Anti-Spam SMTP Proxy is a spam filter that sits on port 25 in front of your
regular SMTP server (sendmail, postfix, qmail, etc).

ASSP performs a number of configurable spam checks, and on detecting a spam
message, provides an immediate 5xx SMTP error code back to the client.
Non-spam messages are passed to your regular SMTP server for further
processing and delivery.

ASSP offers:
	- a whitelist of known good senders
	- Bayesian checks on message headers and contents
	- recipient address validation using LDAP and RFC822 conformance
	- relay denial
	- HELO checking
	- SPF (Sender Policy Framework) checking
	- DNSBL (DNS Block List) checking using many DNSBL services
	- Virus detection

ASSP is a single script with a web-based configuration tool.

WWW: http://assp.sourceforge.net/
<table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/~lantw44/cgit/'><img src='/~lantw44/cgit-data/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/~lantw44/cgit/'>index</a> : <a title='gsoc2013-evolution' href='/~lantw44/cgit/gsoc2013-evolution/'>gsoc2013-evolution</a></td><td class='form'><form method='get'>
<select name='h' onchange='this.form.submit();'>
<option value='archive-integration'>archive-integration</option>
<option value='archive-integration-review'>archive-integration-review</option>
<option value='master'>master</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Google Summer of Code 2013 - GNOME - Archive Integration workspace</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/~lantw44/cgit/gsoc2013-evolution/about/?h=rel-0_6_2'>about</a><a href='/~lantw44/cgit/gsoc2013-evolution/?h=rel-0_6_2'>summary</a><a href='/~lantw44/cgit/gsoc2013-evolution/refs/?h=rel-0_6_2'>refs</a><a href='/~lantw44/cgit/gsoc2013-evolution/log/?h=rel-0_6_2'>log</a><a href='/~lantw44/cgit/gsoc2013-evolution/tree/?h=rel-0_6_2'>tree</a><a class='active' href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=rel-0_6_2'>commit</a><a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=rel-0_6_2'>diff</a><a href='/~lantw44/cgit/gsoc2013-evolution/stats/?h=rel-0_6_2'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/gsoc2013-evolution/log/'>
<input type='hidden' name='h' value='rel-0_6_2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='rel-0_6_2'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>nobody &lt;nobody@localhost&gt;</td><td class='right'>2002-05-16 00:19:25 +0800</td></tr>
<tr><th>committer</th><td>nobody &lt;nobody@localhost&gt;</td><td class='right'>2002-05-16 00:19:25 +0800</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=rel-0_6_2&amp;id=a03f0c6175de0acc8646ce164f070aab968cae76'>a03f0c6175de0acc8646ce164f070aab968cae76</a> (<a href='/~lantw44/cgit/gsoc2013-evolution/patch/?id=a03f0c6175de0acc8646ce164f070aab968cae76'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/tree/?h=rel-0_6_2'>9a14849dd3a40bd1667b88d689e2aa7d58d08bce</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>74f4231f4eb650f0243ff39ab5a085b1df4f7697</a> (<a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=rel-0_6_2&amp;id2=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-rel-0_6_2.tar.gz'>gsoc2013-evolution-rel-0_6_2.tar.gz</a><br/><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-rel-0_6_2.tar.zst'>gsoc2013-evolution-rel-0_6_2.tar.zst</a><br/><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-rel-0_6_2.zip'>gsoc2013-evolution-rel-0_6_2.zip</a><br/></td></tr></table>
<div class='commit-subject'>This commit was manufactured by cvs2svn to create tag 'rel-0_6_2'.<span class='decoration'><a class='tag-annotated-deco' href='/~lantw44/cgit/gsoc2013-evolution/tag/?h=rel-0_6_2'>rel-0_6_2</a></span></div><div class='commit-msg'>svn path=/tags/rel-0_6_2/; revision=16919
</div><div class='diffstat-header'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=rel-0_6_2'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/.cvsignore?h=rel-0_6_2'>.cvsignore</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/AUTHORS?h=rel-0_6_2'>AUTHORS</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/COPYING?h=rel-0_6_2'>COPYING</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/COPYING-DOCS?h=rel-0_6_2'>COPYING-DOCS</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ChangeLog?h=rel-0_6_2'>ChangeLog</a></td><td class='right'>7667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.7%;'/><td class='none' style='width: 82.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/HACKING?h=rel-0_6_2'>HACKING</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/INSTALL?h=rel-0_6_2'>INSTALL</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/MAINTAINERS?h=rel-0_6_2'>MAINTAINERS</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/Makefile.am?h=rel-0_6_2'>Makefile.am</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/NEWS?h=rel-0_6_2'>NEWS</a></td><td class='right'>2408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/README?h=rel-0_6_2'>README</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/acconfig.h?h=rel-0_6_2'>acconfig.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/.cvsignore?h=rel-0_6_2'>addressbook/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/ChangeLog?h=rel-0_6_2'>addressbook/ChangeLog</a></td><td class='right'>11855</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 27.4%;'/><td class='none' style='width: 72.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/E-CARD-NEEDED-FIELDS?h=rel-0_6_2'>addressbook/E-CARD-NEEDED-FIELDS</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/Makefile.am?h=rel-0_6_2'>addressbook/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/.cvsignore?h=rel-0_6_2'>addressbook/backend/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/Makefile.am?h=rel-0_6_2'>addressbook/backend/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/.cvsignore?h=rel-0_6_2'>addressbook/backend/ebook/.cvsignore</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in?h=rel-0_6_2'>addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in?h=rel-0_6_2'>addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/Makefile.am?h=rel-0_6_2'>addressbook/backend/ebook/Makefile.am</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/TODO?h=rel-0_6_2'>addressbook/backend/ebook/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-listener.c?h=rel-0_6_2'>addressbook/backend/ebook/e-book-listener.c</a></td><td class='right'>830</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-listener.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book-listener.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-types.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book-types.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-util.c?h=rel-0_6_2'>addressbook/backend/ebook/e-book-util.c</a></td><td class='right'>759</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-util.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book-util.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view-listener.c?h=rel-0_6_2'>addressbook/backend/ebook/e-book-view-listener.c</a></td><td class='right'>483</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view-listener.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book-view-listener.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view.c?h=rel-0_6_2'>addressbook/backend/ebook/e-book-view.c</a></td><td class='right'>351</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book-view.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book.c?h=rel-0_6_2'>addressbook/backend/ebook/e-book.c</a></td><td class='right'>1500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book.h?h=rel-0_6_2'>addressbook/backend/ebook/e-book.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-compare.c?h=rel-0_6_2'>addressbook/backend/ebook/e-card-compare.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-compare.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card-compare.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-cursor.c?h=rel-0_6_2'>addressbook/backend/ebook/e-card-cursor.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-cursor.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card-cursor.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-pairs.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card-pairs.h</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-simple.c?h=rel-0_6_2'>addressbook/backend/ebook/e-card-simple.c</a></td><td class='right'>1274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-simple.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card-simple.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card-types.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card-types.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card.c?h=rel-0_6_2'>addressbook/backend/ebook/e-card.c</a></td><td class='right'>2857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-card.h?h=rel-0_6_2'>addressbook/backend/ebook/e-card.h</a></td><td class='right'>218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-destination.c?h=rel-0_6_2'>addressbook/backend/ebook/e-destination.c</a></td><td class='right'>1690</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-destination.h?h=rel-0_6_2'>addressbook/backend/ebook/e-destination.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/evolution-ldif-importer.c?h=rel-0_6_2'>addressbook/backend/ebook/evolution-ldif-importer.c</a></td><td class='right'>624</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/evolution-vcard-importer.c?h=rel-0_6_2'>addressbook/backend/ebook/evolution-vcard-importer.c</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/load-gnomecard-addressbook.c?h=rel-0_6_2'>addressbook/backend/ebook/load-gnomecard-addressbook.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/load-pine-addressbook.c?h=rel-0_6_2'>addressbook/backend/ebook/load-pine-addressbook.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/test-card.c?h=rel-0_6_2'>addressbook/backend/ebook/test-card.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/test-client-list.c?h=rel-0_6_2'>addressbook/backend/ebook/test-client-list.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/test-client.c?h=rel-0_6_2'>addressbook/backend/ebook/test-client.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/idl/.cvsignore?h=rel-0_6_2'>addressbook/backend/idl/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/idl/Makefile.am?h=rel-0_6_2'>addressbook/backend/idl/Makefile.am</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/idl/addressbook.idl?h=rel-0_6_2'>addressbook/backend/idl/addressbook.idl</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/.cvsignore?h=rel-0_6_2'>addressbook/backend/pas/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/Makefile.am?h=rel-0_6_2'>addressbook/backend/pas/Makefile.am</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/TODO?h=rel-0_6_2'>addressbook/backend/pas/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/evolutionperson.schema?h=rel-0_6_2'>addressbook/backend/pas/evolutionperson.schema</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-card-sexp.c?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-card-sexp.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-card-sexp.h?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-card-sexp.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-file.c?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-file.c</a></td><td class='right'>1515</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-file.h?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-file.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-ldap.c?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-ldap.c</a></td><td class='right'>3271</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.6%;'/><td class='none' style='width: 92.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-ldap.h?h=rel-0_6_2'>addressbook/backend/pas/pas-backend-ldap.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend.c?h=rel-0_6_2'>addressbook/backend/pas/pas-backend.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend.h?h=rel-0_6_2'>addressbook/backend/pas/pas-backend.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book-factory.c?h=rel-0_6_2'>addressbook/backend/pas/pas-book-factory.c</a></td><td class='right'>666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book-factory.h?h=rel-0_6_2'>addressbook/backend/pas/pas-book-factory.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book-view.c?h=rel-0_6_2'>addressbook/backend/pas/pas-book-view.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book-view.h?h=rel-0_6_2'>addressbook/backend/pas/pas-book-view.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book.c?h=rel-0_6_2'>addressbook/backend/pas/pas-book.c</a></td><td class='right'>948</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book.h?h=rel-0_6_2'>addressbook/backend/pas/pas-book.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-card-cursor.c?h=rel-0_6_2'>addressbook/backend/pas/pas-card-cursor.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-card-cursor.h?h=rel-0_6_2'>addressbook/backend/pas/pas-card-cursor.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/conduit/.cvsignore?h=rel-0_6_2'>addressbook/conduit/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/conduit/Makefile.am?h=rel-0_6_2'>addressbook/conduit/Makefile.am</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/conduit/address-conduit.c?h=rel-0_6_2'>addressbook/conduit/address-conduit.c</a></td><td class='right'>1911</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.4%;'/><td class='none' style='width: 95.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/conduit/e-address.conduit.in?h=rel-0_6_2'>addressbook/conduit/e-address.conduit.in</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/.cvsignore?h=rel-0_6_2'>addressbook/gui/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/Makefile.am?h=rel-0_6_2'>addressbook/gui/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/.cvsignore?h=rel-0_6_2'>addressbook/gui/component/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in?h=rel-0_6_2'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/Makefile.am?h=rel-0_6_2'>addressbook/gui/component/Makefile.am</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-component.c?h=rel-0_6_2'>addressbook/gui/component/addressbook-component.c</a></td><td class='right'>594</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-component.h?h=rel-0_6_2'>addressbook/gui/component/addressbook-component.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-config.c?h=rel-0_6_2'>addressbook/gui/component/addressbook-config.c</a></td><td class='right'>1826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-config.h?h=rel-0_6_2'>addressbook/gui/component/addressbook-config.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-factory.c?h=rel-0_6_2'>addressbook/gui/component/addressbook-factory.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-storage.c?h=rel-0_6_2'>addressbook/gui/component/addressbook-storage.c</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook-storage.h?h=rel-0_6_2'>addressbook/gui/component/addressbook-storage.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook.c?h=rel-0_6_2'>addressbook/gui/component/addressbook.c</a></td><td class='right'>1138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook.h?h=rel-0_6_2'>addressbook/gui/component/addressbook.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-address-popup.c?h=rel-0_6_2'>addressbook/gui/component/e-address-popup.c</a></td><td class='right'>1274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-address-popup.h?h=rel-0_6_2'>addressbook/gui/component/e-address-popup.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-address-widget.c?h=rel-0_6_2'>addressbook/gui/component/e-address-widget.c</a></td><td class='right'>576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-address-widget.h?h=rel-0_6_2'>addressbook/gui/component/e-address-widget.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-cardlist-model.c?h=rel-0_6_2'>addressbook/gui/component/e-cardlist-model.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/e-cardlist-model.h?h=rel-0_6_2'>addressbook/gui/component/e-cardlist-model.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/ldap-config.glade?h=rel-0_6_2'>addressbook/gui/component/ldap-config.glade</a></td><td class='right'>5819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.4%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/.cvsignore?h=rel-0_6_2'>addressbook/gui/component/select-names/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl?h=rel-0_6_2'>addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in?h=rel-0_6_2'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/Makefile.am?h=rel-0_6_2'>addressbook/gui/component/select-names/Makefile.am</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-bonobo.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-bonobo.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-bonobo.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-bonobo.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-completion.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-completion.c</a></td><td class='right'>1292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-completion.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-completion.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-factory.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-factory.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-factory.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-manager.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-manager.c</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-manager.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-manager.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-model.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-model.c</a></td><td class='right'>889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-model.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-model.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-popup.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-popup.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-popup.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-popup.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-table-model.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-table-model.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-table-model.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-table-model.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-text-model.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-text-model.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-text-model.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names-text-model.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names.c</a></td><td class='right'>1182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-select-names.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-simple-card-bonobo.c?h=rel-0_6_2'>addressbook/gui/component/select-names/e-simple-card-bonobo.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-simple-card-bonobo.h?h=rel-0_6_2'>addressbook/gui/component/select-names/e-simple-card-bonobo.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/recipient.glade?h=rel-0_6_2'>addressbook/gui/component/select-names/recipient.glade</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/select-names.glade?h=rel-0_6_2'>addressbook/gui/component/select-names/select-names.glade</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/.cvsignore?h=rel-0_6_2'>addressbook/gui/contact-editor/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/Makefile.am?h=rel-0_6_2'>addressbook/gui/contact-editor/Makefile.am</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/arrow.png?h=rel-0_6_2'>addressbook/gui/contact-editor/arrow.png</a></td><td class='right'>bin</td><td class='graph'>174 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/contact-editor.glade?h=rel-0_6_2'>addressbook/gui/contact-editor/contact-editor.glade</a></td><td class='right'>2537</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor-address.c?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor-address.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor-address.h?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor-address.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor-fullname.c?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor-fullname.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor-fullname.h?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor-fullname.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor.c?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor.c</a></td><td class='right'>2748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor.h?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-editor.h</a></td><td class='right'>137</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-quick-add.c?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-quick-add.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-quick-add.h?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-quick-add.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-save-as.c?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-save-as.c</a></td><td class='right'>214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-save-as.h?h=rel-0_6_2'>addressbook/gui/contact-editor/e-contact-save-as.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/file-exists.glade?h=rel-0_6_2'>addressbook/gui/contact-editor/file-exists.glade</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/fulladdr.glade?h=rel-0_6_2'>addressbook/gui/contact-editor/fulladdr.glade</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/fullname.glade?h=rel-0_6_2'>addressbook/gui/contact-editor/fullname.glade</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/test-editor.c?h=rel-0_6_2'>addressbook/gui/contact-editor/test-editor.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/.cvsignore?h=rel-0_6_2'>addressbook/gui/contact-list-editor/.cvsignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/Makefile.am?h=rel-0_6_2'>addressbook/gui/contact-list-editor/Makefile.am</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/contact-list-editor.glade?h=rel-0_6_2'>addressbook/gui/contact-list-editor/contact-list-editor.glade</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/e-contact-list-editor.c?h=rel-0_6_2'>addressbook/gui/contact-list-editor/e-contact-list-editor.c</a></td><td class='right'>980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/e-contact-list-editor.h?h=rel-0_6_2'>addressbook/gui/contact-list-editor/e-contact-list-editor.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/e-contact-list-model.c?h=rel-0_6_2'>addressbook/gui/contact-list-editor/e-contact-list-model.c</a></td><td class='right'>253</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-list-editor/e-contact-list-model.h?h=rel-0_6_2'>addressbook/gui/contact-list-editor/e-contact-list-model.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/.cvsignore?h=rel-0_6_2'>addressbook/gui/merging/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/Makefile.am?h=rel-0_6_2'>addressbook/gui/merging/Makefile.am</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/e-card-duplicate-detected.glade?h=rel-0_6_2'>addressbook/gui/merging/e-card-duplicate-detected.glade</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade?h=rel-0_6_2'>addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/e-card-merging.c?h=rel-0_6_2'>addressbook/gui/merging/e-card-merging.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/merging/e-card-merging.h?h=rel-0_6_2'>addressbook/gui/merging/e-card-merging.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/.cvsignore?h=rel-0_6_2'>addressbook/gui/search/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/Makefile.am?h=rel-0_6_2'>addressbook/gui/search/Makefile.am</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/addresstypes.xml?h=rel-0_6_2'>addressbook/gui/search/addresstypes.xml</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/e-addressbook-search-dialog.c?h=rel-0_6_2'>addressbook/gui/search/e-addressbook-search-dialog.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/e-addressbook-search-dialog.h?h=rel-0_6_2'>addressbook/gui/search/e-addressbook-search-dialog.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/.cvsignore?h=rel-0_6_2'>addressbook/gui/widgets/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/Makefile.am?h=rel-0_6_2'>addressbook/gui/widgets/Makefile.am</a></td><td class='right'>132</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-model.c?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-model.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-model.h?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-model.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-reflow-adapter.c?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-reflow-adapter.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-reflow-adapter.h?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-reflow-adapter.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-table-adapter.c?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-table-adapter.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-table-adapter.h?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-table-adapter.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-util.c?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-util.c</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-util.h?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-util.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-view.c?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-view.c</a></td><td class='right'>2025</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-addressbook-view.h?h=rel-0_6_2'>addressbook/gui/widgets/e-addressbook-view.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-control.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-control.c</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-control.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-control.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-label.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-label.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-label.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-label.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-view-widget.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-view-widget.c</a></td><td class='right'>368</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-view-widget.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-view-widget.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-view.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-view.c</a></td><td class='right'>555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-view.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-view.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-widget-test.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-widget-test.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-widget.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-widget.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-widget.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard-widget.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard.c?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard.c</a></td><td class='right'>996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard.h?h=rel-0_6_2'>addressbook/gui/widgets/e-minicard.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/gal-view-factory-minicard.c?h=rel-0_6_2'>addressbook/gui/widgets/gal-view-factory-minicard.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/gal-view-factory-minicard.h?h=rel-0_6_2'>addressbook/gui/widgets/gal-view-factory-minicard.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/gal-view-minicard.c?h=rel-0_6_2'>addressbook/gui/widgets/gal-view-minicard.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/gal-view-minicard.h?h=rel-0_6_2'>addressbook/gui/widgets/gal-view-minicard.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/test-minicard-label.c?h=rel-0_6_2'>addressbook/gui/widgets/test-minicard-label.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/test-minicard-view.c?h=rel-0_6_2'>addressbook/gui/widgets/test-minicard-view.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/test-minicard.c?h=rel-0_6_2'>addressbook/gui/widgets/test-minicard.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/test-reflow.c?h=rel-0_6_2'>addressbook/gui/widgets/test-reflow.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/.cvsignore?h=rel-0_6_2'>addressbook/printing/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/Makefile.am?h=rel-0_6_2'>addressbook/printing/Makefile.am</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-envelope.c?h=rel-0_6_2'>addressbook/printing/e-contact-print-envelope.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-envelope.h?h=rel-0_6_2'>addressbook/printing/e-contact-print-envelope.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-style-editor.c?h=rel-0_6_2'>addressbook/printing/e-contact-print-style-editor.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-style-editor.h?h=rel-0_6_2'>addressbook/printing/e-contact-print-style-editor.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-types.h?h=rel-0_6_2'>addressbook/printing/e-contact-print-types.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print.c?h=rel-0_6_2'>addressbook/printing/e-contact-print.c</a></td><td class='right'>1207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print.glade?h=rel-0_6_2'>addressbook/printing/e-contact-print.glade</a></td><td class='right'>2003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print.h?h=rel-0_6_2'>addressbook/printing/e-contact-print.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/medbook.ecps?h=rel-0_6_2'>addressbook/printing/medbook.ecps</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/phonelist.ecps?h=rel-0_6_2'>addressbook/printing/phonelist.ecps</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/smallbook.ecps?h=rel-0_6_2'>addressbook/printing/smallbook.ecps</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/test-contact-print-style-editor.c?h=rel-0_6_2'>addressbook/printing/test-contact-print-style-editor.c</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/test-print.c?h=rel-0_6_2'>addressbook/printing/test-print.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/.cvsignore?h=rel-0_6_2'>art/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/16_copy.png?h=rel-0_6_2'>art/16_copy.png</a></td><td class='right'>bin</td><td class='graph'>516 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/16_customize.png?h=rel-0_6_2'>art/16_customize.png</a></td><td class='right'>bin</td><td class='graph'>266 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/16_cut.png?h=rel-0_6_2'>art/16_cut.png</a></td><td class='right'>bin</td><td class='graph'>531 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/16_paste.png?h=rel-0_6_2'>art/16_paste.png</a></td><td class='right'>bin</td><td class='graph'>626 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ChangeLog?h=rel-0_6_2'>art/ChangeLog</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/Makefile.am?h=rel-0_6_2'>art/Makefile.am</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/about-box.png?h=rel-0_6_2'>art/about-box.png</a></td><td class='right'>bin</td><td class='graph'>51416 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/add-attachment.png?h=rel-0_6_2'>art/add-attachment.png</a></td><td class='right'>bin</td><td class='graph'>715 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/add-nntp-folder-24.png?h=rel-0_6_2'>art/add-nntp-folder-24.png</a></td><td class='right'>bin</td><td class='graph'>863 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/add-service.png?h=rel-0_6_2'>art/add-service.png</a></td><td class='right'>bin</td><td class='graph'>1186 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/alarm.png?h=rel-0_6_2'>art/alarm.png</a></td><td class='right'>bin</td><td class='graph'>4384 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/all_contacts.xpm?h=rel-0_6_2'>art/all_contacts.xpm</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/apply-filters-16.xpm?h=rel-0_6_2'>art/apply-filters-16.xpm</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/arrow-left-24.png?h=rel-0_6_2'>art/arrow-left-24.png</a></td><td class='right'>bin</td><td class='graph'>429 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/arrow-right-24.png?h=rel-0_6_2'>art/arrow-right-24.png</a></td><td class='right'>bin</td><td class='graph'>431 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/attachment.xpm?h=rel-0_6_2'>art/attachment.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/bcg.png?h=rel-0_6_2'>art/bcg.png</a></td><td class='right'>bin</td><td class='graph'>526 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/bell.xpm?h=rel-0_6_2'>art/bell.xpm</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/briefcase.png?h=rel-0_6_2'>art/briefcase.png</a></td><td class='right'>bin</td><td class='graph'>2358 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/butterfly.png?h=rel-0_6_2'>art/butterfly.png</a></td><td class='right'>bin</td><td class='graph'>12117 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/calendar-and-tasks-settings.png?h=rel-0_6_2'>art/calendar-and-tasks-settings.png</a></td><td class='right'>bin</td><td class='graph'>4134 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/cellphone.png?h=rel-0_6_2'>art/cellphone.png</a></td><td class='right'>bin</td><td class='graph'>3440 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/check-filled.xpm?h=rel-0_6_2'>art/check-filled.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/compose-message.png?h=rel-0_6_2'>art/compose-message.png</a></td><td class='right'>bin</td><td class='graph'>1062 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/composer-settings.png?h=rel-0_6_2'>art/composer-settings.png</a></td><td class='right'>bin</td><td class='graph'>3508 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/configure_16_addressbook.xpm?h=rel-0_6_2'>art/configure_16_addressbook.xpm</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/configure_16_calendar.xpm?h=rel-0_6_2'>art/configure_16_calendar.xpm</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/configure_16_folder.xpm?h=rel-0_6_2'>art/configure_16_folder.xpm</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/configure_16_mail.xpm?h=rel-0_6_2'>art/configure_16_mail.xpm</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/connect_to_url-16.xpm?h=rel-0_6_2'>art/connect_to_url-16.xpm</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/contact-is-a-list.png?h=rel-0_6_2'>art/contact-is-a-list.png</a></td><td class='right'>bin</td><td class='graph'>173 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/copy-message.png?h=rel-0_6_2'>art/copy-message.png</a></td><td class='right'>bin</td><td class='graph'>863 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/copy.png?h=rel-0_6_2'>art/copy.png</a></td><td class='right'>bin</td><td class='graph'>918 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/copy_16_message.xpm?h=rel-0_6_2'>art/copy_16_message.xpm</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/cut.png?h=rel-0_6_2'>art/cut.png</a></td><td class='right'>bin</td><td class='graph'>1063 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/dayview.xpm?h=rel-0_6_2'>art/dayview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/delete-message.png?h=rel-0_6_2'>art/delete-message.png</a></td><td class='right'>bin</td><td class='graph'>1210 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/drafts-16.png?h=rel-0_6_2'>art/drafts-16.png</a></td><td class='right'>bin</td><td class='graph'>539 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/edit.xpm?h=rel-0_6_2'>art/edit.xpm</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/empty.gif?h=rel-0_6_2'>art/empty.gif</a></td><td class='right'>bin</td><td class='graph'>104 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/empty.xpm?h=rel-0_6_2'>art/empty.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/encrypt.xpm?h=rel-0_6_2'>art/encrypt.xpm</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/envelope.png?h=rel-0_6_2'>art/envelope.png</a></td><td class='right'>bin</td><td class='graph'>2393 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/es-appointments.png?h=rel-0_6_2'>art/es-appointments.png</a></td><td class='right'>bin</td><td class='graph'>433 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/es-weather.png?h=rel-0_6_2'>art/es-weather.png</a></td><td class='right'>bin</td><td class='graph'>1002 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-16-address-conduit.png?h=rel-0_6_2'>art/evo-16-address-conduit.png</a></td><td class='right'>bin</td><td class='graph'>498 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-16-calendar-conduit.png?h=rel-0_6_2'>art/evo-16-calendar-conduit.png</a></td><td class='right'>bin</td><td class='graph'>505 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-16-todo-conduit.png?h=rel-0_6_2'>art/evo-16-todo-conduit.png</a></td><td class='right'>bin</td><td class='graph'>702 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-48-address-conduit.png?h=rel-0_6_2'>art/evo-48-address-conduit.png</a></td><td class='right'>bin</td><td class='graph'>2919 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-48-calendar-conduit.png?h=rel-0_6_2'>art/evo-48-calendar-conduit.png</a></td><td class='right'>bin</td><td class='graph'>2889 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evo-48-todo-conduit.png?h=rel-0_6_2'>art/evo-48-todo-conduit.png</a></td><td class='right'>bin</td><td class='graph'>3677 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-calendar-mini.png?h=rel-0_6_2'>art/evolution-calendar-mini.png</a></td><td class='right'>bin</td><td class='graph'>502 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-calendar.png?h=rel-0_6_2'>art/evolution-calendar.png</a></td><td class='right'>bin</td><td class='graph'>2733 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-contacts-mini.png?h=rel-0_6_2'>art/evolution-contacts-mini.png</a></td><td class='right'>bin</td><td class='graph'>452 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-contacts-plain.png?h=rel-0_6_2'>art/evolution-contacts-plain.png</a></td><td class='right'>bin</td><td class='graph'>2341 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-contacts.png?h=rel-0_6_2'>art/evolution-contacts.png</a></td><td class='right'>bin</td><td class='graph'>2288 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-inbox-mini.png?h=rel-0_6_2'>art/evolution-inbox-mini.png</a></td><td class='right'>bin</td><td class='graph'>478 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-inbox.png?h=rel-0_6_2'>art/evolution-inbox.png</a></td><td class='right'>bin</td><td class='graph'>2937 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-notes-mini.png?h=rel-0_6_2'>art/evolution-notes-mini.png</a></td><td class='right'>bin</td><td class='graph'>516 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-notes.png?h=rel-0_6_2'>art/evolution-notes.png</a></td><td class='right'>bin</td><td class='graph'>3400 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-tasks-mini.png?h=rel-0_6_2'>art/evolution-tasks-mini.png</a></td><td class='right'>bin</td><td class='graph'>708 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-tasks.png?h=rel-0_6_2'>art/evolution-tasks.png</a></td><td class='right'>bin</td><td class='graph'>3601 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-today-mini.png?h=rel-0_6_2'>art/evolution-today-mini.png</a></td><td class='right'>bin</td><td class='graph'>664 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-today.png?h=rel-0_6_2'>art/evolution-today.png</a></td><td class='right'>bin</td><td class='graph'>3713 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-trash-mini.png?h=rel-0_6_2'>art/evolution-trash-mini.png</a></td><td class='right'>bin</td><td class='graph'>723 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-trash.png?h=rel-0_6_2'>art/evolution-trash.png</a></td><td class='right'>bin</td><td class='graph'>2913 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution.png?h=rel-0_6_2'>art/evolution.png</a></td><td class='right'>bin</td><td class='graph'>5182 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/executive-summary-bg.png?h=rel-0_6_2'>art/executive-summary-bg.png</a></td><td class='right'>bin</td><td class='graph'>86508 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/executive-summary-curve.png?h=rel-0_6_2'>art/executive-summary-curve.png</a></td><td class='right'>bin</td><td class='graph'>1786 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/faq-16.png?h=rel-0_6_2'>art/faq-16.png</a></td><td class='right'>bin</td><td class='graph'>639 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/fetch-mail.png?h=rel-0_6_2'>art/fetch-mail.png</a></td><td class='right'>bin</td><td class='graph'>1027 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/find_contact.xpm?h=rel-0_6_2'>art/find_contact.xpm</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/find_message.xpm?h=rel-0_6_2'>art/find_message.xpm</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/flag-for-followup-16.png?h=rel-0_6_2'>art/flag-for-followup-16.png</a></td><td class='right'>bin</td><td class='graph'>515 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/flag-for-followup-48.png?h=rel-0_6_2'>art/flag-for-followup-48.png</a></td><td class='right'>bin</td><td class='graph'>3273 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/flag-for-followup.xpm?h=rel-0_6_2'>art/flag-for-followup.xpm</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/folder-copy-16.png?h=rel-0_6_2'>art/folder-copy-16.png</a></td><td class='right'>bin</td><td class='graph'>376 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/folder-move-16.png?h=rel-0_6_2'>art/folder-move-16.png</a></td><td class='right'>bin</td><td class='graph'>273 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/folder-settings.png?h=rel-0_6_2'>art/folder-settings.png</a></td><td class='right'>bin</td><td class='graph'>1946 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/folder.xpm?h=rel-0_6_2'>art/folder.xpm</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/font.png?h=rel-0_6_2'>art/font.png</a></td><td class='right'>bin</td><td class='graph'>1480 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/forget_passwords.xpm?h=rel-0_6_2'>art/forget_passwords.xpm</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/forward.png?h=rel-0_6_2'>art/forward.png</a></td><td class='right'>bin</td><td class='graph'>693 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/forward.xpm?h=rel-0_6_2'>art/forward.xpm</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/globe.png?h=rel-0_6_2'>art/globe.png</a></td><td class='right'>bin</td><td class='graph'>3328 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/goto-16.png?h=rel-0_6_2'>art/goto-16.png</a></td><td class='right'>bin</td><td class='graph'>470 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/goto-24.png?h=rel-0_6_2'>art/goto-24.png</a></td><td class='right'>bin</td><td class='graph'>679 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/hand-16.xpm?h=rel-0_6_2'>art/hand-16.xpm</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/hide_deleted_messages.xpm?h=rel-0_6_2'>art/hide_deleted_messages.xpm</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/hide_read_messages.xpm?h=rel-0_6_2'>art/hide_read_messages.xpm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/hide_selected_messages.xpm?h=rel-0_6_2'>art/hide_selected_messages.xpm</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/house.png?h=rel-0_6_2'>art/house.png</a></td><td class='right'>bin</td><td class='graph'>4135 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ico-calendar.png?h=rel-0_6_2'>art/ico-calendar.png</a></td><td class='right'>bin</td><td class='graph'>2677 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ico-mail.png?h=rel-0_6_2'>art/ico-mail.png</a></td><td class='right'>bin</td><td class='graph'>2937 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ico-rdf.png?h=rel-0_6_2'>art/ico-rdf.png</a></td><td class='right'>bin</td><td class='graph'>3627 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ico-weather.png?h=rel-0_6_2'>art/ico-weather.png</a></td><td class='right'>bin</td><td class='graph'>4343 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/imap-16.png?h=rel-0_6_2'>art/imap-16.png</a></td><td class='right'>bin</td><td class='graph'>482 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/import.png?h=rel-0_6_2'>art/import.png</a></td><td class='right'>bin</td><td class='graph'>2309 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/import.xpm?h=rel-0_6_2'>art/import.xpm</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/inbox-16.png?h=rel-0_6_2'>art/inbox-16.png</a></td><td class='right'>bin</td><td class='graph'>587 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/inbox-full-16.png?h=rel-0_6_2'>art/inbox-full-16.png</a></td><td class='right'>bin</td><td class='graph'>549 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/insert-image-24.png?h=rel-0_6_2'>art/insert-image-24.png</a></td><td class='right'>bin</td><td class='graph'>711 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/insert-link-24.png?h=rel-0_6_2'>art/insert-link-24.png</a></td><td class='right'>bin</td><td class='graph'>782 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/insert-table-24.png?h=rel-0_6_2'>art/insert-table-24.png</a></td><td class='right'>bin</td><td class='graph'>430 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/jump.xpm?h=rel-0_6_2'>art/jump.xpm</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ldap-mini.png?h=rel-0_6_2'>art/ldap-mini.png</a></td><td class='right'>bin</td><td class='graph'>542 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ldap-settings.png?h=rel-0_6_2'>art/ldap-settings.png</a></td><td class='right'>bin</td><td class='graph'>3081 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/ldap.png?h=rel-0_6_2'>art/ldap.png</a></td><td class='right'>bin</td><td class='graph'>2614 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/local-16.png?h=rel-0_6_2'>art/local-16.png</a></td><td class='right'>bin</td><td class='graph'>342 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-accounts-settings.png?h=rel-0_6_2'>art/mail-accounts-settings.png</a></td><td class='right'>bin</td><td class='graph'>2328 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid-48.png?h=rel-0_6_2'>art/mail-config-druid-48.png</a></td><td class='right'>bin</td><td class='graph'>3529 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid-account-name.png?h=rel-0_6_2'>art/mail-config-druid-account-name.png</a></td><td class='right'>bin</td><td class='graph'>3150 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid-identity.png?h=rel-0_6_2'>art/mail-config-druid-identity.png</a></td><td class='right'>bin</td><td class='graph'>2646 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid-receive.png?h=rel-0_6_2'>art/mail-config-druid-receive.png</a></td><td class='right'>bin</td><td class='graph'>3551 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid-send.png?h=rel-0_6_2'>art/mail-config-druid-send.png</a></td><td class='right'>bin</td><td class='graph'>3379 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-config-druid.png?h=rel-0_6_2'>art/mail-config-druid.png</a></td><td class='right'>bin</td><td class='graph'>3529 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-need-reply.xpm?h=rel-0_6_2'>art/mail-need-reply.xpm</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-new.xpm?h=rel-0_6_2'>art/mail-new.xpm</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-read.xpm?h=rel-0_6_2'>art/mail-read.xpm</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mail-replied.xpm?h=rel-0_6_2'>art/mail-replied.xpm</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/malehead.png?h=rel-0_6_2'>art/malehead.png</a></td><td class='right'>bin</td><td class='graph'>4220 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mark-as-important-16.png?h=rel-0_6_2'>art/mark-as-important-16.png</a></td><td class='right'>bin</td><td class='graph'>235 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/mark.xpm?h=rel-0_6_2'>art/mark.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/meeting-request.png?h=rel-0_6_2'>art/meeting-request.png</a></td><td class='right'>bin</td><td class='graph'>3520 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/meeting.xpm?h=rel-0_6_2'>art/meeting.xpm</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/monkey-16.png?h=rel-0_6_2'>art/monkey-16.png</a></td><td class='right'>bin</td><td class='graph'>977 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/monthview.xpm?h=rel-0_6_2'>art/monthview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/move-message.png?h=rel-0_6_2'>art/move-message.png</a></td><td class='right'>bin</td><td class='graph'>777 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/move_message.xpm?h=rel-0_6_2'>art/move_message.xpm</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myevo-appointments.png?h=rel-0_6_2'>art/myevo-appointments.png</a></td><td class='right'>bin</td><td class='graph'>2857 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myevo-mail-summary.png?h=rel-0_6_2'>art/myevo-mail-summary.png</a></td><td class='right'>bin</td><td class='graph'>3278 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myevo-post-it.png?h=rel-0_6_2'>art/myevo-post-it.png</a></td><td class='right'>bin</td><td class='graph'>3715 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-clouds.png?h=rel-0_6_2'>art/myweather-clouds.png</a></td><td class='right'>bin</td><td class='graph'>414 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-fog.png?h=rel-0_6_2'>art/myweather-fog.png</a></td><td class='right'>bin</td><td class='graph'>748 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-rain.png?h=rel-0_6_2'>art/myweather-rain.png</a></td><td class='right'>bin</td><td class='graph'>186 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-snow.png?h=rel-0_6_2'>art/myweather-snow.png</a></td><td class='right'>bin</td><td class='graph'>354 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-storm.png?h=rel-0_6_2'>art/myweather-storm.png</a></td><td class='right'>bin</td><td class='graph'>429 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-sun.png?h=rel-0_6_2'>art/myweather-sun.png</a></td><td class='right'>bin</td><td class='graph'>295 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/myweather-suncloud.png?h=rel-0_6_2'>art/myweather-suncloud.png</a></td><td class='right'>bin</td><td class='graph'>469 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new-message.xpm?h=rel-0_6_2'>art/new-message.xpm</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_all_day_event.png?h=rel-0_6_2'>art/new_all_day_event.png</a></td><td class='right'>bin</td><td class='graph'>692 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_appointment.png?h=rel-0_6_2'>art/new_appointment.png</a></td><td class='right'>bin</td><td class='graph'>1542 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_appointment.xpm?h=rel-0_6_2'>art/new_appointment.xpm</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_contact.xpm?h=rel-0_6_2'>art/new_contact.xpm</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_task-16.png?h=rel-0_6_2'>art/new_task-16.png</a></td><td class='right'>bin</td><td class='graph'>427 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/new_task.png?h=rel-0_6_2'>art/new_task.png</a></td><td class='right'>bin</td><td class='graph'>1032 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/next-message.png?h=rel-0_6_2'>art/next-message.png</a></td><td class='right'>bin</td><td class='graph'>1050 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/offline.png?h=rel-0_6_2'>art/offline.png</a></td><td class='right'>bin</td><td class='graph'>640 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/online.png?h=rel-0_6_2'>art/online.png</a></td><td class='right'>bin</td><td class='graph'>547 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/open-in-new-window-16.png?h=rel-0_6_2'>art/open-in-new-window-16.png</a></td><td class='right'>bin</td><td class='graph'>504 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/outbox-16.png?h=rel-0_6_2'>art/outbox-16.png</a></td><td class='right'>bin</td><td class='graph'>575 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/outbox-full-16.png?h=rel-0_6_2'>art/outbox-full-16.png</a></td><td class='right'>bin</td><td class='graph'>551 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/paste.png?h=rel-0_6_2'>art/paste.png</a></td><td class='right'>bin</td><td class='graph'>1053 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pattern.png?h=rel-0_6_2'>art/pattern.png</a></td><td class='right'>bin</td><td class='graph'>271 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pgp-signature-bad.png?h=rel-0_6_2'>art/pgp-signature-bad.png</a></td><td class='right'>bin</td><td class='graph'>4233 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pgp-signature-nokey.png?h=rel-0_6_2'>art/pgp-signature-nokey.png</a></td><td class='right'>bin</td><td class='graph'>2907 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pgp-signature-ok.png?h=rel-0_6_2'>art/pgp-signature-ok.png</a></td><td class='right'>bin</td><td class='graph'>3140 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pin.png?h=rel-0_6_2'>art/pin.png</a></td><td class='right'>bin</td><td class='graph'>354 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/previous-message.png?h=rel-0_6_2'>art/previous-message.png</a></td><td class='right'>bin</td><td class='graph'>1053 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/print-preview-24.png?h=rel-0_6_2'>art/print-preview-24.png</a></td><td class='right'>bin</td><td class='graph'>1035 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/print-preview.xpm?h=rel-0_6_2'>art/print-preview.xpm</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/print.png?h=rel-0_6_2'>art/print.png</a></td><td class='right'>bin</td><td class='graph'>867 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/print.xpm?h=rel-0_6_2'>art/print.xpm</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/priority-high.xpm?h=rel-0_6_2'>art/priority-high.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/priority-low.xpm?h=rel-0_6_2'>art/priority-low.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/properties-16.png?h=rel-0_6_2'>art/properties-16.png</a></td><td class='right'>bin</td><td class='graph'>606 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/rdf.png?h=rel-0_6_2'>art/rdf.png</a></td><td class='right'>bin</td><td class='graph'>4372 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/receive-24.png?h=rel-0_6_2'>art/receive-24.png</a></td><td class='right'>bin</td><td class='graph'>847 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/recur.xpm?h=rel-0_6_2'>art/recur.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/refresh-nntp-folders-24.png?h=rel-0_6_2'>art/refresh-nntp-folders-24.png</a></td><td class='right'>bin</td><td class='graph'>575 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/remove-nntp-folder-24.png?h=rel-0_6_2'>art/remove-nntp-folder-24.png</a></td><td class='right'>bin</td><td class='graph'>878 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply-to-all.png?h=rel-0_6_2'>art/reply-to-all.png</a></td><td class='right'>bin</td><td class='graph'>793 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply.png?h=rel-0_6_2'>art/reply.png</a></td><td class='right'>bin</td><td class='graph'>721 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply.xpm?h=rel-0_6_2'>art/reply.xpm</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply_to_all.xpm?h=rel-0_6_2'>art/reply_to_all.xpm</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/save-16.png?h=rel-0_6_2'>art/save-16.png</a></td><td class='right'>bin</td><td class='graph'>540 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/save-24.png?h=rel-0_6_2'>art/save-24.png</a></td><td class='right'>bin</td><td class='graph'>634 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/save-as-16.png?h=rel-0_6_2'>art/save-as-16.png</a></td><td class='right'>bin</td><td class='graph'>667 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/save.xpm?h=rel-0_6_2'>art/save.xpm</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-high.xpm?h=rel-0_6_2'>art/score-high.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-higher.xpm?h=rel-0_6_2'>art/score-higher.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-highest.xpm?h=rel-0_6_2'>art/score-highest.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-low.xpm?h=rel-0_6_2'>art/score-low.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-lower.xpm?h=rel-0_6_2'>art/score-lower.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-lowest.xpm?h=rel-0_6_2'>art/score-lowest.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-normal.xpm?h=rel-0_6_2'>art/score-normal.xpm</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/search-16.png?h=rel-0_6_2'>art/search-16.png</a></td><td class='right'>bin</td><td class='graph'>526 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/search-and-replace-16.png?h=rel-0_6_2'>art/search-and-replace-16.png</a></td><td class='right'>bin</td><td class='graph'>638 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-16.png?h=rel-0_6_2'>art/send-16.png</a></td><td class='right'>bin</td><td class='graph'>495 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-24-receive.png?h=rel-0_6_2'>art/send-24-receive.png</a></td><td class='right'>bin</td><td class='graph'>900 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-24.png?h=rel-0_6_2'>art/send-24.png</a></td><td class='right'>bin</td><td class='graph'>803 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-48-receive.png?h=rel-0_6_2'>art/send-48-receive.png</a></td><td class='right'>bin</td><td class='graph'>2788 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-later-16.png?h=rel-0_6_2'>art/send-later-16.png</a></td><td class='right'>bin</td><td class='graph'>509 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send-receive.xpm?h=rel-0_6_2'>art/send-receive.xpm</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send.png?h=rel-0_6_2'>art/send.png</a></td><td class='right'>bin</td><td class='graph'>1041 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-close.png?h=rel-0_6_2'>art/service-close.png</a></td><td class='right'>bin</td><td class='graph'>360 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-configure.png?h=rel-0_6_2'>art/service-configure.png</a></td><td class='right'>bin</td><td class='graph'>341 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-down-disabled.png?h=rel-0_6_2'>art/service-down-disabled.png</a></td><td class='right'>bin</td><td class='graph'>331 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-down.png?h=rel-0_6_2'>art/service-down.png</a></td><td class='right'>bin</td><td class='graph'>249 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-left-disabled.png?h=rel-0_6_2'>art/service-left-disabled.png</a></td><td class='right'>bin</td><td class='graph'>319 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-left.png?h=rel-0_6_2'>art/service-left.png</a></td><td class='right'>bin</td><td class='graph'>268 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-right-disabled.png?h=rel-0_6_2'>art/service-right-disabled.png</a></td><td class='right'>bin</td><td class='graph'>318 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-right.png?h=rel-0_6_2'>art/service-right.png</a></td><td class='right'>bin</td><td class='graph'>270 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-up-disabled.png?h=rel-0_6_2'>art/service-up-disabled.png</a></td><td class='right'>bin</td><td class='graph'>347 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-up.png?h=rel-0_6_2'>art/service-up.png</a></td><td class='right'>bin</td><td class='graph'>267 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/show_all_messages.xpm?h=rel-0_6_2'>art/show_all_messages.xpm</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/splash-1-0.png?h=rel-0_6_2'>art/splash-1-0.png</a></td><td class='right'>bin</td><td class='graph'>91906 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/splash.png?h=rel-0_6_2'>art/splash.png</a></td><td class='right'>bin</td><td class='graph'>31187 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/summary-settings.png?h=rel-0_6_2'>art/summary-settings.png</a></td><td class='right'>bin</td><td class='graph'>4659 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/summary_preferences-16.png?h=rel-0_6_2'>art/summary_preferences-16.png</a></td><td class='right'>bin</td><td class='graph'>584 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/talking-heads.png?h=rel-0_6_2'>art/talking-heads.png</a></td><td class='right'>bin</td><td class='graph'>3643 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/task-assigned-to.xpm?h=rel-0_6_2'>art/task-assigned-to.xpm</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/task-assigned.xpm?h=rel-0_6_2'>art/task-assigned.xpm</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/task-recurring.xpm?h=rel-0_6_2'>art/task-recurring.xpm</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/task.png?h=rel-0_6_2'>art/task.png</a></td><td class='right'>bin</td><td class='graph'>172 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/task.xpm?h=rel-0_6_2'>art/task.xpm</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/thankyou.png?h=rel-0_6_2'>art/thankyou.png</a></td><td class='right'>bin</td><td class='graph'>4090 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/timezone-16.xpm?h=rel-0_6_2'>art/timezone-16.xpm</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/timezone-48.png?h=rel-0_6_2'>art/timezone-48.png</a></td><td class='right'>bin</td><td class='graph'>3613 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/tree-expanded.xpm?h=rel-0_6_2'>art/tree-expanded.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/tree-unexpanded.xpm?h=rel-0_6_2'>art/tree-unexpanded.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/undelete_message-16.png?h=rel-0_6_2'>art/undelete_message-16.png</a></td><td class='right'>bin</td><td class='graph'>591 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/wax-seal-broken.png?h=rel-0_6_2'>art/wax-seal-broken.png</a></td><td class='right'>bin</td><td class='graph'>27264 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/wax-seal.png?h=rel-0_6_2'>art/wax-seal.png</a></td><td class='right'>bin</td><td class='graph'>22433 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/weekview.xpm?h=rel-0_6_2'>art/weekview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/work_offline.xpm?h=rel-0_6_2'>art/work_offline.xpm</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/work_online-16.png?h=rel-0_6_2'>art/work_online-16.png</a></td><td class='right'>bin</td><td class='graph'>458 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/working-16.png?h=rel-0_6_2'>art/working-16.png</a></td><td class='right'>bin</td><td class='graph'>490 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/workweekview.xpm?h=rel-0_6_2'>art/workweekview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/world_map-960.png?h=rel-0_6_2'>art/world_map-960.png</a></td><td class='right'>bin</td><td class='graph'>111584 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/yearview.xpm?h=rel-0_6_2'>art/yearview.xpm</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/autogen.sh?h=rel-0_6_2'>autogen.sh</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/.cvsignore?h=rel-0_6_2'>calendar/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/AUTHORS?h=rel-0_6_2'>calendar/AUTHORS</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/ChangeLog?h=rel-0_6_2'>calendar/ChangeLog</a></td><td class='right'>16584</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 38.3%;'/><td class='none' style='width: 61.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/Makefile.am?h=rel-0_6_2'>calendar/Makefile.am</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/TODO?h=rel-0_6_2'>calendar/TODO</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/.cvsignore?h=rel-0_6_2'>calendar/cal-client/.cvsignore</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/Makefile.am?h=rel-0_6_2'>calendar/cal-client/Makefile.am</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client-multi.c?h=rel-0_6_2'>calendar/cal-client/cal-client-multi.c</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client-multi.h?h=rel-0_6_2'>calendar/cal-client/cal-client-multi.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client-types.c?h=rel-0_6_2'>calendar/cal-client/cal-client-types.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client-types.h?h=rel-0_6_2'>calendar/cal-client/cal-client-types.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client.c?h=rel-0_6_2'>calendar/cal-client/cal-client.c</a></td><td class='right'>2552</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-client.h?h=rel-0_6_2'>calendar/cal-client/cal-client.h</a></td><td class='right'>183</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-listener.c?h=rel-0_6_2'>calendar/cal-client/cal-listener.c</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-listener.h?h=rel-0_6_2'>calendar/cal-client/cal-listener.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-query.c?h=rel-0_6_2'>calendar/cal-client/cal-query.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/cal-query.h?h=rel-0_6_2'>calendar/cal-client/cal-query.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/client-test.c?h=rel-0_6_2'>calendar/cal-client/client-test.c</a></td><td class='right'>239</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/query-listener.c?h=rel-0_6_2'>calendar/cal-client/query-listener.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/query-listener.h?h=rel-0_6_2'>calendar/cal-client/query-listener.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-client/test.ics?h=rel-0_6_2'>calendar/cal-client/test.ics</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/.cvsignore?h=rel-0_6_2'>calendar/cal-util/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/Makefile.am?h=rel-0_6_2'>calendar/cal-util/Makefile.am</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-component.c?h=rel-0_6_2'>calendar/cal-util/cal-component.c</a></td><td class='right'>5214</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 12.0%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-component.h?h=rel-0_6_2'>calendar/cal-util/cal-component.h</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-recur.c?h=rel-0_6_2'>calendar/cal-util/cal-recur.c</a></td><td class='right'>3980</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-recur.h?h=rel-0_6_2'>calendar/cal-util/cal-recur.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-util.c?h=rel-0_6_2'>calendar/cal-util/cal-util.c</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/cal-util.h?h=rel-0_6_2'>calendar/cal-util/cal-util.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/test-recur.c?h=rel-0_6_2'>calendar/cal-util/test-recur.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/timeutil.c?h=rel-0_6_2'>calendar/cal-util/timeutil.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/timeutil.h?h=rel-0_6_2'>calendar/cal-util/timeutil.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/.cvsignore?h=rel-0_6_2'>calendar/conduits/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/Makefile.am?h=rel-0_6_2'>calendar/conduits/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/calendar/.cvsignore?h=rel-0_6_2'>calendar/conduits/calendar/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/calendar/Makefile.am?h=rel-0_6_2'>calendar/conduits/calendar/Makefile.am</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/calendar/calendar-conduit.c?h=rel-0_6_2'>calendar/conduits/calendar/calendar-conduit.c</a></td><td class='right'>1778</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/calendar/e-calendar.conduit.in?h=rel-0_6_2'>calendar/conduits/calendar/e-calendar.conduit.in</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/.cvsignore?h=rel-0_6_2'>calendar/conduits/todo/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/Makefile.am?h=rel-0_6_2'>calendar/conduits/todo/Makefile.am</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/e-todo.conduit.in?h=rel-0_6_2'>calendar/conduits/todo/e-todo.conduit.in</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/todo-conduit.c?h=rel-0_6_2'>calendar/conduits/todo/todo-conduit.c</a></td><td class='right'>1435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/.cvsignore?h=rel-0_6_2'>calendar/gui/.cvsignore</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/GNOME_Evolution_Calendar.oaf.in?h=rel-0_6_2'>calendar/gui/GNOME_Evolution_Calendar.oaf.in</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/Makefile.am?h=rel-0_6_2'>calendar/gui/Makefile.am</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/.cvsignore?h=rel-0_6_2'>calendar/gui/alarm-notify/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in?h=rel-0_6_2'>calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/Makefile.am?h=rel-0_6_2'>calendar/gui/alarm-notify/Makefile.am</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-notify-dialog.c?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-notify-dialog.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-notify-dialog.h?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-notify-dialog.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-notify.c?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-notify.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-notify.glade?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-notify.glade</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-notify.h?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-notify.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-queue.c?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-queue.c</a></td><td class='right'>1031</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm-queue.h?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm-queue.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm.c?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm.c</a></td><td class='right'>305</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/alarm.h?h=rel-0_6_2'>calendar/gui/alarm-notify/alarm.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/config-data.c?h=rel-0_6_2'>calendar/gui/alarm-notify/config-data.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/config-data.h?h=rel-0_6_2'>calendar/gui/alarm-notify/config-data.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/notify-main.c?h=rel-0_6_2'>calendar/gui/alarm-notify/notify-main.c</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/save.c?h=rel-0_6_2'>calendar/gui/alarm-notify/save.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/alarm-notify/save.h?h=rel-0_6_2'>calendar/gui/alarm-notify/save.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/cal-search-bar.c?h=rel-0_6_2'>calendar/gui/cal-search-bar.c</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/cal-search-bar.h?h=rel-0_6_2'>calendar/gui/cal-search-bar.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-commands.c?h=rel-0_6_2'>calendar/gui/calendar-commands.c</a></td><td class='right'>811</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-commands.h?h=rel-0_6_2'>calendar/gui/calendar-commands.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-component.c?h=rel-0_6_2'>calendar/gui/calendar-component.c</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-component.h?h=rel-0_6_2'>calendar/gui/calendar-component.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-config.c?h=rel-0_6_2'>calendar/gui/calendar-config.c</a></td><td class='right'>1203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-config.h?h=rel-0_6_2'>calendar/gui/calendar-config.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-model.c?h=rel-0_6_2'>calendar/gui/calendar-model.c</a></td><td class='right'>2465</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-model.h?h=rel-0_6_2'>calendar/gui/calendar-model.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-offline-handler.c?h=rel-0_6_2'>calendar/gui/calendar-offline-handler.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-offline-handler.h?h=rel-0_6_2'>calendar/gui/calendar-offline-handler.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-view-factory.c?h=rel-0_6_2'>calendar/gui/calendar-view-factory.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-view-factory.h?h=rel-0_6_2'>calendar/gui/calendar-view-factory.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-view.c?h=rel-0_6_2'>calendar/gui/calendar-view.c</a></td><td class='right'>316</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-view.h?h=rel-0_6_2'>calendar/gui/calendar-view.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/comp-editor-factory.c?h=rel-0_6_2'>calendar/gui/comp-editor-factory.c</a></td><td class='right'>714</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/comp-editor-factory.h?h=rel-0_6_2'>calendar/gui/comp-editor-factory.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/comp-util.c?h=rel-0_6_2'>calendar/gui/comp-util.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/comp-util.h?h=rel-0_6_2'>calendar/gui/comp-util.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/component-factory.c?h=rel-0_6_2'>calendar/gui/component-factory.c</a></td><td class='right'>729</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/component-factory.h?h=rel-0_6_2'>calendar/gui/component-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/config-control-factory.c?h=rel-0_6_2'>calendar/gui/config-control-factory.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/config-control-factory.h?h=rel-0_6_2'>calendar/gui/config-control-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/control-factory.c?h=rel-0_6_2'>calendar/gui/control-factory.c</a></td><td class='right'>267</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/control-factory.h?h=rel-0_6_2'>calendar/gui/control-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/.cvsignore?h=rel-0_6_2'>calendar/gui/dialogs/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/Makefile.am?h=rel-0_6_2'>calendar/gui/dialogs/Makefile.am</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-options.c?h=rel-0_6_2'>calendar/gui/dialogs/alarm-options.c</a></td><td class='right'>585</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-options.glade?h=rel-0_6_2'>calendar/gui/dialogs/alarm-options.glade</a></td><td class='right'>398</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-options.h?h=rel-0_6_2'>calendar/gui/dialogs/alarm-options.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-page.c?h=rel-0_6_2'>calendar/gui/dialogs/alarm-page.c</a></td><td class='right'>869</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/alarm-page.glade</a></td><td class='right'>381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-page.h?h=rel-0_6_2'>calendar/gui/dialogs/alarm-page.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/cal-prefs-dialog.c?h=rel-0_6_2'>calendar/gui/dialogs/cal-prefs-dialog.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/cal-prefs-dialog.glade?h=rel-0_6_2'>calendar/gui/dialogs/cal-prefs-dialog.glade</a></td><td class='right'>949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/cal-prefs-dialog.h?h=rel-0_6_2'>calendar/gui/dialogs/cal-prefs-dialog.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/cancel-comp.c?h=rel-0_6_2'>calendar/gui/dialogs/cancel-comp.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/cancel-comp.h?h=rel-0_6_2'>calendar/gui/dialogs/cancel-comp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/changed-comp.c?h=rel-0_6_2'>calendar/gui/dialogs/changed-comp.c</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/changed-comp.h?h=rel-0_6_2'>calendar/gui/dialogs/changed-comp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor-page.c?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor-page.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor-page.h?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor-page.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor-util.c?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor-util.c</a></td><td class='right'>590</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor-util.h?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor-util.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor.c?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor.c</a></td><td class='right'>1259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/comp-editor.h?h=rel-0_6_2'>calendar/gui/dialogs/comp-editor.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/delete-comp.c?h=rel-0_6_2'>calendar/gui/dialogs/delete-comp.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/delete-comp.h?h=rel-0_6_2'>calendar/gui/dialogs/delete-comp.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/e-delegate-dialog.c?h=rel-0_6_2'>calendar/gui/dialogs/e-delegate-dialog.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/e-delegate-dialog.glade?h=rel-0_6_2'>calendar/gui/dialogs/e-delegate-dialog.glade</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/e-delegate-dialog.h?h=rel-0_6_2'>calendar/gui/dialogs/e-delegate-dialog.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/event-editor.c?h=rel-0_6_2'>calendar/gui/dialogs/event-editor.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/event-editor.h?h=rel-0_6_2'>calendar/gui/dialogs/event-editor.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/event-page.c?h=rel-0_6_2'>calendar/gui/dialogs/event-page.c</a></td><td class='right'>1439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/event-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/event-page.glade</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/event-page.h?h=rel-0_6_2'>calendar/gui/dialogs/event-page.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/meeting-page.c?h=rel-0_6_2'>calendar/gui/dialogs/meeting-page.c</a></td><td class='right'>862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/meeting-page.etspec?h=rel-0_6_2'>calendar/gui/dialogs/meeting-page.etspec</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/meeting-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/meeting-page.glade</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/meeting-page.h?h=rel-0_6_2'>calendar/gui/dialogs/meeting-page.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/recurrence-page.c?h=rel-0_6_2'>calendar/gui/dialogs/recurrence-page.c</a></td><td class='right'>2446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/recurrence-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/recurrence-page.glade</a></td><td class='right'>602</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/recurrence-page.h?h=rel-0_6_2'>calendar/gui/dialogs/recurrence-page.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/save-comp.c?h=rel-0_6_2'>calendar/gui/dialogs/save-comp.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/save-comp.h?h=rel-0_6_2'>calendar/gui/dialogs/save-comp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/schedule-page.c?h=rel-0_6_2'>calendar/gui/dialogs/schedule-page.c</a></td><td class='right'>542</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/schedule-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/schedule-page.glade</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/schedule-page.h?h=rel-0_6_2'>calendar/gui/dialogs/schedule-page.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/send-comp.c?h=rel-0_6_2'>calendar/gui/dialogs/send-comp.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/send-comp.h?h=rel-0_6_2'>calendar/gui/dialogs/send-comp.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-details-page.c?h=rel-0_6_2'>calendar/gui/dialogs/task-details-page.c</a></td><td class='right'>772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-details-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/task-details-page.glade</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-details-page.h?h=rel-0_6_2'>calendar/gui/dialogs/task-details-page.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-editor.c?h=rel-0_6_2'>calendar/gui/dialogs/task-editor.c</a></td><td class='right'>405</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-editor.h?h=rel-0_6_2'>calendar/gui/dialogs/task-editor.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-page.c?h=rel-0_6_2'>calendar/gui/dialogs/task-page.c</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-page.glade?h=rel-0_6_2'>calendar/gui/dialogs/task-page.glade</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-page.h?h=rel-0_6_2'>calendar/gui/dialogs/task-page.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-calendar-table.c?h=rel-0_6_2'>calendar/gui/e-calendar-table.c</a></td><td class='right'>1345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-calendar-table.etspec?h=rel-0_6_2'>calendar/gui/e-calendar-table.etspec</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-calendar-table.h?h=rel-0_6_2'>calendar/gui/e-calendar-table.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-cell-date-edit-text.c?h=rel-0_6_2'>calendar/gui/e-cell-date-edit-text.c</a></td><td class='right'>235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-cell-date-edit-text.h?h=rel-0_6_2'>calendar/gui/e-cell-date-edit-text.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-layout.c?h=rel-0_6_2'>calendar/gui/e-day-view-layout.c</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-layout.h?h=rel-0_6_2'>calendar/gui/e-day-view-layout.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-main-item.c?h=rel-0_6_2'>calendar/gui/e-day-view-main-item.c</a></td><td class='right'>756</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-main-item.h?h=rel-0_6_2'>calendar/gui/e-day-view-main-item.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-time-item.c?h=rel-0_6_2'>calendar/gui/e-day-view-time-item.c</a></td><td class='right'>659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-time-item.h?h=rel-0_6_2'>calendar/gui/e-day-view-time-item.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-top-item.c?h=rel-0_6_2'>calendar/gui/e-day-view-top-item.c</a></td><td class='right'>695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-top-item.h?h=rel-0_6_2'>calendar/gui/e-day-view-top-item.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view.c?h=rel-0_6_2'>calendar/gui/e-day-view.c</a></td><td class='right'>7570</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.5%;'/><td class='none' style='width: 82.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view.h?h=rel-0_6_2'>calendar/gui/e-day-view.h</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-itip-control.c?h=rel-0_6_2'>calendar/gui/e-itip-control.c</a></td><td class='right'>2020</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.7%;'/><td class='none' style='width: 95.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-itip-control.glade?h=rel-0_6_2'>calendar/gui/e-itip-control.glade</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-itip-control.h?h=rel-0_6_2'>calendar/gui/e-itip-control.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-attendee.c?h=rel-0_6_2'>calendar/gui/e-meeting-attendee.c</a></td><td class='right'>990</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-attendee.h?h=rel-0_6_2'>calendar/gui/e-meeting-attendee.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-model.c?h=rel-0_6_2'>calendar/gui/e-meeting-model.c</a></td><td class='right'>1748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-model.h?h=rel-0_6_2'>calendar/gui/e-meeting-model.h</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-time-sel-item.c?h=rel-0_6_2'>calendar/gui/e-meeting-time-sel-item.c</a></td><td class='right'>1020</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-time-sel-item.h?h=rel-0_6_2'>calendar/gui/e-meeting-time-sel-item.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-time-sel.c?h=rel-0_6_2'>calendar/gui/e-meeting-time-sel.c</a></td><td class='right'>2884</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-time-sel.etspec?h=rel-0_6_2'>calendar/gui/e-meeting-time-sel.etspec</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-time-sel.h?h=rel-0_6_2'>calendar/gui/e-meeting-time-sel.h</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-types.h?h=rel-0_6_2'>calendar/gui/e-meeting-types.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-utils.c?h=rel-0_6_2'>calendar/gui/e-meeting-utils.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-utils.h?h=rel-0_6_2'>calendar/gui/e-meeting-utils.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-tasks.c?h=rel-0_6_2'>calendar/gui/e-tasks.c</a></td><td class='right'>831</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-tasks.h?h=rel-0_6_2'>calendar/gui/e-tasks.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-timezone-entry.c?h=rel-0_6_2'>calendar/gui/e-timezone-entry.c</a></td><td class='right'>387</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-timezone-entry.h?h=rel-0_6_2'>calendar/gui/e-timezone-entry.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-event-item.c?h=rel-0_6_2'>calendar/gui/e-week-view-event-item.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-event-item.h?h=rel-0_6_2'>calendar/gui/e-week-view-event-item.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-layout.c?h=rel-0_6_2'>calendar/gui/e-week-view-layout.c</a></td><td class='right'>425</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-layout.h?h=rel-0_6_2'>calendar/gui/e-week-view-layout.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-main-item.c?h=rel-0_6_2'>calendar/gui/e-week-view-main-item.c</a></td><td class='right'>401</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-main-item.h?h=rel-0_6_2'>calendar/gui/e-week-view-main-item.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-titles-item.c?h=rel-0_6_2'>calendar/gui/e-week-view-titles-item.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-titles-item.h?h=rel-0_6_2'>calendar/gui/e-week-view-titles-item.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view.c?h=rel-0_6_2'>calendar/gui/e-week-view.c</a></td><td class='right'>4379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view.h?h=rel-0_6_2'>calendar/gui/e-week-view.h</a></td><td class='right'>511</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gnome-cal.c?h=rel-0_6_2'>calendar/gui/gnome-cal.c</a></td><td class='right'>2893</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gnome-cal.h?h=rel-0_6_2'>calendar/gui/gnome-cal.h</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gnome-calendar-conduit.png?h=rel-0_6_2'>calendar/gui/gnome-calendar-conduit.png</a></td><td class='right'>bin</td><td class='graph'>3000 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/goto-dialog.glade?h=rel-0_6_2'>calendar/gui/goto-dialog.glade</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/goto.c?h=rel-0_6_2'>calendar/gui/goto.c</a></td><td class='right'>257</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/goto.h?h=rel-0_6_2'>calendar/gui/goto.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-bonobo-control.c?h=rel-0_6_2'>calendar/gui/itip-bonobo-control.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-bonobo-control.h?h=rel-0_6_2'>calendar/gui/itip-bonobo-control.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-control-factory.c?h=rel-0_6_2'>calendar/gui/itip-control-factory.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-control-factory.h?h=rel-0_6_2'>calendar/gui/itip-control-factory.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-utils.c?h=rel-0_6_2'>calendar/gui/itip-utils.c</a></td><td class='right'>820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/itip-utils.h?h=rel-0_6_2'>calendar/gui/itip-utils.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/main.c?h=rel-0_6_2'>calendar/gui/main.c</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/misc.c?h=rel-0_6_2'>calendar/gui/misc.c</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/misc.h?h=rel-0_6_2'>calendar/gui/misc.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/print.c?h=rel-0_6_2'>calendar/gui/print.c</a></td><td class='right'>2646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.1%;'/><td class='none' style='width: 93.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/print.h?h=rel-0_6_2'>calendar/gui/print.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tag-calendar.c?h=rel-0_6_2'>calendar/gui/tag-calendar.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tag-calendar.h?h=rel-0_6_2'>calendar/gui/tag-calendar.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-control-factory.c?h=rel-0_6_2'>calendar/gui/tasks-control-factory.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-control-factory.h?h=rel-0_6_2'>calendar/gui/tasks-control-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-control.c?h=rel-0_6_2'>calendar/gui/tasks-control.c</a></td><td class='right'>684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-control.h?h=rel-0_6_2'>calendar/gui/tasks-control.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-migrate.c?h=rel-0_6_2'>calendar/gui/tasks-migrate.c</a></td><td class='right'>307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/tasks-migrate.h?h=rel-0_6_2'>calendar/gui/tasks-migrate.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/weekday-picker.c?h=rel-0_6_2'>calendar/gui/weekday-picker.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/weekday-picker.h?h=rel-0_6_2'>calendar/gui/weekday-picker.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/idl/.cvsignore?h=rel-0_6_2'>calendar/idl/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/idl/Makefile.am?h=rel-0_6_2'>calendar/idl/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/idl/evolution-calendar.idl?h=rel-0_6_2'>calendar/idl/evolution-calendar.idl</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/.cvsignore?h=rel-0_6_2'>calendar/importers/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in?h=rel-0_6_2'>calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/Makefile.am?h=rel-0_6_2'>calendar/importers/Makefile.am</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/evolution-calendar-importer.h?h=rel-0_6_2'>calendar/importers/evolution-calendar-importer.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/icalendar-importer.c?h=rel-0_6_2'>calendar/importers/icalendar-importer.c</a></td><td class='right'>683</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/importers/main.c?h=rel-0_6_2'>calendar/importers/main.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/.cvsignore?h=rel-0_6_2'>calendar/pcs/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/Makefile.am?h=rel-0_6_2'>calendar/pcs/Makefile.am</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend-file.c?h=rel-0_6_2'>calendar/pcs/cal-backend-file.c</a></td><td class='right'>1949</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend-file.h?h=rel-0_6_2'>calendar/pcs/cal-backend-file.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend-util.c?h=rel-0_6_2'>calendar/pcs/cal-backend-util.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend-util.h?h=rel-0_6_2'>calendar/pcs/cal-backend-util.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend.c?h=rel-0_6_2'>calendar/pcs/cal-backend.c</a></td><td class='right'>849</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-backend.h?h=rel-0_6_2'>calendar/pcs/cal-backend.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-common.h?h=rel-0_6_2'>calendar/pcs/cal-common.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-factory.c?h=rel-0_6_2'>calendar/pcs/cal-factory.c</a></td><td class='right'>820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal-factory.h?h=rel-0_6_2'>calendar/pcs/cal-factory.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal.c?h=rel-0_6_2'>calendar/pcs/cal.c</a></td><td class='right'>871</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/cal.h?h=rel-0_6_2'>calendar/pcs/cal.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/job.c?h=rel-0_6_2'>calendar/pcs/job.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/job.h?h=rel-0_6_2'>calendar/pcs/job.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/query.c?h=rel-0_6_2'>calendar/pcs/query.c</a></td><td class='right'>1449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/pcs/query.h?h=rel-0_6_2'>calendar/pcs/query.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/zones.h?h=rel-0_6_2'>calendar/zones.h</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/.cvsignore?h=rel-0_6_2'>camel/.cvsignore</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/CODING.STYLE?h=rel-0_6_2'>camel/CODING.STYLE</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/ChangeLog?h=rel-0_6_2'>camel/ChangeLog</a></td><td class='right'>18330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 42.3%;'/><td class='none' style='width: 57.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/Makefile.am?h=rel-0_6_2'>camel/Makefile.am</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/README?h=rel-0_6_2'>camel/README</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/README.COPYRIGHT?h=rel-0_6_2'>camel/README.COPYRIGHT</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/README.HACKING?h=rel-0_6_2'>camel/README.HACKING</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/README.mt?h=rel-0_6_2'>camel/README.mt</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/broken-date-parser.c?h=rel-0_6_2'>camel/broken-date-parser.c</a></td><td class='right'>521</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/broken-date-parser.h?h=rel-0_6_2'>camel/broken-date-parser.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-address.c?h=rel-0_6_2'>camel/camel-address.c</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-address.h?h=rel-0_6_2'>camel/camel-address.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-arg.c?h=rel-0_6_2'>camel/camel-arg.c</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-arg.h?h=rel-0_6_2'>camel/camel-arg.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-block-file.c?h=rel-0_6_2'>camel/camel-block-file.c</a></td><td class='right'>1138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-block-file.h?h=rel-0_6_2'>camel/camel-block-file.h</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-charset-map-private.h?h=rel-0_6_2'>camel/camel-charset-map-private.h</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-charset-map.c?h=rel-0_6_2'>camel/camel-charset-map.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-charset-map.h?h=rel-0_6_2'>camel/camel-charset-map.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-cipher-context.c?h=rel-0_6_2'>camel/camel-cipher-context.c</a></td><td class='right'>448</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-cipher-context.h?h=rel-0_6_2'>camel/camel-cipher-context.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-cms-context.c?h=rel-0_6_2'>camel/camel-cms-context.c</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-cms-context.h?h=rel-0_6_2'>camel/camel-cms-context.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-cache.c?h=rel-0_6_2'>camel/camel-data-cache.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-cache.h?h=rel-0_6_2'>camel/camel-data-cache.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-wrapper.c?h=rel-0_6_2'>camel/camel-data-wrapper.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-wrapper.h?h=rel-0_6_2'>camel/camel-data-wrapper.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-digest-folder.c?h=rel-0_6_2'>camel/camel-digest-folder.c</a></td><td class='right'>348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-digest-folder.h?h=rel-0_6_2'>camel/camel-digest-folder.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-digest-store.c?h=rel-0_6_2'>camel/camel-digest-store.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-digest-store.h?h=rel-0_6_2'>camel/camel-digest-store.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-diary.c?h=rel-0_6_2'>camel/camel-disco-diary.c</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-diary.h?h=rel-0_6_2'>camel/camel-disco-diary.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-folder.c?h=rel-0_6_2'>camel/camel-disco-folder.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-folder.h?h=rel-0_6_2'>camel/camel-disco-folder.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-store.c?h=rel-0_6_2'>camel/camel-disco-store.c</a></td><td class='right'>371</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-disco-store.h?h=rel-0_6_2'>camel/camel-disco-store.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-exception-list.def?h=rel-0_6_2'>camel/camel-exception-list.def</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-exception.c?h=rel-0_6_2'>camel/camel-exception.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-exception.h?h=rel-0_6_2'>camel/camel-exception.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-file-utils.c?h=rel-0_6_2'>camel/camel-file-utils.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-file-utils.h?h=rel-0_6_2'>camel/camel-file-utils.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-filter-driver.c?h=rel-0_6_2'>camel/camel-filter-driver.c</a></td><td class='right'>1265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-filter-driver.h?h=rel-0_6_2'>camel/camel-filter-driver.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-filter-search.c?h=rel-0_6_2'>camel/camel-filter-search.c</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-filter-search.h?h=rel-0_6_2'>camel/camel-filter-search.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-search.c?h=rel-0_6_2'>camel/camel-folder-search.c</a></td><td class='right'>1159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-search.h?h=rel-0_6_2'>camel/camel-folder-search.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-summary.c?h=rel-0_6_2'>camel/camel-folder-summary.c</a></td><td class='right'>2748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-summary.h?h=rel-0_6_2'>camel/camel-folder-summary.h</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-thread.c?h=rel-0_6_2'>camel/camel-folder-thread.c</a></td><td class='right'>783</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder-thread.h?h=rel-0_6_2'>camel/camel-folder-thread.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder.c?h=rel-0_6_2'>camel/camel-folder.c</a></td><td class='right'>1993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-folder.h?h=rel-0_6_2'>camel/camel-folder.h</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-html-parser.c?h=rel-0_6_2'>camel/camel-html-parser.c</a></td><td class='right'>807</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-html-parser.h?h=rel-0_6_2'>camel/camel-html-parser.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-http-stream.c?h=rel-0_6_2'>camel/camel-http-stream.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-http-stream.h?h=rel-0_6_2'>camel/camel-http-stream.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-index-control.c?h=rel-0_6_2'>camel/camel-index-control.c</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-index.c?h=rel-0_6_2'>camel/camel-index.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-index.h?h=rel-0_6_2'>camel/camel-index.h</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-internet-address.c?h=rel-0_6_2'>camel/camel-internet-address.c</a></td><td class='right'>510</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-internet-address.h?h=rel-0_6_2'>camel/camel-internet-address.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock-client.c?h=rel-0_6_2'>camel/camel-lock-client.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock-client.h?h=rel-0_6_2'>camel/camel-lock-client.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock-helper.c?h=rel-0_6_2'>camel/camel-lock-helper.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock-helper.h?h=rel-0_6_2'>camel/camel-lock-helper.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock.c?h=rel-0_6_2'>camel/camel-lock.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-lock.h?h=rel-0_6_2'>camel/camel-lock.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-medium.c?h=rel-0_6_2'>camel/camel-medium.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-medium.h?h=rel-0_6_2'>camel/camel-medium.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-basic.c?h=rel-0_6_2'>camel/camel-mime-filter-basic.c</a></td><td class='right'>291</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-basic.h?h=rel-0_6_2'>camel/camel-mime-filter-basic.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-bestenc.c?h=rel-0_6_2'>camel/camel-mime-filter-bestenc.c</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-bestenc.h?h=rel-0_6_2'>camel/camel-mime-filter-bestenc.h</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-charset.c?h=rel-0_6_2'>camel/camel-mime-filter-charset.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-charset.h?h=rel-0_6_2'>camel/camel-mime-filter-charset.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-chomp.c?h=rel-0_6_2'>camel/camel-mime-filter-chomp.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-chomp.h?h=rel-0_6_2'>camel/camel-mime-filter-chomp.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-crlf.c?h=rel-0_6_2'>camel/camel-mime-filter-crlf.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-crlf.h?h=rel-0_6_2'>camel/camel-mime-filter-crlf.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-from.c?h=rel-0_6_2'>camel/camel-mime-filter-from.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-from.h?h=rel-0_6_2'>camel/camel-mime-filter-from.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-html.c?h=rel-0_6_2'>camel/camel-mime-filter-html.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-html.h?h=rel-0_6_2'>camel/camel-mime-filter-html.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-index.c?h=rel-0_6_2'>camel/camel-mime-filter-index.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-index.h?h=rel-0_6_2'>camel/camel-mime-filter-index.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-linewrap.c?h=rel-0_6_2'>camel/camel-mime-filter-linewrap.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-linewrap.h?h=rel-0_6_2'>camel/camel-mime-filter-linewrap.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-save.c?h=rel-0_6_2'>camel/camel-mime-filter-save.c</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-save.h?h=rel-0_6_2'>camel/camel-mime-filter-save.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-tohtml.c?h=rel-0_6_2'>camel/camel-mime-filter-tohtml.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-tohtml.h?h=rel-0_6_2'>camel/camel-mime-filter-tohtml.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter.c?h=rel-0_6_2'>camel/camel-mime-filter.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter.h?h=rel-0_6_2'>camel/camel-mime-filter.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-message.c?h=rel-0_6_2'>camel/camel-mime-message.c</a></td><td class='right'>908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-message.h?h=rel-0_6_2'>camel/camel-mime-message.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-parser.c?h=rel-0_6_2'>camel/camel-mime-parser.c</a></td><td class='right'>1986</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-parser.h?h=rel-0_6_2'>camel/camel-mime-parser.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-part-utils.c?h=rel-0_6_2'>camel/camel-mime-part-utils.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-part-utils.h?h=rel-0_6_2'>camel/camel-mime-part-utils.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-part.c?h=rel-0_6_2'>camel/camel-mime-part.c</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-part.h?h=rel-0_6_2'>camel/camel-mime-part.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-utils.c?h=rel-0_6_2'>camel/camel-mime-utils.c</a></td><td class='right'>4224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.8%;'/><td class='none' style='width: 90.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-utils.h?h=rel-0_6_2'>camel/camel-mime-utils.h</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-movemail.c?h=rel-0_6_2'>camel/camel-movemail.c</a></td><td class='right'>543</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-movemail.h?h=rel-0_6_2'>camel/camel-movemail.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-multipart.c?h=rel-0_6_2'>camel/camel-multipart.c</a></td><td class='right'>541</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-multipart.h?h=rel-0_6_2'>camel/camel-multipart.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-news-address.c?h=rel-0_6_2'>camel/camel-news-address.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-news-address.h?h=rel-0_6_2'>camel/camel-news-address.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-object.c?h=rel-0_6_2'>camel/camel-object.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-object.h?h=rel-0_6_2'>camel/camel-object.h</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-operation.c?h=rel-0_6_2'>camel/camel-operation.c</a></td><td class='right'>676</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-operation.h?h=rel-0_6_2'>camel/camel-operation.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-partition-table.c?h=rel-0_6_2'>camel/camel-partition-table.c</a></td><td class='right'>1015</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-partition-table.h?h=rel-0_6_2'>camel/camel-partition-table.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pgp-context.c?h=rel-0_6_2'>camel/camel-pgp-context.c</a></td><td class='right'>1478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pgp-context.h?h=rel-0_6_2'>camel/camel-pgp-context.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pgp-mime.c?h=rel-0_6_2'>camel/camel-pgp-mime.c</a></td><td class='right'>607</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pgp-mime.h?h=rel-0_6_2'>camel/camel-pgp-mime.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pkcs7-context.c?h=rel-0_6_2'>camel/camel-pkcs7-context.c</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-pkcs7-context.h?h=rel-0_6_2'>camel/camel-pkcs7-context.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-private.h?h=rel-0_6_2'>camel/camel-private.h</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-provider.c?h=rel-0_6_2'>camel/camel-provider.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-provider.h?h=rel-0_6_2'>camel/camel-provider.h</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-remote-store.c?h=rel-0_6_2'>camel/camel-remote-store.c</a></td><td class='right'>634</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-remote-store.h?h=rel-0_6_2'>camel/camel-remote-store.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-anonymous.c?h=rel-0_6_2'>camel/camel-sasl-anonymous.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-anonymous.h?h=rel-0_6_2'>camel/camel-sasl-anonymous.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-cram-md5.c?h=rel-0_6_2'>camel/camel-sasl-cram-md5.c</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-cram-md5.h?h=rel-0_6_2'>camel/camel-sasl-cram-md5.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-digest-md5.c?h=rel-0_6_2'>camel/camel-sasl-digest-md5.c</a></td><td class='right'>895</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-digest-md5.h?h=rel-0_6_2'>camel/camel-sasl-digest-md5.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-kerberos4.c?h=rel-0_6_2'>camel/camel-sasl-kerberos4.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-kerberos4.h?h=rel-0_6_2'>camel/camel-sasl-kerberos4.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-login.c?h=rel-0_6_2'>camel/camel-sasl-login.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-login.h?h=rel-0_6_2'>camel/camel-sasl-login.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-ntlm.c?h=rel-0_6_2'>camel/camel-sasl-ntlm.c</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-ntlm.h?h=rel-0_6_2'>camel/camel-sasl-ntlm.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-plain.c?h=rel-0_6_2'>camel/camel-sasl-plain.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-plain.h?h=rel-0_6_2'>camel/camel-sasl-plain.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-popb4smtp.c?h=rel-0_6_2'>camel/camel-sasl-popb4smtp.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl-popb4smtp.h?h=rel-0_6_2'>camel/camel-sasl-popb4smtp.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl.c?h=rel-0_6_2'>camel/camel-sasl.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-sasl.h?h=rel-0_6_2'>camel/camel-sasl.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-search-private.c?h=rel-0_6_2'>camel/camel-search-private.c</a></td><td class='right'>648</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-search-private.h?h=rel-0_6_2'>camel/camel-search-private.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-seekable-stream.c?h=rel-0_6_2'>camel/camel-seekable-stream.c</a></td><td class='right'>202</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-seekable-stream.h?h=rel-0_6_2'>camel/camel-seekable-stream.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-seekable-substream.c?h=rel-0_6_2'>camel/camel-seekable-substream.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-seekable-substream.h?h=rel-0_6_2'>camel/camel-seekable-substream.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-service.c?h=rel-0_6_2'>camel/camel-service.c</a></td><td class='right'>937</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-service.h?h=rel-0_6_2'>camel/camel-service.h</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-session.c?h=rel-0_6_2'>camel/camel-session.c</a></td><td class='right'>900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-session.h?h=rel-0_6_2'>camel/camel-session.h</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-smime-context.c?h=rel-0_6_2'>camel/camel-smime-context.c</a></td><td class='right'>953</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-smime-context.h?h=rel-0_6_2'>camel/camel-smime-context.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-smime-utils.c?h=rel-0_6_2'>camel/camel-smime-utils.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-smime-utils.h?h=rel-0_6_2'>camel/camel-smime-utils.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-store-summary.c?h=rel-0_6_2'>camel/camel-store-summary.c</a></td><td class='right'>899</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-store-summary.h?h=rel-0_6_2'>camel/camel-store-summary.h</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-store.c?h=rel-0_6_2'>camel/camel-store.c</a></td><td class='right'>1150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-store.h?h=rel-0_6_2'>camel/camel-store.h</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-buffer.c?h=rel-0_6_2'>camel/camel-stream-buffer.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-buffer.h?h=rel-0_6_2'>camel/camel-stream-buffer.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-filter.c?h=rel-0_6_2'>camel/camel-stream-filter.c</a></td><td class='right'>383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-filter.h?h=rel-0_6_2'>camel/camel-stream-filter.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-fs.c?h=rel-0_6_2'>camel/camel-stream-fs.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-fs.h?h=rel-0_6_2'>camel/camel-stream-fs.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-mem.c?h=rel-0_6_2'>camel/camel-stream-mem.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-mem.h?h=rel-0_6_2'>camel/camel-stream-mem.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-null.c?h=rel-0_6_2'>camel/camel-stream-null.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-null.h?h=rel-0_6_2'>camel/camel-stream-null.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream.c?h=rel-0_6_2'>camel/camel-stream.c</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream.h?h=rel-0_6_2'>camel/camel-stream.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream-openssl.c?h=rel-0_6_2'>camel/camel-tcp-stream-openssl.c</a></td><td class='right'>821</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream-raw.c?h=rel-0_6_2'>camel/camel-tcp-stream-raw.c</a></td><td class='right'>614</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream-raw.h?h=rel-0_6_2'>camel/camel-tcp-stream-raw.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream-ssl.c?h=rel-0_6_2'>camel/camel-tcp-stream-ssl.c</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream-ssl.h?h=rel-0_6_2'>camel/camel-tcp-stream-ssl.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream.c?h=rel-0_6_2'>camel/camel-tcp-stream.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-tcp-stream.h?h=rel-0_6_2'>camel/camel-tcp-stream.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-text-index.c?h=rel-0_6_2'>camel/camel-text-index.c</a></td><td class='right'>1935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-text-index.h?h=rel-0_6_2'>camel/camel-text-index.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-transport.c?h=rel-0_6_2'>camel/camel-transport.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-transport.h?h=rel-0_6_2'>camel/camel-transport.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-types.h?h=rel-0_6_2'>camel/camel-types.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-uid-cache.c?h=rel-0_6_2'>camel/camel-uid-cache.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-uid-cache.h?h=rel-0_6_2'>camel/camel-uid-cache.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-url.c?h=rel-0_6_2'>camel/camel-url.c</a></td><td class='right'>553</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-url.h?h=rel-0_6_2'>camel/camel-url.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vee-folder.c?h=rel-0_6_2'>camel/camel-vee-folder.c</a></td><td class='right'>1532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vee-folder.h?h=rel-0_6_2'>camel/camel-vee-folder.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vee-store.c?h=rel-0_6_2'>camel/camel-vee-store.c</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vee-store.h?h=rel-0_6_2'>camel/camel-vee-store.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vtrash-folder.c?h=rel-0_6_2'>camel/camel-vtrash-folder.c</a></td><td class='right'>210</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-vtrash-folder.h?h=rel-0_6_2'>camel/camel-vtrash-folder.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel.c?h=rel-0_6_2'>camel/camel.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel.h?h=rel-0_6_2'>camel/camel.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/devel-docs/camel-index.txt?h=rel-0_6_2'>camel/devel-docs/camel-index.txt</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/devel-docs/camel_data_wrapper.dia?h=rel-0_6_2'>camel/devel-docs/camel_data_wrapper.dia</a></td><td class='right'>bin</td><td class='graph'>3062 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/devel-docs/camel_parser_states.dia?h=rel-0_6_2'>camel/devel-docs/camel_parser_states.dia</a></td><td class='right'>bin</td><td class='graph'>2505 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/devel-docs/camel_stream.dia?h=rel-0_6_2'>camel/devel-docs/camel_stream.dia</a></td><td class='right'>bin</td><td class='graph'>2669 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/gstring-util.c?h=rel-0_6_2'>camel/gstring-util.c</a></td><td class='right'>216</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/gstring-util.h?h=rel-0_6_2'>camel/gstring-util.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/hash-table-utils.c?h=rel-0_6_2'>camel/hash-table-utils.c</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/hash-table-utils.h?h=rel-0_6_2'>camel/hash-table-utils.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/.cvsignore?h=rel-0_6_2'>camel/providers/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/Makefile.am?h=rel-0_6_2'>camel/providers/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/.cvsignore?h=rel-0_6_2'>camel/providers/imap/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/Makefile.am?h=rel-0_6_2'>camel/providers/imap/Makefile.am</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-command.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-command.c</a></td><td class='right'>798</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-command.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-command.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-folder.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-folder.c</a></td><td class='right'>2381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-folder.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-folder.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-message-cache.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-message-cache.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-message-cache.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-message-cache.h</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-private.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-private.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-provider.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-provider.c</a></td><td class='right'>150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-search.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-search.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-search.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-search.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-store.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-store.c</a></td><td class='right'>1991</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-store.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-store.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-summary.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-summary.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-summary.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-summary.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-types.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-types.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-utils.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-utils.c</a></td><td class='right'>1164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-utils.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-utils.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-wrapper.c?h=rel-0_6_2'>camel/providers/imap/camel-imap-wrapper.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-wrapper.h?h=rel-0_6_2'>camel/providers/imap/camel-imap-wrapper.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/libcamelimap.urls?h=rel-0_6_2'>camel/providers/imap/libcamelimap.urls</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/.cvsignore?h=rel-0_6_2'>camel/providers/local/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/Makefile.am?h=rel-0_6_2'>camel/providers/local/Makefile.am</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-folder.c?h=rel-0_6_2'>camel/providers/local/camel-local-folder.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-folder.h?h=rel-0_6_2'>camel/providers/local/camel-local-folder.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-private.h?h=rel-0_6_2'>camel/providers/local/camel-local-private.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-provider.c?h=rel-0_6_2'>camel/providers/local/camel-local-provider.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-store.c?h=rel-0_6_2'>camel/providers/local/camel-local-store.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-store.h?h=rel-0_6_2'>camel/providers/local/camel-local-store.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-summary.c?h=rel-0_6_2'>camel/providers/local/camel-local-summary.c</a></td><td class='right'>583</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-local-summary.h?h=rel-0_6_2'>camel/providers/local/camel-local-summary.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-folder.c?h=rel-0_6_2'>camel/providers/local/camel-maildir-folder.c</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-folder.h?h=rel-0_6_2'>camel/providers/local/camel-maildir-folder.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-store.c?h=rel-0_6_2'>camel/providers/local/camel-maildir-store.c</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-store.h?h=rel-0_6_2'>camel/providers/local/camel-maildir-store.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-summary.c?h=rel-0_6_2'>camel/providers/local/camel-maildir-summary.c</a></td><td class='right'>792</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-maildir-summary.h?h=rel-0_6_2'>camel/providers/local/camel-maildir-summary.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-folder.c?h=rel-0_6_2'>camel/providers/local/camel-mbox-folder.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-folder.h?h=rel-0_6_2'>camel/providers/local/camel-mbox-folder.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-store.c?h=rel-0_6_2'>camel/providers/local/camel-mbox-store.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-store.h?h=rel-0_6_2'>camel/providers/local/camel-mbox-store.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-summary.c?h=rel-0_6_2'>camel/providers/local/camel-mbox-summary.c</a></td><td class='right'>886</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mbox-summary.h?h=rel-0_6_2'>camel/providers/local/camel-mbox-summary.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-folder.c?h=rel-0_6_2'>camel/providers/local/camel-mh-folder.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-folder.h?h=rel-0_6_2'>camel/providers/local/camel-mh-folder.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-store.c?h=rel-0_6_2'>camel/providers/local/camel-mh-store.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-store.h?h=rel-0_6_2'>camel/providers/local/camel-mh-store.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-summary.c?h=rel-0_6_2'>camel/providers/local/camel-mh-summary.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-mh-summary.h?h=rel-0_6_2'>camel/providers/local/camel-mh-summary.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-folder.c?h=rel-0_6_2'>camel/providers/local/camel-spool-folder.c</a></td><td class='right'>701</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-folder.h?h=rel-0_6_2'>camel/providers/local/camel-spool-folder.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-store.c?h=rel-0_6_2'>camel/providers/local/camel-spool-store.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-store.h?h=rel-0_6_2'>camel/providers/local/camel-spool-store.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-summary.c?h=rel-0_6_2'>camel/providers/local/camel-spool-summary.c</a></td><td class='right'>1288</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spool-summary.h?h=rel-0_6_2'>camel/providers/local/camel-spool-summary.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spoold-store.c?h=rel-0_6_2'>camel/providers/local/camel-spoold-store.c</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/camel-spoold-store.h?h=rel-0_6_2'>camel/providers/local/camel-spoold-store.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/local/libcamellocal.urls?h=rel-0_6_2'>camel/providers/local/libcamellocal.urls</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/.cvsignore?h=rel-0_6_2'>camel/providers/nntp/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/Makefile.am?h=rel-0_6_2'>camel/providers/nntp/Makefile.am</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-auth.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-auth.c</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-auth.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-auth.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-folder.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-folder.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-folder.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-folder.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-grouplist.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-grouplist.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-grouplist.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-grouplist.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-newsrc.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-newsrc.c</a></td><td class='right'>655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-newsrc.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-newsrc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-private.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-private.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-provider.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-provider.c</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-resp-codes.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-resp-codes.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-store.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-store.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-store.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-store.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-stream.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-stream.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-stream.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-stream.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-summary.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-summary.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-summary.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-summary.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-types.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-types.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-utils.c?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-utils.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-utils.h?h=rel-0_6_2'>camel/providers/nntp/camel-nntp-utils.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/libcamelnntp.urls?h=rel-0_6_2'>camel/providers/nntp/libcamelnntp.urls</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/test-newsrc.c?h=rel-0_6_2'>camel/providers/nntp/test-newsrc.c</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/.cvsignore?h=rel-0_6_2'>camel/providers/pop3/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/Makefile.am?h=rel-0_6_2'>camel/providers/pop3/Makefile.am</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-engine.c?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-engine.c</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-engine.h?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-engine.h</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-folder.c?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-folder.c</a></td><td class='right'>569</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-folder.h?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-folder.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-provider.c?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-provider.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-store.c?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-store.c</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-store.h?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-store.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-stream.c?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-stream.c</a></td><td class='right'>468</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-stream.h?h=rel-0_6_2'>camel/providers/pop3/camel-pop3-stream.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/libcamelpop3.urls?h=rel-0_6_2'>camel/providers/pop3/libcamelpop3.urls</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/.cvsignore?h=rel-0_6_2'>camel/providers/sendmail/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/Makefile.am?h=rel-0_6_2'>camel/providers/sendmail/Makefile.am</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/camel-sendmail-provider.c?h=rel-0_6_2'>camel/providers/sendmail/camel-sendmail-provider.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/camel-sendmail-transport.c?h=rel-0_6_2'>camel/providers/sendmail/camel-sendmail-transport.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/camel-sendmail-transport.h?h=rel-0_6_2'>camel/providers/sendmail/camel-sendmail-transport.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/sendmail/libcamelsendmail.urls?h=rel-0_6_2'>camel/providers/sendmail/libcamelsendmail.urls</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/.cvsignore?h=rel-0_6_2'>camel/providers/smtp/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/Makefile.am?h=rel-0_6_2'>camel/providers/smtp/Makefile.am</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/camel-smtp-provider.c?h=rel-0_6_2'>camel/providers/smtp/camel-smtp-provider.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/camel-smtp-transport.c?h=rel-0_6_2'>camel/providers/smtp/camel-smtp-transport.c</a></td><td class='right'>1325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/camel-smtp-transport.h?h=rel-0_6_2'>camel/providers/smtp/camel-smtp-transport.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/smtp/libcamelsmtp.urls?h=rel-0_6_2'>camel/providers/smtp/libcamelsmtp.urls</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/string-utils.c?h=rel-0_6_2'>camel/string-utils.c</a></td><td class='right'>232</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/string-utils.h?h=rel-0_6_2'>camel/string-utils.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/.cvsignore?h=rel-0_6_2'>camel/tests/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/Makefile.am?h=rel-0_6_2'>camel/tests/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/README?h=rel-0_6_2'>camel/tests/README</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/data/gendoc.pl?h=rel-0_6_2'>camel/tests/data/gendoc.pl</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/data/genline.pl?h=rel-0_6_2'>camel/tests/data/genline.pl</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/data/getaddr.pl?h=rel-0_6_2'>camel/tests/data/getaddr.pl</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/.cvsignore?h=rel-0_6_2'>camel/tests/folder/.cvsignore</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/Makefile.am?h=rel-0_6_2'>camel/tests/folder/Makefile.am</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/README?h=rel-0_6_2'>camel/tests/folder/README</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test1.c?h=rel-0_6_2'>camel/tests/folder/test1.c</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test2.c?h=rel-0_6_2'>camel/tests/folder/test2.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test3.c?h=rel-0_6_2'>camel/tests/folder/test3.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test4.c?h=rel-0_6_2'>camel/tests/folder/test4.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test5.c?h=rel-0_6_2'>camel/tests/folder/test5.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test6.c?h=rel-0_6_2'>camel/tests/folder/test6.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test7.c?h=rel-0_6_2'>camel/tests/folder/test7.c</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test8.c?h=rel-0_6_2'>camel/tests/folder/test8.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/folder/test9.c?h=rel-0_6_2'>camel/tests/folder/test9.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/.cvsignore?h=rel-0_6_2'>camel/tests/lib/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/Makefile.am?h=rel-0_6_2'>camel/tests/lib/Makefile.am</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/address-data.h?h=rel-0_6_2'>camel/tests/lib/address-data.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/addresses.c?h=rel-0_6_2'>camel/tests/lib/addresses.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/addresses.h?h=rel-0_6_2'>camel/tests/lib/addresses.h</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/camel-test.c?h=rel-0_6_2'>camel/tests/lib/camel-test.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/camel-test.h?h=rel-0_6_2'>camel/tests/lib/camel-test.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/folders.c?h=rel-0_6_2'>camel/tests/lib/folders.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/folders.h?h=rel-0_6_2'>camel/tests/lib/folders.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/messages.c?h=rel-0_6_2'>camel/tests/lib/messages.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/messages.h?h=rel-0_6_2'>camel/tests/lib/messages.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/session.c?h=rel-0_6_2'>camel/tests/lib/session.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/session.h?h=rel-0_6_2'>camel/tests/lib/session.h</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/streams.c?h=rel-0_6_2'>camel/tests/lib/streams.c</a></td><td class='right'>244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/lib/streams.h?h=rel-0_6_2'>camel/tests/lib/streams.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/.cvsignore?h=rel-0_6_2'>camel/tests/message/.cvsignore</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/Makefile.am?h=rel-0_6_2'>camel/tests/message/Makefile.am</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/README?h=rel-0_6_2'>camel/tests/message/README</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/test1.c?h=rel-0_6_2'>camel/tests/message/test1.c</a></td><td class='right'>200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/test2.c?h=rel-0_6_2'>camel/tests/message/test2.c</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/message/test3.c?h=rel-0_6_2'>camel/tests/message/test3.c</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/.cvsignore?h=rel-0_6_2'>camel/tests/mime-filter/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/Makefile.am?h=rel-0_6_2'>camel/tests/mime-filter/Makefile.am</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/crlf-1.in?h=rel-0_6_2'>camel/tests/mime-filter/crlf-1.in</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/crlf-1.out?h=rel-0_6_2'>camel/tests/mime-filter/crlf-1.out</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-1.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-1.in</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-1.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-1.out</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-2.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-2.in</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-2.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-2.out</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-3.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-3.in</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-3.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-3.out</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-4.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-4.in</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-4.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-4.out</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-5.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-5.in</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-5.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-5.out</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-6.in?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-6.in</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/stripheader-6.out?h=rel-0_6_2'>camel/tests/mime-filter/stripheader-6.out</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/test-crlf.c?h=rel-0_6_2'>camel/tests/mime-filter/test-crlf.c</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/mime-filter/test-stripheader.c?h=rel-0_6_2'>camel/tests/mime-filter/test-stripheader.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/misc/.cvsignore?h=rel-0_6_2'>camel/tests/misc/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/misc/Makefile.am?h=rel-0_6_2'>camel/tests/misc/Makefile.am</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/misc/README?h=rel-0_6_2'>camel/tests/misc/README</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/misc/url.c?h=rel-0_6_2'>camel/tests/misc/url.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/.cvsignore?h=rel-0_6_2'>camel/tests/smime/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/Makefile.am?h=rel-0_6_2'>camel/tests/smime/Makefile.am</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/README?h=rel-0_6_2'>camel/tests/smime/README</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/pgp-mime.c?h=rel-0_6_2'>camel/tests/smime/pgp-mime.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/pgp.c?h=rel-0_6_2'>camel/tests/smime/pgp.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/smime/pkcs7.c?h=rel-0_6_2'>camel/tests/smime/pkcs7.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/.cvsignore?h=rel-0_6_2'>camel/tests/stream/.cvsignore</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/Makefile.am?h=rel-0_6_2'>camel/tests/stream/Makefile.am</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/README?h=rel-0_6_2'>camel/tests/stream/README</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/test1.c?h=rel-0_6_2'>camel/tests/stream/test1.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/test2.c?h=rel-0_6_2'>camel/tests/stream/test2.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/tests/stream/test3.c?h=rel-0_6_2'>camel/tests/stream/test3.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/.cvsignore?h=rel-0_6_2'>composer/.cvsignore</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/ChangeLog?h=rel-0_6_2'>composer/ChangeLog</a></td><td class='right'>2898</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/Composer.idl?h=rel-0_6_2'>composer/Composer.idl</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/Evolution-Composer.idl?h=rel-0_6_2'>composer/Evolution-Composer.idl</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/Makefile.am?h=rel-0_6_2'>composer/Makefile.am</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/bad-icon.xpm?h=rel-0_6_2'>composer/bad-icon.xpm</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-icon-list.c?h=rel-0_6_2'>composer/e-icon-list.c</a></td><td class='right'>2675</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-icon-list.h?h=rel-0_6_2'>composer/e-icon-list.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment-bar.c?h=rel-0_6_2'>composer/e-msg-composer-attachment-bar.c</a></td><td class='right'>825</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment-bar.h?h=rel-0_6_2'>composer/e-msg-composer-attachment-bar.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment.c?h=rel-0_6_2'>composer/e-msg-composer-attachment.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment.glade?h=rel-0_6_2'>composer/e-msg-composer-attachment.glade</a></td><td class='right'>280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment.h?h=rel-0_6_2'>composer/e-msg-composer-attachment.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-hdrs.c?h=rel-0_6_2'>composer/e-msg-composer-hdrs.c</a></td><td class='right'>1104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-hdrs.h?h=rel-0_6_2'>composer/e-msg-composer-hdrs.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-select-file.c?h=rel-0_6_2'>composer/e-msg-composer-select-file.c</a></td><td class='right'>268</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-select-file.h?h=rel-0_6_2'>composer/e-msg-composer-select-file.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer.c?h=rel-0_6_2'>composer/e-msg-composer.c</a></td><td class='right'>4323</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.0%;'/><td class='none' style='width: 90.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer.h?h=rel-0_6_2'>composer/e-msg-composer.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/evolution-composer.c?h=rel-0_6_2'>composer/evolution-composer.c</a></td><td class='right'>397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/evolution-composer.h?h=rel-0_6_2'>composer/evolution-composer.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/listener.c?h=rel-0_6_2'>composer/listener.c</a></td><td class='right'>346</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/listener.h?h=rel-0_6_2'>composer/listener.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/configure.in?h=rel-0_6_2'>configure.in</a></td><td class='right'>1366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/.cvsignore?h=rel-0_6_2'>data/.cvsignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/Makefile.am?h=rel-0_6_2'>data/Makefile.am</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/evolution.1?h=rel-0_6_2'>data/evolution.1</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/evolution.desktop.in?h=rel-0_6_2'>data/evolution.desktop.in</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/evolution.keys.in?h=rel-0_6_2'>data/evolution.keys.in</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/evolution.mime?h=rel-0_6_2'>data/evolution.mime</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/.cvsignore?h=rel-0_6_2'>default_user/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/ChangeLog?h=rel-0_6_2'>default_user/ChangeLog</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/Makefile.am?h=rel-0_6_2'>default_user/Makefile.am</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/addressbook-sources.xml?h=rel-0_6_2'>default_user/addressbook-sources.xml</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/.cvsignore?h=rel-0_6_2'>default_user/local/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Calendar/.cvsignore?h=rel-0_6_2'>default_user/local/Calendar/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Calendar/Makefile.am?h=rel-0_6_2'>default_user/local/Calendar/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Calendar/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Calendar/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Contacts/.cvsignore?h=rel-0_6_2'>default_user/local/Contacts/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Contacts/Makefile.am?h=rel-0_6_2'>default_user/local/Contacts/Makefile.am</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Contacts/create-initial?h=rel-0_6_2'>default_user/local/Contacts/create-initial</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Contacts/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Contacts/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Drafts/.cvsignore?h=rel-0_6_2'>default_user/local/Drafts/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Drafts/Makefile.am?h=rel-0_6_2'>default_user/local/Drafts/Makefile.am</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Drafts/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Drafts/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Drafts/mbox?h=rel-0_6_2'>default_user/local/Drafts/mbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Inbox/.cvsignore?h=rel-0_6_2'>default_user/local/Inbox/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Inbox/Makefile.am?h=rel-0_6_2'>default_user/local/Inbox/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Inbox/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Inbox/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Inbox/mbox?h=rel-0_6_2'>default_user/local/Inbox/mbox</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Makefile.am?h=rel-0_6_2'>default_user/local/Makefile.am</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Outbox/.cvsignore?h=rel-0_6_2'>default_user/local/Outbox/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Outbox/Makefile.am?h=rel-0_6_2'>default_user/local/Outbox/Makefile.am</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Outbox/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Outbox/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Outbox/mbox?h=rel-0_6_2'>default_user/local/Outbox/mbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/.cvsignore?h=rel-0_6_2'>default_user/local/Sent/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/Makefile.am?h=rel-0_6_2'>default_user/local/Sent/Makefile.am</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Sent/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/mbox?h=rel-0_6_2'>default_user/local/Sent/mbox</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Tasks/.cvsignore?h=rel-0_6_2'>default_user/local/Tasks/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Tasks/Makefile.am?h=rel-0_6_2'>default_user/local/Tasks/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Tasks/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Tasks/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Trash/.cvsignore?h=rel-0_6_2'>default_user/local/Trash/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Trash/Makefile.am?h=rel-0_6_2'>default_user/local/Trash/Makefile.am</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Trash/folder-metadata.xml?h=rel-0_6_2'>default_user/local/Trash/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/searches.xml?h=rel-0_6_2'>default_user/searches.xml</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/vfolders.xml?h=rel-0_6_2'>default_user/vfolders.xml</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/.cvsignore?h=rel-0_6_2'>devel-docs/.cvsignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/Makefile.am?h=rel-0_6_2'>devel-docs/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/.cvsignore?h=rel-0_6_2'>devel-docs/camel/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/Makefile.am?h=rel-0_6_2'>devel-docs/camel/Makefile.am</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/README_AND_TODO.txt?h=rel-0_6_2'>devel-docs/camel/README_AND_TODO.txt</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/camel-docs.sgml?h=rel-0_6_2'>devel-docs/camel/camel-docs.sgml</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/camel-sections.txt?h=rel-0_6_2'>devel-docs/camel/camel-sections.txt</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/camel.types?h=rel-0_6_2'>devel-docs/camel/camel.types</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/.cvsignore?h=rel-0_6_2'>devel-docs/camel/tmpl/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-data-wrapper.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-data-wrapper.sgml</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-folder.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-folder.sgml</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-mime-message.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-mime-message.sgml</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-mime-part.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-mime-part.sgml</a></td><td class='right'>151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-recipient.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-recipient.sgml</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-service.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-service.sgml</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-store.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-store.sgml</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/camel/tmpl/camel-stream.sgml?h=rel-0_6_2'>devel-docs/camel/tmpl/camel-stream.sgml</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/misc/ref_and_id_proposition.txt?h=rel-0_6_2'>devel-docs/misc/ref_and_id_proposition.txt</a></td><td class='right'>237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/query/virtual-folder-in-depth.sgml?h=rel-0_6_2'>devel-docs/query/virtual-folder-in-depth.sgml</a></td><td class='right'>407</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/devel-docs/query/virtual-folder-in-depth.txt?h=rel-0_6_2'>devel-docs/query/virtual-folder-in-depth.txt</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/.cvsignore?h=rel-0_6_2'>doc/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/COPYING-DOCS?h=rel-0_6_2'>doc/COPYING-DOCS</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/Camel-Classes?h=rel-0_6_2'>doc/Camel-Classes</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/ChangeLog?h=rel-0_6_2'>doc/ChangeLog</a></td><td class='right'>1146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/Design?h=rel-0_6_2'>doc/Design</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/Keybindings?h=rel-0_6_2'>doc/Keybindings</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/Makefile.am?h=rel-0_6_2'>doc/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/NAMESPACE?h=rel-0_6_2'>doc/NAMESPACE</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/.cvsignore?h=rel-0_6_2'>doc/devel/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/ChangeLog?h=rel-0_6_2'>doc/devel/ChangeLog</a></td><td class='right'>274</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/Makefile.am?h=rel-0_6_2'>doc/devel/Makefile.am</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/.cvsignore?h=rel-0_6_2'>doc/devel/calendar/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/Makefile.am?h=rel-0_6_2'>doc/devel/calendar/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/alarm-generation.sgml?h=rel-0_6_2'>doc/devel/calendar/alarm-generation.sgml</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/architecture.sgml?h=rel-0_6_2'>doc/devel/calendar/architecture.sgml</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/.cvsignore?h=rel-0_6_2'>doc/devel/calendar/cal-client/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/Makefile.am?h=rel-0_6_2'>doc/devel/calendar/cal-client/Makefile.am</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client-decl.txt</a></td><td class='right'>490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client-sections.txt</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client.args?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client.types?h=rel-0_6_2'>doc/devel/calendar/cal-client/evolution-cal-client.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/tmpl/cal-client.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-client/tmpl/cal-client.sgml</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/.cvsignore?h=rel-0_6_2'>doc/devel/calendar/cal-util/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/Makefile.am?h=rel-0_6_2'>doc/devel/calendar/cal-util/Makefile.am</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util-decl.txt</a></td><td class='right'>1009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util-sections.txt</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.args?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.signals?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util.signals</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.types?h=rel-0_6_2'>doc/devel/calendar/cal-util/evolution-cal-util.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/cal-component.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/tmpl/cal-component.sgml</a></td><td class='right'>992</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/tmpl/cal-recur.sgml</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/cal-util.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/tmpl/cal-util.sgml</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml</a></td><td class='right'>322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/timeutil.sgml?h=rel-0_6_2'>doc/devel/calendar/cal-util/tmpl/timeutil.sgml</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/evolution-calendar.sgml?h=rel-0_6_2'>doc/devel/calendar/evolution-calendar.sgml</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/public-reference.sgml?h=rel-0_6_2'>doc/devel/calendar/public-reference.sgml</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/evolution-devel-guide.sgml?h=rel-0_6_2'>doc/devel/evolution-devel-guide.sgml</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/.cvsignore?h=rel-0_6_2'>doc/devel/executive-summary/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/Makefile.am?h=rel-0_6_2'>doc/devel/executive-summary/Makefile.am</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/evolution-services-decl.txt?h=rel-0_6_2'>doc/devel/executive-summary/evolution-services-decl.txt</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/evolution-services-sections.txt?h=rel-0_6_2'>doc/devel/executive-summary/evolution-services-sections.txt</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/evolution-services.args?h=rel-0_6_2'>doc/devel/executive-summary/evolution-services.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/evolution-services.hierarchy?h=rel-0_6_2'>doc/devel/executive-summary/evolution-services.hierarchy</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/evolution-services.types?h=rel-0_6_2'>doc/devel/executive-summary/evolution-services.types</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/private-reference.sgml?h=rel-0_6_2'>doc/devel/executive-summary/private-reference.sgml</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/public-reference.sgml?h=rel-0_6_2'>doc/devel/executive-summary/public-reference.sgml</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml?h=rel-0_6_2'>doc/devel/executive-summary/tmpl/evolution-services-unused.sgml</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml?h=rel-0_6_2'>doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml?h=rel-0_6_2'>doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/tmpl/executive-summary-component.sgml?h=rel-0_6_2'>doc/devel/executive-summary/tmpl/executive-summary-component.sgml</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml?h=rel-0_6_2'>doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/fdl.sgml?h=rel-0_6_2'>doc/devel/fdl.sgml</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/.cvsignore?h=rel-0_6_2'>doc/devel/importer/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/Makefile.am?h=rel-0_6_2'>doc/devel/importer/Makefile.am</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/evolution-shell-importer-sections.txt?h=rel-0_6_2'>doc/devel/importer/evolution-shell-importer-sections.txt</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/evolution-shell-importer.args?h=rel-0_6_2'>doc/devel/importer/evolution-shell-importer.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/evolution-shell-importer.hierarchy?h=rel-0_6_2'>doc/devel/importer/evolution-shell-importer.hierarchy</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/evolution-shell-importer.types?h=rel-0_6_2'>doc/devel/importer/evolution-shell-importer.types</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/private-reference.sgml?h=rel-0_6_2'>doc/devel/importer/private-reference.sgml</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/public-reference.sgml?h=rel-0_6_2'>doc/devel/importer/public-reference.sgml</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/tmpl/evolution-importer-client.sgml?h=rel-0_6_2'>doc/devel/importer/tmpl/evolution-importer-client.sgml</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/tmpl/evolution-importer.sgml?h=rel-0_6_2'>doc/devel/importer/tmpl/evolution-importer.sgml</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml?h=rel-0_6_2'>doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/preface.sgml?h=rel-0_6_2'>doc/devel/preface.sgml</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/reference.sgml?h=rel-0_6_2'>doc/devel/reference.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/white-papers/calendar/calendar.sgml?h=rel-0_6_2'>doc/white-papers/calendar/calendar.sgml</a></td><td class='right'>209</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/white-papers/mail/camel.sgml?h=rel-0_6_2'>doc/white-papers/mail/camel.sgml</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/white-papers/mail/ibex.sgml?h=rel-0_6_2'>doc/white-papers/mail/ibex.sgml</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/white-papers/widgets/e-table.sgml?h=rel-0_6_2'>doc/white-papers/widgets/e-table.sgml</a></td><td class='right'>279</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/.cvsignore?h=rel-0_6_2'>e-util/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ChangeLog?h=rel-0_6_2'>e-util/ChangeLog</a></td><td class='right'>1862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.3%;'/><td class='none' style='width: 95.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/Makefile.am?h=rel-0_6_2'>e-util/Makefile.am</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-bit-array.c?h=rel-0_6_2'>e-util/e-bit-array.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-bit-array.h?h=rel-0_6_2'>e-util/e-bit-array.h</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-bonobo-factory-util.c?h=rel-0_6_2'>e-util/e-bonobo-factory-util.c</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-bonobo-factory-util.h?h=rel-0_6_2'>e-util/e-bonobo-factory-util.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-categories-config.c?h=rel-0_6_2'>e-util/e-categories-config.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-categories-config.h?h=rel-0_6_2'>e-util/e-categories-config.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-categories-master-list-wombat.c?h=rel-0_6_2'>e-util/e-categories-master-list-wombat.c</a></td><td class='right'>207</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-categories-master-list-wombat.h?h=rel-0_6_2'>e-util/e-categories-master-list-wombat.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-corba-utils.c?h=rel-0_6_2'>e-util/e-corba-utils.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-corba-utils.h?h=rel-0_6_2'>e-util/e-corba-utils.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-db3-utils.c?h=rel-0_6_2'>e-util/e-db3-utils.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-db3-utils.h?h=rel-0_6_2'>e-util/e-db3-utils.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dbhash.c?h=rel-0_6_2'>e-util/e-dbhash.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dbhash.h?h=rel-0_6_2'>e-util/e-dbhash.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dialog-utils.c?h=rel-0_6_2'>e-util/e-dialog-utils.c</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dialog-utils.h?h=rel-0_6_2'>e-util/e-dialog-utils.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dialog-widgets.c?h=rel-0_6_2'>e-util/e-dialog-widgets.c</a></td><td class='right'>832</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-dialog-widgets.h?h=rel-0_6_2'>e-util/e-dialog-widgets.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-gtk-utils.c?h=rel-0_6_2'>e-util/e-gtk-utils.c</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-gtk-utils.h?h=rel-0_6_2'>e-util/e-gtk-utils.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-gui-utils.c?h=rel-0_6_2'>e-util/e-gui-utils.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-gui-utils.h?h=rel-0_6_2'>e-util/e-gui-utils.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-host-utils.c?h=rel-0_6_2'>e-util/e-host-utils.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-host-utils.h?h=rel-0_6_2'>e-util/e-host-utils.h</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-html-utils.c?h=rel-0_6_2'>e-util/e-html-utils.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-html-utils.h?h=rel-0_6_2'>e-util/e-html-utils.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-i18n.h?h=rel-0_6_2'>e-util/e-i18n.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-iconv.c?h=rel-0_6_2'>e-util/e-iconv.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-iconv.h?h=rel-0_6_2'>e-util/e-iconv.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-iterator.c?h=rel-0_6_2'>e-util/e-iterator.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-iterator.h?h=rel-0_6_2'>e-util/e-iterator.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-lang-utils.c?h=rel-0_6_2'>e-util/e-lang-utils.c</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-lang-utils.h?h=rel-0_6_2'>e-util/e-lang-utils.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-list-iterator.c?h=rel-0_6_2'>e-util/e-list-iterator.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-list-iterator.h?h=rel-0_6_2'>e-util/e-list-iterator.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-list.c?h=rel-0_6_2'>e-util/e-list.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-list.h?h=rel-0_6_2'>e-util/e-list.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-memory.c?h=rel-0_6_2'>e-util/e-memory.c</a></td><td class='right'>1296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-memory.h?h=rel-0_6_2'>e-util/e-memory.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-mktemp.c?h=rel-0_6_2'>e-util/e-mktemp.c</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-mktemp.h?h=rel-0_6_2'>e-util/e-mktemp.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-msgport.c?h=rel-0_6_2'>e-util/e-msgport.c</a></td><td class='right'>914</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-msgport.h?h=rel-0_6_2'>e-util/e-msgport.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-passwords.c?h=rel-0_6_2'>e-util/e-passwords.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-passwords.h?h=rel-0_6_2'>e-util/e-passwords.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-path.c?h=rel-0_6_2'>e-util/e-path.c</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-path.h?h=rel-0_6_2'>e-util/e-path.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-map.c?h=rel-0_6_2'>e-util/e-pilot-map.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-map.h?h=rel-0_6_2'>e-util/e-pilot-map.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-settings.c?h=rel-0_6_2'>e-util/e-pilot-settings.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-settings.h?h=rel-0_6_2'>e-util/e-pilot-settings.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-util.c?h=rel-0_6_2'>e-util/e-pilot-util.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-pilot-util.h?h=rel-0_6_2'>e-util/e-pilot-util.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-request.c?h=rel-0_6_2'>e-util/e-request.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-request.h?h=rel-0_6_2'>e-util/e-request.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sexp.c?h=rel-0_6_2'>e-util/e-sexp.c</a></td><td class='right'>1303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sexp.h?h=rel-0_6_2'>e-util/e-sexp.h</a></td><td class='right'>162</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sorter-array.c?h=rel-0_6_2'>e-util/e-sorter-array.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sorter-array.h?h=rel-0_6_2'>e-util/e-sorter-array.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sorter.c?h=rel-0_6_2'>e-util/e-sorter.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-sorter.h?h=rel-0_6_2'>e-util/e-sorter.h</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-text-event-processor-emacs-like.c?h=rel-0_6_2'>e-util/e-text-event-processor-emacs-like.c</a></td><td class='right'>508</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-text-event-processor-emacs-like.h?h=rel-0_6_2'>e-util/e-text-event-processor-emacs-like.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-text-event-processor-types.h?h=rel-0_6_2'>e-util/e-text-event-processor-types.h</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-text-event-processor.c?h=rel-0_6_2'>e-util/e-text-event-processor.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-text-event-processor.h?h=rel-0_6_2'>e-util/e-text-event-processor.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-time-utils.c?h=rel-0_6_2'>e-util/e-time-utils.c</a></td><td class='right'>409</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-time-utils.h?h=rel-0_6_2'>e-util/e-time-utils.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-url.c?h=rel-0_6_2'>e-util/e-url.c</a></td><td class='right'>339</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-url.h?h=rel-0_6_2'>e-util/e-url.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-util.c?h=rel-0_6_2'>e-util/e-util.c</a></td><td class='right'>1667</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-util.h?h=rel-0_6_2'>e-util/e-util.h</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-xml-utils.c?h=rel-0_6_2'>e-util/e-xml-utils.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-xml-utils.h?h=rel-0_6_2'>e-util/e-xml-utils.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/.cvsignore?h=rel-0_6_2'>e-util/ename/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/Makefile.am?h=rel-0_6_2'>e-util/ename/Makefile.am</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/TODO?h=rel-0_6_2'>e-util/ename/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-address-western.c?h=rel-0_6_2'>e-util/ename/e-address-western.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-address-western.h?h=rel-0_6_2'>e-util/ename/e-address-western.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-name-western-tables.h?h=rel-0_6_2'>e-util/ename/e-name-western-tables.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-name-western.c?h=rel-0_6_2'>e-util/ename/e-name-western.c</a></td><td class='right'>958</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-name-western.h?h=rel-0_6_2'>e-util/ename/e-name-western.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/test-ename-western-gtk.c?h=rel-0_6_2'>e-util/ename/test-ename-western-gtk.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/test-ename-western.c?h=rel-0_6_2'>e-util/ename/test-ename-western.c</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/md5-utils.c?h=rel-0_6_2'>e-util/md5-utils.c</a></td><td class='right'>363</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/md5-utils.h?h=rel-0_6_2'>e-util/md5-utils.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/.cvsignore?h=rel-0_6_2'>executive-summary/.cvsignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/ChangeLog?h=rel-0_6_2'>executive-summary/ChangeLog</a></td><td class='right'>908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/GNOME_Evolution_Summary.oaf.in?h=rel-0_6_2'>executive-summary/GNOME_Evolution_Summary.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/Makefile.am?h=rel-0_6_2'>executive-summary/Makefile.am</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/.cvsignore?h=rel-0_6_2'>executive-summary/component/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/Makefile.am?h=rel-0_6_2'>executive-summary/component/Makefile.am</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/component-factory.c?h=rel-0_6_2'>executive-summary/component/component-factory.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/component-factory.h?h=rel-0_6_2'>executive-summary/component/component-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-callbacks.c?h=rel-0_6_2'>executive-summary/component/e-summary-callbacks.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-callbacks.h?h=rel-0_6_2'>executive-summary/component/e-summary-callbacks.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-factory.c?h=rel-0_6_2'>executive-summary/component/e-summary-factory.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-factory.h?h=rel-0_6_2'>executive-summary/component/e-summary-factory.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-prefs.c?h=rel-0_6_2'>executive-summary/component/e-summary-prefs.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-prefs.h?h=rel-0_6_2'>executive-summary/component/e-summary-prefs.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-url.c?h=rel-0_6_2'>executive-summary/component/e-summary-url.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-url.h?h=rel-0_6_2'>executive-summary/component/e-summary-url.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-util.c?h=rel-0_6_2'>executive-summary/component/e-summary-util.c</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-util.h?h=rel-0_6_2'>executive-summary/component/e-summary-util.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary.c?h=rel-0_6_2'>executive-summary/component/e-summary.c</a></td><td class='right'>1340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary.h?h=rel-0_6_2'>executive-summary/component/e-summary.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/executive-summary-config.glade?h=rel-0_6_2'>executive-summary/component/executive-summary-config.glade</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/executive-summary.png?h=rel-0_6_2'>executive-summary/component/executive-summary.png</a></td><td class='right'>bin</td><td class='graph'>25562 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/main.c?h=rel-0_6_2'>executive-summary/component/main.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/default-header.html?h=rel-0_6_2'>executive-summary/default-header.html</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/.cvsignore?h=rel-0_6_2'>executive-summary/evolution-services/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/Makefile.am?h=rel-0_6_2'>executive-summary/evolution-services/Makefile.am</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-client.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-client.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-client.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-client.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-client.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-client.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-client.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-client.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-factory-client.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-factory-client.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-factory-client.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-factory-client.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-view.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-view.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-view.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component-view.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-component.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-html-view.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-html-view.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-html-view.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary-html-view.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary.c?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary.h?h=rel-0_6_2'>executive-summary/evolution-services/executive-summary.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/.cvsignore?h=rel-0_6_2'>executive-summary/idl/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/Executive-Summary.idl?h=rel-0_6_2'>executive-summary/idl/Executive-Summary.idl</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/HtmlView.idl?h=rel-0_6_2'>executive-summary/idl/HtmlView.idl</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/Makefile.am?h=rel-0_6_2'>executive-summary/idl/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/Summary.idl?h=rel-0_6_2'>executive-summary/idl/Summary.idl</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/SummaryComponent.idl?h=rel-0_6_2'>executive-summary/idl/SummaryComponent.idl</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/summary.html?h=rel-0_6_2'>executive-summary/summary.html</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/.cvsignore?h=rel-0_6_2'>executive-summary/test-service/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in?h=rel-0_6_2'>executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in?h=rel-0_6_2'>executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/Makefile.am?h=rel-0_6_2'>executive-summary/test-service/Makefile.am</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/main.c?h=rel-0_6_2'>executive-summary/test-service/main.c</a></td><td class='right'>296</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/rdf-summary.c?h=rel-0_6_2'>executive-summary/test-service/rdf-summary.c</a></td><td class='right'>984</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/.cvsignore?h=rel-0_6_2'>executive-summary/widgets/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/Makefile.am?h=rel-0_6_2'>executive-summary/widgets/Makefile.am</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-subwindow.c?h=rel-0_6_2'>executive-summary/widgets/e-summary-subwindow.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-subwindow.h?h=rel-0_6_2'>executive-summary/widgets/e-summary-subwindow.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-title-button.c?h=rel-0_6_2'>executive-summary/widgets/e-summary-title-button.c</a></td><td class='right'>402</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-title-button.h?h=rel-0_6_2'>executive-summary/widgets/e-summary-title-button.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-titlebar.c?h=rel-0_6_2'>executive-summary/widgets/e-summary-titlebar.c</a></td><td class='right'>411</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-titlebar.h?h=rel-0_6_2'>executive-summary/widgets/e-summary-titlebar.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/edit.xpm?h=rel-0_6_2'>executive-summary/widgets/edit.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/esummary-window-test.c?h=rel-0_6_2'>executive-summary/widgets/esummary-window-test.c</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/shade.xpm?h=rel-0_6_2'>executive-summary/widgets/shade.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/x.xpm?h=rel-0_6_2'>executive-summary/widgets/x.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/.cvsignore?h=rel-0_6_2'>filter/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/ChangeLog?h=rel-0_6_2'>filter/ChangeLog</a></td><td class='right'>2365</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/Makefile.am?h=rel-0_6_2'>filter/Makefile.am</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-code.c?h=rel-0_6_2'>filter/filter-code.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-code.h?h=rel-0_6_2'>filter/filter-code.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-colour.c?h=rel-0_6_2'>filter/filter-colour.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-colour.h?h=rel-0_6_2'>filter/filter-colour.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-context.c?h=rel-0_6_2'>filter/filter-context.c</a></td><td class='right'>284</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-context.h?h=rel-0_6_2'>filter/filter-context.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-datespec.c?h=rel-0_6_2'>filter/filter-datespec.c</a></td><td class='right'>764</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-datespec.h?h=rel-0_6_2'>filter/filter-datespec.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-editor.c?h=rel-0_6_2'>filter/filter-editor.c</a></td><td class='right'>187</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-editor.h?h=rel-0_6_2'>filter/filter-editor.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-element.c?h=rel-0_6_2'>filter/filter-element.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-element.h?h=rel-0_6_2'>filter/filter-element.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-file.c?h=rel-0_6_2'>filter/filter-file.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-file.h?h=rel-0_6_2'>filter/filter-file.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-filter.c?h=rel-0_6_2'>filter/filter-filter.c</a></td><td class='right'>535</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-filter.h?h=rel-0_6_2'>filter/filter-filter.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-folder.c?h=rel-0_6_2'>filter/filter-folder.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-folder.h?h=rel-0_6_2'>filter/filter-folder.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-input.c?h=rel-0_6_2'>filter/filter-input.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-input.h?h=rel-0_6_2'>filter/filter-input.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-int.c?h=rel-0_6_2'>filter/filter-int.c</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-int.h?h=rel-0_6_2'>filter/filter-int.h</a></td><td class='right'>58</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-option.c?h=rel-0_6_2'>filter/filter-option.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-option.h?h=rel-0_6_2'>filter/filter-option.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-part.c?h=rel-0_6_2'>filter/filter-part.c</a></td><td class='right'>531</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-part.h?h=rel-0_6_2'>filter/filter-part.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-rule.c?h=rel-0_6_2'>filter/filter-rule.c</a></td><td class='right'>867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-rule.h?h=rel-0_6_2'>filter/filter-rule.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-score.c?h=rel-0_6_2'>filter/filter-score.c</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-score.h?h=rel-0_6_2'>filter/filter-score.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-source.c?h=rel-0_6_2'>filter/filter-source.c</a></td><td class='right'>399</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-source.h?h=rel-0_6_2'>filter/filter-source.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter.glade?h=rel-0_6_2'>filter/filter.glade</a></td><td class='right'>738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filtertypes.xml?h=rel-0_6_2'>filter/filtertypes.xml</a></td><td class='right'>672</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/libfilter-i18n.h?h=rel-0_6_2'>filter/libfilter-i18n.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/rule-context.c?h=rel-0_6_2'>filter/rule-context.c</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/rule-context.h?h=rel-0_6_2'>filter/rule-context.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/rule-editor.c?h=rel-0_6_2'>filter/rule-editor.c</a></td><td class='right'>657</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/rule-editor.h?h=rel-0_6_2'>filter/rule-editor.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-context.c?h=rel-0_6_2'>filter/score-context.c</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-context.h?h=rel-0_6_2'>filter/score-context.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-editor.c?h=rel-0_6_2'>filter/score-editor.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-editor.h?h=rel-0_6_2'>filter/score-editor.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-rule.c?h=rel-0_6_2'>filter/score-rule.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-rule.h?h=rel-0_6_2'>filter/score-rule.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-context.c?h=rel-0_6_2'>filter/vfolder-context.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-context.h?h=rel-0_6_2'>filter/vfolder-context.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-editor.c?h=rel-0_6_2'>filter/vfolder-editor.c</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-editor.h?h=rel-0_6_2'>filter/vfolder-editor.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-rule.c?h=rel-0_6_2'>filter/vfolder-rule.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-rule.h?h=rel-0_6_2'>filter/vfolder-rule.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfoldertypes.xml?h=rel-0_6_2'>filter/vfoldertypes.xml</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/.cvsignore?h=rel-0_6_2'>help/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/.cvsignore?h=rel-0_6_2'>help/C/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/Makefile.am?h=rel-0_6_2'>help/C/Makefile.am</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/POTFILES.in?h=rel-0_6_2'>help/C/POTFILES.in</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/apx-authors.sgml?h=rel-0_6_2'>help/C/apx-authors.sgml</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/apx-bugs.sgml?h=rel-0_6_2'>help/C/apx-bugs.sgml</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/apx-gloss.sgml?h=rel-0_6_2'>help/C/apx-gloss.sgml</a></td><td class='right'>480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/config-prefs.sgml?h=rel-0_6_2'>help/C/config-prefs.sgml</a></td><td class='right'>925</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/config-sync.sgml?h=rel-0_6_2'>help/C/config-sync.sgml</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/evolution-C.omf?h=rel-0_6_2'>help/C/evolution-C.omf</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/evolution-faq.sgml?h=rel-0_6_2'>help/C/evolution-faq.sgml</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/evolution.sgml?h=rel-0_6_2'>help/C/evolution.sgml</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/calendar.png?h=rel-0_6_2'>help/C/figures/calendar.png</a></td><td class='right'>bin</td><td class='graph'>49112 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/config-cal.png?h=rel-0_6_2'>help/C/figures/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>9151 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/config-mail.png?h=rel-0_6_2'>help/C/figures/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>10885 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/contact-editor.png?h=rel-0_6_2'>help/C/figures/contact-editor.png</a></td><td class='right'>bin</td><td class='graph'>29672 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/contact.png?h=rel-0_6_2'>help/C/figures/contact.png</a></td><td class='right'>bin</td><td class='graph'>39318 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/exchange-identity.png?h=rel-0_6_2'>help/C/figures/exchange-identity.png</a></td><td class='right'>bin</td><td class='graph'>12600 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/exchange-receive-options.png?h=rel-0_6_2'>help/C/figures/exchange-receive-options.png</a></td><td class='right'>bin</td><td class='graph'>14033 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/exchange-receive.png?h=rel-0_6_2'>help/C/figures/exchange-receive.png</a></td><td class='right'>bin</td><td class='graph'>14455 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/filter-assist-fig.png?h=rel-0_6_2'>help/C/figures/filter-assist-fig.png</a></td><td class='right'>bin</td><td class='graph'>12495 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/filter-new-fig.png?h=rel-0_6_2'>help/C/figures/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>8802 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-1.png?h=rel-0_6_2'>help/C/figures/full-1.png</a></td><td class='right'>bin</td><td class='graph'>1218 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-2.png?h=rel-0_6_2'>help/C/figures/full-2.png</a></td><td class='right'>bin</td><td class='graph'>1260 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-3.png?h=rel-0_6_2'>help/C/figures/full-3.png</a></td><td class='right'>bin</td><td class='graph'>1290 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-4.png?h=rel-0_6_2'>help/C/figures/full-4.png</a></td><td class='right'>bin</td><td class='graph'>1251 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-5.png?h=rel-0_6_2'>help/C/figures/full-5.png</a></td><td class='right'>bin</td><td class='graph'>1293 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-6.png?h=rel-0_6_2'>help/C/figures/full-6.png</a></td><td class='right'>bin</td><td class='graph'>1284 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/full-7.png?h=rel-0_6_2'>help/C/figures/full-7.png</a></td><td class='right'>bin</td><td class='graph'>818 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/mail-composer.png?h=rel-0_6_2'>help/C/figures/mail-composer.png</a></td><td class='right'>bin</td><td class='graph'>16405 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/mail-druid-pic.png?h=rel-0_6_2'>help/C/figures/mail-druid-pic.png</a></td><td class='right'>bin</td><td class='graph'>8457 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/mail-inbox.png?h=rel-0_6_2'>help/C/figures/mail-inbox.png</a></td><td class='right'>bin</td><td class='graph'>61955 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/mail-threaded.png?h=rel-0_6_2'>help/C/figures/mail-threaded.png</a></td><td class='right'>bin</td><td class='graph'>45997 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/mainwindow-pic.png?h=rel-0_6_2'>help/C/figures/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>65810 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/newmsg.png?h=rel-0_6_2'>help/C/figures/newmsg.png</a></td><td class='right'>bin</td><td class='graph'>25303 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/outline.png?h=rel-0_6_2'>help/C/figures/outline.png</a></td><td class='right'>bin</td><td class='graph'>5171 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/print-dest.png?h=rel-0_6_2'>help/C/figures/print-dest.png</a></td><td class='right'>bin</td><td class='graph'>7358 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/print-preview.png?h=rel-0_6_2'>help/C/figures/print-preview.png</a></td><td class='right'>bin</td><td class='graph'>41550 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/replymsg.png?h=rel-0_6_2'>help/C/figures/replymsg.png</a></td><td class='right'>bin</td><td class='graph'>23506 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/schedule.png?h=rel-0_6_2'>help/C/figures/schedule.png</a></td><td class='right'>bin</td><td class='graph'>84480 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/small_desktop.png?h=rel-0_6_2'>help/C/figures/small_desktop.png</a></td><td class='right'>bin</td><td class='graph'>62588 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/summary.png?h=rel-0_6_2'>help/C/figures/summary.png</a></td><td class='right'>bin</td><td class='graph'>94768 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/figures/vfolder-createrule-fig.png?h=rel-0_6_2'>help/C/figures/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>11228 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/menuref.sgml?h=rel-0_6_2'>help/C/menuref.sgml</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/preface.sgml?h=rel-0_6_2'>help/C/preface.sgml</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/topic.dat?h=rel-0_6_2'>help/C/topic.dat</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-calendar.sgml?h=rel-0_6_2'>help/C/usage-calendar.sgml</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-contact.sgml?h=rel-0_6_2'>help/C/usage-contact.sgml</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-exchange.sgml?h=rel-0_6_2'>help/C/usage-exchange.sgml</a></td><td class='right'>735</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-exec-summary.sgml?h=rel-0_6_2'>help/C/usage-exec-summary.sgml</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-mail-org.sgml?h=rel-0_6_2'>help/C/usage-mail-org.sgml</a></td><td class='right'>1095</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-mail.sgml?h=rel-0_6_2'>help/C/usage-mail.sgml</a></td><td class='right'>2244</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-mainwindow.sgml?h=rel-0_6_2'>help/C/usage-mainwindow.sgml</a></td><td class='right'>1488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-notes.sgml?h=rel-0_6_2'>help/C/usage-notes.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-print.sgml?h=rel-0_6_2'>help/C/usage-print.sgml</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-sync.sgml?h=rel-0_6_2'>help/C/usage-sync.sgml</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/COPYING-DOCS?h=rel-0_6_2'>help/COPYING-DOCS</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/ChangeLog?h=rel-0_6_2'>help/ChangeLog</a></td><td class='right'>1772</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/Makefile.am?h=rel-0_6_2'>help/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/README_Translations?h=rel-0_6_2'>help/README_Translations</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/executive-summary/evolution-services.hierarchy?h=rel-0_6_2'>help/devel/executive-summary/evolution-services.hierarchy</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/importer/evolution-shell-importer.hierarchy?h=rel-0_6_2'>help/devel/importer/evolution-shell-importer.hierarchy</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/apx-authors.sgml.po?h=rel-0_6_2'>help/es.po/apx-authors.sgml.po</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/apx-bugs.sgml.po?h=rel-0_6_2'>help/es.po/apx-bugs.sgml.po</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/apx-gloss.sgml.po?h=rel-0_6_2'>help/es.po/apx-gloss.sgml.po</a></td><td class='right'>745</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/config-prefs.sgml.po?h=rel-0_6_2'>help/es.po/config-prefs.sgml.po</a></td><td class='right'>1364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/config-setupassist.sgml.po?h=rel-0_6_2'>help/es.po/config-setupassist.sgml.po</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/config-sync.sgml.po?h=rel-0_6_2'>help/es.po/config-sync.sgml.po</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/evolution.sgml.po?h=rel-0_6_2'>help/es.po/evolution.sgml.po</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/menuref.sgml.po?h=rel-0_6_2'>help/es.po/menuref.sgml.po</a></td><td class='right'>3062</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/preface.sgml.po?h=rel-0_6_2'>help/es.po/preface.sgml.po</a></td><td class='right'>932</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-calendar.sgml.po?h=rel-0_6_2'>help/es.po/usage-calendar.sgml.po</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-contact.sgml.po?h=rel-0_6_2'>help/es.po/usage-contact.sgml.po</a></td><td class='right'>1225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-mail.sgml.po?h=rel-0_6_2'>help/es.po/usage-mail.sgml.po</a></td><td class='right'>2322</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-mainwindow.sgml.po?h=rel-0_6_2'>help/es.po/usage-mainwindow.sgml.po</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-notes.sgml.po?h=rel-0_6_2'>help/es.po/usage-notes.sgml.po</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-print.sgml.po?h=rel-0_6_2'>help/es.po/usage-print.sgml.po</a></td><td class='right'>196</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es.po/usage-sync.sgml.po?h=rel-0_6_2'>help/es.po/usage-sync.sgml.po</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/Makefile.in?h=rel-0_6_2'>help/es/Makefile.in</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/apx-authors.sgml?h=rel-0_6_2'>help/es/apx-authors.sgml</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/apx-bugs.sgml?h=rel-0_6_2'>help/es/apx-bugs.sgml</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/apx-gloss.sgml?h=rel-0_6_2'>help/es/apx-gloss.sgml</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/config-prefs.sgml?h=rel-0_6_2'>help/es/config-prefs.sgml</a></td><td class='right'>646</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/config-setupassist.sgml?h=rel-0_6_2'>help/es/config-setupassist.sgml</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/config-sync.sgml?h=rel-0_6_2'>help/es/config-sync.sgml</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/evolution.sgml?h=rel-0_6_2'>help/es/evolution.sgml</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/menuref.sgml?h=rel-0_6_2'>help/es/menuref.sgml</a></td><td class='right'>1477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/preface.sgml?h=rel-0_6_2'>help/es/preface.sgml</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-calendar.sgml?h=rel-0_6_2'>help/es/usage-calendar.sgml</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-contact.sgml?h=rel-0_6_2'>help/es/usage-contact.sgml</a></td><td class='right'>619</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-mail.sgml?h=rel-0_6_2'>help/es/usage-mail.sgml</a></td><td class='right'>1526</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-mainwindow.sgml?h=rel-0_6_2'>help/es/usage-mainwindow.sgml</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-notes.sgml?h=rel-0_6_2'>help/es/usage-notes.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-print.sgml?h=rel-0_6_2'>help/es/usage-print.sgml</a></td><td class='right'>104</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/es/usage-sync.sgml?h=rel-0_6_2'>help/es/usage-sync.sgml</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/.cvsignore?h=rel-0_6_2'>help/no/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/ChangeLog?h=rel-0_6_2'>help/no/ChangeLog</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/Makefile.am?h=rel-0_6_2'>help/no/Makefile.am</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/apx-authors.sgml?h=rel-0_6_2'>help/no/apx-authors.sgml</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/apx-bugs.sgml?h=rel-0_6_2'>help/no/apx-bugs.sgml</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/apx-gloss.sgml?h=rel-0_6_2'>help/no/apx-gloss.sgml</a></td><td class='right'>419</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/config-encryption.sgml?h=rel-0_6_2'>help/no/config-encryption.sgml</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/config-prefs.sgml?h=rel-0_6_2'>help/no/config-prefs.sgml</a></td><td class='right'>744</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/config-sync.sgml?h=rel-0_6_2'>help/no/config-sync.sgml</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/evolution-faq.sgml?h=rel-0_6_2'>help/no/evolution-faq.sgml</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/evolution-no.omf?h=rel-0_6_2'>help/no/evolution-no.omf</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/evolution.sgml?h=rel-0_6_2'>help/no/evolution.sgml</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/calendar.png?h=rel-0_6_2'>help/no/figures/calendar.png</a></td><td class='right'>bin</td><td class='graph'>42615 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/config-cal.png?h=rel-0_6_2'>help/no/figures/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>7338 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/config-mail.png?h=rel-0_6_2'>help/no/figures/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>9210 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/contact-editor.png?h=rel-0_6_2'>help/no/figures/contact-editor.png</a></td><td class='right'>bin</td><td class='graph'>37707 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/contact.png?h=rel-0_6_2'>help/no/figures/contact.png</a></td><td class='right'>bin</td><td class='graph'>39742 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/filter-assist-fig.png?h=rel-0_6_2'>help/no/figures/filter-assist-fig.png</a></td><td class='right'>bin</td><td class='graph'>5575 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/filter-new-fig.png?h=rel-0_6_2'>help/no/figures/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>8802 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-1.png?h=rel-0_6_2'>help/no/figures/full-1.png</a></td><td class='right'>bin</td><td class='graph'>1218 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-2.png?h=rel-0_6_2'>help/no/figures/full-2.png</a></td><td class='right'>bin</td><td class='graph'>1260 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-3.png?h=rel-0_6_2'>help/no/figures/full-3.png</a></td><td class='right'>bin</td><td class='graph'>1290 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-4.png?h=rel-0_6_2'>help/no/figures/full-4.png</a></td><td class='right'>bin</td><td class='graph'>1251 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-5.png?h=rel-0_6_2'>help/no/figures/full-5.png</a></td><td class='right'>bin</td><td class='graph'>1293 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-6.png?h=rel-0_6_2'>help/no/figures/full-6.png</a></td><td class='right'>bin</td><td class='graph'>1284 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/full-7.png?h=rel-0_6_2'>help/no/figures/full-7.png</a></td><td class='right'>bin</td><td class='graph'>818 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/mail-composer.png?h=rel-0_6_2'>help/no/figures/mail-composer.png</a></td><td class='right'>bin</td><td class='graph'>14971 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/mail-druid-pic.png?h=rel-0_6_2'>help/no/figures/mail-druid-pic.png</a></td><td class='right'>bin</td><td class='graph'>8457 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/mail-inbox.png?h=rel-0_6_2'>help/no/figures/mail-inbox.png</a></td><td class='right'>bin</td><td class='graph'>127593 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/mainwindow-pic.png?h=rel-0_6_2'>help/no/figures/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>130739 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/newmsg.png?h=rel-0_6_2'>help/no/figures/newmsg.png</a></td><td class='right'>bin</td><td class='graph'>14798 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/print-dest.png?h=rel-0_6_2'>help/no/figures/print-dest.png</a></td><td class='right'>bin</td><td class='graph'>7358 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/print-preview.png?h=rel-0_6_2'>help/no/figures/print-preview.png</a></td><td class='right'>bin</td><td class='graph'>51801 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/replymsg.png?h=rel-0_6_2'>help/no/figures/replymsg.png</a></td><td class='right'>bin</td><td class='graph'>19338 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/figures/vfolder-createrule-fig.png?h=rel-0_6_2'>help/no/figures/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>8321 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/menuref.sgml?h=rel-0_6_2'>help/no/menuref.sgml</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/preface.sgml?h=rel-0_6_2'>help/no/preface.sgml</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/topic.dat?h=rel-0_6_2'>help/no/topic.dat</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-calendar.sgml?h=rel-0_6_2'>help/no/usage-calendar.sgml</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-contact.sgml?h=rel-0_6_2'>help/no/usage-contact.sgml</a></td><td class='right'>609</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-encryption.sgml?h=rel-0_6_2'>help/no/usage-encryption.sgml</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-exec-summary.sgml?h=rel-0_6_2'>help/no/usage-exec-summary.sgml</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-mail-org.sgml?h=rel-0_6_2'>help/no/usage-mail-org.sgml</a></td><td class='right'>1021</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-mail.sgml?h=rel-0_6_2'>help/no/usage-mail.sgml</a></td><td class='right'>2005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-mainwindow.sgml?h=rel-0_6_2'>help/no/usage-mainwindow.sgml</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-notes.sgml?h=rel-0_6_2'>help/no/usage-notes.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-print.sgml?h=rel-0_6_2'>help/no/usage-print.sgml</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/no/usage-sync.sgml?h=rel-0_6_2'>help/no/usage-sync.sgml</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/sgmldocs.make?h=rel-0_6_2'>help/sgmldocs.make</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/update_po.pl?h=rel-0_6_2'>help/update_po.pl</a></td><td class='right'>212</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/update_translation.pl?h=rel-0_6_2'>help/update_translation.pl</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/.cvsignore?h=rel-0_6_2'>importers/.cvsignore</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/ChangeLog?h=rel-0_6_2'>importers/ChangeLog</a></td><td class='right'>317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in?h=rel-0_6_2'>importers/GNOME_Evolution_Elm_Intelligent_Importer.oaf.in</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf.in?h=rel-0_6_2'>importers/GNOME_Evolution_GnomeCard_Intelligent_Importer.oaf.in</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in?h=rel-0_6_2'>importers/GNOME_Evolution_Netscape_Intelligent_Importer.oaf.in</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in?h=rel-0_6_2'>importers/GNOME_Evolution_Pine_Intelligent_Importer.oaf.in</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/Makefile.am?h=rel-0_6_2'>importers/Makefile.am</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/elm-importer.c?h=rel-0_6_2'>importers/elm-importer.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/evolution-gnomecard-importer.c?h=rel-0_6_2'>importers/evolution-gnomecard-importer.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/netscape-importer.c?h=rel-0_6_2'>importers/netscape-importer.c</a></td><td class='right'>2229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/importers/pine-importer.c?h=rel-0_6_2'>importers/pine-importer.c</a></td><td class='right'>739</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/.cvsignore?h=rel-0_6_2'>libibex/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/COPYING.LIB?h=rel-0_6_2'>libibex/COPYING.LIB</a></td><td class='right'>481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/ChangeLog?h=rel-0_6_2'>libibex/ChangeLog</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/Makefile.am?h=rel-0_6_2'>libibex/Makefile.am</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/TODO?h=rel-0_6_2'>libibex/TODO</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/block.c?h=rel-0_6_2'>libibex/block.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/block.h?h=rel-0_6_2'>libibex/block.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/diskarray.c?h=rel-0_6_2'>libibex/diskarray.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/disktail.c?h=rel-0_6_2'>libibex/disktail.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/dumpindex.c?h=rel-0_6_2'>libibex/dumpindex.c</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/hash.c?h=rel-0_6_2'>libibex/hash.c</a></td><td class='right'>856</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/ibex.h?h=rel-0_6_2'>libibex/ibex.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/ibex_block.c?h=rel-0_6_2'>libibex/ibex_block.c</a></td><td class='right'>649</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/ibex_internal.h?h=rel-0_6_2'>libibex/ibex_internal.h</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/index.h?h=rel-0_6_2'>libibex/index.h</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/testindex.c?h=rel-0_6_2'>libibex/testindex.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/wordindex.c?h=rel-0_6_2'>libibex/wordindex.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/wordindex.h?h=rel-0_6_2'>libibex/wordindex.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/wordindexmem.c?h=rel-0_6_2'>libibex/wordindexmem.c</a></td><td class='right'>901</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/.cvsignore?h=rel-0_6_2'>libical/.cvsignore</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/AUTHORS?h=rel-0_6_2'>libical/AUTHORS</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/COPYING?h=rel-0_6_2'>libical/COPYING</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/ChangeLog?h=rel-0_6_2'>libical/ChangeLog</a></td><td class='right'>1229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/INSTALL?h=rel-0_6_2'>libical/INSTALL</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/Makefile.am?h=rel-0_6_2'>libical/Makefile.am</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/NEWS?h=rel-0_6_2'>libical/NEWS</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/README?h=rel-0_6_2'>libical/README</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/TEST?h=rel-0_6_2'>libical/TEST</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/THANKS?h=rel-0_6_2'>libical/THANKS</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/TODO?h=rel-0_6_2'>libical/TODO</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/acconfig.h?h=rel-0_6_2'>libical/acconfig.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/autogen.sh?h=rel-0_6_2'>libical/autogen.sh</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/configure.in?h=rel-0_6_2'>libical/configure.in</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/.cvsignore?h=rel-0_6_2'>libical/design-data/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/Makefile.am?h=rel-0_6_2'>libical/design-data/Makefile.am</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/components.txt?h=rel-0_6_2'>libical/design-data/components.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/param-c-types.txt?h=rel-0_6_2'>libical/design-data/param-c-types.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/parameters.csv?h=rel-0_6_2'>libical/design-data/parameters.csv</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/params-in-prop.txt?h=rel-0_6_2'>libical/design-data/params-in-prop.txt</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/prop-to-value.txt?h=rel-0_6_2'>libical/design-data/prop-to-value.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/properties.csv?h=rel-0_6_2'>libical/design-data/properties.csv</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/property-tokens.txt?h=rel-0_6_2'>libical/design-data/property-tokens.txt</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/restrictions.csv?h=rel-0_6_2'>libical/design-data/restrictions.csv</a></td><td class='right'>1348</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/status.txt?h=rel-0_6_2'>libical/design-data/status.txt</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/value-c-types.txt?h=rel-0_6_2'>libical/design-data/value-c-types.txt</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/value-mem-semantics.txt?h=rel-0_6_2'>libical/design-data/value-mem-semantics.txt</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/value-types.csv?h=rel-0_6_2'>libical/design-data/value-types.csv</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/.cvsignore?h=rel-0_6_2'>libical/doc/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/Makefile.am?h=rel-0_6_2'>libical/doc/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/UsingLibical.lyx?h=rel-0_6_2'>libical/doc/UsingLibical.lyx</a></td><td class='right'>2578</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/UsingLibical.ps?h=rel-0_6_2'>libical/doc/UsingLibical.ps</a></td><td class='right'>2327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/UsingLibical.txt?h=rel-0_6_2'>libical/doc/UsingLibical.txt</a></td><td class='right'>1384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/.cvsignore?h=rel-0_6_2'>libical/examples/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/Makefile.am?h=rel-0_6_2'>libical/examples/Makefile.am</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/access_components.c?h=rel-0_6_2'>libical/examples/access_components.c</a></td><td class='right'>319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/access_properties_and_parameters.c?h=rel-0_6_2'>libical/examples/access_properties_and_parameters.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/errors.c?h=rel-0_6_2'>libical/examples/errors.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/main.c?h=rel-0_6_2'>libical/examples/main.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/parse_text.c?h=rel-0_6_2'>libical/examples/parse_text.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/.cvsignore?h=rel-0_6_2'>libical/scripts/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/Makefile.am?h=rel-0_6_2'>libical/scripts/Makefile.am</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedcomponents.pl?h=rel-0_6_2'>libical/scripts/mkderivedcomponents.pl</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedparameters.pl?h=rel-0_6_2'>libical/scripts/mkderivedparameters.pl</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedproperties.pl?h=rel-0_6_2'>libical/scripts/mkderivedproperties.pl</a></td><td class='right'>240</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkderivedvalues.pl?h=rel-0_6_2'>libical/scripts/mkderivedvalues.pl</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkparameterrestrictions.pl?h=rel-0_6_2'>libical/scripts/mkparameterrestrictions.pl</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkrestrictionrecords.pl?h=rel-0_6_2'>libical/scripts/mkrestrictionrecords.pl</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkrestrictiontable.pl?h=rel-0_6_2'>libical/scripts/mkrestrictiontable.pl</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/readvaluesfile.pl?h=rel-0_6_2'>libical/scripts/readvaluesfile.pl</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/.cvsignore?h=rel-0_6_2'>libical/src/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/Makefile.am?h=rel-0_6_2'>libical/src/Makefile.am</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/.cvsignore?h=rel-0_6_2'>libical/src/libical/.cvsignore</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/Makefile.am?h=rel-0_6_2'>libical/src/libical/Makefile.am</a></td><td class='right'>238</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalarray.c?h=rel-0_6_2'>libical/src/libical/icalarray.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalarray.h?h=rel-0_6_2'>libical/src/libical/icalarray.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalattendee.c?h=rel-0_6_2'>libical/src/libical/icalattendee.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalattendee.h?h=rel-0_6_2'>libical/src/libical/icalattendee.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalcomponent.c?h=rel-0_6_2'>libical/src/libical/icalcomponent.c</a></td><td class='right'>1932</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalcomponent.h?h=rel-0_6_2'>libical/src/libical/icalcomponent.h</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedparameter.c.in?h=rel-0_6_2'>libical/src/libical/icalderivedparameter.c.in</a></td><td class='right'>211</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedparameter.h.in?h=rel-0_6_2'>libical/src/libical/icalderivedparameter.h.in</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedproperty.c.in?h=rel-0_6_2'>libical/src/libical/icalderivedproperty.c.in</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedproperty.h.in?h=rel-0_6_2'>libical/src/libical/icalderivedproperty.h.in</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedvalue.c.in?h=rel-0_6_2'>libical/src/libical/icalderivedvalue.c.in</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalderivedvalue.h.in?h=rel-0_6_2'>libical/src/libical/icalderivedvalue.h.in</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalduration.c?h=rel-0_6_2'>libical/src/libical/icalduration.c</a></td><td class='right'>320</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalduration.h?h=rel-0_6_2'>libical/src/libical/icalduration.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalenums.c?h=rel-0_6_2'>libical/src/libical/icalenums.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalenums.h?h=rel-0_6_2'>libical/src/libical/icalenums.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalerror.c?h=rel-0_6_2'>libical/src/libical/icalerror.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalerror.h?h=rel-0_6_2'>libical/src/libical/icalerror.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icallangbind.c?h=rel-0_6_2'>libical/src/libical/icallangbind.c</a></td><td class='right'>272</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icallangbind.h?h=rel-0_6_2'>libical/src/libical/icallangbind.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icallexer.l?h=rel-0_6_2'>libical/src/libical/icallexer.l</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalmemory.c?h=rel-0_6_2'>libical/src/libical/icalmemory.c</a></td><td class='right'>287</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalmemory.h?h=rel-0_6_2'>libical/src/libical/icalmemory.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalmime.c?h=rel-0_6_2'>libical/src/libical/icalmime.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalmime.h?h=rel-0_6_2'>libical/src/libical/icalmime.h</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalparameter.c?h=rel-0_6_2'>libical/src/libical/icalparameter.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalparameter.h?h=rel-0_6_2'>libical/src/libical/icalparameter.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalparameterimpl.h?h=rel-0_6_2'>libical/src/libical/icalparameterimpl.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalparser.c?h=rel-0_6_2'>libical/src/libical/icalparser.c</a></td><td class='right'>1121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalparser.h?h=rel-0_6_2'>libical/src/libical/icalparser.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalperiod.c?h=rel-0_6_2'>libical/src/libical/icalperiod.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalperiod.h?h=rel-0_6_2'>libical/src/libical/icalperiod.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalproperty.c?h=rel-0_6_2'>libical/src/libical/icalproperty.c</a></td><td class='right'>908</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalproperty.h?h=rel-0_6_2'>libical/src/libical/icalproperty.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalrecur.c?h=rel-0_6_2'>libical/src/libical/icalrecur.c</a></td><td class='right'>2370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalrecur.h?h=rel-0_6_2'>libical/src/libical/icalrecur.h</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalrestriction.c.in?h=rel-0_6_2'>libical/src/libical/icalrestriction.c.in</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalrestriction.h?h=rel-0_6_2'>libical/src/libical/icalrestriction.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltime.c?h=rel-0_6_2'>libical/src/libical/icaltime.c</a></td><td class='right'>737</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltime.h?h=rel-0_6_2'>libical/src/libical/icaltime.h</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltimezone.c?h=rel-0_6_2'>libical/src/libical/icaltimezone.c</a></td><td class='right'>1677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltimezone.h?h=rel-0_6_2'>libical/src/libical/icaltimezone.h</a></td><td class='right'>149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltypes.c?h=rel-0_6_2'>libical/src/libical/icaltypes.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icaltypes.h?h=rel-0_6_2'>libical/src/libical/icaltypes.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalvalue.c?h=rel-0_6_2'>libical/src/libical/icalvalue.c</a></td><td class='right'>1256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalvalue.h?h=rel-0_6_2'>libical/src/libical/icalvalue.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalvalueimpl.h?h=rel-0_6_2'>libical/src/libical/icalvalueimpl.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalversion.h.in?h=rel-0_6_2'>libical/src/libical/icalversion.h.in</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalyacc.y?h=rel-0_6_2'>libical/src/libical/icalyacc.y</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/pvl.c?h=rel-0_6_2'>libical/src/libical/pvl.c</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/pvl.h?h=rel-0_6_2'>libical/src/libical/pvl.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/sspm.c?h=rel-0_6_2'>libical/src/libical/sspm.c</a></td><td class='right'>1613</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.7%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/sspm.h?h=rel-0_6_2'>libical/src/libical/sspm.h</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/vsnprintf.c?h=rel-0_6_2'>libical/src/libical/vsnprintf.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/.cvsignore?h=rel-0_6_2'>libical/src/libicalss/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/Makefile.am?h=rel-0_6_2'>libical/src/libicalss/Makefile.am</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcalendar.c?h=rel-0_6_2'>libical/src/libicalss/icalcalendar.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcalendar.h?h=rel-0_6_2'>libical/src/libicalss/icalcalendar.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalclassify.c?h=rel-0_6_2'>libical/src/libicalss/icalclassify.c</a></td><td class='right'>696</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalclassify.h?h=rel-0_6_2'>libical/src/libicalss/icalclassify.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcomponent.h?h=rel-0_6_2'>libical/src/libicalss/icalcomponent.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcsdb.h?h=rel-0_6_2'>libical/src/libicalss/icalcsdb.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstp.c?h=rel-0_6_2'>libical/src/libicalss/icalcstp.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstp.h?h=rel-0_6_2'>libical/src/libicalss/icalcstp.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstpclient.c?h=rel-0_6_2'>libical/src/libicalss/icalcstpclient.c</a></td><td class='right'>343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstpclient.h?h=rel-0_6_2'>libical/src/libicalss/icalcstpclient.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstpserver.c?h=rel-0_6_2'>libical/src/libicalss/icalcstpserver.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalcstpserver.h?h=rel-0_6_2'>libical/src/libicalss/icalcstpserver.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icaldirset.c?h=rel-0_6_2'>libical/src/libicalss/icaldirset.c</a></td><td class='right'>753</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icaldirset.h?h=rel-0_6_2'>libical/src/libicalss/icaldirset.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icaldirsetimpl.h?h=rel-0_6_2'>libical/src/libicalss/icaldirsetimpl.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalfileset.c?h=rel-0_6_2'>libical/src/libicalss/icalfileset.c</a></td><td class='right'>637</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalfileset.h?h=rel-0_6_2'>libical/src/libicalss/icalfileset.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalfilesetimpl.h?h=rel-0_6_2'>libical/src/libicalss/icalfilesetimpl.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalgauge.c?h=rel-0_6_2'>libical/src/libicalss/icalgauge.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalgauge.h?h=rel-0_6_2'>libical/src/libicalss/icalgauge.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalgaugeimpl.h?h=rel-0_6_2'>libical/src/libicalss/icalgaugeimpl.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalmessage.c?h=rel-0_6_2'>libical/src/libicalss/icalmessage.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalmessage.h?h=rel-0_6_2'>libical/src/libicalss/icalmessage.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalset.c?h=rel-0_6_2'>libical/src/libicalss/icalset.c</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalset.h?h=rel-0_6_2'>libical/src/libicalss/icalset.h</a></td><td class='right'>111</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalspanlist.c?h=rel-0_6_2'>libical/src/libicalss/icalspanlist.c</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalspanlist.h?h=rel-0_6_2'>libical/src/libicalss/icalspanlist.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalsslexer.l?h=rel-0_6_2'>libical/src/libicalss/icalsslexer.l</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalssutil.c?h=rel-0_6_2'>libical/src/libicalss/icalssutil.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalssutil.h?h=rel-0_6_2'>libical/src/libicalss/icalssutil.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalssyacc.h?h=rel-0_6_2'>libical/src/libicalss/icalssyacc.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icalssyacc.y?h=rel-0_6_2'>libical/src/libicalss/icalssyacc.y</a></td><td class='right'>245</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/.cvsignore?h=rel-0_6_2'>libical/src/libicalvcal/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/Makefile.am?h=rel-0_6_2'>libical/src/libicalvcal/Makefile.am</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/README.TXT?h=rel-0_6_2'>libical/src/libicalvcal/README.TXT</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/icalvcal.c?h=rel-0_6_2'>libical/src/libicalvcal/icalvcal.c</a></td><td class='right'>1636</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/icalvcal.h?h=rel-0_6_2'>libical/src/libicalvcal/icalvcal.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/port.h?h=rel-0_6_2'>libical/src/libicalvcal/port.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcaltest.c?h=rel-0_6_2'>libical/src/libicalvcal/vcaltest.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcaltmp.c?h=rel-0_6_2'>libical/src/libicalvcal/vcaltmp.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcaltmp.h?h=rel-0_6_2'>libical/src/libicalvcal/vcaltmp.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcc.h?h=rel-0_6_2'>libical/src/libicalvcal/vcc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcc.y?h=rel-0_6_2'>libical/src/libicalvcal/vcc.y</a></td><td class='right'>1195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vctest.c?h=rel-0_6_2'>libical/src/libicalvcal/vctest.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vobject.c?h=rel-0_6_2'>libical/src/libicalvcal/vobject.c</a></td><td class='right'>1449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vobject.h?h=rel-0_6_2'>libical/src/libicalvcal/vobject.h</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/.cvsignore?h=rel-0_6_2'>libical/src/python/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/ChangeLog?h=rel-0_6_2'>libical/src/python/ChangeLog</a></td><td class='right'>109</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Collection.py?h=rel-0_6_2'>libical/src/python/Collection.py</a></td><td class='right'>124</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Component.py?h=rel-0_6_2'>libical/src/python/Component.py</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/DerivedProperties.py?h=rel-0_6_2'>libical/src/python/DerivedProperties.py</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Libical.py?h=rel-0_6_2'>libical/src/python/Libical.py</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/LibicalWrap.i?h=rel-0_6_2'>libical/src/python/LibicalWrap.i</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Makefile.am?h=rel-0_6_2'>libical/src/python/Makefile.am</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Property.py?h=rel-0_6_2'>libical/src/python/Property.py</a></td><td class='right'>839</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/Store.py?h=rel-0_6_2'>libical/src/python/Store.py</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/python-binding.txt?h=rel-0_6_2'>libical/src/python/python-binding.txt</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/python/test.py?h=rel-0_6_2'>libical/src/python/test.py</a></td><td class='right'>373</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/.cvsignore?h=rel-0_6_2'>libical/src/test/.cvsignore</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/Makefile.am?h=rel-0_6_2'>libical/src/test/Makefile.am</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/copycluster.c?h=rel-0_6_2'>libical/src/test/copycluster.c</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/findobj.c?h=rel-0_6_2'>libical/src/test/findobj.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/icaltestparser.c?h=rel-0_6_2'>libical/src/test/icaltestparser.c</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/process.c?h=rel-0_6_2'>libical/src/test/process.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/recur.c?h=rel-0_6_2'>libical/src/test/recur.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/regression.c?h=rel-0_6_2'>libical/src/test/regression.c</a></td><td class='right'>3605</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.3%;'/><td class='none' style='width: 91.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/storage.c?h=rel-0_6_2'>libical/src/test/storage.c</a></td><td class='right'>459</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/stow.c?h=rel-0_6_2'>libical/src/test/stow.c</a></td><td class='right'>866</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/testclassify.c?h=rel-0_6_2'>libical/src/test/testclassify.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/testmime.c?h=rel-0_6_2'>libical/src/test/testmime.c</a></td><td class='right'>340</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/testvcal.c?h=rel-0_6_2'>libical/src/test/testvcal.c</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/.cvsignore?h=rel-0_6_2'>libical/test-data/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/0?h=rel-0_6_2'>libical/test-data/0</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/1?h=rel-0_6_2'>libical/test-data/1</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/1.1?h=rel-0_6_2'>libical/test-data/1.1</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/2?h=rel-0_6_2'>libical/test-data/2</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/2445.ics?h=rel-0_6_2'>libical/test-data/2445.ics</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/2446.ics?h=rel-0_6_2'>libical/test-data/2446.ics</a></td><td class='right'>1006</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/3?h=rel-0_6_2'>libical/test-data/3</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/4?h=rel-0_6_2'>libical/test-data/4</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/5?h=rel-0_6_2'>libical/test-data/5</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/6?h=rel-0_6_2'>libical/test-data/6</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/7?h=rel-0_6_2'>libical/test-data/7</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/Makefile.am?h=rel-0_6_2'>libical/test-data/Makefile.am</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/calendar.ics?h=rel-0_6_2'>libical/test-data/calendar.ics</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/classify.ics?h=rel-0_6_2'>libical/test-data/classify.ics</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/complex-mime.txt?h=rel-0_6_2'>libical/test-data/complex-mime.txt</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/incoming.ics?h=rel-0_6_2'>libical/test-data/incoming.ics</a></td><td class='right'>168</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/overlaps.ics?h=rel-0_6_2'>libical/test-data/overlaps.ics</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/process-incoming.ics?h=rel-0_6_2'>libical/test-data/process-incoming.ics</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/recur.txt?h=rel-0_6_2'>libical/test-data/recur.txt</a></td><td class='right'>404</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/restriction.ics?h=rel-0_6_2'>libical/test-data/restriction.ics</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/simple-mime.txt?h=rel-0_6_2'>libical/test-data/simple-mime.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/smallcluster.ics?h=rel-0_6_2'>libical/test-data/smallcluster.ics</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/stresstest.ics?h=rel-0_6_2'>libical/test-data/stresstest.ics</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/user-cal.vcf?h=rel-0_6_2'>libical/test-data/user-cal.vcf</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/.cvsignore?h=rel-0_6_2'>libical/zoneinfo/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Abidjan.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Abidjan.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Accra.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Accra.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Addis_Ababa.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Addis_Ababa.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Algiers.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Algiers.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Asmera.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Asmera.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Bamako.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Bamako.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Bangui.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Bangui.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Banjul.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Banjul.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Bissau.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Bissau.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Blantyre.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Blantyre.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Brazzaville.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Brazzaville.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Bujumbura.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Bujumbura.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Cairo.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Cairo.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Casablanca.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Casablanca.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Ceuta.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Ceuta.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Conakry.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Conakry.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Dakar.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Dakar.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Dar_es_Salaam.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Dar_es_Salaam.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Djibouti.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Djibouti.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Douala.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Douala.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/El_Aaiun.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/El_Aaiun.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Freetown.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Freetown.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Gaborone.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Gaborone.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Harare.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Harare.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Johannesburg.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Johannesburg.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Kampala.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Kampala.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Khartoum.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Khartoum.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Kigali.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Kigali.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Kinshasa.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Kinshasa.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Lagos.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Lagos.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Libreville.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Libreville.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Lome.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Lome.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Luanda.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Luanda.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Lubumbashi.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Lubumbashi.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Lusaka.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Lusaka.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Malabo.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Malabo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Maputo.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Maputo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Maseru.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Maseru.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Mbabane.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Mbabane.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Mogadishu.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Mogadishu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Monrovia.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Monrovia.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Nairobi.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Nairobi.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Ndjamena.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Ndjamena.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Niamey.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Niamey.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Nouakchott.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Nouakchott.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Ouagadougou.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Ouagadougou.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Porto-Novo.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Porto-Novo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Sao_Tome.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Sao_Tome.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Timbuktu.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Timbuktu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Tripoli.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Tripoli.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Tunis.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Tunis.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Africa/Windhoek.ics?h=rel-0_6_2'>libical/zoneinfo/Africa/Windhoek.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Adak.ics?h=rel-0_6_2'>libical/zoneinfo/America/Adak.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Anchorage.ics?h=rel-0_6_2'>libical/zoneinfo/America/Anchorage.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Anguilla.ics?h=rel-0_6_2'>libical/zoneinfo/America/Anguilla.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Antigua.ics?h=rel-0_6_2'>libical/zoneinfo/America/Antigua.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Araguaina.ics?h=rel-0_6_2'>libical/zoneinfo/America/Araguaina.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Aruba.ics?h=rel-0_6_2'>libical/zoneinfo/America/Aruba.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Asuncion.ics?h=rel-0_6_2'>libical/zoneinfo/America/Asuncion.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Barbados.ics?h=rel-0_6_2'>libical/zoneinfo/America/Barbados.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Belem.ics?h=rel-0_6_2'>libical/zoneinfo/America/Belem.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Belize.ics?h=rel-0_6_2'>libical/zoneinfo/America/Belize.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Boa_Vista.ics?h=rel-0_6_2'>libical/zoneinfo/America/Boa_Vista.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Bogota.ics?h=rel-0_6_2'>libical/zoneinfo/America/Bogota.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Boise.ics?h=rel-0_6_2'>libical/zoneinfo/America/Boise.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Buenos_Aires.ics?h=rel-0_6_2'>libical/zoneinfo/America/Buenos_Aires.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cambridge_Bay.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cambridge_Bay.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cancun.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cancun.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Caracas.ics?h=rel-0_6_2'>libical/zoneinfo/America/Caracas.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Catamarca.ics?h=rel-0_6_2'>libical/zoneinfo/America/Catamarca.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cayenne.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cayenne.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cayman.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cayman.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Chicago.ics?h=rel-0_6_2'>libical/zoneinfo/America/Chicago.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Chihuahua.ics?h=rel-0_6_2'>libical/zoneinfo/America/Chihuahua.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cordoba.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cordoba.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Costa_Rica.ics?h=rel-0_6_2'>libical/zoneinfo/America/Costa_Rica.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Cuiaba.ics?h=rel-0_6_2'>libical/zoneinfo/America/Cuiaba.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Curacao.ics?h=rel-0_6_2'>libical/zoneinfo/America/Curacao.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Danmarkshavn.ics?h=rel-0_6_2'>libical/zoneinfo/America/Danmarkshavn.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Dawson.ics?h=rel-0_6_2'>libical/zoneinfo/America/Dawson.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Dawson_Creek.ics?h=rel-0_6_2'>libical/zoneinfo/America/Dawson_Creek.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Denver.ics?h=rel-0_6_2'>libical/zoneinfo/America/Denver.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Detroit.ics?h=rel-0_6_2'>libical/zoneinfo/America/Detroit.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Dominica.ics?h=rel-0_6_2'>libical/zoneinfo/America/Dominica.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Edmonton.ics?h=rel-0_6_2'>libical/zoneinfo/America/Edmonton.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Eirunepe.ics?h=rel-0_6_2'>libical/zoneinfo/America/Eirunepe.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/El_Salvador.ics?h=rel-0_6_2'>libical/zoneinfo/America/El_Salvador.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Fortaleza.ics?h=rel-0_6_2'>libical/zoneinfo/America/Fortaleza.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Glace_Bay.ics?h=rel-0_6_2'>libical/zoneinfo/America/Glace_Bay.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Godthab.ics?h=rel-0_6_2'>libical/zoneinfo/America/Godthab.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Goose_Bay.ics?h=rel-0_6_2'>libical/zoneinfo/America/Goose_Bay.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Grand_Turk.ics?h=rel-0_6_2'>libical/zoneinfo/America/Grand_Turk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Grenada.ics?h=rel-0_6_2'>libical/zoneinfo/America/Grenada.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Guadeloupe.ics?h=rel-0_6_2'>libical/zoneinfo/America/Guadeloupe.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Guatemala.ics?h=rel-0_6_2'>libical/zoneinfo/America/Guatemala.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Guayaquil.ics?h=rel-0_6_2'>libical/zoneinfo/America/Guayaquil.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Guyana.ics?h=rel-0_6_2'>libical/zoneinfo/America/Guyana.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Halifax.ics?h=rel-0_6_2'>libical/zoneinfo/America/Halifax.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Havana.ics?h=rel-0_6_2'>libical/zoneinfo/America/Havana.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Hermosillo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Hermosillo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Indiana/Indianapolis.ics?h=rel-0_6_2'>libical/zoneinfo/America/Indiana/Indianapolis.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Indiana/Knox.ics?h=rel-0_6_2'>libical/zoneinfo/America/Indiana/Knox.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Indiana/Marengo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Indiana/Marengo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Indiana/Vevay.ics?h=rel-0_6_2'>libical/zoneinfo/America/Indiana/Vevay.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Indianapolis.ics?h=rel-0_6_2'>libical/zoneinfo/America/Indianapolis.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Inuvik.ics?h=rel-0_6_2'>libical/zoneinfo/America/Inuvik.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Iqaluit.ics?h=rel-0_6_2'>libical/zoneinfo/America/Iqaluit.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Jamaica.ics?h=rel-0_6_2'>libical/zoneinfo/America/Jamaica.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Jujuy.ics?h=rel-0_6_2'>libical/zoneinfo/America/Jujuy.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Juneau.ics?h=rel-0_6_2'>libical/zoneinfo/America/Juneau.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Kentucky/Louisville.ics?h=rel-0_6_2'>libical/zoneinfo/America/Kentucky/Louisville.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Kentucky/Monticello.ics?h=rel-0_6_2'>libical/zoneinfo/America/Kentucky/Monticello.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/La_Paz.ics?h=rel-0_6_2'>libical/zoneinfo/America/La_Paz.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Lima.ics?h=rel-0_6_2'>libical/zoneinfo/America/Lima.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Los_Angeles.ics?h=rel-0_6_2'>libical/zoneinfo/America/Los_Angeles.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Louisville.ics?h=rel-0_6_2'>libical/zoneinfo/America/Louisville.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Maceio.ics?h=rel-0_6_2'>libical/zoneinfo/America/Maceio.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Managua.ics?h=rel-0_6_2'>libical/zoneinfo/America/Managua.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Manaus.ics?h=rel-0_6_2'>libical/zoneinfo/America/Manaus.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Martinique.ics?h=rel-0_6_2'>libical/zoneinfo/America/Martinique.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Mazatlan.ics?h=rel-0_6_2'>libical/zoneinfo/America/Mazatlan.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Mendoza.ics?h=rel-0_6_2'>libical/zoneinfo/America/Mendoza.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Menominee.ics?h=rel-0_6_2'>libical/zoneinfo/America/Menominee.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Merida.ics?h=rel-0_6_2'>libical/zoneinfo/America/Merida.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Mexico_City.ics?h=rel-0_6_2'>libical/zoneinfo/America/Mexico_City.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Miquelon.ics?h=rel-0_6_2'>libical/zoneinfo/America/Miquelon.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Monterrey.ics?h=rel-0_6_2'>libical/zoneinfo/America/Monterrey.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Montevideo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Montevideo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Montreal.ics?h=rel-0_6_2'>libical/zoneinfo/America/Montreal.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Montserrat.ics?h=rel-0_6_2'>libical/zoneinfo/America/Montserrat.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Nassau.ics?h=rel-0_6_2'>libical/zoneinfo/America/Nassau.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/New_York.ics?h=rel-0_6_2'>libical/zoneinfo/America/New_York.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Nipigon.ics?h=rel-0_6_2'>libical/zoneinfo/America/Nipigon.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Nome.ics?h=rel-0_6_2'>libical/zoneinfo/America/Nome.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Noronha.ics?h=rel-0_6_2'>libical/zoneinfo/America/Noronha.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/North_Dakota/Center.ics?h=rel-0_6_2'>libical/zoneinfo/America/North_Dakota/Center.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Panama.ics?h=rel-0_6_2'>libical/zoneinfo/America/Panama.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Pangnirtung.ics?h=rel-0_6_2'>libical/zoneinfo/America/Pangnirtung.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Paramaribo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Paramaribo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Phoenix.ics?h=rel-0_6_2'>libical/zoneinfo/America/Phoenix.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Port-au-Prince.ics?h=rel-0_6_2'>libical/zoneinfo/America/Port-au-Prince.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Port_of_Spain.ics?h=rel-0_6_2'>libical/zoneinfo/America/Port_of_Spain.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Porto_Velho.ics?h=rel-0_6_2'>libical/zoneinfo/America/Porto_Velho.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Puerto_Rico.ics?h=rel-0_6_2'>libical/zoneinfo/America/Puerto_Rico.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Rainy_River.ics?h=rel-0_6_2'>libical/zoneinfo/America/Rainy_River.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Rankin_Inlet.ics?h=rel-0_6_2'>libical/zoneinfo/America/Rankin_Inlet.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Recife.ics?h=rel-0_6_2'>libical/zoneinfo/America/Recife.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Regina.ics?h=rel-0_6_2'>libical/zoneinfo/America/Regina.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Rio_Branco.ics?h=rel-0_6_2'>libical/zoneinfo/America/Rio_Branco.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Rosario.ics?h=rel-0_6_2'>libical/zoneinfo/America/Rosario.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Santiago.ics?h=rel-0_6_2'>libical/zoneinfo/America/Santiago.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Santo_Domingo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Santo_Domingo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Sao_Paulo.ics?h=rel-0_6_2'>libical/zoneinfo/America/Sao_Paulo.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Scoresbysund.ics?h=rel-0_6_2'>libical/zoneinfo/America/Scoresbysund.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Shiprock.ics?h=rel-0_6_2'>libical/zoneinfo/America/Shiprock.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/St_Johns.ics?h=rel-0_6_2'>libical/zoneinfo/America/St_Johns.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/St_Kitts.ics?h=rel-0_6_2'>libical/zoneinfo/America/St_Kitts.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/St_Lucia.ics?h=rel-0_6_2'>libical/zoneinfo/America/St_Lucia.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/St_Thomas.ics?h=rel-0_6_2'>libical/zoneinfo/America/St_Thomas.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/St_Vincent.ics?h=rel-0_6_2'>libical/zoneinfo/America/St_Vincent.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Swift_Current.ics?h=rel-0_6_2'>libical/zoneinfo/America/Swift_Current.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Tegucigalpa.ics?h=rel-0_6_2'>libical/zoneinfo/America/Tegucigalpa.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Thule.ics?h=rel-0_6_2'>libical/zoneinfo/America/Thule.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Thunder_Bay.ics?h=rel-0_6_2'>libical/zoneinfo/America/Thunder_Bay.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Tijuana.ics?h=rel-0_6_2'>libical/zoneinfo/America/Tijuana.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Tortola.ics?h=rel-0_6_2'>libical/zoneinfo/America/Tortola.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Vancouver.ics?h=rel-0_6_2'>libical/zoneinfo/America/Vancouver.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Whitehorse.ics?h=rel-0_6_2'>libical/zoneinfo/America/Whitehorse.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Winnipeg.ics?h=rel-0_6_2'>libical/zoneinfo/America/Winnipeg.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Yakutat.ics?h=rel-0_6_2'>libical/zoneinfo/America/Yakutat.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/America/Yellowknife.ics?h=rel-0_6_2'>libical/zoneinfo/America/Yellowknife.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Casey.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Casey.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Davis.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Davis.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/DumontDUrville.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/DumontDUrville.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Mawson.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Mawson.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/McMurdo.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/McMurdo.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Palmer.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Palmer.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/South_Pole.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/South_Pole.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Syowa.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Syowa.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Antarctica/Vostok.ics?h=rel-0_6_2'>libical/zoneinfo/Antarctica/Vostok.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Arctic/Longyearbyen.ics?h=rel-0_6_2'>libical/zoneinfo/Arctic/Longyearbyen.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Aden.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Aden.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Almaty.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Almaty.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Amman.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Amman.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Anadyr.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Anadyr.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Aqtau.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Aqtau.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Aqtobe.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Aqtobe.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Ashgabat.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Ashgabat.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Baghdad.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Baghdad.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Bahrain.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Bahrain.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Baku.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Baku.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Bangkok.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Bangkok.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Beirut.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Beirut.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Bishkek.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Bishkek.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Brunei.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Brunei.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Calcutta.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Calcutta.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Choibalsan.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Choibalsan.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Chongqing.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Chongqing.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Chungking.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Chungking.ics</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Colombo.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Colombo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Damascus.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Damascus.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Dhaka.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Dhaka.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Dili.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Dili.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Dubai.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Dubai.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Dushanbe.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Dushanbe.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Gaza.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Gaza.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Harbin.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Harbin.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Hong_Kong.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Hong_Kong.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Hovd.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Hovd.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Irkutsk.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Irkutsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Istanbul.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Istanbul.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Jakarta.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Jakarta.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Jayapura.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Jayapura.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Jerusalem.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Jerusalem.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kabul.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kabul.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kamchatka.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kamchatka.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Karachi.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Karachi.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kashgar.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kashgar.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Katmandu.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Katmandu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Krasnoyarsk.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Krasnoyarsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kuala_Lumpur.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kuala_Lumpur.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kuching.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kuching.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Kuwait.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Kuwait.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Macao.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Macao.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Magadan.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Magadan.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Manila.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Manila.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Muscat.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Muscat.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Nicosia.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Nicosia.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Novosibirsk.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Novosibirsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Omsk.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Omsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Phnom_Penh.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Phnom_Penh.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Pontianak.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Pontianak.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Pyongyang.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Pyongyang.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Qatar.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Qatar.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Rangoon.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Rangoon.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Riyadh.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Riyadh.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Saigon.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Saigon.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Sakhalin.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Sakhalin.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Samarkand.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Samarkand.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Seoul.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Seoul.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Shanghai.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Shanghai.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Singapore.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Singapore.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Taipei.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Taipei.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Tashkent.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Tashkent.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Tbilisi.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Tbilisi.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Tehran.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Tehran.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Thimphu.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Thimphu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Tokyo.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Tokyo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Ujung_Pandang.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Ujung_Pandang.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Ulaanbaatar.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Ulaanbaatar.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Urumqi.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Urumqi.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Vientiane.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Vientiane.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Vladivostok.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Vladivostok.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Yakutsk.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Yakutsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Yekaterinburg.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Yekaterinburg.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Asia/Yerevan.ics?h=rel-0_6_2'>libical/zoneinfo/Asia/Yerevan.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Azores.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Azores.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Bermuda.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Bermuda.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Canary.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Canary.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Cape_Verde.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Cape_Verde.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Faeroe.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Faeroe.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Jan_Mayen.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Jan_Mayen.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Madeira.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Madeira.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Reykjavik.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Reykjavik.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/South_Georgia.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/South_Georgia.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/St_Helena.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/St_Helena.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Atlantic/Stanley.ics?h=rel-0_6_2'>libical/zoneinfo/Atlantic/Stanley.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Adelaide.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Adelaide.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Brisbane.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Brisbane.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Broken_Hill.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Broken_Hill.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Darwin.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Darwin.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Hobart.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Hobart.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Lindeman.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Lindeman.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Lord_Howe.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Lord_Howe.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Melbourne.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Melbourne.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Perth.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Perth.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Australia/Sydney.ics?h=rel-0_6_2'>libical/zoneinfo/Australia/Sydney.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Amsterdam.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Amsterdam.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Andorra.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Andorra.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Athens.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Athens.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Belfast.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Belfast.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Belgrade.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Belgrade.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Berlin.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Berlin.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Bratislava.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Bratislava.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Brussels.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Brussels.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Bucharest.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Bucharest.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Budapest.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Budapest.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Chisinau.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Chisinau.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Copenhagen.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Copenhagen.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Dublin.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Dublin.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Gibraltar.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Gibraltar.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Helsinki.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Helsinki.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Istanbul.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Istanbul.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Kaliningrad.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Kaliningrad.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Kiev.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Kiev.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Lisbon.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Lisbon.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Ljubljana.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Ljubljana.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/London.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/London.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Luxembourg.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Luxembourg.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Madrid.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Madrid.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Malta.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Malta.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Minsk.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Minsk.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Monaco.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Monaco.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Moscow.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Moscow.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Nicosia.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Nicosia.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Oslo.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Oslo.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Paris.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Paris.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Prague.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Prague.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Riga.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Riga.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Rome.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Rome.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Samara.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Samara.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/San_Marino.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/San_Marino.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Sarajevo.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Sarajevo.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Simferopol.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Simferopol.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Skopje.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Skopje.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Sofia.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Sofia.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Stockholm.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Stockholm.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Tallinn.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Tallinn.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Tirane.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Tirane.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Uzhgorod.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Uzhgorod.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Vaduz.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Vaduz.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Vatican.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Vatican.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Vienna.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Vienna.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Vilnius.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Vilnius.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Warsaw.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Warsaw.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Zagreb.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Zagreb.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Zaporozhye.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Zaporozhye.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Europe/Zurich.ics?h=rel-0_6_2'>libical/zoneinfo/Europe/Zurich.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Antananarivo.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Antananarivo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Chagos.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Chagos.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Christmas.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Christmas.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Cocos.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Cocos.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Comoro.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Comoro.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Kerguelen.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Kerguelen.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Mahe.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Mahe.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Maldives.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Maldives.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Mauritius.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Mauritius.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Mayotte.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Mayotte.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Indian/Reunion.ics?h=rel-0_6_2'>libical/zoneinfo/Indian/Reunion.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Makefile.am?h=rel-0_6_2'>libical/zoneinfo/Makefile.am</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Apia.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Apia.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Auckland.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Auckland.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Chatham.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Chatham.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Easter.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Easter.ics</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Efate.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Efate.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Enderbury.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Enderbury.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Fakaofo.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Fakaofo.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Fiji.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Fiji.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Funafuti.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Funafuti.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Galapagos.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Galapagos.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Gambier.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Gambier.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Guadalcanal.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Guadalcanal.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Guam.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Guam.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Honolulu.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Honolulu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Johnston.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Johnston.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Kiritimati.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Kiritimati.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Kosrae.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Kosrae.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Kwajalein.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Kwajalein.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Majuro.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Majuro.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Marquesas.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Marquesas.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Midway.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Midway.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Nauru.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Nauru.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Niue.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Niue.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Norfolk.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Norfolk.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Noumea.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Noumea.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Pago_Pago.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Pago_Pago.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Palau.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Palau.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Pitcairn.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Pitcairn.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Ponape.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Ponape.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Port_Moresby.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Port_Moresby.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Rarotonga.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Rarotonga.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Saipan.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Saipan.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Tahiti.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Tahiti.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Tarawa.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Tarawa.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Tongatapu.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Tongatapu.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Truk.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Truk.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Wake.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Wake.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Wallis.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Wallis.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/Pacific/Yap.ics?h=rel-0_6_2'>libical/zoneinfo/Pacific/Yap.ics</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/zoneinfo/zones.tab?h=rel-0_6_2'>libical/zoneinfo/zones.tab</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/Makefile.am?h=rel-0_6_2'>libversit/Makefile.am</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/README.TXT?h=rel-0_6_2'>libversit/README.TXT</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/port.h?h=rel-0_6_2'>libversit/port.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vcaltest.c?h=rel-0_6_2'>libversit/vcaltest.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vcaltmp.c?h=rel-0_6_2'>libversit/vcaltmp.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vcaltmp.h?h=rel-0_6_2'>libversit/vcaltmp.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vcc.h?h=rel-0_6_2'>libversit/vcc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vcc.y?h=rel-0_6_2'>libversit/vcc.y</a></td><td class='right'>1280</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vctest.c?h=rel-0_6_2'>libversit/vctest.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vobject.c?h=rel-0_6_2'>libversit/vobject.c</a></td><td class='right'>1469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libversit/vobject.h?h=rel-0_6_2'>libversit/vobject.h</a></td><td class='right'>367</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libwombat/.cvsignore?h=rel-0_6_2'>libwombat/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libwombat/ChangeLog?h=rel-0_6_2'>libwombat/ChangeLog</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libwombat/Makefile.am?h=rel-0_6_2'>libwombat/Makefile.am</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libwombat/wombat-client.c?h=rel-0_6_2'>libwombat/wombat-client.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libwombat/wombat-client.h?h=rel-0_6_2'>libwombat/wombat-client.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/.cvsignore?h=rel-0_6_2'>mail/.cvsignore</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/ChangeLog?h=rel-0_6_2'>mail/ChangeLog</a></td><td class='right'>19513</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 45.0%;'/><td class='none' style='width: 55.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/GNOME_Evolution_Mail.oaf.in?h=rel-0_6_2'>mail/GNOME_Evolution_Mail.oaf.in</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/Mail.idl?h=rel-0_6_2'>mail/Mail.idl</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/Makefile.am?h=rel-0_6_2'>mail/Makefile.am</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/README.async?h=rel-0_6_2'>mail/README.async</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/Spell.idl?h=rel-0_6_2'>mail/Spell.idl</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/component-factory.c?h=rel-0_6_2'>mail/component-factory.c</a></td><td class='right'>1439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/component-factory.h?h=rel-0_6_2'>mail/component-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/e-attchmt.png?h=rel-0_6_2'>mail/e-attchmt.png</a></td><td class='right'>bin</td><td class='graph'>169 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/e-searching-tokenizer.c?h=rel-0_6_2'>mail/e-searching-tokenizer.c</a></td><td class='right'>1037</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/e-searching-tokenizer.h?h=rel-0_6_2'>mail/e-searching-tokenizer.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-factory.c?h=rel-0_6_2'>mail/folder-browser-factory.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-factory.h?h=rel-0_6_2'>mail/folder-browser-factory.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-ui.c?h=rel-0_6_2'>mail/folder-browser-ui.c</a></td><td class='right'>687</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-ui.h?h=rel-0_6_2'>mail/folder-browser-ui.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-window.c?h=rel-0_6_2'>mail/folder-browser-window.c</a></td><td class='right'>134</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser-window.h?h=rel-0_6_2'>mail/folder-browser-window.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser.c?h=rel-0_6_2'>mail/folder-browser.c</a></td><td class='right'>2496</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.8%;'/><td class='none' style='width: 94.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-browser.h?h=rel-0_6_2'>mail/folder-browser.h</a></td><td class='right'>180</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-info.c?h=rel-0_6_2'>mail/folder-info.c</a></td><td class='right'>306</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/folder-info.h?h=rel-0_6_2'>mail/folder-info.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/.cvsignore?h=rel-0_6_2'>mail/importers/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in?h=rel-0_6_2'>mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in?h=rel-0_6_2'>mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/Makefile.am?h=rel-0_6_2'>mail/importers/Makefile.am</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/evolution-mbox-importer.c?h=rel-0_6_2'>mail/importers/evolution-mbox-importer.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/evolution-outlook-importer.c?h=rel-0_6_2'>mail/importers/evolution-outlook-importer.c</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/importers/mozilla-status-headers.h?h=rel-0_6_2'>mail/importers/mozilla-status-headers.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/local-config.glade?h=rel-0_6_2'>mail/local-config.glade</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-editor-news.c?h=rel-0_6_2'>mail/mail-account-editor-news.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-editor-news.h?h=rel-0_6_2'>mail/mail-account-editor-news.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-editor.c?h=rel-0_6_2'>mail/mail-account-editor.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-editor.h?h=rel-0_6_2'>mail/mail-account-editor.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-gui.c?h=rel-0_6_2'>mail/mail-account-gui.c</a></td><td class='right'>2097</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-account-gui.h?h=rel-0_6_2'>mail/mail-account-gui.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-accounts.c?h=rel-0_6_2'>mail/mail-accounts.c</a></td><td class='right'>862</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-accounts.etspec?h=rel-0_6_2'>mail/mail-accounts.etspec</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-accounts.h?h=rel-0_6_2'>mail/mail-accounts.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-autofilter.c?h=rel-0_6_2'>mail/mail-autofilter.c</a></td><td class='right'>434</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-autofilter.h?h=rel-0_6_2'>mail/mail-autofilter.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-callbacks.c?h=rel-0_6_2'>mail/mail-callbacks.c</a></td><td class='right'>3237</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-callbacks.h?h=rel-0_6_2'>mail/mail-callbacks.h</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-composer-prefs.c?h=rel-0_6_2'>mail/mail-composer-prefs.c</a></td><td class='right'>928</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-composer-prefs.h?h=rel-0_6_2'>mail/mail-composer-prefs.h</a></td><td class='right'>133</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config-druid.c?h=rel-0_6_2'>mail/mail-config-druid.c</a></td><td class='right'>983</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config-druid.h?h=rel-0_6_2'>mail/mail-config-druid.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config-factory.c?h=rel-0_6_2'>mail/mail-config-factory.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config-factory.h?h=rel-0_6_2'>mail/mail-config-factory.h</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config.c?h=rel-0_6_2'>mail/mail-config.c</a></td><td class='right'>3003</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config.glade?h=rel-0_6_2'>mail/mail-config.glade</a></td><td class='right'>5039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.6%;'/><td class='none' style='width: 88.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config.h?h=rel-0_6_2'>mail/mail-config.h</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-crypto.c?h=rel-0_6_2'>mail/mail-crypto.c</a></td><td class='right'>300</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-crypto.h?h=rel-0_6_2'>mail/mail-crypto.h</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-display.c?h=rel-0_6_2'>mail/mail-display.c</a></td><td class='right'>2422</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.6%;'/><td class='none' style='width: 94.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-display.h?h=rel-0_6_2'>mail/mail-display.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-folder-cache.c?h=rel-0_6_2'>mail/mail-folder-cache.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-folder-cache.h?h=rel-0_6_2'>mail/mail-folder-cache.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-font-prefs.c?h=rel-0_6_2'>mail/mail-font-prefs.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-font-prefs.h?h=rel-0_6_2'>mail/mail-font-prefs.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-format.c?h=rel-0_6_2'>mail/mail-format.c</a></td><td class='right'>2391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-identify.c?h=rel-0_6_2'>mail/mail-identify.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-importer.c?h=rel-0_6_2'>mail/mail-importer.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-importer.h?h=rel-0_6_2'>mail/mail-importer.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-local.c?h=rel-0_6_2'>mail/mail-local.c</a></td><td class='right'>1469</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-local.h?h=rel-0_6_2'>mail/mail-local.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-mt.c?h=rel-0_6_2'>mail/mail-mt.c</a></td><td class='right'>1011</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-mt.h?h=rel-0_6_2'>mail/mail-mt.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-offline-handler.c?h=rel-0_6_2'>mail/mail-offline-handler.c</a></td><td class='right'>347</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-offline-handler.h?h=rel-0_6_2'>mail/mail-offline-handler.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-ops.c?h=rel-0_6_2'>mail/mail-ops.c</a></td><td class='right'>2303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-ops.h?h=rel-0_6_2'>mail/mail-ops.h</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-preferences.c?h=rel-0_6_2'>mail/mail-preferences.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-preferences.h?h=rel-0_6_2'>mail/mail-preferences.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-search-dialogue.c?h=rel-0_6_2'>mail/mail-search-dialogue.c</a></td><td class='right'>176</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-search-dialogue.h?h=rel-0_6_2'>mail/mail-search-dialogue.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-search.c?h=rel-0_6_2'>mail/mail-search.c</a></td><td class='right'>421</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-search.h?h=rel-0_6_2'>mail/mail-search.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-send-recv.c?h=rel-0_6_2'>mail/mail-send-recv.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-send-recv.h?h=rel-0_6_2'>mail/mail-send-recv.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-session.c?h=rel-0_6_2'>mail/mail-session.c</a></td><td class='right'>1037</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-session.h?h=rel-0_6_2'>mail/mail-session.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-signature-editor.c?h=rel-0_6_2'>mail/mail-signature-editor.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-signature-editor.h?h=rel-0_6_2'>mail/mail-signature-editor.h</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-stream-gtkhtml.c?h=rel-0_6_2'>mail/mail-stream-gtkhtml.c</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-stream-gtkhtml.h?h=rel-0_6_2'>mail/mail-stream-gtkhtml.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-summary.c?h=rel-0_6_2'>mail/mail-summary.c</a></td><td class='right'>522</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-summary.h?h=rel-0_6_2'>mail/mail-summary.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-tools.c?h=rel-0_6_2'>mail/mail-tools.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-tools.h?h=rel-0_6_2'>mail/mail-tools.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-types.h?h=rel-0_6_2'>mail/mail-types.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-vfolder.c?h=rel-0_6_2'>mail/mail-vfolder.c</a></td><td class='right'>960</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-vfolder.h?h=rel-0_6_2'>mail/mail-vfolder.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail.h?h=rel-0_6_2'>mail/mail.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/main.c?h=rel-0_6_2'>mail/main.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-browser.c?h=rel-0_6_2'>mail/message-browser.c</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-browser.h?h=rel-0_6_2'>mail/message-browser.h</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-list.c?h=rel-0_6_2'>mail/message-list.c</a></td><td class='right'>2606</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-list.etspec?h=rel-0_6_2'>mail/message-list.etspec</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-list.h?h=rel-0_6_2'>mail/message-list.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-tag-editor.c?h=rel-0_6_2'>mail/message-tag-editor.c</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-tag-editor.h?h=rel-0_6_2'>mail/message-tag-editor.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-tag-followup.c?h=rel-0_6_2'>mail/message-tag-followup.c</a></td><td class='right'>391</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-tag-followup.h?h=rel-0_6_2'>mail/message-tag-followup.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/message-tags.glade?h=rel-0_6_2'>mail/message-tags.glade</a></td><td class='right'>352</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/subscribe-dialog.c?h=rel-0_6_2'>mail/subscribe-dialog.c</a></td><td class='right'>1644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/subscribe-dialog.etspec?h=rel-0_6_2'>mail/subscribe-dialog.etspec</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/subscribe-dialog.glade?h=rel-0_6_2'>mail/subscribe-dialog.glade</a></td><td class='right'>326</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/subscribe-dialog.h?h=rel-0_6_2'>mail/subscribe-dialog.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/.cvsignore?h=rel-0_6_2'>my-evolution/.cvsignore</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/ChangeLog?h=rel-0_6_2'>my-evolution/ChangeLog</a></td><td class='right'>1565</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.6%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/GNOME_Evolution_Summary.oaf.in?h=rel-0_6_2'>my-evolution/GNOME_Evolution_Summary.oaf.in</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/GNOME_Evolution_Summary.oaf.in.in?h=rel-0_6_2'>my-evolution/GNOME_Evolution_Summary.oaf.in.in</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/Location-translation-script?h=rel-0_6_2'>my-evolution/Location-translation-script</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/Locations?h=rel-0_6_2'>my-evolution/Locations</a></td><td class='right'>3022</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.0%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/Locations.h?h=rel-0_6_2'>my-evolution/Locations.h</a></td><td class='right'>2538</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.9%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/Makefile.am?h=rel-0_6_2'>my-evolution/Makefile.am</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/check-empty.xpm?h=rel-0_6_2'>my-evolution/check-empty.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/check-filled.xpm?h=rel-0_6_2'>my-evolution/check-filled.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/check-none.xpm?h=rel-0_6_2'>my-evolution/check-none.xpm</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/component-factory.c?h=rel-0_6_2'>my-evolution/component-factory.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/component-factory.h?h=rel-0_6_2'>my-evolution/component-factory.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-cell-tri.c?h=rel-0_6_2'>my-evolution/e-cell-tri.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-cell-tri.h?h=rel-0_6_2'>my-evolution/e-cell-tri.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-calendar.c?h=rel-0_6_2'>my-evolution/e-summary-calendar.c</a></td><td class='right'>574</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-calendar.h?h=rel-0_6_2'>my-evolution/e-summary-calendar.h</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-factory.c?h=rel-0_6_2'>my-evolution/e-summary-factory.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-factory.h?h=rel-0_6_2'>my-evolution/e-summary-factory.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-mail.c?h=rel-0_6_2'>my-evolution/e-summary-mail.c</a></td><td class='right'>926</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-mail.h?h=rel-0_6_2'>my-evolution/e-summary-mail.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-offline-handler.c?h=rel-0_6_2'>my-evolution/e-summary-offline-handler.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-offline-handler.h?h=rel-0_6_2'>my-evolution/e-summary-offline-handler.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-preferences.c?h=rel-0_6_2'>my-evolution/e-summary-preferences.c</a></td><td class='right'>1235</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 97.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-preferences.h?h=rel-0_6_2'>my-evolution/e-summary-preferences.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-rdf.c?h=rel-0_6_2'>my-evolution/e-summary-rdf.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-rdf.h?h=rel-0_6_2'>my-evolution/e-summary-rdf.h</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-shown.c?h=rel-0_6_2'>my-evolution/e-summary-shown.c</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-shown.h?h=rel-0_6_2'>my-evolution/e-summary-shown.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-table.c?h=rel-0_6_2'>my-evolution/e-summary-table.c</a></td><td class='right'>441</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-table.h?h=rel-0_6_2'>my-evolution/e-summary-table.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-tasks.c?h=rel-0_6_2'>my-evolution/e-summary-tasks.c</a></td><td class='right'>430</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-tasks.h?h=rel-0_6_2'>my-evolution/e-summary-tasks.h</a></td><td class='right'>35</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-type.h?h=rel-0_6_2'>my-evolution/e-summary-type.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-weather.c?h=rel-0_6_2'>my-evolution/e-summary-weather.c</a></td><td class='right'>829</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary-weather.h?h=rel-0_6_2'>my-evolution/e-summary-weather.h</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary.c?h=rel-0_6_2'>my-evolution/e-summary.c</a></td><td class='right'>939</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/e-summary.h?h=rel-0_6_2'>my-evolution/e-summary.h</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/main.c?h=rel-0_6_2'>my-evolution/main.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/metar.c?h=rel-0_6_2'>my-evolution/metar.c</a></td><td class='right'>1016</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/metar.h?h=rel-0_6_2'>my-evolution/metar.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/my-evolution-html.h?h=rel-0_6_2'>my-evolution/my-evolution-html.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/my-evolution.glade?h=rel-0_6_2'>my-evolution/my-evolution.glade</a></td><td class='right'>626</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/my-evolution/weather.h?h=rel-0_6_2'>my-evolution/weather.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/.cvsignore?h=rel-0_6_2'>notes/.cvsignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/GNOME_Evolution_Notes.oaf.in?h=rel-0_6_2'>notes/GNOME_Evolution_Notes.oaf.in</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/Makefile.am?h=rel-0_6_2'>notes/Makefile.am</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/component-factory.c?h=rel-0_6_2'>notes/component-factory.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/component-factory.h?h=rel-0_6_2'>notes/component-factory.h</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-bevel-button-util.c?h=rel-0_6_2'>notes/e-bevel-button-util.c</a></td><td class='right'>189</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-bevel-button-util.h?h=rel-0_6_2'>notes/e-bevel-button-util.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-bevel-button.c?h=rel-0_6_2'>notes/e-bevel-button.c</a></td><td class='right'>175</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-bevel-button.h?h=rel-0_6_2'>notes/e-bevel-button.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-note.c?h=rel-0_6_2'>notes/e-note.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/e-note.h?h=rel-0_6_2'>notes/e-note.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/main.c?h=rel-0_6_2'>notes/main.c</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/test-notes.c?h=rel-0_6_2'>notes/test-notes.c</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/omf-install/.cvsignore?h=rel-0_6_2'>omf-install/.cvsignore</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/omf-install/Makefile.am?h=rel-0_6_2'>omf-install/Makefile.am</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/.cvsignore?h=rel-0_6_2'>po/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ChangeLog?h=rel-0_6_2'>po/ChangeLog</a></td><td class='right'>3833</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/Makefile.i18npatch?h=rel-0_6_2'>po/Makefile.i18npatch</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/POTFILES.in?h=rel-0_6_2'>po/POTFILES.in</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/POTFILES.skip?h=rel-0_6_2'>po/POTFILES.skip</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/az.po?h=rel-0_6_2'>po/az.po</a></td><td class='right'>28700</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.3%;'/><td class='none' style='width: 33.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/bg.po?h=rel-0_6_2'>po/bg.po</a></td><td class='right'>27490</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.5%;'/><td class='none' style='width: 36.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ca.po?h=rel-0_6_2'>po/ca.po</a></td><td class='right'>31194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 72.0%;'/><td class='none' style='width: 28.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/cs.po?h=rel-0_6_2'>po/cs.po</a></td><td class='right'>25963</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 59.9%;'/><td class='none' style='width: 40.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/da.po?h=rel-0_6_2'>po/da.po</a></td><td class='right'>27539</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.6%;'/><td class='none' style='width: 36.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/de.po?h=rel-0_6_2'>po/de.po</a></td><td class='right'>28720</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.3%;'/><td class='none' style='width: 33.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/el.po?h=rel-0_6_2'>po/el.po</a></td><td class='right'>28974</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.9%;'/><td class='none' style='width: 33.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/en_AU.po?h=rel-0_6_2'>po/en_AU.po</a></td><td class='right'>25921</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 59.8%;'/><td class='none' style='width: 40.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/en_GB.po?h=rel-0_6_2'>po/en_GB.po</a></td><td class='right'>26049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 60.1%;'/><td class='none' style='width: 39.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/es.po?h=rel-0_6_2'>po/es.po</a></td><td class='right'>27449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.4%;'/><td class='none' style='width: 36.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/et.po?h=rel-0_6_2'>po/et.po</a></td><td class='right'>27324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.1%;'/><td class='none' style='width: 36.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/eu.po?h=rel-0_6_2'>po/eu.po</a></td><td class='right'>28075</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.8%;'/><td class='none' style='width: 35.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/fi.po?h=rel-0_6_2'>po/fi.po</a></td><td class='right'>27922</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.5%;'/><td class='none' style='width: 35.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/flu-danish?h=rel-0_6_2'>po/flu-danish</a></td><td class='right'>114</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/fr.po?h=rel-0_6_2'>po/fr.po</a></td><td class='right'>27480</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.4%;'/><td class='none' style='width: 36.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ga.po?h=rel-0_6_2'>po/ga.po</a></td><td class='right'>28433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 65.6%;'/><td class='none' style='width: 34.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/gl.po?h=rel-0_6_2'>po/gl.po</a></td><td class='right'>29900</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 69.0%;'/><td class='none' style='width: 31.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/hu.po?h=rel-0_6_2'>po/hu.po</a></td><td class='right'>29762</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 68.7%;'/><td class='none' style='width: 31.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/it.po?h=rel-0_6_2'>po/it.po</a></td><td class='right'>27317</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.1%;'/><td class='none' style='width: 36.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ja.po?h=rel-0_6_2'>po/ja.po</a></td><td class='right'>28743</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.4%;'/><td class='none' style='width: 33.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ko.po?h=rel-0_6_2'>po/ko.po</a></td><td class='right'>28760</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.4%;'/><td class='none' style='width: 33.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/lt.po?h=rel-0_6_2'>po/lt.po</a></td><td class='right'>29049</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 67.1%;'/><td class='none' style='width: 32.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/lv.po?h=rel-0_6_2'>po/lv.po</a></td><td class='right'>28481</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 65.7%;'/><td class='none' style='width: 34.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/nl.po?h=rel-0_6_2'>po/nl.po</a></td><td class='right'>27826</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.2%;'/><td class='none' style='width: 35.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/nn.po?h=rel-0_6_2'>po/nn.po</a></td><td class='right'>27802</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.2%;'/><td class='none' style='width: 35.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/no.po?h=rel-0_6_2'>po/no.po</a></td><td class='right'>30768</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 71.0%;'/><td class='none' style='width: 29.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/pl.po?h=rel-0_6_2'>po/pl.po</a></td><td class='right'>28684</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.2%;'/><td class='none' style='width: 33.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/pt.po?h=rel-0_6_2'>po/pt.po</a></td><td class='right'>28910</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 66.7%;'/><td class='none' style='width: 33.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/pt_BR.po?h=rel-0_6_2'>po/pt_BR.po</a></td><td class='right'>27867</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.3%;'/><td class='none' style='width: 35.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ro.po?h=rel-0_6_2'>po/ro.po</a></td><td class='right'>29820</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 68.8%;'/><td class='none' style='width: 31.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ru.po?h=rel-0_6_2'>po/ru.po</a></td><td class='right'>27242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 62.9%;'/><td class='none' style='width: 37.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/sk.po?h=rel-0_6_2'>po/sk.po</a></td><td class='right'>27277</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 63.0%;'/><td class='none' style='width: 37.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/sl.po?h=rel-0_6_2'>po/sl.po</a></td><td class='right'>30220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 69.8%;'/><td class='none' style='width: 30.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/sv.po?h=rel-0_6_2'>po/sv.po</a></td><td class='right'>30309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 70.0%;'/><td class='none' style='width: 30.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/tr.po?h=rel-0_6_2'>po/tr.po</a></td><td class='right'>27726</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 64.0%;'/><td class='none' style='width: 36.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/uk.po?h=rel-0_6_2'>po/uk.po</a></td><td class='right'>28233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 65.2%;'/><td class='none' style='width: 34.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/update.sh?h=rel-0_6_2'>po/update.sh</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/vi.po?h=rel-0_6_2'>po/vi.po</a></td><td class='right'>25343</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 58.5%;'/><td class='none' style='width: 41.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/zh_CN.po?h=rel-0_6_2'>po/zh_CN.po</a></td><td class='right'>43319</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 100.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/zh_TW.po?h=rel-0_6_2'>po/zh_TW.po</a></td><td class='right'>17587</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.6%;'/><td class='none' style='width: 59.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/.cvsignore?h=rel-0_6_2'>shell/.cvsignore</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/ChangeLog?h=rel-0_6_2'>shell/ChangeLog</a></td><td class='right'>10655</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.6%;'/><td class='none' style='width: 75.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Activity.idl?h=rel-0_6_2'>shell/Evolution-Activity.idl</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-ConfigControl.idl?h=rel-0_6_2'>shell/Evolution-ConfigControl.idl</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Offline.idl?h=rel-0_6_2'>shell/Evolution-Offline.idl</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Session.idl?h=rel-0_6_2'>shell/Evolution-Session.idl</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Shell.idl?h=rel-0_6_2'>shell/Evolution-Shell.idl</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-ShellComponent.idl?h=rel-0_6_2'>shell/Evolution-ShellComponent.idl</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-ShellComponentDnd.idl?h=rel-0_6_2'>shell/Evolution-ShellComponentDnd.idl</a></td><td class='right'>98</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-ShellView.idl?h=rel-0_6_2'>shell/Evolution-ShellView.idl</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Shortcuts.idl?h=rel-0_6_2'>shell/Evolution-Shortcuts.idl</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Storage.idl?h=rel-0_6_2'>shell/Evolution-Storage.idl</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-StorageSetView.idl?h=rel-0_6_2'>shell/Evolution-StorageSetView.idl</a></td><td class='right'>36</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Wizard.idl?h=rel-0_6_2'>shell/Evolution-Wizard.idl</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-common.idl?h=rel-0_6_2'>shell/Evolution-common.idl</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution.idl?h=rel-0_6_2'>shell/Evolution.idl</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/GNOME_Evolution_Shell.oaf.in?h=rel-0_6_2'>shell/GNOME_Evolution_Shell.oaf.in</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/GNOME_Evolution_TestComponent.oaf?h=rel-0_6_2'>shell/GNOME_Evolution_TestComponent.oaf</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Makefile.am?h=rel-0_6_2'>shell/Makefile.am</a></td><td class='right'>289</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/README?h=rel-0_6_2'>shell/README</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/check-empty.xpm?h=rel-0_6_2'>shell/check-empty.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/check-filled.xpm?h=rel-0_6_2'>shell/check-filled.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/check-missing.xpm?h=rel-0_6_2'>shell/check-missing.xpm</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-activity-handler.c?h=rel-0_6_2'>shell/e-activity-handler.c</a></td><td class='right'>581</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-activity-handler.h?h=rel-0_6_2'>shell/e-activity-handler.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-component-info.c?h=rel-0_6_2'>shell/e-component-info.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-component-info.h?h=rel-0_6_2'>shell/e-component-info.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-component-registry.c?h=rel-0_6_2'>shell/e-component-registry.c</a></td><td class='right'>505</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-component-registry.h?h=rel-0_6_2'>shell/e-component-registry.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-config-page.c?h=rel-0_6_2'>shell/e-corba-config-page.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-config-page.h?h=rel-0_6_2'>shell/e-corba-config-page.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-shortcuts.c?h=rel-0_6_2'>shell/e-corba-shortcuts.c</a></td><td class='right'>330</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-shortcuts.h?h=rel-0_6_2'>shell/e-corba-shortcuts.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-storage-registry.c?h=rel-0_6_2'>shell/e-corba-storage-registry.c</a></td><td class='right'>529</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-storage-registry.h?h=rel-0_6_2'>shell/e-corba-storage-registry.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-storage.c?h=rel-0_6_2'>shell/e-corba-storage.c</a></td><td class='right'>601</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-corba-storage.h?h=rel-0_6_2'>shell/e-corba-storage.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-dnd-bridge.c?h=rel-0_6_2'>shell/e-folder-dnd-bridge.c</a></td><td class='right'>435</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-dnd-bridge.h?h=rel-0_6_2'>shell/e-folder-dnd-bridge.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-list.c?h=rel-0_6_2'>shell/e-folder-list.c</a></td><td class='right'>608</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-list.h?h=rel-0_6_2'>shell/e-folder-list.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-tree.c?h=rel-0_6_2'>shell/e-folder-tree.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-tree.h?h=rel-0_6_2'>shell/e-folder-tree.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-type-registry.c?h=rel-0_6_2'>shell/e-folder-type-registry.c</a></td><td class='right'>561</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder-type-registry.h?h=rel-0_6_2'>shell/e-folder-type-registry.h</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder.c?h=rel-0_6_2'>shell/e-folder.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder.h?h=rel-0_6_2'>shell/e-folder.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-gray-bar.c?h=rel-0_6_2'>shell/e-gray-bar.c</a></td><td class='right'>102</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-gray-bar.h?h=rel-0_6_2'>shell/e-gray-bar.h</a></td><td class='right'>60</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-history.c?h=rel-0_6_2'>shell/e-history.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-history.h?h=rel-0_6_2'>shell/e-history.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-local-folder.c?h=rel-0_6_2'>shell/e-local-folder.c</a></td><td class='right'>557</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-local-folder.h?h=rel-0_6_2'>shell/e-local-folder.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-local-storage.c?h=rel-0_6_2'>shell/e-local-storage.c</a></td><td class='right'>1103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-local-storage.h?h=rel-0_6_2'>shell/e-local-storage.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-setup.c?h=rel-0_6_2'>shell/e-setup.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-setup.h?h=rel-0_6_2'>shell/e-setup.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-about-box.c?h=rel-0_6_2'>shell/e-shell-about-box.c</a></td><td class='right'>417</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-about-box.h?h=rel-0_6_2'>shell/e-shell-about-box.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config-default-folders.c?h=rel-0_6_2'>shell/e-shell-config-default-folders.c</a></td><td class='right'>191</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config-default-folders.h?h=rel-0_6_2'>shell/e-shell-config-default-folders.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config-offline.c?h=rel-0_6_2'>shell/e-shell-config-offline.c</a></td><td class='right'>192</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config-offline.h?h=rel-0_6_2'>shell/e-shell-config-offline.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config.c?h=rel-0_6_2'>shell/e-shell-config.c</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-config.h?h=rel-0_6_2'>shell/e-shell-config.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-constants.h?h=rel-0_6_2'>shell/e-shell-constants.h</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-corba-icon-utils.c?h=rel-0_6_2'>shell/e-shell-corba-icon-utils.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-corba-icon-utils.h?h=rel-0_6_2'>shell/e-shell-corba-icon-utils.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-commands.c?h=rel-0_6_2'>shell/e-shell-folder-commands.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-commands.h?h=rel-0_6_2'>shell/e-shell-folder-commands.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-creation-dialog.c?h=rel-0_6_2'>shell/e-shell-folder-creation-dialog.c</a></td><td class='right'>545</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-creation-dialog.h?h=rel-0_6_2'>shell/e-shell-folder-creation-dialog.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-selection-dialog.c?h=rel-0_6_2'>shell/e-shell-folder-selection-dialog.c</a></td><td class='right'>549</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-selection-dialog.h?h=rel-0_6_2'>shell/e-shell-folder-selection-dialog.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-title-bar.c?h=rel-0_6_2'>shell/e-shell-folder-title-bar.c</a></td><td class='right'>857</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-folder-title-bar.h?h=rel-0_6_2'>shell/e-shell-folder-title-bar.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-importer.c?h=rel-0_6_2'>shell/e-shell-importer.c</a></td><td class='right'>1222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-importer.h?h=rel-0_6_2'>shell/e-shell-importer.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-offline-handler.c?h=rel-0_6_2'>shell/e-shell-offline-handler.c</a></td><td class='right'>845</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-offline-handler.h?h=rel-0_6_2'>shell/e-shell-offline-handler.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-offline-sync.c?h=rel-0_6_2'>shell/e-shell-offline-sync.c</a></td><td class='right'>447</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-offline-sync.h?h=rel-0_6_2'>shell/e-shell-offline-sync.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-settings-dialog.c?h=rel-0_6_2'>shell/e-shell-settings-dialog.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-settings-dialog.h?h=rel-0_6_2'>shell/e-shell-settings-dialog.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-shared-folder-picker-dialog.c?h=rel-0_6_2'>shell/e-shell-shared-folder-picker-dialog.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-shared-folder-picker-dialog.h?h=rel-0_6_2'>shell/e-shell-shared-folder-picker-dialog.h</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-startup-wizard.c?h=rel-0_6_2'>shell/e-shell-startup-wizard.c</a></td><td class='right'>905</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-startup-wizard.h?h=rel-0_6_2'>shell/e-shell-startup-wizard.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-user-creatable-items-handler.c?h=rel-0_6_2'>shell/e-shell-user-creatable-items-handler.c</a></td><td class='right'>679</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-user-creatable-items-handler.h?h=rel-0_6_2'>shell/e-shell-user-creatable-items-handler.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-utils.c?h=rel-0_6_2'>shell/e-shell-utils.c</a></td><td class='right'>141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-utils.h?h=rel-0_6_2'>shell/e-shell-utils.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-view-menu.c?h=rel-0_6_2'>shell/e-shell-view-menu.c</a></td><td class='right'>851</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-view-menu.h?h=rel-0_6_2'>shell/e-shell-view-menu.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-view.c?h=rel-0_6_2'>shell/e-shell-view.c</a></td><td class='right'>2822</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.5%;'/><td class='none' style='width: 93.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-view.h?h=rel-0_6_2'>shell/e-shell-view.h</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell.c?h=rel-0_6_2'>shell/e-shell.c</a></td><td class='right'>2151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 95.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell.h?h=rel-0_6_2'>shell/e-shell.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts-view-model.c?h=rel-0_6_2'>shell/e-shortcuts-view-model.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts-view-model.h?h=rel-0_6_2'>shell/e-shortcuts-view-model.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts-view.c?h=rel-0_6_2'>shell/e-shortcuts-view.c</a></td><td class='right'>708</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts-view.h?h=rel-0_6_2'>shell/e-shortcuts-view.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts.c?h=rel-0_6_2'>shell/e-shortcuts.c</a></td><td class='right'>1151</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shortcuts.h?h=rel-0_6_2'>shell/e-shortcuts.h</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-splash.c?h=rel-0_6_2'>shell/e-splash.c</a></td><td class='right'>429</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-splash.h?h=rel-0_6_2'>shell/e-splash.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view-checkboxes.etstate?h=rel-0_6_2'>shell/e-storage-set-view-checkboxes.etstate</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view-no-checkboxes.etstate?h=rel-0_6_2'>shell/e-storage-set-view-no-checkboxes.etstate</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view.c?h=rel-0_6_2'>shell/e-storage-set-view.c</a></td><td class='right'>2110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 95.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view.etspec?h=rel-0_6_2'>shell/e-storage-set-view.etspec</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view.h?h=rel-0_6_2'>shell/e-storage-set-view.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set.c?h=rel-0_6_2'>shell/e-storage-set.c</a></td><td class='right'>780</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set.h?h=rel-0_6_2'>shell/e-storage-set.h</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage.c?h=rel-0_6_2'>shell/e-storage.c</a></td><td class='right'>704</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage.h?h=rel-0_6_2'>shell/e-storage.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-task-bar.c?h=rel-0_6_2'>shell/e-task-bar.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-task-bar.h?h=rel-0_6_2'>shell/e-task-bar.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-task-widget.c?h=rel-0_6_2'>shell/e-task-widget.c</a></td><td class='right'>231</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-task-widget.h?h=rel-0_6_2'>shell/e-task-widget.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-uri-schema-registry.c?h=rel-0_6_2'>shell/e-uri-schema-registry.c</a></td><td class='right'>181</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-uri-schema-registry.h?h=rel-0_6_2'>shell/e-uri-schema-registry.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-activity-client.c?h=rel-0_6_2'>shell/evolution-activity-client.c</a></td><td class='right'>426</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-activity-client.h?h=rel-0_6_2'>shell/evolution-activity-client.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-config-control.c?h=rel-0_6_2'>shell/evolution-config-control.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-config-control.h?h=rel-0_6_2'>shell/evolution-config-control.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-folder-selector-button.c?h=rel-0_6_2'>shell/evolution-folder-selector-button.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-folder-selector-button.h?h=rel-0_6_2'>shell/evolution-folder-selector-button.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-session.c?h=rel-0_6_2'>shell/evolution-session.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-session.h?h=rel-0_6_2'>shell/evolution-session.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-client.c?h=rel-0_6_2'>shell/evolution-shell-client.c</a></td><td class='right'>643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-client.h?h=rel-0_6_2'>shell/evolution-shell-client.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-client.c?h=rel-0_6_2'>shell/evolution-shell-component-client.c</a></td><td class='right'>843</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-client.h?h=rel-0_6_2'>shell/evolution-shell-component-client.h</a></td><td class='right'>131</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-dnd.c?h=rel-0_6_2'>shell/evolution-shell-component-dnd.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-dnd.h?h=rel-0_6_2'>shell/evolution-shell-component-dnd.h</a></td><td class='right'>130</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-utils.c?h=rel-0_6_2'>shell/evolution-shell-component-utils.c</a></td><td class='right'>166</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component-utils.h?h=rel-0_6_2'>shell/evolution-shell-component-utils.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component.c?h=rel-0_6_2'>shell/evolution-shell-component.c</a></td><td class='right'>1088</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component.h?h=rel-0_6_2'>shell/evolution-shell-component.h</a></td><td class='right'>199</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-view.c?h=rel-0_6_2'>shell/evolution-shell-view.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-view.h?h=rel-0_6_2'>shell/evolution-shell-view.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-listener.c?h=rel-0_6_2'>shell/evolution-storage-listener.c</a></td><td class='right'>379</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-listener.h?h=rel-0_6_2'>shell/evolution-storage-listener.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view-factory.c?h=rel-0_6_2'>shell/evolution-storage-set-view-factory.c</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view-factory.h?h=rel-0_6_2'>shell/evolution-storage-set-view-factory.h</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view-listener.c?h=rel-0_6_2'>shell/evolution-storage-set-view-listener.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view-listener.h?h=rel-0_6_2'>shell/evolution-storage-set-view-listener.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view.c?h=rel-0_6_2'>shell/evolution-storage-set-view.c</a></td><td class='right'>457</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view.h?h=rel-0_6_2'>shell/evolution-storage-set-view.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage.c?h=rel-0_6_2'>shell/evolution-storage.c</a></td><td class='right'>1227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage.h?h=rel-0_6_2'>shell/evolution-storage.h</a></td><td class='right'>160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-test-component.c?h=rel-0_6_2'>shell/evolution-test-component.c</a></td><td class='right'>600</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-wizard.c?h=rel-0_6_2'>shell/evolution-wizard.c</a></td><td class='right'>392</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-wizard.h?h=rel-0_6_2'>shell/evolution-wizard.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/.cvsignore?h=rel-0_6_2'>shell/glade/.cvsignore</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/Makefile.am?h=rel-0_6_2'>shell/glade/Makefile.am</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-active-connection-dialog.glade?h=rel-0_6_2'>shell/glade/e-active-connection-dialog.glade</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-folder-list.glade?h=rel-0_6_2'>shell/glade/e-folder-list.glade</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-shell-config-default-folders.glade?h=rel-0_6_2'>shell/glade/e-shell-config-default-folders.glade</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-shell-folder-creation-dialog.glade?h=rel-0_6_2'>shell/glade/e-shell-folder-creation-dialog.glade</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-shell-shared-folder-picker-dialog.glade?h=rel-0_6_2'>shell/glade/e-shell-shared-folder-picker-dialog.glade</a></td><td class='right'>301</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/evolution-startup-wizard.glade?h=rel-0_6_2'>shell/glade/evolution-startup-wizard.glade</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/.cvsignore?h=rel-0_6_2'>shell/importer/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/GNOME_Evolution_Importer.idl?h=rel-0_6_2'>shell/importer/GNOME_Evolution_Importer.idl</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/Makefile.am?h=rel-0_6_2'>shell/importer/Makefile.am</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer-client.c?h=rel-0_6_2'>shell/importer/evolution-importer-client.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer-client.h?h=rel-0_6_2'>shell/importer/evolution-importer-client.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer-listener.c?h=rel-0_6_2'>shell/importer/evolution-importer-listener.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer-listener.h?h=rel-0_6_2'>shell/importer/evolution-importer-listener.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer.c?h=rel-0_6_2'>shell/importer/evolution-importer.c</a></td><td class='right'>229</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-importer.h?h=rel-0_6_2'>shell/importer/evolution-importer.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-intelligent-importer.c?h=rel-0_6_2'>shell/importer/evolution-intelligent-importer.c</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/evolution-intelligent-importer.h?h=rel-0_6_2'>shell/importer/evolution-intelligent-importer.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/import.glade?h=rel-0_6_2'>shell/importer/import.glade</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/intelligent.c?h=rel-0_6_2'>shell/importer/intelligent.c</a></td><td class='right'>486</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/importer/intelligent.h?h=rel-0_6_2'>shell/importer/intelligent.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/main.c?h=rel-0_6_2'>shell/main.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/sounds/.cvsignore?h=rel-0_6_2'>sounds/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/sounds/Makefile.am?h=rel-0_6_2'>sounds/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/sounds/default_alarm.wav?h=rel-0_6_2'>sounds/default_alarm.wav</a></td><td class='right'>bin</td><td class='graph'>8624 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/stamp.h.in?h=rel-0_6_2'>stamp.h.in</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/.cvsignore?h=rel-0_6_2'>tests/.cvsignore</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/Makefile.am?h=rel-0_6_2'>tests/Makefile.am</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test-movemail.c?h=rel-0_6_2'>tests/test-movemail.c</a></td><td class='right'>164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test-url.c?h=rel-0_6_2'>tests/test-url.c</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test1.c?h=rel-0_6_2'>tests/test1.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test10.c?h=rel-0_6_2'>tests/test10.c</a></td><td class='right'>127</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test11.c?h=rel-0_6_2'>tests/test11.c</a></td><td class='right'>136</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test12.c?h=rel-0_6_2'>tests/test12.c</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test13.c?h=rel-0_6_2'>tests/test13.c</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test14.c?h=rel-0_6_2'>tests/test14.c</a></td><td class='right'>177</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test2.c?h=rel-0_6_2'>tests/test2.c</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test3.c?h=rel-0_6_2'>tests/test3.c</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test4.c?h=rel-0_6_2'>tests/test4.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test5.c?h=rel-0_6_2'>tests/test5.c</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test6.c?h=rel-0_6_2'>tests/test6.c</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test8.c?h=rel-0_6_2'>tests/test8.c</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/test9.c?h=rel-0_6_2'>tests/test9.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/.cvsignore?h=rel-0_6_2'>tests/ui-tests/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/Makefile.am?h=rel-0_6_2'>tests/ui-tests/Makefile.am</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/filter.c?h=rel-0_6_2'>tests/ui-tests/filter.c</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/filterdescription.xml?h=rel-0_6_2'>tests/ui-tests/filterdescription.xml</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/mail-atchmt-image.msg?h=rel-0_6_2'>tests/ui-tests/mail-atchmt-image.msg</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/mail-atchmt-postscript.msg?h=rel-0_6_2'>tests/ui-tests/mail-atchmt-postscript.msg</a></td><td class='right'>8069</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.6%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/mail-atchmt-svg.msg?h=rel-0_6_2'>tests/ui-tests/mail-atchmt-svg.msg</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/message-browser.c?h=rel-0_6_2'>tests/ui-tests/message-browser.c</a></td><td class='right'>819</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/saveoptions.xml?h=rel-0_6_2'>tests/ui-tests/saveoptions.xml</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/store_listing.c?h=rel-0_6_2'>tests/ui-tests/store_listing.c</a></td><td class='right'>424</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/store_listing.glade?h=rel-0_6_2'>tests/ui-tests/store_listing.glade</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/test-multipart-alt.msg?h=rel-0_6_2'>tests/ui-tests/test-multipart-alt.msg</a></td><td class='right'>17738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.9%;'/><td class='none' style='width: 59.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tests/ui-tests/test-multipart-mixed.msg?h=rel-0_6_2'>tests/ui-tests/test-multipart-mixed.msg</a></td><td class='right'>377</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/.cvsignore?h=rel-0_6_2'>tools/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/Makefile.am?h=rel-0_6_2'>tools/Makefile.am</a></td><td class='right'>47</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/csv2vcard?h=rel-0_6_2'>tools/csv2vcard</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/evolution-addressbook-abuse.c?h=rel-0_6_2'>tools/evolution-addressbook-abuse.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/evolution-addressbook-clean.in?h=rel-0_6_2'>tools/evolution-addressbook-clean.in</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/evolution-addressbook-export.c?h=rel-0_6_2'>tools/evolution-addressbook-export.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/evolution-addressbook-import.c?h=rel-0_6_2'>tools/evolution-addressbook-import.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/evolution-move-tasks?h=rel-0_6_2'>tools/evolution-move-tasks</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/killev?h=rel-0_6_2'>tools/killev</a></td><td class='right'>142</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/verify-evolution-install.sh?h=rel-0_6_2'>tools/verify-evolution-install.sh</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/.cvsignore?h=rel-0_6_2'>ui/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/ChangeLog?h=rel-0_6_2'>ui/ChangeLog</a></td><td class='right'>1632</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.8%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/Makefile.am?h=rel-0_6_2'>ui/Makefile.am</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-addressbook.h?h=rel-0_6_2'>ui/evolution-addressbook.h</a></td><td class='right'>25</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-addressbook.xml?h=rel-0_6_2'>ui/evolution-addressbook.xml</a></td><td class='right'>161</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-calendar.xml?h=rel-0_6_2'>ui/evolution-calendar.xml</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-comp-editor.xml?h=rel-0_6_2'>ui/evolution-comp-editor.xml</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-contact-editor.xml?h=rel-0_6_2'>ui/evolution-contact-editor.xml</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-contact-list-editor.xml?h=rel-0_6_2'>ui/evolution-contact-list-editor.xml</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-event-editor.xml?h=rel-0_6_2'>ui/evolution-event-editor.xml</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-executive-summary.xml?h=rel-0_6_2'>ui/evolution-executive-summary.xml</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-mail-global.xml?h=rel-0_6_2'>ui/evolution-mail-global.xml</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-mail-list.xml?h=rel-0_6_2'>ui/evolution-mail-list.xml</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-mail-message.xml?h=rel-0_6_2'>ui/evolution-mail-message.xml</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-mail-messagedisplay.xml?h=rel-0_6_2'>ui/evolution-mail-messagedisplay.xml</a></td><td class='right'>56</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-message-composer.h?h=rel-0_6_2'>ui/evolution-message-composer.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-message-composer.xml?h=rel-0_6_2'>ui/evolution-message-composer.xml</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-signature-editor.xml?h=rel-0_6_2'>ui/evolution-signature-editor.xml</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-subscribe.xml?h=rel-0_6_2'>ui/evolution-subscribe.xml</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-task-editor.xml?h=rel-0_6_2'>ui/evolution-task-editor.xml</a></td><td class='right'>41</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-tasks.xml?h=rel-0_6_2'>ui/evolution-tasks.xml</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution.xml?h=rel-0_6_2'>ui/evolution.xml</a></td><td class='right'>259</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/my-evolution.xml?h=rel-0_6_2'>ui/my-evolution.xml</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/.cvsignore?h=rel-0_6_2'>views/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/ChangeLog?h=rel-0_6_2'>views/ChangeLog</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/Makefile.am?h=rel-0_6_2'>views/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/.cvsignore?h=rel-0_6_2'>views/addressbook/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/Address_Cards.galview?h=rel-0_6_2'>views/addressbook/Address_Cards.galview</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/By_Company.galview?h=rel-0_6_2'>views/addressbook/By_Company.galview</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/Makefile.am?h=rel-0_6_2'>views/addressbook/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/Phone_List.galview?h=rel-0_6_2'>views/addressbook/Phone_List.galview</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/addressbook/galview.xml?h=rel-0_6_2'>views/addressbook/galview.xml</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/calendar/.cvsignore?h=rel-0_6_2'>views/calendar/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/calendar/Makefile.am?h=rel-0_6_2'>views/calendar/Makefile.am</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/calendar/galview.xml?h=rel-0_6_2'>views/calendar/galview.xml</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/.cvsignore?h=rel-0_6_2'>views/mail/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/As_Sent_Folder.galview?h=rel-0_6_2'>views/mail/As_Sent_Folder.galview</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/By_Follow_Up_Flag.galview?h=rel-0_6_2'>views/mail/By_Follow_Up_Flag.galview</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/By_Sender.galview?h=rel-0_6_2'>views/mail/By_Sender.galview</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/By_Status.galview?h=rel-0_6_2'>views/mail/By_Status.galview</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/By_Subject.galview?h=rel-0_6_2'>views/mail/By_Subject.galview</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/Makefile.am?h=rel-0_6_2'>views/mail/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/Messages.galview?h=rel-0_6_2'>views/mail/Messages.galview</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/mail/galview.xml?h=rel-0_6_2'>views/mail/galview.xml</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/tasks/.cvsignore?h=rel-0_6_2'>views/tasks/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/tasks/Makefile.am?h=rel-0_6_2'>views/tasks/Makefile.am</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/tasks/Tasks.galview?h=rel-0_6_2'>views/tasks/Tasks.galview</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/tasks/With_Category.galview?h=rel-0_6_2'>views/tasks/With_Category.galview</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/views/tasks/galview.xml?h=rel-0_6_2'>views/tasks/galview.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/.cvsignore?h=rel-0_6_2'>widgets/.cvsignore</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/ChangeLog?h=rel-0_6_2'>widgets/ChangeLog</a></td><td class='right'>329</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/LICENSE?h=rel-0_6_2'>widgets/LICENSE</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/Makefile.am?h=rel-0_6_2'>widgets/Makefile.am</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-timezone-dialog/.cvsignore?h=rel-0_6_2'>widgets/e-timezone-dialog/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-timezone-dialog/Makefile.am?h=rel-0_6_2'>widgets/e-timezone-dialog/Makefile.am</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-timezone-dialog/e-timezone-dialog.c?h=rel-0_6_2'>widgets/e-timezone-dialog/e-timezone-dialog.c</a></td><td class='right'>717</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-timezone-dialog/e-timezone-dialog.glade?h=rel-0_6_2'>widgets/e-timezone-dialog/e-timezone-dialog.glade</a></td><td class='right'>264</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/e-timezone-dialog/e-timezone-dialog.h?h=rel-0_6_2'>widgets/e-timezone-dialog/e-timezone-dialog.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/meeting-time-sel/.cvsignore?h=rel-0_6_2'>widgets/meeting-time-sel/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/.cvsignore?h=rel-0_6_2'>widgets/menus/.cvsignore</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/Makefile.am?h=rel-0_6_2'>widgets/menus/Makefile.am</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-define-views-dialog.c?h=rel-0_6_2'>widgets/menus/gal-define-views-dialog.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-define-views-dialog.h?h=rel-0_6_2'>widgets/menus/gal-define-views-dialog.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-define-views-model.c?h=rel-0_6_2'>widgets/menus/gal-define-views-model.c</a></td><td class='right'>335</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-define-views-model.h?h=rel-0_6_2'>widgets/menus/gal-define-views-model.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-define-views.glade?h=rel-0_6_2'>widgets/menus/gal-define-views.glade</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-collection.c?h=rel-0_6_2'>widgets/menus/gal-view-collection.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-collection.h?h=rel-0_6_2'>widgets/menus/gal-view-collection.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-etable.c?h=rel-0_6_2'>widgets/menus/gal-view-etable.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-etable.h?h=rel-0_6_2'>widgets/menus/gal-view-etable.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-factory-etable.c?h=rel-0_6_2'>widgets/menus/gal-view-factory-etable.c</a></td><td class='right'>143</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-factory-etable.h?h=rel-0_6_2'>widgets/menus/gal-view-factory-etable.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-factory.c?h=rel-0_6_2'>widgets/menus/gal-view-factory.c</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-factory.h?h=rel-0_6_2'>widgets/menus/gal-view-factory.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-instance-save-as-dialog.c?h=rel-0_6_2'>widgets/menus/gal-view-instance-save-as-dialog.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-instance-save-as-dialog.glade?h=rel-0_6_2'>widgets/menus/gal-view-instance-save-as-dialog.glade</a></td><td class='right'>269</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-instance-save-as-dialog.h?h=rel-0_6_2'>widgets/menus/gal-view-instance-save-as-dialog.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-instance.c?h=rel-0_6_2'>widgets/menus/gal-view-instance.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-instance.h?h=rel-0_6_2'>widgets/menus/gal-view-instance.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-menus.c?h=rel-0_6_2'>widgets/menus/gal-view-menus.c</a></td><td class='right'>482</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-menus.h?h=rel-0_6_2'>widgets/menus/gal-view-menus.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-new-dialog.c?h=rel-0_6_2'>widgets/menus/gal-view-new-dialog.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-new-dialog.glade?h=rel-0_6_2'>widgets/menus/gal-view-new-dialog.glade</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view-new-dialog.h?h=rel-0_6_2'>widgets/menus/gal-view-new-dialog.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view.c?h=rel-0_6_2'>widgets/menus/gal-view.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/menus/gal-view.h?h=rel-0_6_2'>widgets/menus/gal-view.h</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/.cvsignore?h=rel-0_6_2'>widgets/misc/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/ChangeLog?h=rel-0_6_2'>widgets/misc/ChangeLog</a></td><td class='right'>1178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/Makefile.am?h=rel-0_6_2'>widgets/misc/Makefile.am</a></td><td class='right'>107</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-bonobo-widget.c?h=rel-0_6_2'>widgets/misc/e-bonobo-widget.c</a></td><td class='right'>194</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-bonobo-widget.h?h=rel-0_6_2'>widgets/misc/e-bonobo-widget.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-calendar-item.c?h=rel-0_6_2'>widgets/misc/e-calendar-item.c</a></td><td class='right'>2942</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.8%;'/><td class='none' style='width: 93.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-calendar-item.h?h=rel-0_6_2'>widgets/misc/e-calendar-item.h</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-calendar.c?h=rel-0_6_2'>widgets/misc/e-calendar.c</a></td><td class='right'>603</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-calendar.h?h=rel-0_6_2'>widgets/misc/e-calendar.h</a></td><td class='right'>101</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-background.c?h=rel-0_6_2'>widgets/misc/e-canvas-background.c</a></td><td class='right'>467</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-background.h?h=rel-0_6_2'>widgets/misc/e-canvas-background.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-utils.c?h=rel-0_6_2'>widgets/misc/e-canvas-utils.c</a></td><td class='right'>172</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-utils.h?h=rel-0_6_2'>widgets/misc/e-canvas-utils.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-vbox.c?h=rel-0_6_2'>widgets/misc/e-canvas-vbox.c</a></td><td class='right'>376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas-vbox.h?h=rel-0_6_2'>widgets/misc/e-canvas-vbox.h</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas.c?h=rel-0_6_2'>widgets/misc/e-canvas.c</a></td><td class='right'>1160</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas.h?h=rel-0_6_2'>widgets/misc/e-canvas.h</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cell-date-edit.c?h=rel-0_6_2'>widgets/misc/e-cell-date-edit.c</a></td><td class='right'>969</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cell-date-edit.h?h=rel-0_6_2'>widgets/misc/e-cell-date-edit.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cell-percent.c?h=rel-0_6_2'>widgets/misc/e-cell-percent.c</a></td><td class='right'>158</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cell-percent.h?h=rel-0_6_2'>widgets/misc/e-cell-percent.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-charset-picker.c?h=rel-0_6_2'>widgets/misc/e-charset-picker.c</a></td><td class='right'>470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-charset-picker.h?h=rel-0_6_2'>widgets/misc/e-charset-picker.h</a></td><td class='right'>48</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-clipped-label.c?h=rel-0_6_2'>widgets/misc/e-clipped-label.c</a></td><td class='right'>386</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-clipped-label.h?h=rel-0_6_2'>widgets/misc/e-clipped-label.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-colors.c?h=rel-0_6_2'>widgets/misc/e-colors.c</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-colors.h?h=rel-0_6_2'>widgets/misc/e-colors.h</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-combo-button.c?h=rel-0_6_2'>widgets/misc/e-combo-button.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-combo-button.h?h=rel-0_6_2'>widgets/misc/e-combo-button.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-config-page.c?h=rel-0_6_2'>widgets/misc/e-config-page.c</a></td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-config-page.h?h=rel-0_6_2'>widgets/misc/e-config-page.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cursors.c?h=rel-0_6_2'>widgets/misc/e-cursors.c</a></td><td class='right'>153</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-cursors.h?h=rel-0_6_2'>widgets/misc/e-cursors.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-dateedit.c?h=rel-0_6_2'>widgets/misc/e-dateedit.c</a></td><td class='right'>1952</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-dateedit.h?h=rel-0_6_2'>widgets/misc/e-dateedit.h</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-dropdown-button.c?h=rel-0_6_2'>widgets/misc/e-dropdown-button.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-dropdown-button.h?h=rel-0_6_2'>widgets/misc/e-dropdown-button.h</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-filter-bar.c?h=rel-0_6_2'>widgets/misc/e-filter-bar.c</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-filter-bar.h?h=rel-0_6_2'>widgets/misc/e-filter-bar.h</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-gui-utils.c?h=rel-0_6_2'>widgets/misc/e-gui-utils.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-gui-utils.h?h=rel-0_6_2'>widgets/misc/e-gui-utils.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-hsv-utils.c?h=rel-0_6_2'>widgets/misc/e-hsv-utils.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-hsv-utils.h?h=rel-0_6_2'>widgets/misc/e-hsv-utils.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-map.c?h=rel-0_6_2'>widgets/misc/e-map.c</a></td><td class='right'>1803</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-map.h?h=rel-0_6_2'>widgets/misc/e-map.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-messagebox.c?h=rel-0_6_2'>widgets/misc/e-messagebox.c</a></td><td class='right'>356</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-messagebox.h?h=rel-0_6_2'>widgets/misc/e-messagebox.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-multi-config-dialog.c?h=rel-0_6_2'>widgets/misc/e-multi-config-dialog.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-multi-config-dialog.h?h=rel-0_6_2'>widgets/misc/e-multi-config-dialog.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-popup-menu.c?h=rel-0_6_2'>widgets/misc/e-popup-menu.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-popup-menu.h?h=rel-0_6_2'>widgets/misc/e-popup-menu.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-printable.c?h=rel-0_6_2'>widgets/misc/e-printable.c</a></td><td class='right'>221</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-printable.h?h=rel-0_6_2'>widgets/misc/e-printable.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-reflow-model.c?h=rel-0_6_2'>widgets/misc/e-reflow-model.c</a></td><td class='right'>303</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-reflow-model.h?h=rel-0_6_2'>widgets/misc/e-reflow-model.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-reflow.c?h=rel-0_6_2'>widgets/misc/e-reflow.c</a></td><td class='right'>1374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-reflow.h?h=rel-0_6_2'>widgets/misc/e-reflow.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-search-bar.c?h=rel-0_6_2'>widgets/misc/e-search-bar.c</a></td><td class='right'>1149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-search-bar.h?h=rel-0_6_2'>widgets/misc/e-search-bar.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model-array.c?h=rel-0_6_2'>widgets/misc/e-selection-model-array.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model-array.h?h=rel-0_6_2'>widgets/misc/e-selection-model-array.h</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model-simple.c?h=rel-0_6_2'>widgets/misc/e-selection-model-simple.c</a></td><td class='right'>117</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model-simple.h?h=rel-0_6_2'>widgets/misc/e-selection-model-simple.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model.c?h=rel-0_6_2'>widgets/misc/e-selection-model.c</a></td><td class='right'>661</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-selection-model.h?h=rel-0_6_2'>widgets/misc/e-selection-model.h</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-title-bar.c?h=rel-0_6_2'>widgets/misc/e-title-bar.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-title-bar.h?h=rel-0_6_2'>widgets/misc/e-title-bar.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-unicode.c?h=rel-0_6_2'>widgets/misc/e-unicode.c</a></td><td class='right'>3129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-unicode.h?h=rel-0_6_2'>widgets/misc/e-unicode.h</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-url-entry.c?h=rel-0_6_2'>widgets/misc/e-url-entry.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-url-entry.h?h=rel-0_6_2'>widgets/misc/e-url-entry.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/gal-categories.glade?h=rel-0_6_2'>widgets/misc/gal-categories.glade</a></td><td class='right'>197</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/.cvsignore?h=rel-0_6_2'>widgets/misc/pixmaps/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_cross.xpm?h=rel-0_6_2'>widgets/misc/pixmaps/cursor_cross.xpm</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_hand_closed.xpm?h=rel-0_6_2'>widgets/misc/pixmaps/cursor_hand_closed.xpm</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_hand_open.xpm?h=rel-0_6_2'>widgets/misc/pixmaps/cursor_hand_open.xpm</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_zoom_in.xpm?h=rel-0_6_2'>widgets/misc/pixmaps/cursor_zoom_in.xpm</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_zoom_out.xpm?h=rel-0_6_2'>widgets/misc/pixmaps/cursor_zoom_out.xpm</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-calendar.c?h=rel-0_6_2'>widgets/misc/test-calendar.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-charset-picker.c?h=rel-0_6_2'>widgets/misc/test-charset-picker.c</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-color.c?h=rel-0_6_2'>widgets/misc/test-color.c</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-dateedit.c?h=rel-0_6_2'>widgets/misc/test-dateedit.c</a></td><td class='right'>283</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-dropdown-button.c?h=rel-0_6_2'>widgets/misc/test-dropdown-button.c</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-multi-config-dialog.c?h=rel-0_6_2'>widgets/misc/test-multi-config-dialog.c</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/test-title-bar.c?h=rel-0_6_2'>widgets/misc/test-title-bar.c</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/.cvsignore?h=rel-0_6_2'>widgets/table/.cvsignore</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/add-col.xpm?h=rel-0_6_2'>widgets/table/add-col.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/arrow-down.xpm?h=rel-0_6_2'>widgets/table/arrow-down.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/arrow-up.xpm?h=rel-0_6_2'>widgets/table/arrow-up.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/check-empty.xpm?h=rel-0_6_2'>widgets/table/check-empty.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/check-filled.xpm?h=rel-0_6_2'>widgets/table/check-filled.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/clip.png?h=rel-0_6_2'>widgets/table/clip.png</a></td><td class='right'>bin</td><td class='graph'>192 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-checkbox.c?h=rel-0_6_2'>widgets/table/e-cell-checkbox.c</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-checkbox.h?h=rel-0_6_2'>widgets/table/e-cell-checkbox.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-combo.c?h=rel-0_6_2'>widgets/table/e-cell-combo.c</a></td><td class='right'>656</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-combo.h?h=rel-0_6_2'>widgets/table/e-cell-combo.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-date.c?h=rel-0_6_2'>widgets/table/e-cell-date.c</a></td><td class='right'>182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-date.h?h=rel-0_6_2'>widgets/table/e-cell-date.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-float.c?h=rel-0_6_2'>widgets/table/e-cell-float.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-float.h?h=rel-0_6_2'>widgets/table/e-cell-float.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-number.c?h=rel-0_6_2'>widgets/table/e-cell-number.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-number.h?h=rel-0_6_2'>widgets/table/e-cell-number.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-pixbuf.c?h=rel-0_6_2'>widgets/table/e-cell-pixbuf.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-pixbuf.h?h=rel-0_6_2'>widgets/table/e-cell-pixbuf.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-popup.c?h=rel-0_6_2'>widgets/table/e-cell-popup.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-popup.h?h=rel-0_6_2'>widgets/table/e-cell-popup.h</a></td><td class='right'>97</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-progress.c?h=rel-0_6_2'>widgets/table/e-cell-progress.c</a></td><td class='right'>450</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-progress.h?h=rel-0_6_2'>widgets/table/e-cell-progress.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-size.c?h=rel-0_6_2'>widgets/table/e-cell-size.c</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-size.h?h=rel-0_6_2'>widgets/table/e-cell-size.h</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-spin-button.c?h=rel-0_6_2'>widgets/table/e-cell-spin-button.c</a></td><td class='right'>674</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-spin-button.h?h=rel-0_6_2'>widgets/table/e-cell-spin-button.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-text.c?h=rel-0_6_2'>widgets/table/e-cell-text.c</a></td><td class='right'>2670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-text.h?h=rel-0_6_2'>widgets/table/e-cell-text.h</a></td><td class='right'>108</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-toggle.c?h=rel-0_6_2'>widgets/table/e-cell-toggle.c</a></td><td class='right'>484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-toggle.h?h=rel-0_6_2'>widgets/table/e-cell-toggle.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-tree.c?h=rel-0_6_2'>widgets/table/e-cell-tree.c</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-tree.h?h=rel-0_6_2'>widgets/table/e-cell-tree.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-vbox.c?h=rel-0_6_2'>widgets/table/e-cell-vbox.c</a></td><td class='right'>489</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-vbox.h?h=rel-0_6_2'>widgets/table/e-cell-vbox.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell.c?h=rel-0_6_2'>widgets/table/e-cell.c</a></td><td class='right'>499</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell.h?h=rel-0_6_2'>widgets/table/e-cell.h</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-click-to-add.c?h=rel-0_6_2'>widgets/table/e-table-click-to-add.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-click-to-add.h?h=rel-0_6_2'>widgets/table/e-table-click-to-add.h</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-col-dnd.h?h=rel-0_6_2'>widgets/table/e-table-col-dnd.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-col.c?h=rel-0_6_2'>widgets/table/e-table-col.c</a></td><td class='right'>227</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-col.h?h=rel-0_6_2'>widgets/table/e-table-col.h</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-column-specification.c?h=rel-0_6_2'>widgets/table/e-table-column-specification.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-column-specification.h?h=rel-0_6_2'>widgets/table/e-table-column-specification.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-column.c?h=rel-0_6_2'>widgets/table/e-table-column.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config-field.c?h=rel-0_6_2'>widgets/table/e-table-config-field.c</a></td><td class='right'>292</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config-field.h?h=rel-0_6_2'>widgets/table/e-table-config-field.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config-no-group.glade?h=rel-0_6_2'>widgets/table/e-table-config-no-group.glade</a></td><td class='right'>1761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.1%;'/><td class='none' style='width: 95.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config.c?h=rel-0_6_2'>widgets/table/e-table-config.c</a></td><td class='right'>1149</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config.glade?h=rel-0_6_2'>widgets/table/e-table-config.glade</a></td><td class='right'>1841</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-config.h?h=rel-0_6_2'>widgets/table/e-table-config.h</a></td><td class='right'>112</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-defines.h?h=rel-0_6_2'>widgets/table/e-table-defines.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-example-1.c?h=rel-0_6_2'>widgets/table/e-table-example-1.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-example-2.c?h=rel-0_6_2'>widgets/table/e-table-example-2.c</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-extras.c?h=rel-0_6_2'>widgets/table/e-table-extras.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-extras.h?h=rel-0_6_2'>widgets/table/e-table-extras.h</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser-dialog.c?h=rel-0_6_2'>widgets/table/e-table-field-chooser-dialog.c</a></td><td class='right'>219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser-dialog.h?h=rel-0_6_2'>widgets/table/e-table-field-chooser-dialog.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser-item.c?h=rel-0_6_2'>widgets/table/e-table-field-chooser-item.c</a></td><td class='right'>691</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser-item.h?h=rel-0_6_2'>widgets/table/e-table-field-chooser-item.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser.c?h=rel-0_6_2'>widgets/table/e-table-field-chooser.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser.glade?h=rel-0_6_2'>widgets/table/e-table-field-chooser.glade</a></td><td class='right'>129</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-field-chooser.h?h=rel-0_6_2'>widgets/table/e-table-field-chooser.h</a></td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-container.c?h=rel-0_6_2'>widgets/table/e-table-group-container.c</a></td><td class='right'>1449</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-container.h?h=rel-0_6_2'>widgets/table/e-table-group-container.h</a></td><td class='right'>99</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-leaf.c?h=rel-0_6_2'>widgets/table/e-table-group-leaf.c</a></td><td class='right'>633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-leaf.h?h=rel-0_6_2'>widgets/table/e-table-group-leaf.h</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group.c?h=rel-0_6_2'>widgets/table/e-table-group.c</a></td><td class='right'>702</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group.glade?h=rel-0_6_2'>widgets/table/e-table-group.glade</a></td><td class='right'>206</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group.h?h=rel-0_6_2'>widgets/table/e-table-group.h</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header-item.c?h=rel-0_6_2'>widgets/table/e-table-header-item.c</a></td><td class='right'>1801</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 95.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header-item.h?h=rel-0_6_2'>widgets/table/e-table-header-item.h</a></td><td class='right'>115</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header-utils.c?h=rel-0_6_2'>widgets/table/e-table-header-utils.c</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header-utils.h?h=rel-0_6_2'>widgets/table/e-table-header-utils.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header.c?h=rel-0_6_2'>widgets/table/e-table-header.c</a></td><td class='right'>931</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header.h?h=rel-0_6_2'>widgets/table/e-table-header.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-item.c?h=rel-0_6_2'>widgets/table/e-table-item.c</a></td><td class='right'>3532</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.2%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-item.h?h=rel-0_6_2'>widgets/table/e-table-item.h</a></td><td class='right'>226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory-callbacks.c?h=rel-0_6_2'>widgets/table/e-table-memory-callbacks.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory-callbacks.h?h=rel-0_6_2'>widgets/table/e-table-memory-callbacks.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory-store.c?h=rel-0_6_2'>widgets/table/e-table-memory-store.c</a></td><td class='right'>436</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory-store.h?h=rel-0_6_2'>widgets/table/e-table-memory-store.h</a></td><td class='right'>122</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory.c?h=rel-0_6_2'>widgets/table/e-table-memory.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-memory.h?h=rel-0_6_2'>widgets/table/e-table-memory.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-model.c?h=rel-0_6_2'>widgets/table/e-table-model.c</a></td><td class='right'>599</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-model.h?h=rel-0_6_2'>widgets/table/e-table-model.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-one.c?h=rel-0_6_2'>widgets/table/e-table-one.c</a></td><td class='right'>254</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-one.h?h=rel-0_6_2'>widgets/table/e-table-one.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-scrolled.c?h=rel-0_6_2'>widgets/table/e-table-scrolled.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-scrolled.h?h=rel-0_6_2'>widgets/table/e-table-scrolled.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-search.c?h=rel-0_6_2'>widgets/table/e-table-search.c</a></td><td class='right'>251</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-search.h?h=rel-0_6_2'>widgets/table/e-table-search.h</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-selection-model.c?h=rel-0_6_2'>widgets/table/e-table-selection-model.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-selection-model.h?h=rel-0_6_2'>widgets/table/e-table-selection-model.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-simple.c?h=rel-0_6_2'>widgets/table/e-table-simple.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-simple.h?h=rel-0_6_2'>widgets/table/e-table-simple.h</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-size-test.c?h=rel-0_6_2'>widgets/table/e-table-size-test.c</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sort-info.c?h=rel-0_6_2'>widgets/table/e-table-sort-info.c</a></td><td class='right'>488</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sort-info.h?h=rel-0_6_2'>widgets/table/e-table-sort-info.h</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorted-variable.c?h=rel-0_6_2'>widgets/table/e-table-sorted-variable.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorted-variable.h?h=rel-0_6_2'>widgets/table/e-table-sorted-variable.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorted.c?h=rel-0_6_2'>widgets/table/e-table-sorted.c</a></td><td class='right'>310</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorted.h?h=rel-0_6_2'>widgets/table/e-table-sorted.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorter.c?h=rel-0_6_2'>widgets/table/e-table-sorter.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorter.h?h=rel-0_6_2'>widgets/table/e-table-sorter.h</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorting-utils.c?h=rel-0_6_2'>widgets/table/e-table-sorting-utils.c</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-sorting-utils.h?h=rel-0_6_2'>widgets/table/e-table-sorting-utils.h</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-specification.c?h=rel-0_6_2'>widgets/table/e-table-specification.c</a></td><td class='right'>415</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-specification.h?h=rel-0_6_2'>widgets/table/e-table-specification.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-state.c?h=rel-0_6_2'>widgets/table/e-table-state.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-state.h?h=rel-0_6_2'>widgets/table/e-table-state.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-subset-variable.c?h=rel-0_6_2'>widgets/table/e-table-subset-variable.c</a></td><td class='right'>256</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-subset-variable.h?h=rel-0_6_2'>widgets/table/e-table-subset-variable.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-subset.c?h=rel-0_6_2'>widgets/table/e-table-subset.c</a></td><td class='right'>461</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-subset.h?h=rel-0_6_2'>widgets/table/e-table-subset.h</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-tooltip.h?h=rel-0_6_2'>widgets/table/e-table-tooltip.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-tree.h?h=rel-0_6_2'>widgets/table/e-table-tree.h</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-utils.c?h=rel-0_6_2'>widgets/table/e-table-utils.c</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-utils.h?h=rel-0_6_2'>widgets/table/e-table-utils.h</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-without.c?h=rel-0_6_2'>widgets/table/e-table-without.c</a></td><td class='right'>395</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-without.h?h=rel-0_6_2'>widgets/table/e-table-without.h</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table.c?h=rel-0_6_2'>widgets/table/e-table.c</a></td><td class='right'>3141</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 92.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table.dia?h=rel-0_6_2'>widgets/table/e-table.dia</a></td><td class='right'>bin</td><td class='graph'>4514 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table.h?h=rel-0_6_2'>widgets/table/e-table.h</a></td><td class='right'>357</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-memory-callbacks.c?h=rel-0_6_2'>widgets/table/e-tree-memory-callbacks.c</a></td><td class='right'>275</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-memory-callbacks.h?h=rel-0_6_2'>widgets/table/e-tree-memory-callbacks.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-memory.c?h=rel-0_6_2'>widgets/table/e-tree-memory.c</a></td><td class='right'>725</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-memory.h?h=rel-0_6_2'>widgets/table/e-tree-memory.h</a></td><td class='right'>105</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-model.c?h=rel-0_6_2'>widgets/table/e-tree-model.c</a></td><td class='right'>1092</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-model.h?h=rel-0_6_2'>widgets/table/e-tree-model.h</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-scrolled.c?h=rel-0_6_2'>widgets/table/e-tree-scrolled.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-scrolled.h?h=rel-0_6_2'>widgets/table/e-tree-scrolled.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-selection-model.c?h=rel-0_6_2'>widgets/table/e-tree-selection-model.c</a></td><td class='right'>1397</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.2%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-selection-model.h?h=rel-0_6_2'>widgets/table/e-tree-selection-model.h</a></td><td class='right'>77</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-simple.c?h=rel-0_6_2'>widgets/table/e-tree-simple.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-simple.h?h=rel-0_6_2'>widgets/table/e-tree-simple.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-sorted-variable.c?h=rel-0_6_2'>widgets/table/e-tree-sorted-variable.c</a></td><td class='right'>472</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-sorted-variable.h?h=rel-0_6_2'>widgets/table/e-tree-sorted-variable.h</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-sorted.c?h=rel-0_6_2'>widgets/table/e-tree-sorted.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.3%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-sorted.h?h=rel-0_6_2'>widgets/table/e-tree-sorted.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-table-adapter.c?h=rel-0_6_2'>widgets/table/e-tree-table-adapter.c</a></td><td class='right'>1148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-table-adapter.h?h=rel-0_6_2'>widgets/table/e-tree-table-adapter.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree.c?h=rel-0_6_2'>widgets/table/e-tree.c</a></td><td class='right'>3200</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.4%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree.h?h=rel-0_6_2'>widgets/table/e-tree.h</a></td><td class='right'>308</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/image1.png?h=rel-0_6_2'>widgets/table/image1.png</a></td><td class='right'>bin</td><td class='graph'>1858 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/image2.png?h=rel-0_6_2'>widgets/table/image2.png</a></td><td class='right'>bin</td><td class='graph'>1987 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/image3.png?h=rel-0_6_2'>widgets/table/image3.png</a></td><td class='right'>bin</td><td class='graph'>2051 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/remove-col.xpm?h=rel-0_6_2'>widgets/table/remove-col.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/sample.table?h=rel-0_6_2'>widgets/table/sample.table</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/spec.xml?h=rel-0_6_2'>widgets/table/spec.xml</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/table-test.c?h=rel-0_6_2'>widgets/table/table-test.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/table-test.h?h=rel-0_6_2'>widgets/table/table-test.h</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/test-check.c?h=rel-0_6_2'>widgets/table/test-check.c</a></td><td class='right'>222</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/test-cols.c?h=rel-0_6_2'>widgets/table/test-cols.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/test-table.c?h=rel-0_6_2'>widgets/table/test-table.c</a></td><td class='right'>478</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/tree-expanded.xpm?h=rel-0_6_2'>widgets/table/tree-expanded.xpm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/tree-unexpanded.xpm?h=rel-0_6_2'>widgets/table/tree-unexpanded.xpm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/.cvsignore?h=rel-0_6_2'>widgets/text/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion-match.c?h=rel-0_6_2'>widgets/text/e-completion-match.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion-match.h?h=rel-0_6_2'>widgets/text/e-completion-match.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion-test.c?h=rel-0_6_2'>widgets/text/e-completion-test.c</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion-view.c?h=rel-0_6_2'>widgets/text/e-completion-view.c</a></td><td class='right'>935</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion-view.h?h=rel-0_6_2'>widgets/text/e-completion-view.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion.c?h=rel-0_6_2'>widgets/text/e-completion.c</a></td><td class='right'>644</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-completion.h?h=rel-0_6_2'>widgets/text/e-completion.h</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-entry-test.c?h=rel-0_6_2'>widgets/text/e-entry-test.c</a></td><td class='right'>83</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-entry.c?h=rel-0_6_2'>widgets/text/e-entry.c</a></td><td class='right'>1355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-entry.h?h=rel-0_6_2'>widgets/text/e-entry.h</a></td><td class='right'>89</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-table-text-model.c?h=rel-0_6_2'>widgets/text/e-table-text-model.c</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-table-text-model.h?h=rel-0_6_2'>widgets/text/e-table-text-model.h</a></td><td class='right'>66</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model-repos.c?h=rel-0_6_2'>widgets/text/e-text-model-repos.c</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model-repos.h?h=rel-0_6_2'>widgets/text/e-text-model-repos.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model-test.c?h=rel-0_6_2'>widgets/text/e-text-model-test.c</a></td><td class='right'>93</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model-uri.c?h=rel-0_6_2'>widgets/text/e-text-model-uri.c</a></td><td class='right'>359</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model-uri.h?h=rel-0_6_2'>widgets/text/e-text-model-uri.h</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model.c?h=rel-0_6_2'>widgets/text/e-text-model.c</a></td><td class='right'>645</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-model.h?h=rel-0_6_2'>widgets/text/e-text-model.h</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text-test.c?h=rel-0_6_2'>widgets/text/e-text-test.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text.c?h=rel-0_6_2'>widgets/text/e-text.c</a></td><td class='right'>4219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/e-text.h?h=rel-0_6_2'>widgets/text/e-text.h</a></td><td class='right'>273</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/.cvsignore?h=rel-0_6_2'>wombat/.cvsignore</a></td><td class='right'>15</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/ChangeLog?h=rel-0_6_2'>wombat/ChangeLog</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/GNOME_Evolution_WombatLDAP.oaf.in?h=rel-0_6_2'>wombat/GNOME_Evolution_WombatLDAP.oaf.in</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/GNOME_Evolution_WombatNOLDAP.oaf.in?h=rel-0_6_2'>wombat/GNOME_Evolution_WombatNOLDAP.oaf.in</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/Makefile.am?h=rel-0_6_2'>wombat/Makefile.am</a></td><td class='right'>71</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat-moniker.c?h=rel-0_6_2'>wombat/wombat-moniker.c</a></td><td class='right'>159</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat-moniker.h?h=rel-0_6_2'>wombat/wombat-moniker.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat-private-moniker.c?h=rel-0_6_2'>wombat/wombat-private-moniker.c</a></td><td class='right'>171</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat-private-moniker.h?h=rel-0_6_2'>wombat/wombat-private-moniker.h</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat.c?h=rel-0_6_2'>wombat/wombat.c</a></td><td class='right'>304</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/wombat/wombat.idl?h=rel-0_6_2'>wombat/wombat.idl</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>3021 files changed, 0 insertions, 1900944 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/.cvsignore b/.cvsignore<br/>deleted file mode 100644<br/>index 5d4ce997d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-ABOUT-NLS</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-aclocal.m4</div><div class='del'>-config.cache</div><div class='del'>-config.guess</div><div class='del'>-config.h</div><div class='del'>-config.h.in</div><div class='del'>-config.log</div><div class='del'>-config.status</div><div class='del'>-config.sub</div><div class='del'>-configure</div><div class='del'>-install-sh</div><div class='del'>-intl</div><div class='del'>-libtool</div><div class='del'>-ltconfig</div><div class='del'>-ltmain.sh</div><div class='del'>-missing</div><div class='del'>-mkinstalldirs</div><div class='del'>-stamp-h</div><div class='del'>-stamp-h.in</div><div class='del'>-stamp.h</div><div class='del'>-xlibtool</div><div class='del'>-xltmain.sh</div><div class='del'>-evolution.spec</div><div class='del'>-xml-i18n-*</div><div class='head'>diff --git a/AUTHORS b/AUTHORS<br/>deleted file mode 100644<br/>index 832444b195..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/AUTHORS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>AUTHORS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-Evolution was written by:</div><div class='del'>-</div><div class='del'>-Addressbook</div><div class='del'>-	Arturo Esponosa &lt;arturo@nuclecu.unam.mx&gt; (Original Gnomecard author)</div><div class='del'>-	Nat Friedman &lt;nat@ximian.com&gt;</div><div class='del'>-	Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>-	Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>-	Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Artwork</div><div class='del'>-	Tuomas Kuosmanen &lt;tigert@ximian.com&gt;</div><div class='del'>-	Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Calendar</div><div class='del'>-	Seth Alves &lt;seth@ximian.com&gt;</div><div class='del'>-	Eric Busboom &lt;eric@softwarestudio.org&gt; (libical author)</div><div class='del'>-	Arturo Esponosa &lt;arturo@nuclecu.unam.mx&gt; (Gnomecal contributor)</div><div class='del'>-	Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>-	Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>-	Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-	Jesse Pavel &lt;jesse@ximian.com&gt;</div><div class='del'>-	JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>-	Russell Steinthal &lt;rms39@columbia.edu&gt; (Gnomecal maintainer)</div><div class='del'>-</div><div class='del'>-Documentation</div><div class='del'>-	Kevin Breit &lt;mrproper@ximian.com&gt;</div><div class='del'>-	Aaron Weber &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Mailer</div><div class='del'>-	Radek Doulik &lt;rodo@ximian.com&gt;</div><div class='del'>-	Larry Ewing &lt;lewing@ximian.com&gt;</div><div class='del'>-	Bertrand Guiheneuf &lt;bertrand@ximian.com&gt;</div><div class='del'>-	Jason Leach &lt;jleach@ximian.com&gt;</div><div class='del'>-	Matt Loper &lt;matt@ximian.com&gt;</div><div class='del'>-	Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>-	Jeff Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>-	Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>-	Peter Williams &lt;peterw@ximian.com&gt;</div><div class='del'>-	Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>-	Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Notes</div><div class='del'>-	Anders Carlsson &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-Pilot</div><div class='del'>-	JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Shell</div><div class='del'>-	Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>-	Jason Leach &lt;jleach@ximian.com&gt;</div><div class='del'>-	Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Translations</div><div class='del'>-	Akira TAGOH &lt;tagoh@gnome.gr.jp&gt;</div><div class='del'>-	Andraz Tori &lt;andraz.tori1@guest.arnes.si&gt;</div><div class='del'>-	Andreas Hyden &lt;a.hyden@cyberpoint.se&gt;</div><div class='del'>-	Arjan Scherpenisse &lt;acscherp@wins.uva.nl&gt;</div><div class='del'>-	Clara Tattoni &lt;clara.tattoni@libero.it&gt;</div><div class='del'>-	Fatih Demir &lt;kabalak@gmx.net&gt;</div><div class='del'>-	Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-	GNOME PL Team &lt;translators@gnome.pl&gt;</div><div class='del'>-	Gustavo Maciel Dias Vieira &lt;gdvieira@zaz.com.br&gt;</div><div class='del'>-	Héctor García Alvarez &lt;hector@scouts-es.org&gt;</div><div class='del'>-	Jesús Bravo Álvarez &lt;jba@pobox.com&gt;</div><div class='del'>-	Keld Simonsen &lt;keld@dkuug.dk&gt;</div><div class='del'>-	Kjartan Maraas &lt;kmaraas@gnome.org&gt;</div><div class='del'>-	Matthias Warkus &lt;mawa@iname.com&gt;</div><div class='del'>-	Spiros Papadimitriou &lt;spapadim+@cs.cmu.edu&gt;</div><div class='del'>-	Sung-Hyun Nam &lt;namsh@kldp.org&gt;</div><div class='del'>-	Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-	Tiago Antão &lt;tiagoantao@bigfoot.com&gt;</div><div class='del'>-	Valek Filippov &lt;frob@df.ru&gt;</div><div class='del'>-	Vincent Renardias &lt;vincent@redhat.com&gt;</div><div class='del'>-	Yuri Syrota &lt;rasta@renome.rovno.ua&gt;</div><div class='del'>-</div><div class='del'>-UI</div><div class='del'>-	Anna Dirks &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-Widgets</div><div class='del'>-	Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>-	Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>-	Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>-	Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>-	Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='head'>diff --git a/COPYING b/COPYING<br/>deleted file mode 100644<br/>index d60c31a97a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/COPYING?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>COPYING</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-		    GNU GENERAL PUBLIC LICENSE</div><div class='del'>-		       Version 2, June 1991</div><div class='del'>-</div><div class='del'>- Copyright (C) 1989, 1991 Free Software Foundation, Inc.</div><div class='del'>-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- Everyone is permitted to copy and distribute verbatim copies</div><div class='del'>- of this license document, but changing it is not allowed.</div><div class='del'>-</div><div class='del'>-			    Preamble</div><div class='del'>-</div><div class='del'>-  The licenses for most software are designed to take away your</div><div class='del'>-freedom to share and change it.  By contrast, the GNU General Public</div><div class='del'>-License is intended to guarantee your freedom to share and change free</div><div class='del'>-software--to make sure the software is free for all its users.  This</div><div class='del'>-General Public License applies to most of the Free Software</div><div class='del'>-Foundation's software and to any other program whose authors commit to</div><div class='del'>-using it.  (Some other Free Software Foundation software is covered by</div><div class='del'>-the GNU Library General Public License instead.)  You can apply it to</div><div class='del'>-your programs, too.</div><div class='del'>-</div><div class='del'>-  When we speak of free software, we are referring to freedom, not</div><div class='del'>-price.  Our General Public Licenses are designed to make sure that you</div><div class='del'>-have the freedom to distribute copies of free software (and charge for</div><div class='del'>-this service if you wish), that you receive source code or can get it</div><div class='del'>-if you want it, that you can change the software or use pieces of it</div><div class='del'>-in new free programs; and that you know you can do these things.</div><div class='del'>-</div><div class='del'>-  To protect your rights, we need to make restrictions that forbid</div><div class='del'>-anyone to deny you these rights or to ask you to surrender the rights.</div><div class='del'>-These restrictions translate to certain responsibilities for you if you</div><div class='del'>-distribute copies of the software, or if you modify it.</div><div class='del'>-</div><div class='del'>-  For example, if you distribute copies of such a program, whether</div><div class='del'>-gratis or for a fee, you must give the recipients all the rights that</div><div class='del'>-you have.  You must make sure that they, too, receive or can get the</div><div class='del'>-source code.  And you must show them these terms so they know their</div><div class='del'>-rights.</div><div class='del'>-</div><div class='del'>-  We protect your rights with two steps: (1) copyright the software, and</div><div class='del'>-(2) offer you this license which gives you legal permission to copy,</div><div class='del'>-distribute and/or modify the software.</div><div class='del'>-</div><div class='del'>-  Also, for each author's protection and ours, we want to make certain</div><div class='del'>-that everyone understands that there is no warranty for this free</div><div class='del'>-software.  If the software is modified by someone else and passed on, we</div><div class='del'>-want its recipients to know that what they have is not the original, so</div><div class='del'>-that any problems introduced by others will not reflect on the original</div><div class='del'>-authors' reputations.</div><div class='del'>-</div><div class='del'>-  Finally, any free program is threatened constantly by software</div><div class='del'>-patents.  We wish to avoid the danger that redistributors of a free</div><div class='del'>-program will individually obtain patent licenses, in effect making the</div><div class='del'>-program proprietary.  To prevent this, we have made it clear that any</div><div class='del'>-patent must be licensed for everyone's free use or not licensed at all.</div><div class='del'>-</div><div class='del'>-  The precise terms and conditions for copying, distribution and</div><div class='del'>-modification follow.</div><div class='del'>-</div><div class='del'>-		    GNU GENERAL PUBLIC LICENSE</div><div class='del'>-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</div><div class='del'>-</div><div class='del'>-  0. This License applies to any program or other work which contains</div><div class='del'>-a notice placed by the copyright holder saying it may be distributed</div><div class='del'>-under the terms of this General Public License.  The "Program", below,</div><div class='del'>-refers to any such program or work, and a "work based on the Program"</div><div class='del'>-means either the Program or any derivative work under copyright law:</div><div class='del'>-that is to say, a work containing the Program or a portion of it,</div><div class='del'>-either verbatim or with modifications and/or translated into another</div><div class='del'>-language.  (Hereinafter, translation is included without limitation in</div><div class='del'>-the term "modification".)  Each licensee is addressed as "you".</div><div class='del'>-</div><div class='del'>-Activities other than copying, distribution and modification are not</div><div class='del'>-covered by this License; they are outside its scope.  The act of</div><div class='del'>-running the Program is not restricted, and the output from the Program</div><div class='del'>-is covered only if its contents constitute a work based on the</div><div class='del'>-Program (independent of having been made by running the Program).</div><div class='del'>-Whether that is true depends on what the Program does.</div><div class='del'>-</div><div class='del'>-  1. You may copy and distribute verbatim copies of the Program's</div><div class='del'>-source code as you receive it, in any medium, provided that you</div><div class='del'>-conspicuously and appropriately publish on each copy an appropriate</div><div class='del'>-copyright notice and disclaimer of warranty; keep intact all the</div><div class='del'>-notices that refer to this License and to the absence of any warranty;</div><div class='del'>-and give any other recipients of the Program a copy of this License</div><div class='del'>-along with the Program.</div><div class='del'>-</div><div class='del'>-You may charge a fee for the physical act of transferring a copy, and</div><div class='del'>-you may at your option offer warranty protection in exchange for a fee.</div><div class='del'>-</div><div class='del'>-  2. You may modify your copy or copies of the Program or any portion</div><div class='del'>-of it, thus forming a work based on the Program, and copy and</div><div class='del'>-distribute such modifications or work under the terms of Section 1</div><div class='del'>-above, provided that you also meet all of these conditions:</div><div class='del'>-</div><div class='del'>-    a) You must cause the modified files to carry prominent notices</div><div class='del'>-    stating that you changed the files and the date of any change.</div><div class='del'>-</div><div class='del'>-    b) You must cause any work that you distribute or publish, that in</div><div class='del'>-    whole or in part contains or is derived from the Program or any</div><div class='del'>-    part thereof, to be licensed as a whole at no charge to all third</div><div class='del'>-    parties under the terms of this License.</div><div class='del'>-</div><div class='del'>-    c) If the modified program normally reads commands interactively</div><div class='del'>-    when run, you must cause it, when started running for such</div><div class='del'>-    interactive use in the most ordinary way, to print or display an</div><div class='del'>-    announcement including an appropriate copyright notice and a</div><div class='del'>-    notice that there is no warranty (or else, saying that you provide</div><div class='del'>-    a warranty) and that users may redistribute the program under</div><div class='del'>-    these conditions, and telling the user how to view a copy of this</div><div class='del'>-    License.  (Exception: if the Program itself is interactive but</div><div class='del'>-    does not normally print such an announcement, your work based on</div><div class='del'>-    the Program is not required to print an announcement.)</div><div class='del'>-</div><div class='del'>-These requirements apply to the modified work as a whole.  If</div><div class='del'>-identifiable sections of that work are not derived from the Program,</div><div class='del'>-and can be reasonably considered independent and separate works in</div><div class='del'>-themselves, then this License, and its terms, do not apply to those</div><div class='del'>-sections when you distribute them as separate works.  But when you</div><div class='del'>-distribute the same sections as part of a whole which is a work based</div><div class='del'>-on the Program, the distribution of the whole must be on the terms of</div><div class='del'>-this License, whose permissions for other licensees extend to the</div><div class='del'>-entire whole, and thus to each and every part regardless of who wrote it.</div><div class='del'>-</div><div class='del'>-Thus, it is not the intent of this section to claim rights or contest</div><div class='del'>-your rights to work written entirely by you; rather, the intent is to</div><div class='del'>-exercise the right to control the distribution of derivative or</div><div class='del'>-collective works based on the Program.</div><div class='del'>-</div><div class='del'>-In addition, mere aggregation of another work not based on the Program</div><div class='del'>-with the Program (or with a work based on the Program) on a volume of</div><div class='del'>-a storage or distribution medium does not bring the other work under</div><div class='del'>-the scope of this License.</div><div class='del'>-</div><div class='del'>-  3. You may copy and distribute the Program (or a work based on it,</div><div class='del'>-under Section 2) in object code or executable form under the terms of</div><div class='del'>-Sections 1 and 2 above provided that you also do one of the following:</div><div class='del'>-</div><div class='del'>-    a) Accompany it with the complete corresponding machine-readable</div><div class='del'>-    source code, which must be distributed under the terms of Sections</div><div class='del'>-    1 and 2 above on a medium customarily used for software interchange; or,</div><div class='del'>-</div><div class='del'>-    b) Accompany it with a written offer, valid for at least three</div><div class='del'>-    years, to give any third party, for a charge no more than your</div><div class='del'>-    cost of physically performing source distribution, a complete</div><div class='del'>-    machine-readable copy of the corresponding source code, to be</div><div class='del'>-    distributed under the terms of Sections 1 and 2 above on a medium</div><div class='del'>-    customarily used for software interchange; or,</div><div class='del'>-</div><div class='del'>-    c) Accompany it with the information you received as to the offer</div><div class='del'>-    to distribute corresponding source code.  (This alternative is</div><div class='del'>-    allowed only for noncommercial distribution and only if you</div><div class='del'>-    received the program in object code or executable form with such</div><div class='del'>-    an offer, in accord with Subsection b above.)</div><div class='del'>-</div><div class='del'>-The source code for a work means the preferred form of the work for</div><div class='del'>-making modifications to it.  For an executable work, complete source</div><div class='del'>-code means all the source code for all modules it contains, plus any</div><div class='del'>-associated interface definition files, plus the scripts used to</div><div class='del'>-control compilation and installation of the executable.  However, as a</div><div class='del'>-special exception, the source code distributed need not include</div><div class='del'>-anything that is normally distributed (in either source or binary</div><div class='del'>-form) with the major components (compiler, kernel, and so on) of the</div><div class='del'>-operating system on which the executable runs, unless that component</div><div class='del'>-itself accompanies the executable.</div><div class='del'>-</div><div class='del'>-If distribution of executable or object code is made by offering</div><div class='del'>-access to copy from a designated place, then offering equivalent</div><div class='del'>-access to copy the source code from the same place counts as</div><div class='del'>-distribution of the source code, even though third parties are not</div><div class='del'>-compelled to copy the source along with the object code.</div><div class='del'>-</div><div class='del'>-  4. You may not copy, modify, sublicense, or distribute the Program</div><div class='del'>-except as expressly provided under this License.  Any attempt</div><div class='del'>-otherwise to copy, modify, sublicense or distribute the Program is</div><div class='del'>-void, and will automatically terminate your rights under this License.</div><div class='del'>-However, parties who have received copies, or rights, from you under</div><div class='del'>-this License will not have their licenses terminated so long as such</div><div class='del'>-parties remain in full compliance.</div><div class='del'>-</div><div class='del'>-  5. You are not required to accept this License, since you have not</div><div class='del'>-signed it.  However, nothing else grants you permission to modify or</div><div class='del'>-distribute the Program or its derivative works.  These actions are</div><div class='del'>-prohibited by law if you do not accept this License.  Therefore, by</div><div class='del'>-modifying or distributing the Program (or any work based on the</div><div class='del'>-Program), you indicate your acceptance of this License to do so, and</div><div class='del'>-all its terms and conditions for copying, distributing or modifying</div><div class='del'>-the Program or works based on it.</div><div class='del'>-</div><div class='del'>-  6. Each time you redistribute the Program (or any work based on the</div><div class='del'>-Program), the recipient automatically receives a license from the</div><div class='del'>-original licensor to copy, distribute or modify the Program subject to</div><div class='del'>-these terms and conditions.  You may not impose any further</div><div class='del'>-restrictions on the recipients' exercise of the rights granted herein.</div><div class='del'>-You are not responsible for enforcing compliance by third parties to</div><div class='del'>-this License.</div><div class='del'>-</div><div class='del'>-  7. If, as a consequence of a court judgment or allegation of patent</div><div class='del'>-infringement or for any other reason (not limited to patent issues),</div><div class='del'>-conditions are imposed on you (whether by court order, agreement or</div><div class='del'>-otherwise) that contradict the conditions of this License, they do not</div><div class='del'>-excuse you from the conditions of this License.  If you cannot</div><div class='del'>-distribute so as to satisfy simultaneously your obligations under this</div><div class='del'>-License and any other pertinent obligations, then as a consequence you</div><div class='del'>-may not distribute the Program at all.  For example, if a patent</div><div class='del'>-license would not permit royalty-free redistribution of the Program by</div><div class='del'>-all those who receive copies directly or indirectly through you, then</div><div class='del'>-the only way you could satisfy both it and this License would be to</div><div class='del'>-refrain entirely from distribution of the Program.</div><div class='del'>-</div><div class='del'>-If any portion of this section is held invalid or unenforceable under</div><div class='del'>-any particular circumstance, the balance of the section is intended to</div><div class='del'>-apply and the section as a whole is intended to apply in other</div><div class='del'>-circumstances.</div><div class='del'>-</div><div class='del'>-It is not the purpose of this section to induce you to infringe any</div><div class='del'>-patents or other property right claims or to contest validity of any</div><div class='del'>-such claims; this section has the sole purpose of protecting the</div><div class='del'>-integrity of the free software distribution system, which is</div><div class='del'>-implemented by public license practices.  Many people have made</div><div class='del'>-generous contributions to the wide range of software distributed</div><div class='del'>-through that system in reliance on consistent application of that</div><div class='del'>-system; it is up to the author/donor to decide if he or she is willing</div><div class='del'>-to distribute software through any other system and a licensee cannot</div><div class='del'>-impose that choice.</div><div class='del'>-</div><div class='del'>-This section is intended to make thoroughly clear what is believed to</div><div class='del'>-be a consequence of the rest of this License.</div><div class='del'>-</div><div class='del'>-  8. If the distribution and/or use of the Program is restricted in</div><div class='del'>-certain countries either by patents or by copyrighted interfaces, the</div><div class='del'>-original copyright holder who places the Program under this License</div><div class='del'>-may add an explicit geographical distribution limitation excluding</div><div class='del'>-those countries, so that distribution is permitted only in or among</div><div class='del'>-countries not thus excluded.  In such case, this License incorporates</div><div class='del'>-the limitation as if written in the body of this License.</div><div class='del'>-</div><div class='del'>-  9. The Free Software Foundation may publish revised and/or new versions</div><div class='del'>-of the General Public License from time to time.  Such new versions will</div><div class='del'>-be similar in spirit to the present version, but may differ in detail to</div><div class='del'>-address new problems or concerns.</div><div class='del'>-</div><div class='del'>-Each version is given a distinguishing version number.  If the Program</div><div class='del'>-specifies a version number of this License which applies to it and "any</div><div class='del'>-later version", you have the option of following the terms and conditions</div><div class='del'>-either of that version or of any later version published by the Free</div><div class='del'>-Software Foundation.  If the Program does not specify a version number of</div><div class='del'>-this License, you may choose any version ever published by the Free Software</div><div class='del'>-Foundation.</div><div class='del'>-</div><div class='del'>-  10. If you wish to incorporate parts of the Program into other free</div><div class='del'>-programs whose distribution conditions are different, write to the author</div><div class='del'>-to ask for permission.  For software which is copyrighted by the Free</div><div class='del'>-Software Foundation, write to the Free Software Foundation; we sometimes</div><div class='del'>-make exceptions for this.  Our decision will be guided by the two goals</div><div class='del'>-of preserving the free status of all derivatives of our free software and</div><div class='del'>-of promoting the sharing and reuse of software generally.</div><div class='del'>-</div><div class='del'>-			    NO WARRANTY</div><div class='del'>-</div><div class='del'>-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY</div><div class='del'>-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN</div><div class='del'>-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES</div><div class='del'>-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED</div><div class='del'>-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF</div><div class='del'>-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS</div><div class='del'>-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE</div><div class='del'>-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,</div><div class='del'>-REPAIR OR CORRECTION.</div><div class='del'>-</div><div class='del'>-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING</div><div class='del'>-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR</div><div class='del'>-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,</div><div class='del'>-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING</div><div class='del'>-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED</div><div class='del'>-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY</div><div class='del'>-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER</div><div class='del'>-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE</div><div class='del'>-POSSIBILITY OF SUCH DAMAGES.</div><div class='del'>-</div><div class='del'>-		     END OF TERMS AND CONDITIONS</div><div class='del'>-</div><div class='del'>-	    How to Apply These Terms to Your New Programs</div><div class='del'>-</div><div class='del'>-  If you develop a new program, and you want it to be of the greatest</div><div class='del'>-possible use to the public, the best way to achieve this is to make it</div><div class='del'>-free software which everyone can redistribute and change under these terms.</div><div class='del'>-</div><div class='del'>-  To do so, attach the following notices to the program.  It is safest</div><div class='del'>-to attach them to the start of each source file to most effectively</div><div class='del'>-convey the exclusion of warranty; and each file should have at least</div><div class='del'>-the "copyright" line and a pointer to where the full notice is found.</div><div class='del'>-</div><div class='del'>-    &lt;one line to give the program's name and a brief idea of what it does.&gt;</div><div class='del'>-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or modify</div><div class='del'>-    it under the terms of the GNU General Public License as published by</div><div class='del'>-    the Free Software Foundation; either version 2 of the License, or</div><div class='del'>-    (at your option) any later version.</div><div class='del'>-</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with this program; if not, write to the Free Software</div><div class='del'>-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Also add information on how to contact you by electronic and paper mail.</div><div class='del'>-</div><div class='del'>-If the program is interactive, make it output a short notice like this</div><div class='del'>-when it starts in an interactive mode:</div><div class='del'>-</div><div class='del'>-    Gnomovision version 69, Copyright (C) year  name of author</div><div class='del'>-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.</div><div class='del'>-    This is free software, and you are welcome to redistribute it</div><div class='del'>-    under certain conditions; type `show c' for details.</div><div class='del'>-</div><div class='del'>-The hypothetical commands `show w' and `show c' should show the appropriate</div><div class='del'>-parts of the General Public License.  Of course, the commands you use may</div><div class='del'>-be called something other than `show w' and `show c'; they could even be</div><div class='del'>-mouse-clicks or menu items--whatever suits your program.</div><div class='del'>-</div><div class='del'>-You should also get your employer (if you work as a programmer) or your</div><div class='del'>-school, if any, to sign a "copyright disclaimer" for the program, if</div><div class='del'>-necessary.  Here is a sample; alter the names:</div><div class='del'>-</div><div class='del'>-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program</div><div class='del'>-  `Gnomovision' (which makes passes at compilers) written by James Hacker.</div><div class='del'>-</div><div class='del'>-  &lt;signature of Ty Coon&gt;, 1 April 1989</div><div class='del'>-  Ty Coon, President of Vice</div><div class='del'>-</div><div class='del'>-This General Public License does not permit incorporating your program into</div><div class='del'>-proprietary programs.  If your program is a subroutine library, you may</div><div class='del'>-consider it more useful to permit linking proprietary applications with the</div><div class='del'>-library.  If this is what you want to do, use the GNU Library General</div><div class='del'>-Public License instead of this License.</div><div class='head'>diff --git a/COPYING-DOCS b/COPYING-DOCS<br/>deleted file mode 100644<br/>index b42936beb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/COPYING-DOCS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>COPYING-DOCS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,355 +0,0 @@</div><div class='del'>-		GNU Free Documentation License</div><div class='del'>-		   Version 1.1, March 2000</div><div class='del'>-</div><div class='del'>- Copyright (C) 2000  Free Software Foundation, Inc.</div><div class='del'>-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- Everyone is permitted to copy and distribute verbatim copies</div><div class='del'>- of this license document, but changing it is not allowed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-0. PREAMBLE</div><div class='del'>-</div><div class='del'>-The purpose of this License is to make a manual, textbook, or other</div><div class='del'>-written document "free" in the sense of freedom: to assure everyone</div><div class='del'>-the effective freedom to copy and redistribute it, with or without</div><div class='del'>-modifying it, either commercially or noncommercially.  Secondarily,</div><div class='del'>-this License preserves for the author and publisher a way to get</div><div class='del'>-credit for their work, while not being considered responsible for</div><div class='del'>-modifications made by others.</div><div class='del'>-</div><div class='del'>-This License is a kind of "copyleft", which means that derivative</div><div class='del'>-works of the document must themselves be free in the same sense.  It</div><div class='del'>-complements the GNU General Public License, which is a copyleft</div><div class='del'>-license designed for free software.</div><div class='del'>-</div><div class='del'>-We have designed this License in order to use it for manuals for free</div><div class='del'>-software, because free software needs free documentation: a free</div><div class='del'>-program should come with manuals providing the same freedoms that the</div><div class='del'>-software does.  But this License is not limited to software manuals;</div><div class='del'>-it can be used for any textual work, regardless of subject matter or</div><div class='del'>-whether it is published as a printed book.  We recommend this License</div><div class='del'>-principally for works whose purpose is instruction or reference.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. APPLICABILITY AND DEFINITIONS</div><div class='del'>-</div><div class='del'>-This License applies to any manual or other work that contains a</div><div class='del'>-notice placed by the copyright holder saying it can be distributed</div><div class='del'>-under the terms of this License.  The "Document", below, refers to any</div><div class='del'>-such manual or work.  Any member of the public is a licensee, and is</div><div class='del'>-addressed as "you".</div><div class='del'>-</div><div class='del'>-A "Modified Version" of the Document means any work containing the</div><div class='del'>-Document or a portion of it, either copied verbatim, or with</div><div class='del'>-modifications and/or translated into another language.</div><div class='del'>-</div><div class='del'>-A "Secondary Section" is a named appendix or a front-matter section of</div><div class='del'>-the Document that deals exclusively with the relationship of the</div><div class='del'>-publishers or authors of the Document to the Document's overall subject</div><div class='del'>-(or to related matters) and contains nothing that could fall directly</div><div class='del'>-within that overall subject.  (For example, if the Document is in part a</div><div class='del'>-textbook of mathematics, a Secondary Section may not explain any</div><div class='del'>-mathematics.)  The relationship could be a matter of historical</div><div class='del'>-connection with the subject or with related matters, or of legal,</div><div class='del'>-commercial, philosophical, ethical or political position regarding</div><div class='del'>-them.</div><div class='del'>-</div><div class='del'>-The "Invariant Sections" are certain Secondary Sections whose titles</div><div class='del'>-are designated, as being those of Invariant Sections, in the notice</div><div class='del'>-that says that the Document is released under this License.</div><div class='del'>-</div><div class='del'>-The "Cover Texts" are certain short passages of text that are listed,</div><div class='del'>-as Front-Cover Texts or Back-Cover Texts, in the notice that says that</div><div class='del'>-the Document is released under this License.</div><div class='del'>-</div><div class='del'>-A "Transparent" copy of the Document means a machine-readable copy,</div><div class='del'>-represented in a format whose specification is available to the</div><div class='del'>-general public, whose contents can be viewed and edited directly and</div><div class='del'>-straightforwardly with generic text editors or (for images composed of</div><div class='del'>-pixels) generic paint programs or (for drawings) some widely available</div><div class='del'>-drawing editor, and that is suitable for input to text formatters or</div><div class='del'>-for automatic translation to a variety of formats suitable for input</div><div class='del'>-to text formatters.  A copy made in an otherwise Transparent file</div><div class='del'>-format whose markup has been designed to thwart or discourage</div><div class='del'>-subsequent modification by readers is not Transparent.  A copy that is</div><div class='del'>-not "Transparent" is called "Opaque".</div><div class='del'>-</div><div class='del'>-Examples of suitable formats for Transparent copies include plain</div><div class='del'>-ASCII without markup, Texinfo input format, LaTeX input format, SGML</div><div class='del'>-or XML using a publicly available DTD, and standard-conforming simple</div><div class='del'>-HTML designed for human modification.  Opaque formats include</div><div class='del'>-PostScript, PDF, proprietary formats that can be read and edited only</div><div class='del'>-by proprietary word processors, SGML or XML for which the DTD and/or</div><div class='del'>-processing tools are not generally available, and the</div><div class='del'>-machine-generated HTML produced by some word processors for output</div><div class='del'>-purposes only.</div><div class='del'>-</div><div class='del'>-The "Title Page" means, for a printed book, the title page itself,</div><div class='del'>-plus such following pages as are needed to hold, legibly, the material</div><div class='del'>-this License requires to appear in the title page.  For works in</div><div class='del'>-formats which do not have any title page as such, "Title Page" means</div><div class='del'>-the text near the most prominent appearance of the work's title,</div><div class='del'>-preceding the beginning of the body of the text.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. VERBATIM COPYING</div><div class='del'>-</div><div class='del'>-You may copy and distribute the Document in any medium, either</div><div class='del'>-commercially or noncommercially, provided that this License, the</div><div class='del'>-copyright notices, and the license notice saying this License applies</div><div class='del'>-to the Document are reproduced in all copies, and that you add no other</div><div class='del'>-conditions whatsoever to those of this License.  You may not use</div><div class='del'>-technical measures to obstruct or control the reading or further</div><div class='del'>-copying of the copies you make or distribute.  However, you may accept</div><div class='del'>-compensation in exchange for copies.  If you distribute a large enough</div><div class='del'>-number of copies you must also follow the conditions in section 3.</div><div class='del'>-</div><div class='del'>-You may also lend copies, under the same conditions stated above, and</div><div class='del'>-you may publicly display copies.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. COPYING IN QUANTITY</div><div class='del'>-</div><div class='del'>-If you publish printed copies of the Document numbering more than 100,</div><div class='del'>-and the Document's license notice requires Cover Texts, you must enclose</div><div class='del'>-the copies in covers that carry, clearly and legibly, all these Cover</div><div class='del'>-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on</div><div class='del'>-the back cover.  Both covers must also clearly and legibly identify</div><div class='del'>-you as the publisher of these copies.  The front cover must present</div><div class='del'>-the full title with all words of the title equally prominent and</div><div class='del'>-visible.  You may add other material on the covers in addition.</div><div class='del'>-Copying with changes limited to the covers, as long as they preserve</div><div class='del'>-the title of the Document and satisfy these conditions, can be treated</div><div class='del'>-as verbatim copying in other respects.</div><div class='del'>-</div><div class='del'>-If the required texts for either cover are too voluminous to fit</div><div class='del'>-legibly, you should put the first ones listed (as many as fit</div><div class='del'>-reasonably) on the actual cover, and continue the rest onto adjacent</div><div class='del'>-pages.</div><div class='del'>-</div><div class='del'>-If you publish or distribute Opaque copies of the Document numbering</div><div class='del'>-more than 100, you must either include a machine-readable Transparent</div><div class='del'>-copy along with each Opaque copy, or state in or with each Opaque copy</div><div class='del'>-a publicly-accessible computer-network location containing a complete</div><div class='del'>-Transparent copy of the Document, free of added material, which the</div><div class='del'>-general network-using public has access to download anonymously at no</div><div class='del'>-charge using public-standard network protocols.  If you use the latter</div><div class='del'>-option, you must take reasonably prudent steps, when you begin</div><div class='del'>-distribution of Opaque copies in quantity, to ensure that this</div><div class='del'>-Transparent copy will remain thus accessible at the stated location</div><div class='del'>-until at least one year after the last time you distribute an Opaque</div><div class='del'>-copy (directly or through your agents or retailers) of that edition to</div><div class='del'>-the public.</div><div class='del'>-</div><div class='del'>-It is requested, but not required, that you contact the authors of the</div><div class='del'>-Document well before redistributing any large number of copies, to give</div><div class='del'>-them a chance to provide you with an updated version of the Document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4. MODIFICATIONS</div><div class='del'>-</div><div class='del'>-You may copy and distribute a Modified Version of the Document under</div><div class='del'>-the conditions of sections 2 and 3 above, provided that you release</div><div class='del'>-the Modified Version under precisely this License, with the Modified</div><div class='del'>-Version filling the role of the Document, thus licensing distribution</div><div class='del'>-and modification of the Modified Version to whoever possesses a copy</div><div class='del'>-of it.  In addition, you must do these things in the Modified Version:</div><div class='del'>-</div><div class='del'>-A. Use in the Title Page (and on the covers, if any) a title distinct</div><div class='del'>-   from that of the Document, and from those of previous versions</div><div class='del'>-   (which should, if there were any, be listed in the History section</div><div class='del'>-   of the Document).  You may use the same title as a previous version</div><div class='del'>-   if the original publisher of that version gives permission.</div><div class='del'>-B. List on the Title Page, as authors, one or more persons or entities</div><div class='del'>-   responsible for authorship of the modifications in the Modified</div><div class='del'>-   Version, together with at least five of the principal authors of the</div><div class='del'>-   Document (all of its principal authors, if it has less than five).</div><div class='del'>-C. State on the Title page the name of the publisher of the</div><div class='del'>-   Modified Version, as the publisher.</div><div class='del'>-D. Preserve all the copyright notices of the Document.</div><div class='del'>-E. Add an appropriate copyright notice for your modifications</div><div class='del'>-   adjacent to the other copyright notices.</div><div class='del'>-F. Include, immediately after the copyright notices, a license notice</div><div class='del'>-   giving the public permission to use the Modified Version under the</div><div class='del'>-   terms of this License, in the form shown in the Addendum below.</div><div class='del'>-G. Preserve in that license notice the full lists of Invariant Sections</div><div class='del'>-   and required Cover Texts given in the Document's license notice.</div><div class='del'>-H. Include an unaltered copy of this License.</div><div class='del'>-I. Preserve the section entitled "History", and its title, and add to</div><div class='del'>-   it an item stating at least the title, year, new authors, and</div><div class='del'>-   publisher of the Modified Version as given on the Title Page.  If</div><div class='del'>-   there is no section entitled "History" in the Document, create one</div><div class='del'>-   stating the title, year, authors, and publisher of the Document as</div><div class='del'>-   given on its Title Page, then add an item describing the Modified</div><div class='del'>-   Version as stated in the previous sentence.</div><div class='del'>-J. Preserve the network location, if any, given in the Document for</div><div class='del'>-   public access to a Transparent copy of the Document, and likewise</div><div class='del'>-   the network locations given in the Document for previous versions</div><div class='del'>-   it was based on.  These may be placed in the "History" section.</div><div class='del'>-   You may omit a network location for a work that was published at</div><div class='del'>-   least four years before the Document itself, or if the original</div><div class='del'>-   publisher of the version it refers to gives permission.</div><div class='del'>-K. In any section entitled "Acknowledgements" or "Dedications",</div><div class='del'>-   preserve the section's title, and preserve in the section all the</div><div class='del'>-   substance and tone of each of the contributor acknowledgements</div><div class='del'>-   and/or dedications given therein.</div><div class='del'>-L. Preserve all the Invariant Sections of the Document,</div><div class='del'>-   unaltered in their text and in their titles.  Section numbers</div><div class='del'>-   or the equivalent are not considered part of the section titles.</div><div class='del'>-M. Delete any section entitled "Endorsements".  Such a section</div><div class='del'>-   may not be included in the Modified Version.</div><div class='del'>-N. Do not retitle any existing section as "Endorsements"</div><div class='del'>-   or to conflict in title with any Invariant Section.</div><div class='del'>-</div><div class='del'>-If the Modified Version includes new front-matter sections or</div><div class='del'>-appendices that qualify as Secondary Sections and contain no material</div><div class='del'>-copied from the Document, you may at your option designate some or all</div><div class='del'>-of these sections as invariant.  To do this, add their titles to the</div><div class='del'>-list of Invariant Sections in the Modified Version's license notice.</div><div class='del'>-These titles must be distinct from any other section titles.</div><div class='del'>-</div><div class='del'>-You may add a section entitled "Endorsements", provided it contains</div><div class='del'>-nothing but endorsements of your Modified Version by various</div><div class='del'>-parties--for example, statements of peer review or that the text has</div><div class='del'>-been approved by an organization as the authoritative definition of a</div><div class='del'>-standard.</div><div class='del'>-</div><div class='del'>-You may add a passage of up to five words as a Front-Cover Text, and a</div><div class='del'>-passage of up to 25 words as a Back-Cover Text, to the end of the list</div><div class='del'>-of Cover Texts in the Modified Version.  Only one passage of</div><div class='del'>-Front-Cover Text and one of Back-Cover Text may be added by (or</div><div class='del'>-through arrangements made by) any one entity.  If the Document already</div><div class='del'>-includes a cover text for the same cover, previously added by you or</div><div class='del'>-by arrangement made by the same entity you are acting on behalf of,</div><div class='del'>-you may not add another; but you may replace the old one, on explicit</div><div class='del'>-permission from the previous publisher that added the old one.</div><div class='del'>-</div><div class='del'>-The author(s) and publisher(s) of the Document do not by this License</div><div class='del'>-give permission to use their names for publicity for or to assert or</div><div class='del'>-imply endorsement of any Modified Version.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. COMBINING DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may combine the Document with other documents released under this</div><div class='del'>-License, under the terms defined in section 4 above for modified</div><div class='del'>-versions, provided that you include in the combination all of the</div><div class='del'>-Invariant Sections of all of the original documents, unmodified, and</div><div class='del'>-list them all as Invariant Sections of your combined work in its</div><div class='del'>-license notice.</div><div class='del'>-</div><div class='del'>-The combined work need only contain one copy of this License, and</div><div class='del'>-multiple identical Invariant Sections may be replaced with a single</div><div class='del'>-copy.  If there are multiple Invariant Sections with the same name but</div><div class='del'>-different contents, make the title of each such section unique by</div><div class='del'>-adding at the end of it, in parentheses, the name of the original</div><div class='del'>-author or publisher of that section if known, or else a unique number.</div><div class='del'>-Make the same adjustment to the section titles in the list of</div><div class='del'>-Invariant Sections in the license notice of the combined work.</div><div class='del'>-</div><div class='del'>-In the combination, you must combine any sections entitled "History"</div><div class='del'>-in the various original documents, forming one section entitled</div><div class='del'>-"History"; likewise combine any sections entitled "Acknowledgements",</div><div class='del'>-and any sections entitled "Dedications".  You must delete all sections</div><div class='del'>-entitled "Endorsements."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6. COLLECTIONS OF DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may make a collection consisting of the Document and other documents</div><div class='del'>-released under this License, and replace the individual copies of this</div><div class='del'>-License in the various documents with a single copy that is included in</div><div class='del'>-the collection, provided that you follow the rules of this License for</div><div class='del'>-verbatim copying of each of the documents in all other respects.</div><div class='del'>-</div><div class='del'>-You may extract a single document from such a collection, and distribute</div><div class='del'>-it individually under this License, provided you insert a copy of this</div><div class='del'>-License into the extracted document, and follow this License in all</div><div class='del'>-other respects regarding verbatim copying of that document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7. AGGREGATION WITH INDEPENDENT WORKS</div><div class='del'>-</div><div class='del'>-A compilation of the Document or its derivatives with other separate</div><div class='del'>-and independent documents or works, in or on a volume of a storage or</div><div class='del'>-distribution medium, does not as a whole count as a Modified Version</div><div class='del'>-of the Document, provided no compilation copyright is claimed for the</div><div class='del'>-compilation.  Such a compilation is called an "aggregate", and this</div><div class='del'>-License does not apply to the other self-contained works thus compiled</div><div class='del'>-with the Document, on account of their being thus compiled, if they</div><div class='del'>-are not themselves derivative works of the Document.</div><div class='del'>-</div><div class='del'>-If the Cover Text requirement of section 3 is applicable to these</div><div class='del'>-copies of the Document, then if the Document is less than one quarter</div><div class='del'>-of the entire aggregate, the Document's Cover Texts may be placed on</div><div class='del'>-covers that surround only the Document within the aggregate.</div><div class='del'>-Otherwise they must appear on covers around the whole aggregate.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-8. TRANSLATION</div><div class='del'>-</div><div class='del'>-Translation is considered a kind of modification, so you may</div><div class='del'>-distribute translations of the Document under the terms of section 4.</div><div class='del'>-Replacing Invariant Sections with translations requires special</div><div class='del'>-permission from their copyright holders, but you may include</div><div class='del'>-translations of some or all Invariant Sections in addition to the</div><div class='del'>-original versions of these Invariant Sections.  You may include a</div><div class='del'>-translation of this License provided that you also include the</div><div class='del'>-original English version of this License.  In case of a disagreement</div><div class='del'>-between the translation and the original English version of this</div><div class='del'>-License, the original English version will prevail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-9. TERMINATION</div><div class='del'>-</div><div class='del'>-You may not copy, modify, sublicense, or distribute the Document except</div><div class='del'>-as expressly provided for under this License.  Any other attempt to</div><div class='del'>-copy, modify, sublicense or distribute the Document is void, and will</div><div class='del'>-automatically terminate your rights under this License.  However,</div><div class='del'>-parties who have received copies, or rights, from you under this</div><div class='del'>-License will not have their licenses terminated so long as such</div><div class='del'>-parties remain in full compliance.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10. FUTURE REVISIONS OF THIS LICENSE</div><div class='del'>-</div><div class='del'>-The Free Software Foundation may publish new, revised versions</div><div class='del'>-of the GNU Free Documentation License from time to time.  Such new</div><div class='del'>-versions will be similar in spirit to the present version, but may</div><div class='del'>-differ in detail to address new problems or concerns.  See</div><div class='del'>-http://www.gnu.org/copyleft/.</div><div class='del'>-</div><div class='del'>-Each version of the License is given a distinguishing version number.</div><div class='del'>-If the Document specifies that a particular numbered version of this</div><div class='del'>-License "or any later version" applies to it, you have the option of</div><div class='del'>-following the terms and conditions either of that specified version or</div><div class='del'>-of any later version that has been published (not as a draft) by the</div><div class='del'>-Free Software Foundation.  If the Document does not specify a version</div><div class='del'>-number of this License, you may choose any version ever published (not</div><div class='del'>-as a draft) by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ADDENDUM: How to use this License for your documents</div><div class='del'>-</div><div class='del'>-To use this License in a document you have written, include a copy of</div><div class='del'>-the License in the document and put the following copyright and</div><div class='del'>-license notices just after the title page:</div><div class='del'>-</div><div class='del'>-      Copyright (c)  YEAR  YOUR NAME.</div><div class='del'>-      Permission is granted to copy, distribute and/or modify this document</div><div class='del'>-      under the terms of the GNU Free Documentation License, Version 1.1</div><div class='del'>-      or any later version published by the Free Software Foundation;</div><div class='del'>-      with the Invariant Sections being LIST THEIR TITLES, with the</div><div class='del'>-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.</div><div class='del'>-      A copy of the license is included in the section entitled "GNU</div><div class='del'>-      Free Documentation License".</div><div class='del'>-</div><div class='del'>-If you have no Invariant Sections, write "with no Invariant Sections"</div><div class='del'>-instead of saying which ones are invariant.  If you have no</div><div class='del'>-Front-Cover Texts, write "no Front-Cover Texts" instead of</div><div class='del'>-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</div><div class='del'>-</div><div class='del'>-If your document contains nontrivial examples of program code, we</div><div class='del'>-recommend releasing these examples in parallel under your choice of</div><div class='del'>-free software license, such as the GNU General Public License,</div><div class='del'>-to permit their use in free software.</div><div class='head'>diff --git a/ChangeLog b/ChangeLog<br/>deleted file mode 100644<br/>index 26cde14aa9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7667 +0,0 @@</div><div class='del'>-2002-05-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.1: Document "evolution default:mail"</div><div class='del'>-</div><div class='del'>-2002-05-08  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Add an explanation/warning about why we want Berkeley DB</div><div class='del'>-	3.1.17 and nothing else.</div><div class='del'>-</div><div class='del'>-2002-04-28  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: require gtkhtml-1.1.1.</div><div class='del'>-</div><div class='del'>-2002-04-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVO_CHECK_LIB): Bumped the required version number</div><div class='del'>-	of gal to 0.19.99.15.</div><div class='del'>-</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Don't generate libibex/Makefile anymore.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed libibex from SUBDIRS.</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am: Don't link with libibex.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Same here.</div><div class='del'>-</div><div class='del'>-2002-04-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.19.99.14.</div><div class='del'>-</div><div class='del'>-2002-04-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GAL 0.19.99.13.</div><div class='del'>-</div><div class='del'>-2002-04-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required gal version number to 0.19.99.12.</div><div class='del'>-</div><div class='del'>-2002-04-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required gal version number to 0.19.99.11.</div><div class='del'>-</div><div class='del'>-2002-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add checks for gethostbyaddr_r</div><div class='del'>-</div><div class='del'>-2002-04-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for socklen_t and if it doesn't exist,</div><div class='del'>-	define it as unsigned int.</div><div class='del'>-</div><div class='del'>-2002-04-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix static linking on solaris which doesn't have a</div><div class='del'>-	static libresolv.</div><div class='del'>-</div><div class='del'>-2002-04-01  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vobject.c (newStrItem): only include if USE_STRTBL is</div><div class='del'>-	defined.</div><div class='del'>-	(deleteStrItem): same.</div><div class='del'>-	(hashStr): same.</div><div class='del'>-	(lookupStr): if USE_STRTBL is defined, use existing behavior.  if</div><div class='del'>-	not defined, just dup the string.</div><div class='del'>-	(unUseStr): if USE_STRTBL is defined, use existing behavior.  if</div><div class='del'>-	not defined, just free the string.</div><div class='del'>-</div><div class='del'>-2002-04-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Darwin/OS X portability from Max Horn &lt;max@quendi.de&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vcc.y: Remove #include &lt;malloc.h&gt;.</div><div class='del'>-</div><div class='del'>-	* libversit/vobject.c: Likewise, and #include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-2002-03-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add argument `--enable-shlib-components'.  New</div><div class='del'>-	substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,</div><div class='del'>-	OAF_SHLIB_SUFFIX.</div><div class='del'>-</div><div class='del'>-2002-03-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for GConf.  Add gthreads to LIBIBEX_CFLAGS</div><div class='del'>-	and LIBIBEX_LIBS.</div><div class='del'>-</div><div class='del'>-2002-03-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal to 0.19.99.10.</div><div class='del'>-</div><div class='del'>-2002-03-24  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Change the OAFIID for the GtkHTML editor to</div><div class='del'>-	have :1.1 at the end.</div><div class='del'>-</div><div class='del'>-2002-03-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am (evolution_addressbook_import_LDADD):</div><div class='del'>-	s/libversit.la/libversit.a/</div><div class='del'>-</div><div class='del'>-2002-03-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_ADDRESSBOOK_DEPS): add gal.</div><div class='del'>-</div><div class='del'>-2002-03-12  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal.</div><div class='del'>-</div><div class='del'>-2002-03-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Allow the user to enable OpenSSL over Mozilla NSS</div><div class='del'>-	using --enable-openssl or --disable-nss.</div><div class='del'>-</div><div class='del'>-2002-02-24  jacob berkman  &lt;jacob@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* sounds/Makefile.am (EXTRA_DIST): add $(sounds_DATA)</div><div class='del'>-</div><div class='del'>-2002-02-22  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add libglade the to the E_UTIL flags.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal.</div><div class='del'>-</div><div class='del'>-2002-02-12  Tõivo Leedjärv  &lt;leedjarv@interest.ee&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added et to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2002-02-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: make sure PISOCK cflags are added where</div><div class='del'>-	appropriate</div><div class='del'>-</div><div class='del'>-2002-02-08  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): added sounds.</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): added sounds/Makefile.</div><div class='del'>-</div><div class='del'>-	* sounds/Makefile.am: new file.</div><div class='del'>-	* sounds/default_alarm.wav: default alarm sound, currently only used</div><div class='del'>-	when vCalendar files are imported with audio alarms. We need a better</div><div class='del'>-	sound.</div><div class='del'>-</div><div class='del'>-2002-02-07  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal.</div><div class='del'>-</div><div class='del'>-2002-01-28  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added bonobo to filter flags to avoid compile</div><div class='del'>-	error</div><div class='del'>-</div><div class='del'>-2002-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am: Use GNOME_FULL_LIBS and GNOME_FULL_CFLAGS.</div><div class='del'>-</div><div class='del'>-	* configure.in: Define the CAMEL_{CFLAGS,LIBS} using</div><div class='del'>-	EVO_SET_COMPILE_FLAGS.  Likewise define E_UTIL_{CFLAGS,LIBS},</div><div class='del'>-	E_NAME_{CFLAGS,LIBS}, SHELL_{CFLAGS,LIBS},</div><div class='del'>-	IMPORTERS_{CFLAGS,LIBS}, WOMBAT_{CFLAGS,LIBS} and</div><div class='del'>-	E_WIDGETS_{CFLAGS,LIBS}, LIBFILTER_{CFLAGS,LIBS}.  Remove</div><div class='del'>-	GAL_{LIBS,CFLAGS}.  Add GNOME_FULL_{CFLAGS,LIBS}.  Also, move all</div><div class='del'>-	this stuff after OpenSSL check so they benefit from all the</div><div class='del'>-	cflags/ldflags discoveries for the support libraries.</div><div class='del'>-</div><div class='del'>-2002-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>- </div><div class='del'>-	* configure.in: Require gal 0.19.99.1.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS.  Define</div><div class='del'>-	EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,</div><div class='del'>-	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,</div><div class='del'>-	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,</div><div class='del'>-	EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,</div><div class='del'>-	EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,</div><div class='del'>-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it.  Remove SOUP_CFLAGS</div><div class='del'>-	and SOUP_LIBS.</div><div class='del'>-</div><div class='del'>-2002-01-15  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and </div><div class='del'>-	SOUP_LIBS</div><div class='del'>-</div><div class='del'>-	* README: Update to include the SOUP dependancy.</div><div class='del'>-</div><div class='del'>-2002-01-04  Pablo Saratxaga  &lt;pablo@mandrakesoft.com&gt;</div><div class='del'>-</div><div class='del'>-        * configure.in: Added "eu" to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2001-12-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (camel_providerdir): Define this here, using only</div><div class='del'>-	EVOLUTION_MAJOR_VERSION and EVOLUTION_MINOR_VERSION (and not MICRO</div><div class='del'>-	and NANO).</div><div class='del'>-</div><div class='del'>-2001-12-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for alloca.h.</div><div class='del'>-</div><div class='del'>-2001-12-12  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix #16358, No man page for Evolution.]</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am (man_MANS): Install the man page.</div><div class='del'>-</div><div class='del'>-	* data/evolution.1: New man page for Evolution.</div><div class='del'>-</div><div class='del'>-2001-12-10  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>-	* configure.in: use UTF-8 as the char set when testing pilot link</div><div class='del'>- </div><div class='del'>-2001-12-11  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not</div><div class='del'>-	"Evolution".</div><div class='del'>-</div><div class='del'>-2001-12-11  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Up VERSION to 1.1.0.99.</div><div class='del'>-</div><div class='del'>-2001-12-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT</div><div class='del'>-</div><div class='del'>-2001-12-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a</div><div class='del'>-	string that will be appended to the X-Mailer header.</div><div class='del'>-</div><div class='del'>-2001-11-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>- </div><div class='del'>-	* README: Updated. Don't say that the user needs to copy their</div><div class='del'>-	mozilla database files into ~/evolution, since Evolution now</div><div class='del'>-	builds it's own default database files if they don't exist and</div><div class='del'>-	also remove instructions for building with OpenSSL.</div><div class='del'>- </div><div class='del'>-	* acconfig.h: Remove HAVE_OPENSSL define</div><div class='del'>- </div><div class='del'>-	* configure.in: Remove checks for OpenSSL libraries.</div><div class='del'>- </div><div class='del'>-2001-11-20  Wang Jian  &lt;lark@linux.net.cn&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked </div><div class='del'>-	against gettext 0.10.40 and 0.10.35 without any problem. </div><div class='del'>-	Please contact me if anyone wants to disable it (AGAIN).</div><div class='del'>-</div><div class='del'>-2001-11-19  Abel Cheung  &lt;maddog@linuxhall.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before</div><div class='del'>-	  somebody is willing to tell me why it is deleted without</div><div class='del'>-	  reason. It was checked against newest gettext (0.10.40) and</div><div class='del'>-	  older gettext (0.10.35) without any problem. A few</div><div class='del'>-	  translations are not removed from ALL_LINGUAS even though</div><div class='del'>-	  they failed in msgfmt checking.</div><div class='del'>-</div><div class='del'>-2001-11-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Updated.</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.</div><div class='del'>-</div><div class='del'>-2001-11-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Redone with the bug #s from Bugzilla.</div><div class='del'>-</div><div class='del'>-2001-11-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Calendar/tasks NEWS.</div><div class='del'>-</div><div class='del'>-2001-11-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: restore cflags and ldflags properly</div><div class='del'>-</div><div class='del'>-2001-11-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: save the ldflags properly</div><div class='del'>-</div><div class='del'>-2001-11-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check to make sure pilot-link has the charset</div><div class='del'>-	conversion stuff enabled</div><div class='del'>-</div><div class='del'>-2001-11-09  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Chop the output from `uname -s'.  Thanks to</div><div class='del'>-	Michael Gerdts for suggesting the fix.</div><div class='del'>-</div><div class='del'>-2001-11-09  Abel Cheung  &lt;maddog@linux.org.hk&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep</div><div class='del'>-	  complaining to me, and waste a month before discovering it was</div><div class='del'>-	  disabled while I know nothing about it. Please at least complain</div><div class='del'>-	  to me if it's gettext problem.</div><div class='del'>-</div><div class='del'>-2001-11-06  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Up to 0.99.1 for snapshot purposes.</div><div class='del'>-</div><div class='del'>-2001-11-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML</div><div class='del'>-	0.16 and GAL 0.18.</div><div class='del'>-</div><div class='del'>-2001-11-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Small update</div><div class='del'>-</div><div class='del'>-2001-11-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Updated.</div><div class='del'>-</div><div class='del'>-2001-10-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.desktop.in (Icon): evolution.png instead of</div><div class='del'>-	evolution-icon.png.</div><div class='del'>-</div><div class='del'>-2001-10-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Update version to 0.17.100.</div><div class='del'>-</div><div class='del'>-2001-10-31  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Conduits): update</div><div class='del'>-</div><div class='del'>-2001-10-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.</div><div class='del'>-</div><div class='del'>-2001-10-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): Updated mailer NEWS.</div><div class='del'>-</div><div class='del'>-2001-10-30    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): My mailer news.</div><div class='del'>-</div><div class='del'>-2001-10-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Calendar): Calendar NEWS.</div><div class='del'>-</div><div class='del'>-2001-10-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,</div><div class='del'>-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,</div><div class='del'>-	BONOBO_HTML_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GAL version 0.15.99.10.  I know you all</div><div class='del'>-	love this.</div><div class='del'>-</div><div class='del'>-2001-10-30  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: require gtkhtml version 0.15.99.2</div><div class='del'>-</div><div class='del'>-2001-10-29  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).</div><div class='del'>-</div><div class='del'>-2001-10-30  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.15.99.9.</div><div class='del'>-</div><div class='del'>-2001-10-30  &lt;notzed@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Move the configure version number check down</div><div class='del'>-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual</div><div class='del'>-	patch i have every bloody time the version changes.</div><div class='del'>-</div><div class='del'>-2001-10-29  Joe Shaw  &lt;joe@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.15.99.8</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-simple.c,</div><div class='del'>-	addressbook/gui/component/addressbook-storage.c,</div><div class='del'>-	addressbook/gui/widgets/e-addressbook-view.c,</div><div class='del'>-	calendar/gui/e-calendar-table.c,</div><div class='del'>-	calendar/gui/e-itip-control.c,</div><div class='del'>-	calendar/gui/e-meeting-model.c,</div><div class='del'>-	calendar/gui/itip-utils.c,</div><div class='del'>-	calendar/gui/print.c,</div><div class='del'>-	calendar/gui/alarm-notify/alarm-notify-dialog.c,</div><div class='del'>-	filter/rule-editor.c,</div><div class='del'>-	mail/mail-config.c,</div><div class='del'>-	mail/mail-folder-cache.c,</div><div class='del'>-	mail/mail-format.c,</div><div class='del'>-	mail/mail-local.c,</div><div class='del'>-	mail/mail-ops.c,</div><div class='del'>-	mail/mail-vfolder.c,</div><div class='del'>-	shell/e-local-storage.c,</div><div class='del'>-	shell/e-summary-storage.c: Change includes of</div><div class='del'>-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Added my addressbook changes.</div><div class='del'>-</div><div class='del'>-2001-10-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: Add Larry and Radek.</div><div class='del'>-</div><div class='del'>-2001-10-30  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: require gtkhtml version 0.15.99.1</div><div class='del'>-</div><div class='del'>-2001-10-29  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added calendar/importers/Makefile</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of gal to 0.15.99.7.</div><div class='del'>-</div><div class='del'>-2001-10-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am: no need to use destdir</div><div class='del'>-</div><div class='del'>-2001-10-27  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of gal to 0.15.99.6.</div><div class='del'>-</div><div class='del'>-2001-10-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Change the help string on "--enable-nntp" to</div><div class='del'>-	mention the fact that NNTP support is incomplete and unsupported.</div><div class='del'>-	If the user doesn't pass --enable-nntp, don't mention NNTP at all</div><div class='del'>-	in the summary at the end. Also, mention which SSL library is</div><div class='del'>-	being used when SSL support is enabled, and don't mention anything</div><div class='del'>-	about S/MIME since it doesn't work.</div><div class='del'>-</div><div class='del'>-2001-10-26  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: GAL 0.15.99.5.</div><div class='del'>-</div><div class='del'>-2001-10-26  Kevin Breit  &lt;mrproper@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: Updated my email address.</div><div class='del'>-</div><div class='del'>-2001-10-26    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump gal requirement.</div><div class='del'>-</div><div class='del'>-2001-10-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: and add a way to get some more spew about the</div><div class='del'>-	commands we're executing.</div><div class='del'>-</div><div class='del'>-2001-10-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: use eq instead of ==.</div><div class='del'>-</div><div class='del'>-2001-10-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's</div><div class='del'>-	"draw_button" argument can be used in</div><div class='del'>-	addressbook/gui/component/select-names/e-select-names.c.</div><div class='del'>-</div><div class='del'>-2001-10-22  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: bumped required GAL to 0.15.99.2.</div><div class='del'>-</div><div class='del'>-2001-10-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: HAVE_KDE_APPLNK.</div><div class='del'>-</div><div class='del'>-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the</div><div class='del'>-	case in which the kde applnk dir is found.  Also fix the logic</div><div class='del'>-	with the checking so it doesn't get fooled.</div><div class='del'>-</div><div class='del'>-2001-10-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am: include destdir in the path of the kde desktop</div><div class='del'>-	installation dir</div><div class='del'>-</div><div class='del'>-2001-10-20  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'</div><div class='del'>-	in the `KDE_APPLNK_DIR'.</div><div class='del'>-</div><div class='del'>-	* configure.in: New option `--with-kde-applnk-path'.  Define the</div><div class='del'>-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'</div><div class='del'>-	value.</div><div class='del'>-</div><div class='del'>-2001-10-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST</div><div class='del'>-	declarations together so they both happen.</div><div class='del'>-</div><div class='del'>-2001-10-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: use a new fangled perl script that queries oaf for</div><div class='del'>-	interfaces we want to kill.</div><div class='del'>-</div><div class='del'>-2001-10-18  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal to 0.15.99.1</div><div class='del'>-	for use in evolution-addressbook-export.</div><div class='del'>-</div><div class='del'>-	* tools/.cvsignore: Added evolution-addressbook-clean,</div><div class='del'>-	evolution-addressbook-export, evolution-addressbook-import, and</div><div class='del'>-	.libs.</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am: Added evolution-addressbook-clean,</div><div class='del'>-	evolution-addressbook-export, and evolution-addressbook-import.</div><div class='del'>-</div><div class='del'>-	* tools/evolution-addressbook-clean.in: Main script to clean up</div><div class='del'>-	the local contact database.</div><div class='del'>-</div><div class='del'>-	* tools/evolution-addressbook-export.c: Exports the local</div><div class='del'>-	addressbook to the specified file</div><div class='del'>-	(--output-file).  If no --output-file is given, writes out to a</div><div class='del'>-	unique file in the /tmp directory.  In either case, prints the</div><div class='del'>-	filename to stdout.</div><div class='del'>-</div><div class='del'>-	* tools/evolution-addressbook-import.c: Imports the specified file</div><div class='del'>-	(--input-file) to the local addressbook.</div><div class='del'>-</div><div class='del'>-2001-10-18  Wang Jian  &lt;lark@linux.net.cn&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.</div><div class='del'>-</div><div class='del'>-2001-10-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Wrote Addressbook news.</div><div class='del'>-</div><div class='del'>-2001-10-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: kill evolution-ldif-importer.</div><div class='del'>-</div><div class='del'>-2001-10-11  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.</div><div class='del'>-	These must be sorted as a preorder walk for a tree!</div><div class='del'>-</div><div class='del'>-2001-10-10  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.16.99.</div><div class='del'>-</div><div class='del'>-2001-10-10  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14</div><div class='del'>-	or later.  Also, make $with_nspr_includes default to</div><div class='del'>-	`/usr/include/nspr' instead of `/usr/include/mozilla' and</div><div class='del'>-	$with_nss_includes to `/usr/include/moznss' instead of</div><div class='del'>-	`/usr/include/mozilla'.</div><div class='del'>-</div><div class='del'>-2001-10-10  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Added info about the shell, plus some minor fixes for</div><div class='del'>-	consistency.</div><div class='del'>-</div><div class='del'>-2001-10-10  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Updated.</div><div class='del'>-</div><div class='del'>-2001-10-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Calendar): Calendar NEWS.</div><div class='del'>-</div><div class='del'>-2001-10-09    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): Updated for beta 6.</div><div class='del'>-</div><div class='del'>-2001-10-09  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add libart to list of libraries to use in</div><div class='del'>-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions</div><div class='del'>-</div><div class='del'>-2001-10-09  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before</div><div class='del'>-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix</div><div class='del'>-	pointed out by Dmitry G. Mastrukov &lt;dmitry@fitmark.net&gt;.</div><div class='del'>-</div><div class='del'>-2001-10-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove movemail check, since it's not relevant any</div><div class='del'>-	more.</div><div class='del'>-</div><div class='del'>-2001-10-05  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1</div><div class='del'>-</div><div class='del'>-2001-10-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of gal to 0.13.99.1.</div><div class='del'>-</div><div class='del'>-2001-10-01  Aaron Weber &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* help/C/Makefile.am: removed an extraneous tab.</div><div class='del'>-	</div><div class='del'>-2001-10-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.15.99.</div><div class='del'>-</div><div class='del'>-2001-10-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.</div><div class='del'>-</div><div class='del'>-2001-10-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Added more news.</div><div class='del'>-</div><div class='del'>-2001-09-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (nspr_libs): Order the linkline to be the same as</div><div class='del'>-	the order in Mozilla (it is suggested that they be in this order).</div><div class='del'>-	(nss_libs): Same.</div><div class='del'>-</div><div class='del'>-2001-09-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove references to the "compose" program, since</div><div class='del'>-	that functionality went into the shell.</div><div class='del'>-	(AC_OUTPUT): Sort and remove duplicates.</div><div class='del'>-</div><div class='del'>-	* cmdline/*: gone</div><div class='del'>-</div><div class='del'>-2001-09-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is</div><div class='del'>-	not recommended for end-users. It is mostly meant for testing</div><div class='del'>-	purposes.</div><div class='del'>-</div><div class='del'>-2001-09-26  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: make sure the solaris network libs get added to</div><div class='del'>-	the LDAP link line before we test for openldap.  Thanks to Frank</div><div class='del'>-	Belew for finding this.</div><div class='del'>-</div><div class='del'>-2001-09-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal to 0.12.99.0.</div><div class='del'>-</div><div class='del'>-2001-09-21  Nat Friedman  &lt;nat@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.</div><div class='del'>-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.</div><div class='del'>-</div><div class='del'>-2001-09-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump version to 0.14.  Depend on gal &gt;= 0.12,</div><div class='del'>-	gtkhtml &gt;= 0.13.</div><div class='del'>-</div><div class='del'>-2001-09-21  Michael Zucchi  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mail): Updated.</div><div class='del'>-</div><div class='del'>-2001-09-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Added more NEWS items here.</div><div class='del'>-</div><div class='del'>-2001-09-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove dead directory from AC_OUTPUT</div><div class='del'>-</div><div class='del'>-2001-09-16  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated required version of gal to 0.11.99.4.</div><div class='del'>-</div><div class='del'>-2001-09-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: remove unneeded conditionals</div><div class='del'>-</div><div class='del'>-2001-09-13  Yanko Kaneti  &lt;yaneti@declera.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2001-09-13  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf</div><div class='del'>-	as text/x-vcard.</div><div class='del'>-</div><div class='del'>-2001-09-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: temporarily disable zh_TW</div><div class='del'>-</div><div class='del'>-2001-09-10  Abel Cheung  &lt;maddog@linux.org.hk&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added "zh_TW" to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2001-09-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: one-line OpenSSL fix from Yanko Kaneti</div><div class='del'>-	&lt;yaneti@declera.com&gt;</div><div class='del'>-</div><div class='del'>-2001-09-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Updated slightly.</div><div class='del'>-</div><div class='del'>-2001-09-04  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fixes by Neil Conway &lt;neilconway@home.com, as per #8090.]</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix the error message if scrollkeeper is not found.</div><div class='del'>-</div><div class='del'>-	* README: A bunch of minor fixes, tweaks and cleanups.</div><div class='del'>-</div><div class='del'>-2001-09-04  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix #8089, Undocumented Scrollkeeper dependency.]</div><div class='del'>-</div><div class='del'>-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.</div><div class='del'>-</div><div class='del'>-2001-09-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Only check for OpenSSL if we were not able to find</div><div class='del'>-	Mozilla's NSS libraries.</div><div class='del'>-</div><div class='del'>-2001-09-04  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* omf-install/Makefile.am (install-data-local): Don't put</div><div class='del'>-	$(srcdir) in the file path twice.</div><div class='del'>-</div><div class='del'>-2001-09-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped the required version of gal to 0.11.99.2.</div><div class='del'>-</div><div class='del'>-2001-08-31  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of GAL to 0.11.3</div><div class='del'>-	(for g_utf8_collate)</div><div class='del'>-</div><div class='del'>-2001-08-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Patch from Nike Gerdts &lt;michael.gerdts@usa.alcatel.com&gt; for</div><div class='del'>-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and</div><div class='del'>-	LDFLAGS.]</div><div class='del'>-</div><div class='del'>-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS</div><div class='del'>-	instead of after them; likewise, put DB3_LDADD before the already</div><div class='del'>-	defined LDADD.</div><div class='del'>-</div><div class='del'>-2001-08-24  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: We don't need to check for both bonobo-conf 0.11</div><div class='del'>-	AND bonobo-conf 0.2.</div><div class='del'>-</div><div class='del'>-2001-08-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.13.99.</div><div class='del'>-</div><div class='del'>-2001-08-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,</div><div class='del'>-	GtkHTML 0.12.  Don't autogen</div><div class='del'>-	`doc/devel/executive-summary/Makefile'.  Bump version number to</div><div class='del'>-	0.13.</div><div class='del'>-</div><div class='del'>-2001-08-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Global): Added.</div><div class='del'>-</div><div class='del'>-2001-08-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Updated NEWS for addressbook.</div><div class='del'>-</div><div class='del'>-2001-08-21  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mail): Updated some more.</div><div class='del'>-</div><div class='del'>-2001-08-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Updated.</div><div class='del'>-</div><div class='del'>-2001-08-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.10.99.5.</div><div class='del'>-</div><div class='del'>-2001-08-19  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	*Makefile.am: added "help" to subdirs.</div><div class='del'>-	</div><div class='del'>-2001-08-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use</div><div class='del'>-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on</div><div class='del'>-	evolution's local state dir.  this should fix the core dumps</div><div class='del'>-	during install on freebsd and solaris.</div><div class='del'>-</div><div class='del'>-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,</div><div class='del'>-	otherwise default to glib-config.  a cheap solution to get this</div><div class='del'>-	working on freebsd (where they have glib12-config, but not</div><div class='del'>-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.</div><div class='del'>-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure</div><div class='del'>-	this out, and AC_SUBST so omf-install/Makefile.am can use it.</div><div class='del'>-</div><div class='del'>-2001-08-17  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Move the libical compile order.</div><div class='del'>-</div><div class='del'>-2001-08-16  "Big Iain" Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add widgets/e-timezone-dialog/Makefile</div><div class='del'>-</div><div class='del'>-2001-08-16  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: I know what you did last summer!</div><div class='del'>-</div><div class='del'>-2001-08-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.10.99.3.</div><div class='del'>-</div><div class='del'>-2001-08-16  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* README: Some info on adding --localstatedir to the configure</div><div class='del'>-	options.</div><div class='del'>-	* Makefile.am: Added omf-install to the build.</div><div class='del'>-	* configure.in: Adjust for the move of the user docs.</div><div class='del'>-	</div><div class='del'>-2001-08-15  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Addded missing dirs to the build. Add checks for</div><div class='del'>-	scrollkeeper and jw to get the docs building on later Red Hat's.</div><div class='del'>-	* omf-install/*: Added this for integration with scrollkeeper.</div><div class='del'>-	</div><div class='del'>-2001-08-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by</div><div class='del'>-	Miles</div><div class='del'>-</div><div class='del'>-2001-08-11  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* README: Be truthful about the versions of libs we need.</div><div class='del'>-	</div><div class='del'>-2001-08-10  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: if libldap.la is there, default to static linking</div><div class='del'>-	of openldap.  if it's not, default to dynamic.  also, provide</div><div class='del'>-	--with-static-ldap for users that want to override these defaults.</div><div class='del'>-</div><div class='del'>-2001-08-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: link statically with OpenLDAP.</div><div class='del'>-</div><div class='del'>-2001-08-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GAL 0.10.99.2.</div><div class='del'>-</div><div class='del'>-2001-08-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Added #!/bin/sh</div><div class='del'>-</div><div class='del'>-2001-08-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Don't link to libnssckbi3 when linking to nss.</div><div class='del'>-</div><div class='del'>-2001-08-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update pilot information</div><div class='del'>-</div><div class='del'>-2001-08-07  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.10.99.1 or greater.</div><div class='del'>-</div><div class='del'>-2001-08-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fixes #5594, "killev doesn't kill all evolution processes".]</div><div class='del'>-</div><div class='del'>-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor</div><div class='del'>-	and gnome-spell-component.</div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump version number to 0.12.99.</div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Ooops.  We want GAL &gt;= 0.10.0 and GtkHTML &gt;=</div><div class='del'>-	0.11.0.</div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.</div><div class='del'>-	(EVO_CHECK_LIB): </div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump version number to 0.12.0.</div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Added info about the shell changes and slightly changed</div><div class='del'>-	the formatting for the addressbook ones.</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.</div><div class='del'>-</div><div class='del'>-2001-07-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Updated NEWS for addressbook.</div><div class='del'>-</div><div class='del'>-2001-07-31  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: bump required version of gtkhtml to 0.10.99.</div><div class='del'>-</div><div class='del'>-2001-07-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump to 0.11.99</div><div class='del'>-</div><div class='del'>-2001-07-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB</div><div class='del'>-</div><div class='del'>-2001-07-16  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Changed to use test -h instead of -L for checking</div><div class='del'>-	/var/mail vs /var/spool/mail</div><div class='del'>-</div><div class='del'>-2001-07-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: more updates</div><div class='del'>-</div><div class='del'>-2001-07-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mail): Merged mine and Peter's entries.</div><div class='del'>-</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Start new entry</div><div class='del'>-</div><div class='del'>-2001-07-11  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.</div><div class='del'>-</div><div class='del'>-2001-07-10  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (have_nss_includes): Fix nss include check to work.</div><div class='del'>-</div><div class='del'>-2001-07-11  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added option --with-broken-spool for solaris mbox</div><div class='del'>-	spool format.</div><div class='del'>-</div><div class='del'>-2001-07-10  Marius Andreiana  &lt;mandreiana@yahoo.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added ro (Romanian) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2001-07-05  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail</div><div class='del'>-	isn't a symbolic link such as on Red Hat 7.</div><div class='del'>-</div><div class='del'>-2001-07-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Upped the required version of gal.</div><div class='del'>-</div><div class='del'>-2001-07-03  Dietmar Maurer  &lt;dietmar@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* *: use bonobo-conf everywhere</div><div class='del'>-	</div><div class='del'>-2001-07-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (MAILER_LIBS):</div><div class='del'>-	(MAILER_CFLAGS): added bonobo_conf.</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Made evolution depend on bonobo-conf 0.2.</div><div class='del'>-</div><div class='del'>-2001-07-02  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gtkhtml 0.9.99.1. </div><div class='del'>-</div><div class='del'>-2001-07-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for libGal 0.8.99.7.</div><div class='del'>-</div><div class='del'>-2001-07-02  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED</div><div class='del'>-	to make these not totally useless.</div><div class='del'>-</div><div class='del'>-2001-07-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,</div><div class='del'>-	as it needs some CORBA stuff from the latter.</div><div class='del'>-</div><div class='del'>-2001-06-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Added evolution-alarm-notify.</div><div class='del'>-</div><div class='del'>-2001-06-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GAL 0.8.99.6.</div><div class='del'>-</div><div class='del'>-2001-06-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the</div><div class='del'>-	`AC_OUTPUT()' list.</div><div class='del'>-</div><div class='del'>-2001-06-27  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (gal): Bump required gal version for new accessors</div><div class='del'>-	in ETree.</div><div class='del'>-</div><div class='del'>-2001-06-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add addressbook/gui/contact-list-editor, and</div><div class='del'>-	correct path of contact-editor.</div><div class='del'>-</div><div class='del'>-2001-06-21  Rodrigo Moya &lt;rodrigo@gnome-db.org&gt;</div><div class='del'>-</div><div class='del'>-	* libwombat/: added new directory for the libwombat library, which</div><div class='del'>-	will contain the implementation of all CORBA interfaces defined</div><div class='del'>-	in the wombat.idl file</div><div class='del'>-</div><div class='del'>-2001-06-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix the OpenLDAP check to default to "no" if you</div><div class='del'>-	don't specify anything.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* docs/C/usage-sync: Reworded a little bit for more descrip.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/usage-calendar.sgml: Documented categorizing an event.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/usage-mail.sgml: Updated Bcc: example</div><div class='del'>-</div><div class='del'>-2001-06-20  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Change --enable-ldap to --with-openldap, allow a</div><div class='del'>-	path prefix as an argument. Add some libtooly goodness to the</div><div class='del'>-	libldap check in case it depends on ssl libraries.</div><div class='del'>-</div><div class='del'>-2001-06-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Tweak the db3 header check to like our RH7 build</div><div class='del'>-	machine again.</div><div class='del'>-</div><div class='del'>-2001-06-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vcc.y (LexBuf): Changed buf to an int here.</div><div class='del'>-	(lexGetQuotedPrintable): Changed cur to an int here.</div><div class='del'>-</div><div class='del'>-2001-06-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add "--with-db3" to fill in both</div><div class='del'>-	--with-db3-includes and --with-db3-libs. Make them get cached</div><div class='del'>-	properly so you don't need to specify it every time. Simplify some</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add #defines for the current supported db3 version</div><div class='del'>-	so that when we change it we don't have to hunt all of them down</div><div class='del'>-</div><div class='del'>-2001-06-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check the modes on $system_mail_dir and set up</div><div class='del'>-	variables for camel/Makefile to make camel-lock-helper</div><div class='del'>-	setuid/setgid.</div><div class='del'>-</div><div class='del'>-2001-06-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: One slight db3 check correction</div><div class='del'>-</div><div class='del'>-2001-06-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: fix typo in -ldb3 check.</div><div class='del'>-</div><div class='del'>-2001-06-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Update db3 configure checks for RedHat. /me beats</div><div class='del'>-	a sleeping cat to death</div><div class='del'>-</div><div class='del'>-2001-06-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required version of gal to 0.8.99.2.</div><div class='del'>-</div><div class='del'>-2001-06-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/gui/merging/Makefile.</div><div class='del'>-</div><div class='del'>-2001-06-08  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.</div><div class='del'>-</div><div class='del'>-2001-06-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Byebye executive-summary, hello my-evolution</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove all the executive-summary Makefiles. Add the</div><div class='del'>-	my-evolution.</div><div class='del'>-</div><div class='del'>-2001-06-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: Vanity, thy name is trow.</div><div class='del'>-</div><div class='del'>-2001-06-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* config.log: Bump version to 0.10.99</div><div class='del'>-</div><div class='del'>-2001-05-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Included information about db3.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added various checks for db3 libraries and</div><div class='del'>-	includes.  Of note are the new configure options</div><div class='del'>-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify</div><div class='del'>-	the location for your db3 library.</div><div class='del'>-</div><div class='del'>-2001-05-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.</div><div class='del'>-</div><div class='del'>-2001-05-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump gal dependency to 0.8.99.1</div><div class='del'>-</div><div class='del'>-2001-05-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: update version requirements</div><div class='del'>-</div><div class='del'>-2001-05-23  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Remove reference to verify-evolution-install.sh since it</div><div class='del'>-	doesn't work any more.</div><div class='del'>-</div><div class='del'>-	* configure.in (EVO_CHECK_LIB): allow this to take a max version</div><div class='del'>-	too, mostly so we can bound the allowable gal versions for</div><div class='del'>-	releases, but also to require libxml &lt; 2.0.</div><div class='del'>-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).</div><div class='del'>-</div><div class='del'>-2001-05-23  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer</div><div class='del'>-	</div><div class='del'>-2001-05-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we</div><div class='del'>-	don't have the same libs multiple times in the libtool</div><div class='del'>-	command-line.</div><div class='del'>-</div><div class='del'>-2001-05-20  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev (sysname): Add in evolution-vcard-importer as part</div><div class='del'>-	of the list of processes to kill in killev.</div><div class='del'>-</div><div class='del'>-2001-05-18  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook</div><div class='del'>-	gets built before mail.</div><div class='del'>-</div><div class='del'>-2001-05-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we</div><div class='del'>-	don't have to link in all sorts of unnecessary garbage from GNOME</div><div class='del'>-	that we don't need.</div><div class='del'>-</div><div class='del'>-2001-05-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: add the importers.</div><div class='del'>-</div><div class='del'>-2001-05-14  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/evolution-C.omf: added file for Scrollkeeper</div><div class='del'>-</div><div class='del'>-2001-05-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add the nspr includes to the list of includes used</div><div class='del'>-	to test for NSS headers, and don't assume -lpthread in the</div><div class='del'>-	nss/nspr libs - use PTHREAD_LIB.</div><div class='del'>-</div><div class='del'>-2001-05-09  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Added rdf-summary killing stuff from R Burton</div><div class='del'>-	(r.burton@180sw.com)</div><div class='del'>-</div><div class='del'>-2001-05-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt</div><div class='del'>-</div><div class='del'>-2001-05-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add the importers subdir.</div><div class='del'>-</div><div class='del'>-	* configure.in: Make the importers/Makefile</div><div class='del'>-</div><div class='del'>-2001-05-08  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped check for gal to 0.7.99.3.</div><div class='del'>-</div><div class='del'>-2001-05-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for OpenSSL.</div><div class='del'>-</div><div class='del'>-2001-05-05  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: upped required gtkhtml version to 0.9.3, even that is</div><div class='del'>-	not enough for idl changes.</div><div class='del'>-	* README: you need LIB_XML_1_BRANCH. updated all version requirements</div><div class='del'>-	from configure.in</div><div class='del'>-</div><div class='del'>-2001-04-26  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Don't autogen</div><div class='del'>-	`executive-summary/widgets/Makefile', as that subdir doesn't get</div><div class='del'>-	distributed anymore.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: We no longer depend on libunicode.</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove check for libunicode. Remove unicode cflags</div><div class='del'>-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for</div><div class='del'>-	things that need to depend on just gal (for gunicode).</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r</div><div class='del'>-	will DTRT.</div><div class='del'>-	</div><div class='del'>-2001-04-24  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump up the gal requirement</div><div class='del'>-</div><div class='del'>-2001-04-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Don't autogen the the Makefile for the importer</div><div class='del'>-	docs.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Build the docs last.</div><div class='del'>-</div><div class='del'>-2001-04-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (have_nspr_libs): We need to link in more than just</div><div class='del'>-	libnspr4, we also need libpthread.</div><div class='del'>-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.</div><div class='del'>-</div><div class='del'>-2001-04-21  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Added in composer-message.png.</div><div class='del'>-</div><div class='del'>-2001-04-16  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: `mail/importers/Makefile' must come after</div><div class='del'>-	`mail/Makefile'.</div><div class='del'>-</div><div class='del'>-2001-04-16  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Add `doc'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.</div><div class='del'>-</div><div class='del'>-2001-04-12  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the required version of gal to 0.6.99.0.</div><div class='del'>-</div><div class='del'>-2001-04-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check if gethostbyname_r take five params</div><div class='del'>-</div><div class='del'>-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS </div><div class='del'>-</div><div class='del'>-2001-04-10  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: /me is a translator.</div><div class='del'>-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &amp;&amp;</div><div class='del'>-	exit 1.</div><div class='del'>-</div><div class='del'>-2001-04-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): create the makefile in</div><div class='del'>-	camel/tests/smime</div><div class='del'>-</div><div class='del'>-2001-04-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev (sysname): add some more 16 character versions for</div><div class='del'>-	freebsd.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: Brag.</div><div class='del'>-	</div><div class='del'>-2001-04-04  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,</div><div class='del'>-	removed the latter.</div><div class='del'>-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for</div><div class='del'>-	trash folder, one converted from deleted_message.xpm, another from mc.</div><div class='del'>-	* art/Makefile.am: install.</div><div class='del'>-</div><div class='del'>-2001-04-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README (SSL): Remind users that they will currently have to copy</div><div class='del'>-	their cert database from their mozilla directory into ~/evolution.</div><div class='del'>-</div><div class='del'>-2001-04-01  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: added missing (new) files.</div><div class='del'>-</div><div class='del'>-2001-03-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We</div><div class='del'>-	forgot to do this before branching *again*...)</div><div class='del'>-</div><div class='del'>-2001-03-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: add a bit mentioning that if configure claims you don't</div><div class='del'>-	have something installed when you think you do, that it's probably</div><div class='del'>-	because you installed it in the wrong prefix, or because you need</div><div class='del'>-	a -devel package.</div><div class='del'>-</div><div class='del'>-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a</div><div class='del'>-	gnome-config-based library of a given version or later, correctly,</div><div class='del'>-	and if doesn't find it, suggests that you consult the README. Fix</div><div class='del'>-	the various library checks to use this. Meanwhile, remove a bunch</div><div class='del'>-	of old cruft and reorganize a little.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Remove cruft</div><div class='del'>-</div><div class='del'>-2001-03-28  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: In a burst of egomania, added myself.</div><div class='del'>-</div><div class='del'>-2001-03-26  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: create camel/misc/Makefile</div><div class='del'>-</div><div class='del'>-2001-03-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update xml-i18n-tools version</div><div class='del'>-</div><div class='del'>-2001-03-22  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/new-message.xpm: file-&gt;new-&gt;mail message</div><div class='del'>-	* art/folder.xpm: file-&gt;new-&gt;folder</div><div class='del'>-	* art/new_appointment.xpm: file-&gt;new-&gt;appontment</div><div class='del'>-	* art/print-preview.xpm: file-&gt;print preview</div><div class='del'>-	* art/configure_16_calendar.xpm: for the tools menu</div><div class='del'>-</div><div class='del'>-2001-03-22  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: move it a bit up so the icons fit better</div><div class='del'>-</div><div class='del'>-2001-03-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped gal requirement to 0.5.99.11.</div><div class='del'>-</div><div class='del'>-2001-03-22  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/configure_16_folder.xpm, configure_16_mail.xpm,</div><div class='del'>-	copy_16_message.xpm, edit.xpm, encrypt.xpm,</div><div class='del'>-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,</div><div class='del'>-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,</div><div class='del'>-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,</div><div class='del'>-	send-receive.xpm, work_offline.xpm, find_contact.xpm,</div><div class='del'>-	send-24-receive.png, evo-48-calendar-conduit.png,</div><div class='del'>-	evo-48-todo-conduit.png, import.png, send-48-receive.png,</div><div class='del'>-	move_message.xpm, all_contacts.xpm, forward.xpm,</div><div class='del'>-	configure_16_addressbook.xpm, Makefile.am,</div><div class='del'>-	evo-48-address-conduit.png: renamed icons to make Miguel's</div><div class='del'>-	speedups possible</div><div class='del'>-	* art/evolution-inbox.png: color coded one</div><div class='del'>-	* art/envelope.png: reverted back to the non-color coded one</div><div class='del'>-	* art/evolution-contacts-plain.png: non-color coded one for</div><div class='del'>-	the "new contact" dialogue</div><div class='del'>-	</div><div class='del'>-2001-03-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require bison, not yacc (for vcc.y)</div><div class='del'>-</div><div class='del'>-2001-03-20  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Added all the new icons to the</div><div class='del'>-	distribution.</div><div class='del'>-</div><div class='del'>-2001-03-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: More fixes for NSPR and NSS checks - use fixed it</div><div class='del'>-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it</div><div class='del'>-	not default the nspr lib path to /usr/lib/mozilla which may not be</div><div class='del'>-	in the user's library path when checking for nspr libs.</div><div class='del'>-</div><div class='del'>-2001-03-20  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/48_send-receive.png: send-receive for the s/r dialog</div><div class='del'>-	* art/24_send-receive.png: send-receive to replace the</div><div class='del'>-	fetch-mail-doggie</div><div class='del'>-	* art/16_send-receive.xpm: send-receive for (future) menu</div><div class='del'>-	item</div><div class='del'>-	* art/16_import.xpm: for the file menu</div><div class='del'>-	* art/16_work_offline.xpm: for the file menu</div><div class='del'>-	* AUTHORS: so I can show off</div><div class='del'>-	* art/splash.png: making radek famous ;)</div><div class='del'>-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, </div><div class='del'>-	evolution-tasks.png, evolution-today.png: </div><div class='del'>-	 new concept of color coded apps:</div><div class='del'>-	    - mailer: 		#efb43e</div><div class='del'>-	    - calendar:		#bab5ab</div><div class='del'>-	    - contacts: 	#9794ab</div><div class='del'>-	    - tasks:		#6e9e6e</div><div class='del'>-	    - exec. summary:	#c4757e</div><div class='del'>-	</div><div class='del'>-2001-03-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix ettore's fix ;-)</div><div class='del'>-</div><div class='del'>-2001-03-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped gal requirement to 0.5.99.8.</div><div class='del'>-</div><div class='del'>-2001-03-19  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make sure we never define `NSPR_CFLAGS' or</div><div class='del'>-	`NSS_CFLAGS' as just "-I".</div><div class='del'>-</div><div class='del'>-2001-03-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: pulled from the 0.9 release.</div><div class='del'>-</div><div class='del'>-2001-03-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the checks for NSS and NSPR</div><div class='del'>-</div><div class='del'>-2001-03-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Added directions on how to build with SSL support.</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the checks for NSS and NSPR</div><div class='del'>-</div><div class='del'>-2001-03-16  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/48_import.png: for the import druid</div><div class='del'>-</div><div class='del'>-2001-03-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump gal requirement to 0.5.99.7</div><div class='del'>-</div><div class='del'>-2001-03-15  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: create doc/devel/executive-summary/Makefile</div><div class='del'>-	* evolution.png: moved to art/.</div><div class='del'>-	* evolution.desktop: moved to data/.</div><div class='del'>-	* Makefile.am: reflect those moves.</div><div class='del'>-	* art/*.xpm: moved 8 files from calendar/gui here.</div><div class='del'>-	* art/Makefile.am: added moved files.</div><div class='del'>-	distribute *.xpm, install *.png and *view.xpm.</div><div class='del'>-</div><div class='del'>-2001-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.</div><div class='del'>-</div><div class='del'>-2001-03-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Pull up some of the clarifications from the 0.9 branch</div><div class='del'>-</div><div class='del'>-2001-03-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add -lresolv to LDAP_LIBS if it's there.</div><div class='del'>-</div><div class='del'>-2001-03-13  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added the mail/importers dir.</div><div class='del'>-</div><div class='del'>-2001-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Rearranged some of the dependencies to try to get them</div><div class='del'>-	into a more correct order (needed for people building all of these</div><div class='del'>-	packages by hand).</div><div class='del'>-</div><div class='del'>-2001-03-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update</div><div class='del'>-</div><div class='del'>-2001-03-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be</div><div class='del'>-	clever to be calling this 0.9 rather than 0.8, since it's almost</div><div class='del'>-	0.10.</div><div class='del'>-</div><div class='del'>-2001-03-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vcc.y: Changed int to char when returning a character</div><div class='del'>-	from a stream (since it needs to be able to hold EOF.)</div><div class='del'>-</div><div class='del'>-2001-03-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Removed --enable-assbarn-security and replaced it</div><div class='del'>-	with the real options:</div><div class='del'>-	--with-nspr-includes=PREFIX</div><div class='del'>-	--with-nspr-libs=PREFIX</div><div class='del'>-	--with-nss=PREFIX</div><div class='del'>-</div><div class='del'>-	* acconfig.h: #undef HAVE_NSS</div><div class='del'>-</div><div class='del'>-2001-03-07  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require GAL 0.5.99.6 or later.</div><div class='del'>-</div><div class='del'>-2001-03-07  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* shell/main: /* xgettext:no-c-format */ before the welcome</div><div class='del'>-	message.</div><div class='del'>-	* configure.in: Don't try to generate a Makefile in</div><div class='del'>-	camel/providers/vee as it's empty.</div><div class='del'>-	</div><div class='del'>-2001-03-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update pilot instructions</div><div class='del'>-</div><div class='del'>-2001-03-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gal 0.5.99.4.</div><div class='del'>-</div><div class='del'>-2001-03-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Reorganize a bit to get rid of warnings about</div><div class='del'>-	AC_TRY_COMPILE being used before AC_ISC_POSIX</div><div class='del'>-</div><div class='del'>-2001-03-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added views/addressbook/Makefile.</div><div class='del'>-</div><div class='del'>-2001-03-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: install conduit icons</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add logic to make sure we're building against OpenLDAP &gt;= 2</div><div class='del'>-</div><div class='del'>-2001-03-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.</div><div class='del'>-</div><div class='del'>-2001-03-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Redo the Kerberos stuff again to deal with the</div><div class='del'>-	stuff currently on my machine. I think it should deal with both</div><div class='del'>-	the MIT and KTH versions of both krb4 and krb5 now.</div><div class='del'>-</div><div class='del'>-2001-03-01  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/48_evo-address-conduit.png: 48^2 version of the</div><div class='del'>-	addressbook pilot conduit. (for the new control center)</div><div class='del'>-	* art/16_evo-address-conduit.png: 16x16 version for current</div><div class='del'>-	gnomecc</div><div class='del'>-	* art/48_evo-todo-conduit.png: for new gnomecc</div><div class='del'>-	* art/16_evo-todo-conduit.png: for old gnomecc</div><div class='del'>-	* art/48_evo-calendar-conduit.png: for new gnomecc</div><div class='del'>-	* art/16_evo-calendar-conduit.png: for old gnomecc</div><div class='del'>-</div><div class='del'>-2001-03-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gal 0.5.99.2.</div><div class='del'>-</div><div class='del'>-2001-02-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gal 0.5.99.1.</div><div class='del'>-</div><div class='del'>-2001-02-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gal 0.5.99.0.</div><div class='del'>-</div><div class='del'>-2001-02-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* various .cvsignore files: Ignore generated .oaf files</div><div class='del'>-</div><div class='del'>-2001-02-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: install new files</div><div class='del'>-</div><div class='del'>-	* art/*view.xpm: add files from calendar/gui</div><div class='del'>-</div><div class='del'>-2001-02-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: rework ldap check logic so it'll work to</div><div class='del'>-	--disable-ldap if you've previously configured with --enable-ldap.</div><div class='del'>-</div><div class='del'>-2001-02-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt; </div><div class='del'>-</div><div class='del'>-	* data/evolution.keys, evolution.desktop: removed, they are generated.</div><div class='del'>-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.</div><div class='del'>-	* data/evolution.desktop: removed, it duplicates above. </div><div class='del'>-	* Makefile.am, data/Makefile.am: reflect above changes, merge </div><div class='del'>-	translations. </div><div class='del'>-</div><div class='del'>-2001-02-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added hacks to check for Mozilla libs like nspr</div><div class='del'>-	and nss that we will need for SSL and S/MIME.</div><div class='del'>-</div><div class='del'>-2001-02-09  Michael Meeks  &lt;michael@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: depend on bonobo &gt;= 0.36</div><div class='del'>-</div><div class='del'>-2001-02-08  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Upped the version number of gal required to 0.5.</div><div class='del'>-</div><div class='del'>-2001-02-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update to latest requirements</div><div class='del'>-</div><div class='del'>-2001-02-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Added xml-* files.</div><div class='del'>-</div><div class='del'>-2001-02-05  Gustavo Maciel Dias Vieira  &lt;gdvieira@zaz.com.br&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2001-02-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require version 0.4.99.8 of gal.</div><div class='del'>-</div><div class='del'>-2001-02-03  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.</div><div class='del'>-</div><div class='del'>-2001-02-01  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: allow --enable/disable-ldap.</div><div class='del'>-</div><div class='del'>-2001-02-01  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Fix this script to make it work with Solaris.</div><div class='del'>-	Patch from Louise Miller.</div><div class='del'>-</div><div class='del'>-2001-01-29  Eskil Heyn Olsen  &lt;eskil@eazel.com&gt;</div><div class='del'>-</div><div class='del'>-	reviewed by: JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h:</div><div class='del'>-	Added the ENABLE_NNTP define</div><div class='del'>-	</div><div class='del'>-	* configure.in:</div><div class='del'>-	Fixed the NNTP m4 section.</div><div class='del'>-</div><div class='del'>-2001-01-29  Stanislav Visnovsky  &lt;visnovsky@nenya.ms.mff.cuni.cz&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added sk to ALL_LINGUAS.</div><div class='del'>-	* evolution.desktop: added Slovak messages.</div><div class='del'>-</div><div class='del'>-2001-01-27  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): remove</div><div class='del'>-	widgets/shortcut-bar/Makefile from here.</div><div class='del'>-</div><div class='del'>-2001-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Upped the required version of gal in evolution.</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Add the missing .xpm files.</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',</div><div class='del'>-	`16_print_xpm', `16_configure_addressbook'.</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.</div><div class='del'>-</div><div class='del'>-2001-01-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Upped the required version of gal in evolution.</div><div class='del'>-</div><div class='del'>-2001-01-22  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: From the "Ideas from the shower" department:</div><div class='del'>-	new splash screen.</div><div class='del'>-</div><div class='del'>-2001-01-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update package requirements</div><div class='del'>-</div><div class='del'>-2001-01-19  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Changed a leftover $with_x_mailer to</div><div class='del'>-	$with_sub_version.  Made it so that if $with_sub_version isn't</div><div class='del'>-	specified, we don't try to output it, and also corrected the way</div><div class='del'>-	SUB_VERSION is defined.</div><div class='del'>-</div><div class='del'>-2001-01-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?</div><div class='del'>-</div><div class='del'>-2001-01-17  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): add the</div><div class='del'>-	doc/devel/importer/Makefile as a target.</div><div class='del'>-</div><div class='del'>-2001-01-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Removed `--with-x-mailer' option; replaced with a</div><div class='del'>-	more generic `--with-sub-version' option.  So, don't define</div><div class='del'>-	`X_MAILER'; instead, define `SUB_VERSION'.</div><div class='del'>-</div><div class='del'>-2001-01-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add --enable-nntp switch.  default is no.</div><div class='del'>-</div><div class='del'>-2001-01-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: Add --with-x-mailer to set the version</div><div class='del'>-	string that appears in the X-Mailer header.</div><div class='del'>-</div><div class='del'>-2001-01-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Changed the required version of gal.</div><div class='del'>-</div><div class='del'>-2001-01-15  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the </div><div class='del'>-	Message-&gt;Move/Copy to folder -menu entries.</div><div class='del'>-</div><div class='del'>-2001-01-15  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-calendar-mini.png: New version of calendar icon that</div><div class='del'>-	looks more like a calendar and not a dictionary or something :)</div><div class='del'>-</div><div class='del'>-	Btw, the icons get scaled for some reason, even though that is</div><div class='del'>-	not necessary as all of those should be 16x16 pixels. Can anyone look </div><div class='del'>-	into this? </div><div class='del'>-</div><div class='del'>-2001-01-15  Dietmar Maurer  &lt;dietmar@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* *.c: changed the signature of the property_bag get/set</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-2001-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: remove old config message</div><div class='del'>-</div><div class='del'>-2001-01-14  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/evolution-move-tasks: new script to move tasks from the</div><div class='del'>-	Calendar folder to the new Tasks folder, so people won't lose tasks.</div><div class='del'>-	This can be deleted after a few releases.</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am (bin_SCRIPTS): added above.</div><div class='del'>-</div><div class='del'>-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.</div><div class='del'>-</div><div class='del'>-2001-01-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* config.h.in: Removed GPG stuff.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Take out all refs to PGP and GPG stuff.</div><div class='del'>-</div><div class='del'>-	* configure.in: Take out the PGP/GPG detection stuff.</div><div class='del'>-</div><div class='del'>-2001-01-12  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Suggest what to do if gtk-doc is not found.</div><div class='del'>-</div><div class='del'>-2001-01-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make evolution depend on the new version of gal.</div><div class='del'>-</div><div class='del'>-2001-01-12  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README</div><div class='del'>-	a bit and mention the OAF stable branch.</div><div class='del'>-</div><div class='del'>-2001-01-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/priority-high.xpm: Add a white outline around the "!" so it</div><div class='del'>-	still shows up clearly in selected rows when your theme selection</div><div class='del'>-	color is reddish. (Problem pointed out by Federico.)</div><div class='del'>-</div><div class='del'>-2001-01-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: At the end of the configure process, report</div><div class='del'>-	whether the documentation files will be built or not.</div><div class='del'>-</div><div class='del'>-2001-01-10  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/move-message.png, art/move-message.png: New versions.</div><div class='del'>-</div><div class='del'>-2001-01-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.</div><div class='del'>-</div><div class='del'>-2001-01-05  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts-mini.png: This looks more pretty.</div><div class='del'>-</div><div class='del'>-2001-01-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Removed camel/providers/mbox/Makefile and</div><div class='del'>-	camel/providers/mh/Makefile.</div><div class='del'>-</div><div class='del'>-2001-01-01  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require bonobo 0.31</div><div class='del'>-</div><div class='del'>-2000-12-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: If we find threads ok, then always turn on</div><div class='del'>-	ENABLE_THREADS.</div><div class='del'>-</div><div class='del'>-2000-12-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Addressbook): Added a bit of addressbook NEWS.</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the gal check to require gal 0.4.</div><div class='del'>-</div><div class='del'>-2000-12-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved</div><div class='del'>-	these images each up one pixel.</div><div class='del'>-</div><div class='del'>-2000-12-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Update.</div><div class='del'>-</div><div class='del'>-2000-12-14  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Update</div><div class='del'>-</div><div class='del'>-2000-12-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: New splash from Jimmac.</div><div class='del'>-</div><div class='del'>-2000-12-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Removed mention of ETable and EText in widgets</div><div class='del'>-	directory.</div><div class='del'>-</div><div class='del'>-2000-12-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Mention the gconf stable branch.</div><div class='del'>-</div><div class='del'>-2000-12-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the required version of gal.</div><div class='del'>-</div><div class='del'>-2000-12-07  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to</div><div class='del'>-	Editor.idl</div><div class='del'>-</div><div class='del'>-2000-12-06  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.keys: Added some Norwegian translations.</div><div class='del'>-	</div><div class='del'>-2000-12-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Increased the required version of gal.</div><div class='del'>-</div><div class='del'>-2000-12-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: minor tweak</div><div class='del'>-</div><div class='del'>-2000-12-05  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added camel/tests/stream/Makefile.am.</div><div class='del'>-</div><div class='del'>-2000-12-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: gnome-vfs depends on gconf, so add that.</div><div class='del'>-</div><div class='del'>-2000-11-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bumped required gal version to 0.2.99.4 for</div><div class='del'>-	e_str_make_safe.</div><div class='del'>-</div><div class='del'>-	* README: Added some necessary :'s in the pilot-link cvs stuff.</div><div class='del'>-</div><div class='del'>-2000-11-30  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,</div><div class='del'>-	shell/main.c, notes/main.c,</div><div class='del'>-	addressbook/gui/component/addressbook-factory.c:</div><div class='del'>-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.</div><div class='del'>-</div><div class='del'>-2000-11-29  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update pilot info</div><div class='del'>-</div><div class='del'>-2000-11-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump required gal version to 0.2.99.3 for iconv</div><div class='del'>-	changes</div><div class='del'>-</div><div class='del'>-2000-11-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* COPYING-DOCS: Added a copy of the GNU Free Documentation</div><div class='del'>-	License.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.</div><div class='del'>-</div><div class='del'>-2000-11-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK</div><div class='del'>-</div><div class='del'>-	* configure.in: Auto* magic for various camel locking types</div><div class='del'>-</div><div class='del'>-2000-11-28  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile</div><div class='del'>-</div><div class='del'>-2000-11-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* AUTHORS: Update - hopefully I assigned blame correctly :-)</div><div class='del'>-</div><div class='del'>-	* MAINTAINERS: ditto</div><div class='del'>-</div><div class='del'>-2000-11-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Correct the bonobo version error message</div><div class='del'>-</div><div class='del'>-	* README: Update</div><div class='del'>-</div><div class='del'>-2000-11-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added camel/tests stuff to output macro.</div><div class='del'>-</div><div class='del'>-2000-11-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added local provider dir to output macro.</div><div class='del'>-</div><div class='del'>-2000-11-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for libgpgme. (Support not added to mail</div><div class='del'>-	yet.)</div><div class='del'>-</div><div class='del'>-2000-11-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): Removed the</div><div class='del'>-	default_user/local/Tasks/Makefile until the relevant files are on</div><div class='del'>-	CVS.</div><div class='del'>-</div><div class='del'>-2000-11-18  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Added widgets/menus that contains the gal-view-menus.c code from</div><div class='del'>-	Gal that depended on Bonobo.</div><div class='del'>-</div><div class='del'>-	* configure.in: Update list of Makefiles;  </div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Update.</div><div class='del'>-</div><div class='del'>-2000-11-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Update the gal reqiurement version.</div><div class='del'>-</div><div class='del'>-2000-11-10  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require Bonobo &gt;= 0.29, due to the XSync</div><div class='del'>-	fix.</div><div class='del'>-</div><div class='del'>-2000-11-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.2.99.1.</div><div class='del'>-</div><div class='del'>-2000-11-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.2.1.3</div><div class='del'>-</div><div class='del'>-2000-11-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted</div><div class='del'>-	until the end of configure, so check if it's "NONE" and use</div><div class='del'>-	${ac_default_prefix} if so.</div><div class='del'>-</div><div class='del'>-2000-11-06  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in</div><div class='del'>-	${prefix}/share/gtkhtml</div><div class='del'>-</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version</div><div class='del'>-	number to 0.8</div><div class='del'>-	added check for HTMLEditor.idl file</div><div class='del'>-</div><div class='del'>-2000-11-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.2.1.2.</div><div class='del'>-</div><div class='del'>-2000-11-02  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require Bonobo-0.27+</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,</div><div class='del'>-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these</div><div class='del'>-	files.</div><div class='del'>-	* calendar/gui/.cvsignore, composer/.cvsignore,</div><div class='del'>-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,</div><div class='del'>-	po/.cvsignore: added some files to ignore.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,</div><div class='del'>-	shell/main.c, calendar/gui/main.c, notes/main.c,</div><div class='del'>-	executive-summary/component/main.c: call *textdomain() only if</div><div class='del'>-	ENABLE_NLS is defined.</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added lt to ALL_LINGUAS.</div><div class='del'>-	</div><div class='del'>-2000-10-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: fix up printing of kerberos configuration status</div><div class='del'>-</div><div class='del'>-2000-10-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal cvs version.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Kill executive summary components</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added executive-summary stuff</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the executive-summary subdirs.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-	* configure.in: set localedir here to use in Makefiles.</div><div class='del'>-	(AM_GNOME_GETTEXT doesn't actually always set it to</div><div class='del'>-	$(datadir)/locale).</div><div class='del'>-</div><div class='del'>-2000-10-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the gal check to check for gal 0.2.1.</div><div class='del'>-</div><div class='del'>-2000-10-22  Robert Brady  &lt;rwb197@zepler.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added "en_GB" to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate_cb): </div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (General, Addressbook): Updated NEWS for addressbook and</div><div class='del'>-	ETable.</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the gal check to check for gal 0.2.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_MICRO_VERSION): 6.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.</div><div class='del'>-	(dist-hook:): Removed.</div><div class='del'>-</div><div class='del'>-2000-10-18  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate, control_deactivate),</div><div class='del'>-	(create_view): cripple, not worth updating to new UI code.</div><div class='del'>-</div><div class='del'>-2000-10-17  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: This looks happier than the dark piece of rusty</div><div class='del'>-	metal. And the Big Dig in Boston is ugly looking too. Finnish</div><div class='del'>-	road poles are much more cool!</div><div class='del'>-</div><div class='del'>-2000-10-15  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/verify-evolution-install.sh (libcamelvee): Check</div><div class='del'>-	for linkage against version 0.5 libcamelvee, not version 0.3.</div><div class='del'>-	This should track with the version of Evolution itself.</div><div class='del'>-	(rm -f $ldddfile): Remove a temporary file.</div><div class='del'>-</div><div class='del'>-2000-10-15  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added "nn" to ALL_LINGUAS.</div><div class='del'>-	</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Add `splash.png'.</div><div class='del'>-</div><div class='del'>-2000-10-14  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: umm.. it's a splash screen image.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix bonobo error message</div><div class='del'>-</div><div class='del'>-2000-10-11  Jesse Pavel		&lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.keys: Added support for the text/calendar and</div><div class='del'>-	text/x-calendar MIME types.</div><div class='del'>-</div><div class='del'>-2000-10-10  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added lt to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-10-10  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/empty.xpm: make it transparent instead of white.</div><div class='del'>-</div><div class='del'>-2000-10-06  Christophe Merlet  &lt;christophe@merlet.net&gt;</div><div class='del'>-</div><div class='del'>-	* *.desktop: Added french strings.</div><div class='del'>-</div><div class='del'>-2000-10-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh</div><div class='del'>-	to EXTRA_DIST</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for isblank</div><div class='del'>-</div><div class='del'>-	* config.h.in: </div><div class='del'>-	* acconfig.h: #undef HAVE_ISBLANK</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump Bonobo requirement to &gt;= 0.20</div><div class='del'>-</div><div class='del'>-2000-10-05  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* executive-summary/*: Added the executive summary stuff.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-executive-summary.xml: New.</div><div class='del'>-</div><div class='del'>-	* art/add-service.png: New icon.</div><div class='del'>-</div><div class='del'>-2000-10-03  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook-ldap.xml,</div><div class='del'>-	* ui/evolution-addressbook.xml,</div><div class='del'>-	* ui/evolution-calendar.xml,</div><div class='del'>-	* ui/evolution-contact-editor.xml:</div><div class='del'>-	Fixed typo `_decr' -&gt; `_descr', so some missing tooltips will appear.</div><div class='del'>-	Also fixed some typos in descr values.</div><div class='del'>-</div><div class='del'>-2000-09-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-09-29  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...</div><div class='del'>-	menu item.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add a File/Close menu item.</div><div class='del'>-</div><div class='del'>-2000-09-28  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add a FolderSearch control, and</div><div class='del'>-	change "Refresh" to "RefreshList".</div><div class='del'>-</div><div class='del'>-2000-09-27  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add an Refresh List button..</div><div class='del'>-</div><div class='del'>-2000-09-27  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: new file.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: Moved the (un)select all menu items over</div><div class='del'>-	to the Edit menu - this looks nicer.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: Added some new menu items to the Message</div><div class='del'>-	menu like (un)select all and moved "mark as read" to the Message</div><div class='del'>-	menu.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Moved addressbook/ename to e-util/ename so</div><div class='del'>-	generate e-util/ename/Makefile and don't generate</div><div class='del'>-	addressbook/ename/Makefile</div><div class='del'>-</div><div class='del'>-2000-09-23  Tuomas Kuosmanen  &lt;tigert@localhost&gt;</div><div class='del'>-</div><div class='del'>-	* art/attachment.xpm</div><div class='del'>-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one </div><div class='del'>-	I thought, so I accidentally replaced the paperclip icon in the mail</div><div class='del'>-	list column, which wasnt my intention. I hope this works now. The old </div><div class='del'>-	one is back, instead the toolbar icon to add attachment is now called</div><div class='del'>-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted</div><div class='del'>-	printable fields were reading in semi-colons that should have been</div><div class='del'>-	field separators.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on</div><div class='del'>-	evolution-addressbook.xml)</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.</div><div class='del'>-</div><div class='del'>-2000-09-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.</div><div class='del'>-</div><div class='del'>-	* ui/evolution.xml: Fix mis-spelling of "calendar".</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/.cvsignore: Added a cvsignore file here.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-contact-editor.xml: New file for the UI for the</div><div class='del'>-	evolution contact editor.</div><div class='del'>-</div><div class='del'>-2000-09-20  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/attachment.xpm</div><div class='del'>-	* art/send.png: new icons for "compose mail" dialog...</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: alter the krb4 check a bit to deal with configure</div><div class='del'>-	cache suckage. (If you do AC_CHECK_LIB with the same library and</div><div class='del'>-	function name but different LDFLAGS, it will still use the result</div><div class='del'>-	of the previous check. So use a different function the second</div><div class='del'>-	time.)</div><div class='del'>-</div><div class='del'>-2000-09-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: add gal as a dependency</div><div class='del'>-</div><div class='del'>-2000-09-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/score-*.xpm: stupid looking icons for use with displaying</div><div class='del'>-	scores in the message-list view. These need a makeover BADLY ;-)</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added check for gnome-app-lib.  Removed</div><div class='del'>-	directories that have been moved to gal.</div><div class='del'>-</div><div class='del'>-2000-09-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, evolution.spec.in: remove spec file. We haven't</div><div class='del'>-	been keeping it up to date, and it's only good for RH anyway, and</div><div class='del'>-	if people really want a spec file they can get it from our SRPMs.</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require Bonobo 0.19</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced</div><div class='del'>-	addressbook/gui/minicard/Makefile with</div><div class='del'>-	addressbook/gui/widgets/Makefile.</div><div class='del'>-</div><div class='del'>-2000-09-13  Tuomas Kuosmanen  &lt;tigert@localhost&gt;</div><div class='del'>-</div><div class='del'>-	* art/pin.png: added icon for the folder tree "pin down" button</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Calendar): Pilot stuff</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: The notes subdir isn't actually used, so remove</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.5.</div><div class='del'>-</div><div class='del'>-2000-09-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): Added Sent/Outbox feature descriptions</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features</div><div class='del'>-</div><div class='del'>-	* configure.in: s/Sentbox/Sent/</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (buttonsdir): Install the new button icons into</div><div class='del'>-	`$(datadir)/images/evolution/buttons'.</div><div class='del'>-</div><div class='del'>-2000-09-11  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/fetch-mail.png</div><div class='del'>-	* art/compose-message.png</div><div class='del'>-	* art/reply.png</div><div class='del'>-	* art/reply-to-all.png</div><div class='del'>-	* art/forward.png</div><div class='del'>-	* art/move-message.png</div><div class='del'>-	* art/copy-message.png: New icons for the main window toolbar</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Added 0.5 changes for ETable and Addressbook.</div><div class='del'>-</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Add a mention of the verify-evolution-install.sh script</div><div class='del'>-	in tools/.</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Reversed my last change as it broke configure, how do I get it so</div><div class='del'>-	that we can do folders with spaces in the name!?</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Renamed default_user/local/Sentbox to</div><div class='del'>-	default_user/local/Sent\ Mail as Ettore and Danw are picky about</div><div class='del'>-	folder names </div><div class='del'>-</div><div class='del'>-2000-09-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added calendar/conduits/Makefile,</div><div class='del'>-	calendar/conduits/calendar/Makefile and</div><div class='del'>-	calendar/conduits/todo/Makefile to the list of makefiles to</div><div class='del'>-	output.</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add default_user/local/Sentbox/Makefile to the</div><div class='del'>-	list of makefiles to output</div><div class='del'>-</div><div class='del'>-2000-08-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (kerberos): Check and see if krb_sendauth needs</div><div class='del'>-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check</div><div class='del'>-	for a libkrb that doesn't need -ldes.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: #undef it</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)</div><div class='del'>-</div><div class='del'>-	* acconfig.h: #undef that</div><div class='del'>-</div><div class='del'>-2000-08-30  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Robustify the kerberos checks.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: decruft</div><div class='del'>-</div><div class='del'>-2000-08-28  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require oafized bonobo</div><div class='del'>-</div><div class='del'>-2000-08-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Ahem.  If you add dependencies on libraries, make</div><div class='del'>-	sure things still build.  Fixed the libunicode foo.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key</div><div class='del'>-	to translate GDK_KEY_PRESS to insertable UTF-8 string</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* announcement-0.4.1.txt: Updated dependency list.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax</div><div class='del'>-	</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* announcement-0.4.1.txt: Announcement message</div><div class='del'>-</div><div class='del'>-2000-08-19  Mathieu Lacage &lt;mathieu@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	Fixes compile for non-standard prefixes. Mainly in idl</div><div class='del'>-	compilation where -I`gnome-config --datadir`/idl is replaced</div><div class='del'>-	by `gnome-config --cflags idl` (ugly but it works at least)</div><div class='del'>-	and add some random _CFLAGS here and there and _LIBS for linking.</div><div class='del'>-	* addressbook/gui/component/select-names/Makefile.am</div><div class='del'>-	* composer/Makefile.am</div><div class='del'>-	* e-util/Makefile.am</div><div class='del'>-	* filter/Makefile.am</div><div class='del'>-	* mail/Makefile.am</div><div class='del'>-	* shell/Makefile.am</div><div class='del'>-	* widgets/e-text/Makefile.am</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-08-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code</div><div class='del'>-	to make handle position persist across resizes.</div><div class='del'>-</div><div class='del'>-2000-08-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-20  arik devens  &lt;arik@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS</div><div class='del'>-	support so that compiling in an alternate prefix works.</div><div class='del'>-</div><div class='del'>-2000-08-19  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont</div><div class='del'>-	* widgets/e-text/e-text.c: Ported to UTF-8</div><div class='del'>-</div><div class='del'>-2000-08-18  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (gnome-vfs): Check for new enough gnome-vfs</div><div class='del'>-	(needs gnome_vfs_mime_get_default_action_without_fallback)</div><div class='del'>-</div><div class='del'>-2000-08-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Generate</div><div class='del'>-	doc/devel/calendar/cal-util/Makefile.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for db1/db.h too, which is what</div><div class='del'>-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke</div><div class='del'>-	&lt;kwg@teleport.com&gt;</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: offer --enable-pilot-conduits to add pilot</div><div class='del'>-	conduits if the user wants them.</div><div class='del'>-</div><div class='del'>-2000-08-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix the name of the binary to look for for PGP5</div><div class='del'>-</div><div class='del'>-2000-08-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for Bonobo 0.17</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/gui/search/Makefile.</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, README: Depend on gnome-vfs 0.3</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,</div><div class='del'>-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.</div><div class='del'>-</div><div class='del'>-2000-08-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.keys: New file containing MIME keys for</div><div class='del'>-	Evolution. Currently just the addressbook minicard display.</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am (mime_DATA): add evolution.keys</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.</div><div class='del'>-</div><div class='del'>-2000-08-08  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.</div><div class='del'>-</div><div class='del'>-2000-08-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/verify-evolution-install.sh: Look for oafinfo files in</div><div class='del'>-	oaf's prefix, not gnome-libs's. Allow binaries to be installed</div><div class='del'>-	anywhere in $PATH.</div><div class='del'>-</div><div class='del'>-	* configure.in, README: Update the README and the text of the</div><div class='del'>-	Bonobo configure check to match reality. Remove the 0.15 vs</div><div class='del'>-	0.15-and-a-half check since we require post-0.16 now.</div><div class='del'>-</div><div class='del'>-2000-08-03  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove gconf check</div><div class='del'>-</div><div class='del'>-2000-08-03 Alastair McKinstry &lt;mckinstry@computer.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Add Irish translation</div><div class='del'>-</div><div class='del'>-2000-08-02  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: update for BonoboX</div><div class='del'>-</div><div class='del'>-2000-08-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Add camel/providers/nntp</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made clicking choose the right</div><div class='del'>-	character even if show_borders is on.</div><div class='del'>-</div><div class='del'>-2000-08-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.</div><div class='del'>-	Only record the first one found.</div><div class='del'>-</div><div class='del'>-2000-08-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): removed calendar/doc/*</div><div class='del'>-</div><div class='del'>-2000-08-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added mh provider.</div><div class='del'>-</div><div class='del'>-2000-07-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs</div><div class='del'>-	newer)</div><div class='del'>-</div><div class='del'>-2000-07-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump version number to 0.3.</div><div class='del'>-</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default</div><div class='del'>-	the return value to 0.</div><div class='del'>-</div><div class='del'>-2000-07-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: some unrelated changes: check for mkdtemp,</div><div class='del'>-	gnome_vfs_mime_get_default_action_without_fallback, and a</div><div class='del'>-	setuid/setgid movemail binary.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: add MOVEMAIL_PATH</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/conduit/Makefile.</div><div class='del'>-</div><div class='del'>-2000-07-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made focus in not change your selection</div><div class='del'>-	position.</div><div class='del'>-</div><div class='del'>-2000-07-21  Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/event-editor.c: Typo fix</div><div class='del'>-</div><div class='del'>-2000-07-20  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (THREADS_CFLAGS): Make threads mandatory</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-	</div><div class='del'>-	* evolution.desktop &amp; data/evolution.desktop: Added</div><div class='del'>-		the Turkish desktop entries.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): Typo fix.</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.</div><div class='del'>-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.</div><div class='del'>-	Added checks for gtk-doc.</div><div class='del'>-</div><div class='del'>-2000-07-13  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (end): Bigass warnings for camel-async branch</div><div class='del'>-	(remove them later).</div><div class='del'>-</div><div class='del'>-2000-07-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out</div><div class='del'>-	with CVS HEAD versions to avoid breakage.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Version 0.2.</div><div class='del'>-</div><div class='del'>-	* configure.in: Reverse the GtkHTML check.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated to check for required GtkHTML and</div><div class='del'>-	gnome-print</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove the conduits stuff for now.  They depend on</div><div class='del'>-	CVS gnome-pilot, and this is not good for the release.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: updates</div><div class='del'>-</div><div class='del'>-2000-07-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added makefiles for calendar conduits</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".</div><div class='del'>-	If draw_borders is TRUE, cause the cursor to change even if not</div><div class='del'>-	editing.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Removed some border padding and set</div><div class='del'>-	the "draw_borders" argument of the contained GtkText.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a</div><div class='del'>-	"draw_borders" argument which, if set, makes the EText look more</div><div class='del'>-	like a GtkEntry.</div><div class='del'>-</div><div class='del'>-2000-07-09  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts.png: updated so it has better contrast</div><div class='del'>-	against the background.</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts-small.png: Fits the style of the new contacts</div><div class='del'>-	icon, this is a sigle card.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):</div><div class='del'>-	Return "" instead of NULL.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"</div><div class='del'>-	arguments.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added</div><div class='del'>-	"fill_clip_rectangle" argument which describes whether to accept</div><div class='del'>-	clicks throughout the clipping rectangle.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Fixed some typos.</div><div class='del'>-</div><div class='del'>-2000-07-07  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts.png: Changed icon (hi ettore)</div><div class='del'>-	The old handshake one was a little too firm handshake..</div><div class='del'>-	this is a rolodex icon..</div><div class='del'>-</div><div class='del'>-2000-07-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: make pthreads not required again, since they</div><div class='del'>-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since</div><div class='del'>-	that dir doesn't exist any more.</div><div class='del'>-</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): remove the default_user Directories</div><div class='del'>-	dir.</div><div class='del'>-</div><div class='del'>-2000-07-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am, libical/configure.in: Fixed some make distcheck</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GNOME_VFS_CFLAGS): Define.</div><div class='del'>-	(GNOME_VFS_LIBS): Define.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add</div><div class='del'>-	`addressbook/gui/component/select-names/Makefile' to the</div><div class='del'>-	`AC_OUTPUT()' list.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to</div><div class='del'>-	be a widget containing a text item.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed some spacing.</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in:  Re-enable GNOME_PILOT_CHECK.</div><div class='del'>-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little</div><div class='del'>-	things that matter.</div><div class='del'>-</div><div class='del'>-2000-06-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: `AM_PATH_GCONF'.</div><div class='del'>-</div><div class='del'>-2000-06-27  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ctime_r): Check for whether ctime_r takes</div><div class='del'>-	two (Linux) or three (Solaris) arguments.</div><div class='del'>-	(AC_OUTPUT): Don't create notes/Makefile twice.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.</div><div class='del'>-	</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Calculate height including if</div><div class='del'>-	clip_height is set to -1.</div><div class='del'>-	</div><div class='del'>-2000-06-26  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads</div><div class='del'>-	to turn on the threading stuff in evolution-mail. Defaults to no.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add USE_BROKEN_THREADS to the list.</div><div class='del'>-	</div><div class='del'>-2000-06-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the</div><div class='del'>-	latter is not actually defined anywhere.</div><div class='del'>-</div><div class='del'>-2000-06-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (pthread stuff): Make threads required due</div><div class='del'>-	to threaded evolution-mail. Subst in the THREADS_LIBS et</div><div class='del'>-	al.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Remove USE_THREADS conditional as we</div><div class='del'>-	always use threads now.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,</div><div class='del'>-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and</div><div class='del'>-	"y" arguments to EText.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the</div><div class='del'>-	"x" and "y" arguments to EText.   Added vertical scrolling.</div><div class='del'>-</div><div class='del'>-2000-06-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: </div><div class='del'>-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.</div><div class='del'>-</div><div class='del'>-2000-06-17  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made EText use the font from the</div><div class='del'>-	canvas's style if one isn't set.</div><div class='del'>-</div><div class='del'>-2000-06-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/meeting-time-sel/*: updated to use EText items rather than</div><div class='del'>-	GtkEntry widgets and added support for adding new rows.</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: bye bye goad</div><div class='del'>-</div><div class='del'>-2000-06-14  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README (http): added command to co ORBit.</div><div class='del'>-</div><div class='del'>-2000-06-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added IMAP into the build</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_notes_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything</div><div class='del'>-	else.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install `evolution.png' and `evolution.desktop'</div><div class='del'>-	where appropriate.</div><div class='del'>-</div><div class='del'>-	* evolution.png: New.  For now, it's just a copy of</div><div class='del'>-	`art/evolution-inbox.png'.</div><div class='del'>-</div><div class='del'>-	* evolution.desktop: New.</div><div class='del'>-</div><div class='del'>-2000-06-10  Zbigniew Chyla  &lt;chyla@buy.pl&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added pl (Polish) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added new directory `shell/glade'.</div><div class='del'>-</div><div class='del'>-2000-06-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a</div><div class='del'>-	"quantum" argument for making the panes move in jumps.</div><div class='del'>-</div><div class='del'>-2000-06-07  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in:  Create notes/Makefile</div><div class='del'>-</div><div class='del'>-	* notes/*: Add preliminary yellow sticky notes.</div><div class='del'>-</div><div class='del'>-2000-06-05	Mathieu Lacage	&lt;mathieu@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: make it </div><div class='del'>-	compile: add proper bonobo linking params.</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am: idem.</div><div class='del'>-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.</div><div class='del'>-	cleanup some useless includes and libs.</div><div class='del'>-</div><div class='del'>-2000-06-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Add `it' and `de'.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Released Evolution 0.1.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.</div><div class='del'>-</div><div class='del'>-2000-06-02  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-06-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some</div><div class='del'>-	more to reflect OAF's new ascendency. Make the fact that you don't</div><div class='del'>-	need pilot stuff clearer. Add some new directories to the</div><div class='del'>-	directory layout section.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/misc/e-clipped-label.c: Free the finish data.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): add doc, doc/C</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): add doc</div><div class='del'>-</div><div class='del'>-2000-05-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from</div><div class='del'>-	EOG and renamed it to EScrollFrame.</div><div class='del'>-</div><div class='del'>-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added</div><div class='del'>-	e-scroll-frame.[ch].</div><div class='del'>-</div><div class='del'>-2000-05-30  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the</div><div class='del'>-	handle even if the requisition for the child is zero.</div><div class='del'>-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-26  Héctor García Alvarez &lt;hector@scouts-es.org&gt;</div><div class='del'>-</div><div class='del'>-        * configure.in: Added Spanish language</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a</div><div class='del'>-	bug where we were resizing a non-existent window.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made</div><div class='del'>-	the handlebar disappear if either side is empty, hidden, or</div><div class='del'>-	requests 0 size.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added widgets/e-paned/Makefile.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to</div><div class='del'>-	EPaned.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-paned directory.</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/, widgets/e-paned/.cvsignore,</div><div class='del'>-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,</div><div class='del'>-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,</div><div class='del'>-	widgets/e-paned/e-vpaned.h: New widget based completely on</div><div class='del'>-	GtkPaned from 1.4.  This will be more advanced soon.</div><div class='del'>-</div><div class='del'>-2000-05-22  Jeff Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Readded camel/providers/smtp </div><div class='del'>-</div><div class='del'>-2000-05-22  Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added Hungarian language</div><div class='del'>-</div><div class='del'>-2000-05-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): add camel/providers/vee</div><div class='del'>-</div><div class='del'>-2000-05-16  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Install the mini icons.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add --with-purify-options support, and default it</div><div class='del'>-	to what we at helix need</div><div class='del'>-</div><div class='del'>-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png</div><div class='del'>- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png</div><div class='del'>- 	art/evolution-notes-mini.png: new mini-icons for the tree view</div><div class='del'>-	of folders and stuff.</div><div class='del'>-</div><div class='del'>-2000-05-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Added version and availability of required libunicode</div><div class='del'>-	library.</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Update versions needed for gnome-print, bonobo,</div><div class='del'>-	and gtkhtml.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* HACKING: We need a HACKING file.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed dist-hook section.</div><div class='del'>-</div><div class='del'>-	* configure.in: Set the version number.  Added a check for gnome</div><div class='del'>-	window icons.  Removed a bunch of unused Makefiles.</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am: Created a proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added</div><div class='del'>-	e-text-event-processor-types.h.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Added briefcase.png to get installed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Remove the tooltip callback when</div><div class='del'>-	destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing</div><div class='del'>-	for a 'void' function.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an</div><div class='del'>-	activate signal.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in: Added new Directories section for the default_user.</div><div class='del'>-</div><div class='del'>-2000-05-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated for the new `default_user' directory</div><div class='del'>-	setup.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for purify.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a</div><div class='del'>-	"changed" signal that gets sent whenever the text changes.</div><div class='del'>-</div><div class='del'>-2000-05-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Added `--enable-purify' flag.</div><div class='del'>-</div><div class='del'>-2000-05-05  Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* shell/Makefile.am: add support for building purified evolution.</div><div class='del'>-</div><div class='del'>-	* shell/.cvsignore: ignore evolution.pure</div><div class='del'>-</div><div class='del'>-2000-05-05  Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/.cvsignore,</div><div class='del'>-	addressbook/contact-editor/.cvsignore,</div><div class='del'>-	addressbook/gui/component/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/printing/.cvsignore,</div><div class='del'>-	calendar/cal-client/.cvsignore,</div><div class='del'>-	calendar/gui/.cvsignore,</div><div class='del'>-	calendar/pcs/.cvsignore,</div><div class='del'>-	filter/.cvsignore,</div><div class='del'>-	mail/.cvsignore,</div><div class='del'>-	shell/.cvsignore,</div><div class='del'>-	tests/.cvsignore,</div><div class='del'>-	widgets/e-table/.cvsignore,</div><div class='del'>-	widgets/e-text/.cvsignore,</div><div class='del'>-	widgets/meeting-time-sel/.cvsignore,</div><div class='del'>-	widgets/shortcut-bar/.cvsignore,</div><div class='del'>-	wombat/.cvsignore: ignore the .pure directory</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Oops. The Kerberos check was succeeding when it</div><div class='del'>-	shouldn't have (and thus breaking the pop3 build for "normal"</div><div class='del'>-	people). Fix.</div><div class='del'>-</div><div class='del'>-2000-05-03  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.</div><div class='del'>-</div><div class='del'>-2000-05-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Do not output `doc/Makefile' because there is</div><div class='del'>-	nothing to generate it from.</div><div class='del'>-</div><div class='del'>-2000-05-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: add some minimal Kerberos checking.</div><div class='del'>-	This isn't intended to be generically useful at this point, it's</div><div class='del'>-	just there to give me a second POP auth mechanism to play with.</div><div class='del'>-</div><div class='del'>-	Also remove a bit of cruft, and reorganize configure.in a bit.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c: And here too.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): REmoved gmime-utils.h</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (LDADD): Add libeutil to default link line.</div><div class='del'>-	(test_movemail_LDADD): Fixed order for libutil linking.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* tests/ui-tests/Makefile.am: same.</div><div class='del'>-	* widgets/e-text/Makefile.am: same.</div><div class='del'>-	* widgets/meeting-time-sel/Makefile.am: same.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): *sigh* moved back to sync api.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (search_cb): Try deleting messages ...</div><div class='del'>-	(main): Fix for provider api changes.</div><div class='del'>-</div><div class='del'>-2000-05-01  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check if bonobo uses oaf, so you don't</div><div class='del'>-	need to specify --enable-oaf.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: New configured #define `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added `--enable-oaf' option and corresponding</div><div class='del'>-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by</div><div class='del'>-	Maciej Stachowiak &lt;mjs@eazel.com&gt;.</div><div class='del'>-</div><div class='del'>-2000-04-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes</div><div class='del'>-	to recipient stuff.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes</div><div class='del'>-	to recipient stuff.</div><div class='del'>-</div><div class='del'>-2000-04-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/ename/Makefile.</div><div class='del'>-</div><div class='del'>-2000-04-27  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added tools/Makefile.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added tools.</div><div class='del'>-</div><div class='del'>-	* tools/: New directory for tools relating to evolution.</div><div class='del'>-</div><div class='del'>-	* tools/killev: New script for killing all evolution-related</div><div class='del'>-	stuff.</div><div class='del'>-</div><div class='del'>-        * tools/Makefile.am: New file.</div><div class='del'>-	</div><div class='del'>-	* tools/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c (main): And here too.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): Same here.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Change for removed simpledatawrapper.</div><div class='del'>-</div><div class='del'>-2000-04-26  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test13.</div><div class='del'>-</div><div class='del'>-	* default_user/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_destroy): Kill text-&gt;timer and</div><div class='del'>-	text-&gt;timeout on destroy.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests: Update for the camel changes.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly</div><div class='del'>-	useful/interesting any more for the most part, and they frequently</div><div class='del'>-	don't compile.</div><div class='del'>-</div><div class='del'>-2000-04-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct</div><div class='del'>-	place and configuration when using the "max_lines", "anchor"</div><div class='del'>-	(untested), or "justification" arguments.</div><div class='del'>-</div><div class='del'>-From a patch by Iain Holmes &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-	</div><div class='del'>-	* widgets/e-text/e-text-event-processor-emacs-like.c,</div><div class='del'>-	widget/e-text/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and</div><div class='del'>-	C-y to control the X clipboard.  Added double and triple click</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-2000-04-24  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in : Added tr to ALL_LINGUAS .</div><div class='del'>-</div><div class='del'>-2000-04-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c (main): Fixed for method movements.</div><div class='del'>-</div><div class='del'>-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): Changed to use construct_from_stream.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Chagned to use construct_from_stream.</div><div class='del'>-</div><div class='del'>-2000-04-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* default_user/Makefile.am: new file.</div><div class='del'>-</div><div class='del'>-	* default_user/Main_Shortcuts.xml: New file; is used to fill the</div><div class='del'>-	shortcut bar's "main shortcuts" pane.</div><div class='del'>-</div><div class='del'>-	* default_user/Other_Shortcuts.xml: New file, used to fill the</div><div class='del'>-	shortcut bar's "other shortcuts" pane.</div><div class='del'>-</div><div class='del'>-	* default_user/Inbox.mbox: New file. This is the first message a</div><div class='del'>-	new user will see when they fire up Evolution. Needs work.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added default_user directory.</div><div class='del'>-	* configure.in: same.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c: Removed some unecessary includes.  From</div><div class='del'>-	Ali Abdin &lt;aliabdin@aucegypt.edu&gt;</div><div class='del'>-	(create_sample_mime_message): Changed for date api change.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.</div><div class='del'>-</div><div class='del'>-2000-04-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Changed for date api change.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c: Fixed some headers.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.</div><div class='del'>-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being</div><div class='del'>-	built).</div><div class='del'>-	Removed test10.</div><div class='del'>-</div><div class='del'>-2000-04-20  Yukihiro Nakai &lt;nakai@gnome.gr.jp&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add Japanese to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-04-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: More detail on exactly what versions of what libraries</div><div class='del'>-	are needed.</div><div class='del'>-</div><div class='del'>-2000-04-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/*: remove camel-log references</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,</div><div class='del'>-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible</div><div class='del'>-	with its behavior in 1.8.6 and earlier.</div><div class='del'>-</div><div class='del'>-	* tests/test-url.c: New program to test CamelURL</div><div class='del'>-</div><div class='del'>-2000-04-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Added</div><div class='del'>-	orginizational unit, nickname, and internet free-busy fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade: Renamed some</div><div class='del'>-	incorrectly named fields.</div><div class='del'>-</div><div class='del'>-2000-04-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c: Added orginization and role</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed</div><div class='del'>-	some incorrectly named fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Added</div><div class='del'>-	orginization and role fields as well as hooking up the birth date</div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.</div><div class='del'>-</div><div class='del'>-2000-04-15  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c</div><div class='del'>-	(search_entry_activated): New function. Gets called when the quick</div><div class='del'>-	search entry is called on to perform a search.</div><div class='del'>-	(make_quick_search_widget): New function; returns a "quick search"</div><div class='del'>-	widget.</div><div class='del'>-	(control_activate): During the construction of the toolbar, a</div><div class='del'>-	"quick search" widget is included.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: add test12</div><div class='del'>-</div><div class='del'>-	* tests/test12.c (main): add test for nntp stuff.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): same.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-ldap.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Added a note field.</div><div class='del'>-</div><div class='del'>-2000-04-15  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.h: #include</div><div class='del'>-	"addressbook/backend/ebook" to make sure we pick up the right</div><div class='del'>-	addressbook.h.  Butt ugly, but at least it makes it possible for</div><div class='del'>-	me to build Evolution.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(builddir)' so that we pick up the IDL-generated includes</div><div class='del'>-	correctly.</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use</div><div class='del'>-	`$(srcdir)'.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that</div><div class='del'>-	it works with builddir != srcdir.</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if</div><div class='del'>-	the ldap_open failed, and fix warnings.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): don't do search if the</div><div class='del'>-	ensure_connected failed, and fix warnings.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(poll_ldap): fix warnings.</div><div class='del'>-	(pas_backend_ldap_process_get_book_view): same.</div><div class='del'>-	(pas_backend_ldap_get_vcard): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): same.</div><div class='del'>-</div><div class='del'>-	* configure.in: quiet configure in the case where it can't find</div><div class='del'>-	ldap libs.</div><div class='del'>-</div><div class='del'>-2000-04-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c (extract_info):</div><div class='del'>-	Check for 0 length fields when building the outgoing ECard.</div><div class='del'>-</div><div class='del'>-2000-04-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup</div><div class='del'>-	url and title.</div><div class='del'>-</div><div class='del'>-2000-04-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c</div><div class='del'>-	(fill_in_info): reflect the title attribute in the contact editor.</div><div class='del'>-	(extract_info): same.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-reflow.c: add a title.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for</div><div class='del'>-	the title attribute.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out</div><div class='del'>-	the title to the vcard.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: add title field foo to</div><div class='del'>-	the test.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: reflect the title field.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new</div><div class='del'>-	function that polls ldap for more search responses.</div><div class='del'>-	(pas_backend_ldap_search): use the async search interface and</div><div class='del'>-	register an idle call to poll for the responses.</div><div class='del'>-	(view_destroy): make sure to g_source_remove the idle id.</div><div class='del'>-</div><div class='del'>-2000-04-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):</div><div class='del'>-	rework this function to use a table mapping search field names to</div><div class='del'>-	vcard properties and extra information (such as whether or not the</div><div class='del'>-	property is a list.)</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(construct_email_list): new function, to build the ECardList for</div><div class='del'>-	email addresses.</div><div class='del'>-	(construct_phone_list): new function, to build the ECardList for</div><div class='del'>-	phone numbers.</div><div class='del'>-	(pas_backend_ldap_search): use a table mapping ldap attributes to</div><div class='del'>-	ecard properties, and use the special list construction functions</div><div class='del'>-	if the property calls for it.  general cleanup.  added a comment</div><div class='del'>-	about not calling ber_free if there was a decoding error.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-04-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Add tigert's contact-dlg-related images.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add</div><div class='del'>-	tigert's images.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.</div><div class='del'>-</div><div class='del'>-2000-04-12  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/house.png, art/malehead.png, art/cellphone.png, </div><div class='del'>-	art/briefcase.png, art/envelope.png, art/globe.png:</div><div class='del'>-	New icons for the contact manager.. more to follow once I get </div><div class='del'>-	around to do more artist work..</div><div class='del'>-</div><div class='del'>-2000-04-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): delay the setting of the</div><div class='del'>-	ldap variable until we've ensured we were connected.  Also, set</div><div class='del'>-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually</div><div class='del'>-	want a user setting here i assume.)</div><div class='del'>-	(pas_backend_ldap_search): same here, and also send back lists of</div><div class='del'>-	CARDS_PER_VIEW_NOTIFICATION length in each</div><div class='del'>-	pas_book_view_notify_add call.  also, don't call ber_free if there</div><div class='del'>-	was a decoding error, since the ldap library frees it for us.</div><div class='del'>-</div><div class='del'>-2000-04-11  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): Properly use AC_ARG_WITH</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.</div><div class='del'>-</div><div class='del'>-	* configure.in: check for -lldap and -llber and if both are</div><div class='del'>-	present include ldap support in the pas/wombat.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include</div><div class='del'>-	pas-backend.ldap.c if ENABLE_LDAP.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: get searching</div><div class='del'>-	working (converting between the sexp and ldap stuff.)</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pas): register the ldap pas backend if</div><div class='del'>-	HAVE_LDAP is defined.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Changed AC_DEFUN to AC_DEFINE.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for timezone as a variable (as it is in</div><div class='del'>-	linux, but not in freebsd or netbsd.)</div><div class='del'>-</div><div class='del'>-2000-04-11  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new</div><div class='del'>-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending</div><div class='del'>-	on pixmaps.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.</div><div class='del'>-</div><div class='del'>-00-04-11  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c</div><div class='del'>-	(e_text_set_args): Recalculate bounds when width or clip_width changes.</div><div class='del'>-	(tooltip_event): Forward clicks on the tooltip onto the text item.</div><div class='del'>-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.</div><div class='del'>-	(e_text_point): Return 0 when the mouse is on the item.</div><div class='del'>-	(_do_tooltip): Make the tooltip obey the parent items</div><div class='del'>-	line_wrap and max_lines.</div><div class='del'>-</div><div class='del'>-00-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(get_e_card_prop): new function, taking code from func_contains to</div><div class='del'>-	get string properties.</div><div class='del'>-	(entry_compare): new function generic, taking strstr-like function</div><div class='del'>-	as a parameter.</div><div class='del'>-	(func_contains): rewrite function to use entry_compare.</div><div class='del'>-	(is_helper): new helper function to map strcmp to a strstr-like</div><div class='del'>-	function.</div><div class='del'>-	(func_is): new function, implementing "is" for searches.</div><div class='del'>-	(endswith_helper): new function.</div><div class='del'>-	(func_endswith) new function, implementing "endswith" for</div><div class='del'>-	searches.</div><div class='del'>-	(beginswith_helper): new function.</div><div class='del'>-	(func_beginswith): new function, implementing "beginswith" for</div><div class='del'>-	searches.</div><div class='del'>-	(compare_email): new function for searching all email addresses of</div><div class='del'>-	a contact.</div><div class='del'>-	(compare_phone): new function for searching all phone numbers of a</div><div class='del'>-	contact.</div><div class='del'>-	(compare_address): new function for searching all addresses of a</div><div class='del'>-	contact (unimplemented as yet).</div><div class='del'>-	(entry_compare): add support for searching the list items "email",</div><div class='del'>-	"phone" and "address".</div><div class='del'>-	(vcard_matches_search): free the esexp_result.</div><div class='del'>-	(entry_compare): we want comparison functions to take 2 args.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c: This was setting</div><div class='del'>-	E_REFLOW(view)-&gt;items to NULL too soon.  Fixed now.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_search): remove spew.</div><div class='del'>-	(pas_backend_file_process_create_card): move the sync to the</div><div class='del'>-	earliest possible point after the db operation.</div><div class='del'>-	(pas_backend_file_process_remove_card): same.</div><div class='del'>-	(pas_backend_file_process_modify_card): same, and call</div><div class='del'>-	pas_book_respond_modify, not pas_book_respond_remove, here.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new</div><div class='del'>-	function.</div><div class='del'>-	(delete_contact_cb): wire up button to call</div><div class='del'>-	e_minicard_view_remove_selection.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c</div><div class='del'>-	(e_minicard_view_remove_selection): fix warning, and stick "view"</div><div class='del'>-	in the name.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.c: Changed some incorrect</div><div class='del'>-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and</div><div class='del'>-	bonobo_object_unrefs.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c: Changed a</div><div class='del'>-	gtk_object_destroy to a gtk_object_unref.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to</div><div class='del'>-	NULL after freeing its contents.  Added</div><div class='del'>-	e_minicard_view_remove_selection function.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL</div><div class='del'>-	after freeing its contents.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (find_contact_cb):</div><div class='del'>-	implement braindead dialog to input the query string for the view.</div><div class='del'>-</div><div class='del'>-	also, change all callbacks to get the EMinicardView instead of the</div><div class='del'>-	EBook.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c</div><div class='del'>-	(e_minicard_view_get_arg): add missing break.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"</div><div class='del'>-	argument to the e-minicard-view.  Documented all the arguments to</div><div class='del'>-	the e-minicard-view.</div><div class='del'>-</div><div class='del'>-2000-04-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change</div><div class='del'>-	the empty search string ("") to the valid (contains "full_name" "").</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes</div><div class='del'>-	after libpas (since it uses the sexp stuff now.)</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am (INCLUDES): add</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(view_destroy): free the search context and unref the sexp.</div><div class='del'>-	(string_to_dbt): save the zero byte of strings, so we don't have</div><div class='del'>-	to g_strndup everywhere.</div><div class='del'>-	(func_contains): new function, implementing the (contains) search</div><div class='del'>-	function.</div><div class='del'>-	(vcard_matches_search): generic predicate to tell whether or not a</div><div class='del'>-	vcard entry matches the current book view.</div><div class='del'>-	(pas_backend_file_search): rip some of this code out of</div><div class='del'>-	get_book_view (the portion building the list of cards) and make it</div><div class='del'>-	use the e-sexp stuff.</div><div class='del'>-	(pas_backend_file_process_create_card): use vcard_matches_search</div><div class='del'>-	to only notify if the card will appear in the view.</div><div class='del'>-	(pas_backend_file_process_remove_card): use vcard_matches_search</div><div class='del'>-	to only notify if the card will be removed from the view.</div><div class='del'>-	(pas_backend_file_process_modify_card): use vcard_matches_search</div><div class='del'>-	to notify if the modified card was added, removed, or changed in</div><div class='del'>-	the view.</div><div class='del'>-	</div><div class='del'>-2000-04-10  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GNOME_PRINT_CFLAGS): Update to support</div><div class='del'>-	--disable-threads correctly.</div><div class='del'>-</div><div class='del'>-2000-04-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): use view != NULL instead</div><div class='del'>-	of checking db_error when we call pas_book_respond_get_book_view)</div><div class='del'>-</div><div class='del'>-2000-04-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for mkstemp</div><div class='del'>-</div><div class='del'>-2000-04-10  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): removed libical stuff since it has its</div><div class='del'>-	own configure.in.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was</div><div class='del'>-	sending the wrong information to some callbacks.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate</div><div class='del'>-	function.  Made ids get stored in vcards.  Made sure to delete the</div><div class='del'>-	url if it exists.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Made pas include</div><div class='del'>-	addressbook/backend/ebook/ in the search path.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and</div><div class='del'>-	made the create card function store the generated id in the card</div><div class='del'>-	being saved.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free</div><div class='del'>-	bug.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.</div><div class='del'>-	Made the contact editor actually return a valid card when</div><div class='del'>-	gtk_object_get(editor, "card", ...) is called.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and</div><div class='del'>-	paste error.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Made this get the card</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am: Made this include</div><div class='del'>-	contact-editor directory in the search path and link against</div><div class='del'>-	libecontacteditor so that double clicking can open a dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.</div><div class='del'>-	Made double clicking open a contact editor dialog if this minicard</div><div class='del'>-	is contained in a minicard view.  (It needs the minicard view to</div><div class='del'>-	get the EBook to save to.</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: Link wombat against libebook, since</div><div class='del'>-	pas-backend-file now uses ECard.</div><div class='del'>-</div><div class='del'>-2000-04-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (control_activate): Make</div><div class='del'>-	"New Contact" menuitem add a card with new_contact_cb().</div><div class='del'>-	</div><div class='del'>-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,</div><div class='del'>-	since the gui now depends on the contact editor (shouldn't the</div><div class='del'>-	contact-editor directory be moved into 'gui'?).</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (card_added_cb): New</div><div class='del'>-	function. Gets called when a card is successfully added via the</div><div class='del'>-	contact-editor.</div><div class='del'>-	(new_contact_cb): New function. Gets called when a user clicks the</div><div class='del'>-	"new contact" button on the toolbar, and creates a contact-editor</div><div class='del'>-	to edit a new contact entry.</div><div class='del'>-	(control_activate): Call gnome_app_fill_toolbar_with_data()</div><div class='del'>-	instead of gnome_app_fill_toolbar(), so that our toolbar can find</div><div class='del'>-	the right book to add a new card to.</div><div class='del'>-	(addressbook_factory): On an "activate" signal, send the book up</div><div class='del'>-	to control_activate_cb.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):</div><div class='del'>-	Call glade_gnome_init(), so that our contact-editor (which</div><div class='del'>-	requires glade) doesn't barf.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/Makefile.am: added the contact-editor</div><div class='del'>-	to our libraries and include files.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c</div><div class='del'>-	(e_contact_editor_new): Set "card" gtk property to the passed-in</div><div class='del'>-	card property.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (addressbook_factory):</div><div class='del'>-	Added gtk_widget_push/pop_colormap/visual, which I assume is</div><div class='del'>-	necessary for canvas use.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.h,</div><div class='del'>-	addressbook/contact-editor/test-editor.c: Made the contact editor</div><div class='del'>-	load from an ECard.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c: Added support for the URL</div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a</div><div class='del'>-	small typo.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after</div><div class='del'>-	pixmapdir was renamed to imagesdir)</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/Makefile.am,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.h,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.h,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.h,</div><div class='del'>-	addressbook/gui/minicard/test-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/test-reflow.c,</div><div class='del'>-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h,</div><div class='del'>-	widgets/e-minicard/e-minicard-view.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-view.h,</div><div class='del'>-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,</div><div class='del'>-	widgets/e-minicard/e-reflow-sorted.c,</div><div class='del'>-	widgets/e-minicard/e-reflow-sorted.h,</div><div class='del'>-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,</div><div class='del'>-	widgets/e-minicard/test-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/test-minicard-view.c,</div><div class='del'>-	widgets/e-minicard/test-minicard.c,</div><div class='del'>-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the</div><div class='del'>-	correct changes in the correct places.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/,</div><div class='del'>-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,</div><div class='del'>-	addressbook/gui/component/addressbook-factory.c,</div><div class='del'>-	addressbook/gui/component/addressbook.c,</div><div class='del'>-	addressbook/gui/component/addressbook.gnorba,</div><div class='del'>-	addressbook/gui/component/addressbook.h: New directory to proivde</div><div class='del'>-	the component for contact management.  Simply uses an e-minicard-view.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: New subclass of</div><div class='del'>-	e-reflow-sorted that takes an EBook and uses it to compute the</div><div class='del'>-	card data to display.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.h: This now backends to a</div><div class='del'>-	ECard instead of a ETableModel.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized</div><div class='del'>-	add method.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of</div><div class='del'>-	e-reflow that allows the data to be sorted on the fly.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-minicard-view.c: New test to test</div><div class='del'>-	the new minicard view.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard</div><div class='del'>-	backend of the e-minicard.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed</div><div class='del'>-	dependencies.  Added new files.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/, addressbook/gui/Makefile.am,</div><div class='del'>-	addressbook/gui/.cvsignore: New directory for addressbook gui</div><div class='del'>-	bits.  Added subdirectories.  Created an initial .cvsignore.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Added code to do</div><div class='del'>-	notification on bookviews when changes in the backend are made.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.h: Added helper functions to</div><div class='del'>-	notify the view about the addition or modification of a single</div><div class='del'>-	card.  Fixed a mistaken extra free.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed</div><div class='del'>-	incorrect parent class.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Made this accept an</div><div class='del'>-	optional parameter that specifies the vcard to add.</div><div class='del'>-</div><div class='del'>-	* configure.in: Replaced widgets/e-minicard/Makefile and</div><div class='del'>-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile</div><div class='del'>-	and addressbook/gui/component/Makefile respectively.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Removed e-minicard since it's being moved</div><div class='del'>-	to addressbook/gui/minicard.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed the border width around tooltips</div><div class='del'>-	and made the main tooltip area yellow.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR</div><div class='del'>-</div><div class='del'>-2000-04-08  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Added Galician (gl).</div><div class='del'>-</div><div class='del'>-2000-04-07  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-	* configure.in: Modified to create camel/providers/smtp/Makefile</div><div class='del'>-</div><div class='del'>-2000-04-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made text tooltips appear in place.</div><div class='del'>-	Iain figured out that to get them to not appear, we hide the</div><div class='del'>-	tooltip when the mouse leaves the tooltip window, not the canvas</div><div class='del'>-	item (this works because the tooltip window always covers the</div><div class='del'>-	canvas item completely.)</div><div class='del'>-</div><div class='del'>-2000-04-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook.c (control_activate_cb): New</div><div class='del'>-	function. Called when the control is (de)activated.</div><div class='del'>-	(control_activate): New function; called when the control is</div><div class='del'>-	activated, and sets up toolbar/menu times.</div><div class='del'>-	(control_deactivate): New function; removes those toolbar/menu</div><div class='del'>-	items.</div><div class='del'>-	(do_nothing_cb): Does nothing :-)</div><div class='del'>-	(addressbook_factory): Hook up to control_activate_cb().</div><div class='del'>-</div><div class='del'>-2000-04-07  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): correctly (well,</div><div class='del'>-	untested) implement.</div><div class='del'>-	(view_destroy): new function.</div><div class='del'>-</div><div class='del'>-2000-04-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:</div><div class='del'>-	Changed calls to e_cell_text_new to match new function signature.</div><div class='del'>-</div><div class='del'>-2000-04-06  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. </div><div class='del'>-</div><div class='del'>-2000-04-05  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Added wombat.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.</div><div class='del'>-	Changed to "fixed" font so that it will work on everyone's</div><div class='del'>-	machine.  Added a white background rectangle.  Made resizing the</div><div class='del'>-	window resize the contained text item.  Changed to using affines</div><div class='del'>-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.</div><div class='del'>-	Set the text in the entries so that they match the original values</div><div class='del'>-	of the displayed text object.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and</div><div class='del'>-	lifetime issues.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.</div><div class='del'>-</div><div class='del'>-	(From a patch by Iain Holmes &lt;ih@csd.abdn.ac.uk&gt;)</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made tooltips look more like the</div><div class='del'>-	underlying text.  Made tooltips show up more consistently.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,</div><div class='del'>-	addressbook/demo/e-test-model.h: Changed this to backend to an</div><div class='del'>-	ebook.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Fixed const correctness and</div><div class='del'>-	changed a couple of functions to be external.</div><div class='del'>-	</div><div class='del'>-	* addressbook/Makefile.am: Fixed subdir ordering.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function</div><div class='del'>-	pointer declarations.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c: Built new iterator system</div><div class='del'>-	for getting fields with multiple entries.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Added new files</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c, and</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h.</div><div class='del'>-</div><div class='del'>-2000-04-04  Yuri Syrota  &lt;rasta@renome.rovno.ua&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added uk to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-04-04  Andreas Hyden  &lt;a.hyden@cyberpoint.se&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added no and sv to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-04-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c: A bit of clean up.</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/ebook/e-book-types.h,</div><div class='del'>-	addressbook/backend/ebook/e-book-view-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-view-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book-view.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-view.h,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.c,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.h: New files for live views.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.h,</div><div class='del'>-	addressbook/backend/ebook/test-client-list.c,</div><div class='del'>-	addressbook/backend/ebook/test-client.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.h,</div><div class='del'>-	addressbook/backend/idl/addressbook.idl: Added live views and</div><div class='del'>-	searching to the interface (neither is working yet.)</div><div class='del'>-</div><div class='del'>-2000-04-01  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test-movemail.</div><div class='del'>-</div><div class='del'>-	* art/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-2000-03-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:</div><div class='del'>-	Added some missing gtk_object_refs.</div><div class='del'>-</div><div class='del'>-2000-03-30  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_build_all_cards_list): Get first card (with</div><div class='del'>-	R_FIRST) on first seq().</div><div class='del'>-</div><div class='del'>-2000-03-30  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.h: new-file</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: new file</div><div class='del'>-</div><div class='del'>-2000-03-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in:</div><div class='del'>-	* Makefile.am:</div><div class='del'>-	* art/Makefile.am: install new shortcut bar pixmaps.</div><div class='del'>-</div><div class='del'>-2000-03-30  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-calendar.png art/evolution-inbox.png </div><div class='del'>-	art/evolution-tasks.png	art/evolution-contacts.png </div><div class='del'>-	art/evolution-notes.png evolution-today.png:</div><div class='del'>-	added some artwork for the main shortcutbar.. someone</div><div class='del'>-	could stick them in it.</div><div class='del'>-</div><div class='del'>-2000-03-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of</div><div class='del'>-	the corba-cursor object by calling CORBA_Object_duplicate on it on</div><div class='del'>-	e-card-cursor creation and calling CORBA_Object_release on</div><div class='del'>-	e-card-cursor destruction.  Also, properly free string returned</div><div class='del'>-	from Evolution_CardCursor_get_nth function.</div><div class='del'>-</div><div class='del'>-2000-03-29  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added</div><div class='del'>-	some debugging.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c: Added inline</div><div class='del'>-	documentation for exposed functions.</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: same.</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: same.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: add calendar compilation back in.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-factory.c</div><div class='del'>-	(PAS_BOOK_FACTORY_GOAD_ID): changed to</div><div class='del'>-	"evolution:addressbook-server".</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: no need to install a</div><div class='del'>-	.gnorba file from here, as the wombat.gnorba file in</div><div class='del'>-	evolution/wombat will do its job.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c (ebook_create): if</div><div class='del'>-	ebook_new fails, print a warning and return.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed</div><div class='del'>-	to "evolution:addressbook-server".</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c: Changed headerfile path.</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: Use relative paths to libraries in the build</div><div class='del'>-	tree, rather than requiring libraries (such as libpcs) to already</div><div class='del'>-	be installed.</div><div class='del'>-</div><div class='del'>-2000-03-28  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.gnorba: Cleaned up.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pcs): filled in the rest.</div><div class='del'>-	</div><div class='del'>-	* Makefile.am: added wombat.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.gnorba: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/.cvsignore: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pcs): fill out this function some.</div><div class='del'>-</div><div class='del'>-	* configure.in: added wombat.</div><div class='del'>-</div><div class='del'>-2000-03-28  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use</div><div class='del'>-	g_new0 to allocate the BonoboObjectServant.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_build_all_cards_list): remove unnecessary</div><div class='del'>-	strdup/free.</div><div class='del'>-</div><div class='del'>-2000-03-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite</div><div class='del'>-	loop.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client-list.c: New test that</div><div class='del'>-	doesn't add an extra database item.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am,</div><div class='del'>-	addressbook/backend/ebook/.cvsignore: Added test-client-list.</div><div class='del'>-</div><div class='del'>-2000-03-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory</div><div class='del'>-	allocation.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory</div><div class='del'>-	allocation.  Made database stuff not do an extra entry.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Add test for</div><div class='del'>-	get_all_cards functionality.  Changed database name to test.db.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object</div><div class='del'>-	to gtk_object in a couple of places.</div><div class='del'>-</div><div class='del'>-2000-03-28  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_create_unique_id): create id's for entries using</div><div class='del'>-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).</div><div class='del'>-	</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c: new test program. Can be used to copy POP</div><div class='del'>-	mail into your evolution inbox.</div><div class='del'>-</div><div class='del'>-2000-03-27  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_get_vcard): remove unneeded g_strdup;</div><div class='del'>-	(get_length): implement function.</div><div class='del'>-	(get_nth): implement function.</div><div class='del'>-	(cursor_destroy): free up the internal glist of vcards, and fix</div><div class='del'>-	warning.</div><div class='del'>-	(pas_backend_file_build_all_cards_list): new function, to build up</div><div class='del'>-	the list of cards in the db.</div><div class='del'>-	(pas_backend_file_process_get_all_cards): call</div><div class='del'>-	pas_backend_file_build_+all_cards_list, and fix warning.</div><div class='del'>-</div><div class='del'>-2000-03-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Added a section to test</div><div class='del'>-	cursors and returning an id when adding.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address</div><div class='del'>-	pairs since they were added to e-card.c.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Made the set_id function take</div><div class='del'>-	a const char *.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.h,</div><div class='del'>-	addressbook/backend/idl/addressbook.idl,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function</div><div class='del'>-	and made the response to the create_card function include the card</div><div class='del'>-	id.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and</div><div class='del'>-	e-card-cursor.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying</div><div class='del'>-	to an Evolution_CardCursor.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and</div><div class='del'>-	pas-card-cursor.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c,</div><div class='del'>-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for</div><div class='del'>-	making an Evolution_CardCursor server.</div><div class='del'>-</div><div class='del'>-2000-03-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c (main): This test is basically now invalid.</div><div class='del'>-	* tests/test11.c (main): Fix for async search api.  Probably works.</div><div class='del'>-	Removed camel-mbox-*.h headers, should be private.</div><div class='del'>-</div><div class='del'>-2000-03-27  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm</div><div class='del'>-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm</div><div class='del'>-	art/priority-high.xpm art/priority-low.xpm</div><div class='del'>-</div><div class='del'>-	Added some new icons for the message-list view..</div><div class='del'>-</div><div class='del'>-2000-03-26  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for db_185.h (present in newer db</div><div class='del'>-	distributions.)</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_create_unique_id): new function.</div><div class='del'>-	(pas_backend_file_process_create_card): call</div><div class='del'>-	pas_backend_file_create_unique_id and pas_book_notify_add (if the</div><div class='del'>-	db-&gt;put was successful).  also, sync out db.</div><div class='del'>-	(pas_backend_file_process_remove_card): call</div><div class='del'>-	pas_book_notify_remove if the db-&gt;del was successful, and sync out</div><div class='del'>-	db.</div><div class='del'>-	(pas_backend_file_process_modify_card): call</div><div class='del'>-	pas_book_notify_change if db-&gt;put was successful, and sync out db.</div><div class='del'>-	(string_to_dbt): new function.</div><div class='del'>-	(pas_backend_file_process_create_card): use string_to_dbt</div><div class='del'>-	(pas_backend_file_process_remove_card): likewise</div><div class='del'>-	(pas_backend_file_process_modify_card): likewise</div><div class='del'>-	(pas_backend_file_get_vcard): likewise</div><div class='del'>-	(pas_backend_file_upgrade_db): new function, to upgrade a db file</div><div class='del'>-	if we change the data format.</div><div class='del'>-	(pas_backend_file_maybe_upgrade_db): check db version vs. current</div><div class='del'>-	code version, and upgrade it necessary.</div><div class='del'>-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Load an ECard instead</div><div class='del'>-	of a VCard and then get the VCard from that ECard.  Just tests</div><div class='del'>-	ECard and the client stuff at the same time.  Also, replaces</div><div class='del'>-	carriage returns with newlines.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.</div><div class='del'>-</div><div class='del'>-2000-03-25  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: create a card and then</div><div class='del'>-	look it up.</div><div class='del'>-</div><div class='del'>-2000-03-26  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_create_card): add db calls to flesh out</div><div class='del'>-	the interface.  hardcoded id that needs to change, once we decide</div><div class='del'>-	how we're going to create it.</div><div class='del'>-	(pas_backend_file_process_remove_card): add db calls to flesh out</div><div class='del'>-	the interface.</div><div class='del'>-	(pas_backend_file_process_modify_card): likewise</div><div class='del'>-	(pas_backend_file_process_check_connection): likewise</div><div class='del'>-	(pas_backend_file_get_vcard): likewise</div><div class='del'>-	(pas_backend_file_load_uri): likewise</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Set the card id properly</div><div class='del'>-	when retrieving a card.</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-sexp.h: Formatting cleanup.</div><div class='del'>-</div><div class='del'>-2000-03-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -&gt; e-sexp.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Added the ability to set the</div><div class='del'>-	card's id (and made getting it work correctly also.)</div><div class='del'>-</div><div class='del'>-2000-03-25  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*</div><div class='del'>-	as second parameter to g_list_remove_link, not the data pointer.</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-types.h: Removed the</div><div class='del'>-	address-&gt;description field.</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: Added VCard output and</div><div class='del'>-	the use of GtkArguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: Updated this to use the</div><div class='del'>-	GtkArguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-2000-03-25  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ebook/e-book.c,</div><div class='del'>-	ebook/e-book.h,	</div><div class='del'>-	ebook/e-book.h,		</div><div class='del'>-	ebook/e-card-fields.h,</div><div class='del'>-	ebook/e-card.h,</div><div class='del'>-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept</div><div class='del'>-	in addressbook/backend/ebook.</div><div class='del'>-</div><div class='del'>-2000-03-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-types.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c: Added parsing and testing</div><div class='del'>-	for name, full name, birthday, telephone, email, and street</div><div class='del'>-	address properties.</div><div class='del'>-</div><div class='del'>-2000-03-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/.cvsignore,</div><div class='del'>-	addressbook/backend/pas/.cvsignore,</div><div class='del'>-	addressbook/backend/idl/.cvsignore,</div><div class='del'>-	addressbook/backend/.cvsignore: Updated .cvsignore files.</div><div class='del'>-</div><div class='del'>-2000-03-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am, configure.in: Added the</div><div class='del'>-	addressbook/backend directory.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/Makefile.am: Removed the libversit directory</div><div class='del'>-	as it's now included in the base evolution directory.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/Makefile.am: Changed the place where</div><div class='del'>-	libversit is looked for.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c: Fixed some</div><div class='del'>-	indentation.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-types.h: Commented out some code</div><div class='del'>-	to get this to compile.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas.c,</div><div class='del'>-	addressbook/backend/ebook/test-client.c: Include gnome.h and</div><div class='del'>-	gnorba.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl</div><div class='del'>-	instead of bonobo-unknown.idl.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/contact-editor/test-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/printing/e-contact-print.c,</div><div class='del'>-	addressbook/printing/test-contact-print-style-editor.c,</div><div class='del'>-	addressbook/printing/test-print.c: Killed some warnings.</div><div class='del'>-</div><div class='del'>-2000-03-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to</div><div class='del'>-	e_canvas_item_grab_focus.</div><div class='del'>-</div><div class='del'>-2000-03-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook-widget.c: Make background pixmap</div><div class='del'>-	get properly set to NULL.</div><div class='del'>-</div><div class='del'>-2000-03-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the</div><div class='del'>-	ability to access the text event processor.</div><div class='del'>-</div><div class='del'>-2000-03-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook-widget.c: Made the addressbook</div><div class='del'>-	component look in the users home directory for the addressbook.xml</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-03-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/.cvsignore: added filter.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/.cvsignore: added test-addressbook.</div><div class='del'>-</div><div class='del'>-2000-03-17 Elliot Lee &lt;sopwith@redhat.com&gt;</div><div class='del'>-	* calendar/cal-client/Makefile.am,</div><div class='del'>-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,</div><div class='del'>-	calendar/pcs/Makefile.am, mail/Makefile.am,</div><div class='del'>-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.</div><div class='del'>-</div><div class='del'>-2000-03-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): build shell before mail, since mail</div><div class='del'>-	relies on the shell idl files being compiled.</div><div class='del'>-</div><div class='del'>-2000-03-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo</div><div class='del'>-	component.  Changed non bonobo version to compile as</div><div class='del'>-	test-addressbook.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook.c,</div><div class='del'>-	addressbook/demo/addressbook.gnorba,</div><div class='del'>-	addressbook/demo/addressbook.h,</div><div class='del'>-	addressbook/demo/addressbook-factory.c,</div><div class='del'>-	addressbook/demo/addressbook-widget.c,</div><div class='del'>-	addressbook/demo/addressbook-widget.h: New factory to create an</div><div class='del'>-	addressbook bonobo component.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/.cvsignore: Added e-text-test.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/e-test-model.c,</div><div class='del'>-	addressbook/demo/e-test-model.h: A model storing data in an array</div><div class='del'>-	of Address objects.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c: Changed to use</div><div class='del'>-	addressbook/demo/e-test-model.c and</div><div class='del'>-	addressbook/demo/e-test-model.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am: Added e-test-model.c and</div><div class='del'>-	e-test-model.h.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New</div><div class='del'>-	object which stores a piece of text data.  All methods are</div><div class='del'>-	virtual.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this</div><div class='del'>-	to use an ETextModel for its data.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/test-minicard-label.c: Made this work again.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to</div><div class='del'>-	get its data.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h: Added the ability to set</div><div class='del'>-	the text model used for the contained text widget.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard</div><div class='del'>-	is now dependent on an e-table-model for its data.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo, addressbook/demo/.cvsignore,</div><div class='del'>-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,</div><div class='del'>-	addressbook/demo/spec: A new program to test ETable and EMinicard</div><div class='del'>-	integration.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/demo/Makefile.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am: Added the demo/ subdirectory.</div><div class='del'>-</div><div class='del'>-2000-03-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h,</div><div class='del'>-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,</div><div class='del'>-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use</div><div class='del'>-	the new e-canvas reflow system.</div><div class='del'>-</div><div class='del'>-2000-03-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a</div><div class='del'>-	"break_characters" argument.  It lets you define a set of</div><div class='del'>-	characters which should cause optional linebreaks to occur.  Made</div><div class='del'>-	setting the "clip_height" argument to -1 mean no height clipping.</div><div class='del'>-	Moved calling the "resize" signal into an idle handler to avoid</div><div class='del'>-	reentering the canvas update loop.  Made EText recalc bounds if</div><div class='del'>-	the affine has changed.  Fixed up tooltip_count (this counts the</div><div class='del'>-	number of ENTER and LEAVE events.)</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and</div><div class='del'>-	"y" to set the children's position to using</div><div class='del'>-	e_canvas_item_move_absolute.</div><div class='del'>-</div><div class='del'>-2000-03-05  Matt Loper  &lt;matt.loper@splashtech.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Commenting added.</div><div class='del'>-	(on_url_data_requested): renamed from "on_url_requested", to</div><div class='del'>-	reflect that a stream of data is what's actually being asked for.</div><div class='del'>-	(hydrate_persist_stream_from_gstring): New function.</div><div class='del'>-	(camel_stream_to_gstring): New function.</div><div class='del'>-	(on_object_requested): Cleaned up.</div><div class='del'>-</div><div class='del'>-2000-03-04  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am: add bonobo to the build </div><div class='del'>-	process.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (main): </div><div class='del'>-	initialize Bonobo. Use bonobo_main.</div><div class='del'>-	(get_gtk_html_contents_window): set signal handlers</div><div class='del'>-	for url requests and objects requests.</div><div class='del'>-	(on_object_requested): answer to object requests.</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (main): initialize</div><div class='del'>-	gdkrgb. Push visual/colormap.</div><div class='del'>-	(on_url_requested): in the case where a camel url is requested, </div><div class='del'>-	write the camel stream to gtkhtml. </div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (filter_LDADD): add</div><div class='del'>-	gnomeprint in the lib list. </div><div class='del'>-</div><div class='del'>-2000-03-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.</div><div class='del'>-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values</div><div class='del'>-	for linking with GtkHTML.</div><div class='del'>-</div><div class='del'>-2000-03-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,</div><div class='del'>-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the</div><div class='del'>-	list of files to generate.</div><div class='del'>-</div><div class='del'>-2000-02-29  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being</div><div class='del'>-	editted or isn't clipped. Remove the tooltip when editting starts.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Build the test program</div><div class='del'>-</div><div class='del'>-2000-02-29  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data</div><div class='del'>-	files for test program.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/filter.c (main): Test program for filter ui.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to</div><div class='del'>-	eutil.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Build e-util before other stuff.</div><div class='del'>-	(SUBDIRS): Build filter after camel.</div><div class='del'>-</div><div class='del'>-2000-02-28  Chris Lahey  &lt;clahey@umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Compilation error.</div><div class='del'>-</div><div class='del'>-2000-02-28  Chris Lahey  &lt;clahey@umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these</div><div class='del'>-	to use the canvas ::update system properly.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h:</div><div class='del'>-	* configure.in: define SENDMAIL_PATH with the path to sendmail.</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,</div><div class='del'>-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,</div><div class='del'>-	e-text-event-processor-emacs-like.h,</div><div class='del'>-	e-text-event-processor-types.h: This were moved to widgets/e-text/</div><div class='del'>-	a while ago but never removed.  They have now been removed.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some</div><div class='del'>-	warnings from this file.  Made tooltips disappear when you're</div><div class='del'>-	finished with them.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/test-reflow.c,</div><div class='del'>-	widgets/e-minicard/test-minicard.c,</div><div class='del'>-	widgets/e-minicard/test-minicard-label.c: Commented out unused</div><div class='del'>-	about_callback functions.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to</div><div class='del'>-	its e-minicard children.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return</div><div class='del'>-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return</div><div class='del'>-	an EFocus for its "has_focus" argument.  Made the font that</div><div class='del'>-	e-minicard-label uses only be allocated once.</div><div class='del'>-	</div><div class='del'>-2000-02-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): stop</div><div class='del'>-	sscanf() abuse.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: changed references to libibex.a to</div><div class='del'>-	libibex.la.</div><div class='del'>-</div><div class='del'>-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.</div><div class='del'>-	* libical/src/libicalss/.cvsignore: same.</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test11.</div><div class='del'>-</div><div class='del'>-	* libical/Makefile.in: autogenerated file removed from cvs, and</div><div class='del'>-	added to .cvsignore.</div><div class='del'>-	* libical/src/Makefile.in: same.</div><div class='del'>-	* libical/src/libical/Makefile.in: same.</div><div class='del'>-	* libical/src/libicalss/Makefile.in: same.</div><div class='del'>-</div><div class='del'>-2000-02-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): </div><div class='del'>-	uggly hack to test part saving and</div><div class='del'>-	b64 streams.</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c:</div><div class='del'>-	* tests/test11.c: update for camel changes</div><div class='del'>-</div><div class='del'>-2000-02-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Changed dependencies on libibex.la to</div><div class='del'>-	libibex.a. In test9_LDADD, placed libcamelmbox.la before</div><div class='del'>-	libibex.la, as the former requires the latter.</div><div class='del'>-</div><div class='del'>-2000-02-20  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,</div><div class='del'>-	in a tooltip style.</div><div class='del'>-	(e_text_event): Add a timeout on the Enter and remove it on the Leave</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-	* e-text-test.c: New file to test e-text items.</div><div class='del'>-	</div><div class='del'>-2000-02-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: added ABOUT-NLS.  </div><div class='del'>-	* ABOUT-NLS: removed.</div><div class='del'>-	</div><div class='del'>-2000-02-19  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link</div><div class='del'>-	is clicked, indicate the link with a dialog.</div><div class='del'>-</div><div class='del'>-	* libical/src/test/.cvsignore: Added Makefile.</div><div class='del'>-</div><div class='del'>-	* libical/.cvsignore: Added Makefile, configure, config.status.</div><div class='del'>-</div><div class='del'>-	* libical/src/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/Makefile: autogenerated file removed from cvs.</div><div class='del'>-	* libical/configure: same. </div><div class='del'>-	* libical/config.status: same.</div><div class='del'>-	* libical/src/Makefile: same.</div><div class='del'>-	* libical/src/test/Makefile: same.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,</div><div class='del'>-	minicard-test, and reflow-test.</div><div class='del'>-</div><div class='del'>-	* shell/.cvsignore: added files autogenerated from Evolution.idl.</div><div class='del'>-</div><div class='del'>-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,</div><div class='del'>-	vcaltmp.lo, libversit.la</div><div class='del'>-</div><div class='del'>-	* libical/src/test/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/src/libical/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/src/libicalss/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/.cvsignore: New file, with config.log in it.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: minor cleanup.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/.cvsignore: added message-browser.</div><div class='del'>-</div><div class='del'>-2000-02-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): Use a relative path to the mbox provider</div><div class='del'>-	module.</div><div class='del'>-</div><div class='del'>-2000-02-18  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call</div><div class='del'>-	camel_data_wrapper_set_input_stream, rather than</div><div class='del'>-	camel_data_wrapper_construct_from_stream.  For the whole message,</div><div class='del'>-	allow someone to see the header ("to", "from", etc.).  Clicking on</div><div class='del'>-	tree items to see their elements, now works also.</div><div class='del'>-</div><div class='del'>-2000-02-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make gnomeui the last library on the command line,</div><div class='del'>-	as its path is the one most likely to hold other old libraries</div><div class='del'>-	(libxml) and we need newer versions.</div><div class='del'>-	</div><div class='del'>-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the</div><div class='del'>-	AC_CONFIG_SUBDIRS </div><div class='del'>-</div><div class='del'>-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to</div><div class='del'>-	go before we rquery them. </div><div class='del'>-</div><div class='del'>-	Use the new method for gnome-print</div><div class='del'>-	checking instead of the old crufty gtk+ based one that nobody can</div><div class='del'>-	debug.  ever.</div><div class='del'>-	</div><div class='del'>-2000-02-16  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (tree_selection_changed): New</div><div class='del'>-	callback function, which will later change the main html window to</div><div class='del'>-	reflect the newly-selected tree item.</div><div class='del'>-	(get_gtk_html_contents_window): New function. Gets the content</div><div class='del'>-	part of a message.</div><div class='del'>-	(get_gtk_html_header_window): New function. Will get the header</div><div class='del'>-	part of a message, when applicable.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (str_tolower): Now returns a new string,</div><div class='del'>-	rather than changing it in place.</div><div class='del'>-	(initialize_camel_formatter): New function; gives a root</div><div class='del'>-	CamelDataWrapper and a stream to a CamelFormatter.</div><div class='del'>-	(camel_formatter_wrapper_to_html): New function. Translates any</div><div class='del'>-	CamelDataWrapper into html.</div><div class='del'>-	(lookup_unique_id): Allows the root object to be a</div><div class='del'>-	CamelDataWrapper, which is more general than the previously</div><div class='del'>-	required CamelMimeMessage.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-14  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.</div><div class='del'>-</div><div class='del'>-2000-02-13  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added check for libunicode.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added libibex.</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): New test, tests search api.</div><div class='del'>-</div><div class='del'>-2000-02-13  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which</div><div class='del'>-	crashes message-browser.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a</div><div class='del'>-	CamelMimeMessage as a param, rather than a filename.</div><div class='del'>-	(main): Puts our windows in an hpane rather than a vbox. Also</div><div class='del'>-	opens a file dlg box if a filename wasn't given as a first param.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs-&gt;fd to</div><div class='del'>-	-1 if we fail to load the file.</div><div class='del'>-	(camel_stream_fs_new_with_name): If stream_fs-&gt;fd is -1, return</div><div class='del'>-	NULL. These changes make it so that a CamelStreamFs won't be</div><div class='del'>-	created if you give it a bogus filename; they may be replaced once</div><div class='del'>-	exception handling is in place.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree</div><div class='del'>-	items.</div><div class='del'>-	(mime_message_to_html): New function; translates a</div><div class='del'>-	CamelMimeMessage into two strings (one for the header, and one for</div><div class='del'>-	the body).</div><div class='del'>-	(get_gtk_html_window): New function; fills out a window with</div><div class='del'>-	html. The html is taken from a processed rfc822 file, via a</div><div class='del'>-	CamelFormatter.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Added assertions.</div><div class='del'>-	(handle_text_html): Don't call text_to_html on something that's</div><div class='del'>-	already html.</div><div class='del'>-	(multipart_foreach): function deleted.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Added preliminary support for</div><div class='del'>-	the viewing of messages via gtkhtml. Lots of commenting. </div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Fixed the</div><div class='del'>-	location the first time you see the drop down menus for changing</div><div class='del'>-	which phone, email, or snail mail address you see.</div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text</div><div class='del'>-	widget set the cursor properly.</div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.h: Removed some arguments from the .h that</div><div class='del'>-	will never be implemented.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): </div><div class='del'>-	default the text/* mime types to CamelSimpleDataWrapper so</div><div class='del'>-	that Michael can use get_stream. </div><div class='del'>-</div><div class='del'>-2000-02-10  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: The superclass is</div><div class='del'>-	actually a seekable stream, not just a stream.</div><div class='del'>-</div><div class='del'>-2000-02-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't </div><div class='del'>-	build thread related tests if evolution has been</div><div class='del'>-	compiled with no thread support.</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): allow user to enable/disable</div><div class='del'>-	thread support at configure time</div><div class='del'>-	(EXTRA_GNOME_CFLAGS): </div><div class='del'>-	(EXTRA_GNOME_LIBS): thread support is directly </div><div class='del'>-	included in this variable if enabled. No more</div><div class='del'>-	EXTRA_GNOME_CFLAGS_THREADS</div><div class='del'>-	Other special support should be added in </div><div class='del'>-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS</div><div class='del'>-	instead of redefining a new variable </div><div class='del'>-	each time we want to add a new lib. </div><div class='del'>-	(bonobo, ....)</div><div class='del'>-</div><div class='del'>-	* camel/camel.c (camel_init): only try to initialize threads if</div><div class='del'>-	we enabled threads support. </div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use</div><div class='del'>-	EXTRA_GNOME_LIBS</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): remove HAVE_PTHREADS</div><div class='del'>-	variable. Define ENABLE_THREADS instead.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS</div><div class='del'>-	to test if we build thread relateed code. </div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, </div><div class='del'>-	not EXTRA_GNOME_LIBS_THREADS</div><div class='del'>-</div><div class='del'>-2000-02-10  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre</div><div class='del'>-	comparison construct for converting case.</div><div class='del'>-</div><div class='del'>-2000-02-09  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):</div><div class='del'>-	Uses case-insensitive compares.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_new): Uses</div><div class='del'>-	case-insensitive compares.</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):</div><div class='del'>-	Use case-insensitive mime types.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the</div><div class='del'>-	copy source address to match the data read offset.</div><div class='del'>-	(seek): Actually implement the seek.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,</div><div class='del'>-	DONT update the total bytes, and try and truncate the array in</div><div class='del'>-	reverse.  Eek.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):</div><div class='del'>-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp</div><div class='del'>-	(camel_mime_part_encoding_to_string): Handle the default case.</div><div class='del'>-	: include string.h for strcmp() etc.</div><div class='del'>-</div><div class='del'>-2000-02-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/test-multipart-alt.msg: New test file; run</div><div class='del'>-	message-browser on it, and it will crash.</div><div class='del'>-</div><div class='del'>-2000-02-09  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (handle_tree_item): </div><div class='del'>-	show the item. </div><div class='del'>-	(handle_tree_item): show the containers and the containees</div><div class='del'>-	(get_message_tree_ctrl): call handle_tree_item</div><div class='del'>-	on the message itself</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): </div><div class='del'>-	set the mime type to "mime/message".</div><div class='del'>-	--- THIS IS NOT THE CONTENT TYPE ---</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): </div><div class='del'>-	set the mime type to "body-part". </div><div class='del'>-	--- THIS IS NOT THE CONTENT TYPE ---</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): </div><div class='del'>-	mime_type is const. </div><div class='del'>-	(_set_input_stream): really set the input stream</div><div class='del'>-	(_set_output_stream): really set the output stream</div><div class='del'>-	various other typo fixes.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: various typo</div><div class='del'>-	fixes in the ctree construction. </div><div class='del'>-</div><div class='del'>-	* camel/string-utils.c (string_trim): fix braindead</div><div class='del'>-	trailing trim bug.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): </div><div class='del'>-	strip the leading and trailing quotes when constructing the </div><div class='del'>-	content field. This should be done in a more generic </div><div class='del'>-	RFC822 approach, but this fixes a bug that prevent</div><div class='del'>-	matt from analysing some multipart messages.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: reorganize the </div><div class='del'>-	deprecated and new methods. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	Use "From " as the message separating string. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): </div><div class='del'>-	set the mode when creating the mbox file. 	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	ditto</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-2000-02-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor</div><div class='del'>-	cleanup.</div><div class='del'>-</div><div class='del'>-2000-02-09  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually</div><div class='del'>-	initialise the class.  It simple couldn't have worked before.</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): Commented out code</div><div class='del'>-	which crashes just to get something working, memory corruption??</div><div class='del'>-</div><div class='del'>-2000-02-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add new Makefiles to Makefile list.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Build libetext.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am: Build libeminicard and test</div><div class='del'>-	programs.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Remove all e-text and e-minicard code and</div><div class='del'>-	add them to the SUBDIRS list.</div><div class='del'>-</div><div class='del'>-2000-02-08  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: New file; shows a message in</div><div class='del'>-	tree format, where multipart's have multiple leaves.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Changed references from</div><div class='del'>-	'multipart/alternate' to 'multipart/alternative'.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (convert_to_html_and_print): Use the</div><div class='del'>-	buffer length of the stream to create strings which are then</div><div class='del'>-	printed, rather than printing the stream (which might not have a</div><div class='del'>-	trailing \0) directly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (str_tolower): New function; makes a</div><div class='del'>-	string lowercase.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call</div><div class='del'>-	to 'camel_formatter_mime_message_to_html' to contain correct</div><div class='del'>-	params.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',</div><div class='del'>-	'attachments', will be used to let the caller know which items</div><div class='del'>-	should be treated as attachments (as opposed to objects which are</div><div class='del'>-	inline to the body).</div><div class='del'>-	(text_to_html): name changed from 'encode_entities'. Also now</div><div class='del'>-	converts newlines to &lt;br&gt; tags.</div><div class='del'>-	(camel_formatter_mime_message_to_html): Now takes two output</div><div class='del'>-	streams -- one for the header, and one for the body.</div><div class='del'>-	(get_bonobo_tag_for_object): New function; tries to make a tag out</div><div class='del'>-	of (1) the leaf of a mime message and (2) a bonobo object that can</div><div class='del'>-	handle its mime type, but can return NULL if it fails to find the</div><div class='del'>-	mime type.</div><div class='del'>-	(handle_vcard): New function; will write out a vcard as html.</div><div class='del'>-</div><div class='del'>-2000-02-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max</div><div class='del'>-	number of lines (max number of lines is only obeyed if text is not</div><div class='del'>-	being edited).</div><div class='del'>-</div><div class='del'>-2000-02-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.c: Removed an unneccessary</div><div class='del'>-	include of libhnj.  All uses of libhnj are commented out.</div><div class='del'>-</div><div class='del'>-2000-02-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (mime_part_to_html): function deleted.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (print_usage_and_quit): New function,</div><div class='del'>-	which gives usage information.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: made the 'stream' a member of the</div><div class='del'>-	CamelFormatter class, so that streams don't have to be explicitly</div><div class='del'>-	sent as a param where a CamelFormatter is also sent..</div><div class='del'>-	(handle_text_plain): Use 'encode_entities' to change '&lt;' to</div><div class='del'>-	'&amp;gt;', etc.</div><div class='del'>-</div><div class='del'>-2000-02-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): </div><div class='del'>-	(mime_part_to_html): typo fix : </div><div class='del'>-	use find_preferred_displayable_body_part_in_multipart_alternative</div><div class='del'>-	instead of the other names. Allows camel to have no undefined symbols. </div><div class='del'>-</div><div class='del'>-2000-02-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c: New file; intended to test the</div><div class='del'>-	CamelFormatter class.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new</div><div class='del'>-	functions, and a really basic skeleton for getting bonobo objects</div><div class='del'>-	into the html.</div><div class='del'>-	(encode_entities): New function, stolen from Daniel Velliard.</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print-style-editor.h,</div><div class='del'>-	addressbook/printing/e-contact-print-style-editor.c,</div><div class='del'>-	addressbook/printing/test-contact-print-style-editor.c: Files to</div><div class='del'>-	load the contact print style editor from the glade file.  Doesn't</div><div class='del'>-	really do anything yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/Makefile.am: Added style editor stuff.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.glade: Changed a bit.</div><div class='del'>-	Fixed an out of place widget.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/.cvsignore: Added</div><div class='del'>-	contact-print-style-editor-test.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/smallbook.ecps: Fixed up the values to</div><div class='del'>-	match the new types.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/medbook.ecps,</div><div class='del'>-	addressbook/printing/phonelist.ecps: Added two new printing</div><div class='del'>-	styles.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.h: Fixed an incorrect</div><div class='del'>-	comment.</div><div class='del'>-	</div><div class='del'>-	* addressbook/printing/e-contact-print.c: Added columns and letter</div><div class='del'>-	tabs.  Tweaked spacing all over the place.  Fixed card height</div><div class='del'>-	function so that column wrapping is always done correctly.  Added</div><div class='del'>-	pulling of style information from a file.  Added line wrapping</div><div class='del'>-	within each text field.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print-types.h: Added a type field</div><div class='del'>-	for different types of print styles.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab</div><div class='del'>-	command instead of doing focus by hand.  This fixes a problem</div><div class='del'>-	related to the scroll wheel.</div><div class='del'>-	(e_text_command): Reset the blink timer in many more command</div><div class='del'>-	situations so that the cursor blinks less when you're interacting</div><div class='del'>-	with it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus</div><div class='del'>-	command when starting a selection and the ungrab focus command</div><div class='del'>-	when ending it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h: Added grab command type</div><div class='del'>-	so that the event processor can tell the widget to grab the focus.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c: Redefined all sizes using #defines so that</div><div class='del'>-	they can be tweaked later.  Added scroll wheel handling and set up</div><div class='del'>-	adjustment increments so that the scroll bars will work correctly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.h: Added minicard focus type enum.  This</div><div class='del'>-	doesn't mean anything yet, but it will later be used to say which</div><div class='del'>-	direction the focus is coming from (below for shift-tab, above for</div><div class='del'>-	tab.)</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use</div><div class='del'>-	e_canvas_item_grab_focus so that it will work with old versions of</div><div class='del'>-	gnome-canvas.</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around</div><div class='del'>-	focus bugs.</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Set the minimum_width.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column</div><div class='del'>-	line so that the right edge of the reflow will have a line.  Also</div><div class='del'>-	added a minimum_width so that even if the reflow is thinner than</div><div class='del'>-	the window, when you resize it larger all the lines are drawn.</div><div class='del'>-</div><div class='del'>-2000-01-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor</div><div class='del'>-	for the draggable columns.  Made the clickable column area</div><div class='del'>-	larger.  </div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for</div><div class='del'>-	the text item when it is editable.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Forward enter and leave</div><div class='del'>-	notifications to the contained editable text item.</div><div class='del'>-</div><div class='del'>-2000-01-26  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: By looking up a mimetype in a</div><div class='del'>-	hashtable, we can now get a handler function for an arbitrary</div><div class='del'>-	mimetype.</div><div class='del'>-</div><div class='del'>-2000-01-25  Mathieu Lacage &lt;mathieu@advogato.org&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore s: cvs shutup. </div><div class='del'>-</div><div class='del'>-2000-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab</div><div class='del'>-	properly now.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Reindented some areas.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to</div><div class='del'>-	NULL for the canvas so that scrolling won't flash grey.</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass</div><div class='del'>-	GnomeCanvas to work around a few bugs so that evolution will work</div><div class='del'>-	well with old versions of gnome-libs.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade: Not much</div><div class='del'>-	change.  Mostly internal reorganization by glade itself.</div><div class='del'>-</div><div class='del'>-2000-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/smallbook.ecps: Example contact printing</div><div class='del'>-	style.  Not used yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.glade: A glade file for</div><div class='del'>-	editing contact printing styles.  Not used yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/test-print.c: Test file for printing.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.c,</div><div class='del'>-	addressbook/printing/e-contact-print.h,</div><div class='del'>-	addressbook/printing/e-contact-print-types.h,</div><div class='del'>-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:</div><div class='del'>-	New files for contact printing support.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am (SUBDIRS): Add printing.</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gnome-print.  Build the</div><div class='del'>-	addressbook/printing Makefile.</div><div class='del'>-</div><div class='del'>-2000-01-24  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	* camel/camel-data-wrapper.c </div><div class='del'>-	(_set_input_stream): </div><div class='del'>-	(_get_input_stream): </div><div class='del'>-	(_set_output_stream): </div><div class='del'>-	(_get_output_stream): </div><div class='del'>-	The CamelDataWrapper can now be provided with input and</div><div class='del'>-	output streams, so that nothing has to be kept in memory. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream.c (camel_stream_class_init): </div><div class='del'>-	added the "data_available" signal.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added the gnome-pilot and capplet checks; they</div><div class='del'>-	will likely be reworked for the Evolution framework, but for now</div><div class='del'>-	the calendar/ directory needs them.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added checks for gnome-vfs.</div><div class='del'>-</div><div class='del'>-2000-01-24  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c: </div><div class='del'>-	* camel/camel-seekable-stream.h: </div><div class='del'>-	new files. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	* camel/camel-stream-buffered-fs.h: idem</div><div class='del'>-	* camel/camel-stream-buffered-fs.c: idem</div><div class='del'>-	* camel/camel-stream-mem.h: idem</div><div class='del'>-	* camel/camel-stream-mem.c: idem</div><div class='del'>-	(_seek): change declaration</div><div class='del'>-	* camel/camel-stream-fs.c: parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	(_seek): change declaration</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h: parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.[ch]: converted all </div><div class='del'>-	gint64 variables into guint32. </div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (_read): fix stupid bug.</div><div class='del'>-	(_write): ditto. </div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_new): don't</div><div class='del'>-	forget to clean the exception when creating it. </div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_table_add_list): </div><div class='del'>-	add recipient_list to the recipients, not recipients_list. </div><div class='del'>-	I don't know what that variable was doing here. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (write_header_info_to_stream): new</div><div class='del'>-	function, broken out from 'camel_formatter_make_html'.</div><div class='del'>-	(write_mimepart_to_stream): same.</div><div class='del'>-	(find_text_body_part_in_multipart_related): new function.</div><div class='del'>-	(camel_formatter_make_html): Now tries to deal with</div><div class='del'>-	multipart/related, multipart/alternate, and text/(plain|html).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-23  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (camel_store_get_session): </div><div class='del'>-	added a public get_session method.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(camel_mbox_load_summary): load/save message sizes in the summary file</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.h: </div><div class='del'>-	added a size field to the message information </div><div class='del'>-	structure. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	copy message size to the mbox summary information too. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (_seek): updated to </div><div class='del'>-	work with bounded fs streams. </div><div class='del'>-	(_write): ditto.</div><div class='del'>-	(_read): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h (struct ): </div><div class='del'>-	added the cur_pos, inf_bound and sup_bound</div><div class='del'>-	members to allow for bounded fs stream. </div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_set_bounds): new func.</div><div class='del'>-	(_init_with_fd_and_bounds): idem.</div><div class='del'>-	(_init_with_name_and_bounds): idem. </div><div class='del'>-	New functions to allow the usage of bounded fs streams.</div><div class='del'>-</div><div class='del'>-	The bounded fs stream allow, for example, to make a stream</div><div class='del'>-	from a message stored in an mbox file. </div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-2000-01-22  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	use the real summary file path instead of a </div><div class='del'>-	stupid hardcoded one. Fixes yet another bug.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	don't forget to copy the date too. Fix a very annoying bug.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): </div><div class='del'>-	implemented. A lot of fixes too. Works now. </div><div class='del'>-	(_get_uid_list): implemented.</div><div class='del'>-</div><div class='del'>-2000-01-21  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c:</div><div class='del'>-	test the mbox provider. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	if camel_folder_get_mode returns an</div><div class='del'>-	exception, return it instead of</div><div class='del'>-	overriding it with a new one.</div><div class='del'>-	(camel_folder_is_open): make the is_open</div><div class='del'>-	method public.</div><div class='del'>-	(_set_name): use the is_open instead of</div><div class='del'>-	get_mode.</div><div class='del'>-	(_set_name): set the fullname even in the case </div><div class='del'>-	where the folder has no parent.</div><div class='del'>-	(_set_name): use %c, not %d to add the </div><div class='del'>-	separator char into the full path.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: add exception handling everywhere in</div><div class='del'>-	the store related functions arguments. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c: idem</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.h: idem</div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.h: idem</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): </div><div class='del'>-	added camel-mbox-provider.c to the mbox provider</div><div class='del'>-	sources. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	provider registration code.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented</div><div class='del'>-	(_append_message): implemented</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): </div><div class='del'>-	use \0 to mark the end of the buffer.</div><div class='del'>-	(read_next_buffer_chunk): ditto.</div><div class='del'>-	(read_header): test the presence of a \0 instead of</div><div class='del'>-	reading the eof field</div><div class='del'>-	(read_message_begining): idem.</div><div class='del'>-	(camel_mbox_parse_file): idem.</div><div class='del'>-	Remove the eof field from the parser</div><div class='del'>-	structure. </div><div class='del'>-	(read_next_buffer_chunk): removed some nasty bugs</div><div class='del'>-	again. </div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-2000-01-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not</div><div class='del'>-	go here.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added yacc requirements for libversit.</div><div class='del'>-</div><div class='del'>-2000-01-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (camel_formatter_make_html): added a</div><div class='del'>-	CamelMimeMessage as a param to this function, and removed it as a</div><div class='del'>-	member of the object.</div><div class='del'>-</div><div class='del'>-2000-01-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added libversit/Makefile and</div><div class='del'>-	calendar/Makefile.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added libversit and calendar.</div><div class='del'>-</div><div class='del'>-2000-01-20  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	compute and return the file size. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c, camel/camel-formatter.h: New</div><div class='del'>-	files. You'll be able to use a CamelFormatter to get</div><div class='del'>-	html-formatted versions of a CamelMimeMessage.</div><div class='del'>-	</div><div class='del'>-2000-01-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h: Changed some line</div><div class='del'>-	spacing.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Connected to the resize signal of the</div><div class='del'>-	reflow.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c: Made width argument set function only</div><div class='del'>-	update if width is different.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/test-editor.c: Open two dialogs for</div><div class='del'>-	more interesting testing.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.h,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Modified to use</div><div class='del'>-	glade.  Added menus to change which phone/address/email entries to</div><div class='del'>-	view.  Added images to the dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor-strings.h,</div><div class='del'>-	addressbook/contact-editor/contact-editor.glade: Glade files for</div><div class='del'>-	the contact editor dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: Added images and added</div><div class='del'>-	glade stuff.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/arrow.png,</div><div class='del'>-	addressbook/contact-editor/briefcase.png,</div><div class='del'>-	addressbook/contact-editor/netfreebusy.png,</div><div class='del'>-	addressbook/contact-editor/netmeeting.png: Image files for the</div><div class='del'>-	contact editor dialog.</div><div class='del'>-</div><div class='del'>-2000-01-19  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(camel_mbox_load_summary): save/load the next uid. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	Compute the next available uid. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_create): </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	Set and use the next_uid field properly. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.h: added</div><div class='del'>-	an extra field to store the next available uid. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	routine called when the folder is opened. </div><div class='del'>-	Reads or creates the summary file. </div><div class='del'>-	(_create): initialize the internal summary </div><div class='del'>-	structure. </div><div class='del'>-	(_close): save the summary file on closing. </div><div class='del'>-	(_init_with_store): initialize mbox specific</div><div class='del'>-	folder members. </div><div class='del'>-</div><div class='del'>-2000-01-18  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c:</div><div class='del'>-	tests for summary and parsing process of mbox files. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do</div><div class='del'>-	not use case insensitive comp to detect message separators. Kill </div><div class='del'>-	some nasty bugs in netscape file parsing,</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	don't use g_array_append but write directly inside the</div><div class='del'>-	array data instead. Better performance and bug fix. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): </div><div class='del'>-	fix the name and bugs. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.h: update the class</div><div class='del'>-	method definition to match the public defs. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(mbox_load_summary): summary file read/write routines. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	routine to construct the summary after the mbox</div><div class='del'>-	file has been parsed and the x-evolution fields</div><div class='del'>-	inserted. </div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	dont use the x_evolution field but rather the uid to </div><div class='del'>-	determine the presence of "X-Evolution" in the mail. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	parse the status and uid values if the x-evolution</div><div class='del'>-	has been found. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): </div><div class='del'>-	return the parsed status field correctly. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.h: </div><div class='del'>-	fixed bad prototype.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	parse and store the "To:" header.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	added a "to" field </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.c: </div><div class='del'>-	create the arrays here. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.h: the list of </div><div class='del'>-	summary information is no longer a GList but </div><div class='del'>-	rather a GArray.</div><div class='del'>-</div><div class='del'>-2000-01-17  Chrsitopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* head.png, phone.png, email.png, web.png, snailmail.png: Images</div><div class='del'>-	for e-contact-editor.c.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/text-editor.c: Test program</div><div class='del'>-	for contact editor widget.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.h: Contact editor</div><div class='del'>-	widget files.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/.cvsignore,</div><div class='del'>-	addressbook/contact-editor/Makefile.am: New directory for contact</div><div class='del'>-	editor files.</div><div class='del'>-</div><div class='del'>-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory</div><div class='del'>-	for addressbook files.</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: Added reflow-test.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.</div><div class='del'>-</div><div class='del'>-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from</div><div class='del'>-	SUBDIRS since the lack of content was preventing it from</div><div class='del'>-	compiling.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.</div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c (main): test for the mbox utils.</div><div class='del'>-</div><div class='del'>-2000-01-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config</div><div class='del'>-	invocations.</div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	(copy_file_chunk): </div><div class='del'>-	(camel_mbox_xev_write_header_content): </div><div class='del'>-	(string_to_flag): </div><div class='del'>-	(flag_to_string): </div><div class='del'>-	(string_to_uid): </div><div class='del'>-	(uid_to_string): </div><div class='del'>-	A bunch of new funcs to handle x-evolution </div><div class='del'>-	private header field. </div><div class='del'>-	(copy_file_chunk): fixed a nasty bug. </div><div class='del'>-	(camel_mbox_write_xev): create the copy file descriptor</div><div class='del'>-	with the proper arguments. Exceptions implememnted.</div><div class='del'>-	(camel_mbox_write_xev): changed the way bytes are counted. </div><div class='del'>-	No more uses the message size cause it did not take into</div><div class='del'>-	account the message separators characters. </div><div class='del'>-	(camel_mbox_write_xev): hopefully fixed the last bugs. </div><div class='del'>-	works ok now. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-01-15  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): </div><div class='del'>-	store the end of headers position. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	added the end_of_header_position to locate the </div><div class='del'>-	begining of the mail body. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): </div><div class='del'>-	(string_to_uid): </div><div class='del'>-	(flag_to_string): </div><div class='del'>-	(string_to_flag): </div><div class='del'>-	new functions to handle uids and</div><div class='del'>-	flags in the X-Evolution header. </div><div class='del'>-	(camel_mbox_xev_parse_header_content): </div><div class='del'>-	new function to parse an X-Evolution </div><div class='del'>-	header. </div><div class='del'>-	(camel_mbox_xev_write_header_content): </div><div class='del'>-	new function to write the X-Evolution </div><div class='del'>-	header. </div><div class='del'>-</div><div class='del'>-2000-01-13  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): </div><div class='del'>-	eof is true when no more chars are available, not </div><div class='del'>-	when we've read the entire file. </div><div class='del'>-	(initialize_buffer): ditto.</div><div class='del'>-	(read_message_begining): documented.</div><div class='del'>-	(read_header): ditto.</div><div class='del'>-	(new_message_detected): ditto.</div><div class='del'>-	(advance_n_chars): ditto.</div><div class='del'>-	(goto_next_char): ditto.</div><div class='del'>-	(read_next_buffer_chunk): ditto.</div><div class='del'>-	(initialize_buffer): ditto.</div><div class='del'>-	(parser_free): ditto.</div><div class='del'>-	(new_parser): ditto.</div><div class='del'>-</div><div class='del'>-2000-01-12    &lt;clahey@galapagos.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,</div><div class='del'>-	widgets/e-text.h: Added selection and clipboard support.  Added up</div><div class='del'>-	and down arrow keys.  Fixed choice of font colors for the</div><div class='del'>-	selection to be based on the current style.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed</div><div class='del'>-	the fake information added.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Forward mouse events to the field</div><div class='del'>-	EText item.</div><div class='del'>-</div><div class='del'>-2000-01-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:</div><div class='del'>-	e_canvas_item_move_absolute is just a helper function not supplied</div><div class='del'>-	by the gnome_canvas.[ch] I put it here so that multiple items can</div><div class='del'>-	use it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a</div><div class='del'>-	number of other items and places them into multiple columns.  The</div><div class='del'>-	items contained must support a number of arguments and signals to</div><div class='del'>-	allow the reflow to interact with them.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: This is a test program for e-reflow.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn</div><div class='del'>-	selected text.  Added some preliminary code for X selection</div><div class='del'>-	handling and cut &amp; paste.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS</div><div class='del'>-	handling.  Made label display random for more interesting tests of</div><div class='del'>-	multiple cards.  Tweaked sizing information for better display.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added</div><div class='del'>-	ARG_HAS_FOCUS handling.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added the reflow test and reflow files.</div><div class='del'>-</div><div class='del'>-2000-01-12  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): </div><div class='del'>-	Added the prototype of camel_mbox_parse_file. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	updated in-line documentation.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): </div><div class='del'>-	remove non updated tests from the build </div><div class='del'>-	process. </div><div class='del'>-</div><div class='del'>-	* corrected a bunch of bugs </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): </div><div class='del'>-	parser the subject and date.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): added the ability to </div><div class='del'>-	follow the parsing progression. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	parse the x-evolution field. </div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): </div><div class='del'>-	disabled gmime-rfc2047 as it depends on libunicode</div><div class='del'>-	and is not used for the moment. </div><div class='del'>-</div><div class='del'>-2000-01-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize</div><div class='del'>-	signal for when the card changes height.  Made it so that when you</div><div class='del'>-	press tab inside of a field, it goes to the next field.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a</div><div class='del'>-	resize signal for when the label changes height.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for</div><div class='del'>-	multiple lines.  Added scrolling based on cursor position.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Removed an extraneous build target.</div><div class='del'>-</div><div class='del'>-2000-01-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key</div><div class='del'>-	from getting inserted into the buffer since the renderer doesn't</div><div class='del'>-	know what a tab is.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added</div><div class='del'>-	a blinking cursor and scrolling for the text item.</div><div class='del'>-</div><div class='del'>-2000-01-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/test-minicard.c: Removed some code which got in the way</div><div class='del'>-	of testing properly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the</div><div class='del'>-	field text item editable.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-text-event-process*.[ch].</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Changed these to support</div><div class='del'>-	editing.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor.c,</div><div class='del'>-	widgets/e-text-event-processor.h,</div><div class='del'>-	widgets/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.c,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.h: These are a new pair</div><div class='del'>-	of classes which handle all events from the text item and convert</div><div class='del'>-	them into commands.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added minicard and text stuff.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h,</div><div class='del'>-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added</div><div class='del'>-	canvas items for the minicard view in the contact manager.</div><div class='del'>-</div><div class='del'>-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests</div><div class='del'>-	for the minicard items.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on</div><div class='del'>-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in</div><div class='del'>-	e-minicard*.[ch].</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.</div><div class='del'>-</div><div class='del'>-2000-01-06  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add Bonobo detection, Bonobo flags for compilation</div><div class='del'>-	for the components and the shell.</div><div class='del'>-</div><div class='del'>-2000-01-06 Elliot Lee &lt;sopwith@redhat.com&gt;</div><div class='del'>-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with</div><div class='del'>-	builddir != srcdir</div><div class='del'>-</div><div class='del'>-2000-01-05  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,</div><div class='del'>-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread</div><div class='del'>-	version of the compile/link lines.</div><div class='del'>-</div><div class='del'>-1999-11-20  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (PACKAGE): Raise warning level.</div><div class='del'>-</div><div class='del'>-2000-01-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): </div><div class='del'>-	in the io_error label does not return before the </div><div class='del'>-	list has been freed.</div><div class='del'>-</div><div class='del'>-2000-01-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): </div><div class='del'>-	detects netscape ".sdb" folders as well as simple </div><div class='del'>-	non-suffixed folders (as the ones used in pine).</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/string-utils.c (string_prefix): </div><div class='del'>-	finished implementation. </div><div class='del'>-	(string_prefix): added a boolean flag to indicate if the </div><div class='del'>-	suffix has been found. When the suffix does not match, </div><div class='del'>-	return NULL.</div><div class='del'>-</div><div class='del'>-1999-12-26 bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_setv): </div><div class='del'>-	new function. Allow printf-like description</div><div class='del'>-	string constructions. </div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-        * camel/providers/mbox/camel-mbox-store.h:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-store.c:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-folder.h:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-folder.c:</div><div class='del'>-        More work on the mbox provider.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-12-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.h: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.c: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.h: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	part of the mbox provider.</div><div class='del'>-</div><div class='del'>-1999-12-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	check that the folder is closed or raise an exception.</div><div class='del'>-	(_set_name): unset the name fields as soon as possible, </div><div class='del'>-	even if an exception is raised.</div><div class='del'>-</div><div class='del'>-	* configure.in:</div><div class='del'>-	build mbox provider Makefile</div><div class='del'>-	</div><div class='del'>-	* camel/Makefile.am (SUBDIRS): </div><div class='del'>-	re-enable providers compilation</div><div class='del'>-</div><div class='del'>-1999-12-19  Damon Chaplin  &lt;damon@karuna.freeserve.co.uk&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile</div><div class='del'>-</div><div class='del'>-1999-12-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c: include camel-log.h</div><div class='del'>-	to avoid unresolved symbols.</div><div class='del'>-</div><div class='del'>-1999-12-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_summary): </div><div class='del'>-	documented.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_append_message): </div><div class='del'>-	updated to take the change on append into account.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	updated class def concerning append.</div><div class='del'>-	* camel/camel-folder.c </div><div class='del'>-	(camel_folder_append_message): documented. </div><div class='del'>-	(camel_folder_append_message): don't return the </div><div class='del'>-	message number. Use specific methods instead.</div><div class='del'>-	(_append_message): idem.</div><div class='del'>-</div><div class='del'>-	(_delete): use 	exception mechanism.</div><div class='del'>-	(camel_folder_delete): idem.</div><div class='del'>-	(_delete_messages): idem.</div><div class='del'>-	(camel_folder_delete_messages): idem.</div><div class='del'>-	(_get_parent_folder): idem.</div><div class='del'>-	(camel_folder_get_parent_folder): idem.</div><div class='del'>-	(_get_parent_store): idem.</div><div class='del'>-	(_get_mode): idem.</div><div class='del'>-	(camel_folder_get_parent_store): idem.</div><div class='del'>-	(camel_folder_get_mode): idem.</div><div class='del'>-	(_list_subfolders): idem.</div><div class='del'>-	(camel_folder_list_subfolders): idem.</div><div class='del'>-	(_expunge): idem.</div><div class='del'>-	(camel_folder_expunge): idem.</div><div class='del'>-	(_has_message_number_capability): idem.</div><div class='del'>-	(camel_folder_has_message_number_capability): idem.</div><div class='del'>-	(_get_message_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_count): idem.</div><div class='del'>-	(_list_permanent_flags): idem.</div><div class='del'>-	(camel_folder_list_permanent_flags): idem.</div><div class='del'>-	(_copy_message_to): idem.</div><div class='del'>-	(camel_folder_copy_message_to): idem.</div><div class='del'>-	(camel_folder_has_summary_capability): idem.</div><div class='del'>-	(camel_folder_get_summary): idem.</div><div class='del'>-	(camel_folder_has_uid_capability): idem.</div><div class='del'>-	(camel_folder_get_message_uid): idem.</div><div class='del'>-	(_get_message_uid_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_uid_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_by_uid): idem.</div><div class='del'>-	(camel_folder_get_uid_list): idem.</div><div class='del'>-</div><div class='del'>-1999-12-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	use exception mechanism.</div><div class='del'>-	(camel_folder_set_name): idem.</div><div class='del'>-	(camel_folder_set_full_name): idem.</div><div class='del'>-	(_get_name): idem.</div><div class='del'>-	(camel_folder_get_name): idem.</div><div class='del'>-	(_get_full_name): idem.</div><div class='del'>-	(camel_folder_get_full_name): idem.</div><div class='del'>-	(_can_hold_folders): idem.</div><div class='del'>-	(_can_hold_messages): idem.</div><div class='del'>-	(_exists): idem.</div><div class='del'>-	(camel_folder_exists): idem.</div><div class='del'>-	(_is_open): idem.</div><div class='del'>-	(_get_subfolder): idem.</div><div class='del'>-	(camel_folder_get_subfolder): idem.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_clear): </div><div class='del'>-	New function. Clear an exception.</div><div class='del'>-	(camel_exception_get_id): </div><div class='del'>-	New function. </div><div class='del'>-	(camel_exception_get_description): </div><div class='del'>-	New function. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	Use the exception system. When the folder</div><div class='del'>-	has no parent, don't set its full name </div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-12-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_expunge): </div><div class='del'>-	(_expunge): </div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_expunge): </div><div class='del'>-	changed the return value. Now returns the list </div><div class='del'>-	of expunged messages</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_init_with_store): </div><div class='del'>-	cleaned up. Use the exception system now.</div><div class='del'>-	(_open): ditto.</div><div class='del'>-	(camel_folder_open): ditto.</div><div class='del'>-	(camel_folder_open_async): ditto.</div><div class='del'>-	(_close):  ditto.</div><div class='del'>-	(camel_folder_close):  ditto.</div><div class='del'>-	(camel_folder_close_async): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_set): </div><div class='del'>-	When no exception is given, do nothing, just</div><div class='del'>-	return. </div><div class='del'>-	(camel_exception_set): documented.</div><div class='del'>-	(camel_exception_new): idem.</div><div class='del'>-	(camel_exception_free): idem.</div><div class='del'>-	(camel_exception_xfer): idem.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c:</div><div class='del'>-	* camel/camel-folder.h: more clean-ups. </div><div class='del'>-	Removed message list related code. </div><div class='del'>-	This was braindead design. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): </div><div class='del'>-	implemented. The routines in this file will be</div><div class='del'>-	called by providers to handle the list of</div><div class='del'>-	message already standing in memory. </div><div class='del'>-</div><div class='del'>-1999-12-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c: </div><div class='del'>-	* camel/camel-folder-utils.h: </div><div class='del'>-	New files, misc utilities for the </div><div class='del'>-	folder providers. Includes active message</div><div class='del'>-	list utilities. </div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (_has_message_number_capability): </div><div class='del'>-	(camel_folder_has_message_number_capability): </div><div class='del'>-	Added this to know if a folder provides </div><div class='del'>-	number-based message access.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message_count): </div><div class='del'>-	added warning when called directly.</div><div class='del'>-	(_append_message): ditto</div><div class='del'>-	(_open_async):  ditto</div><div class='del'>-	(_close_async):  ditto</div><div class='del'>-	(_delete_messages): ditto </div><div class='del'>-	(_expunge):  ditto</div><div class='del'>-	(_get_message_by_number):  ditto</div><div class='del'>-	(_get_message_uid):  ditto</div><div class='del'>-	(_get_message_uid_by_number):  ditto</div><div class='del'>-	(_get_message_by_uid):  ditto</div><div class='del'>-	(_get_uid_list):  ditto</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_open_async): </div><div class='del'>-	(_open): </div><div class='del'>-	(_close_async): </div><div class='del'>-	(_close): </div><div class='del'>-	(camel_folder_pt_proxy_class_init): </div><div class='del'>-	update </div><div class='del'>-	(_get_message_by_number): </div><div class='del'>-	Update to reflect changes in CamelFolder</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	* camel/camel-folder.c (_get_subfolder): </div><div class='del'>-	(camel_folder_get_subfolder): </div><div class='del'>-	The CamelFolder::get_folder is renamed to </div><div class='del'>-	get_subfolder as it is more intuitive. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message_by_number): </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	* camel/camel-folder.h </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	The get_message method is now named</div><div class='del'>-	get_message_by_number for consistency</div><div class='del'>-	with the _by_uid methods.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.[ch]: </div><div class='del'>-	 clean-ups. </div><div class='del'>-</div><div class='del'>-1999-12-13  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ebook/e-book.h: New file.</div><div class='del'>-	* ebook/e-book.c: New file.</div><div class='del'>-	* ebook/e-card.h: New file.</div><div class='del'>-	* ebook/e-card-fields.h: New file.</div><div class='del'>-	* ebook/e-commerce.h: New file. :-)</div><div class='del'>-</div><div class='del'>-1999-12-08  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Removed the strdup()s, which are not</div><div class='del'>-	deeded anymore.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_subject): `subject' made const.</div><div class='del'>-	(camel_mime_message_set_subject): Likewise.</div><div class='del'>-	(_set_from): `from' made const.</div><div class='del'>-	(camel_mime_message_set_from): Likewise.</div><div class='del'>-	(_set_reply_to): Made `reply_to' const.</div><div class='del'>-	(camel_mime_message_set_reply_to): Likewise.</div><div class='del'>-	(_set_set_received_date): Made `received_date' const.</div><div class='del'>-	(camel_mime_message_set_reply_to): Likewise.</div><div class='del'>-	(_set_field): `value' made const.  Also, strdup the string before</div><div class='del'>-	assigning.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: Virtual methods changed to use const</div><div class='del'>-	strings when setting header values.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (EXTRA_DIST): Added</div><div class='del'>-	`$(libcamel_extra_sources)'.</div><div class='del'>-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'</div><div class='del'>-	in the `Mime-Version' header.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/msg-composer-test.c: Removed.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added `composer'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Create `composer/Makefile'.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.</div><div class='del'>-	(camel_simple_data_wrapper_stream_new): Updated accordingly.</div><div class='del'>-	* camel/camel-stream-data-wrapper.c</div><div class='del'>-	(camel_stream_data_wrapper_construct): Updated accordingly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check</div><div class='del'>-	macro name with `CAMEL_IS...()'.</div><div class='del'>-	* camel/camel-folder-pt-proxy.h: Likewise.</div><div class='del'>-	* camel/camel-folder-summary.h: Likewise. </div><div class='del'>-	* camel/camel-folder.h: Likewise. </div><div class='del'>-	* camel/camel-medium.h: Likewise. </div><div class='del'>-	* camel/camel-mime-body-part.h: Likewise.</div><div class='del'>-	* camel/camel-mime-message.h: Likewise. </div><div class='del'>-	* camel/camel-mime-part.h: Likewise. </div><div class='del'>-	* camel/camel-multipart.h: Likewise. </div><div class='del'>-	* camel/camel-service.h: Likewise. </div><div class='del'>-	* camel/camel-session.h: Likewise. </div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: Likewise. </div><div class='del'>-	* camel/camel-simple-data-wrapper.h: Likewise.</div><div class='del'>-	* camel/camel-store.h: Likewise.</div><div class='del'>-	* camel/camel-stream-buffered-fs.h: Likewise.</div><div class='del'>-	* camel/camel-stream-data-wrapper.h: Likewise. </div><div class='del'>-	* camel/camel-stream-fs.h: Likewise. </div><div class='del'>-	* camel/camel-stream-mem.h: Likewise. </div><div class='del'>-	* camel/camel-stream.h: Likewise. </div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',</div><div class='del'>-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into</div><div class='del'>-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and</div><div class='del'>-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_stream): Write</div><div class='del'>-	"Mime-Version: 1.0" to the stream.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: If executed with a file name parameter, attach a</div><div class='del'>-	file with with that name to the email without loading it into</div><div class='del'>-	core, thus demonstrating usage of my latest changes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_encoding): Updated to use</div><div class='del'>-	`CamelMimePartEncodingType'.</div><div class='del'>-	(camel_mime_part_set_encoding): Likewise.</div><div class='del'>-	(_get_encoding): Likewise.</div><div class='del'>-	(camel_mime_part_get_encoding): Likewise.</div><div class='del'>-	(_write_content_to_stream): Honour the `encoding' member.</div><div class='del'>-	(_construct_from_stream): Made static.</div><div class='del'>-	(camel_mime_part_encoding_to_string): New function.</div><div class='del'>-	(_write_to_stream): Write the encoding string using it.</div><div class='del'>-	(camel_mime_part_init): Set encoding to</div><div class='del'>-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.</div><div class='del'>-	(_finalize): Don't free `encoding' anymore.</div><div class='del'>-	(camel_mime_part_encoding_from_string): New function.</div><div class='del'>-	(_parse_header_pair): Use it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.</div><div class='del'>-	Member `encoding' of `struct _CamelMimePart' changed from `gchar</div><div class='del'>-	*' to `CamelMimePartEncodingType'.  All the encoding-related</div><div class='del'>-	methods changed to use this type instead of `gchar *'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): Compile</div><div class='del'>-	`gmime-base64.c'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.h: New, previously missing, header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-data-wrapper.c: New file implementing the</div><div class='del'>-	`CamelStreamDataWrapper' class.</div><div class='del'>-	* camel/camel-stream-data-wrapper.h: Corresponding header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'</div><div class='del'>-	virtual method.</div><div class='del'>-	(_get_stream): New function implementing the method.</div><div class='del'>-	(camel_simple_data_wrapper_class_init): Install it in the class</div><div class='del'>-	struct.</div><div class='del'>-	(camel_simple_data_wrapper_init): New function initializing the</div><div class='del'>-	`stream' member to NULL,</div><div class='del'>-	(camel_simple_data_wrapper_class_init): Set it as the</div><div class='del'>-	GtkObjectInitFunc.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.h: New member `stream' in</div><div class='del'>-	`struct _CamelSimpleDataWrapper'.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c: New file implementing</div><div class='del'>-	the `CamelSimpleDataWrapperStream' class.</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New</div><div class='del'>-	function.</div><div class='del'>-	(_get_stream): New private function, just returning NULL.</div><div class='del'>-	(camel_data_wrapper_class_init): Install it as the default</div><div class='del'>-	`get_stream' virtual method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in</div><div class='del'>-	`CamelDataWrapperClass'.</div><div class='del'>-	(camel_data_wrapper_get_stream): New function prototype.</div><div class='del'>-</div><div class='del'>-1999-11-05  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/msg-composer-test.c: New file for testing the</div><div class='del'>-	`EMsgComposer' widget.</div><div class='del'>-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do</div><div class='del'>-	not compile `store_listing' for now because it's currently broken.</div><div class='del'>-	(INCLUDES): Added the `widgets' source directory to the include</div><div class='del'>-	path list.</div><div class='del'>-	(LDADD): Removed the MH dependency; link with</div><div class='del'>-	`libevolutionwidgets.la' from the `widgets' directory.</div><div class='del'>-</div><div class='del'>-	* configure.in: Create `widgets/Makefile'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):</div><div class='del'>-	Likewise.</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):</div><div class='del'>-	Likewise.</div><div class='del'>-	* camel/camel.c (camel_init): Likewise.</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register): Likewise.</div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): Likewise.</div><div class='del'>-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.</div><div class='del'>-	* camel/camel-medium.c (camel_medium_class_init): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make</div><div class='del'>-	prototype non-static.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamelinclude_HEADERS): Move</div><div class='del'>-	`camel-exception-list.def' from `EXTRA_DIST' to</div><div class='del'>-	`libcamelinclude_HEADERS'.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: Do not #include &lt;config.h&gt;.</div><div class='del'>-	* camel/data-wrapper-repository.h: Likewise.</div><div class='del'>-</div><div class='del'>-1999-11-05  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.</div><div class='del'>-</div><div class='del'>-1999-10-13  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_close): the </div><div class='del'>-	folder-&gt;close method is now asynchronous.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): </div><div class='del'>-	(_open): </div><div class='del'>-	(_folder_open_cb): </div><div class='del'>-	(_open): </div><div class='del'>-	open/close method implemented in the thread proxy</div><div class='del'>-	folder. More to come.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_xfer): </div><div class='del'>-	new utility func.</div><div class='del'>-</div><div class='del'>-	* camel/camel-marshal-utils.c: some new marshallers</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c: Some explanations</div><div class='del'>-	on the thread proxy system.</div><div class='del'>-</div><div class='del'>-1999-10-11  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-marshal-utils.c: </div><div class='del'>-	camel/camel-marshal-utils.h:</div><div class='del'>-	Handles operation marshalling. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-thread-proxy.c: </div><div class='del'>-	camel/camel-thread-proxy.h: </div><div class='del'>-	new files. Generic proxy system.</div><div class='del'>-	  </div><div class='del'>-	* camel/camel-folder-pt-proxy.c </div><div class='del'>-	moved all proxy related code in dedicated files.</div><div class='del'>-	</div><div class='del'>-	(camel_folder_pt_proxy_init): </div><div class='del'>-	removed proxy initialisation code</div><div class='del'>-	(_finalize): </div><div class='del'>-	removed proxy finalization code</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c </div><div class='del'>-	(camel_exception_new): </div><div class='del'>-	(camel_exception_set): </div><div class='del'>-	(camel_exception_free): </div><div class='del'>-	New funcs.</div><div class='del'>-</div><div class='del'>-1999-09-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_async_close): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* configure.in:</div><div class='del'>-	Check pthreads.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am: </div><div class='del'>-	camel-folder-pt-proxy.c is only compiled</div><div class='del'>-	when pthreads are available.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder-pt-proxy.c:</div><div class='del'>-	Signal proxying implemenatation. </div><div class='del'>-	(_signal_marshaller_server_side): </div><div class='del'>-	(_signal_marshaller_client_side): </div><div class='del'>-	(_init_signals_proxy): </div><div class='del'>-	Code not is tested and has to be best </div><div class='del'>-	explained as it uses threads conditions and</div><div class='del'>-	gtk signal system.</div><div class='del'>-	(_thread_notification_catch): notify pending signals</div><div class='del'>-	as well as thread availability.</div><div class='del'>-</div><div class='del'>-1999-09-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): </div><div class='del'>-	completed</div><div class='del'>-</div><div class='del'>-	Binch of new funcs:</div><div class='del'>-	(_maybe_run_next_op): </div><div class='del'>-	Called by the watch notification when </div><div class='del'>-	a threaded op is completed</div><div class='del'>-	(_thread_notification_catch): </div><div class='del'>-	notification watch call back</div><div class='del'>-	(_init_notify_system): </div><div class='del'>-	set up the notification channel</div><div class='del'>-	(notify_availability): </div><div class='del'>-	called by threads before completion.</div><div class='del'>-</div><div class='del'>-1999-09-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): </div><div class='del'>-	new func. Try to exec an operation in a thread</div><div class='del'>-	or queue it if a thread is already busy.</div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): </div><div class='del'>-	(camel_op_queue_get_service_availability): </div><div class='del'>-	new funcs. </div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.c (camel_op_new): </div><div class='del'>-	(camel_op_free): </div><div class='del'>-	new funcs. Uses glib mem chunks.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_init_with_store): </div><div class='del'>-	added notify io_channel.</div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.h: </div><div class='del'>-	* camel/camel-op-queue.c: </div><div class='del'>-	New object. Operation queue. Meant to be used in </div><div class='del'>-	non-blocking proxy objects.</div><div class='del'>-	(camel_op_queue_run_next_op): new func. </div><div class='del'>-	run the next operation.</div><div class='del'>-</div><div class='del'>-1999-09-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): </div><div class='del'>-	added camel-folder-pt-proxy.[ch] to the build</div><div class='del'>-	process.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_init_with_store): </div><div class='del'>-	started implementation of the pthread-based </div><div class='del'>-	folder proxy.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-08  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-summary.c </div><div class='del'>-	(mh_load_summary): </div><div class='del'>-	(mh_save_summary): </div><div class='del'>-	(mh_create_summary): </div><div class='del'>-	implemented summary (files) for MH folders.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c </div><div class='del'>-	(_get_message_by_uid): implemented.</div><div class='del'>-	(camel_mh_folder_class_init): </div><div class='del'>-	(_get_message_uid): implemented</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_has_uid_capability): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Documented UID methods.</div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	const'ified uid.</div><div class='del'>-	(camel_folder_get_message_by_uid): idem</div><div class='del'>-	removed stupid camel_folder_get_message_uid_by_number</div><div class='del'>-	method.</div><div class='del'>-	</div><div class='del'>-	* tests/ui-tests/store_listing.c (close_all): </div><div class='del'>-	close all open folders and stores. (necessary</div><div class='del'>-	for UID list saving ).</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): </div><div class='del'>-	fix: store UID list in CamelMHFolder object.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_open): </div><div class='del'>-	read or create UID list.</div><div class='del'>-	(_close): save UID list.</div><div class='del'>-</div><div class='del'>-1999-09-07  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c (md5_get_digest_from_file): </div><div class='del'>-	correct parameter decl (const)</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h: typo.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c </div><div class='del'>-	More work on UID stuff for MH.</div><div class='del'>-	(mh_save_uid_list): </div><div class='del'>-	(mh_load_uid_list): </div><div class='del'>-	(mh_generate_uid_list): </div><div class='del'>-	new funcs. Manage on-disk uid list.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): </div><div class='del'>-	Util routines live here now.</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c </div><div class='del'>-	Documented all funcs.</div><div class='del'>-	</div><div class='del'>-	(md5_get_digest_from_stream): </div><div class='del'>-	correct typo.</div><div class='del'>-	(md5_get_digest_from_file): </div><div class='del'>-	same typo corrected.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h : </div><div class='del'>-	raw routines are declared public now.</div><div class='del'>-	Md5 use has to be versatile.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): </div><div class='del'>-	new func. Returns an UID for an MH message.</div><div class='del'>-		</div><div class='del'>-1999-09-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h:</div><div class='del'>-	* camel/md5-utils.c:</div><div class='del'>-	changed names to follow camel style.</div><div class='del'>-	(md5_get_digest_from_stream): </div><div class='del'>-	new methods.</div><div class='del'>-	(md5_get_digest_from_file): </div><div class='del'>-	new function : get file md5 signature. </div><div class='del'>-	To be used in providers code.</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c: imported md5 coding </div><div class='del'>-	routine from rpm. Compiles.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-05  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_has_uid_capability): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Basic UID framework.</div><div class='del'>-	</div><div class='del'>-	* devel-docs/misc/ref_and_id_proposition.txt:</div><div class='del'>-	New revision. Some fixes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): added </div><div class='del'>-	uid_capability field.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_close): publicized</div><div class='del'>-	the close method.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (show_folder_messages): </div><div class='del'>-	use folder summary instead of opening all messages.</div><div class='del'>-	(show_folder_messages): re-enabled old CPU/Mem consumming</div><div class='del'>-	method. Useful for pop3 for instance.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create_summary): </div><div class='del'>-	basic and highly non-efficient summary implementation.</div><div class='del'>-	Should be seen as a proof of concept only.</div><div class='del'>-	subfolder summary still has to be implemented.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): </div><div class='del'>-	hasn't summary for the moment. </div><div class='del'>-	* camel/providers/maildir/camel-maildir-folder.c</div><div class='del'>-	cosmetic changes.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create_summary):</div><div class='del'>-	started summary implementation.</div><div class='del'>-	(_open): correct use of open.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_summary): </div><div class='del'>-	get folder associated summary object.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am:</div><div class='del'>-	added summary files build</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.[ch]: </div><div class='del'>-	basic summary framework</div><div class='del'>-</div><div class='del'>-1999-09-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/Makefile.am:</div><div class='del'>-	sgml doc has camel-recipient now.</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): </div><div class='del'>-	added in-line documentation.</div><div class='del'>-</div><div class='del'>-1999-09-02  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/maildir: Added (experimental) maildir </div><div class='del'>-	provider written by Jukka Zitting &lt;hukka@greywolves.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/providers/Makefile.am (SUBDIRS): build maildir</div><div class='del'>-	provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_get_for_protocol):</div><div class='del'>-	bug fix. patch from  Jukka Zitting &lt;hukka@greywolves.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): </div><div class='del'>-	changed decl to fit CRLFunc. </div><div class='del'>-	(_write_recipients_to_stream): </div><div class='del'>-	calls camel_recipient_foreach_recipient_type now.</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): </div><div class='del'>-	new convinience function. Iterate over all recipient types.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): </div><div class='del'>-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/</div><div class='del'>-	(gmime_write_header_with_glist_to_stream): </div><div class='del'>-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/</div><div class='del'>-</div><div class='del'>-1999-09-01  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_finalize): </div><div class='del'>-	(_add_recipient): </div><div class='del'>-	(_remove_recipient): </div><div class='del'>-	(_get_recipients): now use CamelRecipientTable</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	(gmime_content_field_unref): test if object </div><div class='del'>-	to free is non void.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_finalize): </div><div class='del'>-	(_set_name): </div><div class='del'>-	* camel/camel-mime-part.c (_finalize): </div><div class='del'>-	(_set_description): </div><div class='del'>-	(_set_disposition): </div><div class='del'>-	* camel/camel-service.c (_finalize): </div><div class='del'>-	* camel/camel-stream-fs.c (_finalize): </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	(gmime_content_field_construct_from_string): </div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_free): </div><div class='del'>-</div><div class='del'>-	When using g_free (obj) don't test if obj != NULL</div><div class='del'>-	g_free () already do that. Thanks to elerium for</div><div class='del'>-	the feedback.</div><div class='del'>-</div><div class='del'>-1999-08-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_get): </div><div class='del'>-	(camel_recipient_remove): </div><div class='del'>-	(camel_recipient_add): </div><div class='del'>-	new func. More work on new independant recipient code. </div><div class='del'>-</div><div class='del'>-1999-08-29  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* MAINTAINERS: updated my e-mail address. </div><div class='del'>-</div><div class='del'>-1999-08-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	text parameter declared const</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): </div><div class='del'>-	actually test correctly nb_bytes_read_chunk is &gt;0</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c: </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c:</div><div class='del'>-	* camel/camel-stream-fs.c:</div><div class='del'>-	include string.h</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-mem.c (_write): return </div><div class='del'>-	the numver of written bytes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-buffered-fs.c (_eos): </div><div class='del'>-	return sthg</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (default_camel_seek): </div><div class='del'>-	return something.</div><div class='del'>-</div><div class='del'>-1999-08-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_object): </div><div class='del'>-	contruct the content from the buffer before calling</div><div class='del'>-	CamelMedium implementation.</div><div class='del'>-	(_construct_from_stream): Do not construct the content </div><div class='del'>-	by default, just store the content bytes in </div><div class='del'>-	a temporary buffer. Content will be constructed only</div><div class='del'>-	at caller request (when calling CamelMedium::get_content_object)</div><div class='del'>-	Providers with better access to the messages (mbox/MH ...)</div><div class='del'>-	will have to provider lighter implementation, that is</div><div class='del'>-	shall not read content at all unless the caller asks</div><div class='del'>-	for it (again with get_content).</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c: new file, groups</div><div class='del'>-	mime-part related utils. Meant to be used by providers</div><div class='del'>-	subclassing MimeMessage.</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream): </div><div class='del'>-	(camel_mime_part_construct_content_from_stream): </div><div class='del'>-	no more useless temporary hash table. </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): calls</div><div class='del'>-	mime-part-utils functions now.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (_store_header_pair_from_string): </div><div class='del'>-	do not use hash table to store header, use an array instead.</div><div class='del'>-</div><div class='del'>-1999-08-25  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c: now descend from CamelMedium.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): all headers must be strdup'ed</div><div class='del'>-	(main): unref created objects</div><div class='del'>-</div><div class='del'>-	* camel/camel-medium.c (_set_content_object): </div><div class='del'>-	(_get_content_object): these methods are </div><div class='del'>-	in CamelMedium now.</div><div class='del'>-</div><div class='del'>-1999-08-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-medium.c (camel_medium_class_init): </div><div class='del'>-	new class. Will handle all sort of information media </div><div class='del'>-	(Mime mail messages, Lotus Notes  mail messages, </div><div class='del'>-	postit notes, faxes, who knows .... :)</div><div class='del'>-	CamelMimePart will inherit from it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_disposition): </div><div class='del'>-	(_set_description):</div><div class='del'>-	description and disposition parameters are now const.</div><div class='del'>-	 </div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_free): added</div><div class='del'>-	assertion code.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	uses buffered stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-buffered-fs.c:</div><div class='del'>-	new stream to accelerate file ops.</div><div class='del'>-</div><div class='del'>-1999-08-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): </div><div class='del'>-	name parameter is const. This fixes a bug in destroy ()</div><div class='del'>-</div><div class='del'>-1999-08-18  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: more work on encoder.</div><div class='del'>-</div><div class='del'>-1999-08-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_read): </div><div class='del'>-	return the number of bytes read. </div><div class='del'>-	How can this have ever worked ?</div><div class='del'>-	(camel_stream_flush): don't return anything.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	mem leak fixed.</div><div class='del'>-</div><div class='del'>-1999-08-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c:</div><div class='del'>-	Now has a popup menu on mailbox tree to allow</div><div class='del'>-	easier tests. Implemented the copy stuff.</div><div class='del'>-	Works well for the MH provider :)))</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): </div><div class='del'>-	Test MH provider fast copy implemented.</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-1999-08-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_expunge): </div><div class='del'>-	moved the active list readjustment code here.</div><div class='del'>-	Much saner, providers won't have to worry about</div><div class='del'>-	that.</div><div class='del'>-	(_copy_message_to): new method.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_expunge): </div><div class='del'>-	no more active list readjustment stuff.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: the expunge virtual no more</div><div class='del'>-	returns a list of expunged messages. Now providers</div><div class='del'>-	only have to set the expunge flag on the expunged</div><div class='del'>-	messages.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message): </div><div class='del'>-	moved the caching code here. Finally, I don't want</div><div class='del'>-	providers to crash the libs with a bad message cache</div><div class='del'>-	implementation. </div><div class='del'>-	(_close): do not call the CamelFolder virtual expunge </div><div class='del'>-	method directly, use camel_folder_expunge() instead.</div><div class='del'>-	(camel_folder_expunge): added the want_list param. </div><div class='del'>-	The client can decide if it wants the expunged message</div><div class='del'>-	list or not. If yes, it'll have to unref the messages </div><div class='del'>-	itself.</div><div class='del'>-</div><div class='del'>-1999-08-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (delete_selected_messages): </div><div class='del'>-	(expunge_selected_folders): </div><div class='del'>-	Implemented deletion/expunge mechanism. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message): </div><div class='del'>-	Added some debug info.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_expunge): </div><div class='del'>-	implemented and tested.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_flag): </div><div class='del'>-	changed the old braindead implementation.</div><div class='del'>-	boolean are inserted in the flag hash </div><div class='del'>-	table casted as gpointers.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c: indentation fix</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-08-13  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message): default implementation</div><div class='del'>-	to be called first by providers methods. It looks in the</div><div class='del'>-	folder message list (in memory) to see if the message has</div><div class='del'>-	not already been retrieved, and in this case, returns </div><div class='del'>-	the same CamelMimeMessage object</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): set</div><div class='del'>-	message-&gt;message_number correctly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	New field (message_list) which will hold a </div><div class='del'>-	reference on each message obtained by the folder,</div><div class='del'>-	which is necessary in order for the caching procedure</div><div class='del'>-	to work (Getting the same message from a folder twice</div><div class='del'>-	will return the same CamelMimeMessage object).</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message): </div><div class='del'>-	When the store retreives a message put it in its</div><div class='del'>-	message list.</div><div class='del'>-	(_finalize): free message list.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: fix typo (parmanent)</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_permanent_flag_list): </div><div class='del'>-	(camel_folder_get_permanent_flag_list): </div><div class='del'>-	new method, returns the list of permanent</div><div class='del'>-	flags supported by the folder.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_get_flag_list): </div><div class='del'>-	(camel_mime_message_get_flag_list): new method,</div><div class='del'>-	return the list of flag name used by this message.</div><div class='del'>-</div><div class='del'>-	* camel/hash-table-utils.c (g_strcase_equal): </div><div class='del'>-	(g_strcase_hash): those two func go here now.</div><div class='del'>-</div><div class='del'>-	* camel/hash_table_utils.c (hash_table_generic_free): </div><div class='del'>-	free a (gpointer, gpointer) hash table pair.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): use</div><div class='del'>-	case insensitive hash table functions. </div><div class='del'>-	(_set_flag): </div><div class='del'>-	(camel_mime_message_set_flag): </div><div class='del'>-	(_get_flag): </div><div class='del'>-	(camel_mime_message_get_flag): </div><div class='del'>-	Use const for flag name, they are now</div><div class='del'>-	duplicated.</div><div class='del'>-</div><div class='del'>-1999-08-12  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (show_folder_messages): </div><div class='del'>-	remove stupid debug code.</div><div class='del'>-	(add_mail_store): use camel_session_get_store instead</div><div class='del'>-	of creating MH store directly.</div><div class='del'>-	(main): load MH provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): </div><div class='del'>-	register new provider.</div><div class='del'>-	(camel_provider_get_for_protocol): </div><div class='del'>-	Now, implementation is correct.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_finalize): </div><div class='del'>-	* camel/camel-store.h (struct _CamelStore): </div><div class='del'>-	further disabled url_name field use. </div><div class='del'>-	URL will be generated dynamically.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store_for_protocol): </div><div class='del'>-	compilation and runtime fixes.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (_init): </div><div class='del'>-	synced with CamelStore.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_init): </div><div class='del'>-	in CamelStore::init, url_name is now const.</div><div class='del'>-	disabled url_name copy.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store): </div><div class='del'>-	new function: returns a store for an URL. </div><div class='del'>-	(camel_session_get_store_for_protocol): </div><div class='del'>-	new functionc: returns a store for a given </div><div class='del'>-	store protocol (as IMAP/POP/MH ...)</div><div class='del'>-	* camel/string-utils.c (g_strcase_equal): </div><div class='del'>-	(g_strcase_hash): case insensitive hash table</div><div class='del'>-	funcs.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_init): hash table</div><div class='del'>-	keys are case insensitive.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_get_for_protocol): </div><div class='del'>-	new function, returns the last registered </div><div class='del'>-	provider for a protocol.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-provider.c: </div><div class='del'>-	new file. MH provider registration stuff.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): </div><div class='del'>-	load a provider from a shared object (plugin).</div><div class='del'>-	(camel_provider_register): register a provider </div><div class='del'>-	"by hand". Used for statically defined providers.</div><div class='del'>-</div><div class='del'>-	* tests/test7.c: new test.</div><div class='del'>-	tests providers loading framework.</div><div class='del'>-</div><div class='del'>-1999-08-11  </div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (_finalize): </div><div class='del'>-	* camel/camel-stream-fs.c (_finalize): </div><div class='del'>-	(_destroy): close file descriptor.</div><div class='del'>-	* camel/camel-stream-mem.c (_finalize): </div><div class='del'>-	* camel/camel-store.c (_finalize): </div><div class='del'>-	* camel/camel-folder.c (_finalize): </div><div class='del'>-	* camel/camel-multipart.c (_finalize): </div><div class='del'>-	* camel/camel-simple-data-wrapper.c (_finalize): </div><div class='del'>-	* camel/camel-mime-part.c (_finalize): </div><div class='del'>-	implemented destructors.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_ref): </div><div class='del'>-	(gmime_content_field_unref): </div><div class='del'>-	New reference mechanism for GMimeContentField objects.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_finalize): </div><div class='del'>-	Started implementing destructors.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): </div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): </div><div class='del'>-	removed forgotten anarchic traces.</div><div class='del'>-</div><div class='del'>-1999-08-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c: </div><div class='del'>-	* tests/ui-tests/store_listing.glade:</div><div class='del'>-	Quick and (very) dirty hack to test Camel more</div><div class='del'>-	easily.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_append_message): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-1999-08-09  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/misc/ref_and_id_proposition.txt:</div><div class='del'>-	new file. Document message UID and vfolder</div><div class='del'>-	implementation.</div><div class='del'>-</div><div class='del'>-1999-08-08  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.</div><div class='del'>-	</div><div class='del'>-1999-08-08  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	fix. In MH, message number is not related to </div><div class='del'>-	message position in folder.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): </div><div class='del'>-	util func.</div><div class='del'>-	(_get_message_count): implemented.</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/:</div><div class='del'>-	updated some autogen doc stuff.</div><div class='del'>-	Still don't understand warnings :(</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/providers/MH/camel-mh-store.c: </div><div class='del'>-	* camel/url-util.c: </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	various inline doc corrections.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (get_message_count): </div><div class='del'>-	new method. Returns the number of message </div><div class='del'>-	in the folder.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-06  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test6.c: encoder test.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence</div><div class='del'>-	?= is not always the terminator for an encoded-string.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	stat was not testing the good file. Fixed.</div><div class='del'>-	</div><div class='del'>-	* tests/test4.c (main): added real test for MH folder </div><div class='del'>-	provider. All tested things seem to work OK :)</div><div class='del'>-</div><div class='del'>-1998-08-06  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-	</div><div class='del'>-	* tests/test5.c: test for RFC2047 decoder.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information</div><div class='del'>-	(_list_subfolders): test if first char in folder name is not '.'</div><div class='del'>-	before adding it to the folder list.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_init): </div><div class='del'>-	disable session check temporarily</div><div class='del'>-	(_get_separator): </div><div class='del'>-	(_get_folder): new static func. </div><div class='del'>-	Fixed several oddities in class definition. </div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): </div><div class='del'>-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	prent class is CamelServiceClass not GtkObjectClass</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c : </div><div class='del'>-	cosmetic changes + use of const when possible.</div><div class='del'>-	(find_host):</div><div class='del'>-	fix a bug: when there is no host and no port don't skip the '/'</div><div class='del'>-	all static find_* func are now named _func_*  </div><div class='del'>-	(g_url_free): destructor func.</div><div class='del'>-	cache field has been disabled. Constructing the url string</div><div class='del'>-	won't be too slow and will occur rarely enough that we</div><div class='del'>-	do not need to add complexity to this code. </div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c: </div><div class='del'>-	parent class is CamelStorClass not GtkObjectClass</div><div class='del'>-</div><div class='del'>-1999-08-05  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test4.c: </div><div class='del'>-	test mh provider.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	implemented</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (_get_message): </div><div class='del'>-	new method. </div><div class='del'>-	(camel_folder_get_message): </div><div class='del'>-	corresponding public call</div><div class='del'>-	</div><div class='del'>-	* camel/README.HACKING: </div><div class='del'>-	Some notes.</div><div class='del'>-</div><div class='del'>-	* camel/CODING.STYLE: </div><div class='del'>-	short note about coding style. </div><div class='del'>-</div><div class='del'>-	* camel/README.COPYRIGHT: </div><div class='del'>-	Note about copyright policy.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	minor typo fixes.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: </div><div class='del'>-	* camel/gmime-rfc2047.h:</div><div class='del'>-	indentation and cosmetic changes.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	implemented.</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_delete): </div><div class='del'>-	finshed implementation</div><div class='del'>-	(_delete_messages): implemented.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-04  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047</div><div class='del'>-	  (support for character sets other than US-ASCII in MIME</div><div class='del'>-	  headers). Not actually called from anywhere yet.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create): </div><div class='del'>-	implemented.</div><div class='del'>-	(_delete): started implementation.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_folder): default implementation </div><div class='del'>-	calls camel_store_get_folder ().</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	remove useless exist_on_store field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_exists): </div><div class='del'>-	do not use exist_on_store field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_set_name): </div><div class='del'>-	(camel_folder_get_name): </div><div class='del'>-	new public functions </div><div class='del'>-	(_set_name): set full_path.</div><div class='del'>-</div><div class='del'>-	(_set_full_name): </div><div class='del'>-	(camel_folder_set_full_name): </div><div class='del'>-	commented out this functions def. </div><div class='del'>-	It would make things very difficult to handle, and would not </div><div class='del'>-	be very useful. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-store.h: </div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): </div><div class='del'>-	(camel_mh_store_get_toplevel_dir): </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_set_name): </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.h: </div><div class='del'>-	use (gchar *) instead of (GString *) everywhere.</div><div class='del'>-	use const when necessary.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	removed unused message_list field.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (_set_content_object): </div><div class='del'>-	There is a probleme here. We can not allow mime part</div><div class='del'>-	content-type field and content_object mime-type to be </div><div class='del'>-	different. I thus chosed to set mime part object </div><div class='del'>-	content field to be freed (if necessary) and set</div><div class='del'>-	to be a pointer to content_object mime type</div><div class='del'>-	field. </div><div class='del'>-	(_construct_from_stream): set content_object mime type</div><div class='del'>-	to be the same as mime_part's one. This is necessary</div><div class='del'>-	because we use _set_content_type. </div><div class='del'>-	</div><div class='del'>-	This two things are a bit hackish ansd may need</div><div class='del'>-	to be redesigned.</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): </div><div class='del'>-	use g_strdup_printf and remove a bug.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): </div><div class='del'>-	more debugging output +  nb_bytes_read is now a signed int </div><div class='del'>-	to avoid bug when eos is encountered.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	sync to data_wrapper_repository function name changes. </div><div class='del'>-	Use default "text/plain" type when conten-type field</div><div class='del'>-	is not found. (following RFC 2046 spec).</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): </div><div class='del'>-	(data_wrapper_repository_get_data_wrapper_type): </div><div class='del'>-	change function name prefix (s/data_wrapper/data_wrapper_repository/)</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): </div><div class='del'>-	add `\n` at eol but not before boundary.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	correct implementation of end of stream detection.</div><div class='del'>-</div><div class='del'>-1999-08-01  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): </div><div class='del'>-	use a stream to store the part instead of GString. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	set data wrapper content type to "text/plain".</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-mem.c:</div><div class='del'>-	* camel/camel-stream-mem.h:</div><div class='del'>-	new memory buffer based stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_seek): </div><div class='del'>-	implementation for file system based stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_seek): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): </div><div class='del'>-	pass CamelStreamFsClass instead of CamelStreamClass.</div><div class='del'>-</div><div class='del'>-1999-08-01 bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): </div><div class='del'>-	corrected a bug with memory not allocated for '\0' in strtmp</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	do not return NULL when line is empty. </div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): return true when end</div><div class='del'>-	of multipart is found, not the opposite</div><div class='del'>-</div><div class='del'>-1999-07-31  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	Don't return crlf at end of line.</div><div class='del'>-</div><div class='del'>-1999-07-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	new function: reads a line from a stream.</div><div class='del'>-	should be in streams utils maybe. </div><div class='del'>-</div><div class='del'>-1999-07-29  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	Uses data wrapper repository to find what data wrapper</div><div class='del'>-	to use to construct the content from a stream. When </div><div class='del'>-	no object is registered for the mime type found in</div><div class='del'>-	content type field a CamelSimpleDataWrapper is </div><div class='del'>-	used. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_type): </div><div class='del'>-	(camel_mime_part_get_content_type): returns</div><div class='del'>-	a pointer on the content_type field instead </div><div class='del'>-	of the gchar * mime "type/subtype".</div><div class='del'>-</div><div class='del'>-1999-07-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c</div><div class='del'>-	* camel/data-wrapper-repository.h</div><div class='del'>-	New files. Handles mime type &lt;-&gt; camel object</div><div class='del'>-	(for example "multipart" &lt;-&gt; CamelMultipart</div><div class='del'>-	* tests/tesst3.c: test data repository thing.</div><div class='del'>-</div><div class='del'>-1999-07-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-multipart.c (_write_to_stream): </div><div class='del'>-	implemented output of multipart.</div><div class='del'>-	</div><div class='del'>-	* tests/test1.c (main): testing content objects operations. </div><div class='del'>-</div><div class='del'>-1999-07-25  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	new util function to set a mime part content to be </div><div class='del'>-	a text string.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): </div><div class='del'>-	new util func. </div><div class='del'>-	(camel_simple_data_wrapper_new): new func.</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_write_to_stream): </div><div class='del'>-	implemented output of multiparts.</div><div class='del'>-</div><div class='del'>-1999-07-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): </div><div class='del'>-	New function. Returns the value associated to a </div><div class='del'>-	mime parameter. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-07-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.h: </div><div class='del'>-	* camel/camel-multipart.c:</div><div class='del'>-	New class. Models multipart mime objects.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-body-part.h: </div><div class='del'>-	* camel/camel-mime-body-part.c: </div><div class='del'>-	New class. Body part is a mime part contained in </div><div class='del'>-	a multipart object.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-07-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-log.h: </div><div class='del'>-	implemented hard log level stuff.</div><div class='del'>-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"</div><div class='del'>-	in order to allow hard level switch.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: </div><div class='del'>-	* tests/test2.c: </div><div class='del'>-	updated to use gchar instead of GString. Tests passed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-07-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c: </div><div class='del'>-	* camel/camel-stream.h: </div><div class='del'>-	"const"-antified</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)</div><div class='del'>-	do not use any limit when constructing the object from a stream</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c: </div><div class='del'>-	* camel/camel-stream-fs.h: </div><div class='del'>-	* camel/camel-mime-message.c: </div><div class='del'>-	* camel/camel-mime-message.h: </div><div class='del'>-	* camel/camel-session.c: </div><div class='del'>-	* camel/camel-session.h: </div><div class='del'>-	* camel/camel-service.c: </div><div class='del'>-	* camel/camel-service.h:</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	* camel/camel-store.h: </div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	* camel/gmime-utils.c: </div><div class='del'>-	* camel/gmime-utils.h: </div><div class='del'>-	GString -&gt; gchar</div><div class='del'>-	constantified what had to be.</div><div class='del'>-	</div><div class='del'>-	* camel/string-utils.c: </div><div class='del'>-	* camel/string-utils.h: </div><div class='del'>-	New files. Meant to replace gstring-util for gchar *</div><div class='del'>-	</div><div class='del'>-1999-07-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): </div><div class='del'>-	GString -&gt; gchar</div><div class='del'>-	use const to indicate copied parameter.</div><div class='del'>-</div><div class='del'>-1999-07-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: </div><div class='del'>-	* camel/camel-simple-data-wrapper.h: </div><div class='del'>-	Gstring -&gt; gchar</div><div class='del'>-	</div><div class='del'>-1999-07-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c:  </div><div class='del'>-	* camel/url-util.h: </div><div class='del'>-	Do not use GStrings any more. </div><div class='del'>-	Added assertion code. </div><div class='del'>-	Cosmetic reformating</div><div class='del'>-	</div><div class='del'>-	* AUTHORS:</div><div class='del'>-	* ChangeLog:</div><div class='del'>-	Changed my email address.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-07-13  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64</div><div class='del'>-	encoder based on CamelStreams.  Should the encoder/decoder be a</div><div class='del'>-	Stream itself?</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c: include config.h here.</div><div class='del'>-	* camel/url-util.c: ditto.</div><div class='del'>-	* camel/gstring-util.c: ditto.</div><div class='del'>-	* camel/gmime-content-field.c: ditto.</div><div class='del'>-	* camel/camel-stream.c: ditto.</div><div class='del'>-	* camel/camel-stream-fs.c: ditto.</div><div class='del'>-	* camel/camel-store.c: ditto.</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: ditto.</div><div class='del'>-	* camel/camel-session.c: ditto.</div><div class='del'>-	* camel/camel-service.c: ditto.</div><div class='del'>-	* camel/camel-mime-part.c: ditto.</div><div class='del'>-	* camel/camel-mime-message.c: ditto.</div><div class='del'>-	* camel/camel-log.c: ditto.</div><div class='del'>-	* camel/camel-data-wrapper.c: ditto</div><div class='del'>-	* camel/camel-folder.c: ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_write): Moved api</div><div class='del'>-	documentation to the places that they document.</div><div class='del'>-	(camel_stream_class_init): Virtual classes do not need to have a</div><div class='del'>-	default implementation.  So null them all.</div><div class='del'>-	(camel_stream_write): Return value from write.</div><div class='del'>-	(camel_stream_available): implement.</div><div class='del'>-	(camel_stream_write_strings): documented.</div><div class='del'>-</div><div class='del'>-	* devel-docs/query/virtual-folder-in-depth.sgml: Small</div><div class='del'>-	reformatting</div><div class='del'>-</div><div class='del'>-1999-06-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): now use </div><div class='del'>-	CamelDataWrapper::contruct_form_stream to test </div><div class='del'>-	message parsing</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	construct_from_stream no longer has maximimum size arg.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): new.</div><div class='del'>-	Construct the mime_part from a stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c:</div><div class='del'>-	new field (content_type) and associated methods.</div><div class='del'>-	(camel_mime_part_init): initialize content_type field.</div><div class='del'>-	(_parse_header_pair): now set content_type MimePart field</div><div class='del'>-	instead of using DataWrapper Mime typing facility.</div><div class='del'>-</div><div class='del'>-1999-06-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	s/content_type/mime_type/</div><div class='del'>-</div><div class='del'>-1999-06-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.[ch]:</div><div class='del'>-	new class. Simple implementation of a data wrapper:</div><div class='del'>-	simply keeps the stream result in a byte array.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. </div><div class='del'>-	Have to think about the correct way to store content type stuff.</div><div class='del'>-</div><div class='del'>-1999-06-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): </div><div class='del'>-	includes gmime-utils header. </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	set separator string in write_header_with_glist_to_stream()</div><div class='del'>-	</div><div class='del'>-	* camel/camel-log.c (camel_log): </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	Do not use stderr in initialization of logfile descriptor.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	initialize mode field in open(). </div><div class='del'>-</div><div class='del'>-1999-06-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_get_content_type): </div><div class='del'>-	moved all the content-type stuff here.</div><div class='del'>-	(camel_data_wrapper_init): initialize the instance</div><div class='del'>-	content-type field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): </div><div class='del'>-	parse Content-Type stuff in header. </div><div class='del'>-	(_write_to_stream): write the content type stuff to </div><div class='del'>-	the stream.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): </div><div class='del'>-	new function, returns "type/subtype" mime type string.</div><div class='del'>-	(gmime_content_field_construct_from_string): </div><div class='del'>-	new function, construbt a content_field object</div><div class='del'>-	form a string. be used to set the mime_type from a</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_content_type): </div><div class='del'>-	(camel_mime_part_set_content_type): </div><div class='del'>-	(_get_content_type): </div><div class='del'>-	(_get_content_type): </div><div class='del'>-	new methods.</div><div class='del'>-</div><div class='del'>-1999-06-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	replace CR/LF+'\t' with ' ' </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	trim \t when splitting</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_file): </div><div class='del'>-	corrected bug in scanning tabulations ('t' -&gt; '\t')</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): read mail.test instead</div><div class='del'>-	of mail1.test</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_add_header): </div><div class='del'>-	added comments </div><div class='del'>-</div><div class='del'>-1999-06-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/query/virtual-folder-in-depth.sgml: </div><div class='del'>-	sgmlized Giao's doc about virtual folders.</div><div class='del'>-</div><div class='del'>-1999-05-31  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): </div><div class='del'>-	use new stream code instead of raw file * stuff.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	new func. Will replace get_header_table_from_file and will</div><div class='del'>-	be used to parse headers from files as well as from </div><div class='del'>-	memory buffers.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c:</div><div class='del'>-	CamelStream Subclass. File system based</div><div class='del'>-	stream.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>- 	* camel/camel-stream.h: new class. Represents an </div><div class='del'>-	abstract stream object.</div><div class='del'>-</div><div class='del'>-       * camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	remove leading and trailing spaces in recipient addresses.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (_store_header_pair_from_gstring): </div><div class='del'>-	remove leading and trailing spaces from header values.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_trim): new</div><div class='del'>-	func: remove leading or trailng chars from </div><div class='del'>-	a specified char set.</div><div class='del'>-	(g_string_split): allow trimming of substrings.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): remove gtk_main call</div><div class='del'>-</div><div class='del'>-1999-05-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c </div><div class='del'>-	(_parse_header_pair): </div><div class='del'>-	(_init_header_name_table): </div><div class='del'>-	More header parsing code.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-05-27  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): rewrite message obtained via</div><div class='del'>-	parsing into a file. Actually, it works pretty well :))</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	create recipient list form a comma separated string.</div><div class='del'>-	(_parse_header_pair): added recipient lists parsing.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): </div><div class='del'>-	new (protected) method. Parse a head pair and</div><div class='del'>-	decides what to do with it.</div><div class='del'>-	</div><div class='del'>-	(_add_header): Call in _parse_header_pair</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_parse_header_pair): </div><div class='del'>-	overload  header parsing MimePart mthod.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_split): </div><div class='del'>-	new func: split a gstring into a GList of</div><div class='del'>-	substring.</div><div class='del'>-</div><div class='del'>-1999-05-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_lines_from_file): </div><div class='del'>-	new func. Parses message header zone and returns</div><div class='del'>-	a Glist of all header lines.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c: tests message parsing</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (write_header_table_to_file): </div><div class='del'>-	new func to write a table of headers.</div><div class='del'>-</div><div class='del'>-1999-05-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): </div><div class='del'>-	recipient list printing</div><div class='del'>-	</div><div class='del'>-	* tests/test1.c (main): more tests.</div><div class='del'>-</div><div class='del'>-1999-05-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_write_to_file): test if content</div><div class='del'>-	exists before calling its write_to method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): bugs fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): </div><div class='del'>-	new func. Creates a message with the session field set</div><div class='del'>-	up correctly.</div><div class='del'>-</div><div class='del'>-1999-05-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): tests</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): </div><div class='del'>-	started write_to framework for mime_messages</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (*_message_number): </div><div class='del'>-	message number funcs.</div><div class='del'>-	</div><div class='del'>-1999-05-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (*_flag): </div><div class='del'>-	flags handling methods</div><div class='del'>-</div><div class='del'>-1999-05-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_class_init): </div><div class='del'>-	added recipient handling class funcs.</div><div class='del'>-</div><div class='del'>-1999-05-13  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-        </div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): </div><div class='del'>-	create recipients hash table</div><div class='del'>-	(_remove_recipient): </div><div class='del'>-	(_add_recipient):</div><div class='del'>-	(_get_recipients):  new funcs.</div><div class='del'>-	Internal Recipients data structure is</div><div class='del'>-	a bit complicated though.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_init): </div><div class='del'>-	create headers hash table</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: </div><div class='del'>-	a bunch of get/set header field</div><div class='del'>-	method done. Does nothing yet though.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.[ch] :</div><div class='del'>-	new file. </div><div class='del'>-</div><div class='del'>-1999-05-12  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h (struct ): </div><div class='del'>-	disposition is now a full GMimeContentField</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c: new file</div><div class='del'>-	handle "type/subtype ;parameter=value ; parameter=value ..."</div><div class='del'>-	BNF grammar elements</div><div class='del'>-	(gmime_content_field_write_to_file): new func</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): </div><div class='del'>-	namespace change</div><div class='del'>-</div><div class='del'>-1999-05-11  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_write_to_file): </div><div class='del'>-	overload wrapper class method.</div><div class='del'>-	(_write_to_file): start to write some text in </div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: typo fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	* camel/camel-service.c: </div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/camel-mime-part.c: </div><div class='del'>-	static functions naming follows gnome </div><div class='del'>-	coding style guide.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h: implemented public interfaces</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-10  Bertrand Guiheneuf  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): </div><div class='del'>-	(__camel_mime_part_set_header_lines): </div><div class='del'>-	(__camel_mime_part_get_content_languages): </div><div class='del'>-	(__camel_mime_part_set_content_languages): </div><div class='del'>-	(__camel_mime_part_get_encoding): </div><div class='del'>-	(__camel_mime_part_set_encoding): </div><div class='del'>-	(__camel_mime_part_get_content_MD5): </div><div class='del'>-	(__camel_mime_part_set_content_MD5): </div><div class='del'>-	(__camel_mime_part_get_content_id): </div><div class='del'>-	(__camel_mime_part_set_content_id): </div><div class='del'>-	A bunch of new set/get func.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_list_free): </div><div class='del'>-	convenience function for string list </div><div class='del'>-	complete deallocation.</div><div class='del'>-</div><div class='del'>-1999-05-09  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (__camel_mime_part_add_header): </div><div class='del'>-	new method</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h (struct CamelMimePart):</div><div class='del'>-	added core fields.</div><div class='del'>-</div><div class='del'>-1999-05-08  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.[ch]: </div><div class='del'>-	new class. models a mime mail part.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c </div><div class='del'>-	(camel_data_wrapper_write_to_buffer): method to</div><div class='del'>-	stream data content in a buffer.</div><div class='del'>-	(camel_data_wrapper_write_to_file): </div><div class='del'>-	(camel_data_wrapper_construct_from_buffer): </div><div class='del'>-	(camel_data_wrapper_construct_from_file): </div><div class='del'>-	new methods.</div><div class='del'>-	</div><div class='del'>-1999-05-07  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.[ch]:new class.</div><div class='del'>-	This should not be a class but rather an </div><div class='del'>-	interface. The day Gtk support interfaces, </div><div class='del'>-	it dataWrapper should become an interface.</div><div class='del'>-</div><div class='del'>-1999-05-04  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (camel_service_get_url): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/camel-sections.txt: added </div><div class='del'>-	function doc references</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (__camel_folder_close): </div><div class='del'>-	fixed indentation.</div><div class='del'>-	(camel_folder_expunge): new method.</div><div class='del'>-	(__camel_folder_close): used expunge flag</div><div class='del'>-</div><div class='del'>-1999-05-03  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_mode): </div><div class='del'>-	typo fix</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (__camel_folder_list_subfolders): </div><div class='del'>-	new func.</div><div class='del'>-</div><div class='del'>-	* some doc stuffs</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-01  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c </div><div class='del'>-	(__camel_folder_get_mode): </div><div class='del'>-	(camel_folder_get_mode): </div><div class='del'>-	(camel_folder_get_parent_store): </div><div class='del'>-	(__camel_folder_get_parent_store): </div><div class='del'>-	(camel_folder_get_parent_folder): </div><div class='del'>-	(__camel_folder_get_parent_folder): </div><div class='del'>-	new methods</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c: put __ prefix before</div><div class='del'>-	private virtual funcs.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_delete): </div><div class='del'>-	(camel_folder_delete_messages): </div><div class='del'>-	new methods.</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_new): some</div><div class='del'>-	more comments </div><div class='del'>-</div><div class='del'>-1999-04-27  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_create): </div><div class='del'>-	new public function.</div><div class='del'>-</div><div class='del'>-1999-04-25  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store_from_provider): </div><div class='del'>-	initialize folder object.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (init): new method.</div><div class='del'>-	called by session object at instantiation time.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.h (struct _CamelStore): </div><div class='del'>-	new fields : session and url_name</div><div class='del'>-</div><div class='del'>-1999-04-25  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_set_provider): </div><div class='del'>-	new method to set the default provider for a protocol.</div><div class='del'>-	(camel_session_get_store_from_provider): </div><div class='del'>-	new method to instantiate a folder from a provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.h: s/GString/gchar/g</div><div class='del'>-	+ typo fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.[ch]:</div><div class='del'>-	basic provider structure. Have to write the</div><div class='del'>-	code for dynamic loading.</div><div class='del'>-</div><div class='del'>-1999-04-24  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/url-util.[ch]: s/new_g_url/g_url_new</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (new_g_url): URL </div><div class='del'>-	rewritten completely. Error handling not</div><div class='del'>-	implemented in public functions.</div><div class='del'>-	But URL scan works pretty well :)))</div><div class='del'>-</div><div class='del'>-1999-04-24 bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/url-util.[ch]: I needed the url </div><div class='del'>-	functions to use GString, and I wanted a more</div><div class='del'>-	general scheme so I finally started rewriting </div><div class='del'>-	the whole thing from scratch.</div><div class='del'>-	No more code from gzilla :(</div><div class='del'>-	</div><div class='del'>-1999-04-23  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.[ch]:</div><div class='del'>-	Utility functions to parse URLs.</div><div class='del'>-	Stolen shamelessly from gzilla (www.gzilla.com)</div><div class='del'>-	written by Raph Levien &lt;raph@acm.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/Makefile.am: added url-util.[ch]</div><div class='del'>-	compilation.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): removed devel-docs</div><div class='del'>-	until I come up with a correct Makefile.am</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.h: </div><div class='del'>-	* camel/camel-folder.h:</div><div class='del'>-	correct declarations of structs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-04-22  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c:</div><div class='del'>-	more test implementation.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (camel_store_get_type): typo fix</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-04-21  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): </div><div class='del'>-	start test provider.</div><div class='del'>-</div><div class='del'>-1999-04-20  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-store.h: now CamelStore inherits from</div><div class='del'>-	CamelService.</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (camel_service_class_init): </div><div class='del'>-	basic abstract service class.</div><div class='del'>-</div><div class='del'>-1999-04-19  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/README: added some (few) explanations.</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.[ch]: started implementation</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_type): typo</div><div class='del'>-	uncommented the store related code.</div><div class='del'>-	(camel_folder_create): enable som store relted code. </div><div class='del'>-	Not finished. Have to define public methods first.</div><div class='del'>-</div><div class='del'>-	* camel/camel-log.h: some explanation about the </div><div class='del'>-	log system</div><div class='del'>-</div><div class='del'>-1999-04-18   bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	(camel_folder_create): implemented (partially)</div><div class='del'>-	have to write CamelStore before finishing it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (CamelFolder): added full_name field</div><div class='del'>-	(CamelFolderClass): added set/get_full_name methods</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: some work</div><div class='del'>-	* camel/camel-log.c: log system for camel</div><div class='del'>-	* camel/gstring-util.c: some utilities for GString objects</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* autogen.sh (PKG_NAME): groomf -&gt; gnome-mailer</div><div class='del'>-</div><div class='head'>diff --git a/HACKING b/HACKING<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/HACKING?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>HACKING</a><br/>+++ /dev/null</div><div class='head'>diff --git a/INSTALL b/INSTALL<br/>deleted file mode 100644<br/>index b42a17ac46..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/INSTALL?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>INSTALL</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,182 +0,0 @@</div><div class='del'>-Basic Installation</div><div class='del'>-==================</div><div class='del'>-</div><div class='del'>-   These are generic installation instructions.</div><div class='del'>-</div><div class='del'>-   The `configure' shell script attempts to guess correct values for</div><div class='del'>-various system-dependent variables used during compilation.  It uses</div><div class='del'>-those values to create a `Makefile' in each directory of the package.</div><div class='del'>-It may also create one or more `.h' files containing system-dependent</div><div class='del'>-definitions.  Finally, it creates a shell script `config.status' that</div><div class='del'>-you can run in the future to recreate the current configuration, a file</div><div class='del'>-`config.cache' that saves the results of its tests to speed up</div><div class='del'>-reconfiguring, and a file `config.log' containing compiler output</div><div class='del'>-(useful mainly for debugging `configure').</div><div class='del'>-</div><div class='del'>-   If you need to do unusual things to compile the package, please try</div><div class='del'>-to figure out how `configure' could check whether to do them, and mail</div><div class='del'>-diffs or instructions to the address given in the `README' so they can</div><div class='del'>-be considered for the next release.  If at some point `config.cache'</div><div class='del'>-contains results you don't want to keep, you may remove or edit it.</div><div class='del'>-</div><div class='del'>-   The file `configure.in' is used to create `configure' by a program</div><div class='del'>-called `autoconf'.  You only need `configure.in' if you want to change</div><div class='del'>-it or regenerate `configure' using a newer version of `autoconf'.</div><div class='del'>-</div><div class='del'>-The simplest way to compile this package is:</div><div class='del'>-</div><div class='del'>-  1. `cd' to the directory containing the package's source code and type</div><div class='del'>-     `./configure' to configure the package for your system.  If you're</div><div class='del'>-     using `csh' on an old version of System V, you might need to type</div><div class='del'>-     `sh ./configure' instead to prevent `csh' from trying to execute</div><div class='del'>-     `configure' itself.</div><div class='del'>-</div><div class='del'>-     Running `configure' takes awhile.  While running, it prints some</div><div class='del'>-     messages telling which features it is checking for.</div><div class='del'>-</div><div class='del'>-  2. Type `make' to compile the package.</div><div class='del'>-</div><div class='del'>-  3. Optionally, type `make check' to run any self-tests that come with</div><div class='del'>-     the package.</div><div class='del'>-</div><div class='del'>-  4. Type `make install' to install the programs and any data files and</div><div class='del'>-     documentation.</div><div class='del'>-</div><div class='del'>-  5. You can remove the program binaries and object files from the</div><div class='del'>-     source code directory by typing `make clean'.  To also remove the</div><div class='del'>-     files that `configure' created (so you can compile the package for</div><div class='del'>-     a different kind of computer), type `make distclean'.  There is</div><div class='del'>-     also a `make maintainer-clean' target, but that is intended mainly</div><div class='del'>-     for the package's developers.  If you use it, you may have to get</div><div class='del'>-     all sorts of other programs in order to regenerate files that came</div><div class='del'>-     with the distribution.</div><div class='del'>-</div><div class='del'>-Compilers and Options</div><div class='del'>-=====================</div><div class='del'>-</div><div class='del'>-   Some systems require unusual options for compilation or linking that</div><div class='del'>-the `configure' script does not know about.  You can give `configure'</div><div class='del'>-initial values for variables by setting them in the environment.  Using</div><div class='del'>-a Bourne-compatible shell, you can do that on the command line like</div><div class='del'>-this:</div><div class='del'>-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure</div><div class='del'>-</div><div class='del'>-Or on systems that have the `env' program, you can do it like this:</div><div class='del'>-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure</div><div class='del'>-</div><div class='del'>-Compiling For Multiple Architectures</div><div class='del'>-====================================</div><div class='del'>-</div><div class='del'>-   You can compile the package for more than one kind of computer at the</div><div class='del'>-same time, by placing the object files for each architecture in their</div><div class='del'>-own directory.  To do this, you must use a version of `make' that</div><div class='del'>-supports the `VPATH' variable, such as GNU `make'.  `cd' to the</div><div class='del'>-directory where you want the object files and executables to go and run</div><div class='del'>-the `configure' script.  `configure' automatically checks for the</div><div class='del'>-source code in the directory that `configure' is in and in `..'.</div><div class='del'>-</div><div class='del'>-   If you have to use a `make' that does not supports the `VPATH'</div><div class='del'>-variable, you have to compile the package for one architecture at a time</div><div class='del'>-in the source code directory.  After you have installed the package for</div><div class='del'>-one architecture, use `make distclean' before reconfiguring for another</div><div class='del'>-architecture.</div><div class='del'>-</div><div class='del'>-Installation Names</div><div class='del'>-==================</div><div class='del'>-</div><div class='del'>-   By default, `make install' will install the package's files in</div><div class='del'>-`/usr/local/bin', `/usr/local/man', etc.  You can specify an</div><div class='del'>-installation prefix other than `/usr/local' by giving `configure' the</div><div class='del'>-option `--prefix=PATH'.</div><div class='del'>-</div><div class='del'>-   You can specify separate installation prefixes for</div><div class='del'>-architecture-specific files and architecture-independent files.  If you</div><div class='del'>-give `configure' the option `--exec-prefix=PATH', the package will use</div><div class='del'>-PATH as the prefix for installing programs and libraries.</div><div class='del'>-Documentation and other data files will still use the regular prefix.</div><div class='del'>-</div><div class='del'>-   In addition, if you use an unusual directory layout you can give</div><div class='del'>-options like `--bindir=PATH' to specify different values for particular</div><div class='del'>-kinds of files.  Run `configure --help' for a list of the directories</div><div class='del'>-you can set and what kinds of files go in them.</div><div class='del'>-</div><div class='del'>-   If the package supports it, you can cause programs to be installed</div><div class='del'>-with an extra prefix or suffix on their names by giving `configure' the</div><div class='del'>-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.</div><div class='del'>-</div><div class='del'>-Optional Features</div><div class='del'>-=================</div><div class='del'>-</div><div class='del'>-   Some packages pay attention to `--enable-FEATURE' options to</div><div class='del'>-`configure', where FEATURE indicates an optional part of the package.</div><div class='del'>-They may also pay attention to `--with-PACKAGE' options, where PACKAGE</div><div class='del'>-is something like `gnu-as' or `x' (for the X Window System).  The</div><div class='del'>-`README' should mention any `--enable-' and `--with-' options that the</div><div class='del'>-package recognizes.</div><div class='del'>-</div><div class='del'>-   For packages that use the X Window System, `configure' can usually</div><div class='del'>-find the X include and library files automatically, but if it doesn't,</div><div class='del'>-you can use the `configure' options `--x-includes=DIR' and</div><div class='del'>-`--x-libraries=DIR' to specify their locations.</div><div class='del'>-</div><div class='del'>-Specifying the System Type</div><div class='del'>-==========================</div><div class='del'>-</div><div class='del'>-   There may be some features `configure' can not figure out</div><div class='del'>-automatically, but needs to determine by the type of host the package</div><div class='del'>-will run on.  Usually `configure' can figure that out, but if it prints</div><div class='del'>-a message saying it can not guess the host type, give it the</div><div class='del'>-`--host=TYPE' option.  TYPE can either be a short name for the system</div><div class='del'>-type, such as `sun4', or a canonical name with three fields:</div><div class='del'>-     CPU-COMPANY-SYSTEM</div><div class='del'>-</div><div class='del'>-See the file `config.sub' for the possible values of each field.  If</div><div class='del'>-`config.sub' isn't included in this package, then this package doesn't</div><div class='del'>-need to know the host type.</div><div class='del'>-</div><div class='del'>-   If you are building compiler tools for cross-compiling, you can also</div><div class='del'>-use the `--target=TYPE' option to select the type of system they will</div><div class='del'>-produce code for and the `--build=TYPE' option to select the type of</div><div class='del'>-system on which you are compiling the package.</div><div class='del'>-</div><div class='del'>-Sharing Defaults</div><div class='del'>-================</div><div class='del'>-</div><div class='del'>-   If you want to set default values for `configure' scripts to share,</div><div class='del'>-you can create a site shell script called `config.site' that gives</div><div class='del'>-default values for variables like `CC', `cache_file', and `prefix'.</div><div class='del'>-`configure' looks for `PREFIX/share/config.site' if it exists, then</div><div class='del'>-`PREFIX/etc/config.site' if it exists.  Or, you can set the</div><div class='del'>-`CONFIG_SITE' environment variable to the location of the site script.</div><div class='del'>-A warning: not all `configure' scripts look for a site script.</div><div class='del'>-</div><div class='del'>-Operation Controls</div><div class='del'>-==================</div><div class='del'>-</div><div class='del'>-   `configure' recognizes the following options to control how it</div><div class='del'>-operates.</div><div class='del'>-</div><div class='del'>-`--cache-file=FILE'</div><div class='del'>-     Use and save the results of the tests in FILE instead of</div><div class='del'>-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for</div><div class='del'>-     debugging `configure'.</div><div class='del'>-</div><div class='del'>-`--help'</div><div class='del'>-     Print a summary of the options to `configure', and exit.</div><div class='del'>-</div><div class='del'>-`--quiet'</div><div class='del'>-`--silent'</div><div class='del'>-`-q'</div><div class='del'>-     Do not print messages saying which checks are being made.  To</div><div class='del'>-     suppress all normal output, redirect it to `/dev/null' (any error</div><div class='del'>-     messages will still be shown).</div><div class='del'>-</div><div class='del'>-`--srcdir=DIR'</div><div class='del'>-     Look for the package's source code in directory DIR.  Usually</div><div class='del'>-     `configure' can determine that directory automatically.</div><div class='del'>-</div><div class='del'>-`--version'</div><div class='del'>-     Print the version of Autoconf used to generate the `configure'</div><div class='del'>-     script, and exit.</div><div class='del'>-</div><div class='del'>-`configure' also accepts some other, not widely useful, options.</div><div class='head'>diff --git a/MAINTAINERS b/MAINTAINERS<br/>deleted file mode 100644<br/>index 602e3bf73b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/MAINTAINERS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>MAINTAINERS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Email: ettore@ximian.com</div><div class='del'>-Email: danw@ximian.com</div><div class='del'>-Email: chris@ximian.com</div><div class='del'>-Email: federico@ximian.com</div><div class='del'>-Email: iain@ximian.com</div><div class='head'>diff --git a/Makefile.am b/Makefile.am<br/>deleted file mode 100644<br/>index df0a66c3fb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-changelogs =			\</div><div class='del'>-	ChangeLog</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			\</div><div class='del'>-	AUTHORS			\</div><div class='del'>-	$(changelogs)		\</div><div class='del'>-	COPYING-DOCS		\</div><div class='del'>-	README			\</div><div class='del'>-	HACKING			\</div><div class='del'>-	MAINTAINERS		\</div><div class='del'>-	NEWS			\</div><div class='del'>-	xml-i18n-merge.in	\</div><div class='del'>-	xml-i18n-update.in	\</div><div class='del'>-	xml-i18n-extract.in</div><div class='del'>-</div><div class='del'>-SUBDIRS =			\</div><div class='del'>-        intl                    \</div><div class='del'>-        macros                  \</div><div class='del'>-        data                    \</div><div class='del'>-        e-util                  \</div><div class='del'>-	libical			\</div><div class='del'>-        widgets                 \</div><div class='del'>-        shell                   \</div><div class='del'>-        camel                   \</div><div class='del'>-        filter                  \</div><div class='del'>-        libversit               \</div><div class='del'>-	libwombat		\</div><div class='del'>-	addressbook             \</div><div class='del'>-        composer                \</div><div class='del'>-        mail                    \</div><div class='del'>-        calendar                \</div><div class='del'>-        wombat                  \</div><div class='del'>-	importers		\</div><div class='del'>-	my-evolution		\</div><div class='del'>-        art                     \</div><div class='del'>-	sounds			\</div><div class='del'>-	ui			\</div><div class='del'>-        default_user            \</div><div class='del'>-	views			\</div><div class='del'>-        tools                   \</div><div class='del'>-	doc			\</div><div class='del'>-	help			\</div><div class='del'>-        po			\</div><div class='del'>-	omf-install</div><div class='del'>-</div><div class='head'>diff --git a/NEWS b/NEWS<br/>deleted file mode 100644<br/>index c9e577e07a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/NEWS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>NEWS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2408 +0,0 @@</div><div class='del'>-*** SOMEONE SHOULD MERGE NEWS FROM THE 1-0 BRANCH HERE ***</div><div class='del'>-</div><div class='del'>-Evolution 0.99.2 (Release Candidate 2), 2001-11-14</div><div class='del'>---------------------------------------------------</div><div class='del'>-</div><div class='del'>-Misc:</div><div class='del'>-  #14783 -- killev does not check for system type properly</div><div class='del'>-  #14630 -- HTML docs refer to missing gifs in stylesheet-images</div><div class='del'>-  #15027 -- Typos in the docs</div><div class='del'>-  #15028 -- Corrections to the user documentation</div><div class='del'>-  #15056 -- Spelling Error</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-   #6295 -- Go to folder dialog should have the e-tree focused</div><div class='del'>-  #13872 -- Crash</div><div class='del'>-</div><div class='del'>-Summary</div><div class='del'>-</div><div class='del'>-  #13478 -- Summary hangs at startup</div><div class='del'>-  #14518 -- Crashing while starting the program</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  #10560 -- Messages in Korean charset displayed as blank</div><div class='del'>-  #10735 -- Extra cruft at bottom of Compose window's View menu</div><div class='del'>-  #11177 -- Closing main window while dialog up, hangs</div><div class='del'>-  #11647 -- "Body contains" and "Body does not contain" searches are</div><div class='del'>-            matching strings in the message header</div><div class='del'>-  #13996 -- Searches not available in IMAP in offline mode</div><div class='del'>-  #14351 -- pgp 5.5.8 not supported, recognized as 2.6.x</div><div class='del'>-  #14361 -- IMAP/SSL APPENDs hang</div><div class='del'>-  #14542 -- Crash pressing ctrl-a ctrl-k</div><div class='del'>-  #14569 -- Crash when moving a folder</div><div class='del'>-  #14620 -- Weird font issue in Mdk 7.2</div><div class='del'>-  #14659 -- GPG messages are truncated</div><div class='del'>-  #14672 -- evolution-mail crashes on startup</div><div class='del'>-  #14794 -- PGP signing problem, complaining about 2.6.x when 6.5.1</div><div class='del'>-            is installed</div><div class='del'>-  #14826 -- Crashed the editor by using Alt-C (capitalize word)</div><div class='del'>-  #14838 -- Saving passwords dosen't work</div><div class='del'>-  #14848 -- Forwarding wrong email in separate window when using prev/next</div><div class='del'>-            buttons</div><div class='del'>-  #14861 -- DnD a message from a folder with a space in the name fails</div><div class='del'>-  #14951 -- Cancelling before IMAP connect causes IMAP to loop forever</div><div class='del'>-  #14965 -- Message copy fails with space in folder names</div><div class='del'>-  #15038 -- Can page up or page down off of table</div><div class='del'>-  #15154 -- Long line rendering bug</div><div class='del'>-  #15267 -- Outgoing filter move/copy to folder crashes Mailer</div><div class='del'>-  #15296 -- Mailer hangs when fetching mail</div><div class='del'>-  #15324 -- Table handling code not rendering centered content when</div><div class='del'>-	    it should</div><div class='del'>-  #15374 -- "___" in autogenerated name of vfolder created by sender of message</div><div class='del'>-  #15393 -- Pointer grab when shift-double clicking</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-   #9501 -- Appointment Editor has "Save changes?" confirmation but</div><div class='del'>-            Contact editor does not</div><div class='del'>-  #14107 -- Crash: Address auto-complete pop-up appears after sending mail</div><div class='del'>-  #14646 -- Doesn't handle failure in default_book case</div><div class='del'>-  #14743 -- Contacts crashes when saving a List</div><div class='del'>-  #14780 -- Pushing categories in Contact editor crashes Contacts</div><div class='del'>-  #17355 -- e-select-names/completion from arbitrary storages</div><div class='del'>-</div><div class='del'>-Pilot conduits:</div><div class='del'>-</div><div class='del'>-  #9465  -- Palm Addressbook sync corrupts character set</div><div class='del'>-  #14562 -- Crash</div><div class='del'>-  #15355 -- Bogus warning in calendar conduit</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  #10285 -- Problem printing the calendar</div><div class='del'>-  #13631 -- Left-over debug print</div><div class='del'>-  #14021 -- Problems entering a task</div><div class='del'>-  #14335 -- UTF-8 Error in schedule meeting</div><div class='del'>-  #14337 -- Meeting is added to calender even when selecting decline</div><div class='del'>-  #14362 -- Appointments (public or private) don't show in the Day</div><div class='del'>-	    view of the calendar</div><div class='del'>-  #14392 -- Event editor removes wrong pages when object updated</div><div class='del'>-  #14524 -- Meeting page dragging broken for all day events</div><div class='del'>-  #14655 -- evolution-alarm-notify crash on start</div><div class='del'>-  #14687 -- load_uri failures are not noticed by the client talking</div><div class='del'>-            to the wombat</div><div class='del'>-  #14704 -- Free/busy info not in UTC</div><div class='del'>-  #14765 -- Schedule page timezone problems</div><div class='del'>-  #14842 -- EWeekView - typing in event &amp; day incorrect</div><div class='del'>-  #14845 -- Crash assigning category to new task</div><div class='del'>-  #14941 -- Crash</div><div class='del'>-  #15137 -- Crash when double clicking on empty appointment</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.99.0 (1.0 Release Candidate 1), 2001-11-05</div><div class='del'>-----------------------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Fixed problems with icons not showing up in the druids.  (Ettore,</div><div class='del'>-    Anna)</div><div class='del'>-</div><div class='del'>-  - Fixed some dnd brokenness.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some random crashes and made the shell more robust in case</div><div class='del'>-    of activation problems or components crashing.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Implemented a newer, prettier about box.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Made sure the quit message always gets displayed.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Made sure the shell doesn't allow for folder names with slashes.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Made the folder selection and folder creation dialogs play better</div><div class='del'>-    with the WM for out-of-proc components.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Make sure components don't display dialogs before the shell</div><div class='del'>-    windows are displayed.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some problems with copying/transferring/renaming folders.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Made the pop-up folder bar have the expected size when popped up.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  - Fixed SMTP truncation, IMAP/SSL truncation/hangs when</div><div class='del'>-    sending/appending messages.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Implemented rename for imap/maildir folders.  Rename also tracked</div><div class='del'>-    in vfolder and filter code.  Use rename for local folders when we</div><div class='del'>-    can instead of copy/delete.  (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed startup wizard next page race bugs. (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed toolbars vanishing, Bonobo Suxors. (Michael)</div><div class='del'>-</div><div class='del'>-  - Made filter/vfolder on mailing lists honour domains, but also</div><div class='del'>-    backward compatible.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed the password coming up behind the main window.  (Michael,</div><div class='del'>-    Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed numerous crash on startup/exit/while doing nothing/switching</div><div class='del'>-    folder/components, many races and other architectural errors.</div><div class='del'>-    (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Bunch of vFolder fixes and feature completion. (Michael)</div><div class='del'>-</div><div class='del'>-  - Added a 'index body' option to configure folder.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed 'unread' counts, again.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed some problems leaking file descriptors and overusing them</div><div class='del'>-    when not necessary.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Implemented iconv() caching and Solaris friendly iconv name</div><div class='del'>-    converter.  Made override display charset work in more cases.</div><div class='del'>-    (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Various untranslated buttons/menus and other translation issues</div><div class='del'>-    fixed.  (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Offline searching in IMAP. (Michael)</div><div class='del'>-</div><div class='del'>-  - Don't warn the user if he drags a message and drops it in the same</div><div class='del'>-    place.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed replying-to and forwarding messages with attachments to</div><div class='del'>-    attach the appropriate attachments in the new message.  (Jeff, Larry)</div><div class='del'>-</div><div class='del'>-  - Don't allow the user to edit the default searches and keep all the</div><div class='del'>-    search menus consistant accross all folders.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Allow the user to drag&amp;drop and/or move messages to the Trash</div><div class='del'>-    folder.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Various fixes to the filtering code.  (Jeff, Michael)</div><div class='del'>-</div><div class='del'>-  - Make various dialogs non-modal.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixes to POP3 UID caching so users can "leave mail on server" and</div><div class='del'>-    not get duplicates.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixes to IMAP caching code where servers support the UIDPLUS</div><div class='del'>-    extension. Will also now un-cache a folder when the user deletes</div><div class='del'>-    it from the IMAP server.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Removed support for PGP 2.6.x due to security issues (pgp would</div><div class='del'>-    always return 0 suggesting that the signature was valid even when</div><div class='del'>-    it wasn't).  (Jeff)</div><div class='del'>-</div><div class='del'>-  - "Whitespace-only" recipients are now ignored, rather than being</div><div class='del'>-    flagged as invalid. (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed bugs related to message searching: memory leak, i18n problems,</div><div class='del'>-    etc. (Trow)</div><div class='del'>-</div><div class='del'>-  - We no longer leave stray windows lying around after doing the</div><div class='del'>-    "Add Sender to Addressbook" operation. (Trow)</div><div class='del'>-</div><div class='del'>-  - Bcc: headers are now shown when viewing drafts, sent mail. (Trow)</div><div class='del'>-</div><div class='del'>-  - Lots and lots and lots of other little and not so little things.</div><div class='del'>-    (Michael, Jeff, Dan, Trow)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - General bug fixes.  (Everybody)</div><div class='del'>-</div><div class='del'>-  - Printing fixes.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed the dreaded "this should never happen" bug.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Plugged memory leaks.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed use-score sort ordering when doing completion.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed EAddressPopup race conditions.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Implemented transfer function for shell, so moving contact</div><div class='del'>-    folders now works.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed occasional completion flakiness.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed contact count on folder bar.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixes for LDAP/multibook address completion.  (Toshok, Trow)</div><div class='del'>-</div><div class='del'>-  - Added a "Do you want to save changes?" dialog to the contact </div><div class='del'>-    and contact list editors. (Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed date (birthday and anniversary) handling for LDAP. (Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed nasty LDAP modification bug. (Toshok)</div><div class='del'>-</div><div class='del'>-  - Add a config setting (/Addressbook/default_book_uri) to specify where</div><div class='del'>-    vcards and email addresses from mail messages are stored as contacts.</div><div class='del'>-    (Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed problem that arose in an earlier beta where some contacts</div><div class='del'>-    couldn't be modified or deleted from local addressbook.</div><div class='del'>-    (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - LDIF Importer.  (Chris Toshok, Michael M. Morrison)</div><div class='del'>-</div><div class='del'>-  - Fixed Memory Leaks.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Always show the correct message about the number of contacts on the</div><div class='del'>-    message bar.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed printing of contacts.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed the incredibly annoying bug which caused completed</div><div class='del'>-    (underlined) contacts to spontaneously revert when edited.</div><div class='del'>-    (Trow)</div><div class='del'>-</div><div class='del'>-  - Better event handling in minicard view.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Fixed Bold font in select names dialog.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Show error dialog if saving a contact to a file fails.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Handle carriage returns in any contact field properly.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Summary:</div><div class='del'>-</div><div class='del'>-  - Worked around gnome-vfs problems that were causing crashes.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Set the defaults to be CNN and Boston (Ettore)</div><div class='del'>-</div><div class='del'>-  - Move the location of the RDF file to be in a place that will always exist.</div><div class='del'>-</div><div class='del'>-  - Fixed numerous bugs (Trow, iain)</div><div class='del'>-</div><div class='del'>-  - Made the offline stuff work correctly (iain)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug were the summary wouldn't retain settings if all folders,</div><div class='del'>-    or RDFs, or weather stations were removed. (iain)</div><div class='del'>-</div><div class='del'>-Importers:</div><div class='del'>-</div><div class='del'>-  - Made the pine importer work for multidepth mail folders. (iain)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Underlined accelerators now work in the editor dialogs.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Many fixes for scheduling meetings.  (JP)</div><div class='del'>-</div><div class='del'>-  - Status bar messages for long queries.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Appointments with empty summaries are now deleted from the views.</div><div class='del'>-    Also, you can press Escape to cancel editing [#780].  (Federico)</div><div class='del'>-</div><div class='del'>-  - The alarm daemon no longer displays "old" alarms twice. (Federico)</div><div class='del'>-</div><div class='del'>-  - Alarms now handle timezones correctly [#5852].  (Federico)</div><div class='del'>-</div><div class='del'>-  - Repeating alarms are now handled [#12163].  (Federico)</div><div class='del'>-</div><div class='del'>-  - The alarm daemon is launched as soon as the calendar starts, not</div><div class='del'>-    when you actually open a folder [#13867].  (Federico)</div><div class='del'>-</div><div class='del'>-  - You can now set a default reminder to be added to new appointments</div><div class='del'>-    [#13649].  (Federico)</div><div class='del'>-</div><div class='del'>-  - Fixes for printing week views [#13687, #13688].  (Damon)</div><div class='del'>-</div><div class='del'>-  - Tasks printout now matches the task list better [#10280].  (Damon)</div><div class='del'>-</div><div class='del'>-  - Better handling of DATE values, as opposed to DATE-TIME ones.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Many changes to handle the default timezone better.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Recurrence generation fixes [#11525].  (Damon)</div><div class='del'>-</div><div class='del'>-  - Fixed merging of complete VCALENDAR components.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Fixes to the folder transfer functions.  (Ettore, Federico)</div><div class='del'>-</div><div class='del'>-  - Tasks activation fixes.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Outlook interoperability fixes.  (Damon, JP)</div><div class='del'>-</div><div class='del'>-  - Miscellaneous fixes to the event/task editors.  (Damon, JP, Federico)</div><div class='del'>-</div><div class='del'>-  - New iCalendar importer.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Fixed problems introduced in Beta 6 due to the changes in the URI</div><div class='del'>-    management functions.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Prettier alarm notification dialog.  (Larry)</div><div class='del'>-</div><div class='del'>-  - Session management for the alarm daemon.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Added activity bars for long calendar operations.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Added iCal file importer.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Show error dialogs on calendar failures.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-Conduits:</div><div class='del'>-</div><div class='del'>-  - Addressbook phone numbers now preserved if they can't all be</div><div class='del'>-    synced to desktop (JP)</div><div class='del'>-</div><div class='del'>-  - Sync addressbook phone numbers from non-english pilots (JP)</div><div class='del'>-</div><div class='del'>-  - Various memory leak fixes (JP)</div><div class='del'>-</div><div class='del'>-  - Handle multi-day calendar events (without recurrences) (JP)</div><div class='del'>-</div><div class='del'>-  - Make sure task records are marked complete in every relevant field</div><div class='del'>-    (JP)</div><div class='del'>-</div><div class='del'>-  - Use new timezone stuff everywhere (JP, Damon)</div><div class='del'>-</div><div class='del'>-  - Translate task priorities better (JP)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.16 (Beta 6), 2001-10-10</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Now the shell restarts stale components from previous sessions</div><div class='del'>-    properly.  This should reduce the need for oaf-slay to only the</div><div class='del'>-    cases in which a specific component is completely stuck (which</div><div class='del'>-    hopefully should never happen).  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed the saving of the size of the shortcut bar and the folder</div><div class='del'>-    bar.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Always display a new default view for the shell, unless the user</div><div class='del'>-    specified an `evolution:' URI on the command-line.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fix the weird behavior for right click -&gt; open in new window in a</div><div class='del'>-    pop-up folder bar.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Make the copy/move and dnd code to detect copying of folders onto</div><div class='del'>-    themselves correctly.  (Ettore)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  - Bcc: addresses are now visible when browsing messages in</div><div class='del'>-    the "Sent" folder.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Various backend fixes like thread safeness of concurrent</div><div class='del'>-    triggered events, more forgiving address header decoding,</div><div class='del'>-    fixes for recent breakage to progress reports, adding a deleted</div><div class='del'>-    event/state for folders, various deadlocks.  (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed quick-searching by receipients to work.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Caching of iconv handles to improve performance of many internal</div><div class='del'>-    mail reading/indexing operations.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Major oops in mbox code that caused significant performance</div><div class='del'>-    problems getting/filtering mail fixed.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Message charsets can now be overridden by a user-chosen charset</div><div class='del'>-    encoding in the mail display.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Report errors when file cannot be attached in the composer.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - File-&gt;Folder-&gt;Properties and Delete Folder now work for VFolders.</div><div class='del'>-    (Michael)</div><div class='del'>-</div><div class='del'>-  - VFolders, Filters and Searches are saved in a safe manner so that</div><div class='del'>-    they should not be lost with quota/filled disk problems.  (Michael)</div><div class='del'>- </div><div class='del'>-  - VFolders now update with new mail on their sources.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed the "Load HTML Images" radio button options in the mail</div><div class='del'>-    config dialog to work properly.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - When an IMAP folder is deleted, removed any cached messages that</div><div class='del'>-    had been in that folder when it was "alive".  (Jeff)</div><div class='del'>-</div><div class='del'>-  - New icons for PGP signature authenticity.  (Jeff, Jimmac)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - General fixes.  (Chris Toshok, Trow, Iain, Chris Lahey, JP)</div><div class='del'>-</div><div class='del'>-  - LDAP configuration dialog fixes.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - New authentication work.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed crashes related to editing the Master Category List.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Address completion is no longer confused by whitespace.  (Trow)</div><div class='del'>-</div><div class='del'>-  - More work on having multiple wombats.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Contact names no longer mysteriously disappear when using the</div><div class='del'>-    SelectNames dialog.  (Trow)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Backend improvements (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Compilation fixes for latest Bonobo (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Fixed problem with exceptions to recurring events.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Fixed handling of UNTIL property in recurring events. (Damon)</div><div class='del'>-</div><div class='del'>-  - The alarm daemon will now notify you of alarms that should have</div><div class='del'>-    occurred while it was not running.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Handle monthly-by-day and "last day" recurrences in the conduits.  (JP)</div><div class='del'>-</div><div class='del'>-  - Added priorities to the fields in the attendee list.  (Chris)</div><div class='del'>-</div><div class='del'>-  - Enhancements to the event editor for meetings.  (JP)</div><div class='del'>-</div><div class='del'>-Summary:</div><div class='del'>-</div><div class='del'>-  - Bugfixes.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Recurring events have the correct time and date.  (Iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.15 (Beta 5), 2001-10-02</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Fixed a problem with shortcuts not appearing when created by the</div><div class='del'>-    mailer.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed right-click menu behavior for folders in the folder bar.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Got Rename to work again.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some folder copy/move/dnd bugs.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added a menu item to configure the Pilot settings.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some other miscellaneous bugs/crashes.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added ability to run the intelligent importers from the File-&gt;Import</div><div class='del'>-    menu item. (iain)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  - Fixed the multiple error-dialog thing.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixes to PGP decrypting and verification code.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Made vFolders work a lot better.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Added a confirm expunge option to the mail settings dialog.</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed the update-IMAP-unread-counts bug.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Show messages in the user's preferred charset if the message</div><div class='del'>-    itself doesn't contain charset information or if the message</div><div class='del'>-    charset is wrong (ie the system can't convert the text to utf-8).</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Many backend fixes that users won't notice.  (Michael, Jeff, Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed the crash that accompanied the invalid address warning.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Properly encode the mailto: links we generate inside of displayed</div><div class='del'>-    messages.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Improve the signature editor. (iain)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Backend improvements (JP, Rodrigo).</div><div class='del'>-</div><div class='del'>-  - The alarm daemon can now re-enter properly [#10840].  (Federico)</div><div class='del'>-</div><div class='del'>-  - Alarms can now have zero-time offsets [#7892].  (Federico)</div><div class='del'>-</div><div class='del'>-  - Warning fixes.  (Chris)</div><div class='del'>-</div><div class='del'>-  - Fixed custom Glade widgets on non-Linux systems.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed crashing problems in the event/task editor.  (Damon)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Miscellaneous bug fixes.  (Trow, Chris Toshok, Chris Lahey, JP,</div><div class='del'>-    Peter Williams)</div><div class='del'>-</div><div class='del'>-  - Better handling of addresses containing commas or other special</div><div class='del'>-    characters.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed bugs related to sending mail by left-clicking on an address</div><div class='del'>-    inside a message.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Auto-completion now matches against contact nicknames.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Added help text and generally cleaned up the contact editor.</div><div class='del'>-    (Anna)</div><div class='del'>-</div><div class='del'>-  - Handle multiple wombats properly.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Made which book to use for address completion configurable (no gui</div><div class='del'>-    for this yet.)  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Made Print Preview work in addressbook.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Pilot:</div><div class='del'>-</div><div class='del'>-  - Now syncs exception dates in calendar and addressbook notes.  (JP)</div><div class='del'>-</div><div class='del'>-  - Does not overwrite custom data on pilot.  (JP)</div><div class='del'>-</div><div class='del'>-  - Address completion no longer marks records as changed.  (JP)</div><div class='del'>-</div><div class='del'>-  - Miscellaneous other bug fixes.  (JP)</div><div class='del'>-</div><div class='del'>-Summary:</div><div class='del'>-</div><div class='del'>-  - Cache images instead of repeatedly reloading them (iain)</div><div class='del'>-</div><div class='del'>-  - Only redraw when the summary is visible (iain)</div><div class='del'>-</div><div class='del'>-  - Use the encoding specified in the RDF file (Takuo Kitame)</div><div class='del'>-</div><div class='del'>-  - Leak fixes (Larry)</div><div class='del'>-</div><div class='del'>-  - Show todays tasks works (iain)</div><div class='del'>-</div><div class='del'>-  - Make the preferences dialog nicer. (iain)</div><div class='del'>-</div><div class='del'>-Importers:</div><div class='del'>-</div><div class='del'>-  - Handle cases where the Netscape transport is nothing. (iain)</div><div class='del'>-</div><div class='del'>-Version 0.14 (Beta 4), 2001-09-21</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Lots of i18n fixes.  (Zbigniew Chyla and others)</div><div class='del'>-</div><div class='del'>-  - Made the splash screen use BackingStore.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added a quit dialog box.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed a shell crash that could happen when launching Evolution</div><div class='del'>-    before a previously launched instance was done initializing itself.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed other random shell crashes.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Got the shell to remember window geometries on exit.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some things for Automake 1.5 (unfinished).  (Richard</div><div class='del'>-    Boulton)</div><div class='del'>-</div><div class='del'>-  - Add nice highlighting to DnD operations in the folder tree.</div><div class='del'>-    (Ettore, Clahey)</div><div class='del'>-</div><div class='del'>-  - Fixed several leaks.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed some problems with folder creation and deletion.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Made the Summary the default folder.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Made the title bar display the unread message count again.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Had a few beers while sitting back and relaxin'.  (Jeff, Michael)</div><div class='del'>-</div><div class='del'>-  - Check for valid addresses before sending. (Trow)</div><div class='del'>-</div><div class='del'>-  - Use contact preferences when deciding whether or not to put the</div><div class='del'>-    composer into HTML mode by default. (Trow)</div><div class='del'>-</div><div class='del'>-  - Properly address mail from "hidden" contact lists. (Trow)</div><div class='del'>-</div><div class='del'>-  - Redid folder unread counts/folder tree backend code</div><div class='del'>-    completely. (Michael)</div><div class='del'>-</div><div class='del'>-  - Implemented/fixed getfolderinfo in maildir/spool/local</div><div class='del'>-    folder/vfolder, required to make unread counts work. (Michael)</div><div class='del'>-</div><div class='del'>-  - Redid 'local folder' handling code completely. (Michael, Peter)</div><div class='del'>-    Also fixed the properties dialogue to get the list of supported</div><div class='del'>-    types dynamically, and set the right one at startup. (Michael)</div><div class='del'>-</div><div class='del'>-  - Redid vfolder code in evolution-mail completely.  Main visible</div><div class='del'>-    change is they open at startup, and the vfolder editor works</div><div class='del'>-    much better.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Made it so fcntl(2) locking failures on filesystems (e.g. NFS)</div><div class='del'>-    that dont support locking are treated as success. (Michael)</div><div class='del'>-</div><div class='del'>-  - Fix imap inbox filtering, then moved it to CamelFolder, and</div><div class='del'>-    partly implemented it for spool and maildir mailboxes.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Made the vfolder UNMATCHED folder's name translatable.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Change the way the 'not body contains' filter rule works, so that</div><div class='del'>-    it runs much more efficiently, particularly on IMAP.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Camel will not try and convert charsets of data that contain</div><div class='del'>-    invalid charset data, thus data will not be tainted by</div><div class='del'>-    a failed conversion process. (Michael)</div><div class='del'>-</div><div class='del'>-  - A few threading scheduling changes to try to optimise the user</div><div class='del'>-    experience.  Also changed the way threads are terminated,</div><div class='del'>-    avoiding some possible libpthread bugs.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Changed vfolder uri's to not include the query, set it separately.</div><div class='del'>-</div><div class='del'>-  - Removed a lot of special case code for vfolder/file uri's, other</div><div class='del'>-    dead or newly redundant code, cleanups, etc.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug in libibex that would overallocate block data and</div><div class='del'>-    corrupt it and crash, also fail-back and reset the index in</div><div class='del'>-    more cases.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fix filtering on score so the expression compiles. (Michael)</div><div class='del'>-</div><div class='del'>-  - Came to visit USA at a very wrong time.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Removed X-Evolution headers before sending messages.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - When configuring a new default account, make sure to set it as the</div><div class='del'>-    default.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Convert all textual parts to 8bit before saving them, this makes</div><div class='del'>-    saved messages more human readable.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Don't cache PGP passphrases unless the user requests to do so.</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Unsubscribe from folders before deleting them.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed a number of race conditions in the subscribe dialog.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Save transport (SMTP) passwords if the user has asked us to.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Hide the S/MIME frame in the account editor, we won't be</div><div class='del'>-    supporting it for 1.0.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed it so that icons are displayed for PGP messages.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Give a description for each of the Source and Transport types when</div><div class='del'>-    configuring an account. This makes a few things less confusing.</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - When performing a Send &amp; Receive on a disconnected IMAP server, if</div><div class='del'>-    the user provides a password, connect tot he IMAP server and display</div><div class='del'>-    it's folders too.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Return a folder info for each IMAP folder created when the user</div><div class='del'>-    creates a recursive directory structure.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Added support for more charset conversions (including all</div><div class='del'>-    Windows-cp125x charsets).  (Jeff)</div><div class='del'>-</div><div class='del'>-  - When the disk is full, warn the user and don't crash.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Handle POP servers that don't support the UIDL extension.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Several PGP fixes.  (Jeff)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Miscellaneous bug fixes. (Jon Trowbridge, Chris Toshok, Chris Lahey,</div><div class='del'>-    Ettore Perazzoli, Iain Holmes, Zbigniew Chyla, Jacob Berkman)</div><div class='del'>-</div><div class='del'>-  - Fixed race conditions associated with adding/removing contacts.</div><div class='del'>-    The addressbook should be much more stable now.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed reference counting bugs in addressbook &amp; wombat.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Made address lookup smarter; cut &amp; paste of address now mostly works.</div><div class='del'>-    (Trow)</div><div class='del'>-</div><div class='del'>-  - Plugged Trow's memory leaks.  (Larry)</div><div class='del'>-</div><div class='del'>-  - Name completion now works with one-word names, so it is now much</div><div class='del'>-    easier to send mail to Cher.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Better handling of contact lists in the composer entries.  (Trow,</div><div class='del'>-    Toshok)</div><div class='del'>-</div><div class='del'>-  - SelectNames dialog fixes.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Better handling of contact lists in the pilot conduits.  (JP)</div><div class='del'>-</div><div class='del'>-  - Added Free busy URL and Calendar URI info to contact editor and</div><div class='del'>-    ECard.  (JP)</div><div class='del'>-</div><div class='del'>-  - Made it so you can select uneditable text in Contact Editor.</div><div class='del'>-    (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Worked on LDAP dialog.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - General LDAP work.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed charset handling within VCard handling.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Reworked Drag &amp; Drop for card view.</div><div class='del'>-</div><div class='del'>-Calendar &amp; Tasks:</div><div class='del'>-</div><div class='del'>-  - Free/Busy changes.  (JP, Rodrigo)</div><div class='del'>-</div><div class='del'>-  - iTIP fixes (JP)</div><div class='del'>-</div><div class='del'>-  - i18n fixes, particularly for printing (Zbigniew Chyla)</div><div class='del'>-</div><div class='del'>-  - Added option to confirm deletions (Federico)</div><div class='del'>-</div><div class='del'>-  - Improved alarm system (Federico)</div><div class='del'>-</div><div class='del'>-  - Fixed crashing bug when deleting a folder (Federico)</div><div class='del'>-</div><div class='del'>-  - Added option to hide completed tasks (Damon)</div><div class='del'>-</div><div class='del'>-  - Timezone changes for interoperability with Outlook (Damon)</div><div class='del'>-</div><div class='del'>-  - Fixed problems displaying/parsing times in locales which don't specify</div><div class='del'>-    'am' and 'pm' strings (Damon)</div><div class='del'>-</div><div class='del'>-  - Added toolbar button to delete the selected calendar event (Damon)</div><div class='del'>-</div><div class='del'>-  - Meeting selector integrated (JP)</div><div class='del'>-</div><div class='del'>-Summary:</div><div class='del'>-</div><div class='del'>-  - Fixed bugs and leaks.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Fixed bug with handling of the Slashot RDF files.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Made the Addressbook and Tasks links open the editor for</div><div class='del'>-    them.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Mail summary doesn't force all folders to be opened.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Calendar summary shows if an alarm is set for an appointment.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Timezone fixes.  (Iain, Damon)</div><div class='del'>-</div><div class='del'>-Importers:</div><div class='del'>-</div><div class='del'>-  - Fixed more bugs.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Netscape importer shouldn't crash on Movemail users anymore.</div><div class='del'>-    (Iain)</div><div class='del'>-</div><div class='del'>-  - Pine importer should import addressbooks better.  (Iain)</div><div class='del'>-</div><div class='del'>-  - VCard importer will actually import things now.  (Iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.13 (Beta 3), 2001-08-21</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Global:</div><div class='del'>-</div><div class='del'>-  - New startup assistant to create mail accounts, import mail and set </div><div class='del'>-    your timezone.  (Iain, Taylor)</div><div class='del'>-</div><div class='del'>-  - Improved the appearance and behavior of the clickable title bar and</div><div class='del'>-    the folder tree.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - "Stock" folders such as Inbox have their names translated now and</div><div class='del'>-    cannot be removed.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Moved the Summary (formerly known as "My Evolution") to be a</div><div class='del'>-    normal node instead of being the toplevel node.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some problems with copying, moving and removing folderes.</div><div class='del'>-    (Jason)</div><div class='del'>-</div><div class='del'>-  - Fixed the handling of documentation files in the Help menu.  It</div><div class='del'>-    now integrates nicely with Nautilus and Scrollkeeper.  (Aaron,</div><div class='del'>-    Kjartan)</div><div class='del'>-</div><div class='del'>-  - Implemented the `File -&gt; New' menu.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Improved error messages on start-up.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed various crashes and minor bugs.  (Ettore, Jason)</div><div class='del'>-</div><div class='del'>-  - Various UI tweaks and improvements.  (Anna, Tuomas, Jakub)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Fixed creating IMAP folders.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Add a shortcut to the INBOX of IMAP or spool stores when </div><div class='del'>-    their accounts are first created. (Peter)</div><div class='del'>-</div><div class='del'>-  - Fixed Crash on Exit bugs.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Many more i18n fixes.  (Zbigniew Chyla, Jeff and others)</div><div class='del'>-</div><div class='del'>-  - Subscribe dialog UI tweaks. (Peter, Anna)</div><div class='del'>-</div><div class='del'>-  - Displaying PGP signed messages now shows icons.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Sensitize menu items based on number of selected messages. (Peter)</div><div class='del'>-</div><div class='del'>-  - Always-sign options for PGP.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed keep-on-server for POP servers that don't support UIDL.</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Several IMAP fixes. (Peter, Jeff, Danw)</div><div class='del'>-</div><div class='del'>-  - Fix crash after conversion of an empty folder to another</div><div class='del'>-    format. (Peter)</div><div class='del'>-</div><div class='del'>-  - Ibex now limits its file descriptor usage. (Michael)</div><div class='del'>-</div><div class='del'>-  - When deleting an account, remove the shortcuts that point to it. (Peter)</div><div class='del'>-</div><div class='del'>-  - Several IMAP fixes. (Peter, Jeff, Danw)</div><div class='del'>-</div><div class='del'>-  - Miscellaneous bugfixes all around. (Peter, Jeff, Danw, Michael, others)</div><div class='del'>-</div><div class='del'>-Calendar &amp; Tasks:</div><div class='del'>-</div><div class='del'>-  - Calendar no longer crashes when you scroll a busy month view</div><div class='del'>-    (Federico).</div><div class='del'>-</div><div class='del'>-  - Performance improvements throughout (Damon).</div><div class='del'>-</div><div class='del'>-  - Improved search bar; now handles categories.  (Jon, Federico)</div><div class='del'>-</div><div class='del'>-  - The date navigator now reflects the results of the search bar.</div><div class='del'>-    (Federico)</div><div class='del'>-</div><div class='del'>-  - An empty task is no longer added when you have selected a</div><div class='del'>-    category. (Federico)</div><div class='del'>-</div><div class='del'>-  - Internationalization fixes (Zbigniew).</div><div class='del'>-</div><div class='del'>-  - Timezone fixes (Damon).</div><div class='del'>-</div><div class='del'>-  - Time transparency and component classification support (Damon).</div><div class='del'>-</div><div class='del'>-  - Folder bar now displays the selected time range (Damon).</div><div class='del'>-</div><div class='del'>-  - Improved settings dialog (Anna, Damon, Federico).</div><div class='del'>-</div><div class='del'>-  - iTIP/iMIP fixes for attendees, cancellation. (JP).</div><div class='del'>-</div><div class='del'>-  - Category icon drawing fixes. (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Alarm fixes. (Federico)</div><div class='del'>-</div><div class='del'>-  - Calendar components can be saved independently. (JP)</div><div class='del'>-</div><div class='del'>-  - New icons. (Tuomas)</div><div class='del'>-</div><div class='del'>-  - Contacts support. (Damon)</div><div class='del'>-</div><div class='del'>-  - You can double-click on appointments to edit them. (Damon)</div><div class='del'>-</div><div class='del'>-  - Share more code between the backends. (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Miscellaneous fixes all over the place. (Damon, JP, Rodrigo, Federico)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Various fixes.  (Anna Dirks, Dan Winship, Jason Leach, Jos Dehaes,</div><div class='del'>-    Kjartan Maraas, Lahey, Nat Friedman, Radek Doulik, Toshok, Trow)</div><div class='del'>-</div><div class='del'>-  - Made addressbook menus match the right click menus.  (Lahey)</div><div class='del'>-</div><div class='del'>-  - Made addressbook use camel for building email addresses.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed up phone number matching to not cause errors.  (Lahey)</div><div class='del'>-</div><div class='del'>-  - Made the alphabet bar change the current search.  (Lahey)</div><div class='del'>-</div><div class='del'>-  - Made duplicate contact matching less sensitive.  (Lahey)</div><div class='del'>-</div><div class='del'>-  - Changed advanced search to match behavior in mailer.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Redesigned LDAP server dialog.  (Anna Dirks)</div><div class='del'>-</div><div class='del'>-  - Work on addressbook authentication.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Changes to EDestination.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Magic comma work.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Redesigned ESelectNames dialog.  (Anna Dirks)</div><div class='del'>-</div><div class='del'>-  - Made LDAP changes appear in gui immediately if they're made by the</div><div class='del'>-    local client.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Made ECard hold a link to its original EBook.  (Lahey, Trow)</div><div class='del'>-</div><div class='del'>-  - Adapted for new ESearchBar. (Federico, Trow)</div><div class='del'>-</div><div class='del'>-  - Added the ability to create cards from anywhere in evolution.</div><div class='del'>-    (Lahey)</div><div class='del'>-</div><div class='del'>-  - Made searches for completion not use invalid cached data.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Encode strings typed in by the user for use in sexps.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Made EContactEditor make the save button active more often.</div><div class='del'>-    (Toshok)</div><div class='del'>-</div><div class='del'>-  - Made ESelectNames handle LDAP storages.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Added full country list to addressbook full address editor.</div><div class='del'>-    (Lahey)</div><div class='del'>-</div><div class='del'>-  - Added the contact count to the folder bar.  (Lahey)</div><div class='del'>-</div><div class='del'>-  - Updated icons.  (Damon, Ettore)</div><div class='del'>-</div><div class='del'>-  - Worked on addressbook conduit.  (JP)</div><div class='del'>-</div><div class='del'>-  - Made ESelectNames only show names on the left that aren't on the</div><div class='del'>-    right.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Fixed up minicard dragging.  (Toshok)</div><div class='del'>-</div><div class='del'>-My Evolution:</div><div class='del'>-</div><div class='del'>-  - Miscellaneous fixes all over the place. (iain)</div><div class='del'>-</div><div class='del'>-  - New icons. (Tuomas and Jakub)</div><div class='del'>-</div><div class='del'>-  - Works for people whos text colour was a light colour. (iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.12 (Beta 2), 2001-07-31</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Change the name of the local storage node from "local" to "Local</div><div class='del'>-    Folders".  (Jason)</div><div class='del'>-</div><div class='del'>-  - Fixed a problem with invalid URIs crashing the shell.  (Jason)</div><div class='del'>-</div><div class='del'>-  - Hide internal folder types (like "vtrash") from user.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed some crashes that could happen when creating folders.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed the URIs for the installed manuals in the help menu.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added a status bar to show components' tasks instead of using</div><div class='del'>-    pop-up progress dialogs.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Other miscellaneous bug and leak fixes.  (Jason, Ettore)</div><div class='del'>-</div><div class='del'>-  - Initialize GConf properly when GtkHTML is built with GConf</div><div class='del'>-    support.  (Frederic Crozat)</div><div class='del'>-</div><div class='del'>-  - Make the shortcut bar not change the current group when renaming</div><div class='del'>-    it.  (Jason)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Use new shell ActivityClient interface for progress reporting so</div><div class='del'>-    the ongoing activities appear at the bottom of the window instead of</div><div class='del'>-    using a pop-up.  (Michael)</div><div class='del'>-</div><div class='del'>-  - "Remember this password" check box added.  (Peter, Jeff)</div><div class='del'>-</div><div class='del'>-  - UI for timespan editor cleaned up.  (Peter)</div><div class='del'>-</div><div class='del'>-  - UTF8 issues with PGP and mail display addressed.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Translate some more strings.  (Jeff, Zbigniew Chyla)</div><div class='del'>-</div><div class='del'>-  - Fix camel_session_*_timeout functions.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fix application/pgp handling.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fix DnD with no messages selected.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Respect the GTK+ theme when generating the header in the mail</div><div class='del'>-    display.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Make the default date column smaller.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Don't display "0 hidden" messages.  (Peter)</div><div class='del'>-</div><div class='del'>-  - 'q' now toggles the message (pre)view.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Rename the "Date" column to "Sent".  (Peter)</div><div class='del'>-</div><div class='del'>-  - Fix saving of passwords (some passwords were being saved and</div><div class='del'>-    loaded under different URI's).  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Enter now always open the message in a new window.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Gray out unsupported authentication mechanisms.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fix saving/loading of several preferences.  (Peter, Jason)</div><div class='del'>-</div><div class='del'>-  - Overwrite attachment files correctly.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Don't lose the selection when deleting the last message.  (Jason)</div><div class='del'>-</div><div class='del'>-  - Improve guessing of which address to use when replying.  (Jeff, Jason)</div><div class='del'>-</div><div class='del'>-  - If SSL isn't supported, indicate so.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Improve handling of NoSelect IMAP folders.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Add a browse button for local mailboxes.  (Jason)</div><div class='del'>-</div><div class='del'>-  - VTrash handling improvements.  (Jeff, Peter)</div><div class='del'>-</div><div class='del'>-  - Display "unsent" in outbox summary.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Only have main view folder browsers save view settings.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Fixes to POP3 cache.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Handle variants of charset names.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Progress reporting and optimizations for IMAP.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Progress reporting for SMTP.  (Michel)</div><div class='del'>-</div><div class='del'>-  - Handle unencoded eight-bit headers.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Miscellaneous improvements to Camel backend.  (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - Several crashes fixed.  (everyone)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Fixed some warnings.  (Chris T.)</div><div class='del'>-</div><div class='del'>-  - I18n fixes.  (Zbigniew Chyla)</div><div class='del'>-</div><div class='del'>-  - Address quoting in composer bug fixed.  (Jon)</div><div class='del'>-</div><div class='del'>-  - Made it so that Other Contacts doesn't show up if you don't have</div><div class='del'>-    LDAP compiled in.  (Jason)</div><div class='del'>-</div><div class='del'>-  - Made it so that Other Contacts doesn't show up if you don't have</div><div class='del'>-    any LDAP servers configured.  (Jos Dehaes)</div><div class='del'>-</div><div class='del'>-  - General bug fixes.  (Chris T., Jon, Frederic Crozat, Jason,</div><div class='del'>-    JP, Ettore, Chris L.)</div><div class='del'>-</div><div class='del'>-  - Some LDAP cleanup.  (Chris T.)</div><div class='del'>-</div><div class='del'>-  - Crash fixes.  (Jon, Dan)</div><div class='del'>-</div><div class='del'>-  - Work on contact lists.  (Chris T., Jon)</div><div class='del'>-</div><div class='del'>-  - Made Contact Editor Save &amp; Close button not active if nothing is</div><div class='del'>-    changed.  (Chris T.)</div><div class='del'>-</div><div class='del'>-  - Added accelerators to a few dialogs.  (Taylor Hayward)</div><div class='del'>-</div><div class='del'>-  - Made evolution-vcard-importer.c load the file into the correct directory.</div><div class='del'>-    (Iain)</div><div class='del'>-</div><div class='del'>-Calendar &amp; Tasks:</div><div class='del'>-</div><div class='del'>-  - Show icons for categories.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Multiple selections for cut/copy/paste in task list.  (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Added missing underlined shortcuts for dialogs.  (Taylor)</div><div class='del'>-</div><div class='del'>-  - Many timezone-related fixes.  (Damon, Federico)</div><div class='del'>-</div><div class='del'>-  - Alarm notification dialogs.  (Federico)</div><div class='del'>-</div><div class='del'>-  - iTIP and iMIP ongoing work.  (JP)</div><div class='del'>-</div><div class='del'>-  - Consistency &amp; cosmetic fixes for dialogs and menus.  (Damon,</div><div class='del'>-    Federico)</div><div class='del'>-</div><div class='del'>-  - You can now create new calendar/tasks folders in the shell.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Printing fixes.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Added a search bar for tasks folders.  (Federico)</div><div class='del'>-</div><div class='del'>-  - The task pad in the day view is now filtered as well.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Timezone support for conduits.  (JP)</div><div class='del'>-</div><div class='del'>-  - General bug fixes.  (Federico, JP, Damon, Rodrigo)</div><div class='del'>-</div><div class='del'>-My Evolution:</div><div class='del'>-</div><div class='del'>-  - Removed the wipe trackers option.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Fix broken links in the Calendar.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Added some more German cities.   (Iain)</div><div class='del'>-</div><div class='del'>-  - Fixed the New Feed button.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Fixed the KDE and Newsforge urls.  (Iain and Jason)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.11 (Beta 1), 2001-07-12</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Drag and drop handling (Chris T.)</div><div class='del'>-</div><div class='del'>-  - Online/Offline operation (Ettore)</div><div class='del'>-</div><div class='del'>-  - Numerous code cleanups and bug fixes (Ettore &amp; Jason)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Added ability to specify a charset in the composer and for the </div><div class='del'>-    Preview Pane.  (Jeff, Danw)</div><div class='del'>-</div><div class='del'>-  - Auto-save messages during composition and composer </div><div class='del'>-    crash-recovery.  (Larry)</div><div class='del'>-</div><div class='del'>-  - Better signature file handling.  (Radek)</div><div class='del'>-</div><div class='del'>-  - File-&gt;Insert menu.  (Larry)</div><div class='del'>-</div><div class='del'>-  - Address-completion in the composer.  (Trow)</div><div class='del'>-</div><div class='del'>-  - Much improved PGP/GPG.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Cut/Copy/Paste and Drag &amp; Drop.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Disconnected IMAP, IMAP filtering, and other IMAP improvements. (Danw)</div><div class='del'>-</div><div class='del'>-  - Empty Trash On Exit.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - More informative Folder message counts (new/hidden/total).  (Peter)</div><div class='del'>-</div><div class='del'>-  - Implemented "Select Thread".  (Peter)</div><div class='del'>-</div><div class='del'>-  - Movemail fixes and improvements.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Improved/Configurable Forward/Reply functionality.  (Jeff, Trow, Danw)</div><div class='del'>-</div><div class='del'>-  - Improved Message browser window.  (Jeff, Peter)</div><div class='del'>-</div><div class='del'>-  - Load HTML images Sometimes/Always/Never.  (Danw)</div><div class='del'>-</div><div class='del'>-  - rfc2184 conformance.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Online/Offline modes.  (Ettore, Danw, Jeff)</div><div class='del'>-</div><div class='del'>-  - HTML indexing.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Spool providers.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Many i18n fixes. (Jeff, Trow, Larry, Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed saving of html signature preferences. (Peter)</div><div class='del'>-</div><div class='del'>-  - Cleaned up exiting by having remote stores sync folders (Peter)</div><div class='del'>-</div><div class='del'>-  - Attached binhex files do not cause infinite loops (Peter)</div><div class='del'>-</div><div class='del'>-  - Don't send BCC headers when sending via SMTP (Peter)</div><div class='del'>-</div><div class='del'>-  - Let you show and hide attached message/rfc822's (Peter)</div><div class='del'>-</div><div class='del'>-  - Implemented Create/Remove/Move Folder. (Jason, Jeff)</div><div class='del'>-</div><div class='del'>-  - Maildir fixes and improvments, support for subdirectories. (Michael)</div><div class='del'>-</div><div class='del'>-  - Progress reporting using via shell activity interface. (Michael)</div><div class='del'>-</div><div class='del'>-  - Many bug fixes all around.  (Michael, Jeff, Danw, Peter, Trow and others)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Cut/Copy/Paste (Chris T.)</div><div class='del'>-</div><div class='del'>-  - Improvements to address completion, matching and merging (Jon, Chris L.)</div><div class='del'>-</div><div class='del'>-  - LDAP improvements (Chris T.)</div><div class='del'>-</div><div class='del'>-  - Numerous bug fixing (Jon, Chris L., Chris T.)</div><div class='del'>-</div><div class='del'>-Calendar &amp; Tasks:</div><div class='del'>-</div><div class='del'>-  - Timezone support (Damon)</div><div class='del'>-</div><div class='del'>-  - Cut/Copy/Paste (Rodrigo)</div><div class='del'>-</div><div class='del'>-  - Event/Task editor rewrite (Federico &amp; JP)</div><div class='del'>-</div><div class='del'>-  - Improved Printing (Damon)</div><div class='del'>-</div><div class='del'>-  - Itip/Imip improvements (JP)</div><div class='del'>-</div><div class='del'>-Importers: </div><div class='del'>-</div><div class='del'>-  - Fixes, bug fixes and more fixes. (Iain &amp; Jason)</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - New graphics/icons (Jakub &amp; Tuomas)</div><div class='del'>-</div><div class='del'>-  - UI Improvements (Anna &amp; Taylor)</div><div class='del'>-</div><div class='del'>-  - 'make distcheck' should hopefully be working again (Peter)</div><div class='del'>-</div><div class='del'>-  - Have 'make install' work for non-root users in Camel, albeit</div><div class='del'>-    with a large and important warning message (Peter)</div><div class='del'>-</div><div class='del'>-My Evolution:</div><div class='del'>-</div><div class='del'>-  - Completely new and prettier My Evolution (nee Executive Summary) </div><div class='del'>-</div><div class='del'>-  - Pretty graphics (Jakub)</div><div class='del'>-</div><div class='del'>-  - Mail, Calendar and Task summaries to tell you what you need to do</div><div class='del'>-    today.</div><div class='del'>-</div><div class='del'>-  - Weather forecasts so you don't need to look out the window (I</div><div class='del'>-    dunno, hackers seem to dislike looking out the window or</div><div class='del'>-    something...)</div><div class='del'>-</div><div class='del'>-  - News feeds so you don't need to go to websites to see what news</div><div class='del'>-    articles you don't want to read.</div><div class='del'>-	</div><div class='del'>-  - Printing, you can print it out and make it look like you've got</div><div class='del'>-    lots of stuff to do when really you're just trying to pass the </div><div class='del'>-    time by playing Aisleriot or GLine all day (Iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.10 "Tasmanian Devil", 2001-04-26</div><div class='del'>-------------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Fixed some usability bugs in the folder selection and creation</div><div class='del'>-    dialogs.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added a --debug option.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Added support for drag and drop operations.  (Ettore)</div><div class='del'>-</div><div class='del'>-Mail: </div><div class='del'>-</div><div class='del'>-  - SSL (S/IMAP, S/POP, and S/SMTP).  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Virtual Trash folders in each mail storage and "Empty Trash" menu</div><div class='del'>-    item to expunge all folders in a store.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Email addresses in mail headers are now right-clickable to add</div><div class='del'>-    them to the Addressbook (Jon, Radek)</div><div class='del'>-</div><div class='del'>-  - Hide deleted messages is now a mode rather than a one-time</div><div class='del'>-    operation. (Michael)</div><div class='del'>-</div><div class='del'>-  - When sending plain text mail, use the new plain text mode of the</div><div class='del'>-    GtkHTML editor (Larry)</div><div class='del'>-</div><div class='del'>-  - Cancellable operations, cancellable/async dns lookup, slightly</div><div class='del'>-    improved progress reporting.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Allow per-identity Draft and Sent folders.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Replies quoted with "&gt; " in messages are now displayed dimmed to</div><div class='del'>-    make it easier to find the new bits of text. (Radek)</div><div class='del'>-</div><div class='del'>-  - Saved searches.  Searches now configurable via XML with supporting</div><div class='del'>-    C code.  (Michael)</div><div class='del'>-</div><div class='del'>-  - UNMATCHED vFolder (shows all messages that are in no other</div><div class='del'>-    vFolder). (Michael)</div><div class='del'>-</div><div class='del'>-  - SASL Authentication (Kerberos4, DIGEST-MD5, CRAM-MD5, PLAIN,</div><div class='del'>-    LOGIN, ANONYMOUS) for IMAP and SMTP (haven't done POP yet)</div><div class='del'>-    (Jeff, Dan)</div><div class='del'>-</div><div class='del'>-  - Filter/vFolder on Mailing List.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Resend sent items.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Allow users to turn on/off headers in the composer and added</div><div class='del'>-    Reply-To header entry in the composer.  (Miguel, Jeff)</div><div class='del'>-</div><div class='del'>-  - Numerous OpenPGP (PGP/MIME) fixes.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Replying to a message chooses account based on message</div><div class='del'>-    addressee's.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Redid Forward Inline and Forward Quoted.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - IMAP fixes: greater configurability for faster startup/mail check</div><div class='del'>-    (Dan), folders should now notice new messages when you switch to</div><div class='del'>-    them (Dan), copying/moving many messages at once should be much</div><div class='del'>-    faster (Jeff), better support for old IMAP servers (Dan)</div><div class='del'>-</div><div class='del'>-  - IMAP message bodies are now cached to local disk to speed up</div><div class='del'>-    re-access (Dan)</div><div class='del'>-</div><div class='del'>-  - New config dialogs (last time!) (Anna, Dan)</div><div class='del'>-</div><div class='del'>-  - Sorting by a text field in the message list no longer generates a</div><div class='del'>-    random order. (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed "crash when getting new mail from 2 POP servers" bug. (Dan)</div><div class='del'>-</div><div class='del'>-  - Numerous bugfixes, cleanups and optimisations. (Everyone)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Added support for non editable sources.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Added address completion for use in contact entries using the</div><div class='del'>-    select names system.  (Jon Trowbridge)</div><div class='del'>-</div><div class='del'>-  - Fixed some major crashes in the addressbook backend.  (Clahey)</div><div class='del'>-</div><div class='del'>-  - Updated Ximian's contact information.  (Jason Leach)</div><div class='del'>-</div><div class='del'>-  - Finished LDAP support.  (Toshok)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Event creation fixes.  (Miguel)</div><div class='del'>-</div><div class='del'>-  - Calendar loading fixes and removal of old code.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Made the iTIP control have better spacings.  (Anna)</div><div class='del'>-</div><div class='del'>-  - i18n fixes.  (Kjartan)</div><div class='del'>-</div><div class='del'>-Tasks:</div><div class='del'>-</div><div class='del'>-  - Created a popup list item for ETable to select the Status,</div><div class='del'>-    Classification, Priority, Percent &amp; Transparencey fields.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Created a popup date editor item for ETable to set all the dates in the</div><div class='del'>-    tasks.  (Damon)</div><div class='del'>-</div><div class='del'>-Importers: </div><div class='del'>-</div><div class='del'>-  - Created Intelligent Importers that look for certain files on your disk</div><div class='del'>-    and works out what type of data it is. Currently Intelligent Importers</div><div class='del'>-    exist for Pine, Elm and Netscape. (Iain)</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Rewrote ETree in gal.  Changed evolution to support the changes in</div><div class='del'>-    API.  (Clahey)</div><div class='del'>-</div><div class='del'>-  - Lots of Etable/ETree bug fixes.  (Clahey)</div><div class='del'>-</div><div class='del'>-  - Lots of i18n/l10n fixes.  (Kjartan Maraas, Gedeminas Paulauskas,</div><div class='del'>-    and the Evolution gang)</div><div class='del'>-</div><div class='del'>-  - Fixed the shell interface so it could correctly create folders. (Iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.9 "Platypus", 2001-03-12</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Importing framework.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Made the splash screen a regular window.  (Miguel)</div><div class='del'>-</div><div class='del'>-  - Added a menu item to hide the shortcut bar to the shortuct bar</div><div class='del'>-    right-click menu.  (Jason)</div><div class='del'>-</div><div class='del'>-  - Update the shortcut labels to contain the number of unread</div><div class='del'>-    messages as well.  (Jason)</div><div class='del'>-</div><div class='del'>-  - Pre-select a newly created folder in the folder selection dialog.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - GPG/PGP support is now mostly working and sort of configurable.</div><div class='del'>-    Except that the pretty pictures are missing.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Exciting new configuration druid (Anna, Jeff) and configuration</div><div class='del'>-    editor-of-the-month (Jeff). You can now have multiple identities</div><div class='del'>-    that use different transports.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - The folder-tree unread message counts now work much better. But</div><div class='del'>-    vfolders only display their unread message counts *after you've</div><div class='del'>-    looked at the folder for the first time*.  (Dan)</div><div class='del'>-</div><div class='del'>-  - New mail send/receive stuff with status dialog.  (NotZed)</div><div class='del'>-</div><div class='del'>-  - "Stop" button and support for cancelling operations.  (NotZed)</div><div class='del'>-</div><div class='del'>-  - Various fixes involving IMAP folders and subscriptions.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fake messages to root threads in the message list are now gone.  (NotZed)</div><div class='del'>-</div><div class='del'>-  - NNTP support is no longer configured by default, as this code is</div><div class='del'>-    not expected to be completed by 1.0.</div><div class='del'>-</div><div class='del'>-  - Interface for hiding messages matching certain criteria.  (NotZed)</div><div class='del'>-</div><div class='del'>-  - Quick search bar now includes "Sender contains" option (Tuomas? Eek!)</div><div class='del'>-</div><div class='del'>-  - The mailer now properly launches "gnome_segv" when it crashes. I</div><div class='del'>-    mean, if it were to crash.  (Dan)</div><div class='del'>-</div><div class='del'>-  - IMAP attachments are now not loaded unless you look at them.  (Dan)</div><div class='del'>-</div><div class='del'>-  - The X-Mailer header can now include a compile-time-specified</div><div class='del'>-    string (for specifying package version, etc).  (Dan)</div><div class='del'>-</div><div class='del'>-  - The Date header in the message list now formats dates differently</div><div class='del'>-    depending on how long ago they are.  (Chris)</div><div class='del'>-</div><div class='del'>-  - The composer doesn't ask if you want to save before closing if you</div><div class='del'>-    haven't changed anything. Also, it has more useful window titles</div><div class='del'>-    (Jason Leach) And you can now turn off the "are you sure you</div><div class='del'>-    didn't mean to enter a subject?" dialog box.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - The "Menu" key on a Windows keyboard (the one with the picture of</div><div class='del'>-    a pop-up menu) now pops up the message list right-click menu.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  - Lots of internal stuff that doesn't much affect the user-visible</div><div class='del'>-    functionality, particularly involving multithreading, message</div><div class='del'>-    threading, filters/searching, and regression testing.  (NotZed)</div><div class='del'>-</div><div class='del'>-  - Importers for Outlook Express 4 and mbox (used by most mailers like</div><div class='del'>-    Netscape, Pine, Elm, Eudora) (Iain &amp; Jeff)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Fixed crashing bug on PPC.  (Clahey)</div><div class='del'>-</div><div class='del'>-  - Updated to work with both OpenLDAP 1 and OpenLDAP 2.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Added configuration dialog for LDAP.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Plenty of bug fixes.  (Clahey, Toshok, Meeks, JP, Larry, Jason,</div><div class='del'>-    Federico, Dan, Zucchi, Gediminas Paulauskas, Ettore)</div><div class='del'>-</div><div class='del'>-  - Moved category dialog to gal.  (JP)</div><div class='del'>-</div><div class='del'>-  - Worked on LDAP authentication.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Worked on status messages.  (Toshok)</div><div class='del'>-</div><div class='del'>-  - Worked on GalView stuff.  (Clahey)</div><div class='del'>-</div><div class='del'>-  - Improved the select names dialog GUI.  (Clahey)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - New "go to date" dialog.  (JP)</div><div class='del'>-</div><div class='del'>-  - Categories support for appointments.  (JP)</div><div class='del'>-</div><div class='del'>-  - New alarms page in event editor.  (Anna, JP)</div><div class='del'>-</div><div class='del'>-  - Weekday picker now follows the week start setting.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Date-editing widgets are more consistent with each other.</div><div class='del'>-    (Federico)</div><div class='del'>-</div><div class='del'>-  - Colorization fixes to the views.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Optimizations to the views.  (Damon)</div><div class='del'>-</div><div class='del'>-  - New, simpler loading interface for calendars in the Wombat.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Removal of lots of old Gnomecal code.  (Federico, JP)</div><div class='del'>-</div><div class='del'>-  - Alarm instance generation support for the Wombat.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Alarm trigger queueing for the GUI.  (Federico)</div><div class='del'>-</div><div class='del'>-  - More robust launching and registration of the components.  (Federico)</div><div class='del'>-</div><div class='del'>-  - More i18n friendliness.  (JP, Federico)</div><div class='del'>-</div><div class='del'>-  - Start of the alarm notification daemon.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Cosmetic and focus fixes all over the place.  (Federico, JP)</div><div class='del'>-</div><div class='del'>-Tasks:</div><div class='del'>-</div><div class='del'>-  - New, stand-alone tasks component.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Categories support.  (JP, Damon)</div><div class='del'>-</div><div class='del'>-  - Your old tasks are migrated automatically to the new tasks folder.</div><div class='del'>-    (Federico)</div><div class='del'>-</div><div class='del'>-  - You get asked for confirmation when trying to delete a task entry.</div><div class='del'>-    (Federico)</div><div class='del'>-</div><div class='del'>-Conduits:</div><div class='del'>-</div><div class='del'>-  - Many bug fixes and cleanups.  (JP)</div><div class='del'>-</div><div class='del'>-Executive Summary:</div><div class='del'>-</div><div class='del'>-  - Bugfixes and memory leaks removed.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Calendar summary component.  (Iain)</div><div class='del'>-</div><div class='del'>-  - RDF Summary saves it's state.  (Iain)</div><div class='del'>-</div><div class='del'>-  - Mail summary shows vFolder summaries as well.  (Iain)</div><div class='del'>-</div><div class='del'>-  - User changable number of columns. (Iain)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.8 "Archaeopteryx", 2000-12-14</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Added a `--no-splash' option.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Plugged a number of memory leaks.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Added interfaces to display an arbitrary string associated with a</div><div class='del'>-    folder, and highlight it on demand.  (Ettore, Dan)</div><div class='del'>-</div><div class='del'>-  - Changed the Storage IDLs so that you can associate a physical URI</div><div class='del'>-    to the toplevel node as well.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - If a shell is already running, `evolution' will just make it</div><div class='del'>-    create a new view instead of creating a new shell.  (Ettore)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  Display:</div><div class='del'>-</div><div class='del'>-  - The folder tree now shows unread message counts for mail</div><div class='del'>-    folders. For local folders, this updates in real time.  For IMAP, it</div><div class='del'>-    only updates when you "Get Mail".  To be continued.  (Dan)</div><div class='del'>-</div><div class='del'>-  - New "important" column in the message list.  User-settable.  (Dan)</div><div class='del'>-</div><div class='del'>-  - The message list "Size" column now displays more prettily and</div><div class='del'>-    sorts correctly.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - New command to view the raw source to a message.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - More reliable MIME icon code in the mailer and the composer.</div><div class='del'>-    (Dan, Iain)</div><div class='del'>-</div><div class='del'>-  - Lots of internationalization fixes.  (Dan, Kjartan)</div><div class='del'>-</div><div class='del'>-  Composer / Outgoing mail</div><div class='del'>-</div><div class='del'>-  - Various fixes to use the best charset and MIME encoding for</div><div class='del'>-    outgoing messages.  (Michael, Jeff)</div><div class='del'>-</div><div class='del'>-  - You can now forward messages inline, instead of attaching them.</div><div class='del'>-    Forwarding multiple messages now results in a multipart/digest</div><div class='del'>-    attachment.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Replies are now preceded by "On DATE, PERSON wrote:" (Jeff)</div><div class='del'>-</div><div class='del'>-  - Better reply editing, automagically sets indentation and paragraph</div><div class='del'>-    style to Normal. (Radek)</div><div class='del'>-</div><div class='del'>-  - HTML signature support.  (Radek)</div><div class='del'>-</div><div class='del'>-  - Inline image support.  (Radek)</div><div class='del'>-</div><div class='del'>-  - Fixes for addresses with commas.  (Jeff, Michael)</div><div class='del'>-</div><div class='del'>-  - Fix to not allow attaching directories, devices, etc.</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed the sign of the GMT offset in generated Date headers. </div><div class='del'>-    (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug in base64 encoding.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Fixed a problem in connecting to non-ESMTP SMTP servers.  (Jeff)</div><div class='del'>-</div><div class='del'>-  Miscellaneous Commands / Features:</div><div class='del'>-</div><div class='del'>-  - The mailer will now remember your passwords, if you configure</div><div class='del'>-    that option for a service.  (Dan)</div><div class='del'>-</div><div class='del'>-  - New "Apply Filters" command to apply filter rules to selected</div><div class='del'>-    messages.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - No more "No new mail" dialog.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Individual messages can now be saved to disk.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Synced the Message menu with the right-click menu.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Mailer now uses the same search bar as the addressbook.  (Anna,</div><div class='del'>-    Chris, Jeff)</div><div class='del'>-</div><div class='del'>-  Filters:</div><div class='del'>-</div><div class='del'>-  - Now supports filtering on system flags (ie Answered, Seen,</div><div class='del'>-    Unseen).  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Regular expression searches are now moved to their own Option</div><div class='del'>-    menu.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Allows regex searching on the entire message header.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Now has soundex filters (x sounds like y).  (Jeff)</div><div class='del'>-</div><div class='del'>-  IMAP:</div><div class='del'>-</div><div class='del'>-  - "Get Mail" now scans all folders.  (Dan)</div><div class='del'>-</div><div class='del'>-  - IMAP password dialog no longer pops up at startup: click on the</div><div class='del'>-    server in the folder tree to connect.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Folder subscription support.  (Chris Toshok, Dan)</div><div class='del'>-</div><div class='del'>-  - Various IMAP folder naming fixes. (May fix Cyrus support) (Dan)</div><div class='del'>-</div><div class='del'>-  - Seen/deleted flags are preserved across "Get Mail".  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug that could cause messages to be marked as seen</div><div class='del'>-    even when the UI thought they weren't.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixes for IMAP folders with spaces in their names (again).</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - IMAP Kerberos 4 authentication support.  (Dan)</div><div class='del'>-</div><div class='del'>-  POP3:</div><div class='del'>-</div><div class='del'>-  - Fixed a bunch of error cases in POP3 connection.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed POP3 to more reliably delete messages when it was supposed</div><div class='del'>-    to be doing so.  (Dan)</div><div class='del'>-</div><div class='del'>-  Local mail:</div><div class='del'>-</div><div class='del'>-  - Major local mail rewrite that fixed memory leaks, reduced</div><div class='del'>-    memory consumption, improved efficiency, etc.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Maildir support.  (Michael)</div><div class='del'>-</div><div class='del'>-  - Local mail folders are now locked (via dot locking and/or</div><div class='del'>-    fcntl/flock) while Evolution is modifying them, and it will</div><div class='del'>-    notice if they've changed while it's not looking. (Michael)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - To-do and calendar conduits working except for extended</div><div class='del'>-    character support (ie accented chars) (JP)</div><div class='del'>-</div><div class='del'>-  - Updated wombat implementation of change reporting (JP)</div><div class='del'>-</div><div class='del'>-  - Majorly kick-ass new recurrence page in the event editor with an</div><div class='del'>-    easy UI, a preview of what will happen, and lots of love. (Anna)</div><div class='del'>-</div><div class='del'>-  - Imported a new libical with the APIs we require for alarms, the</div><div class='del'>-    start of the timezone code.  This may be the last Evolution</div><div class='del'>-    release that uses a CVS-imported libical; in the future we should</div><div class='del'>-    depend on official tarballs. (Federico)</div><div class='del'>-</div><div class='del'>-  - Event editor now deals gracefully with iCalendar recurrences we</div><div class='del'>-    cannot edit. (Federico)</div><div class='del'>-</div><div class='del'>-  - Plenty of fixes to the ETable calendar model for the task list</div><div class='del'>-    (Damon).</div><div class='del'>-</div><div class='del'>-  - The task list now saves its state, selected columns and sort order</div><div class='del'>-    (Damon).</div><div class='del'>-</div><div class='del'>-  - Lots of love to the iTIP engine and user interface.  Scheduling</div><div class='del'>-    appointments via email should be working fine, and they should</div><div class='del'>-    also work when you receive them. (Jesse)</div><div class='del'>-</div><div class='del'>-  - Lots of work on the calendar preferences code. (Damon)</div><div class='del'>-</div><div class='del'>-  - Many functional and cosmetic fixes to the day and week</div><div class='del'>-    views. (Damon)</div><div class='del'>-</div><div class='del'>-  - Event and task editors now ask if you try to close them without</div><div class='del'>-    saving changes. (Damon)</div><div class='del'>-</div><div class='del'>-  - You are now prompted if you are sure that you want to delete an</div><div class='del'>-    appointment. (Federico)</div><div class='del'>-</div><div class='del'>-  - Plenty of memory leaks fixed. (JP, Federico)</div><div class='del'>-</div><div class='del'>-  - Prettified the event editor a bit by making widget spacings</div><div class='del'>-    consistent. (Federico)</div><div class='del'>-</div><div class='del'>-  - Fixed semantics for handling exception dates (Federico)</div><div class='del'>-</div><div class='del'>-  - Some fixes to the recurrence instance generation engine. (Damon)</div><div class='del'>-</div><div class='del'>-  - Fixed insertion of new objects via notification into the task</div><div class='del'>-    list.  (JP, Federico)</div><div class='del'>-</div><div class='del'>-  - Misc. polishing for the event editor's innards. (Damon, Federico)</div><div class='del'>-</div><div class='del'>-  - Misc. cruft removal from old Gnomecal code (Federico, Miguel)</div><div class='del'>-</div><div class='del'>-  - Prettier icons for the task list. (Federico)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Addressbook conduit now working, experimentally, except for</div><div class='del'>-    extended character support (ie accented chars.) (JP)</div><div class='del'>-</div><div class='del'>-  - Extended wombat functionality with getChanges call. (JP)</div><div class='del'>-</div><div class='del'>-  - Full name and address dialogs in contact editor fixed. (Chris)</div><div class='del'>-</div><div class='del'>-Executive Summary: (iain)</div><div class='del'>-</div><div class='del'>-  - Now compiled by default.</div><div class='del'>-</div><div class='del'>-  - Prettier default dialogs.</div><div class='del'>-</div><div class='del'>-  - Customisable background.</div><div class='del'>-</div><div class='del'>-  - RDF Summary, and Mail Summary components.</div><div class='del'>-</div><div class='del'>-  - Fixes and optimisations.</div><div class='del'>-</div><div class='del'>-  - Can restore state.</div><div class='del'>-</div><div class='del'>-Version 0.7, "Loch Ness Monster", ????</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-There have been no verified sightings of this release.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.6, "Procompsognathus", 2000-10-19</div><div class='del'>--------------------------------------------</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Split out lots of functionality to gal.  Evolution now depends on</div><div class='del'>-    gal. (Chris Lahey, Gal Team)</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Added a cute splash screen.  (Ettore, TigerT)</div><div class='del'>-</div><div class='del'>-  - Improved the way `~/evolution' is initialized the first time.</div><div class='del'>-    (Iain)</div><div class='del'>-</div><div class='del'>-  - Fixed the problem with the folder bar disappearing too son when</div><div class='del'>-    clicking on the scrollbar.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Updated to use the new toolbar and UI merging code from Bonobo.</div><div class='del'>-    (Michael Meeks, Ettore)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Numerous i18n encoding, decoding, and display fixes. Non-ASCII</div><div class='del'>-    text should be displayed correctly in most context in the mailer</div><div class='del'>-    now. The composer no longer sends undeclared 8bit data. (Jeff)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider now caches summary info between sessions, so</div><div class='del'>-    startup should be much faster for large folders. (Dan)</div><div class='del'>-</div><div class='del'>-  - Subscribe/unsubscribe UI for newsgroups. (IMAP subscriptions will</div><div class='del'>-    be supported in a later release.) NNTP authentication support.</div><div class='del'>-    Various other NNTP fixes. (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - New "full search" button to do more complicated searches. (NotZed)</div><div class='del'>-</div><div class='del'>-  - Composer attachment bar improvements. You can now drag files to</div><div class='del'>-    the composer window to attach them to the message. (Iain)</div><div class='del'>-</div><div class='del'>-  - Message list state (columns selected, sorting, etc) is now saved</div><div class='del'>-    between sessions. (NotZed)</div><div class='del'>-</div><div class='del'>-  - "Get Mail" now works for IMAP. IMAP mail no longer arrives</div><div class='del'>-    asynchronously (although if you delete mail from another client,</div><div class='del'>-    it will be deleted asynchronously). (Dan)</div><div class='del'>-</div><div class='del'>-  - Image attachments now use thumbnail images rather than a generic</div><div class='del'>-    image icon. (Iain)</div><div class='del'>-</div><div class='del'>-  - Various IMAP provider bugs (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  - Filter code cleanup/improvements. (NotZed) Filtering can read and</div><div class='del'>-    write message scores. (Jeff) On-demand filters no longer expunge</div><div class='del'>-    the source folder, and don't filter deleted messages. (Jeff)</div><div class='del'>-    Filters now log their actions. (Jeff)</div><div class='del'>-</div><div class='del'>-  - Drafts, Outbox, and Sent folders now default to showing "To"</div><div class='del'>-    instead of "From" in the header list. Messages output to the Sent</div><div class='del'>-    folder are marked as "Seen". "Send later" on a reply will mark the</div><div class='del'>-    message as having been replied to. (Jeff)</div><div class='del'>-</div><div class='del'>-  - Message list "attachment" column is now functional. The</div><div class='del'>-    read/unread state of a fake thread header now matches the state of</div><div class='del'>-    the thread. (NotZed) Message list sorting is more clever (Jeff)</div><div class='del'>-</div><div class='del'>-  - The "Print" toolbar button now opens a Print dialog rather than a</div><div class='del'>-    Print Preview window. (Miguel)</div><div class='del'>-</div><div class='del'>-  - New "Select All" command. "Mark all messages as seen" became "Mark</div><div class='del'>-    (selected) messages seen". (Jeff)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Improved todo list and calendar view gui (Damon)</div><div class='del'>-</div><div class='del'>-  - Printing works again (Federico)</div><div class='del'>-</div><div class='del'>-  - Config dialog improvement and implementation (Damon)</div><div class='del'>-</div><div class='del'>-  - Todo and calendar conduits working, except for archiving (JP)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Lots of internal refactoring of addressbook, including changes due</div><div class='del'>-    to gal. (Chris, Chris)</div><div class='del'>-</div><div class='del'>-  - Lots of bug fixes. (Chris, Chris, Matt Bissiri, Iain, Dan)</div><div class='del'>-</div><div class='del'>-  - Added a working field to save whether the contact wants</div><div class='del'>-    HTML. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added "Stop" and "View All" toolbar buttons. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Lots of work on modifiable LDAP. (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Recognizes a lot more Prefixes and Suffixes when parsing names. (Nat)</div><div class='del'>-</div><div class='del'>-  - The card view doesn't write out cards unless they've changed. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - New layout of address editor dialog. (Anna, Chris Lahey)</div><div class='del'>-</div><div class='del'>-Version 0.5.1, "Salamended", 2000-09-15</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Fixed a font-handling problem that would cause Evolution to crash</div><div class='del'>-    at startup with certain Gtk themes. (Chris)</div><div class='del'>-</div><div class='del'>-  - Fixed some build problems. (Chris)</div><div class='del'>-</div><div class='del'>-  - We no longer ship an out-of-date Red Hat-only RPM spec file.</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - The shell now installs the `Sent' folder at startup if it doesn't</div><div class='del'>-    exist yet.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - If a component crashes unexpectedly, the shell displays a dialog</div><div class='del'>-    box informing the user of that.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug in the folder selector dialog that would result in</div><div class='del'>-    crashes while trying to move messages in the mailer. (Dan)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Fixed a bug that would cause the addressbook to crash when</div><div class='del'>-    embedded in the composer. (Dan)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Fixed a display problem caused by expunging an IMAP folder. (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed POP mail so that "keep on server" is obeyed correctly. (Dan,</div><div class='del'>-    Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed replies so that replying to a message twice doesn't turn off</div><div class='del'>-    the "replied" flag. (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug that prevented "Send later" from working. (Dan)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.5, "Salamander", 2000-09-13</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Switched to using ETree for the folder view.  (Chris Toshok,</div><div class='del'>-    Ettore)</div><div class='del'>-</div><div class='del'>-  - Added interfaces to change the string displayed in the tree view</div><div class='del'>-    as the name of the folder.  (Ettore)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Uses only the new iCalendar standard internally; this means future</div><div class='del'>-    interoperability with new calendaring programs.  (JP, Federico)</div><div class='del'>-</div><div class='del'>-  - New ultra-cool date range selector, aka little calendar.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Plenty of internal refactoring.  (JP, Damon, Federico)</div><div class='del'>-</div><div class='del'>-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)</div><div class='del'>-    &lt;EXPERIMENTAL&gt;</div><div class='del'>-</div><div class='del'>-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)</div><div class='del'>-    &lt;EXPERIMENTAL&gt;</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - New advanced search dialog.  (Michael Zucchi, Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added parsing of addresses.  (Jesse Pavel)</div><div class='del'>-</div><div class='del'>-  - Converted most of addressbook to UTF8.  (Lauris)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  - Filters (but not vfolders) are now more powerful: they can check</div><div class='del'>-    any message header, and can do regexp searches on the headers and</div><div class='del'>-    body.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - A first draft of an automated mailing list recognizer</div><div class='del'>-    has been added.  (It will need more/better rules.)  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Attachments are handled differently now.  All attachments always</div><div class='del'>-    have an icon and a header, and you can right-click on the icon to</div><div class='del'>-    view/hide, save, or launch an external viewer.  (Dan)</div><div class='del'>-</div><div class='del'>-  - It is no longer necessary to quit and restart after adding a new</div><div class='del'>-    IMAP server.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Lots of i18n/charset fixing.  (Lauris)</div><div class='del'>-</div><div class='del'>-  - Shiny new toolbar icons.  (Tuomas)</div><div class='del'>-</div><div class='del'>-  - Giant menu reorganization. Most message operations are now in the</div><div class='del'>-    "Message" menu, and folder operations in the "Folder" menu.</div><div class='del'>-    (Ettore, Dan, Peter)</div><div class='del'>-</div><div class='del'>-  - "Mark as seen" timeout is now configurable. Mail view remembers</div><div class='del'>-    the location of the message list/message display split.  (Richard</div><div class='del'>-    Hult)</div><div class='del'>-</div><div class='del'>-  - New filter category: "On-demand", for filters to be applied</div><div class='del'>-    at arbitrary times rather than during mail incorporation.  (Peter)</div><div class='del'>-</div><div class='del'>-  - POP/IMAP config pages allow you to specify a port... this may</div><div class='del'>-    go away in a later release when we support ssl/ssh tunneling</div><div class='del'>-    directly.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Reply To All will now remove your own addresses from the recipient</div><div class='del'>-    lists.  (Jesse Pavel)</div><div class='del'>-</div><div class='del'>-  - Folders are synced when you switch to another folder now.  (Dan)</div><div class='del'>-</div><div class='del'>-  - An IMAP bug that caused all messages to be marked as read before</div><div class='del'>-    they were read has been fixed.  (Dan)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider is now more robust about dealing with other</div><div class='del'>-    concurrent IMAP clients.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - POP and IMAP are better about when they do and don't try to</div><div class='del'>-    reconnect.  This was part of Camel operation cancellation support,</div><div class='del'>-    which unfortunately didn't make it into 0.5.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Sent and Outbox folders are now functional.  You now have 2</div><div class='del'>-    options when sending a message - "Send Now" which will send the</div><div class='del'>-    message imediately and "Send Later" which will queue the message in</div><div class='del'>-    Outbox for later sending.  When a message is successfully sent, it</div><div class='del'>-    is copied to the Sent folder for your records.  (Jeff)</div><div class='del'>-</div><div class='del'>-ETable:</div><div class='del'>-</div><div class='del'>-  - ETree fixes.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Lots of small usability fixes.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Lots of grouping bug fixes.  Specifically, fixed crashes when</div><div class='del'>-    grouping in trees and made ETable not go crazy when you change</div><div class='del'>-    data and the table is grouped.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Improved table printing when grouped.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Converted most of ETable to UTF8.  (Lauris)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.4, "Alewife", 2000-08-14</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Added interfaces to display messages and a progress bar when the</div><div class='del'>-    component is busy.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Changed the shell BonoboUIHandler code to allow placing menu items</div><div class='del'>-    such as "Print" in the right places.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added code to check if an existing `~/evolution' directory</div><div class='del'>-    actually has the content we expect and, if not, complain to the</div><div class='del'>-    user.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed some Bonobo-related refcounting problems.  (Michael Meeks)</div><div class='del'>-</div><div class='del'>-  - Removed the GConf dependency.  (JP)</div><div class='del'>-</div><div class='del'>-  - Improved the API for the folder selection dialog.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Memory leak fixes.  (Peter)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  The calendar is in the middle of major rewrite. Evolution 0.4</div><div class='del'>-  ships with essentially the same calendar component as 0.3 did.</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - More work on the Palm Pilot conduits.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed some LDAP-related crashes.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Added support for displaying embedded vCards through a Bonobo</div><div class='del'>-    component.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added support for generic fields.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Fixed the navigation order for the Tab key in the contact editor</div><div class='del'>-    window.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Fixed some Bonobo-related bugs and crashes.  (Chris Lahey, Michael</div><div class='del'>-    Meeks)</div><div class='del'>-</div><div class='del'>-  - Only display entries that have an email address in the address</div><div class='del'>-    selector dialog.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added an utility program to import vCards from Gnomecard.  (Chris</div><div class='del'>-    Lahey)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>- Generic</div><div class='del'>-</div><div class='del'>-  - Long mailer operations (such as fetching new mail) now run</div><div class='del'>-    asynchronously rather than blocking the UI. This involved</div><div class='del'>-    a major rewrite of much of the Camel and mailer code.  (Peter)</div><div class='del'>-</div><div class='del'>-  - GPG/PGP message decryption support (Nathan Thompson-Amato, Dan)</div><div class='del'>-</div><div class='del'>-  - Unfinished messages in the composer can be saved to the "Drafts"</div><div class='del'>-    folder and finished later.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Double-clicking on a message in the message view now opens it in a</div><div class='del'>-    separate window.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - vCards attached to messages now bring up a minicard view with a</div><div class='del'>-    button to add the vCard to the addressbook (Chris Lahey, Dan)</div><div class='del'>-</div><div class='del'>-  - Inline uuencoded/binhexed "attachment" support (Dan)</div><div class='del'>-</div><div class='del'>-  - "Mark All Messages Seen" command.  (Cody Russell)</div><div class='del'>-</div><div class='del'>- Filters / VFolders</div><div class='del'>-</div><div class='del'>-  - Major filter/vfolder dialog rewrite (Michael Zucchi) VFolders can</div><div class='del'>-    now search any (searchable) folder, not just Inbox.</div><div class='del'>-</div><div class='del'>-  - Auto-filter/auto-vfolder code (right click on a message in the</div><div class='del'>-    list and pick one of the options at the bottom of the menu to</div><div class='del'>-    create a filter/vfolder rule for similar messages).  (Michael)</div><div class='del'>-</div><div class='del'>-  - You can now set the color of messages in the message list, based</div><div class='del'>-    on filter rules.  (Local stores can also now store arbitrary user</div><div class='del'>-    flags, although there is not yet UI code to set/view them.)</div><div class='del'>-    (Michael)</div><div class='del'>-</div><div class='del'>-  - Added "Save" button to the quicksearch bar to save a search as a</div><div class='del'>-    vfolder.  (Michael)</div><div class='del'>-</div><div class='del'>- Configuration</div><div class='del'>-</div><div class='del'>-  - Major mail config dialog rewrite (JP).</div><div class='del'>-</div><div class='del'>-  - The mailer now remembers your threaded/unthreaded message view</div><div class='del'>-    setting between sessions.  (Jeremy Wise).</div><div class='del'>-</div><div class='del'>-  - Support for multiple identities (JP, Jeff), sources (JP, Peter), and</div><div class='del'>-    IMAP servers (JP, Dan)</div><div class='del'>-</div><div class='del'>- Providers</div><div class='del'>-</div><div class='del'>-  - You can now leave POP mail on the server. (This will [currently]</div><div class='del'>-    only work right with POP servers that support the UIDL command.</div><div class='del'>-    On other servers, it will never download some messages unless you</div><div class='del'>-    never delete mail.)</div><div class='del'>-</div><div class='del'>-  - There is now an MH-like local store available, and code to convert</div><div class='del'>-    a folder from one type to the other.  (Michael)</div><div class='del'>-</div><div class='del'>-  - The mbox provider now writes out "From " lines that are more</div><div class='del'>-    compatible with other mailers (like Mutt) that are picky about</div><div class='del'>-    their exact format.  (Michael)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider now supports searching (Jeff). Also various</div><div class='del'>-    other speed/efficiency/robustness improvements (Jeff), and support</div><div class='del'>-    for old IMAP4 servers as well as IMAP4rev1 (Jon K Hellan).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.3, "Jellyfish", 2000-07-21</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Pop-up folder selection.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added support for multiple views.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added support for saving component-specific settings, and</div><div class='del'>-    some initial code to save the view's configuration.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed the Bonobo menu code so that it works with all the</div><div class='del'>-    locales.  (Ettore)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-   - Lots of IMAP fixes.  (Jeff) </div><div class='del'>-</div><div class='del'>-   - You can use an external setuid/setgid movemail program</div><div class='del'>-    (although we don't ship our own yet). If you have one</div><div class='del'>-    installed with emacs, the configure script will find</div><div class='del'>-    that. Otherwise, you can specify --with-movemail=/path.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  - You can toggle HTML/plain text for an individual message</div><div class='del'>-    in the composer now.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Bonobo embedding sort of works again, but there are</div><div class='del'>-    problems with size allocation somewhere. Attachments can now</div><div class='del'>-    also be handled by external applications.  (Dan)</div><div class='del'>-</div><div class='del'>-  - text/plain mail is now line-wrapped in the mail display,</div><div class='del'>-    to deal with people who don't put newlines in their mail.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  - Allow user to specify IMAP namespace in the mail config</div><div class='del'>-    dialog.  (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  - Quoted-printable encoder fixes.  (Michael Zucchi)</div><div class='del'>-</div><div class='del'>-  - Various NNTP fixes, include a news pane in the config</div><div class='del'>-    dialog.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Some memory corruption fixes.  (Peter Williams)</div><div class='del'>-</div><div class='del'>-  - Fix for message not being re-drawn as deleted.  (Peter</div><div class='del'>-    Williams, Jeff)</div><div class='del'>-</div><div class='del'>-  - Moving a message to another folder copies the flags now</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Close signature in HTML mail with &lt;/PRE&gt;, not &lt;PRE&gt;, and</div><div class='del'>-    default to ~/.signature.  (Michael Meeks)</div><div class='del'>-</div><div class='del'>-  - Fixed some confusing behavior in the message threading</div><div class='del'>-    algorithm.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Improvements to the item selection code.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Added support for a bunch of previously unsupported iCalendar</div><div class='del'>-    properties.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the calendar with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Seth)</div><div class='del'>-</div><div class='del'>-  - ETable-based to-do list view ("taskpad"), for your viewing</div><div class='del'>-    pleasure.</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the addressbook with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the addressbook with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed some random crashes.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Implemented a vCard Bonobo control so that we can support</div><div class='del'>-    inline vCard viewing in the mailer.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Quick search looks at both the name and the company name now.</div><div class='del'>-    (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added more functionality to the contact editor's toolbar.  (Chris</div><div class='del'>-    Lahey)</div><div class='del'>-</div><div class='del'>-  - Support for printing single cards.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Version 0.2, "Saccharomyces", 2000-07-11</div><div class='del'>-----------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  * Folder selection dialog (Ettore).</div><div class='del'>-</div><div class='del'>-  * Folder creation dialog (Ettore).</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  * LDAP server configuration dialog (Chris Toshok).</div><div class='del'>-  </div><div class='del'>-  * Integration of LDAP servers in the shell's tree view (Chris Toshok).</div><div class='del'>-  </div><div class='del'>-  * ETable-based view (Chris Lahey).</div><div class='del'>-  </div><div class='del'>-  * Printing support for the ETable-based view (Chris Lahey).</div><div class='del'>-  </div><div class='del'>-  * Address selection dialog integrated with the message composer (Chris</div><div class='del'>-    Lahey).</div><div class='del'>-  </div><div class='del'>-  * Many miscellaneous bugs fixed (everyone).</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  * Printing support (Michael, Federico).</div><div class='del'>-  </div><div class='del'>-  * Many, many behavior fixes and polishing to the day/week/month view</div><div class='del'>-    widgets (Damon).</div><div class='del'>-  </div><div class='del'>-  * New glade-based event editor.  This is unfinished but usable (Seth,</div><div class='del'>-    Federico).</div><div class='del'>-  </div><div class='del'>-  * Mouse wheel scrolling support (Anders).</div><div class='del'>-  </div><div class='del'>-  * We have an awesome new engine for computing recurring events</div><div class='del'>-    (Damon).  This will be plugged in to the new iCalendar code.</div><div class='del'>-  </div><div class='del'>-  * Internal and public API fixes (Federico, Seth).</div><div class='del'>-  </div><div class='del'>-  * Shell-related changes (Ettore).</div><div class='del'>-  </div><div class='del'>-  * Data model for ETable; this is not used yet (Federico).</div><div class='del'>-  </div><div class='del'>-  * New iCalendar support; this is not used yet (Federico).</div><div class='del'>-  </div><div class='del'>-  * Pilot syncing updates; this is not used yet (Seth).</div><div class='del'>-  </div><div class='del'>-  * Many miscellaneous bugs fixed (everyone).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  Major features:</div><div class='del'>-</div><div class='del'>-  * Basic IMAP support (Jeff)</div><div class='del'>-</div><div class='del'>-  * Threaded message view (Michael, Chris Toshok)</div><div class='del'>-</div><div class='del'>-  * Filters now work (original work by Michael, bugfixes by Dan)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Smaller features:</div><div class='del'>-</div><div class='del'>-  * Implemented moving messages between folders (Dan)</div><div class='del'>-</div><div class='del'>-  * Very basic printing support (Dan, but it was only like 5 lines</div><div class='del'>-    of code, because gnome-print kicks ass)</div><div class='del'>-</div><div class='del'>-  * "Delete", "Forward", and "Refile" operations now work on</div><div class='del'>-    multiple messages. (Chris Lahey, Peter Williams, Dan)</div><div class='del'>-</div><div class='del'>-  * Toggle read/unread flag when the user clicks on the envelope</div><div class='del'>-    icon (Chris Lahey, Dan).</div><div class='del'>-</div><div class='del'>-  * The "New folder" menu item now works (Ettore, Dan).</div><div class='del'>-</div><div class='del'>-  * The filter/vfolder druid now uses the new shell folder selection</div><div class='del'>-    UI (Michael)</div><div class='del'>-</div><div class='del'>-  * Added "Cc" to the set of filter/vfolderable headers and make the</div><div class='del'>-    filter/vfolder "messages to address" rule work with to or cc.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * New key bindings: "Delete" deletes the current message and jumps</div><div class='del'>-    to the next undeleted message. "N" and "P" go to next/previous</div><div class='del'>-    unread message. (Dan)</div><div class='del'>-</div><div class='del'>-  * Keep asking for POP/IMAP password until the user gets it correct</div><div class='del'>-    or hits Cancel, and remember the result until the user exits (or</div><div class='del'>-    chooses "Forget Passwords"). (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  * Kludge Camel to output ISO-8859-1 instead of UTF-8, since</div><div class='del'>-    neither GtkHTML nor ETable supports UTF-8 still. (Dan)</div><div class='del'>-</div><div class='del'>-  * Use the gnome-vfs "sniff buffer" interface to try to identify</div><div class='del'>-    the MIME type of attachments without useful type information</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * Allow saving drafts in the composer (Ettore)</div><div class='del'>-</div><div class='del'>-  * Added "Received date" header to the set of possible message list</div><div class='del'>-    headers. (Dan)</div><div class='del'>-</div><div class='del'>-  * Partial gladification of the config dialog (JP Rosevear)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Bug fixes:</div><div class='del'>-</div><div class='del'>-  * Message read/unread/deleted flags should now be saved reliably</div><div class='del'>-    when you exit, and summary should not be rebuilt when a rebuild</div><div class='del'>-    isn't needed. Expunging should work reliably (Dan, Ettore,</div><div class='del'>-    Jeff).</div><div class='del'>-</div><div class='del'>-  * Fix disappearing toolbar bug (Dan).</div><div class='del'>-</div><div class='del'>-  * Fixed a bug that made downloading of very large messages over</div><div class='del'>-    POP incredibly slow, and various other smaller POP bugs. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed bugs that made large attachments sometimes get dropped and</div><div class='del'>-    small ones sometimes get truncated. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed filter/vfolder "messages to address" rule to correctly</div><div class='del'>-    match "to" rather than "from". (Michael)</div><div class='del'>-</div><div class='del'>-  * Fix some text/plain formatting bugs in the composer. (Dan,</div><div class='del'>-    Ettore)</div><div class='del'>-</div><div class='del'>-  * Turn off search mode when getting new mail (to avoid corrupting</div><div class='del'>-    the display). Make "get mail" always put unfiltered mail into</div><div class='del'>-    Inbox rather than the current folder. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed a bug that caused "Re:" to be prepended even to subjects</div><div class='del'>-    that started with "Re:" when replying. Added a default subject</div><div class='del'>-    to forwarded messages. (Dan)</div><div class='del'>-</div><div class='del'>-  * Make the "Attach" dialog in the composer remember the last</div><div class='del'>-    directory it was in. (Dan)</div><div class='del'>-</div><div class='del'>-  * Code to parse invalid date formats since some mailers generate</div><div class='del'>-    them... (Jeff)</div><div class='del'>-</div><div class='del'>-  * Fixed various small SMTP bugs (Jeff, Chris Lahey)</div><div class='del'>-</div><div class='del'>-  * Fixed some memory leaks (Peter, Jeff)</div><div class='del'>-</div><div class='del'>-  * Make replies use the text/plain part of a multipart/alternative</div><div class='del'>-    if the user configured plain text rather than HTML mail sending.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * Various config dialog fixes (Jeff)</div><div class='del'>-</div><div class='del'>-  * Partial filter/vfolder GUI facelift (Jacob)</div><div class='head'>diff --git a/README b/README<br/>deleted file mode 100644<br/>index eba68391cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,268 +0,0 @@</div><div class='del'>-Evolution is the integrated mail, calendar and address book</div><div class='del'>-distributed suite from Ximian, Inc.</div><div class='del'>-</div><div class='del'>-See http://www.ximian.com/apps/evolution.php3 for more information.</div><div class='del'>-</div><div class='del'>-Note that Evolution is still beta. This means it may delete all of</div><div class='del'>-your mail if you give it the chance.</div><div class='del'>-</div><div class='del'>-If you are using Evolution, you should subscribe to the Evolution</div><div class='del'>-mailing list. If you are interested in hacking on it, you should</div><div class='del'>-subscribe to the Evolution Hackers mailing list. Send mail to</div><div class='del'>-"evolution-request@ximian.com" or</div><div class='del'>-"evolution-hackers-request@ximian.com" with the word "subscribe" in</div><div class='del'>-the body of the message. If you are planning to work on any part of</div><div class='del'>-Evolution, please send mail to the mailing list first, to avoid</div><div class='del'>-duplicated effort (and to make sure that you aren't basing your work</div><div class='del'>-on interfaces that are expected to change).</div><div class='del'>-</div><div class='del'>-There are mailing list archives available at</div><div class='del'>-http://lists.ximian.com/archives/public/evolution/     and</div><div class='del'>-http://lists.ximian.com/archives/public/evolution-hackers/</div><div class='del'>-</div><div class='del'>-There is also an #evolution IRC channel on irc.gnome.org.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-IF IT DOESN'T WORK</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-Did you read the "How to build" section below?</div><div class='del'>-</div><div class='del'>-If the configure script complains that you don't have a library that</div><div class='del'>-you know you have installed, it usually means either that you've</div><div class='del'>-installed things into multiple prefixes (see the bits on GNOME_PATH</div><div class='del'>-below) or (if you're on Linux) that you installed the "foo" package</div><div class='del'>-but forgot the "foo-devel" or "foo-dev" packages.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HOW TO BUILD EVOLUTION</div><div class='del'>-----------------------</div><div class='del'>-</div><div class='del'>-	*** READ THIS BEFORE YOU START BUILDING ANYTHING! ***</div><div class='del'>-</div><div class='del'>-Evolution depends on a large number of unreleased and rapidly-changing</div><div class='del'>-libraries. Some of these libraries in turn depend on other unreleased</div><div class='del'>-and rapidly-changing libraries.</div><div class='del'>-</div><div class='del'>-Building Evolution is HARD, and it's going to stay hard until all of</div><div class='del'>-the libraries it depends on stabilize, and there's nothing we can do</div><div class='del'>-to make it any easier until then.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GENERAL PRINCIPLES</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-First you have to decide whether you want to install Evolution (and</div><div class='del'>-its dependencies) into the same prefix as the rest of your GNOME</div><div class='del'>-install, or into a new prefix. Installing everything into the same</div><div class='del'>-prefix as the rest of your GNOME install will make it much easier to</div><div class='del'>-build and run programs, and easier to switch between using packages</div><div class='del'>-and building it yourself, but it may also make it harder to uninstall</div><div class='del'>-later.</div><div class='del'>-</div><div class='del'>-If you want to install into the same prefix as the rest of GNOME,</div><div class='del'>-type:</div><div class='del'>-</div><div class='del'>-	gnome-config --prefix</div><div class='del'>-	gnome-config --sysconfdir</div><div class='del'>-</div><div class='del'>-and remember the answers, and pass them to "configure" or "autogen.sh"</div><div class='del'>-when building the other packages you need. For example:</div><div class='del'>-</div><div class='del'>-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib</div><div class='del'>-</div><div class='del'>-    --localstatedir is needed to make the docs integrate with scrollkeeper</div><div class='del'>-    and needs to point to the directory containing the scrollkeeper indices</div><div class='del'>-    which are in: gnome-config --localstatedir</div><div class='del'>-</div><div class='del'>-If you build in another prefix instead, you will need to set the</div><div class='del'>-GNOME_PATH environment variable (and ACLOCAL_FLAGS as well if building</div><div class='del'>-from CVS) to include the prefix you install into. For example:</div><div class='del'>-</div><div class='del'>-        export GNOME_PATH=/usr/local</div><div class='del'>-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"</div><div class='del'>-</div><div class='del'>-(Assuming your shell is bash, and you installed into /usr/local.) You</div><div class='del'>-need to set GNOME_PATH both during compiling AND when you run</div><div class='del'>-evolution. Remember also that if you're installing into an odd prefix</div><div class='del'>-such as /evolution, that you also need to make sure to put</div><div class='del'>-${prefix}/bin in your PATH and ${prefix}/lib in your LD_LIBRARY_PATH.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-DEPENDENCIES</div><div class='del'>-------------</div><div class='del'>-</div><div class='del'>-The following required libraries are available in GNOME CVS, under the</div><div class='del'>-given names.  Most (but not all) of them are also available as</div><div class='del'>-tarballs on ftp.gnome.org.  The (*)ed packages are available in Ximian</div><div class='del'>-GNOME ( http://www.ximian.com/desktop/ ).  Other packages may be</div><div class='del'>-available from the Ximian GNOME evolution preview mirror.</div><div class='del'>-</div><div class='del'>-If installing from packages, remember that you need both the runtime</div><div class='del'>-and -devel packages for each library.</div><div class='del'>-</div><div class='del'>- - xml-i18n-tools - latest from xml-i18n-tools-stable-1-x branch in</div><div class='del'>-   GNOME CVS (0.8.2 is too old)</div><div class='del'>-</div><div class='del'>- - scrollkeeper - 0.1.4 or later (*)</div><div class='del'>-</div><div class='del'>- - gnome-xml - 1.8.10 or later in the 1.0 series, but not from the 2.0</div><div class='del'>-   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_BRANCH".)</div><div class='del'>-   (*)</div><div class='del'>-</div><div class='del'>- - gnome-print - 0.25 or later (*)</div><div class='del'>-</div><div class='del'>- - gdk-pixbuf - 0.9.0 or later (*)</div><div class='del'>-</div><div class='del'>- - ORBit - 0.5.8 or later (*) (If you get this from GNOME CVS, use the</div><div class='del'>-   tag "orbit-stable-0-5".)</div><div class='del'>-</div><div class='del'>- - oaf - 0.6.2 or later (If you get this from GNOME CVS, use the tag</div><div class='del'>-   "oaf-stable-0-6")</div><div class='del'>-</div><div class='del'>-   *** If you are using oaf from CVS, you should use the flag</div><div class='del'>-   *** "--disable-more-warnings" when configure, or it may fail to</div><div class='del'>-   *** build.</div><div class='del'>-</div><div class='del'>- - gnome-vfs - 1.0.0 or later (If you get this from GNOME CVS, use</div><div class='del'>-   the tag "gnome-vfs-1-0")</div><div class='del'>-</div><div class='del'>-   *** If you are using gnome-vfs from CVS, you should use the flag</div><div class='del'>-   *** "--disable-more-warnings" when configuring, or it may fail to</div><div class='del'>-   *** build.</div><div class='del'>-</div><div class='del'>- - libglade - 0.14 or later</div><div class='del'>-</div><div class='del'>- - bonobo - 1.0.3 or later</div><div class='del'>-</div><div class='del'>-   *** Note that bonobo must be installed with the same --prefix as</div><div class='del'>-   *** either gnome-libs or evolution for the Makefiles to work</div><div class='del'>-   *** properly.</div><div class='del'>-</div><div class='del'>- - gal (GNOME Application Library) - 0.18.1 or later</div><div class='del'>-</div><div class='del'>- - gtkhtml - later than 0.16.1</div><div class='del'>-</div><div class='del'>- - SOUP: later than 0.6.99</div><div class='del'>-</div><div class='del'>-Other non-GNOME Dependencies:</div><div class='del'>-</div><div class='del'>- - Berkeley's libdb - 3.1.17</div><div class='del'>-</div><div class='del'>-   db3 is available from http://www.sleepycat.com. Make sure to get</div><div class='del'>-   3.1.17, it isn't the latest version.</div><div class='del'>-</div><div class='del'>-     --- IMPORTANT WARNING ---</div><div class='del'>-</div><div class='del'>-     The on-disk format of DB files has been changing between versions</div><div class='del'>-     2, 3 and 4.  Also, because of the libdb API, there is no way to</div><div class='del'>-     easily handle the different formats from within the application.</div><div class='del'>-     For this reason, Evolution has chosen to use one specific version</div><div class='del'>-     of the library (version 3) and stick to it, so that users do not</div><div class='del'>-     need to convert their addressbook files to use them with</div><div class='del'>-     different version of Evolution.</div><div class='del'>-</div><div class='del'>-     That's why Evolution REQUIRES libdb 3.1.17, and NO OTHER VERSION.</div><div class='del'>-</div><div class='del'>-     If you force the check to accept a version different from 3.1.17,</div><div class='del'>-     your binary of Evolution will be using a different format from</div><div class='del'>-     the chosen one; this means that it will not be able to read</div><div class='del'>-     addressbook databases created by other versions of Evolution</div><div class='del'>-     which were compiled in the standard way.  Also, we DO NOT</div><div class='del'>-     GUARRANTEE that Evolution will work with different versions of</div><div class='del'>-     libdb at all, even if it can be trivially made to compile against</div><div class='del'>-     them.</div><div class='del'>-</div><div class='del'>-     SPECIAL NOTE FOR BINARY PACKAGERS:</div><div class='del'>-</div><div class='del'>-     If you are making binary packages for end-users (e.g. if you are</div><div class='del'>-     a distribution vendor), please statically link Evolution to</div><div class='del'>-     Berkeley DB 3.1.17, as mandated by the configure.in check.  DO</div><div class='del'>-     NOT patch configure.in to work around the check.  Forcing the</div><div class='del'>-     check to link to a different version of the library will only</div><div class='del'>-     give headaches and pain to your users, who will see their</div><div class='del'>-     addressbook disappear and will complain to us (the Evolution</div><div class='del'>-     team) about losing their data.</div><div class='del'>-</div><div class='del'>-     Besides, libdb will be linked statically, which means that your</div><div class='del'>-     distribution doesn't actually need to ship DB 3.1.17 itself</div><div class='del'>-     separately.</div><div class='del'>-</div><div class='del'>-     The Evolution team will be infinitely grateful for your</div><div class='del'>-     co-operation.  Thanks.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-COMPILING BERKELEY DB</div><div class='del'>----------------------</div><div class='del'>-</div><div class='del'>-If you don't have 3.1.17 installed on your system or Evolution doesn't</div><div class='del'>-detect it for some reason, here is a way to get Evolution to link to</div><div class='del'>-it without messing up your system installation.</div><div class='del'>-</div><div class='del'>-  * Get the Sleepycat tarball from:</div><div class='del'>-</div><div class='del'>-      http://www.sleepycat.com/update/3.1.17/db-3.1.17.tar.gz</div><div class='del'>-</div><div class='del'>-  * Install the content somewhere _other_ than the evolution source tree.</div><div class='del'>-     e.g: NOT evolution/db-3.1.17</div><div class='del'>-</div><div class='del'>-  * Compile according to instructions, but installing into some custom</div><div class='del'>-    prefix, for example:</div><div class='del'>-</div><div class='del'>-      ../dist/configure --prefix=/home/user/berkeleydb-3.1.17</div><div class='del'>-</div><div class='del'>-  * Autogen Evolution specifying that it has to look for the DB</div><div class='del'>-    library there, for example:</div><div class='del'>-</div><div class='del'>-      ./autogen.sh --prefix=/opt/gnome</div><div class='del'>-      --with-db3-includes=/home/user/berkeleydb-3.1.17/include</div><div class='del'>-      --with-db3-libs=/home/user/berkeleydb-3.1.17/lib</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-COMPILING PALM PILOT SUPPORT</div><div class='del'>-----------------------------</div><div class='del'>-</div><div class='del'>-If you want support for PalmPilot syncing (currently experimental so</div><div class='del'>-please back up your pilot) you will also need to do the following:</div><div class='del'>-</div><div class='del'>-1) pilot-link 0.9.5</div><div class='del'>-http://www.pilot-link.org</div><div class='del'>-</div><div class='del'>-2) gnome-pilot 0.1.61</div><div class='del'>-http://www.eskil.org/gnome-pilot/</div><div class='del'>-</div><div class='del'>-3) evolution</div><div class='del'>-In your evolution source directory do ./autogen.sh --prefix=&lt;evo-prefix&gt; </div><div class='del'>---with-pisock=&lt;pilot-link-prefix&gt; --enable-pilot-conduits=yes</div><div class='del'>-make</div><div class='del'>-make install</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-SSL SUPPORT</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-If you want SSL support (and someday S/MIME), you will also need libnspr4 and</div><div class='del'>-libnss3 which can be found at http://www.mozilla.org.</div><div class='del'>-</div><div class='del'>-Once you have libnspr4 and libnss3 (and their respective includes) installed,</div><div class='del'>-in your evolution source directory do:</div><div class='del'>-./autogen.sh --prefix=&lt;evo-prefix&gt; --with-nspr-includes=&lt;nspr-includes-prefix&gt;</div><div class='del'>---with-nspr-libs=&lt;nspr-libs-prefix&gt; --with-nss-includes=&lt;nss-includes-prefix&gt;</div><div class='del'>---with-nss-libs=&lt;nss-libs-prefix&gt;</div><div class='del'>-</div><div class='del'>-You'll need to `cp ~/.mozilla/default/*.db ~/evolution` on you've</div><div class='del'>-installed Evolution in order to get a functional SSL-enabled</div><div class='del'>-Evolution.</div><div class='del'>-</div><div class='del'>-WARNING: Evolution also comes with OpenSSL support</div><div class='del'>-(--with-openssl-libs and --with-openssl-includes), but it's not very</div><div class='del'>-well tested, and quite unstable at this point.  It is recommended that</div><div class='del'>-you use the NSPR-based SSL support instead.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-NEWSGROUP (NNTP) SUPPORT</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-Experimental support for NNTP is enabled if you use the --enable-nntp</div><div class='del'>-configure option, but it's currently unmaintained and highly unstable</div><div class='del'>-and experimental.</div><div class='head'>diff --git a/acconfig.h b/acconfig.h<br/>deleted file mode 100644<br/>index e4aed8a2d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/acconfig.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>acconfig.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-#undef ENABLE_NLS</div><div class='del'>-#undef HAVE_CATGETS</div><div class='del'>-#undef HAVE_GETTEXT</div><div class='del'>-#undef HAVE_LC_MESSAGES</div><div class='del'>-#undef HAVE_STPCPY</div><div class='del'>-#undef HAVE_LIBSM</div><div class='del'>-#undef PACKAGE</div><div class='del'>-#undef VERSION</div><div class='del'>-#undef ENABLE_THREADS</div><div class='del'>-#undef SENDMAIL_PATH</div><div class='del'>-#undef SYSTEM_MAIL_DIR</div><div class='del'>-#undef HAVE_LDAP</div><div class='del'>-#undef HAVE_TIMEZONE</div><div class='del'>-#undef HAVE_TM_GMTOFF</div><div class='del'>-#undef HAVE_KRB4</div><div class='del'>-#undef NEED_KRB_SENDAUTH_PROTO</div><div class='del'>-#undef HAVE_KRB5</div><div class='del'>-#undef HAVE_NSS</div><div class='del'>-#undef HAVE_OPENSSL</div><div class='del'>-#undef HAVE_SSL</div><div class='del'>-#undef USE_DOT</div><div class='del'>-#undef USE_FCNTL</div><div class='del'>-#undef USE_FLOCK</div><div class='del'>-#undef ENABLE_NNTP</div><div class='del'>-#undef HAVE_BROKEN_SPOOL</div><div class='del'>-#undef ENABLE_PEDANTIC_PGPMIME</div><div class='del'>-#undef HAVE_KDE_APPLNK</div><div class='del'>-</div><div class='del'>-/* db3 version */</div><div class='del'>-#undef EVOLUTION_DB_VERSION_MAJOR</div><div class='del'>-#undef EVOLUTION_DB_VERSION_MINOR</div><div class='del'>-#undef EVOLUTION_DB_VERSION_PATCH</div><div class='del'>-</div><div class='del'>-/* Sub-version identification string.  */</div><div class='del'>-#undef SUB_VERSION</div><div class='del'>-</div><div class='del'>-/* Preview-release string */</div><div class='del'>-#undef VERSION_COMMENT</div><div class='del'>-</div><div class='del'>-/* Define if ctime_r takes three arguments */</div><div class='del'>-#undef CTIME_R_THREE_ARGS</div><div class='del'>-</div><div class='del'>-/* Define if gethostbyname_r takes five arguments */</div><div class='del'>-#undef GETHOSTBYNAME_R_FIVE_ARGS</div><div class='del'>-</div><div class='del'>-/* Define if gethostbyaddr_r takes seven arguments */</div><div class='del'>-#undef GETHOSTBYADDR_R_SEVEN_ARGS</div><div class='del'>-</div><div class='del'>-/* Define to `int' if your system doesn't have `socklen_t'. */</div><div class='del'>-#undef socklen_t</div><div class='head'>diff --git a/addressbook/.cvsignore b/addressbook/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog<br/>deleted file mode 100644<br/>index bc664491e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11855 +0,0 @@</div><div class='del'>-2002-05-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: Removed an incorrect comment here.</div><div class='del'>-</div><div class='del'>-2002-05-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):</div><div class='del'>-	Enable the dropdown widgets even if the contact is not editable so</div><div class='del'>-	that you can view any email address, phone number, or postal</div><div class='del'>-	address on read only contacts.</div><div class='del'>-</div><div class='del'>-2002-05-10  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:</div><div class='del'>-	Added SimpleCard interface.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Added</div><div class='del'>-	e-simple-card-bonobo.c and e-simple-card-bonobo.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Added SIMPLE_CARD_LIST arg.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-simple-card-bonobo.c,</div><div class='del'>-	gui/component/select-names/e-simple-card-bonobo.h: New class to</div><div class='del'>-	represent an ECardSimple across Bonobo.</div><div class='del'>-</div><div class='del'>-2002-05-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Added "first_email" property.</div><div class='del'>-</div><div class='del'>-2002-05-09  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_get_other_contact_storage): Pass %FALSE as</div><div class='del'>-	@has_shared_folders to evolution_storage_new().</div><div class='del'>-</div><div class='del'>-2002-05-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: link against the libtool version of</div><div class='del'>-	libversit</div><div class='del'>-</div><div class='del'>-2002-05-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_config_control_new): oops, add the NULL back at the</div><div class='del'>-	end of possible_types.</div><div class='del'>-</div><div class='del'>-2002-05-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_ldap_init):</div><div class='del'>-	bleah, need to pass the GtkWindow here so we can pop up the a</div><div class='del'>-	modal parented dialog (gtk modal dialogs suck?).</div><div class='del'>-	(addressbook_ldap_auth): same.</div><div class='del'>-	(addressbook_root_dse_query): same.</div><div class='del'>-	(do_ldap_root_dse_query): same.</div><div class='del'>-	(addressbook_config_control_new): add "ldap-contacts" to the list</div><div class='del'>-	of possible types.</div><div class='del'>-</div><div class='del'>-2002-05-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (create_ldap_folder):</div><div class='del'>-	s/ldap_config/addressbook_config/</div><div class='del'>-</div><div class='del'>-2002-05-03  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (activate_factories_for_uri): finally</div><div class='del'>-	remove the #if 0's and use the oaf query stuff to get backends</div><div class='del'>-	that handle specific protocols.</div><div class='del'>-</div><div class='del'>-2002-05-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_folder_list_changed_callback): Call</div><div class='del'>-	evolution_config_control_changed when the EFolderList changes.</div><div class='del'>-</div><div class='del'>-2002-05-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Updated this</div><div class='del'>-	to have the ConfigControlFactory have an addressbookwide generic</div><div class='del'>-	name and added OAFIID:GNOME_Evolution_Addressbook_ConfigControl.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES),</div><div class='del'>-	gui/component/addressbook-component.c,</div><div class='del'>-	gui/component/addressbook-storage.c, gui/component/addressbook.c:</div><div class='del'>-	Replaced ldap-config.c and ldap-config.h with addressbook-config.c</div><div class='del'>-	andaddressbook-config.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c,</div><div class='del'>-	gui/component/addressbook-config.h: Based on ldap-config.c and</div><div class='del'>-	ldap-config.h.  Added a folder list control.  Made this a multi</div><div class='del'>-	factory.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.c, gui/component/ldap-config.h:</div><div class='del'>-	Replaced these with addressbook-config.c and addressbook-config.h.</div><div class='del'>-</div><div class='del'>-2002-05-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (selection_change):</div><div class='del'>-	Desensitize the to, cc, and bcc buttons if there's no selection</div><div class='del'>-	here.  Fixes Ximian bug #21482.</div><div class='del'>-</div><div class='del'>-2002-05-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (verbs): Changed</div><div class='del'>-	some of these to bind to the ContactListEditor verbs since they're</div><div class='del'>-	marked as that in the ui file.  Fixes Ximian bug #13034.</div><div class='del'>-</div><div class='del'>-2002-04-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (EXTRA_DIST): fix</div><div class='del'>-</div><div class='del'>-2002-04-30  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h</div><div class='del'>-	(e_addressbook_model_peek_card): Added this function so that there</div><div class='del'>-	would be less duplication of cards during run time when</div><div class='del'>-	duplication is unnecessary.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Cleaned up get_card_list and a</div><div class='del'>-	number of associated functions to be much more uniform and</div><div class='del'>-	simpler.</div><div class='del'>-	(get_has_email_address): Don't show the "Send Message to Contact"</div><div class='del'>-	menu item if there are no email addresses in the listed contacts.</div><div class='del'>-	Fixes bug #1298.</div><div class='del'>-</div><div class='del'>-2002-04-30  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Changed this to set a</div><div class='del'>-	subject when sending a contact.  This makes the signature be set</div><div class='del'>-	properly also.</div><div class='del'>-</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Don't link to libibex anymore.</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Same.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Again here.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: And finally here.</div><div class='del'>-</div><div class='del'>-2002-04-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_child_free): Unref the text_model here instead of</div><div class='del'>-	the model, since the model never gets set.  Removed the model</div><div class='del'>-	field since it's no longer used.</div><div class='del'>-</div><div class='del'>-2002-04-24  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.c: Updated this for the new</div><div class='del'>-	e_table_memory_store_insert function prototype.</div><div class='del'>-</div><div class='del'>-2002-04-24  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/component/select-names/select-names.glade (folder_browse):</div><div class='del'>-	Added a "Browse..." button to switch to a different addressbook</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):</div><div class='del'>-	Moved extern EvolutionShellClient out of this function so that</div><div class='del'>-	it'd be more readable.</div><div class='del'>-</div><div class='del'>-2002-04-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Coded handling of the</div><div class='del'>-	select_entry to search within the displayed contacts.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: Updated this</div><div class='del'>-	dialog to have an entry-select instead of an entry-find.</div><div class='del'>-</div><div class='del'>-2002-04-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: Updated this</div><div class='del'>-	dialog to match the redesign.</div><div class='del'>-</div><div class='del'>-2002-04-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (do_popup_menu): Make unused</div><div class='del'>-	menu items disappear instead of graying out.</div><div class='del'>-</div><div class='del'>-2002-04-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c,</div><div class='del'>-	gui/widgets/e-addressbook-reflow-adapter.h: Removed</div><div class='del'>-	e_addressbook_reflow_adapter_right_click and</div><div class='del'>-	e_addressbook_reflow_adapter_base_right_click.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Handle right click menu for</div><div class='del'>-	both types of view.  Merged right click on white space with right</div><div class='del'>-	click on main area.  General clean up.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h: Removed a couple unnecessary</div><div class='del'>-	functions.  Added e_minicard_view_widget_get_view.  Added</div><div class='del'>-	right_click signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:</div><div class='del'>-	Added the right_click signal and the e_minicard_view_get_card_list</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-2002-04-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h: Removed an unused</div><div class='del'>-	variable here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_right_click,</div><div class='del'>-	table_white_space_event): Added a current view submenu to the</div><div class='del'>-	popup menu here.</div><div class='del'>-</div><div class='del'>-2002-04-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin):</div><div class='del'>-	Allow GDK_ACTION_COPY also, since the composer for example does</div><div class='del'>-	not accept MOVE's. Completes bug #8448.</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.glade: change order of scope option</div><div class='del'>-	menu to match how it's stored.</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: change ldap</div><div class='del'>-	config control text so it fits in the config dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.c: #ifdef lots of stuff HAVE_LDAP so</div><div class='del'>-	it'll build/run in either case.</div><div class='del'>-	(addressbook_source_dialog_destroy): rename</div><div class='del'>-	addressbook_add_server_druid_destroy to this, and free lots more</div><div class='del'>-	stuff.</div><div class='del'>-	(addressbook_add_server_druid):</div><div class='del'>-	addressbook_add_server_druid_destroy -&gt;</div><div class='del'>-	addressbook_source_dialog_destroy.</div><div class='del'>-	(do_schema_query): add 3 second timeout to schema query.</div><div class='del'>-	(addressbook_edit_server_dialog): hook up destroy signal.</div><div class='del'>-	(config_control_new): if HAVE_LDAP isn't defined, put up a label</div><div class='del'>-	saying so.</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): add LDAP_CFLAGS to INCLUDES</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (book_open_cb): no more</div><div class='del'>-	source-&gt;type.</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.c (addressbook_dialog_get_source):</div><div class='del'>-	fill in source-&gt;ssl.</div><div class='del'>-	(addressbook_source_dialog_set_source): set up auth/scope/ssl</div><div class='del'>-	option menus properly.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_storage_init_source_uri): always include the</div><div class='del'>-	limit/ssl in the uri so we don't need to rely on defaults</div><div class='del'>-	everywhere.</div><div class='del'>-	(ldap_source_foreach): store the ssl option.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: reorder SSLType to match</div><div class='del'>-	the UI.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate)</div><div class='del'>-	add field for ldap_timeout.</div><div class='del'>-	(pas_backend_ldap_connect): reorder things a bit - we need to</div><div class='del'>-	start tls before the root dse query, if we can.</div><div class='del'>-	(pas_backend_ldap_load_uri): track the way ssl parameters are</div><div class='del'>-	given in the uri, and parse out the timeout.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-config.c (port_changed_func): use the</div><div class='del'>-	symbolic SSL name instead of an integer constant.</div><div class='del'>-</div><div class='del'>-2002-04-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (get_ldap_library_info): fix</div><div class='del'>-	memory leaks.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: remove the</div><div class='del'>-	Addressbook_ConfigControl stuff to LDAP_ConfigControl.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):</div><div class='del'>-	remove addressbook-config.* and add ldap-config.*</div><div class='del'>-	(glade_DATA): same.</div><div class='del'>-	(evolution_addressbook_LDADD): add LDAP_LIBS.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb):</div><div class='del'>-	addressbook_config_register_factory =&gt;</div><div class='del'>-	ldap_config_register_factory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (book_open_cb): remove source-&gt;type</div><div class='del'>-	check - they're always LDAP.</div><div class='del'>-	(load_uri_cb): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (ldap_unparse_ssl): new</div><div class='del'>-	function.</div><div class='del'>-	(ldap_parse_ssl): new function.</div><div class='del'>-	(addressbook_storage_init_source_uri): use a more flexible scheme</div><div class='del'>-	to build up the uri's, and add in the ssl parameter.</div><div class='del'>-	(load_source_data): fill in source-&gt;ssl, and remove source-&gt;type</div><div class='del'>-	assignment.</div><div class='del'>-	(addressbook_source_copy): copy source-&gt;ssl, and remove</div><div class='del'>-	source-&gt;type copy.</div><div class='del'>-	(create_ldap_folder): addressbook_create_new_source =&gt;</div><div class='del'>-	ldap_config_create_new_source.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: remove</div><div class='del'>-	AddressbookSourceType (it was always LDAP), and add</div><div class='del'>-	AddressbookLDAPSSLType.</div><div class='del'>-</div><div class='del'>-2002-04-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_load_default_book): Append</div><div class='del'>-	/addressbook.db to the end of the default URI if it starts with</div><div class='del'>-	file:</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_uri_step): Fix this to not</div><div class='del'>-	loop forever if you have more than one backend.</div><div class='del'>-</div><div class='del'>-2002-04-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_create_categories): Changed this to use</div><div class='del'>-	ECategoriesMasterListOptionMenu.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(section_right_click_cb),</div><div class='del'>-	gui/widgets/e-addressbook-reflow-adapter.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Updated these to match the new</div><div class='del'>-	EPopupMenu.</div><div class='del'>-</div><div class='del'>-2002-04-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Include</div><div class='del'>-	addressbook-config.h here as this file uses it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (SPEC, SPEC2): Made</div><div class='del'>-	this dialog searchable by typing in the ETable.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c: Include e-addressbook-util.h</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click),</div><div class='del'>-	gui/widgets/e-addressbook-view.c (table_right_click): Fixed a</div><div class='del'>-	memory leak here by using "selection-done" signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c,</div><div class='del'>-	gui/widgets/e-addressbook-reflow-adapter.h,</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-view.c:</div><div class='del'>-	Added a right click menu for areas that aren't cards.</div><div class='del'>-</div><div class='del'>-2002-04-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_load_default_book): Update</div><div class='del'>-	for new-and-improved consistent default folder uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_load_default_book): Use</div><div class='del'>-	e_book_load_default_book rather than duplicating most of its logic</div><div class='del'>-	here.</div><div class='del'>-	(load_uri_cb): Modify to work as a callback for</div><div class='del'>-	addressbook_load_default_book as well as addressbook_load_uri.</div><div class='del'>-</div><div class='del'>-2002-04-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (create_view): Add</div><div class='del'>-	view_info arg, but don't do anything with it.</div><div class='del'>-</div><div class='del'>-2002-04-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: add</div><div class='del'>-	config_item:type</div><div class='del'>-</div><div class='del'>-2002-04-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: link to the static libversit</div><div class='del'>-</div><div class='del'>-2002-04-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c (e_addressbook_transfer_cards):</div><div class='del'>-	Update for evolution_shell_client_user_select_folder API change.</div><div class='del'>-</div><div class='del'>-2002-04-04  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Remove AddressbookConfig,</div><div class='del'>-	ContactNew, ContactNewList EPixmap entries.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Print out a</div><div class='del'>-	debugging message just before the main loop starts, for debugging</div><div class='del'>-	purposes.</div><div class='del'>-</div><div class='del'>-2002-04-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: Fix spelling of</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_TTYTDD and E_CARD_SIMPLE_FIELD_PHONE_TTYTDD</div><div class='del'>-	(they previously ended with "TTD" instead of "TDD")</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Update for spelling fix.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Likewise</div><div class='del'>-</div><div class='del'>-2002-04-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c:</div><div class='del'>-	parent_class should be static. (From Max Horn &lt;max@quendi.de&gt;)</div><div class='del'>-</div><div class='del'>-2002-03-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add priority</div><div class='del'>-	for the config page.  Renamed to "Directory Servers".</div><div class='del'>-</div><div class='del'>-2002-03-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_create_card): don't free req-&gt;vcard.</div><div class='del'>-	it's freed in pas_book_free_request.</div><div class='del'>-	(pas_backend_file_process_remove_card): don't free req-&gt;id for the</div><div class='del'>-	same reason.</div><div class='del'>-	(pas_backend_file_process_modify_card): don't free req-&gt;vcard for</div><div class='del'>-	the same reason.</div><div class='del'>-	(pas_backend_file_process_get_changes): don't free req-&gt;change_id</div><div class='del'>-	or release_unref the listener for the same reason.</div><div class='del'>-</div><div class='del'>-2002-03-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (check_schema_support): make sure</div><div class='del'>-	to call ldap_value_free (values);, and ldap_msgfree (resp).</div><div class='del'>-	(get_ldap_library_info): don't ask me why, but it appears we have</div><div class='del'>-	to free each extension char*.</div><div class='del'>-	(query_ldap_root_dse): make sure to free values in the</div><div class='del'>-	subschemaSubentry code before overwriting it, and call</div><div class='del'>-	ldap_msgfree(resp) when we're all done.</div><div class='del'>-	(build_card_from_entry): don't leak the DN, ldap attributes, or</div><div class='del'>-	the berval the ldap_*_attribute calls use to step through the</div><div class='del'>-	attributes.  the docs say this berval is freed when</div><div class='del'>-	ldap_next_attribute returns NULL, but if we don't free it it leaks</div><div class='del'>-	a substantial amount of memory.</div><div class='del'>-	(pas_backend_ldap_search): make sure to only allocate *op once,</div><div class='del'>-	and fix the g_warning since op isn't valid in its scope anymore.</div><div class='del'>-</div><div class='del'>-2002-03-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Update for libversit change: Use .a</div><div class='del'>-	rather than .la now.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Likewise</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Likewise</div><div class='del'>-</div><div class='del'>-2002-03-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_menu_activated):</div><div class='del'>-	Removed.</div><div class='del'>-	(addressbook_factory_new_control): Don't connect anymore, as this</div><div class='del'>-	signal has been removed from the ESearchBar.</div><div class='del'>-	(addressbook_factory_new_control): No more custom menu items here.</div><div class='del'>-</div><div class='del'>-2002-03-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_right_click): Update to</div><div class='del'>-	use new EPopupMenu API.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click): Update to use new</div><div class='del'>-	EPopupMenu API.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(section_right_click_cb): Update to match new EPopupMenu api.</div><div class='del'>-</div><div class='del'>-2002-03-15  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Remove the</div><div class='del'>-	`addressbook_search_menu_items'.</div><div class='del'>-	(addressbook_menu_activated): Removed.</div><div class='del'>-	(addressbook_factory_new_control): Don't connect.  No menu items.</div><div class='del'>-</div><div class='del'>-2002-03-15  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Call</div><div class='del'>-	`e_search_bar_set_ui_component()' to set the BonoboUIComponent for</div><div class='del'>-	the search bar.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon</div><div class='del'>-	for the LDAP sources configuration control.</div><div class='del'>-</div><div class='del'>-2002-03-12  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Remove verb "AddressbookConfig".</div><div class='del'>-	(config_cb): Removed.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c: Remove `dialog' member from</div><div class='del'>-	`AddresbookDialog'.  Instead, add a `config_control' member.</div><div class='del'>-	(config_control_new): New.</div><div class='del'>-	(addressbook_config): Removed.</div><div class='del'>-	(addressbook_config_register_factory): New.</div><div class='del'>-	(config_control_factory_fn): New, factory function for the</div><div class='del'>-	ConfigControl page.</div><div class='del'>-	(addressbook_source_edit_changed): Don't change the sensitivity of</div><div class='del'>-	the dialog.  Rather, invoke ::changed on the ConfigPage.</div><div class='del'>-	(auth_checkbutton_changed): No need to manually change the</div><div class='del'>-	sensitiviness of the buttons here either.</div><div class='del'>-	(add_source_clicked): Likewise, just invoke</div><div class='del'>-	evolution_config_control_changed().</div><div class='del'>-	(edit_source_clicked): Likewise.</div><div class='del'>-	(addressbook_dialog_close): Removed.</div><div class='del'>-	(config_control_destroy_callback): New, callback for when the</div><div class='del'>-	config control gets destroyed.</div><div class='del'>-	(addressbook_dialog_apply): Removed.</div><div class='del'>-	(config_control_apply_callback): New callback for</div><div class='del'>-	EvolutionConfigControl::apply.</div><div class='del'>-	(addressbook_dialog_ok): Removed.</div><div class='del'>-	(addressbook_config_control_new): Set up -&gt;config_control and</div><div class='del'>-	connect the signals.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: Call the main hbox in</div><div class='del'>-	the addressbook_sources dialog `addressbook_sources_main_hbox'.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Call</div><div class='del'>-	`addresbook_config_register_factory'.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add items for</div><div class='del'>-	OAFIID:GNOME_Evolution_Addresbook_ConfigControl and</div><div class='del'>-	OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory.</div><div class='del'>-</div><div class='del'>-2002-03-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (update_query):</div><div class='del'>-	change contains x-evolution-any-field to beginswith on email,</div><div class='del'>-	full_name, and nickname.  faster, and more applicable to this</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2002-03-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add TLSNotAvailable to</div><div class='del'>-	BookLister_CallStatus.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h: add TLS_NOT_AVAILABLE to the EBookStatus enum.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_convert_status): add TLS_NOT_AVAILABLE to the</div><div class='del'>-	switch.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_get_static_capabilities): fix name.</div><div class='del'>-	(pas_backend_ldap_class_init): fix name.</div><div class='del'>-	(pas_backend_ldap_connect): change return type to CallStatus so we</div><div class='del'>-	can return different errors from here.  Also, do STARTTLS if the</div><div class='del'>-	user has asked for it and the connection supports it, returning</div><div class='del'>-	TLSNotAvailable (and close the connection) if they chose to</div><div class='del'>-	require it.</div><div class='del'>-	(pas_backend_ldap_load_uri): return pas_backend_ldap_connect.</div><div class='del'>-	(func_beginswith): pull in change from evolution-1-0-branch to</div><div class='del'>-	make full_name beginswith search both cn and sn.</div><div class='del'>-</div><div class='del'>-2002-03-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (jump_to_letter): since I've</div><div class='del'>-	gone ahead and made the file backend (by way of</div><div class='del'>-	pas-backend-card-sexp.c) use case insensitive searches for</div><div class='del'>-	beginswith, there's no need to list upper and lower case here.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_search_option_items):</div><div class='del'>-	reorder things to put "Any field contains" at the end, since it's</div><div class='del'>-	the least efficient search.  Also reorder the enum to the same</div><div class='del'>-	ordering.  Change "Name contains" to "Name begins with" and change</div><div class='del'>-	"Email contains" to "Email is".</div><div class='del'>-	(addressbook_search_activated): change FULL_NAME to beginswith,</div><div class='del'>-	and change EMAIL to is to match the labels.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-card-sexp.c (compare_name): new</div><div class='del'>-	function, so we can compare both full and family names (so</div><div class='del'>-	beginswith can operate on them both.)</div><div class='del'>-	(endswith_helper): use e_utf8_strstrcase here, since all the</div><div class='del'>-	backends backends use case insensitive searching.</div><div class='del'>-	(func_endswith): same.</div><div class='del'>-</div><div class='del'>-2002-03-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_create_card): track</div><div class='del'>-	union/struct change.</div><div class='del'>-	(pas_book_queue_remove_card): same.</div><div class='del'>-	(pas_book_queue_modify_card): same.</div><div class='del'>-	(pas_book_queue_get_cursor): same.</div><div class='del'>-	(pas_book_queue_get_vcard): same.</div><div class='del'>-	(pas_book_queue_authenticate_user): same.</div><div class='del'>-	(pas_book_queue_get_book_view): same.</div><div class='del'>-	(pas_book_queue_get_changes): same.</div><div class='del'>-	(pas_book_free_request): new function - free everything we need to</div><div class='del'>-	for each type of request.</div><div class='del'>-	(pas_book_destroy): call pas_book_free_request here instead of</div><div class='del'>-	just freeing 3 elements of the old struct.  yay plugging memleaks.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: make PASRequest a union and split out</div><div class='del'>-	members into structs, so it's a little clearer which fields are</div><div class='del'>-	used by which requests.  Also, add prototype for</div><div class='del'>-	pas_book_free_request so backends can just free everything at once</div><div class='del'>-	(usually in their requests_queued signal func.)</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_create_card): track struct/union change.</div><div class='del'>-	(pas_backend_file_process_remove_card): same.</div><div class='del'>-	(pas_backend_file_process_modify_card): same.</div><div class='del'>-	(pas_backend_file_build_cards_list): same.</div><div class='del'>-	(pas_backend_file_process_get_vcard): same.</div><div class='del'>-	(pas_backend_file_process_get_cursor): same.</div><div class='del'>-	(pas_backend_file_process_get_book_view): same.</div><div class='del'>-	(pas_backend_file_process_get_changes): same.</div><div class='del'>-	(pas_backend_file_process_check_connection): same.</div><div class='del'>-	(pas_backend_file_process_authenticate_user): same.</div><div class='del'>-	(pas_backend_file_process_get_supported_fields): same.</div><div class='del'>-	(pas_backend_file_process_client_requests): case the union to the</div><div class='del'>-	specific struct and pass it to the process_* functions.  also,</div><div class='del'>-	call pas_book_free_request here, instead of relying on each of the</div><div class='del'>-	functions to free their stuff.</div><div class='del'>-</div><div class='del'>-2002-03-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_get_other_contact_storage): Update for</div><div class='del'>-	evolution_storage_new() change.</div><div class='del'>-</div><div class='del'>-2002-03-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_realize): don't set "editable" here, as</div><div class='del'>-	the way things work the backend isn't able to override a setting</div><div class='del'>-	from the UI, so writable books never show up as writable.</div><div class='del'>-</div><div class='del'>-2002-03-04  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[fixes bug #20871]</div><div class='del'>-	* gui/component/select-names/select-names.glade: add the</div><div class='del'>-	status-message label.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h (struct</div><div class='del'>-	_ESelectNames): add status_message field.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (status_message):</div><div class='del'>-	new function, set the label's text from the message.</div><div class='del'>-	(e_select_names_init): get the status-message label, and if it's</div><div class='del'>-	valid, connect to the status_message signal of the</div><div class='del'>-	EAddressbookModel.</div><div class='del'>-</div><div class='del'>-2002-02-28  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_search): don't</div><div class='del'>-	ref the view here, since it keeps the view alive until the search</div><div class='del'>-	is over, which we don't want.  we want the view's death to cancel</div><div class='del'>-	the search.  This speeds up starting new searches after one is</div><div class='del'>-	already active (since switching searches actually creates a new</div><div class='del'>-	book view and destroys the old one.)</div><div class='del'>-	(ldap_search_dtor): remove the matching unref here.  The unref as</div><div class='del'>-	it was was incorrect anyway, and caused a crash (we needed</div><div class='del'>-	search_op-&gt;view, not op-&gt;view.)</div><div class='del'>-</div><div class='del'>-2002-02-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[fixes bug #20690]</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_and): the data arg is not</div><div class='del'>-	GList** anymore, it's PASBackendLDAPSExpData*, so use</div><div class='del'>-	ldap_data-&gt;list instead of *list.</div><div class='del'>-	(func_or): same.</div><div class='del'>-	(func_not): same.</div><div class='del'>-	(func_contains): same.</div><div class='del'>-	(func_is): same.</div><div class='del'>-	(func_endswith): same.</div><div class='del'>-	(func_beginswith): same, but also special case the beginswith</div><div class='del'>-	"fileAs" query type (the one used by the alphabet buttons on the</div><div class='del'>-	right hand side, so we can deal with entries that don't have</div><div class='del'>-	fileAs attributes, and return meaningful responses.)</div><div class='del'>-	(pas_backend_ldap_build_query): initialize the</div><div class='del'>-	PASBackendLDAPSExpData struct and pass that instead of &amp;list.</div><div class='del'>-	Also, take the PASBackendLDAP arg to add to the struct in case we</div><div class='del'>-	need it at some point in the future.</div><div class='del'>-	(ldap_search_handler): pass in the PASBackendLDAP.</div><div class='del'>-</div><div class='del'>-2002-02-26  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): move</div><div class='del'>-	card_count++ inside the if that checks to see if a card matches</div><div class='del'>-	(and adds the card to the list).</div><div class='del'>-</div><div class='del'>-2002-02-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed): only</div><div class='del'>-	handle the ESB_ADVANCED case here now.  the actual query work is</div><div class='del'>-	done in addressbook_search_activated.</div><div class='del'>-	(addressbook_search_activated): split out all the searching</div><div class='del'>-	functionality here.</div><div class='del'>-	(addressbook_factory_new_control): hook up "search_activated" to</div><div class='del'>-	addressbook_search_activated.</div><div class='del'>-</div><div class='del'>-2002-02-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_source_dialog_set_source): make the right auth page</div><div class='del'>-	start up open.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (addressbook_source_free):</div><div class='del'>-	free the binddn.</div><div class='del'>-	(addressbook_source_copy): copy the binddn;</div><div class='del'>-</div><div class='del'>-2002-02-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes bugs 20740, 16680, and god knows what else :) ]</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (create_card): double the</div><div class='del'>-	allocated size every time we need more space instead of using a</div><div class='del'>-	fixed size increment.  this helps huge queries.  Also, remove the</div><div class='del'>-	gtk_object_get of "file_as", as it was dead code.</div><div class='del'>-	(book_view_loaded): handle errors here (by popping up a dialog).</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): search_idle -&gt;</div><div class='del'>-	search_timeout.</div><div class='del'>-	(build_card_from_entry): comment out some spew, and unref ecard</div><div class='del'>-	when we're done to plug a memory leak.</div><div class='del'>-	(send_pending_adds): send along to the client all the cards we've</div><div class='del'>-	been saving up.</div><div class='del'>-	(poll_ldap): use a timeout for ldap_result to keep the backend</div><div class='del'>-	from blocking (and it turns out keep the frontend from hanging</div><div class='del'>-	waiting on a ref to complete) on large db's with few matches.</div><div class='del'>-</div><div class='del'>-	Also, add some fairly smart, self-tuning aggregating of cards.</div><div class='del'>-	Keep track of the number of cards we've sent the last time through</div><div class='del'>-	as well as this time, and estimate the number we want to aggregate</div><div class='del'>-	the next time based on them (we average them at the moment),</div><div class='del'>-	subject to maximum/minimum number of cards.  also, we have a</div><div class='del'>-	maximum aggregation time, after which we force a flush if there</div><div class='del'>-	are pending cards and recalculate our target pending number.</div><div class='del'>-	there's a minimum wait time to possibly keep outselves from</div><div class='del'>-	spamming the ui, although it's 0 at the moment.</div><div class='del'>-</div><div class='del'>-	Lastly, make sure to only notify the GUI of status messages when</div><div class='del'>-	we need to.  this results in a *huge* savings.</div><div class='del'>-	(ldap_search_handler): initialize all the pending card stuff, and</div><div class='del'>-	use a timeout instead of an idle function for poll_ldap.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_queue_response): performance optimization</div><div class='del'>-	for large adds.  If we're a CardAddedEvent and there's an existing</div><div class='del'>-	CardAddedEvent at the end of the queue, just concat the lists of</div><div class='del'>-	cards together.  This is to keep the gui from falling further and</div><div class='del'>-	further behind the ldap backend, which is merrily spewing updates</div><div class='del'>-	at the gui.</div><div class='del'>-</div><div class='del'>-2002-02-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Define $(iconsdir).</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (add_creatable_item): New</div><div class='del'>-	helper function.</div><div class='del'>-	(create_component): Add the icons for the user creatable items as</div><div class='del'>-	well.</div><div class='del'>-</div><div class='del'>-2002-02-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri):</div><div class='del'>-	track change to signature, and (for now) just change all the</div><div class='del'>-	return FALSE's to _RepositoryOffline (what FALSE used to map to in</div><div class='del'>-	pas_book_factory_process_request), and change TRUE to _Success.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri):</div><div class='del'>-	track change to signature, and differentiate between</div><div class='del'>-	pas_backend_ldap_connect failing (RepositoryOffline), and</div><div class='del'>-	ldap_url_parse failing (OtherError).</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_process_request): since pas_backend_load_uri</div><div class='del'>-	returns status now, use it to nodify the BookListener if there's a</div><div class='del'>-	failure.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.c (pas_backend_load_uri): track change</div><div class='del'>-	to signature.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.h: change return type of</div><div class='del'>-	pas_backend_load_uri to</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_CallStatus to allow</div><div class='del'>-	differentiation between failure types.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_convert_status): handle _AUTHENTICATION_FAILED.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h (EBookStatus): add</div><div class='del'>-	_AUTHENTICATION_FAILED.</div><div class='del'>-</div><div class='del'>-2002-02-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_process_request): if the load_uri fails, notify</div><div class='del'>-	the listener that the repository is offline.  (partial fix for bug</div><div class='del'>-	20347)</div><div class='del'>-</div><div class='del'>-2002-02-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (create_dn_from_ecard): escape</div><div class='del'>-	commas in the dn, since they're used by ldap to specify the node's</div><div class='del'>-	placement in the tree. (fixes bug 20089)</div><div class='del'>-	(rfc2254_escape): just use sprintf and %02X instead.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (set_book): Keep a</div><div class='del'>-	ref of the model in this case as well.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (set_book): Make</div><div class='del'>-	sure to only set the query once when creating a new book and not</div><div class='del'>-	at all on addressbook model creation.  This prevents an accidental</div><div class='del'>-	pair of changes from making the addressbook model load a remote</div><div class='del'>-	addressbook.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (get_view): If this is the</div><div class='del'>-	first_get_view and the addressbook is remote, empty the view</div><div class='del'>-	instead of leaving it in the state it used to be in.  This only</div><div class='del'>-	occurs if you set the book after the model has existed for a</div><div class='del'>-	while.</div><div class='del'>-	(e_addressbook_model_set_arg): When setting the book, set</div><div class='del'>-	first_get_view to TRUE.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (display_view): Attach to the</div><div class='del'>-	emvw instead of the emv here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c, e-minicard-view-widget.h:</div><div class='del'>-	Made this object have a "column_width" argument and a</div><div class='del'>-	"column_width_changed" signal which are a simple layer down to the</div><div class='del'>-	EMinicardView contained within.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h</div><div class='del'>-	(gal_view_minicard_attach): Made this attach to an</div><div class='del'>-	EMinicardViewWidget instead of a EMinicardView.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c, backend/ebook/e-book-util.h</div><div class='del'>-	(e_book_expand_uri, e_book_load_address_book_by_uri,</div><div class='del'>-	e_book_use_address_book_by_uri): New functions that take a file://</div><div class='del'>-	url ending in the directory name and automatically append the</div><div class='del'>-	addressbook.db and do the appropriate thing.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-card-sexp.c,</div><div class='del'>-	backend/pas/pas-backend-card-sexp.h: Added copyright notice here.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_drop), gui/component/addressbook.c</div><div class='del'>-	(set_prop): Use e_book_expand_uri instead of</div><div class='del'>-	addressbook_expand_uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c: Fixed the fcntl include</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (ContactsCopyToFolder,</div><div class='del'>-	ContactsMoveToFolder): Added handlers for these two verbs.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.h: Removed addressbook_expand_uri in</div><div class='del'>-	favor of e_book_expand_uri.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (transfer_cards):</div><div class='del'>-	Added code to handle Move to and Copy to right click menu items.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c,</div><div class='del'>-	gui/widgets/e-addressbook-util.h (e_addressbook_transfer_cards):</div><div class='del'>-	New function to pop up a dialog and transfer a set of cards to the</div><div class='del'>-	given folder.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h (display_view): Don't attach to</div><div class='del'>-	the view if it doesn't exist yet.  We have to make this then</div><div class='del'>-	attach later.</div><div class='del'>-	(e_addressbook_view_copy_to_folder,</div><div class='del'>-	e_addressbook_view_move_to_folder): New functions utilizing</div><div class='del'>-	e_addressbook_transfer_cards.</div><div class='del'>-	(table_right_click): Add copy_to_folder and move_to_folder to the</div><div class='del'>-	right click menu for tables here.</div><div class='del'>-	(e_addressbook_view_discard_menus): Handle menu unmerging here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h (struct</div><div class='del'>-	_EMinicardViewWidget): Removed unused field.</div><div class='del'>-</div><div class='del'>-2002-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (display_view): Attach the</div><div class='del'>-	GalViewMinicard to the EMinicardView here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/gal-view-minicard.c, gui/widgets/gal-view-minicard.h</div><div class='del'>-	(gal_view_minicard_load, gal_view_minicard_save): Made these save</div><div class='del'>-	the column width of the view.</div><div class='del'>-	(gal_view_minicard_attach, gal_view_minicard_detach): Added these</div><div class='del'>-	functions to allow the GalViewMinicard to set the column width of</div><div class='del'>-	a EMinicardView and to monitor its changes.</div><div class='del'>-</div><div class='del'>-2002-02-12  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(addressbook_get_arg): Added an argument to get the model.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (writable_status): Don't bother</div><div class='del'>-	connecting to the writable_status callback on the book, simply</div><div class='del'>-	rely on the writable_status callback on the addressbook model.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h</div><div class='del'>-	(set_empty_message): Handle the case of a read only view here.</div><div class='del'>-</div><div class='del'>-2002-02-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (create_component): remove</div><div class='del'>-	"New" from user creatable menu items</div><div class='del'>-</div><div class='del'>-2002-02-07  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h</div><div class='del'>-	(e_addressbook_view_setup_menus): Changed this function to use the</div><div class='del'>-	new GalViewMenus which takes a GalViewInstance, instead of a</div><div class='del'>-	GalViewCollection.</div><div class='del'>-</div><div class='del'>-2002-02-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (find_address_mailing): tidy</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (addrconduit_load_configuration): load</div><div class='del'>-	default address setting</div><div class='del'>-	(addrconduit_save_configuration): save default address setting</div><div class='del'>-	(e_addr_gui_new): new gui routine for conduit settings</div><div class='del'>-	(e_addr_gui_fill_widgets): ditto</div><div class='del'>-	(e_addr_gui_fill_config): ditto</div><div class='del'>-	(e_addr_gui_destroy): ditto</div><div class='del'>-	(e_addr_context_destroy): destroy the gui and new_cfg</div><div class='del'>-	(local_record_from_ecard): reinstate commented out bits, determine</div><div class='del'>-	which address to sync to pilot</div><div class='del'>-	(ecard_from_remote_record): determine which address to sync from</div><div class='del'>-	pilot</div><div class='del'>-	(fill_widgets): put the gui widgets in</div><div class='del'>-	(create_settings_window): create gui</div><div class='del'>-	(save_settings): fill gui</div><div class='del'>-</div><div class='del'>-2002-02-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (address_text_changed): if</div><div class='del'>-	the shown address in the mailing address or there is no mailing</div><div class='del'>-	address, set the default flag and make sure the button is checked</div><div class='del'>-	(address_mailing_changed): set the flags properly when the mailing</div><div class='del'>-	address changes</div><div class='del'>-	(e_contact_editor_init): listen for the check button being toggled</div><div class='del'>-	(find_address_mailing): find the address (if any) with the default</div><div class='del'>-	flag</div><div class='del'>-	(set_address_field): set the mailing address button appropriately</div><div class='del'>-	(fill_in_info): find the mailing address</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.h: add new class data member</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: show mailing address</div><div class='del'>-	check button</div><div class='del'>-</div><div class='del'>-2002-02-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_auto_recipient):</div><div class='del'>-	New function to find out if a destination was one which was</div><div class='del'>-	auto-matically set by Evolution.</div><div class='del'>-	(e_destination_set_auto_recipient): Set whether or not the dest is</div><div class='del'>-	an auto-recipient.</div><div class='del'>-	(e_destination_touch): Don't touch the address if it is an</div><div class='del'>-	auto_recipient.</div><div class='del'>-	(e_destination_list_to_vector_sized): New function to avoid having</div><div class='del'>-	to calculate the length of the list ourselves. Allows for a bit of</div><div class='del'>-	optimization if our caller knows the length of the list.</div><div class='del'>-	(e_destination_xml_encode): Encode the auto_recipient bit.</div><div class='del'>-	(e_destination_xml_decode): Decode the auto_recipient bit.</div><div class='del'>-</div><div class='del'>-2002-02-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card): Made</div><div class='del'>-	this preserve addressbook flags other than the first three.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: Added E_CARD_ADDR_MASK and</div><div class='del'>-	E_CARD_ADDR_DEFAULT.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (get_address_flags): Added "PREF" to</div><div class='del'>-	E_CARD_ADDR_DEFAULT mapping.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c: Added #include "e-book-util.h".</div><div class='del'>-</div><div class='del'>-2002-01-30  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_changes):</div><div class='del'>-	compute the change db filename based on our contact db filename.</div><div class='del'>-	(pas_backend_file_load_uri): store the filename in</div><div class='del'>-	bf-&gt;priv-&gt;filename.</div><div class='del'>-	(pas_backend_file_destroy): free the filename, and (!) free</div><div class='del'>-	bf-&gt;priv too.</div><div class='del'>-</div><div class='del'>-2002-01-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_valid): Revert</div><div class='del'>-	my previous change as trow says this will break auto-completion</div><div class='del'>-	stuff.</div><div class='del'>-</div><div class='del'>-2002-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS.</div><div class='del'>-	* gui/contact-list-editor/Makefile.am: Likewise.</div><div class='del'>-	* gui/merging/Makefile.am: Likewise.</div><div class='del'>-	* gui/search/Makefile.am: Likewise.</div><div class='del'>-	* gui/component/select-names/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2002-01-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_valid): Don't</div><div class='del'>-	check for an @ in the email address. This is to fix bug #10960.</div><div class='del'>-</div><div class='del'>-2002-01-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ fixes bug 16097 ]</div><div class='del'>-	* gui/component/addressbook-config.glade: gui love for the new</div><div class='del'>-	auth stuff.</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook.c (load_uri_cb): track change to auth,</div><div class='del'>-	and offer up different prompt strings depending on which method</div><div class='del'>-	(binddn or email) we're using.</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook-storage.c (ldap_unparse_auth): use the</div><div class='del'>-	new auth types for ldap.</div><div class='del'>-	(ldap_parse_auth): same.</div><div class='del'>-	(addressbook_storage_auth_type_to_string): new function.</div><div class='del'>-	(load_source_data): get the binddn too.</div><div class='del'>-	(ldap_source_foreach): store out binddn or emailaddr, depending on</div><div class='del'>-	the auth type chosen.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: add the more detailed auth</div><div class='del'>-	types, add "binddn" to the source structure, and add a prototype</div><div class='del'>-	for addressbook_storage_auth_type_to_string.</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook-config.c (auth_checkbutton_changed):</div><div class='del'>-	set the auth stuff  (in)sensitive.</div><div class='del'>-	(auth_optionmenu_activated): new function.</div><div class='del'>-	(addressbook_source_dialog_set_source): track UI change.</div><div class='del'>-	(addressbook_source_dialog_get_source): same.</div><div class='del'>-	(add_scope_activate_cb): rename add_activate_cb to this to</div><div class='del'>-	distinguish it from the auth stuff.</div><div class='del'>-	(add_auth_activate_cb): new function.</div><div class='del'>-	(addressbook_source_dialog): track change to auth UI stuff.</div><div class='del'>-	(addressbook_storage_auth_type_to_string): new function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: add auth_method arg to</div><div class='del'>-	e_book_authenticate_user.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_authenticate_user): track change</div><div class='del'>-	to prototype - add auth_method arg, and pass it along to the CORBA</div><div class='del'>-	call.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c (book_open_cb): track api change -</div><div class='del'>-	keep this building.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: add auth_method slot in PASRequest.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): add</div><div class='del'>-	auth_method arg and add it to the PASRequest.</div><div class='del'>-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): track</div><div class='del'>-	idl change, add auth_method and pass it along to</div><div class='del'>-	pas_book_queue_authenticate_user.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): support both</div><div class='del'>-	"ldap/simple-email" and "ldap/simple-binddn" auth methods.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add "in string authMethod" to</div><div class='del'>-	authenticateUser.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS</div><div class='del'>-	and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and</div><div class='del'>-	EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.</div><div class='del'>-	* backend/pas/Makefile.am: Likewise.</div><div class='del'>-	* backend/ebook/Makefile.am: Likewise.</div><div class='del'>-	* printing/Makefile.am: Likewise.</div><div class='del'>-	* backend/ebook/Makefile.am: Likewise.</div><div class='del'>-	* gui/widgets/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2002-01-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (create_component): Pass a</div><div class='del'>-	NULL @icon to</div><div class='del'>-	`evolution_shell_component_add_user_creatable_item()'.</div><div class='del'>-</div><div class='del'>-2002-01-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor-address.c: #include</div><div class='del'>-	&lt;locale.h&gt;.</div><div class='del'>-</div><div class='del'>-2002-01-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ fixes bug # 16864 ]</div><div class='del'>-	* backend/ebook/evolution-ldif-importer.c (getValue): create and</div><div class='del'>-	return a GString here, instead of writing to a fixed size buffer.</div><div class='del'>-	(parseLine): use a GString here instead of a fixed size buffer.</div><div class='del'>-</div><div class='del'>-2002-01-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_search_handler): Set the</div><div class='del'>-	number of cards to return to the value specified in the ldap uri,</div><div class='del'>-	leaving the default at 100.  Fixes Ximian bug #13953.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_source_dialog),</div><div class='del'>-	gui/component/addressbook-config.glade: Added a limit entry here</div><div class='del'>-	to edit the limit field of the source.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c,</div><div class='del'>-	gui/component/addressbook-storage.h</div><div class='del'>-	(addressbook_storage_init_source_uri): Added a limit field to this</div><div class='del'>-	class and pass that value through in the uri that's generated.</div><div class='del'>-</div><div class='del'>-2002-01-18  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c: Made username match with no</div><div class='del'>-	domain match be vague instead of partial.  Fixes Ximian bug</div><div class='del'>-	#13612.</div><div class='del'>-</div><div class='del'>-2002-01-18  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (view_contact_cb): New verb to open</div><div class='del'>-	a bunch of cards.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): Call</div><div class='del'>-	e_addressbook_show_multiple_cards instead of doing this ourselves.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c,</div><div class='del'>-	gui/widgets/e-addressbook-util.h</div><div class='del'>-	(e_addressbook_show_multiple_cards): Added this function to show a</div><div class='del'>-	bunch of cards, including a dialog if lots of windows are going to</div><div class='del'>-	appear.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_view,</div><div class='del'>-	e_addressbook_view_can_view): e_addressbook_view_view calls</div><div class='del'>-	e_addressbook_show_multiple_cards on the appropriate list of</div><div class='del'>-	cards.</div><div class='del'>-</div><div class='del'>-2002-01-18  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor-address.c</div><div class='del'>-	(fill_in_countries), gui/contact-editor/fulladdr.glade: Sort</div><div class='del'>-	country list.  Country list moves from fulladdr.glade to</div><div class='del'>-	e-contact-editor-address.c, but only a few country names have</div><div class='del'>-	actually changed.  Fixes Ximian bug #16545.</div><div class='del'>-</div><div class='del'>-2001-12-20  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	Fixes #17725</div><div class='del'>-</div><div class='del'>-	* evolution/addressbook/printing/e-contact-print.c (complete_sequence):</div><div class='del'>-	Do not assume that the first byte of file_as is the first letter, use</div><div class='del'>-	utf8 functions instead.</div><div class='del'>-</div><div class='del'>-2002-01-16  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: move all functions here, get rid of</div><div class='del'>-	header files, use e-pilot-settings to display gui</div><div class='del'>-</div><div class='del'>-2002-01-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: remove misleading</div><div class='del'>-	title and fix spacing</div><div class='del'>-</div><div class='del'>-2002-01-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (alphabet_state_changed): Handle</div><div class='del'>-	setting the search bar to "Advanced..." when the alphabet buttons</div><div class='del'>-	are pushed and back when they're cleared.  Fixes Ximian bug</div><div class='del'>-	#12904.</div><div class='del'>-	(addressbook_menu_activated): When the user calls Search-&gt;clear,</div><div class='del'>-	set the search to ESB_ANY and "", don't just set the text.  This</div><div class='del'>-	is especially useful when it's set to ESB_ADVANCED.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h (alphabet_state_change): Added</div><div class='del'>-	this signal which gets emitted when the alphabet buttons are</div><div class='del'>-	pushed.</div><div class='del'>-	(command_state_change): Removed the ref pair here.  It's not</div><div class='del'>-	necessary.  gtk_signal_emit refs the object itself.</div><div class='del'>-</div><div class='del'>-2002-01-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (name_synonyms): Added a couple</div><div class='del'>-	of names here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_get_nth_obj): Removed an unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-2002-01-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h (create_alphabet): Use toggle</div><div class='del'>-	buttons here.  Fixes Ximian bug #10734.</div><div class='del'>-</div><div class='del'>-2002-01-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (set_fields): Choose the</div><div class='del'>-	first filled in address field here.  Fixes Ximian bug #2222.</div><div class='del'>-</div><div class='del'>-2002-01-03  Joe Shaw  &lt;joe@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-card.c: Add a test for getting arbitrary</div><div class='del'>-        fields.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-card-sexp.c (compare_arbitrary): Added.</div><div class='del'>-	(prop_info_table): Add a LIST_PROP for arbitrary fields.</div><div class='del'>-</div><div class='del'>-2002-01-03  Nat Friedman  &lt;nat@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (activate_factories_for_uri): Free the</div><div class='del'>-	query if the oaf response is of zero length.</div><div class='del'>-</div><div class='del'>-2001-12-27  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(real_add_address_cb): When we clean, don't clean the model's last</div><div class='del'>-	element.  This helps keep things working properly when we have</div><div class='del'>-	signal-character separators.</div><div class='del'>-	(section_right_click_cb): Changed to work properly with our</div><div class='del'>-	EText-emitted popup signal.</div><div class='del'>-	(e_select_names_add_section): Use ETexts for the recipient</div><div class='del'>-	sections, rather than tables.  This lets us make them directly</div><div class='del'>-	editable. (Bug #1721)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_info_new): Pass in a ESelectNamesTextModel, not a</div><div class='del'>-	ESelectNamesModel.</div><div class='del'>-	(e_select_names_popup): Adjust for the new signature for</div><div class='del'>-	e_select_names_model_text_pos.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(focus_out_cb): Schedule a cleaning when we focus out.</div><div class='del'>-	(focus_in_cb): Cancel pending cleaning when we get focus.  This</div><div class='del'>-	helps us avoid bad things happening during the fast focus out/ins</div><div class='del'>-	that happen when the completion dropdown appears.</div><div class='del'>-	(completion_handler): Adjust for new signatures of</div><div class='del'>-	e_select_names_model_text_pos and e_select_names_model_name_pos.</div><div class='del'>-	(e_select_names_manager_entry_new): Pass in our</div><div class='del'>-	ESelectNamesTextModel when constructing the</div><div class='del'>-	ESelectNamesCompletion.</div><div class='del'>-	(e_select_names_manager_entry_free): Cancel any pending clean-ups.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Get the text off of the text model.</div><div class='del'>-	Which is the only way that really makes sense when you think about</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: Added a</div><div class='del'>-	copy of the associated ESelectNamesTextModel to</div><div class='del'>-	ESelectNamesCompletionPrivate.  This replaces the</div><div class='del'>-	ESelectNamesModel.</div><div class='del'>-	(e_select_names_completion_destroy): Unref -&gt;text_model.</div><div class='del'>-	(e_select_names_completion_handle_request): Pass in our text</div><div class='del'>-	model's separator info when calling e_select_names_model_text_pos.</div><div class='del'>-	(e_select_names_completion_new): Pass in the text model as an arg</div><div class='del'>-	instead of the model, and ref it as needed.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_init): Set separator as either ", " or</div><div class='del'>-	",", depending on the value of the EVOLUTION_DISABLE_MAGIC_COMMA</div><div class='del'>-	environment variable.</div><div class='del'>-	(e_select_names_text_model_destroy): Free the separator.</div><div class='del'>-	(changed_cb): Flush our cached text on changed.</div><div class='del'>-	(e_select_names_text_model_set_source): Use our own changed_cb</div><div class='del'>-	callback on changed, rather than just connecting up</div><div class='del'>-	e_text_model_changed.</div><div class='del'>-	(e_select_names_text_model_set_separator): Added.  Lets the</div><div class='del'>-	separator between recipients be specified.</div><div class='del'>-	(e_select_names_text_model_get_text): Cache the text we get from</div><div class='del'>-	calling e_select_names_model_get_textification.</div><div class='del'>-	(e_select_names_text_model_insert_length): A bunch of small</div><div class='del'>-	changes to properly support generic separators, rather than</div><div class='del'>-	(implicit and explicitly) assuming ", ".</div><div class='del'>-	(e_select_names_text_model_delete): More small tweaks to handle</div><div class='del'>-	generic separators.</div><div class='del'>-	(e_select_names_text_model_get_nth_obj): Use new signature when</div><div class='del'>-	calling e_select_names_model_name_pos, and use our cached text.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_destroy): We don't cache the text or</div><div class='del'>-	addr_text anymore, so no need to free them here.</div><div class='del'>-	(e_select_names_model_changed): ...and no need to reset our text</div><div class='del'>-	and addr_text caches here.</div><div class='del'>-	(e_select_names_model_get_textification): Take a separator as an</div><div class='del'>-	arg, rather than just using ", ".  Also, no caching.</div><div class='del'>-	(e_select_names_model_get_address_text): Take a separator as an</div><div class='del'>-	arg, rather than just using ", ".  And no caching here either.</div><div class='del'>-	(e_select_names_model_clean): Add arg that give us control over</div><div class='del'>-	whether or not the last entry should get cleaned.  We need this</div><div class='del'>-	when using a one-character separator, so that new destinations</div><div class='del'>-	that get tacked onto the end don't get immediately cleaned away</div><div class='del'>-	for being empty.</div><div class='del'>-	(e_select_names_model_name_pos): Take the separator length as an</div><div class='del'>-	argument, remove implicit assumption of length 2.</div><div class='del'>-	(e_select_names_model_text_pos): Take the separator length as an</div><div class='del'>-	argument, remove implicit assumption of length 2.</div><div class='del'>-</div><div class='del'>-2001-12-20  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix #17377, Evolution doesn't work on multi-depth displays.]</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Push GdkRGB visual</div><div class='del'>-	and colormap.</div><div class='del'>-</div><div class='del'>-2001-12-19  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click): Add cut/copy/paste to</div><div class='del'>-	right-click menu.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_right_click): Add</div><div class='del'>-	cut/copy/paste to right-click menu.  (Fixes bug #14528.)  Also,</div><div class='del'>-	disable some right-click options if our addressbook isn't</div><div class='del'>-	editable.</div><div class='del'>-</div><div class='del'>-2001-12-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (check_for_slow_setting): go slow and</div><div class='del'>-	clear the map if the last uri and the current uri do not match</div><div class='del'>-	(post_sync): save the last uri</div><div class='del'>-</div><div class='del'>-	* conduits/address-conduit-config.h: handle a last uri config</div><div class='del'>-	option</div><div class='del'>-</div><div class='del'>-2001-12-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_default_book_open):</div><div class='del'>-	change this to match its e-book counterpart, and only failover to</div><div class='del'>-	the local addressbook if the protocol wasn't supported.  that way</div><div class='del'>-	errors like "failure to connect" are still reported to the user.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.h: add prototypes for</div><div class='del'>-	e_book_load_default_book and e_book_get_config_database.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_default_book_open): new</div><div class='del'>-	function, basically cut and paste addressbook_default_book_open</div><div class='del'>-	from addressbook.c here.</div><div class='del'>-	(e_book_load_default_book): cut and past</div><div class='del'>-	addressbook_load_default_book here, pretty much, except leave off</div><div class='del'>-	the auth stuff.</div><div class='del'>-	(e_book_get_config_database): new function, returns the</div><div class='del'>-	Bonobo_ConfigDatabase for e_book_load_default_book to use.</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (start_addressbook_server): use</div><div class='del'>-	e_book_load_default_book here.</div><div class='del'>-	</div><div class='del'>-2001-12-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ fixes bug 17355 ]</div><div class='del'>-	* gui/component/select-names/e-select-names.c (new_folder): if</div><div class='del'>-	we're dealing with an LDAP folder, prepend [LDAP] to it.  Now that</div><div class='del'>-	we have 3 different places where folders are coming from, it helps</div><div class='del'>-	to be able to differentiate "Contacts" in ~/evolution and a</div><div class='del'>-	"Contacts" ldap server and a "Contacts" exchange folder.</div><div class='del'>-	(add_additional_select_names_uris): loop through the bonobo conf</div><div class='del'>-	settings for additional folders, adding them to the option menu.</div><div class='del'>-	(e_select_names_hookup_shell_listeners): call</div><div class='del'>-	add_additional_select_names_uris.</div><div class='del'>-</div><div class='del'>-2001-11-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_realize): Use an #ECanvasBackground here</div><div class='del'>-	instead of a #GnomeCanvasRect.</div><div class='del'>- </div><div class='del'>-2001-12-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: Added</div><div class='del'>-	'cache_complete' flag to ESelectNamesCompletionPrivate.</div><div class='del'>-	(e_select_names_completion_seq_complete_cb): Set cache_complete</div><div class='del'>-	to TRUE if our query wasn't interrupted.</div><div class='del'>-	(e_select_names_completion_start_query): Set cache_complete to</div><div class='del'>-	FALSE at the beginning of a potentially-cached query.</div><div class='del'>-	(e_select_names_completion_do_query): Only reuse cached cards</div><div class='del'>-	if cache_complete is TRUE.  (Fixes bug #10241)</div><div class='del'>-</div><div class='del'>-2001-12-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* conduit/address-conduit.c (e_addr_context_destroy): don't free</div><div class='del'>- 	the hash table keys, we didn't allocate them and free the change</div><div class='del'>- 	objects and unref the associated cards</div><div class='del'>- 	(local_record_from_uid): unref the temp card we create</div><div class='del'>- 	(replace_record): ref the new card associated with the card change</div><div class='del'>- 	and unref the old one</div><div class='del'>-</div><div class='del'>-2001-12-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure</div><div class='del'>- 	to copy the custom fields so they are not overwritten</div><div class='del'>-</div><div class='del'>-2001-12-13  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (simple_query_new): Used</div><div class='del'>-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.</div><div class='del'>-	(Bug #17126)</div><div class='del'>-</div><div class='del'>-2001-12-07  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_entry_new): Remove a reference to code</div><div class='del'>-	I don't want to commit yet. :-)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Extensively</div><div class='del'>-	refactored -- this code had gotten _really_ ugly.  Untangle things</div><div class='del'>-	to the point where our reference counting problems are fixable.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_destroy): Remove all of the ugly hacks to work around our</div><div class='del'>-	memory management problems, and just unref the manager.</div><div class='del'>-	(Fixes #14412)</div><div class='del'>-</div><div class='del'>-2001-12-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(search_for_dn_with_objectclasses): move search_for_dn's contents</div><div class='del'>-	here, and add an "existing_objectclasses" parameter that we pass</div><div class='del'>-	on to build_card_from_entry.</div><div class='del'>-	(search_for_dn): call search_for_dn_with_objectclasses with NULL</div><div class='del'>-	for existing_objectclasses.</div><div class='del'>-	(build_card_from_entry): if existing_objectclasses is non-NULL,</div><div class='del'>-	fill it in with the list of existing objectclass values for this</div><div class='del'>-	entry.</div><div class='del'>-	(add_objectclass_mod): if existing_objectclasses is non-NULL,</div><div class='del'>-	meaning we're modifying an entry, search in the existing</div><div class='del'>-	objectclasses for the ones we want to be there, and only add</div><div class='del'>-	what's missing.  If none are missing, don't add objectclass_mod to</div><div class='del'>-	the list of mods.</div><div class='del'>-	(create_card_handler): track change to add_objectclass_mod (pass</div><div class='del'>-	NULL).</div><div class='del'>-	(modify_card_handler): use search_for_dn_with_objectclasses</div><div class='del'>-	instead of search_for_dn, and pass the existing objectclasses to</div><div class='del'>-	add_objectclass_mod.  also, free the list when we're done.</div><div class='del'>-	(poll_ldap): track change to build_card_from_entry (pass NULL).</div><div class='del'>-</div><div class='del'>-2001-12-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):</div><div class='del'>-	we need to be able to disable non-labels here as well.  since</div><div class='del'>-	we're using enable_widget and not gtk_widget_set_sensitive, it's</div><div class='del'>-	okay to handle entries/text's, etc, here.</div><div class='del'>-	(widget_field_mappings): add label-caluri and label-fburl here.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: change the label names</div><div class='del'>-	for the freebusy/calendar urls to have more descriptive names,</div><div class='del'>-	since we use them in e-contact-editor.c now.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: add support for</div><div class='del'>-	caluri/calendarURI, fburl/freeBusyURI.</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: add calendarURI and</div><div class='del'>-	freeBusyURI.</div><div class='del'>-</div><div class='del'>-2001-12-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: Fixed up the</div><div class='del'>-	accelerators and such here.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):</div><div class='del'>-	Translate this string.</div><div class='del'>-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.</div><div class='del'>-	(setup_tab_order): Fixed up the tab order here.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/fulladdr.glade: Made the country combo</div><div class='del'>-	focusable here.</div><div class='del'>-</div><div class='del'>-2001-12-03  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_equal): Make address</div><div class='del'>-	comparisons case-insensitive. (Fixes 11776)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address</div><div class='del'>-	host comparisons case-insensitive. (Fixes 11776)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean</div><div class='del'>-	ESelectNamesModel on focus-out. (Half of a fix for 15656)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (nonempty): Fix this function</div><div class='del'>-	and make it utf8-safe. (The other half of the fix for 15656)</div><div class='del'>-</div><div class='del'>-2001-11-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency</div><div class='del'>-	fixes with standard contact editor.  Added Save As, Send As, and</div><div class='del'>-	Send To.  Replaced Save toolbar with Save and Close and added Save</div><div class='del'>-	and Close menu item.  Added a trash icon.</div><div class='del'>-</div><div class='del'>-2001-11-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):</div><div class='del'>-	Setup the tab order here.  Fixes Ximian bug #13751.</div><div class='del'>-</div><div class='del'>-2001-11-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (connect_master_list_changed,</div><div class='del'>-	make_suboptions): Changed how this list of categories gets</div><div class='del'>-	computed.  Fixes Ximian bugs #7707 and #7708.</div><div class='del'>-</div><div class='del'>-2001-11-15  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),</div><div class='del'>-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,</div><div class='del'>-	e_contact_rectangle, e_contact_print_letter_tab,</div><div class='del'>-	e_contact_print_letter_heading, e_contact_get_card_size,</div><div class='del'>-	e_contact_print_card, e_contact_print_phone_list):</div><div class='del'>-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/</div><div class='del'>-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/</div><div class='del'>-</div><div class='del'>-2001-11-14  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against</div><div class='del'>-	LDAP_SUCCESS as the return value, not -1.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): same.</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): same.</div><div class='del'>-</div><div class='del'>-2001-11-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes Ximian bug #14843 ]</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a</div><div class='del'>-	subexpression wasn't filled in.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_or): same.</div><div class='del'>-</div><div class='del'>-2001-11-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):</div><div class='del'>-	Release callback's reference to EContactListEditor.</div><div class='del'>-	(list_modified_cb): Release callback's reference to</div><div class='del'>-	EContactListEditor.</div><div class='del'>-	(save_card): Ref the EContactListEditor on behalf of the</div><div class='del'>-	e_book_foo callback. (Fixes bug #14743)</div><div class='del'>-	(save_card): Set changed to false once we've saved.</div><div class='del'>-	(list_deleted_cb): Release callback's reference.</div><div class='del'>-	(delete_cb): Hold reference for the callback.</div><div class='del'>-</div><div class='del'>-2001-11-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If</div><div class='del'>-	our call to e_categories_new returns NULL, put up an error dialog</div><div class='del'>-	and return.  (Fixed #14780)</div><div class='del'>-		</div><div class='del'>-2001-11-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes Ximian bug #14687 ]</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_process_request): do load_uri before add_client,</div><div class='del'>-	so we know if the load actually worked (add_client uses this</div><div class='del'>-	information to respond to the new client.)  before this change,</div><div class='del'>-	the client would still think the book was in a useful state even</div><div class='del'>-	if the load_uri failed.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if</div><div class='del'>-	the we're not connected, say so.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):</div><div class='del'>-	same.</div><div class='del'>-	(pas_backend_file_load_uri): don't report_writable here,</div><div class='del'>-	add_client does it.  was only needed before because of the</div><div class='del'>-	improper ordering in pas-book-factory.c above.</div><div class='del'>-</div><div class='del'>-2001-11-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes Ximian bug #14646 ]</div><div class='del'>-	* gui/component/addressbook.c (addressbook_default_book_open): new</div><div class='del'>-	function.  if the default_book failed to load, load the local</div><div class='del'>-	addressbook in its place.</div><div class='del'>-	addressbook_load_default_book): if we're loading the default_book</div><div class='del'>-	uri, use addressbook_default_book_open as the open_response.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the</div><div class='del'>-	load_state to NotLoaded so we can attempt another load_uri on</div><div class='del'>-	the book if it fails.</div><div class='del'>-</div><div class='del'>-2001-11-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_destroy): Explicitly destroy entries.  Part of the fix for</div><div class='del'>-	the lingering completion window bug.</div><div class='del'>-</div><div class='del'>-2001-11-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: Use ordering of the pilot's phone</div><div class='del'>-	label list to find fields we sync in order to avoid strcmp'ing the</div><div class='del'>-	pilot's labels rendering phone syncing usable only for english</div><div class='del'>-	language pilots</div><div class='del'>-</div><div class='del'>-2001-11-03  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes Ximian bug #14410 ]</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):</div><div class='del'>-	init in_async_call to FALSE.</div><div class='del'>-	(card_added_cb): turn the UI back on and set in_async_call to</div><div class='del'>-	FALSE.</div><div class='del'>-	(card_modified_cb): same.</div><div class='del'>-	(card_deleted_cb): same.</div><div class='del'>-	(save_card): turn off the UI by setting the dialog insensitive,</div><div class='del'>-	and set in_async_call to TRUE.</div><div class='del'>-	(delete_cb): same.</div><div class='del'>-	(app_delete_event_cb): if we're in an async call don't let the</div><div class='del'>-	window get deleted.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):</div><div class='del'>-	add in_async_call flag for when we make a wombat call and need to</div><div class='del'>-	disable the UI.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(e_contact_list_editor_init): init in_async_call to FALSE.</div><div class='del'>-	(list_added_cb): turn the UI back on and set in_async_call to</div><div class='del'>-	FALSE.</div><div class='del'>-	(list_modified_cb): same.</div><div class='del'>-	(list_deleted_cb): same.</div><div class='del'>-	(save_card): turn off the UI by setting the dialog insensitive,</div><div class='del'>-	and set in_async_call to TRUE.</div><div class='del'>-	(delete_cb): same.</div><div class='del'>-	(app_delete_event_cb): if we're in an async call don't let the</div><div class='del'>-	window get deleted.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.h (struct</div><div class='del'>-	_EContactListEditor): add in_async_call flag for when we make a</div><div class='del'>-	wombat call and need to disable the UI.</div><div class='del'>-</div><div class='del'>-2001-11-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for</div><div class='del'>-	NULL dates before converting them to strings.  Fixes Ximian bug</div><div class='del'>-	#14394.</div><div class='del'>-</div><div class='del'>-2001-11-02  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_destroy): Leak select-names related data structures until</div><div class='del'>-	the memory management issues get sorted out.  Fixed bug #14086.</div><div class='del'>-</div><div class='del'>-2001-10-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes</div><div class='del'>-	and changes match here.</div><div class='del'>-</div><div class='del'>-2001-10-31  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_destroy): Check that local_listener and</div><div class='del'>-	other_contacts_listener are non-NULL before</div><div class='del'>-	disconnecting/unrefing.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(entry_destroyed): The entry shouldn't unref the manager.</div><div class='del'>-	(e_select_names_manager_create_entry): The entry shouldn't hold a</div><div class='del'>-	ref to the manager.  It becomes circular.</div><div class='del'>-	(e_select_names_manager_create_entry): On the other hand, we</div><div class='del'>-	should hold a ref to the entry we create.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_destroy): Remove the explicit dialog destroy hack.</div><div class='del'>-</div><div class='del'>-2001-10-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_destroy): Force the select names dialog to be destroyed.</div><div class='del'>-	This is a hack to fix bug #14002 -- I'll clean up the refcounting</div><div class='del'>-	issues post-freeze.  At least now it won't crash.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): make sure</div><div class='del'>-	to translate the character sets of the names</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(manager_ok_cb): send a null bonobo arg to prevent explosion</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: correct include typo</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_value_at): Convert xml-ified destinations into proper</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c (init):</div><div class='del'>-	Connect to manager's "ok" signal.</div><div class='del'>-	(manager_ok_cb): Emit "ok" bonobo-signal.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_class_init): Added "ok" signal.</div><div class='del'>-	(e_select_names_clicked): Emit 'ok' signal.</div><div class='del'>-</div><div class='del'>-2001-10-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c</div><div class='del'>-	(e_addressbook_prompt_save_dialog): new function, a "Do you want</div><div class='del'>-	to save changes?" dialog.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.h: add prototype for</div><div class='del'>-	e_addressbook_prompt_save_dialog.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):</div><div class='del'>-	call e_addressbook_prompt_save_dialog and save the card if they</div><div class='del'>-	select save.  return TRUE if the dialog should be closed, FALSE</div><div class='del'>-	otherwise.</div><div class='del'>-	(file_close_cb): check prompt_to_save_changes before closing the</div><div class='del'>-	dialog.</div><div class='del'>-	(app_delete_event_cb): same.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog</div><div class='del'>-	and save the card if they select save.  return TRUE if the dialog</div><div class='del'>-	should be closed, FALSE otherwise.</div><div class='del'>-	(file_close_cb): check prompt_to_save_changes before closing the</div><div class='del'>-	dialog.</div><div class='del'>-	(app_delete_event_cb): same.</div><div class='del'>-</div><div class='del'>-2001-10-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload</div><div class='del'>-	this function for modifying objectclasses too, so we can make sure</div><div class='del'>-	evolutionPerson shows up in the objectclasses of an entry if it</div><div class='del'>-	shows up in the schema for the server.</div><div class='del'>-	(create_card_handler): add @replace = FALSE in the call to</div><div class='del'>-	add_objectclass_mod.</div><div class='del'>-	(modify_card_handler): call add_objectclass_mod with @replace =</div><div class='del'>-	TRUE.</div><div class='del'>-	(anniversary_compare): fix typo - return "equal", not "TRUE".</div><div class='del'>-	(birthday_compare): same.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (pre_sync): Comment out spew.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):</div><div class='del'>-	Comment out spew.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_drop): Comment out spew.</div><div class='del'>-	(get_dnd_selection): Comment out spew.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_set_value_at): Comment out spew.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_command_state): Check that</div><div class='del'>-	our BonoboUIComponent has a container so we don't get a lot of</div><div class='del'>-	annoying debug spew.</div><div class='del'>-</div><div class='del'>-	* printing/smallbook.ecps: Fixed fonts.</div><div class='del'>-</div><div class='del'>-	* printing/phonelist.ecps: Fixed fonts.</div><div class='del'>-</div><div class='del'>-	* printing/medbook.ecps: Fixed fonts.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (e_contact_get_card_size): Commented</div><div class='del'>-	out spew.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard-&gt;card</div><div class='del'>-	!= NULL.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_destroy): We were using</div><div class='del'>-	book_data-&gt;book_view immediately after unrefing it.  Reordered the</div><div class='del'>-	code a bit to avoid this.</div><div class='del'>-</div><div class='del'>-2001-10-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.h: add prototype for</div><div class='del'>-	pas_book_factory_dump_active_backends.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_dump_active_backends): new function.</div><div class='del'>-	(dump_active_server_map_entry): new function.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(make_match): Drop a match if either of the text fields is NULL.</div><div class='del'>-	This could happen if any of the utf-8 involved is invalid, for</div><div class='del'>-	example. (Bug #13757)</div><div class='del'>-</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (is_syncable): fix bug that allowed</div><div class='del'>-	for phone's not to be in priority order and the item to still be</div><div class='del'>-	syncable</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h</div><div class='del'>-	(addrconduit_load_configuration): get management by id</div><div class='del'>-</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* conduit/address-conduit.c (is_syncable): a card also needs to</div><div class='del'>-	have its phone nums in priority order to be "syncable"</div><div class='del'>-	</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (is_syncable): move the syncable</div><div class='del'>-	checking code to a different function</div><div class='del'>-	(ecard_from_remote_record): set the name parts individually</div><div class='del'>-	(local_record_from_ecard): use is_syncable</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (file_as_get_style,</div><div class='del'>-	file_as_set_style): Use the actual ECardName in the ECard instead</div><div class='del'>-	of parsing the full_name here.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h</div><div class='del'>-	(e_card_simple_set_name): New function to set the ECardName on</div><div class='del'>-	this card and fix the file_as if necessary.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h</div><div class='del'>-	(e_card_simple_get): Handle returning dates here.</div><div class='del'>-	(e_card_simple_get_allow_newlines): New function.  Returns whether</div><div class='del'>-	it makes much sense to have newlines in this string.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c,</div><div class='del'>-	gui/component/addressbook-config.h</div><div class='del'>-	(addressbook_create_new_source): The first argument here should</div><div class='del'>-	be const.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c: Added #include</div><div class='del'>-	"addressbook-config.h".</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an</div><div class='del'>-	escape here, cancel editing and remove the focus from the text.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.</div><div class='del'>-	(field_activated): Stop editing on the activate signal and remove</div><div class='del'>-	the focus from the text.  Fixes Ximian bug #12286.</div><div class='del'>-</div><div class='del'>-2001-10-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: tidy</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (add_record): unref ecard when done</div><div class='del'>-</div><div class='del'>-2001-10-28  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this</div><div class='del'>-	function.</div><div class='del'>-	(e_card_date_to_string): ...and this one.  Fixes build problem in</div><div class='del'>-	pas-backend-ldap.c.</div><div class='del'>-</div><div class='del'>-2001-10-28  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_hookup_shell_listeners): Change "this should never</div><div class='del'>-	happen" dialog to not give my name/e-mail.  Sorry translators.</div><div class='del'>-	But this really should never happen, thanks to my fix below.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Initialize</div><div class='del'>-	global_shell_client to NULL. (Bug #6625)</div><div class='del'>-</div><div class='del'>-2001-10-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ bug #12979 ]</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new</div><div class='del'>-	function.</div><div class='del'>-	(anniversary_ber): new function.</div><div class='del'>-	(anniversary_compare): new function.</div><div class='del'>-	(birthday_populate): new function.</div><div class='del'>-	(birthday_ber): new function.</div><div class='del'>-	(birthday_compare): new function.</div><div class='del'>-</div><div class='del'>-2001-10-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_destroy): free up all the book_data</div><div class='del'>-	list stuff.</div><div class='del'>-	(e_select_names_completion_got_book_view_cb): deal with book_data</div><div class='del'>-	being passed as the closure, and increment the</div><div class='del'>-	pending_completion_seq counter.</div><div class='del'>-	(e_select_names_completion_card_added_cb): deal with book_data</div><div class='del'>-	being passwd as the closure.</div><div class='del'>-	(e_select_names_completion_seq_complete_cb): same, and decrement</div><div class='del'>-	the pending_completion_seq if we haven't gotten one for this book</div><div class='del'>-	view before.</div><div class='del'>-	(e_select_names_completion_stop_query): cancel all the</div><div class='del'>-	book_data's.</div><div class='del'>-	(e_select_names_completion_start_query): use the books_not_ready</div><div class='del'>-	counter instead of book_ready.  also, do e_book_get_book_view on</div><div class='del'>-	each of the book's in our list.</div><div class='del'>-	(e_select_names_completion_do_query): change to deal with our</div><div class='del'>-	list.</div><div class='del'>-	(e_select_names_completion_book_ready): decrement the</div><div class='del'>-	book_not_ready counter.</div><div class='del'>-	(e_select_names_completion_new): add the book we're created with</div><div class='del'>-	to our list.</div><div class='del'>-	(e_select_names_completion_add_book): implement.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.h: add</div><div class='del'>-	prototype for e_select_names_completion_add_book.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_new): use addressbook_config_data, and</div><div class='del'>-	don't unref the db.</div><div class='del'>-	(e_select_names_manager_create_entry): always add NULL for a book</div><div class='del'>-	(which corresponds to the local book), and if the completion_book</div><div class='del'>-	is present, add it to the list of books to complete again.</div><div class='del'>-</div><div class='del'>-2001-10-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to</div><div class='del'>-	EBookCallback signature, and unref the book.</div><div class='del'>-	(quick_add_merge_card): use addressbook_load_default_book.</div><div class='del'>-	(ce_have_book): change to EBookCallback signature, and unref the</div><div class='del'>-	book.</div><div class='del'>-	(edit_card): use addressbook_load_default_book.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (email_table_save_card_cb):</div><div class='del'>-	change to EBookCallback signature, and unref the book.</div><div class='del'>-	(add_card_idle_cb): use addressbook_load_default_book, and call</div><div class='del'>-	the cb if it fails.</div><div class='del'>-	(e_address_popup_cleanup): fix type -- should be "pop-&gt;card =</div><div class='del'>-	NULL", not "pop = NULL".</div><div class='del'>-	(contact_editor_cb): change to EBookCallback signature.</div><div class='del'>-	(edit_contact_info_cb): use addressbook_load_default_book.</div><div class='del'>-	(start_query): change to EBookCallback signature.</div><div class='del'>-	(e_address_popup_query): use addressbook_load_default_book.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-control.c (book_open_cb): change to</div><div class='del'>-	EBookCallback signature, and unref the book.</div><div class='del'>-	(save_in_addressbook): use addressbook_load_default_book instead</div><div class='del'>-	of e_book_use_local_address_book.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're</div><div class='del'>-	including addressbook.h which has it's own set of funky include</div><div class='del'>-	path requirements.</div><div class='del'>-</div><div class='del'>-2001-10-27  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak</div><div class='del'>-	stuff. (Bug #13709)</div><div class='del'>-</div><div class='del'>-2001-10-27  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,</div><div class='del'>-	nickname_simple_query_cb): Set book_uri when cardification occurs.</div><div class='del'>-</div><div class='del'>-2001-10-27  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_add_section): Turned off use_ellipsis (it breaks</div><div class='del'>-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian</div><div class='del'>-	bug #13693.</div><div class='del'>-</div><div class='del'>-2001-10-27  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(make_match): Doh!  We should be sorting our contacts so that the</div><div class='del'>-	most frequently used ones are at the top of the list, not the</div><div class='del'>-	bottom.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a</div><div class='del'>-	bonobo_object_unref, not a gtk_object_unref.</div><div class='del'>-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref</div><div class='del'>-	here.</div><div class='del'>-	(pas_book_destroy): If our pas_book_check_queue timeout is still</div><div class='del'>-	active, disable it.  This should never happen, but it never hurts</div><div class='del'>-	to be careful.</div><div class='del'>-	(pas_book_destroy): Set book-&gt;priv to NULL after we free it.</div><div class='del'>-</div><div class='del'>-2001-10-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): copy phone</div><div class='del'>-	labels and show phone as well, clear correct entry text and</div><div class='del'>-	correctly detect unsyncable cases</div><div class='del'>-</div><div class='del'>-2001-10-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): touch the</div><div class='del'>-	record on lookup</div><div class='del'>-	(check_for_slow_setting): write touched only if we are doing a</div><div class='del'>-	slow sync</div><div class='del'>-	(card_removed): don't touch on lookup</div><div class='del'>-	(match): touch on lookup</div><div class='del'>-</div><div class='del'>-2001-10-27  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid</div><div class='del'>-	reentrancy guards.</div><div class='del'>-	(pas_book_queue_request): Changed our idle handler into a timeout,</div><div class='del'>-	so as to work w/ reentrancy guards.</div><div class='del'>-	(pas_book_init): Explicit initialization.</div><div class='del'>-</div><div class='del'>-2001-10-26  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.h: add prototypes for</div><div class='del'>-	addressbook_config_database, and addressbook_load_default_book.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_config_database): new</div><div class='del'>-	function, so we aren't activating the db everywhere we need to use</div><div class='del'>-	it.</div><div class='del'>-	(addressbook_load_default_book): load the default book, after</div><div class='del'>-	getting the uri from bonobo-config.</div><div class='del'>-</div><div class='del'>-2001-10-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return</div><div class='del'>-	on cancellation.</div><div class='del'>-	(simple_query_sequence_complete_cb): Act if not cancelled.</div><div class='del'>-	(simple_query_book_view_cb): Free &amp; return on cancellation.</div><div class='del'>-	(e_book_simple_query_cancel): Set cancellation flag.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a</div><div class='del'>-	reference to ourselves for the duration of our addressbook fetch.</div><div class='del'>-	(start_query): Release when we've fetched our addressbook.</div><div class='del'>-	(e_address_popup_cleanup): Break out most of what we do in</div><div class='del'>-	_destroy into a separate function.</div><div class='del'>-	(e_address_popup_destroy): Class cleanup.</div><div class='del'>-	(contact_editor_cb): Paranoid clean-up.</div><div class='del'>-	(add_contacts_cb): Paranoid clean-up.</div><div class='del'>-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/e-address.conduit.in: remove the merges as valid sync</div><div class='del'>-	types</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (pre_sync): write out only the touched</div><div class='del'>-	records if we are doing copies</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h</div><div class='del'>-	(addrconduit_load_configuration): get the sync type</div><div class='del'>-</div><div class='del'>-2001-10-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (e_address_popup_destroy):</div><div class='del'>-	Cancel any pending queries.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't</div><div class='del'>-	assert, but check if ce-&gt;app != NULL, since this function can</div><div class='del'>-	(apparently) get called multiple times.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad</div><div class='del'>-	dialog ref-counting crap.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our</div><div class='del'>-	EContactEditor, since we are holding a pointer to it in</div><div class='del'>-	EditorCloseStruct.</div><div class='del'>-	(card_modified_cb): Unref our EContactEditor when we free our</div><div class='del'>-	EditorCloseStruct.</div><div class='del'>-	(card_added_cb): Unref our EContactEditor when we free our</div><div class='del'>-	EditorCloseStruct.</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* conduit/address-conduit.c (check_for_slow_setting): make debug</div><div class='del'>-	info more accurate</div><div class='del'>-	</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (e_addr_context_destroy): prevent</div><div class='del'>-	double unref</div><div class='del'>-	(cursor_cb): correct typo</div><div class='del'>-	(card_removed): remove the card from the map if was archived and</div><div class='del'>-	is now deleted</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* conduit/address-conduit.h: new member</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (print_remote): free the struct after</div><div class='del'>-	using it</div><div class='del'>-	(e_addr_context_new): make consistent with other conduits</div><div class='del'>-	(e_addr_context_destroy): properly destroy the context</div><div class='del'>-	(cursor_cb): no need to ref the card, its done for us</div><div class='del'>-	(clear_entry_text): util function to free a field</div><div class='del'>-	(free_local): free a local record</div><div class='del'>-	(local_record_to_pilot_record): use a static buffer so we don't</div><div class='del'>-	have to free it later</div><div class='del'>-	(local_record_from_ecard): only fill in the fields we might not</div><div class='del'>-	sync, clear a field before replacing the contents</div><div class='del'>-	(for_each): track locals</div><div class='del'>-	(for_each_modified): ditto</div><div class='del'>-	(free_match): use free_local</div><div class='del'>-</div><div class='del'>-2001-10-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h</div><div class='del'>-	(set_has_cursor): Added has_cursor argument.  Setting the argument</div><div class='del'>-	to TRUE if the minicard doesn't have focus will grab the focus.</div><div class='del'>-	Fixes Ximian bug #3024.</div><div class='del'>-</div><div class='del'>-2001-10-24  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Initialize</div><div class='del'>-	gnome-vfs.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (xfer_file): Added.</div><div class='del'>-	(Copied from the calendar.)</div><div class='del'>-	(xfer_folder): Fixed to allow renaming of contact folders.</div><div class='del'>-</div><div class='del'>-2001-10-24  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_class_init): Removed key_press handler here</div><div class='del'>-	since delete and backspace are now handled by keybindings.</div><div class='del'>-</div><div class='del'>-2001-10-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fix command paths when we specify</div><div class='del'>-	our pixmaps, so we don't get a lot of totally useless &amp; very ugly</div><div class='del'>-	bonobo-ui spew.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty</div><div class='del'>-	string as an arg shouldn't generate a warning.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: Removed</div><div class='del'>-	our cancelled flag and e_select_names_completion_cancel function,</div><div class='del'>-	since we were just duplicating stuff that had ended up in</div><div class='del'>-	ECompletion.</div><div class='del'>-	(match_name): Form our menu_text properly on an additional-name</div><div class='del'>-	match.</div><div class='del'>-	(e_select_names_completion_got_book_view_cb): Store handles for</div><div class='del'>-	our signals, disconnect them properly when we switch book views.</div><div class='del'>-	(e_select_names_completion_stop_query): Disconnect signals when we</div><div class='del'>-	stop our query.</div><div class='del'>-	(check_capabilities): Spew if we are using LDAP for completion.</div><div class='del'>-	(e_select_names_completion_destroy): Disconnect our signals when</div><div class='del'>-	we destroy.</div><div class='del'>-	This all should fix bug #10241.</div><div class='del'>-</div><div class='del'>-2001-10-23  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_add_section): Set "draw_button" argument to TRUE</div><div class='del'>-	on this EEntry.</div><div class='del'>-</div><div class='del'>-2001-10-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an</div><div class='del'>-	error dialog if there's an error while saving.  If the person hits</div><div class='del'>-	cancel on the "file exists" dialog, don't close the file selection</div><div class='del'>-	dialog.  Fixes Ximian bug #7055.</div><div class='del'>-</div><div class='del'>-2001-10-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(model_and_selection_free): right_click_up here when we let go of</div><div class='del'>-	the popup.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):</div><div class='del'>-	right_click_up here.</div><div class='del'>-</div><div class='del'>-2001-10-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_add_section, e_select_names_set_default): Use an</div><div class='del'>-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.</div><div class='del'>-</div><div class='del'>-2001-10-21  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate_cb): Call</div><div class='del'>-	e_addressbook_model_force_folder_bar_message when we activate the</div><div class='del'>-	component. (Fixes bug #11749)</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c</div><div class='del'>-	(e_addressbook_model_force_folder_bar_message): Added.  Forces</div><div class='del'>-	emission of a folder_bar_message.</div><div class='del'>-</div><div class='del'>-2001-10-20  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_set_default): stick with the style font if the</div><div class='del'>-	efont bold font does not exist.	</div><div class='del'>-	(e_select_names_set_default): don't forget to unref the oldstyle.</div><div class='del'>-</div><div class='del'>-2001-10-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(name_style_query): Fix memory leak.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our</div><div class='del'>-	string vector letter_v when we are done with it.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our</div><div class='del'>-	QuickAdd structure.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (e_address_popup_construct):</div><div class='del'>-	Unref our style after we are done with it.</div><div class='del'>-</div><div class='del'>-2001-10-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (activate_factories_for_uri): We</div><div class='del'>-	shouldn't leak the info returned by oaf_query.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove</div><div class='del'>-	superfluous call to quick_add_unref.</div><div class='del'>-	(editor_closed_cb): Remove superfluous call to quick_add_unref.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We</div><div class='del'>-	need to unref the card returned by e_addressbook_model_get_card.</div><div class='del'>-</div><div class='del'>-2001-10-20  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Make LDAP servers</div><div class='del'>-	non-user-creatable.</div><div class='del'>-</div><div class='del'>-2001-10-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (e_contact_print_card): Check that the</div><div class='del'>-	string we are checking for xml-ness is non-NULL.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_importv): Filter</div><div class='del'>-	out empty destinations. (also Bug #13036)</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (e_contact_build_style): Use</div><div class='del'>-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,</div><div class='del'>-	our spacing gets all messed up. (Bug #10785)</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):</div><div class='del'>-	Allow printing if there are any cards in our view.  The selection</div><div class='del'>-	has nothing to do with it.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_empty): Check</div><div class='del'>-	for strings that contain non-whitespace, rather than just looking</div><div class='del'>-	for a non-zero first character. (Bug #13036)</div><div class='del'>-</div><div class='del'>-2001-10-20  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):</div><div class='del'>-	Handle focus_change in event by selecting that contact.  Fixes</div><div class='del'>-	Ximian bug #3024.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_unset_cb):</div><div class='del'>-	Repeatedly call gtk_main_quit here as long as there is a main loop</div><div class='del'>-	around.  This is an ugly hack around Ximian bug #11760.</div><div class='del'>-</div><div class='del'>-2001-10-20  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Added #include</div><div class='del'>-	&lt;gal/widgets/e-unicode.h&gt;.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-control.c: Made this display the number</div><div class='del'>-	of extra cards in the attachment as well as made it save them all</div><div class='del'>-	to the local addressbook if the person selects the button.  Fixes</div><div class='del'>-	Ximian bug #9507.</div><div class='del'>-</div><div class='del'>-2001-10-20  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not</div><div class='del'>-	grab on a right click.  Fixes Ximian bug #12660.</div><div class='del'>-</div><div class='del'>-2001-10-19  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_motion): Get @folder_type here too [to</div><div class='del'>-	match the changes in the EvolutionShellComponentDnd interface].</div><div class='del'>-	Also, remove a debugging message.</div><div class='del'>-	(destination_folder_handle_drop): Likewise.</div><div class='del'>-</div><div class='del'>-2001-10-18  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (add_menu_item):</div><div class='del'>-	Translate labels in select-names option menu. (Bug #9604)</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): Made the default window size</div><div class='del'>-	slightly wider. (Bug #7516)</div><div class='del'>-</div><div class='del'>-2001-10-18  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h</div><div class='del'>-	(e_card_list_get_vcard): Made this take a const GList.</div><div class='del'>-</div><div class='del'>-2001-10-18  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(check_capabilities): Added.  Check if our book is local or</div><div class='del'>-	networked.</div><div class='del'>-	(e_select_names_completion_book_ready): Call check_capabilities.</div><div class='del'>-	(e_select_names_completion_new): Call check_capabilities.</div><div class='del'>-	(e_select_names_completion_do_query): If we have a networked book,</div><div class='del'>-	keep trying if we haven't been able to cache any cards --- our</div><div class='del'>-	earlier attempts could have failed due to too many matches. (Bug</div><div class='del'>-	#12932)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(focus_out_cb): Lag our cardification on focus-out.  This seems to</div><div class='del'>-	help with the unintended cardifications that can result from the</div><div class='del'>-	weird focus-out/focus-in events that get generated when the popup</div><div class='del'>-	disappears.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c: Removed some debug spew.</div><div class='del'>-</div><div class='del'>-2001-10-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_source_dialog):</div><div class='del'>-	grab focus in the Account entry when preparing the dialog, fixes</div><div class='del'>-	#10406.</div><div class='del'>-</div><div class='del'>-2001-10-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (new_folder): make</div><div class='del'>-	sure to also add "ldap-contacts" folders to the option menu.</div><div class='del'>-</div><div class='del'>-2001-10-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): sync all</div><div class='del'>-	the fields we can, with out overwriting</div><div class='del'>-	(local_record_from_ecard): write the fields to the pilot in</div><div class='del'>-	priority order unless there are fields on the pilot we can't</div><div class='del'>-	store, then fill in the fields as they are on the pilot</div><div class='del'>-</div><div class='del'>-2001-10-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean</div><div class='del'>-	up here.  Might fix some crashes, specifically Ximian bug #10164.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model</div><div class='del'>-	column numbers here.  Fixes Ximian bug #12308.</div><div class='del'>-</div><div class='del'>-2001-10-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):</div><div class='del'>-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match</div><div class='del'>-	vcard id's, fixes longstanding bug (#7406) where cards were not</div><div class='del'>-	modifiable or removable after having been created during a 1-2</div><div class='del'>-	week long window in early betas.</div><div class='del'>-	(PAS_BACKEND_FILE_VERSION): change to 0.2</div><div class='del'>-	(PAS_ID_PREFIX): #define this here.</div><div class='del'>-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of</div><div class='del'>-	the string.</div><div class='del'>-</div><div class='del'>-2001-10-16  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return</div><div class='del'>-	FALSE if no extension.</div><div class='del'>-</div><div class='del'>-2001-10-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_id): If card-&gt;id is NULL,</div><div class='del'>-	return an empty string.</div><div class='del'>-	(e_card_set_id): Don't allow the card id to be set to NULL; use</div><div class='del'>-	the empty string instead.</div><div class='del'>-	(e_card_get_vobject): When building our vcard, pass in the empty</div><div class='del'>-	string as the id if card-&gt;id is NULL. (Bug #10164)</div><div class='del'>-</div><div class='del'>-2001-10-16  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): don't set</div><div class='del'>-	the phone info if it is blank</div><div class='del'>-	(ecard_from_remote_record): save up to 3 fax numbers</div><div class='del'>-</div><div class='del'>-2001-10-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):</div><div class='del'>-	unref the book after we pass it off to evolution-addressbook.</div><div class='del'>-</div><div class='del'>-2001-10-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref</div><div class='del'>-	op-&gt;view.</div><div class='del'>-	(pas_backend_ldap_process_create_card): ref op-&gt;view.</div><div class='del'>-	(remove_card_dtor): unref op-&gt;view.</div><div class='del'>-	(pas_backend_ldap_process_remove_card): ref op-&gt;view.</div><div class='del'>-	(modify_card_dtor): unref op-&gt;view.</div><div class='del'>-	(pas_backend_ldap_process_modify_card): ref op-&gt;view.</div><div class='del'>-	(ldap_search_dtor): unref op-&gt;view.</div><div class='del'>-	(pas_backend_ldap_search): ref op-&gt;view.</div><div class='del'>-</div><div class='del'>-2001-10-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_get_book_view): make sure to unref the</div><div class='del'>-	book_view here so we don't leak them.</div><div class='del'>-</div><div class='del'>-2001-10-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): call</div><div class='del'>-	e_passwords_init and e_passwords_shutdown.</div><div class='del'>-</div><div class='del'>-2001-10-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,</div><div class='del'>-	e_card_get_vobject): Properly decide whether a property needs to</div><div class='del'>-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.</div><div class='del'>-</div><div class='del'>-2001-10-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,</div><div class='del'>-	e_contact_list_save_as): Set the default file name here.  Fixes</div><div class='del'>-	Ximian bug #7053.</div><div class='del'>-</div><div class='del'>-2001-10-14  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_hookup_shell_listeners): Added linebreaks to our</div><div class='del'>-	"this shouldn't happen" dialog message. (Bug #12498)</div><div class='del'>-</div><div class='del'>-2001-10-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Add a component name</div><div class='del'>-	to the e_passwords_init() call.</div><div class='del'>-</div><div class='del'>-2001-10-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-ldif-importer.c: commit the importer</div><div class='del'>-	originally from Michael M. Morrison, with fixups by toshok.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (bin_PROGRAMS): add</div><div class='del'>-	evolution-ldif-importer.</div><div class='del'>-	(oaf_in_files): add</div><div class='del'>-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and</div><div class='del'>-	IS_LIST.</div><div class='del'>-	(e_card_simple_set): fix typo.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: ignore</div><div class='del'>-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and</div><div class='del'>-	evolution-ldif-importer.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:</div><div class='del'>-	ldif importer oafinfo.</div><div class='del'>-</div><div class='del'>-2001-10-12  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added a boolean type here.</div><div class='del'>-</div><div class='del'>-2001-10-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(addressbook_model_set_uri): Check to see if the uri we are</div><div class='del'>-	setting is the same as the current uri.  If so, do nothing.</div><div class='del'>-	(Bug #11324)</div><div class='del'>-</div><div class='del'>-2001-10-11  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c</div><div class='del'>-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for</div><div class='del'>-	whether or not we want to revert to an earlier cardified state.</div><div class='del'>-	(e_destination_cardify): Don't be quite as aggressive about</div><div class='del'>-	reverting to previous cardified states. (Bug #11890)</div><div class='del'>-</div><div class='del'>-2001-10-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,</div><div class='del'>-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,</div><div class='del'>-	e_card_simple_set_address, e_card_simple_set_delivery_address,</div><div class='del'>-	file_as_get_style, file_as_set_style, e_card_simple_set,</div><div class='del'>-	e_card_simple_set_arbitrary),</div><div class='del'>-	gui/contact-editor/e-contact-editor-address.c</div><div class='del'>-	(e_contact_editor_address_destroy,</div><div class='del'>-	e_contact_editor_address_set_arg,</div><div class='del'>-	e_contact_editor_address_get_arg),</div><div class='del'>-	gui/contact-editor/e-contact-editor-fullname.c</div><div class='del'>-	(e_contact_editor_fullname_destroy,</div><div class='del'>-	e_contact_editor_fullname_set_arg,</div><div class='del'>-	e_contact_editor_fullname_get_arg),</div><div class='del'>-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,</div><div class='del'>-	address_text_changed, name_entry_changed, full_name_clicked,</div><div class='del'>-	full_addr_clicked, fill_in_info): Changed these to use the new ref</div><div class='del'>-	and unref functions for ECard auxillary types.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: Added a comment.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: Added ref_count field to all the</div><div class='del'>-	types.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and</div><div class='del'>-	unref functions here for all the ECard auxillary types.  Removed</div><div class='del'>-	the corresponding free functions.  Switched to using these</div><div class='del'>-	functions where appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: #include</div><div class='del'>-	&lt;e-util/e-passwords.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (load_uri_cb): const correctify.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c: #include</div><div class='del'>-	&lt;addressbook/gui/component/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an</div><div class='del'>-	unnecessary ref here.</div><div class='del'>-</div><div class='del'>-2001-10-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (update_folder):</div><div class='del'>-	Don't need this any more.</div><div class='del'>-</div><div class='del'>-2001-10-11  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): Check that</div><div class='del'>-	view-&gt;view != NULL.</div><div class='del'>-	(save_contact_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(search_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(delete_contact_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(print_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(print_preview_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(stop_loading_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(cut_contacts_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(copy_contacts_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(paste_contacts_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(select_all_contacts_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(send_contact_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(send_contact_to_cb): Check that view-&gt;view != NULL.</div><div class='del'>-	(update_command_state): Check that view-&gt;view != NULL.  Hold a</div><div class='del'>-	reference to the AddressbookView for the duration of the function,</div><div class='del'>-	in case we exit during bonobo-reentrancy.</div><div class='del'>-	(addressbook_view_ref): Added.</div><div class='del'>-	(addressbook_view_unref): Added.  Simple ref counting for</div><div class='del'>-	AddressbookView objects.</div><div class='del'>-	(addressbook_view_clear): Zero out an AddressbookView.  This is</div><div class='del'>-	now separated from the deallocation of the AddressbookView object,</div><div class='del'>-	so that we don't leave a dangling pointer if we exit during</div><div class='del'>-	bonobo-reentrancy in update_command_state. (Which often seems to</div><div class='del'>-	happen if we exit while addressbook operations are going on.)</div><div class='del'>-	(destroy_callback): Replace previous call to addressbook_view_free</div><div class='del'>-	with addressbook_view_clear/addressbook_view_unref calls.</div><div class='del'>-	(addressbook_factory_new_control): Initialize the reference count</div><div class='del'>-	in the AddressbookView object.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):</div><div class='del'>-	Carefully zero out our destroyed object.</div><div class='del'>-	(command_state_change): Hold a reference to ourselves during the</div><div class='del'>-	signal emission.</div><div class='del'>-	(get_selected_cards): Ref cards as we add them to the list.</div><div class='del'>-	(e_addressbook_view_stop): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_create): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_print): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_save_as): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_send): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_send_to): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_delete): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_cut): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_copy): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_paste): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_select_all): Check for view != NULL.</div><div class='del'>-	(e_addressbook_view_can_stop): Check for view != NULL.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be</div><div class='del'>-	careful about zeroing out our destroyed object.</div><div class='del'>-	</div><div class='del'>-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops</div><div class='del'>-	event processing in the underlying listener.</div><div class='del'>-</div><div class='del'>-2001-10-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_destroy): If our select names dialog is</div><div class='del'>-	still around, destroy it.  Otherwise, the dialog will hang around</div><div class='del'>-	after our composer goes away.</div><div class='del'>-</div><div class='del'>-2001-10-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: add an Email Address</div><div class='del'>-	field/label/help text.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_source_dialog_set_source): fill in the email entry</div><div class='del'>-	from the source.  also, set the initial state of the email</div><div class='del'>-	label/entry.</div><div class='del'>-	(auth_checkbutton_changed): set the email label/entry</div><div class='del'>-	sensitive/editable if auth is turned on, and</div><div class='del'>-	insensitive/uneditable if it's off.</div><div class='del'>-	(addressbook_source_dialog_get_source): get the email address from</div><div class='del'>-	the email entry.</div><div class='del'>-	(addressbook_source_dialog): hook up the email entry to the</div><div class='del'>-	changed signal foo, as well as the focus handler for displaying</div><div class='del'>-	help text.</div><div class='del'>-</div><div class='del'>-2001-10-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_new): db isn't a BonoboObject, so don't</div><div class='del'>-	bonobo_object_unref it!</div><div class='del'>-</div><div class='del'>-2001-10-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(addressbook_model_set_uri): e_book_load_uri -&gt;</div><div class='del'>-	addressbook_load_uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_new): e_book_load_uri -&gt;</div><div class='del'>-	addressbook_load_uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (forget_passwords_cb): new function,</div><div class='del'>-	call e_passwords_forget_passwords.</div><div class='del'>-	(verbs): Add ContactsForgetPasswords.</div><div class='del'>-	(load_uri_auth_cb): new function, call the callback and free up</div><div class='del'>-	our closure stuff.</div><div class='del'>-	(load_uri_cb): once the uri is loaded, check if we're configured</div><div class='del'>-	to authenticate for it, and do so, using the e_passwords stuff.</div><div class='del'>-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off</div><div class='del'>-	the parameters and start the load-with-auth machinery.</div><div class='del'>-	(book_open_cb): remove all the auth stuff from here, as it's</div><div class='del'>-	handled elsewhere now.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): call</div><div class='del'>-	e_passwords_init.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (user_create_new_item_cb):</div><div class='del'>-	e_book_load_uri -&gt; addressbook_load_uri.</div><div class='del'>-	(destination_folder_handle_drop): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.h: add prototype for</div><div class='del'>-	addressbook_load_uri (a wrapper around e_book_load_uri that also</div><div class='del'>-	handles authentication if the user selects it.)</div><div class='del'>-</div><div class='del'>-2001-10-05  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(real_add_address_cb): Check to make sure our call to</div><div class='del'>-	e_addressbook_model_get_card doesn't return NULL.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c</div><div class='del'>-	(e_addressbook_model_get_card): Chek that we aren't requesting a</div><div class='del'>-	negative row.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):</div><div class='del'>-	Move to the bottom of the scrolled window, so we can see the</div><div class='del'>-	address we just added.</div><div class='del'>-	(table_drag_data_received_cb): Move to the bottom of the scrolled</div><div class='del'>-	window, so we can see the contact we just dropped.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	We don't own the string returned by e_categories_master_list_nth,</div><div class='del'>-	so terrible things will happen if we free it. (Bug 10916)</div><div class='del'>-</div><div class='del'>-2001-10-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):</div><div class='del'>-	don't set the editable field on the model - let the book do that.</div><div class='del'>-	(book_writable_cb): call writable_status to propagate a ui-change</div><div class='del'>-	event up (and sensitize the write-only toolbar buttons after you</div><div class='del'>-	authenticate with ldap.)</div><div class='del'>-</div><div class='del'>-2001-10-04  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (activate_factories_for_uri): for some</div><div class='del'>-	reason, matching on protocol is causing problems for me.</div><div class='del'>-	disabling it for now.</div><div class='del'>-</div><div class='del'>-2001-10-04  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: use ldap.png for ldap</div><div class='del'>-	contacts.</div><div class='del'>-</div><div class='del'>-2001-10-03  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-storage.c </div><div class='del'>-	(addressbook_storage_setup): Only load_storages if you have LDAP.</div><div class='del'>-	(load_source_data): Only do stuff if you have LDAP.</div><div class='del'>-</div><div class='del'>-2001-10-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),</div><div class='del'>-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the</div><div class='del'>-	fields to use properly.</div><div class='del'>-</div><div class='del'>-2001-10-02  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(name_style_query): Strip out commas before forming our query.</div><div class='del'>-	(match_name): Use e_card_compare_name_to_string_full, rather</div><div class='del'>-	than our crufty old matching code.  Not only is this cleaner,</div><div class='del'>-	but that crufty old code was very broken when it came to </div><div class='del'>-	handling strings with whitespace. (Bug 8988)</div><div class='del'>-	(match_nickname): utf8 and bug fixes.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c</div><div class='del'>-	(e_card_compare_name_to_string_full): Added.  This is basically</div><div class='del'>-	e_card_compare_name_to_string with a bunch of extra options, so</div><div class='del'>-	that it can more readily be reused in other contexts.</div><div class='del'>-	(e_card_compare_name_to_string): This is now just a call to</div><div class='del'>-	e_card_compare_name_to_string_full with the extra args filled in</div><div class='del'>-	to defaults that simulate the old behavior.</div><div class='del'>-</div><div class='del'>-2001-10-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-        * backend/ebook/e-book.c (e_book_construct): remove most of the</div><div class='del'>-	oaf stuff from here.  we do it in load_uri, where we'll have more</div><div class='del'>-	information (namely, the protocol we're using.)</div><div class='del'>-	(activate_factories_for_uri): do an oaf query to get a list of all</div><div class='del'>-	objects implementing our BookFactory interface and also supporting</div><div class='del'>-	the protocol used in the uri.</div><div class='del'>-        (e_book_load_uri): try activating book factories to handle this</div><div class='del'>-	uri, and start the iteration over the list.</div><div class='del'>-        (e_book_load_uri_from_factory): try and load the uri.</div><div class='del'>-        (e_book_load_uri_open_cb): callback function for the</div><div class='del'>-	BookFactory_openBook call - if it succeeds, call the user's</div><div class='del'>-	callback.  otherwise step to the next factory.</div><div class='del'>-        (e_book_load_uri_step): go to the next factory in our list, and</div><div class='del'>-	error out if there are no more.</div><div class='del'>-	</div><div class='del'>-2001-10-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_get_textification): Made the max length of</div><div class='del'>-	the textification be 2047 characters.  Fixes Ximian bug #3021.</div><div class='del'>-</div><div class='del'>-2001-10-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): if there</div><div class='del'>-	was no first name or last name, file as the company.</div><div class='del'>-</div><div class='del'>-2001-10-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_changes_foreach_key): if there is a db error,</div><div class='del'>-	assume deletion</div><div class='del'>-	(pas_backend_file_changes): write after all is done for efficiency</div><div class='del'>-</div><div class='del'>-2001-09-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_changes_foreach_key): g_strdup</div><div class='del'>-	(pas_backend_file_changes): ditto, make sure to free all data and</div><div class='del'>-	do a hash write after each add/remove</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_to_pilot_record): use</div><div class='del'>-	the local record category</div><div class='del'>-	(local_record_from_ecard): ndle the fields and category we don't</div><div class='del'>-	sync by making sure we don't overwrite them</div><div class='del'>-</div><div class='del'>-2001-09-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to</div><div class='del'>-	get a list of all objects implementing our BookFactory interface,</div><div class='del'>-	instead of just activating the one IID.  this should really be a</div><div class='del'>-	global list, not a per EBook.</div><div class='del'>-	(e_book_load_uri): start the iteration over our list of</div><div class='del'>-	BookFactory's.</div><div class='del'>-	(e_book_load_uri_from_factory): try and load the uri.</div><div class='del'>-	(e_book_load_uri_open_cb): callback function for the</div><div class='del'>-	BookFactory_openBook call - if it succeeds, call the user's</div><div class='del'>-	callback.  otherwise step to the next factory.</div><div class='del'>-	(e_book_load_uri_step): go to the next factory in our list, and</div><div class='del'>-	error out if there are no more.</div><div class='del'>-</div><div class='del'>-2001-09-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): use the old</div><div class='del'>-	record (if there was one) so as not to overwrite fields we don't</div><div class='del'>-	sync</div><div class='del'>-	(pre_sync): store the dbi in the context and don't make it object</div><div class='del'>-	data</div><div class='del'>-</div><div class='del'>-2001-09-26  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use</div><div class='del'>-	priv-&gt;iid instead of the hardcoded string here.</div><div class='del'>-	(pas_book_factory_activate): parameterize the factory's iid, as in</div><div class='del'>-	the calendar server, and provide a default if iid == NULL.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.h: add iid parameter for</div><div class='del'>-	pas_book_factory_activate.</div><div class='del'>-</div><div class='del'>-2001-09-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use</div><div class='del'>-	camel_address_format, not camel_address_encode.</div><div class='del'>-</div><div class='del'>-2001-09-26  Anna Marie Dirks  &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: Added help text (thanks </div><div class='del'>-	to Aaron) and re-worded the labels, and fixed the shortcuts on the </div><div class='del'>-	brand-spanking-new Collaboration tab.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2001-09-26  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.h: add</div><div class='del'>-	completion_book.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and</div><div class='del'>-	if it's present, use the corresponding EBook for completing</div><div class='del'>-	addresses.</div><div class='del'>-	(focus_out_cb): use manager-&gt;completion_book here instead of NULL,</div><div class='del'>-	which corresponds to the local addressbook.</div><div class='del'>-	(completion_popup_cb): same.</div><div class='del'>-	(e_select_names_manager_create_entry): same.</div><div class='del'>-</div><div class='del'>-2001-09-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):</div><div class='del'>-	Properly handle names when the individual elements (given,</div><div class='del'>-	addition, family) contain whitespace.  (Bug #10502)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_set_name): Reset</div><div class='del'>-	textrep when we change the name.</div><div class='del'>-	(e_destination_set_email): Reset textrep when we change the email.</div><div class='del'>-	(e_destination_get_textrep): Make sure that the textrep version of</div><div class='del'>-	the address is properly quoted if it contains unsafe characters.</div><div class='del'>-	(All related to bug #10796)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_nickname): Fix nickname matching. (bug #9698)</div><div class='del'>-	(make_match): Use e_completion_match_new when building our match,</div><div class='del'>-	rather than ad hoc manipulation of the struct.</div><div class='del'>-</div><div class='del'>-2001-09-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set</div><div class='del'>-	the last_use and use_score fields of the card to known values so</div><div class='del'>-	the card doesn't register as changed when only they have changed</div><div class='del'>-</div><div class='del'>-2001-09-26  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function</div><div class='del'>- 	to set email addresses properly, and handle multiple occurrences of</div><div class='del'>- 	email addresses, home phone numbers, and business phone numbers.</div><div class='del'>-	</div><div class='del'>-2001-09-25  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (user_create_new_item_cb):</div><div class='del'>-	Handle creating the new contact in the current folder if it's a</div><div class='del'>-	contacts folder.  Fixes Ximian bug #7814.</div><div class='del'>-</div><div class='del'>-2001-09-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (LDAP_SCHEMA): add</div><div class='del'>-	evolutionperson.schema</div><div class='del'>-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).</div><div class='del'>-</div><div class='del'>-2001-09-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): sync the</div><div class='del'>-	note the to pilot and make sure to blank fields when appropriate</div><div class='del'>-	(local_record_from_ecard): sync the note to the desktop</div><div class='del'>-</div><div class='del'>-2001-09-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the</div><div class='del'>-	error case to plug a memory leak.</div><div class='del'>-</div><div class='del'>-2001-09-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): when creating the cards,</div><div class='del'>-	don't display any of the subname fields (surname, given, middle,</div><div class='del'>-	suffix, etc.)</div><div class='del'>-</div><div class='del'>-2001-09-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c</div><div class='del'>-	(e_card_simple_get): add getters for the additional name fields.</div><div class='del'>-	(field_data): move FAMILY_NAME to the end of the list, and add</div><div class='del'>-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.</div><div class='del'>-	</div><div class='del'>-	* backend/ebook/e-card-simple.h: same.</div><div class='del'>-</div><div class='del'>-2001-09-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (print_preview_cb): Hooked up print</div><div class='del'>-	preview button.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h</div><div class='del'>-	(e_addressbook_view_print_preview): Added this function.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h</div><div class='del'>-	(e_contact_print_preview): Added this function.</div><div class='del'>-</div><div class='del'>-2001-09-19  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):</div><div class='del'>-	Use the default e-mail address if we have nothing else to go on.</div><div class='del'>-	Previously we just failed, which basically meant that name-only</div><div class='del'>-	searches would never work properly.</div><div class='del'>-	(nickname_simple_query_cb): The logic was a bit tangled here; if</div><div class='del'>-	our query status isn't SUCCESS, always give up but don't leak the</div><div class='del'>-	destination.  And if our nickname query fails and we try the</div><div class='del'>-	name-and-email query, use the textrep for a name-only search.  The</div><div class='del'>-	only reason we are doing a nickname query in the first place is if</div><div class='del'>-	we have an obviously invalid e-mail.</div><div class='del'>-	(launch_cardify_query): Use e_destination_is_valid to determine</div><div class='del'>-	if we should try a nickname query first.</div><div class='del'>-	These changes basically fix bug 7728, and generally make the</div><div class='del'>-	auto-cardification of addresses a lot more clever and robust.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (name_and_email_cb): Use</div><div class='del'>-	e_card_compare_name_to_string instead of e_card_name_match_string.</div><div class='del'>-	(e_book_name_and_email_query): The arguments to g_strsplit were</div><div class='del'>-	in the wrong order.  Doh!</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):</div><div class='del'>-	Added.  Replaces e_card_name_match_string, and actually works.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Removed e_card_name_match_string</div><div class='del'>-	function, which didn't work particularly well.</div><div class='del'>-</div><div class='del'>-2001-09-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (cursor_cb): don't add to the complete</div><div class='del'>-	list of cards if the card is a list</div><div class='del'>-	(card_added): don't add to the list of changes if the card is a</div><div class='del'>-	list</div><div class='del'>-	(card_changed): ditto</div><div class='del'>-	(card_removed): ditto</div><div class='del'>-</div><div class='del'>-2001-09-19  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_hookup_shell_listeners): Change the "this should</div><div class='del'>-	never happen" message into a request for people to e-mail me</div><div class='del'>-	directly with info if they encounter that error.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):</div><div class='del'>-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that</div><div class='del'>-	they won't be leaked if they are dynamic strings, so that they</div><div class='del'>-	will be i18n-correct, and so that underscores won't be interpreted</div><div class='del'>-	as key accelerators.  What a PITA.  Also, don't leak our</div><div class='del'>-	iterators.  (Bug #10200.)</div><div class='del'>-	(popup_menu_list): The same GnomeUIInfo tweaking as in</div><div class='del'>-	popup_menu_card.</div><div class='del'>-	(popup_menu_nocard): Ditto.</div><div class='del'>-</div><div class='del'>-2001-09-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data</div><div class='del'>- </div><div class='del'>- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri</div><div class='del'>- 	property when appropriate</div><div class='del'>- 	(parse_caluri): handle read caluri</div><div class='del'>- 	(e_card_class_init): add caluri arg</div><div class='del'>- 	(e_card_destroy): free the caluri</div><div class='del'>- 	(e_card_get_arg): return caluri arg</div><div class='del'>- 	(e_card_set_arg): set caluri from arg</div><div class='del'>- 	(e_card_init): init caluri to null</div><div class='del'>- </div><div class='del'>- 	* backend/ebook/e-card-simple.h: new simple field</div><div class='del'>- </div><div class='del'>- 	* backend/ebook/e-card.h: new member</div><div class='del'>- </div><div class='del'>- 	* gui/contact-editor/e-contact-editor.c (field_changed): util</div><div class='del'>- 	callback to change the command state</div><div class='del'>- 	(set_entry_changed_signal_field): hook up a change signal to above</div><div class='del'>- 	(set_entry_changed_signals): use above function</div><div class='del'>- </div><div class='del'>- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration</div><div class='del'>- 	page and fields</div><div class='del'>-	</div><div class='del'>-2001-09-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_build_cards_list): create a sexp and check if</div><div class='del'>-	the cards match before adding them to the list</div><div class='del'>-	(pas_backend_file_process_get_cursor): send extra param</div><div class='del'>-</div><div class='del'>-2001-09-18  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(book_query_process_card_list): unref the destination regardless</div><div class='del'>-	of whether we get an email addresss.</div><div class='del'>-</div><div class='del'>-2001-09-17  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(name_style_query): use g_strfreev.</div><div class='del'>-	(match_name): s/g_free/g_strfreev.</div><div class='del'>-	(match_file_as): s/g_free/g_strfreev.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix</div><div class='del'>-	the memory handling here.  All there members of the vector need to</div><div class='del'>-	be freed all the time.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c (parse_line): free the</div><div class='del'>-	string outside of the test that makes sure there are three</div><div class='del'>-	entries.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_nickname): don't malloc a match we will never use.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd</div><div class='del'>-	capabilities.</div><div class='del'>-</div><div class='del'>-2001-09-17  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_valid): We want</div><div class='del'>-	to assume that a destination that comes from a card is</div><div class='del'>-	automatically valid, but the right way to check that is by calling</div><div class='del'>-	e_destination_from_card, not by checking if dest-&gt;priv-&gt;card !=</div><div class='del'>-	NULL.  (Fixed bug #10017)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_name): Fixed a stupid bug was causing completion to fail</div><div class='del'>-	for contacts who have only one name.  (The classic example we all</div><div class='del'>-	know and love is 'George &lt;jirka@5z.com&gt;')  (bug #8353)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if</div><div class='del'>-	the card we are trying to send to has no valid e-mail addresses.</div><div class='del'>-	(bug #10137)</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly</div><div class='del'>-	assumed that event-&gt;button.button is 1, 2, or 3, causing disaster</div><div class='del'>-	when using a wheel-mouse.  Fixed. (bug #9400)</div><div class='del'>-</div><div class='del'>-2001-09-16  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):</div><div class='del'>-	use enable_widget instead of gtk_widget_set_sensitive.</div><div class='del'>-	(_email_arrow_pressed): same.</div><div class='del'>-	(_address_arrow_pressed): same.</div><div class='del'>-	(disable_widget_foreach): same.</div><div class='del'>-	(enable_writable_fields): same.</div><div class='del'>-	(set_editable): same.</div><div class='del'>-	(enable_widget): new function, using both gtk_widget_set_sensitive</div><div class='del'>-	and *_set_editable to allow the user to select text in GtkEntry's</div><div class='del'>-	and GtkText's.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor-fullname.c</div><div class='del'>-	(e_contact_editor_fullname_set_arg): use set_editable as well as</div><div class='del'>-	set_sensitive, to allow the user to select text in GtkEntry's.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor-address.c</div><div class='del'>-	(e_contact_editor_address_set_arg): same.</div><div class='del'>-</div><div class='del'>-2001-09-16  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: fix syntax errors (which are</div><div class='del'>-	broken, imo...)</div><div class='del'>-</div><div class='del'>-2001-09-16  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so</div><div class='del'>-	that they match the order of the option menus in the glade file.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (auth_checkbutton_changed):</div><div class='del'>-	new function, mostly there to house some #ifdef'ed out code.</div><div class='del'>-	(option_menuitem_activated): new function, to keep track of</div><div class='del'>-	changes to the ldap scope optionmenu.</div><div class='del'>-	(addressbook_source_dialog_set_source): set the menu history as</div><div class='del'>-	well as the dialog's copy of the scope.</div><div class='del'>-	(addressbook_source_dialog_get_source): fill in the source's scope</div><div class='del'>-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me</div><div class='del'>-	code.</div><div class='del'>-	(add_activate_cb): new function, add an activate callback for the</div><div class='del'>-	optionmenu's items.</div><div class='del'>-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me</div><div class='del'>-	code, always start the dialog on page 0, and hook up the</div><div class='del'>-	scope optionmenu's items.</div><div class='del'>-</div><div class='del'>-2001-09-15  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (e_card_compare_name): No</div><div class='del'>-	loose name matches on family names. (#8802)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): We can't use NULL as the</div><div class='del'>-	first arg for e_addressbook_show_contact_editor anymore.  Damn.</div><div class='del'>-	(#8535)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make</div><div class='del'>-	"stop" do nothing but set the stopped flag, as in</div><div class='del'>-	e-book-view-listener.c.</div><div class='del'>-	(e_book_listener_destroy): Clean up our queue here, rather than in</div><div class='del'>-	e_book_listener_stop.</div><div class='del'>-	(response_free): Added.  Move the rather lengthy bit of code</div><div class='del'>-	needed to free a EBookListenerResponse into one place.</div><div class='del'>-	(e_book_listener_check_queue): Properly deal with the stopped</div><div class='del'>-	flag.</div><div class='del'>-	(e_book_listener_queue_response): If the stopped flag is set, just</div><div class='del'>-	drop the incoming response.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_stop): Make "stop" do nothing but set the</div><div class='del'>-	stopped flag.</div><div class='del'>-	(e_book_view_listener_destroy): Move all of the clean-up that used</div><div class='del'>-	to be in e_book_view_listener_stop here.  This considerably simplifies</div><div class='del'>-	the logic required to avoid various race conditions.</div><div class='del'>-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.</div><div class='del'>-	(e_book_view_listener_queue_response): Drop all incoming responses if</div><div class='del'>-	we are stopped.</div><div class='del'>-</div><div class='del'>-2001-09-14  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a</div><div class='del'>-	reference to the book on behalf of our idle function.</div><div class='del'>-	(pas_book_check_queue): When we are finished, drop the reference</div><div class='del'>-	we've been holding on behalf of the idle function.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_create_card): Hold a reference to the</div><div class='del'>-	book_view while sending our notifications.</div><div class='del'>-	(pas_backend_file_process_remove_card): Hold a reference to the</div><div class='del'>-	book_view while sending our notifications.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove</div><div class='del'>-	debugging spew.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c: Remove a lot of unused code that</div><div class='del'>-	worked around bugs that have long since been fixed.</div><div class='del'>-	(simple_query_disconnect): Added.  Breaks out the part of</div><div class='del'>-	simple_query_free that disconnect signals.</div><div class='del'>-	(simple_query_free): Replace code w/ a call to</div><div class='del'>-	simple_query_disconnect.</div><div class='del'>-	(simple_query_sequence_complete_cb): Call simple_query_disconnect</div><div class='del'>-	before executing the callback, so that our callbacks don't get</div><div class='del'>-	triggered by any book changes that might occur during that</div><div class='del'>-	callback.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_check_queue): Changed to be consistent with</div><div class='del'>-	e_book_listener_check_queue.</div><div class='del'>-	(e_book_view_listener_queue_response): Also changed to use a</div><div class='del'>-	high-frequency timeout.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):</div><div class='del'>-	OK, I've agonized over this stupid little function, and it should</div><div class='del'>-	now be race-free.</div><div class='del'>-	(e_book_listener_queue_response): We process our response queue in</div><div class='del'>-	a high-frequency timeout rather than an idle.  Using an idle</div><div class='del'>-	function leads to some tricky race conditions and bad interactions</div><div class='del'>-	with bonobo's semi-broken attempts to take over event processing.</div><div class='del'>-	(e_book_view_listener_stop): Manually disable our timeout and</div><div class='del'>-	clean up.</div><div class='del'>-</div><div class='del'>-2001-09-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Automake 1.5 fixes pointed out by Richard Boulton</div><div class='del'>-	&lt;richard@tartarus.org&gt;, as per #9258.]</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly</div><div class='del'>-	instead of using `+='.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to</div><div class='del'>-	`LDAP_BACKEND_FILES'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of</div><div class='del'>-	using `+='.</div><div class='del'>-</div><div class='del'>-2001-09-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use</div><div class='del'>-	ldap_init.  ldap_open is deprecated in openldap 2.x.</div><div class='del'>-</div><div class='del'>-2001-09-12  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):</div><div class='del'>-	Fix the check.</div><div class='del'>-</div><div class='del'>-2001-09-12  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c: free the values that are being</div><div class='del'>-	leaked here.</div><div class='del'>-</div><div class='del'>-2001-09-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c (match_email): </div><div class='del'>-	printf arguments were reversed by mistake.  Fixed bug #9693.</div><div class='del'>-</div><div class='del'>-2001-09-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_list): Added.  Treat right-clicks on a contact list as</div><div class='del'>-	a special case.</div><div class='del'>-	(e_select_names_popup): Check if we are dealing with a contact</div><div class='del'>-	list.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_check_queue): See</div><div class='del'>-	e_book_listener_check_queue below.</div><div class='del'>-	(e_book_view_listener_queue_response): See</div><div class='del'>-	e_book_listener_queue_response below.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):</div><div class='del'>-	Explicitly prohibit reentrancy.  Use gtk-unref rather than</div><div class='del'>-	bobobo-unref.</div><div class='del'>-	(e_book_listener_queue_response): Hold a gtk-ref to the listener</div><div class='del'>-	while the idle function runs, not a bonobo-ref.  As far as I can</div><div class='del'>-	tell, it is impossible to avoid a race condition here when we have</div><div class='del'>-	to worry about bonobo reentrancy.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Alter a copy of the</div><div class='del'>-	original EDestination, rather than just using a new one.  We need</div><div class='del'>-	to do this to preserve prior-card information for possible</div><div class='del'>-	reversion later.</div><div class='del'>-	(e_select_names_text_model_delete): Ditto.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_clear_card): When</div><div class='del'>-	clearing a destination where -&gt;card != NULL, store it for possible</div><div class='del'>-	reversion later.</div><div class='del'>-	(e_destination_revert): If we have an old card stored, go back to</div><div class='del'>-	using it for the destination.</div><div class='del'>-	(e_destination_is_valid): Tries to detect obviously broken</div><div class='del'>-	addresses.</div><div class='del'>-	(e_destination_cardify): If our destination is invalid, first try</div><div class='del'>-	to cardify simply by reverting to an older card.</div><div class='del'>-	(e_destination_destroy): Unref any cached old card.</div><div class='del'>-	(e_destination_copy): Copy the old card information.</div><div class='del'>-</div><div class='del'>-2001-09-07  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(sync_table_and_models): Show all rows in the table, and then</div><div class='del'>-	remove the rows that correspond to entries in the</div><div class='del'>-	ESelectNamesModels in the children.</div><div class='del'>-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we</div><div class='del'>-	don't change our table while we are in the middle of iterating</div><div class='del'>-	over the selection.</div><div class='del'>-	(remove_address): Just delete the address from the</div><div class='del'>-	ESelectNamesModel, the signal handler will do the rest.</div><div class='del'>-	(selected_rows_foreach_cb): Call remove_address to do our dirty</div><div class='del'>-	work.</div><div class='del'>-	(e_select_names_add_section): Connect to the 'changed' signal from</div><div class='del'>-	the ESelectNamesModel, and call sync_table_and_models explicitly to</div><div class='del'>-	get our initial state correct.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c</div><div class='del'>-	(fill_in_info): Deal with EDestinations in our table that don't</div><div class='del'>-	come from cards.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Added</div><div class='del'>-	another ESelectNamesModel* to the ESelectNamesManagerSection</div><div class='del'>-	struct.  Called 'original_model', this contains a copy of the</div><div class='del'>-	model as it is when we begin using the SelectNames dialog.</div><div class='del'>-	(section_copy): Copy the original model.</div><div class='del'>-	(section_free): Free the original model.</div><div class='del'>-	(e_select_names_manager_add_section_with_limit): Initialize the</div><div class='del'>-	original model.</div><div class='del'>-	(e_select_names_clicked): I've changed the semantics of this</div><div class='del'>-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,</div><div class='del'>-	we do nothing.  If Cancel is clicked, we revert to the</div><div class='del'>-	'original_model' copy of our address entry state before we started</div><div class='del'>-	editting.  Finally, we close the dialog before any of thing. Doing</div><div class='del'>-	it last caused problems, because signals were being triggered</div><div class='del'>-	which had dangling pointers as their closures.</div><div class='del'>-	(e_select_names_manager_activate_dialog): Copy our current state</div><div class='del'>-	to the original model, and share the same ESelectNamesModel</div><div class='del'>-	between the dialog and the address entry in the composer..</div><div class='del'>-	(e_select_names_manager_get_cards): Removed.  It had been</div><div class='del'>-	#if 0/#endif-ed out for a while.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_freeze): Added.</div><div class='del'>-	(e_select_names_model_thaw): Added.</div><div class='del'>-	(e_select_names_model_uncardify): Added.  If possible,</div><div class='del'>-	"uncardifies" a specific model entry.</div><div class='del'>-	(e_select_names_model_changed): Changed to pay attention</div><div class='del'>-	to the freeze count.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(clean_query_text): Strip leading/trailing whitespace from</div><div class='del'>-	queries.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.</div><div class='del'>-	Converts a card-associated destination into a text-associated</div><div class='del'>-	destination w/ the e-mail address.</div><div class='del'>-	(e_destination_list_to_vector): Added.  A convenience routine.</div><div class='del'>-	(e_destination_freev): Added.  A convenience routine.</div><div class='del'>-	(e_destination_touchv): Added.  I'm lazy.</div><div class='del'>-</div><div class='del'>-2001-09-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	(make_contact_editor_cb): show the right contact editor (the list</div><div class='del'>-	editor for list cards).</div><div class='del'>-	</div><div class='del'>-2001-09-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_card): do the EDestination xml magic on email</div><div class='del'>-	addresses we put in the popup.</div><div class='del'>-</div><div class='del'>-2001-08-27  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	For every category:</div><div class='del'>-	- set .translate to FALSE (e_categories_master_list_nth returns</div><div class='del'>-	translated category name)</div><div class='del'>-	- convert category name in UTF-8 to locale's encoding</div><div class='del'>-</div><div class='del'>-2001-08-23  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_card): Fixed two bugs:</div><div class='del'>-	- missing coversion of contact name to GTK+ locale,</div><div class='del'>-	- passing dynamically created string (contact name) inside uiinfo struct</div><div class='del'>-	to gnome-app-helper functions.</div><div class='del'>-	Remember: these functions may change strings, trying to translate them!</div><div class='del'>-	(popup_menu_nocard): Ditto</div><div class='del'>-</div><div class='del'>-2001-09-07  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Removed unused factory</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-2001-09-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (notify_listener): new</div><div class='del'>-	function, notify the bonobo listener.</div><div class='del'>-	(remove_ldap_folder): track change to EvolutionStorage signal.</div><div class='del'>-	(create_ldap_folder): same, and make sure the type is</div><div class='del'>-	"ldap-contacts".</div><div class='del'>-	(load_source_data): folders that we create should have</div><div class='del'>-	"ldap-contacts" as their type.</div><div class='del'>-	(addressbook_storage_add_source): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: (folder_types): add</div><div class='del'>-	"ldap-contacts", for display of ldap servers (they get their own</div><div class='del'>-	icon, and their own name in the Create New Folder dialog.</div><div class='del'>-	(create_view): use IS_CONTACT_TYPE since we support two folder</div><div class='del'>-	types now.</div><div class='del'>-	(create_folder): same.</div><div class='del'>-	(remove_folder): same.</div><div class='del'>-	(xfer_folder): same.</div><div class='del'>-</div><div class='del'>-2001-09-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change</div><div class='del'>-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.</div><div class='del'>-</div><div class='del'>-2001-09-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove</div><div class='del'>-	status messages from here.</div><div class='del'>-	(e_addressbook_view_delete_selection): same.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a</div><div class='del'>-	NULL status message along with the stop_state_changed.  The null</div><div class='del'>-	status message will clear the status bar for this view.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_status_message): use the</div><div class='del'>-	EvolutionActivityClient stuff.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status</div><div class='del'>-	message for abandoning a search.</div><div class='del'>-	(ldap_op_process_current): wrap status messages in _().</div><div class='del'>-	(ldap_op_process): same.</div><div class='del'>-	(create_card_handler): same, and remove the notify_status for ""</div><div class='del'>-	and add a notify_complete call after the card is added.</div><div class='del'>-	(remove_card_handler): same.</div><div class='del'>-	(modify_card_handler): same.</div><div class='del'>-	(poll_ldap): wrap status messages with _(), and remove the "Search</div><div class='del'>-	Complete" message.</div><div class='del'>-	(ldap_search_handler): wrap status message.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use</div><div class='del'>-	_() on status messages, and make sure the last notify_* called is</div><div class='del'>-	notify_complete.</div><div class='del'>-</div><div class='del'>-2001-09-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix #958, ShellComponents should not be created by factories, for</div><div class='del'>-	the addressbook.]</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.</div><div class='del'>-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.</div><div class='del'>-	(create_component): Renamed from `factory_fn'.  Just register the</div><div class='del'>-	thing on OAF.</div><div class='del'>-	(addressbook_component_factory_init): Just call it.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the</div><div class='del'>-	ShellComponentFactory.</div><div class='del'>-</div><div class='del'>-2001-09-04  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE</div><div class='del'>-	if the file isn't a valid VCard file.</div><div class='del'>-</div><div class='del'>-2001-08-05  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c</div><div class='del'>-	(field_data): Marked "name" and "short_name" fields for translation.</div><div class='del'>-	(e_card_simple_get_name, e_card_simple_get_short_name): Return</div><div class='del'>-	localized version of the name (using U_() macro).</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):</div><div class='del'>-	Connect "changed" signal from "entry-web" entry to widget_changed.</div><div class='del'>-	(changing this field wasn't making "Save and Close" button sensitive)</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(button_labels, button_letters): New strings containing a list of</div><div class='del'>-	labels and "values" of all buttons placed on the right side of the</div><div class='del'>-	addressbook view (intended for localization).</div><div class='del'>-	(struct LetterClosure): Changed the type of letter field to gunichar.</div><div class='del'>-	(e_utf8_split): New function, similar to g_strsplit, but operates on</div><div class='del'>-	UTF-8 strings.</div><div class='del'>-	(jump_to_letter): Don't hardcode letters, build queries dynamically</div><div class='del'>-	using UTF-8 and localized letters stored in button_letters.</div><div class='del'>-	(connect_button): Removed.</div><div class='del'>-	(create_alphabet): Don't use glade file, build buttons manually using</div><div class='del'>-	(localized) labels from button_labels. Use (localized) values from</div><div class='del'>-	button_letters when creating LetterClosure.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.[ch]</div><div class='del'>-	(e_minicard_view_widget_jump_to_letter): Changed the type of the</div><div class='del'>-	second argument from char to gunichar.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c</div><div class='del'>-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on</div><div class='del'>-	UTF-8 string.</div><div class='del'>-	(e_minicard_view_jump_to_letter): Changed the type of the second</div><div class='del'>-	argument from char to gunichar + conversion to UTF-8 string.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h</div><div class='del'>-	(e_minicard_view_jump_to_letter): Changed the type of the second</div><div class='del'>-	argument from char to gunichar.</div><div class='del'>-</div><div class='del'>-2001-09-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),</div><div class='del'>-	backend/pas/pas-backend-file.c (do_create),</div><div class='del'>-	backend/pas/pas-backend-ldap.c</div><div class='del'>-	(create_card_handler, remove_card_handler, modify_card_handler,</div><div class='del'>-	pas_backend_ldap_process_get_vcard, poll_ldap): Use</div><div class='del'>-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here</div><div class='del'>-	since all internal communications and database storage are assumed</div><div class='del'>-	to be utf8.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h</div><div class='del'>-	(e_card_simple_duplicate): Simplified this function considerably.</div><div class='del'>-	(e_card_simple_get_vcard_assume_utf8): Added this function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,</div><div class='del'>-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made</div><div class='del'>-	these functions pay attention to charset attributes.</div><div class='del'>-	(e_card_new_with_default_charset,</div><div class='del'>-	e_card_load_cards_from_file_with_default_charset,</div><div class='del'>-	e_card_load_cards_from_string_with_default_charset): New functions</div><div class='del'>-	that let you change the default charset from UTF-8.</div><div class='del'>-	(e_card_get_vcard): Made this write out charset attributes when</div><div class='del'>-	necessary.</div><div class='del'>-	(e_card_get_vcard_assume_utf8): New function that writes out a</div><div class='del'>-	card without writing out charset attributes.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),</div><div class='del'>-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),</div><div class='del'>-	backend/ebook/test-card.c (main),</div><div class='del'>-	gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c</div><div class='del'>-	(main), gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c</div><div class='del'>-	(selection_received), gui/widgets/e-minicard-control.c</div><div class='del'>-	(pstream_load): Changed the default charset to be used here to</div><div class='del'>-	ISO-8859-1.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),</div><div class='del'>-	backend/ebook/load-pine-addressbook.c (add_card_cb),</div><div class='del'>-	backend/ebook/test-client-list.c (get_cursor_cb),</div><div class='del'>-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use</div><div class='del'>-	e_card_get_vcard_assume_utf8 to print out testing strings.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h</div><div class='del'>-	(e_select_names_model_contains): Changed this to be const</div><div class='del'>-	EDestination *dest to fix a warning.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):</div><div class='del'>-	Translate window title here.</div><div class='del'>-</div><div class='del'>-2001-08-31  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_get_other_contact_storage): s/_/U_/</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):</div><div class='del'>-	Use g_utf8_collate.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_compare):</div><div class='del'>-	Ditto.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (card_compare):</div><div class='del'>-	Ditto.</div><div class='del'>-</div><div class='del'>-2001-08-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_clicked): Use e_select_names_model_merge to</div><div class='del'>-	combine the selected names with any existing ones.  This causes</div><div class='del'>-	you to not lose addresses typed directly into the entry while the</div><div class='del'>-	SelectNames dialog is up. (Bug #8058)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_merge): Merge the contents of one</div><div class='del'>-	ESelectNamesModel into another, avoiding duplicates.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_equal): Added.</div><div class='del'>-	Determines if two destinations appear to refer to the same</div><div class='del'>-	recipient.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Added cast to</div><div class='del'>-	g_free args to silence compiler warnings.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):</div><div class='del'>-	Paranoia.  Check that name != qa-&gt;name.</div><div class='del'>-	(quick_add_set_email): Check that email != qa-&gt;email.</div><div class='del'>-	(ce_have_book): Store the QuickAdd data structure in object data,</div><div class='del'>-	so that we can be extra-careful and avoid having a dangling</div><div class='del'>-	pointer floating around out somewhere as the closure for a signal.</div><div class='del'>-	Fixes bug #8155, I think.</div><div class='del'>-	(card_added_cb): Clear object data to ensure single unref.</div><div class='del'>-	(editor_closed_cb): Clear object data to ensure single unref.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(book_query_score): Make sure that comp-&gt;priv-&gt;query_text isn't</div><div class='del'>-	NULL.  (Fixes bug #8195)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):</div><div class='del'>-	This function can be re-entrant during the signal emission; Added</div><div class='del'>-	extra ref/unrefs and checks to avoid problems if this happens.</div><div class='del'>-	This is similar to my recent changes to</div><div class='del'>-	e_book_view_listener_check_queue.  (Fixes bug #7400)</div><div class='del'>-</div><div class='del'>-2001-08-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Get rid of a warning by</div><div class='del'>-	initializing the closing NULL element in folder_types correctly.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Updated to match</div><div class='del'>-	the studlyCapsification of attributes in shell/Evolution*.idl.</div><div class='del'>-</div><div class='del'>-2001-08-27  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(sexp_file_as): Added.  Generated queries against file_as.</div><div class='del'>-	(match_file_as): Added.  Match results of queries against</div><div class='del'>-	file_as. (Bug #8152)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_check_queue): Added ref/unref pair to make</div><div class='del'>-	sure that our listener doesn't get finalized during the signal</div><div class='del'>-	emission and leave us with a dangling pointer. (Bug #7661)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging</div><div class='del'>-	spew that I left in by mistake.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging</div><div class='del'>-	spew.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if</div><div class='del'>-	the card we are trying to send to is a contact list. (Bug #6580)</div><div class='del'>-</div><div class='del'>-2001-08-27  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):</div><div class='del'>-	Display localized status string (added missing _()).</div><div class='del'>-</div><div class='del'>-2001-08-24  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_set_card): Put a</div><div class='del'>-	freeze/thaw around our the set of operations that changes the</div><div class='del'>-	internal state of our card, so 'changed' signal callbacks won't be</div><div class='del'>-	invoked on a card in an intermediary state.  This fixes the bug</div><div class='del'>-	that was causing the e-mail addresses in cards to be blank when</div><div class='del'>-	replying to a message.  (An unexpected side-effect of toshok's</div><div class='del'>-	change on 8/22 to make sure that priv-&gt;email != NULL).</div><div class='del'>-	(e_destination_get_name): Code slightly rearranged for (IMO)</div><div class='del'>-	clarity.</div><div class='del'>-</div><div class='del'>-2001-08-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): add</div><div class='del'>-	BUTTON_PRESS_MASK so double clicks still work.</div><div class='del'>-</div><div class='del'>-2001-08-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed): switch</div><div class='del'>-	"full_name" to "x-evolution-any-field" in all the queries where we</div><div class='del'>-	want to match all cards, since the backends universally handle</div><div class='del'>-	this special case more efficiently.</div><div class='del'>-</div><div class='del'>-2001-08-22  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):</div><div class='del'>-	In the GUI, the toggle is labelled "hide addresses", not "show</div><div class='del'>-	addresses" -- so we have to reverse the boolean value we read in.</div><div class='del'>-	(fill_in_info): Same bug as before: since the GUI reads "hide", we</div><div class='del'>-	have to initialize the toggle to '!show_addresses', not</div><div class='del'>-	'show_addresses'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c</div><div class='del'>-	(e_destination_list_show_addresses): Added.</div><div class='del'>-	(e_destination_xml_encode): Encode the value of</div><div class='del'>-	e_destination_list_show_addresses into the XML.</div><div class='del'>-	(e_destination_xml_decode): Read and store the "show_addresses"</div><div class='del'>-	flag.</div><div class='del'>-</div><div class='del'>-2001-08-22  jacob berkman  &lt;jacob@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (emit_event): emit an event from</div><div class='del'>-	our event source</div><div class='del'>-	(contact_editor_cb): emit a destroy event so our control frame can</div><div class='del'>-	be destroyed.</div><div class='del'>-	(edit_contact_info_cb): emit a hide event so our control frame can</div><div class='del'>-	be hidden</div><div class='del'>-	(e_address_popup_cardify):</div><div class='del'>-	(add_contacts_cb): emit the destroy event</div><div class='del'>-	(e_address_popup_factory_new_control): don't unref our object at</div><div class='del'>-	widget destroy time as that was really really broken</div><div class='del'>-	(e_address_popup_factory_new_control): create an event source and</div><div class='del'>-	aggregate ourself with it</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):</div><div class='del'>-	display a nicer warning when we can't find a widget for a given</div><div class='del'>-	field</div><div class='del'>-	(e_contact_editor_raise): only raise if there is a window</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: name some widgets that</div><div class='del'>-	got unnamed, and set the first entry as defaultable</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c: envelope printing is</div><div class='del'>-	disabled in 1.0</div><div class='del'>-</div><div class='del'>-2001-08-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_email): make</div><div class='del'>-	sure we don't get into a situation where priv-&gt;email == NULL.</div><div class='del'>-</div><div class='del'>-2001-08-21  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,</div><div class='del'>-	drag_button_down won't be true in the BUTTON_RELEASE case, since</div><div class='del'>-	we set it to false in MOTION_NOTIFY once the threshold is reached.</div><div class='del'>-	(e_minicard_drag_end): remove this function, since it was needed</div><div class='del'>-	to work around a bug in gnome-canvas.</div><div class='del'>-	</div><div class='del'>-2001-08-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_addressbook_create_ebook_table): Wrap our addressbook table</div><div class='del'>-	adapter in an ETableWithout, so that we can make addresses appear</div><div class='del'>-	and disappear when we remove/add them to the section lists</div><div class='del'>-	(To/Cc/Bcc) on the right of the dialog.</div><div class='del'>-	(real_add_address_cb): When we add an address, hide it in the main</div><div class='del'>-	list.</div><div class='del'>-	(e_select_names_init): Get pointer to our without table from the</div><div class='del'>-	table's object data, and store it.</div><div class='del'>-	(remove_address): When we remove an address, show it in the main</div><div class='del'>-	list.</div><div class='del'>-	(card_key): Added.  Allocate a unique key from an ECard.</div><div class='del'>-	(esn_get_key_fn): Added.  Callback for ETableWithout.</div><div class='del'>-	(esn_dup_key_fn): Added.  Callback for ETableWithout.</div><div class='del'>-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.</div><div class='del'>-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed</div><div class='del'>-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS</div><div class='del'>-	type.  This allows the cards in the ESelectName dialog to</div><div class='del'>-	appear in proper sort order (i.e. as 'Doe, John' rather than</div><div class='del'>-	'John Doe').  Fixes ximian #6002.</div><div class='del'>-</div><div class='del'>-2001-08-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're</div><div class='del'>-	only passing 1 GTK_TYPE_POINTER arg, not 2.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for</div><div class='del'>-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For</div><div class='del'>-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,</div><div class='del'>-	and connect to the "drag_end" signal on our canvas so we'll know</div><div class='del'>-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the</div><div class='del'>-	grab if we were dragging and get the event.</div><div class='del'>-	(e_minicard_drag_end): new function, just remove the pointer/gtk</div><div class='del'>-	grabs and disconnect.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint</div><div class='del'>-	drag_button"</div><div class='del'>-</div><div class='del'>-2001-08-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const</div><div class='del'>-	</div><div class='del'>-2001-08-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_changes): null out card_sexp so that</div><div class='del'>-	we don't crash when copying</div><div class='del'>-</div><div class='del'>-2001-08-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: fix warnings, get compiling again</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h: remove c/p typos</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: link against the static camel</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for</div><div class='del'>-	toolbar. Used Delete icon in menu.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'</div><div class='del'>-	as it seems more appropriate. Also added delete icon for menu.</div><div class='del'>-</div><div class='del'>-2001-08-19  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Update the folder list to</div><div class='del'>-	include a display name and a description.</div><div class='del'>-</div><div class='del'>-2001-08-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search</div><div class='del'>-	icons.</div><div class='del'>-</div><div class='del'>-2001-08-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_folder_bar_label),</div><div class='del'>-	gui/widgets/e-addressbook-model.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h</div><div class='del'>-	(folder_bar_message): Set the folder bar message here.  Fixes</div><div class='del'>-	Ximian bug #4670.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use</div><div class='del'>-	strlen(SEPARATOR) here so that if the separator changes the length</div><div class='del'>-	will work properly.</div><div class='del'>-</div><div class='del'>-2001-08-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/fulladdr.glade: Added full country list.</div><div class='del'>-	Fixes Ximian bug #5123.</div><div class='del'>-</div><div class='del'>-2001-08-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Hook up `delete-message.png' as the</div><div class='del'>-	icon for "ContactDelete".</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c: Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: add prototype for</div><div class='del'>-	addressbook_get_other_contact_storage.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_get_other_contact_storage): rename register_storage</div><div class='del'>-	to this, and return the EvolutionStorage.</div><div class='del'>-	(load_source_data): register_storage =&gt;</div><div class='del'>-	addressbook_get_other_contact_storage.</div><div class='del'>-	(addressbook_storage_add_source): register_storage =&gt;</div><div class='del'>-	addressbook_get_other_contact_storage.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c</div><div class='del'>-	(set_entry_changed_signals): connect to the "changed" signal on</div><div class='del'>-	"entry-web" to update command state.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):</div><div class='del'>-	call e_card_set_id on the list's card so we can continue to use</div><div class='del'>-	this dialog.  also, call command_state_changed if we aren't</div><div class='del'>-	closing the dialog so the toolbar is properly sensitized.</div><div class='del'>-	(list_deleted_cb): always close the dialog after we successfully</div><div class='del'>-	delete a list.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call</div><div class='del'>-	e_card_set_id on the card so we can continue to use this dialog</div><div class='del'>-	(to modify or delete the card.)</div><div class='del'>-	(card_deleted_cb): always close the dialog after we successfully</div><div class='del'>-	delete a card.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed): call</div><div class='del'>-	e_sexp_encode_string on the search string the user types in so it</div><div class='del'>-	doesn't break sexp parsing in the wombat.</div><div class='del'>-</div><div class='del'>-2001-08-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: changed to new print icon.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: (struct</div><div class='del'>-	ESelectNamesFolder): rename physical_uri to uri, since it includes</div><div class='del'>-	the addressbook.db for file: uris.</div><div class='del'>-	(e_select_names_folder_free): physical_uri =&gt; uri.</div><div class='del'>-	(e_select_names_option_activated): physical_uri =&gt; uri, and we</div><div class='del'>-	don't need to strdup_printf "addressbook.db" onto the end anymore.</div><div class='del'>-	(new_folder): if the physical_uri is a file: uri, append</div><div class='del'>-	/addressbook.db onto it.</div><div class='del'>-	(hookup_listener): new function, split out lots of code from</div><div class='del'>-	e_select_names_hookup_shell_listener.</div><div class='del'>-	(e_select_names_hookup_shell_listeners): rename</div><div class='del'>-	e_select_names_hookup_shell_listener to this, and hookup both the</div><div class='del'>-	local and "Other Contacts" listener, using hookup_listener.</div><div class='del'>-	(e_select_names_destroy): disconnect from the</div><div class='del'>-	other_contacts_listener and unref it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h (struct</div><div class='del'>-	_ESelectNames): add a listener for Other Contacts, and rename</div><div class='del'>-	"listener" to "local_listener."</div><div class='del'>-</div><div class='del'>-2001-08-17  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_seq_complete_cb): If we get the</div><div class='del'>-	"sequence_complete" signal when we aren't searching, it means the</div><div class='del'>-	addressbook changed out from under us.  Clear the search cache, so</div><div class='del'>-	that future completion requests won't use the out-of-date cached</div><div class='del'>-	data.  Also, don't unref book_view... we leave the EBookView open</div><div class='del'>-	so that we can catch these addressbook changes.</div><div class='del'>-	(e_select_names_completion_do_query): Don't use the book_view</div><div class='del'>-	being non-NULL as a sign that another query is still running.</div><div class='del'>-	(e_select_names_completion_got_book_view_cb): Properly unref any</div><div class='del'>-	previous value in book_view.</div><div class='del'>-</div><div class='del'>-2001-08-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click),</div><div class='del'>-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the</div><div class='del'>-	messages here in the right click menus.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our</div><div class='del'>-	card_sexp.</div><div class='del'>-	(create_card_handler): make sure to set the id of the vcard so it</div><div class='del'>-	gets properly transmitted back to the BookView, and notify all</div><div class='del'>-	matching BookViews to add the created card.</div><div class='del'>-	(remove_card_handler): notify all matching BookViews to remove the</div><div class='del'>-	card.</div><div class='del'>-	(modify_card_handler): notify all matching BookViews to modify the</div><div class='del'>-	card.</div><div class='del'>-	(pas_backend_ldap_process_get_book_view): init card_sexp based on</div><div class='del'>-	the view's search.</div><div class='del'>-</div><div class='del'>-2001-08-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_book_view_copy): use card_sexp.</div><div class='del'>-	(pas_backend_file_book_view_free): same.</div><div class='del'>-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.</div><div class='del'>-	(pas_backend_file_search): use card_sexp.</div><div class='del'>-	(pas_backend_file_process_get_book_view): same.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (libpas_a_SOURCES): add</div><div class='del'>-	pas-backend-card-sexp.[ch].</div><div class='del'>-</div><div class='del'>-2001-08-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Added code</div><div class='del'>-	so the user can create a new contact or contact list from anywhere</div><div class='del'>-	in evolution.</div><div class='del'>-</div><div class='del'>-2001-08-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: Added a closing paren.</div><div class='del'>-</div><div class='del'>-2001-08-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_handle_request): Renamed from _begin to</div><div class='del'>-	match changes in gal 0.10.99.3.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): </div><div class='del'>-	Check that name != NULL before we start messing with it.</div><div class='del'>-	(Fixes bug #7329)</div><div class='del'>-</div><div class='del'>-2001-08-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_nickname): Boost scoring on an exact nickname match.</div><div class='del'>-	Manually addressify match.</div><div class='del'>-	(match_name): Manually addressify matches.</div><div class='del'>-	(book_query_score): Remove automatic addressification.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed): Minor</div><div class='del'>-	tweak to avoid a crash if we have a negative subid with id</div><div class='del'>-	ESB_CATEGORY.  This should never happen.</div><div class='del'>-	(addressbook_menu_activated): Reset the entry/option when we</div><div class='del'>-	select "Clear".</div><div class='del'>-	Some changes to reflect renaming in ESearchBar.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_set_property_fn): Cardify after importing destinations.</div><div class='del'>-	This might fix a problem that Damon is having.</div><div class='del'>- </div><div class='del'>-2001-08-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: set title of initial</div><div class='del'>-	dialog to Addressbook Sources (bug #6704).</div><div class='del'>-</div><div class='del'>-2001-08-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (create_ldap_folder): don't</div><div class='del'>-	let people add subdirs in the ldap server storage - everything is</div><div class='del'>-	toplevel there.</div><div class='del'>-</div><div class='del'>-2001-08-14  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_get_vcard): implement using</div><div class='del'>-	search_for_dn.</div><div class='del'>-</div><div class='del'>-2001-08-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	Tell the search bar to translate the subitem texts.</div><div class='del'>-</div><div class='del'>-2001-08-14  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	Add "Any Category" option for category searches.</div><div class='del'>-	(addressbook_query_changed): Do the right thing on an</div><div class='del'>-	"Any Category" search.</div><div class='del'>-</div><div class='del'>-2001-08-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Fix up to match the</div><div class='del'>-	pas_book_new/get_vcard changes.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:</div><div class='del'>-	Got rid of an extraneous _ here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):</div><div class='del'>-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,</div><div class='del'>-	forgot to write this function.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: Added focus targets</div><div class='del'>-	here.  Fixes part of Ximian bug #5843.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):</div><div class='del'>-	Grab focus here.  Fixes Ximian bug #2265.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control): </div><div class='del'>-	(addressbook_query_changed): Fixed two const warnings here.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c,</div><div class='del'>-	printing/e-contact-print-envelope.h: Fixed some missing includes</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2001-08-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view.c (add_book_iterator): Call</div><div class='del'>-	e_card_set_book here.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call</div><div class='del'>-	e_card_set_book here.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the</div><div class='del'>-	part where the uri is made part of the uid.  Made uri a separate</div><div class='del'>-	field.  Fixes Ximian bug #6490.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:</div><div class='del'>-	Change this to use ECard's split uids and uris.</div><div class='del'>-</div><div class='del'>-2001-08-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't</div><div class='del'>-	g_strdup the stuff we're passing into e_list_append, since it does</div><div class='del'>-	the copy for us.</div><div class='del'>-	(check_schema_support): don't initialize supported_fields list</div><div class='del'>-	here, since there's a gross case where the programmer/user can</div><div class='del'>-	bring up the contact editor before the connection stuff is</div><div class='del'>-	finished, and we don't want to crash.</div><div class='del'>-	(pas_backend_ldap_init): move it here to we can guarantee it's</div><div class='del'>-	there. (bug #6546).</div><div class='del'>-</div><div class='del'>-2001-08-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_source_dialog_set_source): don't access source-&gt;auth</div><div class='del'>-	if source == NULL (bug #7086).</div><div class='del'>-</div><div class='del'>-2001-08-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c,</div><div class='del'>-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,</div><div class='del'>-	backend/ebook/e-book.h, backend/idl/addressbook.idl,</div><div class='del'>-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,</div><div class='del'>-	backend/pas/pas-book.h: Changed get_card to be asyncronous.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed</div><div class='del'>-	these to deal with the new get_card functionality.</div><div class='del'>-</div><div class='del'>-2001-08-11  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Mark a string for translation.</div><div class='del'>-	* This fixes bug #7052</div><div class='del'>-	* printing/e-contact-print.h: Add headers to make it stand on itw own.</div><div class='del'>-	* printing/e-contact-print.c: Marked some strings for translation.</div><div class='del'>-	* printing/e-contact-print-envelope.c: Same here.</div><div class='del'>-	</div><div class='del'>-2001-08-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):</div><div class='del'>-	Remove single- or double-quotes from names before sticking them</div><div class='del'>-	into the addressbook. (Bug #6499)</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed):</div><div class='del'>-	Properly handle "Category is" queries by checking the search bar</div><div class='del'>-	suboption.</div><div class='del'>-	(addressbook_factory_new_control): Attach subitems corresponding</div><div class='del'>-	to all wombat categories to the "Category is" ESearchBarItem.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Set the ESearchBarItem</div><div class='del'>-	subitems explicitly to NULL.</div><div class='del'>-</div><div class='del'>-2001-08-10  Anna Marie Dirks &lt;anna@ximian.com&gt;</div><div class='del'>-	 * gui/component/select-names/select-names.glade: did a little</div><div class='del'>-	packing-magic to get the two tables at bottom of this dialog</div><div class='del'>-	to seem to line up. </div><div class='del'>-</div><div class='del'>-	*gui/component/select-names/e-select-names.c: changed the title</div><div class='del'>-	of this dialog to "Select Contacts from Addressbook". </div><div class='del'>-</div><div class='del'>-2001-08-09  Anna Marie Dirks &lt;anna@ximian.com&gt;</div><div class='del'>-        * gui/component/select-names/select-names.glade: redesigned</div><div class='del'>-        this dialog to fix bug #6815. </div><div class='del'>-</div><div class='del'>-	*gui/component/select-names/e-select-names.c: connected the</div><div class='del'>-	widgets (or one of them anyway. clahey did the rest) for my</div><div class='del'>-	new and lovely glade file.</div><div class='del'>-	</div><div class='del'>-2001-08-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: remove passwd_cb.</div><div class='del'>-</div><div class='del'>-2001-08-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	This change is dedicated to Jacob Berkman.</div><div class='del'>-	(e_select_names_text_model_insert_length): If the last character</div><div class='del'>-	we inserted was a "magic comma", remember its position.</div><div class='del'>-	(e_select_names_text_model_delete): If the last character we</div><div class='del'>-	inserted was a "magic comma", and if the next thing we do is to</div><div class='del'>-	hit backspace, delete both the comma and the extra whitespace we</div><div class='del'>-	added.</div><div class='del'>-	(e_select_names_text_model_init): Initialize our last magic comma</div><div class='del'>-	position.</div><div class='del'>-</div><div class='del'>-2001-08-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_create_entry): Hook up some magic to</div><div class='del'>-	(basically) cardify an entry on focus-out.  (What we do is actually</div><div class='del'>-	more complicated than that.)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_set_property_fn): After we set an entry's text, try to</div><div class='del'>-	cardify it.  We need to do this so that (for example) reply</div><div class='del'>-	e-mails get properly cardified.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_duplicate): Use e_select_names_model_append,</div><div class='del'>-	rather than manipulating lists directly.</div><div class='del'>-	(e_select_names_model_insert): Connect "changed" signal proxy for</div><div class='del'>-	added EDestination.</div><div class='del'>-	(e_select_names_model_append): Ditto.</div><div class='del'>-	(e_select_names_model_replace): Ditto, and disconnect signals for</div><div class='del'>-	replaced EDestination.</div><div class='del'>-	(e_select_names_model_delete): Ditto on the disconnection.</div><div class='del'>-	(e_select_names_model_delete_all): Ditto.</div><div class='del'>-	(e_select_names_model_cardify): Added.  Try to cardify a specified</div><div class='del'>-	EDestination.</div><div class='del'>-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending</div><div class='del'>-	cardification of a single EDestination.</div><div class='del'>-	(e_select_names_model_cardify_all): Added.  Cardify all of the</div><div class='del'>-	EDestinations in the model.</div><div class='del'>-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any</div><div class='del'>-	and all pending cardifications.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_class_init): Added</div><div class='del'>-	"changed" and "cardified" signals.</div><div class='del'>-	(e_destination_freeze): Added (static).</div><div class='del'>-	(e_destination_thaw): Added (static).</div><div class='del'>-	(e_destination_clear_card): Reset allow_cardify and</div><div class='del'>-	cannot_cardify, cancel any pending cardifications, and emit the</div><div class='del'>-	"changed" signal.</div><div class='del'>-	(e_destination_clear_strings): Emit the "changed" signal.</div><div class='del'>-	(e_destination_clear): Do freeze/thaw to prevent multiple signal</div><div class='del'>-	emissions.</div><div class='del'>-	(e_destination_set_card): Check that the card we are setting is</div><div class='del'>-	not equal to the current card, and emit the "changed" signal if we</div><div class='del'>-	are actually changing.</div><div class='del'>-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.</div><div class='del'>-	(e_destination_set_name): Emit "changed" signal, if necessary.</div><div class='del'>-	(e_destination_set_email): Emit "changed" signal, if necessary.</div><div class='del'>-	(e_destination_set_html_mail_pref): Emit "changed" signal, if</div><div class='del'>-	necessary.</div><div class='del'>-	(use_card_cb): If we've just loaded/set the ECard, emit the</div><div class='del'>-	"changed" signal.</div><div class='del'>-	(e_destination_set_raw): Emit "changed" signal, if necessary.</div><div class='del'>-	(e_destination_allow_cardification): Added.</div><div class='del'>-	(e_destination_set_allow_cardification): Added.</div><div class='del'>-	(e_destination_cardify): Added.  Tries to automatically convert</div><div class='del'>-	a string-based EDestination to one based on an ECard.</div><div class='del'>-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.</div><div class='del'>-	(e_destination_cancel_cardify): Added.  Cancels any pending</div><div class='del'>-	cardifications.</div><div class='del'>-	(e_destination_xml_decode): Added freeze/thaw.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A</div><div class='del'>-	canned simple query for nicknames.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given</div><div class='del'>-	a card and an string containing an email address, return the index</div><div class='del'>-	number of the address inside of the card, or -1 if the address is</div><div class='del'>-	not found.</div><div class='del'>-</div><div class='del'>-2001-08-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] </div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook.c (book_open_cb): create our own</div><div class='del'>-	dialog that prompts for both the email address and the password.</div><div class='del'>-	the email address is stored in the source and filled in for the</div><div class='del'>-	user after the first time they enter one and press OK.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (create_ldap_folder): has a</div><div class='del'>-	return value, not a int* parameter.</div><div class='del'>-	(create_ldap_folder): new function, we can create ldap servers</div><div class='del'>-	from the File-&gt;New-&gt;Folder menu item now.</div><div class='del'>-	(register_storage): hook up the "create_folder" signal.</div><div class='del'>-	(addressbook_storage_init_source_uri): remove the file case, we</div><div class='del'>-	only build ldap uris here.</div><div class='del'>-	(load_source_data): remove the file source stuff, and handle</div><div class='del'>-	"emailaddr".</div><div class='del'>-	(save_source_data): call ldap_source_foreach directly.</div><div class='del'>-	(addressbook_source_free): remove file source stuff.</div><div class='del'>-	(addressbook_source_copy): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: get rid of all the file</div><div class='del'>-	source stuff from AddressbookSource, since this is only being used</div><div class='del'>-	for ldap servers.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): look up the ldap</div><div class='del'>-	entry based on the provided email address and use the resulting</div><div class='del'>-	DN/passwd to authenticate.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c: pretty much gutted to make</div><div class='del'>-	it work with the new UI.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: new version from anna.</div><div class='del'>-	</div><div class='del'>-2001-08-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width</div><div class='del'>-	on all addressbook columns to 75.  Fixes Ximian bug #2773.</div><div class='del'>-</div><div class='del'>-2001-08-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark</div><div class='del'>-	the dialog as changed so the save button is immediately available.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once</div><div class='del'>-	we save reset the change flag to false if we aren't closing the</div><div class='del'>-	dialog.</div><div class='del'>-	(card_added_cb): same.</div><div class='del'>-	(e_contact_editor_class_init): add a "changed" arg.</div><div class='del'>-	(e_contact_editor_set_arg): add setter for "changed".</div><div class='del'>-	(e_contact_editor_get_arg): add getter for "changed".</div><div class='del'>-</div><div class='del'>-2001-08-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better</div><div class='del'>-	to assume that we can write to the local addressbook than that we</div><div class='del'>-	can't write to it :)</div><div class='del'>-</div><div class='del'>-2001-08-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):</div><div class='del'>-	call e_pixmap_update so we can use the same save/save-as pixmaps</div><div class='del'>-	as the contact editor.</div><div class='del'>-</div><div class='del'>-2001-08-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new</div><div class='del'>-	function, used by the context menu.</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top</div><div class='del'>-	of the menu.  also, disable "Delete" if the addressbook isn't</div><div class='del'>-	writable.</div><div class='del'>-</div><div class='del'>-2001-08-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,</div><div class='del'>-	and ), as per rfc2254.</div><div class='del'>-	(func_contains): escape the string.</div><div class='del'>-	(func_is): same.</div><div class='del'>-	(func_beginswith): same.</div><div class='del'>-	(func_endswith): same.</div><div class='del'>-</div><div class='del'>-2001-08-08  Nat Friedman  &lt;nat@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out</div><div class='del'>-	since Envelope printing is disabled for 1.0.	</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(e_addressbook_reflow_adapter_right_click): Removed "Print</div><div class='del'>-	Envelope" menu item.</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef</div><div class='del'>-	this HAVE_LDAP.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): set the title of the window to</div><div class='del'>-	"Advanced Search".</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (search_cb): pass view-&gt;view instead</div><div class='del'>-	of the EBook.</div><div class='del'>-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.</div><div class='del'>-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.</div><div class='del'>-	(addressbook_search_option_items): add "Advanced..." here.</div><div class='del'>-	(addressbook_query_changed): add special handling for Advanced...</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.h (struct</div><div class='del'>-	_EAddressbookSearchDialog): add EAddressbookView and remove the</div><div class='del'>-	model/adapter fields.  Also fix prototype of</div><div class='del'>-	e_addressbook_search_dialog_new.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_class_init): get rid of</div><div class='del'>-	set_arg/get_arg.</div><div class='del'>-	(button_press): set the query on the EAddressbookView, and always</div><div class='del'>-	close the dialog.</div><div class='del'>-	(e_addressbook_search_dialog_init): get rid of the minicard view,</div><div class='del'>-	and pack the other widgets accordingly.</div><div class='del'>-	(e_addressbook_search_dialog_new): pass EAddressbookView instead</div><div class='del'>-	of EBook.</div><div class='del'>-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes bug #5066 ]</div><div class='del'>-	* gui/component/addressbook-storage.c (remove_ldap_folder): new</div><div class='del'>-	function, remove the source.</div><div class='del'>-	(register_storage): connect to the "remove_folder" signal so we</div><div class='del'>-	know when to remove the folder.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use</div><div class='del'>-	g_strcasecmp since ldap attribute names are not case sensitive.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(table_drag_data_received_cb): make sure we update the changed</div><div class='del'>-	state if a successful drop happens.</div><div class='del'>-</div><div class='del'>-2001-08-07  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_init): Make the OK button the keyboard default</div><div class='del'>-	instead of Cancel.  Bug #4942.</div><div class='del'>-</div><div class='del'>-2001-08-06  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor</div><div class='del'>-	(e_book_unqueue_op): use e_book_op_free</div><div class='del'>-	(e_book_do_response_create_card): ditto</div><div class='del'>-	(e_book_do_response_generic): ditto</div><div class='del'>-	(e_book_do_response_get_cursor): ditto</div><div class='del'>-	(e_book_do_response_get_view): ditto</div><div class='del'>-	(e_book_do_response_get_changes): ditto</div><div class='del'>-	(e_book_do_response_open): ditto</div><div class='del'>-	(e_book_do_response_get_supported_fields): ditto</div><div class='del'>-</div><div class='del'>-2001-08-05  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_response_get_view): set</div><div class='del'>-	op-&gt;listener to NULL to catch possible use of freed op</div><div class='del'>-	(e_book_do_response_get_changes): ditto</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	   (e_book_view_listener_check_queue): this callback could be (and</div><div class='del'>-	   indeed is) called from signal emited above, </div><div class='del'>-	   signal handler could call e_book_view_listener_stop, so we need to check</div><div class='del'>-	   if idle is still set and if not we don't want to unref again</div><div class='del'>-</div><div class='del'>-2001-08-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so</div><div class='del'>-	that if there's one less match than possible compares are</div><div class='del'>-	considered more VAGUE.  Fixes Ximian bug #3400.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_hookup_shell_listener): Check for storage != NULL</div><div class='del'>-	here.  This shouldn't come up unless addressbook has crashed</div><div class='del'>-	previously within this session of evolution, but this is just a</div><div class='del'>-	bit of insurance.  Fixes Ximian bug #3699.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the</div><div class='del'>-	criteria of whether the first part of each iteration matched or</div><div class='del'>-	the second one did.  Before it got it wrong sometimes and caused</div><div class='del'>-	the pointer to jump off the end of the array.  Fixes Ximian bug</div><div class='del'>-	#4674.</div><div class='del'>-</div><div class='del'>-2001-08-03  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (load_source_data): Update</div><div class='del'>-	for EvolutionStorage API changes.</div><div class='del'>-	(addressbook_storage_add_source): Ditto.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this</div><div class='del'>-	change the query based on which letter is clicked.  Fixes Ximian</div><div class='del'>-	bug #2202.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	Fixed warnings here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(hash_cleanup_fn): Removed this unused function.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,</div><div class='del'>-	fill_in_info): Made the list of E_CARD_PHONE types in</div><div class='del'>-	phone_correspondences more complete by adding the new 5</div><div class='del'>-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some</div><div class='del'>-	types (E_CARD_PHONE_HOME will actually match</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card</div><div class='del'>-	and fill_in_info search for an exact match in the list of</div><div class='del'>-	phone_correspondences and then look for a partial match.  Got rid</div><div class='del'>-	of not going forward when doing a remove from an EList since EList</div><div class='del'>-	handles this case automatically.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for</div><div class='del'>-	assistant, callback, radio, telex, and ttytdd.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):</div><div class='del'>-	Handle the new E_CARD_PHONE types.</div><div class='del'>-</div><div class='del'>-2001-08-02  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am (ecpsdir): Add camel dependency.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Add camel dependency.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Add camel dependency.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Properly init camel.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_clear_strings):</div><div class='del'>-	Clear -&gt;raw.</div><div class='del'>-	(e_destination_is_empty): We aren't empty if -&gt;raw is set..</div><div class='del'>-	(e_destination_set_raw): Replaces e_destination_set_string.</div><div class='del'>-	(e_destination_get_name): Use camel's parser to extract the name</div><div class='del'>-	from -&gt;raw.</div><div class='del'>-	(e_destination_get_email): Use camel's parser to extract the email</div><div class='del'>-	address from -&gt;raw.</div><div class='del'>-	(e_destination_get_address): Use camel to produce properly quoted,</div><div class='del'>-	RFC-compliant addresses.  Thanks camel! (Bug #5860)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(emailify_match): Always append an e-mail address, as long as it</div><div class='del'>-	doesn't have one already at it's beginning or end.  Don't limit</div><div class='del'>-	self to just emailifying entries tied to cards with multiple</div><div class='del'>-	addresses.  (I didn't really want to do this, but people seem to</div><div class='del'>-	like keeping multiple cards for the same person, and other</div><div class='del'>-	solutions (like scanning all matches for duplicate names, and only</div><div class='del'>-	emailifying those) just seemed like way too much work for such a</div><div class='del'>-	limited payoff.)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c:</div><div class='del'>-	s/e_destination_set_string/e_destination_set_raw/.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"</div><div class='del'>-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug</div><div class='del'>-	#5558)</div><div class='del'>-	(popup_menu_nocard): Ditto.</div><div class='del'>-</div><div class='del'>-2001-08-02  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	Removed some extra padding and pack the addressbook view into a</div><div class='del'>-	frame with inward shadowing, just because it looks prettier.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,</div><div class='del'>-	Save As, and Print icons for the menus and toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,</div><div class='del'>-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,</div><div class='del'>-	e_addressbook_view_send, e_addressbook_view_send_to): New</div><div class='del'>-	functions to allow outside users to cause the addressbook to save,</div><div class='del'>-	send, or send a message to its selection.</div><div class='del'>-</div><div class='del'>-2001-08-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/.cvsignore: Removed this file from this unused</div><div class='del'>-	directory.</div><div class='del'>-</div><div class='del'>-2001-08-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/Makefile.am: Added file-exists.glade.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-save-as.c (file_exists),</div><div class='del'>-	gui/contact-editor/file-exists.glade: Added a dialog to ask the</div><div class='del'>-	user whether to replace an already existing file.  Mostly from a</div><div class='del'>-	patch by Jos Dehaes.  Fixes Ximian bug #2231.</div><div class='del'>-</div><div class='del'>-2001-08-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_check_queue): Removed thrash checking code</div><div class='del'>-	here since thrashing shouldn't happen now that we've cleaned this</div><div class='del'>-	up some.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly</div><div class='del'>-	handle cases where construction fails.</div><div class='del'>-</div><div class='del'>-2001-07-30  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-vcard-importer.c: Added #include</div><div class='del'>-	&lt;e-util/e-path.h&gt;.</div><div class='del'>-</div><div class='del'>-2001-07-23  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_source_dialog):</div><div class='del'>-	Convert translated string to UTF8 before calling put_html.</div><div class='del'>-</div><div class='del'>-2001-07-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_do_query): Properly handle the case</div><div class='del'>-	where our "cleaned" completion is the empty string.  This happens,</div><div class='del'>-	for example, if the query text is the string "\"".  (Bug #5610).</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_address_textv):</div><div class='del'>-	Reassure fejj that I'm not doing something stupid here.</div><div class='del'>-	(e_destination_get_address): Fix address quoting.  This is a</div><div class='del'>-	stop-gap measure until I can change this code to use Camel's</div><div class='del'>-	superior address-handling routines.  (Also Bug #5610)</div><div class='del'>-</div><div class='del'>-2001-07-30  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (load_source_data): Fix a</div><div class='del'>-	return value bug, to make it so if it fails to load an</div><div class='del'>-	addressbook-sources.xml file (either a parse error or it doesn't</div><div class='del'>-	exist for example), it deregisters the storage.</div><div class='del'>-	(register_storage): Don't make a storage for users who don't have</div><div class='del'>-	LDAP support built in.  Bug #1950.</div><div class='del'>-</div><div class='del'>-2001-07-30  Frederic Crozat  &lt;fcrozat@mandrakesoft.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-factory.c: Fix crashes</div><div class='del'>-	when gtkhtml is compiled with gconf support</div><div class='del'>-</div><div class='del'>-2001-07-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Tidy ldadds</div><div class='del'>-</div><div class='del'>-2001-07-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a</div><div class='del'>-	small, stupid mistake; use e_select_names_model_get_textification</div><div class='del'>-	for the getter for "text".</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Removed some debugging chatter.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_create_entry): Store the completion</div><div class='del'>-	handler in the entry's object data.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Added support for getting "destinations"</div><div class='del'>-	and "allow_contact_lists" properties.</div><div class='del'>-	(entry_set_property_fn): Added support for setting "destinations"</div><div class='del'>-	and "allow_contact_lists" properties.</div><div class='del'>-	(impl_SelectNames_get_entry_for_section): Added definitions for</div><div class='del'>-	"destinations" and "allow_contact_lists" properties.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_get_match_contact_lists): Added.</div><div class='del'>-	(e_select_names_completion_set_match_contact_lists): Added.</div><div class='del'>-	Controls whether contact lists are offered as options during</div><div class='del'>-	completion.</div><div class='del'>-	(book_query_process_card_list): Check if match_contact_lists</div><div class='del'>-	is set before (duh!) matching on a contact list.</div><div class='del'>-	(e_select_names_completion_init): Set match_contact_lists</div><div class='del'>-	to TRUE by default.</div><div class='del'>-</div><div class='del'>-2001-07-25  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_contains): change the way</div><div class='del'>-	x-evolution-any-field is converted to an ldap query.  it used to</div><div class='del'>-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).</div><div class='del'>-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more</div><div class='del'>-	efficient (both in the building, and on the server side no doubt).</div><div class='del'>-</div><div class='del'>-2001-07-25  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup</div><div class='del'>-	the results of e_destination_get_email.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(e_select_names_popup): Check that our destination isn't empty</div><div class='del'>-	before building our popup. (Bug #5250)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_empty): Made</div><div class='del'>-	argument const.</div><div class='del'>-</div><div class='del'>-2001-07-24  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c: Added checks</div><div class='del'>-	for all of the args of the exposed functions, so that</div><div class='del'>-	we won't crash on bad inputs.  (Related to bug #4856.)</div><div class='del'>-</div><div class='del'>-2001-07-24  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to</div><div class='del'>-	"Add Anyway".</div><div class='del'>-</div><div class='del'>-2001-07-24  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_name): Added</div><div class='del'>-	fallbacks for the name in the case of an e-card, to avoid the</div><div class='del'>-	"nameless contact" bug.</div><div class='del'>-</div><div class='del'>-2001-07-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic</div><div class='del'>-	here too for when we modify an already shown card.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c: make</div><div class='del'>-	parent_class static, just to be anal.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(remove_entry_cb): removing entries changes the list, so flag it.</div><div class='del'>-	(table_drag_data_received_cb): restrict cards we add to lists to</div><div class='del'>-	be non-list cards.</div><div class='del'>-	(extract_info): clear out the email list in the card before we</div><div class='del'>-	repopulate it from the contact list model.</div><div class='del'>-	(fill_in_info): set the checkbox to active/inactive based on</div><div class='del'>-	thecard.</div><div class='del'>-</div><div class='del'>-2001-07-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call</div><div class='del'>-	widget_changed.</div><div class='del'>-	(phone_entry_changed): same.</div><div class='del'>-	(email_entry_changed): same.</div><div class='del'>-	(address_text_changed): same.</div><div class='del'>-	(name_entry_changed): same.</div><div class='del'>-	(company_entry_changed): same.</div><div class='del'>-	(widget_changed): new function that we can either call or set as a</div><div class='del'>-	signal to change the "changed" flag on the dialog.</div><div class='del'>-	(set_entry_changed_signals): connect lots of "changed" signals on</div><div class='del'>-	widgets to widget_changed.</div><div class='del'>-	(add_lists): connect "changed" to widget_changed.</div><div class='del'>-</div><div class='del'>-2001-07-24  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_hookup_shell_listener): Check if</div><div class='del'>-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,</div><div class='del'>-	which it should never do.  If it does, print a warning in a dialog</div><div class='del'>-	and try to recover w/o crashing.  (Bug #5193)</div><div class='del'>-</div><div class='del'>-2001-07-24  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't</div><div class='del'>-	stop the idle_queue and unref from here, since this might be</div><div class='del'>-	called from inside e_book_listener_check_queue, and we don't want</div><div class='del'>-	to return to that function with the listener having been</div><div class='del'>-	destroyed.</div><div class='del'>-	(e_book_listener_check_queue): Don't exit early if the queue is</div><div class='del'>-	stopped. Proceed through the check if the queue is NULL (which is</div><div class='del'>-	must be if the queue is stopped), and then reach the existing code</div><div class='del'>-	to remove the idle handler. Combined with the above, this fixes</div><div class='del'>-	ximian #4485 (again). This is not a plot to boost my</div><div class='del'>-	showstopper-bugfixing count by fixing the same bug over and over</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2001-07-23  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Re-fix for my 07-18 not-quite-fix.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like</div><div class='del'>-	EBookViewListener.</div><div class='del'>-	(e_book_listener_check_queue): Don't emit signals if the listener</div><div class='del'>-	is stopped.</div><div class='del'>-	(e_book_listener_queue_generic_response, etc): Don't queue</div><div class='del'>-	responses if the listener is stopped.</div><div class='del'>-	(e_book_listener_stop): Flush the queue and stop queue/emitting</div><div class='del'>-	further responses.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous</div><div class='del'>-	change and call e_book_listener_stop() instead.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_stop): When removing an idle handler, unref</div><div class='del'>-	the listener as well, since e_book_view_listener_queue_response</div><div class='del'>-	will have ref'ed it.</div><div class='del'>-</div><div class='del'>-2001-07-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (remove_folder): Add a</div><div class='del'>-	@type arg.  If the type is not "contacts", report an</div><div class='del'>-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove</div><div class='del'>-	`g_print()' debugging messages.</div><div class='del'>-	(xfer_folder): Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Make the "contacts"</div><div class='del'>-	folders user-creatable by setting `user_creatable' to %TRUE in the</div><div class='del'>-	`EvolutionShellComponentFolderType's.</div><div class='del'>-</div><div class='del'>-2001-07-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ patch contributed by Jos Dehaes &lt;jos.dehaes@bigfoot.com&gt; ]</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook-storage.c (register_storage): new</div><div class='del'>-	function, register our evolution_storage.</div><div class='del'>-	(addressbook_storage_setup): remove storage registration from</div><div class='del'>-	here.</div><div class='del'>-	(load_source_data): register the storage here before we load</div><div class='del'>-	addressbook-sources.xml, and deregister it if there are no sources</div><div class='del'>-	listed.</div><div class='del'>-	(addressbook_storage_remove_source): unregister the storage if the</div><div class='del'>-	list of sources hits 0 length.</div><div class='del'>-</div><div class='del'>-2001-07-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's</div><div class='del'>-	queue before unreffing it to ensure that it doesn't emit any more</div><div class='del'>-	"responses_queued" signals after the EBook is destroyed.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,</div><div class='del'>-	e_book_listener_queue_response, e_book_listener_new): Use</div><div class='del'>-	bonobo_object_ref/unref rather than gtk_object_ref/unref.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_queue_response, e_book_view_listener_new):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-18  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list</div><div class='del'>-	of cards that match our query using the avoid list here, instead</div><div class='del'>-	of using the avoid list in the query itself, since ldap can't</div><div class='del'>-	handle that.</div><div class='del'>-	(use_common_book_cb): remove the block of code including the avoid</div><div class='del'>-	list in the query sent to wombat.</div><div class='del'>-</div><div class='del'>-2001-07-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"</div><div class='del'>-	        and  #4554 - general ldap search crash ]</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_contains): the length of</div><div class='del'>-	the big query string needs to take into account the length of the</div><div class='del'>-	footer as well as the header - fix random memory corruption here.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):</div><div class='del'>-	list can be NULL, specifically if there's a parsing error in the</div><div class='del'>-	sexp, so deal with it.</div><div class='del'>-</div><div class='del'>-2001-07-17  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_queue_response): Hold a reference to our</div><div class='del'>-	listener while the idle function is active.</div><div class='del'>-	(e_book_view_listener_check_queue): Only unref the listener when</div><div class='del'>-	the idle function is finished.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_clicked): Instead of replacing section-&gt;model with</div><div class='del'>-	source, copy source onto section-&gt;model with</div><div class='del'>-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the</div><div class='del'>-	stuff related to ETextModels, because it doesn't make any sense to</div><div class='del'>-	me, and everything appears to work without it.</div><div class='del'>-	(Die bug #2059.  Die! Die! Die!)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_overwrite_copy): Added.  Copies the contents</div><div class='del'>-	of one ESelectNamesModel onto another.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument</div><div class='del'>-	const.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_set_string): Removed</div><div class='del'>-	old, broken code and annoying g_messages.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_response): Hold a reference to the listener</div><div class='del'>-	while the idle function is active.</div><div class='del'>-	(e_book_listener_check_queue): Only release our reference to the</div><div class='del'>-	listener when the queue is empty.  These two changes fix a race</div><div class='del'>-	condition, since the listener could be unrefed while the listener</div><div class='del'>-	was still active. (Seems to fix bug #4485)</div><div class='del'>-</div><div class='del'>-2001-07-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade,</div><div class='del'>-	gui/merging/e-card-duplicate-detected.glade,</div><div class='del'>-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,</div><div class='del'>-	printing/e-contact-print.glade: Patch from Taylor Hayward</div><div class='del'>-	&lt;thayward@gjpc.com&gt;.  Added accelerators to a few dialogs.</div><div class='del'>-</div><div class='del'>-2001-07-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:</div><div class='del'>-	Added addSectionWithLimit to the SelectNames interface.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_SelectNames_add_section_with_limit): Added.  Implements</div><div class='del'>-	addSectionWithLimit.</div><div class='del'>-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.</div><div class='del'>-	(init): Listen for "changed" signals from our manager.</div><div class='del'>-	(manager_changed_cb): Notify our listeners if we get a changed</div><div class='del'>-	signal from our manager.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_class_init): Added a "changed" signal".</div><div class='del'>-	(section_copy): Propogate the signal connection.</div><div class='del'>-	(section_free): Disconnect the changed handler.</div><div class='del'>-	(e_select_names_manager_add_section_with_limit): Connect to the</div><div class='del'>-	new section's model, listening for changes.</div><div class='del'>-	(e_select_names_manager_activate_dialog): Connect to the "working</div><div class='del'>-	copy" model, listening for changes.</div><div class='del'>-	(e_select_names_manager_add_section_with_limit): Added.</div><div class='del'>-	(e_select_names_manager_add_section): Changed to just be a special</div><div class='del'>-	case of e_select_names_manager_add_section_with_limit.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_set_limit): Added.  Allows a max number of</div><div class='del'>-	names allowed in the model.</div><div class='del'>-	(e_select_names_model_get_limit): Added.  Returns the limit.</div><div class='del'>-	(e_select_names_model_at_limit): Added.  Returns TRUE if the</div><div class='del'>-	model is "full".</div><div class='del'>-	(e_select_names_model_insert): Check that we aren't at the</div><div class='del'>-	limit before inserting.  Silently return if we are.</div><div class='del'>-	(e_select_names_model_append): Check that we aren't at the</div><div class='del'>-	limit before appending.  Silently return if we are.</div><div class='del'>-</div><div class='del'>-2001-07-16  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_dialog_apply):</div><div class='del'>-	call addressbook_storage_write_sources here after we're done</div><div class='del'>-	rebuilding them.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_storage_clear_sources): don't write the source file</div><div class='del'>-	here.</div><div class='del'>-	(addressbook_storage_add_source): same.</div><div class='del'>-	(addressbook_storage_remove_source): same.</div><div class='del'>-	(addressbook_storage_write_sources): new function, write the</div><div class='del'>-	source file out.</div><div class='del'>-	(addressbook_source_copy): g_strdup the binddn so we don't end up</div><div class='del'>-	free'ing it multiple times thanks to copies freeing theirs.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: add prototype for</div><div class='del'>-	address_storage_write_sources.</div><div class='del'>-</div><div class='del'>-2001-07-16  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just </div><div class='del'>-	use the default directory. Use the directory that is passed into the</div><div class='del'>-	load file function.</div><div class='del'>-</div><div class='del'>-2001-07-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_set_string):</div><div class='del'>-	Commented out some unused variables and labels.</div><div class='del'>-	(e_destination_importv): Check for the xml not parsing correctly</div><div class='del'>-	and just return NULL here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_import_destinationv): Handle a NULL destv</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2001-07-15  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a</div><div class='del'>-	call to e_table_view_to_model_row here.</div><div class='del'>-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,</div><div class='del'>-	e_addressbook_view_can_copy): If the selection model is NULL here,</div><div class='del'>-	return NULL (this was done before in a g_return_val_if_fail which</div><div class='del'>-	is only conditionally included.)</div><div class='del'>-</div><div class='del'>-2001-07-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: Changed Company to</div><div class='del'>-	Organization here.</div><div class='del'>-</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: add ldap cflags</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_xml_decode):</div><div class='del'>-	Oops. I introduced my own bug, accidently set `email' to a</div><div class='del'>-	g_free'd pointer - eek!</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_importv): Optimized</div><div class='del'>-	the same way I optimized g_strsplit. If you use a GPtrArray</div><div class='del'>-	instead of a linked list, you save yourself from having to iterate</div><div class='del'>-	through the list an extra 3 times.</div><div class='del'>-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!</div><div class='del'>-	e_utf8_xml1_decode something which is already in UTF-8 or you'll</div><div class='del'>-	corrupt it!! I smack thee who hath done this evil deed!</div><div class='del'>-</div><div class='del'>-2001-07-12  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):</div><div class='del'>-	Check for no extension. Actually same as Jason's fix below :) but</div><div class='del'>-	also check the file contents.</div><div class='del'>-</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: add accelerators,</div><div class='del'>-	taylor's patch</div><div class='del'>-</div><div class='del'>-2001-07-12  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):</div><div class='del'>-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.</div><div class='del'>-</div><div class='del'>-2001-07-11  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (remove_cb): Added</div><div class='del'>-	some comments for clarity and fixed a pretty noticable bug with</div><div class='del'>-	how right click "Remove" was deleting more than it should with</div><div class='del'>-	consecutive runs.</div><div class='del'>-</div><div class='del'>-2001-07-10  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: assign OID's to the schema</div><div class='del'>-	entries, and add schema support for contact lists.</div><div class='del'>-</div><div class='del'>-2001-07-10  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set</div><div class='del'>-	bf-&gt;priv-&gt;file_db before calling do_create.</div><div class='del'>-</div><div class='del'>-2001-07-06  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Fixed order</div><div class='del'>-	of arguments to evolution_shell_component_new.</div><div class='del'>-</div><div class='del'>-2001-07-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Check that str isn't</div><div class='del'>-	the empty string before doing an insert.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_set_string): We were</div><div class='del'>-	being too smart for our own good here, and causing problems for</div><div class='del'>-	the completion code... (bug #4253, bug #4255, bug #4280)</div><div class='del'>-	(e_destination_set_name): Clear any cached address.</div><div class='del'>-	(e_destination_set_email): Clear any cached address.</div><div class='del'>-	(e_destination_get_address): Handle the cases where the name</div><div class='del'>-	contains some e-mail information.</div><div class='del'>-</div><div class='del'>-2001-07-09  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a</div><div class='del'>-	string for translation. Also add the neccesary includes to make</div><div class='del'>-	_() macros work.</div><div class='del'>-	</div><div class='del'>-2001-07-07  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (add_field): Detect the embedded</div><div class='del'>-	EDestination XML, and convert it to a nice-looking e-mail address.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to</div><div class='del'>-	reflect changes to EContactListModel.  (Yeah, this is vague,</div><div class='del'>-	but the changes are _really_ obvious and boring.)</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c: Revamped</div><div class='del'>-	to make everything an EDestination, rather than storing either</div><div class='del'>-	cards or strings.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Use</div><div class='del'>-	e_destination_get_textrep.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c</div><div class='del'>-	(fill_in_info): Use e_destination_get_name and</div><div class='del'>-	e_destination_get_email.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(popup_menu_card): Use e_destination_get_name instead of</div><div class='del'>-	e_card_name_to_string.</div><div class='del'>-	(quick_add_cb): Use e_destination_get_address.</div><div class='del'>-	(popup_menu_nocard): Use e_destination_get_name.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_changed): Removed obsolete debugging code.</div><div class='del'>-	(e_select_names_model_get_textification): Use e_destination_get_textrep.</div><div class='del'>-	(e_select_names_model_get_address_text): Use e_destination_get_address.</div><div class='del'>-	(e_select_names_model_get_string): Use e_destination_get_textrep.</div><div class='del'>-	(e_select_names_model_replace): Use e_destination_get_textrep.</div><div class='del'>-	(e_select_names_model_name_pos): Use e_destination_get_textrep.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(emailify_match): Match only if this isn't a contact list.</div><div class='del'>-	(match_email): Match only if this isn't a contact list.</div><div class='del'>-	(match_name): Do the right thing in the case of a contact list.</div><div class='del'>-	(book_query_process_card_list): Don't construct a match for</div><div class='del'>-	each possible e-mail address if this is a contact list.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c: Major-league de-crufting and</div><div class='del'>-	rationalization, combined with lots of hacks to make things work</div><div class='del'>-	properly with contact lists.</div><div class='del'>-	(e_destination_copy): Copy contact list info.</div><div class='del'>-	(e_destination_clear_card): Clear contact list info.</div><div class='del'>-	(e_destination_is_empty): If we contain a contact list, we aren't</div><div class='del'>-	empty.</div><div class='del'>-	(e_destination_set_card_uri): Added.  Allows us to set a</div><div class='del'>-	destination by card URI.</div><div class='del'>-	(e_destination_set_name): Allows the contact's name only ("Jane</div><div class='del'>-	Smith") to be set.</div><div class='del'>-	(e_destination_set_email): Allows the contact's e-mail only</div><div class='del'>-	("jane@assbarn.com") to be set.</div><div class='del'>-	(e_destination_set_string): Takes a free-form string containing a</div><div class='del'>-	contact's name and/or e-mail, and tries to do the right thing with</div><div class='del'>-	it.</div><div class='del'>-	(e_destination_contains_card): Renamed.  Used to be</div><div class='del'>-	e_destination_has_card.</div><div class='del'>-	(e_destination_from_card): Added.  Returns TRUE if the</div><div class='del'>-	EDestination comes from either a ECard (which we presently hold)</div><div class='del'>-	or is specified by an ECard URI.</div><div class='del'>-	(e_destination_use_card): Allows an EDestination's ECard to be</div><div class='del'>-	accessed, via a callback.  If we only are holding the URI, the</div><div class='del'>-	card will be loaded and stored in the EDestination.</div><div class='del'>-	(e_destination_get_name): Returns the name only ("Jane Smith"), or</div><div class='del'>-	NULL.</div><div class='del'>-	(e_destination_get_email): Returns the email only</div><div class='del'>-	("jane@assbarn.com"), or NULL.</div><div class='del'>-	(e_destination_get_address): Added.  Returns a "full address" if</div><div class='del'>-	both the name &amp; e-mail are available ("Jane Smith</div><div class='del'>-	&lt;jane@assbarn.com&gt;"), or just the e-mail if the name is unknown</div><div class='del'>-	("jane@assbarn.com&gt;").  If the destination is a contact list,</div><div class='del'>-	returns a comma-separated list of addresses.</div><div class='del'>-	(e_destination_get_textrep): Added.  Returns a "text</div><div class='del'>-	representation" of the EDestination.  This is what is now</div><div class='del'>-	displayed for completed, "cardified" destinations in addressbook</div><div class='del'>-	entries.</div><div class='del'>-	(e_destination_is_evolution_list): Check to see if this</div><div class='del'>-	destination is for a contact list.</div><div class='del'>-	(e_destination_xml_encode): Added.  Build an XML data structure</div><div class='del'>-	representing an EDestination.</div><div class='del'>-	(e_destination_xml_decode): Added.  Parse an XML data structure,</div><div class='del'>-	constructing an EDestination.</div><div class='del'>-	(e_destination_export): Added.  Returns a null-terminated string</div><div class='del'>-	containing an XML representation of the EDestination, with</div><div class='del'>-	newlines and excess whitespace removed.</div><div class='del'>-	(e_destination_import): Added.  Parses a string containing an XML</div><div class='del'>-	representation of an EDestination.</div><div class='del'>-	(e_destination_exportv): Added.  Returns a null-terminated string</div><div class='del'>-	containing an XML representation of a collection of EDestinations,</div><div class='del'>-	with newlines and excess whitespace removed.</div><div class='del'>-	(e_destination_importv): Added.  Takes an XML representation of a</div><div class='del'>-	collection of destinations, parses it, and returns a vector of</div><div class='del'>-	EDestinations.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_duplicate): Copy the -&gt;book</div><div class='del'>-	pointer.</div><div class='del'>-	(e_card_get_id): Check that the argument is valid.</div><div class='del'>-	(e_card_set_id): Check that the argument is valid.</div><div class='del'>-	(e_card_get_book): Added.  Return the EBook the ECard came from.</div><div class='del'>-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,</div><div class='del'>-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL</div><div class='del'>-	if the EBook URI or the ID are unknown/not set.</div><div class='del'>-	(e_card_get_vobject): If we have the URI, use it as the</div><div class='del'>-	VCUniqueStringProp, rather than just the ID.  This is a hack to</div><div class='del'>-	make DnD work properly.</div><div class='del'>-	(parse_id): Detect if the unique ID we've been passed is a URI or</div><div class='del'>-	just a plain card ID, and do the right thing in either case.</div><div class='del'>-	(e_card_uri_extract_book_uri): Added.  Convenience function for</div><div class='del'>-	parsing card URIs.</div><div class='del'>-	(e_card_uri_extract_card_id): Added.  Convenience function for</div><div class='del'>-	parsing card URIs.</div><div class='del'>-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its</div><div class='del'>-	URI.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view.c: Added a EBook * to the</div><div class='del'>-	_EBookViewPrivate struct.  This is meant to contain the EBook the</div><div class='del'>-	EBookView is associated with.</div><div class='del'>-	(add_book_iterator): Added.  A convenience function for attaching</div><div class='del'>-	the EBook to a GList of cards (if no EBook is already stored).</div><div class='del'>-	(e_book_view_do_added_event): Record the EBook in the added</div><div class='del'>-	ECards.</div><div class='del'>-	(e_book_view_do_modified_event): Record the EBook in the modified</div><div class='del'>-	ECards.</div><div class='del'>-	(e_book_view_set_book): Added.  Stores a pointer to the</div><div class='del'>-	EBookView's "parent" EBook.</div><div class='del'>-	(e_book_view_init): Init book_view-&gt;priv-&gt;book to NULL.</div><div class='del'>-	(e_book_view_destroy): Unref book_view-&gt;priv-&gt;book.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.</div><div class='del'>-	(e_book_unqueue_op): Removed debugging spew.</div><div class='del'>-	(e_book_do_response_get_view): Attach the current EBook to the</div><div class='del'>-	created EBookView.</div><div class='del'>-	(e_book_do_response_get_changes): Attach the current EBook to the</div><div class='del'>-	created EBookView.</div><div class='del'>-	(e_book_load_uri): Save a copy of the uri in the EBook.</div><div class='del'>-	(e_book_get_uri): Added.  Just returns book-&gt;priv-&gt;uri.</div><div class='del'>-	(e_book_get_card): Attach a pointer to the Ebook to the</div><div class='del'>-	newly-loaded ECard.</div><div class='del'>-	(e_book_add_card): Attach a pointer to the EBook to the</div><div class='del'>-	newly-added ECard.</div><div class='del'>-	(e_book_commit_card): Attach a pointer to the EBook to the</div><div class='del'>-	committed ECard.</div><div class='del'>-	(e_book_init): Initialize the uri to NULL.</div><div class='del'>-	(e_book_destroy): Free the uri string on destruction.</div><div class='del'>-</div><div class='del'>-2001-07-06  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (populate_context_menu):</div><div class='del'>-	Removed.  [It was just bogus testing code for the right-click menu</div><div class='del'>-	populating interface in the shell].</div><div class='del'>-	(factory_fn): Pass NULL as the PopulateContextMenuFn.</div><div class='del'>-</div><div class='del'>-2001-07-05  Anna Marie Dirks  &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/contact-list-editor.glade: </div><div class='del'>-	Added some accelerators, padding, and a "memebers" frame;</div><div class='del'>-	also fixed spacing and growth behaviour of this dialog. </div><div class='del'>-</div><div class='del'>-2001-07-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory</div><div class='del'>-	leak here.</div><div class='del'>-</div><div class='del'>-2001-07-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (match_search_info_free): Set</div><div class='del'>-	info-&gt;avoid = NULL.  This shouldn't make a difference, but it</div><div class='del'>-	can't hurt.</div><div class='del'>-</div><div class='del'>-2001-07-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_is_cell_editable): Check if the row is within our</div><div class='del'>-	table and return from this function as if the card is a standard</div><div class='del'>-	card, not a list.</div><div class='del'>-</div><div class='del'>-2001-07-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): </div><div class='del'>-	added $(BONOBO_CONF_LIBS) to get it to compile.</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added</div><div class='del'>-	$(BONOBO_CONF_LIBS).</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_create_categories),</div><div class='del'>-	gui/contact-editor/e-contact-editor.c (categories_clicked):</div><div class='del'>-	Switched to an ECategoriesMasterListWombat instead of an</div><div class='del'>-	ECategoriesMasterListArray here.</div><div class='del'>-</div><div class='del'>-2001-07-02  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=</div><div class='del'>-	builddir compile fix.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (INCLUDES): Same.</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am (INCLUDES): Same.</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c (categories_clicked):</div><div class='del'>-	Turned off wombatification of the categories master list here.</div><div class='del'>-</div><div class='del'>-2001-07-01  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):</div><div class='del'>-	use ECARD_UID_LINK_PREFIX.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c</div><div class='del'>-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.h: add prototype for</div><div class='del'>-	e_destination_importv_list.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_importv_list): new</div><div class='del'>-	function, take an ECard corresponding to an address list and</div><div class='del'>-	resolve any linked cards, returning an EDestination vector.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,</div><div class='del'>-	since we need to use it in a few places.</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	related_contacts field.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h</div><div class='del'>-	(e_select_names_model_import_destinationv): Added this function.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/contact-editor.glade: Replaced the entry here</div><div class='del'>-	for related contacts with a table which is filled in in the C code.</div><div class='del'>-</div><div class='del'>-	* gui/contact-editor/e-contact-editor.c,</div><div class='del'>-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select</div><div class='del'>-	names entry here for the related contacts field.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Removed all the test programs here</div><div class='del'>-	since there are circular dependencies now.</div><div class='del'>-</div><div class='del'>-2001-07-01  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_string): Fall</div><div class='del'>-	back to use the name field if all else fails (which can happen</div><div class='del'>-	with imported EDestinations).</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the</div><div class='del'>-	"recipient not specified" bug --- we were not correctly checking</div><div class='del'>-	for whether or not an EDestination was actually empty.</div><div class='del'>-</div><div class='del'>-2001-06-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.</div><div class='del'>-	Somewhere in the code (somewhere in the minicard stuff) this can</div><div class='del'>-	be called with a NULL arg, which was causing crashes.</div><div class='del'>-	(e_card_evolution_list_show_addresses): Check args.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (build_field): I was accidentally</div><div class='del'>-	comparing characters and strings here, and didn't see the compiler</div><div class='del'>-	warning.  Fixed.</div><div class='del'>-	(e_destination_exportv): Don't export any empty destinations.</div><div class='del'>-	(bug#3825).</div><div class='del'>-</div><div class='del'>-2001-06-30  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked</div><div class='del'>-	strings for translation.</div><div class='del'>-</div><div class='del'>-2001-06-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging.c (match_query_callback): Make the</div><div class='del'>-	standard for considering two cards to be match stricter.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(make_match): Use the card's use-score to set the match's</div><div class='del'>-	sort_major value.</div><div class='del'>-	(match_name): Removed obsolete code.</div><div class='del'>-	(e_select_names_completion_begin): Added (double) cast to make</div><div class='del'>-	match-&gt;score calculation come out properly.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and</div><div class='del'>-	X-EVOLUTION-USE-SCORE to attribute_jump_array.</div><div class='del'>-	(e_card_get_today): Added.  A convenience routine for getting</div><div class='del'>-	today's date and putting it in a GDate.</div><div class='del'>-	(e_card_get_use_score): Added.  Compute the current, time-decayed,</div><div class='del'>-	use-score for the card.</div><div class='del'>-	(e_card_touch): Increment the use-score by one; update the last</div><div class='del'>-	used date.</div><div class='del'>-	(e_card_date_to_string): Added as a convenience routine, getting</div><div class='del'>-	rid of some code duplication.</div><div class='del'>-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and</div><div class='del'>-	X-EVOLUTION-LAST-USE.</div><div class='del'>-	(parse_last_use): Added.</div><div class='del'>-	(parse_use_score): Added.</div><div class='del'>-	(e_card_class_init): Added args for last-use and use-score.</div><div class='del'>-	(e_card_get_arg): Added handlers for last-use and use-score.</div><div class='del'>-	o</div><div class='del'>-	(e_card_set_arg): Added handlers for last-use and use-score.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c: Added pending_card_id to</div><div class='del'>-	EDestinationPrivate struct.</div><div class='del'>-	(e_destination_copy): Copy the pending_card_id.</div><div class='del'>-	(e_destination_is_empty): Check for a pending_card_id.  We are</div><div class='del'>-	non-empty if we have one.</div><div class='del'>-	(e_destination_clear_card): Clear pending_card_id.</div><div class='del'>-	(e_destination_set_card): Clear pending_card_id.</div><div class='del'>-	(e_destination_has_pending_card): Added.</div><div class='del'>-	(e_destination_use_card): Added.  An asynchronous way to load a</div><div class='del'>-	pending card and then apply a callback to it.</div><div class='del'>-	(build_field): Be paranoid, map our special characters to '_'.</div><div class='del'>-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a</div><div class='del'>-	hard-wired array size.  Added the "card" entry.</div><div class='del'>-	(e_destination_import): Fix bug in handling of the "name" field.</div><div class='del'>-	Process the "card" field.</div><div class='del'>-	(e_destination_touch): "Touch" and commit the ECard corresponding</div><div class='del'>-	to the e-mail address in the destination.  (A query against the</div><div class='del'>-	local addressbook is actually performed, in case the destination</div><div class='del'>-	isn't cardified.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the</div><div class='del'>-	way E_CARD_MATCH_FOO results are mapped to comparison results.</div><div class='del'>-	Report better matches when the family name is matched.</div><div class='del'>-</div><div class='del'>-2001-06-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (update_query):</div><div class='del'>-	Added a search field to the query here.</div><div class='del'>-	(e_select_names_init): Update the query on a number of signals here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h: Added search_entry</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: Added the search</div><div class='del'>-	entry here.  Added some labels.  Removed the update button.</div><div class='del'>-</div><div class='del'>-2001-06-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_option_activated): Change the uri here to have</div><div class='del'>-	addressbook.db at the end.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: Changed the name</div><div class='del'>-	of the folder option menu here to match the name used in the code.</div><div class='del'>-</div><div class='del'>-2001-06-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (update_query):</div><div class='del'>-	Change the query when the "Update List" button is pushed.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h: Removed</div><div class='del'>-	currently_selected field.  Added categories_entry field.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade: Added "Update</div><div class='del'>-	List" button.</div><div class='del'>-</div><div class='del'>-2001-06-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR</div><div class='del'>-	define.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and</div><div class='del'>-	pixbuf size.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf</div><div class='del'>-	and its size.</div><div class='del'>-	(e_minicard_destroy): unref the list_icon_pixbuf.</div><div class='del'>-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.</div><div class='del'>-	(e_minicard_resize_children): clip the header_text by the</div><div class='del'>-	list_icon, and place the list_icon in the right spot.</div><div class='del'>-	(remodel): show the list_icon if we're a list, and hide it</div><div class='del'>-	otherwise.</div><div class='del'>-</div><div class='del'>-2001-06-28  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up</div><div class='del'>-	list editor for lists, contact editor otherwise.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): same.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to</div><div class='del'>-	GtkOjbect, since it can be either a contact editor or contact list</div><div class='del'>-	editor.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_is_cell_editable): don't allow editting of any fields</div><div class='del'>-	except the name and file_as for lists.</div><div class='del'>-</div><div class='del'>-2001-06-28  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient</div><div class='del'>-	e-table include, and add include for contact-editor so we can</div><div class='del'>-	reuse the confirm_delete dialog.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.h (struct</div><div class='del'>-	_EContactListEditor): remove prototype for</div><div class='del'>-	e_contact_list_editor_close, since the function no longer exists.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(list_deleted_cb): new function, emit our "list_deleted" signal.</div><div class='del'>-	(delete_cb): new function, called from the Delete toolbar item.</div><div class='del'>-	(e_contact_list_editor_raise): flesh out function.</div><div class='del'>-	(extract_info): "evolution_list" =&gt; "list".</div><div class='del'>-	(fill_in_info): same.</div><div class='del'>-</div><div class='del'>-2001-06-28  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vobject): add support for</div><div class='del'>-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.</div><div class='del'>-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.</div><div class='del'>-	(parse_list_show_addresses): new function, parse the boolean</div><div class='del'>-	X-EVOLUTION-LIST-SHOW-ADDRESSES.</div><div class='del'>-	(e_card_class_init): add args for "list" and</div><div class='del'>-	"list_show_addresses".</div><div class='del'>-	(e_card_set_arg): add support for list and list_show_addresses.</div><div class='del'>-	(e_card_get_arg): same.</div><div class='del'>-	(e_card_init): init list and list_show_addresses.</div><div class='del'>-</div><div class='del'>-2001-06-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as</div><div class='del'>-	the @external_uri_schemas argument to</div><div class='del'>-	`evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-2001-06-27  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c</div><div class='del'>-	(contact_list_row_count): track storage change - we're only using</div><div class='del'>-	1 array now.</div><div class='del'>-	(contact_list_value_at): same.</div><div class='del'>-	(contact_list_model_destroy): same.</div><div class='del'>-	(e_contact_list_model_init): same.</div><div class='del'>-	(e_contact_list_model_add_email): same.</div><div class='del'>-	(e_contact_list_model_add_card): same.</div><div class='del'>-	(e_contact_list_model_remove_row): same.</div><div class='del'>-	(e_contact_list_model_remove_all): new function - just free/unref</div><div class='del'>-	all existing rows.</div><div class='del'>-	(e_contact_list_model_get_email): new function, returns the</div><div class='del'>-	alloc'ed string containing either an email address or an encoded</div><div class='del'>-	ECardId.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2</div><div class='del'>-	separate arrays for email and cards, and store them in the same</div><div class='del'>-	array.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.h (struct</div><div class='del'>-	_EContactListEditor): add the visible_addr_checkbutton widget.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c</div><div class='del'>-	(visible_addrs_toggled_cb): new function.</div><div class='del'>-	(e_contact_list_editor_init): connect to "toggled" on</div><div class='del'>-	visible_addrs_checkbutton.</div><div class='del'>-	(file_save_cb): new function.</div><div class='del'>-	(tb_save_and_close_cb): new function.</div><div class='del'>-	(verbs): add Save and Save &amp; Close.</div><div class='del'>-	(list_added_cb): new function.</div><div class='del'>-	(list_modified_cb): new function.</div><div class='del'>-	(save_card): new function - we do *not* use e_card_merging_* calls</div><div class='del'>-	here.</div><div class='del'>-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"</div><div class='del'>-	getter.</div><div class='del'>-	(e_contact_list_editor_set_arg): same for the "card" setter.</div><div class='del'>-	(extract_info): new function.</div><div class='del'>-	(fill_in_info): new function.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/contact-list-editor.glade: add a</div><div class='del'>-	checkbutton at the bottom to determine whether to visibly include</div><div class='del'>-	mail addresses in mail sent to this list.</div><div class='del'>-</div><div class='del'>-2001-06-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_create_categories): Oops.  Can't use the wombat</div><div class='del'>-	version of the master categories list yet.</div><div class='del'>-</div><div class='del'>-2001-06-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove</div><div class='del'>-	counts were off in this function.</div><div class='del'>-	(remove_card, modify_card): Moved the table notifications around a</div><div class='del'>-	bit here.</div><div class='del'>-</div><div class='del'>-2001-06-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/component/select-names/select-names.glade</div><div class='del'>-	(e_select_names_create_categories): Added a categories combo here.</div><div class='del'>-	It's not used yet.</div><div class='del'>-</div><div class='del'>-2001-06-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/addresstypes.xml: Added category searching to the</div><div class='del'>-	advanced search dialog here.</div><div class='del'>-	</div><div class='del'>-2001-06-26  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (compare_category): Added</div><div class='del'>-	category searching to the file backend.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_query_changed): Added</div><div class='del'>-	category searching to the search bar.</div><div class='del'>-</div><div class='del'>-2001-06-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.</div><div class='del'>-</div><div class='del'>-2001-06-25  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/contact-list-editor.glade: change layout</div><div class='del'>-	slightly, the icon no longer pushes everything to the left, and</div><div class='del'>-	make the buttons on the right smaller and more in line with the</div><div class='del'>-	other widgets.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c</div><div class='del'>-	(contact_list_value_at): return the SimpleAndString-&gt;string</div><div class='del'>-	instead of querying the ecardsimple.</div><div class='del'>-	(e_contact_list_model_init): initially allocate 10 of each type</div><div class='del'>-	(email and simple).</div><div class='del'>-	(e_contact_list_model_add_email): realloc if need be.</div><div class='del'>-	(e_contact_list_model_add_card): same, and initialize the string</div><div class='del'>-	displayed to be "[Name] [&lt;email&gt;]".</div><div class='del'>-	(e_contact_list_model_remove_row): change for SimpleAndString.</div><div class='del'>-	(contact_list_model_destroy): free our 2 arrays.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts</div><div class='del'>-	and the SimpleAndString struct.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =&gt;</div><div class='del'>-	Ximian.</div><div class='del'>-	(e_contact_list_editor_init): hook up d&amp;d destination signals, and</div><div class='del'>-	un-#if 0 the delete_event signal.</div><div class='del'>-	(table_drag_motion_cb): new function.</div><div class='del'>-	(table_drag_drop_cb): new function.</div><div class='del'>-	(table_drag_data_received_cb): new function.</div><div class='del'>-	(file_close_cb): new function.</div><div class='del'>-	(verbs) uncomment the close verb.</div><div class='del'>-	(close_dialog): new function.</div><div class='del'>-	(app_delete_event_cb): new function.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =&gt;</div><div class='del'>-	Ximian.</div><div class='del'>-</div><div class='del'>-2001-06-25  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c: Add a huge steaming pile of</div><div class='del'>-	code to handle the case of single-address merging.  In other</div><div class='del'>-	words, if you go to "harvest" an address by right-clicking on it</div><div class='del'>-	in the mail viewer, and you already have a closely-matching</div><div class='del'>-	contact (w/ a different e-mail address), this gives you the</div><div class='del'>-	option of editting that contact's e-mail addresses to add the</div><div class='del'>-	one you just clicked on.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (match_search_info_free): It is</div><div class='del'>-	amazing how much better things work when you don't try to</div><div class='del'>-	dereference the pointer you just freed.</div><div class='del'>-</div><div class='del'>-2001-06-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to</div><div class='del'>-	libecontacteditor.a.</div><div class='del'>-	(minicard_widget_test_LDADD): same.</div><div class='del'>-	(INCLUDES): same, for the includes.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.h: correct path to</div><div class='del'>-	e-contact-editor.h, and add e-contact-list-editor.h.  Add</div><div class='del'>-	prototype for e_addressbook_show_contact_list_editor.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c: remove #include</div><div class='del'>-	"e-contact-editor.h" (our header includes it.)</div><div class='del'>-	(added_cb): rename card_added_cb to this, and make it so it can be</div><div class='del'>-	reused in both the list and card cases.  remove the g_print too.</div><div class='del'>-	(modified_cb): same for modified case.</div><div class='del'>-	(deleted_cb): same for deleted case.</div><div class='del'>-	(editor_closed_cb): change first arg to GtkObject* so we can reuse</div><div class='del'>-	this for both list and card.</div><div class='del'>-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,</div><div class='del'>-	deleted_cb, and pass FALSE as user_data.</div><div class='del'>-	(e_addressbook_show_contact_list_editor): new function, same as</div><div class='del'>-	above but creating a contact-list-editor, and pass TRUE as</div><div class='del'>-	user_data.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c: correct path to contact-editor.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-widget.c: same.</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c: same.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_list_cb): new function.</div><div class='del'>-	(update_command_state): update ContactNewList command.</div><div class='del'>-	(verbs): remove ViewAll from the toolbar from the verb list.  Add</div><div class='del'>-	ContactNewList.</div><div class='del'>-	(pixmaps): same for pixmaps.</div><div class='del'>-	</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new</div><div class='del'>-	path for contact-editor.</div><div class='del'>-	(INCLUDES): same.</div><div class='del'>-</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.h:</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-model.c:</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.h:</div><div class='del'>-	* gui/contact-list-editor/e-contact-list-editor.c:</div><div class='del'>-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor</div><div class='del'>-	  commit.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): add contact-editor.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: (SUBDIRS): remove contact-editor.</div><div class='del'>-</div><div class='del'>-2001-06-21  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(make_contact_editor_cb): Renamed.  (The old name,</div><div class='del'>-	edit_contact_info_have_book_cb was a hold-over from before, when</div><div class='del'>-	we weren't using e_book_use_local_address_book.)</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c</div><div class='del'>-	(e_address_popup_schedule_refresh): A Added.  We now do the name</div><div class='del'>-	refreshes in an idle function, rather than in the setters.</div><div class='del'>-	(e_address_popup_set_free_form): Added.  Properly handle inputs of</div><div class='del'>-	the form "Foo &lt;bar@zar.com&gt;", extracting the name and e-mail</div><div class='del'>-	address.</div><div class='del'>-	(e_address_popup_set_name): Check to make sure that the free-form</div><div class='del'>-	handler shouldn't be used to handle the input.  Schedule a refresh</div><div class='del'>-	after making any changes.</div><div class='del'>-	(e_address_popup_set_email): Check to make sure that the free-form</div><div class='del'>-	handler shouldn't be used to handle the input.  Schedule a refresh</div><div class='del'>-	after making any changes.</div><div class='del'>-	(e_address_popup_name_only_matches): Temporary place-holder for</div><div class='del'>-	handling name-only matches.</div><div class='del'>-	(query_cb): If our initial query fails (and included e-mail</div><div class='del'>-	information), do a name-only query.  This is to handle the case of</div><div class='del'>-	adding new e-mail addresses to existing contacts.</div><div class='del'>-	(e_address_popup_query): Eliminated the "common_book" crap; using</div><div class='del'>-	e_book_use_local_address_book instead.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (match_search_info_free): Make</div><div class='del'>-	sure that the -&gt;avoid list gets properly freed.</div><div class='del'>-</div><div class='del'>-2001-06-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_supported_fields): fix a refcounting</div><div class='del'>-	memleak.</div><div class='del'>-</div><div class='del'>-2001-06-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_get_supported_fields_response): fix memory</div><div class='del'>-	leak.</div><div class='del'>-</div><div class='del'>-2001-06-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: add prototype for</div><div class='del'>-	close_dialog to remove warnings.</div><div class='del'>-</div><div class='del'>-2001-06-20  Dave Camp  &lt;dave@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data</div><div class='del'>-	to be a GNOME_Evolution_Composer_AttachmentData rather than a</div><div class='del'>-	CORBA_char*.</div><div class='del'>-</div><div class='del'>-2001-06-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_double_click): track</div><div class='del'>-	change to e_addressbook_show_contact_editor signature.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): same.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):</div><div class='del'>-	add an entry for "Card ID already exists".</div><div class='del'>-	(e_addressbook_show_contact_editor): track the change to signal</div><div class='del'>-	names and e_contact_editor_new signature here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-util.h: change</div><div class='del'>-	e_addressbook_show_contact_editor's signature to match</div><div class='del'>-	e_contact_editor_new more closely.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free</div><div class='del'>-	up the simple mapping to plug a potentially sizeable memory leak.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): call</div><div class='del'>-	e_addressbook_show_contact_editor here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(edit_contact_info_have_book_cb): remove the get_supported_fields</div><div class='del'>-	stuff, since the contact editor handles it for us now, and call</div><div class='del'>-	e_addressbook_show_contact_editor.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): track change to</div><div class='del'>-	e_addressbook_show_contact_editor.</div><div class='del'>-</div><div class='del'>-2001-06-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename</div><div class='del'>-	ce_book_found_fields to this, remove the fetching of fields (the</div><div class='del'>-	contact editor code handles that now.), and change the add_card</div><div class='del'>-	signal to card_added.</div><div class='del'>-	(card_added_cb): copied somewhat from merge_cb above.  we don't</div><div class='del'>-	need to do the merge here, just call the callback.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):</div><div class='del'>-	track signal change.  add book arg, and is_read_only -&gt; editable.</div><div class='del'>-	(wants_html_changed): if the card isn't already changed, flag it</div><div class='del'>-	as such (and update the commands.)</div><div class='del'>-	(phone_entry_changed): same.</div><div class='del'>-	(email_entry_changed): same.</div><div class='del'>-	(address_text_changed): same.</div><div class='del'>-	(name_entry_changed): same.</div><div class='del'>-	(company_entry_changed): same.</div><div class='del'>-	(full_name_clicked): is_read_only -&gt; editable.</div><div class='del'>-	(full_addr_clicked): same.</div><div class='del'>-	(card_added_cb): new function, emit our card_added signal, and</div><div class='del'>-	close the dialog if we're supposed to.  properly deal with error</div><div class='del'>-	status here.</div><div class='del'>-	(card_modified_cb): same, modulo card_added -&gt; card_modified.</div><div class='del'>-	(save_card): actually call e_card_merging_book_{add/commit}_card</div><div class='del'>-	instead of using a signal.  Also, add a gboolean arg to tell</div><div class='del'>-	whether or not to close the dialog after saving the card.</div><div class='del'>-	(card_deleted_cb): new function, just emit our "card_deleted"</div><div class='del'>-	signal.</div><div class='del'>-	(delete_cb): actually call e_book_remove_card here, instead of</div><div class='del'>-	using a signal.</div><div class='del'>-	(tb_save_and_close_cb): call save_card with TRUE for should_close.</div><div class='del'>-	(e_contact_editor_init): init changed = FALSE;</div><div class='del'>-	(e_contact_editor_destroy): unref our book if we have one.</div><div class='del'>-	(e_contact_editor_new): new signature, set the "book" arg, and</div><div class='del'>-	call e_book_get_supported_fields here.</div><div class='del'>-	(supported_fields_cb): new function, show the contact editor.</div><div class='del'>-	(e_contact_editor_set_arg): initialize changed to FALSE when</div><div class='del'>-	setting the card (but *after*, since the changed callbacks will</div><div class='del'>-	set it to TRUE.)  also, call command_state_changed if editable</div><div class='del'>-	changes.  also handle setting "book".  oh, and is_read_only -&gt;</div><div class='del'>-	editable.</div><div class='del'>-	(command_state_changed): new function - set the state of the</div><div class='del'>-	commands we care about.</div><div class='del'>-	(e_contact_editor_get_arg): add "book" handling, and is_read_only</div><div class='del'>-	-&gt; editable.</div><div class='del'>-	(_phone_arrow_pressed): is_read_only -&gt; editable.</div><div class='del'>-	(_email_arrow_pressed): same.</div><div class='del'>-	(_address_arrow_pressed): same.</div><div class='del'>-	(enable_writable_fields): same.</div><div class='del'>-	(set_editable): rename set_read_only to this, and is_read_only -&gt;</div><div class='del'>-	editable.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h (struct _EContactEditor):</div><div class='del'>-	is_read_only -&gt; editable, add a "changed" flag so we can sensitize</div><div class='del'>-	commands correctly, and add an EBook* arg to e_contact_editor_new</div><div class='del'>-	and to the EContactEditor struct.  Also, change all the signals to</div><div class='del'>-	past tense, and send the EBookStatus in them.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c</div><div class='del'>-	(e_contact_editor_address_class_init): is_read_only -&gt; editable.</div><div class='del'>-	(e_contact_editor_address_set_arg): same.</div><div class='del'>-	(e_contact_editor_address_get_arg): same.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.h (struct</div><div class='del'>-	_EContactEditorAddress): same.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c</div><div class='del'>-	(e_contact_editor_fullname_class_init): same.</div><div class='del'>-	(e_contact_editor_fullname_set_arg): same.</div><div class='del'>-	(e_contact_editor_fullname_get_arg): same.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.h (struct</div><div class='del'>-	_EContactEditorFullname): same.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: don't build contact-editor-test now,</div><div class='del'>-	until contact-editor gets moved to gui/ and we can more easily</div><div class='del'>-	depend on the e_card_merging_* calls.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return</div><div class='del'>-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the</div><div class='del'>-	BookListener status enum.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h: add</div><div class='del'>-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_convert_status): add support for</div><div class='del'>-	CardIdAlreadyExists.</div><div class='del'>-</div><div class='del'>-2001-06-19  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,</div><div class='del'>-	removal of gtk_object_set_data() hacks, simplified by using</div><div class='del'>-	some of the newer ebook convenience routines, etc.</div><div class='del'>-	(ce_book_found_fields):</div><div class='del'>-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the</div><div class='del'>-	small changes in the contact editor API.</div><div class='del'>-</div><div class='del'>-2001-06-18  Eskil Heyn Olsen  &lt;eskil@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: (check_for_slow_setting),</div><div class='del'>-	(conduit_get_gpilot_conduit):</div><div class='del'>-	Tweaked for some gnome-pilot api changes</div><div class='del'>-</div><div class='del'>-2001-06-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this</div><div class='del'>-	properly, using base and (objectclass=*).</div><div class='del'>-</div><div class='del'>-2001-06-14  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a</div><div class='del'>-	function call - call close_dialog instead of file_close_cb.</div><div class='del'>-</div><div class='del'>-2001-06-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Set the</div><div class='del'>-	"expoted_dnd_types" to NULL in the folder_types.</div><div class='del'>-</div><div class='del'>-2001-06-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(search_override_check): Add a workaround for an EText bug.</div><div class='del'>-	(e_select_names_completion_begin): Fix up the match scoring in the</div><div class='del'>-	search_override case so the lines are offered in the correct</div><div class='del'>-	order.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/merging/Makefile.am (glade_DATA): Added</div><div class='del'>-	e-card-merging-book-commit-duplicate-detected.glade here.</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:</div><div class='del'>-	Added this file.  The GUI for asking whether to commit a modified</div><div class='del'>-	card.</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h</div><div class='del'>-	(e_card_merging_book_commit_card): Added this function.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c</div><div class='del'>-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use</div><div class='del'>-	e_card_merging_book_commit_card instead of e_book_commit_card here.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Made e_card_simple_get_id return const char *.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made</div><div class='del'>-	e_card_get_id return const char *.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id</div><div class='del'>-	variable const here.  Added a break to make it slightly more</div><div class='del'>-	efficient.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made</div><div class='del'>-	e_minicard_get_card_id return const char *.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle</div><div class='del'>-	the "id" property in searches.</div><div class='del'>-	(pas_backend_file_process_modify_card): Made id variable const</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id</div><div class='del'>-	variable const here.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c,</div><div class='del'>-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled</div><div class='del'>-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving</div><div class='del'>-	e-book-listener.[ch] and e-book.c.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_uri,</div><div class='del'>-	e_book_get_supported_fields, e_book_authenticate_user,</div><div class='del'>-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,</div><div class='del'>-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made</div><div class='del'>-	it so that all of these functions queue their ops before calling</div><div class='del'>-	their CORBA functions.  This way, if the response is sent back</div><div class='del'>-	before the CORBA function returns there's no problem.  Added</div><div class='del'>-	e_book_unqueue_op so that the op could be unqueued if the CORBA</div><div class='del'>-	call fails.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h</div><div class='del'>-	(e_book_listener_unpop_response): Added this function to put a</div><div class='del'>-	response back into the queue.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_check_listener_queue,</div><div class='del'>-	e_book_queue_op): Handle the case where the op hasn't been queued</div><div class='del'>-	yet when we get the response.  In this case we unpop the response.</div><div class='del'>-	Also, when queueing an op, we check to see if there are any</div><div class='del'>-	responses waiting.</div><div class='del'>-</div><div class='del'>-	* This change has been reverted.</div><div class='del'>-</div><div class='del'>-2001-06-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h</div><div class='del'>-	(e_card_locate_match_full): Added this function to let you do</div><div class='del'>-	slightly more complicated searches.</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use</div><div class='del'>-	e_card_locate_match_full to check if the card exists in the book</div><div class='del'>-	it's being added to instead of in the default book.</div><div class='del'>-</div><div class='del'>-2001-06-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_name): Removed unused email variable.</div><div class='del'>-</div><div class='del'>-2001-06-09  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null</div><div class='del'>-	terminate the strv here.</div><div class='del'>-	(e_card_locate_match): ref here instead of unref.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL</div><div class='del'>-	card here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am</div><div class='del'>-	(INCLUDES): Added addressbook/gui/merging here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c (book_ready_cb),</div><div class='del'>-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),</div><div class='del'>-	gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(addressbook_append_row), gui/widgets/e-addressbook-util.c</div><div class='del'>-	(add_card_cb), gui/widgets/e-addressbook-view.c</div><div class='del'>-	(selection_received), gui/widgets/e-minicard-control.c</div><div class='del'>-	(book_open_cb): Use e_card_merging_book_add_card instead of</div><div class='del'>-	e_book_add_card here.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): Added merging.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD),</div><div class='del'>-	gui/widgets/Makefile.am (minicard_test_LDADD,</div><div class='del'>-	minicard_widget_test_LDADD): Added libecardmerging.a here.</div><div class='del'>-</div><div class='del'>-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:</div><div class='del'>-	New addressbook library.</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-duplicate-detected.glade: Glade file for</div><div class='del'>-	duplicate detected dialog.</div><div class='del'>-</div><div class='del'>-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New</div><div class='del'>-	files for detecting duplicates before adding and putting up a</div><div class='del'>-	dialog if duplicates are found.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2001-06-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove</div><div class='del'>-	the gtk_widget_show call...</div><div class='del'>-	(e_contact_editor_show): and put it here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h: add prototype for</div><div class='del'>-	e_contact_editor_show.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): call</div><div class='del'>-	e_addressbook_show_contact_editor.</div><div class='del'>-	(card_modified_cb): call e_addressbook_error_dialog if status !=</div><div class='del'>-	SUCCESS.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call</div><div class='del'>-	e_addressbook_show_contact_editor.  also, use card_modified_cb as</div><div class='del'>-	the commit_card callback.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_double_click): clean</div><div class='del'>-	this area up alot, call e_addressbook_show_contact_editor.</div><div class='del'>-	(card_deleted_cb): call e_addressbook_error_dialog.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(card_modified_cb): new function, call e_addressbook_error_dialog</div><div class='del'>-	if the status != SUCCESS.</div><div class='del'>-	(addressbook_set_value_at): use card_modified_cb as the callback</div><div class='del'>-	for e_book_commit_card.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add</div><div class='del'>-	e-addressbook-util.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): use</div><div class='del'>-	e_addressbook_show_contact_editor here.</div><div class='del'>-</div><div class='del'>-2001-06-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (categories_clicked): Remove</div><div class='del'>-	references to ECategoryMasterListWombat.</div><div class='del'>-</div><div class='del'>-2001-06-05  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (remove_cb): Make</div><div class='del'>-	this work when multiple names are selected then right</div><div class='del'>-	click-&gt;Remove.</div><div class='del'>-</div><div class='del'>-2001-06-05  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come</div><div class='del'>-	in.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,</div><div class='del'>-	pas_backend_file_process_remove_card,</div><div class='del'>-	pas_backend_file_process_modify_card,</div><div class='del'>-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,</div><div class='del'>-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using</div><div class='del'>-	them.</div><div class='del'>-	(pas_backend_file_build_all_cards_list): Reindented.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits</div><div class='del'>-	with a custom widget that creates an EDateEdit.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead</div><div class='del'>-	of a GnomeDateEdit.</div><div class='del'>-</div><div class='del'>-2001-06-05  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	(Fix bug #655: SelectNames doesn't let you remove addresses after</div><div class='del'>-	 you add them)</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(section_right_click_cb): New function, provides a popup menu with</div><div class='del'>-	just "Remove" in it.</div><div class='del'>-	(remove_cb): New callback to do the remove.</div><div class='del'>-	(e_select_names_add_section): Attach the "right_click" signal to</div><div class='del'>-	the section_right_click_cb above.</div><div class='del'>-</div><div class='del'>-2001-06-05  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(completion_handler): Change the completion handler to use the</div><div class='del'>-	ECompletionMatch.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	General changes to convert for ECompletionMatch use.</div><div class='del'>-	(emailify_match): Use extra sort keys in ECompletionMatch to let</div><div class='del'>-	us ensure that the primary email address is always the first</div><div class='del'>-	option, the secondary comes second, etc.  There was no nice way to</div><div class='del'>-	do this previously.</div><div class='del'>-	(match_name): Removed code that adjusted score based on</div><div class='del'>-	similarities between the "real name" and the e-mail address.  It</div><div class='del'>-	seemed like a good idea at the time, but produced unexpected and</div><div class='del'>-	confusing results.</div><div class='del'>-</div><div class='del'>-2001-06-04  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-compare.c: Added.  Code for testing</div><div class='del'>-	if two ECards appear to pertain to the same contact (using loose</div><div class='del'>-	matching rules, as opposed to requiring exact equality) and to</div><div class='del'>-	query the addressbook for the "best match" to ECard.</div><div class='del'>-</div><div class='del'>-2001-06-03  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_status_message): remove spew,</div><div class='del'>-	and don't call the ShellView CORBA method if the interface doesn't</div><div class='del'>-	exist (for whatever reason.)</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):</div><div class='del'>-	unref the EAddressbookModel.</div><div class='del'>-	(create_minicard_view): unref the adapter.</div><div class='del'>-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.</div><div class='del'>-	(card_modified_cb): same.</div><div class='del'>-	(card_removed_cb): new function, and same.</div><div class='del'>-	(delete_card_cb): pass card_removed_cb as the callback.</div><div class='del'>-	(emit_status_message): new function, just emit status_message.</div><div class='del'>-	(status_message): change to call emit_status_message.</div><div class='del'>-	(card_deleted_cb): emit_status_message ("Done."), and call</div><div class='del'>-	e_book_error_dialog if status != SUCCESS.</div><div class='del'>-	(do_remove): pass view in the closure arg.</div><div class='del'>-	(e_addressbook_view_delete_selection): emit status "Removing</div><div class='del'>-	cards..." before starting the removal.</div><div class='del'>-	(e_book_error_dialog): new function - pop up a (possibly) helpful</div><div class='del'>-	message about why an operation failed.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.</div><div class='del'>-	(e_minicard_view_widget_destroy): unref the adapter.</div><div class='del'>-	(e_minicard_view_widget_get_selection_model): if there isn't a</div><div class='del'>-	minicard view return NULL.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c</div><div class='del'>-	(e_addressbook_table_adapter_construct): ref the</div><div class='del'>-	EAddressbookModel.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c</div><div class='del'>-	(addressbook_finalize): rename this from addressbook_destroy, to</div><div class='del'>-	reflect the method change.</div><div class='del'>-	(e_addressbook_reflow_adapter_class_init): same.</div><div class='del'>-	(e_addressbook_reflow_adapter_construct): ref the</div><div class='del'>-	EAddressbookModel.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.h: add editable_set flag.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (writable_status): only record</div><div class='del'>-	the writable state of the addressbook if the user hasn't set it.</div><div class='del'>-	(e_addressbook_model_init): init editable_set to FALSE.</div><div class='del'>-	(e_addressbook_model_set_arg): set editable_set to TRUE.</div><div class='del'>-</div><div class='del'>-2001-06-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move</div><div class='del'>-	`$(DB3_LDADD)' before libeutil.</div><div class='del'>-</div><div class='del'>-2001-06-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add</div><div class='del'>-	$(DB3_LDADD)'.</div><div class='del'>-</div><div class='del'>-2001-05-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Updated this to use db3.</div><div class='del'>-</div><div class='del'>-2001-05-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added</div><div class='del'>-	fields for the GalViewMenus and GalViewCollection; we need to keep</div><div class='del'>-	them around while the component is active.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.</div><div class='del'>-	Unref the factories.  Do not unref the collection, since we need</div><div class='del'>-	it for the signal emission (okay, so the views object adds a</div><div class='del'>-	reference to it, but if we are interested in it we should keep a</div><div class='del'>-	reference anyways).</div><div class='del'>-	(e_addressbook_view_setup_menus): Create the collection and views</div><div class='del'>-	on the EAddressbookView's fields so that we can keep them around.</div><div class='del'>-	(e_addressbook_view_discard_menus): New function; gets rid of the</div><div class='del'>-	collection and views objects.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate_cb): Call</div><div class='del'>-	e_addressbook_view_discard_menus().</div><div class='del'>-</div><div class='del'>-2001-05-31  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.h (struct</div><div class='del'>-	_ESelectNames): add the EAddressbookModel* and change the</div><div class='del'>-	ETableModel's name to "adapter".</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c (set_book),</div><div class='del'>-	(addressbook_model_set_uri): these two things take an</div><div class='del'>-	EAddressbookModel* instead of an ETableModel now.</div><div class='del'>-	(e_addressbook_create_ebook_table): don't case the</div><div class='del'>-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter</div><div class='del'>-	on the EAddressbookModel instead.</div><div class='del'>-	(e_select_names_init): set e_select_names-&gt;adapter.</div><div class='del'>-</div><div class='del'>-2001-05-31  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (remove_card): decrement</div><div class='del'>-	data_count before emitting the card_removed signal, and break</div><div class='del'>-	after we've removed the matching card.</div><div class='del'>-	(e_addressbook_model_class_init): change signature of</div><div class='del'>-	"card_removed" signal to match what we emit (and what is</div><div class='del'>-	expected.)</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the</div><div class='del'>-	signal name is "destroy", not "destroyed".</div><div class='del'>-	(do_remove): new function, actually remove the card.</div><div class='del'>-	(e_addressbook_view_delete_selection): get this working for both</div><div class='del'>-	view types.</div><div class='del'>-</div><div class='del'>-2001-05-31  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Print Preview =&gt;</div><div class='del'>-	ContactsPrintPreview.  Changed peter's change so that the node</div><div class='del'>-	name is more in line with "Print.."'s</div><div class='del'>-</div><div class='del'>-2001-05-30  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Use the correct path to the print</div><div class='del'>-	preview menu item.</div><div class='del'>-</div><div class='del'>-2001-05-30  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (cut_contacts_cb): new function, for</div><div class='del'>-	the Cut verb.</div><div class='del'>-	(copy_contacts_cb): new function, for the Copy verb.</div><div class='del'>-	(paste_contacts_cb): new function, for the Paste verb.</div><div class='del'>-	(select_all_contacts_cb): new function, for the Select All verb.</div><div class='del'>-	(update_command_state): add handling for sensitivity of</div><div class='del'>-	Cut/Copy/Paste/Select All.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init</div><div class='del'>-	the invisible and set up selection/destroy signals.</div><div class='del'>-	(get_selection_model): new function, so we can get the</div><div class='del'>-	ETableSelectionModel from either view type.  makes lots of the</div><div class='del'>-	other functions easier, since we can get the list of selected</div><div class='del'>-	cards using the same code regardless of view type.</div><div class='del'>-	(invisible_destroyed): new function.</div><div class='del'>-	(selection_get): new function.  convert the clipboard list to</div><div class='del'>-	string.</div><div class='del'>-	(selection_clear_event): new function - free up the list of</div><div class='del'>-	ECards.</div><div class='del'>-	(selection_received): if the selection data is valid and</div><div class='del'>-	well-formed, add the corresponding cards to the ebook.</div><div class='del'>-	(add_to_list): new function.</div><div class='del'>-	(get_selected_cards): new function.</div><div class='del'>-	(e_addressbook_view_cut): new function, implement in terms of</div><div class='del'>-	_copy and _delete_selection.</div><div class='del'>-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD</div><div class='del'>-	selection after saving the list of selected ECards.</div><div class='del'>-	(e_addressbook_view_paste): call gtk_selection_convert.</div><div class='del'>-	(e_addressbook_view_select_all): new function, using</div><div class='del'>-	e_selection_model_select_all.</div><div class='del'>-	(e_addressbook_view_can_print): re-implement in terms of</div><div class='del'>-	get_selection_model.</div><div class='del'>-	(e_addressbook_view_can_delete): same.</div><div class='del'>-	(e_addressbook_view_can_cut): new function.</div><div class='del'>-	(e_addressbook_view_can_copy): new function.</div><div class='del'>-	(e_addressbook_view_can_paste): new function.  hmm, always return</div><div class='del'>-	TRUE here.</div><div class='del'>-	(e_addressbook_view_can_select_all): new function.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add</div><div class='del'>-	selection stuff - the list of selected cards, and the GtkInvisible</div><div class='del'>-	selection owner, and add prototypes for</div><div class='del'>-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h: add a prototype for</div><div class='del'>-	e_minicard_view_widget_get_selection_model.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_get_selection_model): new function.</div><div class='del'>-</div><div class='del'>-2001-05-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: #include</div><div class='del'>-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"</div><div class='del'>-	for e_pixmaps_update.</div><div class='del'>-</div><div class='del'>-2001-05-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Reference libeshell.la instead of</div><div class='del'>-	libeshell.a.</div><div class='del'>-</div><div class='del'>-2001-05-25  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):</div><div class='del'>-	Correct the height calculation here to not include the</div><div class='del'>-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to</div><div class='del'>-	be more consistent and simpler.</div><div class='del'>-</div><div class='del'>-2001-05-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such</div><div class='del'>-	that ones that happening at the beginning or during an operation</div><div class='del'>-	are followed by "..." and those that stop the operation are</div><div class='del'>-	followed by "."</div><div class='del'>-	(create_card_handler): same.</div><div class='del'>-	(ldap_op_process_current): same, and also call _notify_complete if</div><div class='del'>-	we can't connect to ldap server.</div><div class='del'>-	(poll_ldap): same, and change "Polling for LDAP search result" to</div><div class='del'>-	"Receiving LDAP search results"</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call</div><div class='del'>-	notify_status_message at the beginning of this function, and</div><div class='del'>-	whenever we call _notify_complete.</div><div class='del'>-</div><div class='del'>-2001-05-23  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to</div><div class='del'>-	EAddressbookModel and stop_state_changed to</div><div class='del'>-	EAddressbookModelClass.  also, add prototype for</div><div class='del'>-	e_addressbook_model_can_stop.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect</div><div class='del'>-	from "sequence_complete", and set search_in_progress to FALSE.</div><div class='del'>-	(sequence_complete): set search_in_progress to FALSE and emit</div><div class='del'>-	"stop_state_changed."</div><div class='del'>-	(e_addressbook_model_class_init): create the "stop_state_changed"</div><div class='del'>-	signal.</div><div class='del'>-	(e_addressbook_model_init): init stuff.</div><div class='del'>-	(book_view_loaded): connect to "sequence_complete" signal.</div><div class='del'>-	(book_view_loaded): set search_in_progress to TRUE and emit</div><div class='del'>-	"stop_state_changed"</div><div class='del'>-	(e_addressbook_model_stop): set search_in_progress to false, emit</div><div class='del'>-	"stop_state_changed", and set our status to "Search Interrupted."</div><div class='del'>-	(e_addressbook_model_can_stop): return search_in_progress.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):</div><div class='del'>-	connect to the stop_state_changed signal on EAddressbookModel.</div><div class='del'>-	(stop_state_changed): new function.</div><div class='del'>-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_command_state): use</div><div class='del'>-	e_addressbook_view_can_stop to set the sensitivity of the stop</div><div class='del'>-	button.</div><div class='del'>-</div><div class='del'>-2001-05-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):</div><div class='del'>-	ref the listener for the duration of this function, since emitting</div><div class='del'>-	"responses_queued" may cause it to be unreffed by its EBook in</div><div class='del'>-	some cases, which could cause the second response_queue check to</div><div class='del'>-	look at garbage data if it got destroyed.</div><div class='del'>-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.</div><div class='del'>-</div><div class='del'>-2001-05-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: track the change in</div><div class='del'>-	evolution-addressbook.xml's bonobo ui path's.</div><div class='del'>-</div><div class='del'>-2001-05-21  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (change_view_type): update_view_type</div><div class='del'>-	is gone, since the menu item is gone.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use</div><div class='del'>-	e_table_model_rows_inserted here.</div><div class='del'>-</div><div class='del'>-2001-05-20  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_source_item_new): Removed an unused variable.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Made text here non-const.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(edit_contact_info_cb): Cast to a gpointer here.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.</div><div class='del'>-</div><div class='del'>-2001-05-18  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_name): Do a better job constructing match strings, so we</div><div class='del'>-	never try to use a segment of the name that isn't there (resulting</div><div class='del'>-	in ugly (null)'s in the string).  Boost our score if some part of</div><div class='del'>-	the name also matches the front part of the e-mail address, so the</div><div class='del'>-	name match will always trump the e-mail match.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Return the serialized EDestinations</div><div class='del'>-	(rather than just a string w/ e-mail addresses) through the bonobo</div><div class='del'>-	component's property bag.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_export_destinationv): Added.  A convenience routine</div><div class='del'>-	for serializing the model's EDestinations into a string.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(add_html_mail): Added.  Puts in a check menu item for whether or</div><div class='del'>-	not the recipient wants HTML mail.</div><div class='del'>-	(popup_menu_card): Add menu item for HTML mail.  Enable edit</div><div class='del'>-	contact info item.</div><div class='del'>-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit</div><div class='del'>-	contact info item.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):</div><div class='del'>-	Added.  Fetches the local addressbook and caches it on the first</div><div class='del'>-	call.  This is meant to be an easy and efficient way to get at the</div><div class='del'>-	local addressbook with the minimum of code.</div><div class='del'>-	(e_book_query_address_locally): Added.  Convenience code that</div><div class='del'>-	does an e-mail only e_book_name_and_email_query against the</div><div class='del'>-	local address book.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c</div><div class='del'>-	(e_destination_set_html_mail_pref): Added.  Allows the intended</div><div class='del'>-	recipient's HTML mail preference to be manipulated.</div><div class='del'>-	(e_destination_get_email_verbose): Added.  Cleaned up to use</div><div class='del'>-	e_destination_get_name.</div><div class='del'>-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail</div><div class='del'>-	preference.  If the destination is linked to a card, the</div><div class='del'>-	preference is taken from the card (unless it has been explicitly</div><div class='del'>-	overridden by a called to e_destination_set_html_mail_pref).</div><div class='del'>-	(e_destination_get_address_textv): Added.  Form a unified address string</div><div class='del'>-	from a NULL-terminated vector of EDestinations.</div><div class='del'>-	(e_destination_export): Added.  Serialize an EDestination to a string.</div><div class='del'>-	(e_destination_import): Added.  Unserialize a string to build an</div><div class='del'>-	EDestination.</div><div class='del'>-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of</div><div class='del'>-	EDestinations to a string.</div><div class='del'>-	(e_destination_importv): Added.  Unserialize a string to build a</div><div class='del'>-	NULL-terminated vector of EDestinations.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c:</div><div class='del'>-	Implemented local versions of g_strcasecmp and g_strncasecmp</div><div class='del'>-	(which should really be in glib, I think...) for utf8, and used</div><div class='del'>-	them to make this code utf8-safe.</div><div class='del'>-</div><div class='del'>-2001-05-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_command_state): no more</div><div class='del'>-	ContactFind command.</div><div class='del'>-</div><div class='del'>-2001-05-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_class_init): add our selection_change</div><div class='del'>-	signal.</div><div class='del'>-	(e_minicard_view_widget_realize): connect to the ESelectionModel's</div><div class='del'>-	selection_changed signal.</div><div class='del'>-	(e_minicard_view_widget_selected_count): new function.</div><div class='del'>-	(selection_change): new function - emit our "selection_change"</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h (struct</div><div class='del'>-	_EMinicardViewWidgetClass): add selection_change signal.  also,</div><div class='del'>-	add prototype for e_minicard_view_widget_selected_count.  </div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_class_init): add our command_state_change</div><div class='del'>-	signal.</div><div class='del'>-	(e_addressbook_view_init): connect to the writable_status signal</div><div class='del'>-	on the EAddressbookModel.</div><div class='del'>-	(minicard_selection_change): new function - calls</div><div class='del'>-	command_state_change.</div><div class='del'>-	(create_minicard_view): connect to selection_change on the</div><div class='del'>-	minicard_view so we know when to update command state.</div><div class='del'>-	(table_selection_change): new function - calls</div><div class='del'>-	command_state_change.</div><div class='del'>-	(writable_status): new function - calls command_state_change.</div><div class='del'>-	(command_state_change): new function - emits our</div><div class='del'>-	"command_state_change" signal.</div><div class='del'>-	(create_table_view): connect to the selection_change signal so we</div><div class='del'>-	know to update the command state.</div><div class='del'>-	(change_view_type): update the command state every time we change</div><div class='del'>-	view types.</div><div class='del'>-	(e_addressbook_view_can_create): new function.</div><div class='del'>-	(e_addressbook_view_can_print): new function.</div><div class='del'>-	(e_addressbook_view_can_delete): new function.</div><div class='del'>-	(e_addressbook_view_can_stop): new function.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (struct</div><div class='del'>-	_EAddressbookViewClass): add command_state_change signal, and</div><div class='del'>-	prototypes of functions the component can use to test the state of</div><div class='del'>-	commands.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink</div><div class='del'>-	the writable_status signal on the EBook.</div><div class='del'>-	(writable_status): new function.</div><div class='del'>-	(e_addressbook_model_class_init): add our writable_status signal.</div><div class='del'>-	(e_addressbook_model_init): init writable_status_id.</div><div class='del'>-	(e_addressbook_model_set_arg): unlink the writable_status signal</div><div class='del'>-	on the old EBook, and connect it on the new one.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.h: add writable_status signal.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_command_state): new</div><div class='del'>-	function, set the sensitivity of the bonobo commands.</div><div class='del'>-	(control_activate): update our command state immediately upon</div><div class='del'>-	activating the control.</div><div class='del'>-	(addressbook_factory_new_control): register command_state_change</div><div class='del'>-	to update the commands.</div><div class='del'>-</div><div class='del'>-2001-05-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): initialize the model and</div><div class='del'>-	adapter.</div><div class='del'>-	(button_press): set on the model.</div><div class='del'>-	(e_addressbook_search_dialog_new): same.</div><div class='del'>-	(e_addressbook_search_dialog_set_arg): same.</div><div class='del'>-	(e_addressbook_search_dialog_destroy): unref the model and</div><div class='del'>-	adapter.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.h (struct</div><div class='del'>-	_EAddressbookSearchDialog): add our model and reflow adapter.</div><div class='del'>-</div><div class='del'>-2001-05-16  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed</div><div class='del'>-	up the lifetime of the drag_data_get signal a bit.</div><div class='del'>-</div><div class='del'>-2001-05-15  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel</div><div class='del'>-	-&gt; ReflowAdapter name change.</div><div class='del'>-	(get_card_list): same.</div><div class='del'>-	(e_minicard_view_drag_begin): same.</div><div class='del'>-	(supported_fields_cb): model -&gt; adapter.</div><div class='del'>-	(adapter_changed): hook up signals and set the empty message on</div><div class='del'>-	our adapter.</div><div class='del'>-	(e_minicard_view_set_arg): add support for "adapter", and set</div><div class='del'>-	model -&gt; adapter.</div><div class='del'>-	(e_minicard_view_get_arg): same.</div><div class='del'>-	(disconnect_signals): no more status_message.</div><div class='del'>-	(do_remove): track to use adapter.</div><div class='del'>-	(e_minicard_view_class_init): add adapter arg, and remove</div><div class='del'>-	status_message.</div><div class='del'>-	(e_minicard_view_init): all the code here is in adapter_changed</div><div class='del'>-	now.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):</div><div class='del'>-	EMinicardViewModel -&gt; EAddressbookReflowAdapter.</div><div class='del'>-	(struct _EMinicardViewClass): get rid of status_message.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_class_init): remove the status_message</div><div class='del'>-	signal.</div><div class='del'>-	(e_minicard_view_widget_new): take the adapter as our argument,</div><div class='del'>-	and store it away for when we create the view.</div><div class='del'>-	(e_minicard_view_widget_realize): when we create the view just set</div><div class='del'>-	the adapter field on it.  also, don't connect to status_message.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h (struct</div><div class='del'>-	_EMinicardViewWidget): add our adapter here, so we can pass it</div><div class='del'>-	into the view when we create it.</div><div class='del'>-	(struct _EMinicardViewWidgetClass): remove status_message.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (status_message): new function,</div><div class='del'>-	no more propagating status messages!</div><div class='del'>-	(e_addressbook_view_init): create our model and conenct to its</div><div class='del'>-	status_message signal.</div><div class='del'>-	(book_writable_cb): set "editable" on the model, not our object.</div><div class='del'>-	(e_addressbook_view_set_arg): same, but with "book" and "query" as</div><div class='del'>-	well.</div><div class='del'>-	(create_minicard_view): create our reflow adapter and pass it to</div><div class='del'>-	the minicard view widget.  also, call e_reflow_model_changed so</div><div class='del'>-	it'll pick up any already present cards.</div><div class='del'>-	(table_double_click): ADDRESSBOOK_MODEL -&gt; TABLE_ADAPTER.</div><div class='del'>-	(get_card_list_1): remove the cast, since we don't need it any</div><div class='del'>-	longer.</div><div class='del'>-	(table_right_click): ADDRESSBOOK_MODEL -&gt; TABLE_ADAPTER.</div><div class='del'>-	(table_drag_data_get): same.</div><div class='del'>-	(create_table_view): create the table adapter, and use it as our</div><div class='del'>-	ETableModel.</div><div class='del'>-	(change_view_type): remove the status_message hook up and setting</div><div class='del'>-	of query/book/editable.</div><div class='del'>-	(e_addressbook_view_stop): just call e_addressbook_model_stop here</div><div class='del'>-	instead of switching on the view type.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add</div><div class='del'>-	our EAddressbookModel.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the</div><div class='del'>-	adapter files, and remove e-minicard-view-model.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-model.[ch]: removed.</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.c: new file.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-table-adapter.h: new file.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c: rework this class to now</div><div class='del'>-	subclass from ETableModel anymore.  It not subclasses from</div><div class='del'>-	GtkObject, and we use table and reflow adapters to get at the</div><div class='del'>-	data.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.h: same.</div><div class='del'>-</div><div class='del'>-2001-05-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small</div><div class='del'>-	error not decreasing the data_count here.</div><div class='del'>-</div><div class='del'>-2001-05-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.h: add prototype for</div><div class='del'>-	addressbook_expand_uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_drop): create an EBook for</div><div class='del'>-	@physical_uri.</div><div class='del'>-	(dnd_drop_book_open_cb): actually add the dropped cards.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_expand_uri): abstract</div><div class='del'>-	this code out from the set_prop method so we can use it in the</div><div class='del'>-	component.</div><div class='del'>-	(set_prop): call addressbook_expand_uri.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.h: add prototype for</div><div class='del'>-	e_card_load_cards_from_string.</div><div class='del'>-</div><div class='del'>-2001-05-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c</div><div class='del'>-	(destination_folder_handle_drop): spew the data passed to us.</div><div class='del'>-	(destination_folder_handle_motion): the suggested_action is not an</div><div class='del'>-	ActionSet, but an Action, so don't or together multiple actions.</div><div class='del'>-</div><div class='del'>-2001-05-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_source_dialog):</div><div class='del'>-	correct bug causing the Ok button to never be enabled.</div><div class='del'>-</div><div class='del'>-2001-05-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (populate_context_menu):</div><div class='del'>-	example.</div><div class='del'>-</div><div class='del'>-2001-05-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):</div><div class='del'>-	use e_card_list_get_vcard to build up the data to send.</div><div class='del'>-	(e_minicard_view_init): connect to the model's drag_begin signal.</div><div class='del'>-	(e_minicard_view_drag_begin): gather the list of cards being</div><div class='del'>-	dragged and call gtk_drag_begin.</div><div class='del'>-	(add_to_list): new function.</div><div class='del'>-	(get_card_list): same.</div><div class='del'>-	(disconnect_signals): disconnect the drag_data_get signal.</div><div class='del'>-	(e_minicard_view_init): connect to the drag_begin signal on our</div><div class='del'>-	model.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change</div><div class='del'>-	drag_card to drag_list.</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new</div><div class='del'>-	function, emit our drag_begin signal.</div><div class='del'>-	(addressbook_incarnate): connect to the item's drag_begin signal.</div><div class='del'>-	(e_minicard_view_model_class_init): init our drag_begin signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (addressbook_source_dialog):</div><div class='del'>-	always loop through all source types here, making LDAP first so</div><div class='del'>-	it's forces as the first notebook item.</div><div class='del'>-	(addressbook_config_auth_label): remove SASL case.</div><div class='del'>-	(addressbook_source_edit_changed): same.</div><div class='del'>-	(addressbook_source_item_new): flag the area of code that needs to</div><div class='del'>-	go into the advanced dialog (if we add one before someone</div><div class='del'>-	graciously redesigns the entire addressbook gui :)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove</div><div class='del'>-	SASL case.</div><div class='del'>-	(ldap_parse_auth): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: make LDAP come first in our</div><div class='del'>-	source type enumeration, and remove the SASL auth type.</div><div class='del'>-</div><div class='del'>-2001-05-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and</div><div class='del'>-	the full_name or file_as haven't been yet, set them.</div><div class='del'>-</div><div class='del'>-2001-05-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Reordered the includes here.</div><div class='del'>-	(string_to_dbt): The sleepycat libdb documentation suggests</div><div class='del'>-	memseting the DBT to 0 so we do that here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip</div><div class='del'>-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): Skip the</div><div class='del'>-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.</div><div class='del'>-</div><div class='del'>-2001-05-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only</div><div class='del'>-	check schema support if we've connected.</div><div class='del'>-</div><div class='del'>-2001-05-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (enable_writable_fields):</div><div class='del'>-	don't leak the ECard or ECardSimple.</div><div class='del'>-</div><div class='del'>-2001-05-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:</div><div class='del'>-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Rename all the GnomeCard to VCard.</div><div class='del'>-</div><div class='del'>-	* evolution-vcard-importer.c: Make the GnomeCard a generic </div><div class='del'>-	vcard importer.</div><div class='del'>-</div><div class='del'>-2001-05-08  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed</div><div class='del'>-	e-card-pairs.h since we're not using it.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):</div><div class='del'>-	Added break; to default: case here.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added changed variable so as to avoid sync_card when possible.</div><div class='del'>-	(e_card_simple_destroy): Free all the data here properly.</div><div class='del'>-	(e_card_simple_get_arg): Slight simplification here.</div><div class='del'>-	(fill_in_info, e_card_simple_arbitrary_foreach,</div><div class='del'>-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to</div><div class='del'>-	save a bit of memory.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up</div><div class='del'>-	includes a bit.</div><div class='del'>-	(e_card_list_get_vcard, e_card_list_send): Added these functions</div><div class='del'>-	for acting on a group of cards.</div><div class='del'>-	(parse_org): Cleaned up this function a bit.</div><div class='del'>-	(e_card_free_empty_lists): Added this function to delete</div><div class='del'>-	unnecessary ELists and save a bit of memory.</div><div class='del'>-	(e_v_object_get_child_value): Made this return NULL if not found</div><div class='del'>-	instead of g_strdup("").</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-save-as.c,</div><div class='del'>-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added</div><div class='del'>-	this function to save multiple contacts.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Commented out reflow test.</div><div class='del'>-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and</div><div class='del'>-	e-minicard-view-model.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-model.c,</div><div class='del'>-	gui/widgets/e-minicard-view-model.h: Model for use in</div><div class='del'>-	EMinicardView.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:</div><div class='del'>-	Reworked this to use the new EReflow stuff.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle</div><div class='del'>-	right click menus now.  Emits a signal on the parent canvas item</div><div class='del'>-	instead.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c,</div><div class='del'>-	printing/e-contact-print-envelope.h</div><div class='del'>-	(e_contact_print_envelope_list_dialog_new): Added this function to</div><div class='del'>-	print multiple envelopes (only prints first for now.)</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h</div><div class='del'>-	(e_contact_print_card_list_dialog_new): Added this function to</div><div class='del'>-	print multiple cards.  Only prints the first for now.</div><div class='del'>-</div><div class='del'>-2001-05-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (remove_folder): flesh out</div><div class='del'>-	the function more.  It should work now, but there's no way to</div><div class='del'>-	invoke this method from the ui at the moment, heh.</div><div class='del'>-</div><div class='del'>-2001-05-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (book_open_cb): Use a different</div><div class='del'>-	error message in the ldap support/no ldap support/file cases.</div><div class='del'>-</div><div class='del'>-2001-05-07  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: use define from</div><div class='del'>-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu</div><div class='del'>-	names.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:</div><div class='del'>-	removed EVOLUTION_VERSION.</div><div class='del'>-</div><div class='del'>-2001-05-04  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (remove_folder): un-#if 0</div><div class='del'>-	this.</div><div class='del'>-	(xfer_folder): add skeleton code to validate xfer request.  always</div><div class='del'>-	notifies with PERMISSION_DENIED at present.</div><div class='del'>-	(populate_context_menu): un-#if 0 this.</div><div class='del'>-	(get_dnd_selection): same.</div><div class='del'>-	(destination_folder_handle_motion): new function.</div><div class='del'>-	(destination_folder_handle_drop): new function.</div><div class='del'>-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder</div><div class='del'>-	interface, and add it to our shell component.</div><div class='del'>-</div><div class='del'>-2001-05-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): init change_id to NULL</div><div class='del'>-</div><div class='del'>-2001-05-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_view_free): unref the</div><div class='del'>-	book if the view is being destroyed</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): unref the book_view when</div><div class='del'>-	we are finished, it is only interesting if someone else has reffed</div><div class='del'>-	it now (weak reference)</div><div class='del'>-	(pas_backend_file_add_client): unref the book for the same reason</div><div class='del'>-	as above</div><div class='del'>-</div><div class='del'>-	* Fixes bug #2255</div><div class='del'>-</div><div class='del'>-2001-04-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the</div><div class='del'>-	view does not contain a search context, the result is by default</div><div class='del'>-	false fixes #2470</div><div class='del'>-</div><div class='del'>-2001-04-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Remove call to</div><div class='del'>-	unicode_init.</div><div class='del'>-</div><div class='del'>-2001-04-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c: Lots of code has been</div><div class='del'>-	simplified here.</div><div class='del'>-	(e_address_popup_factory_new_control): Rather than directly pop</div><div class='del'>-	our control up in a window (via the e_address_popup_popup</div><div class='del'>-	function, which is now gone), just return the widget and let the</div><div class='del'>-	caller do the popping.  This works better, since it means we don't</div><div class='del'>-	have to work around the vagaries of bonobo focus &amp; event handling.</div><div class='del'>-	(e_address_popup_set_name): Refresh when both name &amp; email have</div><div class='del'>-	been set, rather than checking a stupid counter.</div><div class='del'>-	(e_address_popup_set_email): Ditto.</div><div class='del'>-</div><div class='del'>-2001-04-22  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_storage_clear_sources): Added save_source_data here.</div><div class='del'>-</div><div class='del'>-2001-04-21  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly</div><div class='del'>-	convert to utf8. (Bug #2256)</div><div class='del'>-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)</div><div class='del'>-</div><div class='del'>-2001-04-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_name): Added.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(real_add_address_cb): Use e_select_names_model_append.  It's</div><div class='del'>-	nicer.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_append): Added.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(book_query_process_card_list): Filter out completion matches that</div><div class='del'>-	don't have an associated e-mail address.</div><div class='del'>-	(book_query_score): Give a bonus to the primary address, so that</div><div class='del'>-	it always comes up first in the completion results.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):</div><div class='del'>-	Convert utf8 strings into gtk strings before displaying.</div><div class='del'>-</div><div class='del'>-2001-04-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c,</div><div class='del'>-	backend/ebook/e-book-view-listener.h: Added the function</div><div class='del'>-	e_book_view_listener_stop to tell the book view listener to stop</div><div class='del'>-	sending signals.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the</div><div class='del'>-	EBookViewListener to stop when we're destroyed.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (view_destroy,</div><div class='del'>-	pas_backend_file_process_get_book_view,</div><div class='del'>-	pas_backend_file_process_get_changes): Cleaned these up a bit</div><div class='del'>-	using bonobo_object_ref and bonobo_object_unref.</div><div class='del'>-	(pas_backend_file_process_get_book_view,</div><div class='del'>-	pas_backend_file_process_get_changes): bonobo_object_release_unref</div><div class='del'>-	the EBookListener here.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit</div><div class='del'>-	using bonobo_object_ref.  Make sure to unref the listener when</div><div class='del'>-	we're done with it.  Put the new book_view in the list before</div><div class='del'>-	telling the book_listener that it's ready.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned</div><div class='del'>-	this up a bit using bonobo_object_dup_ref.</div><div class='del'>-	(pas_book_view_destroy): Cleaned this up a bit using</div><div class='del'>-	bonobo_object_release_unref.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,</div><div class='del'>-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of</div><div class='del'>-	just duplicating.</div><div class='del'>-</div><div class='del'>-2001-04-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(impl_BookListener_respond_get_cursor): Ref the cursor here when</div><div class='del'>-	we receive it.</div><div class='del'>-	(impl_BookListener_respond_get_view,</div><div class='del'>-	impl_BookListener_respond_get_changes): Ref the book_view here</div><div class='del'>-	when we receive it.</div><div class='del'>-	(impl_BookListener_respond_open_book): Ref the book here when we</div><div class='del'>-	receive it.</div><div class='del'>-	(e_book_listener_destroy): Unref the objects in our queue here.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned</div><div class='del'>-	this up using bonobo_object_dup_ref.</div><div class='del'>-	(e_book_view_destroy): Cleaned this up using</div><div class='del'>-	bonobo_object_release_unref.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,</div><div class='del'>-	e_book_do_response_get_view, e_book_do_response_get_changes,</div><div class='del'>-	e_book_unload_uri): Cleaned this up using</div><div class='del'>-	bonobo_object_release_unref.</div><div class='del'>-</div><div class='del'>-2001-04-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Get the ESelectNamesModel from the</div><div class='del'>-	widget's text model instead of storing it as a gtk_object_set_data</div><div class='del'>-	since it may change.</div><div class='del'>-</div><div class='del'>-2001-04-12  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice</div><div class='del'>-	and Fax phone numbers too, finishing off bug #1667.</div><div class='del'>-</div><div class='del'>-2001-04-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built</div><div class='del'>-	in VCard.</div><div class='del'>-</div><div class='del'>-2001-04-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): put the</div><div class='del'>-	business address into the pilot record as that is what we put into</div><div class='del'>-	the desktop record</div><div class='del'>-	(ecard_from_remote_record): set both the address label and</div><div class='del'>-	delivery address to avoid bad parser guessing, fixes #2143</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: remove deprecated pilot code</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: ditto</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.h: ditto</div><div class='del'>-	</div><div class='del'>-2001-04-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): Don't add</div><div class='del'>-	more than five phone numbers and set the remaining blank entries</div><div class='del'>-	to some reasonable defaults</div><div class='del'>-</div><div class='del'>-2001-04-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: Added</div><div class='del'>-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (accepted_dnd_types):</div><div class='del'>-	Fixed a warning here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c: Modified this to have more</div><div class='del'>-	columns, but not let them be edited if they're not a simple</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a</div><div class='del'>-	warning and a memory leak here.</div><div class='del'>-</div><div class='del'>-2001-04-10  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.</div><div class='del'>-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were</div><div class='del'>-	not translated after selecting one of them.</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().</div><div class='del'>-	Updated list[] for translators.</div><div class='del'>-	* gui/widgets/e-minicard.c: same.</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning</div><div class='del'>-	for "editable" arg.</div><div class='del'>-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.</div><div class='del'>-</div><div class='del'>-2001-04-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (remove_folder): stubbed,</div><div class='del'>-	#if 0'ed</div><div class='del'>-	(xfer_folder): same.</div><div class='del'>-	(populate_context_menu): same.</div><div class='del'>-	(get_dnd_selection): same.</div><div class='del'>-	(factory_fn): add the accepted drag types ("text/x-vard") to</div><div class='del'>-	folder_types.</div><div class='del'>-</div><div class='del'>-2001-04-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if</div><div class='del'>-	it's button 1, store the button x, y, and set drag_button_down to</div><div class='del'>-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.</div><div class='del'>-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3</div><div class='del'>-	pixels.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for</div><div class='del'>-	button x, y, and a bit for if the button has been pressed so we</div><div class='del'>-	can tell whether a motion should be a drag.</div><div class='del'>-	(struct _EMinicardClass): add drag_begin signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new</div><div class='del'>-	function, starts the drag.</div><div class='del'>-	(book_view_loaded): connect the "drag_data_get" signal.</div><div class='del'>-	(e_minicard_view_drag_data_get): new function.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add</div><div class='del'>-	drag_card and id for canvas_drag_data_get_id.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new</div><div class='del'>-	function.</div><div class='del'>-	(create_table_view): add d&amp;d stuff.</div><div class='del'>-</div><div class='del'>-2001-04-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: add #include &lt;sys/types.h&gt; since</div><div class='del'>-	gnome-print.h uses time_t without including it.  this really</div><div class='del'>-	should be fixed in gnome-print.</div><div class='del'>-</div><div class='del'>-2001-04-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):</div><div class='del'>-	make sure to notify new clients to the writable status of an</div><div class='del'>-	already open (and authenticated) book.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.[ch]: Fix headers.</div><div class='del'>-	* component/addressbook-storage.c: Same here.</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Same here.</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard-label.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard-view.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard-widget-test.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard-widget.c: Same here.</div><div class='del'>-	* gui/widgets/e-minicard.c: Same here.</div><div class='del'>-	* gui/widgets/test-minicard-label.c: Same here.</div><div class='del'>-</div><div class='del'>-2001-04-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a</div><div class='del'>-	crash here.</div><div class='del'>-</div><div class='del'>-2001-04-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model</div><div class='del'>-	more consistent in the number of columns it has.</div><div class='del'>-	(addressbook_append_row): Fixed this function.  We removed the col</div><div class='del'>-	offset.</div><div class='del'>-</div><div class='del'>-2001-04-02  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut</div><div class='del'>-	down and unregister the factory on exit. </div><div class='del'>-</div><div class='del'>-2001-04-01  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: changed icon to</div><div class='del'>-	evolution-contacts-plain.png.</div><div class='del'>-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new</div><div class='del'>-	contact, print, print preview, changed filenames of renamed icons.</div><div class='del'>-</div><div class='del'>-2001-03-31  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(real_add_address_cb): Call e_select_names_model_clean after</div><div class='del'>-	adding address.  This should deal with the bug reports related</div><div class='del'>-	to stray commas.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_clean): Added.  Remove all empty destinations.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check</div><div class='del'>-	if an EDestination is in essentially a null state.</div><div class='del'>-</div><div class='del'>-2001-03-30  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):</div><div class='del'>-	Tell new clients that are added whether they're writable.</div><div class='del'>-</div><div class='del'>-2001-03-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Added #include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-	</div><div class='del'>-	* printing/e-contact-print-envelope.c: Added #include &lt;time.h&gt;</div><div class='del'>-	and #include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-</div><div class='del'>-2001-04-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_email): Better handle matching of "nameless" contacts.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_string): Better</div><div class='del'>-	handle the case of a "nameless" contact.</div><div class='del'>-</div><div class='del'>-2001-03-29  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* *.*: Clean up #includes. Replace &lt;gnome.h&gt;, &lt;bonobo.h&gt; and</div><div class='del'>-	&lt;gtk/gtk.h&gt; with more finegrained headers where needed.</div><div class='del'>-</div><div class='del'>-2001-03-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.</div><div class='del'>-</div><div class='del'>-2001-03-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c</div><div class='del'>-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of</div><div class='del'>-	getting the NAME and then the ORG.  That way if we expand</div><div class='del'>-	NAME_OR_ORG, this will use it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_addressbook_create_ebook_table, SPEC): Use the correct column</div><div class='del'>-	in the SPEC.</div><div class='del'>-</div><div class='del'>-2001-03-25  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_seq_complete_cb): Rather than starting</div><div class='del'>-	the pending query by directly calling</div><div class='del'>-	e_select_names_completion_do_query, call</div><div class='del'>-	e_completion_begin_search.  Circumventing the ECompletion API was</div><div class='del'>-	causing it to get confused in some cases.</div><div class='del'>-</div><div class='del'>-2001-03-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):</div><div class='del'>-	Added.  Call me old-fashioned, but I just prefer to have a real</div><div class='del'>-	API rather than doing everything via gtk_object_get/set-type</div><div class='del'>-	calls.</div><div class='del'>-	(e_minicard_widget_set_arg): Changed to call</div><div class='del'>-	e_minicard_widget_set_card.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c: Small changes to get rid of</div><div class='del'>-	compiler warnings.  (Casting out const, removed unused variables,</div><div class='del'>-	etc.)  Removed some debugging messages.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Added call</div><div class='del'>-	to e_address_popup_factory_init.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-popup.c: Added.  A popup gadget that is</div><div class='del'>-	invoked (as a bonobo control) when an address is left-clicked in</div><div class='del'>-	the mailer.  The addressbook is queries, and the address is either</div><div class='del'>-	displayed as a minicard (if it already exists) or in a "generic</div><div class='del'>-	format".  A button is provided for editting/adding the contact.</div><div class='del'>-	Some of the semantics of this widget are a bit... non-standard,</div><div class='del'>-	because of bonobo issues.  I can't really seem to replicate</div><div class='del'>-	popup-menu behavior because of how bonobo propogates events, etc.</div><div class='del'>-	so I've tried to produce something that I think is non-annoying.</div><div class='del'>-	YMMV.</div><div class='del'>-</div><div class='del'>-2001-03-22  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new</div><div class='del'>-	IDL.</div><div class='del'>-</div><div class='del'>-2001-03-20  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_pixmaps): Added artwork from</div><div class='del'>-	Jakub. </div><div class='del'>-</div><div class='del'>-2001-03-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Merged branch:</div><div class='del'>-</div><div class='del'>-2001-03-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c: Call</div><div class='del'>-	e_selection_model_simple_insert_rows and</div><div class='del'>-	e_selection_model_simple_delete_rows instead of</div><div class='del'>-	e_selection_model_simple_insert_row and</div><div class='del'>-	e_selection_model_simple_delete_row.</div><div class='del'>-</div><div class='del'>-End of branch</div><div class='del'>-</div><div class='del'>-2001-03-17  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: Brutally</div><div class='del'>-	refactored to boost performance in large-addressbook situations.</div><div class='del'>-	These fixes give accepable performance (even with the suboptimal</div><div class='del'>-	pas-backend-file searching) using tigert's addressbook-of-death.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): </div><div class='del'>-	Start feeding query matches back to the caller before the</div><div class='del'>-	entire search is complete; this gives us some "instant feedback"</div><div class='del'>-	rather than causing evolution to totally lock up...</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.</div><div class='del'>-	(e_book_cancel_op): Added.  Search for a pending op with a given</div><div class='del'>-	tag, and mark it as inactive.</div><div class='del'>-	(e_book_do_response_get_cursor): Don't execute callback if this</div><div class='del'>-	operations has been cancelled.</div><div class='del'>-	(e_book_do_response_get_view): Ditto.</div><div class='del'>-	(e_book_do_response_get_changes): Ditto.</div><div class='del'>-	(e_book_do_response_get_supported_fields): Ditto.</div><div class='del'>-	(e_book_get_supported_fields): Return an operation tag (that can</div><div class='del'>-	be used to cancel the operation) rather than just TRUE/FALSE.</div><div class='del'>-	Zero is always an invalid tag and is returned in the case of an</div><div class='del'>-	error, so this shouldn't break any code that looked at the return</div><div class='del'>-	value (unless it did so in a particularly stupid way, of course).</div><div class='del'>-	(e_book_get_cursor): Ditto.</div><div class='del'>-	(e_book_get_book_view): Ditto.</div><div class='del'>-	(e_book_get_changes): Ditto.</div><div class='del'>-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically</div><div class='del'>-	a call to e_book_cancel_op with error checking, etc.)</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.</div><div class='del'>-</div><div class='del'>-2001-03-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_writable_status): new function.</div><div class='del'>-	(impl_BookListener_report_writable): new function.</div><div class='del'>-	(e_book_listener_get_epv): fill in epv-&gt;notifyWritable.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.h: add writable status entries.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.</div><div class='del'>-	(e_book_check_listener_queue): add WritableStatusEvent to the</div><div class='del'>-	switch.</div><div class='del'>-	(e_book_class_init): register writable_status signal.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: add writable_status signal.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add notifyWritable method to</div><div class='del'>-	BookListener.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"</div><div class='del'>-	arg.</div><div class='del'>-	(e_minicard_init): init editable.</div><div class='del'>-	(e_minicard_set_arg): loop over the minicard fields setting their</div><div class='del'>-	"editable".</div><div class='del'>-	(e_minicard_get_arg): add editable.</div><div class='del'>-	(supported_fields_cb): use editable when creating the</div><div class='del'>-	contact_editor.</div><div class='del'>-	(add_field): set "editable" when creatin the e_minicard.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add</div><div class='del'>-	editable arg.</div><div class='del'>-	(e_minicard_view_init): init editable.</div><div class='del'>-	(create_card): pass editable to e_minicard canvas item.</div><div class='del'>-	(e_minicard_view_set_arg): bit of a hack - loop over all the</div><div class='del'>-	canvas items setting their "editable."</div><div class='del'>-	(e_minicard_view_get_arg): add editable.</div><div class='del'>-	(supported_fields_cb): use editable when creating the contact</div><div class='del'>-	editor.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add</div><div class='del'>-	"editable."</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_class_init): add "editable" field.</div><div class='del'>-	(e_minicard_view_widget_init): init editable to FALSE.</div><div class='del'>-	(e_minicard_view_widget_set_arg): save editable, and pass it along</div><div class='del'>-	the e-minicard-view.</div><div class='del'>-	(e_minicard_view_widget_realize): same.</div><div class='del'>-	(e_minicard_view_widget_get_arg): add editable.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h (struct</div><div class='del'>-	_EMinicardViewWidget): add "editable" field.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add</div><div class='del'>-	"editable" field.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):</div><div class='del'>-	add "editable" arg.</div><div class='del'>-	(e_minicard_label_set_arg): editable, set it on the e_text too.</div><div class='del'>-	(e_minicard_label_get_arg): editable.</div><div class='del'>-	(e_minicard_label_construct): set the "editable" field when we</div><div class='del'>-	create the e_text cavas item</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):</div><div class='del'>-	default editable to FALSE.</div><div class='del'>-	(book_writable_cb): new function, set our editable field and</div><div class='del'>-	gtk_object_set it on the active view.</div><div class='del'>-	(e_addressbook_view_set_arg): set the active view's editable when</div><div class='del'>-	we set the view's book, and connect the "writable_status" signal</div><div class='del'>-	to book_writable_cb.</div><div class='del'>-	(change_view_type): same.</div><div class='del'>-	(supported_fields_cb): use our "editable" when creating the</div><div class='del'>-	contact editor.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add</div><div class='del'>-	editable field.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):</div><div class='del'>-	change the default of editable to FALSE.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_report_writable): new function.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if</div><div class='del'>-	we open the file O_RDWR (or create it) report it as writable.  if</div><div class='del'>-	we can't open it as O_RDWR, try opening it read-only before we</div><div class='del'>-	attempt to create it.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): if we authenticate</div><div class='del'>-	successfully, grant write permissions (this is lacking but there's</div><div class='del'>-	really nothing we can do to determine the extent of the access</div><div class='del'>-	afforded a user.)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2001-03-15  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-widget.c: Added addressbook querying and</div><div class='del'>-	"cardification" functions, which are turned off by default for now</div><div class='del'>-	because of addressbook bugs.  Added a popup menu option to turn</div><div class='del'>-	queries on, so that others can enjoy the thrill of massive flaming</div><div class='del'>-	death.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Made warnings always</div><div class='del'>-	be fatal.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-view.c: Added some debugging spew.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added</div><div class='del'>-	a little experimental code to try to make file searches scale</div><div class='del'>-	better.  #if 0/#endif-ed out for now.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_name_match_string): Added.</div><div class='del'>-	Looser name-matching function.</div><div class='del'>-	(e_card_email_match_string): Added.  Loose e-mail matching.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c</div><div class='del'>-	(e_book_view_listener_check_queue): Added code to cause us to</div><div class='del'>-	abort rather than get trapped in a 100%-CPU-consuming loop in</div><div class='del'>-	certain situations.  Now we just need to figure out how to avoid</div><div class='del'>-	these situations altogether.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-util.c: Added.  Now contains the simple</div><div class='del'>-	query stuff and the open local addressbook functions.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Moved simple query stuff and open local</div><div class='del'>-	addressbook functions into e-book-util.c.</div><div class='del'>-</div><div class='del'>-2001-03-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): </div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):</div><div class='del'>-	Update arguments to e_canvas_item_grab_focus.</div><div class='del'>-</div><div class='del'>-2001-03-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_pixmaps): Fix a warning</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2001-03-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to</div><div class='del'>-	ld order from Greg Williams.</div><div class='del'>-</div><div class='del'>-2001-03-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): Moved where we call</div><div class='del'>-	pas_book_respond_get_book_view.</div><div class='del'>-</div><div class='del'>-2001-03-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for</div><div class='del'>-	categories.</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: add categories attribute.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (field_data): add</div><div class='del'>-	E_CARD_SIMPLE_FIELD_CATEGORIES.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: add</div><div class='del'>-	E_CARD_SIMPLE_FIELD_CATEGORIES.</div><div class='del'>-</div><div class='del'>-2001-03-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only</div><div class='del'>-	param.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add</div><div class='del'>-	is_read_only param.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add</div><div class='del'>-	is_read_only param.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): add is_read_only param.</div><div class='del'>-	also, include a little policy here and make it TRUE, as the user</div><div class='del'>-	shouldn't be editting in this context anyway (imo).</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (supported_fields_cb): add</div><div class='del'>-	is_read_only param.</div><div class='del'>-</div><div class='del'>-	* contact-editor/test-editor.c (main): add is_read_only param.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (set_read_only): new function,</div><div class='del'>-	that either enables or disables all the text fields, combo boxes,</div><div class='del'>-	and some buttons, depending on the state of is_read_only.</div><div class='del'>-	(e_contact_editor_class_init): add read/write arg "is_read_only".</div><div class='del'>-	(full_name_clicked): set the is_read_only of the fullname dialog</div><div class='del'>-	to the editor's.</div><div class='del'>-	(full_addr_clicked): same.</div><div class='del'>-	(e_contact_editor_new): add is_read_only param, that gets set</div><div class='del'>-	along with the other params.</div><div class='del'>-	(e_contact_editor_set_arg): add setter for is_read_only.</div><div class='del'>-	(e_contact_editor_get_arg): add getter for is_read_only.</div><div class='del'>-	(_phone_arrow_pressed): change TRUE to !editor-&gt;is_read_only for</div><div class='del'>-	entry.</div><div class='del'>-	(_email_arrow_pressed): same.</div><div class='del'>-	(_address_arrow_pressed): same.</div><div class='del'>-	(enable_writable_fields): same.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c</div><div class='del'>-	(e_contact_editor_fullname_class_init): add read/write arg</div><div class='del'>-	"is_read_only".</div><div class='del'>-	(e_contact_editor_fullname_set_arg): add setter for is_read_only</div><div class='del'>-	that enables/disables all the entries/combos.</div><div class='del'>-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.h (struct</div><div class='del'>-	_EContactEditorFullname): add is_read_only flag.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c</div><div class='del'>-	(e_contact_editor_address_class_init): add read/write arg</div><div class='del'>-	"is_read_only".</div><div class='del'>-	(e_contact_editor_address_set_arg): add setter for is_read_only</div><div class='del'>-	that disables/enables all the entries/combos.</div><div class='del'>-	(e_contact_editor_address_get_arg): add getter for is_read_only.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.h (struct</div><div class='del'>-	_EContactEditorAddress): add is_read_only flag.</div><div class='del'>-</div><div class='del'>-2001-03-13  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Change the importer includes around a bit.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.</div><div class='del'>-</div><div class='del'>-2001-03-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become</div><div class='del'>-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo</div><div class='del'>-</div><div class='del'>-2001-03-11  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_simple_query): Added. A</div><div class='del'>-	simplified, cancellable query mechanism that lets you avoid</div><div class='del'>-	dealing with EBookView.</div><div class='del'>-	(e_book_simple_query_cancel): Added. Cancels a running query.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.</div><div class='del'>-</div><div class='del'>-2001-03-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c</div><div class='del'>-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.</div><div class='del'>-	Removed debugging code, hopefully without introducing any bugs</div><div class='del'>-	in the process.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Fix bug with commas</div><div class='del'>-	inside of name/address combos.  As long as the comma is inside of</div><div class='del'>-	quotes, it will be treated as part of the name rather than as a</div><div class='del'>-	break between addresses.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(match_nickname): Use e_card_name_to_string for nickname match</div><div class='del'>-	strings.</div><div class='del'>-	(match_email): Use e_card_name_to_string for email match strings.</div><div class='del'>-	(e_select_names_completion_begin): Strip quotes out of query text,</div><div class='del'>-	so we don't produce malformed sexps.</div><div class='del'>-	Added William Blake quote easter egg.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...</div><div class='del'>-	mostly unsuccessful.</div><div class='del'>-	(e_contact_quick_add_free_form): Added.  Takes a single string</div><div class='del'>-	and tries to parse out (using some simple, loose rules) the</div><div class='del'>-	name and e-mail -- then calls e_contact_quick_add.  An attempt to </div><div class='del'>-	get the computer to automatically Do The Right Thing.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm</div><div class='del'>-	anal.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server</div><div class='del'>-	info for EAddressWidget.</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server</div><div class='del'>-	info for EAddressWidget.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Add call to</div><div class='del'>-	e_address_widget_factory_init.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-address-widget.h: </div><div class='del'>-	* gui/component/e-address-widget.c: Added.  A little widget (and a</div><div class='del'>-	Bonobo control, BTW) for displaying addresses, with a left-click</div><div class='del'>-	menu.  Used to display addresses in the mail viewer (as embedded</div><div class='del'>-	GtkHTML objects, replacing the text previously used).  Still quite</div><div class='del'>-	incomplete.</div><div class='del'>-</div><div class='del'>-2001-03-08  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Specify a</div><div class='del'>-	NULL `EvolutionShellComponentGetDndSelectionFn'.</div><div class='del'>-</div><div class='del'>-2001-03-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Fix glitch with</div><div class='del'>-	inserting comma-delimited stuff when length &gt; 1.</div><div class='del'>-</div><div class='del'>-2001-03-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.</div><div class='del'>-	Just encapsulates opening</div><div class='del'>-	file://~username/evolution/local/Contactes/addressbook.db, so that</div><div class='del'>-	path doesn't need to be hardwired in throughout the code.</div><div class='del'>-</div><div class='del'>-2001-03-06  Benjamin Kahn  &lt;xkahn@cybersites.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c (clicked_cb): </div><div class='del'>-	Added the third argument to e_contact_editor_new.  (Cheated</div><div class='del'>-	and send NULL for the field argument, which is probably</div><div class='del'>-	troublesome.  It will be fixed soon by either clahey or </div><div class='del'>-	toshok.)</div><div class='del'>-</div><div class='del'>-2001-03-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c</div><div class='del'>-	(e_select_names_model_replace): Fix a reference counting bug.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c (popup_cb):</div><div class='del'>-	A callback for creating the appropriate popup by calling</div><div class='del'>-	e_select_names_popup.</div><div class='del'>-	(e_select_names_manager_create_entry): Connect popup_cb to the</div><div class='del'>-	entry's popup signal</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-popup.c: Added.  Code</div><div class='del'>-	for popup right-click menus for recipient entries.  Still a bit</div><div class='del'>-	incomplete.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.c (e_destination_get_email_num):</div><div class='del'>-	Added.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a</div><div class='del'>-	dialog for very quickly adding entries to the address book.</div><div class='del'>-	Still not fully working.</div><div class='del'>-</div><div class='del'>-2001-03-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this</div><div class='del'>-	file a bit.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):</div><div class='del'>-	Made it so that passing in NULL to the writable_fields arg sets</div><div class='del'>-	the set of writable fields to the empty set.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): Pass NULL as the</div><div class='del'>-	writable_fields argument here.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.</div><div class='del'>-	This way we will get the file_as field as one of our</div><div class='del'>-	ETableColumns.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the</div><div class='del'>-	changes in ECardSimple.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item</div><div class='del'>-	isn't realized.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: doh, track renaming of</div><div class='del'>-	objectclass from evolvePerson to evolutionPerson.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolutionperson.schema: rename evolveperson.schema</div><div class='del'>-	to this, and add remaining attributes.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up</div><div class='del'>-	ones that were incorrent (either the ldap_attr or the query prop).</div><div class='del'>-</div><div class='del'>-2001-03-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: update sed script</div><div class='del'>-</div><div class='del'>-	* conduit/e-address.conduit.in: update for new pilot foo</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): track change to</div><div class='del'>-	e_contact_editor_new.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add</div><div class='del'>-	objectclasses for "person", "organizationalPerson", and "top" as</div><div class='del'>-	well, just to be complete.</div><div class='del'>-	(check_schema_support): rename check_for_evolve_person to this, to</div><div class='del'>-	reflect that we're doing more than just checking for that</div><div class='del'>-	objectClass.</div><div class='del'>-	(add_oc_attributes_to_supported_fields): new function.</div><div class='del'>-	(add_to_supported_fields): new function.</div><div class='del'>-	(pas_backend_ldap_destroy): unref supported_fields.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new</div><div class='del'>-	function.</div><div class='del'>-	(e_minicard_view_event): split out the creation of the contact</div><div class='del'>-	editor to the supported_fields callback.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.</div><div class='del'>-	(e_minicard_event): split out the creation of the contact editor</div><div class='del'>-	to the supported_fields callback.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_double_click): split</div><div class='del'>-	function into two functions, since e_book_get_supported_fields</div><div class='del'>-	requires a callback now.</div><div class='del'>-	(supported_fields_cb): new function.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): split this into</div><div class='del'>-	two functions, since e_book_get_supported_fields requires a</div><div class='del'>-	callback now.</div><div class='del'>-	(supported_fields_cb): new function.</div><div class='del'>-</div><div class='del'>-	* contact-editor/test-editor.c (main): track change to</div><div class='del'>-	e_contact_editor_new (pass NULL for the writable_fields arg.)</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: fix several labels so they</div><div class='del'>-	make better sense (since we look them up in e-contact-editor.c.)</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add</div><div class='del'>-	writable_fields.  also, add it to e_contact_editor_new.</div><div class='del'>-	</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):</div><div class='del'>-	add writable_fields arg.</div><div class='del'>-	(e_contact_editor_destroy): unref the writable_fields list.</div><div class='del'>-	(e_contact_editor_new): pass @fields as the writable_fields arg.</div><div class='del'>-	(e_contact_editor_set_arg): add writable_fields support.</div><div class='del'>-	(enable_writable_fields): new (very hairy) function, to disable</div><div class='del'>-	everything and reenable just the fields listed in the</div><div class='del'>-	writable_fields list.</div><div class='del'>-	(_email_arrow_pressed): set label-email1, entry-email1, and</div><div class='del'>-	checkbutton-htmlmail to be sensitive since the only way to get</div><div class='del'>-	here is to activate a writable field in the menu.</div><div class='del'>-	(_address_arrow_pressed): set label-address, button-fulladdr, and</div><div class='del'>-	text-address to be sensitive for the same reason.</div><div class='del'>-	(_phone_arrow_pressed): sensitize the label and entry for the same</div><div class='del'>-	reason.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (field_data): add new entries for</div><div class='del'>-	phone enums, and fill in the ecard_field with (bogus in all but a</div><div class='del'>-	few cases) strings.  these are the strings sent from wombat to</div><div class='del'>-	evolution-addressbook for supported_fields.</div><div class='del'>-	(e_card_simple_get_ecard_field): new function.</div><div class='del'>-	(e_card_simple_map_phone_to_field): new function.</div><div class='del'>-	(e_card_simple_map_email_to_field): new function.</div><div class='del'>-	(e_card_simple_map_address_to_field): new function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: add a few phone entries to the</div><div class='del'>-	ECardSimpleField enum, and add prototypes for mapping the list</div><div class='del'>-	types (phone, email, address) to ECardSimpleField.  Also, add</div><div class='del'>-	prototype for e_card_simple_get_ecard_field.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c</div><div class='del'>-	(e_book_do_response_get_supported_fields): don't build the EList</div><div class='del'>-	here, it's already built.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.h: change fields from the CORBA</div><div class='del'>-	sequence to the EList in our reponse struct.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_get_supported_fields_response): we make the</div><div class='del'>-	EList here, since after we return the CORBA list is freed up.</div><div class='del'>-</div><div class='del'>-2001-03-02  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_supported_fields): implement</div><div class='del'>-	properly, we support everything.</div><div class='del'>-</div><div class='del'>-2001-03-01  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_set_property_fn): Oops, we do need to be able to write to</div><div class='del'>-	"text" after all (for things like Reply-to: to work properly).</div><div class='del'>-	Fixed.</div><div class='del'>-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable</div><div class='del'>-	property again.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_insert_length): Increment pos so that</div><div class='del'>-	we don't reverse strings when length &gt; 1 (a particularly amusing</div><div class='del'>-	bug).</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c</div><div class='del'>-	(e_select_names_completion_destroy): Check for NULL before calling</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error</div><div class='del'>-	messages.</div><div class='del'>-</div><div class='del'>-2001-03-01  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: I am an</div><div class='del'>-	idiot.</div><div class='del'>-</div><div class='del'>-2001-03-01  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c</div><div class='del'>-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_get_source): Added.  A function for</div><div class='del'>-	looking up the ESelectNamesModel by id.  (I didn't end up using</div><div class='del'>-	this function, but it might come in handy later.)</div><div class='del'>-	(e_select_names_manager_get_cards): #if 0/#endif out this</div><div class='del'>-	function.</div><div class='del'>-	(e_select_names_manager_create_entry): Modified to attach an</div><div class='del'>-	ESelectNamesCompletion to the entry we create.</div><div class='del'>-	(completion_handler): A post-completion handler for our EEntry, to</div><div class='del'>-	take the completion's extra data (an EDestination) and properly</div><div class='del'>-	stick it into our ESelectNamesModel.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(real_add_address_cb): Changed to operate on EDestinations rather</div><div class='del'>-	than ECards and to use the new ESelectNamesModel API.  This leads</div><div class='del'>-	to a rather nice code simplication.</div><div class='del'>-	(remove_address): Changed for new ESelectNamesModel API.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): Rather than just passing the entry's text</div><div class='del'>-	through the property bag, get the "address text" from the model.</div><div class='del'>-	This returns a nice, verbose string of addresses with names</div><div class='del'>-	expanded when the address is tied to an ECard (i.e. "Jon</div><div class='del'>-	Trowbridge &lt;trow@ximian.com&gt;").</div><div class='del'>-	(impl_SelectNames_get_entry_for_section): Make the text property</div><div class='del'>-	read-only.</div><div class='del'>-	(entry_set_property_fn): ...and since it is read-only now, chop</div><div class='del'>-	out the setter code.</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.h: </div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Again,</div><div class='del'>-	this code has been (pretty much) totally rewritten to convert all</div><div class='del'>-	text operations into changes on the ESelectNamesModel.  This lets</div><div class='del'>-	us give the associated EEntry some (IMHO) nice semantics regarding</div><div class='del'>-	whitespace, etc.  Includes object activation, so destinations tied</div><div class='del'>-	to ECards are underlined and can be double-clicked to bring up a</div><div class='del'>-	contact editor.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.h: </div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: I've heavily</div><div class='del'>-	modified this object to both hide all implementation details</div><div class='del'>-	(which the old version exposed a bit too much for my peculiar</div><div class='del'>-	tastes) and to act as an EDestination container.  The old code put</div><div class='del'>-	the text model operations here.  I've moved them all to</div><div class='del'>-	ESelectNamesTextModel --- so the text model actions (insert,</div><div class='del'>-	delete, etc.) are all done through the API rather than operating on</div><div class='del'>-	ESelectNamesModel internals.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.c: Added.  A</div><div class='del'>-	fairly complicated object derived from ECompletion that searches</div><div class='del'>-	our local addressbook in various and sundry ways.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-completion.h: </div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-destination.h: </div><div class='del'>-	* backend/ebook/e-destination.c: Added.  This object encapsulates</div><div class='del'>-	a place to sent an email to, which can either be just a address as</div><div class='del'>-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge</div><div class='del'>-	&lt;trow@ximian.com&gt;"), or an ECard and a specific address within</div><div class='del'>-	that ECard.</div><div class='del'>-</div><div class='del'>-2001-03-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,</div><div class='del'>-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used</div><div class='del'>-	ESelectionModelSimple and the changes to EReflow and EReflowSorted</div><div class='del'>-	to get multiple selection in the minicard view.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/test-reflow.c: Changed this to get it to compile</div><div class='del'>-	with the changes to EReflow.</div><div class='del'>-</div><div class='del'>-2001-02-21  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made</div><div class='del'>-	this pay attention to the return value of e_sexp_parse.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_activate_obj): Fixed a const</div><div class='del'>-	inconsistency here.</div><div class='del'>-</div><div class='del'>-2001-02-21  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):</div><div class='del'>-	new function.</div><div class='del'>-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track</div><div class='del'>-	change to idl.</div><div class='del'>-	(pas_book_respond_get_supported_fields): new function.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: add GetSupportedFields to the</div><div class='del'>-	PASOperation enum.  Also, add a stringlist field to the PASRequest</div><div class='del'>-	struct.  lastly, add a prototype for</div><div class='del'>-	pas_book_respond_get_supported_fields.</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-backend.h: remove prototype for</div><div class='del'>-	pas_backend_get_supported_fields, and remove it from the vtable.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):</div><div class='del'>-	remove.</div><div class='del'>-	(pas_backend_class_init): no vtable entry for get_supported_fields</div><div class='del'>-	anymore.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_get_supported_fields): new function.</div><div class='del'>-	(pas_backend_ldap_process_client_requests): add case for</div><div class='del'>-	GetSupportedFields.</div><div class='del'>-	(pas_backend_ldap_class_init): get_supported_fields isn't in</div><div class='del'>-	vtable anymore.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_supported_fields): new function.</div><div class='del'>-	(pas_backend_file_process_client_requests): add case for</div><div class='del'>-	GetSupportedFields.</div><div class='del'>-	(pas_backend_file_class_init): get_supported_fields isn't in</div><div class='del'>-	vtable anymore.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: Book::getSupportedFields now</div><div class='del'>-	returns void and add BookListener::notifySupportedFields.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c (get_fields_cb): new function.</div><div class='del'>-	(auth_user_cb): track change to e_book_get_supported_fields.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c</div><div class='del'>-	(e_book_do_response_get_supported_fields): new function.</div><div class='del'>-	(e_book_check_listener_queue): add case</div><div class='del'>-	GetSupportedFieldsResponse.</div><div class='del'>-	(e_book_get_supported_fields): switch to async model.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an</div><div class='del'>-	async model.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_get_supported_fields_response): new</div><div class='del'>-	function.</div><div class='del'>-	(impl_BookListener_response_get_supported_fields): new function.</div><div class='del'>-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.h: add an async response for</div><div class='del'>-	GetSupportedFields and add a stringlist member to the</div><div class='del'>-	EBookListenerResponse struct.</div><div class='del'>-</div><div class='del'>-2001-02-20  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):</div><div class='del'>-	Moved the register_factory() code to here, since it was the only</div><div class='del'>-	thing being called anyways.</div><div class='del'>-	(PasBookFactoryPrivate): Added a "registered" flag.</div><div class='del'>-	(pas_book_factory_activate): Set the registered flag.</div><div class='del'>-	(pas_book_factory_destroy): Deactivate the factory when we go away.</div><div class='del'>-</div><div class='del'>-2001-02-20  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: add e-book interface to getting</div><div class='del'>-	supported fields.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some</div><div class='del'>-	spew about supported fields.</div><div class='del'>-</div><div class='del'>-2001-02-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Remove PISOCK_LIBDIR</div><div class='del'>-</div><div class='del'>-2001-02-19  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_create_entry): When creating the entry,</div><div class='del'>-	open up an ebook (corresponding to the local addressbook) and make</div><div class='del'>-	the entry use an EAddressCompletion.</div><div class='del'>-	(completion_handler): Added; this is the actual completion</div><div class='del'>-	handler, which manipulates the entry when the user selects</div><div class='del'>-	something from the drop-down.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Various hacks</div><div class='del'>-	by clahey to unbreak e_select_names_model_add_item,</div><div class='del'>-	e_select_names_model_replace_item (which I added) and</div><div class='del'>-	e_select_names_model_remove_item.</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c</div><div class='del'>-	(e_select_names_text_model_obj_count,</div><div class='del'>-	e_select_names_text_model_get_nth_obj): Make chunks of text that</div><div class='del'>-	correspond to ECards in the ESelectNamesModel be embedded objects.</div><div class='del'>-	(e_select_names_text_model_activate_obj): On activation, pop up a</div><div class='del'>-	contact editor for the embedded object's card.</div><div class='del'>-	(e_select_names_text_model_model_changed): Fixed to work with</div><div class='del'>-	ETextModel API changes.</div><div class='del'>-	(e_select_names_text_model_set_text): Make const correct.</div><div class='del'>-	(e_select_names_text_model_insert): Make const correct.</div><div class='del'>-	(e_select_names_text_model_insert_length): Make const correct.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-address-completion.h,</div><div class='del'>-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion</div><div class='del'>-	is a derived class of ECompletion that does asynchronous address</div><div class='del'>-	lookups for completions.</div><div class='del'>-</div><div class='del'>-2001-02-17  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add sequence&lt;string&gt; typedef, and</div><div class='del'>-	add getSupportedFields method.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c</div><div class='del'>-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.c (pas_backend_class_init): init</div><div class='del'>-	get_supported_fields = NULL.</div><div class='del'>-	(pas_backend_get_supported_fields): new function.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.h: add prototype for</div><div class='del'>-	pas_backend_get_supported_fields.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_get_supported_fields): new function.</div><div class='del'>-	(pas_backend_file_class_init): fill in get_supported_fields.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_get_supported_fields): new function.</div><div class='del'>-	(pas_backend_ldap_class_init): fill in get_supported_fields.</div><div class='del'>-</div><div class='del'>-2001-02-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and</div><div class='del'>-	E_LIST_PROP here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added</div><div class='del'>-	this function.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h</div><div class='del'>-	(e_minicard_event): Added an editor field to the EMinicard object.</div><div class='del'>-	Made it so that if you double click on the same card twice, it</div><div class='del'>-	doesn't open a new window, but instead raises the old.</div><div class='del'>-</div><div class='del'>-2001-02-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (addressbook_source_free):</div><div class='del'>-	Free the ldap.binddn.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_setup_menus): Free the dir strings.</div><div class='del'>-</div><div class='del'>-2001-02-08  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (categories_clicked): Set the</div><div class='del'>-	header on the category dialog we pop up.</div><div class='del'>-</div><div class='del'>-2001-02-12  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.</div><div class='del'>-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:</div><div class='del'>-	Marked strings for translation in this newly created file.</div><div class='del'>-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the</div><div class='del'>-	xml-i18n-tools framework.</div><div class='del'>-	* gui/component/Makefile.am: Same as above.</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here</div><div class='del'>-	too.</div><div class='del'>-	</div><div class='del'>-2001-02-11  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed an ancient #include</div><div class='del'>-	&lt;libgnorba/gnorba.h&gt;</div><div class='del'>-</div><div class='del'>-2001-02-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	Really use xml-i18n-tools.</div><div class='del'>-	</div><div class='del'>-	* conduit/e-address-conduit-control-applet.desktop: removed.</div><div class='del'>-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.</div><div class='del'>-	* conduit/Makefile.am: reflect above changes, merge translations.</div><div class='del'>-	</div><div class='del'>-	* contact-editor/e-contact-editor-strings.h,</div><div class='del'>-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,</div><div class='del'>-	contact-editor/e-contact-editor-confirm-delete.glade.h,</div><div class='del'>-	gui/component/select-names/select-names.glade.h:</div><div class='del'>-	removed these files, xml-i18n-extract takes care of strings itself.</div><div class='del'>-	</div><div class='del'>-	* contact-editor/*.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:</div><div class='del'>-	changed project options to not output_translatable_strings.</div><div class='del'>-	</div><div class='del'>-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,</div><div class='del'>-	gui/component/select-names/Makefile.am, printing/Makefile.am:</div><div class='del'>-	do not include removed files in EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2001-02-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh</div><div class='del'>-	out this check.  #ifdef the entire thing OPENLDAP2, as it only</div><div class='del'>-	works with the new schema stuff in openldap 2.x (both on server</div><div class='del'>-	and client, so upgrade your server.)</div><div class='del'>-	</div><div class='del'>-2001-02-07  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add</div><div class='del'>-	a contact *").</div><div class='del'>-</div><div class='del'>-2001-02-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only</div><div class='del'>-	set the DEBUG_LEVEL if we're OPENLDAP2.</div><div class='del'>-</div><div class='del'>-2001-02-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if</div><div class='del'>-	equal, FALSE otherwise.</div><div class='del'>-	(business_compare): same.</div><div class='del'>-	(homephone_compare): same.</div><div class='del'>-	(email_ber): return NULL if there are no elements in our list.</div><div class='del'>-	(homephone_ber): same.</div><div class='del'>-	(business_ber): same.</div><div class='del'>-	(build_mods_from_ecards): add smarts to handle list elements</div><div class='del'>-	properly (like email, business_phone, home_phone.)  now we'll</div><div class='del'>-	properly send updates if any element in the list changes.</div><div class='del'>-</div><div class='del'>-2001-02-06  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (INCLUDES): Added</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\".</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_setup_menus): Changed the local and system</div><div class='del'>-	directories.</div><div class='del'>-</div><div class='del'>-2001-02-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,</div><div class='del'>-	didn't mean to commit this.</div><div class='del'>-	</div><div class='del'>-2001-02-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/evolveperson.schema: new file.  this will eventually</div><div class='del'>-	form the suggested additions to an existing openldap server that,</div><div class='del'>-	along with support for inetorgperson, will allow people to store</div><div class='del'>-	all evolution attributes in ldap.</div><div class='del'>-	</div><div class='del'>-2001-02-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't</div><div class='del'>-	need the = NULL's since we g_new0.</div><div class='del'>-	(check_for_evolve_person): new function.</div><div class='del'>-	(pas_backend_ldap_connect): check to see if the evolvePerson</div><div class='del'>-	objectclass is there.</div><div class='del'>-	(build_mods_from_ecards): right now, just silently skip the extra</div><div class='del'>-	attributes if we don't support evolvePerson.</div><div class='del'>-	(add_objectclass_mod): new function, add both inetOrgPerson and</div><div class='del'>-	(if it's available) evolvePerson as objectclasses.</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): also check to see if</div><div class='del'>-	evolvePerson is there, if we couldn't do it (due to auth reasons)</div><div class='del'>-	in the connect method.</div><div class='del'>-	(prop_info): change the telephoneNumber LDAP attribute to be used</div><div class='del'>-	for evolution's business phone numbers.  the primary phone number</div><div class='del'>-	will be a single valued attribute on evolvePerson.</div><div class='del'>-	(business_populate): new function.</div><div class='del'>-	(business_ber): new function.</div><div class='del'>-	(business_compare): new function.</div><div class='del'>-</div><div class='del'>-2001-02-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,</div><div class='del'>-	allocate 2 char*s when i assign 2 char*s.</div><div class='del'>-</div><div class='del'>-2001-02-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to</div><div class='del'>-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.</div><div class='del'>-	(build_mods_from_ecards): don't include the mod if the value is ""</div><div class='del'>-	- this isn't valid on schema checking ldap servers.</div><div class='del'>-	(homephone_populate): new function.</div><div class='del'>-	(homephone_ber): new function.</div><div class='del'>-	(homephone_compare): new function.</div><div class='del'>-	(create_card_handler): add spew when adding cards so I can see</div><div class='del'>-	what's going on.</div><div class='del'>-2001-02-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (table_add_elem): Save the</div><div class='del'>-	help_text in the closure.</div><div class='del'>-</div><div class='del'>-2001-02-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added</div><div class='del'>-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,</div><div class='del'>-	gal-view-minicard.c, and gal-view-minicard.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/gal-view-factory-minicard.c,</div><div class='del'>-	gui/widgets/gal-view-factory-minicard.h,</div><div class='del'>-	gui/widgets/gal-view-minicard.c, and</div><div class='del'>-	gui/widgets/gal-view-minicard.h: New classes for minicard view</div><div class='del'>-	type.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff</div><div class='del'>-	properly.</div><div class='del'>-	</div><div class='del'>-2001-02-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field</div><div class='del'>-	be quoted printable.</div><div class='del'>-</div><div class='del'>-2001-01-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): This should be a close button,</div><div class='del'>-	not a cancel button.</div><div class='del'>-</div><div class='del'>-2001-02-04  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_activate_dialog): Call</div><div class='del'>-	e_select_names_set_default when appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Added support for</div><div class='del'>-	double clicking sending the selected contacts to the default</div><div class='del'>-	section.  Added a set_default function.  Made multiple selection</div><div class='del'>-	work.</div><div class='del'>-</div><div class='del'>-2001-01-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.</div><div class='del'>-	(table_add_elem): add help_text parameter and set up focus_in</div><div class='del'>-	events to display the help in the dialog's html area.</div><div class='del'>-	(focus_help): new function, calls put_html on the help text.</div><div class='del'>-	(addressbook_ldap_auth_item_new): add help texts.</div><div class='del'>-	(addressbook_source_item_new): add help texts.</div><div class='del'>-	(addressbook_source_dialog): add help texts.</div><div class='del'>-</div><div class='del'>-2001-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_add_section): Remove the butt-ugly arrow icon and</div><div class='del'>-	replace it with a less invasive "-&gt;" icon.</div><div class='del'>-</div><div class='del'>-2001-01-25  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add</div><div class='del'>-	comment about the else block here.</div><div class='del'>-	(prop_info): add home_address, business_address, business_fax,</div><div class='del'>-	assistant, and isdn.</div><div class='del'>-</div><div class='del'>-2001-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made</div><div class='del'>-	this only add the initial VCard if it finds a file</div><div class='del'>-	"create-initial" in the directory it's creating the database in.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Added a</div><div class='del'>-	create_folder function.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): Fixed an unused variable</div><div class='del'>-	warning.</div><div class='del'>-</div><div class='del'>-2001-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_setup_menus): Setup the view collection</div><div class='del'>-	properly and handle the "display_view" signal.</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/component/addressbook.c (update_pixmaps): Consider the</div><div class='del'>-	placeholder in the path for the "Print" item.</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (update_pixmaps): Set the icon for</div><div class='del'>-	"/Toolbar/Find" to "24_find_contact.xpm".</div><div class='del'>-</div><div class='del'>-2001-01-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_pixmap): New.</div><div class='del'>-	(update_pixmaps): New function, setting the pixmaps for the items</div><div class='del'>-	of type "pixbuf", using `set_pixmap'.</div><div class='del'>-	(control_activate): Call it.</div><div class='del'>-</div><div class='del'>-2001-01-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.</div><div class='del'>-	(vcard_matches_search): esexp api fixes.</div><div class='del'>-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).</div><div class='del'>-</div><div class='del'>-2001-01-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to</div><div class='del'>-	add the lengths here (include the \0?  anyone?).</div><div class='del'>-	(build_mods_from_ecards): if we're filling in mod-&gt;mod_bvalues,</div><div class='del'>-	set mod_op |= LDAP_MOD_BVALUES.</div><div class='del'>-</div><div class='del'>-2001-01-23  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-	</div><div class='del'>-	(Fix #1225: advanced search cancel/close)</div><div class='del'>-	</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c</div><div class='del'>-	(e_addressbook_search_dialog_init): Set it up with Search and a</div><div class='del'>-	Cancel button, Search is still the default.</div><div class='del'>-</div><div class='del'>-2001-01-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): properly ref</div><div class='del'>-	the ecard. still need to kill some memory leaks.</div><div class='del'>-</div><div class='del'>-2001-01-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: remove vfs dependency</div><div class='del'>-</div><div class='del'>-2001-01-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (delete_record):  Remove</div><div class='del'>-	deleted records from the pilot map so we don't have dupes in the future</div><div class='del'>-	</div><div class='del'>-2001-01-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (table_right_click): </div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_event): Update for</div><div class='del'>-	e_popup_menu_run prototype change.</div><div class='del'>-</div><div class='del'>-2001-01-19  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_set_property_fn): Use a gtk_object_set_data to set the</div><div class='del'>-	property to TRUE here.</div><div class='del'>-</div><div class='del'>-	(entry_changed): New function, calls bonobo_control_set_property</div><div class='del'>-	if entry_changed hasn't been set to TRUE yet.</div><div class='del'>-	</div><div class='del'>-	(impl_SelectNames_get_entry_for_section): Connect "changed" on</div><div class='del'>-	each entry_widget to the new entry_changed() func.</div><div class='del'>-</div><div class='del'>-2001-01-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): always free </div><div class='del'>-	the delivery elements and correct embarrassingly stupid memory error </div><div class='del'>-	that was causing the addressbook conduit problems.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c </div><div class='del'>-	(e_book_view_listener_check_queue): ref/unref ourself when processing </div><div class='del'>-	in case someone we signal unrefs us.</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (sequence_complete): disconnect signals</div><div class='del'>-	when complete</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made</div><div class='del'>-	it return a gboolean; it was completely ignoring the return value</div><div class='del'>-	from register_factory().</div><div class='del'>-</div><div class='del'>-2001-01-17  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine</div><div class='del'>-	oainfo file until it is actually added to the repository.  We need</div><div class='del'>-	to keep the build working for nightlies to work.</div><div class='del'>-</div><div class='del'>-2001-01-16  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix</div><div class='del'>-	Code/Ximian/ for the initial contact card.</div><div class='del'>-</div><div class='del'>-2001-01-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (print_local): prevent segfaults and </div><div class='del'>-	buffer overflows</div><div class='del'>-	(print_remote): ditto</div><div class='del'>-</div><div class='del'>-2001-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: pass -module and -avoid-version to conduit</div><div class='del'>-	linker</div><div class='del'>-</div><div class='del'>-2001-01-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as</div><div class='del'>-	the @copy_folder_fn arg to `evolution_shell_component_new'.</div><div class='del'>-</div><div class='del'>-2001-01-12  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: added i18n for etable.</div><div class='del'>-</div><div class='del'>-2001-01-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_process_create_card): get a book view from</div><div class='del'>-	somewhere so we can give status messages - choose the first one in</div><div class='del'>-	the list.</div><div class='del'>-	(pas_backend_ldap_process_modify_card): same.</div><div class='del'>-	(pas_backend_ldap_process_remove_card): same.</div><div class='del'>-	(prop_info): add more properties, like home_phone, mobile, pager,</div><div class='del'>-	uri, org_unit, office, title, and manager.</div><div class='del'>-</div><div class='del'>-2001-01-09  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME</div><div class='del'>-	libraries at the end to make the thing compile.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.</div><div class='del'>-</div><div class='del'>-2001-01-09  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	connect with the EAddressbookView's status_message signal.</div><div class='del'>-	(set_status_message): set the status message on the ShellView</div><div class='del'>-	Interface associated with our control.</div><div class='del'>-	(retrieve_shell_view_interface_from_control): new function.  get</div><div class='del'>-	the shell view inteface associated with a control.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c</div><div class='del'>-	(e_addressbook_view_class_init): register status_message signal.</div><div class='del'>-	(status_message): new function, emit our status_message signal.</div><div class='del'>-	(change_view_type): connect with the view-&gt;object's</div><div class='del'>-	"status_message" signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.h (struct</div><div class='del'>-	_EAddressbookViewClass): add status_message signal.</div><div class='del'>-</div><div class='del'>-2001-01-09  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c</div><div class='del'>-	(e_minicard_view_widget_class_init): register our status_message</div><div class='del'>-	signal.</div><div class='del'>-	(status_message): new function, emit our status_message signal.</div><div class='del'>-	(e_minicard_view_widget_realize): connect to the EMinicardView's</div><div class='del'>-	status_message signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):</div><div class='del'>-	register our status_message signal.</div><div class='del'>-	(e_minicard_view_init): init status_message_id.</div><div class='del'>-	(status_message): new function, emit our status_message signal.</div><div class='del'>-	(book_view_loaded): connect to the EBookView's status_message</div><div class='del'>-	signal.</div><div class='del'>-	(disconnect_signals): disconnect status_message_id.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and</div><div class='del'>-	status_message signal.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (status_message): new</div><div class='del'>-	function, emit our status_message.</div><div class='del'>-	(e_addressbook_model_class_init): register our "status_message"</div><div class='del'>-	signal.</div><div class='del'>-	(book_view_loaded): connect to the EBookView's status_message</div><div class='del'>-	signal, so we can chain it to our parent.</div><div class='del'>-	(e_addressbook_model_init): init status_message_id.</div><div class='del'>-	(remove_book_view): disconnect status_message_id.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.h: add status_message_id, and</div><div class='del'>-	status_message signal.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c change the objectclass we create</div><div class='del'>-	objects with to "inetOrgPerson" as it encompasses the fields we</div><div class='del'>-	use.</div><div class='del'>-	(create_dn_from_ecard): remove the mail/org handling from</div><div class='del'>-	here.  we just prepend cn=$cn onto the base dn.</div><div class='del'>-	(create_card_handler): remove the NULL that build_mods_from_ecards</div><div class='del'>-	adds at the end, and insert our objectClass.</div><div class='del'>-	(modify_card_handler): call search_for_dn to get the ECardSimple</div><div class='del'>-	of the old card, since it might (and does in the current code)</div><div class='del'>-	doing a brute force search.</div><div class='del'>-	(search_for_dn): new function, to search for an entry by its dn.</div><div class='del'>-	right now we brute force (objectclass=*) under the base dn and</div><div class='del'>-	compare dn's.  going to add a first pass that explodes the dn and</div><div class='del'>-	searches that way, using (objectclass=*) as a last resort.  also,</div><div class='del'>-	here's where we'd put the extensibleMatch code if we want to go</div><div class='del'>-	that route.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the</div><div class='del'>-	full name regenerate ecard-&gt;name.</div><div class='del'>-</div><div class='del'>-2001-01-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c</div><div class='del'>-	(e_book_listener_queue_authentication_response): new function.</div><div class='del'>-	(impl_BookListener_respond_authentication_result): new function.</div><div class='del'>-	(e_book_listener_get_epv): fill in</div><div class='del'>-	epv-&gt;notifyAuthenticationResult.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to</div><div class='del'>-	EBookListenerOperation.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: add prototype for</div><div class='del'>-	e_book_authenticate_user.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):</div><div class='del'>-	add authenticateUser method.</div><div class='del'>-	(GNOME:Evolution:Addressbook:BookListener): add</div><div class='del'>-	AuthenticationFailed and AuthenticationRequired to CallStatus.</div><div class='del'>-	also add notifyAuthenticationResult method.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_authenticate_user): dummy</div><div class='del'>-	authenticate_user function that always succeeds.</div><div class='del'>-	(pas_backend_file_process_client_requests): respond to the</div><div class='del'>-	AuthenticateUser request.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):</div><div class='del'>-	gtk_object_unref(sexp) =&gt; s_exp_unref(sexp).</div><div class='del'>-	(pas_backend_ldap_process_authenticate_user): fill in to use</div><div class='del'>-	ldap_simple_bind_s.</div><div class='del'>-	(pas_backend_ldap_process_client_requests): respond to the</div><div class='del'>-	AuthenticateUser request.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new</div><div class='del'>-	function.</div><div class='del'>-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new</div><div class='del'>-	function.</div><div class='del'>-	(pas_book_respond_authenticate_user): new function.</div><div class='del'>-	(pas_book_get_epv): fill in epv-&gt;authenticateUser.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and</div><div class='del'>-	add user/passwd to the PASRequest struct.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c</div><div class='del'>-	(addressbook_storage_get_source_by_uri): new function.  should use</div><div class='del'>-	a hashtable, perhaps, but the lists will generally be small</div><div class='del'>-	anyway.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.h: add prototype for</div><div class='del'>-	addressbook_storage_get_source_by_uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c</div><div class='del'>-	(addressbook_source_dialog_set_source): fill in the binddn if the</div><div class='del'>-	auth page is shown.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (book_open_cb): shoe-horn</div><div class='del'>-	authentication in here.  if the source was configured to use</div><div class='del'>-	authentication, authenticate the user after opening the ebook.</div><div class='del'>-	also, be paranoid and clear out the password after authenticating.</div><div class='del'>-	(book_auth_cb): callback for auth.  set the "book" arg on the</div><div class='del'>-	view-&gt;view here.</div><div class='del'>-	(passwd_cb): set the view's passwd that'll be used in</div><div class='del'>-	book_open_cb.</div><div class='del'>-	(addressbook_view_free): g_free view-&gt;passwd.</div><div class='del'>-</div><div class='del'>-2001-01-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c,</div><div class='del'>-	gui/component/addressbook-component.h</div><div class='del'>-	(addressbook_component_get_shell_client): Added this function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Added code for the</div><div class='del'>-	ability to switch between different folders.  This doesn't work</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade.h: Added an option</div><div class='del'>-	menu to this dialog.</div><div class='del'>-</div><div class='del'>-2001-01-04  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Fix hard coded library names that were </div><div class='del'>-	accidentally committed (i'm looking at you miggie)</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect</div><div class='del'>-	renaming.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.[hc]: These are</div><div class='del'>-	living in gal now</div><div class='del'>-	</div><div class='del'>-2001-01-04  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): </div><div class='del'>-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.</div><div class='del'>-</div><div class='del'>-2001-01-03  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c (get_view): check</div><div class='del'>-	capabilities is valid before doing a strstr.</div><div class='del'>-</div><div class='del'>-2001-01-03  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_search):</div><div class='del'>-	g_strdup things we g_free.</div><div class='del'>-</div><div class='del'>-2001-01-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this</div><div class='del'>-	won't crash if the given contact is removed from the database</div><div class='del'>-	while this function is being called.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c: Made sure this won't crash if the</div><div class='del'>-	given contact is removed from the database while the right click</div><div class='del'>-	menu is being displayed.</div><div class='del'>-</div><div class='del'>-2000-12-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c (edit_source_clicked): copy</div><div class='del'>-	the dialog's source, destroy the dialog after we're done, and make</div><div class='del'>-	sure to update both columns in the clist.</div><div class='del'>-	(add_source_clicked): copy the dialog's source, and destroy the</div><div class='del'>-	dialog when we're done.</div><div class='del'>-	(addressbook_source_dialog_destroy): free up all the dialog's</div><div class='del'>-	memory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_prop): allow file: uri's that</div><div class='del'>-	point to files, not just dirs that contain addressbook.db.  The</div><div class='del'>-	rule is the addressbook file has to end in .db.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.c (file_source_foreach):</div><div class='del'>-	contactserver =&gt; contactfile.  cut and paste error.</div><div class='del'>-	(addressbook_storage_init_source_uri): use file://%s to build the</div><div class='del'>-	uri.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these</div><div class='del'>-	in my last commit.</div><div class='del'>-</div><div class='del'>-2000-12-29  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (config_cb): new function, calling</div><div class='del'>-	our new config ui code.</div><div class='del'>-	(control_activate): no longer load evolution-addressbook-ldap.xml,</div><div class='del'>-	as it's not there.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb):</div><div class='del'>-	setup_ldap_storage =&gt; addressbook_storage_setup.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):</div><div class='del'>-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].</div><div class='del'>-	(glade_DATA): remove ldap-server-dialog.glade and add</div><div class='del'>-	addressbook-config.glade.</div><div class='del'>-	(EXTRA_DIST): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.[ch]: add another dialog to</div><div class='del'>-	give a list of our sources and offer the Add/Delete/Edit</div><div class='del'>-	interface.  This plugs into the previous dialog work (the source</div><div class='del'>-	editor.)</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-storage.[ch]: new files, containing</div><div class='del'>-	the remains of e-ldap-storage.[ch] and adding the new</div><div class='del'>-	AddressbookSource type and it's subordinates.  Also, the xml</div><div class='del'>-	format has changed slightly and the file name is no longer</div><div class='del'>-	~/evolution/ldap-servers.xml - it's</div><div class='del'>-	~/evolution/addressbook-sources.xml.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.glade: new file, new config</div><div class='del'>-	interface.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: removed.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.[ch]: removed.</div><div class='del'>-</div><div class='del'>-2000-12-28  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add</div><div class='del'>-	addressbook-config.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-config.c,</div><div class='del'>-	gui/component/addressbook-config.h: new files, containing at the</div><div class='del'>-	moment a beautiful "new/edit source dialog" inspired by the</div><div class='del'>-	mail-config-gui code.  It'll be ready for prime time after rev'ing</div><div class='del'>-	the .xml file the addressbook uses to store it's "other sources"</div><div class='del'>-	to include files, and the addition of the ldap auth stuff.</div><div class='del'>-</div><div class='del'>-2000-12-25  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw</div><div class='del'>-	background to FALSE.</div><div class='del'>-	</div><div class='del'>-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.</div><div class='del'>-	(e_minicard_label_construct): ditto</div><div class='del'>-</div><div class='del'>-2000-12-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fullname-strings.h,</div><div class='del'>-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix</div><div class='del'>-	drop down box.  Patch submitted by Martin Hicks &lt;mort@bork.org&gt;.</div><div class='del'>-</div><div class='del'>-2000-12-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put</div><div class='del'>-	in the change list</div><div class='del'>-	(next_changed_item): util function to get the real next changed item</div><div class='del'>-	(compute_status): really compute the status of the record</div><div class='del'>-	(local_record_from_uid): Set the id of the temporary card</div><div class='del'>-	(check_for_slow_setting): Make this check a little saner</div><div class='del'>-	(card_added): Only record the CardObjectChange if the card is not</div><div class='del'>-	archived</div><div class='del'>-	(card_changed): ditto</div><div class='del'>-	(card_removed): ditto</div><div class='del'>-	(set_status_cleared): actually clear the status</div><div class='del'>-	(for_each_modified): Clean out cruft and use next_changed_item</div><div class='del'>-	(add_record): Set the new id properly in our local card copy</div><div class='del'>-	(replace_record): handle the case where the record has been deleted</div><div class='del'>-	and we need to call add.  need to update the changed_hash entry</div><div class='del'>-	(delete_record): Don't panic if the card is not found, its already</div><div class='del'>-	been deleted.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): </div><div class='del'>-	The change_context no longer has a del_cards member</div><div class='del'>-	(pas_backend_file_book_view_free): ditto</div><div class='del'>-	(pas_backend_file_process_get_changes): ditto</div><div class='del'>-	(pas_backend_file_changes_foreach_key): just record the id</div><div class='del'>-	(pas_backend_file_changes): notify_remove needs an id not a vcard</div><div class='del'>-</div><div class='del'>-2000-12-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (match): Use my own wrapper</div><div class='del'>-	functions instead of trying to *directly* access the the data </div><div class='del'>-	structures my self</div><div class='del'>-	(post_sync): Put in hack to prevent syncing the same records twice</div><div class='del'>-	(local_record_from_uid): set the card id when creating a blank one</div><div class='del'>-	(add_record): Set the id of the card we have and don't go to the</div><div class='del'>-	server to get the latest version</div><div class='del'>-</div><div class='del'>-2000-12-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): Convert</div><div class='del'>-	pilot strings to utf for the e-cards.</div><div class='del'>-	</div><div class='del'>-2000-12-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard</div><div class='del'>-	strings to pilot encodings</div><div class='del'>-</div><div class='del'>-2000-12-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if</div><div class='del'>-	you select multiple contacts, the right click menu to delete</div><div class='del'>-	deletes them all.</div><div class='del'>-</div><div class='del'>-2000-12-18  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always</div><div class='del'>-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to</div><div class='del'>-	NAME_ERROR).</div><div class='del'>-	(build_card_from_entry): ldap_get_values can return NULL.  also,</div><div class='del'>-	openldap2 keeps us from getting at ldap-&gt;ld_errno, so we can't</div><div class='del'>-	tell if there was a decoding error like we used to.  the double</div><div class='del'>-	free problem where ldap would free the ber if there was a decoding</div><div class='del'>-	problem might be fixed now..  further investigation is needed.</div><div class='del'>-	for now we leak in openldap2.</div><div class='del'>-	(ldap_search_handler): the ldap structure is opaque, so use</div><div class='del'>-	ldap_search_ext to give the extra information (the max responses,</div><div class='del'>-	timeout, etc.) in the openldap2 case.</div><div class='del'>-</div><div class='del'>-2000-12-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test</div><div class='del'>-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,</div><div class='del'>-	use it instead of NAME_ERROR.</div><div class='del'>-</div><div class='del'>-2000-12-14  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut</div><div class='del'>-	and paste description error.</div><div class='del'>-</div><div class='del'>-2000-12-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate</div><div class='del'>-	the returned vcard so we don't sometimes end up with trailing</div><div class='del'>-	junk that makes libversit unhappy.</div><div class='del'>-</div><div class='del'>-2000-12-13  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c </div><div class='del'>-	(e_select_names_add_section): Make the -&gt; into a GNOME stock image.</div><div class='del'>-</div><div class='del'>-2000-12-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_init): Connect to the "cursor_change" signal on</div><div class='del'>-	the ETable here instead of the ETableScrolled.</div><div class='del'>-	(remove_address): Added the col and event parameters to this</div><div class='del'>-	callback to match the added parameters to the double click signal.</div><div class='del'>-	(e_select_names_add_section): Connect to the "double_click" signal</div><div class='del'>-	on the ETable here instead of the ETableScrolled.</div><div class='del'>-</div><div class='del'>-2000-12-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"</div><div class='del'>-	argument, copy the incoming name.  This fixes a crash.</div><div class='del'>-</div><div class='del'>-2000-12-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made editing the name using</div><div class='del'>-	the full name button set the file as entry properly.  Made it</div><div class='del'>-	so that the address parse that the user chooses after</div><div class='del'>-	clicking on the Full Address... button gets saved.</div><div class='del'>-</div><div class='del'>-2000-12-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it</div><div class='del'>-	so that the editor-&gt;name is set after the entry is changed.  This</div><div class='del'>-	means that the reparse that the person chose is saved.</div><div class='del'>-</div><div class='del'>-2000-12-07  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL</div><div class='del'>-	as the @toplevel_node_handler_id argument to</div><div class='del'>-	`evolution_storage_new'.</div><div class='del'>-</div><div class='del'>-2000-12-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fixed some formatting.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.h: Removed an</div><div class='del'>-	unneeded #include.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the</div><div class='del'>-	ETable instead of the ETableScrolled.</div><div class='del'>-</div><div class='del'>-2000-12-07  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather</div><div class='del'>-	than NULL to e_card_new.</div><div class='del'>-	(local_record_from_ecard): Make sure ecard-&gt;name is valid</div><div class='del'>-	(check_for_slow_setting): Remove hard coded test value</div><div class='del'>-	(card_added): g_strdup the resul of e_card_get_id</div><div class='del'>-	(card_changed): ditto</div><div class='del'>-</div><div class='del'>-2000-12-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing</div><div class='del'>-	the ETableScrolled proxy functions.</div><div class='del'>-</div><div class='del'>-2000-12-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Moved the gal view menu stuff from</div><div class='del'>-	here to EAddressbookView.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h: New function to set up the menus</div><div class='del'>-	for the EAddressbookView.</div><div class='del'>-</div><div class='del'>-2000-12-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Another conduit build fix</div><div class='del'>-</div><div class='del'>-2000-12-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): </div><div class='del'>-	Create an empty vcard with the appropriate id for deleted cards</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the</div><div class='del'>-	address fields are added sensibly</div><div class='del'>-</div><div class='del'>-2000-12-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the</div><div class='del'>-	call to `evolution_storage_new()': pass NULL for</div><div class='del'>-	@toplevel_node_uri.</div><div class='del'>-</div><div class='del'>-2000-11-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_to_pilot_record): Return</div><div class='del'>-	a struct rather than a pointer to a struct</div><div class='del'>-	(view_cb): kill warning</div><div class='del'>-	(compare): local_record_to_pilot_record now returns a struct</div><div class='del'>-	(prepare): ditto</div><div class='del'>-	(free_prepare): remove as per gnome-pilot changes</div><div class='del'>-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal</div><div class='del'>-</div><div class='del'>-2000-11-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: Remove "complete" field</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (print_local): Make it print useful debug</div><div class='del'>-	info</div><div class='del'>-	(print_remote): ditto</div><div class='del'>-	(local_record_from_ecard): Make sure phone numbers get out to the pilot</div><div class='del'>-	(ecard_from_remote_record): Set phone strings to "" if they are null</div><div class='del'>-	(sequence_complete): unref the book view</div><div class='del'>-	(view_cb): ref the book view</div><div class='del'>-	(free_prepare): do nothing</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): </div><div class='del'>-	Destroy the card lists with the rest of the view.</div><div class='del'>-	(pas_backend_file_changes): Don't destroy the card lists here</div><div class='del'>-	(pas_backend_file_book_view_free): Free the card/id lists in the</div><div class='del'>-	change context here, the correct place.</div><div class='del'>-	(pas_backend_file_changes): instead of here...</div><div class='del'>-</div><div class='del'>-2000-11-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL</div><div class='del'>-	in pas_backend_file_process_get_book_view.  Changed</div><div class='del'>-	pas_backend_file_book_view_copy a bit.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.</div><div class='del'>-</div><div class='del'>-2000-11-18  Matt Bissiri  &lt;matt@bissiri.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am:</div><div class='del'>-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD</div><div class='del'>-	so that it will link properly now that gal-view-menus.[ch]</div><div class='del'>-	was moved from gal into evolution.</div><div class='del'>-</div><div class='del'>-2000-11-15  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): </div><div class='del'>-	Initialize destination struct with '0's.</div><div class='del'>-</div><div class='del'>-2000-11-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"</div><div class='del'>-	to "text/x-vcard".</div><div class='del'>-</div><div class='del'>-2000-11-11  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: Add idl-generated files.</div><div class='del'>-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):</div><div class='del'>-	* backend/ebook/e-card.c: (e_card_send):</div><div class='del'>-	s/Evolution_/GNOME_Evolution_/g;</div><div class='del'>-</div><div class='del'>-2000-11-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Link in composer bonobo code.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to</div><div class='del'>-	send mail to an ECard or send an ECard as a VCard attachment.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Add verbs to send the contact</div><div class='del'>-	as a VCard or send mail to the contact.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Removed some unused</div><div class='del'>-	variables.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:</div><div class='del'>-	Added menu items to send the contact as a VCard or send mail to</div><div class='del'>-	the contact.</div><div class='del'>-</div><div class='del'>-2000-11-11  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo:</div><div class='del'>-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:</div><div class='del'>-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"</div><div class='del'>-	to sync up with yesterday's IDL re-scoping.</div><div class='del'>-</div><div class='del'>-2000-11-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Put in gal view menus for testing</div><div class='del'>-	purposes.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c: Fixed up envelope printing</div><div class='del'>-	a bit.  Added code for printing return addresses.</div><div class='del'>-</div><div class='del'>-2000-11-09  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks</div><div class='del'>-	(card_added): callback for book view</div><div class='del'>-	(card_changed): ditto</div><div class='del'>-	(card_removed): ditto</div><div class='del'>-	(sequence_complete): ditto</div><div class='del'>-	(view_cb): callback for the get changes call</div><div class='del'>-	(pre_sync): force synchronous loading of book view</div><div class='del'>-	(for_each): we already have the card so create the local record directly</div><div class='del'>-	(for_each_modified): Uncomment and fix</div><div class='del'>-	(delete_record): ditto</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: link against gal for ebook - needs fixing</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond</div><div class='del'>-	to a get_changes call</div><div class='del'>-	(e_book_check_listener_queue): define the get changes response operation</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):</div><div class='del'>-	Queue up a get changes response</div><div class='del'>-	(impl_BookListener_respond_get_changes): Implement the get_changes method</div><div class='del'>-	(e_book_listener_get_epv): add get_changes implementation to epv</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only</div><div class='del'>-	copy the search_context and change_context elements if they actually exist</div><div class='del'>-	(pas_backend_file_changes): Hard code a path for now, only notify if</div><div class='del'>-	there is something to notify about</div><div class='del'>-</div><div class='del'>-2000-11-07  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: Update PASRequest structure</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name</div><div class='del'>-	(pas_book_queue_get_changes): Use PASRequest change_id slot</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): </div><div class='del'>-	Properly copy change_id and change_context</div><div class='del'>-	(pas_backend_file_book_view_free): Free change_id/change_context</div><div class='del'>-	(pas_backend_file_changes_foreach_key): Callback to figure out the</div><div class='del'>-	deleted cards</div><div class='del'>-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.</div><div class='del'>-	Write out updated hash</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: Rename get_changes param</div><div class='del'>-</div><div class='del'>-2000-11-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Switched from EAddressbookSearch to</div><div class='del'>-	ESearchBar.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,</div><div class='del'>-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.</div><div class='del'>-	This has been moved to filter/ and renamed ESearchBar.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c: Forgot to set the font.</div><div class='del'>-	This works for me now.</div><div class='del'>-</div><div class='del'>-2000-11-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(impl_SelectNames_get_entry_for_section): Duplicate the object</div><div class='del'>-	reference before returning.</div><div class='del'>-</div><div class='del'>-2000-11-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add</div><div class='del'>-	menus items to the envelope printing stuff.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Hook up the search menu.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-search.c,</div><div class='del'>-	gui/widgets/e-addressbook-search.h: Add the search menu.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Add e-contact-print-envelope.c and</div><div class='del'>-	e-contact-print-envelope.h.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c,</div><div class='del'>-	printing/e-contact-print-envelope.h: Added envelope printing.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Clean the idl-generated</div><div class='del'>-	files properly.</div><div class='del'>-</div><div class='del'>-2000-11-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these</div><div class='del'>-	unnecessary .cvsignores.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Switch to using EAddressbookSearch</div><div class='del'>-	instead of custom quick search widget.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made this do a</div><div class='del'>-	slightly better job of rendering names.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and</div><div class='del'>-	e-addressbook-search.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-search.c,</div><div class='del'>-	gui/widgets/e-addressbook-search.h: New class that puts up an</div><div class='del'>-	entry and a combo box.</div><div class='del'>-</div><div class='del'>-2000-11-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): </div><div class='del'>-	(e_ldap_storage_add_server): Add "highlighted" flag to</div><div class='del'>-	evolution_storage_new_folder</div><div class='del'>-</div><div class='del'>-2000-10-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense</div><div class='del'>-	(compute_pid): remove</div><div class='del'>-	(local_record_from_ecard): Create local record from ecard - not finished</div><div class='del'>-	(local_record_from_uid): Obtain local_record from uid with the proper</div><div class='del'>-	e-book way</div><div class='del'>-	(set_status_cleared): Add empty callback</div><div class='del'>-	(add_archive_record): kill</div><div class='del'>-	(delete_archive_record): kill</div><div class='del'>-	(archive_record): Add empty callback</div><div class='del'>-	(conduit_get_gpilot_conduit): Update signal connects</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine</div><div class='del'>-	the type of change - not finished</div><div class='del'>-	(pas_backend_file_search_changes): Create a view and callback based on </div><div class='del'>-	how the cards have changed</div><div class='del'>-	(pas_backend_file_process_get_changes): Implement the get changes operation</div><div class='del'>-	for files</div><div class='del'>-	(pas_backend_file_process_client_requests): Add GetChanges method for</div><div class='del'>-	processing</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to</div><div class='del'>-	the list</div><div class='del'>-	(impl_Evolution_Book_get_changes): implement object method</div><div class='del'>-	(pas_book_get_epv): Add get changes to epv</div><div class='del'>-	(pas_book_respond_get_changes): Respond to the get changes operation</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: Add GetChanges PASOperation</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes</div><div class='del'>-	methods</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_get_changes): Client function</div><div class='del'>-	to a view of the changed objects</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: New prototype</div><div class='del'>-</div><div class='del'>-2000-10-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* backend/e-book/e-card.c: Fixed marking of strings</div><div class='del'>-	for translation. Use "_(" instead of "_ (".</div><div class='del'>-	* gui/component/addressbook-factory.c: Add missing</div><div class='del'>-	calls to bindtextdomain() and textdomain noticed by</div><div class='del'>-	Dan Winship.</div><div class='del'>-	* gui/component/addressbook.c: Marked string for translation.</div><div class='del'>-	</div><div class='del'>-2000-10-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am, gui/search/Makefile.am,</div><div class='del'>-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Turned off</div><div class='del'>-	newlines in header fields.</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (e_contact_print_letter_tab),</div><div class='del'>-	(complete_sequence, e_contact_do_print_phone_list, lowify):</div><div class='del'>-	unsigned charness.</div><div class='del'>-</div><div class='del'>-2000-10-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only</div><div class='del'>-	call the handler if the if we're connected, and if we fail to</div><div class='del'>-	connect finish the op and post a message.</div><div class='del'>-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.</div><div class='del'>-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY =&gt; LDAP_SUCCESS.</div><div class='del'>-	(modify_card_handler): only perform the ldap_modify_s if we have a</div><div class='del'>-	list of modifications.</div><div class='del'>-	(get_cursor_handler): use ldap_error_to_response here.</div><div class='del'>-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant</div><div class='del'>-	389.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am (INCLUDES): </div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (INCLUDES): </div><div class='del'>-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: Use new libeconduit calls and</div><div class='del'>-	abstraction</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: ditto</div><div class='del'>-	</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read</div><div class='del'>-	(post_sync): Use e_pilot_map_write</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Link libeconduit and not libical</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): </div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (toggle_view_as_cb): </div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: New structure of file - similar</div><div class='del'>-	to calendar/todo conduits</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h: Config stuff for conduit</div><div class='del'>-</div><div class='del'>-	* conduit/.cvsignore: Update</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Build fixes</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-control-applet.desktop: Renamed</div><div class='del'>-	to e-address-conduit-control-applet.desktop</div><div class='del'>-</div><div class='del'>-	* conduit/address.conduit.in: Renamed to e-address.conduit.in</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name</div><div class='del'>-	column since it's a bit weird.  This also fixes the initial state</div><div class='del'>-	since all of the column choices were off by one.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am (glade_DATA): Remove</div><div class='del'>-	`e-contact-print.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Move here.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (glade_DATA): Remove</div><div class='del'>-	`ldap-server-dialog.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Move here.</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Change how the extension field acts when</div><div class='del'>-	converting delivery addresses to labels.</div><div class='del'>-</div><div class='del'>-2000-10-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the</div><div class='del'>-	function e_card_delivery_address_to_label.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c: Fixed a potential</div><div class='del'>-	crash.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made this save the changed</div><div class='del'>-	data to the string version of the address.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (change_view_type): update to new</div><div class='del'>-	UI handler.</div><div class='del'>-	(update_view_type): split from (change_view_type).</div><div class='del'>-	(control_activate): add an update_view_type.</div><div class='del'>-</div><div class='del'>-2000-10-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the</div><div class='del'>-	email address if both name and organization are taken.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Fixed up the spec</div><div class='del'>-	strings in this class.  Removed the "cursor_mode" argument to</div><div class='del'>-	ETable since it's part of the spec now.</div><div class='del'>-</div><div class='del'>-2000-10-17  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Change the initial dialog </div><div class='del'>-	visibility to FALSE</div><div class='del'>-	so the contact editor doesn't flash when it appears.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c </div><div class='del'>-	(e_select_names_manager_activate_dialog): Only allow one dialog</div><div class='del'>-	per manager.</div><div class='del'>-</div><div class='del'>-2000-10-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a</div><div class='del'>-	bit better.</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am:</div><div class='del'>-	* gui/component/Makefile.am: Remove CPPFLAGS since they just</div><div class='del'>-	duplicate flags that were already in INCLUDES.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am (ecpsdir): </div><div class='del'>-	* gui/widgets/Makefile.am:</div><div class='del'>-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to</div><div class='del'>-	INCLUDES so they don't override any CPPFLAGS set at configure</div><div class='del'>-	time.</div><div class='del'>-</div><div class='del'>-2000-10-14  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): if we are in</div><div class='del'>-	LDAP mode then merge in the extra few items, otherwise just merge</div><div class='del'>-	the standard thing; saves duplication.</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Added</div><div class='del'>-	"evolution:shell-component-icon" property.</div><div class='del'>-</div><div class='del'>-2000-10-14  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c </div><div class='del'>-	(e_select_names_manager_activate_dialog): Only allow one dialog</div><div class='del'>-	per id.</div><div class='del'>-	(e_select_names_manager_destroy): Destroy the hashtable.</div><div class='del'>-	(e_select_names_manager_init): Init the hashtable.</div><div class='del'>-</div><div class='del'>-2000-10-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	Rearranged these fields a bit more.</div><div class='del'>-</div><div class='del'>-2000-10-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Changed these for boolean</div><div class='del'>-	ascending attribute instead of int ascending attribute.  Fixed</div><div class='del'>-	e-select-names to not use a column past the end of its array.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	Rearranged the address editor dialog.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed the column</div><div class='del'>-	elements, the no-headers attribute and added a cursor-mode=line</div><div class='del'>-	attribute.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Updated these to the new style</div><div class='del'>-	ETables.</div><div class='del'>-</div><div class='del'>-2000-10-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed</div><div class='del'>-	ondemand callback nonsense from rule_context_load().</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-	(e_contact_editor_init): upd.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate_cb): upd.</div><div class='del'>-	(control_deactivate): kill.</div><div class='del'>-	(control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): update.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-</div><div class='del'>-Fri Sep 29 07:33:54 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so</div><div class='del'>- 	that minicard doesn't write out changes to the backend unless</div><div class='del'>- 	something's actually changed.</div><div class='del'>-</div><div class='del'>-Tue Sep 26 16:28:47 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Make sure that card-&gt;name and</div><div class='del'>- 	card-&gt;full_name are always valid.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Removed some unused</div><div class='del'>- 	variables.</div><div class='del'>-</div><div class='del'>-2000-09-22  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c (extract_info): If</div><div class='del'>-	(editor-&gt;name == NULL), store ptr to newly allocated ECardName in</div><div class='del'>- 	editor-&gt;name, not just in a stack variable.  This fixes a crash</div><div class='del'>- 	which happened when you click "New", then click "Full Name...",</div><div class='del'>- 	then enter name, then click "OK".</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_name_to_string): Add</div><div class='del'>- 	g_return_val_if_fail.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am:</div><div class='del'>-	* gui/component/Makefile.am:</div><div class='del'>-	* contact-editor/Makefile.am:</div><div class='del'>-	* printing/Makefile.am: Look for ename in /e-util/ename instead of</div><div class='del'>-	/addressbook/ename</div><div class='del'>-	</div><div class='del'>-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h</div><div class='del'>-</div><div class='del'>-	* ename: Moved to /e-util so it could be shared</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): took out ename</div><div class='del'>-</div><div class='del'>-2000-09-25  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western-tables.h: Added a ton of new prefixes and</div><div class='del'>-	suffixes.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): update.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the</div><div class='del'>- 	remove/modify/create functions.  add another flag for the property</div><div class='del'>- 	table, PROP_DN, which makes it easy for us to determine when we</div><div class='del'>- 	need to create a new DN for a record when we're modifying.  also</div><div class='del'>- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills</div><div class='del'>- 	in the list of bvalues that we send to the ldap server.  The</div><div class='del'>- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly</div><div class='del'>- 	complex (yay ldap).</div><div class='del'>-	(ldap_search_handler): act synchronous when ldap_search responds</div><div class='del'>- 	with -1.</div><div class='del'>-	(view_destroy): use pas_book_view_notify_status_message.</div><div class='del'>-	(ldap_op_process_current): same</div><div class='del'>-	(ldap_op_process): same</div><div class='del'>-	(poll_ldap): same</div><div class='del'>-	(ldap_search_handler): same</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: add</div><div class='del'>- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (field_data): add</div><div class='del'>- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.</div><div class='del'>-	(e_card_simple_get): add getter for FAMILY_NAME.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Made addresses be quoted printable again</div><div class='del'>- 	so that they will encode properly if they have carriage returns in</div><div class='del'>- 	them.  This is possible now because of a fix in libversit.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c,</div><div class='del'>- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,</div><div class='del'>- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,</div><div class='del'>- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a</div><div class='del'>- 	function to set the status message associated with a given view.</div><div class='del'>-  	This is not yet implemented in the gui.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c, backend/ebook/e-book.h,</div><div class='del'>-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,</div><div class='del'>-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,</div><div class='del'>-	backend/pas/pas-backend.h, backend/pas/pas-book.c,</div><div class='del'>-	backend/pas/pas-book.h: Added a function to query static</div><div class='del'>-	capabilities (capabilities that can be reported immediately) and</div><div class='del'>-	implemented them in the 2 servers.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a View All button and a Stop</div><div class='del'>-	button.  Sorted out the new directory server stuff a bit.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop</div><div class='del'>-	function.  Check for capabilities before deciding whether to load</div><div class='del'>-	all cards when initially viewed.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h: Added stop and view all</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:</div><div class='del'>-	Added a stop function.  Check for capabilities before deciding</div><div class='del'>-	whether to load all cards when initially viewed.</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): remove _UIHandler</div><div class='del'>-</div><div class='del'>-2000-09-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Added a missing include</div><div class='del'>-	of ctype.h.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a problem where using a</div><div class='del'>-	GList was causing us to not be reentrant.  We now use an EList</div><div class='del'>-	here and so now this is reentrant.  This should fix the "wombat</div><div class='del'>-	crashes every time you run evolution" bug.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.</div><div class='del'>-</div><div class='del'>-2000-09-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Make this work when a</div><div class='del'>-	field is spread across multiple lines.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a</div><div class='del'>-	wants_html field to cards.  Uses "x-mozilla-html".</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added definition of</div><div class='del'>-	EVOLUTION_DATADIR.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Make Wants HTML check</div><div class='del'>-	button visible.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Make Wants HTML check button</div><div class='del'>-	active.  Fix UI stuff to use XML.  Set parent window of</div><div class='del'>-	confirm_delete dialog.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set</div><div class='del'>-	the parent window of the confirm_delete dialog.</div><div class='del'>-	</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards</div><div class='del'>-	when the addressbook was first loading.  (It was overwriting a</div><div class='del'>-	string with NULL during init.)</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am (ruledir): Use $(datadir), not</div><div class='del'>-	$(prefix)/share</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,</div><div class='del'>-	ename/Makefile.am, gui/component/Makefile.am,</div><div class='del'>-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,</div><div class='del'>-	contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.h,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,</div><div class='del'>-	ename/test-ename-western-gtk.c,</div><div class='del'>-	gui/component/addressbook-factory.c, gui/component/addressbook.c,</div><div class='del'>-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,</div><div class='del'>-	gui/component/select-names/e-select-names-bonobo.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h,</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,</div><div class='del'>-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,</div><div class='del'>-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,</div><div class='del'>-	printing/e-contact-print.c: Fixed the #include lines to deal</div><div class='del'>-	properly with gal.</div><div class='del'>-	</div><div class='del'>-2000-09-15  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h,</div><div class='del'>-	contact-editor/e-contact-save-as.h,</div><div class='del'>-	gui/widgets/e-addressbook-model.h,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,</div><div class='del'>-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed all of the code to actually</div><div class='del'>-	create and display the correct view of the addressbook and moved</div><div class='del'>-	it to the new class gui/widgets/e-addressbook-view.c.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added everything necessary for</div><div class='del'>-	e-addressbook-view.c and e-addressbook-view.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h: New class to deal with actual</div><div class='del'>-	display of addresses and switching between card view and table</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c: Made this deal more</div><div class='del'>-	gracefully with having the book set to NULL.</div><div class='del'>-</div><div class='del'>-2000-09-16  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: fix broken include.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): define datadir.</div><div class='del'>-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): use datadir.</div><div class='del'>-</div><div class='del'>-2000-09-16  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (gladedir): Define.</div><div class='del'>-	(glade_DATA): Install `alphabet.glade'.</div><div class='del'>-	(EXTRA_DIST): Define.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.</div><div class='del'>-	(EXTRA_DIST): Remove `alphabet.glade.h'.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add</div><div class='del'>-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this</div><div class='del'>-	is what Chris meant to do.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_srcdir)/addressbook/gui/widgets'.</div><div class='del'>-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'</div><div class='del'>-	and `e-addressbook-model.h'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: #include</div><div class='del'>-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of</div><div class='del'>-	"addressbook/gui/component", as it has been moved there.</div><div class='del'>-</div><div class='del'>-2000-09-15  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: split all the ldap operations</div><div class='del'>-	into 2 halves, a handler, and destructor, and create a structure</div><div class='del'>-	containing two function pointers and any data they need.  this</div><div class='del'>-	allows us queue up pending operations (since the LDAP*'s are no</div><div class='del'>-	longer view specific.  there's one per backend.)  also, add</div><div class='del'>-	support for restarting async operations if the SERVER DOWN error</div><div class='del'>-	isn't communicated until sometime after the handler is called (as</div><div class='del'>-	is the case with the async search stuff.)</div><div class='del'>-</div><div class='del'>-2000-09-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Call unicode_init</div><div class='del'>-	for e-font stuff.</div><div class='del'>-</div><div class='del'>-2000-09-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added</div><div class='del'>-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.</div><div class='del'>-</div><div class='del'>-2000-09-14  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: update include.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: update include.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h: update include.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: update include path.</div><div class='del'>-</div><div class='del'>-2000-09-13  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.</div><div class='del'>-	(create_toolbar): ditto.</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Radicaly update UI handler code.</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to</div><div class='del'>-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,</div><div class='del'>-	and e-reflow-sorted.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and</div><div class='del'>-	libereflow.a to a bunch of LDADD lines.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added</div><div class='del'>-	libereflow.a here.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Add space after `-I'</div><div class='del'>-	when invoking `orbit-idl'.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a crash error.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-11  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: fixed certain address parsing</div><div class='del'>-	problems.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade: Made this a bit better balanced.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the toolbar button for find do</div><div class='del'>-	the same thing that the menu item for search does.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Made the top half of</div><div class='del'>-	this not expand.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Removed a bunch of redundant code.  Made it so that when you set</div><div class='del'>-	an address label, it sets the delivery address as well.  Added</div><div class='del'>-	functions to set and get the delivery address.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to</div><div class='del'>-	convert and address label to a delivery address.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],</div><div class='del'>-	fulladdr.glade, fulladdr.glade.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Switched from a label</div><div class='del'>-	to a button to show the parsed address.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/e-contact-editor-address.h: New class to implement</div><div class='del'>-	the parsed address dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.h: Added const to the</div><div class='del'>-	_new function.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Implemented clicking on the</div><div class='del'>-	address button.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	New glade files for the parsed address dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fullname-strings.h, fullname.glade: Changed these</div><div class='del'>-	accellabels to labels.</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Added e-address-western.c.</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Added by Jesse.</div><div class='del'>-</div><div class='del'>-2000-09-08  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):</div><div class='del'>-	Use canvas default font</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto</div><div class='del'>-	(get_left_width): Ditto</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-2000-09-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the</div><div class='del'>-	extra arg now needed by `evolution_storage_new_folder()'.</div><div class='del'>-	(e_ldap_storage_add_server): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-31  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and</div><div class='del'>-	`-I$(top_srcdir)'.</div><div class='del'>-</div><div class='del'>-2000-08-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook</div><div class='del'>-	and load-pine-addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+</div><div class='del'>-</div><div class='del'>-2000-08-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Add a name to the minicard</div><div class='del'>-	viewer.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: </div><div class='del'>-	* backend/ebook/test-client.c: </div><div class='del'>-	* backend/ebook/test-client-list.c: </div><div class='del'>-	* backend/ebook/load-gnomecard-addressbook.c: </div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: </div><div class='del'>-	* backend/pas/pas-book-factory.c: </div><div class='del'>-	* conduit/address-conduit.h: Remove USING_OAF checks</div><div class='del'>-</div><div class='del'>-2000-08-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Use the right argument name to turn</div><div class='del'>-	on grid lines.</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Comment out minicard-view-test</div><div class='del'>-	since its gnorba dependent</div><div class='del'>-	</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: ditto</div><div class='del'>-</div><div class='del'>-2000-08-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* demo/* Removed the demo directory since it's no longer used.</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.gnorba: Kill</div><div class='del'>-	</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.gnorba: Kill</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am:  Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-2000-08-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add</div><div class='del'>-	-export-dynamic so libglade will be able to resolve custom widget</div><div class='del'>-	callbacks.</div><div class='del'>-</div><div class='del'>-2000-08-23  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper</div><div class='del'>-	(extract_field): Same</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Link demo with libeutil.la</div><div class='del'>-</div><div class='del'>-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper</div><div class='del'>-	(search_entry_activated): Same</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the</div><div class='del'>-	arguments to rule_context_load.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fix this to not mess up if the person</div><div class='del'>-	passes a VCard with a carriage return in the mailing address.</div><div class='del'>-</div><div class='del'>-2000-08-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/addresstypes.xml: Fixed fullname-&gt;full_name for</div><div class='del'>-	search field.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we</div><div class='del'>-	actually got any parts to build the dialogue with.</div><div class='del'>-</div><div class='del'>-2000-08-13  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Set the</div><div class='del'>-	global_shell_client nastyhack when we know it.</div><div class='del'>-	This is only required to link with the filter code ...</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added</div><div class='del'>-	libfilter.a to the link line.</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name</div><div class='del'>-	from libaddressbooksearchdialog to libaddressbooksearch, as used</div><div class='del'>-	elsewhere.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget):</div><div class='del'>-	Implement.</div><div class='del'>-	(get_query): Likewise.</div><div class='del'>-	(e_addressbook_search_dialog_destroy): Unref filter stuff when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): Added chris's</div><div class='del'>-	patch to put the meny in</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/e-card.h: Started adding a time zone field to ECard.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Added</div><div class='del'>-	e_table_model_pre_change where appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Linked in the search dialog again.</div><div class='del'>-	It looks like some changes in the shell made this not work.</div><div class='del'>-</div><div class='del'>-2000-08-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed</div><div class='del'>-	this to use ECardSimple.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added stuff to the right click</div><div class='del'>-	menu.  Activated the new search dialog that doesn't quite work</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.</div><div class='del'>-</div><div class='del'>-2000-08-15  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors</div><div class='del'>-	for the selected state.  This doesn't properly redraw the minicard</div><div class='del'>-	when there is a style_change event, that is next.</div><div class='del'>-	(e_minicard_realize): use style colors.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h</div><div class='del'>-	as in RedHat 7.0 -- patch from Kenny Graunke &lt;kwg@teleport.com&gt;</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add</div><div class='del'>-	address-conduit.h</div><div class='del'>-</div><div class='del'>-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if</div><div class='del'>-	ENABLE_PILOT_CONDUITS is set.</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): add conduit subdir.</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add</div><div class='del'>-	special oaf initialization hack so conduit can find wombat, and</div><div class='del'>-	accept all cookies so that we can actually talk to oaf.</div><div class='del'>-</div><div class='del'>-2000-08-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the</div><div class='del'>-	wrong field to be searched.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made the select</div><div class='del'>-	names dialog only display entries with email addresses.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Fixed a typo in the name of</div><div class='del'>-	the first phone entry.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.h: A few small interface</div><div class='del'>-	fixes.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Link in the addressbook search</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added the search directory.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Fixed a potential crash.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.</div><div class='del'>-</div><div class='del'>-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Ettore fixed compilation.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-view.c: Ref our book view listener.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Updated to use new minicard view</div><div class='del'>-	widget.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and</div><div class='del'>-	e-minicard-view-widget.h.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-view-widget.h: New class that's just a</div><div class='del'>-	minicard view in an ECanvas.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: New file for</div><div class='del'>-	implementing a search dialog.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (transmit): implement code to encode</div><div class='del'>-	the first email address and send to the pilot.</div><div class='del'>-	(get_phone_label_by_flag): rename find_phone_label_for_flags to</div><div class='del'>-	this, and implement by calling get_phone_label_by_name.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): add code</div><div class='del'>-	for handling email addresses from pilot (which stores it as a</div><div class='del'>-	phone number entry.  go figure.)</div><div class='del'>-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).</div><div class='del'>-	(update_record): un #if 0 the code to handle the case where the</div><div class='del'>-	pilot info has changed for a local record.</div><div class='del'>-	(merge_ecard_with_remote_record): implement function, but for now</div><div class='del'>-	just return the existing (desktop) record - we still don't allow</div><div class='del'>-	merge from the pilot.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/addresstypes.xml: Changed a couple of input field</div><div class='del'>-	names.</div><div class='del'>-</div><div class='del'>-2000-08-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Remove prototype for</div><div class='del'>-	`setup_ldap_storage()', which shouldn't be here anyway.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/, gui/search/addresstypes.xml: New search dialog for</div><div class='del'>-	addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Update for</div><div class='del'>-	changed prototype, pass evolution_homedir arg to</div><div class='del'>-	setup_ldap_storage.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes</div><div class='del'>-	an evolution_homedir arg, uses that to generate the path to the</div><div class='del'>-	ldapservers.xml file, and stores the result in a static variable.</div><div class='del'>-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that</div><div class='del'>-	static variable rather than hardcoding the path to the file.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on</div><div class='del'>-	missing phone numbers or email addresses.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added a button to save to</div><div class='del'>-	your addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-09  Cody Russell  &lt;bratsche@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the toolbar honor the user's</div><div class='del'>-	gnomecc settings for detachable toolbars.</div><div class='del'>-</div><div class='del'>-2000-08-09  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western-tables.h: Added some military prefixes.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Add the stock</div><div class='del'>-	print icon to the print item.</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Put the print</div><div class='del'>-	item in the right placeholder so that it gets the right position</div><div class='del'>-	in the "File" menu.</div><div class='del'>-	(control_deactivate): Updated accordingly.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed</div><div class='del'>-	e_popup_menu_run call to match the new arguments.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Fixed this file to work</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID</div><div class='del'>-	here.  Also cleaned up the code a bit with the help of Michael</div><div class='del'>-	Meeks.</div><div class='del'>-</div><div class='del'>-2000-08-08  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):</div><div class='del'>-	use x-evolution-any-field.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (search_entry_activated): use</div><div class='del'>-	x-evolution-any-field.</div><div class='del'>-	(change_view_type): same.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query</div><div class='del'>-	to x-evolution-any-field.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_contains): support</div><div class='del'>-	x-evolution-any-field for matching any evolution supported field.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (compare_email): switch to using</div><div class='del'>-	ECardSimple calls.</div><div class='del'>-	(compare_phone): same.</div><div class='del'>-	(compare_address): same.</div><div class='del'>-	(entry_compare): switch to using ECardSimple calls, and support a</div><div class='del'>-	'x-evolution-any-field' wildcard field.</div><div class='del'>-	(vcard_matches_search): use an ECardSimple.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Removed the next and prev</div><div class='del'>-	toolbar buttons since they don't do anything.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor.c: Fixed the tab order to not</div><div class='del'>-	repeat the web page address field.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed the tab order for this</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-08-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Cast to (char *) in</div><div class='del'>-	e_card_load_cards_from_file since libversit isn't const correct.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-04  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): unref.</div><div class='del'>-</div><div class='del'>-	* demo/addressbook.c (control_activate): unref.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/e-addressbook-model.c: Emit "model_pre_change"</div><div class='del'>-	signal as appropriate.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Adapted this to supply the</div><div class='del'>-	new append_row API of ETableModel.</div><div class='del'>-</div><div class='del'>-2000-07-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed the default set of columns.</div><div class='del'>-</div><div class='del'>-2000-07-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook</div><div class='del'>-	compilation.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_load_cards_from_file helper function to load multiple cards</div><div class='del'>-	from a single file.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-gnomecard-addressbook.c: New file to load</div><div class='del'>-	vcard files.  I think this is the format that gnomecard uses so if</div><div class='del'>-	you copy your gnomecard file to gnomecard.vcf and then run this</div><div class='del'>-	program in the same directory, it'll copy all your gnome contacts</div><div class='del'>-	into evolution.  It needs to be changed to take a filename as a</div><div class='del'>-	parameter.  Some fields (phone and address information, for</div><div class='del'>-	example) aren't displayed properly, but are saved.  This is new</div><div class='del'>-	code, so some other than phone and address may be lost.</div><div class='del'>-</div><div class='del'>-2000-07-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and</div><div class='del'>-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even</div><div class='del'>-	if the OpenLDAP support is not enabled.</div><div class='del'>-</div><div class='del'>-2000-07-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load</div><div class='del'>-	to.</div><div class='del'>-</div><div class='del'>-2000-07-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-07-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the</div><div class='del'>-	view until we've taken care of freeing its internals.  also, close</div><div class='del'>-	the ldap connection here.</div><div class='del'>-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,</div><div class='del'>-	since it's always called when we create a view.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): open an ldap connection</div><div class='del'>-	in this function and close it at the end.</div><div class='del'>-	(poll_ldap): make sure to call ldap_unbind to close the view's</div><div class='del'>-	connection here.</div><div class='del'>-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -</div><div class='del'>-	ldap_unbind will either be called from poll_ldap or from</div><div class='del'>-	view_destroy.</div><div class='del'>-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an</div><div class='del'>-	LDAP*.</div><div class='del'>-</div><div class='del'>-2000-07-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): same.</div><div class='del'>-</div><div class='del'>-2000-07-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: lowercasify the</div><div class='del'>-	supported_mime_types</div><div class='del'>-</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.</div><div class='del'>-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.</div><div class='del'>-	(set_status): implement.</div><div class='del'>-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous</div><div class='del'>-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.</div><div class='del'>-	(local_record_from_ecard): get the current status from the ecard.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.</div><div class='del'>-	(parse_pilot_status): new function.</div><div class='del'>-	(e_card_class_init): add pilot status object arg.</div><div class='del'>-	(e_card_set_arg): add pilot status support.</div><div class='del'>-	(e_card_get_arg): same.</div><div class='del'>-	(e_card_init): initialize pilot_status to 0.</div><div class='del'>-</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: add comment headers to signals that</div><div class='del'>-	didn't have any.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (start_address_server): use the user's</div><div class='del'>-	Contact db.  not toshok's.</div><div class='del'>-</div><div class='del'>-2000-07-25  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we</div><div class='del'>-	opened ok.</div><div class='del'>-</div><div class='del'>-2000-07-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static</div><div class='del'>-	version of the library for address conduit to use</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: build a static version of the library</div><div class='del'>-	to link into the conduit</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Added a #define for</div><div class='del'>-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's</div><div class='del'>-	in properly from VCards.  Rearranged some field orders.  Added a</div><div class='del'>-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.</div><div class='del'>-</div><div class='del'>-2000-07-24  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.h: add pilot_id.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): add support for</div><div class='del'>-	X-EVOLUTION-PILOTD vcard field.</div><div class='del'>-	(e_card_class_init): add pilot_id arg.</div><div class='del'>-	(e_card_set_arg): handle pilot_id arg.</div><div class='del'>-</div><div class='del'>-2000-07-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c: Remove the idle handler</div><div class='del'>-	when we're destroyed.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Fixed the spacing on the card</div><div class='del'>-	header.</div><div class='del'>-</div><div class='del'>-2000-07-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Fixed the oaf info.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,</div><div class='del'>-	gui/minicard/e-minicard-widget-test.c: Added a test for the</div><div class='del'>-	minicard widget.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Fixed the mime type.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent</div><div class='del'>-	isn't a minicard view.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.oafinfo: Removed.</div><div class='del'>-</div><div class='del'>-2000-07-20  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Update for</div><div class='del'>-	the new `evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-	</div><div class='del'>-	* conduit/address-conduit-control-applet.desktop:</div><div class='del'>-		Added the Turkish desktop entry.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the</div><div class='del'>-	list of mime types we support.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added</div><div class='del'>-	gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c, and</div><div class='del'>-	gui/minicard/e-minicard-widget.h.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-widget.h: Got these to compile.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.gnorba,</div><div class='del'>-	gui/minicard/e-minicard-control.oafinfo: Copied directly from</div><div class='del'>-	bonobo-clock-control.  These aren't done yet.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-widget.h: New files for using a minicard</div><div class='del'>-	as a widget or a bonobo control.</div><div class='del'>-</div><div class='del'>-2000-07-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.</div><div class='del'>-	don't save the port in the host slot either.</div><div class='del'>-</div><div class='del'>-2000-07-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-confirm-delete.glade,</div><div class='del'>-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added</div><div class='del'>-	these.</div><div class='del'>-</div><div class='del'>-2000-07-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched the order of compilation of printing and</div><div class='del'>-	contact-editor.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added printing libraries and a</div><div class='del'>-	confirm delete dialog glade file.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Enabled the delete and print</div><div class='del'>-	functions as well as providing a confirm delete dialog to the</div><div class='del'>-	outside world.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made the delete button on new cards</div><div class='del'>-	active.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added printing libraries to a number</div><div class='del'>-	of test programs.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Added print and delete to the right</div><div class='del'>-	click menu.  Made the delete button on the card editor active.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a</div><div class='del'>-	function to print a single card.</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix</div><div class='del'>-	typo that was saving the port in the rootdn spot.</div><div class='del'>-	(save_ldap_data): make this a bit safer - writing to a new file</div><div class='del'>-	and renaming it.</div><div class='del'>-	(load_ldap_data): make this a bit smarter - if parsing the</div><div class='del'>-	ldapservers.xml file fails and there's a .new file there,</div><div class='del'>-	rename it.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Do case insensitive compares.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Make quick search</div><div class='del'>-	search both name and company name.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added installation of arrow.png.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.</div><div class='del'>-</div><div class='del'>-2000-07-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed an unused function</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl</div><div class='del'>-	file to EXTRA_DIST</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Remove the</div><div class='del'>-	SelectNames test.</div><div class='del'>-</div><div class='del'>-2000-07-10  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)</div><div class='del'>-	Make multiple addresses be concatenated correctly.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Switched from ETable</div><div class='del'>-	to ETableScrolled.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or</div><div class='del'>-	"name or org" fields.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added a field that gives the name if it exists and the company</div><div class='del'>-	name otherwise.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Formatting changes.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: Added</div><div class='del'>-	stripping of names and display of company name if name doesn't</div><div class='del'>-	exist.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Fixed up the</div><div class='del'>-	display so that we display both name and email address.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Fixed a small</div><div class='del'>-	off by one error that was causing an extra character to get</div><div class='del'>-	deleted sometimes.</div><div class='del'>-</div><div class='del'>-2000-07-09  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with</div><div class='del'>-	scroll region setting.</div><div class='del'>-	(resize): Likewise.</div><div class='del'>-	(main): Put the contacts list in an EScrolledFrame instead of using a</div><div class='del'>-	separate GtkScrollbar.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and</div><div class='del'>-	don't allow drags on dividers that aren't visible.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with</div><div class='del'>-	scroll region setting.</div><div class='del'>-	(resize): Likewise.</div><div class='del'>-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of</div><div class='del'>-	using a separate GtkScrollbar.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed unused do_nothing_cb</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h: Made the OK</div><div class='del'>-	and Cancel buttons in the ESelectNames dialog we create work</div><div class='del'>-	properly.</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Added</div><div class='del'>-	e_select_names_model_duplicate.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Made the</div><div class='del'>-	text be set correctly if there's already data in the source when</div><div class='del'>-	the text model is created.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Removed handling of</div><div class='del'>-	the buttons (the user of this dialog will have to handle them.)</div><div class='del'>-	Added e_select_names_get_source.  Fixed some typos.</div><div class='del'>-</div><div class='del'>-2000-07-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Link the toolbar print button to</div><div class='del'>-	the print callback.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_clicked): Hitting OK or Cancel at least closes the</div><div class='del'>-	dialog now.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_create_entry): Set the returned entry to</div><div class='del'>-	use the ellipsis.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: Include</div><div class='del'>-	e-select-names-factory.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Handle a NULL</div><div class='del'>-	iterator properly in the replace function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: Fill in</div><div class='del'>-	info properly in the value_at function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Don't</div><div class='del'>-	strlen a NULL text object.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Close if the person</div><div class='del'>-	hits ok or cancel (doesn't yet actually undo changes if Cancel is</div><div class='del'>-	hit.)  Handle removing addresses when they're double clicked on.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade.h: Hid some unused</div><div class='del'>-	fields and changed the text at the top of the dialog.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/.cvsignore: Ignore dynamically </div><div class='del'>-	created source files</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): New function to set the properties.</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Start up the factory</div><div class='del'>-	for `Evolution::Addressbook::SelectNames'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:</div><div class='del'>-	New.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-factory.c: New.</div><div class='del'>-	* gui/component/select-names/e-select-names-factory.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c: New.</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Call</div><div class='del'>-	`e_select_names_factory_init()'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_add_section): Made const-aware.</div><div class='del'>-	(e_select_names_manager_create_entry): Made const-aware.</div><div class='del'>-	(e_select_names_manager_activate_dialog): Made const-aware.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:</div><div class='del'>-	New.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: Added an "editable" argument.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Set our</div><div class='del'>-	EAddressModel to not be editable.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Changed to line</div><div class='del'>-	mode.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c: Implemented the</div><div class='del'>-	get_cards function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Implemented adding</div><div class='del'>-	cards through the interface.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Make the</div><div class='del'>-	entry widgets we create editable.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Use</div><div class='del'>-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: When</div><div class='del'>-	the model changes, send a model changed signal.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Made</div><div class='del'>-	changing this work correctly if it's empty.  Made change signals</div><div class='del'>-	propagate properly.  Is a bit better about freeing iterators when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made the finished</div><div class='del'>-	lists be in order instead of being sorted.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_server_cb): Since</div><div class='del'>-	ELDAPServer-&gt;port is a char *, allocate a string with the number</div><div class='del'>-	389 contained.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the select names test test the</div><div class='del'>-	new code instead of the old way of getting to an ESelectNames</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Coded</div><div class='del'>-	storing the model for each section, creating an entry and</div><div class='del'>-	returning it, and for activating the dialog.  Wrote a bit of the</div><div class='del'>-	get_cards code, but not all of it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Coded all of</div><div class='del'>-	the code needed to make ESelectNamesTextModel work (it doesn't</div><div class='del'>-	yet, but all the code should be there.)  Removed</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c: Changed</div><div class='del'>-	these to compensate for removal of</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h: Fixed some</div><div class='del'>-	silly typos.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Added a parameter to</div><div class='del'>-	add_section that lets you specify the source ESelectNamesModel.</div><div class='del'>-	</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and</div><div class='del'>-	make port a string.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a</div><div class='del'>-	uri, load all the bits and pieces and build up the uri when</div><div class='del'>-	creating the folder, according to the openldap url format.</div><div class='del'>-	(ldap_server_foreach): store out each of the individual uri</div><div class='del'>-	pieces.</div><div class='del'>-	(e_ldap_storage_remove_server): free the new fields.</div><div class='del'>-	(get_string_value): if the text is empty, return the empty string</div><div class='del'>-	instead of NULL.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.</div><div class='del'>-	(fill_in_server_info): port is a string now.</div><div class='del'>-</div><div class='del'>-2000-07-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and</div><div class='del'>-	Close" to "Save and Close".  Removed some toolbar items that will</div><div class='del'>-	never be used.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Added functions</div><div class='del'>-	to allow you to modify the model (not implemented yet.)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h: Finished</div><div class='del'>-	this.  Doesn't support changing the model at all.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Finished</div><div class='del'>-	this.  Changing the model by typing is done, but doesn't work</div><div class='del'>-	since none of the functions in the base model are implemented.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_server_cb): call</div><div class='del'>-	e_ldap_storage_add_server call.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: add name row.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add</div><div class='del'>-	support for the name-entry.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add</div><div class='del'>-	prototypes for e_ldap_storage_add_server and</div><div class='del'>-	e_ldap_storage_remove_server.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new</div><div class='del'>-	function, add it to our hash table, add a shell folder, and save</div><div class='del'>-	out the metadata.</div><div class='del'>-	(ldap_server_foreach): add the ldap server info under a</div><div class='del'>-	"contactserver" node.</div><div class='del'>-	(setup_ldap_storage): create our hashtable.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_prop): remove hack to read</div><div class='del'>-	"uri" file from local directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add</div><div class='del'>-	e-ldap-storage.{c,h}</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): call</div><div class='del'>-	setup_ldap_storage.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register</div><div class='del'>-	the LDAP storage and load the .xml file.</div><div class='del'>-	(load_ldap_data): function to load our xml file.</div><div class='del'>-	(save_ldap_data): function to save our xml file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: new file.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c: Fixed more compile</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Fixed compile error.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,</div><div class='del'>-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,</div><div class='del'>-	e-card-list.c, e-card-list.h.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-iterator.c,</div><div class='del'>-	backend/ebook/e-card-iterator.h,</div><div class='del'>-	backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,</div><div class='del'>-	backend/ebook/e-card-list.h: Removed in favor or versions without</div><div class='del'>-	the -card in the e-util directory since these classes are not</div><div class='del'>-	specific to cards at all.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,</div><div class='del'>-	backend/ebook/e-card.c, backend/ebook/e-card.h,</div><div class='del'>-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,</div><div class='del'>-	backend/pas/pas-backend-file.c: Changed the references to</div><div class='del'>-	e-card-list.c and friends to e-list.c and friends.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added #include</div><div class='del'>-	&lt;e-contact-save-as.h&gt; to fix a warning.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Moved a number of classes associated</div><div class='del'>-	with the select-names object to the new select-names directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed the reference to</div><div class='del'>-	e-select-names.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c, gui/component/e-select-names.h,</div><div class='del'>-	gui/component/select-names.glade,</div><div class='del'>-	gui/component/select-names.glade.h: Moved these files into</div><div class='del'>-	select-names/.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/.cvsignore,</div><div class='del'>-	gui/component/select-names/Makefile.am,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/component/select-names/recipient.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade.h: New files for</div><div class='del'>-	select names dialog (e-select-names.c, e-select-names.h,</div><div class='del'>-	select-names.glade, select-names.glade.h and recipient.glade moved</div><div class='del'>-	from gui/component/.)</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h: New select</div><div class='del'>-	names manager interface (Not complete.)</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	addressbook/gui/component/e-cardlist-model.c: Added</div><div class='del'>-	value_to_string handlers.</div><div class='del'>-</div><div class='del'>-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and</div><div class='del'>-	"y" arguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Activated Click To Add</div><div class='del'>-	and set the click to add message.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/e-addressbook-model.c: Added</div><div class='del'>-	value_to_string and append_row handlers.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/e-select-names.c: Added a column.</div><div class='del'>-</div><div class='del'>-2000-06-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.</div><div class='del'>-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer</div><div class='del'>-	we know to be NULL.</div><div class='del'>-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.</div><div class='del'>-	easier to type.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/test-minicard-label.c,</div><div class='del'>-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove</div><div class='del'>-	usage of "x" and "y" arguments.</div><div class='del'>-</div><div class='del'>-2000-06-18    &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in</div><div class='del'>-	the default GNOME prefix.</div><div class='del'>-</div><div class='del'>-2000-06-17  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-label.c,</div><div class='del'>-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made</div><div class='del'>-	the left column of minicards not get any wider than the widest</div><div class='del'>-	possible name.</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_addressbook_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Removed the</div><div class='del'>-	ETableModel thaw handler.</div><div class='del'>-	* gui/component/e-cardlist-model.c: Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c: Fixed the widget reparenting.</div><div class='del'>-</div><div class='del'>-2000-06-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added glade files.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a test of the Select Names</div><div class='del'>-	functionality.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Made this class_init</div><div class='del'>-	function a bit cleaner.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c: Tested this and fixed some</div><div class='del'>-	obvious errors.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade: The main window shouldn't be</div><div class='del'>-	visible by default.</div><div class='del'>-</div><div class='del'>-2000-06-11  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link</div><div class='del'>-	with libemiscwidgets.a.</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.</div><div class='del'>-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.</div><div class='del'>-	(reflow_test_LDADD): Likewise.</div><div class='del'>-	(minicard_view_test_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions</div><div class='del'>-	for better readability.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c, gui/component/e-select-names.h:</div><div class='del'>-	This should be a working dialog now.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade: Changed the name &amp; creation</div><div class='del'>-	function of the ETable here.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade,</div><div class='del'>-	gui/component/select-names.glade.h: Glade files for Select Names</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and</div><div class='del'>-	extract_info more often.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added table printing code.</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Pass NULL</div><div class='del'>-	for the new args @create_folder_fn and @remove_folder_fn.</div><div class='del'>-</div><div class='del'>-2000-06-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (create_view): Updated for</div><div class='del'>-	the new `EvolutionShellComponentCreateViewFn'.  Return</div><div class='del'>-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not</div><div class='del'>-	"contacts".</div><div class='del'>-</div><div class='del'>-2000-06-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Bind Save As to save the</div><div class='del'>-	current view of the contact as a vcard.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the</div><div class='del'>-	card simple and extract the card info.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h (EContactEditor): Now this</div><div class='del'>-	derives from GtkObject.  It follows the same strategy as the</div><div class='del'>-	EventEditor in the calendar.</div><div class='del'>-	(EContactEditor): Added an is_new_card field so that we can know</div><div class='del'>-	whether to add() or commit() the card.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):</div><div class='del'>-	Derive from GtkObject.</div><div class='del'>-	(e_contact_editor_class_init): Likewise.</div><div class='del'>-	(e_contact_editor_class_init): Added an "is_new_card" argument.</div><div class='del'>-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.</div><div class='del'>-	(e_contact_editor_get_arg): Likewise.</div><div class='del'>-	(e_contact_editor_new): Take in an is_new_arg argument and set it</div><div class='del'>-	on the object.</div><div class='del'>-	(e_contact_editor_init): Load the app widget into the app field of</div><div class='del'>-	the EContactEditor structure.  Create its UIHandler as well.</div><div class='del'>-	(e_contact_editor_class_init): New "add_card", "commit_card", and</div><div class='del'>-	"editor_closed" signals.</div><div class='del'>-</div><div class='del'>-	* contact-editor/test-editor.c (main): Modified for the new API.</div><div class='del'>-	(editor_closed_cb): Tweaked for the new API.</div><div class='del'>-	Since this test program does not use Bonobo, it doesn't work,</div><div class='del'>-	though.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): Use the new</div><div class='del'>-	contact editor API.</div><div class='del'>-	(table_double_click): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the</div><div class='del'>-	new contact editor API.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new</div><div class='del'>-	contact editor API.</div><div class='del'>-</div><div class='del'>-2000-06-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove</div><div class='del'>-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of</div><div class='del'>-	course] the library is built in the build directory, not in the</div><div class='del'>-	source directory.</div><div class='del'>-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with</div><div class='del'>-	`libeminicard.a'.</div><div class='del'>-	(minicard_label_test_LDADD): Likewise.</div><div class='del'>-	(reflow_test_LDADD): Likewise.</div><div class='del'>-	(minicard_view_test_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Bind right click on the ETable to</div><div class='del'>-	"Save to VCard."</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made phone/email/address</div><div class='del'>-	labels change correctly again.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Made</div><div class='del'>-	evolution-addressbook shut down when the shell is done with it.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made</div><div class='del'>-	double click only work on the first button.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: return TRUE if opening a contact</div><div class='del'>-	editor so that we don't get a "new dialog" contact editor.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): Use the stock</div><div class='del'>-	cancel button for the dialog.</div><div class='del'>-	(table_double_click): Likewise.</div><div class='del'>-	(find_contact_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-31  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Added accelerators for</div><div class='del'>-	the remaining items.</div><div class='del'>-</div><div class='del'>-	Add spacing, beautify the dialogs.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Put the toolbar</div><div class='del'>-	into a frame to make it look like standard GNOME toolbars.  Also,</div><div class='del'>-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do</div><div class='del'>-	evil things when its moved to the left or the right of the window.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c,</div><div class='del'>-	gui/component/e-cardlist-model.h: New files for card list.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/alphabet.glade: Made the alphabet buttons not</div><div class='del'>-	focusable.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Made the "123" button work.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last</div><div class='del'>-	letter available work.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/alphabet.glade: Added a bit of space around the</div><div class='del'>-	alphabet bar.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added alphabet.glade and</div><div class='del'>-	alphabet.glade.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c, gui/component/alphabet.glade,</div><div class='del'>-	gui/component/alphabet.glade.h: Added an alphabet bar.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,</div><div class='del'>-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:</div><div class='del'>-	Added the ability to just to a particular spot in the reflow.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Made double clicking create a</div><div class='del'>-	new card.  Set the empty message.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a</div><div class='del'>-	message for when the reflow is empty.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/medbook.ecps: Made the</div><div class='del'>-	default printout be full page.  Made sorting case insensitive.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c,</div><div class='del'>-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,</div><div class='del'>-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,</div><div class='del'>-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,</div><div class='del'>-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,</div><div class='del'>-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Made printing wait for</div><div class='del'>-	"sequence_complete" signal and made it sort.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c,</div><div class='del'>-	gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: Added double click to open</div><div class='del'>-	contact editor.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed some columns.</div><div class='del'>-</div><div class='del'>-2000-05-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	New function.</div><div class='del'>-	(addressbook_factory): Use it.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (evolution_addressbook_LDADD): Link with</div><div class='del'>-	`evolution-shell-component.o' from the shell directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: New.</div><div class='del'>-	* gui/component/addressbook-component.h: New.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched printing and gui.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.h,</div><div class='del'>-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,</div><div class='del'>-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,</div><div class='del'>-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the</div><div class='del'>-	#defines to work elsewhere in evolution.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added linking to libecontactprint.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a menu item to print the</div><div class='del'>-	current query.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Add linking to libebook and requirements.</div><div class='del'>-	Add installation of ecps files.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed</div><div class='del'>-	this to use real data from an EBook.</div><div class='del'>-</div><div class='del'>-	* printing/test-print.c: Made this pass NULL, NULL to</div><div class='del'>-	e_contact_print_dialog_new so that it will compile.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and</div><div class='del'>-	e-contact-editor-save-as.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-save-as.c,</div><div class='del'>-	contact-editor/e-contact-save-as.h: New files that display a save</div><div class='del'>-	as dialog and then save the given card to that file.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right</div><div class='del'>-	click menu.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/e-addressbook-model.c: Added initialize_value and</div><div class='del'>-	value_is_empty callbacks.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a bug that broke</div><div class='del'>-	address field support.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Added support for arbitrary</div><div class='del'>-	fields in the contact editor.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fixed e_card_name_copy and</div><div class='del'>-	e_card_arbitrary_copy to deal correctly with a passed NULL.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Removed imagesdir stuff.</div><div class='del'>-</div><div class='del'>-	* contact-editor/arrow.png: Made this transparent.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Renamed some widgets</div><div class='del'>-	and added custom widgets for all of the images.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Worked on making this work</div><div class='del'>-	decently well with messed up glade files.  Cleaned up a lot of code.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fixed the code to write out and read in</div><div class='del'>-	arbitrary fields.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,</div><div class='del'>-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added</div><div class='del'>-	arbitrary field support.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.</div><div class='del'>-	(poll_ldap): same.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: add typedefs for the can_write</div><div class='del'>-	functions, and add parameters to pas_book_new.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.</div><div class='del'>-	(pas_book_new): same.</div><div class='del'>-	(impl_Evolution_Book_can_write): new function.</div><div class='del'>-	(impl_Evolution_Book_can_write_card): same.</div><div class='del'>-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.</div><div class='del'>-	(pas_backend_ldap_can_write_card): same.</div><div class='del'>-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.</div><div class='del'>-	(pas_backend_file_can_write): same.</div><div class='del'>-	(can_write): return TRUE if we can write to the addressbook file.</div><div class='del'>-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl (Evolution): add can_write and</div><div class='del'>-	can_write_card permission requests.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory</div><div class='del'>-	leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,</div><div class='del'>-	contact-editor/e-contact-editor.c, ename/e-name-western.c,</div><div class='del'>-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed</div><div class='del'>-	some memory leaks.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Rearranged some code.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a reference</div><div class='del'>-	leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a compile</div><div class='del'>-	error.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Got rid of a</div><div class='del'>-	memory leak.  Rearranged a couple functions.</div><div class='del'>-	</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:</div><div class='del'>-	Added some code to stop watching the EBook when the canvas is</div><div class='del'>-	destroyed (apparently the canvas is destroyed before our widget is</div><div class='del'>-	destroyed.)</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Use the correct</div><div class='del'>-	policy for resize.</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added libeutil for e-card's support</div><div class='del'>-	for categories.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added</div><div class='del'>-	a function to get the length.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories</div><div class='del'>-	support (accessible either as "categories" or "category_list".)</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-table and all of the</div><div class='del'>-	categories files.</div><div class='del'>-</div><div class='del'>-	* contact-editor/categories.glade,</div><div class='del'>-	contact-editor/categories-strings.h,</div><div class='del'>-	contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.h:</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.</div><div class='del'>-	Added opening of categories dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Rearranged libraries so that</div><div class='del'>-	libetable would be available for the contact editor categories</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make</div><div class='del'>-	contact editor dialog resizable.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added libetable contact editor</div><div class='del'>-	categories dialog.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.</div><div class='del'>-</div><div class='del'>-2000-05-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulname.glade: Use accelerators here.</div><div class='del'>-</div><div class='del'>-2000-05-13  Valek Filippov  &lt;frob@df.ru&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: save translatable strings</div><div class='del'>-	* gui/component/ldap-server-dialog.glade.h: file with strings</div><div class='del'>-	* printing/e-contact-print.glade: save translatable strings</div><div class='del'>-	* printing/e-contact-print.glade.h: file with strings</div><div class='del'>-		</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Now that we</div><div class='del'>-	depend on recent gnome-libs we can make the toolbar detachable</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the table view be sorted by</div><div class='del'>-	name initially.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: Send a proper response when you</div><div class='del'>-	can't find the ldap URI.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Cleaned up the open error dialog a</div><div class='del'>-	bit.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a dialog for when you can't</div><div class='del'>-	open an addressbook.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,</div><div class='del'>-	e-card-types.h.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.</div><div class='del'>-	Removed some old defines.</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Added e-name-western-tables.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added</div><div class='del'>-	a proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c: Added a missed cast.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Added a proper EXTRA_DIST section.</div><div class='del'>-	</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Make sure that the canvas</div><div class='del'>-	doesn't intercept keyboard focus.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use new art.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Replaced the Address</div><div class='del'>-	button with a label and rearranged the address area a bit.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Reenable editting.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Destroy the view object when</div><div class='del'>-	leaving the minicard view.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call</div><div class='del'>-	reflow_request when sorting on an item changes.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Make File As change if name or</div><div class='del'>-	company are changed pretty much anywhere.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Turned off having minicard editing</div><div class='del'>-	effect anything since it's so crashy.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Added a default card to all new</div><div class='del'>-	file backends.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Rearranged order of things</div><div class='del'>-	getting destroyed.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Rearranged order of things</div><div class='del'>-	getting destroyed.  Don't set attributes of non-null or destroyed</div><div class='del'>-	items.  Destroy parent object when destroyed.  Maintain ref_count</div><div class='del'>-	of items in list.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Don't set attributes of non-null</div><div class='del'>-	items.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in</div><div class='del'>-	list.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.</div><div class='del'>-	Destroy parent object when destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed some indentation.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Changed Email to</div><div class='del'>-	Primary Email.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate</div><div class='del'>-	if data exists in the pull down menus for the phone, address, and</div><div class='del'>-	email fields.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed the string duplication</div><div class='del'>-	problem.  Fixed the business/home address string mix up.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made the minicard view the default</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing</div><div class='del'>-	should work better now.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,</div><div class='del'>-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be</div><div class='del'>-	destroyed and recreated when updating a field.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;toshok@the-dot-in.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (remodel): make sure to free the</div><div class='del'>-	return value of e_card_simple_get.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (teardown_table_view): destroy the</div><div class='del'>-	ECardSimple here, plug memory leak.</div><div class='del'>-	(create_table_view): use view-&gt;simple so we can destroy the</div><div class='del'>-	ECardSimple later on.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_extract_middle): comment</div><div class='del'>-	function, and fix an ABR.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_cleanup_string): comment</div><div class='del'>-	function, and fix an ABR.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Added saving in minicard view.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_prop): don't create a new</div><div class='del'>-	ebook.  instead, unload the current uri (if there is one) and load</div><div class='del'>-	the new one.</div><div class='del'>-	(addressbook_factory): create the ebook once.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Replaced some model_changed</div><div class='del'>-	calls with row_inserted calls.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:</div><div class='del'>-	Removed some code that was notifying too many clients at the wrong</div><div class='del'>-	times.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Set view-&gt;book.  Unreffed</div><div class='del'>-	view-&gt;book.  Unreffed the model instead of destroying it.  Removed</div><div class='del'>-	the /tmp/test.db stuff.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the addressbook create the</div><div class='del'>-	correct file uri.  Added a default query.  Initialize view-&gt;model</div><div class='del'>-	and view-&gt;view to NULL.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/minicard/e-minicard-view.c: Only call get_book_view if both</div><div class='del'>-	book and query and non-null.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): remove the</div><div class='del'>-	separator and toggle view items as well.</div><div class='del'>-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu</div><div class='del'>-	item.</div><div class='del'>-	(get_query): getter for the query string that takes into account</div><div class='del'>-	the two view types.</div><div class='del'>-	(set_query): setter for the query string that takes into account</div><div class='del'>-	the two view types.</div><div class='del'>-	(set_book): setter for the EBook type - not really a setter, since</div><div class='del'>-	the book is kept in the AddressbookView, but this method actually</div><div class='del'>-	sets the "book" property on the current view.</div><div class='del'>-	(find_contact_cb): make use of get/set_query</div><div class='del'>-	(search_entry_activated): make use of set_query.</div><div class='del'>-	(control_activate): add a menu separator and an item to toggle</div><div class='del'>-	between view types.</div><div class='del'>-	(book_open_cb): make use of set_book.</div><div class='del'>-	(ebook_create): no longer needs to return the EBook, since we set</div><div class='del'>-	the book field in our view.</div><div class='del'>-	(teardown_minicard_view): destructor function for the minicard</div><div class='del'>-	specific ui.</div><div class='del'>-	(create_minicard_view): constructor function for the minicard</div><div class='del'>-	specific ui.</div><div class='del'>-	(teardown_table_view): destructor function for the e-table</div><div class='del'>-	specific ui.</div><div class='del'>-	(create_table_view): constructor function for the e-table specific</div><div class='del'>-	ui.</div><div class='del'>-	(change_view_type): destroy the old and create the new view ui,</div><div class='del'>-	change the label of the Toggle View menu item, and reset the book</div><div class='del'>-	and query on the new view type.</div><div class='del'>-	(addressbook_factory): create an all-encompassing vbox that the</div><div class='del'>-	view uses to create the bonobo control, which contains 1 widget</div><div class='del'>-	per ui specific view (the e-table in the table case, and another</div><div class='del'>-	vbox in the minicard case.)  use change_view_type to create the</div><div class='del'>-	initial view.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Made a NULL callback just mean to not</div><div class='del'>-	call back.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Reordered fields.  Added a get_const function to get a constant</div><div class='del'>-	string that persists until the simple is destroyed.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added e-addressbook-model.c and</div><div class='del'>-	e-addressbook-model.h and all of the libraries and includes that</div><div class='del'>-	they are dependent on.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: Initialize e cursors.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added inactive code to display an</div><div class='del'>-	ETable view of the addressbook.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: New files to implement an</div><div class='del'>-	ETable model with a EBook back end.</div><div class='del'>-	</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Mostly finished ECardSimple.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Changed this to match with</div><div class='del'>-	some of the changes to ECardSimple.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed this to look for</div><div class='del'>-	"addressbook.db" in the given directory if it doesn't find the</div><div class='del'>-	file "uri".</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed</div><div class='del'>-	this to use ECardSimple.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/component/.cvsignore: ignore evolution-addressbook.pure</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: add support for generating </div><div class='del'>-	evolution-addressbook.pure.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a</div><div class='del'>-	port isn't specified in the uri default to 389.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made this take a uri through its</div><div class='del'>-	property bag.</div><div class='del'>-</div><div class='del'>-2000-05-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added e-card-simple.c and</div><div class='del'>-	e-card-simple.h.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	New card wrapper class to simplify things.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use</div><div class='del'>-	ECardSimple a bit.</div><div class='del'>-</div><div class='del'>-2000-05-03  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): #ifdef</div><div class='del'>-	HAVE_LDAP the ldap specific stuff.</div><div class='del'>-	(null_cb): same.</div><div class='del'>-	(control_activate): same.</div><div class='del'>-</div><div class='del'>-2000-05-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_srcdir)/addressbook/ename'.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* demo/Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* printing/Makefile.am: same.</div><div class='del'>-</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: Add back in the</div><div class='del'>-	CORBA_Object_release.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c: Properly duplicate and release the</div><div class='del'>-	listener passed to us.</div><div class='del'>-</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:</div><div class='del'>-	Made uri slightly better managed.</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_process_request): Remove this</div><div class='del'>-	CORBA_Object_release that causes things not to work.  This is just</div><div class='del'>-	a temporary fix until we figure out what's actually wrong.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.</div><div class='del'>-	</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched the subdirs order since backend depends on</div><div class='del'>-	ename.</div><div class='del'>-</div><div class='del'>-2000-05-01  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):</div><div class='del'>-	fix a typo in the for loop.</div><div class='del'>-</div><div class='del'>-2000-05-01  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: include gtk.</div><div class='del'>-</div><div class='del'>-2000-04-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h (EBookStatus): Added new status</div><div class='del'>-	values for the IDL stuff.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New</div><div class='del'>-	"last_book_gone" signal.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_launch_backend): Better error handling.</div><div class='del'>-	(pas_book_factory_process_queue): Let</div><div class='del'>-	pas_book_factory_process_request() free the request.</div><div class='del'>-	(pas_book_factory_process_request): Free the request here.</div><div class='del'>-	Perform better error handling.</div><div class='del'>-	(free_active_server_map_entry): Free an active server map entry;</div><div class='del'>-	free the URI key and unref the backend value.  This function was</div><div class='del'>-	renamed; the old one was trying to CORBA_Object_unref() a GTK+</div><div class='del'>-	object!</div><div class='del'>-	(remove_backends_entry): Free a backend table entry; free the URI</div><div class='del'>-	key.</div><div class='del'>-	(backend_last_client_gone_cb): Remove the backend from the active</div><div class='del'>-	server map and emit the "last_book_gone" signal if appropriate.</div><div class='del'>-	(pas_book_factory_get_n_backends): New function to query the</div><div class='del'>-	number of running backends in an addressbook factory.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a</div><div class='del'>-	ProtocolNotSupported code.  This is for when the addressbook</div><div class='del'>-	factory cannot find a provider for the requested URI.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.h (PASBackendClass): New</div><div class='del'>-	"last_client_gone" signal.</div><div class='del'>-	(PASBackendClass): New get_uri virtual method.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a</div><div class='del'>-	gboolean success code.</div><div class='del'>-	(pas_backend_add_client): Return a gboolean success code.</div><div class='del'>-	(pas_backend_last_client_gone): New function used by backend</div><div class='del'>-	implementations to notify upwards when the backend's last client</div><div class='del'>-	is destroyed.</div><div class='del'>-	(pas_backend_get_uri): New function to get the URI of a backend.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):</div><div class='del'>-	Pass the backend as the closure data to the "destroy" handler of</div><div class='del'>-	the book.  We cannot call pas_book_get_backend() in the callback</div><div class='del'>-	since the book's private data has already been destroyed when the</div><div class='del'>-	callback is invoked.  Alternatively, we could move the private</div><div class='del'>-	data destruction step to the book's ::finalize() method.</div><div class='del'>-	(pas_backend_file_book_destroy_cb): Get the backend from the</div><div class='del'>-	callback's data, not from the book.</div><div class='del'>-	(pas_backend_file_remove_client): Remove the book from the list of</div><div class='del'>-	clients.  When all clients go away, call</div><div class='del'>-	pas_backend_last_client_gone().</div><div class='del'>-	(PASBackendFilePrivate): Added an uri field.</div><div class='del'>-	(pas_backend_file_get_uri): Implement the get_uri method.</div><div class='del'>-	(pas_backend_file_load_uri): Return a gboolean success code.</div><div class='del'>-	Also, store the URI in the private structure.</div><div class='del'>-	(pas_backend_file_add_client): Return a gboolean success code.</div><div class='del'>-	Also, call pas_backend_last_client_gone() if appropriate.</div><div class='del'>-	(pas_backend_file_destroy): Free the bf-&gt;priv-&gt;uri.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):</div><div class='del'>-	Pass the backend as the closure data to the "destroy" handler of</div><div class='del'>-	the book.  See above for rationale.</div><div class='del'>-	(pas_backend_ldap_book_destroy_cb): Get the backend from the</div><div class='del'>-	callback's data.</div><div class='del'>-	(pas_backend_ldap_remove_client): Remove the book from the list of</div><div class='del'>-	clients.  When all clients go away, call</div><div class='del'>-	pas_backend_last_client_gone().</div><div class='del'>-	(pas_backend_ldap_load_uri): Return a gboolean success code.</div><div class='del'>-	(pas_backend_ldap_add_client): Return a gboolean success code.</div><div class='del'>-	Also, call pas_backend_last_client_gone() if appropriate.</div><div class='del'>-	(PASBackendLDAPPrivate): New uri field.</div><div class='del'>-	(pas_backend_ldap_get_uri): Implement the get_uri method.</div><div class='del'>-	(pas_backend_ldap_load_uri): Store the uri in the private</div><div class='del'>-	structure.</div><div class='del'>-	(pas_backend_ldap_destroy): Free the bl-&gt;priv-&gt;uri.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added</div><div class='del'>-	e-ldap-server-dialog.c</div><div class='del'>-	(glade_DATA): added ldap-server-dialog.glade</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: new file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.h: new file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c: new file, contains logic</div><div class='del'>-	associated with ldap server dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): remove the</div><div class='del'>-	directory server menu item.</div><div class='del'>-	(null_cb): do nothing callback for e_book_load_uri call.  should</div><div class='del'>-	change to (at the very least) pop up a dialog if there was an</div><div class='del'>-	error.</div><div class='del'>-	(new_server_cb): new function - really just switches to a</div><div class='del'>-	particular ldap server, since the information isn't saved</div><div class='del'>-	anywhere.</div><div class='del'>-	(control_activate): add directory server menu item.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_uri): create the book</div><div class='del'>-	listener here, since it's destroyed in unload_uri.</div><div class='del'>-	(e_book_construct): remove the book listener construction here.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: Added load-pine-addressbook.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made</div><div class='del'>-	some fields invisible that were visible before.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Make file as not have the : after it if</div><div class='del'>-	it's empty.  If there's no name, or file_as, fill in these fields</div><div class='del'>-	with defaults based on full_name or name respectively.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: New file to do import of</div><div class='del'>-	pine .addressbook files.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Made empty fields act as the</div><div class='del'>-	empty string for searches.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Made the File As field update</div><div class='del'>-	properly as you edit the name and company fields.  Added the pull</div><div class='del'>-	down list of File As choices.  Made sure that all fields will</div><div class='del'>-	be set to NULL if they are deleted to the empty string.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Use the File As field instead of the</div><div class='del'>-	Full Name field for the header.  Make identical compares on the</div><div class='del'>-	File As field do a compare on the uid.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/fullname.glade: Fixed a string mismatch.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added ename includes and libs.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_name_from_string.  Added header for</div><div class='del'>-	e_card_delivery_address_from_string, even though it's not</div><div class='del'>-	implemented yet.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Removed the ename includes since we</div><div class='del'>-	no longer use ename directly here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed this to properly save</div><div class='del'>-	the address labels displayed.  Updated this to use the function</div><div class='del'>-	e_card_name_from_string instead of doing it by hand.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fullname-strings.h,</div><div class='del'>-	contact-editor/fullname.glade: Deleted an unused field.  Changed</div><div class='del'>-	the set of prefixes and suffixes.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_ensure_connected): add support for a rootdn in</div><div class='del'>-	the uri.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in</div><div class='del'>-	the call to ldap_search_s.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.</div><div class='del'>-</div><div class='del'>-2000-04-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_phone_new e_card_delivery_address_new,</div><div class='del'>-	e_card_delivery_address_to_string, e_card_name_copy,</div><div class='del'>-	e_card_name_new, e_card_name_to_string, and made e_card_name_free</div><div class='del'>-	public.  Removed some unused code.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]</div><div class='del'>-	and fullname.glade.  Added e-name libs and includes.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.h,</div><div class='del'>-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:</div><div class='del'>-	New dialog for editing the fields of a name separately.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Create an</div><div class='del'>-	EContactEditorFullname when you click on the Full Name button.</div><div class='del'>-	Maintain a parsed name at all times.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added</div><div class='del'>-	e-name libs.</div><div class='del'>-</div><div class='del'>-2000-04-28  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c (register_factory): fix the</div><div class='del'>-	`USING_OAF' changes so that they work for when we are not using</div><div class='del'>-	oaf.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am</div><div class='del'>-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.</div><div class='del'>-	(INCLUDES): Add `-I$(srcdir)/..'.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(register_factory): New function to register the factory.</div><div class='del'>-	Implementation different according to `USING_OAF'.</div><div class='del'>-	(pas_book_factory_activate): Use `register_factory()'.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',</div><div class='del'>-	varying depending on whether we are `USING_OAF'.</div><div class='del'>-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c (init_corba): New function,</div><div class='del'>-	implemented differently according to the `USING_OAF' #define.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.</div><div class='del'>-	(e_book_construct): Work with OAF #if `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (gnome_libs): Removed.</div><div class='del'>-	(corbadir): Removed.</div><div class='del'>-	(ebook_libs): Removed.</div><div class='del'>-	(test_client_LDADD): Just add `libebook.la'.</div><div class='del'>-	(test_card_LDADD): Likewise.</div><div class='del'>-	(test_client_list_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c</div><div class='del'>-	(init_corba): New helper function, implemented differently</div><div class='del'>-	according to `USING_OAF'.</div><div class='del'>-	(main): Call `init_corba()'.</div><div class='del'>-</div><div class='del'>-2000-04-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,</div><div class='del'>-	office, manager, assistant, spouse, and anniversary fields.  These</div><div class='del'>-	all use "X-EVOLUTION-" fields in the VCards.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Added all the new fields (except</div><div class='del'>-	anniversary) to the list of fields.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed</div><div class='del'>-	fields and fixed the placement of the comments field.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made the newly added fields</div><div class='del'>-	display properly.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added ename.</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,</div><div class='del'>-	ename/test-ename-western.c: Fixed up some #includes.</div><div class='del'>-</div><div class='del'>-	* ename/.cvsignore: Added .cvsignore.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	backend/ebook/e-card.h: Added an address label field.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Got rid of some unused</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Added the address label field.</div><div class='del'>-	Load only.  Editing these fields seems to mess things up.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added proper handling of the</div><div class='del'>-	email field.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Edited the glade file.</div><div class='del'>-	Removed all the fields that we don't use.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Made the phone fields work</div><div class='del'>-	properly.  The address and email fields are temporarily turned off</div><div class='del'>-	until they can be made to work as the phone fields do.</div><div class='del'>-</div><div class='del'>-2000-04-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to</div><div class='del'>-	pick up IDL files in the installation prefix as well.</div><div class='del'>-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'</div><div class='del'>-	to get the IDLs from the installation prefix as well.</div><div class='del'>-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of</div><div class='del'>-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,</div><div class='del'>-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.</div><div class='del'>-	(test_client_list_LDADD): Likewise.</div><div class='del'>-	(test_card_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log</div><div class='del'>-	domain.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Use</div><div class='del'>-	"evolution-addressbook" as the log domain.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.</div><div class='del'>-	Do not install any header files.</div><div class='del'>-	(INCLUDES): Remove spurious include paths.</div><div class='del'>-</div><div class='del'>-	* backend/pas/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Do not install the test programs.</div><div class='del'>-	Fixed some include weirdness.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to</div><div class='del'>-	"contact-editor".</div><div class='del'>-	(INCLUDES): Fix.</div><div class='del'>-</div><div class='del'>-	* contact-editor/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: Started a ChangeLog here.</div><div class='head'>diff --git a/addressbook/E-CARD-NEEDED-FIELDS b/addressbook/E-CARD-NEEDED-FIELDS<br/>deleted file mode 100644<br/>index e227d1b130..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/E-CARD-NEEDED-FIELDS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/E-CARD-NEEDED-FIELDS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-I will add these fields as I get a chance to.</div><div class='del'>-</div><div class='del'>-Thanks,</div><div class='del'>-    Chris Lahey</div><div class='del'>-</div><div class='del'>-X-EVOLUTION-LIST			boolean if this is a mailing list.</div><div class='del'>-X-EVOLUTION-LIST-SHOW-ADDRESSES		boolean whether to list all email addresses in the To: line or to treat the list kind of like a BCC.</div><div class='del'>-X-EVOLUTION-RELATED-CONTACTS		EDestionationList of related contacts.</div><div class='del'>-REV					last changed date.
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am<br/>deleted file mode 100644<br/>index 9aad9c1b30..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-if ENABLE_PILOT_CONDUITS</div><div class='del'>-CONDUIT_SUBDIR=conduit</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-SUBDIRS =	\</div><div class='del'>-	backend printing gui $(CONDUIT_SUBDIR)</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/.cvsignore b/addressbook/backend/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/backend/Makefile.am b/addressbook/backend/Makefile.am<br/>deleted file mode 100644<br/>index b2807b2480..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = idl ebook pas</div><div class='head'>diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore<br/>deleted file mode 100644<br/>index deec6ea2e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-addressbook-stubs.c</div><div class='del'>-addressbook-skels.c</div><div class='del'>-addressbook-common.c</div><div class='del'>-addressbook.h</div><div class='del'>-test-card</div><div class='del'>-test-client</div><div class='del'>-test-client-list</div><div class='del'>-load-pine-addressbook</div><div class='del'>-load-gnomecard-addressbook</div><div class='del'>-evolution-vcard-importer</div><div class='del'>-evolution-gnomecard-importer</div><div class='del'>-evolution-ldif-importer</div><div class='del'>-Evolution-Composer-stubs.c</div><div class='del'>-Evolution-Composer-skels.c</div><div class='del'>-Evolution-Composer-common.c</div><div class='del'>-Evolution-Composer.h</div><div class='del'>-GNOME_Evolution_Addressbook_VCard_Importer.oaf</div><div class='del'>-GNOME_Evolution_Addressbook_LDIF_Importer.oaf</div><div class='head'>diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in<br/>deleted file mode 100644<br/>index b022dcde67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"</div><div class='del'>-	    type="exe"</div><div class='del'>-	    location="evolution-ldif-importer"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Factory to import LDIF files into Evolution."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Importer:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:menu-name" type="string"</div><div class='del'>-		       value="LDAP Data Interchange Format (.ldif)"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Imports LDIF files into Evolution."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in<br/>deleted file mode 100644<br/>index 9cd4699633..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"</div><div class='del'>-	    type="exe"</div><div class='del'>-	    location="evolution-vcard-importer"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Factory to import VCard files into Evolution."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Importer:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:menu-name" type="string"</div><div class='del'>-		       value="VCard (.vcf, .gcrd)"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Imports VCard files into Evolution."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am<br/>deleted file mode 100644<br/>index 29430d93f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-noinst_PROGRAMS = test-card test-client test-client-list</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS =	evolution-vcard-importer 	\</div><div class='del'>-		evolution-ldif-importer		\</div><div class='del'>-		load-pine-addressbook		\</div><div class='del'>-		load-gnomecard-addressbook</div><div class='del'>-</div><div class='del'>-CORBA_SOURCE =				\</div><div class='del'>-	addressbook.h			\</div><div class='del'>-	addressbook-common.c		\</div><div class='del'>-	addressbook-stubs.c		\</div><div class='del'>-	addressbook-skels.c		\</div><div class='del'>-        Evolution-Composer.h            \</div><div class='del'>-        Evolution-Composer-common.c     \</div><div class='del'>-        Evolution-Composer-skels.c      \</div><div class='del'>-        Evolution-Composer-stubs.c</div><div class='del'>-</div><div class='del'>-idls =								\</div><div class='del'>-	$(srcdir)/../idl/addressbook.idl			\</div><div class='del'>-	$(srcdir)/../../../composer/Evolution-Composer.idl</div><div class='del'>-</div><div class='del'>-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl</div><div class='del'>-</div><div class='del'>-$(CORBA_SOURCE): $(idls)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"        	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"EBook\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I$(top_srcdir)/camel				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/ename		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/ename		\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-        $(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libebook.la</div><div class='del'>-</div><div class='del'>-libebook_la_SOURCES =					\</div><div class='del'>-	$(CORBA_SOURCE)					\</div><div class='del'>-	e-book-listener.c				\</div><div class='del'>-	e-book-view-listener.c				\</div><div class='del'>-	e-book-view.c					\</div><div class='del'>-	e-book.c					\</div><div class='del'>-	e-book-util.c					\</div><div class='del'>-	e-card-cursor.c					\</div><div class='del'>-	e-card-simple.c					\</div><div class='del'>-	e-card.c					\</div><div class='del'>-	e-card-compare.c				\</div><div class='del'>-	e-destination.c</div><div class='del'>-</div><div class='del'>-libebookincludedir = $(includedir)/evolution/ebook</div><div class='del'>-</div><div class='del'>-libebookinclude_HEADERS =				\</div><div class='del'>-	e-book-listener.h				\</div><div class='del'>-	e-book-types.h					\</div><div class='del'>-	e-book-view-listener.h				\</div><div class='del'>-	e-book-view.h					\</div><div class='del'>-	e-book.h					\</div><div class='del'>-	e-book-util.h					\</div><div class='del'>-	e-card-cursor.h					\</div><div class='del'>-	e-card-simple.h					\</div><div class='del'>-	e-card-types.h					\</div><div class='del'>-	e-card.h					\</div><div class='del'>-	e-card-compare.h				\</div><div class='del'>-	e-destination.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# make a static library for use by addressbook's conduit's shared library</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libebook-static.la</div><div class='del'>-libebook_static_la_SOURCES = $(libebook_la_SOURCES)</div><div class='del'>-libebook_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test_client_SOURCES =					\</div><div class='del'>-	test-client.c</div><div class='del'>-</div><div class='del'>-test_client_LDADD =					\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-test_client_list_SOURCES =				\</div><div class='del'>-	test-client-list.c</div><div class='del'>-</div><div class='del'>-test_client_list_LDADD =				\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-test_card_SOURCES =					\</div><div class='del'>-	test-card.c</div><div class='del'>-</div><div class='del'>-test_card_LDADD =					\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-evolution_vcard_importer_SOURCES = \</div><div class='del'>-	evolution-vcard-importer.c</div><div class='del'>-</div><div class='del'>-evolution_vcard_importer_LDADD =				\</div><div class='del'>-	libebook.la						\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la			\</div><div class='del'>-	$(top_builddir)/shell/importer/libevolution-importer.la \</div><div class='del'>-	$(DB3_LDADD)						\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-evolution_ldif_importer_SOURCES = \</div><div class='del'>-	evolution-ldif-importer.c</div><div class='del'>-</div><div class='del'>-evolution_ldif_importer_LDADD =					\</div><div class='del'>-	libebook.la						\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)				\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la			\</div><div class='del'>-	$(top_builddir)/shell/importer/libevolution-importer.la \</div><div class='del'>-	$(DB3_LDADD)						\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-load_pine_addressbook_SOURCES =				\</div><div class='del'>-	load-pine-addressbook.c</div><div class='del'>-</div><div class='del'>-load_pine_addressbook_LDADD =				\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-load_gnomecard_addressbook_SOURCES =			\</div><div class='del'>-	load-gnomecard-addressbook.c</div><div class='del'>-</div><div class='del'>-load_gnomecard_addressbook_LDADD =			\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a		\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_SOURCE)</div><div class='del'>-CLEANFILES    = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files =	GNOME_Evolution_Addressbook_VCard_Importer.oaf.in \</div><div class='del'>-		GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-# add this back when you add the file to the archive ;)</div><div class='del'>-#	GNOME_Evolution_Addressbook_Pine_Importer.oafinfo</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)</div><div class='head'>diff --git a/addressbook/backend/ebook/TODO b/addressbook/backend/ebook/TODO<br/>deleted file mode 100644<br/>index a69703cd92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/TODO?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-* Make sure open_book_progress does not use the EBook op queue; make</div><div class='del'>-  sure it works.</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c<br/>deleted file mode 100644<br/>index ce85ed75ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-listener.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,830 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Exports the BookListener interface.  Maintains a queue of messages</div><div class='del'>- * which come in on the interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-book-listener.h"</div><div class='del'>-</div><div class='del'>-static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RESPONSES_QUEUED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_book_listener_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass          *e_book_listener_parent_class;</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookListener__vepv  e_book_listener_vepv;</div><div class='del'>-</div><div class='del'>-struct _EBookListenerPrivate {</div><div class='del'>-	GList   *response_queue;</div><div class='del'>-	gint     timeout_id;</div><div class='del'>-</div><div class='del'>-	guint timeout_lock : 1;</div><div class='del'>-	guint stopped      : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-response_free (EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	if (resp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (resp-&gt;msg);</div><div class='del'>-	g_free (resp-&gt;id);</div><div class='del'>-</div><div class='del'>-	if (resp-&gt;book != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		</div><div class='del'>-		bonobo_object_release_unref (resp-&gt;book, &amp;ev);</div><div class='del'>-		</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_listener_destroy: "</div><div class='del'>-				   "Exception destroying book "</div><div class='del'>-				   "in response queue!\n");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (resp-&gt;cursor != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		</div><div class='del'>-		bonobo_object_release_unref (resp-&gt;cursor, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_listener_destroy: "</div><div class='del'>-				   "Exception destroying cursor "</div><div class='del'>-				   "in response queue!\n");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (resp-&gt;book_view != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		</div><div class='del'>-		bonobo_object_release_unref (resp-&gt;book_view, &amp;ev);</div><div class='del'>-		</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_listener_destroy: "</div><div class='del'>-				   "Exception destroying book_view "</div><div class='del'>-				   "in response queue!\n");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_book_listener_check_queue (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_lock)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;timeout_lock = TRUE;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue != NULL &amp;&amp; !listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (listener), e_book_listener_signals [RESPONSES_QUEUED]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue == NULL || listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		listener-&gt;priv-&gt;timeout_id = 0;</div><div class='del'>-		listener-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener)); /* release the timeout's reference */</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_response (EBookListener         *listener,</div><div class='del'>-				EBookListenerResponse *response)</div><div class='del'>-{</div><div class='del'>-	if (response == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		response_free (response);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;response_queue = g_list_append (listener-&gt;priv-&gt;response_queue, response);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_id == 0) {</div><div class='del'>-</div><div class='del'>-		/* 20 == an arbitrary small integer */</div><div class='del'>-		listener-&gt;priv-&gt;timeout_id = g_timeout_add (20, (GSourceFunc) e_book_listener_check_queue, listener);</div><div class='del'>-</div><div class='del'>-		/* Hold a reference on behalf of the timeout */</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (listener));</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_generic_response (EBookListener          *listener,</div><div class='del'>-					EBookListenerOperation  op,</div><div class='del'>-					EBookStatus             status)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = op;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_open_response (EBookListener  *listener,</div><div class='del'>-				     EBookStatus     status,</div><div class='del'>-				     GNOME_Evolution_Addressbook_Book  book)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = OpenBookResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-	resp-&gt;book   = book;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_open_progress (EBookListener *listener,</div><div class='del'>-				     const char    *msg,</div><div class='del'>-				     short          percent)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op      = OpenProgressEvent;</div><div class='del'>-	resp-&gt;msg     = g_strdup (msg);</div><div class='del'>-	resp-&gt;percent = percent;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_create_card_response (EBookListener *listener,</div><div class='del'>-					    EBookStatus    status,</div><div class='del'>-					    const char    *id)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = CreateCardResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-	resp-&gt;id     = g_strdup (id);</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_get_vcard_response (EBookListener        *listener,</div><div class='del'>-					  EBookStatus           status,</div><div class='del'>-					  const char           *vcard)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp         = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = GetCardResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-	resp-&gt;vcard  = g_strdup (vcard);</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_get_cursor_response (EBookListener        *listener,</div><div class='del'>-					   EBookStatus           status,</div><div class='del'>-					   GNOME_Evolution_Addressbook_CardCursor  cursor)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = GetCursorResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-	resp-&gt;cursor = cursor;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_get_view_response (EBookListener        *listener,</div><div class='del'>-					 EBookStatus           status,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookView    book_view)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = GetBookViewResponse;</div><div class='del'>-	resp-&gt;status    = status;</div><div class='del'>-	resp-&gt;book_view = book_view;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_get_changes_response (EBookListener        *listener,</div><div class='del'>-					    EBookStatus           status,</div><div class='del'>-					    GNOME_Evolution_Addressbook_BookView book_view)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = GetChangesResponse;</div><div class='del'>-	resp-&gt;status    = status;</div><div class='del'>-	resp-&gt;book_view = book_view;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_link_status (EBookListener *listener,</div><div class='del'>-				   gboolean       connected)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = LinkStatusEvent;</div><div class='del'>-	resp-&gt;connected = connected;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_writable_status (EBookListener *listener,</div><div class='del'>-				       gboolean       writable)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = WritableStatusEvent;</div><div class='del'>-	resp-&gt;writable  = writable;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_authentication_response (EBookListener *listener,</div><div class='del'>-					       EBookStatus    status)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = AuthenticationResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_queue_get_supported_fields_response (EBookListener *listener,</div><div class='del'>-						     EBookStatus status,</div><div class='del'>-						     const GNOME_Evolution_Addressbook_stringlist *fields)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op     = GetSupportedFieldsResponse;</div><div class='del'>-	resp-&gt;status = status;</div><div class='del'>-	resp-&gt;fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; fields-&gt;_length; i ++) {</div><div class='del'>-		e_list_append (resp-&gt;fields, fields-&gt;_buffer[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_CardId id,</div><div class='del'>-				       CORBA_Environment                       *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_create_card_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_remove_card (PortableServer_Servant servant,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_generic_response (</div><div class='del'>-		listener, RemoveCardResponse,</div><div class='del'>-		e_book_listener_convert_status (status));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_modify_card (PortableServer_Servant servant,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_generic_response (</div><div class='del'>-		listener, ModifyCardResponse,</div><div class='del'>-		e_book_listener_convert_status (status));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_get_vcard (PortableServer_Servant servant,</div><div class='del'>-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				     const GNOME_Evolution_Addressbook_VCard card,</div><div class='del'>-				     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_get_vcard_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		g_strdup (card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,</div><div class='del'>-				      const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				      const GNOME_Evolution_Addressbook_CardCursor cursor,</div><div class='del'>-				      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor  cursor_copy;</div><div class='del'>-</div><div class='del'>-	cursor_copy = bonobo_object_dup_ref (cursor, ev);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("EBookListener: Exception while duplicating CardCursor!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_get_cursor_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		cursor_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_get_view (PortableServer_Servant servant,</div><div class='del'>-				    const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				    const GNOME_Evolution_Addressbook_BookView book_view,</div><div class='del'>-				    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	GNOME_Evolution_Addressbook_BookView    book_view_copy;</div><div class='del'>-</div><div class='del'>-	book_view_copy = bonobo_object_dup_ref (book_view, ev);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("EBookListener: Exception while duplicating BookView.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_get_view_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		book_view_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_get_changes (PortableServer_Servant servant,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				       const GNOME_Evolution_Addressbook_BookView book_view,</div><div class='del'>-				       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	GNOME_Evolution_Addressbook_BookView    book_view_copy;</div><div class='del'>-</div><div class='del'>-	book_view_copy = bonobo_object_dup_ref (book_view, ev);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("EBookListener: Exception while duplicating BookView.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_get_changes_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		book_view_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_open_book (PortableServer_Servant servant,</div><div class='del'>-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-				     const GNOME_Evolution_Addressbook_Book book,</div><div class='del'>-				     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	GNOME_Evolution_Addressbook_Book  book_copy;</div><div class='del'>-</div><div class='del'>-	book_copy = bonobo_object_dup_ref (book, ev);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("EBookListener: Exception while duplicating Book!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_open_response (</div><div class='del'>-		listener,</div><div class='del'>-		e_book_listener_convert_status (status),</div><div class='del'>-		book_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_report_open_book_progress (PortableServer_Servant servant,</div><div class='del'>-					     const CORBA_char *status_message,</div><div class='del'>-					     const CORBA_short percent,</div><div class='del'>-					     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_open_progress (</div><div class='del'>-		listener, status_message, percent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_respond_authentication_result (PortableServer_Servant servant,</div><div class='del'>-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-						 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_authentication_response (</div><div class='del'>-				       listener, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_response_get_supported_fields (PortableServer_Servant servant,</div><div class='del'>-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,</div><div class='del'>-						 const GNOME_Evolution_Addressbook_stringlist *fields,</div><div class='del'>-						 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_get_supported_fields_response (</div><div class='del'>-				     listener, status, fields);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_report_connection_status (PortableServer_Servant servant,</div><div class='del'>-					    const CORBA_boolean connected,</div><div class='del'>-					    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_link_status (</div><div class='del'>-		listener, connected);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookListener_report_writable (PortableServer_Servant servant,</div><div class='del'>-				   const CORBA_boolean writable,</div><div class='del'>-				   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_listener_queue_writable_status (listener, writable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_listener_check_pending:</div><div class='del'>- * @listener: the #EBookListener </div><div class='del'>- *</div><div class='del'>- * Returns: the number of items on the response queue,</div><div class='del'>- * or -1 if the @listener is isn't an #EBookListener.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_book_listener_check_pending (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              -1);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), -1);</div><div class='del'>-</div><div class='del'>-	return g_list_length (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_listener_pop_response:</div><div class='del'>- * @listener: the #EBookListener for which a request is to be popped</div><div class='del'>- *</div><div class='del'>- * Returns: an #EBookListenerResponse if there are responses on the</div><div class='del'>- * queue to be returned; %NULL if there aren't, or if the @listener</div><div class='del'>- * isn't an EBookListener.</div><div class='del'>- */</div><div class='del'>-EBookListenerResponse *</div><div class='del'>-e_book_listener_pop_response (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-	GList                 *popped;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), NULL);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	resp = listener-&gt;priv-&gt;response_queue-&gt;data;</div><div class='del'>-</div><div class='del'>-	popped = listener-&gt;priv-&gt;response_queue;</div><div class='del'>-	listener-&gt;priv-&gt;response_queue =</div><div class='del'>-		g_list_remove_link (listener-&gt;priv-&gt;response_queue,</div><div class='del'>-				    listener-&gt;priv-&gt;response_queue);</div><div class='del'>-	g_list_free_1 (popped);</div><div class='del'>-</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBookStatus</div><div class='del'>-e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_CallStatus status)</div><div class='del'>-{</div><div class='del'>-	switch (status) {</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_Success:</div><div class='del'>-		return E_BOOK_STATUS_SUCCESS;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:</div><div class='del'>-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_AuthenticationFailed:</div><div class='del'>-		return E_BOOK_STATUS_AUTHENTICATION_FAILED;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:</div><div class='del'>-		return E_BOOK_STATUS_PERMISSION_DENIED;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_CardNotFound:</div><div class='del'>-		return E_BOOK_STATUS_CARD_NOT_FOUND;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists:</div><div class='del'>-		return E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:</div><div class='del'>-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_TLSNotAvailable:</div><div class='del'>-		return E_BOOK_STATUS_TLS_NOT_AVAILABLE;</div><div class='del'>-	case GNOME_Evolution_Addressbook_BookListener_OtherError:</div><div class='del'>-		return E_BOOK_STATUS_OTHER_ERROR;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("e_book_listener_convert_status: Unknown status "</div><div class='del'>-			   "from card server: %d\n", (int) status);</div><div class='del'>-		return E_BOOK_STATUS_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBookListener *</div><div class='del'>-e_book_listener_construct (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookListener *servant;</div><div class='del'>-	CORBA_Environment           ev;</div><div class='del'>-	CORBA_Object                obj;</div><div class='del'>-</div><div class='del'>-	g_assert (listener != NULL);</div><div class='del'>-	g_assert (E_IS_BOOK_LISTENER (listener));</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;e_book_listener_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookListener__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);</div><div class='del'>-</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_listener_new:</div><div class='del'>- * @book: the #EBook for which the listener is to be bound</div><div class='del'>- *</div><div class='del'>- * Creates and returns a new #EBookListener for the book.</div><div class='del'>- *</div><div class='del'>- * Returns: a new #EBookListener</div><div class='del'>- */</div><div class='del'>-EBookListener *</div><div class='del'>-e_book_listener_new ()</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener;</div><div class='del'>-	EBookListener *retval;</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (E_BOOK_LISTENER_TYPE);</div><div class='del'>-</div><div class='del'>-	retval = e_book_listener_construct (listener);</div><div class='del'>-</div><div class='del'>-	if (retval == NULL) {</div><div class='del'>-		g_warning ("e_book_listener_new: Error constructing "</div><div class='del'>-			   "EBookListener!\n");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_init (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	listener-&gt;priv = g_new0 (EBookListenerPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_listener_stop (EBookListener *listener)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_BOOK_LISTENER (listener));</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;stopped = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EBookListener *listener = E_BOOK_LISTENER (object);</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	/* Remove our response queue handler: In theory, this can never happen since we</div><div class='del'>-	 always hold a reference to the listener while the timeout is running. */</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_id) {</div><div class='del'>-		g_source_remove (listener-&gt;priv-&gt;timeout_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up anything still sitting in response_queue */</div><div class='del'>-	for (l = listener-&gt;priv-&gt;response_queue; l != NULL; l = l-&gt;next) {</div><div class='del'>-		EBookListenerResponse *resp = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		response_free (resp);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-</div><div class='del'>-	g_free (listener-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	GTK_OBJECT_CLASS (e_book_listener_parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookListener__epv *</div><div class='del'>-e_book_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv                             = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyOpenBookProgress     = impl_BookListener_report_open_book_progress;</div><div class='del'>-	epv-&gt;notifyBookOpened           = impl_BookListener_respond_open_book;</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyCardCreated          = impl_BookListener_respond_create_card;</div><div class='del'>-	epv-&gt;notifyCardRemoved          = impl_BookListener_respond_remove_card;</div><div class='del'>-	epv-&gt;notifyCardModified         = impl_BookListener_respond_modify_card;</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyAuthenticationResult = impl_BookListener_respond_authentication_result;</div><div class='del'>-	epv-&gt;notifySupportedFields      = impl_BookListener_response_get_supported_fields;</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyCardRequested        = impl_BookListener_respond_get_vcard;</div><div class='del'>-	epv-&gt;notifyCursorRequested      = impl_BookListener_respond_get_cursor;</div><div class='del'>-	epv-&gt;notifyViewRequested        = impl_BookListener_respond_get_view;</div><div class='del'>-	epv-&gt;notifyChangesRequested     = impl_BookListener_respond_get_changes;</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyConnectionStatus     = impl_BookListener_report_connection_status;</div><div class='del'>-	epv-&gt;notifyWritable             = impl_BookListener_report_writable;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();</div><div class='del'>-	e_book_listener_vepv.GNOME_Evolution_Addressbook_BookListener_epv = e_book_listener_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_listener_class_init (EBookListenerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	e_book_listener_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_book_listener_signals [RESPONSES_QUEUED] =</div><div class='del'>-		gtk_signal_new ("responses_queued",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookListenerClass, responses_queued),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_book_listener_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_book_listener_destroy;</div><div class='del'>-</div><div class='del'>-	e_book_listener_corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_listener_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-e_book_listener_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EBookListener",</div><div class='del'>-			sizeof (EBookListener),</div><div class='del'>-			sizeof (EBookListenerClass),</div><div class='del'>-			(GtkClassInitFunc)  e_book_listener_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_book_listener_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h<br/>deleted file mode 100644<br/>index f546c9a029..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-listener.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A client-side GtkObject which exposes the</div><div class='del'>- * Evolution:BookListener interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_LISTENER_H__</div><div class='del'>-#define __E_BOOK_LISTENER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;ebook/addressbook.h&gt;</div><div class='del'>-#include &lt;ebook/e-book-types.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _EBookListener EBookListener;</div><div class='del'>-typedef struct _EBookListenerClass EBookListenerClass;</div><div class='del'>-typedef struct _EBookListenerPrivate EBookListenerPrivate;</div><div class='del'>-</div><div class='del'>-struct _EBookListener {</div><div class='del'>-	BonoboObject           parent;</div><div class='del'>-	EBookListenerPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EBookListenerClass {</div><div class='del'>-	BonoboObjectClass parent;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals</div><div class='del'>-	 */</div><div class='del'>-	void (*responses_queued) (void);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Async responses */</div><div class='del'>-	OpenBookResponse,</div><div class='del'>-	CreateCardResponse,</div><div class='del'>-	RemoveCardResponse,</div><div class='del'>-	ModifyCardResponse,</div><div class='del'>-	GetCardResponse,</div><div class='del'>-	GetCursorResponse,</div><div class='del'>-	GetBookViewResponse,</div><div class='del'>-	GetChangesResponse,</div><div class='del'>-	AuthenticationResponse,</div><div class='del'>-	GetSupportedFieldsResponse,</div><div class='del'>-</div><div class='del'>-	/* Async events */</div><div class='del'>-	LinkStatusEvent,</div><div class='del'>-	WritableStatusEvent,</div><div class='del'>-	OpenProgressEvent,</div><div class='del'>-} EBookListenerOperation;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookListenerOperation  op;</div><div class='del'>-</div><div class='del'>-	/* For most Response notifications */</div><div class='del'>-	EBookStatus             status;</div><div class='del'>-</div><div class='del'>-	/* For OpenBookResponse */</div><div class='del'>-	GNOME_Evolution_Addressbook_Book          book;</div><div class='del'>-</div><div class='del'>-	/* For GetCursorResponse */</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor    cursor;</div><div class='del'>-</div><div class='del'>-	/* For GetBookViewReponse */</div><div class='del'>-	GNOME_Evolution_Addressbook_BookView      book_view;</div><div class='del'>-</div><div class='del'>-	/* For GetSupportedFields */</div><div class='del'>-	EList                                    *fields;</div><div class='del'>-</div><div class='del'>-	/* For OpenProgressEvent */</div><div class='del'>-	char                   *msg;</div><div class='del'>-	short                   percent;</div><div class='del'>-</div><div class='del'>-	/* For LinkStatusEvent */</div><div class='del'>-	gboolean                connected;</div><div class='del'>-</div><div class='del'>-	/* For WritableStatusEvent */</div><div class='del'>-	gboolean                writable;</div><div class='del'>-</div><div class='del'>-	/* For Card[Added|Removed|Modified]Event */</div><div class='del'>-	char                   *id;</div><div class='del'>-	char                   *vcard;</div><div class='del'>-} EBookListenerResponse;</div><div class='del'>-</div><div class='del'>-EBookListener         *e_book_listener_new            (void);</div><div class='del'>-int                    e_book_listener_check_pending  (EBookListener *listener);</div><div class='del'>-EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);</div><div class='del'>-GtkType                e_book_listener_get_type       (void);</div><div class='del'>-void                   e_book_listener_stop           (EBookListener *listener);</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookListener__epv *e_book_listener_get_epv (void);</div><div class='del'>-</div><div class='del'>-#define E_BOOK_LISTENER_TYPE        (e_book_listener_get_type ())</div><div class='del'>-#define E_BOOK_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))</div><div class='del'>-#define E_BOOK_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_LISTENER_TYPE, EBookListenerClass))</div><div class='del'>-#define E_IS_BOOK_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_LISTENER_TYPE))</div><div class='del'>-#define E_IS_BOOK_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_BOOK_LISTENER_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h<br/>deleted file mode 100644<br/>index 398e46d74c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A client-side GtkObject which exposes the</div><div class='del'>- * Evolution:BookListener interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_TYPES_H__</div><div class='del'>-#define __E_BOOK_TYPES_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_BOOK_STATUS_SUCCESS,</div><div class='del'>-	E_BOOK_STATUS_UNKNOWN,</div><div class='del'>-	E_BOOK_STATUS_REPOSITORY_OFFLINE,</div><div class='del'>-	E_BOOK_STATUS_PERMISSION_DENIED,</div><div class='del'>-	E_BOOK_STATUS_CARD_NOT_FOUND,</div><div class='del'>-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS,</div><div class='del'>-	E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED,</div><div class='del'>-	E_BOOK_STATUS_CANCELLED,</div><div class='del'>-	E_BOOK_STATUS_AUTHENTICATION_FAILED,</div><div class='del'>-	E_BOOK_STATUS_TLS_NOT_AVAILABLE,</div><div class='del'>-	E_BOOK_STATUS_OTHER_ERROR</div><div class='del'>-} EBookStatus;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS,</div><div class='del'>-	E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED,</div><div class='del'>-	E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR</div><div class='del'>-} EBookSimpleQueryStatus;</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_BOOK_TYPES_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c<br/>deleted file mode 100644<br/>index d3de9840f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,759 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-book-util.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-book-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include "e-card-compare.h"</div><div class='del'>-</div><div class='del'>-typedef struct _CommonBookInfo CommonBookInfo;</div><div class='del'>-struct _CommonBookInfo {</div><div class='del'>-	EBookCommonCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_book_expand_uri (const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *new_uri;</div><div class='del'>-</div><div class='del'>-	if (!strncmp (uri, "file:", 5)) {</div><div class='del'>-		if (strlen (uri + 7) &gt; 3</div><div class='del'>-		    &amp;&amp; !strcmp (uri + strlen(uri) - 3, ".db")) {</div><div class='del'>-			/* it's a .db file */</div><div class='del'>-			new_uri = g_strdup (uri);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			char *file_name;</div><div class='del'>-			/* we assume it's a dir and glom addressbook.db onto the end. */</div><div class='del'>-			file_name = g_concat_dir_and_file(uri + 7, "addressbook.db");</div><div class='del'>-			new_uri = g_strdup_printf("file://%s", file_name);</div><div class='del'>-			g_free(file_name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		new_uri = g_strdup (uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-got_uri_book_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CommonBookInfo *info = (CommonBookInfo *) closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		info-&gt;cb (book, info-&gt;closure);</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;cb (NULL, info-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_book_load_address_book_by_uri (EBook *book, const char *uri, EBookCallback open_response, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gboolean rv;</div><div class='del'>-	char *real_uri;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,          FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);</div><div class='del'>-	g_return_val_if_fail (open_response != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	real_uri = e_book_expand_uri (uri);</div><div class='del'>-</div><div class='del'>-	rv = e_book_load_uri (book, real_uri, open_response, closure);</div><div class='del'>-</div><div class='del'>-	if (!rv) {</div><div class='del'>-		g_warning ("Couldn't load addressbook %s", real_uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (real_uri);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_use_address_book_by_uri (const char *uri, EBookCommonCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	CommonBookInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	info = g_new0 (CommonBookInfo, 1);</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (! e_book_load_address_book_by_uri (book, uri, got_uri_book_cb, info)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		g_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-Bonobo_ConfigDatabase</div><div class='del'>-e_book_get_config_database (CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	static Bonobo_ConfigDatabase config_db;</div><div class='del'>-</div><div class='del'>-	if (config_db == NULL)</div><div class='del'>-		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);</div><div class='del'>-</div><div class='del'>-	return config_db;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_book_load_local_address_book (EBook *book, EBookCallback open_response, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	gchar *uri;</div><div class='del'>-	gboolean rv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,          FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);</div><div class='del'>-	g_return_val_if_fail (open_response != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	filename = gnome_util_prepend_user_home ("evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", filename);</div><div class='del'>-</div><div class='del'>-	rv = e_book_load_uri (book, uri, open_response, closure);</div><div class='del'>-</div><div class='del'>-	if (!rv) {</div><div class='del'>-		g_warning ("Couldn't load local addressbook %s", uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (filename);</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBook *common_local_book = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-got_local_book_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CommonBookInfo *info = (CommonBookInfo *) closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-</div><div class='del'>-		/* We try not to leak in a race condition where the</div><div class='del'>-		   local book got loaded twice. */</div><div class='del'>-</div><div class='del'>-		if (common_local_book) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-			book = common_local_book;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		info-&gt;cb (book, info-&gt;closure);</div><div class='del'>-</div><div class='del'>-		if (common_local_book == NULL) {</div><div class='del'>-			common_local_book = book;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		info-&gt;cb (NULL, info-&gt;closure);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_use_local_address_book (EBookCommonCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	CommonBookInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	if (common_local_book != NULL) {</div><div class='del'>-		cb (common_local_book, closure);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info = g_new0 (CommonBookInfo, 1);</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (! e_book_load_local_address_book (book, got_local_book_cb, info)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		g_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gpointer closure;</div><div class='del'>-	EBookCallback open_response;</div><div class='del'>-} DefaultBookClosure;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_default_book_open (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	DefaultBookClosure *default_book_closure = closure;</div><div class='del'>-	gpointer user_closure = default_book_closure-&gt;closure;</div><div class='del'>-	EBookCallback user_response = default_book_closure-&gt;open_response;</div><div class='del'>-</div><div class='del'>-	g_free (default_book_closure);</div><div class='del'>-</div><div class='del'>-	/* special case the protocol not supported error, since we</div><div class='del'>-	   really only want to failover to the local book in the case</div><div class='del'>-	   where there's no installed backend for that protocol.  all</div><div class='del'>-	   other errors (failure to connect, etc.) should get reported</div><div class='del'>-	   to the caller as normal. */</div><div class='del'>-	if (status == E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED) {</div><div class='del'>-		e_book_load_local_address_book (book, user_response, user_closure);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		user_response (book, status, user_closure);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_book_load_default_book (EBook *book, EBookCallback open_response, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	char *val, *uri;</div><div class='del'>-	gboolean rv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Bonobo_ConfigDatabase config_db;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,          FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);</div><div class='del'>-	g_return_val_if_fail (open_response != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	config_db = e_book_get_config_database (&amp;ev);</div><div class='del'>-	val = bonobo_config_get_string (config_db, "/DefaultFolders/contacts_uri", &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1);</div><div class='del'>-		default_book_closure-&gt;closure = closure;</div><div class='del'>-		default_book_closure-&gt;open_response = open_response;</div><div class='del'>-</div><div class='del'>-		/* Sigh. FIXME. */</div><div class='del'>-		if (!strncmp (val, "file:", 5))</div><div class='del'>-			uri = g_strconcat (val, "/addressbook.db", NULL);</div><div class='del'>-		else</div><div class='del'>-			uri = g_strdup (val);</div><div class='del'>-		rv = e_book_load_uri (book, uri,</div><div class='del'>-				      e_book_default_book_open, default_book_closure);</div><div class='del'>-		g_free (uri);</div><div class='del'>-		g_free (val);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		rv = e_book_load_local_address_book (book, open_response, closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!rv) {</div><div class='del'>-		g_warning ("Couldn't load default addressbook");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Simple Query Stuff</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _SimpleQueryInfo SimpleQueryInfo;</div><div class='del'>-struct _SimpleQueryInfo {</div><div class='del'>-	guint tag;</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *query;</div><div class='del'>-	EBookSimpleQueryCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-	EBookView *view;</div><div class='del'>-	guint add_tag;</div><div class='del'>-	guint seq_complete_tag;</div><div class='del'>-	GList *cards;</div><div class='del'>-	gboolean cancelled;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_add_simple_query (EBook *book, SimpleQueryInfo *info)</div><div class='del'>-{</div><div class='del'>-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");</div><div class='del'>-	pending = g_list_prepend (pending, info);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SimpleQueryInfo *</div><div class='del'>-book_lookup_simple_query (EBook *book, guint tag)</div><div class='del'>-{</div><div class='del'>-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");</div><div class='del'>-	while (pending) {</div><div class='del'>-		SimpleQueryInfo *sq = pending-&gt;data;</div><div class='del'>-		if (sq-&gt;tag == tag)</div><div class='del'>-			return sq;</div><div class='del'>-		pending = g_list_next (pending);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_remove_simple_query (EBook *book, SimpleQueryInfo *info)</div><div class='del'>-{</div><div class='del'>-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");</div><div class='del'>-	GList *i;</div><div class='del'>-</div><div class='del'>-	for (i=pending; i != NULL; i = g_list_next (i)) {</div><div class='del'>-		if (i-&gt;data == info) {</div><div class='del'>-			pending = g_list_remove_link (pending, i);</div><div class='del'>-			g_list_free_1 (i);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-book_issue_tag (EBook *book)</div><div class='del'>-{</div><div class='del'>-	gpointer ptr = gtk_object_get_data (GTK_OBJECT (book), "sq_tag");</div><div class='del'>-	guint tag = GPOINTER_TO_UINT (ptr);</div><div class='del'>-	if (tag == 0)</div><div class='del'>-		tag = 1;</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (book), "sq_tag", GUINT_TO_POINTER (tag+1));</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SimpleQueryInfo *</div><div class='del'>-simple_query_new (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq = g_new0 (SimpleQueryInfo, 1);</div><div class='del'>-</div><div class='del'>-	sq-&gt;tag = book_issue_tag (book);</div><div class='del'>-	sq-&gt;book = book;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-	sq-&gt;query = g_strdup (query);</div><div class='del'>-	sq-&gt;cb = cb;</div><div class='del'>-	sq-&gt;closure = closure;</div><div class='del'>-	sq-&gt;cancelled = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Automatically add ourselves to the EBook's pending list. */</div><div class='del'>-	book_add_simple_query (book, sq);</div><div class='del'>-</div><div class='del'>-	return sq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_disconnect (SimpleQueryInfo *sq)</div><div class='del'>-{</div><div class='del'>-	if (sq-&gt;add_tag) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (sq-&gt;view), sq-&gt;add_tag);</div><div class='del'>-		sq-&gt;add_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sq-&gt;seq_complete_tag) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (sq-&gt;view), sq-&gt;seq_complete_tag);</div><div class='del'>-		sq-&gt;seq_complete_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sq-&gt;view) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (sq-&gt;view));</div><div class='del'>-		sq-&gt;view = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_free (SimpleQueryInfo *sq)</div><div class='del'>-{</div><div class='del'>-	simple_query_disconnect (sq);</div><div class='del'>-</div><div class='del'>-	/* Remove ourselves from the EBook's pending list. */</div><div class='del'>-	book_remove_simple_query (sq-&gt;book, sq);</div><div class='del'>-</div><div class='del'>-	g_free (sq-&gt;query);</div><div class='del'>-</div><div class='del'>-	if (sq-&gt;book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (sq-&gt;book));</div><div class='del'>-</div><div class='del'>-	g_list_foreach (sq-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (sq-&gt;cards);</div><div class='del'>-</div><div class='del'>-	g_free (sq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_card_added_cb (EBookView *view, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq = closure;</div><div class='del'>-</div><div class='del'>-	if (sq-&gt;cancelled)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sq-&gt;cards = g_list_concat (sq-&gt;cards, g_list_copy ((GList *) cards));</div><div class='del'>-	g_list_foreach ((GList *) cards, (GFunc) gtk_object_ref, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_sequence_complete_cb (EBookView *view, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq = closure;</div><div class='del'>-</div><div class='del'>-	/* Disconnect signals, so that we don't pick up any changes to the book that occur</div><div class='del'>-	   in our callback */</div><div class='del'>-	simple_query_disconnect (sq);</div><div class='del'>-	if (! sq-&gt;cancelled)</div><div class='del'>-		sq-&gt;cb (sq-&gt;book, E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS, sq-&gt;cards, sq-&gt;closure);</div><div class='del'>-	simple_query_free (sq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_book_view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq = closure;</div><div class='del'>-</div><div class='del'>-	if (sq-&gt;cancelled) {</div><div class='del'>-		simple_query_free (sq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		simple_query_disconnect (sq);</div><div class='del'>-		sq-&gt;cb (sq-&gt;book, E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR, NULL, sq-&gt;closure);</div><div class='del'>-		simple_query_free (sq);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sq-&gt;view = book_view;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (book_view));</div><div class='del'>-</div><div class='del'>-	sq-&gt;add_tag = gtk_signal_connect (GTK_OBJECT (sq-&gt;view),</div><div class='del'>-					  "card_added",</div><div class='del'>-					  GTK_SIGNAL_FUNC (simple_query_card_added_cb),</div><div class='del'>-					  sq);</div><div class='del'>-	sq-&gt;seq_complete_tag = gtk_signal_connect (GTK_OBJECT (sq-&gt;view),</div><div class='del'>-						   "sequence_complete",</div><div class='del'>-						   GTK_SIGNAL_FUNC (simple_query_sequence_complete_cb),</div><div class='del'>-						   sq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_simple_query (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book &amp;&amp; E_IS_BOOK (book), 0);</div><div class='del'>-	g_return_val_if_fail (query, 0);</div><div class='del'>-	g_return_val_if_fail (cb, 0);</div><div class='del'>-</div><div class='del'>-	sq = simple_query_new (book, query, cb, closure);</div><div class='del'>-	e_book_get_book_view (book, (gchar *) query, simple_query_book_view_cb, sq);</div><div class='del'>-</div><div class='del'>-	return sq-&gt;tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_simple_query_cancel (EBook *book, guint tag)</div><div class='del'>-{</div><div class='del'>-	SimpleQueryInfo *sq;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (book &amp;&amp; E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	sq = book_lookup_simple_query (book, tag);</div><div class='del'>-</div><div class='del'>-	if (sq) {</div><div class='del'>-		sq-&gt;cancelled = TRUE;</div><div class='del'>-		sq-&gt;cb (sq-&gt;book, E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED, NULL, sq-&gt;closure);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Simple query tag %d is unknown", tag);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Specialized Queries</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _NameEmailQueryInfo NameEmailQueryInfo;</div><div class='del'>-struct _NameEmailQueryInfo {</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *email;</div><div class='del'>-	EBookSimpleQueryCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_email_query_info_free (NameEmailQueryInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info) {</div><div class='del'>-		g_free (info-&gt;name);</div><div class='del'>-		g_free (info-&gt;email);</div><div class='del'>-		g_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_and_email_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	NameEmailQueryInfo *info = closure;</div><div class='del'>-	GList *filtered_cards = NULL;</div><div class='del'>-</div><div class='del'>-	while (cards) {</div><div class='del'>-		ECard *card = E_CARD (cards-&gt;data);</div><div class='del'>-		if ((info-&gt;name == NULL || e_card_compare_name_to_string (card, info-&gt;name) &gt;= E_CARD_MATCH_VAGUE)</div><div class='del'>-		    &amp;&amp; (info-&gt;email == NULL || e_card_email_match_string (card, info-&gt;email))) {</div><div class='del'>-			filtered_cards = g_list_append (filtered_cards, card);</div><div class='del'>-		}</div><div class='del'>-		cards = g_list_next (cards);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;cb (book, status, filtered_cards, info-&gt;closure);</div><div class='del'>-</div><div class='del'>-	g_list_free (filtered_cards);</div><div class='del'>-</div><div class='del'>-	name_email_query_info_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_name_and_email_query (EBook *book,</div><div class='del'>-			     const gchar *name,</div><div class='del'>-			     const gchar *email,</div><div class='del'>-			     EBookSimpleQueryCallback cb,</div><div class='del'>-			     gpointer closure)</div><div class='del'>-{</div><div class='del'>-	NameEmailQueryInfo *info;</div><div class='del'>-	gchar *email_query=NULL, *name_query=NULL, *query;</div><div class='del'>-	guint tag;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book &amp;&amp; E_IS_BOOK (book), 0);</div><div class='del'>-	g_return_val_if_fail (cb != NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (name &amp;&amp; !*name)</div><div class='del'>-		name = NULL;</div><div class='del'>-	if (email &amp;&amp; !*email)</div><div class='del'>-		email = NULL;</div><div class='del'>-</div><div class='del'>-	if (name == NULL &amp;&amp; email == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* Build our e-mail query.</div><div class='del'>-	 * We only query against the username part of the address, to avoid not matching</div><div class='del'>-	 * fred@foo.com and fred@mail.foo.com.  While their may be namespace collisions</div><div class='del'>-	 * in the usernames of everyone out there, it shouldn't be that bad.  (Famous last words.)</div><div class='del'>-	 */</div><div class='del'>-	if (email) {</div><div class='del'>-		const gchar *t = email;</div><div class='del'>-		while (*t &amp;&amp; *t != '@')</div><div class='del'>-			++t;</div><div class='del'>-		if (*t == '@') {</div><div class='del'>-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", t-email, email);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", email);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build our name query.</div><div class='del'>-	 * We only do name-query stuff if we don't have an e-mail address.  Our basic assumption</div><div class='del'>-	 * is that the username part of the email is good enough to keep the amount of stuff returned</div><div class='del'>-	 * in the query relatively small.</div><div class='del'>-	 */</div><div class='del'>-	if (name &amp;&amp; !email) {</div><div class='del'>-		gchar *name_cpy = g_strdup (name), *qjoined;</div><div class='del'>-		gchar **namev;</div><div class='del'>-		gint i, count=0;</div><div class='del'>-</div><div class='del'>-		g_strstrip (name_cpy);</div><div class='del'>-		namev = g_strsplit (name_cpy, " ", 0);</div><div class='del'>-		for (i=0; namev[i]; ++i) {</div><div class='del'>-			if (*namev[i]) {</div><div class='del'>-				char *str = namev[i];</div><div class='del'>-</div><div class='del'>-				namev[i] = g_strdup_printf ("(contains \"file_as\" \"%s\")", namev[i]);</div><div class='del'>-				++count;</div><div class='del'>-</div><div class='del'>-				g_free (str);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		qjoined = g_strjoinv (" ", namev);</div><div class='del'>-		if (count &gt; 1) {</div><div class='del'>-			name_query = g_strdup_printf ("(or %s)", qjoined);</div><div class='del'>-		} else {</div><div class='del'>-			name_query = qjoined;</div><div class='del'>-			qjoined = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (name_cpy);</div><div class='del'>-		g_strfreev (namev);</div><div class='del'>-		g_free (qjoined);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assemble our e-mail &amp; name queries */</div><div class='del'>-	if (email_query &amp;&amp; name_query) {</div><div class='del'>-		query = g_strdup_printf ("(and %s %s)", email_query, name_query);</div><div class='del'>-	} else if (email_query) {</div><div class='del'>-		query = email_query;</div><div class='del'>-		email_query = NULL;</div><div class='del'>-	} else if (name_query) {</div><div class='del'>-		query = name_query;</div><div class='del'>-		name_query = NULL;</div><div class='del'>-	} else</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	info = g_new0 (NameEmailQueryInfo, 1);</div><div class='del'>-	info-&gt;name = g_strdup (name);</div><div class='del'>-	info-&gt;email = g_strdup (email);</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	tag = e_book_simple_query (book, query, name_and_email_cb, info);</div><div class='del'>-</div><div class='del'>-	g_free (email_query);</div><div class='del'>-	g_free (name_query);</div><div class='del'>-	g_free (query);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Simple nickname query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _NicknameQueryInfo NicknameQueryInfo;</div><div class='del'>-struct _NicknameQueryInfo {</div><div class='del'>-	gchar *nickname;</div><div class='del'>-	EBookSimpleQueryCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nickname_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	NicknameQueryInfo *info = closure;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;cb)</div><div class='del'>-		info-&gt;cb (book, status, cards, info-&gt;closure);</div><div class='del'>-</div><div class='del'>-	g_free (info-&gt;nickname);</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_nickname_query (EBook *book,</div><div class='del'>-		       const char *nickname,</div><div class='del'>-		       EBookSimpleQueryCallback cb,</div><div class='del'>-		       gpointer closure)</div><div class='del'>-{</div><div class='del'>-	NicknameQueryInfo *info;</div><div class='del'>-	gchar *query;</div><div class='del'>-	guint retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), 0);</div><div class='del'>-	g_return_val_if_fail (nickname != NULL, 0);</div><div class='del'>-</div><div class='del'>-	/* The empty-string case shouldn't generate a warning. */</div><div class='del'>-	if (! *nickname)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	info = g_new0 (NicknameQueryInfo, 1);</div><div class='del'>-	info-&gt;nickname = g_strdup (nickname);</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	query = g_strdup_printf ("(is \"nickname\" \"%s\")", info-&gt;nickname);</div><div class='del'>-</div><div class='del'>-	retval = e_book_simple_query (book, query, nickname_cb, info);</div><div class='del'>-</div><div class='del'>-	g_free (query);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Convenience routine to check for addresses in the local address book.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _HaveAddressInfo HaveAddressInfo;</div><div class='del'>-struct _HaveAddressInfo {</div><div class='del'>-	gchar *email;</div><div class='del'>-	EBookHaveAddressCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-have_address_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	HaveAddressInfo *info = (HaveAddressInfo *) closure;</div><div class='del'>-	</div><div class='del'>-	info-&gt;cb (book, </div><div class='del'>-		  info-&gt;email,</div><div class='del'>-		  cards &amp;&amp; (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) ? E_CARD (cards-&gt;data) : NULL,</div><div class='del'>-		  info-&gt;closure);</div><div class='del'>-</div><div class='del'>-	g_free (info-&gt;email);</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-have_address_book_open_cb (EBook *book, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	HaveAddressInfo *info = (HaveAddressInfo *) closure;</div><div class='del'>-</div><div class='del'>-	if (book) {</div><div class='del'>-</div><div class='del'>-		e_book_name_and_email_query (book, NULL, info-&gt;email, have_address_query_cb, info);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		info-&gt;cb (NULL, info-&gt;email, NULL, info-&gt;closure);</div><div class='del'>-</div><div class='del'>-		g_free (info-&gt;email);</div><div class='del'>-		g_free (info);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_query_address_locally (const gchar *email,</div><div class='del'>-			      EBookHaveAddressCallback cb,</div><div class='del'>-			      gpointer closure)</div><div class='del'>-{</div><div class='del'>-	HaveAddressInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (email != NULL);</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	info = g_new0 (HaveAddressInfo, 1);</div><div class='del'>-	info-&gt;email = g_strdup (email);</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	e_book_use_local_address_book (have_address_book_open_cb, info);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h<br/>deleted file mode 100644<br/>index 33f90c399f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-book-util.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_UTIL_H__</div><div class='del'>-#define __E_BOOK_UTIL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "e-book.h"</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-/* Callbacks for asynchronous functions. */</div><div class='del'>-typedef void (*EBookCommonCallback)      (EBook *book, gpointer closure);</div><div class='del'>-typedef void (*EBookSimpleQueryCallback) (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure);</div><div class='del'>-typedef void (*EBookHaveAddressCallback) (EBook *book, const gchar *addr, ECard *card, gpointer closure);</div><div class='del'>-</div><div class='del'>-/* expand file:///foo/foo/ to file:///foo/foo/addressbook.db */</div><div class='del'>-char                  *e_book_expand_uri                (const char               *uri);</div><div class='del'>-gboolean               e_book_load_address_book_by_uri  (EBook                    *book,</div><div class='del'>-							 const char               *uri,</div><div class='del'>-							 EBookCallback             open_response,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-void                   e_book_use_address_book_by_uri   (const char               *uri,</div><div class='del'>-							 EBookCommonCallback       cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-</div><div class='del'>-gboolean               e_book_load_local_address_book   (EBook                    *book,</div><div class='del'>-							 EBookCallback             open_response,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-void                   e_book_use_local_address_book    (EBookCommonCallback       cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-gboolean               e_book_load_default_book         (EBook                    *book,</div><div class='del'>-							 EBookCallback             open_response,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-</div><div class='del'>-/* Bonoboconf database interface. */</div><div class='del'>-Bonobo_ConfigDatabase  e_book_get_config_database       (CORBA_Environment        *ev);</div><div class='del'>-</div><div class='del'>-/* Simple Query Interface. */</div><div class='del'>-guint                  e_book_simple_query              (EBook                    *book,</div><div class='del'>-							 const char               *query,</div><div class='del'>-							 EBookSimpleQueryCallback  cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-void                   e_book_simple_query_cancel       (EBook                    *book,</div><div class='del'>-							 guint                     tag);</div><div class='del'>-</div><div class='del'>-/* Specialized Name/Email Queries */</div><div class='del'>-guint                  e_book_name_and_email_query      (EBook                    *book,</div><div class='del'>-							 const char               *name,</div><div class='del'>-							 const char               *email,</div><div class='del'>-							 EBookSimpleQueryCallback  cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-guint                  e_book_nickname_query            (EBook                    *book,</div><div class='del'>-							 const char               *nickname,</div><div class='del'>-							 EBookSimpleQueryCallback  cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-</div><div class='del'>-/* Returns the ECard associated to email in the callback,</div><div class='del'>-   or NULL if no match is found in the local address book. */</div><div class='del'>-void                   e_book_query_address_locally     (const gchar              *email,</div><div class='del'>-							 EBookHaveAddressCallback  cb,</div><div class='del'>-							 gpointer                  closure);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_BOOK_UTIL_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c<br/>deleted file mode 100644<br/>index 9981375631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-view-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,483 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Exports the BookViewListener interface.  Maintains a queue of messages</div><div class='del'>- * which come in on the interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-book-view-listener.h"</div><div class='del'>-#include "e-book-view.h"</div><div class='del'>-#include "e-card.h"</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RESPONSES_QUEUED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_book_view_listener_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass          *e_book_view_listener_parent_class;</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vepv;</div><div class='del'>-</div><div class='del'>-struct _EBookViewListenerPrivate {</div><div class='del'>-	GList   *response_queue;</div><div class='del'>-	gint     timeout_id;</div><div class='del'>-</div><div class='del'>-	guint timeout_lock : 1;</div><div class='del'>-	guint stopped      : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_book_view_listener_check_queue (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_lock)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;timeout_lock = TRUE;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue != NULL &amp;&amp; !listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (listener), e_book_view_listener_signals [RESPONSES_QUEUED]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue == NULL || listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		listener-&gt;priv-&gt;timeout_id = 0;</div><div class='del'>-		listener-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_response (EBookViewListener         *listener,</div><div class='del'>-				     EBookViewListenerResponse *response)</div><div class='del'>-{</div><div class='del'>-	if (response == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped) {</div><div class='del'>-		/* Free response and return */</div><div class='del'>-		g_free (response-&gt;id);</div><div class='del'>-		g_list_foreach (response-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (response-&gt;cards);</div><div class='del'>-		g_free (response-&gt;message);</div><div class='del'>-		g_free (response);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* a slight optimization for huge ldap queries.  if there's an</div><div class='del'>-	   existing Add response on the end of the queue, and we're an</div><div class='del'>-	   Add response, we just glom the two lists of cards</div><div class='del'>-	   together */</div><div class='del'>-	if (response-&gt;op == CardAddedEvent) {</div><div class='del'>-		GList *last = g_list_last (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-		EBookViewListenerResponse *last_resp = NULL;</div><div class='del'>-</div><div class='del'>-		if (last) last_resp = last-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (last_resp &amp;&amp; last_resp-&gt;op == CardAddedEvent ) {</div><div class='del'>-			response-&gt;cards = g_list_concat (last_resp-&gt;cards, response-&gt;cards);</div><div class='del'>-			g_free (response);</div><div class='del'>-			/* there should already be a timeout since the</div><div class='del'>-			   queue isn't empty, so we'll just return</div><div class='del'>-			   here */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			listener-&gt;priv-&gt;response_queue = g_list_append (last, response);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		listener-&gt;priv-&gt;response_queue = g_list_append (listener-&gt;priv-&gt;response_queue, response);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_id == 0) {</div><div class='del'>-</div><div class='del'>-		/* Here, 20 == an arbitrary small number */		</div><div class='del'>-		listener-&gt;priv-&gt;timeout_id = g_timeout_add (20, (GSourceFunc) e_book_view_listener_check_queue, listener);</div><div class='del'>-</div><div class='del'>-		/* Hold a reference to the listener on behalf of the timeout */</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (listener));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,</div><div class='del'>-					EBookViewListenerOperation  op)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = NULL;</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_id_event (EBookViewListener          *listener,</div><div class='del'>-				     EBookViewListenerOperation  op,</div><div class='del'>-				     const char             *id)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = g_strdup (id);</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,</div><div class='del'>-					   EBookViewListenerOperation  op,</div><div class='del'>-					   const GNOME_Evolution_Addressbook_VCardList  *cards)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = NULL;</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = NULL;</div><div class='del'>-	</div><div class='del'>-	for ( i = 0; i &lt; cards-&gt;_length; i++ ) {</div><div class='del'>-		resp-&gt;cards = g_list_append(resp-&gt;cards, e_card_new(cards-&gt;_buffer[i]));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Status Message */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_message_event (EBookViewListener          *listener,</div><div class='del'>-					  EBookViewListenerOperation  op,</div><div class='del'>-					  const char                 *message)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;stopped)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = NULL;</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = g_strdup(message);</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_notify_card_added (PortableServer_Servant servant,</div><div class='del'>-					 const GNOME_Evolution_Addressbook_VCardList *cards,</div><div class='del'>-					 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_sequence_event (</div><div class='del'>-		listener, CardAddedEvent, cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_notify_card_removed (PortableServer_Servant servant,</div><div class='del'>-					   const GNOME_Evolution_Addressbook_CardId id,</div><div class='del'>-					   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_id_event (</div><div class='del'>-		listener, CardRemovedEvent, (const char *) id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_notify_card_changed (PortableServer_Servant servant,</div><div class='del'>-					   const GNOME_Evolution_Addressbook_VCardList *cards,</div><div class='del'>-					   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_sequence_event (</div><div class='del'>-		listener, CardModifiedEvent, cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_notify_sequence_complete (PortableServer_Servant servant,</div><div class='del'>-						CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_empty_event (listener, SequenceCompleteEvent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_notify_status_message (PortableServer_Servant  servant,</div><div class='del'>-					     const char             *message,</div><div class='del'>-					     CORBA_Environment      *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_message_event (listener, StatusMessageEvent, message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_check_pending:</div><div class='del'>- * @listener: the #EBookViewListener </div><div class='del'>- *</div><div class='del'>- * Returns: the number of items on the response queue,</div><div class='del'>- * or -1 if the @listener is isn't an #EBookViewListener.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_book_view_listener_check_pending (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              -1);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), -1);</div><div class='del'>-</div><div class='del'>-	return g_list_length (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_pop_response:</div><div class='del'>- * @listener: the #EBookViewListener for which a request is to be popped</div><div class='del'>- *</div><div class='del'>- * Returns: an #EBookViewListenerResponse if there are responses on the</div><div class='del'>- * queue to be returned; %NULL if there aren't, or if the @listener</div><div class='del'>- * isn't an EBookViewListener.</div><div class='del'>- */</div><div class='del'>-EBookViewListenerResponse *</div><div class='del'>-e_book_view_listener_pop_response (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-	GList                 *popped;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), NULL);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	resp = listener-&gt;priv-&gt;response_queue-&gt;data;</div><div class='del'>-</div><div class='del'>-	popped = listener-&gt;priv-&gt;response_queue;</div><div class='del'>-	listener-&gt;priv-&gt;response_queue =</div><div class='del'>-		g_list_remove_link (listener-&gt;priv-&gt;response_queue,</div><div class='del'>-				    listener-&gt;priv-&gt;response_queue);</div><div class='del'>-	g_list_free_1 (popped);</div><div class='del'>-</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBookViewListener *</div><div class='del'>-e_book_view_listener_construct (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookViewListener *servant;</div><div class='del'>-	CORBA_Environment           ev;</div><div class='del'>-	CORBA_Object                obj;</div><div class='del'>-</div><div class='del'>-	g_assert (listener != NULL);</div><div class='del'>-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;e_book_view_listener_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookViewListener__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);</div><div class='del'>-</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_new:</div><div class='del'>- * @book: the #EBookView for which the listener is to be bound</div><div class='del'>- *</div><div class='del'>- * Creates and returns a new #EBookViewListener for the book.</div><div class='del'>- *</div><div class='del'>- * Returns: a new #EBookViewListener</div><div class='del'>- */</div><div class='del'>-EBookViewListener *</div><div class='del'>-e_book_view_listener_new ()</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener;</div><div class='del'>-	EBookViewListener *retval;</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (E_BOOK_VIEW_LISTENER_TYPE);</div><div class='del'>-</div><div class='del'>-	retval = e_book_view_listener_construct (listener);</div><div class='del'>-</div><div class='del'>-	if (retval == NULL) {</div><div class='del'>-		g_warning ("e_book_view_listener_new: Error constructing "</div><div class='del'>-			   "EBookViewListener!\n");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_init (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	listener-&gt;priv                 = g_new0 (EBookViewListenerPrivate, 1);</div><div class='del'>-	listener-&gt;priv-&gt;response_queue = NULL;</div><div class='del'>-	listener-&gt;priv-&gt;timeout_id     = 0;</div><div class='del'>-	listener-&gt;priv-&gt;timeout_lock   = FALSE;</div><div class='del'>-	listener-&gt;priv-&gt;stopped        = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_view_listener_stop (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_BOOK_VIEW_LISTENER (listener));</div><div class='del'>-	listener-&gt;priv-&gt;stopped = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (object);</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	/* Remove our response queue handler: In theory, this can never happen since we</div><div class='del'>-	 always hold a reference to the listener while the timeout is running. */</div><div class='del'>-	if (listener-&gt;priv-&gt;timeout_id) {</div><div class='del'>-		g_source_remove (listener-&gt;priv-&gt;timeout_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear out the queue */</div><div class='del'>-	for (l = listener-&gt;priv-&gt;response_queue; l != NULL; l = l-&gt;next) {</div><div class='del'>-		EBookViewListenerResponse *resp = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_free(resp-&gt;id);</div><div class='del'>-</div><div class='del'>-		g_list_foreach(resp-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-		g_list_free(resp-&gt;cards);</div><div class='del'>-		resp-&gt;cards = NULL;</div><div class='del'>-</div><div class='del'>-		g_free (resp-&gt;message);</div><div class='del'>-		resp-&gt;message = NULL;</div><div class='del'>-</div><div class='del'>-		g_free (resp);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-	</div><div class='del'>-	g_free (listener-&gt;priv);</div><div class='del'>-	listener-&gt;priv = NULL;</div><div class='del'>-	</div><div class='del'>-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *</div><div class='del'>-e_book_view_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;notifyCardChanged      = impl_BookViewListener_notify_card_changed;</div><div class='del'>-	epv-&gt;notifyCardRemoved      = impl_BookViewListener_notify_card_removed;</div><div class='del'>-	epv-&gt;notifyCardAdded        = impl_BookViewListener_notify_card_added;</div><div class='del'>-	epv-&gt;notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;</div><div class='del'>-	epv-&gt;notifyStatusMessage    = impl_BookViewListener_notify_status_message;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();</div><div class='del'>-	e_book_view_listener_vepv.GNOME_Evolution_Addressbook_BookViewListener_epv = e_book_view_listener_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_class_init (EBookViewListenerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_signals [RESPONSES_QUEUED] =</div><div class='del'>-		gtk_signal_new ("responses_queued",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewListenerClass, responses_queued),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_book_view_listener_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_book_view_listener_destroy;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-e_book_view_listener_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EBookViewListener",</div><div class='del'>-			sizeof (EBookViewListener),</div><div class='del'>-			sizeof (EBookViewListenerClass),</div><div class='del'>-			(GtkClassInitFunc)  e_book_view_listener_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_book_view_listener_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h<br/>deleted file mode 100644<br/>index d373872ad0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-view-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A client-side GtkObject which exposes the</div><div class='del'>- * Evolution:BookViewListener interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_VIEW_LISTENER_H__</div><div class='del'>-#define __E_BOOK_VIEW_LISTENER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _EBookViewListener EBookViewListener;</div><div class='del'>-typedef struct _EBookViewListenerClass EBookViewListenerClass;</div><div class='del'>-typedef struct _EBookViewListenerPrivate EBookViewListenerPrivate;</div><div class='del'>-</div><div class='del'>-struct _EBookViewListener {</div><div class='del'>-	BonoboObject           parent;</div><div class='del'>-	EBookViewListenerPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EBookViewListenerClass {</div><div class='del'>-	BonoboObjectClass parent;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals</div><div class='del'>-	 */</div><div class='del'>-	void (*responses_queued) (void);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	/* Async events */</div><div class='del'>-	CardAddedEvent,</div><div class='del'>-	CardRemovedEvent,</div><div class='del'>-	CardModifiedEvent,</div><div class='del'>-	SequenceCompleteEvent,</div><div class='del'>-	StatusMessageEvent,</div><div class='del'>-} EBookViewListenerOperation;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookViewListenerOperation  op;</div><div class='del'>-</div><div class='del'>-	/* For CardRemovedEvent */</div><div class='del'>-	char                   *id;</div><div class='del'>-</div><div class='del'>-	/* For Card[Added|Modified]Event */</div><div class='del'>-	GList                  *cards; /* Of type ECard. */</div><div class='del'>-</div><div class='del'>-	/* For StatusMessageEvent */</div><div class='del'>-	char                   *message;</div><div class='del'>-	</div><div class='del'>-} EBookViewListenerResponse;</div><div class='del'>-</div><div class='del'>-EBookViewListener         *e_book_view_listener_new            (void);</div><div class='del'>-int                        e_book_view_listener_check_pending  (EBookViewListener *listener);</div><div class='del'>-EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);</div><div class='del'>-GtkType                    e_book_view_listener_get_type       (void);</div><div class='del'>-void                       e_book_view_listener_stop           (EBookViewListener *listener);</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);</div><div class='del'>-</div><div class='del'>-#define E_BOOK_VIEW_LISTENER_TYPE        (e_book_view_listener_get_type ())</div><div class='del'>-#define E_BOOK_VIEW_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))</div><div class='del'>-#define E_BOOK_VIEW_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListenerClass))</div><div class='del'>-#define E_IS_BOOK_VIEW_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_LISTENER_TYPE))</div><div class='del'>-#define E_IS_BOOK_VIEW_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_BOOK_VIEW_LISTENER_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c<br/>deleted file mode 100644<br/>index 1af893bcd6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,351 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmarshal.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "e-card-cursor.h"</div><div class='del'>-#include "e-book-view-listener.h"</div><div class='del'>-#include "e-book-view.h"</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-GtkObjectClass *e_book_view_parent_class;</div><div class='del'>-</div><div class='del'>-struct _EBookViewPrivate {</div><div class='del'>-	GNOME_Evolution_Addressbook_BookView     corba_book_view;</div><div class='del'>-</div><div class='del'>-	EBook                 *book;</div><div class='del'>-	</div><div class='del'>-	EBookViewListener     *listener;</div><div class='del'>-</div><div class='del'>-	int                    responses_queued_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CARD_CHANGED,</div><div class='del'>-	CARD_REMOVED,</div><div class='del'>-	CARD_ADDED,</div><div class='del'>-	SEQUENCE_COMPLETE,</div><div class='del'>-	STATUS_MESSAGE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_book_view_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_book_iterator (gpointer data, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD (data);</div><div class='del'>-	EBook *book = E_BOOK (closure);</div><div class='del'>-</div><div class='del'>-	e_card_set_book (card, book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_do_added_event (EBookView                 *book_view,</div><div class='del'>-			    EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	if (book_view-&gt;priv-&gt;book)</div><div class='del'>-		g_list_foreach (resp-&gt;cards, add_book_iterator, book_view-&gt;priv-&gt;book);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_ADDED],</div><div class='del'>-			 resp-&gt;cards);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (resp-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (resp-&gt;cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_do_modified_event (EBookView                 *book_view,</div><div class='del'>-			       EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	if (book_view-&gt;priv-&gt;book)</div><div class='del'>-		g_list_foreach (resp-&gt;cards, add_book_iterator, book_view-&gt;priv-&gt;book);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_CHANGED],</div><div class='del'>-			 resp-&gt;cards);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (resp-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (resp-&gt;cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_do_removed_event (EBookView                 *book_view,</div><div class='del'>-			      EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_REMOVED],</div><div class='del'>-			 resp-&gt;id);</div><div class='del'>-</div><div class='del'>-	g_free(resp-&gt;id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_do_complete_event (EBookView                 *book_view,</div><div class='del'>-			      EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [SEQUENCE_COMPLETE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_do_status_message_event (EBookView                 *book_view,</div><div class='del'>-				     EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [STATUS_MESSAGE],</div><div class='del'>-			 resp-&gt;message);</div><div class='del'>-	g_free(resp-&gt;message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reading notices out of the EBookViewListener's queue.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	resp = e_book_view_listener_pop_response (listener);</div><div class='del'>-	</div><div class='del'>-	if (resp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (resp-&gt;op) {</div><div class='del'>-	case CardAddedEvent:</div><div class='del'>-		e_book_view_do_added_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case CardModifiedEvent:</div><div class='del'>-		e_book_view_do_modified_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case CardRemovedEvent:</div><div class='del'>-		e_book_view_do_removed_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case SequenceCompleteEvent:</div><div class='del'>-		e_book_view_do_complete_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case StatusMessageEvent:</div><div class='del'>-		e_book_view_do_status_message_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error ("EBookView: Unknown operation %d in listener queue!\n",</div><div class='del'>-			 resp-&gt;op);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-	g_return_val_if_fail (book_view != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_VIEW (book_view), FALSE);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Copy in the corba_book_view.</div><div class='del'>-	 */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	book_view-&gt;priv-&gt;corba_book_view = bonobo_object_dup_ref(corba_book_view, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_view_construct: Exception duplicating corba_book_view.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		book_view-&gt;priv-&gt;corba_book_view = NULL;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create our local BookListener interface.</div><div class='del'>-	 */</div><div class='del'>-	book_view-&gt;priv-&gt;listener = listener;</div><div class='del'>-	book_view-&gt;priv-&gt;responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view-&gt;priv-&gt;listener), "responses_queued",</div><div class='del'>-								   e_book_view_check_listener_queue, book_view);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref(BONOBO_OBJECT(book_view-&gt;priv-&gt;listener));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_new:</div><div class='del'>- */</div><div class='del'>-EBookView *</div><div class='del'>-e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-</div><div class='del'>-	book_view = gtk_type_new (E_BOOK_VIEW_TYPE);</div><div class='del'>-</div><div class='del'>-	if (! e_book_view_construct (book_view, corba_book_view, listener)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book_view));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return book_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_view_set_book (EBookView *book_view, EBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (book_view &amp;&amp; E_IS_BOOK_VIEW (book_view));</div><div class='del'>-	g_return_if_fail (book &amp;&amp; E_IS_BOOK (book));</div><div class='del'>-	g_return_if_fail (book_view-&gt;priv-&gt;book == NULL);</div><div class='del'>-</div><div class='del'>-	book_view-&gt;priv-&gt;book = book;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_view_stop (EBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (book_view &amp;&amp; E_IS_BOOK_VIEW (book_view));</div><div class='del'>-	if (book_view-&gt;priv-&gt;listener)</div><div class='del'>-		e_book_view_listener_stop (book_view-&gt;priv-&gt;listener);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_init (EBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	book_view-&gt;priv                      = g_new0 (EBookViewPrivate, 1);</div><div class='del'>-	book_view-&gt;priv-&gt;book                = NULL;</div><div class='del'>-	book_view-&gt;priv-&gt;corba_book_view     = CORBA_OBJECT_NIL;</div><div class='del'>-	book_view-&gt;priv-&gt;listener            = NULL;</div><div class='del'>-	book_view-&gt;priv-&gt;responses_queued_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EBookView             *book_view = E_BOOK_VIEW (object);</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-</div><div class='del'>-	if (book_view-&gt;priv-&gt;book) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book_view-&gt;priv-&gt;book));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (book_view-&gt;priv-&gt;corba_book_view) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		bonobo_object_release_unref (book_view-&gt;priv-&gt;corba_book_view, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("EBookView: Exception while releasing BookView\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (book_view-&gt;priv-&gt;listener) {</div><div class='del'>-		if (book_view-&gt;priv-&gt;responses_queued_id)</div><div class='del'>-			gtk_signal_disconnect(GTK_OBJECT(book_view-&gt;priv-&gt;listener),</div><div class='del'>-					      book_view-&gt;priv-&gt;responses_queued_id);</div><div class='del'>-		e_book_view_listener_stop (book_view-&gt;priv-&gt;listener);</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT(book_view-&gt;priv-&gt;listener));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (book_view-&gt;priv);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (e_book_view_parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS (e_book_view_parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_class_init (EBookViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	e_book_view_parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_book_view_signals [CARD_CHANGED] =</div><div class='del'>-		gtk_signal_new ("card_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, card_changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_book_view_signals [CARD_ADDED] =</div><div class='del'>-		gtk_signal_new ("card_added",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, card_added),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	e_book_view_signals [CARD_REMOVED] =</div><div class='del'>-		gtk_signal_new ("card_removed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, card_removed),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_book_view_signals [SEQUENCE_COMPLETE] =</div><div class='del'>-		gtk_signal_new ("sequence_complete",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, sequence_complete),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_book_view_signals [STATUS_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("status_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, status_message),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_book_view_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;card_changed = NULL;</div><div class='del'>-	klass-&gt;card_added = NULL;</div><div class='del'>-	klass-&gt;card_removed = NULL;</div><div class='del'>-	klass-&gt;sequence_complete = NULL;</div><div class='del'>-	klass-&gt;status_message = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_book_view_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-e_book_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EBookView",</div><div class='del'>-			sizeof (EBookView),</div><div class='del'>-			sizeof (EBookViewClass),</div><div class='del'>-			(GtkClassInitFunc)  e_book_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_book_view_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h<br/>deleted file mode 100644<br/>index 86326ca5b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_VIEW_H__</div><div class='del'>-#define __E_BOOK_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-view-listener.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _EBookView        EBookView;</div><div class='del'>-typedef struct _EBookViewClass   EBookViewClass;</div><div class='del'>-typedef struct _EBookViewPrivate EBookViewPrivate;</div><div class='del'>-</div><div class='del'>-struct _EBook;  /* Forward reference */</div><div class='del'>-</div><div class='del'>-struct _EBookView {</div><div class='del'>-	GtkObject     parent;</div><div class='del'>-	EBookViewPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EBookViewClass {</div><div class='del'>-	GtkObjectClass parent;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals.</div><div class='del'>-	 */</div><div class='del'>-	void (* card_changed)      (EBookView *book_view, const GList *cards);</div><div class='del'>-	void (* card_removed)      (EBookView *book_view, const char *id);</div><div class='del'>-	void (* card_added)        (EBookView *book_view, const GList *cards);</div><div class='del'>-	void (* sequence_complete) (EBookView *book_view);</div><div class='del'>-	void (* status_message)    (EBookView *book_view, const char *message);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-EBookView         *e_book_view_new                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);</div><div class='del'>-</div><div class='del'>-GtkType            e_book_view_get_type               (void);</div><div class='del'>-</div><div class='del'>-void               e_book_view_set_book               (EBookView *book_view, struct _EBook *book);</div><div class='del'>-</div><div class='del'>-void               e_book_view_stop                   (EBookView *book_view);</div><div class='del'>-</div><div class='del'>-#define E_BOOK_VIEW_TYPE        (e_book_view_get_type ())</div><div class='del'>-#define E_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_TYPE, EBookView))</div><div class='del'>-#define E_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_TYPE, EBookViewClass))</div><div class='del'>-#define E_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_TYPE))</div><div class='del'>-#define E_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_BOOK_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c<br/>deleted file mode 100644<br/>index 28308a7016..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1500 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmarshal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "e-card-cursor.h"</div><div class='del'>-#include "e-book-listener.h"</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-GtkObjectClass *e_book_parent_class;</div><div class='del'>-</div><div class='del'>-#define CARDSERVER_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	URINotLoaded,</div><div class='del'>-	URILoading,</div><div class='del'>-	URILoaded</div><div class='del'>-} EBookLoadState;</div><div class='del'>-</div><div class='del'>-struct _EBookPrivate {</div><div class='del'>-	GList *book_factories;</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	EBookListener	      *listener;</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book         corba_book;</div><div class='del'>-</div><div class='del'>-	EBookLoadState         load_state;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The operation queue.  New operations are appended to the</div><div class='del'>-	 * end of the queue.  When responses come back from the PAS,</div><div class='del'>-	 * the op structures are popped off the front of the queue.</div><div class='del'>-	 */</div><div class='del'>-	GList                 *pending_ops;</div><div class='del'>-</div><div class='del'>-	guint op_tag;</div><div class='del'>-</div><div class='del'>-	gchar *uri;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	OPEN_PROGRESS,</div><div class='del'>-	WRITABLE_STATUS,</div><div class='del'>-	LINK_STATUS,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_book_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	guint     tag;</div><div class='del'>-	gboolean  active;</div><div class='del'>-	gpointer  cb;</div><div class='del'>-	gpointer  closure;</div><div class='del'>-	EBookViewListener *listener;</div><div class='del'>-} EBookOp;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local response queue management.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_op_free (EBookOp *op)</div><div class='del'>-{</div><div class='del'>-	if (op-&gt;listener) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (op-&gt;listener));</div><div class='del'>-		op-&gt;listener = NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-e_book_queue_op (EBook    *book,</div><div class='del'>-		 gpointer  cb,</div><div class='del'>-		 gpointer  closure,</div><div class='del'>-		 EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	op           = g_new0 (EBookOp, 1);</div><div class='del'>-	op-&gt;tag      = book-&gt;priv-&gt;op_tag++;</div><div class='del'>-	op-&gt;active   = TRUE;</div><div class='del'>-	op-&gt;cb       = cb;</div><div class='del'>-	op-&gt;closure  = closure;</div><div class='del'>-	op-&gt;listener = listener;</div><div class='del'>-</div><div class='del'>-	if (op-&gt;listener)</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (op-&gt;listener));</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;pending_ops =</div><div class='del'>-		g_list_append (book-&gt;priv-&gt;pending_ops, op);</div><div class='del'>-</div><div class='del'>-	return op-&gt;tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Local response queue management.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_book_unqueue_op (EBook    *book)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-	GList *removed;</div><div class='del'>-</div><div class='del'>-	removed = g_list_last (book-&gt;priv-&gt;pending_ops);</div><div class='del'>-</div><div class='del'>-	if (removed) {</div><div class='del'>-		book-&gt;priv-&gt;pending_ops = g_list_remove_link (book-&gt;priv-&gt;pending_ops,</div><div class='del'>-							      removed);</div><div class='del'>-		op = removed-&gt;data;</div><div class='del'>-		e_book_op_free (op);</div><div class='del'>-		g_list_free_1 (removed);</div><div class='del'>-		book-&gt;priv-&gt;op_tag--;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBookOp *</div><div class='del'>-e_book_pop_op (EBook *book)</div><div class='del'>-{</div><div class='del'>-	GList   *popped;</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;pending_ops == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	op = book-&gt;priv-&gt;pending_ops-&gt;data;</div><div class='del'>-</div><div class='del'>-	popped = book-&gt;priv-&gt;pending_ops;</div><div class='del'>-	book-&gt;priv-&gt;pending_ops =</div><div class='del'>-		g_list_remove_link (book-&gt;priv-&gt;pending_ops,</div><div class='del'>-				    book-&gt;priv-&gt;pending_ops);</div><div class='del'>-</div><div class='del'>-	g_list_free_1 (popped);</div><div class='del'>-</div><div class='del'>-	return op;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_book_cancel_op (EBook *book, guint tag)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-	gboolean cancelled = FALSE;</div><div class='del'>-</div><div class='del'>-	for (iter = book-&gt;priv-&gt;pending_ops; iter != NULL &amp;&amp; !cancelled; iter = g_list_next (iter)) {</div><div class='del'>-		EBookOp *op = iter-&gt;data;</div><div class='del'>-		if (op-&gt;tag == tag) {</div><div class='del'>-			op-&gt;active = FALSE;</div><div class='del'>-			cancelled = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return cancelled;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_create_card (EBook                 *book,</div><div class='del'>-				EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_create_card: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;cb)</div><div class='del'>-		((EBookIdCallback) op-&gt;cb) (book, resp-&gt;status, resp-&gt;id, op-&gt;closure);</div><div class='del'>-	g_free (resp-&gt;id);</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_generic (EBook                 *book,</div><div class='del'>-			    EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_generic: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;cb)</div><div class='del'>-		((EBookCallback) op-&gt;cb) (book, resp-&gt;status, op-&gt;closure);</div><div class='del'>-</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_get_vcard (EBook                 *book,</div><div class='del'>-			      EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_get_vcard: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (resp-&gt;vcard != NULL) {</div><div class='del'>-</div><div class='del'>-		card = e_card_new(resp-&gt;vcard);</div><div class='del'>-</div><div class='del'>-		if (card != NULL) {</div><div class='del'>-			e_card_set_book (card, book);</div><div class='del'>-			if (op-&gt;cb) {</div><div class='del'>-				if (op-&gt;active)</div><div class='del'>-					((EBookCardCallback) op-&gt;cb) (book, resp-&gt;status, card, op-&gt;closure);</div><div class='del'>-				else</div><div class='del'>-					((EBookCardCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		} else {</div><div class='del'>-			((EBookCursorCallback) op-&gt;cb) (book, resp-&gt;status, NULL, op-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		((EBookCardCallback) op-&gt;cb) (book, resp-&gt;status, NULL, op-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (resp-&gt;vcard);</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_get_cursor (EBook                 *book,</div><div class='del'>-			       EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookOp *op;</div><div class='del'>-	ECardCursor *cursor;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cursor = e_card_cursor_new(resp-&gt;cursor);</div><div class='del'>-</div><div class='del'>-	if (cursor != NULL) {</div><div class='del'>-		if (op-&gt;cb) {</div><div class='del'>-			if (op-&gt;active)</div><div class='del'>-				((EBookCursorCallback) op-&gt;cb) (book, resp-&gt;status, cursor, op-&gt;closure);</div><div class='del'>-			else</div><div class='del'>-				((EBookCursorCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.</div><div class='del'>-		 */</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		bonobo_object_release_unref (resp-&gt;cursor, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_do_response_get_cursor: Exception releasing "</div><div class='del'>-				   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(cursor));</div><div class='del'>-	} else {</div><div class='del'>-		((EBookCursorCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_get_view (EBook                 *book,</div><div class='del'>-			     EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookOp *op;</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_get_view: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	book_view = e_book_view_new (resp-&gt;book_view, op-&gt;listener);</div><div class='del'>-</div><div class='del'>-	if (book_view != NULL) {</div><div class='del'>-		e_book_view_set_book (book_view, book);</div><div class='del'>-</div><div class='del'>-		/* Only execute the callback if the operation is still flagged as active (i.e. hasn't</div><div class='del'>-		   been cancelled.  This is mildly wasteful since we unnecessaryily create the</div><div class='del'>-		   book_view, etc... but I'm leery of tinkering with the CORBA magic. */</div><div class='del'>-		if (op-&gt;cb) {</div><div class='del'>-			if (op-&gt;active)</div><div class='del'>-				((EBookBookViewCallback) op-&gt;cb) (book, resp-&gt;status, book_view, op-&gt;closure);</div><div class='del'>-			else</div><div class='del'>-				((EBookBookViewCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-	</div><div class='del'>-		/*</div><div class='del'>-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.</div><div class='del'>-		 */</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		bonobo_object_release_unref  (resp-&gt;book_view, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_do_response_get_view: Exception releasing "</div><div class='del'>-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book_view));</div><div class='del'>-	} else {</div><div class='del'>-		e_book_view_listener_stop (op-&gt;listener);</div><div class='del'>-		((EBookBookViewCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_get_changes (EBook                 *book,</div><div class='del'>-				EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookOp *op;</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_get_changes: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	book_view = e_book_view_new (resp-&gt;book_view, op-&gt;listener);</div><div class='del'>-</div><div class='del'>-	if (book_view != NULL) {</div><div class='del'>-		e_book_view_set_book (book_view, book);</div><div class='del'>-	</div><div class='del'>-		if (op-&gt;cb) {</div><div class='del'>-			if (op-&gt;active)</div><div class='del'>-				((EBookBookViewCallback) op-&gt;cb) (book, resp-&gt;status, book_view, op-&gt;closure);</div><div class='del'>-			else</div><div class='del'>-				((EBookBookViewCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Release the remote GNOME_Evolution_Addressbook_BookView in the PAS.</div><div class='del'>-		 */</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		bonobo_object_release_unref  (resp-&gt;book_view, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_book_do_response_get_changes: Exception releasing "</div><div class='del'>-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book_view));</div><div class='del'>-	} else {</div><div class='del'>-		e_book_view_listener_stop (op-&gt;listener);</div><div class='del'>-		((EBookBookViewCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_open (EBook                 *book,</div><div class='del'>-			 EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	if (resp-&gt;status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		book-&gt;priv-&gt;corba_book  = resp-&gt;book;</div><div class='del'>-		book-&gt;priv-&gt;load_state  = URILoaded;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_open: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;cb)</div><div class='del'>-		((EBookCallback) op-&gt;cb) (book, resp-&gt;status, op-&gt;closure);</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_progress_event (EBook                 *book,</div><div class='del'>-			  EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],</div><div class='del'>-			 resp-&gt;msg, resp-&gt;percent);</div><div class='del'>-</div><div class='del'>-	g_free (resp-&gt;msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_link_event (EBook                 *book,</div><div class='del'>-		      EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],</div><div class='del'>-			 resp-&gt;connected);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_writable_event (EBook                 *book,</div><div class='del'>-			  EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [WRITABLE_STATUS],</div><div class='del'>-			 resp-&gt;writable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_do_response_get_supported_fields (EBook                 *book,</div><div class='del'>-					 EBookListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	EBookOp *op;</div><div class='del'>-</div><div class='del'>-	op = e_book_pop_op (book);</div><div class='del'>-</div><div class='del'>-	if (op == NULL) {</div><div class='del'>-		g_warning ("e_book_do_response_get_supported_fields: Cannot find operation "</div><div class='del'>-			   "in local op queue!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;cb) {</div><div class='del'>-		if (op-&gt;active)</div><div class='del'>-			((EBookFieldsCallback) op-&gt;cb) (book, resp-&gt;status, resp-&gt;fields, op-&gt;closure);</div><div class='del'>-		else</div><div class='del'>-			((EBookFieldsCallback) op-&gt;cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_op_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reading notices out of the EBookListener's queue.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_book_check_listener_queue (EBookListener *listener, EBook *book)</div><div class='del'>-{</div><div class='del'>-	EBookListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	resp = e_book_listener_pop_response (listener);</div><div class='del'>-</div><div class='del'>-	if (resp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (resp-&gt;op) {</div><div class='del'>-	case CreateCardResponse:</div><div class='del'>-		e_book_do_response_create_card (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case RemoveCardResponse:</div><div class='del'>-	case ModifyCardResponse:</div><div class='del'>-	case AuthenticationResponse:</div><div class='del'>-		e_book_do_response_generic (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case GetCardResponse:</div><div class='del'>-		e_book_do_response_get_vcard (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case GetCursorResponse:</div><div class='del'>-		e_book_do_response_get_cursor (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case GetBookViewResponse:</div><div class='del'>-		e_book_do_response_get_view(book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case GetChangesResponse:</div><div class='del'>-		e_book_do_response_get_changes(book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case OpenBookResponse:</div><div class='del'>-		e_book_do_response_open (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case GetSupportedFieldsResponse:</div><div class='del'>-		e_book_do_response_get_supported_fields (book, resp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case OpenProgressEvent:</div><div class='del'>-		e_book_do_progress_event (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case LinkStatusEvent:</div><div class='del'>-		e_book_do_link_event (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	case WritableStatusEvent:</div><div class='del'>-		e_book_do_writable_event (book, resp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error ("EBook: Unknown operation %d in listener queue!\n",</div><div class='del'>-			 resp-&gt;op);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_load_uri:</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char                      *uri;</div><div class='del'>-	EBookCallback              open_response;</div><div class='del'>-	gpointer                   closure;</div><div class='del'>-} EBookLoadURIData;</div><div class='del'>-</div><div class='del'>-static void e_book_load_uri_from_factory (EBook *book,</div><div class='del'>-					  GNOME_Evolution_Addressbook_BookFactory factory,</div><div class='del'>-					  EBookLoadURIData *load_uri_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_load_uri_step (EBook *book, EBookStatus status, EBookLoadURIData *data)</div><div class='del'>-{</div><div class='del'>-	/* iterate to the next possible CardFactory, or fail</div><div class='del'>-	   if it's the last one */</div><div class='del'>-	book-&gt;priv-&gt;iter = book-&gt;priv-&gt;iter-&gt;next;</div><div class='del'>-	if (book-&gt;priv-&gt;iter) {</div><div class='del'>-		GNOME_Evolution_Addressbook_BookFactory factory = book-&gt;priv-&gt;iter-&gt;data;</div><div class='del'>-		e_book_load_uri_from_factory (book, factory, data);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		EBookCallback cb = data-&gt;open_response;</div><div class='del'>-		gpointer closure = data-&gt;closure;</div><div class='del'>-		</div><div class='del'>-		/* reset the load_state to NotLoaded so people can</div><div class='del'>-                   attempt another load_uri on the book. */</div><div class='del'>-		book-&gt;priv-&gt;load_state = URINotLoaded;</div><div class='del'>-</div><div class='del'>-		g_free (data);</div><div class='del'>-</div><div class='del'>-		cb (book, status, closure);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_load_uri_open_cb (EBook *book, EBookStatus status, EBookLoadURIData *data)</div><div class='del'>-{</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		EBookCallback cb = data-&gt;open_response;</div><div class='del'>-		gpointer closure = data-&gt;closure;</div><div class='del'>-</div><div class='del'>-		g_free (data);</div><div class='del'>-</div><div class='del'>-		cb (book, status, closure);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		e_book_load_uri_step (book, status, data);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_load_uri_from_factory (EBook *book,</div><div class='del'>-			      GNOME_Evolution_Addressbook_BookFactory factory,</div><div class='del'>-			      EBookLoadURIData *load_uri_data)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, e_book_load_uri_open_cb, load_uri_data, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookFactory_openBook (</div><div class='del'>-		factory, book-&gt;priv-&gt;uri,</div><div class='del'>-		bonobo_object_corba_objref (BONOBO_OBJECT (book-&gt;priv-&gt;listener)),</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_load_uri_step (book, E_BOOK_STATUS_OTHER_ERROR, load_uri_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-activate_factories_for_uri (EBook *book, const char *uri)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	OAF_ServerInfoList *info_list = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	char *protocol, *query, *colon;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-</div><div class='del'>-	colon = strchr (uri, ':');</div><div class='del'>-	if (!colon) {</div><div class='del'>-		g_warning ("e_book_load_uri: Unable to determine protocol in the URI\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	protocol = g_strndup (uri, colon-uri);</div><div class='del'>-	query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/BookFactory:1.0')"</div><div class='del'>-				 " AND addressbook:supported_protocols.has ('%s')", protocol</div><div class='del'>-				 );</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	info_list = oaf_query (query, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Eeek!  Cannot perform OAF query for book factories.");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		goto shutdown;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (info_list-&gt;_length == 0) {</div><div class='del'>-		g_warning ("Can't find installed BookFactory that handles protocol '%s'.", protocol);</div><div class='del'>-		g_free (protocol);</div><div class='del'>-		g_free (query);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		goto shutdown;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; info_list-&gt;_length; i ++) {</div><div class='del'>-		const OAF_ServerInfo *info;</div><div class='del'>-		GNOME_Evolution_Addressbook_BookFactory factory;</div><div class='del'>-</div><div class='del'>-		info = info_list-&gt;_buffer + i;</div><div class='del'>-</div><div class='del'>-		factory = oaf_activate_from_id (info-&gt;iid, 0, NULL, NULL);</div><div class='del'>-</div><div class='del'>-		if (factory == CORBA_OBJECT_NIL)</div><div class='del'>-			g_warning ("e_book_construct: Could not obtain a handle "</div><div class='del'>-				   "to the Personal Addressbook Server with IID `%s'\n", info-&gt;iid);</div><div class='del'>-		else</div><div class='del'>-			book-&gt;priv-&gt;book_factories = g_list_append (book-&gt;priv-&gt;book_factories,</div><div class='del'>-								    factory);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!book-&gt;priv-&gt;book_factories) {</div><div class='del'>-		g_warning ("Couldn't activate any book factories.");</div><div class='del'>-		goto shutdown;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>- shutdown:</div><div class='del'>-	if (info_list)</div><div class='del'>-		CORBA_free (info_list);</div><div class='del'>-	g_free (query);</div><div class='del'>-	g_free (protocol);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_book_load_uri (EBook                     *book,</div><div class='del'>-		 const char                *uri,</div><div class='del'>-		 EBookCallback              open_response,</div><div class='del'>-		 gpointer                   closure)</div><div class='del'>-{</div><div class='del'>-	EBookLoadURIData *load_uri_data;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookFactory factory;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,          FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);</div><div class='del'>-	g_return_val_if_fail (uri != NULL,           FALSE);</div><div class='del'>-	g_return_val_if_fail (open_response != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URINotLoaded) {</div><div class='del'>-		g_warning ("e_book_load_uri: Attempted to load a URI "</div><div class='del'>-			   "on a book which already has a URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* try to find a list of factories that can handle the protocol */</div><div class='del'>-	if (!activate_factories_for_uri (book, uri)) {</div><div class='del'>-		open_response (NULL, E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED, closure);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	g_free (book-&gt;priv-&gt;uri);</div><div class='del'>-	book-&gt;priv-&gt;uri = g_strdup (uri);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create our local BookListener interface.</div><div class='del'>-	 */</div><div class='del'>-	book-&gt;priv-&gt;listener = e_book_listener_new ();</div><div class='del'>-	if (book-&gt;priv-&gt;listener == NULL) {</div><div class='del'>-		g_warning ("e_book_load_uri: Could not create EBookListener!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book-&gt;priv-&gt;listener), "responses_queued",</div><div class='del'>-			    e_book_check_listener_queue, book);</div><div class='del'>-</div><div class='del'>-	load_uri_data = g_new (EBookLoadURIData, 1);</div><div class='del'>-	load_uri_data-&gt;open_response = open_response;</div><div class='del'>-	load_uri_data-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	/* initialize the iterator, and load from the first one*/</div><div class='del'>-	book-&gt;priv-&gt;iter = book-&gt;priv-&gt;book_factories;</div><div class='del'>-</div><div class='del'>-	factory = book-&gt;priv-&gt;iter-&gt;data;</div><div class='del'>-</div><div class='del'>-	e_book_load_uri_from_factory (book, factory, load_uri_data);</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;load_state = URILoading;</div><div class='del'>-</div><div class='del'>-	/* Now we play the waiting game. */</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_unload_uri:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_book_unload_uri (EBook *book)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME: Make sure this works if the URI is still being</div><div class='del'>-	 * loaded.</div><div class='del'>-	 */</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_unload_uri: No URI is loaded!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.</div><div class='del'>-	 */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref  (book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_unload_uri: Exception releasing "</div><div class='del'>-			   "remote book interface!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_listener_stop (book-&gt;priv-&gt;listener);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (book-&gt;priv-&gt;listener));</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;listener   = NULL;</div><div class='del'>-	book-&gt;priv-&gt;load_state = URINotLoaded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_book_get_uri (EBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (book &amp;&amp; E_IS_BOOK (book), NULL);</div><div class='del'>-</div><div class='del'>-	return book-&gt;priv-&gt;uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_book_get_static_capabilities (EBook *book)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *temp;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_unload_uri: No URI is loaded!\n");</div><div class='del'>-		return g_strdup("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	temp = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_static_capabilities: Exception "</div><div class='del'>-			   "during get_static_capabilities!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret_val = g_strdup(temp);</div><div class='del'>-	CORBA_free(temp);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_get_supported_fields (EBook              *book,</div><div class='del'>-			     EBookFieldsCallback cb,</div><div class='del'>-			     gpointer            closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	guint tag;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_unload_uri: No URI is loaded!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag = e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_getSupportedFields(book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_supported_fields: Exception "</div><div class='del'>-			   "during get_supported_fields!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_book_construct (EBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (book != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;book_factories = NULL;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_new:</div><div class='del'>- */</div><div class='del'>-EBook *</div><div class='del'>-e_book_new (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = gtk_type_new (E_BOOK_TYPE);</div><div class='del'>-</div><div class='del'>-	if (! e_book_construct (book)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return book;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* User authentication. */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_authenticate_user (EBook         *book,</div><div class='del'>-			  const char    *user,</div><div class='del'>-			  const char    *passwd,</div><div class='del'>-			  const char    *auth_method,</div><div class='del'>-			  EBookCallback cb,</div><div class='del'>-			  gpointer      closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_authenticate_user: No URI loaded!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_authenticateUser (book-&gt;priv-&gt;corba_book,</div><div class='del'>-							   user,</div><div class='del'>-							   passwd,</div><div class='del'>-							   auth_method,</div><div class='del'>-							   &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_authenticate_user: Exception authenticating user with the PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fetching cards */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_get_card:</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_book_get_card (EBook             *book,</div><div class='del'>-		 const char        *id,</div><div class='del'>-		 EBookCardCallback  cb,</div><div class='del'>-		 gpointer           closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	guint tag;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     0);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), 0);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_get_card: No URI loaded!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	tag = e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_getVCard (book-&gt;priv-&gt;corba_book, (const GNOME_Evolution_Addressbook_VCard) id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_card: Exception "</div><div class='del'>-			   "getting card!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deleting cards. */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_remove_card:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_remove_card (EBook         *book,</div><div class='del'>-		    ECard         *card,</div><div class='del'>-		    EBookCallback  cb,</div><div class='del'>-		    gpointer       closure)</div><div class='del'>-{</div><div class='del'>-	const char *id;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (card != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_remove_card: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = e_card_get_id (card);</div><div class='del'>-	g_assert (id != NULL);</div><div class='del'>-</div><div class='del'>-	return e_book_remove_card_by_id (book, id, cb, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_remove_card_by_id:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_remove_card_by_id (EBook         *book,</div><div class='del'>-			  const char    *id,</div><div class='del'>-			  EBookCallback  cb,</div><div class='del'>-			  gpointer       closure)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (id != NULL,       FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_removeCard (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const GNOME_Evolution_Addressbook_CardId) id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_remove_card_by_id: CORBA exception "</div><div class='del'>-			   "talking to PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adding cards. */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_add_card:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_add_card (EBook           *book,</div><div class='del'>-		 ECard           *card,</div><div class='del'>-		 EBookIdCallback  cb,</div><div class='del'>-		 gpointer         closure)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	char     *vcard;</div><div class='del'>-	gboolean  retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (card != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_add_card: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vcard = e_card_get_vcard_assume_utf8 (card);</div><div class='del'>-</div><div class='del'>-	if (vcard == NULL) {</div><div class='del'>-		g_warning ("e_book_add_card: Cannot convert card to VCard string!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = e_book_add_vcard (book, vcard, cb, closure);</div><div class='del'>-</div><div class='del'>-	g_free (vcard);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;book &amp;&amp; card-&gt;book != book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-	card-&gt;book = book;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_add_vcard:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_add_vcard (EBook           *book,</div><div class='del'>-		  const char      *vcard,</div><div class='del'>-		  EBookIdCallback  cb,</div><div class='del'>-		  gpointer         closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book  != NULL,    FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (vcard != NULL,    FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_add_vcard: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_addCard (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Modifying cards. */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_commit_card:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_commit_card (EBook         *book,</div><div class='del'>-		    ECard         *card,</div><div class='del'>-		    EBookCallback  cb,</div><div class='del'>-		    gpointer       closure)</div><div class='del'>-{</div><div class='del'>-	char     *vcard;</div><div class='del'>-	gboolean  retval;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (book  != NULL,    FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (card != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_commit_card: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vcard = e_card_get_vcard_assume_utf8 (card);</div><div class='del'>-</div><div class='del'>-	if (vcard == NULL) {</div><div class='del'>-		g_warning ("e_book_commit_card: Error "</div><div class='del'>-			   "getting VCard for card!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = e_book_commit_vcard (book, vcard, cb, closure);</div><div class='del'>-</div><div class='del'>-	g_free (vcard);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;book &amp;&amp; card-&gt;book != book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-	card-&gt;book = book;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_commit_vcard:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_commit_vcard (EBook         *book,</div><div class='del'>-		     const char    *vcard,</div><div class='del'>-		     EBookCallback  cb,</div><div class='del'>-		     gpointer       closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book  != NULL,    FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-	g_return_val_if_fail (vcard != NULL,    FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_commit_vcard: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_modifyCard (</div><div class='del'>-		book-&gt;priv-&gt;corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_commit_vcard: Exception "</div><div class='del'>-			   "modifying card in PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_check_connection:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_book_check_connection (EBook *book)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_check_connection: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_checkConnection (book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_check_connection: Exception "</div><div class='del'>-			   "querying the PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_get_cursor       (EBook               *book,</div><div class='del'>-			 gchar               *query,</div><div class='del'>-			 EBookCursorCallback  cb,</div><div class='del'>-			 gpointer             closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	guint tag;</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail (book != NULL,     0);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), 0);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_check_connection: No URI loaded!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	tag = e_book_queue_op (book, cb, closure, NULL);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_getCursor (book-&gt;priv-&gt;corba_book, query, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_all_cards: Exception "</div><div class='del'>-			   "querying list of cards!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_get_book_view       (EBook                 *book,</div><div class='del'>-			    const gchar           *query,</div><div class='del'>-			    EBookBookViewCallback  cb,</div><div class='del'>-			    gpointer               closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookViewListener *listener;</div><div class='del'>-	guint tag;</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail (book != NULL,     0);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), 0);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_get_book_view: No URI loaded!\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener = e_book_view_listener_new();</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	tag = e_book_queue_op (book, cb, closure, listener);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_getBookView (book-&gt;priv-&gt;corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_book_view: Exception "</div><div class='del'>-			   "getting book_view!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_book_get_changes         (EBook                 *book,</div><div class='del'>-			    gchar                 *changeid,</div><div class='del'>-			    EBookBookViewCallback  cb,</div><div class='del'>-			    gpointer               closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookViewListener *listener;</div><div class='del'>-	guint tag;</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail (book != NULL,     0);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), 0);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_get_changes: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener = e_book_view_listener_new();</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	tag = e_book_queue_op (book, cb, closure, listener);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_getChanges (book-&gt;priv-&gt;corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_changes: Exception "</div><div class='del'>-			   "getting changes!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		e_book_unqueue_op (book);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_cancel</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_book_cancel (EBook *book, guint tag)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_BOOK (book));</div><div class='del'>-	g_return_if_fail (tag != 0);</div><div class='del'>-</div><div class='del'>-	/* In an attempt to be useful, we take a bit of extra care in reporting</div><div class='del'>-	   errors.  This might come in handy someday. */</div><div class='del'>-	if (tag &gt;= book-&gt;priv-&gt;op_tag)</div><div class='del'>-		g_warning ("Attempt to cancel unassigned operation (%u)", tag);</div><div class='del'>-	else if (! e_book_cancel_op (book, tag))</div><div class='del'>-		g_warning ("Attempt to cancel unknown operation (%u)", tag); </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_get_name:</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_book_get_name (EBook *book)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-	char              *retval;</div><div class='del'>-	char              *name;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,     NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), NULL);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_get_name: No URI loaded!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	name = GNOME_Evolution_Addressbook_Book_getName (book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_name: Exception getting name from PAS!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (name == NULL) {</div><div class='del'>-		g_warning ("e_book_get_name: Got NULL name from PAS!\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = g_strdup (name);</div><div class='del'>-	CORBA_free (name);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_init (EBook *book)</div><div class='del'>-{</div><div class='del'>-	book-&gt;priv             = g_new0 (EBookPrivate, 1);</div><div class='del'>-	book-&gt;priv-&gt;load_state = URINotLoaded;</div><div class='del'>-	book-&gt;priv-&gt;op_tag     = 1;</div><div class='del'>-	book-&gt;priv-&gt;uri        = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EBook             *book = E_BOOK (object);</div><div class='del'>-	CORBA_Environment  ev;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state == URILoaded)</div><div class='del'>-		e_book_unload_uri (book);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	for (l = book-&gt;priv-&gt;book_factories; l; l = l-&gt;next) {</div><div class='del'>-		CORBA_Object_release ((CORBA_Object)l-&gt;data, &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("EBook: Exception while releasing BookFactory\n");</div><div class='del'>-</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			CORBA_exception_init (&amp;ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (book-&gt;priv-&gt;uri);</div><div class='del'>-</div><div class='del'>-	g_free (book-&gt;priv);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (e_book_parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_class_init (EBookClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	e_book_parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_book_signals [LINK_STATUS] =</div><div class='del'>-		gtk_signal_new ("link_status",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookClass, link_status),</div><div class='del'>-				gtk_marshal_NONE__BOOL,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_BOOL);</div><div class='del'>-</div><div class='del'>-	e_book_signals [WRITABLE_STATUS] =</div><div class='del'>-		gtk_signal_new ("writable_status",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookClass, writable_status),</div><div class='del'>-				gtk_marshal_NONE__BOOL,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_BOOL);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_book_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_book_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-e_book_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EBook",</div><div class='del'>-			sizeof (EBook),</div><div class='del'>-			sizeof (EBookClass),</div><div class='del'>-			(GtkClassInitFunc)  e_book_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_book_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h<br/>deleted file mode 100644<br/>index 1403a23f60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-book.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,152 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_BOOK_H__</div><div class='del'>-#define __E_BOOK_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-cursor.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-view.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-types.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _EBook        EBook;</div><div class='del'>-typedef struct _EBookClass   EBookClass;</div><div class='del'>-typedef struct _EBookPrivate EBookPrivate;</div><div class='del'>-</div><div class='del'>-struct _EBook {</div><div class='del'>-	GtkObject     parent;</div><div class='del'>-	EBookPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EBookClass {</div><div class='del'>-	GtkObjectClass parent;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals.</div><div class='del'>-	 */</div><div class='del'>-	void (* open_progress)   (EBook *book, const char *msg, short percent);</div><div class='del'>-	void (* link_status)     (EBook *book, gboolean connected);</div><div class='del'>-	void (* writable_status) (EBook *book, gboolean writable);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Callbacks for asynchronous functions. */</div><div class='del'>-typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);</div><div class='del'>-typedef void (*EBookOpenProgressCallback)     (EBook          *book,</div><div class='del'>-					       const char     *status_message,</div><div class='del'>-					       short           percent,</div><div class='del'>-					       gpointer        closure);</div><div class='del'>-typedef void (*EBookIdCallback)       (EBook *book, EBookStatus status, const char *id, gpointer closure);</div><div class='del'>-typedef void (*EBookCardCallback)     (EBook *book, EBookStatus status, ECard *card, gpointer closure);</div><div class='del'>-typedef void (*EBookCursorCallback)   (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure);</div><div class='del'>-typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);</div><div class='del'>-typedef void (*EBookFieldsCallback)   (EBook *book, EBookStatus status, EList *fields, gpointer closure);</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-EBook    *e_book_new                      (void);</div><div class='del'>-</div><div class='del'>-gboolean  e_book_load_uri                 (EBook                 *book,</div><div class='del'>-					   const char            *uri,</div><div class='del'>-					   EBookCallback          open_response,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-void      e_book_unload_uri               (EBook                 *book);</div><div class='del'>-</div><div class='del'>-const char *e_book_get_uri                (EBook                 *book);</div><div class='del'>-</div><div class='del'>-char     *e_book_get_static_capabilities  (EBook                 *book);</div><div class='del'>-</div><div class='del'>-guint     e_book_get_supported_fields     (EBook                 *book,</div><div class='del'>-					   EBookFieldsCallback    cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* User authentication. */</div><div class='del'>-void      e_book_authenticate_user        (EBook                 *book,</div><div class='del'>-					   const char            *user,</div><div class='del'>-					   const char            *passwd,</div><div class='del'>-					   const char            *auth_method,</div><div class='del'>-					   EBookCallback         cb,</div><div class='del'>-					   gpointer              closure);</div><div class='del'>-</div><div class='del'>-/* Fetching cards. */</div><div class='del'>-guint     e_book_get_card                 (EBook                 *book,</div><div class='del'>-					   const char            *id,</div><div class='del'>-					   EBookCardCallback      cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* Deleting cards. */</div><div class='del'>-gboolean  e_book_remove_card              (EBook                 *book,</div><div class='del'>-					   ECard                 *card,</div><div class='del'>-					   EBookCallback          cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-gboolean  e_book_remove_card_by_id        (EBook                 *book,</div><div class='del'>-					   const char            *id,</div><div class='del'>-					   EBookCallback          cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* Adding cards. */</div><div class='del'>-gboolean  e_book_add_card                 (EBook                 *book,</div><div class='del'>-					   ECard                 *card,</div><div class='del'>-					   EBookIdCallback        cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-gboolean  e_book_add_vcard                (EBook                 *book,</div><div class='del'>-					   const char            *vcard,</div><div class='del'>-					   EBookIdCallback        cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* Modifying cards. */</div><div class='del'>-gboolean  e_book_commit_card              (EBook                 *book,</div><div class='del'>-					   ECard                 *card,</div><div class='del'>-					   EBookCallback          cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-gboolean  e_book_commit_vcard             (EBook                 *book,</div><div class='del'>-					   const char            *vcard,</div><div class='del'>-					   EBookCallback          cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* Checking to see if we're connected to the card repository. */</div><div class='del'>-gboolean  e_book_check_connection         (EBook                 *book);</div><div class='del'>-guint     e_book_get_cursor               (EBook                 *book,</div><div class='del'>-					   char                  *query,</div><div class='del'>-					   EBookCursorCallback    cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-guint     e_book_get_book_view            (EBook                 *book,</div><div class='del'>-					   const gchar           *query,</div><div class='del'>-					   EBookBookViewCallback  cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-guint     e_book_get_changes              (EBook                 *book,</div><div class='del'>-					   char                  *changeid,</div><div class='del'>-					   EBookBookViewCallback  cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* Cancel a pending operation. */</div><div class='del'>-void      e_book_cancel                   (EBook                 *book,</div><div class='del'>-					   guint                  tag);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Getting the name of the repository. */</div><div class='del'>-char     *e_book_get_name                 (EBook                 *book);</div><div class='del'>-</div><div class='del'>-GtkType   e_book_get_type                 (void);</div><div class='del'>-</div><div class='del'>-#define E_BOOK_TYPE        (e_book_get_type ())</div><div class='del'>-#define E_BOOK(o)          (GTK_CHECK_CAST ((o), E_BOOK_TYPE, EBook))</div><div class='del'>-#define E_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_TYPE, EBookClass))</div><div class='del'>-#define E_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), E_BOOK_TYPE))</div><div class='del'>-#define E_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_BOOK_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c<br/>deleted file mode 100644<br/>index a022c4e394..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-compare.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-compare.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,704 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-card-compare.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include "e-book-util.h"</div><div class='del'>-#include "e-card-compare.h"</div><div class='del'>-</div><div class='del'>-/* This is an "optimistic" combiner: the best of the two outcomes is</div><div class='del'>-   selected. */</div><div class='del'>-static ECardMatchType</div><div class='del'>-combine_comparisons (ECardMatchType prev,</div><div class='del'>-		     ECardMatchType new_info)</div><div class='del'>-{</div><div class='del'>-	if (new_info == E_CARD_MATCH_NOT_APPLICABLE)</div><div class='del'>-		return prev;</div><div class='del'>-	return (ECardMatchType) MAX ((gint) prev, (gint) new_info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** Name comparisons ***/</div><div class='del'>-</div><div class='del'>-/* This *so* doesn't belong here... at least not implemented in a</div><div class='del'>-   sucky way like this.  But it can be fixed later. */</div><div class='del'>-</div><div class='del'>-/* This is very Anglocentric. */</div><div class='del'>-static gchar *name_synonyms[][2] = {</div><div class='del'>-	{ "jon", "john" },   /* Ah, the hacker's perogative */</div><div class='del'>-	{ "joseph", "joe" },</div><div class='del'>-	{ "robert", "bob" },</div><div class='del'>-	{ "gene", "jean" },</div><div class='del'>-	{ "jesse", "jessie" },</div><div class='del'>-	{ "ian", "iain" },</div><div class='del'>-	{ "richard", "dick" },</div><div class='del'>-	{ "william", "bill" },</div><div class='del'>-	{ "william", "will" },</div><div class='del'>-	{ "anthony", "tony" },</div><div class='del'>-	{ "michael", "mike" },</div><div class='del'>-	{ "eric", "erik" },</div><div class='del'>-	{ "elizabeth", "liz" },</div><div class='del'>-	{ "jeff", "geoff" },</div><div class='del'>-	{ "jeff", "geoffrey" },</div><div class='del'>-	{ "tom", "thomas" },</div><div class='del'>-	{ "dave", "david" },</div><div class='del'>-	{ "jim", "james" },</div><div class='del'>-	{ "abigal", "abby" },</div><div class='del'>-	{ "amanda", "amy" },</div><div class='del'>-	{ "amanda", "manda" },</div><div class='del'>-	{ "jennifer", "jenny" },</div><div class='del'>-	{ "christopher", "chris" },</div><div class='del'>-	{ "rebecca", "becca" },</div><div class='del'>-	{ "rebecca", "becky" },</div><div class='del'>-	{ "anderson", "andersen" },</div><div class='del'>-	{ "johnson", "johnsen" },</div><div class='del'>-	/* We could go on and on... */</div><div class='del'>-	/* We should add soundex here. */</div><div class='del'>-	{ NULL, NULL }</div><div class='del'>-};</div><div class='del'>-	</div><div class='del'>-static gboolean</div><div class='del'>-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)</div><div class='del'>-{</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	if (!(a &amp;&amp; b &amp;&amp; *a &amp;&amp; *b))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If we are in 'strict' mode, b must match the beginning of a.</div><div class='del'>-	   So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.</div><div class='del'>-</div><div class='del'>-	   If strict is FALSE, it is sufficient for the strings to share</div><div class='del'>-	   some leading characters.  In this case, "Robert" and "Robbie"</div><div class='del'>-	   would match, as would "Dave" and "Dan". */</div><div class='del'>-	</div><div class='del'>-	if (strict) {</div><div class='del'>-		len = g_utf8_strlen (b, -1);</div><div class='del'>-	} else {</div><div class='del'>-		len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return !g_utf8_strncasecmp (a, b, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)</div><div class='del'>-{</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	if (!(a &amp;&amp; b &amp;&amp; *a &amp;&amp; *b))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (name_fragment_match (a, b, strict))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* Check for nicknames.  Yes, the linear search blows. */</div><div class='del'>-	for (i=0; name_synonyms[i][0]; ++i) {</div><div class='del'>-</div><div class='del'>-		if (!g_utf8_strcasecmp (name_synonyms[i][0], a)</div><div class='del'>-		    &amp;&amp; !g_utf8_strcasecmp (name_synonyms[i][1], b))</div><div class='del'>-			return TRUE;</div><div class='del'>-		</div><div class='del'>-		if (!g_utf8_strcasecmp (name_synonyms[i][0], b)</div><div class='del'>-		    &amp;&amp; !g_utf8_strcasecmp (name_synonyms[i][1], a))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_name_to_string (ECard *card, const gchar *str)</div><div class='del'>-{</div><div class='del'>-	return e_card_compare_name_to_string_full (card, str, FALSE, NULL, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_name_to_string_full (ECard *card, const gchar *str, gboolean allow_partial_matches,</div><div class='del'>-				    gint *matched_parts_out, ECardMatchPart *first_matched_part_out, gint *matched_character_count_out)</div><div class='del'>-{</div><div class='del'>-	gchar **namev, **givenv = NULL, **addv = NULL, **familyv = NULL;</div><div class='del'>-</div><div class='del'>-	gint matched_parts = E_CARD_MATCH_PART_NONE;</div><div class='del'>-	ECardMatchPart first_matched_part = E_CARD_MATCH_PART_NONE;</div><div class='del'>-	ECardMatchPart this_part_match = E_CARD_MATCH_PART_NOT_APPLICABLE;</div><div class='del'>-	ECardMatchType match_type;</div><div class='del'>-</div><div class='del'>-	gint match_count = 0, matched_character_count = 0, fragment_count;</div><div class='del'>-	gint i, j;</div><div class='del'>-	gchar *str_cpy, *s;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card-&gt;name != NULL, E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (str != NULL, E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	str_cpy = s = g_strdup (str);</div><div class='del'>-	while (*s) {</div><div class='del'>-		if (*s == ',' || *s == '"')</div><div class='del'>-			*s = ' ';</div><div class='del'>-		++s;</div><div class='del'>-	}</div><div class='del'>-	namev   = g_strsplit (str_cpy, " ", 0);</div><div class='del'>-	g_free (str_cpy);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;name-&gt;given)</div><div class='del'>-		givenv = g_strsplit (card-&gt;name-&gt;given, " ", 0);</div><div class='del'>-	if (card-&gt;name-&gt;additional)</div><div class='del'>-		addv = g_strsplit (card-&gt;name-&gt;additional, " ", 0);</div><div class='del'>-	if (card-&gt;name-&gt;family)</div><div class='del'>-		familyv = g_strsplit (card-&gt;name-&gt;family, " ", 0);</div><div class='del'>-</div><div class='del'>-	fragment_count = 0;</div><div class='del'>-	for (i = 0; givenv &amp;&amp; givenv[i]; ++i)</div><div class='del'>-		++fragment_count;</div><div class='del'>-	for (i = 0; addv &amp;&amp; addv[i]; ++i)</div><div class='del'>-		++fragment_count;</div><div class='del'>-	for (i = 0; familyv &amp;&amp; familyv[i]; ++i)</div><div class='del'>-		++fragment_count;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; namev[i] &amp;&amp; this_part_match != E_CARD_MATCH_PART_NONE; ++i) {</div><div class='del'>-</div><div class='del'>-		if (*namev[i]) {</div><div class='del'>-</div><div class='del'>-			this_part_match = E_CARD_MATCH_PART_NONE;</div><div class='del'>-</div><div class='del'>-			/* When we are allowing partials, we are strict about the matches we allow.</div><div class='del'>-			   Does this make sense?  Not really, but it does the right thing for the purposes</div><div class='del'>-			   of completion. */</div><div class='del'>-</div><div class='del'>-			if (givenv &amp;&amp; this_part_match == E_CARD_MATCH_PART_NONE) {</div><div class='del'>-				for (j = 0; givenv[j]; ++j) {</div><div class='del'>-					if (name_fragment_match_with_synonyms (givenv[j], namev[i], allow_partial_matches)) {</div><div class='del'>-</div><div class='del'>-						this_part_match = E_CARD_MATCH_PART_GIVEN_NAME;</div><div class='del'>-</div><div class='del'>-						/* We remove a piece of a name once it has been matched against, so</div><div class='del'>-						   that "john john" won't match "john doe". */</div><div class='del'>-						g_free (givenv[j]);</div><div class='del'>-						givenv[j] = g_strdup ("");</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (addv &amp;&amp; this_part_match == E_CARD_MATCH_PART_NONE) {</div><div class='del'>-				for (j = 0; addv[j]; ++j) {</div><div class='del'>-					if (name_fragment_match_with_synonyms (addv[j], namev[i], allow_partial_matches)) {</div><div class='del'>-						</div><div class='del'>-						this_part_match = E_CARD_MATCH_PART_ADDITIONAL_NAME;</div><div class='del'>-</div><div class='del'>-						g_free (addv[j]);</div><div class='del'>-						addv[j] = g_strdup ("");</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (familyv &amp;&amp; this_part_match == E_CARD_MATCH_PART_NONE) {</div><div class='del'>-				for (j = 0; familyv[j]; ++j) {</div><div class='del'>-					if (allow_partial_matches ? name_fragment_match_with_synonyms (familyv[j], namev[i], allow_partial_matches)</div><div class='del'>-					    : !g_utf8_strcasecmp (familyv[j], namev[i])) {</div><div class='del'>-</div><div class='del'>-						this_part_match = E_CARD_MATCH_PART_FAMILY_NAME;</div><div class='del'>-</div><div class='del'>-						g_free (familyv[j]);</div><div class='del'>-						familyv[j] = g_strdup ("");</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (this_part_match != E_CARD_MATCH_PART_NONE) {</div><div class='del'>-				++match_count;</div><div class='del'>-				matched_character_count += g_utf8_strlen (namev[i], -1);</div><div class='del'>-				matched_parts |= this_part_match;</div><div class='del'>-				if (first_matched_part == E_CARD_MATCH_PART_NONE)</div><div class='del'>-					first_matched_part = this_part_match;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	match_type = E_CARD_MATCH_NONE;</div><div class='del'>-</div><div class='del'>-	if (this_part_match != E_CARD_MATCH_PART_NONE) {</div><div class='del'>-</div><div class='del'>-		if (match_count &gt; 0)</div><div class='del'>-			match_type = E_CARD_MATCH_VAGUE;</div><div class='del'>-		</div><div class='del'>-		if (fragment_count == match_count) {</div><div class='del'>-</div><div class='del'>-			match_type = E_CARD_MATCH_EXACT;</div><div class='del'>-</div><div class='del'>-		} else if (fragment_count == match_count + 1) {</div><div class='del'>-</div><div class='del'>-			match_type = E_CARD_MATCH_PARTIAL;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (matched_parts_out)</div><div class='del'>-		*matched_parts_out = matched_parts;</div><div class='del'>-	if (first_matched_part_out)</div><div class='del'>-		*first_matched_part_out = first_matched_part;</div><div class='del'>-	if (matched_character_count_out)</div><div class='del'>-		*matched_character_count_out = matched_character_count;</div><div class='del'>-</div><div class='del'>-	g_strfreev (namev);</div><div class='del'>-	g_strfreev (givenv);</div><div class='del'>-	g_strfreev (addv);</div><div class='del'>-	g_strfreev (familyv);</div><div class='del'>-</div><div class='del'>-	return match_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_name (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	ECardName *a, *b;</div><div class='del'>-	gint matches=0, possible=0;</div><div class='del'>-	gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	a = card1-&gt;name;</div><div class='del'>-	b = card2-&gt;name;</div><div class='del'>-</div><div class='del'>-	if (a == NULL || b == NULL)</div><div class='del'>-		return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-</div><div class='del'>-	if (a-&gt;given &amp;&amp; b-&gt;given) {</div><div class='del'>-		++possible;</div><div class='del'>-		if (name_fragment_match_with_synonyms (a-&gt;given, b-&gt;given, FALSE /* both inputs are complete */)) {</div><div class='del'>-			++matches;</div><div class='del'>-			given_match = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;additional &amp;&amp; b-&gt;additional) {</div><div class='del'>-		++possible;</div><div class='del'>-		if (name_fragment_match_with_synonyms (a-&gt;additional, b-&gt;additional, FALSE /* both inputs are complete */)) {</div><div class='del'>-			++matches;</div><div class='del'>-			additional_match = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (a-&gt;family &amp;&amp; b-&gt;family) {</div><div class='del'>-		++possible;</div><div class='del'>-		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */</div><div class='del'>-		if (! g_utf8_strcasecmp (a-&gt;family, b-&gt;family)) {</div><div class='del'>-			++matches;</div><div class='del'>-			family_match = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now look at the # of matches and try to intelligently map</div><div class='del'>-	   an E_CARD_MATCH_* type to it.  Special consideration is given</div><div class='del'>-	   to family-name matches. */</div><div class='del'>-</div><div class='del'>-	if (possible == 0)</div><div class='del'>-		return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-</div><div class='del'>-	if (possible == 1)</div><div class='del'>-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;</div><div class='del'>-</div><div class='del'>-	if (possible == matches)</div><div class='del'>-		return family_match ? E_CARD_MATCH_EXACT : E_CARD_MATCH_PARTIAL;</div><div class='del'>-</div><div class='del'>-	if (possible == matches+1)</div><div class='del'>-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;</div><div class='del'>-</div><div class='del'>-	return E_CARD_MATCH_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** Nickname Comparisons ***/</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_nickname (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card1 &amp;&amp; E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card2 &amp;&amp; E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** E-mail Comparisons ***/</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-match_email_username (const gchar *addr1, const gchar *addr2)</div><div class='del'>-{</div><div class='del'>-	gint c1, c2;</div><div class='del'>-	if (addr1 == NULL || addr2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	while (*addr1 &amp;&amp; *addr2 &amp;&amp; *addr1 != '@' &amp;&amp; *addr2 != '@') {</div><div class='del'>-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;</div><div class='del'>-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;</div><div class='del'>-		if (c1 != c2)</div><div class='del'>-			return FALSE;</div><div class='del'>-		++addr1;</div><div class='del'>-		++addr2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return *addr1 == *addr2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-match_email_hostname (const gchar *addr1, const gchar *addr2)</div><div class='del'>-{</div><div class='del'>-	gint c1, c2;</div><div class='del'>-	gboolean seen_at1, seen_at2;</div><div class='del'>-	if (addr1 == NULL || addr2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Walk to the end of each string. */</div><div class='del'>-	seen_at1 = FALSE;</div><div class='del'>-	if (*addr1) {</div><div class='del'>-		while (*addr1) {</div><div class='del'>-			if (*addr1 == '@')</div><div class='del'>-				seen_at1 = TRUE;</div><div class='del'>-			++addr1;</div><div class='del'>-		}</div><div class='del'>-		--addr1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	seen_at2 = FALSE;</div><div class='del'>-	if (*addr2) {</div><div class='del'>-		while (*addr2) {</div><div class='del'>-			if (*addr2 == '@')</div><div class='del'>-				seen_at2 = TRUE;</div><div class='del'>-			++addr2;</div><div class='del'>-		}</div><div class='del'>-		--addr2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!seen_at1 &amp;&amp; !seen_at2)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (!seen_at1 || !seen_at2)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	while (*addr1 != '@' &amp;&amp; *addr2 != '@') {</div><div class='del'>-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;</div><div class='del'>-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;</div><div class='del'>-		if (c1 != c2)</div><div class='del'>-			return FALSE;</div><div class='del'>-		--addr1;</div><div class='del'>-		--addr2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This will match bob@foo.ximian.com and bob@ximian.com */</div><div class='del'>-	return *addr1 == '.' || *addr2 == '.';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardMatchType</div><div class='del'>-compare_email_addresses (const gchar *addr1, const gchar *addr2)</div><div class='del'>-{</div><div class='del'>-	if (addr1 == NULL || addr2 == NULL)</div><div class='del'>-		return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-</div><div class='del'>-	if (match_email_username (addr1, addr2)) </div><div class='del'>-		return match_email_hostname (addr1, addr2) ? E_CARD_MATCH_EXACT : E_CARD_MATCH_VAGUE;</div><div class='del'>-</div><div class='del'>-	return E_CARD_MATCH_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_email (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	EIterator *i1, *i2;</div><div class='del'>-	ECardMatchType match = E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (card1 &amp;&amp; E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card2 &amp;&amp; E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	if (card1-&gt;email == NULL || card2-&gt;email == NULL)</div><div class='del'>-		return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-</div><div class='del'>-	i1 = e_list_get_iterator (card1-&gt;email);</div><div class='del'>-	i2 = e_list_get_iterator (card2-&gt;email);</div><div class='del'>-</div><div class='del'>-	/* Do pairwise-comparisons on all of the e-mail addresses.  If</div><div class='del'>-	   we find an exact match, there is no reason to keep</div><div class='del'>-	   checking. */</div><div class='del'>-	e_iterator_reset (i1);</div><div class='del'>-	while (e_iterator_is_valid (i1) &amp;&amp; match != E_CARD_MATCH_EXACT) {</div><div class='del'>-		const gchar *addr1 = (const gchar *) e_iterator_get (i1);</div><div class='del'>-</div><div class='del'>-		e_iterator_reset (i2);</div><div class='del'>-		while (e_iterator_is_valid (i2) &amp;&amp; match != E_CARD_MATCH_EXACT) {</div><div class='del'>-			const gchar *addr2 = (const gchar *) e_iterator_get (i2);</div><div class='del'>-</div><div class='del'>-			match = combine_comparisons (match, compare_email_addresses (addr1, addr2));</div><div class='del'>-			</div><div class='del'>-			e_iterator_next (i2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_iterator_next (i1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (i1));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (i2));</div><div class='del'>-</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_address (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card1 &amp;&amp; E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card2 &amp;&amp; E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	/* Unimplemented */</div><div class='del'>-</div><div class='del'>-	return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare_telephone (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card1 &amp;&amp; E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card2 &amp;&amp; E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	/* Unimplemented */</div><div class='del'>-</div><div class='del'>-	return E_CARD_MATCH_NOT_APPLICABLE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardMatchType</div><div class='del'>-e_card_compare (ECard *card1, ECard *card2)</div><div class='del'>-{</div><div class='del'>-	ECardMatchType result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (card1 &amp;&amp; E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-	g_return_val_if_fail (card2 &amp;&amp; E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);</div><div class='del'>-</div><div class='del'>-	result = E_CARD_MATCH_NONE;</div><div class='del'>-	result = combine_comparisons (result, e_card_compare_name      (card1, card2));</div><div class='del'>-	result = combine_comparisons (result, e_card_compare_nickname  (card1, card2));</div><div class='del'>-	result = combine_comparisons (result, e_card_compare_email     (card1, card2));</div><div class='del'>-	result = combine_comparisons (result, e_card_compare_address   (card1, card2));</div><div class='del'>-	result = combine_comparisons (result, e_card_compare_telephone (card1, card2));</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct _MatchSearchInfo MatchSearchInfo;</div><div class='del'>-struct _MatchSearchInfo {</div><div class='del'>-	ECard *card;</div><div class='del'>-	GList *avoid;</div><div class='del'>-	ECardMatchQueryCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-match_search_info_free (MatchSearchInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (info-&gt;card));</div><div class='del'>-</div><div class='del'>-		/* This should already have been deallocated, but just in case... */</div><div class='del'>-		if (info-&gt;avoid) {</div><div class='del'>-			g_list_foreach (info-&gt;avoid, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-			g_list_free (info-&gt;avoid);</div><div class='del'>-			info-&gt;avoid = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MatchSearchInfo *info = (MatchSearchInfo *) closure;</div><div class='del'>-	ECardMatchType best_match = E_CARD_MATCH_NONE;</div><div class='del'>-	ECard *best_card = NULL;</div><div class='del'>-	GList *remaining_cards = NULL;</div><div class='del'>-	const GList *i;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {</div><div class='del'>-		info-&gt;cb (info-&gt;card, NULL, E_CARD_MATCH_NONE, info-&gt;closure);</div><div class='del'>-		match_search_info_free (info);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* remove the cards we're to avoid from the list, if they're present */</div><div class='del'>-	for (i = cards; i != NULL; i = g_list_next (i)) {</div><div class='del'>-		ECard *this_card = E_CARD (i-&gt;data);</div><div class='del'>-		GList *iterator;</div><div class='del'>-		gboolean avoid = FALSE;</div><div class='del'>-		for (iterator = info-&gt;avoid; iterator; iterator = iterator-&gt;next) {</div><div class='del'>-			if (!strcmp (e_card_get_id (iterator-&gt;data), e_card_get_id (this_card))) {</div><div class='del'>-				avoid = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!avoid)</div><div class='del'>-			remaining_cards = g_list_prepend (remaining_cards, this_card);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remaining_cards = g_list_reverse (remaining_cards);</div><div class='del'>-</div><div class='del'>-	for (i = remaining_cards; i != NULL; i = g_list_next (i)) {</div><div class='del'>-		ECard *this_card = E_CARD (i-&gt;data);</div><div class='del'>-		ECardMatchType this_match = e_card_compare (info-&gt;card, this_card);</div><div class='del'>-		if ((gint)this_match &gt; (gint)best_match) {</div><div class='del'>-			best_match = this_match;</div><div class='del'>-			best_card  = this_card;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (remaining_cards);</div><div class='del'>-</div><div class='del'>-	info-&gt;cb (info-&gt;card, best_card, best_match, info-&gt;closure);</div><div class='del'>-	match_search_info_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define MAX_QUERY_PARTS 10</div><div class='del'>-static void</div><div class='del'>-use_common_book_cb (EBook *book, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MatchSearchInfo *info = (MatchSearchInfo *) closure;</div><div class='del'>-	ECard *card = info-&gt;card;</div><div class='del'>-	gchar *query_parts[MAX_QUERY_PARTS];</div><div class='del'>-	gint p=0;</div><div class='del'>-	gchar *query, *qj;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (book == NULL) {</div><div class='del'>-		info-&gt;cb (info-&gt;card, NULL, E_CARD_MATCH_NONE, info-&gt;closure);</div><div class='del'>-		match_search_info_free (info);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;nickname)</div><div class='del'>-		query_parts[p++] = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", card-&gt;nickname);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (card-&gt;name-&gt;given &amp;&amp; strlen (card-&gt;name-&gt;given) &gt; 1)</div><div class='del'>-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card-&gt;name-&gt;given);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;name-&gt;additional &amp;&amp; strlen (card-&gt;name-&gt;additional) &gt; 1)</div><div class='del'>-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card-&gt;name-&gt;additional);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;name-&gt;family &amp;&amp; strlen (card-&gt;name-&gt;family) &gt; 1)</div><div class='del'>-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card-&gt;name-&gt;family);</div><div class='del'>-</div><div class='del'>-		</div><div class='del'>-	if (card-&gt;email) {</div><div class='del'>-		EIterator *iter = e_list_get_iterator (card-&gt;email);</div><div class='del'>-		while (e_iterator_is_valid (iter) &amp;&amp; p &lt; MAX_QUERY_PARTS) {</div><div class='del'>-			gchar *addr = g_strdup (e_iterator_get (iter));</div><div class='del'>-			if (addr) {</div><div class='del'>-				gchar *s = addr;</div><div class='del'>-				while (*s) {</div><div class='del'>-					if (*s == '@') {</div><div class='del'>-						*s = '\0';</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-					++s;</div><div class='del'>-				}</div><div class='del'>-				query_parts[p++] = g_strdup_printf ("(beginswith \"email\" \"%s\")", addr);</div><div class='del'>-				g_free (addr);</div><div class='del'>-			}</div><div class='del'>-			e_iterator_next (iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* Build up our full query from the parts. */</div><div class='del'>-	query_parts[p] = NULL;</div><div class='del'>-	qj = g_strjoinv (" ", query_parts);</div><div class='del'>-	for(i = 0; query_parts[i] != NULL; i++)</div><div class='del'>-		g_free(query_parts[i]);</div><div class='del'>-	if (p &gt; 0) {</div><div class='del'>-		query = g_strdup_printf ("(or %s)", qj);</div><div class='del'>-		g_free (qj);</div><div class='del'>-	} else {</div><div class='del'>-		query = qj;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_simple_query (book, query, simple_query_cb, info);</div><div class='del'>-</div><div class='del'>-	g_free (query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_locate_match (ECard *card, ECardMatchQueryCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MatchSearchInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	info = g_new (MatchSearchInfo, 1);</div><div class='del'>-	info-&gt;card = card;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (card));</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-	info-&gt;avoid = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_use_local_address_book (use_common_book_cb, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_locate_match_full:</div><div class='del'>- * @book: The book to look in.  If this is NULL, use the main local</div><div class='del'>- * addressbook.</div><div class='del'>- * @card: The card to compare to.</div><div class='del'>- * @avoid: A list of cards to not match.  These will not show up in the search.</div><div class='del'>- * @cb: The function to call.</div><div class='del'>- * @closure: The closure to add to the call.</div><div class='del'>- * </div><div class='del'>- * Look for the best match and return it using the ECardMatchQueryCallback.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MatchSearchInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	info = g_new (MatchSearchInfo, 1);</div><div class='del'>-	info-&gt;card = card;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (card));</div><div class='del'>-	info-&gt;cb = cb;</div><div class='del'>-	info-&gt;closure = closure;</div><div class='del'>-	info-&gt;avoid = g_list_copy (avoid);</div><div class='del'>-	g_list_foreach (info-&gt;avoid, (GFunc) gtk_object_ref, NULL);</div><div class='del'>-</div><div class='del'>-	if (book)</div><div class='del'>-		use_common_book_cb (book, info);</div><div class='del'>-	else</div><div class='del'>-		e_book_use_local_address_book (use_common_book_cb, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h<br/>deleted file mode 100644<br/>index 07ccb54e89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-compare.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-compare.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-card-compare.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_COMPARE_H__</div><div class='del'>-#define __E_CARD_COMPARE_H__</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-#include "e-card.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_CARD_MATCH_NOT_APPLICABLE = 0,</div><div class='del'>-	E_CARD_MATCH_NONE           = 1,</div><div class='del'>-	E_CARD_MATCH_VAGUE          = 2,</div><div class='del'>-	E_CARD_MATCH_PARTIAL        = 3,</div><div class='del'>-	E_CARD_MATCH_EXACT          = 4</div><div class='del'>-} ECardMatchType;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_CARD_MATCH_PART_NOT_APPLICABLE   = -1,</div><div class='del'>-	E_CARD_MATCH_PART_NONE             = 0,</div><div class='del'>-	E_CARD_MATCH_PART_GIVEN_NAME       = 1&lt;&lt;0,</div><div class='del'>-	E_CARD_MATCH_PART_ADDITIONAL_NAME  = 1&lt;&lt;2,</div><div class='del'>-	E_CARD_MATCH_PART_FAMILY_NAME      = 1&lt;&lt;3</div><div class='del'>-} ECardMatchPart;</div><div class='del'>-</div><div class='del'>-typedef void (*ECardMatchQueryCallback) (ECard *card, ECard *match, ECardMatchType type, gpointer closure);</div><div class='del'>-</div><div class='del'>-ECardMatchType e_card_compare_name_to_string      (ECard *card, const gchar *str);</div><div class='del'>-</div><div class='del'>-ECardMatchType e_card_compare_name_to_string_full (ECard *card, const gchar *str,</div><div class='del'>-						   gboolean allow_partial_matches,</div><div class='del'>-						   gint *matched_parts, ECardMatchPart *first_matched_part,</div><div class='del'>-						   gint *matched_character_count);</div><div class='del'>-</div><div class='del'>-ECardMatchType e_card_compare_name      (ECard *card1, ECard *card2);</div><div class='del'>-ECardMatchType e_card_compare_nickname  (ECard *card1, ECard *card2);</div><div class='del'>-ECardMatchType e_card_compare_email     (ECard *card1, ECard *card2);</div><div class='del'>-ECardMatchType e_card_compare_address   (ECard *card1, ECard *card2);</div><div class='del'>-ECardMatchType e_card_compare_telephone (ECard *card1, ECard *card2);</div><div class='del'>-</div><div class='del'>-ECardMatchType e_card_compare           (ECard *card1, ECard *card2);</div><div class='del'>-</div><div class='del'>-void           e_card_locate_match      (ECard *card, ECardMatchQueryCallback cb, gpointer closure);</div><div class='del'>-void           e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CARD_COMPARE_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c<br/>deleted file mode 100644<br/>index 171f83d736..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-cursor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-cursor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,235 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * e-card-cursor.c: Implements card cursors.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "e-card-cursor.h"</div><div class='del'>-</div><div class='del'>-struct _ECardCursorPrivate {</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A pointer to our parent object class</div><div class='del'>- */</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Implemented GtkObject::destroy</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_cursor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardCursor *cursor = E_CARD_CURSOR (object);</div><div class='del'>-	CORBA_Environment      ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor_unref( cursor-&gt;priv-&gt;corba_cursor, &amp;ev );</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("e_card_cursor_destroy: Exception unreffing "</div><div class='del'>-			  "corba cursor.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_Object_release (cursor-&gt;priv-&gt;corba_cursor, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("e_card_cursor_destroy: Exception releasing "</div><div class='del'>-			  "corba cursor.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if ( cursor-&gt;priv )</div><div class='del'>-		g_free ( cursor-&gt;priv );</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_cursor_get_length:</div><div class='del'>- * @cursor: the #ECardCursor whose length is being queried</div><div class='del'>- *</div><div class='del'>- * Returns: the number of items the cursor references, or -1 there's</div><div class='del'>- * an error.</div><div class='del'>- */</div><div class='del'>-long</div><div class='del'>-e_card_cursor_get_length (ECardCursor *cursor)</div><div class='del'>-{</div><div class='del'>-	if ( cursor-&gt;priv-&gt;corba_cursor != CORBA_OBJECT_NIL ) {</div><div class='del'>-		CORBA_Environment      ev;</div><div class='del'>-		long ret_val;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		ret_val = GNOME_Evolution_Addressbook_CardCursor_count (cursor-&gt;priv-&gt;corba_cursor, &amp;ev);</div><div class='del'>-		</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning("e_card_cursor_get_length: Exception during "</div><div class='del'>-				  "get_length corba call.\n");</div><div class='del'>-			ret_val = -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return ret_val;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_cursor_get_nth:</div><div class='del'>- * @cursor: an #ECardCursor object</div><div class='del'>- * @n: the index of the item requested</div><div class='del'>- *</div><div class='del'>- * Gets an #ECard based on an index.</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ECard on success, or %NULL on failure.</div><div class='del'>- */</div><div class='del'>-ECard *</div><div class='del'>-e_card_cursor_get_nth (ECardCursor *cursor,</div><div class='del'>-		       const long   n)</div><div class='del'>-{</div><div class='del'>-	if ( cursor-&gt;priv-&gt;corba_cursor != CORBA_OBJECT_NIL ) {</div><div class='del'>-		CORBA_Environment      en;</div><div class='del'>-		CORBA_char *vcard;</div><div class='del'>-		ECard *card;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;en);</div><div class='del'>-</div><div class='del'>-		vcard = GNOME_Evolution_Addressbook_CardCursor_getNth(cursor-&gt;priv-&gt;corba_cursor, n, &amp;en);</div><div class='del'>-		</div><div class='del'>-		if (en._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning("e_card_cursor_get_nth: Exception during "</div><div class='del'>-				  "get_nth corba call.\n");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;en);</div><div class='del'>-</div><div class='del'>-		card = e_card_new (vcard);</div><div class='del'>-</div><div class='del'>-		CORBA_free(vcard);</div><div class='del'>-</div><div class='del'>-		return card;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return e_card_new("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_cursor_class_init (ECardCursorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_card_cursor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_cursor_init (ECardCursor *cursor)</div><div class='del'>-{</div><div class='del'>-	cursor-&gt;priv = g_new(ECardCursorPrivate, 1);</div><div class='del'>-	cursor-&gt;priv-&gt;corba_cursor = CORBA_OBJECT_NIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_card_cursor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"ECardCursor",</div><div class='del'>-			sizeof (ECardCursor),</div><div class='del'>-			sizeof (ECardCursorClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_cursor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_cursor_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_cursor_construct:</div><div class='del'>- * @cursor: an #ECardCursor object</div><div class='del'>- * @corba_cursor: an #GNOME_Evolution_Addressbook_CardCursor</div><div class='del'>- *</div><div class='del'>- * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor</div><div class='del'>- * @cursor object.</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ECardCursor on success, or %NULL on failure.</div><div class='del'>- */</div><div class='del'>-ECardCursor *</div><div class='del'>-e_card_cursor_construct (ECardCursor          *cursor,</div><div class='del'>-			 GNOME_Evolution_Addressbook_CardCursor  corba_cursor)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment      ev;</div><div class='del'>-	g_return_val_if_fail (cursor != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD_CURSOR (cursor), NULL);</div><div class='del'>-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize cursor</div><div class='del'>-	 */</div><div class='del'>-	cursor-&gt;priv-&gt;corba_cursor = CORBA_Object_duplicate(corba_cursor, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("e_card_cursor_construct: Exception duplicating "</div><div class='del'>-			  "corba cursor.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor_ref(cursor-&gt;priv-&gt;corba_cursor, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("e_card_cursor_construct: Exception reffing "</div><div class='del'>-			  "corba cursor.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Success: return the GtkType we were given</div><div class='del'>-	 */</div><div class='del'>-	return cursor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_cursor_new:</div><div class='del'>- * @cursor: the #GNOME_Evolution_Addressbook_CardCursor to be wrapped</div><div class='del'>- *</div><div class='del'>- * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor</div><div class='del'>- * object.</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ECardCursor on success, or %NULL on failure.</div><div class='del'>- */</div><div class='del'>-ECardCursor *</div><div class='del'>-e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor)</div><div class='del'>-{</div><div class='del'>-	ECardCursor *cursor;</div><div class='del'>-</div><div class='del'>-	cursor = gtk_type_new (e_card_cursor_get_type ());</div><div class='del'>-	</div><div class='del'>-	return e_card_cursor_construct (cursor,</div><div class='del'>-					corba_cursor);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h<br/>deleted file mode 100644<br/>index e042268635..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-cursor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-cursor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_CURSOR_H__</div><div class='del'>-#define __E_CARD_CURSOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/addressbook.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _ECardCursor        ECardCursor;</div><div class='del'>-typedef struct _ECardCursorPrivate ECardCursorPrivate;</div><div class='del'>-typedef struct _ECardCursorClass   ECardCursorClass;</div><div class='del'>-</div><div class='del'>-struct _ECardCursor {</div><div class='del'>-	GtkObject           parent;</div><div class='del'>-	ECardCursorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardCursorClass {</div><div class='del'>-	GtkObjectClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-ECardCursor *e_card_cursor_new       (GNOME_Evolution_Addressbook_CardCursor  corba_cursor);</div><div class='del'>-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,</div><div class='del'>-				      GNOME_Evolution_Addressbook_CardCursor  corba_cursor);</div><div class='del'>-</div><div class='del'>-GtkType      e_card_cursor_get_type    (void);</div><div class='del'>-</div><div class='del'>-/* Fetching cards. */</div><div class='del'>-long         e_card_cursor_get_length  (ECardCursor          *cursor);</div><div class='del'>-ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,</div><div class='del'>-					const long            nth);</div><div class='del'>-#define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())</div><div class='del'>-#define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))</div><div class='del'>-#define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))</div><div class='del'>-#define E_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE))</div><div class='del'>-#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_CURSOR_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h<br/>deleted file mode 100644<br/>index f82f948ebb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-pairs.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-pairs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,118 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* GnomeCard - a graphical contact manager.</div><div class='del'>- *</div><div class='del'>- * pairs.h: This file is part of GnomeCard.</div><div class='del'>- * </div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_PAIRS_H__</div><div class='del'>-#define __E_CARD_PAIRS_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libversit/vcc.h&gt;</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-struct pair</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	ECardPropertyType i ;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct pair prop_lookup[] = {</div><div class='del'>-		{        VCFullNameProp, PROP_FNAME },</div><div class='del'>-		{            VCNameProp, PROP_NAME },</div><div class='del'>-		{           VCPhotoProp, PROP_PHOTO },</div><div class='del'>-		{       VCBirthDateProp, PROP_BDAY },</div><div class='del'>-		{             VCAdrProp, PROP_DELADDR },</div><div class='del'>-		{   VCDeliveryLabelProp, PROP_DELLABEL },</div><div class='del'>-		{       VCTelephoneProp, PROP_PHONE },</div><div class='del'>-		{    VCEmailAddressProp, PROP_EMAIL },</div><div class='del'>-		{          VCMailerProp, PROP_MAILER },</div><div class='del'>-		{        VCTimeZoneProp, PROP_TIMEZN },</div><div class='del'>-		{             VCGeoProp, PROP_GEOPOS },</div><div class='del'>-		{           VCTitleProp, PROP_TITLE },</div><div class='del'>-		{    VCBusinessRoleProp, PROP_ROLE },</div><div class='del'>-		{            VCLogoProp, PROP_LOGO },</div><div class='del'>-		{           VCAgentProp, PROP_AGENT },</div><div class='del'>-		{             VCOrgProp, PROP_ORG },</div><div class='del'>-		{      VCCategoriesProp, PROP_CATEGORIES },</div><div class='del'>-		{         VCCommentProp, PROP_COMMENT },</div><div class='del'>-		{     VCLastRevisedProp, PROP_REV },</div><div class='del'>-		{   VCPronunciationProp, PROP_SOUND },</div><div class='del'>-		{             VCURLProp, PROP_URL },</div><div class='del'>-		{    VCUniqueStringProp, PROP_UID },</div><div class='del'>-		{         VCVersionProp, PROP_VERSION },</div><div class='del'>-		{       VCPublicKeyProp, PROP_KEY },</div><div class='del'>-		{           VCValueProp, PROP_VALUE },</div><div class='del'>-		{        VCEncodingProp, PROP_ENCODING },</div><div class='del'>-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },</div><div class='del'>-		{            VC8bitProp, PROP_8BIT },</div><div class='del'>-		{          VCBase64Prop, PROP_BASE64 },</div><div class='del'>-		{        VCLanguageProp, PROP_LANG },</div><div class='del'>-		{         VCCharSetProp, PROP_CHARSET },</div><div class='del'>-		{ NULL, PROP_NONE} };</div><div class='del'>-</div><div class='del'>-struct pair photo_pairs[] = {</div><div class='del'>-		{ VCGIFProp, PHOTO_GIF },</div><div class='del'>-		{ VCCGMProp, PHOTO_CGM },</div><div class='del'>-		{ VCWMFProp, PHOTO_WMF },</div><div class='del'>-		{ VCBMPProp, PHOTO_BMP },</div><div class='del'>-		{ VCMETProp, PHOTO_MET },</div><div class='del'>-		{ VCPMBProp, PHOTO_PMB },</div><div class='del'>-		{ VCDIBProp, PHOTO_DIB },</div><div class='del'>-		{ VCPICTProp, PHOTO_PICT },</div><div class='del'>-		{ VCTIFFProp, PHOTO_TIFF },</div><div class='del'>-		{ VCPDFProp, PHOTO_PDF },</div><div class='del'>-		{ VCPSProp, PHOTO_PS },</div><div class='del'>-		{ VCJPEGProp, PHOTO_JPEG },</div><div class='del'>-		{ VCMPEGProp, PHOTO_MPEG },</div><div class='del'>-		{ VCMPEG2Prop, PHOTO_MPEG2 },</div><div class='del'>-		{ VCAVIProp, PHOTO_AVI },</div><div class='del'>-		{ VCQuickTimeProp, PHOTO_QTIME },</div><div class='del'>-		{ NULL, 0 } };</div><div class='del'>-</div><div class='del'>-struct pair email_pairs[] = {</div><div class='del'>-		{ VCAOLProp, EMAIL_AOL },</div><div class='del'>-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },</div><div class='del'>-		{ VCATTMailProp, EMAIL_ATT },</div><div class='del'>-		{ VCCISProp, EMAIL_CIS },</div><div class='del'>-		{ VCEWorldProp, EMAIL_EWORLD },</div><div class='del'>-		{ VCInternetProp, EMAIL_INET },</div><div class='del'>-		{ VCIBMMailProp, EMAIL_IBM },</div><div class='del'>-		{ VCMCIMailProp, EMAIL_MCI },</div><div class='del'>-		{ VCPowerShareProp, EMAIL_POWERSHARE },</div><div class='del'>-		{ VCProdigyProp, EMAIL_PRODIGY },</div><div class='del'>-		{ VCTLXProp, EMAIL_TLX },</div><div class='del'>-		{ VCX400Prop, EMAIL_X400 },</div><div class='del'>-		{ NULL, 0 } };</div><div class='del'>-</div><div class='del'>-struct pair sound_pairs[] = {</div><div class='del'>-		{ VCAIFFProp, SOUND_AIFF },</div><div class='del'>-		{ VCPCMProp, SOUND_PCM },</div><div class='del'>-		{ VCWAVEProp, SOUND_WAVE },</div><div class='del'>-		{ NULL, 0 } };</div><div class='del'>-</div><div class='del'>-struct pair key_pairs[] = {</div><div class='del'>-		{ VCX509Prop, KEY_X509 },</div><div class='del'>-		{ VCPGPProp, KEY_PGP },</div><div class='del'>-		{ NULL, 0 } };</div><div class='del'>-	  </div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-#endif /* ! __E_CARD_PAIRS_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c<br/>deleted file mode 100644<br/>index 2bf06c8cd9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-simple.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1274 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Chris Lahey     &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Arturo Espinosa (arturo@nuclecu.unam.mx)</div><div class='del'>- *   Nat Friedman    (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libversit/vcc.h&gt;</div><div class='del'>-#include "e-card-simple.h"</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum _ECardSimpleInternalType ECardSimpleInternalType;</div><div class='del'>-typedef struct _ECardSimpleFieldData ECardSimpleFieldData;</div><div class='del'>-</div><div class='del'>-enum _ECardSimpleInternalType {</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_STRING,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_DATE,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_PHONE,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,</div><div class='del'>-	E_CARD_SIMPLE_INTERNAL_TYPE_BOOL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardSimpleFieldData {</div><div class='del'>-	ECardSimpleField         field;</div><div class='del'>-	char                    *ecard_field;</div><div class='del'>-	char                    *name;</div><div class='del'>-	char                    *short_name;</div><div class='del'>-	int                      list_type_index;</div><div class='del'>-	ECardSimpleInternalType  type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This order must match the order in the .h. */</div><div class='del'>-</div><div class='del'>-/* the ecard_field data below should only be used for TYPE_STRING,</div><div class='del'>-   TYPE_DATE, and TYPE_SPECIAL fields.  that is, it's only valid for</div><div class='del'>-   e-cards for those types.  it is used as a unique name for fields</div><div class='del'>-   for the get_supported functionality.  */</div><div class='del'>-static ECardSimpleFieldData field_data[] =</div><div class='del'>-{</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",         N_("File As"),       "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",       N_("Name"),          N_("Name"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "email",           N_("Email"),         N_("Email"),    E_CARD_SIMPLE_EMAIL_ID_EMAIL,        E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone",   N_("Primary"),       N_("Prim"),     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", N_("Assistant"),     N_("Assistant"),E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone",  N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone",  N_("Callback"),      N_("Callback"), E_CARD_SIMPLE_PHONE_ID_CALLBACK,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone",   N_("Company"),       N_("Comp"),     E_CARD_SIMPLE_PHONE_ID_COMPANY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone",      N_("Home"),          N_("Home"),     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",             N_("Organization"),  N_("Org"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "business_address",N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "home_address",    N_("Home"),          N_("Home"),     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone",    N_("Mobile"),        N_("Mobile"),   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone",       N_("Car"),           N_("Car"),      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax",    N_("Business Fax"),  N_("Bus Fax"),  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax",        N_("Home Fax"),      N_("Home Fax"), E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "business_phone_2",N_("Business 2"),    N_("Bus 2"),    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "home_phone_2",    N_("Home 2"),        N_("Home 2"),   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn",            N_("ISDN"),          N_("ISDN"),     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone",     N_("Other"),         N_("Other"),    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,    "other_fax",       N_("Other Fax"),     N_("Other Fax"), E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager",           N_("Pager"),         N_("Pager"),    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio",           N_("Radio"),         N_("Radio"),    E_CARD_SIMPLE_PHONE_ID_RADIO,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex",           N_("Telex"),         N_("Telex"),    E_CARD_SIMPLE_PHONE_ID_TELEX,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,       "tty",             N_("TTY"),           N_("TTY"),      E_CARD_SIMPLE_PHONE_ID_TTYTDD,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "other_address",   N_("Other"),         N_("Other"),    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "email_2",         N_("Email 2"),       N_("Email 2"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "email_3",         N_("Email 3"),       N_("Email 3"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_URL,                "url",             N_("Web Site"),      N_("Url"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",        N_("Department"),    N_("Dep"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",          N_("Office"),        N_("Off"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",           N_("Title"),         N_("Title"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",            N_("Profession"),    N_("Prof"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",         N_("Manager"),       N_("Man"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",       N_("Assistant"),     N_("Ass"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",        N_("Nickname"),      N_("Nick"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",          N_("Spouse"),        N_("Spouse"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",            N_("Note"),          N_("Note"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_CALURI,             "caluri",          N_("Calendar URI"),  N_("CALUri"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",           N_("Free-busy URL"), N_("FBUrl"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary",     N_("Anniversary"),   N_("Anniv"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",      N_("Birth Date"),    "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",          "",                  "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",       "",                  "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_CATEGORIES,         "categories",      N_("Categories"),    N_("Categories"), 0,                                 E_CARD_SIMPLE_INTERNAL_TYPE_STRING },</div><div class='del'>-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name",     N_("Family Name"),   N_("Family Name"), 0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_GIVEN_NAME,         "given_name",      "Given Name",    "Given Name",  0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,    "additional_name",  "Additional Name", "Additional Name",  0,                        E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_NAME_SUFFIX,        "name_suffix",     "Name Suffix",   "Name Suffix",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_WANTS_HTML,         "wants_html",      "Wants HTML",    "Wants HTML",   0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },</div><div class='del'>- 	{ E_CARD_SIMPLE_FIELD_IS_LIST,            "list",            "Is List",       "Is List",      0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },</div><div class='del'>-};</div><div class='del'>-static int field_data_count = sizeof (field_data) / sizeof (field_data[0]);</div><div class='del'>-</div><div class='del'>-static void e_card_simple_init (ECardSimple *simple);</div><div class='del'>-static void e_card_simple_class_init (ECardSimpleClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_card_simple_destroy (GtkObject *object);</div><div class='del'>-static void e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void fill_in_info(ECardSimple *simple);</div><div class='del'>-</div><div class='del'>-ECardPhoneFlags phone_correspondences[] = {</div><div class='del'>-	E_CARD_PHONE_ASSISTANT, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */</div><div class='del'>-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */</div><div class='del'>-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */</div><div class='del'>-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */</div><div class='del'>-	E_CARD_PHONE_CALLBACK, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */</div><div class='del'>-	E_CARD_PHONE_CAR, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */</div><div class='del'>-	E_CARD_PHONE_WORK, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */</div><div class='del'>-	E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */</div><div class='del'>-	E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */</div><div class='del'>-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */</div><div class='del'>-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */</div><div class='del'>-	E_CARD_PHONE_CELL, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */</div><div class='del'>-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */</div><div class='del'>-	E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */</div><div class='del'>-	E_CARD_PHONE_PAGER, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */</div><div class='del'>-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */</div><div class='del'>-	E_CARD_PHONE_RADIO, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */</div><div class='del'>-	E_CARD_PHONE_TELEX, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */</div><div class='del'>-	E_CARD_PHONE_TTYTDD, /* E_CARD_SIMPLE_PHONE_ID_TTYTDD,	   */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *phone_names[] = {</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */</div><div class='del'>-	"Business",</div><div class='del'>-	"Business 2",</div><div class='del'>-	"Business Fax",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */</div><div class='del'>-	"Car",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */</div><div class='del'>-	"Home",</div><div class='del'>-	"Home 2",</div><div class='del'>-	"Home Fax",</div><div class='del'>-	"ISDN",</div><div class='del'>-	"Mobile",</div><div class='del'>-	"Other",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */</div><div class='del'>-	"Pager",</div><div class='del'>-	"Primary",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTDD,	   */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *phone_short_names[] = {</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */</div><div class='del'>-	"Bus",</div><div class='del'>-	"Bus 2",</div><div class='del'>-	"Bus Fax",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */</div><div class='del'>-	"Car",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */</div><div class='del'>-	"Home",</div><div class='del'>-	"Home 2",</div><div class='del'>-	"Home Fax",</div><div class='del'>-	"ISDN",</div><div class='del'>-	"Mob",</div><div class='del'>-	"Other",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */</div><div class='del'>-	"Pag",</div><div class='del'>-	"Prim",</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */</div><div class='del'>-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTDD,	   */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ECardAddressFlags addr_correspondences[] = {</div><div class='del'>-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */</div><div class='del'>-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */</div><div class='del'>-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *address_names[] = {</div><div class='del'>-	"Business",</div><div class='del'>-	"Home",</div><div class='del'>-	"Other",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ECardSimple class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ECardSimple class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_card_simple_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType simple_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!simple_type) {</div><div class='del'>-		GtkTypeInfo simple_info = {</div><div class='del'>-			"ECardSimple",</div><div class='del'>-			sizeof (ECardSimple),</div><div class='del'>-			sizeof (ECardSimpleClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_simple_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_simple_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		simple_type = gtk_type_unique (gtk_object_get_type (), &amp;simple_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return simple_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ECardSimple that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ECardSimple *</div><div class='del'>-e_card_simple_new (ECard *card)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));</div><div class='del'>-	gtk_object_set(GTK_OBJECT(simple),</div><div class='del'>-		       "card", card,</div><div class='del'>-		       NULL);</div><div class='del'>-	return simple;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardSimple *</div><div class='del'>-e_card_simple_duplicate(ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	ECard *card = simple-&gt;card ? e_card_duplicate (simple-&gt;card) : e_card_new ("");</div><div class='del'>-	ECardSimple *new_simple = e_card_simple_new(card);</div><div class='del'>-	return new_simple;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_get_id:</div><div class='del'>- * @simple: an #ECardSimple</div><div class='del'>- *</div><div class='del'>- * Returns: a string representing the id of the simple, which is unique</div><div class='del'>- * within its book.</div><div class='del'>- */</div><div class='del'>-const char *</div><div class='del'>-e_card_simple_get_id (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card)</div><div class='del'>-		return e_card_get_id(simple-&gt;card);</div><div class='del'>-	else</div><div class='del'>-		return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_get_id:</div><div class='del'>- * @simple: an #ECardSimple</div><div class='del'>- * @id: a id in string format</div><div class='del'>- *</div><div class='del'>- * Sets the identifier of a simple, which should be unique within its</div><div class='del'>- * book.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_card_simple_set_id (ECardSimple *simple, const char *id)</div><div class='del'>-{</div><div class='del'>-	if ( simple-&gt;card )</div><div class='del'>-		e_card_set_id(simple-&gt;card, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_get_vcard:</div><div class='del'>- * @simple: an #ECardSimple</div><div class='del'>- *</div><div class='del'>- * Returns: a string in vcard format, which is wrapped by the @simple.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_card_simple_get_vcard (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card)</div><div class='del'>-		return e_card_get_vcard(simple-&gt;card);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_get_vcard_assume_utf8:</div><div class='del'>- * @simple: an #ECardSimple</div><div class='del'>- *</div><div class='del'>- * Returns: a string in vcard format, which is wrapped by the @simple.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_card_simple_get_vcard_assume_utf8 (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card)</div><div class='del'>-		return e_card_get_vcard_assume_utf8(simple-&gt;card);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_simple_class_init (ECardSimpleClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ECardSimple::card",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_card_simple_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_card_simple_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_card_simple_set_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECardSimple lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_simple_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	simple = E_CARD_SIMPLE (object);</div><div class='del'>-</div><div class='del'>-	if (simple-&gt;card)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(simple-&gt;card));</div><div class='del'>-	g_list_foreach(simple-&gt;temp_fields, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free(simple-&gt;temp_fields);</div><div class='del'>-	simple-&gt;temp_fields = NULL;</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i++)</div><div class='del'>-		e_card_phone_unref (simple-&gt;phone[i]);</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i++)</div><div class='del'>-		g_free(simple-&gt;email[i]);</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)</div><div class='del'>-		e_card_address_label_unref(simple-&gt;address[i]);</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)</div><div class='del'>-		e_card_delivery_address_unref(simple-&gt;delivery[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the simple */</div><div class='del'>-static void</div><div class='del'>-e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	</div><div class='del'>-	simple = E_CARD_SIMPLE (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (simple-&gt;card)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(simple-&gt;card));</div><div class='del'>-		g_list_foreach(simple-&gt;temp_fields, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(simple-&gt;temp_fields);</div><div class='del'>-		simple-&gt;temp_fields = NULL;</div><div class='del'>-		if (GTK_VALUE_OBJECT(*arg))</div><div class='del'>-			simple-&gt;card = E_CARD(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-		else</div><div class='del'>-			simple-&gt;card = NULL;</div><div class='del'>-		if(simple-&gt;card)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(simple-&gt;card));</div><div class='del'>-		fill_in_info(simple);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the simple */</div><div class='del'>-static void</div><div class='del'>-e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	simple = E_CARD_SIMPLE (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		e_card_simple_sync_card(simple);</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) simple-&gt;card;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_simple_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_simple_init (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	simple-&gt;card = NULL;</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i++)</div><div class='del'>-		simple-&gt;phone[i] = NULL;</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i++)</div><div class='del'>-		simple-&gt;email[i] = NULL;</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)</div><div class='del'>-		simple-&gt;address[i] = NULL;</div><div class='del'>-	simple-&gt;temp_fields = NULL;</div><div class='del'>-</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	ECard *card = simple-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		EList *address_list;</div><div class='del'>-		EList *phone_list;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EList *delivery_list;</div><div class='del'>-		const ECardPhone *phone;</div><div class='del'>-		const char *email;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		const ECardDeliveryAddress *delivery;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "address_label", &amp;address_list,</div><div class='del'>-			       "address",       &amp;delivery_list,</div><div class='del'>-			       "phone",         &amp;phone_list,</div><div class='del'>-			       "email",         &amp;email_list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i++) {</div><div class='del'>-			e_card_phone_unref(simple-&gt;phone[i]);</div><div class='del'>-			simple-&gt;phone[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			gboolean found = FALSE;</div><div class='del'>-			phone = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-				if ((phone-&gt;flags == phone_correspondences[i]) &amp;&amp; (simple-&gt;phone[i] == NULL)) {</div><div class='del'>-					simple-&gt;phone[i] = e_card_phone_ref(phone);</div><div class='del'>-					found = TRUE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (found)</div><div class='del'>-				continue;</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-				if (((phone-&gt;flags &amp; phone_correspondences[i]) == phone_correspondences[i]) &amp;&amp; (simple-&gt;phone[i] == NULL)) {</div><div class='del'>-					simple-&gt;phone[i] = e_card_phone_ref(phone);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {</div><div class='del'>-			g_free(simple-&gt;email[i]);</div><div class='del'>-			simple-&gt;email[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			email = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-				if ((simple-&gt;email[i] == NULL)) {</div><div class='del'>-					simple-&gt;email[i] = g_strdup(email);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-			e_card_address_label_unref(simple-&gt;address[i]);</div><div class='del'>-			simple-&gt;address[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			address = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if (((address-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) &amp;&amp; (simple-&gt;address[i] == NULL)) {</div><div class='del'>-					simple-&gt;address[i] = e_card_address_label_ref(address);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-			e_card_delivery_address_unref(simple-&gt;delivery[i]);</div><div class='del'>-			simple-&gt;delivery[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			delivery = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if (((delivery-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) &amp;&amp; (simple-&gt;delivery[i] == NULL)) {</div><div class='del'>-					simple-&gt;delivery[i] = e_card_delivery_address_ref(delivery);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		e_card_free_empty_lists (card);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_simple_sync_card(ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	ECard *card = simple-&gt;card;</div><div class='del'>-	if (card &amp;&amp; simple-&gt;changed) {</div><div class='del'>-		EList *address_list;</div><div class='del'>-		EList *phone_list;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EList *delivery_list;</div><div class='del'>-		const ECardPhone *phone;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		const ECardDeliveryAddress *delivery;</div><div class='del'>-		const char *email;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "address_label", &amp;address_list,</div><div class='del'>-			       "address",       &amp;delivery_list,</div><div class='del'>-			       "phone",         &amp;phone_list,</div><div class='del'>-			       "email",         &amp;email_list,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {</div><div class='del'>-			int i;</div><div class='del'>-			gboolean found = FALSE;</div><div class='del'>-			phone = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-				if (phone-&gt;flags == phone_correspondences[i]) {</div><div class='del'>-					if (simple-&gt;phone[i]) {</div><div class='del'>-						simple-&gt;phone[i]-&gt;flags = phone_correspondences[i];</div><div class='del'>-						if (simple-&gt;phone[i]-&gt;number &amp;&amp; *simple-&gt;phone[i]-&gt;number) {</div><div class='del'>-							e_iterator_set(iterator, simple-&gt;phone[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_iterator_delete(iterator);</div><div class='del'>-						}</div><div class='del'>-						e_card_phone_unref(simple-&gt;phone[i]);</div><div class='del'>-						simple-&gt;phone[i] = NULL;</div><div class='del'>-						found = TRUE;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			if (found)</div><div class='del'>-				continue;</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-				if ((phone-&gt;flags &amp; phone_correspondences[i]) == phone_correspondences[i]) {</div><div class='del'>-					if (simple-&gt;phone[i]) {</div><div class='del'>-						simple-&gt;phone[i]-&gt;flags = phone_correspondences[i];</div><div class='del'>-						if (simple-&gt;phone[i]-&gt;number &amp;&amp; *simple-&gt;phone[i]-&gt;number) {</div><div class='del'>-							e_iterator_set(iterator, simple-&gt;phone[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_iterator_delete(iterator);</div><div class='del'>-						}</div><div class='del'>-						e_card_phone_unref(simple-&gt;phone[i]);</div><div class='del'>-						simple-&gt;phone[i] = NULL;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}	</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-			if (simple-&gt;phone[i]) {</div><div class='del'>-				simple-&gt;phone[i]-&gt;flags = phone_correspondences[i];</div><div class='del'>-				e_list_append(phone_list, simple-&gt;phone[i]);</div><div class='del'>-				e_card_phone_unref(simple-&gt;phone[i]);</div><div class='del'>-				simple-&gt;phone[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {</div><div class='del'>-			int i;</div><div class='del'>-			email = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-				if (simple-&gt;email[i]) {</div><div class='del'>-					if (*simple-&gt;email[i]) {</div><div class='del'>-						e_iterator_set(iterator, simple-&gt;email[i]);</div><div class='del'>-					} else {</div><div class='del'>-						e_iterator_delete(iterator);</div><div class='del'>-					}</div><div class='del'>-					g_free(simple-&gt;email[i]);</div><div class='del'>-					simple-&gt;email[i] = NULL;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}	</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-			if (simple-&gt;email[i]) {</div><div class='del'>-				e_list_append(email_list, simple-&gt;email[i]);</div><div class='del'>-				g_free(simple-&gt;email[i]);</div><div class='del'>-				simple-&gt;email[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {</div><div class='del'>-			int i;</div><div class='del'>-			address = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if ((address-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) {</div><div class='del'>-					if (simple-&gt;address[i]) {</div><div class='del'>-						simple-&gt;address[i]-&gt;flags &amp;= ~E_CARD_ADDR_MASK;</div><div class='del'>-						simple-&gt;address[i]-&gt;flags |= addr_correspondences[i];</div><div class='del'>-						if (simple-&gt;address[i]-&gt;data &amp;&amp; *simple-&gt;address[i]-&gt;data) {</div><div class='del'>-							e_iterator_set(iterator, simple-&gt;address[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_iterator_delete(iterator);</div><div class='del'>-						}</div><div class='del'>-						e_card_address_label_unref(simple-&gt;address[i]);</div><div class='del'>-						simple-&gt;address[i] = NULL;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}	</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-			if (simple-&gt;address[i]) {</div><div class='del'>-				simple-&gt;address[i]-&gt;flags &amp;= ~E_CARD_ADDR_MASK;</div><div class='del'>-				simple-&gt;address[i]-&gt;flags |= addr_correspondences[i];</div><div class='del'>-				e_list_append(address_list, simple-&gt;address[i]);</div><div class='del'>-				e_card_address_label_unref(simple-&gt;address[i]);</div><div class='del'>-				simple-&gt;address[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {</div><div class='del'>-			int i;</div><div class='del'>-			delivery = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if ((delivery-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) {</div><div class='del'>-					if (simple-&gt;delivery[i]) {</div><div class='del'>-						simple-&gt;delivery[i]-&gt;flags &amp;= ~E_CARD_ADDR_MASK;</div><div class='del'>-						simple-&gt;delivery[i]-&gt;flags |= addr_correspondences[i];</div><div class='del'>-						if (!e_card_delivery_address_is_empty(simple-&gt;delivery[i])) {</div><div class='del'>-							e_iterator_set(iterator, simple-&gt;delivery[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_iterator_delete(iterator);</div><div class='del'>-						}</div><div class='del'>-						e_card_delivery_address_unref(simple-&gt;delivery[i]);</div><div class='del'>-						simple-&gt;delivery[i] = NULL;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}	</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-			if (simple-&gt;delivery[i]) {</div><div class='del'>-				simple-&gt;delivery[i]-&gt;flags &amp;= ~E_CARD_ADDR_MASK;</div><div class='del'>-				simple-&gt;delivery[i]-&gt;flags |= addr_correspondences[i];</div><div class='del'>-				e_list_append(delivery_list, simple-&gt;delivery[i]);</div><div class='del'>-				e_card_delivery_address_unref(simple-&gt;delivery[i]);</div><div class='del'>-				simple-&gt;delivery[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		fill_in_info(simple);</div><div class='del'>-		e_card_free_empty_lists (card);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	simple-&gt;changed = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,</div><div class='del'>-						 ECardSimplePhoneId    id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;phone[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char           *e_card_simple_get_email   (ECardSimple          *simple,</div><div class='del'>-						 ECardSimpleEmailId    id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;email[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,</div><div class='del'>-						 ECardSimpleAddressId  id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;address[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,</div><div class='del'>-								ECardSimpleAddressId  id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;delivery[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set_phone   (ECardSimple          *simple,</div><div class='del'>-					   ECardSimplePhoneId    id,</div><div class='del'>-					   const ECardPhone           *phone)</div><div class='del'>-{</div><div class='del'>-	e_card_phone_unref(simple-&gt;phone[id]);</div><div class='del'>-	simple-&gt;phone[id] = e_card_phone_ref(phone);</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set_email   (ECardSimple          *simple,</div><div class='del'>-					   ECardSimpleEmailId    id,</div><div class='del'>-					   const char                 *email)</div><div class='del'>-{</div><div class='del'>-	g_free(simple-&gt;email[id]);</div><div class='del'>-	simple-&gt;email[id] = g_strdup(email);</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_simple_set_address (ECardSimple *simple, ECardSimpleAddressId id, const ECardAddrLabel *address)</div><div class='del'>-{</div><div class='del'>-	e_card_address_label_unref(simple-&gt;address[id]);</div><div class='del'>-	simple-&gt;address[id] = e_card_address_label_ref(address);</div><div class='del'>-	e_card_delivery_address_unref(simple-&gt;delivery[id]);</div><div class='del'>-	simple-&gt;delivery[id] = e_card_delivery_address_from_label(simple-&gt;address[id]);</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set_delivery_address (ECardSimple          *simple,</div><div class='del'>-						    ECardSimpleAddressId  id,</div><div class='del'>-						    const ECardDeliveryAddress *delivery)</div><div class='del'>-{</div><div class='del'>-	e_card_delivery_address_unref(simple-&gt;delivery[id]);</div><div class='del'>-	simple-&gt;delivery[id] = e_card_delivery_address_ref(delivery);</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *e_card_simple_get_const    (ECardSimple          *simple,</div><div class='del'>-					ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	char *ret_val = e_card_simple_get(simple, field);</div><div class='del'>-	if (ret_val)</div><div class='del'>-		simple-&gt;temp_fields = g_list_prepend(simple-&gt;temp_fields, ret_val);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char     *e_card_simple_get            (ECardSimple          *simple,</div><div class='del'>-					ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	const ECardAddrLabel *addr;</div><div class='del'>-	const ECardPhone *phone;</div><div class='del'>-	const char *string;</div><div class='del'>-	ECardDate *date;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-		if (simple-&gt;card) {</div><div class='del'>-			gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-				       field_data[field].ecard_field, &amp;string,</div><div class='del'>-				       NULL);</div><div class='del'>-			return g_strdup(string);</div><div class='del'>-		} else</div><div class='del'>-			return NULL;</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</div><div class='del'>-		if (simple-&gt;card) {</div><div class='del'>-			gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-				       field_data[field].ecard_field, &amp;date,</div><div class='del'>-				       NULL);</div><div class='del'>-			if (date != NULL) {</div><div class='del'>-				char buf[26];</div><div class='del'>-				struct tm then;</div><div class='del'>-				then.tm_year = date-&gt;year;</div><div class='del'>-				then.tm_mon  = date-&gt;month - 1;</div><div class='del'>-				then.tm_mday = date-&gt;day;</div><div class='del'>-				then.tm_hour = 12;</div><div class='del'>-				then.tm_min  = 0;</div><div class='del'>-				then.tm_sec  = 0;</div><div class='del'>-				e_strftime_fix_am_pm (buf, 26, _("%x"), &amp;then);</div><div class='del'>-				return g_strdup (buf);</div><div class='del'>-			} else {</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			return NULL;</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:</div><div class='del'>-		addr = e_card_simple_get_address(simple,</div><div class='del'>-						 field_data[field].list_type_index);</div><div class='del'>-		if (addr)</div><div class='del'>-			return g_strdup(addr-&gt;data);</div><div class='del'>-		else</div><div class='del'>-			return NULL;</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:</div><div class='del'>-		phone = e_card_simple_get_phone(simple,</div><div class='del'>-						field_data[field].list_type_index);</div><div class='del'>-		if (phone)</div><div class='del'>-			return g_strdup(phone-&gt;number);</div><div class='del'>-		else</div><div class='del'>-			return NULL;</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:</div><div class='del'>-		string = e_card_simple_get_email(simple,</div><div class='del'>-						 field_data[field].list_type_index);</div><div class='del'>-		return g_strdup(string);</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:</div><div class='del'>-		if (simple-&gt;card) {</div><div class='del'>-			gboolean boole;</div><div class='del'>-			gtk_object_get (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-					field_data[field].ecard_field, &amp;boole,</div><div class='del'>-					NULL);</div><div class='del'>-			if (boole)</div><div class='del'>-				return "true";</div><div class='del'>-			else</div><div class='del'>-				return NULL;</div><div class='del'>-		} else {</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-		switch (field) {</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-					       "file_as", &amp;string,</div><div class='del'>-					       NULL);</div><div class='del'>-				if (string &amp;&amp; *string)</div><div class='del'>-					return g_strdup(string);</div><div class='del'>-				gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-					       "full_name", &amp;string,</div><div class='del'>-					       NULL);</div><div class='del'>-				if (string &amp;&amp; *string)</div><div class='del'>-					return g_strdup(string);</div><div class='del'>-				gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-					       "org", &amp;string,</div><div class='del'>-					       NULL);</div><div class='del'>-				if (string &amp;&amp; *string)</div><div class='del'>-					return g_strdup(string);</div><div class='del'>-				string = e_card_simple_get_email(simple,</div><div class='del'>-								 E_CARD_SIMPLE_EMAIL_ID_EMAIL); </div><div class='del'>-				return g_strdup(string);</div><div class='del'>-			} else</div><div class='del'>-				return NULL;</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gtk_object_get (GTK_OBJECT(simple-&gt;card),</div><div class='del'>-						"name", &amp;name,</div><div class='del'>-						NULL);</div><div class='del'>-				return g_strdup (name-&gt;family);</div><div class='del'>-			} else</div><div class='del'>-				return NULL;</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_GIVEN_NAME:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gtk_object_get (GTK_OBJECT(simple-&gt;card),</div><div class='del'>-						"name", &amp;name,</div><div class='del'>-						NULL);</div><div class='del'>-				return g_strdup (name-&gt;given);</div><div class='del'>-			} else</div><div class='del'>-				return NULL;</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gtk_object_get (GTK_OBJECT(simple-&gt;card),</div><div class='del'>-						"name", &amp;name,</div><div class='del'>-						NULL);</div><div class='del'>-				return g_strdup (name-&gt;additional);</div><div class='del'>-			} else</div><div class='del'>-				return NULL;</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_NAME_SUFFIX:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gtk_object_get (GTK_OBJECT(simple-&gt;card),</div><div class='del'>-						"name", &amp;name,</div><div class='del'>-						NULL);</div><div class='del'>-				return g_strdup (name-&gt;suffix);</div><div class='del'>-			} else</div><div class='del'>-				return NULL;</div><div class='del'>-		default:</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-name_to_style(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	char *strings[4], **stringptr;</div><div class='del'>-	char *substring;</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(" ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		string = g_strdup(company);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		substring = g_strjoinv(", ", strings);</div><div class='del'>-		if (!(company &amp;&amp; *company))</div><div class='del'>-			company = "";</div><div class='del'>-		if (style == 3)</div><div class='del'>-			string = g_strdup_printf("%s (%s)", substring, company);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup_printf("%s (%s)", company, substring);</div><div class='del'>-		g_free(substring);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		string = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_as_get_style (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);</div><div class='del'>-	char *trystring;</div><div class='del'>-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);</div><div class='del'>-	ECardName *name = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	int style;</div><div class='del'>-	style = 0;</div><div class='del'>-	if (!company)</div><div class='del'>-		company = g_strdup("");</div><div class='del'>-	if (filestring) {</div><div class='del'>-		gtk_object_get (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-				"name", &amp;name,</div><div class='del'>-				NULL);</div><div class='del'>-		</div><div class='del'>-		if (!name) {</div><div class='del'>-			goto end;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		style = -1;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; 5; i++) {</div><div class='del'>-			trystring = name_to_style(name, company, i);</div><div class='del'>-			if (!strcmp(trystring, filestring)) {</div><div class='del'>-				g_free(trystring);</div><div class='del'>-				style = i;</div><div class='del'>-				goto end;</div><div class='del'>-			}</div><div class='del'>-			g_free(trystring);</div><div class='del'>-		}</div><div class='del'>-	}		</div><div class='del'>- end:</div><div class='del'>-		</div><div class='del'>-	g_free(filestring);</div><div class='del'>-	g_free(company);</div><div class='del'>-	</div><div class='del'>-	return style;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_as_set_style(ECardSimple *simple, int style)</div><div class='del'>-{</div><div class='del'>-	if (style != -1) {</div><div class='del'>-		char *string;</div><div class='del'>-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);</div><div class='del'>-		ECardName *name;</div><div class='del'>-</div><div class='del'>-		if (!company)</div><div class='del'>-			company = g_strdup("");</div><div class='del'>-		gtk_object_get (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-				"name", &amp;name,</div><div class='del'>-				NULL);</div><div class='del'>-		if (name) {</div><div class='del'>-			string = name_to_style(name, company, style);</div><div class='del'>-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);</div><div class='del'>-			g_free(string);</div><div class='del'>-		}</div><div class='del'>-		g_free(company);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set            (ECardSimple          *simple,</div><div class='del'>-					      ECardSimpleField      field,</div><div class='del'>-					      const char           *data)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	ECardAddrLabel *address;</div><div class='del'>-	ECardPhone *phone;</div><div class='del'>-	int style;</div><div class='del'>-	simple-&gt;changed = TRUE;</div><div class='del'>-	switch (field) {</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_FULL_NAME:</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_ORG:</div><div class='del'>-		style = file_as_get_style(simple);</div><div class='del'>-		gtk_object_set(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       field_data[field].ecard_field, data,</div><div class='del'>-			       NULL);</div><div class='del'>-		file_as_set_style(simple, style);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		switch(type) {</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-			gtk_object_set(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-				       field_data[field].ecard_field, data,</div><div class='del'>-				       NULL);</div><div class='del'>-			break;</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</div><div class='del'>-			break; /* FIXME!!!! */</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:</div><div class='del'>-			address = e_card_address_label_new();</div><div class='del'>-			address-&gt;data = g_strdup (data);</div><div class='del'>-			e_card_simple_set_address(simple,</div><div class='del'>-						  field_data[field].list_type_index,</div><div class='del'>-						  address);</div><div class='del'>-			e_card_address_label_unref(address);</div><div class='del'>-			break;</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:</div><div class='del'>-			phone = e_card_phone_new();</div><div class='del'>-			phone-&gt;number = g_strdup (data);</div><div class='del'>-			e_card_simple_set_phone(simple,</div><div class='del'>-						field_data[field].list_type_index,</div><div class='del'>-						phone);</div><div class='del'>-			e_card_phone_unref(phone);</div><div class='del'>-			break;</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:</div><div class='del'>-			e_card_simple_set_email(simple,</div><div class='del'>-						field_data[field].list_type_index,</div><div class='del'>-						data);</div><div class='del'>-			break;</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-			break;</div><div class='del'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:</div><div class='del'>-			if (simple-&gt;card) {</div><div class='del'>-				gboolean boole = TRUE;</div><div class='del'>-				if (data == NULL)</div><div class='del'>-					boole = FALSE;</div><div class='del'>-				else if (!strcasecmp (data, "false"))</div><div class='del'>-					boole = FALSE;</div><div class='del'>-				gtk_object_set (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-						field_data[field].ecard_field, boole,</div><div class='del'>-						NULL);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-					     </div><div class='del'>-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,</div><div class='del'>-					  ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:</div><div class='del'>-	default:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_STRING;</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_BOOL;</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_DATE;</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_STRING;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char     *e_card_simple_get_ecard_field (ECardSimple         *simple,</div><div class='del'>-					       ECardSimpleField     field)</div><div class='del'>-{</div><div class='del'>-	return field_data[field].ecard_field;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char     *e_card_simple_get_name       (ECardSimple          *simple,</div><div class='del'>-					      ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	return U_(field_data[field].name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_simple_get_allow_newlines (ECardSimple          *simple,</div><div class='del'>-				  ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-	default:</div><div class='del'>-		switch (field) {</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_NOTE:</div><div class='del'>-			return TRUE;</div><div class='del'>-		default:</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char     *e_card_simple_get_short_name (ECardSimple          *simple,</div><div class='del'>-					      ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	return U_(field_data[field].short_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,</div><div class='del'>-						       ECardSimpleArbitraryCallback *callback,</div><div class='del'>-						       gpointer                      closure)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card) {</div><div class='del'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (callback)</div><div class='del'>-				(*callback) (arbitrary, closure);</div><div class='del'>-		}</div><div class='del'>-		e_card_free_empty_lists (simple-&gt;card);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,</div><div class='del'>-						       const char           *key)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card) {</div><div class='del'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (!strcasecmp(arbitrary-&gt;key, key))</div><div class='del'>-				return arbitrary;</div><div class='del'>-		}</div><div class='del'>-		e_card_free_empty_lists (simple-&gt;card);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Any of these except key can be NULL */	      </div><div class='del'>-void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,</div><div class='del'>-						       const char           *key,</div><div class='del'>-						       const char           *type,</div><div class='del'>-						       const char           *value)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card) {</div><div class='del'>-		ECardArbitrary *new_arb;</div><div class='del'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		simple-&gt;changed = TRUE;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (!strcasecmp(arbitrary-&gt;key, key)) {</div><div class='del'>-				new_arb = e_card_arbitrary_new();</div><div class='del'>-				new_arb-&gt;key = g_strdup(key);</div><div class='del'>-				new_arb-&gt;type = g_strdup(type);</div><div class='del'>-				new_arb-&gt;value = g_strdup(value);</div><div class='del'>-				e_iterator_set(iterator, new_arb);</div><div class='del'>-				e_card_arbitrary_unref(new_arb);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		new_arb = e_card_arbitrary_new();</div><div class='del'>-		new_arb-&gt;key = g_strdup(key);</div><div class='del'>-		new_arb-&gt;type = g_strdup(type);</div><div class='del'>-		new_arb-&gt;value = g_strdup(value);</div><div class='del'>-		e_list_append(list, new_arb);</div><div class='del'>-		e_card_arbitrary_unref(new_arb);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_simple_set_name (ECardSimple *simple, ECardName *name)</div><div class='del'>-{</div><div class='del'>-	int style;</div><div class='del'>-	style = file_as_get_style(simple);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-			"name", name,</div><div class='del'>-			NULL);</div><div class='del'>-	file_as_set_style(simple, style);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These map between the individual list types and ECardSimpleField */</div><div class='del'>-ECardSimpleField</div><div class='del'>-e_card_simple_map_phone_to_field (ECardSimplePhoneId phone_id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (phone_id &lt; E_CARD_SIMPLE_PHONE_ID_LAST, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; field_data_count; i ++)</div><div class='del'>-		if (field_data[i].list_type_index == phone_id</div><div class='del'>-		    &amp;&amp; field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_PHONE)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	g_warning ("couldn't find phone id %d, returning 0 (which is almost assuredly incorrect)\n", phone_id);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardSimpleField</div><div class='del'>-e_card_simple_map_email_to_field (ECardSimpleEmailId email_id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (email_id &lt; E_CARD_SIMPLE_EMAIL_ID_LAST, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; field_data_count; i ++)</div><div class='del'>-		if (field_data[i].list_type_index == email_id</div><div class='del'>-		    &amp;&amp; field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	g_warning ("couldn't find email id %d, returning 0 (which is almost assuredly incorrect)\n", email_id);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardSimpleField</div><div class='del'>-e_card_simple_map_address_to_field (ECardSimpleAddressId address_id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (address_id &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST, 0);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; field_data_count; i ++)</div><div class='del'>-		if (field_data[i].list_type_index == address_id</div><div class='del'>-		    &amp;&amp; field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	g_warning ("couldn't find address id %d, returning 0 (which is almost assuredly incorrect)\n", address_id);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h<br/>deleted file mode 100644<br/>index f0a5b2d613..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-simple.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,233 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_SIMPLE_H__</div><div class='del'>-#define __E_CARD_SIMPLE_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-types.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())</div><div class='del'>-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))</div><div class='del'>-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))</div><div class='del'>-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))</div><div class='del'>-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))</div><div class='del'>-</div><div class='del'>-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;</div><div class='del'>-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;</div><div class='del'>-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;</div><div class='del'>-typedef enum _ECardSimpleType ECardSimpleType;</div><div class='del'>-typedef enum _ECardSimpleField ECardSimpleField;</div><div class='del'>-</div><div class='del'>-enum _ECardSimplePhoneId {</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_CAR,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_COMPANY,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME_2,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_ISDN,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_MOBILE,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_OTHER,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_PAGER,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_RADIO,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_TELEX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_TTYTDD,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* We need HOME and WORK email addresses here. */</div><div class='del'>-enum _ECardSimpleEmailId {</div><div class='del'>-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,</div><div class='del'>-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,</div><div class='del'>-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,</div><div class='del'>-	E_CARD_SIMPLE_EMAIL_ID_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Should this include (BILLING/SHIPPING)? */</div><div class='del'>-enum _ECardSimpleAddressId {</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_HOME,</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _ECardSimpleType {</div><div class='del'>-	E_CARD_SIMPLE_TYPE_STRING,</div><div class='del'>-	E_CARD_SIMPLE_TYPE_DATE,</div><div class='del'>-	E_CARD_SIMPLE_TYPE_BOOL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _ECardSimpleField {</div><div class='del'>-	E_CARD_SIMPLE_FIELD_FILE_AS,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_FULL_NAME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_EMAIL,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_COMPANY,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_HOME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ORG,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ADDRESS_HOME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_MOBILE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_CAR,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_HOME_2,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_ISDN,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_OTHER,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_PAGER,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_RADIO,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_TELEX,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_EMAIL_2,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_EMAIL_3,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_URL,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ORG_UNIT,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_OFFICE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_TITLE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ROLE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_MANAGER,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ASSISTANT,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_NICKNAME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_SPOUSE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_NOTE,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_CALURI,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_FBURL,</div><div class='del'>-	/* If you add after FBURL, make sure to move LAST_SIMPLE_STRING */</div><div class='del'>-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING = E_CARD_SIMPLE_FIELD_FBURL,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ANNIVERSARY,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_BIRTH_DATE,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_MAILER,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_CATEGORIES,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_GIVEN_NAME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_NAME_SUFFIX,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_WANTS_HTML,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_IS_LIST,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _ECardSimple ECardSimple;</div><div class='del'>-typedef struct _ECardSimpleClass ECardSimpleClass;</div><div class='del'>-</div><div class='del'>-struct _ECardSimple {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	GList *temp_fields;</div><div class='del'>-</div><div class='del'>-	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];</div><div class='del'>-	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];</div><div class='del'>-	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];</div><div class='del'>-	ECardDeliveryAddress *delivery[E_CARD_SIMPLE_ADDRESS_ID_LAST];</div><div class='del'>-</div><div class='del'>-	gboolean changed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardSimpleClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);</div><div class='del'>-ECardSimple                *e_card_simple_new                    (ECard                        *card);</div><div class='del'>-const char                 *e_card_simple_get_id                 (ECardSimple                  *simple);</div><div class='del'>-void                        e_card_simple_set_id                 (ECardSimple                  *simple,</div><div class='del'>-								  const gchar                  *character);</div><div class='del'>-char                       *e_card_simple_get_vcard              (ECardSimple                  *simple);</div><div class='del'>-char                       *e_card_simple_get_vcard_assume_utf8  (ECardSimple                  *simple);</div><div class='del'>-ECardSimple                *e_card_simple_duplicate              (ECardSimple                  *simple);</div><div class='del'>-char                       *e_card_simple_get                    (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-const char                 *e_card_simple_get_const              (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-void                        e_card_simple_set                    (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field,</div><div class='del'>-								  const char                   *data);</div><div class='del'>-ECardSimpleType             e_card_simple_type                   (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-</div><div class='del'>-const char                 *e_card_simple_get_ecard_field        (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-const char                 *e_card_simple_get_name               (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-const char                 *e_card_simple_get_short_name         (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-gboolean                    e_card_simple_get_allow_newlines     (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleField              field);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Use these only if building lists of specific types.  It should be</div><div class='del'>- * easier to use the above if you consider a phone field to be the</div><div class='del'>- * same as any other field.</div><div class='del'>- */</div><div class='del'>-const ECardPhone           *e_card_simple_get_phone              (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimplePhoneId            id);</div><div class='del'>-const char                 *e_card_simple_get_email              (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleEmailId            id);</div><div class='del'>-const ECardAddrLabel       *e_card_simple_get_address            (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleAddressId          id);</div><div class='del'>-const ECardDeliveryAddress *e_card_simple_get_delivery_address   (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleAddressId          id);</div><div class='del'>-void                        e_card_simple_set_phone              (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimplePhoneId            id,</div><div class='del'>-								  const ECardPhone             *phone);</div><div class='del'>-void                        e_card_simple_set_email              (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleEmailId            id,</div><div class='del'>-								  const char                   *email);</div><div class='del'>-void                        e_card_simple_set_address            (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleAddressId          id,</div><div class='del'>-								  const ECardAddrLabel         *address);</div><div class='del'>-void                        e_card_simple_set_delivery_address   (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleAddressId          id,</div><div class='del'>-								  const ECardDeliveryAddress   *delivery);</div><div class='del'>-void                        e_card_simple_arbitrary_foreach      (ECardSimple                  *simple,</div><div class='del'>-								  ECardSimpleArbitraryCallback *callback,</div><div class='del'>-								  gpointer                      closure);</div><div class='del'>-const ECardArbitrary       *e_card_simple_get_arbitrary          (ECardSimple                  *simple,</div><div class='del'>-								  const char                   *key);</div><div class='del'>-/* Any of these except key can be NULL */	      </div><div class='del'>-void                        e_card_simple_set_arbitrary          (ECardSimple                  *simple,</div><div class='del'>-								  const char                   *key,</div><div class='del'>-								  const char                   *type,</div><div class='del'>-								  const char                   *value);</div><div class='del'>-void                        e_card_simple_set_name               (ECardSimple                  *simple,</div><div class='del'>-								  ECardName                    *name);</div><div class='del'>-void                        e_card_simple_sync_card              (ECardSimple                  *simple);</div><div class='del'>-</div><div class='del'>-/* These map between the individual list types and ECardSimpleField */</div><div class='del'>-ECardSimpleField            e_card_simple_map_phone_to_field     (ECardSimplePhoneId            phone_id);</div><div class='del'>-ECardSimpleField            e_card_simple_map_email_to_field     (ECardSimpleEmailId            email_id);</div><div class='del'>-ECardSimpleField            e_card_simple_map_address_to_field   (ECardSimpleAddressId          address_id);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType                     e_card_simple_get_type               (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_SIMPLE_H__ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h<br/>deleted file mode 100644<br/>index 8d35c54924..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_TYPES_H__</div><div class='del'>-#define __E_CARD_TYPES_H__</div><div class='del'>-</div><div class='del'>-/* IDENTIFICATION PROPERTIES */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint  ref_count;</div><div class='del'>-	char *prefix;        /* Mr. */</div><div class='del'>-	char *given;         /* John */</div><div class='del'>-	char *additional;    /* Quinlan */</div><div class='del'>-	char *family;        /* Public */</div><div class='del'>-	char *suffix;        /* Esq. */</div><div class='del'>-} ECardName;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int year;</div><div class='del'>-	int month;</div><div class='del'>-	int day;</div><div class='del'>-} ECardDate;</div><div class='del'>-</div><div class='del'>-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_CARD_PHONE_PREF      = 1 &lt;&lt; 0,</div><div class='del'>-	E_CARD_PHONE_WORK      = 1 &lt;&lt; 1,</div><div class='del'>-	E_CARD_PHONE_HOME      = 1 &lt;&lt; 2,</div><div class='del'>-	E_CARD_PHONE_VOICE     = 1 &lt;&lt; 3,</div><div class='del'>-	E_CARD_PHONE_FAX       = 1 &lt;&lt; 4,</div><div class='del'>-	E_CARD_PHONE_MSG       = 1 &lt;&lt; 5,</div><div class='del'>-	E_CARD_PHONE_CELL      = 1 &lt;&lt; 6,</div><div class='del'>-	E_CARD_PHONE_PAGER     = 1 &lt;&lt; 7,</div><div class='del'>-	E_CARD_PHONE_BBS       = 1 &lt;&lt; 8,</div><div class='del'>-	E_CARD_PHONE_MODEM     = 1 &lt;&lt; 9,</div><div class='del'>-	E_CARD_PHONE_CAR       = 1 &lt;&lt; 10,</div><div class='del'>-	E_CARD_PHONE_ISDN      = 1 &lt;&lt; 11,</div><div class='del'>-	E_CARD_PHONE_VIDEO     = 1 &lt;&lt; 12,</div><div class='del'>-	E_CARD_PHONE_ASSISTANT = 1 &lt;&lt; 13,</div><div class='del'>-	E_CARD_PHONE_CALLBACK  = 1 &lt;&lt; 14,</div><div class='del'>-	E_CARD_PHONE_RADIO     = 1 &lt;&lt; 15,</div><div class='del'>-	E_CARD_PHONE_TELEX     = 1 &lt;&lt; 16,</div><div class='del'>-	E_CARD_PHONE_TTYTDD    = 1 &lt;&lt; 17,</div><div class='del'>-} ECardPhoneFlags;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint ref_count;</div><div class='del'>-	ECardPhoneFlags  flags;</div><div class='del'>-	char            *number;</div><div class='del'>-} ECardPhone;</div><div class='del'>-</div><div class='del'>-/* DELIVERY ADDRESSING PROPERTIES */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_CARD_ADDR_HOME    = 1 &lt;&lt; 0, </div><div class='del'>-	E_CARD_ADDR_WORK    = 1 &lt;&lt; 1,</div><div class='del'>-	E_CARD_ADDR_POSTAL  = 1 &lt;&lt; 2, </div><div class='del'>-	E_CARD_ADDR_MASK    = 7,</div><div class='del'>-	E_CARD_ADDR_PARCEL  = 1 &lt;&lt; 3, </div><div class='del'>-	E_CARD_ADDR_DOM     = 1 &lt;&lt; 4,</div><div class='del'>-	E_CARD_ADDR_INTL    = 1 &lt;&lt; 5, </div><div class='del'>-	E_CARD_ADDR_DEFAULT = 1 &lt;&lt; 6</div><div class='del'>-} ECardAddressFlags;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint ref_count;</div><div class='del'>-	ECardAddressFlags  flags;</div><div class='del'>-</div><div class='del'>-	char     	  *po;</div><div class='del'>-	char     	  *ext;</div><div class='del'>-	char     	  *street;</div><div class='del'>-	char     	  *city;</div><div class='del'>-	char     	  *region;</div><div class='del'>-	char     	  *code;</div><div class='del'>-	char     	  *country;</div><div class='del'>-} ECardDeliveryAddress;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint ref_count;</div><div class='del'>-	ECardAddressFlags  flags;</div><div class='del'>-	char              *data;</div><div class='del'>-} ECardAddrLabel;</div><div class='del'>-</div><div class='del'>-/* ARBITRARY PROPERTIES */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint ref_count;</div><div class='del'>-	char *key;</div><div class='del'>-	char *type;</div><div class='del'>-	char *value;</div><div class='del'>-} ECardArbitrary;</div><div class='del'>-</div><div class='del'>-#endif /* __E_CARD_TYPES_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c<br/>deleted file mode 100644<br/>index 4fd0bb623d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2857 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Arturo Espinosa (arturo@nuclecu.unam.mx)</div><div class='del'>- *   Nat Friedman    (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object-client.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libversit/vcc.h&gt;</div><div class='del'>-#include "e-util/ename/e-name-western.h"</div><div class='del'>-#include "e-util/ename/e-address-western.h"</div><div class='del'>-#include "e-book.h"</div><div class='del'>-#include "e-destination.h"</div><div class='del'>-</div><div class='del'>-#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))</div><div class='del'>-#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))</div><div class='del'>-#define has(obj,prop) (vo = isAPropertyOf ((obj), (prop)))</div><div class='del'>-</div><div class='del'>-#define XEV_WANTS_HTML "X-MOZILLA-HTML"</div><div class='del'>-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"</div><div class='del'>-#define XEV_LIST "X-EVOLUTION-LIST"</div><div class='del'>-#define XEV_LIST_SHOW_ADDRESSES "X-EVOLUTION-LIST-SHOW_ADDRESSES"</div><div class='del'>-#define XEV_RELATED_CONTACTS "X-EVOLUTION-RELATED_CONTACTS"</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_FILE_AS,</div><div class='del'>-	ARG_FULL_NAME,</div><div class='del'>-	ARG_NAME,</div><div class='del'>-	ARG_ADDRESS,</div><div class='del'>-	ARG_ADDRESS_LABEL,</div><div class='del'>-	ARG_PHONE,</div><div class='del'>-	ARG_EMAIL,</div><div class='del'>-	ARG_BIRTH_DATE,</div><div class='del'>-	ARG_URL,</div><div class='del'>-	ARG_ORG,</div><div class='del'>-	ARG_ORG_UNIT,</div><div class='del'>-	ARG_OFFICE,</div><div class='del'>-	ARG_TITLE,</div><div class='del'>-	ARG_ROLE,</div><div class='del'>-	ARG_MANAGER,</div><div class='del'>-	ARG_ASSISTANT,</div><div class='del'>-	ARG_NICKNAME,</div><div class='del'>-	ARG_SPOUSE,</div><div class='del'>-	ARG_ANNIVERSARY,</div><div class='del'>-	ARG_MAILER,</div><div class='del'>-	ARG_CALURI,</div><div class='del'>-	ARG_FBURL,</div><div class='del'>-	ARG_NOTE,</div><div class='del'>-	ARG_RELATED_CONTACTS,</div><div class='del'>-	ARG_CATEGORIES,</div><div class='del'>-	ARG_CATEGORY_LIST,</div><div class='del'>-	ARG_WANTS_HTML,</div><div class='del'>-	ARG_WANTS_HTML_SET,</div><div class='del'>-	ARG_EVOLUTION_LIST,</div><div class='del'>-	ARG_EVOLUTION_LIST_SHOW_ADDRESSES,</div><div class='del'>-	ARG_ARBITRARY,</div><div class='del'>-	ARG_ID,</div><div class='del'>-	ARG_LAST_USE,</div><div class='del'>-	ARG_USE_SCORE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void parse(ECard *card, VObject *vobj, char *default_charset);</div><div class='del'>-static void e_card_init (ECard *card);</div><div class='del'>-static void e_card_class_init (ECardClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_card_destroy (GtkObject *object);</div><div class='del'>-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void assign_string(VObject *vobj, char *default_charset, char **string);</div><div class='del'>-</div><div class='del'>-char *e_v_object_get_child_value(VObject *vobj, char *name, char *default_charset);</div><div class='del'>-</div><div class='del'>-static void parse_bday(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_full_name(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_file_as(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_name(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_email(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_phone(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_address(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_address_label(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_url(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_org(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_office(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_title(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_role(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_manager(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_assistant(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_nickname(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_spouse(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_anniversary(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_mailer(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_caluri(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_fburl(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_note(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_related_contacts(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_categories(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_wants_html(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_list(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_list_show_addresses(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_arbitrary(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_id(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_last_use(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-static void parse_use_score(ECard *card, VObject *object, char *default_charset);</div><div class='del'>-</div><div class='del'>-static ECardPhoneFlags get_phone_flags (VObject *vobj);</div><div class='del'>-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);</div><div class='del'>-static ECardAddressFlags get_address_flags (VObject *vobj);</div><div class='del'>-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);</div><div class='del'>-</div><div class='del'>-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object, char *default_charset);</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *key;</div><div class='del'>-	ParsePropertyFunc function;</div><div class='del'>-} attribute_jump_array[] = </div><div class='del'>-{</div><div class='del'>-	{ VCFullNameProp,            parse_full_name },</div><div class='del'>-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },</div><div class='del'>-	{ VCNameProp,                parse_name },</div><div class='del'>-	{ VCBirthDateProp,           parse_bday },</div><div class='del'>-	{ VCEmailAddressProp,        parse_email },</div><div class='del'>-	{ VCTelephoneProp,           parse_phone },</div><div class='del'>-	{ VCAdrProp,                 parse_address },</div><div class='del'>-	{ VCDeliveryLabelProp,       parse_address_label },</div><div class='del'>-	{ VCURLProp,                 parse_url },</div><div class='del'>-	{ VCOrgProp,                 parse_org },</div><div class='del'>-	{ "X-EVOLUTION-OFFICE",      parse_office },</div><div class='del'>-	{ VCTitleProp,               parse_title },</div><div class='del'>-	{ VCBusinessRoleProp,        parse_role },</div><div class='del'>-	{ "X-EVOLUTION-MANAGER",     parse_manager },</div><div class='del'>-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },</div><div class='del'>-	{ "NICKNAME",                parse_nickname },</div><div class='del'>-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },</div><div class='del'>-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   </div><div class='del'>-	{ VCMailerProp,              parse_mailer },</div><div class='del'>-	{ "CALURI",                  parse_caluri },</div><div class='del'>-	{ "FBURL",                   parse_fburl },</div><div class='del'>-	{ VCNoteProp,                parse_note },</div><div class='del'>-	{ XEV_RELATED_CONTACTS,      parse_related_contacts },</div><div class='del'>-	{ "CATEGORIES",              parse_categories },</div><div class='del'>-	{ XEV_WANTS_HTML,            parse_wants_html },</div><div class='del'>-	{ XEV_ARBITRARY,             parse_arbitrary },</div><div class='del'>-	{ VCUniqueStringProp,        parse_id },</div><div class='del'>-	{ "X-EVOLUTION-LAST-USE",    parse_last_use },</div><div class='del'>-	{ "X-EVOLUTION-USE-SCORE",   parse_use_score },</div><div class='del'>-	{ XEV_LIST,                  parse_list },</div><div class='del'>-	{ XEV_LIST_SHOW_ADDRESSES,   parse_list_show_addresses },</div><div class='del'>-	{ VCUniqueStringProp,        parse_id }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ECard class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ECard class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_card_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType card_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!card_type) {</div><div class='del'>-		GtkTypeInfo card_info = {</div><div class='del'>-			"ECard",</div><div class='del'>-			sizeof (ECard),</div><div class='del'>-			sizeof (ECardClass),</div><div class='del'>-			(GtkClassInitFunc) e_card_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_card_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		card_type = gtk_type_unique (gtk_object_get_type (), &amp;card_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return card_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_card_new_with_default_charset (char *vcard, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));</div><div class='del'>-	while(vobj) {</div><div class='del'>-		VObject *next;</div><div class='del'>-		parse(card, vobj, default_charset);</div><div class='del'>-		next = nextVObjectInList(vobj);</div><div class='del'>-		cleanVObject(vobj);</div><div class='del'>-		vobj = next;</div><div class='del'>-	}</div><div class='del'>-	if (card-&gt;name == NULL)</div><div class='del'>-		card-&gt;name = e_card_name_new();</div><div class='del'>-	if (card-&gt;file_as == NULL)</div><div class='del'>-		card-&gt;file_as = g_strdup("");</div><div class='del'>-	if (card-&gt;fname == NULL)</div><div class='del'>-		card-&gt;fname = g_strdup("");</div><div class='del'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_new:</div><div class='del'>- * @vcard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ECard that wraps the @vcard.</div><div class='del'>- */</div><div class='del'>-ECard *</div><div class='del'>-e_card_new (char *vcard)</div><div class='del'>-{</div><div class='del'>-	return e_card_new_with_default_charset (vcard, "UTF-8");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_card_duplicate(ECard *card)</div><div class='del'>-{</div><div class='del'>-	char *vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-	ECard *new_card = e_card_new(vcard);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;book) {</div><div class='del'>-		new_card-&gt;book = card-&gt;book;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (new_card-&gt;book));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_get_today (GDate *dt)</div><div class='del'>-{</div><div class='del'>-	time_t now;</div><div class='del'>-	struct tm *now_tm;</div><div class='del'>-	if (dt == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	time (&amp;now);</div><div class='del'>-	now_tm = localtime (&amp;now);</div><div class='del'>-</div><div class='del'>-	g_date_set_dmy (dt, now_tm-&gt;tm_mday, now_tm-&gt;tm_mon + 1, now_tm-&gt;tm_year + 1900);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-float</div><div class='del'>-e_card_get_use_score(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GDate today, last_use;</div><div class='del'>-	gint days_since_last_use;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (card != NULL &amp;&amp; E_IS_CARD (card), 0);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;last_use == NULL)</div><div class='del'>-		return 0.0;</div><div class='del'>-</div><div class='del'>-	e_card_get_today (&amp;today);</div><div class='del'>-	g_date_set_dmy (&amp;last_use, card-&gt;last_use-&gt;day, card-&gt;last_use-&gt;month, card-&gt;last_use-&gt;year);</div><div class='del'>-</div><div class='del'>-	days_since_last_use = g_date_julian (&amp;today) - g_date_julian (&amp;last_use);</div><div class='del'>-	</div><div class='del'>-	/* Apply a seven-day "grace period" to the use score decay. */</div><div class='del'>-	days_since_last_use -= 7;</div><div class='del'>-	if (days_since_last_use &lt; 0)</div><div class='del'>-		days_since_last_use = 0;</div><div class='del'>-</div><div class='del'>-	return MAX (card-&gt;raw_use_score, 0) * exp (- days_since_last_use / 30.0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_touch(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GDate today;</div><div class='del'>-	double use_score;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card != NULL &amp;&amp; E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	e_card_get_today (&amp;today);</div><div class='del'>-	use_score = e_card_get_use_score (card);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;last_use == NULL)</div><div class='del'>-		card-&gt;last_use = g_new (ECardDate, 1);</div><div class='del'>-</div><div class='del'>-	card-&gt;last_use-&gt;day   = g_date_day (&amp;today);</div><div class='del'>-	card-&gt;last_use-&gt;month = g_date_month (&amp;today);</div><div class='del'>-	card-&gt;last_use-&gt;year  = g_date_year (&amp;today);</div><div class='del'>-</div><div class='del'>-	card-&gt;raw_use_score   = use_score + 1.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_get_id:</div><div class='del'>- * @card: an #ECard</div><div class='del'>- *</div><div class='del'>- * Returns: a string representing the id of the card, which is unique</div><div class='del'>- * within its book.</div><div class='del'>- */</div><div class='del'>-const char *</div><div class='del'>-e_card_get_id (ECard *card)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card &amp;&amp; E_IS_CARD (card), NULL);</div><div class='del'>-</div><div class='del'>-	return card-&gt;id ? card-&gt;id : "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_get_id:</div><div class='del'>- * @card: an #ECard</div><div class='del'>- * @id: a id in string format</div><div class='del'>- *</div><div class='del'>- * Sets the identifier of a card, which should be unique within its</div><div class='del'>- * book.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_card_set_id (ECard *card, const char *id)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;id )</div><div class='del'>-		g_free(card-&gt;id);</div><div class='del'>-	card-&gt;id = g_strdup(id ? id : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EBook *</div><div class='del'>-e_card_get_book (ECard *card)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card &amp;&amp; E_IS_CARD (card), NULL);</div><div class='del'>-</div><div class='del'>-	return card-&gt;book;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_set_book (ECard *card, EBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-	card-&gt;book = book;</div><div class='del'>-	if (card-&gt;book)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_card_date_to_string (ECardDate *dt)</div><div class='del'>-{</div><div class='del'>-	if (dt) </div><div class='del'>-		return g_strdup_printf ("%04d-%02d-%02d",</div><div class='del'>-					CLAMP(dt-&gt;year, 1000, 9999),</div><div class='del'>-					CLAMP(dt-&gt;month, 1, 12),</div><div class='del'>-					CLAMP(dt-&gt;day, 1, 31));</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-addPropValueUTF8(VObject *o, const char *p, const char *v)</div><div class='del'>-{</div><div class='del'>-	VObject *prop = addPropValue (o, p, v);</div><div class='del'>-	for (; *v; v++) {</div><div class='del'>-		if ((*v) &amp; 0x80) {</div><div class='del'>-			addPropValue (prop, "CHARSET", "UTF-8");</div><div class='del'>-			for (; *v; v++) {</div><div class='del'>-				if (*v == '\n') {</div><div class='del'>-					addProp(prop, VCQuotedPrintableProp);</div><div class='del'>-					return prop;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return prop;</div><div class='del'>-		}</div><div class='del'>-		if (*v == '\n') {</div><div class='del'>-			addProp(prop, VCQuotedPrintableProp);</div><div class='del'>-			for (; *v; v++) {</div><div class='del'>-				if ((*v) &amp; 0x80) {</div><div class='del'>-					addPropValue (prop, "CHARSET", "UTF-8");</div><div class='del'>-					return prop;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return prop;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return prop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-addPropValueQP(VObject *o, const char *p, const char *v)</div><div class='del'>-{</div><div class='del'>-	VObject *prop = addPropValue (o, p, v);</div><div class='del'>-	for (; *v; v++) {</div><div class='del'>-		if (*v == '\n') {</div><div class='del'>-			addProp(prop, VCQuotedPrintableProp);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return prop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addPropValueSets (VObject *o, const char *p, const char *v, gboolean assumeUTF8, gboolean *is_ascii, gboolean *has_return)</div><div class='del'>-{</div><div class='del'>-	addPropValue (o, p, v);</div><div class='del'>-	if (*has_return &amp;&amp; (assumeUTF8 || !*is_ascii))</div><div class='del'>-		return;</div><div class='del'>-	if (*has_return) {</div><div class='del'>-		for (; *v; v++) {</div><div class='del'>-			if (*v &amp; 0x80) {</div><div class='del'>-				*is_ascii = FALSE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (assumeUTF8 || !*is_ascii) {</div><div class='del'>-		for (; *v; v++) {</div><div class='del'>-			if (*v == '\n') {</div><div class='del'>-				*has_return = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for (; *v; v++) {</div><div class='del'>-		if (*v &amp; 0x80) {</div><div class='del'>-			*is_ascii = FALSE;</div><div class='del'>-			for (; *v; v++) {</div><div class='del'>-				if (*v == '\n') {</div><div class='del'>-					*has_return = TRUE;</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (*v == '\n') {</div><div class='del'>-			*has_return = TRUE;</div><div class='del'>-			for (; *v; v++) {</div><div class='del'>-				if (*v &amp; 0x80) {</div><div class='del'>-					*is_ascii = FALSE;</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ADD_PROP_VALUE(o, p, v)              (assumeUTF8 ? (addPropValueQP ((o), (p), (v))) : addPropValueUTF8 ((o), (p), (v)))</div><div class='del'>-#define ADD_PROP_VALUE_SET_IS_ASCII(o, p, v) (addPropValueSets ((o), (p), (v), assumeUTF8, &amp;is_ascii, &amp;has_return))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static VObject *</div><div class='del'>-e_card_get_vobject (const ECard *card, gboolean assumeUTF8)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj;</div><div class='del'>-	</div><div class='del'>-	vobj = newVObject (VCCardProp);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;file_as &amp;&amp; *card-&gt;file_as)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-FILE-AS", card-&gt;file_as);</div><div class='del'>-	else if (card-&gt;file_as)</div><div class='del'>-		addProp(vobj, "X-EVOLUTION-FILE_AS");</div><div class='del'>-</div><div class='del'>-	if (card-&gt;fname &amp;&amp; *card-&gt;fname)</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCFullNameProp, card-&gt;fname);</div><div class='del'>-	else if (card-&gt;fname)</div><div class='del'>-		addProp(vobj, VCFullNameProp);</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;name &amp;&amp; (card-&gt;name-&gt;prefix || card-&gt;name-&gt;given || card-&gt;name-&gt;additional || card-&gt;name-&gt;family || card-&gt;name-&gt;suffix) ) {</div><div class='del'>-		VObject *nameprop;</div><div class='del'>-		gboolean is_ascii = TRUE;</div><div class='del'>-		gboolean has_return = FALSE;</div><div class='del'>-		nameprop = addProp(vobj, VCNameProp);</div><div class='del'>-		if ( card-&gt;name-&gt;prefix )</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNamePrefixesProp, card-&gt;name-&gt;prefix);</div><div class='del'>-		if ( card-&gt;name-&gt;given ) </div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCGivenNameProp, card-&gt;name-&gt;given);</div><div class='del'>-		if ( card-&gt;name-&gt;additional )</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCAdditionalNamesProp, card-&gt;name-&gt;additional);</div><div class='del'>-		if ( card-&gt;name-&gt;family )</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCFamilyNameProp, card-&gt;name-&gt;family);</div><div class='del'>-		if ( card-&gt;name-&gt;suffix )</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNameSuffixesProp, card-&gt;name-&gt;suffix);</div><div class='del'>-		if (has_return)</div><div class='del'>-			addProp(nameprop, VCQuotedPrintableProp);</div><div class='del'>-		if (!(is_ascii || assumeUTF8))</div><div class='del'>-			addPropValue (nameprop, "CHARSET", "UTF-8");</div><div class='del'>-	}</div><div class='del'>-	else if (card-&gt;name)</div><div class='del'>-		addProp(vobj, VCNameProp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;address ) {</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(card-&gt;address);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *addressprop;</div><div class='del'>-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);</div><div class='del'>-			gboolean is_ascii = TRUE;</div><div class='del'>-			gboolean has_return = FALSE;</div><div class='del'>-</div><div class='del'>-			addressprop = addProp(vobj, VCAdrProp);</div><div class='del'>-			</div><div class='del'>-			set_address_flags (addressprop, address-&gt;flags);</div><div class='del'>-			if (address-&gt;po)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalBoxProp, address-&gt;po);</div><div class='del'>-			if (address-&gt;ext)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCExtAddressProp, address-&gt;ext);</div><div class='del'>-			if (address-&gt;street)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCStreetAddressProp, address-&gt;street);</div><div class='del'>-			if (address-&gt;city)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCityProp, address-&gt;city);</div><div class='del'>-			if (address-&gt;region)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCRegionProp, address-&gt;region);</div><div class='del'>-			if (address-&gt;code)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalCodeProp, address-&gt;code);</div><div class='del'>-			if (address-&gt;country)</div><div class='del'>-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCountryNameProp, address-&gt;country);</div><div class='del'>-</div><div class='del'>-			if (has_return)</div><div class='del'>-				addProp(addressprop, VCQuotedPrintableProp);</div><div class='del'>-			if (!(is_ascii || assumeUTF8))</div><div class='del'>-				addPropValue (addressprop, "CHARSET", "UTF-8");</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;address_label ) {</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(card-&gt;address_label);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *labelprop;</div><div class='del'>-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);</div><div class='del'>-			if (address_label-&gt;data)</div><div class='del'>-				labelprop = ADD_PROP_VALUE(vobj, VCDeliveryLabelProp, address_label-&gt;data);</div><div class='del'>-			else</div><div class='del'>-				labelprop = addProp(vobj, VCDeliveryLabelProp);</div><div class='del'>-			</div><div class='del'>-			set_address_flags (labelprop, address_label-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;phone ) { </div><div class='del'>-		EIterator *iterator = e_list_get_iterator(card-&gt;phone);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *phoneprop;</div><div class='del'>-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);</div><div class='del'>-			phoneprop = ADD_PROP_VALUE(vobj, VCTelephoneProp, phone-&gt;number);</div><div class='del'>-			</div><div class='del'>-			set_phone_flags (phoneprop, phone-&gt;flags);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;email ) { </div><div class='del'>-		EIterator *iterator = e_list_get_iterator(card-&gt;email);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *emailprop;</div><div class='del'>-			emailprop = ADD_PROP_VALUE(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));</div><div class='del'>-			addProp (emailprop, VCInternetProp);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;bday ) {</div><div class='del'>-		char *value;</div><div class='del'>-		value = e_card_date_to_string (card-&gt;bday);</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCBirthDateProp, value);</div><div class='del'>-		g_free(value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;url)</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCURLProp, card-&gt;url);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;org || card-&gt;org_unit) {</div><div class='del'>-		VObject *orgprop;</div><div class='del'>-		gboolean is_ascii = TRUE;</div><div class='del'>-		gboolean has_return = FALSE;</div><div class='del'>-		orgprop = addProp(vobj, VCOrgProp);</div><div class='del'>-		</div><div class='del'>-		if (card-&gt;org)</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgNameProp, card-&gt;org);</div><div class='del'>-		if (card-&gt;org_unit)</div><div class='del'>-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgUnitProp, card-&gt;org_unit);</div><div class='del'>-</div><div class='del'>-		if (has_return)</div><div class='del'>-			addProp(orgprop, VCQuotedPrintableProp);</div><div class='del'>-		if (!(is_ascii || assumeUTF8))</div><div class='del'>-			addPropValue (orgprop, "CHARSET", "UTF-8");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;office)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-OFFICE", card-&gt;office);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;title)</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCTitleProp, card-&gt;title);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;role)</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCBusinessRoleProp, card-&gt;role);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;manager)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-MANAGER", card-&gt;manager);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;assistant)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ASSISTANT", card-&gt;assistant);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;nickname)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "NICKNAME", card-&gt;nickname);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;spouse)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-SPOUSE", card-&gt;spouse);</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;anniversary ) {</div><div class='del'>-		char *value;</div><div class='del'>-		value = e_card_date_to_string (card-&gt;anniversary);</div><div class='del'>-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ANNIVERSARY", value);</div><div class='del'>-		g_free(value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;mailer) {</div><div class='del'>-		ADD_PROP_VALUE(vobj, VCMailerProp, card-&gt;mailer);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;caluri)</div><div class='del'>-		addPropValueQP(vobj, "CALURI", card-&gt;caluri);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;fburl)</div><div class='del'>-		ADD_PROP_VALUE(vobj, "FBURL", card-&gt;fburl);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;note) {</div><div class='del'>-		VObject *noteprop;</div><div class='del'>-</div><div class='del'>-		noteprop = ADD_PROP_VALUE(vobj, VCNoteProp, card-&gt;note);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;last_use) {</div><div class='del'>-		char *value;</div><div class='del'>-		value = e_card_date_to_string (card-&gt;last_use);</div><div class='del'>-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-LAST-USE", value);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;raw_use_score &gt; 0) {</div><div class='del'>-		char *value;</div><div class='del'>-		value = g_strdup_printf ("%f", card-&gt;raw_use_score);</div><div class='del'>-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-USE-SCORE", value);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;related_contacts &amp;&amp; *card-&gt;related_contacts) {</div><div class='del'>-		ADD_PROP_VALUE(vobj, XEV_RELATED_CONTACTS, card-&gt;related_contacts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;categories) {</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		int length = 0;</div><div class='del'>-		char *string;</div><div class='del'>-		char *stringptr;</div><div class='del'>-		for (iterator = e_list_get_iterator(card-&gt;categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			length += strlen(e_iterator_get(iterator)) + 1;</div><div class='del'>-		}</div><div class='del'>-		string = g_new(char, length + 1);</div><div class='del'>-		stringptr = string;</div><div class='del'>-		*stringptr = 0;</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			strcpy(stringptr, e_iterator_get(iterator));</div><div class='del'>-			stringptr += strlen(stringptr);</div><div class='del'>-			*stringptr = ',';</div><div class='del'>-			stringptr++;</div><div class='del'>-			*stringptr = 0;</div><div class='del'>-		}</div><div class='del'>-		if (stringptr &gt; string) {</div><div class='del'>-			stringptr --;</div><div class='del'>-			*stringptr = 0;</div><div class='del'>-		}</div><div class='del'>-		ADD_PROP_VALUE (vobj, "CATEGORIES", string);</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;wants_html_set) {</div><div class='del'>-		ADD_PROP_VALUE (vobj, XEV_WANTS_HTML, card-&gt;wants_html ? "TRUE" : "FALSE");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;list) {</div><div class='del'>-		ADD_PROP_VALUE (vobj, XEV_LIST, "TRUE");</div><div class='del'>-		ADD_PROP_VALUE (vobj, XEV_LIST_SHOW_ADDRESSES, card-&gt;list_show_addresses ? "TRUE" : "FALSE");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;arbitrary) {</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		for (iterator = e_list_get_iterator(card-&gt;arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			VObject *arb_object;</div><div class='del'>-			if (arbitrary-&gt;value) {</div><div class='del'>-				arb_object = ADD_PROP_VALUE (vobj, XEV_ARBITRARY, arbitrary-&gt;value);</div><div class='del'>-			} else {</div><div class='del'>-				arb_object = addProp (vobj, XEV_ARBITRARY);</div><div class='del'>-			}</div><div class='del'>-			if (arbitrary-&gt;type) {</div><div class='del'>-				ADD_PROP_VALUE (arb_object, "TYPE", arbitrary-&gt;type);</div><div class='del'>-			}</div><div class='del'>-			if (arbitrary-&gt;key) {</div><div class='del'>-				addProp (arb_object, arbitrary-&gt;key);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addPropValueQP (vobj, VCUniqueStringProp, (card-&gt;id ? card-&gt;id : ""));</div><div class='del'>-</div><div class='del'>-	return vobj;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_get_vcard:</div><div class='del'>- * @card: an #ECard</div><div class='del'>- *</div><div class='del'>- * Returns: a string in vCard format, which is wrapped by the @card.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_card_get_vcard (ECard *card)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj;</div><div class='del'>-	char *temp, *ret_val;</div><div class='del'>-</div><div class='del'>-	vobj = e_card_get_vobject (card, FALSE);</div><div class='del'>-	temp = writeMemVObject(NULL, NULL, vobj);</div><div class='del'>-	ret_val = g_strdup(temp);</div><div class='del'>-	free(temp);</div><div class='del'>-	cleanVObject(vobj);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_card_get_vcard_assume_utf8 (ECard *card)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj;</div><div class='del'>-	char *temp, *ret_val;</div><div class='del'>-</div><div class='del'>-	vobj = e_card_get_vobject (card, TRUE);</div><div class='del'>-	temp = writeMemVObject(NULL, NULL, vobj);</div><div class='del'>-	ret_val = g_strdup(temp);</div><div class='del'>-	free(temp);</div><div class='del'>-	cleanVObject(vobj);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_list_get_vcard:</div><div class='del'>- * @list: a list of #ECards</div><div class='del'>- *</div><div class='del'>- * Returns: a string in vCard format.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_card_list_get_vcard (const GList *list)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj;</div><div class='del'>-</div><div class='del'>-	char *temp, *ret_val;</div><div class='del'>-</div><div class='del'>-	vobj = NULL;</div><div class='del'>-</div><div class='del'>-	for (; list; list = list-&gt;next) {</div><div class='del'>-		VObject *tempvobj;</div><div class='del'>-		ECard *card = list-&gt;data;</div><div class='del'>-</div><div class='del'>-		tempvobj = e_card_get_vobject (card, FALSE);</div><div class='del'>-		addList (&amp;vobj, tempvobj);</div><div class='del'>-	}</div><div class='del'>-	temp = writeMemVObjects(NULL, NULL, vobj);</div><div class='del'>-	ret_val = g_strdup(temp);</div><div class='del'>-	free(temp);</div><div class='del'>-	cleanVObjects(vobj);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_file_as(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;file_as )</div><div class='del'>-		g_free(card-&gt;file_as);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;file_as));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_name(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	e_card_name_unref(card-&gt;name);</div><div class='del'>-</div><div class='del'>-	card-&gt;name = e_card_name_new();</div><div class='del'>-</div><div class='del'>-	card-&gt;name-&gt;family     = e_v_object_get_child_value (vobj, VCFamilyNameProp,      default_charset);</div><div class='del'>-	card-&gt;name-&gt;given      = e_v_object_get_child_value (vobj, VCGivenNameProp,       default_charset);</div><div class='del'>-	card-&gt;name-&gt;additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp, default_charset);</div><div class='del'>-	card-&gt;name-&gt;prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp,    default_charset);</div><div class='del'>-	card-&gt;name-&gt;suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp,    default_charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_full_name(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;fname )</div><div class='del'>-		g_free(card-&gt;fname);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;fname));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_email(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	char *next_email;</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	assign_string(vobj, default_charset, &amp;next_email);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "email", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, next_email);</div><div class='del'>-	g_free (next_email);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_bday(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if ( card-&gt;bday )</div><div class='del'>-			g_free(card-&gt;bday);</div><div class='del'>-		card-&gt;bday = g_new(ECardDate, 1);</div><div class='del'>-		*(card-&gt;bday) = e_card_date_from_string(str);</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_phone(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ECardPhone *next_phone = e_card_phone_new ();</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(next_phone-&gt;number));</div><div class='del'>-	next_phone-&gt;flags = get_phone_flags(vobj);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "phone", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, next_phone);</div><div class='del'>-	e_card_phone_unref (next_phone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_address(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *next_addr = e_card_delivery_address_new ();</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	next_addr-&gt;flags   = get_address_flags (vobj);</div><div class='del'>-	next_addr-&gt;po      = e_v_object_get_child_value (vobj, VCPostalBoxProp,     default_charset);</div><div class='del'>-	next_addr-&gt;ext     = e_v_object_get_child_value (vobj, VCExtAddressProp,    default_charset);</div><div class='del'>-	next_addr-&gt;street  = e_v_object_get_child_value (vobj, VCStreetAddressProp, default_charset);</div><div class='del'>-	next_addr-&gt;city    = e_v_object_get_child_value (vobj, VCCityProp,          default_charset);</div><div class='del'>-	next_addr-&gt;region  = e_v_object_get_child_value (vobj, VCRegionProp,        default_charset);</div><div class='del'>-	next_addr-&gt;code    = e_v_object_get_child_value (vobj, VCPostalCodeProp,    default_charset);</div><div class='del'>-	next_addr-&gt;country = e_v_object_get_child_value (vobj, VCCountryNameProp,   default_charset);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "address", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, next_addr);</div><div class='del'>-	e_card_delivery_address_unref (next_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_address_label(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *next_addr = e_card_address_label_new ();</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	next_addr-&gt;flags   = get_address_flags (vobj);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;next_addr-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "address_label", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, next_addr);</div><div class='del'>-	e_card_address_label_unref (next_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_url(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;url)</div><div class='del'>-		g_free(card-&gt;url);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;url));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_org(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	char *temp;</div><div class='del'>-	</div><div class='del'>-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp, default_charset);</div><div class='del'>-	g_free(card-&gt;org);</div><div class='del'>-	card-&gt;org = temp;</div><div class='del'>-</div><div class='del'>-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp, default_charset);</div><div class='del'>-	g_free(card-&gt;org_unit);</div><div class='del'>-	card-&gt;org_unit = temp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_office(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;office )</div><div class='del'>-		g_free(card-&gt;office);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;office));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_title(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;title )</div><div class='del'>-		g_free(card-&gt;title);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;title));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_role(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;role)</div><div class='del'>-		g_free(card-&gt;role);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;role));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_manager(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;manager )</div><div class='del'>-		g_free(card-&gt;manager);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;manager));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_assistant(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;assistant )</div><div class='del'>-		g_free(card-&gt;assistant);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;assistant));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_nickname(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;nickname)</div><div class='del'>-		g_free(card-&gt;nickname);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;nickname));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_spouse(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;spouse )</div><div class='del'>-		g_free(card-&gt;spouse);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;spouse));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_anniversary(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if (card-&gt;anniversary)</div><div class='del'>-			g_free(card-&gt;anniversary);</div><div class='del'>-		card-&gt;anniversary = g_new(ECardDate, 1);</div><div class='del'>-		*(card-&gt;anniversary) = e_card_date_from_string(str);</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_mailer(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( card-&gt;mailer )</div><div class='del'>-		g_free(card-&gt;mailer);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;mailer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_caluri(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>- 	g_free(card-&gt;caluri);</div><div class='del'>- 	assign_string(vobj, default_charset, &amp;(card-&gt;caluri));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_fburl(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;fburl);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;fburl));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_note(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;note);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;note));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_related_contacts(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;related_contacts);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;related_contacts));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_list_unique(ECard *card, EList *list, char *string)</div><div class='del'>-{</div><div class='del'>-	char *temp = e_strdup_strip(string);</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	if (!*temp) {</div><div class='del'>-		g_free(temp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		if (!strcmp(e_iterator_get(iterator), temp)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		e_list_append(list, temp);</div><div class='del'>-	}</div><div class='del'>-	g_free(temp);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_parse_categories(ECard *card, char *str)</div><div class='del'>-{</div><div class='del'>-	int length = strlen(str);</div><div class='del'>-	char *copy = g_new(char, length + 1);</div><div class='del'>-	int i, j;</div><div class='del'>-	EList *list;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "category_list", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	for (i = 0, j = 0; str[i]; i++, j++) {</div><div class='del'>-		switch (str[i]) {</div><div class='del'>-		case '\\':</div><div class='del'>-			i++;</div><div class='del'>-			if (str[i]) {</div><div class='del'>-				copy[j] = str[i];</div><div class='del'>-			} else</div><div class='del'>-				i--;</div><div class='del'>-			break;</div><div class='del'>-		case ',':</div><div class='del'>-			copy[j] = 0;</div><div class='del'>-			add_list_unique(card, list, copy);</div><div class='del'>-			j = -1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			copy[j] = str[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	copy[j] = 0;</div><div class='del'>-	add_list_unique(card, list, copy);</div><div class='del'>-	g_free(copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_categories(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		do_parse_categories(card, str);</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_wants_html(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if (!strcasecmp(str, "true")) {</div><div class='del'>-			card-&gt;wants_html = TRUE;</div><div class='del'>-			card-&gt;wants_html_set = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (!strcasecmp(str, "false")) {</div><div class='del'>-			card-&gt;wants_html = FALSE;</div><div class='del'>-			card-&gt;wants_html_set = TRUE;</div><div class='del'>-		}</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_list(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if (!strcasecmp(str, "true")) {</div><div class='del'>-			card-&gt;list = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (!strcasecmp(str, "false")) {</div><div class='del'>-			card-&gt;list = FALSE;</div><div class='del'>-		}</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_list_show_addresses(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if (!strcasecmp(str, "true")) {</div><div class='del'>-			card-&gt;list_show_addresses = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (!strcasecmp(str, "false")) {</div><div class='del'>-			card-&gt;list_show_addresses = FALSE;</div><div class='del'>-		}</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef union ValueItem {</div><div class='del'>-    const char *strs;</div><div class='del'>-    const wchar_t *ustrs;</div><div class='del'>-    unsigned int i;</div><div class='del'>-    unsigned long l;</div><div class='del'>-    void *any;</div><div class='del'>-    VObject *vobj;</div><div class='del'>-} ValueItem;</div><div class='del'>-</div><div class='del'>-struct VObject {</div><div class='del'>-    VObject *next;</div><div class='del'>-    const char *id;</div><div class='del'>-    VObject *prop;</div><div class='del'>-    unsigned short valType;</div><div class='del'>-    ValueItem val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_arbitrary(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ECardArbitrary *arbitrary = e_card_arbitrary_new();</div><div class='del'>-	VObjectIterator iterator;</div><div class='del'>-	EList *list;</div><div class='del'>-	for ( initPropIterator (&amp;iterator, vobj); moreIteration(&amp;iterator); ) {</div><div class='del'>-		VObject *temp = nextVObject(&amp;iterator);</div><div class='del'>-		const char *name = vObjectName(temp);</div><div class='del'>-		if (name &amp;&amp; !strcmp(name, "TYPE")) {</div><div class='del'>-			g_free(arbitrary-&gt;type);</div><div class='del'>-			assign_string(temp, default_charset, &amp;(arbitrary-&gt;type));</div><div class='del'>-		} else {</div><div class='del'>-			g_free(arbitrary-&gt;key);</div><div class='del'>-			arbitrary-&gt;key = g_strdup(name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(arbitrary-&gt;value));</div><div class='del'>-	</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "arbitrary", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, arbitrary);</div><div class='del'>-	e_card_arbitrary_unref(arbitrary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_id(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	g_free(card-&gt;id);</div><div class='del'>-	assign_string(vobj, default_charset, &amp;(card-&gt;id));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_last_use(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if ( card-&gt;last_use )</div><div class='del'>-			g_free(card-&gt;last_use);</div><div class='del'>-		card-&gt;last_use = g_new(ECardDate, 1);</div><div class='del'>-		*(card-&gt;last_use) = e_card_date_from_string(str);</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deal with charset */</div><div class='del'>-static void</div><div class='del'>-parse_use_score(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	card-&gt;raw_use_score = 0;</div><div class='del'>-	</div><div class='del'>-	if ( vObjectValueType (vobj) ) {</div><div class='del'>-		char *str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		card-&gt;raw_use_score = MAX(0, atof (str));</div><div class='del'>-		free (str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_attribute(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)-&gt;klass)-&gt;attribute_jump_table, vObjectName(vobj));</div><div class='del'>-	if ( function )</div><div class='del'>-		function(card, vobj, default_charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse(ECard *card, VObject *vobj, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	VObjectIterator iterator;</div><div class='del'>-	initPropIterator(&amp;iterator, vobj);</div><div class='del'>-	while(moreIteration (&amp;iterator)) {</div><div class='del'>-		parse_attribute(card, nextVObject(&amp;iterator), default_charset);</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;fname) {</div><div class='del'>-		card-&gt;fname = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;name) {</div><div class='del'>-		card-&gt;name = e_card_name_from_string(card-&gt;fname);</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;file_as) {</div><div class='del'>-		ECardName *name = card-&gt;name;</div><div class='del'>-		char *strings[3], **stringptr;</div><div class='del'>-		char *string;</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		card-&gt;file_as = string;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_class_init (ECardClass *klass)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	klass-&gt;attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {</div><div class='del'>-		g_hash_table_insert(klass-&gt;attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ECard::file_as",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::full_name",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::name",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::address",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::address_label",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::phone",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::email",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::birth_date",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::url",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::org",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::org_unit",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::office",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::title",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::role",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::manager",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::assistant",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::nickname",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::spouse",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::anniversary",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::mailer",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::caluri",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CALURI);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::fburl",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::note",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::related_contacts",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_RELATED_CONTACTS);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::categories",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CATEGORIES);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::category_list",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CATEGORY_LIST);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::wants_html",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::wants_html_set",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::list",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::list_show_addresses",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST_SHOW_ADDRESSES);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::arbitrary",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_ARBITRARY);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::id",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ID);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::last_use",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_LAST_USE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::use_score",</div><div class='del'>-				 GTK_TYPE_FLOAT, GTK_ARG_READWRITE, ARG_USE_SCORE);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_card_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_card_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_card_set_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardPhone *</div><div class='del'>-e_card_phone_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardPhone *newphone = g_new(ECardPhone, 1);</div><div class='del'>-</div><div class='del'>-	newphone-&gt;ref_count = 1;</div><div class='del'>-	newphone-&gt;number = NULL;</div><div class='del'>-	newphone-&gt;flags = 0;</div><div class='del'>-	</div><div class='del'>-	return newphone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_phone_unref (ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	if (phone) {</div><div class='del'>-		phone-&gt;ref_count --;</div><div class='del'>-		if (phone-&gt;ref_count == 0) {</div><div class='del'>-			g_free(phone-&gt;number);</div><div class='del'>-			g_free(phone);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardPhone *</div><div class='del'>-e_card_phone_ref (const ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	ECardPhone *phone_mutable = (ECardPhone *) phone;</div><div class='del'>-	if (phone_mutable)</div><div class='del'>-		phone_mutable-&gt;ref_count ++;</div><div class='del'>-	return phone_mutable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardPhone *</div><div class='del'>-e_card_phone_copy (const ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	if ( phone ) {</div><div class='del'>-		ECardPhone *phone_copy = e_card_phone_new();</div><div class='del'>-		phone_copy-&gt;number = g_strdup(phone-&gt;number);</div><div class='del'>-		phone_copy-&gt;flags  = phone-&gt;flags;</div><div class='del'>-		return phone_copy;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardDeliveryAddress *</div><div class='del'>-e_card_delivery_address_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);</div><div class='del'>-</div><div class='del'>-	newaddr-&gt;ref_count = 1;</div><div class='del'>-	newaddr-&gt;po      = NULL;</div><div class='del'>-	newaddr-&gt;ext     = NULL;</div><div class='del'>-	newaddr-&gt;street  = NULL;</div><div class='del'>-	newaddr-&gt;city    = NULL;</div><div class='del'>-	newaddr-&gt;region  = NULL;</div><div class='del'>-	newaddr-&gt;code    = NULL;</div><div class='del'>-	newaddr-&gt;country = NULL;</div><div class='del'>-	newaddr-&gt;flags   = 0;</div><div class='del'>-</div><div class='del'>-	return newaddr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_delivery_address_unref (ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		addr-&gt;ref_count --;</div><div class='del'>-		if (addr-&gt;ref_count == 0) {</div><div class='del'>-			g_free(addr-&gt;po);</div><div class='del'>-			g_free(addr-&gt;ext);</div><div class='del'>-			g_free(addr-&gt;street);</div><div class='del'>-			g_free(addr-&gt;city);</div><div class='del'>-			g_free(addr-&gt;region);</div><div class='del'>-			g_free(addr-&gt;code);</div><div class='del'>-			g_free(addr-&gt;country);</div><div class='del'>-			g_free(addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardDeliveryAddress *</div><div class='del'>-e_card_delivery_address_ref (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *addr_mutable = (ECardDeliveryAddress *) addr;</div><div class='del'>-	if (addr_mutable)</div><div class='del'>-		addr_mutable-&gt;ref_count ++;</div><div class='del'>-	return addr_mutable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardDeliveryAddress *</div><div class='del'>-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		ECardDeliveryAddress *addr_copy = e_card_delivery_address_new ();</div><div class='del'>-		addr_copy-&gt;po      = g_strdup(addr-&gt;po     );</div><div class='del'>-		addr_copy-&gt;ext     = g_strdup(addr-&gt;ext    );</div><div class='del'>-		addr_copy-&gt;street  = g_strdup(addr-&gt;street );</div><div class='del'>-		addr_copy-&gt;city    = g_strdup(addr-&gt;city   );</div><div class='del'>-		addr_copy-&gt;region  = g_strdup(addr-&gt;region );</div><div class='del'>-		addr_copy-&gt;code    = g_strdup(addr-&gt;code   );</div><div class='del'>-		addr_copy-&gt;country = g_strdup(addr-&gt;country);</div><div class='del'>-		addr_copy-&gt;flags   = addr-&gt;flags;</div><div class='del'>-		return addr_copy;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	return (((addr-&gt;po      == NULL) || (*addr-&gt;po      == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;ext     == NULL) || (*addr-&gt;ext     == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;street  == NULL) || (*addr-&gt;street  == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;city    == NULL) || (*addr-&gt;city    == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;region  == NULL) || (*addr-&gt;region  == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;code    == NULL) || (*addr-&gt;code    == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;country == NULL) || (*addr-&gt;country == 0)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardDeliveryAddress *</div><div class='del'>-e_card_delivery_address_from_label(const ECardAddrLabel *label)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *addr = e_card_delivery_address_new ();</div><div class='del'>-	EAddressWestern *western = e_address_western_parse (label-&gt;data);</div><div class='del'>-	</div><div class='del'>-	addr-&gt;po      = g_strdup (western-&gt;po_box     );</div><div class='del'>-	addr-&gt;ext     = g_strdup (western-&gt;extended   );</div><div class='del'>-	addr-&gt;street  = g_strdup (western-&gt;street     );</div><div class='del'>-	addr-&gt;city    = g_strdup (western-&gt;locality   );</div><div class='del'>-	addr-&gt;region  = g_strdup (western-&gt;region     );</div><div class='del'>-	addr-&gt;code    = g_strdup (western-&gt;postal_code);</div><div class='del'>-	addr-&gt;country = g_strdup (western-&gt;country    );</div><div class='del'>-	addr-&gt;flags   = label-&gt;flags;</div><div class='del'>-	</div><div class='del'>-	e_address_western_free(western);</div><div class='del'>-	</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	char *strings[5], **stringptr = strings;</div><div class='del'>-	char *line1, *line22, *line2;</div><div class='del'>-	char *final;</div><div class='del'>-	if (addr-&gt;po &amp;&amp; *addr-&gt;po)</div><div class='del'>-		*(stringptr++) = addr-&gt;po;</div><div class='del'>-	if (addr-&gt;street &amp;&amp; *addr-&gt;street)</div><div class='del'>-		*(stringptr++) = addr-&gt;street;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line1 = g_strjoinv(" ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (addr-&gt;region &amp;&amp; *addr-&gt;region)</div><div class='del'>-		*(stringptr++) = addr-&gt;region;</div><div class='del'>-	if (addr-&gt;code &amp;&amp; *addr-&gt;code)</div><div class='del'>-		*(stringptr++) = addr-&gt;code;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line22 = g_strjoinv(" ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (addr-&gt;city &amp;&amp; *addr-&gt;city)</div><div class='del'>-		*(stringptr++) = addr-&gt;city;</div><div class='del'>-	if (line22 &amp;&amp; *line22)</div><div class='del'>-		*(stringptr++) = line22;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line2 = g_strjoinv(", ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (line1 &amp;&amp; *line1)</div><div class='del'>-		*(stringptr++) = line1;</div><div class='del'>-	if (addr-&gt;ext &amp;&amp; *addr-&gt;ext)</div><div class='del'>-		*(stringptr++) = addr-&gt;ext;</div><div class='del'>-	if (line2 &amp;&amp; *line2)</div><div class='del'>-		*(stringptr++) = line2;</div><div class='del'>-	if (addr-&gt;country &amp;&amp; *addr-&gt;country)</div><div class='del'>-		*(stringptr++) = addr-&gt;country;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	final = g_strjoinv("\n", strings);</div><div class='del'>-	g_free(line1);</div><div class='del'>-	g_free(line22);</div><div class='del'>-	g_free(line2);</div><div class='del'>-	return final;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *label;</div><div class='del'>-	label = e_card_address_label_new();</div><div class='del'>-	label-&gt;flags = addr-&gt;flags;</div><div class='del'>-	label-&gt;data = e_card_delivery_address_to_string(addr);</div><div class='del'>-</div><div class='del'>-	return label;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_address_label_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);</div><div class='del'>-</div><div class='del'>-	newaddr-&gt;ref_count = 1;</div><div class='del'>-	newaddr-&gt;data = NULL;</div><div class='del'>-	newaddr-&gt;flags = 0;</div><div class='del'>-	</div><div class='del'>-	return newaddr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_address_label_unref (ECardAddrLabel *addr)</div><div class='del'>-{</div><div class='del'>-	if (addr) {</div><div class='del'>-		addr-&gt;ref_count --;</div><div class='del'>-		if (addr-&gt;ref_count == 0) {</div><div class='del'>-			g_free(addr-&gt;data);</div><div class='del'>-			g_free(addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_address_label_ref (const ECardAddrLabel *addr)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *addr_mutable = (ECardAddrLabel *) addr;</div><div class='del'>-	if (addr_mutable)</div><div class='del'>-		addr_mutable-&gt;ref_count ++;</div><div class='del'>-	return addr_mutable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_address_label_copy (const ECardAddrLabel *addr)</div><div class='del'>-{</div><div class='del'>-	if ( addr ) {</div><div class='del'>-		ECardAddrLabel *addr_copy = e_card_address_label_new ();</div><div class='del'>-		addr_copy-&gt;data  = g_strdup(addr-&gt;data);</div><div class='del'>-		addr_copy-&gt;flags = addr-&gt;flags;</div><div class='del'>-		return addr_copy;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardName *e_card_name_new(void)</div><div class='del'>-{</div><div class='del'>-	ECardName *newname  = g_new(ECardName, 1);</div><div class='del'>-</div><div class='del'>-	newname-&gt;ref_count  = 1;</div><div class='del'>-	newname-&gt;prefix     = NULL;</div><div class='del'>-	newname-&gt;given      = NULL;</div><div class='del'>-	newname-&gt;additional = NULL;</div><div class='del'>-	newname-&gt;family     = NULL;</div><div class='del'>-	newname-&gt;suffix     = NULL;</div><div class='del'>-</div><div class='del'>-	return newname;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_name_unref(ECardName *name)</div><div class='del'>-{</div><div class='del'>-	if (name) {</div><div class='del'>-		name-&gt;ref_count --;</div><div class='del'>-		if (name-&gt;ref_count == 0) {</div><div class='del'>-			g_free (name-&gt;prefix);</div><div class='del'>-			g_free (name-&gt;given);</div><div class='del'>-			g_free (name-&gt;additional);</div><div class='del'>-			g_free (name-&gt;family);</div><div class='del'>-			g_free (name-&gt;suffix);</div><div class='del'>-			g_free (name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardName *</div><div class='del'>-e_card_name_ref(const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	ECardName *name_mutable = (ECardName *) name;</div><div class='del'>-	if (name_mutable)</div><div class='del'>-		name_mutable-&gt;ref_count ++;</div><div class='del'>-	return name_mutable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardName *</div><div class='del'>-e_card_name_copy(const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	if (name) {</div><div class='del'>-		ECardName *newname = e_card_name_new ();</div><div class='del'>-               </div><div class='del'>-		newname-&gt;prefix = g_strdup(name-&gt;prefix);</div><div class='del'>-		newname-&gt;given = g_strdup(name-&gt;given);</div><div class='del'>-		newname-&gt;additional = g_strdup(name-&gt;additional);</div><div class='del'>-		newname-&gt;family = g_strdup(name-&gt;family);</div><div class='del'>-		newname-&gt;suffix = g_strdup(name-&gt;suffix);</div><div class='del'>-</div><div class='del'>-		return newname;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_card_name_to_string(const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	char *strings[6], **stringptr = strings;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (name-&gt;prefix &amp;&amp; *name-&gt;prefix)</div><div class='del'>-		*(stringptr++) = name-&gt;prefix;</div><div class='del'>-	if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-		*(stringptr++) = name-&gt;given;</div><div class='del'>-	if (name-&gt;additional &amp;&amp; *name-&gt;additional)</div><div class='del'>-		*(stringptr++) = name-&gt;additional;</div><div class='del'>-	if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-		*(stringptr++) = name-&gt;family;</div><div class='del'>-	if (name-&gt;suffix &amp;&amp; *name-&gt;suffix)</div><div class='del'>-		*(stringptr++) = name-&gt;suffix;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	return g_strjoinv(" ", strings);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardName *</div><div class='del'>-e_card_name_from_string(const char *full_name)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = e_card_name_new ();</div><div class='del'>-	ENameWestern *western = e_name_western_parse (full_name);</div><div class='del'>-	</div><div class='del'>-	name-&gt;prefix     = g_strdup (western-&gt;prefix);</div><div class='del'>-	name-&gt;given      = g_strdup (western-&gt;first );</div><div class='del'>-	name-&gt;additional = g_strdup (western-&gt;middle);</div><div class='del'>-	name-&gt;family     = g_strdup (western-&gt;last  );</div><div class='del'>-	name-&gt;suffix     = g_strdup (western-&gt;suffix);</div><div class='del'>-	</div><div class='del'>-	e_name_western_free(western);</div><div class='del'>-	</div><div class='del'>-	return name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardArbitrary *</div><div class='del'>-e_card_arbitrary_new(void)</div><div class='del'>-{</div><div class='del'>-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);</div><div class='del'>-	arbitrary-&gt;ref_count = 1;</div><div class='del'>-	arbitrary-&gt;key = NULL;</div><div class='del'>-	arbitrary-&gt;type = NULL;</div><div class='del'>-	arbitrary-&gt;value = NULL;</div><div class='del'>-	return arbitrary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_arbitrary_unref(ECardArbitrary *arbitrary)</div><div class='del'>-{</div><div class='del'>-	if (arbitrary) {</div><div class='del'>-		arbitrary-&gt;ref_count --;</div><div class='del'>-		if (arbitrary-&gt;ref_count == 0) {</div><div class='del'>-			g_free(arbitrary-&gt;key);</div><div class='del'>-			g_free(arbitrary-&gt;type);</div><div class='del'>-			g_free(arbitrary-&gt;value);</div><div class='del'>-			g_free(arbitrary);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardArbitrary *</div><div class='del'>-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)</div><div class='del'>-{</div><div class='del'>-	if (arbitrary) {</div><div class='del'>-		ECardArbitrary *arb_copy = e_card_arbitrary_new ();</div><div class='del'>-		arb_copy-&gt;key = g_strdup(arbitrary-&gt;key);</div><div class='del'>-		arb_copy-&gt;type = g_strdup(arbitrary-&gt;type);</div><div class='del'>-		arb_copy-&gt;value = g_strdup(arbitrary-&gt;value);</div><div class='del'>-		return arb_copy;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardArbitrary *</div><div class='del'>-e_card_arbitrary_ref(const ECardArbitrary *arbitrary)</div><div class='del'>-{</div><div class='del'>-	ECardArbitrary *arbitrary_mutable = (ECardArbitrary *) arbitrary;</div><div class='del'>-	if (arbitrary_mutable)</div><div class='del'>-		arbitrary_mutable-&gt;ref_count ++;</div><div class='del'>-	return arbitrary_mutable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* EMail matching */</div><div class='del'>-static gboolean</div><div class='del'>-e_card_email_match_single_string (const gchar *a, const gchar *b)</div><div class='del'>-{</div><div class='del'>-	const gchar *xa = NULL, *xb = NULL;</div><div class='del'>-	gboolean match = TRUE;</div><div class='del'>-</div><div class='del'>-	for (xa=a; *xa &amp;&amp; *xa != '@'; ++xa);</div><div class='del'>-	for (xb=b; *xb &amp;&amp; *xb != '@'; ++xb);</div><div class='del'>-</div><div class='del'>-	if (xa-a != xb-b || *xa != *xb || g_strncasecmp (a, b, xa-a))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (*xa == '\0')</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Find the end of the string, then walk through backwards comparing.</div><div class='del'>-	   This is so that we'll match joe@foobar.com and joe@mail.foobar.com.</div><div class='del'>-	*/</div><div class='del'>-	while (*xa)</div><div class='del'>-		++xa;</div><div class='del'>-	while (*xb)</div><div class='del'>-		++xb;</div><div class='del'>-</div><div class='del'>-	while (match &amp;&amp; *xa != '@' &amp;&amp; *xb != '@') {</div><div class='del'>-		match = (tolower (*xa) == tolower (*xb));</div><div class='del'>-		--xa;</div><div class='del'>-		--xb;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	match = match &amp;&amp; ((tolower (*xa) == tolower (*xb)) || (*xa == '.') || (*xb == '.'));</div><div class='del'>-</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_email_match_string (const ECard *card, const gchar *str)</div><div class='del'>-{</div><div class='del'>-	EIterator *iter;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (card &amp;&amp; E_IS_CARD (card), FALSE);</div><div class='del'>-	g_return_val_if_fail (str != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	iter = e_list_get_iterator (card-&gt;email);</div><div class='del'>-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {</div><div class='del'>-		if (e_card_email_match_single_string (e_iterator_get (iter), str))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (iter));</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_card_email_find_number (const ECard *card, const gchar *email)</div><div class='del'>-{</div><div class='del'>-	EIterator *iter;</div><div class='del'>-	gint count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), -1);</div><div class='del'>-	g_return_val_if_fail (email != NULL, -1);</div><div class='del'>-</div><div class='del'>-	iter = e_list_get_iterator (card-&gt;email);</div><div class='del'>-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {</div><div class='del'>-		if (!g_strcasecmp (e_iterator_get (iter), email))</div><div class='del'>-			goto finished;</div><div class='del'>-		++count;</div><div class='del'>-	}</div><div class='del'>-	count = -1;</div><div class='del'>-</div><div class='del'>- finished:</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (iter));</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECard lifecycle management and vCard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(object);</div><div class='del'>-	g_free(card-&gt;id);</div><div class='del'>-	if (card-&gt;book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;book));</div><div class='del'>-	g_free(card-&gt;file_as);</div><div class='del'>-	g_free(card-&gt;fname);</div><div class='del'>-	e_card_name_unref(card-&gt;name);</div><div class='del'>-	g_free(card-&gt;bday);</div><div class='del'>-</div><div class='del'>-	g_free(card-&gt;url);</div><div class='del'>-	g_free(card-&gt;org);</div><div class='del'>-	g_free(card-&gt;org_unit);</div><div class='del'>-	g_free(card-&gt;office);</div><div class='del'>-	g_free(card-&gt;title);</div><div class='del'>-	g_free(card-&gt;role);</div><div class='del'>-	g_free(card-&gt;manager);</div><div class='del'>-	g_free(card-&gt;assistant);</div><div class='del'>-	g_free(card-&gt;nickname);</div><div class='del'>-	g_free(card-&gt;spouse);</div><div class='del'>-	g_free(card-&gt;anniversary);</div><div class='del'>-	g_free(card-&gt;caluri);</div><div class='del'>-	g_free(card-&gt;fburl);</div><div class='del'>-	g_free(card-&gt;note);</div><div class='del'>-	g_free(card-&gt;related_contacts);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;categories)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card-&gt;categories));</div><div class='del'>-	if (card-&gt;email)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card-&gt;email));</div><div class='del'>-	if (card-&gt;phone)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card-&gt;phone));</div><div class='del'>-	if (card-&gt;address)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card-&gt;address));</div><div class='del'>-	if (card-&gt;address_label)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card-&gt;address_label));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the card */</div><div class='del'>-static void</div><div class='del'>-e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	</div><div class='del'>-	card = E_CARD (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_FILE_AS:</div><div class='del'>-		g_free(card-&gt;file_as);</div><div class='del'>-		card-&gt;file_as = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		if (card-&gt;file_as == NULL)</div><div class='del'>-			card-&gt;file_as = g_strdup("");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_FULL_NAME:</div><div class='del'>-		g_free(card-&gt;fname);</div><div class='del'>-		card-&gt;fname = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		if (card-&gt;fname == NULL)</div><div class='del'>-			card-&gt;fname = g_strdup("");</div><div class='del'>-</div><div class='del'>-		e_card_name_unref (card-&gt;name);</div><div class='del'>-		card-&gt;name = e_card_name_from_string (card-&gt;fname);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		e_card_name_unref (card-&gt;name);</div><div class='del'>-		card-&gt;name = e_card_name_ref(GTK_VALUE_POINTER(*arg));</div><div class='del'>-		if (card-&gt;name == NULL)</div><div class='del'>-			card-&gt;name = e_card_name_new();</div><div class='del'>-		if (card-&gt;fname == NULL) {</div><div class='del'>-			card-&gt;fname = e_card_name_to_string(card-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		if (card-&gt;file_as == NULL) {</div><div class='del'>-			ECardName *name = card-&gt;name;</div><div class='del'>-			char *strings[3], **stringptr;</div><div class='del'>-			char *string;</div><div class='del'>-			stringptr = strings;</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-			*stringptr = NULL;</div><div class='del'>-			string = g_strjoinv(", ", strings);</div><div class='del'>-			card-&gt;file_as = string;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		if (card-&gt;categories)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card-&gt;categories));</div><div class='del'>-		card-&gt;categories = NULL;</div><div class='del'>-		if (GTK_VALUE_STRING(*arg))</div><div class='del'>-			do_parse_categories(card, GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORY_LIST:</div><div class='del'>-		if (card-&gt;categories)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card-&gt;categories));</div><div class='del'>-		card-&gt;categories = E_LIST(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-		if (card-&gt;categories)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(card-&gt;categories));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BIRTH_DATE:</div><div class='del'>-		g_free(card-&gt;bday);</div><div class='del'>-		if (GTK_VALUE_POINTER (*arg)) {</div><div class='del'>-			card-&gt;bday = g_new (ECardDate, 1);</div><div class='del'>-			memcpy (card-&gt;bday, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));</div><div class='del'>-		} else {</div><div class='del'>-			card-&gt;bday = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_URL:</div><div class='del'>-		g_free(card-&gt;url);</div><div class='del'>-		card-&gt;url = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG:</div><div class='del'>-		g_free(card-&gt;org);</div><div class='del'>-		card-&gt;org = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG_UNIT:</div><div class='del'>-		g_free(card-&gt;org_unit);</div><div class='del'>-		card-&gt;org_unit = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_OFFICE:</div><div class='del'>-		g_free(card-&gt;office);</div><div class='del'>-		card-&gt;office = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TITLE:</div><div class='del'>-		g_free(card-&gt;title);</div><div class='del'>-		card-&gt;title = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ROLE:</div><div class='del'>-		g_free(card-&gt;role);</div><div class='del'>-		card-&gt;role = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MANAGER:</div><div class='del'>-		g_free(card-&gt;manager);</div><div class='del'>-		card-&gt;manager = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ASSISTANT:</div><div class='del'>-		g_free(card-&gt;assistant);</div><div class='del'>-		card-&gt;assistant = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NICKNAME:</div><div class='del'>-		g_free(card-&gt;nickname);</div><div class='del'>-		card-&gt;nickname = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPOUSE:</div><div class='del'>-		g_free(card-&gt;spouse);</div><div class='del'>-		card-&gt;spouse = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ANNIVERSARY:</div><div class='del'>-		g_free(card-&gt;anniversary);</div><div class='del'>-		if (GTK_VALUE_POINTER (*arg)) {</div><div class='del'>-			card-&gt;anniversary = g_new (ECardDate, 1);</div><div class='del'>-			memcpy (card-&gt;anniversary, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));</div><div class='del'>-		} else {</div><div class='del'>-			card-&gt;anniversary = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MAILER:</div><div class='del'>-		g_free(card-&gt;mailer);</div><div class='del'>-		card-&gt;mailer = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CALURI:</div><div class='del'>-		g_free(card-&gt;caluri);</div><div class='del'>-		card-&gt;caluri = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FBURL:</div><div class='del'>-		g_free(card-&gt;fburl);</div><div class='del'>-		card-&gt;fburl = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NOTE:</div><div class='del'>-		g_free (card-&gt;note);</div><div class='del'>-		card-&gt;note = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_RELATED_CONTACTS:</div><div class='del'>-		g_free (card-&gt;related_contacts);</div><div class='del'>-		card-&gt;related_contacts = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_WANTS_HTML:</div><div class='del'>-		card-&gt;wants_html = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		card-&gt;wants_html_set = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ARBITRARY:</div><div class='del'>-		if (card-&gt;arbitrary)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card-&gt;arbitrary));</div><div class='del'>-		card-&gt;arbitrary = E_LIST(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-		if (card-&gt;arbitrary)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(card-&gt;arbitrary));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ID:</div><div class='del'>-		g_free(card-&gt;id);</div><div class='del'>-		card-&gt;id = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		if (card-&gt;id == NULL)</div><div class='del'>-			card-&gt;id = g_strdup ("");</div><div class='del'>-		break;</div><div class='del'>-	case ARG_LAST_USE:</div><div class='del'>-		g_free(card-&gt;last_use);</div><div class='del'>-		if (GTK_VALUE_POINTER (*arg)) {</div><div class='del'>-			card-&gt;last_use = g_new (ECardDate, 1);</div><div class='del'>-			memcpy (card-&gt;last_use, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));</div><div class='del'>-		} else {</div><div class='del'>-			card-&gt;last_use = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_USE_SCORE:</div><div class='del'>-		card-&gt;raw_use_score = GTK_VALUE_FLOAT(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EVOLUTION_LIST:</div><div class='del'>-		card-&gt;list = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:</div><div class='del'>-		card-&gt;list_show_addresses = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the card */</div><div class='del'>-static void</div><div class='del'>-e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	card = E_CARD (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_FILE_AS:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = card-&gt;file_as;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FULL_NAME:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = card-&gt;fname;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;name;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		if (!card-&gt;address)</div><div class='del'>-			card-&gt;address = e_list_new((EListCopyFunc) e_card_delivery_address_ref,</div><div class='del'>-						   (EListFreeFunc) e_card_delivery_address_unref,</div><div class='del'>-						   NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;address);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ADDRESS_LABEL:</div><div class='del'>-		if (!card-&gt;address_label)</div><div class='del'>-			card-&gt;address_label = e_list_new((EListCopyFunc) e_card_address_label_ref,</div><div class='del'>-							 (EListFreeFunc) e_card_address_label_unref,</div><div class='del'>-							 NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;address_label);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PHONE:</div><div class='del'>-		if (!card-&gt;phone)</div><div class='del'>-			card-&gt;phone = e_list_new((EListCopyFunc) e_card_phone_ref,</div><div class='del'>-						 (EListFreeFunc) e_card_phone_unref,</div><div class='del'>-						 NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;phone);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EMAIL:</div><div class='del'>-		if (!card-&gt;email)</div><div class='del'>-			card-&gt;email = e_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-						 (EListFreeFunc) g_free,</div><div class='del'>-						 NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;email);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		{</div><div class='del'>-			int i;</div><div class='del'>-			char ** strs;</div><div class='del'>-			int length;</div><div class='del'>-			EIterator *iterator;</div><div class='del'>-			if (!card-&gt;categories)</div><div class='del'>-				card-&gt;categories = e_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-							      (EListFreeFunc) g_free,</div><div class='del'>-							      NULL);</div><div class='del'>-			length = e_list_length(card-&gt;categories);</div><div class='del'>-			strs = g_new(char *, length + 1);</div><div class='del'>-			for (iterator = e_list_get_iterator(card-&gt;categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {</div><div class='del'>-				strs[i] = (char *)e_iterator_get(iterator);</div><div class='del'>-			}</div><div class='del'>-			strs[i] = 0;</div><div class='del'>-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);</div><div class='del'>-			g_free(strs);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORY_LIST:</div><div class='del'>-		if (!card-&gt;categories)</div><div class='del'>-			card-&gt;categories = e_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-						      (EListFreeFunc) g_free,</div><div class='del'>-						      NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;categories);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BIRTH_DATE:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;bday;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_URL:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;url;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;org;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG_UNIT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;org_unit;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_OFFICE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;office;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TITLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;title;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ROLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;role;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MANAGER:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;manager;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ASSISTANT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;assistant;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NICKNAME:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;nickname;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPOUSE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;spouse;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ANNIVERSARY:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;anniversary;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MAILER:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;mailer;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CALURI:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;caluri;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FBURL:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;fburl;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NOTE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;note;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_RELATED_CONTACTS:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;related_contacts;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_WANTS_HTML:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;wants_html;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_WANTS_HTML_SET:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;wants_html_set;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ARBITRARY:</div><div class='del'>-		if (!card-&gt;arbitrary)</div><div class='del'>-			card-&gt;arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_ref,</div><div class='del'>-						     (EListFreeFunc) e_card_arbitrary_unref,</div><div class='del'>-						     NULL);</div><div class='del'>-</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;arbitrary);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ID:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;id;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_LAST_USE:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;last_use;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_USE_SCORE:</div><div class='del'>-		GTK_VALUE_FLOAT(*arg) = e_card_get_use_score (card);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EVOLUTION_LIST:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;list;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;list_show_addresses;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_card_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_card_init (ECard *card)</div><div class='del'>-{</div><div class='del'>-	card-&gt;id                  = g_strdup("");</div><div class='del'>-	</div><div class='del'>-	card-&gt;file_as             = NULL;</div><div class='del'>-	card-&gt;fname               = NULL;</div><div class='del'>-	card-&gt;name                = NULL;</div><div class='del'>-	card-&gt;bday                = NULL;</div><div class='del'>-	card-&gt;email               = NULL;</div><div class='del'>-	card-&gt;phone               = NULL;</div><div class='del'>-	card-&gt;address             = NULL;</div><div class='del'>-	card-&gt;address_label       = NULL;</div><div class='del'>-	card-&gt;url                 = NULL;</div><div class='del'>-	card-&gt;org                 = NULL;</div><div class='del'>-	card-&gt;org_unit            = NULL;</div><div class='del'>-	card-&gt;office              = NULL;</div><div class='del'>-	card-&gt;title               = NULL;</div><div class='del'>-	card-&gt;role                = NULL;</div><div class='del'>-	card-&gt;manager             = NULL;</div><div class='del'>-	card-&gt;assistant           = NULL;</div><div class='del'>-	card-&gt;nickname            = NULL;</div><div class='del'>-	card-&gt;spouse              = NULL;</div><div class='del'>-	card-&gt;anniversary         = NULL;</div><div class='del'>-	card-&gt;mailer              = NULL;</div><div class='del'>-	card-&gt;caluri              = NULL;</div><div class='del'>-	card-&gt;fburl               = NULL;</div><div class='del'>-	card-&gt;note                = NULL;</div><div class='del'>-	card-&gt;related_contacts    = NULL;</div><div class='del'>-	card-&gt;categories          = NULL;</div><div class='del'>-	card-&gt;wants_html          = FALSE;</div><div class='del'>-	card-&gt;wants_html_set      = FALSE;</div><div class='del'>-	card-&gt;list                = FALSE;</div><div class='del'>-	card-&gt;list_show_addresses = FALSE;</div><div class='del'>-	card-&gt;arbitrary           = NULL;</div><div class='del'>-	card-&gt;last_use            = NULL;</div><div class='del'>-	card-&gt;raw_use_score       = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_card_load_cards_from_file_with_default_charset(const char *filename, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-	while(vobj) {</div><div class='del'>-		VObject *next;</div><div class='del'>-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-		parse(card, vobj, default_charset);</div><div class='del'>-		next = nextVObjectInList(vobj);</div><div class='del'>-		cleanVObject(vobj);</div><div class='del'>-		vobj = next;</div><div class='del'>-		list = g_list_prepend(list, card);</div><div class='del'>-	}</div><div class='del'>-	list = g_list_reverse(list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_card_load_cards_from_file(const char *filename)</div><div class='del'>-{</div><div class='del'>-	return e_card_load_cards_from_file_with_default_charset (filename, "UTF-8");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_card_load_cards_from_string_with_default_charset(const char *str, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj = Parse_MIME(str, strlen (str));</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-	while(vobj) {</div><div class='del'>-		VObject *next;</div><div class='del'>-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-		parse(card, vobj, default_charset);</div><div class='del'>-		next = nextVObjectInList(vobj);</div><div class='del'>-		cleanVObject(vobj);</div><div class='del'>-		vobj = next;</div><div class='del'>-		list = g_list_prepend(list, card);</div><div class='del'>-	}</div><div class='del'>-	list = g_list_reverse(list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_card_load_cards_from_string(const char *str)</div><div class='del'>-{</div><div class='del'>-	return e_card_load_cards_from_string_with_default_charset (str, "UTF-8");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_free_empty_lists (ECard *card)</div><div class='del'>-{</div><div class='del'>-	if (card-&gt;address &amp;&amp; e_list_length (card-&gt;address) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;address));</div><div class='del'>-		card-&gt;address = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;address_label &amp;&amp; e_list_length (card-&gt;address_label) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;address_label));</div><div class='del'>-		card-&gt;address_label = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;phone &amp;&amp; e_list_length (card-&gt;phone) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;phone));</div><div class='del'>-		card-&gt;phone = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;email &amp;&amp; e_list_length (card-&gt;email) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;email));</div><div class='del'>-		card-&gt;email = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;categories &amp;&amp; e_list_length (card-&gt;categories) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;categories));</div><div class='del'>-		card-&gt;categories = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;arbitrary &amp;&amp; e_list_length (card-&gt;arbitrary) == 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (card-&gt;arbitrary));</div><div class='del'>-		card-&gt;arbitrary = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-assign_string(VObject *vobj, char *default_charset, char **string)</div><div class='del'>-{</div><div class='del'>-	int type = vObjectValueType(vobj);</div><div class='del'>-	char *str;</div><div class='del'>-	char *charset = default_charset;</div><div class='del'>-	gboolean free_charset = FALSE;</div><div class='del'>-	VObject *charset_obj;</div><div class='del'>-</div><div class='del'>-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {</div><div class='del'>-		switch (vObjectValueType (charset_obj)) {</div><div class='del'>-		case VCVT_STRINGZ:</div><div class='del'>-			charset = (char *) vObjectStringZValue(charset_obj);</div><div class='del'>-			break;</div><div class='del'>-		case VCVT_USTRINGZ:</div><div class='del'>-			charset = fakeCString (vObjectUStringZValue (charset_obj));</div><div class='del'>-			free_charset = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case VCVT_STRINGZ:</div><div class='del'>-		if (strcmp (charset, "UTF-8"))</div><div class='del'>-			*string = e_utf8_from_charset_string (charset, vObjectStringZValue(vobj));</div><div class='del'>-		else</div><div class='del'>-			*string = g_strdup(vObjectStringZValue(vobj));</div><div class='del'>-		break;</div><div class='del'>-	case VCVT_USTRINGZ:</div><div class='del'>-		str = fakeCString (vObjectUStringZValue (vobj));</div><div class='del'>-		if (strcmp (charset, "UTF-8"))</div><div class='del'>-			*string = e_utf8_from_charset_string (charset, str);</div><div class='del'>-		else</div><div class='del'>-			*string = g_strdup(str);</div><div class='del'>-		free(str);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		*string = g_strdup("");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (free_charset) {</div><div class='del'>-		free (charset);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ECardDate</div><div class='del'>-e_card_date_from_string (const char *str)</div><div class='del'>-{</div><div class='del'>-	ECardDate date;</div><div class='del'>-	int length;</div><div class='del'>-</div><div class='del'>-	date.year = 0;</div><div class='del'>-	date.month = 0;</div><div class='del'>-	date.day = 0;</div><div class='del'>-</div><div class='del'>-	length = strlen(str);</div><div class='del'>-	</div><div class='del'>-	if (length == 10 ) {</div><div class='del'>-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;</div><div class='del'>-		date.month = str[5] * 10 + str[6] - '0' * 11;</div><div class='del'>-		date.day = str[8] * 10 + str[9] - '0' * 11;</div><div class='del'>-	} else if ( length == 8 ) {</div><div class='del'>-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;</div><div class='del'>-		date.month = str[4] * 10 + str[5] - '0' * 11;</div><div class='del'>-		date.day = str[6] * 10 + str[7] - '0' * 11;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return date;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_v_object_get_child_value(VObject *vobj, char *name, char *default_charset)</div><div class='del'>-{</div><div class='del'>-	char *ret_val;</div><div class='del'>-	VObjectIterator iterator;</div><div class='del'>-	gboolean free_charset = FALSE;</div><div class='del'>-	VObject *charset_obj;</div><div class='del'>-</div><div class='del'>-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {</div><div class='del'>-		switch (vObjectValueType (charset_obj)) {</div><div class='del'>-		case VCVT_STRINGZ:</div><div class='del'>-			default_charset = (char *) vObjectStringZValue(charset_obj);</div><div class='del'>-			break;</div><div class='del'>-		case VCVT_USTRINGZ:</div><div class='del'>-			default_charset = fakeCString (vObjectUStringZValue (charset_obj));</div><div class='del'>-			free_charset = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	initPropIterator(&amp;iterator, vobj);</div><div class='del'>-	while(moreIteration (&amp;iterator)) {</div><div class='del'>-		VObject *attribute = nextVObject(&amp;iterator);</div><div class='del'>-		const char *id = vObjectName(attribute);</div><div class='del'>-		if ( ! strcmp(id, name) ) {</div><div class='del'>-			assign_string(attribute, default_charset, &amp;ret_val);</div><div class='del'>-			return ret_val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (free_charset)</div><div class='del'>-		free (default_charset);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct { </div><div class='del'>-	char *id;</div><div class='del'>-	ECardPhoneFlags flag;</div><div class='del'>-} phone_pairs[] = {</div><div class='del'>-	{ VCPreferredProp,         E_CARD_PHONE_PREF },</div><div class='del'>-	{ VCWorkProp,              E_CARD_PHONE_WORK },</div><div class='del'>-	{ VCHomeProp,              E_CARD_PHONE_HOME },</div><div class='del'>-	{ VCVoiceProp,             E_CARD_PHONE_VOICE },</div><div class='del'>-	{ VCFaxProp,               E_CARD_PHONE_FAX },</div><div class='del'>-	{ VCMessageProp,           E_CARD_PHONE_MSG },</div><div class='del'>-	{ VCCellularProp,          E_CARD_PHONE_CELL },</div><div class='del'>-	{ VCPagerProp,             E_CARD_PHONE_PAGER },</div><div class='del'>-	{ VCBBSProp,               E_CARD_PHONE_BBS },</div><div class='del'>-	{ VCModemProp,             E_CARD_PHONE_MODEM },</div><div class='del'>-	{ VCCarProp,               E_CARD_PHONE_CAR },</div><div class='del'>-	{ VCISDNProp,              E_CARD_PHONE_ISDN },</div><div class='del'>-	{ VCVideoProp,             E_CARD_PHONE_VIDEO },</div><div class='del'>-	{ "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT },</div><div class='del'>-	{ "X-EVOLUTION-CALLBACK",  E_CARD_PHONE_CALLBACK  },</div><div class='del'>-	{ "X-EVOLUTION-RADIO",     E_CARD_PHONE_RADIO     },</div><div class='del'>-	{ "X-EVOLUTION-TELEX",     E_CARD_PHONE_TELEX     },</div><div class='del'>-	{ "X-EVOLUTION-TTYTDD",    E_CARD_PHONE_TTYTDD    },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECardPhoneFlags</div><div class='del'>-get_phone_flags (VObject *vobj)</div><div class='del'>-{</div><div class='del'>-	ECardPhoneFlags ret = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {</div><div class='del'>-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {</div><div class='del'>-			ret |= phone_pairs[i].flag;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {</div><div class='del'>-		if (flags &amp; phone_pairs[i].flag) {</div><div class='del'>-				addProp (vobj, phone_pairs[i].id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct { </div><div class='del'>-	char *id;</div><div class='del'>-	ECardAddressFlags flag;</div><div class='del'>-} addr_pairs[] = {</div><div class='del'>-	{ VCDomesticProp, E_CARD_ADDR_DOM },</div><div class='del'>-	{ VCInternationalProp, E_CARD_ADDR_INTL },</div><div class='del'>-	{ VCPostalProp, E_CARD_ADDR_POSTAL },</div><div class='del'>-	{ VCParcelProp, E_CARD_ADDR_PARCEL },</div><div class='del'>-	{ VCHomeProp, E_CARD_ADDR_HOME },</div><div class='del'>-	{ VCWorkProp, E_CARD_ADDR_WORK },</div><div class='del'>-	{ "PREF", E_CARD_ADDR_DEFAULT },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECardAddressFlags</div><div class='del'>-get_address_flags (VObject *vobj)</div><div class='del'>-{</div><div class='del'>-	ECardAddressFlags ret = 0;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {</div><div class='del'>-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {</div><div class='del'>-			ret |= addr_pairs[i].flag;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_address_flags (VObject *vobj, ECardAddressFlags flags)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {</div><div class='del'>-		if (flags &amp; addr_pairs[i].flag) {</div><div class='del'>-			addProp (vobj, addr_pairs[i].id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution-Composer.h&gt;</div><div class='del'>-</div><div class='del'>-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer"</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_list_send (GList *cards, ECardDisposition disposition)</div><div class='del'>-{</div><div class='del'>-	BonoboObjectClient *bonobo_server;</div><div class='del'>-	GNOME_Evolution_Composer composer_server;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	if (cards == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* First, I obtain an object reference that represents the Composer. */</div><div class='del'>-	bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (bonobo_server != NULL);</div><div class='del'>-</div><div class='del'>-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (disposition == E_CARD_DISPOSITION_AS_TO) {</div><div class='del'>-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;</div><div class='del'>-		CORBA_char *subject;</div><div class='del'>-		int to_i, bcc_i;</div><div class='del'>-		GList *iter;</div><div class='del'>-		gint to_length = 0, bcc_length = 0;</div><div class='del'>-</div><div class='del'>-		/* Figure out how many addresses of each kind we have. */</div><div class='del'>-		for (iter = cards; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-			ECard *card = E_CARD (iter-&gt;data);</div><div class='del'>-			if (e_card_evolution_list (card)) {</div><div class='del'>-				gint len = card-&gt;email ? e_list_length (card-&gt;email) : 0;</div><div class='del'>-				if (e_card_evolution_list_show_addresses (card))</div><div class='del'>-					to_length += len;</div><div class='del'>-				else</div><div class='del'>-					bcc_length += len;</div><div class='del'>-			} else {</div><div class='del'>-				if (card-&gt;email != NULL)</div><div class='del'>-					++to_length;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now I have to make a CORBA sequences that represents a recipient list with</div><div class='del'>-		   the right number of entries, for the cards. */</div><div class='del'>-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		to_list-&gt;_maximum = to_length;</div><div class='del'>-		to_list-&gt;_length = to_length;</div><div class='del'>-		if (to_length &gt; 0) {</div><div class='del'>-			to_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to_length);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		cc_list-&gt;_maximum = cc_list-&gt;_length = 0;</div><div class='del'>-		</div><div class='del'>-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		bcc_list-&gt;_maximum = bcc_length;</div><div class='del'>-		bcc_list-&gt;_length = bcc_length;</div><div class='del'>-		if (bcc_length &gt; 0) {</div><div class='del'>-			bcc_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc_length);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		to_i = 0;</div><div class='del'>-		bcc_i = 0;</div><div class='del'>-		while (cards != NULL) {</div><div class='del'>-			ECard *card = cards-&gt;data;</div><div class='del'>-			EIterator *iterator;</div><div class='del'>-			gchar *name, *addr;</div><div class='del'>-			gboolean is_list, is_hidden, free_name_addr;</div><div class='del'>-			GNOME_Evolution_Composer_Recipient *recipient;</div><div class='del'>-</div><div class='del'>-			if (card-&gt;email != NULL) {</div><div class='del'>-</div><div class='del'>-				is_list = e_card_evolution_list (card);</div><div class='del'>-				is_hidden = is_list &amp;&amp; !e_card_evolution_list_show_addresses (card);</div><div class='del'>-			</div><div class='del'>-				for (iterator = e_list_get_iterator (card-&gt;email); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {</div><div class='del'>-					</div><div class='del'>-					if (is_hidden) {</div><div class='del'>-						recipient = &amp;(bcc_list-&gt;_buffer[bcc_i]);</div><div class='del'>-						++bcc_i;</div><div class='del'>-					} else {</div><div class='del'>-						recipient = &amp;(to_list-&gt;_buffer[to_i]);</div><div class='del'>-						++to_i;</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					name = "";</div><div class='del'>-					addr = "";</div><div class='del'>-					free_name_addr = FALSE;</div><div class='del'>-					if (e_iterator_is_valid (iterator)) {</div><div class='del'>-						</div><div class='del'>-						if (is_list) {</div><div class='del'>-							/* We need to decode the list entries, which are XMLified EDestinations. */</div><div class='del'>-							EDestination *dest = e_destination_import (e_iterator_get (iterator));</div><div class='del'>-							if (dest != NULL) {</div><div class='del'>-								name = g_strdup (e_destination_get_name (dest));</div><div class='del'>-								addr = g_strdup (e_destination_get_email (dest));</div><div class='del'>-								free_name_addr = TRUE;</div><div class='del'>-								gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-							}</div><div class='del'>-							</div><div class='del'>-						} else { /* is just a plain old card */</div><div class='del'>-							if (card-&gt;name)</div><div class='del'>-								name = e_card_name_to_string (card-&gt;name);</div><div class='del'>-							addr = g_strdup ((char *) e_iterator_get (iterator));</div><div class='del'>-							free_name_addr = TRUE;</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					recipient-&gt;name    = CORBA_string_dup (name ? name : "");</div><div class='del'>-					recipient-&gt;address = CORBA_string_dup (addr ? addr : "");</div><div class='del'>-					</div><div class='del'>-					if (free_name_addr) {</div><div class='del'>-						g_free ((gchar *) name);</div><div class='del'>-						g_free ((gchar *) addr);</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					/* If this isn't a list, we quit after the first (i.e. the default) address. */</div><div class='del'>-					if (!is_list)</div><div class='del'>-						break;</div><div class='del'>-					</div><div class='del'>-				}</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			cards = g_list_next (cards);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		subject = CORBA_string_dup ("");</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_free (to_list);</div><div class='del'>-		CORBA_free (cc_list);</div><div class='del'>-		CORBA_free (bcc_list);</div><div class='del'>-		CORBA_free (subject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (disposition == E_CARD_DISPOSITION_AS_ATTACHMENT) {</div><div class='del'>-		CORBA_char *content_type, *filename, *description;</div><div class='del'>-		GNOME_Evolution_Composer_AttachmentData *attach_data;</div><div class='del'>-		CORBA_boolean show_inline;</div><div class='del'>-		char *tempstr;</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;</div><div class='del'>-		CORBA_char *subject;</div><div class='del'>-		</div><div class='del'>-		content_type = CORBA_string_dup ("text/x-vcard");</div><div class='del'>-		filename = CORBA_string_dup ("");</div><div class='del'>-</div><div class='del'>-		if (cards-&gt;next) {</div><div class='del'>-			description = CORBA_string_dup (_("Multiple VCards"));</div><div class='del'>-		} else {</div><div class='del'>-			char *file_as;</div><div class='del'>-</div><div class='del'>-			gtk_object_get(GTK_OBJECT(cards-&gt;data),</div><div class='del'>-				       "file_as", &amp;file_as,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-			tempstr = g_strdup_printf (_("VCard for %s"), file_as);</div><div class='del'>-			description = CORBA_string_dup (tempstr);</div><div class='del'>-			g_free (tempstr);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		show_inline = FALSE;</div><div class='del'>-</div><div class='del'>-		tempstr = e_card_list_get_vcard (cards);</div><div class='del'>-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();</div><div class='del'>-		attach_data-&gt;_maximum = attach_data-&gt;_length = strlen (tempstr);</div><div class='del'>-		attach_data-&gt;_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data-&gt;_length);</div><div class='del'>-		strcpy (attach_data-&gt;_buffer, tempstr);</div><div class='del'>-		g_free (tempstr);</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Composer_attachData (composer_server, </div><div class='del'>-						     content_type, filename, description,</div><div class='del'>-						     show_inline, attach_data,</div><div class='del'>-						     &amp;ev);</div><div class='del'>-	</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	</div><div class='del'>-		CORBA_free (content_type);</div><div class='del'>-		CORBA_free (filename);</div><div class='del'>-		CORBA_free (description);</div><div class='del'>-		CORBA_free (attach_data);</div><div class='del'>-</div><div class='del'>-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		to_list-&gt;_maximum = to_list-&gt;_length = 0;</div><div class='del'>-		</div><div class='del'>-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		cc_list-&gt;_maximum = cc_list-&gt;_length = 0;</div><div class='del'>-</div><div class='del'>-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		bcc_list-&gt;_maximum = bcc_list-&gt;_length = 0;</div><div class='del'>-</div><div class='del'>-		if (!cards || cards-&gt;next) {</div><div class='del'>-			subject = CORBA_string_dup ("Contact information");</div><div class='del'>-		} else {</div><div class='del'>-			ECard *card = cards-&gt;data;</div><div class='del'>-			const gchar *tempstr2;</div><div class='del'>-</div><div class='del'>-			tempstr2 = NULL;</div><div class='del'>-			gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-				       "file_as", &amp;tempstr2,</div><div class='del'>-				       NULL);</div><div class='del'>-			if (!tempstr2 || !*tempstr2)</div><div class='del'>-				gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-					       "full_name", &amp;tempstr2,</div><div class='del'>-					       NULL);</div><div class='del'>-			if (!tempstr2 || !*tempstr2)</div><div class='del'>-				gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-					       "org", &amp;tempstr2,</div><div class='del'>-					       NULL);</div><div class='del'>-			if (!tempstr2 || !*tempstr2) {</div><div class='del'>-				EList *list;</div><div class='del'>-				EIterator *iterator;</div><div class='del'>-				gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-					       "email", &amp;list,</div><div class='del'>-					       NULL);</div><div class='del'>-				iterator = e_list_get_iterator (list);</div><div class='del'>-				if (e_iterator_is_valid (iterator)) {</div><div class='del'>-					tempstr2 = e_iterator_get (iterator);</div><div class='del'>-				}</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!tempstr2 || !*tempstr2)</div><div class='del'>-				tempstr = g_strdup_printf ("Contact information");</div><div class='del'>-			else</div><div class='del'>-				tempstr = g_strdup_printf ("Contact information for %s", tempstr2);</div><div class='del'>-			subject = CORBA_string_dup (tempstr);</div><div class='del'>-			g_free (tempstr);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &amp;ev);</div><div class='del'>-</div><div class='del'>-		CORBA_free (to_list);</div><div class='del'>-		CORBA_free (cc_list);</div><div class='del'>-		CORBA_free (bcc_list);</div><div class='del'>-		CORBA_free (subject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Composer_show (composer_server, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_send (ECard *card, ECardDisposition disposition)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	list = g_list_prepend (NULL, card);</div><div class='del'>-	e_card_list_send (list, disposition);</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_evolution_list (ECard *card)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card &amp;&amp; E_IS_CARD (card), FALSE);</div><div class='del'>-	return card-&gt;list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_evolution_list_show_addresses (ECard *card)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (card &amp;&amp; E_IS_CARD (card), FALSE);</div><div class='del'>-	return card-&gt;list_show_addresses;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct _CardLoadData CardLoadData;</div><div class='del'>-struct _CardLoadData {</div><div class='del'>-	gchar *card_id;</div><div class='del'>-	ECardCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardLoadData *data = (CardLoadData *) closure;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;cb != NULL) {</div><div class='del'>-		if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-			data-&gt;cb (card, data-&gt;closure);</div><div class='del'>-		else</div><div class='del'>-			data-&gt;cb (NULL, data-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (data-&gt;card_id);</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_load_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardLoadData *data = (CardLoadData *) closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		e_book_get_card (book, data-&gt;card_id, get_card_cb, closure);</div><div class='del'>-	else {</div><div class='del'>-		data-&gt;cb (NULL, data-&gt;closure);</div><div class='del'>-		g_free (data-&gt;card_id);</div><div class='del'>-		g_free (data);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_card_load_uri (const gchar *book_uri, const gchar *uid, ECardCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardLoadData *data;</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	data          = g_new (CardLoadData, 1);</div><div class='del'>-	data-&gt;card_id = g_strdup (uid);</div><div class='del'>-	data-&gt;cb      = cb;</div><div class='del'>-	data-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	e_book_load_uri (book, book_uri, card_load_cb, data);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h<br/>deleted file mode 100644<br/>index 23876bd63a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-card.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Arturo Espinosa</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_H__</div><div class='del'>-#define __E_CARD_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-types.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD            (e_card_get_type ())</div><div class='del'>-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))</div><div class='del'>-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))</div><div class='del'>-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))</div><div class='del'>-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))</div><div class='del'>-</div><div class='del'>-typedef struct _ECard ECard;</div><div class='del'>-typedef struct _ECardClass ECardClass;</div><div class='del'>-</div><div class='del'>-struct _EBook; /* Forward reference */</div><div class='del'>-</div><div class='del'>-struct _ECard {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	char *id;</div><div class='del'>-</div><div class='del'>-	struct _EBook   *book;          /* The EBook this card is from.     */</div><div class='del'>-</div><div class='del'>-	char            *file_as;       /* The File As field.               */</div><div class='del'>-	char            *fname;         /* The full name.                   */</div><div class='del'>-	ECardName       *name;          /* The structured name.             */</div><div class='del'>-	EList           *address;  	/* Delivery addresses (ECardDeliveryAddress *) */</div><div class='del'>-	EList           *address_label; /* Delivery address labels</div><div class='del'>-					 * (ECardAddrLabel *)               */</div><div class='del'>-</div><div class='del'>-	EList           *phone;         /* Phone numbers (ECardPhone *)     */</div><div class='del'>-	EList           *email;         /* Email addresses (char *)         */</div><div class='del'>-	char            *url;	        /* The person's web page.           */</div><div class='del'>-</div><div class='del'>-	ECardDate       *bday;	        /* The person's birthday.           */</div><div class='del'>-</div><div class='del'>-	char            *note;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	char            *org;           /* The person's organization.       */</div><div class='del'>-	char            *org_unit;      /* The person's organization unit.  */</div><div class='del'>-	char            *office;        /* The person's office.             */</div><div class='del'>-	char            *role;          /* The person's role w/in his org   */</div><div class='del'>-	char            *title;	        /* The person's title w/in his org  */</div><div class='del'>-</div><div class='del'>-	char            *manager;</div><div class='del'>-	char            *assistant;</div><div class='del'>-</div><div class='del'>-	char            *nickname;      /* The person's nickname            */</div><div class='del'>-	</div><div class='del'>-	char            *spouse;        /* The person's spouse.             */</div><div class='del'>-	ECardDate       *anniversary;   /* The person's anniversary.        */</div><div class='del'>-</div><div class='del'>-	char            *mailer;        /* Mailer                           */</div><div class='del'>-</div><div class='del'>-	char            *caluri;        /* Calendar URI                     */</div><div class='del'>-	char            *fburl;         /* Free Busy URL                    */</div><div class='del'>-</div><div class='del'>-	gint             timezone;      /* number of minutes from UTC as an int */</div><div class='del'>-</div><div class='del'>-	ECardDate       *last_use;</div><div class='del'>-	float            raw_use_score;</div><div class='del'>-</div><div class='del'>-	char            *related_contacts;  /* EDestinationV (serialized) of related contacts. */</div><div class='del'>-</div><div class='del'>-	EList           *categories;    /* Categories.                      */</div><div class='del'>-</div><div class='del'>-	EList           *arbitrary;     /* Arbitrary fields.                */</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	guint32         wants_html : 1;     /* Wants html mail. */</div><div class='del'>-	guint32         wants_html_set : 1; /* Wants html mail. */</div><div class='del'>-	guint32		list : 1; /* If the card corresponds to a contact list */</div><div class='del'>-	guint32		list_show_addresses : 1; /* Whether to show the addresses</div><div class='del'>-						    in the To: or Bcc: field */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	ECardPhoto      *logo;          /* This person's org's logo.        */</div><div class='del'>-</div><div class='del'>-	ECardPhoto      *photo;    	/* A photo of the person.           */</div><div class='del'>-	</div><div class='del'>-	ECard           *agent;         /* A person who sereves as this</div><div class='del'>-					   guy's agent/secretary/etc.       */</div><div class='del'>-</div><div class='del'>-	ECardSound      *sound;</div><div class='del'>-</div><div class='del'>-	ECardKey        *key;	        /* The person's public key.         */</div><div class='del'>-	ECardTimeZone   *timezn;        /* The person's time zone.          */</div><div class='del'>-	ECardGeoPos     *geopos;        /* The person's long/lat.           */</div><div class='del'>-</div><div class='del'>-	ECardRev        *rev;	        /* The time this card was last</div><div class='del'>-					   modified.                        */</div><div class='del'>-</div><div class='del'>-	EList        xtension;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-	GHashTable    *attribute_jump_table;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Simple functions */</div><div class='del'>-ECard                *e_card_new                                          (char                       *vcard); /* Assumes utf8 */</div><div class='del'>-ECard                *e_card_new_with_default_charset                     (char                       *vcard,</div><div class='del'>-									   char                       *default_charset);</div><div class='del'>-const char           *e_card_get_id                                       (ECard                      *card);</div><div class='del'>-void                  e_card_set_id                                       (ECard                      *card,</div><div class='del'>-									   const char                 *character);</div><div class='del'>-</div><div class='del'>-struct _EBook        *e_card_get_book                                     (ECard                      *card);</div><div class='del'>-void                  e_card_set_book                                     (ECard                      *card,</div><div class='del'>-									   struct _EBook              *book);</div><div class='del'>-char                 *e_card_get_vcard                                    (ECard                      *card);</div><div class='del'>-char                 *e_card_get_vcard_assume_utf8                        (ECard                      *card);</div><div class='del'>-char                 *e_card_list_get_vcard                               (const GList                *list);</div><div class='del'>-ECard                *e_card_duplicate                                    (ECard                      *card);</div><div class='del'>-float                 e_card_get_use_score                                (ECard                      *card);</div><div class='del'>-void                  e_card_touch                                        (ECard                      *card);</div><div class='del'>-</div><div class='del'>-/* Evolution List convenience functions */</div><div class='del'>-/*   used for encoding uids in email addresses */</div><div class='del'>-gboolean              e_card_evolution_list                               (ECard                      *card);</div><div class='del'>-gboolean              e_card_evolution_list_show_addresses                (ECard                      *card);</div><div class='del'>-</div><div class='del'>-/* ECardPhone manipulation */</div><div class='del'>-ECardPhone           *e_card_phone_new                                    (void);</div><div class='del'>-ECardPhone           *e_card_phone_copy                                   (const ECardPhone           *phone);</div><div class='del'>-ECardPhone           *e_card_phone_ref                                    (const ECardPhone           *phone);</div><div class='del'>-void                  e_card_phone_unref                                  (ECardPhone                 *phone);</div><div class='del'>-</div><div class='del'>-/* ECardDeliveryAddress manipulation */</div><div class='del'>-ECardDeliveryAddress *e_card_delivery_address_new                         (void);</div><div class='del'>-ECardDeliveryAddress *e_card_delivery_address_copy                        (const ECardDeliveryAddress *addr);</div><div class='del'>-ECardDeliveryAddress *e_card_delivery_address_ref                         (const ECardDeliveryAddress *addr);</div><div class='del'>-void                  e_card_delivery_address_unref                       (ECardDeliveryAddress       *addr);</div><div class='del'>-gboolean              e_card_delivery_address_is_empty                    (const ECardDeliveryAddress *addr);</div><div class='del'>-char                 *e_card_delivery_address_to_string                   (const ECardDeliveryAddress *addr);</div><div class='del'>-ECardDeliveryAddress *e_card_delivery_address_from_label                  (const ECardAddrLabel       *label);</div><div class='del'>-ECardAddrLabel       *e_card_delivery_address_to_label                    (const ECardDeliveryAddress *addr);</div><div class='del'>-</div><div class='del'>-/* ECardAddrLabel manipulation */</div><div class='del'>-ECardAddrLabel       *e_card_address_label_new                            (void);</div><div class='del'>-ECardAddrLabel       *e_card_address_label_copy                           (const ECardAddrLabel       *addr);</div><div class='del'>-ECardAddrLabel       *e_card_address_label_ref                            (const ECardAddrLabel       *addr);</div><div class='del'>-void                  e_card_address_label_unref                          (ECardAddrLabel             *addr);</div><div class='del'>-</div><div class='del'>-/* ECardName manipulation */</div><div class='del'>-ECardName            *e_card_name_new                                     (void);</div><div class='del'>-ECardName            *e_card_name_copy                                    (const ECardName            *name);</div><div class='del'>-ECardName            *e_card_name_ref                                     (const ECardName            *name);</div><div class='del'>-void                  e_card_name_unref                                   (ECardName                  *name);</div><div class='del'>-char                 *e_card_name_to_string                               (const ECardName            *name);</div><div class='del'>-ECardName            *e_card_name_from_string                             (const char                 *full_name);</div><div class='del'>-</div><div class='del'>-/* ECardDate */</div><div class='del'>-ECardDate             e_card_date_from_string                             (const gchar                *str);</div><div class='del'>-gchar                *e_card_date_to_string                               (ECardDate                  *dt);</div><div class='del'>-</div><div class='del'>-/* ECardArbitrary manipulation */</div><div class='del'>-ECardArbitrary       *e_card_arbitrary_new                                (void);</div><div class='del'>-ECardArbitrary       *e_card_arbitrary_copy                               (const ECardArbitrary       *arbitrary);</div><div class='del'>-ECardArbitrary       *e_card_arbitrary_ref                                (const ECardArbitrary       *arbitrary);</div><div class='del'>-void                  e_card_arbitrary_unref                              (ECardArbitrary             *arbitrary);</div><div class='del'>-</div><div class='del'>-/* ECard email manipulation */</div><div class='del'>-gboolean              e_card_email_match_string                           (const ECard                *card,</div><div class='del'>-									   const gchar                *str);</div><div class='del'>-gint                  e_card_email_find_number                            (const ECard                *card,</div><div class='del'>-									   const gchar                *email);</div><div class='del'>-</div><div class='del'>-/* Specialized functionality */</div><div class='del'>-GList                *e_card_load_cards_from_file                         (const char                 *filename);</div><div class='del'>-GList                *e_card_load_cards_from_file_with_default_charset    (const char                 *filename,</div><div class='del'>-									   char                       *default_charset);</div><div class='del'>-GList                *e_card_load_cards_from_string                       (const char                 *str);</div><div class='del'>-GList                *e_card_load_cards_from_string_with_default_charset  (const char                 *str,</div><div class='del'>-									   char                       *default_charset);</div><div class='del'>-void                  e_card_free_empty_lists                             (ECard                      *card);</div><div class='del'>-</div><div class='del'>-enum _ECardDisposition {</div><div class='del'>-	E_CARD_DISPOSITION_AS_ATTACHMENT,</div><div class='del'>-	E_CARD_DISPOSITION_AS_TO,</div><div class='del'>-};</div><div class='del'>-typedef enum _ECardDisposition ECardDisposition;</div><div class='del'>-void                  e_card_send                           (ECard                      *card,</div><div class='del'>-							     ECardDisposition            disposition);</div><div class='del'>-void                  e_card_list_send                      (GList                      *cards,</div><div class='del'>-							     ECardDisposition            disposition);</div><div class='del'>-</div><div class='del'>-/* Getting ECards via their URIs */</div><div class='del'>-typedef void (*ECardCallback) (ECard *card, gpointer closure);</div><div class='del'>-void                  e_card_load_uri                       (const gchar                *book_uri,</div><div class='del'>-							     const gchar                *uid,</div><div class='del'>-							     ECardCallback               cb,</div><div class='del'>-							     gpointer                    closure);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType               e_card_get_type                       (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_H__ */</div><div class='head'>diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c<br/>deleted file mode 100644<br/>index 5cb5fa859f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-destination.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-destination.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1690 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-destination.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-destination.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "e-book.h"</div><div class='del'>-#include "e-book-util.h"</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-#include &lt;camel/camel-internet-address.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	CARDIFIED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint e_destination_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-struct _EDestinationPrivate {</div><div class='del'>-	gchar *raw;</div><div class='del'>-</div><div class='del'>-	gchar *book_uri;</div><div class='del'>-	gchar *card_uid;</div><div class='del'>-	ECard *card;</div><div class='del'>-	gint card_email_num;</div><div class='del'>-</div><div class='del'>-	ECard *old_card;</div><div class='del'>-	gint old_card_email_num;</div><div class='del'>-	gchar *old_textrep;</div><div class='del'>-</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *email;</div><div class='del'>-	gchar *addr;</div><div class='del'>-	gchar *textrep;</div><div class='del'>-</div><div class='del'>-	GList *list_dests;</div><div class='del'>-</div><div class='del'>-	guint html_mail_override : 1;</div><div class='del'>-	guint wants_html_mail : 1;</div><div class='del'>-</div><div class='del'>-	guint show_addresses : 1;</div><div class='del'>-</div><div class='del'>-	guint has_been_cardified : 1;</div><div class='del'>-	guint allow_cardify : 1;</div><div class='del'>-	guint cannot_cardify : 1;</div><div class='del'>-	guint auto_recipient : 1;</div><div class='del'>-	guint pending_cardification;</div><div class='del'>-</div><div class='del'>-	guint pending_change : 1;</div><div class='del'>-</div><div class='del'>-	EBook *cardify_book;</div><div class='del'>-</div><div class='del'>-	gint freeze_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_destination_clear_card    (EDestination *);</div><div class='del'>-static void e_destination_clear_strings (EDestination *);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = E_DESTINATION (obj);</div><div class='del'>-</div><div class='del'>-	e_destination_clear (dest);</div><div class='del'>-</div><div class='del'>-	if (dest-&gt;priv-&gt;old_card)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;old_card));</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;cardify_book)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;cardify_book));</div><div class='del'>-</div><div class='del'>-	g_free (dest-&gt;priv-&gt;old_textrep);</div><div class='del'>-</div><div class='del'>-	g_free (dest-&gt;priv);</div><div class='del'>-</div><div class='del'>-	if (parent_class-&gt;destroy)</div><div class='del'>-		parent_class-&gt;destroy (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_class_init (EDestinationClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (GTK_TYPE_OBJECT));</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_destination_destroy;</div><div class='del'>-</div><div class='del'>-	e_destination_signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EDestinationClass, changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_destination_signals[CARDIFIED] =</div><div class='del'>-		gtk_signal_new ("cardified",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EDestinationClass, cardified),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_destination_signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_init (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	dest-&gt;priv = g_new0 (struct _EDestinationPrivate, 1);</div><div class='del'>-</div><div class='del'>-	dest-&gt;priv-&gt;allow_cardify = TRUE;</div><div class='del'>-	dest-&gt;priv-&gt;cannot_cardify = FALSE;</div><div class='del'>-	dest-&gt;priv-&gt;auto_recipient = FALSE;</div><div class='del'>-	dest-&gt;priv-&gt;pending_cardification = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_destination_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType dest_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!dest_type) {</div><div class='del'>-		GtkTypeInfo dest_info = {</div><div class='del'>-			"EDestination",</div><div class='del'>-			sizeof (EDestination),</div><div class='del'>-			sizeof (EDestinationClass),</div><div class='del'>-			(GtkClassInitFunc) e_destination_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_destination_init,</div><div class='del'>-			NULL, NULL, /* reserved */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		dest_type = gtk_type_unique (gtk_object_get_type (), &amp;dest_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return dest_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination *</div><div class='del'>-e_destination_new (void)</div><div class='del'>-{</div><div class='del'>-	return E_DESTINATION (gtk_type_new (E_TYPE_DESTINATION));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_freeze (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (dest-&gt;priv-&gt;freeze_count &gt;= 0);</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;freeze_count++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_thaw (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (dest-&gt;priv-&gt;freeze_count &gt; 0);</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;freeze_count--;</div><div class='del'>-	if (dest-&gt;priv-&gt;freeze_count == 0 &amp;&amp; dest-&gt;priv-&gt;pending_change)</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_changed (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	if (dest-&gt;priv-&gt;freeze_count == 0) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CHANGED]);</div><div class='del'>-		dest-&gt;priv-&gt;pending_change = FALSE;</div><div class='del'>-		dest-&gt;priv-&gt;cannot_cardify = FALSE;</div><div class='del'>-	</div><div class='del'>-	} else {</div><div class='del'>-		dest-&gt;priv-&gt;pending_change = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination *</div><div class='del'>-e_destination_copy (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	EDestination *new_dest;</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-</div><div class='del'>-	new_dest = e_destination_new ();</div><div class='del'>-</div><div class='del'>-	new_dest-&gt;priv-&gt;book_uri           = g_strdup (dest-&gt;priv-&gt;book_uri);</div><div class='del'>-	new_dest-&gt;priv-&gt;card_uid           = g_strdup (dest-&gt;priv-&gt;card_uid);</div><div class='del'>-	new_dest-&gt;priv-&gt;name               = g_strdup (dest-&gt;priv-&gt;name);</div><div class='del'>-	new_dest-&gt;priv-&gt;email              = g_strdup (dest-&gt;priv-&gt;email);</div><div class='del'>-	new_dest-&gt;priv-&gt;addr               = g_strdup (dest-&gt;priv-&gt;addr);</div><div class='del'>-	new_dest-&gt;priv-&gt;card_email_num     = dest-&gt;priv-&gt;card_email_num;</div><div class='del'>-	new_dest-&gt;priv-&gt;old_card_email_num = dest-&gt;priv-&gt;old_card_email_num;</div><div class='del'>-	new_dest-&gt;priv-&gt;old_textrep        = g_strdup (dest-&gt;priv-&gt;old_textrep);</div><div class='del'>-</div><div class='del'>-	new_dest-&gt;priv-&gt;card     = dest-&gt;priv-&gt;card;</div><div class='del'>-	if (new_dest-&gt;priv-&gt;card)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (new_dest-&gt;priv-&gt;card));</div><div class='del'>-</div><div class='del'>-	new_dest-&gt;priv-&gt;old_card = dest-&gt;priv-&gt;old_card;</div><div class='del'>-	if (new_dest-&gt;priv-&gt;old_card)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (new_dest-&gt;priv-&gt;old_card));</div><div class='del'>-</div><div class='del'>-	new_dest-&gt;priv-&gt;html_mail_override = dest-&gt;priv-&gt;html_mail_override;</div><div class='del'>-	new_dest-&gt;priv-&gt;wants_html_mail    = dest-&gt;priv-&gt;wants_html_mail;</div><div class='del'>-</div><div class='del'>-	for (iter = dest-&gt;priv-&gt;list_dests; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		new_dest-&gt;priv-&gt;list_dests = g_list_append (new_dest-&gt;priv-&gt;list_dests,</div><div class='del'>-							    e_destination_copy (E_DESTINATION (iter-&gt;data)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_dest;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_clear_card (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	if (dest-&gt;priv-&gt;card) {</div><div class='del'>-		if (dest-&gt;priv-&gt;old_card)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;old_card));</div><div class='del'>-		</div><div class='del'>-		dest-&gt;priv-&gt;old_card = dest-&gt;priv-&gt;card;</div><div class='del'>-		dest-&gt;priv-&gt;old_card_email_num = dest-&gt;priv-&gt;card_email_num;</div><div class='del'>-		</div><div class='del'>-		g_free (dest-&gt;priv-&gt;old_textrep);</div><div class='del'>-		dest-&gt;priv-&gt;old_textrep = g_strdup (e_destination_get_textrep (dest));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;priv-&gt;book_uri);</div><div class='del'>-	dest-&gt;priv-&gt;book_uri = NULL;</div><div class='del'>-	g_free (dest-&gt;priv-&gt;card_uid);</div><div class='del'>-	dest-&gt;priv-&gt;card_uid = NULL;</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;card = NULL;</div><div class='del'>-	dest-&gt;priv-&gt;card_email_num = -1;</div><div class='del'>-	</div><div class='del'>-	g_list_foreach (dest-&gt;priv-&gt;list_dests, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (dest-&gt;priv-&gt;list_dests);</div><div class='del'>-	dest-&gt;priv-&gt;list_dests = NULL;</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;allow_cardify = TRUE;</div><div class='del'>-	dest-&gt;priv-&gt;cannot_cardify = FALSE;</div><div class='del'>-	</div><div class='del'>-	e_destination_cancel_cardify (dest);</div><div class='del'>-	</div><div class='del'>-	e_destination_changed (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_destination_clear_strings (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_free (dest-&gt;priv-&gt;raw);</div><div class='del'>-	dest-&gt;priv-&gt;raw = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;priv-&gt;name);</div><div class='del'>-	dest-&gt;priv-&gt;name = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;priv-&gt;email);</div><div class='del'>-	dest-&gt;priv-&gt;email = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;priv-&gt;addr);</div><div class='del'>-	dest-&gt;priv-&gt;addr = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;priv-&gt;textrep);</div><div class='del'>-	dest-&gt;priv-&gt;textrep = NULL;</div><div class='del'>-	</div><div class='del'>-	e_destination_changed (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_clear (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	e_destination_freeze (dest);</div><div class='del'>-	</div><div class='del'>-	e_destination_clear_card (dest);</div><div class='del'>-	e_destination_clear_strings (dest);</div><div class='del'>-	</div><div class='del'>-	e_destination_thaw (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-nonempty (const gchar *s)</div><div class='del'>-{</div><div class='del'>-	gunichar c;</div><div class='del'>-	while (*s) {</div><div class='del'>-		c = g_utf8_get_char (s);</div><div class='del'>-		if (!g_unichar_isspace (c))</div><div class='del'>-			return TRUE;</div><div class='del'>-		s = g_utf8_next_char (s);</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_is_empty (const EDestination *dest)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	struct _EDestinationPrivate *p;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), TRUE);</div><div class='del'>-	</div><div class='del'>-	p = dest-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return !(p-&gt;card != NULL</div><div class='del'>-		 || (p-&gt;book_uri &amp;&amp; *p-&gt;book_uri)</div><div class='del'>-		 || (p-&gt;card_uid &amp;&amp; *p-&gt;card_uid)</div><div class='del'>-		 || (p-&gt;raw &amp;&amp; nonempty (p-&gt;raw))</div><div class='del'>-		 || (p-&gt;name &amp;&amp; nonempty (p-&gt;name))</div><div class='del'>-		 || (p-&gt;email &amp;&amp; nonempty (p-&gt;email))</div><div class='del'>-		 || (p-&gt;addr &amp;&amp; nonempty (p-&gt;addr))</div><div class='del'>-		 || (p-&gt;list_dests != NULL));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_is_valid (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	const char *email;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (e_destination_from_card (dest))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	email = e_destination_get_email (dest);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: if we really wanted to get fancy here, we could</div><div class='del'>-           check to make sure that the address was valid according to</div><div class='del'>-           rfc822's addr-spec grammar. */</div><div class='del'>-	</div><div class='del'>-	return email &amp;&amp; *email &amp;&amp; strchr (email, '@');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_equal (const EDestination *a, const EDestination *b)</div><div class='del'>-{</div><div class='del'>-	const struct _EDestinationPrivate *pa, *pb;</div><div class='del'>-	const char *na, *nb;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (a), FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (b), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (a == b)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	pa = a-&gt;priv;</div><div class='del'>-	pb = b-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Check equality of cards. */</div><div class='del'>-	if (pa-&gt;card || pb-&gt;card) {</div><div class='del'>-		if (! (pa-&gt;card &amp;&amp; pb-&gt;card))</div><div class='del'>-			return FALSE;</div><div class='del'>-		</div><div class='del'>-		if (pa-&gt;card == pb-&gt;card || !strcmp (e_card_get_id (pa-&gt;card), e_card_get_id (pb-&gt;card)))</div><div class='del'>-			return TRUE;</div><div class='del'>-		</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Just in case name returns NULL */</div><div class='del'>-	na = e_destination_get_name (a);</div><div class='del'>-	nb = e_destination_get_name (b);</div><div class='del'>-	if ((na || nb) &amp;&amp; !(na &amp;&amp; nb &amp;&amp; ! g_utf8_strcasecmp (na, nb)))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_card (EDestination *dest, ECard *card, gint email_num)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card != card || dest-&gt;priv-&gt;card_email_num != email_num) {</div><div class='del'>-		/* We have to freeze/thaw around these operations so that the 'changed'</div><div class='del'>-		   signals don't cause the EDestination's internal state to be altered</div><div class='del'>-		   before we can finish setting -&gt;card &amp;&amp; -&gt;card_email_num. */</div><div class='del'>-		e_destination_freeze (dest);</div><div class='del'>-		e_destination_clear (dest);</div><div class='del'>-		</div><div class='del'>-		dest-&gt;priv-&gt;card = card;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (dest-&gt;priv-&gt;card));</div><div class='del'>-		</div><div class='del'>-		dest-&gt;priv-&gt;card_email_num = email_num;</div><div class='del'>-		</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-		e_destination_thaw (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_book_uri (EDestination *dest, const gchar *uri)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (uri != NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;book_uri == NULL || strcmp (dest-&gt;priv-&gt;book_uri, uri)) {</div><div class='del'>-		g_free (dest-&gt;priv-&gt;book_uri);</div><div class='del'>-		dest-&gt;priv-&gt;book_uri = g_strdup (uri);</div><div class='del'>-		</div><div class='del'>-		/* If we already have a card, remove it unless it's uri matches the one</div><div class='del'>-		   we just set. */</div><div class='del'>-		if (dest-&gt;priv-&gt;card) {</div><div class='del'>-			EBook *book = e_card_get_book (dest-&gt;priv-&gt;card);</div><div class='del'>-			if ((!book) || strcmp (uri, e_book_get_uri (book))) {</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;card));</div><div class='del'>-				dest-&gt;priv-&gt;card = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_card_uid (EDestination *dest, const gchar *uid, gint email_num)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card_uid == NULL</div><div class='del'>-	    || strcmp (dest-&gt;priv-&gt;card_uid, uid)</div><div class='del'>-	    || dest-&gt;priv-&gt;card_email_num != email_num) {</div><div class='del'>-		</div><div class='del'>-		g_free (dest-&gt;priv-&gt;card_uid);</div><div class='del'>-		dest-&gt;priv-&gt;card_uid = g_strdup (uid);</div><div class='del'>-		dest-&gt;priv-&gt;card_email_num = email_num;</div><div class='del'>-		</div><div class='del'>-		/* If we already have a card, remove it unless it's uri matches the one</div><div class='del'>-		   we just set. */</div><div class='del'>-		if (dest-&gt;priv-&gt;card &amp;&amp; strcmp (uid, e_card_get_id (dest-&gt;priv-&gt;card))) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;card));</div><div class='del'>-			dest-&gt;priv-&gt;card = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_name (EDestination *dest, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	if (name == NULL) {</div><div class='del'>-		if (dest-&gt;priv-&gt;name != NULL) {</div><div class='del'>-			g_free (dest-&gt;priv-&gt;name);</div><div class='del'>-			dest-&gt;priv-&gt;name = NULL;</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (dest-&gt;priv-&gt;name == NULL || strcmp (dest-&gt;priv-&gt;name, name)) {</div><div class='del'>-		g_free (dest-&gt;priv-&gt;name);</div><div class='del'>-		dest-&gt;priv-&gt;name = g_strdup (name);</div><div class='del'>-		changed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (changed) {</div><div class='del'>-		g_free (dest-&gt;priv-&gt;addr);</div><div class='del'>-		dest-&gt;priv-&gt;addr = NULL;</div><div class='del'>-		g_free (dest-&gt;priv-&gt;textrep);</div><div class='del'>-		dest-&gt;priv-&gt;textrep = NULL;</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_email (EDestination *dest, const gchar *email)</div><div class='del'>-{</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	if (email == NULL) {</div><div class='del'>-		if (dest-&gt;priv-&gt;email != NULL) {</div><div class='del'>-			g_free (dest-&gt;priv-&gt;addr);</div><div class='del'>-			dest-&gt;priv-&gt;addr = NULL;</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (dest-&gt;priv-&gt;email == NULL || strcmp (dest-&gt;priv-&gt;email, email)) {</div><div class='del'>-		g_free (dest-&gt;priv-&gt;email);</div><div class='del'>-		dest-&gt;priv-&gt;email = g_strdup (email);</div><div class='del'>-		changed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (changed) {</div><div class='del'>-		g_free (dest-&gt;priv-&gt;addr);</div><div class='del'>-		dest-&gt;priv-&gt;addr = NULL;</div><div class='del'>-		g_free (dest-&gt;priv-&gt;textrep);</div><div class='del'>-		dest-&gt;priv-&gt;textrep = NULL;</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_html_mail_pref (EDestination *dest, gboolean x)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;html_mail_override = TRUE;</div><div class='del'>-	if (dest-&gt;priv-&gt;wants_html_mail != x) {</div><div class='del'>-		dest-&gt;priv-&gt;wants_html_mail = x;</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_contains_card (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	return dest-&gt;priv-&gt;card != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_from_card (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	return dest-&gt;priv-&gt;card != NULL || dest-&gt;priv-&gt;book_uri != NULL || dest-&gt;priv-&gt;card_uid != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_is_auto_recipient (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;auto_recipient;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_auto_recipient (EDestination *dest, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;auto_recipient = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct _UseCard UseCard;</div><div class='del'>-struct _UseCard {</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	EDestinationCardCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-use_card_cb (ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	UseCard *uc = (UseCard *) closure;</div><div class='del'>-	</div><div class='del'>-	if (card != NULL &amp;&amp; uc-&gt;dest-&gt;priv-&gt;card == NULL) {</div><div class='del'>-		uc-&gt;dest-&gt;priv-&gt;card = card;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (uc-&gt;dest-&gt;priv-&gt;card));</div><div class='del'>-		e_destination_changed (uc-&gt;dest);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (uc-&gt;cb) {</div><div class='del'>-		uc-&gt;cb (uc-&gt;dest, uc-&gt;dest-&gt;priv-&gt;card, uc-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* We held a copy of the destination during the callback. */</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (uc-&gt;dest));</div><div class='del'>-	g_free (uc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_use_card (EDestination *dest, EDestinationCardCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card != NULL) {</div><div class='del'>-		if (cb)</div><div class='del'>-			cb (dest, dest-&gt;priv-&gt;card, closure);</div><div class='del'>-	} else if (dest-&gt;priv-&gt;book_uri != NULL &amp;&amp; dest-&gt;priv-&gt;card_uid != NULL) {</div><div class='del'>-		UseCard *uc = g_new (UseCard, 1);</div><div class='del'>-		</div><div class='del'>-		uc-&gt;dest = dest;</div><div class='del'>-		/* Hold a reference to the destination during the callback. */</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (uc-&gt;dest));</div><div class='del'>-		uc-&gt;cb = cb;</div><div class='del'>-		uc-&gt;closure = closure;</div><div class='del'>-		e_card_load_uri (dest-&gt;priv-&gt;book_uri, dest-&gt;priv-&gt;card_uid, use_card_cb, uc);</div><div class='del'>-	} else {</div><div class='del'>-		if (cb)</div><div class='del'>-			cb (dest, NULL, closure);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_destination_get_card (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_card_uid (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card_uid)</div><div class='del'>-		return dest-&gt;priv-&gt;card_uid;</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card)</div><div class='del'>-		return e_card_get_id (dest-&gt;priv-&gt;card);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_book_uri (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;book_uri)</div><div class='del'>-		return dest-&gt;priv-&gt;book_uri;</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card) {</div><div class='del'>-		EBook *book = e_card_get_book (dest-&gt;priv-&gt;card);</div><div class='del'>-		</div><div class='del'>-		if (book) {</div><div class='del'>-			return e_book_get_uri (book);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_destination_get_email_num (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), -1);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card == NULL &amp;&amp; (dest-&gt;priv-&gt;book_uri == NULL || dest-&gt;priv-&gt;card_uid == NULL))</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;card_email_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_name (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	struct _EDestinationPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	priv = (struct _EDestinationPrivate *)dest-&gt;priv; /* cast out const */</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;name == NULL) {</div><div class='del'>-		if (priv-&gt;card != NULL) {</div><div class='del'>-			priv-&gt;name = e_card_name_to_string (priv-&gt;card-&gt;name);</div><div class='del'>-			</div><div class='del'>-			if (priv-&gt;name == NULL || *priv-&gt;name == '\0') {</div><div class='del'>-				g_free (priv-&gt;name);</div><div class='del'>-				priv-&gt;name = g_strdup (priv-&gt;card-&gt;file_as);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (priv-&gt;name == NULL || *priv-&gt;name == '\0') {</div><div class='del'>-				g_free (priv-&gt;name);</div><div class='del'>-				priv-&gt;name = g_strdup (e_destination_get_email (dest));</div><div class='del'>-			}</div><div class='del'>-		} else if (priv-&gt;raw != NULL) {</div><div class='del'>-			CamelInternetAddress *addr = camel_internet_address_new ();</div><div class='del'>-			</div><div class='del'>-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv-&gt;raw)) {</div><div class='del'>-				const char *camel_name = NULL;</div><div class='del'>-				</div><div class='del'>-				camel_internet_address_get (addr, 0, &amp;camel_name, NULL);</div><div class='del'>-				priv-&gt;name = g_strdup (camel_name);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;name;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_email (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	struct _EDestinationPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	priv = (struct _EDestinationPrivate *)dest-&gt;priv; /* cast out const */</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;email == NULL) {</div><div class='del'>-		if (priv-&gt;card != NULL) {</div><div class='del'>-			/* Pull the address out of the card. */</div><div class='del'>-			if (priv-&gt;card-&gt;email) {</div><div class='del'>-				EIterator *iter = e_list_get_iterator (priv-&gt;card-&gt;email);</div><div class='del'>-				int n = priv-&gt;card_email_num;</div><div class='del'>-				</div><div class='del'>-				if (n &gt;= 0) {</div><div class='del'>-					while (n &gt; 0) {</div><div class='del'>-						e_iterator_next (iter);</div><div class='del'>-						n--;</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					if (e_iterator_is_valid (iter)) {</div><div class='del'>-						gconstpointer ptr = e_iterator_get (iter);</div><div class='del'>-						priv-&gt;email = g_strdup ((char *) ptr);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} </div><div class='del'>-		} else if (priv-&gt;raw != NULL) {</div><div class='del'>-			CamelInternetAddress *addr = camel_internet_address_new ();</div><div class='del'>-			</div><div class='del'>-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv-&gt;raw)) {</div><div class='del'>-				const gchar *camel_email = NULL;</div><div class='del'>-				camel_internet_address_get (addr, 0, NULL, &amp;camel_email);</div><div class='del'>-				priv-&gt;email = g_strdup (camel_email);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-		} </div><div class='del'>-		</div><div class='del'>-		/* Force e-mail to be non-null... */</div><div class='del'>-		if (priv-&gt;email == NULL) {</div><div class='del'>-			priv-&gt;email = g_strdup ("");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;email;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_address (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	struct _EDestinationPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	priv = (struct _EDestinationPrivate *)dest-&gt;priv; /* cast out const */</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;addr == NULL) {</div><div class='del'>-		CamelInternetAddress *addr = camel_internet_address_new ();</div><div class='del'>-		</div><div class='del'>-		if (e_destination_is_evolution_list (dest)) {</div><div class='del'>-			GList *iter = dest-&gt;priv-&gt;list_dests;</div><div class='del'>-			</div><div class='del'>-			while (iter) {</div><div class='del'>-				EDestination *list_dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-				</div><div class='del'>-				if (!e_destination_is_empty (list_dest)) {</div><div class='del'>-					camel_internet_address_add (addr, </div><div class='del'>-								    e_destination_get_name (list_dest),</div><div class='del'>-								    e_destination_get_email (list_dest));</div><div class='del'>-				}</div><div class='del'>-				iter = g_list_next (iter);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			priv-&gt;addr = camel_address_encode (CAMEL_ADDRESS (addr));</div><div class='del'>-		} else if (priv-&gt;raw) {</div><div class='del'>-</div><div class='del'>-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv-&gt;raw)) {</div><div class='del'>-				priv-&gt;addr = camel_address_encode (CAMEL_ADDRESS (addr));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			camel_internet_address_add (addr,</div><div class='del'>-						    e_destination_get_name (dest),</div><div class='del'>-						    e_destination_get_email (dest));</div><div class='del'>-			</div><div class='del'>-			priv-&gt;addr = camel_address_encode (CAMEL_ADDRESS (addr));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_raw (EDestination *dest, const gchar *raw)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (raw != NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;raw == NULL || strcmp (dest-&gt;priv-&gt;raw, raw)) {</div><div class='del'>-		e_destination_freeze (dest);</div><div class='del'>-		</div><div class='del'>-		e_destination_clear (dest);</div><div class='del'>-		dest-&gt;priv-&gt;raw = g_strdup (raw);</div><div class='del'>-		e_destination_changed (dest);</div><div class='del'>-		</div><div class='del'>-		e_destination_thaw (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_destination_get_textrep (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	const char *name, *email;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;raw)</div><div class='del'>-		return dest-&gt;priv-&gt;raw;</div><div class='del'>-	</div><div class='del'>-	name  = e_destination_get_name (dest);</div><div class='del'>-	email = e_destination_get_email (dest);</div><div class='del'>-	</div><div class='del'>-	if (e_destination_from_card (dest) &amp;&amp; name != NULL)</div><div class='del'>-		return name;</div><div class='del'>-	</div><div class='del'>-	/* Make sure that our address gets quoted properly */</div><div class='del'>-	if (name &amp;&amp; email &amp;&amp; dest-&gt;priv-&gt;textrep == NULL) {</div><div class='del'>-		CamelInternetAddress *addr = camel_internet_address_new ();</div><div class='del'>-		</div><div class='del'>-		camel_internet_address_add (addr, name, email);</div><div class='del'>-		g_free (dest-&gt;priv-&gt;textrep);</div><div class='del'>-		dest-&gt;priv-&gt;textrep = camel_address_format (CAMEL_ADDRESS (addr));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;textrep != NULL)</div><div class='del'>-		return dest-&gt;priv-&gt;textrep;</div><div class='del'>-</div><div class='del'>-	if (email)</div><div class='del'>-		return email;</div><div class='del'>-	</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_is_evolution_list (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;list_dests == NULL</div><div class='del'>-	    &amp;&amp; dest-&gt;priv-&gt;card != NULL</div><div class='del'>-	    &amp;&amp; dest-&gt;priv-&gt;card-&gt;email != NULL</div><div class='del'>-	    &amp;&amp; e_card_evolution_list (dest-&gt;priv-&gt;card)) {</div><div class='del'>-		</div><div class='del'>-		EIterator *iter = e_list_get_iterator (dest-&gt;priv-&gt;card-&gt;email);</div><div class='del'>-		</div><div class='del'>-		e_iterator_reset (iter);</div><div class='del'>-		while (e_iterator_is_valid (iter)) {</div><div class='del'>-			const char *dest_xml = (const char *) e_iterator_get (iter);</div><div class='del'>-			EDestination *list_dest = e_destination_import (dest_xml);</div><div class='del'>-			</div><div class='del'>-			if (list_dest)</div><div class='del'>-				dest-&gt;priv-&gt;list_dests = g_list_append (dest-&gt;priv-&gt;list_dests, list_dest);</div><div class='del'>-			e_iterator_next (iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;list_dests != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_list_show_addresses (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;card != NULL)</div><div class='del'>-		return e_card_evolution_list_show_addresses (dest-&gt;priv-&gt;card);</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;show_addresses;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_get_html_mail_pref (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;html_mail_override || dest-&gt;priv-&gt;card == NULL)</div><div class='del'>-		return dest-&gt;priv-&gt;wants_html_mail;</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;card-&gt;wants_html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_allow_cardification (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	return dest-&gt;priv-&gt;allow_cardify;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_set_allow_cardification (EDestination *dest, gboolean x)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;allow_cardify = x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_cardify_book (EDestination *dest, EBook *book)</div><div class='del'>-{</div><div class='del'>-	if (dest-&gt;priv-&gt;cardify_book &amp;&amp; dest-&gt;priv-&gt;cardify_book != book) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest-&gt;priv-&gt;cardify_book));</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	dest-&gt;priv-&gt;cardify_book = book;</div><div class='del'>-	</div><div class='del'>-	if (book)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_and_email_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = E_DESTINATION (closure);</div><div class='del'>-	</div><div class='del'>-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS &amp;&amp; g_list_length ((GList *) cards) == 1) {</div><div class='del'>-		ECard *card = E_CARD (cards-&gt;data);</div><div class='del'>-		const char *email = e_destination_get_email (dest);</div><div class='del'>-		int email_num = 0;</div><div class='del'>-		</div><div class='del'>-		if (e_destination_is_valid (dest) &amp;&amp; email &amp;&amp; *email) {</div><div class='del'>-			email_num = e_card_email_find_number (card, e_destination_get_email (dest));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (email_num &gt;= 0) {</div><div class='del'>-			const char *book_uri;</div><div class='del'>-			</div><div class='del'>-			book_uri = e_book_get_uri (book);</div><div class='del'>-			</div><div class='del'>-			dest-&gt;priv-&gt;has_been_cardified = TRUE;</div><div class='del'>-			e_destination_set_card (dest, card, email_num);</div><div class='del'>-			e_destination_set_book_uri (dest, book_uri);</div><div class='del'>-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!dest-&gt;priv-&gt;has_been_cardified) {</div><div class='del'>-		dest-&gt;priv-&gt;cannot_cardify = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nickname_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = E_DESTINATION (closure);</div><div class='del'>-	</div><div class='del'>-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {</div><div class='del'>-		if (g_list_length ((GList *) cards) == 1) {</div><div class='del'>-			const char *book_uri;</div><div class='del'>-			</div><div class='del'>-			book_uri = e_book_get_uri (book);</div><div class='del'>-			</div><div class='del'>-			dest-&gt;priv-&gt;has_been_cardified = TRUE;</div><div class='del'>-			e_destination_set_card (dest, E_CARD (cards-&gt;data), 0); /* Uses primary e-mail by default. */</div><div class='del'>-			e_destination_set_book_uri (dest, book_uri);</div><div class='del'>-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);</div><div class='del'>-			</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */</div><div class='del'>-			</div><div class='del'>-		} else {</div><div class='del'>-			/* We can only end up here if we don't look at all like an e-mail address, so</div><div class='del'>-			   we do a name-only query on the textrep */</div><div class='del'>-			</div><div class='del'>-			e_book_name_and_email_query (book,</div><div class='del'>-						     e_destination_get_textrep (dest),</div><div class='del'>-						     NULL,</div><div class='del'>-						     name_and_email_simple_query_cb,</div><div class='del'>-						     dest);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Something went wrong with the query: drop our ref to the destination and return. */</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-launch_cardify_query (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	if (! e_destination_is_valid (dest)) {</div><div class='del'>-		/* If it doesn't look like an e-mail address, see if it is a nickname. */</div><div class='del'>-		e_book_nickname_query (dest-&gt;priv-&gt;cardify_book,</div><div class='del'>-				       e_destination_get_textrep (dest),</div><div class='del'>-				       nickname_simple_query_cb,</div><div class='del'>-				       dest);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		e_book_name_and_email_query (dest-&gt;priv-&gt;cardify_book,</div><div class='del'>-					     e_destination_get_name (dest),</div><div class='del'>-					     e_destination_get_email (dest),</div><div class='del'>-					     name_and_email_simple_query_cb,</div><div class='del'>-					     dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-use_local_book_cb (EBook *book, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = E_DESTINATION (closure);</div><div class='del'>-	if (dest-&gt;priv-&gt;cardify_book == NULL) {</div><div class='del'>-		dest-&gt;priv-&gt;cardify_book = book;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	launch_cardify_query (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_destination_reverting_is_a_good_idea (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	const char *textrep;</div><div class='del'>-	int len, old_len;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	if (dest-&gt;priv-&gt;old_textrep == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	textrep = e_destination_get_textrep (dest);</div><div class='del'>-	</div><div class='del'>-	len = g_utf8_strlen (textrep, -1);</div><div class='del'>-	old_len = g_utf8_strlen (dest-&gt;priv-&gt;old_textrep, -1);</div><div class='del'>-	</div><div class='del'>-	if (len &lt;= old_len/2)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_cardify (EDestination *dest, EBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (book == NULL || E_IS_BOOK (book));</div><div class='del'>-	</div><div class='del'>-	if (e_destination_is_evolution_list (dest))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (e_destination_contains_card (dest))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (!dest-&gt;priv-&gt;allow_cardify)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;cannot_cardify)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_destination_cancel_cardify (dest);</div><div class='del'>-	</div><div class='del'>-	/* In some cases, we can revert to the previous card. */</div><div class='del'>-	if (!e_destination_is_valid (dest)</div><div class='del'>-	    &amp;&amp; e_destination_reverting_is_a_good_idea (dest)</div><div class='del'>-	    &amp;&amp; e_destination_revert (dest)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	set_cardify_book (dest, book);</div><div class='del'>-	</div><div class='del'>-	/* Handle the case of an EDestination containing a card URL */</div><div class='del'>-	if (e_destination_contains_card (dest)) {</div><div class='del'>-		e_destination_use_card (dest, NULL, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we have a book ready, proceed.  We hold a reference to ourselves</div><div class='del'>-	   until our query is complete. */</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-	if (dest-&gt;priv-&gt;cardify_book != NULL) {</div><div class='del'>-		launch_cardify_query (dest);</div><div class='del'>-	} else {</div><div class='del'>-		e_book_use_local_address_book (use_local_book_cb, dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_cardify_delayed (gpointer ptr)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = E_DESTINATION (ptr);</div><div class='del'>-	</div><div class='del'>-	e_destination_cardify (dest, dest-&gt;priv-&gt;cardify_book);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_cardify_delayed (EDestination *dest, EBook *book, gint delay)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	g_return_if_fail (book == NULL || E_IS_BOOK (book));</div><div class='del'>-	</div><div class='del'>-	if (delay &lt; 0)</div><div class='del'>-		delay = 500;</div><div class='del'>-	</div><div class='del'>-	e_destination_cancel_cardify (dest);</div><div class='del'>-	</div><div class='del'>-	set_cardify_book (dest, book);</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;pending_cardification = gtk_timeout_add (delay, do_cardify_delayed, dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_cancel_cardify (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;pending_cardification) {</div><div class='del'>-		gtk_timeout_remove (dest-&gt;priv-&gt;pending_cardification);</div><div class='del'>-		dest-&gt;priv-&gt;pending_cardification = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_uncardify (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	char *email;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (!e_destination_contains_card (dest))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	email = g_strdup (e_destination_get_email (dest));</div><div class='del'>-	</div><div class='del'>-	if (email == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	e_destination_freeze (dest);</div><div class='del'>-	e_destination_clear (dest);</div><div class='del'>-	e_destination_set_raw (dest, email);</div><div class='del'>-	g_free (email);</div><div class='del'>-	e_destination_thaw (dest);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_revert (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;priv-&gt;old_card) {</div><div class='del'>-		ECard *card;</div><div class='del'>-		int card_email_num;</div><div class='del'>-		</div><div class='del'>-		card = dest-&gt;priv-&gt;old_card;</div><div class='del'>-		card_email_num = dest-&gt;priv-&gt;old_card_email_num;</div><div class='del'>-		</div><div class='del'>-		dest-&gt;priv-&gt;old_card = NULL;</div><div class='del'>-		g_free (dest-&gt;priv-&gt;old_textrep);</div><div class='del'>-		dest-&gt;priv-&gt;old_textrep = NULL;</div><div class='del'>-		</div><div class='del'>-		e_destination_freeze (dest);</div><div class='del'>-		e_destination_clear (dest);</div><div class='del'>-		e_destination_set_card (dest, card, card_email_num);</div><div class='del'>-		e_destination_thaw (dest);</div><div class='del'>-		</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Destination import/export</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_destination_get_address_textv (EDestination **destv)</div><div class='del'>-{</div><div class='del'>-	int i, j, len = 0;</div><div class='del'>-	char **strv;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (destv, NULL);</div><div class='del'>-	</div><div class='del'>-	/* Q: Please tell me this is only for assertion</div><div class='del'>-           reasons. If this is considered to be ok behavior then you</div><div class='del'>-           shouldn't use g_return's. Just a reminder ;-) </div><div class='del'>-	   </div><div class='del'>-	   A: Yes, this is just an assertion.  (Though it does find the</div><div class='del'>-	   length of the vector in the process...)</div><div class='del'>-	*/</div><div class='del'>-	while (destv[len]) {</div><div class='del'>-		g_return_val_if_fail (E_IS_DESTINATION (destv[len]), NULL);</div><div class='del'>-		len++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	strv = g_new0 (char *, len + 1);</div><div class='del'>-	for (i = 0, j = 0; destv[i]; i++) {</div><div class='del'>-		if (!e_destination_is_empty (destv[i])) {</div><div class='del'>-			const char *addr = e_destination_get_address (destv[i]);</div><div class='del'>-			strv[j++] = addr ? (char *) addr : "";</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	str = g_strjoinv (", ", strv);</div><div class='del'>-	</div><div class='del'>-	g_free (strv);</div><div class='del'>-	</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-xmlNodePtr</div><div class='del'>-e_destination_xml_encode (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr dest_node;</div><div class='del'>-	const char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	dest_node = xmlNewNode (NULL, "destination");</div><div class='del'>-	</div><div class='del'>-	str = e_destination_get_name (dest);</div><div class='del'>-	if (str)</div><div class='del'>-		xmlNewTextChild (dest_node, NULL, "name", str);</div><div class='del'>-	</div><div class='del'>-	if (!e_destination_is_evolution_list (dest)) {</div><div class='del'>-		str = e_destination_get_email (dest);</div><div class='del'>-		if (str)</div><div class='del'>-			xmlNewTextChild (dest_node, NULL, "email", str);</div><div class='del'>-	} else {</div><div class='del'>-		GList *iter = dest-&gt;priv-&gt;list_dests;</div><div class='del'>-		</div><div class='del'>-		while (iter) {</div><div class='del'>-			EDestination *list_dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-			xmlNodePtr list_node = xmlNewNode (NULL, "list_entry");</div><div class='del'>-			</div><div class='del'>-			str = e_destination_get_name (list_dest);</div><div class='del'>-			if (str)</div><div class='del'>-				xmlNewTextChild (list_node, NULL, "name", str);</div><div class='del'>-			</div><div class='del'>-			str = e_destination_get_email (list_dest);</div><div class='del'>-			if (str)</div><div class='del'>-				xmlNewTextChild (list_node, NULL, "email", str);</div><div class='del'>-			</div><div class='del'>-			xmlAddChild (dest_node, list_node);</div><div class='del'>-			</div><div class='del'>-			iter = g_list_next (iter);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		xmlNewProp (dest_node, "is_list", "yes");</div><div class='del'>-		xmlNewProp (dest_node, "show_addresses", </div><div class='del'>-			    e_destination_list_show_addresses (dest) ? "yes" : "no");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	str = e_destination_get_book_uri (dest);</div><div class='del'>-	if (str) {</div><div class='del'>-		xmlNewTextChild (dest_node, NULL, "book_uri", str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	str = e_destination_get_card_uid (dest);</div><div class='del'>-	if (str) {</div><div class='del'>-		char buf[16];</div><div class='del'>-		</div><div class='del'>-		xmlNodePtr uri_node = xmlNewTextChild (dest_node, NULL, "card_uid", str);</div><div class='del'>-		g_snprintf (buf, 16, "%d", e_destination_get_email_num (dest));</div><div class='del'>-		xmlNewProp (uri_node, "email_num", buf);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	xmlNewProp (dest_node, "html_mail", e_destination_get_html_mail_pref (dest) ? "yes" : "no");</div><div class='del'>-	</div><div class='del'>-	xmlNewProp (dest_node, "auto_recipient",</div><div class='del'>-		    e_destination_is_auto_recipient (dest) ? "yes" : "no");</div><div class='del'>-	</div><div class='del'>-	return dest_node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_destination_xml_decode (EDestination *dest, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	char *name = NULL, *email = NULL, *book_uri = NULL, *card_uid = NULL;</div><div class='del'>-	gboolean is_list = FALSE, show_addr = FALSE, auto_recip = FALSE;</div><div class='del'>-	gboolean html_mail = FALSE;</div><div class='del'>-	GList *list_dests = NULL;</div><div class='del'>-	int email_num = -1;</div><div class='del'>-	char *tmp;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-	g_return_val_if_fail (node != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	if (strcmp (node-&gt;name, "destination"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	tmp = xmlGetProp (node, "html_mail");</div><div class='del'>-	if (tmp) {</div><div class='del'>-		html_mail = !strcmp (tmp, "yes");</div><div class='del'>-		xmlFree (tmp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	tmp = xmlGetProp (node, "is_list");</div><div class='del'>-	if (tmp) {</div><div class='del'>-		is_list = !strcmp (tmp, "yes");</div><div class='del'>-		xmlFree (tmp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	tmp = xmlGetProp (node, "show_addresses");</div><div class='del'>-	if (tmp) {</div><div class='del'>-		show_addr = !strcmp (tmp, "yes");</div><div class='del'>-		xmlFree (tmp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	tmp = xmlGetProp (node, "auto_recipient");</div><div class='del'>-	if (tmp) {</div><div class='del'>-		auto_recip = !strcmp (tmp, "yes");</div><div class='del'>-		xmlFree (tmp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	node = node-&gt;xmlChildrenNode;</div><div class='del'>-	while (node) {</div><div class='del'>-		if (!strcmp (node-&gt;name, "name")) {</div><div class='del'>-			tmp = xmlNodeGetContent (node);</div><div class='del'>-			g_free (name);</div><div class='del'>-			name = g_strdup (tmp);</div><div class='del'>-			xmlFree (tmp);</div><div class='del'>-		} else if (!is_list &amp;&amp; !strcmp (node-&gt;name, "email")) {</div><div class='del'>-			tmp = xmlNodeGetContent (node);</div><div class='del'>-			g_free (email);</div><div class='del'>-			email = g_strdup (tmp);</div><div class='del'>-			xmlFree (tmp);</div><div class='del'>-		} else if (is_list &amp;&amp; !strcmp (node-&gt;name, "list_entry")) {</div><div class='del'>-			xmlNodePtr subnode = node-&gt;xmlChildrenNode;</div><div class='del'>-			char *list_name = NULL, *list_email = NULL;</div><div class='del'>-			</div><div class='del'>-			while (subnode) {</div><div class='del'>-				if (!strcmp (subnode-&gt;name, "name")) {</div><div class='del'>-					tmp = xmlNodeGetContent (subnode);</div><div class='del'>-					g_free (list_name);</div><div class='del'>-					list_name = g_strdup (tmp);</div><div class='del'>-					xmlFree (tmp);</div><div class='del'>-				} else if (!strcmp (subnode-&gt;name, "email")) {</div><div class='del'>-					tmp = xmlNodeGetContent (subnode);</div><div class='del'>-					g_free (list_email);</div><div class='del'>-					list_email = g_strdup (tmp);</div><div class='del'>-					xmlFree (tmp);</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				subnode = subnode-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (list_name || list_email) {</div><div class='del'>-				EDestination *list_dest = e_destination_new ();</div><div class='del'>-				</div><div class='del'>-				if (list_name)</div><div class='del'>-					e_destination_set_name (list_dest, list_name);</div><div class='del'>-				if (list_email)</div><div class='del'>-					e_destination_set_email (list_dest, list_email);</div><div class='del'>-				</div><div class='del'>-				g_free (list_name);</div><div class='del'>-				g_free (list_email);</div><div class='del'>-				</div><div class='del'>-				list_dests = g_list_append (list_dests, list_dest);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strcmp (node-&gt;name, "book_uri")) {</div><div class='del'>-			tmp = xmlNodeGetContent (node);</div><div class='del'>-			g_free (book_uri);</div><div class='del'>-			book_uri = g_strdup (tmp);</div><div class='del'>-			xmlFree (tmp);</div><div class='del'>-		} else if (!strcmp (node-&gt;name, "card_uid")) {</div><div class='del'>-			tmp = xmlNodeGetContent (node);</div><div class='del'>-			g_free (card_uid);</div><div class='del'>-			card_uid = g_strdup (tmp);</div><div class='del'>-			xmlFree (tmp);</div><div class='del'>-			</div><div class='del'>-			tmp = xmlGetProp (node, "email_num");</div><div class='del'>-			email_num = atoi (tmp);</div><div class='del'>-			xmlFree (tmp);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_destination_freeze (dest);</div><div class='del'>-	</div><div class='del'>-	e_destination_clear (dest);</div><div class='del'>-	</div><div class='del'>-	if (name) {</div><div class='del'>-		e_destination_set_name (dest, name);</div><div class='del'>-		g_free (name);</div><div class='del'>-	}</div><div class='del'>-	if (email) {</div><div class='del'>-		e_destination_set_email (dest, email);</div><div class='del'>-		g_free (email);</div><div class='del'>-	}</div><div class='del'>-	if (book_uri) {</div><div class='del'>-		e_destination_set_book_uri (dest, book_uri);</div><div class='del'>-		g_free (book_uri);</div><div class='del'>-	}</div><div class='del'>-	if (card_uid) {</div><div class='del'>-		e_destination_set_card_uid (dest, card_uid, email_num);</div><div class='del'>-		g_free (card_uid);</div><div class='del'>-	}</div><div class='del'>-	if (list_dests)</div><div class='del'>-		dest-&gt;priv-&gt;list_dests = list_dests;</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;html_mail_override = TRUE;</div><div class='del'>-	dest-&gt;priv-&gt;wants_html_mail = html_mail;</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;show_addresses = show_addr;</div><div class='del'>-	</div><div class='del'>-	dest-&gt;priv-&gt;auto_recipient = auto_recip;</div><div class='del'>-	</div><div class='del'>-	e_destination_thaw (dest);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Make utf-8 safe */</div><div class='del'>-static gchar *</div><div class='del'>-null_terminate_and_remove_extra_whitespace (xmlChar *xml_in, gint size)</div><div class='del'>-{</div><div class='del'>-	gboolean skip_white = FALSE;</div><div class='del'>-	char *xml, *r, *w;</div><div class='del'>-	</div><div class='del'>-	if (xml_in == NULL || size &lt;= 0) </div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	xml = g_strndup (xml_in, size);</div><div class='del'>-	r = w = xml;</div><div class='del'>-	</div><div class='del'>-	while (*r) {</div><div class='del'>-		if (*r == '\n' || *r == '\r') {</div><div class='del'>-			skip_white = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			gboolean is_space = isspace (*r);</div><div class='del'>-			</div><div class='del'>-			*w = *r;</div><div class='del'>-			</div><div class='del'>-			if (!(skip_white &amp;&amp; is_space))</div><div class='del'>-				w++;</div><div class='del'>-			if (!is_space)</div><div class='del'>-				skip_white = FALSE;</div><div class='del'>-		}</div><div class='del'>-		r++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*w = '\0';</div><div class='del'>-	</div><div class='del'>-	return xml;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_destination_export (const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr dest_node;</div><div class='del'>-	xmlDocPtr dest_doc;</div><div class='del'>-	xmlChar *buffer = NULL;</div><div class='del'>-	int size = -1;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest), NULL);</div><div class='del'>-	</div><div class='del'>-	dest_node = e_destination_xml_encode (dest);</div><div class='del'>-	if (dest_node == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	dest_doc = xmlNewDoc (XML_DEFAULT_VERSION);</div><div class='del'>-	xmlDocSetRootElement (dest_doc, dest_node);</div><div class='del'>-	</div><div class='del'>-	xmlDocDumpMemory (dest_doc, &amp;buffer, &amp;size);</div><div class='del'>-	xmlFreeDoc (dest_doc);</div><div class='del'>-	</div><div class='del'>-	str = null_terminate_and_remove_extra_whitespace (buffer, size);</div><div class='del'>-	xmlFree (buffer);</div><div class='del'>-	</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination *</div><div class='del'>-e_destination_import (const gchar *str)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest = NULL;</div><div class='del'>-	xmlDocPtr dest_doc;</div><div class='del'>-	</div><div class='del'>-	if (!(str &amp;&amp; *str))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	dest_doc = xmlParseMemory ((char *) str, strlen (str));</div><div class='del'>-	if (dest_doc &amp;&amp; dest_doc-&gt;xmlRootNode) {</div><div class='del'>-		dest = e_destination_new ();</div><div class='del'>-		if (! e_destination_xml_decode (dest, dest_doc-&gt;xmlRootNode)) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-			dest = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	xmlFreeDoc (dest_doc);</div><div class='del'>-	</div><div class='del'>-	return dest;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_destination_exportv (EDestination **destv)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr destv_doc;</div><div class='del'>-	xmlNodePtr destv_node;</div><div class='del'>-	xmlChar *buffer = NULL;</div><div class='del'>-	int i, size = -1;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (destv == NULL || *destv == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	destv_doc  = xmlNewDoc (XML_DEFAULT_VERSION);</div><div class='del'>-	destv_node = xmlNewNode (NULL, "destinations");</div><div class='del'>-	xmlDocSetRootElement (destv_doc, destv_node);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; destv[i]; i++) {</div><div class='del'>-		if (! e_destination_is_empty (destv[i])) {</div><div class='del'>-			xmlNodePtr dest_node = e_destination_xml_encode (destv[i]);</div><div class='del'>-			if (dest_node)</div><div class='del'>-				xmlAddChild (destv_node, dest_node);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	xmlDocDumpMemory (destv_doc, &amp;buffer, &amp;size);</div><div class='del'>-	xmlFreeDoc (destv_doc);</div><div class='del'>-	</div><div class='del'>-	str = null_terminate_and_remove_extra_whitespace (buffer, size);</div><div class='del'>-	xmlFree (buffer);</div><div class='del'>-	</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_destination_importv (const gchar *str)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *dest_array = NULL;</div><div class='del'>-	xmlDocPtr destv_doc;</div><div class='del'>-	xmlNodePtr node;</div><div class='del'>-	EDestination **destv = NULL;</div><div class='del'>-	</div><div class='del'>-	if (!(str &amp;&amp; *str))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	destv_doc = xmlParseMemory ((char *)str, strlen (str));</div><div class='del'>-	if (destv_doc == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	node = destv_doc-&gt;xmlRootNode;</div><div class='del'>-	</div><div class='del'>-	if (strcmp (node-&gt;name, "destinations"))</div><div class='del'>-		goto finished;</div><div class='del'>-	</div><div class='del'>-	node = node-&gt;xmlChildrenNode;</div><div class='del'>-	</div><div class='del'>-	dest_array = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	while (node) {</div><div class='del'>-		EDestination *dest;</div><div class='del'>-		</div><div class='del'>-		dest = e_destination_new ();</div><div class='del'>-		if (e_destination_xml_decode (dest, node) &amp;&amp; !e_destination_is_empty (dest)) {</div><div class='del'>-			g_ptr_array_add (dest_array, dest);</div><div class='del'>-		} else {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* we need destv to be NULL terminated */</div><div class='del'>-	g_ptr_array_add (dest_array, NULL);</div><div class='del'>-	</div><div class='del'>-	destv = (EDestination **) dest_array-&gt;pdata;</div><div class='del'>-	g_ptr_array_free (dest_array, FALSE);</div><div class='del'>-	</div><div class='del'>- finished:</div><div class='del'>-	xmlFreeDoc (destv_doc);</div><div class='del'>-	</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_destination_list_to_vector_sized (GList *list, int n)</div><div class='del'>-{</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	int i = 0;</div><div class='del'>-	</div><div class='del'>-	if (n == -1)</div><div class='del'>-		n = g_list_length (list);</div><div class='del'>-	</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	destv = g_new (EDestination *, n + 1);</div><div class='del'>-	while (list != NULL &amp;&amp; i &lt; n) {</div><div class='del'>-		destv[i] = E_DESTINATION (list-&gt;data);</div><div class='del'>-		list-&gt;data = NULL;</div><div class='del'>-		i++;</div><div class='del'>-		list = g_list_next (list);</div><div class='del'>-	}</div><div class='del'>-	destv[i] = NULL;</div><div class='del'>-	</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_destination_list_to_vector (GList *list)</div><div class='del'>-{</div><div class='del'>-	return e_destination_list_to_vector_sized (list, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_freev (EDestination **destv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (destv) {</div><div class='del'>-		for (i = 0; destv[i] != NULL; ++i) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (destv[i]));</div><div class='del'>-		}</div><div class='del'>-		g_free (destv);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-touch_cb (EBook *book, const gchar *addr, ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	if (book != NULL &amp;&amp; card != NULL) {</div><div class='del'>-		e_card_touch (card);</div><div class='del'>-		d(g_message ("Use score for \"%s\" is now %f", addr, e_card_get_use_score (card)));</div><div class='del'>-		e_book_commit_card (book, card, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_touch (EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	const char *email;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	if (!e_destination_is_auto_recipient (dest)) {</div><div class='del'>-		email = e_destination_get_email (dest);</div><div class='del'>-		</div><div class='del'>-		if (email)</div><div class='del'>-			e_book_query_address_locally (email, touch_cb, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_destination_touchv (EDestination **destv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (destv != NULL);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; destv[i] != NULL; ++i) {</div><div class='del'>-		e_destination_touch (destv[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h<br/>deleted file mode 100644<br/>index f545794ab0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-destination.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/e-destination.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-destination.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_DESTINATION_H__</div><div class='del'>-#define __E_DESTINATION_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_DESTINATION        (e_destination_get_type ())</div><div class='del'>-#define E_DESTINATION(o)          (GTK_CHECK_CAST ((o), E_TYPE_DESTINATION, EDestination))</div><div class='del'>-#define E_DESTINATION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_TYPE_DESTINATION, EDestinationClass))</div><div class='del'>-#define E_IS_DESTINATION(o)       (GTK_CHECK_TYPE ((o), E_TYPE_DESTINATION))</div><div class='del'>-#define E_IS_DESTINATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TYPE_DESTINATION))</div><div class='del'>-</div><div class='del'>-typedef struct _EDestination EDestination;</div><div class='del'>-typedef struct _EDestinationClass EDestinationClass;</div><div class='del'>-</div><div class='del'>-typedef void (*EDestinationCardCallback) (EDestination *dest, ECard *card, gpointer closure);</div><div class='del'>-</div><div class='del'>-struct _EDestinationPrivate;</div><div class='del'>-</div><div class='del'>-struct _EDestination {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	struct _EDestinationPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EDestinationClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed) (EDestination *dest);	</div><div class='del'>-	void (*cardified) (EDestination *dest);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_destination_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EDestination  *e_destination_new                (void);</div><div class='del'>-void           e_destination_changed            (EDestination *);</div><div class='del'>-EDestination  *e_destination_copy               (const EDestination *);</div><div class='del'>-void           e_destination_clear              (EDestination *);</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_is_empty           (const EDestination *);</div><div class='del'>-gboolean       e_destination_is_valid           (const EDestination *);</div><div class='del'>-gboolean       e_destination_equal              (const EDestination *a, const EDestination *b);</div><div class='del'>-</div><div class='del'>-void           e_destination_set_card           (EDestination *, ECard *card, gint email_num);</div><div class='del'>-void           e_destination_set_book_uri       (EDestination *, const gchar *uri); </div><div class='del'>-void           e_destination_set_card_uid       (EDestination *, const gchar *uid, gint email_num); </div><div class='del'>-</div><div class='del'>-void           e_destination_set_name           (EDestination *, const gchar *name);</div><div class='del'>-void           e_destination_set_email          (EDestination *, const gchar *email);</div><div class='del'>-</div><div class='del'>-void           e_destination_set_html_mail_pref (EDestination *, gboolean);</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_contains_card      (const EDestination *);</div><div class='del'>-gboolean       e_destination_from_card          (const EDestination *);</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_is_auto_recipient  (const EDestination *);</div><div class='del'>-void           e_destination_set_auto_recipient (EDestination *, gboolean value);</div><div class='del'>-</div><div class='del'>-void           e_destination_use_card           (EDestination *, EDestinationCardCallback cb, gpointer closure);</div><div class='del'>-</div><div class='del'>-ECard         *e_destination_get_card           (const EDestination *);</div><div class='del'>-const gchar   *e_destination_get_book_uri       (const EDestination *);</div><div class='del'>-const gchar   *e_destination_get_card_uid       (const EDestination *);</div><div class='del'>-gint           e_destination_get_email_num      (const EDestination *);</div><div class='del'>-</div><div class='del'>-const gchar   *e_destination_get_name           (const EDestination *);  /* "Jane Smith" */</div><div class='del'>-const gchar   *e_destination_get_email          (const EDestination *);  /* "jane@assbarn.com" */</div><div class='del'>-const gchar   *e_destination_get_address        (const EDestination *);  /* "Jane Smith &lt;jane@assbarn.com&gt;" (or a comma-sep set of such for a list) */</div><div class='del'>-</div><div class='del'>-void           e_destination_set_raw            (EDestination *, const gchar *free_form_string);</div><div class='del'>-const gchar   *e_destination_get_textrep        (const EDestination *);  /* "Jane Smith" or "jane@assbarn.com" */</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_is_evolution_list   (const EDestination *);</div><div class='del'>-gboolean       e_destination_list_show_addresses (const EDestination *);</div><div class='del'>-</div><div class='del'>-/* If true, they want HTML mail. */</div><div class='del'>-gboolean       e_destination_get_html_mail_pref (const EDestination *);</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_allow_cardification     (const EDestination *);</div><div class='del'>-void           e_destination_set_allow_cardification (EDestination *, gboolean);</div><div class='del'>-void           e_destination_cardify                 (EDestination *, EBook *);</div><div class='del'>-void           e_destination_cardify_delayed         (EDestination *, EBook *, gint delay); /* delay &lt; 0: "default" */</div><div class='del'>-void           e_destination_cancel_cardify          (EDestination *);</div><div class='del'>-gboolean       e_destination_uncardify               (EDestination *);</div><div class='del'>-</div><div class='del'>-gboolean       e_destination_revert                  (EDestination *);</div><div class='del'>-</div><div class='del'>-gchar         *e_destination_get_address_textv  (EDestination **);</div><div class='del'>-</div><div class='del'>-xmlNodePtr     e_destination_xml_encode         (const EDestination *dest);</div><div class='del'>-gboolean       e_destination_xml_decode         (EDestination *dest, xmlNodePtr node);</div><div class='del'>-</div><div class='del'>-gchar         *e_destination_export             (const EDestination *);</div><div class='del'>-EDestination  *e_destination_import             (const gchar *str);</div><div class='del'>-</div><div class='del'>-gchar         *e_destination_exportv            (EDestination **);</div><div class='del'>-EDestination **e_destination_importv            (const gchar *str);</div><div class='del'>-</div><div class='del'>-EDestination **e_destination_list_to_vector_sized (GList *, int n);</div><div class='del'>-EDestination **e_destination_list_to_vector       (GList *);</div><div class='del'>-</div><div class='del'>-void           e_destination_freev              (EDestination **);</div><div class='del'>-</div><div class='del'>-void           e_destination_touch              (EDestination *);</div><div class='del'>-void           e_destination_touchv             (EDestination **);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_DESTINATION_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c<br/>deleted file mode 100644<br/>index 60ac899e81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/evolution-ldif-importer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/evolution-ldif-importer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,624 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * LDIF importer.  LDIF is the file format of an exported Netscape</div><div class='del'>- * addressbook.</div><div class='del'>- *</div><div class='del'>- * Framework copied from evolution-gnomecard-importer.c</div><div class='del'>- *</div><div class='del'>- * Michael M. Morrison (mmorrison@kqcorp.com)</div><div class='del'>- *</div><div class='del'>- * Multi-line value support, mailing list support, base64 support, and</div><div class='del'>- * various fixups: Chris Toshok (toshok@ximian.com)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-book.h&gt;</div><div class='del'>-#include &lt;e-card-simple.h&gt;</div><div class='del'>-#include &lt;e-destination.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;importer/evolution-importer.h&gt;</div><div class='del'>-#include &lt;importer/GNOME_Evolution_Importer.h&gt;</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-static GHashTable *dn_card_hash;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *filename;</div><div class='del'>-	GList *cardlist;</div><div class='del'>-	GList *iterator;</div><div class='del'>-	EBook *book;</div><div class='del'>-	gboolean ready;</div><div class='del'>-} LDIFImporter;</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *ldif_attribute;</div><div class='del'>-	ECardSimpleField simple_field;</div><div class='del'>-#define FLAG_ADDRESS 0x01</div><div class='del'>-	int flags;</div><div class='del'>-}</div><div class='del'>-ldif_fields[] = {</div><div class='del'>-	{ "cn", E_CARD_SIMPLE_FIELD_FULL_NAME },</div><div class='del'>-	{ "mail", E_CARD_SIMPLE_FIELD_EMAIL },</div><div class='del'>-#if 0</div><div class='del'>-	{ "givenname", E_CARD_SIMPLE_FIELD_GIVEN_NAME },</div><div class='del'>-#endif</div><div class='del'>-	{ "sn", E_CARD_SIMPLE_FIELD_FAMILY_NAME },</div><div class='del'>-	{ "xmozillanickname", E_CARD_SIMPLE_FIELD_NICKNAME },</div><div class='del'>-	{ "o", E_CARD_SIMPLE_FIELD_ORG },</div><div class='del'>-	{ "locality", 0, FLAG_ADDRESS},</div><div class='del'>-	{ "st", 0, FLAG_ADDRESS },</div><div class='del'>-	{ "streetaddress", 0, FLAG_ADDRESS },</div><div class='del'>-	{ "title", E_CARD_SIMPLE_FIELD_TITLE },</div><div class='del'>-	{ "postalcode", 0, FLAG_ADDRESS },</div><div class='del'>-	{ "countryname", 0, FLAG_ADDRESS },</div><div class='del'>-	{ "telephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS},</div><div class='del'>-	{ "homephone", E_CARD_SIMPLE_FIELD_PHONE_HOME },</div><div class='del'>-	{ "facsimiletelephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX },</div><div class='del'>-	{ "ou", E_CARD_SIMPLE_FIELD_ORG_UNIT },</div><div class='del'>-	{ "pagerphone", E_CARD_SIMPLE_FIELD_PHONE_PAGER },</div><div class='del'>-	{ "cellphone", E_CARD_SIMPLE_FIELD_PHONE_MOBILE },</div><div class='del'>-	{ "homeurl", E_CARD_SIMPLE_FIELD_URL },</div><div class='del'>-	{ "description", E_CARD_SIMPLE_FIELD_NOTE },</div><div class='del'>-	{ "xmozillausehtmlmail", E_CARD_SIMPLE_FIELD_WANTS_HTML }</div><div class='del'>-};</div><div class='del'>-static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]);</div><div class='del'>-</div><div class='del'>-static unsigned char base64_rank[256] = {</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,</div><div class='del'>-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,</div><div class='del'>-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,</div><div class='del'>-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,</div><div class='del'>-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,</div><div class='del'>-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * base64_decode_step: decode a chunk of base64 encoded data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: max length of data to decode</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- *</div><div class='del'>- * Decodes a chunk of base64 encoded data</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, c;</div><div class='del'>-	register unsigned int v;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	inend = in+len;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	/* convert 4 base64 bytes to 3 normal bytes */</div><div class='del'>-	v=*save;</div><div class='del'>-	i=*state;</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		c = base64_rank[*inptr++];</div><div class='del'>-		if (c != 0xff) {</div><div class='del'>-			v = (v&lt;&lt;6) | c;</div><div class='del'>-			i++;</div><div class='del'>-			if (i==4) {</div><div class='del'>-				*outptr++ = v&gt;&gt;16;</div><div class='del'>-				*outptr++ = v&gt;&gt;8;</div><div class='del'>-				*outptr++ = v;</div><div class='del'>-				i=0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*save = v;</div><div class='del'>-	*state = i;</div><div class='del'>-</div><div class='del'>-	/* quick scan back for '=' on the end somewhere */</div><div class='del'>-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */</div><div class='del'>-	i=2;</div><div class='del'>-	while (inptr&gt;in &amp;&amp; i) {</div><div class='del'>-		inptr--;</div><div class='del'>-		if (base64_rank[*inptr] != 0xff) {</div><div class='del'>-			if (*inptr == '=')</div><div class='del'>-				outptr--;</div><div class='del'>-			i--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if i!= 0 then there is a truncation error! */</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-base64_decode_simple (char *data, int len)</div><div class='del'>-{</div><div class='del'>-	int state = 0;</div><div class='del'>-	unsigned int save = 0;</div><div class='del'>-</div><div class='del'>-	return base64_decode_step ((unsigned char *)data, len,</div><div class='del'>-				   (unsigned char *)data, &amp;state, &amp;save);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GString *</div><div class='del'>-getValue( char **src )</div><div class='del'>-{</div><div class='del'>-	GString *dest = g_string_new("");</div><div class='del'>-	char *s = *src;</div><div class='del'>-	gboolean need_base64 = (*s == ':');</div><div class='del'>-</div><div class='del'>- copy_line:</div><div class='del'>-	while( *s != 0 &amp;&amp; *s != '\n' &amp;&amp; *s != '\r' )</div><div class='del'>-		dest = g_string_append_c (dest, *s++);</div><div class='del'>-</div><div class='del'>-	if (*s == '\r') s++;</div><div class='del'>-	if (*s == '\n')	s++;</div><div class='del'>-</div><div class='del'>-	/* check for continuation here */</div><div class='del'>-	if (*s == ' ') {</div><div class='del'>-		s++;</div><div class='del'>-		goto copy_line;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (need_base64) {</div><div class='del'>-		int new_len;</div><div class='del'>-		/* it's base64 encoded */</div><div class='del'>-		dest = g_string_erase (dest, 0, 2);</div><div class='del'>-		new_len = base64_decode_simple (dest-&gt;str, strlen (dest-&gt;str));</div><div class='del'>-		dest = g_string_truncate (dest, new_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*src = s;</div><div class='del'>-</div><div class='del'>-	return dest;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf )</div><div class='del'>-{</div><div class='del'>-	char *ptr;</div><div class='del'>-	char *colon, *value;</div><div class='del'>-	gboolean field_handled;</div><div class='del'>-	GString *ldif_value;</div><div class='del'>-</div><div class='del'>-	ptr = *buf;</div><div class='del'>-</div><div class='del'>-	/* if the string is empty, return */</div><div class='del'>-	if (*ptr == '\0') {</div><div class='del'>-		*buf = NULL;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* skip comment lines */</div><div class='del'>-	if (*ptr == '#') {</div><div class='del'>-		ptr = strchr (ptr, '\n');</div><div class='del'>-		if (!ptr)</div><div class='del'>-			*buf = NULL;</div><div class='del'>-		else</div><div class='del'>-			*buf = ptr + 1;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first, check for a 'continuation' line */</div><div class='del'>-	if( ptr[0] == ' ' &amp;&amp; ptr[1] != '\n' ) {</div><div class='del'>-		g_warning ("unexpected continuation line");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	colon = (char *)strchr( ptr, ':' );</div><div class='del'>-	if (colon) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		*colon = 0;</div><div class='del'>-		value = colon + 1;</div><div class='del'>-		while ( isspace(*value) )</div><div class='del'>-			value++;</div><div class='del'>-</div><div class='del'>-		ldif_value = getValue(&amp;value );</div><div class='del'>-</div><div class='del'>-		field_handled = FALSE;</div><div class='del'>-		for (i = 0; i &lt; num_ldif_fields; i ++) {</div><div class='del'>-			if (!g_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {</div><div class='del'>-				if (ldif_fields[i].flags &amp; FLAG_ADDRESS) {</div><div class='del'>-					if (!g_strcasecmp (ptr, "locality"))</div><div class='del'>-						address-&gt;city = g_strdup (ldif_value-&gt;str);</div><div class='del'>-					else if (!g_strcasecmp (ptr, "countryname"))</div><div class='del'>-						address-&gt;country = g_strdup (ldif_value-&gt;str);</div><div class='del'>-					else if (!g_strcasecmp (ptr, "postalcode"))</div><div class='del'>-						address-&gt;code = g_strdup (ldif_value-&gt;str);</div><div class='del'>-					else if (!g_strcasecmp (ptr, "st"))</div><div class='del'>-						address-&gt;region = g_strdup (ldif_value-&gt;str);</div><div class='del'>-					else if (!g_strcasecmp (ptr, "streetaddress"))</div><div class='del'>-						address-&gt;street = g_strdup (ldif_value-&gt;str);</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					e_card_simple_set (simple, ldif_fields[i].simple_field, ldif_value-&gt;str);</div><div class='del'>-					printf ("set %s to %s\n", ptr, ldif_value-&gt;str);</div><div class='del'>-				}</div><div class='del'>-				field_handled = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* handle objectclass/dn/member out here */</div><div class='del'>-		if (!field_handled) {</div><div class='del'>-			if (!g_strcasecmp (ptr, "dn"))</div><div class='del'>-				g_hash_table_insert (dn_card_hash, g_strdup(ldif_value-&gt;str), simple-&gt;card);</div><div class='del'>-			else if (!g_strcasecmp (ptr, "objectclass") &amp;&amp; !g_strcasecmp (ldif_value-&gt;str, "groupofnames")) {</div><div class='del'>-				e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_IS_LIST, "true");</div><div class='del'>-			}</div><div class='del'>-			else if (!g_strcasecmp (ptr, "member")) {</div><div class='del'>-				EList *email;</div><div class='del'>-				gtk_object_get (GTK_OBJECT (simple-&gt;card),</div><div class='del'>-						"email", &amp;email,</div><div class='del'>-						NULL);</div><div class='del'>-				e_list_append (email, ldif_value-&gt;str);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* put the colon back the way it was, just for kicks */</div><div class='del'>-		*colon = ':';</div><div class='del'>-</div><div class='del'>-		g_string_free (ldif_value, TRUE);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unrecognized entry %s", ptr);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*buf = value;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECard *</div><div class='del'>-getNextLDIFEntry( FILE *f )</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardAddrLabel *label;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	ECardDeliveryAddress *address;</div><div class='del'>-	GString *str;</div><div class='del'>-	char line[1024];</div><div class='del'>-	char *buf;</div><div class='del'>-</div><div class='del'>-	str = g_string_new ("");</div><div class='del'>-	/* read from the file until we get to a blank line (or eof) */</div><div class='del'>-	while (!feof (f)) {</div><div class='del'>-		if (!fgets (line, sizeof(line), f))</div><div class='del'>-			break;</div><div class='del'>-		if (line[0] == '\n')</div><div class='del'>-			break;</div><div class='del'>-		str = g_string_append (str, line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strlen (str-&gt;str) == 0) {</div><div class='del'>-		g_string_free (str, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now parse that entry */</div><div class='del'>-	card = e_card_new ("");</div><div class='del'>-	simple = e_card_simple_new (card);</div><div class='del'>-	address = e_card_delivery_address_new ();</div><div class='del'>-</div><div class='del'>-	buf = str-&gt;str;</div><div class='del'>-	while (buf) {</div><div class='del'>-		if (!parseLine (simple, address, &amp;buf)) {</div><div class='del'>-			/* parsing error */</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-			e_card_delivery_address_unref (address);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* fill in the address */</div><div class='del'>-	address-&gt;flags = E_CARD_ADDR_HOME;</div><div class='del'>-</div><div class='del'>-	label = e_card_delivery_address_to_label (address);</div><div class='del'>-	e_card_delivery_address_unref (address);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME, label);</div><div class='del'>-</div><div class='del'>-	e_card_address_label_unref (label);</div><div class='del'>-</div><div class='del'>-	e_card_simple_sync_card (simple);</div><div class='del'>-</div><div class='del'>-	g_string_free (str, TRUE);</div><div class='del'>-</div><div class='del'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(closure);</div><div class='del'>-	char *vcard;</div><div class='del'>-</div><div class='del'>-	e_card_set_id (card, id);</div><div class='del'>-</div><div class='del'>-	vcard = e_card_get_vcard(card);	</div><div class='del'>-</div><div class='del'>-	g_print ("Saved card: %s\n", vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-resolve_list_card (LDIFImporter *gci, ECard *card)</div><div class='del'>-{</div><div class='del'>-	EList *email;</div><div class='del'>-	EIterator *email_iter;</div><div class='del'>-	char *full_name;</div><div class='del'>-</div><div class='del'>-	if (!e_card_evolution_list (card))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card),</div><div class='del'>-			"email", &amp;email,</div><div class='del'>-			"full_name", &amp;full_name,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* set file_as to full_name so we don't later try and figure</div><div class='del'>-           out a first/last name for the list. */</div><div class='del'>-	if (full_name)</div><div class='del'>-		gtk_object_set (GTK_OBJECT (card),</div><div class='del'>-				"file_as", full_name,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-	email_iter = e_list_get_iterator (email);</div><div class='del'>-	while (e_iterator_is_valid (email_iter)) {</div><div class='del'>-		const char *dn = e_iterator_get (email_iter);</div><div class='del'>-		ECard *dn_card = g_hash_table_lookup (dn_card_hash, dn);</div><div class='del'>-</div><div class='del'>-		/* break list chains here, since we don't support them just yet */</div><div class='del'>-		if (dn_card &amp;&amp; !e_card_evolution_list (dn_card)) {</div><div class='del'>-			EDestination *dest = e_destination_new ();</div><div class='del'>-			gchar *dest_xml;</div><div class='del'>-			e_destination_set_card (dest, dn_card, 0);  /* Hard-wired for default e-mail, since netscape only exports 1 email address */</div><div class='del'>-			dest_xml = e_destination_export (dest);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-			if (dest_xml) {</div><div class='del'>-				e_iterator_set (email_iter, dest_xml);</div><div class='del'>-				g_free (dest_xml);</div><div class='del'>-				e_iterator_next (email_iter);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				e_iterator_delete (email_iter);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			e_iterator_delete (email_iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	LDIFImporter *gci = (LDIFImporter *) closure;</div><div class='del'>-	GList * list = NULL;</div><div class='del'>-	GList * list_list = NULL;</div><div class='del'>-	FILE * file;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if(!( file = fopen( gci-&gt;filename, "r" ) )) {</div><div class='del'>-		g_warning("!!!Can't open .ldif file");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn_card_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	while ((card = getNextLDIFEntry (file))) {</div><div class='del'>-</div><div class='del'>-		if (e_card_evolution_list (card))</div><div class='del'>-			list_list = g_list_append (list_list, card);</div><div class='del'>-		else</div><div class='del'>-			list = g_list_append (list, card);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose( file );</div><div class='del'>-</div><div class='del'>-	list = g_list_reverse( list );</div><div class='del'>-	list_list = g_list_reverse (list_list);</div><div class='del'>-	list = g_list_concat (list, list_list);</div><div class='del'>-</div><div class='del'>-	gci-&gt;cardlist = list;</div><div class='del'>-	gci-&gt;ready = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ebook_create (LDIFImporter *gci)</div><div class='del'>-{</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	</div><div class='del'>-	gci-&gt;book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!gci-&gt;book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (gci-&gt;book, uri, book_open_cb, gci)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* EvolutionImporter methods */</div><div class='del'>-static void</div><div class='del'>-process_item_fn (EvolutionImporter *importer,</div><div class='del'>-		 CORBA_Object listener,</div><div class='del'>-		 void *closure,</div><div class='del'>-		 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	LDIFImporter *gci = (LDIFImporter *) closure;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if (gci-&gt;iterator == NULL)</div><div class='del'>-		gci-&gt;iterator = gci-&gt;cardlist;</div><div class='del'>-</div><div class='del'>-	if (gci-&gt;ready == FALSE) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-							       GNOME_Evolution_ImporterListener_NOT_READY,</div><div class='del'>-							       gci-&gt;iterator ? TRUE : FALSE, </div><div class='del'>-							       ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (gci-&gt;iterator == NULL) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,</div><div class='del'>-							       FALSE, ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = gci-&gt;iterator-&gt;data;</div><div class='del'>-	if (e_card_evolution_list (card))</div><div class='del'>-		resolve_list_card (gci, card);</div><div class='del'>-	e_book_add_card (gci-&gt;book, card, add_card_cb, card);</div><div class='del'>-</div><div class='del'>-	gci-&gt;iterator = gci-&gt;iterator-&gt;next;</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-						       GNOME_Evolution_ImporterListener_OK,</div><div class='del'>-						       gci-&gt;iterator ? TRUE : FALSE, </div><div class='del'>-						       ev);</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error notifying listeners.");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *supported_extensions[2] = {</div><div class='del'>-	".ldif", NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-support_format_fn (EvolutionImporter *importer,</div><div class='del'>-		   const char *filename,</div><div class='del'>-		   void *closure)</div><div class='del'>-{</div><div class='del'>-	char *ext;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ext = strrchr (filename, '.');</div><div class='del'>-	if (ext == NULL) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; supported_extensions[i] != NULL; i++) {</div><div class='del'>-		if (strcmp (supported_extensions[i], ext) == 0)</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-importer_destroy_cb (GtkObject *object,</div><div class='del'>-		     LDIFImporter *gci)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-load_file_fn (EvolutionImporter *importer,</div><div class='del'>-	      const char *filename,</div><div class='del'>-	      const char *folderpath,</div><div class='del'>-	      void *closure)</div><div class='del'>-{</div><div class='del'>-	LDIFImporter *gci;</div><div class='del'>-</div><div class='del'>-	gci = (LDIFImporter *) closure;</div><div class='del'>-	gci-&gt;filename = g_strdup (filename);</div><div class='del'>-	gci-&gt;cardlist = NULL;</div><div class='del'>-	gci-&gt;iterator = NULL;</div><div class='del'>-	gci-&gt;ready = FALSE;</div><div class='del'>-	ebook_create (gci);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-					   </div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *_factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	EvolutionImporter *importer;</div><div class='del'>-	LDIFImporter *gci;</div><div class='del'>-</div><div class='del'>-	gci = g_new (LDIFImporter, 1);</div><div class='del'>-	importer = evolution_importer_new (support_format_fn, load_file_fn, </div><div class='del'>-					   process_item_fn, NULL, gci);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (importer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-importer_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, </div><div class='del'>-					      factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_error ("Unable to create factory");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc,</div><div class='del'>-      char **argv)</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-	</div><div class='del'>-	gnome_init_with_popt_table ("Evolution-LDIF-Importer",</div><div class='del'>-				    "0.0", argc, argv, oaf_popt_options, 0,</div><div class='del'>-				    NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	importer_init ();</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c<br/>deleted file mode 100644<br/>index e32593b4fb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/evolution-vcard-importer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/evolution-vcard-importer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,260 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-book.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;importer/evolution-importer.h&gt;</div><div class='del'>-#include &lt;importer/GNOME_Evolution_Importer.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-path.h&gt;</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *filename;</div><div class='del'>-	char *folderpath;</div><div class='del'>-	GList *cardlist;</div><div class='del'>-	GList *iterator;</div><div class='del'>-	EBook *book;</div><div class='del'>-	gboolean ready;</div><div class='del'>-} VCardImporter;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(closure);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	VCardImporter *gci = (VCardImporter *) closure;</div><div class='del'>-</div><div class='del'>-	gci-&gt;cardlist = e_card_load_cards_from_file_with_default_charset(gci-&gt;filename, "ISO-8859-1");</div><div class='del'>-	gci-&gt;ready = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ebook_create (VCardImporter *gci)</div><div class='del'>-{</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	gchar *epath;</div><div class='del'>-	</div><div class='del'>-	gci-&gt;book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!gci-&gt;book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (), "evolution/local");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	epath = e_path_to_physical (uri, gci-&gt;folderpath);</div><div class='del'>-	g_free (uri);</div><div class='del'>-	uri = g_strdup_printf ("%s/addressbook.db", epath);</div><div class='del'>-	g_free (epath);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (gci-&gt;book, uri, book_open_cb, gci)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* EvolutionImporter methods */</div><div class='del'>-static void</div><div class='del'>-process_item_fn (EvolutionImporter *importer,</div><div class='del'>-		 CORBA_Object listener,</div><div class='del'>-		 void *closure,</div><div class='del'>-		 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	VCardImporter *gci = (VCardImporter *) closure;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if (gci-&gt;iterator == NULL)</div><div class='del'>-		gci-&gt;iterator = gci-&gt;cardlist;</div><div class='del'>-	</div><div class='del'>-	if (gci-&gt;ready == FALSE) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-							       GNOME_Evolution_ImporterListener_NOT_READY,</div><div class='del'>-							       gci-&gt;iterator ? TRUE : FALSE, </div><div class='del'>-							       ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (gci-&gt;iterator == NULL) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,</div><div class='del'>-							       FALSE, ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	card = gci-&gt;iterator-&gt;data;</div><div class='del'>-	e_book_add_card (gci-&gt;book, card, add_card_cb, card);</div><div class='del'>-	</div><div class='del'>-	gci-&gt;iterator = gci-&gt;iterator-&gt;next;</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ImporterListener_notifyResult (listener,</div><div class='del'>-						       GNOME_Evolution_ImporterListener_OK,</div><div class='del'>-						       gci-&gt;iterator ? TRUE : FALSE, </div><div class='del'>-						       ev);</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error notifying listeners.");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *supported_extensions[3] = {</div><div class='del'>-	".vcf",</div><div class='del'>-	".gcrd",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Actually check the contents of this file */</div><div class='del'>-static gboolean</div><div class='del'>-check_file_is_vcard (const char *filename)</div><div class='del'>-{</div><div class='del'>-	FILE *handle;</div><div class='del'>-	char line[4096];</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	handle = fopen (filename, "r");</div><div class='del'>-	if (handle == NULL) {</div><div class='del'>-		g_print ("\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	fgets (line, 4096, handle);</div><div class='del'>-	if (line == NULL) {</div><div class='del'>-		fclose (handle);</div><div class='del'>-		g_print ("\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strncmp (line, "BEGIN:VCARD", 11) == 0) {</div><div class='del'>-		result = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		result = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (handle);</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-support_format_fn (EvolutionImporter *importer,</div><div class='del'>-		   const char *filename,</div><div class='del'>-		   void *closure)</div><div class='del'>-{</div><div class='del'>-	char *ext;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ext = strrchr (filename, '.');</div><div class='del'>-	if (ext == NULL) {</div><div class='del'>-		return check_file_is_vcard (filename);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; supported_extensions[i] != NULL; i++) {</div><div class='del'>-		if (strcmp (supported_extensions[i], ext) == 0)</div><div class='del'>-			return check_file_is_vcard (filename);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-importer_destroy_cb (GtkObject *object,</div><div class='del'>-		     VCardImporter *gci)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-load_file_fn (EvolutionImporter *importer,</div><div class='del'>-	      const char *filename,</div><div class='del'>-	      const char *folderpath,</div><div class='del'>-	      void *closure)</div><div class='del'>-{</div><div class='del'>-	VCardImporter *gci;</div><div class='del'>-</div><div class='del'>-	if (check_file_is_vcard (filename) == FALSE) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gci = (VCardImporter *) closure;</div><div class='del'>-	gci-&gt;filename = g_strdup (filename);</div><div class='del'>-	gci-&gt;folderpath = g_strdup (folderpath);</div><div class='del'>-	gci-&gt;cardlist = NULL;</div><div class='del'>-	gci-&gt;iterator = NULL;</div><div class='del'>-	gci-&gt;ready = FALSE;</div><div class='del'>-	ebook_create (gci);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-					   </div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *_factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	EvolutionImporter *importer;</div><div class='del'>-	VCardImporter *gci;</div><div class='del'>-</div><div class='del'>-	gci = g_new (VCardImporter, 1);</div><div class='del'>-	importer = evolution_importer_new (support_format_fn, load_file_fn, </div><div class='del'>-					   process_item_fn, NULL, gci);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (importer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-importer_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, </div><div class='del'>-					      factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_error ("Unable to create factory");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc,</div><div class='del'>-      char **argv)</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-	</div><div class='del'>-	gnome_init_with_popt_table ("Evolution-VCard-Importer",</div><div class='del'>-				    PACKAGE, argc, argv, oaf_popt_options, 0,</div><div class='del'>-				    NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	importer_init ();</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c<br/>deleted file mode 100644<br/>index 6f592a4664..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/load-gnomecard-addressbook.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/load-gnomecard-addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-static CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(closure);</div><div class='del'>-	char *vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-	g_print ("Saved card: %s\n", vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	GList *list = e_card_load_cards_from_file_with_default_charset("gnomecard.vcf", "ISO-8859-1");</div><div class='del'>-	GList *iterator;</div><div class='del'>-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {</div><div class='del'>-		ECard *card = iterator-&gt;data;</div><div class='del'>-		e_book_add_card(book, card, add_card_cb, card);</div><div class='del'>-	}</div><div class='del'>-	g_list_free(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c<br/>deleted file mode 100644<br/>index c1d58a88bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/load-pine-addressbook.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/load-pine-addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-static CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(closure);</div><div class='del'>-	char *vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-	g_print ("Saved card: %s\n", vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_line (EBook *book, char *line)</div><div class='del'>-{</div><div class='del'>-	char **strings;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-	strings = g_strsplit(line, "\t", 3);</div><div class='del'>-	if (strings[0] &amp;&amp; strings[1] &amp;&amp; strings[2]) {</div><div class='del'>-		name = e_card_name_from_string(strings[1]);</div><div class='del'>-		gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-			       "nickname", strings[0],</div><div class='del'>-			       "full_name", strings[1],</div><div class='del'>-			       "name", name,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "email", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		e_list_append(list, strings[2]);</div><div class='del'>-		e_book_add_card(book, card, add_card_cb, card);</div><div class='del'>-	}</div><div class='del'>-	g_strfreev(strings);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	FILE *fp = fopen (".addressbook", "r");</div><div class='del'>-	char line[2 * 1024];</div><div class='del'>-	int which = 0;</div><div class='del'>-	char *lastline = NULL;</div><div class='del'>-</div><div class='del'>-	if (!fp) {</div><div class='del'>-		g_warning ("Can't find .addressbook");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while(fgets(line + which * 1024, 1024, fp)) {</div><div class='del'>-		int length;</div><div class='del'>-		char *thisline = line + which * 1024;</div><div class='del'>-		length = strlen(thisline);</div><div class='del'>-		if (thisline[length - 1] == '\n')</div><div class='del'>-			line[--length] = 0;</div><div class='del'>-		if (lastline &amp;&amp; *thisline &amp;&amp; isspace(*thisline)) {</div><div class='del'>-			char *temp;</div><div class='del'>-			while(*thisline &amp;&amp; isspace(*thisline))</div><div class='del'>-				thisline ++;</div><div class='del'>-			temp = lastline;</div><div class='del'>-			lastline = g_strdup_printf("%s%s", lastline, thisline);</div><div class='del'>-			g_free(temp);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (lastline) {</div><div class='del'>-			parse_line (book, lastline);</div><div class='del'>-			g_free(lastline);</div><div class='del'>-		}</div><div class='del'>-		lastline = g_strdup(thisline);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lastline) {</div><div class='del'>-		parse_line (book, lastline);</div><div class='del'>-		g_free(lastline);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static char *</div><div class='del'>-read_file (char *name)</div><div class='del'>-{</div><div class='del'>-	int  len;</div><div class='del'>-	char buff[65536];</div><div class='del'>-	char line[1024];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	f = fopen (name, "r");</div><div class='del'>-	if (f == NULL)</div><div class='del'>-		g_error ("Unable to open %s!\n", name);</div><div class='del'>-</div><div class='del'>-	len  = 0;</div><div class='del'>-	while (fgets (line, sizeof (line), f) != NULL) {</div><div class='del'>-		strcpy (buff + len, line);</div><div class='del'>-		len += strlen (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buff);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c<br/>deleted file mode 100644<br/>index b17dc62174..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-card.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/test-card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +0,0 @@</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include "e-card.h"</div><div class='del'>-</div><div class='del'>-#define TEST_VCARD                   \</div><div class='del'>-"BEGIN:VCARD</div><div class='del'>-"                      \</div><div class='del'>-"FN:Nat</div><div class='del'>-"                           \</div><div class='del'>-"N:Friedman;Nat;D;Mr.</div><div class='del'>-"             \</div><div class='del'>-"ORG:Ximian, Inc.</div><div class='del'>-"             \</div><div class='del'>-"TITLE:Head Geek</div><div class='del'>-"                  \</div><div class='del'>-"ROLE:Programmer/Executive</div><div class='del'>-"        \</div><div class='del'>-"BDAY:1977-08-06</div><div class='del'>-"                  \</div><div class='del'>-"TEL;WORK:617 679 1984</div><div class='del'>-"            \</div><div class='del'>-"TEL;CELL:123 456 7890</div><div class='del'>-"            \</div><div class='del'>-"EMAIL;INTERNET:nat@nat.org</div><div class='del'>-"       \</div><div class='del'>-"EMAIL;INTERNET:nat@ximian.com</div><div class='del'>-" \</div><div class='del'>-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;</div><div class='del'>-" \</div><div class='del'>-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA</div><div class='del'>-" \</div><div class='del'>-"END:VCARD</div><div class='del'>-"                        \</div><div class='del'>-"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-read_file (char *name)</div><div class='del'>-{</div><div class='del'>-	int  len;</div><div class='del'>-	char buff[65536];</div><div class='del'>-	char line[1024];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	f = fopen (name, "r");</div><div class='del'>-	if (f == NULL)</div><div class='del'>-		g_error ("Unable to open %s!\n", name);</div><div class='del'>-</div><div class='del'>-	len  = 0;</div><div class='del'>-	while (fgets (line, sizeof (line), f) != NULL) {</div><div class='del'>-		strcpy (buff + len, line);</div><div class='del'>-		len += strlen (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	char  *cardstr;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	/* Fields */</div><div class='del'>-	char *fname;</div><div class='del'>-	char *org;</div><div class='del'>-	char *org_unit;</div><div class='del'>-        char *title;</div><div class='del'>-	char *role;</div><div class='del'>-	char *nickname;</div><div class='del'>-	char *fburl;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	EList *address;</div><div class='del'>-	EList *phone;</div><div class='del'>-	EList *email;</div><div class='del'>-	EList *arbitrary;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	ECardDate *bday;</div><div class='del'>-</div><div class='del'>-	gnome_init ("TestCard", "0.0", argc, argv);</div><div class='del'>-</div><div class='del'>-	cardstr = NULL;</div><div class='del'>-	if (argc == 2)</div><div class='del'>-		cardstr = read_file (argv [1]);</div><div class='del'>-</div><div class='del'>-	if (cardstr == NULL)</div><div class='del'>-		cardstr = TEST_VCARD;</div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-	  int i;</div><div class='del'>-	  for ( i = 0; i &lt; 100000; i++ ) {</div><div class='del'>-	    card = e_card_new (cardstr);</div><div class='del'>-	  </div><div class='del'>-	    gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-	  }</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	card = e_card_new_with_default_charset (cardstr, "ISO-8859-1");</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "full_name",  &amp;fname,</div><div class='del'>-		       "name",       &amp;name,</div><div class='del'>-		       "address",    &amp;address,</div><div class='del'>-		       "phone",      &amp;phone,</div><div class='del'>-		       "email",      &amp;email,</div><div class='del'>-		       "org",        &amp;org,</div><div class='del'>-		       "org_unit",   &amp;org_unit,</div><div class='del'>-		       "title",      &amp;title,</div><div class='del'>-		       "role",       &amp;role,</div><div class='del'>-		       "nickname",   &amp;nickname,</div><div class='del'>-		       "fburl",      &amp;fburl,</div><div class='del'>-		       "arbitrary",  &amp;arbitrary,</div><div class='del'>-		       "birth_date", &amp;bday,</div><div class='del'>-		       NULL);</div><div class='del'>-	if ( fname ) {</div><div class='del'>-	  printf("Name : %s\n", fname);</div><div class='del'>-	  g_free(fname);</div><div class='del'>-	}</div><div class='del'>-	if ( name ) {</div><div class='del'>-	  printf("Full Name:\n");</div><div class='del'>-	  if ( name-&gt;prefix )</div><div class='del'>-	    printf("  prefix     : %s\n", name-&gt;prefix);</div><div class='del'>-	  if ( name-&gt;given )</div><div class='del'>-	    printf("  given      : %s\n", name-&gt;given);</div><div class='del'>-	  if ( name-&gt;additional )</div><div class='del'>-	    printf("  additional : %s\n", name-&gt;additional);</div><div class='del'>-	  if ( name-&gt;family )</div><div class='del'>-	    printf("  family     : %s\n", name-&gt;family);</div><div class='del'>-	  if ( name-&gt;suffix )</div><div class='del'>-	    printf("  suffix     : %s\n", name-&gt;suffix);</div><div class='del'>-	}</div><div class='del'>-	if ( org ) {</div><div class='del'>-	  printf("Company : %s\n", org);</div><div class='del'>-        }</div><div class='del'>-	if ( org_unit ) {</div><div class='del'>-	  printf("Department : %s\n", org_unit);</div><div class='del'>-        }</div><div class='del'>-	if ( title ) {</div><div class='del'>-	  printf("Title : %s\n", title);</div><div class='del'>-        }</div><div class='del'>-	if ( role ) {</div><div class='del'>-	  printf("Profession : %s\n", role);</div><div class='del'>-        }</div><div class='del'>-	if ( nickname ) {</div><div class='del'>-	  printf("Nickname : %s\n", nickname);</div><div class='del'>-        }</div><div class='del'>-	if ( fburl ) {</div><div class='del'>-	  printf("Free Busy URL : %s\n", fburl);</div><div class='del'>-	}</div><div class='del'>-	if ( arbitrary ) {</div><div class='del'>-	  iterator = e_list_get_iterator(arbitrary);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-            ECardArbitrary *arbitrary = (ECardArbitrary *) e_iterator_get(iterator);</div><div class='del'>-	    printf("Arbitrary : %s, %s\n", arbitrary-&gt;key, arbitrary-&gt;value);</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if ( bday ) {</div><div class='del'>-	  printf("BDay : %4d-%02d-%02d\n", bday-&gt;year, bday-&gt;month, bday-&gt;day);</div><div class='del'>-	}</div><div class='del'>-	if ( email ) {</div><div class='del'>-	  iterator = e_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if ( phone ) {</div><div class='del'>-	  iterator = e_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);</div><div class='del'>-	    printf("Phone ; %d : %s\n", e_card_phone-&gt;flags, e_card_phone-&gt;number);</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if ( address ) {</div><div class='del'>-	  iterator = e_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);</div><div class='del'>-	    printf("Address ; %d:\n", del_address-&gt;flags);</div><div class='del'>-	    if ( del_address-&gt;po )</div><div class='del'>-	      printf("  Po      : %s\n", del_address-&gt;po);</div><div class='del'>-	    if ( del_address-&gt;ext )</div><div class='del'>-	      printf("  Ext     : %s\n", del_address-&gt;ext);</div><div class='del'>-	    if ( del_address-&gt;street )</div><div class='del'>-	      printf("  Street  : %s\n", del_address-&gt;street);</div><div class='del'>-	    if ( del_address-&gt;city )</div><div class='del'>-	      printf("  City    : %s\n", del_address-&gt;city);</div><div class='del'>-	    if ( del_address-&gt;region )</div><div class='del'>-	      printf("  Region  : %s\n", del_address-&gt;region);</div><div class='del'>-	    if ( del_address-&gt;code )</div><div class='del'>-	      printf("  Code    : %s\n", del_address-&gt;code);</div><div class='del'>-	    if ( del_address-&gt;country )</div><div class='del'>-	      printf("  Country : %s\n", del_address-&gt;country);</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	printf("%s", e_card_get_vcard_assume_utf8(card));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c<br/>deleted file mode 100644<br/>index 8a38ccf4e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client-list.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/test-client-list.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init ("blah", "0.0", argc, argv);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	long length = e_card_cursor_get_length(cursor);</div><div class='del'>-	long i;</div><div class='del'>-	</div><div class='del'>-	printf ("Length: %d\n", (int) length);</div><div class='del'>-	for ( i = 0; i &lt; length; i++ ) {</div><div class='del'>-		ECard *card = e_card_cursor_get_nth(cursor, i);</div><div class='del'>-		char *vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-		printf("[%s]\n", vcard);</div><div class='del'>-		g_free(vcard);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	printf ("Book opened.\n");</div><div class='del'>-	e_book_get_cursor(book, "", get_cursor_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c<br/>deleted file mode 100644<br/>index 04f2c5b0e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/ebook/test-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,204 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-#include "e-book-util.h"</div><div class='del'>-</div><div class='del'>-#define TEST_VCARD                   \</div><div class='del'>-"BEGIN:VCARD</div><div class='del'>-"                      \</div><div class='del'>-"FN:Nat</div><div class='del'>-"                           \</div><div class='del'>-"N:Friedman;Nat;D;Mr.</div><div class='del'>-"             \</div><div class='del'>-"BDAY:1977-08-06</div><div class='del'>-"                  \</div><div class='del'>-"TEL;WORK:617 679 1984</div><div class='del'>-"            \</div><div class='del'>-"TEL;CELL:123 456 7890</div><div class='del'>-"            \</div><div class='del'>-"EMAIL;INTERNET:nat@nat.org</div><div class='del'>-"       \</div><div class='del'>-"EMAIL;INTERNET:nat@ximian.com</div><div class='del'>-" \</div><div class='del'>-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;</div><div class='del'>-" \</div><div class='del'>-"END:VCARD</div><div class='del'>-"                        \</div><div class='del'>-"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-static CORBA_Environment ev;</div><div class='del'>-static char *cardstr;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	long length = e_card_cursor_get_length(cursor);</div><div class='del'>-	long i;</div><div class='del'>-</div><div class='del'>-	/* we just added a card, so the length should be &gt;1 */</div><div class='del'>-	printf ("\n%s: %s(): Number of cards is %ld\n",</div><div class='del'>-		__FILE__, __FUNCTION__, length);</div><div class='del'>-	if (length &lt; 1)</div><div class='del'>-		printf ("*** Why isn't this above zero?? ***\n\n");</div><div class='del'>-	</div><div class='del'>-	for ( i = 0; i &lt; length; i++ ) {</div><div class='del'>-		ECard *card = e_card_cursor_get_nth(cursor, i);</div><div class='del'>-		char *vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-		printf("Get all cards callback: [%s]\n", vcard);</div><div class='del'>-		g_free(vcard);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	char *vcard;</div><div class='del'>-</div><div class='del'>-	vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-	printf ("Card added: [%s]\n", vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-	printf ("Getting cards..\n");</div><div class='del'>-	e_book_get_cursor(book, "", get_cursor_cb, NULL);</div><div class='del'>-	printf ("Done getting all cards.\n");	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	GTimer *timer;</div><div class='del'>-</div><div class='del'>-	printf ("Status: %d\n", status);</div><div class='del'>-</div><div class='del'>-	printf ("Id: %s\n", id);</div><div class='del'>-</div><div class='del'>-	timer = g_timer_new ();</div><div class='del'>-	g_timer_start (timer);</div><div class='del'>-	e_book_get_card (book, id, get_card_cb, closure);</div><div class='del'>-	g_timer_stop (timer);</div><div class='del'>-	printf ("%g\n", g_timer_elapsed (timer, NULL));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_fields_cb (EBook *book, EBookStatus status, EList *fields, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	if (fields) {</div><div class='del'>-		EIterator *iter = e_list_get_iterator (fields);</div><div class='del'>-</div><div class='del'>-		printf ("Supported fields:\n");</div><div class='del'>-</div><div class='del'>-		for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {</div><div class='del'>-			printf (" %s\n", (char*)e_iterator_get (iter));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(fields));</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		printf ("No supported fields?\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_add_vcard(book, cardstr, add_card_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-auth_user_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	printf ("user authenticated\n");</div><div class='del'>-	e_book_get_supported_fields (book, get_fields_cb, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	e_book_authenticate_user (book, "username", "password", "auth_method", auth_user_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_default_book (book, book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-read_file (char *name)</div><div class='del'>-{</div><div class='del'>-	int  len;</div><div class='del'>-	char buff[65536];</div><div class='del'>-	char line[1024];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	f = fopen (name, "r");</div><div class='del'>-	if (f == NULL)</div><div class='del'>-		g_error ("Unable to open %s!\n", name);</div><div class='del'>-</div><div class='del'>-	len  = 0;</div><div class='del'>-	while (fgets (line, sizeof (line), f) != NULL) {</div><div class='del'>-		strcpy (buff + len, line);</div><div class='del'>-		len += strlen (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	cardstr = NULL;</div><div class='del'>-	if (argc == 2)</div><div class='del'>-		cardstr = read_file (argv [1]);</div><div class='del'>-</div><div class='del'>-	if (cardstr == NULL)</div><div class='del'>-		cardstr = TEST_VCARD;</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/idl/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/backend/idl/Makefile.am b/addressbook/backend/idl/Makefile.am<br/>deleted file mode 100644<br/>index db61d2c30c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/idl/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-idldir = $(datadir)/idl</div><div class='del'>-</div><div class='del'>-idl_DATA =			\</div><div class='del'>-	addressbook.idl</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(idl_DATA)</div><div class='head'>diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl<br/>deleted file mode 100644<br/>index f708026424..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/addressbook.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/idl/addressbook.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,163 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-module Addressbook {</div><div class='del'>-	typedef string CardId;</div><div class='del'>-	typedef string VCard;</div><div class='del'>-	typedef sequence&lt;VCard&gt; VCardList;</div><div class='del'>-	typedef sequence&lt;string&gt; stringlist;</div><div class='del'>-</div><div class='del'>-	interface CardCursor : Bonobo::Unknown {</div><div class='del'>-		long   count  ();</div><div class='del'>-		string getNth (in long n);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* </div><div class='del'>-	 * A book view is a live view of a book.  It's either a view</div><div class='del'>-	 * of all the cards in the book or a view of a query.  When</div><div class='del'>-	 * created, it will get a series of signal_card_added calls</div><div class='del'>-	 * for all objects in the initial set.  After that, it will</div><div class='del'>-	 * get added, removed, or changed signals whenever the book</div><div class='del'>-	 * changes (if it affects the set of viewed cards.)</div><div class='del'>-	 */</div><div class='del'>-	interface BookViewListener : Bonobo::Unknown {</div><div class='del'>-		void notifyCardAdded        (in VCardList cards);</div><div class='del'>-		void notifyCardRemoved      (in CardId id);</div><div class='del'>-		void notifyCardChanged      (in VCardList cards);</div><div class='del'>-		void notifySequenceComplete ();</div><div class='del'>-		void notifyStatusMessage    (in string message);</div><div class='del'>-	};</div><div class='del'>-	</div><div class='del'>-	interface BookView : Bonobo::Unknown {</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	interface Book : Bonobo::Unknown {</div><div class='del'>-		/*</div><div class='del'>-		 * Fetching cards in the addresbook.</div><div class='del'>-		 */</div><div class='del'>-		void getVCard (in CardId id);</div><div class='del'>-</div><div class='del'>-		void authenticateUser (in string user, in string passwd,</div><div class='del'>-				       in string authMethod);</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Adding and deleting cards in the book.</div><div class='del'>-		 */</div><div class='del'>-		void addCard    (in VCard vcard);</div><div class='del'>-		void removeCard (in CardId Id);</div><div class='del'>-	        </div><div class='del'>-		/*</div><div class='del'>-		 * Modifying cards in the addressbook.</div><div class='del'>-		 */</div><div class='del'>-		void modifyCard (in VCard vcard);</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 * This function returns a cursor to the book</div><div class='del'>-		 * listener.  This is for people who want a snapshot</div><div class='del'>-		 * of the addressbook.</div><div class='del'>-		 */</div><div class='del'>-		void getCursor (in string query);</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 * These two functions return a book view to the book</div><div class='del'>-		 * listener.  This is for people who want a live view</div><div class='del'>-		 * of the addressbook.</div><div class='del'>-		 */</div><div class='del'>-		void getBookView (in BookViewListener listener, in string query);</div><div class='del'>-</div><div class='del'>-		void getChanges  (in BookViewListener listener, in string change_id);</div><div class='del'>-</div><div class='del'>-		void checkConnection ();</div><div class='del'>-</div><div class='del'>-		void getSupportedFields ();</div><div class='del'>-</div><div class='del'>-		string getStaticCapabilities ();</div><div class='del'>-</div><div class='del'>-		string getName ();</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	interface BookListener : Bonobo::Unknown {</div><div class='del'>-</div><div class='del'>-		enum CallStatus {</div><div class='del'>-			Success,</div><div class='del'>-			RepositoryOffline,</div><div class='del'>-			PermissionDenied,</div><div class='del'>-			CardNotFound,</div><div class='del'>-			CardIdAlreadyExists,</div><div class='del'>-			ProtocolNotSupported,</div><div class='del'>-			AuthenticationFailed,</div><div class='del'>-			AuthenticationRequired,</div><div class='del'>-			UnsupportedField,</div><div class='del'>-</div><div class='del'>-			TLSNotAvailable,</div><div class='del'>-</div><div class='del'>-			OtherError</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		void notifyCardCreated  (in CallStatus status, in CardId Id);</div><div class='del'>-</div><div class='del'>-		void notifyCardRemoved  (in CallStatus status);</div><div class='del'>-</div><div class='del'>-		void notifyCardModified (in CallStatus status);</div><div class='del'>-		</div><div class='del'>-		void notifyOpenBookProgress (in string status_message, in short percent);</div><div class='del'>-</div><div class='del'>-		void notifyBookOpened       (in CallStatus status, in Book book);</div><div class='del'>-</div><div class='del'>-		void notifyCardRequested    (in CallStatus status, in VCard card);</div><div class='del'>-</div><div class='del'>-		void notifyCursorRequested  (in CallStatus status, in CardCursor cursor);</div><div class='del'>-</div><div class='del'>-		void notifyViewRequested    (in CallStatus status, in BookView view);</div><div class='del'>-</div><div class='del'>-		void notifyChangesRequested (in CallStatus status, in BookView view);</div><div class='del'>-</div><div class='del'>-		void notifyAuthenticationResult (in CallStatus status);</div><div class='del'>-</div><div class='del'>-		void notifySupportedFields (in CallStatus status, in stringlist fields);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * notifyConnectionStatus:</div><div class='del'>-		 *</div><div class='del'>-		 * Used to report changes in the connection to the</div><div class='del'>-		 * contact repository.  This is often a response to a</div><div class='del'>-		 * call to check_connection() on the Book, but wombat</div><div class='del'>-		 * is free to report the connection status without</div><div class='del'>-		 * being asked.</div><div class='del'>-		 */</div><div class='del'>-		void notifyConnectionStatus (in boolean connected);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * notifyWritable:</div><div class='del'>-		 *</div><div class='del'>-		 * Used to report whether or not a backend can write</div><div class='del'>-		 * to a given addressbook.  All books default to</div><div class='del'>-		 * read-only, so unless you receive a notification</div><div class='del'>-		 * saying otherwise, treat the book as read-only.  It</div><div class='del'>-		 * is presumed that this notification will be sent</div><div class='del'>-		 * early (just after a connection is opened, usually),</div><div class='del'>-		 * but it may also be sent later, if/when the backend</div><div class='del'>-		 * notices a change.</div><div class='del'>-		 */</div><div class='del'>-		void notifyWritable (in boolean writable);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	interface BookFactory : Bonobo::Unknown {</div><div class='del'>-		exception ProtocolNotSupported {};</div><div class='del'>-</div><div class='del'>-		void openBook (in string uri, in BookListener listener)</div><div class='del'>-			raises (ProtocolNotSupported);</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/addressbook/backend/pas/.cvsignore b/addressbook/backend/pas/.cvsignore<br/>deleted file mode 100644<br/>index 071cef99ae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-addressbook-stubs.c</div><div class='del'>-addressbook-skels.c</div><div class='del'>-addressbook-common.c</div><div class='del'>-addressbook.h</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am<br/>deleted file mode 100644<br/>index 3f9a2627cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-CORBA_SOURCE =						\</div><div class='del'>-	addressbook.h					\</div><div class='del'>-	addressbook-common.c				\</div><div class='del'>-	addressbook-stubs.c				\</div><div class='del'>-	addressbook-skels.c</div><div class='del'>-</div><div class='del'>-idls =							\</div><div class='del'>-	$(srcdir)/../idl/addressbook.idl</div><div class='del'>-</div><div class='del'>-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl</div><div class='del'>-</div><div class='del'>-$(CORBA_SOURCE): $(idls)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	$(DB3_CFLAGS)					\</div><div class='del'>-	$(LDAP_CFLAGS)					\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"wombat-pas\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-        $(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-LDAP_SCHEMA =						\</div><div class='del'>-	evolutionperson.schema</div><div class='del'>-</div><div class='del'>-LDAP_BACKEND_FILES = pas-backend-ldap.c pas-backend-ldap.h</div><div class='del'>-</div><div class='del'>-if ENABLE_LDAP</div><div class='del'>-LDAP_BACKEND = $(LDAP_BACKEND_FILES)</div><div class='del'>-else</div><div class='del'>-LDAP_BACKEND = </div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libpas.a</div><div class='del'>-</div><div class='del'>-libpas_a_SOURCES =					\</div><div class='del'>-	$(CORBA_SOURCE)					\</div><div class='del'>-	pas-book-factory.c				\</div><div class='del'>-	pas-book-factory.h				\</div><div class='del'>-	pas-book-view.c					\</div><div class='del'>-	pas-book-view.h					\</div><div class='del'>-	pas-book.c					\</div><div class='del'>-	pas-book.h					\</div><div class='del'>-	pas-backend-card-sexp.c				\</div><div class='del'>-	pas-backend-card-sexp.h				\</div><div class='del'>-	pas-backend-file.c				\</div><div class='del'>-	pas-backend-file.h				\</div><div class='del'>-	$(LDAP_BACKEND)					\</div><div class='del'>-	pas-backend.c					\</div><div class='del'>-	pas-backend.h					\</div><div class='del'>-	pas-card-cursor.c				\</div><div class='del'>-	pas-card-cursor.h</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_SOURCE)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(LDAP_BACKEND_FILES) $(LDAP_SCHEMA)</div><div class='head'>diff --git a/addressbook/backend/pas/TODO b/addressbook/backend/pas/TODO<br/>deleted file mode 100644<br/>index 0c77c1b200..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/TODO?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-* Implement pas_book_factory_activate</div><div class='del'>-* Authentication
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema<br/>deleted file mode 100644<br/>index f0f3a394df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/evolutionperson.schema?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/evolutionperson.schema</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# Depends upon</div><div class='del'>-#   Definition of an X.500 Attribute Type and an Object Class to Hold</div><div class='del'>-#   Uniform Resource Identifiers (URIs) [RFC2079]</div><div class='del'>-#	(core.schema)</div><div class='del'>-#   </div><div class='del'>-#   A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256]</div><div class='del'>-#	(core.schema)</div><div class='del'>-#</div><div class='del'>-#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)</div><div class='del'>-#</div><div class='del'>-#   The Internet Organizational Person Schema (inetorgperson)</div><div class='del'>-#</div><div class='del'>-# OIDs are broken up into the following:</div><div class='del'>-#   1.3.6.1.4.1.8506.1.?</div><div class='del'>-#                     .1  Syntaxes</div><div class='del'>-#                     .2  Attributes</div><div class='del'>-#                     .3  Objectclasses</div><div class='del'>-   </div><div class='del'>-# primaryPhone</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.1</div><div class='del'>-	NAME 'primaryPhone'</div><div class='del'>-	DESC 'preferred phone number used to contact a person'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-# carPhone</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.2</div><div class='del'>-	NAME 'carPhone'</div><div class='del'>-	DESC 'car phone telephone number of the person'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.3</div><div class='del'>-	NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' )</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.4</div><div class='del'>-	NAME 'otherPhone'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.5</div><div class='del'>-	NAME 'businessRole'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.6</div><div class='del'>-	NAME 'managerName'</div><div class='del'>-	SUP name )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.7</div><div class='del'>-	NAME 'assistantName'</div><div class='del'>-	SUP name )</div><div class='del'>-</div><div class='del'>-# spouseName</div><div class='del'>-# single valued (/me smirks)</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.8</div><div class='del'>-	NAME 'spouseName'</div><div class='del'>-	SUP name</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.9</div><div class='del'>-	NAME 'otherPostalAddress'</div><div class='del'>-	EQUALITY caseIgnoreListMatch</div><div class='del'>-	SUBSTR caseIgnoreListSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.10</div><div class='del'>-	NAME ( 'mailer' 'mua' )</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.11</div><div class='del'>-	NAME ( 'birthDate' 'dob' )</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.12</div><div class='del'>-	NAME 'anniversary'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.13</div><div class='del'>-	NAME 'note'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.14</div><div class='del'>-	NAME 'evolutionArbitrary'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )</div><div class='del'>-	)</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.15</div><div class='del'>-	NAME 'fileAs'</div><div class='del'>-	SUP name )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.16</div><div class='del'>-	NAME 'assistantPhone'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.17</div><div class='del'>-	NAME 'companyPhone'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.18</div><div class='del'>-	NAME 'callbackPhone'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.19</div><div class='del'>-	NAME ( 'otherFacsimileTelephoneNumber' 'otherFax' )</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.20</div><div class='del'>-	NAME 'radio'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.21</div><div class='del'>-	NAME 'telex'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.22</div><div class='del'>-	NAME 'tty'</div><div class='del'>-	EQUALITY telephoneNumberMatch</div><div class='del'>-	SUBSTR telephoneNumberSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.23</div><div class='del'>-	NAME 'categories'</div><div class='del'>-	EQUALITY caseIgnoreMatch</div><div class='del'>-	SUBSTR caseIgnoreSubstringsMatch</div><div class='del'>-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.24</div><div class='del'>-	NAME 'contact'</div><div class='del'>-        EQUALITY distinguishedNameMatch</div><div class='del'>-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.25</div><div class='del'>-	NAME 'listName'</div><div class='del'>-	SUP name</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.26</div><div class='del'>-	NAME 'calendarURI'</div><div class='del'>-        EQUALITY caseExactIA5Match</div><div class='del'>-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-attributetype ( 1.3.6.1.4.1.8506.1.2.27</div><div class='del'>-	NAME 'freeBusyURI'</div><div class='del'>-        EQUALITY caseExactIA5Match</div><div class='del'>-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26</div><div class='del'>-	SINGLE-VALUE )</div><div class='del'>-</div><div class='del'>-# evolutionPerson</div><div class='del'>-objectclass	( 1.3.6.1.4.1.8506.1.3.1</div><div class='del'>-    NAME 'evolutionPerson'</div><div class='del'>-	DESC 'Objectclass geared to Evolution Usage'</div><div class='del'>-    SUP inetOrgPerson</div><div class='del'>-    STRUCTURAL</div><div class='del'>-	MAY (</div><div class='del'>-	        fileAs $ primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ </div><div class='del'>-		otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $</div><div class='del'>-		otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $</div><div class='del'>-		note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $</div><div class='del'>-		radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI )</div><div class='del'>-	)</div><div class='del'>-</div><div class='del'>-# evolutionPersonList</div><div class='del'>-objectclass	( 1.3.6.1.4.1.8506.1.3.2</div><div class='del'>-    NAME 'evolutionPersonList'</div><div class='del'>-	DESC 'Objectclass geared to Evolution Contact Lists'</div><div class='del'>-    SUP top</div><div class='del'>-    STRUCTURAL</div><div class='del'>-	MUST (</div><div class='del'>-		listName )</div><div class='del'>-	MAY (</div><div class='del'>-		mail $ contact )</div><div class='del'>-	)</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-card-sexp.c b/addressbook/backend/pas/pas-backend-card-sexp.c<br/>deleted file mode 100644<br/>index ea217fa052..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-card-sexp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-card-sexp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,467 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * pas-backend-card-sexp.c</div><div class='del'>- * Copyright 1999, 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "pas-backend-card-sexp.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-typedef struct _SearchContext SearchContext;</div><div class='del'>-</div><div class='del'>-struct _PASBackendCardSExpPrivate {</div><div class='del'>-	ESExp *search_sexp;</div><div class='del'>-	SearchContext *search_context;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _SearchContext {</div><div class='del'>-	ECardSimple *card;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_email (ECardSimple *card, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-		const char *email = e_card_simple_get_email (card, i);</div><div class='del'>-</div><div class='del'>-		if (email &amp;&amp; compare(email, str))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_phone (ECardSimple *card, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-		const ECardPhone *phone = e_card_simple_get_phone (card, i);</div><div class='del'>-</div><div class='del'>-		if (phone &amp;&amp; compare(phone-&gt;number, str))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_name (ECardSimple *card, const char *str,</div><div class='del'>-	      char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	name = e_card_simple_get_const (card, E_CARD_SIMPLE_FIELD_FULL_NAME);</div><div class='del'>-	if (name &amp;&amp; compare (name, str))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	name = e_card_simple_get_const (card, E_CARD_SIMPLE_FIELD_FAMILY_NAME);</div><div class='del'>-	if (name &amp;&amp; compare (name, str))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_address (ECardSimple *card, const char *str,</div><div class='del'>-		 char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	g_warning("address searching not implemented\n");</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_category (ECardSimple *card, const char *str,</div><div class='del'>-		  char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	EList *categories;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	gboolean ret_val = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card),</div><div class='del'>-			"card", &amp;ecard,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard),</div><div class='del'>-			"category_list", &amp;categories,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	for (iterator = e_list_get_iterator(categories); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {</div><div class='del'>-		const char *category = e_iterator_get (iterator);</div><div class='del'>-</div><div class='del'>-		if (compare(category, str)) {</div><div class='del'>-			ret_val = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-	e_card_free_empty_lists (ecard);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_arbitrary (ECardSimple *card, const char *str,</div><div class='del'>-		   char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	EList *list;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	gboolean ret_val = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card),</div><div class='del'>-			"card", &amp;ecard,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard),</div><div class='del'>-			"arbitrary", &amp;list,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	for (iterator = e_list_get_iterator(list); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {</div><div class='del'>-		const ECardArbitrary *arbitrary = e_iterator_get (iterator);</div><div class='del'>-</div><div class='del'>-		if (compare(arbitrary-&gt;key, str)) {</div><div class='del'>-			ret_val = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-	e_card_free_empty_lists (ecard);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct prop_info {</div><div class='del'>-	ECardSimpleField field_id;</div><div class='del'>-	const char *query_prop;</div><div class='del'>-	const char *ecard_prop;</div><div class='del'>-#define PROP_TYPE_NORMAL   0x01</div><div class='del'>-#define PROP_TYPE_LIST     0x02</div><div class='del'>-#define PROP_TYPE_LISTITEM 0x03</div><div class='del'>-#define PROP_TYPE_ID 0x04</div><div class='del'>-	int prop_type;</div><div class='del'>-	gboolean (*list_compare)(ECardSimple *ecard, const char *str,</div><div class='del'>-				 char *(*compare)(const char*, const char*));</div><div class='del'>-</div><div class='del'>-} prop_info_table[] = {</div><div class='del'>-#define NORMAL_PROP(f,q,e) {f, q, e, PROP_TYPE_NORMAL, NULL}</div><div class='del'>-#define ID_PROP {0, "id", NULL, PROP_TYPE_ID, NULL}</div><div class='del'>-#define LIST_PROP(q,e,c) {0, q, e, PROP_TYPE_LIST, c}</div><div class='del'>-</div><div class='del'>-	/* query prop,  ecard prop,   type,              list compare function */</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "file_as" ),</div><div class='del'>-	LIST_PROP ( "full_name", "full_name", compare_name), /* not really a list, but we need to compare both full and surname */</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),</div><div class='del'>-	ID_PROP,</div><div class='del'>-	LIST_PROP ( "email", "email", compare_email ),</div><div class='del'>-	LIST_PROP ( "phone", "phone", compare_phone ),</div><div class='del'>-	LIST_PROP ( "address", "address", compare_address ),</div><div class='del'>-	LIST_PROP ( "category", "category", compare_category ),</div><div class='del'>-	LIST_PROP ( "arbitrary", "arbitrary", compare_arbitrary )</div><div class='del'>-};</div><div class='del'>-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-entry_compare(SearchContext *ctx, struct _ESExp *f,</div><div class='del'>-	      int argc, struct _ESExpResult **argv,</div><div class='del'>-	      char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-</div><div class='del'>-	if (argc == 2</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; argv[1]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *propname;</div><div class='del'>-		struct prop_info *info = NULL;</div><div class='del'>-		int i;</div><div class='del'>-		gboolean any_field;</div><div class='del'>-</div><div class='del'>-		propname = argv[0]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-		any_field = !strcmp(propname, "x-evolution-any-field");</div><div class='del'>-		for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-			if (any_field</div><div class='del'>-			    || !strcmp (prop_info_table[i].query_prop, propname)) {</div><div class='del'>-				info = &amp;prop_info_table[i];</div><div class='del'>-				</div><div class='del'>-				if (info-&gt;prop_type == PROP_TYPE_NORMAL) {</div><div class='del'>-					char *prop = NULL;</div><div class='del'>-					/* searches where the query's property</div><div class='del'>-					   maps directly to an ecard property */</div><div class='del'>-					</div><div class='del'>-					prop = e_card_simple_get (ctx-&gt;card, info-&gt;field_id);</div><div class='del'>-</div><div class='del'>-					if (prop &amp;&amp; compare(prop, argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-					if ((!prop) &amp;&amp; compare("", argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-					g_free (prop);</div><div class='del'>-				} else if (info-&gt;prop_type == PROP_TYPE_LIST) {</div><div class='del'>-				/* the special searches that match any of the list elements */</div><div class='del'>-					truth = info-&gt;list_compare (ctx-&gt;card, argv[1]-&gt;value.string, compare);</div><div class='del'>-				} else if (info-&gt;prop_type == PROP_TYPE_ID) {</div><div class='del'>-					const char *prop = NULL;</div><div class='del'>-					/* searches where the query's property</div><div class='del'>-					   maps directly to an ecard property */</div><div class='del'>-					</div><div class='del'>-					prop = e_card_get_id (ctx-&gt;card-&gt;card);</div><div class='del'>-</div><div class='del'>-					if (prop &amp;&amp; compare(prop, argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-					if ((!prop) &amp;&amp; compare("", argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* if we're looking at all fields and find a match,</div><div class='del'>-				   or if we're just looking at this one field,</div><div class='del'>-				   break. */</div><div class='del'>-				if ((any_field &amp;&amp; truth)</div><div class='del'>-				    || !any_field)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = truth;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	SearchContext *ctx = data;</div><div class='del'>-</div><div class='del'>-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-is_helper (const char *s1, const char *s2)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(s1, s2))</div><div class='del'>-		return (char*)s1;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	SearchContext *ctx = data;</div><div class='del'>-</div><div class='del'>-	return entry_compare (ctx, f, argc, argv, is_helper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-endswith_helper (const char *s1, const char *s2)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	if ((p = (char*)e_utf8_strstrcase(s1, s2))</div><div class='del'>-	    &amp;&amp; (strlen(p) == strlen(s2)))</div><div class='del'>-		return p;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	SearchContext *ctx = data;</div><div class='del'>-</div><div class='del'>-	return entry_compare (ctx, f, argc, argv, endswith_helper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-beginswith_helper (const char *s1, const char *s2)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	if ((p = (char*)e_utf8_strstrcase(s1, s2))</div><div class='del'>-	    &amp;&amp; (p == s1))</div><div class='del'>-		return p;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	SearchContext *ctx = data;</div><div class='del'>-</div><div class='del'>-	return entry_compare (ctx, f, argc, argv, beginswith_helper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'builtin' functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "contains", func_contains, 0 },</div><div class='del'>-	{ "is", func_is, 0 },</div><div class='del'>-	{ "beginswith", func_beginswith, 0 },</div><div class='del'>-	{ "endswith", func_endswith, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	card = e_card_new ((char*)vcard);</div><div class='del'>-	sexp-&gt;priv-&gt;search_context-&gt;card = e_card_simple_new (card);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-	/* if it's not a valid vcard why is it in our db? :) */</div><div class='del'>-	if (!sexp-&gt;priv-&gt;search_context-&gt;card)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_eval(sexp-&gt;priv-&gt;search_sexp);</div><div class='del'>-</div><div class='del'>-	retval = (r &amp;&amp; r-&gt;type == ESEXP_RES_BOOL &amp;&amp; r-&gt;value.bool);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(sexp-&gt;priv-&gt;search_context-&gt;card));</div><div class='del'>-</div><div class='del'>-	e_sexp_result_free(sexp-&gt;priv-&gt;search_sexp, r);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_card_sexp_new:</div><div class='del'>- */</div><div class='del'>-PASBackendCardSExp *</div><div class='del'>-pas_backend_card_sexp_new (const char *text)</div><div class='del'>-{</div><div class='del'>-	PASBackendCardSExp *sexp = gtk_type_new (pas_backend_card_sexp_get_type ());</div><div class='del'>-	int esexp_error;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	sexp-&gt;priv-&gt;search_sexp = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction(sexp-&gt;priv-&gt;search_sexp, 0, symbols[i].name,</div><div class='del'>-					     (ESExpIFunc *)symbols[i].func, sexp-&gt;priv-&gt;search_context);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function(sexp-&gt;priv-&gt;search_sexp, 0, symbols[i].name,</div><div class='del'>-					    symbols[i].func, sexp-&gt;priv-&gt;search_context);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_sexp_input_text(sexp-&gt;priv-&gt;search_sexp, text, strlen(text));</div><div class='del'>-	esexp_error = e_sexp_parse(sexp-&gt;priv-&gt;search_sexp);</div><div class='del'>-</div><div class='del'>-	if (esexp_error == -1) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (sexp));</div><div class='del'>-		sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_card_sexp_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBackendCardSExp *sexp = PAS_BACKEND_CARD_SEXP (object);</div><div class='del'>-	e_sexp_unref(sexp-&gt;priv-&gt;search_sexp);</div><div class='del'>-</div><div class='del'>-	g_free (sexp-&gt;priv-&gt;search_context);</div><div class='del'>-	g_free (sexp-&gt;priv);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_card_sexp_class_init (PASBackendCardSExpClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* Set the virtual methods. */</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_backend_card_sexp_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_card_sexp_init (PASBackendCardSExp *sexp)</div><div class='del'>-{</div><div class='del'>-	PASBackendCardSExpPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv             = g_new0 (PASBackendCardSExpPrivate, 1);</div><div class='del'>-</div><div class='del'>-	sexp-&gt;priv = priv;</div><div class='del'>-	priv-&gt;search_context = g_new (SearchContext, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_card_sexp_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_backend_card_sexp_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBackendCardSExp",</div><div class='del'>-			sizeof (PASBackendCardSExp),</div><div class='del'>-			sizeof (PASBackendCardSExpClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_backend_card_sexp_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_backend_card_sexp_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-card-sexp.h b/addressbook/backend/pas/pas-backend-card-sexp.h<br/>deleted file mode 100644<br/>index ee51a75dab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-card-sexp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-card-sexp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * pas-backend-card-sexp.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BACKEND_CARD_SEXP_H__</div><div class='del'>-#define __PAS_BACKEND_CARD_SEXP_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _PASBackendCardSExpPrivate PASBackendCardSExpPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject parent_object;</div><div class='del'>-	PASBackendCardSExpPrivate *priv;</div><div class='del'>-} PASBackendCardSExp;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-} PASBackendCardSExpClass;</div><div class='del'>-</div><div class='del'>-PASBackendCardSExp *pas_backend_card_sexp_new      (const char *text);</div><div class='del'>-GtkType             pas_backend_card_sexp_get_type (void);</div><div class='del'>-</div><div class='del'>-gboolean            pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard);</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_CARD_SEXP_TYPE        (pas_backend_card_sexp_get_type ())</div><div class='del'>-#define PAS_BACKEND_CARD_SEXP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_CARD_SEXP_TYPE, PASBackendCardSExp))</div><div class='del'>-#define PAS_BACKEND_CARD_SEXP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendCardSExpClass))</div><div class='del'>-#define PAS_IS_BACKEND_CARD_SEXP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_CARD_SEXP_TYPE))</div><div class='del'>-#define PAS_IS_BACKEND_CARD_SEXP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_CARD_SEXP_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* __PAS_BACKEND_CARD_SEXP_H__ */</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c<br/>deleted file mode 100644<br/>index 2848fcda71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-file.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1515 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"  </div><div class='del'>-#include "pas-backend-file.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;db.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-db3-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#if DB_VERSION_MAJOR != 3 || \</div><div class='del'>-    DB_VERSION_MINOR != 1 || \</div><div class='del'>-    DB_VERSION_PATCH != 17</div><div class='del'>-#error Including wrong DB3.  Need libdb 3.1.17.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-#include &lt;e-util/e-dbhash.h&gt;</div><div class='del'>-#include &lt;e-util/e-db3-utils.h&gt;</div><div class='del'>-#include "pas-book.h"</div><div class='del'>-#include "pas-card-cursor.h"</div><div class='del'>-#include "pas-backend-card-sexp.h"</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"</div><div class='del'>-#define PAS_BACKEND_FILE_VERSION "0.2"</div><div class='del'>-</div><div class='del'>-#define PAS_ID_PREFIX "pas-id-"</div><div class='del'>-</div><div class='del'>-static PASBackendClass *pas_backend_file_parent_class;</div><div class='del'>-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;</div><div class='del'>-typedef struct _PASBackendFileBookView PASBackendFileBookView;</div><div class='del'>-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;</div><div class='del'>-typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext;</div><div class='del'>-</div><div class='del'>-struct _PASBackendFilePrivate {</div><div class='del'>-	GList    *clients;</div><div class='del'>-	gboolean  loaded;</div><div class='del'>-	char     *uri;</div><div class='del'>-	char     *filename;</div><div class='del'>-	DB       *file_db;</div><div class='del'>-	EList    *book_views;</div><div class='del'>-	gboolean  writable;</div><div class='del'>-	GHashTable *address_lists;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBackendFileCursorPrivate {</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-	PASBook    *book;</div><div class='del'>-</div><div class='del'>-	GList      *elements;</div><div class='del'>-	guint32    num_elements;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBackendFileBookView {</div><div class='del'>-	PASBookView                 *book_view;</div><div class='del'>-	gchar                       *search;</div><div class='del'>-	PASBackendCardSExp          *card_sexp;</div><div class='del'>-	gchar                       *change_id;</div><div class='del'>-	PASBackendFileChangeContext *change_context;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PasBackendFileChangeContext {</div><div class='del'>-	DB *db;</div><div class='del'>-</div><div class='del'>-	GList *add_cards;</div><div class='del'>-	GList *add_ids;</div><div class='del'>-	GList *mod_cards;</div><div class='del'>-	GList *mod_ids;</div><div class='del'>-	GList *del_ids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static PASBackendFileBookView *</div><div class='del'>-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileBookView *new_book_view;</div><div class='del'>-	new_book_view = g_new (PASBackendFileBookView, 1);</div><div class='del'>-	new_book_view-&gt;book_view = book_view-&gt;book_view;</div><div class='del'>-</div><div class='del'>-	new_book_view-&gt;search = g_strdup(book_view-&gt;search);</div><div class='del'>-	new_book_view-&gt;card_sexp = book_view-&gt;card_sexp;</div><div class='del'>-	if (new_book_view-&gt;card_sexp)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(new_book_view-&gt;card_sexp));</div><div class='del'>-	</div><div class='del'>-	new_book_view-&gt;change_id = g_strdup(book_view-&gt;change_id);</div><div class='del'>-	if (book_view-&gt;change_context) {</div><div class='del'>-		new_book_view-&gt;change_context = g_new(PASBackendFileChangeContext, 1);</div><div class='del'>-		new_book_view-&gt;change_context-&gt;db = book_view-&gt;change_context-&gt;db;</div><div class='del'>-		new_book_view-&gt;change_context-&gt;add_cards = book_view-&gt;change_context-&gt;add_cards;</div><div class='del'>-		new_book_view-&gt;change_context-&gt;add_ids = book_view-&gt;change_context-&gt;add_ids;</div><div class='del'>-		new_book_view-&gt;change_context-&gt;mod_cards = book_view-&gt;change_context-&gt;mod_cards;</div><div class='del'>-		new_book_view-&gt;change_context-&gt;mod_ids = book_view-&gt;change_context-&gt;mod_ids;</div><div class='del'>-		new_book_view-&gt;change_context-&gt;del_ids = book_view-&gt;change_context-&gt;del_ids;</div><div class='del'>-	} else</div><div class='del'>-		new_book_view-&gt;change_context = NULL;</div><div class='del'>-	</div><div class='del'>-	return new_book_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)</div><div class='del'>-{</div><div class='del'>-	g_free(book_view-&gt;search);</div><div class='del'>-	if (book_view-&gt;card_sexp)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(book_view-&gt;card_sexp));</div><div class='del'>-</div><div class='del'>-	g_free(book_view-&gt;change_id);</div><div class='del'>-	if (book_view-&gt;change_context) {</div><div class='del'>-		g_list_foreach (book_view-&gt;change_context-&gt;add_cards, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_foreach (book_view-&gt;change_context-&gt;add_ids, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_foreach (book_view-&gt;change_context-&gt;mod_cards, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_foreach (book_view-&gt;change_context-&gt;mod_ids, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_foreach (book_view-&gt;change_context-&gt;del_ids, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_free (book_view-&gt;change_context-&gt;add_cards);</div><div class='del'>-		g_list_free (book_view-&gt;change_context-&gt;add_ids);</div><div class='del'>-		g_list_free (book_view-&gt;change_context-&gt;mod_cards);</div><div class='del'>-		g_list_free (book_view-&gt;change_context-&gt;mod_ids);</div><div class='del'>-		g_list_free (book_view-&gt;change_context-&gt;del_ids);</div><div class='del'>-	}</div><div class='del'>-	g_free(book_view-&gt;change_context);</div><div class='del'>-</div><div class='del'>-	g_free(book_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-get_length(PASCardCursor *cursor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	return cursor_data-&gt;num_elements;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_nth(PASCardCursor *cursor, long n, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;</div><div class='del'>-	GList *nth_item = g_list_nth(cursor_data-&gt;elements, n);</div><div class='del'>-</div><div class='del'>-	return g_strdup((char*)nth_item-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Addressbook_Book corba_book;</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data-&gt;book));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("cursor_destroy: Exception unreffing "</div><div class='del'>-			  "corba book.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_list_foreach(cursor_data-&gt;elements, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free (cursor_data-&gt;elements);</div><div class='del'>-</div><div class='del'>-	g_free(cursor_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBook           *book = (PASBook *)data;</div><div class='del'>-	PASBackendFile    *bf;</div><div class='del'>-	EIterator         *iterator;</div><div class='del'>-	gboolean success = FALSE;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));</div><div class='del'>-	for (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-		if (view-&gt;book_view == PAS_BOOK_VIEW(object)) {</div><div class='del'>-			e_iterator_delete(iterator);</div><div class='del'>-			success = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!success)</div><div class='del'>-		g_warning ("Failed to remove from book_views list");</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref(BONOBO_OBJECT(book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-string_to_dbt(const char *str, DBT *dbt)</div><div class='del'>-{</div><div class='del'>-	memset (dbt, 0, sizeof (*dbt));</div><div class='del'>-	dbt-&gt;data = (void*)str;</div><div class='del'>-	dbt-&gt;size = strlen (str) + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_backend_file_create_unique_id (char *vcard)</div><div class='del'>-{</div><div class='del'>-	/* use a 32 counter and the 32 bit timestamp to make an id.</div><div class='del'>-	   it's doubtful 2^32 id's will be created in a second, so we</div><div class='del'>-	   should be okay. */</div><div class='del'>-	static guint c = 0;</div><div class='del'>-	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)</div><div class='del'>-{</div><div class='del'>-	/* If this is not a search context view, it doesn't match be default */</div><div class='del'>-	if (view-&gt;card_sexp == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return pas_backend_card_sexp_match_vcard (view-&gt;card_sexp, vcard_string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_search (PASBackendFile  	      *bf,</div><div class='del'>-			 PASBook         	      *book,</div><div class='del'>-			 const PASBackendFileBookView *cnstview)</div><div class='del'>-{</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	GList   *cards = NULL;</div><div class='del'>-	gint    card_count = 0, card_threshold = 20, card_threshold_max = 1000;</div><div class='del'>-	DB      *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBC     *dbc;</div><div class='del'>-	DBT     id_dbt, vcard_dbt;</div><div class='del'>-	int     file_version_name_len;</div><div class='del'>-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;</div><div class='del'>-	gboolean search_needed;</div><div class='del'>-</div><div class='del'>-	if (!bf-&gt;priv-&gt;loaded)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	search_needed = TRUE;</div><div class='del'>-</div><div class='del'>-	if ( ! strcmp (view-&gt;search, "(contains \"x-evolution-any-field\" \"\")"))</div><div class='del'>-		search_needed = FALSE;</div><div class='del'>-</div><div class='del'>-	if (search_needed)</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, _("Searching..."));</div><div class='del'>-	else</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, _("Loading..."));</div><div class='del'>-</div><div class='del'>-	if (view-&gt;card_sexp)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(view-&gt;card_sexp));</div><div class='del'>-</div><div class='del'>-	view-&gt;card_sexp = pas_backend_card_sexp_new (view-&gt;search);</div><div class='del'>-	</div><div class='del'>-	if (!view-&gt;card_sexp) {</div><div class='del'>-		/* need a different error message here. */</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, _("Error in search expression."));</div><div class='del'>-		pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;cursor (db, NULL, &amp;dbc, 0);</div><div class='del'>-</div><div class='del'>-	memset (&amp;id_dbt, 0, sizeof (id_dbt));</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		g_warning ("pas_backend_file_search: error building list\n");</div><div class='del'>-	} else {</div><div class='del'>-		db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_FIRST);</div><div class='del'>-</div><div class='del'>-		while (db_error == 0) {</div><div class='del'>-</div><div class='del'>-			/* don't include the version in the list of cards */</div><div class='del'>-			if (id_dbt.size != file_version_name_len+1</div><div class='del'>-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {</div><div class='del'>-				char *vcard_string = vcard_dbt.data;</div><div class='del'>-</div><div class='del'>-				/* check if the vcard matches the search sexp */</div><div class='del'>-				if ((!search_needed) || vcard_matches_search (view, vcard_string)) {</div><div class='del'>-					cards = g_list_prepend (cards, g_strdup (vcard_string));</div><div class='del'>-					card_count ++;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* If we've accumulated a number of checks, pass them off to the client. */</div><div class='del'>-				if (card_count &gt;= card_threshold) {</div><div class='del'>-					cards = g_list_reverse (cards);</div><div class='del'>-					pas_book_view_notify_add (view-&gt;book_view, cards);</div><div class='del'>-					/* Clean up the handed-off data. */</div><div class='del'>-					g_list_foreach (cards, (GFunc)g_free, NULL);</div><div class='del'>-					g_list_free (cards);</div><div class='del'>-					cards = NULL;</div><div class='del'>-					card_count = 0;</div><div class='del'>-</div><div class='del'>-					/* Yeah, this scheme is overly complicated.  But I like it. */</div><div class='del'>-					if (card_threshold &lt; card_threshold_max) {</div><div class='del'>-						card_threshold = MIN (2*card_threshold, card_threshold_max);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_NEXT);</div><div class='del'>-		}</div><div class='del'>-		dbc-&gt;c_close (dbc);</div><div class='del'>-</div><div class='del'>-		if (db_error != DB_NOTFOUND) {</div><div class='del'>-			g_warning ("pas_backend_file_search: error building list\n");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card_count)</div><div class='del'>-		pas_book_view_notify_add (view-&gt;book_view, cards);</div><div class='del'>-</div><div class='del'>-	pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	** It's fine to do this now since the data has been handed off.</div><div class='del'>-	*/</div><div class='del'>-	g_list_foreach (cards, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free (cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_changes_foreach_key (const char *key, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileChangeContext *ctx = user_data;</div><div class='del'>-	DB      *db = ctx-&gt;db;</div><div class='del'>-	DBT     id_dbt, vcard_dbt;</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	</div><div class='del'>-	string_to_dbt (key, &amp;id_dbt);</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-	db_error = db-&gt;get (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-	</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		char *id = id_dbt.data;</div><div class='del'>-		</div><div class='del'>-		ctx-&gt;del_ids = g_list_append (ctx-&gt;del_ids, g_strdup (id));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_changes (PASBackendFile  	      *bf,</div><div class='del'>-			  PASBook         	      *book,</div><div class='del'>-			  const PASBackendFileBookView *cnstview)</div><div class='del'>-{</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	DBT     id_dbt, vcard_dbt;</div><div class='del'>-	char    *filename;</div><div class='del'>-	EDbHash *ehash;</div><div class='del'>-	GList *i, *v;</div><div class='del'>-	DB      *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBC *dbc;</div><div class='del'>-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;</div><div class='del'>-	PASBackendFileChangeContext *ctx = cnstview-&gt;change_context;</div><div class='del'>-	char *dirname, *slash;</div><div class='del'>-</div><div class='del'>-	memset (&amp;id_dbt, 0, sizeof (id_dbt));</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-	if (!bf-&gt;priv-&gt;loaded)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Find the changed ids */</div><div class='del'>-	dirname = g_strdup (bf-&gt;priv-&gt;filename);</div><div class='del'>-	slash = strrchr (dirname, '/');</div><div class='del'>-	*slash = '\0';</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/%s.db", dirname, view-&gt;change_id);</div><div class='del'>-	ehash = e_dbhash_new (filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	g_free (dirname);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;cursor (db, NULL, &amp;dbc, 0);</div><div class='del'>-</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		g_warning ("pas_backend_file_changes: error building list\n");</div><div class='del'>-	} else {</div><div class='del'>-		db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_FIRST);</div><div class='del'>-</div><div class='del'>-		while (db_error == 0) {</div><div class='del'>-</div><div class='del'>-			/* don't include the version in the list of cards */</div><div class='del'>-			if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1</div><div class='del'>-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {</div><div class='del'>-				ECard *card;</div><div class='del'>-				char *id = id_dbt.data;</div><div class='del'>-				char *vcard_string;</div><div class='del'>-				</div><div class='del'>-				/* Remove fields the user can't change</div><div class='del'>-				 * and can change without the rest of the</div><div class='del'>-				 * card changing </div><div class='del'>-				 */</div><div class='del'>-				card = e_card_new (vcard_dbt.data);</div><div class='del'>-				gtk_object_set (GTK_OBJECT (card), "last_use", NULL, "use_score", 0.0, NULL);</div><div class='del'>-				vcard_string = e_card_get_vcard_assume_utf8 (card);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-				</div><div class='del'>-				/* check what type of change has occurred, if any */</div><div class='del'>-				switch (e_dbhash_compare (ehash, id, vcard_string)) {</div><div class='del'>-				case E_DBHASH_STATUS_SAME:</div><div class='del'>-					break;</div><div class='del'>-				case E_DBHASH_STATUS_NOT_FOUND:</div><div class='del'>-					ctx-&gt;add_cards = g_list_append (ctx-&gt;add_cards, </div><div class='del'>-									g_strdup(vcard_string));</div><div class='del'>-					ctx-&gt;add_ids = g_list_append (ctx-&gt;add_ids, g_strdup(id));</div><div class='del'>-					break;</div><div class='del'>-				case E_DBHASH_STATUS_DIFFERENT:</div><div class='del'>-					ctx-&gt;mod_cards = g_list_append (ctx-&gt;mod_cards, </div><div class='del'>-									g_strdup(vcard_string));</div><div class='del'>-					ctx-&gt;mod_ids = g_list_append (ctx-&gt;mod_ids, g_strdup(id));</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_NEXT);</div><div class='del'>-		}</div><div class='del'>-		dbc-&gt;c_close (dbc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)pas_backend_file_changes_foreach_key, view-&gt;change_context);</div><div class='del'>-</div><div class='del'>-	/* Send the changes */</div><div class='del'>-	if (db_error != DB_NOTFOUND) {</div><div class='del'>-		g_warning ("pas_backend_file_changes: error building list\n");</div><div class='del'>-	} else {</div><div class='del'>-  		if (ctx-&gt;add_cards != NULL)</div><div class='del'>-  			pas_book_view_notify_add (view-&gt;book_view, ctx-&gt;add_cards);</div><div class='del'>-		</div><div class='del'>-		if (ctx-&gt;mod_cards != NULL)</div><div class='del'>-			pas_book_view_notify_change (view-&gt;book_view, ctx-&gt;mod_cards);</div><div class='del'>-</div><div class='del'>-		for (v = ctx-&gt;del_ids; v != NULL; v = v-&gt;next){</div><div class='del'>-			char *id = v-&gt;data;</div><div class='del'>-			pas_book_view_notify_remove (view-&gt;book_view, id);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the hash */</div><div class='del'>-	for (i = ctx-&gt;add_ids, v = ctx-&gt;add_cards; i != NULL; i = i-&gt;next, v = v-&gt;next){</div><div class='del'>-		char *id = i-&gt;data;</div><div class='del'>-		char *vcard = v-&gt;data;</div><div class='del'>-</div><div class='del'>-		e_dbhash_add (ehash, id, vcard);</div><div class='del'>-		g_free (i-&gt;data);</div><div class='del'>-		g_free (v-&gt;data);		</div><div class='del'>-	}	</div><div class='del'>-	for (i = ctx-&gt;mod_ids, v = ctx-&gt;mod_cards; i != NULL; i = i-&gt;next, v = v-&gt;next){</div><div class='del'>-		char *id = i-&gt;data;</div><div class='del'>-		char *vcard = v-&gt;data;</div><div class='del'>-</div><div class='del'>-		e_dbhash_add (ehash, id, vcard);</div><div class='del'>-		g_free (i-&gt;data);</div><div class='del'>-		g_free (v-&gt;data);		</div><div class='del'>-	}	</div><div class='del'>-	for (i = ctx-&gt;del_ids; i != NULL; i = i-&gt;next){</div><div class='del'>-		char *id = i-&gt;data;</div><div class='del'>-</div><div class='del'>-		e_dbhash_remove (ehash, id);</div><div class='del'>-		g_free (i-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dbhash_write (ehash);</div><div class='del'>-  	e_dbhash_destroy (ehash);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-do_create(PASBackend *backend,</div><div class='del'>-	  char       *vcard_req,</div><div class='del'>-	  char      **vcard_ptr)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	DB             *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBT            id_dbt, vcard_dbt;</div><div class='del'>-	int            db_error;</div><div class='del'>-	char           *id;</div><div class='del'>-	ECard          *card;</div><div class='del'>-	char           *vcard;</div><div class='del'>-	char           *ret_val;</div><div class='del'>-</div><div class='del'>-	id = pas_backend_file_create_unique_id (vcard_req);</div><div class='del'>-</div><div class='del'>-	string_to_dbt (id, &amp;id_dbt);</div><div class='del'>-	</div><div class='del'>-	card = e_card_new(vcard_req);</div><div class='del'>-	e_card_set_id(card, id);</div><div class='del'>-	vcard = e_card_get_vcard_assume_utf8(card);</div><div class='del'>-</div><div class='del'>-	string_to_dbt (vcard, &amp;vcard_dbt);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;put (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-</div><div class='del'>-	if (0 == db_error) {</div><div class='del'>-		db_error = db-&gt;sync (db, 0);</div><div class='del'>-		if (db_error != 0)</div><div class='del'>-			g_warning ("db-&gt;sync failed.\n");</div><div class='del'>-		ret_val = id;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_free (id);</div><div class='del'>-		ret_val = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	card = NULL;</div><div class='del'>-</div><div class='del'>-	if (vcard_ptr &amp;&amp; ret_val)</div><div class='del'>-		*vcard_ptr = vcard;</div><div class='del'>-	else</div><div class='del'>-		g_free (vcard);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_create_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASCreateCardRequest *req)</div><div class='del'>-{</div><div class='del'>-	char *id;</div><div class='del'>-	char *vcard;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	id = do_create(backend, req-&gt;vcard, &amp;vcard);</div><div class='del'>-	if (id) {</div><div class='del'>-		for (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-			if (vcard_matches_search (view, vcard)) {</div><div class='del'>-				bonobo_object_ref (BONOBO_OBJECT (view-&gt;book_view));</div><div class='del'>-				pas_book_view_notify_add_1 (view-&gt;book_view, vcard);</div><div class='del'>-				pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-				bonobo_object_unref (BONOBO_OBJECT (view-&gt;book_view));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		</div><div class='del'>-		pas_book_respond_create (</div><div class='del'>-			book,</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener_Success,</div><div class='del'>-			id);</div><div class='del'>-		g_free(vcard);</div><div class='del'>-		g_free(id);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* XXX need a different call status for this case, i</div><div class='del'>-                   think */</div><div class='del'>-		pas_book_respond_create (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound,</div><div class='del'>-				 "");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_remove_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRemoveCardRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	DB             *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBT            id_dbt, vcard_dbt;</div><div class='del'>-	int            db_error;</div><div class='del'>-	EIterator     *iterator;</div><div class='del'>-	char          *vcard_string;</div><div class='del'>-	const char    *id;</div><div class='del'>-</div><div class='del'>-	id = req-&gt;id;</div><div class='del'>-	string_to_dbt (id, &amp;id_dbt);</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;get (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-	if (0 != db_error) {</div><div class='del'>-		pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	db_error = db-&gt;del (db, NULL, &amp;id_dbt, 0);</div><div class='del'>-	if (0 != db_error) {</div><div class='del'>-		pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;sync (db, 0);</div><div class='del'>-	if (db_error != 0)</div><div class='del'>-		g_warning ("db-&gt;sync failed.\n");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	vcard_string = vcard_dbt.data;</div><div class='del'>-	for (iterator = e_list_get_iterator (bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-		if (vcard_matches_search (view, vcard_string)) {</div><div class='del'>-			bonobo_object_ref (BONOBO_OBJECT (view-&gt;book_view));</div><div class='del'>-			pas_book_view_notify_remove (view-&gt;book_view, req-&gt;id);</div><div class='del'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-			bonobo_object_unref (BONOBO_OBJECT (view-&gt;book_view));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	</div><div class='del'>-	pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_Success);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_modify_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASModifyCardRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	DB             *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBT            id_dbt, vcard_dbt;</div><div class='del'>-	int            db_error;</div><div class='del'>-	EIterator     *iterator;</div><div class='del'>-	ECard         *card;</div><div class='del'>-	const char    *id, *lookup_id;</div><div class='del'>-	char          *old_vcard_string;</div><div class='del'>-</div><div class='del'>-	/* create a new ecard from the request data */</div><div class='del'>-	card = e_card_new(req-&gt;vcard);</div><div class='del'>-	id = e_card_get_id(card);</div><div class='del'>-</div><div class='del'>-	/* This is disgusting, but for a time cards were added with</div><div class='del'>-           ID's that are no longer used (they contained both the uri</div><div class='del'>-           and the id.) If we recognize it as a uri (file:///...) trim</div><div class='del'>-           off everything before the last '/', and use that as the</div><div class='del'>-           id.*/</div><div class='del'>-	if (!strncmp (id, "file:///", strlen ("file:///"))) {</div><div class='del'>-		lookup_id = strrchr (id, '/') + 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		lookup_id = id;</div><div class='del'>-</div><div class='del'>-	string_to_dbt (lookup_id, &amp;id_dbt);	</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-	/* get the old ecard - the one that's presently in the db */</div><div class='del'>-	db_error = db-&gt;get (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-	if (0 != db_error) {</div><div class='del'>-		pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	old_vcard_string = g_strdup(vcard_dbt.data);</div><div class='del'>-</div><div class='del'>-	string_to_dbt (req-&gt;vcard, &amp;vcard_dbt);	</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;put (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-</div><div class='del'>-	if (0 == db_error) {</div><div class='del'>-		db_error = db-&gt;sync (db, 0);</div><div class='del'>-		if (db_error != 0)</div><div class='del'>-			g_warning ("db-&gt;sync failed.\n");</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			CORBA_Environment ev;</div><div class='del'>-			const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-			gboolean old_match, new_match;</div><div class='del'>-</div><div class='del'>-			CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-</div><div class='del'>-			old_match = vcard_matches_search (view, old_vcard_string);</div><div class='del'>-			new_match = vcard_matches_search (view, req-&gt;vcard);</div><div class='del'>-			if (old_match &amp;&amp; new_match)</div><div class='del'>-				pas_book_view_notify_change_1 (view-&gt;book_view, req-&gt;vcard);</div><div class='del'>-			else if (new_match)</div><div class='del'>-				pas_book_view_notify_add_1 (view-&gt;book_view, req-&gt;vcard);</div><div class='del'>-			else /* if (old_match) */</div><div class='del'>-				pas_book_view_notify_remove (view-&gt;book_view, id);</div><div class='del'>-</div><div class='del'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-</div><div class='del'>-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_Success);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(old_vcard_string);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_build_cards_list(PASBackend *backend,</div><div class='del'>-				  PASBackendFileCursorPrivate *cursor_data,</div><div class='del'>-				  char *search)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	DB             *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBC            *dbc;</div><div class='del'>-	int            db_error;</div><div class='del'>-	DBT  id_dbt, vcard_dbt;</div><div class='del'>-	PASBackendCardSExp *card_sexp = NULL;</div><div class='del'>-	gboolean search_needed;</div><div class='del'>-	</div><div class='del'>-	cursor_data-&gt;elements = NULL;</div><div class='del'>-</div><div class='del'>-	search_needed = TRUE;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (search, "(contains \"x-evolution-any-field\" \"\")"))</div><div class='del'>-		search_needed = FALSE;</div><div class='del'>-</div><div class='del'>-	card_sexp = pas_backend_card_sexp_new (search);</div><div class='del'>-	</div><div class='del'>-	if (!card_sexp)</div><div class='del'>-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;cursor (db, NULL, &amp;dbc, 0);</div><div class='del'>-</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-	memset (&amp;id_dbt, 0, sizeof (id_dbt));</div><div class='del'>-	db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_FIRST);</div><div class='del'>-</div><div class='del'>-	while (db_error == 0) {</div><div class='del'>-</div><div class='del'>-		/* don't include the version in the list of cards */</div><div class='del'>-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1</div><div class='del'>-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {</div><div class='del'>-</div><div class='del'>-			if ((!search_needed) || (card_sexp != NULL &amp;&amp; pas_backend_card_sexp_match_vcard  (card_sexp, vcard_dbt.data))) {</div><div class='del'>-				cursor_data-&gt;elements = g_list_prepend (cursor_data-&gt;elements, g_strdup (vcard_dbt.data));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_NEXT);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (db_error != DB_NOTFOUND) {</div><div class='del'>-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		cursor_data-&gt;num_elements = g_list_length (cursor_data-&gt;elements);</div><div class='del'>-		cursor_data-&gt;elements = g_list_reverse (cursor_data-&gt;elements);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_get_vcard (PASBackend *backend,</div><div class='del'>-				    PASBook    *book,</div><div class='del'>-				    PASGetVCardRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-	DB             *db;</div><div class='del'>-	DBT             id_dbt, vcard_dbt;</div><div class='del'>-	int             db_error = 0;</div><div class='del'>-	char           *card;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_CallStatus status;	</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));</div><div class='del'>-	db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-</div><div class='del'>-	string_to_dbt (req-&gt;id, &amp;id_dbt);</div><div class='del'>-	memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;get (db, NULL, &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-</div><div class='del'>-	if (db_error == 0) {</div><div class='del'>-		card = vcard_dbt.data;</div><div class='del'>-		status = GNOME_Evolution_Addressbook_BookListener_Success;</div><div class='del'>-	} else {</div><div class='del'>-		card = NULL;</div><div class='del'>-		status = GNOME_Evolution_Addressbook_BookListener_CardNotFound;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_vcard (book,</div><div class='del'>-				    status,</div><div class='del'>-				    card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_get_cursor (PASBackend *backend,</div><div class='del'>-				     PASBook    *book,</div><div class='del'>-				     PASGetCursorRequest *req)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	  DB             *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	  DBT            id_dbt, vcard_dbt;</div><div class='del'>-	*/</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int            db_error = 0;</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data;</div><div class='del'>-	PASCardCursor *cursor;</div><div class='del'>-	GNOME_Evolution_Addressbook_Book corba_book;</div><div class='del'>-</div><div class='del'>-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);</div><div class='del'>-	cursor_data-&gt;backend = backend;</div><div class='del'>-	cursor_data-&gt;book = book;</div><div class='del'>-</div><div class='del'>-	pas_backend_file_build_cards_list(backend, cursor_data, req-&gt;search);</div><div class='del'>-</div><div class='del'>-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "</div><div class='del'>-			  "corba book.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-	</div><div class='del'>-	cursor = pas_card_cursor_new(get_length,</div><div class='del'>-				     get_nth,</div><div class='del'>-				     cursor_data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);</div><div class='del'>-	</div><div class='del'>-	pas_book_respond_get_cursor (</div><div class='del'>-		book,</div><div class='del'>-		(db_error == 0 </div><div class='del'>-		 ? GNOME_Evolution_Addressbook_BookListener_Success </div><div class='del'>-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound),</div><div class='del'>-		cursor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_get_book_view (PASBackend *backend,</div><div class='del'>-					PASBook    *book,</div><div class='del'>-					PASGetBookViewRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	PASBookView       *book_view;</div><div class='del'>-	PASBackendFileBookView view;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;listener != NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_ref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-	book_view = pas_book_view_new (req-&gt;listener);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(view_destroy), book);</div><div class='del'>-</div><div class='del'>-	view.book_view = book_view;</div><div class='del'>-	view.search = g_strdup (req-&gt;search);</div><div class='del'>-	view.card_sexp = NULL;</div><div class='del'>-	view.change_id = NULL;</div><div class='del'>-	view.change_context = NULL;	</div><div class='del'>-</div><div class='del'>-	e_list_append(bf-&gt;priv-&gt;book_views, &amp;view);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_book_view (book,</div><div class='del'>-		   (book_view != NULL</div><div class='del'>-		    ? GNOME_Evolution_Addressbook_BookListener_Success </div><div class='del'>-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),</div><div class='del'>-		   book_view);</div><div class='del'>-</div><div class='del'>-	iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views);</div><div class='del'>-	e_iterator_last(iterator);</div><div class='del'>-	pas_backend_file_search (bf, book, e_iterator_get(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_get_changes (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASGetChangesRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	PASBookView       *book_view;</div><div class='del'>-	PASBackendFileBookView view;</div><div class='del'>-	PASBackendFileChangeContext ctx;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;listener != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-	book_view = pas_book_view_new (req-&gt;listener);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(view_destroy), book);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_changes (book,</div><div class='del'>-		   (book_view != NULL</div><div class='del'>-		    ? GNOME_Evolution_Addressbook_BookListener_Success </div><div class='del'>-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),</div><div class='del'>-		   book_view);</div><div class='del'>-</div><div class='del'>-	view.book_view = book_view;</div><div class='del'>-	view.change_id = req-&gt;change_id;</div><div class='del'>-	view.change_context = &amp;ctx;</div><div class='del'>-	ctx.db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	ctx.add_cards = NULL;</div><div class='del'>-	ctx.add_ids = NULL;</div><div class='del'>-	ctx.mod_cards = NULL;</div><div class='del'>-	ctx.mod_ids = NULL;</div><div class='del'>-	ctx.del_ids = NULL;</div><div class='del'>-	view.search = NULL;</div><div class='del'>-	view.card_sexp = NULL;</div><div class='del'>-	</div><div class='del'>-	e_list_append(bf-&gt;priv-&gt;book_views, &amp;view);</div><div class='del'>-</div><div class='del'>-	iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views);</div><div class='del'>-	e_iterator_last(iterator);</div><div class='del'>-	pas_backend_file_changes (bf, book, e_iterator_get(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_check_connection (PASBackend *backend,</div><div class='del'>-					   PASBook    *book,</div><div class='del'>-					   PASCheckConnectionRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	pas_book_report_connection (book, bf-&gt;priv-&gt;file_db != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_backend_file_extract_path_from_uri (const char *uri)</div><div class='del'>-{</div><div class='del'>-	g_assert (strncasecmp (uri, "file:", 5) == 0);</div><div class='del'>-</div><div class='del'>-	return g_strdup (uri + 5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_authenticate_user (PASBackend *backend,</div><div class='del'>-					    PASBook    *book,</div><div class='del'>-					    PASAuthenticateUserRequest *req)</div><div class='del'>-{</div><div class='del'>-	pas_book_respond_authenticate_user (book,</div><div class='del'>-					    GNOME_Evolution_Addressbook_BookListener_Success);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_get_supported_fields (PASBackend *backend,</div><div class='del'>-					       PASBook    *book,</div><div class='del'>-					       PASGetSupportedFieldsRequest *req)</div><div class='del'>-{</div><div class='del'>-	EList *fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	ECard *card;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* we support everything, so instantiate an e-card, and loop</div><div class='del'>-           through all fields, adding their ecard_fields. */</div><div class='del'>-</div><div class='del'>-	card = e_card_new ("");</div><div class='del'>-	simple = e_card_simple_new (card);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_FIELD_LAST; i ++)</div><div class='del'>-		e_list_append (fields, e_card_simple_get_ecard_field (simple, i));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_supported_fields (book,</div><div class='del'>-					       GNOME_Evolution_Addressbook_BookListener_Success,</div><div class='del'>-					       fields);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_process_client_requests (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	backend = pas_book_get_backend (book);</div><div class='del'>-</div><div class='del'>-	req = pas_book_pop_request (book);</div><div class='del'>-	if (req == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (req-&gt;op) {</div><div class='del'>-	case CreateCard:</div><div class='del'>-		pas_backend_file_process_create_card (backend, book, (PASCreateCardRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RemoveCard:</div><div class='del'>-		pas_backend_file_process_remove_card (backend, book, (PASRemoveCardRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ModifyCard:</div><div class='del'>-		pas_backend_file_process_modify_card (backend, book, (PASModifyCardRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CheckConnection:</div><div class='del'>-		pas_backend_file_process_check_connection (backend, book, (PASCheckConnectionRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetVCard:</div><div class='del'>-		pas_backend_file_process_get_vcard (backend, book, (PASGetVCardRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case GetCursor:</div><div class='del'>-		pas_backend_file_process_get_cursor (backend, book, (PASGetCursorRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case GetBookView:</div><div class='del'>-		pas_backend_file_process_get_book_view (backend, book, (PASGetBookViewRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetChanges:</div><div class='del'>-		pas_backend_file_process_get_changes (backend, book, (PASGetChangesRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AuthenticateUser:</div><div class='del'>-		pas_backend_file_process_authenticate_user (backend, book, (PASAuthenticateUserRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetSupportedFields:</div><div class='del'>-		pas_backend_file_process_get_supported_fields (backend, book, (PASGetSupportedFieldsRequest*)req);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_free_request (req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *backend;</div><div class='del'>-</div><div class='del'>-	backend = PAS_BACKEND_FILE (data);</div><div class='del'>-</div><div class='del'>-	pas_backend_remove_client (PAS_BACKEND (backend), book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** versions:</div><div class='del'>-**</div><div class='del'>-** 0.0 just a list of cards</div><div class='del'>-**</div><div class='del'>-** 0.1 same as 0.0, but with the version tag</div><div class='del'>-**</div><div class='del'>-** 0.2 not a real format upgrade, just a hack to fix broken ids caused</div><div class='del'>-**     by a bug in early betas, but we only need to convert them if</div><div class='del'>-**     the previous version is 0.1, since the bug existed after 0.1</div><div class='del'>-**     came about.</div><div class='del'>-*/</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)</div><div class='del'>-{</div><div class='del'>-	DB  *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	int db_error;</div><div class='del'>-	DBT version_name_dbt, version_dbt;</div><div class='del'>-	</div><div class='del'>-	if (strcmp (old_version, "0.0")</div><div class='del'>-	    &amp;&amp; strcmp (old_version, "0.1")) {</div><div class='del'>-		g_warning ("unsupported version '%s' found in PAS backend file\n",</div><div class='del'>-			   old_version);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strcmp (old_version, "0.1")) {</div><div class='del'>-		/* we just loop through all the cards in the db,</div><div class='del'>-                   giving them valid ids if they don't have them */</div><div class='del'>-		DBT  id_dbt, vcard_dbt;</div><div class='del'>-		DBC *dbc;</div><div class='del'>-		int  card_failed = 0;</div><div class='del'>-</div><div class='del'>-		db_error = db-&gt;cursor (db, NULL, &amp;dbc, 0);</div><div class='del'>-		if (db_error != 0) {</div><div class='del'>-			g_warning ("unable to get cursor");</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memset (&amp;id_dbt, 0, sizeof (id_dbt));</div><div class='del'>-		memset (&amp;vcard_dbt, 0, sizeof (vcard_dbt));</div><div class='del'>-</div><div class='del'>-		db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_FIRST);</div><div class='del'>-</div><div class='del'>-		while (db_error == 0) {</div><div class='del'>-			if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1</div><div class='del'>-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {</div><div class='del'>-				ECard *card;</div><div class='del'>-</div><div class='del'>-				card = e_card_new (vcard_dbt.data);</div><div class='del'>-</div><div class='del'>-				/* the cards we're looking for are</div><div class='del'>-				   created with a normal id dbt, but</div><div class='del'>-				   with the id field in the vcard set</div><div class='del'>-				   to something that doesn't match.</div><div class='del'>-				   so, we need to modify the card to</div><div class='del'>-				   have the same id as the the dbt. */</div><div class='del'>-				if (strcmp (id_dbt.data, e_card_get_id (card))) {</div><div class='del'>-					char *vcard;</div><div class='del'>-</div><div class='del'>-					e_card_set_id (card, id_dbt.data);</div><div class='del'>-</div><div class='del'>-					vcard = e_card_get_vcard (card);</div><div class='del'>-					string_to_dbt (vcard, &amp;vcard_dbt);</div><div class='del'>-</div><div class='del'>-					db_error = db-&gt;put (db, NULL,</div><div class='del'>-							    &amp;id_dbt, &amp;vcard_dbt, 0);</div><div class='del'>-</div><div class='del'>-					g_free (vcard);</div><div class='del'>-</div><div class='del'>-					if (db_error != 0)</div><div class='del'>-						card_failed++;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				gtk_object_unref (GTK_OBJECT(card));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			db_error = dbc-&gt;c_get(dbc, &amp;id_dbt, &amp;vcard_dbt, DB_NEXT);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (card_failed) {</div><div class='del'>-			g_warning ("failed to update %d cards\n", card_failed);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &amp;version_name_dbt);</div><div class='del'>-	string_to_dbt (PAS_BACKEND_FILE_VERSION, &amp;version_dbt);</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;put (db, NULL, &amp;version_name_dbt, &amp;version_dbt, 0);</div><div class='del'>-	if (db_error == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)</div><div class='del'>-{</div><div class='del'>-	DB   *db = bf-&gt;priv-&gt;file_db;</div><div class='del'>-	DBT  version_name_dbt, version_dbt;</div><div class='del'>-	int  db_error;</div><div class='del'>-	char *version;</div><div class='del'>-	gboolean ret_val = TRUE;</div><div class='del'>-</div><div class='del'>-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &amp;version_name_dbt);</div><div class='del'>-	memset (&amp;version_dbt, 0, sizeof (version_dbt));</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;get (db, NULL, &amp;version_name_dbt, &amp;version_dbt, 0);</div><div class='del'>-	if (db_error == 0) {</div><div class='del'>-		/* success */</div><div class='del'>-		version = g_strdup (version_dbt.data);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* key was not in file */</div><div class='del'>-		version = g_strdup ("0.0");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp (version, PAS_BACKEND_FILE_VERSION))</div><div class='del'>-		ret_val = pas_backend_file_upgrade_db (bf, version);</div><div class='del'>-</div><div class='del'>-	g_free (version);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define INITIAL_VCARD "BEGIN:VCARD\n\</div><div class='del'>-X-EVOLUTION-FILE-AS:Ximian, Inc.\n\</div><div class='del'>-LABEL;WORK;QUOTED-PRINTABLE:401 Park Drive  3 West=0ABoston, MA 02215=0AUSA\n\</div><div class='del'>-TEL;WORK;VOICE:(617) 236-0442\n\</div><div class='del'>-TEL;WORK;FAX:(617) 236-8630\n\</div><div class='del'>-EMAIL;INTERNET:hello@ximian.com\n\</div><div class='del'>-URL:www.ximian.com/\n\</div><div class='del'>-ORG:Ximian, Inc.;\n\</div><div class='del'>-NOTE:Welcome to the Ximian Addressbook.\n\</div><div class='del'>-END:VCARD"</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Addressbook_BookListener_CallStatus</div><div class='del'>-pas_backend_file_load_uri (PASBackend             *backend,</div><div class='del'>-			   const char             *uri)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-	char           *filename;</div><div class='del'>-	gboolean        writable = FALSE;</div><div class='del'>-	int             db_error;</div><div class='del'>-	DB *db;</div><div class='del'>-	int major, minor, patch;</div><div class='del'>-</div><div class='del'>-	g_assert (bf-&gt;priv-&gt;loaded == FALSE);</div><div class='del'>-</div><div class='del'>-	db_version (&amp;major, &amp;minor, &amp;patch);</div><div class='del'>-</div><div class='del'>-	if (major != 3 ||</div><div class='del'>-	    minor != 1 ||</div><div class='del'>-	    patch != 17) {</div><div class='del'>-		g_warning ("Wrong version of libdb.");</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	filename = pas_backend_file_extract_path_from_uri (uri);</div><div class='del'>-</div><div class='del'>-	db_error = e_db3_utils_maybe_recover (filename);</div><div class='del'>-	if (db_error != 0)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-</div><div class='del'>-	db_error = db_create (&amp;db, NULL, 0);</div><div class='del'>-	if (db_error != 0)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;open (db, filename, NULL, DB_HASH, 0, 0666);</div><div class='del'>-</div><div class='del'>-	if (db_error == DB_OLD_VERSION) {</div><div class='del'>-		db_error = e_db3_utils_upgrade_format (filename);</div><div class='del'>-</div><div class='del'>-		if (db_error != 0)</div><div class='del'>-			return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-</div><div class='del'>-		db_error = db-&gt;open (db, filename, NULL, DB_HASH, 0, 0666);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bf-&gt;priv-&gt;file_db = db;</div><div class='del'>-</div><div class='del'>-	if (db_error == 0) {</div><div class='del'>-		writable = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		db_error = db-&gt;open (db, filename, NULL, DB_HASH, DB_RDONLY, 0666);</div><div class='del'>-</div><div class='del'>-		if (db_error != 0) {</div><div class='del'>-			db_error = db-&gt;open (db, filename, NULL, DB_HASH, DB_CREATE, 0666);</div><div class='del'>-</div><div class='del'>-			if (db_error == 0) {</div><div class='del'>-				char *create_initial_file;</div><div class='del'>-				char *dir;</div><div class='del'>-</div><div class='del'>-				dir = g_dirname(filename);</div><div class='del'>-				create_initial_file = g_concat_dir_and_file(dir, "create-initial");</div><div class='del'>-</div><div class='del'>-				if (g_file_exists(create_initial_file)) {</div><div class='del'>-					char *id;</div><div class='del'>-					id = do_create(backend, INITIAL_VCARD, NULL);</div><div class='del'>-					g_free (id);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				g_free(create_initial_file);</div><div class='del'>-				g_free(dir);</div><div class='del'>-</div><div class='del'>-				writable = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		bf-&gt;priv-&gt;file_db = NULL;</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bf-&gt;priv-&gt;writable = writable;</div><div class='del'>-</div><div class='del'>-	if (pas_backend_file_maybe_upgrade_db (bf))</div><div class='del'>-		bf-&gt;priv-&gt;loaded = TRUE;</div><div class='del'>-	else {</div><div class='del'>-		db-&gt;close (db, 0);</div><div class='del'>-		bf-&gt;priv-&gt;file_db = NULL;</div><div class='del'>-		bf-&gt;priv-&gt;writable = FALSE;</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(bf-&gt;priv-&gt;uri);</div><div class='del'>-	bf-&gt;priv-&gt;uri = g_strdup (uri);</div><div class='del'>-</div><div class='del'>-	g_free (bf-&gt;priv-&gt;filename);</div><div class='del'>-	bf-&gt;priv-&gt;filename = filename;</div><div class='del'>-</div><div class='del'>-	return GNOME_Evolution_Addressbook_BookListener_Success;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_uri handler for the addressbook file backend */</div><div class='del'>-static const char *</div><div class='del'>-pas_backend_file_get_uri (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (bf-&gt;priv-&gt;loaded, NULL);</div><div class='del'>-	g_assert (bf-&gt;priv-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	return bf-&gt;priv-&gt;uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_add_client (PASBackend             *backend,</div><div class='del'>-			     GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-	PASBook        *book;</div><div class='del'>-</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_FILE (backend));</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	book = pas_book_new (backend, listener);</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		if (!bf-&gt;priv-&gt;clients)</div><div class='del'>-			pas_backend_last_client_gone (backend);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book), "destroy",</div><div class='del'>-			    pas_backend_file_book_destroy_cb, backend);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",</div><div class='del'>-		    pas_backend_file_process_client_requests, NULL);</div><div class='del'>-</div><div class='del'>-	bf-&gt;priv-&gt;clients = g_list_prepend (</div><div class='del'>-		bf-&gt;priv-&gt;clients, book);</div><div class='del'>-</div><div class='del'>-	if (bf-&gt;priv-&gt;loaded) {</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-			book, GNOME_Evolution_Addressbook_BookListener_Success);</div><div class='del'>-		if (bf-&gt;priv-&gt;writable)</div><div class='del'>-			pas_book_report_writable (book, bf-&gt;priv-&gt;writable);</div><div class='del'>-	} else {</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-		       book, GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (book));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_remove_client (PASBackend             *backend,</div><div class='del'>-				PASBook                *book)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-	GList *l;</div><div class='del'>-	PASBook *lbook;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BACKEND_FILE (backend));</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	/* Find the book in the list of clients */</div><div class='del'>-</div><div class='del'>-	for (l = bf-&gt;priv-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		lbook = PAS_BOOK (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (lbook == book)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	/* Disconnect */</div><div class='del'>-</div><div class='del'>-	bf-&gt;priv-&gt;clients = g_list_remove_link (bf-&gt;priv-&gt;clients, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	/* When all clients go away, notify the parent factory about it so that</div><div class='del'>-	 * it may decide whether to kill the backend or not.</div><div class='del'>-	 */</div><div class='del'>-	if (!bf-&gt;priv-&gt;clients)</div><div class='del'>-		pas_backend_last_client_gone (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_backend_file_get_static_capabilities (PASBackend             *backend)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("local");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_construct (PASBackendFile *backend)</div><div class='del'>-{</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_FILE (backend));</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_construct (PAS_BACKEND (backend)))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_file_new:</div><div class='del'>- */</div><div class='del'>-PASBackend *</div><div class='del'>-pas_backend_file_new (void)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *backend;</div><div class='del'>-</div><div class='del'>-	backend = gtk_type_new (pas_backend_file_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_file_construct (backend)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return PAS_BACKEND (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(bf-&gt;priv-&gt;book_views));</div><div class='del'>-	g_free (bf-&gt;priv-&gt;uri);</div><div class='del'>-	g_free (bf-&gt;priv-&gt;filename);</div><div class='del'>-</div><div class='del'>-	g_free (bf-&gt;priv);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_backend_file_parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_class_init (PASBackendFileClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	PASBackendClass *parent_class;</div><div class='del'>-</div><div class='del'>-	pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ());</div><div class='del'>-</div><div class='del'>-	parent_class = PAS_BACKEND_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	/* Set the virtual methods. */</div><div class='del'>-	parent_class-&gt;load_uri                = pas_backend_file_load_uri;</div><div class='del'>-	parent_class-&gt;get_uri                 = pas_backend_file_get_uri;</div><div class='del'>-	parent_class-&gt;add_client              = pas_backend_file_add_client;</div><div class='del'>-	parent_class-&gt;remove_client           = pas_backend_file_remove_client;</div><div class='del'>-	parent_class-&gt;get_static_capabilities = pas_backend_file_get_static_capabilities;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_backend_file_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_init (PASBackendFile *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv             = g_new0 (PASBackendFilePrivate, 1);</div><div class='del'>-	priv-&gt;loaded     = FALSE;</div><div class='del'>-	priv-&gt;clients    = NULL;</div><div class='del'>-	priv-&gt;book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL);</div><div class='del'>-	priv-&gt;uri        = NULL;</div><div class='del'>-	priv-&gt;writable   = FALSE;</div><div class='del'>-</div><div class='del'>-	backend-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_file_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_backend_file_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBackendFile",</div><div class='del'>-			sizeof (PASBackendFile),</div><div class='del'>-			sizeof (PASBackendFileClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_backend_file_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_backend_file_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (pas_backend_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h<br/>deleted file mode 100644<br/>index 6c29c8b7a2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-file.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BACKEND_FILE_H__</div><div class='del'>-#define __PAS_BACKEND_FILE_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "pas-backend.h"</div><div class='del'>-</div><div class='del'>-typedef struct _PASBackendFilePrivate PASBackendFilePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASBackend             parent_object;</div><div class='del'>-	PASBackendFilePrivate *priv;</div><div class='del'>-} PASBackendFile;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASBackendClass parent_class;</div><div class='del'>-} PASBackendFileClass;</div><div class='del'>-</div><div class='del'>-PASBackend *pas_backend_file_new      (void);</div><div class='del'>-GtkType     pas_backend_file_get_type (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_FILE_TYPE        (pas_backend_file_get_type ())</div><div class='del'>-#define PAS_BACKEND_FILE(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_FILE_TYPE, PASBackendFile))</div><div class='del'>-#define PAS_BACKEND_FILE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendFileClass))</div><div class='del'>-#define PAS_IS_BACKEND_FILE(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_FILE_TYPE))</div><div class='del'>-#define PAS_IS_BACKEND_FILE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_FILE_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BACKEND_FILE_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c<br/>deleted file mode 100644<br/>index ee41bfcb69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-ldap.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-ldap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3271 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Chris Toshok (toshok@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define DEBUG</div><div class='del'>-</div><div class='del'>-#include "config.h"  </div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define LDAP_DEBUG</div><div class='del'>-#define LDAP_DEBUG_ADD</div><div class='del'>-#endif</div><div class='del'>-#include &lt;ldap.h&gt;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#undef LDAP_DEBUG</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if LDAP_VENDOR_VERSION &gt; 20000</div><div class='del'>-#define OPENLDAP2</div><div class='del'>-#else</div><div class='del'>-#define OPENLDAP1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef OPENLDAP2</div><div class='del'>-#include &lt;ldap_schema.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-</div><div class='del'>-#include "pas-backend-ldap.h"</div><div class='del'>-#include "pas-backend-card-sexp.h"</div><div class='del'>-#include "pas-book.h"</div><div class='del'>-#include "pas-card-cursor.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	PAS_BACKEND_LDAP_TLS_NO,</div><div class='del'>-	PAS_BACKEND_LDAP_TLS_ALWAYS,</div><div class='del'>-	PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE,</div><div class='del'>-} PASBackendLDAPUseTLS;</div><div class='del'>-</div><div class='del'>-/* interval for our poll_ldap timeout */</div><div class='del'>-#define LDAP_POLL_INTERVAL 20</div><div class='del'>-</div><div class='del'>-/* timeout for ldap_result */</div><div class='del'>-#define LDAP_RESULT_TIMEOUT_MILLIS 10</div><div class='del'>-</div><div class='del'>-/* smart grouping stuff */</div><div class='del'>-#define GROUPING_INITIAL_SIZE 1</div><div class='del'>-#define GROUPING_MAXIMUM_SIZE 200</div><div class='del'>-</div><div class='del'>-/* the next two are in milliseconds */</div><div class='del'>-#define GROUPING_MINIMUM_WAIT 0  /* we never send updates faster than this, to avoid totally spamming the UI */</div><div class='del'>-#define GROUPING_MAXIMUM_WAIT 250 /* we always send updates (if there are pending cards) when we hit this */</div><div class='del'>-</div><div class='del'>-#define TV_TO_MILLIS(timeval) ((timeval).tv_sec * 1000 + (timeval).tv_usec / 1000)</div><div class='del'>-</div><div class='del'>-/* the objectClasses we need */</div><div class='del'>-#define TOP                  "top"</div><div class='del'>-#define PERSON               "person"</div><div class='del'>-#define ORGANIZATIONALPERSON "organizationalPerson"</div><div class='del'>-#define INETORGPERSON        "inetOrgPerson"</div><div class='del'>-#define EVOLUTIONPERSON      "evolutionPerson"</div><div class='del'>-</div><div class='del'>-static gchar *query_prop_to_ldap(gchar *query_prop);</div><div class='del'>-</div><div class='del'>-static PASBackendClass *pas_backend_ldap_parent_class;</div><div class='del'>-typedef struct _PASBackendLDAPCursorPrivate PASBackendLDAPCursorPrivate;</div><div class='del'>-typedef struct _PASBackendLDAPBookView PASBackendLDAPBookView;</div><div class='del'>-typedef struct LDAPOp LDAPOp;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _PASBackendLDAPPrivate {</div><div class='del'>-	char     *uri;</div><div class='del'>-	gboolean connected;</div><div class='del'>-	GList    *clients;</div><div class='del'>-</div><div class='del'>-	gchar    *ldap_host;   /* the hostname of the server */</div><div class='del'>-	int      ldap_port;    /* the port of the server */</div><div class='del'>-	char     *schema_dn;   /* the base dn for schema information */</div><div class='del'>-	gchar    *ldap_rootdn; /* the base dn of our searches */</div><div class='del'>-	int      ldap_scope;   /* the scope used for searches */</div><div class='del'>-	int      ldap_limit;   /* the search limit */</div><div class='del'>-	int      ldap_timeout; /* the search timeout */</div><div class='del'>-</div><div class='del'>-	gboolean ldap_v3;      /* TRUE if the server supports protocol</div><div class='del'>-                                  revision 3 (necessary for TLS) */</div><div class='del'>-	gboolean starttls;     /* TRUE if the *library* supports</div><div class='del'>-                                  starttls.  will be false if openssl</div><div class='del'>-                                  was not built into openldap. */</div><div class='del'>-	PASBackendLDAPUseTLS use_tls;</div><div class='del'>-</div><div class='del'>-	GList    *book_views;</div><div class='del'>-</div><div class='del'>-	LDAP     *ldap;</div><div class='del'>-</div><div class='del'>-	EList    *supported_fields;</div><div class='del'>-</div><div class='del'>-	/* whether or not there's support for the objectclass we need</div><div class='del'>-           to store all our additional fields */</div><div class='del'>-	gboolean evolutionPersonSupported;</div><div class='del'>-	gboolean schema_checked;</div><div class='del'>-</div><div class='del'>-	gboolean writable;</div><div class='del'>-</div><div class='del'>-	/* our operations */</div><div class='del'>-	GHashTable *id_to_op;</div><div class='del'>-	int active_ops;</div><div class='del'>-	int                   poll_timeout;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBackendLDAPCursorPrivate {</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-	PASBook    *book;</div><div class='del'>-</div><div class='del'>-	GList      *elements;</div><div class='del'>-	long       num_elements;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBackendLDAPBookView {</div><div class='del'>-	PASBookView           *book_view;</div><div class='del'>-	PASBackendLDAPPrivate *blpriv;</div><div class='del'>-	gchar                 *search;</div><div class='del'>-	PASBackendCardSExp    *card_sexp;</div><div class='del'>-</div><div class='del'>-	LDAPOp                *search_op;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*LDAPOpHandler)(LDAPOp *op, LDAPMessage *res);</div><div class='del'>-typedef void (*LDAPOpDtor)(LDAPOp *op);</div><div class='del'>-</div><div class='del'>-struct LDAPOp {</div><div class='del'>-	LDAPOpHandler handler;</div><div class='del'>-	LDAPOpDtor    dtor;</div><div class='del'>-	PASBackend    *backend;</div><div class='del'>-	PASBook       *book;</div><div class='del'>-	PASBookView   *view;</div><div class='del'>-	int            id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void     ldap_op_add (LDAPOp *op, PASBackend *backend, PASBook *book,</div><div class='del'>-			     PASBookView *view, int id, LDAPOpHandler handler, LDAPOpDtor dtor);</div><div class='del'>-static void     ldap_op_finished (LDAPOp *op);</div><div class='del'>-</div><div class='del'>-static void     ldap_search_op_timeout (LDAPOp *op, glong cur_millis);</div><div class='del'>-</div><div class='del'>-static gboolean poll_ldap (PASBackendLDAP *bl);</div><div class='del'>-</div><div class='del'>-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses);</div><div class='del'>-</div><div class='del'>-static void email_populate (ECardSimple *card, char **values);</div><div class='del'>-struct berval** email_ber (ECardSimple *card);</div><div class='del'>-static gboolean email_compare (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-static void homephone_populate (ECardSimple *card, char **values);</div><div class='del'>-struct berval** homephone_ber (ECardSimple *card);</div><div class='del'>-static gboolean homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-static void business_populate (ECardSimple *card, char **values);</div><div class='del'>-struct berval** business_ber (ECardSimple *card);</div><div class='del'>-static gboolean business_compare (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-static void anniversary_populate (ECardSimple *card, char **values);</div><div class='del'>-struct berval** anniversary_ber (ECardSimple *card);</div><div class='del'>-static gboolean anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-static void birthday_populate (ECardSimple *card, char **values);</div><div class='del'>-struct berval** birthday_ber (ECardSimple *card);</div><div class='del'>-static gboolean birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-struct prop_info {</div><div class='del'>-	ECardSimpleField field_id;</div><div class='del'>-	char *query_prop;</div><div class='del'>-	char *ldap_attr;</div><div class='del'>-#define PROP_TYPE_STRING   0x01</div><div class='del'>-#define PROP_TYPE_COMPLEX     0x02</div><div class='del'>-#define PROP_DN            0x04</div><div class='del'>-#define PROP_EVOLVE        0x08</div><div class='del'>-	int prop_type;</div><div class='del'>-</div><div class='del'>-	/* the remaining items are only used for the TYPE_COMPLEX props */</div><div class='del'>-</div><div class='del'>-	/* used when reading from the ldap server populates ECard with the values in **values. */</div><div class='del'>-	void (*populate_ecard_func)(ECardSimple *card, char **values);</div><div class='del'>-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */</div><div class='del'>-	struct berval** (*ber_func)(ECardSimple *card);</div><div class='del'>-	/* used to compare list attributes */</div><div class='del'>-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);</div><div class='del'>-</div><div class='del'>-} prop_info[] = {</div><div class='del'>-</div><div class='del'>-#define COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX, ctor, ber, cmp}</div><div class='del'>-#define E_COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX | PROP_EVOLVE, ctor, ber, cmp}</div><div class='del'>-#define STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING}</div><div class='del'>-#define E_STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING | PROP_EVOLVE}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* name fields */</div><div class='del'>-	STRING_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME,   "full_name", "cn" ),</div><div class='del'>-	STRING_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),</div><div class='del'>-</div><div class='del'>-	/* email addresses */</div><div class='del'>-	COMPLEX_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate, email_ber, email_compare),</div><div class='del'>-</div><div class='del'>-	/* phone numbers */</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone", "primaryPhone"),</div><div class='del'>-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone", "telephoneNumber", business_populate, business_ber, business_compare),</div><div class='del'>-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone", "homePhone", homephone_populate, homephone_ber, homephone_compare),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone", "mobile"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone", "carPhone"),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax", "facsimileTelephoneNumber"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax", "homeFacsimileTelephoneNumber"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone", "otherPhone"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_fax", "otherFacsimileTelephoneNumber"), </div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn", "internationaliSDNNumber"), </div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager", "pager"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio", "radio"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex", "telex"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", "assistantPhone"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone", "companyPhone"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone", "callbackPhone"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TTYTDD,       "tty", "tty"),</div><div class='del'>-</div><div class='del'>-	/* org information */</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG,       "org",       "o"),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG_UNIT,  "org_unit",  "ou"),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_OFFICE,    "office",    "roomNumber"),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_TITLE,     "title",     "title"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ROLE,      "role",      "businessRole"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MANAGER,   "manager",   "managerName"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistantName"), </div><div class='del'>-</div><div class='del'>-	/* addresses */</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, "business_address", "postalAddress"),</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_HOME,     "home_address",     "homePostalAddress"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,    "other_address",    "otherPostalAddress"),</div><div class='del'>-</div><div class='del'>-	/* misc fields */</div><div class='del'>-	STRING_PROP (E_CARD_SIMPLE_FIELD_URL,           "url", "labeledURI"),</div><div class='del'>-	/* map nickname to displayName */</div><div class='del'>-	STRING_PROP   (E_CARD_SIMPLE_FIELD_NICKNAME,    "nickname",  "displayName"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_SPOUSE,      "spouse", "spouseName"), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_NOTE,        "note", "note"), </div><div class='del'>-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_ANNIVERSARY, "anniversary", "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), </div><div class='del'>-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE,  "birth_date", "birthDate", birthday_populate, birthday_ber, birthday_compare), </div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER,      "mailer", "mailer"), </div><div class='del'>-</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS,     "file_as", "fileAs"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES,  "categories", "categories"),</div><div class='del'>-</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI,      "caluri", "calendarURI"),</div><div class='del'>-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL,       "fburl", "freeBusyURI")</div><div class='del'>-</div><div class='del'>-/*  	E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#undef E_STRING_PROP</div><div class='del'>-#undef STRING_PROP</div><div class='del'>-#undef E_COMPLEX_PROP</div><div class='del'>-#undef COMPLEX_PROP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_view (int msgid, LDAPOp *op, PASBookView *view)</div><div class='del'>-{</div><div class='del'>-	if (op-&gt;view == view)</div><div class='del'>-		op-&gt;view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Addressbook_Book    corba_book;</div><div class='del'>-	PASBook           *book = (PASBook *)data;</div><div class='del'>-	PASBackendLDAP    *bl;</div><div class='del'>-	GList             *list;</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP(pas_book_get_backend(book));</div><div class='del'>-	for (list = bl-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-		PASBackendLDAPBookView *view = list-&gt;data;</div><div class='del'>-		if (view-&gt;book_view == PAS_BOOK_VIEW(object)) {</div><div class='del'>-			/* if we have an active search, interrupt it */</div><div class='del'>-			if (view-&gt;search_op)</div><div class='del'>-				ldap_op_finished (view-&gt;search_op);</div><div class='del'>-			/* and remove us as the view for any other</div><div class='del'>-                           operations that might be using us to spew</div><div class='del'>-                           status messages to the gui */</div><div class='del'>-			g_hash_table_foreach (bl-&gt;priv-&gt;id_to_op, (GHFunc)remove_view, view-&gt;book_view);</div><div class='del'>-			g_free (view-&gt;search);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (view-&gt;card_sexp));</div><div class='del'>-			g_free (view);</div><div class='del'>-			bl-&gt;priv-&gt;book_views = g_list_remove_link(bl-&gt;priv-&gt;book_views, list);</div><div class='del'>-			g_list_free_1(list);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("view_destroy: Exception unreffing "</div><div class='del'>-			  "corba book.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_to_supported_fields (PASBackendLDAP *bl, char **attrs, GHashTable *attr_hash)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; attrs[i]; i ++) {</div><div class='del'>-		char *query_prop = g_hash_table_lookup (attr_hash, attrs[i]);</div><div class='del'>-</div><div class='del'>-		if (query_prop) {</div><div class='del'>-			e_list_append (bl-&gt;priv-&gt;supported_fields, query_prop);</div><div class='del'>-</div><div class='del'>-			/* handle the list attributes here */</div><div class='del'>-			if (!strcmp (query_prop, "email")) {</div><div class='del'>-				e_list_append (bl-&gt;priv-&gt;supported_fields, "email_2");</div><div class='del'>-				e_list_append (bl-&gt;priv-&gt;supported_fields, "email_3");</div><div class='del'>-			}</div><div class='del'>-			else if (!strcmp (query_prop, "business_phone")) {</div><div class='del'>-				e_list_append (bl-&gt;priv-&gt;supported_fields, "business_phone_2");</div><div class='del'>-			}</div><div class='del'>-			else if (!strcmp (query_prop, "home_phone")) {</div><div class='del'>-				e_list_append (bl-&gt;priv-&gt;supported_fields, "home_phone_2");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_oc_attributes_to_supported_fields (PASBackendLDAP *bl, LDAPObjectClass *oc)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GHashTable *attr_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_prop_infos; i ++)</div><div class='del'>-		g_hash_table_insert (attr_hash, prop_info[i].ldap_attr, prop_info[i].query_prop);</div><div class='del'>-</div><div class='del'>-	if (oc-&gt;oc_at_oids_must)</div><div class='del'>-		add_to_supported_fields (bl, oc-&gt;oc_at_oids_must, attr_hash);</div><div class='del'>-</div><div class='del'>-	if (oc-&gt;oc_at_oids_may)</div><div class='del'>-		add_to_supported_fields (bl, oc-&gt;oc_at_oids_may, attr_hash);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (attr_hash);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_schema_support (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-	char *attrs[2];</div><div class='del'>-	LDAPMessage *resp;</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	if (!bl-&gt;priv-&gt;schema_dn)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;schema_checked = TRUE;</div><div class='del'>-</div><div class='del'>-	attrs[0] = "objectClasses";</div><div class='del'>-	attrs[1] = NULL;</div><div class='del'>-</div><div class='del'>-	if (ldap_search_ext_s (ldap, bl-&gt;priv-&gt;schema_dn, LDAP_SCOPE_BASE,</div><div class='del'>-			       "(objectClass=subschema)", attrs, 0,</div><div class='del'>-			       NULL, NULL, NULL, 0, &amp;resp) == LDAP_SUCCESS) {</div><div class='del'>-		char **values;</div><div class='del'>-</div><div class='del'>-		values = ldap_get_values (ldap, resp, "objectClasses");</div><div class='del'>-</div><div class='del'>-		if (values) {</div><div class='del'>-			int i;</div><div class='del'>-			for (i = 0; values[i]; i ++) {</div><div class='del'>-				int j;</div><div class='del'>-				int code;</div><div class='del'>-				const char *err;</div><div class='del'>-				LDAPObjectClass *oc = ldap_str2objectclass (values[i], &amp;code, &amp;err, 0);</div><div class='del'>-</div><div class='del'>-				if (!oc)</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				for (j = 0; oc-&gt;oc_names[j]; j++)</div><div class='del'>-					if (!g_strcasecmp (oc-&gt;oc_names[j], EVOLUTIONPERSON)) {</div><div class='del'>-						g_print ("support found on ldap server for objectclass evolutionPerson\n");</div><div class='del'>-						bl-&gt;priv-&gt;evolutionPersonSupported = TRUE;</div><div class='del'>-</div><div class='del'>-						add_oc_attributes_to_supported_fields (bl, oc);</div><div class='del'>-					}</div><div class='del'>-					else if (!g_strcasecmp (oc-&gt;oc_names[j], INETORGPERSON)</div><div class='del'>-						 || !g_strcasecmp (oc-&gt;oc_names[j], ORGANIZATIONALPERSON)</div><div class='del'>-						 || !g_strcasecmp (oc-&gt;oc_names[j], PERSON)) {</div><div class='del'>-						add_oc_attributes_to_supported_fields (bl, oc);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-				ldap_objectclass_free (oc);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ldap_value_free (values);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_msgfree (resp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_ldap_library_info ()</div><div class='del'>-{</div><div class='del'>-	LDAPAPIInfo info;</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-</div><div class='del'>-	if (LDAP_SUCCESS != ldap_create (&amp;ldap)) {</div><div class='del'>-		g_warning ("couldn't create LDAP* for getting at the client lib api info");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info.ldapai_info_version = LDAP_API_INFO_VERSION;</div><div class='del'>-</div><div class='del'>-	if (LDAP_OPT_SUCCESS != ldap_get_option (ldap, LDAP_OPT_API_INFO, &amp;info)) {</div><div class='del'>-		g_warning ("couldn't get ldap api info");</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		int i;</div><div class='del'>-		g_message ("libldap vendor/version: %s %2d.%02d.%02d",</div><div class='del'>-			   info.ldapai_vendor_name,</div><div class='del'>-			   info.ldapai_vendor_version / 10000,</div><div class='del'>-			   (info.ldapai_vendor_version % 10000) / 1000,</div><div class='del'>-			   info.ldapai_vendor_version % 1000);</div><div class='del'>-</div><div class='del'>-		g_message ("extensions present:");</div><div class='del'>-		/* yuck.  we have to free these? */</div><div class='del'>-		for (i = 0; info.ldapai_extensions[i]; i++) {</div><div class='del'>-			char *extension = info.ldapai_extensions[i];</div><div class='del'>-			g_message (extension);</div><div class='del'>-			ldap_memfree (extension);</div><div class='del'>-		}</div><div class='del'>-		ldap_memfree (info.ldapai_extensions);</div><div class='del'>-		ldap_memfree (info.ldapai_vendor_name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_unbind_ext_s (ldap, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-query_ldap_root_dse (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-#define MAX_DSE_ATTRS 20</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	LDAPMessage *resp;</div><div class='del'>-	int ldap_error;</div><div class='del'>-	char *attrs[MAX_DSE_ATTRS], **values;</div><div class='del'>-	int i = 0;</div><div class='del'>-	struct timeval timeout;</div><div class='del'>-</div><div class='del'>-	attrs[i++] = "supportedControl";</div><div class='del'>-	attrs[i++] = "supportedExtension";</div><div class='del'>-	attrs[i++] = "supportedFeatures";</div><div class='del'>-	attrs[i++] = "supportedSASLMechanisms";</div><div class='del'>-	attrs[i++] = "supportedLDAPVersion";</div><div class='del'>-	attrs[i++] = "subschemaSubentry"; /* OpenLDAP's dn for schema information */</div><div class='del'>-	attrs[i++] = "schemaNamingContext"; /* Active directory's dn for schema information */</div><div class='del'>-	attrs[i] = NULL;</div><div class='del'>-</div><div class='del'>-	timeout.tv_sec = 0;</div><div class='del'>-	timeout.tv_usec = LDAP_RESULT_TIMEOUT_MILLIS * 1000;</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_search_ext_s (ldap,</div><div class='del'>-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,</div><div class='del'>-					"(objectclass=*)",</div><div class='del'>-					attrs, 0, NULL, NULL, NULL, 0, &amp;resp);</div><div class='del'>-	if (ldap_error != LDAP_SUCCESS) {</div><div class='del'>-		g_warning ("could not perform query on Root DSE");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "supportedControl");</div><div class='del'>-	if (values) {</div><div class='del'>-		for (i = 0; values[i]; i++)</div><div class='del'>-			g_message ("supported server control: %s", values[i]);</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "supportedExtension");</div><div class='del'>-	if (values) {</div><div class='del'>-		for (i = 0; values[i]; i++) {</div><div class='del'>-			g_message ("supported server extension: %s", values[i]);</div><div class='del'>-			if (!strcmp (values[i], LDAP_EXOP_START_TLS)) {</div><div class='del'>-				g_message ("server reports LDAP_EXOP_START_TLS");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "supportedSASLMechanisms");</div><div class='del'>-	if (values) {</div><div class='del'>-		for (i = 0; values[i]; i++)</div><div class='del'>-			g_message ("supported SASL mechanism: %s", values[i]);</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "supportedLDAPVersion");</div><div class='del'>-	if (values) {</div><div class='del'>-		for (i = 0; values[i]; i++)</div><div class='del'>-			if (LDAP_VERSION3 == atoi (values[i]))</div><div class='del'>-				bl-&gt;priv-&gt;ldap_v3 = TRUE;</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "subschemaSubentry");</div><div class='del'>-	if (!values || !values[0]) {</div><div class='del'>-		if (values) ldap_value_free (values);</div><div class='del'>-		values = ldap_get_values (ldap, resp, "schemaNamingContext");</div><div class='del'>-	}</div><div class='del'>-	if (values &amp;&amp; values[0]) {</div><div class='del'>-		bl-&gt;priv-&gt;schema_dn = g_strdup (values[0]);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("could not determine location of schema information on LDAP server");</div><div class='del'>-	}</div><div class='del'>-	if (values)</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-</div><div class='del'>-	ldap_msgfree (resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Addressbook_BookListener_CallStatus</div><div class='del'>-pas_backend_ldap_connect (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPPrivate *blpriv = bl-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* close connection first if it's open first */</div><div class='del'>-	if (blpriv-&gt;ldap)</div><div class='del'>-		ldap_unbind (blpriv-&gt;ldap);</div><div class='del'>-</div><div class='del'>-	blpriv-&gt;ldap = ldap_init (blpriv-&gt;ldap_host, blpriv-&gt;ldap_port);</div><div class='del'>-#if defined (DEBUG) &amp;&amp; defined (LDAP_OPT_DEBUG_LEVEL)</div><div class='del'>-	{</div><div class='del'>-		int debug_level = 4;</div><div class='del'>-		ldap_set_option (blpriv-&gt;ldap, LDAP_OPT_DEBUG_LEVEL, &amp;debug_level);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (NULL != blpriv-&gt;ldap) {</div><div class='del'>-		int ldap_error;</div><div class='del'>-</div><div class='del'>-		if (bl-&gt;priv-&gt;use_tls) {</div><div class='del'>-			ldap_error = ldap_start_tls_s (blpriv-&gt;ldap, NULL, NULL);</div><div class='del'>-			if (LDAP_SUCCESS != ldap_error) {</div><div class='del'>-				if (bl-&gt;priv-&gt;use_tls == PAS_BACKEND_LDAP_TLS_ALWAYS) {</div><div class='del'>-					g_message ("TLS not available (fatal version), (ldap_error 0x%02x)", ldap_error);</div><div class='del'>-					ldap_unbind (blpriv-&gt;ldap);</div><div class='del'>-					blpriv-&gt;ldap = NULL;</div><div class='del'>-					return GNOME_Evolution_Addressbook_BookListener_TLSNotAvailable;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					g_message ("TLS not available (ldap_error 0x%02x)", ldap_error);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else</div><div class='del'>-				g_message ("TLS active");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		query_ldap_root_dse (bl);</div><div class='del'>-</div><div class='del'>-		if (bl-&gt;priv-&gt;ldap_v3) {</div><div class='del'>-			int protocol_version = LDAP_VERSION3;</div><div class='del'>-			ldap_error = ldap_set_option (blpriv-&gt;ldap, LDAP_OPT_PROTOCOL_VERSION, &amp;protocol_version);</div><div class='del'>-			if (LDAP_OPT_SUCCESS != ldap_error) {</div><div class='del'>-				g_warning ("failed to set protocol version to LDAPv3");</div><div class='del'>-				bl-&gt;priv-&gt;ldap_v3 = FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		blpriv-&gt;connected = TRUE;</div><div class='del'>-</div><div class='del'>-		/* check to see if evolutionPerson is supported, if we can (me</div><div class='del'>-		   might not be able to if we can't authenticate.  if we</div><div class='del'>-		   can't, try again in auth_user.) */</div><div class='del'>-		check_schema_support (bl);</div><div class='del'>-</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_Success;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("pas_backend_ldap_connect failed for "</div><div class='del'>-			   "'ldap://%s:%d/%s'\n",</div><div class='del'>-			   blpriv-&gt;ldap_host,</div><div class='del'>-			   blpriv-&gt;ldap_port,</div><div class='del'>-			   blpriv-&gt;ldap_rootdn ? blpriv-&gt;ldap_rootdn : "");</div><div class='del'>-		blpriv-&gt;connected = FALSE;</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_add (LDAPOp *op, PASBackend *backend,</div><div class='del'>-	     PASBook *book, PASBookView *view,</div><div class='del'>-	     int id,</div><div class='del'>-	     LDAPOpHandler handler, LDAPOpDtor dtor)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	op-&gt;backend = backend;</div><div class='del'>-	op-&gt;book = book;</div><div class='del'>-	op-&gt;view = view;</div><div class='del'>-	op-&gt;id = id;</div><div class='del'>-	op-&gt;handler = handler;</div><div class='del'>-	op-&gt;dtor = dtor;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (bl-&gt;priv-&gt;id_to_op,</div><div class='del'>-			     &amp;op-&gt;id, op);</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;active_ops ++;</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;poll_timeout == -1)</div><div class='del'>-		bl-&gt;priv-&gt;poll_timeout = g_timeout_add (LDAP_POLL_INTERVAL,</div><div class='del'>-							(GSourceFunc) poll_ldap,</div><div class='del'>-							bl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_finished (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend = op-&gt;backend;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (bl-&gt;priv-&gt;id_to_op, &amp;op-&gt;id);</div><div class='del'>-</div><div class='del'>-	/* should handle errors here */</div><div class='del'>-	ldap_abandon (bl-&gt;priv-&gt;ldap, op-&gt;id);</div><div class='del'>-</div><div class='del'>-	op-&gt;dtor (op);</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;active_ops--;</div><div class='del'>-	if (bl-&gt;priv-&gt;active_ops == 0) {</div><div class='del'>-		if (bl-&gt;priv-&gt;poll_timeout != -1)</div><div class='del'>-			g_source_remove (bl-&gt;priv-&gt;poll_timeout);</div><div class='del'>-		bl-&gt;priv-&gt;poll_timeout = -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_change_id (LDAPOp *op, int msg_id)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend = op-&gt;backend;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (bl-&gt;priv-&gt;id_to_op, &amp;op-&gt;id);</div><div class='del'>-</div><div class='del'>-	op-&gt;id = msg_id;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (bl-&gt;priv-&gt;id_to_op,</div><div class='del'>-			     &amp;op-&gt;id, op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ldap_error_to_response (int ldap_error)</div><div class='del'>-{</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_Success;</div><div class='del'>-	else if (LDAP_NAME_ERROR (ldap_error))</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_CardNotFound;</div><div class='del'>-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;</div><div class='del'>-	else if (ldap_error == LDAP_SERVER_DOWN)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;</div><div class='del'>-	else if (ldap_error == LDAP_ALREADY_EXISTS)</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists;</div><div class='del'>-	else</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-create_dn_from_ecard (ECardSimple *card, const char *root_dn)</div><div class='del'>-{</div><div class='del'>-	char *cn, *cn_part = NULL;</div><div class='del'>-	char *dn;</div><div class='del'>-</div><div class='del'>-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);</div><div class='del'>-	if (cn) {</div><div class='del'>-		if (strchr (cn, ',')) {</div><div class='del'>-			/* need to escape commas */</div><div class='del'>-			char *new_cn = g_malloc0 (strlen (cn) * 3 + 1);</div><div class='del'>-			int i, j;</div><div class='del'>-</div><div class='del'>-			for (i = 0, j = 0; i &lt; strlen (cn); i ++) {</div><div class='del'>-				if (cn[i] == ',') {</div><div class='del'>-					sprintf (new_cn + j, "%%%02X", cn[i]);</div><div class='del'>-					j += 3;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					new_cn[j++] = cn[i];</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			cn_part = g_strdup_printf ("cn=%s", new_cn);</div><div class='del'>-			g_free (new_cn);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			cn_part = g_strdup_printf ("cn=%s", cn);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		cn_part = g_strdup ("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn = g_strdup_printf ("%s%s%s", cn_part,</div><div class='del'>-			      (root_dn &amp;&amp; strlen(root_dn)) ? "," : "",</div><div class='del'>-			      (root_dn &amp;&amp; strlen(root_dn)) ? root_dn: "");</div><div class='del'>-</div><div class='del'>-	g_free (cn_part);</div><div class='del'>-</div><div class='del'>-	g_print ("generated dn: %s\n", dn);</div><div class='del'>-</div><div class='del'>-	return dn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_mods (GPtrArray *mods)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	LDAPMod *mod;</div><div class='del'>-</div><div class='del'>-	while ((mod = g_ptr_array_index (mods, i++))) {</div><div class='del'>-		int j;</div><div class='del'>-		g_free (mod-&gt;mod_type);</div><div class='del'>-</div><div class='del'>-		if (mod-&gt;mod_op &amp; LDAP_MOD_BVALUES) {</div><div class='del'>-			for (j = 0; mod-&gt;mod_bvalues[j]; j++) {</div><div class='del'>-				g_free (mod-&gt;mod_bvalues[j]-&gt;bv_val);</div><div class='del'>-				g_free (mod-&gt;mod_bvalues[j]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			for (j = 0; mod-&gt;mod_values[j]; j++)</div><div class='del'>-				g_free (mod-&gt;mod_values[j]);</div><div class='del'>-		}</div><div class='del'>-		g_free (mod);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (mods, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray*</div><div class='del'>-build_mods_from_ecards (PASBackendLDAP *bl, ECardSimple *current, ECardSimple *new, gboolean *new_dn_needed)</div><div class='del'>-{</div><div class='del'>-	gboolean adding = (current == NULL);</div><div class='del'>-	GPtrArray *result = g_ptr_array_new();</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (new_dn_needed)</div><div class='del'>-		*new_dn_needed = FALSE;</div><div class='del'>-</div><div class='del'>-	/* we walk down the list of properties we can deal with (that</div><div class='del'>-	 big table at the top of the file) */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-		gboolean include;</div><div class='del'>-		gboolean new_prop_present = FALSE;</div><div class='del'>-		gboolean current_prop_present = FALSE;</div><div class='del'>-		struct berval** new_prop_bers = NULL;</div><div class='del'>-		char *new_prop = NULL;</div><div class='del'>-		char *current_prop = NULL;</div><div class='del'>-</div><div class='del'>-		/* XXX if it's an evolutionPerson prop and the ldap</div><div class='del'>-                   server doesn't support that objectclass, skip it. */</div><div class='del'>-		if (prop_info[i].prop_type &amp; PROP_EVOLVE &amp;&amp; !bl-&gt;priv-&gt;evolutionPersonSupported)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* get the value for the new card, and compare it to</div><div class='del'>-                   the value in the current card to see if we should</div><div class='del'>-                   update it -- if adding is TRUE, short circuit the</div><div class='del'>-                   check. */</div><div class='del'>-		if (prop_info[i].prop_type &amp; PROP_TYPE_STRING) {</div><div class='del'>-			new_prop = e_card_simple_get (new, prop_info[i].field_id);</div><div class='del'>-			new_prop_present = (new_prop != NULL);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			new_prop_bers = prop_info[i].ber_func (new);</div><div class='del'>-			new_prop_present = (new_prop_bers != NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* need to set INCLUDE to true if the field needs to</div><div class='del'>-                   show up in the ldap modify request */</div><div class='del'>-		if (adding) {</div><div class='del'>-			/* if we're creating a new card, include it if the</div><div class='del'>-                           field is there at all */</div><div class='del'>-			if (prop_info[i].prop_type &amp; PROP_TYPE_STRING)</div><div class='del'>-				include = (new_prop_present &amp;&amp; *new_prop); /* empty strings cause problems */</div><div class='del'>-			else</div><div class='del'>-				include = new_prop_present;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* if we're modifying an existing card,</div><div class='del'>-                           include it if the current field value is</div><div class='del'>-                           different than the new one, if it didn't</div><div class='del'>-                           exist previously, or if it's been</div><div class='del'>-                           removed. */</div><div class='del'>-			if (prop_info[i].prop_type &amp; PROP_TYPE_STRING) {</div><div class='del'>-				current_prop = e_card_simple_get (current, prop_info[i].field_id);</div><div class='del'>-				current_prop_present = (current_prop != NULL);</div><div class='del'>-</div><div class='del'>-				if (new_prop &amp;&amp; current_prop)</div><div class='del'>-					include = *new_prop &amp;&amp; strcmp (new_prop, current_prop);</div><div class='del'>-				else</div><div class='del'>-					include = (!!new_prop != !!current_prop);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				int j;</div><div class='del'>-				struct berval **current_prop_bers = prop_info[i].ber_func (current);</div><div class='del'>-</div><div class='del'>-				current_prop_present = (current_prop_bers != NULL);</div><div class='del'>-</div><div class='del'>-				/* free up the current_prop_bers */</div><div class='del'>-				if (current_prop_bers) {</div><div class='del'>-					for (j = 0; current_prop_bers[j]; j++) {</div><div class='del'>-						g_free (current_prop_bers[j]-&gt;bv_val);</div><div class='del'>-						g_free (current_prop_bers[j]);</div><div class='del'>-					}</div><div class='del'>-					g_free (current_prop_bers);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				include = !prop_info[i].compare_func (new, current);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (include) {</div><div class='del'>-			LDAPMod *mod = g_new (LDAPMod, 1);</div><div class='del'>-</div><div class='del'>-			/* the included attribute has changed - we</div><div class='del'>-                           need to update the dn if it's one of the</div><div class='del'>-                           attributes we compute the dn from. */</div><div class='del'>-			if (new_dn_needed)</div><div class='del'>-				*new_dn_needed |= prop_info[i].prop_type &amp; PROP_DN;</div><div class='del'>-</div><div class='del'>-			if (adding) {</div><div class='del'>-				mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if (!new_prop_present)</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_DELETE;</div><div class='del'>-				else if (!current_prop_present)</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-				else</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_REPLACE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			mod-&gt;mod_type = g_strdup (prop_info[i].ldap_attr);</div><div class='del'>-</div><div class='del'>-			if (prop_info[i].prop_type &amp; PROP_TYPE_STRING) {</div><div class='del'>-				mod-&gt;mod_values = g_new (char*, 2);</div><div class='del'>-				mod-&gt;mod_values[0] = new_prop;</div><div class='del'>-				mod-&gt;mod_values[1] = NULL;</div><div class='del'>-			}</div><div class='del'>-			else { /* PROP_TYPE_COMPLEX */</div><div class='del'>-				mod-&gt;mod_op |= LDAP_MOD_BVALUES;</div><div class='del'>-				mod-&gt;mod_bvalues = new_prop_bers;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_ptr_array_add (result, mod);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* NULL terminate the list of modifications */</div><div class='del'>-	g_ptr_array_add (result, NULL);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array, GList *existing_objectclasses)</div><div class='del'>-{</div><div class='del'>-	LDAPMod *objectclass_mod;</div><div class='del'>-</div><div class='del'>-	if (existing_objectclasses) {</div><div class='del'>-		int i = 0;</div><div class='del'>-</div><div class='del'>-		objectclass_mod = g_new (LDAPMod, 1);</div><div class='del'>-		objectclass_mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-		objectclass_mod-&gt;mod_type = g_strdup ("objectClass");</div><div class='del'>-		objectclass_mod-&gt;mod_values = g_new (char*, bl-&gt;priv-&gt;evolutionPersonSupported ? 6 : 5);</div><div class='del'>-</div><div class='del'>-		/* yes, this is a linear search for each of our</div><div class='del'>-                   objectclasses, but really, how many objectclasses</div><div class='del'>-                   are there going to be in any sane ldap entry? */</div><div class='del'>-#define FIND_INSERT(oc) \</div><div class='del'>-	if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_strcasecmp)) \</div><div class='del'>-	         objectclass_mod-&gt;mod_values[i++] = g_strdup ((oc));</div><div class='del'>-</div><div class='del'>-		FIND_INSERT (TOP);</div><div class='del'>-		FIND_INSERT (PERSON);</div><div class='del'>-		FIND_INSERT (ORGANIZATIONALPERSON);</div><div class='del'>-		FIND_INSERT (INETORGPERSON);</div><div class='del'>-		if (bl-&gt;priv-&gt;evolutionPersonSupported)</div><div class='del'>-			FIND_INSERT (EVOLUTIONPERSON);</div><div class='del'>-		objectclass_mod-&gt;mod_values[i] = NULL;</div><div class='del'>-</div><div class='del'>-		if (i) {</div><div class='del'>-			g_ptr_array_add (mod_array, objectclass_mod);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			g_free (objectclass_mod-&gt;mod_type);</div><div class='del'>-			g_free (objectclass_mod-&gt;mod_values);</div><div class='del'>-			g_free (objectclass_mod);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		objectclass_mod = g_new (LDAPMod, 1);</div><div class='del'>-		objectclass_mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-		objectclass_mod-&gt;mod_type = g_strdup ("objectClass");</div><div class='del'>-		objectclass_mod-&gt;mod_values = g_new (char*, bl-&gt;priv-&gt;evolutionPersonSupported ? 6 : 5);</div><div class='del'>-		objectclass_mod-&gt;mod_values[0] = g_strdup (TOP);</div><div class='del'>-		objectclass_mod-&gt;mod_values[1] = g_strdup (PERSON);</div><div class='del'>-		objectclass_mod-&gt;mod_values[2] = g_strdup (ORGANIZATIONALPERSON);</div><div class='del'>-		objectclass_mod-&gt;mod_values[3] = g_strdup (INETORGPERSON);</div><div class='del'>-		if (bl-&gt;priv-&gt;evolutionPersonSupported) {</div><div class='del'>-			objectclass_mod-&gt;mod_values[4] = g_strdup (EVOLUTIONPERSON);</div><div class='del'>-			objectclass_mod-&gt;mod_values[5] = NULL;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			objectclass_mod-&gt;mod_values[4] = NULL;</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_add (mod_array, objectclass_mod);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *dn;</div><div class='del'>-	ECardSimple *new_card;</div><div class='del'>-} LDAPCreateOp;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int ldap_error;</div><div class='del'>-	int response;</div><div class='del'>-</div><div class='del'>-	if (LDAP_RES_ADD != ldap_msgtype (res)) {</div><div class='del'>-		g_warning ("incorrect msg type %d passed to create_card_handler", ldap_msgtype (res));</div><div class='del'>-		pas_book_respond_create (op-&gt;book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_OtherError,</div><div class='del'>-					 create_op-&gt;dn);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_parse_result (ldap, res, &amp;ldap_error,</div><div class='del'>-			   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		/* the card was created, let's let the views know about it */</div><div class='del'>-		GList *l;</div><div class='del'>-		for (l = bl-&gt;priv-&gt;book_views; l; l = l-&gt;next) {</div><div class='del'>-			CORBA_Environment ev;</div><div class='del'>-			gboolean match;</div><div class='del'>-			PASBackendLDAPBookView *view = l-&gt;data; </div><div class='del'>-</div><div class='del'>-			CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-</div><div class='del'>-			match = pas_backend_card_sexp_match_vcard (view-&gt;card_sexp,</div><div class='del'>-								   e_card_simple_get_vcard_assume_utf8 (create_op-&gt;new_card));</div><div class='del'>-			if (match) {</div><div class='del'>-				char *vcard = e_card_simple_get_vcard_assume_utf8 (create_op-&gt;new_card);</div><div class='del'>-				pas_book_view_notify_add_1 (view-&gt;book_view,</div><div class='del'>-							    vcard);</div><div class='del'>-				g_free (vcard);</div><div class='del'>-			}</div><div class='del'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-</div><div class='del'>-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		ldap_perror (ldap, "create_card");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (op-&gt;view)</div><div class='del'>-		pas_book_view_notify_complete (op-&gt;view);</div><div class='del'>-</div><div class='del'>-	/* and lastly respond */</div><div class='del'>-	response = ldap_error_to_response (ldap_error);</div><div class='del'>-	pas_book_respond_create (op-&gt;book,</div><div class='del'>-				 response,</div><div class='del'>-				 create_op-&gt;dn);</div><div class='del'>-</div><div class='del'>-	ldap_op_finished (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (create_op-&gt;dn);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (create_op-&gt;new_card));</div><div class='del'>-	g_free (create_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_create_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	PASBookView *book_view = NULL;</div><div class='del'>-	int create_card_msgid;</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	int response;</div><div class='del'>-	int err;</div><div class='del'>-	GPtrArray *mod_array;</div><div class='del'>-	LDAPMod **ldap_mods;</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;book_views) {</div><div class='del'>-		PASBackendLDAPBookView *v = bl-&gt;priv-&gt;book_views-&gt;data;</div><div class='del'>-		book_view = v-&gt;book_view;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf ("vcard = %s\n", req-&gt;create.vcard);</div><div class='del'>-</div><div class='del'>-	new_ecard = e_card_new (req-&gt;create.vcard);</div><div class='del'>-	create_op-&gt;new_card = e_card_simple_new (new_ecard);</div><div class='del'>-</div><div class='del'>-	create_op-&gt;dn = create_dn_from_ecard (create_op-&gt;new_card, bl-&gt;priv-&gt;ldap_rootdn);</div><div class='del'>-	e_card_simple_set_id (create_op-&gt;new_card, create_op-&gt;dn); /* for the notification code below */</div><div class='del'>-</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	/* build our mods */</div><div class='del'>-	mod_array = build_mods_from_ecards (bl, NULL, create_op-&gt;new_card, NULL);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (!mod_array) {</div><div class='del'>-		/* there's an illegal field in there.  report</div><div class='del'>-                   UnsupportedAttribute back */</div><div class='del'>-		pas_book_respond_create (book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_UnsupportedField,</div><div class='del'>-					 create_op-&gt;dn);</div><div class='del'>-</div><div class='del'>-		g_free (create_op-&gt;dn);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(create_op-&gt;new_card));</div><div class='del'>-		g_free (create_op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* remove the NULL at the end */</div><div class='del'>-	g_ptr_array_remove (mod_array, NULL);</div><div class='del'>-</div><div class='del'>-	/* add our objectclass(es) */</div><div class='del'>-	add_objectclass_mod (bl, mod_array, NULL);</div><div class='del'>-</div><div class='del'>-	/* then put the NULL back */</div><div class='del'>-	g_ptr_array_add (mod_array, NULL);</div><div class='del'>-</div><div class='del'>-#ifdef LDAP_DEBUG_ADD</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-		printf ("Sending the following to the server as ADD\n");</div><div class='del'>-</div><div class='del'>-		for (i = 0; g_ptr_array_index(mod_array, i); i ++) {</div><div class='del'>-			LDAPMod *mod = g_ptr_array_index(mod_array, i);</div><div class='del'>-			if (mod-&gt;mod_op &amp; LDAP_MOD_DELETE)</div><div class='del'>-				printf ("del ");</div><div class='del'>-			else if (mod-&gt;mod_op &amp; LDAP_MOD_REPLACE)</div><div class='del'>-				printf ("rep ");</div><div class='del'>-			else</div><div class='del'>-				printf ("add ");</div><div class='del'>-			if (mod-&gt;mod_op &amp; LDAP_MOD_BVALUES)</div><div class='del'>-				printf ("ber ");</div><div class='del'>-			else</div><div class='del'>-				printf ("    ");</div><div class='del'>-</div><div class='del'>-			printf (" %s:\n", mod-&gt;mod_type);</div><div class='del'>-</div><div class='del'>-			if (mod-&gt;mod_op &amp; LDAP_MOD_BVALUES) {</div><div class='del'>-				int j;</div><div class='del'>-				for (j = 0; mod-&gt;mod_bvalues[j] &amp;&amp; mod-&gt;mod_bvalues[j]-&gt;bv_val; j++)</div><div class='del'>-					printf ("\t\t'%s'\n", mod-&gt;mod_bvalues[j]-&gt;bv_val);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				int j;</div><div class='del'>-</div><div class='del'>-				for (j = 0; mod-&gt;mod_values[j]; j++)</div><div class='del'>-					printf ("\t\t'%s'\n", mod-&gt;mod_values[j]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	ldap_mods = (LDAPMod**)mod_array-&gt;pdata;</div><div class='del'>-</div><div class='del'>-	if (book_view)</div><div class='del'>-		pas_book_view_notify_status_message (book_view, _("Adding card to LDAP server..."));</div><div class='del'>-</div><div class='del'>-	err = ldap_add_ext (ldap, create_op-&gt;dn, ldap_mods,</div><div class='del'>-			    NULL, NULL, &amp;create_card_msgid);</div><div class='del'>-</div><div class='del'>-	/* and clean up */</div><div class='del'>-	free_mods (mod_array);</div><div class='del'>-</div><div class='del'>-	if (LDAP_SUCCESS != err) {</div><div class='del'>-		response = ldap_error_to_response (err);</div><div class='del'>-		pas_book_respond_create (create_op-&gt;op.book,</div><div class='del'>-					 response,</div><div class='del'>-					 create_op-&gt;dn);</div><div class='del'>-		create_card_dtor ((LDAPOp*)create_op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_print ("ldap_add_ext returned %d\n", err);</div><div class='del'>-		ldap_op_add ((LDAPOp*)create_op, backend, book,</div><div class='del'>-			     book_view, create_card_msgid,</div><div class='del'>-			     create_card_handler, create_card_dtor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *id;</div><div class='del'>-} LDAPRemoveOp;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	if (LDAP_RES_DELETE != ldap_msgtype (res)) {</div><div class='del'>-		g_warning ("incorrect msg type %d passed to remove_card_handler", ldap_msgtype (res));</div><div class='del'>-		pas_book_respond_remove (op-&gt;book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_parse_result (bl-&gt;priv-&gt;ldap, res, &amp;ldap_error,</div><div class='del'>-			   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		/* the card was removed, let's let the views know about it */</div><div class='del'>-		GList *l;</div><div class='del'>-		for (l = bl-&gt;priv-&gt;book_views; l; l = l-&gt;next) {</div><div class='del'>-			CORBA_Environment ev;</div><div class='del'>-			PASBackendLDAPBookView *view = l-&gt;data; </div><div class='del'>-					</div><div class='del'>-			CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-</div><div class='del'>-			pas_book_view_notify_remove (view-&gt;book_view, remove_op-&gt;id);</div><div class='del'>-</div><div class='del'>-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		ldap_perror (bl-&gt;priv-&gt;ldap, "remove_card");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_respond_remove (remove_op-&gt;op.book,</div><div class='del'>-				 ldap_error_to_response (ldap_error));</div><div class='del'>-</div><div class='del'>-	if (op-&gt;view)</div><div class='del'>-		pas_book_view_notify_complete (op-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (remove_op-&gt;id);</div><div class='del'>-	g_free (remove_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_remove_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	PASBookView *book_view = NULL;</div><div class='del'>-	int remove_msgid;</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;book_views) {</div><div class='del'>-		PASBackendLDAPBookView *v = bl-&gt;priv-&gt;book_views-&gt;data;</div><div class='del'>-		book_view = v-&gt;book_view;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remove_op-&gt;id = g_strdup (req-&gt;remove.id);</div><div class='del'>-</div><div class='del'>-	if (book_view)</div><div class='del'>-		pas_book_view_notify_status_message (book_view, _("Removing card from LDAP server..."));</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_delete_ext (bl-&gt;priv-&gt;ldap,</div><div class='del'>-				      remove_op-&gt;id,</div><div class='del'>-				      NULL, NULL, &amp;remove_msgid);</div><div class='del'>-</div><div class='del'>-	if (ldap_error != LDAP_SUCCESS) {</div><div class='del'>-		pas_book_respond_remove (remove_op-&gt;op.book,</div><div class='del'>-					 ldap_error_to_response (ldap_error));</div><div class='del'>-		remove_card_dtor ((LDAPOp*)remove_op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_print ("ldap_delete_ext returned %d\n", ldap_error);</div><div class='del'>-		ldap_op_add ((LDAPOp*)remove_op, backend, book,</div><div class='del'>-			     book_view, remove_msgid,</div><div class='del'>-			     remove_card_handler, remove_card_dtor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-** MODIFY</div><div class='del'>-**</div><div class='del'>-** The modification request is actually composed of 2 separate</div><div class='del'>-** requests.  Since we need to get a list of theexisting objectclasses</div><div class='del'>-** used by the ldap server for the entry, and since the UI only sends</div><div class='del'>-** us the current card, we need to query the ldap server for the</div><div class='del'>-** existing card.</div><div class='del'>-**</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	const char *id; /* the id of the card we're modifying */</div><div class='del'>-	char *current_vcard; /* current in the LDAP db */</div><div class='del'>-	ECardSimple *current_card;</div><div class='del'>-	char *vcard;         /* the VCard we want to store */</div><div class='del'>-	ECardSimple *card;</div><div class='del'>-	GList *existing_objectclasses;</div><div class='del'>-} LDAPModifyOp;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card_modify_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	if (LDAP_RES_MODIFY != ldap_msgtype (res)) {</div><div class='del'>-		g_warning ("incorrect msg type %d passed to modify_card_handler", ldap_msgtype (res));</div><div class='del'>-		pas_book_respond_modify (op-&gt;book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_parse_result (ldap, res, &amp;ldap_error,</div><div class='del'>-			   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		/* the card was modified, let's let the views know about it */</div><div class='del'>-		GList *l;</div><div class='del'>-		for (l = bl-&gt;priv-&gt;book_views; l; l = l-&gt;next) {</div><div class='del'>-			CORBA_Environment ev;</div><div class='del'>-			gboolean old_match, new_match;</div><div class='del'>-			PASBackendLDAPBookView *view = l-&gt;data; </div><div class='del'>-					</div><div class='del'>-			CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-</div><div class='del'>-			old_match = pas_backend_card_sexp_match_vcard (view-&gt;card_sexp,</div><div class='del'>-								       modify_op-&gt;current_vcard);</div><div class='del'>-			new_match = pas_backend_card_sexp_match_vcard (view-&gt;card_sexp,</div><div class='del'>-								       modify_op-&gt;vcard);</div><div class='del'>-			if (old_match &amp;&amp; new_match)</div><div class='del'>-				pas_book_view_notify_change_1 (view-&gt;book_view, modify_op-&gt;vcard);</div><div class='del'>-			else if (new_match)</div><div class='del'>-				pas_book_view_notify_add_1 (view-&gt;book_view, modify_op-&gt;vcard);</div><div class='del'>-			else /* if (old_match) */</div><div class='del'>-				pas_book_view_notify_remove (view-&gt;book_view, e_card_simple_get_id (modify_op-&gt;card));</div><div class='del'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-</div><div class='del'>-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		ldap_perror (ldap, "ldap_modify_s");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and lastly respond */</div><div class='del'>-	pas_book_respond_modify (op-&gt;book,</div><div class='del'>-				 ldap_error_to_response (ldap_error));</div><div class='del'>-	ldap_op_finished (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card_search_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int msg_type;</div><div class='del'>-</div><div class='del'>-	/* if it's successful, we should get called with a</div><div class='del'>-	   RES_SEARCH_ENTRY and a RES_SEARCH_RESULT.  if it's</div><div class='del'>-	   unsuccessful, we should only see a RES_SEARCH_RESULT */</div><div class='del'>-</div><div class='del'>-	msg_type = ldap_msgtype (res);</div><div class='del'>-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {</div><div class='del'>-		LDAPMessage *e = ldap_first_entry(ldap, res);</div><div class='del'>-</div><div class='del'>-		if (!e) {</div><div class='del'>-			g_warning ("uh, this shouldn't happen");</div><div class='del'>-			pas_book_respond_modify (op-&gt;book,</div><div class='del'>-						 GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-			ldap_op_finished (op);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		modify_op-&gt;current_card = build_card_from_entry (ldap, e,</div><div class='del'>-								 &amp;modify_op-&gt;existing_objectclasses);</div><div class='del'>-		modify_op-&gt;current_vcard = e_card_simple_get_vcard_assume_utf8 (modify_op-&gt;current_card);</div><div class='del'>-	}</div><div class='del'>-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {</div><div class='del'>-		int ldap_error;</div><div class='del'>-		LDAPMod **ldap_mods;</div><div class='del'>-		GPtrArray *mod_array;</div><div class='del'>-		gboolean differences;</div><div class='del'>-		gboolean need_new_dn;</div><div class='del'>-		int modify_card_msgid;</div><div class='del'>-</div><div class='del'>-		/* grab the result code, and set up the actual modify</div><div class='del'>-                   if it was successful */</div><div class='del'>-		ldap_parse_result (bl-&gt;priv-&gt;ldap, res, &amp;ldap_error,</div><div class='del'>-				   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-		if (ldap_error != LDAP_SUCCESS) {</div><div class='del'>-			/* more here i'm sure */</div><div class='del'>-			pas_book_respond_modify (op-&gt;book,</div><div class='del'>-						 ldap_error_to_response (ldap_error));</div><div class='del'>-			ldap_op_finished (op);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* build our mods */</div><div class='del'>-		mod_array = build_mods_from_ecards (bl, modify_op-&gt;current_card, modify_op-&gt;card, &amp;need_new_dn);</div><div class='del'>-		differences = mod_array-&gt;len &gt; 0;</div><div class='del'>-</div><div class='del'>-		if (differences) {</div><div class='del'>-			/* remove the NULL at the end */</div><div class='del'>-			g_ptr_array_remove (mod_array, NULL);</div><div class='del'>-</div><div class='del'>-			/* add our objectclass(es), making sure</div><div class='del'>-			   evolutionPerson is there if it's supported */</div><div class='del'>-			add_objectclass_mod (bl, mod_array, modify_op-&gt;existing_objectclasses);</div><div class='del'>-</div><div class='del'>-			/* then put the NULL back */</div><div class='del'>-			g_ptr_array_add (mod_array, NULL);</div><div class='del'>-</div><div class='del'>-			ldap_mods = (LDAPMod**)mod_array-&gt;pdata;</div><div class='del'>-</div><div class='del'>-			/* actually perform the ldap modify */</div><div class='del'>-			ldap_error = ldap_modify_ext (ldap, modify_op-&gt;id, ldap_mods,</div><div class='del'>-						      NULL, NULL, &amp;modify_card_msgid);</div><div class='del'>-</div><div class='del'>-			if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-				op-&gt;handler = modify_card_modify_handler;</div><div class='del'>-				ldap_op_change_id ((LDAPOp*)modify_op,</div><div class='del'>-						   modify_card_msgid);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				g_warning ("ldap_modify_ext returned %d\n", ldap_error);</div><div class='del'>-				pas_book_respond_modify (op-&gt;book,</div><div class='del'>-							 ldap_error_to_response (ldap_error));</div><div class='del'>-				ldap_op_finished (op);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* and clean up */</div><div class='del'>-		free_mods (mod_array);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unhandled result type %d returned", msg_type);</div><div class='del'>-		pas_book_respond_modify (op-&gt;book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;</div><div class='del'>-</div><div class='del'>-	g_list_foreach (modify_op-&gt;existing_objectclasses, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free (modify_op-&gt;existing_objectclasses);</div><div class='del'>-	g_free (modify_op-&gt;current_vcard);</div><div class='del'>-	if (modify_op-&gt;current_card)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (modify_op-&gt;current_card));</div><div class='del'>-	g_free (modify_op-&gt;vcard);</div><div class='del'>-	if (modify_op-&gt;card)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (modify_op-&gt;card));</div><div class='del'>-	g_free (modify_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_modify_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = g_new0 (LDAPModifyOp, 1);</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	int ldap_error;</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-	int modify_card_msgid;</div><div class='del'>-	PASBookView *book_view = NULL;</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;book_views) {</div><div class='del'>-		PASBackendLDAPBookView *v = bl-&gt;priv-&gt;book_views-&gt;data;</div><div class='del'>-		book_view = v-&gt;book_view;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	modify_op-&gt;vcard = g_strdup (req-&gt;modify.vcard);</div><div class='del'>-	new_ecard = e_card_new (modify_op-&gt;vcard);</div><div class='del'>-	modify_op-&gt;card = e_card_simple_new (new_ecard);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_ecard));</div><div class='del'>-	modify_op-&gt;id = e_card_simple_get_id(modify_op-&gt;card);</div><div class='del'>-</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	if (book_view)</div><div class='del'>-		pas_book_view_notify_status_message (book_view, _("Modifying card from LDAP server..."));</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_search_ext (ldap, modify_op-&gt;id,</div><div class='del'>-				      LDAP_SCOPE_BASE,</div><div class='del'>-				      "(objectclass=*)",</div><div class='del'>-				      NULL, 0, NULL, NULL,</div><div class='del'>-				      NULL, /* XXX timeout */</div><div class='del'>-				      1, &amp;modify_card_msgid);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		ldap_op_add ((LDAPOp*)modify_op, backend, book,</div><div class='del'>-			     book_view, modify_card_msgid,</div><div class='del'>-			     modify_card_search_handler, modify_card_dtor);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("ldap_search_ext returned %d\n", ldap_error);</div><div class='del'>-		pas_book_respond_modify (book,</div><div class='del'>-					 GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-		modify_card_dtor ((LDAPOp*)modify_op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-} LDAPGetVCardOp;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_vcard_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	int msg_type;</div><div class='del'>-</div><div class='del'>-	/* the msg_type will be either SEARCH_ENTRY (if we're</div><div class='del'>-	   successful) or SEARCH_RESULT (if we're not), so we finish</div><div class='del'>-	   the op after either */</div><div class='del'>-	msg_type = ldap_msgtype (res);</div><div class='del'>-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {</div><div class='del'>-		LDAPMessage *e = ldap_first_entry(bl-&gt;priv-&gt;ldap, res);</div><div class='del'>-		ECardSimple *simple;</div><div class='del'>-		char *vcard;</div><div class='del'>-</div><div class='del'>-		if (!e) {</div><div class='del'>-			g_warning ("uh, this shouldn't happen");</div><div class='del'>-			pas_book_respond_get_vcard (op-&gt;book,</div><div class='del'>-						    GNOME_Evolution_Addressbook_BookListener_OtherError,</div><div class='del'>-						    "");</div><div class='del'>-			ldap_op_finished (op);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		simple = build_card_from_entry (bl-&gt;priv-&gt;ldap, e, NULL);</div><div class='del'>-		vcard = e_card_simple_get_vcard_assume_utf8 (simple);</div><div class='del'>-		pas_book_respond_get_vcard (op-&gt;book,</div><div class='del'>-					    GNOME_Evolution_Addressbook_BookListener_Success,</div><div class='del'>-					    vcard);</div><div class='del'>-		g_free (vcard);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {</div><div class='del'>-		int ldap_error;</div><div class='del'>-		ldap_parse_result (bl-&gt;priv-&gt;ldap, res, &amp;ldap_error,</div><div class='del'>-				   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-		pas_book_respond_get_vcard (op-&gt;book, ldap_error_to_response (ldap_error), "");</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unhandled result type %d returned", msg_type);</div><div class='del'>-		pas_book_respond_get_vcard (op-&gt;book, GNOME_Evolution_Addressbook_BookListener_OtherError,</div><div class='del'>-					    "");</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_vcard_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPGetVCardOp *get_vcard_op = (LDAPGetVCardOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (get_vcard_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_get_vcard (PASBackend *backend,</div><div class='del'>-				    PASBook *book,</div><div class='del'>-				    PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPGetVCardOp *get_vcard_op = g_new0 (LDAPGetVCardOp, 1);</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int get_vcard_msgid;</div><div class='del'>-	PASBookView *book_view = NULL;</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;book_views) {</div><div class='del'>-		PASBackendLDAPBookView *v = bl-&gt;priv-&gt;book_views-&gt;data;</div><div class='del'>-		book_view = v-&gt;book_view;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ldap_error = ldap_search_ext (ldap, req-&gt;get_vcard.id,</div><div class='del'>-				      LDAP_SCOPE_BASE,</div><div class='del'>-				      "(objectclass=*)",</div><div class='del'>-				      NULL, 0, NULL, NULL,</div><div class='del'>-				      NULL, /* XXX timeout */</div><div class='del'>-				      1, &amp;get_vcard_msgid);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		ldap_op_add ((LDAPOp*)get_vcard_op, backend, book,</div><div class='del'>-			     book_view, get_vcard_msgid,</div><div class='del'>-			     get_vcard_handler, get_vcard_dtor);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		pas_book_respond_get_vcard (book,</div><div class='del'>-					    ldap_error_to_response (ldap_error),</div><div class='del'>-					    "");</div><div class='del'>-		get_vcard_dtor ((LDAPOp*)get_vcard_op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data;</div><div class='del'>-	gboolean responded; /* if FALSE, we need to free cursor_data in the dtor */</div><div class='del'>-} LDAPGetCursorOp;</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-get_length(PASCardCursor *cursor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	return cursor_data-&gt;num_elements;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_nth(PASCardCursor *cursor, long n, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (n &lt; cursor_data-&gt;num_elements, NULL);</div><div class='del'>-</div><div class='del'>-	return (char*)g_list_nth (cursor_data-&gt;elements, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	if (cursor_data-&gt;book) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		GNOME_Evolution_Addressbook_Book corba_book;</div><div class='del'>-</div><div class='del'>-		corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data-&gt;book));</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Addressbook_Book_unref(corba_book, &amp;ev);</div><div class='del'>-	</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning("cursor_destroy: Exception unreffing "</div><div class='del'>-				  "corba book.\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* free the ldap specific cursor information */</div><div class='del'>-	g_list_foreach (cursor_data-&gt;elements, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free (cursor_data-&gt;elements);</div><div class='del'>-</div><div class='del'>-	g_free(cursor_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int msg_type;</div><div class='del'>-</div><div class='del'>-	msg_type = ldap_msgtype (res);</div><div class='del'>-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {</div><div class='del'>-		LDAPMessage *e;</div><div class='del'>-</div><div class='del'>-		e = ldap_first_entry (ldap, res);</div><div class='del'>-		while (e) {</div><div class='del'>-			ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-			simple = build_card_from_entry (ldap, e, NULL);</div><div class='del'>-			if (simple) {</div><div class='del'>-				char *vcard = e_card_simple_get_vcard_assume_utf8 (simple);</div><div class='del'>-				cursor_op-&gt;cursor_data-&gt;num_elements ++;</div><div class='del'>-				cursor_op-&gt;cursor_data-&gt;elements = g_list_prepend (cursor_op-&gt;cursor_data-&gt;elements,</div><div class='del'>-										   vcard);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {</div><div class='del'>-		PASCardCursor *cursor = CORBA_OBJECT_NIL;</div><div class='del'>-		int ldap_error;</div><div class='del'>-		ldap_parse_result (bl-&gt;priv-&gt;ldap, res, &amp;ldap_error,</div><div class='del'>-				   NULL, NULL, NULL, NULL, 0);</div><div class='del'>-</div><div class='del'>-		if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-			cursor = pas_card_cursor_new(get_length,</div><div class='del'>-						     get_nth,</div><div class='del'>-						     cursor_op-&gt;cursor_data);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect(GTK_OBJECT(cursor), "destroy",</div><div class='del'>-					   GTK_SIGNAL_FUNC(cursor_destroy), cursor_op-&gt;cursor_data);</div><div class='del'>-</div><div class='del'>-			cursor_op-&gt;responded = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pas_book_respond_get_cursor (cursor_op-&gt;cursor_data-&gt;book,</div><div class='del'>-					     ldap_error_to_response (ldap_error),</div><div class='del'>-					     cursor);</div><div class='del'>-</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unhandled result type %d returned", msg_type);</div><div class='del'>-		pas_book_respond_get_cursor (op-&gt;book,</div><div class='del'>-					     GNOME_Evolution_Addressbook_BookListener_OtherError,</div><div class='del'>-					     CORBA_OBJECT_NIL);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;</div><div class='del'>-</div><div class='del'>-	if (!cursor_op-&gt;responded) {</div><div class='del'>-		cursor_destroy (NULL, cursor_op-&gt;cursor_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_get_cursor (PASBackend *backend,</div><div class='del'>-				     PASBook    *book,</div><div class='del'>-				     PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	LDAP           *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int            ldap_error;</div><div class='del'>-	int            get_cursor_msgid;</div><div class='del'>-	LDAPGetCursorOp *cursor_op;</div><div class='del'>-</div><div class='del'>-	cursor_op = g_new0 (LDAPGetCursorOp, 1);</div><div class='del'>-	cursor_op-&gt;cursor_data = g_new0 (PASBackendLDAPCursorPrivate, 1);</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_search_ext (ldap,</div><div class='del'>-				      bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-				      bl-&gt;priv-&gt;ldap_scope,</div><div class='del'>-				      "(objectclass=*)",</div><div class='del'>-				      NULL, 0,</div><div class='del'>-				      NULL, NULL, NULL, /* timeout */</div><div class='del'>-				      bl-&gt;priv-&gt;ldap_limit, &amp;get_cursor_msgid);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		GNOME_Evolution_Addressbook_Book corba_book;</div><div class='del'>-</div><div class='del'>-		corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Addressbook_Book_ref(corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-		cursor_op-&gt;cursor_data-&gt;backend = backend;</div><div class='del'>-		cursor_op-&gt;cursor_data-&gt;book = book;</div><div class='del'>-			</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning("pas_backend_ldap_process_get_cursor: Exception reffing "</div><div class='del'>-				  "corba book.\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-		ldap_op_add ((LDAPOp*)cursor_op, backend, book,</div><div class='del'>-			     NULL, get_cursor_msgid, get_cursor_handler, get_cursor_dtor);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		pas_book_respond_get_cursor (book,</div><div class='del'>-					     ldap_error_to_response (ldap_error),</div><div class='del'>-					     CORBA_OBJECT_NIL);</div><div class='del'>-		get_cursor_dtor ((LDAPOp*)cursor_op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* List property functions */</div><div class='del'>-static void</div><div class='del'>-email_populate(ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; values[i] &amp;&amp; i &lt; 3; i ++) {</div><div class='del'>-		e_card_simple_set_email (card, i, values[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-email_ber(ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	struct berval** result;</div><div class='del'>-	const char *emails[3];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	num = 0;</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		emails[i] = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-		if (emails[i])</div><div class='del'>-			num++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	result = g_new (struct berval*, num + 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i ++)</div><div class='del'>-		result[i] = g_new (struct berval, 1);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		if (emails[i]) {</div><div class='del'>-			result[j]-&gt;bv_val = g_strdup (emails[i]);</div><div class='del'>-			result[j++]-&gt;bv_len = strlen (emails[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result[num] = NULL;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-email_compare (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	const char *email1, *email2;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		gboolean equal;</div><div class='del'>-		email1 = e_card_simple_get_email (ecard1, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-		email2 = e_card_simple_get_email (ecard2, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-</div><div class='del'>-		if (email1 &amp;&amp; email2)</div><div class='del'>-			equal = !strcmp (email1, email2);</div><div class='del'>-		else</div><div class='del'>-			equal = (!!email1 == !!email2);</div><div class='del'>-</div><div class='del'>-		if (!equal)</div><div class='del'>-			return equal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-homephone_populate(ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	if (values[0])</div><div class='del'>-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME, values[0]);</div><div class='del'>-	if (values[1])</div><div class='del'>-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2, values[1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-homephone_ber(ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	struct berval** result;</div><div class='del'>-	const char *homephones[3];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	num = 0;</div><div class='del'>-	if ((homephones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME)))</div><div class='del'>-		num++;</div><div class='del'>-	if ((homephones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2)))</div><div class='del'>-		num++;</div><div class='del'>-</div><div class='del'>-	if (num == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	result = g_new (struct berval*, num + 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i ++)</div><div class='del'>-		result[i] = g_new (struct berval, 1);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; 2; i ++) {</div><div class='del'>-		if (homephones[i]) {</div><div class='del'>-			result[j]-&gt;bv_val = g_strdup (homephones[i]);</div><div class='del'>-			result[j++]-&gt;bv_len = strlen (homephones[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result[num] = NULL;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_HOME, E_CARD_SIMPLE_FIELD_PHONE_HOME_2 };</div><div class='del'>-	const char *phone1, *phone2;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i ++) {</div><div class='del'>-		gboolean equal;</div><div class='del'>-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);</div><div class='del'>-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);</div><div class='del'>-</div><div class='del'>-		if (phone1 &amp;&amp; phone2)</div><div class='del'>-			equal = !strcmp (phone1, phone2);</div><div class='del'>-		else</div><div class='del'>-			equal = (!!phone1 == !!phone2);</div><div class='del'>-</div><div class='del'>-		if (!equal)</div><div class='del'>-			return equal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-business_populate(ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	if (values[0])</div><div class='del'>-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, values[0]);</div><div class='del'>-	if (values[1])</div><div class='del'>-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2, values[1]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-business_ber(ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	struct berval** result;</div><div class='del'>-	const char *business_phones[3];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	num = 0;</div><div class='del'>-	if ((business_phones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS)))</div><div class='del'>-		num++;</div><div class='del'>-	if ((business_phones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2)))</div><div class='del'>-		num++;</div><div class='del'>-</div><div class='del'>-	if (num == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	result = g_new (struct berval*, num + 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i ++)</div><div class='del'>-		result[i] = g_new (struct berval, 1);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; 2; i ++) {</div><div class='del'>-		if (business_phones[i]) {</div><div class='del'>-			result[j]-&gt;bv_val = g_strdup (business_phones[i]);</div><div class='del'>-			result[j++]-&gt;bv_len = strlen (business_phones[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result[num] = NULL;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-business_compare (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2 };</div><div class='del'>-	const char *phone1, *phone2;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 2; i ++) {</div><div class='del'>-		gboolean equal;</div><div class='del'>-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);</div><div class='del'>-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);</div><div class='del'>-</div><div class='del'>-		if (phone1 &amp;&amp; phone2)</div><div class='del'>-			equal = !strcmp (phone1, phone2);</div><div class='del'>-		else</div><div class='del'>-			equal = (!!phone1 == !!phone2);</div><div class='del'>-</div><div class='del'>-		if (!equal)</div><div class='del'>-			return equal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-anniversary_populate (ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	if (values[0]) {</div><div class='del'>-		ECardDate dt = e_card_date_from_string (values[0]);</div><div class='del'>-		gtk_object_set (GTK_OBJECT (card-&gt;card),</div><div class='del'>-				"anniversary", &amp;dt,</div><div class='del'>-				NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-anniversary_ber (ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	ECardDate *dt;</div><div class='del'>-	struct berval** result = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card-&gt;card),</div><div class='del'>-			"anniversary", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (dt) {</div><div class='del'>-		char *anniversary;</div><div class='del'>-</div><div class='del'>-		anniversary = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-		result = g_new (struct berval*, 2);</div><div class='del'>-		result[0] = g_new (struct berval, 1);</div><div class='del'>-		result[0]-&gt;bv_val = anniversary;</div><div class='del'>-		result[0]-&gt;bv_len = strlen (anniversary);</div><div class='del'>-</div><div class='del'>-		result[1] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	ECardDate *dt;</div><div class='del'>-	char *date1 = NULL, *date2 = NULL;</div><div class='del'>-	gboolean equal;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard1-&gt;card),</div><div class='del'>-			"anniversary", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-	if (dt)</div><div class='del'>-		date1 = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard2-&gt;card),</div><div class='del'>-			"anniversary", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-	if (dt)</div><div class='del'>-		date2 = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-	if (date1 &amp;&amp; date2)</div><div class='del'>-		equal = !strcmp (date1, date2);</div><div class='del'>-	else</div><div class='del'>-		equal = (!!date1 == !!date2);</div><div class='del'>-</div><div class='del'>-	g_free (date1);</div><div class='del'>-	g_free (date2);</div><div class='del'>-</div><div class='del'>-	return equal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-birthday_populate (ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	if (values[0]) {</div><div class='del'>-		ECardDate dt = e_card_date_from_string (values[0]);</div><div class='del'>-		gtk_object_set (GTK_OBJECT (card-&gt;card),</div><div class='del'>-				"birth_date", &amp;dt,</div><div class='del'>-				NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-birthday_ber (ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	ECardDate *dt;</div><div class='del'>-	struct berval** result = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card-&gt;card),</div><div class='del'>-			"birth_date", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (dt) {</div><div class='del'>-		char *birthday;</div><div class='del'>-</div><div class='del'>-		birthday = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-		result = g_new (struct berval*, 2);</div><div class='del'>-		result[0] = g_new (struct berval, 1);</div><div class='del'>-		result[0]-&gt;bv_val = birthday;</div><div class='del'>-		result[0]-&gt;bv_len = strlen (birthday);</div><div class='del'>-</div><div class='del'>-		result[1] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	ECardDate *dt;</div><div class='del'>-	char *date1 = NULL, *date2 = NULL;</div><div class='del'>-	gboolean equal;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard1-&gt;card),</div><div class='del'>-			"birth_date", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-	if (dt)</div><div class='del'>-		date1 = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (ecard2-&gt;card),</div><div class='del'>-			"birth_date", &amp;dt,</div><div class='del'>-			NULL);</div><div class='del'>-	if (dt)</div><div class='del'>-		date2 = e_card_date_to_string (dt);</div><div class='del'>-</div><div class='del'>-	if (date1 &amp;&amp; date2)</div><div class='del'>-		equal = !strcmp (date1, date2);</div><div class='del'>-	else</div><div class='del'>-		equal = (!!date1 == !!date2);</div><div class='del'>-</div><div class='del'>-	g_free (date1);</div><div class='del'>-	g_free (date2);</div><div class='del'>-</div><div class='del'>-	return equal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GList *list;</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-} PASBackendLDAPSExpData;</div><div class='del'>-</div><div class='del'>-#define IS_RFC2254_CHAR(c) ((c) == '*' || (c) =='\\' || (c) == '(' || (c) == ')' || (c) == '\0')</div><div class='del'>-static char *</div><div class='del'>-rfc2254_escape(char *str)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int len = strlen(str);</div><div class='del'>-	int newlen = 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i ++) {</div><div class='del'>-		if (IS_RFC2254_CHAR(str[i]))</div><div class='del'>-			newlen += 3;</div><div class='del'>-		else</div><div class='del'>-			newlen ++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len == newlen) {</div><div class='del'>-		return g_strdup (str);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		char *newstr = g_malloc0 (newlen + 1);</div><div class='del'>-		int j = 0;</div><div class='del'>-		for (i = 0; i &lt; len; i ++) {</div><div class='del'>-			if (IS_RFC2254_CHAR(str[i])) {</div><div class='del'>-				sprintf (newstr + j, "\\%02x", str[i]);</div><div class='del'>-				j+= 3;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				newstr[j++] = str[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return newstr;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	char ** strings;</div><div class='del'>-</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		strings = g_new0(char*, argc+3);</div><div class='del'>-		strings[0] = g_strdup ("(&amp;");</div><div class='del'>-		strings[argc+3 - 2] = g_strdup (")");</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; argc; i ++) {</div><div class='del'>-			GList *list_head = ldap_data-&gt;list;</div><div class='del'>-			if (!list_head)</div><div class='del'>-				break;</div><div class='del'>-			strings[argc - i] = list_head-&gt;data;</div><div class='del'>-			ldap_data-&gt;list = g_list_remove_link(list_head, list_head);</div><div class='del'>-			g_list_free_1(list_head);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list, g_strjoinv(" ", strings));</div><div class='del'>-</div><div class='del'>-		for (i = 0 ; i &lt; argc + 2; i ++)</div><div class='del'>-			g_free (strings[i]);</div><div class='del'>-</div><div class='del'>-		g_free (strings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	char ** strings;</div><div class='del'>-</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		strings = g_new0(char*, argc+3);</div><div class='del'>-		strings[0] = g_strdup ("(|");</div><div class='del'>-		strings[argc+3 - 2] = g_strdup (")");</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; argc; i ++) {</div><div class='del'>-			GList *list_head = ldap_data-&gt;list;</div><div class='del'>-			if (!list_head)</div><div class='del'>-				break;</div><div class='del'>-			strings[argc - i] = list_head-&gt;data;</div><div class='del'>-			ldap_data-&gt;list = g_list_remove_link(list_head, list_head);</div><div class='del'>-			g_list_free_1(list_head);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list, g_strjoinv(" ", strings));</div><div class='del'>-</div><div class='del'>-		for (i = 0 ; i &lt; argc + 2; i ++)</div><div class='del'>-			g_free (strings[i]);</div><div class='del'>-</div><div class='del'>-		g_free (strings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	/* just replace the head of the list with the NOT of it. */</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char *term = ldap_data-&gt;list-&gt;data;</div><div class='del'>-		ldap_data-&gt;list-&gt;data = g_strdup_printf("(!%s)", term);</div><div class='del'>-		g_free (term);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc == 2</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; argv[1]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *propname = argv[0]-&gt;value.string;</div><div class='del'>-		char *str = rfc2254_escape(argv[1]-&gt;value.string);</div><div class='del'>-		gboolean one_star = FALSE;</div><div class='del'>-</div><div class='del'>-		if (strlen(str) == 0)</div><div class='del'>-			one_star = TRUE;</div><div class='del'>-</div><div class='del'>-		if (!strcmp (propname, "x-evolution-any-field")) {</div><div class='del'>-			int i;</div><div class='del'>-			int query_length;</div><div class='del'>-			char *big_query;</div><div class='del'>-			char *match_str;</div><div class='del'>-</div><div class='del'>-			match_str = g_strdup_printf("=*%s%s)",</div><div class='del'>-						    str, one_star ? "" : "*");</div><div class='del'>-</div><div class='del'>-			query_length = 3; /* strlen ("(|") + strlen (")") */</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-				query_length += 1 /* strlen ("(") */ + strlen(prop_info[i].ldap_attr) + strlen (match_str);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			big_query = g_malloc0(query_length + 1);</div><div class='del'>-			strcat (big_query, "(|");</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-				strcat (big_query, "(");</div><div class='del'>-				strcat (big_query, prop_info[i].ldap_attr);</div><div class='del'>-				strcat (big_query, match_str);</div><div class='del'>-			}</div><div class='del'>-			strcat (big_query, ")");</div><div class='del'>-</div><div class='del'>-			ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list, big_query);</div><div class='del'>-</div><div class='del'>-			g_free (match_str);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			char *ldap_attr = query_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-			if (ldap_attr)</div><div class='del'>-				ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-								 g_strdup_printf("(%s=*%s%s)",</div><div class='del'>-										 ldap_attr,</div><div class='del'>-										 str,</div><div class='del'>-										 one_star ? "" : "*"));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc == 2</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; argv[1]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *propname = argv[0]-&gt;value.string;</div><div class='del'>-		char *str = rfc2254_escape(argv[1]-&gt;value.string);</div><div class='del'>-		char *ldap_attr = query_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-		if (ldap_attr)</div><div class='del'>-			ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-							 g_strdup_printf("(%s=%s)",</div><div class='del'>-									 ldap_attr, str));</div><div class='del'>-		else {</div><div class='del'>-			g_warning ("unknown query property\n");</div><div class='del'>-			/* we want something that'll always be false */</div><div class='del'>-			ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-							 g_strdup("objectClass=MyBarnIsBiggerThanYourBarn"));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc == 2</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; argv[1]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *propname = argv[0]-&gt;value.string;</div><div class='del'>-		char *str = rfc2254_escape(argv[1]-&gt;value.string);</div><div class='del'>-		char *ldap_attr = query_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-		/* insert hack for fileAs queries, since we need to do</div><div class='del'>-		   the right thing if the server supports them or not,</div><div class='del'>-		   and for entries that have no fileAs attribute. */</div><div class='del'>-		if (ldap_attr) {</div><div class='del'>-			if (!strcmp (propname, "full_name")) {</div><div class='del'>-				ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-							       g_strdup_printf(</div><div class='del'>-								       "(|(cn=%s*)(sn=%s*))",</div><div class='del'>-								       str, str));</div><div class='del'>-			}</div><div class='del'>-			else if (!strcmp (ldap_attr, "fileAs")) {</div><div class='del'>-				ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-								 g_strdup_printf(</div><div class='del'>-								 "(|(fileAs=%s*)(&amp;(!(fileAs=*))(sn=%s*)))",</div><div class='del'>-								 str, str));</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-								 g_strdup_printf("(%s=%s*)",</div><div class='del'>-										 ldap_attr,</div><div class='del'>-										 str));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPSExpData *ldap_data = data;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc == 2</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; argv[1]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *propname = argv[0]-&gt;value.string;</div><div class='del'>-		char *str = rfc2254_escape(argv[1]-&gt;value.string);</div><div class='del'>-		char *ldap_attr = query_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-		if (ldap_attr)</div><div class='del'>-			ldap_data-&gt;list = g_list_prepend(ldap_data-&gt;list,</div><div class='del'>-							 g_strdup_printf("(%s=*%s)",</div><div class='del'>-									 ldap_attr,</div><div class='del'>-									 str));</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'builtin' functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "and", func_and, 0 },</div><div class='del'>-	{ "or", func_or, 0 },</div><div class='del'>-	{ "not", func_not, 0 },</div><div class='del'>-	{ "contains", func_contains, 0 },</div><div class='del'>-	{ "is", func_is, 0 },</div><div class='del'>-	{ "beginswith", func_beginswith, 0 },</div><div class='del'>-	{ "endswith", func_endswith, 0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-pas_backend_ldap_build_query (PASBackendLDAP *bl, gchar *query)</div><div class='del'>-{</div><div class='del'>-	ESExp *sexp;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	gchar *retval;</div><div class='del'>-	PASBackendLDAPSExpData data;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	data.list = NULL;</div><div class='del'>-	data.bl = bl;</div><div class='del'>-</div><div class='del'>-	sexp = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction(sexp, 0, symbols[i].name,</div><div class='del'>-					     (ESExpIFunc *)symbols[i].func, &amp;data);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function(sexp, 0, symbols[i].name,</div><div class='del'>-					    symbols[i].func, &amp;data);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_sexp_input_text(sexp, query, strlen(query));</div><div class='del'>-	e_sexp_parse(sexp);</div><div class='del'>-</div><div class='del'>-	r = e_sexp_eval(sexp);</div><div class='del'>-</div><div class='del'>-	e_sexp_result_free(sexp, r);</div><div class='del'>-	e_sexp_unref (sexp);</div><div class='del'>-</div><div class='del'>-	if (data.list) {</div><div class='del'>-		if (data.list-&gt;next) {</div><div class='del'>-			g_warning ("conversion to ldap query string failed");</div><div class='del'>-			retval = NULL;</div><div class='del'>-			g_list_foreach (data.list, (GFunc)g_free, NULL);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			retval = data.list-&gt;data;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("conversion to ldap query string failed");</div><div class='del'>-		retval = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (data.list);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-query_prop_to_ldap(gchar *query_prop)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_prop_infos; i ++)</div><div class='del'>-		if (!strcmp (query_prop, prop_info[i].query_prop))</div><div class='del'>-			return prop_info[i].ldap_attr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	PASBackendLDAPBookView *view;</div><div class='del'>-</div><div class='del'>-	/* grouping stuff */</div><div class='del'>-	GList    *pending_adds;        /* the cards we're sending */</div><div class='del'>-	int       num_pending_adds;    /* the number waiting to be sent */</div><div class='del'>-	int       target_pending_adds; /* the cutoff that forces a flush to the client, if it happens before the timeout */</div><div class='del'>-	int       num_sent_this_time;  /* the number of cards we sent to the client before the most recent timeout */</div><div class='del'>-	int       num_sent_last_time;  /* the number of cards we sent to the client before the previous timeout */</div><div class='del'>-	glong     grouping_time_start;</div><div class='del'>-	</div><div class='del'>-	/* used by search_handler to only send the status messages once */</div><div class='del'>-	gboolean notified_receiving_results;</div><div class='del'>-} LDAPSearchOp;</div><div class='del'>-</div><div class='del'>-static ECardSimple *</div><div class='del'>-build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-	ECardSimple *card = e_card_simple_new (ecard);</div><div class='del'>-	char *dn;</div><div class='del'>-	char *attr;</div><div class='del'>-	BerElement *ber = NULL;</div><div class='del'>-</div><div class='del'>-	dn = ldap_get_dn(ldap, e);</div><div class='del'>-	e_card_simple_set_id (card, dn);</div><div class='del'>-	ldap_memfree (dn);</div><div class='del'>-</div><div class='del'>-	for (attr = ldap_first_attribute (ldap, e, &amp;ber); attr;</div><div class='del'>-	     attr = ldap_next_attribute (ldap, e, ber)) {</div><div class='del'>-		int i;</div><div class='del'>-		struct prop_info *info = NULL;</div><div class='del'>-		char **values;</div><div class='del'>-</div><div class='del'>-		if (existing_objectclasses &amp;&amp; !strcasecmp (attr, "objectclass")) {</div><div class='del'>-			values = ldap_get_values (ldap, e, attr);</div><div class='del'>-			for (i = 0; values[i]; i ++)</div><div class='del'>-				*existing_objectclasses = g_list_append (*existing_objectclasses, g_strdup (values[i]));</div><div class='del'>-</div><div class='del'>-			ldap_value_free (values);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++)</div><div class='del'>-				if (!g_strcasecmp (attr, prop_info[i].ldap_attr))</div><div class='del'>-					info = &amp;prop_info[i];</div><div class='del'>-</div><div class='del'>-			if (info) {</div><div class='del'>-				values = ldap_get_values (ldap, e, attr);</div><div class='del'>-</div><div class='del'>-				if (values) {</div><div class='del'>-					if (info-&gt;prop_type &amp; PROP_TYPE_STRING) {</div><div class='del'>-						/* if it's a normal property just set the string */</div><div class='del'>-						e_card_simple_set (card, info-&gt;field_id, values[0]);</div><div class='del'>-</div><div class='del'>-					}</div><div class='del'>-					else if (info-&gt;prop_type &amp; PROP_TYPE_COMPLEX) {</div><div class='del'>-						/* if it's a list call the ecard-populate function,</div><div class='del'>-						   which calls gtk_object_set to set the property */</div><div class='del'>-						info-&gt;populate_ecard_func(card,</div><div class='del'>-									  values);</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					ldap_value_free (values);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_memfree (attr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX the openldap man page for</div><div class='del'>-	   ldap_first_attribute/ldap_next_attribute says that the ber</div><div class='del'>-	   is freed if there are no more attributes</div><div class='del'>-	   (ldap_next_attribute returns NULL), but this seems to not</div><div class='del'>-	   be the case (as of openldap-2.0.23), so free it here. */</div><div class='del'>-	if (ber)</div><div class='del'>-		ber_free (ber, 0);</div><div class='del'>-</div><div class='del'>-	e_card_simple_sync_card (card);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ecard));</div><div class='del'>-</div><div class='del'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-poll_ldap (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	LDAP           *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int            rc;</div><div class='del'>-	LDAPMessage    *res;</div><div class='del'>-	GTimeVal cur_time;</div><div class='del'>-	glong cur_millis;</div><div class='del'>-	struct timeval timeout;</div><div class='del'>-</div><div class='del'>-	timeout.tv_sec = 0;</div><div class='del'>-	timeout.tv_usec = LDAP_RESULT_TIMEOUT_MILLIS * 1000;</div><div class='del'>-</div><div class='del'>-	rc = ldap_result (ldap, LDAP_RES_ANY, 0, &amp;timeout, &amp;res);</div><div class='del'>-	if (rc != 0) {/* rc == 0 means timeout exceeded */</div><div class='del'>-#if 0</div><div class='del'>-		if (rc == -1 &amp;&amp; received == 0) {</div><div class='del'>-			pas_book_view_notify_status_message (view-&gt;book_view, _("Restarting search."));</div><div class='del'>-			/* connection went down and we never got any. */</div><div class='del'>-			bl-&gt;priv-&gt;connected = FALSE;</div><div class='del'>-</div><div class='del'>-			/* this will reopen the connection */</div><div class='del'>-			ldap_op_restart ((LDAPOp*)op);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		if (rc == -1) {</div><div class='del'>-			g_warning ("ldap_result returned -1");</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			int msgid = ldap_msgid (res);</div><div class='del'>-			LDAPOp *op;</div><div class='del'>-</div><div class='del'>-			op = g_hash_table_lookup (bl-&gt;priv-&gt;id_to_op, &amp;msgid);</div><div class='del'>-			if (!op)</div><div class='del'>-				g_error ("unknown operation, msgid = %d", msgid);</div><div class='del'>-</div><div class='del'>-			op-&gt;handler (op, res);</div><div class='del'>-</div><div class='del'>-			ldap_msgfree(res);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_get_current_time (&amp;cur_time);</div><div class='del'>-	cur_millis = TV_TO_MILLIS (cur_time);</div><div class='del'>-       </div><div class='del'>-	for (list = bl-&gt;priv-&gt;book_views; list; list = g_list_next(list)) {</div><div class='del'>-		PASBackendLDAPBookView *view = list-&gt;data;</div><div class='del'>-		if (view-&gt;search_op)</div><div class='del'>-			ldap_search_op_timeout (view-&gt;search_op, cur_millis);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_pending_adds (LDAPSearchOp *search_op)</div><div class='del'>-{</div><div class='del'>-	search_op-&gt;num_sent_this_time += search_op-&gt;num_pending_adds;</div><div class='del'>-	pas_book_view_notify_add (search_op-&gt;op.view, search_op-&gt;pending_adds);</div><div class='del'>-	g_list_foreach (search_op-&gt;pending_adds, (GFunc)g_free, NULL);</div><div class='del'>-	search_op-&gt;pending_adds = NULL;</div><div class='del'>-	search_op-&gt;num_pending_adds = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_search_op_timeout (LDAPOp *op, glong cur_millis)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *search_op = (LDAPSearchOp*)op;</div><div class='del'>-</div><div class='del'>-	if (cur_millis - search_op-&gt;grouping_time_start &gt; GROUPING_MINIMUM_WAIT) {</div><div class='del'>-</div><div class='del'>-		if (search_op-&gt;num_pending_adds &gt;= search_op-&gt;target_pending_adds)</div><div class='del'>-			send_pending_adds (search_op);</div><div class='del'>-</div><div class='del'>-		if (cur_millis - search_op-&gt;grouping_time_start &gt; GROUPING_MAXIMUM_WAIT) {</div><div class='del'>-			GTimeVal new_start;</div><div class='del'>-</div><div class='del'>-			if (search_op-&gt;num_pending_adds)</div><div class='del'>-				send_pending_adds (search_op);</div><div class='del'>-			search_op-&gt;target_pending_adds = MIN (GROUPING_MAXIMUM_SIZE,</div><div class='del'>-							 (search_op-&gt;num_sent_this_time + search_op-&gt;num_sent_last_time) / 2);</div><div class='del'>-			search_op-&gt;target_pending_adds = MAX (search_op-&gt;target_pending_adds, 1);</div><div class='del'>-</div><div class='del'>-#ifdef PERFORMANCE_SPEW</div><div class='del'>-			printf ("num sent this time %d, last time %d, target pending adds set to %d\n",</div><div class='del'>-				search_op-&gt;num_sent_this_time,</div><div class='del'>-				search_op-&gt;num_sent_last_time,</div><div class='del'>-				search_op-&gt;target_pending_adds);</div><div class='del'>-#endif</div><div class='del'>-			g_get_current_time (&amp;new_start);</div><div class='del'>-			search_op-&gt;grouping_time_start = TV_TO_MILLIS (new_start); </div><div class='del'>-			search_op-&gt;num_sent_last_time = search_op-&gt;num_sent_this_time;</div><div class='del'>-			search_op-&gt;num_sent_this_time = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_search_handler (LDAPOp *op, LDAPMessage *res)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *search_op = (LDAPSearchOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-	LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	LDAPMessage *e;</div><div class='del'>-	int msg_type;</div><div class='del'>-</div><div class='del'>-	if (!search_op-&gt;notified_receiving_results) {</div><div class='del'>-		search_op-&gt;notified_receiving_results = TRUE;</div><div class='del'>-		pas_book_view_notify_status_message (op-&gt;view, _("Receiving LDAP search results..."));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg_type = ldap_msgtype (res);</div><div class='del'>-	if (msg_type == LDAP_RES_SEARCH_ENTRY) {</div><div class='del'>-		e = ldap_first_entry(ldap, res);</div><div class='del'>-</div><div class='del'>-		while (NULL != e) {</div><div class='del'>-			ECardSimple *card = build_card_from_entry (ldap, e, NULL);</div><div class='del'>-</div><div class='del'>-			search_op-&gt;pending_adds = g_list_append (search_op-&gt;pending_adds,</div><div class='del'>-								 e_card_simple_get_vcard_assume_utf8 (card));</div><div class='del'>-			search_op-&gt;num_pending_adds ++;</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-			e = ldap_next_entry(ldap, e);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (msg_type == LDAP_RES_SEARCH_RESULT) {</div><div class='del'>-		/* the entry that marks the end of our search */</div><div class='del'>-		if (search_op-&gt;num_pending_adds)</div><div class='del'>-			send_pending_adds (search_op);</div><div class='del'>-		pas_book_view_notify_complete (search_op-&gt;op.view);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unhandled search result type %d returned", msg_type);</div><div class='del'>-		if (search_op-&gt;num_pending_adds)</div><div class='del'>-			send_pending_adds (search_op);</div><div class='del'>-		pas_book_view_notify_complete (search_op-&gt;op.view);</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_search_dtor (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;</div><div class='del'>-</div><div class='del'>-	/* unhook us from our PASBackendLDAPBookView */</div><div class='del'>-	if (search_op-&gt;view)</div><div class='del'>-		search_op-&gt;view-&gt;search_op = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (search_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_search (PASBackendLDAP  	*bl,</div><div class='del'>-			 PASBook         	*book,</div><div class='del'>-			 PASBackendLDAPBookView *view)</div><div class='del'>-{</div><div class='del'>-	char *ldap_query;</div><div class='del'>-</div><div class='del'>-	pas_book_view_notify_status_message (view-&gt;book_view, _("Searching..."));</div><div class='del'>-</div><div class='del'>-	ldap_query = pas_backend_ldap_build_query(bl, view-&gt;search);</div><div class='del'>-</div><div class='del'>-	if (ldap_query != NULL) {</div><div class='del'>-		LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-		int ldap_err;</div><div class='del'>-		GTimeVal search_start;</div><div class='del'>-		int search_msgid;</div><div class='del'>-		</div><div class='del'>-		ldap_err = ldap_search_ext (ldap, bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-					    bl-&gt;priv-&gt;ldap_scope,</div><div class='del'>-					    ldap_query,</div><div class='del'>-					    NULL, 0,</div><div class='del'>-					    NULL, /* XXX */</div><div class='del'>-					    NULL, /* XXX */</div><div class='del'>-					    NULL, /* XXX timeout */</div><div class='del'>-					    bl-&gt;priv-&gt;ldap_limit, &amp;search_msgid);</div><div class='del'>-</div><div class='del'>-		g_free (ldap_query);</div><div class='del'>-</div><div class='del'>-		if (ldap_err != LDAP_SUCCESS) {</div><div class='del'>-			pas_book_view_notify_status_message (view-&gt;book_view, ldap_err2string(ldap_err));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		else if (search_msgid == -1) {</div><div class='del'>-			pas_book_view_notify_status_message (view-&gt;book_view,</div><div class='del'>-							     _("Error performing search"));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			LDAPSearchOp *op = g_new0 (LDAPSearchOp, 1);</div><div class='del'>-</div><div class='del'>-			op-&gt;target_pending_adds = GROUPING_INITIAL_SIZE;</div><div class='del'>-</div><div class='del'>-			g_get_current_time (&amp;search_start);</div><div class='del'>-			op-&gt;grouping_time_start = TV_TO_MILLIS (search_start);</div><div class='del'>-</div><div class='del'>-			op-&gt;view = view;</div><div class='del'>-</div><div class='del'>-			view-&gt;search_op = (LDAPOp*)op;</div><div class='del'>-</div><div class='del'>-			ldap_op_add ((LDAPOp*)op, PAS_BACKEND(bl), book, view-&gt;book_view,</div><div class='del'>-				     search_msgid,</div><div class='del'>-				     ldap_search_handler, ldap_search_dtor);</div><div class='del'>-			</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("LDAP problem converting search query %s\n", view-&gt;search);</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, _("Could not parse query string"));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_get_book_view (PASBackend *backend,</div><div class='del'>-					PASBook    *book,</div><div class='del'>-					PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	PASBookView       *book_view;</div><div class='del'>-	PASBackendLDAPBookView *view;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;get_book_view.listener != NULL);</div><div class='del'>-</div><div class='del'>-	book_view = pas_book_view_new (req-&gt;get_book_view.listener);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref(BONOBO_OBJECT(book));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",</div><div class='del'>-			   GTK_SIGNAL_FUNC(view_destroy), book);</div><div class='del'>-</div><div class='del'>-	view = g_new0(PASBackendLDAPBookView, 1);</div><div class='del'>-	view-&gt;book_view = book_view;</div><div class='del'>-	view-&gt;search = g_strdup(req-&gt;get_book_view.search);</div><div class='del'>-	view-&gt;card_sexp = pas_backend_card_sexp_new (view-&gt;search);</div><div class='del'>-	view-&gt;blpriv = bl-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;book_views = g_list_prepend(bl-&gt;priv-&gt;book_views, view);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_book_view (book,</div><div class='del'>-		(book_view != NULL</div><div class='del'>-		 ? GNOME_Evolution_Addressbook_BookListener_Success </div><div class='del'>-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),</div><div class='del'>-		book_view);</div><div class='del'>-</div><div class='del'>-	pas_backend_ldap_search (bl, book, view);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (book_view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_check_connection (PASBackend *backend,</div><div class='del'>-					   PASBook    *book,</div><div class='del'>-					   PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	pas_book_report_connection (book, bl-&gt;priv-&gt;connected);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_authenticate_user (PASBackend *backend,</div><div class='del'>-					    PASBook    *book,</div><div class='del'>-					    PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	int ldap_error;</div><div class='del'>-	char *dn = NULL;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (req-&gt;auth_user.auth_method, "ldap/simple-email")) {</div><div class='del'>-		LDAPMessage    *res, *e;</div><div class='del'>-		char *query = g_strdup_printf ("(mail=%s)", req-&gt;auth_user.user);</div><div class='del'>-</div><div class='del'>-		ldap_error = ldap_search_s (bl-&gt;priv-&gt;ldap,</div><div class='del'>-					    bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-					    bl-&gt;priv-&gt;ldap_scope,</div><div class='del'>-					    query,</div><div class='del'>-					    NULL, 0, &amp;res);</div><div class='del'>-		g_free (query);</div><div class='del'>-</div><div class='del'>-		if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-			e = ldap_first_entry (bl-&gt;priv-&gt;ldap, res);</div><div class='del'>-			dn = g_strdup(ldap_get_dn (bl-&gt;priv-&gt;ldap, e));</div><div class='del'>-			ldap_msgfree (res);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			pas_book_respond_authenticate_user (book,</div><div class='del'>-						    GNOME_Evolution_Addressbook_BookListener_PermissionDenied);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (!strcmp (req-&gt;auth_user.auth_method, "ldap/simple-binddn")) {</div><div class='del'>-		dn = g_strdup (req-&gt;auth_user.user);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now authenticate against the DN we were either supplied or queried for */</div><div class='del'>-	printf ("authenticating as %s\n", dn);</div><div class='del'>-	ldap_error = ldap_simple_bind_s(bl-&gt;priv-&gt;ldap,</div><div class='del'>-					dn,</div><div class='del'>-					req-&gt;auth_user.passwd);</div><div class='del'>-	g_free (dn);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_authenticate_user (book,</div><div class='del'>-					    ldap_error_to_response (ldap_error));</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;writable = (ldap_error == LDAP_SUCCESS);</div><div class='del'>-</div><div class='del'>-	if (!bl-&gt;priv-&gt;schema_checked)</div><div class='del'>-		check_schema_support (bl);</div><div class='del'>-</div><div class='del'>-	pas_book_report_writable (book, bl-&gt;priv-&gt;writable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_get_supported_fields (PASBackend *backend,</div><div class='del'>-					       PASBook    *book,</div><div class='del'>-					       PASRequest *req)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_get_supported_fields (book,</div><div class='del'>-					       GNOME_Evolution_Addressbook_BookListener_Success,</div><div class='del'>-					       bl-&gt;priv-&gt;supported_fields);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_client_requests (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	backend = pas_book_get_backend (book);</div><div class='del'>-</div><div class='del'>-	req = pas_book_pop_request (book);</div><div class='del'>-	if (req == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (req-&gt;op) {</div><div class='del'>-	case CreateCard:</div><div class='del'>-		pas_backend_ldap_process_create_card (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RemoveCard:</div><div class='del'>-		pas_backend_ldap_process_remove_card (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ModifyCard:</div><div class='del'>-		pas_backend_ldap_process_modify_card (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CheckConnection:</div><div class='del'>-		pas_backend_ldap_process_check_connection (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetVCard:</div><div class='del'>-		pas_backend_ldap_process_get_vcard (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetCursor:</div><div class='del'>-		pas_backend_ldap_process_get_cursor (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetBookView:</div><div class='del'>-		pas_backend_ldap_process_get_book_view (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetChanges:</div><div class='del'>-		/* FIXME: Code this. */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case AuthenticateUser:</div><div class='del'>-		pas_backend_ldap_process_authenticate_user (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GetSupportedFields:</div><div class='del'>-		pas_backend_ldap_process_get_supported_fields (backend, book, req);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_free_request (req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *backend;</div><div class='del'>-</div><div class='del'>-	backend = PAS_BACKEND_LDAP (data);</div><div class='del'>-</div><div class='del'>-	pas_backend_remove_client (PAS_BACKEND (backend), book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Addressbook_BookListener_CallStatus</div><div class='del'>-pas_backend_ldap_load_uri (PASBackend             *backend,</div><div class='del'>-			   const char             *uri)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	LDAPURLDesc    *lud;</div><div class='del'>-	int ldap_error;</div><div class='del'>-	char **attributes;</div><div class='del'>-	int i;</div><div class='del'>-	int limit = 100;</div><div class='del'>-	int timeout = 60; /* 1 minute */</div><div class='del'>-</div><div class='del'>-	g_assert (bl-&gt;priv-&gt;connected == FALSE);</div><div class='del'>-</div><div class='del'>-	attributes = g_strsplit (uri, ";", 0);</div><div class='del'>-</div><div class='del'>-	if (attributes[0] == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	for (i = 1; attributes[i]; i++) {</div><div class='del'>-		char *equals;</div><div class='del'>-		char *value;</div><div class='del'>-		int key_length;</div><div class='del'>-		equals = strchr (attributes[i], '=');</div><div class='del'>-		if (equals) {</div><div class='del'>-			key_length = equals - attributes[i];</div><div class='del'>-			value = equals + 1;</div><div class='del'>-		} else {</div><div class='del'>-			key_length = strlen (attributes[i]);</div><div class='del'>-			value = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (key_length == strlen("limit") &amp;&amp; !strncmp (attributes[i], "limit", key_length)) {</div><div class='del'>-			if (value)</div><div class='del'>-				limit = atoi(value);</div><div class='del'>-		}</div><div class='del'>-		else if (key_length == strlen("ssl") &amp;&amp; !strncmp (attributes[i], "ssl", key_length)) {</div><div class='del'>-			if (value) {</div><div class='del'>-				if (!strncmp (value, "always", 6)) {</div><div class='del'>-					bl-&gt;priv-&gt;use_tls = PAS_BACKEND_LDAP_TLS_ALWAYS;</div><div class='del'>-				}</div><div class='del'>-				else if (!strncmp (value, "whenever_possible", 3)) {</div><div class='del'>-					bl-&gt;priv-&gt;use_tls = PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					g_warning ("unhandled value for use_tls, not using it");</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				bl-&gt;priv-&gt;use_tls = PAS_BACKEND_LDAP_TLS_WHEN_POSSIBLE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else if (key_length == strlen("timeout") &amp;&amp; !strncmp (attributes[i], "timeout", key_length)) {</div><div class='del'>-			if (value)</div><div class='del'>-				timeout = atoi (value);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_url_parse ((char*)attributes[0], &amp;lud);</div><div class='del'>-	g_strfreev (attributes);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		g_free(bl-&gt;priv-&gt;uri);</div><div class='del'>-		bl-&gt;priv-&gt;uri = g_strdup (uri);</div><div class='del'>-		bl-&gt;priv-&gt;ldap_host = g_strdup(lud-&gt;lud_host);</div><div class='del'>-		bl-&gt;priv-&gt;ldap_port = lud-&gt;lud_port;</div><div class='del'>-		/* if a port wasn't specified, default to LDAP_PORT */</div><div class='del'>-		if (bl-&gt;priv-&gt;ldap_port == 0)</div><div class='del'>-			bl-&gt;priv-&gt;ldap_port = LDAP_PORT;</div><div class='del'>-		bl-&gt;priv-&gt;ldap_rootdn = g_strdup(lud-&gt;lud_dn);</div><div class='del'>-		bl-&gt;priv-&gt;ldap_limit = limit;</div><div class='del'>-		bl-&gt;priv-&gt;ldap_timeout = timeout;</div><div class='del'>-		bl-&gt;priv-&gt;ldap_scope = lud-&gt;lud_scope;</div><div class='del'>-</div><div class='del'>-		ldap_free_urldesc(lud);</div><div class='del'>-</div><div class='del'>-		return pas_backend_ldap_connect (bl);</div><div class='del'>-	} else</div><div class='del'>-		return GNOME_Evolution_Addressbook_BookListener_OtherError;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_uri handler for the addressbook LDAP backend */</div><div class='del'>-static const char *</div><div class='del'>-pas_backend_ldap_get_uri (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	return bl-&gt;priv-&gt;uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_ldap_add_client (PASBackend             *backend,</div><div class='del'>-			     GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-	PASBook        *book;</div><div class='del'>-</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_LDAP (backend));</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	book = pas_book_new (backend, listener);</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		if (!bl-&gt;priv-&gt;clients)</div><div class='del'>-			pas_backend_last_client_gone (backend);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book), "destroy",</div><div class='del'>-		    pas_backend_ldap_book_destroy_cb, backend);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",</div><div class='del'>-		    pas_backend_ldap_process_client_requests, NULL);</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;clients = g_list_prepend (</div><div class='del'>-		bl-&gt;priv-&gt;clients, book);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;connected) {</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-			book, GNOME_Evolution_Addressbook_BookListener_Success);</div><div class='del'>-	} else {</div><div class='del'>-		pas_book_respond_open (</div><div class='del'>-			book, GNOME_Evolution_Addressbook_BookListener_OtherError);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_report_writable (book, bl-&gt;priv-&gt;writable);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (book));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_remove_client (PASBackend             *backend,</div><div class='del'>-				PASBook                *book)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-	GList *l;</div><div class='del'>-	PASBook *lbook;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BACKEND_LDAP (backend));</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	/* Find the book in the list of clients */</div><div class='del'>-</div><div class='del'>-	for (l = bl-&gt;priv-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		lbook = PAS_BOOK (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (lbook == book)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	/* Disconnect */</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;clients = g_list_remove_link (bl-&gt;priv-&gt;clients, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	/* When all clients go away, notify the parent factory about it so that</div><div class='del'>-	 * it may decide whether to kill the backend or not.</div><div class='del'>-	 */</div><div class='del'>-	if (!bl-&gt;priv-&gt;clients)</div><div class='del'>-		pas_backend_last_client_gone (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_backend_ldap_get_static_capabilities (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("net");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_ldap_construct (PASBackendLDAP *backend)</div><div class='del'>-{</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_LDAP (backend));</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_construct (PAS_BACKEND (backend)))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_ldap_new:</div><div class='del'>- */</div><div class='del'>-PASBackend *</div><div class='del'>-pas_backend_ldap_new (void)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *backend;</div><div class='del'>-</div><div class='del'>-	backend = gtk_type_new (pas_backend_ldap_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_ldap_construct (backend)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return PAS_BACKEND (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-call_dtor (int msgid, LDAPOp *op, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ldap_abandon (PAS_BACKEND_LDAP(op-&gt;backend)-&gt;priv-&gt;ldap, op-&gt;id);</div><div class='del'>-</div><div class='del'>-	op-&gt;dtor (op);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-</div><div class='del'>-	bl = PAS_BACKEND_LDAP (object);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (bl-&gt;priv-&gt;id_to_op, (GHRFunc)call_dtor, NULL);</div><div class='del'>-	g_hash_table_destroy (bl-&gt;priv-&gt;id_to_op);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;poll_timeout != -1)</div><div class='del'>-		g_source_remove (bl-&gt;priv-&gt;poll_timeout);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;supported_fields)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (bl-&gt;priv-&gt;supported_fields));</div><div class='del'>-</div><div class='del'>-	g_free (bl-&gt;priv-&gt;uri);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_class_init (PASBackendLDAPClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	PASBackendClass *parent_class;</div><div class='del'>-</div><div class='del'>-	/* get client side information (extensions present in the library) */</div><div class='del'>-	get_ldap_library_info ();</div><div class='del'>-</div><div class='del'>-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());</div><div class='del'>-</div><div class='del'>-	parent_class = PAS_BACKEND_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	/* Set the virtual methods. */</div><div class='del'>-	parent_class-&gt;load_uri                = pas_backend_ldap_load_uri;</div><div class='del'>-	parent_class-&gt;get_uri                 = pas_backend_ldap_get_uri;</div><div class='del'>-	parent_class-&gt;add_client              = pas_backend_ldap_add_client;</div><div class='del'>-	parent_class-&gt;remove_client           = pas_backend_ldap_remove_client;</div><div class='del'>-	parent_class-&gt;get_static_capabilities = pas_backend_ldap_get_static_capabilities;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_backend_ldap_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_init (PASBackendLDAP *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv                   = g_new0 (PASBackendLDAPPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;supported_fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);</div><div class='del'>-	priv-&gt;ldap_limit       = 100;</div><div class='del'>-	priv-&gt;id_to_op         = g_hash_table_new (g_int_hash, g_int_equal);</div><div class='del'>-	priv-&gt;poll_timeout     = -1;</div><div class='del'>-	backend-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_ldap_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_backend_ldap_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBackendLDAP",</div><div class='del'>-			sizeof (PASBackendLDAP),</div><div class='del'>-			sizeof (PASBackendLDAPClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_backend_ldap_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_backend_ldap_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (pas_backend_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h<br/>deleted file mode 100644<br/>index 9f32c58bbf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-ldap.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend-ldap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BACKEND_LDAP_H__</div><div class='del'>-#define __PAS_BACKEND_LDAP_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "pas-backend.h"</div><div class='del'>-</div><div class='del'>-typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASBackend             parent_object;</div><div class='del'>-	PASBackendLDAPPrivate *priv;</div><div class='del'>-} PASBackendLDAP;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASBackendClass parent_class;</div><div class='del'>-} PASBackendLDAPClass;</div><div class='del'>-</div><div class='del'>-PASBackend *pas_backend_ldap_new      (void);</div><div class='del'>-GtkType     pas_backend_ldap_get_type (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_LDAP_TYPE        (pas_backend_ldap_get_type ())</div><div class='del'>-#define PAS_BACKEND_LDAP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_LDAP_TYPE, PASBackendLDAP))</div><div class='del'>-#define PAS_BACKEND_LDAP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendLDAPClass))</div><div class='del'>-#define PAS_IS_BACKEND_LDAP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_LDAP_TYPE))</div><div class='del'>-#define PAS_IS_BACKEND_LDAP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_LDAP_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BACKEND_LDAP_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c<br/>deleted file mode 100644<br/>index a17e014002..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "pas-backend.h"</div><div class='del'>-</div><div class='del'>-#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)-&gt;klass)</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	LAST_CLIENT_GONE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint pas_backend_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-pas_backend_construct (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Addressbook_BookListener_CallStatus</div><div class='del'>-pas_backend_load_uri (PASBackend             *backend,</div><div class='del'>-		      const char             *uri)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);</div><div class='del'>-	g_return_val_if_fail (uri != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;load_uri != NULL);</div><div class='del'>-</div><div class='del'>-	return (* CLASS (backend)-&gt;load_uri) (backend, uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_get_uri:</div><div class='del'>- * @backend: An addressbook backend.</div><div class='del'>- * </div><div class='del'>- * Queries the URI that an addressbook backend is serving.</div><div class='del'>- * </div><div class='del'>- * Return value: URI for the backend.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-pas_backend_get_uri (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_uri != NULL);</div><div class='del'>-</div><div class='del'>-	return (* CLASS (backend)-&gt;get_uri) (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_add_client:</div><div class='del'>- * @backend: An addressbook backend.</div><div class='del'>- * @listener: Listener for notification to the client.</div><div class='del'>- *</div><div class='del'>- * Adds a client to an addressbook backend.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on failure to add the client.</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-pas_backend_add_client (PASBackend             *backend,</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);</div><div class='del'>-	g_return_val_if_fail (listener != CORBA_OBJECT_NIL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;add_client != NULL);</div><div class='del'>-</div><div class='del'>-	return CLASS (backend)-&gt;add_client (backend, listener);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_backend_remove_client (PASBackend *backend,</div><div class='del'>-			   PASBook    *book)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BACKEND (backend));</div><div class='del'>-	g_return_if_fail (book    != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BOOK (book));</div><div class='del'>-	</div><div class='del'>-	g_assert (CLASS (backend)-&gt;remove_client != NULL);</div><div class='del'>-</div><div class='del'>-	CLASS (backend)-&gt;remove_client (backend, book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-pas_backend_get_static_capabilities (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);</div><div class='del'>-	</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_static_capabilities != NULL);</div><div class='del'>-</div><div class='del'>-	return CLASS (backend)-&gt;get_static_capabilities (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_last_client_gone:</div><div class='del'>- * @backend: An addressbook backend.</div><div class='del'>- * </div><div class='del'>- * Emits the "last_client_gone" signal for the specified backend.  Should</div><div class='del'>- * only be called from backend implementations if the backend really does</div><div class='del'>- * not have any more clients.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-pas_backend_last_client_gone (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), pas_backend_signals[LAST_CLIENT_GONE]);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_init (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_class_init (PASBackendClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	pas_backend_signals[LAST_CLIENT_GONE] =</div><div class='del'>-		gtk_signal_new ("last_client_gone",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (PASBackendClass, last_client_gone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, pas_backend_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;add_client = NULL;</div><div class='del'>-	klass-&gt;remove_client = NULL;</div><div class='del'>-	klass-&gt;get_static_capabilities = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_backend_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBackend",</div><div class='del'>-			sizeof (PASBackend),</div><div class='del'>-			sizeof (PASBackendClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_backend_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_backend_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h<br/>deleted file mode 100644<br/>index cdf8f37c30..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-backend.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * An abstract class which defines the API to a given backend.</div><div class='del'>- * There will be one PASBackend object for every URI which is loaded.</div><div class='del'>- *</div><div class='del'>- * Two people will call into the PASBackend API:</div><div class='del'>- *</div><div class='del'>- * 1. The PASBookFactory, when it has been asked to load a book.</div><div class='del'>- *    It will create a new PASBackend if one is not already running</div><div class='del'>- *    for the requested URI.  It will call pas_backend_add_client to</div><div class='del'>- *    add a new client to an existing PASBackend server.</div><div class='del'>- *</div><div class='del'>- * 2. A PASBook, when a client has requested an operation on the</div><div class='del'>- *    GNOME_Evolution_Addressbook_Book interface.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BACKEND_H__</div><div class='del'>-#define __PAS_BACKEND_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;pas/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _PASBackend        PASBackend;</div><div class='del'>-typedef struct _PASBackendPrivate PASBackendPrivate;</div><div class='del'>-</div><div class='del'>-#include &lt;pas/pas-book.h&gt;</div><div class='del'>-</div><div class='del'>-struct _PASBackend {</div><div class='del'>-	GtkObject parent_object;</div><div class='del'>-	PASBackendPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_CallStatus (*load_uri) (PASBackend *backend, const char *uri);</div><div class='del'>-	const char *(* get_uri) (PASBackend *backend);</div><div class='del'>-	gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_BookListener listener);</div><div class='del'>-	void (*remove_client) (PASBackend *backend, PASBook *book);</div><div class='del'>-        char *(*get_static_capabilities) (PASBackend *backend);</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* last_client_gone) (PASBackend *backend);</div><div class='del'>-} PASBackendClass;</div><div class='del'>-</div><div class='del'>-typedef PASBackend * (*PASBackendFactoryFn) (void);</div><div class='del'>-</div><div class='del'>-gboolean    pas_backend_construct                (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Addressbook_BookListener_CallStatus</div><div class='del'>-            pas_backend_load_uri                 (PASBackend             *backend,</div><div class='del'>-						  const char             *uri);</div><div class='del'>-const char *pas_backend_get_uri                  (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-gboolean    pas_backend_add_client               (PASBackend             *backend,</div><div class='del'>-						  GNOME_Evolution_Addressbook_BookListener  listener);</div><div class='del'>-void        pas_backend_remove_client            (PASBackend             *backend,</div><div class='del'>-						  PASBook                *book);</div><div class='del'>-char       *pas_backend_get_static_capabilities  (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-void        pas_backend_last_client_gone         (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-GtkType     pas_backend_get_type                 (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_TYPE        (pas_backend_get_type ())</div><div class='del'>-#define PAS_BACKEND(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_TYPE, PASBackend))</div><div class='del'>-#define PAS_BACKEND_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendClass))</div><div class='del'>-#define PAS_IS_BACKEND(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_TYPE))</div><div class='del'>-#define PAS_IS_BACKEND_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BACKEND_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c<br/>deleted file mode 100644<br/>index 9c713f5ce8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,666 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "pas-book-factory.h"</div><div class='del'>-</div><div class='del'>-#define DEFAULT_PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass          *pas_book_factory_parent_class;</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookFactory__vepv   pas_book_factory_vepv;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char                              *uri;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener             listener;</div><div class='del'>-} PASBookFactoryQueuedRequest;</div><div class='del'>-</div><div class='del'>-struct _PASBookFactoryPrivate {</div><div class='del'>-	gint        idle_id;</div><div class='del'>-	GHashTable *backends;</div><div class='del'>-	GHashTable *active_server_map;</div><div class='del'>-	GList      *queued_requests;</div><div class='del'>-</div><div class='del'>-	/* OAFIID of the factory */</div><div class='del'>-	char *iid;</div><div class='del'>-</div><div class='del'>-	/* Whether the factory has been registered with OAF yet */</div><div class='del'>-	guint       registered : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	LAST_BOOK_GONE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint factory_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_book_factory_canonicalize_uri (const char *uri)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: What do I do here? */</div><div class='del'>-</div><div class='del'>-	return g_strdup (uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-pas_book_factory_extract_proto_from_uri (const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *proto;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	p = strchr (uri, ':');</div><div class='del'>-</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	proto = g_malloc0 (p - uri + 1);</div><div class='del'>-</div><div class='del'>-	strncpy (proto, uri, p - uri);</div><div class='del'>-</div><div class='del'>-	return proto;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_factory_register_backend:</div><div class='del'>- * @factory:</div><div class='del'>- * @proto:</div><div class='del'>- * @backend:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_factory_register_backend (PASBookFactory      *factory,</div><div class='del'>-				   const char          *proto,</div><div class='del'>-				   PASBackendFactoryFn  backend)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (factory != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));</div><div class='del'>-	g_return_if_fail (proto != NULL);</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup (factory-&gt;priv-&gt;backends, proto) != NULL) {</div><div class='del'>-		g_warning ("pas_book_factory_register_backend: "</div><div class='del'>-			   "Proto \"%s\" already registered!\n", proto);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (factory-&gt;priv-&gt;backends,</div><div class='del'>-			     g_strdup (proto), backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_factory_get_n_backends:</div><div class='del'>- * @factory: An addressbook factory.</div><div class='del'>- * </div><div class='del'>- * Queries the number of running addressbook backends in an addressbook factory.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of running backends.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-pas_book_factory_get_n_backends (PASBookFactory *factory)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (factory != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), -1);</div><div class='del'>-</div><div class='del'>-	return g_hash_table_size (factory-&gt;priv-&gt;active_server_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_active_server_map_entry (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-</div><div class='del'>-	uri = key;</div><div class='del'>-	backend = PAS_BACKEND (value);</div><div class='del'>-</div><div class='del'>-	g_message ("  %s: %p", uri, backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_factory_dump_active_backends (PASBookFactory *factory)</div><div class='del'>-{</div><div class='del'>-	g_message ("Active PAS backends");</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (factory-&gt;priv-&gt;active_server_map,</div><div class='del'>-			      dump_active_server_map_entry,</div><div class='del'>-			      NULL);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a backend loses its last connected client */</div><div class='del'>-static void</div><div class='del'>-backend_last_client_gone_cb (PASBackend *backend, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBookFactory *factory;</div><div class='del'>-	const char *uri;</div><div class='del'>-	gpointer orig_key;</div><div class='del'>-	gboolean result;</div><div class='del'>-	char *orig_uri;</div><div class='del'>-</div><div class='del'>-	factory = PAS_BOOK_FACTORY (data);</div><div class='del'>-</div><div class='del'>-	/* Remove the backend from the active server map */</div><div class='del'>-</div><div class='del'>-	uri = pas_backend_get_uri (backend);</div><div class='del'>-	g_assert (uri != NULL);</div><div class='del'>-</div><div class='del'>-	result = g_hash_table_lookup_extended (factory-&gt;priv-&gt;active_server_map, uri,</div><div class='del'>-					       &amp;orig_key, NULL);</div><div class='del'>-	g_assert (result != FALSE);</div><div class='del'>-</div><div class='del'>-	orig_uri = orig_key;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (factory-&gt;priv-&gt;active_server_map, orig_uri);</div><div class='del'>-	g_free (orig_uri);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-	/* Notify upstream if there are no more backends */</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_size (factory-&gt;priv-&gt;active_server_map) == 0)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (factory), factory_signals[LAST_BOOK_GONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static PASBackendFactoryFn</div><div class='del'>-pas_book_factory_lookup_backend_factory (PASBookFactory *factory,</div><div class='del'>-					 const char     *uri)</div><div class='del'>-{</div><div class='del'>-	PASBackendFactoryFn  backend_fn;</div><div class='del'>-	char                *proto;</div><div class='del'>-	char                *canonical_uri;</div><div class='del'>-</div><div class='del'>-	g_assert (factory != NULL);</div><div class='del'>-	g_assert (PAS_IS_BOOK_FACTORY (factory));</div><div class='del'>-	g_assert (uri != NULL);</div><div class='del'>-</div><div class='del'>-	canonical_uri = pas_book_factory_canonicalize_uri (uri);</div><div class='del'>-	if (canonical_uri == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	proto = pas_book_factory_extract_proto_from_uri (canonical_uri);</div><div class='del'>-	if (proto == NULL) {</div><div class='del'>-		g_free (canonical_uri);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	backend_fn = g_hash_table_lookup (factory-&gt;priv-&gt;backends, proto);</div><div class='del'>-</div><div class='del'>-	g_free (proto); </div><div class='del'>-	g_free (canonical_uri);</div><div class='del'>-</div><div class='del'>-	return backend_fn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static PASBackend *</div><div class='del'>-pas_book_factory_launch_backend (PASBookFactory              *factory,</div><div class='del'>-				 GNOME_Evolution_Addressbook_BookListener       listener,</div><div class='del'>-				 const char                  *uri)</div><div class='del'>-{</div><div class='del'>-	PASBackendFactoryFn  backend_factory;</div><div class='del'>-	PASBackend          *backend;</div><div class='del'>-</div><div class='del'>-	backend_factory = pas_book_factory_lookup_backend_factory (</div><div class='del'>-		factory, uri);</div><div class='del'>-</div><div class='del'>-	if (!backend_factory) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("pas_book_factory_launch_backend(): could not notify "</div><div class='del'>-				   "the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	backend = (* backend_factory) ();</div><div class='del'>-	if (!backend) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener_OtherError,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("pas_book_factory_launch_backend(): could not notify "</div><div class='del'>-				   "the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (factory-&gt;priv-&gt;active_server_map,</div><div class='del'>-			     g_strdup (uri),</div><div class='del'>-			     backend);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",</div><div class='del'>-			    backend_last_client_gone_cb,</div><div class='del'>-			    factory);</div><div class='del'>-</div><div class='del'>-	return backend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_process_request (PASBookFactory              *factory,</div><div class='del'>-				  PASBookFactoryQueuedRequest *request)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-	char *uri;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener listener;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	uri = request-&gt;uri;</div><div class='del'>-	listener = request-&gt;listener;</div><div class='del'>-	g_free (request);</div><div class='del'>-</div><div class='del'>-	/* Look up the backend and create one if needed */</div><div class='del'>-</div><div class='del'>-	backend = g_hash_table_lookup (factory-&gt;priv-&gt;active_server_map, uri);</div><div class='del'>-</div><div class='del'>-	if (!backend) {</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_CallStatus status;</div><div class='del'>-</div><div class='del'>-		backend = pas_book_factory_launch_backend (factory, listener, uri);</div><div class='del'>-		if (!backend)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		status = pas_backend_load_uri (backend, uri);</div><div class='del'>-		if (status != GNOME_Evolution_Addressbook_BookListener_Success) {</div><div class='del'>-			/* tell the listener that we failed to open the book */</div><div class='del'>-			CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-					   listener, status,</div><div class='del'>-					   CORBA_OBJECT_NIL,</div><div class='del'>-					   &amp;ev);</div><div class='del'>-</div><div class='del'>-			if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-				g_warning ("pas_book_respond_open: Exception "</div><div class='del'>-					   "responding to BookListener!\n");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pas_backend_add_client (backend, listener);</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_backend_add_client (backend, listener);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("pas_book_factory_process_request(): could not release the listener");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_book_factory_process_queue (PASBookFactory *factory)</div><div class='del'>-{</div><div class='del'>-	/* Process pending Book-creation requests. */</div><div class='del'>-	if (factory-&gt;priv-&gt;queued_requests != NULL) {</div><div class='del'>-		PASBookFactoryQueuedRequest  *request;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		l = factory-&gt;priv-&gt;queued_requests;</div><div class='del'>-		request = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		pas_book_factory_process_request (factory, request);</div><div class='del'>-</div><div class='del'>-		factory-&gt;priv-&gt;queued_requests = g_list_remove_link (</div><div class='del'>-			factory-&gt;priv-&gt;queued_requests, l);</div><div class='del'>-		g_list_free_1 (l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (factory-&gt;priv-&gt;queued_requests == NULL) {</div><div class='del'>-</div><div class='del'>-		factory-&gt;priv-&gt;idle_id = 0;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_queue_request (PASBookFactory               *factory,</div><div class='del'>-				const char                   *uri,</div><div class='del'>-				const GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBookFactoryQueuedRequest *request;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener       listener_copy;</div><div class='del'>-	CORBA_Environment            ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	listener_copy = CORBA_Object_duplicate (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("PASBookFactory: Could not duplicate BookListener!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	request           = g_new0 (PASBookFactoryQueuedRequest, 1);</div><div class='del'>-	request-&gt;listener = listener_copy;</div><div class='del'>-	request-&gt;uri      = g_strdup (uri);</div><div class='del'>-</div><div class='del'>-	factory-&gt;priv-&gt;queued_requests =</div><div class='del'>-		g_list_prepend (factory-&gt;priv-&gt;queued_requests, request);</div><div class='del'>-</div><div class='del'>-	if (! factory-&gt;priv-&gt;idle_id) {</div><div class='del'>-		factory-&gt;priv-&gt;idle_id =</div><div class='del'>-			g_idle_add ((GSourceFunc) pas_book_factory_process_queue, factory);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant        servant,</div><div class='del'>-				      const CORBA_char             *uri,</div><div class='del'>-				      const GNOME_Evolution_Addressbook_BookListener  listener,</div><div class='del'>-				      CORBA_Environment            *ev)</div><div class='del'>-{</div><div class='del'>-	PASBookFactory      *factory =</div><div class='del'>-		PAS_BOOK_FACTORY (bonobo_object_from_servant (servant));</div><div class='del'>-	PASBackendFactoryFn  backend_factory;</div><div class='del'>-</div><div class='del'>-	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);</div><div class='del'>-</div><div class='del'>-	if (backend_factory == NULL) {</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			ev);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pas_book_factory_queue_request (factory, uri, listener);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_book_factory_construct (PASBookFactory *factory)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookFactory  *servant;</div><div class='del'>-	CORBA_Environment           ev;</div><div class='del'>-	CORBA_Object                obj;</div><div class='del'>-</div><div class='del'>-	g_assert (factory != NULL);</div><div class='del'>-	g_assert (PAS_IS_BOOK_FACTORY (factory));</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;pas_book_factory_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookFactory__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (factory), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (factory), obj);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_factory_new:</div><div class='del'>- */</div><div class='del'>-PASBookFactory *</div><div class='del'>-pas_book_factory_new (void)</div><div class='del'>-{</div><div class='del'>-	PASBookFactory *factory;</div><div class='del'>-</div><div class='del'>-	factory = gtk_type_new (pas_book_factory_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_book_factory_construct (factory)) {</div><div class='del'>-		g_warning ("pas_book_factory_new: Could not construct PASBookFactory!\n");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_factory_activate:</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-pas_book_factory_activate (PASBookFactory *factory, const char *iid)</div><div class='del'>-{</div><div class='del'>-	PASBookFactoryPrivate *priv;</div><div class='del'>-	CORBA_Object obj;</div><div class='del'>-	OAF_RegistrationResult result;</div><div class='del'>-	char *tmp_iid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (factory != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (!priv-&gt;registered, FALSE);</div><div class='del'>-</div><div class='del'>-	/* if iid is NULL, use the default factory OAFIID */</div><div class='del'>-	if (iid)</div><div class='del'>-		tmp_iid = g_strdup (iid);</div><div class='del'>-	else</div><div class='del'>-		tmp_iid = g_strdup (DEFAULT_PAS_BOOK_FACTORY_OAF_ID);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (tmp_iid, obj);</div><div class='del'>-</div><div class='del'>-	switch (result) {</div><div class='del'>-	case OAF_REG_SUCCESS:</div><div class='del'>-		priv-&gt;registered = TRUE;</div><div class='del'>-		priv-&gt;iid = tmp_iid;</div><div class='del'>-		return TRUE;</div><div class='del'>-	case OAF_REG_NOT_LISTED:</div><div class='del'>-		g_message ("Error registering the PAS factory: not listed");</div><div class='del'>-		break;</div><div class='del'>-	case OAF_REG_ALREADY_ACTIVE:</div><div class='del'>-		g_message ("Error registering the PAS factory: already active");</div><div class='del'>-		break;</div><div class='del'>-	case OAF_REG_ERROR:</div><div class='del'>-	default:</div><div class='del'>-		g_message ("Error registering the PAS factory: generic error");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (tmp_iid);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_init (PASBookFactory *factory)</div><div class='del'>-{</div><div class='del'>-	factory-&gt;priv = g_new0 (PASBookFactoryPrivate, 1);</div><div class='del'>-</div><div class='del'>-	factory-&gt;priv-&gt;active_server_map = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	factory-&gt;priv-&gt;backends          = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	factory-&gt;priv-&gt;queued_requests   = NULL;</div><div class='del'>-	factory-&gt;priv-&gt;registered        = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_active_server_map_entry (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	PASBackend *backend;</div><div class='del'>-</div><div class='del'>-	uri = key;</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	backend = PAS_BACKEND (value);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_backends_entry (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	uri = key;</div><div class='del'>-	g_free (uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBookFactory *factory = PAS_BOOK_FACTORY (object);</div><div class='del'>-	GList          *l;</div><div class='del'>-</div><div class='del'>-	for (l = factory-&gt;priv-&gt;queued_requests; l != NULL; l = l-&gt;next) {</div><div class='del'>-		PASBookFactoryQueuedRequest *request = l-&gt;data;</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		g_free (request-&gt;uri);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		CORBA_Object_release (request-&gt;listener, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		g_free (request);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (factory-&gt;priv-&gt;queued_requests);</div><div class='del'>-	factory-&gt;priv-&gt;queued_requests = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (factory-&gt;priv-&gt;active_server_map,</div><div class='del'>-			      free_active_server_map_entry,</div><div class='del'>-			      NULL);</div><div class='del'>-	g_hash_table_destroy (factory-&gt;priv-&gt;active_server_map);</div><div class='del'>-	factory-&gt;priv-&gt;active_server_map = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (factory-&gt;priv-&gt;backends,</div><div class='del'>-			      remove_backends_entry,</div><div class='del'>-			      NULL);</div><div class='del'>-	g_hash_table_destroy (factory-&gt;priv-&gt;backends);</div><div class='del'>-	factory-&gt;priv-&gt;backends = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory-&gt;priv-&gt;registered) {</div><div class='del'>-		CORBA_Object obj;</div><div class='del'>-</div><div class='del'>-		obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));</div><div class='del'>-		oaf_active_server_unregister (factory-&gt;priv-&gt;iid, obj);</div><div class='del'>-		factory-&gt;priv-&gt;registered = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (factory-&gt;priv-&gt;iid);</div><div class='del'>-	</div><div class='del'>-	g_free (factory-&gt;priv);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_BookFactory__epv *</div><div class='del'>-pas_book_factory_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();</div><div class='del'>-	pas_book_factory_vepv.GNOME_Evolution_Addressbook_BookFactory_epv = pas_book_factory_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_factory_class_init (PASBookFactoryClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	pas_book_factory_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	factory_signals[LAST_BOOK_GONE] =</div><div class='del'>-		gtk_signal_new ("last_book_gone",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (PASBookFactoryClass, last_book_gone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, factory_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_book_factory_destroy;</div><div class='del'>-</div><div class='del'>-	pas_book_factory_corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_factory_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_book_factory_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBookFactory",</div><div class='del'>-			sizeof (PASBookFactory),</div><div class='del'>-			sizeof (PASBookFactoryClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_book_factory_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_book_factory_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h<br/>deleted file mode 100644<br/>index 1936701296..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pas/pas-backend.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BOOK_FACTORY_H__</div><div class='del'>-#define __PAS_BOOK_FACTORY_H__</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObject            parent_object;</div><div class='del'>-	PASBookFactoryPrivate *priv;</div><div class='del'>-} PASBookFactory;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* last_book_gone) (PASBookFactory *factory);</div><div class='del'>-} PASBookFactoryClass;</div><div class='del'>-</div><div class='del'>-PASBookFactory *pas_book_factory_new              (void);</div><div class='del'>-</div><div class='del'>-void            pas_book_factory_register_backend (PASBookFactory               *factory,</div><div class='del'>-						   const char                   *proto,</div><div class='del'>-						   PASBackendFactoryFn           backend_factory);</div><div class='del'>-</div><div class='del'>-int             pas_book_factory_get_n_backends   (PASBookFactory               *factory);</div><div class='del'>-</div><div class='del'>-void            pas_book_factory_dump_active_backends (PASBookFactory *factory);</div><div class='del'>-</div><div class='del'>-gboolean        pas_book_factory_activate         (PASBookFactory               *factory, const char *iid);</div><div class='del'>-</div><div class='del'>-GtkType         pas_book_factory_get_type (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())</div><div class='del'>-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))</div><div class='del'>-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))</div><div class='del'>-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))</div><div class='del'>-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BOOK_FACTORY_H__ */</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c<br/>deleted file mode 100644<br/>index b5266a6b35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,315 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * pas-book-view.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "pas-book-view.h"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *pas_book_view_parent_class;</div><div class='del'>-POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;</div><div class='del'>-</div><div class='del'>-struct _PASBookViewPrivate {</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener  listener;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_notify_change:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_change (PASBookView                *book_view,</div><div class='del'>-			     const GList                *cards)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gint i, length;</div><div class='del'>-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;</div><div class='del'>-</div><div class='del'>-	length = g_list_length((GList *) cards);</div><div class='del'>-</div><div class='del'>-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);</div><div class='del'>-	card_sequence._maximum = length;</div><div class='del'>-	card_sequence._length = length;</div><div class='del'>-</div><div class='del'>-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {</div><div class='del'>-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, &amp;card_sequence, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_change: Exception signaling BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_free(card_sequence._buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_change_1 (PASBookView *book_view,</div><div class='del'>-			       const char  *card)</div><div class='del'>-{</div><div class='del'>-	GList *list = g_list_append(NULL, (char *) card);</div><div class='del'>-	pas_book_view_notify_change(book_view, list);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_notify_remove:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_remove (PASBookView                *book_view,</div><div class='del'>-			     const char                 *id)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, (GNOME_Evolution_Addressbook_CardId) id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_notify_add:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_add (PASBookView                *book_view,</div><div class='del'>-			  const GList                *cards)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gint i, length;</div><div class='del'>-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;</div><div class='del'>-</div><div class='del'>-	length = g_list_length((GList *)cards);</div><div class='del'>-</div><div class='del'>-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);</div><div class='del'>-	card_sequence._maximum = length;</div><div class='del'>-	card_sequence._length = length;</div><div class='del'>-</div><div class='del'>-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {</div><div class='del'>-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, &amp;card_sequence, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_add: Exception signaling BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_free(card_sequence._buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_add_1 (PASBookView *book_view,</div><div class='del'>-			    const char  *card)</div><div class='del'>-{</div><div class='del'>-	GList *list = g_list_append(NULL, (char *) card);</div><div class='del'>-	pas_book_view_notify_add(book_view, list);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_complete (PASBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_view_notify_status_message (PASBookView *book_view,</div><div class='del'>-				     const char  *message)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, message, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_status_message: Exception signaling BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_book_view_construct (PASBookView                *book_view,</div><div class='del'>-			 GNOME_Evolution_Addressbook_BookViewListener  listener)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookView *servant;</div><div class='del'>-	CORBA_Environment   ev;</div><div class='del'>-	CORBA_Object        obj;</div><div class='del'>-</div><div class='del'>-	g_assert (book_view      != NULL);</div><div class='del'>-	g_assert (PAS_IS_BOOK_VIEW (book_view));</div><div class='del'>-	g_assert (listener  != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;pas_book_view_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_dup_ref (listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("Unable to duplicate &amp; ref listener object in pas-book-view.c\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book_view), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (book_view), obj);</div><div class='del'>-</div><div class='del'>-	book_view-&gt;priv-&gt;listener  = listener;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_new:</div><div class='del'>- */</div><div class='del'>-PASBookView *</div><div class='del'>-pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBookView *book_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	book_view = gtk_type_new (pas_book_view_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_book_view_construct (book_view, listener)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book_view));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return book_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBookView *book_view = PAS_BOOK_VIEW (object);</div><div class='del'>-	CORBA_Environment   ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (book_view-&gt;priv-&gt;listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (book_view-&gt;priv);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_book_view_parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_BookView__epv *</div><div class='del'>-pas_book_view_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_BookView__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookView__epv, 1);</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_view_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	pas_book_view_vepv.Bonobo_Unknown_epv     = bonobo_object_get_epv ();</div><div class='del'>-	pas_book_view_vepv.GNOME_Evolution_Addressbook_BookView_epv = pas_book_view_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_view_class_init (PASBookViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	pas_book_view_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_book_view_destroy;</div><div class='del'>-</div><div class='del'>-	pas_book_view_corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_view_init (PASBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	book_view-&gt;priv           = g_new0 (PASBookViewPrivate, 1);</div><div class='del'>-	book_view-&gt;priv-&gt;listener = CORBA_OBJECT_NIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_book_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBookView",</div><div class='del'>-			sizeof (PASBookView),</div><div class='del'>-			sizeof (PASBookViewClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_book_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_book_view_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h<br/>deleted file mode 100644<br/>index 26bf360f17..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface</div><div class='del'>- * and which maintains a request queue.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BOOK_VIEW_H__</div><div class='del'>-#define __PAS_BOOK_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;pas/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _PASBookView        PASBookView;</div><div class='del'>-typedef struct _PASBookViewClass   PASBookViewClass;</div><div class='del'>-typedef struct _PASBookViewPrivate PASBookViewPrivate;</div><div class='del'>-</div><div class='del'>-struct _PASBookView {</div><div class='del'>-	BonoboObject     parent_object;</div><div class='del'>-	PASBookViewPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASBookViewClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-PASBookView *pas_book_view_new                    (GNOME_Evolution_Addressbook_BookViewListener  listener);</div><div class='del'>-</div><div class='del'>-void         pas_book_view_notify_change          (PASBookView                *book_view,</div><div class='del'>-						   const GList                *cards);</div><div class='del'>-void         pas_book_view_notify_change_1        (PASBookView                *book_view,</div><div class='del'>-						   const char                 *card);</div><div class='del'>-void         pas_book_view_notify_remove          (PASBookView                *book_view,</div><div class='del'>-						   const char                 *id);</div><div class='del'>-void         pas_book_view_notify_add             (PASBookView                *book_view,</div><div class='del'>-						   const GList                *cards);</div><div class='del'>-void         pas_book_view_notify_add_1           (PASBookView                *book_view,</div><div class='del'>-						   const char                 *card);</div><div class='del'>-void         pas_book_view_notify_complete        (PASBookView                *book_view);</div><div class='del'>-void         pas_book_view_notify_status_message  (PASBookView                *book_view,</div><div class='del'>-						   const char                 *message);</div><div class='del'>-</div><div class='del'>-GtkType      pas_book_view_get_type               (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())</div><div class='del'>-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))</div><div class='del'>-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))</div><div class='del'>-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))</div><div class='del'>-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BOOK_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c<br/>deleted file mode 100644<br/>index 9bb2cd348e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,948 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * pas-book.c</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-util/e-list.h"</div><div class='del'>-#include "pas-book.h"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *pas_book_parent_class;</div><div class='del'>-POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	REQUESTS_QUEUED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint pas_book_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-struct _PASBookPrivate {</div><div class='del'>-	PASBackend             *backend;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener  listener;</div><div class='del'>-</div><div class='del'>-	GList                  *request_queue;</div><div class='del'>-	gint                    timeout_id;</div><div class='del'>-	</div><div class='del'>-	guint                   timeout_lock : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_book_check_queue (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	if (book-&gt;priv-&gt;timeout_lock)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;timeout_lock = TRUE;</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;request_queue != NULL) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (book),</div><div class='del'>-				 pas_book_signals [REQUESTS_QUEUED]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;request_queue == NULL) {</div><div class='del'>-		book-&gt;priv-&gt;timeout_id = 0;</div><div class='del'>-		book-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (book));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;timeout_lock = FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_request (PASBook *book, PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	book-&gt;priv-&gt;request_queue =</div><div class='del'>-		g_list_append (book-&gt;priv-&gt;request_queue, req);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;timeout_id == 0) {</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (book));</div><div class='del'>-		book-&gt;priv-&gt;timeout_id = g_timeout_add (20, (GSourceFunc) pas_book_check_queue, book);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_create_card (PASBook *book, const char *vcard)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req        = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op    = CreateCard;</div><div class='del'>-	req-&gt;create.vcard = g_strdup (vcard);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_remove_card (PASBook *book, const char *id)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req     = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op = RemoveCard;</div><div class='del'>-	req-&gt;remove.id = g_strdup (id);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_modify_card (PASBook *book, const char *vcard)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req        = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op    = ModifyCard;</div><div class='del'>-	req-&gt;modify.vcard = g_strdup (vcard);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_get_cursor (PASBook *book, const char *search)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req         = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op     = GetCursor;</div><div class='del'>-	req-&gt;get_cursor.search = g_strdup(search);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_get_vcard (PASBook *book, const char *id)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req     = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op = GetVCard;</div><div class='del'>-	req-&gt;get_vcard.id = g_strdup(id);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_authenticate_user (PASBook *book,</div><div class='del'>-				  const char *user, const char *passwd, const char *auth_method)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req         = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op     = AuthenticateUser;</div><div class='del'>-	req-&gt;auth_user.user   = g_strdup(user);</div><div class='del'>-	req-&gt;auth_user.passwd = g_strdup(passwd);</div><div class='del'>-	req-&gt;auth_user.auth_method = g_strdup(auth_method);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_get_supported_fields (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req     = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op = GetSupportedFields;</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	req           = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op       = GetBookView;</div><div class='del'>-	req-&gt;get_book_view.search   = g_strdup(search);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	req-&gt;get_book_view.listener = bonobo_object_dup_ref(listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_queue_get_book_view: Exception "</div><div class='del'>-			   "duplicating BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	req           = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op       = GetChanges;</div><div class='del'>-	req-&gt;get_changes.change_id= g_strdup(change_id);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	req-&gt;get_changes.listener = bonobo_object_dup_ref(listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_queue_get_changes: Exception "</div><div class='del'>-			   "duplicating BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_check_connection (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req        = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op    = CheckConnection;</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,</div><div class='del'>-						const GNOME_Evolution_Addressbook_CardId id,</div><div class='del'>-						CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_get_vcard (book, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_authenticateUser (PortableServer_Servant servant,</div><div class='del'>-							const char* user,</div><div class='del'>-							const char* passwd,</div><div class='del'>-							const char* auth_method,</div><div class='del'>-							CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_authenticate_user (book, user, passwd, auth_method);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,</div><div class='del'>-				 const GNOME_Evolution_Addressbook_VCard vcard,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_create_card (book, (const char *) vcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,</div><div class='del'>-				 const GNOME_Evolution_Addressbook_CardId id,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_remove_card (book, (const char *) id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,</div><div class='del'>-				 const GNOME_Evolution_Addressbook_VCard vcard,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_modify_card (book, (const char *) vcard);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant,</div><div class='del'>-				const CORBA_char *search,</div><div class='del'>-				CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_get_cursor (book, search);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,</div><div class='del'>-				   const GNOME_Evolution_Addressbook_BookViewListener listener,</div><div class='del'>-				   const CORBA_char *search,</div><div class='del'>-				   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_get_book_view (book, listener, search);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,</div><div class='del'>-				 const GNOME_Evolution_Addressbook_BookViewListener listener,</div><div class='del'>-				 const CORBA_char *change_id,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_get_changes (book, listener, change_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,</div><div class='del'>-				      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_check_connection (book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant,</div><div class='del'>-					     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-	char *temp;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	temp = pas_backend_get_static_capabilities (book-&gt;priv-&gt;backend);</div><div class='del'>-	ret_val = CORBA_string_dup(temp);</div><div class='del'>-	g_free(temp);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Addressbook_Book_getSupportedFields (PortableServer_Servant servant,</div><div class='del'>-							  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	pas_book_queue_get_supported_fields (book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_get_backend:</div><div class='del'>- */</div><div class='del'>-PASBackend *</div><div class='del'>-pas_book_get_backend (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (book != NULL,       NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);</div><div class='del'>-</div><div class='del'>-	return book-&gt;priv-&gt;backend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_get_listener:</div><div class='del'>- */</div><div class='del'>-GNOME_Evolution_Addressbook_BookListener</div><div class='del'>-pas_book_get_listener (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (book != NULL,       CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK (book), CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	return book-&gt;priv-&gt;listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_check_pending</div><div class='del'>- */</div><div class='del'>-gint</div><div class='del'>-pas_book_check_pending (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (book != NULL,       -1);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK (book), -1);</div><div class='del'>-</div><div class='del'>-	return g_list_length (book-&gt;priv-&gt;request_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_pop_request:</div><div class='del'>- */</div><div class='del'>-PASRequest *</div><div class='del'>-pas_book_pop_request (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	GList      *popped;</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book != NULL,       NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;request_queue == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	req = book-&gt;priv-&gt;request_queue-&gt;data;</div><div class='del'>-</div><div class='del'>-	popped = book-&gt;priv-&gt;request_queue;</div><div class='del'>-	book-&gt;priv-&gt;request_queue =</div><div class='del'>-		g_list_remove_link (book-&gt;priv-&gt;request_queue, popped);</div><div class='del'>-</div><div class='del'>-	g_list_free_1 (popped);</div><div class='del'>-</div><div class='del'>-	return req;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_open:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_open (PASBook                           *book,</div><div class='del'>-		       GNOME_Evolution_Addressbook_BookListener_CallStatus  status)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (status == GNOME_Evolution_Addressbook_BookListener_Success) {</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-			book-&gt;priv-&gt;listener, status,</div><div class='del'>-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),</div><div class='del'>-			&amp;ev);</div><div class='del'>-	} else {</div><div class='del'>-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (</div><div class='del'>-			book-&gt;priv-&gt;listener, status,</div><div class='del'>-			CORBA_OBJECT_NIL, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_open: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_create:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_create (PASBook                           *book,</div><div class='del'>-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-			 const char                        *id)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, (char *)id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_create: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_remove:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_remove (PASBook                           *book,</div><div class='del'>-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_remove: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_modify:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_modify (PASBook                           *book,</div><div class='del'>-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyCardModified (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_modify: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_authenticate_user:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_authenticate_user (PASBook                           *book,</div><div class='del'>-				    GNOME_Evolution_Addressbook_BookListener_CallStatus  status)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyAuthenticationResult (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_authenticate_user: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_supported_fields (PASBook *book,</div><div class='del'>-				       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-				       EList   *fields)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Addressbook_stringlist stringlist;</div><div class='del'>-	int num_fields;</div><div class='del'>-	EIterator *iter;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	num_fields = e_list_length (fields);</div><div class='del'>-</div><div class='del'>-	stringlist._buffer = CORBA_sequence_CORBA_string_allocbuf (num_fields);</div><div class='del'>-	stringlist._maximum = num_fields;</div><div class='del'>-	stringlist._length = num_fields;</div><div class='del'>-</div><div class='del'>-	iter = e_list_get_iterator (fields);</div><div class='del'>-</div><div class='del'>-	for (i = 0; e_iterator_is_valid (iter); e_iterator_next (iter), i ++) {</div><div class='del'>-		stringlist._buffer[i] = CORBA_string_dup (e_iterator_get(iter));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (fields));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifySupportedFields (</div><div class='del'>-			book-&gt;priv-&gt;listener, status,</div><div class='del'>-			&amp;stringlist,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_free(stringlist._buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_get_cursor:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_cursor (PASBook                           *book,</div><div class='del'>-			     GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-			     PASCardCursor                     *cursor)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object      object;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_get_cursor: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_get_book_view:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_book_view (PASBook                           *book,</div><div class='del'>-				GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-				PASBookView                       *book_view)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object      object;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_get_book_view: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_get_changes:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_vcard (PASBook                           *book,</div><div class='del'>-			    GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-			    char                              *vcard)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyCardRequested (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, vcard, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_get_card: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_respond_get_changes:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_changes (PASBook                           *book,</div><div class='del'>-			      GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-			      PASBookView                       *book_view)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object      object;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_get_changes: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_report_connection:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_report_connection (PASBook  *book,</div><div class='del'>-			    gboolean  connected)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (</div><div class='del'>-		book-&gt;priv-&gt;listener, (CORBA_boolean) connected, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_report_connection: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_report_writable:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_report_writable (PASBook                           *book,</div><div class='del'>-			  gboolean                           writable)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_BookListener_notifyWritable (</div><div class='del'>-		book-&gt;priv-&gt;listener, (CORBA_boolean) writable, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_report_writable: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_book_construct (PASBook                *book,</div><div class='del'>-		    PASBackend             *backend,</div><div class='del'>-		    GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_Book *servant;</div><div class='del'>-	CORBA_Environment   ev;</div><div class='del'>-	CORBA_Object        obj;</div><div class='del'>-</div><div class='del'>-	g_assert (book      != NULL);</div><div class='del'>-	g_assert (PAS_IS_BOOK (book));</div><div class='del'>-	g_assert (listener  != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;pas_book_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (book), obj);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	book-&gt;priv-&gt;listener = CORBA_Object_duplicate (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("pas_book_construct(): could not duplicate the listener");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	book-&gt;priv-&gt;listener  = listener;</div><div class='del'>-	book-&gt;priv-&gt;backend   = backend;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_new:</div><div class='del'>- */</div><div class='del'>-PASBook *</div><div class='del'>-pas_book_new (PASBackend             *backend,</div><div class='del'>-	      GNOME_Evolution_Addressbook_BookListener  listener)</div><div class='del'>-{</div><div class='del'>-	PASBook *book;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	book = gtk_type_new (pas_book_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_book_construct (book, backend, listener)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return book;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pas_book_free_request (PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	switch (req-&gt;op) {</div><div class='del'>-	case CreateCard:</div><div class='del'>-		g_free (req-&gt;create.id);</div><div class='del'>-		g_free (req-&gt;create.vcard);</div><div class='del'>-		break;</div><div class='del'>-	case RemoveCard:</div><div class='del'>-		g_free (req-&gt;remove.id);</div><div class='del'>-		break;</div><div class='del'>-	case ModifyCard:</div><div class='del'>-		g_free (req-&gt;modify.vcard);</div><div class='del'>-		break;</div><div class='del'>-	case GetVCard:</div><div class='del'>-		g_free (req-&gt;get_vcard.id);</div><div class='del'>-		break;</div><div class='del'>-	case GetCursor:</div><div class='del'>-		g_free (req-&gt;get_cursor.search);</div><div class='del'>-		break;</div><div class='del'>-	case GetBookView:</div><div class='del'>-		g_free (req-&gt;get_book_view.search);</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (req-&gt;get_book_view.listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("pas_book_free_request(GetBookView): could not release the listener");</div><div class='del'>-	</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		break;</div><div class='del'>-	case GetChanges:</div><div class='del'>-		g_free (req-&gt;get_changes.change_id);</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (req-&gt;get_changes.listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("pas_book_free_request(GetChanges): could not release the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		break;</div><div class='del'>-	case CheckConnection:</div><div class='del'>-		/* nothing to free */</div><div class='del'>-		break;</div><div class='del'>-	case AuthenticateUser:</div><div class='del'>-		g_free (req-&gt;auth_user.user);</div><div class='del'>-		g_free (req-&gt;auth_user.passwd);</div><div class='del'>-		g_free (req-&gt;auth_user.auth_method);</div><div class='del'>-		break;</div><div class='del'>-	case GetSupportedFields:</div><div class='del'>-		/* nothing to free */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (object);</div><div class='del'>-	GList   *l;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	for (l = book-&gt;priv-&gt;request_queue; l != NULL; l = l-&gt;next) {</div><div class='del'>-		pas_book_free_request ((PASRequest *)l-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (book-&gt;priv-&gt;request_queue);</div><div class='del'>-</div><div class='del'>-	/* We should never ever have timeout_id == 0 when we get destroyed, unless there</div><div class='del'>-	   is some sort of reference counting bug.  Still, we do this to try to avoid</div><div class='del'>-	   horrible crashes in those situations. */</div><div class='del'>-	if (book-&gt;priv-&gt;timeout_id) {</div><div class='del'>-		g_warning ("PASBook destroyed with non-zero timeout_id.  This shouldn't happen.");</div><div class='del'>-		g_source_remove (book-&gt;priv-&gt;timeout_id);</div><div class='del'>-		book-&gt;priv-&gt;timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (book-&gt;priv-&gt;listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("pas_book_construct(): could not release the listener");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (book-&gt;priv);</div><div class='del'>-	book-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_book_parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_Book__epv *</div><div class='del'>-pas_book_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_Book__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;getVCard              = impl_GNOME_Evolution_Addressbook_Book_getVCard;</div><div class='del'>-	epv-&gt;authenticateUser      = impl_GNOME_Evolution_Addressbook_Book_authenticateUser;</div><div class='del'>-	epv-&gt;addCard               = impl_GNOME_Evolution_Addressbook_Book_addCard;</div><div class='del'>-	epv-&gt;removeCard            = impl_GNOME_Evolution_Addressbook_Book_removeCard;</div><div class='del'>-	epv-&gt;modifyCard            = impl_GNOME_Evolution_Addressbook_Book_modifyCard;</div><div class='del'>-	epv-&gt;checkConnection       = impl_GNOME_Evolution_Addressbook_Book_checkConnection;</div><div class='del'>-	epv-&gt;getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;</div><div class='del'>-	epv-&gt;getSupportedFields    = impl_GNOME_Evolution_Addressbook_Book_getSupportedFields;</div><div class='del'>-	epv-&gt;getCursor             = impl_GNOME_Evolution_Addressbook_Book_getCursor;</div><div class='del'>-	epv-&gt;getBookView           = impl_GNOME_Evolution_Addressbook_Book_getBookView;</div><div class='del'>-	epv-&gt;getChanges            = impl_GNOME_Evolution_Addressbook_Book_getChanges;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();</div><div class='del'>-	pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_class_init (PASBookClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	pas_book_signals [REQUESTS_QUEUED] =</div><div class='del'>-		gtk_signal_new ("requests_queued",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (PASBookClass, requests_queued),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, pas_book_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_book_destroy;</div><div class='del'>-</div><div class='del'>-	pas_book_corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_init (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	book-&gt;priv                = g_new0 (PASBookPrivate, 1);</div><div class='del'>-	book-&gt;priv-&gt;timeout_id    = 0;</div><div class='del'>-	book-&gt;priv-&gt;request_queue = NULL;</div><div class='del'>-	book-&gt;priv-&gt;timeout_id    = 0;</div><div class='del'>-	book-&gt;priv-&gt;timeout_lock  = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_book_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBook",</div><div class='del'>-			sizeof (PASBook),</div><div class='del'>-			sizeof (PASBookClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_book_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_book_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h<br/>deleted file mode 100644<br/>index a6f2fda3cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-book.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface</div><div class='del'>- * and which maintains a request queue.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_BOOK_H__</div><div class='del'>-#define __PAS_BOOK_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;pas/addressbook.h&gt;</div><div class='del'>-#include &lt;pas/pas-book-view.h&gt;</div><div class='del'>-#include "e-util/e-list.h"</div><div class='del'>-</div><div class='del'>-typedef struct _PASBook        PASBook;</div><div class='del'>-typedef struct _PASBookPrivate PASBookPrivate;</div><div class='del'>-</div><div class='del'>-#include &lt;pas/pas-backend.h&gt;</div><div class='del'>-#include &lt;pas/pas-card-cursor.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CreateCard,</div><div class='del'>-	RemoveCard,</div><div class='del'>-	ModifyCard,</div><div class='del'>-	GetVCard,</div><div class='del'>-	GetCursor,</div><div class='del'>-	GetBookView,</div><div class='del'>-	GetChanges,</div><div class='del'>-	CheckConnection,</div><div class='del'>-	AuthenticateUser,</div><div class='del'>-	GetSupportedFields</div><div class='del'>-} PASOperation;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *id;</div><div class='del'>-	char *vcard;</div><div class='del'>-} PASCreateCardRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *id;</div><div class='del'>-} PASRemoveCardRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *vcard;</div><div class='del'>-} PASModifyCardRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *id;</div><div class='del'>-} PASGetVCardRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *search;</div><div class='del'>-} PASGetCursorRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *search;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener listener;</div><div class='del'>-} PASGetBookViewRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *change_id;</div><div class='del'>-	GNOME_Evolution_Addressbook_BookViewListener listener;</div><div class='del'>-} PASGetChangesRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-} PASCheckConnectionRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-	char *user;</div><div class='del'>-        char *passwd;</div><div class='del'>-	char *auth_method;</div><div class='del'>-} PASAuthenticateUserRequest;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	PASOperation op;</div><div class='del'>-} PASGetSupportedFieldsRequest;</div><div class='del'>-</div><div class='del'>-typedef union {</div><div class='del'>-	PASOperation               op;</div><div class='del'>-</div><div class='del'>-	PASCreateCardRequest       create;</div><div class='del'>-	PASRemoveCardRequest       remove;</div><div class='del'>-	PASModifyCardRequest       modify;</div><div class='del'>-	PASGetVCardRequest         get_vcard;</div><div class='del'>-	PASGetCursorRequest        get_cursor;</div><div class='del'>-	PASGetBookViewRequest      get_book_view;</div><div class='del'>-	PASGetChangesRequest       get_changes;</div><div class='del'>-	PASCheckConnectionRequest  check_connection;</div><div class='del'>-	PASAuthenticateUserRequest auth_user;</div><div class='del'>-	PASGetSupportedFieldsRequest get_supported_fields;</div><div class='del'>-} PASRequest;</div><div class='del'>-</div><div class='del'>-struct _PASBook {</div><div class='del'>-	BonoboObject     parent_object;</div><div class='del'>-	PASBookPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Signals */</div><div class='del'>-	void (*requests_queued) (void);</div><div class='del'>-} PASBookClass;</div><div class='del'>-</div><div class='del'>-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);</div><div class='del'>-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);</div><div class='del'>-</div><div class='del'>-PASBook                *pas_book_new                    (PASBackend                        *backend,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener             listener);</div><div class='del'>-PASBackend             *pas_book_get_backend            (PASBook                           *book);</div><div class='del'>-GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);</div><div class='del'>-int                     pas_book_check_pending          (PASBook                           *book);</div><div class='del'>-PASRequest             *pas_book_pop_request            (PASBook                           *book);</div><div class='del'>-void                    pas_book_free_request           (PASRequest                        *request);</div><div class='del'>-void                    pas_book_respond_open           (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_create         (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							 const char                        *id);</div><div class='del'>-void                    pas_book_respond_remove         (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_modify         (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_authenticate_user (PASBook                           *book,</div><div class='del'>-							    GNOME_Evolution_Addressbook_BookListener_CallStatus  status);</div><div class='del'>-void                    pas_book_respond_get_supported_fields (PASBook *book,</div><div class='del'>-							       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							       EList   *fields);</div><div class='del'>-</div><div class='del'>-void                    pas_book_respond_get_cursor     (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							 PASCardCursor                     *cursor);</div><div class='del'>-void                    pas_book_respond_get_book_view  (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							 PASBookView                       *book_view);</div><div class='del'>-void                    pas_book_respond_get_vcard      (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							 char                              *vcard);</div><div class='del'>-void                    pas_book_respond_get_changes    (PASBook                           *book,</div><div class='del'>-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,</div><div class='del'>-							 PASBookView                       *book_view);</div><div class='del'>-void                    pas_book_report_connection      (PASBook                           *book,</div><div class='del'>-							 gboolean                           connected);</div><div class='del'>-</div><div class='del'>-void                    pas_book_report_writable        (PASBook                           *book,</div><div class='del'>-							 gboolean                           writable);</div><div class='del'>-</div><div class='del'>-GtkType                 pas_book_get_type               (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BOOK_TYPE        (pas_book_get_type ())</div><div class='del'>-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))</div><div class='del'>-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))</div><div class='del'>-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))</div><div class='del'>-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BOOK_H__ */</div><div class='head'>diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c<br/>deleted file mode 100644<br/>index 572f63f46e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-card-cursor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-card-cursor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * pas-card-cursor.c: Implements card cursors.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "pas-card-cursor.h"</div><div class='del'>-</div><div class='del'>-struct _PASCardCursorPrivate {</div><div class='del'>-	long     (*get_length) (PASCardCursor *cursor, gpointer data);</div><div class='del'>-	char *   (*get_nth)    (PASCardCursor *cursor, long n, gpointer data);</div><div class='del'>-	gpointer   data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A pointer to our parent object class</div><div class='del'>- */</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The VEPV for the CardCursor object</div><div class='del'>- */</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_CardCursor__vepv cursor_vepv;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Implemented GtkObject::destroy</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pas_card_cursor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASCardCursor *cursor = PAS_CARD_CURSOR (object);</div><div class='del'>-</div><div class='del'>-	if ( cursor-&gt;priv )</div><div class='del'>-		g_free ( cursor-&gt;priv );</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CORBA Demo::Echo::echo method implementation</div><div class='del'>- */</div><div class='del'>-static CORBA_long</div><div class='del'>-impl_pas_card_cursor_get_length (PortableServer_Servant  servant,</div><div class='del'>-			       CORBA_Environment      *ev)</div><div class='del'>-{</div><div class='del'>-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));</div><div class='del'>-	if ( cursor-&gt;priv-&gt;get_length )</div><div class='del'>-		return cursor-&gt;priv-&gt;get_length( cursor, cursor-&gt;priv-&gt;data );</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CORBA Demo::Echo::echo method implementation</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-impl_pas_card_cursor_get_nth (PortableServer_Servant  servant,</div><div class='del'>-			    const CORBA_long        n,</div><div class='del'>-			    CORBA_Environment      *ev)</div><div class='del'>-{</div><div class='del'>-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));</div><div class='del'>-	if ( cursor-&gt;priv-&gt;get_nth ) {</div><div class='del'>-		char *vcard = cursor-&gt;priv-&gt;get_nth( cursor, n, cursor-&gt;priv-&gt;data );</div><div class='del'>-		char *retval = CORBA_string_dup (vcard);</div><div class='del'>-		g_free (vcard);</div><div class='del'>-		return retval;</div><div class='del'>-	} else</div><div class='del'>-		return CORBA_string_dup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * If you want users to derive classes from your implementation</div><div class='del'>- * you need to support this method.</div><div class='del'>- */</div><div class='del'>-POA_GNOME_Evolution_Addressbook_CardCursor__epv *</div><div class='del'>-pas_card_cursor_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is the method invoked by CORBA</div><div class='del'>-	 */</div><div class='del'>-	epv-&gt;count  = impl_pas_card_cursor_get_length;</div><div class='del'>-	epv-&gt;getNth = impl_pas_card_cursor_get_nth;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_pas_card_cursor_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	cursor_vepv.Bonobo_Unknown_epv       = bonobo_object_get_epv ();</div><div class='del'>-	cursor_vepv.GNOME_Evolution_Addressbook_CardCursor_epv = pas_card_cursor_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_card_cursor_class_init (PASCardCursorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_card_cursor_destroy;</div><div class='del'>-</div><div class='del'>-	init_pas_card_cursor_corba_class ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_card_cursor_init (PASCardCursor *cursor)</div><div class='del'>-{</div><div class='del'>-	cursor-&gt;priv = g_new(PASCardCursorPrivate, 1);</div><div class='del'>-	cursor-&gt;priv-&gt;get_length = NULL;</div><div class='del'>-	cursor-&gt;priv-&gt;get_nth = NULL;</div><div class='del'>-	cursor-&gt;priv-&gt;data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-pas_card_cursor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASCardCursor",</div><div class='del'>-			sizeof (PASCardCursor),</div><div class='del'>-			sizeof (PASCardCursorClass),</div><div class='del'>-			(GtkClassInitFunc) pas_card_cursor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_card_cursor_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-PASCardCursor *</div><div class='del'>-pas_card_cursor_construct (PASCardCursor           *cursor,</div><div class='del'>-			   GNOME_Evolution_Addressbook_CardCursor     corba_cursor,</div><div class='del'>-			   PASCardCursorLengthFunc  get_length,</div><div class='del'>-			   PASCardCursorNthFunc     get_nth,</div><div class='del'>-			   gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (cursor != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_CARD_CURSOR (cursor), NULL);</div><div class='del'>-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Call parent constructor</div><div class='del'>-	 */</div><div class='del'>-	if (!bonobo_object_construct (BONOBO_OBJECT (cursor), (CORBA_Object) corba_cursor))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Initialize cursor</div><div class='del'>-	 */</div><div class='del'>-	cursor-&gt;priv-&gt;get_length = get_length;</div><div class='del'>-	cursor-&gt;priv-&gt;get_nth = get_nth;</div><div class='del'>-	cursor-&gt;priv-&gt;data = data;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Success: return the GtkType we were given</div><div class='del'>-	 */</div><div class='del'>-	return cursor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This routine creates the ORBit CORBA server and initializes the</div><div class='del'>- * CORBA side of things</div><div class='del'>- */</div><div class='del'>-static GNOME_Evolution_Addressbook_CardCursor</div><div class='del'>-create_cursor (BonoboObject *cursor)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_CardCursor *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;cursor_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_CardCursor__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Activates the CORBA object.</div><div class='del'>-	 */</div><div class='del'>-	return (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-PASCardCursor *</div><div class='del'>-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,</div><div class='del'>-		     PASCardCursorNthFunc     get_nth,</div><div class='del'>-		     gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASCardCursor *cursor;</div><div class='del'>-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;</div><div class='del'>-</div><div class='del'>-	cursor = gtk_type_new (pas_card_cursor_get_type ());</div><div class='del'>-	corba_cursor = create_cursor (BONOBO_OBJECT (cursor));</div><div class='del'>-</div><div class='del'>-	if (corba_cursor == CORBA_OBJECT_NIL){</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (cursor));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return pas_card_cursor_construct (cursor,</div><div class='del'>-					  corba_cursor,</div><div class='del'>-					  get_length,</div><div class='del'>-					  get_nth,</div><div class='del'>-					  data);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h<br/>deleted file mode 100644<br/>index 70ecb5e718..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-card-cursor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/backend/pas/pas-card-cursor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __PAS_CARD_CURSOR_H__</div><div class='del'>-#define __PAS_CARD_CURSOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;pas/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef struct _PASCardCursor        PASCardCursor;</div><div class='del'>-typedef struct _PASCardCursorPrivate PASCardCursorPrivate;</div><div class='del'>-typedef struct _PASCardCursorClass   PASCardCursorClass;</div><div class='del'>-</div><div class='del'>-typedef long (*PASCardCursorLengthFunc) (PASCardCursor *cursor, gpointer data);</div><div class='del'>-typedef char * (*PASCardCursorNthFunc) (PASCardCursor *cursor, long n, gpointer data);</div><div class='del'>-</div><div class='del'>-struct _PASCardCursor {</div><div class='del'>-	BonoboObject     parent;</div><div class='del'>-	PASCardCursorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _PASCardCursorClass {</div><div class='del'>-	BonoboObjectClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,</div><div class='del'>-				          PASCardCursorNthFunc     get_nth,</div><div class='del'>-					  gpointer data);</div><div class='del'>-PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,</div><div class='del'>-					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,</div><div class='del'>-					  PASCardCursorLengthFunc  get_length,</div><div class='del'>-					  PASCardCursorNthFunc     get_nth,</div><div class='del'>-					  gpointer data);</div><div class='del'>-</div><div class='del'>-GtkType        pas_card_cursor_get_type  (void);</div><div class='del'>-POA_GNOME_Evolution_Addressbook_CardCursor__epv *</div><div class='del'>-               pas_card_cursor_get_epv   (void);</div><div class='del'>-</div><div class='del'>-/* Fetching cards. */</div><div class='del'>-#define PAS_CARD_CURSOR_TYPE        (pas_card_cursor_get_type ())</div><div class='del'>-#define PAS_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), PAS_CARD_CURSOR_TYPE, PASCardCursor))</div><div class='del'>-#define PAS_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_CARD_CURSOR_TYPE, PASCardCursorClass))</div><div class='del'>-#define PAS_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), PAS_CARD_CURSOR_TYPE))</div><div class='del'>-#define PAS_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_CARD_CURSOR_TYPE))</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_CARD_CURSOR_H__ */</div><div class='head'>diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore<br/>deleted file mode 100644<br/>index 87b35d3be5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/conduit/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-libeaddress_conduit.la</div><div class='del'>-e-address-conduit-control-applet</div><div class='del'>-e-address-conduit-control-applet.desktop</div><div class='del'>-e-address.conduit</div><div class='head'>diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am<br/>deleted file mode 100644<br/>index 86be3b2fed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/conduit/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/addressbook		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend	\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(PISOCK_CFLAGS)			\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"</div><div class='del'>-</div><div class='del'>-# Address Conduit</div><div class='del'>-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la</div><div class='del'>-</div><div class='del'>-libeaddress_conduit_la_SOURCES = \</div><div class='del'>-	address-conduit.c</div><div class='del'>-</div><div class='del'>-libeaddress_conduit_la_LDFLAGS = -module -avoid-version</div><div class='del'>-libeaddress_conduit_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename-static.la			\</div><div class='del'>-	$(top_builddir)/libversit/libversit_lt.la			\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(top_builddir)/camel/libcamel-static.la	 		\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)</div><div class='del'>-</div><div class='del'>-e-address.conduit: e-address.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' 				\</div><div class='del'>-	    -e 's^\@datadir\@^$(datadir)^g' 				\</div><div class='del'>-	    &lt; $(srcdir)/e-address.conduit.in &gt; e-address.conduit.tmp 	\</div><div class='del'>-	&amp;&amp; mv e-address.conduit.tmp e-address.conduit</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-address.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-address.conduit.in</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='head'>diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c<br/>deleted file mode 100644<br/>index 48f3fa03d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/address-conduit.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/conduit/address-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1911 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution addressbook - Address Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;pi-address.h&gt;</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-types.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-cursor.h&gt;</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-sync-abs.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-#include &lt;e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-#include &lt;e-pilot-settings.h&gt;</div><div class='del'>-#include &lt;e-pilot-util.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.2"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "eaddrconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_CONDUIT 1</div><div class='del'>-/* #undef DEBUG_CONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookStatus status;</div><div class='del'>-	char *id;</div><div class='del'>-} CardObjectChangeStatus;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CARD_ADDED,</div><div class='del'>-	CARD_MODIFIED,</div><div class='del'>-	CARD_DELETED</div><div class='del'>-} CardObjectChangeType;</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	CardObjectChangeType type;</div><div class='del'>-} CardObjectChange;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LABEL_WORK,</div><div class='del'>-	LABEL_HOME,</div><div class='del'>-	LABEL_FAX,</div><div class='del'>-	LABEL_OTHER,</div><div class='del'>-	LABEL_EMAIL,</div><div class='del'>-	LABEL_MAIN,</div><div class='del'>-	LABEL_PAGER,</div><div class='del'>-	LABEL_MOBILE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECardSimpleField priority [] = {</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_HOME,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_EMAIL,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_PAGER,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_MOBILE,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_HOME_2,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_EMAIL_2,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_OTHER,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_EMAIL_3,</div><div class='del'>-	E_CARD_SIMPLE_FIELD_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int priority_label [] = {</div><div class='del'>-	LABEL_WORK,</div><div class='del'>-	LABEL_HOME,</div><div class='del'>-	LABEL_FAX,</div><div class='del'>-	LABEL_EMAIL,</div><div class='del'>-	LABEL_PAGER,</div><div class='del'>-	LABEL_MOBILE,</div><div class='del'>-	LABEL_WORK,</div><div class='del'>-	LABEL_HOME,</div><div class='del'>-	LABEL_FAX,</div><div class='del'>-	LABEL_EMAIL,</div><div class='del'>-	LABEL_OTHER,</div><div class='del'>-	LABEL_MAIN,</div><div class='del'>-	LABEL_FAX,</div><div class='del'>-	LABEL_EMAIL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _EAddrLocalRecord EAddrLocalRecord;</div><div class='del'>-typedef struct _EAddrConduitCfg EAddrConduitCfg;</div><div class='del'>-typedef struct _EAddrConduitGui EAddrConduitGui;</div><div class='del'>-typedef struct _EAddrConduitContext EAddrConduitContext;</div><div class='del'>-</div><div class='del'>-/* Local Record */</div><div class='del'>-struct _EAddrLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding ECard object */</div><div class='del'>-	ECard *ecard;</div><div class='del'>-</div><div class='del'>-        /* pilot-link address structure, used for implementing Transmit. */</div><div class='del'>-	struct Address *addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addrconduit_destroy_record (EAddrLocalRecord *local) </div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;ecard));</div><div class='del'>-	free_Address (local-&gt;addr);</div><div class='del'>-	g_free (local-&gt;addr);</div><div class='del'>-	g_free (local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Configuration */</div><div class='del'>-struct _EAddrConduitCfg {</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;</div><div class='del'>-</div><div class='del'>-	gboolean secret;</div><div class='del'>-	ECardSimpleAddressId default_address;</div><div class='del'>-</div><div class='del'>-	gchar *last_uri;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EAddrConduitCfg *</div><div class='del'>-addrconduit_load_configuration (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	EAddrConduitCfg *c;</div><div class='del'>-	GnomePilotConduitManagement *management;</div><div class='del'>-	GnomePilotConduitConfig *config;</div><div class='del'>-	gchar *address, prefix[256];</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",</div><div class='del'>-		    pilot_id);</div><div class='del'>-	</div><div class='del'>-	c = g_new0 (EAddrConduitCfg,1);</div><div class='del'>-	g_assert (c != NULL);</div><div class='del'>-</div><div class='del'>-	c-&gt;pilot_id = pilot_id;</div><div class='del'>-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	config = gnome_pilot_conduit_config_new (management, pilot_id);</div><div class='del'>-	if (!gnome_pilot_conduit_config_is_enabled (config, &amp;c-&gt;sync_type))</div><div class='del'>-		c-&gt;sync_type = GnomePilotConduitSyncTypeNotSet;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (config));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (management));</div><div class='del'>-</div><div class='del'>-	/* Custom settings */</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-</div><div class='del'>-	c-&gt;secret = gnome_config_get_bool ("secret=FALSE");</div><div class='del'>-	address = gnome_config_get_string ("default_address=business");</div><div class='del'>-	if (!strcmp (address, "business"))</div><div class='del'>-		c-&gt;default_address = E_CARD_SIMPLE_ADDRESS_ID_BUSINESS;</div><div class='del'>-	else if (!strcmp (address, "home"))</div><div class='del'>-		c-&gt;default_address = E_CARD_SIMPLE_ADDRESS_ID_HOME;</div><div class='del'>-	else if (!strcmp (address, "other"))</div><div class='del'>-		c-&gt;default_address = E_CARD_SIMPLE_ADDRESS_ID_OTHER;</div><div class='del'>-	g_free (address);</div><div class='del'>-	c-&gt;last_uri = gnome_config_get_string ("last_uri");</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addrconduit_save_configuration (EAddrConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",</div><div class='del'>-		    c-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	gnome_config_set_bool ("secret", c-&gt;secret);</div><div class='del'>-	switch (c-&gt;default_address) {</div><div class='del'>-	case E_CARD_SIMPLE_ADDRESS_ID_BUSINESS:</div><div class='del'>-		gnome_config_set_string ("default_address", "business");</div><div class='del'>-		break;</div><div class='del'>-	case E_CARD_SIMPLE_ADDRESS_ID_HOME:</div><div class='del'>-		gnome_config_set_string ("default_address", "home");</div><div class='del'>-		break;</div><div class='del'>-	case E_CARD_SIMPLE_ADDRESS_ID_OTHER:</div><div class='del'>-		gnome_config_set_string ("default_address", "other");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unknown default_address value");</div><div class='del'>-	}</div><div class='del'>-	gnome_config_set_string ("last_uri", c-&gt;last_uri);</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	gnome_config_drop_all ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EAddrConduitCfg*</div><div class='del'>-addrconduit_dupe_configuration (EAddrConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	EAddrConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (EAddrConduitCfg, 1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-</div><div class='del'>-	retval-&gt;secret = c-&gt;secret;</div><div class='del'>-	retval-&gt;default_address = c-&gt;default_address;</div><div class='del'>-	retval-&gt;last_uri = g_strdup (c-&gt;last_uri);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-addrconduit_destroy_configuration (EAddrConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (c-&gt;last_uri);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gui */</div><div class='del'>-struct _EAddrConduitGui {</div><div class='del'>-	GtkWidget *default_address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EAddrConduitGui *</div><div class='del'>-e_addr_gui_new (EPilotSettings *ps) </div><div class='del'>-{</div><div class='del'>-	EAddrConduitGui *gui;</div><div class='del'>-	GtkWidget *lbl, *menu;</div><div class='del'>-	gint rows, i;</div><div class='del'>-	static const char *items[] = {"Business", "Home", "Other", NULL};</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ps != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);</div><div class='del'>-</div><div class='del'>-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, </div><div class='del'>-			  E_PILOT_SETTINGS_TABLE_COLS);</div><div class='del'>-</div><div class='del'>-	gui = g_new0 (EAddrConduitGui, 1);</div><div class='del'>-</div><div class='del'>-	rows = E_PILOT_SETTINGS_TABLE_ROWS;</div><div class='del'>-	lbl = gtk_label_new (_("Default Sync Address:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);</div><div class='del'>-	gui-&gt;default_address = gtk_option_menu_new ();</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	for (i = 0; items[i] != NULL; i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (items[i]);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_show (menu);</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (gui-&gt;default_address), menu);</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);</div><div class='del'>-        gtk_table_attach_defaults (GTK_TABLE (ps), gui-&gt;default_address, 1, 2, rows, rows + 1);</div><div class='del'>-	gtk_widget_show (lbl);</div><div class='del'>-	gtk_widget_show (gui-&gt;default_address);</div><div class='del'>-	</div><div class='del'>-	return gui;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const int default_address_map[] = {</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_HOME,</div><div class='del'>-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addr_gui_fill_widgets (EAddrConduitGui *gui, EAddrConduitCfg *cfg) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gui != NULL);</div><div class='del'>-	g_return_if_fail (cfg != NULL);</div><div class='del'>-</div><div class='del'>-	e_dialog_option_menu_set (gui-&gt;default_address, </div><div class='del'>-				  cfg-&gt;default_address, </div><div class='del'>-				  default_address_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addr_gui_fill_config (EAddrConduitGui *gui, EAddrConduitCfg *cfg) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gui != NULL);</div><div class='del'>-	g_return_if_fail (cfg != NULL);</div><div class='del'>-</div><div class='del'>-	cfg-&gt;default_address = e_dialog_option_menu_get (gui-&gt;default_address, </div><div class='del'>-							 default_address_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addr_gui_destroy (EAddrConduitGui *gui) </div><div class='del'>-{</div><div class='del'>-	g_free (gui);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context */</div><div class='del'>-struct _EAddrConduitContext {</div><div class='del'>-	GnomePilotDBInfo *dbi;</div><div class='del'>-</div><div class='del'>-	EAddrConduitCfg *cfg;</div><div class='del'>-	EAddrConduitCfg *new_cfg;</div><div class='del'>-	EAddrConduitGui *gui;</div><div class='del'>-	GtkWidget *ps;</div><div class='del'>-	</div><div class='del'>-	struct AddressAppInfo ai;</div><div class='del'>-</div><div class='del'>-	EBook *ebook;</div><div class='del'>-	GList *cards;</div><div class='del'>-	GList *changed;</div><div class='del'>-	GHashTable *changed_hash;</div><div class='del'>-	GList *locals;</div><div class='del'>-	</div><div class='del'>-	gboolean address_load_tried;</div><div class='del'>-	gboolean address_load_success;</div><div class='del'>-</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EAddrConduitContext *</div><div class='del'>-e_addr_context_new (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;cfg = addrconduit_load_configuration (pilot_id);</div><div class='del'>-	ctxt-&gt;new_cfg = addrconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-	ctxt-&gt;gui = NULL;</div><div class='del'>-	ctxt-&gt;ps = NULL;</div><div class='del'>-	ctxt-&gt;ebook = NULL;</div><div class='del'>-	ctxt-&gt;cards = NULL;</div><div class='del'>-	ctxt-&gt;changed_hash = NULL;</div><div class='del'>-	ctxt-&gt;changed = NULL;</div><div class='del'>-	ctxt-&gt;locals = NULL;</div><div class='del'>-	ctxt-&gt;map = NULL;</div><div class='del'>-</div><div class='del'>-	return ctxt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addr_context_destroy (EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (ctxt != NULL);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;cfg != NULL)</div><div class='del'>-		addrconduit_destroy_configuration (ctxt-&gt;cfg);</div><div class='del'>-	if (ctxt-&gt;new_cfg != NULL)</div><div class='del'>-		addrconduit_destroy_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-	if (ctxt-&gt;gui != NULL)</div><div class='del'>-		e_addr_gui_destroy (ctxt-&gt;gui);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;ebook != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ctxt-&gt;ebook));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;cards != NULL) {</div><div class='del'>-		for (l = ctxt-&gt;cards; l != NULL; l = l-&gt;next)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (l-&gt;data));</div><div class='del'>-		g_list_free (ctxt-&gt;cards);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;changed_hash != NULL)</div><div class='del'>-		g_hash_table_destroy (ctxt-&gt;changed_hash);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;changed != NULL) {</div><div class='del'>-		CardObjectChange *coc;</div><div class='del'>-		</div><div class='del'>-		for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-			coc = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (coc-&gt;card));</div><div class='del'>-			g_free (coc);</div><div class='del'>-		}</div><div class='del'>-		g_list_free (ctxt-&gt;changed);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;locals != NULL) {</div><div class='del'>-		for (l = ctxt-&gt;locals; l != NULL; l = l-&gt;next)</div><div class='del'>-			addrconduit_destroy_record (l-&gt;data);</div><div class='del'>-		g_list_free (ctxt-&gt;locals);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;map != NULL)</div><div class='del'>-		e_pilot_map_destroy (ctxt-&gt;map);</div><div class='del'>-</div><div class='del'>-	g_free (ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug routines */</div><div class='del'>-static char *</div><div class='del'>-print_local (EAddrLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;addr) {</div><div class='del'>-		g_snprintf (buff, 4096, "['%s' '%s' '%s']",</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryLastname] ?</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryLastname] : "",</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryFirstname] ?</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryFirstname] : "",</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryCompany] ?</div><div class='del'>-			    local-&gt;addr-&gt;entry[entryCompany] : "");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct Address addr;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;addr, 0, sizeof (struct Address));</div><div class='del'>-	unpack_Address (&amp;addr, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	g_snprintf (buff, 4096, "['%s' '%s' '%s']",</div><div class='del'>-		    addr.entry[entryLastname] ?</div><div class='del'>-		    addr.entry[entryLastname] : "",</div><div class='del'>-		    addr.entry[entryFirstname] ?</div><div class='del'>-		    addr.entry[entryFirstname] : "",</div><div class='del'>-		    addr.entry[entryCompany] ?</div><div class='del'>-		    addr.entry[entryCompany] : "");</div><div class='del'>-</div><div class='del'>-	free_Address (&amp;addr);</div><div class='del'>-</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Addressbok Server routines */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardObjectChangeStatus *cons = closure;</div><div class='del'>-</div><div class='del'>-	cons-&gt;status = status;</div><div class='del'>-	cons-&gt;id = g_strdup (id);</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_cb (EBook *ebook, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	(*(EBookStatus*)closure) = status;</div><div class='del'>-	gtk_main_quit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		long length;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		ctxt-&gt;address_load_success = TRUE;</div><div class='del'>-</div><div class='del'>-		length = e_card_cursor_get_length (cursor);</div><div class='del'>-		ctxt-&gt;cards = NULL;</div><div class='del'>-		for (i = 0; i &lt; length; i ++) {</div><div class='del'>-			ECard *card = e_card_cursor_get_nth (cursor, i);</div><div class='del'>-			</div><div class='del'>-			if (e_card_evolution_list (card))</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			ctxt-&gt;cards = g_list_append (ctxt-&gt;cards, card);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		WARN (_("Cursor could not be loaded\n"));</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		WARN (_("EBook not loaded\n"));</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_addressbook_server (EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gboolean result;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,-2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ebook = e_book_new ();</div><div class='del'>-</div><div class='del'>-	result = e_book_load_default_book (ctxt-&gt;ebook, book_open_cb, ctxt);</div><div class='del'>-	</div><div class='del'>-	/* run a sub event loop to turn ebook's async loading into a</div><div class='del'>-           synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;address_load_success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static char *</div><div class='del'>-map_name (EAddrConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename = NULL;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-next_changed_item (EAddrConduitContext *ctxt, GList *changes) </div><div class='del'>-{</div><div class='del'>-	CardObjectChange *coc;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = changes; l != NULL; l = l-&gt;next) {</div><div class='del'>-		coc = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (g_hash_table_lookup (ctxt-&gt;changed_hash, e_card_get_id (coc-&gt;card)))</div><div class='del'>-			return l;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_mail (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_EMAIL;</div><div class='del'>-	</div><div class='del'>-	switch (*field) {</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_EMAIL:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_EMAIL_2;</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_EMAIL_2:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_EMAIL_3;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_home (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_HOME;</div><div class='del'>-	</div><div class='del'>-	switch (*field) {</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_PHONE_HOME:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_work (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS;</div><div class='del'>-	</div><div class='del'>-	switch (*field) {</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_fax (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX;</div><div class='del'>-	</div><div class='del'>-	switch (*field) {</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;</div><div class='del'>-	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_other (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER;</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_main (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_PRIMARY;</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_pager (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_PAGER;</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECardSimpleField</div><div class='del'>-get_next_mobile (ECardSimpleField *field)</div><div class='del'>-{</div><div class='del'>-	if (field == NULL)</div><div class='del'>-		return E_CARD_SIMPLE_FIELD_PHONE_MOBILE;</div><div class='del'>-</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_next_init (ECardSimpleField *next_mail,</div><div class='del'>-	       ECardSimpleField *next_home,</div><div class='del'>-	       ECardSimpleField *next_work,</div><div class='del'>-	       ECardSimpleField *next_fax,</div><div class='del'>-	       ECardSimpleField *next_other,</div><div class='del'>-	       ECardSimpleField *next_main,</div><div class='del'>-	       ECardSimpleField *next_pager,</div><div class='del'>-	       ECardSimpleField *next_mobile)</div><div class='del'>-{	</div><div class='del'>-	*next_mail = get_next_mail (NULL);</div><div class='del'>-	*next_home = get_next_home (NULL);</div><div class='del'>-	*next_work = get_next_work (NULL);</div><div class='del'>-	*next_fax = get_next_fax (NULL);</div><div class='del'>-	*next_other = get_next_other (NULL);</div><div class='del'>-	*next_main = get_next_main (NULL);</div><div class='del'>-	*next_pager = get_next_pager (NULL);</div><div class='del'>-	*next_mobile = get_next_mobile (NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_next_done (ECardSimpleField field)</div><div class='del'>-{</div><div class='del'>-	if (field == E_CARD_SIMPLE_FIELD_LAST)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) </div><div class='del'>-{	</div><div class='del'>-	ECardSimpleField next_mail, next_home, next_work, next_fax;</div><div class='del'>-	ECardSimpleField next_other, next_main, next_pager, next_mobile;</div><div class='del'>-	gboolean syncable = TRUE;</div><div class='del'>-	int i, l = 0;</div><div class='del'>-</div><div class='del'>-	/* See if there are fields we can't sync or not in priority order */</div><div class='del'>-	get_next_init (&amp;next_mail, &amp;next_home, &amp;next_work, &amp;next_fax,</div><div class='del'>-		       &amp;next_other, &amp;next_main, &amp;next_pager, &amp;next_mobile);</div><div class='del'>-	</div><div class='del'>-	for (i = entryPhone1; i &lt;= entryPhone5 &amp;&amp; syncable; i++) {</div><div class='del'>-		int phonelabel = local-&gt;addr-&gt;phoneLabel[i - entryPhone1];</div><div class='del'>-		const char *phone_str = local-&gt;addr-&gt;entry[i];</div><div class='del'>-		gboolean empty = !(phone_str &amp;&amp; *phone_str);</div><div class='del'>-		</div><div class='del'>-		if (empty)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		for ( ; priority_label[l] != -1; l++)</div><div class='del'>-			if (phonelabel == priority_label[l])</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-		if (priority_label[l] == -1) {</div><div class='del'>-			syncable = FALSE;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (phonelabel == LABEL_EMAIL) {</div><div class='del'>-			if (is_next_done (next_mail) || next_mail != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_mail = get_next_mail (&amp;next_mail);</div><div class='del'>-		} else if (phonelabel == LABEL_HOME) {</div><div class='del'>-			if (is_next_done (next_home) || next_home != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_home = get_next_home (&amp;next_home);</div><div class='del'>-		} else if (phonelabel == LABEL_WORK) {</div><div class='del'>-			if (is_next_done (next_work) || next_work != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_work = get_next_work (&amp;next_work);</div><div class='del'>-		} else if (phonelabel == LABEL_FAX) {</div><div class='del'>-			if (is_next_done (next_fax) || next_fax != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_fax = get_next_fax (&amp;next_fax);</div><div class='del'>-		} else if (phonelabel == LABEL_OTHER) {</div><div class='del'>-			if (is_next_done (next_other) || next_other != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_other = get_next_other (&amp;next_other);</div><div class='del'>-		} else if (phonelabel == LABEL_MAIN) {</div><div class='del'>-			if (is_next_done (next_main) || next_main != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_main = get_next_main (&amp;next_main);</div><div class='del'>-		} else if (phonelabel == LABEL_PAGER) {</div><div class='del'>-			if (is_next_done (next_pager) || next_pager != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_pager = get_next_pager (&amp;next_pager);</div><div class='del'>-		} else if (phonelabel == LABEL_MOBILE) {</div><div class='del'>-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {</div><div class='del'>-				syncable = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			next_mobile = get_next_mobile (&amp;next_mobile);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return syncable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_entry_text (struct Address address, int field)</div><div class='del'>-{</div><div class='del'>-	if (address.entry[field])</div><div class='del'>-		return e_pilot_utf8_from_pchar (address.entry[field]);</div><div class='del'>-	</div><div class='del'>-	return g_strdup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clear_entry_text (struct Address address, int field) </div><div class='del'>-{</div><div class='del'>-	if (address.entry[field]) {</div><div class='del'>-		free (address.entry[field]);</div><div class='del'>-		address.entry[field] = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CardObjectChange *coc;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-</div><div class='del'>-	coc = g_hash_table_lookup (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-	if (coc == NULL) {</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (coc-&gt;type) {</div><div class='del'>-	case CARD_ADDED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNew;</div><div class='del'>-		break;	</div><div class='del'>-	case CARD_MODIFIED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordModified;</div><div class='del'>-		break;</div><div class='del'>-	case CARD_DELETED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordDeleted;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord</div><div class='del'>-local_record_to_pilot_record (EAddrLocalRecord *local,</div><div class='del'>-			      EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord p;</div><div class='del'>-	static char record[0xffff];</div><div class='del'>-	</div><div class='del'>-	g_assert (local-&gt;addr != NULL );</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_to_pilot_record\n");</div><div class='del'>-</div><div class='del'>-	p.ID = local-&gt;local.ID;</div><div class='del'>-	p.category = local-&gt;local.category;</div><div class='del'>-	p.attr = local-&gt;local.attr;</div><div class='del'>-	p.archived = local-&gt;local.archived;</div><div class='del'>-	p.secret = local-&gt;local.secret;</div><div class='del'>-</div><div class='del'>-	/* Generate pilot record structure */</div><div class='del'>-	p.record = record;</div><div class='del'>-	p.length = pack_Address (local-&gt;addr, p.record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	const ECardDeliveryAddress *delivery;</div><div class='del'>-	ECardSimpleAddressId mailing_address;</div><div class='del'>-	int phone = entryPhone1;</div><div class='del'>-</div><div class='del'>-	gboolean syncable;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (ecard != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;ecard = ecard;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ecard));</div><div class='del'>-	simple = e_card_simple_new (ecard);</div><div class='del'>-	</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, ecard-&gt;id, TRUE);</div><div class='del'>-</div><div class='del'>-	compute_status (ctxt, local, ecard-&gt;id);</div><div class='del'>-</div><div class='del'>-	local-&gt;addr = g_new0 (struct Address, 1);</div><div class='del'>-</div><div class='del'>-	/* Handle the fields and category we don't sync by making sure</div><div class='del'>-         * we don't overwrite them </div><div class='del'>-	 */</div><div class='del'>-	if (local-&gt;local.ID != 0) {</div><div class='del'>-		struct Address addr;</div><div class='del'>-		char record[0xffff];</div><div class='del'>-		int cat = 0;</div><div class='del'>-		</div><div class='del'>-		if (dlp_ReadRecordById (ctxt-&gt;dbi-&gt;pilot_socket, </div><div class='del'>-					ctxt-&gt;dbi-&gt;db_handle,</div><div class='del'>-					local-&gt;local.ID, &amp;record, </div><div class='del'>-					NULL, NULL, NULL, &amp;cat) &gt; 0) {</div><div class='del'>-			local-&gt;local.category = cat;</div><div class='del'>-			memset (&amp;addr, 0, sizeof (struct Address));</div><div class='del'>-			unpack_Address (&amp;addr, record, 0xffff);</div><div class='del'>-			for (i = 0; i &lt; 5; i++) {</div><div class='del'>-				if (addr.entry[entryPhone1 + i])</div><div class='del'>-					local-&gt;addr-&gt;entry[entryPhone1 + i] = </div><div class='del'>-						strdup (addr.entry[entryPhone1 + i]);</div><div class='del'>-				local-&gt;addr-&gt;phoneLabel[i] = addr.phoneLabel[i];</div><div class='del'>-			}</div><div class='del'>-			local-&gt;addr-&gt;showPhone = addr.showPhone;</div><div class='del'>-			for (i = 0; i &lt; 4; i++) {</div><div class='del'>-				if (addr.entry[entryCustom1 + i])</div><div class='del'>-					local-&gt;addr-&gt;entry[entryCustom1 + i] = </div><div class='del'>-						strdup (addr.entry[entryCustom1 + i]);</div><div class='del'>-			}</div><div class='del'>-			free_Address (&amp;addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ecard-&gt;name) {</div><div class='del'>-		local-&gt;addr-&gt;entry[entryFirstname] = e_pilot_utf8_to_pchar (ecard-&gt;name-&gt;given);</div><div class='del'>-		local-&gt;addr-&gt;entry[entryLastname] = e_pilot_utf8_to_pchar (ecard-&gt;name-&gt;family);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	local-&gt;addr-&gt;entry[entryCompany] = e_pilot_utf8_to_pchar (ecard-&gt;org);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryTitle] = e_pilot_utf8_to_pchar (ecard-&gt;title);</div><div class='del'>-</div><div class='del'>-	mailing_address = -1;</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		</div><div class='del'>-		address = e_card_simple_get_address(simple, i);</div><div class='del'>-		if (address &amp;&amp; (address-&gt;flags &amp; E_CARD_ADDR_DEFAULT))</div><div class='del'>-			mailing_address = i;</div><div class='del'>-	}</div><div class='del'>-	if (mailing_address == -1)</div><div class='del'>-		mailing_address = ctxt-&gt;cfg-&gt;default_address;</div><div class='del'>-</div><div class='del'>-	delivery = e_card_simple_get_delivery_address (simple, mailing_address);</div><div class='del'>-	if (delivery) {</div><div class='del'>-		local-&gt;addr-&gt;entry[entryAddress] = e_pilot_utf8_to_pchar (delivery-&gt;street);</div><div class='del'>-		local-&gt;addr-&gt;entry[entryCity] = e_pilot_utf8_to_pchar (delivery-&gt;city);</div><div class='del'>-		local-&gt;addr-&gt;entry[entryState] = e_pilot_utf8_to_pchar (delivery-&gt;region);</div><div class='del'>-		local-&gt;addr-&gt;entry[entryZip] = e_pilot_utf8_to_pchar (delivery-&gt;code);</div><div class='del'>-		local-&gt;addr-&gt;entry[entryCountry] = e_pilot_utf8_to_pchar (delivery-&gt;country);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Phone numbers */</div><div class='del'>-</div><div class='del'>-	/* See if everything is syncable */</div><div class='del'>-	syncable = is_syncable (ctxt, local);</div><div class='del'>-	</div><div class='del'>-	if (syncable) {</div><div class='del'>-		INFO ("Syncable");</div><div class='del'>-</div><div class='del'>-		/* Sync by priority */</div><div class='del'>-		for (i = 0, phone = entryPhone1; </div><div class='del'>-		     priority[i] != E_CARD_SIMPLE_FIELD_LAST &amp;&amp; phone &lt;= entryPhone5; i++) {</div><div class='del'>-			const char *phone_str;</div><div class='del'>-			</div><div class='del'>-			phone_str = e_card_simple_get_const (simple, priority[i]);</div><div class='del'>-			if (phone_str &amp;&amp; *phone_str) {</div><div class='del'>-				clear_entry_text (*local-&gt;addr, phone);</div><div class='del'>-				local-&gt;addr-&gt;entry[phone] = e_pilot_utf8_to_pchar (phone_str);</div><div class='del'>-				local-&gt;addr-&gt;phoneLabel[phone - entryPhone1] = priority_label[i];</div><div class='del'>-				phone++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		for ( ; phone &lt;= entryPhone5; phone++)</div><div class='del'>-			      local-&gt;addr-&gt;phoneLabel[phone - entryPhone1] = phone - entryPhone1;</div><div class='del'>-		local-&gt;addr-&gt;showPhone = 0;</div><div class='del'>-	} else {</div><div class='del'>-		ECardSimpleField next_mail, next_home, next_work, next_fax;</div><div class='del'>-		ECardSimpleField next_other, next_main, next_pager, next_mobile;</div><div class='del'>-</div><div class='del'>-		INFO ("Not Syncable");</div><div class='del'>-		get_next_init (&amp;next_mail, &amp;next_home, &amp;next_work, &amp;next_fax,</div><div class='del'>-			       &amp;next_other, &amp;next_main, &amp;next_pager, &amp;next_mobile);</div><div class='del'>-</div><div class='del'>-		/* Not completely syncable, so do the best we can */</div><div class='del'>-		for (i = entryPhone1; i &lt;= entryPhone5; i++) {</div><div class='del'>-			int phonelabel = local-&gt;addr-&gt;phoneLabel[i - entryPhone1];</div><div class='del'>-			const char *phone_str = NULL;</div><div class='del'>-			</div><div class='del'>-			if (phonelabel == LABEL_EMAIL &amp;&amp; !is_next_done (next_mail)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_mail);</div><div class='del'>-				next_mail = get_next_mail (&amp;next_mail);</div><div class='del'>-			} else if (phonelabel == LABEL_HOME &amp;&amp; !is_next_done (next_home)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_home);</div><div class='del'>-				next_home = get_next_home (&amp;next_home);</div><div class='del'>-			} else if (phonelabel == LABEL_WORK &amp;&amp; !is_next_done (next_work)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_work);</div><div class='del'>-				next_work = get_next_work (&amp;next_work);</div><div class='del'>-			} else if (phonelabel == LABEL_FAX &amp;&amp; !is_next_done (next_fax)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_fax);</div><div class='del'>-				next_fax = get_next_fax (&amp;next_fax);</div><div class='del'>-			} else if (phonelabel == LABEL_OTHER &amp;&amp; !is_next_done (next_other)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_other);</div><div class='del'>-				next_other = get_next_other (&amp;next_other);</div><div class='del'>-			} else if (phonelabel == LABEL_MAIN &amp;&amp; !is_next_done (next_main)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_main);</div><div class='del'>-				next_main = get_next_main (&amp;next_main);</div><div class='del'>-			} else if (phonelabel == LABEL_PAGER &amp;&amp; !is_next_done (next_pager)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_pager);</div><div class='del'>-				next_pager = get_next_pager (&amp;next_pager);</div><div class='del'>-			} else if (phonelabel == LABEL_MOBILE &amp;&amp; !is_next_done (next_mobile)) {</div><div class='del'>-				phone_str = e_card_simple_get_const (simple, next_mobile);</div><div class='del'>-				next_mobile = get_next_mobile (&amp;next_mobile);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (phone_str &amp;&amp; *phone_str) {</div><div class='del'>-				clear_entry_text (*local-&gt;addr, i);</div><div class='del'>-				local-&gt;addr-&gt;entry[i] = e_pilot_utf8_to_pchar (phone_str);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Note */</div><div class='del'>-	local-&gt;addr-&gt;entry[entryNote] = e_pilot_utf8_to_pchar (ecard-&gt;note);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (EAddrLocalRecord *local,</div><div class='del'>-		       const char *uid,</div><div class='del'>-		       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard = NULL;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_assert (local != NULL);</div><div class='del'>-</div><div class='del'>-	for (l = ctxt-&gt;cards; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ecard = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (ecard-&gt;id &amp;&amp; !strcmp (ecard-&gt;id, uid))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ecard = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ecard != NULL) {</div><div class='del'>-		local_record_from_ecard (local, ecard, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		ecard = e_card_new ("");</div><div class='del'>-		e_card_set_id (ecard, uid);</div><div class='del'>-		local_record_from_ecard (local, ecard, ctxt);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ecard));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECard *</div><div class='del'>-ecard_from_remote_record(EAddrConduitContext *ctxt,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 ECard *in_card)</div><div class='del'>-{</div><div class='del'>-	struct Address address;</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	ECardDeliveryAddress *delivery;</div><div class='del'>-	ECardAddrLabel *label;</div><div class='del'>-	ECardSimpleAddressId mailing_address;</div><div class='del'>-	char *txt;</div><div class='del'>-	ECardSimpleField next_mail, next_home, next_work, next_fax;</div><div class='del'>-	ECardSimpleField next_other, next_main, next_pager, next_mobile;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-	memset (&amp;address, 0, sizeof (struct Address));</div><div class='del'>-	unpack_Address (&amp;address, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (in_card == NULL)</div><div class='del'>-		ecard = e_card_new("");</div><div class='del'>-	else</div><div class='del'>-		ecard = e_card_duplicate (in_card);</div><div class='del'>-</div><div class='del'>-	/* Name */</div><div class='del'>-	name = e_card_name_copy (ecard-&gt;name);</div><div class='del'>-	name-&gt;given = get_entry_text (address, entryFirstname);</div><div class='del'>-	name-&gt;family = get_entry_text (address, entryLastname);</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (ecard);</div><div class='del'>-	txt = e_card_name_to_string (name);	</div><div class='del'>-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, txt);</div><div class='del'>-	e_card_simple_set_name (simple, name);</div><div class='del'>-</div><div class='del'>-	/* File as */</div><div class='del'>-	if (!(txt &amp;&amp; *txt))</div><div class='del'>-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, </div><div class='del'>-				  address.entry[entryCompany]);</div><div class='del'>-</div><div class='del'>-	g_free (txt);</div><div class='del'>-	e_card_name_unref (name);</div><div class='del'>-</div><div class='del'>-	/* Title and Company */</div><div class='del'>-	txt = get_entry_text (address, entryTitle);</div><div class='del'>-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, txt);</div><div class='del'>-	g_free (txt);</div><div class='del'>-</div><div class='del'>-	txt = get_entry_text (address, entryCompany);</div><div class='del'>-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, txt);</div><div class='del'>-	g_free (txt);</div><div class='del'>-</div><div class='del'>-	/* Address */</div><div class='del'>-	mailing_address = -1;</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-		const ECardAddrLabel *addr;</div><div class='del'>-</div><div class='del'>-		addr = e_card_simple_get_address(simple, i);</div><div class='del'>-		if (addr &amp;&amp; (addr-&gt;flags &amp; E_CARD_ADDR_DEFAULT))</div><div class='del'>-			mailing_address = i;</div><div class='del'>-	}</div><div class='del'>-	if (mailing_address == -1)</div><div class='del'>-		mailing_address = ctxt-&gt;cfg-&gt;default_address;</div><div class='del'>-</div><div class='del'>-	delivery = e_card_delivery_address_new ();</div><div class='del'>-	delivery-&gt;flags |= E_CARD_ADDR_DEFAULT;</div><div class='del'>-	delivery-&gt;street = get_entry_text (address, entryAddress);</div><div class='del'>-	delivery-&gt;city = get_entry_text (address, entryCity);</div><div class='del'>-	delivery-&gt;region = get_entry_text (address, entryState);</div><div class='del'>-	delivery-&gt;country = get_entry_text (address, entryCountry);</div><div class='del'>-	delivery-&gt;code = get_entry_text (address, entryZip);</div><div class='del'>-</div><div class='del'>-	label = e_card_address_label_new ();</div><div class='del'>-	label-&gt;flags |= E_CARD_ADDR_DEFAULT;</div><div class='del'>-	label-&gt;data = e_card_delivery_address_to_string (delivery);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_address (simple, mailing_address, label);</div><div class='del'>-	e_card_simple_set_delivery_address (simple, mailing_address, delivery);</div><div class='del'>-	</div><div class='del'>-	e_card_delivery_address_unref (delivery);</div><div class='del'>-	e_card_address_label_unref (label);</div><div class='del'>-	</div><div class='del'>-	/* Phone numbers */</div><div class='del'>-	get_next_init (&amp;next_mail, &amp;next_home, &amp;next_work, &amp;next_fax,</div><div class='del'>-		       &amp;next_other, &amp;next_main, &amp;next_pager, &amp;next_mobile);</div><div class='del'>-</div><div class='del'>-	for (i = entryPhone1; i &lt;= entryPhone5; i++) {</div><div class='del'>-		int phonelabel = address.phoneLabel[i - entryPhone1];</div><div class='del'>-		char *phonenum = get_entry_text (address, i);</div><div class='del'>-		</div><div class='del'>-		if (phonelabel == LABEL_EMAIL &amp;&amp; !is_next_done (next_mail)) {</div><div class='del'>-			e_card_simple_set (simple, next_mail, phonenum);</div><div class='del'>-			next_mail = get_next_mail (&amp;next_mail);</div><div class='del'>-		} else if (phonelabel == LABEL_HOME &amp;&amp; !is_next_done (next_home)) {</div><div class='del'>-			e_card_simple_set (simple, next_home, phonenum);</div><div class='del'>-			next_home = get_next_home (&amp;next_home);</div><div class='del'>-		} else if (phonelabel == LABEL_WORK &amp;&amp; !is_next_done (next_work)) {</div><div class='del'>-			e_card_simple_set (simple, next_work, phonenum);</div><div class='del'>-			next_work = get_next_work (&amp;next_work);</div><div class='del'>-		} else if (phonelabel == LABEL_FAX &amp;&amp; !is_next_done (next_fax)) {</div><div class='del'>-			e_card_simple_set (simple, next_fax, phonenum);</div><div class='del'>-			next_fax = get_next_fax (&amp;next_fax);</div><div class='del'>-		} else if (phonelabel == LABEL_OTHER &amp;&amp; !is_next_done (next_other)) {</div><div class='del'>-			e_card_simple_set (simple, next_other, phonenum);</div><div class='del'>-			next_other = get_next_other (&amp;next_other);</div><div class='del'>-		} else if (phonelabel == LABEL_MAIN &amp;&amp; !is_next_done (next_main)) {</div><div class='del'>-			e_card_simple_set (simple, next_main, phonenum);</div><div class='del'>-			next_main = get_next_main (&amp;next_main);</div><div class='del'>-		} else if (phonelabel == LABEL_PAGER &amp;&amp; !is_next_done (next_pager)) {</div><div class='del'>-			e_card_simple_set (simple, next_pager, phonenum);</div><div class='del'>-			next_pager = get_next_pager (&amp;next_pager);</div><div class='del'>-		} else if (phonelabel == LABEL_MOBILE &amp;&amp; !is_next_done (next_mobile)) {</div><div class='del'>-			e_card_simple_set (simple, next_mobile, phonenum);</div><div class='del'>-			next_mobile = get_next_mobile (&amp;next_mobile);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (phonenum);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Note */</div><div class='del'>-	txt = get_entry_text (address, entryNote);</div><div class='del'>-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_NOTE, txt);</div><div class='del'>-	g_free (txt);</div><div class='del'>-	</div><div class='del'>-	e_card_simple_sync_card (simple);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-</div><div class='del'>-	free_Address(&amp;address);</div><div class='del'>-</div><div class='del'>-	return ecard;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-	int map_count;</div><div class='del'>-	const char *uri;</div><div class='del'>-	</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);	</div><div class='del'>-	if (map_count == 0)</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Or if the URI's don't match */</div><div class='del'>-	uri = e_book_get_uri (ctxt-&gt;ebook);</div><div class='del'>-	LOG("  Current URI %s (%s)\n", uri, ctxt-&gt;cfg-&gt;last_uri ? ctxt-&gt;cfg-&gt;last_uri : "&lt;NONE&gt;");</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;last_uri != NULL &amp;&amp; strcmp (ctxt-&gt;cfg-&gt;last_uri, uri)) {</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-		e_pilot_map_clear (ctxt-&gt;map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_added (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = cards; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ECard *card = E_CARD (l-&gt;data);</div><div class='del'>-		CardObjectChange *coc;</div><div class='del'>-		</div><div class='del'>-		if (e_card_evolution_list (card))</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		coc = g_new0 (CardObjectChange, 1);</div><div class='del'>-		coc-&gt;card = card;</div><div class='del'>-		coc-&gt;type = CARD_ADDED;</div><div class='del'>-</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (coc-&gt;card));</div><div class='del'>-		ctxt-&gt;changed = g_list_prepend (ctxt-&gt;changed, coc);</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, e_card_get_id (coc-&gt;card)))</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, (gpointer)e_card_get_id (coc-&gt;card), coc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = cards; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ECard *card = E_CARD (l-&gt;data);</div><div class='del'>-		CardObjectChange *coc;</div><div class='del'>-</div><div class='del'>-		if (e_card_evolution_list (card))</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		coc = g_new0 (CardObjectChange, 1);		</div><div class='del'>-		coc-&gt;card = E_CARD (l-&gt;data);</div><div class='del'>-		coc-&gt;type = CARD_MODIFIED;</div><div class='del'>-</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (coc-&gt;card));</div><div class='del'>-		ctxt-&gt;changed = g_list_prepend (ctxt-&gt;changed, coc);</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, e_card_get_id (coc-&gt;card)))</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, (gpointer)e_card_get_id (coc-&gt;card), coc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CardObjectChange *coc;</div><div class='del'>-	gboolean archived;</div><div class='del'>-	</div><div class='del'>-	archived = e_pilot_map_uid_is_archived (ctxt-&gt;map, id);</div><div class='del'>-	</div><div class='del'>-	/* If its deleted, not in the archive and not in the map its a list */</div><div class='del'>-	if (!archived &amp;&amp; e_pilot_map_lookup_pid (ctxt-&gt;map, id, FALSE) == 0)</div><div class='del'>-		return;	</div><div class='del'>-	</div><div class='del'>-	coc = g_new0 (CardObjectChange, 1);</div><div class='del'>-	coc-&gt;card = e_card_new ("");</div><div class='del'>-	e_card_set_id (coc-&gt;card, id);</div><div class='del'>-	coc-&gt;type = CARD_DELETED;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;changed = g_list_prepend (ctxt-&gt;changed, coc);</div><div class='del'>-	</div><div class='del'>-	if (!archived)</div><div class='del'>-		g_hash_table_insert (ctxt-&gt;changed_hash, (gpointer)e_card_get_id (coc-&gt;card), coc);</div><div class='del'>-	else</div><div class='del'>-		e_pilot_map_remove_by_uid (ctxt-&gt;map, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sequence_complete (EBookView *book_view, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (book_view), ctxt);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (book_view));</div><div class='del'>-  	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = data;</div><div class='del'>-	</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (book_view));</div><div class='del'>-	</div><div class='del'>-  	gtk_signal_connect (GTK_OBJECT (book_view), "card_added", </div><div class='del'>-			    (GtkSignalFunc) card_added, ctxt);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book_view), "card_changed", </div><div class='del'>-			    (GtkSignalFunc) card_changed, ctxt);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (book_view), "card_removed", </div><div class='del'>-			    (GtkSignalFunc) card_removed, ctxt);</div><div class='del'>-  	gtk_signal_connect (GTK_OBJECT (book_view), "sequence_complete", </div><div class='del'>-			    (GtkSignalFunc) sequence_complete, ctxt);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-/*    	GList *l; */</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *change_id;</div><div class='del'>-/*  	gint num_records; */</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;dbi = dbi;	</div><div class='del'>-	ctxt-&gt;ebook = NULL;</div><div class='del'>-	</div><div class='del'>-	if (start_addressbook_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id mappings */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Count and hash the changes */</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	ctxt-&gt;changed_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	e_book_get_changes (ctxt-&gt;ebook, change_id, view_cb, ctxt);</div><div class='del'>-	</div><div class='del'>-	/* Force the view loading to be synchronous */</div><div class='del'>-	gtk_main ();</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	</div><div class='del'>-	/* Set the count information */</div><div class='del'>-/*  	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_TODO); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); */</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's Address application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's Address application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AddressAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-  	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyToPilot</div><div class='del'>-	    || ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyFromPilot)</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gchar *filename, *change_id;</div><div class='del'>-	</div><div class='del'>-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	g_free (ctxt-&gt;cfg-&gt;last_uri);</div><div class='del'>-	ctxt-&gt;cfg-&gt;last_uri = g_strdup (e_book_get_uri (ctxt-&gt;ebook));</div><div class='del'>-	addrconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* FIX ME ugly hack - our changes musn't count, this does introduce</div><div class='del'>-	 * a race condition if anyone changes a record elsewhere during sycnc</div><div class='del'>-         */	</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	e_book_get_changes (ctxt-&gt;ebook, change_id, view_cb, ctxt);</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EAddrLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, local-&gt;ecard-&gt;id, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    EAddrLocalRecord *local,</div><div class='del'>-		    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-	g_hash_table_remove (ctxt-&gt;changed_hash, e_card_get_id (local-&gt;ecard));</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  EAddrLocalRecord **local,</div><div class='del'>-	  EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-  	static GList *cards, *iterator;</div><div class='del'>-  	static int count;</div><div class='del'>-</div><div class='del'>-  	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		cards = ctxt-&gt;cards;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (cards != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (cards));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-  			local_record_from_ecard (*local, cards-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-</div><div class='del'>-			iterator = cards;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-			local_record_from_ecard (*local, iterator-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-  			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   EAddrLocalRecord **local,</div><div class='del'>-		   EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("for_each_modified beginning\n");</div><div class='del'>-		</div><div class='del'>-		iterator = ctxt-&gt;changed;</div><div class='del'>-		</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		iterator = next_changed_item (ctxt, iterator);</div><div class='del'>-		if (iterator != NULL) {</div><div class='del'>-			CardObjectChange *coc = iterator-&gt;data;</div><div class='del'>-			</div><div class='del'>-			LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-			 </div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-			local_record_from_ecard (*local, coc-&gt;card, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		iterator = g_list_next (iterator);</div><div class='del'>-		if (iterator &amp;&amp; (iterator = next_changed_item (ctxt, iterator))) {</div><div class='del'>-			CardObjectChange *coc = iterator-&gt;data;</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-			local_record_from_ecard (*local, coc-&gt;card, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each_modified ending");</div><div class='del'>-</div><div class='del'>-    			/* Signal the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EAddrLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord local_pilot;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	local_pilot = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot.length</div><div class='del'>-	    || memcmp (local_pilot.record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-	</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	CardObjectChangeStatus cons;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	ecard = ecard_from_remote_record (ctxt, remote, NULL);</div><div class='del'>-	</div><div class='del'>-	/* add the ecard to the server */</div><div class='del'>-	e_book_add_card (ctxt-&gt;ebook, ecard, add_card_cb, &amp;cons);</div><div class='del'>-</div><div class='del'>-	gtk_main(); /* enter sub mainloop */</div><div class='del'>-	</div><div class='del'>-	if (cons.status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		WARN ("add_record: failed to add card to ebook\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_card_set_id (ecard, cons.id);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, ecard-&gt;id, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ecard));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EAddrLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	EBookStatus commit_status;</div><div class='del'>-	CardObjectChange *coc;</div><div class='del'>-	CardObjectChangeStatus cons;</div><div class='del'>-	char *old_id;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	old_id = g_strdup (e_card_get_id (local-&gt;ecard));</div><div class='del'>-	coc = g_hash_table_lookup (ctxt-&gt;changed_hash, old_id);</div><div class='del'>-	</div><div class='del'>-	new_ecard = ecard_from_remote_record (ctxt, remote, local-&gt;ecard);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;ecard));</div><div class='del'>-	local-&gt;ecard = new_ecard;</div><div class='del'>-</div><div class='del'>-	if (coc &amp;&amp; coc-&gt;type == CARD_DELETED)</div><div class='del'>-		e_book_add_card (ctxt-&gt;ebook, local-&gt;ecard, add_card_cb, &amp;cons);</div><div class='del'>-	else</div><div class='del'>-		e_book_commit_card (ctxt-&gt;ebook, local-&gt;ecard, status_cb, &amp;commit_status);</div><div class='del'>-	</div><div class='del'>-	gtk_main (); /* enter sub mainloop */</div><div class='del'>-</div><div class='del'>-	/* Adding a record causes wombat to assign a new uid so we must tidy */</div><div class='del'>-	if (coc &amp;&amp; coc-&gt;type == CARD_DELETED) {</div><div class='del'>-		gboolean arch = e_pilot_map_uid_is_archived (ctxt-&gt;map, e_card_get_id (local-&gt;ecard));</div><div class='del'>-		</div><div class='del'>-		e_card_set_id (local-&gt;ecard, cons.id);</div><div class='del'>-		e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, cons.id, arch);</div><div class='del'>-</div><div class='del'>-		coc = g_hash_table_lookup (ctxt-&gt;changed_hash, old_id);</div><div class='del'>-		if (coc) {</div><div class='del'>-			g_hash_table_remove (ctxt-&gt;changed_hash, e_card_get_id (coc-&gt;card));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (coc-&gt;card));</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (local-&gt;ecard));</div><div class='del'>-			coc-&gt;card = local-&gt;ecard;</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, (gpointer)e_card_get_id (coc-&gt;card), coc);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		commit_status = cons.status;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (commit_status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		WARN ("replace_record: failed to update card in ebook\n");</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       EAddrLocalRecord *local,</div><div class='del'>-	       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	EBookStatus commit_status;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (local-&gt;ecard != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("delete_record: delete %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-	e_pilot_map_remove_by_uid (ctxt-&gt;map, local-&gt;ecard-&gt;id);</div><div class='del'>-	e_book_remove_card_by_id (ctxt-&gt;ebook, local-&gt;ecard-&gt;id, status_cb, &amp;commit_status);</div><div class='del'>-	</div><div class='del'>-	gtk_main (); /* enter sub mainloop */</div><div class='del'>-	</div><div class='del'>-	if (commit_status != E_BOOK_STATUS_SUCCESS &amp;&amp; commit_status != E_BOOK_STATUS_CARD_NOT_FOUND)</div><div class='del'>-		WARN ("delete_record: failed to delete card in ebook\n");</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EAddrLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, local-&gt;local.ID, local-&gt;ecard-&gt;id, archive);</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       EAddrLocalRecord **local,</div><div class='del'>-       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-  	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*local = NULL;</div><div class='del'>-	uid = e_pilot_map_lookup_uid (ctxt-&gt;map, remote-&gt;ID, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (!uid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	LOG ("  matched\n");</div><div class='del'>-	</div><div class='del'>-	*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-	local_record_from_uid (*local, uid, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    EAddrLocalRecord *local,</div><div class='del'>-	    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	addrconduit_destroy_record (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EAddrLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-	</div><div class='del'>-	*remote = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot Settings Callbacks */</div><div class='del'>-static void</div><div class='del'>-fill_widgets (EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt-&gt;ps),</div><div class='del'>-				     ctxt-&gt;cfg-&gt;secret);</div><div class='del'>-</div><div class='del'>-	e_addr_gui_fill_widgets (ctxt-&gt;gui, ctxt-&gt;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-create_settings_window (GnomePilotConduit *conduit,</div><div class='del'>-			GtkWidget *parent,</div><div class='del'>-			EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("create_settings_window");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ps = e_pilot_settings_new ();</div><div class='del'>-	ctxt-&gt;gui = e_addr_gui_new (E_PILOT_SETTINGS (ctxt-&gt;ps));</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (parent), ctxt-&gt;ps);</div><div class='del'>-	gtk_widget_show (ctxt-&gt;ps);</div><div class='del'>-</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-display_settings (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("display_settings");</div><div class='del'>-	</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_settings    (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("save_settings");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;new_cfg-&gt;secret =</div><div class='del'>-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt-&gt;ps));</div><div class='del'>-	e_addr_gui_fill_config (ctxt-&gt;gui, ctxt-&gt;new_cfg);</div><div class='del'>-</div><div class='del'>-	addrconduit_save_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-revert_settings  (GnomePilotConduit *conduit, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("revert_settings");</div><div class='del'>-</div><div class='del'>-	addrconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-	addrconduit_destroy_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-	ctxt-&gt;new_cfg = addrconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	EAddrConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in address's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	ctxt = e_addr_context_new (pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-</div><div class='del'>-	/* Gui Settings */</div><div class='del'>-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{ </div><div class='del'>-	EAddrConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), </div><div class='del'>-				    "addrconduit_context");</div><div class='del'>-</div><div class='del'>-	e_addr_context_destroy (ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in<br/>deleted file mode 100644<br/>index e5a5ab765e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/e-address.conduit.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/conduit/e-address.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-	&lt;conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/&gt;</div><div class='del'>-	&lt;name value="EAddress"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/&gt;</div><div class='del'>-     	&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</div><div class='head'>diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am<br/>deleted file mode 100644<br/>index 6b0850da5d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = contact-editor contact-list-editor merging widgets search component</div><div class='head'>diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore<br/>deleted file mode 100644<br/>index 8bcb766191..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-evolution-addressbook</div><div class='del'>-evolution-addressbook.pure</div><div class='del'>-test-addressbook</div><div class='del'>-GNOME_Evolution_Addressbook.oaf
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in<br/>deleted file mode 100644<br/>index c475ef47f5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the Addressbook Minicard control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/vcard"/&gt;</div><div class='del'>-		&lt;item value="text/x-vcard"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       _value="Evolution Addressbook minicard viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               _value="Control that displays an Evolution addressbook minicard."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the sample Addressbook control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:BonoboControl/addressbook-control:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Control:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="A sample Bonobo control which displays an addressbook."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/ShellComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               _value="Evolution component for handling contacts."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"</div><div class='del'>-	    type="exe"</div><div class='del'>-	    location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Factory for the Addressbook's address displayer"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:BonoboControl/address-widget:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Control:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="A Bonobo control for displaying an address."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory"</div><div class='del'>-	    type="exe"</div><div class='del'>-	    location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Factory for the Addressbook's address popup"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:BonoboControl/address-widget:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Control:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="A Bonobo control for an address popup."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Factory for the configuration controls for the Evolution Addressbook."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"</div><div class='del'>-            type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/ConfigControl:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:title" type="string"</div><div class='del'>-		       _value="Directory Servers"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:description" type="string"</div><div class='del'>-		       _value="This page can be used to configure access to LDAP directory servers"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:icon_name" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:priority" type="string" value="-6"/&gt;</div><div class='del'>-    </div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Configuration control for the Evolution Addressbook Storages."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Account Editor --&gt;</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ConfigControl"</div><div class='del'>-            type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-	    	&lt;item value="IDL:GNOME/Evolution/ConfigControl:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:title" type="string"</div><div class='del'>-	   	       _value="Addressbook Settings"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:description" type="string"</div><div class='del'>-		       _value="This page can be used to configure Addressbook Settings"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:icon_name" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/&gt;</div><div class='del'>-    </div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Configuration control for the Evolution Addressbook."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am<br/>deleted file mode 100644<br/>index bfae4c1198..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-SUBDIRS	= select-names</div><div class='del'>-</div><div class='del'>-INCLUDES =							\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\</div><div class='del'>-	-I$(top_srcdir)						\</div><div class='del'>-	-I$(top_builddir)					\</div><div class='del'>-	-I$(top_srcdir)/shell					\</div><div class='del'>-	-I$(top_builddir)/shell					\</div><div class='del'>-	-I$(top_srcdir)/widgets/misc				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/contact-editor		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/minicard		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/widgets			\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend			\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend			\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		\</div><div class='del'>-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \</div><div class='del'>-	$(LDAP_CFLAGS)						\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS =	\</div><div class='del'>-	evolution-addressbook</div><div class='del'>-</div><div class='del'>-evolution_addressbook_SOURCES = 	\</div><div class='del'>-	addressbook-component.c		\</div><div class='del'>-	addressbook-component.h		\</div><div class='del'>-	addressbook-config.c		\</div><div class='del'>-	addressbook-config.h		\</div><div class='del'>-	addressbook-factory.c		\</div><div class='del'>-	addressbook-storage.c		\</div><div class='del'>-	addressbook-storage.h		\</div><div class='del'>-	addressbook.c			\</div><div class='del'>-	addressbook.h			\</div><div class='del'>-	e-cardlist-model.c		\</div><div class='del'>-	e-cardlist-model.h		\</div><div class='del'>-	e-address-widget.h		\</div><div class='del'>-	e-address-widget.c		\</div><div class='del'>-	e-address-popup.h		\</div><div class='del'>-	e-address-popup.c</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDADD =								\</div><div class='del'>-	select-names/libeselectnames.la							\</div><div class='del'>-	$(top_builddir)/shell/libeshell.la						\</div><div class='del'>-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a				\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la						\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la					\</div><div class='del'>-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\</div><div class='del'>-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a						\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a 					\</div><div class='del'>-	$(top_builddir)/addressbook/printing/libecontactprint.a				\</div><div class='del'>-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a			\</div><div class='del'>-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a			\</div><div class='del'>-	$(top_builddir)/filter/libfilter.la						\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la						\</div><div class='del'>-	$(top_builddir)/widgets/menus/libmenus.la					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = GNOME_Evolution_Addressbook.oaf.in</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = ldap-config.glade</div><div class='del'>-</div><div class='del'>-iconsdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 				\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	$(oaf_DATA)			\</div><div class='del'>-	$(oaf_in_files)</div><div class='del'>-</div><div class='del'>-if ENABLE_PURIFY</div><div class='del'>-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-all-local: evolution-addressbook.pure</div><div class='del'>-</div><div class='del'>-evolution-addressbook.pure: evolution-addressbook</div><div class='del'>-	@rm -f evolution-addressbook.pure</div><div class='del'>-	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)</div><div class='del'>-</div><div class='del'>-endif</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c<br/>deleted file mode 100644<br/>index 590cdd26bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-component.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,594 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* addressbook-component.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-types.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-uri.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-ops.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-directory.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-file-info.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "evolution-shell-component-dnd.h"</div><div class='del'>-#include "evolution-storage.h"</div><div class='del'>-</div><div class='del'>-#include "ebook/e-book.h"</div><div class='del'>-#include "ebook/e-card.h"</div><div class='del'>-#include "ebook/e-book-util.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook-config.h"</div><div class='del'>-#include "addressbook-storage.h"</div><div class='del'>-#include "addressbook-component.h"</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "addressbook/gui/merging/e-card-merging.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponent"</div><div class='del'>-</div><div class='del'>-EvolutionShellClient *global_shell_client = NULL;</div><div class='del'>-</div><div class='del'>-EvolutionShellClient *</div><div class='del'>-addressbook_component_get_shell_client  (void)</div><div class='del'>-{</div><div class='del'>-	return global_shell_client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *accepted_dnd_types[] = {</div><div class='del'>-	"text/x-vcard",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ "contacts", "evolution-contacts.png", N_("Contacts"), N_("Folder containing contact information"),</div><div class='del'>-	  TRUE, accepted_dnd_types, NULL },</div><div class='del'>-	{ "ldap-contacts", "ldap.png", N_("LDAP Server"), N_("LDAP server containing contact information"),</div><div class='del'>-	  FALSE, accepted_dnd_types, NULL },</div><div class='del'>-	{ NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define IS_CONTACT_TYPE(x)  (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "ldap-contacts") == 0)</div><div class='del'>-</div><div class='del'>-/* EvolutionShellComponent methods and signals.  */</div><div class='del'>-</div><div class='del'>-static EvolutionShellComponentResult</div><div class='del'>-create_view (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     const char *view_info,</div><div class='del'>-	     BonoboControl **control_return,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	if (!IS_CONTACT_TYPE (type))</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-</div><div class='del'>-	control = addressbook_factory_new_control ();</div><div class='del'>-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);</div><div class='del'>-</div><div class='del'>-	*control_return = control;</div><div class='del'>-</div><div class='del'>-	return EVOLUTION_SHELL_COMPONENT_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_ShellComponentListener_Result result;</div><div class='del'>-</div><div class='del'>-	if (!IS_CONTACT_TYPE (type))</div><div class='del'>-		result = GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;</div><div class='del'>-	else </div><div class='del'>-		result = GNOME_Evolution_ShellComponentListener_OK;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &amp;ev);</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *addressbook_db_path, *subdir_path;</div><div class='del'>-	struct stat sb;</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (!IS_CONTACT_TYPE (type)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strncmp (physical_uri, "ldap://", 7)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (strncmp (physical_uri, "file://", 7)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	subdir_path = g_concat_dir_and_file (physical_uri + 7, "subfolders");</div><div class='del'>-	rv = stat (subdir_path, &amp;sb);</div><div class='del'>-	g_free (subdir_path);</div><div class='del'>-	if (rv != -1) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addressbook_db_path = g_concat_dir_and_file (physical_uri + 7, "addressbook.db");</div><div class='del'>-	rv = unlink (addressbook_db_path);</div><div class='del'>-	g_free (addressbook_db_path);</div><div class='del'>-	if (rv == 0) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_OK,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (errno == EACCES || errno == EPERM)</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-							     GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,</div><div class='del'>-							     &amp;ev);</div><div class='del'>-		else</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-							     GNOME_Evolution_ShellComponentListener_INVALID_URI, /*XXX*/</div><div class='del'>-							     &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-/* This code is cut &amp; pasted from calendar/gui/component-factory.c */</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_ShellComponentListener_Result</div><div class='del'>-xfer_file (GnomeVFSURI *base_src_uri,</div><div class='del'>-	   GnomeVFSURI *base_dest_uri,</div><div class='del'>-	   const char *file_name,</div><div class='del'>-	   int remove_source)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSURI *src_uri, *dest_uri;</div><div class='del'>-	GnomeVFSHandle *hin, *hout;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GnomeVFSFileInfo file_info;</div><div class='del'>-	GnomeVFSFileSize size;</div><div class='del'>-	char *buffer;</div><div class='del'>-	</div><div class='del'>-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_open_uri (&amp;hin, src_uri, GNOME_VFS_OPEN_READ);</div><div class='del'>-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */</div><div class='del'>-	}</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_get_file_info_uri (src_uri, &amp;file_info, GNOME_VFS_FILE_INFO_DEFAULT);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_create_uri (&amp;hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write source file to destination file */</div><div class='del'>-	buffer = g_malloc (file_info.size);</div><div class='del'>-	result = gnome_vfs_read (hin, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_write (hout, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (remove_source) {</div><div class='del'>-		char *text_uri;</div><div class='del'>-</div><div class='del'>-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */</div><div class='del'>-</div><div class='del'>-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-		result = gnome_vfs_unlink (text_uri);</div><div class='del'>-		g_free (text_uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (hin);</div><div class='del'>-	gnome_vfs_close (hout);</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-	g_free (buffer);</div><div class='del'>-</div><div class='del'>-	return GNOME_Evolution_ShellComponentListener_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xfer_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *source_physical_uri,</div><div class='del'>-	     const char *destination_physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     gboolean remove_source,</div><div class='del'>-	     const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	GnomeVFSURI *src_uri;</div><div class='del'>-	GnomeVFSURI *dest_uri;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (!IS_CONTACT_TYPE (type)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-								     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!strncmp (source_physical_uri, "ldap://", 7)</div><div class='del'>-	    || !strncmp (destination_physical_uri, "ldap://", 7)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-							     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,</div><div class='del'>-							     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strncmp (source_physical_uri, "file://", 7)</div><div class='del'>-	    || strncmp (destination_physical_uri, "file://", 7)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,</div><div class='del'>-							     GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-							     &amp;ev);</div><div class='del'>-		CORBA_exception_free(&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check URIs */</div><div class='del'>-	src_uri = gnome_vfs_uri_new (source_physical_uri);</div><div class='del'>-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);</div><div class='del'>-	if (!src_uri || ! dest_uri) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = xfer_file (src_uri, dest_uri, "addressbook.db", remove_source);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-</div><div class='del'>-        CORBA_exception_free (&amp;ev);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_dnd_selection (EvolutionShellComponent *shell_component,</div><div class='del'>-		   const char *physical_uri,</div><div class='del'>-		   int type,</div><div class='del'>-		   int *format_return,</div><div class='del'>-		   const char **selection_return,</div><div class='del'>-		   int *selection_length_return,</div><div class='del'>-		   void *closure)</div><div class='del'>-{</div><div class='del'>-	/* g_print ("should get dnd selection for %s\n", physical_uri); */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int owner_count = 0;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	owner_count ++;</div><div class='del'>-</div><div class='del'>-	if (global_shell_client == NULL)</div><div class='del'>-		global_shell_client = shell_client;</div><div class='del'>-</div><div class='del'>-	addressbook_config_register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));</div><div class='del'>-</div><div class='del'>-	addressbook_storage_setup (shell_component, evolution_homedir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-gtk_main_quit_cb (gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-		GNOME_Evolution_Shell shell_interface,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	owner_count --;</div><div class='del'>-	if (owner_count == 0) {</div><div class='del'>-		g_idle_add (gtk_main_quit_cb, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME We should perhaps take the time to figure out if the book is editable. */</div><div class='del'>-static void</div><div class='del'>-local_addressbook_cb (EBook *book, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gboolean is_list = GPOINTER_TO_INT (closure);</div><div class='del'>-	if (book == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (is_list)</div><div class='del'>-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE);</div><div class='del'>-	else</div><div class='del'>-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nonlocal_addressbook_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		local_addressbook_cb (book, closure);</div><div class='del'>-	else</div><div class='del'>-		local_addressbook_cb (NULL, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-user_create_new_item_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-			 const char *id,</div><div class='del'>-			 const char *parent_folder_physical_uri,</div><div class='del'>-			 const char *parent_folder_type,</div><div class='del'>-			 gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean is_contact_list;</div><div class='del'>-	if (!strcmp (id, "contact")) {</div><div class='del'>-		is_contact_list = FALSE;</div><div class='del'>-	} else if (!strcmp (id, "contact_list")) {</div><div class='del'>-		is_contact_list = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Don't know how to create item of type \"%s\"", id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (IS_CONTACT_TYPE (parent_folder_type)) {</div><div class='del'>-		EBook *book;</div><div class='del'>-		gchar *uri;</div><div class='del'>-</div><div class='del'>-		book = e_book_new ();</div><div class='del'>-		uri = g_strdup_printf ("%s/addressbook.db", parent_folder_physical_uri);</div><div class='del'>-</div><div class='del'>-		if (addressbook_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0)</div><div class='del'>-			g_warning ("Couldn't load addressbook %s", uri);</div><div class='del'>-</div><div class='del'>-		g_free (uri);</div><div class='del'>-	} else {</div><div class='del'>-		e_book_use_local_address_book (local_addressbook_cb, GINT_TO_POINTER (is_contact_list));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Destination side DnD */</div><div class='del'>-</div><div class='del'>-static CORBA_boolean</div><div class='del'>-destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *folder,</div><div class='del'>-				  const char *physical_uri,</div><div class='del'>-				  const char *folder_type,</div><div class='del'>-				  const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,</div><div class='del'>-				  GNOME_Evolution_ShellComponentDnd_Action * suggested_action_return,</div><div class='del'>-				  gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	*suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dnd_drop_book_open_cb (EBook *book, EBookStatus status, GList *card_list)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = card_list; l; l = l-&gt;next) {</div><div class='del'>-		ECard *card = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		e_card_merging_book_add_card (book, card, NULL /* XXX */, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_boolean</div><div class='del'>-destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *folder,</div><div class='del'>-				const char *physical_uri,</div><div class='del'>-				const char *folder_type,</div><div class='del'>-				const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,</div><div class='del'>-				const GNOME_Evolution_ShellComponentDnd_Action action,</div><div class='del'>-				const GNOME_Evolution_ShellComponentDnd_Data * data,</div><div class='del'>-				gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	GList *card_list;</div><div class='del'>-	char *expanded_uri;</div><div class='del'>-</div><div class='del'>-	if (action == GNOME_Evolution_ShellComponentDnd_ACTION_LINK)</div><div class='del'>-		return FALSE; /* we can't create links in our addressbook format */</div><div class='del'>-</div><div class='del'>-	/* g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); */</div><div class='del'>-</div><div class='del'>-	card_list = e_card_load_cards_from_string_with_default_charset (data-&gt;bytes._buffer, "ISO-8859-1");</div><div class='del'>-</div><div class='del'>-	expanded_uri = e_book_expand_uri (physical_uri);</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	addressbook_load_uri (book, expanded_uri,</div><div class='del'>-			      (EBookCallback)dnd_drop_book_open_cb, card_list);</div><div class='del'>-</div><div class='del'>-	g_free (expanded_uri);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The factory function.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_creatable_item (EvolutionShellComponent *shell_component,</div><div class='del'>-		    const char *id,</div><div class='del'>-		    const char *description,</div><div class='del'>-		    const char *menu_description,</div><div class='del'>-		    char menu_shortcut,</div><div class='del'>-		    const char *icon_name)</div><div class='del'>-{</div><div class='del'>-	char *icon_path;</div><div class='del'>-	GdkPixbuf *icon;</div><div class='del'>-</div><div class='del'>-	if (icon_name == NULL) {</div><div class='del'>-		icon_path = NULL;</div><div class='del'>-		icon = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);</div><div class='del'>-		icon = gdk_pixbuf_new_from_file (icon_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_shell_component_add_user_creatable_item (shell_component,</div><div class='del'>-							   id,</div><div class='del'>-							   description,</div><div class='del'>-							   menu_description,</div><div class='del'>-							   menu_shortcut,</div><div class='del'>-							   icon);</div><div class='del'>-</div><div class='del'>-	if (icon != NULL)</div><div class='del'>-		gdk_pixbuf_unref (icon);</div><div class='del'>-	g_free (icon_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-create_component (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellComponent *shell_component;</div><div class='del'>-	EvolutionShellComponentDndDestinationFolder *destination_interface;</div><div class='del'>-</div><div class='del'>-	shell_component = evolution_shell_component_new (folder_types, NULL,</div><div class='del'>-							 create_view, create_folder,</div><div class='del'>-							 remove_folder, xfer_folder,</div><div class='del'>-							 NULL,</div><div class='del'>-							 get_dnd_selection,</div><div class='del'>-							 NULL);</div><div class='del'>-</div><div class='del'>-	destination_interface = evolution_shell_component_dnd_destination_folder_new (destination_folder_handle_motion,</div><div class='del'>-										      destination_folder_handle_drop,</div><div class='del'>-										      shell_component);</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component),</div><div class='del'>-				     BONOBO_OBJECT (destination_interface));</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, "contact",</div><div class='del'>-			    _("New Contact"), _("_Contact"), 'c',</div><div class='del'>-			    "evolution-contacts-mini.png");</div><div class='del'>-	add_creatable_item (shell_component, "contact_list",</div><div class='del'>-			    _("New Contact List"), _("Contact _List"), 'l',</div><div class='del'>-			    "all_contacts.xpm");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",</div><div class='del'>-			    GTK_SIGNAL_FUNC (user_create_new_item_cb), NULL);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (shell_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME this should probably be renamed as we don't use factories anymore.  */</div><div class='del'>-void</div><div class='del'>-addressbook_component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *object;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	object = create_component ();</div><div class='del'>-</div><div class='del'>-	/* FIXME: Handle errors better?  */</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID,</div><div class='del'>-					     bonobo_object_corba_objref (object));</div><div class='del'>-	if (result == OAF_REG_ERROR)</div><div class='del'>-		g_error ("Cannot register -- %s", GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h<br/>deleted file mode 100644<br/>index 9b36873902..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-component.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* addressbook-component.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _ADDRESSBOOK_COMPONENT_H</div><div class='del'>-#define _ADDRESSBOOK_COMPONENT_H</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "evolution-storage.h"</div><div class='del'>-</div><div class='del'>-void                  addressbook_component_factory_init      (void);</div><div class='del'>-EvolutionShellClient *addressbook_component_get_shell_client  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _ADDRESSBOOK_COMPONENT_H */</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c<br/>deleted file mode 100644<br/>index 0961d81533..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-config.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-config.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1826 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- * Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- * Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-/*#define STANDALONE*/</div><div class='del'>-/*#define NEW_ADVANCED_UI*/</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook-config.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "addressbook-storage.h"</div><div class='del'>-</div><div class='del'>-#include "evolution-config-control.h"</div><div class='del'>-#include &lt;shell/e-folder-list.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-memory-store.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;e-util/e-html-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-#include "ldap.h"</div><div class='del'>-#include "ldap_schema.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define LDAP_PORT_STRING "389"</div><div class='del'>-#define LDAPS_PORT_STRING "636"</div><div class='del'>-</div><div class='del'>-#define GLADE_FILE_NAME "ldap-config.glade"</div><div class='del'>-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControlFactory"</div><div class='del'>-#define LDAP_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_LDAPStorage_ConfigControl"</div><div class='del'>-#define ADDRESSBOOK_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_ConfigControl"</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-GtkWidget* addressbook_dialog_create_sources_table (char *name, char *string1, char *string2,</div><div class='del'>-						    int num1, int num2);</div><div class='del'>-GtkWidget* supported_bases_create_table (char *name, char *string1, char *string2,</div><div class='del'>-					 int num1, int num2);</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-GtkWidget* objectclasses_create_server_table (char *name, char *string1, char *string2,</div><div class='del'>-					      int num1, int num2);</div><div class='del'>-GtkWidget* objectclasses_create_evolution_table (char *name, char *string1, char *string2,</div><div class='del'>-						 int num1, int num2);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* default objectclasses */</div><div class='del'>-#define TOP                  "top"</div><div class='del'>-#define PERSON               "person"</div><div class='del'>-#define ORGANIZATIONALPERSON "organizationalPerson"</div><div class='del'>-#define INETORGPERSON        "inetOrgPerson"</div><div class='del'>-#define EVOLUTIONPERSON      "evolutionPerson"</div><div class='del'>-#define CALENTRY             "calEntry"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkWidget *notebook;</div><div class='del'>-	int page_num;</div><div class='del'>-} FocusHelpClosure;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-focus_help (GtkWidget *w, GdkEventFocus *event, FocusHelpClosure *closure)</div><div class='del'>-{</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK(closure-&gt;notebook), closure-&gt;page_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_focus_handler (GtkWidget *widget, GtkWidget *notebook, int page_num)</div><div class='del'>-{</div><div class='del'>-	FocusHelpClosure *focus_closure = g_new0 (FocusHelpClosure, 1);</div><div class='del'>-	focus_closure-&gt;notebook = notebook;</div><div class='del'>-	focus_closure-&gt;page_num = page_num;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect_full (GTK_OBJECT (widget),</div><div class='del'>-				 "focus_in_event" /* XXX */,</div><div class='del'>-				 (GtkSignalFunc) focus_help, NULL,</div><div class='del'>-				 focus_closure,</div><div class='del'>-				 (GtkDestroyNotify) g_free,</div><div class='del'>-				 FALSE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EvolutionConfigControl *config_control;</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GNOME_Evolution_Shell shell;</div><div class='del'>-</div><div class='del'>-	GtkWidget *sourcesTable;</div><div class='del'>-	ETableModel *sourcesModel;</div><div class='del'>-	GtkWidget *addSource;</div><div class='del'>-	GtkWidget *editSource;</div><div class='del'>-	GtkWidget *deleteSource;</div><div class='del'>-</div><div class='del'>-} AddressbookDialog;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	AddressbookDialog *addressbook_dialog;</div><div class='del'>-	GladeXML  *gui;</div><div class='del'>-</div><div class='del'>-	GtkWidget *window;</div><div class='del'>-	GtkWidget *druid; /* only used (obviously) in the druid */</div><div class='del'>-</div><div class='del'>-	/* info page fields */</div><div class='del'>-	GtkSignalFunc general_modify_func;</div><div class='del'>-	GtkWidget *host;</div><div class='del'>-	GtkWidget *auth_optionmenu;</div><div class='del'>-	AddressbookLDAPAuthType auth; </div><div class='del'>-	GtkWidget *auth_label_notebook;</div><div class='del'>-	GtkWidget *auth_entry_notebook;</div><div class='del'>-	GtkWidget *email;</div><div class='del'>-	GtkWidget *binddn;</div><div class='del'>-</div><div class='del'>-	/* connecting page fields */</div><div class='del'>-	GtkSignalFunc connecting_modify_func;</div><div class='del'>-	GtkWidget *port_combo;</div><div class='del'>-	GtkWidget *ssl_optionmenu;</div><div class='del'>-	AddressbookLDAPSSLType ssl;</div><div class='del'>-</div><div class='del'>-	/* searching page fields */</div><div class='del'>-	GtkSignalFunc searching_modify_func;</div><div class='del'>-	GtkWidget *rootdn;</div><div class='del'>-	AddressbookLDAPScopeType scope;</div><div class='del'>-	GtkWidget *scope_optionmenu;</div><div class='del'>-	GtkWidget *timeout_scale;</div><div class='del'>-	GtkWidget *limit_spinbutton;</div><div class='del'>-</div><div class='del'>-	/* display name page fields */</div><div class='del'>-	GtkWidget *display_name;</div><div class='del'>-	gboolean display_name_changed; /* only used in the druid */</div><div class='del'>-</div><div class='del'>-	gboolean schema_query_successful;</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-	/* objectclasses tab fields */</div><div class='del'>-	GPtrArray *server_objectclasses;    /* the objectclasses available on the server */</div><div class='del'>-	GPtrArray *evolution_objectclasses; /* the objectclasses evolution will use */</div><div class='del'>-	GPtrArray *default_objectclasses;   /* the objectclasses we default to (actually the</div><div class='del'>-					       intersection between defaults and server_objectclasses) */</div><div class='del'>-	GtkSignalFunc objectclasses_modify_func;</div><div class='del'>-	GtkWidget *objectclasses_server_table;</div><div class='del'>-	ETableModel *objectclasses_server_model;</div><div class='del'>-	GtkWidget *objectclasses_evolution_table;</div><div class='del'>-	ETableModel *objectclasses_evolution_model;</div><div class='del'>-	GtkWidget *objectclasses_add_button;</div><div class='del'>-	GtkWidget *objectclasses_remove_button;</div><div class='del'>-</div><div class='del'>-	/* refs we keep around so we can add/hide the tabs */</div><div class='del'>-	GtkWidget *objectclasses_tab;</div><div class='del'>-	GtkWidget *objectclasses_label;</div><div class='del'>-	GtkWidget *mappings_tab;</div><div class='del'>-	GtkWidget *mappings_label;</div><div class='del'>-	GtkWidget *dn_customization_tab;</div><div class='del'>-	GtkWidget *dn_customization_label;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* stuff for the account editor window */</div><div class='del'>-	int source_model_row;</div><div class='del'>-	GtkWidget *ok_button;</div><div class='del'>-	GtkWidget *apply_button;</div><div class='del'>-	GtkWidget *close_button;</div><div class='del'>-	GtkWidget *advanced_button_notebook;</div><div class='del'>-	GtkWidget *notebook; /* the toplevel notebook */</div><div class='del'>-</div><div class='del'>-	gboolean advanced;</div><div class='del'>-</div><div class='del'>-} AddressbookSourceDialog;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ldap api foo */</div><div class='del'>-static LDAP *</div><div class='del'>-addressbook_ldap_init (GtkWidget *window, AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	LDAP *ldap = ldap_init (source-&gt;host, atoi(source-&gt;port));</div><div class='del'>-</div><div class='del'>-	if (!ldap) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_error_dialog_parented (_("Failed to connect to LDAP server"), GTK_WINDOW(window));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX do TLS if it's configured in */</div><div class='del'>-</div><div class='del'>-	return ldap;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-addressbook_ldap_auth (GtkWidget *window, AddressbookSource *source, LDAP *ldap)</div><div class='del'>-{</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	/* XXX use auth info from source */</div><div class='del'>-	ldap_error = ldap_simple_bind_s (ldap, NULL, NULL);</div><div class='del'>-	if (LDAP_SUCCESS != ldap_error) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_error_dialog_parented (_("Failed to authenticate with LDAP server"), GTK_WINDOW (window));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-	}</div><div class='del'>-	return ldap_error;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-addressbook_root_dse_query (GtkWidget *dialog, AddressbookSource *source, LDAP *ldap, char **attrs, LDAPMessage **resp)</div><div class='del'>-{</div><div class='del'>-	int ldap_error;</div><div class='del'>-	struct timeval timeout;</div><div class='del'>-</div><div class='del'>-	/* 3 second timeout */</div><div class='del'>-	timeout.tv_sec = 3;</div><div class='del'>-	timeout.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_search_ext_s (ldap,</div><div class='del'>-					LDAP_ROOT_DSE, LDAP_SCOPE_BASE,</div><div class='del'>-					"(objectclass=*)",</div><div class='del'>-					attrs, 0, NULL, NULL, &amp;timeout, LDAP_NO_LIMIT, resp);</div><div class='del'>-	if (LDAP_SUCCESS != ldap_error) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_error_dialog_parented (_("Could not perform query on Root DSE"), GTK_WINDOW (dialog));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ldap_error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static AddressbookSource *</div><div class='del'>-addressbook_dialog_get_source (AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	AddressbookSource *source = g_new0 (AddressbookSource, 1);</div><div class='del'>-</div><div class='del'>-	source-&gt;name       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;display_name));</div><div class='del'>-	source-&gt;host       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;host));</div><div class='del'>-	source-&gt;email_addr = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;email));</div><div class='del'>-	source-&gt;binddn     = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;binddn));</div><div class='del'>-	source-&gt;port       = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry));</div><div class='del'>-	source-&gt;rootdn     = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;rootdn));</div><div class='del'>-	source-&gt;limit      = atoi(e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;limit_spinbutton)));</div><div class='del'>-	source-&gt;scope      = dialog-&gt;scope;</div><div class='del'>-	source-&gt;auth       = dialog-&gt;auth;</div><div class='del'>-	source-&gt;ssl        = dialog-&gt;ssl;</div><div class='del'>-</div><div class='del'>-	addressbook_storage_init_source_uri (source);</div><div class='del'>-</div><div class='del'>-	return source;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;display_name), source ? source-&gt;name : "");</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;host), source ? source-&gt;host : "");</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;email), source ? source-&gt;email_addr : "");</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;binddn), source ? source-&gt;binddn : "");</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry), source ? source-&gt;port : LDAP_PORT_STRING);</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;rootdn), source ? source-&gt;rootdn : "");</div><div class='del'>-</div><div class='del'>-	string = g_strdup_printf ("%d", source ? source-&gt;limit : 100);</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;limit_spinbutton), string);</div><div class='del'>-	g_free (string);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;auth = source ? source-&gt;auth : ADDRESSBOOK_LDAP_AUTH_NONE;</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog-&gt;auth_optionmenu), dialog-&gt;auth);</div><div class='del'>-	if (dialog-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE) {</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;auth_label_notebook), dialog-&gt;auth - 1);</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;auth_entry_notebook), dialog-&gt;auth - 1);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;auth_label_notebook, dialog-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE);</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;auth_entry_notebook, dialog-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;scope = source ? source-&gt;scope : ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog-&gt;scope_optionmenu), dialog-&gt;scope);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;ssl = source ? source-&gt;auth : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog-&gt;ssl_optionmenu), dialog-&gt;ssl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_source_dialog_destroy (GtkWidget *widget, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-#define IF_UNREF(x) if (x) gtk_object_unref (GTK_OBJECT ((x)))</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (dialog-&gt;server_objectclasses) {</div><div class='del'>-		for (i = 0; i &lt; dialog-&gt;server_objectclasses-&gt;len; i ++)</div><div class='del'>-			ldap_objectclass_free (g_ptr_array_index (dialog-&gt;server_objectclasses, i));</div><div class='del'>-		g_ptr_array_free (dialog-&gt;server_objectclasses, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dialog-&gt;evolution_objectclasses) {</div><div class='del'>-		for (i = 0; i &lt; dialog-&gt;evolution_objectclasses-&gt;len; i ++)</div><div class='del'>-			ldap_objectclass_free (g_ptr_array_index (dialog-&gt;evolution_objectclasses, i));</div><div class='del'>-		g_ptr_array_free (dialog-&gt;evolution_objectclasses, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dialog-&gt;default_objectclasses) {</div><div class='del'>-		for (i = 0; i &lt; dialog-&gt;default_objectclasses-&gt;len; i ++)</div><div class='del'>-			ldap_objectclass_free (g_ptr_array_index (dialog-&gt;default_objectclasses, i));</div><div class='del'>-		g_ptr_array_free (dialog-&gt;default_objectclasses, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	IF_UNREF (dialog-&gt;objectclasses_server_model);</div><div class='del'>-	IF_UNREF (dialog-&gt;objectclasses_evolution_model);</div><div class='del'>-</div><div class='del'>-	IF_UNREF (dialog-&gt;objectclasses_tab);</div><div class='del'>-	IF_UNREF (dialog-&gt;objectclasses_label);</div><div class='del'>-	IF_UNREF (dialog-&gt;mappings_tab);</div><div class='del'>-	IF_UNREF (dialog-&gt;mappings_label);</div><div class='del'>-	IF_UNREF (dialog-&gt;dn_customization_tab);</div><div class='del'>-	IF_UNREF (dialog-&gt;dn_customization_label);</div><div class='del'>-</div><div class='del'>-#undef IF_UNREF</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (dialog-&gt;gui));</div><div class='del'>-</div><div class='del'>-	g_free (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_add_server_druid_cancel (GtkWidget *widget, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_destroy (dialog-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_add_server_druid_finish (GnomeDruidPage *druid_page, GtkWidget *gnome_druid, AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);</div><div class='del'>-	AddressbookDialog *dialog = sdialog-&gt;addressbook_dialog;</div><div class='del'>-</div><div class='del'>-	printf ("in finish (%s,%s)\n", source-&gt;name, source-&gt;host);</div><div class='del'>-</div><div class='del'>-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;sourcesModel),</div><div class='del'>-				     -1, source, source-&gt;name, source-&gt;host);</div><div class='del'>-</div><div class='del'>-	evolution_config_control_changed (dialog-&gt;config_control);</div><div class='del'>-</div><div class='del'>-	/* tear down the widgets */</div><div class='del'>-	gtk_widget_destroy (sdialog-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reparent_to_vbox (AddressbookSourceDialog *dialog, char *vbox_name, char *widget_name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox, *widget;</div><div class='del'>-</div><div class='del'>-	vbox = glade_xml_get_widget (dialog-&gt;gui, vbox_name);</div><div class='del'>-	widget = glade_xml_get_widget (dialog-&gt;gui, widget_name);</div><div class='del'>-</div><div class='del'>-	gtk_widget_reparent (widget, vbox);</div><div class='del'>-	gtk_box_set_child_packing (GTK_BOX (vbox), widget, TRUE, TRUE, 0, GTK_PACK_START);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-auth_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;auth = g_list_index (gtk_container_children (GTK_CONTAINER (item-&gt;parent)),</div><div class='del'>-				    item);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;general_modify_func (item, dialog);</div><div class='del'>-</div><div class='del'>-	if (dialog-&gt;auth == 0) {</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;auth_label_notebook, FALSE);</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;auth_entry_notebook, FALSE);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;auth_label_notebook, TRUE);</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;auth_entry_notebook, TRUE);</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;auth_label_notebook), dialog-&gt;auth - 1);</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;auth_entry_notebook), dialog-&gt;auth - 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_auth_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (auth_optionmenu_activated), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_general_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *general_tab_help;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	general_tab_help = glade_xml_get_widget (dialog-&gt;gui, "general-tab-help");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;general_modify_func = modify_func;</div><div class='del'>-	dialog-&gt;host = glade_xml_get_widget (dialog-&gt;gui, "server-name-entry");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;host), "changed",</div><div class='del'>-			    modify_func, dialog);</div><div class='del'>-	add_focus_handler (dialog-&gt;host, general_tab_help, 0);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;auth_label_notebook = glade_xml_get_widget (dialog-&gt;gui, "auth-label-notebook");</div><div class='del'>-	dialog-&gt;auth_entry_notebook = glade_xml_get_widget (dialog-&gt;gui, "auth-entry-notebook");</div><div class='del'>-	dialog-&gt;email = glade_xml_get_widget (dialog-&gt;gui, "email-entry");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;email), "changed",</div><div class='del'>-			    modify_func, dialog);</div><div class='del'>-	add_focus_handler (dialog-&gt;email, general_tab_help, 1);</div><div class='del'>-	dialog-&gt;binddn = glade_xml_get_widget (dialog-&gt;gui, "dn-entry");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;binddn), "changed",</div><div class='del'>-			    modify_func, dialog);</div><div class='del'>-	add_focus_handler (dialog-&gt;binddn, general_tab_help, 2);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;auth_optionmenu = glade_xml_get_widget (dialog-&gt;gui, "auth-optionmenu");</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog-&gt;auth_optionmenu));</div><div class='del'>-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_auth_activate_cb, dialog);</div><div class='del'>-	add_focus_handler (dialog-&gt;auth_optionmenu, general_tab_help, 3);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-general_tab_check (AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;host));</div><div class='del'>-	if (!string || !string[0])</div><div class='del'>-		valid = FALSE;</div><div class='del'>-	g_free (string);</div><div class='del'>-</div><div class='del'>-	if (valid) {</div><div class='del'>-		if (dialog-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE) {</div><div class='del'>-			if (dialog-&gt;auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)</div><div class='del'>-				string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;binddn));</div><div class='del'>-			else</div><div class='del'>-				string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;email));</div><div class='del'>-</div><div class='del'>-			if (!string || !string[0])</div><div class='del'>-				valid = FALSE;</div><div class='del'>-			g_free (string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_info_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog-&gt;druid),</div><div class='del'>-					   TRUE, /* back */</div><div class='del'>-					   general_tab_check (dialog), /* next */</div><div class='del'>-					   TRUE /* cancel */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_info_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	druid_info_page_modify_cb (NULL, dialog);</div><div class='del'>-	/* stick the focus in the hostname field */</div><div class='del'>-	gtk_widget_grab_focus (dialog-&gt;host);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* connecting page */</div><div class='del'>-static void</div><div class='del'>-ssl_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;ssl = g_list_index (gtk_container_children (GTK_CONTAINER (item-&gt;parent)),</div><div class='del'>-				    item);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;connecting_modify_func (item, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ssl_optionmenu_selected (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *connecting_tab_help;</div><div class='del'>-	int ssl_type = g_list_index (gtk_container_children (GTK_CONTAINER (item-&gt;parent)),</div><div class='del'>-				     item);</div><div class='del'>-</div><div class='del'>-	connecting_tab_help = glade_xml_get_widget (dialog-&gt;gui, "connecting-tab-help");</div><div class='del'>-</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK(connecting_tab_help), ssl_type + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_ssl_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ssl_optionmenu_activated), dialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "select",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ssl_optionmenu_selected), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-port_changed_func (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	/* if the port value is ldaps, set the SSL/TLS option menu to</div><div class='del'>-	   Always and desensitize it */</div><div class='del'>-	char *string = e_utf8_gtk_entry_get_text (GTK_ENTRY (item));</div><div class='del'>-</div><div class='del'>-	dialog-&gt;connecting_modify_func (item, dialog);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (string, LDAPS_PORT_STRING)) {</div><div class='del'>-		dialog-&gt;ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS;</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU(dialog-&gt;ssl_optionmenu),</div><div class='del'>-					     dialog-&gt;ssl);</div><div class='del'>-</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;ssl_optionmenu, FALSE);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;ssl_optionmenu, TRUE);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-		</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_connecting_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *connecting_tab_help;</div><div class='del'>-</div><div class='del'>-	dialog-&gt;connecting_modify_func = modify_func;</div><div class='del'>-</div><div class='del'>-	connecting_tab_help = glade_xml_get_widget (dialog-&gt;gui, "connecting-tab-help");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;port_combo = glade_xml_get_widget (dialog-&gt;gui, "port-combo");</div><div class='del'>-	add_focus_handler (dialog-&gt;port_combo, connecting_tab_help, 0);</div><div class='del'>-	add_focus_handler (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry, connecting_tab_help, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry), "changed",</div><div class='del'>-			    modify_func, dialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry), "changed",</div><div class='del'>-			    port_changed_func, dialog);</div><div class='del'>-	dialog-&gt;ssl_optionmenu = glade_xml_get_widget (dialog-&gt;gui, "ssl-optionmenu");</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog-&gt;ssl_optionmenu));</div><div class='del'>-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_ssl_activate_cb, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connecting_tab_check (AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry));</div><div class='del'>-	if (!string || !string[0])</div><div class='del'>-		valid = FALSE;</div><div class='del'>-	g_free (string);</div><div class='del'>-</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_connecting_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog-&gt;druid),</div><div class='del'>-					   TRUE, /* back */</div><div class='del'>-					   connecting_tab_check (dialog), /* next */</div><div class='del'>-					   TRUE /* cancel */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_connecting_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	druid_connecting_page_modify_cb (NULL, dialog);</div><div class='del'>-	/* stick the focus in the port combo */</div><div class='del'>-	gtk_widget_grab_focus (GTK_COMBO(dialog-&gt;port_combo)-&gt;entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* searching page */</div><div class='del'>-static ETableMemoryStoreColumnInfo bases_table_columns[] = {</div><div class='del'>-	E_TABLE_MEMORY_STORE_STRING,</div><div class='del'>-	E_TABLE_MEMORY_STORE_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BASES_TABLE_SPEC \</div><div class='del'>-"&lt;ETableSpecification cursor-mode=\"line\" no-headers=\"true\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Base\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableState&gt; \</div><div class='del'>-    &lt;column source=\"0\"/&gt; \</div><div class='del'>-    &lt;grouping&gt;&lt;/grouping&gt; \</div><div class='del'>-  &lt;/ETableState&gt; \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-supported_bases_create_table (char *name, char *string1, char *string2, int num1, int num2)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-</div><div class='del'>-	model = e_table_memory_store_new (bases_table_columns);</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, BASES_TABLE_SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-do_ldap_root_dse_query (GtkWidget *dialog, ETableModel *model, AddressbookSource *source, char ***rvalues)</div><div class='del'>-{</div><div class='del'>-	LDAP* ldap;</div><div class='del'>-	char *attrs[2];</div><div class='del'>-	int ldap_error;</div><div class='del'>-	char **values;</div><div class='del'>-	LDAPMessage *resp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	ldap = addressbook_ldap_init (dialog, source);</div><div class='del'>-	if (!ldap)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (LDAP_SUCCESS != addressbook_ldap_auth (dialog, source, ldap))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	attrs[0] = "namingContexts";</div><div class='del'>-	attrs[1] = NULL;</div><div class='del'>-</div><div class='del'>-	ldap_error = addressbook_root_dse_query (dialog, source, ldap, attrs, &amp;resp);</div><div class='del'>-</div><div class='del'>-	if (ldap_error != LDAP_SUCCESS)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "namingContexts");</div><div class='del'>-	if (!values || values[0] == NULL) {</div><div class='del'>-		GtkWidget *error_dialog;</div><div class='del'>-		error_dialog = gnome_ok_dialog_parented (_("The server responded with no supported search bases"), GTK_WINDOW (dialog));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; values[i]; i++)</div><div class='del'>-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (model),</div><div class='del'>-					     -1, GINT_TO_POINTER(i), values[i]);</div><div class='del'>-</div><div class='del'>-	*rvalues = values;</div><div class='del'>-</div><div class='del'>-	ldap_unbind_s (ldap);</div><div class='del'>-	return TRUE;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	ldap_unbind_s (ldap);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-search_base_selection_model_changed (ESelectionModel *selection_model, GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog),</div><div class='del'>-				    0 /* OK */, e_selection_model_selected_count (selection_model) == 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *selection_model;</div><div class='del'>-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *supported_bases_table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	int id;</div><div class='del'>-	char **values;</div><div class='del'>-</div><div class='del'>-	dialog = glade_xml_get_widget (sdialog-&gt;gui, "supported-bases-dialog");</div><div class='del'>-</div><div class='del'>-	supported_bases_table = glade_xml_get_widget (sdialog-&gt;gui, "supported-bases-table");</div><div class='del'>-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(supported_bases_table)));</div><div class='del'>-	model = gtk_object_get_data (GTK_OBJECT (supported_bases_table), "model");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (selection_model), "selection_changed",</div><div class='del'>-			    search_base_selection_model_changed, dialog);</div><div class='del'>-</div><div class='del'>-	search_base_selection_model_changed (selection_model, dialog);</div><div class='del'>-</div><div class='del'>-	if (do_ldap_root_dse_query (dialog, model, source, &amp;values)) {</div><div class='del'>-		gnome_dialog_close_hides (GNOME_DIALOG(dialog), TRUE);</div><div class='del'>-</div><div class='del'>-		id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-		if (id == 0) {</div><div class='del'>-			int i;</div><div class='del'>-			/* OK was clicked */</div><div class='del'>-</div><div class='del'>-			/* ugh. */</div><div class='del'>-			for (i = 0; values[i]; i ++) {</div><div class='del'>-				if (e_selection_model_is_row_selected (selection_model, i)) {</div><div class='del'>-					e_utf8_gtk_entry_set_text (GTK_ENTRY (sdialog-&gt;rootdn), values[i]);</div><div class='del'>-					break; /* single selection, so we can quit when we've found it. */</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_value_free (values);</div><div class='del'>-</div><div class='del'>-		e_table_memory_store_clear (E_TABLE_MEMORY_STORE (model));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addressbook_source_free (source);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (selection_model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-scope_optionmenu_activated (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;scope = g_list_index (gtk_container_children (GTK_CONTAINER (item-&gt;parent)),</div><div class='del'>-				      item);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;searching_modify_func (item, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_scope_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (scope_optionmenu_activated), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_searching_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *rootdn_button;</div><div class='del'>-	GtkWidget *searching_tab_help;</div><div class='del'>-</div><div class='del'>-	dialog-&gt;searching_modify_func = modify_func;</div><div class='del'>-</div><div class='del'>-	searching_tab_help = glade_xml_get_widget (dialog-&gt;gui, "searching-tab-help");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;rootdn = glade_xml_get_widget (dialog-&gt;gui, "rootdn-entry");</div><div class='del'>-	add_focus_handler (dialog-&gt;rootdn, searching_tab_help, 0);</div><div class='del'>-	if (modify_func)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (dialog-&gt;rootdn), "changed",</div><div class='del'>-				    modify_func, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;scope_optionmenu = glade_xml_get_widget (dialog-&gt;gui, "scope-optionmenu");</div><div class='del'>-	add_focus_handler (dialog-&gt;scope_optionmenu, searching_tab_help, 1);</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog-&gt;scope_optionmenu));</div><div class='del'>-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_scope_activate_cb, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;timeout_scale = glade_xml_get_widget (dialog-&gt;gui, "timeout-scale");</div><div class='del'>-	add_focus_handler (dialog-&gt;timeout_scale, searching_tab_help, 2);</div><div class='del'>-	if (modify_func)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (GTK_RANGE(dialog-&gt;timeout_scale)-&gt;adjustment),</div><div class='del'>-				    "value_changed",</div><div class='del'>-				    modify_func, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;limit_spinbutton = glade_xml_get_widget (dialog-&gt;gui, "download-limit-spinbutton");</div><div class='del'>-	if (modify_func)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (dialog-&gt;limit_spinbutton), "changed",</div><div class='del'>-				    modify_func, dialog);</div><div class='del'>-</div><div class='del'>-	/* special handling for the "Show Supported Bases button" */</div><div class='del'>-	rootdn_button = glade_xml_get_widget (dialog-&gt;gui, "rootdn-button");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (rootdn_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC(query_for_supported_bases), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_searching_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog-&gt;druid),</div><div class='del'>-					   TRUE, /* back */</div><div class='del'>-					   TRUE, /* next */</div><div class='del'>-					   TRUE /* cancel */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* display name page */</div><div class='del'>-static gboolean</div><div class='del'>-display_name_check (AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;display_name));</div><div class='del'>-	if (!string || !string[0])</div><div class='del'>-		valid = FALSE;</div><div class='del'>-	g_free (string);</div><div class='del'>-</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-display_name_page_prepare (GtkWidget *page, GtkWidget *gnome_druid, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	if (!dialog-&gt;display_name_changed) {</div><div class='del'>-		char *server_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog-&gt;host));</div><div class='del'>-		e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;display_name), server_name);</div><div class='del'>-		g_free (server_name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_druid_set_buttons_sensitive (GNOME_DRUID(dialog-&gt;druid),</div><div class='del'>-					   TRUE, /* back */</div><div class='del'>-					   display_name_check (dialog), /* next */</div><div class='del'>-					   TRUE /* cancel */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-druid_display_name_page_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;display_name_changed = TRUE;</div><div class='del'>-	display_name_page_prepare (NULL, NULL, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-/* objectclasses page */</div><div class='del'>-static ETableMemoryStoreColumnInfo objectclasses_table_columns[] = {</div><div class='del'>-	E_TABLE_MEMORY_STORE_STRING,</div><div class='del'>-	E_TABLE_MEMORY_STORE_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define OBJECTCLASSES_TABLE_SPEC \</div><div class='del'>-"&lt;ETableSpecification cursor-mode=\"line\" no-headers=\"true\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Objectclass\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableState&gt; \</div><div class='del'>-    &lt;column source=\"0\"/&gt; \</div><div class='del'>-    &lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"true\"/&gt; &lt;/grouping&gt; \</div><div class='del'>-  &lt;/ETableState&gt; \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-objectclasses_create_server_table (char *name, char *string1, char *string2,</div><div class='del'>-				   int num1, int num2)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-</div><div class='del'>-	model = e_table_memory_store_new (objectclasses_table_columns);</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, OBJECTCLASSES_TABLE_SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-objectclasses_create_evolution_table (char *name, char *string1, char *string2,</div><div class='del'>-				      int num1, int num2)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-</div><div class='del'>-	model = e_table_memory_store_new (objectclasses_table_columns);</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, OBJECTCLASSES_TABLE_SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_add_foreach (int model_row, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	LDAPObjectClass *oc = e_table_memory_get_data (E_TABLE_MEMORY (dialog-&gt;objectclasses_server_model), model_row);	</div><div class='del'>-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_server_model), model_row);</div><div class='del'>-	/* XXX remove from the server array */</div><div class='del'>-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_evolution_model),</div><div class='del'>-				     -1, oc, oc-&gt;oc_names[0]);</div><div class='del'>-	/* XXX add to the evolution array */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_add (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;objectclasses_server_table)));</div><div class='del'>-</div><div class='del'>-	e_selection_model_foreach (esm, (EForeachFunc)objectclasses_add_foreach, dialog);</div><div class='del'>-	dialog-&gt;objectclasses_modify_func (item, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_server_double_click (ETable *et, int row, int col, GdkEvent *event, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	objectclasses_add_foreach (row, dialog);</div><div class='del'>-	dialog-&gt;objectclasses_modify_func (GTK_WIDGET (et), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_remove_foreach (int model_row, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	LDAPObjectClass *oc = e_table_memory_get_data (E_TABLE_MEMORY (dialog-&gt;objectclasses_evolution_model), model_row);</div><div class='del'>-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_evolution_model), model_row);</div><div class='del'>-	/* XXX remove from the evolution array */</div><div class='del'>-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_server_model),</div><div class='del'>-				     -1, oc, oc-&gt;oc_names[0]);</div><div class='del'>-	/* XXX add to the server array */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_remove (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;objectclasses_evolution_table)));</div><div class='del'>-</div><div class='del'>-	e_selection_model_foreach (esm, (EForeachFunc)objectclasses_add_foreach, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_modify_func (item, dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_evolution_double_click (ETable *et, int row, int col, GdkEvent *event, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	objectclasses_remove_foreach (row, dialog);</div><div class='del'>-	dialog-&gt;objectclasses_modify_func (GTK_WIDGET (et), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-objectclasses_restore_default (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	dialog-&gt;objectclasses_modify_func (item, dialog);</div><div class='del'>-</div><div class='del'>-	/* clear out our evolution list */</div><div class='del'>-	for (i = 0; i &lt; dialog-&gt;evolution_objectclasses-&gt;len; i ++) {</div><div class='del'>-		g_ptr_array_add (dialog-&gt;server_objectclasses, g_ptr_array_index (dialog-&gt;evolution_objectclasses, i));</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_set_size (dialog-&gt;evolution_objectclasses, 0);</div><div class='del'>-</div><div class='del'>-	e_table_memory_store_clear (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_evolution_model));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; dialog-&gt;default_objectclasses-&gt;len; i++) {</div><div class='del'>-		LDAPObjectClass *oc = g_ptr_array_index (dialog-&gt;default_objectclasses, i);</div><div class='del'>-		g_ptr_array_add (dialog-&gt;evolution_objectclasses, oc);</div><div class='del'>-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;objectclasses_evolution_model),</div><div class='del'>-					     i, oc, oc-&gt;oc_names[0]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-server_selection_model_changed (ESelectionModel *selection_model, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;objectclasses_add_button,</div><div class='del'>-				  e_selection_model_selected_count (selection_model) &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-evolution_selection_model_changed (ESelectionModel *selection_model, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;objectclasses_remove_button,</div><div class='del'>-				  e_selection_model_selected_count (selection_model) &gt; 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_objectclasses_tab (AddressbookSourceDialog *dialog, GtkSignalFunc modify_func)</div><div class='del'>-{</div><div class='del'>-	ETable *table;</div><div class='del'>-	GtkWidget *restore_default;</div><div class='del'>-	ESelectionModel *esm;</div><div class='del'>-</div><div class='del'>-	dialog-&gt;server_objectclasses = g_ptr_array_new ();</div><div class='del'>-	dialog-&gt;evolution_objectclasses = g_ptr_array_new ();</div><div class='del'>-	dialog-&gt;default_objectclasses = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_modify_func = modify_func;</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_server_table = glade_xml_get_widget (dialog-&gt;gui, "objectclasses-server-table");</div><div class='del'>-	dialog-&gt;objectclasses_server_model = gtk_object_get_data (GTK_OBJECT (dialog-&gt;objectclasses_server_table), "model");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_evolution_table = glade_xml_get_widget (dialog-&gt;gui, "objectclasses-evolution-table");</div><div class='del'>-	dialog-&gt;objectclasses_evolution_model = gtk_object_get_data (GTK_OBJECT (dialog-&gt;objectclasses_evolution_table), "model");</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;objectclasses_server_table));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (table), "double_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (objectclasses_server_double_click), dialog);</div><div class='del'>-	esm = e_table_get_selection_model (table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",</div><div class='del'>-			    server_selection_model_changed, dialog);</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;objectclasses_evolution_table));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (table), "double_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (objectclasses_evolution_double_click), dialog);</div><div class='del'>-	esm = e_table_get_selection_model (table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",</div><div class='del'>-			    evolution_selection_model_changed, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_add_button = glade_xml_get_widget (dialog-&gt;gui, "objectclasses-add-button");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;objectclasses_add_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC(objectclasses_add), dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;objectclasses_remove_button = glade_xml_get_widget (dialog-&gt;gui, "objectclasses-remove-button");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;objectclasses_remove_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC(objectclasses_remove), dialog);</div><div class='del'>-</div><div class='del'>-	restore_default = glade_xml_get_widget (dialog-&gt;gui, "objectclasses-default-button");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (restore_default), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC(objectclasses_restore_default), dialog);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static AddressbookSourceDialog *</div><div class='del'>-addressbook_add_server_druid (AddressbookDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;addressbook_dialog = dialog;</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;window = glade_xml_get_widget (sdialog-&gt;gui, "account-druid-window");</div><div class='del'>-	sdialog-&gt;druid = glade_xml_get_widget (sdialog-&gt;gui, "account-druid");</div><div class='del'>-</div><div class='del'>-	/* info page */</div><div class='del'>-	page = glade_xml_get_widget (sdialog-&gt;gui, "add-server-druid-info-page");</div><div class='del'>-	reparent_to_vbox (sdialog, "account-druid-general-vbox", "general-tab");</div><div class='del'>-	setup_general_tab (sdialog, GTK_SIGNAL_FUNC (druid_info_page_modify_cb));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(page), "prepare",</div><div class='del'>-			    GTK_SIGNAL_FUNC(druid_info_page_prepare), sdialog);</div><div class='del'>-</div><div class='del'>-	/* connecting page */</div><div class='del'>-	page = glade_xml_get_widget (sdialog-&gt;gui, "add-server-druid-connecting-page");</div><div class='del'>-	reparent_to_vbox (sdialog, "account-druid-connecting-vbox", "connecting-tab");</div><div class='del'>-	setup_connecting_tab (sdialog, druid_connecting_page_modify_cb);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(page), "prepare",</div><div class='del'>-			    GTK_SIGNAL_FUNC(druid_connecting_page_prepare), sdialog);</div><div class='del'>-</div><div class='del'>-	/* searching page */</div><div class='del'>-	page = glade_xml_get_widget (sdialog-&gt;gui, "add-server-druid-searching-page");</div><div class='del'>-	reparent_to_vbox (sdialog, "account-druid-searching-vbox", "searching-tab");</div><div class='del'>-	setup_searching_tab (sdialog, NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(page), "prepare",</div><div class='del'>-			    GTK_SIGNAL_FUNC(druid_searching_page_prepare), sdialog);</div><div class='del'>-</div><div class='del'>-	/* display name page */</div><div class='del'>-	page = glade_xml_get_widget (sdialog-&gt;gui, "add-server-druid-display-name-page");</div><div class='del'>-	sdialog-&gt;display_name = glade_xml_get_widget (sdialog-&gt;gui, "druid-display-name-entry");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;display_name), "changed",</div><div class='del'>-			    druid_display_name_page_modify_cb, sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(page), "prepare",</div><div class='del'>-			    GTK_SIGNAL_FUNC(display_name_page_prepare), sdialog);</div><div class='del'>-</div><div class='del'>-	page = glade_xml_get_widget (sdialog-&gt;gui, "add-server-druid-finish-page");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(page), "finish",</div><div class='del'>-			    GTK_SIGNAL_FUNC(addressbook_add_server_druid_finish), sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(sdialog-&gt;druid), "cancel",</div><div class='del'>-			    GTK_SIGNAL_FUNC(addressbook_add_server_druid_cancel), sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(sdialog-&gt;window), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC(addressbook_source_dialog_destroy), sdialog);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_modal (GTK_WINDOW (sdialog-&gt;window), TRUE);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (sdialog-&gt;window);</div><div class='del'>-</div><div class='del'>-	return sdialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-</div><div class='del'>-	valid = display_name_check (dialog);</div><div class='del'>-	if (valid)</div><div class='del'>-		valid = general_tab_check (dialog);</div><div class='del'>-#if 0</div><div class='del'>-	if (valid)</div><div class='del'>-		valid = connecting_tab_check (dialog);</div><div class='del'>-	if (valid)</div><div class='del'>-		valid = searching_tab_check (dialog);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;ok_button, valid);</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;apply_button, valid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_advanced_button_state (AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	if (dialog-&gt;advanced) {</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;advanced_button_notebook), 0);</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog-&gt;notebook), dialog-&gt;objectclasses_tab, dialog-&gt;objectclasses_label);</div><div class='del'>-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog-&gt;notebook), dialog-&gt;mappings_tab, dialog-&gt;mappings_label);</div><div class='del'>-		gtk_notebook_append_page (GTK_NOTEBOOK(dialog-&gt;notebook), dialog-&gt;dn_customization_tab, dialog-&gt;dn_customization_label);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		gtk_notebook_set_page (GTK_NOTEBOOK(dialog-&gt;advanced_button_notebook), 1);</div><div class='del'>-		</div><div class='del'>-		/* hide the advanced tabs of the main notebook */</div><div class='del'>-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog-&gt;notebook), 5);</div><div class='del'>-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog-&gt;notebook), 4);</div><div class='del'>-		gtk_notebook_remove_page (GTK_NOTEBOOK(dialog-&gt;notebook), 3);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-static void</div><div class='del'>-advanced_button_clicked (GtkWidget *button, AddressbookSourceDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;advanced = !dialog-&gt;advanced;</div><div class='del'>-	set_advanced_button_state (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-do_schema_query (AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-	int ldap_error;</div><div class='del'>-	char *schema_dn;</div><div class='del'>-	char *attrs[3];</div><div class='del'>-	char **values;</div><div class='del'>-	int i;</div><div class='del'>-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);</div><div class='del'>-	LDAPMessage *resp;</div><div class='del'>-	struct timeval timeout;</div><div class='del'>-</div><div class='del'>-	ldap = addressbook_ldap_init (sdialog-&gt;window, source);</div><div class='del'>-	if (!ldap)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (LDAP_SUCCESS != addressbook_ldap_auth (sdialog-&gt;window, source, ldap))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	attrs[0] = "subschemaSubentry";</div><div class='del'>-	attrs[1] = NULL;</div><div class='del'>-</div><div class='del'>-	ldap_error = addressbook_root_dse_query (sdialog-&gt;window, source, ldap, attrs, &amp;resp);</div><div class='del'>-</div><div class='del'>-	if (ldap_error != LDAP_SUCCESS)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "subschemaSubentry");</div><div class='del'>-	if (!values || values[0] == NULL) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_ok_dialog_parented (_("This server does not support LDAPv3 schema information"), GTK_WINDOW (sdialog-&gt;window));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	schema_dn = g_strdup (values[0]);</div><div class='del'>-</div><div class='del'>-	ldap_value_free (values);</div><div class='del'>-	ldap_msgfree (resp);</div><div class='del'>-</div><div class='del'>-	attrs[0] = "objectClasses";</div><div class='del'>-	attrs[1] = NULL;</div><div class='del'>-</div><div class='del'>-	/* 3 second timeout */</div><div class='del'>-	timeout.tv_sec = 3;</div><div class='del'>-	timeout.tv_usec = 0;</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_search_ext_s (ldap, schema_dn, LDAP_SCOPE_BASE,</div><div class='del'>-					"(objectClass=subschema)", attrs, 0,</div><div class='del'>-					NULL, NULL, &amp;timeout, LDAP_NO_LIMIT, &amp;resp);</div><div class='del'>-	if (LDAP_SUCCESS != ldap_error) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_error_dialog_parented (_("Error retrieving schema information"), GTK_WINDOW (sdialog-&gt;window));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	values = ldap_get_values (ldap, resp, "objectClasses");</div><div class='del'>-	if (!values) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		dialog = gnome_error_dialog_parented (_("Server did not respond with valid schema information"), GTK_WINDOW (sdialog-&gt;window));</div><div class='del'>-		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; values[i]; i ++) { </div><div class='del'>-		int j;</div><div class='del'>-		int code;</div><div class='del'>-		const char *err;</div><div class='del'>-		LDAPObjectClass *oc = ldap_str2objectclass (values[i], &amp;code, &amp;err, 0);</div><div class='del'>-</div><div class='del'>-		if (!oc)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* we fill in the default list of classes here */</div><div class='del'>-		for (j = 0; oc-&gt;oc_names[j]; j ++) {</div><div class='del'>-			if (!g_strcasecmp (oc-&gt;oc_names[j], EVOLUTIONPERSON) ||</div><div class='del'>-			    !g_strcasecmp (oc-&gt;oc_names[j], INETORGPERSON) ||</div><div class='del'>-			    !g_strcasecmp (oc-&gt;oc_names[j], ORGANIZATIONALPERSON) ||</div><div class='del'>-			    !g_strcasecmp (oc-&gt;oc_names[j], PERSON) ||</div><div class='del'>-			    !g_strcasecmp (oc-&gt;oc_names[j], CALENTRY) ||</div><div class='del'>-			    !g_strcasecmp (oc-&gt;oc_names[j], TOP))</div><div class='del'>-				g_ptr_array_add (sdialog-&gt;default_objectclasses, oc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add (sdialog-&gt;server_objectclasses, oc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addressbook_source_free (source);</div><div class='del'>-	ldap_unbind_s (ldap);</div><div class='del'>-	return TRUE;</div><div class='del'>-</div><div class='del'>- fail:</div><div class='del'>-	addressbook_source_free (source);</div><div class='del'>-	if (ldap)</div><div class='del'>-		ldap_unbind_s (ldap);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_dialog_switch_page (GtkNotebook *notebook,</div><div class='del'>-			 GtkNotebookPage *page, guint page_num,</div><div class='del'>-			 AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	if (page_num &gt;= 3 &amp;&amp; !sdialog-&gt;schema_query_successful) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), FALSE);</div><div class='del'>-</div><div class='del'>-		sdialog-&gt;schema_query_successful = do_schema_query (sdialog);</div><div class='del'>-</div><div class='del'>-		if (sdialog-&gt;schema_query_successful) {</div><div class='del'>-			/* fill in the objectclasses model */</div><div class='del'>-			for (i = 0; i &lt; sdialog-&gt;server_objectclasses-&gt;len; i ++) {</div><div class='del'>-				LDAPObjectClass *oc = g_ptr_array_index (sdialog-&gt;server_objectclasses, i);</div><div class='del'>-				e_table_memory_store_insert (E_TABLE_MEMORY_STORE (sdialog-&gt;objectclasses_server_model),</div><div class='del'>-							     -1, oc, oc-&gt;oc_names[0]);</div><div class='del'>-			}</div><div class='del'>-			gtk_widget_set_sensitive (page-&gt;child, TRUE);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			gtk_widget_set_sensitive (page-&gt;child, FALSE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_widget_set_sensitive (GTK_WIDGET (notebook), TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-edit_dialog_store_change (AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	AddressbookSource *source = addressbook_dialog_get_source (sdialog);</div><div class='del'>-	AddressbookDialog *dialog = sdialog-&gt;addressbook_dialog;</div><div class='del'>-	AddressbookSource *old_source;</div><div class='del'>-</div><div class='del'>-	/* check the display name for uniqueness */</div><div class='del'>-	if (FALSE /* XXX */) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* store the new source in the addressbook dialog */</div><div class='del'>-	old_source = e_table_memory_get_data (E_TABLE_MEMORY (dialog-&gt;sourcesModel), sdialog-&gt;source_model_row);</div><div class='del'>-	addressbook_source_free (old_source);</div><div class='del'>-	e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog-&gt;sourcesModel),</div><div class='del'>-				     sdialog-&gt;source_model_row);</div><div class='del'>-</div><div class='del'>-	e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;sourcesModel),</div><div class='del'>-				     sdialog-&gt;source_model_row, source, source-&gt;name, source-&gt;host);</div><div class='del'>-</div><div class='del'>-	/* and let the config control know about the change */</div><div class='del'>-	evolution_config_control_changed (dialog-&gt;config_control);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_dialog_apply_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	if (!edit_dialog_store_change (sdialog))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* resensitize the buttons */</div><div class='del'>-	gtk_widget_set_sensitive (sdialog-&gt;ok_button, FALSE);</div><div class='del'>-	gtk_widget_set_sensitive (sdialog-&gt;apply_button, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_dialog_close_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_destroy (sdialog-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_dialog_ok_clicked (GtkWidget *item, AddressbookSourceDialog *sdialog)</div><div class='del'>-{</div><div class='del'>-	if (edit_dialog_store_change (sdialog))</div><div class='del'>-		edit_dialog_close_clicked (item, sdialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static AddressbookSourceDialog*</div><div class='del'>-addressbook_edit_server_dialog (AddressbookDialog *dialog, AddressbookSource *source, int model_row)</div><div class='del'>-{</div><div class='del'>-	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);</div><div class='del'>-	GtkWidget *general_tab_help;</div><div class='del'>-	GtkWidget *fewer_options_button, *more_options_button;</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;addressbook_dialog = dialog;</div><div class='del'>-	sdialog-&gt;source_model_row = model_row;</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;window = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-window");</div><div class='del'>-</div><div class='del'>-	/* general tab */</div><div class='del'>-	general_tab_help = glade_xml_get_widget (dialog-&gt;gui, "general-tab-help");</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-general-vbox", "general-tab");</div><div class='del'>-	setup_general_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));</div><div class='del'>-	sdialog-&gt;display_name = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-display-name-entry");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;display_name), "changed",</div><div class='del'>-			    editor_modify_cb, sdialog);</div><div class='del'>-	add_focus_handler (sdialog-&gt;display_name, general_tab_help, 4);</div><div class='del'>-</div><div class='del'>-	/* connecting tab */</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-connecting-vbox", "connecting-tab");</div><div class='del'>-	setup_connecting_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));</div><div class='del'>-</div><div class='del'>-	/* searching tab */</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-searching-vbox", "searching-tab");</div><div class='del'>-	setup_searching_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-	/* objectclasses tab */</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-objectclasses-vbox", "objectclasses-tab");</div><div class='del'>-	setup_objectclasses_tab (sdialog, GTK_SIGNAL_FUNC (editor_modify_cb));</div><div class='del'>-</div><div class='del'>-	/* mappings tab */</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-mappings-vbox", "mappings-tab");</div><div class='del'>-	/* XXX setup_mappings_tab */</div><div class='del'>-</div><div class='del'>-	/* dn customization tab */</div><div class='del'>-	reparent_to_vbox (sdialog, "account-editor-dn-customization-vbox", "dn-customization-tab");</div><div class='del'>-	/* XXX setup_dn_customization_tab */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;ok_button = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-ok-button");</div><div class='del'>-	sdialog-&gt;apply_button = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-apply-button");</div><div class='del'>-	sdialog-&gt;close_button = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-close-button");</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;advanced_button_notebook = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-advanced-button-notebook");</div><div class='del'>-	fewer_options_button = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-fewer-options-button");</div><div class='del'>-	more_options_button = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-more-options-button");</div><div class='del'>-</div><div class='del'>-	sdialog-&gt;notebook = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-notebook");</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-	sdialog-&gt;objectclasses_label = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-objectclasses-label");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;objectclasses_label));</div><div class='del'>-	sdialog-&gt;objectclasses_tab = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-objectclasses-vbox");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;objectclasses_tab));</div><div class='del'>-	sdialog-&gt;mappings_label = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-mappings-label");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;mappings_label));</div><div class='del'>-	sdialog-&gt;mappings_tab = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-mappings-vbox");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;mappings_tab));</div><div class='del'>-	sdialog-&gt;dn_customization_label = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-dn-customization-label");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;dn_customization_label));</div><div class='del'>-	sdialog-&gt;dn_customization_tab = glade_xml_get_widget (sdialog-&gt;gui, "account-editor-dn-customization-vbox");</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (sdialog-&gt;dn_customization_tab));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	addressbook_source_dialog_set_source (sdialog, source);</div><div class='del'>-</div><div class='del'>-	set_advanced_button_state (sdialog);</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fewer_options_button),</div><div class='del'>-			    "clicked", advanced_button_clicked, sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (more_options_button),</div><div class='del'>-			    "clicked", advanced_button_clicked, sdialog);</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-	gtk_widget_hide (sdialog-&gt;advanced_button_notebook);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef NEW_ADVANCED_UI</div><div class='del'>-	/* set up a signal handler to query for schema info if the user switches to the advanced tabs */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;notebook), "switch_page",</div><div class='del'>-			    GTK_SIGNAL_FUNC (edit_dialog_switch_page), sdialog);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;ok_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_ok_clicked), sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;apply_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_apply_clicked), sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (sdialog-&gt;close_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC(edit_dialog_close_clicked), sdialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(sdialog-&gt;window), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC(addressbook_source_dialog_destroy), sdialog);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (sdialog-&gt;ok_button, FALSE);</div><div class='del'>-	gtk_widget_set_sensitive (sdialog-&gt;apply_button, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_modal (GTK_WINDOW (sdialog-&gt;window), TRUE);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (sdialog-&gt;window);</div><div class='del'>-</div><div class='del'>-	return sdialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	addressbook_add_server_druid (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	ESelectionModel *selection_model;</div><div class='del'>-	int row_count;</div><div class='del'>-	</div><div class='del'>-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;sourcesTable)));</div><div class='del'>-	row_count = e_selection_model_row_count (selection_model);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; row_count; i ++) {</div><div class='del'>-		if (e_selection_model_is_row_selected (selection_model, i)) {</div><div class='del'>-			AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY(dialog-&gt;sourcesModel), i);</div><div class='del'>-			AddressbookSourceDialog *sdialog;</div><div class='del'>-			sdialog = addressbook_edit_server_dialog (dialog, source, i);</div><div class='del'>-			break; /* single select so we're done now */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	AddressbookSource *source;</div><div class='del'>-	AddressbookSourceDialog *sdialog;</div><div class='del'>-</div><div class='del'>-	source = gtk_clist_get_row_data (GTK_CLIST (dialog-&gt;clistSources), dialog-&gt;source_row);</div><div class='del'>-</div><div class='del'>-	sdialog = addressbook_config_source_with_gui (dialog-&gt;gui, source, dialog-&gt;page);</div><div class='del'>-	if (sdialog-&gt;id == 0) {</div><div class='del'>-		/* Ok was clicked */</div><div class='del'>-		source = addressbook_source_copy(sdialog-&gt;source);</div><div class='del'>-</div><div class='del'>-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog-&gt;clistSources), dialog-&gt;source_row, 0, source-&gt;name);</div><div class='del'>-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog-&gt;clistSources), dialog-&gt;source_row, 1, source-&gt;host);</div><div class='del'>-		gtk_clist_set_row_data (GTK_CLIST (dialog-&gt;clistSources), dialog-&gt;source_row, source);</div><div class='del'>-</div><div class='del'>-		evolution_config_control_changed (dialog-&gt;config_control);</div><div class='del'>-</div><div class='del'>-		update_sensitivity (dialog);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	ESelectionModel *selection_model;</div><div class='del'>-	int row_count;</div><div class='del'>-	</div><div class='del'>-	selection_model = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;sourcesTable)));</div><div class='del'>-	row_count = e_selection_model_row_count (selection_model);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; row_count; i ++) {</div><div class='del'>-		if (e_selection_model_is_row_selected (selection_model, i)) {</div><div class='del'>-			AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY(dialog-&gt;sourcesModel), i);</div><div class='del'>-			e_table_memory_store_remove (E_TABLE_MEMORY_STORE (dialog-&gt;sourcesModel), i);</div><div class='del'>-			addressbook_source_free (source);</div><div class='del'>-</div><div class='del'>-			break; /* single select so we're done now */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_config_control_changed (dialog-&gt;config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_config_control_destroy_callback (EvolutionConfigControl *config_control,</div><div class='del'>-				      void *data)</div><div class='del'>-{</div><div class='del'>-	AddressbookDialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = (AddressbookDialog *) data;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dialog-&gt;gui));</div><div class='del'>-</div><div class='del'>-	/* XXX free more stuff here */</div><div class='del'>-</div><div class='del'>-	g_free (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_config_control_apply_callback (EvolutionConfigControl *config_control,</div><div class='del'>-				    void *data)</div><div class='del'>-{</div><div class='del'>-	AddressbookDialog *dialog;</div><div class='del'>-	int i;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	dialog = (AddressbookDialog *) data;</div><div class='del'>-</div><div class='del'>-	addressbook_storage_clear_sources();</div><div class='del'>-</div><div class='del'>-	count = e_table_model_row_count (E_TABLE_MODEL (dialog-&gt;sourcesModel));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; count; i ++) {</div><div class='del'>-		AddressbookSource *source = e_table_memory_get_data (E_TABLE_MEMORY (dialog-&gt;sourcesModel), i);</div><div class='del'>-		addressbook_storage_add_source (addressbook_source_copy (source));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addressbook_storage_write_sources();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sources_selection_changed (ESelectionModel *esm, AddressbookDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	gboolean sensitive = e_selection_model_selected_count (esm) == 1;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;editSource, sensitive);</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;deleteSource, sensitive);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static AddressbookDialog *</div><div class='del'>-ldap_dialog_new (GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	AddressbookDialog *dialog;</div><div class='del'>-	GList *l;</div><div class='del'>-	ESelectionModel *esm;</div><div class='del'>-</div><div class='del'>-	dialog = g_new0 (AddressbookDialog, 1);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);</div><div class='del'>-	dialog-&gt;shell = shell;</div><div class='del'>-</div><div class='del'>-	dialog-&gt;sourcesTable = glade_xml_get_widget (dialog-&gt;gui, "sourcesTable");</div><div class='del'>-	dialog-&gt;sourcesModel = gtk_object_get_data (GTK_OBJECT (dialog-&gt;sourcesTable), "model");</div><div class='del'>-	</div><div class='del'>-	dialog-&gt;addSource = glade_xml_get_widget (dialog-&gt;gui, "addSource");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(dialog-&gt;addSource), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_source_clicked),</div><div class='del'>-			    dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;editSource = glade_xml_get_widget (dialog-&gt;gui, "editSource");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(dialog-&gt;editSource), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (edit_source_clicked),</div><div class='del'>-			    dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;deleteSource = glade_xml_get_widget (dialog-&gt;gui, "deleteSource");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(dialog-&gt;deleteSource), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_source_clicked),</div><div class='del'>-			    dialog);</div><div class='del'>-</div><div class='del'>-	l = addressbook_storage_get_sources ();</div><div class='del'>-	for (; l != NULL; l = l-&gt;next) {</div><div class='del'>-		AddressbookSource *source;</div><div class='del'>-</div><div class='del'>-		source = addressbook_source_copy ((AddressbookSource*)l-&gt;data);</div><div class='del'>-</div><div class='del'>-		e_table_memory_store_insert (E_TABLE_MEMORY_STORE (dialog-&gt;sourcesModel),</div><div class='del'>-					     -1, source, source-&gt;name, source-&gt;host);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	esm = e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(dialog-&gt;sourcesTable)));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (esm), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (sources_selection_changed), dialog);</div><div class='del'>-</div><div class='del'>-	sources_selection_changed (esm, dialog);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;page = glade_xml_get_widget (dialog-&gt;gui, "addressbook-sources");</div><div class='del'>-</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ETableMemoryStoreColumnInfo sources_table_columns[] = {</div><div class='del'>-	E_TABLE_MEMORY_STORE_STRING,</div><div class='del'>-	E_TABLE_MEMORY_STORE_STRING,</div><div class='del'>-	E_TABLE_MEMORY_STORE_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SOURCES_TABLE_SPEC \</div><div class='del'>-"&lt;ETableSpecification cursor-mode=\"line\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Account Name\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"1\" _title=\"Server Name\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableState&gt; \</div><div class='del'>-    &lt;column source=\"0\"/&gt; \</div><div class='del'>-    &lt;column source=\"1\"/&gt; \</div><div class='del'>-    &lt;grouping&gt;&lt;/grouping&gt; \</div><div class='del'>-  &lt;/ETableState&gt; \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-addressbook_dialog_create_sources_table (char *name, char *string1, char *string2, int num1, int num2)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	</div><div class='del'>-	model = e_table_memory_store_new (sources_table_columns);</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, SOURCES_TABLE_SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-#endif /* HAVE_LDAP */</div><div class='del'>-</div><div class='del'>-static EvolutionConfigControl *</div><div class='del'>-ldap_config_control_new (GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	EvolutionConfigControl *control;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	AddressbookDialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = ldap_dialog_new (shell);</div><div class='del'>-</div><div class='del'>-	control_widget = dialog-&gt;page;</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (control_widget);</div><div class='del'>-</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (control_widget-&gt;parent), control_widget);</div><div class='del'>-#else</div><div class='del'>-	control_widget = gtk_label_new (_("LDAP was not enabled in this build of Evolution"));</div><div class='del'>-	gtk_widget_set_sensitive (control_widget, FALSE);</div><div class='del'>-	gtk_widget_show (control_widget);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	control = evolution_config_control_new (control_widget);</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	dialog-&gt;config_control = control;</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;config_control), "apply",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ldap_config_control_apply_callback), dialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;config_control), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ldap_config_control_destroy_callback), dialog);</div><div class='del'>-</div><div class='del'>-	gtk_widget_unref (dialog-&gt;page);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_folder_list_changed_callback (EFolderList *efl,</div><div class='del'>-					  EvolutionConfigControl *control)</div><div class='del'>-{</div><div class='del'>-	evolution_config_control_changed (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_config_control_destroy_callback (EvolutionConfigControl *config_control,</div><div class='del'>-					     void *data)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_config_control_apply_callback (EvolutionConfigControl *config_control,</div><div class='del'>-					   EFolderList *list)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase config_db;</div><div class='del'>-	char *xml;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	config_db = addressbook_config_database(&amp;ev);</div><div class='del'>-</div><div class='del'>-	xml = e_folder_list_get_xml (list);</div><div class='del'>-	bonobo_config_set_string (config_db, "/Addressbook/Completion/uris", xml, &amp;ev);</div><div class='del'>-	g_free (xml);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EvolutionConfigControl *</div><div class='del'>-addressbook_config_control_new (GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	EvolutionConfigControl *control;</div><div class='del'>-	EvolutionShellClient *shell_client;</div><div class='del'>-	Bonobo_ConfigDatabase config_db;</div><div class='del'>-	char *xml;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	static const char *possible_types[] = { "contacts", "ldap-contacts", NULL };</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	config_db = addressbook_config_database(&amp;ev);</div><div class='del'>-</div><div class='del'>-	xml = bonobo_config_get_string (config_db, "/Addressbook/Completion/uris", &amp;ev);</div><div class='del'>-	shell_client = evolution_shell_client_new (shell);</div><div class='del'>-	control_widget = e_folder_list_new (shell_client,</div><div class='del'>-					    xml);</div><div class='del'>-	bonobo_object_client_unref (BONOBO_OBJECT_CLIENT (shell_client), NULL);</div><div class='del'>-	g_free (xml);</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (control_widget),</div><div class='del'>-			"title", _("Extra Completion folders"),</div><div class='del'>-			"possible_types", possible_types,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (control_widget);</div><div class='del'>-</div><div class='del'>-	control = evolution_config_control_new (control_widget);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control_widget), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_folder_list_changed_callback), control);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "apply",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_config_control_apply_callback), control_widget);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_config_control_destroy_callback), control_widget);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Implementation of the factory for the configuration control.  */</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-config_control_factory_fn (BonoboGenericFactory *factory,</div><div class='del'>-			   const char *component_id,</div><div class='del'>-			   void *data)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Shell shell;</div><div class='del'>-	EvolutionConfigControl *control;</div><div class='del'>-</div><div class='del'>-	shell = (GNOME_Evolution_Shell) data;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (component_id, LDAP_CONFIG_CONTROL_ID)) {</div><div class='del'>-		control = ldap_config_control_new (shell);</div><div class='del'>-	} else if (!strcmp (component_id, ADDRESSBOOK_CONFIG_CONTROL_ID)) {</div><div class='del'>-		control = addressbook_config_control_new (shell);</div><div class='del'>-	} else {</div><div class='del'>-		control = NULL;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-addressbook_config_register_factory (GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (shell != CORBA_OBJECT_NIL, FALSE);</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new_multi (CONFIG_CONTROL_FACTORY_ID,</div><div class='del'>-						    config_control_factory_fn,</div><div class='del'>-						    shell);</div><div class='del'>-</div><div class='del'>-	if (factory != NULL) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Cannot register factory %s", CONFIG_CONTROL_FACTORY_ID);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_config_create_new_source (const char *new_source, GtkWidget *parent)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-#if 0</div><div class='del'>-	AddressbookSourceDialog *dialog;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, NULL);</div><div class='del'>-</div><div class='del'>-	dialog = addressbook_source_dialog (gui, NULL, parent);</div><div class='del'>-</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog-&gt;name), new_source);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close_hides (GNOME_DIALOG(dialog-&gt;dialog), TRUE);</div><div class='del'>-</div><div class='del'>-	dialog-&gt;id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog-&gt;dialog));</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dialog-&gt;gui));</div><div class='del'>-</div><div class='del'>-	if (dialog-&gt;id == 0) {</div><div class='del'>-		/* Ok was clicked */</div><div class='del'>-		addressbook_storage_add_source (addressbook_source_copy(dialog-&gt;source));</div><div class='del'>-		addressbook_storage_write_sources();</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-#endif /* HAVE_LDAP */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef STANDALONE</div><div class='del'>-int</div><div class='del'>-main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	AddressbookDialog *dialog;</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",</div><div class='del'>-				    argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-</div><div class='del'>-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-</div><div class='del'>-	dialog = ldap_dialog_new (NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (glade_xml_get_widget (dialog-&gt;gui, "addressbook-sources-window"));</div><div class='del'>-</div><div class='del'>-	gtk_main();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h<br/>deleted file mode 100644<br/>index 668c55bbd3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-config.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* addressbook-storage.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- * Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-#ifndef __ADDRESSBOOK_CONFIG_H__</div><div class='del'>-#define __ADDRESSBOOK_CONFIG_H__</div><div class='del'>-</div><div class='del'>-#include "addressbook-storage.h"</div><div class='del'>-</div><div class='del'>-void  addressbook_config_create_new_source  (const char            *new_source,</div><div class='del'>-					     GtkWidget             *parent);</div><div class='del'>-</div><div class='del'>-gboolean  addressbook_config_register_factory  (GNOME_Evolution_Shell shell);</div><div class='del'>-</div><div class='del'>-#endif /* __ADDRESSBOOK_CONFIG_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c<br/>deleted file mode 100644<br/>index 6f675894e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-/**</div><div class='del'>- * sample-control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * </div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@nat.org)</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-init.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-cursors.h&gt;</div><div class='del'>-#include &lt;e-util/e-passwords.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-#include &lt;gconf/gconf.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "addressbook-component.h"</div><div class='del'>-#include "e-address-widget.h"</div><div class='del'>-#include "e-address-popup.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-minicard-control.h"</div><div class='del'>-#include "select-names/e-select-names-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_corba (int *argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",</div><div class='del'>-				    *argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-</div><div class='del'>-	oaf_init (*argc, argv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-	gconf_init (argc, argv, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-	free (malloc (5));</div><div class='del'>-	</div><div class='del'>-	init_corba (&amp;argc, argv);</div><div class='del'>-</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (!gnome_vfs_init ())</div><div class='del'>-		g_error (_("Could not initialize gnome-vfs"));</div><div class='del'>-</div><div class='del'>-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should</div><div class='del'>-           be `addressbook-control-factory.c' and the functions should be called</div><div class='del'>-           `addressbook_control_factory_something()'.  And `addressbook-component.c'</div><div class='del'>-           should be `addressbook-component-factory.c'.  */</div><div class='del'>-</div><div class='del'>-	addressbook_factory_init ();</div><div class='del'>-	addressbook_component_factory_init ();</div><div class='del'>-</div><div class='del'>-	e_select_names_factory_init ();</div><div class='del'>-	</div><div class='del'>-	e_minicard_control_factory_init ();</div><div class='del'>-</div><div class='del'>-	e_address_widget_factory_init ();</div><div class='del'>-	e_address_popup_factory_init ();</div><div class='del'>-</div><div class='del'>-	e_cursors_init();</div><div class='del'>-</div><div class='del'>-	e_passwords_init("Addressbook");</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/*g_thread_init (NULL);*/</div><div class='del'>-	camel_type_init ();</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-</div><div class='del'>-	g_print ("Evolution Addressbook up and running\n");</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c<br/>deleted file mode 100644<br/>index d3430dd476..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-storage.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-storage.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,705 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-ldap-storage.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Chris Toshok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The addressbook-sources.xml file goes like this:</div><div class='del'>-</div><div class='del'>-   &lt;?xml version="1.0"?&gt;</div><div class='del'>-   &lt;addressbooks&gt;</div><div class='del'>-     &lt;contactserver&gt;</div><div class='del'>-           &lt;name&gt;LDAP Server&lt;/name&gt;</div><div class='del'>-	   &lt;host&gt;ldap.server.com&lt;/host&gt;</div><div class='del'>-	   &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-	   &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-	   &lt;authmethod&gt;simple&lt;/authmethod&gt;</div><div class='del'>-	   &lt;emailaddr&gt;toshok@blubag.com&lt;/emailaddr&gt;</div><div class='del'>-	   &lt;limit&gt;100&lt;/limit&gt;</div><div class='del'>-	   &lt;rememberpass/&gt;</div><div class='del'>-     &lt;/contactserver&gt;</div><div class='del'>-   &lt;/addressbooks&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "addressbook-storage.h"</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/util/e-xml-utils.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook-config.h"</div><div class='del'>-</div><div class='del'>-#define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static gboolean load_source_data (const char *file_path);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static gboolean save_source_data (const char *file_path);</div><div class='del'>-static void deregister_storage (void);</div><div class='del'>-</div><div class='del'>-static GList *sources;</div><div class='del'>-static EvolutionStorage *storage;</div><div class='del'>-static char *storage_path;</div><div class='del'>-static GNOME_Evolution_Shell corba_shell;</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_setup (EvolutionShellComponent *shell_component,</div><div class='del'>-			   const char *evolution_homedir)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellClient *shell_client;</div><div class='del'>-</div><div class='del'>-	shell_client = evolution_shell_component_get_owner (shell_component);</div><div class='del'>-	if (shell_client == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("We have no shell!?");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-</div><div class='del'>-	sources = NULL;</div><div class='del'>-</div><div class='del'>-	if (storage_path)</div><div class='del'>-		g_free (storage_path);</div><div class='del'>-	storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML);</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	if (!load_source_data (storage_path))</div><div class='del'>-		deregister_storage ();</div><div class='del'>-#endif </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static void</div><div class='del'>-notify_listener (const Bonobo_Listener listener, </div><div class='del'>-		 GNOME_Evolution_Storage_Result corba_result)</div><div class='del'>-{</div><div class='del'>-	CORBA_any any;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	any._type = TC_GNOME_Evolution_Storage_Result;</div><div class='del'>-	any._value = &amp;corba_result;</div><div class='del'>-</div><div class='del'>-	Bonobo_Listener_event (listener, "result", &amp;any, &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,</div><div class='del'>-		    const CORBA_char *path, const CORBA_char *physical_uri,</div><div class='del'>-		    gpointer data)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	addressbook_storage_remove_source (path + 1);</div><div class='del'>-	addressbook_storage_write_sources();</div><div class='del'>-</div><div class='del'>-	notify_listener (listener, GNOME_Evolution_Storage_OK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,</div><div class='del'>-		    const CORBA_char *path, const CORBA_char *type,</div><div class='del'>-		    const CORBA_char *description, const CORBA_char *parent_physical_uri,</div><div class='del'>-		    gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (strcmp (type, "ldap-contacts")) {</div><div class='del'>-		notify_listener (listener, GNOME_Evolution_Storage_UNSUPPORTED_TYPE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp (parent_physical_uri, "")) {/* ldap servers can't have subfolders */</div><div class='del'>-		notify_listener (listener, GNOME_Evolution_Storage_INVALID_URI);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	addressbook_config_create_new_source (path + 1, NULL);</div><div class='del'>-</div><div class='del'>-	notify_listener (listener, GNOME_Evolution_Storage_OK);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EvolutionStorage *</div><div class='del'>-addressbook_get_other_contact_storage (void) </div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	EvolutionStorageResult result;</div><div class='del'>-</div><div class='del'>-	if (storage == NULL) {</div><div class='del'>-		storage = evolution_storage_new (U_("Other Contacts"), FALSE);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (storage),</div><div class='del'>-				    "remove_folder",</div><div class='del'>-				    GTK_SIGNAL_FUNC(remove_ldap_folder), NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (storage),</div><div class='del'>-				    "create_folder",</div><div class='del'>-				    GTK_SIGNAL_FUNC(create_ldap_folder), NULL);</div><div class='del'>-		result = evolution_storage_register_on_shell (storage, corba_shell);</div><div class='del'>-		switch (result) {</div><div class='del'>-		case EVOLUTION_STORAGE_OK:</div><div class='del'>-			break;</div><div class='del'>-		case EVOLUTION_STORAGE_ERROR_GENERIC : </div><div class='del'>-			g_warning("register_storage: generic error");</div><div class='del'>-			break;</div><div class='del'>-		case EVOLUTION_STORAGE_ERROR_CORBA : </div><div class='del'>-			g_warning("register_storage: corba error");</div><div class='del'>-			break;</div><div class='del'>-		case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED :</div><div class='del'>-			g_warning("register_storage: already registered error");</div><div class='del'>-			break;</div><div class='del'>-		case EVOLUTION_STORAGE_ERROR_EXISTS :</div><div class='del'>-			g_warning("register_storage: already exists error");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_warning("register_storage: other error");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return storage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-deregister_storage (void)</div><div class='del'>-{</div><div class='del'>-	if (evolution_storage_deregister_on_shell (storage, corba_shell) != </div><div class='del'>-	    EVOLUTION_STORAGE_OK) {</div><div class='del'>-		g_warning("couldn't deregister storage");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	storage = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static char *</div><div class='del'>-get_string_value (xmlNode *node,</div><div class='del'>-		  const char *name)</div><div class='del'>-{</div><div class='del'>-	xmlNode *p;</div><div class='del'>-	xmlChar *xml_string;</div><div class='del'>-	char *retval;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (node, (xmlChar *) name);</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");</div><div class='del'>-	if (p == NULL) /* there's no text between the tags, return the empty string */</div><div class='del'>-		return g_strdup("");</div><div class='del'>-</div><div class='del'>-	xml_string = xmlNodeListGetString (node-&gt;doc, p, 1);</div><div class='del'>-	retval = g_strdup ((char *) xml_string);</div><div class='del'>-	xmlFree (xml_string);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_integer_value (xmlNode *node,</div><div class='del'>-		   const char *name,</div><div class='del'>-		   int defval)</div><div class='del'>-{</div><div class='del'>-	xmlNode *p;</div><div class='del'>-	xmlChar *xml_string;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (node, (xmlChar *) name);</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return defval;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");</div><div class='del'>-	if (p == NULL) /* there's no text between the tags, return the default */</div><div class='del'>-		return defval;</div><div class='del'>-</div><div class='del'>-	xml_string = xmlNodeListGetString (node-&gt;doc, p, 1);</div><div class='del'>-	retval = atoi (xml_string);</div><div class='del'>-	xmlFree (xml_string);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)</div><div class='del'>-{</div><div class='del'>-	switch (auth_type) {</div><div class='del'>-	case ADDRESSBOOK_LDAP_AUTH_NONE:</div><div class='del'>-		return "none";</div><div class='del'>-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL:</div><div class='del'>-		return "ldap/simple-email";</div><div class='del'>-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:</div><div class='del'>-		return "ldap/simple-binddn";</div><div class='del'>-	default:</div><div class='del'>-		g_assert(0);</div><div class='del'>-		return "none";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static AddressbookLDAPAuthType</div><div class='del'>-ldap_parse_auth (const char *auth)</div><div class='del'>-{</div><div class='del'>-	if (!auth)</div><div class='del'>-		return ADDRESSBOOK_LDAP_AUTH_NONE;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (auth, "ldap/simple-email") || !strcmp (auth, "simple"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL;</div><div class='del'>-	else if (!strcmp (auth, "ldap/simple-binddn"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN;</div><div class='del'>-	else</div><div class='del'>-		return ADDRESSBOOK_LDAP_AUTH_NONE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-ldap_unparse_scope (AddressbookLDAPScopeType scope_type)</div><div class='del'>-{</div><div class='del'>-	switch (scope_type) {</div><div class='del'>-	case ADDRESSBOOK_LDAP_SCOPE_BASE:</div><div class='del'>-		return "base";</div><div class='del'>-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:</div><div class='del'>-		return "one";</div><div class='del'>-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:</div><div class='del'>-		return "sub";</div><div class='del'>-	default:</div><div class='del'>-		g_assert(0);</div><div class='del'>-		return "";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static AddressbookLDAPScopeType</div><div class='del'>-ldap_parse_scope (const char *scope)</div><div class='del'>-{</div><div class='del'>-	if (!scope)</div><div class='del'>-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE; /* XXX good default? */</div><div class='del'>-</div><div class='del'>-	if (!strcmp (scope, "base"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_SCOPE_BASE;</div><div class='del'>-	else if (!strcmp (scope, "one"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;</div><div class='del'>-	else</div><div class='del'>-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)</div><div class='del'>-{</div><div class='del'>-	switch (ssl_type) {</div><div class='del'>-	case ADDRESSBOOK_LDAP_SSL_NEVER:</div><div class='del'>-		return "never";</div><div class='del'>-	case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE:</div><div class='del'>-		return "whenever_possible";</div><div class='del'>-	case ADDRESSBOOK_LDAP_SSL_ALWAYS:</div><div class='del'>-		return "always";</div><div class='del'>-	default:</div><div class='del'>-		g_assert(0);</div><div class='del'>-		return "";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static AddressbookLDAPSSLType</div><div class='del'>-ldap_parse_ssl (const char *ssl)</div><div class='del'>-{</div><div class='del'>-	if (!ssl)</div><div class='del'>-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; /* XXX good default? */</div><div class='del'>-</div><div class='del'>-	if (!strcmp (ssl, "always"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_SSL_ALWAYS;</div><div class='del'>-	else if (!strcmp (ssl, "never"))</div><div class='del'>-		return ADDRESSBOOK_LDAP_SSL_NEVER;</div><div class='del'>-	else</div><div class='del'>-		return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-const char*</div><div class='del'>-addressbook_storage_auth_type_to_string (AddressbookLDAPAuthType auth_type)</div><div class='del'>-{</div><div class='del'>-	return ldap_unparse_auth (auth_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_init_source_uri (AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	GString *str;</div><div class='del'>-</div><div class='del'>-	if (source-&gt;uri)</div><div class='del'>-		g_free (source-&gt;uri);</div><div class='del'>-</div><div class='del'>-	str = g_string_new ("ldap://");</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa (str, "%s:%s/%s?"/*trigraph prevention*/"?%s",</div><div class='del'>-			   source-&gt;host, source-&gt;port, source-&gt;rootdn, ldap_unparse_scope (source-&gt;scope));</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa (str, ";limit=%d", source-&gt;limit);</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa (str, ";ssl=%s", ldap_unparse_ssl (source-&gt;ssl));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_string_sprintfa (str, ";timeout=%d", source-&gt;timeout);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	source-&gt;uri = str-&gt;str;</div><div class='del'>-</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-static gboolean</div><div class='del'>-load_source_data (const char *file_path)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *root;</div><div class='del'>-	xmlNode *child;</div><div class='del'>-</div><div class='del'>-	addressbook_get_other_contact_storage();</div><div class='del'>-</div><div class='del'>- tryagain:</div><div class='del'>-	doc = xmlParseFile (file_path);</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		/* Check to see if a addressbook-sources.xml.new file</div><div class='del'>-                   exists.  If it does, rename it and try loading it */</div><div class='del'>-		char *new_path = g_strdup_printf ("%s.new", file_path);</div><div class='del'>-		struct stat sb;</div><div class='del'>-</div><div class='del'>-		if (stat (new_path, &amp;sb) == 0) {</div><div class='del'>-			int rv;</div><div class='del'>-</div><div class='del'>-			rv = rename (new_path, file_path);</div><div class='del'>-			g_free (new_path);</div><div class='del'>-</div><div class='del'>-			if (rv &lt; 0) {</div><div class='del'>-				g_error ("Failed to rename %s: %s\n",</div><div class='del'>-					 file_path,</div><div class='del'>-					 strerror(errno));</div><div class='del'>-				return FALSE;</div><div class='del'>-			} else</div><div class='del'>-				goto tryagain;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (new_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	root = xmlDocGetRootElement (doc);</div><div class='del'>-	if (root == NULL || strcmp (root-&gt;name, "addressbooks") != 0) {</div><div class='del'>-		xmlFreeDoc (doc);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (child = root-&gt;childs; child; child = child-&gt;next) {</div><div class='del'>-		char *path;</div><div class='del'>-		AddressbookSource *source;</div><div class='del'>-</div><div class='del'>-		source = g_new0 (AddressbookSource, 1);</div><div class='del'>-</div><div class='del'>-		if (!strcmp (child-&gt;name, "contactserver")) {</div><div class='del'>-			source-&gt;port   = get_string_value (child, "port");</div><div class='del'>-			source-&gt;host   = get_string_value (child, "host");</div><div class='del'>-			source-&gt;rootdn = get_string_value (child, "rootdn");</div><div class='del'>-			source-&gt;scope  = ldap_parse_scope (get_string_value (child, "scope"));</div><div class='del'>-			source-&gt;auth   = ldap_parse_auth (get_string_value (child, "authmethod"));</div><div class='del'>-			source-&gt;ssl    = ldap_parse_ssl (get_string_value (child, "ssl"));</div><div class='del'>-			source-&gt;email_addr = get_string_value (child, "emailaddr");</div><div class='del'>-			source-&gt;binddn = get_string_value (child, "binddn");</div><div class='del'>-			source-&gt;limit  = get_integer_value (child, "limit", 100);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			g_warning ("unknown node '%s' in %s", child-&gt;name, file_path);</div><div class='del'>-			g_free (source);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addressbook_storage_init_source_uri (source);</div><div class='del'>-</div><div class='del'>-		source-&gt;name = get_string_value (child, "name");</div><div class='del'>-		source-&gt;description = get_string_value (child, "description");</div><div class='del'>-</div><div class='del'>-		path = g_strdup_printf ("/%s", source-&gt;name);</div><div class='del'>-		evolution_storage_new_folder (storage, path, source-&gt;name,</div><div class='del'>-					      "ldap-contacts", source-&gt;uri,</div><div class='del'>-					      source-&gt;description, 0);</div><div class='del'>-</div><div class='del'>-		sources = g_list_append (sources, source);</div><div class='del'>-</div><div class='del'>-		g_free (path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (g_list_length (sources) == 0)</div><div class='del'>-		deregister_storage();</div><div class='del'>-</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_source_foreach(AddressbookSource *source, xmlNode *root)</div><div class='del'>-{</div><div class='del'>-	xmlNode *source_root = xmlNewNode (NULL,</div><div class='del'>-					   (xmlChar *) "contactserver");</div><div class='del'>-</div><div class='del'>-	xmlAddChild (root, source_root);</div><div class='del'>-</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "name",</div><div class='del'>-		     (xmlChar *) source-&gt;name);</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "description",</div><div class='del'>-		     (xmlChar *) source-&gt;description);</div><div class='del'>-</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "port",</div><div class='del'>-		     (xmlChar *) source-&gt;port);</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "host",</div><div class='del'>-		     (xmlChar *) source-&gt;host);</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "rootdn",</div><div class='del'>-		     (xmlChar *) source-&gt;rootdn);</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "scope",</div><div class='del'>-		     (xmlChar *) ldap_unparse_scope(source-&gt;scope));</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "authmethod",</div><div class='del'>-		     (xmlChar *) ldap_unparse_auth(source-&gt;auth));</div><div class='del'>-	xmlNewChild (source_root, NULL, (xmlChar *) "ssl",</div><div class='del'>-		     (xmlChar *) ldap_unparse_ssl(source-&gt;ssl));</div><div class='del'>-</div><div class='del'>-	if (source-&gt;limit != 100) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = g_strdup_printf ("%d", source-&gt;limit);</div><div class='del'>-		xmlNewChild (source_root, NULL, (xmlChar *) "limit",</div><div class='del'>-			     (xmlChar *) string);</div><div class='del'>-		g_free (string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (source-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE) {</div><div class='del'>-		if (source-&gt;auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)</div><div class='del'>-			xmlNewChild (source_root, NULL, (xmlChar *) "binddn",</div><div class='del'>-				     (xmlChar *) source-&gt;binddn);</div><div class='del'>-		else</div><div class='del'>-			xmlNewChild (source_root, NULL, (xmlChar *) "emailaddr",</div><div class='del'>-				     (xmlChar *) source-&gt;email_addr);</div><div class='del'>-</div><div class='del'>-		if (source-&gt;remember_passwd)</div><div class='del'>-			xmlNewChild (source_root, NULL, (xmlChar *) "rememberpass",</div><div class='del'>-				     NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-save_source_data (const char *file_path)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *root;</div><div class='del'>-	int fd, rv;</div><div class='del'>-	xmlChar *buf;</div><div class='del'>-	int buf_size;</div><div class='del'>-	char *new_path = g_strdup_printf ("%s.new", file_path);</div><div class='del'>-</div><div class='del'>-	doc = xmlNewDoc ((xmlChar *) "1.0");</div><div class='del'>-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "addressbooks", NULL);</div><div class='del'>-	xmlDocSetRootElement (doc, root);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (sources, (GFunc)ldap_source_foreach, root);</div><div class='del'>-</div><div class='del'>-	fd = open (new_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);</div><div class='del'>-	fchmod (fd, 0600);</div><div class='del'>-</div><div class='del'>-	xmlDocDumpMemory (doc, &amp;buf, &amp;buf_size);</div><div class='del'>-</div><div class='del'>-	if (buf == NULL) {</div><div class='del'>-		g_error ("Failed to write %s: xmlBufferCreate() == NULL", file_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = write (fd, buf, buf_size);</div><div class='del'>-	xmlFree (buf);</div><div class='del'>-	close (fd);</div><div class='del'>-</div><div class='del'>-	if (0 &gt; rv) {</div><div class='del'>-		g_error ("Failed to write new %s: %s\n", file_path, strerror(errno));</div><div class='del'>-		unlink (new_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (0 &gt; rename (new_path, file_path)) {</div><div class='del'>-			g_error ("Failed to rename %s: %s\n", file_path, strerror(errno));</div><div class='del'>-			unlink (new_path);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_add_source (AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	sources = g_list_append (sources, source);</div><div class='del'>-</div><div class='del'>-	/* And then to the ui */</div><div class='del'>-	addressbook_get_other_contact_storage();</div><div class='del'>-	path = g_strdup_printf ("/%s", source-&gt;name);</div><div class='del'>-	evolution_storage_new_folder (storage, path, source-&gt;name, "ldap-contacts",</div><div class='del'>-				      source-&gt;uri, source-&gt;description, 0);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_remove_source (const char *name)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	AddressbookSource *source = NULL;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	/* remove it from our hashtable */</div><div class='del'>-	for (l = sources; l; l = l-&gt;next) {</div><div class='del'>-		AddressbookSource *s = l-&gt;data;</div><div class='del'>-		if (!strcmp (s-&gt;name, name)) {</div><div class='del'>-			source = s;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!source)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sources = g_list_remove_link (sources, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	addressbook_source_free (source);</div><div class='del'>-</div><div class='del'>-	/* and then from the ui */</div><div class='del'>-	path = g_strdup_printf ("/%s", name);</div><div class='del'>-	evolution_storage_removed_folder (storage, path);</div><div class='del'>-</div><div class='del'>-	if (g_list_length (sources) == 0) </div><div class='del'>-		deregister_storage ();</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-addressbook_storage_get_sources ()</div><div class='del'>-{</div><div class='del'>-	return sources;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-AddressbookSource *</div><div class='del'>-addressbook_storage_get_source_by_uri (const char *uri)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = sources; l ; l = l-&gt;next) {</div><div class='del'>-		AddressbookSource *source = l-&gt;data;</div><div class='del'>-		if (!strcmp (uri, source-&gt;uri))</div><div class='del'>-			return source;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_source_free (AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	g_free (source-&gt;name);</div><div class='del'>-	g_free (source-&gt;description);</div><div class='del'>-	g_free (source-&gt;uri);</div><div class='del'>-	g_free (source-&gt;host);</div><div class='del'>-	g_free (source-&gt;port);</div><div class='del'>-	g_free (source-&gt;rootdn);</div><div class='del'>-	g_free (source-&gt;email_addr);</div><div class='del'>-	g_free (source-&gt;binddn);</div><div class='del'>-</div><div class='del'>-	g_free (source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_source_foreach (AddressbookSource *source, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *path = g_strdup_printf ("/%s", source-&gt;name);</div><div class='del'>-</div><div class='del'>-	evolution_storage_removed_folder (storage, path);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	addressbook_source_free (source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_clear_sources (void)</div><div class='del'>-{</div><div class='del'>-	g_list_foreach (sources, (GFunc)addressbook_source_foreach, NULL);</div><div class='del'>-	g_list_free (sources);</div><div class='del'>-	deregister_storage ();</div><div class='del'>-	sources = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_storage_write_sources (void)</div><div class='del'>-{</div><div class='del'>-	save_source_data (storage_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-AddressbookSource *</div><div class='del'>-addressbook_source_copy (const AddressbookSource *source)</div><div class='del'>-{</div><div class='del'>-	AddressbookSource *copy;</div><div class='del'>-</div><div class='del'>-	copy = g_new0 (AddressbookSource, 1);</div><div class='del'>-	copy-&gt;name = g_strdup (source-&gt;name);</div><div class='del'>-	copy-&gt;description = g_strdup (source-&gt;description);</div><div class='del'>-	copy-&gt;uri = g_strdup (source-&gt;uri);</div><div class='del'>-</div><div class='del'>-	copy-&gt;host = g_strdup (source-&gt;host);</div><div class='del'>-	copy-&gt;port = g_strdup (source-&gt;port);</div><div class='del'>-	copy-&gt;rootdn = g_strdup (source-&gt;rootdn);</div><div class='del'>-	copy-&gt;scope = source-&gt;scope;</div><div class='del'>-	copy-&gt;auth = source-&gt;auth;</div><div class='del'>-	copy-&gt;ssl = source-&gt;ssl;</div><div class='del'>-	copy-&gt;email_addr = g_strdup (source-&gt;email_addr);</div><div class='del'>-	copy-&gt;binddn = g_strdup (source-&gt;binddn);</div><div class='del'>-	copy-&gt;remember_passwd = source-&gt;remember_passwd;</div><div class='del'>-	copy-&gt;limit = source-&gt;limit;</div><div class='del'>-</div><div class='del'>-	return copy;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h<br/>deleted file mode 100644<br/>index 541d8096f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-storage.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook-storage.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* addressbook-storage.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Chris Toshok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ADDRESSBOOK_STORAGE_H__</div><div class='del'>-#define __ADDRESSBOOK_STORAGE_H__</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "evolution-storage.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ADDRESSBOOK_LDAP_AUTH_NONE,</div><div class='del'>-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,</div><div class='del'>-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,</div><div class='del'>-} AddressbookLDAPAuthType;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,</div><div class='del'>-	ADDRESSBOOK_LDAP_SCOPE_BASE,</div><div class='del'>-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,</div><div class='del'>-	ADDRESSBOOK_LDAP_SCOPE_LAST</div><div class='del'>-} AddressbookLDAPScopeType;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ADDRESSBOOK_LDAP_SSL_ALWAYS,</div><div class='del'>-	ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE,</div><div class='del'>-	ADDRESSBOOK_LDAP_SSL_NEVER</div><div class='del'>-} AddressbookLDAPSSLType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	char *description;</div><div class='del'>-	char *host;</div><div class='del'>-	char *port;</div><div class='del'>-	char *rootdn;</div><div class='del'>-	AddressbookLDAPScopeType scope;</div><div class='del'>-	AddressbookLDAPAuthType auth;</div><div class='del'>-	AddressbookLDAPSSLType ssl;</div><div class='del'>-	char *email_addr;                   /* used in AUTH_SIMPLE_EMAIL */</div><div class='del'>-	char *binddn;                       /* used in AUTH_SIMPLE_BINDDN */</div><div class='del'>-	gboolean remember_passwd;</div><div class='del'>-	int limit;</div><div class='del'>-</div><div class='del'>-	char *uri; /* filled in from the above */</div><div class='del'>-} AddressbookSource;</div><div class='del'>-</div><div class='del'>-void addressbook_storage_setup (EvolutionShellComponent *shell_component,</div><div class='del'>-				const char *evolution_homedir);</div><div class='del'>-</div><div class='del'>-EvolutionStorage  *addressbook_get_other_contact_storage (void);</div><div class='del'>-GList             *addressbook_storage_get_sources (void);</div><div class='del'>-AddressbookSource *addressbook_storage_get_source_by_uri (const char *uri);</div><div class='del'>-void               addressbook_storage_clear_sources (void);</div><div class='del'>-void               addressbook_storage_write_sources (void);</div><div class='del'>-AddressbookSource *addressbook_source_copy (const AddressbookSource *source);</div><div class='del'>-void               addressbook_source_free (AddressbookSource *source);</div><div class='del'>-void               addressbook_storage_init_source_uri (AddressbookSource *source);</div><div class='del'>-</div><div class='del'>-void               addressbook_storage_add_source (AddressbookSource *source);</div><div class='del'>-void               addressbook_storage_remove_source (const char *name);</div><div class='del'>-const char*        addressbook_storage_auth_type_to_string (AddressbookLDAPAuthType auth_type);</div><div class='del'>-</div><div class='del'>-#endif /* __ADDRESSBOOK_STORAGE_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c<br/>deleted file mode 100644<br/>index 332ddf3b56..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1138 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * addressbook.c: </div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Chris Lahey (clahey@ximian.com)</div><div class='del'>- *</div><div class='del'>- * (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-categories-master-list-wombat.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-#include "e-util/e-passwords.h"</div><div class='del'>-#include "select-names/e-select-names.h"</div><div class='del'>-#include "select-names/e-select-names-manager.h"</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component-utils.h"</div><div class='del'>-#include "evolution-activity-client.h"</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "addressbook-config.h"</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "addressbook-component.h"</div><div class='del'>-#include "addressbook/gui/search/e-addressbook-search-dialog.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-view.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-util.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-search-bar.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-filter-bar.h&gt;</div><div class='del'>-</div><div class='del'>-/* This is used for the addressbook status bar */</div><div class='del'>-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "evolution-contacts-mini.png"</div><div class='del'>-static GdkPixbuf *progress_icon[2] = { NULL, NULL };</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define PROPERTY_FOLDER_URI          "folder_uri"</div><div class='del'>-</div><div class='del'>-#define PROPERTY_FOLDER_URI_IDX      1</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gint refs;</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	ESearchBar *search;</div><div class='del'>-	gint        ecml_changed_id;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	EvolutionActivityClient *activity;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	BonoboPropertyBag *properties;</div><div class='del'>-	char *uri;</div><div class='del'>-	char *passwd;</div><div class='del'>-	gboolean ignore_search_changes;</div><div class='del'>-} AddressbookView;</div><div class='del'>-</div><div class='del'>-static void addressbook_view_ref (AddressbookView *);</div><div class='del'>-static void addressbook_view_unref (AddressbookView *);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view-&gt;view));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_contact_list_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view-&gt;view));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_save_as(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_view(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		gtk_widget_show(e_addressbook_search_dialog_new(view-&gt;view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_delete_selection(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_print(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_print_preview(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_stop(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_cut(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_copy(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_paste(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_select_all (view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_send (view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_send_to (view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_copy_to_folder (view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-move_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	if (view-&gt;view)</div><div class='del'>-		e_addressbook_view_move_to_folder (view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	e_passwords_forget_passwords();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_command_state (EAddressbookView *eav, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	addressbook_view_ref (view);</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (view-&gt;control);</div><div class='del'>-</div><div class='del'>-	if (bonobo_ui_component_get_container (uic) != CORBA_OBJECT_NIL) {</div><div class='del'>-</div><div class='del'>-		/* New Contact */</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactNew",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_create (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactNewList",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_create (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsSaveAsVCard",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_save_as (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsView",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_view (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		/* Print Contact */</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsPrint",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_print (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		/* Print Contact */</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsPrintPreview",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_print (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		/* Delete Contact */</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactDelete",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_delete (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsCut",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_cut (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsCopy",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_copy (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsPaste",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_paste (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsSelectAll",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_select_all (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsSendContactToOther",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_send (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsSendMessageToContact",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_send_to (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsMoveToFolder",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_move_to_folder (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactsCopyToFolder",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_copy_to_folder (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-		/* Stop */</div><div class='del'>-		bonobo_ui_component_set_prop (uic,</div><div class='del'>-					      "/commands/ContactStop",</div><div class='del'>-					      "sensitive",</div><div class='del'>-					      e_addressbook_view_can_stop (view-&gt;view) ? "1" : "0", NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addressbook_view_unref (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_view_type (AddressbookView *view, EAddressbookViewType view_type)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set (GTK_OBJECT (view-&gt;view), "type", view_type, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsPrintPreview", print_preview_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsSaveAsVCard", save_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsView", view_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactNewList", new_contact_list_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsCut", cut_contacts_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsCopy", copy_contacts_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsPaste", paste_contacts_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsSelectAll", select_all_contacts_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsSendContactToOther", send_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsSendMessageToContact", send_contact_to_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsMoveToFolder", move_contact_to_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsCopyToFolder", copy_contact_to_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsForgetPasswords", forget_passwords_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps [] = {</div><div class='del'>-	E_PIXMAP ("/menu/File/New/NewFirstItem/ContactNew", "evolution-contacts-mini.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "save-as-16.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "16_cut.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "16_copy.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "16_paste.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "evolution-trash-mini.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/ToolSearch", "search-16.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactsPrint", "buttons/print.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactDelete", "buttons/delete-message.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate (BonoboControl     *control,</div><div class='del'>-		  BonoboUIComponent *uic,</div><div class='del'>-		  AddressbookView   *view)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer remote_ui_container;</div><div class='del'>-</div><div class='del'>-	remote_ui_container = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (uic, remote_ui_container);</div><div class='del'>-	bonobo_object_release_unref (remote_ui_container, NULL);</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_ui_component (view-&gt;search, uic);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		uic, verbs, view);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_freeze (uic, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-addressbook.xml",</div><div class='del'>-			       "evolution-addressbook");</div><div class='del'>-</div><div class='del'>-	e_addressbook_view_setup_menus (view-&gt;view, uic);</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (uic, pixmaps);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (uic, NULL);</div><div class='del'>-</div><div class='del'>-	update_command_state (view-&gt;view, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate_cb (BonoboControl *control, </div><div class='del'>-		     gboolean activate, </div><div class='del'>-		     AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-	</div><div class='del'>-	if (activate) {</div><div class='del'>-</div><div class='del'>-		control_activate (control, uic, view);</div><div class='del'>-		if (activate &amp;&amp; view-&gt;view &amp;&amp; view-&gt;view-&gt;model)</div><div class='del'>-			e_addressbook_model_force_folder_bar_message (view-&gt;view-&gt;model);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		bonobo_ui_component_unset_container (uic);</div><div class='del'>-		e_addressbook_view_discard_menus (view-&gt;view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_view_ref (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	g_assert (view-&gt;refs &gt; 0);</div><div class='del'>-	++view-&gt;refs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_view_unref (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	g_assert (view-&gt;refs &gt; 0);</div><div class='del'>-	--view-&gt;refs;</div><div class='del'>-	if (view-&gt;refs == 0) {</div><div class='del'>-		g_free (view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECategoriesMasterList *</div><div class='del'>-get_master_list (void)</div><div class='del'>-{</div><div class='del'>-	static ECategoriesMasterList *category_list = NULL;</div><div class='del'>-</div><div class='del'>-	if (category_list == NULL)</div><div class='del'>-		category_list = e_categories_master_list_wombat_new ();</div><div class='del'>-	return category_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_view_clear (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;uri &amp;&amp; view-&gt;view) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (view-&gt;properties) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT(view-&gt;properties));</div><div class='del'>-		view-&gt;properties = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (view-&gt;view));</div><div class='del'>-		view-&gt;view = NULL;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	g_free(view-&gt;passwd);</div><div class='del'>-	view-&gt;passwd = NULL;</div><div class='del'>-</div><div class='del'>-	g_free(view-&gt;uri);</div><div class='del'>-	view-&gt;uri = NULL;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;refs == 0)</div><div class='del'>-		g_free(view);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;ecml_changed_id != 0) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT(get_master_list()),</div><div class='del'>-				       view-&gt;ecml_changed_id);</div><div class='del'>-		view-&gt;ecml_changed_id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		gtk_object_set(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", book,</div><div class='del'>-			       NULL);</div><div class='del'>-	} else {</div><div class='del'>-		AddressbookSource *source;</div><div class='del'>-		GtkWidget *warning_dialog, *label;</div><div class='del'>-</div><div class='del'>-        	warning_dialog = gnome_dialog_new (</div><div class='del'>-        		_("Unable to open addressbook"),</div><div class='del'>-			GNOME_STOCK_BUTTON_CLOSE,</div><div class='del'>-        		NULL);</div><div class='del'>-</div><div class='del'>-		source = addressbook_storage_get_source_by_uri (view-&gt;uri);</div><div class='del'>-</div><div class='del'>-		if (source) {</div><div class='del'>-#if HAVE_LDAP</div><div class='del'>-			label = gtk_label_new (</div><div class='del'>-					       _("We were unable to open this addressbook.  This either\n"</div><div class='del'>-						 "means you have entered an incorrect URI, or the LDAP server\n"</div><div class='del'>-						 "is down"));</div><div class='del'>-#else</div><div class='del'>-			label = gtk_label_new (</div><div class='del'>-					       _("This version of Evolution does not have LDAP support\n"</div><div class='del'>-						 "compiled in to it.  If you want to use LDAP in Evolution\n"</div><div class='del'>-						 "you must compile the program from the CVS sources after\n"</div><div class='del'>-						 "retrieving OpenLDAP from the link below.\n"));</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			label = gtk_label_new (</div><div class='del'>-					       _("We were unable to open this addressbook.  Please check that the\n"</div><div class='del'>-						 "path exists and that you have permission to access it."));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_misc_set_alignment(GTK_MISC(label),</div><div class='del'>-				       0, .5);</div><div class='del'>-		gtk_label_set_justify(GTK_LABEL(label),</div><div class='del'>-				      GTK_JUSTIFY_LEFT);</div><div class='del'>-</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)-&gt;vbox), </div><div class='del'>-				    label, TRUE, TRUE, 0);</div><div class='del'>-		gtk_widget_show (label);</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_LDAP</div><div class='del'>-		if (source) {</div><div class='del'>-			GtkWidget *href;</div><div class='del'>-			href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");</div><div class='del'>-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)-&gt;vbox), </div><div class='del'>-					    href, FALSE, FALSE, 0);</div><div class='del'>-			gtk_widget_show (href);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG (warning_dialog));</div><div class='del'>-		</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (warning_dialog));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_callback(GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = data;</div><div class='del'>-	if (view-&gt;view &amp;&amp; view-&gt;view-&gt;model &amp;&amp; view-&gt;view-&gt;model-&gt;book_view)</div><div class='del'>-		e_book_view_stop (view-&gt;view-&gt;model-&gt;book_view);</div><div class='del'>-	addressbook_view_clear (view);</div><div class='del'>-	addressbook_view_unref (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_FOLDER_URI_IDX:</div><div class='del'>-		if (view &amp;&amp; view-&gt;uri)</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, view-&gt;uri);</div><div class='del'>-		else</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-} LoadUriData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	LoadUriData *data = closure;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		/* pop up a nice dialog, or redo the authentication</div><div class='del'>-                   bit some number of times. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	data-&gt;cb (book, status, data-&gt;closure);</div><div class='del'>-</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_uri_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	AddressbookSource *source;</div><div class='del'>-	LoadUriData *load_uri_data = closure;</div><div class='del'>-</div><div class='del'>-	source = addressbook_storage_get_source_by_uri (e_book_get_uri (book));</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		/* check if the addressbook needs authentication */</div><div class='del'>-</div><div class='del'>-		if (source &amp;&amp;</div><div class='del'>-		    source-&gt;auth != ADDRESSBOOK_LDAP_AUTH_NONE) {</div><div class='del'>-			const char *password;</div><div class='del'>-			char *pass_dup = NULL;</div><div class='del'>-</div><div class='del'>-			password = e_passwords_get_password (e_book_get_uri (book));</div><div class='del'>-</div><div class='del'>-			if (!password) {</div><div class='del'>-				char *prompt;</div><div class='del'>-				gboolean remember;</div><div class='del'>-</div><div class='del'>-				if (source-&gt;auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)</div><div class='del'>-					prompt = g_strdup_printf (_("Enter password for %s (user %s)"),</div><div class='del'>-								  source-&gt;name, source-&gt;binddn);</div><div class='del'>-				else</div><div class='del'>-					prompt = g_strdup_printf (_("Enter password for %s (user %s)"),</div><div class='del'>-								  source-&gt;name, source-&gt;email_addr);</div><div class='del'>-				remember = source-&gt;remember_passwd;</div><div class='del'>-				pass_dup = e_passwords_ask_password (</div><div class='del'>-								     prompt, e_book_get_uri (book), prompt, TRUE,</div><div class='del'>-								     E_PASSWORDS_REMEMBER_FOREVER, &amp;remember,</div><div class='del'>-								     NULL);</div><div class='del'>-				if (remember != source-&gt;remember_passwd) {</div><div class='del'>-					source-&gt;remember_passwd = remember;</div><div class='del'>-					addressbook_storage_write_sources ();</div><div class='del'>-				}</div><div class='del'>-				g_free (prompt);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (password || pass_dup) {</div><div class='del'>-				char *user;</div><div class='del'>-</div><div class='del'>-				if (source-&gt;auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN)</div><div class='del'>-					user = source-&gt;binddn;</div><div class='del'>-				else</div><div class='del'>-					user = source-&gt;email_addr;</div><div class='del'>-				if (!user)</div><div class='del'>-					user = "";</div><div class='del'>-				e_book_authenticate_user (book, user, password ? password : pass_dup,</div><div class='del'>-							  addressbook_storage_auth_type_to_string (source-&gt;auth),</div><div class='del'>-							  load_uri_auth_cb, closure);</div><div class='del'>-				g_free (pass_dup);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	load_uri_data-&gt;cb (book, status, load_uri_data-&gt;closure);</div><div class='del'>-	g_free (load_uri_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-addressbook_load_uri (EBook *book, const char *uri,</div><div class='del'>-		      EBookCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	LoadUriData *load_uri_data = g_new (LoadUriData, 1);</div><div class='del'>-	gboolean rv;</div><div class='del'>-</div><div class='del'>-	load_uri_data-&gt;cb = cb;</div><div class='del'>-	load_uri_data-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	rv = e_book_load_uri (book, uri, load_uri_cb, load_uri_data);</div><div class='del'>-</div><div class='del'>-	if (!rv)</div><div class='del'>-		g_free (load_uri_data);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-addressbook_load_default_book (EBook *book, EBookCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	LoadUriData *load_uri_data = g_new (LoadUriData, 1);</div><div class='del'>-	gboolean rv;</div><div class='del'>-</div><div class='del'>-	load_uri_data-&gt;cb = cb;</div><div class='del'>-	load_uri_data-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	rv = e_book_load_default_book (book, load_uri_cb, load_uri_data);</div><div class='del'>-</div><div class='del'>-	if (!rv)</div><div class='del'>-		g_free (load_uri_data);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  const BonoboArg   *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = user_data;</div><div class='del'>-</div><div class='del'>-	char *uri_data;</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_FOLDER_URI_IDX:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (view-&gt;uri) {</div><div class='del'>-			/* we've already had a uri set on this view, so unload it */</div><div class='del'>-			e_book_unload_uri (book);</div><div class='del'>-			g_free (view-&gt;uri);</div><div class='del'>-		} else {</div><div class='del'>-			book = e_book_new ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		view-&gt;uri = g_strdup(BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		</div><div class='del'>-		uri_data = e_book_expand_uri (view-&gt;uri);</div><div class='del'>-</div><div class='del'>-		if (! addressbook_load_uri (book, uri_data, book_open_cb, view))</div><div class='del'>-			printf ("error calling load_uri!\n");</div><div class='del'>-</div><div class='del'>-		g_free(uri_data);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ESB_FULL_NAME,</div><div class='del'>-	ESB_EMAIL,</div><div class='del'>-	ESB_CATEGORY,</div><div class='del'>-	ESB_ANY,</div><div class='del'>-	ESB_ADVANCED</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ESearchBarItem addressbook_search_option_items[] = {</div><div class='del'>-	{ N_("Name begins with"), ESB_FULL_NAME, NULL },</div><div class='del'>-	{ N_("Email is"), ESB_EMAIL, NULL },</div><div class='del'>-	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */</div><div class='del'>-	{ N_("Any field contains"), ESB_ANY, NULL },</div><div class='del'>-	{ N_("Advanced..."), ESB_ADVANCED, NULL },</div><div class='del'>-	{ NULL, -1, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-alphabet_state_changed (EAddressbookView *eav, gunichar letter, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;ignore_search_changes = TRUE;</div><div class='del'>-	if (letter == 0) {</div><div class='del'>-		e_search_bar_set_item_id (view-&gt;search, ESB_ANY);</div><div class='del'>-		e_search_bar_set_text (view-&gt;search, "");</div><div class='del'>-	} else {</div><div class='del'>-		e_search_bar_set_item_id (view-&gt;search, ESB_ADVANCED);</div><div class='del'>-	}</div><div class='del'>-	view-&gt;ignore_search_changes = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_search_activated (ESearchBar *esb, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterList *master_list;</div><div class='del'>-	char *search_word, *search_query;</div><div class='del'>-	const char *category_name;</div><div class='del'>-	int search_type, subid;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;ignore_search_changes) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(esb),</div><div class='del'>-		       "text", &amp;search_word,</div><div class='del'>-		       "item_id", &amp;search_type,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	if (search_type == ESB_ADVANCED) {</div><div class='del'>-		gtk_widget_show(e_addressbook_search_dialog_new(view-&gt;view));</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if ((search_word &amp;&amp; strlen (search_word)) || search_type == ESB_CATEGORY) {</div><div class='del'>-			GString *s = g_string_new ("");</div><div class='del'>-			e_sexp_encode_string (s, search_word);</div><div class='del'>-			switch (search_type) {</div><div class='del'>-			case ESB_ANY:</div><div class='del'>-				search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" %s)",</div><div class='del'>-								s-&gt;str);</div><div class='del'>-				break;</div><div class='del'>-			case ESB_FULL_NAME:</div><div class='del'>-				search_query = g_strdup_printf ("(beginswith \"full_name\" %s)",</div><div class='del'>-								s-&gt;str);</div><div class='del'>-				break;</div><div class='del'>-			case ESB_EMAIL:</div><div class='del'>-				search_query = g_strdup_printf ("(is \"email\" %s)",</div><div class='del'>-								s-&gt;str);</div><div class='del'>-				break;</div><div class='del'>-			case ESB_CATEGORY:</div><div class='del'>-				subid = e_search_bar_get_subitem_id (esb);</div><div class='del'>-</div><div class='del'>-				if (subid &lt; 0 || subid == G_MAXINT) {</div><div class='del'>-					/* match everything */</div><div class='del'>-					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-				} else {</div><div class='del'>-					master_list = get_master_list ();</div><div class='del'>-					category_name = e_categories_master_list_nth (master_list, subid);</div><div class='del'>-					search_query = g_strdup_printf ("(contains \"category\" \"%s\")", category_name);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			g_string_free (s, TRUE);</div><div class='del'>-		} else</div><div class='del'>-			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-</div><div class='del'>-		if (search_query)</div><div class='del'>-			gtk_object_set (GTK_OBJECT(view-&gt;view),</div><div class='del'>-					"query", search_query,</div><div class='del'>-					NULL);</div><div class='del'>-</div><div class='del'>-		g_free (search_query);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (search_word);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	int search_type;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(esb),</div><div class='del'>-		       "item_id", &amp;search_type,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	if (search_type == ESB_ADVANCED) {</div><div class='del'>-		gtk_widget_show(e_addressbook_search_dialog_new(view-&gt;view));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_ShellView</div><div class='del'>-retrieve_shell_view_interface_from_control (BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ControlFrame control_frame;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view_interface;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	shell_view_interface = gtk_object_get_data (GTK_OBJECT (control),</div><div class='del'>-						    "shell_view_interface");</div><div class='del'>-</div><div class='del'>-	if (shell_view_interface)</div><div class='del'>-		return shell_view_interface;</div><div class='del'>-</div><div class='del'>-	control_frame = bonobo_control_get_control_frame (control);</div><div class='del'>-</div><div class='del'>-	if (control_frame == NULL)</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,</div><div class='del'>-							       "IDL:GNOME/Evolution/ShellView:1.0",</div><div class='del'>-							       &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (shell_view_interface != CORBA_OBJECT_NIL)</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (control),</div><div class='del'>-				     "shell_view_interface",</div><div class='del'>-				     shell_view_interface);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Control frame doesn't have Evolution/ShellView.");</div><div class='del'>-</div><div class='del'>-	return shell_view_interface;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_status_message (EAddressbookView *eav, const char *message, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (!message || !*message) {</div><div class='del'>-		if (view-&gt;activity) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (view-&gt;activity));</div><div class='del'>-			view-&gt;activity = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (!view-&gt;activity) {</div><div class='del'>-		int display;</div><div class='del'>-		char *clientid = g_strdup_printf ("%p", view);</div><div class='del'>-</div><div class='del'>-		if (progress_icon[0] == NULL)</div><div class='del'>-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CONTACTS_PROGRESS_IMAGE);</div><div class='del'>-</div><div class='del'>-		view-&gt;activity = evolution_activity_client_new (addressbook_component_get_shell_client(), clientid,</div><div class='del'>-								progress_icon, message, TRUE, &amp;display);</div><div class='del'>-</div><div class='del'>-		g_free (clientid);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		evolution_activity_client_update (view-&gt;activity, message, -1.0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_folder_bar_label (EAddressbookView *eav, const char *message, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view_interface;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	shell_view_interface = retrieve_shell_view_interface_from_control (view-&gt;control);</div><div class='del'>-	if (!shell_view_interface) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(g_message("Updating via ShellView"));</div><div class='del'>-</div><div class='del'>-	if (message == NULL || message[0] == 0) {</div><div class='del'>-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,</div><div class='del'>-							     "",</div><div class='del'>-							     &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,</div><div class='del'>-							     message,</div><div class='del'>-							     &amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_warning ("Exception in label update: %s",</div><div class='del'>-			   bonobo_exception_get_text (&amp;ev));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Our global singleton config database */</div><div class='del'>-static Bonobo_ConfigDatabase config_db = NULL;</div><div class='del'>-</div><div class='del'>-Bonobo_ConfigDatabase</div><div class='del'>-addressbook_config_database (CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	if (config_db == NULL)</div><div class='del'>-		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);</div><div class='del'>-</div><div class='del'>-	return config_db;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-compare_subitems (const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	const ESearchBarSubitem *subitem_a = a;</div><div class='del'>-	const ESearchBarSubitem *subitem_b = b;</div><div class='del'>-</div><div class='del'>-	return strcoll (subitem_a-&gt;text, subitem_b-&gt;text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-make_suboptions (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ESearchBarSubitem *subitems;</div><div class='del'>-	ECategoriesMasterList *master_list;</div><div class='del'>-	gint i, N;</div><div class='del'>-</div><div class='del'>-	master_list = get_master_list ();</div><div class='del'>-	N = e_categories_master_list_count (master_list);</div><div class='del'>-	subitems = g_new (ESearchBarSubitem, N+2);</div><div class='del'>-</div><div class='del'>-	subitems[0].id = G_MAXINT;</div><div class='del'>-	subitems[0].text = g_strdup (_("Any Category"));</div><div class='del'>-	subitems[0].translate = FALSE;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;N; ++i) {</div><div class='del'>-		const char *category = e_categories_master_list_nth (master_list, i);</div><div class='del'>-</div><div class='del'>-		subitems[i+1].id = i;</div><div class='del'>-		subitems[i+1].text = e_utf8_to_locale_string (category);</div><div class='del'>-		subitems[i+1].translate = FALSE;</div><div class='del'>-	}</div><div class='del'>-	subitems[N+1].id = -1;</div><div class='del'>-	subitems[N+1].text = NULL;</div><div class='del'>-</div><div class='del'>-	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_suboption (view-&gt;search, ESB_CATEGORY, subitems);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecml_changed (ECategoriesMasterList *ecml, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	make_suboptions (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_master_list_changed (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;ecml_changed_id =</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (get_master_list()), "changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (ecml_changed), view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboControl *</div><div class='del'>-addressbook_factory_new_control (void)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-</div><div class='del'>-	frame = gtk_frame_new (NULL);</div><div class='del'>-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);</div><div class='del'>-</div><div class='del'>-	view = g_new0 (AddressbookView, 1);</div><div class='del'>-	view-&gt;refs = 1;</div><div class='del'>-	view-&gt;ignore_search_changes = FALSE;</div><div class='del'>-</div><div class='del'>-	view-&gt;vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;vbox), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (destroy_callback),</div><div class='del'>-			    (gpointer) view);</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-	view-&gt;control = bonobo_control_new (view-&gt;vbox);</div><div class='del'>-</div><div class='del'>-	view-&gt;search = E_SEARCH_BAR (e_search_bar_new (NULL, addressbook_search_option_items));</div><div class='del'>-	make_suboptions (view);</div><div class='del'>-	connect_master_list_changed (view);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (view-&gt;vbox), GTK_WIDGET (view-&gt;search),</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;search), "query_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;search), "search_activated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_search_activated), view);</div><div class='del'>-</div><div class='del'>-	view-&gt;view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view-&gt;view));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (view-&gt;vbox), frame,</div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* create the initial view */</div><div class='del'>-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (frame);</div><div class='del'>-	gtk_widget_show (view-&gt;vbox);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET(view-&gt;view));</div><div class='del'>-	gtk_widget_show (GTK_WIDGET(view-&gt;search));</div><div class='del'>-</div><div class='del'>-	view-&gt;properties = bonobo_property_bag_new (get_prop, set_prop, view);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (view-&gt;properties,</div><div class='del'>-				 PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (view-&gt;control,</div><div class='del'>-				       view-&gt;properties);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;view),</div><div class='del'>-			    "status_message",</div><div class='del'>-			    GTK_SIGNAL_FUNC(set_status_message),</div><div class='del'>-			    view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;view),</div><div class='del'>-			    "folder_bar_message",</div><div class='del'>-			    GTK_SIGNAL_FUNC(set_folder_bar_label),</div><div class='del'>-			    view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;view),</div><div class='del'>-			    "command_state_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC(update_command_state),</div><div class='del'>-			    view);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;view),</div><div class='del'>-			    "alphabet_state_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC(alphabet_state_changed),</div><div class='del'>-			    view);</div><div class='del'>-	</div><div class='del'>-	view-&gt;uri = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;control), "activate",</div><div class='del'>-			    control_activate_cb, view);</div><div class='del'>-</div><div class='del'>-	return view-&gt;control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-addressbook_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (addressbook_factory_new_control ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-addressbook_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *addressbook_control_factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (addressbook_control_factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	addressbook_control_factory = bonobo_generic_factory_new (</div><div class='del'>-		"OAFIID:GNOME_Evolution_Addressbook_ControlFactory",</div><div class='del'>-		addressbook_factory, NULL);</div><div class='del'>-</div><div class='del'>-	if (addressbook_control_factory == NULL) {</div><div class='del'>-		g_error ("I could not register a Addressbook factory.");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h<br/>deleted file mode 100644<br/>index 6fb82b710d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/addressbook.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-#ifndef __ADDRESSBOOK_H__</div><div class='del'>-#define __ADDRESSBOOK_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-</div><div class='del'>-Bonobo_ConfigDatabase addressbook_config_database (CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-/* use this instead of e_book_load_uri everywhere where you want the</div><div class='del'>-   authentication to be handled for you. */</div><div class='del'>-gboolean       addressbook_load_uri             (EBook *book, const char *uri, EBookCallback cb, gpointer closure);</div><div class='del'>-gboolean       addressbook_load_default_book    (EBook *book, EBookCallback open_response, gpointer closure);</div><div class='del'>-</div><div class='del'>-BonoboControl *addressbook_factory_new_control  (void);</div><div class='del'>-void           addressbook_factory_init         (void);</div><div class='del'>-</div><div class='del'>-#endif /* __ADDRESSBOOK_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c<br/>deleted file mode 100644<br/>index 7c04cc0130..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-address-popup.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-address-popup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1274 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-address-popup.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This file is too big and this widget is too complicated.  Forgive me.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "e-address-popup.h"</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-editor.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-quick-add.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-minicard-widget.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-addressbook-util.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Some general scaffolding for our widgets.  Think of this as a really, really</div><div class='del'>- * lame implementation of a wizard (...which is still somewhat more general that</div><div class='del'>- * we really need it to be).</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _MiniWizard MiniWizard;</div><div class='del'>-struct _MiniWizard {</div><div class='del'>-	GtkWidget *body;</div><div class='del'>-</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	GtkWidget *ok_button;</div><div class='del'>-	GtkWidget *cancel_button;</div><div class='del'>-</div><div class='del'>-	void (*ok_cb) (MiniWizard *, gpointer);</div><div class='del'>-	void (*cleanup_cb) (gpointer);</div><div class='del'>-	gpointer closure;</div><div class='del'>-</div><div class='del'>-	void (*destroy_cb) (MiniWizard *, gpointer);</div><div class='del'>-	gpointer destroy_closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mini_wizard_container_add (MiniWizard *wiz, GtkWidget *w)</div><div class='del'>-{</div><div class='del'>-	GList *iter = gtk_container_children (GTK_CONTAINER (wiz-&gt;vbox));</div><div class='del'>-	while (iter != NULL) {</div><div class='del'>-		GtkWidget *oldw = (GtkWidget *) iter-&gt;data;</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (wiz-&gt;vbox), oldw);</div><div class='del'>-		gtk_widget_destroy (oldw);</div><div class='del'>-	}</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (wiz-&gt;vbox), w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mini_wizard_destroy (MiniWizard *wiz)</div><div class='del'>-{</div><div class='del'>-	if (wiz-&gt;cleanup_cb)</div><div class='del'>-		wiz-&gt;cleanup_cb (wiz-&gt;closure);</div><div class='del'>-	wiz-&gt;cleanup_cb = NULL;</div><div class='del'>-</div><div class='del'>-	if (wiz-&gt;destroy_cb)</div><div class='del'>-		wiz-&gt;destroy_cb (wiz, wiz-&gt;destroy_closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mini_wizard_ok_cb (GtkWidget *b, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = (MiniWizard *) closure;</div><div class='del'>-</div><div class='del'>-	gpointer old_closure = wiz-&gt;closure;</div><div class='del'>-	void (*old_cleanup) (gpointer) = wiz-&gt;cleanup_cb;</div><div class='del'>-</div><div class='del'>-	wiz-&gt;cleanup_cb = NULL;</div><div class='del'>-</div><div class='del'>-	if (wiz-&gt;ok_cb)</div><div class='del'>-		wiz-&gt;ok_cb (wiz, wiz-&gt;closure);</div><div class='del'>-</div><div class='del'>-	if (old_cleanup)</div><div class='del'>-		old_cleanup (old_closure);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mini_wizard_cancel_cb (GtkWidget *b, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	mini_wizard_destroy ((MiniWizard *) closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mini_wizard_destroy_cb (GtkWidget *w, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = (MiniWizard *) closure;</div><div class='del'>-	if (wiz-&gt;cleanup_cb)</div><div class='del'>-		wiz-&gt;cleanup_cb (wiz-&gt;closure);</div><div class='del'>-	g_free (wiz);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static MiniWizard *</div><div class='del'>-mini_wizard_new (void)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = g_new (MiniWizard, 1);</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-</div><div class='del'>-	wiz-&gt;body          = gtk_vbox_new (FALSE, 2);</div><div class='del'>-	wiz-&gt;vbox          = gtk_vbox_new (FALSE, 2);</div><div class='del'>-	wiz-&gt;ok_button     = gnome_stock_button (GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	wiz-&gt;cancel_button = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	wiz-&gt;ok_cb      = NULL;</div><div class='del'>-	wiz-&gt;cleanup_cb = NULL;</div><div class='del'>-	wiz-&gt;closure    = NULL;</div><div class='del'>-</div><div class='del'>-	wiz-&gt;destroy_cb      = NULL;</div><div class='del'>-	wiz-&gt;destroy_closure = NULL;</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), wiz-&gt;ok_button, TRUE, FALSE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), wiz-&gt;cancel_button, TRUE, FALSE, 2);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (wiz-&gt;body), wiz-&gt;vbox, TRUE, TRUE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (wiz-&gt;body), gtk_hseparator_new (), FALSE, TRUE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (wiz-&gt;body), hbox, FALSE, TRUE, 2);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (wiz-&gt;body);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wiz-&gt;ok_button),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (mini_wizard_ok_cb),</div><div class='del'>-			    wiz);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wiz-&gt;cancel_button),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (mini_wizard_cancel_cb),</div><div class='del'>-			    wiz);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wiz-&gt;body),</div><div class='del'>-			    "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (mini_wizard_destroy_cb),</div><div class='del'>-			    wiz);</div><div class='del'>-</div><div class='del'>-	return wiz;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is the code for the UI thingie that lets you manipulate the e-mail</div><div class='del'>- * addresses (and *only* the e-mail addresses) associated with an existing</div><div class='del'>- * card.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define EMPTY_ENTRY N_("(none)")</div><div class='del'>-</div><div class='del'>-typedef struct _EMailMenu EMailMenu;</div><div class='del'>-struct _EMailMenu {</div><div class='del'>-	GtkWidget *option_menu;</div><div class='del'>-	GList *options;</div><div class='del'>-	gchar *current_selection;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_menu_free (EMailMenu *menu)</div><div class='del'>-{</div><div class='del'>-	if (menu == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_list_foreach (menu-&gt;options, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free (menu-&gt;options);</div><div class='del'>-	g_free (menu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMailMenu *</div><div class='del'>-email_menu_new (void)</div><div class='del'>-{</div><div class='del'>-	EMailMenu *menu = g_new (EMailMenu, 1);</div><div class='del'>-</div><div class='del'>-	menu-&gt;option_menu = gtk_option_menu_new ();</div><div class='del'>-	menu-&gt;options = NULL;</div><div class='del'>-	menu-&gt;current_selection = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (menu-&gt;option_menu), gtk_menu_new ());</div><div class='del'>-</div><div class='del'>-	return menu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_activate_cb (GtkWidget *w, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EMailMenu *menu = (EMailMenu *) closure;</div><div class='del'>-	gchar *addr = (gchar *) gtk_object_get_data (GTK_OBJECT (w), "addr");</div><div class='del'>-</div><div class='del'>-	menu-&gt;current_selection = addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_menu_add_option (EMailMenu *menu, const gchar *addr)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu_item;</div><div class='del'>-	gchar *addr_cpy;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (menu != NULL);</div><div class='del'>-	if (addr == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	addr_cpy = g_strdup (addr);</div><div class='del'>-	menu-&gt;options = g_list_append (menu-&gt;options, addr_cpy);</div><div class='del'>-</div><div class='del'>-	menu_item = gtk_menu_item_new_with_label (addr);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (menu_item), "addr", addr_cpy);</div><div class='del'>-	gtk_widget_show_all (menu_item);</div><div class='del'>-	gtk_menu_append (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu-&gt;option_menu))), menu_item);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu_item),</div><div class='del'>-			    "activate",</div><div class='del'>-			    menu_activate_cb,</div><div class='del'>-			    menu);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_menu_add_options_from_card (EMailMenu *menu, ECard *card, const gchar *extra_addr)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (card);</div><div class='del'>-</div><div class='del'>-	/* If any of these three e-mail fields are NULL, email_menu_add_option will just</div><div class='del'>-	   return without doing anything. */</div><div class='del'>-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));</div><div class='del'>-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));</div><div class='del'>-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));</div><div class='del'>-	email_menu_add_option (menu, extra_addr);</div><div class='del'>-	email_menu_add_option (menu, EMPTY_ENTRY);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_menu_set_option (EMailMenu *menu, const gchar *addr)</div><div class='del'>-{</div><div class='del'>-	guint count = 0;</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (menu != NULL);</div><div class='del'>-</div><div class='del'>-	if (addr == NULL) {</div><div class='del'>-		email_menu_set_option (menu, EMPTY_ENTRY);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iter = menu-&gt;options;</div><div class='del'>-	while (iter &amp;&amp; strcmp (addr, (gchar *) iter-&gt;data)) {</div><div class='del'>-		++count;</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iter) {</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (menu-&gt;option_menu), count);</div><div class='del'>-		menu-&gt;current_selection = (gchar *) iter-&gt;data;</div><div class='del'>-	} </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef UNDEFINED_FUNCTIONS_SHOULD_PLEASE_BE_INCLUDED</div><div class='del'>-static void</div><div class='del'>-email_menu_unset_option (EMailMenu *menu, const gchar *addr)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (menu != NULL);</div><div class='del'>-	g_return_if_fail (addr != NULL);</div><div class='del'>-</div><div class='del'>-	if (menu-&gt;current_selection == NULL || strcmp (addr, menu-&gt;current_selection))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	iter = menu-&gt;options;</div><div class='del'>-	while (iter &amp;&amp; strcmp (addr, (gchar *) iter-&gt;data)) {</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-	}</div><div class='del'>-	if (iter) {</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-		if (iter) {</div><div class='del'>-			email_menu_set_option (menu, (gchar *) iter-&gt;data);</div><div class='del'>-		} else {</div><div class='del'>-			email_menu_set_option (menu, EMPTY_ENTRY);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMailTable EMailTable;</div><div class='del'>-struct _EMailTable {</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EMailMenu *primary;</div><div class='del'>-	EMailMenu *email2;</div><div class='del'>-	EMailMenu *email3;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_cleanup_cb (gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EMailTable *et = (EMailTable *) closure;</div><div class='del'>-</div><div class='del'>-	if (et == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (et-&gt;card));</div><div class='del'>-	email_menu_free (et-&gt;primary);</div><div class='del'>-	email_menu_free (et-&gt;email2);</div><div class='del'>-	email_menu_free (et-&gt;email3);</div><div class='del'>-</div><div class='del'>-	g_free (et);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_from_card (EMailTable *et)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (et != NULL);</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (et-&gt;card);</div><div class='del'>-	email_menu_set_option (et-&gt;primary, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));</div><div class='del'>-	email_menu_set_option (et-&gt;email2,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));</div><div class='del'>-	email_menu_set_option (et-&gt;email3,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_to_card (EMailTable *et)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	gchar *curr;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (et != NULL);</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (et-&gt;card);</div><div class='del'>-</div><div class='del'>-	curr = et-&gt;primary-&gt;current_selection;</div><div class='del'>-	if (curr &amp;&amp; !strcmp (curr, _(EMPTY_ENTRY)))</div><div class='del'>-		curr = NULL;</div><div class='del'>-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL, curr);</div><div class='del'>-</div><div class='del'>-	curr = et-&gt;email2-&gt;current_selection;</div><div class='del'>-	if (curr &amp;&amp; !strcmp (curr, _(EMPTY_ENTRY)))</div><div class='del'>-		curr = NULL;</div><div class='del'>-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, curr);</div><div class='del'>-</div><div class='del'>-	curr = et-&gt;email3-&gt;current_selection;</div><div class='del'>-	if (curr &amp;&amp; !strcmp (curr, _(EMPTY_ENTRY)))</div><div class='del'>-		curr = NULL;</div><div class='del'>-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, curr);</div><div class='del'>-</div><div class='del'>-	e_card_simple_sync_card (simple);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_save_card_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD (closure);</div><div class='del'>-</div><div class='del'>-	if (book) {</div><div class='del'>-		e_book_commit_card (book, card, NULL, NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * We have to do this in an idle function because of what might be a</div><div class='del'>- * re-entrancy problems with EBook.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-add_card_idle_cb (gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (!addressbook_load_default_book (book, email_table_save_card_cb, closure)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		email_table_save_card_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, closure);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_ok_cb (MiniWizard *wiz, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EMailTable *et = (EMailTable *) closure;</div><div class='del'>-</div><div class='del'>-	email_table_to_card (et);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (et-&gt;card));</div><div class='del'>-	gtk_idle_add (add_card_idle_cb, et-&gt;card);</div><div class='del'>-</div><div class='del'>-	mini_wizard_destroy (wiz);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_table_init (MiniWizard *wiz, ECard *card, const gchar *extra_address)</div><div class='del'>-{</div><div class='del'>-	EMailTable *et;</div><div class='del'>-</div><div class='del'>-	gchar *name_str;</div><div class='del'>-	gint xpad, ypad;</div><div class='del'>-	GtkAttachOptions label_x_opts, label_y_opts;</div><div class='del'>-	GtkAttachOptions menu_x_opts, menu_y_opts;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	et = g_new (EMailTable, 1);</div><div class='del'>-</div><div class='del'>-	et-&gt;card = card;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (et-&gt;card));</div><div class='del'>-</div><div class='del'>-	et-&gt;table = gtk_table_new (4, 2, FALSE);</div><div class='del'>-</div><div class='del'>-	et-&gt;primary = email_menu_new ();</div><div class='del'>-	et-&gt;email2  = email_menu_new ();</div><div class='del'>-	et-&gt;email3  = email_menu_new ();</div><div class='del'>-</div><div class='del'>-	email_menu_add_options_from_card (et-&gt;primary, et-&gt;card, extra_address);</div><div class='del'>-	email_menu_add_options_from_card (et-&gt;email2,  et-&gt;card, extra_address);</div><div class='del'>-	email_menu_add_options_from_card (et-&gt;email3,  et-&gt;card, extra_address);</div><div class='del'>-</div><div class='del'>-	email_table_from_card (et);</div><div class='del'>-</div><div class='del'>-	label_x_opts = GTK_FILL;</div><div class='del'>-	label_y_opts = GTK_FILL;</div><div class='del'>-	menu_x_opts = GTK_EXPAND | GTK_FILL;</div><div class='del'>-	menu_y_opts = GTK_EXPAND | GTK_FILL;</div><div class='del'>-	xpad = 3;</div><div class='del'>-	ypad = 3;</div><div class='del'>-</div><div class='del'>-	name_str = e_card_name_to_string (et-&gt;card-&gt;name);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  gtk_label_new (name_str),</div><div class='del'>-			  0, 2, 0, 1, </div><div class='del'>-			  label_x_opts, label_y_opts, xpad, ypad);</div><div class='del'>-	g_free (name_str);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  gtk_label_new (_("Primary Email")),</div><div class='del'>-			  0, 1, 1, 2, </div><div class='del'>-			  label_x_opts, label_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  et-&gt;primary-&gt;option_menu,</div><div class='del'>-			  1, 2, 1, 2, </div><div class='del'>-			  menu_x_opts, menu_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  gtk_label_new (_("Email 2")),</div><div class='del'>-			  0, 1, 2, 3,</div><div class='del'>-			  label_x_opts, label_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  et-&gt;email2-&gt;option_menu,</div><div class='del'>-			  1, 2, 2, 3,</div><div class='del'>-			  menu_x_opts, menu_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  gtk_label_new (_("Email 3")),</div><div class='del'>-			  0, 1, 3, 4,</div><div class='del'>-			  label_x_opts, label_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (et-&gt;table),</div><div class='del'>-			  et-&gt;email3-&gt;option_menu,</div><div class='del'>-			  1, 2, 3, 4,</div><div class='del'>-			  menu_x_opts, menu_y_opts, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (et-&gt;primary-&gt;option_menu);</div><div class='del'>-	gtk_widget_show_all (et-&gt;email2-&gt;option_menu);</div><div class='del'>-	gtk_widget_show_all (et-&gt;email3-&gt;option_menu);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (et-&gt;table);</div><div class='del'>-	mini_wizard_container_add (wiz, et-&gt;table);</div><div class='del'>-	wiz-&gt;ok_cb      = email_table_ok_cb;</div><div class='del'>-	wiz-&gt;cleanup_cb = email_table_cleanup_cb;</div><div class='del'>-	wiz-&gt;closure    = et;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This code is for the little UI thing that lets you pick from a set of cards</div><div class='del'>- * and decide which one you want to add the e-mail address to.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _CardPicker CardPicker;</div><div class='del'>-struct _CardPicker {</div><div class='del'>-	GtkWidget *body;</div><div class='del'>-	GtkWidget *clist;</div><div class='del'>-	GList *cards;</div><div class='del'>-	gchar *new_name;</div><div class='del'>-	gchar *new_email;</div><div class='del'>-</div><div class='del'>-	gint current_row;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_picker_row_select_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = (MiniWizard *) closure;</div><div class='del'>-	CardPicker *pick = (CardPicker *) wiz-&gt;closure;</div><div class='del'>-	pick-&gt;current_row = row;</div><div class='del'>-	gtk_widget_set_sensitive (wiz-&gt;ok_button, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_picker_row_unselect_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = (MiniWizard *) closure;</div><div class='del'>-	CardPicker *pick = (CardPicker *) wiz-&gt;closure;</div><div class='del'>-	pick-&gt;current_row = -1;</div><div class='del'>-	gtk_widget_set_sensitive (wiz-&gt;ok_button, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_picker_ok_cb (MiniWizard *wiz, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardPicker *pick = (CardPicker *) closure;</div><div class='del'>-	g_return_if_fail (pick-&gt;current_row &gt;= 0);</div><div class='del'>-</div><div class='del'>-	if (pick-&gt;current_row == 0) {</div><div class='del'>-		e_contact_quick_add (pick-&gt;new_name, pick-&gt;new_email, NULL, NULL);</div><div class='del'>-		mini_wizard_destroy (wiz);</div><div class='del'>-	} else {</div><div class='del'>-		ECard *card = (ECard *) g_list_nth_data (pick-&gt;cards, pick-&gt;current_row-1);</div><div class='del'>-		email_table_init (wiz, card, pick-&gt;new_email);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_picker_cleanup_cb (gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardPicker *pick = (CardPicker *) closure;</div><div class='del'>-</div><div class='del'>-	g_list_foreach (pick-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (pick-&gt;cards);</div><div class='del'>-</div><div class='del'>-	g_free (pick-&gt;new_name);</div><div class='del'>-	g_free (pick-&gt;new_email);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_picker_init (MiniWizard *wiz, const GList *cards, const gchar *new_name, const gchar *new_email)</div><div class='del'>-{</div><div class='del'>-	CardPicker *pick;</div><div class='del'>-	gchar *str;</div><div class='del'>-	GtkWidget *w, *swin;</div><div class='del'>-</div><div class='del'>-	pick = g_new (CardPicker, 1);</div><div class='del'>-</div><div class='del'>-	pick-&gt;body  = gtk_vbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	pick-&gt;clist = gtk_clist_new (1);</div><div class='del'>-	gtk_clist_set_column_title (GTK_CLIST (pick-&gt;clist), 0, _("Select an Action"));</div><div class='del'>-	gtk_clist_column_titles_show (GTK_CLIST (pick-&gt;clist));</div><div class='del'>-	gtk_clist_set_selection_mode (GTK_CLIST (pick-&gt;clist), GTK_SELECTION_SINGLE);</div><div class='del'>-</div><div class='del'>-	gtk_clist_freeze (GTK_CLIST (pick-&gt;clist));</div><div class='del'>-</div><div class='del'>-	str = g_strdup_printf (_("Create a new contact \"%s\""), new_name);</div><div class='del'>-	gtk_clist_append (GTK_CLIST (pick-&gt;clist), &amp;str);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	pick-&gt;cards = NULL;</div><div class='del'>-	while (cards) {</div><div class='del'>-		ECard *card = (ECard *) cards-&gt;data;</div><div class='del'>-		gchar *name_str = e_card_name_to_string (card-&gt;name);</div><div class='del'>-</div><div class='del'>-		pick-&gt;cards = g_list_append (pick-&gt;cards, card);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (card));</div><div class='del'>-</div><div class='del'>-		str = g_strdup_printf (_("Add address to existing contact \"%s\""), name_str);</div><div class='del'>-		gtk_clist_append (GTK_CLIST (pick-&gt;clist), &amp;str);</div><div class='del'>-		g_free (name_str);</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-		cards = g_list_next (cards);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_clist_thaw (GTK_CLIST (pick-&gt;clist));</div><div class='del'>-</div><div class='del'>-	pick-&gt;new_name  = g_strdup (new_name);</div><div class='del'>-	pick-&gt;new_email = g_strdup (new_email);</div><div class='del'>-</div><div class='del'>-	pick-&gt;current_row = -1;</div><div class='del'>-	gtk_widget_set_sensitive (wiz-&gt;ok_button, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Connect some signals &amp; callbacks */</div><div class='del'>-</div><div class='del'>-	wiz-&gt;ok_cb      = card_picker_ok_cb;</div><div class='del'>-	wiz-&gt;cleanup_cb = card_picker_cleanup_cb;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (pick-&gt;clist),</div><div class='del'>-			    "select-row",</div><div class='del'>-			    GTK_SIGNAL_FUNC (card_picker_row_select_cb),</div><div class='del'>-			    wiz);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (pick-&gt;clist),</div><div class='del'>-			    "unselect-row",</div><div class='del'>-			    GTK_SIGNAL_FUNC (card_picker_row_unselect_cb),</div><div class='del'>-			    wiz);</div><div class='del'>-</div><div class='del'>-	/* Build our widget */</div><div class='del'>-</div><div class='del'>-	w = gtk_label_new (new_email);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pick-&gt;body), w, FALSE, TRUE, 3);</div><div class='del'>-</div><div class='del'>-	swin = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),</div><div class='del'>-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);</div><div class='del'>-</div><div class='del'>-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swin), pick-&gt;clist);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pick-&gt;body), swin, TRUE, TRUE, 2);</div><div class='del'>-	gtk_widget_show_all (pick-&gt;body);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Put it in our mini-wizard */</div><div class='del'>-</div><div class='del'>-	wiz-&gt;closure = pick;</div><div class='del'>-	mini_wizard_container_add (wiz, pick-&gt;body);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The code for the actual EAddressPopup widget begins here.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void e_address_popup_destroy (GtkObject *);</div><div class='del'>-static void e_address_popup_query   (EAddressPopup *);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_class_init (EAddressPopupClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_address_popup_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_init (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	pop-&gt;transitory = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_cleanup (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	if (pop-&gt;card) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (pop-&gt;card));</div><div class='del'>-		pop-&gt;card = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pop-&gt;scheduled_refresh) {</div><div class='del'>-		gtk_timeout_remove (pop-&gt;scheduled_refresh);</div><div class='del'>-		pop-&gt;scheduled_refresh = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pop-&gt;query_tag) {</div><div class='del'>-		e_book_simple_query_cancel (pop-&gt;book, pop-&gt;query_tag);</div><div class='del'>-		pop-&gt;query_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pop-&gt;book) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (pop-&gt;book));</div><div class='del'>-		pop-&gt;book = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (pop-&gt;name);</div><div class='del'>-	pop-&gt;name = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (pop-&gt;email);</div><div class='del'>-	pop-&gt;email = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (obj);</div><div class='del'>-</div><div class='del'>-	e_address_popup_cleanup (pop);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS (parent_class)-&gt;destroy (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_address_popup_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType pop_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!pop_type) {</div><div class='del'>-		GtkTypeInfo pop_info = {</div><div class='del'>-			"EAddressPopup",</div><div class='del'>-			sizeof (EAddressPopup),</div><div class='del'>-			sizeof (EAddressPopupClass),</div><div class='del'>-			(GtkClassInitFunc) e_address_popup_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_address_popup_init,</div><div class='del'>-			NULL, NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		pop_type = gtk_type_unique (gtk_event_box_get_type (), &amp;pop_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pop_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_refresh_names (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	if (pop-&gt;name_widget) {</div><div class='del'>-		if (pop-&gt;name &amp;&amp; *pop-&gt;name) {</div><div class='del'>-			gchar *s = e_utf8_to_gtk_string (pop-&gt;name_widget, pop-&gt;name);</div><div class='del'>-			gtk_label_set_text (GTK_LABEL (pop-&gt;name_widget), s);</div><div class='del'>-			g_free (s);</div><div class='del'>-			gtk_widget_show (pop-&gt;name_widget);</div><div class='del'>-		} else {</div><div class='del'>-			gtk_widget_hide (pop-&gt;name_widget);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pop-&gt;email_widget) {</div><div class='del'>-		if (pop-&gt;email &amp;&amp; *pop-&gt;email) {</div><div class='del'>-			gchar *s = e_utf8_to_gtk_string (pop-&gt;email_widget, pop-&gt;email);</div><div class='del'>-			gtk_label_set_text (GTK_LABEL (pop-&gt;email_widget), s);</div><div class='del'>-			g_free (s);</div><div class='del'>-			gtk_widget_show (pop-&gt;email_widget);</div><div class='del'>-		} else {</div><div class='del'>-			gtk_widget_hide (pop-&gt;email_widget);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_address_popup_query (pop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-refresh_timeout_cb (gpointer ptr)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (ptr);</div><div class='del'>-	e_address_popup_refresh_names (pop);</div><div class='del'>-	pop-&gt;scheduled_refresh = 0;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_schedule_refresh (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	if (pop-&gt;scheduled_refresh == 0)</div><div class='del'>-		pop-&gt;scheduled_refresh = gtk_timeout_add (20, refresh_timeout_cb, pop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* If we are handed something of the form "Foo &lt;bar@bar.com&gt;",</div><div class='del'>-   do the right thing. */</div><div class='del'>-static gboolean</div><div class='del'>-e_address_popup_set_free_form (EAddressPopup *pop, const gchar *txt)</div><div class='del'>-{</div><div class='del'>-	gchar *lt, *gt = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop), FALSE);</div><div class='del'>-</div><div class='del'>-	if (txt == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	lt = strchr (txt, '&lt;');</div><div class='del'>-	if (lt)</div><div class='del'>-		gt = strchr (txt, '&gt;');</div><div class='del'>-</div><div class='del'>-	if (lt &amp;&amp; gt &amp;&amp; lt+1 &lt; gt) {</div><div class='del'>-		gchar *name  = g_strndup (txt,  lt-txt);</div><div class='del'>-		gchar *email = g_strndup (lt+1, gt-lt-1);</div><div class='del'>-		e_address_popup_set_name (pop, name);</div><div class='del'>-		e_address_popup_set_email (pop, email);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_popup_set_name (EAddressPopup *pop, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-</div><div class='del'>-	/* We only allow the name to be set once. */</div><div class='del'>-	if (pop-&gt;name)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!e_address_popup_set_free_form (pop, name)) {</div><div class='del'>-		pop-&gt;name = g_strdup (name);</div><div class='del'>-		if (pop-&gt;name)</div><div class='del'>-			g_strstrip (pop-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_address_popup_schedule_refresh (pop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_popup_set_email (EAddressPopup *pop, const gchar *email)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-</div><div class='del'>-	/* We only allow the e-mail to be set once. */</div><div class='del'>-	if (pop-&gt;email)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!e_address_popup_set_free_form (pop, email)) {</div><div class='del'>-		pop-&gt;email = g_strdup (email);</div><div class='del'>-		if (pop-&gt;email)</div><div class='del'>-			g_strstrip (pop-&gt;email);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_address_popup_schedule_refresh (pop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_popup_construct (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox, *name_holder;</div><div class='del'>-	GdkColor color = { 0x0, 0xffff, 0xffff, 0xffff };</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-</div><div class='del'>-	pop-&gt;main_vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Build Generic View */</div><div class='del'>-</div><div class='del'>-	name_holder = gtk_event_box_new ();</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 2);</div><div class='del'>-	pop-&gt;name_widget = gtk_label_new ("");</div><div class='del'>-	pop-&gt;email_widget = gtk_label_new ("");</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), pop-&gt;name_widget, TRUE, TRUE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), pop-&gt;email_widget, TRUE, TRUE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (name_holder), GTK_WIDGET (vbox));</div><div class='del'>-</div><div class='del'>-	if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (name_holder)), &amp;color, FALSE, TRUE)) {</div><div class='del'>-		GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (name_holder)));</div><div class='del'>-		style-&gt;bg[0] = color;</div><div class='del'>-		gtk_widget_set_style (GTK_WIDGET (name_holder), style);</div><div class='del'>-		gtk_style_unref (style);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pop-&gt;generic_view = gtk_frame_new (NULL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (pop-&gt;generic_view), name_holder);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pop-&gt;main_vbox), pop-&gt;generic_view, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show_all (pop-&gt;generic_view);</div><div class='del'>-</div><div class='del'>-	pop-&gt;query_msg = gtk_label_new (_("Querying Addressbook..."));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pop-&gt;main_vbox), pop-&gt;query_msg, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (pop-&gt;query_msg);</div><div class='del'>-</div><div class='del'>-	/* Build Minicard View */</div><div class='del'>-	pop-&gt;minicard_view = e_minicard_widget_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pop-&gt;main_vbox), pop-&gt;minicard_view, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Final assembly */</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (pop), pop-&gt;main_vbox);</div><div class='del'>-	gtk_widget_show (pop-&gt;main_vbox);</div><div class='del'>-</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (pop), 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_address_popup_new (void)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = gtk_type_new (E_ADDRESS_POPUP_TYPE);</div><div class='del'>-	e_address_popup_construct (pop);</div><div class='del'>-	return GTK_WIDGET (pop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-emit_event (EAddressPopup *pop, const char *event)</div><div class='del'>-{</div><div class='del'>-	if (pop-&gt;es) {</div><div class='del'>-		BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-		arg = bonobo_arg_new (BONOBO_ARG_BOOLEAN);</div><div class='del'>-		BONOBO_ARG_SET_BOOLEAN (arg, TRUE);</div><div class='del'>-		bonobo_event_source_notify_listeners_full (pop-&gt;es,</div><div class='del'>-							   "GNOME/Evolution/Addressbook/AddressPopup",</div><div class='del'>-							   "Event",</div><div class='del'>-							   event,</div><div class='del'>-							   arg, NULL);</div><div class='del'>-		bonobo_arg_release (arg);</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);</div><div class='del'>-	EContactEditor *ce = e_addressbook_show_contact_editor (book, pop-&gt;card, FALSE, TRUE);</div><div class='del'>-	e_address_popup_cleanup (pop);</div><div class='del'>-	emit_event (pop, "Destroy");</div><div class='del'>-	e_contact_editor_raise (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_contact_info_cb (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	emit_event (pop, "Hide");</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (!addressbook_load_default_book (book, contact_editor_cb, pop)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		contact_editor_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_cardify (EAddressPopup *pop, ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *b;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-	g_return_if_fail (card &amp;&amp; E_IS_CARD (card));</div><div class='del'>-	g_return_if_fail (pop-&gt;card == NULL);</div><div class='del'>-</div><div class='del'>-	pop-&gt;card = card;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (pop-&gt;card));</div><div class='del'>-</div><div class='del'>-	e_minicard_widget_set_card (E_MINICARD_WIDGET (pop-&gt;minicard_view), card);</div><div class='del'>-	gtk_widget_show (pop-&gt;minicard_view);</div><div class='del'>-	gtk_widget_hide (pop-&gt;generic_view);</div><div class='del'>-</div><div class='del'>-	b = gtk_button_new_with_label (_("Edit Contact Info"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pop-&gt;main_vbox), b, TRUE, TRUE, 0);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (b),</div><div class='del'>-				   "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC (edit_contact_info_cb),</div><div class='del'>-				   GTK_OBJECT (pop));</div><div class='del'>-	gtk_widget_show (b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_contacts_cb (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	if (pop-&gt;email &amp;&amp; *pop-&gt;email) {</div><div class='del'>-		if (pop-&gt;name &amp;&amp; *pop-&gt;name)</div><div class='del'>-			e_contact_quick_add (pop-&gt;name, pop-&gt;email, NULL, NULL);</div><div class='del'>-		else</div><div class='del'>-			e_contact_quick_add_free_form (pop-&gt;email, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	e_address_popup_cleanup (pop);</div><div class='del'>-	emit_event (pop, "Destroy");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_no_matches (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *b;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-</div><div class='del'>-	b = gtk_button_new_with_label (_("Add to Contacts"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (pop-&gt;main_vbox), b, TRUE, TRUE, 0);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (b),</div><div class='del'>-				   "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC (add_contacts_cb),</div><div class='del'>-				   GTK_OBJECT (pop));</div><div class='del'>-	gtk_widget_show (b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-wizard_destroy_cb (MiniWizard *wiz, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (closure));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	gint x, y, w, h, xmax, ymax;</div><div class='del'>-</div><div class='del'>-	xmax = gdk_screen_width ();</div><div class='del'>-	ymax = gdk_screen_height ();</div><div class='del'>-</div><div class='del'>-	if (gtk_object_get_data (GTK_OBJECT (widget), "size_allocate") == NULL) {</div><div class='del'>-		gdk_window_get_pointer (NULL, &amp;x, &amp;y, NULL);</div><div class='del'>-		w = alloc-&gt;width;</div><div class='del'>-		h = alloc-&gt;height;</div><div class='del'>-		x = CLAMP (x - w/2, 0, xmax - w);</div><div class='del'>-		y = CLAMP (y - h/2, 0, ymax - h);</div><div class='del'>-		gtk_widget_set_uposition (widget, x, y);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (widget), "size_allocate", widget);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_ambiguous_email_add (EAddressPopup *pop, const GList *cards)</div><div class='del'>-{</div><div class='del'>-	MiniWizard *wiz = mini_wizard_new ();</div><div class='del'>-	GtkWidget *win = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-	</div><div class='del'>-	wiz-&gt;destroy_cb      = wizard_destroy_cb;</div><div class='del'>-	wiz-&gt;destroy_closure = win;</div><div class='del'>-</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (win),  _("Merge E-Mail Address"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (win),</div><div class='del'>-			    "size_allocate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (popup_size_allocate_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	/* FIXME: This hard-wired size is evil. */</div><div class='del'>-	gtk_widget_set_usize (win, 275, 170);</div><div class='del'>-		</div><div class='del'>-	card_picker_init (wiz, cards, pop-&gt;name, pop-&gt;email);</div><div class='del'>-</div><div class='del'>-	e_address_popup_cleanup (pop);</div><div class='del'>-	emit_event (pop, "Destroy");</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (win), wiz-&gt;body);</div><div class='del'>-	gtk_widget_show_all (win);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_multiple_matches (EAddressPopup *pop, const GList *cards)</div><div class='del'>-{</div><div class='del'>-	pop-&gt;multiple_matches = TRUE;</div><div class='del'>-</div><div class='del'>-	e_address_popup_ambiguous_email_add (pop, cards);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Addressbook Query Fun</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_only_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pop = E_ADDRESS_POPUP (closure);</div><div class='del'>-</div><div class='del'>-	pop-&gt;query_tag = 0;</div><div class='del'>-</div><div class='del'>-	if (cards == NULL) {</div><div class='del'>-		e_address_popup_no_matches (pop);</div><div class='del'>-	} else {</div><div class='del'>-		e_address_popup_ambiguous_email_add (pop, cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pop = E_ADDRESS_POPUP (closure);</div><div class='del'>-</div><div class='del'>-	pop-&gt;query_tag = 0;</div><div class='del'>-	gtk_widget_hide (pop-&gt;query_msg);</div><div class='del'>-</div><div class='del'>-	if (cards == NULL) {</div><div class='del'>-		</div><div class='del'>-		/* Do a name-only query if:</div><div class='del'>-		   (1) The name is non-empty.</div><div class='del'>-		   (2) The e-mail is also non-empty (so that the query we just did wasn't actually a name-only query.</div><div class='del'>-		*/</div><div class='del'>-		if (pop-&gt;name &amp;&amp; *pop-&gt;name &amp;&amp; pop-&gt;email &amp;&amp; *pop-&gt;email) {</div><div class='del'>-			pop-&gt;query_tag = e_book_name_and_email_query (book, pop-&gt;name, NULL, name_only_query_cb, pop);</div><div class='del'>-		} else {</div><div class='del'>-			e_address_popup_no_matches (pop);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	} else {</div><div class='del'>-		if (g_list_length ((GList *) cards) == 1)</div><div class='del'>-			e_address_popup_cardify (pop, E_CARD (cards-&gt;data));</div><div class='del'>-		else</div><div class='del'>-			e_address_popup_multiple_matches (pop, cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-start_query (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);</div><div class='del'>-	</div><div class='del'>-	if (pop-&gt;query_tag)</div><div class='del'>-		e_book_simple_query_cancel (book, pop-&gt;query_tag);</div><div class='del'>-</div><div class='del'>-	if (pop-&gt;book != book) {</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-		if (pop-&gt;book)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (pop-&gt;book));</div><div class='del'>-		pop-&gt;book = book;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	pop-&gt;query_tag = e_book_name_and_email_query (book, pop-&gt;name, pop-&gt;email, query_cb, pop);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (pop));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_popup_query (EAddressPopup *pop)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (pop &amp;&amp; E_IS_ADDRESS_POPUP (pop));</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (pop));</div><div class='del'>-</div><div class='del'>-	if (!addressbook_load_default_book (book, start_query, pop)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		start_query (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	PROPERTY_NAME,</div><div class='del'>-	PROPERTY_EMAIL,</div><div class='del'>-	PROPERTY_TRANSITORY</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_NAME:</div><div class='del'>-		e_address_popup_set_name (pop, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_EMAIL:</div><div class='del'>-		e_address_popup_set_email (pop, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_NAME:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, pop-&gt;name);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_EMAIL:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, pop-&gt;email);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_TRANSITORY:</div><div class='del'>-		BONOBO_ARG_SET_BOOLEAN (arg, pop-&gt;transitory);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboControl *</div><div class='del'>-e_address_popup_factory_new_control (void)</div><div class='del'>-{</div><div class='del'>-        BonoboControl *control;</div><div class='del'>-        BonoboPropertyBag *bag;</div><div class='del'>-	EAddressPopup *addy;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	w = e_address_popup_new ();</div><div class='del'>-	addy = E_ADDRESS_POPUP (w);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (w);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-        bag = bonobo_property_bag_new (get_prop, set_prop, w);</div><div class='del'>-        bonobo_property_bag_add (bag, "name", PROPERTY_NAME,</div><div class='del'>-                                 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);</div><div class='del'>-</div><div class='del'>-        bonobo_property_bag_add (bag, "email", PROPERTY_EMAIL,</div><div class='del'>-                                 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (bag, "transitory", PROPERTY_TRANSITORY,</div><div class='del'>-				 BONOBO_ARG_BOOLEAN, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE);</div><div class='del'>-</div><div class='del'>-        bonobo_control_set_properties (control, bag);</div><div class='del'>-        bonobo_object_unref (BONOBO_OBJECT (bag));</div><div class='del'>-</div><div class='del'>-	addy-&gt;es = bonobo_event_source_new ();</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				     BONOBO_OBJECT (addy-&gt;es));</div><div class='del'>-</div><div class='del'>-        return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-e_address_popup_factory (BonoboGenericFactory *factory, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (e_address_popup_factory_new_control ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_popup_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory",</div><div class='del'>-					      e_address_popup_factory, NULL);</div><div class='del'>-	</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register an AddressPopup factory.");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h<br/>deleted file mode 100644<br/>index b648b79d4f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-address-popup.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-address-popup.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-address-popup.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_ADDRESS_POPUP_H__</div><div class='del'>-#define __E_ADDRESS_POPUP_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_ADDRESS_POPUP_TYPE        (e_address_popup_get_type ())</div><div class='del'>-#define E_ADDRESS_POPUP(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_POPUP_TYPE, EAddressPopup))</div><div class='del'>-#define E_ADDRESS_POPUP_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_POPUP_TYPE, EAddressPopupClass))</div><div class='del'>-#define E_IS_ADDRESS_POPUP(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_POPUP_TYPE))</div><div class='del'>-#define E_IS_ADDRESS_POPUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_POPUP_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressPopup EAddressPopup;</div><div class='del'>-typedef struct _EAddressPopupClass EAddressPopupClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressPopup {</div><div class='del'>-	GtkEventBox parent;</div><div class='del'>-</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *email;</div><div class='del'>-</div><div class='del'>-	GtkWidget *name_widget;</div><div class='del'>-	GtkWidget *email_widget;</div><div class='del'>-	GtkWidget *query_msg;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *main_vbox;</div><div class='del'>-	GtkWidget *generic_view;</div><div class='del'>-	GtkWidget *minicard_view;</div><div class='del'>-</div><div class='del'>-	gboolean transitory;</div><div class='del'>-</div><div class='del'>-	guint scheduled_refresh;</div><div class='del'>-	EBook *book;</div><div class='del'>-	guint query_tag;</div><div class='del'>-	gboolean multiple_matches;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	BonoboEventSource *es;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressPopupClass {</div><div class='del'>-	GtkEventBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_address_popup_get_type (void);</div><div class='del'>-</div><div class='del'>-void e_address_popup_set_name  (EAddressPopup *, const gchar *name);</div><div class='del'>-void e_address_popup_set_email (EAddressPopup *, const gchar *email);</div><div class='del'>-</div><div class='del'>-void e_address_popup_construct (EAddressPopup *);</div><div class='del'>-GtkWidget *e_address_popup_new (void);</div><div class='del'>-</div><div class='del'>-void e_address_popup_factory_init (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESS_POPUP_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c<br/>deleted file mode 100644<br/>index d044ddf7b9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-address-widget.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-address-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,576 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-address-widget.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-quick-add.h&gt;</div><div class='del'>-#include "e-address-widget.h"</div><div class='del'>-</div><div class='del'>-static void e_address_widget_class_init (EAddressWidgetClass *klass);</div><div class='del'>-static void e_address_widget_init       (EAddressWidget *obj);</div><div class='del'>-static void e_address_widget_destroy    (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static gint e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev);</div><div class='del'>-static void e_address_widget_popup (EAddressWidget *, GdkEventButton *ev);</div><div class='del'>-static void e_address_widget_schedule_query (EAddressWidget *);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static EBook *common_book = NULL; /* sort of lame */</div><div class='del'>-</div><div class='del'>-static gboolean doing_queries = FALSE;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_class_init (EAddressWidgetClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_address_widget_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;button_press_event = e_address_widget_button_press_handler;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_init (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (obj);</div><div class='del'>-</div><div class='del'>-	g_free (addr-&gt;name);</div><div class='del'>-	g_free (addr-&gt;email);</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;query_tag)</div><div class='del'>-		e_book_simple_query_cancel (common_book, addr-&gt;query_tag);</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;query_idle_tag)</div><div class='del'>-		gtk_idle_remove (addr-&gt;query_idle_tag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (w);</div><div class='del'>-	if (ev-&gt;button == 3 &amp;&amp; ev-&gt;state == 0) {</div><div class='del'>-		e_address_widget_popup (addr, ev);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_address_widget_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType aw_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!aw_type) {</div><div class='del'>-		GtkTypeInfo aw_info = {</div><div class='del'>-			"EAddressWidget",</div><div class='del'>-			sizeof (EAddressWidget),</div><div class='del'>-			sizeof (EAddressWidgetClass),</div><div class='del'>-			(GtkClassInitFunc) e_address_widget_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_address_widget_init,</div><div class='del'>-			NULL, NULL, /* reserved... but for what sinister purpose? */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		aw_type = gtk_type_unique (gtk_event_box_get_type (), &amp;aw_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return aw_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gtk_widget_visible (GtkWidget *w, gboolean x)</div><div class='del'>-{</div><div class='del'>-	if (x)</div><div class='del'>-		gtk_widget_show (w);</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_hide (w);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_refresh (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	gchar *str;</div><div class='del'>-	gboolean have_name, have_email;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-</div><div class='del'>-	have_name = addr-&gt;name &amp;&amp; *addr-&gt;name;</div><div class='del'>-	have_email = addr-&gt;email &amp;&amp; *addr-&gt;email &amp;&amp; (addr-&gt;card == NULL || !addr-&gt;known_email);</div><div class='del'>-</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (addr-&gt;name_widget), have_name ? addr-&gt;name : "");</div><div class='del'>-	gtk_widget_visible (addr-&gt;name_widget, have_name);</div><div class='del'>-	if (addr-&gt;card) {</div><div class='del'>-		gint i, N = strlen (addr-&gt;name);</div><div class='del'>-		gchar *pattern = g_malloc (N+1);</div><div class='del'>-		for (i=0; i&lt;N; ++i)</div><div class='del'>-			pattern[i] = '_';</div><div class='del'>-		pattern[i] = '\0';</div><div class='del'>-		gtk_label_set_pattern (GTK_LABEL (addr-&gt;name_widget), pattern);</div><div class='del'>-		g_free (pattern);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_label_set_pattern (GTK_LABEL (addr-&gt;name_widget), "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (have_email) {</div><div class='del'>-		str = g_strdup_printf (have_name ? "&lt;%s&gt;" : "%s", addr-&gt;email);</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (addr-&gt;email_widget), str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (addr-&gt;email_widget), "");</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_visible (addr-&gt;email_widget, have_email);</div><div class='del'>-</div><div class='del'>-	gtk_widget_visible (addr-&gt;spacer, have_name &amp;&amp; have_email);</div><div class='del'>-</div><div class='del'>-	/* Launch a query to find the appropriate card, if necessary. */</div><div class='del'>-	if (addr-&gt;card == NULL) </div><div class='del'>-		e_address_widget_schedule_query (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_widget_set_name (EAddressWidget *addr, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-</div><div class='del'>-	g_free (addr-&gt;name);</div><div class='del'>-	addr-&gt;name = g_strdup (name);</div><div class='del'>-</div><div class='del'>-	e_address_widget_refresh (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_widget_set_email (EAddressWidget *addr, const gchar *email)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-</div><div class='del'>-	g_free (addr-&gt;email);</div><div class='del'>-	addr-&gt;email = g_strdup (email);</div><div class='del'>-</div><div class='del'>-	e_address_widget_refresh (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_widget_set_text (EAddressWidget *addr, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-	</div><div class='del'>-	e_address_widget_set_email (addr, text); /* CRAP */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_widget_construct (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *box;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-</div><div class='del'>-	box = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	</div><div class='del'>-	addr-&gt;name_widget = gtk_label_new ("");</div><div class='del'>-	addr-&gt;spacer = gtk_label_new (" ");</div><div class='del'>-	addr-&gt;email_widget = gtk_label_new ("");</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), addr-&gt;name_widget, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), addr-&gt;spacer, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), addr-&gt;email_widget, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (addr), box);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (box);</div><div class='del'>-	gtk_widget_show (addr-&gt;name_widget);</div><div class='del'>-	gtk_widget_show (addr-&gt;email_widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_address_widget_new (void)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = gtk_type_new (e_address_widget_get_type ());</div><div class='del'>-	e_address_widget_construct (addr);</div><div class='del'>-	return GTK_WIDGET (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Cardification</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_cardify (EAddressWidget *addr, ECard *card, gboolean known_email)</div><div class='del'>-{</div><div class='del'>-	if (addr-&gt;card != card || addr-&gt;known_email != known_email) {</div><div class='del'>-</div><div class='del'>-		if (addr-&gt;card != card) {</div><div class='del'>-			if (addr-&gt;card)</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (addr-&gt;card));</div><div class='del'>-			addr-&gt;card = card;</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (addr-&gt;card));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addr-&gt;known_email = known_email;</div><div class='del'>-</div><div class='del'>-		if (!(addr-&gt;name &amp;&amp; *addr-&gt;name)) {</div><div class='del'>-			gchar *s = e_card_name_to_string (card-&gt;name);</div><div class='del'>-			e_address_widget_set_name (addr, s);</div><div class='del'>-			g_free (s);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_address_widget_refresh (addr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-query_results_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = user_data;</div><div class='del'>-</div><div class='del'>-	if (g_list_length ((GList *) cards) == 1) {</div><div class='del'>-		ECard *card = E_CARD (cards-&gt;data);</div><div class='del'>-		e_address_widget_cardify (addr, card, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr-&gt;query_tag = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_do_query (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	e_book_name_and_email_query (common_book, addr-&gt;name, addr-&gt;email, query_results_cb, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_ready_cb (EBook *book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	if (common_book == NULL) {</div><div class='del'>-		common_book = book;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (common_book));</div><div class='del'>-	} else</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-</div><div class='del'>-	e_address_widget_do_query (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-query_idle_fn (gpointer ptr)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (ptr);</div><div class='del'>-</div><div class='del'>-	if (common_book) {</div><div class='del'>-		e_address_widget_do_query (addr);</div><div class='del'>-	} else {</div><div class='del'>-		e_book_load_local_address_book (e_book_new (), book_ready_cb, addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	addr-&gt;query_idle_tag = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_schedule_query (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	if (addr-&gt;query_idle_tag || !doing_queries)</div><div class='del'>-		return;</div><div class='del'>-	addr-&gt;query_idle_tag = gtk_idle_add (query_idle_fn, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Popup Menu</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define ARBITRARY_UIINFO_LIMIT 64</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-popup_add_name_and_address (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)</div><div class='del'>-{</div><div class='del'>-	gboolean flag = FALSE;</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;name &amp;&amp; *addr-&gt;name) {</div><div class='del'>-		uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-		uiinfo[i].label = addr-&gt;name;</div><div class='del'>-		++i;</div><div class='del'>-		flag = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (addr-&gt;email &amp;&amp; *addr-&gt;email) {</div><div class='del'>-		uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-		uiinfo[i].label = addr-&gt;email;</div><div class='del'>-		++i;</div><div class='del'>-		flag = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flag) {</div><div class='del'>-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-		++i;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-flip_queries_flag_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	doing_queries = !doing_queries;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-popup_add_query_change (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)</div><div class='del'>-{</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = doing_queries ? _("Disable Queries") : _("Enable Queries (Dangerous!)");</div><div class='del'>-	uiinfo[i].moreinfo = flip_queries_flag_cb;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-popup_menu_card (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-	gint i=0;</div><div class='del'>-	ECard *card = E_CARD (addr-&gt;card);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (card != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	memset (uiinfo, 0, sizeof (uiinfo));</div><div class='del'>-</div><div class='del'>-	i = popup_add_name_and_address (addr, uiinfo, i);</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = _("Edit Contact Info");</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	i = popup_add_query_change (addr, uiinfo, i);</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-	pop = gnome_popup_menu_new (uiinfo);</div><div class='del'>-	return pop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-post_quick_add_cb (ECard *card, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	e_address_widget_cardify (E_ADDRESS_WIDGET (user_data), card, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_contacts_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	e_contact_quick_add (addr-&gt;name, addr-&gt;email, post_quick_add_cb, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-popup_menu_nocard (EAddressWidget *addr)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-	gint i=0;</div><div class='del'>-</div><div class='del'>-	memset (uiinfo, 0, sizeof (uiinfo));</div><div class='del'>-</div><div class='del'>-	i = popup_add_name_and_address (addr, uiinfo, i);</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = _("Add to Contacts");</div><div class='del'>-	uiinfo[i].moreinfo = add_contacts_cb;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	i = popup_add_query_change (addr, uiinfo, i);</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-	pop = gnome_popup_menu_new (uiinfo);</div><div class='del'>-	return pop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_widget_popup (EAddressWidget *addr, GdkEventButton *ev)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (addr &amp;&amp; E_IS_ADDRESS_WIDGET (addr));</div><div class='del'>-</div><div class='del'>-	pop = addr-&gt;card ? popup_menu_card (addr) : popup_menu_nocard (addr);</div><div class='del'>-</div><div class='del'>-	if (pop)</div><div class='del'>-		gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Bonobo Control Magic</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ADDRESS_PROPERTY_NAME,</div><div class='del'>-	ADDRESS_PROPERTY_EMAIL,</div><div class='del'>-	ADDRESS_PROPERTY_TEXT,</div><div class='del'>-	ADDRESS_PROPERTY_BACKGROUND_RGB</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case ADDRESS_PROPERTY_NAME:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, addr-&gt;name ? addr-&gt;name :"");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ADDRESS_PROPERTY_EMAIL:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, addr-&gt;email ? addr-&gt;email : "");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ADDRESS_PROPERTY_TEXT:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, "?");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ADDRESS_PROPERTY_NAME:</div><div class='del'>-		e_address_widget_set_name (addr, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ADDRESS_PROPERTY_EMAIL:</div><div class='del'>-		e_address_widget_set_email (addr, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ADDRESS_PROPERTY_TEXT:</div><div class='del'>-		e_address_widget_set_text (addr, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-		</div><div class='del'>-	case ADDRESS_PROPERTY_BACKGROUND_RGB:</div><div class='del'>-		{</div><div class='del'>-			gint bg = BONOBO_ARG_GET_INT (arg);</div><div class='del'>-			GdkColor color;</div><div class='del'>-</div><div class='del'>-			color.red   = (bg &amp; 0xff0000) &gt;&gt; 8;</div><div class='del'>-			color.green = (bg &amp; 0x00ff00);</div><div class='del'>-			color.blue  = (bg &amp; 0x0000ff) &lt;&lt; 8;</div><div class='del'>-</div><div class='del'>-			if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (addr)), &amp;color, FALSE, TRUE)) {</div><div class='del'>-				GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (addr)));</div><div class='del'>-				style-&gt;bg[0] = color;</div><div class='del'>-				gtk_widget_set_style (GTK_WIDGET (addr), style);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboControl *</div><div class='del'>-e_address_widget_factory_new_control (void)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	BonoboPropertyBag *bag;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	w = e_address_widget_new ();</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (w);</div><div class='del'>-</div><div class='del'>-	bag = bonobo_property_bag_new (get_prop, set_prop, w);</div><div class='del'>-	bonobo_property_bag_add (bag, "name", ADDRESS_PROPERTY_NAME,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (bag, "email", ADDRESS_PROPERTY_EMAIL,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (bag, "text", ADDRESS_PROPERTY_TEXT,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (bag, "background_rgb", ADDRESS_PROPERTY_BACKGROUND_RGB,</div><div class='del'>-				 BONOBO_ARG_INT, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, bag);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (bag));</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-e_address_widget_factory (BonoboGenericFactory *factory, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (e_address_widget_factory_new_control ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_address_widget_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory",</div><div class='del'>-					      e_address_widget_factory, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register an AddressWidget factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h<br/>deleted file mode 100644<br/>index 535e51028c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-address-widget.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-address-widget.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-address-widget.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_ADDRESS_WIDGET_H__</div><div class='del'>-#define __E_ADDRESS_WIDGET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkeventbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_ADDRESS_WIDGET_TYPE        (e_address_widget_get_type ())</div><div class='del'>-#define E_ADDRESS_WIDGET(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_WIDGET_TYPE, EAddressWidget))</div><div class='del'>-#define E_ADDRESS_WIDGET_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_WIDGET_TYPE, EAddressWidgetClass))</div><div class='del'>-#define E_IS_ADDRESS_WIDGET(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_WIDGET_TYPE))</div><div class='del'>-#define E_IS_ADDRESS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_WIDGET_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressWidget EAddressWidget;</div><div class='del'>-typedef struct _EAddressWidgetClass EAddressWidgetClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressWidget {</div><div class='del'>-	GtkEventBox parent;</div><div class='del'>-	</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *email;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *name_widget;</div><div class='del'>-	GtkWidget *email_widget;</div><div class='del'>-	GtkWidget *spacer;</div><div class='del'>-</div><div class='del'>-	guint query_idle_tag;</div><div class='del'>-	guint query_tag;</div><div class='del'>-</div><div class='del'>-	ECard *card;</div><div class='del'>-	gboolean known_email;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressWidgetClass {</div><div class='del'>-	GtkEventBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_address_widget_get_type (void);</div><div class='del'>-</div><div class='del'>-void e_address_widget_set_name  (EAddressWidget *, const gchar *name);</div><div class='del'>-void e_address_widget_set_email (EAddressWidget *, const gchar *email);</div><div class='del'>-void e_address_widget_set_text  (EAddressWidget *, const gchar *text);</div><div class='del'>-</div><div class='del'>-void e_address_widget_construct (EAddressWidget *);</div><div class='del'>-GtkWidget *e_address_widget_new (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void e_address_widget_factory_init (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESS_WIDGET_H__ */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c<br/>deleted file mode 100644<br/>index 5d9b053934..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-cardlist-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,229 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-#include "e-cardlist-model.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_table_model_get_type()</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_destroy(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *model = E_CARDLIST_MODEL(object);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; model-&gt;data_count; i++ ) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-	}</div><div class='del'>-	g_free(model-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_cardlist_model_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return E_CARD_SIMPLE_FIELD_LAST;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of rows in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_cardlist_model_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);</div><div class='del'>-	return e_cardlist_model-&gt;data_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the value at a particular point in our ETableModel. */</div><div class='del'>-static void *</div><div class='del'>-e_cardlist_model_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);</div><div class='del'>-	const char *value;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= e_cardlist_model-&gt;data_count )</div><div class='del'>-		return NULL;</div><div class='del'>-	value = e_card_simple_get_const(e_cardlist_model-&gt;data[row], </div><div class='del'>-					col + 1);</div><div class='del'>-	return (void *)(value ? value : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);</div><div class='del'>-	ECard *card;</div><div class='del'>-	if ( col &gt;= E_CARD_SIMPLE_FIELD_LAST - 1|| row &gt;= e_cardlist_model-&gt;data_count )</div><div class='del'>-		return;</div><div class='del'>-	e_table_model_pre_change(etc);</div><div class='del'>-	e_card_simple_set(e_cardlist_model-&gt;data[row],</div><div class='del'>-			  col + 1,</div><div class='del'>-			  val);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(e_cardlist_model-&gt;data[row]),</div><div class='del'>-		       "card", &amp;card,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	e_table_model_cell_changed(etc, col, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns whether a particular cell is editable. */</div><div class='del'>-static gboolean</div><div class='del'>-e_cardlist_model_is_cell_editable (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-e_cardlist_model_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-e_cardlist_model_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_cardlist_model_add(ECardlistModel *model,</div><div class='del'>-		     ECard **cards,</div><div class='del'>-		     int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	model-&gt;data = g_realloc(model-&gt;data, model-&gt;data_count + count * sizeof(ECard *));</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		gboolean found = FALSE;</div><div class='del'>-		const gchar *id = e_card_get_id(cards[i]);</div><div class='del'>-		for ( i = 0; i &lt; model-&gt;data_count; i++) {</div><div class='del'>-			if ( !strcmp(e_card_simple_get_id(model-&gt;data[i]), id) ) {</div><div class='del'>-				found = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!found) {</div><div class='del'>-			e_table_model_pre_change(E_TABLE_MODEL(model));</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(cards[i]));</div><div class='del'>-			model-&gt;data[model-&gt;data_count++] = e_card_simple_new (cards[i]);</div><div class='del'>-			e_table_model_row_inserted(E_TABLE_MODEL(model), model-&gt;data_count - 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_cardlist_model_remove(ECardlistModel *model,</div><div class='del'>-			const char *id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for ( i = 0; i &lt; model-&gt;data_count; i++) {</div><div class='del'>-		if ( !strcmp(e_card_simple_get_id(model-&gt;data[i]), id) ) {</div><div class='del'>-			e_table_model_pre_change(E_TABLE_MODEL(model));</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-			memmove(model-&gt;data + i, model-&gt;data + i + 1, (model-&gt;data_count - i - 1) * sizeof (ECard *));</div><div class='del'>-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	ETableModelClass *model_class = (ETableModelClass *) object_class;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = e_cardlist_model_destroy;</div><div class='del'>-</div><div class='del'>-	model_class-&gt;column_count = e_cardlist_model_col_count;</div><div class='del'>-	model_class-&gt;row_count = e_cardlist_model_row_count;</div><div class='del'>-	model_class-&gt;value_at = e_cardlist_model_value_at;</div><div class='del'>-	model_class-&gt;set_value_at = e_cardlist_model_set_value_at;</div><div class='del'>-	model_class-&gt;is_cell_editable = e_cardlist_model_is_cell_editable;</div><div class='del'>-	model_class-&gt;duplicate_value = e_cardlist_model_duplicate_value;</div><div class='del'>-	model_class-&gt;free_value = e_cardlist_model_free_value;</div><div class='del'>-	model_class-&gt;initialize_value = e_cardlist_model_initialize_value;</div><div class='del'>-	model_class-&gt;value_is_empty = e_cardlist_model_value_is_empty;</div><div class='del'>-	model_class-&gt;value_to_string = e_cardlist_model_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *model = E_CARDLIST_MODEL(object);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_cardlist_model_get(ECardlistModel *model,</div><div class='del'>-		     int                row)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;data &amp;&amp; row &lt; model-&gt;data_count) {</div><div class='del'>-		ECard *card;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(model-&gt;data[row]),</div><div class='del'>-			       "card", &amp;card,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-		return card;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_cardlist_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"ECardlistModel",</div><div class='del'>-			sizeof (ECardlistModel),</div><div class='del'>-			sizeof (ECardlistModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_cardlist_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_cardlist_model_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableModel *</div><div class='del'>-e_cardlist_model_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_cardlist_model_get_type ());</div><div class='del'>-	</div><div class='del'>-	return E_TABLE_MODEL(et);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h<br/>deleted file mode 100644<br/>index 0b9a7a2265..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/e-cardlist-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_CARDLIST_MODEL_H_</div><div class='del'>-#define _E_CARDLIST_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;ebook/e-book-view.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())</div><div class='del'>-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))</div><div class='del'>-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))</div><div class='del'>-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))</div><div class='del'>-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardSimple **data;</div><div class='del'>-	int data_count;</div><div class='del'>-} ECardlistModel;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-} ECardlistModelClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_cardlist_model_get_type (void);</div><div class='del'>-ETableModel *e_cardlist_model_new (void);</div><div class='del'>-</div><div class='del'>-/* Returns object with an extra ref count. */</div><div class='del'>-ECard *e_cardlist_model_get  (ECardlistModel  *model,</div><div class='del'>-			      int              row);</div><div class='del'>-void e_cardlist_model_add    (ECardlistModel  *model,</div><div class='del'>-			      ECard          **card,</div><div class='del'>-			      int              count);</div><div class='del'>-void e_cardlist_model_remove (ECardlistModel  *model,</div><div class='del'>-			      const char      *id);</div><div class='del'>-</div><div class='del'>-#endif /* _E_CARDLIST_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade<br/>deleted file mode 100644<br/>index 868cdb40f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/ldap-config.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/ldap-config.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5819 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;addressbook-config-mockup&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;addressbook-config-mockup&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;../../../art&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;Add/Edit Attribute Mappings--Simple Version&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Add (or Edit) Attribute Mappings&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;True&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox4&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area4&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button37&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button39&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox30&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox66&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap35&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;ldap.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label283&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Please select and Evolution attribute and an</div><div class='del'>-LDAP attribute to associate with it.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hseparator8&lt;/name&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table18&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label284&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Evolution attribute:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;default_focus_target&gt;combo-entry2&lt;/default_focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label285&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_LDAP attribute:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;default_focus_target&gt;combo-entry3&lt;/default_focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;combo4&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;combo-entry2&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;combo5&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;combo-entry3&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;Add/Edit Attribute Mappings-- Multiple Selection Version&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Add (or Edit) Attribute Mappings&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;default_width&gt;393&lt;/default_width&gt;</div><div class='del'>-  &lt;default_height&gt;324&lt;/default_height&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox31&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox9&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button40&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button41&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox32&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox67&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap36&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;ldap.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label286&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Please select and Evolution attribute and an</div><div class='del'>-LDAP attribute to associate with it.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hseparator9&lt;/name&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table19&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label287&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Evolution attribute:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;default_focus_target&gt;entry32&lt;/default_focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;combo6&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;entry32&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label288&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_LDAP attributes:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;7.45058e-09&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow6&lt;/name&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;clist4&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;column_widths&gt;163,80&lt;/column_widths&gt;</div><div class='del'>-	    &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	    &lt;show_titles&gt;True&lt;/show_titles&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label289&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Attribute&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label290&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Select&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;account-editor-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;account-editor&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;vbox37&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;account-editor-notebook&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-general-vbox&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox100&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label431&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Display name:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment45&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0.9&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;account-editor-display-name-entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator12&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label331&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-connecting-vbox&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label334&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Connecting&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-searching-vbox&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label344&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Searching&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-objectclasses-vbox&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;account-editor-objectclasses-label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Objectclasses&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-mappings-vbox&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;account-editor-mappings-label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Mappings&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-dn-customization-vbox&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;account-editor-dn-customization-label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;DN Customization&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hseparator10&lt;/name&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox120&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;account-editor-advanced-button-notebook&lt;/name&gt;</div><div class='del'>-	&lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	&lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	&lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	&lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	&lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	&lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	&lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbuttonbox21&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;account-editor-fewer-options-button&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;&amp;lt;&amp;lt; Fewer Options&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label554&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label554&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbuttonbox28&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;account-editor-more-options-button&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_More Options &amp;gt;&amp;gt;&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label555&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label555&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbuttonbox20&lt;/name&gt;</div><div class='del'>-	&lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	&lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	&lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	&lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-editor-ok-button&lt;/name&gt;</div><div class='del'>-	  &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-editor-apply-button&lt;/name&gt;</div><div class='del'>-	  &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-editor-close-button&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_CLOSE&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;account-druid-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;account-druid&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GnomeDruid&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;account-druid&lt;/name&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageStart&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;druidpagestart1&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;LDAP Configuration Assistant&lt;/title&gt;</div><div class='del'>-      &lt;text&gt;This assistant will help you to access online directory services</div><div class='del'>-using LDAP (Lightweight Directory Access Protocol) servers. </div><div class='del'>-</div><div class='del'>-Adding a new LDAP server requires some specialized information</div><div class='del'>-about the server. Please contact your system administrator if you </div><div class='del'>-need help finding this information.&lt;/text&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;text_color&gt;0,0,0&lt;/text_color&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-      &lt;textbox_color&gt;255,255,255&lt;/textbox_color&gt;</div><div class='del'>-      &lt;logo_image&gt;ldap.png&lt;/logo_image&gt;</div><div class='del'>-      &lt;watermark_image&gt;xstdruidbg-3.png&lt;/watermark_image&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageStandard&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;add-server-druid-info-page&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;Step 1: Server Information&lt;/title&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;GnomeDruidPageStandard:vbox&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;druid-vbox1&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-druid-general-vbox&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label158&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;The first step in configuring an LDAP server is to provide its name, and your log in</div><div class='del'>-information. Please ask your system administrator if you are unsure of this information.&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hseparator2&lt;/name&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageStandard&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;add-server-druid-connecting-page&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;Step 2: Connecting to Server&lt;/title&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;GnomeDruidPageStandard:vbox&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;druid-vbox2&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-druid-connecting-vbox&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label174&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Now, you must specify how you want to connect to the LDAP server. The SSL (Secure Sockets Layer)</div><div class='del'>-and TLS (Transport Layer Security) protocols are used by some servers to cryptographically protect</div><div class='del'>-your connection. Ask your system administrator if your LDAP server uses these protocols.&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hseparator3&lt;/name&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageStandard&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;add-server-druid-searching-page&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;Step 3: Searching the Directory&lt;/title&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;GnomeDruidPageStandard:vbox&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;vbox23&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;account-druid-searching-vbox&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label254&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;The options on this page control how many entries should be included in your</div><div class='del'>-searches, and how long a search should take. Ask your system administrator if you</div><div class='del'>-need to change these options.&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hseparator7&lt;/name&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageStandard&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;add-server-druid-display-name-page&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;Step 4: Display Name&lt;/title&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;GnomeDruidPageStandard:vbox&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;druid-vbox5&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox21&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label198&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Specifying a display name is the last required step in configuring an LDAP server.&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hseparator5&lt;/name&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table15&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;druid-display-name-entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label199&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;_Display name:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;default_focus_target&gt;druid-display-name-entry&lt;/default_focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;notebook15&lt;/name&gt;</div><div class='del'>-	    &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	    &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	    &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	    &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	    &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	    &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	    &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox41&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;pixmap21&lt;/name&gt;</div><div class='del'>-		&lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label207&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;This is the name for this server that will appear in your Evolution folder list.</div><div class='del'>-It is for display purposes only. &lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label208&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox42&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;pixmap22&lt;/name&gt;</div><div class='del'>-		&lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label215&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Selecting this option will let you change Evolution's default settings for LDAP</div><div class='del'>-searches, and for creating and editting contacts. &lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label210&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GnomeDruidPageFinish&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;add-server-druid-finish-page&lt;/name&gt;</div><div class='del'>-      &lt;title&gt;Finished&lt;/title&gt;</div><div class='del'>-      &lt;text&gt;Congratulations, you are finished setting up this LDAP server. You</div><div class='del'>-are now ready to access this directory.</div><div class='del'>-</div><div class='del'>-Please click the &amp;quot;Finish&amp;quot; button to save the settings you have entered here.&lt;/text&gt;</div><div class='del'>-      &lt;background_color&gt;0,0,0&lt;/background_color&gt;</div><div class='del'>-      &lt;logo_background_color&gt;0,0,0&lt;/logo_background_color&gt;</div><div class='del'>-      &lt;textbox_color&gt;255,255,255&lt;/textbox_color&gt;</div><div class='del'>-      &lt;text_color&gt;0,0,0&lt;/text_color&gt;</div><div class='del'>-      &lt;title_color&gt;255,255,255&lt;/title_color&gt;</div><div class='del'>-      &lt;watermark_image&gt;xstdruidbg-3.png&lt;/watermark_image&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;edit_server_window_simple&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;edit_server_window_simple&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;vbox67&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;notebook25&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox68&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox121&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label484&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Display name:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment52&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0.9&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;entry54&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator13&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table32&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;rows&gt;3&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label485&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Server name:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;entry55&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label486&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Log in method:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label487&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Distinguished _name:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;entry56&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;entry55&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment53&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;optionmenu18&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;items&gt;Anonymously</div><div class='del'>-Using email address</div><div class='del'>-Using distinguished name (DN)</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	      &lt;initial_choice&gt;2&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;entry56&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;notebook26&lt;/name&gt;</div><div class='del'>-	  &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	  &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	  &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	  &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	  &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	  &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	  &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox122&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap66&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label488&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This is the full name of your ldap server. For example, &amp;quot;ldap.mycompany.com&amp;quot;.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label489&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox123&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap67&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label490&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label168&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label491&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox124&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap68&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label492&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;label169&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label493&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label165&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label494&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label214&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox125&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap69&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label495&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This is the name for this server that will appear in your Evolution folder list.</div><div class='del'>-It is for display purposes only. &lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label496&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label452&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label497&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox69&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table33&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label498&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Port number:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment54&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox70&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;radiobutton9&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Always&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;radiobutton10&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_If necessary &lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;radiobutton11&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Don't use SSL/TLS&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment55&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkPixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap70&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;build_insensitive&gt;True&lt;/build_insensitive&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment56&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;combo8&lt;/name&gt;</div><div class='del'>-	      &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	      &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	      &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	      &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	      &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	      &lt;items&gt;380</div><div class='del'>-666</div><div class='del'>-1234</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		&lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-		&lt;name&gt;entry57&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-		&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		&lt;text&gt;380&lt;/text&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label499&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;U_se SSL/TLS:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;7.45058e-09&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;notebook27&lt;/name&gt;</div><div class='del'>-	  &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	  &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	  &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	  &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	  &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	  &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	  &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox126&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap71&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label500&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This is the port on the LDAP server that Evolution will try to connect to. A </div><div class='del'>-list of standard ports has been provided. Ask your system administrator</div><div class='del'>-what port you should specify.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label501&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox127&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap72&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label502&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Selecting this option means that Evolution will only connect to your LDAP server if</div><div class='del'>-your LDAP server supports SSL or TLS.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label503&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label398&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox128&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap73&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label504&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Selecting this option means that Evolution will only try to use SSL/TLS if you are in a </div><div class='del'>-insecure environment. For example, if you and your LDAP server are behind a firewall</div><div class='del'>-at work, then Evolution doesn't need to use SSL/TLS because your connection is already</div><div class='del'>-secure.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label505&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label396&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox129&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap74&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label506&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Selecting this option means that your server does not support either SSL or TLS.  This </div><div class='del'>-means that your connection will be insecure, and that you will be vulnerable to security</div><div class='del'>-exploits. &lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label507&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label397&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label508&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Connecting&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox71&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table34&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label509&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Search base:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label510&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;S_earch scope: &lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment57&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;7.45058e-09&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;optionmenu19&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;items&gt;Sub</div><div class='del'>-One</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	      &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox130&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;entry58&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;button90&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;  S_how Supported Bases &lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label511&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Timeout (minutes):&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment58&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox131&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label512&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;1:00&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHScale&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hscale5&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;draw_value&gt;False&lt;/draw_value&gt;</div><div class='del'>-		&lt;value_pos&gt;GTK_POS_LEFT&lt;/value_pos&gt;</div><div class='del'>-		&lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		&lt;policy&gt;GTK_UPDATE_DELAYED&lt;/policy&gt;</div><div class='del'>-		&lt;value&gt;3&lt;/value&gt;</div><div class='del'>-		&lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-		&lt;upper&gt;5&lt;/upper&gt;</div><div class='del'>-		&lt;step&gt;0.5&lt;/step&gt;</div><div class='del'>-		&lt;page&gt;1&lt;/page&gt;</div><div class='del'>-		&lt;page_size&gt;0&lt;/page_size&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label513&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;5:00&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label514&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Selected:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label515&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;2:30&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label516&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Download limit:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment59&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox132&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;spinbutton5&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		&lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		&lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-		&lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		&lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;value&gt;100&lt;/value&gt;</div><div class='del'>-		&lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-		&lt;upper&gt;10000&lt;/upper&gt;</div><div class='del'>-		&lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		&lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		&lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label517&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;cards&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;notebook28&lt;/name&gt;</div><div class='del'>-	  &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	  &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	  &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	  &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	  &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	  &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	  &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox133&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap75&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label518&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;The search base is the distinguished name (DN)  of the entry where your searches will </div><div class='del'>-begin. If you leave this blank, the search will begin at the root of the directory tree.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label519&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox134&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap76&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label520&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;The search scope defines how deep you would like the search to extend down the </div><div class='del'>-directory tree. A search scope of &amp;quot;sub&amp;quot; will include all entries below your search base.</div><div class='del'>-A search scope of &amp;quot;one&amp;quot; will only include the entries one level beneath your base.</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label521&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox135&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap77&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label522&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This option controls how long a search will be run.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label523&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label165&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox136&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;pixmap78&lt;/name&gt;</div><div class='del'>-	      &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label524&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This is the maximum number of entries to download. Setting this number to be </div><div class='del'>-too large will slow down your addressbook.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label525&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;label166&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label526&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Searching&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hseparator14&lt;/name&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox142&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbuttonbox25&lt;/name&gt;</div><div class='del'>-	&lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	&lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	&lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	&lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button100&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_More Options &amp;gt;&amp;gt;&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbuttonbox26&lt;/name&gt;</div><div class='del'>-	&lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	&lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	&lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	&lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button101&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button102&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button103&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;stock_button&gt;GNOME_STOCK_BUTTON_CLOSE&lt;/stock_button&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;addressbook-sources-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Addressbook Sources&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;default_width&gt;355&lt;/default_width&gt;</div><div class='del'>-  &lt;default_height&gt;285&lt;/default_height&gt;</div><div class='del'>-  &lt;allow_shrink&gt;True&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;addressbook-sources-vbox&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox27&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button104&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button105&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button106&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CLOSE&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;addressbook-sources&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;sourcesTable&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;addressbook_dialog_create_sources_table&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Thu, 11 Apr 2002 00:31:02 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox73&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label529&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbuttonbox18&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;addSource&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;editSource&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Edit&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;deleteSource&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;De_lete&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;general-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;general-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;general-tab&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table36&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;3&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label534&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Server name:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;default_focus_target&gt;server-name-entry&lt;/default_focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label535&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Log in method:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;server-name-entry&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment63&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;auth-optionmenu&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;items&gt;Anonymously</div><div class='del'>-Using email address</div><div class='del'>-Using distinguished name (DN)</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;auth-label-notebook&lt;/name&gt;</div><div class='del'>-	&lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	&lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	&lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	&lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	&lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	&lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	&lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	&lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label553&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Email Address:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label546&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label546&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label536&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Distinguished _name:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label547&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label547&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;auth-entry-notebook&lt;/name&gt;</div><div class='del'>-	&lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	&lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-	&lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-	&lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	&lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	&lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	&lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	&lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;email-entry&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label549&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label549&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dn-entry&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label550&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;label550&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;general-tab-help&lt;/name&gt;</div><div class='del'>-      &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox145&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap79&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label537&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;This is the full name of your ldap server. For example, &amp;quot;ldap.mycompany.com&amp;quot;.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label538&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox146&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap80&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label539&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Evolution will use this email address to authenticate you with the server&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label540&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox147&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap81&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label541&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Evolution will use this DN to authenticate you with the server&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label542&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label165&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label552&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;This is the method evolution will use to authenticate you.  Note that setting this to &amp;quot;Email Address&amp;quot; requires anonymous access to your ldap server.&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;True&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label551&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label551&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox148&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap82&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label544&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;This is the name for this server that will appear in your Evolution folder list.</div><div class='del'>-It is for display purposes only. &lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label545&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label452&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;connecting-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;connecting-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;connecting-tab&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table14&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label175&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Port number:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment23&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkPixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap11&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;build_insensitive&gt;True&lt;/build_insensitive&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment21&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;port-combo&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;389</div><div class='del'>-636</div><div class='del'>-3268</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;entry27&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;389&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label176&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;U_se SSL/TLS:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment60&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;ssl-optionmenu&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;items&gt;Always</div><div class='del'>-Whenever Possible</div><div class='del'>-Never</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	  &lt;initial_choice&gt;1&lt;/initial_choice&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;connecting-tab-help&lt;/name&gt;</div><div class='del'>-      &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox30&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap7&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label178&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;This is the port on the LDAP server that Evolution will try to connect to. A </div><div class='del'>-list of standard ports has been provided. Ask your system administrator</div><div class='del'>-what port you should specify.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label179&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox31&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap8&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label395&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Selecting this option means that Evolution will only connect to your LDAP server if</div><div class='del'>-your LDAP server supports SSL or TLS.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label398&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label398&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox91&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap43&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label399&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Selecting this option means that Evolution will only try to use SSL/TLS if you are in a </div><div class='del'>-insecure environment. For example, if you and your LDAP server are behind a firewall</div><div class='del'>-at work, then Evolution doesn't need to use SSL/TLS because your connection is already</div><div class='del'>-secure.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label396&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label396&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox92&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap44&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label400&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Selecting this option means that your server does not support either SSL or TLS.  This </div><div class='del'>-means that your connection will be insecure, and that you will be vulnerable to security</div><div class='del'>-exploits. &lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label397&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label397&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;searching-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;searching-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;searching-tab&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table30&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label455&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Search base:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label456&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;S_earch scope: &lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment49&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;7.45058e-09&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scope-optionmenu&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;items&gt;One</div><div class='del'>-Sub</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox109&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;rootdn-entry&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;rootdn-button&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;  S_how Supported Bases &lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label457&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Timeout (minutes):&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment50&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox110&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label458&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;1:00&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHScale&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;timeout-scale&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;draw_value&gt;False&lt;/draw_value&gt;</div><div class='del'>-	    &lt;value_pos&gt;GTK_POS_LEFT&lt;/value_pos&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;policy&gt;GTK_UPDATE_DELAYED&lt;/policy&gt;</div><div class='del'>-	    &lt;value&gt;3&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;5&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;0.5&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;1&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;0&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label459&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;5:00&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label460&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Selected:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label461&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;2:30&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label462&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Download limit:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment51&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox111&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;download-limit-spinbutton&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;100&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;10000&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label463&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;cards&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;searching-tab-help&lt;/name&gt;</div><div class='del'>-      &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox112&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap60&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label464&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;The search base is the distinguished name (DN)  of the entry where your searches will </div><div class='del'>-begin. If you leave this blank, the search will begin at the root of the directory tree.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label465&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox113&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap61&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label466&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;The search scope defines how deep you would like the search to extend down the </div><div class='del'>-directory tree. A search scope of &amp;quot;sub&amp;quot; will include all entries below your search base.</div><div class='del'>-A search scope of &amp;quot;one&amp;quot; will only include the entries one level beneath your base.</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label467&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox114&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap62&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label468&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;This option controls how long a search will be run.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label469&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label165&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox115&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap63&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label470&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;This is the maximum number of entries to download. Setting this number to be </div><div class='del'>-too large will slow down your addressbook.&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label471&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label166&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;objectclasses-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;objectclasses-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;objectclasses-tab&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox93&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox51&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label405&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Objectclasses Used on Server:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;objectclasses-server-table&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;objectclasses_create_server_table&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 16 Apr 2002 17:09:21 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox52&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label407&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbuttonbox15&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;1&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;47&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;objectclasses-add-button&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Add -&amp;gt;&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;objectclasses-remove-button&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;&amp;lt;- _Remove&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox53&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label408&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Objectclasses Used in Evolution:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;objectclasses-evolution-table&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;objectclasses_create_evolution_table&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 16 Apr 2002 17:09:43 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox16&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;87&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;objectclasses-default-button&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;R_estore Defaults&lt;/label&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;mappings-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;mappings-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;mappings-tab&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox94&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox55&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow21&lt;/name&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;clist18&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;column_widths&gt;146,80&lt;/column_widths&gt;</div><div class='del'>-	    &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	    &lt;show_titles&gt;True&lt;/show_titles&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label411&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Evolution Attribute&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	      &lt;name&gt;label412&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Associated LDAP Attribute&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox56&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label413&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbuttonbox16&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button71&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Add Mapping&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button72&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Edit Mapping&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button73&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Delete Mapping&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox17&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;30&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button74&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Re_store Defaults&lt;/label&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dn-customization-tab-window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;dn-customization-tab&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;dn-customization-tab&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;notebook24&lt;/name&gt;</div><div class='del'>-      &lt;show_tabs&gt;False&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;False&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox116&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap64&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label473&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;To add an attribute to the DN, select it from the list and click the &amp;quot;Add Attribute&amp;quot; button.</div><div class='del'>-Any values that you add to the DN will become required values for any new contacts</div><div class='del'>-that you add to the directory on the LDAP server. &lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label474&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label163&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox117&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GnomePixmap&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;pixmap65&lt;/name&gt;</div><div class='del'>-	  &lt;filename&gt;gnome-hint.png&lt;/filename&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label475&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Selecting this option will let you change Evolution's default settings for LDAP</div><div class='del'>-searches, and for creating and editting contacts. &lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label476&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;label164&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table31&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox64&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label477&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbuttonbox17&lt;/name&gt;</div><div class='del'>-	  &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	  &lt;spacing&gt;10&lt;/spacing&gt;</div><div class='del'>-	  &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	  &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	  &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	  &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button78&lt;/name&gt;</div><div class='del'>-	    &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Add to DN&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;scrolledwindow22&lt;/name&gt;</div><div class='del'>-	&lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	&lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	&lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	&lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;clist19&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;column_widths&gt;152,80&lt;/column_widths&gt;</div><div class='del'>-	  &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	  &lt;show_titles&gt;True&lt;/show_titles&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label478&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;LDAP Attribute&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label479&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Corresponding Evolution Attribute&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox118&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label480&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Distinguished Name (DN):&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;default_focus_target&gt;entry53&lt;/default_focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry53&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbuttonbox18&lt;/name&gt;</div><div class='del'>-	&lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	&lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	&lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	&lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button79&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Restore Defaults&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;supported-bases-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Supported Search Bases&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;default_width&gt;300&lt;/default_width&gt;</div><div class='del'>-  &lt;default_height&gt;200&lt;/default_height&gt;</div><div class='del'>-  &lt;allow_shrink&gt;True&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox5&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area5&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button107&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button109&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;supported-bases-table&lt;/name&gt;</div><div class='del'>-      &lt;creation_function&gt;supported_bases_create_table&lt;/creation_function&gt;</div><div class='del'>-      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-      &lt;last_modification_time&gt;Fri, 12 Apr 2002 20:06:45 GMT&lt;/last_modification_time&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore<br/>deleted file mode 100644<br/>index cd669499fa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='del'>-GNOME_Evolution_Addressbook_SelectNames.oaf</div><div class='head'>diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl<br/>deleted file mode 100644<br/>index f25279bb38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the SelectNames dialog.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-module Addressbook {</div><div class='del'>-</div><div class='del'>-	interface SimpleCard : Bonobo::Unknown {</div><div class='del'>-		struct Arbitrary {</div><div class='del'>-			string key;</div><div class='del'>-			string type;</div><div class='del'>-			string value;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		enum Field {</div><div class='del'>-			FileAs,</div><div class='del'>-			FullName,</div><div class='del'>-			Email,</div><div class='del'>-			PhonePrimary,</div><div class='del'>-			PhoneAssistant,</div><div class='del'>-			PhoneBusiness,</div><div class='del'>-			PhoneCallback,</div><div class='del'>-			PhoneCompany,</div><div class='del'>-			PhoneHome,</div><div class='del'>-			Org,</div><div class='del'>-			AddressBusiness,</div><div class='del'>-			AddressHome,</div><div class='del'>-			PhoneMobile,</div><div class='del'>-			PhoneCar,</div><div class='del'>-			PhoneBusinessFax,</div><div class='del'>-			PhoneHomeFax,</div><div class='del'>-			PhoneBusiness2,</div><div class='del'>-			PhoneHome2,</div><div class='del'>-			PhoneIsdn,</div><div class='del'>-			PhoneOther,</div><div class='del'>-			PhoneOtherFax,</div><div class='del'>-			PhonePager,</div><div class='del'>-			PhoneRadio,</div><div class='del'>-			PhoneTelex,</div><div class='del'>-			PhoneTtytdd,</div><div class='del'>-			AddressOther,</div><div class='del'>-			Email2,</div><div class='del'>-			Email3,</div><div class='del'>-			Url,</div><div class='del'>-			OrgUnit,</div><div class='del'>-			Office,</div><div class='del'>-			Title,</div><div class='del'>-			Role,</div><div class='del'>-			Manager,</div><div class='del'>-			Assistant,</div><div class='del'>-			Nickname,</div><div class='del'>-			Spouse,</div><div class='del'>-			Note,</div><div class='del'>-			Caluri,</div><div class='del'>-			Fburl,</div><div class='del'>-			Anniversary,</div><div class='del'>-			BirthDate,</div><div class='del'>-			Mailer,</div><div class='del'>-			NameOrOrg,</div><div class='del'>-			Categories,</div><div class='del'>-			FamilyName,</div><div class='del'>-			GivenName,</div><div class='del'>-			AdditionalName,</div><div class='del'>-			NameSuffix,</div><div class='del'>-			WantsHtml,</div><div class='del'>-			IsList,</div><div class='del'>-			Last</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		Arbitrary getArbitrary (in string key);</div><div class='del'>-		void setArbitrary (in string key, in string type, in string value);</div><div class='del'>-</div><div class='del'>-		string get (in Field field);</div><div class='del'>-		void set (in Field field, in string value);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	typedef sequence&lt;SimpleCard&gt; SimpleCardList;</div><div class='del'>-</div><div class='del'>-	interface SelectNames : Bonobo::Unknown {</div><div class='del'>-		struct Section {</div><div class='del'>-			string id;</div><div class='del'>-			string title;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		typedef sequence&lt;Section&gt; SectionList;</div><div class='del'>-</div><div class='del'>-		exception DuplicateID {};</div><div class='del'>-		exception SectionNotFound {};</div><div class='del'>-</div><div class='del'>-		void addSection (in string id, in string title)</div><div class='del'>-			raises (DuplicateID);</div><div class='del'>-		void addSectionWithLimit (in string id, in string title, in short limit)</div><div class='del'>-			raises (DuplicateID);</div><div class='del'>-</div><div class='del'>-		Bonobo::Control getEntryBySection (in string section_id)</div><div class='del'>-			raises (SectionNotFound);</div><div class='del'>-</div><div class='del'>-		void activateDialog (in string section_id);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in<br/>deleted file mode 100644<br/>index 7f26e2aaed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-addressbook"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the Addressbook's name selection interface"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Evolution's addressbook name selection interface."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am<br/>deleted file mode 100644<br/>index 347af45f74..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-# CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED = \</div><div class='del'>-	Evolution-Addressbook-SelectNames.h		\</div><div class='del'>-	Evolution-Addressbook-SelectNames-common.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-skels.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-</div><div class='del'>-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\</div><div class='del'>-		$(srcdir)/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-</div><div class='del'>-oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text			\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-table			\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/minicard	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/widgets		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"	\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libeselectnames.la</div><div class='del'>-</div><div class='del'>-libeselectnames_la_SOURCES = 			\</div><div class='del'>-	$(IDL_GENERATED)			\</div><div class='del'>-	e-select-names-bonobo.c			\</div><div class='del'>-	e-select-names-bonobo.h			\</div><div class='del'>-	e-select-names-completion.c		\</div><div class='del'>-	e-select-names-completion.h		\</div><div class='del'>-	e-select-names-factory.c		\</div><div class='del'>-	e-select-names-factory.h		\</div><div class='del'>-	e-select-names-manager.c		\</div><div class='del'>-	e-select-names-manager.h		\</div><div class='del'>-	e-select-names-model.c			\</div><div class='del'>-	e-select-names-model.h			\</div><div class='del'>-	e-select-names-popup.c			\</div><div class='del'>-	e-select-names-popup.h			\</div><div class='del'>-	e-select-names-table-model.c		\</div><div class='del'>-	e-select-names-table-model.h		\</div><div class='del'>-	e-select-names-text-model.c		\</div><div class='del'>-	e-select-names-text-model.h		\</div><div class='del'>-	e-select-names.c			\</div><div class='del'>-	e-select-names.h			\</div><div class='del'>-	e-simple-card-bonobo.c			\</div><div class='del'>-	e-simple-card-bonobo.h</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = select-names.glade</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	$(oaf_in_files)		\</div><div class='del'>-	$(oaf_DATA)		\</div><div class='del'>-	$(IDLS)</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c<br/>deleted file mode 100644<br/>index a8d0975771..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-bonobo.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-bonobo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,502 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-bonobo.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-select-names-bonobo.h"</div><div class='del'>-#include "e-simple-card-bonobo.h"</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-</div><div class='del'>-#include "e-select-names-manager.h"</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-#include "e-select-names-completion.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE bonobo_object_get_type ()</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonoboPrivate {</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	BonoboEventSource *event_source;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _EntryPropertyID {</div><div class='del'>-	ENTRY_PROPERTY_ID_TEXT,</div><div class='del'>-	ENTRY_PROPERTY_ID_DESTINATIONS,</div><div class='del'>-	ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST,</div><div class='del'>-	ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,</div><div class='del'>-	ENTRY_PROPERTY_ID_ENTRY_CHANGED</div><div class='del'>-};</div><div class='del'>-typedef enum _EntryPropertyID EntryPropertyID;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PropertyBag implementation for the entry widgets.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_get_property_fn (BonoboPropertyBag *bag,</div><div class='del'>-		       BonoboArg *arg,</div><div class='del'>-		       unsigned int arg_id,</div><div class='del'>-		       CORBA_Environment *ev,</div><div class='del'>-		       void *user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	w = GTK_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ENTRY_PROPERTY_ID_TEXT:</div><div class='del'>-		{</div><div class='del'>-			ETextModel *text_model;</div><div class='del'>-			text_model = E_TEXT_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_text_model"));</div><div class='del'>-			g_assert (text_model != NULL);</div><div class='del'>-			</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, e_text_model_get_text (text_model));</div><div class='del'>-		break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_DESTINATIONS:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesModel *model;</div><div class='del'>-			char *text;</div><div class='del'>-</div><div class='del'>-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));</div><div class='del'>-			g_assert (model != NULL);</div><div class='del'>-</div><div class='del'>-			text = e_select_names_model_export_destinationv (model);</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, text);</div><div class='del'>-			g_free (text);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesModel *model;</div><div class='del'>-			int count;</div><div class='del'>-			int i;</div><div class='del'>-			GNOME_Evolution_Addressbook_SimpleCardList *card_list;</div><div class='del'>-</div><div class='del'>-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));</div><div class='del'>-			g_assert (model != NULL);</div><div class='del'>-</div><div class='del'>-			count = e_select_names_model_count (model);</div><div class='del'>-</div><div class='del'>-			card_list = GNOME_Evolution_Addressbook_SimpleCardList__alloc ();</div><div class='del'>-			card_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Addressbook_SimpleCard_allocbuf (count);</div><div class='del'>-			card_list-&gt;_maximum = count;</div><div class='del'>-			card_list-&gt;_length = count;</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; count; i++) {</div><div class='del'>-				const EDestination *destination = e_select_names_model_get_destination (model, i);</div><div class='del'>-				const ECard *card = e_destination_get_card (destination);</div><div class='del'>-				ECardSimple *simple = e_card_simple_new ((ECard *) card);</div><div class='del'>-				ESimpleCardBonobo *simple_card = e_simple_card_bonobo_new (simple);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-</div><div class='del'>-				card_list-&gt;_buffer[i] = bonobo_object_corba_objref (BONOBO_OBJECT (simple_card));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			CORBA_free (arg-&gt;_value);</div><div class='del'>-			BONOBO_ARG_SET_GENERAL (arg, card_list, TC_GNOME_Evolution_Addressbook_SimpleCardList, GNOME_Evolution_Addressbook_SimpleCardList *, NULL);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesCompletion *comp;</div><div class='del'>-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));</div><div class='del'>-			g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-			BONOBO_ARG_SET_BOOLEAN (arg, e_select_names_completion_get_match_contact_lists (comp));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:</div><div class='del'>-		/* This is a read-only property. */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_set_property_fn (BonoboPropertyBag *bag,</div><div class='del'>-		       const BonoboArg *arg,</div><div class='del'>-		       guint arg_id,</div><div class='del'>-		       CORBA_Environment *ev,</div><div class='del'>-		       gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	w = GTK_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_TEXT:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesModel *model;</div><div class='del'>-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));</div><div class='del'>-			g_assert (model != NULL);</div><div class='del'>-			</div><div class='del'>-			e_entry_set_text (E_ENTRY (w), BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-			e_select_names_model_cardify_all (model, NULL, 0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_DESTINATIONS:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesModel *model;</div><div class='del'>-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));</div><div class='del'>-			g_assert (model != NULL);</div><div class='del'>-</div><div class='del'>-			e_select_names_model_import_destinationv (model, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-			e_select_names_model_cardify_all (model, NULL, 0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:</div><div class='del'>-		{</div><div class='del'>-			ESelectNamesCompletion *comp;</div><div class='del'>-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));</div><div class='del'>-			g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-			e_select_names_completion_set_match_contact_lists (comp, BONOBO_ARG_GET_BOOLEAN (arg));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (w), "entry_property_id_changed", GUINT_TO_POINTER (1));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation.  */</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_SelectNames *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;SelectNames_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SelectNames_add_section (PortableServer_Servant servant,</div><div class='del'>-			      const CORBA_char *id,</div><div class='del'>-			      const CORBA_char *title,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_add_section (priv-&gt;manager, id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SelectNames_add_section_with_limit (PortableServer_Servant servant,</div><div class='del'>-					 const CORBA_char *id,</div><div class='del'>-					 const CORBA_char *title,</div><div class='del'>-					 CORBA_short limit,</div><div class='del'>-					 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_add_section_with_limit (priv-&gt;manager, id, title, limit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_changed (GtkWidget *widget, BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	gboolean changed = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (widget), "entry_property_id_changed"));</div><div class='del'>-</div><div class='del'>-	if (!changed)</div><div class='del'>-		bonobo_control_set_property (control, "entry_changed", TRUE, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-manager_changed_cb (ESelectNamesManager *manager, const gchar *section_id, gint changed_working_copy, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);</div><div class='del'>-	BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-	arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-	BONOBO_ARG_SET_STRING (arg, section_id);</div><div class='del'>-</div><div class='del'>-	bonobo_event_source_notify_listeners_full (select_names-&gt;priv-&gt;event_source,</div><div class='del'>-						   "GNOME/Evolution",</div><div class='del'>-						   "changed",</div><div class='del'>-						   changed_working_copy ? "working_copy" : "model",</div><div class='del'>-						   arg, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_arg_release (arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-manager_ok_cb (ESelectNamesManager *manager, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);</div><div class='del'>-	BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-	arg = bonobo_arg_new (BONOBO_ARG_NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_event_source_notify_listeners_full (select_names-&gt;priv-&gt;event_source,</div><div class='del'>-						   "GNOME/Evolution",</div><div class='del'>-						   "ok",</div><div class='del'>-						   "dialog",</div><div class='del'>-						   arg,</div><div class='del'>-						   NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_arg_release (arg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Control</div><div class='del'>-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,</div><div class='del'>-					const CORBA_char *section_id,</div><div class='del'>-					CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-	GtkWidget *entry_widget;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	BonoboPropertyBag *property_bag;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	entry_widget = e_select_names_manager_create_entry (priv-&gt;manager, section_id);</div><div class='del'>-	gtk_widget_show (entry_widget);</div><div class='del'>-	</div><div class='del'>-	if (entry_widget == NULL) {</div><div class='del'>-		CORBA_exception_set (ev,</div><div class='del'>-				     CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Addressbook_SelectNames_SectionNotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (entry_widget);</div><div class='del'>-</div><div class='del'>-	property_bag = bonobo_property_bag_new (entry_get_property_fn, entry_set_property_fn, entry_widget);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "text", ENTRY_PROPERTY_ID_TEXT,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "destinations", ENTRY_PROPERTY_ID_DESTINATIONS,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "simple_card_list", ENTRY_PROPERTY_ID_SIMPLE_CARD_LIST,</div><div class='del'>-				 TC_GNOME_Evolution_Addressbook_SimpleCardList, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "allow_contact_lists", ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,</div><div class='del'>-				 BONOBO_ARG_BOOLEAN, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "entry_changed", ENTRY_PROPERTY_ID_ENTRY_CHANGED,</div><div class='del'>-				 BONOBO_ARG_BOOLEAN, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, property_bag);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry_widget), "changed", GTK_SIGNAL_FUNC (entry_changed), control);</div><div class='del'>-</div><div class='del'>-	return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SelectNames_activate_dialog (PortableServer_Servant servant,</div><div class='del'>-				  const CORBA_char *section_id,</div><div class='del'>-				  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_activate_dialog (priv-&gt;manager, section_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;manager-&gt;names) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (priv-&gt;manager-&gt;names));</div><div class='del'>-		priv-&gt;manager-&gt;names = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;manager));</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init ()</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private    = NULL;</div><div class='del'>-	base_epv-&gt;finalize    = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_SelectNames__epv, 1);</div><div class='del'>-	epv-&gt;addSection          = impl_SelectNames_add_section;</div><div class='del'>-	epv-&gt;addSectionWithLimit = impl_SelectNames_add_section_with_limit;</div><div class='del'>-	epv-&gt;getEntryBySection   = impl_SelectNames_get_entry_for_section;</div><div class='del'>-	epv-&gt;activateDialog      = impl_SelectNames_activate_dialog;</div><div class='del'>-</div><div class='del'>-	vepv = &amp;SelectNames_vepv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv                    = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Addressbook_SelectNames_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (ESelectNamesBonoboClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = impl_destroy;</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (ESelectNamesBonobo *select_names)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ESelectNamesBonoboPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;manager = e_select_names_manager_new ();</div><div class='del'>-	priv-&gt;event_source = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;manager),</div><div class='del'>-			    "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (manager_changed_cb),</div><div class='del'>-			    select_names);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;manager),</div><div class='del'>-			    "ok",</div><div class='del'>-			    GTK_SIGNAL_FUNC (manager_ok_cb),</div><div class='del'>-			    select_names);</div><div class='del'>-</div><div class='del'>-	select_names-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,</div><div class='del'>-				 GNOME_Evolution_Addressbook_SelectNames corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (select_names != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (select_names), corba_object);</div><div class='del'>-</div><div class='del'>-	g_assert (select_names-&gt;priv-&gt;event_source == NULL);</div><div class='del'>-	select_names-&gt;priv-&gt;event_source = bonobo_event_source_new ();</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (select_names), BONOBO_OBJECT (select_names-&gt;priv-&gt;event_source));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesBonobo *</div><div class='del'>-e_select_names_bonobo_new (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	select_names = gtk_type_new (e_select_names_bonobo_get_type ());</div><div class='del'>-</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (select_names), servant);</div><div class='del'>-	e_select_names_bonobo_construct (select_names, corba_object);</div><div class='del'>-</div><div class='del'>-	return select_names;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_select_names_bonobo, "ESelectNamesBonobo", ESelectNamesBonobo, class_init, init, PARENT_TYPE)</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h<br/>deleted file mode 100644<br/>index f254dd6e94..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-bonobo.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-bonobo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-bonobo.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_BONOBO_H__</div><div class='del'>-#define __E_SELECT_NAMES_BONOBO_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))</div><div class='del'>-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))</div><div class='del'>-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_BONOBO))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesBonobo        ESelectNamesBonobo;</div><div class='del'>-typedef struct _ESelectNamesBonoboPrivate ESelectNamesBonoboPrivate;</div><div class='del'>-typedef struct _ESelectNamesBonoboClass   ESelectNamesBonoboClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonobo {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonoboClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType             e_select_names_bonobo_get_type   (void);</div><div class='del'>-void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,</div><div class='del'>-						      GNOME_Evolution_Addressbook_SelectNames corba_object);</div><div class='del'>-ESelectNamesBonobo *e_select_names_bonobo_new        (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_SELECT_NAMES_BONOBO_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c<br/>deleted file mode 100644<br/>index cbfc1d56c6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-completion.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-completion.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1292 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-select-names-completion.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-select-names-completion.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-destination.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-simple.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-compare.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBook *book;</div><div class='del'>-	guint book_view_tag;</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-	ESelectNamesCompletion *comp;</div><div class='del'>-	guint card_added_tag;</div><div class='del'>-	guint seq_complete_tag;</div><div class='del'>-	gboolean sequence_complete_received;</div><div class='del'>-} ESelectNamesCompletionBookData;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesCompletionPrivate {</div><div class='del'>-</div><div class='del'>-	ESelectNamesTextModel *text_model;</div><div class='del'>-</div><div class='del'>-	GList *book_data;</div><div class='del'>-	gint books_not_ready;</div><div class='del'>-	gint pending_completion_seq;</div><div class='del'>-</div><div class='del'>-	gchar *waiting_query;</div><div class='del'>-	gint waiting_pos, waiting_limit;</div><div class='del'>-	gchar *query_text;</div><div class='del'>-</div><div class='del'>-	gchar *cached_query_text;</div><div class='del'>-	GList *cached_cards;</div><div class='del'>-	gboolean cache_complete;</div><div class='del'>-</div><div class='del'>-	gboolean match_contact_lists;</div><div class='del'>-	gboolean primary_only;</div><div class='del'>-</div><div class='del'>-	gboolean can_fail_due_to_too_many_hits; /* like LDAP, for example... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_completion_class_init (ESelectNamesCompletionClass *);</div><div class='del'>-static void e_select_names_completion_init (ESelectNamesCompletion *);</div><div class='del'>-static void e_select_names_completion_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data);</div><div class='del'>-static void e_select_names_completion_card_added_cb    (EBookView *, const GList *cards, gpointer user_data);</div><div class='del'>-static void e_select_names_completion_seq_complete_cb  (EBookView *, gpointer user_data);</div><div class='del'>-</div><div class='del'>-static void e_select_names_completion_do_query (ESelectNamesCompletion *, const gchar *query_text, gint pos, gint limit);</div><div class='del'>-</div><div class='del'>-static void e_select_names_completion_handle_request  (ECompletion *, const gchar *txt, gint pos, gint limit);</div><div class='del'>-static void e_select_names_completion_end    (ECompletion *);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static FILE *out;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Query builders</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef gchar *(*BookQuerySExp) (ESelectNamesCompletion *);</div><div class='del'>-typedef ECompletionMatch *(*BookQueryMatchTester) (ESelectNamesCompletion *, EDestination *);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-our_match_destroy (ECompletionMatch *match)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (match-&gt;user_data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-make_match (EDestination *dest, const gchar *menu_form, double score)</div><div class='del'>-{</div><div class='del'>-	ECompletionMatch *match;</div><div class='del'>-	ECard *card = e_destination_get_card (dest);</div><div class='del'>-</div><div class='del'>-	match = e_completion_match_new (e_destination_get_name (dest), menu_form, score);</div><div class='del'>-</div><div class='del'>-	e_completion_match_set_text (match, e_destination_get_name (dest), menu_form);</div><div class='del'>-</div><div class='del'>-	/* Reject any match that has null text fields. */</div><div class='del'>-	if (! (e_completion_match_get_match_text (match) &amp;&amp; e_completion_match_get_menu_text (match))) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (match));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Since we sort low to high, we negate so that larger use scores will come first */</div><div class='del'>-	match-&gt;sort_major = card ? -floor (e_card_get_use_score (card)) : 0;</div><div class='del'>-</div><div class='del'>-	match-&gt;sort_minor = e_destination_get_email_num (dest);</div><div class='del'>-</div><div class='del'>-	match-&gt;user_data = dest;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	match-&gt;destroy = our_match_destroy;</div><div class='del'>-</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Nickname query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-sexp_nickname (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	gchar *query = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp-&gt;priv-&gt;query_text);</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-match_nickname (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	ECompletionMatch *match = NULL;</div><div class='del'>-	gint len;</div><div class='del'>-	ECard *card = e_destination_get_card (dest);</div><div class='del'>-	double score;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;nickname == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	len = g_utf8_strlen (comp-&gt;priv-&gt;query_text, -1);</div><div class='del'>-	if (card-&gt;nickname &amp;&amp; !g_utf8_strncasecmp (comp-&gt;priv-&gt;query_text, card-&gt;nickname, len)) {</div><div class='del'>-		const gchar *name;</div><div class='del'>-		gchar *str;</div><div class='del'>-</div><div class='del'>-		score = len * 2; /* nickname gives 2 points per matching character */</div><div class='del'>-</div><div class='del'>-		if (len == g_utf8_strlen (card-&gt;nickname, -1)) /* boost score on an exact match */</div><div class='del'>-		    score *= 10;</div><div class='del'>-</div><div class='del'>-		name = e_destination_get_name (dest);</div><div class='del'>-		if (name &amp;&amp; *name)</div><div class='del'>-			str = g_strdup_printf ("'%s' %s &lt;%s&gt;", card-&gt;nickname, name, e_destination_get_email (dest));</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup_printf ("'%s' &lt;%s&gt;", card-&gt;nickname, e_destination_get_email (dest));</div><div class='del'>-</div><div class='del'>-		match = make_match (dest, str, score);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * E-Mail Query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-sexp_email (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("(beginswith \"email\" \"%s\")", comp-&gt;priv-&gt;query_text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-match_email (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	ECompletionMatch *match;</div><div class='del'>-	gint len = strlen (comp-&gt;priv-&gt;query_text);</div><div class='del'>-	const gchar *name = e_destination_get_name (dest);</div><div class='del'>-	const gchar *email = e_destination_get_email (dest);</div><div class='del'>-	double score;</div><div class='del'>-	</div><div class='del'>-	if (email</div><div class='del'>-	    &amp;&amp; !g_utf8_strncasecmp (comp-&gt;priv-&gt;query_text, email, len)</div><div class='del'>-	    &amp;&amp; !e_destination_is_evolution_list (dest)) {</div><div class='del'>-		</div><div class='del'>-		gchar *str;</div><div class='del'>-		</div><div class='del'>-		score = len * 2; /* 2 points for each matching character */</div><div class='del'>-</div><div class='del'>-		if (name &amp;&amp; *name)</div><div class='del'>-			str = g_strdup_printf ("&lt;%s&gt; %s", email, name);</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup (email);</div><div class='del'>-</div><div class='del'>-		match = make_match (dest, str, score);</div><div class='del'>-</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-		return match;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Name Query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-name_style_query (ESelectNamesCompletion *comp, const gchar *field)</div><div class='del'>-{</div><div class='del'>-	if (comp &amp;&amp; comp-&gt;priv-&gt;query_text &amp;&amp; *comp-&gt;priv-&gt;query_text) {</div><div class='del'>-		gchar *cpy = g_strdup (comp-&gt;priv-&gt;query_text), *c;</div><div class='del'>-		gchar **strv;</div><div class='del'>-		gchar *query;</div><div class='del'>-		gint i, count=0;</div><div class='del'>-</div><div class='del'>-		for (c = cpy; *c; ++c) {</div><div class='del'>-			if (*c == ',')</div><div class='del'>-				*c = ' ';</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strv = g_strsplit (cpy, " ", 0);</div><div class='del'>-		for (i=0; strv[i]; ++i) {</div><div class='del'>-			gchar *old;</div><div class='del'>-			++count;</div><div class='del'>-			g_strstrip (strv[i]);</div><div class='del'>-			old = strv[i];</div><div class='del'>-			strv[i] = g_strdup_printf ("(contains \"%s\" \"%s\")", field, old);</div><div class='del'>-			g_free (old);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (count == 1) {</div><div class='del'>-			query = strv[0];</div><div class='del'>-			strv[0] = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			gchar *joined = g_strjoinv (" ", strv);</div><div class='del'>-			query = g_strdup_printf ("(and %s)", joined);</div><div class='del'>-			g_free (joined);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (cpy);</div><div class='del'>-		g_strfreev (strv);</div><div class='del'>-</div><div class='del'>-		return query;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-sexp_name (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	return name_style_query (comp, "full_name");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-match_name (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	ECompletionMatch *final_match = NULL;</div><div class='del'>-	gchar *menu_text = NULL;</div><div class='del'>-	ECard *card;</div><div class='del'>-	const gchar *email;</div><div class='del'>-	gint match_len = 0;</div><div class='del'>-	ECardMatchType match;</div><div class='del'>-	ECardMatchPart first_match;</div><div class='del'>-	double score = 0;</div><div class='del'>-	gboolean have_given, have_additional, have_family;</div><div class='del'>-</div><div class='del'>-	card = e_destination_get_card (dest);</div><div class='del'>-	</div><div class='del'>-	if (card-&gt;name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	email = e_destination_get_email (dest);</div><div class='del'>-</div><div class='del'>-	match = e_card_compare_name_to_string_full (card, comp-&gt;priv-&gt;query_text, TRUE /* yes, allow partial matches */,</div><div class='del'>-						    NULL, &amp;first_match, &amp;match_len);</div><div class='del'>-</div><div class='del'>-	if (match &lt;= E_CARD_MATCH_NONE)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	score = match_len * 3; /* three points per match character */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (card-&gt;nickname) {</div><div class='del'>-		/* We massively boost the score if the nickname exists and is the same as one of the "real" names.  This keeps the</div><div class='del'>-		   nickname from matching ahead of the real name for this card. */</div><div class='del'>-		len = strlen (card-&gt;nickname);</div><div class='del'>-		if ((card-&gt;name-&gt;given &amp;&amp; !g_utf8_strncasecmp (card-&gt;name-&gt;given, card-&gt;nickname, MIN (strlen (card-&gt;name-&gt;given), len)))</div><div class='del'>-		    || (card-&gt;name-&gt;family &amp;&amp; !g_utf8_strncasecmp (card-&gt;name-&gt;family, card-&gt;nickname, MIN (strlen (card-&gt;name-&gt;family), len)))</div><div class='del'>-		    || (card-&gt;name-&gt;additional &amp;&amp; !g_utf8_strncasecmp (card-&gt;name-&gt;additional, card-&gt;nickname, MIN (strlen (card-&gt;name-&gt;additional), len))))</div><div class='del'>-			score *= 100;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	have_given       = card-&gt;name-&gt;given &amp;&amp; *card-&gt;name-&gt;given;</div><div class='del'>-	have_additional  = card-&gt;name-&gt;additional &amp;&amp; *card-&gt;name-&gt;additional;</div><div class='del'>-	have_family      = card-&gt;name-&gt;family &amp;&amp; *card-&gt;name-&gt;family;</div><div class='del'>-</div><div class='del'>-	if (e_card_evolution_list (card)) {</div><div class='del'>-</div><div class='del'>-		menu_text = e_card_name_to_string (card-&gt;name);</div><div class='del'>-</div><div class='del'>-	} else if (first_match == E_CARD_MATCH_PART_GIVEN_NAME) {</div><div class='del'>-</div><div class='del'>-		if (have_family)</div><div class='del'>-			menu_text = g_strdup_printf ("%s %s &lt;%s&gt;", card-&gt;name-&gt;given, card-&gt;name-&gt;family, email);</div><div class='del'>-		else</div><div class='del'>-			menu_text = g_strdup_printf ("%s &lt;%s&gt;", card-&gt;name-&gt;given, email);</div><div class='del'>-</div><div class='del'>-	} else if (first_match == E_CARD_MATCH_PART_ADDITIONAL_NAME) {</div><div class='del'>-</div><div class='del'>-		if (have_given) {</div><div class='del'>-</div><div class='del'>-			menu_text = g_strdup_printf ("%s%s%s, %s &lt;%s&gt;",</div><div class='del'>-						     card-&gt;name-&gt;additional,</div><div class='del'>-						     have_family ? " " : "",</div><div class='del'>-						     have_family ? card-&gt;name-&gt;family : "",</div><div class='del'>-						     card-&gt;name-&gt;given,</div><div class='del'>-						     email);</div><div class='del'>-		} else {</div><div class='del'>-</div><div class='del'>-			menu_text = g_strdup_printf ("%s%s%s &lt;%s&gt;",</div><div class='del'>-						     card-&gt;name-&gt;additional,</div><div class='del'>-						     have_family ? " " : "",</div><div class='del'>-						     have_family ? card-&gt;name-&gt;family : "",</div><div class='del'>-						     email);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else if (first_match == E_CARD_MATCH_PART_FAMILY_NAME) { </div><div class='del'>-</div><div class='del'>-		if (have_given)</div><div class='del'>-			menu_text = g_strdup_printf ("%s, %s%s%s &lt;%s&gt;",</div><div class='del'>-						     card-&gt;name-&gt;family,</div><div class='del'>-						     card-&gt;name-&gt;given,</div><div class='del'>-						     have_additional ? " " : "",</div><div class='del'>-						     have_additional ? card-&gt;name-&gt;additional : "",</div><div class='del'>-						     email);</div><div class='del'>-		else</div><div class='del'>-			menu_text = g_strdup_printf ("%s &lt;%s&gt;", card-&gt;name-&gt;family, email);</div><div class='del'>-</div><div class='del'>-	} else { /* something funny happened */</div><div class='del'>-</div><div class='del'>-		menu_text = g_strdup_printf ("&lt;%s&gt; ???", email);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (menu_text) {</div><div class='del'>-		g_strstrip (menu_text);</div><div class='del'>-		final_match = make_match (dest, menu_text, score);</div><div class='del'>-		g_free (menu_text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return final_match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * File As Query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-sexp_file_as (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	return name_style_query (comp, "file_as");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-match_file_as (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	const gchar *name;</div><div class='del'>-	const gchar *email;</div><div class='del'>-	gchar *cpy, **strv, *menu_text;</div><div class='del'>-	gint i, len;</div><div class='del'>-	double score = 0.00001;</div><div class='del'>-	ECompletionMatch *match;</div><div class='del'>-</div><div class='del'>-	name = e_destination_get_name (dest);</div><div class='del'>-	email = e_destination_get_email (dest);</div><div class='del'>-</div><div class='del'>-	if (!(name &amp;&amp; *name))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	cpy = g_strdup (comp-&gt;priv-&gt;query_text);</div><div class='del'>-	strv = g_strsplit (cpy, " ", 0);</div><div class='del'>-</div><div class='del'>-	for (i=0; strv[i] &amp;&amp; score &gt; 0; ++i) {</div><div class='del'>-		len = g_utf8_strlen (strv[i], -1);</div><div class='del'>-		if (!g_utf8_strncasecmp (name, strv[i], len))</div><div class='del'>-			score += len; /* one point per character of the match */</div><div class='del'>-		else</div><div class='del'>-			score = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (cpy);</div><div class='del'>-	g_strfreev (strv);</div><div class='del'>-</div><div class='del'>-	if (score &lt;= 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	menu_text = g_strdup_printf ("%s &lt;%s&gt;", name, email);</div><div class='del'>-	g_strstrip (menu_text);</div><div class='del'>-	match = make_match (dest, menu_text, score);</div><div class='del'>-	g_free (menu_text);</div><div class='del'>-</div><div class='del'>-	return match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Initials Query</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-sexp_initials (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-match_initials (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _BookQuery BookQuery;</div><div class='del'>-struct _BookQuery {</div><div class='del'>-	gboolean primary;</div><div class='del'>-	BookQuerySExp builder;</div><div class='del'>-	BookQueryMatchTester tester;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static BookQuery book_queries[] = {</div><div class='del'>-	{ TRUE,  sexp_nickname, match_nickname},</div><div class='del'>-	{ TRUE,  sexp_email,    match_email },</div><div class='del'>-	{ TRUE,  sexp_name,     match_name },</div><div class='del'>-	{ TRUE,  sexp_file_as,  match_file_as },</div><div class='del'>-	{ FALSE, sexp_initials, match_initials }</div><div class='del'>-};</div><div class='del'>-static gint book_query_count = sizeof (book_queries) / sizeof (BookQuery);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Build up a big compound sexp corresponding to all of our queries.</div><div class='del'>- */</div><div class='del'>-static gchar *</div><div class='del'>-book_query_sexp (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	gint i, j, count = 0;</div><div class='del'>-	gchar **queryv, *query;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp &amp;&amp; E_IS_SELECT_NAMES_COMPLETION (comp), NULL);</div><div class='del'>-</div><div class='del'>-	if (! (comp-&gt;priv-&gt;query_text &amp;&amp; *comp-&gt;priv-&gt;query_text))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;priv-&gt;primary_only) {</div><div class='del'>-		for (i=0; i&lt;book_query_count; ++i)</div><div class='del'>-			if (book_queries[i].primary)</div><div class='del'>-				++count;</div><div class='del'>-	} else {</div><div class='del'>-		count = book_query_count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	queryv = g_new0 (gchar *, count+1);</div><div class='del'>-	for (i=0, j=0; i&lt;count; ++i) {</div><div class='del'>-		queryv[j] = book_queries[i].builder (comp);</div><div class='del'>-		if (queryv[j])</div><div class='del'>-			++j;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (j == 0) {</div><div class='del'>-		query = NULL;</div><div class='del'>-	} else if (j == 1) {</div><div class='del'>-		query = queryv[0];</div><div class='del'>-		queryv[0] = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		gchar *tmp = g_strjoinv (" ", queryv);</div><div class='del'>-		query = g_strdup_printf ("(or %s)", tmp);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;count; ++i)</div><div class='del'>-		g_free (queryv[i]);</div><div class='del'>-	g_free (queryv);</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Sweep across all of our query rules and find the best score/match</div><div class='del'>- * string that applies to a given destination.</div><div class='del'>- */</div><div class='del'>-static ECompletionMatch *</div><div class='del'>-book_query_score (ESelectNamesCompletion *comp, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	ECompletionMatch *best_match = NULL;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), NULL);</div><div class='del'>-</div><div class='del'>-	if (! (comp-&gt;priv-&gt;query_text &amp;&amp; *comp-&gt;priv-&gt;query_text))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	for (i=0; i&lt;book_query_count; ++i) {</div><div class='del'>-</div><div class='del'>-		ECompletionMatch *this_match = NULL;</div><div class='del'>-</div><div class='del'>-		if (book_queries[i].primary || !comp-&gt;priv-&gt;primary_only) {</div><div class='del'>-			if (book_queries[i].tester &amp;&amp; e_destination_get_card (dest)) {</div><div class='del'>-				this_match = book_queries[i].tester (comp, dest);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (this_match) {</div><div class='del'>-				if (best_match == NULL || this_match-&gt;score &gt; best_match-&gt;score) {</div><div class='del'>-					e_completion_match_unref (best_match);</div><div class='del'>-					best_match = this_match;</div><div class='del'>-				} else {</div><div class='del'>-					e_completion_match_unref (this_match);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return best_match;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_query_process_card_list (ESelectNamesCompletion *comp, const GList *cards)</div><div class='del'>-{</div><div class='del'>-	while (cards) {</div><div class='del'>-		ECard *card = E_CARD (cards-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (e_card_evolution_list (card)) {</div><div class='del'>-</div><div class='del'>-			if (comp-&gt;priv-&gt;match_contact_lists) {</div><div class='del'>-</div><div class='del'>-				EDestination *dest = e_destination_new ();</div><div class='del'>-				ECompletionMatch *match;</div><div class='del'>-				e_destination_set_card (dest, card, 0);</div><div class='del'>-				match = book_query_score (comp, dest);</div><div class='del'>-				if (match &amp;&amp; match-&gt;score &gt; 0) {</div><div class='del'>-					e_completion_found_match (E_COMPLETION (comp), match);</div><div class='del'>-				} else {</div><div class='del'>-					e_completion_match_unref (match);</div><div class='del'>-				}</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else if (card-&gt;email) {</div><div class='del'>-			gint i;</div><div class='del'>-			for (i=0; i&lt;e_list_length (card-&gt;email); ++i) {</div><div class='del'>-				EDestination *dest = e_destination_new ();</div><div class='del'>-				const gchar *email;</div><div class='del'>-				ECompletionMatch *match;</div><div class='del'>-				</div><div class='del'>-				e_destination_set_card (dest, card, i);</div><div class='del'>-				email = e_destination_get_email (dest);</div><div class='del'>-</div><div class='del'>-				if (email &amp;&amp; *email) {</div><div class='del'>-				</div><div class='del'>-					match = book_query_score (comp, dest);</div><div class='del'>-					if (match &amp;&amp; match-&gt;score &gt; 0) {</div><div class='del'>-						e_completion_found_match (E_COMPLETION (comp), match);</div><div class='del'>-					} else {</div><div class='del'>-						e_completion_match_unref (match);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		cards = g_list_next (cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static gchar *</div><div class='del'>-initials_query_match_cb (QueryInfo *qi, ECard *card, double *score)</div><div class='del'>-{</div><div class='del'>-	gint len;</div><div class='del'>-	gchar f='\0', m='\0', l='\0'; /* initials */</div><div class='del'>-	gchar cf, cm, cl;</div><div class='del'>-</div><div class='del'>-	len = strlen (qi-&gt;comp-&gt;priv-&gt;query_text);</div><div class='del'>-	</div><div class='del'>-	if (len == 2) {</div><div class='del'>-		</div><div class='del'>-		f = qi-&gt;comp-&gt;priv-&gt;query_text[0];</div><div class='del'>-		m = '\0';</div><div class='del'>-		l = qi-&gt;comp-&gt;priv-&gt;query_text[1];</div><div class='del'>-</div><div class='del'>-	} else if (len == 3) {</div><div class='del'>-</div><div class='del'>-		f = qi-&gt;comp-&gt;priv-&gt;query_text[0];</div><div class='del'>-		m = qi-&gt;comp-&gt;priv-&gt;query_text[1];</div><div class='del'>-		l = qi-&gt;comp-&gt;priv-&gt;query_text[2];</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cf = card-&gt;name-&gt;given ? *card-&gt;name-&gt;given : '\0';</div><div class='del'>-	cm = card-&gt;name-&gt;additional ? *card-&gt;name-&gt;additional : '\0';</div><div class='del'>-	cl = card-&gt;name-&gt;family ? *card-&gt;name-&gt;family : '\0';</div><div class='del'>-</div><div class='del'>-	if (f &amp;&amp; isupper ((gint) f))</div><div class='del'>-		f = tolower ((gint) f);</div><div class='del'>-	if (m &amp;&amp; isupper ((gint) m))</div><div class='del'>-		m = tolower ((gint) m);</div><div class='del'>-	if (l &amp;&amp; isupper ((gint) l))</div><div class='del'>-		l = tolower ((gint) l);</div><div class='del'>-</div><div class='del'>-	if (cf &amp;&amp; isupper ((gint) cf))</div><div class='del'>-		cf = tolower ((gint) cf);</div><div class='del'>-	if (cm &amp;&amp; isupper ((gint) cm))</div><div class='del'>-		cm = tolower ((gint) cm);</div><div class='del'>-	if (cl &amp;&amp; isupper ((gint) cl))</div><div class='del'>-		cl = tolower ((gint) cl);</div><div class='del'>-</div><div class='del'>-	if ((f == '\0' || (f == cf)) &amp;&amp; (m == '\0' || (m == cm)) &amp;&amp; (l == '\0' || (l == cl))) {</div><div class='del'>-		if (score)</div><div class='del'>-			*score = 3;</div><div class='del'>-		if (m)</div><div class='del'>-			return g_strdup_printf ("%s %s %s", card-&gt;name-&gt;given, card-&gt;name-&gt;additional, card-&gt;name-&gt;family);</div><div class='del'>-		else</div><div class='del'>-			return g_strdup_printf ("%s %s", card-&gt;name-&gt;given, card-&gt;name-&gt;family);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-start_initials_query (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	gint len;</div><div class='del'>-	gchar *query;</div><div class='del'>-</div><div class='del'>-	if (comp &amp;&amp; comp-&gt;priv-&gt;query_text &amp;&amp; *(comp-&gt;priv-&gt;query_text)) {</div><div class='del'>-		</div><div class='del'>-		len = strlen (comp-&gt;priv-&gt;query_text);</div><div class='del'>-		if (len &lt; 2 || len &gt; 3)</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%c\")", *(comp-&gt;priv-&gt;query_text));</div><div class='del'>-		query_info_start (comp, comp-&gt;priv-&gt;query_text, query, initials_query_match_cb);</div><div class='del'>-		g_free (query);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * ESelectNamesCompletion code</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_completion_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType select_names_complete_type = 0;</div><div class='del'>-  </div><div class='del'>-	if (!select_names_complete_type) {</div><div class='del'>-		GtkTypeInfo select_names_complete_info = {</div><div class='del'>-			"ESelectNamesCompletion",</div><div class='del'>-			sizeof (ESelectNamesCompletion),</div><div class='del'>-			sizeof (ESelectNamesCompletionClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_completion_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_completion_init,</div><div class='del'>-			NULL, NULL, /* reserved */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		select_names_complete_type = gtk_type_unique (e_completion_get_type (), &amp;select_names_complete_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return select_names_complete_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_class_init (ESelectNamesCompletionClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	ECompletionClass *completion_class = E_COMPLETION_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (e_completion_get_type ()));</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_completion_destroy;</div><div class='del'>-</div><div class='del'>-	completion_class-&gt;request_completion = e_select_names_completion_handle_request;</div><div class='del'>-	completion_class-&gt;end_completion = e_select_names_completion_end;</div><div class='del'>-</div><div class='del'>-	if (getenv ("EVO_DEBUG_SELECT_NAMES_COMPLETION")) {</div><div class='del'>-		out = fopen ("/tmp/evo-debug-select-names-completion", "w");</div><div class='del'>-		if (out)</div><div class='del'>-			setvbuf (out, NULL, _IONBF, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_init (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	comp-&gt;priv = g_new0 (struct _ESelectNamesCompletionPrivate, 1);</div><div class='del'>-	comp-&gt;priv-&gt;match_contact_lists = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;priv-&gt;text_model)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp-&gt;priv-&gt;text_model));</div><div class='del'>-</div><div class='del'>-	for (l = comp-&gt;priv-&gt;book_data; l; l = l-&gt;next) {</div><div class='del'>-		ESelectNamesCompletionBookData *book_data = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (book_data-&gt;card_added_tag) {</div><div class='del'>-			gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;card_added_tag);</div><div class='del'>-			book_data-&gt;card_added_tag = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (book_data-&gt;seq_complete_tag) {</div><div class='del'>-			gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;seq_complete_tag);</div><div class='del'>-			book_data-&gt;seq_complete_tag = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book_data-&gt;book));</div><div class='del'>-</div><div class='del'>-		if (book_data-&gt;book_view)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (book_data-&gt;book_view));</div><div class='del'>-</div><div class='del'>-		g_free (book_data);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (comp-&gt;priv-&gt;book_data);</div><div class='del'>-</div><div class='del'>-	g_free (comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-	g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-</div><div class='del'>-	g_free (comp-&gt;priv-&gt;cached_query_text);</div><div class='del'>-	g_list_foreach (comp-&gt;priv-&gt;cached_cards, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (comp-&gt;priv-&gt;cached_cards);</div><div class='del'>-</div><div class='del'>-	g_free (comp-&gt;priv);</div><div class='del'>-</div><div class='del'>-	if (parent_class-&gt;destroy)</div><div class='del'>-		parent_class-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  EBook/EBookView Callbacks &amp; Query Stuff</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-clean_query_text (const gchar *s)</div><div class='del'>-{</div><div class='del'>-	gchar *q = g_new (gchar, strlen(s)+1), *t;</div><div class='del'>-</div><div class='del'>-	t = q;</div><div class='del'>-	while (*s) {</div><div class='del'>-		if (*s != ',' &amp;&amp; *s != '"') {</div><div class='del'>-			*t = *s;</div><div class='del'>-			++t;</div><div class='del'>-		}</div><div class='del'>-		++s;</div><div class='del'>-	}</div><div class='del'>-	*t = '\0';</div><div class='del'>-</div><div class='del'>-	g_strstrip (q);</div><div class='del'>-</div><div class='del'>-	return q;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_clear_cache (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	g_free (comp-&gt;priv-&gt;cached_query_text);</div><div class='del'>-	comp-&gt;priv-&gt;cached_query_text = NULL;</div><div class='del'>-</div><div class='del'>-	g_list_foreach (comp-&gt;priv-&gt;cached_cards, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (comp-&gt;priv-&gt;cached_cards);</div><div class='del'>-	comp-&gt;priv-&gt;cached_cards = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletion *comp;</div><div class='del'>-	ESelectNamesCompletionBookData *book_data;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	book_data = (ESelectNamesCompletionBookData*)user_data;</div><div class='del'>-	comp = book_data-&gt;comp;</div><div class='del'>-</div><div class='del'>-	book_data-&gt;book_view_tag = 0;</div><div class='del'>-</div><div class='del'>-	if (book_data-&gt;card_added_tag) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;card_added_tag);</div><div class='del'>-		book_data-&gt;card_added_tag = 0;</div><div class='del'>-	}</div><div class='del'>-	if (book_data-&gt;seq_complete_tag) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;seq_complete_tag);</div><div class='del'>-		book_data-&gt;seq_complete_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (view));</div><div class='del'>-	if (book_data-&gt;book_view)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book_data-&gt;book_view));</div><div class='del'>-	book_data-&gt;book_view = view;</div><div class='del'>-</div><div class='del'>-	book_data-&gt;card_added_tag = </div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (view),</div><div class='del'>-				    "card_added",</div><div class='del'>-				    GTK_SIGNAL_FUNC (e_select_names_completion_card_added_cb),</div><div class='del'>-				    book_data);</div><div class='del'>-</div><div class='del'>-	book_data-&gt;seq_complete_tag =</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (view),</div><div class='del'>-				    "sequence_complete",</div><div class='del'>-				    GTK_SIGNAL_FUNC (e_select_names_completion_seq_complete_cb),</div><div class='del'>-				    book_data);</div><div class='del'>-	book_data-&gt;sequence_complete_received = FALSE;</div><div class='del'>-	comp-&gt;priv-&gt;pending_completion_seq++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_card_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletionBookData *book_data = user_data;</div><div class='del'>-	ESelectNamesCompletion *comp = book_data-&gt;comp;</div><div class='del'>-</div><div class='del'>-	if (e_completion_searching (E_COMPLETION (comp))) {</div><div class='del'>-		book_query_process_card_list (comp, cards);</div><div class='del'>-</div><div class='del'>-		/* Save the list of matching cards. */</div><div class='del'>-		while (cards) {</div><div class='del'>-			comp-&gt;priv-&gt;cached_cards = g_list_prepend (comp-&gt;priv-&gt;cached_cards, cards-&gt;data);</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (cards-&gt;data));</div><div class='del'>-			cards = g_list_next (cards);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_seq_complete_cb (EBookView *book_view, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletionBookData *book_data = user_data;</div><div class='del'>-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION(book_data-&gt;comp);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * We aren't searching, but the addressbook has changed -- clear our card cache so that</div><div class='del'>-	 * future completion requests will take the changes into account.</div><div class='del'>-	 */</div><div class='del'>-	if (! e_completion_searching (E_COMPLETION (comp))) {</div><div class='del'>-		e_select_names_completion_clear_cache (comp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!book_data-&gt;sequence_complete_received) {</div><div class='del'>-		book_data-&gt;sequence_complete_received = TRUE;</div><div class='del'>-		comp-&gt;priv-&gt;pending_completion_seq --;</div><div class='del'>-		if (comp-&gt;priv-&gt;pending_completion_seq &gt; 0)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;priv-&gt;cached_query_text</div><div class='del'>-	    &amp;&amp; !comp-&gt;priv-&gt;cache_complete</div><div class='del'>-	    &amp;&amp; !strcmp (comp-&gt;priv-&gt;cached_query_text, comp-&gt;priv-&gt;query_text))</div><div class='del'>-		comp-&gt;priv-&gt;cache_complete = TRUE;</div><div class='del'>-</div><div class='del'>-	g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-	comp-&gt;priv-&gt;query_text = NULL;</div><div class='del'>-</div><div class='del'>-	if (out)</div><div class='del'>-		fprintf (out, "ending search\n");</div><div class='del'>-</div><div class='del'>-	e_completion_end_search (E_COMPLETION (comp)); /* That's all folks! */</div><div class='del'>-</div><div class='del'>-	/* Need to launch a new completion if another one is pending. */</div><div class='del'>-	if (comp-&gt;priv-&gt;waiting_query) {</div><div class='del'>-		gchar *s = comp-&gt;priv-&gt;waiting_query;</div><div class='del'>-		comp-&gt;priv-&gt;waiting_query = NULL;</div><div class='del'>-		e_completion_begin_search (E_COMPLETION (comp), s, comp-&gt;priv-&gt;waiting_pos, comp-&gt;priv-&gt;waiting_limit);</div><div class='del'>-		g_free (s);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_stop_query (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp &amp;&amp; E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-</div><div class='del'>-	if (out)</div><div class='del'>-		fprintf (out, "stopping query\n");</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;priv-&gt;waiting_query) {</div><div class='del'>-		if (out)</div><div class='del'>-			fprintf (out, "stopped waiting query\n");</div><div class='del'>-		g_free (comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-		comp-&gt;priv-&gt;waiting_query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-	comp-&gt;priv-&gt;query_text = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = comp-&gt;priv-&gt;book_data; l; l = l-&gt;next) {</div><div class='del'>-		ESelectNamesCompletionBookData *book_data = l-&gt;data;</div><div class='del'>-		if (book_data-&gt;book_view_tag) {</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "cancelled book view creation\n");</div><div class='del'>-			e_book_cancel (book_data-&gt;book, book_data-&gt;book_view_tag);</div><div class='del'>-			book_data-&gt;book_view_tag = 0;</div><div class='del'>-		}</div><div class='del'>-		if (book_data-&gt;book_view) {</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "disconnecting book view signals\n");</div><div class='del'>-</div><div class='del'>-			if (book_data-&gt;card_added_tag) {</div><div class='del'>-				gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;card_added_tag);</div><div class='del'>-				book_data-&gt;card_added_tag = 0;</div><div class='del'>-			}</div><div class='del'>-			if (book_data-&gt;seq_complete_tag) {</div><div class='del'>-				gtk_signal_disconnect (GTK_OBJECT (book_data-&gt;book_view), book_data-&gt;seq_complete_tag);</div><div class='del'>-				book_data-&gt;seq_complete_tag = 0;</div><div class='del'>-			}</div><div class='del'>-	</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "unrefed book view\n");</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (book_data-&gt;book_view));</div><div class='del'>-			book_data-&gt;book_view = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear the cache, which may contain partial results. */</div><div class='del'>-	e_select_names_completion_clear_cache (comp);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar *query_text)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (comp &amp;&amp; E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-	g_return_if_fail (query_text);</div><div class='del'>-</div><div class='del'>-	e_select_names_completion_stop_query (comp);  /* Stop any prior queries. */</div><div class='del'>-</div><div class='del'>-	if (comp-&gt;priv-&gt;books_not_ready == 0) {</div><div class='del'>-		gchar *sexp;</div><div class='del'>-	</div><div class='del'>-		g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-		comp-&gt;priv-&gt;query_text = g_strdup (query_text);</div><div class='del'>-</div><div class='del'>-		g_free (comp-&gt;priv-&gt;cached_query_text);</div><div class='del'>-		comp-&gt;priv-&gt;cached_query_text = g_strdup (query_text);</div><div class='del'>-		comp-&gt;priv-&gt;cache_complete = FALSE;</div><div class='del'>-</div><div class='del'>-		sexp = book_query_sexp (comp);</div><div class='del'>-		if (sexp &amp;&amp; *sexp) {</div><div class='del'>-			GList *l;</div><div class='del'>-</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "\n\n**** starting query: \"%s\"\n", comp-&gt;priv-&gt;query_text);</div><div class='del'>-</div><div class='del'>-			for (l = comp-&gt;priv-&gt;book_data; l; l = l-&gt;next) {</div><div class='del'>-				ESelectNamesCompletionBookData *book_data = l-&gt;data;</div><div class='del'>-				book_data-&gt;book_view_tag = e_book_get_book_view (book_data-&gt;book, sexp, </div><div class='del'>-										 e_select_names_completion_got_book_view_cb, book_data);</div><div class='del'>-				if (! book_data-&gt;book_view_tag)</div><div class='del'>-					g_warning ("Exception calling e_book_get_book_view");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-			comp-&gt;priv-&gt;query_text = NULL;</div><div class='del'>-		}</div><div class='del'>-		g_free (sexp);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		comp-&gt;priv-&gt;waiting_query = g_strdup (query_text);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_do_query (ESelectNamesCompletion *comp, const gchar *query_text, gint pos, gint limit)</div><div class='del'>-{</div><div class='del'>-	gchar *clean;</div><div class='del'>-	gboolean query_is_still_running, can_reuse_cached_cards;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-</div><div class='del'>-	clean = clean_query_text (query_text);</div><div class='del'>-	if (! (clean &amp;&amp; *clean)) {</div><div class='del'>-		g_free (clean);</div><div class='del'>-		e_completion_end_search (E_COMPLETION (comp));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	query_is_still_running = FALSE;</div><div class='del'>-	for (l = comp-&gt;priv-&gt;book_data; l; l = l-&gt;next) {</div><div class='del'>-		ESelectNamesCompletionBookData *book_data = l-&gt;data;</div><div class='del'>-		query_is_still_running = book_data-&gt;book_view_tag;</div><div class='del'>-		if (query_is_still_running)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (out) {</div><div class='del'>-		fprintf (out, "do_query: %s =&gt; %s\n", query_text, clean);</div><div class='del'>-		if (query_is_still_running)</div><div class='del'>-			fprintf (out, "a query is still running!\n");</div><div class='del'>-	}</div><div class='del'>-	if (comp-&gt;priv-&gt;cached_query_text &amp;&amp; out)</div><div class='del'>-		fprintf (out, "cached: %s\n", comp-&gt;priv-&gt;cached_query_text);</div><div class='del'>-</div><div class='del'>-	can_reuse_cached_cards = (comp-&gt;priv-&gt;cached_query_text</div><div class='del'>-				  &amp;&amp; comp-&gt;priv-&gt;cache_complete</div><div class='del'>-				  &amp;&amp; (!comp-&gt;priv-&gt;can_fail_due_to_too_many_hits || comp-&gt;priv-&gt;cached_cards != NULL)</div><div class='del'>-				  &amp;&amp; (strlen (comp-&gt;priv-&gt;cached_query_text) &lt;= strlen (clean))</div><div class='del'>-				  &amp;&amp; !g_utf8_strncasecmp (comp-&gt;priv-&gt;cached_query_text, clean, strlen (comp-&gt;priv-&gt;cached_query_text)));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (can_reuse_cached_cards) {</div><div class='del'>-</div><div class='del'>-		if (out)</div><div class='del'>-			fprintf (out, "can reuse cached card!\n");</div><div class='del'>-</div><div class='del'>-		if (query_is_still_running) {</div><div class='del'>-			g_free (comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-			comp-&gt;priv-&gt;waiting_query = clean;</div><div class='del'>-			comp-&gt;priv-&gt;waiting_pos = pos;</div><div class='del'>-			comp-&gt;priv-&gt;waiting_limit = limit;</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "waiting for running query to complete: %s\n", comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (comp-&gt;priv-&gt;query_text);</div><div class='del'>-		comp-&gt;priv-&gt;query_text = clean;</div><div class='del'>-		if (out)</div><div class='del'>-			fprintf (out, "using existing query info: %s (vs %s)\n", comp-&gt;priv-&gt;query_text, comp-&gt;priv-&gt;cached_query_text);</div><div class='del'>-		book_query_process_card_list (comp, comp-&gt;priv-&gt;cached_cards);</div><div class='del'>-		e_completion_end_search (E_COMPLETION (comp));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_select_names_completion_start_query (comp, clean);</div><div class='del'>-	g_free (clean);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Completion Search Override - a Framework for Christian-Resurrection-Holiday Edible-Chicken-Ova</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-typedef struct _SearchOverride SearchOverride;</div><div class='del'>-struct _SearchOverride {</div><div class='del'>-	const gchar *trigger;</div><div class='del'>-	const gchar *text[4];</div><div class='del'>-};</div><div class='del'>-static SearchOverride override[] = { </div><div class='del'>-	{ "why?", { "\"I must create a system, or be enslaved by another man's.\"",</div><div class='del'>-		    "            -- Wiliam Blake, \"Jerusalem\"",</div><div class='del'>-		    NULL } },</div><div class='del'>-	{ "easter-egg?", { "What were you expecting, a flight simulator?", NULL } },</div><div class='del'>-	{ NULL, { NULL } } };</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-search_override_check (SearchOverride *over, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	/* The g_utf8_validate is needed because as of 2001-06-11,</div><div class='del'>-	 * EText doesn't translate from locale-&gt;UTF8 when you paste</div><div class='del'>-	 * into it.</div><div class='del'>-	 */</div><div class='del'>-	if (over == NULL || text == NULL || !g_utf8_validate (text, -1, NULL))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return !g_utf8_strcasecmp (over-&gt;trigger, text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Completion Callbacks</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_handle_request (ECompletion *comp, const gchar *text, gint pos, gint limit)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp);</div><div class='del'>-	const gchar *str;</div><div class='del'>-	gint index, j;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-	g_return_if_fail (text != NULL);</div><div class='del'>-	</div><div class='del'>-	if (out) {</div><div class='del'>-		fprintf (out, "\n\n**** requesting completion\n");</div><div class='del'>-		fprintf (out, "text=\"%s\" pos=%d limit=%d\n", text, pos, limit);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_model_text_pos (selcomp-&gt;priv-&gt;text_model-&gt;source,</div><div class='del'>-				       selcomp-&gt;priv-&gt;text_model-&gt;seplen,</div><div class='del'>-				       pos, &amp;index, NULL, NULL);</div><div class='del'>-	str = index &gt;= 0 ? e_select_names_model_get_string (selcomp-&gt;priv-&gt;text_model-&gt;source, index) : NULL;</div><div class='del'>-</div><div class='del'>-	if (out)</div><div class='del'>-		fprintf (out, "index=%d str=\"%s\"\n", index, str);</div><div class='del'>-</div><div class='del'>-	if (str == NULL || *str == '\0') {</div><div class='del'>-		if (out)</div><div class='del'>-			fprintf (out, "aborting empty query\n");</div><div class='del'>-		e_completion_end_search (comp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (j=0; override[j].trigger; ++j) {</div><div class='del'>-		if (search_override_check (&amp;(override[j]), str)) {</div><div class='del'>-			gint k;</div><div class='del'>-</div><div class='del'>-			for (k=0; override[j].text[k]; ++k) {</div><div class='del'>-				ECompletionMatch *match = g_new (ECompletionMatch, 1);</div><div class='del'>-				e_completion_match_construct (match);</div><div class='del'>-				e_completion_match_set_text (match, text, override[j].text[k]);</div><div class='del'>-				match-&gt;score = 1 / (double) (k + 1);</div><div class='del'>-				e_completion_found_match (comp, match);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			e_completion_end_search (comp);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_completion_do_query (selcomp, str, pos, limit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_end (ECompletion *comp)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_COMPLETION (comp));</div><div class='del'>-</div><div class='del'>-	if (out)</div><div class='del'>-		fprintf (out, "completion ended\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_capabilities (ESelectNamesCompletion *comp, EBook *book)</div><div class='del'>-{</div><div class='del'>-	gchar *cap = e_book_get_static_capabilities (book);</div><div class='del'>-	comp-&gt;priv-&gt;can_fail_due_to_too_many_hits = !strcmp (cap, "net");</div><div class='del'>-	if (comp-&gt;priv-&gt;can_fail_due_to_too_many_hits) {</div><div class='del'>-		g_message ("using LDAP source for completion!");</div><div class='del'>-	}</div><div class='del'>-	g_free (cap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_completion_book_ready (EBook *book, EBookStatus status, ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	comp-&gt;priv-&gt;books_not_ready--;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_BOOK (book));</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-</div><div class='del'>-	check_capabilities (comp, book);</div><div class='del'>-</div><div class='del'>-	/* If waiting_query is non-NULL, someone tried to start a query before the book was ready.</div><div class='del'>-	   Now that it is, get started. */</div><div class='del'>-	if (comp-&gt;priv-&gt;books_not_ready == 0 &amp;&amp; comp-&gt;priv-&gt;waiting_query) {</div><div class='del'>-		e_select_names_completion_start_query (comp, comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-		g_free (comp-&gt;priv-&gt;waiting_query);</div><div class='del'>-		comp-&gt;priv-&gt;waiting_query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp)); /* post-async unref */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- *  Our Pseudo-Constructor</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-ECompletion *</div><div class='del'>-e_select_names_completion_new (EBook *book, ESelectNamesTextModel *text_model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletion *comp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (book == NULL || E_IS_BOOK (book), NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model), NULL);</div><div class='del'>-</div><div class='del'>-	comp = (ESelectNamesCompletion *) gtk_type_new (e_select_names_completion_get_type ());</div><div class='del'>-</div><div class='del'>-	if (book == NULL) {</div><div class='del'>-		ESelectNamesCompletionBookData *book_data = g_new0 (ESelectNamesCompletionBookData, 1);</div><div class='del'>-</div><div class='del'>-		book_data-&gt;book = e_book_new ();</div><div class='del'>-		book_data-&gt;comp = comp;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (book_data-&gt;book));</div><div class='del'>-		gtk_object_sink (GTK_OBJECT (book_data-&gt;book));</div><div class='del'>-</div><div class='del'>-		comp-&gt;priv-&gt;book_data = g_list_append (comp-&gt;priv-&gt;book_data, book_data);</div><div class='del'>-		comp-&gt;priv-&gt;books_not_ready++;</div><div class='del'>-</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (comp)); /* ref ourself before our async call */</div><div class='del'>-		e_book_load_local_address_book (book_data-&gt;book, (EBookCallback) e_select_names_completion_book_ready, comp);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		e_select_names_completion_add_book (comp, book);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	comp-&gt;priv-&gt;text_model = text_model;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (text_model));</div><div class='del'>-</div><div class='del'>-	return E_COMPLETION (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_completion_add_book (ESelectNamesCompletion *comp, EBook *book)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesCompletionBookData *book_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (book != NULL);</div><div class='del'>-</div><div class='del'>-	book_data = g_new0 (ESelectNamesCompletionBookData, 1);</div><div class='del'>-	book_data-&gt;book = book;</div><div class='del'>-	book_data-&gt;comp = comp;</div><div class='del'>-	check_capabilities (comp, book);</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (book_data-&gt;book));</div><div class='del'>-	comp-&gt;priv-&gt;book_data = g_list_append (comp-&gt;priv-&gt;book_data, book_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *comp)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), FALSE);</div><div class='del'>-	return comp-&gt;priv-&gt;match_contact_lists;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *comp, gboolean x)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));</div><div class='del'>-	comp-&gt;priv-&gt;match_contact_lists = x;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h<br/>deleted file mode 100644<br/>index 86522fa5ce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-completion.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-completion.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-select-names-completion.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_SELECT_NAMES_COMPLETION_H</div><div class='del'>-#define E_SELECT_NAMES_COMPLETION_H</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-completion.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_SELECT_NAMES_COMPLETION_TYPE        (e_select_names_completion_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletion))</div><div class='del'>-#define E_SELECT_NAMES_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletionClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_SELECT_NAMES_COMPLETION_TYPE))</div><div class='del'>-#define E_IS_SELECT_NAMES_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECT_NAMES_COMPLETION_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesCompletion ESelectNamesCompletion;</div><div class='del'>-typedef struct _ESelectNamesCompletionClass ESelectNamesCompletionClass;</div><div class='del'>-struct _ESelectNamesCompletionPrivate;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesCompletion {</div><div class='del'>-	ECompletion parent;</div><div class='del'>-</div><div class='del'>-	struct _ESelectNamesCompletionPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesCompletionClass {</div><div class='del'>-	ECompletionClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType      e_select_names_completion_get_type (void);</div><div class='del'>-</div><div class='del'>-ECompletion *e_select_names_completion_new                     (EBook *, ESelectNamesTextModel *);</div><div class='del'>-void         e_select_names_completion_add_book                (ESelectNamesCompletion *, EBook *);</div><div class='del'>-gboolean     e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *);</div><div class='del'>-void         e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *, gboolean);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* E_SELECT_NAMES_COMPLETION_H */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c<br/>deleted file mode 100644<br/>index d6560d6366..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names-bonobo.h"</div><div class='del'>-#include "e-select-names-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (e_select_names_bonobo_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h<br/>deleted file mode 100644<br/>index 0fe85c8361..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SECELT_NAMES_FACTORY_H</div><div class='del'>-#define _E_SECELT_NAMES_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean e_select_names_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c<br/>deleted file mode 100644<br/>index 53978ac502..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-manager.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-manager.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,647 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Chris Lahey     &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Jon Trowbridge  &lt;trow@ximian.com.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names-manager.h"</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-#include "e-select-names-completion.h"</div><div class='del'>-#include "e-select-names-popup.h"</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-destination.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	OK,</div><div class='del'>-	CANCEL,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_select_names_manager_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *id;</div><div class='del'>-	char *title;</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	ESelectNamesModel *original_model;</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	guint changed_tag;</div><div class='del'>-} ESelectNamesManagerSection;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *id;</div><div class='del'>-	EEntry *entry;</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	guint cleaning_tag;</div><div class='del'>-} ESelectNamesManagerEntry;</div><div class='del'>-</div><div class='del'>-static void e_select_names_manager_init (ESelectNamesManager *manager);</div><div class='del'>-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_manager_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-/* ESelectNamesManagerSection routines */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-section_model_changed_cb (ESelectNamesModel *model, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerSection *section = closure;</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (section-&gt;manager),</div><div class='del'>-			 e_select_names_manager_signals[CHANGED],</div><div class='del'>-			 section-&gt;id,</div><div class='del'>-			 FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESelectNamesManagerSection *</div><div class='del'>-e_select_names_manager_section_new (ESelectNamesManager *manager,</div><div class='del'>-				    const gchar *id,</div><div class='del'>-				    const gchar *title,</div><div class='del'>-				    ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerSection *section;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	section = g_new0 (ESelectNamesManagerSection, 1);</div><div class='del'>-</div><div class='del'>-	section-&gt;id = g_strdup (id);</div><div class='del'>-	section-&gt;title = g_strdup (title);</div><div class='del'>-</div><div class='del'>-	section-&gt;manager = manager;</div><div class='del'>-</div><div class='del'>-	section-&gt;model = model;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (section-&gt;model));</div><div class='del'>-	section-&gt;changed_tag =</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (section-&gt;model),</div><div class='del'>-				    "changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (section_model_changed_cb),</div><div class='del'>-				    section);</div><div class='del'>-</div><div class='del'>-	return section;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_section_free (ESelectNamesManagerSection *section)</div><div class='del'>-{</div><div class='del'>-	if (section == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (section-&gt;id);</div><div class='del'>-	g_free (section-&gt;title);</div><div class='del'>-</div><div class='del'>-	if (section-&gt;model) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (section-&gt;model), section-&gt;changed_tag);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (section-&gt;model));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (section-&gt;original_model) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (section-&gt;original_model));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (section);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-/* ESelectNamesManagerEntry routines */</div><div class='del'>-</div><div class='del'>-static ESelectNamesManagerEntry *</div><div class='del'>-get_entry_info (EEntry *entry)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_ENTRY (entry), NULL);</div><div class='del'>-	return (ESelectNamesManagerEntry *) gtk_object_get_data (GTK_OBJECT (entry), "entry_info");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *text_model;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (eentry),</div><div class='del'>-			"model", &amp;text_model,</div><div class='del'>-			NULL);</div><div class='del'>-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));</div><div class='del'>-</div><div class='del'>-	e_select_names_popup (text_model, ev, pos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-clean_cb (gpointer ptr)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry = ptr;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_clean (entry-&gt;model, TRUE);</div><div class='del'>-	entry-&gt;cleaning_tag = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-focus_in_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry = user_data;</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;cleaning_tag) {</div><div class='del'>-		gtk_timeout_remove (entry-&gt;cleaning_tag);</div><div class='del'>-		entry-&gt;cleaning_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_model_cancel_cardify_all (entry-&gt;model);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-focus_out_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry = user_data;</div><div class='del'>-	gboolean visible = e_entry_completion_popup_is_visible (entry-&gt;entry);</div><div class='del'>-</div><div class='del'>-	if (! visible) {</div><div class='del'>-		e_select_names_model_cardify_all (entry-&gt;model, entry-&gt;manager-&gt;completion_book, 100);</div><div class='del'>-		if (entry-&gt;cleaning_tag == 0)</div><div class='del'>-			entry-&gt;cleaning_tag = gtk_timeout_add (100, clean_cb, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-completion_popup_cb (EEntry *w, gint visible, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry = user_data;</div><div class='del'>-</div><div class='del'>-	if (!visible &amp;&amp; !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry-&gt;entry-&gt;canvas)))</div><div class='del'>-		e_select_names_model_cardify_all (entry-&gt;model, entry-&gt;manager-&gt;completion_book, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-completion_handler (EEntry *entry, ECompletionMatch *match)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *mgr_entry;</div><div class='del'>-	ESelectNamesTextModel *text_model;</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	gint i, pos, start_pos, len;</div><div class='del'>-</div><div class='del'>-	if (match == NULL || match-&gt;user_data == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mgr_entry = get_entry_info (entry);</div><div class='del'>-	dest = E_DESTINATION (match-&gt;user_data);</div><div class='del'>-</div><div class='del'>-	/* Sometimes I really long for garbage collection.  Reference</div><div class='del'>-           counting makes you feel 31337, but sometimes it is just a</div><div class='del'>-           bitch. */</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (entry),</div><div class='del'>-			"model", &amp;text_model,</div><div class='del'>-			NULL);</div><div class='del'>-	g_assert (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));</div><div class='del'>-</div><div class='del'>-	pos = e_entry_get_position (entry);</div><div class='del'>-	e_select_names_model_text_pos (mgr_entry-&gt;model, text_model-&gt;seplen, pos, &amp;i, NULL, NULL);</div><div class='del'>-	e_select_names_model_replace (mgr_entry-&gt;model, i, dest);</div><div class='del'>-	e_select_names_model_name_pos (mgr_entry-&gt;model, text_model-&gt;seplen, i, &amp;start_pos, &amp;len);</div><div class='del'>-	e_entry_set_position (entry, start_pos+len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESelectNamesManagerEntry *</div><div class='del'>-e_select_names_manager_entry_new (ESelectNamesManager *manager, ESelectNamesModel *model, const gchar *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry;</div><div class='del'>-	ETextModel *text_model;</div><div class='del'>-	ECompletion *comp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	entry = g_new0 (ESelectNamesManagerEntry, 1);</div><div class='del'>-</div><div class='del'>-	entry-&gt;id = g_strdup (id);</div><div class='del'>-</div><div class='del'>-	entry-&gt;entry = E_ENTRY (e_entry_new ());</div><div class='del'>-	text_model = e_select_names_text_model_new (model);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(entry-&gt;entry),</div><div class='del'>-		       "model",          text_model, /* The entry takes ownership of the text model */</div><div class='del'>-		       "editable",       TRUE,</div><div class='del'>-		       "use_ellipsis",   TRUE,</div><div class='del'>-		       "allow_newlines", FALSE,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (entry-&gt;entry));</div><div class='del'>-</div><div class='del'>-	comp = e_select_names_completion_new (NULL, E_SELECT_NAMES_TEXT_MODEL (text_model));</div><div class='del'>-	if (manager-&gt;completion_book)</div><div class='del'>-		e_select_names_completion_add_book (E_SELECT_NAMES_COMPLETION (comp),</div><div class='del'>-						    manager-&gt;completion_book);</div><div class='del'>-</div><div class='del'>-	e_entry_enable_completion_full (entry-&gt;entry, comp, 50, completion_handler);</div><div class='del'>-</div><div class='del'>-	entry-&gt;manager = manager;</div><div class='del'>-</div><div class='del'>-	entry-&gt;model = model;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (model));</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry-&gt;entry),</div><div class='del'>-			    "popup",</div><div class='del'>-			    GTK_SIGNAL_FUNC (popup_cb),</div><div class='del'>-			    entry);</div><div class='del'>-			</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry-&gt;entry-&gt;canvas),</div><div class='del'>-			    "focus_in_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (focus_in_cb),</div><div class='del'>-			    entry);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry-&gt;entry-&gt;canvas),</div><div class='del'>-			    "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (focus_out_cb),</div><div class='del'>-			    entry);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry-&gt;entry),</div><div class='del'>-			    "completion_popup",</div><div class='del'>-			    GTK_SIGNAL_FUNC (completion_popup_cb),</div><div class='del'>-			    entry);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (entry-&gt;entry), "entry_info", entry);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (entry-&gt;entry), "select_names_model", model);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (entry-&gt;entry), "select_names_text_model", text_model);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (entry-&gt;entry), "completion_handler", comp);</div><div class='del'>-</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_entry_free (ESelectNamesManagerEntry *entry)</div><div class='del'>-{</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (entry-&gt;id);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (entry-&gt;model));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (entry-&gt;entry));</div><div class='del'>-</div><div class='del'>-	if (entry-&gt;cleaning_tag)</div><div class='del'>-		gtk_timeout_remove (entry-&gt;cleaning_tag);</div><div class='del'>-</div><div class='del'>-	g_free (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_save_models (ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-	</div><div class='del'>-	for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (section-&gt;original_model == NULL &amp;&amp; section-&gt;model != NULL)</div><div class='del'>-			section-&gt;original_model = e_select_names_model_duplicate (section-&gt;model);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_revert_to_saved_models (ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-		if (section-&gt;model &amp;&amp; section-&gt;original_model) {</div><div class='del'>-			e_select_names_model_overwrite_copy (section-&gt;model, section-&gt;original_model);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (section-&gt;original_model));</div><div class='del'>-			section-&gt;original_model = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_discard_saved_models (ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-		if (section-&gt;original_model) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (section-&gt;original_model));</div><div class='del'>-			section-&gt;original_model = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		manager-&gt;completion_book = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (manager)); /* unref ourself (matches ref before the load_uri call below) */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_manager_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesManager that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ESelectNamesManager *</div><div class='del'>-e_select_names_manager_new (void)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *val;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	db = addressbook_config_database (&amp;ev);</div><div class='del'>-</div><div class='del'>-	val = bonobo_config_get_string (db, "/Addressbook/Completion/uri", &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (val) {</div><div class='del'>-		manager-&gt;completion_book = e_book_new ();</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (manager)); /* ref ourself before our async call */</div><div class='del'>-		addressbook_load_uri (manager-&gt;completion_book, val, (EBookCallback)open_book_cb, manager);</div><div class='del'>-		g_free (val);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		manager-&gt;completion_book = NULL;</div><div class='del'>-</div><div class='del'>-	return manager;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesManager lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_manager_add_section (ESelectNamesManager *manager,</div><div class='del'>-				    const char *id,</div><div class='del'>-				    const char *title)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));</div><div class='del'>-	g_return_if_fail (id != NULL);</div><div class='del'>-	g_return_if_fail (title != NULL);</div><div class='del'>-	</div><div class='del'>-	e_select_names_manager_add_section_with_limit (manager, id, title, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,</div><div class='del'>-					       const char *id,</div><div class='del'>-					       const char *title,</div><div class='del'>-					       gint limit)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerSection *section;</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));</div><div class='del'>-	g_return_if_fail (id != NULL);</div><div class='del'>-	g_return_if_fail (title != NULL);</div><div class='del'>-	</div><div class='del'>-	model = e_select_names_model_new ();</div><div class='del'>-	e_select_names_model_set_limit (model, limit);</div><div class='del'>-	</div><div class='del'>-	section = e_select_names_manager_section_new (manager, id, title, model);</div><div class='del'>-</div><div class='del'>-	manager-&gt;sections = g_list_append (manager-&gt;sections, section);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_manager_get_source (ESelectNamesManager *manager,</div><div class='del'>-				   const char *id)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-		if (!strcmp (section-&gt;id, id))</div><div class='del'>-			return section-&gt;model;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-		if (!strcmp(section-&gt;id, id)) {</div><div class='del'>-			ESelectNamesManagerEntry *entry;</div><div class='del'>-</div><div class='del'>-			entry = e_select_names_manager_entry_new (manager, section-&gt;model, section-&gt;id);</div><div class='del'>-			manager-&gt;entries = g_list_append (manager-&gt;entries, entry);</div><div class='del'>-</div><div class='del'>-			return GTK_WIDGET(entry-&gt;entry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-</div><div class='del'>-	switch(button) {</div><div class='del'>-	case 0:</div><div class='del'>-		e_select_names_manager_discard_saved_models (manager);</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[OK]);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		e_select_names_manager_revert_to_saved_models (manager);</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[CANCEL]);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,</div><div class='del'>-					const char *id)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));</div><div class='del'>-	g_return_if_fail (id != NULL);</div><div class='del'>-</div><div class='del'>-	if (manager-&gt;names) {</div><div class='del'>-		</div><div class='del'>-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager-&gt;names)));</div><div class='del'>-		e_select_names_set_default (manager-&gt;names, id);</div><div class='del'>-		gdk_window_show (GTK_WIDGET (manager-&gt;names)-&gt;window);</div><div class='del'>-		gdk_window_raise (GTK_WIDGET (manager-&gt;names)-&gt;window);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		GList *iter;</div><div class='del'>-</div><div class='del'>-		manager-&gt;names = E_SELECT_NAMES (e_select_names_new ());</div><div class='del'>-</div><div class='del'>-		for (iter = manager-&gt;sections; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-			ESelectNamesManagerSection *section = iter-&gt;data;</div><div class='del'>-			e_select_names_add_section (manager-&gt;names, section-&gt;id, section-&gt;title, section-&gt;model);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_select_names_set_default (manager-&gt;names, id);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(manager-&gt;names), </div><div class='del'>-				   "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC(e_select_names_clicked),</div><div class='del'>-				   manager);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(manager-&gt;names),</div><div class='del'>-				   "destroy",</div><div class='del'>-				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), </div><div class='del'>-				   &amp;manager-&gt;names);</div><div class='del'>-</div><div class='del'>-		gtk_widget_show(GTK_WIDGET(manager-&gt;names));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_save_models (manager);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_init (ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	manager-&gt;sections = NULL;</div><div class='del'>-	manager-&gt;entries  = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	</div><div class='del'>-	manager = E_SELECT_NAMES_MANAGER (object);</div><div class='del'>-</div><div class='del'>-	if (manager-&gt;names) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (manager-&gt;names));</div><div class='del'>-		manager-&gt;names = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_foreach (manager-&gt;sections, (GFunc) e_select_names_manager_section_free, NULL);</div><div class='del'>-	g_list_free (manager-&gt;sections);</div><div class='del'>-	manager-&gt;sections = NULL;</div><div class='del'>-</div><div class='del'>-	g_list_foreach (manager-&gt;entries, (GFunc) e_select_names_manager_entry_free, NULL);</div><div class='del'>-	g_list_free (manager-&gt;entries);</div><div class='del'>-	manager-&gt;entries = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_manager_destroy;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_signals[CHANGED] = </div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER_INT,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_POINTER,</div><div class='del'>-				GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_signals[OK] =</div><div class='del'>-		gtk_signal_new ("ok",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, ok),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_signals[CANCEL] =</div><div class='del'>-		gtk_signal_new ("cancel",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, cancel),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_select_names_manager_signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_manager_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesManager class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesManager class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_manager_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType manager_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!manager_type) {</div><div class='del'>-		GtkTypeInfo manager_info = {</div><div class='del'>-			"ESelectNamesManager",</div><div class='del'>-			sizeof (ESelectNamesManager),</div><div class='del'>-			sizeof (ESelectNamesManagerClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_manager_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_manager_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		manager_type = gtk_type_unique (gtk_object_get_type (), &amp;manager_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return manager_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h<br/>deleted file mode 100644<br/>index 9fdad2c304..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-manager.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-manager.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_MANAGER_H__</div><div class='del'>-#define __E_SELECT_NAMES_MANAGER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))</div><div class='del'>-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))</div><div class='del'>-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesManager ESelectNamesManager;</div><div class='del'>-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesManager {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	GList *sections;</div><div class='del'>-	GList *entries;</div><div class='del'>-</div><div class='del'>-	ESelectNames *names;</div><div class='del'>-</div><div class='del'>-	EBook *completion_book;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesManagerClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed) (ESelectNamesManager *, const gchar *section_id, gint changed_working_copy);</div><div class='del'>-	void (*ok)      (ESelectNamesManager *);</div><div class='del'>-	void (*cancel)  (ESelectNamesManager *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ESelectNamesManager *e_select_names_manager_new                    (void);</div><div class='del'>-void                 e_select_names_manager_add_section            (ESelectNamesManager *manager,</div><div class='del'>-							            const char *id,</div><div class='del'>-							            const char *title);</div><div class='del'>-void                 e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,</div><div class='del'>-								    const char *id,</div><div class='del'>-								    const char *title,</div><div class='del'>-								    gint limit);</div><div class='del'>-ESelectNamesModel   *e_select_names_manager_get_source             (ESelectNamesManager *manager,</div><div class='del'>-								    const char *id);</div><div class='del'>-GtkWidget           *e_select_names_manager_create_entry           (ESelectNamesManager *manager,</div><div class='del'>-							            const char *id);</div><div class='del'>-void                 e_select_names_manager_activate_dialog        (ESelectNamesManager *manager,</div><div class='del'>-							            const char *id);</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType              e_select_names_manager_get_type               (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c<br/>deleted file mode 100644<br/>index fadb8c21a0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,889 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Chris Lahey     &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Jon Trowbidge   &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmarshal.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#define MAX_LENGTH 2047</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_SELECT_NAMES_MODEL_CHANGED,</div><div class='del'>-	E_SELECT_NAMES_MODEL_RESIZED,</div><div class='del'>-	E_SELECT_NAMES_MODEL_LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	NAME_DATA_BLANK,</div><div class='del'>-	NAME_DATA_CARD,</div><div class='del'>-	NAME_DATA_STRING</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	NAME_FORMAT_GIVEN_FIRST,</div><div class='del'>-	NAME_FORMAT_FAMILY_FIRST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModelPrivate {</div><div class='del'>-	gchar *id;</div><div class='del'>-	gchar *title;</div><div class='del'>-</div><div class='del'>-	GList *data;  /* of EDestination */</div><div class='del'>-</div><div class='del'>-	gint limit;</div><div class='del'>-</div><div class='del'>-	gint freeze_count;</div><div class='del'>-	gboolean pending_changed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_select_names_model_init (ESelectNamesModel *model);</div><div class='del'>-static void e_select_names_model_class_init (ESelectNamesModelClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_model_destroy (GtkObject *object);</div><div class='del'>-static void e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesModel",</div><div class='del'>-			sizeof (ESelectNamesModel),</div><div class='del'>-			sizeof (ESelectNamesModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (gtk_object_get_type (), &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_INT) (GtkObject *object, gint arg1, gint arg2, gint arg3, gpointer user_data);</div><div class='del'>-static void</div><div class='del'>-local_gtk_marshal_NONE__INT_INT_INT (GtkObject    *object, </div><div class='del'>-				     GtkSignalFunc func, </div><div class='del'>-				     gpointer      func_data, </div><div class='del'>-				     GtkArg       *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__INT_INT_INT rfunc;</div><div class='del'>-	rfunc = (GtkSignal_NONE__INT_INT_INT) func;</div><div class='del'>-	(* rfunc) (object,</div><div class='del'>-		   GTK_VALUE_INT(args[0]),</div><div class='del'>-		   GTK_VALUE_INT(args[1]),</div><div class='del'>-		   GTK_VALUE_INT(args[2]),</div><div class='del'>-		   func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_class_init (ESelectNamesModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED] =</div><div class='del'>-		gtk_signal_new ("resized",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, resized),</div><div class='del'>-				local_gtk_marshal_NONE__INT_INT_INT,</div><div class='del'>-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_select_names_model_signals, E_SELECT_NAMES_MODEL_LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesModel::card",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-</div><div class='del'>-	klass-&gt;changed = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_model_set_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_model_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_init (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;priv = g_new0 (struct _ESelectNamesModelPrivate, 1);</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;limit = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-	</div><div class='del'>-	g_free (model-&gt;priv-&gt;title);</div><div class='del'>-	g_free (model-&gt;priv-&gt;id);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (model-&gt;priv-&gt;data, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (model-&gt;priv-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_free (model-&gt;priv);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_changed (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;priv-&gt;freeze_count &gt; 0) {</div><div class='del'>-		model-&gt;priv-&gt;pending_changed = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT(model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);</div><div class='del'>-		model-&gt;priv-&gt;pending_changed = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destination_changed_proxy (EDestination *dest, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	e_select_names_model_changed (E_SELECT_NAMES_MODEL (closure));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_model_new (void)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (gtk_type_new (e_select_names_model_get_type ()));</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_model_duplicate (ESelectNamesModel *old)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;id = g_strdup (old-&gt;priv-&gt;id);</div><div class='del'>-	model-&gt;priv-&gt;title = g_strdup (old-&gt;priv-&gt;title);</div><div class='del'>-	</div><div class='del'>-	for (iter = old-&gt;priv-&gt;data; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		EDestination *dup = e_destination_copy (E_DESTINATION (iter-&gt;data));</div><div class='del'>-		e_select_names_model_append (model, dup);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;limit = old-&gt;priv-&gt;limit;</div><div class='del'>-</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator)</div><div class='del'>-{</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (separator &amp;&amp; *separator, NULL);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;data == NULL) {</div><div class='del'>-		</div><div class='del'>-		text = g_strdup ("");</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		gchar **strv = g_new0 (gchar *, g_list_length (model-&gt;priv-&gt;data)+1);</div><div class='del'>-		gint i = 0;</div><div class='del'>-		GList *iter = model-&gt;priv-&gt;data;</div><div class='del'>-		</div><div class='del'>-		while (iter) {</div><div class='del'>-			EDestination *dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-			strv[i] = (gchar *) e_destination_get_textrep (dest);</div><div class='del'>-			++i;</div><div class='del'>-			iter = g_list_next (iter);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		text = g_strjoinv (separator, strv);</div><div class='del'>-		</div><div class='del'>-		if (strlen(text) &gt; MAX_LENGTH) {</div><div class='del'>-			text[MAX_LENGTH] = '\0';</div><div class='del'>-			text = g_realloc (text, MAX_LENGTH + 1);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (strv);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return text;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_select_names_model_get_address_text (ESelectNamesModel *model, const char *separator)</div><div class='del'>-{</div><div class='del'>-	gchar *addr_text;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (separator &amp;&amp; *separator, NULL);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;data == NULL) {</div><div class='del'>-</div><div class='del'>-		addr_text = g_strdup ("");</div><div class='del'>-		</div><div class='del'>-	} else {</div><div class='del'>-		gchar **strv = g_new0 (gchar *, g_list_length (model-&gt;priv-&gt;data)+1);</div><div class='del'>-		gint i = 0;</div><div class='del'>-		GList *iter = model-&gt;priv-&gt;data;</div><div class='del'>-</div><div class='del'>-		while (iter) {</div><div class='del'>-			EDestination *dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-			strv[i] = (gchar *) e_destination_get_address (dest);</div><div class='del'>-			if (strv[i])</div><div class='del'>-				++i;</div><div class='del'>-			iter = g_list_next (iter);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		addr_text = g_strjoinv (separator, strv);</div><div class='del'>-		</div><div class='del'>-		g_free (strv);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addr_text;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_select_names_model_count (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (model != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);</div><div class='del'>-</div><div class='del'>-	return g_list_length (model-&gt;priv-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_select_names_model_get_limit (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (model != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);</div><div class='del'>-</div><div class='del'>-	return model-&gt;priv-&gt;limit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_set_limit (ESelectNamesModel *model, gint limit)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;limit = MAX (limit, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_model_at_limit (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (model != NULL, TRUE);</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), TRUE);</div><div class='del'>-</div><div class='del'>-	return model-&gt;priv-&gt;limit &gt;= 0 &amp;&amp; g_list_length (model-&gt;priv-&gt;data) &gt;= model-&gt;priv-&gt;limit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const EDestination *</div><div class='del'>-e_select_names_model_get_destination (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (0 &lt;= index, NULL);</div><div class='del'>-	g_return_val_if_fail (index &lt; g_list_length (model-&gt;priv-&gt;data), NULL);</div><div class='del'>-</div><div class='del'>-	return E_DESTINATION (g_list_nth_data (model-&gt;priv-&gt;data, index));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_select_names_model_export_destinationv (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	gchar *str;</div><div class='del'>-	gint i, len = 0;</div><div class='del'>-	GList *j;</div><div class='del'>-	g_return_val_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	len = g_list_length (model-&gt;priv-&gt;data);</div><div class='del'>-	destv = g_new0 (EDestination *, len+1);</div><div class='del'>-	</div><div class='del'>-	for (i=0, j = model-&gt;priv-&gt;data; j != NULL; j = g_list_next (j)) {</div><div class='del'>-		EDestination *dest = E_DESTINATION (j-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (dest)</div><div class='del'>-			destv[i++] = dest;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str = e_destination_exportv (destv);</div><div class='del'>-	g_free (destv);</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-void send_changed (EDestination *dest, ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = closure;</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_import_destinationv (ESelectNamesModel *model,</div><div class='del'>-					  gchar *destinationv)</div><div class='del'>-{</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-</div><div class='del'>-	destv = e_destination_importv (destinationv);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_delete_all (model);</div><div class='del'>-</div><div class='del'>-	if (destv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; destv[i]; i++) {</div><div class='del'>-		e_destination_use_card (destv[i], send_changed, model);</div><div class='del'>-		e_select_names_model_append (model, destv[i]);</div><div class='del'>-	}</div><div class='del'>-	g_free (destv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_select_names_model_get_card (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	const EDestination *dest;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (0 &lt;= index, NULL);</div><div class='del'>-	g_return_val_if_fail (index &lt; g_list_length (model-&gt;priv-&gt;data), NULL);</div><div class='del'>-</div><div class='del'>-	dest = e_select_names_model_get_destination (model, index);</div><div class='del'>-	return dest ? e_destination_get_card (dest) : NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_select_names_model_get_string (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	const EDestination *dest;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (0 &lt;= index, NULL);</div><div class='del'>-	g_return_val_if_fail (index &lt; g_list_length (model-&gt;priv-&gt;data), NULL);</div><div class='del'>-</div><div class='del'>-	dest = e_select_names_model_get_destination (model, index);</div><div class='del'>-	</div><div class='del'>-	return dest ? e_destination_get_textrep (dest) : "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_destination (ESelectNamesModel *model, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dest),</div><div class='del'>-			    "changed",</div><div class='del'>-			    destination_changed_proxy,</div><div class='del'>-			    model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disconnect_destination (ESelectNamesModel *model, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_disconnect_by_func (GTK_OBJECT (dest), destination_changed_proxy, model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_model_contains (ESelectNamesModel *model, const EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);</div><div class='del'>-</div><div class='del'>-	for (iter = model-&gt;priv-&gt;data; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		if (iter-&gt;data != NULL &amp;&amp; e_destination_equal (dest, E_DESTINATION (iter-&gt;data)))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_insert (ESelectNamesModel *model, gint index, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (0 &lt;= index &amp;&amp; index &lt;= g_list_length (model-&gt;priv-&gt;data));</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-</div><div class='del'>-	if (e_select_names_model_at_limit (model)) {</div><div class='del'>-		/* FIXME: This is bad. */</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	connect_destination (model, dest);</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;data = g_list_insert (model-&gt;priv-&gt;data, dest, index);</div><div class='del'>-	</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-	gtk_object_sink (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_append (ESelectNamesModel *model, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (model &amp;&amp; E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-</div><div class='del'>-	if (e_select_names_model_at_limit (model)) {</div><div class='del'>-		/* FIXME: This is bad. */</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	connect_destination (model, dest);</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;data = g_list_append (model-&gt;priv-&gt;data, dest);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref  (GTK_OBJECT (dest));</div><div class='del'>-	gtk_object_sink (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	const gchar *new_str, *old_str;</div><div class='del'>-	gint old_strlen=0, new_strlen=0;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (model-&gt;priv-&gt;data == NULL || (0 &lt;= index &amp;&amp; index &lt; g_list_length (model-&gt;priv-&gt;data)));</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_DESTINATION (dest));</div><div class='del'>-	</div><div class='del'>-	new_str = e_destination_get_textrep (dest);</div><div class='del'>-	new_strlen = new_str ? strlen (new_str) : 0;</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;data == NULL) {</div><div class='del'>-</div><div class='del'>-		connect_destination (model, dest);</div><div class='del'>-</div><div class='del'>-		model-&gt;priv-&gt;data = g_list_append (model-&gt;priv-&gt;data, dest);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-		gtk_object_sink (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		</div><div class='del'>-		node = g_list_nth (model-&gt;priv-&gt;data, index);</div><div class='del'>-</div><div class='del'>-		if (node-&gt;data != dest) {</div><div class='del'>-</div><div class='del'>-			disconnect_destination (model, E_DESTINATION (node-&gt;data));</div><div class='del'>-			connect_destination (model, dest);</div><div class='del'>-</div><div class='del'>-			old_str = e_destination_get_textrep (E_DESTINATION (node-&gt;data));</div><div class='del'>-			old_strlen = old_str ? strlen (old_str) : 0;</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (node-&gt;data));</div><div class='del'>-</div><div class='del'>-			node-&gt;data = dest;</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-			gtk_object_sink (GTK_OBJECT (dest));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED],</div><div class='del'>-			 index, old_strlen, new_strlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_delete (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	EDestination *dest;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (0 &lt;= index &amp;&amp; index &lt; g_list_length (model-&gt;priv-&gt;data));</div><div class='del'>-	</div><div class='del'>-	node = g_list_nth (model-&gt;priv-&gt;data, index);</div><div class='del'>-	dest = E_DESTINATION (node-&gt;data);</div><div class='del'>-</div><div class='del'>-	disconnect_destination (model, dest);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	model-&gt;priv-&gt;data = g_list_remove_link (model-&gt;priv-&gt;data, node);</div><div class='del'>-	g_list_free_1 (node);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_clean (ESelectNamesModel *model, gboolean clean_last_entry)</div><div class='del'>-{</div><div class='del'>-	GList *iter, *next;</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL &amp;&amp; E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-</div><div class='del'>-	iter = model-&gt;priv-&gt;data;</div><div class='del'>-</div><div class='del'>-	while (iter) {</div><div class='del'>-		EDestination *dest;</div><div class='del'>-</div><div class='del'>-		next = g_list_next (iter);</div><div class='del'>-</div><div class='del'>-		if (next == NULL &amp;&amp; !clean_last_entry)</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		dest = iter-&gt;data ? E_DESTINATION (iter-&gt;data) : NULL;</div><div class='del'>-</div><div class='del'>-		if (dest == NULL || e_destination_is_empty (dest)) {</div><div class='del'>-			if (dest) {</div><div class='del'>-				disconnect_destination (model, dest);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-			}</div><div class='del'>-			model-&gt;priv-&gt;data = g_list_remove_link (model-&gt;priv-&gt;data, iter);</div><div class='del'>-			g_list_free_1 (iter);</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		iter = next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed)</div><div class='del'>-		e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_all_iter (gpointer data, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	disconnect_destination (E_SELECT_NAMES_MODEL (closure), E_DESTINATION (data));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_delete_all (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (model != NULL &amp;&amp; E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-</div><div class='del'>-	g_list_foreach (model-&gt;priv-&gt;data, delete_all_iter, model);</div><div class='del'>-	g_list_free (model-&gt;priv-&gt;data);</div><div class='del'>-	model-&gt;priv-&gt;data = NULL;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src)</div><div class='del'>-{</div><div class='del'>-	gint i, len;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dest &amp;&amp; E_IS_SELECT_NAMES_MODEL (dest));</div><div class='del'>-	g_return_if_fail (src &amp;&amp; E_IS_SELECT_NAMES_MODEL (src));</div><div class='del'>-</div><div class='del'>-	if (src == dest)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_delete_all (dest);</div><div class='del'>-	len = e_select_names_model_count (src);</div><div class='del'>-	for (i = 0; i &lt; len; ++i) {</div><div class='del'>-		const EDestination *d = e_select_names_model_get_destination (src, i);</div><div class='del'>-		if (d)</div><div class='del'>-			e_select_names_model_append (dest, e_destination_copy (d));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_merge (ESelectNamesModel *dest, ESelectNamesModel *src)</div><div class='del'>-{</div><div class='del'>-	gint i, len;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (dest));</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (src));</div><div class='del'>-</div><div class='del'>-	if (src == dest)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = e_select_names_model_count (src);</div><div class='del'>-	for (i = 0; i &lt; len; ++i) {</div><div class='del'>-		const EDestination *d = e_select_names_model_get_destination (src, i);</div><div class='del'>-		if (d &amp;&amp; !e_select_names_model_contains (dest, d))</div><div class='del'>-			e_select_names_model_append (dest, e_destination_copy (d));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length)</div><div class='del'>-{</div><div class='del'>-	gint rp = 0, i, len = 0;</div><div class='del'>-	GList *iter;</div><div class='del'>-	const gchar *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (seplen &gt; 0);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	iter = model-&gt;priv-&gt;data;</div><div class='del'>-	while (iter &amp;&amp; i &lt;= index) {</div><div class='del'>-		rp += len + (i &gt; 0 ? seplen : 0);</div><div class='del'>-		str = e_destination_get_textrep (E_DESTINATION (iter-&gt;data));</div><div class='del'>-		len = str ? strlen (str) : 0;</div><div class='del'>-		++i;</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (i &lt;= index) {</div><div class='del'>-		rp = -1;</div><div class='del'>-		len = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pos)</div><div class='del'>-		*pos = rp;</div><div class='del'>-	if (length)</div><div class='del'>-		*length = len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-	const gchar *str;</div><div class='del'>-	gint len = 0, i = 0, sp = 0, adj = 0;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (seplen &gt; 0);</div><div class='del'>-</div><div class='del'>-	iter = model-&gt;priv-&gt;data;</div><div class='del'>-</div><div class='del'>-	while (iter != NULL) {</div><div class='del'>-		str = e_destination_get_textrep (E_DESTINATION (iter-&gt;data));</div><div class='del'>-		len = str ? strlen (str) : 0;</div><div class='del'>-</div><div class='del'>-		if (sp &lt;= pos &amp;&amp; pos &lt;= sp + len + adj) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sp += len + adj + 1;</div><div class='del'>-		adj = seplen-1;</div><div class='del'>-		++i;</div><div class='del'>-</div><div class='del'>-		iter = g_list_next (iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i != 0)</div><div class='del'>-		sp += seplen-1; /* skip past "magic space" */</div><div class='del'>-</div><div class='del'>-	if (iter == NULL) {</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("text_pos ended NULL\n");</div><div class='del'>-#endif</div><div class='del'>-		i = -1;</div><div class='del'>-		sp = -1;</div><div class='del'>-		len = 0;</div><div class='del'>-	} else {</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("text_pos got index %d\n", i);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (index)</div><div class='del'>-		*index = i;</div><div class='del'>-	if (start_pos)</div><div class='del'>-		*start_pos = sp;</div><div class='del'>-	if (length)</div><div class='del'>-		*length = len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_cardify (ESelectNamesModel *model, EBook *book, gint index, gint delay)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (book == NULL || E_IS_BOOK (book));</div><div class='del'>-	g_return_if_fail (0 &lt;= index &amp;&amp; index &lt; g_list_length (model-&gt;priv-&gt;data));</div><div class='del'>-</div><div class='del'>-	dest = E_DESTINATION (g_list_nth_data (model-&gt;priv-&gt;data, index));</div><div class='del'>-</div><div class='del'>-	if (!e_destination_is_empty (dest)) {</div><div class='del'>-</div><div class='del'>-		if (delay &gt; 0)</div><div class='del'>-			e_destination_cardify_delayed (dest, book, delay);</div><div class='del'>-		else</div><div class='del'>-			e_destination_cardify (dest, book);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_model_uncardify (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	gboolean rv = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);</div><div class='del'>-	g_return_val_if_fail (0 &lt;= index &amp;&amp; index &lt; g_list_length (model-&gt;priv-&gt;data), FALSE);</div><div class='del'>-</div><div class='del'>-	dest = E_DESTINATION (g_list_nth_data (model-&gt;priv-&gt;data, index));</div><div class='del'>-</div><div class='del'>-	if (!e_destination_is_empty (dest)) {</div><div class='del'>-		EDestination *cpy_dest = e_destination_copy (dest);</div><div class='del'>-</div><div class='del'>-		rv = e_destination_uncardify (cpy_dest);</div><div class='del'>-</div><div class='del'>-		if (rv) {</div><div class='del'>-			e_select_names_model_replace (model, index, cpy_dest);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_cancel_cardify (ESelectNamesModel *model, gint index)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (0 &lt;= index &amp;&amp; index &lt; g_list_length (model-&gt;priv-&gt;data));</div><div class='del'>-</div><div class='del'>-	dest = E_DESTINATION (g_list_nth_data (model-&gt;priv-&gt;data, index));</div><div class='del'>-	</div><div class='del'>-	e_destination_cancel_cardify (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_cardify_all (ESelectNamesModel *model, EBook *book, gint delay)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (book == NULL || E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	for (iter = model-&gt;priv-&gt;data; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		EDestination *dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-		if (!e_destination_is_empty (dest)) {</div><div class='del'>-</div><div class='del'>-			if (delay &gt; 0)</div><div class='del'>-				e_destination_cardify_delayed (dest, book, delay);</div><div class='del'>-			else</div><div class='del'>-				e_destination_cardify (dest, book);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_cancel_cardify_all (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	GList *iter;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-</div><div class='del'>-	for (iter = model-&gt;priv-&gt;data; iter != NULL; iter = g_list_next (iter)) {</div><div class='del'>-		EDestination *dest = E_DESTINATION (iter-&gt;data);</div><div class='del'>-		e_destination_cancel_cardify (dest);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_freeze (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	</div><div class='del'>-	++model-&gt;priv-&gt;freeze_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_thaw (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));</div><div class='del'>-	g_return_if_fail (model-&gt;priv-&gt;freeze_count &gt; 0);</div><div class='del'>-</div><div class='del'>-	--model-&gt;priv-&gt;freeze_count;</div><div class='del'>-	if (model-&gt;priv-&gt;pending_changed)</div><div class='del'>-		e_select_names_model_changed (model);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h<br/>deleted file mode 100644<br/>index 9179eb676d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-destination.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))</div><div class='del'>-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesModel ESelectNamesModel;</div><div class='del'>-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;</div><div class='del'>-struct _ESelectNamesModelPrivate;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModel {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	struct _ESelectNamesModelPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModelClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed) (ESelectNamesModel *model);</div><div class='del'>-	void (*resized) (ESelectNamesModel *model, gint index, gint old_len, gint new_len);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_select_names_model_get_type  (void);</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *e_select_names_model_new       (void);</div><div class='del'>-ESelectNamesModel *e_select_names_model_duplicate (ESelectNamesModel *old);</div><div class='del'>-</div><div class='del'>-gchar             *e_select_names_model_get_textification (ESelectNamesModel *model, const char *separator);</div><div class='del'>-gchar             *e_select_names_model_get_address_text  (ESelectNamesModel *model, const char *separator);</div><div class='del'>-</div><div class='del'>-gint                e_select_names_model_count               (ESelectNamesModel *model);</div><div class='del'>-gint                e_select_names_model_get_limit           (ESelectNamesModel *model);</div><div class='del'>-void                e_select_names_model_set_limit           (ESelectNamesModel *model, gint limit);</div><div class='del'>-gboolean            e_select_names_model_at_limit            (ESelectNamesModel *model);</div><div class='del'>-</div><div class='del'>-const EDestination *e_select_names_model_get_destination     (ESelectNamesModel *model, gint index);</div><div class='del'>-gchar              *e_select_names_model_export_destinationv (ESelectNamesModel *model);</div><div class='del'>-void                e_select_names_model_import_destinationv (ESelectNamesModel *model,</div><div class='del'>-							      gchar *destinationv);</div><div class='del'>-ECard              *e_select_names_model_get_card            (ESelectNamesModel *model, gint index);</div><div class='del'>-const gchar        *e_select_names_model_get_string          (ESelectNamesModel *model, gint index);</div><div class='del'>-</div><div class='del'>-gboolean      e_select_names_model_contains       (ESelectNamesModel *model, const EDestination *dest);</div><div class='del'>-</div><div class='del'>-void          e_select_names_model_insert         (ESelectNamesModel *model, gint index, EDestination *dest);</div><div class='del'>-void          e_select_names_model_append         (ESelectNamesModel *model, EDestination *dest);</div><div class='del'>-void          e_select_names_model_replace        (ESelectNamesModel *model, gint index, EDestination *dest);</div><div class='del'>-void          e_select_names_model_delete         (ESelectNamesModel *model, gint index);</div><div class='del'>-void          e_select_names_model_delete_all     (ESelectNamesModel *model);</div><div class='del'>-void          e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src);</div><div class='del'>-void          e_select_names_model_merge          (ESelectNamesModel *dest, ESelectNamesModel *src);</div><div class='del'>-</div><div class='del'>-void          e_select_names_model_clean      (ESelectNamesModel *model, gboolean clean_last_entry);</div><div class='del'>-</div><div class='del'>-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint seplen, gint index, gint *pos, gint *length);</div><div class='del'>-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint seplen, gint pos, gint *index, gint *start_pos, gint *length);</div><div class='del'>-</div><div class='del'>-void          e_select_names_model_cardify            (ESelectNamesModel *model, EBook *book, gint index, gint delay);</div><div class='del'>-gboolean      e_select_names_model_uncardify          (ESelectNamesModel *model, gint index);</div><div class='del'>-void          e_select_names_model_cancel_cardify     (ESelectNamesModel *model, gint index);</div><div class='del'>-void          e_select_names_model_cardify_all        (ESelectNamesModel *model, EBook *book, gint delay);</div><div class='del'>-void          e_select_names_model_cancel_cardify_all (ESelectNamesModel *model);</div><div class='del'>-</div><div class='del'>-/* This is a mildly annoying freeze/thaw pair, in that it only applies to the 'changed'</div><div class='del'>-   signal and not to 'resized'.  This could cause unexpected results in some cases. */</div><div class='del'>-void          e_select_names_model_freeze (ESelectNamesModel *model);</div><div class='del'>-void          e_select_names_model_thaw   (ESelectNamesModel *model);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c<br/>deleted file mode 100644<br/>index 442a00b6c1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-popup.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-popup.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,564 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-select-names-popup.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckmenuitem.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app-helper.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-editor.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-quick-add.h&gt;</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-#include "e-select-names-popup.h"</div><div class='del'>-</div><div class='del'>-typedef struct _PopupInfo PopupInfo;</div><div class='del'>-struct _PopupInfo {</div><div class='del'>-	ESelectNamesTextModel *text_model;</div><div class='del'>-	const EDestination *dest;</div><div class='del'>-	gint pos;</div><div class='del'>-	gint index;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static PopupInfo *</div><div class='del'>-popup_info_new (ESelectNamesTextModel *text_model, const EDestination *dest, gint pos, gint index)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = g_new0 (PopupInfo, 1);</div><div class='del'>-	info-&gt;text_model = text_model;</div><div class='del'>-	info-&gt;dest = dest;</div><div class='del'>-	info-&gt;pos = pos;</div><div class='del'>-	info-&gt;index = index;</div><div class='del'>-</div><div class='del'>-	if (text_model)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (text_model));</div><div class='del'>-</div><div class='del'>-	if (dest)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_info_free (PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info) {</div><div class='del'>-		</div><div class='del'>-		if (info-&gt;text_model)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (info-&gt;text_model));</div><div class='del'>-</div><div class='del'>-		if (info-&gt;dest)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (info-&gt;dest));</div><div class='del'>-</div><div class='del'>-		g_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_info_cleanup (GtkWidget *w, gpointer info)</div><div class='del'>-{</div><div class='del'>-	popup_info_free ((PopupInfo *) info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* You are in a maze of twisty little callbacks, all alike... */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-make_contact_editor_cb (EBook *book, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (book) {</div><div class='del'>-		EDestination *dest = E_DESTINATION (user_data);</div><div class='del'>-		ECard *card;</div><div class='del'>-</div><div class='del'>-		card = (ECard *) e_destination_get_card (dest);</div><div class='del'>-		if (e_card_evolution_list (card)) {</div><div class='del'>-			EContactListEditor *ce;</div><div class='del'>-			ce = e_addressbook_show_contact_list_editor (book, card, FALSE, TRUE);</div><div class='del'>-			e_contact_list_editor_raise (ce);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			EContactEditor *ce;</div><div class='del'>-			ce = e_addressbook_show_contact_editor (book, card, FALSE, TRUE);</div><div class='del'>-			e_contact_editor_raise (ce);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_contact_info_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	if (info == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (info-&gt;dest));</div><div class='del'>-	e_book_use_local_address_book (make_contact_editor_cb, (gpointer) info-&gt;dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_email_num_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	gint n;</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	</div><div class='del'>-	if (info == NULL) </div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (! GTK_CHECK_MENU_ITEM (w)-&gt;active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	n = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "number"));</div><div class='del'>-</div><div class='del'>-	if (n != e_destination_get_email_num (info-&gt;dest)) {</div><div class='del'>-		dest = e_destination_new ();</div><div class='del'>-		e_destination_set_card (dest, e_destination_get_card (info-&gt;dest), n);</div><div class='del'>-		e_select_names_model_replace (info-&gt;text_model-&gt;source, info-&gt;index, dest);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_recipient_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	e_select_names_model_delete (info-&gt;text_model-&gt;source, info-&gt;index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_remove_recipient (GnomeUIInfo *uiinfo, PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	uiinfo-&gt;type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo-&gt;label = _("Remove");</div><div class='del'>-	uiinfo-&gt;moreinfo = remove_recipient_cb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_all_recipients_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	e_select_names_model_delete_all (info-&gt;text_model-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_remove_all_recipients (GnomeUIInfo *uiinfo, PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	uiinfo-&gt;type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo-&gt;label = _("Remove All");</div><div class='del'>-	uiinfo-&gt;moreinfo = remove_all_recipients_cb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-toggle_html_mail_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM (w);</div><div class='del'>-	const EDestination *dest;</div><div class='del'>-</div><div class='del'>-	if (info == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dest = info-&gt;dest;</div><div class='del'>-</div><div class='del'>-	item = GTK_CHECK_MENU_ITEM (item);</div><div class='del'>-	e_destination_set_html_mail_pref ((EDestination *) dest, item-&gt;active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	uiinfo-&gt;type = GNOME_APP_UI_TOGGLEITEM;</div><div class='del'>-	uiinfo-&gt;label = _("Send HTML Mail?");</div><div class='del'>-	uiinfo-&gt;moreinfo = toggle_html_mail_cb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (uiinfo-&gt;widget),</div><div class='del'>-					e_destination_get_html_mail_pref (info-&gt;dest));</div><div class='del'>-	gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (uiinfo-&gt;widget), TRUE);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_uiinfo_label (GnomeUIInfo *uiinfo, const gchar *str)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	gchar *label_txt;</div><div class='del'>-	GList *item_children;</div><div class='del'>-	</div><div class='del'>-	label_txt = e_utf8_to_locale_string (str);</div><div class='del'>-	item_children = gtk_container_children (GTK_CONTAINER (uiinfo-&gt;widget));</div><div class='del'>-	label = item_children-&gt;data;</div><div class='del'>-	g_list_free (item_children);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (label), label_txt);</div><div class='del'>-	g_free (label_txt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define ARBITRARY_UIINFO_LIMIT 64</div><div class='del'>-static GtkWidget *</div><div class='del'>-popup_menu_card (PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	GnomeUIInfo radioinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	gboolean using_radio = FALSE;</div><div class='del'>-	ECard *card;</div><div class='del'>-	gint i=0;</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	gint html_toggle;</div><div class='del'>-	gint mail_label = -1;</div><div class='del'>-	const gchar *mail_label_str = NULL;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Build up our GnomeUIInfo array.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	memset (uiinfo, 0, sizeof (uiinfo));</div><div class='del'>-	memset (radioinfo, 0, sizeof (radioinfo));</div><div class='del'>-</div><div class='del'>-	card = e_destination_get_card (info-&gt;dest);</div><div class='del'>-</div><div class='del'>-	/* Use an empty label for now, we'll fill it later.</div><div class='del'>-	   If we set uiinfo label to contact name here, gnome_popup_menu_new</div><div class='del'>-	   could screw it up trying make a "translation". */</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = "";</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	if (card-&gt;email) {</div><div class='del'>-		</div><div class='del'>-		if (e_list_length (card-&gt;email) &gt; 1) {</div><div class='del'>-			gint j = 0;</div><div class='del'>-</div><div class='del'>-			using_radio = TRUE;</div><div class='del'>-</div><div class='del'>-			iterator = e_list_get_iterator (card-&gt;email);</div><div class='del'>-			for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {</div><div class='del'>-				gchar *label = (gchar *)e_iterator_get (iterator);</div><div class='del'>-				if (label &amp;&amp; *label) {</div><div class='del'>-					radioinfo[j].label = "";</div><div class='del'>-					radioinfo[j].type = GNOME_APP_UI_ITEM;</div><div class='del'>-					radioinfo[j].moreinfo = change_email_num_cb;</div><div class='del'>-					++j;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-			</div><div class='del'>-			radioinfo[j].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-			</div><div class='del'>-			uiinfo[i].type = GNOME_APP_UI_RADIOITEMS;</div><div class='del'>-			uiinfo[i].moreinfo = radioinfo;</div><div class='del'>-			++i;</div><div class='del'>-			</div><div class='del'>-		} else {</div><div class='del'>-			uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-			uiinfo[i].label = "";</div><div class='del'>-			mail_label_str = e_destination_get_email (info-&gt;dest);</div><div class='del'>-			mail_label = i;</div><div class='del'>-			++i;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-		++i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_html_mail (&amp;(uiinfo[i]), info);</div><div class='del'>-	html_toggle = i;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = N_("Edit Contact Info");</div><div class='del'>-	uiinfo[i].moreinfo = edit_contact_info_cb;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	add_remove_recipient (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-	</div><div class='del'>-	add_remove_all_recipients (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-		</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now do something with it...</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	pop = gnome_popup_menu_new (uiinfo);</div><div class='del'>-</div><div class='del'>-	init_html_mail (&amp;(uiinfo[html_toggle]), info);</div><div class='del'>-</div><div class='del'>-	/* Properly handle the names &amp; e-mail addresses so that they don't get leaked and so that</div><div class='del'>-	   underscores are interpreted as key accelerators.  This sucks. */</div><div class='del'>-</div><div class='del'>-	set_uiinfo_label (&amp;(uiinfo[0]), e_destination_get_name (info-&gt;dest));</div><div class='del'>-	</div><div class='del'>-	if (mail_label &gt;= 0) {</div><div class='del'>-		set_uiinfo_label (&amp;(uiinfo[mail_label]), e_destination_get_email (info-&gt;dest));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (using_radio) {</div><div class='del'>-		gint n = e_destination_get_email_num (info-&gt;dest);</div><div class='del'>-		gint j = 0;</div><div class='del'>-		iterator = e_list_get_iterator (card-&gt;email);</div><div class='del'>-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {</div><div class='del'>-			gchar *label = (gchar *)e_iterator_get (iterator);</div><div class='del'>-			if (label &amp;&amp; *label) {</div><div class='del'>-				set_uiinfo_label (&amp;(radioinfo[j]), label);</div><div class='del'>-				</div><div class='del'>-				gtk_object_set_data (GTK_OBJECT (radioinfo[j].widget), "number", GINT_TO_POINTER (j));</div><div class='del'>-</div><div class='del'>-				if (j == n) </div><div class='del'>-					gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radioinfo[n].widget), TRUE);</div><div class='del'>-				</div><div class='del'>-				++j;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return pop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-popup_menu_list (PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-	const gchar *str;</div><div class='del'>-	gchar *gs;</div><div class='del'>-	gint i = 0, subcount = 0, max_subcount = 10;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	memset (uiinfo, 0, sizeof (uiinfo));</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = "";</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	card = e_destination_get_card (info-&gt;dest);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;email) {</div><div class='del'>-		</div><div class='del'>-		iterator = e_list_get_iterator (card-&gt;email);</div><div class='del'>-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) &amp;&amp; subcount &lt; max_subcount; e_iterator_next (iterator)) {</div><div class='del'>-			gchar *label = (gchar *) e_iterator_get (iterator);</div><div class='del'>-			if (label &amp;&amp; *label) {</div><div class='del'>-				uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-				uiinfo[i].label = "";</div><div class='del'>-				++i;</div><div class='del'>-				++subcount;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (e_iterator_is_valid (iterator)) {</div><div class='del'>-			uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-			uiinfo[i].label = "";</div><div class='del'>-			++i;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-		++i;</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = N_("Edit Contact List");</div><div class='del'>-	uiinfo[i].moreinfo = edit_contact_info_cb;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	add_remove_recipient (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-	</div><div class='del'>-	add_remove_all_recipients (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-</div><div class='del'>-	pop = gnome_popup_menu_new (uiinfo);</div><div class='del'>-</div><div class='del'>-	/* Now set labels properly. */</div><div class='del'>-	</div><div class='del'>-	str = e_destination_get_name (info-&gt;dest);</div><div class='del'>-	if (!(str &amp;&amp; *str))</div><div class='del'>-		str = _("Unnamed Contact List");</div><div class='del'>-	set_uiinfo_label (&amp;(uiinfo[0]), str);</div><div class='del'>-</div><div class='del'>-	if (card-&gt;email) {</div><div class='del'>-		</div><div class='del'>-		iterator = e_list_get_iterator (card-&gt;email);</div><div class='del'>-		i = 2;</div><div class='del'>-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) &amp;&amp; subcount &lt; max_subcount; e_iterator_next (iterator)) {</div><div class='del'>-			gchar *label = (gchar *) e_iterator_get (iterator);</div><div class='del'>-			if (label &amp;&amp; *label) {</div><div class='del'>-				EDestination *subdest = e_destination_import (label);</div><div class='del'>-				set_uiinfo_label (&amp;(uiinfo[i]), e_destination_get_address (subdest));</div><div class='del'>-				++i;</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (subdest));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (e_iterator_is_valid (iterator)) {</div><div class='del'>-			gs = g_strdup_printf (N_("(%d not shown)"), e_list_length (card-&gt;email) - max_subcount);</div><div class='del'>-			set_uiinfo_label (&amp;(uiinfo[i]), gs);</div><div class='del'>-			g_free (gs);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return pop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_cb (GtkWidget *w, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PopupInfo *info = (PopupInfo *) user_data;</div><div class='del'>-	e_contact_quick_add_free_form (e_destination_get_address (info-&gt;dest), NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-popup_menu_nocard (PopupInfo *info)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];</div><div class='del'>-	gint i=0;</div><div class='del'>-	GtkWidget *pop;</div><div class='del'>-	const gchar *str;</div><div class='del'>-	gint html_toggle;</div><div class='del'>-</div><div class='del'>-	memset (uiinfo, 0, sizeof (uiinfo));</div><div class='del'>-</div><div class='del'>-	/* Use an empty label for now, we'll fill it later.</div><div class='del'>-	   If we set uiinfo label to contact name here, gnome_popup_menu_new</div><div class='del'>-	   could screw it up trying make a "translation". */</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = "";</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	add_html_mail (&amp;(uiinfo[i]), info);</div><div class='del'>-	html_toggle = i;</div><div class='del'>-	++i;</div><div class='del'>-	</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ITEM;</div><div class='del'>-	uiinfo[i].label = _("Add to Contacts");</div><div class='del'>-	uiinfo[i].moreinfo = quick_add_cb;</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	add_remove_recipient (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	add_remove_all_recipients (&amp;(uiinfo[i]), info);</div><div class='del'>-	++i;</div><div class='del'>-</div><div class='del'>-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;</div><div class='del'>-</div><div class='del'>-	pop = gnome_popup_menu_new (uiinfo);</div><div class='del'>-</div><div class='del'>-	init_html_mail (&amp;(uiinfo[html_toggle]), info);</div><div class='del'>-</div><div class='del'>-	/* Now set label of the first item to contact name */</div><div class='del'>-	str = e_destination_get_name (info-&gt;dest);</div><div class='del'>-	if (! (str &amp;&amp; *str))</div><div class='del'>-		str = e_destination_get_email (info-&gt;dest);</div><div class='del'>-	if (! (str &amp;&amp; *str))</div><div class='del'>-		str = _("Unnamed Contact");</div><div class='del'>-	</div><div class='del'>-	set_uiinfo_label (&amp;(uiinfo[0]), str);</div><div class='del'>-	</div><div class='del'>-	return pop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_popup (ESelectNamesTextModel *text_model, GdkEventButton *ev, gint pos)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	GtkWidget *popup;</div><div class='del'>-	PopupInfo *info;</div><div class='del'>-	const EDestination *dest;</div><div class='del'>-	ECard *card;</div><div class='del'>-	gint index;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (text_model));</div><div class='del'>-	g_return_if_fail (ev);</div><div class='del'>-	g_return_if_fail (0 &lt;= pos);</div><div class='del'>-</div><div class='del'>-	model = text_model-&gt;source;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_text_pos (model, text_model-&gt;seplen, pos, &amp;index, NULL, NULL);</div><div class='del'>-	if (index &lt; 0 || index &gt;= e_select_names_model_count (model))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dest = e_select_names_model_get_destination (model, index);</div><div class='del'>-	if (e_destination_is_empty (dest))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	card = e_destination_get_card (dest);</div><div class='del'>-</div><div class='del'>-	info = popup_info_new (text_model, dest, pos, index);</div><div class='del'>-	</div><div class='del'>-	if (e_destination_contains_card (dest)) {</div><div class='del'>-		if (e_destination_is_evolution_list (dest))</div><div class='del'>-			popup = popup_menu_list (info);</div><div class='del'>-		else</div><div class='del'>-			popup = popup_menu_card (info);</div><div class='del'>-	} else {</div><div class='del'>-		popup = popup_menu_nocard (info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (popup) {</div><div class='del'>-		/* Clean up our info item after we've made our selection. */</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (popup),</div><div class='del'>-				    "selection-done",</div><div class='del'>-				    GTK_SIGNAL_FUNC (popup_info_cleanup),</div><div class='del'>-				    info);</div><div class='del'>-</div><div class='del'>-		gnome_popup_menu_do_popup (popup, NULL, NULL, ev, info);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		popup_info_free (info);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-popup.h b/addressbook/gui/component/select-names/e-select-names-popup.h<br/>deleted file mode 100644<br/>index 09cd29da18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-popup.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-popup.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-select-names-popup.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_POPUP_H__</div><div class='del'>-#define __E_SELECT_NAMES_POPUP_H__</div><div class='del'>-</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-</div><div class='del'>-void e_select_names_popup (ESelectNamesTextModel *text_model, GdkEventButton *ev, gint pos);</div><div class='del'>-</div><div class='del'>-#endif /* __E_SELECT_NAMES_POPUP_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c<br/>deleted file mode 100644<br/>index a4faf69503..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-table-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-table-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,348 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Chris Lahey     &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names-table-model.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_SOURCE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_init       (ESelectNamesTableModel *model);</div><div class='del'>-static void e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_destroy    (GtkObject *object);</div><div class='del'>-static void e_select_names_table_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_table_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,</div><div class='del'>-						      ESelectNamesTableModel *model);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_add_source (ESelectNamesTableModel *model,</div><div class='del'>-				       ESelectNamesModel     *source)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = source;</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source_changed_id = gtk_signal_connect(GTK_OBJECT(model-&gt;source), "changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC(e_select_names_table_model_model_changed),</div><div class='del'>-						      model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;source_changed_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT(model-&gt;source), model-&gt;source_changed_id);</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesTableModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesTableModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_table_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesTableModel",</div><div class='del'>-			sizeof (ESelectNamesTableModel),</div><div class='del'>-			sizeof (ESelectNamesTableModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_table_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_table_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (e_table_model_get_type (), &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesTableModel that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ETableModel *</div><div class='del'>-e_select_names_table_model_new (ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ETableModel *model = E_TABLE_MODEL(gtk_type_new(e_select_names_table_model_get_type()));</div><div class='del'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "source", source,</div><div class='del'>-		       NULL);</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;source) {</div><div class='del'>-		int count = e_select_names_model_count (model-&gt;source);</div><div class='del'>-		gint i;</div><div class='del'>-</div><div class='del'>-		model-&gt;count = count;</div><div class='del'>-		model-&gt;data = g_new(ESelectNamesTableModelData, count);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; count; ++i) {</div><div class='del'>-			const EDestination *dest = e_select_names_model_get_destination (model-&gt;source, i);</div><div class='del'>-			ECard *card = dest ? e_destination_get_card (dest) : NULL;</div><div class='del'>-</div><div class='del'>-			if (card) {</div><div class='del'>-				ECardSimple *simple = e_card_simple_new(card);</div><div class='del'>-				model-&gt;data[i].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);</div><div class='del'>-				if (model-&gt;data[i].name == 0)</div><div class='del'>-					model-&gt;data[i].name = g_strdup("");</div><div class='del'>-				model-&gt;data[i].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);</div><div class='del'>-				if (model-&gt;data[i].email == 0)</div><div class='del'>-					model-&gt;data[i].email = g_strdup("");</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-			} else {</div><div class='del'>-				const gchar *name = e_destination_get_name (dest);</div><div class='del'>-				const gchar *email = e_destination_get_email (dest);</div><div class='del'>-</div><div class='del'>-				model-&gt;data[i].name =  g_strdup (name &amp;&amp; *name ? name : email);</div><div class='del'>-				model-&gt;data[i].email = g_strdup (email);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		model-&gt;count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clear_info (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; model-&gt;count; i++) {</div><div class='del'>-		g_free(model-&gt;data[i].name);</div><div class='del'>-		g_free(model-&gt;data[i].email);</div><div class='del'>-	}</div><div class='del'>-	g_free(model-&gt;data);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;count = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesTableModel lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	e_select_names_table_model_drop_source (model);</div><div class='del'>-	clear_info(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_select_names_table_model_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of rows in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_select_names_table_model_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);</div><div class='del'>-	if (e_select_names_table_model-&gt;count == -1) {</div><div class='del'>-		if (e_select_names_table_model-&gt;source) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		} else {</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return e_select_names_table_model-&gt;count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the value at a particular point in our ETableModel. */</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);</div><div class='del'>-	if (e_select_names_table_model-&gt;data == NULL) {</div><div class='del'>-		fill_in_info(e_select_names_table_model);</div><div class='del'>-	}</div><div class='del'>-	switch (col) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (e_select_names_table_model-&gt;data[row].name == NULL) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		}</div><div class='del'>-		return e_select_names_table_model-&gt;data[row].name;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (e_select_names_table_model-&gt;data[row].email == NULL) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		}</div><div class='del'>-		return e_select_names_table_model-&gt;data[row].email;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns whether a particular cell is editable. */</div><div class='del'>-static gboolean</div><div class='del'>-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_model_changed (ESelectNamesModel     *source,</div><div class='del'>-					  ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	e_table_model_pre_change(E_TABLE_MODEL(model));</div><div class='del'>-	clear_info(model);</div><div class='del'>-	e_table_model_changed(E_TABLE_MODEL(model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		e_select_names_table_model_drop_source (model);</div><div class='del'>-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model-&gt;source);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_init (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-</div><div class='del'>-	model-&gt;count = -1;</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETableModelClass *table_model_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	table_model_class = E_TABLE_MODEL_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_table_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_table_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_table_model_set_arg;</div><div class='del'>-</div><div class='del'>-	table_model_class-&gt;column_count = e_select_names_table_model_col_count;</div><div class='del'>-	table_model_class-&gt;row_count = e_select_names_table_model_row_count;</div><div class='del'>-	table_model_class-&gt;value_at = e_select_names_table_model_value_at;</div><div class='del'>-	table_model_class-&gt;set_value_at = e_select_names_table_model_set_value_at;</div><div class='del'>-	table_model_class-&gt;is_cell_editable = e_select_names_table_model_is_cell_editable;</div><div class='del'>-	table_model_class-&gt;duplicate_value = e_select_names_table_model_duplicate_value;</div><div class='del'>-	table_model_class-&gt;free_value = e_select_names_table_model_free_value;</div><div class='del'>-	table_model_class-&gt;initialize_value = e_select_names_table_model_initialize_value;</div><div class='del'>-	table_model_class-&gt;value_is_empty = e_select_names_table_model_value_is_empty;</div><div class='del'>-	table_model_class-&gt;value_to_string = e_select_names_table_model_value_to_string;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h<br/>deleted file mode 100644<br/>index f917ff17d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-table-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-table-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_TABLE_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))</div><div class='del'>-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	char *email;</div><div class='del'>-} ESelectNamesTableModelData;</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesTableModel ESelectNamesTableModel;</div><div class='del'>-typedef struct _ESelectNamesTableModelClass ESelectNamesTableModelClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTableModel {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesModel *source;</div><div class='del'>-	int source_changed_id;</div><div class='del'>-</div><div class='del'>-	int count;</div><div class='del'>-	ESelectNamesTableModelData *data; /* This is used as an array. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTableModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ETableModel *e_select_names_table_model_new  (ESelectNamesModel *source);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType     e_select_names_table_model_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_TABLE_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c<br/>deleted file mode 100644<br/>index 0a69137fa5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-text-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-text-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,779 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Chris Lahey    &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-text-model-repos.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/gui/contact-editor/e-contact-editor.h&gt;</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-static FILE *out = NULL; /* stream for debugging spew */</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_SOURCE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);</div><div class='del'>-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);</div><div class='del'>-static void e_select_names_text_model_destroy    (GtkObject *object);</div><div class='del'>-static void e_select_names_text_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_text_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void e_select_names_text_model_set_source (ESelectNamesTextModel *model, ESelectNamesModel *source);</div><div class='del'>-</div><div class='del'>-static const gchar *e_select_names_text_model_get_text      (ETextModel *model);</div><div class='del'>-static void         e_select_names_text_model_set_text      (ETextModel *model, const gchar *text);</div><div class='del'>-static void         e_select_names_text_model_insert        (ETextModel *model, gint position, const gchar *text);</div><div class='del'>-static void         e_select_names_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);</div><div class='del'>-static void         e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);</div><div class='del'>-</div><div class='del'>-static gint         e_select_names_text_model_obj_count   (ETextModel *model);</div><div class='del'>-static const gchar *e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len);</div><div class='del'>-static void         e_select_names_text_model_activate_obj (ETextModel *model, gint n);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ETextModelClass *parent_class;</div><div class='del'>-#define PARENT_TYPE e_text_model_get_type()</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_text_model_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesTextModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesTextModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_text_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesTextModel",</div><div class='del'>-			sizeof (ESelectNamesTextModel),</div><div class='del'>-			sizeof (ESelectNamesTextModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_text_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_text_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (PARENT_TYPE, &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETextModelClass *text_model_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	text_model_class = E_TEXT_MODEL_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class(PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesTextModel::source",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_text_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_text_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_text_model_set_arg;</div><div class='del'>-</div><div class='del'>-	text_model_class-&gt;get_text      = e_select_names_text_model_get_text;</div><div class='del'>-	text_model_class-&gt;set_text      = e_select_names_text_model_set_text;</div><div class='del'>-	text_model_class-&gt;insert        = e_select_names_text_model_insert;</div><div class='del'>-	text_model_class-&gt;insert_length = e_select_names_text_model_insert_length;</div><div class='del'>-	text_model_class-&gt;delete        = e_select_names_text_model_delete;</div><div class='del'>-</div><div class='del'>-	text_model_class-&gt;obj_count     = e_select_names_text_model_obj_count;</div><div class='del'>-	text_model_class-&gt;get_nth_obj   = e_select_names_text_model_get_nth_obj;</div><div class='del'>-	text_model_class-&gt;object_activated = e_select_names_text_model_activate_obj;</div><div class='del'>-</div><div class='del'>-	if (getenv ("EVO_DEBUG_SELECT_NAMES_TEXT_MODEL")) {</div><div class='del'>-		out = fopen ("/tmp/evo-debug-select-names-text-model", "w");</div><div class='del'>-		if (out)</div><div class='del'>-			setvbuf (out, NULL, _IONBF, 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_model (ESelectNamesTextModel *text_model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = text_model-&gt;source;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	if (out == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	fprintf (out, "\n*** Model State: count=%d\n", e_select_names_model_count (model));</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;e_select_names_model_count (model); ++i)</div><div class='del'>-		fprintf (out, "[%d] \"%s\" %s\n", i,</div><div class='del'>-			 e_select_names_model_get_string (model, i),</div><div class='del'>-			 e_select_names_model_get_card (model, i) ? "&lt;card&gt;" : "");</div><div class='del'>-	fprintf (out, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_init (ESelectNamesTextModel *model)</div><div class='del'>-{</div><div class='del'>-	const gchar *default_sep;</div><div class='del'>-</div><div class='del'>-	model-&gt;last_magic_comma_pos = -1;</div><div class='del'>-</div><div class='del'>-	if (getenv ("EVOLUTION_DISABLE_MAGIC_COMMA"))</div><div class='del'>-		default_sep = ",";</div><div class='del'>-	else</div><div class='del'>-		default_sep = ", ";</div><div class='del'>-</div><div class='del'>-	e_select_names_text_model_set_separator (model, default_sep);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-</div><div class='del'>-	g_free (model-&gt;text);</div><div class='del'>-	g_free (model-&gt;sep);</div><div class='del'>-	</div><div class='del'>-	e_select_names_text_model_set_source (model, NULL);</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		e_select_names_text_model_set_source(model, E_SELECT_NAMES_MODEL (GTK_VALUE_OBJECT (*arg)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model-&gt;source);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-resize_cb (ESelectNamesModel *source, gint index, gint old_len, gint new_len, ETextModel *model)</div><div class='del'>-{</div><div class='del'>-	EReposDeleteShift repos_del;</div><div class='del'>-	EReposInsertShift repos_ins;</div><div class='del'>-	gint pos;</div><div class='del'>-	gint seplen = E_SELECT_NAMES_TEXT_MODEL (model)-&gt;seplen;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_name_pos (source, seplen, index, &amp;pos, NULL);</div><div class='del'>-</div><div class='del'>-	if (new_len &lt; old_len) {</div><div class='del'>-</div><div class='del'>-		repos_del.model = model;</div><div class='del'>-		repos_del.pos = pos;</div><div class='del'>-		repos_del.len = old_len - new_len;</div><div class='del'>-		e_text_model_reposition (model, e_repos_delete_shift, &amp;repos_del);</div><div class='del'>-</div><div class='del'>-	} else if (old_len &lt; new_len) {</div><div class='del'>-</div><div class='del'>-		repos_ins.model = model;</div><div class='del'>-		repos_ins.pos = pos;</div><div class='del'>-		repos_ins.len = new_len - old_len;</div><div class='del'>-		e_text_model_reposition (model, e_repos_insert_shift, &amp;repos_ins);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-changed_cb (ETextModel *model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);</div><div class='del'>-	</div><div class='del'>-	g_free (text_model-&gt;text);</div><div class='del'>-	text_model-&gt;text = NULL;</div><div class='del'>-</div><div class='del'>-	e_text_model_changed (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_set_source (ESelectNamesTextModel *model,</div><div class='del'>-				      ESelectNamesModel     *source)</div><div class='del'>-{</div><div class='del'>-	if (source == model-&gt;source)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (model-&gt;source) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (model-&gt;source), model-&gt;source_changed_id);</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (model-&gt;source), model-&gt;source_resize_id);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (model-&gt;source));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;source = source;</div><div class='del'>-</div><div class='del'>-	if (model-&gt;source) {</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (model-&gt;source));</div><div class='del'>-		model-&gt;source_changed_id = gtk_signal_connect_object (GTK_OBJECT(model-&gt;source),</div><div class='del'>-								      "changed",</div><div class='del'>-								      GTK_SIGNAL_FUNC (changed_cb),</div><div class='del'>-								      GTK_OBJECT (model));</div><div class='del'>-		model-&gt;source_resize_id = gtk_signal_connect (GTK_OBJECT(model-&gt;source),</div><div class='del'>-							      "resized",</div><div class='del'>-							      GTK_SIGNAL_FUNC (resize_cb),</div><div class='del'>-							      model);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETextModel *</div><div class='del'>-e_select_names_text_model_new (ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ETextModel *model = E_TEXT_MODEL (gtk_type_new (e_select_names_text_model_get_type()));</div><div class='del'>-	e_select_names_text_model_set_source (E_SELECT_NAMES_TEXT_MODEL (model), source);</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));</div><div class='del'>-	g_return_if_fail (sep &amp;&amp; *sep);</div><div class='del'>-</div><div class='del'>-	g_free (model-&gt;sep);</div><div class='del'>-	model-&gt;sep = g_strdup (sep);</div><div class='del'>-	model-&gt;seplen = strlen (sep);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-e_select_names_text_model_get_text (ETextModel *model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);</div><div class='del'>-</div><div class='del'>-	if (snm == NULL)</div><div class='del'>-		return "";</div><div class='del'>-	else if (snm-&gt;text == NULL)</div><div class='del'>-		snm-&gt;text = e_select_names_model_get_textification (snm-&gt;source, snm-&gt;sep);</div><div class='del'>-</div><div class='del'>-	return snm-&gt;text;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_set_text (ETextModel *model, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_delete_all (snm-&gt;source);</div><div class='del'>-	e_select_names_text_model_insert (model, 0, text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_insert (ETextModel *model, gint position, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	e_select_names_text_model_insert_length (model, position, text, strlen (text));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gchar *text, gint length)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);</div><div class='del'>-	ESelectNamesModel *source = text_model-&gt;source;</div><div class='del'>-</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	if (out) {</div><div class='del'>-		gchar *tmp = g_strndup (text, length);</div><div class='del'>-		fprintf (out, "&gt;&gt; insert  \"%s\" (len=%d) at %d\n", tmp, length, pos);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = CLAMP (pos, 0, strlen (e_select_names_model_get_textification (source, text_model-&gt;sep)));</div><div class='del'>-</div><div class='del'>-	/* We want to control all cursor motions ourselves, rather than taking hints</div><div class='del'>-	   from the ESelectNamesModel. */</div><div class='del'>-	gtk_signal_handler_block (GTK_OBJECT (source), text_model-&gt;source_resize_id);</div><div class='del'>-</div><div class='del'>-	/* We handle this one character at a time. */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; length &amp;&amp; text[i]; ++i) {</div><div class='del'>-		gint index, start_pos, text_len;</div><div class='del'>-		gboolean inside_quote = FALSE;</div><div class='del'>-</div><div class='del'>-		text_model-&gt;last_magic_comma_pos = -1;</div><div class='del'>-</div><div class='del'>-		if (out) </div><div class='del'>-			fprintf (out, "processing [%c]\n", text[i]);</div><div class='del'>-</div><div class='del'>-		e_select_names_model_text_pos (source, text_model-&gt;seplen, pos, &amp;index, &amp;start_pos, &amp;text_len);</div><div class='del'>-</div><div class='del'>-		if (out) </div><div class='del'>-			fprintf (out, "index=%d start_pos=%d text_len=%d\n", index, start_pos, text_len);</div><div class='del'>-</div><div class='del'>-		if (text[i] == *text_model-&gt;sep &amp;&amp; index &gt;= 0) { /* Is this a quoted or an unquoted separator we are dealing with? */</div><div class='del'>-			const EDestination *dest = e_select_names_model_get_destination (source, index);</div><div class='del'>-			if (dest) {</div><div class='del'>-				const gchar *str = e_destination_get_textrep (dest);</div><div class='del'>-				gint j;</div><div class='del'>-				if (out)</div><div class='del'>-					fprintf (out, "str=%s pos=%d\n", str, pos);</div><div class='del'>-				for (j=0; j&lt;pos-start_pos &amp;&amp; str[j]; ++j)</div><div class='del'>-					if (str[j] == '"') {</div><div class='del'>-						inside_quote = !inside_quote;</div><div class='del'>-						if (out)</div><div class='del'>-							fprintf (out, "flip to %d at %d\n", start_pos+j, inside_quote);</div><div class='del'>-					}</div><div class='del'>-			}</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, inside_quote ? "inside quote\n" : "not inside quote\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		if (text[i] == *text_model-&gt;sep &amp;&amp; !inside_quote) {</div><div class='del'>-</div><div class='del'>-			/* This is the case of hitting , first thing in an empty entry */</div><div class='del'>-			if (index == -1) {</div><div class='del'>-				EReposAbsolute repos;</div><div class='del'>-				</div><div class='del'>-				e_select_names_model_insert (source, 0, e_destination_new ());</div><div class='del'>-				e_select_names_model_insert (source, 0, e_destination_new ());</div><div class='del'>-</div><div class='del'>-				repos.model = model;</div><div class='del'>-				repos.pos = -1; /* At end */</div><div class='del'>-				e_text_model_reposition (model, e_repos_absolute, &amp;repos);</div><div class='del'>-				</div><div class='del'>-</div><div class='del'>-			} else if (pos &lt;= start_pos || pos == start_pos + text_len) {</div><div class='del'>-				EReposInsertShift repos;</div><div class='del'>-				gint ins_point = index;</div><div class='del'>-</div><div class='del'>-				if (text_len != 0 &amp;&amp; pos == start_pos + text_len)</div><div class='del'>-					++ins_point;</div><div class='del'>-				</div><div class='del'>-				/* Block adjacent blank cards. */</div><div class='del'>-				if (! ((ins_point &lt; e_select_names_model_count (source) &amp;&amp;</div><div class='del'>-					(e_select_names_model_get_string (source, ins_point) == NULL)) </div><div class='del'>-				       || (ins_point &gt; 0 &amp;&amp; (e_select_names_model_get_string (source, ins_point-1) == NULL)))) {</div><div class='del'>-</div><div class='del'>-					e_select_names_model_insert (source, ins_point, e_destination_new ());</div><div class='del'>-</div><div class='del'>-					repos.model = model;</div><div class='del'>-					repos.pos = pos;</div><div class='del'>-					repos.len = text_model-&gt;seplen;</div><div class='del'>-					e_text_model_reposition (model, e_repos_insert_shift, &amp;repos);</div><div class='del'>-					pos += text_model-&gt;seplen;</div><div class='del'>-				} </div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				EReposInsertShift repos;</div><div class='del'>-				gint offset = MAX (pos - start_pos, 0);</div><div class='del'>-				const gchar *str = e_select_names_model_get_string (source, index);</div><div class='del'>-				gchar *str1 = g_strndup (str, offset);</div><div class='del'>-				gchar *str2 = g_strdup (str+offset);</div><div class='del'>-				EDestination *d1 = e_destination_new (), *d2 = e_destination_new ();</div><div class='del'>-</div><div class='del'>-				e_destination_set_raw (d1, str1);</div><div class='del'>-				e_destination_set_raw (d2, str2);</div><div class='del'>-</div><div class='del'>-				e_select_names_model_replace (source, index, d1);</div><div class='del'>-				e_select_names_model_insert (source, index+1, d2);</div><div class='del'>-</div><div class='del'>-				g_free (str1);</div><div class='del'>-				g_free (str2);</div><div class='del'>-</div><div class='del'>-				repos.model = model;</div><div class='del'>-				repos.pos = pos;</div><div class='del'>-				repos.len = text_model-&gt;seplen;</div><div class='del'>-				e_text_model_reposition (model, e_repos_insert_shift, &amp;repos);</div><div class='del'>-				pos += text_model-&gt;seplen;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (text_model-&gt;seplen &gt; 1)</div><div class='del'>-				text_model-&gt;last_magic_comma_pos = pos;</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			EReposInsertShift repos;</div><div class='del'>-			gint offset = MAX (pos - start_pos, 0);</div><div class='del'>-			const gchar *str;</div><div class='del'>-			gchar *new_str = NULL;</div><div class='del'>-			gint this_length = 1;</div><div class='del'>-			gboolean whitespace = isspace ((gint) text[i]);</div><div class='del'>-</div><div class='del'>-			str = index &gt;= 0 ? e_select_names_model_get_string (source, index) : NULL;</div><div class='del'>-			if (str &amp;&amp; *str) {</div><div class='del'>-				if (pos &lt;= start_pos) {</div><div class='del'>-					if (whitespace) {</div><div class='del'>-						/* swallow leading whitespace */</div><div class='del'>-						this_length = 0;</div><div class='del'>-					} else {</div><div class='del'>-						/* Adjust for our "magic white space" */</div><div class='del'>-						/* FIXME: This code does the wrong thing if seplen &gt; 2 */</div><div class='del'>-						new_str = g_strdup_printf("%c%s%s", text[i], pos &lt; start_pos ? " " : "", str);</div><div class='del'>-						if (pos &lt; start_pos)</div><div class='del'>-							++this_length;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					new_str = g_strdup_printf ("%.*s%c%s", offset, str, text[i], str + offset);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (whitespace) {</div><div class='del'>-					/* swallow leading whitespace */</div><div class='del'>-					this_length = 0;</div><div class='del'>-				} else {</div><div class='del'>-					new_str = g_strdup_printf ("%c", text[i]);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (new_str) {</div><div class='del'>-</div><div class='del'>-				EDestination *dest;</div><div class='del'>-				dest = index &gt;= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();</div><div class='del'>-				e_destination_set_raw (dest, new_str);</div><div class='del'>-				e_select_names_model_replace (source, index, dest);</div><div class='del'>-				</div><div class='del'>-				/* e_select_names_model_replace (source, index, dest); */</div><div class='del'>-</div><div class='del'>-				if (this_length &gt; 0) {</div><div class='del'>-					repos.model = model;</div><div class='del'>-					repos.pos = pos;</div><div class='del'>-					repos.len = this_length;</div><div class='del'>-					e_text_model_reposition (model, e_repos_insert_shift, &amp;repos);</div><div class='del'>-</div><div class='del'>-					pos += this_length;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				g_free (new_str);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dump_model (text_model);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock (GTK_OBJECT (source), text_model-&gt;source_resize_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);</div><div class='del'>-	ESelectNamesModel *source = text_model-&gt;source;</div><div class='del'>-	gint index, start_pos, text_len, offset;</div><div class='del'>-		</div><div class='del'>-	if (out) {</div><div class='del'>-		const gchar *str = e_select_names_model_get_textification (source, text_model-&gt;sep);</div><div class='del'>-		gint i, len;</div><div class='del'>-</div><div class='del'>-		fprintf (out, "&gt;&gt; delete %d at pos %d\n", length, pos);</div><div class='del'>-</div><div class='del'>-		len = strlen (str);</div><div class='del'>-		for (i=0; i&lt;pos &amp;&amp; i&lt;len; ++i)</div><div class='del'>-			fprintf (out, "%c", str[i]);</div><div class='del'>-		fprintf (out, "[");</div><div class='del'>-		for (i=pos; i&lt;pos+length &amp;&amp; i&lt;len; ++i)</div><div class='del'>-			fprintf (out, "%c", str[i]);</div><div class='del'>-		fprintf (out, "]");</div><div class='del'>-		for (i=pos+length; i&lt;len; ++i)</div><div class='del'>-			fprintf (out, "%c", str[i]);</div><div class='del'>-		fprintf (out, "\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (length &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (text_model-&gt;last_magic_comma_pos == pos+1 &amp;&amp; length == 1) {</div><div class='del'>-		pos -= text_model-&gt;seplen-1;</div><div class='del'>-		if (pos &gt;= 0)</div><div class='del'>-			length = text_model-&gt;seplen;</div><div class='del'>-		text_model-&gt;last_magic_comma_pos = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_select_names_model_text_pos (source, text_model-&gt;seplen, pos, &amp;index, &amp;start_pos, &amp;text_len);</div><div class='del'>-</div><div class='del'>-	if (out) </div><div class='del'>-		fprintf (out, "index=%d, start_pos=%d, text_len=%d\n", index, start_pos, text_len);</div><div class='del'>-</div><div class='del'>-	/* We want to control all cursor motions ourselves, rather than taking hints</div><div class='del'>-	   from the ESelectNamesModel. */</div><div class='del'>-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)-&gt;source_resize_id);</div><div class='del'>-</div><div class='del'>-	/* First, we handle a few tricky cases. */</div><div class='del'>-</div><div class='del'>-	if (pos &lt; start_pos) {</div><div class='del'>-		EReposAbsolute repos;</div><div class='del'>-</div><div class='del'>-		repos.model = model;</div><div class='del'>-		repos.pos = pos;</div><div class='del'>-		e_text_model_reposition (model, e_repos_absolute, &amp;repos);</div><div class='del'>-</div><div class='del'>-		length -= start_pos - pos;</div><div class='del'>-</div><div class='del'>-		if (length &gt; 0)</div><div class='del'>-			e_select_names_text_model_delete (model, start_pos, length);</div><div class='del'>-		goto finished;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pos == start_pos + text_len) {</div><div class='del'>-		/* We are positioned right at the end of an entry, possibly right in front of a comma. */</div><div class='del'>-</div><div class='del'>-		if (index+1 &lt; e_select_names_model_count (source)) {</div><div class='del'>-			EReposDeleteShift repos;</div><div class='del'>-			EDestination *new_dest;</div><div class='del'>-			const gchar *str1 = e_select_names_model_get_string (source, index);</div><div class='del'>-			const gchar *str2 = e_select_names_model_get_string (source, index+1);</div><div class='del'>-			gchar *new_str;</div><div class='del'>-</div><div class='del'>-			while (str1 &amp;&amp; *str1 &amp;&amp; isspace ((gint) *str1))</div><div class='del'>-				++str1;</div><div class='del'>-			while (str2 &amp;&amp; *str2 &amp;&amp; isspace ((gint) *str2))</div><div class='del'>-				++str2;</div><div class='del'>-			</div><div class='del'>-			if (str1 &amp;&amp; str2)</div><div class='del'>-				new_str = g_strdup_printf ("%s%s%s", str1, text_model-&gt;sep+1, str2);</div><div class='del'>-			else if (str1)</div><div class='del'>-				new_str = g_strdup (str1);</div><div class='del'>-			else if (str2)</div><div class='del'>-				new_str = g_strdup (str2);</div><div class='del'>-			else</div><div class='del'>-				new_str = g_strdup ("");</div><div class='del'>-</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "joining \"%s\" and \"%s\" to \"%s\"\n", str1, str2, new_str);</div><div class='del'>-</div><div class='del'>-			e_select_names_model_delete (source, index+1);</div><div class='del'>-</div><div class='del'>-			new_dest = e_destination_new ();</div><div class='del'>-			e_destination_set_raw (new_dest, new_str);</div><div class='del'>-			e_select_names_model_replace (source, index, new_dest);</div><div class='del'>-			g_free (new_str);</div><div class='del'>-</div><div class='del'>-			repos.model = model;</div><div class='del'>-			repos.pos = pos;</div><div class='del'>-			repos.len = text_model-&gt;seplen;</div><div class='del'>-</div><div class='del'>-			e_text_model_reposition (model, e_repos_delete_shift, &amp;repos);</div><div class='del'>-</div><div class='del'>-			if (length &gt; 1)</div><div class='del'>-				e_select_names_text_model_delete (model, pos, length-1);</div><div class='del'>-		} else {</div><div class='del'>-			/* If we are at the end of the last entry (which we must be if we end up in this block),</div><div class='del'>-			   we can just do nothing.  So this else-block is here just to give us a place to</div><div class='del'>-			   put this comment. */</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto finished;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pos + length &gt; start_pos + text_len) {</div><div class='del'>-		/* Uh oh... our changes straddle two objects. */</div><div class='del'>-</div><div class='del'>-		if (pos == start_pos) { /* Delete the whole thing */</div><div class='del'>-			EReposDeleteShift repos;</div><div class='del'>-		</div><div class='del'>-			e_select_names_model_delete (source, index);</div><div class='del'>-</div><div class='del'>-			if (out) </div><div class='del'>-				fprintf (out, "deleted all of %d\n", index);</div><div class='del'>-</div><div class='del'>-			repos.model = model;</div><div class='del'>-			repos.pos = pos;</div><div class='del'>-			repos.len = text_len + text_model-&gt;seplen;</div><div class='del'>-		</div><div class='del'>-			e_text_model_reposition (model, e_repos_delete_shift, &amp;repos);</div><div class='del'>-</div><div class='del'>-			length -= text_len + text_model-&gt;seplen;</div><div class='del'>-			if (length &gt; 0)</div><div class='del'>-				e_select_names_text_model_delete (model, pos, length);</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* Delete right up to the end, and then call e_select_names_text_model_delete again</div><div class='del'>-			   to finish the job. */</div><div class='del'>-			gint len1, len2;</div><div class='del'>-			</div><div class='del'>-			len1 = text_len - (pos - start_pos);</div><div class='del'>-			len2 = length - len1;</div><div class='del'>-</div><div class='del'>-			if (out) </div><div class='del'>-				fprintf (out, "two-stage delete: %d, %d\n", len1, len2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-			e_select_names_text_model_delete (model, pos, len1);</div><div class='del'>-			e_select_names_text_model_delete (model, pos, len2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto finished;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Our changes are confined to just one entry. */</div><div class='del'>-	if (length &gt; 0) {</div><div class='del'>-		const gchar *str;</div><div class='del'>-		gchar *new_str;</div><div class='del'>-		</div><div class='del'>-		offset = pos - start_pos;</div><div class='del'>-		</div><div class='del'>-		str = e_select_names_model_get_string (source, index);</div><div class='del'>-		new_str = str ? g_strdup_printf ("%.*s%s", offset, str, str + offset + length) : NULL;</div><div class='del'>-		</div><div class='del'>-		if (new_str) {</div><div class='del'>-			EReposDeleteShift repos;</div><div class='del'>-			EDestination *dest;</div><div class='del'>-</div><div class='del'>-			dest = index &gt;= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();</div><div class='del'>-			e_destination_set_raw (dest, new_str);</div><div class='del'>-			e_select_names_model_replace (source, index, dest);</div><div class='del'>-			</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "new_str: \"%s\"\n", new_str);</div><div class='del'>-</div><div class='del'>-			g_free (new_str);</div><div class='del'>-			</div><div class='del'>-			repos.model = model;</div><div class='del'>-			repos.pos = pos;</div><div class='del'>-			repos.len = length;</div><div class='del'>-			</div><div class='del'>-			e_text_model_reposition (model, e_repos_delete_shift, &amp;repos);</div><div class='del'>-			</div><div class='del'>-		} else {</div><div class='del'>-			EReposDeleteShift repos;</div><div class='del'>-			</div><div class='del'>-			e_select_names_model_delete (source, index);</div><div class='del'>-			</div><div class='del'>-			if (out)</div><div class='del'>-				fprintf (out, "deleted %d\n", index);</div><div class='del'>-</div><div class='del'>-			</div><div class='del'>-			repos.model = model;</div><div class='del'>-			repos.pos = pos;</div><div class='del'>-			repos.len = text_model-&gt;seplen;</div><div class='del'>-			</div><div class='del'>-			e_text_model_reposition (model, e_repos_delete_shift, &amp;repos);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- finished:</div><div class='del'>-	E_SELECT_NAMES_TEXT_MODEL (model)-&gt;last_magic_comma_pos = -1;</div><div class='del'>-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)-&gt;source_resize_id);</div><div class='del'>-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_select_names_text_model_obj_count (ETextModel *model)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)-&gt;source;</div><div class='del'>-	gint i, count;</div><div class='del'>-</div><div class='del'>-	count = i = e_select_names_model_count (source);</div><div class='del'>-	while (i &gt; 0) {</div><div class='del'>-		const EDestination *dest;</div><div class='del'>-		--i;</div><div class='del'>-		dest = e_select_names_model_get_destination (source, i);</div><div class='del'>-		if (e_destination_get_card (dest) == NULL)</div><div class='del'>-			--count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-nth_obj_index (ESelectNamesModel *source, gint n)</div><div class='del'>-{</div><div class='del'>-	gint i, N;</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	N = e_select_names_model_count (source);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		const EDestination *dest = e_select_names_model_get_destination (source, i);</div><div class='del'>-		if (e_destination_get_card (dest))</div><div class='del'>-			--n;</div><div class='del'>-		++i;</div><div class='del'>-	} while (n &gt;= 0 &amp;&amp; i &lt; N);</div><div class='del'>-</div><div class='del'>-	if (i &lt;= N)</div><div class='del'>-		--i;</div><div class='del'>-	else</div><div class='del'>-		i = -1;</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *text_model = E_SELECT_NAMES_TEXT_MODEL (model);</div><div class='del'>-	ESelectNamesModel *source = text_model-&gt;source;</div><div class='del'>-	gint i, pos;</div><div class='del'>-</div><div class='del'>-	i = nth_obj_index (source, n);</div><div class='del'>-	if (i &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	e_select_names_model_name_pos (source, text_model-&gt;seplen, i, &amp;pos,  len);</div><div class='del'>-	if (pos &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (text_model-&gt;text == NULL)</div><div class='del'>-		text_model-&gt;text = e_select_names_model_get_textification (source, text_model-&gt;sep);</div><div class='del'>-	return text_model-&gt;text + pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_activate_obj (ETextModel *model, gint n)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)-&gt;source;</div><div class='del'>-	EContactEditor *contact_editor;</div><div class='del'>-	ECard *card;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	i = nth_obj_index (source, n);</div><div class='del'>-	g_return_if_fail (i &gt;= 0);</div><div class='del'>-</div><div class='del'>-	card = e_select_names_model_get_card (source, i);</div><div class='del'>-	g_return_if_fail (card != NULL);</div><div class='del'>-	</div><div class='del'>-	/* present read-only contact editor when someone double clicks from here */</div><div class='del'>-	contact_editor = e_addressbook_show_contact_editor (e_card_get_book (card), card, FALSE, FALSE);</div><div class='del'>-	e_contact_editor_raise (contact_editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h<br/>deleted file mode 100644<br/>index 29ab727368..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-text-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names-text-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey    &lt;clahey@ximian.com&gt;</div><div class='del'>- *   Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_TEXT_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text-model.h&gt;</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))</div><div class='del'>-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;</div><div class='del'>-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTextModel {</div><div class='del'>-	ETextModel parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesModel *source;</div><div class='del'>-	gint source_changed_id;</div><div class='del'>-	gint source_resize_id;</div><div class='del'>-</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	gchar *sep;</div><div class='del'>-	gint seplen;</div><div class='del'>-	</div><div class='del'>-	gint last_magic_comma_pos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTextModelClass {</div><div class='del'>-	ETextModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ETextModel *e_select_names_text_model_new           (ESelectNamesModel *source);</div><div class='del'>-void        e_select_names_text_model_set_separator (ESelectNamesTextModel *model, const char *sep);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType     e_select_names_text_model_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c<br/>deleted file mode 100644<br/>index 3f5c32d38e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1182 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-select-names.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-without.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-addressbook-model.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-addressbook-table-adapter.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/e-cardlist-model.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook-component.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook-storage.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook.h&gt;</div><div class='del'>-#include &lt;shell/evolution-shell-client.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-simple.h&gt;</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-#include &lt;gal/widgets/e-categories-master-list-option-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-#include &lt;e-util/e-categories-master-list-wombat.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_select_names_init		(ESelectNames		 *card);</div><div class='del'>-static void e_select_names_class_init	(ESelectNamesClass	 *klass);</div><div class='del'>-static void e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_destroy (GtkObject *object);</div><div class='del'>-static void update_query (GtkWidget *widget, ESelectNames *e_select_names);</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class = NULL;</div><div class='del'>-#define PARENT_TYPE gnome_dialog_get_type()</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char                  *title;</div><div class='del'>-	ESelectNamesModel     *source;</div><div class='del'>-	ESelectNamesTextModel *text_model;</div><div class='del'>-	ESelectNames          *names;</div><div class='del'>-	GtkWidget             *label;</div><div class='del'>-	GtkWidget             *button;</div><div class='del'>-} ESelectNamesChild;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesFolder {</div><div class='del'>-	char *description;</div><div class='del'>-	char *display_name;</div><div class='del'>-	char *uri;</div><div class='del'>-	char *physicalUri;</div><div class='del'>-	char *path;</div><div class='del'>-	int   count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"ESelectNames",</div><div class='del'>-			sizeof (ESelectNames),</div><div class='del'>-			sizeof (ESelectNamesClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_class_init (ESelectNamesClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_select_names_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SPEC "&lt;ETableSpecification no-headers=\"true\" cursor-mode=\"line\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"%d\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\" search=\"string\"/&gt; \</div><div class='del'>-	&lt;ETableState&gt;                   			       \</div><div class='del'>-		&lt;column source=\"0\"/&gt;     			       \</div><div class='del'>-	        &lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"true\"/&gt; &lt;/grouping&gt; \</div><div class='del'>-	&lt;/ETableState&gt;                  			       \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-#define SPEC2 "&lt;ETableSpecification no-headers=\"true\" cursor-mode=\"line\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\" search=\"string\"/&gt; \</div><div class='del'>-	&lt;ETableState&gt;                   			       \</div><div class='del'>-		&lt;column source=\"0\"/&gt;     			       \</div><div class='del'>-        	&lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"true\"/&gt; &lt;/grouping&gt; \</div><div class='del'>-	&lt;/ETableState&gt;                  			       \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_book(EBook *book, EBookStatus status, ESelectNames *esn)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set(GTK_OBJECT(esn-&gt;model),</div><div class='del'>-		       "book", book,</div><div class='del'>-		       NULL);</div><div class='del'>-	update_query (NULL, esn);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(book));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(esn));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(esn-&gt;model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_book_with_model_data(EBook *book, EBookStatus status, EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "book", book,</div><div class='del'>-		       "query", "(contains \"email\" \"\")",</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(book));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_model_set_uri(ESelectNames *e_select_names, EAddressbookModel *model, const char *uri, ESelectNamesFolder *e_folder)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	/* If uri == the current uri, then we don't have to do anything */</div><div class='del'>-	book = e_addressbook_model_get_ebook (model);</div><div class='del'>-	if (book) {</div><div class='del'>-		const gchar *current_uri = e_book_get_uri (book);</div><div class='del'>-		if (uri &amp;&amp; current_uri &amp;&amp; !strcmp (uri, current_uri))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	book = e_book_new();</div><div class='del'>-	if (e_select_names) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(e_select_names));</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model));</div><div class='del'>-		addressbook_load_uri(book, uri, (EBookCallback) set_book, e_select_names);</div><div class='del'>-		e_select_names-&gt;current_folder = e_folder;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model));</div><div class='del'>-		addressbook_load_uri(book, uri, (EBookCallback) set_book_with_model_data, model);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-card_key (ECard *card)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	const gchar *book_uri;</div><div class='del'>-	</div><div class='del'>-	if (card == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	g_assert (E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	book = e_card_get_book (card);</div><div class='del'>-	book_uri = book ? e_book_get_uri (book) : "NoBook";</div><div class='del'>-	return g_strdup_printf ("%s|%s", book_uri ? book_uri : "NoURI", e_card_get_id (card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_one_model (gpointer k, gpointer val, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ETableWithout *etw = E_TABLE_WITHOUT (closure);</div><div class='del'>-	ESelectNamesChild *child = val;</div><div class='del'>-	ESelectNamesModel *model = child-&gt;source;</div><div class='del'>-	gint i, count;</div><div class='del'>-	ECard *card;</div><div class='del'>-	void *key;</div><div class='del'>-	</div><div class='del'>-	count = e_select_names_model_count (model);</div><div class='del'>-	for (i = 0; i &lt; count; ++i) {</div><div class='del'>-		card = e_select_names_model_get_card (model, i);</div><div class='del'>-		if (card) {</div><div class='del'>-			key = card_key (card);</div><div class='del'>-			e_table_without_hide (etw, key);</div><div class='del'>-			g_free (key);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl)</div><div class='del'>-{</div><div class='del'>-	e_table_without_show_all (E_TABLE_WITHOUT (esl-&gt;without));</div><div class='del'>-	g_hash_table_foreach (esl-&gt;children, sync_one_model, esl-&gt;without);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_add_address_cb (int model_row, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child = closure;</div><div class='del'>-	ESelectNames *names = child-&gt;names;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EDestination *dest = e_destination_new ();</div><div class='del'>-	gint mapped_row;</div><div class='del'>-</div><div class='del'>-	mapped_row = e_table_subset_view_to_model_row (E_TABLE_SUBSET (names-&gt;without), model_row);</div><div class='del'>-</div><div class='del'>-	card = e_addressbook_model_get_card (E_ADDRESSBOOK_MODEL(names-&gt;model), mapped_row);</div><div class='del'>-	</div><div class='del'>-	if (card != NULL) {</div><div class='del'>-		e_destination_set_card (dest, card, 0);</div><div class='del'>-</div><div class='del'>-		e_select_names_model_append (child-&gt;source, dest);</div><div class='del'>-		e_select_names_model_clean (child-&gt;source, FALSE);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_add_address(ESelectNames *names, ESelectNamesChild *child)</div><div class='del'>-{</div><div class='del'>-	e_select_names_model_freeze (child-&gt;source);</div><div class='del'>-	e_table_selected_row_foreach(e_table_scrolled_get_table(names-&gt;table),</div><div class='del'>-				     real_add_address_cb, child);</div><div class='del'>-	e_select_names_model_thaw (child-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_address(ETable *table, int row, int col, GdkEvent *event, ESelectNames *names)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-</div><div class='del'>-	child = g_hash_table_lookup(names-&gt;children, names-&gt;def);</div><div class='del'>-	if (child) {</div><div class='del'>-		real_add_address(names, child);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sensitize_button (gpointer key, gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	gboolean *sensitive = user_data;</div><div class='del'>-	ESelectNamesChild *child = data;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (child-&gt;button, *sensitive);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_change (ETable *table, ESelectNames *names)</div><div class='del'>-{</div><div class='del'>-	gboolean sensitive;</div><div class='del'>-</div><div class='del'>-	sensitive = e_table_selected_count (table) &gt; 0;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (names-&gt;children, sensitize_button, &amp;sensitive);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-esn_get_key_fn (ETableModel *source, int row, void *closure)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL (closure);</div><div class='del'>-	ECard *card = e_addressbook_model_get_card (model, row);</div><div class='del'>-	void *key = card_key (card);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-	return key;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-esn_dup_key_fn (const void *key, void *closure)</div><div class='del'>-{</div><div class='del'>-	void *dup = (void *) g_strdup ((const gchar *) key);</div><div class='del'>-	return dup;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esn_free_gotten_key_fn (void *key, void *closure)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esn_free_duped_key_fn (void *key, void *closure)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)</div><div class='del'>-{</div><div class='del'>-	ETableModel *adapter;</div><div class='del'>-	ETableModel *without;</div><div class='del'>-	EAddressbookModel *model;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *uri;</div><div class='del'>-	char *spec;</div><div class='del'>-</div><div class='del'>-	model = e_addressbook_model_new ();</div><div class='del'>-	adapter = E_TABLE_MODEL (e_addressbook_table_adapter_new (model));</div><div class='del'>-</div><div class='del'>-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf("file://%s", filename);</div><div class='del'>-</div><div class='del'>-	addressbook_model_set_uri(NULL, model, uri, NULL);</div><div class='del'>-</div><div class='del'>-	g_free(uri);</div><div class='del'>-	g_free(filename);</div><div class='del'>-</div><div class='del'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "editable", FALSE,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	without = e_table_without_new (adapter,</div><div class='del'>-				       g_str_hash,</div><div class='del'>-				       g_str_equal,</div><div class='del'>-				       esn_get_key_fn,</div><div class='del'>-				       esn_dup_key_fn,</div><div class='del'>-				       esn_free_gotten_key_fn,</div><div class='del'>-				       esn_free_duped_key_fn,</div><div class='del'>-				       model);</div><div class='del'>-</div><div class='del'>-	spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);</div><div class='del'>-	table = e_table_scrolled_new (without, NULL, spec, NULL);</div><div class='del'>-	g_free(spec);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "without", without);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_folder_free(ESelectNamesFolder *e_folder)</div><div class='del'>-{</div><div class='del'>-	g_free(e_folder-&gt;description );</div><div class='del'>-	g_free(e_folder-&gt;display_name);</div><div class='del'>-	g_free(e_folder-&gt;uri);</div><div class='del'>-	g_free(e_folder-&gt;physicalUri);</div><div class='del'>-	g_free(e_folder-&gt;path);</div><div class='del'>-	g_free(e_folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_option_activated(GtkWidget *widget, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesFolder *e_folder = gtk_object_get_data (GTK_OBJECT (widget), "EsnChoiceFolder");</div><div class='del'>-</div><div class='del'>-	addressbook_model_set_uri(e_select_names, e_select_names-&gt;model, e_folder-&gt;uri, e_folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ESelectNames *names;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	int count;</div><div class='del'>-} NamesAndMenu;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_menu_item		(gpointer	key,</div><div class='del'>-			 gpointer	value,</div><div class='del'>-			 gpointer	user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	ESelectNamesFolder *e_folder;</div><div class='del'>-	NamesAndMenu *nnm;</div><div class='del'>-	ESelectNames *e_select_names;</div><div class='del'>-	gchar *label;</div><div class='del'>-</div><div class='del'>-	nnm = user_data;</div><div class='del'>-	e_folder = value;</div><div class='del'>-	menu = nnm-&gt;menu;</div><div class='del'>-	e_select_names = nnm-&gt;names;</div><div class='del'>-</div><div class='del'>-	label = e_utf8_to_locale_string (_(e_folder-&gt;display_name));</div><div class='del'>-	item = gtk_menu_item_new_with_label (label);</div><div class='del'>-	g_free (label);</div><div class='del'>-</div><div class='del'>-	gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (item), "EsnChoiceFolder", e_folder);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_select_names_option_activated),</div><div class='del'>-			    e_select_names);</div><div class='del'>-</div><div class='del'>-	e_folder-&gt;count = nnm-&gt;count++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_option_menu(ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *option;</div><div class='del'>-</div><div class='del'>-	option = glade_xml_get_widget (e_select_names-&gt;gui,</div><div class='del'>-				       "optionmenu-folder");</div><div class='del'>-	if (option) {</div><div class='del'>-		NamesAndMenu nnm;</div><div class='del'>-		menu = gtk_menu_new ();</div><div class='del'>-</div><div class='del'>-		nnm.names = e_select_names;</div><div class='del'>-		nnm.menu = menu;</div><div class='del'>-		nnm.count = 0;</div><div class='del'>-</div><div class='del'>-		g_hash_table_foreach	(e_select_names-&gt;folders,</div><div class='del'>-					 add_menu_item,</div><div class='del'>-					 &amp;nnm);</div><div class='del'>-</div><div class='del'>-		gtk_widget_show_all (menu);</div><div class='del'>-</div><div class='del'>-		gtk_option_menu_set_menu (GTK_OPTION_MENU (option), </div><div class='del'>-					  menu);</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);</div><div class='del'>-		gtk_widget_set_sensitive (option, TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_folder      (EvolutionStorageListener *storage_listener,</div><div class='del'>-		 const char *path,</div><div class='del'>-		 const GNOME_Evolution_Folder *folder,</div><div class='del'>-		 ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(folder-&gt;type, "contacts")</div><div class='del'>-	    || !strcmp(folder-&gt;type, "ldap-contacts")) {</div><div class='del'>-		ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);</div><div class='del'>-		e_folder-&gt;description  = g_strdup(folder-&gt;description );</div><div class='del'>-		if (!strcmp (folder-&gt;type, "ldap-contacts"))</div><div class='del'>-			e_folder-&gt;display_name = g_strdup_printf ("%s [LDAP]", folder-&gt;displayName);</div><div class='del'>-		else</div><div class='del'>-			e_folder-&gt;display_name = g_strdup(folder-&gt;displayName);</div><div class='del'>-</div><div class='del'>-		if (!strncmp (folder-&gt;physicalUri, "file:", 5))</div><div class='del'>-			e_folder-&gt;uri = g_strdup_printf ("%s/addressbook.db", folder-&gt;physicalUri);</div><div class='del'>-		else</div><div class='del'>-			e_folder-&gt;uri = g_strdup(folder-&gt;physicalUri);</div><div class='del'>-		e_folder-&gt;physicalUri = g_strdup(folder-&gt;physicalUri);</div><div class='del'>-		e_folder-&gt;path = g_strdup (path);</div><div class='del'>-		e_folder-&gt;count = -1;</div><div class='del'>-		g_hash_table_insert(e_select_names-&gt;folders,</div><div class='del'>-				    e_folder-&gt;path, e_folder);</div><div class='del'>-		g_hash_table_insert(e_select_names-&gt;folders_by_uri,</div><div class='del'>-				    e_folder-&gt;physicalUri, e_folder);</div><div class='del'>-		update_option_menu(e_select_names);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-removed_folder  (EvolutionStorageListener *storage_listener,</div><div class='del'>-		 const char *path,</div><div class='del'>-		 ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesFolder *e_folder;</div><div class='del'>-</div><div class='del'>-	if ((e_folder = g_hash_table_lookup(e_select_names-&gt;folders, path))) {</div><div class='del'>-		g_hash_table_remove(e_select_names-&gt;folders_by_uri,</div><div class='del'>-				    e_folder-&gt;physicalUri);</div><div class='del'>-		g_hash_table_remove(e_select_names-&gt;folders, path);</div><div class='del'>-		e_select_names_folder_free(e_folder);</div><div class='del'>-		update_option_menu(e_select_names);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_query (GtkWidget *widget, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	char *category = "";</div><div class='del'>-	char *search = "";</div><div class='del'>-	char *query;</div><div class='del'>-	char *q_array[4];</div><div class='del'>-	int i;</div><div class='del'>-	if (e_select_names-&gt;categories) {</div><div class='del'>-		category = e_categories_master_list_option_menu_get_category (E_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names-&gt;categories));</div><div class='del'>-	}</div><div class='del'>-	if (e_select_names-&gt;search_entry) {</div><div class='del'>-		search = gtk_entry_get_text (GTK_ENTRY (e_select_names-&gt;search_entry));</div><div class='del'>-	}</div><div class='del'>-	i = 0;</div><div class='del'>-	q_array[i++] = "(contains \"email\" \"\")";</div><div class='del'>-	if (category &amp;&amp; *category)</div><div class='del'>-		q_array[i++] = g_strdup_printf ("(is \"category\" \"%s\")", category);</div><div class='del'>-	if (search &amp;&amp; *search)</div><div class='del'>-		q_array[i++] = g_strdup_printf ("(or (beginswith \"email\" \"%s\") "</div><div class='del'>-						"    (beginswith \"full_name\" \"%s\") "</div><div class='del'>-						"    (beginswith \"nickname\" \"%s\"))",</div><div class='del'>-						search, search, search);</div><div class='del'>-	q_array[i++] = NULL;</div><div class='del'>-	if (i &gt; 2) {</div><div class='del'>-		char *temp = g_strjoinv (" ", q_array);</div><div class='del'>-		query = g_strdup_printf ("(and %s)", temp);</div><div class='del'>-		g_free (temp);</div><div class='del'>-	} else {</div><div class='del'>-		query = g_strdup (q_array[0]);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_set (GTK_OBJECT (e_select_names-&gt;model),</div><div class='del'>-			"query", query,</div><div class='del'>-			NULL);</div><div class='del'>-	for (i = 1; q_array[i]; i++) {</div><div class='del'>-		g_free (q_array[i]);</div><div class='del'>-	}</div><div class='del'>-	g_free (query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-categories_changed (GtkWidget *widget, gint value, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	update_query (widget, e_select_names);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_entry_changed (GtkWidget *widget, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	if (e_select_names-&gt;select_entry) {</div><div class='del'>-		char *select_string = gtk_entry_get_text (GTK_ENTRY (e_select_names-&gt;select_entry));</div><div class='del'>-		char *select_strcoll_string = g_utf8_collate_key (select_string, -1);</div><div class='del'>-		int count;</div><div class='del'>-		ETable *table;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		table = e_table_scrolled_get_table (e_select_names-&gt;table);</div><div class='del'>-</div><div class='del'>-		count = e_table_model_row_count (e_select_names-&gt;without);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			int model_row = e_table_view_to_model_row (table, i);</div><div class='del'>-			char *row_strcoll_string =</div><div class='del'>-				g_utf8_collate_key (e_table_model_value_at (e_select_names-&gt;without,</div><div class='del'>-									    E_CARD_SIMPLE_FIELD_NAME_OR_ORG,</div><div class='del'>-									    model_row),</div><div class='del'>-						    -1);</div><div class='del'>-			if (strcmp (select_strcoll_string, row_strcoll_string) &lt;= 0) {</div><div class='del'>-				g_free (row_strcoll_string);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			g_free (row_strcoll_string);</div><div class='del'>-		}</div><div class='del'>-		g_free (select_strcoll_string);</div><div class='del'>-		if (i == count)</div><div class='del'>-			i --;</div><div class='del'>-</div><div class='del'>-		if (count &gt; 0) {</div><div class='del'>-			i = e_table_view_to_model_row (table, i);</div><div class='del'>-			e_table_set_cursor_row (table, i);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern EvolutionShellClient *global_shell_client;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_browse (GtkWidget *widget, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	const char *allowed_types[] = { "contacts", NULL };</div><div class='del'>-	GNOME_Evolution_Folder *folder;</div><div class='del'>-	const char *current_uri = "";</div><div class='del'>-	ESelectNamesFolder *e_folder;</div><div class='del'>-</div><div class='del'>-	if (e_select_names-&gt;current_folder &amp;&amp; e_select_names-&gt;current_folder-&gt;physicalUri) {</div><div class='del'>-		current_uri = e_select_names-&gt;current_folder-&gt;physicalUri;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_shell_client_user_select_folder (global_shell_client,</div><div class='del'>-						   GTK_WINDOW (gtk_widget_get_toplevel (widget)),</div><div class='del'>-						   _("Find contact in"), current_uri,</div><div class='del'>-						   allowed_types,</div><div class='del'>-						   &amp;folder);</div><div class='del'>-	if (!folder)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if ((e_folder = g_hash_table_lookup(e_select_names-&gt;folders_by_uri, folder-&gt;physicalUri))) {</div><div class='del'>-		GtkWidget *option;</div><div class='del'>-</div><div class='del'>-		option = glade_xml_get_widget (e_select_names-&gt;gui,</div><div class='del'>-					       "optionmenu-folder");</div><div class='del'>-		if (e_folder-&gt;count != -1 &amp;&amp; option) {</div><div class='del'>-			gtk_option_menu_set_history (GTK_OPTION_MENU (option), e_folder-&gt;count);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		addressbook_model_set_uri(e_select_names, e_select_names-&gt;model, e_folder-&gt;uri, e_folder);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-hookup_listener (ESelectNames *e_select_names,</div><div class='del'>-		 GNOME_Evolution_Storage storage,</div><div class='del'>-		 EvolutionStorageListener *listener,</div><div class='del'>-		 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_StorageListener corba_listener;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (storage != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	corba_listener = evolution_storage_listener_corba_objref(listener);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(listener), "new_folder",</div><div class='del'>-			   GTK_SIGNAL_FUNC(new_folder), e_select_names);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(listener), "removed_folder",</div><div class='del'>-			   GTK_SIGNAL_FUNC(removed_folder), e_select_names);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Storage_addListener(storage, corba_listener, ev);</div><div class='del'>-</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_select_names_init: Exception adding listener to "</div><div class='del'>-			   "remote GNOME_Evolution_Storage interface.\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_additional_select_names_uris (ESelectNames *e_select_names, CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase config_db;</div><div class='del'>-	guint32 num_additional_uris;</div><div class='del'>-	int i;</div><div class='del'>-	gboolean flag;</div><div class='del'>-</div><div class='del'>-	config_db = addressbook_config_database (ev);</div><div class='del'>-</div><div class='del'>-	num_additional_uris = bonobo_config_get_ulong_with_default (config_db, "/Addressbook/additional_select_names_folders/num", 0, &amp;flag);</div><div class='del'>-	for (i = 0; i &lt; num_additional_uris; i ++) {</div><div class='del'>-		ESelectNamesFolder *e_folder;</div><div class='del'>-		char *config_path;</div><div class='del'>-		char *path;</div><div class='del'>-		char *name;</div><div class='del'>-		char *uri;</div><div class='del'>-</div><div class='del'>-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_path", i);</div><div class='del'>-		path = bonobo_config_get_string (config_db, config_path, ev);</div><div class='del'>-		g_free (config_path);</div><div class='del'>-</div><div class='del'>-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_name", i);</div><div class='del'>-		name = bonobo_config_get_string (config_db, config_path, ev);</div><div class='del'>-		g_free (config_path);</div><div class='del'>-</div><div class='del'>-		config_path = g_strdup_printf ("/Addressbook/additional_select_names_folders/folder_%d_uri", i);</div><div class='del'>-		uri = bonobo_config_get_string (config_db, config_path, ev);</div><div class='del'>-		g_free (config_path);</div><div class='del'>-</div><div class='del'>-		if (!path || !name || !uri) {</div><div class='del'>-			g_free (path);</div><div class='del'>-			g_free (name);</div><div class='del'>-			g_free (uri);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_folder = g_new(ESelectNamesFolder, 1);</div><div class='del'>-		e_folder-&gt;description  = g_strdup("");</div><div class='del'>-		e_folder-&gt;display_name = g_strdup(name);</div><div class='del'>-		if (!strncmp (uri, "file:", 5))</div><div class='del'>-			e_folder-&gt;uri = g_strdup_printf ("%s/addressbook.db", uri);</div><div class='del'>-		else</div><div class='del'>-			e_folder-&gt;uri = g_strdup(uri);</div><div class='del'>-		g_hash_table_insert(e_select_names-&gt;folders,</div><div class='del'>-				    g_strdup(path), e_folder);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (num_additional_uris)</div><div class='del'>-		update_option_menu(e_select_names);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_hookup_shell_listeners (ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	EvolutionStorage *other_contact_storage;</div><div class='del'>-	GNOME_Evolution_Storage storage;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	storage = (GNOME_Evolution_Storage) (evolution_shell_client_get_local_storage(addressbook_component_get_shell_client()));</div><div class='del'>-	e_select_names-&gt;local_listener = evolution_storage_listener_new();</div><div class='del'>-</div><div class='del'>-	/* This should really never happen, but a bug report (ximian #5193) came in w/ a backtrace suggesting that it did in</div><div class='del'>-	   fact happen to someone, so the best we can do is try to avoid crashing in this case. */</div><div class='del'>-	if (storage == CORBA_OBJECT_NIL) {</div><div class='del'>-		GtkWidget *oh_shit;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"</div><div class='del'>-						"This may have been caused by the evolution-addressbook component crashing.\n"</div><div class='del'>-						"To help us better understand and ultimately resolve this problem,\n"</div><div class='del'>-						"please send an e-mail to Jon Trowbridge &lt;trow@ximian.com&gt; with a\n"</div><div class='del'>-						"detailed description of the circumstances under which this error\n"</div><div class='del'>-						"occurred.  Thank you."));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"</div><div class='del'>-						"Under normal circumstances, this should never happen.\n"</div><div class='del'>-						"You may need to exit and restart Evolution in order to\n"</div><div class='del'>-						"correct this problem."));</div><div class='del'>-		gtk_widget_show (oh_shit);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		hookup_listener (e_select_names, storage, e_select_names-&gt;local_listener, &amp;ev);</div><div class='del'>-		bonobo_object_release_unref(storage, &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("e_select_names_init: Exception unref'ing "</div><div class='del'>-				   "remote GNOME_Evolution_Storage interface.\n");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	other_contact_storage = addressbook_get_other_contact_storage ();</div><div class='del'>-	if (other_contact_storage) {</div><div class='del'>-		storage = bonobo_object_corba_objref (BONOBO_OBJECT (other_contact_storage));</div><div class='del'>-		e_select_names-&gt;other_contacts_listener = evolution_storage_listener_new();</div><div class='del'>-</div><div class='del'>-		hookup_listener (e_select_names, storage, e_select_names-&gt;other_contacts_listener, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* XXX kludge to fill in folders for the exchange plugin.  we</div><div class='del'>-	   latch onto a set of bonobo-conf settings that are</div><div class='del'>-	   maintained by the plugin and do the right magic to get the</div><div class='del'>-	   folders displayed in the option menu */</div><div class='del'>-	add_additional_select_names_uris (e_select_names, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free(&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *e_select_names_create_categories (gchar *name,</div><div class='del'>-					     gchar *string1, gchar *string2,</div><div class='del'>-					     gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_select_names_create_categories (gchar *name,</div><div class='del'>-				  gchar *string1, gchar *string2,</div><div class='del'>-				  gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterList *ecml;</div><div class='del'>-	GtkWidget *option_menu;</div><div class='del'>-</div><div class='del'>-	ecml = e_categories_master_list_wombat_new ();</div><div class='del'>-	option_menu = e_categories_master_list_option_menu_new (ecml);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ecml));</div><div class='del'>-</div><div class='del'>-	return option_menu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_init (ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget, *button;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);</div><div class='del'>-	e_select_names-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;children = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	e_select_names-&gt;child_count = 0;</div><div class='del'>-	e_select_names-&gt;def = NULL;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "table-top");</div><div class='del'>-	if (!widget) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_ref(widget);</div><div class='del'>-	gtk_widget_unparent(widget);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_select_names)-&gt;vbox), widget, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(widget);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_buttons(GNOME_DIALOG(e_select_names),</div><div class='del'>-				    GNOME_STOCK_BUTTON_OK,</div><div class='del'>-				    GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				    NULL);</div><div class='del'>-	gnome_dialog_set_default(GNOME_DIALOG(e_select_names), 0);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_title(GTK_WINDOW(e_select_names), _("Select Contacts from Addressbook")); </div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));</div><div class='del'>-	e_select_names-&gt;model = gtk_object_get_data(GTK_OBJECT(e_select_names-&gt;table), "model");</div><div class='del'>-	e_select_names-&gt;adapter = gtk_object_get_data(GTK_OBJECT(e_select_names-&gt;table), "adapter");</div><div class='del'>-	e_select_names-&gt;without = gtk_object_get_data(GTK_OBJECT(e_select_names-&gt;table), "without");</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;categories = glade_xml_get_widget (gui, "custom-categories");</div><div class='del'>-	if (e_select_names-&gt;categories &amp;&amp; !E_IS_CATEGORIES_MASTER_LIST_OPTION_MENU (e_select_names-&gt;categories))</div><div class='del'>-		e_select_names-&gt;categories = NULL;</div><div class='del'>-	if (e_select_names-&gt;categories)</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(e_select_names-&gt;categories), "changed",</div><div class='del'>-				   GTK_SIGNAL_FUNC(categories_changed), e_select_names);</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;search_entry = glade_xml_get_widget (gui, "entry-find");</div><div class='del'>-	if (e_select_names-&gt;search_entry &amp;&amp; !GTK_IS_ENTRY (e_select_names-&gt;search_entry))</div><div class='del'>-		e_select_names-&gt;search_entry = NULL;</div><div class='del'>-	if (e_select_names-&gt;search_entry)</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(e_select_names-&gt;search_entry), "activate",</div><div class='del'>-				   GTK_SIGNAL_FUNC(update_query), e_select_names);</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;select_entry = glade_xml_get_widget (gui, "entry-select");</div><div class='del'>-	if (e_select_names-&gt;select_entry &amp;&amp; !GTK_IS_ENTRY (e_select_names-&gt;select_entry))</div><div class='del'>-		e_select_names-&gt;select_entry = NULL;</div><div class='del'>-	if (e_select_names-&gt;select_entry)</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(e_select_names-&gt;select_entry), "changed",</div><div class='del'>-				   GTK_SIGNAL_FUNC(select_entry_changed), e_select_names);</div><div class='del'>-</div><div class='del'>-	button  = glade_xml_get_widget (gui, "button-find");</div><div class='del'>-	if (button &amp;&amp; GTK_IS_BUTTON (button))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC(update_query), e_select_names);</div><div class='del'>-</div><div class='del'>-	button  = glade_xml_get_widget (gui, "button-browse");</div><div class='del'>-	if (button &amp;&amp; GTK_IS_BUTTON (button))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC(folder_browse), e_select_names);</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;folders = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	e_select_names-&gt;folders_by_uri = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	e_select_names_hookup_shell_listeners (e_select_names);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table (e_select_names-&gt;table)), "double_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_address), e_select_names);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table (e_select_names-&gt;table)), "selection_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_change), e_select_names);</div><div class='del'>-	selection_change (e_table_scrolled_get_table (e_select_names-&gt;table), e_select_names);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_disconnect_by_func (GTK_OBJECT (child-&gt;source), GTK_SIGNAL_FUNC (sync_table_and_models), e_select_names);</div><div class='del'>-	g_free(child-&gt;title);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(child-&gt;text_model));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(child-&gt;source));</div><div class='del'>-	g_free(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNames *e_select_names = E_SELECT_NAMES(object);</div><div class='del'>-</div><div class='del'>-	if (e_select_names-&gt;local_listener) {</div><div class='del'>-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names-&gt;local_listener), e_select_names);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_select_names-&gt;local_listener));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (e_select_names-&gt;other_contacts_listener) {</div><div class='del'>-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names-&gt;other_contacts_listener), e_select_names);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_select_names-&gt;other_contacts_listener));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(e_select_names-&gt;gui));</div><div class='del'>-	g_hash_table_foreach(e_select_names-&gt;children, (GHFunc) e_select_names_child_free, e_select_names);</div><div class='del'>-	g_hash_table_destroy(e_select_names-&gt;children);</div><div class='del'>-	g_hash_table_destroy(e_select_names-&gt;folders);</div><div class='del'>-	g_hash_table_destroy(e_select_names-&gt;folders_by_uri);</div><div class='del'>-</div><div class='del'>-	g_free(e_select_names-&gt;def);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_select_names_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_select_names_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNames *editor;</div><div class='del'>-</div><div class='del'>-	editor = E_SELECT_NAMES (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNames *e_select_names;</div><div class='del'>-</div><div class='del'>-	e_select_names = E_SELECT_NAMES (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_clicked(GtkWidget *button, ESelectNamesChild *child)</div><div class='del'>-{</div><div class='del'>-	real_add_address(child-&gt;names, child);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-remove_address(ETable *table, int row, int col, GdkEvent *event, ESelectNamesChild *child)</div><div class='del'>-{</div><div class='del'>-	e_select_names_model_delete (child-&gt;source, row);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _RightClickData {</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-	int index;</div><div class='del'>-};</div><div class='del'>-typedef struct _RightClickData RightClickData;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static GSList *selected_rows = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-etable_selection_foreach_cb (int row, void *data)</div><div class='del'>-{</div><div class='del'>-	/* Build a list of rows in reverse order, then remove them,</div><div class='del'>-           necessary because otherwise it'll start trying to delete</div><div class='del'>-           rows out of index in ETableModel */</div><div class='del'>-	selected_rows = g_slist_prepend (selected_rows, GINT_TO_POINTER (row));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selected_rows_foreach_cb (void *row, void *data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child = data;</div><div class='del'>-</div><div class='del'>-	remove_address (NULL, GPOINTER_TO_INT (row), 0, NULL, child);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_cb (GtkWidget *widget, void *data)</div><div class='del'>-{</div><div class='del'>-	RightClickData *rcdata = (RightClickData *)data;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_delete (rcdata-&gt;child-&gt;source, rcdata-&gt;index);</div><div class='del'>-</div><div class='del'>-	/* Free everything we've created */</div><div class='del'>-	g_free (rcdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-section_right_click_cb (EText *text, GdkEventButton *ev, gint pos, ESelectNamesChild *child)</div><div class='del'>-{</div><div class='del'>-	EPopupMenu right_click_menu[] = {</div><div class='del'>-		E_POPUP_ITEM (N_("Remove"), GTK_SIGNAL_FUNC (remove_cb), 0),</div><div class='del'>-		E_POPUP_TERMINATOR</div><div class='del'>-	};</div><div class='del'>-	gint index;</div><div class='del'>-</div><div class='del'>-	e_select_names_model_text_pos (child-&gt;source, child-&gt;text_model-&gt;seplen, pos, &amp;index, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (index != -1) {</div><div class='del'>-		RightClickData *rcdata = g_new0 (RightClickData, 1);</div><div class='del'>-		rcdata-&gt;index = index;</div><div class='del'>-		rcdata-&gt;child = child;</div><div class='del'>-</div><div class='del'>-		e_popup_menu_run (right_click_menu, (GdkEvent *)ev, 0, 0, rcdata);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *alignment;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkTable *table;</div><div class='del'>-	char *label_text;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	GtkWidget *sw;</div><div class='del'>-	GtkWidget *recipient_table;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup(e_select_names-&gt;children, id)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	table = GTK_TABLE(glade_xml_get_widget (e_select_names-&gt;gui, "table-recipients"));</div><div class='del'>-</div><div class='del'>-	child = g_new(ESelectNamesChild, 1);</div><div class='del'>-</div><div class='del'>-	child-&gt;names = e_select_names;</div><div class='del'>-	child-&gt;title = e_utf8_from_locale_string(_(name));</div><div class='del'>-</div><div class='del'>-	child-&gt;text_model = (ESelectNamesTextModel *) e_select_names_text_model_new (source);</div><div class='del'>-	e_select_names_text_model_set_separator (child-&gt;text_model, "\n");</div><div class='del'>-</div><div class='del'>-	child-&gt;source = source;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(child-&gt;source));</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;child_count++;</div><div class='del'>-</div><div class='del'>-	alignment = gtk_alignment_new(0, 0, 1, 0);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new ();</div><div class='del'>-</div><div class='del'>-	label = e_entry_new ();</div><div class='del'>-	gtk_object_set(GTK_OBJECT(label),</div><div class='del'>-		       "draw_background", FALSE,</div><div class='del'>-		       "draw_borders", FALSE,</div><div class='del'>-		       "draw_button", TRUE,</div><div class='del'>-		       "editable", FALSE,</div><div class='del'>-		       "text", "",</div><div class='del'>-		       "use_ellipsis", FALSE,</div><div class='del'>-		       "justification", GTK_JUSTIFY_CENTER,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	label_text = g_strconcat (child-&gt;title, " -&gt;", NULL);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (label),</div><div class='del'>-			"text", label_text,</div><div class='del'>-			"emulate_label_resize", TRUE,</div><div class='del'>-			NULL);</div><div class='del'>-	g_free (label_text);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (button), label);</div><div class='del'>-	child-&gt;label = label;</div><div class='del'>-	child-&gt;button = button;</div><div class='del'>-</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(alignment), button);</div><div class='del'>-	gtk_widget_show_all(alignment);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(button_clicked), child);</div><div class='del'>-	gtk_table_attach(table, alignment,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 e_select_names-&gt;child_count,</div><div class='del'>-			 e_select_names-&gt;child_count + 1,</div><div class='del'>-			 GTK_FILL, GTK_FILL,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (e_select_names-&gt;table);</div><div class='del'>-	gtk_widget_set_sensitive (button, e_table_selected_count (etable) &gt; 0);</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	sw = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	recipient_table = e_entry_new ();</div><div class='del'>-	gtk_object_set (GTK_OBJECT (recipient_table),</div><div class='del'>-			"model", child-&gt;text_model,</div><div class='del'>-			"allow_newlines", TRUE,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (recipient_table),</div><div class='del'>-			    "popup",</div><div class='del'>-			    GTK_SIGNAL_FUNC (section_right_click_cb),</div><div class='del'>-			    child);</div><div class='del'>-</div><div class='del'>-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), recipient_table);</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "right_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(section_right_click_cb), child);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "double_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(remove_address), child);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (child-&gt;source),</div><div class='del'>-			    "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (sync_table_and_models),</div><div class='del'>-			    e_select_names);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (sw);</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach(table, sw,</div><div class='del'>-			 1, 2,</div><div class='del'>-			 e_select_names-&gt;child_count,</div><div class='del'>-			 e_select_names-&gt;child_count + 1,</div><div class='del'>-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert(e_select_names-&gt;children, g_strdup(id), child);</div><div class='del'>-</div><div class='del'>-	sync_table_and_models (child-&gt;source, e_select_names);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-card_copy(const void *value, void *closure)</div><div class='del'>-{</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(value));</div><div class='del'>-	return (void *)value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_free(void *value, void *closure)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_select_names_get_section(ESelectNames *e_select_names, char *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-	int i;</div><div class='del'>-	int rows;</div><div class='del'>-	EList *list;</div><div class='del'>-	</div><div class='del'>-	child = g_hash_table_lookup(e_select_names-&gt;children, id);</div><div class='del'>-	if (!child)</div><div class='del'>-		return NULL;</div><div class='del'>-	rows = e_select_names_model_count (child-&gt;source);</div><div class='del'>-	</div><div class='del'>-	list = e_list_new(card_copy, card_free, NULL);</div><div class='del'>-	for (i = 0; i &lt; rows; i++) {</div><div class='del'>-		ECard *card = e_select_names_model_get_card (child-&gt;source, i);</div><div class='del'>-		e_list_append(list, card);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_get_source(ESelectNames *e_select_names,</div><div class='del'>-			  char *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names-&gt;children, id);</div><div class='del'>-	if (child) {</div><div class='del'>-		if (child-&gt;source)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(child-&gt;source));</div><div class='del'>-		return child-&gt;source;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_set_default (ESelectNames *e_select_names,</div><div class='del'>-			    const char *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-</div><div class='del'>-	if (e_select_names-&gt;def) {</div><div class='del'>-		child = g_hash_table_lookup(e_select_names-&gt;children, e_select_names-&gt;def);</div><div class='del'>-		if (child)</div><div class='del'>-			gtk_object_set (GTK_OBJECT (E_ENTRY (child-&gt;label)-&gt;item),</div><div class='del'>-					"bold", FALSE,</div><div class='del'>-					NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(e_select_names-&gt;def);</div><div class='del'>-	e_select_names-&gt;def = g_strdup(id);</div><div class='del'>-</div><div class='del'>-	if (e_select_names-&gt;def) {</div><div class='del'>-		child = g_hash_table_lookup(e_select_names-&gt;children, e_select_names-&gt;def);</div><div class='del'>-		if (child)</div><div class='del'>-			gtk_object_set (GTK_OBJECT (E_ENTRY (child-&gt;label)-&gt;item),</div><div class='del'>-					"bold", TRUE,</div><div class='del'>-					NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h<br/>deleted file mode 100644<br/>index 443784ee9e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-select-names.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-select-names.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_SELECT_NAMES_H__</div><div class='del'>-#define __E_SELECT_NAMES_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-addressbook-model.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include "e-util/e-list.h"</div><div class='del'>-#include "shell/evolution-storage-listener.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ESelectNames - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_SELECT_NAMES_TYPE			(e_select_names_get_type ())</div><div class='del'>-#define E_SELECT_NAMES(obj)			(GTK_CHECK_CAST ((obj), E_SELECT_NAMES_TYPE, ESelectNames))</div><div class='del'>-#define E_SELECT_NAMES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SELECT_NAMES_TYPE, ESelectNamesClass))</div><div class='del'>-#define E_IS_SELECT_NAMES(obj)		(GTK_CHECK_TYPE ((obj), E_SELECT_NAMES_TYPE))</div><div class='del'>-#define E_IS_SELECT_NAMES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SELECT_NAMES_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNames       ESelectNames;</div><div class='del'>-typedef struct _ESelectNamesClass  ESelectNamesClass;</div><div class='del'>-typedef struct _ESelectNamesFolder ESelectNamesFolder;</div><div class='del'>-</div><div class='del'>-struct _ESelectNames</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	</div><div class='del'>-	GHashTable *children; /* Of type char * to ESelectNamesChild */</div><div class='del'>-	int child_count;</div><div class='del'>-	ETableScrolled *table;</div><div class='del'>-	ETableModel *adapter;</div><div class='del'>-	ETableModel *without;</div><div class='del'>-	EAddressbookModel *model;</div><div class='del'>-	GtkWidget *categories;</div><div class='del'>-	GtkWidget *search_entry;</div><div class='del'>-	GtkWidget *select_entry;</div><div class='del'>-	GtkWidget *status_message;</div><div class='del'>-	EvolutionStorageListener *local_listener;</div><div class='del'>-	EvolutionStorageListener *other_contacts_listener;</div><div class='del'>-	GHashTable *folders;</div><div class='del'>-	GHashTable *folders_by_uri;</div><div class='del'>-	char *def;</div><div class='del'>-	ESelectNamesFolder *current_folder;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_select_names_new          (void);</div><div class='del'>-GtkType    e_select_names_get_type     (void);</div><div class='del'>-</div><div class='del'>-void       e_select_names_add_section  (ESelectNames *e_select_names,</div><div class='del'>-				       	char         *name,</div><div class='del'>-				       	char         *id,</div><div class='del'>-				       	ESelectNamesModel *source);</div><div class='del'>-ESelectNamesModel *e_select_names_get_source   (ESelectNames *e_select_names,</div><div class='del'>-						char *id);</div><div class='del'>-void e_select_names_set_default (ESelectNames *e_select_names,</div><div class='del'>-				 const char *id);</div><div class='del'>-/* Returns a ref counted list of addresses. */</div><div class='del'>-EList     *e_select_names_get_section  (ESelectNames *e_select_names,</div><div class='del'>-				       	char         *id);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_SELECT_NAMES_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-simple-card-bonobo.c b/addressbook/gui/component/select-names/e-simple-card-bonobo.c<br/>deleted file mode 100644<br/>index 9834eddd83..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-simple-card-bonobo.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-simple-card-bonobo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,269 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-simple-card-bonobo.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- * Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-simple-card-bonobo.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE bonobo_object_get_type ()</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ESimpleCardBonoboPrivate {</div><div class='del'>-	ECardSimple *card_simple;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation.  */</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_SimpleCard__vepv SimpleCard_vepv;</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Addressbook_SimpleCard *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SimpleCard *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Addressbook_SimpleCard *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;SimpleCard_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SimpleCard__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Addressbook_SimpleCard_Arbitrary *</div><div class='del'>-impl_SimpleCard_get_arbitrary (PortableServer_Servant servant,</div><div class='del'>-			       const CORBA_char *key,</div><div class='del'>-			       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Addressbook_SimpleCard_Arbitrary *ret_val = GNOME_Evolution_Addressbook_SimpleCard_Arbitrary__alloc ();</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);</div><div class='del'>-	priv = simple_card-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_simple) {</div><div class='del'>-		const ECardArbitrary *arbitrary = e_card_simple_get_arbitrary (priv-&gt;card_simple, key);</div><div class='del'>-		ret_val-&gt;key = CORBA_string_dup (arbitrary-&gt;key);</div><div class='del'>-		ret_val-&gt;value = CORBA_string_dup (arbitrary-&gt;value);</div><div class='del'>-		ret_val-&gt;type = CORBA_string_dup (arbitrary-&gt;type);</div><div class='del'>-	} else {</div><div class='del'>-		ret_val-&gt;key = CORBA_string_dup ("");</div><div class='del'>-		ret_val-&gt;value = CORBA_string_dup ("");</div><div class='del'>-		ret_val-&gt;type = CORBA_string_dup ("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SimpleCard_set_arbitrary (PortableServer_Servant servant,</div><div class='del'>-			       const CORBA_char *key,</div><div class='del'>-			       const CORBA_char *type,</div><div class='del'>-			       const CORBA_char *value,</div><div class='del'>-			       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);</div><div class='del'>-	priv = simple_card-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_simple) {</div><div class='del'>-		e_card_simple_set_arbitrary (priv-&gt;card_simple, key, type, value);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_char *</div><div class='del'>-impl_SimpleCard_get (PortableServer_Servant servant,</div><div class='del'>-		     GNOME_Evolution_Addressbook_SimpleCard_Field field,</div><div class='del'>-		     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);</div><div class='del'>-	priv = simple_card-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_simple) {</div><div class='del'>-		char *value = e_card_simple_get (priv-&gt;card_simple,</div><div class='del'>-						 field);</div><div class='del'>-		char *ret_val = CORBA_string_dup (value);</div><div class='del'>-		g_free (value);</div><div class='del'>-		return ret_val;</div><div class='del'>-	} else {</div><div class='del'>-		return CORBA_string_dup ("");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SimpleCard_set (PortableServer_Servant servant,</div><div class='del'>-		     GNOME_Evolution_Addressbook_SimpleCard_Field field,</div><div class='del'>-		     const CORBA_char *value,</div><div class='del'>-		     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	simple_card = E_SIMPLE_CARD_BONOBO (bonobo_object);</div><div class='del'>-	priv = simple_card-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_simple) {</div><div class='del'>-		e_card_simple_set (priv-&gt;card_simple,</div><div class='del'>-				   field,</div><div class='del'>-				   value);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	simple_card = E_SIMPLE_CARD_BONOBO (object);</div><div class='del'>-	priv = simple_card-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;card_simple) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;card_simple));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-</div><div class='del'>-	simple_card-&gt;priv = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init ()</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SimpleCard__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SimpleCard__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-</div><div class='del'>-	base_epv                 = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private       = NULL;</div><div class='del'>-	base_epv-&gt;finalize       = NULL;</div><div class='del'>-	base_epv-&gt;default_POA    = NULL;</div><div class='del'>-</div><div class='del'>-	epv                      = g_new0 (POA_GNOME_Evolution_Addressbook_SimpleCard__epv, 1);</div><div class='del'>-	epv-&gt;getArbitrary        = impl_SimpleCard_get_arbitrary;</div><div class='del'>-	epv-&gt;setArbitrary        = impl_SimpleCard_set_arbitrary;</div><div class='del'>-	epv-&gt;get                 = impl_SimpleCard_get;</div><div class='del'>-	epv-&gt;set                 = impl_SimpleCard_set;</div><div class='del'>-</div><div class='del'>-	vepv                     = &amp;SimpleCard_vepv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Addressbook_SimpleCard_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (ESimpleCardBonoboClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = impl_destroy;</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (ESimpleCardBonobo *simple_card)</div><div class='del'>-{</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ESimpleCardBonoboPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;card_simple = NULL;</div><div class='del'>-</div><div class='del'>-	simple_card-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_simple_card_bonobo_construct (ESimpleCardBonobo *simple_card,</div><div class='del'>-				GNOME_Evolution_Addressbook_SimpleCard corba_object,</div><div class='del'>-				ECardSimple *card_simple)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (simple_card != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SIMPLE_CARD_BONOBO (simple_card));</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (simple_card), corba_object);</div><div class='del'>-</div><div class='del'>-	simple_card-&gt;priv-&gt;card_simple = card_simple;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (card_simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESimpleCardBonobo *</div><div class='del'>-e_simple_card_bonobo_new (ECardSimple *card_simple)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Addressbook_SimpleCard *servant;</div><div class='del'>-	GNOME_Evolution_Addressbook_SimpleCard corba_object;</div><div class='del'>-	ESimpleCardBonobo *simple_card;</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	simple_card = gtk_type_new (e_simple_card_bonobo_get_type ());</div><div class='del'>-</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (simple_card), servant);</div><div class='del'>-	e_simple_card_bonobo_construct (simple_card, corba_object, card_simple);</div><div class='del'>-</div><div class='del'>-	return simple_card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_simple_card_bonobo, "ESimpleCardBonobo", ESimpleCardBonobo, class_init, init, PARENT_TYPE)</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-simple-card-bonobo.h b/addressbook/gui/component/select-names/e-simple-card-bonobo.h<br/>deleted file mode 100644<br/>index 763c54085b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-simple-card-bonobo.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/e-simple-card-bonobo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-simple-card-bonobo.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- * Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SIMPLE_CARD_BONOBO_H__</div><div class='del'>-#define __E_SIMPLE_CARD_BONOBO_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-simple.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SIMPLE_CARD_BONOBO			(e_simple_card_bonobo_get_type ())</div><div class='del'>-#define E_SIMPLE_CARD_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SIMPLE_CARD_BONOBO, ESimpleCardBonobo))</div><div class='del'>-#define E_SIMPLE_CARD_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SIMPLE_CARD_BONOBO, ESimpleCardBonoboClass))</div><div class='del'>-#define E_IS_SIMPLE_CARD_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SIMPLE_CARD_BONOBO))</div><div class='del'>-#define E_IS_SIMPLE_CARD_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SIMPLE_CARD_BONOBO))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ESimpleCardBonobo        ESimpleCardBonobo;</div><div class='del'>-typedef struct _ESimpleCardBonoboPrivate ESimpleCardBonoboPrivate;</div><div class='del'>-typedef struct _ESimpleCardBonoboClass   ESimpleCardBonoboClass;</div><div class='del'>-</div><div class='del'>-struct _ESimpleCardBonobo {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	ESimpleCardBonoboPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESimpleCardBonoboClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType            e_simple_card_bonobo_get_type   (void);</div><div class='del'>-void               e_simple_card_bonobo_construct  (ESimpleCardBonobo                      *simple_card,</div><div class='del'>-						    GNOME_Evolution_Addressbook_SimpleCard  corba_object,</div><div class='del'>-						    ECardSimple                            *card_simple);</div><div class='del'>-ESimpleCardBonobo *e_simple_card_bonobo_new        (ECardSimple                            *card_simple);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_SIMPLE_CARD_BONOBO_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade<br/>deleted file mode 100644<br/>index b60972d094..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/recipient.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/recipient.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Recipient&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;recipient&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window1&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;hbox-top&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-      &lt;xalign&gt;1.08033e-07&lt;/xalign&gt;</div><div class='del'>-      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;text-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;-&amp;gt;&lt;/label&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade<br/>deleted file mode 100644<br/>index 59c8d31364..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/select-names.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/component/select-names/select-names.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,477 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Select-names&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;select-names&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;../../../../art/&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-top&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Select Names&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;default_width&gt;417&lt;/default_width&gt;</div><div class='del'>-  &lt;default_height&gt;332&lt;/default_height&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button4&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button5&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-top&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;3&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hseparator1&lt;/name&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Show Contacts&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table5&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label30&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Folder:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;optionmenu-folder&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label31&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Category:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;optionmenu-folder&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;custom-categories&lt;/name&gt;</div><div class='del'>-	    &lt;creation_function&gt;e_select_names_create_categories&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Tue, 19 Feb 2002 23:06:24 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-browse&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Browse...&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox5&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table4&lt;/name&gt;</div><div class='del'>-	  &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label32&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Type a name into the entry, or</div><div class='del'>-select one from the list below:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment4&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox6&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;entry-select&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		&lt;text&gt;&lt;/text&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;alignment3&lt;/name&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-		&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;table-source&lt;/name&gt;</div><div class='del'>-		  &lt;creation_function&gt;e_addressbook_create_ebook_table&lt;/creation_function&gt;</div><div class='del'>-		  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		  &lt;last_modification_time&gt;Sat, 10 Jun 2000 22:02:57 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table-recipients&lt;/name&gt;</div><div class='del'>-	    &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label20&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Selected Contacts:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;True&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;status-message&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;3&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore<br/>deleted file mode 100644<br/>index 6fd0b5075c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-contact-editor-test</div><div class='head'>diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am<br/>deleted file mode 100644<br/>index c6dd88415d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/merging	\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-table		\</div><div class='del'>-	-I$(top_builddir)/shell			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\</div><div class='del'>-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-editor\"	\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontacteditor.a</div><div class='del'>-</div><div class='del'>-libecontacteditor_a_SOURCES = 			\</div><div class='del'>-	e-contact-editor-address.c		\</div><div class='del'>-	e-contact-editor-address.h		\</div><div class='del'>-	e-contact-editor-fullname.c		\</div><div class='del'>-	e-contact-editor-fullname.h		\</div><div class='del'>-	e-contact-editor.c			\</div><div class='del'>-	e-contact-editor.h			\</div><div class='del'>-	e-contact-save-as.c			\</div><div class='del'>-	e-contact-save-as.h			\</div><div class='del'>-	e-contact-quick-add.c			\</div><div class='del'>-	e-contact-quick-add.h</div><div class='del'>-</div><div class='del'>-evolutiondir = $(datadir)/evolution</div><div class='del'>-</div><div class='del'>-evolution_DATA = arrow.png</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 				\</div><div class='del'>-	contact-editor.glade		\</div><div class='del'>-	fulladdr.glade			\</div><div class='del'>-	fullname.glade			\</div><div class='del'>-	file-exists.glade		\</div><div class='del'>-	e-contact-editor-confirm-delete.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(evolution_DATA)		\</div><div class='del'>-	$(glade_DATA)</div><div class='head'>diff --git a/addressbook/gui/contact-editor/arrow.png b/addressbook/gui/contact-editor/arrow.png<br/>deleted file mode 100644<br/>index b102356c78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/arrow.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/arrow.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade<br/>deleted file mode 100644<br/>index c8c880fa0c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/contact-editor.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/contact-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2537 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Contact-editor&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;contact-editor&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;backup_source_files&gt;False&lt;/backup_source_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog2&lt;/name&gt;</div><div class='del'>-  &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox2&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area2&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button28&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button29&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button30&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table2&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;2&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry2&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button31&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button32&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Delete&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	&lt;height&gt;200&lt;/height&gt;</div><div class='del'>-	&lt;hscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/hscrollbar_policy&gt;</div><div class='del'>-	&lt;vscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/vscrollbar_policy&gt;</div><div class='del'>-	&lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	&lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;clist1&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-	  &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-	  &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	  &lt;show_titles&gt;True&lt;/show_titles&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_NONE&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;label20&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Phone Types&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-add-phone&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;New phone type&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button43&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_ADD&lt;/stock_pixmap&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button44&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame-add-phone&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-      &lt;label&gt;New phone type&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment9&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;9&lt;/border_width&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-add-phone&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeApp&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;contact editor&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Contact Editor&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;enable_layout_config&gt;True&lt;/enable_layout_config&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GnomeDock&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeApp:dock&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dock1&lt;/name&gt;</div><div class='del'>-    &lt;allow_floating&gt;True&lt;/allow_floating&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDock:contents&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;notebook-contact-editor&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table-contact-editor-general&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;14&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;8&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-phone1&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-phone2&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-phone3&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-phone4&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;text-address&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-	  &lt;height&gt;1&lt;/height&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;9&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-fullname&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Full _Name...&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment3&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-email1&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment5&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone4&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment7&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone2&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment8&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone1&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator4&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment6&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone3&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-fullname&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-jobtitle&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-company&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-email1&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-web&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;8&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;9&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator5&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;combo-file-as&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;True&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;entry-file-as&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator6&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;7&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;8&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment-htmlmail&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;6&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;7&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;True&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;True&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;checkbutton-htmlmail&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Wants to receive _HTML mail&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment4&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-address&lt;/name&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox1&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-phone1&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Business&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-phone1&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox2&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-phone2&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Home&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-phone2&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox3&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-phone3&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Business Fax&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-phone3&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox4&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-phone4&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Mobile&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-phone4&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox5&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-email1&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Primary Email&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-email1&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox-business&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-address&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Business&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;text-address&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment2&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;9&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;10&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;checkbutton-mailingaddress&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;This is the _mailing address&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator9&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;11&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;12&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator10&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;11&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;12&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment-contacts&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;13&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-contacts&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;C_ontacts...&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment15&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;7&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;13&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;entry-categories&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment16&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;13&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-categories&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Ca_tegories...&lt;/label&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox7&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label-jobtitle&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Job title:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;entry-jobtitle&lt;/focus_target&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom1&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;malehead.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:19:47 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom2&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;cellphone.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:02 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom3&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;envelope.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:19:51 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;7&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom4&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;house.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:06 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;10&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom5&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;evolution-contacts-plain.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:19:59 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;14&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom6&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;briefcase.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:09 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;14&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom10&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;globe.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:19:56 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;8&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;10&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-company&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Organi_zation:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-company&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-fulladdr&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Add_ress...&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;5&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;6&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;7&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment17&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;12&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;13&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table-contacts&lt;/name&gt;</div><div class='del'>-	    &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;0&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;accellabel-fileas&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;File A_s:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-file-as&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;accellabel-web&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Web page address:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-web&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;8&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;9&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label15&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table-contact-editor-details&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;9&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;6&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-department&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;D_epartment:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-department&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-office&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Office:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-office&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-profession&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;P_rofession:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-profession&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-nickname&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Nickname:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-nickname&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-spouse&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;S_pouse:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-spouse&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-birthday&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Birthda_y:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;dateedit-birthday&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-assistant&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;A_ssistant's name:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-assistant&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-manager&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Manager's Name:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;entry-manager&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-anniversary&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Anni_versary:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;dateedit-anniversary&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-spouse&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-department&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-office&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-profession&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-nickname&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-assistant&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;entry-manager&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator7&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-comments&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;No_tes:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;text-comments&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;7&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;8&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator8&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;6&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;7&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom7&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;briefcase.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:13 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom8&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;malehead.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:16 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow2&lt;/name&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;8&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;9&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;text-comments&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom9&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;globe.png&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:19 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;7&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;9&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-birthday&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_contact_editor_create_date&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 05 Jun 2001 02:36:27 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dateedit-anniversary&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_contact_editor_create_date&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 05 Jun 2001 02:36:32 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;6&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Details&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox3&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;custom12&lt;/name&gt;</div><div class='del'>-	    &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	    &lt;string1&gt;globe.png&lt;/string1&gt;</div><div class='del'>-	    &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Thu, 18 May 2000 12:20:13 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label24&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;If this person publishes free/busy or other calendar information on the Internet, enter the address</div><div class='del'>-of that information here.&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment18&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0.75&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table-contact-editor-collaboration&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label-caluri&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;_Public Calendar URL:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;focus_target&gt;entry-caluri&lt;/focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label-fburl&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;F_ree/Busy URL:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;focus_target&gt;entry-fburl&lt;/focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;entry-caluri&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;entry-fburl&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label21&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Collaboration&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GnomeAppBar&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeApp:appbar&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;appbar1&lt;/name&gt;</div><div class='del'>-    &lt;has_progress&gt;True&lt;/has_progress&gt;</div><div class='del'>-    &lt;has_status&gt;True&lt;/has_status&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c<br/>deleted file mode 100644<br/>index dfd89fc75d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-address.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,564 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-editor-address.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-contact-editor-address.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcombo.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);</div><div class='del'>-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);</div><div class='del'>-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void fill_in_info(EContactEditorAddress *editor);</div><div class='del'>-static void extract_info(EContactEditorAddress *editor);</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ADDRESS,</div><div class='del'>-	ARG_IS_READ_ONLY</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_address_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_address_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_address_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorAddress",</div><div class='del'>-				sizeof (EContactEditorAddress),</div><div class='del'>-				sizeof (EContactEditorAddressClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_address_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_address_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_address_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_address_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeDialogClass *dialog_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	dialog_class = (GnomeDialogClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_dialog_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ADDRESS);</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorAddress::editable", GTK_TYPE_BOOL, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_address_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_address_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_address_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-add_to_tab_order(GList *list, GladeXML *gui, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(gui, name);</div><div class='del'>-	return g_list_prepend(list, widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_tab_order(GladeXML *gui)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *container;</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-</div><div class='del'>-	container = glade_xml_get_widget(gui, "table-checkaddress");</div><div class='del'>-</div><div class='del'>-	if (container) {</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-city");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-region");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-code");</div><div class='del'>-		list = add_to_tab_order(list, gui, "combo-country");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char * countries [] = {</div><div class='del'>-	N_("United States"),</div><div class='del'>-	N_("Afghanistan"),</div><div class='del'>-	N_("Albania"),</div><div class='del'>-	N_("Algeria"),</div><div class='del'>-	N_("American Samoa"),</div><div class='del'>-	N_("Andorra"),</div><div class='del'>-	N_("Angola"),</div><div class='del'>-	N_("Anguilla"),</div><div class='del'>-	N_("Antarctica"),</div><div class='del'>-	N_("Antigua And Barbuda"),</div><div class='del'>-	N_("Argentina"),</div><div class='del'>-	N_("Armenia"),</div><div class='del'>-	N_("Aruba"),</div><div class='del'>-	N_("Australia"),</div><div class='del'>-	N_("Austria"),</div><div class='del'>-	N_("Azerbaijan"),</div><div class='del'>-	N_("Bahamas"),</div><div class='del'>-	N_("Bahrain"),</div><div class='del'>-	N_("Bangladesh"),</div><div class='del'>-	N_("Barbados"),</div><div class='del'>-	N_("Belarus"),</div><div class='del'>-	N_("Belgium"),</div><div class='del'>-	N_("Belize"),</div><div class='del'>-	N_("Benin"),</div><div class='del'>-	N_("Bermuda"),</div><div class='del'>-	N_("Bhutan"),</div><div class='del'>-	N_("Bolivia"),</div><div class='del'>-	N_("Bosnia And Herzegowina"),</div><div class='del'>-	N_("Botswana"),</div><div class='del'>-	N_("Bouvet Island"),</div><div class='del'>-	N_("Brazil"),</div><div class='del'>-	N_("British Indian Ocean Territory"),</div><div class='del'>-	N_("Brunei Darussalam"),</div><div class='del'>-	N_("Bulgaria"),</div><div class='del'>-	N_("Burkina Faso"),</div><div class='del'>-	N_("Burundi"),</div><div class='del'>-	N_("Cambodia"),</div><div class='del'>-	N_("Cameroon"),</div><div class='del'>-	N_("Canada"),</div><div class='del'>-	N_("Cape Verde"),</div><div class='del'>-	N_("Cayman Islands"),</div><div class='del'>-	N_("Central African Republic"),</div><div class='del'>-	N_("Chad"),</div><div class='del'>-	N_("Chile"),</div><div class='del'>-	N_("China"),</div><div class='del'>-	N_("Christmas Island"),</div><div class='del'>-	N_("Cocos (Keeling) Islands"),</div><div class='del'>-	N_("Colombia"),</div><div class='del'>-	N_("Comoros"),</div><div class='del'>-	N_("Congo"),</div><div class='del'>-	N_("Congo"),</div><div class='del'>-	N_("Cook Islands"),</div><div class='del'>-	N_("Costa Rica"),</div><div class='del'>-	N_("Cote d'Ivoire"),</div><div class='del'>-	N_("Croatia"),</div><div class='del'>-	N_("Cuba"),</div><div class='del'>-	N_("Cyprus"),</div><div class='del'>-	N_("Czech Republic"),</div><div class='del'>-	N_("Denmark"),</div><div class='del'>-	N_("Djibouti"),</div><div class='del'>-	N_("Dominica"),</div><div class='del'>-	N_("Dominican Republic"),</div><div class='del'>-	N_("East Timor"),</div><div class='del'>-	N_("Ecuador"),</div><div class='del'>-	N_("Egypt"),</div><div class='del'>-	N_("El Salvador"),</div><div class='del'>-	N_("Equatorial Guinea"),</div><div class='del'>-	N_("Eritrea"),</div><div class='del'>-	N_("Estonia"),</div><div class='del'>-	N_("Ethiopia"),</div><div class='del'>-	N_("Falkland Islands"),</div><div class='del'>-	N_("Faroe Islands"),</div><div class='del'>-	N_("Fiji"),</div><div class='del'>-	N_("Finland"),</div><div class='del'>-	N_("France"),</div><div class='del'>-	N_("French Guiana"),</div><div class='del'>-	N_("French Polynesia"),</div><div class='del'>-	N_("French Southern Territories"),</div><div class='del'>-	N_("Gabon"),</div><div class='del'>-	N_("Gambia"),</div><div class='del'>-	N_("Georgia"),</div><div class='del'>-	N_("Germany"),</div><div class='del'>-	N_("Ghana"),</div><div class='del'>-	N_("Gibraltar"),</div><div class='del'>-	N_("Greece"),</div><div class='del'>-	N_("Greenland"),</div><div class='del'>-	N_("Grenada"),</div><div class='del'>-	N_("Guadeloupe"),</div><div class='del'>-	N_("Guam"),</div><div class='del'>-	N_("Guatemala"),</div><div class='del'>-	N_("Guinea"),</div><div class='del'>-	N_("Guinea-bissau"),</div><div class='del'>-	N_("Guyana"),</div><div class='del'>-	N_("Haiti"),</div><div class='del'>-	N_("Heard And McDonald Islands"),</div><div class='del'>-	N_("Holy See"),</div><div class='del'>-	N_("Honduras"),</div><div class='del'>-	N_("Hong Kong"),</div><div class='del'>-	N_("Hungary"),</div><div class='del'>-	N_("Iceland"),</div><div class='del'>-	N_("India"),</div><div class='del'>-	N_("Indonesia"),</div><div class='del'>-	N_("Ireland"),</div><div class='del'>-	N_("Israel"),</div><div class='del'>-	N_("Italy"),</div><div class='del'>-	N_("Jamaica"),</div><div class='del'>-	N_("Japan"),</div><div class='del'>-	N_("Jordan"),</div><div class='del'>-	N_("Kazakhstan"),</div><div class='del'>-	N_("Kenya"),</div><div class='del'>-	N_("Kiribati"),</div><div class='del'>-	N_("Korea, Republic Of"),</div><div class='del'>-	N_("Kuwait"),</div><div class='del'>-	N_("Kyrgyzstan"),</div><div class='del'>-	N_("Laos"),</div><div class='del'>-	N_("Latvia"),</div><div class='del'>-	N_("Lebanon"),</div><div class='del'>-	N_("Lesotho"),</div><div class='del'>-	N_("Liberia"),</div><div class='del'>-	N_("Liechtenstein"),</div><div class='del'>-	N_("Lithuania"),</div><div class='del'>-	N_("Luxembourg"),</div><div class='del'>-	N_("Macau"),</div><div class='del'>-	N_("Macedonia"),</div><div class='del'>-	N_("Madagascar"),</div><div class='del'>-	N_("Malawi"),</div><div class='del'>-	N_("Malaysia"),</div><div class='del'>-	N_("Maldives"),</div><div class='del'>-	N_("Mali"),</div><div class='del'>-	N_("Malta"),</div><div class='del'>-	N_("Marshall Islands"),</div><div class='del'>-	N_("Martinique"),</div><div class='del'>-	N_("Mauritania"),</div><div class='del'>-	N_("Mauritius"),</div><div class='del'>-	N_("Mayotte"),</div><div class='del'>-	N_("Mexico"),</div><div class='del'>-	N_("Micronesia"),</div><div class='del'>-	N_("Moldova, Republic Of"),</div><div class='del'>-	N_("Monaco"),</div><div class='del'>-	N_("Mongolia"),</div><div class='del'>-	N_("Montserrat"),</div><div class='del'>-	N_("Morocco"),</div><div class='del'>-	N_("Mozambique"),</div><div class='del'>-	N_("Myanmar"),</div><div class='del'>-	N_("Namibia"),</div><div class='del'>-	N_("Nauru"),</div><div class='del'>-	N_("Nepal"),</div><div class='del'>-	N_("Netherlands"),</div><div class='del'>-	N_("Netherlands Antilles"),</div><div class='del'>-	N_("New Caledonia"),</div><div class='del'>-	N_("New Zealand"),</div><div class='del'>-	N_("Nicaragua"),</div><div class='del'>-	N_("Niger"),</div><div class='del'>-	N_("Nigeria"),</div><div class='del'>-	N_("Niue"),</div><div class='del'>-	N_("Norfolk Island"),</div><div class='del'>-	N_("Northern Mariana Islands"),</div><div class='del'>-	N_("Norway"),</div><div class='del'>-	N_("Oman"),</div><div class='del'>-	N_("Pakistan"),</div><div class='del'>-	N_("Palau"),</div><div class='del'>-	N_("Palestinian Territory"),</div><div class='del'>-	N_("Panama"),</div><div class='del'>-	N_("Papua New Guinea"),</div><div class='del'>-	N_("Paraguay"),</div><div class='del'>-	N_("Peru"),</div><div class='del'>-	N_("Philippines"),</div><div class='del'>-	N_("Pitcairn"),</div><div class='del'>-	N_("Poland"),</div><div class='del'>-	N_("Portugal"),</div><div class='del'>-	N_("Puerto Rico"),</div><div class='del'>-	N_("Qatar"),</div><div class='del'>-	N_("Reunion"),</div><div class='del'>-	N_("Romania"),</div><div class='del'>-	N_("Russian Federation"),</div><div class='del'>-	N_("Rwanda"),</div><div class='del'>-	N_("Saint Kitts And Nevis"),</div><div class='del'>-	N_("Saint Lucia"),</div><div class='del'>-	N_("Saint Vincent And The Grena-dines"),</div><div class='del'>-	N_("Samoa"),</div><div class='del'>-	N_("San Marino"),</div><div class='del'>-	N_("Sao Tome And Principe"),</div><div class='del'>-	N_("Saudi Arabia"),</div><div class='del'>-	N_("Senegal"),</div><div class='del'>-	N_("Seychelles"),</div><div class='del'>-	N_("Sierra Leone"),</div><div class='del'>-	N_("Singapore"),</div><div class='del'>-	N_("Slovakia"),</div><div class='del'>-	N_("Slovenia"),</div><div class='del'>-	N_("Solomon Islands"),</div><div class='del'>-	N_("Somalia"),</div><div class='del'>-	N_("South Africa"),</div><div class='del'>-	N_("South Georgia And The South Sandwich Islands"),</div><div class='del'>-	N_("Spain"),</div><div class='del'>-	N_("Sri Lanka"),</div><div class='del'>-	N_("St. Helena"),</div><div class='del'>-	N_("St. Pierre And Miquelon"),</div><div class='del'>-	N_("Sudan"),</div><div class='del'>-	N_("Suriname"),</div><div class='del'>-	N_("Svalbard And Jan Mayen Islands"),</div><div class='del'>-	N_("Swaziland"),</div><div class='del'>-	N_("Sweden"),</div><div class='del'>-	N_("Switzerland"),</div><div class='del'>-	N_("Taiwan"),</div><div class='del'>-	N_("Tajikistan"),</div><div class='del'>-	N_("Tanzania, United Republic Of"),</div><div class='del'>-	N_("Thailand"),</div><div class='del'>-	N_("Togo"),</div><div class='del'>-	N_("Tokelau"),</div><div class='del'>-	N_("Tonga"),</div><div class='del'>-	N_("Trinidad And Tobago"),</div><div class='del'>-	N_("Tunisia"),</div><div class='del'>-	N_("Turkey"),</div><div class='del'>-	N_("Turkmenistan"),</div><div class='del'>-	N_("Turks And Caicos Islands"),</div><div class='del'>-	N_("Tuvalu"),</div><div class='del'>-	N_("Uganda"),</div><div class='del'>-	N_("Ukraine"),</div><div class='del'>-	N_("United Arab Emirates"),</div><div class='del'>-	N_("United Kingdom"),</div><div class='del'>-	N_("United States Minor Outlying Islands"),</div><div class='del'>-	N_("Uruguay"),</div><div class='del'>-	N_("Uzbekistan"),</div><div class='del'>-	N_("Vanuatu"),</div><div class='del'>-	N_("Venezuela"),</div><div class='del'>-	N_("Viet Nam"),</div><div class='del'>-	N_("Virgin Islands, British"),</div><div class='del'>-	N_("Virgin Islands, U.S."),</div><div class='del'>-	N_("Wallis And Futuna Islands"),</div><div class='del'>-	N_("Western Sahara"),</div><div class='del'>-	N_("Yemen"),</div><div class='del'>-	N_("Yugoslavia"),</div><div class='del'>-	N_("Zambia"),</div><div class='del'>-	N_("Zimbabwe"),</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-compare_func (const void *voida, const void *voidb)</div><div class='del'>-{</div><div class='del'>-	char * const *stringa = voida, * const *stringb = voidb;</div><div class='del'>-</div><div class='del'>-	return strcoll (*stringa, *stringb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_countries (GladeXML *gui)</div><div class='del'>-{</div><div class='del'>-	GtkCombo *combo;</div><div class='del'>-	combo = (GtkCombo *) glade_xml_get_widget(gui, "combo-country");</div><div class='del'>-	if (combo &amp;&amp; GTK_IS_COMBO (combo)) {</div><div class='del'>-		static gboolean sorted = FALSE;</div><div class='del'>-		static GList *country_list;</div><div class='del'>-		if (!sorted) {</div><div class='del'>-			int i;</div><div class='del'>-			char *locale;</div><div class='del'>-</div><div class='del'>-			for (i = 0; countries[i]; i++) {</div><div class='del'>-				countries[i] = _(countries[i]);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			locale = setlocale (LC_COLLATE, NULL);</div><div class='del'>-			qsort (countries + 1, i - 1, sizeof (countries[0]), compare_func);</div><div class='del'>-			country_list = NULL;</div><div class='del'>-			for (i = 0; countries[i]; i++) {</div><div class='del'>-				country_list = g_list_prepend (country_list, countries[i]);</div><div class='del'>-			}</div><div class='del'>-			country_list = g_list_reverse (country_list);</div><div class='del'>-			sorted = TRUE;</div><div class='del'>-		}</div><div class='del'>-		gtk_combo_set_popdown_strings (combo, country_list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address-&gt;address = NULL;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);</div><div class='del'>-	e_contact_editor_address-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	setup_tab_order (gui);</div><div class='del'>-	fill_in_countries (gui);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "table-checkaddress");</div><div class='del'>-	gtk_widget_ref(widget);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(widget-&gt;parent), widget);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)-&gt;vbox), widget, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_address_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_address-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address-&gt;gui));</div><div class='del'>-	e_card_delivery_address_unref(e_contact_editor_address-&gt;address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_address_new (const ECardDeliveryAddress *address)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"address", address,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		e_card_delivery_address_unref(e_contact_editor_address-&gt;address);</div><div class='del'>-		e_contact_editor_address-&gt;address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));</div><div class='del'>-		fill_in_info(e_contact_editor_address);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_IS_READ_ONLY: {</div><div class='del'>-		int i;</div><div class='del'>-		char *entry_names[] = {</div><div class='del'>-			"entry-street",</div><div class='del'>-			"entry-city",</div><div class='del'>-			"entry-ext",</div><div class='del'>-			"entry-po",</div><div class='del'>-			"entry-region",</div><div class='del'>-			"combo-country",</div><div class='del'>-			"entry-code",</div><div class='del'>-			NULL</div><div class='del'>-		};</div><div class='del'>-		e_contact_editor_address-&gt;editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		for (i = 0; entry_names[i] != NULL; i ++) {</div><div class='del'>-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address-&gt;gui, entry_names[i]);</div><div class='del'>-			if (GTK_IS_ENTRY (w)) {</div><div class='del'>-				gtk_entry_set_editable (GTK_ENTRY (w),</div><div class='del'>-							e_contact_editor_address-&gt;editable);</div><div class='del'>-			}</div><div class='del'>-			else if (GTK_IS_COMBO (w)) {</div><div class='del'>-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)-&gt;entry),</div><div class='del'>-							e_contact_editor_address-&gt;editable);</div><div class='del'>-				gtk_widget_set_sensitive (GTK_COMBO (w)-&gt;button, e_contact_editor_address-&gt;editable);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		extract_info(e_contact_editor_address);</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_ref(e_contact_editor_address-&gt;address);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_IS_READ_ONLY:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_contact_editor_address-&gt;editable ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_field(EContactEditorAddress *editor, char *field, char *string)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable) {</div><div class='del'>-		e_utf8_gtk_editable_set_text(editable, string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (address) {</div><div class='del'>-		fill_in_field(editor, "entry-street" , address-&gt;street );</div><div class='del'>-		fill_in_field(editor, "entry-po"     , address-&gt;po     );</div><div class='del'>-		fill_in_field(editor, "entry-ext"    , address-&gt;ext    );</div><div class='del'>-		fill_in_field(editor, "entry-city"   , address-&gt;city   );</div><div class='del'>-		fill_in_field(editor, "entry-region" , address-&gt;region );</div><div class='del'>-		fill_in_field(editor, "entry-code"   , address-&gt;code   );</div><div class='del'>-		fill_in_field(editor, "entry-country", address-&gt;country);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorAddress *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable)</div><div class='del'>-		return e_utf8_gtk_editable_get_text(editable);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (!address) {</div><div class='del'>-		address = e_card_delivery_address_new();</div><div class='del'>-		editor-&gt;address = address;</div><div class='del'>-	}</div><div class='del'>-	address-&gt;street  = extract_field(editor, "entry-street" );</div><div class='del'>-	address-&gt;po      = extract_field(editor, "entry-po"     );</div><div class='del'>-	address-&gt;ext     = extract_field(editor, "entry-ext"    );</div><div class='del'>-	address-&gt;city    = extract_field(editor, "entry-city"   );</div><div class='del'>-	address-&gt;region  = extract_field(editor, "entry-region" );</div><div class='del'>-	address-&gt;code    = extract_field(editor, "entry-code"   );</div><div class='del'>-	address-&gt;country = extract_field(editor, "entry-country");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h<br/>deleted file mode 100644<br/>index ff29c5b7ec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-address.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-editor-address.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_ADDRESS_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactEditorAddress - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * name         ECardName *     RW              The card currently being edited. Returns a copy.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorAddress       EContactEditorAddress;</div><div class='del'>-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddress</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardDeliveryAddress *address;</div><div class='del'>-</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddressClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);</div><div class='del'>-GtkType    e_contact_editor_address_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade<br/>deleted file mode 100644<br/>index b91a040d46..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-contact-editor-confirm-delete&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-contact-editor-confirm-delete&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeMessageBox&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;confirm-dialog&lt;/name&gt;</div><div class='del'>-  &lt;message_box_type&gt;GNOME_MESSAGE_BOX_QUESTION&lt;/message_box_type&gt;</div><div class='del'>-  &lt;message&gt;Are you sure you want</div><div class='del'>-to delete this contact?&lt;/message&gt;</div><div class='del'>-  &lt;title&gt;Delete Contact?&lt;/title&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;True&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c<br/>deleted file mode 100644<br/>index 5ae8b36a9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor-fullname.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-editor-fullname.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "e-contact-editor-fullname.h"</div><div class='del'>-#include &lt;gtk/gtkcombo.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);</div><div class='del'>-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);</div><div class='del'>-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_fullname_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void fill_in_info(EContactEditorFullname *editor);</div><div class='del'>-static void extract_info(EContactEditorFullname *editor);</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_NAME,</div><div class='del'>-	ARG_IS_READ_ONLY</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_fullname_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_fullname_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_fullname_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_fullname_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorFullname",</div><div class='del'>-				sizeof (EContactEditorFullname),</div><div class='del'>-				sizeof (EContactEditorFullnameClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_fullname_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_fullname_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_fullname_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeDialogClass *dialog_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	dialog_class = (GnomeDialogClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_dialog_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_NAME);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorFullname::editable", GTK_TYPE_BOOL, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_fullname_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_fullname_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_fullname_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_fullname-&gt;name = NULL;</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);</div><div class='del'>-	e_contact_editor_fullname-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "table-checkfullname");</div><div class='del'>-	gtk_widget_ref(widget);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(widget-&gt;parent), widget);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)-&gt;vbox), widget, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_fullname_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_fullname-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname-&gt;gui));</div><div class='del'>-	e_card_name_unref(e_contact_editor_fullname-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_fullname_new (const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"name", name,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorFullname *e_contact_editor_fullname;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		e_card_name_unref(e_contact_editor_fullname-&gt;name);</div><div class='del'>-		e_contact_editor_fullname-&gt;name = e_card_name_copy(GTK_VALUE_POINTER (*arg));</div><div class='del'>-		fill_in_info(e_contact_editor_fullname);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_IS_READ_ONLY: {</div><div class='del'>-		int i;</div><div class='del'>-		char *entry_names[] = {</div><div class='del'>-			"combo-title",</div><div class='del'>-			"combo-suffix",</div><div class='del'>-			"entry-first",</div><div class='del'>-			"entry-middle",</div><div class='del'>-			"entry-last",</div><div class='del'>-			NULL</div><div class='del'>-		};</div><div class='del'>-		e_contact_editor_fullname-&gt;editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		for (i = 0; entry_names[i] != NULL; i ++) {</div><div class='del'>-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname-&gt;gui, entry_names[i]);</div><div class='del'>-			if (GTK_IS_ENTRY (w)) {</div><div class='del'>-				gtk_entry_set_editable (GTK_ENTRY (w),</div><div class='del'>-							e_contact_editor_fullname-&gt;editable);</div><div class='del'>-			}</div><div class='del'>-			else if (GTK_IS_COMBO (w)) {</div><div class='del'>-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)-&gt;entry),</div><div class='del'>-							e_contact_editor_fullname-&gt;editable);</div><div class='del'>-				gtk_widget_set_sensitive (GTK_COMBO (w)-&gt;button, e_contact_editor_fullname-&gt;editable);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorFullname *e_contact_editor_fullname;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		extract_info(e_contact_editor_fullname);</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_card_name_ref(e_contact_editor_fullname-&gt;name);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_IS_READ_ONLY:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_contact_editor_fullname-&gt;editable ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_field(EContactEditorFullname *editor, char *field, char *string)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (entry) {</div><div class='del'>-		if (string)</div><div class='del'>-			e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-		else</div><div class='del'>-			gtk_entry_set_text(entry, "");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (name) {</div><div class='del'>-		fill_in_field(editor, "entry-title",  name-&gt;prefix);</div><div class='del'>-		fill_in_field(editor, "entry-first",  name-&gt;given);</div><div class='del'>-		fill_in_field(editor, "entry-middle", name-&gt;additional);</div><div class='del'>-		fill_in_field(editor, "entry-last",   name-&gt;family);</div><div class='del'>-		fill_in_field(editor, "entry-suffix", name-&gt;suffix);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorFullname *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (entry)</div><div class='del'>-		return e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (!name) {</div><div class='del'>-		name = e_card_name_new();</div><div class='del'>-		editor-&gt;name = name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name-&gt;prefix     = extract_field(editor, "entry-title" );</div><div class='del'>-	name-&gt;given      = extract_field(editor, "entry-first" );</div><div class='del'>-	name-&gt;additional = extract_field(editor, "entry-middle");</div><div class='del'>-	name-&gt;family     = extract_field(editor, "entry-last"  );</div><div class='del'>-	name-&gt;suffix     = extract_field(editor, "entry-suffix");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h<br/>deleted file mode 100644<br/>index 0d09b13700..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor-fullname.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-editor-fullname.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_FULLNAME_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactEditorFullname - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * name         ECardName *     RW              The card currently being edited. Returns a copy.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))</div><div class='del'>-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorFullname       EContactEditorFullname;</div><div class='del'>-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorFullname</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardName *name;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-</div><div class='del'>-	/* Whether the dialog will accept modifications */</div><div class='del'>-	guint editable : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorFullnameClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);</div><div class='del'>-GtkType    e_contact_editor_fullname_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c<br/>deleted file mode 100644<br/>index fd0f14ddb5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2748 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-editor.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcombo.h&gt;</div><div class='del'>-#include &lt;gtk/gtktext.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-popup-menu.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-ui-container.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-categories.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-categories-master-list-wombat.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-util.h"</div><div class='del'>-#include "e-util/e-gui-utils.h"</div><div class='del'>-#include "widgets/misc/e-dateedit.h"</div><div class='del'>-#include "shell/evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor-address.h"</div><div class='del'>-#include "e-contact-editor-fullname.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	CARD_ADDED,</div><div class='del'>-	CARD_MODIFIED,</div><div class='del'>-	CARD_DELETED,</div><div class='del'>-	EDITOR_CLOSED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_init		(EContactEditor		 *card);</div><div class='del'>-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);</div><div class='del'>-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);</div><div class='del'>-#endif</div><div class='del'>-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);</div><div class='del'>-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);</div><div class='del'>-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);</div><div class='del'>-static void find_address_mailing (EContactEditor *editor);</div><div class='del'>-static void enable_writable_fields(EContactEditor *editor);</div><div class='del'>-static void set_editable(EContactEditor *editor);</div><div class='del'>-static void fill_in_info(EContactEditor *editor);</div><div class='del'>-static void extract_info(EContactEditor *editor);</div><div class='del'>-static void set_fields(EContactEditor *editor);</div><div class='del'>-static void set_address_field(EContactEditor *editor, int result);</div><div class='del'>-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);</div><div class='del'>-static void command_state_changed (EContactEditor *ce);</div><div class='del'>-static void widget_changed (GtkWidget *widget, EContactEditor *editor);</div><div class='del'>-static void close_dialog (EContactEditor *ce);</div><div class='del'>-static void enable_widget (GtkWidget *widget, gboolean enabled);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static guint contact_editor_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-	ARG_IS_NEW_CARD,</div><div class='del'>-	ARG_EDITABLE,</div><div class='del'>-	ARG_CHANGED,</div><div class='del'>-	ARG_WRITABLE_FIELDS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DYNAMIC_LIST_EMAIL,</div><div class='del'>-	DYNAMIC_LIST_PHONE,</div><div class='del'>-	DYNAMIC_LIST_ADDRESS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType contact_editor_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!contact_editor_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo contact_editor_info =</div><div class='del'>-      {</div><div class='del'>-        "EContactEditor",</div><div class='del'>-        sizeof (EContactEditor),</div><div class='del'>-        sizeof (EContactEditorClass),</div><div class='del'>-        (GtkClassInitFunc) e_contact_editor_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_contact_editor_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;contact_editor_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return contact_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,</div><div class='del'>-					    gint arg1,</div><div class='del'>-					    GtkObject *arg2,</div><div class='del'>-					    gpointer user_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_marshal_NONE__INT_OBJECT (GtkObject * object,</div><div class='del'>-			    GtkSignalFunc func,</div><div class='del'>-			    gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__INT_OBJECT rfunc;</div><div class='del'>-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_INT (args[0]),</div><div class='del'>-		  GTK_VALUE_OBJECT (args[1]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_class_init (EContactEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::book", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::writable_fields", GTK_TYPE_POINTER,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_WRITABLE_FIELDS);</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::editable", GTK_TYPE_BOOL,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-  gtk_object_add_arg_type ("EContactEditor::changed", GTK_TYPE_BOOL,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_CHANGED);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[CARD_ADDED] =</div><div class='del'>-	  gtk_signal_new ("card_added",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_added),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[CARD_MODIFIED] =</div><div class='del'>-	  gtk_signal_new ("card_modified",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_modified),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[CARD_DELETED] =</div><div class='del'>-	  gtk_signal_new ("card_deleted",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_deleted),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_editor_signals[EDITOR_CLOSED] =</div><div class='del'>-	  gtk_signal_new ("editor_closed",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),</div><div class='del'>-			  gtk_marshal_NONE__NONE,</div><div class='del'>-			  GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);</div><div class='del'>- </div><div class='del'>-  object_class-&gt;set_arg = e_contact_editor_set_arg;</div><div class='del'>-  object_class-&gt;get_arg = e_contact_editor_get_arg;</div><div class='del'>-  object_class-&gt;destroy = e_contact_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui = editor-&gt;gui;</div><div class='del'>-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);</div><div class='del'>-	GtkWidget *pixmap;</div><div class='del'>-	gchar *image_temp;</div><div class='del'>-	if (button &amp;&amp; GTK_IS_BUTTON(button)) {</div><div class='del'>-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);</div><div class='del'>-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);</div><div class='del'>-		gtk_container_add(GTK_CONTAINER(button),</div><div class='del'>-				  pixmap);</div><div class='del'>-		g_free(image_temp);</div><div class='del'>-		gtk_widget_show(pixmap);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_replace_buttons(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-wants_html_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gboolean wants_html;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(widget),</div><div class='del'>-		       "active", &amp;wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-		       "wants_html", wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(widget);</div><div class='del'>-	ECardPhone *phone;</div><div class='del'>-</div><div class='del'>-	if ( widget == glade_xml_get_widget(editor-&gt;gui, "entry-phone1") ) {</div><div class='del'>-		which = 1;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "entry-phone2") ) {</div><div class='del'>-		which = 2;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "entry-phone3") ) {</div><div class='del'>-		which = 3;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "entry-phone4") ) {</div><div class='del'>-		which = 4;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	phone = e_card_phone_new();</div><div class='del'>-	phone-&gt;number = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	e_card_simple_set_phone(editor-&gt;simple, editor-&gt;phone_choice[which - 1], phone);</div><div class='del'>-	e_card_phone_unref(phone);</div><div class='del'>-	set_fields(editor);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gchar *string;</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(widget);</div><div class='del'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_email(editor-&gt;simple, editor-&gt;email_choice, string);</div><div class='del'>-</div><div class='del'>-	g_free (string);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_text_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-	ECardAddrLabel *address;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_choice == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	address = e_card_address_label_new();</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_mailing == editor-&gt;address_choice || editor-&gt;address_mailing == -1) {</div><div class='del'>-		GtkWidget *check;</div><div class='del'>-		</div><div class='del'>-		address-&gt;flags |= E_CARD_ADDR_DEFAULT;</div><div class='del'>-		</div><div class='del'>-		check = glade_xml_get_widget(editor-&gt;gui, "checkbutton-mailingaddress");</div><div class='del'>-		if (check &amp;&amp; GTK_IS_CHECK_BUTTON (check)) {</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (check), editor);</div><div class='del'>-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);</div><div class='del'>-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (check), editor);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	address-&gt;data = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-	e_card_address_label_unref(address);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_mailing_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *address;</div><div class='del'>-	GtkWidget *text;</div><div class='del'>-	gboolean mailing_address;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_choice == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mailing_address = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));</div><div class='del'>-	</div><div class='del'>-	/* Mark the current address as the mailing address */</div><div class='del'>- 	text = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-	if (text &amp;&amp; GTK_IS_TEXT(text)) {</div><div class='del'>-</div><div class='del'>-		address = e_card_address_label_new();</div><div class='del'>-		</div><div class='del'>-		if (mailing_address)</div><div class='del'>-			address-&gt;flags |= E_CARD_ADDR_DEFAULT;</div><div class='del'>-		else</div><div class='del'>-			address-&gt;flags &amp;= ~E_CARD_ADDR_DEFAULT;</div><div class='del'>-		address-&gt;data = e_utf8_gtk_editable_get_chars(GTK_EDITABLE (text), 0, -1);</div><div class='del'>-	</div><div class='del'>-		e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-		e_card_address_label_unref(address);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unset the previous mailing address flag */</div><div class='del'>-	if (mailing_address &amp;&amp; editor-&gt;address_mailing != -1) {</div><div class='del'>-		const ECardAddrLabel *curr;</div><div class='del'>-</div><div class='del'>-		curr = e_card_simple_get_address(editor-&gt;simple, </div><div class='del'>-						 editor-&gt;address_mailing);</div><div class='del'>-		address = e_card_address_label_copy (curr);</div><div class='del'>-		address-&gt;flags &amp;= ~E_CARD_ADDR_DEFAULT;</div><div class='del'>-		e_card_simple_set_address(editor-&gt;simple, </div><div class='del'>-					  editor-&gt;address_mailing,</div><div class='del'>-					  address);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remember the new mailing address */</div><div class='del'>-	if (mailing_address)</div><div class='del'>-		editor-&gt;address_mailing = editor-&gt;address_choice;</div><div class='del'>-	else</div><div class='del'>-		editor-&gt;address_mailing = -1;</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This function tells you whether name_to_style will make sense.  */</div><div class='del'>-static gboolean</div><div class='del'>-style_makes_sense(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0: /* Fall Through */</div><div class='del'>-	case 1:</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 2:</div><div class='del'>-		if (company &amp;&amp; *company)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		if (company &amp;&amp; *company &amp;&amp; name &amp;&amp; ((name-&gt;given &amp;&amp; *name-&gt;given) || (name-&gt;family &amp;&amp; *name-&gt;family)))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-name_to_style(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	char *strings[4], **stringptr;</div><div class='del'>-	char *substring;</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(" ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		string = g_strdup(company);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		substring = g_strjoinv(", ", strings);</div><div class='del'>-		if (!(company &amp;&amp; *company))</div><div class='del'>-			company = "";</div><div class='del'>-		if (style == 3)</div><div class='del'>-			string = g_strdup_printf("%s (%s)", substring, company);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup_printf("%s (%s)", company, substring);</div><div class='del'>-		g_free(substring);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		string = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_as_get_style (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	char *filestring;</div><div class='del'>-	char *trystring;</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	int i;</div><div class='del'>-	int style;</div><div class='del'>-</div><div class='del'>-	if (!(file_as &amp;&amp; GTK_IS_ENTRY(file_as)))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	filestring = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-</div><div class='del'>-	style = -1;</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		trystring = name_to_style(name, editor-&gt;company, i);</div><div class='del'>-		if (!strcmp(trystring, filestring)) {</div><div class='del'>-			g_free(trystring);</div><div class='del'>-			g_free(filestring);</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		g_free(trystring);</div><div class='del'>-	}</div><div class='del'>-	g_free (filestring);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_as_set_style(EContactEditor *editor, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	int i;</div><div class='del'>-	GList *strings = NULL;</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-	if (!(file_as &amp;&amp; GTK_IS_ENTRY(file_as)))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (style == -1) {</div><div class='del'>-		string = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-		strings = g_list_append(strings, string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "combo-file-as");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		if (style_makes_sense(editor-&gt;name, editor-&gt;company, i)) {</div><div class='del'>-			char *u;</div><div class='del'>-			u = name_to_style(editor-&gt;name, editor-&gt;company, i);</div><div class='del'>-			string = e_utf8_to_gtk_string (widget, u);</div><div class='del'>-			g_free (u);</div><div class='del'>-			if (string) strings = g_list_append(strings, string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_COMBO(widget)) {</div><div class='del'>-		GtkCombo *combo = GTK_COMBO(widget);</div><div class='del'>-		gtk_combo_set_popdown_strings(combo, strings);</div><div class='del'>-		g_list_foreach(strings, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(strings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (style != -1) {</div><div class='del'>-		string = name_to_style(editor-&gt;name, editor-&gt;company, style);</div><div class='del'>-		e_utf8_gtk_entry_set_text(file_as, string);</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int style = 0;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	style = file_as_get_style(editor);</div><div class='del'>-	</div><div class='del'>-	e_card_name_unref(editor-&gt;name);</div><div class='del'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));</div><div class='del'>-	editor-&gt;name = e_card_name_from_string(string);</div><div class='del'>-	g_free (string);</div><div class='del'>-	</div><div class='del'>-	file_as_set_style(editor, style);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-company_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int style = 0;</div><div class='del'>-</div><div class='del'>-	style = file_as_get_style(editor);</div><div class='del'>-	</div><div class='del'>-	g_free(editor-&gt;company);</div><div class='del'>-	</div><div class='del'>-	editor-&gt;company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));</div><div class='del'>-	</div><div class='del'>-	file_as_set_style(editor, style);</div><div class='del'>-</div><div class='del'>-	widget_changed (widget, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-field_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_entry_changed_signal_phone(EContactEditor *editor, char *id)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, id);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   phone_entry_changed, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-widget_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;editable) {</div><div class='del'>-		g_warning ("non-editable contact editor has an editable field in it.");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_entry_changed_signal_field(EContactEditor *editor, char *id)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, id);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   field_changed, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_entry_changed_signals(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	set_entry_changed_signal_phone(editor, "entry-phone1");</div><div class='del'>-	set_entry_changed_signal_phone(editor, "entry-phone2");</div><div class='del'>-	set_entry_changed_signal_phone(editor, "entry-phone3");</div><div class='del'>-	set_entry_changed_signal_phone(editor, "entry-phone4");</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-email1");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   email_entry_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_TEXT(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   address_text_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-fullname");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   name_entry_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-company");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   company_entry_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-web");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-categories");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-jobtitle");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-manager");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-assistant");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-office");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-department");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-profession");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-nickname");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-spouse");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "text-comments");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_TEXT(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-birthday");</div><div class='del'>-	if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-anniversary");</div><div class='del'>-	if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "entry-web");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_ENTRY(widget)) {</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_name_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor-&gt;name));</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (dialog),</div><div class='del'>-			"editable", editor-&gt;editable,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardName *name;</div><div class='del'>-		GtkWidget *fname_widget;</div><div class='del'>-		int style = 0;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "name", &amp;name,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		style = file_as_get_style(editor);</div><div class='del'>-</div><div class='del'>-		fname_widget = glade_xml_get_widget(editor-&gt;gui, "entry-fullname");</div><div class='del'>-		if (fname_widget &amp;&amp; GTK_IS_ENTRY(fname_widget)) {</div><div class='del'>-			char *full_name = e_card_name_to_string(name);</div><div class='del'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);</div><div class='del'>-			g_free(full_name);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_card_name_unref(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_ref(name);</div><div class='del'>-</div><div class='del'>-		file_as_set_style(editor, style);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_addr_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	int result;</div><div class='del'>-	const ECardDeliveryAddress *address;</div><div class='del'>-</div><div class='del'>-	address = e_card_simple_get_delivery_address(editor-&gt;simple, editor-&gt;address_choice);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));</div><div class='del'>-	gtk_object_set (GTK_OBJECT (dialog),</div><div class='del'>-			"editable", editor-&gt;editable,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardDeliveryAddress *new_address;</div><div class='del'>-		GtkWidget *address_widget;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "address", &amp;new_address,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		address_widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-		if (address_widget &amp;&amp; GTK_IS_EDITABLE(address_widget)) {</div><div class='del'>-			char *string = e_card_delivery_address_to_string(new_address);</div><div class='del'>-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);</div><div class='del'>-			g_free(string);</div><div class='del'>-		} else {</div><div class='del'>-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);</div><div class='del'>-			e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-			e_card_address_label_unref(address);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_card_simple_set_delivery_address(editor-&gt;simple, editor-&gt;address_choice, new_address);</div><div class='del'>-</div><div class='del'>-		e_card_delivery_address_unref(new_address);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-categories_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	char *categories = NULL;</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	int result;</div><div class='del'>-	GtkWidget *entry = glade_xml_get_widget(editor-&gt;gui, "entry-categories");</div><div class='del'>-	ECategoriesMasterList *ecml;</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));</div><div class='del'>-	else if (editor-&gt;card)</div><div class='del'>-		gtk_object_get(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-	dialog = GNOME_DIALOG(e_categories_new(categories));</div><div class='del'>-</div><div class='del'>-	if (dialog == NULL) {</div><div class='del'>-		GtkWidget *uh_oh = gnome_error_dialog (_("Category editor not available."));</div><div class='del'>-		gtk_widget_show (uh_oh);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ecml = e_categories_master_list_wombat_new ();</div><div class='del'>-	gtk_object_set(GTK_OBJECT(dialog),</div><div class='del'>-		       "header", _("This contact belongs to these categories:"),</div><div class='del'>-		       "ecml", ecml,</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ecml));</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-	g_free (categories);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-				       "categories", categories,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_free(categories);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ensure_select_names_contact (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (editor-&gt;select_names_contacts == NULL) {</div><div class='del'>-		editor-&gt;select_names_contacts = e_select_names_manager_new ();</div><div class='del'>-		e_select_names_manager_add_section (editor-&gt;select_names_contacts,</div><div class='del'>-						    "contacts",</div><div class='del'>-						    "Related Contacts");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_entry_changed_signal_field(editor, "entry-caluri");</div><div class='del'>-	set_entry_changed_signal_field(editor, "entry-fburl");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-contacts_clicked (GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ensure_select_names_contact (editor);</div><div class='del'>-	e_select_names_manager_activate_dialog (editor-&gt;select_names_contacts,</div><div class='del'>-						"contacts");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_lists (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table = glade_xml_get_widget (editor-&gt;gui, "table-contacts");</div><div class='del'>-	if (table &amp;&amp; GTK_IS_TABLE (table)) {</div><div class='del'>-		GtkWidget *entry;</div><div class='del'>-</div><div class='del'>-		ensure_select_names_contact (editor);</div><div class='del'>-		entry = e_select_names_manager_create_entry (editor-&gt;select_names_contacts,</div><div class='del'>-							     "contacts");</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(entry), "changed",</div><div class='del'>-				   widget_changed, editor);</div><div class='del'>-		gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 1, 0, 1);</div><div class='del'>-		gtk_widget_show (entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-	gboolean should_close;</div><div class='del'>-} EditorCloseStruct;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce = ecs-&gt;ce;</div><div class='del'>-	gboolean should_close = ecs-&gt;should_close;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (ce-&gt;app, TRUE);</div><div class='del'>-	ce-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	e_card_set_id (ce-&gt;card, id);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_ADDED],</div><div class='del'>-			 status, ce-&gt;card);</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		ce-&gt;is_new_card = FALSE;</div><div class='del'>-</div><div class='del'>-		if (should_close) {</div><div class='del'>-			close_dialog (ce);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			ce-&gt;changed = FALSE;</div><div class='del'>-			command_state_changed (ce);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</div><div class='del'>-	g_free (ecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce = ecs-&gt;ce;</div><div class='del'>-	gboolean should_close = ecs-&gt;should_close;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (ce-&gt;app, TRUE);</div><div class='del'>-	ce-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_MODIFIED],</div><div class='del'>-			 status, ce-&gt;card);</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		if (should_close) {</div><div class='del'>-			close_dialog (ce);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			ce-&gt;changed = FALSE;</div><div class='del'>-			command_state_changed (ce);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</div><div class='del'>-	g_free (ecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request saving a card */</div><div class='del'>-static void</div><div class='del'>-save_card (EContactEditor *ce, gboolean should_close)</div><div class='del'>-{</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	if (ce-&gt;book) {</div><div class='del'>-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);</div><div class='del'>-		</div><div class='del'>-		ecs-&gt;ce = ce;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (ecs-&gt;ce));</div><div class='del'>-</div><div class='del'>-		ecs-&gt;should_close = should_close;</div><div class='del'>-</div><div class='del'>-		gtk_widget_set_sensitive (ce-&gt;app, FALSE);</div><div class='del'>-		ce-&gt;in_async_call = TRUE;</div><div class='del'>-</div><div class='del'>-		if (ce-&gt;is_new_card)</div><div class='del'>-			e_card_merging_book_add_card (ce-&gt;book, ce-&gt;card, GTK_SIGNAL_FUNC(card_added_cb), ecs);</div><div class='del'>-		else</div><div class='del'>-			e_card_merging_book_commit_card (ce-&gt;book, ce-&gt;card, GTK_SIGNAL_FUNC(card_modified_cb), ecs);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Closes the dialog box and emits the appropriate signals */</div><div class='del'>-static void</div><div class='del'>-close_dialog (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	if (ce-&gt;app != NULL) {</div><div class='del'>-		gtk_widget_destroy (ce-&gt;app);</div><div class='del'>-		ce-&gt;app = NULL;</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-prompt_to_save_changes (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;changed)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor-&gt;app))) {</div><div class='del'>-	case 0: /* Save */</div><div class='del'>-		save_card (editor, FALSE);</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 1: /* Discard */</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 2: /* Cancel */</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu callbacks */</div><div class='del'>-</div><div class='del'>-/* File/Save callback */</div><div class='del'>-static void</div><div class='del'>-file_save_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	save_card (ce, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Close callback */</div><div class='del'>-static void</div><div class='del'>-file_close_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	if (!prompt_to_save_changes (ce))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_save_as_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	card = ce-&gt;card;</div><div class='del'>-	e_contact_save_as(_("Save Contact as VCard"), card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_send_as_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	card = ce-&gt;card;</div><div class='del'>-	e_card_send(card, E_CARD_DISPOSITION_AS_ATTACHMENT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_send_to_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	card = ce-&gt;card;</div><div class='del'>-	e_card_send(card, E_CARD_DISPOSITION_AS_TO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_contact_editor_confirm_delete(GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_parent(dialog, parent);</div><div class='del'>-	</div><div class='del'>-	result = gnome_dialog_run_and_close(dialog);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(gui));</div><div class='del'>-</div><div class='del'>-	return !result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_deleted_cb (EBook *book, EBookStatus status, EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive (ce-&gt;app, TRUE);</div><div class='del'>-	ce-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_DELETED],</div><div class='del'>-			 status, ce-&gt;card);</div><div class='del'>-</div><div class='del'>-	/* always close the dialog after we successfully delete a card */</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	ECard *card = ce-&gt;card;</div><div class='del'>-	ECardSimple *simple = ce-&gt;simple;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(simple));</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce-&gt;app))) {</div><div class='del'>-</div><div class='del'>-		extract_info (ce);</div><div class='del'>-		e_card_simple_sync_card (simple);</div><div class='del'>-		</div><div class='del'>-		if (!ce-&gt;is_new_card &amp;&amp; ce-&gt;book) {</div><div class='del'>-			gtk_widget_set_sensitive (ce-&gt;app, FALSE);</div><div class='del'>-			ce-&gt;in_async_call = TRUE;</div><div class='del'>-</div><div class='del'>-			e_book_remove_card (ce-&gt;book, card, GTK_SIGNAL_FUNC(card_deleted_cb), ce);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_card_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Toolbar/Save and Close callback */</div><div class='del'>-static void</div><div class='del'>-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	save_card (ce, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),</div><div class='del'>-#endif</div><div class='del'>-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EPixmap pixmaps[] = {</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-	E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),</div><div class='del'>-#endif</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactEditorSaveClose", "buttons/save-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactEditorDelete", "buttons/delete-message.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_ui (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (ce-&gt;uic, verbs, ce);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ce-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-contact-editor.xml",</div><div class='del'>-			       "evolution-contact-editor");</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (ce-&gt;uic, pixmaps);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the dialog box is destroyed */</div><div class='del'>-static gint</div><div class='del'>-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	/* if we're saving, don't allow the dialog to close */</div><div class='del'>-	if (ce-&gt;in_async_call)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (!prompt_to_save_changes (ce))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-add_to_tab_order(GList *list, GladeXML *gui, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(gui, name);</div><div class='del'>-	return g_list_prepend(list, widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_tab_order(GladeXML *gui)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *container;</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-</div><div class='del'>-	container = glade_xml_get_widget(gui, "table-contact-editor-general");</div><div class='del'>-</div><div class='del'>-	if (container) {</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-fullname");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-jobtitle");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-company");</div><div class='del'>-		list = add_to_tab_order(list, gui, "combo-file-as");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone2");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone3");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone4");</div><div class='del'>-</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-email1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "alignment-htmlmail");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-web");</div><div class='del'>-		list = add_to_tab_order(list, gui, "button-fulladdr");</div><div class='del'>-		list = add_to_tab_order(list, gui, "text-address");</div><div class='del'>-		list = add_to_tab_order(list, gui, "alignment-contacts");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_init (EContactEditor *e_contact_editor)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *bonobo_win;</div><div class='del'>-	GtkWidget *wants_html;</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;email_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;name = e_card_name_new();</div><div class='del'>-	e_contact_editor-&gt;company = g_strdup("");</div><div class='del'>-	</div><div class='del'>-	e_contact_editor-&gt;email_choice = 0;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;</div><div class='del'>-	e_contact_editor-&gt;address_choice = 0;</div><div class='del'>-	e_contact_editor-&gt;address_mailing = -1;</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;arbitrary_fields = NULL;</div><div class='del'>-	</div><div class='del'>-	e_contact_editor-&gt;simple = e_card_simple_new(NULL);</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;card = NULL;</div><div class='del'>-	e_contact_editor-&gt;changed = FALSE;</div><div class='del'>-	e_contact_editor-&gt;in_async_call = FALSE;</div><div class='del'>-	e_contact_editor-&gt;editable = TRUE;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);</div><div class='del'>-	e_contact_editor-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	setup_tab_order(gui);</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;app = glade_xml_get_widget (gui, "contact editor");</div><div class='del'>-</div><div class='del'>-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor-&gt;app),</div><div class='del'>-				  (GtkCallback) add_field_callback,</div><div class='del'>-				  e_contact_editor);</div><div class='del'>-</div><div class='del'>-	_replace_buttons(e_contact_editor);</div><div class='del'>-	add_lists (e_contact_editor);</div><div class='del'>-	set_entry_changed_signals(e_contact_editor);</div><div class='del'>-</div><div class='del'>-	wants_html = glade_xml_get_widget(e_contact_editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-	if (wants_html &amp;&amp; GTK_IS_TOGGLE_BUTTON(wants_html))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",</div><div class='del'>-				   wants_html_changed, e_contact_editor);</div><div class='del'>-</div><div class='del'>- 	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "checkbutton-mailingaddress");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_TOGGLE_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "toggled",</div><div class='del'>-				   address_mailing_changed, e_contact_editor);</div><div class='del'>-	</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fullname");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_name_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fulladdr");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_addr_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-categories");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   categories_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-contacts");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   contacts_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-	bonobo_win = bonobo_window_new ("contact-editor-dialog", _("Contact Editor"));</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (e_contact_editor-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("contact_editor_construct(): Could not get contents");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (e_contact_editor-&gt;app);</div><div class='del'>-		e_contact_editor-&gt;app = bonobo_win;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	if (!e_contact_editor-&gt;uic) {</div><div class='del'>-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	bonobo_ui_component_set_container (e_contact_editor-&gt;uic,</div><div class='del'>-					   bonobo_object_corba_objref (</div><div class='del'>-						   BONOBO_OBJECT (container)));</div><div class='del'>-</div><div class='del'>-	create_ui (e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "entry-fullname");</div><div class='del'>-	if (widget)</div><div class='del'>-		gtk_widget_grab_focus (widget);</div><div class='del'>-</div><div class='del'>-	/* Connect to the deletion of the dialog */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_contact_editor-&gt;app), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_destroy (GtkObject *object) {</div><div class='del'>-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor-&gt;writable_fields) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor-&gt;writable_fields));</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;email_list) {</div><div class='del'>-		g_list_foreach(e_contact_editor-&gt;email_list, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(e_contact_editor-&gt;email_list);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;email_info) {</div><div class='del'>-		g_free(e_contact_editor-&gt;email_info);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;email_popup) {</div><div class='del'>-		gtk_widget_unref(e_contact_editor-&gt;email_popup);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (e_contact_editor-&gt;phone_list) {</div><div class='del'>-		g_list_foreach(e_contact_editor-&gt;phone_list, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(e_contact_editor-&gt;phone_list);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;phone_info) {</div><div class='del'>-		g_free(e_contact_editor-&gt;phone_info);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;phone_popup) {</div><div class='del'>-		gtk_widget_unref(e_contact_editor-&gt;phone_popup);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (e_contact_editor-&gt;address_list) {</div><div class='del'>-		g_list_foreach(e_contact_editor-&gt;address_list, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(e_contact_editor-&gt;address_list);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;address_info) {</div><div class='del'>-		g_free(e_contact_editor-&gt;address_info);</div><div class='del'>-	}</div><div class='del'>-	if (e_contact_editor-&gt;address_popup) {</div><div class='del'>-		gtk_widget_unref(e_contact_editor-&gt;address_popup);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (e_contact_editor-&gt;simple)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor-&gt;simple));</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor-&gt;book));</div><div class='del'>-</div><div class='del'>-	e_card_name_unref(e_contact_editor-&gt;name);</div><div class='del'>-	g_free (e_contact_editor-&gt;company);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(e_contact_editor-&gt;gui));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-command_state_changed (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_set_prop (ce-&gt;uic,</div><div class='del'>-				      "/commands/ContactEditorSaveClose",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      ce-&gt;changed ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (ce-&gt;uic,</div><div class='del'>-				      "/commands/ContactEditorSave",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      ce-&gt;changed ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (ce-&gt;uic,</div><div class='del'>-				      "/commands/ContactEditorDelete",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      (ce-&gt;editable &amp;&amp; !ce-&gt;is_new_card) ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-supported_fields_cb (EBook *book, EBookStatus status,</div><div class='del'>-		     EList *fields, EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set (GTK_OBJECT (ce),</div><div class='del'>-			"writable_fields", fields,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_show (ce);</div><div class='del'>-</div><div class='del'>-	command_state_changed (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EContactEditor *</div><div class='del'>-e_contact_editor_new (EBook *book,</div><div class='del'>-		      ECard *card,</div><div class='del'>-		      gboolean is_new_card,</div><div class='del'>-		      gboolean editable)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK (book), NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_CARD (card), NULL);</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (ce),</div><div class='del'>-			"book", book,</div><div class='del'>-			"card", card,</div><div class='del'>-			"is_new_card", is_new_card,</div><div class='del'>-			"editable", editable,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (book)</div><div class='del'>-		e_book_get_supported_fields (book, (EBookFieldsCallback)supported_fields_cb, ce);</div><div class='del'>-</div><div class='del'>-	return ce;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *editor;</div><div class='del'>-</div><div class='del'>-	editor = E_CONTACT_EDITOR (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (editor-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(editor-&gt;book));</div><div class='del'>-		editor-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (editor-&gt;book));</div><div class='del'>-		/* XXX more here about editable/etc. */</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (editor-&gt;card)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(editor-&gt;card));</div><div class='del'>-		editor-&gt;card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));</div><div class='del'>-		gtk_object_set(GTK_OBJECT(editor-&gt;simple),</div><div class='del'>-			       "card", editor-&gt;card,</div><div class='del'>-			       NULL);</div><div class='del'>-		fill_in_info(editor);</div><div class='del'>-		editor-&gt;changed = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_IS_NEW_CARD:</div><div class='del'>-		editor-&gt;is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_EDITABLE: {</div><div class='del'>-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		gboolean changed = (editor-&gt;editable != new_value);</div><div class='del'>-</div><div class='del'>-		editor-&gt;editable = new_value;</div><div class='del'>-</div><div class='del'>-		if (changed) {</div><div class='del'>-			set_editable (editor);</div><div class='del'>-			command_state_changed (editor);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ARG_CHANGED: {</div><div class='del'>-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		gboolean changed = (editor-&gt;changed != new_value);</div><div class='del'>-</div><div class='del'>-		editor-&gt;changed = new_value;</div><div class='del'>-</div><div class='del'>-		if (changed)</div><div class='del'>-			command_state_changed (editor);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case ARG_WRITABLE_FIELDS:</div><div class='del'>-		if (editor-&gt;writable_fields)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(editor-&gt;writable_fields));</div><div class='del'>-		editor-&gt;writable_fields = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		if (editor-&gt;writable_fields)</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (editor-&gt;writable_fields));</div><div class='del'>-		else</div><div class='del'>-			editor-&gt;writable_fields = e_list_new(NULL, NULL, NULL);</div><div class='del'>-		enable_writable_fields (editor);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *e_contact_editor;</div><div class='del'>-</div><div class='del'>-	e_contact_editor = E_CONTACT_EDITOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		e_card_simple_sync_card(e_contact_editor-&gt;simple);</div><div class='del'>-		extract_info(e_contact_editor);</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor-&gt;card);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_IS_NEW_CARD:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_contact_editor-&gt;is_new_card ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_contact_editor-&gt;editable ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_CHANGED:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_contact_editor-&gt;changed ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_WRITABLE_FIELDS:</div><div class='del'>-		if (e_contact_editor-&gt;writable_fields)</div><div class='del'>-			GTK_VALUE_POINTER (*arg) = e_list_duplicate (e_contact_editor-&gt;writable_fields);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_POINTER (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_popup_position(GtkMenu *menu,</div><div class='del'>-		gint *x,</div><div class='del'>-		gint *y,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *button = GTK_WIDGET(data);</div><div class='del'>-	GtkRequisition request;</div><div class='del'>-	int mh, mw;</div><div class='del'>-	gdk_window_get_origin (button-&gt;window, x, y);</div><div class='del'>-	*x += button-&gt;allocation.width;</div><div class='del'>-	*y += button-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	gtk_widget_size_request(GTK_WIDGET(menu), &amp;request);</div><div class='del'>-</div><div class='del'>-	mh = request.height;</div><div class='del'>-	mw = request.width;</div><div class='del'>-</div><div class='del'>-	*x -= mw;</div><div class='del'>-	if (*x &lt; 0)</div><div class='del'>-		*x = 0;</div><div class='del'>-	</div><div class='del'>-	if (*y &lt; 0)</div><div class='del'>-		*y = 0;</div><div class='del'>-	</div><div class='del'>-	if ((*x + mw) &gt; gdk_screen_width ())</div><div class='del'>-		*x = gdk_screen_width () - mw;</div><div class='del'>-	</div><div class='del'>-	if ((*y + mh) &gt; gdk_screen_height ())</div><div class='del'>-		*y = gdk_screen_height () - mh;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)</div><div class='del'>-{</div><div class='del'>-	gint menu_item;</div><div class='del'>-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");</div><div class='del'>-	gtk_widget_realize(popup);</div><div class='del'>-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);</div><div class='del'>-	if ( menu_item != -1 ) {</div><div class='del'>-#if 0</div><div class='del'>-		if (menu_item == g_list_length (*list)) {</div><div class='del'>-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);</div><div class='del'>-		} else {</div><div class='del'>-#endif</div><div class='del'>-			GtkWidget *label_widget = glade_xml_get_widget(editor-&gt;gui, label);</div><div class='del'>-			if (label_widget &amp;&amp; GTK_IS_LABEL(label_widget)) {</div><div class='del'>-				gtk_object_set(GTK_OBJECT(label_widget),</div><div class='del'>-					       "label", _(g_list_nth_data(*list, menu_item)),</div><div class='del'>-					       NULL);</div><div class='del'>-			}</div><div class='del'>-#if 0</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	return menu_item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)</div><div class='del'>-{</div><div class='del'>-	GnomeUIInfo *info;</div><div class='del'>-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };</div><div class='del'>-	GnomeUIInfo end = GNOMEUIINFO_END;</div><div class='del'>-	int length;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	info = *infop;</div><div class='del'>-</div><div class='del'>-	if ( info )</div><div class='del'>-		g_free(info);</div><div class='del'>-	length = g_list_length( list );</div><div class='del'>-	info = g_new(GnomeUIInfo, length + 2);</div><div class='del'>-	for (i = 0; i &lt; length; i++) {</div><div class='del'>-		info[i] = singleton;</div><div class='del'>-		info[i].label = _(list-&gt;data);</div><div class='del'>-		list = list-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	info[i] = end;</div><div class='del'>-</div><div class='del'>-	*infop = info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_build_phone_ui (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;phone_list == NULL) {</div><div class='del'>-		static char *info[] = {</div><div class='del'>-			N_("Assistant"),</div><div class='del'>-			N_("Business"),</div><div class='del'>-			N_("Business 2"),</div><div class='del'>-			N_("Business Fax"),</div><div class='del'>-			N_("Callback"),</div><div class='del'>-			N_("Car"),</div><div class='del'>-			N_("Company"),</div><div class='del'>-			N_("Home"),</div><div class='del'>-			N_("Home 2"),</div><div class='del'>-			N_("Home Fax"),</div><div class='del'>-			N_("ISDN"),</div><div class='del'>-			N_("Mobile"),</div><div class='del'>-			N_("Other"),</div><div class='del'>-			N_("Other Fax"),</div><div class='del'>-			N_("Pager"),</div><div class='del'>-			N_("Primary"),</div><div class='del'>-			N_("Radio"),</div><div class='del'>-			N_("Telex"),</div><div class='del'>-			N_("TTY/TDD")</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; sizeof(info) / sizeof(info[0]); i++) {</div><div class='del'>-			editor-&gt;phone_list = g_list_append(editor-&gt;phone_list, g_strdup(info[i]));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (editor-&gt;phone_info == NULL) {</div><div class='del'>-		e_contact_editor_build_ui_info(editor-&gt;phone_list, &amp;editor-&gt;phone_info);</div><div class='del'>-		</div><div class='del'>-		if ( editor-&gt;phone_popup )</div><div class='del'>-			gtk_widget_unref(editor-&gt;phone_popup);</div><div class='del'>-		</div><div class='del'>-		editor-&gt;phone_popup = gnome_popup_menu_new(editor-&gt;phone_info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_build_email_ui (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;email_list == NULL) {</div><div class='del'>-		static char *info[] = {</div><div class='del'>-			N_("Primary Email"),</div><div class='del'>-			N_("Email 2"),</div><div class='del'>-			N_("Email 3")</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; sizeof(info) / sizeof(info[0]); i++) {</div><div class='del'>-			editor-&gt;email_list = g_list_append(editor-&gt;email_list, g_strdup(info[i]));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (editor-&gt;email_info == NULL) {</div><div class='del'>-		e_contact_editor_build_ui_info(editor-&gt;email_list, &amp;editor-&gt;email_info);</div><div class='del'>-</div><div class='del'>-		if ( editor-&gt;email_popup )</div><div class='del'>-			gtk_widget_unref(editor-&gt;email_popup);</div><div class='del'>-		</div><div class='del'>-		editor-&gt;email_popup = gnome_popup_menu_new(editor-&gt;email_info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_build_address_ui (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_list == NULL) {</div><div class='del'>-		static char *info[] = {</div><div class='del'>-			N_("Business"),</div><div class='del'>-			N_("Home"),</div><div class='del'>-			N_("Other")</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; sizeof(info) / sizeof(info[0]); i++) {</div><div class='del'>-			editor-&gt;address_list = g_list_append(editor-&gt;address_list, g_strdup(info[i]));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (editor-&gt;address_info == NULL) {</div><div class='del'>-		e_contact_editor_build_ui_info(editor-&gt;address_list, &amp;editor-&gt;address_info);</div><div class='del'>-</div><div class='del'>-		if ( editor-&gt;address_popup )</div><div class='del'>-			gtk_widget_unref(editor-&gt;address_popup);</div><div class='del'>-		</div><div class='del'>-		editor-&gt;address_popup = gnome_popup_menu_new(editor-&gt;address_info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),</div><div class='del'>-					       "e_contact_editor_label");</div><div class='del'>-</div><div class='del'>-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),</div><div class='del'>-						      "e_contact_editor_dialog_entry");</div><div class='del'>-	</div><div class='del'>-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),</div><div class='del'>-					   "e_contact_editor_list");</div><div class='del'>-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),</div><div class='del'>-					   "e_contact_editor_info");</div><div class='del'>-	switch (button) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (label &amp;&amp; GTK_IS_LABEL(label)) {</div><div class='del'>-			gtk_object_set(GTK_OBJECT(label),</div><div class='del'>-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),</div><div class='del'>-				       NULL);</div><div class='del'>-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));</div><div class='del'>-			g_free(*info);</div><div class='del'>-			*info = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog_entry = gtk_entry_new();</div><div class='del'>-	GtkWidget *entry = glade_xml_get_widget(editor-&gt;gui, entry_id);</div><div class='del'>-	GtkWidget *label = glade_xml_get_widget(editor-&gt;gui, label_id);</div><div class='del'>-	</div><div class='del'>-	GtkWidget *dialog = gnome_dialog_new(title,</div><div class='del'>-					     NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)-&gt;vbox),</div><div class='del'>-			  gtk_widget_new (gtk_frame_get_type(),</div><div class='del'>-					  "border_width", 4,</div><div class='del'>-					  "label", title,</div><div class='del'>-					  "child", gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-								  "child", dialog_entry,</div><div class='del'>-								  "xalign", .5,</div><div class='del'>-								  "yalign", .5,</div><div class='del'>-								  "xscale", 1.0,</div><div class='del'>-								  "yscale", 1.0,</div><div class='del'>-								  "border_width", 9,</div><div class='del'>-								  NULL),</div><div class='del'>-					  NULL));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),</div><div class='del'>-					       "Add",</div><div class='del'>-					       GNOME_STOCK_PIXMAP_ADD);</div><div class='del'>-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",</div><div class='del'>-			   _dialog_clicked, editor);</div><div class='del'>-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",</div><div class='del'>-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_entry", entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_label", label);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_dialog_entry", dialog_entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_list", list);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_info", info);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(dialog);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	int i;</div><div class='del'>-	gchar *label;</div><div class='del'>-	gchar *entry;</div><div class='del'>-	int result;</div><div class='del'>-	if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone1") ) {</div><div class='del'>-		which = 1;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone2") ) {</div><div class='del'>-		which = 2;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone3") ) {</div><div class='del'>-		which = 3;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone4") ) {</div><div class='del'>-		which = 4;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	label = g_strdup_printf("label-phone%d", which);</div><div class='del'>-	entry = g_strdup_printf("entry-phone%d", which);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_build_phone_ui (editor);</div><div class='del'>-	</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i++) {</div><div class='del'>-		const ECardPhone *phone = e_card_simple_get_phone(editor-&gt;simple, i);</div><div class='del'>-		gboolean checked;</div><div class='del'>-		checked = phone &amp;&amp; phone-&gt;number &amp;&amp; *phone-&gt;number;</div><div class='del'>-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor-&gt;phone_info[i].widget),</div><div class='del'>-					       checked);</div><div class='del'>-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor-&gt;phone_info[i].widget),</div><div class='del'>-						    TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	result = _arrow_pressed (widget, button, editor, editor-&gt;phone_popup, &amp;editor-&gt;phone_list, &amp;editor-&gt;phone_info, label, entry, "Add new phone number type");</div><div class='del'>-	</div><div class='del'>-	if (result != -1) {</div><div class='del'>-		editor-&gt;phone_choice[which - 1] = result;</div><div class='del'>-		set_fields(editor);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, label), TRUE);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, entry), editor-&gt;editable);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(label);</div><div class='del'>-	g_free(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_build_email_ui (editor);</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {</div><div class='del'>-		const char *string = e_card_simple_get_email(editor-&gt;simple, i);</div><div class='del'>-		gboolean checked;</div><div class='del'>-		checked = string &amp;&amp; *string;</div><div class='del'>-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor-&gt;email_info[i].widget),</div><div class='del'>-					       checked);</div><div class='del'>-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor-&gt;email_info[i].widget),</div><div class='del'>-						    TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	result = _arrow_pressed (widget, button, editor, editor-&gt;email_popup, &amp;editor-&gt;email_list, &amp;editor-&gt;email_info, "label-email1", "entry-email1", "Add new Email type");</div><div class='del'>-	</div><div class='del'>-	if (result != -1) {</div><div class='del'>-		editor-&gt;email_choice = result;</div><div class='del'>-		set_fields(editor);</div><div class='del'>-</div><div class='del'>-		/* make sure the buttons/entry is/are sensitive */</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-email1"), TRUE);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, "entry-email1"), editor-&gt;editable);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, "checkbutton-htmlmail"), editor-&gt;editable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_build_address_ui (editor);</div><div class='del'>-</div><div class='del'>-	for(i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-		const ECardAddrLabel *address = e_card_simple_get_address(editor-&gt;simple, i);</div><div class='del'>-		gboolean checked;</div><div class='del'>-		checked = address &amp;&amp; address-&gt;data &amp;&amp; *address-&gt;data;</div><div class='del'>-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor-&gt;address_info[i].widget),</div><div class='del'>-					       checked);</div><div class='del'>-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor-&gt;address_info[i].widget),</div><div class='del'>-						    TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = _arrow_pressed (widget, button, editor, editor-&gt;address_popup, &amp;editor-&gt;address_list, &amp;editor-&gt;address_info, "label-address", "text-address", "Add new Address type");</div><div class='del'>-</div><div class='del'>-	if (result != -1) {</div><div class='del'>-		set_address_field(editor, result);</div><div class='del'>-</div><div class='del'>-		/* make sure the buttons/entry is/are sensitive */</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-address"), TRUE);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, "text-address"), editor-&gt;editable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-find_address_mailing (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	const ECardAddrLabel *address;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	editor-&gt;address_mailing = -1;</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-		address = e_card_simple_get_address(editor-&gt;simple, i);</div><div class='del'>-		if (address &amp;&amp; (address-&gt;flags &amp; E_CARD_ADDR_DEFAULT)) {</div><div class='del'>-			if (editor-&gt;address_mailing == -1) {</div><div class='del'>-				editor-&gt;address_mailing = i;</div><div class='del'>-			} else {</div><div class='del'>-				ECardAddrLabel *new;</div><div class='del'>-				</div><div class='del'>-				new = e_card_address_label_copy (address);</div><div class='del'>-				new-&gt;flags &amp;= ~E_CARD_ADDR_DEFAULT;</div><div class='del'>-				e_card_simple_set_address(editor-&gt;simple, i, new);</div><div class='del'>-				e_card_address_label_unref (new);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_field(GtkEntry *entry, const char *string)</div><div class='del'>-{</div><div class='del'>-	char *oldstring = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	if (!string)</div><div class='del'>-		string = "";</div><div class='del'>-	if (strcmp(string, oldstring))</div><div class='del'>-		e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-	g_free (oldstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_phone_field(GtkWidget *entry, const ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	set_field(GTK_ENTRY(entry), phone ? phone-&gt;number : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_fields(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	GtkWidget *label_widget;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	entry = glade_xml_get_widget(editor-&gt;gui, "entry-phone1");</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		set_phone_field(entry, e_card_simple_get_phone(editor-&gt;simple, editor-&gt;phone_choice[0]));</div><div class='del'>-</div><div class='del'>-	entry = glade_xml_get_widget(editor-&gt;gui, "entry-phone2");</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		set_phone_field(entry, e_card_simple_get_phone(editor-&gt;simple, editor-&gt;phone_choice[1]));</div><div class='del'>-</div><div class='del'>-	entry = glade_xml_get_widget(editor-&gt;gui, "entry-phone3");</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		set_phone_field(entry, e_card_simple_get_phone(editor-&gt;simple, editor-&gt;phone_choice[2]));</div><div class='del'>-</div><div class='del'>-	entry = glade_xml_get_widget(editor-&gt;gui, "entry-phone4");</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		set_phone_field(entry, e_card_simple_get_phone(editor-&gt;simple, editor-&gt;phone_choice[3]));</div><div class='del'>-	</div><div class='del'>-	entry = glade_xml_get_widget(editor-&gt;gui, "entry-email1");</div><div class='del'>-	if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor-&gt;simple, editor-&gt;email_choice));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	e_contact_editor_build_address_ui (editor);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-		const ECardAddrLabel *address = e_card_simple_get_address(editor-&gt;simple, i);</div><div class='del'>-</div><div class='del'>-		if (address &amp;&amp; address-&gt;data &amp;&amp; *address-&gt;data)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	if (i == E_CARD_SIMPLE_ADDRESS_ID_LAST)</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-	label_widget = glade_xml_get_widget(editor-&gt;gui, "label-address");</div><div class='del'>-	if (label_widget &amp;&amp; GTK_IS_LABEL(label_widget)) {</div><div class='del'>-		gtk_object_set(GTK_OBJECT(label_widget),</div><div class='del'>-			       "label", _(g_list_nth_data(editor-&gt;address_list, i)),</div><div class='del'>-			       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_address_field(editor, i);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_address_field(EContactEditor *editor, int result)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *text, *check;</div><div class='del'>-	</div><div class='del'>-	text = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-</div><div class='del'>-	if (text &amp;&amp; GTK_IS_TEXT(text)) {</div><div class='del'>-		int position;</div><div class='del'>-		GtkEditable *editable;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-</div><div class='del'>-		if (result == -1)</div><div class='del'>-			result = editor-&gt;address_choice;</div><div class='del'>-		editor-&gt;address_choice = -1;</div><div class='del'>-</div><div class='del'>-		position = 0;</div><div class='del'>-		editable = GTK_EDITABLE(text);</div><div class='del'>-</div><div class='del'>-		gtk_editable_delete_text(editable, 0, -1);</div><div class='del'>-		address = e_card_simple_get_address(editor-&gt;simple, result);</div><div class='del'>-		if (address &amp;&amp; address-&gt;data) {</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address-&gt;data);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		check = glade_xml_get_widget(editor-&gt;gui, "checkbutton-mailingaddress");</div><div class='del'>-		if (check &amp;&amp; GTK_IS_CHECK_BUTTON (check)) {</div><div class='del'>-			if (address &amp;&amp; address-&gt;data)</div><div class='del'>-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), </div><div class='del'>-							      address-&gt;flags &amp; E_CARD_ADDR_DEFAULT);</div><div class='del'>-			else</div><div class='del'>-				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		editor-&gt;address_choice = result;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_field_callback(GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	const char *name;</div><div class='del'>-	int i;</div><div class='del'>-	static const char *builtins[] = {</div><div class='del'>-		"entry-fullname",</div><div class='del'>-		"entry-web",</div><div class='del'>-		"entry-company",</div><div class='del'>-		"entry-department",</div><div class='del'>-		"entry-office",</div><div class='del'>-		"entry-jobtitle",</div><div class='del'>-		"entry-profession",</div><div class='del'>-		"entry-manager",</div><div class='del'>-		"entry-assistant",</div><div class='del'>-		"entry-nickname",</div><div class='del'>-		"entry-spouse",</div><div class='del'>-		"text-comments",</div><div class='del'>-		"entry-categories",</div><div class='del'>-		"entry-contacts",</div><div class='del'>-		"entry-file-as",</div><div class='del'>-		"dateedit-anniversary",</div><div class='del'>-		"dateedit-birthday",</div><div class='del'>-		"entry-phone1",</div><div class='del'>-		"entry-phone2",</div><div class='del'>-		"entry-phone3",</div><div class='del'>-		"entry-phone4",</div><div class='del'>-		"entry-email1",</div><div class='del'>-		"text-address",</div><div class='del'>-		"checkbutton-mailingaddress",</div><div class='del'>-		"checkbutton-htmlmail",</div><div class='del'>-		"entry-caluri",</div><div class='del'>-		"entry-fburl",</div><div class='del'>-		NULL</div><div class='del'>-	};</div><div class='del'>-	name = glade_get_widget_name(widget);</div><div class='del'>-	if (name) {</div><div class='del'>-		for (i = 0; builtins[i]; i++) {</div><div class='del'>-			if (!strcmp(name, builtins[i]))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {</div><div class='del'>-			editor-&gt;arbitrary_fields = g_list_prepend(editor-&gt;arbitrary_fields, g_strdup(name));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *id;</div><div class='del'>-	char *key;</div><div class='del'>-} field_mapping [] = {</div><div class='del'>-	{ "entry-fullname", "full_name" },</div><div class='del'>-	{ "entry-web", "url" },</div><div class='del'>-	{ "entry-company", "org" },</div><div class='del'>-	{ "entry-department", "org_unit" },</div><div class='del'>-	{ "entry-office", "office" },</div><div class='del'>-	{ "entry-jobtitle", "title" },</div><div class='del'>-	{ "entry-profession", "role" },</div><div class='del'>-	{ "entry-manager", "manager" },</div><div class='del'>-	{ "entry-assistant", "assistant" },</div><div class='del'>-	{ "entry-nickname", "nickname" },</div><div class='del'>-	{ "entry-spouse", "spouse" },</div><div class='del'>-	{ "text-comments", "note" },</div><div class='del'>-	{ "entry-categories", "categories" },</div><div class='del'>-	{ "entry-caluri", "caluri" },</div><div class='del'>-	{ "entry-fburl", "fburl" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_field(EContactEditor *editor, char *id, char *value)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, id);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		int position = 0;</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		gtk_editable_delete_text(editable, 0, -1);</div><div class='del'>-		if (value) {</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       key, &amp;string,</div><div class='del'>-		       NULL);</div><div class='del'>-	fill_in_field(editor, id, string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		int position = 0;</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		const ECardArbitrary *arbitrary;</div><div class='del'>-</div><div class='del'>-		gtk_editable_delete_text(editable, 0, -1);</div><div class='del'>-		arbitrary = e_card_simple_get_arbitrary(simple,</div><div class='del'>-							name);</div><div class='del'>-		if (arbitrary &amp;&amp; arbitrary-&gt;value) {</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary-&gt;value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disable_widget_foreach (char *key, GtkWidget *widget, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	enable_widget (widget, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *widget_name;</div><div class='del'>-	ECardSimpleField field_id;</div><div class='del'>-	gboolean desensitize_for_read_only;</div><div class='del'>-} widget_field_mappings[] = {</div><div class='del'>-	{ "entry-web", E_CARD_SIMPLE_FIELD_URL, TRUE },</div><div class='del'>-	{ "accellabel-web", E_CARD_SIMPLE_FIELD_URL },</div><div class='del'>-</div><div class='del'>-	{ "entry-jobtitle", E_CARD_SIMPLE_FIELD_TITLE, TRUE },</div><div class='del'>-	{ "label-jobtitle", E_CARD_SIMPLE_FIELD_TITLE },</div><div class='del'>-</div><div class='del'>-	{ "entry-company", E_CARD_SIMPLE_FIELD_ORG, TRUE },</div><div class='del'>-	{ "label-company", E_CARD_SIMPLE_FIELD_ORG },</div><div class='del'>-</div><div class='del'>-	{ "combo-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },</div><div class='del'>-	{ "entry-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },</div><div class='del'>-	{ "accellabel-fileas", E_CARD_SIMPLE_FIELD_FILE_AS },</div><div class='del'>-</div><div class='del'>-	{ "label-department", E_CARD_SIMPLE_FIELD_ORG_UNIT },</div><div class='del'>-	{ "entry-department", E_CARD_SIMPLE_FIELD_ORG_UNIT, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-office", E_CARD_SIMPLE_FIELD_OFFICE },</div><div class='del'>-	{ "entry-office", E_CARD_SIMPLE_FIELD_OFFICE, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-profession", E_CARD_SIMPLE_FIELD_ROLE },</div><div class='del'>-	{ "entry-profession", E_CARD_SIMPLE_FIELD_ROLE, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-manager", E_CARD_SIMPLE_FIELD_MANAGER },</div><div class='del'>-	{ "entry-manager", E_CARD_SIMPLE_FIELD_MANAGER, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT },</div><div class='del'>-	{ "entry-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-nickname", E_CARD_SIMPLE_FIELD_NICKNAME },</div><div class='del'>-	{ "entry-nickname", E_CARD_SIMPLE_FIELD_NICKNAME, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-spouse", E_CARD_SIMPLE_FIELD_SPOUSE },</div><div class='del'>-	{ "entry-spouse", E_CARD_SIMPLE_FIELD_SPOUSE, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE },</div><div class='del'>-	{ "dateedit-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY },</div><div class='del'>-	{ "dateedit-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-comments", E_CARD_SIMPLE_FIELD_NOTE },</div><div class='del'>-	{ "text-comments", E_CARD_SIMPLE_FIELD_NOTE, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "entry-fullname", E_CARD_SIMPLE_FIELD_FULL_NAME, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "button-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },</div><div class='del'>-	{ "entry-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-caluri", E_CARD_SIMPLE_FIELD_CALURI },</div><div class='del'>-	{ "entry-caluri", E_CARD_SIMPLE_FIELD_CALURI, TRUE },</div><div class='del'>-</div><div class='del'>-	{ "label-fburl", E_CARD_SIMPLE_FIELD_FBURL },</div><div class='del'>-	{ "entry-fburl", E_CARD_SIMPLE_FIELD_FBURL, TRUE }</div><div class='del'>-};</div><div class='del'>-static int num_widget_field_mappings = sizeof(widget_field_mappings) / sizeof (widget_field_mappings[0]);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-enable_writable_fields(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	EList *fields = editor-&gt;writable_fields;</div><div class='del'>-	EIterator *iter;</div><div class='del'>-	GHashTable *dropdown_hash, *supported_hash;</div><div class='del'>-	int i;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	ECard *card;</div><div class='del'>-	char *widget_name;</div><div class='del'>-</div><div class='del'>-	if (!fields)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	card = e_card_new ("");</div><div class='del'>-	simple = e_card_simple_new (card);</div><div class='del'>-</div><div class='del'>-	dropdown_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	supported_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* build our hashtable of the drop down menu items */</div><div class='del'>-	e_contact_editor_build_phone_ui (editor);</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++)</div><div class='del'>-		g_hash_table_insert (dropdown_hash,</div><div class='del'>-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_phone_to_field (i)),</div><div class='del'>-				     editor-&gt;phone_info[i].widget);</div><div class='del'>-	e_contact_editor_build_email_ui (editor);</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++)</div><div class='del'>-		g_hash_table_insert (dropdown_hash,</div><div class='del'>-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_email_to_field (i)),</div><div class='del'>-				     editor-&gt;email_info[i].widget);</div><div class='del'>-	e_contact_editor_build_address_ui (editor);</div><div class='del'>-	for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++)</div><div class='del'>-		g_hash_table_insert (dropdown_hash,</div><div class='del'>-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_address_to_field (i)),</div><div class='del'>-				     editor-&gt;address_info[i].widget);</div><div class='del'>-</div><div class='del'>-	/* then disable them all */</div><div class='del'>-	g_hash_table_foreach (dropdown_hash, (GHFunc)disable_widget_foreach, NULL);</div><div class='del'>-</div><div class='del'>-	/* disable the label widgets for the dropdowns (4 phone, 1</div><div class='del'>-           email and the toggle button, and 1 address and one for</div><div class='del'>-           the full address button */</div><div class='del'>-	for (i = 0; i &lt; 4; i ++) {</div><div class='del'>-		widget_name = g_strdup_printf ("label-phone%d", i+1);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, widget_name), FALSE);</div><div class='del'>-		g_free (widget_name);</div><div class='del'>-		widget_name = g_strdup_printf ("entry-phone%d", i+1);</div><div class='del'>-		enable_widget (glade_xml_get_widget (editor-&gt;gui, widget_name), FALSE);</div><div class='del'>-		g_free (widget_name);</div><div class='del'>-	}</div><div class='del'>-	enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-email1"), FALSE);</div><div class='del'>-	enable_widget (glade_xml_get_widget (editor-&gt;gui, "entry-email1"), FALSE);</div><div class='del'>-	enable_widget (glade_xml_get_widget (editor-&gt;gui, "checkbutton-htmlmail"), FALSE);</div><div class='del'>-	enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-address"), FALSE);</div><div class='del'>-	enable_widget (glade_xml_get_widget (editor-&gt;gui, "text-address"), FALSE);</div><div class='del'>-</div><div class='del'>-	/* enable widgets that map directly from a field to a widget (the drop down items) */</div><div class='del'>-	iter = e_list_get_iterator (fields);</div><div class='del'>-	for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {</div><div class='del'>-		char *field = (char*)e_iterator_get (iter);</div><div class='del'>-		GtkWidget *widget = g_hash_table_lookup (dropdown_hash, field);</div><div class='del'>-</div><div class='del'>-		if (widget) {</div><div class='del'>-			enable_widget (widget, TRUE);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* if it's not a field that's handled by the</div><div class='del'>-                           dropdown items, add it to the has to be</div><div class='del'>-                           used in the second step */</div><div class='del'>-			g_hash_table_insert (supported_hash, field, field);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* ugh - this is needed to make sure we don't have a</div><div class='del'>-                   disabled label next to a drop down when the item in</div><div class='del'>-                   the menu (the one reflected in the label) is</div><div class='del'>-                   enabled. */</div><div class='del'>-		if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_email_to_field(editor-&gt;email_choice)))) {</div><div class='del'>-			enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-email1"), TRUE);</div><div class='del'>-			enable_widget (glade_xml_get_widget (editor-&gt;gui, "entry-email1"), editor-&gt;editable);</div><div class='del'>-			enable_widget (glade_xml_get_widget (editor-&gt;gui, "checkbutton-htmlmail"), editor-&gt;editable);</div><div class='del'>-		}</div><div class='del'>-		else if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_address_to_field(editor-&gt;address_choice)))) {</div><div class='del'>-			enable_widget (glade_xml_get_widget (editor-&gt;gui, "label-address"), TRUE);</div><div class='del'>-			enable_widget (glade_xml_get_widget (editor-&gt;gui, "text-address"), editor-&gt;editable);</div><div class='del'>-		}</div><div class='del'>-		else for (i = 0; i &lt; 4; i ++) {</div><div class='del'>-			if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_phone_to_field(editor-&gt;phone_choice[i])))) {</div><div class='del'>-				widget_name = g_strdup_printf ("label-phone%d", i+1);</div><div class='del'>-				enable_widget (glade_xml_get_widget (editor-&gt;gui, widget_name), TRUE);</div><div class='del'>-				g_free (widget_name);</div><div class='del'>-				widget_name = g_strdup_printf ("entry-phone%d", i+1);</div><div class='del'>-				enable_widget (glade_xml_get_widget (editor-&gt;gui, widget_name), editor-&gt;editable);</div><div class='del'>-				g_free (widget_name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* handle the label next to the dropdown widgets */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_widget_field_mappings; i ++) {</div><div class='del'>-		gboolean enabled;</div><div class='del'>-		GtkWidget *w;</div><div class='del'>-		const char *field;</div><div class='del'>-</div><div class='del'>-		w = glade_xml_get_widget(editor-&gt;gui, widget_field_mappings[i].widget_name);</div><div class='del'>-		if (!w) {</div><div class='del'>-			g_warning (_("Could not find widget for a field: `%s'"),</div><div class='del'>-				   widget_field_mappings[i].widget_name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		field = e_card_simple_get_ecard_field (simple,</div><div class='del'>-						       widget_field_mappings[i].field_id);</div><div class='del'>-</div><div class='del'>-		enabled = (g_hash_table_lookup (supported_hash, field) != NULL);</div><div class='del'>-</div><div class='del'>-		enable_widget (w, enabled);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (dropdown_hash);</div><div class='del'>-	g_hash_table_destroy (supported_hash);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(simple));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editable (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	char *entry;</div><div class='del'>-	/* set the sensitivity of all the non-dropdown entry/texts/dateedits */</div><div class='del'>-	for (i = 0; i &lt; num_widget_field_mappings; i ++) {</div><div class='del'>-		if (widget_field_mappings[i].desensitize_for_read_only) {</div><div class='del'>-			GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, widget_field_mappings[i].widget_name);</div><div class='del'>-			enable_widget (widget, editor-&gt;editable);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* handle the phone dropdown entries */</div><div class='del'>-	for (i = 0; i &lt; 4; i ++) {</div><div class='del'>-		entry = g_strdup_printf ("entry-phone%d", i+1);</div><div class='del'>-</div><div class='del'>-		enable_widget (glade_xml_get_widget(editor-&gt;gui, entry),</div><div class='del'>-			       editor-&gt;editable);</div><div class='del'>-</div><div class='del'>-		g_free (entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* handle the email dropdown entry */</div><div class='del'>-	entry = "entry-email1";</div><div class='del'>-	enable_widget (glade_xml_get_widget(editor-&gt;gui, entry),</div><div class='del'>-		       editor-&gt;editable);</div><div class='del'>-	enable_widget (glade_xml_get_widget(editor-&gt;gui, "checkbutton-htmlmail"),</div><div class='del'>-		       editor-&gt;editable);</div><div class='del'>-</div><div class='del'>-	/* handle the address dropdown entry */</div><div class='del'>-	entry = "text-address";</div><div class='del'>-	enable_widget (glade_xml_get_widget(editor-&gt;gui, entry),</div><div class='del'>-		       editor-&gt;editable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECard *card = editor-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		char *file_as;</div><div class='del'>-		char *related_contacts;</div><div class='del'>-		ECardName *name;</div><div class='del'>-		const ECardDate *anniversary;</div><div class='del'>-		const ECardDate *bday;</div><div class='del'>-		int i;</div><div class='del'>-		GtkWidget *widget;</div><div class='del'>-		GList *list;</div><div class='del'>-		gboolean wants_html, wants_html_set;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as",          &amp;file_as,</div><div class='del'>-			       "related_contacts", &amp;related_contacts,</div><div class='del'>-			       "name",             &amp;name,</div><div class='del'>-			       "anniversary",      &amp;anniversary,</div><div class='del'>-			       "birth_date",       &amp;bday,</div><div class='del'>-			       "wants_html_set",   &amp;wants_html_set,</div><div class='del'>-			       "wants_html",       &amp;wants_html,</div><div class='del'>-			       NULL);</div><div class='del'>-	</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			fill_in_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		find_address_mailing (editor);</div><div class='del'>-		</div><div class='del'>-		if (wants_html_set) {</div><div class='del'>-			GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-			if (widget &amp;&amp; GTK_IS_CHECK_BUTTON(widget)) {</div><div class='del'>-				gtk_object_set(GTK_OBJECT(widget),</div><div class='del'>-					       "active", wants_html,</div><div class='del'>-					       NULL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* File as has to come after company and name or else it'll get messed up when setting them. */</div><div class='del'>-		fill_in_field(editor, "entry-file-as", file_as);</div><div class='del'>-		</div><div class='del'>-		e_card_name_unref(editor-&gt;name);</div><div class='del'>-		editor-&gt;name = e_card_name_ref(name);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-anniversary");</div><div class='del'>-		if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-			EDateEdit *dateedit;</div><div class='del'>-			dateedit = E_DATE_EDIT(widget);</div><div class='del'>-			if (anniversary)</div><div class='del'>-				e_date_edit_set_date (dateedit,</div><div class='del'>-						      anniversary-&gt;year,</div><div class='del'>-						      anniversary-&gt;month,</div><div class='del'>-						      anniversary-&gt;day);</div><div class='del'>-			else</div><div class='del'>-				e_date_edit_set_time (dateedit, -1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-birthday");</div><div class='del'>-		if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-			EDateEdit *dateedit;</div><div class='del'>-			dateedit = E_DATE_EDIT(widget);</div><div class='del'>-			if (bday)</div><div class='del'>-				e_date_edit_set_date (dateedit,</div><div class='del'>-						      bday-&gt;year,</div><div class='del'>-						      bday-&gt;month,</div><div class='del'>-						      bday-&gt;day);</div><div class='del'>-			else</div><div class='del'>-				e_date_edit_set_time (dateedit, -1);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (editor-&gt;select_names_contacts &amp;&amp; related_contacts &amp;&amp; *related_contacts) {</div><div class='del'>-			ESelectNamesModel *model = e_select_names_manager_get_source (editor-&gt;select_names_contacts,</div><div class='del'>-										      "contacts");</div><div class='del'>-			e_select_names_model_import_destinationv (model, related_contacts);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		set_fields(editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, editable_id);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, string,</div><div class='del'>-				       NULL);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, NULL,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    string);</div><div class='del'>-		else</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    NULL);</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECard *card = editor-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		ECardDate anniversary;</div><div class='del'>-		ECardDate bday;</div><div class='del'>-		int i;</div><div class='del'>-		GtkWidget *widget;</div><div class='del'>-		GList *list;</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "entry-file-as");</div><div class='del'>-		if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-			GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "file_as", string,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			if (string) g_free(string);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			extract_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (editor-&gt;select_names_contacts) {</div><div class='del'>-			ESelectNamesModel *model = e_select_names_manager_get_source (editor-&gt;select_names_contacts,</div><div class='del'>-										      "contacts");</div><div class='del'>-			char *string = e_select_names_model_export_destinationv (model);</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				gtk_object_set (GTK_OBJECT (card),</div><div class='del'>-						"related_contacts", string,</div><div class='del'>-						NULL);</div><div class='del'>-			else</div><div class='del'>-				gtk_object_set (GTK_OBJECT (card),</div><div class='del'>-						"related_contacts", NULL,</div><div class='del'>-						NULL);</div><div class='del'>-			g_free (string);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (editor-&gt;name)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "name", editor-&gt;name,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-anniversary");</div><div class='del'>-		if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-			if (e_date_edit_get_date (E_DATE_EDIT (widget),</div><div class='del'>-						  &amp;anniversary.year,</div><div class='del'>-						  &amp;anniversary.month,</div><div class='del'>-						  &amp;anniversary.day)) {</div><div class='del'>-				/* g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day); */</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "anniversary", &amp;anniversary,</div><div class='del'>-					       NULL);</div><div class='del'>-			} else</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "anniversary", NULL,</div><div class='del'>-					       NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget(editor-&gt;gui, "dateedit-birthday");</div><div class='del'>-		if (widget &amp;&amp; E_IS_DATE_EDIT(widget)) {</div><div class='del'>-			if (e_date_edit_get_date (E_DATE_EDIT (widget),</div><div class='del'>-						  &amp;bday.year,</div><div class='del'>-						  &amp;bday.month,</div><div class='del'>-						  &amp;bday.day)) {</div><div class='del'>-				/* g_print ("%d %d %d\n", bday.year, bday.month, bday.day); */</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "birth_date", &amp;bday,</div><div class='del'>-					       NULL);</div><div class='del'>-			} else</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "birth_date", NULL,</div><div class='del'>-					       NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_contact_editor_raise:</div><div class='del'>- * @config: The %EContactEditor object.</div><div class='del'>- *</div><div class='del'>- * Raises the dialog associated with this %EContactEditor object.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_contact_editor_raise (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: perhaps we should raise at realize time */</div><div class='del'>-	if (GTK_WIDGET (editor-&gt;app)-&gt;window)</div><div class='del'>-		gdk_window_raise (GTK_WIDGET (editor-&gt;app)-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_contact_editor_show:</div><div class='del'>- * @ce: The %EContactEditor object.</div><div class='del'>- *</div><div class='del'>- * Shows the dialog associated with this %EContactEditor object.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_contact_editor_show (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_show (ce-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_editor_create_date(gchar *name,</div><div class='del'>-			     gchar *string1, gchar *string2,</div><div class='del'>-			     gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_editor_create_date(gchar *name,</div><div class='del'>-			     gchar *string1, gchar *string2,</div><div class='del'>-			     gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = e_date_edit_new ();</div><div class='del'>-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),</div><div class='del'>-					   TRUE);</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (widget), -1);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-enable_widget (GtkWidget *widget, gboolean enabled)</div><div class='del'>-{</div><div class='del'>-	if (GTK_IS_ENTRY (widget)) {</div><div class='del'>-		gtk_entry_set_editable (GTK_ENTRY (widget), enabled);</div><div class='del'>-	}</div><div class='del'>-	else if (GTK_IS_TEXT (widget)) {</div><div class='del'>-		gtk_text_set_editable (GTK_TEXT (widget), enabled);</div><div class='del'>-	}</div><div class='del'>-	else if (GTK_IS_COMBO (widget)) {</div><div class='del'>-		gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (widget)-&gt;entry),</div><div class='del'>-					enabled);</div><div class='del'>-		gtk_widget_set_sensitive (GTK_COMBO (widget)-&gt;button, enabled);</div><div class='del'>-	}</div><div class='del'>-	else if (E_IS_DATE_EDIT (widget)) {</div><div class='del'>-		e_date_edit_set_editable (E_DATE_EDIT (widget), enabled);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_set_sensitive (widget, enabled);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h<br/>deleted file mode 100644<br/>index 249640379b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,137 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-editor.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_CONTACT_EDITOR_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app-helper.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/gui/component/select-names/e-select-names-manager.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactEditor - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * card         ECard *         RW              The card currently being edited</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))</div><div class='del'>-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditor       EContactEditor;</div><div class='del'>-typedef struct _EContactEditorClass  EContactEditorClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditor</div><div class='del'>-{</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GnomeUIInfo *email_info;</div><div class='del'>-	GnomeUIInfo *phone_info;</div><div class='del'>-	GnomeUIInfo *address_info;</div><div class='del'>-	GtkWidget *email_popup;</div><div class='del'>-	GtkWidget *phone_popup;</div><div class='del'>-	GtkWidget *address_popup;</div><div class='del'>-	GList *email_list;</div><div class='del'>-	GList *phone_list;</div><div class='del'>-	GList *address_list;</div><div class='del'>-</div><div class='del'>-	ESelectNamesManager *select_names_contacts;</div><div class='del'>-</div><div class='del'>-	ECardName *name;</div><div class='del'>-	char *company;</div><div class='del'>-</div><div class='del'>-	ECardSimpleEmailId email_choice;</div><div class='del'>-	ECardSimplePhoneId phone_choice[4];</div><div class='del'>-	ECardSimpleAddressId address_choice;</div><div class='del'>-	ECardSimpleAddressId address_mailing;</div><div class='del'>-	</div><div class='del'>-	GList *arbitrary_fields;</div><div class='del'>-</div><div class='del'>-	/* Whether we are editing a new card or an existing one */</div><div class='del'>-	guint is_new_card : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the card has been changed since bringing up the contact editor */</div><div class='del'>-	guint changed : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the contact editor will accept modifications */</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether an async wombat call is in progress */</div><div class='del'>-	guint in_async_call : 1;</div><div class='del'>-</div><div class='del'>-	EList *writable_fields;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* card_added)    (EContactEditor *ce, EBookStatus status, ECard *card);</div><div class='del'>-	void (* card_modified) (EContactEditor *ce, EBookStatus status, ECard *card);</div><div class='del'>-	void (* card_deleted)  (EContactEditor *ce, EBookStatus status, ECard *card);</div><div class='del'>-	void (* editor_closed) (EContactEditor *ce);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EContactEditor *e_contact_editor_new             (EBook *book,</div><div class='del'>-						  ECard *card,</div><div class='del'>-						  gboolean is_new_card,</div><div class='del'>-						  gboolean editable);</div><div class='del'>-GtkType         e_contact_editor_get_type        (void);</div><div class='del'>-void            e_contact_editor_show            (EContactEditor *editor);</div><div class='del'>-void            e_contact_editor_close           (EContactEditor *editor);</div><div class='del'>-void            e_contact_editor_raise           (EContactEditor *editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean        e_contact_editor_confirm_delete  (GtkWindow      *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c<br/>deleted file mode 100644<br/>index f36d0b101e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-quick-add.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-quick-add.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,468 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-contact-quick-add.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-contact-quick-add.h"</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-</div><div class='del'>-typedef struct _QuickAdd QuickAdd;</div><div class='del'>-struct _QuickAdd {</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *email;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	EContactQuickAddCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-</div><div class='del'>-	GtkWidget *name_entry;</div><div class='del'>-	GtkWidget *email_entry;</div><div class='del'>-</div><div class='del'>-	gint refs;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static QuickAdd *</div><div class='del'>-quick_add_new (void)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = g_new0 (QuickAdd, 1);</div><div class='del'>-	qa-&gt;card = e_card_new ("");</div><div class='del'>-	qa-&gt;refs = 1;</div><div class='del'>-	return qa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_ref (QuickAdd *qa)</div><div class='del'>-{</div><div class='del'>-	if (qa) {</div><div class='del'>-		++qa-&gt;refs;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_unref (QuickAdd *qa)</div><div class='del'>-{</div><div class='del'>-	if (qa) {</div><div class='del'>-		--qa-&gt;refs;</div><div class='del'>-		if (qa-&gt;refs == 0) {</div><div class='del'>-			g_free (qa-&gt;name);</div><div class='del'>-			g_free (qa-&gt;email);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (qa-&gt;card));</div><div class='del'>-			g_free (qa);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_set_name (QuickAdd *qa, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	if (name == qa-&gt;name)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (qa-&gt;name);</div><div class='del'>-	qa-&gt;name = g_strdup (name);</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (qa-&gt;card);</div><div class='del'>-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, name);</div><div class='del'>-	e_card_simple_sync_card (simple);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_set_email (QuickAdd *qa, const gchar *email)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	if (email == qa-&gt;email)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (qa-&gt;email);</div><div class='del'>-	qa-&gt;email = g_strdup (email);</div><div class='del'>-</div><div class='del'>-	simple = e_card_simple_new (qa-&gt;card);</div><div class='del'>-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_EMAIL, email);</div><div class='del'>-	e_card_simple_sync_card (simple);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-merge_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = (QuickAdd *) closure;</div><div class='del'>-</div><div class='del'>-	if (book != NULL) {</div><div class='del'>-		e_card_merging_book_add_card (book, qa-&gt;card, NULL, NULL);</div><div class='del'>-		if (qa-&gt;cb)</div><div class='del'>-			qa-&gt;cb (qa-&gt;card, qa-&gt;closure);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-	} else {</div><div class='del'>-		/* Something went wrong. */</div><div class='del'>-		if (qa-&gt;cb)</div><div class='del'>-			qa-&gt;cb (NULL, qa-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	quick_add_unref (qa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-quick_add_merge_card (QuickAdd *qa)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	quick_add_ref (qa);</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (!addressbook_load_default_book (book, merge_cb, qa)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		merge_cb (book, E_BOOK_STATUS_OTHER_ERROR, qa);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Raise a contact editor with all fields editable, and hook up all signals accordingly.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (ce), "quick_add");</div><div class='del'>-</div><div class='del'>-	if (qa) {</div><div class='del'>-</div><div class='del'>-		if (qa-&gt;cb)</div><div class='del'>-			qa-&gt;cb (qa-&gt;card, qa-&gt;closure);</div><div class='del'>-	</div><div class='del'>-		/* We don't need to unref qa because we set_data_full below */</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (ce), "quick_add", NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (GtkWidget *w, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (w), "quick_add");</div><div class='del'>-</div><div class='del'>-	if (qa) {</div><div class='del'>-		/* We don't need to unref qa because we set_data_full below */</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (w), "quick_add", NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (w));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ce_have_book (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = (QuickAdd *) closure;</div><div class='del'>-</div><div class='del'>-	if (book == NULL) {</div><div class='del'>-		g_warning ("Couldn't open local address book.");</div><div class='del'>-		quick_add_unref (qa);</div><div class='del'>-	} else {</div><div class='del'>-		EContactEditor *contact_editor = e_contact_editor_new (book, qa-&gt;card, TRUE, TRUE /* XXX */);</div><div class='del'>-</div><div class='del'>-		/* mark it as changed so the Save buttons are enabled when we bring up the dialog. */</div><div class='del'>-		gtk_object_set (GTK_OBJECT(contact_editor),</div><div class='del'>-				"changed", TRUE,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		/* We pass this via object data, so that we don't get a dangling pointer referenced if both</div><div class='del'>-		   the "card_added" and "editor_closed" get emitted.  (Which, based on a backtrace in bugzilla,</div><div class='del'>-		   I think can happen and cause a crash. */</div><div class='del'>-		gtk_object_set_data_full (GTK_OBJECT (contact_editor), "quick_add", qa,</div><div class='del'>-					  (GtkDestroyNotify) quick_add_unref);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (contact_editor),</div><div class='del'>-				    "card_added",</div><div class='del'>-				    GTK_SIGNAL_FUNC (card_added_cb),</div><div class='del'>-				    NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (contact_editor),</div><div class='del'>-				    "editor_closed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (editor_closed_cb),</div><div class='del'>-				    NULL);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_card (QuickAdd *qa)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-	if (!addressbook_load_default_book (book, ce_have_book, qa)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		ce_have_book (book, E_BOOK_STATUS_OTHER_ERROR, qa);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clicked_cb (GtkWidget *w, gint button, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa = (QuickAdd *) closure;</div><div class='del'>-</div><div class='del'>-	/* Get data out of entries. */</div><div class='del'>-	if (button == 0 || button == 1) {</div><div class='del'>-		gchar *name = NULL;</div><div class='del'>-		gchar *email = NULL;</div><div class='del'>-</div><div class='del'>-		if (qa-&gt;name_entry) {</div><div class='del'>-			gchar *tmp;</div><div class='del'>-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa-&gt;name_entry), 0, -1);</div><div class='del'>-			name = e_utf8_from_gtk_string (qa-&gt;name_entry, tmp);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (qa-&gt;email_entry) {</div><div class='del'>-			gchar *tmp;</div><div class='del'>-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa-&gt;email_entry), 0, -1);</div><div class='del'>-			email = e_utf8_from_gtk_string (qa-&gt;email_entry, tmp);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		quick_add_set_name (qa, name);</div><div class='del'>-		quick_add_set_email (qa, email);</div><div class='del'>-	</div><div class='del'>-		g_free (name);</div><div class='del'>-		g_free (email);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (w);</div><div class='del'>-</div><div class='del'>-	if (button == 0) {</div><div class='del'>-</div><div class='del'>-		/* OK */</div><div class='del'>-		quick_add_merge_card (qa);</div><div class='del'>-</div><div class='del'>-	} else if (button == 1) {</div><div class='del'>-		</div><div class='del'>-		/* EDIT FULL */</div><div class='del'>-		edit_card (qa);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* CANCEL */</div><div class='del'>-		quick_add_unref (qa);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-build_quick_add_dialog (QuickAdd *qa)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkTable *table;</div><div class='del'>-	const gint xpad=1, ypad=1;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (qa != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_dialog_new (_("Contact Quick-Add"),</div><div class='del'>-				   GNOME_STOCK_BUTTON_OK,</div><div class='del'>-				   _("Edit Full"),</div><div class='del'>-				   GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				   NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog),</div><div class='del'>-			    "clicked",</div><div class='del'>-			    clicked_cb,</div><div class='del'>-			    qa);</div><div class='del'>-</div><div class='del'>-	qa-&gt;name_entry = gtk_entry_new ();</div><div class='del'>-	if (qa-&gt;name) {</div><div class='del'>-		gchar *str = e_utf8_to_gtk_string (qa-&gt;name_entry, qa-&gt;name);</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (qa-&gt;name_entry), str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	qa-&gt;email_entry = gtk_entry_new ();</div><div class='del'>-	if (qa-&gt;email) {</div><div class='del'>-		gchar *str = e_utf8_to_gtk_string (qa-&gt;email_entry, qa-&gt;email);</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (qa-&gt;email_entry), str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, gtk_label_new (_("Full Name")),</div><div class='del'>-			  0, 1, 0, 1,</div><div class='del'>-			  0, 0, xpad, ypad);</div><div class='del'>-	gtk_table_attach (table, qa-&gt;name_entry,</div><div class='del'>-			  1, 2, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);</div><div class='del'>-	gtk_table_attach (table, gtk_label_new (_("E-mail")),</div><div class='del'>-			  0, 1, 1, 2,</div><div class='del'>-			  0, 0, xpad, ypad);</div><div class='del'>-	gtk_table_attach (table, qa-&gt;email_entry,</div><div class='del'>-			  1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox),</div><div class='del'>-			    GTK_WIDGET (table),</div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show_all (GTK_WIDGET (table));</div><div class='del'>-			  </div><div class='del'>-	</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_quick_add (const gchar *in_name, const gchar *email,</div><div class='del'>-		     EContactQuickAddCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	QuickAdd *qa;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	gchar *name = NULL;</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	/* We need to have *something* to work with. */</div><div class='del'>-	if (in_name == NULL &amp;&amp; email == NULL) {</div><div class='del'>-		if (cb)</div><div class='del'>-			cb (NULL, closure);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (in_name) {</div><div class='del'>-		name = g_strdup (in_name);</div><div class='del'>-</div><div class='del'>-		/* Remove extra whitespace and the quotes some mailers put around names. */</div><div class='del'>-		g_strstrip (name);</div><div class='del'>-		len = strlen (name);</div><div class='del'>-		if ((name[0] == '\'' &amp;&amp; name[len-1] == '\'') || (name[0] == '"' &amp;&amp; name[len-1] == '"')) {</div><div class='del'>-			name[0] = ' ';</div><div class='del'>-			name[len-1] = ' ';</div><div class='del'>-		}</div><div class='del'>-		g_strstrip (name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	qa = quick_add_new ();</div><div class='del'>-	qa-&gt;cb = cb;</div><div class='del'>-	qa-&gt;closure = closure;</div><div class='del'>-	if (name)</div><div class='del'>-		quick_add_set_name (qa, name);</div><div class='del'>-	if (email)</div><div class='del'>-		quick_add_set_email (qa, email);</div><div class='del'>-</div><div class='del'>-	dialog = build_quick_add_dialog (qa);</div><div class='del'>-	gtk_widget_show_all (dialog);</div><div class='del'>-</div><div class='del'>-	g_free (name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	gchar *name=NULL, *email=NULL;</div><div class='del'>-	const gchar *last_at, *s;</div><div class='del'>-	gboolean in_quote;</div><div class='del'>-</div><div class='del'>-	if (text == NULL) {</div><div class='del'>-		e_contact_quick_add (NULL, NULL, cb, closure);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look for things that look like e-mail addresses embedded in text */</div><div class='del'>-	in_quote = FALSE;</div><div class='del'>-	last_at = NULL;</div><div class='del'>-	for (s = text; *s; ++s) {</div><div class='del'>-		if (*s == '@' &amp;&amp; !in_quote)</div><div class='del'>-			last_at = s;</div><div class='del'>-		else if (*s == '"')</div><div class='del'>-			in_quote = !in_quote;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	if (last_at == NULL) {</div><div class='del'>-		/* No at sign, so we treat it all as the name */</div><div class='del'>-		name = g_strdup (text);</div><div class='del'>-	} else {</div><div class='del'>-		gboolean bad_char = FALSE;</div><div class='del'>-		</div><div class='del'>-		/* walk backwards to whitespace or a &lt; or a quote... */</div><div class='del'>-		while (last_at &gt;= text &amp;&amp; !bad_char</div><div class='del'>-		       &amp;&amp; !(isspace ((gint) *last_at) || *last_at == '&lt;' || *last_at == '"')) {</div><div class='del'>-			/* Check for some stuff that can't appear in a legal e-mail address. */</div><div class='del'>-			if (*last_at == '['</div><div class='del'>-			    || *last_at == ']'</div><div class='del'>-			    || *last_at == '('</div><div class='del'>-			    || *last_at == ')')</div><div class='del'>-				bad_char = TRUE;</div><div class='del'>-			--last_at;</div><div class='del'>-		}</div><div class='del'>-		if (last_at &lt; text)</div><div class='del'>-			last_at = text;</div><div class='del'>-</div><div class='del'>-		/* ...and then split the text there */</div><div class='del'>-		if (!bad_char) {</div><div class='del'>-			if (text &lt; last_at)</div><div class='del'>-				name = g_strndup (text, last_at-text);</div><div class='del'>-			email = g_strdup (last_at);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If all else has failed, make it the name. */</div><div class='del'>-	if (name == NULL &amp;&amp; email == NULL) </div><div class='del'>-		name = g_strdup (text);</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Clean up email, remove bracketing &lt;&gt;s */</div><div class='del'>-	if (email &amp;&amp; *email) {</div><div class='del'>-		gboolean changed = FALSE;</div><div class='del'>-		g_strstrip (email);</div><div class='del'>-		if (*email == '&lt;') {</div><div class='del'>-			*email = ' ';</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (email[strlen (email)-1] == '&gt;') {</div><div class='del'>-			email[strlen (email)-1] = ' ';</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (changed)</div><div class='del'>-			g_strstrip (email);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	e_contact_quick_add (name, email, cb, closure);</div><div class='del'>-	g_free (name);</div><div class='del'>-	g_free (email);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h<br/>deleted file mode 100644<br/>index 1bf69ee114..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-quick-add.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-quick-add.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-contact-quick-add.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CONTACT_QUICK_ADD_H__</div><div class='del'>-#define __E_CONTACT_QUICK_ADD_H__</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-typedef void (*EContactQuickAddCallback) (ECard *new_card, gpointer closure);</div><div class='del'>-</div><div class='del'>-void e_contact_quick_add (const gchar *name, const gchar *email, </div><div class='del'>-			  EContactQuickAddCallback cb, gpointer closure);</div><div class='del'>-</div><div class='del'>-void e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure);</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_QUICK_ADD_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c<br/>deleted file mode 100644<br/>index 78994ea405..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-save-as.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-editor.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;gtk/gtkfilesel.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-static int file_exists(GtkFileSelection *filesel, const char *filename);</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkFileSelection *filesel;</div><div class='del'>-	char *vcard;</div><div class='del'>-} SaveAsInfo;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_it(GtkWidget *widget, SaveAsInfo *info)</div><div class='del'>-{</div><div class='del'>-	gint error = 0;</div><div class='del'>-	gint response = 0;</div><div class='del'>-	</div><div class='del'>-	const char *filename = gtk_file_selection_get_filename (info-&gt;filesel);</div><div class='del'>-</div><div class='del'>-	error = e_write_file (filename, info-&gt;vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);</div><div class='del'>-</div><div class='del'>-	if (error == EEXIST) {</div><div class='del'>-		response = file_exists(info-&gt;filesel, filename);</div><div class='del'>-		switch (response) {</div><div class='del'>-			case 0 : /* Overwrite */</div><div class='del'>-				e_write_file(filename, info-&gt;vcard, O_WRONLY | O_CREAT | O_TRUNC);</div><div class='del'>-				break;</div><div class='del'>-			case 1 : /* cancel */</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	} else if (error != 0) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		char *str;</div><div class='del'>-</div><div class='del'>-		str = g_strdup_printf ("Error saving %s: %s", filename, strerror(errno));</div><div class='del'>-		dialog = gnome_message_box_new (str, GNOME_MESSAGE_BOX_ERROR, GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (info-&gt;filesel));</div><div class='del'>-</div><div class='del'>-		gtk_widget_show (dialog);</div><div class='del'>-		</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (info-&gt;vcard);</div><div class='del'>-	gtk_widget_destroy(GTK_WIDGET(info-&gt;filesel));</div><div class='del'>-	g_free(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_it(GtkWidget *widget, SaveAsInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_free (info-&gt;vcard);</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (info-&gt;filesel));</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_it(GtkWidget *widget, SaveAsInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_free (info-&gt;vcard);</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-make_safe_filename (const char *prefix, char *name)</div><div class='del'>-{</div><div class='del'>-	char *safe, *p;</div><div class='del'>-</div><div class='del'>-	if (!name) {</div><div class='del'>-		/* This is a filename. Translators take note. */</div><div class='del'>-		name = _("card.vcf");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = strrchr (name, '/');</div><div class='del'>-	if (p)</div><div class='del'>-		safe = g_strdup_printf ("%s%s%s", prefix, p, ".vcf");</div><div class='del'>-	else</div><div class='del'>-		safe = g_strdup_printf ("%s/%s%s", prefix, name, ".vcf");</div><div class='del'>-	</div><div class='del'>-	p = strrchr (safe, '/') + 1;</div><div class='del'>-	if (p)</div><div class='del'>-		e_filename_make_safe (p);</div><div class='del'>-	</div><div class='del'>-	return safe;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_save_as(char *title, ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *filesel;</div><div class='del'>-	char *file;</div><div class='del'>-	char *name;</div><div class='del'>-	SaveAsInfo *info = g_new(SaveAsInfo, 1);</div><div class='del'>-</div><div class='del'>-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card),</div><div class='del'>-			"file_as", &amp;name,</div><div class='del'>-			NULL);</div><div class='del'>-	file = make_safe_filename (g_get_home_dir(), name);</div><div class='del'>-	gtk_file_selection_set_filename (filesel, file);</div><div class='del'>-	g_free (file);</div><div class='del'>-</div><div class='del'>-	info-&gt;filesel = filesel;</div><div class='del'>-	info-&gt;vcard = e_card_get_vcard(card);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel-&gt;ok_button), "clicked",</div><div class='del'>-			   save_it, info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel-&gt;cancel_button), "clicked",</div><div class='del'>-			   close_it, info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",</div><div class='del'>-			   delete_it, info);</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(filesel));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_save_as(char *title, GList *list)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *filesel;</div><div class='del'>-	SaveAsInfo *info = g_new(SaveAsInfo, 1);</div><div class='del'>-</div><div class='del'>-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));</div><div class='del'>-</div><div class='del'>-	/* This is a filename. Translators take note. */</div><div class='del'>-	if (list &amp;&amp; list-&gt;data &amp;&amp; list-&gt;next == NULL) {</div><div class='del'>-		char *name, *file;</div><div class='del'>-		gtk_object_get (GTK_OBJECT (list-&gt;data),</div><div class='del'>-				"file_as", &amp;name,</div><div class='del'>-				NULL);</div><div class='del'>-		file = make_safe_filename (g_get_home_dir(), name);</div><div class='del'>-		gtk_file_selection_set_filename (filesel, file);</div><div class='del'>-		g_free (file);</div><div class='del'>-	} else {</div><div class='del'>-		char *file;</div><div class='del'>-		file = make_safe_filename (g_get_home_dir(), _("list"));</div><div class='del'>-		gtk_file_selection_set_filename (filesel, file);</div><div class='del'>-		g_free (file);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;filesel = filesel;</div><div class='del'>-	info-&gt;vcard = e_card_list_get_vcard (list);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel-&gt;ok_button), "clicked",</div><div class='del'>-			   save_it, info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel-&gt;cancel_button), "clicked",</div><div class='del'>-			   close_it, info);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",</div><div class='del'>-			   delete_it, info);</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(filesel));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_exists(GtkFileSelection *filesel, const char *filename)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog = NULL;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GladeXML *gui = NULL;</div><div class='del'>-	int result = 0;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/file-exists.glade", NULL);</div><div class='del'>-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "dialog-exists"));</div><div class='del'>-	</div><div class='del'>-	label = glade_xml_get_widget (gui, "label-exists");</div><div class='del'>-	if (GTK_IS_LABEL (label)) {</div><div class='del'>-		string = g_strdup_printf (_("%s already exists\nDo you want to overwrite it?"), filename);</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (label), string);</div><div class='del'>-		g_free (string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_parent(dialog, GTK_WINDOW(filesel));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (dialog));</div><div class='del'>-	result = gnome_dialog_run_and_close(dialog);</div><div class='del'>-</div><div class='del'>-	g_free(gui);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h<br/>deleted file mode 100644<br/>index b97d25ee3a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/e-contact-save-as.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-save-as.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_CONTACT_SAVE_AS_H__</div><div class='del'>-#define __E_CONTACT_SAVE_AS_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_save_as(gchar *title, ECard *card);</div><div class='del'>-void</div><div class='del'>-e_contact_list_save_as(gchar *title, GList *list);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/file-exists.glade b/addressbook/gui/contact-editor/file-exists.glade<br/>deleted file mode 100644<br/>index 7c457cb892..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/file-exists.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/file-exists.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;File_exists.glade&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;file_exists.glade&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-exists&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Confirm Overwrite&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Overwrite&lt;/label&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;label-exists&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Don't bother translating this string.  It's not used.&lt;/label&gt;</div><div class='del'>-      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade<br/>deleted file mode 100644<br/>index d66b9163e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fulladdr.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/fulladdr.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,473 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fulladdr&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fulladdr&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-checkaddress&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Check Address&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox-container&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkaddress&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;6&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Address:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-street&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_City:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-city&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-city&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-ext&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_PO Box:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-po&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Address _2:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-ext&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-po&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-street&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_State/Province:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-region&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-region&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-country&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-country&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-code&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_ZIP Code:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-code&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Countr_y:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-country&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade<br/>deleted file mode 100644<br/>index 17be70647c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fullname.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/fullname.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,389 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fullname&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fullname&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-checkfullname&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Check Full Name&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;True&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox-container&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkfullname&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;21&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-title&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Mr.</div><div class='del'>-Mrs.</div><div class='del'>-Ms.</div><div class='del'>-Miss</div><div class='del'>-Dr.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-title&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-suffix&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Sr.</div><div class='del'>-Jr.</div><div class='del'>-I</div><div class='del'>-II</div><div class='del'>-III</div><div class='del'>-Esq.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-suffix&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-first&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-middle&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-last&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_First:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-first&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Title:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-title&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Middle:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-middle&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Last:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-last&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Suffix:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-suffix&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c<br/>deleted file mode 100644<br/>index e6b46adb83..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/test-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-editor/test-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,144 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * test-editor.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-</div><div class='del'>-#define TEST_VCARD                   \</div><div class='del'>-"BEGIN:VCARD</div><div class='del'>-"                      \</div><div class='del'>-"FN:Nat</div><div class='del'>-"                           \</div><div class='del'>-"N:Friedman;Nat;D;Mr.</div><div class='del'>-"             \</div><div class='del'>-"BDAY:1977-08-06</div><div class='del'>-"                  \</div><div class='del'>-"TEL;WORK:617 679 1984</div><div class='del'>-"            \</div><div class='del'>-"TEL;CELL:123 456 7890</div><div class='del'>-"            \</div><div class='del'>-"EMAIL;INTERNET:nat@nat.org</div><div class='del'>-"       \</div><div class='del'>-"EMAIL;INTERNET:nat@ximian.com</div><div class='del'>-" \</div><div class='del'>-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;</div><div class='del'>-" \</div><div class='del'>-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA</div><div class='del'>-" \</div><div class='del'>-"END:VCARD</div><div class='del'>-"                        \</div><div class='del'>-"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-read_file (char *name)</div><div class='del'>-{</div><div class='del'>-	int  len;</div><div class='del'>-	char buff[65536];</div><div class='del'>-	char line[1024];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	f = fopen (name, "r");</div><div class='del'>-	if (f == NULL)</div><div class='del'>-		g_error ("Unable to open %s!\n", name);</div><div class='del'>-</div><div class='del'>-	len  = 0;</div><div class='del'>-	while (fgets (line, sizeof (line), f) != NULL) {</div><div class='del'>-		strcpy (buff + len, line);</div><div class='del'>-		len += strlen (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a contact editor is closed */</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (EContactEditor *ce, gpointer data)</div><div class='del'>-{</div><div class='del'>-	static int count = 2;</div><div class='del'>-</div><div class='del'>-	count--;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ce));</div><div class='del'>-</div><div class='del'>-	if (count == 0)</div><div class='del'>-		exit (0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the contact editor canvas item" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-	char *cardstr;</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-	    textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-	gnome_init( "Contact Editor Test", VERSION, argc, argv);</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-</div><div class='del'>-	cardstr = NULL;</div><div class='del'>-	if (argc == 2)</div><div class='del'>-		cardstr = read_file (argv [1]);</div><div class='del'>-</div><div class='del'>-	if (cardstr == NULL)</div><div class='del'>-		cardstr = TEST_VCARD;</div><div class='del'>-</div><div class='del'>-	ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);</div><div class='del'>-</div><div class='del'>-	ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);</div><div class='del'>-</div><div class='del'>-	gtk_main();</div><div class='del'>-</div><div class='del'>-	/* Not reached. */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/.cvsignore b/addressbook/gui/contact-list-editor/.cvsignore<br/>deleted file mode 100644<br/>index 5eaae75530..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.pure</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am<br/>deleted file mode 100644<br/>index f710729826..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/merging	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/contact-editor	\</div><div class='del'>-	-I$(top_builddir)/shell			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\</div><div class='del'>-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-list-editor\"	\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontactlisteditor.a</div><div class='del'>-</div><div class='del'>-libecontactlisteditor_a_SOURCES = 		\</div><div class='del'>-	e-contact-list-editor.c			\</div><div class='del'>-	e-contact-list-editor.h			\</div><div class='del'>-	e-contact-list-model.c			\</div><div class='del'>-	e-contact-list-model.h</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 					\</div><div class='del'>-	contact-list-editor.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(glade_DATA)</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade<br/>deleted file mode 100644<br/>index 92c6aa013f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/contact-list-editor.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/contact-list-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,272 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;contact-list-editor&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;contact-list-editor&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeApp&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;contact list editor&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;contact-list-editor&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;default_width&gt;426&lt;/default_width&gt;</div><div class='del'>-  &lt;default_height&gt;304&lt;/default_height&gt;</div><div class='del'>-  &lt;allow_shrink&gt;True&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;enable_layout_config&gt;True&lt;/enable_layout_config&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GnomeDock&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeApp:dock&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dock1&lt;/name&gt;</div><div class='del'>-    &lt;allow_floating&gt;True&lt;/allow_floating&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDock:contents&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;vbox8&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox6&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label10&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;List _name:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;default_focus_target&gt;list-name-entry&lt;/default_focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;list-name-entry&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom7&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;evolution-contacts-plain.png&lt;/string1&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Sat, 23 Jun 2001 05:59:21 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame3&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	&lt;label&gt;Members&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox7&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox9&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label11&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Type an email address or drag a contact into the list below:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;email-entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;contact-list-table&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;e_contact_list_editor_create_table&lt;/creation_function&gt;</div><div class='del'>-	      &lt;string1&gt;&lt;/string1&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Sat, 23 Jun 2001 06:00:16 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;visible-addrs-checkbutton&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Hide addresses when sending mail to this list&lt;/label&gt;</div><div class='del'>-	      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox10&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label12&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;</div><div class='del'>-&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbuttonbox4&lt;/name&gt;</div><div class='del'>-	      &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;add-email-button&lt;/name&gt;</div><div class='del'>-		&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;remove-button&lt;/name&gt;</div><div class='del'>-		&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Remove&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c<br/>deleted file mode 100644<br/>index c88af3005e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/e-contact-list-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/e-contact-list-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,980 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-list-editor.c</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Author: Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-contact-list-editor.h"</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-container.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "shell/evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "e-contact-list-model.h"</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	LIST_ADDED,</div><div class='del'>-	LIST_MODIFIED,</div><div class='del'>-	LIST_DELETED,</div><div class='del'>-	EDITOR_CLOSED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_contact_list_editor_init		(EContactListEditor		 *editor);</div><div class='del'>-static void e_contact_list_editor_class_init	(EContactListEditorClass	 *klass);</div><div class='del'>-static void e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_list_editor_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void create_ui (EContactListEditor *ce);</div><div class='del'>-static void set_editable (EContactListEditor *editor);</div><div class='del'>-static void command_state_changed (EContactListEditor *editor);</div><div class='del'>-static void close_dialog (EContactListEditor *cle);</div><div class='del'>-static void extract_info(EContactListEditor *editor);</div><div class='del'>-static void fill_in_info(EContactListEditor *editor);</div><div class='del'>-</div><div class='del'>-static void add_email_cb (GtkWidget *w, EContactListEditor *editor);</div><div class='del'>-static void remove_entry_cb (GtkWidget *w, EContactListEditor *editor);</div><div class='del'>-static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);</div><div class='del'>-static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);</div><div class='del'>-</div><div class='del'>-static gint app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);</div><div class='del'>-static gboolean table_drag_drop_cb (ETable *table, int row, int col, GdkDragContext *context,</div><div class='del'>-				    gint x, gint y, guint time, EContactListEditor *editor);</div><div class='del'>-static gboolean table_drag_motion_cb (ETable *table, int row, int col, GdkDragContext *context,</div><div class='del'>-				      gint x, gint y, guint time, EContactListEditor *editor);</div><div class='del'>-static void table_drag_data_received_cb (ETable *table, int row, int col,</div><div class='del'>-					 GdkDragContext *context,</div><div class='del'>-					 gint x, gint y,</div><div class='del'>-					 GtkSelectionData *selection_data, guint info, guint time,</div><div class='del'>-					 EContactListEditor *editor);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static guint contact_list_editor_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-enum DndTargetType {</div><div class='del'>-	DND_TARGET_TYPE_VCARD,</div><div class='del'>-};</div><div class='del'>-#define VCARD_TYPE "text/x-vcard"</div><div class='del'>-static GtkTargetEntry drag_types[] = {</div><div class='del'>-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },</div><div class='del'>-};</div><div class='del'>-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-	ARG_IS_NEW_LIST,</div><div class='del'>-	ARG_EDITABLE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_list_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType contact_list_editor_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!contact_list_editor_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo contact_list_editor_info =</div><div class='del'>-      {</div><div class='del'>-        "EContactListEditor",</div><div class='del'>-        sizeof (EContactListEditor),</div><div class='del'>-        sizeof (EContactListEditorClass),</div><div class='del'>-        (GtkClassInitFunc) e_contact_list_editor_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_contact_list_editor_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      contact_list_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;contact_list_editor_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return contact_list_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,</div><div class='del'>-					    gint arg1,</div><div class='del'>-					    GtkObject *arg2,</div><div class='del'>-					    gpointer user_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_marshal_NONE__INT_OBJECT (GtkObject * object,</div><div class='del'>-			    GtkSignalFunc func,</div><div class='del'>-			    gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__INT_OBJECT rfunc;</div><div class='del'>-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_INT (args[0]),</div><div class='del'>-		  GTK_VALUE_OBJECT (args[1]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_editor_class_init (EContactListEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  gtk_object_add_arg_type ("EContactListEditor::book", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-  gtk_object_add_arg_type ("EContactListEditor::card", GTK_TYPE_OBJECT, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-  gtk_object_add_arg_type ("EContactListEditor::is_new_list", GTK_TYPE_BOOL,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_IS_NEW_LIST);</div><div class='del'>-  gtk_object_add_arg_type ("EContactListEditor::editable", GTK_TYPE_BOOL,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-</div><div class='del'>-  contact_list_editor_signals[LIST_ADDED] =</div><div class='del'>-	  gtk_signal_new ("list_added",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_added),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_list_editor_signals[LIST_MODIFIED] =</div><div class='del'>-	  gtk_signal_new ("list_modified",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_modified),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_list_editor_signals[LIST_DELETED] =</div><div class='del'>-	  gtk_signal_new ("list_deleted",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_deleted),</div><div class='del'>-			  e_marshal_NONE__INT_OBJECT,</div><div class='del'>-			  GTK_TYPE_NONE, 2,</div><div class='del'>-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-  contact_list_editor_signals[EDITOR_CLOSED] =</div><div class='del'>-	  gtk_signal_new ("editor_closed",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, editor_closed),</div><div class='del'>-			  gtk_marshal_NONE__NONE,</div><div class='del'>-			  GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-  gtk_object_class_add_signals (object_class, contact_list_editor_signals, LAST_SIGNAL);</div><div class='del'>- </div><div class='del'>-  object_class-&gt;set_arg = e_contact_list_editor_set_arg;</div><div class='del'>-  object_class-&gt;get_arg = e_contact_list_editor_get_arg;</div><div class='del'>-  object_class-&gt;destroy = e_contact_list_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_editor_init (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *bonobo_win;</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-</div><div class='del'>-	editor-&gt;card = NULL;</div><div class='del'>-	editor-&gt;changed = FALSE;</div><div class='del'>-	editor-&gt;editable = TRUE;</div><div class='del'>-	editor-&gt;in_async_call = FALSE;</div><div class='del'>-	editor-&gt;is_new_list = FALSE;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL);</div><div class='del'>-	editor-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	editor-&gt;app = glade_xml_get_widget (gui, "contact list editor");</div><div class='del'>-</div><div class='del'>-	editor-&gt;table = glade_xml_get_widget (gui, "contact-list-table");</div><div class='del'>-	editor-&gt;model = gtk_object_get_data (GTK_OBJECT(editor-&gt;table), "model");</div><div class='del'>-</div><div class='del'>-	editor-&gt;add_button = glade_xml_get_widget (editor-&gt;gui, "add-email-button");</div><div class='del'>-	editor-&gt;remove_button = glade_xml_get_widget (editor-&gt;gui, "remove-button");</div><div class='del'>-</div><div class='del'>-	editor-&gt;email_entry = glade_xml_get_widget (gui, "email-entry");</div><div class='del'>-	editor-&gt;list_name_entry = glade_xml_get_widget (gui, "list-name-entry");</div><div class='del'>-</div><div class='del'>-	editor-&gt;visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-	bonobo_win = bonobo_window_new ("contact-list-editor", _("Contact List Editor"));</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (editor-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("contact_list_editor_construct(): Could not get contents");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (editor-&gt;app);</div><div class='del'>-		editor-&gt;app = bonobo_win;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	editor-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	if (!editor-&gt;uic) {</div><div class='del'>-		g_message ("e_contact_list_editor_init(): eeeeek, could not create the UI handler!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	bonobo_ui_component_set_container (editor-&gt;uic,</div><div class='del'>-					   bonobo_object_corba_objref (</div><div class='del'>-								       BONOBO_OBJECT (container)));</div><div class='del'>-</div><div class='del'>-	create_ui (editor);</div><div class='del'>-</div><div class='del'>-	/* connect signals */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(editor-&gt;add_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC(add_email_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(editor-&gt;email_entry),</div><div class='del'>-			    "activate", GTK_SIGNAL_FUNC(add_email_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(editor-&gt;remove_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC(remove_entry_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(editor-&gt;list_name_entry),</div><div class='del'>-			    "changed", GTK_SIGNAL_FUNC(list_name_changed_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(editor-&gt;visible_addrs_checkbutton),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC(visible_addrs_toggled_cb), editor);</div><div class='del'>-</div><div class='del'>-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor-&gt;table)),</div><div class='del'>-			       0, drag_types, num_drag_types, GDK_ACTION_LINK);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor-&gt;table))),</div><div class='del'>-			    "table_drag_motion", GTK_SIGNAL_FUNC(table_drag_motion_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor-&gt;table))),</div><div class='del'>-			    "table_drag_drop", GTK_SIGNAL_FUNC(table_drag_drop_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor-&gt;table))),</div><div class='del'>-			    "table_drag_data_received", GTK_SIGNAL_FUNC(table_drag_data_received_cb), editor);</div><div class='del'>-</div><div class='del'>-	command_state_changed (editor);</div><div class='del'>-</div><div class='del'>-	/* Connect to the deletion of the dialog */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (editor-&gt;app), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (app_delete_event_cb), editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EContactListEditor *cle;</div><div class='del'>-	gboolean should_close;</div><div class='del'>-} EditorCloseStruct;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-list_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = ecs-&gt;cle;</div><div class='del'>-	gboolean should_close = ecs-&gt;should_close;</div><div class='del'>-</div><div class='del'>-	if (cle-&gt;app)</div><div class='del'>-		gtk_widget_set_sensitive (cle-&gt;app, TRUE);</div><div class='del'>-	cle-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	e_card_set_id (cle-&gt;card, id);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_ADDED],</div><div class='del'>-			 status, cle-&gt;card);</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		cle-&gt;is_new_list = FALSE;</div><div class='del'>-</div><div class='del'>-		if (should_close)</div><div class='del'>-			close_dialog (cle);</div><div class='del'>-		else</div><div class='del'>-			command_state_changed (cle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cle));</div><div class='del'>-	g_free (ecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = ecs-&gt;cle;</div><div class='del'>-	gboolean should_close = ecs-&gt;should_close;</div><div class='del'>-</div><div class='del'>-	if (cle-&gt;app)</div><div class='del'>-		gtk_widget_set_sensitive (cle-&gt;app, TRUE);</div><div class='del'>-	cle-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_MODIFIED],</div><div class='del'>-			 status, cle-&gt;card);</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		if (should_close)</div><div class='del'>-			close_dialog (cle);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cle)); /* release ref held for ebook callback */</div><div class='del'>-	g_free (ecs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_card (EContactListEditor *cle, gboolean should_close)</div><div class='del'>-{</div><div class='del'>-	extract_info (cle);</div><div class='del'>-</div><div class='del'>-	if (cle-&gt;book) {</div><div class='del'>-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);</div><div class='del'>-		</div><div class='del'>-		ecs-&gt;cle = cle;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (cle));</div><div class='del'>-		ecs-&gt;should_close = should_close;</div><div class='del'>-</div><div class='del'>-		if (cle-&gt;app)</div><div class='del'>-			gtk_widget_set_sensitive (cle-&gt;app, FALSE);</div><div class='del'>-		cle-&gt;in_async_call = TRUE;</div><div class='del'>-</div><div class='del'>-		if (cle-&gt;is_new_list)</div><div class='del'>-			e_book_add_card (cle-&gt;book, cle-&gt;card, GTK_SIGNAL_FUNC(list_added_cb), ecs);</div><div class='del'>-		else</div><div class='del'>-			e_book_commit_card (cle-&gt;book, cle-&gt;card, GTK_SIGNAL_FUNC(list_modified_cb), ecs);</div><div class='del'>-</div><div class='del'>-		cle-&gt;changed = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-prompt_to_save_changes (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;changed)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor-&gt;app))) {</div><div class='del'>-	case 0: /* Save */</div><div class='del'>-		save_card (editor, FALSE);</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 1: /* Discard */</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 2: /* Cancel */</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_close_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	if (!prompt_to_save_changes (cle))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	close_dialog (cle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_save_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	save_card (cle, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_save_as_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (cle);</div><div class='del'>-</div><div class='del'>-	e_contact_save_as(_("Save List as VCard"), cle-&gt;card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_send_as_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (cle);</div><div class='del'>-</div><div class='del'>-	e_card_send(cle-&gt;card, E_CARD_DISPOSITION_AS_ATTACHMENT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_send_to_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (cle);</div><div class='del'>-</div><div class='del'>-	e_card_send(cle-&gt;card, E_CARD_DISPOSITION_AS_TO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tb_save_and_close_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-	save_card (cle, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-list_deleted_cb (EBook *book, EBookStatus status, EContactListEditor *cle)</div><div class='del'>-{</div><div class='del'>-	if (cle-&gt;app)</div><div class='del'>-		gtk_widget_set_sensitive (cle-&gt;app, TRUE);</div><div class='del'>-	cle-&gt;in_async_call = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_DELETED],</div><div class='del'>-			 status, cle-&gt;card);</div><div class='del'>-</div><div class='del'>-	/* always close the dialog after we successfully delete a list */</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		close_dialog (cle);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cle)); /* release reference held for callback */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-	ECard *card = cle-&gt;card;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(cle-&gt;app))) {</div><div class='del'>-</div><div class='del'>-		extract_info (cle);</div><div class='del'>-		</div><div class='del'>-		if (!cle-&gt;is_new_list) {</div><div class='del'>-			gtk_widget_set_sensitive (cle-&gt;app, FALSE);</div><div class='del'>-			cle-&gt;in_async_call = TRUE;</div><div class='del'>-			</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (cle)); /* hold reference for callback */</div><div class='del'>-			e_book_remove_card (cle-&gt;book, card, GTK_SIGNAL_FUNC(list_deleted_cb), cle);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveClose", tb_save_and_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorDelete", delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveAs", file_save_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendAs", file_send_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSendTo", file_send_to_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps[] = {</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorSave", "save-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorSaveClose", "save-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorSaveAs", "save-as-16.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorDelete", "evolution-trash-mini.png"),</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorPrint", "print.xpm"),</div><div class='del'>-	E_PIXMAP ("/commands/ContactListEditorPrintEnvelope", "print.xpm"),</div><div class='del'>-#endif</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactListEditorSaveClose", "buttons/save-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactListEditorDelete", "buttons/delete-message.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/ContactListEditorPrint", "buttons/print.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_ui (EContactListEditor *ce)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		ce-&gt;uic, verbs, ce);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ce-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-contact-list-editor.xml",</div><div class='del'>-			       "evolution-contact-list-editor");</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (ce-&gt;uic, pixmaps);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EContactListEditor *</div><div class='del'>-e_contact_list_editor_new (EBook *book,</div><div class='del'>-			   ECard *list_card,</div><div class='del'>-			   gboolean is_new_list,</div><div class='del'>-			   gboolean editable)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_LIST_EDITOR (gtk_type_new (E_CONTACT_LIST_EDITOR_TYPE));</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (ce),</div><div class='del'>-			"book", book,</div><div class='del'>-			"card", list_card,</div><div class='del'>-			"is_new_list", is_new_list,</div><div class='del'>-			"editable", editable,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	return ce;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *editor;</div><div class='del'>-</div><div class='del'>-	editor = E_CONTACT_LIST_EDITOR (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (editor-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(editor-&gt;book));</div><div class='del'>-		editor-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (editor-&gt;book));</div><div class='del'>-		/* XXX more here about editable/etc. */</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (editor-&gt;card)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(editor-&gt;card));</div><div class='del'>-		editor-&gt;card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));</div><div class='del'>-		fill_in_info(editor);</div><div class='del'>-		editor-&gt;changed = FALSE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_IS_NEW_LIST: {</div><div class='del'>-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		gboolean changed = (editor-&gt;is_new_list != new_value);</div><div class='del'>-</div><div class='del'>-		editor-&gt;is_new_list = new_value;</div><div class='del'>-</div><div class='del'>-		if (changed)</div><div class='del'>-			command_state_changed (editor);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ARG_EDITABLE: {</div><div class='del'>-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;</div><div class='del'>-		gboolean changed = (editor-&gt;editable != new_value);</div><div class='del'>-</div><div class='del'>-		editor-&gt;editable = new_value;</div><div class='del'>-</div><div class='del'>-		if (changed) {</div><div class='del'>-			set_editable (editor);</div><div class='del'>-			command_state_changed (editor);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *editor;</div><div class='del'>-</div><div class='del'>-	editor = E_CONTACT_LIST_EDITOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		extract_info(editor);</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor-&gt;card);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_IS_NEW_LIST:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = editor-&gt;is_new_list ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = editor-&gt;editable ? TRUE : FALSE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_editor_show (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_show (editor-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_editor_raise (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gdk_window_raise (GTK_WIDGET (editor-&gt;app)-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SPEC "&lt;ETableSpecification no-headers=\"true\" cursor-mode=\"line\" selection-mode=\"single\"&gt; \</div><div class='del'>- &lt;ETableColumn model_col= \"0\" _title=\"Contact\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" /&gt; \</div><div class='del'>-	&lt;ETableState&gt;                   			       \</div><div class='del'>-		&lt;column source=\"0\"/&gt;     			       \</div><div class='del'>-	        &lt;grouping&gt; &lt;/grouping&gt;				       \</div><div class='del'>-	&lt;/ETableState&gt;                  			       \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_list_editor_create_table(gchar *name,</div><div class='del'>-				   gchar *string1, gchar *string2,</div><div class='del'>-				   gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_list_editor_create_table(gchar *name,</div><div class='del'>-				   gchar *string1, gchar *string2,</div><div class='del'>-				   gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-</div><div class='del'>-	model = e_contact_list_model_new ();</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "model", model);</div><div class='del'>-</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_email_cb (GtkWidget *w, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor-&gt;table));</div><div class='del'>-	char *text = gtk_entry_get_text (GTK_ENTRY(editor-&gt;email_entry));</div><div class='del'>-</div><div class='del'>-	if (text &amp;&amp; *text) {</div><div class='del'>-		e_contact_list_model_add_email (E_CONTACT_LIST_MODEL(editor-&gt;model), text);</div><div class='del'>-</div><div class='del'>-		/* Skip to the end of the list */</div><div class='del'>-		if (adj-&gt;upper - adj-&gt;lower &gt; adj-&gt;page_size)</div><div class='del'>-			gtk_adjustment_set_value (adj, adj-&gt;upper);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY(editor-&gt;email_entry), "");</div><div class='del'>-</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_row (int model_row, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	e_contact_list_model_remove_row (E_CONTACT_LIST_MODEL (editor-&gt;model), model_row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_entry_cb (GtkWidget *w, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	e_table_selected_row_foreach (e_table_scrolled_get_table(E_TABLE_SCROLLED(editor-&gt;table)),</div><div class='del'>-				      (EForeachFunc)remove_row, editor);</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-list_name_changed_cb (GtkWidget *w, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (!editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editable (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive (editor-&gt;email_entry, editor-&gt;editable);</div><div class='del'>-	gtk_widget_set_sensitive (editor-&gt;list_name_entry, editor-&gt;editable);</div><div class='del'>-	gtk_widget_set_sensitive (editor-&gt;add_button, editor-&gt;editable);</div><div class='del'>-	gtk_widget_set_sensitive (editor-&gt;remove_button, editor-&gt;editable);</div><div class='del'>-	gtk_widget_set_sensitive (editor-&gt;table, editor-&gt;editable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Closes the dialog box and emits the appropriate signals */</div><div class='del'>-static void</div><div class='del'>-close_dialog (EContactListEditor *cle)</div><div class='del'>-{</div><div class='del'>-	g_assert (cle-&gt;app != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (cle-&gt;app);</div><div class='del'>-	cle-&gt;app = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[EDITOR_CLOSED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the editor is destroyed */</div><div class='del'>-static gint</div><div class='del'>-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_LIST_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	/* if we're in an async call, don't allow the dialog to close */</div><div class='del'>-	if (ce-&gt;in_async_call)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (!prompt_to_save_changes (ce))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-table_drag_motion_cb (ETable *table, int row, int col,</div><div class='del'>-		      GdkDragContext *context,</div><div class='del'>-		      gint x, gint y, guint time, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	for (p = context-&gt;targets; p != NULL; p = p-&gt;next) {</div><div class='del'>-		char *possible_type;</div><div class='del'>-</div><div class='del'>-		possible_type = gdk_atom_name ((GdkAtom) p-&gt;data);</div><div class='del'>-		if (!strcmp (possible_type, VCARD_TYPE)) {</div><div class='del'>-			g_free (possible_type);</div><div class='del'>-			gdk_drag_status (context, GDK_ACTION_LINK, time);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (possible_type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-table_drag_drop_cb (ETable *table, int row, int col,</div><div class='del'>-		    GdkDragContext *context,</div><div class='del'>-		    gint x, gint y, guint time, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (context-&gt;targets != NULL) {</div><div class='del'>-		gtk_drag_get_data (GTK_WIDGET (table), context,</div><div class='del'>-				   GPOINTER_TO_INT (context-&gt;targets-&gt;data),</div><div class='del'>-				   time);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_drag_data_received_cb (ETable *table, int row, int col,</div><div class='del'>-			     GdkDragContext *context,</div><div class='del'>-			     gint x, gint y,</div><div class='del'>-			     GtkSelectionData *selection_data,</div><div class='del'>-			     guint info, guint time, EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor-&gt;table));</div><div class='del'>-	char *target_type;</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-</div><div class='del'>-	target_type = gdk_atom_name (selection_data-&gt;target);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (target_type, VCARD_TYPE)) {</div><div class='del'>-</div><div class='del'>-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data-&gt;data, "ISO-8859-1");</div><div class='del'>-		GList *c;</div><div class='del'>-</div><div class='del'>-		for (c = card_list; c; c = c-&gt;next) {</div><div class='del'>-			ECard *ecard = c-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (!e_card_evolution_list (ecard)) {</div><div class='del'>-				ECardSimple *simple = e_card_simple_new (ecard);</div><div class='del'>-</div><div class='del'>-				e_contact_list_model_add_card (E_CONTACT_LIST_MODEL (editor-&gt;model),</div><div class='del'>-							       simple);</div><div class='del'>-</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-</div><div class='del'>-				changed = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (card_list);</div><div class='del'>-</div><div class='del'>-		/* Skip to the end of the list */</div><div class='del'>-		if (adj-&gt;upper - adj-&gt;lower &gt; adj-&gt;page_size)</div><div class='del'>-			gtk_adjustment_set_value (adj, adj-&gt;upper);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changed &amp;&amp; !editor-&gt;changed) {</div><div class='del'>-		editor-&gt;changed = TRUE;</div><div class='del'>-		command_state_changed (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-command_state_changed (EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_set_prop (editor-&gt;uic,</div><div class='del'>-				      "/commands/ContactListEditorSaveClose",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      editor-&gt;changed &amp;&amp; editor-&gt;editable ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (editor-&gt;uic,</div><div class='del'>-				      "/commands/ContactListEditorSave",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      editor-&gt;changed &amp;&amp; editor-&gt;editable ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (editor-&gt;uic,</div><div class='del'>-				      "/commands/ContactListEditorDelete",</div><div class='del'>-				      "sensitive",</div><div class='del'>-				      editor-&gt;editable &amp;&amp; !editor-&gt;is_new_list ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECard *card = editor-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		int i;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EIterator *email_iter;</div><div class='del'>-		char *string = e_utf8_gtk_editable_get_chars(GTK_EDITABLE (editor-&gt;list_name_entry), 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       "file_as", string,</div><div class='del'>-				       "full_name", string,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		g_free (string);</div><div class='del'>-</div><div class='del'>-		</div><div class='del'>-		gtk_object_set (GTK_OBJECT(card),</div><div class='del'>-				"list", GINT_TO_POINTER (TRUE),</div><div class='del'>-				"list_show_addresses",</div><div class='del'>-				GINT_TO_POINTER (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(editor-&gt;visible_addrs_checkbutton))),</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		gtk_object_get (GTK_OBJECT(card),</div><div class='del'>-				"email", &amp;email_list,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		/* clear the email list */</div><div class='del'>-		email_iter = e_list_get_iterator (email_list);</div><div class='del'>-		e_iterator_last (email_iter);</div><div class='del'>-		while (e_iterator_is_valid (E_ITERATOR (email_iter))) {</div><div class='del'>-			e_iterator_delete (E_ITERATOR (email_iter));</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (email_iter));</div><div class='del'>-</div><div class='del'>-		/* then refill it from the contact list model */</div><div class='del'>-		for (i = 0; i &lt; e_table_model_row_count (editor-&gt;model); i ++) {</div><div class='del'>-			const EDestination *dest = e_contact_list_model_get_destination (E_CONTACT_LIST_MODEL (editor-&gt;model), i);</div><div class='del'>-			gchar *dest_xml = e_destination_export (dest);</div><div class='del'>-			if (dest_xml) {</div><div class='del'>-				e_list_append (email_list, dest_xml);</div><div class='del'>-			}</div><div class='del'>-			g_free (dest_xml);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactListEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (editor-&gt;card) {</div><div class='del'>-		char *file_as;</div><div class='del'>-		gboolean show_addresses = FALSE;</div><div class='del'>-		gboolean is_evolution_list = FALSE;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EIterator *email_iter;</div><div class='del'>-</div><div class='del'>-		gtk_object_get (GTK_OBJECT (editor-&gt;card),</div><div class='del'>-				"file_as", &amp;file_as,</div><div class='del'>-				"email", &amp;email_list,</div><div class='del'>-				"list", &amp;is_evolution_list,</div><div class='del'>-				"list_show_addresses", &amp;show_addresses,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		gtk_editable_delete_text (GTK_EDITABLE (editor-&gt;list_name_entry), 0, -1);</div><div class='del'>-		if (file_as) {</div><div class='del'>-			int position = 0;</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string (editor-&gt;list_name_entry, file_as);</div><div class='del'>-			gtk_editable_insert_text (GTK_EDITABLE (editor-&gt;list_name_entry), u, strlen (u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(editor-&gt;visible_addrs_checkbutton), !show_addresses);</div><div class='del'>-</div><div class='del'>-		e_contact_list_model_remove_all (E_CONTACT_LIST_MODEL (editor-&gt;model));</div><div class='del'>-</div><div class='del'>-		email_iter = e_list_get_iterator (email_list);</div><div class='del'>-		</div><div class='del'>-		while (e_iterator_is_valid (email_iter)) {</div><div class='del'>-			const char *dest_xml = e_iterator_get (email_iter);</div><div class='del'>-			EDestination *dest;</div><div class='del'>-</div><div class='del'>-			/* g_message ("incoming xml: [%s]", dest_xml); */</div><div class='del'>-			dest = e_destination_import (dest_xml);</div><div class='del'>-</div><div class='del'>-			if (dest != NULL) {</div><div class='del'>-				e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL (editor-&gt;model), dest);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			e_iterator_next (email_iter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h<br/>deleted file mode 100644<br/>index 37f54df170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/e-contact-list-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/e-contact-list-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,110 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-list-editor.h</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Author: Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_CONTACT_LIST_EDITOR_H__</div><div class='del'>-#define __E_CONTACT_LIST_EDITOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app-helper.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_LIST_EDITOR_TYPE			(e_contact_list_editor_get_type ())</div><div class='del'>-#define E_CONTACT_LIST_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditor))</div><div class='del'>-#define E_CONTACT_LIST_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditorClass))</div><div class='del'>-#define E_IS_CONTACT_LIST_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))</div><div class='del'>-#define E_IS_CONTACT_LIST_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactListEditor       EContactListEditor;</div><div class='del'>-typedef struct _EContactListEditorClass  EContactListEditorClass;</div><div class='del'>-</div><div class='del'>-struct _EContactListEditor</div><div class='del'>-{</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	GtkWidget *email_entry;</div><div class='del'>-	GtkWidget *list_name_entry;</div><div class='del'>-	GtkWidget *add_button;</div><div class='del'>-	GtkWidget *remove_button;</div><div class='del'>-	GtkWidget *visible_addrs_checkbutton;</div><div class='del'>-</div><div class='del'>-	/* Whether we are editing a new card or an existing one */</div><div class='del'>-	guint is_new_list : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the card has been changed since bringing up the contact editor */</div><div class='del'>-	guint changed : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the contact editor will accept modifications */</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether an async wombat call is in progress */</div><div class='del'>-	guint in_async_call : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactListEditorClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* list_added)    (EContactListEditor *cle, EBookStatus status, ECard *card);</div><div class='del'>-	void (* list_modified) (EContactListEditor *cle, EBookStatus status, ECard *card);</div><div class='del'>-	void (* list_deleted)  (EContactListEditor *cle, EBookStatus status, ECard *card);</div><div class='del'>-	void (* editor_closed) (EContactListEditor *cle);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EContactListEditor *e_contact_list_editor_new             (EBook *book,</div><div class='del'>-							   ECard *list_card,</div><div class='del'>-							   gboolean is_new_list,</div><div class='del'>-							   gboolean editable);</div><div class='del'>-GtkType             e_contact_list_editor_get_type        (void);</div><div class='del'>-void                e_contact_list_editor_show            (EContactListEditor *editor);</div><div class='del'>-void                e_contact_list_editor_raise           (EContactListEditor *editor);</div><div class='del'>-</div><div class='del'>-gboolean            e_contact_list_editor_confirm_delete  (GtkWindow      *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_LIST_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c<br/>deleted file mode 100644<br/>index c4321c2820..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/e-contact-list-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/e-contact-list-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,253 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-contact-list-model.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_table_model_get_type()</div><div class='del'>-static ETableModelClass *parent_class;</div><div class='del'>-</div><div class='del'>-#define COLS 1</div><div class='del'>-</div><div class='del'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-contact_list_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return COLS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of rows in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-contact_list_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);</div><div class='del'>-	return model-&gt;data_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the value at a particular point in our ETableModel. */</div><div class='del'>-static void *</div><div class='del'>-contact_list_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);</div><div class='del'>-</div><div class='del'>-	return (void *) e_destination_get_address (model-&gt;data[row]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-contact_list_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns whether a particular cell is editable. */</div><div class='del'>-static gboolean</div><div class='del'>-contact_list_is_cell_editable (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-contact_list_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-contact_list_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-contact_list_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-contact_list_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-contact_list_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-contact_list_model_destroy (GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	EContactListModel *model = E_CONTACT_LIST_MODEL (o);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; model-&gt;data_count; i ++) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (model-&gt;data[i]));</div><div class='del'>-	}</div><div class='del'>-	g_free (model-&gt;data);</div><div class='del'>-</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;data_alloc = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_model_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	ETableModelClass *model_class = (ETableModelClass *) object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = contact_list_model_destroy;</div><div class='del'>-</div><div class='del'>-	model_class-&gt;column_count = contact_list_col_count;</div><div class='del'>-	model_class-&gt;row_count = contact_list_row_count;</div><div class='del'>-	model_class-&gt;value_at = contact_list_value_at;</div><div class='del'>-	model_class-&gt;set_value_at = contact_list_set_value_at;</div><div class='del'>-	model_class-&gt;is_cell_editable = contact_list_is_cell_editable;</div><div class='del'>-	model_class-&gt;duplicate_value = contact_list_duplicate_value;</div><div class='del'>-	model_class-&gt;free_value = contact_list_free_value;</div><div class='del'>-	model_class-&gt;initialize_value = contact_list_initialize_value;</div><div class='del'>-	model_class-&gt;value_is_empty = contact_list_value_is_empty;</div><div class='del'>-	model_class-&gt;value_to_string = contact_list_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_list_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactListModel *model = E_CONTACT_LIST_MODEL(object);</div><div class='del'>-</div><div class='del'>-	model-&gt;data_alloc = 10;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;data = g_new (EDestination*, model-&gt;data_alloc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_list_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EContactListModel",</div><div class='del'>-			sizeof (EContactListModel),</div><div class='del'>-			sizeof (EContactListModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_contact_list_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_contact_list_model_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_construct (EContactListModel *model)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableModel *</div><div class='del'>-e_contact_list_model_new ()</div><div class='del'>-{</div><div class='del'>-	EContactListModel *model;</div><div class='del'>-</div><div class='del'>-	model = gtk_type_new (e_contact_list_model_get_type ());</div><div class='del'>-</div><div class='del'>-	e_contact_list_model_construct (model);</div><div class='del'>-</div><div class='del'>-	return E_TABLE_MODEL(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));</div><div class='del'>-	g_return_if_fail (E_IS_DESTINATION (dest));</div><div class='del'>-</div><div class='del'>-	if (model-&gt;data_count + 1 &gt;= model-&gt;data_alloc) {</div><div class='del'>-		model-&gt;data_alloc *= 2;</div><div class='del'>-		model-&gt;data = g_renew (EDestination*, model-&gt;data, model-&gt;data_alloc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;data[model-&gt;data_count ++] = dest;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (dest));</div><div class='del'>-	gtk_object_sink (GTK_OBJECT (dest));</div><div class='del'>-</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_add_email (EContactListModel *model,</div><div class='del'>-				const char *email)</div><div class='del'>-{</div><div class='del'>-	EDestination *new_dest;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));</div><div class='del'>-	g_return_if_fail (email != NULL);</div><div class='del'>-</div><div class='del'>-	new_dest = e_destination_new ();</div><div class='del'>-	e_destination_set_email (new_dest, email);</div><div class='del'>-</div><div class='del'>-	e_contact_list_model_add_destination (model, new_dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_add_card (EContactListModel *model,</div><div class='del'>-			       ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	EDestination *new_dest;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));</div><div class='del'>-	g_return_if_fail (E_IS_CARD_SIMPLE (simple));</div><div class='del'>-</div><div class='del'>-	new_dest = e_destination_new ();</div><div class='del'>-	e_destination_set_card (new_dest, simple-&gt;card, 0); /* Hard-wired for default e-mail */</div><div class='del'>-</div><div class='del'>-	e_contact_list_model_add_destination (model, new_dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_remove_row (EContactListModel *model, int row)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));</div><div class='del'>-	g_return_if_fail (0 &lt;= row &amp;&amp; row &lt; model-&gt;data_count);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (model-&gt;data[row]));</div><div class='del'>-	memmove (model-&gt;data + row, model-&gt;data + row + 1, sizeof (EDestination*) * (model-&gt;data_count - row - 1));</div><div class='del'>-	model-&gt;data_count --;</div><div class='del'>-</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_list_model_remove_all (EContactListModel *model)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; model-&gt;data_count; i ++) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (model-&gt;data[i]));</div><div class='del'>-		model-&gt;data[i] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const EDestination *</div><div class='del'>-e_contact_list_model_get_destination (EContactListModel *model, int row)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);</div><div class='del'>-	g_return_val_if_fail (0 &lt;= row &amp;&amp; row &lt; model-&gt;data_count, NULL);</div><div class='del'>-</div><div class='del'>-	return model-&gt;data[row];</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h<br/>deleted file mode 100644<br/>index 1c2d6ac8d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-list-editor/e-contact-list-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/contact-list-editor/e-contact-list-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_CONTACT_LIST_MODEL_H_</div><div class='del'>-#define _E_CONTACT_LIST_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-view.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-destination.h"</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_LIST_MODEL_TYPE        (e_contact_list_model_get_type ())</div><div class='del'>-#define E_CONTACT_LIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CONTACT_LIST_MODEL_TYPE, EContactListModel))</div><div class='del'>-#define E_CONTACT_LIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CONTACT_LIST_MODEL_TYPE, EContactListModelClass))</div><div class='del'>-#define E_IS_CONTACT_LIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CONTACT_LIST_MODEL_TYPE))</div><div class='del'>-#define E_IS_CONTACT_LIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CONTACT_LIST_MODEL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _EContactListModel EContactListModel;</div><div class='del'>-typedef struct _EContactListModelClass EContactListModelClass;</div><div class='del'>-</div><div class='del'>-struct _EContactListModel {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	EDestination **data;</div><div class='del'>-	int data_count;</div><div class='del'>-	int data_alloc;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EContactListModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType      e_contact_list_model_get_type (void);</div><div class='del'>-void         e_contact_list_model_construct (EContactListModel *model);</div><div class='del'>-ETableModel *e_contact_list_model_new (void);</div><div class='del'>-</div><div class='del'>-void         e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest);</div><div class='del'>-void         e_contact_list_model_add_email       (EContactListModel *model, const char *email);</div><div class='del'>-void         e_contact_list_model_add_card        (EContactListModel *model, ECardSimple *simple);</div><div class='del'>-</div><div class='del'>-void	     e_contact_list_model_remove_row (EContactListModel *model, int row);</div><div class='del'>-void         e_contact_list_model_remove_all (EContactListModel *model);</div><div class='del'>-</div><div class='del'>-const EDestination *e_contact_list_model_get_destination (EContactListModel *model, int row);</div><div class='del'>-</div><div class='del'>-#endif /* _E_CONTACT_LIST_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/gui/merging/.cvsignore b/addressbook/gui/merging/.cvsignore<br/>deleted file mode 100644<br/>index d6c55c7345..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am<br/>deleted file mode 100644<br/>index 7df0ac4fcc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-card-gui\"			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook	\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecardmerging.a</div><div class='del'>-</div><div class='del'>-libecardmerging_a_SOURCES =			\</div><div class='del'>-	e-card-merging.c			\</div><div class='del'>-	e-card-merging.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = 	e-card-duplicate-detected.glade	\</div><div class='del'>-		e-card-merging-book-commit-duplicate-detected.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	 $(glade_DATA)</div><div class='head'>diff --git a/addressbook/gui/merging/e-card-duplicate-detected.glade b/addressbook/gui/merging/e-card-duplicate-detected.glade<br/>deleted file mode 100644<br/>index bc6624e8fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/e-card-duplicate-detected.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/e-card-duplicate-detected.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-card-duplicate-detected&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-card-duplicate-detected&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-duplicate-contact&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Duplicate Contact Detected&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_POPUP&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Add Anyway&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_ADD&lt;/stock_pixmap&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button4&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;6&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;custom-old-card&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;e_card_merging_create_old_card&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Fri, 08 Jun 2001 01:33:22 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;The name or email address of this contact already exists</div><div class='del'>-in this folder.  Would you like to add it anyway?&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Original Contact:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;New Contact:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;custom-new-card&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;e_card_merging_create_old_card&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Fri, 08 Jun 2001 01:33:22 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom2&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;malehead.png&lt;/string1&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Fri, 08 Jun 2001 00:18:39 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade<br/>deleted file mode 100644<br/>index 0bc60ba13a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-card-merging-book-commit-duplicate-detected&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-card-merging-book-commit-duplicate-detected&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog-duplicate-contact&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Duplicate Contact Detected&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_POPUP&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Change Anyway&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_ADD&lt;/stock_pixmap&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button4&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;6&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;custom-old-card&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;e_card_merging_create_old_card&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Fri, 08 Jun 2001 01:33:22 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;The changed email or name of this contact already</div><div class='del'>-exists in this folder.  Would you like to add it anyway?&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Conflicting Contact:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Changed Contact:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;custom-new-card&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;e_card_merging_create_old_card&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Fri, 08 Jun 2001 01:33:22 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	&lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	&lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;custom2&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;e_create_image_widget&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;malehead.png&lt;/string1&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Fri, 08 Jun 2001 00:18:39 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c<br/>deleted file mode 100644<br/>index b9aacabde7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/e-card-merging.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/e-card-merging.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,168 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Code for checking for duplicates when doing ECard work.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include "e-card-compare.h"</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "addressbook/gui/widgets/e-minicard-widget.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_CARD_MERGING_ADD,</div><div class='del'>-	E_CARD_MERGING_COMMIT</div><div class='del'>-} ECardMergingOpType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ECardMergingOpType op;</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EBookIdCallback id_cb;</div><div class='del'>-	EBookCallback   cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-} ECardMergingLookup;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doit (ECardMergingLookup *lookup)</div><div class='del'>-{</div><div class='del'>-	if (lookup-&gt;op == E_CARD_MERGING_ADD)</div><div class='del'>-		e_book_add_card (lookup-&gt;book, lookup-&gt;card, lookup-&gt;id_cb, lookup-&gt;closure);</div><div class='del'>-	else if (lookup-&gt;op == E_CARD_MERGING_COMMIT)</div><div class='del'>-		e_book_commit_card (lookup-&gt;book, lookup-&gt;card, lookup-&gt;cb, lookup-&gt;closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancelit (ECardMergingLookup *lookup)</div><div class='del'>-{</div><div class='del'>-	if (lookup-&gt;op == E_CARD_MERGING_ADD) {</div><div class='del'>-		if (lookup-&gt;id_cb)</div><div class='del'>-			lookup-&gt;id_cb (lookup-&gt;book, E_BOOK_STATUS_CANCELLED, NULL, lookup-&gt;closure);</div><div class='del'>-	} else if (lookup-&gt;op == E_CARD_MERGING_COMMIT) {</div><div class='del'>-		if (lookup-&gt;cb)</div><div class='del'>-			lookup-&gt;cb (lookup-&gt;book, E_BOOK_STATUS_CANCELLED, lookup-&gt;closure);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clicked (GnomeDialog *dialog, int button, ECardMergingLookup *lookup)</div><div class='del'>-{</div><div class='del'>-	switch (button) {</div><div class='del'>-	case 0:</div><div class='del'>-		doit (lookup);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		cancelit (lookup);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	g_free (lookup);</div><div class='del'>-	gnome_dialog_close (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECardMergingLookup *lookup = closure;</div><div class='del'>-</div><div class='del'>-	if ((gint) type &lt;= (gint) E_CARD_MATCH_VAGUE) {</div><div class='del'>-		doit (lookup);</div><div class='del'>-		g_free (lookup);</div><div class='del'>-	} else {</div><div class='del'>-		GladeXML *ui;</div><div class='del'>-		</div><div class='del'>-		GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-		if (lookup-&gt;op == E_CARD_MERGING_ADD)</div><div class='del'>-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL);</div><div class='del'>-		else if (lookup-&gt;op == E_CARD_MERGING_COMMIT)</div><div class='del'>-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL);</div><div class='del'>-		else {</div><div class='del'>-			doit (lookup);</div><div class='del'>-			g_free (lookup);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget (ui, "custom-old-card");</div><div class='del'>-		gtk_object_set (GTK_OBJECT (widget),</div><div class='del'>-				"card", match,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget (ui, "custom-new-card");</div><div class='del'>-		gtk_object_set (GTK_OBJECT (widget),</div><div class='del'>-				"card", card,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (widget), "clicked",</div><div class='del'>-				    GTK_SIGNAL_FUNC (clicked), lookup);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_merging_book_add_card (EBook           *book,</div><div class='del'>-			      ECard           *card,</div><div class='del'>-			      EBookIdCallback  cb,</div><div class='del'>-			      gpointer         closure)</div><div class='del'>-{</div><div class='del'>-	ECardMergingLookup *lookup;</div><div class='del'>-</div><div class='del'>-	lookup = g_new (ECardMergingLookup, 1);</div><div class='del'>-</div><div class='del'>-	lookup-&gt;op = E_CARD_MERGING_ADD;</div><div class='del'>-	lookup-&gt;book = book;</div><div class='del'>-	lookup-&gt;card = card;</div><div class='del'>-	lookup-&gt;id_cb = cb;</div><div class='del'>-	lookup-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	e_card_locate_match_full (book, card, NULL, match_query_callback, lookup);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_card_merging_book_commit_card (EBook                 *book,</div><div class='del'>-				 ECard                 *card,</div><div class='del'>-				 EBookCallback          cb,</div><div class='del'>-				 gpointer               closure)</div><div class='del'>-{</div><div class='del'>-	ECardMergingLookup *lookup;</div><div class='del'>-	GList *avoid;</div><div class='del'>-	</div><div class='del'>-	lookup = g_new (ECardMergingLookup, 1);</div><div class='del'>-</div><div class='del'>-	lookup-&gt;op = E_CARD_MERGING_COMMIT;</div><div class='del'>-	lookup-&gt;book = book;</div><div class='del'>-	lookup-&gt;card = card;</div><div class='del'>-	lookup-&gt;cb = cb;</div><div class='del'>-	lookup-&gt;closure = closure;</div><div class='del'>-</div><div class='del'>-	avoid = g_list_append (NULL, card);</div><div class='del'>-</div><div class='del'>-	e_card_locate_match_full (book, card, avoid, match_query_callback, lookup);</div><div class='del'>-</div><div class='del'>-	g_list_free (avoid);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_card_merging_create_old_card(gchar *name,</div><div class='del'>-			       gchar *string1, gchar *string2,</div><div class='del'>-			       gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_card_merging_create_old_card(gchar *name,</div><div class='del'>-			     gchar *string1, gchar *string2,</div><div class='del'>-			     gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	return e_minicard_widget_new ();</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/merging/e-card-merging.h b/addressbook/gui/merging/e-card-merging.h<br/>deleted file mode 100644<br/>index c4d9483beb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/merging/e-card-merging.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/merging/e-card-merging.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * The Evolution addressbook client object.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CARD_MERGING_H__</div><div class='del'>-#define __E_CARD_MERGING_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-gboolean  e_card_merging_book_add_card     (EBook           *book,</div><div class='del'>-					    ECard           *card,</div><div class='del'>-					    EBookIdCallback  cb,</div><div class='del'>-					    gpointer         closure);</div><div class='del'>-gboolean  e_card_merging_book_commit_card  (EBook           *book,</div><div class='del'>-					    ECard           *card,</div><div class='del'>-					    EBookCallback    cb,</div><div class='del'>-					    gpointer         closure);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_CARD_MERGING_H__ */</div><div class='head'>diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore<br/>deleted file mode 100644<br/>index d6c55c7345..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/search/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am<br/>deleted file mode 100644<br/>index db4117c785..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/search/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-ruledir = $(datadir)/evolution</div><div class='del'>-rule_DATA = addresstypes.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = addresstypes.xml</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text			\</div><div class='del'>-	-I$(top_srcdir)/widgets/misc			\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libeaddressbooksearch.a</div><div class='del'>-</div><div class='del'>-libeaddressbooksearch_a_SOURCES =		\</div><div class='del'>-	e-addressbook-search-dialog.c		\</div><div class='del'>-	e-addressbook-search-dialog.h</div><div class='head'>diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml<br/>deleted file mode 100644<br/>index 4ee23af613..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/addresstypes.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/search/addresstypes.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filterdescription&gt;</div><div class='del'>-&lt;partset&gt;</div><div class='del'>- &lt;part name="name"&gt;</div><div class='del'>-  &lt;title&gt;Name&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="name-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(contains "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (contains "full_name" ${name}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(is "full_name" ${name})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (is "full_name" ${name}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="begin"&gt;</div><div class='del'>-        &lt;title&gt;begins with&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(beginswith "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="end"&gt;</div><div class='del'>-        &lt;title&gt;ends in&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(endswith "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="name"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="email"&gt;</div><div class='del'>-  &lt;title&gt;Email&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="email-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(contains "email" ${email})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (contains "email" ${email}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(is "email" ${email})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (is "email" ${email}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="address" name="email"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="category"&gt;</div><div class='del'>-  &lt;title&gt;Category&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="category-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(contains "category" ${category})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (contains "category" ${category}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(is "category" ${category})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (is "category" ${category}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="category"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="sexp"&gt;</div><div class='del'>-   &lt;title&gt;Expression&lt;/title&gt;</div><div class='del'>-   &lt;input type="code" name="code"/&gt;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-&lt;/partset&gt;</div><div class='del'>-&lt;/filterdescription&gt;</div><div class='head'>diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c<br/>deleted file mode 100644<br/>index 2dbe9b1e7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/e-addressbook-search-dialog.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/search/e-addressbook-search-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-addressbook-search-dialog.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-addressbook-search-dialog.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);</div><div class='del'>-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);</div><div class='del'>-static void e_addressbook_search_dialog_destroy       (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeDialog *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_dialog_get_type())</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_search_dialog_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type)</div><div class='del'>-	{</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EAddressbookSearchDialog",</div><div class='del'>-			sizeof (EAddressbookSearchDialog),</div><div class='del'>-			sizeof (EAddressbookSearchDialogClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_search_dialog_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_search_dialog_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy       = e_addressbook_search_dialog_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	view-&gt;context = rule_context_new();</div><div class='del'>-	/* FIXME: hide this in a class */</div><div class='del'>-	rule_context_add_part_set(view-&gt;context, "partset", filter_part_get_type(),</div><div class='del'>-				  rule_context_add_part, rule_context_next_part);</div><div class='del'>-	rule_context_load(view-&gt;context, SEARCH_RULE_DIR "/addresstypes.xml", "");</div><div class='del'>-	view-&gt;rule = filter_rule_new();</div><div class='del'>-	part = rule_context_next_part(view-&gt;context, NULL);</div><div class='del'>-	if (part == NULL) {</div><div class='del'>-		g_warning("Problem loading search for addressbook no parts to load");</div><div class='del'>-		return gtk_entry_new();</div><div class='del'>-	} else {</div><div class='del'>-		filter_rule_add_part(view-&gt;rule, filter_part_clone(part));</div><div class='del'>-		return filter_rule_get_widget(view-&gt;rule, view-&gt;context);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_query (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	filter_rule_build_code(view-&gt;rule, out);</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	printf("Searching using %s\n", ret);</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_press (GtkWidget *widget, int button, EAddressbookSearchDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	char *query;</div><div class='del'>-</div><div class='del'>-	if (button == 0) {</div><div class='del'>-		query = get_query(dialog);</div><div class='del'>-		gtk_object_set(GTK_OBJECT(dialog-&gt;view),</div><div class='del'>-			       "query", query,</div><div class='del'>-			       NULL);</div><div class='del'>-		g_free(query);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog = GNOME_DIALOG (view);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);</div><div class='del'>-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));</div><div class='del'>-	view-&gt;search = get_widget(view);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(dialog-&gt;vbox), view-&gt;search, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show(view-&gt;search);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_buttons(dialog,</div><div class='del'>-				    _("Search"),</div><div class='del'>-				    GNOME_STOCK_BUTTON_CLOSE, NULL);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_set_default(dialog, 0);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(button_press), view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_addressbook_search_dialog_new (EAddressbookView *addr_view)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());</div><div class='del'>-	view-&gt;view = addr_view;</div><div class='del'>-	return GTK_WIDGET(view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *view;</div><div class='del'>-</div><div class='del'>-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)view-&gt;context);</div><div class='del'>-	gtk_object_unref((GtkObject *)view-&gt;rule);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS(parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h<br/>deleted file mode 100644<br/>index a8c4067d29..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/e-addressbook-search-dialog.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/search/e-addressbook-search-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-view-widget.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__</div><div class='del'>-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-view.h"</div><div class='del'>-#include "filter/rule-context.h"</div><div class='del'>-#include "filter/filter-rule.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;</div><div class='del'>-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearchDialog</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-</div><div class='del'>-	GtkWidget *search;</div><div class='del'>-</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-</div><div class='del'>-	RuleContext *context;</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearchDialogClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType    e_addressbook_search_dialog_get_type (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_search_dialog_new (EAddressbookView *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore<br/>deleted file mode 100644<br/>index 472fd2593f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-minicard-label-test</div><div class='del'>-minicard-test</div><div class='del'>-minicard-view-test</div><div class='del'>-minicard-widget-test</div><div class='del'>-reflow-test</div><div class='head'>diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am<br/>deleted file mode 100644<br/>index fe1b29d7c6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-minicard\"			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/merging		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/component	\</div><div class='del'>-	-I$(top_srcdir)/widgets/misc			\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libeminicard.a</div><div class='del'>-</div><div class='del'>-libeminicard_a_SOURCES =			\</div><div class='del'>-	e-addressbook-reflow-adapter.c		\</div><div class='del'>-	e-addressbook-reflow-adapter.h		\</div><div class='del'>-	e-addressbook-table-adapter.c		\</div><div class='del'>-	e-addressbook-table-adapter.h		\</div><div class='del'>-	e-addressbook-model.c			\</div><div class='del'>-	e-addressbook-model.h			\</div><div class='del'>-	e-addressbook-util.c			\</div><div class='del'>-	e-addressbook-util.h			\</div><div class='del'>-	e-addressbook-view.c			\</div><div class='del'>-	e-addressbook-view.h			\</div><div class='del'>-	e-minicard-control.c			\</div><div class='del'>-	e-minicard-control.h			\</div><div class='del'>-	e-minicard-label.c			\</div><div class='del'>-	e-minicard-label.h			\</div><div class='del'>-	e-minicard-view-widget.c		\</div><div class='del'>-	e-minicard-view-widget.h		\</div><div class='del'>-	e-minicard-view.c			\</div><div class='del'>-	e-minicard-view.h			\</div><div class='del'>-	e-minicard-widget.c			\</div><div class='del'>-	e-minicard-widget.h			\</div><div class='del'>-	e-minicard.c				\</div><div class='del'>-	e-minicard.h				\</div><div class='del'>-	gal-view-factory-minicard.c		\</div><div class='del'>-	gal-view-factory-minicard.h		\</div><div class='del'>-	gal-view-minicard.c			\</div><div class='del'>-	gal-view-minicard.h</div><div class='del'>-</div><div class='del'>-#noinst_PROGRAMS =				\</div><div class='del'>-#	 minicard-widget-test			\</div><div class='del'>-#	 minicard-label-test			\</div><div class='del'>-#	 minicard-test</div><div class='del'>-##	reflow-test</div><div class='del'>-##	minicard-view-test</div><div class='del'>-#</div><div class='del'>-#minicard_label_test_SOURCES = 	\</div><div class='del'>-#	 test-minicard-label.c</div><div class='del'>-#</div><div class='del'>-#minicard_label_test_LDADD =				\</div><div class='del'>-#	 libeminicard.a					\</div><div class='del'>-#	 $(EVOLUTION_ADDRESSBOOK_LIBS)			\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la</div><div class='del'>-#</div><div class='del'>-#minicard_test_SOURCES = 	\</div><div class='del'>-#	 test-minicard.c</div><div class='del'>-#</div><div class='del'>-#minicard_test_LDADD =							\</div><div class='del'>-#	 libeminicard.a							\</div><div class='del'>-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	 $(top_builddir)/libversit/libversit.la				\</div><div class='del'>-#	 $(top_builddir)/e-util/ename/libename.la			\</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \</div><div class='del'>-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\</div><div class='del'>-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	$(EVOLUTION_ADDRESSBOOK_LIBS)					\</div><div class='del'>-#	 libeminicard.a</div><div class='del'>-#</div><div class='del'>-#reflow_test_SOURCES = 	\</div><div class='del'>-#	 test-reflow.c</div><div class='del'>-#</div><div class='del'>-#reflow_test_LDADD =							\</div><div class='del'>-#	 libeminicard.a							\</div><div class='del'>-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	 $(top_builddir)/libversit/libversit.la				\</div><div class='del'>-#	 $(top_builddir)/e-util/ename/libename.la			\</div><div class='del'>-#	 $(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\</div><div class='del'>-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	$(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-</div><div class='del'>-#minicard_view_test_SOURCES = 	\</div><div class='del'>-#	test-minicard-view.c</div><div class='del'>-</div><div class='del'>-#minicard_view_test_LDADD =						\</div><div class='del'>-#	$(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-#	libeminicard.a							\</div><div class='del'>-#	$(top_builddir)/addressbook/backend/ebook/libebook.la		\</div><div class='del'>-#	$(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	$(top_builddir)/libversit/libversit.la				\</div><div class='del'>-#	$(top_builddir)/addressbook/ename/libename.la			\</div><div class='del'>-#	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\</div><div class='del'>-#	$(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-#	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-#</div><div class='del'>-#minicard_widget_test_SOURCES = 	\</div><div class='del'>-#	 e-minicard-widget-test.c</div><div class='del'>-#</div><div class='del'>-#minicard_widget_test_LDADD =						\</div><div class='del'>-#	 libeminicard.a							\</div><div class='del'>-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	 $(top_builddir)/libversit/libversit.la				\</div><div class='del'>-#	 $(top_builddir)/e-util/ename/libename.la			\</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\</div><div class='del'>-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-#	 $(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\</div><div class='del'>-#	$(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = </div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c<br/>deleted file mode 100644<br/>index 5647e1d88e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,600 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Christopher James Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE gtk_object_get_type()</div><div class='del'>-GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EAddressbookModel callbacks</div><div class='del'>- * These are the callbacks that define the behavior of our custom model.</div><div class='del'>- */</div><div class='del'>-static void e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_EDITABLE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	WRITABLE_STATUS,</div><div class='del'>-	STATUS_MESSAGE,</div><div class='del'>-	FOLDER_BAR_MESSAGE,</div><div class='del'>-	CARD_ADDED,</div><div class='del'>-	CARD_REMOVED,</div><div class='del'>-	CARD_CHANGED,</div><div class='del'>-	MODEL_CHANGED,</div><div class='del'>-	STOP_STATE_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define COLS (E_CARD_SIMPLE_FIELD_LAST)</div><div class='del'>-</div><div class='del'>-static guint e_addressbook_model_signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_data (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; model-&gt;data_count; i++ ) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(model-&gt;data);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;allocated_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_book_view(EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;create_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;create_card_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;remove_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;remove_card_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;modify_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;modify_card_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;status_message_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;status_message_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;sequence_complete_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;sequence_complete_id);</div><div class='del'>-</div><div class='del'>-	model-&gt;create_card_id = 0;</div><div class='del'>-	model-&gt;remove_card_id = 0;</div><div class='del'>-	model-&gt;modify_card_id = 0;</div><div class='del'>-	model-&gt;status_message_id = 0;</div><div class='del'>-	model-&gt;sequence_complete_id = 0;</div><div class='del'>-</div><div class='del'>-	model-&gt;search_in_progress = FALSE;</div><div class='del'>-</div><div class='del'>-	if (model-&gt;book_view) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book_view));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;book_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_destroy(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;get_view_idle) {</div><div class='del'>-		g_source_remove(model-&gt;get_view_idle);</div><div class='del'>-		model-&gt;get_view_idle = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remove_book_view(model);</div><div class='del'>-	free_data (model);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;book) {</div><div class='del'>-		if (model-&gt;writable_status_id)</div><div class='del'>-			gtk_signal_disconnect(GTK_OBJECT (model-&gt;book),</div><div class='del'>-					      model-&gt;writable_status_id);</div><div class='del'>-</div><div class='del'>-		model-&gt;writable_status_id = 0;</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book));</div><div class='del'>-		model-&gt;book = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_folder_bar_message (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	int count;</div><div class='del'>-	char *message;</div><div class='del'>-</div><div class='del'>-	count = model-&gt;data_count;</div><div class='del'>-</div><div class='del'>-	switch (count) {</div><div class='del'>-	case 0:</div><div class='del'>-		message = g_strdup (_("No cards"));</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		message = g_strdup (_("1 card"));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		message = g_strdup_printf (_("%d cards"), count);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [FOLDER_BAR_MESSAGE],</div><div class='del'>-			 message);</div><div class='del'>-</div><div class='del'>-	g_free (message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card(EBookView *book_view,</div><div class='del'>-	    const GList *cards,</div><div class='del'>-	    EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	int old_count = model-&gt;data_count;</div><div class='del'>-	int length = g_list_length ((GList *)cards);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;data_count + length &gt; model-&gt;allocated_count) {</div><div class='del'>-		while (model-&gt;data_count + length &gt; model-&gt;allocated_count)</div><div class='del'>-			model-&gt;allocated_count = model-&gt;allocated_count * 2 + 1;</div><div class='del'>-		model-&gt;data = g_renew(ECard *, model-&gt;data, model-&gt;allocated_count);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</div><div class='del'>-		model-&gt;data[model-&gt;data_count++] = cards-&gt;data;</div><div class='del'>-		gtk_object_ref (cards-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [CARD_ADDED],</div><div class='del'>-			 old_count, model-&gt;data_count - old_count);</div><div class='del'>-</div><div class='del'>-	update_folder_bar_message (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card(EBookView *book_view,</div><div class='del'>-	    const char *id,</div><div class='del'>-	    EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; model-&gt;data_count; i++) {</div><div class='del'>-		if ( !strcmp(e_card_get_id(model-&gt;data[i]), id) ) {</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-			memmove(model-&gt;data + i, model-&gt;data + i + 1, (model-&gt;data_count - i - 1) * sizeof (ECard *));</div><div class='del'>-			model-&gt;data_count--;</div><div class='del'>-</div><div class='del'>-			gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-					 e_addressbook_model_signals [CARD_REMOVED],</div><div class='del'>-					 i);</div><div class='del'>-			update_folder_bar_message (model);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card(EBookView *book_view,</div><div class='del'>-	    const GList *cards,</div><div class='del'>-	    EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</div><div class='del'>-		int i;</div><div class='del'>-		for ( i = 0; i &lt; model-&gt;data_count; i++) {</div><div class='del'>-			if ( !strcmp(e_card_get_id(model-&gt;data[i]), e_card_get_id(E_CARD(cards-&gt;data))) ) {</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(model-&gt;data[i]));</div><div class='del'>-				model-&gt;data[i] = e_card_duplicate(E_CARD(cards-&gt;data));</div><div class='del'>-				gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-						 e_addressbook_model_signals [CARD_CHANGED],</div><div class='del'>-						 i);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_message (EBookView *book_view,</div><div class='del'>-		char* status,</div><div class='del'>-		EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [STATUS_MESSAGE],</div><div class='del'>-			 status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sequence_complete (EBookView *book_view,</div><div class='del'>-		   EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;search_in_progress = FALSE;</div><div class='del'>-	status_message (book_view, NULL, model);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-writable_status (EBook *book,</div><div class='del'>-		 gboolean writable,</div><div class='del'>-		 EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	if (!model-&gt;editable_set) {</div><div class='del'>-		model-&gt;editable = writable;</div><div class='del'>-</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-				 e_addressbook_model_signals [WRITABLE_STATUS],</div><div class='del'>-				 writable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_model_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = addressbook_destroy;</div><div class='del'>-	object_class-&gt;set_arg   = e_addressbook_model_set_arg;</div><div class='del'>-	object_class-&gt;get_arg   = e_addressbook_model_get_arg;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookModel::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookModel::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookModel::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [WRITABLE_STATUS] =</div><div class='del'>-		gtk_signal_new ("writable_status",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, writable_status),</div><div class='del'>-				gtk_marshal_NONE__BOOL,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_BOOL);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [STATUS_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("status_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, status_message),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [FOLDER_BAR_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("folder_bar_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, folder_bar_message),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [CARD_ADDED] =</div><div class='del'>-		gtk_signal_new ("card_added",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_added),</div><div class='del'>-				gtk_marshal_NONE__INT_INT,</div><div class='del'>-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [CARD_REMOVED] =</div><div class='del'>-		gtk_signal_new ("card_removed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_removed),</div><div class='del'>-				gtk_marshal_NONE__INT,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [CARD_CHANGED] =</div><div class='del'>-		gtk_signal_new ("card_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_changed),</div><div class='del'>-				gtk_marshal_NONE__INT,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [MODEL_CHANGED] =</div><div class='del'>-		gtk_signal_new ("model_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, model_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_addressbook_model_signals [STOP_STATE_CHANGED] =</div><div class='del'>-		gtk_signal_new ("stop_state_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, stop_state_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_addressbook_model_signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);</div><div class='del'>-	model-&gt;book = NULL;</div><div class='del'>-	model-&gt;query = g_strdup("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-	model-&gt;book_view = NULL;</div><div class='del'>-	model-&gt;get_view_idle = 0;</div><div class='del'>-	model-&gt;create_card_id = 0;</div><div class='del'>-	model-&gt;remove_card_id = 0;</div><div class='del'>-	model-&gt;modify_card_id = 0;</div><div class='del'>-	model-&gt;status_message_id = 0;</div><div class='del'>-	model-&gt;writable_status_id = 0;</div><div class='del'>-	model-&gt;sequence_complete_id = 0;</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;allocated_count = 0;</div><div class='del'>-	model-&gt;search_in_progress = FALSE;</div><div class='del'>-	model-&gt;editable = FALSE;</div><div class='del'>-	model-&gt;editable_set = FALSE;</div><div class='del'>-	model-&gt;first_get_view = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = closure;</div><div class='del'>-</div><div class='del'>-	remove_book_view(model);</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (_("Error getting book view"), status);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;book_view = book_view;</div><div class='del'>-	if (model-&gt;book_view)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model-&gt;book_view));</div><div class='del'>-	model-&gt;create_card_id = gtk_signal_connect(GTK_OBJECT(model-&gt;book_view),</div><div class='del'>-						  "card_added",</div><div class='del'>-						  GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-						  model);</div><div class='del'>-	model-&gt;remove_card_id = gtk_signal_connect(GTK_OBJECT(model-&gt;book_view),</div><div class='del'>-						  "card_removed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(remove_card),</div><div class='del'>-						  model);</div><div class='del'>-	model-&gt;modify_card_id = gtk_signal_connect(GTK_OBJECT(model-&gt;book_view),</div><div class='del'>-						  "card_changed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(modify_card),</div><div class='del'>-						  model);</div><div class='del'>-	model-&gt;status_message_id = gtk_signal_connect(GTK_OBJECT(model-&gt;book_view),</div><div class='del'>-						      "status_message",</div><div class='del'>-						      GTK_SIGNAL_FUNC(status_message),</div><div class='del'>-						      model);</div><div class='del'>-	model-&gt;sequence_complete_id = gtk_signal_connect(GTK_OBJECT(model-&gt;book_view),</div><div class='del'>-							 "sequence_complete",</div><div class='del'>-							 GTK_SIGNAL_FUNC(sequence_complete),</div><div class='del'>-							 model);</div><div class='del'>-</div><div class='del'>-	free_data (model);</div><div class='del'>-</div><div class='del'>-	model-&gt;search_in_progress = TRUE;</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [MODEL_CHANGED]);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_view (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;book &amp;&amp; model-&gt;query) {</div><div class='del'>-		if (model-&gt;first_get_view) {</div><div class='del'>-			char *capabilities;</div><div class='del'>-			capabilities = e_book_get_static_capabilities (model-&gt;book);</div><div class='del'>-			if (capabilities &amp;&amp; strstr (capabilities, "local")) {</div><div class='del'>-				e_book_get_book_view (model-&gt;book, model-&gt;query, book_view_loaded, model);</div><div class='del'>-			} else {</div><div class='del'>-				remove_book_view(model);</div><div class='del'>-				free_data (model);</div><div class='del'>-				gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-						 e_addressbook_model_signals [MODEL_CHANGED]);</div><div class='del'>-				gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-						 e_addressbook_model_signals [STOP_STATE_CHANGED]);</div><div class='del'>-			}</div><div class='del'>-			model-&gt;first_get_view = FALSE;</div><div class='del'>-			g_free (capabilities);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			e_book_get_book_view (model-&gt;book, model-&gt;query, book_view_loaded, model);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;get_view_idle = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_addressbook_model_get_card(EAddressbookModel *model,</div><div class='del'>-			     int                row)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;data &amp;&amp; 0 &lt;= row &amp;&amp; row &lt; model-&gt;data_count) {</div><div class='del'>-		ECard *card;</div><div class='del'>-		card = e_card_duplicate (model-&gt;data[row]);</div><div class='del'>-		return card;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECard *</div><div class='del'>-e_addressbook_model_peek_card(EAddressbookModel *model,</div><div class='del'>-			      int                row)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;data &amp;&amp; 0 &lt;= row &amp;&amp; row &lt; model-&gt;data_count) {</div><div class='del'>-		return model-&gt;data[row];</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_ADDRESSBOOK_MODEL (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (model-&gt;book) {</div><div class='del'>-			if (model-&gt;writable_status_id)</div><div class='del'>-				gtk_signal_disconnect(GTK_OBJECT (model-&gt;book),</div><div class='del'>-						      model-&gt;writable_status_id);</div><div class='del'>-</div><div class='del'>-			model-&gt;writable_status_id = 0;</div><div class='del'>-</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(model-&gt;book));</div><div class='del'>-		}</div><div class='del'>-		model-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		if (model-&gt;book) {</div><div class='del'>-			model-&gt;first_get_view = TRUE;</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(model-&gt;book));</div><div class='del'>-			if (model-&gt;get_view_idle == 0)</div><div class='del'>-				model-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, model);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT(model-&gt;book),</div><div class='del'>-					    "writable_status",</div><div class='del'>-					    writable_status, model);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		if (model-&gt;query)</div><div class='del'>-			g_free(model-&gt;query);</div><div class='del'>-		model-&gt;query = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (model-&gt;get_view_idle == 0)</div><div class='del'>-			model-&gt;get_view_idle = g_idle_add((GSourceFunc)get_view, model);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		model-&gt;editable = GTK_VALUE_BOOL (*arg);</div><div class='del'>-		model-&gt;editable_set = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *e_addressbook_model;</div><div class='del'>-</div><div class='del'>-	e_addressbook_model = E_ADDRESSBOOK_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_addressbook_model-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(e_addressbook_model-&gt;query);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_addressbook_model-&gt;editable;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EAddressbookModel",</div><div class='del'>-			sizeof (EAddressbookModel),</div><div class='del'>-			sizeof (EAddressbookModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_model_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EAddressbookModel*</div><div class='del'>-e_addressbook_model_new (void)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_addressbook_model_get_type ());</div><div class='del'>-	</div><div class='del'>-	return et;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void   e_addressbook_model_stop    (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	remove_book_view(model);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (model),</div><div class='del'>-			 e_addressbook_model_signals [STATUS_MESSAGE],</div><div class='del'>-			 "Search Interrupted.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_model_can_stop (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;search_in_progress;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_model_force_folder_bar_message (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	update_folder_bar_message (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_addressbook_model_card_count (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;data_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_addressbook_model_card_at (EAddressbookModel *model, int index)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;data[index];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_model_editable (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;editable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EBook *</div><div class='del'>-e_addressbook_model_get_ebook (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;book;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h<br/>deleted file mode 100644<br/>index 5e018388b8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-#define _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-view.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_MODEL_TYPE        (e_addressbook_model_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_MODEL(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModel))</div><div class='del'>-#define E_ADDRESSBOOK_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModelClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_MODEL(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_MODEL_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_MODEL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookModel EAddressbookModel;</div><div class='del'>-typedef struct _EAddressbookModelClass EAddressbookModelClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookModel {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	EBook *book;</div><div class='del'>-	char *query;</div><div class='del'>-	EBookView *book_view;</div><div class='del'>-</div><div class='del'>-	int get_view_idle;</div><div class='del'>-</div><div class='del'>-	ECard **data;</div><div class='del'>-	int data_count;</div><div class='del'>-	int allocated_count;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id, status_message_id, writable_status_id, sequence_complete_id;</div><div class='del'>-</div><div class='del'>-	guint search_in_progress : 1;</div><div class='del'>-	guint editable : 1;</div><div class='del'>-	guint editable_set : 1;</div><div class='del'>-	guint first_get_view : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EAddressbookModelClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals</div><div class='del'>-	 */</div><div class='del'>-	void (*writable_status)    (EAddressbookModel *model, gboolean writable);</div><div class='del'>-	void (*status_message)     (EAddressbookModel *model, const gchar *message);</div><div class='del'>-	void (*folder_bar_message) (EAddressbookModel *model, const gchar *message);</div><div class='del'>-	void (*card_added)         (EAddressbookModel *model, gint index, gint count);</div><div class='del'>-	void (*card_removed)       (EAddressbookModel *model, gint index);</div><div class='del'>-	void (*card_changed)       (EAddressbookModel *model, gint index);</div><div class='del'>-	void (*model_changed)      (EAddressbookModel *model);</div><div class='del'>-	void (*stop_state_changed) (EAddressbookModel *model);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType            e_addressbook_model_get_type                  (void);</div><div class='del'>-EAddressbookModel *e_addressbook_model_new                       (void);</div><div class='del'>-</div><div class='del'>-/* Returns object with ref count of 1. */</div><div class='del'>-ECard             *e_addressbook_model_get_card                  (EAddressbookModel *model,</div><div class='del'>-								  int                row);</div><div class='del'>-const ECard       *e_addressbook_model_peek_card                 (EAddressbookModel *model,</div><div class='del'>-								  int                row);</div><div class='del'>-EBook             *e_addressbook_model_get_ebook                 (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-void               e_addressbook_model_stop                      (EAddressbookModel *model);</div><div class='del'>-gboolean           e_addressbook_model_can_stop                  (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-void               e_addressbook_model_force_folder_bar_message  (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-int                e_addressbook_model_card_count                (EAddressbookModel *model);</div><div class='del'>-ECard             *e_addressbook_model_card_at                   (EAddressbookModel *model,</div><div class='del'>-								  int                index);</div><div class='del'>-gboolean           e_addressbook_model_editable                  (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-#endif /* _E_ADDRESSBOOK_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c<br/>deleted file mode 100644<br/>index 16e61a2d89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-reflow-adapter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-reflow-adapter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,472 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-addressbook-reflow-adapter.h"</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include "e-addressbook-view.h"</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EAddressbookReflowAdapterPrivate {</div><div class='del'>-	EAddressbookModel *model;</div><div class='del'>-	</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_reflow_model_get_type()</div><div class='del'>-EReflowModel *parent_class;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_EDITABLE,</div><div class='del'>-	ARG_MODEL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DRAG_BEGIN,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_addressbook_reflow_adapter_signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unlink_model(EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;create_card_id);</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;remove_card_id);</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;modify_card_id);</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = 0;</div><div class='del'>-	priv-&gt;remove_card_id = 0;</div><div class='del'>-	priv-&gt;modify_card_id = 0;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	priv-&gt;model = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-count_lines (const gchar *text)</div><div class='del'>-{</div><div class='del'>-	int num_lines = 1;</div><div class='del'>-	gunichar unival;</div><div class='del'>-</div><div class='del'>-	for (text = e_unicode_get_utf8 (text, &amp;unival); (unival &amp;&amp; text); text = e_unicode_get_utf8 (text, &amp;unival)) {</div><div class='del'>-		if (unival == '\n') {</div><div class='del'>-			num_lines ++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return num_lines;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_height (GnomeCanvas *canvas, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	EFont *font = e_font_from_gdk_font (((GtkWidget *) canvas)-&gt;style-&gt;font);</div><div class='del'>-	gint height = e_font_height (font) * count_lines (text) / canvas-&gt;pixels_per_unit;</div><div class='del'>-</div><div class='del'>-	e_font_unref (font);</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_finalize(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);</div><div class='del'>-</div><div class='del'>-	unlink_model (adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_set_width (EReflowModel *erm, int width)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of items in our EReflowModel. */</div><div class='del'>-static int</div><div class='del'>-addressbook_count (EReflowModel *erm)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return e_addressbook_model_card_count (priv-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of items in our EReflowModel. */</div><div class='del'>-static int</div><div class='del'>-addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	/* FIXME */</div><div class='del'>-	ECardSimpleField field;</div><div class='del'>-	int count = 0;</div><div class='del'>-	int height;</div><div class='del'>-	char *string;</div><div class='del'>-	ECardSimple *simple = e_card_simple_new (e_addressbook_model_card_at (priv-&gt;model, i));</div><div class='del'>-</div><div class='del'>-	string = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);</div><div class='del'>-	height = text_height (GNOME_CANVAS_ITEM (parent)-&gt;canvas, string ? string : "") + 10.0;</div><div class='del'>-	g_free(string);</div><div class='del'>-</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING &amp;&amp; count &lt; 5; field++) {</div><div class='del'>-</div><div class='del'>-		if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		string = e_card_simple_get(simple, field);</div><div class='del'>-		if (string &amp;&amp; *string) {</div><div class='del'>-			int this_height;</div><div class='del'>-			int field_text_height;</div><div class='del'>-</div><div class='del'>-			this_height = text_height (GNOME_CANVAS_ITEM (parent)-&gt;canvas, e_card_simple_get_name(simple, field));</div><div class='del'>-</div><div class='del'>-			field_text_height = text_height (GNOME_CANVAS_ITEM (parent)-&gt;canvas, string);</div><div class='del'>-			if (this_height &lt; field_text_height)</div><div class='del'>-				this_height = field_text_height;</div><div class='del'>-</div><div class='del'>-			this_height += 3;</div><div class='del'>-</div><div class='del'>-			height += this_height;</div><div class='del'>-			count ++;</div><div class='del'>-		}</div><div class='del'>-		g_free (string);</div><div class='del'>-	}</div><div class='del'>-	height += 2;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-addressbook_compare (EReflowModel *erm, int n1, int n2)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	ECard *card1, *card2;</div><div class='del'>-	</div><div class='del'>-	card1 = e_addressbook_model_card_at (priv-&gt;model, n1);</div><div class='del'>-	card2 = e_addressbook_model_card_at (priv-&gt;model, n2);</div><div class='del'>-</div><div class='del'>-	if (card1 &amp;&amp; card2) {</div><div class='del'>-		char *file_as1, *file_as2;</div><div class='del'>-		file_as1 = card1-&gt;file_as;</div><div class='del'>-		file_as2 = card2-&gt;file_as;</div><div class='del'>-		if (file_as1 &amp;&amp; file_as2)</div><div class='del'>-			return g_utf8_collate(file_as1, file_as2);</div><div class='del'>-		if (file_as1)</div><div class='del'>-			return -1;</div><div class='del'>-		if (file_as2)</div><div class='del'>-			return 1;</div><div class='del'>-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));</div><div class='del'>-	}</div><div class='del'>-	if (card1)</div><div class='del'>-		return -1;</div><div class='del'>-	if (card2)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	gint ret_val = 0;</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT(adapter),</div><div class='del'>-			 e_addressbook_reflow_adapter_signals[DRAG_BEGIN],</div><div class='del'>-			 event, &amp;ret_val);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItem *</div><div class='del'>-addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	item = gnome_canvas_item_new(parent,</div><div class='del'>-				     e_minicard_get_type(),</div><div class='del'>-				     "card", e_addressbook_model_card_at (priv-&gt;model, i),</div><div class='del'>-				     "editable", e_addressbook_model_editable (priv-&gt;model),</div><div class='del'>-				     NULL);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "selected",</div><div class='del'>-			    GTK_SIGNAL_FUNC(card_selected), emvm);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC(adapter_drag_begin), adapter);</div><div class='del'>-</div><div class='del'>-	return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set(item,</div><div class='del'>-			      "card", e_addressbook_model_card_at (priv-&gt;model, i),</div><div class='del'>-			      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card(EAddressbookModel *model,</div><div class='del'>-	    gint index, gint count,</div><div class='del'>-	    EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_model_items_inserted (E_REFLOW_MODEL (adapter),</div><div class='del'>-				       index,</div><div class='del'>-				       count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card(EAddressbookModel *model,</div><div class='del'>-	    gint index,</div><div class='del'>-	    EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card(EAddressbookModel *model,</div><div class='del'>-	    gint index,</div><div class='del'>-	    EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_model_item_changed (E_REFLOW_MODEL (adapter), index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-model_changed(EAddressbookModel *model,</div><div class='del'>-	      EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"book", GTK_VALUE_OBJECT (*arg),</div><div class='del'>-				NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"query", GTK_VALUE_STRING (*arg),</div><div class='del'>-				NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"editable", GTK_VALUE_BOOL (*arg),</div><div class='del'>-				NULL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK: {</div><div class='del'>-		EBook *book;</div><div class='del'>-		gtk_object_get (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"book", &amp;book,</div><div class='del'>-				NULL);</div><div class='del'>-		if (book)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(book);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case ARG_QUERY: {</div><div class='del'>-		char *query;</div><div class='del'>-		gtk_object_get (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"query", &amp;query,</div><div class='del'>-				NULL);</div><div class='del'>-		GTK_VALUE_STRING (*arg) = query;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case ARG_EDITABLE: {</div><div class='del'>-		gboolean editable;</div><div class='del'>-		gtk_object_get (GTK_OBJECT (priv-&gt;model),</div><div class='del'>-				"editable", &amp;editable,</div><div class='del'>-				NULL);</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = editable;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case ARG_MODEL:</div><div class='del'>-		if (priv-&gt;model)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (priv-&gt;model);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_reflow_adapter_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	EReflowModelClass *model_class = (EReflowModelClass *) object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = addressbook_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = addressbook_get_arg;</div><div class='del'>-	object_class-&gt;finalize = addressbook_finalize;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::model", E_ADDRESSBOOK_MODEL_TYPE,</div><div class='del'>-				 GTK_ARG_READABLE, ARG_MODEL);</div><div class='del'>-</div><div class='del'>-	e_addressbook_reflow_adapter_signals [DRAG_BEGIN] =</div><div class='del'>-		gtk_signal_new ("drag_begin",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookReflowAdapterClass, drag_begin),</div><div class='del'>-				gtk_marshal_INT__POINTER,</div><div class='del'>-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_addressbook_reflow_adapter_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	model_class-&gt;set_width = addressbook_set_width;</div><div class='del'>-	model_class-&gt;count = addressbook_count;</div><div class='del'>-	model_class-&gt;height = addressbook_height;</div><div class='del'>-	model_class-&gt;compare = addressbook_compare;</div><div class='del'>-	model_class-&gt;incarnate = addressbook_incarnate;</div><div class='del'>-	model_class-&gt;reincarnate = addressbook_reincarnate;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_reflow_adapter_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = adapter-&gt;priv = g_new0 (EAddressbookReflowAdapterPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = 0;</div><div class='del'>-	priv-&gt;remove_card_id = 0;</div><div class='del'>-	priv-&gt;modify_card_id = 0;</div><div class='del'>-	priv-&gt;model_changed_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_reflow_adapter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EAddressbookReflowAdapter",</div><div class='del'>-			sizeof (EAddressbookReflowAdapter),</div><div class='del'>-			sizeof (EAddressbookReflowAdapterClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_reflow_adapter_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_reflow_adapter_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,</div><div class='del'>-					EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;model = model;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_added",</div><div class='del'>-						  GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;remove_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_removed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(remove_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;modify_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_changed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(modify_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;model_changed_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						    "model_changed",</div><div class='del'>-						    GTK_SIGNAL_FUNC(model_changed),</div><div class='del'>-						    adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EReflowModel *</div><div class='del'>-e_addressbook_reflow_adapter_new (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapter *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_addressbook_reflow_adapter_get_type ());</div><div class='del'>-</div><div class='del'>-	e_addressbook_reflow_adapter_construct (et, model);</div><div class='del'>-</div><div class='del'>-	return E_REFLOW_MODEL(et);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_addressbook_reflow_adapter_get_card (EAddressbookReflowAdapter *adapter,</div><div class='del'>-				       int index)</div><div class='del'>-{</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return e_addressbook_model_get_card (priv-&gt;model, index);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h<br/>deleted file mode 100644<br/>index b3f6ab9c0d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-reflow-adapter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-reflow-adapter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_</div><div class='del'>-#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-reflow-model.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-selection-model.h&gt;</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-view.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE        (e_addressbook_reflow_adapter_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapter))</div><div class='del'>-#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapterClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookReflowAdapter EAddressbookReflowAdapter;</div><div class='del'>-typedef struct _EAddressbookReflowAdapterPrivate EAddressbookReflowAdapterPrivate;</div><div class='del'>-typedef struct _EAddressbookReflowAdapterClass EAddressbookReflowAdapterClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookReflowAdapter {</div><div class='del'>-	EReflowModel parent;</div><div class='del'>-</div><div class='del'>-	EAddressbookReflowAdapterPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EAddressbookReflowAdapterClass {</div><div class='del'>-	EReflowModelClass parent_class;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals</div><div class='del'>-	 */</div><div class='del'>-	gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType       e_addressbook_reflow_adapter_get_type          (void);</div><div class='del'>-void          e_addressbook_reflow_adapter_construct         (EAddressbookReflowAdapter *adapter,</div><div class='del'>-							      EAddressbookModel         *model);</div><div class='del'>-EReflowModel *e_addressbook_reflow_adapter_new               (EAddressbookModel         *model);</div><div class='del'>-</div><div class='del'>-/* Returns object with ref count of 1. */</div><div class='del'>-ECard        *e_addressbook_reflow_adapter_get_card          (EAddressbookReflowAdapter *adapter,</div><div class='del'>-							      int                        index);</div><div class='del'>-#endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c<br/>deleted file mode 100644<br/>index 08c03863aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-table-adapter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-table-adapter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,406 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include "e-addressbook-table-adapter.h"</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookTableAdapterPrivate {</div><div class='del'>-	EAddressbookModel *model;</div><div class='del'>-</div><div class='del'>-	ECardSimple **simples;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_table_model_get_type()</div><div class='del'>-ETableModelClass *parent_class;</div><div class='del'>-</div><div class='del'>-#define COLS (E_CARD_SIMPLE_FIELD_LAST)</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unlink_model(EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;create_card_id);</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;remove_card_id);</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;modify_card_id);</div><div class='del'>-	gtk_signal_disconnect(GTK_OBJECT (priv-&gt;model),</div><div class='del'>-			      priv-&gt;model_changed_id);</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = 0;</div><div class='del'>-	priv-&gt;remove_card_id = 0;</div><div class='del'>-	priv-&gt;modify_card_id = 0;</div><div class='del'>-	priv-&gt;model_changed_id = 0;</div><div class='del'>-</div><div class='del'>-	/* free up the existing mapping if there is one */</div><div class='del'>-	if (priv-&gt;simples) {</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;count; i ++)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (priv-&gt;simples[i]));</div><div class='del'>-		g_free (priv-&gt;simples);</div><div class='del'>-		priv-&gt;simples = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	priv-&gt;model = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_simple_mapping(EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* free up the existing mapping if there is one */</div><div class='del'>-	if (priv-&gt;simples) {</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;count; i ++)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (priv-&gt;simples[i]));</div><div class='del'>-		g_free (priv-&gt;simples);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* build up our mapping to ECardSimple*'s */</div><div class='del'>-	priv-&gt;count = e_addressbook_model_card_count (priv-&gt;model);</div><div class='del'>-	priv-&gt;simples = g_new (ECardSimple*, priv-&gt;count);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;count; i ++) {</div><div class='del'>-		priv-&gt;simples[i] = e_card_simple_new (e_addressbook_model_card_at (priv-&gt;model, i));</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (priv-&gt;simples[i]));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_destroy(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);</div><div class='del'>-</div><div class='del'>-	unlink_model(adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-addressbook_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return COLS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of rows in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-addressbook_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return e_addressbook_model_card_count (priv-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the value at a particular point in our ETableModel. */</div><div class='del'>-static void *</div><div class='del'>-addressbook_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	const char *value;</div><div class='del'>-</div><div class='del'>-	if ( col &gt;= COLS || row &gt;= e_addressbook_model_card_count (priv-&gt;model) )</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	value = e_card_simple_get_const(priv-&gt;simples[row], col);</div><div class='del'>-</div><div class='del'>-	if (value &amp;&amp; !strncmp (value, "&lt;?xml", 5)) {</div><div class='del'>-		EDestination *dest = e_destination_import (value);</div><div class='del'>-		if (dest) {</div><div class='del'>-			g_free ((gchar *) value);</div><div class='del'>-			value = g_strdup (e_destination_get_address (dest));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return (void *)(value ? value : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-card_modified_cb (EBook* book, EBookStatus status,</div><div class='del'>-		  gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	/* g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__); */</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		e_addressbook_error_dialog (_("Error modifying card"), status);</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	if (e_addressbook_model_editable (priv-&gt;model)) {</div><div class='del'>-		ECard *card;</div><div class='del'>-</div><div class='del'>-		if ( col &gt;= COLS|| row &gt;= e_addressbook_model_card_count (priv-&gt;model) )</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		e_table_model_pre_change(etc);</div><div class='del'>-</div><div class='del'>-		e_card_simple_set(priv-&gt;simples[row],</div><div class='del'>-				  col,</div><div class='del'>-				  val);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(priv-&gt;simples[row]),</div><div class='del'>-			       "card", &amp;card,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		e_card_merging_book_commit_card(e_addressbook_model_get_ebook(priv-&gt;model),</div><div class='del'>-						card, card_modified_cb, NULL);</div><div class='del'>-</div><div class='del'>-		/* XXX do we need this?  shouldn't the commit_card generate a changed signal? */</div><div class='del'>-		e_table_model_cell_changed(etc, col, row);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns whether a particular cell is editable. */</div><div class='del'>-static gboolean</div><div class='del'>-addressbook_is_cell_editable (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if (row &gt;= 0 &amp;&amp; row &lt; e_addressbook_model_card_count (priv-&gt;model))</div><div class='del'>-		card = e_addressbook_model_card_at (priv-&gt;model, row);</div><div class='del'>-	else</div><div class='del'>-		card = NULL;</div><div class='del'>-</div><div class='del'>-	if (!e_addressbook_model_editable(priv-&gt;model))</div><div class='del'>-		return FALSE;</div><div class='del'>-	else if (card &amp;&amp; e_card_evolution_list (card))</div><div class='del'>-		/* we only allow editing of the name and file as for</div><div class='del'>-                   lists */</div><div class='del'>-		return col == E_CARD_SIMPLE_FIELD_FULL_NAME || col == E_CARD_SIMPLE_FIELD_FILE_AS; </div><div class='del'>-	else</div><div class='del'>-		return col &lt; E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etm);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	int col;</div><div class='del'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-	simple = e_card_simple_new(card);</div><div class='del'>-</div><div class='del'>-	for (col = 0; col &lt; E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; col++) {</div><div class='del'>-		const void *val = e_table_model_value_at(source, col, row);</div><div class='del'>-		e_card_simple_set(simple, col, val);</div><div class='del'>-	}</div><div class='del'>-	e_card_simple_sync_card(simple);</div><div class='del'>-	e_card_merging_book_add_card (e_addressbook_model_get_ebook (priv-&gt;model), card, NULL, NULL);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-addressbook_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-addressbook_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-addressbook_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_table_adapter_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	ETableModelClass *model_class = (ETableModelClass *) object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = addressbook_destroy;</div><div class='del'>-</div><div class='del'>-	model_class-&gt;column_count = addressbook_col_count;</div><div class='del'>-	model_class-&gt;row_count = addressbook_row_count;</div><div class='del'>-	model_class-&gt;value_at = addressbook_value_at;</div><div class='del'>-	model_class-&gt;set_value_at = addressbook_set_value_at;</div><div class='del'>-	model_class-&gt;is_cell_editable = addressbook_is_cell_editable;</div><div class='del'>-	model_class-&gt;append_row = addressbook_append_row;</div><div class='del'>-	model_class-&gt;duplicate_value = addressbook_duplicate_value;</div><div class='del'>-	model_class-&gt;free_value = addressbook_free_value;</div><div class='del'>-	model_class-&gt;initialize_value = addressbook_initialize_value;</div><div class='del'>-	model_class-&gt;value_is_empty = addressbook_value_is_empty;</div><div class='del'>-	model_class-&gt;value_to_string = addressbook_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_table_adapter_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = adapter-&gt;priv = g_new0 (EAddressbookTableAdapterPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = 0;</div><div class='del'>-	priv-&gt;remove_card_id = 0;</div><div class='del'>-	priv-&gt;modify_card_id = 0;</div><div class='del'>-	priv-&gt;model_changed_id = 0;</div><div class='del'>-	priv-&gt;simples = NULL;</div><div class='del'>-	priv-&gt;count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card (EAddressbookModel *model,</div><div class='del'>-	     gint index, gint count,</div><div class='del'>-	     EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv-&gt;count += count;</div><div class='del'>-	priv-&gt;simples = g_renew(ECardSimple *, priv-&gt;simples, priv-&gt;count);</div><div class='del'>-	memmove (priv-&gt;simples + index + count, priv-&gt;simples + index, (priv-&gt;count - index - count) * sizeof (ECardSimple *));</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (adapter));</div><div class='del'>-	for (i = 0; i &lt; count; i ++) {</div><div class='del'>-		priv-&gt;simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv-&gt;model, index + i));</div><div class='del'>-	}</div><div class='del'>-	e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card (EAddressbookModel *model,</div><div class='del'>-	     gint index,</div><div class='del'>-	     EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (adapter));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;simples[index]));</div><div class='del'>-	memmove (priv-&gt;simples + index, priv-&gt;simples + index + 1, (priv-&gt;count - index - 1) * sizeof (ECardSimple *));</div><div class='del'>-	priv-&gt;count --;</div><div class='del'>-	e_table_model_rows_deleted (E_TABLE_MODEL (adapter), index, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card (EAddressbookModel *model,</div><div class='del'>-	     gint index,</div><div class='del'>-	     EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (adapter));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;simples[index]));</div><div class='del'>-	priv-&gt;simples[index] = e_card_simple_new (e_addressbook_model_card_at (priv-&gt;model, index));</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (priv-&gt;simples[index]));</div><div class='del'>-	e_table_model_row_changed (E_TABLE_MODEL (adapter), index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-model_changed (EAddressbookModel *model,</div><div class='del'>-	       EAddressbookTableAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (adapter));</div><div class='del'>-	build_simple_mapping (adapter);</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (adapter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_table_adapter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EAddressbookTableAdapter",</div><div class='del'>-			sizeof (EAddressbookTableAdapter),</div><div class='del'>-			sizeof (EAddressbookTableAdapterClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_table_adapter_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_table_adapter_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,</div><div class='del'>-				       EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv = adapter-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;model = model;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_added",</div><div class='del'>-						  GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;remove_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_removed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(remove_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;modify_card_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						  "card_changed",</div><div class='del'>-						  GTK_SIGNAL_FUNC(modify_card),</div><div class='del'>-						  adapter);</div><div class='del'>-	priv-&gt;model_changed_id = gtk_signal_connect(GTK_OBJECT(priv-&gt;model),</div><div class='del'>-						    "model_changed",</div><div class='del'>-						    GTK_SIGNAL_FUNC(model_changed),</div><div class='del'>-						    adapter);</div><div class='del'>-</div><div class='del'>-	build_simple_mapping (adapter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableModel *</div><div class='del'>-e_addressbook_table_adapter_new (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	EAddressbookTableAdapter *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_addressbook_table_adapter_get_type ());</div><div class='del'>-</div><div class='del'>-	e_addressbook_table_adapter_construct (et, model);</div><div class='del'>-</div><div class='del'>-	return E_TABLE_MODEL(et);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h<br/>deleted file mode 100644<br/>index d76434e80a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-table-adapter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-table-adapter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_ADDRESSBOOK_TABLE_ADAPTER_H_</div><div class='del'>-#define _E_ADDRESSBOOK_TABLE_ADAPTER_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-view.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_TABLE_ADAPTER_TYPE        (e_addressbook_table_adapter_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_TABLE_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapter))</div><div class='del'>-#define E_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapterClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))</div><div class='del'>-</div><div class='del'>-/* Virtual Column list:</div><div class='del'>-   0   Email</div><div class='del'>-   1   Full Name</div><div class='del'>-   2   Street</div><div class='del'>-   3   Phone</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookTableAdapter EAddressbookTableAdapter;</div><div class='del'>-typedef struct _EAddressbookTableAdapterPrivate EAddressbookTableAdapterPrivate;</div><div class='del'>-typedef struct _EAddressbookTableAdapterClass EAddressbookTableAdapterClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookTableAdapter {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	EAddressbookTableAdapterPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EAddressbookTableAdapterClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType      e_addressbook_table_adapter_get_type (void);</div><div class='del'>-void         e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,</div><div class='del'>-						    EAddressbookModel *model);</div><div class='del'>-ETableModel *e_addressbook_table_adapter_new (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-#endif /* _E_ADDRESSBOOK_TABLE_ADAPTER_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c<br/>deleted file mode 100644<br/>index b1c40bd483..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,381 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-table-field-chooser.c</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Author: Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-#include &lt;shell/evolution-shell-client.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_error_dialog (const gchar *msg, EBookStatus status)</div><div class='del'>-{</div><div class='del'>-	static char *status_to_string[] = {</div><div class='del'>-		N_("Success"),</div><div class='del'>-		N_("Unknown error"),</div><div class='del'>-		N_("Repository offline"),</div><div class='del'>-		N_("Permission denied"),</div><div class='del'>-		N_("Card not found"),</div><div class='del'>-		N_("Card ID already exists"),</div><div class='del'>-		N_("Protocol not supported"),</div><div class='del'>-		N_("Cancelled"),</div><div class='del'>-		N_("Other error")</div><div class='del'>-	};</div><div class='del'>-	char *error_msg;</div><div class='del'>-</div><div class='del'>-	error_msg = g_strdup_printf ("%s: %s", msg, _(status_to_string [status]));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (gnome_error_dialog (error_msg));</div><div class='del'>-</div><div class='del'>-	g_free (error_msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_addressbook_prompt_save_dialog (GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("Do you want to save changes?"),</div><div class='del'>-					GNOME_MESSAGE_BOX_QUESTION,</div><div class='del'>-					GNOME_STOCK_BUTTON_YES,</div><div class='del'>-					GNOME_STOCK_BUTTON_NO,</div><div class='del'>-					GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-					NULL);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);</div><div class='del'>-</div><div class='del'>-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-added_cb (EBook* book, EBookStatus status, const char *id,</div><div class='del'>-	  gboolean is_list)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (is_list ? _("Error adding list") : _("Error adding card"), status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modified_cb (EBook* book, EBookStatus status,</div><div class='del'>-	     gboolean is_list)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (is_list ? _("Error modifying list") : _("Error modifying card"),</div><div class='del'>-					    status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-deleted_cb (EBook* book, EBookStatus status,</div><div class='del'>-	    gboolean is_list)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (is_list ? _("Error removing list") : _("Error removing card"),</div><div class='del'>-					    status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (GtkObject *editor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EContactEditor *</div><div class='del'>-e_addressbook_show_contact_editor (EBook *book, ECard *card,</div><div class='del'>-				   gboolean is_new_card,</div><div class='del'>-				   gboolean editable)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = e_contact_editor_new (book, card, is_new_card, editable);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "card_added",</div><div class='del'>-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (FALSE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "card_modified",</div><div class='del'>-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (FALSE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "card_deleted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (FALSE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);</div><div class='del'>-</div><div class='del'>-	return ce;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EContactListEditor *</div><div class='del'>-e_addressbook_show_contact_list_editor (EBook *book, ECard *card,</div><div class='del'>-					gboolean is_new_card,</div><div class='del'>-					gboolean editable)</div><div class='del'>-{</div><div class='del'>-	EContactListEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = e_contact_list_editor_new (book, card, is_new_card, editable);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "list_added",</div><div class='del'>-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (TRUE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "list_modified",</div><div class='del'>-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (TRUE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "list_deleted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (TRUE));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_closed_cb), GINT_TO_POINTER (TRUE));</div><div class='del'>-</div><div class='del'>-	e_contact_list_editor_show (ce);</div><div class='del'>-</div><div class='del'>-	return ce;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBook *book;</div><div class='del'>-	GList *list;</div><div class='del'>-	gboolean editable;</div><div class='del'>-} BookAndList;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_cards (EBook *book, GList *list, gboolean editable)</div><div class='del'>-{</div><div class='del'>-	for (; list; list = list-&gt;next) {</div><div class='del'>-		ECard *card = list-&gt;data;</div><div class='del'>-		if (e_card_evolution_list (card))</div><div class='del'>-			e_addressbook_show_contact_list_editor (book, card, FALSE, editable);</div><div class='del'>-		else</div><div class='del'>-			e_addressbook_show_contact_editor (book, card, FALSE, editable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_question_clicked (GtkObject *object, int button, BookAndList *bnl)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog = GNOME_DIALOG (object);</div><div class='del'>-	switch (button) {</div><div class='del'>-	case 0:</div><div class='del'>-		view_cards (bnl-&gt;book, bnl-&gt;list, bnl-&gt;editable);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_close(dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_question_destroyed (GtkObject *object, GList *list)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_show_multiple_cards (EBook *book,</div><div class='del'>-				   GList *list,</div><div class='del'>-				   gboolean editable)</div><div class='del'>-{</div><div class='del'>-	if (list) {</div><div class='del'>-		int length = g_list_length (list);</div><div class='del'>-		if (length &gt; 5) {</div><div class='del'>-			char *string;</div><div class='del'>-			GtkWidget *dialog;</div><div class='del'>-			BookAndList bnl;</div><div class='del'>-</div><div class='del'>-			bnl.book = book;</div><div class='del'>-			bnl.list = list;</div><div class='del'>-			bnl.editable = editable;</div><div class='del'>-</div><div class='del'>-			dialog = gnome_dialog_new (_("Display Cards?"),</div><div class='del'>-						   _("Display Cards"),</div><div class='del'>-						   GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-						   NULL);</div><div class='del'>-</div><div class='del'>-			string = g_strdup_printf (_("You have requested that %d cards be cards. This will cause %d new windows to be\n"</div><div class='del'>-						    "displayed on your screen. Do you really want to display all of these cards?"), length, length);</div><div class='del'>-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), gtk_label_new (string), FALSE, FALSE, 0);</div><div class='del'>-			g_free (string);</div><div class='del'>-</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (dialog), "destroy",</div><div class='del'>-					    GTK_SIGNAL_FUNC (view_question_destroyed), &amp;bnl);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (dialog), "clicked",</div><div class='del'>-					    GTK_SIGNAL_FUNC (view_question_clicked), &amp;bnl);</div><div class='del'>-</div><div class='del'>-			gtk_widget_show_all (dialog);</div><div class='del'>-</div><div class='del'>-			gtk_main();</div><div class='del'>-		} else {</div><div class='del'>-			view_cards (book, list, editable);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct CardCopyProcess_ CardCopyProcess;</div><div class='del'>-</div><div class='del'>-typedef void (*CardCopyDone) (CardCopyProcess *process);</div><div class='del'>-</div><div class='del'>-struct CardCopyProcess_ {</div><div class='del'>-	int count;</div><div class='del'>-	GList *cards;</div><div class='del'>-	EBook *source;</div><div class='del'>-	EBook *destination;</div><div class='del'>-	CardCopyDone done_cb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (_("Error removing card"), status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_delete (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EBook *book = user_data;</div><div class='del'>-	ECard *card = data;</div><div class='del'>-</div><div class='del'>-	e_book_remove_card(book, card, card_deleted_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cards (CardCopyProcess *process)</div><div class='del'>-{</div><div class='del'>-	g_list_foreach (process-&gt;cards,</div><div class='del'>-			do_delete,</div><div class='del'>-			process-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_unref (CardCopyProcess *process)</div><div class='del'>-{</div><div class='del'>-	process-&gt;count --;</div><div class='del'>-	if (process-&gt;count == 0) {</div><div class='del'>-		if (process-&gt;done_cb) {</div><div class='del'>-			process-&gt;done_cb (process);</div><div class='del'>-		}</div><div class='del'>-		e_free_object_list(process-&gt;cards);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (process-&gt;source));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (process-&gt;destination));</div><div class='del'>-		g_free (process);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CardCopyProcess *process = user_data;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (_("Error adding card"), status);</div><div class='del'>-	} else {</div><div class='del'>-		process_unref (process);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_copy (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	CardCopyProcess *process;</div><div class='del'>-</div><div class='del'>-	process = user_data;</div><div class='del'>-	card = data;</div><div class='del'>-</div><div class='del'>-	book = process-&gt;destination;</div><div class='del'>-</div><div class='del'>-	process-&gt;count ++;</div><div class='del'>-	e_book_add_card(book, card, card_added_cb, process);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-got_book_cb (EBook *book, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardCopyProcess *process;</div><div class='del'>-	process = closure;</div><div class='del'>-	if (book) {</div><div class='del'>-		process-&gt;destination = book;</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (book));</div><div class='del'>-		g_list_foreach (process-&gt;cards,</div><div class='del'>-				do_copy,</div><div class='del'>-				process);</div><div class='del'>-	}</div><div class='del'>-	process_unref (process);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern EvolutionShellClient *global_shell_client;</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_transfer_cards (EBook *source, GList *cards /* adopted */, gboolean delete_from_source, GtkWindow *parent_window)</div><div class='del'>-{</div><div class='del'>-	const char *allowed_types[] = { "contacts", NULL };</div><div class='del'>-	GNOME_Evolution_Folder *folder;</div><div class='del'>-	static char *last_uri = NULL;</div><div class='del'>-	CardCopyProcess *process;</div><div class='del'>-	char *desc;</div><div class='del'>-</div><div class='del'>-	if (cards == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (last_uri == NULL)</div><div class='del'>-		last_uri = g_strdup ("");</div><div class='del'>-</div><div class='del'>-	if (cards-&gt;next == NULL) {</div><div class='del'>-		if (delete_from_source)</div><div class='del'>-			desc = _("Move card to");</div><div class='del'>-		else</div><div class='del'>-			desc = _("Copy card to");</div><div class='del'>-	} else {</div><div class='del'>-		if (delete_from_source)</div><div class='del'>-			desc = _("Move cards to");</div><div class='del'>-		else</div><div class='del'>-			desc = _("Copy cards to");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_shell_client_user_select_folder (global_shell_client,</div><div class='del'>-						   parent_window,</div><div class='del'>-						   desc, last_uri, allowed_types,</div><div class='del'>-						   &amp;folder);</div><div class='del'>-	if (!folder)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (strcmp (last_uri, folder-&gt;evolutionUri) != 0) {</div><div class='del'>-		g_free (last_uri);</div><div class='del'>-		last_uri = g_strdup (folder-&gt;evolutionUri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	process = g_new (CardCopyProcess, 1);</div><div class='del'>-	process-&gt;count = 1;</div><div class='del'>-	process-&gt;source = source;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (source));</div><div class='del'>-	process-&gt;cards = cards;</div><div class='del'>-	process-&gt;destination = NULL;</div><div class='del'>-</div><div class='del'>-	if (delete_from_source)</div><div class='del'>-		process-&gt;done_cb = delete_cards;</div><div class='del'>-	else</div><div class='del'>-		process-&gt;done_cb = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_use_address_book_by_uri (folder-&gt;physicalUri, got_book_cb, process);</div><div class='del'>-</div><div class='del'>-	CORBA_free (folder);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h<br/>deleted file mode 100644<br/>index f0681cea4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-addressbook-util.h</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Author: Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_ADDRESSBOOK_UTIL_H__</div><div class='del'>-#define __E_ADDRESSBOOK_UTIL_H__</div><div class='del'>-</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/gui/contact-editor/e-contact-editor.h"</div><div class='del'>-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-void                e_addressbook_error_dialog              (const gchar *msg,</div><div class='del'>-							     EBookStatus  status);</div><div class='del'>-gint                e_addressbook_prompt_save_dialog        (GtkWindow   *parent);</div><div class='del'>-EContactEditor     *e_addressbook_show_contact_editor       (EBook       *book,</div><div class='del'>-							     ECard       *card,</div><div class='del'>-							     gboolean     is_new_card,</div><div class='del'>-							     gboolean     editable);</div><div class='del'>-EContactListEditor *e_addressbook_show_contact_list_editor  (EBook       *book,</div><div class='del'>-							     ECard       *card,</div><div class='del'>-							     gboolean     is_new_card,</div><div class='del'>-							     gboolean     editable);</div><div class='del'>-void                e_addressbook_show_multiple_cards       (EBook       *book,</div><div class='del'>-							     GList       *list,</div><div class='del'>-							     gboolean     editable);</div><div class='del'>-void                e_addressbook_transfer_cards            (EBook       *source,</div><div class='del'>-							     GList       *cards, /* adopted */</div><div class='del'>-							     gboolean     delete_from_source,</div><div class='del'>-							     GtkWindow   *parent_window);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESSBOOK_UTIL_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c<br/>deleted file mode 100644<br/>index 83fab4685e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2025 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-table-field-chooser.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkinvisible.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-factory-etable.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-etable.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-xml-utils.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-</div><div class='del'>-#include "gal-view-factory-minicard.h"</div><div class='del'>-#include "gal-view-minicard.h"</div><div class='del'>-</div><div class='del'>-#include "e-addressbook-view.h"</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-#include "e-addressbook-table-adapter.h"</div><div class='del'>-#include "e-addressbook-reflow-adapter.h"</div><div class='del'>-#include "e-minicard-view-widget.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-</div><div class='del'>-#define SHOW_ALL_SEARCH "(contains \"x-evolution-any-field\" \"\")"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void e_addressbook_view_init		(EAddressbookView		 *card);</div><div class='del'>-static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);</div><div class='del'>-static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_view_destroy (GtkObject *object);</div><div class='del'>-static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);</div><div class='del'>-</div><div class='del'>-static void status_message     (GtkObject *object, const gchar *status, EAddressbookView *eav);</div><div class='del'>-static void folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav);</div><div class='del'>-static void stop_state_changed (GtkObject *object, EAddressbookView *eav);</div><div class='del'>-static void writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav);</div><div class='del'>-static void command_state_change (EAddressbookView *eav);</div><div class='del'>-static void alphabet_state_change (EAddressbookView *eav, gunichar letter);</div><div class='del'>-</div><div class='del'>-static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,</div><div class='del'>-				   EAddressbookView *view);</div><div class='del'>-static void selection_received (GtkWidget *invisible, GtkSelectionData *selection_data,</div><div class='del'>-				guint time, EAddressbookView *view);</div><div class='del'>-static void selection_get (GtkWidget *invisible, GtkSelectionData *selection_data,</div><div class='del'>-			   guint info, guint time_stamp, EAddressbookView *view);</div><div class='del'>-static void invisible_destroyed (GtkWidget *invisible, EAddressbookView *view);</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_TYPE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STATUS_MESSAGE,</div><div class='del'>-	FOLDER_BAR_MESSAGE,</div><div class='del'>-	COMMAND_STATE_CHANGE,</div><div class='del'>-	ALPHABET_STATE_CHANGE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum DndTargetType {</div><div class='del'>-	DND_TARGET_TYPE_VCARD,</div><div class='del'>-};</div><div class='del'>-#define VCARD_TYPE "text/x-vcard"</div><div class='del'>-static GtkTargetEntry drag_types[] = {</div><div class='del'>-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },</div><div class='del'>-};</div><div class='del'>-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);</div><div class='del'>-</div><div class='del'>-static guint e_addressbook_view_signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-static GdkAtom clipboard_atom = GDK_NONE;</div><div class='del'>-</div><div class='del'>-static GalViewCollection *collection = NULL;</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EAddressbookView",</div><div class='del'>-			sizeof (EAddressbookView),</div><div class='del'>-			sizeof (EAddressbookViewClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_view_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-		       	/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_table_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_class_init (EAddressbookViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_table_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_addressbook_view_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_addressbook_view_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_addressbook_view_destroy;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_TYPE);</div><div class='del'>-</div><div class='del'>-	e_addressbook_view_signals [STATUS_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("status_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, status_message),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_addressbook_view_signals [FOLDER_BAR_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("folder_bar_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, folder_bar_message),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_addressbook_view_signals [COMMAND_STATE_CHANGE] =</div><div class='del'>-		gtk_signal_new ("command_state_change",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, command_state_change),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	e_addressbook_view_signals [ALPHABET_STATE_CHANGE] =</div><div class='del'>-		gtk_signal_new ("alphabet_state_change",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, alphabet_state_change),</div><div class='del'>-				gtk_marshal_NONE__UINT,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_UINT);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_addressbook_view_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	if (!clipboard_atom)</div><div class='del'>-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_init (EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	eav-&gt;view_type = E_ADDRESSBOOK_VIEW_NONE;</div><div class='del'>-</div><div class='del'>-	eav-&gt;model = e_addressbook_model_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			    "status_message",</div><div class='del'>-			    GTK_SIGNAL_FUNC (status_message),</div><div class='del'>-			    eav);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			    "folder_bar_message",</div><div class='del'>-			    GTK_SIGNAL_FUNC (folder_bar_message),</div><div class='del'>-			    eav);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			    "stop_state_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (stop_state_changed),</div><div class='del'>-			    eav);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			    "writable_status",</div><div class='del'>-			    GTK_SIGNAL_FUNC (writable_status),</div><div class='del'>-			    eav);</div><div class='del'>-</div><div class='del'>-	eav-&gt;editable = FALSE;</div><div class='del'>-	eav-&gt;book = NULL;</div><div class='del'>-	eav-&gt;query = g_strdup (SHOW_ALL_SEARCH);</div><div class='del'>-</div><div class='del'>-	eav-&gt;object = NULL;</div><div class='del'>-	eav-&gt;widget = NULL;</div><div class='del'>-</div><div class='del'>-	eav-&gt;view_instance = NULL;</div><div class='del'>-	eav-&gt;view_menus = NULL;</div><div class='del'>-	eav-&gt;uic = NULL;</div><div class='del'>-	eav-&gt;current_alphabet_widget = NULL;</div><div class='del'>-</div><div class='del'>-	eav-&gt;invisible = gtk_invisible_new ();</div><div class='del'>-</div><div class='del'>-	gtk_selection_add_target (eav-&gt;invisible,</div><div class='del'>-				  clipboard_atom,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING,</div><div class='del'>-				  0);</div><div class='del'>-		</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;invisible), "selection_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_get), </div><div class='del'>-			    eav);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;invisible), "selection_clear_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_clear_event),</div><div class='del'>-			    eav);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;invisible), "selection_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_received),</div><div class='del'>-			    eav);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT(eav-&gt;invisible), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (invisible_destroyed),</div><div class='del'>-			    eav);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;model) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(eav-&gt;model));</div><div class='del'>-		eav-&gt;model = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;book) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-		eav-&gt;book = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(eav-&gt;query);</div><div class='del'>-	eav-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	eav-&gt;uic = NULL;</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;view_instance) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (eav-&gt;view_instance));</div><div class='del'>-		eav-&gt;view_instance = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;view_menus) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (eav-&gt;view_menus));</div><div class='del'>-		eav-&gt;view_menus = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;clipboard_cards) {</div><div class='del'>-		g_list_foreach (eav-&gt;clipboard_cards, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (eav-&gt;clipboard_cards);</div><div class='del'>-		eav-&gt;clipboard_cards = NULL;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	if (eav-&gt;invisible) {</div><div class='del'>-		gtk_widget_destroy (eav-&gt;invisible);</div><div class='del'>-		eav-&gt;invisible = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_addressbook_view_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	eav-&gt;editable = writable;</div><div class='del'>-	command_state_change (eav);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef JUST_FOR_TRANSLATORS</div><div class='del'>-static char *list [] = {</div><div class='del'>-	N_("* Click here to add a contact *"),</div><div class='del'>-	N_("File As"),</div><div class='del'>-	N_("Full Name"),</div><div class='del'>-	N_("Email"),</div><div class='del'>-	N_("Primary Phone"),</div><div class='del'>-	N_("Assistant Phone"),</div><div class='del'>-	N_("Business Phone"),</div><div class='del'>-	N_("Callback Phone"),</div><div class='del'>-	N_("Company Phone"),</div><div class='del'>-	N_("Home Phone"),</div><div class='del'>-	N_("Organization"),</div><div class='del'>-	N_("Business Address"),</div><div class='del'>-	N_("Home Address"),</div><div class='del'>-	N_("Mobile Phone"),</div><div class='del'>-	N_("Car Phone"),</div><div class='del'>-	N_("Business Fax"),</div><div class='del'>-	N_("Home Fax"),</div><div class='del'>-	N_("Business Phone 2"),</div><div class='del'>-	N_("Home Phone 2"),</div><div class='del'>-	N_("ISDN"),</div><div class='del'>-	N_("Other Phone"),</div><div class='del'>-	N_("Other Fax"),</div><div class='del'>-	N_("Pager"),</div><div class='del'>-	N_("Radio"),</div><div class='del'>-	N_("Telex"),</div><div class='del'>-	N_("TTY"),</div><div class='del'>-	N_("Other Address"),</div><div class='del'>-	N_("Email 2"),</div><div class='del'>-	N_("Email 3"),</div><div class='del'>-	N_("Web Site"),</div><div class='del'>-	N_("Department"),</div><div class='del'>-	N_("Office"),</div><div class='del'>-	N_("Title"),</div><div class='del'>-	N_("Profession"),</div><div class='del'>-	N_("Manager"),</div><div class='del'>-	N_("Assistant"),</div><div class='del'>-	N_("Nickname"),</div><div class='del'>-	N_("Spouse"),</div><div class='del'>-	N_("Note"),</div><div class='del'>-	N_("Free-busy URL"),</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define SPEC "&lt;?xml version=\"1.0\"?&gt;      \</div><div class='del'>-&lt;ETableSpecification click-to-add=\"true\" draw-grid=\"true\" _click-to-add-message=\"* Click here to add a contact *\"&gt;   \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"File As\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"1\" _title=\"Full Name\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"2\" _title=\"Email\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"3\" _title=\"Primary Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"4\" _title=\"Assistant Phone\"  expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"5\" _title=\"Business Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"6\" _title=\"Callback Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"7\" _title=\"Company Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"8\" _title=\"Home Phone\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"9\" _title=\"Organization\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"10\" _title=\"Business Address\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"11\" _title=\"Home Address\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"12\" _title=\"Mobile Phone\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"13\" _title=\"Car Phone\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"14\" _title=\"Business Fax\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"15\" _title=\"Home Fax\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"16\" _title=\"Business Phone 2\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"17\" _title=\"Home Phone 2\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"18\" _title=\"ISDN\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"19\" _title=\"Other Phone\"      expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"20\" _title=\"Other Fax\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"21\" _title=\"Pager\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"22\" _title=\"Radio\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"23\" _title=\"Telex\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"24\" _title=\"TTY\"              expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"25\" _title=\"Other Address\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"26\" _title=\"Email 2\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"27\" _title=\"Email 3\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"28\" _title=\"Web Site\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"29\" _title=\"Department\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"30\" _title=\"Office\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"31\" _title=\"Title\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"32\" _title=\"Profession\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"33\" _title=\"Manager\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"34\" _title=\"Assistant\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"35\" _title=\"Nickname\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"36\" _title=\"Spouse\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"37\" _title=\"Note\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"38\" _title=\"Free-busy URL\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableState&gt;                            \</div><div class='del'>-    &lt;column source=\"0\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"1\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"5\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"2\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"3\"/&gt;                 \</div><div class='del'>-    &lt;grouping&gt;                             \</div><div class='del'>-      &lt;leaf column=\"0\" ascending=\"true\"/&gt; \</div><div class='del'>-    &lt;/grouping&gt;                            \</div><div class='del'>-  &lt;/ETableState&gt;                           \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_collection (void)</div><div class='del'>-{</div><div class='del'>-	GalViewFactory *factory;</div><div class='del'>-	ETableSpecification *spec;</div><div class='del'>-	char *galview;</div><div class='del'>-</div><div class='del'>-	if (collection == NULL) {</div><div class='del'>-		collection = gal_view_collection_new();</div><div class='del'>-</div><div class='del'>-		galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");</div><div class='del'>-		gal_view_collection_set_storage_directories</div><div class='del'>-			(collection,</div><div class='del'>-			 EVOLUTION_DATADIR "/evolution/views/addressbook/",</div><div class='del'>-			 galview);</div><div class='del'>-		g_free(galview);</div><div class='del'>-</div><div class='del'>-		spec = e_table_specification_new();</div><div class='del'>-		e_table_specification_load_from_string(spec, SPEC);</div><div class='del'>-</div><div class='del'>-		factory = gal_view_factory_etable_new (spec);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (spec));</div><div class='del'>-		gal_view_collection_add_factory (collection, factory);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		factory = gal_view_factory_minicard_new ();</div><div class='del'>-		gal_view_collection_add_factory (collection, factory);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		gal_view_collection_load(collection);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-display_view(GalViewInstance *instance,</div><div class='del'>-	     GalView *view,</div><div class='del'>-	     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *address_view = data;</div><div class='del'>-	if (GAL_IS_VIEW_ETABLE(view)) {</div><div class='del'>-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_TABLE);</div><div class='del'>-		gal_view_etable_attach_table (GAL_VIEW_ETABLE(view), e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view-&gt;widget)));</div><div class='del'>-	} else if (GAL_IS_VIEW_MINICARD(view)) {</div><div class='del'>-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-		gal_view_minicard_attach (GAL_VIEW_MINICARD(view), E_MINICARD_VIEW_WIDGET (address_view-&gt;object));</div><div class='del'>-	}</div><div class='del'>-	address_view-&gt;current_view = view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_menus (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;book &amp;&amp; view-&gt;view_instance == NULL) {</div><div class='del'>-		init_collection ();</div><div class='del'>-		view-&gt;view_instance = gal_view_instance_new (collection, e_book_get_uri (view-&gt;book));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view_instance &amp;&amp; view-&gt;uic) {</div><div class='del'>-		view-&gt;view_menus = gal_view_menus_new(view-&gt;view_instance);</div><div class='del'>-		gal_view_menus_apply(view-&gt;view_menus, view-&gt;uic, NULL);</div><div class='del'>-</div><div class='del'>-		display_view (view-&gt;view_instance, gal_view_instance_get_current_view (view-&gt;view_instance), view);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(view-&gt;view_instance), "display_view",</div><div class='del'>-				   display_view, view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (eav-&gt;book) {</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-		}</div><div class='del'>-		if (GTK_VALUE_OBJECT(*arg)) {</div><div class='del'>-			eav-&gt;book = E_BOOK(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			eav-&gt;book = NULL;</div><div class='del'>-</div><div class='del'>-		if (eav-&gt;view_instance) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (eav-&gt;view_instance));</div><div class='del'>-			eav-&gt;view_instance = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_set(GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			       "book", eav-&gt;book,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		setup_menus (eav);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-#if 0 /* This code will mess up ldap a bit.  We need to think about the ramifications of this more. */</div><div class='del'>-		if ((GTK_VALUE_STRING (*arg) == NULL &amp;&amp; !strcmp (eav-&gt;query, SHOW_ALL_SEARCH)) ||</div><div class='del'>-		    (GTK_VALUE_STRING (*arg) != NULL &amp;&amp; !strcmp (eav-&gt;query, GTK_VALUE_STRING (*arg))))</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-		g_free(eav-&gt;query);</div><div class='del'>-		eav-&gt;query = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		if (!eav-&gt;query)</div><div class='del'>-			eav-&gt;query = g_strdup (SHOW_ALL_SEARCH);</div><div class='del'>-		gtk_object_set(GTK_OBJECT(eav-&gt;model),</div><div class='del'>-			       "query", eav-&gt;query,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (eav-&gt;current_alphabet_widget != NULL) {</div><div class='del'>-			GtkWidget *current = eav-&gt;current_alphabet_widget;</div><div class='del'>-</div><div class='del'>-			eav-&gt;current_alphabet_widget = NULL;</div><div class='del'>-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (current), FALSE);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TYPE:</div><div class='del'>-		change_view_type(eav, GTK_VALUE_ENUM(*arg));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (eav-&gt;book)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav-&gt;book);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = eav-&gt;query;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TYPE:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = eav-&gt;view_type;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESelectionModel*</div><div class='del'>-get_selection_model (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_MINICARD)</div><div class='del'>-		return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view-&gt;object));</div><div class='del'>-	else</div><div class='del'>-		return e_table_get_selection_model (e_table_scrolled_get_table (E_TABLE_SCROLLED(view-&gt;widget)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Popup menu stuff */</div><div class='del'>-typedef struct {</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	EPopupMenu *submenu;</div><div class='del'>-	gpointer closure;</div><div class='del'>-} CardAndBook;</div><div class='del'>-</div><div class='del'>-static ESelectionModel*</div><div class='del'>-card_and_book_get_selection_model (CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	return get_selection_model (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_and_book_free (CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *view = card_and_book-&gt;view;</div><div class='del'>-	ESelectionModel *selection;</div><div class='del'>-</div><div class='del'>-	if (card_and_book-&gt;submenu)</div><div class='del'>-		gal_view_instance_free_popup_menu (view-&gt;view_instance,</div><div class='del'>-						   card_and_book-&gt;submenu);</div><div class='del'>-</div><div class='del'>-	selection = card_and_book_get_selection_model (card_and_book);</div><div class='del'>-	if (selection)</div><div class='del'>-		e_selection_model_right_click_up(selection);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_card_list_1(gint model_row,</div><div class='del'>-		      gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardAndBook *card_and_book;</div><div class='del'>-	GList **list;</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	card_and_book = closure;</div><div class='del'>-	list = card_and_book-&gt;closure;</div><div class='del'>-	view = card_and_book-&gt;view;</div><div class='del'>-</div><div class='del'>-	card = e_addressbook_model_get_card(view-&gt;model, model_row);</div><div class='del'>-	*list = g_list_prepend(*list, card);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-get_card_list (CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-	ESelectionModel *selection;</div><div class='del'>-</div><div class='del'>-	selection = card_and_book_get_selection_model (card_and_book);</div><div class='del'>-</div><div class='del'>-	if (selection) {</div><div class='del'>-		card_and_book-&gt;closure = &amp;list;</div><div class='del'>-		e_selection_model_foreach (selection, get_card_list_1, card_and_book);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-has_email_address_1(gint model_row,</div><div class='del'>-			  gpointer closure)</div><div class='del'>-{</div><div class='del'>-	CardAndBook *card_and_book;</div><div class='del'>-	gboolean *has_email;</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	const ECard *card;</div><div class='del'>-	EList *email;</div><div class='del'>-</div><div class='del'>-	card_and_book = closure;</div><div class='del'>-	has_email = card_and_book-&gt;closure;</div><div class='del'>-	view = card_and_book-&gt;view;</div><div class='del'>-</div><div class='del'>-	if (*has_email)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	card = e_addressbook_model_peek_card(view-&gt;model, model_row);</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (card),</div><div class='del'>-			"email", &amp;email,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (e_list_length (email) &gt; 0)</div><div class='del'>-		*has_email = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_has_email_address (CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *selection;</div><div class='del'>-	gboolean has_email = FALSE;</div><div class='del'>-</div><div class='del'>-	selection = card_and_book_get_selection_model (card_and_book);</div><div class='del'>-</div><div class='del'>-	if (selection) {</div><div class='del'>-		card_and_book-&gt;closure = &amp;has_email;</div><div class='del'>-		e_selection_model_foreach (selection, has_email_address_1, card_and_book);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return has_email;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	GList *cards = get_card_list (card_and_book);</div><div class='del'>-	if (cards) {</div><div class='del'>-		e_contact_list_save_as(_("Save as VCard"), cards);</div><div class='del'>-		e_free_object_list(cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_as (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	GList *cards = get_card_list (card_and_book);</div><div class='del'>-	if (cards) {</div><div class='del'>-		e_card_list_send(cards, E_CARD_DISPOSITION_AS_ATTACHMENT);</div><div class='del'>-		e_free_object_list(cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_to (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	GList *cards = get_card_list (card_and_book);</div><div class='del'>-</div><div class='del'>-	if (cards) {</div><div class='del'>-		e_card_list_send(cards, E_CARD_DISPOSITION_AS_TO);</div><div class='del'>-		e_free_object_list(cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	GList *cards = get_card_list (card_and_book);</div><div class='del'>-	if (cards) {</div><div class='del'>-		if (cards-&gt;next)</div><div class='del'>-			gtk_widget_show(e_contact_print_card_list_dialog_new(cards));</div><div class='del'>-		else</div><div class='del'>-			gtk_widget_show(e_contact_print_card_dialog_new(cards-&gt;data));</div><div class='del'>-		e_free_object_list(cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-static void</div><div class='del'>-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	GList *cards = get_card_list (card_and_book);</div><div class='del'>-	if (cards) {</div><div class='del'>-		gtk_widget_show(e_contact_list_print_envelope_dialog_new(card_and_book-&gt;card));</div><div class='del'>-		e_free_object_list(cards);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_copy (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-paste (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_paste (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cut (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_cut (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book-&gt;view-&gt;widget)))) {</div><div class='del'>-		EBook *book;</div><div class='del'>-</div><div class='del'>-		GList *list = get_card_list(card_and_book);</div><div class='del'>-		GList *iterator;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card_and_book-&gt;view-&gt;model),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		for (iterator = list; iterator; iterator = iterator-&gt;next) {</div><div class='del'>-			ECard *card = iterator-&gt;data;</div><div class='del'>-			/* Remove the card. */</div><div class='del'>-			e_book_remove_card (book,</div><div class='del'>-					    card,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-		}</div><div class='del'>-		e_free_object_list(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_to_folder (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_copy_to_folder (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-move_to_folder (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_move_to_folder (card_and_book-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_popup_info (GtkWidget *w, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	card_and_book_free (card_and_book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_card (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card_and_book-&gt;view-&gt;model),</div><div class='del'>-		       "book", &amp;book,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_list (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card_and_book-&gt;view-&gt;model),</div><div class='del'>-		       "book", &amp;book,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-sources (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	control = gtk_object_get_data (GTK_OBJECT (gcal), "control");</div><div class='del'>-	if (control == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	shell_view = get_shell_view_interface (control);</div><div class='del'>-	if (shell_view == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ShellView_showSettings (shell_view, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("control_util_show_settings(): Could not show settings");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define POPUP_READONLY_MASK 0x1</div><div class='del'>-#define POPUP_NOSELECTION_MASK 0x2</div><div class='del'>-#define POPUP_NOEMAIL_MASK 0x4</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_popup_menu(EAddressbookView *view, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	CardAndBook *card_and_book;</div><div class='del'>-	GtkMenu *popup;</div><div class='del'>-	EPopupMenu *submenu = NULL;</div><div class='del'>-	ESelectionModel *selection_model;</div><div class='del'>-	gboolean selection = FALSE;</div><div class='del'>-</div><div class='del'>-	EPopupMenu menu[] = {</div><div class='del'>-		E_POPUP_ITEM (N_("New Contact..."), GTK_SIGNAL_FUNC(new_card), POPUP_READONLY_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("New Contact List..."), GTK_SIGNAL_FUNC(new_list), POPUP_READONLY_MASK),</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-#if 0</div><div class='del'>-		E_POPUP_ITEM (N_("Go to Folder..."), GTK_SIGNAL_FUNC (goto_folder), 0),</div><div class='del'>-		E_POPUP_ITEM (N_("Import..."), GTK_SIGNAL_FUNC (import), POPUP_READONLY_MASK),</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-		E_POPUP_ITEM (N_("Search for Contacts..."), GTK_SIGNAL_FUNC (search), 0),</div><div class='del'>-		E_POPUP_ITEM (N_("Addressbook Sources..."), GTK_SIGNAL_FUNC (sources), 0),</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-		E_POPUP_ITEM (N_("Pilot Settings..."), GTK_SIGNAL_FUNC (pilot_settings), 0),</div><div class='del'>-#endif</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-		E_POPUP_ITEM (N_("Save as VCard"), GTK_SIGNAL_FUNC(save_as), POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Forward Contact"), GTK_SIGNAL_FUNC(send_as), POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Send Message to Contact"), GTK_SIGNAL_FUNC(send_to), POPUP_NOSELECTION_MASK | POPUP_NOEMAIL_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Print"), GTK_SIGNAL_FUNC(print), POPUP_NOSELECTION_MASK),</div><div class='del'>-#if 0 /* Envelope printing is disabled for Evolution 1.0. */</div><div class='del'>-		E_POPUP_ITEM (N_("Print Envelope"), GTK_SIGNAL_FUNC(print_envelope), POPUP_NOSELECTION_MASK),</div><div class='del'>-#endif</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-		E_POPUP_ITEM (N_("Copy to folder..."), GTK_SIGNAL_FUNC(copy_to_folder), POPUP_NOSELECTION_MASK), </div><div class='del'>-		E_POPUP_ITEM (N_("Move to folder..."), GTK_SIGNAL_FUNC(move_to_folder), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-		E_POPUP_ITEM (N_("Cut"), GTK_SIGNAL_FUNC (cut), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Copy"), GTK_SIGNAL_FUNC (copy), POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Paste"), GTK_SIGNAL_FUNC (paste), POPUP_READONLY_MASK),</div><div class='del'>-		E_POPUP_ITEM (N_("Delete"), GTK_SIGNAL_FUNC(delete), POPUP_READONLY_MASK | POPUP_NOSELECTION_MASK),</div><div class='del'>-		E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-		E_POPUP_SUBMENU (N_("Current View"), submenu = gal_view_instance_get_popup_menu (view-&gt;view_instance), 0),</div><div class='del'>-		E_POPUP_TERMINATOR</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	card_and_book = g_new(CardAndBook, 1);</div><div class='del'>-	card_and_book-&gt;view = view;</div><div class='del'>-	card_and_book-&gt;submenu = submenu;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(card_and_book-&gt;view));</div><div class='del'>-</div><div class='del'>-	selection_model = card_and_book_get_selection_model (card_and_book);</div><div class='del'>-	if (selection_model)</div><div class='del'>-		selection = e_selection_model_selected_count (selection_model) &gt; 0;</div><div class='del'>-</div><div class='del'>-	popup = e_popup_menu_create (menu,</div><div class='del'>-				     0,</div><div class='del'>-				     (e_addressbook_model_editable (view-&gt;model) ? 0 : POPUP_READONLY_MASK) +</div><div class='del'>-				     (selection ? 0 : POPUP_NOSELECTION_MASK) +</div><div class='del'>-				     (get_has_email_address (card_and_book) ? 0 : POPUP_NOEMAIL_MASK),</div><div class='del'>-				     card_and_book);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (free_popup_info), card_and_book);</div><div class='del'>-	e_popup_menu (popup, event);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Minicard view stuff */</div><div class='del'>-</div><div class='del'>-/* Translators: put here a list of labels you want to see on buttons in</div><div class='del'>-   addressbook. You may use any character to separate labels but it must</div><div class='del'>-   also be placed at the begining ot the string */</div><div class='del'>-const char *button_labels = N_(",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");</div><div class='del'>-/* Translators: put here a list of characters that correspond to buttons</div><div class='del'>-   in addressbook. You may use any character to separate labels but it</div><div class='del'>-   must also be placed at the begining ot the string.</div><div class='del'>-   Use lower case letters if possible. */</div><div class='del'>-const char *button_letters = N_(",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	gunichar letter;</div><div class='del'>-} LetterClosure;</div><div class='del'>-</div><div class='del'>-static char **</div><div class='del'>-e_utf8_split (const char *utf8_str, gunichar delim)</div><div class='del'>-{</div><div class='del'>-	GSList *str_list = NULL, *sl;</div><div class='del'>-	int n = 0;</div><div class='del'>-	const char *str, *s;</div><div class='del'>-	char **str_array;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (utf8_str != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	str = utf8_str;</div><div class='del'>-	while (*str != '\0') {</div><div class='del'>-		int len;</div><div class='del'>-		char *new_str;</div><div class='del'>-</div><div class='del'>-		for (s = str; *s != '\0' &amp;&amp; g_utf8_get_char (s) != delim; s = g_utf8_next_char (s))</div><div class='del'>-			;</div><div class='del'>-		len = s - str;</div><div class='del'>-		new_str = g_new (char, len + 1);</div><div class='del'>-		if (len &gt; 0) {</div><div class='del'>-			memcpy (new_str, str, len);</div><div class='del'>-		}</div><div class='del'>-		new_str[len] = '\0';</div><div class='del'>-		str_list = g_slist_prepend (str_list, new_str);</div><div class='del'>-		n++;</div><div class='del'>-		if (*s != '\0') {</div><div class='del'>-			str = g_utf8_next_char (s);</div><div class='del'>-		} else {</div><div class='del'>-			str = s;</div><div class='del'>-		}		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str_array = g_new (char *, n + 1);</div><div class='del'>-	str_array[n--] = NULL;</div><div class='del'>-	for (sl = str_list; sl != NULL; sl = sl-&gt;next) {</div><div class='del'>-		str_array[n--] = sl-&gt;data;</div><div class='del'>-	}</div><div class='del'>-	g_slist_free (str_list);</div><div class='del'>-</div><div class='del'>-	return str_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-jump_to_letter(EAddressbookView *view, gunichar letter)</div><div class='del'>-{</div><div class='del'>-	char *query;</div><div class='del'>-</div><div class='del'>-	if (g_unichar_isdigit (letter)) {</div><div class='del'>-		const char *letters = U_(button_letters);</div><div class='del'>-		char **letter_v;</div><div class='del'>-		GString *gstr;</div><div class='del'>-		char **p;</div><div class='del'>-</div><div class='del'>-		letter_v = e_utf8_split (g_utf8_next_char (letters),</div><div class='del'>-		                         g_utf8_get_char (letters));</div><div class='del'>-		g_assert (letter_v != NULL &amp;&amp; letter_v[0] != NULL);</div><div class='del'>-		gstr = g_string_new ("(not (or ");</div><div class='del'>-		for (p = letter_v + 1; *p != NULL; p++) {</div><div class='del'>-			g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", *p);</div><div class='del'>-		}</div><div class='del'>-		g_string_append (gstr, "))");</div><div class='del'>-		query = gstr-&gt;str;</div><div class='del'>-		g_strfreev (letter_v);</div><div class='del'>-		g_string_free (gstr, FALSE);</div><div class='del'>-	} else {</div><div class='del'>-		char s[6 + 1];</div><div class='del'>-</div><div class='del'>-		s [g_unichar_to_utf8 (letter, s)] = '\0';</div><div class='del'>-		query = g_strdup_printf ("(beginswith \"file_as\" \"%s\")", s);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_set (GTK_OBJECT (view),</div><div class='del'>-			"query", query,</div><div class='del'>-			NULL);</div><div class='del'>-	g_free (query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_toggled(GtkWidget *button, LetterClosure *closure)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *view = closure-&gt;view;</div><div class='del'>-</div><div class='del'>-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {</div><div class='del'>-		GtkWidget *current = view-&gt;current_alphabet_widget;</div><div class='del'>-</div><div class='del'>-		view-&gt;current_alphabet_widget = NULL;</div><div class='del'>-		if (current &amp;&amp; current != button)</div><div class='del'>-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (current), FALSE);</div><div class='del'>-		jump_to_letter (view, closure-&gt;letter);</div><div class='del'>-		view-&gt;current_alphabet_widget = button;</div><div class='del'>-		alphabet_state_change (view, closure-&gt;letter);</div><div class='del'>-	} else {</div><div class='del'>-		if (view-&gt;current_alphabet_widget != NULL &amp;&amp;</div><div class='del'>-		    view-&gt;current_alphabet_widget == button) {</div><div class='del'>-			view-&gt;current_alphabet_widget = NULL;</div><div class='del'>-			gtk_object_set (GTK_OBJECT (view),</div><div class='del'>-					"query", NULL,</div><div class='del'>-					NULL);</div><div class='del'>-			alphabet_state_change (view, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_closure(GtkWidget *button, LetterClosure *closure)</div><div class='del'>-{</div><div class='del'>-	if (button != NULL &amp;&amp;</div><div class='del'>-	    button == closure-&gt;view-&gt;current_alphabet_widget) {</div><div class='del'>-		closure-&gt;view-&gt;current_alphabet_widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free(closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_alphabet (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget, *viewport, *vbox;</div><div class='del'>-	const char *labels, *letters;</div><div class='del'>-	char **label_v, **letter_v;</div><div class='del'>-	char **pl, **pc;</div><div class='del'>-	gunichar sep;</div><div class='del'>-</div><div class='del'>-	widget = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),</div><div class='del'>-	                                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);</div><div class='del'>-</div><div class='del'>-	viewport = gtk_viewport_new (NULL, NULL);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (widget), viewport);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (viewport), 4);</div><div class='del'>-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (viewport), vbox);</div><div class='del'>-	gtk_widget_set_usize (vbox, 27, 0);</div><div class='del'>-</div><div class='del'>-	labels = U_(button_labels);</div><div class='del'>-	sep = g_utf8_get_char (labels);</div><div class='del'>-	label_v = e_utf8_split (g_utf8_next_char (labels), sep);</div><div class='del'>-	letters = U_(button_letters);</div><div class='del'>-	sep = g_utf8_get_char (letters);</div><div class='del'>-	letter_v = e_utf8_split (g_utf8_next_char (letters), sep);</div><div class='del'>-	g_assert (label_v != NULL &amp;&amp; letter_v != NULL);</div><div class='del'>-	for (pl = label_v, pc = letter_v; *pl != NULL &amp;&amp; *pc != NULL; pl++, pc++) {</div><div class='del'>-		GtkWidget *button;</div><div class='del'>-		LetterClosure *closure;</div><div class='del'>-		char *label;</div><div class='del'>-</div><div class='del'>-		label = e_utf8_to_locale_string (*pl);</div><div class='del'>-		button = gtk_toggle_button_new_with_label (label);</div><div class='del'>-		g_free (label);</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-		closure = g_new (LetterClosure, 1);</div><div class='del'>-		closure-&gt;view = view;</div><div class='del'>-		closure-&gt;letter = g_utf8_get_char (*pc);</div><div class='del'>-		closure-&gt;button = button;</div><div class='del'>-		closure-&gt;vbox = vbox;</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "toggled",</div><div class='del'>-		                   GTK_SIGNAL_FUNC (button_toggled), closure);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "destroy",</div><div class='del'>-		                   GTK_SIGNAL_FUNC (free_closure), closure);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	g_strfreev (label_v);</div><div class='del'>-	g_strfreev (letter_v);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (widget);</div><div class='del'>-</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	command_state_change (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-minicard_button_press (GtkWidget *widget, GdkEventButton *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	d(g_print ("Button %d pressed with event type %d\n", event-&gt;button, event-&gt;type));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-minicard_right_click (EMinicardView *minicard_view_item, GdkEvent *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	do_popup_menu(view, event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_minicard_view (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *scrollframe;</div><div class='del'>-	GtkWidget *alphabet;</div><div class='del'>-	GtkWidget *minicard_view;</div><div class='del'>-	GtkWidget *minicard_hbox;</div><div class='del'>-	EAddressbookReflowAdapter *adapter;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-</div><div class='del'>-	minicard_hbox = gtk_hbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-	adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view-&gt;model));</div><div class='del'>-	minicard_view = e_minicard_view_widget_new(adapter);</div><div class='del'>-</div><div class='del'>-	/* A hack */</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (adapter), "view", view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(minicard_view), "selection_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(minicard_selection_change), view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(minicard_view), "button_press_event",</div><div class='del'>-			   GTK_SIGNAL_FUNC(minicard_button_press), view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(minicard_view), "right_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(minicard_right_click), view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	view-&gt;object = GTK_OBJECT(minicard_view);</div><div class='del'>-	view-&gt;widget = minicard_hbox;</div><div class='del'>-</div><div class='del'>-	scrollframe = e_scroll_frame_new (NULL, NULL);</div><div class='del'>-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),</div><div class='del'>-				   GTK_POLICY_AUTOMATIC,</div><div class='del'>-				   GTK_POLICY_AUTOMATIC);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	alphabet = create_alphabet(view);</div><div class='del'>-	if (alphabet) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(alphabet));</div><div class='del'>-		gtk_widget_unparent(alphabet);</div><div class='del'>-		gtk_box_pack_start(GTK_BOX(minicard_hbox), alphabet, FALSE, FALSE, 0);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(alphabet));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_table_attach(GTK_TABLE(view), minicard_hbox,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all( GTK_WIDGET(minicard_hbox) );</div><div class='del'>-</div><div class='del'>-	gtk_widget_pop_visual ();</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-</div><div class='del'>-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (adapter));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view-&gt;object)) {</div><div class='del'>-		EAddressbookModel *model = view-&gt;model;</div><div class='del'>-		ECard *card = e_addressbook_model_get_card(model, row);</div><div class='del'>-		EBook *book;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(model),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-		</div><div class='del'>-		g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-		if (e_card_evolution_list (card))</div><div class='del'>-			e_addressbook_show_contact_list_editor (book, card, FALSE, view-&gt;editable);</div><div class='del'>-		else</div><div class='del'>-			e_addressbook_show_contact_editor (book, card, FALSE, view-&gt;editable);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	do_popup_menu(view, event);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-table_white_space_event(ETableScrolled *table, GdkEvent *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;type == GDK_BUTTON_PRESS &amp;&amp; ((GdkEventButton *)event)-&gt;button == 3) {</div><div class='del'>-		do_popup_menu(view, event);</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_selection_change(ETableScrolled *table, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	command_state_change (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_drag_data_get (ETable             *table,</div><div class='del'>-		     int                 row,</div><div class='del'>-		     int                 col,</div><div class='del'>-		     GdkDragContext     *context,</div><div class='del'>-		     GtkSelectionData   *selection_data,</div><div class='del'>-		     guint               info,</div><div class='del'>-		     guint               time,</div><div class='del'>-		     gpointer            user_data)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *view = user_data;</div><div class='del'>-</div><div class='del'>-	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view-&gt;object))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (info) {</div><div class='del'>-	case DND_TARGET_TYPE_VCARD: {</div><div class='del'>-		char *value;</div><div class='del'>-</div><div class='del'>-		row = e_table_view_to_model_row (table, row);</div><div class='del'>-		value = e_card_get_vcard(view-&gt;model-&gt;data[row]);</div><div class='del'>-</div><div class='del'>-		gtk_selection_data_set (selection_data,</div><div class='del'>-					selection_data-&gt;target,</div><div class='del'>-					8,</div><div class='del'>-					value, strlen (value));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-emit_status_message (EAddressbookView *eav, const gchar *status)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eav),</div><div class='del'>-			 e_addressbook_view_signals [STATUS_MESSAGE],</div><div class='del'>-			 status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-emit_folder_bar_message (EAddressbookView *eav, const gchar *message)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eav),</div><div class='del'>-			 e_addressbook_view_signals [FOLDER_BAR_MESSAGE],</div><div class='del'>-			 message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_message (GtkObject *object, const gchar *status, EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	emit_status_message (eav, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	emit_folder_bar_message (eav, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stop_state_changed (GtkObject *object, EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	command_state_change (eav);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-command_state_change (EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	/* Reffing during emission is unnecessary.  Gtk automatically refs during an emission. */</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eav), e_addressbook_view_signals [COMMAND_STATE_CHANGE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-alphabet_state_change (EAddressbookView *eav, gunichar letter)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eav), e_addressbook_view_signals [ALPHABET_STATE_CHANGE], letter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_table_view (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ETableModel *adapter;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	</div><div class='del'>-	simple = e_card_simple_new(NULL);</div><div class='del'>-</div><div class='del'>-	adapter = e_addressbook_table_adapter_new(view-&gt;model);</div><div class='del'>-</div><div class='del'>-	/* Here we create the table.  We give it the three pieces of</div><div class='del'>-	   the table we've created, the header, the model, and the</div><div class='del'>-	   initial layout.  It does the rest.  */</div><div class='del'>-	table = e_table_scrolled_new (adapter, NULL, SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	view-&gt;object = GTK_OBJECT(adapter);</div><div class='del'>-	view-&gt;widget = table;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "double_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_double_click), view);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "right_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_right_click), view);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "white_space_event",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_white_space_event), view);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "selection_change",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_selection_change), view);</div><div class='del'>-</div><div class='del'>-	/* drag &amp; drop signals */</div><div class='del'>-	e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)-&gt;table), GDK_BUTTON1_MASK,</div><div class='del'>-				 drag_types, num_drag_types, GDK_ACTION_MOVE);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (E_TABLE_SCROLLED(table)-&gt;table),</div><div class='del'>-			    "table_drag_data_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_drag_data_get),</div><div class='del'>-			    view);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach(GTK_TABLE(view), table,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show( GTK_WIDGET(table) );</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_view_type (EAddressbookView *view, EAddressbookViewType view_type)</div><div class='del'>-{</div><div class='del'>-	if (view_type == view-&gt;view_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;widget) {</div><div class='del'>-		gtk_widget_destroy (view-&gt;widget);</div><div class='del'>-		view-&gt;widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	view-&gt;object = NULL;</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_MINICARD:</div><div class='del'>-		create_minicard_view (view);</div><div class='del'>-		break;</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_TABLE:</div><div class='del'>-		create_table_view (view);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("view_type must be either TABLE or MINICARD\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	view-&gt;view_type = view_type;</div><div class='del'>-</div><div class='del'>-	command_state_change (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");</div><div class='del'>-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(printable));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(table));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");</div><div class='del'>-	GtkWidget *preview;</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_printable_reset(printable);</div><div class='del'>-		while (e_printable_data_left(printable)) {</div><div class='del'>-			if (gnome_print_gsave(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_translate(pc, 72, 72) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			e_printable_print_page(printable,</div><div class='del'>-					       pc,</div><div class='del'>-					       6.5 * 72,</div><div class='del'>-					       5 * 72,</div><div class='del'>-					       TRUE);</div><div class='del'>-			if (gnome_print_grestore(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_showpage(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-		}</div><div class='del'>-		gnome_print_master_close(master);</div><div class='del'>-		gnome_print_master_print(master);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(master));</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_printable_reset(printable);</div><div class='del'>-		while (e_printable_data_left(printable)) {</div><div class='del'>-			if (gnome_print_gsave(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_translate(pc, 72, 72) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			e_printable_print_page(printable,</div><div class='del'>-					       pc,</div><div class='del'>-					       6.5 * 72,</div><div class='del'>-					       9 * 72,</div><div class='del'>-					       TRUE);</div><div class='del'>-			if (gnome_print_grestore(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_showpage(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-		}</div><div class='del'>-		gnome_print_master_close(master);</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(master));</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_setup_menus (EAddressbookView *view,</div><div class='del'>-				BonoboUIComponent *uic)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));</div><div class='del'>-	g_return_if_fail (uic != NULL);</div><div class='del'>-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));</div><div class='del'>-</div><div class='del'>-	init_collection ();</div><div class='del'>-</div><div class='del'>-	view-&gt;uic = uic;</div><div class='del'>-</div><div class='del'>-	setup_menus (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_addressbook_view_discard_menus:</div><div class='del'>- * @view: An addressbook view.</div><div class='del'>- * </div><div class='del'>- * Makes an addressbook view discard its GAL view menus and its views instance</div><div class='del'>- * objects.  This should be called when the corresponding Bonobo component is</div><div class='del'>- * deactivated.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_discard_menus (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));</div><div class='del'>-	g_return_if_fail (view-&gt;view_instance);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view_menus) {</div><div class='del'>-		gal_view_menus_unmerge (view-&gt;view_menus, NULL);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (view-&gt;view_menus));</div><div class='del'>-		view-&gt;view_menus = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (view-&gt;view_instance) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (view-&gt;view_instance));</div><div class='del'>-		view-&gt;view_instance = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	view-&gt;uic = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_print(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_MINICARD) {</div><div class='del'>-		char *query;</div><div class='del'>-		EBook *book;</div><div class='del'>-		GtkWidget *print;</div><div class='del'>-</div><div class='del'>-		gtk_object_get (GTK_OBJECT(view-&gt;model),</div><div class='del'>-				"query", &amp;query,</div><div class='del'>-				"book", &amp;book,</div><div class='del'>-				NULL);</div><div class='del'>-		print = e_contact_print_dialog_new(book, query);</div><div class='del'>-		g_free(query);</div><div class='del'>-		gtk_widget_show_all(print);</div><div class='del'>-	} else if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_TABLE) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		EPrintable *printable;</div><div class='del'>-		ETable *etable;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-		gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,</div><div class='del'>-						       NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;widget), "table", &amp;etable, NULL);</div><div class='del'>-		printable = e_table_get_printable(etable);</div><div class='del'>-</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(view-&gt;widget));</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view-&gt;widget);</div><div class='del'>-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);</div><div class='del'>-		</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);</div><div class='del'>-		gtk_widget_show(dialog);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_print_preview(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_MINICARD) {</div><div class='del'>-		char *query;</div><div class='del'>-		EBook *book;</div><div class='del'>-</div><div class='del'>-		gtk_object_get (GTK_OBJECT(view-&gt;model),</div><div class='del'>-				"query", &amp;query,</div><div class='del'>-				"book", &amp;book,</div><div class='del'>-				NULL);</div><div class='del'>-		e_contact_print_preview(book, query);</div><div class='del'>-		g_free(query);</div><div class='del'>-	} else if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_TABLE) {</div><div class='del'>-		EPrintable *printable;</div><div class='del'>-		ETable *etable;</div><div class='del'>-		GnomePrintMaster *master;</div><div class='del'>-		GnomePrintContext *pc;</div><div class='del'>-		GtkWidget *preview;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;widget), "table", &amp;etable, NULL);</div><div class='del'>-		printable = e_table_get_printable(etable);</div><div class='del'>-</div><div class='del'>-		master = gnome_print_master_new();</div><div class='del'>-		gnome_print_master_set_copies (master, 1, FALSE);</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_printable_reset(printable);</div><div class='del'>-		while (e_printable_data_left(printable)) {</div><div class='del'>-			if (gnome_print_gsave(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_translate(pc, 72, 72) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			e_printable_print_page(printable,</div><div class='del'>-					       pc,</div><div class='del'>-					       6.5 * 72,</div><div class='del'>-					       9 * 72,</div><div class='del'>-					       TRUE);</div><div class='del'>-			if (gnome_print_grestore(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_showpage(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-		}</div><div class='del'>-		gnome_print_master_close(master);</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(master));</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(printable));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_addressbook_error_dialog (_("Error removing card"), status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_remove (int i, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EAddressbookView *view = user_data;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT(view-&gt;model),</div><div class='del'>-			"book", &amp;book,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	card = e_addressbook_model_get_card (view-&gt;model, i);</div><div class='del'>-</div><div class='del'>-	e_book_remove_card(book, card, card_deleted_cb, view);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_delete_selection(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *model = get_selection_model (view);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model);</div><div class='del'>-</div><div class='del'>-	e_selection_model_foreach (model,</div><div class='del'>-				   do_remove,</div><div class='del'>-				   view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-invisible_destroyed (GtkWidget *invisible, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;invisible = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_get (GtkWidget *invisible,</div><div class='del'>-	       GtkSelectionData *selection_data,</div><div class='del'>-	       guint info,</div><div class='del'>-	       guint time_stamp,</div><div class='del'>-	       EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	char *value;</div><div class='del'>-</div><div class='del'>-	value = e_card_list_get_vcard(view-&gt;clipboard_cards);</div><div class='del'>-</div><div class='del'>-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,</div><div class='del'>-				8, value, strlen (value));</div><div class='del'>-				</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_clear_event (GtkWidget *invisible,</div><div class='del'>-		       GdkEventSelection *event,</div><div class='del'>-		       EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;clipboard_cards) {</div><div class='del'>-		g_list_foreach (view-&gt;clipboard_cards, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (view-&gt;clipboard_cards);</div><div class='del'>-		view-&gt;clipboard_cards = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_received (GtkWidget *invisible,</div><div class='del'>-		    GtkSelectionData *selection_data,</div><div class='del'>-		    guint time,</div><div class='del'>-		    EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (selection_data-&gt;length &lt; 0 || selection_data-&gt;type != GDK_SELECTION_TYPE_STRING) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* XXX make sure selection_data-&gt;data = \0 terminated */</div><div class='del'>-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data-&gt;data, "ISO-8859-1");</div><div class='del'>-		GList *l;</div><div class='del'>-		</div><div class='del'>-		if (!card_list /* it wasn't a vcard list */)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		for (l = card_list; l; l = l-&gt;next) {</div><div class='del'>-			ECard *card = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			e_card_merging_book_add_card (view-&gt;book, card, NULL /* XXX */, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (card_list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_to_list (int model_row, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	GList **list = closure;</div><div class='del'>-	*list = g_list_prepend (*list, GINT_TO_POINTER (model_row));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-get_selected_cards (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	GList *iterator;</div><div class='del'>-	ESelectionModel *selection = get_selection_model (view);</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-	e_selection_model_foreach (selection, add_to_list, &amp;list);</div><div class='del'>-</div><div class='del'>-	for (iterator = list; iterator; iterator = iterator-&gt;next) {</div><div class='del'>-		iterator-&gt;data = e_addressbook_model_card_at (view-&gt;model, GPOINTER_TO_INT (iterator-&gt;data));</div><div class='del'>-		if (iterator-&gt;data)</div><div class='del'>-			gtk_object_ref (iterator-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	list = g_list_reverse (list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_save_state (EAddressbookView *view, const char *filename)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *node;</div><div class='del'>-</div><div class='del'>-	doc = xmlNewDoc ("1.0");</div><div class='del'>-	node = xmlNewDocNode (doc, NULL, "addressbook-view", NULL);</div><div class='del'>-	xmlDocSetRootElement (doc, node);</div><div class='del'>-</div><div class='del'>-	switch (view-&gt;view_type) {</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_MINICARD: {</div><div class='del'>-		int column_width;</div><div class='del'>-		e_xml_set_string_prop_by_name (node, "style", "minicard");</div><div class='del'>-		gtk_object_get (GTK_OBJECT (view-&gt;object),</div><div class='del'>-				"column_width", &amp;column_width,</div><div class='del'>-				NULL);</div><div class='del'>-		e_xml_set_integer_prop_by_name (node, "column-width", column_width);</div><div class='del'>-		break;	</div><div class='del'>-	}</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_TABLE: {</div><div class='del'>-		ETableState *state;</div><div class='del'>-		state = e_table_get_state_object (E_TABLE (view-&gt;widget));</div><div class='del'>-</div><div class='del'>-		e_xml_set_string_prop_by_name (node, "style", "table");</div><div class='del'>-		e_table_state_save_to_node (state, node);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (state));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	default:</div><div class='del'>-		xmlFreeDoc(doc);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	xmlSaveFile (filename, doc);</div><div class='del'>-	xmlFreeDoc(doc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_load_state (EAddressbookView *view, const char *filename)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-</div><div class='del'>-	doc = xmlParseFile (filename);</div><div class='del'>-	if (doc) {</div><div class='del'>-		xmlNode *node;</div><div class='del'>-		char *type;</div><div class='del'>-</div><div class='del'>-		node = xmlDocGetRootElement (doc);</div><div class='del'>-		type = e_xml_get_string_prop_by_name (node, "style");</div><div class='del'>-</div><div class='del'>-		if (!strcmp (type, "minicard")) {</div><div class='del'>-			int column_width;</div><div class='del'>-</div><div class='del'>-			change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-</div><div class='del'>-			column_width = e_xml_get_integer_prop_by_name (node, "column-width");</div><div class='del'>-			gtk_object_set (GTK_OBJECT (view-&gt;object),</div><div class='del'>-					"column_width", column_width,</div><div class='del'>-					NULL);</div><div class='del'>-		} else if (!strcmp (type, "table")) {</div><div class='del'>-			ETableState *state;</div><div class='del'>-</div><div class='del'>-			change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);</div><div class='del'>-</div><div class='del'>-			state = e_table_state_new();</div><div class='del'>-			e_table_state_load_from_node (state, node-&gt;xmlChildrenNode);</div><div class='del'>-			e_table_set_state_object (E_TABLE (view-&gt;widget), state);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (state));</div><div class='del'>-		}</div><div class='del'>-		xmlFreeDoc(doc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_save_as (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GList *list = get_selected_cards (view);</div><div class='del'>-	if (list)</div><div class='del'>-		e_contact_list_save_as (_("Save as VCard"), list);</div><div class='del'>-	e_free_object_list(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_view (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GList *list = get_selected_cards (view);</div><div class='del'>-	e_addressbook_show_multiple_cards (view-&gt;book, list, view-&gt;editable);</div><div class='del'>-	e_free_object_list(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_send (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GList *list = get_selected_cards (view);</div><div class='del'>-	if (list)</div><div class='del'>-		e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT);</div><div class='del'>-	e_free_object_list(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_send_to (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GList *list = get_selected_cards (view);</div><div class='del'>-	if (list)</div><div class='del'>-		e_card_list_send (list, E_CARD_DISPOSITION_AS_TO);</div><div class='del'>-	e_free_object_list(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_cut (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	e_addressbook_view_copy (view);</div><div class='del'>-	e_addressbook_view_delete_selection (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_copy (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;clipboard_cards = get_selected_cards (view);</div><div class='del'>-</div><div class='del'>-	gtk_selection_owner_set (view-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_paste (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	gtk_selection_convert (view-&gt;invisible, clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_select_all (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *model = get_selection_model (view);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model);</div><div class='del'>-</div><div class='del'>-	e_selection_model_select_all (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_show_all(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view),</div><div class='del'>-		       "query", NULL,</div><div class='del'>-		       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_stop(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view)</div><div class='del'>-		e_addressbook_model_stop (view-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_transfer_cards (EAddressbookView *view, gboolean delete_from_source)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	GList *cards;</div><div class='del'>-	GtkWindow *parent_window;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;model), </div><div class='del'>-		       "book", &amp;book,</div><div class='del'>-		       NULL);</div><div class='del'>-	cards = get_selected_cards (view);</div><div class='del'>-	parent_window = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view)));</div><div class='del'>-</div><div class='del'>-	e_addressbook_transfer_cards (book, cards, delete_from_source, parent_window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_copy_to_folder (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view_transfer_cards (view, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_move_to_folder (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	view_transfer_cards (view, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_addressbook_view_selection_nonempty (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	ESelectionModel *selection_model;</div><div class='del'>-</div><div class='del'>-	selection_model = get_selection_model (view);</div><div class='del'>-	if (selection_model == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return e_selection_model_selected_count (selection_model) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_create (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_model_editable (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_print (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view &amp;&amp; view-&gt;model ? e_addressbook_model_card_count (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_save_as (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_view (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_addressbook_view_can_send (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean   </div><div class='del'>-e_addressbook_view_can_send_to (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_delete (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) &amp;&amp; e_addressbook_model_editable (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_cut (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) &amp;&amp; e_addressbook_model_editable (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_copy (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_paste (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_model_editable (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_select_all (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_model_card_count (view-&gt;model) != 0 : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_stop (EAddressbookView  *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_model_can_stop (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_copy_to_folder (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_addressbook_view_can_move_to_folder (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	return view ? e_addressbook_view_selection_nonempty (view) &amp;&amp; e_addressbook_model_editable (view-&gt;model) : FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h<br/>deleted file mode 100644<br/>index 58511845bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-addressbook-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,146 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-addressbook-view.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_ADDRESSBOOK_VIEW_H__</div><div class='del'>-#define __E_ADDRESSBOOK_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-instance.h&gt;</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-#include "widgets/menus/gal-view-menus.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EAddressbookView - A card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))</div><div class='del'>-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */</div><div class='del'>-	E_ADDRESSBOOK_VIEW_TABLE,</div><div class='del'>-	E_ADDRESSBOOK_VIEW_MINICARD</div><div class='del'>-} EAddressbookViewType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookView       EAddressbookView;</div><div class='del'>-typedef struct _EAddressbookViewClass  EAddressbookViewClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookView</div><div class='del'>-{</div><div class='del'>-	GtkTable parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	EAddressbookViewType view_type;</div><div class='del'>-</div><div class='del'>-	EAddressbookModel   *model;</div><div class='del'>-</div><div class='del'>-	GtkWidget *invisible;</div><div class='del'>-	GList *clipboard_cards;</div><div class='del'>-</div><div class='del'>-	EBook *book;</div><div class='del'>-	char  *query;</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	GtkObject *object;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *current_alphabet_widget;</div><div class='del'>-</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-</div><div class='del'>-	/* Menus handler and the view instance */</div><div class='del'>-	GalViewInstance *view_instance;</div><div class='del'>-	GalViewMenus *view_menus;</div><div class='del'>-	GalView *current_view;</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressbookViewClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Signals</div><div class='del'>-	 */</div><div class='del'>-	void (*status_message)        (EAddressbookView *view, const gchar *message);</div><div class='del'>-	void (*folder_bar_message)    (EAddressbookView *view, const gchar *message);</div><div class='del'>-	void (*command_state_change)  (EAddressbookView *view);</div><div class='del'>-	void (*alphabet_state_change) (EAddressbookView *view, gunichar letter);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_view_new                 (void);</div><div class='del'>-GtkType    e_addressbook_view_get_type            (void);</div><div class='del'>-</div><div class='del'>-void       e_addressbook_view_setup_menus         (EAddressbookView  *view,</div><div class='del'>-						   BonoboUIComponent *uic);</div><div class='del'>-</div><div class='del'>-void       e_addressbook_view_discard_menus       (EAddressbookView  *view);</div><div class='del'>-</div><div class='del'>-void       e_addressbook_view_save_as             (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_view                (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_send                (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_send_to             (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_print               (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_print_preview       (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_delete_selection    (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_cut                 (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_copy                (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_paste               (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_select_all          (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_show_all            (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_stop                (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_copy_to_folder      (EAddressbookView  *view);</div><div class='del'>-void       e_addressbook_view_move_to_folder      (EAddressbookView  *view);</div><div class='del'>-</div><div class='del'>-gboolean   e_addressbook_view_can_create          (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_print           (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_save_as         (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_view            (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_send            (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_send_to         (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_delete          (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_cut             (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_copy            (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_paste           (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_select_all      (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_stop            (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_copy_to_folder  (EAddressbookView  *view);</div><div class='del'>-gboolean   e_addressbook_view_can_move_to_folder  (EAddressbookView  *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESSBOOK_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c<br/>deleted file mode 100644<br/>index 73417af78c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-control.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,373 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * e-minicard-control.c</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *    Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-stream.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-client.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book-util.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/gui/component/addressbook.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard-control.h"</div><div class='del'>-#include "e-minicard-widget.h"</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EMinicardWidget *minicard;</div><div class='del'>-	GList *card_list;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-} EMinicardControl;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-enum {</div><div class='del'>-	PROP_RUNNING</div><div class='del'>-} MyArgs;</div><div class='del'>-</div><div class='del'>-#define RUNNING_KEY  "Clock::Running"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GtkObject *clock = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROP_RUNNING:</div><div class='del'>-	{</div><div class='del'>-		gboolean b = GPOINTER_TO_UINT (gtk_object_get_data (clock, RUNNING_KEY));</div><div class='del'>-		BONOBO_ARG_SET_BOOLEAN (arg, b);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  const BonoboArg   *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GtkClock *clock = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROP_RUNNING:</div><div class='del'>-	{</div><div class='del'>-		guint i;</div><div class='del'>-</div><div class='del'>-		i = BONOBO_ARG_GET_BOOLEAN (arg);</div><div class='del'>-</div><div class='del'>-		if (i)</div><div class='del'>-			gtk_clock_start (clock);</div><div class='del'>-		else</div><div class='del'>-			gtk_clock_stop (clock);</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (clock), RUNNING_KEY,</div><div class='del'>-				     GUINT_TO_POINTER (i));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bonobo::PersistStream</div><div class='del'>- *</div><div class='del'>- * These two functions implement the Bonobo::PersistStream load and</div><div class='del'>- * save methods which allow data to be loaded into and out of the</div><div class='del'>- * BonoboObject.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-stream_read (Bonobo_Stream stream)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	CORBA_Environment    ev;</div><div class='del'>-	char *data = NULL;</div><div class='del'>-	gint length = 0;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	do {</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,</div><div class='del'>-				    &amp;buffer, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data = g_realloc (data, length + buffer-&gt;_length + 1);</div><div class='del'>-</div><div class='del'>-		memcpy (data + length, buffer-&gt;_buffer, buffer-&gt;_length);</div><div class='del'>-</div><div class='del'>-		length += buffer-&gt;_length;</div><div class='del'>-</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (data)</div><div class='del'>-		data[length] = '\0';</div><div class='del'>-	else</div><div class='del'>-		data = g_strdup("");</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-} /* stream_read */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:load method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	char *vcard;</div><div class='del'>-	EMinicardControl *minicard_control = data;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/vCard") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((vcard = stream_read (stream)) == NULL) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_FileNotFound, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_free_object_list (minicard_control-&gt;card_list);</div><div class='del'>-	list = e_card_load_cards_from_string_with_default_charset(vcard, "ISO-8859-1");</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	minicard_control-&gt;card_list = list;</div><div class='del'>-	if (list)</div><div class='del'>-		gtk_object_set(GTK_OBJECT(minicard_control-&gt;minicard),</div><div class='del'>-			       "card", list-&gt;data,</div><div class='del'>-			       NULL);</div><div class='del'>-	if (list &amp;&amp; list-&gt;next) {</div><div class='del'>-		char *message;</div><div class='del'>-		int length = g_list_length (list) - 1;</div><div class='del'>-		if (length &gt; 1) {</div><div class='del'>-			message = g_strdup_printf (_("and %d other cards."), length);</div><div class='del'>-		} else {</div><div class='del'>-			message = g_strdup_printf (_("and one other card."));</div><div class='del'>-		}</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (minicard_control-&gt;label), message);</div><div class='del'>-		g_free (message);</div><div class='del'>-		gtk_widget_show (minicard_control-&gt;label);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (minicard_control-&gt;label);</div><div class='del'>-	}</div><div class='del'>-} /* pstream_load */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:save method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EMinicardControl *minicard_control = data;</div><div class='del'>-	char             *vcard;</div><div class='del'>-	int               length;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/vCard") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vcard = e_card_list_get_vcard(minicard_control-&gt;card_list);</div><div class='del'>-	length = strlen (vcard);</div><div class='del'>-	bonobo_stream_client_write (stream, vcard, length, ev);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-} /* pstream_save */</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-pstream_get_max_size (BonoboPersistStream *ps, void *data,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EMinicardControl *minicard_control = data;</div><div class='del'>-	char *vcard;</div><div class='del'>-	gint length;</div><div class='del'>-</div><div class='del'>-	vcard = e_card_list_get_vcard(minicard_control-&gt;card_list);</div><div class='del'>-	length = strlen (vcard);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-</div><div class='del'>-	return length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-pstream_get_content_types (BonoboPersistStream *ps, void *closure,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	GList *list = closure;</div><div class='del'>-	if (book) {</div><div class='del'>-		GList *p;</div><div class='del'>-		for (p = list; p; p = p-&gt;next) {</div><div class='del'>-			e_card_merging_book_add_card(book, p-&gt;data, NULL, NULL);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-	}</div><div class='del'>-	e_free_object_list (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_in_addressbook(GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMinicardControl *minicard_control = data;</div><div class='del'>-	GList *list, *p;</div><div class='del'>-	EBook *book;</div><div class='del'>-</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	list = g_list_copy (minicard_control-&gt;card_list);</div><div class='del'>-</div><div class='del'>-	for (p = list; p; p = p-&gt;next)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-</div><div class='del'>-	if (!addressbook_load_default_book (book, book_open_cb, list)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (book));</div><div class='del'>-		book_open_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_struct (GtkWidget *control, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMinicardControl *minicard_control = data;</div><div class='del'>-	e_free_object_list (minicard_control-&gt;card_list);</div><div class='del'>-	g_free (minicard_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	BonoboPropertyBag  *pb;</div><div class='del'>-#endif</div><div class='del'>-	BonoboControl       *control;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	GtkWidget	    *minicard;</div><div class='del'>-	GtkWidget           *button;</div><div class='del'>-	GtkWidget           *label;</div><div class='del'>-	GtkWidget           *vbox;</div><div class='del'>-</div><div class='del'>-	EMinicardControl    *minicard_control = g_new (EMinicardControl, 1);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	minicard_control-&gt;card_list = NULL;</div><div class='del'>-	minicard_control-&gt;minicard = NULL;</div><div class='del'>-	minicard_control-&gt;label = NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-</div><div class='del'>-	minicard = e_minicard_widget_new ();</div><div class='del'>-	gtk_widget_show (minicard);</div><div class='del'>-	minicard_control-&gt;minicard = E_MINICARD_WIDGET (minicard);</div><div class='del'>-</div><div class='del'>-	/* This is intentionally not shown. */</div><div class='del'>-	label = gtk_label_new ("");</div><div class='del'>-	minicard_control-&gt;label = label;</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label(_("Save in addressbook"));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   save_in_addressbook, minicard_control);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (vbox);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "destroy",</div><div class='del'>-			    free_struct, minicard_control);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,</div><div class='del'>-					    pstream_get_max_size,</div><div class='del'>-					    pstream_get_content_types,</div><div class='del'>-					    minicard_control);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* Create the properties. */</div><div class='del'>-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);</div><div class='del'>-	bonobo_control_set_properties (control, pb);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,</div><div class='del'>-				 BONOBO_ARG_BOOLEAN, NULL,</div><div class='del'>-				 "Whether or not the clock is running", 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (control));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				    BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory =</div><div class='del'>-		bonobo_generic_factory_new (</div><div class='del'>-		        "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory",</div><div class='del'>-			e_minicard_control_factory, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register a EMinicard control factory.");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-control.h b/addressbook/gui/widgets/e-minicard-control.h<br/>deleted file mode 100644<br/>index 4a0da88435..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-control.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef __E_MINICARD_CONTROL_H__</div><div class='del'>-#define __E_MINICARD_CONTROL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-</div><div class='del'>-void             e_minicard_control_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_CONTROL_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c<br/>deleted file mode 100644<br/>index b59ff46ae3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-label.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-label.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,470 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-minicard-label.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_minicard_label_init		(EMinicardLabel		 *card);</div><div class='del'>-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);</div><div class='del'>-static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);</div><div class='del'>-static void e_minicard_label_realize (GnomeCanvasItem *item);</div><div class='del'>-static void e_minicard_label_unrealize (GnomeCanvasItem *item);</div><div class='del'>-static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags);</div><div class='del'>-</div><div class='del'>-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_WIDTH,</div><div class='del'>-	ARG_HEIGHT,</div><div class='del'>-	ARG_HAS_FOCUS,</div><div class='del'>-	ARG_FIELD,</div><div class='del'>-	ARG_FIELDNAME,</div><div class='del'>-	ARG_TEXT_MODEL,</div><div class='del'>-	ARG_MAX_FIELD_NAME_WIDTH,</div><div class='del'>-	ARG_EDITABLE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_label_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType minicard_label_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!minicard_label_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo minicard_label_info =</div><div class='del'>-      {</div><div class='del'>-        "EMinicardLabel",</div><div class='del'>-        sizeof (EMinicardLabel),</div><div class='del'>-        sizeof (EMinicardLabelClass),</div><div class='del'>-        (GtkClassInitFunc) e_minicard_label_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_minicard_label_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      minicard_label_type = gtk_type_unique (gnome_canvas_group_get_type (), &amp;minicard_label_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return minicard_label_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_class_init (EMinicardLabelClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-  GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-  item_class = (GnomeCanvasItemClass *) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (gnome_canvas_group_get_type ());</div><div class='del'>-  </div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::width", GTK_TYPE_DOUBLE, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_WIDTH); </div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::height", GTK_TYPE_DOUBLE, </div><div class='del'>-			   GTK_ARG_READABLE, ARG_HEIGHT);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::has_focus", GTK_TYPE_BOOL, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_HAS_FOCUS);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::field", GTK_TYPE_STRING, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_FIELD);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_FIELDNAME);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_TEXT_MODEL);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::max_field_name_length", GTK_TYPE_DOUBLE,</div><div class='del'>-			   GTK_ARG_READWRITE, ARG_MAX_FIELD_NAME_WIDTH);</div><div class='del'>-  gtk_object_add_arg_type ("EMinicardLabel::editable", GTK_TYPE_BOOL, </div><div class='del'>-			   GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>- </div><div class='del'>-  object_class-&gt;set_arg = e_minicard_label_set_arg;</div><div class='del'>-  object_class-&gt;get_arg = e_minicard_label_get_arg;</div><div class='del'>-  /*  object_class-&gt;destroy = e_minicard_label_destroy; */</div><div class='del'>-  </div><div class='del'>-  /* GnomeCanvasItem method overrides */</div><div class='del'>-  item_class-&gt;realize     = e_minicard_label_realize;</div><div class='del'>-  item_class-&gt;unrealize   = e_minicard_label_unrealize;</div><div class='del'>-  item_class-&gt;event       = e_minicard_label_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_init (EMinicardLabel *minicard_label)</div><div class='del'>-{</div><div class='del'>-  minicard_label-&gt;width = 10;</div><div class='del'>-  minicard_label-&gt;height = 10;</div><div class='del'>-  minicard_label-&gt;rect = NULL;</div><div class='del'>-  minicard_label-&gt;fieldname = NULL;</div><div class='del'>-  minicard_label-&gt;field = NULL;</div><div class='del'>-</div><div class='del'>-  minicard_label-&gt;max_field_name_length = -1;</div><div class='del'>-</div><div class='del'>-  e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EMinicardLabel *e_minicard_label;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	e_minicard_label = E_MINICARD_LABEL (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		e_minicard_label-&gt;width = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		e_minicard_label_resize_children(e_minicard_label);</div><div class='del'>-		e_canvas_item_request_reflow (item);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HAS_FOCUS:</div><div class='del'>-		if (e_minicard_label-&gt;field &amp;&amp; (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))</div><div class='del'>-			e_canvas_item_grab_focus(e_minicard_label-&gt;field, FALSE);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FIELD:</div><div class='del'>-		gnome_canvas_item_set( e_minicard_label-&gt;field, "text", GTK_VALUE_STRING (*arg), NULL );</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FIELDNAME:</div><div class='del'>-		gnome_canvas_item_set( e_minicard_label-&gt;fieldname, "text", GTK_VALUE_STRING (*arg), NULL );</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TEXT_MODEL:</div><div class='del'>-		gnome_canvas_item_set( e_minicard_label-&gt;field, "model", GTK_VALUE_OBJECT (*arg), NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MAX_FIELD_NAME_WIDTH:</div><div class='del'>-		e_minicard_label-&gt;max_field_name_length = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		e_minicard_label-&gt;editable = GTK_VALUE_BOOL (*arg);</div><div class='del'>-		gtk_object_set (GTK_OBJECT (e_minicard_label-&gt;field), "editable", e_minicard_label-&gt;editable, NULL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardLabel *e_minicard_label;</div><div class='del'>-	char *temp;</div><div class='del'>-	ETextModel *tempmodel;</div><div class='del'>-</div><div class='del'>-	e_minicard_label = E_MINICARD_LABEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label-&gt;width;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label-&gt;height;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HAS_FOCUS:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = e_minicard_label-&gt;has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FIELD:</div><div class='del'>-		gtk_object_get( GTK_OBJECT( e_minicard_label-&gt;field ), "text", &amp;temp, NULL );</div><div class='del'>-		GTK_VALUE_STRING (*arg) = temp;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_FIELDNAME:</div><div class='del'>-		gtk_object_get( GTK_OBJECT( e_minicard_label-&gt;fieldname ), "text", &amp;temp, NULL );</div><div class='del'>-		GTK_VALUE_STRING (*arg) = temp;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TEXT_MODEL:</div><div class='del'>-		gtk_object_get( GTK_OBJECT( e_minicard_label-&gt;field ), "model", &amp;tempmodel, NULL );</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MAX_FIELD_NAME_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label-&gt;max_field_name_length;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_minicard_label-&gt;editable;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;realize)</div><div class='del'>-	  (* GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;realize) (item);</div><div class='del'>-</div><div class='del'>-	e_canvas_item_request_reflow(item);</div><div class='del'>-	</div><div class='del'>-	if (!item-&gt;canvas-&gt;aa)</div><div class='del'>-	  {</div><div class='del'>-	  }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_label_construct (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EMinicardLabel *e_minicard_label;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-</div><div class='del'>-	font = ((GtkWidget *) item-&gt;canvas)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	e_minicard_label = E_MINICARD_LABEL (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( item );</div><div class='del'>-</div><div class='del'>-	e_minicard_label-&gt;rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 0,</div><div class='del'>-				 "y1", (double) 0,</div><div class='del'>-				 "x2", (double) e_minicard_label-&gt;width - 1,</div><div class='del'>-				 "y2", (double) e_minicard_label-&gt;height - 1,</div><div class='del'>-				 "outline_color", NULL,</div><div class='del'>-				 NULL );</div><div class='del'>-	e_minicard_label-&gt;fieldname =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 e_text_get_type(),</div><div class='del'>-				 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				 "clip_width", (double) ( e_minicard_label-&gt;width / 2 - 4 ),</div><div class='del'>-				 "clip", TRUE,</div><div class='del'>-				 "use_ellipsis", TRUE,</div><div class='del'>-				 "font_gdk", font,</div><div class='del'>-				 "fill_color", "black",</div><div class='del'>-				 "draw_background", FALSE,</div><div class='del'>-				 NULL );</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard_label-&gt;fieldname, 2, 1);</div><div class='del'>-</div><div class='del'>-	e_minicard_label-&gt;field =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 e_text_get_type(),</div><div class='del'>-				 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				 "clip_width", (double) ( ( e_minicard_label-&gt;width + 1 ) / 2 - 4 ),</div><div class='del'>-				 "clip", TRUE,</div><div class='del'>-				 "use_ellipsis", TRUE,</div><div class='del'>-				 "font_gdk", font,</div><div class='del'>-				 "fill_color", "black",</div><div class='del'>-				 "editable", e_minicard_label-&gt;editable,</div><div class='del'>-				 "draw_background", FALSE,</div><div class='del'>-				 NULL );</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard_label-&gt;field, ( e_minicard_label-&gt;width / 2 + 2), 1);</div><div class='del'>-</div><div class='del'>-	e_canvas_item_request_reflow(item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  EMinicardLabel *e_minicard_label;</div><div class='del'>-</div><div class='del'>-  e_minicard_label = E_MINICARD_LABEL (item);</div><div class='del'>-</div><div class='del'>-  if (!item-&gt;canvas-&gt;aa)</div><div class='del'>-    {</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;unrealize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;unrealize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-  EMinicardLabel *e_minicard_label;</div><div class='del'>- </div><div class='del'>-  e_minicard_label = E_MINICARD_LABEL (item);</div><div class='del'>-</div><div class='del'>-  switch( event-&gt;type )</div><div class='del'>-    {</div><div class='del'>-    case GDK_KEY_PRESS:</div><div class='del'>-	    if (event-&gt;key.keyval == GDK_Escape) {</div><div class='del'>-		    GnomeCanvasItem *parent;</div><div class='del'>-</div><div class='del'>-		    e_text_cancel_editing (E_TEXT (e_minicard_label-&gt;field));</div><div class='del'>-</div><div class='del'>-		    parent = GNOME_CANVAS_ITEM (e_minicard_label)-&gt;parent;</div><div class='del'>-		    if (parent)</div><div class='del'>-			    e_canvas_item_grab_focus(parent, FALSE);</div><div class='del'>-	    }</div><div class='del'>-	    break;</div><div class='del'>-    case GDK_FOCUS_CHANGE:</div><div class='del'>-      {</div><div class='del'>-	GdkEventFocus *focus_event = (GdkEventFocus *) event;</div><div class='del'>-	if ( focus_event-&gt;in )</div><div class='del'>-	  {</div><div class='del'>-	    gnome_canvas_item_set( e_minicard_label-&gt;rect, </div><div class='del'>-				   "outline_color", "grey50", </div><div class='del'>-				   "fill_color", "grey90",</div><div class='del'>-				   NULL );</div><div class='del'>-	    e_minicard_label-&gt;has_focus = TRUE;</div><div class='del'>-	  }</div><div class='del'>-	else</div><div class='del'>-	  {</div><div class='del'>-	    gnome_canvas_item_set( e_minicard_label-&gt;rect, </div><div class='del'>-				   "outline_color", NULL, </div><div class='del'>-				   "fill_color", NULL,</div><div class='del'>-				   NULL );</div><div class='del'>-	    e_minicard_label-&gt;has_focus = FALSE;</div><div class='del'>-	  }</div><div class='del'>-      }</div><div class='del'>-      break;</div><div class='del'>-    case GDK_BUTTON_PRESS:</div><div class='del'>-    case GDK_BUTTON_RELEASE: </div><div class='del'>-    case GDK_MOTION_NOTIFY:</div><div class='del'>-    case GDK_ENTER_NOTIFY:</div><div class='del'>-    case GDK_LEAVE_NOTIFY: {</div><div class='del'>-	    gboolean return_val;</div><div class='del'>-#if 0</div><div class='del'>-	    GnomeCanvasItem *field;</div><div class='del'>-	    ArtPoint p;</div><div class='del'>-	    double inv[6], affine[6];</div><div class='del'>-	    </div><div class='del'>-	    field = e_minicard_label-&gt;field;</div><div class='del'>-	    art_affine_identity (affine);</div><div class='del'>-	    </div><div class='del'>-	    if (field-&gt;xform != NULL) {</div><div class='del'>-		    if (field-&gt;object.flags &amp; GNOME_CANVAS_ITEM_AFFINE_FULL) {</div><div class='del'>-			    art_affine_multiply (affine, affine, field-&gt;xform);</div><div class='del'>-		    } else {</div><div class='del'>-			    affine[4] += field-&gt;xform[0];</div><div class='del'>-			    affine[5] += field-&gt;xform[1];</div><div class='del'>-		    }</div><div class='del'>-	    }</div><div class='del'>-	    </div><div class='del'>-	    art_affine_invert (inv, affine);</div><div class='del'>-	    switch(event-&gt;type) {</div><div class='del'>-	    case GDK_MOTION_NOTIFY:</div><div class='del'>-		    p.x = event-&gt;motion.x;</div><div class='del'>-		    p.y = event-&gt;motion.y;</div><div class='del'>-		    art_affine_point (&amp;p, &amp;p, inv);</div><div class='del'>-		    event-&gt;motion.x = p.x;</div><div class='del'>-		    event-&gt;motion.y = p.y;</div><div class='del'>-		    break;</div><div class='del'>-	    case GDK_BUTTON_PRESS:</div><div class='del'>-	    case GDK_BUTTON_RELEASE:</div><div class='del'>-		    p.x = event-&gt;button.x;</div><div class='del'>-		    p.y = event-&gt;button.y;</div><div class='del'>-		    art_affine_point (&amp;p, &amp;p, inv);</div><div class='del'>-		    event-&gt;button.x = p.x;</div><div class='del'>-		    event-&gt;button.y = p.y;</div><div class='del'>-		    break;</div><div class='del'>-	    case GDK_ENTER_NOTIFY:</div><div class='del'>-	    case GDK_LEAVE_NOTIFY:</div><div class='del'>-		    p.x = event-&gt;crossing.x;</div><div class='del'>-		    p.y = event-&gt;crossing.y;</div><div class='del'>-		    art_affine_point (&amp;p, &amp;p, inv);</div><div class='del'>-		    event-&gt;crossing.x = p.x;</div><div class='del'>-		    event-&gt;crossing.y = p.y;</div><div class='del'>-		    break;</div><div class='del'>-	    default:</div><div class='del'>-		    break;</div><div class='del'>-	    }</div><div class='del'>-#endif	    </div><div class='del'>-	    gtk_signal_emit_by_name(GTK_OBJECT(e_minicard_label-&gt;field), "event", event, &amp;return_val);</div><div class='del'>-	    return return_val;</div><div class='del'>-	    break;</div><div class='del'>-    }</div><div class='del'>-    default:</div><div class='del'>-	    break;</div><div class='del'>-    }</div><div class='del'>-  </div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event)</div><div class='del'>-    return (* GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event) (item, event);</div><div class='del'>-  else</div><div class='del'>-    return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)</div><div class='del'>-{</div><div class='del'>-	double left_width;</div><div class='del'>-	if (e_minicard_label-&gt;max_field_name_length != -1 &amp;&amp; ((e_minicard_label-&gt;width / 2) - 4 &gt; e_minicard_label-&gt;max_field_name_length))</div><div class='del'>-		left_width = e_minicard_label-&gt;max_field_name_length;</div><div class='del'>-	else</div><div class='del'>-		left_width = e_minicard_label-&gt;width / 2 - 4;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set( e_minicard_label-&gt;fieldname,</div><div class='del'>-			       "clip_width", (double) ( left_width ),</div><div class='del'>-			       NULL );</div><div class='del'>-	gnome_canvas_item_set( e_minicard_label-&gt;field,</div><div class='del'>-			       "clip_width", (double) ( e_minicard_label-&gt;width - 8 - left_width ),</div><div class='del'>-			       NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)</div><div class='del'>-{</div><div class='del'>-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);</div><div class='del'>-	</div><div class='del'>-	gint old_height;</div><div class='del'>-	gdouble text_height;</div><div class='del'>-	gdouble left_width;</div><div class='del'>-</div><div class='del'>-	old_height = e_minicard_label-&gt;height;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(e_minicard_label-&gt;fieldname), </div><div class='del'>-		       "text_height", &amp;text_height,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	e_minicard_label-&gt;height = text_height;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(e_minicard_label-&gt;field), </div><div class='del'>-		       "text_height", &amp;text_height,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	if (e_minicard_label-&gt;height &lt; text_height)</div><div class='del'>-		e_minicard_label-&gt;height = text_height;</div><div class='del'>-	e_minicard_label-&gt;height += 3;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set( e_minicard_label-&gt;rect,</div><div class='del'>-			       "x2", (double) e_minicard_label-&gt;width - 1,</div><div class='del'>-			       "y2", (double) e_minicard_label-&gt;height - 1,</div><div class='del'>-			       NULL );</div><div class='del'>-</div><div class='del'>-	if (e_minicard_label-&gt;max_field_name_length != -1 &amp;&amp; ((e_minicard_label-&gt;width / 2) - 4 &gt; e_minicard_label-&gt;max_field_name_length))</div><div class='del'>-		left_width = e_minicard_label-&gt;max_field_name_length;</div><div class='del'>-	else</div><div class='del'>-		left_width = e_minicard_label-&gt;width / 2 - 4;</div><div class='del'>-</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard_label-&gt;field, left_width + 6, 1);</div><div class='del'>-</div><div class='del'>-	if (old_height != e_minicard_label-&gt;height)</div><div class='del'>-		e_canvas_item_request_parent_reflow(item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCanvasItem *</div><div class='del'>-e_minicard_label_new(GnomeCanvasGroup *parent)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);</div><div class='del'>-	e_minicard_label_construct(item);</div><div class='del'>-	return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h<br/>deleted file mode 100644<br/>index 32792991a7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-label.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-label.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-label.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MINICARD_LABEL_H__</div><div class='del'>-#define __E_MINICARD_LABEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicardLabel - A label doing focus with non-marching ants.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * width        double          RW              width of the label</div><div class='del'>- * height       double          R               height of the label</div><div class='del'>- * field        string          RW              text in the field label</div><div class='del'>- * fieldname    string          RW              text in the fieldname label</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_LABEL_TYPE			(e_minicard_label_get_type ())</div><div class='del'>-#define E_MINICARD_LABEL(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_LABEL_TYPE, EMinicardLabel))</div><div class='del'>-#define E_MINICARD_LABEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_LABEL_TYPE, EMiniCardLabelClass))</div><div class='del'>-#define E_IS_MINICARD_LABEL(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_LABEL_TYPE))</div><div class='del'>-#define E_IS_MINICARD_LABEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_LABEL_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardLabel       EMinicardLabel;</div><div class='del'>-typedef struct _EMinicardLabelClass  EMinicardLabelClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardLabel</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroup parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	double width;</div><div class='del'>-	double height;</div><div class='del'>-	double max_field_name_length;</div><div class='del'>-	guint editable : 1;</div><div class='del'>-	GnomeCanvasItem *fieldname;</div><div class='del'>-	GnomeCanvasItem *field;</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-</div><div class='del'>-	gboolean has_focus;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardLabelClass</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroupClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_minicard_label_get_type (void);</div><div class='del'>-GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);</div><div class='del'>-void e_minicard_label_construct (GnomeCanvasItem *item);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_LABEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c<br/>deleted file mode 100644<br/>index 1f6e1bd26b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view-widget.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-view-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,368 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-minicard-view-widget.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-background.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard-view-widget.h"</div><div class='del'>-</div><div class='del'>-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);</div><div class='del'>-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);</div><div class='del'>-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_widget_destroy       (GtkObject *object);</div><div class='del'>-static void e_minicard_view_widget_reflow        (ECanvas *canvas);</div><div class='del'>-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);</div><div class='del'>-static void e_minicard_view_widget_realize       (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-static ECanvasClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_EDITABLE,</div><div class='del'>-	ARG_COLUMN_WIDTH</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SELECTION_CHANGE,</div><div class='del'>-	COLUMN_WIDTH_CHANGED,</div><div class='del'>-	RIGHT_CLICK,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_view_widget_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-  if (!type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo info =</div><div class='del'>-      {</div><div class='del'>-        "EMinicardViewWidget",</div><div class='del'>-        sizeof (EMinicardViewWidget),</div><div class='del'>-        sizeof (EMinicardViewWidgetClass),</div><div class='del'>-        (GtkClassInitFunc) e_minicard_view_widget_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_minicard_view_widget_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      type = gtk_type_unique (e_canvas_get_type (), &amp;info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	ECanvasClass *canvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-	canvas_class = E_CANVAS_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (e_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::column_width", GTK_TYPE_INT,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_COLUMN_WIDTH);</div><div class='del'>-</div><div class='del'>-	signals [SELECTION_CHANGE] =</div><div class='del'>-		gtk_signal_new ("selection_change",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, selection_change),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	signals [COLUMN_WIDTH_CHANGED] =</div><div class='del'>-		gtk_signal_new ("column_width_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, column_width_changed),</div><div class='del'>-				e_marshal_NONE__DOUBLE,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE);</div><div class='del'>-</div><div class='del'>-	signals [RIGHT_CLICK] =</div><div class='del'>-		gtk_signal_new ("right_click",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, right_click),</div><div class='del'>-				gtk_marshal_INT__POINTER,</div><div class='del'>-				GTK_TYPE_INT, 1, GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg       = e_minicard_view_widget_set_arg;</div><div class='del'>-	object_class-&gt;get_arg       = e_minicard_view_widget_get_arg;</div><div class='del'>-	object_class-&gt;destroy       = e_minicard_view_widget_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize       = e_minicard_view_widget_realize;</div><div class='del'>-	widget_class-&gt;size_allocate = e_minicard_view_widget_size_allocate;</div><div class='del'>-</div><div class='del'>-	canvas_class-&gt;reflow        = e_minicard_view_widget_reflow;</div><div class='del'>-</div><div class='del'>-	klass-&gt;selection_change     = NULL;</div><div class='del'>-	klass-&gt;column_width_changed = NULL;</div><div class='del'>-	klass-&gt;right_click          = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_init (EMinicardViewWidget *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;emv = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;book = NULL;</div><div class='del'>-	view-&gt;query = NULL;</div><div class='del'>-	view-&gt;editable = FALSE;</div><div class='del'>-	view-&gt;column_width = 150;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));</div><div class='del'>-</div><div class='del'>-	widget-&gt;adapter = adapter;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (widget-&gt;adapter));</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_MINICARD_VIEW_WIDGET (o);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (emvw-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(emvw-&gt;book));</div><div class='del'>-		if (GTK_VALUE_OBJECT (*arg)) {</div><div class='del'>-			emvw-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-			if (emvw-&gt;book)</div><div class='del'>-				gtk_object_ref(GTK_OBJECT(emvw-&gt;book));</div><div class='del'>-		} else</div><div class='del'>-			emvw-&gt;book = NULL;</div><div class='del'>-		if (emvw-&gt;emv)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-				       "book", emvw-&gt;book,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		emvw-&gt;query = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (emvw-&gt;emv)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-				       "query", emvw-&gt;query,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		emvw-&gt;editable = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		if (emvw-&gt;emv)</div><div class='del'>-			gtk_object_set (GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-					"editable", emvw-&gt;editable,</div><div class='del'>-					NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_COLUMN_WIDTH:</div><div class='del'>-		emvw-&gt;column_width = GTK_VALUE_INT (*arg);</div><div class='del'>-		if (emvw-&gt;emv) {</div><div class='del'>-			gtk_object_set (GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-					"column_width", (int) emvw-&gt;column_width,</div><div class='del'>-					NULL);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_MINICARD_VIEW_WIDGET (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emvw-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(emvw-&gt;query);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = emvw-&gt;editable;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_COLUMN_WIDTH:</div><div class='del'>-		GTK_VALUE_INT (*arg) = emvw-&gt;column_width;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-	g_free(view-&gt;query);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (view-&gt;adapter));</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS(parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT(widget),</div><div class='del'>-			 signals [SELECTION_CHANGE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT(widget),</div><div class='del'>-			 signals [COLUMN_WIDTH_CHANGED], width);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-right_click (EMinicardView *view, GdkEvent *event, EMinicardViewWidget *widget)</div><div class='del'>-{</div><div class='del'>-	guint ret_val;</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT(widget),</div><div class='del'>-			 signals [RIGHT_CLICK],</div><div class='del'>-			 event, &amp;ret_val);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS(view) ),</div><div class='del'>-			      e_canvas_background_get_type(),</div><div class='del'>-			      "fill_color", "white",</div><div class='del'>-			      NULL );</div><div class='del'>-</div><div class='del'>-	view-&gt;emv = gnome_canvas_item_new(</div><div class='del'>-		gnome_canvas_root( GNOME_CANVAS(view) ),</div><div class='del'>-		e_minicard_view_get_type(),</div><div class='del'>-		"height", (double) 100,</div><div class='del'>-		"minimum_width", (double) 100,</div><div class='del'>-		"adapter", view-&gt;adapter,</div><div class='del'>-		"column_width", (int) view-&gt;column_width,</div><div class='del'>-		NULL );</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (E_REFLOW(view-&gt;emv)-&gt;selection),</div><div class='del'>-			    "selection_changed",</div><div class='del'>-			    selection_change, view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;emv),</div><div class='del'>-			    "column_width_changed",</div><div class='del'>-			    column_width_changed, view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;emv),</div><div class='del'>-			    "right_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (right_click), view);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;realize)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;realize (widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate (widget, allocation);</div><div class='del'>-	</div><div class='del'>-	if (GTK_WIDGET_REALIZED(widget)) {</div><div class='del'>-		double width;</div><div class='del'>-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set( view-&gt;emv,</div><div class='del'>-				       "height", (double) allocation-&gt;height,</div><div class='del'>-				       NULL );</div><div class='del'>-		gnome_canvas_item_set( view-&gt;emv,</div><div class='del'>-				       "minimum_width", (double) allocation-&gt;width,</div><div class='del'>-				       NULL );</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;emv),</div><div class='del'>-			       "width", &amp;width,</div><div class='del'>-			       NULL);</div><div class='del'>-		width = MAX(width, allocation-&gt;width);</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation-&gt;height - 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_reflow(ECanvas *canvas)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);</div><div class='del'>-</div><div class='del'>-	if (E_CANVAS_CLASS(parent_class)-&gt;reflow)</div><div class='del'>-		E_CANVAS_CLASS(parent_class)-&gt;reflow (canvas);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;emv),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, GTK_WIDGET(canvas)-&gt;allocation.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)-&gt;allocation.height - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectionModel *</div><div class='del'>-e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;emv)</div><div class='del'>-		return E_SELECTION_MODEL (E_REFLOW (view-&gt;emv)-&gt;selection);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMinicardView *</div><div class='del'>-e_minicard_view_widget_get_view             (EMinicardViewWidget       *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;emv)</div><div class='del'>-		return E_MINICARD_VIEW (view-&gt;emv);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h<br/>deleted file mode 100644<br/>index c55bb6e636..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view-widget.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-view-widget.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-view-widget.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MINICARD_VIEW_WIDGET_H__</div><div class='del'>-#define __E_MINICARD_VIEW_WIDGET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET_TYPE			(e_minicard_view_widget_get_type ())</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget))</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass))</div><div class='del'>-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))</div><div class='del'>-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardViewWidget       EMinicardViewWidget;</div><div class='del'>-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewWidget</div><div class='del'>-{</div><div class='del'>-	ECanvas parent;</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *emv;</div><div class='del'>-</div><div class='del'>-	EAddressbookReflowAdapter *adapter;</div><div class='del'>-</div><div class='del'>-	EBook *book;</div><div class='del'>-	char *query;</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	double column_width;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewWidgetClass</div><div class='del'>-{</div><div class='del'>-	ECanvasClass parent_class;</div><div class='del'>-	void         (*selection_change)     (EMinicardViewWidget *emvw);</div><div class='del'>-	void         (*column_width_changed) (EMinicardViewWidget *emvw, double width);</div><div class='del'>-	guint        (*right_click)          (EMinicardViewWidget *emvw);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType          e_minicard_view_widget_get_type             (void);</div><div class='del'>-GtkWidget       *e_minicard_view_widget_new                  (EAddressbookReflowAdapter *adapter);</div><div class='del'>-</div><div class='del'>-/* Get parts of the view widget. */</div><div class='del'>-ESelectionModel *e_minicard_view_widget_get_selection_model  (EMinicardViewWidget       *view);</div><div class='del'>-EMinicardView   *e_minicard_view_widget_get_view             (EMinicardViewWidget       *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c<br/>deleted file mode 100644<br/>index 8c758bb746..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,555 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-minicard-view.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkselection.h&gt;</div><div class='del'>-#include &lt;gtk/gtkdnd.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_minicard_view_drag_data_get(GtkWidget *widget,</div><div class='del'>-					  GdkDragContext *context,</div><div class='del'>-					  GtkSelectionData *selection_data,</div><div class='del'>-					  guint info,</div><div class='del'>-					  guint time,</div><div class='del'>-					  EMinicardView *view);</div><div class='del'>-</div><div class='del'>-static EReflowClass *parent_class = NULL;</div><div class='del'>-#define PARENT_TYPE (E_REFLOW_TYPE)</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ADAPTER,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_EDITABLE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RIGHT_CLICK,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-enum DndTargetType {</div><div class='del'>-	DND_TARGET_TYPE_VCARD_LIST,</div><div class='del'>-};</div><div class='del'>-#define VCARD_LIST_TYPE "text/x-vcard"</div><div class='del'>-static GtkTargetEntry drag_types[] = {</div><div class='del'>-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }</div><div class='del'>-};</div><div class='del'>-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_drag_data_get(GtkWidget *widget,</div><div class='del'>-			      GdkDragContext *context,</div><div class='del'>-			      GtkSelectionData *selection_data,</div><div class='del'>-			      guint info,</div><div class='del'>-			      guint time,</div><div class='del'>-			      EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	if (!E_IS_MINICARD_VIEW(view))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (info) {</div><div class='del'>-	case DND_TARGET_TYPE_VCARD_LIST: {</div><div class='del'>-		char *value;</div><div class='del'>-		</div><div class='del'>-		value = e_card_list_get_vcard(view-&gt;drag_list);</div><div class='del'>-</div><div class='del'>-		gtk_selection_data_set (selection_data,</div><div class='del'>-					selection_data-&gt;target,</div><div class='del'>-					8,</div><div class='del'>-					value, strlen (value));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_foreach (view-&gt;drag_list, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (view-&gt;drag_list);</div><div class='del'>-	view-&gt;drag_list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	GdkDragContext *context;</div><div class='del'>-	GtkTargetList *target_list;</div><div class='del'>-	GdkDragAction actions = GDK_ACTION_MOVE | GDK_ACTION_COPY;</div><div class='del'>-	</div><div class='del'>-	view-&gt;drag_list = e_minicard_view_get_card_list (view);</div><div class='del'>-</div><div class='del'>-	g_print ("dragging %d card(s)\n", g_list_length (view-&gt;drag_list));</div><div class='del'>-</div><div class='del'>-	target_list = gtk_target_list_new (drag_types, num_drag_types);</div><div class='del'>-</div><div class='del'>-	context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)-&gt;canvas),</div><div class='del'>-				  target_list, actions, 1/*XXX*/, event);</div><div class='del'>-</div><div class='del'>-	if (!view-&gt;canvas_drag_data_get_id)</div><div class='del'>-		view-&gt;canvas_drag_data_get_id = gtk_signal_connect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)-&gt;canvas),</div><div class='del'>-								    "drag_data_get",</div><div class='del'>-								    GTK_SIGNAL_FUNC (e_minicard_view_drag_data_get),</div><div class='del'>-								    view);</div><div class='del'>-</div><div class='del'>-	gtk_drag_set_icon_default (context);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_empty_message (EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	char *empty_message;</div><div class='del'>-	gboolean editable = FALSE;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;adapter) {</div><div class='del'>-		gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-				"editable", &amp;editable,</div><div class='del'>-				NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (editable)</div><div class='del'>-		empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view.\n\n"</div><div class='del'>-							    "Double-click here to create a new Contact."));</div><div class='del'>-	else</div><div class='del'>-		empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view."));</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT(view),</div><div class='del'>-			"empty_message", empty_message,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	g_free (empty_message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-writable_status_change (EAddressbookModel *model, gboolean writable, EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	set_empty_message (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-adapter_changed (EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	set_empty_message (view);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;adapter), "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_minicard_view_drag_begin), view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EMinicardView *view;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	view = E_MINICARD_VIEW (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_ADAPTER:</div><div class='del'>-		if (view-&gt;adapter) {</div><div class='del'>-			if (view-&gt;writable_status_id) {</div><div class='del'>-				EAddressbookModel *model;</div><div class='del'>-				gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-						"model", &amp;model,</div><div class='del'>-						NULL);</div><div class='del'>-				if (model) {</div><div class='del'>-					gtk_signal_disconnect (GTK_OBJECT (model), view-&gt;writable_status_id);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT(view-&gt;adapter));</div><div class='del'>-		}</div><div class='del'>-		view-&gt;writable_status_id = 0;</div><div class='del'>-		view-&gt;adapter = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (view-&gt;adapter));</div><div class='del'>-		adapter_changed (view);</div><div class='del'>-		gtk_object_set (GTK_OBJECT (view),</div><div class='del'>-				"model", view-&gt;adapter,</div><div class='del'>-				NULL);</div><div class='del'>-		if (view-&gt;adapter) {</div><div class='del'>-			EAddressbookModel *model;</div><div class='del'>-			gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					"model", &amp;model,</div><div class='del'>-					NULL);</div><div class='del'>-			if (model) {</div><div class='del'>-				view-&gt;writable_status_id =</div><div class='del'>-					gtk_signal_connect (GTK_OBJECT (model), "writable_status",</div><div class='del'>-							    GTK_SIGNAL_FUNC (writable_status_change), view);</div><div class='del'>-			}</div><div class='del'>-							    </div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "book", GTK_VALUE_OBJECT (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		set_empty_message (view);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "query", GTK_VALUE_STRING (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		gtk_object_set (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "editable", GTK_VALUE_BOOL (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		set_empty_message (view);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardView *view;</div><div class='del'>-</div><div class='del'>-	view = E_MINICARD_VIEW (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ADAPTER:</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = view-&gt;adapter;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "book", &amp;GTK_VALUE_OBJECT (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "query", &amp;GTK_VALUE_STRING (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					    "editable", &amp;GTK_VALUE_BOOL (*arg),</div><div class='del'>-					    NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicardView *view = E_MINICARD_VIEW(object);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;canvas_drag_data_get_id) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)-&gt;canvas),</div><div class='del'>-				       view-&gt;canvas_drag_data_get_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (view-&gt;adapter) {</div><div class='del'>-		if (view-&gt;writable_status_id) {</div><div class='del'>-			EAddressbookModel *model;</div><div class='del'>-			gtk_object_get (GTK_OBJECT (view-&gt;adapter),</div><div class='del'>-					"model", &amp;model,</div><div class='del'>-					NULL);</div><div class='del'>-			if (model) {</div><div class='del'>-				gtk_signal_disconnect (GTK_OBJECT (model), view-&gt;writable_status_id);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(view-&gt;adapter));</div><div class='del'>-	}</div><div class='del'>-	view-&gt;writable_status_id = 0;</div><div class='del'>-	view-&gt;adapter = NULL;</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS(parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-e_minicard_view_right_click (EMinicardView *view, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	guint ret_val = 0;</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (view), signals[RIGHT_CLICK],</div><div class='del'>-			 event, &amp;ret_val);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMinicardView *view;</div><div class='del'>- </div><div class='del'>-	view = E_MINICARD_VIEW (item);</div><div class='del'>-</div><div class='del'>-	switch( event-&gt;type ) {</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		if (((GdkEventButton *)event)-&gt;button == 1)</div><div class='del'>-		{</div><div class='del'>-			EBook *book;</div><div class='del'>-			gboolean editable;</div><div class='del'>-</div><div class='del'>-			gtk_object_get(GTK_OBJECT(view), "book", &amp;book, NULL);</div><div class='del'>-			gtk_object_get(GTK_OBJECT(view-&gt;adapter), "editable", &amp;editable, NULL);</div><div class='del'>-</div><div class='del'>-			g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-			e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, editable);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 3) {</div><div class='del'>-			e_minicard_view_right_click (view, event);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;event)</div><div class='del'>-		return GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;event(item, event);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMinicardView *view;</div><div class='del'>-	int return_val = FALSE;</div><div class='del'>-</div><div class='del'>-	view = E_MINICARD_VIEW (reflow);</div><div class='del'>-	if (parent_class-&gt;selection_event) {</div><div class='del'>-		return_val = parent_class-&gt;selection_event (reflow, item, event);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_FOCUS_CHANGE:</div><div class='del'>-		if (event-&gt;focus_change.in) {</div><div class='del'>-			int i;</div><div class='del'>-			for (i = 0; i &lt; reflow-&gt;count; i++) {</div><div class='del'>-				if (reflow-&gt;items[i] == item) {</div><div class='del'>-					e_selection_model_maybe_do_something(reflow-&gt;selection, i, 0, 0);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 3) {</div><div class='del'>-			return_val = e_minicard_view_right_click (view, event);</div><div class='del'>-			if (!return_val)</div><div class='del'>-				e_selection_model_right_click_up(reflow-&gt;selection);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return return_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EMinicardView *view;</div><div class='del'>-	EBookCallback cb;</div><div class='del'>-	gpointer closure;</div><div class='del'>-} ViewCbClosure;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_remove (int i, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	ViewCbClosure *viewcbclosure = user_data;</div><div class='del'>-	EMinicardView *view = viewcbclosure-&gt;view;</div><div class='del'>-	EBookCallback cb = viewcbclosure-&gt;cb;</div><div class='del'>-	gpointer closure = viewcbclosure-&gt;closure;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT(view-&gt;adapter),</div><div class='del'>-			"book", &amp;book,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	card = e_addressbook_reflow_adapter_get_card (view-&gt;adapter, i);</div><div class='del'>-</div><div class='del'>-	e_book_remove_card(book, card, cb, closure);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int</div><div class='del'>-compare_to_utf_str (EMinicard *card, const char *utf_str)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(card != NULL, 0);</div><div class='del'>-	g_return_val_if_fail(E_IS_MINICARD(card), 0);</div><div class='del'>-</div><div class='del'>-	if (g_unichar_isdigit (g_utf8_get_char (utf_str))) {</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;card) {</div><div class='del'>-		char *file_as;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card-&gt;card),</div><div class='del'>-			       "file_as", &amp;file_as,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (file_as)</div><div class='del'>-			return g_utf8_strcasecmp (file_as, utf_str);</div><div class='del'>-		else</div><div class='del'>-			return 0;</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_class_init (EMinicardViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-	EReflowClass *reflow_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) klass;</div><div class='del'>-	reflow_class = (EReflowClass *) klass;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-	</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardView::adapter", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ADAPTER);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardView::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-</div><div class='del'>-	signals [RIGHT_CLICK] =</div><div class='del'>-		gtk_signal_new ("right_click",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardViewClass, right_click),</div><div class='del'>-				gtk_marshal_INT__POINTER,</div><div class='del'>-				GTK_TYPE_INT, 1, GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg         = e_minicard_view_set_arg;</div><div class='del'>-	object_class-&gt;get_arg         = e_minicard_view_get_arg;</div><div class='del'>-	object_class-&gt;destroy         = e_minicard_view_destroy;</div><div class='del'>-</div><div class='del'>-	item_class-&gt;event             = e_minicard_view_event;</div><div class='del'>-</div><div class='del'>-	reflow_class-&gt;selection_event = e_minicard_view_selection_event;</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_init (EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;adapter = NULL;</div><div class='del'>-	view-&gt;canvas_drag_data_get_id = 0;</div><div class='del'>-	view-&gt;writable_status_id = 0;</div><div class='del'>-</div><div class='del'>-	set_empty_message (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType reflow_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!reflow_type) {</div><div class='del'>-		static const GtkTypeInfo reflow_info = {</div><div class='del'>-			"EMinicardView",</div><div class='del'>-			sizeof (EMinicardView),</div><div class='del'>-			sizeof (EMinicardViewClass),</div><div class='del'>-			(GtkClassInitFunc) e_minicard_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_minicard_view_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		reflow_type = gtk_type_unique (PARENT_TYPE, &amp;reflow_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return reflow_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_view_remove_selection(EMinicardView *view,</div><div class='del'>-				 EBookCallback  cb,</div><div class='del'>-				 gpointer       closure)</div><div class='del'>-{</div><div class='del'>-	ViewCbClosure viewcbclosure;</div><div class='del'>-	viewcbclosure.view = view;</div><div class='del'>-	viewcbclosure.cb = cb;</div><div class='del'>-	viewcbclosure.closure = closure;</div><div class='del'>-</div><div class='del'>-	e_selection_model_foreach (E_REFLOW (view)-&gt;selection,</div><div class='del'>-				   do_remove,</div><div class='del'>-				   &amp;viewcbclosure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_view_jump_to_letter (EMinicardView *view,</div><div class='del'>-                                gunichar letter)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	char uft_str[6 + 1];</div><div class='del'>-</div><div class='del'>-	utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';</div><div class='del'>-	e_reflow_sorted_jump (E_REFLOW_SORTED (view),</div><div class='del'>-	                      (GCompareFunc) compare_to_utf_str,</div><div class='del'>-	                      utf_str);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GList *list;</div><div class='del'>-	EAddressbookReflowAdapter *adapter;</div><div class='del'>-} ModelAndList;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_to_list (int index, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ModelAndList *mal = closure;</div><div class='del'>-	mal-&gt;list = g_list_prepend (mal-&gt;list, e_addressbook_reflow_adapter_get_card (mal-&gt;adapter, index));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-e_minicard_view_get_card_list (EMinicardView *view)</div><div class='del'>-{</div><div class='del'>-	ModelAndList mal;</div><div class='del'>-</div><div class='del'>-	mal.adapter = view-&gt;adapter;</div><div class='del'>-	mal.list = NULL;</div><div class='del'>-</div><div class='del'>-	e_selection_model_foreach (E_REFLOW (view)-&gt;selection, add_to_list, &amp;mal);</div><div class='del'>-</div><div class='del'>-	mal.list = g_list_reverse (mal.list);</div><div class='del'>-	return mal.list;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h<br/>deleted file mode 100644<br/>index 1f23c62754..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-view.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MINICARD_VIEW_H__</div><div class='del'>-#define __E_MINICARD_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-reflow.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-selection-model-simple.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "e-addressbook-reflow-adapter.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicardView - A canvas item container.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * book         EBook           RW              book to query</div><div class='del'>- * query        string          RW              query string</div><div class='del'>- *</div><div class='del'>- * From EReflowSorted:   (you should really know what you're doing if you set these.)</div><div class='del'>- * compare_func  GCompareFunc   RW              compare function</div><div class='del'>- * string_func   EReflowStringFunc RW           string function</div><div class='del'>- *</div><div class='del'>- * From EReflow:</div><div class='del'>- * minimum_width double         RW              minimum width of the reflow.  width &gt;= minimum_width</div><div class='del'>- * width        double          R               width of the reflow</div><div class='del'>- * height       double          RW              height of the reflow</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_VIEW_TYPE			(e_minicard_view_get_type ())</div><div class='del'>-#define E_MINICARD_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView))</div><div class='del'>-#define E_MINICARD_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass))</div><div class='del'>-#define E_IS_MINICARD_VIEW(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE))</div><div class='del'>-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardView       EMinicardView;</div><div class='del'>-typedef struct _EMinicardViewClass  EMinicardViewClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardView</div><div class='del'>-{</div><div class='del'>-	EReflow parent;</div><div class='del'>-</div><div class='del'>-	EAddressbookReflowAdapter *adapter;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-</div><div class='del'>-	GList *drag_list;</div><div class='del'>-</div><div class='del'>-	guint canvas_drag_data_get_id;</div><div class='del'>-</div><div class='del'>-	guint writable_status_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewClass</div><div class='del'>-{</div><div class='del'>-	EReflowClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*right_click) (EMinicardView *view, GdkEvent *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType  e_minicard_view_get_type          (void);</div><div class='del'>-void     e_minicard_view_remove_selection  (EMinicardView *view,</div><div class='del'>-					    EBookCallback  cb,</div><div class='del'>-					    gpointer       closure);</div><div class='del'>-void     e_minicard_view_jump_to_letter    (EMinicardView *view,</div><div class='del'>-					    gunichar       letter);</div><div class='del'>-GList   *e_minicard_view_get_card_list     (EMinicardView *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c<br/>deleted file mode 100644<br/>index 04ef2f0823..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget-test.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-widget-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* test-minicard.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TEST_VCARD                   \</div><div class='del'>-"BEGIN:VCARD</div><div class='del'>-"                      \</div><div class='del'>-"FN:Nat</div><div class='del'>-"                           \</div><div class='del'>-"N:Friedman;Nat;D;Mr.</div><div class='del'>-"             \</div><div class='del'>-"ORG:Ximian, Inc.</div><div class='del'>-"             \</div><div class='del'>-"TITLE:Head Geek</div><div class='del'>-"                  \</div><div class='del'>-"ROLE:Programmer/Executive</div><div class='del'>-"        \</div><div class='del'>-"BDAY:1977-08-06</div><div class='del'>-"                  \</div><div class='del'>-"TEL;WORK:617 679 1984</div><div class='del'>-"            \</div><div class='del'>-"TEL;CELL:123 456 7890</div><div class='del'>-"            \</div><div class='del'>-"EMAIL;INTERNET:nat@nat.org</div><div class='del'>-"       \</div><div class='del'>-"EMAIL;INTERNET:nat@ximian.com</div><div class='del'>-" \</div><div class='del'>-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;</div><div class='del'>-" \</div><div class='del'>-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA</div><div class='del'>-" \</div><div class='del'>-"END:VCARD</div><div class='del'>-"                        \</div><div class='del'>-"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include "e-minicard-widget.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Minicard Widget Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the minicard widget" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *minicard;</div><div class='del'>-  ECard *card;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Minicard Widget Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Minicard Widget Test", NULL);</div><div class='del'>-</div><div class='del'>-  minicard = e_minicard_widget_new();</div><div class='del'>-  card = e_card_new(TEST_VCARD);</div><div class='del'>-  gtk_object_set(GTK_OBJECT(minicard),</div><div class='del'>-		 "card", card,</div><div class='del'>-		 NULL);</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), minicard );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c<br/>deleted file mode 100644<br/>index 566a43b087..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-table-field-chooser.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include "e-minicard-widget.h"</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-</div><div class='del'>-static void e_minicard_widget_init		(EMinicardWidget		 *card);</div><div class='del'>-static void e_minicard_widget_class_init	(EMinicardWidgetClass	 *klass);</div><div class='del'>-static void e_minicard_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_widget_destroy (GtkObject *object);</div><div class='del'>-static void e_minicard_widget_size_request	 (GtkWidget	    *widget, GtkRequisition    *requisition);</div><div class='del'>-static void e_minicard_widget_size_allocate	 (GtkWidget	    *widget, GtkAllocation     *allocation);</div><div class='del'>-static void e_minicard_widget_reflow             (ECanvas           *canvas);</div><div class='del'>-</div><div class='del'>-static ECanvasClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_widget_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo info =</div><div class='del'>-			{</div><div class='del'>-				"EMinicardWidget",</div><div class='del'>-				sizeof (EMinicardWidget),</div><div class='del'>-				sizeof (EMinicardWidgetClass),</div><div class='del'>-				(GtkClassInitFunc) e_minicard_widget_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_minicard_widget_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			type = gtk_type_unique (e_canvas_get_type (), &amp;info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_class_init (EMinicardWidgetClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	ECanvasClass   *ecanvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS(klass);</div><div class='del'>-	ecanvas_class = E_CANVAS_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (e_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_minicard_widget_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_minicard_widget_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_minicard_widget_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;size_request  = e_minicard_widget_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = e_minicard_widget_size_allocate;</div><div class='del'>-</div><div class='del'>-	ecanvas_class-&gt;reflow = e_minicard_widget_reflow;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardWidget::card", GTK_TYPE_OBJECT,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-	if (height &lt;= 0)</div><div class='del'>-		height = 1;</div><div class='del'>-	widget-&gt;requisition.height = height;</div><div class='del'>-	widget-&gt;requisition.width  = 200;</div><div class='del'>-	requisition-&gt;height = height;</div><div class='del'>-	requisition-&gt;width  = 200;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;item,</div><div class='del'>-			       "width", (double) allocation-&gt;width,</div><div class='del'>-			       NULL );</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-	height = MAX(height, allocation-&gt;height);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS( emw ), 0, 0, allocation-&gt;width - 1, height - 1);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;rect,</div><div class='del'>-			       "x2", (double) allocation-&gt;width,</div><div class='del'>-			       "y2", (double) height,</div><div class='del'>-			       NULL );</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate(widget, allocation);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void e_minicard_widget_reflow(ECanvas *canvas)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(canvas);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	height = MAX(height, GTK_WIDGET(emw)-&gt;allocation.height);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS(emw), 0, 0, GTK_WIDGET(emw)-&gt;allocation.width - 1, height - 1);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;rect,</div><div class='del'>-			       "x2", (double) GTK_WIDGET(emw)-&gt;allocation.width,</div><div class='del'>-			       "y2", (double) height,</div><div class='del'>-			       NULL );	</div><div class='del'>-	</div><div class='del'>-	gtk_widget_queue_resize(GTK_WIDGET(canvas));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_init (EMinicardWidget *emw)</div><div class='del'>-{</div><div class='del'>-	emw-&gt;rect = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),</div><div class='del'>-					   gnome_canvas_rect_get_type(),</div><div class='del'>-					   "x1", (double) 0,</div><div class='del'>-					   "y1", (double) 0,</div><div class='del'>-					   "x2", (double) 100,</div><div class='del'>-					   "y2", (double) 100,</div><div class='del'>-					   "fill_color", "white",</div><div class='del'>-					   NULL );</div><div class='del'>-</div><div class='del'>-	emw-&gt;item = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),</div><div class='del'>-					  e_minicard_get_type(),</div><div class='del'>-					  "width", (double) 100,</div><div class='del'>-					  NULL );</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( emw ),</div><div class='del'>-					 0, 0,</div><div class='del'>-					 100, 100 );</div><div class='del'>-	</div><div class='del'>-	emw-&gt;card = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	if (emw-&gt;card)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(emw-&gt;card));</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_minicard_widget_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-	gpointer ptr;</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		ptr = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		e_minicard_widget_set_card (emw, ptr ? E_CARD (ptr) : NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (emw-&gt;card)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emw-&gt;card);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_widget_set_card (EMinicardWidget *emw, ECard *card)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (emw &amp;&amp; E_IS_MINICARD_WIDGET (emw));</div><div class='del'>-	g_return_if_fail (card == NULL || E_IS_CARD (card));</div><div class='del'>-</div><div class='del'>-	if (card != emw-&gt;card) {</div><div class='del'>-</div><div class='del'>-		if (emw-&gt;card)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (emw-&gt;card));</div><div class='del'>-</div><div class='del'>-		emw-&gt;card = card;</div><div class='del'>-</div><div class='del'>-		if (emw-&gt;card)</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (emw-&gt;card));</div><div class='del'>-</div><div class='del'>-		if (emw-&gt;item)</div><div class='del'>-			gtk_object_set (GTK_OBJECT (emw-&gt;item),</div><div class='del'>-				       "card", emw-&gt;card,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h<br/>deleted file mode 100644<br/>index eaf0f8edb6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard-widget.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-widget.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MINICARD_WIDGET_H__</div><div class='del'>-#define __E_MINICARD_WIDGET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicardWidget - A card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_WIDGET_TYPE			(e_minicard_widget_get_type ())</div><div class='del'>-#define E_MINICARD_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget))</div><div class='del'>-#define E_MINICARD_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass))</div><div class='del'>-#define E_IS_MINICARD_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE))</div><div class='del'>-#define E_IS_MINICARD_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardWidget       EMinicardWidget;</div><div class='del'>-typedef struct _EMinicardWidgetClass  EMinicardWidgetClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardWidget</div><div class='del'>-{</div><div class='del'>-	ECanvas parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	ECard *card;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardWidgetClass</div><div class='del'>-{</div><div class='del'>-	ECanvasClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_minicard_widget_new(void);</div><div class='del'>-GtkType    e_minicard_widget_get_type (void);</div><div class='del'>-</div><div class='del'>-void e_minicard_widget_set_card (EMinicardWidget *, ECard *);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_WIDGET_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c<br/>deleted file mode 100644<br/>index d8e34577b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,996 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-minicard.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkdnd.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "e-addressbook-util.h"</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-card-merging.h"</div><div class='del'>-</div><div class='del'>-static void e_minicard_init		(EMinicard		 *card);</div><div class='del'>-static void e_minicard_class_init	(EMinicardClass	 *klass);</div><div class='del'>-static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_destroy (GtkObject *object);</div><div class='del'>-static void e_minicard_finalize (GtkObject *object);</div><div class='del'>-static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event);</div><div class='del'>-static void e_minicard_realize (GnomeCanvasItem *item);</div><div class='del'>-static void e_minicard_unrealize (GnomeCanvasItem *item);</div><div class='del'>-static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );</div><div class='del'>-</div><div class='del'>-static void e_minicard_resize_children( EMinicard *e_minicard );</div><div class='del'>-static void remodel( EMinicard *e_minicard );</div><div class='del'>-</div><div class='del'>-static gint e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardField EMinicardField;</div><div class='del'>-</div><div class='del'>-struct _EMinicardField {</div><div class='del'>-	ECardSimpleField field;</div><div class='del'>-	GnomeCanvasItem *label;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define LIST_ICON_FILENAME "contact-is-a-list.png"</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_FIELD(field) ((EMinicardField *)(field))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_field_destroy(EMinicardField *field)</div><div class='del'>-{</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(field-&gt;label));</div><div class='del'>-	g_free(field);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_WIDTH,</div><div class='del'>-	ARG_HEIGHT,</div><div class='del'>-	ARG_HAS_FOCUS,</div><div class='del'>-	ARG_SELECTED,</div><div class='del'>-	ARG_HAS_CURSOR,</div><div class='del'>-	ARG_EDITABLE,</div><div class='del'>-	ARG_CARD</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SELECTED,</div><div class='del'>-	DRAG_BEGIN,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_minicard_signals [LAST_SIGNAL] = {0, };</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType minicard_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!minicard_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo minicard_info =</div><div class='del'>-      {</div><div class='del'>-        "EMinicard",</div><div class='del'>-        sizeof (EMinicard),</div><div class='del'>-        sizeof (EMinicardClass),</div><div class='del'>-        (GtkClassInitFunc) e_minicard_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_minicard_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      minicard_type = gtk_type_unique (gnome_canvas_group_get_type (), &amp;minicard_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return minicard_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_class_init (EMinicardClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());</div><div class='del'>-  </div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::width", GTK_TYPE_DOUBLE, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_WIDTH); </div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::height", GTK_TYPE_DOUBLE, </div><div class='del'>-				 GTK_ARG_READABLE, ARG_HEIGHT);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::has_focus", GTK_TYPE_ENUM,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_HAS_FOCUS);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::selected", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_SELECTED);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::has_cursor", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_HAS_CURSOR);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-</div><div class='del'>-	e_minicard_signals [SELECTED] =</div><div class='del'>-		gtk_signal_new ("selected",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardClass, selected),</div><div class='del'>-				gtk_marshal_INT__POINTER,</div><div class='del'>-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	e_minicard_signals [DRAG_BEGIN] =</div><div class='del'>-		gtk_signal_new ("drag_begin",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMinicardClass, drag_begin),</div><div class='del'>-				gtk_marshal_INT__POINTER,</div><div class='del'>-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_minicard_signals, LAST_SIGNAL);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg  = e_minicard_set_arg;</div><div class='del'>-	object_class-&gt;get_arg  = e_minicard_get_arg;</div><div class='del'>-	object_class-&gt;destroy  = e_minicard_destroy;</div><div class='del'>-	object_class-&gt;finalize = e_minicard_finalize;</div><div class='del'>-  </div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;realize    = e_minicard_realize;</div><div class='del'>-	item_class-&gt;unrealize  = e_minicard_unrealize;</div><div class='del'>-	item_class-&gt;event      = e_minicard_event;</div><div class='del'>-</div><div class='del'>-	klass-&gt;selected        = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_init (EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	/*   minicard-&gt;card = NULL;*/</div><div class='del'>-	minicard-&gt;rect             = NULL;</div><div class='del'>-	minicard-&gt;fields           = NULL;</div><div class='del'>-	minicard-&gt;width            = 10;</div><div class='del'>-	minicard-&gt;height           = 10;</div><div class='del'>-	minicard-&gt;has_focus        = FALSE;</div><div class='del'>-	minicard-&gt;selected         = FALSE;</div><div class='del'>-	minicard-&gt;editable         = FALSE;</div><div class='del'>-	minicard-&gt;has_cursor       = FALSE;</div><div class='del'>-</div><div class='del'>-	minicard-&gt;card             = NULL;</div><div class='del'>-	minicard-&gt;simple           = e_card_simple_new(NULL);</div><div class='del'>-</div><div class='del'>-	minicard-&gt;list_icon_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME);</div><div class='del'>-	minicard-&gt;list_icon_size   = gdk_pixbuf_get_height (minicard-&gt;list_icon_pixbuf);</div><div class='del'>-</div><div class='del'>-	minicard-&gt;editor           = NULL;</div><div class='del'>-</div><div class='del'>-	minicard-&gt;changed          = FALSE;</div><div class='del'>-</div><div class='del'>-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_selected (EMinicard *minicard, gboolean selected)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)-&gt;canvas);</div><div class='del'>-	if (selected) {</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;rect, </div><div class='del'>-				       "outline_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL],</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;header_rect, </div><div class='del'>-				       "fill_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_SELECTED],</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;header_text, </div><div class='del'>-				       "fill_color_gdk", &amp;canvas-&gt;style-&gt;text[GTK_STATE_SELECTED],</div><div class='del'>-				       NULL);</div><div class='del'>-	} else {</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;rect, </div><div class='del'>-				       "outline_color", NULL, </div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;header_rect, </div><div class='del'>-				       "fill_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL],</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_set (minicard-&gt;header_text, </div><div class='del'>-				       "fill_color_gdk", &amp;canvas-&gt;style-&gt;fg[GTK_STATE_NORMAL],</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-	minicard-&gt;selected = selected;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_has_cursor (EMinicard *minicard, gboolean has_cursor)</div><div class='del'>-{</div><div class='del'>-	if (!minicard-&gt;has_focus &amp;&amp; has_cursor)</div><div class='del'>-		e_canvas_item_grab_focus(GNOME_CANVAS_ITEM (minicard), FALSE);</div><div class='del'>-	minicard-&gt;has_cursor = has_cursor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	e_minicard = E_MINICARD (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		if (e_minicard-&gt;width != GTK_VALUE_DOUBLE (*arg)) {</div><div class='del'>-			e_minicard-&gt;width = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-			e_minicard_resize_children(e_minicard);</div><div class='del'>-			if ( GTK_OBJECT_FLAGS( e_minicard ) &amp; GNOME_CANVAS_ITEM_REALIZED )</div><div class='del'>-				e_canvas_item_request_reflow(item);</div><div class='del'>-		}</div><div class='del'>-	  break;</div><div class='del'>-	case ARG_HAS_FOCUS:</div><div class='del'>-		if (e_minicard-&gt;fields) {</div><div class='del'>-			if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_START ||</div><div class='del'>-			     GTK_VALUE_ENUM(*arg) == E_FOCUS_CURRENT) {</div><div class='del'>-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard-&gt;fields-&gt;data)-&gt;label,</div><div class='del'>-						      "has_focus", GTK_VALUE_ENUM(*arg),</div><div class='del'>-						      NULL);</div><div class='del'>-			} else if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_END ) {</div><div class='del'>-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard-&gt;fields)-&gt;data)-&gt;label,</div><div class='del'>-						      "has_focus", GTK_VALUE_ENUM(*arg),</div><div class='del'>-						      NULL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			if (!e_minicard-&gt;has_focus)</div><div class='del'>-				e_canvas_item_grab_focus(item, FALSE);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SELECTED:</div><div class='del'>-		if (e_minicard-&gt;selected != GTK_VALUE_BOOL(*arg))</div><div class='del'>-			set_selected (e_minicard, GTK_VALUE_BOOL(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		e_minicard-&gt;editable = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		for (l = e_minicard-&gt;fields; l; l = l-&gt;next)</div><div class='del'>-			gtk_object_set (GTK_OBJECT (E_MINICARD_FIELD (l-&gt;data)-&gt;label),</div><div class='del'>-					"editable", e_minicard-&gt;editable,</div><div class='del'>-					NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HAS_CURSOR:</div><div class='del'>-		d(g_print("%s: ARG_HAS_CURSOR\n", __FUNCTION__));</div><div class='del'>-		if (e_minicard-&gt;has_cursor != GTK_VALUE_BOOL(*arg))</div><div class='del'>-			set_has_cursor (e_minicard, GTK_VALUE_BOOL(*arg));</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (e_minicard-&gt;card)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT(e_minicard-&gt;card));</div><div class='del'>-		e_minicard-&gt;card = E_CARD(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-		if (e_minicard-&gt;card)</div><div class='del'>-			gtk_object_ref (GTK_OBJECT(e_minicard-&gt;card));</div><div class='del'>-		gtk_object_set(GTK_OBJECT(e_minicard-&gt;simple),</div><div class='del'>-			       "card", e_minicard-&gt;card,</div><div class='del'>-			       NULL);</div><div class='del'>-		remodel(e_minicard);</div><div class='del'>-		e_canvas_item_request_reflow(item);</div><div class='del'>-		e_minicard-&gt;changed = FALSE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-	  GTK_VALUE_DOUBLE (*arg) = e_minicard-&gt;width;</div><div class='del'>-	  break;</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-	  GTK_VALUE_DOUBLE (*arg) = e_minicard-&gt;height;</div><div class='del'>-	  break;</div><div class='del'>-	case ARG_HAS_FOCUS:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = e_minicard-&gt;has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SELECTED:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_minicard-&gt;selected;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_HAS_CURSOR:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_minicard-&gt;has_cursor;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_minicard-&gt;editable;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		e_card_simple_sync_card(e_minicard-&gt;simple);</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard-&gt;card);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	  arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-	  break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MINICARD (object));</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (object);</div><div class='del'>-	</div><div class='del'>-	g_list_foreach(e_minicard-&gt;fields, (GFunc) e_minicard_field_destroy, NULL);</div><div class='del'>-	g_list_free(e_minicard-&gt;fields);</div><div class='del'>-</div><div class='del'>-	gdk_pixbuf_unref (e_minicard-&gt;list_icon_pixbuf);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MINICARD (object));</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (object);</div><div class='del'>-	</div><div class='del'>-	if (e_minicard-&gt;card)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(e_minicard-&gt;card));</div><div class='del'>-	if (e_minicard-&gt;simple)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT(e_minicard-&gt;simple));</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;finalize) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( item );</div><div class='del'>-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)-&gt;canvas);</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;realize)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;realize) (item);</div><div class='del'>-	</div><div class='del'>-	e_minicard-&gt;rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 0,</div><div class='del'>-				 "y1", (double) 0,</div><div class='del'>-				 "x2", (double) e_minicard-&gt;width - 1,</div><div class='del'>-				 "y2", (double) e_minicard-&gt;height - 1,</div><div class='del'>-				 "outline_color", NULL,</div><div class='del'>-				 NULL );</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;header_rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 2,</div><div class='del'>-				 "y1", (double) 2,</div><div class='del'>-				 "x2", (double) e_minicard-&gt;width - 3,</div><div class='del'>-				 "y2", (double) e_minicard-&gt;height - 3,</div><div class='del'>-				 "fill_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL],</div><div class='del'>-				 NULL );</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;header_text =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 e_text_get_type(),</div><div class='del'>-				 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				 "width", (double) ( e_minicard-&gt;width - 12 ),</div><div class='del'>-				 "clip", TRUE,</div><div class='del'>-				 "use_ellipsis", TRUE,</div><div class='del'>-#if 0</div><div class='del'>-				 "font", "fixed-bold-10",</div><div class='del'>-#endif</div><div class='del'>-				 "fill_color_gdk", &amp;canvas-&gt;style-&gt;fg[GTK_STATE_NORMAL],</div><div class='del'>-				 "text", "",</div><div class='del'>-				 "draw_background", FALSE,</div><div class='del'>-				 NULL );</div><div class='del'>-</div><div class='del'>-	e_canvas_item_move_absolute(e_minicard-&gt;header_text, 6, 6);</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;list_icon = </div><div class='del'>-		gnome_canvas_item_new ( group,</div><div class='del'>-					gnome_canvas_pixbuf_get_type(),</div><div class='del'>-					"pixbuf", e_minicard-&gt;list_icon_pixbuf,</div><div class='del'>-					NULL);</div><div class='del'>-</div><div class='del'>-	remodel(e_minicard);</div><div class='del'>-	e_canvas_item_request_reflow(item);</div><div class='del'>-</div><div class='del'>-	if (!item-&gt;canvas-&gt;aa) {</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  EMinicard *e_minicard;</div><div class='del'>-</div><div class='del'>-  e_minicard = E_MINICARD (item);</div><div class='del'>-</div><div class='del'>-  if (!item-&gt;canvas-&gt;aa)</div><div class='del'>-    {</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;unrealize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;unrealize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_modified_cb (EBook* book, EBookStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	d(g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__));</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		e_addressbook_error_dialog (_("Error modifying card"), status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the contact editor is closed */</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (GtkObject *editor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMinicard *minicard = data;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (editor));</div><div class='del'>-	minicard-&gt;editor = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-	GtkWidget *canvas;</div><div class='del'>-	</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)-&gt;canvas);</div><div class='del'>-	</div><div class='del'>-	switch( event-&gt;type ) {</div><div class='del'>-	case GDK_FOCUS_CHANGE:</div><div class='del'>-		{</div><div class='del'>-			GdkEventFocus *focus_event = (GdkEventFocus *) event;</div><div class='del'>-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", __FUNCTION__, focus_event-&gt;in?"in":"out"));</div><div class='del'>-			if (focus_event-&gt;in) {</div><div class='del'>-				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */</div><div class='del'>-				e_minicard-&gt;has_focus = TRUE;</div><div class='del'>-				if (!e_minicard-&gt;selected) {</div><div class='del'>-					e_minicard_selected(e_minicard, event);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				EBook *book = NULL;</div><div class='del'>-</div><div class='del'>-				if (e_minicard-&gt;changed) {</div><div class='del'>-				</div><div class='del'>-					e_card_simple_sync_card(e_minicard-&gt;simple);</div><div class='del'>-</div><div class='del'>-					if (E_IS_MINICARD_VIEW(GNOME_CANVAS_ITEM(e_minicard)-&gt;parent)) {</div><div class='del'>-					</div><div class='del'>-						gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(e_minicard)-&gt;parent),</div><div class='del'>-							       "book", &amp;book,</div><div class='del'>-							       NULL);</div><div class='del'>-					</div><div class='del'>-					}</div><div class='del'>-				</div><div class='del'>-					if (book) {</div><div class='del'>-					</div><div class='del'>-						/* Add the card in the contact editor to our ebook */</div><div class='del'>-						e_card_merging_book_commit_card (book,</div><div class='del'>-										 e_minicard-&gt;card,</div><div class='del'>-										 card_modified_cb,</div><div class='del'>-										 NULL);</div><div class='del'>-					} else {</div><div class='del'>-						remodel(e_minicard);</div><div class='del'>-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));</div><div class='del'>-					}</div><div class='del'>-					e_minicard-&gt;changed = FALSE;</div><div class='del'>-				}</div><div class='del'>-				e_minicard-&gt;has_focus = FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_PRESS: {</div><div class='del'>-		if (1 &lt;= event-&gt;button.button &amp;&amp; event-&gt;button.button &lt;= 2) {</div><div class='del'>-			int ret_val = e_minicard_selected(e_minicard, event);</div><div class='del'>-			GdkEventMask mask = ((1 &lt;&lt; (4 + event-&gt;button.button)) |</div><div class='del'>-					     GDK_POINTER_MOTION_MASK |</div><div class='del'>-					     GDK_BUTTON_PRESS_MASK |</div><div class='del'>-					     GDK_BUTTON_RELEASE_MASK);</div><div class='del'>-			</div><div class='del'>-			e_canvas_item_grab_focus(item, TRUE);</div><div class='del'>-</div><div class='del'>-			if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (e_minicard),</div><div class='del'>-						    mask, NULL, event-&gt;button.time)) {</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-			gtk_grab_add (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)-&gt;canvas));</div><div class='del'>-			e_minicard-&gt;button_x = event-&gt;button.x;</div><div class='del'>-			e_minicard-&gt;button_y = event-&gt;button.y;</div><div class='del'>-			e_minicard-&gt;drag_button = event-&gt;button.button;</div><div class='del'>-			e_minicard-&gt;drag_button_down = TRUE;</div><div class='del'>-			return ret_val;</div><div class='del'>-		} else if (event-&gt;button.button == 3) {</div><div class='del'>-			int ret_val = e_minicard_selected(e_minicard, event);</div><div class='del'>-			if (ret_val != 0)</div><div class='del'>-				return ret_val;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (e_minicard-&gt;drag_button == event-&gt;button.button) {</div><div class='del'>-			e_minicard-&gt;drag_button = 0;</div><div class='del'>-			e_minicard-&gt;drag_button_down = FALSE;</div><div class='del'>-			e_minicard-&gt;button_x = -1;</div><div class='del'>-			e_minicard-&gt;button_y = -1;</div><div class='del'>-</div><div class='del'>-			if (GTK_WIDGET_HAS_GRAB (GNOME_CANVAS_ITEM (e_minicard)-&gt;canvas)) {</div><div class='del'>-				gtk_grab_remove (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)-&gt;canvas));</div><div class='del'>-				gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (e_minicard), event-&gt;button.time);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		if (e_minicard-&gt;drag_button_down &amp;&amp; event-&gt;motion.state &amp; GDK_BUTTON1_MASK) {</div><div class='del'>-			if (MAX (abs (e_minicard-&gt;button_x - event-&gt;motion.x),</div><div class='del'>-				 abs (e_minicard-&gt;button_y - event-&gt;motion.y)) &gt; 3) {</div><div class='del'>-				gint ret_val;</div><div class='del'>-</div><div class='del'>-				ret_val = e_minicard_drag_begin(e_minicard, event);</div><div class='del'>-</div><div class='del'>-				e_minicard-&gt;drag_button_down = FALSE;</div><div class='del'>-</div><div class='del'>-				return ret_val;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1 &amp;&amp; E_IS_MINICARD_VIEW(item-&gt;parent)) {</div><div class='del'>-			if (e_minicard-&gt;editor) {</div><div class='del'>-				if (e_card_evolution_list (e_minicard-&gt;card))</div><div class='del'>-					e_contact_list_editor_raise (E_CONTACT_LIST_EDITOR(e_minicard-&gt;editor));</div><div class='del'>-				else</div><div class='del'>-					e_contact_editor_raise(E_CONTACT_EDITOR(e_minicard-&gt;editor));</div><div class='del'>-			} else {</div><div class='del'>-				EBook *book = NULL;</div><div class='del'>-				if (E_IS_MINICARD_VIEW(item-&gt;parent)) {</div><div class='del'>-					gtk_object_get(GTK_OBJECT(item-&gt;parent),</div><div class='del'>-						       "book", &amp;book,</div><div class='del'>-						       NULL);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (book != NULL) {</div><div class='del'>-					if (e_card_evolution_list (e_minicard-&gt;card)) {</div><div class='del'>-						EContactListEditor *editor = e_addressbook_show_contact_list_editor (book, e_minicard-&gt;card,</div><div class='del'>-														     FALSE, e_minicard-&gt;editable);</div><div class='del'>-						e_minicard-&gt;editor = GTK_OBJECT (editor);</div><div class='del'>-					}</div><div class='del'>-					else {</div><div class='del'>-						EContactEditor *editor = e_addressbook_show_contact_editor (book, e_minicard-&gt;card,</div><div class='del'>-													    FALSE, e_minicard-&gt;editable);</div><div class='del'>-						e_minicard-&gt;editor = GTK_OBJECT (editor);</div><div class='del'>-					}</div><div class='del'>-					gtk_object_ref (e_minicard-&gt;editor);</div><div class='del'>-</div><div class='del'>-					gtk_signal_connect (e_minicard-&gt;editor, "editor_closed",</div><div class='del'>-							    GTK_SIGNAL_FUNC (editor_closed_cb), e_minicard);</div><div class='del'>-</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_KEY_PRESS:</div><div class='del'>-		if (event-&gt;key.keyval == GDK_Tab || </div><div class='del'>-		    event-&gt;key.keyval == GDK_KP_Tab || </div><div class='del'>-		    event-&gt;key.keyval == GDK_ISO_Left_Tab) {</div><div class='del'>-			GList *list;</div><div class='del'>-			for (list = e_minicard-&gt;fields; list; list = list-&gt;next) {</div><div class='del'>-				EMinicardField *field = E_MINICARD_FIELD(list-&gt;data);</div><div class='del'>-				GnomeCanvasItem *item = field-&gt;label;</div><div class='del'>-				EFocus has_focus;</div><div class='del'>-				gtk_object_get(GTK_OBJECT(item),</div><div class='del'>-					       "has_focus", &amp;has_focus,</div><div class='del'>-					       NULL);</div><div class='del'>-				if (has_focus != E_FOCUS_NONE) {</div><div class='del'>-					if (event-&gt;key.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-						list = list-&gt;prev;</div><div class='del'>-					else</div><div class='del'>-						list = list-&gt;next;</div><div class='del'>-					if (list) {</div><div class='del'>-						EMinicardField *field = E_MINICARD_FIELD(list-&gt;data);</div><div class='del'>-						GnomeCanvasItem *item = field-&gt;label;</div><div class='del'>-						gnome_canvas_item_set(item,</div><div class='del'>-								      "has_focus", (event-&gt;key.state &amp; GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,</div><div class='del'>-								      NULL);</div><div class='del'>-						return 1;</div><div class='del'>-					} else {</div><div class='del'>-						return 0;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event)</div><div class='del'>-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event) (item, event);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_resize_children( EMinicard *e_minicard )</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	</div><div class='del'>-	if (e_minicard-&gt;header_text) {</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;header_text,</div><div class='del'>-				       "width", ((double) e_minicard-&gt;width - 12 </div><div class='del'>-						 - (e_card_evolution_list (e_minicard-&gt;card) ? e_minicard-&gt;list_icon_size : 0.0)),</div><div class='del'>-				       NULL );</div><div class='del'>-	}</div><div class='del'>-	if (e_minicard-&gt;list_icon) {</div><div class='del'>-		e_canvas_item_move_absolute(e_minicard-&gt;list_icon,</div><div class='del'>-					    e_minicard-&gt;width - e_minicard-&gt;list_icon_size - 3,</div><div class='del'>-					    3);</div><div class='del'>-	}</div><div class='del'>-	for ( list = e_minicard-&gt;fields; list; list = g_list_next( list ) ) {</div><div class='del'>-		gnome_canvas_item_set( E_MINICARD_FIELD( list-&gt;data )-&gt;label,</div><div class='del'>-				       "width", (double) e_minicard-&gt;width - 4.0,</div><div class='del'>-				       NULL );</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-field_changed (EText *text, EMinicard *e_minicard)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleType type;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	type = GPOINTER_TO_INT</div><div class='del'>-		(gtk_object_get_data(GTK_OBJECT(text),</div><div class='del'>-				     "EMinicard:field"));</div><div class='del'>-	gtk_object_get(GTK_OBJECT(text),</div><div class='del'>-		       "text", &amp;string,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_card_simple_set(e_minicard-&gt;simple,</div><div class='del'>-			  type,</div><div class='del'>-			  string);</div><div class='del'>-	g_free(string);</div><div class='del'>-	e_minicard-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-field_activated (EText *text, EMinicard *e_minicard)</div><div class='del'>-{</div><div class='del'>-	e_text_stop_editing (text);</div><div class='del'>-	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (e_minicard), FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *new_item;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	ECardSimpleType type;</div><div class='del'>-	EMinicardField *minicard_field;</div><div class='del'>-	char *name;</div><div class='del'>-	char *string;</div><div class='del'>-	</div><div class='del'>-	group = GNOME_CANVAS_GROUP( e_minicard );</div><div class='del'>-	</div><div class='del'>-	type = e_card_simple_type(e_minicard-&gt;simple, field);</div><div class='del'>-	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard-&gt;simple, field));</div><div class='del'>-	string = e_card_simple_get(e_minicard-&gt;simple, field);</div><div class='del'>-</div><div class='del'>-	/* Magically convert embedded XML into an address. */</div><div class='del'>-	if (!strncmp (string, "&lt;?xml", 5)) {</div><div class='del'>-		EDestination *dest = e_destination_import (string);</div><div class='del'>-		if (dest != NULL) {</div><div class='del'>-			gchar *new_string = g_strdup (e_destination_get_address (dest));</div><div class='del'>-			g_free (string);</div><div class='del'>-			string = new_string;</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_item = e_minicard_label_new(group);</div><div class='del'>-	gnome_canvas_item_set( new_item,</div><div class='del'>-			       "width", e_minicard-&gt;width - 4.0,</div><div class='del'>-			       "fieldname", name,</div><div class='del'>-			       "field", string,</div><div class='del'>-			       "max_field_name_length", left_width,</div><div class='del'>-			       "editable", e_minicard-&gt;editable,</div><div class='del'>-			       NULL );</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)-&gt;field),</div><div class='del'>-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)-&gt;field),</div><div class='del'>-			   "activate", GTK_SIGNAL_FUNC(field_activated), e_minicard);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(E_MINICARD_LABEL(new_item)-&gt;field),</div><div class='del'>-		       "allow_newlines", e_card_simple_get_allow_newlines (e_minicard-&gt;simple, field),</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)-&gt;field),</div><div class='del'>-			    "EMinicard:field",</div><div class='del'>-			    GINT_TO_POINTER(field));</div><div class='del'>-</div><div class='del'>-	minicard_field = g_new(EMinicardField, 1);</div><div class='del'>-	minicard_field-&gt;field = field;</div><div class='del'>-	minicard_field-&gt;label = new_item;</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;fields = g_list_append( e_minicard-&gt;fields, minicard_field);</div><div class='del'>-	e_canvas_item_move_absolute(new_item, 2, e_minicard-&gt;height);</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_free(string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gdouble</div><div class='del'>-get_left_width(EMinicard *e_minicard)</div><div class='del'>-{</div><div class='del'>-	gchar *name;</div><div class='del'>-	ECardSimpleField field;</div><div class='del'>-	gdouble width = -1;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-</div><div class='del'>-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)-&gt;canvas)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {</div><div class='del'>-		gdouble this_width;</div><div class='del'>-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard-&gt;simple, field));</div><div class='del'>-		this_width = gdk_text_width(font, name, strlen(name));</div><div class='del'>-		if (width &lt; this_width)</div><div class='del'>-			width = this_width;</div><div class='del'>-		g_free(name);</div><div class='del'>-	}</div><div class='del'>-	return width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remodel( EMinicard *e_minicard )</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-	if ( !(GTK_OBJECT_FLAGS( e_minicard ) &amp; GNOME_CANVAS_ITEM_REALIZED) )</div><div class='del'>-		return;</div><div class='del'>-	if (e_minicard-&gt;simple) {</div><div class='del'>-		ECardSimpleField field;</div><div class='del'>-		GList *list;</div><div class='del'>-		char *file_as;</div><div class='del'>-		gdouble left_width = -1;</div><div class='del'>-</div><div class='del'>-		if (e_minicard-&gt;header_text) {</div><div class='del'>-			file_as = e_card_simple_get(e_minicard-&gt;simple, E_CARD_SIMPLE_FIELD_FILE_AS);</div><div class='del'>-			gnome_canvas_item_set( e_minicard-&gt;header_text,</div><div class='del'>-					       "text", file_as ? file_as : "",</div><div class='del'>-					       NULL );</div><div class='del'>-			g_free(file_as);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (e_minicard-&gt;card &amp;&amp; e_card_evolution_list (e_minicard-&gt;card) ) {</div><div class='del'>-			gnome_canvas_item_show (e_minicard-&gt;list_icon);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			gnome_canvas_item_hide (e_minicard-&gt;list_icon);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list = e_minicard-&gt;fields;</div><div class='del'>-		e_minicard-&gt;fields = NULL;</div><div class='del'>-</div><div class='del'>-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING &amp;&amp; count &lt; 5; field++) {</div><div class='del'>-			EMinicardField *minicard_field = NULL;</div><div class='del'>-</div><div class='del'>-			if (list)</div><div class='del'>-				minicard_field = list-&gt;data;</div><div class='del'>-			if (minicard_field &amp;&amp; minicard_field-&gt;field == field) {</div><div class='del'>-				GList *this_list = list;</div><div class='del'>-				char *string;</div><div class='del'>-</div><div class='del'>-				string = e_card_simple_get(e_minicard-&gt;simple, field);</div><div class='del'>-				if (string &amp;&amp; *string) {</div><div class='del'>-					/* Magically convert embedded XML into an address. */</div><div class='del'>-					if (!strncmp (string, "&lt;?xml", 4)) {</div><div class='del'>-						EDestination *dest = e_destination_import (string);</div><div class='del'>-						if (dest != NULL) {</div><div class='del'>-							gchar *new_string = g_strdup (e_destination_get_address (dest));</div><div class='del'>-							g_free (string);</div><div class='del'>-							string = new_string;</div><div class='del'>-							gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					e_minicard-&gt;fields = g_list_append(e_minicard-&gt;fields, minicard_field);</div><div class='del'>-					gtk_object_set(GTK_OBJECT(minicard_field-&gt;label),</div><div class='del'>-						       "field", string,</div><div class='del'>-						       NULL);</div><div class='del'>-					count ++;</div><div class='del'>-				} else {</div><div class='del'>-					e_minicard_field_destroy(minicard_field);</div><div class='del'>-				}</div><div class='del'>-				list = g_list_remove_link(list, this_list);</div><div class='del'>-				g_list_free_1(this_list);</div><div class='del'>-				g_free(string);</div><div class='del'>-			} else {</div><div class='del'>-				char *string;</div><div class='del'>-				if (left_width == -1) {</div><div class='del'>-					left_width = get_left_width(e_minicard);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				string = e_card_simple_get(e_minicard-&gt;simple, field);</div><div class='del'>-				if (string &amp;&amp; *string) {</div><div class='del'>-					add_field(e_minicard, field, left_width);</div><div class='del'>-					count++;</div><div class='del'>-				}</div><div class='del'>-				g_free(string);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_reflow( GnomeCanvasItem *item, int flags )</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard = E_MINICARD(item);</div><div class='del'>-	if ( GTK_OBJECT_FLAGS( e_minicard ) &amp; GNOME_CANVAS_ITEM_REALIZED ) {</div><div class='del'>-		GList *list;</div><div class='del'>-		gdouble text_height;</div><div class='del'>-		gint old_height;</div><div class='del'>-		</div><div class='del'>-		old_height = e_minicard-&gt;height;</div><div class='del'>-</div><div class='del'>-		gtk_object_get( GTK_OBJECT( e_minicard-&gt;header_text ),</div><div class='del'>-				"text_height", &amp;text_height,</div><div class='del'>-				NULL );</div><div class='del'>-		</div><div class='del'>-		e_minicard-&gt;height = text_height + 10.0;</div><div class='del'>-		</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;header_rect,</div><div class='del'>-				       "y2", text_height + 9.0,</div><div class='del'>-				       NULL );</div><div class='del'>-		</div><div class='del'>-		for(list = e_minicard-&gt;fields; list; list = g_list_next(list)) {</div><div class='del'>-			EMinicardField *field = E_MINICARD_FIELD(list-&gt;data);</div><div class='del'>-			GnomeCanvasItem *item = field-&gt;label;</div><div class='del'>-			gtk_object_get (GTK_OBJECT(item),</div><div class='del'>-					"height", &amp;text_height,</div><div class='del'>-					NULL);</div><div class='del'>-			e_canvas_item_move_absolute(item, 2, e_minicard-&gt;height);</div><div class='del'>-			e_minicard-&gt;height += text_height;</div><div class='del'>-		}</div><div class='del'>-		e_minicard-&gt;height += 2;</div><div class='del'>-		</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;rect,</div><div class='del'>-				       "y2", (double) e_minicard-&gt;height - 1,</div><div class='del'>-				       NULL );</div><div class='del'>-		</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;rect,</div><div class='del'>-				       "x2", (double) e_minicard-&gt;width - 1.0,</div><div class='del'>-				       "y2", (double) e_minicard-&gt;height - 1.0,</div><div class='del'>-				       NULL );</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;header_rect,</div><div class='del'>-				       "x2", (double) e_minicard-&gt;width - 3.0,</div><div class='del'>-				       NULL );</div><div class='del'>-</div><div class='del'>-		if (old_height != e_minicard-&gt;height)</div><div class='del'>-			e_canvas_item_request_parent_reflow(item);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_minicard_get_card_id (EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(minicard != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);</div><div class='del'>-</div><div class='del'>-	if (minicard-&gt;card) {</div><div class='del'>-		return e_card_get_id(minicard-&gt;card);</div><div class='del'>-	} else {</div><div class='del'>-		return "";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(minicard1 != NULL, 0);</div><div class='del'>-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);</div><div class='del'>-	g_return_val_if_fail(minicard2 != NULL, 0);</div><div class='del'>-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);</div><div class='del'>-</div><div class='del'>-	if (minicard1-&gt;card &amp;&amp; minicard2-&gt;card) {</div><div class='del'>-		char *file_as1, *file_as2;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(minicard1-&gt;card),</div><div class='del'>-			       "file_as", &amp;file_as1,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(minicard2-&gt;card),</div><div class='del'>-			       "file_as", &amp;file_as2,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (file_as1 &amp;&amp; file_as2)</div><div class='del'>-			return g_utf8_collate(file_as1, file_as2);</div><div class='del'>-		if (file_as1)</div><div class='del'>-			return -1;</div><div class='del'>-		if (file_as2)</div><div class='del'>-			return 1;</div><div class='del'>-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_minicard_selected (EMinicard *minicard, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	gint ret_val = 0;</div><div class='del'>-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard);</div><div class='del'>-	if (item-&gt;parent) {</div><div class='del'>-		guint signal_id = gtk_signal_lookup ("selection_event", GTK_OBJECT_TYPE (item-&gt;parent));</div><div class='del'>-		/* We should probably check the signature here, but I</div><div class='del'>-		 * don't think it's worth the time required to code</div><div class='del'>-		 * it.</div><div class='del'>-		 */</div><div class='del'>-		if (signal_id != 0) {</div><div class='del'>-			gtk_signal_emit(GTK_OBJECT(item-&gt;parent),</div><div class='del'>-					signal_id,</div><div class='del'>-					item, event, &amp;ret_val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	gint ret_val = 0;</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT(minicard),</div><div class='del'>-			 e_minicard_signals[DRAG_BEGIN],</div><div class='del'>-			 event, &amp;ret_val);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h<br/>deleted file mode 100644<br/>index bb6a3c072e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/e-minicard.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,123 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MINICARD_H__</div><div class='del'>-#define __E_MINICARD_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include "addressbook/gui/contact-editor/e-contact-editor.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicard - A small card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * width        double          RW              width of the card</div><div class='del'>- * height       double          R               height of the card</div><div class='del'>- * card		ECard*		RW		Pointer to the ECard</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_TYPE			(e_minicard_get_type ())</div><div class='del'>-#define E_MINICARD(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard))</div><div class='del'>-#define E_MINICARD_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass))</div><div class='del'>-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE))</div><div class='del'>-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicard       EMinicard;</div><div class='del'>-typedef struct _EMinicardClass  EMinicardClass;</div><div class='del'>-typedef enum _EMinicardFocusType EMinicardFocusType;</div><div class='del'>-</div><div class='del'>-enum _EMinicardFocusType {</div><div class='del'>-	E_MINICARD_FOCUS_TYPE_START,</div><div class='del'>-	E_MINICARD_FOCUS_TYPE_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicard</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroup parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	GnomeCanvasItem *header_rect;</div><div class='del'>-	GnomeCanvasItem *header_text;</div><div class='del'>-	GnomeCanvasItem *list_icon;</div><div class='del'>-</div><div class='del'>-	GdkPixbuf *list_icon_pixbuf;</div><div class='del'>-	double list_icon_size;</div><div class='del'>-</div><div class='del'>-	GtkObject *editor;</div><div class='del'>-</div><div class='del'>-	GList *fields; /* Of type EMinicardField */</div><div class='del'>-	guint needs_remodeling : 1;</div><div class='del'>-</div><div class='del'>-	guint changed : 1;</div><div class='del'>-</div><div class='del'>-	guint selected : 1;</div><div class='del'>-	guint has_cursor : 1;</div><div class='del'>-</div><div class='del'>-	guint has_focus : 1;</div><div class='del'>-</div><div class='del'>-	guint editable : 1;</div><div class='del'>-</div><div class='del'>-	guint drag_button_down : 1;</div><div class='del'>-	gint drag_button;</div><div class='del'>-</div><div class='del'>-	gint button_x;</div><div class='del'>-	gint button_y;</div><div class='del'>-</div><div class='del'>-	double width;</div><div class='del'>-	double height;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardClass</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroupClass parent_class;</div><div class='del'>-</div><div class='del'>-	gint (* selected) (EMinicard *minicard, GdkEvent *event);</div><div class='del'>-	gint (* drag_begin) (EMinicard *minicard, GdkEvent *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType     e_minicard_get_type     (void);</div><div class='del'>-const char *e_minicard_get_card_id  (EMinicard *minicard);</div><div class='del'>-int         e_minicard_compare      (EMinicard *minicard1,</div><div class='del'>-				     EMinicard *minicard2);</div><div class='del'>-</div><div class='del'>-int         e_minicard_selected     (EMinicard *minicard,</div><div class='del'>-				     GdkEvent  *event);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c<br/>deleted file mode 100644<br/>index 10e13d9bdf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/gal-view-factory-minicard.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/gal-view-factory-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * gal-view-factory-minicard.c: A View Factory</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "gal-view-factory-minicard.h"</div><div class='del'>-#include "gal-view-minicard.h"</div><div class='del'>-</div><div class='del'>-#define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)-&gt;klass)</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE gal_view_factory_get_type ()</div><div class='del'>-</div><div class='del'>-static GalViewFactoryClass *gal_view_factory_minicard_parent_class;</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-gal_view_factory_minicard_get_title       (GalViewFactory *factory)</div><div class='del'>-{</div><div class='del'>-	return _("Card View");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GalView *</div><div class='del'>-gal_view_factory_minicard_new_view        (GalViewFactory *factory,</div><div class='del'>-					   const char     *name)</div><div class='del'>-{</div><div class='del'>-	return gal_view_minicard_new(name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-gal_view_factory_minicard_get_type_code (GalViewFactory *factory)</div><div class='del'>-{</div><div class='del'>-	return "minicard";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_factory_minicard_destroy         (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	GalViewFactoryMinicard *factory = GAL_VIEW_FACTORY_MINICARD(object);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_factory_minicard_class_init      (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);</div><div class='del'>-	gal_view_factory_minicard_parent_class    = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	view_factory_class-&gt;get_title           = gal_view_factory_minicard_get_title;</div><div class='del'>-	view_factory_class-&gt;new_view            = gal_view_factory_minicard_new_view;</div><div class='del'>-	view_factory_class-&gt;get_type_code       = gal_view_factory_minicard_get_type_code;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy                   = gal_view_factory_minicard_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gal_view_minicard_new</div><div class='del'>- *</div><div class='del'>- * A new GalViewFactory for creating Minicard views.  Create one of</div><div class='del'>- * these and pass it to GalViewCollection for use.</div><div class='del'>- *</div><div class='del'>- * Returns: The new GalViewFactoryMinicard.</div><div class='del'>- */</div><div class='del'>-GalViewFactory *</div><div class='del'>-gal_view_factory_minicard_new        (void)</div><div class='del'>-{</div><div class='del'>-	return gal_view_factory_minicard_construct (gtk_type_new (gal_view_factory_minicard_get_type ()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gal_view_minicard_construct</div><div class='del'>- * @factory: The factory to construct</div><div class='del'>- *</div><div class='del'>- * constructs the GalViewFactoryMinicard.  To be used by subclasses and</div><div class='del'>- * language bindings.</div><div class='del'>- *</div><div class='del'>- * Returns: The GalViewFactoryMinicard.</div><div class='del'>- */</div><div class='del'>-GalViewFactory *</div><div class='del'>-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)</div><div class='del'>-{</div><div class='del'>-	return GAL_VIEW_FACTORY(factory);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-gal_view_factory_minicard_get_type  (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type)</div><div class='del'>-	{</div><div class='del'>-		GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"GalViewFactoryMinicard",</div><div class='del'>-			sizeof (GalViewFactoryMinicard),</div><div class='del'>-			sizeof (GalViewFactoryMinicardClass),</div><div class='del'>-			(GtkClassInitFunc) gal_view_factory_minicard_class_init,</div><div class='del'>-			(GtkObjectInitFunc) gal_view_factory_minicard_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h<br/>deleted file mode 100644<br/>index 3816fdba46..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/gal-view-factory-minicard.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/gal-view-factory-minicard.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * gal-view-factory-minicard.c: A View Factory</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#ifndef _GAL_VIEW_FACTORY_MINICARD_H_</div><div class='del'>-#define _GAL_VIEW_FACTORY_MINICARD_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-factory.h&gt;</div><div class='del'>-</div><div class='del'>-#define GAL_VIEW_FACTORY_MINICARD_TYPE        (gal_view_factory_minicard_get_type ())</div><div class='del'>-#define GAL_VIEW_FACTORY_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicard))</div><div class='del'>-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicardClass))</div><div class='del'>-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_MINICARD_TYPE))</div><div class='del'>-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_MINICARD_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewFactory base;</div><div class='del'>-} GalViewFactoryMinicard;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewFactoryClass parent_class;</div><div class='del'>-} GalViewFactoryMinicardClass;</div><div class='del'>-</div><div class='del'>-/* Standard functions */</div><div class='del'>-GtkType         gal_view_factory_minicard_get_type   (void);</div><div class='del'>-GalViewFactory *gal_view_factory_minicard_new        (void);</div><div class='del'>-GalViewFactory *gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory);</div><div class='del'>-</div><div class='del'>-#endif /* _GAL_VIEW_FACTORY_MINICARD_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c<br/>deleted file mode 100644<br/>index b3162e51d1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/gal-view-minicard.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/gal-view-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,221 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * gal-view-minicard.c: An Minicard View</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "gal-view-minicard.h"</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gal/util/e-xml-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE gal_view_get_type ()</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-static GalViewClass *gal_view_minicard_parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_edit            (GalView *view)</div><div class='del'>-{</div><div class='del'>-	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void  </div><div class='del'>-gal_view_minicard_load (GalView *view,</div><div class='del'>-			const char *filename)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	doc = xmlParseFile (filename);</div><div class='del'>-	if (doc) {</div><div class='del'>-		xmlNode *root = xmlDocGetRootElement(doc);</div><div class='del'>-		GAL_VIEW_MINICARD (view)-&gt;column_width = e_xml_get_double_prop_by_name_with_default (root, "column_width", 150);</div><div class='del'>-		xmlFreeDoc(doc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_save (GalView *view,</div><div class='del'>-			const char *filename)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *root;</div><div class='del'>-</div><div class='del'>-	doc = xmlNewDoc("1.0");</div><div class='del'>-	root = xmlNewNode (NULL, "EMinicardViewState");</div><div class='del'>-	e_xml_set_double_prop_by_name (root, "column_width", GAL_VIEW_MINICARD (view)-&gt;column_width);</div><div class='del'>-	xmlDocSetRootElement(doc, root);</div><div class='del'>-	xmlSaveFile(filename, doc);</div><div class='del'>-	xmlFreeDoc(doc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-gal_view_minicard_get_title       (GalView *view)</div><div class='del'>-{</div><div class='del'>-	return GAL_VIEW_MINICARD(view)-&gt;title;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_set_title       (GalView *view,</div><div class='del'>-				 const char *title)</div><div class='del'>-{</div><div class='del'>-	g_free(GAL_VIEW_MINICARD(view)-&gt;title);</div><div class='del'>-	GAL_VIEW_MINICARD(view)-&gt;title = g_strdup(title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-gal_view_minicard_get_type_code (GalView *view)</div><div class='del'>-{</div><div class='del'>-	return "minicard";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GalView *</div><div class='del'>-gal_view_minicard_clone       (GalView *view)</div><div class='del'>-{</div><div class='del'>-	GalViewMinicard *gvm, *new;</div><div class='del'>-</div><div class='del'>-	gvm = GAL_VIEW_MINICARD(view);</div><div class='del'>-</div><div class='del'>-	new               = gtk_type_new (gal_view_minicard_get_type ());</div><div class='del'>-	new-&gt;title        = g_strdup (gvm-&gt;title);</div><div class='del'>-	new-&gt;column_width = gvm-&gt;column_width;</div><div class='del'>-</div><div class='del'>-	return GAL_VIEW(new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_destroy         (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);</div><div class='del'>-	gal_view_minicard_detach (view);</div><div class='del'>-	g_free(view-&gt;title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_class_init      (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);</div><div class='del'>-	gal_view_minicard_parent_class  = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	gal_view_class-&gt;edit          = gal_view_minicard_edit         ;</div><div class='del'>-	gal_view_class-&gt;load          = gal_view_minicard_load         ;</div><div class='del'>-	gal_view_class-&gt;save          = gal_view_minicard_save         ;</div><div class='del'>-	gal_view_class-&gt;get_title     = gal_view_minicard_get_title    ;</div><div class='del'>-	gal_view_class-&gt;set_title     = gal_view_minicard_set_title    ;</div><div class='del'>-	gal_view_class-&gt;get_type_code = gal_view_minicard_get_type_code;</div><div class='del'>-	gal_view_class-&gt;clone         = gal_view_minicard_clone        ;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy         = gal_view_minicard_destroy      ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gal_view_minicard_init      (GalViewMinicard *gvm)</div><div class='del'>-{</div><div class='del'>-	gvm-&gt;title = NULL;</div><div class='del'>-	gvm-&gt;column_width = 150.0;</div><div class='del'>-</div><div class='del'>-	gvm-&gt;emvw = NULL;</div><div class='del'>-	gvm-&gt;emvw_column_width_changed_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gal_view_minicard_new</div><div class='del'>- * @title: The name of the new view.</div><div class='del'>- *</div><div class='del'>- * Returns a new GalViewMinicard.  This is primarily for use by</div><div class='del'>- * GalViewFactoryMinicard.</div><div class='del'>- *</div><div class='del'>- * Returns: The new GalViewMinicard.</div><div class='del'>- */</div><div class='del'>-GalView *</div><div class='del'>-gal_view_minicard_new (const gchar *title)</div><div class='del'>-{</div><div class='del'>-	return gal_view_minicard_construct (gtk_type_new (gal_view_minicard_get_type ()), title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gal_view_minicard_construct</div><div class='del'>- * @view: The view to construct.</div><div class='del'>- * @title: The name of the new view.</div><div class='del'>- *</div><div class='del'>- * constructs the GalViewMinicard.  To be used by subclasses and</div><div class='del'>- * language bindings.</div><div class='del'>- *</div><div class='del'>- * Returns: The GalViewMinicard.</div><div class='del'>- */</div><div class='del'>-GalView *</div><div class='del'>-gal_view_minicard_construct  (GalViewMinicard *view,</div><div class='del'>-			      const gchar *title)</div><div class='del'>-{</div><div class='del'>-	view-&gt;title = g_strdup(title);</div><div class='del'>-	return GAL_VIEW(view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-gal_view_minicard_get_type        (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type)</div><div class='del'>-	{</div><div class='del'>-		GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"GalViewMinicard",</div><div class='del'>-			sizeof (GalViewMinicard),</div><div class='del'>-			sizeof (GalViewMinicardClass),</div><div class='del'>-			(GtkClassInitFunc) gal_view_minicard_class_init,</div><div class='del'>-			(GtkObjectInitFunc) gal_view_minicard_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-column_width_changed (ETable *table, double width, GalViewMinicard *view)</div><div class='del'>-{</div><div class='del'>-	d(g_print("%s: Old width = %f, New width = %f\n", __FUNCTION__, view-&gt;column_width, width));</div><div class='del'>-	if (view-&gt;column_width != width) {</div><div class='del'>-		view-&gt;column_width = width;</div><div class='del'>-		gal_view_changed(GAL_VIEW(view));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gal_view_minicard_attach (GalViewMinicard *view, EMinicardViewWidget *emvw)</div><div class='del'>-{</div><div class='del'>-	gal_view_minicard_detach (view);</div><div class='del'>-</div><div class='del'>-	view-&gt;emvw = emvw;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (view-&gt;emvw));</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (view-&gt;emvw),</div><div class='del'>-			"column_width", (int) view-&gt;column_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	view-&gt;emvw_column_width_changed_id =</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(view-&gt;emvw), "column_width_changed",</div><div class='del'>-				   GTK_SIGNAL_FUNC (column_width_changed), view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gal_view_minicard_detach (GalViewMinicard *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;emvw == NULL)</div><div class='del'>-		return;</div><div class='del'>-	if (view-&gt;emvw_column_width_changed_id) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (view-&gt;emvw),</div><div class='del'>-				       view-&gt;emvw_column_width_changed_id);</div><div class='del'>-		view-&gt;emvw_column_width_changed_id = 0;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (view-&gt;emvw));</div><div class='del'>-	view-&gt;emvw = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h<br/>deleted file mode 100644<br/>index 31a28c56d9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/gal-view-minicard.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/gal-view-minicard.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * gal-view-minicard.h: An Minicard View</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#ifndef _GAL_VIEW_MINICARD_H_</div><div class='del'>-#define _GAL_VIEW_MINICARD_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view.h&gt;</div><div class='del'>-#include &lt;e-minicard-view-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#define GAL_VIEW_MINICARD_TYPE        (gal_view_minicard_get_type ())</div><div class='del'>-#define GAL_VIEW_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard))</div><div class='del'>-#define GAL_VIEW_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass))</div><div class='del'>-#define GAL_IS_VIEW_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE))</div><div class='del'>-#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalView              base;</div><div class='del'>-</div><div class='del'>-	char                *title;</div><div class='del'>-	double               column_width;</div><div class='del'>-</div><div class='del'>-	EMinicardViewWidget *emvw;</div><div class='del'>-	guint                emvw_column_width_changed_id;</div><div class='del'>-} GalViewMinicard;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewClass parent_class;</div><div class='del'>-} GalViewMinicardClass;</div><div class='del'>-</div><div class='del'>-/* Standard functions */</div><div class='del'>-GtkType  gal_view_minicard_get_type   (void);</div><div class='del'>-GalView *gal_view_minicard_new        (const gchar         *title);</div><div class='del'>-GalView *gal_view_minicard_construct  (GalViewMinicard     *view,</div><div class='del'>-				       const gchar         *title);</div><div class='del'>-void     gal_view_minicard_attach     (GalViewMinicard     *view,</div><div class='del'>-				       EMinicardViewWidget *emvw);</div><div class='del'>-void     gal_view_minicard_detach     (GalViewMinicard     *view);</div><div class='del'>-</div><div class='del'>-#endif /* _GAL_VIEW_MINICARD_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c<br/>deleted file mode 100644<br/>index 7b1919aef4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard-label.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/test-minicard-label.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* test-minicard-label.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "e-minicard-label.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GnomeCanvasItem *label;</div><div class='del'>-GnomeCanvasItem *rect;</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation-&gt;width, allocation-&gt;height );</div><div class='del'>-  gnome_canvas_item_set( label,</div><div class='del'>-			 "width", (double) allocation-&gt;width,</div><div class='del'>-			 "height", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_item_set( rect,</div><div class='del'>-			 "x2", (double) allocation-&gt;width,</div><div class='del'>-			 "y2", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Minicard Label Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the minicard label canvas item" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void button_press_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  gnome_canvas_item_grab_focus( label );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *canvas;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Minicard Label Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Minicard Label Test", NULL);</div><div class='del'>-</div><div class='del'>-  canvas = e_canvas_new();</div><div class='del'>-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				gnome_canvas_rect_get_type(),</div><div class='del'>-				"x1", (double) 0,</div><div class='del'>-				"y1", (double) 0,</div><div class='del'>-				"x2", (double) 100,</div><div class='del'>-				"y2", (double) 100,</div><div class='del'>-				"fill_color", "white",</div><div class='del'>-				NULL );</div><div class='del'>-  label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));</div><div class='del'>-  gnome_canvas_item_set( label,</div><div class='del'>-			 "width", (double) 100,</div><div class='del'>-			 "height", (double) 100,</div><div class='del'>-			 "fieldname", "Full Name:",</div><div class='del'>-			 "field", "Christopher James Lahey",</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),</div><div class='del'>-				   0, 0,</div><div class='del'>-				   100, 100 );</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), canvas );</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "button_press_event",</div><div class='del'>-		      GTK_SIGNAL_FUNC( button_press_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c<br/>deleted file mode 100644<br/>index caa9dac270..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/test-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,208 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* test-reflow.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnorba/gnorba.h&gt;</div><div class='del'>-#include &lt;e-util/e-canvas.h&gt;</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GnomeCanvasItem *reflow;</div><div class='del'>-GnomeCanvasItem *rect;</div><div class='del'>-GtkAllocation last_alloc;</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	gnome_CORBA_init_with_popt_table (</div><div class='del'>-		"Reflow Test", VERSION,</div><div class='del'>-		&amp;argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &amp;ev);</div><div class='del'>-</div><div class='del'>-	orb = gnome_CORBA_ORB ();</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (orb, NULL, NULL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-  double width;</div><div class='del'>-  last_alloc = *allocation;</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "height", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "minimum_width", (double) allocation-&gt;width,</div><div class='del'>-			 NULL );</div><div class='del'>-  gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		 "width", &amp;width,</div><div class='del'>-		 NULL);</div><div class='del'>-  width = MAX(width, allocation-&gt;width);</div><div class='del'>-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width, allocation-&gt;height );</div><div class='del'>-  gnome_canvas_item_set( rect,</div><div class='del'>-			 "x2", (double) width,</div><div class='del'>-			 "y2", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void resize(GnomeCanvas *canvas, gpointer data)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(canvas , 0, 0, width, last_alloc.height );</div><div class='del'>-	gnome_canvas_item_set( rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) last_alloc.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Reflow Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the reflow canvas item" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		gnome_canvas_item_set(reflow,</div><div class='del'>-				      "book", book,</div><div class='del'>-				      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *canvas;</div><div class='del'>-  GtkWidget *vbox;</div><div class='del'>-  GtkWidget *scrollbar;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  CORBA_exception_init (&amp;ev);</div><div class='del'>-  init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-  app = gnome_app_new("Reflow Test", NULL);</div><div class='del'>-</div><div class='del'>-  vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-  canvas = e_canvas_new();</div><div class='del'>-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				gnome_canvas_rect_get_type(),</div><div class='del'>-				"x1", (double) 0,</div><div class='del'>-				"y1", (double) 0,</div><div class='del'>-				"x2", (double) 100,</div><div class='del'>-				"y2", (double) 100,</div><div class='del'>-				"fill_color", "white",</div><div class='del'>-				NULL );</div><div class='del'>-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				  e_minicard_view_get_type(),</div><div class='del'>-				  "height", (double) 100,</div><div class='del'>-				  "minimum_width", (double) 100,</div><div class='del'>-				  NULL );</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",</div><div class='del'>-		      GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-		      ( gpointer ) app);</div><div class='del'>-</div><div class='del'>-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),</div><div class='del'>-				   0, 0,</div><div class='del'>-				   100, 100 );</div><div class='del'>-</div><div class='del'>-  gtk_box_pack_start(GTK_BOX(vbox), canvas, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-  scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)));</div><div class='del'>-</div><div class='del'>-  gtk_box_pack_start(GTK_BOX(vbox), scrollbar, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), vbox );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)-&gt;bin_window, NULL, FALSE);</div><div class='del'>-</div><div class='del'>-  gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-</div><div class='del'>-  bonobo_main ();</div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c<br/>deleted file mode 100644<br/>index b84a591bbb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/test-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* test-minicard.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GnomeCanvasItem *card;</div><div class='del'>-GnomeCanvasItem *rect;</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation-&gt;width, allocation-&gt;height );</div><div class='del'>-  gnome_canvas_item_set( card,</div><div class='del'>-			 "width", (double) allocation-&gt;width,</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_item_set( rect,</div><div class='del'>-			 "x2", (double) allocation-&gt;width,</div><div class='del'>-			 "y2", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Minicard Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the minicard canvas item" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *canvas;</div><div class='del'>-  int i;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Minicard Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Minicard Test", NULL);</div><div class='del'>-</div><div class='del'>-  canvas = gnome_canvas_new();</div><div class='del'>-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				gnome_canvas_rect_get_type(),</div><div class='del'>-				"x1", (double) 0,</div><div class='del'>-				"y1", (double) 0,</div><div class='del'>-				"x2", (double) 100,</div><div class='del'>-				"y2", (double) 100,</div><div class='del'>-				"fill_color", "white",</div><div class='del'>-				NULL );</div><div class='del'>-  for ( i = 0; i &lt; 1; i++ )</div><div class='del'>-    {</div><div class='del'>-      card = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				    e_minicard_get_type(),</div><div class='del'>-				    "width", (double) 100,</div><div class='del'>-				    NULL );</div><div class='del'>-    }</div><div class='del'>-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),</div><div class='del'>-				   0, 0,</div><div class='del'>-				   100, 100 );</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), canvas );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c<br/>deleted file mode 100644<br/>index 14066c4cd0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-reflow.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/gui/widgets/test-reflow.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* test-reflow.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define TEST_VCARD                   \</div><div class='del'>-"BEGIN:VCARD</div><div class='del'>-"                      \</div><div class='del'>-"FN:Nat</div><div class='del'>-"                           \</div><div class='del'>-"N:Friedman;Nat;D;Mr.</div><div class='del'>-"             \</div><div class='del'>-"TITLE:Head Geek</div><div class='del'>-"                  \</div><div class='del'>-"BDAY:1977-08-06</div><div class='del'>-"                  \</div><div class='del'>-"TEL;WORK:617 679 1984</div><div class='del'>-"            \</div><div class='del'>-"TEL;CELL:123 456 7890</div><div class='del'>-"            \</div><div class='del'>-"EMAIL;INTERNET:nat@nat.org</div><div class='del'>-"       \</div><div class='del'>-"EMAIL;INTERNET:nat@ximian.com</div><div class='del'>-" \</div><div class='del'>-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;</div><div class='del'>-" \</div><div class='del'>-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA</div><div class='del'>-" \</div><div class='del'>-"END:VCARD</div><div class='del'>-"                        \</div><div class='del'>-"</div><div class='del'>-"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-reflow.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GnomeCanvasItem *reflow;</div><div class='del'>-GnomeCanvasItem *rect;</div><div class='del'>-GtkAllocation last_alloc;</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-  double width;</div><div class='del'>-  last_alloc = *allocation;</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "height", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "minimum_width", (double) allocation-&gt;width,</div><div class='del'>-			 NULL );</div><div class='del'>-  gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		 "width", &amp;width,</div><div class='del'>-		 NULL);</div><div class='del'>-  width = MAX(width, allocation-&gt;width);</div><div class='del'>-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation-&gt;height - 1);</div><div class='del'>-  gnome_canvas_item_set( rect,</div><div class='del'>-			 "x2", (double) width,</div><div class='del'>-			 "y2", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void resize(GnomeCanvas *canvas, gpointer data)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);</div><div class='del'>-	gnome_canvas_item_set( rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) last_alloc.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Reflow Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the reflow canvas item" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *canvas;</div><div class='del'>-  GtkWidget *vbox;</div><div class='del'>-  GtkWidget *scrollframe;</div><div class='del'>-  int i;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Reflow Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Reflow Test", NULL);</div><div class='del'>-</div><div class='del'>-  vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-  canvas = e_canvas_new();</div><div class='del'>-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				gnome_canvas_rect_get_type(),</div><div class='del'>-				"x1", (double) 0,</div><div class='del'>-				"y1", (double) 0,</div><div class='del'>-				"x2", (double) 100,</div><div class='del'>-				"y2", (double) 100,</div><div class='del'>-				"fill_color", "white",</div><div class='del'>-				NULL );</div><div class='del'>-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				  e_reflow_get_type(),</div><div class='del'>-				  "height", (double) 100,</div><div class='del'>-				  "minimum_width", (double) 100,</div><div class='del'>-				  NULL );</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",</div><div class='del'>-		      GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-		      ( gpointer ) app);</div><div class='del'>-  for ( i = 0; i &lt; 200; i++ )</div><div class='del'>-    {</div><div class='del'>-      GnomeCanvasItem *item;</div><div class='del'>-      ECard *card = e_card_new (TEST_VCARD);</div><div class='del'>-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),</div><div class='del'>-				    e_minicard_get_type(),</div><div class='del'>-				    "card", card,</div><div class='del'>-				    NULL);</div><div class='del'>-      e_reflow_add_item(E_REFLOW(reflow), item, NULL);</div><div class='del'>-    }</div><div class='del'>-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),</div><div class='del'>-				   0, 0,</div><div class='del'>-				   100, 100 );</div><div class='del'>-</div><div class='del'>-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),</div><div class='del'>-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));</div><div class='del'>-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),</div><div class='del'>-			     GTK_POLICY_AUTOMATIC,</div><div class='del'>-			     GTK_POLICY_NEVER);</div><div class='del'>-  </div><div class='del'>-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)-&gt;bin_window, NULL, FALSE);</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore<br/>deleted file mode 100644<br/>index 96194f7fd7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-contact-print-test</div><div class='del'>-contact-print-style-editor-test</div><div class='head'>diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am<br/>deleted file mode 100644<br/>index bd532b86cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-ecpsdir    = $(datadir)/evolution/ecps</div><div class='del'>-</div><div class='del'>-ecps_DATA  =				\</div><div class='del'>-	smallbook.ecps			\</div><div class='del'>-	medbook.ecps			\</div><div class='del'>-	phonelist.ecps</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 				\</div><div class='del'>-	e-contact-print.glade</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\</div><div class='del'>-	-I$(top_srcdir)/addressbook		\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontactprint.a</div><div class='del'>-</div><div class='del'>-libecontactprint_a_SOURCES = 			\</div><div class='del'>-	e-contact-print-envelope.c		\</div><div class='del'>-	e-contact-print-envelope.h		\</div><div class='del'>-	e-contact-print-style-editor.c		\</div><div class='del'>-	e-contact-print-style-editor.h		\</div><div class='del'>-	e-contact-print-types.h			\</div><div class='del'>-	e-contact-print.c			\</div><div class='del'>-	e-contact-print.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =			\</div><div class='del'>-	contact-print-test		\</div><div class='del'>-	contact-print-style-editor-test</div><div class='del'>-</div><div class='del'>-contact_print_test_SOURCES = 	\</div><div class='del'>-	test-print.c</div><div class='del'>-</div><div class='del'>-contact_print_test_LDADD =	\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a			\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la		\</div><div class='del'>-	libecontactprint.a					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-</div><div class='del'>-contact_print_style_editor_test_SOURCES = 	\</div><div class='del'>-	test-contact-print-style-editor.c</div><div class='del'>-</div><div class='del'>-contact_print_style_editor_test_LDADD =	\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a			\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la		\</div><div class='del'>-	libecontactprint.a					\</div><div class='del'>-	$(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 		\</div><div class='del'>-	$(glade_DATA)	\</div><div class='del'>-	$(ecps_DATA)</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c<br/>deleted file mode 100644<br/>index 2f65afa81b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-envelope.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print-envelope.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,245 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print-envelope.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#define ENVELOPE_HEIGHT (72.0 * 4.0)</div><div class='del'>-#define ENVELOPE_WIDTH (72.0 * 9.5)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int start;</div><div class='del'>-	int length;</div><div class='del'>-} EcpeLine;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-startset(void *pointer, EcpeLine **iterator)</div><div class='del'>-{</div><div class='del'>-	(*iterator)--;</div><div class='del'>-	(*iterator)-&gt;start = GPOINTER_TO_INT(pointer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-lengthset(void *pointer, EcpeLine **iterator)</div><div class='del'>-{</div><div class='del'>-	(*iterator)--;</div><div class='del'>-	(*iterator)-&gt;length = GPOINTER_TO_INT(pointer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EcpeLine *</div><div class='del'>-ecpe_break(char *address)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int laststart = 0;</div><div class='del'>-	GList *startlist = NULL;</div><div class='del'>-	GList *lengthlist = NULL;</div><div class='del'>-	EcpeLine *ret_val;</div><div class='del'>-	EcpeLine *iterator;</div><div class='del'>-</div><div class='del'>-	for (i = 0; address[i]; i++) {</div><div class='del'>-		if (address[i] == '\n') {</div><div class='del'>-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));</div><div class='del'>-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));</div><div class='del'>-			length ++;</div><div class='del'>-			laststart = i + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));</div><div class='del'>-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));</div><div class='del'>-	length ++;</div><div class='del'>-</div><div class='del'>-	ret_val = g_new(EcpeLine, length + 1);</div><div class='del'>-</div><div class='del'>-	iterator = ret_val + length;</div><div class='del'>-	g_list_foreach(startlist, (GFunc) startset, &amp;iterator);</div><div class='del'>-	g_list_free(startlist);</div><div class='del'>-</div><div class='del'>-	iterator = ret_val + length;</div><div class='del'>-	g_list_foreach(lengthlist, (GFunc) lengthset, &amp;iterator);</div><div class='del'>-	g_list_free(lengthlist);</div><div class='del'>-</div><div class='del'>-	ret_val[length].start = -1;</div><div class='del'>-	ret_val[length].length = -1;</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)</div><div class='del'>-{</div><div class='del'>-	double width = 0;</div><div class='del'>-	int i;</div><div class='del'>-	if (widthp) {</div><div class='del'>-		for (i = 0; linelist[i].length != -1; i++) {</div><div class='del'>-			width = MAX(width, gnome_font_get_width_utf8_sized (font, address + linelist[i].start, linelist[i].length));</div><div class='del'>-		}</div><div class='del'>-		*widthp = width;</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; linelist[i].length != -1; i++)</div><div class='del'>-			/* Intentionally empty */;</div><div class='del'>-	}</div><div class='del'>-	if (heightp) {</div><div class='del'>-		*heightp = gnome_font_get_size(font) * i;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	gnome_print_setfont(pc, font);</div><div class='del'>-	for (i = 0; linelist[i].length != -1; i++) {</div><div class='del'>-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));</div><div class='del'>-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);</div><div class='del'>-		y -= gnome_font_get_size(font);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *card = e_card_simple_new(ecard);</div><div class='del'>-	char *address;</div><div class='del'>-	EcpeLine *linelist;</div><div class='del'>-	double x;</div><div class='del'>-	double y;</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	gnome_print_rotate(pc, 90);</div><div class='del'>-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);</div><div class='del'>-</div><div class='del'>-	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);</div><div class='del'>-	linelist = ecpe_break(address);</div><div class='del'>-	if (as_return)</div><div class='del'>-		font = gnome_font_new("Helvetica", 9);</div><div class='del'>-	else</div><div class='del'>-		font = gnome_font_new("Helvetica", 12);</div><div class='del'>-	ecpe_linelist_dimensions(font, address, linelist, NULL, &amp;y);</div><div class='del'>-	if (as_return) {</div><div class='del'>-		x = 36;</div><div class='del'>-		y = ENVELOPE_HEIGHT - 36;</div><div class='del'>-	} else {</div><div class='del'>-		x = ENVELOPE_WIDTH / 2;</div><div class='del'>-		y = (ENVELOPE_HEIGHT - y) / 2;</div><div class='del'>-	}</div><div class='del'>-	ecpe_linelist_print(pc, font, address, linelist, x, y);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(font));</div><div class='del'>-	g_free(linelist);</div><div class='del'>-</div><div class='del'>-	g_free(address);</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage(pc);</div><div class='del'>-	gnome_print_context_close(pc);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	GtkWidget *preview;</div><div class='del'>-</div><div class='del'>-	card = gtk_object_get_data(GTK_OBJECT(dialog), "card");</div><div class='del'>-</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-</div><div class='del'>-		ecpe_print(pc, card, FALSE);</div><div class='del'>-		</div><div class='del'>-		gnome_print_master_print(master);</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-</div><div class='del'>-		ecpe_print(pc, card, FALSE);</div><div class='del'>-		</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_envelope_dialog_new(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Print all the contacts selected. */</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_envelope_list_dialog_new(GList *list)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if (list == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(list-&gt;data);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h<br/>deleted file mode 100644<br/>index 4302c4c5d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-envelope.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print-envelope.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print-envelope.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_CONTACT_PRINT_ENVELOPE_H</div><div class='del'>-#define E_CONTACT_PRINT_ENVELOPE_H</div><div class='del'>-</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include "e-contact-print-types.h"</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);</div><div class='del'>-GtkWidget *e_contact_print_envelope_list_dialog_new(GList *list);</div><div class='del'>-</div><div class='del'>-#endif /* E_CONTACT_PRINT_ENVELOPE_H */</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c<br/>deleted file mode 100644<br/>index f05a508ed8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-style-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print-style-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print-style-editor.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "e-contact-print-style-editor.h"</div><div class='del'>-</div><div class='del'>-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);</div><div class='del'>-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);</div><div class='del'>-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_print_style_editor_destroy        (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkVBoxClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_print_style_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType contact_print_style_editor_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!contact_print_style_editor_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo contact_print_style_editor_info =</div><div class='del'>-      {</div><div class='del'>-        "EContactPrintStyleEditor",</div><div class='del'>-        sizeof (EContactPrintStyleEditor),</div><div class='del'>-        sizeof (EContactPrintStyleEditorClass),</div><div class='del'>-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_contact_print_style_editor_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &amp;contact_print_style_editor_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return contact_print_style_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-  GtkVBoxClass *vbox_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-  vbox_class = (GtkVBoxClass *) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (gtk_vbox_get_type ());</div><div class='del'>-  </div><div class='del'>-  object_class-&gt;set_arg = e_contact_print_style_editor_set_arg;</div><div class='del'>-  object_class-&gt;get_arg = e_contact_print_style_editor_get_arg;</div><div class='del'>-  object_class-&gt;destroy = e_contact_print_style_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)</div><div class='del'>-{</div><div class='del'>-	gtk_table_attach(table,</div><div class='del'>-			 gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-					"child", gnome_pixmap_new_from_file(image),</div><div class='del'>-					"xalign", (double) 0,</div><div class='del'>-					"yalign", (double) 0,</div><div class='del'>-					"xscale", (double) 0,</div><div class='del'>-					"yscale", (double) 0,</div><div class='del'>-					NULL),</div><div class='del'>-			 left, right, top, bottom,</div><div class='del'>-			 GTK_FILL, GTK_FILL,</div><div class='del'>-			 0, 0);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-</div><div class='del'>-	/*   e_contact_print_style_editor-&gt;card = NULL;*/</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL);</div><div class='del'>-	e_contact_print_style_editor-&gt;gui = gui;</div><div class='del'>-	gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),</div><div class='del'>-			    GTK_WIDGET(e_contact_print_style_editor));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_print_style_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(e_contact_print_style_editor-&gt;gui));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_print_style_editor_new (char *filename)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactPrintStyleEditor *e_contact_print_style_editor;</div><div class='del'>-</div><div class='del'>-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactPrintStyleEditor *e_contact_print_style_editor;</div><div class='del'>-</div><div class='del'>-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-	  arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-	  break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h<br/>deleted file mode 100644<br/>index e4604d551c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-style-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print-style-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-contact-print-style-editor.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__</div><div class='del'>-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactPrintStyleEditor - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * card         ECard *         R               The card currently being edited</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())</div><div class='del'>-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))</div><div class='del'>-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))</div><div class='del'>-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))</div><div class='del'>-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;</div><div class='del'>-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;</div><div class='del'>-</div><div class='del'>-struct _EContactPrintStyleEditor</div><div class='del'>-{</div><div class='del'>-	GtkVBox parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactPrintStyleEditorClass</div><div class='del'>-{</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_print_style_editor_new(char *filename);</div><div class='del'>-GtkType    e_contact_print_style_editor_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h<br/>deleted file mode 100644<br/>index b7082b41f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print-types.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_CONTACT_PRINT_TYPES_H</div><div class='del'>-#define E_CONTACT_PRINT_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-font.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _EContactPrintStyle EContactPrintStyle;</div><div class='del'>-typedef enum _EContactPrintType EContactPrintType;</div><div class='del'>-</div><div class='del'>-enum _EContactPrintType {</div><div class='del'>-	E_CONTACT_PRINT_TYPE_CARDS,</div><div class='del'>-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,</div><div class='del'>-	E_CONTACT_PRINT_TYPE_PHONE_LIST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactPrintStyle</div><div class='del'>-{</div><div class='del'>-	gchar *title;</div><div class='del'>-	EContactPrintType type;</div><div class='del'>-	gboolean sections_start_new_page;</div><div class='del'>-	guint num_columns;</div><div class='del'>-	guint blank_forms;</div><div class='del'>-	gboolean letter_tabs;</div><div class='del'>-	gboolean letter_headings;</div><div class='del'>-	GnomeFont *headings_font;</div><div class='del'>-	GnomeFont *body_font;</div><div class='del'>-	gboolean print_using_grey;</div><div class='del'>-	gint paper_type;</div><div class='del'>-	gdouble paper_width;</div><div class='del'>-	gdouble paper_height;</div><div class='del'>-	gint paper_source;</div><div class='del'>-	gdouble top_margin;</div><div class='del'>-	gdouble left_margin;</div><div class='del'>-	gdouble bottom_margin;</div><div class='del'>-	gdouble right_margin;</div><div class='del'>-	gint page_size;</div><div class='del'>-	gdouble page_width;</div><div class='del'>-	gdouble page_height;</div><div class='del'>-	gboolean orientation_portrait;</div><div class='del'>-	GnomeFont *header_font;</div><div class='del'>-	gchar *left_header;</div><div class='del'>-	gchar *center_header;</div><div class='del'>-	gchar *right_header;</div><div class='del'>-	GnomeFont *footer_font;</div><div class='del'>-	gchar *left_footer;</div><div class='del'>-	gchar *center_footer;</div><div class='del'>-	gchar *right_footer;</div><div class='del'>-	gboolean reverse_on_even_pages;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif /* E_CONTACT_PRINT_TYPES_H */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c<br/>deleted file mode 100644<br/>index 81f5c4e965..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1207 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-contact-print.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-multipage.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card-simple.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-destination.h&gt;</div><div class='del'>-</div><div class='del'>-#define SCALE 5</div><div class='del'>-#define HYPHEN_PIXELS 20</div><div class='del'>-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )</div><div class='del'>-</div><div class='del'>-typedef struct _EContactPrintContext EContactPrintContext;</div><div class='del'>-</div><div class='del'>-struct _EContactPrintContext</div><div class='del'>-{</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	gdouble x;</div><div class='del'>-	gdouble y;</div><div class='del'>-	gint column;</div><div class='del'>-	EContactPrintStyle *style;</div><div class='del'>-	gboolean first_section;</div><div class='del'>-	gchar first_char_on_page;</div><div class='del'>-	gchar last_char_on_page;</div><div class='del'>-	GnomeFont *letter_heading_font;</div><div class='del'>-	GnomeFont *letter_tab_font;</div><div class='del'>-	char *character;</div><div class='del'>-	gboolean first_contact;</div><div class='del'>-</div><div class='del'>-	gboolean uses_book;</div><div class='del'>-	int type;</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *query;</div><div class='del'>-</div><div class='del'>-	GList *cards;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)</div><div class='del'>-{</div><div class='del'>-	if ( width == -1 || gnome_font_get_width_utf8(font, text) &lt;= width ) {</div><div class='del'>-		if ( return_val ) {</div><div class='del'>-			*return_val = g_list_append(*return_val, g_strdup(text));</div><div class='del'>-		}</div><div class='del'>-		return 1;</div><div class='del'>-	} else {</div><div class='del'>-#if 1</div><div class='del'>-		int i, l;</div><div class='del'>-		double x = 0;</div><div class='del'>-		int lastend = 0;</div><div class='del'>-		int linestart = 0;</div><div class='del'>-		int firstword = 1;</div><div class='del'>-		int linecount = 0;</div><div class='del'>-		l = strlen(text);</div><div class='del'>-		for ( i = 0; i &lt; l; i++ ) {</div><div class='del'>-			if ( text[i] == ' ' ) {</div><div class='del'>-				if ( (!firstword) &amp;&amp; x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) &gt; width ) {</div><div class='del'>-					if (return_val) {</div><div class='del'>-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));</div><div class='del'>-					}</div><div class='del'>-					x = gnome_font_get_width_utf8(font, "    ");</div><div class='del'>-					linestart = lastend + 1;</div><div class='del'>-					x += gnome_font_get_width_utf8_sized(font, text + linestart, i - linestart);</div><div class='del'>-					lastend = i;</div><div class='del'>-					linecount ++;</div><div class='del'>-				} else {</div><div class='del'>-					x += gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend);</div><div class='del'>-					lastend = i;</div><div class='del'>-				}</div><div class='del'>-				firstword = 0;</div><div class='del'>-			} else if ( text[i] == '\n' ) {</div><div class='del'>-				if ( (!firstword) &amp;&amp; x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) &gt; width ) {</div><div class='del'>-					if (return_val) {</div><div class='del'>-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));</div><div class='del'>-					}</div><div class='del'>-					linestart = lastend + 1;</div><div class='del'>-					lastend = i;</div><div class='del'>-					linecount ++;</div><div class='del'>-				}</div><div class='del'>-				if (return_val) {</div><div class='del'>-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));</div><div class='del'>-				}</div><div class='del'>-				linestart = i + 1;</div><div class='del'>-				lastend = i + 1;</div><div class='del'>-				linecount ++;</div><div class='del'>-				x = gnome_font_get_width_utf8(font, "    ");</div><div class='del'>-</div><div class='del'>-				firstword = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if ( (!firstword) &amp;&amp; x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) &gt; width ) {</div><div class='del'>-			if (return_val) {</div><div class='del'>-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));</div><div class='del'>-			}</div><div class='del'>-			linestart = lastend + 1;</div><div class='del'>-			lastend = i;</div><div class='del'>-			linecount ++;</div><div class='del'>-		}</div><div class='del'>-		if (return_val) {</div><div class='del'>-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));</div><div class='del'>-		}</div><div class='del'>-		linecount ++;</div><div class='del'>-		return(linecount);</div><div class='del'>-#else</div><div class='del'>-		HnjBreak *breaks;</div><div class='del'>-		gint *result;</div><div class='del'>-		gint *is;</div><div class='del'>-		gint n_breaks = 0, n_actual_breaks = 0;</div><div class='del'>-		gint i;</div><div class='del'>-		gint l;</div><div class='del'>-		gchar *hyphenation;</div><div class='del'>-		double x = - gnome_font_get_width_utf8(font, "    ") * SCALE;</div><div class='del'>-		HnjParams hnjparams;</div><div class='del'>-</div><div class='del'>-		hnjparams.set_width = width * SCALE + x;</div><div class='del'>-		hnjparams.max_neg_space = 0;</div><div class='del'>-		hnjparams.tab_width = 0;</div><div class='del'>-</div><div class='del'>-		l = strlen(text);</div><div class='del'>-	</div><div class='del'>-		/* find possible line breaks. */</div><div class='del'>-		for (i = 0; i &lt; l; i++) {</div><div class='del'>-			if (text[i] == '-')</div><div class='del'>-				n_breaks++;</div><div class='del'>-			else if (text[i] == ' ')</div><div class='del'>-				n_breaks++;</div><div class='del'>-#if 0</div><div class='del'>- 			else if (hyphenation[i] &amp; 1)</div><div class='del'>-				n_breaks++;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		breaks = g_new( HnjBreak, n_breaks + 1 );</div><div class='del'>-		result = g_new( gint, n_breaks + 1 );</div><div class='del'>-		is = g_new( gint, n_breaks + 1 );</div><div class='del'>-		n_breaks = 0;</div><div class='del'>-		/* find possible line breaks. */</div><div class='del'>-	</div><div class='del'>-		for (i = 0; i &lt; l; i++) {</div><div class='del'>-			if ( text[i] == '-' ) {</div><div class='del'>-				x += gnome_font_get_width(font, text[i]) * SCALE;</div><div class='del'>-				breaks[n_breaks].x0 = x;</div><div class='del'>-				breaks[n_breaks].x1 = x;</div><div class='del'>-				breaks[n_breaks].penalty = HYPHEN_PENALTY;</div><div class='del'>-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;</div><div class='del'>-				is[n_breaks] = i + 1;</div><div class='del'>-				n_breaks++;</div><div class='del'>-			} else if ( text[i] == ' ' ) {</div><div class='del'>-				breaks[ n_breaks ].x0 = x;</div><div class='del'>-				x += gnome_font_get_width(font, text[i]) * SCALE;</div><div class='del'>-				breaks[ n_breaks ].x1 = x;</div><div class='del'>-				breaks[ n_breaks ].penalty = 0;</div><div class='del'>-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;</div><div class='del'>-				is[ n_breaks ] = i + 1;</div><div class='del'>-				n_breaks++;</div><div class='del'>-#if 0</div><div class='del'>-			} else if (word-&gt;hyphenation[i] &amp; 1) {</div><div class='del'>-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;</div><div class='del'>-				breaks[n_breaks].x1 = x;</div><div class='del'>-				breaks[n_breaks].penalty = HYPHEN_PENALTY;</div><div class='del'>-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;</div><div class='del'>-				is[n_breaks] = i + 1;</div><div class='del'>-				n_breaks++;</div><div class='del'>-#endif</div><div class='del'>-			} else</div><div class='del'>-				x += gnome_font_get_width(font, text[i]) * SCALE;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		is[n_breaks] = i;</div><div class='del'>-		breaks[n_breaks].flags = 0;</div><div class='del'>-		n_breaks++;</div><div class='del'>-</div><div class='del'>-		/* Calculate optimal line breaks. */</div><div class='del'>-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,</div><div class='del'>-					       &amp;hnjparams, result);</div><div class='del'>-</div><div class='del'>-		if ( return_val ) {</div><div class='del'>-			gchar *next_val;</div><div class='del'>-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN &amp;&amp; text[is[result[0]]] != '-' ) {</div><div class='del'>-				next_val = g_new(gchar, is[result[0]] + 2);</div><div class='del'>-				strncpy(next_val, text, is[result[0]]);</div><div class='del'>-				next_val[is[result[0]]] = 0;</div><div class='del'>-				strcat(next_val, "-");</div><div class='del'>-			} else {</div><div class='del'>-				next_val = g_new(gchar, is[result[0]] + 1);</div><div class='del'>-				strncpy(next_val, text, is[result[0]]);</div><div class='del'>-				next_val[is[result[0]]] = 0;</div><div class='del'>-			}</div><div class='del'>-			*return_val = g_list_append(*return_val, next_val);</div><div class='del'>-			</div><div class='del'>-			for ( i = 1; i &lt; n_actual_breaks; i++ ) {</div><div class='del'>-				if ( (breaks[result[i]].flags &amp; HNJ_JUST_FLAG_ISHYPHEN) &amp;&amp; (text[is[result[i]]] != '-') ) {</div><div class='del'>-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);</div><div class='del'>-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);</div><div class='del'>-					next_val[is[result[i]] - is[result[i - 1]]] = 0;</div><div class='del'>-					strcat(next_val, "-");</div><div class='del'>-				} else {</div><div class='del'>-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);</div><div class='del'>-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);</div><div class='del'>-					next_val[is[result[i]] - is[result[i - 1]]] = 0;</div><div class='del'>-				}</div><div class='del'>-				*return_val = g_list_append(*return_val, next_val);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (breaks);</div><div class='del'>-		g_free (result);</div><div class='del'>-		g_free (is);</div><div class='del'>-		return n_actual_breaks;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	GList *list = NULL, *list_start;</div><div class='del'>-	int first_line = 1;</div><div class='del'>-	gnome_print_gsave(pc);</div><div class='del'>-	gnome_print_setfont(pc, font);</div><div class='del'>-	e_contact_divide_text(pc, font, width, text, &amp;list);</div><div class='del'>-	for ( list_start = list; list; list = g_list_next(list)) {</div><div class='del'>-		y -= gnome_font_get_ascender(font);</div><div class='del'>-		gnome_print_moveto(pc, x, y);</div><div class='del'>-		gnome_print_show(pc, (char *)list-&gt;data);</div><div class='del'>-		y -= gnome_font_get_descender(font);</div><div class='del'>-		y -= .2 * gnome_font_get_size (font);</div><div class='del'>-		if ( first_line ) {</div><div class='del'>-			x += gnome_font_get_width_utf8(font, "    ");</div><div class='del'>-			first_line = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_list_foreach( list_start, (GFunc) g_free, NULL );</div><div class='del'>-	g_list_free( list_start );</div><div class='del'>-	gnome_print_grestore(pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gdouble</div><div class='del'>-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)</div><div class='del'>-{</div><div class='del'>-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);</div><div class='del'>-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +</div><div class='del'>-		(line_count - 1) * .2 * gnome_font_get_size (font);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)</div><div class='del'>-{</div><div class='del'>-	ctxt-&gt;y -= .1 * gnome_font_get_size (font);</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, font, x, ctxt-&gt;y, width, text);</div><div class='del'>-	ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, font, width, text);</div><div class='del'>-	ctxt-&gt;y -= .1 * gnome_font_get_size (font);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_rectangle(GnomePrintContext *pc, </div><div class='del'>-		   gdouble x0,</div><div class='del'>-		   gdouble y0,</div><div class='del'>-		   gdouble x1,</div><div class='del'>-		   gdouble y1,</div><div class='del'>-		   gdouble r,</div><div class='del'>-		   gdouble g,</div><div class='del'>-		   gdouble b)</div><div class='del'>-{</div><div class='del'>-	gnome_print_gsave(pc);</div><div class='del'>-	gnome_print_setrgbcolor(pc, r, g, b);</div><div class='del'>-	gnome_print_moveto(pc, x0, y0);</div><div class='del'>-	gnome_print_lineto(pc, x1, y0);</div><div class='del'>-	gnome_print_lineto(pc, x1, y1);</div><div class='del'>-	gnome_print_lineto(pc, x0, y1);</div><div class='del'>-	gnome_print_lineto(pc, x0, y0);</div><div class='del'>-	gnome_print_fill(pc);</div><div class='del'>-	gnome_print_grestore(pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	return gnome_font_get_width_utf8(ctxt-&gt;letter_tab_font, "123") + 4 + 18;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_print_letter_tab (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	unsigned char character;</div><div class='del'>-	gdouble x, y;</div><div class='del'>-	gdouble page_width = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble tab_height, tab_width;</div><div class='del'>-	gdouble font_size;</div><div class='del'>-	tab_height = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin - ctxt-&gt;style-&gt;bottom_margin) / 27.0;</div><div class='del'>-	font_size = tab_height / 2;</div><div class='del'>-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;</div><div class='del'>-	x = page_width + 72 * (ctxt-&gt;style-&gt;left_margin) - tab_width;</div><div class='del'>-	y = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave( ctxt-&gt;pc );</div><div class='del'>-	if ( ctxt-&gt;style-&gt;print_using_grey )</div><div class='del'>-		e_contact_rectangle( ctxt-&gt;pc, x, 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin), x + tab_width, ctxt-&gt;style-&gt;bottom_margin * 72, .85, .85, .85 );</div><div class='del'>-	for ( character = 'A' - 1; character &lt;= 'Z'; character ++ ) {</div><div class='del'>-		char string[] = "123";</div><div class='del'>-		if ( character &gt;= 'A' ) {</div><div class='del'>-			string[0] = tolower(character);</div><div class='del'>-			string[1] = 0;</div><div class='del'>-		}</div><div class='del'>-		if ( character &gt;= ctxt-&gt;first_char_on_page &amp;&amp; character &lt;= ctxt-&gt;last_char_on_page ) {</div><div class='del'>-			e_contact_rectangle( ctxt-&gt;pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );</div><div class='del'>-			gnome_print_setrgbcolor( ctxt-&gt;pc, 1, 1, 1 );</div><div class='del'>-			e_contact_output( ctxt-&gt;pc, ctxt-&gt;letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt-&gt;letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );</div><div class='del'>-		} else {</div><div class='del'>-			gnome_print_setrgbcolor( ctxt-&gt;pc, 0, 0, 0 );</div><div class='del'>-			e_contact_output( ctxt-&gt;pc, ctxt-&gt;letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt-&gt;letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );</div><div class='del'>-		}</div><div class='del'>-		y -= tab_height;</div><div class='del'>-	}</div><div class='del'>-	gnome_print_grestore( ctxt-&gt;pc );</div><div class='del'>-	return gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, "123") + gnome_font_get_size (ctxt-&gt;style-&gt;body_font) / 5;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble ascender, descender;</div><div class='del'>-	ascender = gnome_font_get_ascender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	descender = gnome_font_get_descender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	return ascender + descender + 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)</div><div class='del'>-{</div><div class='del'>-	gdouble ascender, descender;</div><div class='del'>-	gdouble width;</div><div class='del'>-</div><div class='del'>-	width = gnome_font_get_width_utf8(ctxt-&gt;letter_heading_font, "m") * 1.7;</div><div class='del'>-	ascender = gnome_font_get_ascender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	descender = gnome_font_get_descender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	gnome_print_gsave( ctxt-&gt;pc );</div><div class='del'>-	e_contact_rectangle( ctxt-&gt;pc, ctxt-&gt;x, ctxt-&gt;y, ctxt-&gt;x + width, ctxt-&gt;y - (ascender + descender + 6), 0, 0, 0);</div><div class='del'>-	gnome_print_setrgbcolor(ctxt-&gt;pc, 1, 1, 1);</div><div class='del'>-	ctxt-&gt;y -= 4;</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;letter_heading_font, ctxt-&gt;x + (width - gnome_font_get_width_utf8(ctxt-&gt;letter_heading_font, character))/ 2, ctxt-&gt;y, -1, character);</div><div class='del'>-	ctxt-&gt;y -= ascender + descender;</div><div class='del'>-	ctxt-&gt;y -= 2;</div><div class='del'>-	ctxt-&gt;y -= 3;</div><div class='del'>-	gnome_print_grestore( ctxt-&gt;pc );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_start_new_page(EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ctxt-&gt;x = ctxt-&gt;style-&gt;left_margin * 72;</div><div class='del'>-	ctxt-&gt;y = (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin) * 72;</div><div class='del'>-	ctxt-&gt;column = 0;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		e_contact_print_letter_tab(ctxt);</div><div class='del'>-	gnome_print_showpage(ctxt-&gt;pc);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;first_char_on_page = ctxt-&gt;last_char_on_page + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble height = 0;</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	char *file_as;</div><div class='del'>-	gint field;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-		       "file_as", &amp;file_as,</div><div class='del'>-		       NULL);</div><div class='del'>-	height += e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as);</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = e_card_simple_get(simple, field);</div><div class='del'>-		if (string &amp;&amp; *string) {</div><div class='del'>-			double xoff = 0;</div><div class='del'>-			xoff += gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, e_card_simple_get_name(simple, field));</div><div class='del'>-			xoff += gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, ":  ");</div><div class='del'>-			height += e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, column_width - xoff, string);</div><div class='del'>-			height += .2 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-</div><div class='del'>-	/* g_message ("%s %g", e_card_simple_get (simple, E_CARD_SIMPLE_FIELD_FILE_AS), height); */</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	char *file_as;</div><div class='del'>-	int field;</div><div class='del'>-</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave(ctxt-&gt;pc);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-		       "file_as", &amp;file_as,</div><div class='del'>-		       NULL);</div><div class='del'>-	if (ctxt-&gt;style-&gt;print_using_grey)</div><div class='del'>-		e_contact_rectangle(ctxt-&gt;pc, ctxt-&gt;x, ctxt-&gt;y + gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .3, ctxt-&gt;x + column_width, ctxt-&gt;y - e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .3, .85, .85, .85);</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, ctxt-&gt;x + 2, ctxt-&gt;y, column_width - 4, file_as);</div><div class='del'>-	ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as);</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = e_card_simple_get(simple, field);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; !strncmp (string, "&lt;?xml", 4)) {</div><div class='del'>-			EDestination *dest = e_destination_import (string);</div><div class='del'>-			if (dest != NULL) {</div><div class='del'>-				gchar *new_string = g_strdup (e_destination_get_address (dest));</div><div class='del'>-				g_free (string);</div><div class='del'>-				string = new_string;</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string) {</div><div class='del'>-			double xoff = 0;</div><div class='del'>-			e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x + xoff, ctxt-&gt;y, -1, e_card_simple_get_name(simple, field));</div><div class='del'>-			xoff += gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, e_card_simple_get_name(simple, field));</div><div class='del'>-			e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x + xoff, ctxt-&gt;y, -1, ":  ");</div><div class='del'>-			xoff += gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, ":  ");</div><div class='del'>-			e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x + xoff, ctxt-&gt;y, column_width - xoff, string);</div><div class='del'>-			ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, column_width - xoff, string);</div><div class='del'>-			ctxt-&gt;y -= .2 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	gnome_print_grestore(ctxt-&gt;pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_start_new_column (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_offset;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_offset = (page_width + 18) / ctxt-&gt;style-&gt;num_columns;</div><div class='del'>-	ctxt-&gt;column ++;</div><div class='del'>-	if (ctxt-&gt;column &gt;= ctxt-&gt;style-&gt;num_columns) {</div><div class='del'>-		e_contact_start_new_page(ctxt);</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;x = (72 * ctxt-&gt;style-&gt;left_margin) + column_offset * ctxt-&gt;column;</div><div class='del'>-	ctxt-&gt;y = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *cards = ctxt-&gt;cards;</div><div class='del'>-</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;first_contact = TRUE;</div><div class='del'>-	ctxt-&gt;character = NULL;</div><div class='del'>-	ctxt-&gt;y = (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin) * 72;</div><div class='del'>-	ctxt-&gt;x = (ctxt-&gt;style-&gt;left_margin) * 72;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-</div><div class='del'>-	for(; cards; cards = cards-&gt;next) {</div><div class='del'>-		ECard *card = cards-&gt;data;</div><div class='del'>-		ECardSimple *simple = e_card_simple_new(card);</div><div class='del'>-		guchar *file_as;</div><div class='del'>-		gchar *letter_str = NULL;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as", &amp;file_as,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (file_as != NULL) {</div><div class='del'>-			letter_str = g_strndup (file_as, g_utf8_next_char (file_as) - (gchar *) file_as);</div><div class='del'>-		}</div><div class='del'>-		if ( file_as &amp;&amp; (!ctxt-&gt;character || g_utf8_collate (ctxt-&gt;character, letter_str) != 0) ) {</div><div class='del'>-			g_free (ctxt-&gt;character);</div><div class='del'>-			ctxt-&gt;character = g_strdup (letter_str);</div><div class='del'>-			if (ctxt-&gt;style-&gt;sections_start_new_page &amp;&amp; ! ctxt-&gt;first_contact) {</div><div class='del'>-				e_contact_start_new_page(ctxt);</div><div class='del'>-			}</div><div class='del'>-			else if ((!ctxt-&gt;first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) &lt; ctxt-&gt;style-&gt;bottom_margin * 72))</div><div class='del'>-				e_contact_start_new_column(ctxt);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, ctxt-&gt;character);</div><div class='del'>-			ctxt-&gt;first_section = FALSE;</div><div class='del'>-		} </div><div class='del'>-		else if ( (!ctxt-&gt;first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_card_size(simple, ctxt) &lt; ctxt-&gt;style-&gt;bottom_margin * 72)) {</div><div class='del'>-			e_contact_start_new_column(ctxt);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, ctxt-&gt;character);</div><div class='del'>-		}</div><div class='del'>-		g_free (letter_str);</div><div class='del'>-		ctxt-&gt;last_char_on_page = toupper(*file_as);</div><div class='del'>-		if ( ctxt-&gt;last_char_on_page &lt; ctxt-&gt;first_char_on_page )</div><div class='del'>-			ctxt-&gt;first_char_on_page = ctxt-&gt;last_char_on_page;</div><div class='del'>-		e_contact_print_card(simple, ctxt);</div><div class='del'>-		ctxt-&gt;first_contact = FALSE;</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;last_char_on_page = 'Z';</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		e_contact_print_letter_tab(ctxt);</div><div class='del'>-	gnome_print_showpage(ctxt-&gt;pc);</div><div class='del'>-	gnome_print_context_close(ctxt-&gt;pc);</div><div class='del'>-	g_free(ctxt-&gt;character);</div><div class='del'>-	if (book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book_view));</div><div class='del'>-	if (ctxt-&gt;type == GNOME_PRINT_PREVIEW) {</div><div class='del'>-		GtkWidget *preview;</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt-&gt;master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-	} else {</div><div class='del'>-		gnome_print_master_print(ctxt-&gt;master);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;pc));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;master));</div><div class='del'>-	if (ctxt-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(ctxt-&gt;book));</div><div class='del'>-	g_free(ctxt-&gt;query);</div><div class='del'>-	g_list_foreach(ctxt-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free(ctxt-&gt;cards);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;headings_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;body_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;header_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;footer_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;letter_heading_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;letter_tab_font));</div><div class='del'>-	g_free(ctxt-&gt;style);</div><div class='del'>-	g_free(ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-card_compare (ECard *card1, ECard *card2) {</div><div class='del'>-	if (card1 &amp;&amp; card2) {</div><div class='del'>-		char *file_as1, *file_as2;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card1),</div><div class='del'>-			       "file_as", &amp;file_as1,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card2),</div><div class='del'>-			       "file_as", &amp;file_as2,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (file_as1 &amp;&amp; file_as2)</div><div class='del'>-			return g_utf8_collate(file_as1, file_as2);</div><div class='del'>-		if (file_as1)</div><div class='del'>-			return -1;</div><div class='del'>-		if (file_as2)</div><div class='del'>-			return 1;</div><div class='del'>-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	for(; cards; cards = cards-&gt;next) {</div><div class='del'>-		ECard *card = cards-&gt;data;</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-		ctxt-&gt;cards = g_list_insert_sorted(ctxt-&gt;cards, card, (GCompareFunc) card_compare);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(book_view));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(book_view),</div><div class='del'>-			   "card_added",</div><div class='del'>-			   GTK_SIGNAL_FUNC(create_card),</div><div class='del'>-			   ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(book_view),</div><div class='del'>-			   "sequence_complete",</div><div class='del'>-			   GTK_SIGNAL_FUNC(complete_sequence),</div><div class='del'>-			   ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static double</div><div class='del'>-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	double height = 0;</div><div class='del'>-	int field;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = e_card_simple_get(simple, field);</div><div class='del'>-		if (string &amp;&amp; *string) {</div><div class='del'>-			if ( 1 ) /* field is a phone field. */ {</div><div class='del'>-				gchar *field = string;</div><div class='del'>-				height += e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, 100, field);</div><div class='del'>-				height += .2 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	double xoff, dotwidth;</div><div class='del'>-	int dotcount;</div><div class='del'>-	char *dots;</div><div class='del'>-	int i;</div><div class='del'>-	char *file_as;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave(ctxt-&gt;pc);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x, ctxt-&gt;y, -1, e_card_get_string_fileas(card));</div><div class='del'>-	</div><div class='del'>-	xoff = column_width - 9 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-	dotwidth = xoff - </div><div class='del'>-		gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, e_card_get_string_fileas(card)) - </div><div class='del'>-		gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, " ");</div><div class='del'>-	dotcount = dotwidth / gnome_font_get_width(ctxt-&gt;style-&gt;body_font, '.');</div><div class='del'>-	dots = g_new(gchar, dotcount + 1);</div><div class='del'>-	for (i = 0; i &lt; dotcount; i++)</div><div class='del'>-		dots[i] = '.';</div><div class='del'>-	dots[dotcount] = 0;</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x + xoff - dotcount * gnome_font_get_width(ctxt-&gt;style-&gt;body_font, '.'), ctxt-&gt;y, -1, dots);</div><div class='del'>-	g_free(dots);</div><div class='del'>-		</div><div class='del'>-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {</div><div class='del'>-		if ( 1 ) /* field is a phone field. */ {</div><div class='del'>-			gchar *field = e_card_get_string(card, shown_fields-&gt;data);</div><div class='del'>-			e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x + xoff, ctxt-&gt;y, -1, shown_fields-&gt;data);</div><div class='del'>-			e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, </div><div class='del'>-					 ctxt-&gt;x + column_width - gnome_font_get_width_utf8(ctxt-&gt;style-&gt;body_font, </div><div class='del'>-											      field),</div><div class='del'>-					 ctxt-&gt;y,</div><div class='del'>-					 -1,</div><div class='del'>-					 field);</div><div class='del'>-			ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, 100, field);</div><div class='del'>-			ctxt-&gt;y -= .2 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	gnome_print_grestore(ctxt-&gt;pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	ctxt-&gt;first_contact = TRUE;</div><div class='del'>-	ctxt-&gt;character = NULL;</div><div class='del'>-	ctxt-&gt;y = (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin) * 72;</div><div class='del'>-	ctxt-&gt;x = (ctxt-&gt;style-&gt;left_margin) * 72;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-	/*</div><div class='del'>-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {</div><div class='del'>-	*/</div><div class='del'>-	for (i=0; i &lt; 30; i++) {</div><div class='del'>-		guchar *file_as = e_card_get_string_fileas(card);</div><div class='del'>-		if ( file_as &amp;&amp; (!character || *character != tolower(*file_as)) ) {</div><div class='del'>-			if (ctxt-&gt;style-&gt;sections_start_new_page &amp;&amp; ! first_contact) {</div><div class='del'>-				e_contact_start_new_page(ctxt);</div><div class='del'>-			}</div><div class='del'>-			else if ((!first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) &lt; ctxt-&gt;style-&gt;bottom_margin * 72))</div><div class='del'>-				e_contact_start_new_column(ctxt);</div><div class='del'>-			if (!character)</div><div class='del'>-				character = g_strdup(" ");</div><div class='del'>-			*character = tolower(*file_as);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, character);</div><div class='del'>-			ctxt-&gt;first_section = FALSE;</div><div class='del'>-		} </div><div class='del'>-		else if ( (!first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_card_size(card, ctxt, shown_fields) &lt; ctxt-&gt;style-&gt;bottom_margin * 72)) {</div><div class='del'>-			e_contact_start_new_column(ctxt);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, character);</div><div class='del'>-		}</div><div class='del'>-		ctxt-&gt;last_char_on_page = toupper(*file_as);</div><div class='del'>-		if ( ctxt-&gt;last_char_on_page &lt; ctxt-&gt;first_char_on_page )</div><div class='del'>-			ctxt-&gt;first_char_on_page = ctxt-&gt;last_char_on_page;</div><div class='del'>-		e_contact_print_phone_list(card, ctxt, shown_fields);</div><div class='del'>-		first_contact = FALSE;</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;last_char_on_page = 'Z';</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		e_contact_print_letter_tab(ctxt);</div><div class='del'>-	gnome_print_showpage(ctxt-&gt;pc);</div><div class='del'>-	gnome_print_context_close(ctxt-&gt;pc);</div><div class='del'>-	g_free(character);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	switch ( ctxt-&gt;style-&gt;type ) {</div><div class='del'>-	case E_CONTACT_PRINT_TYPE_CARDS:</div><div class='del'>-		e_contact_do_print_cards( book, query, ctxt);</div><div class='del'>-		break;</div><div class='del'>-#if 0</div><div class='del'>-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:</div><div class='del'>-		e_contact_do_print_phone_list( book, query, ctxt );</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lowify( char *data )</div><div class='del'>-{</div><div class='del'>-	for ( ; *data; data++ )</div><div class='del'>-		*data = tolower((unsigned char) *data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean get_bool( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data ) {</div><div class='del'>-		lowify ( data );</div><div class='del'>-		return ! strcmp(data, "true");</div><div class='del'>-	} else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_string( char *data, char **variable )</div><div class='del'>-{</div><div class='del'>-	g_free ( *variable );</div><div class='del'>-	if ( data )</div><div class='del'>-		*variable = g_strdup( data );</div><div class='del'>-	else</div><div class='del'>-		*variable = g_strdup( "" );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_integer( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data )</div><div class='del'>-		return atoi(data);</div><div class='del'>-	else </div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double get_float( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data )</div><div class='del'>-		return atof(data);</div><div class='del'>-	else </div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_font( char *data, GnomeFont **variable )</div><div class='del'>-{</div><div class='del'>-	if ( data ) {</div><div class='del'>-		GnomeFont *font = gnome_font_new_from_full_name( data );</div><div class='del'>-		if ( font ) {</div><div class='del'>-			gtk_object_unref( GTK_OBJECT(*variable) );</div><div class='del'>-			*variable = font;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_build_style(EContactPrintStyle *style)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr styledoc;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	style-&gt;title = g_strdup("");</div><div class='del'>-	style-&gt;type = E_CONTACT_PRINT_TYPE_CARDS;</div><div class='del'>-	style-&gt;sections_start_new_page = TRUE;</div><div class='del'>-	style-&gt;num_columns = 2;</div><div class='del'>-	style-&gt;blank_forms = 2;</div><div class='del'>-	style-&gt;letter_tabs = TRUE;</div><div class='del'>-	style-&gt;letter_headings = FALSE;</div><div class='del'>-</div><div class='del'>-	style-&gt;headings_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOLD, FALSE, 8);</div><div class='del'>-	style-&gt;body_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);</div><div class='del'>-</div><div class='del'>-	style-&gt;print_using_grey = TRUE;</div><div class='del'>-	style-&gt;paper_type = 0;</div><div class='del'>-	style-&gt;paper_width = 8.5;</div><div class='del'>-	style-&gt;paper_height = 11;</div><div class='del'>-	style-&gt;paper_source = 0;</div><div class='del'>-	style-&gt;top_margin = .5;</div><div class='del'>-	style-&gt;left_margin = .5;</div><div class='del'>-	style-&gt;bottom_margin = .5;</div><div class='del'>-	style-&gt;right_margin = .5;</div><div class='del'>-	style-&gt;page_size = 0;</div><div class='del'>-	style-&gt;page_width = 2.75;</div><div class='del'>-	style-&gt;page_height = 4.25;</div><div class='del'>-#if 0</div><div class='del'>-	style-&gt;page_width = 4.25;</div><div class='del'>-	style-&gt;page_height = 5.5;</div><div class='del'>-#endif</div><div class='del'>-#if 0</div><div class='del'>-	style-&gt;page_width = 5.5;</div><div class='del'>-	style-&gt;page_height = 8.5;</div><div class='del'>-#endif</div><div class='del'>-	style-&gt;orientation_portrait = FALSE;</div><div class='del'>-</div><div class='del'>-	style-&gt;header_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);</div><div class='del'>-</div><div class='del'>-	style-&gt;left_header = g_strdup("");</div><div class='del'>-	style-&gt;center_header = g_strdup("");</div><div class='del'>-	style-&gt;right_header = g_strdup("");</div><div class='del'>-</div><div class='del'>-	style-&gt;footer_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);</div><div class='del'>-</div><div class='del'>-	style-&gt;left_footer = g_strdup("");</div><div class='del'>-	style-&gt;center_footer = g_strdup("");</div><div class='del'>-	style-&gt;right_footer = g_strdup("");</div><div class='del'>-	style-&gt;reverse_on_even_pages = FALSE;</div><div class='del'>-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");</div><div class='del'>-	styledoc = xmlParseFile(filename);</div><div class='del'>-	g_free(filename);</div><div class='del'>-	if (styledoc) {</div><div class='del'>-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);</div><div class='del'>-		xmlNodePtr node;</div><div class='del'>-		for (node = stylenode-&gt;childs; node; node = node-&gt;next) {</div><div class='del'>-			char *data = xmlNodeGetContent ( node );</div><div class='del'>-			if ( !strcmp( node-&gt;name, "title" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;title));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "type" ) ) {</div><div class='del'>-				lowify( data );</div><div class='del'>-				if ( !strcmp( data, "cards" ) )</div><div class='del'>-					style-&gt;type = E_CONTACT_PRINT_TYPE_CARDS;</div><div class='del'>-				else if ( !strcmp( data, "memo_style" ) )</div><div class='del'>-					style-&gt;type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;</div><div class='del'>-				else if ( !strcmp( data, "phone_list" ) )</div><div class='del'>-					style-&gt;type = E_CONTACT_PRINT_TYPE_PHONE_LIST;</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "sections_start_new_page" ) ) {</div><div class='del'>-				style-&gt;sections_start_new_page = get_bool(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "num_columns" ) ) {</div><div class='del'>-				style-&gt;num_columns = get_integer(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "blank_forms" ) ) {</div><div class='del'>-				style-&gt;blank_forms = get_integer(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "letter_tabs" ) ) {</div><div class='del'>-				style-&gt;letter_tabs = get_bool(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "letter_headings" ) ) {</div><div class='del'>-				style-&gt;letter_headings = get_bool(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "headings_font" ) ) {</div><div class='del'>-				get_font( data, &amp;(style-&gt;headings_font) );</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "body_font" ) ) {</div><div class='del'>-				get_font( data, &amp;(style-&gt;body_font) );</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "print_using_grey" ) ) {</div><div class='del'>-				style-&gt;print_using_grey = get_bool(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "paper_width" ) ) {</div><div class='del'>-				style-&gt;paper_width = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "paper_height" ) ) {</div><div class='del'>-				style-&gt;paper_height = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "top_margin" ) ) {</div><div class='del'>-				style-&gt;top_margin = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "left_margin" ) ) {</div><div class='del'>-				style-&gt;left_margin = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "bottom_margin" ) ) {</div><div class='del'>-				style-&gt;bottom_margin = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "right_margin" ) ) {</div><div class='del'>-				style-&gt;right_margin = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "page_width" ) ) {</div><div class='del'>-				style-&gt;page_width = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "page_height" ) ) {</div><div class='del'>-				style-&gt;page_height = get_float(data);</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "orientation" ) ) {</div><div class='del'>-				if ( data ) {</div><div class='del'>-					lowify(data);</div><div class='del'>-					style-&gt;orientation_portrait = strcmp(data, "landscape");</div><div class='del'>-				} else {</div><div class='del'>-					style-&gt;orientation_portrait = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "header_font" ) ) {</div><div class='del'>-				get_font( data, &amp;(style-&gt;header_font) );</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "left_header" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;left_header));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "center_header" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;center_header));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "right_header" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;right_header));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "footer_font" ) ) {</div><div class='del'>-				get_font( data, &amp;(style-&gt;footer_font) );</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "left_footer" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;left_footer));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "center_footer" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;center_footer));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "right_footer" ) ) {</div><div class='del'>-				get_string(data, &amp;(style-&gt;right_footer));</div><div class='del'>-			} else if ( !strcmp( node-&gt;name, "reverse_on_even_pages" ) ) {</div><div class='del'>-				style-&gt;reverse_on_even_pages = get_bool(data);</div><div class='del'>-			}</div><div class='del'>-			if ( data )</div><div class='del'>-				xmlFree (data);</div><div class='del'>-		}</div><div class='del'>-		xmlFreeDoc(styledoc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_contact_print_close(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);</div><div class='del'>-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");</div><div class='del'>-	EBook *book = NULL;</div><div class='del'>-	char *query = NULL;</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	gdouble font_size;</div><div class='del'>-	if (uses_book) {</div><div class='del'>-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");</div><div class='del'>-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");</div><div class='del'>-	} else {</div><div class='del'>-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");</div><div class='del'>-	}</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_contact_build_style(style);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;x = 0;</div><div class='del'>-		ctxt-&gt;y = 0;</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-		ctxt-&gt;style = style;</div><div class='del'>-		ctxt-&gt;master = master;</div><div class='del'>-		ctxt-&gt;first_section = TRUE;</div><div class='del'>-		ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-		ctxt-&gt;type = GNOME_PRINT_PRINT;</div><div class='del'>-</div><div class='del'>-		font_size = 72 * ctxt-&gt;style-&gt;page_height / 27.0 / 2.0;</div><div class='del'>-		ctxt-&gt;letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * 1.5);</div><div class='del'>-		ctxt-&gt;letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), font_size);</div><div class='del'>-	</div><div class='del'>-		ctxt-&gt;pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, </div><div class='del'>-										   72 * style-&gt;paper_width, </div><div class='del'>-										   72 * style-&gt;paper_height,</div><div class='del'>-										   72 * style-&gt;page_width,</div><div class='del'>-										   72 * style-&gt;page_height));</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;book = book;</div><div class='del'>-		ctxt-&gt;query = query;</div><div class='del'>-		if (uses_book) {</div><div class='del'>-			ctxt-&gt;cards = NULL;</div><div class='del'>-			e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			ctxt-&gt;cards = g_list_append(NULL, card);</div><div class='del'>-			complete_sequence(NULL, ctxt);</div><div class='del'>-		}</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_contact_build_style(style);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;x = 0;</div><div class='del'>-		ctxt-&gt;y = 0;</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-		ctxt-&gt;style = style;</div><div class='del'>-		ctxt-&gt;master = master;</div><div class='del'>-		ctxt-&gt;first_section = TRUE;</div><div class='del'>-		ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-		ctxt-&gt;type = GNOME_PRINT_PREVIEW;</div><div class='del'>-</div><div class='del'>-		font_size = 72 * ctxt-&gt;style-&gt;page_height / 27.0 / 2.0;</div><div class='del'>-		ctxt-&gt;letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * 1.5);</div><div class='del'>-		ctxt-&gt;letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), font_size);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, </div><div class='del'>-										   72 * style-&gt;paper_width, </div><div class='del'>-										   72 * style-&gt;paper_height,</div><div class='del'>-										   72 * style-&gt;page_width,</div><div class='del'>-										   72 * style-&gt;page_height));</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;book = book;</div><div class='del'>-		ctxt-&gt;query = g_strdup(query);</div><div class='del'>-		if (uses_book) {</div><div class='del'>-			ctxt-&gt;cards = NULL;</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(book));</div><div class='del'>-			e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			ctxt-&gt;cards = g_list_append(NULL, card);</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-			complete_sequence(NULL, ctxt);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		if (uses_book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(book));</div><div class='del'>-		else</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		g_free(query);</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		g_free(style);</div><div class='del'>-		g_free(ctxt);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_dialog_new(EBook *book, char *query)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new(_("Print cards"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,</div><div class='del'>-					       NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(book));</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_print_preview(EBook *book, char *query)</div><div class='del'>-{</div><div class='del'>-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);</div><div class='del'>-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	gdouble font_size;</div><div class='del'>-</div><div class='del'>-	master = gnome_print_master_new();</div><div class='del'>-	gnome_print_master_set_copies (master, 1, FALSE);</div><div class='del'>-	pc = gnome_print_master_get_context (master);</div><div class='del'>-	e_contact_build_style (style);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;x = 0;</div><div class='del'>-	ctxt-&gt;y = 0;</div><div class='del'>-	ctxt-&gt;column = 0;</div><div class='del'>-	ctxt-&gt;style = style;</div><div class='del'>-	ctxt-&gt;master = master;</div><div class='del'>-	ctxt-&gt;first_section = TRUE;</div><div class='del'>-	ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-	ctxt-&gt;type = GNOME_PRINT_PREVIEW;</div><div class='del'>-</div><div class='del'>-	font_size = 72 * ctxt-&gt;style-&gt;page_height / 27.0 / 2.0;</div><div class='del'>-	ctxt-&gt;letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * 1.5);</div><div class='del'>-	ctxt-&gt;letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), font_size);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, </div><div class='del'>-									    72 * style-&gt;paper_width, </div><div class='del'>-									    72 * style-&gt;paper_height,</div><div class='del'>-									    72 * style-&gt;page_width,</div><div class='del'>-									    72 * style-&gt;page_height));</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;book = book;</div><div class='del'>-	ctxt-&gt;query = g_strdup(query);</div><div class='del'>-	ctxt-&gt;cards = NULL;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(book));</div><div class='del'>-	e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_card_dialog_new(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Print all the contacts selected. */</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_card_list_dialog_new(GList *list)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	if (list == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(list-&gt;data);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade<br/>deleted file mode 100644<br/>index 292fc8cc85..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2003 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Printing&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;printing&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;False&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;False&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;print-edit-style&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Page Setup:&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox-contact-print-style-editor&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;5&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;16&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Style name:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label-style-name&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;notebook1&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-	&lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-	&lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-	&lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-	&lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-	&lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-	&lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;5&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame5&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Preview:&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;7&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame6&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Options&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;alignment4&lt;/name&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		&lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-		  &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-		  &lt;rows&gt;6&lt;/rows&gt;</div><div class='del'>-		  &lt;columns&gt;5&lt;/columns&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-		  &lt;column_spacing&gt;0&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Include:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Sections:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment2&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;radiobutton1&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;Immediately follow each other&lt;/label&gt;</div><div class='del'>-		      &lt;active&gt;True&lt;/active&gt;</div><div class='del'>-		      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;checkbutton1&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Letter tabs on side&lt;/label&gt;</div><div class='del'>-		    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;checkbutton2&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Headings for each letter&lt;/label&gt;</div><div class='del'>-		    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment3&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;5&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;radiobutton2&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;Start on a new page&lt;/label&gt;</div><div class='del'>-		      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Number of columns:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Blank forms at end:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment6&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;spinbutton2&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		      &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		      &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-		      &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		      &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;value&gt;2&lt;/value&gt;</div><div class='del'>-		      &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-		      &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-		      &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		      &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		      &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment5&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;2&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;spinbutton1&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;45&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		      &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		      &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-		      &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		      &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-		      &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-		      &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-		      &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		      &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		      &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox3&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;frame7&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Fonts&lt;/label&gt;</div><div class='del'>-		&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-		&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;table2&lt;/name&gt;</div><div class='del'>-		  &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-		  &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-		  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;row_spacing&gt;13&lt;/row_spacing&gt;</div><div class='del'>-		  &lt;column_spacing&gt;8&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment7&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;button6&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;F_ont...&lt;/label&gt;</div><div class='del'>-		      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment8&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;button5&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;90&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;_Font...&lt;/label&gt;</div><div class='del'>-		      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;vbox4&lt;/name&gt;</div><div class='del'>-		    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label10&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Headings&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry3&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;100&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;10 pt. Tahoma&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;vbox5&lt;/name&gt;</div><div class='del'>-		    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label9&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Body&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry2&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;100&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;8 pt. Tahoma&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;frame8&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Shading&lt;/label&gt;</div><div class='del'>-		&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-		&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;checkbutton3&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;Print using gray shading&lt;/label&gt;</div><div class='del'>-		  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Format&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox3&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox6&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Paper&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;vbox16&lt;/name&gt;</div><div class='del'>-		&lt;border_width&gt;10&lt;/border_width&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox17&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label21&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Type:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-		    &lt;hscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/hscrollbar_policy&gt;</div><div class='del'>-		    &lt;vscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/vscrollbar_policy&gt;</div><div class='del'>-		    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-		    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;clist1&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-		      &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-		      &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-		      &lt;show_titles&gt;False&lt;/show_titles&gt;</div><div class='del'>-		      &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-		      &lt;widget&gt;</div><div class='del'>-			&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-			&lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-			&lt;name&gt;label26&lt;/name&gt;</div><div class='del'>-			&lt;label&gt;label26&lt;/label&gt;</div><div class='del'>-			&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-			&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-			&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-			&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-			&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-			&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;/widget&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox18&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label24&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Dimensions:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;hbox5&lt;/name&gt;</div><div class='del'>-		    &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-		    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label27&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Width:&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry9&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label28&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Height:&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry10&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox19&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label25&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Paper source:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;combo1&lt;/name&gt;</div><div class='del'>-		    &lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-		    &lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-		    &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-		    &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-		    &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-		    &lt;items&gt;&lt;/items&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-		      &lt;name&gt;combo-entry1&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame10&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Margins&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;table4&lt;/name&gt;</div><div class='del'>-		&lt;border_width&gt;15&lt;/border_width&gt;</div><div class='del'>-		&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-		&lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-		&lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-		&lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-		&lt;column_spacing&gt;9&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label29&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Top:&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label30&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Bottom:&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label31&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Left:&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry11&lt;/name&gt;</div><div class='del'>-		  &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry12&lt;/name&gt;</div><div class='del'>-		  &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry13&lt;/name&gt;</div><div class='del'>-		  &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry14&lt;/name&gt;</div><div class='del'>-		  &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label32&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Right:&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox7&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame11&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Page&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;vbox8&lt;/name&gt;</div><div class='del'>-		&lt;border_width&gt;10&lt;/border_width&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox20&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label33&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Size:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;scrolledwindow2&lt;/name&gt;</div><div class='del'>-		    &lt;hscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/hscrollbar_policy&gt;</div><div class='del'>-		    &lt;vscrollbar_policy&gt;GTK_POLICY_ALWAYS&lt;/vscrollbar_policy&gt;</div><div class='del'>-		    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-		    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;clist2&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-		      &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-		      &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-		      &lt;show_titles&gt;False&lt;/show_titles&gt;</div><div class='del'>-		      &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-		      &lt;widget&gt;</div><div class='del'>-			&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-			&lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-			&lt;name&gt;label35&lt;/name&gt;</div><div class='del'>-			&lt;label&gt;label26&lt;/label&gt;</div><div class='del'>-			&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-			&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-			&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-			&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-			&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-			&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;/widget&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox21&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;label34&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;Dimensions:&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;hbox6&lt;/name&gt;</div><div class='del'>-		    &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-		    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label36&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Width:&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry15&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;label37&lt;/name&gt;</div><div class='del'>-		      &lt;label&gt;Height:&lt;/label&gt;</div><div class='del'>-		      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;entry16&lt;/name&gt;</div><div class='del'>-		      &lt;width&gt;1&lt;/width&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		      &lt;child&gt;</div><div class='del'>-			&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-			&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-			&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		      &lt;/child&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame12&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Orientation&lt;/label&gt;</div><div class='del'>-	      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;10&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox9&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment9&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;radiobutton3&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;Portrait&lt;/label&gt;</div><div class='del'>-		      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;alignment10&lt;/name&gt;</div><div class='del'>-		    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		    &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		    &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;radiobutton4&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;label&gt;Landscape&lt;/label&gt;</div><div class='del'>-		      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Paper&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox10&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table5&lt;/name&gt;</div><div class='del'>-	    &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment15&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;button11&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;F_ont...&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text10&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;50&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text11&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;50&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text12&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;50&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text13&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;50&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text14&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;5&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;text15&lt;/name&gt;</div><div class='del'>-	      &lt;height&gt;50&lt;/height&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment16&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;vbox14&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label14&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Header&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry7&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment17&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;vbox15&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label15&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Footer:&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;entry8&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment14&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;1&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;button10&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Font...&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox7&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkToolbar&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;toolbar1&lt;/name&gt;</div><div class='del'>-	      &lt;orientation&gt;GTK_ORIENTATION_HORIZONTAL&lt;/orientation&gt;</div><div class='del'>-	      &lt;type&gt;GTK_TOOLBAR_ICONS&lt;/type&gt;</div><div class='del'>-	      &lt;space_size&gt;5&lt;/space_size&gt;</div><div class='del'>-	      &lt;space_style&gt;GTK_TOOLBAR_SPACE_EMPTY&lt;/space_style&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;tooltips&gt;True&lt;/tooltips&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;checkbutton4&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Reverse on even pages&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Header/Footer&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h<br/>deleted file mode 100644<br/>index 12f13f4573..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/e-contact-print.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print.h</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_CONTACT_PRINT_H</div><div class='del'>-#define E_CONTACT_PRINT_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include "e-contact-print-types.h"</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);</div><div class='del'>-void e_contact_print_preview(EBook *book, char *query);</div><div class='del'>-GtkWidget *e_contact_print_card_dialog_new(ECard *card);</div><div class='del'>-GtkWidget *e_contact_print_card_list_dialog_new(GList *list);</div><div class='del'>-</div><div class='del'>-#endif /* E_CONTACT_PRINT_H */</div><div class='head'>diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps<br/>deleted file mode 100644<br/>index ef76c0b46e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/medbook.ecps?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/medbook.ecps</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-&lt;style&gt;</div><div class='del'>-&lt;title/&gt;</div><div class='del'>-&lt;type&gt;cards&lt;/type&gt;</div><div class='del'>-&lt;sections_start_new_page&gt;FALSE&lt;/sections_start_new_page&gt;</div><div class='del'>-&lt;num_columns&gt;2&lt;/num_columns&gt;</div><div class='del'>-&lt;blank_forms&gt;2&lt;/blank_forms&gt;</div><div class='del'>-&lt;letter_tabs&gt;TRUE&lt;/letter_tabs&gt;</div><div class='del'>-&lt;letter_headings&gt;TRUE&lt;/letter_headings&gt;</div><div class='del'>-&lt;headings_font&gt;Helvetica Bold 12&lt;/headings_font&gt;</div><div class='del'>-&lt;body_font&gt;Helvetica 8&lt;/body_font&gt;</div><div class='del'>-&lt;print_using_grey&gt;TRUE&lt;/print_using_grey&gt;</div><div class='del'>-&lt;paper_width&gt;8.5&lt;/paper_width&gt;</div><div class='del'>-&lt;paper_height&gt;11&lt;/paper_height&gt;</div><div class='del'>-&lt;top_margin&gt;0.5&lt;/top_margin&gt;</div><div class='del'>-&lt;left_margin&gt;0.5&lt;/left_margin&gt;</div><div class='del'>-&lt;bottom_margin&gt;0.5&lt;/bottom_margin&gt;</div><div class='del'>-&lt;right_margin&gt;0.5&lt;/right_margin&gt;</div><div class='del'>-&lt;page_width&gt;8.5&lt;/page_width&gt;</div><div class='del'>-&lt;page_height&gt;11&lt;/page_height&gt;</div><div class='del'>-&lt;orientation&gt;portrait&lt;/orientation&gt;</div><div class='del'>-&lt;header_font&gt;Helvetica 8&lt;/header_font&gt;</div><div class='del'>-&lt;left_header/&gt;</div><div class='del'>-&lt;center_header/&gt;</div><div class='del'>-&lt;right_header/&gt;</div><div class='del'>-&lt;footer_font&gt;Helvetica 8&lt;/footer_font&gt;</div><div class='del'>-&lt;left_footer/&gt;</div><div class='del'>-&lt;center_footer&gt;[Page #]&lt;/center_footer&gt;</div><div class='del'>-&lt;right_footer/&gt;</div><div class='del'>-&lt;reverse_on_even_pages&gt;FALSE&lt;/reverse_on_even_pages&gt;</div><div class='del'>-&lt;/style&gt;</div><div class='head'>diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps<br/>deleted file mode 100644<br/>index 980750a6b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/phonelist.ecps?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/phonelist.ecps</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;style&gt;</div><div class='del'>-&lt;title/&gt;</div><div class='del'>-&lt;type&gt;phone_list&lt;/type&gt;</div><div class='del'>-&lt;sections_start_new_page&gt;FALSE&lt;/sections_start_new_page&gt;</div><div class='del'>-&lt;num_columns&gt;2&lt;/num_columns&gt;</div><div class='del'>-&lt;letter_tabs&gt;FALSE&lt;/letter_tabs&gt;</div><div class='del'>-&lt;letter_headings&gt;TRUE&lt;/letter_headings&gt;</div><div class='del'>-&lt;headings_font&gt;Helvetica Bold 10&lt;/headings_font&gt;</div><div class='del'>-&lt;body_font&gt;Helvetica 8&lt;/body_font&gt;</div><div class='del'>-&lt;print_using_grey&gt;TRUE&lt;/print_using_grey&gt;</div><div class='del'>-&lt;paper_width&gt;8.5&lt;/paper_width&gt;</div><div class='del'>-&lt;paper_height&gt;11&lt;/paper_height&gt;</div><div class='del'>-&lt;top_margin&gt;0.5&lt;/top_margin&gt;</div><div class='del'>-&lt;left_margin&gt;0.5&lt;/left_margin&gt;</div><div class='del'>-&lt;bottom_margin&gt;0.5&lt;/bottom_margin&gt;</div><div class='del'>-&lt;right_margin&gt;0.5&lt;/right_margin&gt;</div><div class='del'>-&lt;page_width&gt;8.5&lt;/page_width&gt;</div><div class='del'>-&lt;page_height&gt;11&lt;/page_height&gt;</div><div class='del'>-&lt;orientation&gt;portrait&lt;/orientation&gt;</div><div class='del'>-&lt;header_font&gt;Helvetica 8&lt;/header_font&gt;</div><div class='del'>-&lt;left_header/&gt;</div><div class='del'>-&lt;center_header/&gt;</div><div class='del'>-&lt;right_header/&gt;</div><div class='del'>-&lt;footer_font&gt;Helvetica 8&lt;/footer_font&gt;</div><div class='del'>-&lt;left_footer&gt;[User Name]&lt;/left_footer&gt;</div><div class='del'>-&lt;center_footer&gt;[Page #]&lt;/center_footer&gt;</div><div class='del'>-&lt;right_footer&gt;[Date Printed]&lt;/right_footer&gt;</div><div class='del'>-&lt;reverse_on_even_pages&gt;FALSE&lt;/reverse_on_even_pages&gt;</div><div class='del'>-&lt;/style&gt;</div><div class='head'>diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps<br/>deleted file mode 100644<br/>index 0bb19aa92e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/smallbook.ecps?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/smallbook.ecps</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-&lt;style&gt;</div><div class='del'>-&lt;title/&gt;</div><div class='del'>-&lt;type&gt;cards&lt;/type&gt;</div><div class='del'>-&lt;sections_start_new_page&gt;FALSE&lt;/sections_start_new_page&gt;</div><div class='del'>-&lt;num_columns&gt;1&lt;/num_columns&gt;</div><div class='del'>-&lt;blank_forms&gt;2&lt;/blank_forms&gt;</div><div class='del'>-&lt;letter_tabs&gt;TRUE&lt;/letter_tabs&gt;</div><div class='del'>-&lt;letter_headings&gt;TRUE&lt;/letter_headings&gt;</div><div class='del'>-&lt;headings_font&gt;Helvetica Bold 8&lt;/headings_font&gt;</div><div class='del'>-&lt;body_font&gt;Helvetica 6&lt;/body_font&gt;</div><div class='del'>-&lt;print_using_grey&gt;TRUE&lt;/print_using_grey&gt;</div><div class='del'>-&lt;paper_width&gt;8.5&lt;/paper_width&gt;</div><div class='del'>-&lt;paper_height&gt;11&lt;/paper_height&gt;</div><div class='del'>-&lt;top_margin&gt;0.5&lt;/top_margin&gt;</div><div class='del'>-&lt;left_margin&gt;0.5&lt;/left_margin&gt;</div><div class='del'>-&lt;bottom_margin&gt;0.5&lt;/bottom_margin&gt;</div><div class='del'>-&lt;right_margin&gt;0.5&lt;/right_margin&gt;</div><div class='del'>-&lt;page_width&gt;2.75&lt;/page_width&gt;</div><div class='del'>-&lt;page_height&gt;4.25&lt;/page_height&gt;</div><div class='del'>-&lt;orientation&gt;portrait&lt;/orientation&gt;</div><div class='del'>-&lt;header_font&gt;Helvetica 6&lt;/header_font&gt;</div><div class='del'>-&lt;left_header/&gt;</div><div class='del'>-&lt;center_header/&gt;</div><div class='del'>-&lt;right_header/&gt;</div><div class='del'>-&lt;footer_font&gt;Helvetica 6&lt;/footer_font&gt;</div><div class='del'>-&lt;left_footer/&gt;</div><div class='del'>-&lt;center_footer&gt;[Page #]&lt;/center_footer&gt;</div><div class='del'>-&lt;right_footer/&gt;</div><div class='del'>-&lt;reverse_on_even_pages&gt;FALSE&lt;/reverse_on_even_pages&gt;</div><div class='del'>-&lt;/style&gt;</div><div class='head'>diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c<br/>deleted file mode 100644<br/>index 0ac169468c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/test-contact-print-style-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/test-contact-print-style-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * test-contact-print-style-editor.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include "e-contact-print-style-editor.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GtkWidget *editor;</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-	static int count = 2;</div><div class='del'>-	count --;</div><div class='del'>-	if ( count &lt;= 0 )</div><div class='del'>-		exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the contact print style editor widget" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Contact Print Style Editor Test", VERSION, argc, argv);</div><div class='del'>-</div><div class='del'>-  glade_gnome_init ();</div><div class='del'>-</div><div class='del'>-  app = gnome_app_new("Contact Print Style Editor Test", NULL);</div><div class='del'>-</div><div class='del'>-  editor = e_contact_print_style_editor_new("");</div><div class='del'>-  </div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), editor );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c<br/>deleted file mode 100644<br/>index fc868318d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/test-print.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>addressbook/printing/test-print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * test-print.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "e-contact-print.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-GtkWidget *print;</div><div class='del'>-</div><div class='del'>-static gint test_close(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	exit(0);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Contact Print Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Ximian, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the contact print code" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GList *shown_fields = NULL;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Contact Print Test", VERSION, argc, argv);</div><div class='del'>-</div><div class='del'>-  glade_gnome_init ();</div><div class='del'>-  </div><div class='del'>-  shown_fields = g_list_append(shown_fields, "First field");</div><div class='del'>-  shown_fields = g_list_append(shown_fields, "Second field");</div><div class='del'>-  shown_fields = g_list_append(shown_fields, "Third field");</div><div class='del'>-  shown_fields = g_list_append(shown_fields, "Fourth field");</div><div class='del'>-</div><div class='del'>-  print = e_contact_print_dialog_new(NULL, NULL);</div><div class='del'>-  gtk_widget_show_all(print);</div><div class='del'>-  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/art/.cvsignore b/art/.cvsignore<br/>deleted file mode 100644<br/>index c038ed7864..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in
\ No newline at end of file</div><div class='head'>diff --git a/art/16_copy.png b/art/16_copy.png<br/>deleted file mode 100644<br/>index 31ede839ea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/16_copy.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/16_copy.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/16_customize.png b/art/16_customize.png<br/>deleted file mode 100644<br/>index 1a0e15ad4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/16_customize.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/16_customize.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/16_cut.png b/art/16_cut.png<br/>deleted file mode 100644<br/>index 5860a9c56f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/16_cut.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/16_cut.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/16_paste.png b/art/16_paste.png<br/>deleted file mode 100644<br/>index 56f15c5cc3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/16_paste.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/16_paste.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ChangeLog b/art/ChangeLog<br/>deleted file mode 100644<br/>index cb4c3b76f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,567 +0,0 @@</div><div class='del'>-2002-04-25  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): font.png: Add for the font config</div><div class='del'>-	prefs.</div><div class='del'>-</div><div class='del'>-2002-04-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* monkey-16.png: Replace with an antialiased version</div><div class='del'>-</div><div class='del'>-2002-04-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA), folder-settings.png: Add. (Copied</div><div class='del'>-	from Unscalable Gorilla because it was handy. Will probably get</div><div class='del'>-	changed to something else...)</div><div class='del'>-</div><div class='del'>-2002-03-28  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-and-tasks-settings.png: New.</div><div class='del'>-	* composer-settings.png: New.</div><div class='del'>-	* ldap-settings.png: New.</div><div class='del'>-	* mail-accounts-settings.png: New.</div><div class='del'>-	* summary-settings.png: New.</div><div class='del'>-</div><div class='del'>-2002-03-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): Add working-16.png (the GNOME2 stock</div><div class='del'>-	"wait" icon, from Jakub)</div><div class='del'>-</div><div class='del'>-2002-03-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* forward.xpm, reply.xpm, reply_to_all.xpm: Rename the internal</div><div class='del'>-	structure to coincide with the filenames.</div><div class='del'>-</div><div class='del'>-2002-02-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* about-box.png, splash.png: New cool artwork from Jakub.</div><div class='del'>-	</div><div class='del'>-2002-02-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove meeting_widget.png from the build since it</div><div class='del'>-	doesn't seem to be in cvs?</div><div class='del'>-</div><div class='del'>-2002-02-20  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* summary_preferences-16.png: menu icon for summary preferences</div><div class='del'>-	* Makefile.am: added the icon</div><div class='del'>-</div><div class='del'>-2002-02-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* flag-for-followup.xpm:</div><div class='del'>-	* flag-for-followup-16.png:</div><div class='del'>-	* flag-for-followup-48.png: New icons.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the new icons...</div><div class='del'>-</div><div class='del'>-2002-02-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install mail-new.xpm, mail-read.xpm and</div><div class='del'>-	priority-high.xpm in the same place as other bonobo-ui menu</div><div class='del'>-	pixmaps so we can use these in menus too.</div><div class='del'>-</div><div class='del'>-2002-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* connect_to_url-16.xpm: new icon</div><div class='del'>-</div><div class='del'>-	* new_all_day_event.png: ditto</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install and dist new images</div><div class='del'>-</div><div class='del'>-2001-12-11  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* mail-need-reply.xpm: A new icon that sucks less.  We still need</div><div class='del'>-	some Tuomas-love.</div><div class='del'>-</div><div class='del'>-2001-12-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* mail-need-reply.xpm: Added a really, really ugly and</div><div class='del'>-	awful icon to symbolize "message needs a reply".</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added mail-need-reply.xpm.</div><div class='del'>-</div><div class='del'>-2001-11-06  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution.png: New, updated icon from Tuomas.</div><div class='del'>-</div><div class='del'>-2001-11-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): dist the glade data</div><div class='del'>-</div><div class='del'>-2001-11-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gladedir): New.</div><div class='del'>-	(glade_DATA): Pixmap files required to be installed by the glade</div><div class='del'>-	files.</div><div class='del'>-</div><div class='del'>-2001-10-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install `evolution.png', not `evolution-icon.png'.</div><div class='del'>-</div><div class='del'>-	* evolution.png: Renamed from `evolution-icon.png', removing the</div><div class='del'>-	old, now unused `evolution.png'.</div><div class='del'>-</div><div class='del'>-2001-10-30  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash-1-0.png: new style splash </div><div class='del'>-</div><div class='del'>-2001-10-23  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: Remove the "1" from "1.0 Release Candidate 1" so it</div><div class='del'>-	looks better.</div><div class='del'>-</div><div class='del'>-2001-10-23  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (appicon_DATA): Changed the filename here too </div><div class='del'>-	so the icon gets installed.</div><div class='del'>-</div><div class='del'>-	* evolution-icon.png: New icon that scales better.</div><div class='del'>-</div><div class='del'>-2001-10-22  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* about-box.png: update the layout a bit</div><div class='del'>-	* splash.png: update to 0.17 </div><div class='del'>-</div><div class='del'>-2001-10-16  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): Add `about-box.png'.</div><div class='del'>-</div><div class='del'>-	* about-box.png: New image for the about box from Jakub.</div><div class='del'>-</div><div class='del'>-2001-10-18  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): add alarm.png for the new alarm</div><div class='del'>-	notification code.</div><div class='del'>-</div><div class='del'>-2001-10-04  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): change ldap-16.png to ldap-mini.png,</div><div class='del'>-	and add ldap.png.</div><div class='del'>-</div><div class='del'>-2001-10-04  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: bump to 0.16</div><div class='del'>-	* ldap.png: 48x48 version for shortcut bar</div><div class='del'>-</div><div class='del'>-2001-09-25  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* add task.png</div><div class='del'>-</div><div class='del'>-2001-09-21  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* remove timezone.png...dunno where it came from.</div><div class='del'>-</div><div class='del'>-2001-09-21  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* install timezone-16.xpm</div><div class='del'>-</div><div class='del'>-2001-09-21  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: beta4</div><div class='del'>-</div><div class='del'>-2001-09-08  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pgp-signature-*: for the pgp signature checking</div><div class='del'>-	* Makefile.am (images_DATA): add the icon files</div><div class='del'>-</div><div class='del'>-2001-09-06  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): add ldap-16.png.</div><div class='del'>-</div><div class='del'>-2001-09-05  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* meeting-request.png: for the inline .ics stuff</div><div class='del'>-	* Makefile.am (images_DATA): add the icon file</div><div class='del'>-</div><div class='del'>-2001-09-04  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* timezone-48.png: for the timezone configuration step in the</div><div class='del'>-	  first-time-druid</div><div class='del'>-	* Makefile.am (images_DATA): add the icon file</div><div class='del'>-	</div><div class='del'>-2001-08-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install new file</div><div class='del'>-</div><div class='del'>-	* talking-heads.png: new graphic for meeting requests</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): added goto-16.png &amp; new_task-16.png.</div><div class='del'>-	(buttons_DATA): added save-24.png.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (buttons_DATA): added cut.png, copy.png &amp; paste.png,</div><div class='del'>-	so we can use them for the tasks toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-18  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): added 16_copy.png, 16_customize.png,</div><div class='del'>-	16_cut.png &amp; 16_paste.png.</div><div class='del'>-	(buttons_DATA): added new_task.png, which I made from scaling up the</div><div class='del'>-	smaller task.xpm icon.</div><div class='del'>-</div><div class='del'>-2001-08-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (buttons_DATA): Added `delete-message.png'.</div><div class='del'>-</div><div class='del'>-2001-08-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): moved task.xpm here, so it gets installed,</div><div class='del'>-	so we can use it for the menus. Note that we don't have an icon to</div><div class='del'>-	use in the toolbar for a new task, and we need one. Jakub?</div><div class='del'>-</div><div class='del'>-2001-08-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* wax-seal.png: Added.</div><div class='del'>-</div><div class='del'>-	* wax-seal-broken.png: Added.</div><div class='del'>-</div><div class='del'>-2001-08-17  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: marketing spoils the fun. boring splash again.</div><div class='del'>-	</div><div class='del'>-2001-08-17  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: Ruperzilla splash</div><div class='del'>-	</div><div class='del'>-	* splash-1-0.png: 1.0 candidate</div><div class='del'>-</div><div class='del'>-2001-08-16  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* {next,previous}-message.png: use new document template. maybe</div><div class='del'>-	  still a bit dark.</div><div class='del'>-	</div><div class='del'>-2001-08-15  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* add-attachment.png: get rid of the yellow</div><div class='del'>-</div><div class='del'>-	* compose-message.png: the old one seemed too dark to me. This one</div><div class='del'>-	shares the same document base as the new stuff.</div><div class='del'>-</div><div class='del'>-2001-08-15  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* all_contacts.xpm, new_contact.xpm: Nat wanted something bigger</div><div class='del'>-	  that would match the new button style. The filename of</div><div class='del'>-	  all_contacts.xpm is crap, maybe you guys can fix it to be</div><div class='del'>-	  "new_list.xpm" or something. Didn't want to break things.</div><div class='del'>-	 </div><div class='del'>-2001-08-15  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* save-16.png, save-as-16.png: fix bottom. Tuomas didn't like too</div><div class='del'>-	  much detail.</div><div class='del'>-</div><div class='del'>-2001-08-15  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* goto-24.png: Icon for "Goto date.." -button. Someone could add</div><div class='del'>-	this into the code?</div><div class='del'>-</div><div class='del'>-2001-08-14  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* arrow-[left,right]-24.png: new arrow icons for calendar</div><div class='del'>-	toolbar..</div><div class='del'>-</div><div class='del'>-2001-08-14  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-today-mini.png: new summary tree view icon.</div><div class='del'>-</div><div class='del'>-2001-08-10  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_*: removed these files, which are now in gal</div><div class='del'>-</div><div class='del'>-2001-08-09  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* send-receive.xpm: Updated this to have the yellow/green arrows</div><div class='del'>-	so it matches the style of other icons. Noticed that tasklist</div><div class='del'>-	scales 16x16 icons larger, so they generally look Bad(tm). (fixes</div><div class='del'>-	#6475)</div><div class='del'>-</div><div class='del'>-2001-08-07  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* timezone-16.xpm: copied from the international category icon.</div><div class='del'>-	It would be better to have 2 different icons for these, but I had</div><div class='del'>-	to get rid of that square timezone icon!</div><div class='del'>-</div><div class='del'>-2001-08-07  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-trash-mini.png: scaled down Tuomas' trash icon.</div><div class='del'>-	  tweaked a bit. looks a lot better than the previous one.</div><div class='del'>-	</div><div class='del'>-2001-08-07  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* inbox-*, outbox-*: tree view icons * filters.xpm, edit-16.xpm,</div><div class='del'>-	marlboro_filters.xpm: remove unused * vfolder-16.xpm,</div><div class='del'>-	delete-message.xpm, undelete-message.xpm: let's not use xpms *</div><div class='del'>-	evolution-trash-mini.png: new version for edit&gt;delete message,</div><div class='del'>-	tree view and everything * undelete_message-16.png,</div><div class='del'>-	folder-move-16.png, open-in-new-window-16.png, folder-copy-16.png:</div><div class='del'>-	tree view icons * faq-16.png, mark-as-important-16.png: menu icons</div><div class='del'>-	* Makefile.am (images_DATA): add new icons, change some xpms to</div><div class='del'>-	pngs</div><div class='del'>-      </div><div class='del'>-</div><div class='del'>-2001-08-03  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldap-16.png, imap-16.png, local-16.png: tree view icons for</div><div class='del'>-	  imap, ldap and local folders.</div><div class='del'>-</div><div class='del'>-2001-08-02  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* myevo-mail-summary.png, myevo-post-it.png, *</div><div class='del'>-	myevo-appointments.png: icons for My Evolution -- mail summary,</div><div class='del'>-	tasks, appointments. These are _NOT_TO_ replace the shortcut</div><div class='del'>-	icons, but solely for My Evolution.</div><div class='del'>-	</div><div class='del'>-2001-08-02  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* receive-24.png: Icon for the send/receive dialog at least.</div><div class='del'>-</div><div class='del'>-2001-07-31  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash.png: beta2 splash</div><div class='del'>-</div><div class='del'>-2001-07-31  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* send-24-receive.png: New version, looks more consistent with the</div><div class='del'>-	other icons.</div><div class='del'>-</div><div class='del'>-2001-07-30  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* search-16.png, search-and-replace-16.png: menu versions for</div><div class='del'>-	  shell and editor.  * properties-16.png: properties for shel</div><div class='del'>-	  (maybe other places too) * send-16.png, send-later-16.png:</div><div class='del'>-	  editor, shell menu.  * work_online-16.png: to accompany work</div><div class='del'>-	  online menu toggle.  * save-16.png, save-as-16.png:</div><div class='del'>-	  everywhere. (based on Tuomas new gnome stock panel icon)</div><div class='del'>-	</div><div class='del'>-2001-07-27    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* new_appointment.[xpm,png]: New version, fixes bug #4704</div><div class='del'>-	hopefully.</div><div class='del'>-</div><div class='del'>-2001-07-25  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): added print-preview-24.png.</div><div class='del'>-</div><div class='del'>-2001-07-25  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* print-preview-24.png: toolbar icon for calendar's appointment</div><div class='del'>-	  dialog (now using the menu version)</div><div class='del'>-</div><div class='del'>-2001-07-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Pull in new splash screen</div><div class='del'>-</div><div class='del'>-2001-07-20  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install 2 new category icons</div><div class='del'>-	(16_category_suppliers.png and 16_category_time-and-expenses.png)</div><div class='del'>-</div><div class='del'>-2001-07-20    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_time-and-expenses.png: Icon for "Time &amp; Expenses"</div><div class='del'>-	category..</div><div class='del'>-</div><div class='del'>-	* 16_category_suppliers.png: Icon for "Suppliers" category..</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.png, evolution-contacts.png,</div><div class='del'>-	evolution-inbox.png, evolution-tasks.png, evolution-today.png:</div><div class='del'>-	Took out the colored background circles from the icons, apparently</div><div class='del'>-	people found them confusing rather than useful, especially on</div><div class='del'>-	small icons -mode of the shortcutbar.</div><div class='del'>-</div><div class='del'>-2001-07-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install the 2 new category icons</div><div class='del'>-</div><div class='del'>-2001-07-19    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_strategies.png, 16_category_status.png: New category</div><div class='del'>-	icons.</div><div class='del'>-</div><div class='del'>-2001-07-19  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* insert-link-24.png, insert-table-24.png, insert-image-24.png:</div><div class='del'>-	  toolbar icons for message editor.</div><div class='del'>-</div><div class='del'>-2001-07-17  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install category icons</div><div class='del'>-</div><div class='del'>-2001-07-17  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_holiday-cards.png 16_category_hot-contacts.png</div><div class='del'>-	16_category_ideas.png: new category icons..</div><div class='del'>-</div><div class='del'>-2001-07-16  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_favorites.png 16_category_gifts.png</div><div class='del'>-	16_category_goals.png: New additions for the category stuff..</div><div class='del'>-	still more to do..</div><div class='del'>-</div><div class='del'>-2001-07-13  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_category_*.png: Some category icons for calendar/tasks, to</div><div class='del'>-	match the different category types for events. Still many to do,</div><div class='del'>-	but I wanted to commit them so you people can start hacking on the</div><div class='del'>-	code already. More to follow shortly.</div><div class='del'>-</div><div class='del'>-	* 16_customize.png: Icon for "Customize toolbars" or whatever menu</div><div class='del'>-	item that deals with customizing stuff (the icon is a wrench)</div><div class='del'>-</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: extra dist another xpm</div><div class='del'>-</div><div class='del'>-2001-07-12    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* delete_message.[png,xpm]: New versions for the trashcan icon.  I</div><div class='del'>-	am wondering if we should do some filename cleanup here, all menu</div><div class='del'>-	icons should really be 16_foo.png, whereas the toolbar ones should</div><div class='del'>-	be foo.png. Currently we are mixing PNG and XPM here with some</div><div class='del'>-	files having otherwise same names (like this one)..</div><div class='del'>-</div><div class='del'>-2001-07-11    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* new_appointment.[png,xpm]: New versions</div><div class='del'>-</div><div class='del'>-2001-07-10  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* new_appointment.png: New appointment icon.  *</div><div class='del'>-	new_appointment.xpm: Small version.. (should we change this to</div><div class='del'>-	16_new_appointment.png btw?</div><div class='del'>-</div><div class='del'>-2001-07-09  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install the myweather-* icons.</div><div class='del'>-</div><div class='del'>-2001-07-07    &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* 16_[cut,copy,paste].png: New icons for the</div><div class='del'>-	Edit-&gt;[Cut,Copy,Paste] entries, the current gnome-stock ones start</div><div class='del'>-	to look bad when scaled down, so these are already 16x16 pixels.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* myweather-*: weather status icons for My Evolution</div><div class='del'>-</div><div class='del'>-2001-07-04  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: install apply-filters-16.xpm</div><div class='del'>-</div><div class='del'>-2001-07-03  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit</div><div class='del'>-	the general style.</div><div class='del'>-</div><div class='del'>-2001-07-01  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* print.xpm, print-preview.xpm: nat didn't like the jaggy</div><div class='del'>-	  version. This one is based on tuomas 48x48 print icon.</div><div class='del'>-</div><div class='del'>-2001-06-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',</div><div class='del'>-	`previous-message.png'.</div><div class='del'>-</div><div class='del'>-2001-06-29  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* remove-nntp-folder-24.png, add-nntp-folder-24.png,</div><div class='del'>-	  refresh-nntp-folders-24.png: manage subscriptions toolbar icons</div><div class='del'>-</div><div class='del'>-2001-06-29  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* print.png: Icon for print message.</div><div class='del'>-</div><div class='del'>-	* next-message.png, previous-message.png: New icons to replace the</div><div class='del'>-	&lt; &gt; arrows in the mailer.</div><div class='del'>-</div><div class='del'>-2001-06-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): add contact-is-a-list.png</div><div class='del'>-</div><div class='del'>-2001-06-29  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-is-a-list.png: icon for toshok, for contact lists.</div><div class='del'>-</div><div class='del'>-2001-06-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install the add-attachment.png icon.</div><div class='del'>-</div><div class='del'>-2001-06-27  Tuomas Kuosmanen  &lt;tigert@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar-mini.png: New version of the folder tree's</div><div class='del'>-	calendar icon. Doesnt look too much like the contacts icon.</div><div class='del'>-</div><div class='del'>-2001-06-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* world_map-960.png: world map picture used for selecting</div><div class='del'>-	timezones.  * Makefile.am (images_DATA): added world_map-960.png</div><div class='del'>-	for timezones.</div><div class='del'>-</div><div class='del'>-2001-06-14  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* apply-filters-16.xpm: for mailer menu.  * vfolder-16.xpm:</div><div class='del'>-	vfolder icon for menu items * hand-16.xpm: originally ment for</div><div class='del'>-	customize toolbars. might not work * edit-16.xpm: edit message</div><div class='del'>-	(message open)</div><div class='del'>-	</div><div class='del'>-2001-06-13  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rdf.png, ico-rdf.png: ximianize those</div><div class='del'>-</div><div class='del'>-2001-06-13  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* splash-1-0.png: Initial mockup for the final splash.  Didn't</div><div class='del'>-	  wan't to overwrite the unstable splash.png.</div><div class='del'>-	</div><div class='del'>-2001-06-07  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* empty.gif: es-weather.png es-appointments.png ico-calendar.png</div><div class='del'>-	  ico-mail.png ico-rdf.png ico-weather.png bcg.png rdf.png</div><div class='del'>-	  pattern.png: Added all these for the new My Evolution</div><div class='del'>-</div><div class='del'>-2001-06-04  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* timezone-16.xpm: for events in a diffrent timezone</div><div class='del'>-</div><div class='del'>-2001-05-22  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-inbox-mini.png: fixed the shadow</div><div class='del'>-</div><div class='del'>-2001-05-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): Install Jakub's new icons</div><div class='del'>-</div><div class='del'>-2001-05-16  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* mail-config-druid-48.png, mail-config-druid-identity.png,</div><div class='del'>-	  mail-config-druid-account-name.png,</div><div class='del'>-	  mail-config-druid-receive.png, mail-config-druid-send.png,</div><div class='del'>-	  thankyou.png: config druid icons</div><div class='del'>-	  </div><div class='del'>-	      thankyou.png can be used for the last step in every evo</div><div class='del'>-	      druid (like the import one)</div><div class='del'>-</div><div class='del'>-2001-05-16  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.png, evolution-contacts.png,</div><div class='del'>-	  evolution-inbox.png, evolution-today.png, evolution-tasks.png:</div><div class='del'>-	  fixed bug #2862. Also changed the envelope icon Oh and we use</div><div class='del'>-	  #b39169 for calendar now</div><div class='del'>-	  </div><div class='del'>-2001-05-16  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): Added `online.png' and `offline.png'.</div><div class='del'>-</div><div class='del'>-	* online.png: New icon by Tuomas.  * offline.png: New icon by</div><div class='del'>-	Tuomas.</div><div class='del'>-</div><div class='del'>-2001-05-14  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (images_DATA): add in the new find_message.xpm</div><div class='del'>-</div><div class='del'>-2001-05-14  Jakub Steiner &lt;jimmac@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* find_message.xpm: Duncan requested this</div><div class='del'>-</div><div class='head'>diff --git a/art/Makefile.am b/art/Makefile.am<br/>deleted file mode 100644<br/>index 931fd0213c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-imagesdir = $(datadir)/images/evolution</div><div class='del'>-images_DATA = \</div><div class='del'>-	16_copy.png			\</div><div class='del'>-	16_customize.png		\</div><div class='del'>-	16_cut.png			\</div><div class='del'>-	16_paste.png			\</div><div class='del'>-	about-box.png			\</div><div class='del'>-	alarm.png			\</div><div class='del'>-	all_contacts.xpm		\</div><div class='del'>-	apply-filters-16.xpm		\</div><div class='del'>-	bcg.png				\</div><div class='del'>-	briefcase.png       		\</div><div class='del'>-	butterfly.png			\</div><div class='del'>-	calendar-and-tasks-settings.png \</div><div class='del'>-	cellphone.png       		\</div><div class='del'>-	compose-message.png		\</div><div class='del'>-	composer-settings.png		\</div><div class='del'>-	configure_16_addressbook.xpm	\</div><div class='del'>-	configure_16_calendar.xpm	\</div><div class='del'>-	configure_16_folder.xpm		\</div><div class='del'>-	configure_16_mail.xpm		\</div><div class='del'>-	connect_to_url-16.xpm		\</div><div class='del'>-	contact-is-a-list.png		\</div><div class='del'>-	copy_16_message.xpm		\</div><div class='del'>-	edit.xpm			\</div><div class='del'>-	empty.gif			\</div><div class='del'>-	encrypt.xpm			\</div><div class='del'>-	envelope.png        		\</div><div class='del'>-	es-appointments.png		\</div><div class='del'>-	es-weather.png			\</div><div class='del'>-	evolution-calendar-mini.png 	\</div><div class='del'>-	evolution-calendar.png 		\</div><div class='del'>-	evolution-contacts-mini.png 	\</div><div class='del'>-	evolution-contacts-plain.png 	\</div><div class='del'>-	evolution-contacts.png 		\</div><div class='del'>-	evolution-inbox-mini.png 	\</div><div class='del'>-	evolution-inbox.png 		\</div><div class='del'>-	evolution-notes-mini.png 	\</div><div class='del'>-	evolution-notes.png 		\</div><div class='del'>-	evolution-tasks-mini.png 	\</div><div class='del'>-	evolution-tasks.png 		\</div><div class='del'>-	evolution-today-mini.png	\</div><div class='del'>-	evolution-today.png 		\</div><div class='del'>-	evolution-trash-mini.png 	\</div><div class='del'>-	evolution-trash.png 		\</div><div class='del'>-	executive-summary-bg.png	\</div><div class='del'>-	executive-summary-curve.png	\</div><div class='del'>-	faq-16.png			\</div><div class='del'>-	fetch-mail.png			\</div><div class='del'>-	find_contact.xpm		\</div><div class='del'>-	find_message.xpm		\</div><div class='del'>-	flag-for-followup-16.png	\</div><div class='del'>-	folder-copy-16.png		\</div><div class='del'>-	folder-move-16.png		\</div><div class='del'>-	folder-settings.png		\</div><div class='del'>-	folder.xpm			\</div><div class='del'>-	font.png			\</div><div class='del'>-	forward.xpm			\</div><div class='del'>-	globe.png           		\</div><div class='del'>-	goto-16.png			\</div><div class='del'>-	hide_deleted_messages.xpm	\</div><div class='del'>-	hide_read_messages.xpm		\</div><div class='del'>-	hide_selected_messages.xpm	\</div><div class='del'>-	house.png           		\</div><div class='del'>-	ico-calendar.png		\</div><div class='del'>-	ico-mail.png			\</div><div class='del'>-	ico-rdf.png			\</div><div class='del'>-	ico-weather.png			\</div><div class='del'>-	import.png			\</div><div class='del'>-	import.xpm			\</div><div class='del'>-	inbox-16.png			\</div><div class='del'>-	inbox-full-16.png		\</div><div class='del'>-	ldap-mini.png			\</div><div class='del'>-	ldap-settings.png		\</div><div class='del'>-	ldap.png			\</div><div class='del'>-	mail-accounts-settings.png	\</div><div class='del'>-	mail-config-druid-account-name.png \</div><div class='del'>-	mail-config-druid-identity.png	\</div><div class='del'>-	mail-config-druid-receive.png	\</div><div class='del'>-	mail-config-druid-send.png	\</div><div class='del'>-	mail-config-druid.png		\</div><div class='del'>-	mail-new.xpm			\</div><div class='del'>-	mail-read.xpm			\</div><div class='del'>-	malehead.png			\</div><div class='del'>-	mark-as-important-16.png	\</div><div class='del'>-	meeting-request.png		\</div><div class='del'>-	meeting-request.png 		\</div><div class='del'>-	meeting.xpm			\</div><div class='del'>-	monkey-16.png			\</div><div class='del'>-	move_message.xpm		\</div><div class='del'>-	myevo-appointments.png		\</div><div class='del'>-	myevo-mail-summary.png		\</div><div class='del'>-	myevo-post-it.png		\</div><div class='del'>-	myweather-clouds.png		\</div><div class='del'>-	myweather-fog.png		\</div><div class='del'>-	myweather-rain.png		\</div><div class='del'>-	myweather-snow.png		\</div><div class='del'>-	myweather-storm.png		\</div><div class='del'>-	myweather-sun.png		\</div><div class='del'>-	myweather-suncloud.png		\</div><div class='del'>-	new-message.xpm			\</div><div class='del'>-	new_all_day_event.png		\</div><div class='del'>-	new_appointment.xpm		\</div><div class='del'>-	new_contact.xpm			\</div><div class='del'>-	new_task-16.png			\</div><div class='del'>-	offline.png			\</div><div class='del'>-	online.png			\</div><div class='del'>-	open-in-new-window-16.png 	\</div><div class='del'>-	outbox-16.png 			\</div><div class='del'>-	outbox-full-16.png 		\</div><div class='del'>-	pattern.png			\</div><div class='del'>-	pgp-signature-bad.png 		\</div><div class='del'>-	pgp-signature-nokey.png 	\</div><div class='del'>-	pgp-signature-ok.png 		\</div><div class='del'>-	print-preview.xpm		\</div><div class='del'>-	print.xpm			\</div><div class='del'>-	priority-high.xpm		\</div><div class='del'>-	rdf.png				\</div><div class='del'>-	reply.xpm			\</div><div class='del'>-	reply_to_all.xpm		\</div><div class='del'>-	save-16.png			\</div><div class='del'>-	save-as-16.png			\</div><div class='del'>-	save.xpm			\</div><div class='del'>-	search-16.png			\</div><div class='del'>-	search-and-replace-16.png	\</div><div class='del'>-	send-16.png                     \</div><div class='del'>-	send-later-16.png		\</div><div class='del'>-	send-receive.xpm		\</div><div class='del'>-	service-close.png		\</div><div class='del'>-	service-configure.png		\</div><div class='del'>-	service-down-disabled.png	\</div><div class='del'>-	service-down.png		\</div><div class='del'>-	service-left-disabled.png	\</div><div class='del'>-	service-left.png		\</div><div class='del'>-	service-right-disabled.png	\</div><div class='del'>-	service-right.png		\</div><div class='del'>-	service-up-disabled.png		\</div><div class='del'>-	service-up.png			\</div><div class='del'>-	show_all_messages.xpm		\</div><div class='del'>-	splash.png			\</div><div class='del'>-	summary-settings.png		\</div><div class='del'>-	summary_preferences-16.png	\</div><div class='del'>-	talking-heads.png		\</div><div class='del'>-	task.png			\</div><div class='del'>-	task.xpm			\</div><div class='del'>-	thankyou.png			\</div><div class='del'>-	timezone-16.xpm			\</div><div class='del'>-	timezone-48.png 		\</div><div class='del'>-	undelete_message-16.png		\</div><div class='del'>-	wax-seal-broken.png		\</div><div class='del'>-	wax-seal.png			\</div><div class='del'>-	work_offline.xpm		\</div><div class='del'>-	work_online-16.png		\</div><div class='del'>-	working-16.png			\</div><div class='del'>-	world_map-960.png</div><div class='del'>-</div><div class='del'>-buttonsdir = $(datadir)/images/evolution/buttons</div><div class='del'>-buttons_DATA = 				\</div><div class='del'>-	arrow-right-24.png		\</div><div class='del'>-	arrow-left-24.png		\</div><div class='del'>-	add-attachment.png		\</div><div class='del'>-	add-service.png			\</div><div class='del'>-	compose-message.png		\</div><div class='del'>-	copy-message.png		\</div><div class='del'>-	copy.png			\</div><div class='del'>-	cut.png				\</div><div class='del'>-	dayview.xpm			\</div><div class='del'>-	delete-message.png		\</div><div class='del'>-	fetch-mail.png			\</div><div class='del'>-	forward.png			\</div><div class='del'>-	goto-24.png  			\</div><div class='del'>-	monthview.xpm  			\</div><div class='del'>-	move-message.png		\</div><div class='del'>-	next-message.png		\</div><div class='del'>-	new_appointment.png		\</div><div class='del'>-	new_task.png			\</div><div class='del'>-	paste.png			\</div><div class='del'>-	previous-message.png		\</div><div class='del'>-	print.png			\</div><div class='del'>-	print-preview-24.png		\</div><div class='del'>-	reply.png			\</div><div class='del'>-	reply-to-all.png		\</div><div class='del'>-	receive-24.png		\</div><div class='del'>-	save-24.png			\</div><div class='del'>-	send-24-receive.png		\</div><div class='del'>-	send-24.png		\</div><div class='del'>-	weekview.xpm  			\</div><div class='del'>-	workweekview.xpm		\</div><div class='del'>-	yearview.xpm</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = 					\</div><div class='del'>-	evolution.png				\</div><div class='del'>-	import.png				\</div><div class='del'>-	flag-for-followup-48.png		\</div><div class='del'>-	mail-config-druid-account-name.png	\</div><div class='del'>-	mail-config-druid-identity.png		\</div><div class='del'>-	mail-config-druid.png			\</div><div class='del'>-	mail-config-druid-receive.png		\</div><div class='del'>-	mail-config-druid-send.png		\</div><div class='del'>-	thankyou.png				\</div><div class='del'>-	timezone-48.png</div><div class='del'>-</div><div class='del'>-conduitsdir = $(datadir)/images/evolution/conduits</div><div class='del'>-conduits_DATA =				\</div><div class='del'>-	evo-16-address-conduit.png   	\</div><div class='del'>-	evo-16-todo-conduit.png     	\</div><div class='del'>-	evo-16-calendar-conduit.png  	\</div><div class='del'>-	evo-48-calendar-conduit.png	\</div><div class='del'>-	evo-48-address-conduit.png  	\</div><div class='del'>-	evo-48-todo-conduit.png</div><div class='del'>-</div><div class='del'>-appicondir = $(datadir)/pixmaps</div><div class='del'>-appicon_DATA = evolution.png</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	attachment.xpm			\</div><div class='del'>-	bell.xpm			\</div><div class='del'>-	check-filled.xpm		\</div><div class='del'>-	empty.xpm			\</div><div class='del'>-	jump.xpm			\</div><div class='del'>-	mail-need-reply.xpm		\</div><div class='del'>-	mail-new.xpm			\</div><div class='del'>-	mail-read.xpm			\</div><div class='del'>-	mail-replied.xpm		\</div><div class='del'>-	flag-for-followup.xpm		\</div><div class='del'>-	mark.xpm			\</div><div class='del'>-	meeting.xpm			\</div><div class='del'>-	priority-high.xpm		\</div><div class='del'>-	priority-low.xpm		\</div><div class='del'>-	recur.xpm			\</div><div class='del'>-	score-higher.xpm		\</div><div class='del'>-	score-highest.xpm		\</div><div class='del'>-	score-high.xpm			\</div><div class='del'>-	score-lower.xpm			\</div><div class='del'>-	score-lowest.xpm		\</div><div class='del'>-	score-low.xpm			\</div><div class='del'>-	score-normal.xpm		\</div><div class='del'>-	task-assigned-to.xpm		\</div><div class='del'>-	task-assigned.xpm		\</div><div class='del'>-	task-recurring.xpm		\</div><div class='del'>-	timezone-16.xpm			\</div><div class='del'>-	tree-expanded.xpm		\</div><div class='del'>-	tree-unexpanded.xpm		\</div><div class='del'>-	$(images_DATA)			\</div><div class='del'>-	$(buttons_DATA)			\</div><div class='del'>-	$(conduits_DATA)		\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	$(appicon_DATA)</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/art/about-box.png b/art/about-box.png<br/>deleted file mode 100644<br/>index 721cdb8a51..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/about-box.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/about-box.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/add-attachment.png b/art/add-attachment.png<br/>deleted file mode 100644<br/>index adbec9900b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/add-attachment.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/add-attachment.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/add-nntp-folder-24.png b/art/add-nntp-folder-24.png<br/>deleted file mode 100644<br/>index 4941fe9250..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/add-nntp-folder-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/add-nntp-folder-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/add-service.png b/art/add-service.png<br/>deleted file mode 100644<br/>index eb20f4e068..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/add-service.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/add-service.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/alarm.png b/art/alarm.png<br/>deleted file mode 100644<br/>index 71a9be8a48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/alarm.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/alarm.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/all_contacts.xpm b/art/all_contacts.xpm<br/>deleted file mode 100644<br/>index 817bff7649..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/all_contacts.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/all_contacts.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * all_contacts_xpm[] = {</div><div class='del'>-"24 24 131 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #FDFDFD",</div><div class='del'>-"@ 	c #F5F5F5",</div><div class='del'>-"# 	c #F6F6F6",</div><div class='del'>-"$ 	c #D0D0D0",</div><div class='del'>-"% 	c #C1C1C1",</div><div class='del'>-"&amp; 	c #C3C3C3",</div><div class='del'>-"* 	c #C6C6C6",</div><div class='del'>-"= 	c #C8C8C8",</div><div class='del'>-"- 	c #8D8D8D",</div><div class='del'>-"; 	c #CACACA",</div><div class='del'>-"&gt; 	c #919191",</div><div class='del'>-", 	c #EFEFEF",</div><div class='del'>-"' 	c #878787",</div><div class='del'>-") 	c #8A8A8A",</div><div class='del'>-"! 	c #5C5C5C",</div><div class='del'>-"~ 	c #F8F8F8",</div><div class='del'>-"{ 	c #EAEAEA",</div><div class='del'>-"] 	c #CCCCCC",</div><div class='del'>-"^ 	c #CECECE",</div><div class='del'>-"/ 	c #979797",</div><div class='del'>-"( 	c #D2D2D2",</div><div class='del'>-"_ 	c #9A9A9A",</div><div class='del'>-": 	c #646464",</div><div class='del'>-"&lt; 	c #939393",</div><div class='del'>-"[ 	c #9D9D9D",</div><div class='del'>-"} 	c #6B6B6B",</div><div class='del'>-"| 	c #BDBDBD",</div><div class='del'>-"1 	c #FFFFFF",</div><div class='del'>-"2 	c #A1A1A1",</div><div class='del'>-"3 	c #D9D9D9",</div><div class='del'>-"4 	c #E3E3E3",</div><div class='del'>-"5 	c #EDEDED",</div><div class='del'>-"6 	c #EEEEEE",</div><div class='del'>-"7 	c #C9B49B",</div><div class='del'>-"8 	c #8E7151",</div><div class='del'>-"9 	c #876E51",</div><div class='del'>-"0 	c #BAB1A5",</div><div class='del'>-"a 	c #FBFBFB",</div><div class='del'>-"b 	c #FEFEFE",</div><div class='del'>-"c 	c #DEDCD7",</div><div class='del'>-"d 	c #9E9E9E",</div><div class='del'>-"e 	c #BABABA",</div><div class='del'>-"f 	c #D1D1D1",</div><div class='del'>-"g 	c #A3A3A3",</div><div class='del'>-"h 	c #F3F3F3",</div><div class='del'>-"i 	c #A88D6E",</div><div class='del'>-"j 	c #DFD0BF",</div><div class='del'>-"k 	c #5E432B",</div><div class='del'>-"l 	c #7E6C5B",</div><div class='del'>-"m 	c #313131",</div><div class='del'>-"n 	c #575757",</div><div class='del'>-"o 	c #FCFCFC",</div><div class='del'>-"p 	c #555555",</div><div class='del'>-"q 	c #D5D3CF",</div><div class='del'>-"r 	c #868686",</div><div class='del'>-"s 	c #A6A6A6",</div><div class='del'>-"t 	c #CDCDCD",</div><div class='del'>-"u 	c #DBDBDB",</div><div class='del'>-"v 	c #EEDFCC",</div><div class='del'>-"w 	c #F4EEE6",</div><div class='del'>-"x 	c #765E45",</div><div class='del'>-"y 	c #736251",</div><div class='del'>-"z 	c #D9D7D2",</div><div class='del'>-"A 	c #606060",</div><div class='del'>-"B 	c #7D7D7D",</div><div class='del'>-"C 	c #9C9C9C",</div><div class='del'>-"D 	c #A5A5A5",</div><div class='del'>-"E 	c #7C7C7C",</div><div class='del'>-"F 	c #FAFAFA",</div><div class='del'>-"G 	c #7590AE",</div><div class='del'>-"H 	c #C1665A",</div><div class='del'>-"I 	c #445B71",</div><div class='del'>-"J 	c #D7D6D3",</div><div class='del'>-"K 	c #ADADAD",</div><div class='del'>-"L 	c #9B9B9B",</div><div class='del'>-"M 	c #B6B6B6",</div><div class='del'>-"N 	c #E6E6E6",</div><div class='del'>-"O 	c #F1F1F1",</div><div class='del'>-"P 	c #A8A8A8",</div><div class='del'>-"Q 	c #4B6983",</div><div class='del'>-"R 	c #9DB8D2",</div><div class='del'>-"S 	c #486481",</div><div class='del'>-"T 	c #314E6C",</div><div class='del'>-"U 	c #667A8D",</div><div class='del'>-"V 	c #D4D3CE",</div><div class='del'>-"W 	c #787878",</div><div class='del'>-"X 	c #D3D3D3",</div><div class='del'>-"Y 	c #E1E1E1",</div><div class='del'>-"Z 	c #ABABAB",</div><div class='del'>-"` 	c #5F7C96",</div><div class='del'>-" .	c #5D7A95",</div><div class='del'>-"..	c #4D6B87",</div><div class='del'>-"+.	c #3B556D",</div><div class='del'>-"@.	c #344A60",</div><div class='del'>-"#.	c #999999",</div><div class='del'>-"$.	c #C7C7C7",</div><div class='del'>-"%.	c #DDDBD6",</div><div class='del'>-"&amp;.	c #DADADA",</div><div class='del'>-"*.	c #E2E2E2",</div><div class='del'>-"=.	c #898989",</div><div class='del'>-"-.	c #A9A9A9",</div><div class='del'>-";.	c #B0B0B0",</div><div class='del'>-"&gt;.	c #5D5D5D",</div><div class='del'>-",.	c #CBC9C2",</div><div class='del'>-"'.	c #BBBBBB",</div><div class='del'>-").	c #ECECEC",</div><div class='del'>-"!.	c #EAE8E3",</div><div class='del'>-"~.	c #DAD8D3",</div><div class='del'>-"{.	c #D3D2CD",</div><div class='del'>-"].	c #CECCC8",</div><div class='del'>-"^.	c #CCCAC6",</div><div class='del'>-"/.	c #D1CFCA",</div><div class='del'>-"(.	c #D2D0CB",</div><div class='del'>-"_.	c #C8C5BF",</div><div class='del'>-":.	c #737169",</div><div class='del'>-"&lt;.	c #8F8F8F",</div><div class='del'>-"[.	c #B3B3B3",</div><div class='del'>-"}.	c #DCDCDC",</div><div class='del'>-"|.	c #E8E8E8",</div><div class='del'>-"1.	c #B5B5B5",</div><div class='del'>-"2.	c #565656",</div><div class='del'>-"3.	c #A0A0A0",</div><div class='del'>-"4.	c #C2C2C2",</div><div class='del'>-"5.	c #848484",</div><div class='del'>-"6.	c #838383",</div><div class='del'>-"7.	c #7B7B7B",</div><div class='del'>-"8.	c #8B8B8B",</div><div class='del'>-"9.	c #B2B2B2",</div><div class='del'>-"0.	c #B8B8B8",</div><div class='del'>-"                                                ",</div><div class='del'>-"                                                ",</div><div class='del'>-"        . . . . . . . . . . . . . . . . . . . . ",</div><div class='del'>-"        . + @ @ @ @ @ @ @ # # # # # # # # # $ . ",</div><div class='del'>-"        . @ % % % &amp; &amp; &amp; &amp; * * * * * = = = = - . ",</div><div class='del'>-"        . # &amp; &amp; &amp; * * * * = = = = = ; ; ; ; &gt; . ",</div><div class='del'>-"        . , ' ' ' ) ) ) ) - - - - - &gt; &gt; &gt; &gt; ! . ",</div><div class='del'>-"        . ~ { { { { { { { { { { { { { { { { ; . ",</div><div class='del'>-"        . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / . ",</div><div class='del'>-"        . # ] ] ] ^ ^ ^ ^ ^ $ &amp; ^ $ ( ( ( ( _ . ",</div><div class='del'>-"  . . . . . . . . . . . . . . : &lt; / [ [ [ [ } . ",</div><div class='del'>-". | 1 1 1 1 1 1 1 1 1 1 1 1 2 . 3 4 5 6 6 6 * . ",</div><div class='del'>-". 1 ~ 7 8 9 0 1 + 1 a 1 1 b c . d e f 3 3 3 g . ",</div><div class='del'>-". 1 h i j k l 1 m n o p + 1 q . r s t u u u g . ",</div><div class='del'>-". 1 h v w x y 1 1 1 1 1 1 1 z . A B C D D D E . ",</div><div class='del'>-". 1 F G H I J 1 K 1 L K 1 1 q . ) M N O O , P . ",</div><div class='del'>-". 1 Q R S T U 1 1 1 1 1 1 1 V . W D X Y Y Y Z . ",</div><div class='del'>-". 1 `  ...+.@.1 #.L 5 $.1 1 %.. E K &amp;.*.*.*.K . ",</div><div class='del'>-". 1 1 1 1 1 1 1 1 1 1 1 1 1 c . A =.-.;.;.;.[ . ",</div><div class='del'>-". 1 1 &gt;.1 &gt;.1 W 1 L 1 * o F ,.. =.'.).@ @ @ $ . ",</div><div class='del'>-". g !.!.!.~.~.~.{.].^./.(._.:.. &lt;.[.}.N |.|.1.. ",</div><div class='del'>-"  . . . . . . . . . . . . . . 2.3.% Y N |.|.1.. ",</div><div class='del'>-"        . 4.&lt; - =.' 5.) r 6.7.E 8.2 9.1.0.0.e . ",</div><div class='del'>-"        . . . . . . . . . . . . . . . . . . . . "};</div><div class='head'>diff --git a/art/apply-filters-16.xpm b/art/apply-filters-16.xpm<br/>deleted file mode 100644<br/>index 28410fe30b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/apply-filters-16.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/apply-filters-16.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * apply_filers_16_xpm[] = {</div><div class='del'>-"16 16 29 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #161616",</div><div class='del'>-"+	c #EDEAE8",</div><div class='del'>-"@	c #CDC1BA",</div><div class='del'>-"#	c #6A4E3D",</div><div class='del'>-"$	c #C6B8AF",</div><div class='del'>-"%	c #333333",</div><div class='del'>-"&amp;	c #F3F1EE",</div><div class='del'>-"*	c #5E4537",</div><div class='del'>-"=	c #D6CCC5",</div><div class='del'>-"-	c #916C56",</div><div class='del'>-";	c #5A4235",</div><div class='del'>-"&gt;	c #BBA9A0",</div><div class='del'>-",	c #C3B3AC",</div><div class='del'>-"'	c #CEC1BB",</div><div class='del'>-")	c #BBAAA0",</div><div class='del'>-"!	c #A1897A",</div><div class='del'>-"~	c #664B3B",</div><div class='del'>-"{	c #383838",</div><div class='del'>-"]	c #856B60",</div><div class='del'>-"^	c #C2B3A9",</div><div class='del'>-"/	c #E9E3E0",</div><div class='del'>-"(	c #EEE9E7",</div><div class='del'>-"_	c #7B5A46",</div><div class='del'>-":	c #F5F4F2",</div><div class='del'>-"&lt;	c #B8A69B",</div><div class='del'>-"[	c #AE998D",</div><div class='del'>-"}	c #553E32",</div><div class='del'>-"|	c #725442",</div><div class='del'>-"                ",</div><div class='del'>-"  .+.           ",</div><div class='del'>-"  .@.     .#    ",</div><div class='del'>-"  .$.     %&amp;*   ",</div><div class='del'>-"  .$.......=-;  ",</div><div class='del'>-"  .$&gt;$$$$$,'--. ",</div><div class='del'>-"  .$.......)-*  ",</div><div class='del'>-"  .$.     .!*   ",</div><div class='del'>-"  .$.     .~    ",</div><div class='del'>-"  .$.     {]    ",</div><div class='del'>-"  .^.     ./~   ",</div><div class='del'>-"  .(.......,-#  ",</div><div class='del'>-"  _$:,$$$$$&lt;--. ",</div><div class='del'>-"   ~.......[-}  ",</div><div class='del'>-"          .!#   ",</div><div class='del'>-"          .|    "};</div><div class='head'>diff --git a/art/arrow-left-24.png b/art/arrow-left-24.png<br/>deleted file mode 100644<br/>index a977b3fb1a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/arrow-left-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/arrow-left-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/arrow-right-24.png b/art/arrow-right-24.png<br/>deleted file mode 100644<br/>index 393b0dca3e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/arrow-right-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/arrow-right-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/attachment.xpm b/art/attachment.xpm<br/>deleted file mode 100644<br/>index 21f2ecdb0e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/attachment.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/attachment.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * attachment_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #FFFFFF",</div><div class='del'>-"+	c #000000",</div><div class='del'>-"                ",</div><div class='del'>-"     ...        ",</div><div class='del'>-"    .+++. .     ",</div><div class='del'>-"   .+...+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+.+.+.+.    ",</div><div class='del'>-"   .+..+..+.    ",</div><div class='del'>-"   .+.....+.    ",</div><div class='del'>-"    .+...+.     ",</div><div class='del'>-"     .+++.      ",</div><div class='del'>-"      ...       "};</div><div class='head'>diff --git a/art/bcg.png b/art/bcg.png<br/>deleted file mode 100644<br/>index ec03f8ab6e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/bcg.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/bcg.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/bell.xpm b/art/bell.xpm<br/>deleted file mode 100644<br/>index b1ab537a17..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/bell.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/bell.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * bell_xpm[] = {</div><div class='del'>-"16 16 64 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #E3BB43",</div><div class='del'>-"@	c #E6C049",</div><div class='del'>-"#	c #EED275",</div><div class='del'>-"$	c #F4E193",</div><div class='del'>-"%	c #F4DF8C",</div><div class='del'>-"&amp;	c #EAC95C",</div><div class='del'>-"*	c #EFD57A",</div><div class='del'>-"=	c #FAEFBB",</div><div class='del'>-"-	c #FDF6D3",</div><div class='del'>-";	c #FDF5C6",</div><div class='del'>-"&gt;	c #F4E18F",</div><div class='del'>-",	c #E4BD43",</div><div class='del'>-"'	c #F6E295",</div><div class='del'>-")	c #FEF9D8",</div><div class='del'>-"!	c #FFFFFF",</div><div class='del'>-"~	c #FFFADA",</div><div class='del'>-"{	c #FCEEAA",</div><div class='del'>-"]	c #EBCA5A",</div><div class='del'>-"^	c #E9C550",</div><div class='del'>-"/	c #FAEA9C",</div><div class='del'>-"(	c #FEF7CB",</div><div class='del'>-"_	c #FFF8CC",</div><div class='del'>-":	c #FDF1A8",</div><div class='del'>-"&lt;	c #EED060",</div><div class='del'>-"[	c #D39D12",</div><div class='del'>-"}	c #F2D55D",</div><div class='del'>-"|	c #FCEC91",</div><div class='del'>-"1	c #FFF4AE",</div><div class='del'>-"2	c #FFF5B6",</div><div class='del'>-"3	c #FEEF97",</div><div class='del'>-"4	c #F3D65E",</div><div class='del'>-"5	c #D5A216",</div><div class='del'>-"6	c #FAE05C",</div><div class='del'>-"7	c #FFED7C",</div><div class='del'>-"8	c #FFEF8C",</div><div class='del'>-"9	c #FFF092",</div><div class='del'>-"0	c #FDEB7A",</div><div class='del'>-"a	c #F4D750",</div><div class='del'>-"b	c #D8A717",</div><div class='del'>-"c	c #EAC01D",</div><div class='del'>-"d	c #F6D83E",</div><div class='del'>-"e	c #FAE255",</div><div class='del'>-"f	c #FAE362",</div><div class='del'>-"g	c #F9E161",</div><div class='del'>-"h	c #F6DE5B",</div><div class='del'>-"i	c #F1D145",</div><div class='del'>-"j	c #E6BE28",</div><div class='del'>-"k	c #D09B09",</div><div class='del'>-"l	c #B67E00",</div><div class='del'>-"m	c #CE9100",</div><div class='del'>-"n	c #D69F04",</div><div class='del'>-"o	c #E0B011",</div><div class='del'>-"p	c #E6BA1D",</div><div class='del'>-"q	c #E3B721",</div><div class='del'>-"r	c #E0B21E",</div><div class='del'>-"s	c #DCAB16",</div><div class='del'>-"t	c #D7A20D",</div><div class='del'>-"u	c #CC9303",</div><div class='del'>-"v	c #BE8400",</div><div class='del'>-"w	c #AC7500",</div><div class='del'>-"x	c #A06B00",</div><div class='del'>-"y	c #FFDD00",</div><div class='del'>-"                ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"      .+@.      ",</div><div class='del'>-"     .#$%&amp;.     ",</div><div class='del'>-"    .*=-;&gt;,.    ",</div><div class='del'>-"    .')!~{].    ",</div><div class='del'>-"   .^/(~_:&lt;[.   ",</div><div class='del'>-"   .}|121345.   ",</div><div class='del'>-"   .678980ab.   ",</div><div class='del'>-"  .cdefghijkl.  ",</div><div class='del'>-" .mnopqrstuvwx. ",</div><div class='del'>-" .............. ",</div><div class='del'>-"      .8y.      ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/briefcase.png b/art/briefcase.png<br/>deleted file mode 100644<br/>index 424ad09632..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/briefcase.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/briefcase.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/butterfly.png b/art/butterfly.png<br/>deleted file mode 100644<br/>index 00089774e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/butterfly.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/butterfly.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/calendar-and-tasks-settings.png b/art/calendar-and-tasks-settings.png<br/>deleted file mode 100644<br/>index a457bb3cc8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/calendar-and-tasks-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/calendar-and-tasks-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/cellphone.png b/art/cellphone.png<br/>deleted file mode 100644<br/>index c8d70ae663..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/cellphone.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/cellphone.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/check-filled.xpm b/art/check-filled.xpm<br/>deleted file mode 100644<br/>index c0468fc25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/check-filled.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/check-filled.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static const char * check_filled_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  ............  ",</div><div class='del'>-"  .          .  ",</div><div class='del'>-"  .        . .  ",</div><div class='del'>-"  .       .. .  ",</div><div class='del'>-"  .      ... .  ",</div><div class='del'>-"  . .   ...  .  ",</div><div class='del'>-"  . .. ...   .  ",</div><div class='del'>-"  . .....    .  ",</div><div class='del'>-"  .  ...     .  ",</div><div class='del'>-"  .   .      .  ",</div><div class='del'>-"  .          .  ",</div><div class='del'>-"  ............  ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/compose-message.png b/art/compose-message.png<br/>deleted file mode 100644<br/>index 0be2101b6f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/compose-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/compose-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/composer-settings.png b/art/composer-settings.png<br/>deleted file mode 100644<br/>index f255c755e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/composer-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/composer-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/configure_16_addressbook.xpm b/art/configure_16_addressbook.xpm<br/>deleted file mode 100644<br/>index 4e037fe7b5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/configure_16_addressbook.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/configure_16_addressbook.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_configure_addressbook_xpm[] = {</div><div class='del'>-"16 16 58 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #EFEFEF",</div><div class='del'>-"#	c #C3C3C3",</div><div class='del'>-"$	c #EAEAEA",</div><div class='del'>-"%	c #BDBDBD",</div><div class='del'>-"&amp;	c #CFCFCF",</div><div class='del'>-"*	c #898989",</div><div class='del'>-"=	c #A8A8A8",</div><div class='del'>-"-	c #A3A3A3",</div><div class='del'>-";	c #F8F8F8",</div><div class='del'>-"&gt;	c #C9B49B",</div><div class='del'>-",	c #8E7151",</div><div class='del'>-"'	c #876E51",</div><div class='del'>-")	c #BAB1A5",</div><div class='del'>-"!	c #9D9D9D",</div><div class='del'>-"~	c #EAE8E3",</div><div class='del'>-"{	c #F3F3F3",</div><div class='del'>-"]	c #A88D6E",</div><div class='del'>-"^	c #DFD0BF",</div><div class='del'>-"/	c #5E432B",</div><div class='del'>-"(	c #7E6C5B",</div><div class='del'>-"_	c #A6A6A6",</div><div class='del'>-":	c #EEEEEE",</div><div class='del'>-"&lt;	c #EEDFCC",</div><div class='del'>-"[	c #F4EEE6",</div><div class='del'>-"}	c #765E45",</div><div class='del'>-"|	c #736251",</div><div class='del'>-"1	c #C1C1C1",</div><div class='del'>-"2	c #B4B4B4",</div><div class='del'>-"3	c #FAFAFA",</div><div class='del'>-"4	c #7590AE",</div><div class='del'>-"5	c #C1665A",</div><div class='del'>-"6	c #445B71",</div><div class='del'>-"7	c #AEADAB",</div><div class='del'>-"8	c #E8E8E8",</div><div class='del'>-"9	c #4B6983",</div><div class='del'>-"0	c #9DB8D2",</div><div class='del'>-"a	c #486481",</div><div class='del'>-"b	c #314E6C",</div><div class='del'>-"c	c #BDBCB8",</div><div class='del'>-"d	c #5F7C96",</div><div class='del'>-"e	c #5D7A95",</div><div class='del'>-"f	c #4D6B87",</div><div class='del'>-"g	c #3B556D",</div><div class='del'>-"h	c #999794",</div><div class='del'>-"i	c #ADABA8",</div><div class='del'>-"j	c #5D5D5D",</div><div class='del'>-"k	c #9B9B9B",</div><div class='del'>-"l	c #DEDEDE",</div><div class='del'>-"m	c #C3C0BA",</div><div class='del'>-"n	c #DAD8D3",</div><div class='del'>-"o	c #B1AFAB",</div><div class='del'>-"p	c #CBC9C5",</div><div class='del'>-"q	c #A5A3A0",</div><div class='del'>-"r	c #96948F",</div><div class='del'>-"s	c #918E85",</div><div class='del'>-"       ..  ..   ",</div><div class='del'>-"      .+.  .@.  ",</div><div class='del'>-"      .+....@.  ",</div><div class='del'>-"      .+@@@@#.  ",</div><div class='del'>-" .......$@@#... ",</div><div class='del'>-".%+++++&amp;.+#.*=-.",</div><div class='del'>-".+;&gt;,')+.+@.!&amp;~.",</div><div class='del'>-".+{]^/(+.+#._:~.",</div><div class='del'>-".+{&lt;[}|1.+@.2&amp;~.",</div><div class='del'>-".+34567.8@##.2~.",</div><div class='del'>-".+90ab.&amp;@@@@#.c.",</div><div class='del'>-".+defg.+....@.h.",</div><div class='del'>-".+++++.+.!2.@.i.",</div><div class='del'>-".++j+j+..kl..!m.",</div><div class='del'>-".-~~~~~noc~pqrs.",</div><div class='del'>-" .............. "};</div><div class='head'>diff --git a/art/configure_16_calendar.xpm b/art/configure_16_calendar.xpm<br/>deleted file mode 100644<br/>index 3dd7392a1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/configure_16_calendar.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/configure_16_calendar.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * configure_16_calendar_xpm[] = {</div><div class='del'>-"16 16 57 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #EFEFEF",</div><div class='del'>-"#	c #A8A8A8",</div><div class='del'>-"$	c #C3C3C3",</div><div class='del'>-"%	c #D4D4D4",</div><div class='del'>-"&amp;	c #939393",</div><div class='del'>-"*	c #F5F5F5",</div><div class='del'>-"=	c #EAEAEA",</div><div class='del'>-"-	c #E05232",</div><div class='del'>-";	c #DF4623",</div><div class='del'>-"&gt;	c #E78B76",</div><div class='del'>-",	c #868686",</div><div class='del'>-"'	c #4A4A4A",</div><div class='del'>-")	c #DF502F",</div><div class='del'>-"!	c #E87F68",</div><div class='del'>-"~	c #FDF6F4",</div><div class='del'>-"{	c #A7A7A7",</div><div class='del'>-"]	c #747474",</div><div class='del'>-"^	c #CFCFCF",</div><div class='del'>-"/	c #DF4B29",</div><div class='del'>-"(	c #F1B2A3",</div><div class='del'>-"_	c #E05231",</div><div class='del'>-":	c #F3BFB4",</div><div class='del'>-"&lt;	c #EEEEEE",</div><div class='del'>-"[	c #FAE8E4",</div><div class='del'>-"}	c #F9DDD6",</div><div class='del'>-"|	c #E87B62",</div><div class='del'>-"1	c #8D8D8D",</div><div class='del'>-"2	c #7B7B7B",</div><div class='del'>-"3	c #9C9C9C",</div><div class='del'>-"4	c #989898",</div><div class='del'>-"5	c #707070",</div><div class='del'>-"6	c #E2E2E2",</div><div class='del'>-"7	c #E8E8E8",</div><div class='del'>-"8	c #B4B4B4",</div><div class='del'>-"9	c #E1E1E1",</div><div class='del'>-"0	c #B0B0B0",</div><div class='del'>-"a	c #DEDEDE",</div><div class='del'>-"b	c #E0E0E0",</div><div class='del'>-"c	c #F4F4F4",</div><div class='del'>-"d	c #9D9D9D",</div><div class='del'>-"e	c #979797",</div><div class='del'>-"f	c #BDBDBD",</div><div class='del'>-"g	c #A0A0A0",</div><div class='del'>-"h	c #C1C1C1",</div><div class='del'>-"i	c #DADADA",</div><div class='del'>-"j	c #D9D9D9",</div><div class='del'>-"k	c #CECECE",</div><div class='del'>-"l	c #7C7C7C",</div><div class='del'>-"m	c #EDEDED",</div><div class='del'>-"n	c #9F9F9F",</div><div class='del'>-"o	c #ECECEC",</div><div class='del'>-"p	c #E6E6E6",</div><div class='del'>-"q	c #E7E7E7",</div><div class='del'>-"r	c #808080",</div><div class='del'>-" ..  ..         ",</div><div class='del'>-".+....@........ ",</div><div class='del'>-".+....@.++++++#.",</div><div class='del'>-".+@@@@$.++++%&amp;*.",</div><div class='del'>-" .=@@$.++-+;&gt;,*.",</div><div class='del'>-"  .+$.'#++)!~{*.",</div><div class='del'>-"  .+@.]^+/(_:+*.",</div><div class='del'>-"  .+$.#&lt;+[+}|+&lt;.",</div><div class='del'>-"  .+@.12$3$4$56.",</div><div class='del'>-" .7@$$.8++++++9.",</div><div class='del'>-".^@@@@$.^+++0ab.",</div><div class='del'>-".+....@.{+++c#b.",</div><div class='del'>-".+.de.@.f+++ghi.",</div><div class='del'>-" ..jk..da+++++b.",</div><div class='del'>-"  .lm^#n&lt;op96qr.",</div><div class='del'>-"   ............ "};</div><div class='head'>diff --git a/art/configure_16_folder.xpm b/art/configure_16_folder.xpm<br/>deleted file mode 100644<br/>index 4d016ca91a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/configure_16_folder.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/configure_16_folder.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_configure_folder_xpm[] = {</div><div class='del'>-"16 16 66 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #EFEFEF",</div><div class='del'>-"#	c #C3C3C3",</div><div class='del'>-"$	c #E4E5DF",</div><div class='del'>-"%	c #D5D6CB",</div><div class='del'>-"&amp;	c #D6D7CA",</div><div class='del'>-"*	c #F5F6F0",</div><div class='del'>-"=	c #ADB198",</div><div class='del'>-"-	c #C2C6A9",</div><div class='del'>-";	c #C0C3A7",</div><div class='del'>-"&gt;	c #B4B89D",</div><div class='del'>-",	c #EAECDB",</div><div class='del'>-"'	c #F6F6F4",</div><div class='del'>-")	c #EAECDA",</div><div class='del'>-"!	c #AAAB9E",</div><div class='del'>-"~	c #E5E8D4",</div><div class='del'>-"{	c #E4E7D2",</div><div class='del'>-"]	c #C7C9B6",</div><div class='del'>-"^	c #F7F7F7",</div><div class='del'>-"/	c #DADEBF",</div><div class='del'>-"(	c #DADEBE",</div><div class='del'>-"_	c #D8DCBC",</div><div class='del'>-":	c #D6DBB9",</div><div class='del'>-"&lt;	c #797D66",</div><div class='del'>-"[	c #CDD2AD",</div><div class='del'>-"}	c #CBD1AA",</div><div class='del'>-"|	c #95997C",</div><div class='del'>-"1	c #F3F3EA",</div><div class='del'>-"2	c #70745E",</div><div class='del'>-"3	c #A3A889",</div><div class='del'>-"4	c #F3F4EA",</div><div class='del'>-"5	c #D5D9B7",</div><div class='del'>-"6	c #7F8369",</div><div class='del'>-"7	c #ABB08E",</div><div class='del'>-"8	c #929778",</div><div class='del'>-"9	c #F1F3E9",</div><div class='del'>-"0	c #D3D7B4",</div><div class='del'>-"a	c #7C7F65",</div><div class='del'>-"b	c #8F9474",</div><div class='del'>-"c	c #F0F1E7",</div><div class='del'>-"d	c #D1D6B2",</div><div class='del'>-"e	c #CFD4AF",</div><div class='del'>-"f	c #7A7D61",</div><div class='del'>-"g	c #8D9270",</div><div class='del'>-"h	c #EFF1E5",</div><div class='del'>-"i	c #86896D",</div><div class='del'>-"j	c #909273",</div><div class='del'>-"k	c #707459",</div><div class='del'>-"l	c #EBECDE",</div><div class='del'>-"m	c #CACFA8",</div><div class='del'>-"n	c #C8CDA5",</div><div class='del'>-"o	c #B8BD97",</div><div class='del'>-"p	c #848769",</div><div class='del'>-"q	c #BFC598",</div><div class='del'>-"r	c #60634C",</div><div class='del'>-"s	c #989E79",</div><div class='del'>-"t	c #C9CCB9",</div><div class='del'>-"u	c #919576",</div><div class='del'>-"v	c #848869",</div><div class='del'>-"w	c #686B52",</div><div class='del'>-"x	c #838768",</div><div class='del'>-"y	c #595C46",</div><div class='del'>-"z	c #797D60",</div><div class='del'>-"A	c #666951",</div><div class='del'>-"      ..  ..    ",</div><div class='del'>-"     .+.  .@.   ",</div><div class='del'>-"     .+....@.   ",</div><div class='del'>-"   ...+@@@@#.   ",</div><div class='del'>-"  .$%&amp;.+@@#.    ",</div><div class='del'>-" .*=-;&gt;.+#..... ",</div><div class='del'>-" .,',,).+@.!~{].",</div><div class='del'>-" .^/(_:.+#.&lt;[}|.",</div><div class='del'>-" .1/(_:.+@.23}|.",</div><div class='del'>-" .4_:5.+@##.678.",</div><div class='del'>-" .950.+@@@@#.ab.",</div><div class='del'>-" .cde.+....@.fg.",</div><div class='del'>-" .h[}.+.ij.@.kg.",</div><div class='del'>-" .lmno..pq..rsg.",</div><div class='del'>-" .t8ubvwwgxyzgA.",</div><div class='del'>-"  ............. "};</div><div class='head'>diff --git a/art/configure_16_mail.xpm b/art/configure_16_mail.xpm<br/>deleted file mode 100644<br/>index b6416735ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/configure_16_mail.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/configure_16_mail.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_configure_mail_xpm[] = {</div><div class='del'>-"16 16 42 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #EFEFEF",</div><div class='del'>-"#	c #C3C3C3",</div><div class='del'>-"$	c #010101",</div><div class='del'>-"%	c #2F2F2F",</div><div class='del'>-"&amp;	c #A7A4A0",</div><div class='del'>-"*	c #FCFCFC",</div><div class='del'>-"=	c #F5F5F5",</div><div class='del'>-"-	c #5D5B57",</div><div class='del'>-";	c #EBEBEB",</div><div class='del'>-"&gt;	c #1B1B1B",</div><div class='del'>-",	c #FBFBF8",</div><div class='del'>-"'	c #716E6B",</div><div class='del'>-")	c #ECECEC",</div><div class='del'>-"!	c #BEBEBE",</div><div class='del'>-"~	c #EDEDED",</div><div class='del'>-"{	c #DFDFDF",</div><div class='del'>-"]	c #FBFAF7",</div><div class='del'>-"^	c #A5A29D",</div><div class='del'>-"/	c #E9E9E8",</div><div class='del'>-"(	c #797873",</div><div class='del'>-"_	c #8E8C8A",</div><div class='del'>-":	c #C6C3BD",</div><div class='del'>-"&lt;	c #C9C5C0",</div><div class='del'>-"[	c #7D7A77",</div><div class='del'>-"}	c #F7F5F1",</div><div class='del'>-"|	c #FAF9F6",</div><div class='del'>-"1	c #F8F6F2",</div><div class='del'>-"2	c #DAD8D6",</div><div class='del'>-"3	c #656360",</div><div class='del'>-"4	c #E2DFD8",</div><div class='del'>-"5	c #090808",</div><div class='del'>-"6	c #D7D4CE",</div><div class='del'>-"7	c #D8D5CF",</div><div class='del'>-"8	c #D6D3CD",</div><div class='del'>-"9	c #D9D6D0",</div><div class='del'>-"0	c #D3D1CD",</div><div class='del'>-"a	c #BEBCB6",</div><div class='del'>-"b	c #E0DCD5",</div><div class='del'>-"c	c #222221",</div><div class='del'>-"         ..  .. ",</div><div class='del'>-"        .+.  .@.",</div><div class='del'>-"        .+....@.",</div><div class='del'>-"        .+@@@@#.",</div><div class='del'>-"         .+@@#. ",</div><div class='del'>-"          .+#.  ",</div><div class='del'>-"  $%$$$$$$.+@.  ",</div><div class='del'>-" $&amp;******=.+#.  ",</div><div class='del'>-" $+-+++++;&gt;+@.  ",</div><div class='del'>-" $+,'+++).!@##. ",</div><div class='del'>-" $+,,'+~.{@@@@#.",</div><div class='del'>-" $+,]^'/.+....@.",</div><div class='del'>-" $+](,,_.+.:&lt;.@.",</div><div class='del'>-" $+[,}|12..34.. ",</div><div class='del'>-" $56777890abc$  ",</div><div class='del'>-"  $$$$$$$$$$$   "};</div><div class='head'>diff --git a/art/connect_to_url-16.xpm b/art/connect_to_url-16.xpm<br/>deleted file mode 100644<br/>index 5053d252f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/connect_to_url-16.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/connect_to_url-16.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,123 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * connect_to_url_16_xpm[] = {</div><div class='del'>-"16 16 104 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #070808",</div><div class='del'>-"@ 	c #677B68",</div><div class='del'>-"# 	c #BECFC5",</div><div class='del'>-"$ 	c #B4C3C6",</div><div class='del'>-"% 	c #8AA0B6",</div><div class='del'>-"&amp; 	c #95A1AC",</div><div class='del'>-"* 	c #AFB8B8",</div><div class='del'>-"= 	c #989D98",</div><div class='del'>-"- 	c #373737",</div><div class='del'>-"; 	c #AFC1B1",</div><div class='del'>-"&gt; 	c #E0E7DE",</div><div class='del'>-", 	c #BACFC6",</div><div class='del'>-"' 	c #96AFC0",</div><div class='del'>-") 	c #728BA4",</div><div class='del'>-"! 	c #889BA4",</div><div class='del'>-"~ 	c #829176",</div><div class='del'>-"{ 	c #879A81",</div><div class='del'>-"] 	c #AAA89A",</div><div class='del'>-"^ 	c #585A5B",</div><div class='del'>-"/ 	c #1D1D1D",</div><div class='del'>-"( 	c #748E79",</div><div class='del'>-"_ 	c #DEEADF",</div><div class='del'>-": 	c #B1D9B3",</div><div class='del'>-"&lt; 	c #AAD8B5",</div><div class='del'>-"[ 	c #79B7A5",</div><div class='del'>-"} 	c #7A9AB5",</div><div class='del'>-"| 	c #839DA3",</div><div class='del'>-"1 	c #74876C",</div><div class='del'>-"2 	c #7E8471",</div><div class='del'>-"3 	c #82755A",</div><div class='del'>-"4 	c #8F7F66",</div><div class='del'>-"5 	c #2D2E2D",</div><div class='del'>-"6 	c #CAD7CB",</div><div class='del'>-"7 	c #BCD9C2",</div><div class='del'>-"8 	c #96C69D",</div><div class='del'>-"9 	c #4D8550",</div><div class='del'>-"0 	c #597FA7",</div><div class='del'>-"a 	c #418093",</div><div class='del'>-"b 	c #637E61",</div><div class='del'>-"c 	c #73755B",</div><div class='del'>-"d 	c #86765A",</div><div class='del'>-"e 	c #949290",</div><div class='del'>-"f 	c #CDDACD",</div><div class='del'>-"g 	c #518355",</div><div class='del'>-"h 	c #989389",</div><div class='del'>-"i 	c #807D74",</div><div class='del'>-"j 	c #3B7480",</div><div class='del'>-"k 	c #449268",</div><div class='del'>-"l 	c #819395",</div><div class='del'>-"m 	c #797E67",</div><div class='del'>-"n 	c #9D907D",</div><div class='del'>-"o 	c #73816F",</div><div class='del'>-"p 	c #43423C",</div><div class='del'>-"q 	c #B7B3AA",</div><div class='del'>-"r 	c #C4C2BD",</div><div class='del'>-"s 	c #EAE8E3",</div><div class='del'>-"t 	c #4D5C5E",</div><div class='del'>-"u 	c #887664",</div><div class='del'>-"v 	c #000001",</div><div class='del'>-"w 	c #010101",</div><div class='del'>-"x 	c #E2E1DD",</div><div class='del'>-"y 	c #F0EFEC",</div><div class='del'>-"z 	c #AAA7A0",</div><div class='del'>-"A 	c #C5D2C8",</div><div class='del'>-"B 	c #E9EEEA",</div><div class='del'>-"C 	c #8B8572",</div><div class='del'>-"D 	c #476346",</div><div class='del'>-"E 	c #889079",</div><div class='del'>-"F 	c #F2F0ED",</div><div class='del'>-"G 	c #EBEAE6",</div><div class='del'>-"H 	c #8A857B",</div><div class='del'>-"I 	c #ECEBE8",</div><div class='del'>-"J 	c #4D6C8B",</div><div class='del'>-"K 	c #4B6963",</div><div class='del'>-"L 	c #53885E",</div><div class='del'>-"M 	c #6E7653",</div><div class='del'>-"N 	c #747F6C",</div><div class='del'>-"O 	c #0C0B0A",</div><div class='del'>-"P 	c #78756B",</div><div class='del'>-"Q 	c #BEBBB5",</div><div class='del'>-"R 	c #B3B1AA",</div><div class='del'>-"S 	c #7D786E",</div><div class='del'>-"T 	c #E1DFDB",</div><div class='del'>-"U 	c #46698F",</div><div class='del'>-"V 	c #598860",</div><div class='del'>-"W 	c #617853",</div><div class='del'>-"X 	c #818667",</div><div class='del'>-"Y 	c #030506",</div><div class='del'>-"Z 	c #8C8981",</div><div class='del'>-"` 	c #A6A29B",</div><div class='del'>-" .	c #726D63",</div><div class='del'>-"..	c #CECAC3",</div><div class='del'>-"+.	c #3D5143",</div><div class='del'>-"@.	c #020203",</div><div class='del'>-"#.	c #0F0F0D",</div><div class='del'>-"$.	c #F0F3F1",</div><div class='del'>-"%.	c #272622",</div><div class='del'>-"&amp;.	c #8B877E",</div><div class='del'>-"*.	c #706C62",</div><div class='del'>-"=.	c #B1ADA4",</div><div class='del'>-"-.	c #6C685E",</div><div class='del'>-";.	c #646056",</div><div class='del'>-"          . . . + . . . .       ",</div><div class='del'>-"        . @ # $ % &amp; * = - .     ",</div><div class='del'>-"      . ; &gt; , ' ) ! ~ { ] ^ /   ",</div><div class='del'>-"    . ( _ : &lt; [ } | 1 2 3 4 5 . ",</div><div class='del'>-"    . 6 7 8 9 . . 0 a b c d e . ",</div><div class='del'>-"    . f g . . h i . j k l m n . ",</div><div class='del'>-"    . o p q r s i . . . . t u v ",</div><div class='del'>-"    w . x y z s i . A A B . C v ",</div><div class='del'>-". . . i x y z s i . . . . D E v ",</div><div class='del'>-"s s s s F G H I i . J K L M N O ",</div><div class='del'>-"i i P P Q R S T P . U V W X Y   ",</div><div class='del'>-". . w P Z `  ...P . . . . +.@.  ",</div><div class='del'>-"      #.Z `  ...P . A A $..     ",</div><div class='del'>-"        %.&amp;.*.=.-.. . . .       ",</div><div class='del'>-"          #.#.h ;..             ",</div><div class='del'>-"              #.#.              "};</div><div class='head'>diff --git a/art/contact-is-a-list.png b/art/contact-is-a-list.png<br/>deleted file mode 100644<br/>index 3a7bc1c143..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/contact-is-a-list.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/contact-is-a-list.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/copy-message.png b/art/copy-message.png<br/>deleted file mode 100644<br/>index 907ec1a85d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/copy-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/copy-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/copy.png b/art/copy.png<br/>deleted file mode 100644<br/>index 23a6db32e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/copy.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/copy.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/copy_16_message.xpm b/art/copy_16_message.xpm<br/>deleted file mode 100644<br/>index a4f56cfd6e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/copy_16_message.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/copy_16_message.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_copy_message_xpm[] = {</div><div class='del'>-"16 16 39 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #95938E",</div><div class='del'>-"&amp;	c #FBFBFB",</div><div class='del'>-"*	c #F9F8F6",</div><div class='del'>-"=	c #FBFAFA",</div><div class='del'>-"-	c #F6F5F1",</div><div class='del'>-";	c #7D7B78",</div><div class='del'>-"&gt;	c #EAE8E3",</div><div class='del'>-",	c #969491",</div><div class='del'>-"'	c #F6F4F1",</div><div class='del'>-")	c #81807C",</div><div class='del'>-"!	c #E5E3DE",</div><div class='del'>-"~	c #F7F6F4",</div><div class='del'>-"{	c #B0ADA7",</div><div class='del'>-"]	c #83817E",</div><div class='del'>-"^	c #E1DFDA",</div><div class='del'>-"/	c #928F8B",</div><div class='del'>-"(	c #FBFBFA",</div><div class='del'>-"_	c #F7F5F2",</div><div class='del'>-":	c #F5F3F0",</div><div class='del'>-"&lt;	c #B5B2AC",</div><div class='del'>-"[	c #A09C97",</div><div class='del'>-"}	c #F0EFEB",</div><div class='del'>-"|	c #E4E2DD",</div><div class='del'>-"1	c #AEABA6",</div><div class='del'>-"2	c #92908B",</div><div class='del'>-"3	c #E8E6E1",</div><div class='del'>-"4	c #F7F6F2",</div><div class='del'>-"5	c #F5F4F0",</div><div class='del'>-"6	c #6B6A68",</div><div class='del'>-"7	c #E2DFD9",</div><div class='del'>-"8	c #E2E0DB",</div><div class='del'>-"9	c #E3E1DC",</div><div class='del'>-"0	c #E6E4DF",</div><div class='del'>-"                ",</div><div class='del'>-" .+.........    ",</div><div class='del'>-".@#########$.   ",</div><div class='del'>-".#%&amp;*#*=*-;&gt;.   ",</div><div class='del'>-".#*,=*=*')'!.   ",</div><div class='del'>-".#**.+......... ",</div><div class='del'>-".#*.@#########$.",</div><div class='del'>-".#~.#%&amp;*#*=*-;&gt;.",</div><div class='del'>-".#{.#*,=*=*')'!.",</div><div class='del'>-".]^.#**/(*_)*:!.",</div><div class='del'>-" ...#*~&lt;)#)[-}|.",</div><div class='del'>-"   .#~1**)__23|.",</div><div class='del'>-"   .#{*:45_:&gt;63.",</div><div class='del'>-"   .]^777^8890$.",</div><div class='del'>-"    ........... ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/cut.png b/art/cut.png<br/>deleted file mode 100644<br/>index 7ffb512043..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/cut.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/cut.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/dayview.xpm b/art/dayview.xpm<br/>deleted file mode 100644<br/>index dbabb24c5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/dayview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/dayview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * dayview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #D8D8D4",</div><div class='del'>-"@	c #919191",</div><div class='del'>-"#	c #666666",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #F2F1ED",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++++++++++++++++++@. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".@####################. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".+@@#@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/art/delete-message.png b/art/delete-message.png<br/>deleted file mode 100644<br/>index 1bec6baac7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/delete-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/delete-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/drafts-16.png b/art/drafts-16.png<br/>deleted file mode 100644<br/>index 285646f60b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/drafts-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/drafts-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/edit.xpm b/art/edit.xpm<br/>deleted file mode 100644<br/>index 28b8f090c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/edit.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/edit.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_edit_xpm[] = {</div><div class='del'>-"16 16 65 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FDFDFD",</div><div class='del'>-"@	c #E2E2E2",</div><div class='del'>-"#	c #BAA88F",</div><div class='del'>-"$	c #836B4E",</div><div class='del'>-"%	c #FEFEFE",</div><div class='del'>-"&amp;	c #FCFCFC",</div><div class='del'>-"*	c #FBFBFB",</div><div class='del'>-"=	c #E5E5E5",</div><div class='del'>-"-	c #C5A985",</div><div class='del'>-";	c #DC9E55",</div><div class='del'>-"&gt;	c #9E6233",</div><div class='del'>-",	c #FFFFFF",</div><div class='del'>-"'	c #F2F2F2",</div><div class='del'>-")	c #D9D9D9",</div><div class='del'>-"!	c #E4E4E4",</div><div class='del'>-"~	c #C3A783",</div><div class='del'>-"{	c #DD9D53",</div><div class='del'>-"]	c #A76631",</div><div class='del'>-"^	c #EEEEEE",</div><div class='del'>-"/	c #D4D4D4",</div><div class='del'>-"(	c #FAFAFA",</div><div class='del'>-"_	c #7B7B7B",</div><div class='del'>-":	c #C5AA88",</div><div class='del'>-"&lt;	c #A86631",</div><div class='del'>-"[	c #DCDCDC",</div><div class='del'>-"}	c #F0F0F0",</div><div class='del'>-"|	c #5E5E5E",</div><div class='del'>-"1	c #C3A47A",</div><div class='del'>-"2	c #DD9D52",</div><div class='del'>-"3	c #A66430",</div><div class='del'>-"4	c #D5D5D5",</div><div class='del'>-"5	c #6A6A6A",</div><div class='del'>-"6	c #C2A174",</div><div class='del'>-"7	c #DC9B4E",</div><div class='del'>-"8	c #A96630",</div><div class='del'>-"9	c #6E6E6E",</div><div class='del'>-"0	c #D8D8D8",</div><div class='del'>-"a	c #D6D6D6",</div><div class='del'>-"b	c #9F9F9F",</div><div class='del'>-"c	c #BEA686",</div><div class='del'>-"d	c #DD9D51",</div><div class='del'>-"e	c #AA682F",</div><div class='del'>-"f	c #F5F5F5",</div><div class='del'>-"g	c #DDDDDD",</div><div class='del'>-"h	c #F9F9F9",</div><div class='del'>-"i	c #7A7A7A",</div><div class='del'>-"j	c #BCAC9B",</div><div class='del'>-"k	c #A86E3F",</div><div class='del'>-"l	c #797979",</div><div class='del'>-"m	c #F4F4F4",</div><div class='del'>-"n	c #F3F3F3",</div><div class='del'>-"o	c #DFDFDF",</div><div class='del'>-"p	c #7C7C7C",</div><div class='del'>-"q	c #4F4F4F",</div><div class='del'>-"r	c #6C6C6C",</div><div class='del'>-"s	c #EAEAEA",</div><div class='del'>-"t	c #F8F8F8",</div><div class='del'>-"u	c #F6F6F6",</div><div class='del'>-"v	c #F7F7F7",</div><div class='del'>-"w	c #EBEBEB",</div><div class='del'>-"x	c #ECECEC",</div><div class='del'>-"y	c #E0E0E0",</div><div class='del'>-"z	c #E8E8E8",</div><div class='del'>-"       ..    .. ",</div><div class='del'>-"     ..+@.  .#$.",</div><div class='del'>-"   ..%+&amp;*=..-;&gt;.",</div><div class='del'>-" ..,%+')*!.~{]. ",</div><div class='del'>-".,%%^/)*(_:{&lt;.  ",</div><div class='del'>-".%%)[**}|123.   ",</div><div class='del'>-" .+'*}456789.   ",</div><div class='del'>-" .&amp;*0abcde.fg.  ",</div><div class='del'>-"  .((hijklfmno. ",</div><div class='del'>-"  .(hpq.rfmnsg. ",</div><div class='del'>-"   .tilufm^oo.  ",</div><div class='del'>-"   .vuufwoo..   ",</div><div class='del'>-"    .uxyo..     ",</div><div class='del'>-"    .zg..       ",</div><div class='del'>-"     ..         ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/empty.gif b/art/empty.gif<br/>deleted file mode 100644<br/>index 0be4006193..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/empty.gif?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/empty.gif</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/empty.xpm b/art/empty.xpm<br/>deleted file mode 100644<br/>index aca06618b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/empty.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/empty.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * empty_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #FFFFFF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/encrypt.xpm b/art/encrypt.xpm<br/>deleted file mode 100644<br/>index 636345ad9d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/encrypt.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/encrypt.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_encrypt_xpm[] = {</div><div class='del'>-"16 16 61 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FDFDFD",</div><div class='del'>-"@	c #808080",</div><div class='del'>-"#	c #FEFEFE",</div><div class='del'>-"$	c #8F8F8F",</div><div class='del'>-"%	c #313131",</div><div class='del'>-"&amp;	c #CDB86D",</div><div class='del'>-"*	c #EED680",</div><div class='del'>-"=	c #FFFFFF",</div><div class='del'>-"-	c #F2F2F2",</div><div class='del'>-";	c #343434",</div><div class='del'>-"&gt;	c #EEEEEE",</div><div class='del'>-",	c #D4D4D4",</div><div class='del'>-"'	c #D9D9D9",</div><div class='del'>-")	c #3D3D3D",</div><div class='del'>-"!	c #8D8D8D",</div><div class='del'>-"~	c #DCDCDC",</div><div class='del'>-"{	c #FBFBFB",</div><div class='del'>-"]	c #B2B2B2",</div><div class='del'>-"^	c #3A3A3A",</div><div class='del'>-"/	c #A9A9A9",</div><div class='del'>-"(	c #F0F0F0",</div><div class='del'>-"_	c #444444",</div><div class='del'>-":	c #E4E9F1",</div><div class='del'>-"&lt;	c #B3C5D7",</div><div class='del'>-"[	c #AABDCE",</div><div class='del'>-"}	c #A2B4C5",</div><div class='del'>-"|	c #99ABBD",</div><div class='del'>-"1	c #8FA3B4",</div><div class='del'>-"2	c #3C5469",</div><div class='del'>-"3	c #FCFCFC",</div><div class='del'>-"4	c #D8D8D8",</div><div class='del'>-"5	c #D6D6D6",</div><div class='del'>-"6	c #6A6A6A",</div><div class='del'>-"7	c #BDCEE0",</div><div class='del'>-"8	c #8FAAC4",</div><div class='del'>-"9	c #819DB7",</div><div class='del'>-"0	c #7490AA",</div><div class='del'>-"a	c #66839D",</div><div class='del'>-"b	c #587690",</div><div class='del'>-"c	c #314456",</div><div class='del'>-"d	c #FAFAFA",</div><div class='del'>-"e	c #F9F9F9",</div><div class='del'>-"f	c #676767",</div><div class='del'>-"g	c #DFDFDF",</div><div class='del'>-"h	c #5F5F5F",</div><div class='del'>-"i	c #F8F8F8",</div><div class='del'>-"j	c #F7F7F7",</div><div class='del'>-"k	c #696969",</div><div class='del'>-"l	c #92A1B0",</div><div class='del'>-"m	c #5E7081",</div><div class='del'>-"n	c #556879",</div><div class='del'>-"o	c #4C5F70",</div><div class='del'>-"p	c #435668",</div><div class='del'>-"q	c #394E5F",</div><div class='del'>-"r	c #23313E",</div><div class='del'>-"s	c #F6F6F6",</div><div class='del'>-"t	c #7E7E7E",</div><div class='del'>-"u	c #E8E8E8",</div><div class='del'>-"v	c #DDDDDD",</div><div class='del'>-"                ",</div><div class='del'>-"        ..      ",</div><div class='del'>-"      ..+@...   ",</div><div class='del'>-"    ..#+$%&amp;*&amp;.  ",</div><div class='del'>-"  ..=#+-;&amp;@. &amp;. ",</div><div class='del'>-" .=##&gt;,')*!. *. ",</div><div class='del'>-" .##'~{]^&amp;!/.&amp;..",</div><div class='del'>-"  .+-{(_:&lt;[}|12.",</div><div class='del'>-"  .3{4567890abc.",</div><div class='del'>-"   .ddef7890abc.",</div><div class='del'>-"   .degh7890abc.",</div><div class='del'>-"    .ijklmnopqr.",</div><div class='del'>-"    .jsghkkt....",</div><div class='del'>-"     .sssg..    ",</div><div class='del'>-"     .uv..      ",</div><div class='del'>-"      ..        "};</div><div class='head'>diff --git a/art/envelope.png b/art/envelope.png<br/>deleted file mode 100644<br/>index 3e801181aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/envelope.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/envelope.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/es-appointments.png b/art/es-appointments.png<br/>deleted file mode 100644<br/>index e194232051..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/es-appointments.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/es-appointments.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/es-weather.png b/art/es-weather.png<br/>deleted file mode 100644<br/>index 3d31469e78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/es-weather.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/es-weather.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-16-address-conduit.png b/art/evo-16-address-conduit.png<br/>deleted file mode 100644<br/>index 18a2e5809e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-16-address-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-16-address-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-16-calendar-conduit.png b/art/evo-16-calendar-conduit.png<br/>deleted file mode 100644<br/>index dd8e8ab85e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-16-calendar-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-16-calendar-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-16-todo-conduit.png b/art/evo-16-todo-conduit.png<br/>deleted file mode 100644<br/>index d36d2c61fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-16-todo-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-16-todo-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-48-address-conduit.png b/art/evo-48-address-conduit.png<br/>deleted file mode 100644<br/>index 342a061088..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-48-address-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-48-address-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-48-calendar-conduit.png b/art/evo-48-calendar-conduit.png<br/>deleted file mode 100644<br/>index bb0a49791e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-48-calendar-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-48-calendar-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evo-48-todo-conduit.png b/art/evo-48-todo-conduit.png<br/>deleted file mode 100644<br/>index dd4899e984..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evo-48-todo-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evo-48-todo-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png<br/>deleted file mode 100644<br/>index cddb0396dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-calendar-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-calendar-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-calendar.png b/art/evolution-calendar.png<br/>deleted file mode 100644<br/>index 76afca6b6f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-calendar.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-calendar.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png<br/>deleted file mode 100644<br/>index 5ddb92c1ce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-contacts-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-contacts-plain.png b/art/evolution-contacts-plain.png<br/>deleted file mode 100644<br/>index 542a81a508..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts-plain.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-contacts-plain.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-contacts.png b/art/evolution-contacts.png<br/>deleted file mode 100644<br/>index 0d2cfb7e5f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-contacts.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-inbox-mini.png b/art/evolution-inbox-mini.png<br/>deleted file mode 100644<br/>index dbc20fcef1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-inbox-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-inbox-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-inbox.png b/art/evolution-inbox.png<br/>deleted file mode 100644<br/>index 66a4ba89cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-inbox.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-inbox.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-notes-mini.png b/art/evolution-notes-mini.png<br/>deleted file mode 100644<br/>index f5b5d776d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-notes-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-notes-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-notes.png b/art/evolution-notes.png<br/>deleted file mode 100644<br/>index f82006b894..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-notes.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-notes.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-tasks-mini.png b/art/evolution-tasks-mini.png<br/>deleted file mode 100644<br/>index d23b5a0be7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-tasks-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-tasks-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-tasks.png b/art/evolution-tasks.png<br/>deleted file mode 100644<br/>index a3771c23eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-tasks.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-tasks.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-today-mini.png b/art/evolution-today-mini.png<br/>deleted file mode 100644<br/>index 6039b15e82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-today-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-today-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-today.png b/art/evolution-today.png<br/>deleted file mode 100644<br/>index 010bcb8cc7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-today.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-today.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-trash-mini.png b/art/evolution-trash-mini.png<br/>deleted file mode 100644<br/>index 56a8daa51f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-trash-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-trash-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution-trash.png b/art/evolution-trash.png<br/>deleted file mode 100644<br/>index c2ac8da173..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-trash.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution-trash.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/evolution.png b/art/evolution.png<br/>deleted file mode 100644<br/>index 412dcfbbc0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/evolution.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/executive-summary-bg.png b/art/executive-summary-bg.png<br/>deleted file mode 100644<br/>index fdcde6613d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/executive-summary-bg.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/executive-summary-bg.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/executive-summary-curve.png b/art/executive-summary-curve.png<br/>deleted file mode 100644<br/>index 3ba42dd02b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/executive-summary-curve.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/executive-summary-curve.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/faq-16.png b/art/faq-16.png<br/>deleted file mode 100644<br/>index fcf71658da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/faq-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/faq-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/fetch-mail.png b/art/fetch-mail.png<br/>deleted file mode 100644<br/>index 30cda0564d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/fetch-mail.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/fetch-mail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/find_contact.xpm b/art/find_contact.xpm<br/>deleted file mode 100644<br/>index 37d957b13b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/find_contact.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/find_contact.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 24_find_contact_xpm[] = {</div><div class='del'>-"24 24 100 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #BDBDBD",</div><div class='del'>-"@ 	c #FFFFFF",</div><div class='del'>-"# 	c #A3A3A3",</div><div class='del'>-"$ 	c #F8F8F8",</div><div class='del'>-"% 	c #C9B49B",</div><div class='del'>-"&amp; 	c #8E7151",</div><div class='del'>-"* 	c #876E51",</div><div class='del'>-"= 	c #BAB1A5",</div><div class='del'>-"- 	c #FDFDFD",</div><div class='del'>-"; 	c #FBFBFB",</div><div class='del'>-"&gt; 	c #EAE8E3",</div><div class='del'>-", 	c #F3F3F3",</div><div class='del'>-"' 	c #A88D6E",</div><div class='del'>-") 	c #DFD0BF",</div><div class='del'>-"! 	c #5E432B",</div><div class='del'>-"~ 	c #7E6C5B",</div><div class='del'>-"{ 	c #313131",</div><div class='del'>-"] 	c #575757",</div><div class='del'>-"^ 	c #FCFCFC",</div><div class='del'>-"/ 	c #555555",</div><div class='del'>-"( 	c #EEDFCC",</div><div class='del'>-"_ 	c #F4EEE6",</div><div class='del'>-": 	c #765E45",</div><div class='del'>-"&lt; 	c #736251",</div><div class='del'>-"[ 	c #FAFAFA",</div><div class='del'>-"} 	c #7590AE",</div><div class='del'>-"| 	c #C1665A",</div><div class='del'>-"1 	c #445B71",</div><div class='del'>-"2 	c #D7D6D3",</div><div class='del'>-"3 	c #ADADAD",</div><div class='del'>-"4 	c #9B9B9B",</div><div class='del'>-"5 	c #4B6983",</div><div class='del'>-"6 	c #9DB8D2",</div><div class='del'>-"7 	c #486481",</div><div class='del'>-"8 	c #314E6C",</div><div class='del'>-"9 	c #667A8D",</div><div class='del'>-"0 	c #E0E0E0",</div><div class='del'>-"a 	c #BCBCBC",</div><div class='del'>-"b 	c #C5C5C5",</div><div class='del'>-"c 	c #5F7C96",</div><div class='del'>-"d 	c #5D7A95",</div><div class='del'>-"e 	c #4D6B87",</div><div class='del'>-"f 	c #3B556D",</div><div class='del'>-"g 	c #344A60",</div><div class='del'>-"h 	c #47473F",</div><div class='del'>-"i 	c #0A0A09",</div><div class='del'>-"j 	c #4B4B43",</div><div class='del'>-"k 	c #999999",</div><div class='del'>-"l 	c #34342E",</div><div class='del'>-"m 	c #9D9D8D",</div><div class='del'>-"n 	c #CFCFB9",</div><div class='del'>-"o 	c #C4C4AF",</div><div class='del'>-"p 	c #8D8D7F",</div><div class='del'>-"q 	c #353530",</div><div class='del'>-"r 	c #A2A2A2",</div><div class='del'>-"s 	c #D2D2D2",</div><div class='del'>-"t 	c #5D5D5D",</div><div class='del'>-"u 	c #46463F",</div><div class='del'>-"v 	c #9C9C8C",</div><div class='del'>-"w 	c #E2E2D0",</div><div class='del'>-"x 	c #EDEDE7",</div><div class='del'>-"y 	c #C0C0AC",</div><div class='del'>-"z 	c #B2B29F",</div><div class='del'>-"A 	c #828274",</div><div class='del'>-"B 	c #4C4C44",</div><div class='del'>-"C 	c #B9B9B9",</div><div class='del'>-"D 	c #D1CFC8",</div><div class='del'>-"E 	c #090908",</div><div class='del'>-"F 	c #D5D5BF",</div><div class='del'>-"G 	c #FBFBFA",</div><div class='del'>-"H 	c #C3C3AE",</div><div class='del'>-"I 	c #B5B5A2",</div><div class='del'>-"J 	c #A6A695",</div><div class='del'>-"K 	c #959586",</div><div class='del'>-"L 	c #080807",</div><div class='del'>-"M 	c #72706D",</div><div class='del'>-"N 	c #918E85",</div><div class='del'>-"O 	c #090909",</div><div class='del'>-"P 	c #CACAB5",</div><div class='del'>-"Q 	c #DDDDD0",</div><div class='del'>-"R 	c #B7B7A4",</div><div class='del'>-"S 	c #AAAA98",</div><div class='del'>-"T 	c #9B9B8B",</div><div class='del'>-"U 	c #8C8C7D",</div><div class='del'>-"V 	c #474740",</div><div class='del'>-"W 	c #929283",</div><div class='del'>-"X 	c #BABAA7",</div><div class='del'>-"Y 	c #ADAD9B",</div><div class='del'>-"Z 	c #9F9F8E",</div><div class='del'>-"` 	c #909081",</div><div class='del'>-" .	c #727266",</div><div class='del'>-"..	c #4C4C45",</div><div class='del'>-"+.	c #34342F",</div><div class='del'>-"@.	c #878779",</div><div class='del'>-"#.	c #A0A090",</div><div class='del'>-"$.	c #737367",</div><div class='del'>-"%.	c #010101",</div><div class='del'>-"&amp;.	c #414141",</div><div class='del'>-"                                                ",</div><div class='del'>-"                                                ",</div><div class='del'>-"                                                ",</div><div class='del'>-"        . . . . . . . . . . . . . .             ",</div><div class='del'>-"      . + @ @ @ @ @ @ @ @ @ @ @ @ # .           ",</div><div class='del'>-"      . @ $ % &amp; * = @ - @ ; @ @ @ &gt; .           ",</div><div class='del'>-"      . @ , ' ) ! ~ @ { ] ^ / - @ &gt; .           ",</div><div class='del'>-"      . @ , ( _ : &lt; @ @ @ @ @ @ @ &gt; .           ",</div><div class='del'>-"      . @ [ } | 1 2 @ 3 @ 4 3 @ @ &gt; .           ",</div><div class='del'>-"      . @ 5 6 7 8 9 0 3 a b 0 @ @ &gt; .           ",</div><div class='del'>-"      . @ c d e f g h i i j k b @ &gt; .           ",</div><div class='del'>-"      . @ @ @ @ @ l m n o p q r s &gt; .           ",</div><div class='del'>-"      . @ @ t @ u v w x y z A B C D .           ",</div><div class='del'>-"      . # &gt; &gt; &gt; E F G H I J K L M N .           ",</div><div class='del'>-"        . . . . O P Q R S T U i . .             ",</div><div class='del'>-"                V W X Y Z `  ...                ",</div><div class='del'>-"                  +.@.#.W $.%.%.                ",</div><div class='del'>-"                    j i i &amp;.  %.%.              ",</div><div class='del'>-"                              %.%.%.            ",</div><div class='del'>-"                                %.%.%.          ",</div><div class='del'>-"                                  %.%.%.        ",</div><div class='del'>-"                                    %.%.        ",</div><div class='del'>-"                                                ",</div><div class='del'>-"                                                "};</div><div class='head'>diff --git a/art/find_message.xpm b/art/find_message.xpm<br/>deleted file mode 100644<br/>index 04465b4ff8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/find_message.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/find_message.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,130 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * find_message_xpm[] = {</div><div class='del'>-"24 24 103 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #E9E9E9",</div><div class='del'>-"@ 	c #E2E2E2",</div><div class='del'>-"# 	c #D7D7D7",</div><div class='del'>-"$ 	c #FDFDFD",</div><div class='del'>-"% 	c #FCFCFC",</div><div class='del'>-"&amp; 	c #FBFBFB",</div><div class='del'>-"* 	c #D8D8D8",</div><div class='del'>-"= 	c #FEFEFE",</div><div class='del'>-"- 	c #E4E4E4",</div><div class='del'>-"; 	c #BABABA",</div><div class='del'>-"&gt; 	c #E0E0E0",</div><div class='del'>-", 	c #FAFAFA",</div><div class='del'>-"' 	c #F9F9F9",</div><div class='del'>-") 	c #EAEAEA",</div><div class='del'>-"! 	c #F8F8F8",</div><div class='del'>-"~ 	c #CECECE",</div><div class='del'>-"{ 	c #BDBDBD",</div><div class='del'>-"] 	c #E6E6E6",</div><div class='del'>-"^ 	c #E7E7E7",</div><div class='del'>-"/ 	c #FFFFFF",</div><div class='del'>-"( 	c #C2C2C2",</div><div class='del'>-"_ 	c #E5E5E5",</div><div class='del'>-": 	c #47473F",</div><div class='del'>-"&lt; 	c #0A0A09",</div><div class='del'>-"[ 	c #4B4B43",</div><div class='del'>-"} 	c #8E8E8E",</div><div class='del'>-"| 	c #AFAFAF",</div><div class='del'>-"1 	c #34342E",</div><div class='del'>-"2 	c #9D9D8D",</div><div class='del'>-"3 	c #CFCFB9",</div><div class='del'>-"4 	c #C4C4AF",</div><div class='del'>-"5 	c #8D8D7F",</div><div class='del'>-"6 	c #353530",</div><div class='del'>-"7 	c #848484",</div><div class='del'>-"8 	c #BFBFBF",</div><div class='del'>-"9 	c #F7F7F7",</div><div class='del'>-"0 	c #F5F5F5",</div><div class='del'>-"a 	c #46463F",</div><div class='del'>-"b 	c #9C9C8C",</div><div class='del'>-"c 	c #E2E2D0",</div><div class='del'>-"d 	c #EDEDE7",</div><div class='del'>-"e 	c #C0C0AC",</div><div class='del'>-"f 	c #B2B29F",</div><div class='del'>-"g 	c #828274",</div><div class='del'>-"h 	c #45453D",</div><div class='del'>-"i 	c #A7A7A7",</div><div class='del'>-"j 	c #D2D2D2",</div><div class='del'>-"k 	c #D5D5D5",</div><div class='del'>-"l 	c #090908",</div><div class='del'>-"m 	c #D5D5BF",</div><div class='del'>-"n 	c #FBFBFA",</div><div class='del'>-"o 	c #C3C3AE",</div><div class='del'>-"p 	c #B5B5A2",</div><div class='del'>-"q 	c #A6A695",</div><div class='del'>-"r 	c #959586",</div><div class='del'>-"s 	c #080807",</div><div class='del'>-"t 	c #979797",</div><div class='del'>-"u 	c #F4F4F4",</div><div class='del'>-"v 	c #090909",</div><div class='del'>-"w 	c #CACAB5",</div><div class='del'>-"x 	c #DDDDD0",</div><div class='del'>-"y 	c #B7B7A4",</div><div class='del'>-"z 	c #AAAA98",</div><div class='del'>-"A 	c #9B9B8B",</div><div class='del'>-"B 	c #8C8C7D",</div><div class='del'>-"C 	c #929292",</div><div class='del'>-"D 	c #CBCBCB",</div><div class='del'>-"E 	c #D3D3D3",</div><div class='del'>-"F 	c #474740",</div><div class='del'>-"G 	c #929283",</div><div class='del'>-"H 	c #BABAA7",</div><div class='del'>-"I 	c #ADAD9B",</div><div class='del'>-"J 	c #9F9F8E",</div><div class='del'>-"K 	c #909081",</div><div class='del'>-"L 	c #727266",</div><div class='del'>-"M 	c #4C4C45",</div><div class='del'>-"N 	c #A6A6A6",</div><div class='del'>-"O 	c #DFDFDF",</div><div class='del'>-"P 	c #34342F",</div><div class='del'>-"Q 	c #878779",</div><div class='del'>-"R 	c #A0A090",</div><div class='del'>-"S 	c #737367",</div><div class='del'>-"T 	c #010101",</div><div class='del'>-"U 	c #919191",</div><div class='del'>-"V 	c #C1C1C1",</div><div class='del'>-"W 	c #D1D1D1",</div><div class='del'>-"X 	c #414141",</div><div class='del'>-"Y 	c #4B4B4B",</div><div class='del'>-"Z 	c #131313",</div><div class='del'>-"` 	c #646464",</div><div class='del'>-" .	c #8B8B8B",</div><div class='del'>-"..	c #AEAEAE",</div><div class='del'>-"+.	c #5E5E5E",</div><div class='del'>-"@.	c #6E6E6E",</div><div class='del'>-"#.	c #575757",</div><div class='del'>-"$.	c #595959",</div><div class='del'>-"%.	c #585858",</div><div class='del'>-"&amp;.	c #C4C4C4",</div><div class='del'>-"*.	c #DDDDDD",</div><div class='del'>-"=.	c #797979",</div><div class='del'>-"-.	c #2F2F2F",</div><div class='del'>-"                                                ",</div><div class='del'>-"                                                ",</div><div class='del'>-"                      . .                       ",</div><div class='del'>-"                  . . + @ .                     ",</div><div class='del'>-"              . . # $ % &amp; .                     ",</div><div class='del'>-"          . . * = = = = &amp; - .                   ",</div><div class='del'>-"        . ; = = = = &gt; &gt; , ' .   . .             ",</div><div class='del'>-"        . ) = = &gt; &gt; = = = ! . . + @ .           ",</div><div class='del'>-"          . $ = = = = ~ . . # $ % &amp; .           ",</div><div class='del'>-"          . % &amp; = { . . * = = = = &amp; - .         ",</div><div class='del'>-"        . . . , ] . * ^ ^ ^ = &gt; &gt; , ' .         ",</div><div class='del'>-"      . / = . ( _ : &lt; &lt; [ } | ^ = = ! - .       ",</div><div class='del'>-"      . # = = . 1 2 3 4 5 6 7 8 &gt; &gt; 9 0 .       ",</div><div class='del'>-"        . $ = a b c d e f g h i j = = 0 - .     ",</div><div class='del'>-"        . k &amp; l m n o p q r s t j &gt; &gt; 0 u .     ",</div><div class='del'>-"          . , v w x y z A B &lt; C D = = = = - .   ",</div><div class='del'>-"          . E F G H I J K L M N j = = = O O .   ",</div><div class='del'>-"            . ! P Q R G S T T U V ^ O O . .     ",</div><div class='del'>-"            . W = [ &lt; &lt; X Y Z `  .... .         ",</div><div class='del'>-"              . = = &gt; O +.@.#.T $.%.            ",</div><div class='del'>-"              . &amp;.*.. .     =.. T -.            ",</div><div class='del'>-"                . .             T T T           ",</div><div class='del'>-"                                  T T           ",</div><div class='del'>-"                                                "};</div><div class='head'>diff --git a/art/flag-for-followup-16.png b/art/flag-for-followup-16.png<br/>deleted file mode 100644<br/>index c21a388135..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/flag-for-followup-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/flag-for-followup-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/flag-for-followup-48.png b/art/flag-for-followup-48.png<br/>deleted file mode 100644<br/>index 76f5c0b04e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/flag-for-followup-48.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/flag-for-followup-48.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/flag-for-followup.xpm b/art/flag-for-followup.xpm<br/>deleted file mode 100644<br/>index ddb3b37ca9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/flag-for-followup.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/flag-for-followup.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * flag_for_followup_xpm[] = {</div><div class='del'>-"16 16 59 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #282E33",</div><div class='del'>-"@	c #C1D1E0",</div><div class='del'>-"#	c #929EA9",</div><div class='del'>-"$	c #69737C",</div><div class='del'>-"%	c #32404B",</div><div class='del'>-"&amp;	c #363F47",</div><div class='del'>-"*	c #AEC0D1",</div><div class='del'>-"=	c #DAE3EB",</div><div class='del'>-"-	c #C4D4E4",</div><div class='del'>-";	c #6F8498",</div><div class='del'>-"&gt;	c #4D5D6C",</div><div class='del'>-",	c #3F4D5B",</div><div class='del'>-"'	c #3F4952",</div><div class='del'>-")	c #AABBCB",</div><div class='del'>-"!	c #C6D3DE",</div><div class='del'>-"~	c #E4EAF0",</div><div class='del'>-"{	c #C0D0E0",</div><div class='del'>-"]	c #73889C",</div><div class='del'>-"^	c #526271",</div><div class='del'>-"/	c #41505E",</div><div class='del'>-"(	c #56636F",</div><div class='del'>-"_	c #41484E",</div><div class='del'>-":	c #97A9B8",</div><div class='del'>-"&lt;	c #5D7B95",</div><div class='del'>-"[	c #6A87A1",</div><div class='del'>-"}	c #B5C4D2",</div><div class='del'>-"|	c #D8E1E9",</div><div class='del'>-"1	c #CFDBE6",</div><div class='del'>-"2	c #9DB8D2",</div><div class='del'>-"3	c #455461",</div><div class='del'>-"4	c #465665",</div><div class='del'>-"5	c #45515B",</div><div class='del'>-"6	c #30363A",</div><div class='del'>-"7	c #C0B094",</div><div class='del'>-"8	c #4B6983",</div><div class='del'>-"9	c #57758F",</div><div class='del'>-"0	c #64819B",</div><div class='del'>-"a	c #B3C2D0",</div><div class='del'>-"b	c #D2DBE4",</div><div class='del'>-"c	c #DCE4EC",</div><div class='del'>-"d	c #A4BBD1",</div><div class='del'>-"e	c #97A1AB",</div><div class='del'>-"f	c #74797F",</div><div class='del'>-"g	c #727A81",</div><div class='del'>-"h	c #606A74",</div><div class='del'>-"i	c #B39169",</div><div class='del'>-"j	c #516F89",</div><div class='del'>-"k	c #AEBECC",</div><div class='del'>-"l	c #AFBFCE",</div><div class='del'>-"m	c #DCE4EB",</div><div class='del'>-"n	c #7D94A8",</div><div class='del'>-"o	c #BBC8D3",</div><div class='del'>-"p	c #0E0E0E",</div><div class='del'>-"q	c #D7DEE4",</div><div class='del'>-"r	c #040404",</div><div class='del'>-"s	c #9EA4AA",</div><div class='del'>-"t	c #0B0F13",</div><div class='del'>-"       .        ",</div><div class='del'>-"    ...+.       ",</div><div class='del'>-"   .@#$%&amp;.      ",</div><div class='del'>-"  .*=-;&gt;,'..    ",</div><div class='del'>-"  .)!~{]^/(_..  ",</div><div class='del'>-" .:&lt;[}|12;3456. ",</div><div class='del'>-".7.890abcdefgh. ",</div><div class='del'>-" .i.8j&lt;klm....  ",</div><div class='del'>-"  .i.88nop      ",</div><div class='del'>-"   .i.88qr      ",</div><div class='del'>-"    .i.8s.      ",</div><div class='del'>-"     .i.t       ",</div><div class='del'>-"      .i.       ",</div><div class='del'>-"       .i.      ",</div><div class='del'>-"        .i.     ",</div><div class='del'>-"         ..     "};</div><div class='head'>diff --git a/art/folder-copy-16.png b/art/folder-copy-16.png<br/>deleted file mode 100644<br/>index 5c0a3c9dbd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/folder-copy-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/folder-copy-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/folder-move-16.png b/art/folder-move-16.png<br/>deleted file mode 100644<br/>index 4a94499f1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/folder-move-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/folder-move-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/folder-settings.png b/art/folder-settings.png<br/>deleted file mode 100644<br/>index 37a7c86f35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/folder-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/folder-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/folder.xpm b/art/folder.xpm<br/>deleted file mode 100644<br/>index 4ef29bcad7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/folder.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/folder.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * folder_xpm[] = {</div><div class='del'>-"16 16 54 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #E4E5DF",</div><div class='del'>-"@	c #D5D6CB",</div><div class='del'>-"#	c #D6D7CA",</div><div class='del'>-"$	c #A3A39D",</div><div class='del'>-"%	c #F5F6F0",</div><div class='del'>-"&amp;	c #ADB198",</div><div class='del'>-"*	c #C2C6A9",</div><div class='del'>-"=	c #C0C3A7",</div><div class='del'>-"-	c #B4B89D",</div><div class='del'>-";	c #6D705F",</div><div class='del'>-"&gt;	c #EAECDB",</div><div class='del'>-",	c #F6F6F4",</div><div class='del'>-"'	c #EAECDA",</div><div class='del'>-")	c #E8EAD8",</div><div class='del'>-"!	c #E9EBDB",</div><div class='del'>-"~	c #E7E9D6",</div><div class='del'>-"{	c #E6E8D5",</div><div class='del'>-"]	c #E5E8D4",</div><div class='del'>-"^	c #E4E7D2",</div><div class='del'>-"/	c #C7C9B6",</div><div class='del'>-"(	c #F7F7F7",</div><div class='del'>-"_	c #DADEBF",</div><div class='del'>-":	c #DADEBE",</div><div class='del'>-"&lt;	c #D8DCBC",</div><div class='del'>-"[	c #D6DBB9",</div><div class='del'>-"}	c #D5D9B7",</div><div class='del'>-"|	c #D3D7B4",</div><div class='del'>-"1	c #D1D6B2",</div><div class='del'>-"2	c #CFD4AF",</div><div class='del'>-"3	c #CDD2AD",</div><div class='del'>-"4	c #CBD1AA",</div><div class='del'>-"5	c #95997C",</div><div class='del'>-"6	c #F3F3EA",</div><div class='del'>-"7	c #F3F4EA",</div><div class='del'>-"8	c #CACFA8",</div><div class='del'>-"9	c #C8CDA5",</div><div class='del'>-"0	c #929778",</div><div class='del'>-"a	c #F1F3E9",</div><div class='del'>-"b	c #C6CCA3",</div><div class='del'>-"c	c #C4CAA0",</div><div class='del'>-"d	c #8F9474",</div><div class='del'>-"e	c #F0F1E7",</div><div class='del'>-"f	c #C2C89D",</div><div class='del'>-"g	c #C1C79B",</div><div class='del'>-"h	c #8D9270",</div><div class='del'>-"i	c #EFF1E5",</div><div class='del'>-"j	c #BFC598",</div><div class='del'>-"k	c #EBECDE",</div><div class='del'>-"l	c #C9CCB9",</div><div class='del'>-"m	c #919576",</div><div class='del'>-"n	c #8F9372",</div><div class='del'>-"o	c #666951",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"   ....         ",</div><div class='del'>-"  .+@#$.        ",</div><div class='del'>-" .%&amp;*=-;....... ",</div><div class='del'>-" .&gt;,&gt;&gt;')!~~{]^/.",</div><div class='del'>-" .(_:&lt;[}|112345.",</div><div class='del'>-" .6_:&lt;[}|112345.",</div><div class='del'>-" .7&lt;[}|12334890.",</div><div class='del'>-" .a}|1234889bcd.",</div><div class='del'>-" .e123489bbcfgh.",</div><div class='del'>-" .i3489bcffgjjh.",</div><div class='del'>-" .k89bcfgjjjjjh.",</div><div class='del'>-" .l0mdnhhhhhhho.",</div><div class='del'>-"  ............. ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/font.png b/art/font.png<br/>deleted file mode 100644<br/>index 8c5e8ee2a7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/font.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/font.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/forget_passwords.xpm b/art/forget_passwords.xpm<br/>deleted file mode 100644<br/>index a121300716..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/forget_passwords.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/forget_passwords.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,125 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * forget_passwords_xpm[] = {</div><div class='del'>-"16 16 106 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #010101",</div><div class='del'>-"+ 	c #C0B09D",</div><div class='del'>-"@ 	c #FEC6BC",</div><div class='del'>-"# 	c #FFCDB4",</div><div class='del'>-"$ 	c #C2A887",</div><div class='del'>-"% 	c #DCB9A8",</div><div class='del'>-"&amp; 	c #AF843A",</div><div class='del'>-"* 	c #755C5C",</div><div class='del'>-"= 	c #655E37",</div><div class='del'>-"- 	c #DBBCAE",</div><div class='del'>-"; 	c #FFC4B8",</div><div class='del'>-"&gt; 	c #FFCDBC",</div><div class='del'>-", 	c #DDBCA3",</div><div class='del'>-"' 	c #DBBEB5",</div><div class='del'>-") 	c #B9933A",</div><div class='del'>-"! 	c #D3AF84",</div><div class='del'>-"~ 	c #BE933A",</div><div class='del'>-"{ 	c #CDA86F",</div><div class='del'>-"] 	c #A3753F",</div><div class='del'>-"^ 	c #554F2E",</div><div class='del'>-"/ 	c #FFC5A3",</div><div class='del'>-"( 	c #FFFFE3",</div><div class='del'>-"_ 	c #D4B584",</div><div class='del'>-": 	c #DCBEB5",</div><div class='del'>-"&lt; 	c #CDAE95",</div><div class='del'>-"[ 	c #E6BAA8",</div><div class='del'>-"} 	c #BDA897",</div><div class='del'>-"| 	c #CCA871",</div><div class='del'>-"1 	c #B9841D",</div><div class='del'>-"2 	c #CCAF95",</div><div class='del'>-"3 	c #A8753F",</div><div class='del'>-"4 	c #C4B29C",</div><div class='del'>-"5 	c #E3B89E",</div><div class='del'>-"6 	c #E6BEA8",</div><div class='del'>-"7 	c #C89E58",</div><div class='del'>-"8 	c #DCB5A0",</div><div class='del'>-"9 	c #B5841D",</div><div class='del'>-"0 	c #E6B593",</div><div class='del'>-"a 	c #BA9E58",</div><div class='del'>-"b 	c #B4841D",</div><div class='del'>-"c 	c #C79E58",</div><div class='del'>-"d 	c #3B250B",</div><div class='del'>-"e 	c #FFE5BE",</div><div class='del'>-"f 	c #F2C7B2",</div><div class='del'>-"g 	c #F3BE9E",</div><div class='del'>-"h 	c #C7B5A9",</div><div class='del'>-"i 	c #F3C8B9",</div><div class='del'>-"j 	c #C29E58",</div><div class='del'>-"k 	c #E6C2AE",</div><div class='del'>-"l 	c #BBAAB1",</div><div class='del'>-"m 	c #C7A887",</div><div class='del'>-"n 	c #BE9E58",</div><div class='del'>-"o 	c #6D572C",</div><div class='del'>-"p 	c #CDB6AC",</div><div class='del'>-"q 	c #E6BE9E",</div><div class='del'>-"r 	c #C7AE95",</div><div class='del'>-"s 	c #E6C3B5",</div><div class='del'>-"t 	c #DCB593",</div><div class='del'>-"u 	c #B9A073",</div><div class='del'>-"v 	c #CAA49D",</div><div class='del'>-"w 	c #AE841D",</div><div class='del'>-"x 	c #A6781B",</div><div class='del'>-"y 	c #BA8E51",</div><div class='del'>-"z 	c #B1813F",</div><div class='del'>-"A 	c #C6A871",</div><div class='del'>-"B 	c #DCBEAF",</div><div class='del'>-"C 	c #E6BEB5",</div><div class='del'>-"D 	c #D4B0AE",</div><div class='del'>-"E 	c #BDA058",</div><div class='del'>-"F 	c #AC761B",</div><div class='del'>-"G 	c #A77D3F",</div><div class='del'>-"H 	c #A06422",</div><div class='del'>-"I 	c #B59358",</div><div class='del'>-"J 	c #BDA187",</div><div class='del'>-"K 	c #D3B5A0",</div><div class='del'>-"L 	c #BD933A",</div><div class='del'>-"M 	c #B09960",</div><div class='del'>-"N 	c #BD9D60",</div><div class='del'>-"O 	c #AC8131",</div><div class='del'>-"P 	c #935511",</div><div class='del'>-"Q 	c #753F20",</div><div class='del'>-"R 	c #753D1D",</div><div class='del'>-"S 	c #D4AE84",</div><div class='del'>-"T 	c #B09264",</div><div class='del'>-"U 	c #BDA475",</div><div class='del'>-"V 	c #B48431",</div><div class='del'>-"W 	c #B08431",</div><div class='del'>-"X 	c #A86813",</div><div class='del'>-"Y 	c #975C16",</div><div class='del'>-"Z 	c #A06413",</div><div class='del'>-"` 	c #5C3D1D",</div><div class='del'>-" .	c #A46A36",</div><div class='del'>-"..	c #903801",</div><div class='del'>-"+.	c #953D1D",</div><div class='del'>-"@.	c #751801",</div><div class='del'>-"#.	c #681601",</div><div class='del'>-"$.	c #844116",</div><div class='del'>-"%.	c #1D0101",</div><div class='del'>-"&amp;.	c #A0581D",</div><div class='del'>-"*.	c #933A01",</div><div class='del'>-"=.	c #A67531",</div><div class='del'>-"-.	c #87581D",</div><div class='del'>-";.	c #A86F1D",</div><div class='del'>-"&gt;.	c #A1713A",</div><div class='del'>-",.	c #B09358",</div><div class='del'>-"                                ",</div><div class='del'>-"          . . . . . .           ",</div><div class='del'>-"      . . + @ # $ % &amp; * .       ",</div><div class='del'>-"    = - ; &gt; , ' ) ! ~ { ] .     ",</div><div class='del'>-"  ^ / ( _ : &lt; [ } | 1 2 ) 3 .   ",</div><div class='del'>-". 4 5 6 7 : 8 9 0 a 2 b c ~ d   ",</div><div class='del'>-". e f g h i j k l m $ &lt; n 1 o . ",</div><div class='del'>-". p q r s t b u v 2 c w c x y . ",</div><div class='del'>-"  . z A B 1 ) C D $ E j F G H . ",</div><div class='del'>-"    . I ~ J K L M 2 ~ N O P Q . ",</div><div class='del'>-"      . . R S T U V W X Y Z .   ",</div><div class='del'>-"            `  ...+.@.#.$..     ",</div><div class='del'>-"              . %.&amp;.*.=.        ",</div><div class='del'>-"                . -.;.&gt;.        ",</div><div class='del'>-"                  . ` ,..       ",</div><div class='del'>-"                    . . .       "};</div><div class='head'>diff --git a/art/forward.png b/art/forward.png<br/>deleted file mode 100644<br/>index bbce8ad3c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/forward.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/forward.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/forward.xpm b/art/forward.xpm<br/>deleted file mode 100644<br/>index fcb25802a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/forward.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/forward.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * forward_xpm[] = {</div><div class='del'>-"16 16 32 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #FFFFFF",</div><div class='del'>-"&amp;	c #5D5B57",</div><div class='del'>-"*	c #868580",</div><div class='del'>-"=	c #E5E2DB",</div><div class='del'>-"-	c #FBFBF8",</div><div class='del'>-";	c #716E6B",</div><div class='del'>-"&gt;	c #62605C",</div><div class='del'>-",	c #F8F7F2",</div><div class='del'>-"'	c #DDDAD4",</div><div class='del'>-")	c #000000",</div><div class='del'>-"!	c #FBFAF7",</div><div class='del'>-"~	c #A5A29D",</div><div class='del'>-"{	c #797873",</div><div class='del'>-"]	c #BBC2CC",</div><div class='del'>-"^	c #576E87",</div><div class='del'>-"/	c #EFEFEF",</div><div class='del'>-"(	c #CCCCCC",</div><div class='del'>-"_	c #7D7A77",</div><div class='del'>-":	c #F7F5F1",</div><div class='del'>-"&lt;	c #FAF9F6",</div><div class='del'>-"[	c #314E6C",</div><div class='del'>-"}	c #090808",</div><div class='del'>-"|	c #D7D4CE",</div><div class='del'>-"1	c #D8D5CF",</div><div class='del'>-"2	c #181818",</div><div class='del'>-"3	c #090909",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  .+.........   ",</div><div class='del'>-" .@#########$.  ",</div><div class='del'>-" .%&amp;%%%%%%%*=.  ",</div><div class='del'>-" .%-;%%%%%&gt;,'.  ",</div><div class='del'>-" .%--;%)))))))))",</div><div class='del'>-" .%-!~;)%%%%%%%)",</div><div class='del'>-" .%!{--)%]^///()",</div><div class='del'>-" .%_-:&lt;)%^[[/[()",</div><div class='del'>-" .}|111)%/[[[[()",</div><div class='del'>-"  .....)%//[[[()",</div><div class='del'>-"       )%/[[[[()",</div><div class='del'>-"       )%((((((2",</div><div class='del'>-"       ))3))))))"};</div><div class='head'>diff --git a/art/globe.png b/art/globe.png<br/>deleted file mode 100644<br/>index 84bebd7e9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/globe.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/globe.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/goto-16.png b/art/goto-16.png<br/>deleted file mode 100644<br/>index 800db10e41..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/goto-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/goto-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/goto-24.png b/art/goto-24.png<br/>deleted file mode 100644<br/>index b6fc82fd73..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/goto-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/goto-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/hand-16.xpm b/art/hand-16.xpm<br/>deleted file mode 100644<br/>index d925e2d968..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/hand-16.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/hand-16.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,115 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * hand_16_xpm[] = {</div><div class='del'>-"16 16 96 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #010100",</div><div class='del'>-"+ 	c #010000",</div><div class='del'>-"@ 	c #090600",</div><div class='del'>-"# 	c #030000",</div><div class='del'>-"$ 	c #E8E6E1",</div><div class='del'>-"% 	c #A3A09C",</div><div class='del'>-"&amp; 	c #080000",</div><div class='del'>-"* 	c #D6D2CD",</div><div class='del'>-"= 	c #8F8A84",</div><div class='del'>-"- 	c #FFFAF7",</div><div class='del'>-"; 	c #98938D",</div><div class='del'>-"&gt; 	c #F1EDE9",</div><div class='del'>-", 	c #88827E",</div><div class='del'>-"' 	c #181510",</div><div class='del'>-") 	c #F8EEE4",</div><div class='del'>-"! 	c #F8ECE0",</div><div class='del'>-"~ 	c #F8ECDE",</div><div class='del'>-"{ 	c #0D0600",</div><div class='del'>-"] 	c #F8EBDE",</div><div class='del'>-"^ 	c #F6E7D7",</div><div class='del'>-"/ 	c #D5C5B6",</div><div class='del'>-"( 	c #070000",</div><div class='del'>-"_ 	c #F6E5D3",</div><div class='del'>-": 	c #F7E9D9",</div><div class='del'>-"&lt; 	c #050200",</div><div class='del'>-"[ 	c #080300",</div><div class='del'>-"} 	c #312722",</div><div class='del'>-"| 	c #EFE7E0",</div><div class='del'>-"1 	c #F6F2EF",</div><div class='del'>-"2 	c #F6F1EE",</div><div class='del'>-"3 	c #EDE4DB",</div><div class='del'>-"4 	c #F1E4D6",</div><div class='del'>-"5 	c #9D9790",</div><div class='del'>-"6 	c #12110D",</div><div class='del'>-"7 	c #958E88",</div><div class='del'>-"8 	c #DDCFC2",</div><div class='del'>-"9 	c #F6E8D9",</div><div class='del'>-"0 	c #F6F1EC",</div><div class='del'>-"a 	c #F5F1EE",</div><div class='del'>-"b 	c #E5D7CB",</div><div class='del'>-"c 	c #F7E8D8",</div><div class='del'>-"d 	c #EEDFD3",</div><div class='del'>-"e 	c #CAC0B6",</div><div class='del'>-"f 	c #645951",</div><div class='del'>-"g 	c #E7D9CA",</div><div class='del'>-"h 	c #F6E6D5",</div><div class='del'>-"i 	c #F7EBDE",</div><div class='del'>-"j 	c #E9DCD2",</div><div class='del'>-"k 	c #040000",</div><div class='del'>-"l 	c #F7EFE7",</div><div class='del'>-"m 	c #EDDECF",</div><div class='del'>-"n 	c #D6C8BA",</div><div class='del'>-"o 	c #CBB9AC",</div><div class='del'>-"p 	c #D2C8BC",</div><div class='del'>-"q 	c #F8EEE3",</div><div class='del'>-"r 	c #F5EEE8",</div><div class='del'>-"s 	c #EFE3D7",</div><div class='del'>-"t 	c #B8A99D",</div><div class='del'>-"u 	c #060100",</div><div class='del'>-"v 	c #D7CFC7",</div><div class='del'>-"w 	c #F9F2E9",</div><div class='del'>-"x 	c #F3E3D4",</div><div class='del'>-"y 	c #F1DFCF",</div><div class='del'>-"z 	c #E6D7C7",</div><div class='del'>-"A 	c #F8F2ED",</div><div class='del'>-"B 	c #EDE1D4",</div><div class='del'>-"C 	c #0A0300",</div><div class='del'>-"D 	c #D7CFC9",</div><div class='del'>-"E 	c #FAF2EC",</div><div class='del'>-"F 	c #F1E0D1",</div><div class='del'>-"G 	c #F6EEE8",</div><div class='del'>-"H 	c #000000",</div><div class='del'>-"I 	c #171111",</div><div class='del'>-"J 	c #A79D9D",</div><div class='del'>-"K 	c #C8BDBC",</div><div class='del'>-"L 	c #A59D9A",</div><div class='del'>-"M 	c #ABA8A3",</div><div class='del'>-"N 	c #BFB7B5",</div><div class='del'>-"O 	c #060000",</div><div class='del'>-"P 	c #0E0403",</div><div class='del'>-"Q 	c #0A0000",</div><div class='del'>-"R 	c #0A0200",</div><div class='del'>-"S 	c #080401",</div><div class='del'>-"T 	c #FCF4F2",</div><div class='del'>-"U 	c #F9F1EF",</div><div class='del'>-"V 	c #F8F0EE",</div><div class='del'>-"W 	c #F2EDEA",</div><div class='del'>-"X 	c #DDD9D6",</div><div class='del'>-"Y 	c #E5E4E0",</div><div class='del'>-"Z 	c #030400",</div><div class='del'>-"` 	c #0B0505",</div><div class='del'>-" .	c #050000",</div><div class='del'>-"..	c #14100F",</div><div class='del'>-"+.	c #090806",</div><div class='del'>-"@.	c #000100",</div><div class='del'>-"              . +               ",</div><div class='del'>-"          @ # $ % + +           ",</div><div class='del'>-"        &amp; * = - ; &gt; , '         ",</div><div class='del'>-"        &amp; ) ; ! ; ~ ; {         ",</div><div class='del'>-"        &amp; ] ; ^ ; ] ; / (       ",</div><div class='del'>-"        &amp; _ ; _ ; : ; / (       ",</div><div class='del'>-"    &lt; [ } | 1 2 3 4 5 / (       ",</div><div class='del'>-"  6 _ 7 &amp; 8 _ 9 0 a b / (       ",</div><div class='del'>-"  + c d e f g h _ i j / (       ",</div><div class='del'>-"    k l m n o p q r s t (       ",</div><div class='del'>-"    u v w x y z A B _ t (       ",</div><div class='del'>-"      C D E _ F G _ / H         ",</div><div class='del'>-"        I J K _ _ L M &amp;         ",</div><div class='del'>-"        N O P Q R k S           ",</div><div class='del'>-"        k T U V W X Y Z         ",</div><div class='del'>-"        k `  ...# +.H @.        "};</div><div class='head'>diff --git a/art/hide_deleted_messages.xpm b/art/hide_deleted_messages.xpm<br/>deleted file mode 100644<br/>index 189d8d350e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/hide_deleted_messages.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/hide_deleted_messages.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * hide_deleted_messages_xpm[] = {</div><div class='del'>-"16 16 20 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #828282",</div><div class='del'>-"+	c #A0A0A0",</div><div class='del'>-"@	c #AAAAAA",</div><div class='del'>-"#	c #898989",</div><div class='del'>-"$	c #9A9A9A",</div><div class='del'>-"%	c #8F8F8F",</div><div class='del'>-"&amp;	c #A9A9A9",</div><div class='del'>-"*	c #A5A5A5",</div><div class='del'>-"=	c #959595",</div><div class='del'>-"-	c #A8A8A8",</div><div class='del'>-";	c #AEAEAE",</div><div class='del'>-"&gt;	c #B1B1B1",</div><div class='del'>-",	c #B3B3B3",</div><div class='del'>-"'	c #9B9B9B",</div><div class='del'>-")	c #DF421E",</div><div class='del'>-"!	c #000000",</div><div class='del'>-"~	c #B7B7B7",</div><div class='del'>-"{	c #ADADAD",</div><div class='del'>-"]	c #AFAFAF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-" .. .+.@#$..    ",</div><div class='del'>-" .. ..%&amp;$*=$    ",</div><div class='del'>-" .. .@.-;$#&gt;    ",</div><div class='del'>-"                ",</div><div class='del'>-" .%.; .%, '.  ) ",</div><div class='del'>-"!!!!!!!!!!!!! ))",</div><div class='del'>-" .~$. ... ..  ) ",</div><div class='del'>-"                ",</div><div class='del'>-" .+ .+.'% .+    ",</div><div class='del'>-" .{ .#%.] '&amp;    ",</div><div class='del'>-" .' .$;.% ..    ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/hide_read_messages.xpm b/art/hide_read_messages.xpm<br/>deleted file mode 100644<br/>index 8df1313651..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/hide_read_messages.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/hide_read_messages.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * hide_read_messages_xpm[] = {</div><div class='del'>-"16 16 4 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #DF421E",</div><div class='del'>-"@	c #828282",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  .. .......    ",</div><div class='del'>-"              + ",</div><div class='del'>-"  @ @@@ @@ @  ++",</div><div class='del'>-"              + ",</div><div class='del'>-"  ... .. ...    ",</div><div class='del'>-"                ",</div><div class='del'>-"  ... . ....    ",</div><div class='del'>-"              + ",</div><div class='del'>-"  @@ @@@ @@@  ++",</div><div class='del'>-"              + ",</div><div class='del'>-"  . ... ....    ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/hide_selected_messages.xpm b/art/hide_selected_messages.xpm<br/>deleted file mode 100644<br/>index cb1989b84c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/hide_selected_messages.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/hide_selected_messages.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * hide_selected_messages_xpm[] = {</div><div class='del'>-"16 16 14 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #4B6983",</div><div class='del'>-"+	c #DF421E",</div><div class='del'>-"@	c #FFFFFF",</div><div class='del'>-"#	c #798FA2",</div><div class='del'>-"$	c #BEC8D0",</div><div class='del'>-"%	c #F1F3F5",</div><div class='del'>-"&amp;	c #CDD5DC",</div><div class='del'>-"*	c #A9B6C2",</div><div class='del'>-"=	c #000000",</div><div class='del'>-"-	c #647E94",</div><div class='del'>-";	c #A2B1BE",</div><div class='del'>-"&gt;	c #E4E8EC",</div><div class='del'>-",	c #D8DEE4",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-" ............ + ",</div><div class='del'>-" .@#$%%#@&amp;*%. ++",</div><div class='del'>-" ............ + ",</div><div class='del'>-"                ",</div><div class='del'>-"  === == ===    ",</div><div class='del'>-"                ",</div><div class='del'>-"  === = ====    ",</div><div class='del'>-"                ",</div><div class='del'>-" ............ + ",</div><div class='del'>-" .@%-@&amp;@;&gt;,%. ++",</div><div class='del'>-" ............ + ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/house.png b/art/house.png<br/>deleted file mode 100644<br/>index df43ec6181..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/house.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/house.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ico-calendar.png b/art/ico-calendar.png<br/>deleted file mode 100644<br/>index 3010528d7f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ico-calendar.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ico-calendar.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ico-mail.png b/art/ico-mail.png<br/>deleted file mode 100644<br/>index 66a4ba89cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ico-mail.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ico-mail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ico-rdf.png b/art/ico-rdf.png<br/>deleted file mode 100644<br/>index 0e39037b95..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ico-rdf.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ico-rdf.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ico-weather.png b/art/ico-weather.png<br/>deleted file mode 100644<br/>index 25eb161f8c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ico-weather.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ico-weather.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/imap-16.png b/art/imap-16.png<br/>deleted file mode 100644<br/>index 1e2932a728..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/imap-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/imap-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/import.png b/art/import.png<br/>deleted file mode 100644<br/>index 151b60a270..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/import.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/import.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/import.xpm b/art/import.xpm<br/>deleted file mode 100644<br/>index a996072772..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/import.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/import.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_import_xpm[] = {</div><div class='del'>-"16 16 40 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #A50B05",</div><div class='del'>-"@	c #A1A1A1",</div><div class='del'>-"#	c #FFFFFF",</div><div class='del'>-"$	c #A7A7A7",</div><div class='del'>-"%	c #980000",</div><div class='del'>-"&amp;	c #DBDBDB",</div><div class='del'>-"*	c #9B9B9B",</div><div class='del'>-"=	c #9C9C9C",</div><div class='del'>-"-	c #E4E4E4",</div><div class='del'>-";	c #9F0502",</div><div class='del'>-"&gt;	c #A90F07",</div><div class='del'>-",	c #D23618",</div><div class='del'>-"'	c #AEAEAE",</div><div class='del'>-")	c #A3A3A3",</div><div class='del'>-"!	c #D83C1B",</div><div class='del'>-"~	c #E46243",</div><div class='del'>-"{	c #E87E64",</div><div class='del'>-"]	c #2C2C2C",</div><div class='del'>-"^	c #9E8754",</div><div class='del'>-"/	c #6B5B39",</div><div class='del'>-"(	c #826E46",</div><div class='del'>-"_	c #9E8655",</div><div class='del'>-":	c #BFA367",</div><div class='del'>-"&lt;	c #DCCBA3",</div><div class='del'>-"[	c #99804F",</div><div class='del'>-"}	c #D8C7A2",</div><div class='del'>-"|	c #F0DBAC",</div><div class='del'>-"1	c #E4D3AF",</div><div class='del'>-"2	c #76520D",</div><div class='del'>-"3	c #865F10",</div><div class='del'>-"4	c #E1BB65",</div><div class='del'>-"5	c #D1940C",</div><div class='del'>-"6	c #906612",</div><div class='del'>-"7	c #7D5C14",</div><div class='del'>-"8	c #CF920B",</div><div class='del'>-"9	c #714F0C",</div><div class='del'>-"0	c #E2BE6C",</div><div class='del'>-"a	c #7B560E",</div><div class='del'>-".......  +      ",</div><div class='del'>-".@###$. %+      ",</div><div class='del'>-".&amp;*#=-.%;&gt;,,    ",</div><div class='del'>-".'-$-). ++ !    ",</div><div class='del'>-".......  + ~    ",</div><div class='del'>-"           {    ",</div><div class='del'>-"                ",</div><div class='del'>-"       ......]. ",</div><div class='del'>-"      .^/(_:&lt;[. ",</div><div class='del'>-"     .}||||123. ",</div><div class='del'>-"     .45555567. ",</div><div class='del'>-"     .45555567. ",</div><div class='del'>-"     .45555567. ",</div><div class='del'>-"     .45585569. ",</div><div class='del'>-"     .055555a.  ",</div><div class='del'>-"     ........   "};</div><div class='head'>diff --git a/art/inbox-16.png b/art/inbox-16.png<br/>deleted file mode 100644<br/>index 88071fa91e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/inbox-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/inbox-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/inbox-full-16.png b/art/inbox-full-16.png<br/>deleted file mode 100644<br/>index 289335eaa2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/inbox-full-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/inbox-full-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/insert-image-24.png b/art/insert-image-24.png<br/>deleted file mode 100644<br/>index 4b2fd4ffae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/insert-image-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/insert-image-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/insert-link-24.png b/art/insert-link-24.png<br/>deleted file mode 100644<br/>index 9824bc8ae6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/insert-link-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/insert-link-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/insert-table-24.png b/art/insert-table-24.png<br/>deleted file mode 100644<br/>index 21344caea6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/insert-table-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/insert-table-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/jump.xpm b/art/jump.xpm<br/>deleted file mode 100644<br/>index d974142d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/jump.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/jump.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * jump_xpm[] = {</div><div class='del'>-"16 8 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFF00",</div><div class='del'>-"................",</div><div class='del'>-".++++++++++++++.",</div><div class='del'>-".++++++++++++++.",</div><div class='del'>-".++..++..++..++.",</div><div class='del'>-".++..++..++..++.",</div><div class='del'>-".++++++++++++++.",</div><div class='del'>-".++++++++++++++.",</div><div class='del'>-"................"};</div><div class='head'>diff --git a/art/ldap-mini.png b/art/ldap-mini.png<br/>deleted file mode 100644<br/>index 85c4dc0cf7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ldap-mini.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ldap-mini.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ldap-settings.png b/art/ldap-settings.png<br/>deleted file mode 100644<br/>index 6a2bcff352..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ldap-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ldap-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/ldap.png b/art/ldap.png<br/>deleted file mode 100644<br/>index 5ff8180b35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/ldap.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/ldap.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/local-16.png b/art/local-16.png<br/>deleted file mode 100644<br/>index 1fc929bbf7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/local-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/local-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-accounts-settings.png b/art/mail-accounts-settings.png<br/>deleted file mode 100644<br/>index 565b1b300a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-accounts-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-accounts-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid-48.png b/art/mail-config-druid-48.png<br/>deleted file mode 100644<br/>index 35b452b4e9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid-48.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid-48.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid-account-name.png b/art/mail-config-druid-account-name.png<br/>deleted file mode 100644<br/>index 2cad5eb941..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid-account-name.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid-account-name.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid-identity.png b/art/mail-config-druid-identity.png<br/>deleted file mode 100644<br/>index f895a1e168..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid-identity.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid-identity.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid-receive.png b/art/mail-config-druid-receive.png<br/>deleted file mode 100644<br/>index df75812db3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid-receive.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid-receive.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid-send.png b/art/mail-config-druid-send.png<br/>deleted file mode 100644<br/>index 1bf501ddb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid-send.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid-send.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-config-druid.png b/art/mail-config-druid.png<br/>deleted file mode 100644<br/>index 35b452b4e9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-config-druid.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-config-druid.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mail-need-reply.xpm b/art/mail-need-reply.xpm<br/>deleted file mode 100644<br/>index 283ef3d83f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-need-reply.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-need-reply.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * mail_need_reply_xpm[] = {</div><div class='del'>-"16 16 82 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #2A2A2A",</div><div class='del'>-"+	c #AAAAAA",</div><div class='del'>-"@	c #A2A2A2",</div><div class='del'>-"#	c #949494",</div><div class='del'>-"$	c #E4E4E4",</div><div class='del'>-"%	c #F6F6F6",</div><div class='del'>-"&amp;	c #F7F7F7",</div><div class='del'>-"*	c #F8F8F8",</div><div class='del'>-"=	c #E5E5E5",</div><div class='del'>-"-	c #898989",</div><div class='del'>-";	c #7A7A7A",</div><div class='del'>-"&gt;	c #DADADA",</div><div class='del'>-",	c #F5F5F5",</div><div class='del'>-"'	c #818181",</div><div class='del'>-")	c #B1B1B1",</div><div class='del'>-"!	c #858585",</div><div class='del'>-"~	c #EDEDED",</div><div class='del'>-"{	c #8E8E8E",</div><div class='del'>-"]	c #E1E1E1",</div><div class='del'>-"^	c #E2E2E2",</div><div class='del'>-"/	c #7F7F7F",</div><div class='del'>-"(	c #B7B7B7",</div><div class='del'>-"_	c #E0E0E0",</div><div class='del'>-":	c #BEBEBE",</div><div class='del'>-"&lt;	c #737373",</div><div class='del'>-"[	c #848484",</div><div class='del'>-"}	c #E8E8E8",</div><div class='del'>-"|	c #DBDBDB",</div><div class='del'>-"1	c #363636",</div><div class='del'>-"2	c #9C9C9C",</div><div class='del'>-"3	c #C9C9C9",</div><div class='del'>-"4	c #919191",</div><div class='del'>-"5	c #B4B4B4",</div><div class='del'>-"6	c #AFAFAF",</div><div class='del'>-"7	c #C3C3C3",</div><div class='del'>-"8	c #6F635C",</div><div class='del'>-"9	c #372B24",</div><div class='del'>-"0	c #EBEBEB",</div><div class='del'>-"a	c #F1F1F1",</div><div class='del'>-"b	c #D7D7D7",</div><div class='del'>-"c	c #C7C7C7",</div><div class='del'>-"d	c #E9E9E9",</div><div class='del'>-"e	c #F3F3F3",</div><div class='del'>-"f	c #BDBDBD",</div><div class='del'>-"g	c #CDCDCD",</div><div class='del'>-"h	c #372E28",</div><div class='del'>-"i	c #F6B893",</div><div class='del'>-"j	c #88634D",</div><div class='del'>-"k	c #534339",</div><div class='del'>-"l	c #2C211A",</div><div class='del'>-"m	c #8F8F8F",</div><div class='del'>-"n	c #A8A8A8",</div><div class='del'>-"o	c #6F6F6F",</div><div class='del'>-"p	c #473B34",</div><div class='del'>-"q	c #DBA585",</div><div class='del'>-"r	c #F4A677",</div><div class='del'>-"s	c #F5AD82",</div><div class='del'>-"t	c #F5B189",</div><div class='del'>-"u	c #72503C",</div><div class='del'>-"v	c #3F3F3F",</div><div class='del'>-"w	c #1C1C1C",</div><div class='del'>-"x	c #2B1E15",</div><div class='del'>-"y	c #DC976F",</div><div class='del'>-"z	c #DA8A5B",</div><div class='del'>-"A	c #583725",</div><div class='del'>-"B	c #984816",</div><div class='del'>-"C	c #A75223",</div><div class='del'>-"D	c #43210E",</div><div class='del'>-"E	c #261102",</div><div class='del'>-"F	c #853F12",</div><div class='del'>-"G	c #A55123",</div><div class='del'>-"H	c #9C4C20",</div><div class='del'>-"I	c #984B20",</div><div class='del'>-"J	c #42200E",</div><div class='del'>-"K	c #853E12",</div><div class='del'>-"L	c #4A240E",</div><div class='del'>-"M	c #291408",</div><div class='del'>-"N	c #160A04",</div><div class='del'>-"O	c #200E01",</div><div class='del'>-"P	c #180B01",</div><div class='del'>-"Q	c #000000",</div><div class='del'>-"                ",</div><div class='del'>-"   .++++++++++. ",</div><div class='del'>-"   @#$%&amp;**%&amp;=-; ",</div><div class='del'>-"   +&gt;#,,,,,,')! ",</div><div class='del'>-"   +*~{],,^/(_! ",</div><div class='del'>-"   +*,:&lt;,,;[]}! ",</div><div class='del'>-"   +|1234-567}! ",</div><div class='del'>-"   +890abcdefg! ",</div><div class='del'>-"   hijkklmbbbno ",</div><div class='del'>-"  pqrsttu.vvvvw ",</div><div class='del'>-" xyzzzzzA       ",</div><div class='del'>-" xBCCCCCD       ",</div><div class='del'>-"  EFGHIIJ       ",</div><div class='del'>-"   EKLMMN       ",</div><div class='del'>-"    OP          ",</div><div class='del'>-"     Q          "};</div><div class='head'>diff --git a/art/mail-new.xpm b/art/mail-new.xpm<br/>deleted file mode 100644<br/>index 767ec6366f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-new.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-new.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * mail_new_xpm[] = {</div><div class='del'>-"16 16 48 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #202020",</div><div class='del'>-"@	c #817968",</div><div class='del'>-"#	c #F5F5F5",</div><div class='del'>-"$	c #4D493C",</div><div class='del'>-"%	c #736C5C",</div><div class='del'>-"&amp;	c #F5EEEE",</div><div class='del'>-"*	c #FFEDC7",</div><div class='del'>-"=	c #FAF3EC",</div><div class='del'>-"-	c #FCE6B5",</div><div class='del'>-";	c #60594D",</div><div class='del'>-"&gt;	c #D3C29E",</div><div class='del'>-",	c #746D5D",</div><div class='del'>-"'	c #F5F1F1",</div><div class='del'>-")	c #FDEECD",</div><div class='del'>-"!	c #F8F4ED",</div><div class='del'>-"~	c #FAE3B3",</div><div class='del'>-"{	c #645F4F",</div><div class='del'>-"]	c #C9BA98",</div><div class='del'>-"^	c #71685A",</div><div class='del'>-"/	c #FCF5EA",</div><div class='del'>-"(	c #FFE8B7",</div><div class='del'>-"_	c #F5DEB2",</div><div class='del'>-":	c #FFEABD",</div><div class='del'>-"&lt;	c #90856F",</div><div class='del'>-"[	c #7C7361",</div><div class='del'>-"}	c #E4D1A9",</div><div class='del'>-"|	c #C9B996",</div><div class='del'>-"1	c #FFEBC2",</div><div class='del'>-"2	c #887F6B",</div><div class='del'>-"3	c #726B59",</div><div class='del'>-"4	c #D1BF9C",</div><div class='del'>-"5	c #8B816C",</div><div class='del'>-"6	c #FFE9BA",</div><div class='del'>-"7	c #F9E2B2",</div><div class='del'>-"8	c #FFE8B8",</div><div class='del'>-"9	c #F6DFB3",</div><div class='del'>-"0	c #D4C19D",</div><div class='del'>-"a	c #534D42",</div><div class='del'>-"b	c #CFBF9C",</div><div class='del'>-"c	c #645F51",</div><div class='del'>-"d	c #C2B293",</div><div class='del'>-"e	c #C4B393",</div><div class='del'>-"f	c #C4B495",</div><div class='del'>-"g	c #C5B596",</div><div class='del'>-"h	c #CCBC99",</div><div class='del'>-"i	c #4C483D",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  .+.........   ",</div><div class='del'>-" .@#########$.  ",</div><div class='del'>-" .#%&amp;*#*=*-;&gt;.  ",</div><div class='del'>-" .#*,')!*~{~].  ",</div><div class='del'>-" .#**^/*({*_].  ",</div><div class='del'>-" .#*:&lt;{#{[-}|.  ",</div><div class='del'>-" .#12**{((34|.  ",</div><div class='del'>-" .#5*_67890ab.  ",</div><div class='del'>-" .cdeeedffghi.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/mail-read.xpm b/art/mail-read.xpm<br/>deleted file mode 100644<br/>index b4e3160ab4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-read.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-read.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * mail_read_xpm[] = {</div><div class='del'>-"16 16 51 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #D9D6D0",</div><div class='del'>-"@	c #C3C0B9",</div><div class='del'>-"#	c #EFEDE8",</div><div class='del'>-"$	c #F7F7F6",</div><div class='del'>-"%	c #FAFAFA",</div><div class='del'>-"&amp;	c #B6B4AE",</div><div class='del'>-"*	c #737373",</div><div class='del'>-"=	c #C2BFB8",</div><div class='del'>-"-	c #F5F4F2",</div><div class='del'>-";	c #FAFAF9",</div><div class='del'>-"&gt;	c #FFFFFF",</div><div class='del'>-",	c #D2CFC9",</div><div class='del'>-"'	c #707070",</div><div class='del'>-")	c #5D5B57",</div><div class='del'>-"!	c #868580",</div><div class='del'>-"~	c #E5E2DB",</div><div class='del'>-"{	c #FBFBF8",</div><div class='del'>-"]	c #716E6B",</div><div class='del'>-"^	c #62605C",</div><div class='del'>-"/	c #F8F7F2",</div><div class='del'>-"(	c #DDDAD4",</div><div class='del'>-"_	c #929191",</div><div class='del'>-":	c #969390",</div><div class='del'>-"&lt;	c #92908A",</div><div class='del'>-"[	c #A1A0A0",</div><div class='del'>-"}	c #F7F5F1",</div><div class='del'>-"|	c #FBFAF7",</div><div class='del'>-"1	c #A5A29D",</div><div class='del'>-"2	c #908D87",</div><div class='del'>-"3	c #F9F7F3",</div><div class='del'>-"4	c #F0EEE8",</div><div class='del'>-"5	c #DDD9D2",</div><div class='del'>-"6	c #797873",</div><div class='del'>-"7	c #F9F8F4",</div><div class='del'>-"8	c #74726E",</div><div class='del'>-"9	c #E3E0D9",</div><div class='del'>-"0	c #7D7A77",</div><div class='del'>-"a	c #FAF9F6",</div><div class='del'>-"b	c #F8F6F2",</div><div class='del'>-"c	c #FAF8F5",</div><div class='del'>-"d	c #F7F5F2",</div><div class='del'>-"e	c #E2DFD8",</div><div class='del'>-"f	c #090808",</div><div class='del'>-"g	c #D7D4CE",</div><div class='del'>-"h	c #D8D5CF",</div><div class='del'>-"i	c #D6D3CD",</div><div class='del'>-"j	c #DAD7D1",</div><div class='del'>-"k	c #E0DCD5",</div><div class='del'>-"l	c #222221",</div><div class='del'>-"     .....      ",</div><div class='del'>-"    .+++++.     ",</div><div class='del'>-"   .++++++@.    ",</div><div class='del'>-"  .+++++#$%&amp;.   ",</div><div class='del'>-" .*==-;&gt;&gt;&gt;&gt;,'.  ",</div><div class='del'>-" .&gt;)&gt;&gt;&gt;&gt;&gt;&gt;&gt;!~.  ",</div><div class='del'>-" .&gt;{]&gt;&gt;&gt;&gt;&gt;^/(.  ",</div><div class='del'>-" .&gt;{{_::&lt;[{}(.  ",</div><div class='del'>-" .&gt;{|1{{{2345.  ",</div><div class='del'>-" .&gt;|6{{{77895.  ",</div><div class='del'>-" .&gt;0{}abcd~8e.  ",</div><div class='del'>-" .fghhhi++jkl.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm<br/>deleted file mode 100644<br/>index 06f4a7420a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mail-replied.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mail-replied.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * mail_replied_xpm[] = {</div><div class='del'>-"16 16 33 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #95938E",</div><div class='del'>-"&amp;	c #FBFBFB",</div><div class='del'>-"*	c #F9F8F6",</div><div class='del'>-"=	c #FBFAFA",</div><div class='del'>-"-	c #F6F5F1",</div><div class='del'>-";	c #7D7B78",</div><div class='del'>-"&gt;	c #EAE8E3",</div><div class='del'>-",	c #969491",</div><div class='del'>-"'	c #000000",</div><div class='del'>-")	c #928F8B",</div><div class='del'>-"!	c #FFFFFF",</div><div class='del'>-"~	c #F7F6F4",</div><div class='del'>-"{	c #B5B2AC",</div><div class='del'>-"]	c #003366",</div><div class='del'>-"^	c #EFEFEF",</div><div class='del'>-"/	c #CCCCCC",</div><div class='del'>-"(	c #AEABA6",</div><div class='del'>-"_	c #B0ADA7",</div><div class='del'>-":	c #F5F3F0",</div><div class='del'>-"&lt;	c #83817E",</div><div class='del'>-"[	c #E1DFDA",</div><div class='del'>-"}	c #E2DFD9",</div><div class='del'>-"|	c #002C59",</div><div class='del'>-"1	c #002850",</div><div class='del'>-"2	c #00254A",</div><div class='del'>-"3	c #181818",</div><div class='del'>-"4	c #090909",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  .+.........   ",</div><div class='del'>-" .@#########$.  ",</div><div class='del'>-" .#%&amp;*#*=*-;&gt;.  ",</div><div class='del'>-" .#*,=''''''''' ",</div><div class='del'>-" .#**)'!!!!!!!' ",</div><div class='del'>-" .#*~{'!]]]]^/' ",</div><div class='del'>-" .#~(*'!]]]^^/' ",</div><div class='del'>-" .#_*:'!]]]]^/' ",</div><div class='del'>-" .&lt;[}}'!]^]]|/' ",</div><div class='del'>-"  ....'!^^^12/' ",</div><div class='del'>-"      '!//////3 ",</div><div class='del'>-"      ''4'''''' ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/malehead.png b/art/malehead.png<br/>deleted file mode 100644<br/>index ada9545c85..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/malehead.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/malehead.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mark-as-important-16.png b/art/mark-as-important-16.png<br/>deleted file mode 100644<br/>index 393d86e77c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mark-as-important-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mark-as-important-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/mark.xpm b/art/mark.xpm<br/>deleted file mode 100644<br/>index 710cd0e872..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/mark.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/mark.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * mark_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #36592A",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"           .    ",</div><div class='del'>-"          ..    ",</div><div class='del'>-"         ..     ",</div><div class='del'>-"    .   ..      ",</div><div class='del'>-"    .. ...      ",</div><div class='del'>-"     ....       ",</div><div class='del'>-"     ...        ",</div><div class='del'>-"      ..        ",</div><div class='del'>-"      .         ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/meeting-request.png b/art/meeting-request.png<br/>deleted file mode 100644<br/>index 0fba577bfe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/meeting-request.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/meeting-request.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/meeting.xpm b/art/meeting.xpm<br/>deleted file mode 100644<br/>index bf182fbd8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/meeting.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/meeting.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * meeting_xpm[] = {</div><div class='del'>-"16 16 45 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #161616",</div><div class='del'>-"@	c #A7A7A7",</div><div class='del'>-"#	c #8A8A8A",</div><div class='del'>-"$	c #757575",</div><div class='del'>-"%	c #686868",</div><div class='del'>-"&amp;	c #555555",</div><div class='del'>-"*	c #434343",</div><div class='del'>-"=	c #2F2F2F",</div><div class='del'>-"-	c #2B2B2B",</div><div class='del'>-";	c #FFFFFF",</div><div class='del'>-"&gt;	c #CACACA",</div><div class='del'>-",	c #C0C0C0",</div><div class='del'>-"'	c #B6B6B6",</div><div class='del'>-")	c #D8D5CD",</div><div class='del'>-"!	c #CFCFCF",</div><div class='del'>-"~	c #AEADA5",</div><div class='del'>-"{	c #7F7D78",</div><div class='del'>-"]	c #85847F",</div><div class='del'>-"^	c #92908A",</div><div class='del'>-"/	c #E0DFD7",</div><div class='del'>-"(	c #A09E98",</div><div class='del'>-"_	c #E6E5E0",</div><div class='del'>-":	c #E5E3DF",</div><div class='del'>-"&lt;	c #A5A49D",</div><div class='del'>-"[	c #9D9B95",</div><div class='del'>-"}	c #D5D5D5",</div><div class='del'>-"|	c #B4B1AB",</div><div class='del'>-"1	c #83817C",</div><div class='del'>-"2	c #D44D41",</div><div class='del'>-"3	c #A7453E",</div><div class='del'>-"4	c #919089",</div><div class='del'>-"5	c #E2E1DB",</div><div class='del'>-"6	c #9C9A94",</div><div class='del'>-"7	c #DEDBD5",</div><div class='del'>-"8	c #D9D6CE",</div><div class='del'>-"9	c #E79E3C",</div><div class='del'>-"0	c #934238",</div><div class='del'>-"a	c #B4B1AA",</div><div class='del'>-"b	c #807F79",</div><div class='del'>-"c	c #82817C",</div><div class='del'>-"d	c #7E7D78",</div><div class='del'>-"e	c #ACA9A3",</div><div class='del'>-"f	c #A3A09A",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-" .............  ",</div><div class='del'>-" +@#$%&amp;&amp;***=-.  ",</div><div class='del'>-" .;;&gt;;;,;;';).  ",</div><div class='del'>-" .!~{~~]~~{~^.  ",</div><div class='del'>-" .;/(_:&lt;))[)~.  ",</div><div class='del'>-" .}|1||2333|4.  ",</div><div class='del'>-" .;56783990)~.  ",</div><div class='del'>-" .}|1||3000|4.  ",</div><div class='del'>-" .)ab~~c~~def.  ",</div><div class='del'>-" .............  ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/monkey-16.png b/art/monkey-16.png<br/>deleted file mode 100644<br/>index 02fb7b6eb5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/monkey-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/monkey-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/monthview.xpm b/art/monthview.xpm<br/>deleted file mode 100644<br/>index 21c76151d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/monthview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/monthview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * monthview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #666666",</div><div class='del'>-"#	c #919191",</div><div class='del'>-"$	c #F2F1ED",</div><div class='del'>-"%	c #D8D8D4",</div><div class='del'>-"....................... ",</div><div class='del'>-".+++++++++++++++++++++. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".%###################@. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/art/move-message.png b/art/move-message.png<br/>deleted file mode 100644<br/>index 143cea1a93..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/move-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/move-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/move_message.xpm b/art/move_message.xpm<br/>deleted file mode 100644<br/>index 846febbe49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/move_message.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/move_message.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_move_message_xpm[] = {</div><div class='del'>-"16 16 40 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #95938E",</div><div class='del'>-"&amp;	c #FBFBFB",</div><div class='del'>-"*	c #F9F8F6",</div><div class='del'>-"=	c #FBFAFA",</div><div class='del'>-"-	c #F6F5F1",</div><div class='del'>-";	c #7D7B78",</div><div class='del'>-"&gt;	c #EAE8E3",</div><div class='del'>-",	c #969491",</div><div class='del'>-"'	c #F6F4F1",</div><div class='del'>-")	c #81807C",</div><div class='del'>-"!	c #E5E3DE",</div><div class='del'>-"~	c #000000",</div><div class='del'>-"{	c #928F8B",</div><div class='del'>-"]	c #FBFBFA",</div><div class='del'>-"^	c #F7F5F2",</div><div class='del'>-"/	c #F5F3F0",</div><div class='del'>-"(	c #F7F6F4",</div><div class='del'>-"_	c #B5B2AC",</div><div class='del'>-":	c #A09C97",</div><div class='del'>-"&lt;	c #F0EFEB",</div><div class='del'>-"[	c #E4E2DD",</div><div class='del'>-"}	c #AEABA6",</div><div class='del'>-"|	c #92908B",</div><div class='del'>-"1	c #E8E6E1",</div><div class='del'>-"2	c #B0ADA7",</div><div class='del'>-"3	c #F7F6F2",</div><div class='del'>-"4	c #F5F4F0",</div><div class='del'>-"5	c #6B6A68",</div><div class='del'>-"6	c #83817E",</div><div class='del'>-"7	c #E1DFDA",</div><div class='del'>-"8	c #E2DFD9",</div><div class='del'>-"9	c #E2E0DB",</div><div class='del'>-"0	c #E3E1DC",</div><div class='del'>-"a	c #E6E4DF",</div><div class='del'>-"                ",</div><div class='del'>-" . . . . . .    ",</div><div class='del'>-".           .   ",</div><div class='del'>-"                ",</div><div class='del'>-".           .   ",</div><div class='del'>-"    .+......... ",</div><div class='del'>-".  .@#########$.",</div><div class='del'>-"   .#%&amp;*#*=*-;&gt;.",</div><div class='del'>-".  .#*,=*=*')'!.",</div><div class='del'>-" ~ .#**{]*^)*/!.",</div><div class='del'>-"   .#*(_)#):-&lt;[.",</div><div class='del'>-"   .#(}**)^^|1[.",</div><div class='del'>-"   .#2*/34^/&gt;51.",</div><div class='del'>-"   .678887990a$.",</div><div class='del'>-"    ........... ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/myevo-appointments.png b/art/myevo-appointments.png<br/>deleted file mode 100644<br/>index 873528a964..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myevo-appointments.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myevo-appointments.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myevo-mail-summary.png b/art/myevo-mail-summary.png<br/>deleted file mode 100644<br/>index 453f9938ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myevo-mail-summary.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myevo-mail-summary.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myevo-post-it.png b/art/myevo-post-it.png<br/>deleted file mode 100644<br/>index f0ef421549..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myevo-post-it.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myevo-post-it.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-clouds.png b/art/myweather-clouds.png<br/>deleted file mode 100644<br/>index fa1fa4b80f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-clouds.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-clouds.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-fog.png b/art/myweather-fog.png<br/>deleted file mode 100644<br/>index 60db197df7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-fog.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-fog.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-rain.png b/art/myweather-rain.png<br/>deleted file mode 100644<br/>index 3ce291f788..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-rain.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-rain.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-snow.png b/art/myweather-snow.png<br/>deleted file mode 100644<br/>index 8a45248692..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-snow.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-snow.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-storm.png b/art/myweather-storm.png<br/>deleted file mode 100644<br/>index cef334a43c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-storm.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-storm.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-sun.png b/art/myweather-sun.png<br/>deleted file mode 100644<br/>index 26349305bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-sun.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-sun.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/myweather-suncloud.png b/art/myweather-suncloud.png<br/>deleted file mode 100644<br/>index a2058e77b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/myweather-suncloud.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/myweather-suncloud.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/new-message.xpm b/art/new-message.xpm<br/>deleted file mode 100644<br/>index add4263a4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new-message.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new-message.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * new_message_xpm[] = {</div><div class='del'>-"16 16 19 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FDFDFD",</div><div class='del'>-"@	c #E2E2E2",</div><div class='del'>-"#	c #FEFEFE",</div><div class='del'>-"$	c #FCFCFC",</div><div class='del'>-"%	c #FBFBFB",</div><div class='del'>-"&amp;	c #FFFFFF",</div><div class='del'>-"*	c #E4E4E4",</div><div class='del'>-"=	c #E0E0E0",</div><div class='del'>-"-	c #FAFAFA",</div><div class='del'>-";	c #F9F9F9",</div><div class='del'>-"&gt;	c #F8F8F8",</div><div class='del'>-",	c #F7F7F7",</div><div class='del'>-"'	c #F5F5F5",</div><div class='del'>-")	c #F4F4F4",</div><div class='del'>-"!	c #DFDFDF",</div><div class='del'>-"~	c #E8E8E8",</div><div class='del'>-"{	c #DDDDDD",</div><div class='del'>-"                ",</div><div class='del'>-"        ..      ",</div><div class='del'>-"      ..+@.     ",</div><div class='del'>-"    ..#+$%.     ",</div><div class='del'>-"  ..&amp;####%*.    ",</div><div class='del'>-" .&amp;####==-;.    ",</div><div class='del'>-" .###==###&gt;*.   ",</div><div class='del'>-"  .+####==,'.   ",</div><div class='del'>-"  .$%#==###'*.  ",</div><div class='del'>-"   .--###==').  ",</div><div class='del'>-"   .-;#==####*. ",</div><div class='del'>-"    .&gt;######!!. ",</div><div class='del'>-"    .,####!!..  ",</div><div class='del'>-"     .##=!..    ",</div><div class='del'>-"     .~{..      ",</div><div class='del'>-"      ..        "};</div><div class='head'>diff --git a/art/new_all_day_event.png b/art/new_all_day_event.png<br/>deleted file mode 100644<br/>index ee15651725..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_all_day_event.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_all_day_event.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/new_appointment.png b/art/new_appointment.png<br/>deleted file mode 100644<br/>index 5dc61801da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_appointment.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_appointment.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/new_appointment.xpm b/art/new_appointment.xpm<br/>deleted file mode 100644<br/>index d55eb396e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_appointment.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_appointment.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * new_appointment_xpm[] = {</div><div class='del'>-"16 16 107 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #FEFEFE",</div><div class='del'>-"@ 	c #FDFDFD",</div><div class='del'>-"# 	c #E0E0E0",</div><div class='del'>-"$ 	c #C1C1C1",</div><div class='del'>-"% 	c #F1F1F1",</div><div class='del'>-"&amp; 	c #C3C3C3",</div><div class='del'>-"* 	c #FBFBFB",</div><div class='del'>-"= 	c #A8A8A8",</div><div class='del'>-"- 	c #525252",</div><div class='del'>-"; 	c #141414",</div><div class='del'>-"&gt; 	c #111111",</div><div class='del'>-", 	c #383838",</div><div class='del'>-"' 	c #6E6E6E",</div><div class='del'>-") 	c #ADADAD",</div><div class='del'>-"! 	c #717171",</div><div class='del'>-"~ 	c #5D5D5D",</div><div class='del'>-"{ 	c #404040",</div><div class='del'>-"] 	c #BA8D31",</div><div class='del'>-"^ 	c #EAB23D",</div><div class='del'>-"/ 	c #403011",</div><div class='del'>-"( 	c #E5E5E5",</div><div class='del'>-"_ 	c #B4B4B4",</div><div class='del'>-": 	c #606060",</div><div class='del'>-"&lt; 	c #DADADA",</div><div class='del'>-"[ 	c #777777",</div><div class='del'>-"} 	c #4B4B49",</div><div class='del'>-"| 	c #161616",</div><div class='del'>-"1 	c #EFB63E",</div><div class='del'>-"2 	c #F6D591",</div><div class='del'>-"3 	c #F3B840",</div><div class='del'>-"4 	c #916D26",</div><div class='del'>-"5 	c #F8F8F8",</div><div class='del'>-"6 	c #F3F3F3",</div><div class='del'>-"7 	c #E7E7E7",</div><div class='del'>-"8 	c #B5B5B5",</div><div class='del'>-"9 	c #A1A1A1",</div><div class='del'>-"0 	c #919191",</div><div class='del'>-"a 	c #EEB53E",</div><div class='del'>-"b 	c #FAE7BC",</div><div class='del'>-"c 	c #FCD584",</div><div class='del'>-"d 	c #FEC142",</div><div class='del'>-"e 	c #FFC243",</div><div class='del'>-"f 	c #FFFFFF",</div><div class='del'>-"g 	c #CECECE",</div><div class='del'>-"h 	c #0B0B0B",</div><div class='del'>-"i 	c #B9B9B9",</div><div class='del'>-"j 	c #E4E4E4",</div><div class='del'>-"k 	c #B88B30",</div><div class='del'>-"l 	c #F9E2B2",</div><div class='del'>-"m 	c #FDD789",</div><div class='del'>-"n 	c #D0D0D0",</div><div class='del'>-"o 	c #373737",</div><div class='del'>-"p 	c #898989",</div><div class='del'>-"q 	c #ABABAB",</div><div class='del'>-"r 	c #33332D",</div><div class='del'>-"s 	c #CFCFB9",</div><div class='del'>-"t 	c #E7AF3C",</div><div class='del'>-"u 	c #F9DDA4",</div><div class='del'>-"v 	c #FECA5E",</div><div class='del'>-"w 	c #D09E36",</div><div class='del'>-"x 	c #8B8B8B",</div><div class='del'>-"y 	c #F6F6F6",</div><div class='del'>-"z 	c #131313",</div><div class='del'>-"A 	c #3A2B0F",</div><div class='del'>-"B 	c #8F6C25",</div><div class='del'>-"C 	c #FDC042",</div><div class='del'>-"D 	c #2D220C",</div><div class='del'>-"E 	c #6F6F6F",</div><div class='del'>-"F 	c #8F8F8F",</div><div class='del'>-"G 	c #353535",</div><div class='del'>-"H 	c #C3C3AE",</div><div class='del'>-"I 	c #DFDFDF",</div><div class='del'>-"J 	c #F0F0F0",</div><div class='del'>-"K 	c #FCFCFC",</div><div class='del'>-"L 	c #363636",</div><div class='del'>-"M 	c #AAAAAA",</div><div class='del'>-"N 	c #C8C8C8",</div><div class='del'>-"O 	c #A9A9A9",</div><div class='del'>-"P 	c #E1E1E1",</div><div class='del'>-"Q 	c #4A4A4A",</div><div class='del'>-"R 	c #FAFAFA",</div><div class='del'>-"S 	c #C4C4C4",</div><div class='del'>-"T 	c #3C3C36",</div><div class='del'>-"U 	c #ADAD9B",</div><div class='del'>-"V 	c #CCCCCC",</div><div class='del'>-"W 	c #D6D6D6",</div><div class='del'>-"X 	c #F4F4F4",</div><div class='del'>-"Y 	c #F7F7F7",</div><div class='del'>-"Z 	c #BABABA",</div><div class='del'>-"` 	c #BFBFBF",</div><div class='del'>-" .	c #C9C9C9",</div><div class='del'>-"..	c #767676",</div><div class='del'>-"+.	c #CBCBCB",</div><div class='del'>-"@.	c #ACACAC",</div><div class='del'>-"#.	c #B3B3B3",</div><div class='del'>-"$.	c #5C5C5C",</div><div class='del'>-"%.	c #C5C5C5",</div><div class='del'>-"&amp;.	c #A0A0A0",</div><div class='del'>-"*.	c #444444",</div><div class='del'>-"=.	c #A7A7A7",</div><div class='del'>-"-.	c #989898",</div><div class='del'>-";.	c #4B4B4B",</div><div class='del'>-"&gt;.	c #9C9C9C",</div><div class='del'>-",.	c #A2A2A2",</div><div class='del'>-"'.	c #BBBBBB",</div><div class='del'>-"        . . . . . . . . .       ",</div><div class='del'>-"      . + + + + + + @ # $ .     ",</div><div class='del'>-"      . + % % % % % % &amp; * = .   ",</div><div class='del'>-"      . - ; . &gt; , ' % ) ! ~ { . ",</div><div class='del'>-"    . . ] ^ / ( _ . : &lt; [ } | . ",</div><div class='del'>-"  . . 1 2 3 4 5 6 7 . : 8 9 0 . ",</div><div class='del'>-"  . a b c d e f g h i . 9 j 0 . ",</div><div class='del'>-". k l m e e e n o p % q r s 0 . ",</div><div class='del'>-". t u v e e w o x + y &lt; z j 0 . ",</div><div class='del'>-". A B C e e D E f + F G . H 0 . ",</div><div class='del'>-". I J K f f n L M @ J N z j 0 . ",</div><div class='del'>-". O P y + + f n Q R S 9 T U 0 . ",</div><div class='del'>-"  . V W X R K * Y V Z . 9 j 0 . ",</div><div class='del'>-"  . . ` Z  ...+.@.#.. $.%.j 0 . ",</div><div class='del'>-"    . . &amp;.@.*.=.-.. ;.&gt;.,.'.&amp;.. ",</div><div class='del'>-"      . . . . . . . . . . . .   "};</div><div class='head'>diff --git a/art/new_contact.xpm b/art/new_contact.xpm<br/>deleted file mode 100644<br/>index 9b7e778102..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_contact.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_contact.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * new_contact_xpm[] = {</div><div class='del'>-"24 24 71 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #BABABA",</div><div class='del'>-"@	c #FDFDFD",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #959595",</div><div class='del'>-"%	c #FBFBFB",</div><div class='del'>-"&amp;	c #FAFAFA",</div><div class='del'>-"*	c #F9F9F9",</div><div class='del'>-"=	c #F8F8F8",</div><div class='del'>-"-	c #F7F7F7",</div><div class='del'>-";	c #E3E3E3",</div><div class='del'>-"&gt;	c #BDBDBD",</div><div class='del'>-",	c #9D9C9A",</div><div class='del'>-"'	c #999896",</div><div class='del'>-")	c #A4A4A3",</div><div class='del'>-"!	c #391414",</div><div class='del'>-"~	c #B1B1B1",</div><div class='del'>-"{	c #D4D4D4",</div><div class='del'>-"]	c #E2E2E2",</div><div class='del'>-"^	c #DCD4C7",</div><div class='del'>-"/	c #C1B8A6",</div><div class='del'>-"(	c #878682",</div><div class='del'>-"_	c #BFBFBF",</div><div class='del'>-":	c #7C7C7C",</div><div class='del'>-"&lt;	c #909090",</div><div class='del'>-"[	c #747474",</div><div class='del'>-"}	c #818181",</div><div class='del'>-"|	c #A8A8A8",</div><div class='del'>-"1	c #B6B6B6",</div><div class='del'>-"2	c #F6F6F6",</div><div class='del'>-"3	c #7F742E",</div><div class='del'>-"4	c #E1E1E1",</div><div class='del'>-"5	c #959FA4",</div><div class='del'>-"6	c #678690",</div><div class='del'>-"7	c #9A9891",</div><div class='del'>-"8	c #959490",</div><div class='del'>-"9	c #F5F5F5",</div><div class='del'>-"0	c #2B6776",</div><div class='del'>-"a	c #294E70",</div><div class='del'>-"b	c #294770",</div><div class='del'>-"c	c #284D6F",</div><div class='del'>-"d	c #232362",</div><div class='del'>-"e	c #B1B3B4",</div><div class='del'>-"f	c #979797",</div><div class='del'>-"g	c #B0B0B0",</div><div class='del'>-"h	c #AFAFAF",</div><div class='del'>-"i	c #D3D3D3",</div><div class='del'>-"j	c #E0E0E0",</div><div class='del'>-"k	c #27276C",</div><div class='del'>-"l	c #28286D",</div><div class='del'>-"m	c #282A6F",</div><div class='del'>-"n	c #2A5A73",</div><div class='del'>-"o	c #DFDFDF",</div><div class='del'>-"p	c #A2A2A2",</div><div class='del'>-"q	c #B5B5B5",</div><div class='del'>-"r	c #727272",</div><div class='del'>-"s	c #BCBCBC",</div><div class='del'>-"t	c #F4F4F4",</div><div class='del'>-"u	c #DEDEDE",</div><div class='del'>-"v	c #D5D5D5",</div><div class='del'>-"w	c #DDDDDD",</div><div class='del'>-"x	c #BEBEBE",</div><div class='del'>-"y	c #D1D1D1",</div><div class='del'>-"z	c #F3F3F3",</div><div class='del'>-"A	c #DCDCDC",</div><div class='del'>-"B	c #E7E7E7",</div><div class='del'>-"C	c #E6E6E6",</div><div class='del'>-"D	c #E5E5E5",</div><div class='del'>-"E	c #E4E4E4",</div><div class='del'>-"F	c #686868",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"  ..................... ",</div><div class='del'>-" .+@@@@@@@@@@@@@@@@@@#$.",</div><div class='del'>-" .@%%%%%&amp;&amp;&amp;&amp;*****===--;.",</div><div class='del'>-" .@%&gt;&gt;,')&gt;&amp;*****==----;.",</div><div class='del'>-" .@%&gt;&gt;!..,***~={=&gt;----].",</div><div class='del'>-" .@%&gt;&gt;^/.(**_:&lt;[&lt;}|1-2].",</div><div class='del'>-" .@%&gt;&gt;^3.'**={=----2224.",</div><div class='del'>-" .@&amp;&gt;567.8*===----22294.",</div><div class='del'>-" .@&amp;0abcde==1&lt;f{ghi&gt;99j.",</div><div class='del'>-" .@&amp;akklmn==----222999o.",</div><div class='del'>-" .@*****===-pg|qiprs9tu.",</div><div class='del'>-" .@*vvv=1&gt;----222999ttw.",</div><div class='del'>-" .@*vxf=p---gi2h$syytzw.",</div><div class='del'>-" .@*===-----22999tttzzA.",</div><div class='del'>-" .hBBCDDE;]]]44joouwwAF.",</div><div class='del'>-"  ..................... ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/art/new_task-16.png b/art/new_task-16.png<br/>deleted file mode 100644<br/>index 7937d8d53b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_task-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_task-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/new_task.png b/art/new_task.png<br/>deleted file mode 100644<br/>index 16a1c94b6b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/new_task.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/new_task.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/next-message.png b/art/next-message.png<br/>deleted file mode 100644<br/>index 80de893ecf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/next-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/next-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/offline.png b/art/offline.png<br/>deleted file mode 100644<br/>index 57bdd27be2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/offline.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/offline.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/online.png b/art/online.png<br/>deleted file mode 100644<br/>index 9a6a3980c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/online.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/online.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/open-in-new-window-16.png b/art/open-in-new-window-16.png<br/>deleted file mode 100644<br/>index 07496e8b81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/open-in-new-window-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/open-in-new-window-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/outbox-16.png b/art/outbox-16.png<br/>deleted file mode 100644<br/>index e52e00a7f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/outbox-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/outbox-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/outbox-full-16.png b/art/outbox-full-16.png<br/>deleted file mode 100644<br/>index cb138fa2b3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/outbox-full-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/outbox-full-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/paste.png b/art/paste.png<br/>deleted file mode 100644<br/>index 736900531a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/paste.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/paste.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pattern.png b/art/pattern.png<br/>deleted file mode 100644<br/>index 33abc187ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pattern.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/pattern.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pgp-signature-bad.png b/art/pgp-signature-bad.png<br/>deleted file mode 100644<br/>index 82318fbb4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pgp-signature-bad.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/pgp-signature-bad.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pgp-signature-nokey.png b/art/pgp-signature-nokey.png<br/>deleted file mode 100644<br/>index 00250e090c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pgp-signature-nokey.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/pgp-signature-nokey.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pgp-signature-ok.png b/art/pgp-signature-ok.png<br/>deleted file mode 100644<br/>index 51782b0e40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pgp-signature-ok.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/pgp-signature-ok.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pin.png b/art/pin.png<br/>deleted file mode 100644<br/>index fff34d7d96..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pin.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/pin.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/previous-message.png b/art/previous-message.png<br/>deleted file mode 100644<br/>index 17c3dcadb6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/previous-message.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/previous-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/print-preview-24.png b/art/print-preview-24.png<br/>deleted file mode 100644<br/>index cd6b90e6bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/print-preview-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/print-preview-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/print-preview.xpm b/art/print-preview.xpm<br/>deleted file mode 100644<br/>index a4b36d639d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/print-preview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/print-preview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,153 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * print_preview_xpm[] = {</div><div class='del'>-"16 16 134 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #9D9D8D",</div><div class='del'>-"@ 	c #CFCFB9",</div><div class='del'>-"# 	c #C4C4AF",</div><div class='del'>-"$ 	c #8D8D7F",</div><div class='del'>-"% 	c #353530",</div><div class='del'>-"&amp; 	c #828282",</div><div class='del'>-"* 	c #9C9C8C",</div><div class='del'>-"= 	c #E2E2D0",</div><div class='del'>-"- 	c #EDEDE7",</div><div class='del'>-"; 	c #C0C0AC",</div><div class='del'>-"&gt; 	c #B2B29F",</div><div class='del'>-", 	c #828274",</div><div class='del'>-"' 	c #4C4C44",</div><div class='del'>-") 	c #FFFFFF",</div><div class='del'>-"! 	c #EFEFEF",</div><div class='del'>-"~ 	c #ECECEC",</div><div class='del'>-"{ 	c #090908",</div><div class='del'>-"] 	c #D5D5BF",</div><div class='del'>-"^ 	c #FBFBFA",</div><div class='del'>-"/ 	c #C3C3AE",</div><div class='del'>-"( 	c #B5B5A2",</div><div class='del'>-"_ 	c #A6A695",</div><div class='del'>-": 	c #959586",</div><div class='del'>-"&lt; 	c #080807",</div><div class='del'>-"[ 	c #E3E3E3",</div><div class='del'>-"} 	c #CDCDCD",</div><div class='del'>-"| 	c #D7D7D7",</div><div class='del'>-"1 	c #090909",</div><div class='del'>-"2 	c #CACAB5",</div><div class='del'>-"3 	c #DDDDD0",</div><div class='del'>-"4 	c #B7B7A4",</div><div class='del'>-"5 	c #AAAA98",</div><div class='del'>-"6 	c #9B9B8B",</div><div class='del'>-"7 	c #8C8C7D",</div><div class='del'>-"8 	c #0A0A09",</div><div class='del'>-"9 	c #E9E9E9",</div><div class='del'>-"0 	c #EBEBEB",</div><div class='del'>-"a 	c #DBDBDB",</div><div class='del'>-"b 	c #929283",</div><div class='del'>-"c 	c #BABAA7",</div><div class='del'>-"d 	c #ADAD9B",</div><div class='del'>-"e 	c #9F9F8E",</div><div class='del'>-"f 	c #909081",</div><div class='del'>-"g 	c #727266",</div><div class='del'>-"h 	c #52524C",</div><div class='del'>-"i 	c #A4A4A4",</div><div class='del'>-"j 	c #34342F",</div><div class='del'>-"k 	c #878779",</div><div class='del'>-"l 	c #A0A090",</div><div class='del'>-"m 	c #737367",</div><div class='del'>-"n 	c #010101",</div><div class='del'>-"o 	c #575757",</div><div class='del'>-"p 	c #A6A6A6",</div><div class='del'>-"q 	c #4B4B43",</div><div class='del'>-"r 	c #414141",</div><div class='del'>-"s 	c #777777",</div><div class='del'>-"t 	c #979797",</div><div class='del'>-"u 	c #BCBBBB",</div><div class='del'>-"v 	c #D4D4D3",</div><div class='del'>-"w 	c #878787",</div><div class='del'>-"x 	c #323232",</div><div class='del'>-"y 	c #A5A5A5",</div><div class='del'>-"z 	c #D0D0CF",</div><div class='del'>-"A 	c #B5B5B5",</div><div class='del'>-"B 	c #C2C2C2",</div><div class='del'>-"C 	c #FBFBFB",</div><div class='del'>-"D 	c #FAFAFA",</div><div class='del'>-"E 	c #999999",</div><div class='del'>-"F 	c #363636",</div><div class='del'>-"G 	c #9E9E9E",</div><div class='del'>-"H 	c #ECECEB",</div><div class='del'>-"I 	c #AEADAB",</div><div class='del'>-"J 	c #F7F7F7",</div><div class='del'>-"K 	c #E5E5E4",</div><div class='del'>-"L 	c #8D8D8D",</div><div class='del'>-"M 	c #F1F1F1",</div><div class='del'>-"N 	c #A0A0A0",</div><div class='del'>-"O 	c #E2E2E2",</div><div class='del'>-"P 	c #D9D9D8",</div><div class='del'>-"Q 	c #898988",</div><div class='del'>-"R 	c #0C0C0C",</div><div class='del'>-"S 	c #302F2F",</div><div class='del'>-"T 	c #A4A3A1",</div><div class='del'>-"U 	c #CCCAC6",</div><div class='del'>-"V 	c #1B1B1B",</div><div class='del'>-"W 	c #969594",</div><div class='del'>-"X 	c #D6D4D2",</div><div class='del'>-"Y 	c #DDDBDA",</div><div class='del'>-"Z 	c #DCDCDB",</div><div class='del'>-"` 	c #DEDDDD",</div><div class='del'>-" .	c #DFDEDD",</div><div class='del'>-"..	c #DDDCDB",</div><div class='del'>-"+.	c #DBDBD9",</div><div class='del'>-"@.	c #7E7E7D",</div><div class='del'>-"#.	c #383838",</div><div class='del'>-"$.	c #555453",</div><div class='del'>-"%.	c #9F9E9A",</div><div class='del'>-"&amp;.	c #A8A7A6",</div><div class='del'>-"*.	c #9E9D9C",</div><div class='del'>-"=.	c #615E59",</div><div class='del'>-"-.	c #54514E",</div><div class='del'>-";.	c #54524E",</div><div class='del'>-"&gt;.	c #514F4B",</div><div class='del'>-",.	c #52504C",</div><div class='del'>-"'.	c #504D49",</div><div class='del'>-").	c #4D4B47",</div><div class='del'>-"!.	c #4F4D49",</div><div class='del'>-"~.	c #514F4C",</div><div class='del'>-"{.	c #535251",</div><div class='del'>-"].	c #8E8D8A",</div><div class='del'>-"^.	c #B4B3B1",</div><div class='del'>-"/.	c #C0BFBC",</div><div class='del'>-"(.	c #B9B8B5",</div><div class='del'>-"_.	c #B3B1AF",</div><div class='del'>-":.	c #B1B1AE",</div><div class='del'>-"&lt;.	c #AFAEAC",</div><div class='del'>-"[.	c #B0AEAC",</div><div class='del'>-"}.	c #ACACA9",</div><div class='del'>-"|.	c #A6A6A4",</div><div class='del'>-"1.	c #ABAAA7",</div><div class='del'>-"2.	c #AEADAA",</div><div class='del'>-"3.	c #AAA9A6",</div><div class='del'>-"4.	c #201F1E",</div><div class='del'>-"5.	c #403F3D",</div><div class='del'>-"6.	c #444341",</div><div class='del'>-"7.	c #454542",</div><div class='del'>-"8.	c #42423F",</div><div class='del'>-"9.	c #3F3E3C",</div><div class='del'>-"0.	c #3A3936",</div><div class='del'>-"a.	c #393835",</div><div class='del'>-"b.	c #31302D",</div><div class='del'>-"c.	c #1E1D1B",</div><div class='del'>-"      . . . .                   ",</div><div class='del'>-"    . + @ # $ % &amp; . . . .       ",</div><div class='del'>-"  . * = - ; &gt; , ' ) ! ~ .       ",</div><div class='del'>-"  { ] ^ / ( _ : &lt; [ } | .       ",</div><div class='del'>-"  1 2 3 4 5 6 7 8 9 0 a .       ",</div><div class='del'>-"  . b c d e f g h . i a .       ",</div><div class='del'>-"    j k l b m n o p 0 a .       ",</div><div class='del'>-"      q 8 8 r s n . t a . .     ",</div><div class='del'>-"    . u v ) 9 9 w n x y z A .   ",</div><div class='del'>-"  . B C ) D ) D C E n F G H I . ",</div><div class='del'>-"  . D J K L M N O P Q R S T U V ",</div><div class='del'>-"  . W X Y Z `  ...P +.@.#.$.%.. ",</div><div class='del'>-"  . &amp;.*.=.-.;.&gt;.,.'.).!.~.{.].. ",</div><div class='del'>-"  . ^./.(._.:.&lt;.[.}.|.1.2.&lt;.3.. ",</div><div class='del'>-"  . 4.5.6.7.7.7.8.5.9.0.a.b.c.. ",</div><div class='del'>-"    . . . . . . . . . . . . .   "};</div><div class='head'>diff --git a/art/print.png b/art/print.png<br/>deleted file mode 100644<br/>index f223a1146d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/print.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/print.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/print.xpm b/art/print.xpm<br/>deleted file mode 100644<br/>index da46eb0157..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/print.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/print.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,107 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * print_xpm[] = {</div><div class='del'>-"16 16 88 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #ECECEC",</div><div class='del'>-"#	c #353535",</div><div class='del'>-"$	c #D3D3D3",</div><div class='del'>-"%	c #131313",</div><div class='del'>-"&amp;	c #C7C7C7",</div><div class='del'>-"*	c #D7D7D7",</div><div class='del'>-"=	c #EBEBEB",</div><div class='del'>-"-	c #E9E9E9",</div><div class='del'>-";	c #DBDBDB",</div><div class='del'>-"&gt;	c #4D4D4D",</div><div class='del'>-",	c #A4A4A4",</div><div class='del'>-"'	c #414141",</div><div class='del'>-")	c #8C8C8C",</div><div class='del'>-"!	c #979797",</div><div class='del'>-"~	c #BCBBBB",</div><div class='del'>-"{	c #D4D4D3",</div><div class='del'>-"]	c #D0D0CF",</div><div class='del'>-"^	c #B5B5B5",</div><div class='del'>-"/	c #C2C2C2",</div><div class='del'>-"(	c #FBFBFB",</div><div class='del'>-"_	c #FAFAFA",</div><div class='del'>-":	c #F8F8F8",</div><div class='del'>-"&lt;	c #F4F4F3",</div><div class='del'>-"[	c #ECECEB",</div><div class='del'>-"}	c #AEADAB",</div><div class='del'>-"|	c #F7F7F7",</div><div class='del'>-"1	c #E5E5E4",</div><div class='del'>-"2	c #8D8D8D",</div><div class='del'>-"3	c #F1F1F1",</div><div class='del'>-"4	c #A0A0A0",</div><div class='del'>-"5	c #E2E2E2",</div><div class='del'>-"6	c #D9D9D8",</div><div class='del'>-"7	c #DEDDDC",</div><div class='del'>-"8	c #DCDCDA",</div><div class='del'>-"9	c #D8D7D4",</div><div class='del'>-"0	c #B3B2B0",</div><div class='del'>-"a	c #CCCAC6",</div><div class='del'>-"b	c #1B1B1B",</div><div class='del'>-"c	c #969594",</div><div class='del'>-"d	c #D6D4D2",</div><div class='del'>-"e	c #DDDBDA",</div><div class='del'>-"f	c #DCDCDB",</div><div class='del'>-"g	c #DEDDDD",</div><div class='del'>-"h	c #DFDEDD",</div><div class='del'>-"i	c #DDDCDB",</div><div class='del'>-"j	c #DBDBD9",</div><div class='del'>-"k	c #DAD9D7",</div><div class='del'>-"l	c #D9D8D6",</div><div class='del'>-"m	c #81807E",</div><div class='del'>-"n	c #9F9E9A",</div><div class='del'>-"o	c #A8A7A6",</div><div class='del'>-"p	c #9E9D9C",</div><div class='del'>-"q	c #615E59",</div><div class='del'>-"r	c #54514E",</div><div class='del'>-"s	c #54524E",</div><div class='del'>-"t	c #514F4B",</div><div class='del'>-"u	c #52504C",</div><div class='del'>-"v	c #504D49",</div><div class='del'>-"w	c #4D4B47",</div><div class='del'>-"x	c #4F4D49",</div><div class='del'>-"y	c #514F4C",</div><div class='del'>-"z	c #939291",</div><div class='del'>-"A	c #9B9A97",</div><div class='del'>-"B	c #B4B3B1",</div><div class='del'>-"C	c #C0BFBC",</div><div class='del'>-"D	c #B9B8B5",</div><div class='del'>-"E	c #B3B1AF",</div><div class='del'>-"F	c #B1B1AE",</div><div class='del'>-"G	c #AFAEAC",</div><div class='del'>-"H	c #B0AEAC",</div><div class='del'>-"I	c #ACACA9",</div><div class='del'>-"J	c #A6A6A4",</div><div class='del'>-"K	c #ABAAA7",</div><div class='del'>-"L	c #AEADAA",</div><div class='del'>-"M	c #AAA9A6",</div><div class='del'>-"N	c #201F1E",</div><div class='del'>-"O	c #403F3D",</div><div class='del'>-"P	c #444341",</div><div class='del'>-"Q	c #454542",</div><div class='del'>-"R	c #42423F",</div><div class='del'>-"S	c #3F3E3C",</div><div class='del'>-"T	c #3A3936",</div><div class='del'>-"U	c #393835",</div><div class='del'>-"V	c #31302D",</div><div class='del'>-"W	c #1E1D1B",</div><div class='del'>-"                ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"    .++++++@.   ",</div><div class='del'>-"    .+#$.%&amp;*.   ",</div><div class='del'>-"    .+=---=;.   ",</div><div class='del'>-"    .+&gt;.=.,;.   ",</div><div class='del'>-"    .+=====;.   ",</div><div class='del'>-"   ..+'=).!;..  ",</div><div class='del'>-"  .~{+------]^. ",</div><div class='del'>-" ./(+_+_((_:&lt;[}.",</div><div class='del'>-" ._|1234567890ab",</div><div class='del'>-" .cdefghi6jklmn.",</div><div class='del'>-" .opqrstuvwxyzA.",</div><div class='del'>-" .BCDEFGHIJKLGM.",</div><div class='del'>-" .NOPQQQROSTUVW.",</div><div class='del'>-"  ............. "};</div><div class='head'>diff --git a/art/priority-high.xpm b/art/priority-high.xpm<br/>deleted file mode 100644<br/>index 884c8b8236..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/priority-high.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/priority-high.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * priority_high_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #FFFFFF",</div><div class='del'>-"X	c #A7453E",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"        .       ",</div><div class='del'>-"       .X.      ",</div><div class='del'>-"      .XXX.     ",</div><div class='del'>-"      .XXX.     ",</div><div class='del'>-"      .XXX.     ",</div><div class='del'>-"      .XX.      ",</div><div class='del'>-"      .XX.      ",</div><div class='del'>-"      .X.       ",</div><div class='del'>-"      ..        ",</div><div class='del'>-"     .XX.       ",</div><div class='del'>-"     .XX.       ",</div><div class='del'>-"      ..        ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/priority-low.xpm b/art/priority-low.xpm<br/>deleted file mode 100644<br/>index ad53e9e0cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/priority-low.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/priority-low.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * priority_low_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #21405A",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"     ......     ",</div><div class='del'>-"      ....      ",</div><div class='del'>-"      ....      ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/properties-16.png b/art/properties-16.png<br/>deleted file mode 100644<br/>index 7586e3ab27..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/properties-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/properties-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/rdf.png b/art/rdf.png<br/>deleted file mode 100644<br/>index b4bdbafa99..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/rdf.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/rdf.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/receive-24.png b/art/receive-24.png<br/>deleted file mode 100644<br/>index bfa7d972bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/receive-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/receive-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/recur.xpm b/art/recur.xpm<br/>deleted file mode 100644<br/>index bb34fa4568..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/recur.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/recur.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * recur_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #333366",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    ..   .....  ",</div><div class='del'>-"  ...    ....   ",</div><div class='del'>-"  ..     ....   ",</div><div class='del'>-" ..      .....  ",</div><div class='del'>-" ..      .  ..  ",</div><div class='del'>-" ..         ..  ",</div><div class='del'>-" ..  .      ..  ",</div><div class='del'>-" .....      ..  ",</div><div class='del'>-"  ....     ..   ",</div><div class='del'>-"  ....    ...   ",</div><div class='del'>-" .....   ..     ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/refresh-nntp-folders-24.png b/art/refresh-nntp-folders-24.png<br/>deleted file mode 100644<br/>index b1c339a973..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/refresh-nntp-folders-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/refresh-nntp-folders-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/remove-nntp-folder-24.png b/art/remove-nntp-folder-24.png<br/>deleted file mode 100644<br/>index 5500bdec23..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/remove-nntp-folder-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/remove-nntp-folder-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/reply-to-all.png b/art/reply-to-all.png<br/>deleted file mode 100644<br/>index fa64fdeecf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply-to-all.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/reply-to-all.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/reply.png b/art/reply.png<br/>deleted file mode 100644<br/>index 70ee66b8eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/reply.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/reply.xpm b/art/reply.xpm<br/>deleted file mode 100644<br/>index 681801c7d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/reply.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * reply_xpm[] = {</div><div class='del'>-"16 16 27 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #FFFFFF",</div><div class='del'>-"&amp;	c #5D5B57",</div><div class='del'>-"*	c #868580",</div><div class='del'>-"=	c #E5E2DB",</div><div class='del'>-"-	c #FBFBF8",</div><div class='del'>-";	c #716E6B",</div><div class='del'>-"&gt;	c #000000",</div><div class='del'>-",	c #FBFAF7",</div><div class='del'>-"'	c #A5A29D",</div><div class='del'>-")	c #990000",</div><div class='del'>-"!	c #EFEFEF",</div><div class='del'>-"~	c #CCCCCC",</div><div class='del'>-"{	c #797873",</div><div class='del'>-"]	c #7D7A77",</div><div class='del'>-"^	c #F7F5F1",</div><div class='del'>-"/	c #090808",</div><div class='del'>-"(	c #D7D4CE",</div><div class='del'>-"_	c #D8D5CF",</div><div class='del'>-":	c #7F0000",</div><div class='del'>-"&lt;	c #181818",</div><div class='del'>-"[	c #090909",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  .+.........   ",</div><div class='del'>-" .@#########$.  ",</div><div class='del'>-" .%&amp;%%%%%%%*=.  ",</div><div class='del'>-" .%-;%&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt;&gt; ",</div><div class='del'>-" .%--;&gt;%%%%%%%&gt; ",</div><div class='del'>-" .%-,'&gt;%))))!~&gt; ",</div><div class='del'>-" .%,{-&gt;%)))!!~&gt; ",</div><div class='del'>-" .%]-^&gt;%))))!~&gt; ",</div><div class='del'>-" ./(__&gt;%)!)):~&gt; ",</div><div class='del'>-"  ....&gt;%!!!::~&gt; ",</div><div class='del'>-"      &gt;%~~~~~~&lt; ",</div><div class='del'>-"      &gt;&gt;[&gt;&gt;&gt;&gt;&gt;&gt; ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/reply_to_all.xpm b/art/reply_to_all.xpm<br/>deleted file mode 100644<br/>index be5c633f2a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply_to_all.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/reply_to_all.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * reply_to_all_xpm[] = {</div><div class='del'>-"16 16 33 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #010101",</div><div class='del'>-"+	c #2F2F2F",</div><div class='del'>-"@	c #A7A4A0",</div><div class='del'>-"#	c #FCFCFC",</div><div class='del'>-"$	c #64625F",</div><div class='del'>-"%	c #FFFFFF",</div><div class='del'>-"&amp;	c #5D5B57",</div><div class='del'>-"*	c #868580",</div><div class='del'>-"=	c #E5E2DB",</div><div class='del'>-"-	c #FBFBF8",</div><div class='del'>-";	c #716E6B",</div><div class='del'>-"&gt;	c #62605C",</div><div class='del'>-",	c #F8F7F2",</div><div class='del'>-"'	c #DDDAD4",</div><div class='del'>-")	c #F7F5F1",</div><div class='del'>-"!	c #FBFAF7",</div><div class='del'>-"~	c #A5A29D",</div><div class='del'>-"{	c #000000",</div><div class='del'>-"]	c #797873",</div><div class='del'>-"^	c #7D7A77",</div><div class='del'>-"/	c #FAF9F6",</div><div class='del'>-"(	c #F8F6F2",</div><div class='del'>-"_	c #990000",</div><div class='del'>-":	c #EFEFEF",</div><div class='del'>-"&lt;	c #CCCCCC",</div><div class='del'>-"[	c #090808",</div><div class='del'>-"}	c #D7D4CE",</div><div class='del'>-"|	c #D8D5CF",</div><div class='del'>-"1	c #D6D3CD",</div><div class='del'>-"2	c #7F0000",</div><div class='del'>-"3	c #181818",</div><div class='del'>-"4	c #090909",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-" .+.........    ",</div><div class='del'>-".@#########$.   ",</div><div class='del'>-".%&amp;%%%%%%%*=..  ",</div><div class='del'>-".%-;%%%%%&gt;,'.$. ",</div><div class='del'>-".%--;%%%;-)'.=. ",</div><div class='del'>-".%-!~;-{{{{{{{{{",</div><div class='del'>-".%!]--;{%%%%%%%{",</div><div class='del'>-".%^-)/({%____:&lt;{",</div><div class='del'>-".[}|||1{%___::&lt;{",</div><div class='del'>-" ......{%____:&lt;{",</div><div class='del'>-"  .[}||{%_:__2&lt;{",</div><div class='del'>-"   ....{%:::22&lt;{",</div><div class='del'>-"       {%&lt;&lt;&lt;&lt;&lt;&lt;3",</div><div class='del'>-"       {{4{{{{{{"};</div><div class='head'>diff --git a/art/save-16.png b/art/save-16.png<br/>deleted file mode 100644<br/>index 20a27ca2a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/save-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/save-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/save-24.png b/art/save-24.png<br/>deleted file mode 100644<br/>index 51375a3f40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/save-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/save-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/save-as-16.png b/art/save-as-16.png<br/>deleted file mode 100644<br/>index 3b9612efdf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/save-as-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/save-as-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/save.xpm b/art/save.xpm<br/>deleted file mode 100644<br/>index 7b1812943e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/save.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/save.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_save_xpm[] = {</div><div class='del'>-"16 16 26 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #B8CADB",</div><div class='del'>-"@	c #C5D4E3",</div><div class='del'>-"#	c #687B8D",</div><div class='del'>-"$	c #D8D8D8",</div><div class='del'>-"%	c #CFDBE6",</div><div class='del'>-"&amp;	c #9DB8D2",</div><div class='del'>-"*	c #728699",</div><div class='del'>-"=	c #BCCEDF",</div><div class='del'>-"-	c #FFFFFF",</div><div class='del'>-";	c #D2DEEA",</div><div class='del'>-"&gt;	c #C0D1E2",</div><div class='del'>-",	c #CFDBE7",</div><div class='del'>-"'	c #798EA3",</div><div class='del'>-")	c #D0DDE9",</div><div class='del'>-"!	c #B7CBDE",</div><div class='del'>-"~	c #B6CADD",</div><div class='del'>-"{	c #B7CADD",</div><div class='del'>-"]	c #BACCDF",</div><div class='del'>-"^	c #9FB9D3",</div><div class='del'>-"/	c #7E94A9",</div><div class='del'>-"(	c #A4BDD5",</div><div class='del'>-"_	c #BABABA",</div><div class='del'>-":	c #556474",</div><div class='del'>-"&lt;	c #2A303A",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  ............  ",</div><div class='del'>-" .+@#$$$$$$%&amp;*. ",</div><div class='del'>-" .=&amp;#------;&amp;*. ",</div><div class='del'>-" .&gt;&amp;#$$$$$$,&amp;*. ",</div><div class='del'>-" .&gt;&amp;'------)&amp;*. ",</div><div class='del'>-" .&gt;&amp;&amp;!~~{{]^&amp;*. ",</div><div class='del'>-" .&gt;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;*. ",</div><div class='del'>-" .&gt;&amp;&amp;//////&amp;&amp;*. ",</div><div class='del'>-" .&gt;(/$$_$-$/&amp;*. ",</div><div class='del'>-" .&gt;&amp;/$_$-/$/&amp;*. ",</div><div class='del'>-" .&gt;&amp;/$_-$/$/&amp;*. ",</div><div class='del'>-" .=&amp;/_$-$$$/**. ",</div><div class='del'>-"  .:........&lt;.  ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-high.xpm b/art/score-high.xpm<br/>deleted file mode 100644<br/>index bb7bd47562..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-high.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-high.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_high_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .+   ",</div><div class='del'>-"    @@@    .++  ",</div><div class='del'>-"   @#@#@   .++  ",</div><div class='del'>-"   @$%$@   .++  ",</div><div class='del'>-"   @$$$@   . +  ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-higher.xpm b/art/score-higher.xpm<br/>deleted file mode 100644<br/>index 696e74bed5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-higher.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-higher.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_higher_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++  ",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .  ++",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-highest.xpm b/art/score-highest.xpm<br/>deleted file mode 100644<br/>index d8dab65079..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-highest.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-highest.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_highest_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++++",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .    ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-low.xpm b/art/score-low.xpm<br/>deleted file mode 100644<br/>index e071741adc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-low.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-low.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_low_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .+   ",</div><div class='del'>-"    @@@    .++  ",</div><div class='del'>-"   @#@#@   .++  ",</div><div class='del'>-"   @$%$@   .++  ",</div><div class='del'>-"   @$$$@   . +  ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-lower.xpm b/art/score-lower.xpm<br/>deleted file mode 100644<br/>index 74da90d670..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-lower.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-lower.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_lower_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++  ",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .  ++",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm<br/>deleted file mode 100644<br/>index 9beee1849f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-lowest.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-lowest.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_lowest_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++++",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .    ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-normal.xpm b/art/score-normal.xpm<br/>deleted file mode 100644<br/>index 82b618cb8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-normal.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/score-normal.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_normal_xpm[] = {</div><div class='del'>-"16 16 5 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #17D1EA",</div><div class='del'>-"@	c #FFFFFF",</div><div class='del'>-"#	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    ...         ",</div><div class='del'>-"   .+.+.        ",</div><div class='del'>-"   .@#@.        ",</div><div class='del'>-"   .@@@.        ",</div><div class='del'>-"   ..@..        ",</div><div class='del'>-"  ..@@@..       ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-"  .@@@@@.       ",</div><div class='del'>-"   ##@##        ",</div><div class='del'>-"   ## ##        ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/search-16.png b/art/search-16.png<br/>deleted file mode 100644<br/>index 6e9837d8ee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/search-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/search-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/search-and-replace-16.png b/art/search-and-replace-16.png<br/>deleted file mode 100644<br/>index 5daa4c39a0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/search-and-replace-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/search-and-replace-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-16.png b/art/send-16.png<br/>deleted file mode 100644<br/>index 4cf96ead39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-24-receive.png b/art/send-24-receive.png<br/>deleted file mode 100644<br/>index 1d3d4df420..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-24-receive.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-24-receive.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-24.png b/art/send-24.png<br/>deleted file mode 100644<br/>index 5c7e4a261e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-24.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-24.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-48-receive.png b/art/send-48-receive.png<br/>deleted file mode 100644<br/>index 53f8b15d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-48-receive.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-48-receive.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-later-16.png b/art/send-later-16.png<br/>deleted file mode 100644<br/>index 3b2bb791d4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-later-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-later-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/send-receive.xpm b/art/send-receive.xpm<br/>deleted file mode 100644<br/>index f9ba82e5c8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send-receive.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send-receive.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * send_receive_xpm[] = {</div><div class='del'>-"16 16 39 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #F7EFD0",</div><div class='del'>-"@	c #F7EFD1",</div><div class='del'>-"#	c #EED680",</div><div class='del'>-"$	c #C38909",</div><div class='del'>-"%	c #F6ECC9",</div><div class='del'>-"&amp;	c #D1940C",</div><div class='del'>-"*	c #B98208",</div><div class='del'>-"=	c #A59458",</div><div class='del'>-"-	c #D1BC70",</div><div class='del'>-";	c #E9D17B",</div><div class='del'>-"&gt;	c #B07C08",</div><div class='del'>-",	c #916608",</div><div class='del'>-"'	c #F3E3A8",</div><div class='del'>-")	c #AE7B0A",</div><div class='del'>-"!	c #F4E4AD",</div><div class='del'>-"~	c #F5E9BC",</div><div class='del'>-"{	c #D8E6D2",</div><div class='del'>-"]	c #B9C9B1",</div><div class='del'>-"^	c #6F9059",</div><div class='del'>-"/	c #C6B26A",</div><div class='del'>-"(	c #D7E5D0",</div><div class='del'>-"_	c #AECCA1",</div><div class='del'>-":	c #557C3B",</div><div class='del'>-"&lt;	c #D3E3CB",</div><div class='del'>-"[	c #D0E1C9",</div><div class='del'>-"}	c #DBE7D6",</div><div class='del'>-"|	c #B9C3B5",</div><div class='del'>-"1	c #BDCEB6",</div><div class='del'>-"2	c #A9C79C",</div><div class='del'>-"3	c #65894C",</div><div class='del'>-"4	c #748C64",</div><div class='del'>-"5	c #668154",</div><div class='del'>-"6	c #669447",</div><div class='del'>-"7	c #58833C",</div><div class='del'>-"8	c #E1EBDC",</div><div class='del'>-"9	c #5E8A41",</div><div class='del'>-"0	c #E0EADB",</div><div class='del'>-"    .           ",</div><div class='del'>-"   .+.          ",</div><div class='del'>-"  .@#$.         ",</div><div class='del'>-" .%##&amp;*.        ",</div><div class='del'>-".%=-;&gt;,,.       ",</div><div class='del'>-"...'#)...       ",</div><div class='del'>-"  .!#).  .....  ",</div><div class='del'>-"  .~#).  .{]^.  ",</div><div class='del'>-"  .#/).  .(_:.  ",</div><div class='del'>-"  .....  .&lt;_:.  ",</div><div class='del'>-"       ...[_:...",</div><div class='del'>-"       .}|12345.",</div><div class='del'>-"        .}__67. ",</div><div class='del'>-"         .8_9.  ",</div><div class='del'>-"          .0.   ",</div><div class='del'>-"           .    "};</div><div class='head'>diff --git a/art/send.png b/art/send.png<br/>deleted file mode 100644<br/>index fb95df6016..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/send.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-close.png b/art/service-close.png<br/>deleted file mode 100644<br/>index d8e7cea744..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-close.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-close.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-configure.png b/art/service-configure.png<br/>deleted file mode 100644<br/>index 8c56dc4c7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-configure.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-configure.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-down-disabled.png b/art/service-down-disabled.png<br/>deleted file mode 100644<br/>index f6742ff105..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-down-disabled.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-down-disabled.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-down.png b/art/service-down.png<br/>deleted file mode 100644<br/>index 49f532f527..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-down.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-down.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-left-disabled.png b/art/service-left-disabled.png<br/>deleted file mode 100644<br/>index fc4256346b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-left-disabled.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-left-disabled.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-left.png b/art/service-left.png<br/>deleted file mode 100644<br/>index 38fe293e39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-left.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-left.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-right-disabled.png b/art/service-right-disabled.png<br/>deleted file mode 100644<br/>index 848c2a499c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-right-disabled.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-right-disabled.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-right.png b/art/service-right.png<br/>deleted file mode 100644<br/>index 7fdabac13d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-right.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-right.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-up-disabled.png b/art/service-up-disabled.png<br/>deleted file mode 100644<br/>index 6258caa5d9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-up-disabled.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-up-disabled.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-up.png b/art/service-up.png<br/>deleted file mode 100644<br/>index a24b336c6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-up.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/service-up.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/show_all_messages.xpm b/art/show_all_messages.xpm<br/>deleted file mode 100644<br/>index f38a42aebf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/show_all_messages.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/show_all_messages.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * show_all_messages_xpm[] = {</div><div class='del'>-"16 16 8 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #9DB8D2",</div><div class='del'>-"@	c #FFFFFF",</div><div class='del'>-"#	c #89A1B9",</div><div class='del'>-"$	c #859DB4",</div><div class='del'>-"%	c #CACACA",</div><div class='del'>-"&amp;	c #8199AF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    .         . ",</div><div class='del'>-"   . .       . .",</div><div class='del'>-"  .         .  .",</div><div class='del'>-" ...........    ",</div><div class='del'>-" .+@+. .+@+.    ",</div><div class='del'>-" .#+$. .%+&amp;.    ",</div><div class='del'>-"  ...   ...     ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/splash-1-0.png b/art/splash-1-0.png<br/>deleted file mode 100644<br/>index 13dabfd980..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/splash-1-0.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/splash-1-0.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/splash.png b/art/splash.png<br/>deleted file mode 100644<br/>index 530e0f743c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/splash.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/splash.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/summary-settings.png b/art/summary-settings.png<br/>deleted file mode 100644<br/>index 011d94ac0a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/summary-settings.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/summary-settings.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/summary_preferences-16.png b/art/summary_preferences-16.png<br/>deleted file mode 100644<br/>index 4a318c2fd1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/summary_preferences-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/summary_preferences-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/talking-heads.png b/art/talking-heads.png<br/>deleted file mode 100644<br/>index 1c2ba5b040..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/talking-heads.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/talking-heads.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/task-assigned-to.xpm b/art/task-assigned-to.xpm<br/>deleted file mode 100644<br/>index d60eeafa2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/task-assigned-to.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/task-assigned-to.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_assigned_to_xpm[] = {</div><div class='del'>-"16 16 11 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #ABCCAB",</div><div class='del'>-"*	c #768E76",</div><div class='del'>-"=	c #5E705E",</div><div class='del'>-"-	c #EEEEEE",</div><div class='del'>-"   . . . . .    ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .+.+.+.+.+.@.  ",</div><div class='del'>-" .+.#.#.#.#.$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#######..$.  ",</div><div class='del'>-" .+%%%%%%%.&amp;..  ",</div><div class='del'>-" .+##......&amp;&amp;.  ",</div><div class='del'>-" .+%%.&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;. ",</div><div class='del'>-" .+##.&amp;*&amp;*&amp;*&amp;*&amp;.",</div><div class='del'>-" .+%%.========. ",</div><div class='del'>-" .+##......==.  ",</div><div class='del'>-" .+%%%%%%%.=..  ",</div><div class='del'>-" .-$$$$$$$..$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/task-assigned.xpm b/art/task-assigned.xpm<br/>deleted file mode 100644<br/>index 9b245c0c49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/task-assigned.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/task-assigned.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_assigned_xpm[] = {</div><div class='del'>-"16 16 11 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #FFCC66",</div><div class='del'>-"*	c #CC9933",</div><div class='del'>-"=	c #996600",</div><div class='del'>-"-	c #EEEEEE",</div><div class='del'>-"   . . . . .    ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .+.+.+.+.+.@.  ",</div><div class='del'>-" .+.#.#.#.#.$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+##..#####$.  ",</div><div class='del'>-" .+%%.&amp;.%%%%$.  ",</div><div class='del'>-"......&amp;&amp;.###$.  ",</div><div class='del'>-".&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;.%%$.  ",</div><div class='del'>-".&amp;*&amp;*&amp;*&amp;*&amp;.#$.  ",</div><div class='del'>-".========.%%$.  ",</div><div class='del'>-"......==.###$.  ",</div><div class='del'>-" .+%%.=.%%%%$.  ",</div><div class='del'>-" .-$$..$$$$$$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/task-recurring.xpm b/art/task-recurring.xpm<br/>deleted file mode 100644<br/>index 634cd87a84..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/task-recurring.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/task-recurring.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_recurring_xpm[] = {</div><div class='del'>-"16 16 40 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #BFBFC3",</div><div class='del'>-"*	c #A2A2B0",</div><div class='del'>-"=	c #454572",</div><div class='del'>-"-	c #9898A9",</div><div class='del'>-";	c #85859C",</div><div class='del'>-"&gt;	c #333366",</div><div class='del'>-",	c #4F4F79",</div><div class='del'>-"'	c #B3B3C3",</div><div class='del'>-")	c #A3A3B7",</div><div class='del'>-"!	c #9696AD",</div><div class='del'>-"~	c #464672",</div><div class='del'>-"{	c #7F7F99",</div><div class='del'>-"]	c #C9C9CA",</div><div class='del'>-"^	c #3D3D6D",</div><div class='del'>-"/	c #3B3B6B",</div><div class='del'>-"(	c #A4A4B8",</div><div class='del'>-"_	c #B5B5C4",</div><div class='del'>-":	c #D1D1D8",</div><div class='del'>-"&lt;	c #9191A4",</div><div class='del'>-"[	c #B5B5BD",</div><div class='del'>-"}	c #9F9FAE",</div><div class='del'>-"|	c #4A4A76",</div><div class='del'>-"1	c #40406F",</div><div class='del'>-"2	c #E9E9E9",</div><div class='del'>-"3	c #8F8FA9",</div><div class='del'>-"4	c #9D9DAC",</div><div class='del'>-"5	c #9090A4",</div><div class='del'>-"6	c #55557F",</div><div class='del'>-"7	c #ADADBE",</div><div class='del'>-"8	c #484875",</div><div class='del'>-"9	c #B9B9C7",</div><div class='del'>-"0	c #DCDCE0",</div><div class='del'>-"a	c #EEEEEE",</div><div class='del'>-"   . . . . .    ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .+.+.+.+.+.@.  ",</div><div class='del'>-" .+.#.#.#.#.$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+&amp;*=-#;&gt;&gt;,$.  ",</div><div class='del'>-" .+'&gt;)%%!&gt;&gt;'$.  ",</div><div class='del'>-" .+~{]##;^/~$.  ",</div><div class='del'>-" .+&gt;(%%%_:(&gt;$.  ",</div><div class='del'>-" .+&gt;&lt;[}###&lt;&gt;$.  ",</div><div class='del'>-" .+|^1!%%23|$.  ",</div><div class='del'>-" .+4&gt;&gt;;##5&gt;4$.  ",</div><div class='del'>-" .+6&gt;&gt;!%7890$.  ",</div><div class='del'>-" .a$$$$$$$$$$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/task.png b/art/task.png<br/>deleted file mode 100644<br/>index 5b3c7b7534..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/task.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/task.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/task.xpm b/art/task.xpm<br/>deleted file mode 100644<br/>index 4a53c3e9ab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/task.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/task.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_xpm[] = {</div><div class='del'>-"16 16 8 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #EEEEEE",</div><div class='del'>-"   . . . . .    ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .+.+.+.+.+.@.  ",</div><div class='del'>-" .+.#.#.#.#.$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .&amp;$$$$$$$$$$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/thankyou.png b/art/thankyou.png<br/>deleted file mode 100644<br/>index f08f553cc3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/thankyou.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/thankyou.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/timezone-16.xpm b/art/timezone-16.xpm<br/>deleted file mode 100644<br/>index 6f3094a395..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/timezone-16.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/timezone-16.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * timezone_16_xpm[] = {</div><div class='del'>-"16 16 143 2",</div><div class='del'>-"  	c None",</div><div class='del'>-". 	c #000000",</div><div class='del'>-"+ 	c #2A2B2B",</div><div class='del'>-"@ 	c #020203",</div><div class='del'>-"# 	c #050709",</div><div class='del'>-"$ 	c #020202",</div><div class='del'>-"% 	c #7490B2",</div><div class='del'>-"&amp; 	c #A6BDD4",</div><div class='del'>-"* 	c #C0D3E5",</div><div class='del'>-"= 	c #E6E7E6",</div><div class='del'>-"- 	c #C7CCC5",</div><div class='del'>-"; 	c #9BAC9F",</div><div class='del'>-"&gt; 	c #030304",</div><div class='del'>-", 	c #010101",</div><div class='del'>-"' 	c #82848E",</div><div class='del'>-") 	c #80846B",</div><div class='del'>-"! 	c #7FA59B",</div><div class='del'>-"~ 	c #AECFE0",</div><div class='del'>-"{ 	c #C0D8EF",</div><div class='del'>-"] 	c #B4C4C2",</div><div class='del'>-"^ 	c #6A8B6C",</div><div class='del'>-"/ 	c #699678",</div><div class='del'>-"( 	c #51826F",</div><div class='del'>-"_ 	c #2D535E",</div><div class='del'>-": 	c #1C492A",</div><div class='del'>-"&lt; 	c #5EA66A",</div><div class='del'>-"[ 	c #7BC280",</div><div class='del'>-"} 	c #67BA7A",</div><div class='del'>-"| 	c #7AC7A7",</div><div class='del'>-"1 	c #B1D1EC",</div><div class='del'>-"2 	c #94ADAF",</div><div class='del'>-"3 	c #719177",</div><div class='del'>-"4 	c #609996",</div><div class='del'>-"5 	c #5B9583",</div><div class='del'>-"6 	c #537762",</div><div class='del'>-"7 	c #6E9874",</div><div class='del'>-"8 	c #64A970",</div><div class='del'>-"9 	c #6DBD77",</div><div class='del'>-"0 	c #5FB565",</div><div class='del'>-"a 	c #5DAD6B",</div><div class='del'>-"b 	c #89BFF1",</div><div class='del'>-"c 	c #89BFF5",</div><div class='del'>-"d 	c #4C9DAB",</div><div class='del'>-"e 	c #459D82",</div><div class='del'>-"f 	c #55A395",</div><div class='del'>-"g 	c #557A5C",</div><div class='del'>-"h 	c #1A304E",</div><div class='del'>-"i 	c #74B678",</div><div class='del'>-"j 	c #5EB666",</div><div class='del'>-"k 	c #49A54F",</div><div class='del'>-"l 	c #4CA34F",</div><div class='del'>-"m 	c #90C4E4",</div><div class='del'>-"n 	c #7BB8F8",</div><div class='del'>-"o 	c #7FBCF8",</div><div class='del'>-"p 	c #49A09A",</div><div class='del'>-"q 	c #389B6F",</div><div class='del'>-"r 	c #81ACBF",</div><div class='del'>-"s 	c #617B65",</div><div class='del'>-"t 	c #5B735E",</div><div class='del'>-"u 	c #010202",</div><div class='del'>-"v 	c #7AAD6E",</div><div class='del'>-"w 	c #438C3D",</div><div class='del'>-"x 	c #6AA8A1",</div><div class='del'>-"y 	c #92C5F1",</div><div class='del'>-"z 	c #77B8F6",</div><div class='del'>-"A 	c #77B7F7",</div><div class='del'>-"B 	c #7BB7F2",</div><div class='del'>-"C 	c #5DA9BA",</div><div class='del'>-"D 	c #56A4A1",</div><div class='del'>-"E 	c #85B1D9",</div><div class='del'>-"F 	c #637679",</div><div class='del'>-"G 	c #586D86",</div><div class='del'>-"H 	c #040506",</div><div class='del'>-"I 	c #6B975F",</div><div class='del'>-"J 	c #749486",</div><div class='del'>-"K 	c #85BDD9",</div><div class='del'>-"L 	c #8FBFEF",</div><div class='del'>-"M 	c #82BBF4",</div><div class='del'>-"N 	c #82BAF2",</div><div class='del'>-"O 	c #84B9EE",</div><div class='del'>-"P 	c #71AFEE",</div><div class='del'>-"Q 	c #96ABBF",</div><div class='del'>-"R 	c #8AB7D4",</div><div class='del'>-"S 	c #668B77",</div><div class='del'>-"T 	c #557E74",</div><div class='del'>-"U 	c #040406",</div><div class='del'>-"V 	c #649D69",</div><div class='del'>-"W 	c #508B52",</div><div class='del'>-"X 	c #508074",</div><div class='del'>-"Y 	c #7EAEDD",</div><div class='del'>-"Z 	c #81BBF4",</div><div class='del'>-"` 	c #81B9F2",</div><div class='del'>-" .	c #83B8EE",</div><div class='del'>-"..	c #80ACD5",</div><div class='del'>-"+.	c #908466",</div><div class='del'>-"@.	c #64825C",</div><div class='del'>-"#.	c #5C7F5A",</div><div class='del'>-"$.	c #627F5C",</div><div class='del'>-"%.	c #5C7677",</div><div class='del'>-"&amp;.	c #5C9D67",</div><div class='del'>-"*.	c #5D9071",</div><div class='del'>-"=.	c #617576",</div><div class='del'>-"-.	c #7DB2E8",</div><div class='del'>-";.	c #7EB4EA",</div><div class='del'>-"&gt;.	c #7BB0E6",</div><div class='del'>-",.	c #7698B8",</div><div class='del'>-"'.	c #66855E",</div><div class='del'>-").	c #53885E",</div><div class='del'>-"!.	c #51845C",</div><div class='del'>-"~.	c #61825D",</div><div class='del'>-"{.	c #3D362D",</div><div class='del'>-"].	c #0A1C14",</div><div class='del'>-"^.	c #609D73",</div><div class='del'>-"/.	c #68A879",</div><div class='del'>-"(.	c #628E77",</div><div class='del'>-"_.	c #7AAEE4",</div><div class='del'>-":.	c #70A4DB",</div><div class='del'>-"&lt;.	c #72A7DD",</div><div class='del'>-"[.	c #6997C6",</div><div class='del'>-"}.	c #598860",</div><div class='del'>-"|.	c #51835C",</div><div class='del'>-"1.	c #638860",</div><div class='del'>-"2.	c #07090A",</div><div class='del'>-"3.	c #50716C",</div><div class='del'>-"4.	c #6FA779",</div><div class='del'>-"5.	c #5D8976",</div><div class='del'>-"6.	c #7AA7D4",</div><div class='del'>-"7.	c #73A5D7",</div><div class='del'>-"8.	c #6495C7",</div><div class='del'>-"9.	c #557FAB",</div><div class='del'>-"0.	c #65855F",</div><div class='del'>-"a.	c #5A875F",</div><div class='del'>-"b.	c #558462",</div><div class='del'>-"c.	c #778383",</div><div class='del'>-"d.	c #7B98B4",</div><div class='del'>-"e.	c #7CA0C3",</div><div class='del'>-"f.	c #7397BD",</div><div class='del'>-"g.	c #7D8FA0",</div><div class='del'>-"h.	c #809980",</div><div class='del'>-"i.	c #143325",</div><div class='del'>-"j.	c #597658",</div><div class='del'>-"k.	c #030505",</div><div class='del'>-"l.	c #030404",</div><div class='del'>-"                                ",</div><div class='del'>-"          . . + @ @ #           ",</div><div class='del'>-"      . $ % &amp; * = - ; &gt; ,       ",</div><div class='del'>-"    . ' ) ! ~ { ] ^ / ( _ ,     ",</div><div class='del'>-"    : &lt; [ } | 1 2 3 4 5 6 $     ",</div><div class='del'>-"  , 7 8 9 0 a b c d e f g h ,   ",</div><div class='del'>-"  , i j k l m n o p q r s t u   ",</div><div class='del'>-"  , v w x y z A B C D E F G H   ",</div><div class='del'>-"  , I J K L M N O P Q R S T U   ",</div><div class='del'>-"  , V W X Y Z `  ...+.@.#.$.H   ",</div><div class='del'>-"  u %.&amp;.*.=.-.;.&gt;.,.'.).!.~.{.  ",</div><div class='del'>-"    ].^./.(._.:.&lt;.[.}.|.1.2.    ",</div><div class='del'>-"    @ 3.4.5.6.7.8.9.0.a.b.&gt;     ",</div><div class='del'>-"      @ H c.d.e.f.g.h.i.j.      ",</div><div class='del'>-"          u u k.&gt; l.&gt;           ",</div><div class='del'>-"                                "};</div><div class='head'>diff --git a/art/timezone-48.png b/art/timezone-48.png<br/>deleted file mode 100644<br/>index 2222e6f903..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/timezone-48.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/timezone-48.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm<br/>deleted file mode 100644<br/>index fc748953eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/tree-expanded.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/tree-expanded.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * tree_expanded_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+.....+.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm<br/>deleted file mode 100644<br/>index 0dfb12a0a5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/tree-unexpanded.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/tree-unexpanded.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * tree_unexpanded_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+.....+.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/undelete_message-16.png b/art/undelete_message-16.png<br/>deleted file mode 100644<br/>index 066cbfc99c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/undelete_message-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/undelete_message-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/wax-seal-broken.png b/art/wax-seal-broken.png<br/>deleted file mode 100644<br/>index 951f062dcc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/wax-seal-broken.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/wax-seal-broken.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/wax-seal.png b/art/wax-seal.png<br/>deleted file mode 100644<br/>index 5b0ba63bff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/wax-seal.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/wax-seal.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/weekview.xpm b/art/weekview.xpm<br/>deleted file mode 100644<br/>index 869b9e722a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/weekview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/weekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * weekview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D8D8D4",</div><div class='del'>-"#	c #F2F1ED",</div><div class='del'>-"$	c #919191",</div><div class='del'>-"%	c #666666",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++++++++@++++++++++. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$$$$$$$$$$$. ",</div><div class='del'>-".+#########$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".@$$$$$$$$$%$$$$$$$$$%. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/art/work_offline.xpm b/art/work_offline.xpm<br/>deleted file mode 100644<br/>index b4c2cdc17f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/work_offline.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/work_offline.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * 16_work_offline_xpm[] = {</div><div class='del'>-"16 16 14 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #424242",</div><div class='del'>-"+	c #212121",</div><div class='del'>-"@	c #737373",</div><div class='del'>-"#	c #EFEFEF",</div><div class='del'>-"$	c #DEDEDE",</div><div class='del'>-"%	c #CECECE",</div><div class='del'>-"&amp;	c #101010",</div><div class='del'>-"*	c #8C8C8C",</div><div class='del'>-"=	c #636363",</div><div class='del'>-"-	c #ADADAD",</div><div class='del'>-";	c #9C9C9C",</div><div class='del'>-"&gt;	c #000000",</div><div class='del'>-",	c #BDBDBD",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"     .+++..@    ",</div><div class='del'>-"    . ###$$%&amp;   ",</div><div class='del'>-"   @#*=*-*=*%@  ",</div><div class='del'>-"   .#;&gt; %-&gt;;%+  ",</div><div class='del'>-"   .$-&gt; %-&gt;,%+  ",</div><div class='del'>-"   .$;$#,;$ %+  ",</div><div class='del'>-"   .$$ %+% #%&amp;  ",</div><div class='del'>-"   @%-$@&gt;@%-%.  ",</div><div class='del'>-"    .,;;;;-,.   ",</div><div class='del'>-"     @++++&amp;.    ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/work_online-16.png b/art/work_online-16.png<br/>deleted file mode 100644<br/>index b11d36d277..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/work_online-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/work_online-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/working-16.png b/art/working-16.png<br/>deleted file mode 100644<br/>index 5f12053a84..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/working-16.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/working-16.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/workweekview.xpm b/art/workweekview.xpm<br/>deleted file mode 100644<br/>index 35cceedbdc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/workweekview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/workweekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * workweekview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D8D8D4",</div><div class='del'>-"#	c #B5B4AF",</div><div class='del'>-"$	c #666666",</div><div class='del'>-"%	c #F2F1ED",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++@+++@+++@+++@++++. ",</div><div class='del'>-".+###$###$###$###$###$. ",</div><div class='del'>-".+###$###$###$###$###$. ",</div><div class='del'>-".@$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".++++#+++#+++#+++#+++#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".@###$###$###$###$####. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/art/world_map-960.png b/art/world_map-960.png<br/>deleted file mode 100644<br/>index 0512d20115..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/world_map-960.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/world_map-960.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/yearview.xpm b/art/yearview.xpm<br/>deleted file mode 100644<br/>index 0d4fa4135b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/yearview.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>art/yearview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * yearview_xpm[] = {</div><div class='del'>-"24 24 17 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F2F1ED",</div><div class='del'>-"#	c #AAA9A6",</div><div class='del'>-"$	c #D7D6D2",</div><div class='del'>-"%	c #92918E",</div><div class='del'>-"&amp;	c #B7B6B3",</div><div class='del'>-"*	c #CBCAC6",</div><div class='del'>-"=	c #919191",</div><div class='del'>-"-	c #888785",</div><div class='del'>-";	c #B6B6B2",</div><div class='del'>-"&gt;	c #888884",</div><div class='del'>-",	c #C1C1BD",</div><div class='del'>-"'	c #A7A6A3",</div><div class='del'>-")	c #D8D8D4",</div><div class='del'>-"!	c #666666",</div><div class='del'>-"....................... ",</div><div class='del'>-".+++++++++++++++++++++. ",</div><div class='del'>-".+@@@@@@@#$%&amp;*@@@@@@@=. ",</div><div class='del'>-".+@@@@@@@-;&gt;,'@@@@@@@=. ",</div><div class='del'>-".+====================. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".)===================!. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/autogen.sh b/autogen.sh<br/>deleted file mode 100755<br/>index eec4b5f56d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/autogen.sh?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>autogen.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# Run this to generate all the initial makefiles, etc.</div><div class='del'>-</div><div class='del'>-srcdir=`dirname $0`</div><div class='del'>-test -z "$srcdir" &amp;&amp; srcdir=.</div><div class='del'>-</div><div class='del'>-PKG_NAME="evolution"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-. $srcdir/macros/autogen.sh</div><div class='head'>diff --git a/calendar/.cvsignore b/calendar/.cvsignore<br/>deleted file mode 100644<br/>index b7f7dea650..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-_libs</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='head'>diff --git a/calendar/AUTHORS b/calendar/AUTHORS<br/>deleted file mode 100644<br/>index e4fda3d3bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/AUTHORS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/AUTHORS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-Miguel de Icaza &lt;miguel@kernel.org&gt;</div><div class='del'>-Federico Mena &lt;federico@helixcode.com&gt;</div><div class='del'>-Arturo Esponosa &lt;arturo@nuclecu.unam.mx&gt;</div><div class='del'>-Russell Steinthal &lt;rms39@columbia.edu&gt;</div><div class='del'>-Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>-Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='head'>diff --git a/calendar/ChangeLog b/calendar/ChangeLog<br/>deleted file mode 100644<br/>index 64748151dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16584 +0,0 @@</div><div class='del'>-2002-05-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c (schedule_page_construct): set the</div><div class='del'>-	working hours for the meeting time selector</div><div class='del'>-	</div><div class='del'>-2002-05-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: make the range datetime member a</div><div class='del'>-	struct not a pointer</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_recurid): take a</div><div class='del'>-	pointer to a range</div><div class='del'>-	(cal_component_set_recurid): ditto</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_minimal): get/set the recurrence id</div><div class='del'>-	properly</div><div class='del'>-	</div><div class='del'>-2002-05-09  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (get_servers): use</div><div class='del'>-	GNOME_Evolution_Storage__get_folderList instead of</div><div class='del'>-	GNOME_Evolution_Storage_getFolderList since I have now changed</div><div class='del'>-	that to be an attribute instead of a method.</div><div class='del'>-</div><div class='del'>-2002-05-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (start_calendar_server): start a server a</div><div class='del'>-	uri</div><div class='del'>-	(start_default_server): start a default server</div><div class='del'>-	(get_servers): get all clients for all folders of the given</div><div class='del'>-	type(s)</div><div class='del'>-	(find_server): locate a server for a particular uid</div><div class='del'>-	(init): get_servers, listen for object_requested signal</div><div class='del'>-	(destroy): destroy all clients</div><div class='del'>-	(write_html): put options is there own cell</div><div class='del'>-	(get_publish_options): place selector in if param is true</div><div class='del'>-	(get_request_options): ditto</div><div class='del'>-	(get_real_item): only try and look up the item if we know its in</div><div class='del'>-	the server</div><div class='del'>-	(show_current_event): find the server (if any) for the current</div><div class='del'>-	comp</div><div class='del'>-	(show_current_todo): ditto</div><div class='del'>-	(update_attendee_status): if there is no server for the comp, it</div><div class='del'>-	doesn't exist</div><div class='del'>-	(remove_item): ditto</div><div class='del'>-	(button_selected_cb): get a client for the selected folder</div><div class='del'>-	(object_requested_cb): draw the folder button in</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_default_tasks_folder):</div><div class='del'>-	get default tasks uri</div><div class='del'>-	(calendar_config_default_calendar_folder): get default calendar</div><div class='del'>-	uri</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (get_default_uri): use</div><div class='del'>-	cal_util_expand_uri</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: new proto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_util_expand_uri): tack on the file name</div><div class='del'>-	if its a file uri</div><div class='del'>-</div><div class='del'>-2002-05-03  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_delete_selected):</div><div class='del'>-	(e_tasks_complete_selected): show progress messages</div><div class='del'>-	on the status bar.</div><div class='del'>-</div><div class='del'>-2002-05-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/query.c: #include &lt;gtk/gtkmain.h&gt; to avoid warnings.</div><div class='del'>-</div><div class='del'>-2002-05-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (free_view_popup): only discard the popup if</div><div class='del'>-	we created one</div><div class='del'>-</div><div class='del'>-2002-05-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/query.c: refactored a bit, to not do things in idle loops.</div><div class='del'>-</div><div class='del'>-2002-05-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_day_details): modify the start and end hours</div><div class='del'>-	to accomodate all the events in the day</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (free_view_popup): only discard the popup if we</div><div class='del'>-	created one</div><div class='del'>-</div><div class='del'>-2002-04-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct): remove setup_widgets</div><div class='del'>-	from here</div><div class='del'>-	(gnome_calendar_init): move setup_widgets back here</div><div class='del'>-</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Don't link to libibex anymore!!</div><div class='del'>-</div><div class='del'>-2002-04-24  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_pilot_settings): launch pilot</div><div class='del'>-	settings capplet</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_pilot_settings): ditto</div><div class='del'>-	</div><div class='del'>-2002-04-24  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-week-view.c (free_view_popup): free the view popup</div><div class='del'>-	(e_week_view_show_popup_menu): add the view popup to the</div><div class='del'>-	"main_item" menu and listen for destruction</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (free_view_popup): as above</div><div class='del'>-	(e_day_view_on_event_right_click): as above</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.h: add class member</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: add a class member</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (set_view): set the instance view id properly</div><div class='del'>-	when switching views</div><div class='del'>-	(gnome_calendar_setup_view_popup): generate a view popup</div><div class='del'>-	(gnome_calendar_discard_view_popup): destroy a view popup</div><div class='del'>-</div><div class='del'>-2002-04-22  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (impl_Cal_get_alarms_in_range): raise an exception if the</div><div class='del'>-	backend's method returns NULL, since we can't send a NULL pointer to</div><div class='del'>-	ORBit.</div><div class='del'>-</div><div class='del'>-2002-04-19  Anna Marie Dirks  &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Collapsed notebook into two pages</div><div class='del'>-	and added accelerators for everything, as part of my config dialog</div><div class='del'>-	polishing project</div><div class='del'>-</div><div class='del'>-2002-04-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): properly</div><div class='del'>-	handle -ve recurrence values</div><div class='del'>-	(month_num_submenu_selection_done_cb): track the current date in</div><div class='del'>-	use</div><div class='del'>-	(make_recur_month_num_submenu): make a submenu of dates</div><div class='del'>-	(make_recur_month_num_menu): make the date/relation option menu</div><div class='del'>-	(month_num_menu_selection_done_cb): update the date properly and</div><div class='del'>-	keep both option menus consistent</div><div class='del'>-	(month_day_menu_selection_done_cb): keep both option menus</div><div class='del'>-	consistent</div><div class='del'>-	(make_monthly_special): listen for selection done signal</div><div class='del'>-	(make_recurrence_special): destroy old month_num_menu</div><div class='del'>-	(recurrence_page_fill_widgets): properly handle -ve recurrence</div><div class='del'>-	values</div><div class='del'>-</div><div class='del'>-2002-04-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_settings): show the settings</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_settings): ditto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (control_util_show_settings): show the</div><div class='del'>-	settings dialog</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (control_factory_new_control): set the</div><div class='del'>-	control as object data on the calendar</div><div class='del'>-</div><div class='del'>-2002-04-17  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c,</div><div class='del'>-	gui/dialogs/meeting-page.c: Updated these to match the new</div><div class='del'>-	EPopupMenu.</div><div class='del'>-</div><div class='del'>-2002-04-05  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.[ch] (cal_backend_get_query): new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_query): new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (impl_Cal_get_query): call the CalBackend's implementation</div><div class='del'>-	instead of calling query_new directly.</div><div class='del'>-</div><div class='del'>-	* pcs/query.[ch]: fixed headers.</div><div class='del'>-</div><div class='del'>-2002-04-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): Fix this: Rodrigo's patch</div><div class='del'>-	used one of the functions I just removed. :)</div><div class='del'>-</div><div class='del'>-2002-04-10  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): use the default uri for</div><div class='del'>-	tasks (as stored in the configuration) when the calendar URI is not</div><div class='del'>-	a local one (connector, etc).</div><div class='del'>-</div><div class='del'>-2002-04-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (get_default_uri): Use new-and-improved</div><div class='del'>-	default folder URI config paths.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_{get,set}_default_uri,</div><div class='del'>-	calendar_config_{get,set}_default_tasks_uri): Remove these. The</div><div class='del'>-	shell owns this information now. (Weren't being used anyway.)</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (get_data_uri): Fix another place that</div><div class='del'>-	hardcoded tacking foo.ics on to the end of URLs.</div><div class='del'>-</div><div class='del'>-2002-04-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_view): Add view_info arg. If the</div><div class='del'>-	view_info is non-empty and this is a calendar folder, set the</div><div class='del'>-	"view" property on the control's propertybag.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (calendar_properties_init): Set up the</div><div class='del'>-	"view" property.</div><div class='del'>-	(get_prop, set_prop): handle the "view" property by</div><div class='del'>-	getting/setting the GnomeCalendar's view. Unfortunately, this</div><div class='del'>-	doesn't actually work. See #23208.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Set the UI</div><div class='del'>-	component's container before calling</div><div class='del'>-	gnome_calendar_set_ui_component so that the search bar</div><div class='del'>-	initialization will work.</div><div class='del'>-</div><div class='del'>-2002-04-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.[hc]: Remove dead files.</div><div class='del'>-</div><div class='del'>-2002-04-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: add config_item:type</div><div class='del'>-</div><div class='del'>-2002-04-01  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: Fix a string.</div><div class='del'>-	</div><div class='del'>-2002-04-01  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c: simple fix for DB3 header inclusion in</div><div class='del'>-	Mac OS X, by Max Horn &lt;max@quendi.de&gt;</div><div class='del'>-</div><div class='del'>-2002-03-31  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (clean_up): free the my_address member</div><div class='del'>-	(find_my_address): fall back on a CN match if possible</div><div class='del'>-	(change_status): handle changing the status of a non-existent</div><div class='del'>-	address by adding a new attendee</div><div class='del'>-	(update_attendee_status): if the attendee response is not from a</div><div class='del'>-	user on the list of attendees, ask the user if they want to add</div><div class='del'>-	the attendee any how (as an optional participant)</div><div class='del'>-	(ok_clicked_cb): if we are suppose to rsvp and the status was ok,</div><div class='del'>-	but the attendee address is not known, find it</div><div class='del'>-	</div><div class='del'>-2002-03-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Set a priority for the</div><div class='del'>-	config item.  Rename to "Calendar and Tasks".</div><div class='del'>-</div><div class='del'>-2002-03-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: s/libversit.la/libversit.a/</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2002-03-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-calendar-table.c: implement new pop up menu items for</div><div class='del'>-	"Save as", "Print", "Assign Task", "Forward as iCalendar"</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: similarly, also "Publish Free/Busy</div><div class='del'>-	Information" and "New Meeting" and "New Task"</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (show_assignment): move the assignment</div><div class='del'>-	page stuff here</div><div class='del'>-	(task_editor_show_assignment): use it</div><div class='del'>-	(assign_task_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_as_cmd): use new e-util file</div><div class='del'>-	selector function</div><div class='del'>-</div><div class='del'>-	* meeting-mockup.glade: Remove old file</div><div class='del'>-</div><div class='del'>-	* topic.dat</div><div class='del'>-</div><div class='del'>-2002-03-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: s/libversit.la/libversit.a/</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Likewise</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Likewise</div><div class='del'>-</div><div class='del'>-2002-03-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c: Removed `search_menu_items'.</div><div class='del'>-	(cal_search_bar_menu_activated): Removed.</div><div class='del'>-	(cal_search_bar_class_init): Don't install.</div><div class='del'>-	(cal_search_bar_construct): No menu items here.</div><div class='del'>-</div><div class='del'>-2002-03-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Updated to use new EPopupMenu API.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: Updated to use new EPopupMenu API.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Updated to use new EPopupMenu API.</div><div class='del'>-</div><div class='del'>-2002-03-15  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): Call</div><div class='del'>-	`e_tasks_set_ui_component()' here to give it the</div><div class='del'>-	BonoboUIComponent.</div><div class='del'>-	(tasks_control_deactivate): Likewise, call it here to unset the</div><div class='del'>-	BonoboUIComponent.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_set_ui_component): New.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Call</div><div class='del'>-	gnome_calendar_set_ui_component() here.</div><div class='del'>-	(calendar_control_deactivate): ...And here, with a NULL</div><div class='del'>-	BonoboUIComponent.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.</div><div class='del'>-</div><div class='del'>-2002-03-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: use bonobo exception macros to tidy</div><div class='del'>-</div><div class='del'>-	* gui/itip-control-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: ditto</div><div class='del'>-</div><div class='del'>-2002-03-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: add all day event editor mode</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: clean up exception handling</div><div class='del'>-	(sc_user_create_new_item_cb): support the all day event id</div><div class='del'>-	(create_object): add a user creatable all day appointment item</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c (get_default_event): get a default</div><div class='del'>-	event either all day or starting at the top of the hour</div><div class='del'>-	(get_default_task): get a default task</div><div class='del'>-	(edit_new): support the all day event mode</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: remove unused functions/verbs</div><div class='del'>-</div><div class='del'>-2002-03-13  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Add an</div><div class='del'>-	"evolution:config_item:icon_path" attribute so we get an icon for</div><div class='del'>-	the calendar preferences.</div><div class='del'>-</div><div class='del'>-2002-03-12  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Add &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-	to cal-prefs-dialog so it doesn't get shown when we load the Glade</div><div class='del'>-	file with libglade.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Register the</div><div class='del'>-	ConfigControl factory.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: Removed verb "TaskSettings".</div><div class='del'>-	(tasks_control_settings_cmd): Removed.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Removed verb "CalendarSettings".</div><div class='del'>-	(settings_cmd): Removed.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c: Renamed `CalPrefsDialogPrivate'</div><div class='del'>-	to `DialogData'.  Replace `dialog' member with a `page' member.</div><div class='del'>-	Remove `toplevel_notebook' member.</div><div class='del'>-	(init_widgets): Renamed from `cal_prefs_dialog_init_widgets'.</div><div class='del'>-	Just get a DialogData.</div><div class='del'>-	(get_widgets): Get a DialogData pointer.</div><div class='del'>-	(cal_prefs_dialog_destroy): Removed.</div><div class='del'>-	(config_control_destroy_callback): New, signal handler for</div><div class='del'>-	::destroy for ConfigControl.</div><div class='del'>-	(cal_prefs_dialog_new): Create a new DialogData, connect all the</div><div class='del'>-	signal handlers.</div><div class='del'>-	(create_time_edit): Renamed from</div><div class='del'>-	`cal_prefs_dialog_create_time_edit'.</div><div class='del'>-	(cal_prefs_dialog_show): Removed.</div><div class='del'>-	(cal_prefs_dialog_button_clicked): Removed.</div><div class='del'>-	(show_task_list_config): Get a DialogData.</div><div class='del'>-	(show_config): Renamed from `cal_prefs_dialog_show_config'.</div><div class='del'>-	Likewise.</div><div class='del'>-	(update_task_list_config): Likewise.</div><div class='del'>-	(update_config): Renamed from</div><div class='del'>-	`cal_prefs_dialog_update_config'. Likewise.</div><div class='del'>-	(color_set_callback): New callback, makes the dialog report</div><div class='del'>-	changes when the setting in any of the color widgets is changed.</div><div class='del'>-	(widget_changed_callback): New callback, makes the dialog report</div><div class='del'>-	changes when any of the widgets changes status.</div><div class='del'>-	(connect_changed): New utility function to connect this callback</div><div class='del'>-	to all the widgets.</div><div class='del'>-	(setup_widgets): Connect all the widgets.</div><div class='del'>-	(cal_prefs_dialog_new): Call `setup_widgets'.</div><div class='del'>-</div><div class='del'>-	* gui/config-control-factory.c: New.</div><div class='del'>-	* gui/config-control-factory.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Add</div><div class='del'>-	OAFIID:GNOME_Evolution_Calendar_ConfigControl and</div><div class='del'>-	OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory.</div><div class='del'>-</div><div class='del'>-2002-03-06  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Should fix #21240</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.c: replaced use of GnomeVFSURI</div><div class='del'>-	with EUri, to allow non-registered methods.</div><div class='del'>-</div><div class='del'>-2002-03-05  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (e_itip_control_set_data): reverted my last</div><div class='del'>-	change of adding the METHOD property to the incoming request.</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_string): added extra</div><div class='del'>-	X-MICROSOFT-CDO-REPLYTIME property for broken Outlook. Should fix</div><div class='del'>-	#20783.</div><div class='del'>-</div><div class='del'>-2002-03-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_compliant): Reset the DTSTAMP of the new</div><div class='del'>-	component. (RFC2245 says DTSTAMP corresponds to the time the</div><div class='del'>-	particular iCalendar representation of the object was created.)</div><div class='del'>-	Fixes #21198.</div><div class='del'>-</div><div class='del'>-2002-03-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: remove unneeded parameter from print_text_size</div><div class='del'>-	everywhere</div><div class='del'>-	(get_font_for_size): calculate a font size based on the available</div><div class='del'>-	height</div><div class='del'>-	(print_text): calculate the top of where the font should be drawn</div><div class='del'>-	(print_text_size): use get_font_for_size</div><div class='del'>-	(print_day_background): use get_font_for_size</div><div class='del'>-</div><div class='del'>-2002-03-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel-item.c</div><div class='del'>-	(e_meeting_time_selector_item_draw): pass the real table</div><div class='del'>-	to e_meeting_model_etable_view_to_model_row</div><div class='del'>-	(e_meeting_time_selector_item_paint_busy_periods): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (right_click_cb): ditto</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-model.h: update protos</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c</div><div class='del'>-	(e_meeting_model_etable_model_to_view_row): take in to account the</div><div class='del'>-	fact the table used the without model</div><div class='del'>-	(e_meeting_model_etable_view_to_model_row): ditto</div><div class='del'>-</div><div class='del'>-2002-03-04  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: added support for printing the Tasks table.</div><div class='del'>-	I hacked it a bit so the user could choose portrait or landscape mode.</div><div class='del'>-	This is bug #9677. ETable printing has a few issues, though, and it</div><div class='del'>-	isn't very pretty.</div><div class='del'>-</div><div class='del'>-2002-03-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_subject): Prefix the subject with an</div><div class='del'>-	indicator like "Accepted" or "Cancelled" explaining what the</div><div class='del'>-	action is, since Outlook doesn't display any of that information</div><div class='del'>-	inline like we do. (20780)</div><div class='del'>-</div><div class='del'>-2002-02-28  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/e-itip-control.c (e_itip_control_set_data): added the</div><div class='del'>-	METHOD property to the top level component we create.</div><div class='del'>-</div><div class='del'>-2002-02-26  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (set_prop):</div><div class='del'>-	* gui/tasks-control.c (tasks_control_set_property): display an error</div><div class='del'>-	message if the call to gnome_calendar_open or e_tasks_open does not</div><div class='del'>-	return TRUE. Fixes #20346.</div><div class='del'>-</div><div class='del'>-2002-02-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): use</div><div class='del'>-	GNOME_Evolution_Composer_setBody rather than _setMultipartType and</div><div class='del'>-	_attachData now, to send a message containing just a text/calendar</div><div class='del'>-	part. Fixes 14705. Mostly.</div><div class='del'>-	(comp_content_type): Include the filename here since we can't add</div><div class='del'>-	a Content-Disposition now.</div><div class='del'>-</div><div class='del'>-2002-02-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (cal_search_bar_class_init): change</div><div class='del'>-	query_changed to search_activated.</div><div class='del'>-	(cal_search_bar_search_activated): rename</div><div class='del'>-	cal_search_bar_query_changed to this.</div><div class='del'>-</div><div class='del'>-2002-02-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (add_creatable_item): New helper</div><div class='del'>-	function.</div><div class='del'>-	(create_object): Add icons for the various user creatable items.</div><div class='del'>-</div><div class='del'>-2002-02-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* gui/e-itip-control.c (send_item): pass extra itip_send_comp</div><div class='del'>-	params</div><div class='del'>- 	(send_freebusy): ditto</div><div class='del'>- 	(ok_clicked_cb): ditto, including the timezones culled from the</div><div class='del'>-	component</div><div class='del'>- </div><div class='del'>- 	* gui/e-week-view.c: pass extra itip_send_comp params</div><div class='del'>- </div><div class='del'>- 	* gui/calendar-commands.c: ditto</div><div class='del'>- </div><div class='del'>- 	* gui/e-day-view.c: ditto</div><div class='del'>- </div><div class='del'>- 	* gui/dialogs/task-editor.c: ditto</div><div class='del'>- </div><div class='del'>- 	* gui/dialogs/event-editor.c: ditto</div><div class='del'>- </div><div class='del'>- 	* gui/dialogs/comp-editor.c: ditto</div><div class='del'>- 	</div><div class='del'>- 	* gui/itip-utils.h (itip_send_comp): update proto</div><div class='del'>- </div><div class='del'>- 	* gui/itip-utils.c (foreach_tzid_callback): check the passed in</div><div class='del'>- 	zones, then the builtin time zones then the client</div><div class='del'>-</div><div class='del'>-2002-02-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* gui/e-itip-control.c (find_my_address): strip the ical value and</div><div class='del'>- 	do a case insensitive compare</div><div class='del'>- 	(find_attendee): ditto</div><div class='del'>- 	(change_status): put the error message here</div><div class='del'>- 	(ok_clicked_cb): don't update the item or rsvp unless</div><div class='del'>- 	change_status was successful, trip the ical value and do a case</div><div class='del'>- 	insensitive compare</div><div class='del'>- </div><div class='del'>- 	* gui/itip-utils.c (get_address): strip the incoming address</div><div class='del'>- 	(itip_strip_mailto): use g_strncasecmp</div><div class='del'>- 	(comp_limit_attendees): strip the ical value and do a case</div><div class='del'>- 	insensitive compare</div><div class='del'>-</div><div class='del'>-2002-02-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* gui/e-meeting-model.c: use new column enums</div><div class='del'>- 	(set_value_at): emit pre-change/cell change signals</div><div class='del'>- 	(destroy): destroy refresh_queue and refresh_data</div><div class='del'>- 	(init): init new elements</div><div class='del'>- 	(refresh_queue_add): if the attendee is being refreshed already,</div><div class='del'>- 	possibly update the start/end times to look for and update the</div><div class='del'>- 	callback info, otherwise add it to the queue</div><div class='del'>- 	(refresh_queue_remove): remove a refreshing attende from the queue</div><div class='del'>- 	(process_callbacks): make all the callbacks and remove the</div><div class='del'>- 	attendee from the queue</div><div class='del'>- 	(process_free_busy): process the callbacks immediately if parsing</div><div class='del'>- 	fails or on successful completion of processing</div><div class='del'>- 	(async_close): process free busy</div><div class='del'>-	(cursor_cb): we're only looking for one at a time now</div><div class='del'>- 	(refresh_busy_periods): idle callback to start processing the queue</div><div class='del'>- 	(e_meeting_model_refresh_all_busy_periods): add every row to the queue</div><div class='del'>- 	(e_meeting_model_refresh_busy_periods): add a single row to the queue</div><div class='del'>- </div><div class='del'>- 	* gui/e-meeting-model.h: new protos, enum the columns</div><div class='del'>- </div><div class='del'>- 	* gui/e-meeting-time-sel.c: use new compare time function</div><div class='del'>- 	(e_meeting_time_selector_construct): listen for a cell changed</div><div class='del'>- 	signal and use separate callbacks for rows_inserted and</div><div class='del'>- 	rows_deleted</div><div class='del'>- 	(e_meeting_time_selector_refresh_free_busy): util function to</div><div class='del'>- 	refresh free busy info</div><div class='del'>- 	(e_meeting_time_selector_on_update_free_busy): use above</div><div class='del'>- 	(rows_inserted_cb): refresh free busy on the new rows</div><div class='del'>- 	(cell_changed_cb): refresh free busy on the row when the address</div><div class='del'>- 	changes</div><div class='del'>- 	(rows_deleted_cb): redraw</div><div class='del'>- </div><div class='del'>- 	* gui/e-meeting-utils.[hc]: a holding spot for a meeting time</div><div class='del'>- 	comparison function</div><div class='del'>- </div><div class='del'>- 	* gui/Makefile.am: compile new files</div><div class='del'>-	</div><div class='del'>-2002-02-13  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-        * gui/control-factory.c (set_prop): don't append 'calendar.ics'</div><div class='del'>-	to the URI.</div><div class='del'>-	(get_prop): finished.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_set_property): don't append</div><div class='del'>-	'tasks.ics' to the URI.</div><div class='del'>-	(tasks_control_get_property): finished.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open):</div><div class='del'>-	* gui/e-tasks.c (e_tasks_open): append $filename.ics to the uri to be</div><div class='del'>-	opened if the uri is local. Leave intact in other cases.</div><div class='del'>-</div><div class='del'>-2002-02-08  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): check if</div><div class='del'>-	the CalComponentDateTime values are set before trying to use them.</div><div class='del'>-	Possibly fixes bug #18529.</div><div class='del'>-</div><div class='del'>-	* importers/icalendar-importer.c: added vCalendar importer and</div><div class='del'>-	intelligent GnomeCalendar importer code here, as it shares a lot of</div><div class='del'>-	code with the iCalendar importer.</div><div class='del'>-</div><div class='del'>-	NOTE: check_folder_type() needs to be finished at some point.</div><div class='del'>-	It needs a new shell Corba call so it can decide whether to import</div><div class='del'>-	events or tasks into the folder. Currently it just imports both.</div><div class='del'>-</div><div class='del'>-	* importers/main.c (importer_factory_fn): create vCalendar importer</div><div class='del'>-	or GnomeCalendar importer if required.</div><div class='del'>-</div><div class='del'>-	* importers/evolution-calendar-importer.h: added declarations for</div><div class='del'>-	creating a vCalendar importer and intelligent Gnome Calendar importer.</div><div class='del'>-</div><div class='del'>-	* importers/Makefile.am: added -DEVOLUTION_SOUNDDIR so the importer</div><div class='del'>-	knows what filename to use for audio alarms in vCalendar files.</div><div class='del'>-	Added libicalvcal-evolution to LDADD.</div><div class='del'>-</div><div class='del'>-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: added vCalendar</div><div class='del'>-	importer and intelligent Gnome Calendar importer.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE</div><div class='del'>-	if the event uses UTC. We don't want to flag all events from Outlook,</div><div class='del'>-	which use UTC.</div><div class='del'>-</div><div class='del'>-2002-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.glade: change custom widget</div><div class='del'>-	creator to e_url_entry_new</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (get_widgets): get the url entry</div><div class='del'>-	and its entry</div><div class='del'>-</div><div class='del'>-2002-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.glade: add a custom widget created</div><div class='del'>-	with e_url_button_new</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (task_details_page_init): init</div><div class='del'>-	url_button member to NULL</div><div class='del'>-	(init_widgets): set the url button entry</div><div class='del'>-	(get_widgets): get the url button</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): use new all day event icon</div><div class='del'>-</div><div class='del'>-2002-02-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: pass meeting boolean for</div><div class='del'>-	gnome_calendar_edit_object and gnome_calendar_new_appointment_for</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (confirm_expunge): kill warning</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_meeting_cb): show a new meeting</div><div class='del'>-	dialog</div><div class='del'>-	(new_event_cb): pass new param</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): take meeting</div><div class='del'>-	boolean and show meeting page if true</div><div class='del'>-	(gnome_calendar_new_appointment_for): takeing meeting param and</div><div class='del'>-	pass to above</div><div class='del'>-	(gnome_calendar_new_appointment): add new param</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h: update proto</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_component): take a comp editor</div><div class='del'>-	mode, determine vtype</div><div class='del'>-	(sc_user_create_new_item_cb): check for meeting user creatable</div><div class='del'>-	item</div><div class='del'>-	(create_object): add meeting as user creatable item</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c (edit_new): get a comp editor mode</div><div class='del'>-	now, determine vtype and show meeting page if required</div><div class='del'>-	(queue_edit_new): get comp editor mode</div><div class='del'>-	(impl_editNew): ditto, plus queue the mode directly instead of</div><div class='del'>-	determining the vtype</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (show_meeting): new internal util</div><div class='del'>-	function to show meeting page</div><div class='del'>-	(event_editor_show_meeting): show the meeting</div><div class='del'>-	(schedule_meeting_cmd): use show_meeting</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.h: new proto</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: editNew takes a mode rather than a</div><div class='del'>-	type now</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: fix includes</div><div class='del'>-</div><div class='del'>-2002-02-07  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_setup_view_menus), gui/gnome-cal.c</div><div class='del'>-	(gnome_calendar_setup_view_menus): Made these use the new</div><div class='del'>-	GalViewMenus stuff.</div><div class='del'>-</div><div class='del'>-2002-02-06  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): convert months</div><div class='del'>-	from 1-12 to 0-11. Fixes bug #19235.</div><div class='del'>-</div><div class='del'>-2002-02-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (e_todo_gui_new): new gui routines</div><div class='del'>-	for conduit settings</div><div class='del'>-	(e_todo_gui_fill_config): ditto</div><div class='del'>-	(e_todo_gui_fill_widgets): ditto</div><div class='del'>-	(e_todo_gui_destroy): ditto</div><div class='del'>-	(e_todo_context_destroy): destroy new_cfg and gui properly</div><div class='del'>-	(local_record_from_comp): set the priority to the default setting</div><div class='del'>-	if none is set on the icalendar object</div><div class='del'>-	(fill_widgets): fill gui widgets</div><div class='del'>-	(create_settings_window): create gui</div><div class='del'>-</div><div class='del'>-2002-01-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_html): if this is a reply, print the</div><div class='del'>-	attendee status</div><div class='del'>-</div><div class='del'>-2002-01-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.glade: Use 1 instead of zero as the</div><div class='del'>-	minimum value for the repetitions spin button as we use a check</div><div class='del'>-	box to specify whether the alarm has repetitions or not.  Fixes</div><div class='del'>-	bug #19054.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/Makefile.am (evolution_calendar_importer_LDADD):</div><div class='del'>-	Ooops.  Forgot to use EVOLUTION_CALENDAR_LIBS here.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Use</div><div class='del'>-	EVOLUTION_CALENDAR_CONDUIT_LIBS and</div><div class='del'>-	EVOLUTION_CALENDAR_CONDUIT_CFLAGS.</div><div class='del'>-	* conduits/todo/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and</div><div class='del'>-	EVOLUTION_CALENDAR_CFLAGS.</div><div class='del'>-	* cal-util/Makefile.am: Likewise.</div><div class='del'>-	* gui/alarm-notify/Makefile.am: Likewise.</div><div class='del'>-	* gui/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2002-01-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_object): Pass a NULL @icon to</div><div class='del'>-	`evolution_shell_component_add_user_creatable_item()'.</div><div class='del'>-</div><div class='del'>-2002-01-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (todoconduit_load_configuration):</div><div class='del'>-	return a new configuration struct, load default priority setting</div><div class='del'>-	(todoconduit_save_configuration): save default priority setting</div><div class='del'>-	(e_todo_context_new): dupe configuration</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (e_calendar_context_new):</div><div class='del'>-	set ps to NULL</div><div class='del'>-</div><div class='del'>-2002-01-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string</div><div class='del'>-	in the correct variable (str), so it actually gets shown for alarms</div><div class='del'>-	with specific trigger times. Fixes bug #18801.</div><div class='del'>-</div><div class='del'>-2002-01-15  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_widgets): default component</div><div class='del'>-	classification to PUBLIC. Fixes internal bug #1066</div><div class='del'>-</div><div class='del'>-2002-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: move all functions here,</div><div class='del'>-	get rid of header files, use e-pilot-settings to display gui</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: as above</div><div class='del'>-	</div><div class='del'>-2002-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/gnome-cal.c (get_current_time): use icaltimetype_to_tm</div><div class='del'>-	</div><div class='del'>-2002-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):</div><div class='del'>-	figure out when today is and highlight if it is not selected</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.h: enum the "today" color</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_realize): init the "today" color</div><div class='del'>-</div><div class='del'>-2002-01-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.h: add protos</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.c (save_blessed_program): records a</div><div class='del'>-	program as blessed</div><div class='del'>-	(is_blessed_program): checks to see if a program is blessed</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (procedure_notification_dialog):</div><div class='del'>-	popup a dialog notifying the user that is a program and let them</div><div class='del'>-	not see the dialog about this program again</div><div class='del'>-	(procedure_notification): use above</div><div class='del'>-</div><div class='del'>-2002-01-11  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.c: </div><div class='del'>-	* gui/e-itip-control.c (write_label_piece): </div><div class='del'>-	* gui/calendar-config.c (on_timezone_set): translate timezone names</div><div class='del'>-	when displayed. Fixes bug #6544.</div><div class='del'>-</div><div class='del'>-2002-01-03  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_complete_cmd): new verb</div><div class='del'>-	callback</div><div class='del'>-	(sensitize_commands): set sensitivity of mark complete command</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_complete_selected): mark selected tasks</div><div class='del'>-	in the table as complete</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_complete_selected):</div><div class='del'>-	mark selected rows as complete</div><div class='del'>-</div><div class='del'>-2002-01-03  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/tasks-control.c (confirm_expunge): only need one warning</div><div class='del'>-	message now</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (create_sexp): change the logic to expunge all</div><div class='del'>-	completed tasks not just hidden ones</div><div class='del'>-</div><div class='del'>-2002-01-03  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/tasks-control.c (confirm_expunge): confirm expunging of the</div><div class='del'>-	tasks</div><div class='del'>-	(tasks_control_expunge_cmd): verb callback</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): read confirm expunge value</div><div class='del'>-	(calendar_config_write): write confirm expunge value</div><div class='del'>-	(calendar_config_write_on_exit): ditto</div><div class='del'>-	(calendar_config_get_confirm_expunge): get value</div><div class='del'>-	(calendar_config_set_confirm_expunge): set value</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (start_calendar_server): kill warning</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_init): init query member to NULL</div><div class='del'>-	(set_status_message): util function to set status message</div><div class='del'>-	(e_tasks_open): use above</div><div class='del'>-	(cal_opened_cb): ditto</div><div class='del'>-	(create_sexp): create sexp of items to be deleted</div><div class='del'>-	(query_obj_updated_cb): remove any items found</div><div class='del'>-	(query_eval_error_cb): bail out on error</div><div class='del'>-	(query_query_done_cb): tidy when done</div><div class='del'>-	(e_tasks_delete_completed): set up query</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (query_query_done_cb): use g_warning</div><div class='del'>-	instead of printing to stderr</div><div class='del'>-	(query_eval_error_cb): ditto</div><div class='del'>-	(update_query): clear the status message if we can't create the</div><div class='del'>-	query</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (resolve_tzid_cb): make this static</div><div class='del'>-</div><div class='del'>-2001-12-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c: remove needs send signal related</div><div class='del'>-	cruft</div><div class='del'>-	(save_comp_with_send): with send_component_dialog, indicate if the</div><div class='del'>-	meeting info is newly created or not</div><div class='del'>-	(real_edit_comp): remember if the dialog initially needs a send</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/send-comp.c (send_component_dialog): take a "new"</div><div class='del'>-	parameter indicating whether the dialog should intimate if the</div><div class='del'>-	component to be sent is a new meeting or not</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/send-comp.h: update proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c: remove no longer used needs_send</div><div class='del'>-	notification and signal</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: remove proto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): add new</div><div class='del'>-	param to send_component_dialog</div><div class='del'>-	(e_day_view_finish_long_event_resize): ditto</div><div class='del'>-	(e_day_view_finish_resize): ditto</div><div class='del'>-	(e_day_view_on_editing_stopped): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_editing_stopped): add new</div><div class='del'>-	param to send_component_dialog</div><div class='del'>-</div><div class='del'>-2001-12-21 JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/comp-editor.h: inherit from bonobo window	</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c: inherit from bonobo window</div><div class='del'>-	(comp_editor_key_press_event): Look for an escape key press and</div><div class='del'>-	close the window if found</div><div class='del'>-</div><div class='del'>-2001-12-20  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fixes #17377, Evolution doesn't work on multi-depth displays.]</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Push GdkRGB visual and colormap.</div><div class='del'>-</div><div class='del'>-2001-12-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):</div><div class='del'>-	go slow and clear the map if the last uri and the current uri do</div><div class='del'>-	not match</div><div class='del'>-	(post_sync): save the last uri</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: handle a last uri</div><div class='del'>-	config option</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-    	* conduits/calendar/calendar-conduit.c (start_calendar_server):</div><div class='del'>-    	use the open_default_calendar method</div><div class='del'>-    </div><div class='del'>-    	* conduits/todo/todo-conduit.c (start_calendar_server): same as above</div><div class='del'>-	</div><div class='del'>-    	* cal-client/Makefile.am: link with bonobo conf</div><div class='del'>-    </div><div class='del'>-    	* cal-client/cal-client.h: new protos</div><div class='del'>-    </div><div class='del'>-    	* idl/evolution-calendar.idl: make sure open method raises</div><div class='del'>-    	appropriate exceptions</div><div class='del'>-    </div><div class='del'>-     	* gui/e-itip-control.c (start_calendar_server): use</div><div class='del'>-     	cal_client_open_default_* calls</div><div class='del'>-     </div><div class='del'>-     	* cal-client/cal-client.c (real_open_calendar): do the real work</div><div class='del'>-     	of loading</div><div class='del'>-     	(cal_client_open_calendar): use above</div><div class='del'>-     	(get_fall_back_uri): get the basic local uri</div><div class='del'>-     	(get_default_uri): get the default uri from the config db</div><div class='del'>-     	(cal_client_open_default_calendar): open the default uri or the</div><div class='del'>-     	fallback if the method is unsupported</div><div class='del'>-     	(cal_client_open_default_tasks): same for tasks</div><div class='del'>-	</div><div class='del'>-2001-12-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* gui/e-itip-control.c (send_item): use get_real_item</div><div class='del'>- 	(get_refresh_options): uncomment out</div><div class='del'>- 	(get_real_item): obtain the real object which has the uid of the</div><div class='del'>- 	item received</div><div class='del'>- 	(show_current_todo): use get_refresh_options for refresh method</div><div class='del'>- 	and provide the description and summary from the real component</div><div class='del'>- 	since its not in the reply</div><div class='del'>- 	(show_current_event): ditto</div><div class='del'>- 	(send_item): use get_real_item</div><div class='del'>-</div><div class='del'>-2001-12-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_limit_attendees): can't remove properties</div><div class='del'>-	in an iteration loop, so remove them outside the loop</div><div class='del'>-	(comp_minimal): don't set a recurid if there isn't one, add the x</div><div class='del'>-	properties to the clone</div><div class='del'>-	(comp_compliant): unref the clone for DECLINECOUNTER</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (get_refresh_options): make function</div><div class='del'>-	available again</div><div class='del'>-	(show_current_event): use it here</div><div class='del'>-	(ok_clicked_cb): can't remove properties in an iteration loop, so</div><div class='del'>-	remove them outside the loop</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (free_icalcomponent): properly free the</div><div class='del'>-	attendee list</div><div class='del'>-	(cal_component_rescan): don't destroy the alarm hash</div><div class='del'>-</div><div class='del'>-2001-12-13  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* zones.h: new file to contain all timezone names for translation.</div><div class='del'>-	We won't be using the translations in 1.0.1, but it gives translators</div><div class='del'>-	time before we do use them in 1.0.2.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added zones.h to EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2001-12-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_top_canvas_button_release):</div><div class='del'>- 	ungrab the pointer before calling</div><div class='del'>- 	e_day_view_finish_long_event_resize</div><div class='del'>- 	(e_day_view_on_main_canvas_button_release): ditto</div><div class='del'>- 	(e_day_view_finish_long_event_resize): ask if the meeting should</div><div class='del'>- 	be sent</div><div class='del'>- 	(e_day_view_finish_resize): ditto</div><div class='del'>- 	(e_day_view_on_editing_stopped): ditto</div><div class='del'>- 	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>- 	(e_day_view_on_main_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-2001-12-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>- 	* gui/e-meeting-model.c (process_free_busy_comp): properly convert</div><div class='del'>- 	the dtstart and dtend times if they are UTC</div><div class='del'>- 	(cursor_cb): if we don't have anybody to get f/b info for, process</div><div class='del'>- 	the callbacks immediately</div><div class='del'>- 	(e_meeting_model_refresh_busy_periods): take start/end times,</div><div class='del'>- 	calculate the timet values with object timezone</div><div class='del'>- 	(e_meeting_model_etable_model_to_view_row): proper cast</div><div class='del'>- 	(e_meeting_model_etable_view_to_model_row): ditto</div><div class='del'>-	(async_open): bail out if we couldn't open properly</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>- 	(e_meeting_time_selector_on_update_free_busy): use defines for</div><div class='del'>- 	determining the number of days before and after of free busy to</div><div class='del'>- 	request</div><div class='del'>- 	(e_meeting_time_selector_update_dates_shown): use defines for the</div><div class='del'>- 	number of days shown</div><div class='del'>- </div><div class='del'>- 	* gui/e-meeting-model.h: update proto</div><div class='del'>-</div><div class='del'>-2001-12-10  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (control_factory_new_control): removed code</div><div class='del'>-	that connects to GnomeCalendar's "dates_shown_changed" signal.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (gcal_calendar_dates_change_cb): </div><div class='del'>-	(calendar_control_activate): moved it here, so it gets reconnected</div><div class='del'>-	whenever the control is activated. Fixes bug #15798.</div><div class='del'>-</div><div class='del'>-2001-12-10  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/GNOME_Evolution_Calendar_Importer.oaf.in: fixed executable</div><div class='del'>-	name. Fixes bug #16880.</div><div class='del'>-</div><div class='del'>-2001-12-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-  </div><div class='del'>-  	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-  	if we have an alarm that can be represented on the pilot, set the</div><div class='del'>-  	appointment fields appropriately, if the duration has values for</div><div class='del'>-  	minutes and/or hours and/or days, use the lowest common</div><div class='del'>-  	denominator</div><div class='del'>-  	(comp_from_remote_record): if the appointment on the pilot has an</div><div class='del'>-  	alarm, find the first alarm an item currently had that is relative</div><div class='del'>-  	to the start and with a negative duration and update it (or create</div><div class='del'>-  	a new one if no valid ones exist)</div><div class='del'>-  </div><div class='del'>- 	* cal-util/cal-component.c (cal_component_get_alarm_uids): build</div><div class='del'>-  	list in the order they appear in the component so we get</div><div class='del'>-  	consisting order for the gui and for the pilot</div><div class='del'>- </div><div class='del'>-2001-12-08  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_get_default_uri):</div><div class='del'>-	(calendar_config_get_default_tasks_uri): s/%/%s</div><div class='del'>-</div><div class='del'>-2001-11-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	(committed by Damon)</div><div class='del'>-</div><div class='del'>-	Fix bug #14699.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (QueryState): Added a state QUERY_WAIT_FOR_BACKEND</div><div class='del'>-	to indicate that the query is not populated as we are waiting for</div><div class='del'>-	the backend to be opened.</div><div class='del'>-	(query_init): Start in the QUERY_WAIT_FOR_BACKEND state.</div><div class='del'>-	(query_destroy): Only disconnect from the backend if we are in a</div><div class='del'>-	state that implies that we are connected to its signals.</div><div class='del'>-	(query_construct): If the backend is already loaded, immediately</div><div class='del'>-	set the state to QUERY_START_PENDING.</div><div class='del'>-	(backend_opened_cb): Disconnect from the backend's "opened"</div><div class='del'>-	signal.  Set the state to QUERY_START_PENDING.</div><div class='del'>-	(match_component): We can now only match components if the query</div><div class='del'>-	is in progress or if it is done.  Assert to that effect, and do</div><div class='del'>-	not ensure_sexp().</div><div class='del'>-	(match_component): Do not check for a nonexistent component using</div><div class='del'>-	g_return_if_fail().  Also, there is no need to ref/unref the</div><div class='del'>-	component.</div><div class='del'>-	(backend_obj_updated_cb): Assert to the effect of our state.</div><div class='del'>-	(backend_obj_removed_cb): Likewise.</div><div class='del'>-	(parse_sexp): Renamed from ensure_sexp().  Assert that the query</div><div class='del'>-	has not started.  Do not disconnect from the backend's signals</div><div class='del'>-	here, since we have no connections.</div><div class='del'>-	(start_query_cb): Set the state to QUERY_IN_PROGRESS here instead</div><div class='del'>-	of in populate_query().</div><div class='del'>-</div><div class='del'>-2001-12-07  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_get_default_uri):</div><div class='del'>-	(calendar_config_get_default_tasks_uri): if the key in the config</div><div class='del'>-	database does not exist, just return the local URIs, but never</div><div class='del'>-	return NULL</div><div class='del'>-</div><div class='del'>-2001-12-06  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_widgets): default</div><div class='del'>-	component classification to PUBLIC</div><div class='del'>-</div><div class='del'>-2001-12-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-        * gui/dialogs/event-editor.c (event_editor_destroy): Explicitly</div><div class='del'>-	destroy the EMeetingModel.  This is a hack to work around problems</div><div class='del'>-	with the reference counting; we are still leaking the</div><div class='del'>-	EMeetingModels.</div><div class='del'>-</div><div class='del'>-        * gui/e-meeting-time-sel.c</div><div class='del'>-        (e_meeting_time_selector_construct): Ref our EMeetingModel.</div><div class='del'>-        (e_meeting_time_selector_destroy): Unref the model.</div><div class='del'>-</div><div class='del'>-        * gui/e-meeting-model.c (destroy): Properly destroy</div><div class='del'>-	corba_select_names with a call to bonobo_object_release_unref.</div><div class='del'>-        (Fixes 14002)</div><div class='del'>-</div><div class='del'>-2001-12-05  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.glade: added entry for the LOCATION field</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c: added support for the new LOCATION entry</div><div class='del'>-	added in the Event editor.</div><div class='del'>-</div><div class='del'>-2001-12-05  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (comp_subject, comp_description):</div><div class='del'>-	Marked strings for translation.</div><div class='del'>-</div><div class='del'>-2001-12-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c: </div><div class='del'>-	* gui/calendar-model.c: make sure we call e_table_model_pre_change()</div><div class='del'>-	before changing the model.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_configure_e_calendar_table): </div><div class='del'>-	removed call to e_table_model_changed(). calendar_model_refresh()</div><div class='del'>-	results in that anyway.</div><div class='del'>-</div><div class='del'>-2001-12-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.etspec: disabled 'Alarms', 'End Date' and</div><div class='del'>-	'Show Time As' fields, as these are not useful for tasks. We may want</div><div class='del'>-	to reenable them later if we add a table view of calendar events.</div><div class='del'>-</div><div class='del'>-2001-12-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-offline-handler.c (backend_cal_opened): connect to</div><div class='del'>-	"cal_set_mode" signal before calling cal_client_set_mode. Also,</div><div class='del'>-	s/cal_mode_set/cal_set_mode</div><div class='del'>-	(backend_go_offline): connect to "cal_opened" signal before calling</div><div class='del'>-	cal_client_open_calendar</div><div class='del'>-</div><div class='del'>-2001-11-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (remove_item): only show the dialog if we</div><div class='del'>-	created it. Hopefully fixes bug #15774.</div><div class='del'>-	Also ifdef'ed out a lot of code that isn't currently used, including</div><div class='del'>-	code to use a label which is never created. The unused code was there</div><div class='del'>-	to support handling multiple iTIP objects in a message, but was never</div><div class='del'>-	updated when we switched to use HTML for the control. Fixes bug #16232.</div><div class='del'>-</div><div class='del'>-2001-11-28  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_task): Set the category of</div><div class='del'>-	the new task to that of the search bar.  Fixes bug #15533.</div><div class='del'>-</div><div class='del'>-2001-11-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (update_attendee_status):</div><div class='del'>-	* gui/itip-utils.c (comp_to_list): fixed typos in translatable</div><div class='del'>-	strings. Fixes Ximian #15456</div><div class='del'>-</div><div class='del'>-2001-11-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: Substituted gnome_font_get_width_string() with</div><div class='del'>-	gnome_font_get_width_utf8() and gnome_font_get_width_string_n()</div><div class='del'>-	with gnome_font_get_width_utf8_sized(). Fixes calendar part of #15379.</div><div class='del'>-</div><div class='del'>-2001-11-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (date_value_to_string): Convert the buffer</div><div class='del'>-	to UTF8.</div><div class='del'>-	(calendar_model_value_to_string): Do not convert the string fields</div><div class='del'>-	to UTF8 again; they are already in UTF8.  Fixes the UTF8-related</div><div class='del'>-	bits of bug #15304.</div><div class='del'>-</div><div class='del'>-2001-11-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: </div><div class='del'>-	* cal-util/cal-component.h: #ifdef'ed out the LOCATION field for now,</div><div class='del'>-	since it wasn't supported everywhere, or in the .etspec file.</div><div class='del'>-</div><div class='del'>-2001-11-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: don't abort when e_table_selected_count()</div><div class='del'>-	returns odd values. There seems to be a bug in ETable. This is to</div><div class='del'>-	avoid bug #13843.</div><div class='del'>-</div><div class='del'>-2001-11-13  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	(committed to CVS by Damon)</div><div class='del'>-	Fixes bug #15137.</div><div class='del'>-	</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Do not try</div><div class='del'>-	to operate on the event if it gets deleted while stopping the</div><div class='del'>-	edition.</div><div class='del'>-	(e_day_view_on_event_double_click): Likewise.</div><div class='del'>-	(e_day_view_on_long_event_button_press): Likewise.</div><div class='del'>-	(e_day_view_on_event_button_press): Likewise.</div><div class='del'>-	(e_day_view_on_long_event_click): Likewise.</div><div class='del'>-	(e_day_view_on_event_click): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.</div><div class='del'>-</div><div class='del'>-2001-11-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (pre_sync): remove silly</div><div class='del'>-	debug warning</div><div class='del'>-</div><div class='del'>-2001-11-13  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/config-data.c (ensure_inited): </div><div class='del'>-	* gui/calendar-config.c (config_read): </div><div class='del'>-	* conduits/todo/todo-conduit.c (get_default_timezone): </div><div class='del'>-	* conduits/calendar/calendar-conduit.c (get_default_timezone): </div><div class='del'>-	make the timezone default to UTC. Fixes bug #14362.</div><div class='del'>-</div><div class='del'>-2001-11-13  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (selection_received): only change the day,</div><div class='del'>-	month and year for the start date, for not screwing up the start</div><div class='del'>-	time, which was being set to midnight always (Fixes Ximian #5287)</div><div class='del'>-	Also, deal correctly with VCALENDAR components</div><div class='del'>-	</div><div class='del'>-	* gui/e-day-view.c (selection_received): dela correctly with</div><div class='del'>-	VCALENDAR components being pasted</div><div class='del'>-</div><div class='del'>-2001-11-11  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.c (get_calendars_to_load): The last</div><div class='del'>-	argument to the bonobo_config_get_XXX_with_default() is a gboolean</div><div class='del'>-	*, not a CORBA_Environment *.  Fixes bug #14655.</div><div class='del'>-</div><div class='del'>-2001-11-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>- 	* pcs/cal-backend-file.c (free_busy_instance): recurrence</div><div class='del'>- 	expansion callback for free/busy</div><div class='del'>- 	(create_user_free_busy): expand recurrences and use date/time</div><div class='del'>- 	values for dtstart and dtend</div><div class='del'>- </div><div class='del'>-2001-11-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (e_meeting_model_get_zone): accessor</div><div class='del'>-	(e_meeting_model_set_zone): ditto</div><div class='del'>-	(init): init to the calendar default zone</div><div class='del'>-	(process_free_busy_comp): take the zone to convert to as a param</div><div class='del'>-	(e_meeting_model_refresh_busy_periods): redraw properly</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c (update_time): set the zone of the</div><div class='del'>-	model</div><div class='del'>-</div><div class='del'>-2001-11-09  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): don't subtract a day</div><div class='del'>-	from DTEND. For DATE values we don't include the entire day now.</div><div class='del'>-	Fixes bug #14842.</div><div class='del'>-</div><div class='del'>-2001-11-09  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-layout.c (e_week_view_layout_events): fix buffer</div><div class='del'>-	overflow. Fixes bug #10285 (the printing of lines &amp; dates in the</div><div class='del'>-	printout of the month view).</div><div class='del'>-</div><div class='del'>-2001-11-09  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c</div><div class='del'>-	(meeting_page_fill_widgets): Convert strings to GTK+ encoding.</div><div class='del'>-	(meeting_page_destroy): Free allocated strings before freeing the list</div><div class='del'>-	itself.</div><div class='del'>-</div><div class='del'>-2001-11-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_timeout_handler): don't let an empty</div><div class='del'>-	event occur for all days when auto scrolling</div><div class='del'>-</div><div class='del'>-2001-11-08  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c </div><div class='del'>-	(cal_backend_file_compute_changes_foreach_key): don't leak the</div><div class='del'>-	string returned by cal_component_get_as_string nor the temporary</div><div class='del'>-	CalComponent we create</div><div class='del'>-</div><div class='del'>-2001-11-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>- 	* gui/e-itip-control.c (ok_clicked_cb): don't add the item, remove</div><div class='del'>- 	it if declining (in case it was added before)</div><div class='del'>- 	(remove_item): Since we can't discern between an item not found</div><div class='del'>- 	and another error, always say the removal is complete</div><div class='del'>-</div><div class='del'>-2001-11-07  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-cell-date-edit-text.c (ecd_get_text):</div><div class='del'>-	Convert generated string to UTF-8.</div><div class='del'>-</div><div class='del'>-2001-11-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>- 	* gui/e-meeting-time-sel.c</div><div class='del'>- 	(e_meeting_time_selector_on_start_time_changed): emit changed</div><div class='del'>- 	signal</div><div class='del'>- 	(e_meeting_time_selector_on_end_time_changed): emit changed</div><div class='del'>- 	signal, if end time is now before start time and all day event,</div><div class='del'>- 	make sure a whole day is still selected</div><div class='del'>- 	(e_meeting_time_selector_drag_meeting_time): calculate the first</div><div class='del'>- 	and last_time's in whole days for all day events</div><div class='del'>- 	(e_meeting_time_selector_timeout_handler): calculate the drag time</div><div class='del'>- 	to be whole days for all day events and scroll the canvas even if</div><div class='del'>- 	we don't update the time so the user can see where they're headed</div><div class='del'>-</div><div class='del'>-2001-11-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_edit_comp): make sure</div><div class='del'>-	to remove all attendees from the model when we edit a new comp,</div><div class='del'>-	append the pages if they are needed and we weren't showing them</div><div class='del'>-	before</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_edit_comp): same as above</div><div class='del'>-</div><div class='del'>- 	* gui/dialogs/comp-editor.c (comp_editor_remove_page): check for a</div><div class='del'>- 	return value indicating the page was not found and return if so</div><div class='del'>- </div><div class='del'>-2001-11-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.c: #include</div><div class='del'>-	"Evolution-Addressbook-SelectNames.h", not</div><div class='del'>-	"../Evolution-Addressbook-SelectNames.h".  Grrr.</div><div class='del'>-</div><div class='del'>-2001-11-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_class_init):</div><div class='del'>-	add a changed signal</div><div class='del'>-	(e_meeting_time_selector_construct): emit changed signal</div><div class='del'>-	(e_meeting_time_selector_set_meeting_time): ditto</div><div class='del'>-	(e_meeting_time_selector_set_all_day): set the all day setting</div><div class='del'>-	(e_meeting_time_selector_autopick): emit changed signal</div><div class='del'>-	(e_meeting_time_selector_find_nearest_interval): find proper</div><div class='del'>-	interval when in all day mode</div><div class='del'>-	(e_meeting_time_selector_find_nearest_interval_backward): ditto</div><div class='del'>-	(e_meeting_time_selector_drag_meeting_time): for all day events,</div><div class='del'>-	move the time when past the 12 hour mark, and and always make sure</div><div class='del'>-	1 full day is selected, emit changed signal when appropriate</div><div class='del'>-	(e_meeting_time_selector_update_start_date_edit): set date and</div><div class='del'>-	time of day together</div><div class='del'>-	(e_meeting_time_selector_update_end_date_edit): ditto, and adjust</div><div class='del'>-	display time if all day event</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel-item.c</div><div class='del'>-	(e_meeting_time_selector_item_draw): remove unused variable</div><div class='del'>-	(e_meeting_time_selector_item_button_press): for all day mode,</div><div class='del'>-	make the interval a whole day</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c (update_time): set the meeting time</div><div class='del'>-	selector setting instead of manual mucking with the e-date-edit</div><div class='del'>-	widgets</div><div class='del'>-	(init_widgets): listen to the changed signal of the meeting time</div><div class='del'>-	selector instead of propagating multiple events as it updates</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (update_time): block time zone change</div><div class='del'>-	signals</div><div class='del'>-</div><div class='del'>-2001-11-05  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (dup_date_edit_value): removed ';' in the wrong</div><div class='del'>-	place. Fixes bug #14421.</div><div class='del'>-</div><div class='del'>-2001-11-05  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_LDFLAGS):</div><div class='del'>-	-export-dynamic for libglade custom widget.</div><div class='del'>-</div><div class='del'>-2001-11-04  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c (get_default_component): use TZID from the</div><div class='del'>-	builtin timezone, instead of using the location name.</div><div class='del'>-</div><div class='del'>-2001-11-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (compute_alarm_range): Short-circuit the</div><div class='del'>-	calculation of the repeat time if there are zero repetitions.</div><div class='del'>-	(compute_alarm_range): I'm a moron.  De-reference alarm_start when</div><div class='del'>-	subtracting stuff from it!  Fixes bug #14209.</div><div class='del'>-</div><div class='del'>-2001-10-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: Added rules to generate</div><div class='del'>-	`Evolution-Addressbook-SelectNames.h'.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.h: #include</div><div class='del'>-	"Evolution-Addressbook-SelectNames.h" from this directory.</div><div class='del'>-</div><div class='del'>-2001-10-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.c: #include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-2001-10-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (dn_query_obj_updated_cb): If a query is not in</div><div class='del'>-	progress, just retag the whole thing.  An event may change dates</div><div class='del'>-	and tag_calendar_by_comp() would not know how to untag the old</div><div class='del'>-	dates.  Fixes bug #10220.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (start_query_cb): Connect to the backend's</div><div class='del'>-	"obj_updated" and "obj_removed" signals here instead of in</div><div class='del'>-	query_construct().  If a query is started while another one is</div><div class='del'>-	notifying of an update, these signal connections would get appened</div><div class='del'>-	to the running signal (the one that triggered the notification</div><div class='del'>-	about an update) and the new signal handlers would also get</div><div class='del'>-	called.  We are really not interested in updates before we</div><div class='del'>-	populate the query, because we'll catch the changes anyways.</div><div class='del'>-</div><div class='del'>-2001-10-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #13723.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendarClass): New signals</div><div class='del'>-	"calendar_focus_change", "taskpad_focus_change", and</div><div class='del'>-	"taskpad_selection_changed".  Renamed "selection_changed" to</div><div class='del'>-	"calendar_selection_changed".</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_num_tasks_selected): New</div><div class='del'>-	function.</div><div class='del'>-	(setup_widgets): Connect to the focus event signals of the task</div><div class='del'>-	pad and the calendar view widgets.</div><div class='del'>-	(gnome_calendar_delete_selection): Renamed from</div><div class='del'>-	gnome_calendar_delete_event().</div><div class='del'>-	(gnome_calendar_cut_clipboard): Handle the current focus location.</div><div class='del'>-	(gnome_calendar_copy_clipboard): Likewise.</div><div class='del'>-	(gnome_calendar_paste_clipboard): Likewise.</div><div class='del'>-	(gnome_calendar_delete_selection): Likewise.</div><div class='del'>-	(table_selection_change_cb): New callback.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (sensitize_calendar_commands): Take in</div><div class='del'>-	whether we should unconditionally disable everything.</div><div class='del'>-	(sensitize_taskpad_commands): Analogous function to the above.</div><div class='del'>-	(gcal_calendar_focus_change_cb): New callback, used for calendar</div><div class='del'>-	views.</div><div class='del'>-	(gcal_taskpad_focus_change_cb): New callback, used for the</div><div class='del'>-	taskpad.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): Use a better test for</div><div class='del'>-	keys that should start editing.  Fixes bug #6447.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Likewise.</div><div class='del'>-</div><div class='del'>-2001-10-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Make the pre_changes and changes match</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2001-10-31  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): send as mixed rather than</div><div class='del'>-	alternative</div><div class='del'>-</div><div class='del'>-2001-10-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.c (KEY_CALENDARS_TO_LOAD):</div><div class='del'>-	Removed.</div><div class='del'>-	(KEY_NUM_CALENDARS_TO_LOAD): New key, containing the number of</div><div class='del'>-	calendars to load.</div><div class='del'>-	(BASE_KEY_CALENDAR_TO_LOAD): New base key name for the URIs of the</div><div class='del'>-	calendars to load.</div><div class='del'>-	(save_calendars_to_load): Rewrote to not use a sequence, to work</div><div class='del'>-	around an ORBit bug that causes bonobo-moniker-xmldb to crash.</div><div class='del'>-	(get_calendars_to_load): Likewise.</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): disconnect</div><div class='del'>-	signals added in append_page(). Fixes Gtk-Critical warning about</div><div class='del'>-	GtkAccelGroup being added twice to a window.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): set a body for the message</div><div class='del'>-</div><div class='del'>-2001-10-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): call</div><div class='del'>-	GNOME_Evolution_Composer_setMultipartType to get a</div><div class='del'>-	multipart/alternative.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_on_start_time_changed): don't overwrite</div><div class='del'>-	memory</div><div class='del'>-	(e_meeting_time_selector_on_end_time_changed): ditto</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (dup_date_edit_value): return NULL if passed</div><div class='del'>-	NULL. Should fix bug #14048.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): Do not ignore the</div><div class='del'>-	exceptions of the cases that do not have defaults.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_drag_meeting_time): if we are doing all</div><div class='del'>-	day stuff, make the drag increment 1 day at a time</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (meeting_page_fill_component): Add</div><div class='del'>-	_() to a string that was missing it.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (table_canvas_focus_out_cb): Commit</div><div class='del'>-	the ETable click-to-add for if the dialog is being destroyed.</div><div class='del'>-	Should fix bug #13959.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): Allocate enough space for the</div><div class='del'>-	string!  (was missing the null terminator) Possibly fixes #13924.</div><div class='del'>-	Thanks a *LOT* to Michael Zucchi for running this through Purify.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-time-sel-item.c</div><div class='del'>-	(e_meeting_time_selector_item_button_press): move in whole day</div><div class='del'>-	increments if we are in all day mode</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_on_start_time_changed): get rid of</div><div class='del'>-	localtime call</div><div class='del'>-	(e_meeting_time_selector_on_end_time_changed): ditto</div><div class='del'>-	(e_meeting_time_selector_update_start_date_edit): set the date</div><div class='del'>-	editor using the meeting time fields directly</div><div class='del'>-	(e_meeting_time_selector_update_end_date_edit): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c (update_time): do the set_show_time</div><div class='del'>-	stuff first</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (process_multi_day): don't</div><div class='del'>-	adjust the time, set the default timezone for date values</div><div class='del'>-</div><div class='del'>-2001-10-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (INCLUDES):</div><div class='del'>-	s/BONOBO_HTML_GNOME_LIBS/BONOBO_HTML_GNOME_CFLAGS/</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-model.c (e_meeting_model_count_actual_attendees):</div><div class='del'>-	count the actual attendees (doesn't include people delegating</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c: use</div><div class='del'>-	e_meeting_model_count_actual_attendees (renamed)</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel-item.c: use</div><div class='del'>-	e_meeting_model_etable_view_to_model_row calls instead of calling</div><div class='del'>-	on the model directly, use e_meeting_model_count_actual_attendees</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c</div><div class='del'>-	(e_meeting_model_etable_model_to_view_row): get the real mapping</div><div class='del'>-	(e_meeting_model_etable_view_to_model_row): ditto</div><div class='del'>-	(get_key): e-table-without callback</div><div class='del'>-	(duplicate_key): ditto</div><div class='del'>-	(free_gotten_key): ditto</div><div class='del'>-	(free_duplicated_key): ditto</div><div class='del'>-	(init): create without model</div><div class='del'>-	(e_meeting_model_etable_from_model): build etable from without</div><div class='del'>-	model</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.h: update protos</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (right_click_cb): convert row from</div><div class='del'>-	view to model row</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_widgets): set to the default</div><div class='del'>-	timezone for DATE values, in case the user switches to a DATE-TIME.</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c: handle DATE values for Start and Due dates.</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c: </div><div class='del'>-	* gui/dialogs/event-page.c: </div><div class='del'>-	* gui/dialogs/comp-editor-util.c: updated code to handle DATE values.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): </div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): updated DATE code.</div><div class='del'>-</div><div class='del'>-	* gui/e-cell-date-edit-text.c: </div><div class='del'>-	* gui/calendar-model.c: updated to support DATE values.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_generate_instances_of_rule): updated</div><div class='del'>-	to use DATE values in same way as Outlook - i.e. the DTEND date is</div><div class='del'>-	not included entirely. Though I did make it so that if the DTSTART</div><div class='del'>-	and DTEND used the same DATE value, it includes the entire day.</div><div class='del'>-	So 1-day events should be the same. Long All-Day events will be</div><div class='del'>-	1 day shorter.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_start_plus_duration): </div><div class='del'>-	don't subtract a day from the end date.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: updated the EPixmap paths for Cut/Copy etc.</div><div class='del'>-	Removed Print &amp; Print Preview paths, since we don't have menu commands</div><div class='del'>-	for these any more.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #10016.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): Use</div><div class='del'>-	bonobo_ui_util_set_ui() instead of doing things by hand.  Hmmm, if</div><div class='del'>-	only that function had a way of telling us whether it failed so</div><div class='del'>-	that we could avoid setting the verb list...</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_init): Do not pass the</div><div class='del'>-	filename with the full path so that Bonobo can find it in a smart</div><div class='del'>-	way.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_init): Likewise.</div><div class='del'>-</div><div class='del'>-2001-10-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Use an</div><div class='del'>-	EMessageBox instead of a gnome_dialog_question so that the label</div><div class='del'>-	gets line breaking.  Fixes bug #11260.</div><div class='del'>-</div><div class='del'>-2001-10-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #13649.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c</div><div class='del'>-	(calendar_config_get_use_default_reminder): New function.</div><div class='del'>-	(calendar_config_set_use_default_reminder): New function.</div><div class='del'>-	(calendar_config_get_default_reminder_interval): New function.</div><div class='del'>-	(calendar_config_set_default_reminder_interval): New function.</div><div class='del'>-	(calendar_config_get_default_reminder_units): New function.</div><div class='del'>-	(calendar_config_set_default_reminder_units): New function.</div><div class='del'>-	(config_read): Get the options for default reminders.</div><div class='del'>-	(calendar_config_write): Set the options for default reminders.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):</div><div class='del'>-	Set the default reminder widgets from the config values.</div><div class='del'>-	(cal_prefs_dialog_update_config): Set the config values from the</div><div class='del'>-	widgets.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_event_new_with_defaults): New</div><div class='del'>-	function; creates a VEVENT component with the default alarm.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): Use</div><div class='del'>-	cal_comp_event_new_with_defaults ();</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Likewise.</div><div class='del'>-	* gui/calendar-model.c (calendar_model_append_row): Likewise.</div><div class='del'>-	* gui/comp-editor-factory.c (get_default_component): Likewise.</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (ensure_alarm_properties_cb): Ensure we</div><div class='del'>-	have a DESCRIPTION property.</div><div class='del'>-	(cal_component_commit_sequence): Ensure we have the mandatory</div><div class='del'>-	alarm properties.</div><div class='del'>-</div><div class='del'>-2001-10-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-model.c (process_section): process an individual</div><div class='del'>-	section here</div><div class='del'>-	(select_names_ok_cb): call above</div><div class='del'>-	(get_select_name_dialog): listen for ok:dialog signal</div><div class='del'>-</div><div class='del'>-2001-10-29  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/Makefile.am (evolution_calendar_importer_LDADD): </div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): </div><div class='del'>-	* cal-util/Makefile.am (test_recur_LDADD): </div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): use libical-evolution.la</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c: save the timezone passed in for the</div><div class='del'>-	start time, so if our times are changed we use this. Also, if the</div><div class='del'>-	end time was passed in in a different timezone, convert it.</div><div class='del'>-	Also hide the time fields for DATE values. Note that DATE values still</div><div class='del'>-	do not work.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.glade: changed "Invite Others" to</div><div class='del'>-	"Invite Others..." to be consistent with the other page.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (times_updated):</div><div class='del'>-	(all_day_event_toggled_cb): set is_date if appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_label_piece): convert all UTC times to</div><div class='del'>-	the current timezone. Outlook sends simple, non-recurring, events as</div><div class='del'>-	UTC times, which isn't very useful.</div><div class='del'>-</div><div class='del'>-2001-10-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (launch_alarm_daemon): Launch the alarm daemon as</div><div class='del'>-	soon as the calendar component is started.  Fixes bug #13867;</div><div class='del'>-	we can't really do much better than this.</div><div class='del'>-</div><div class='del'>-2001-10-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (pixmaps): Fix the verb names for the</div><div class='del'>-	pixmaps in the Edit menu; they were out of synch with the XML</div><div class='del'>-	UI description.</div><div class='del'>-</div><div class='del'>-2001-10-29  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_dump_active_backends): new</div><div class='del'>-	function.</div><div class='del'>-	(dump_backend): new function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h: add prototype for</div><div class='del'>-	cal_factory_dump_active_backends.</div><div class='del'>-</div><div class='del'>-2001-10-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #12163.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (compute_alarm_range): Take alarm</div><div class='del'>-	repetitions into account.</div><div class='del'>-	(add_alarm_occurrences_cb): Add alarm repetitions.</div><div class='del'>-	(generate_absolute_triggers): Likewise.</div><div class='del'>-	(generate_absolute_triggers): Oops, absolute triggers are in UTC,</div><div class='del'>-	so convert them as such.  Also, pay attention to the timezones of</div><div class='del'>-	the dtstart and dtend properties.</div><div class='del'>-</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/Makefile.am: include the header as a source so it gets</div><div class='del'>-	dist'ed.</div><div class='del'>-</div><div class='del'>-2001-10-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/Makefile.am (INCLUDES):</div><div class='del'>-	s/BONOBO_CFLAGS/BONOBO_GNOME_CFLAGS/.</div><div class='del'>-</div><div class='del'>-2001-10-29  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/icalendar-importer.c (load_file_fn): fixed URI</div><div class='del'>-	construction, which was preventing importing into the root</div><div class='del'>-	calendar (~/evo/local/Calendar/)</div><div class='del'>-</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (is_all_day): handle date</div><div class='del'>-	values</div><div class='del'>-</div><div class='del'>-2001-10-29  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importers/: added evolution-calendar-importer binary, starting</div><div class='del'>-	with an iCalendar file importer</div><div class='del'>-</div><div class='del'>-2001-10-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h</div><div class='del'>-	(todoconduit_load_configuration): get the management object by id</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h</div><div class='del'>-	(calconduit_load_configuration): ditto</div><div class='del'>-</div><div class='del'>-2001-10-29  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[ch] (calendar_config_get_default_uri):</div><div class='del'>-	(calendar_config_set_default_uri):</div><div class='del'>-	(calendar_config_get_default_tasks_uri):</div><div class='del'>-	(calendar_config_set_default_tasks_uri): new functions for setting</div><div class='del'>-	and retrieving the default calendar URIs</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (init): don't use</div><div class='del'>-	hard-coded URI, but use the default calendar URI, as returned</div><div class='del'>-	by calendar_config_get_default_uri</div><div class='del'>-	(start_calendar_server): added a "gboolean tasks" parameter, so</div><div class='del'>-	that the local tasks.ics file is used if the calendar to be</div><div class='del'>-	started is for tasks when no default tasks URI is found in</div><div class='del'>-	the configuration</div><div class='del'>-</div><div class='del'>-2001-10-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (add_record): unref the</div><div class='del'>-	comp when finished</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (add_record): ditto</div><div class='del'>-	</div><div class='del'>-2001-10-28  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_widgets): added break</div><div class='del'>-	statements after each case, when setting the classification.</div><div class='del'>-	Fixes bug #13772.</div><div class='del'>-</div><div class='del'>-2001-10-28  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (destroy_wombat_client): removed this</div><div class='del'>-	function, as we don't need to unref at all the WombatClient</div><div class='del'>-	object, since it is aggregated to the CalListener object, which</div><div class='del'>-	will take care of unrefing it (Fixes Ximian #12001)</div><div class='del'>-	(cal_client_open_calendar): create the WombatClient here</div><div class='del'>-</div><div class='del'>-2001-10-28  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_todo_details): get the tasks directly from the</div><div class='del'>-	CalendarModel, so we get the filtering &amp; sorting for free. Fixes</div><div class='del'>-	bug #10280. Hmm. This seems too easy. It isn't going to work is it...</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_task_pad): new function to get</div><div class='del'>-	the TaskPad ECalendarTable, for printing.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: </div><div class='del'>-	* gui/calendar-config.c (calendar_config_get_hide_completed_tasks_sexp): </div><div class='del'>-	split this out from calendar-model.c so we could use it for printing,</div><div class='del'>-	but ended up doing that a different way.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (init_widgets): removed a duplicated signal</div><div class='del'>-	connected to field_changed_cb().</div><div class='del'>-</div><div class='del'>-2001-10-27  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_week_view): </div><div class='del'>-	(range_selector_new): when the week start day is set to Sunday, we</div><div class='del'>-	have to be careful to make sure we print the correct week, since</div><div class='del'>-	the previous Saturday is actually printed first. Fixes bug #13687.</div><div class='del'>-	(print_week_summary): always set compress_weekend to true if</div><div class='del'>-	multi_week_view is FALSE (i.e. we are printing the week view).</div><div class='del'>-	Fixes bug #13688.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (send_freebusy): use the timezones from the</div><div class='del'>-	DTSTART and DTEND.</div><div class='del'>-	(write_label_piece): output the date-time and the timezone after it.</div><div class='del'>-	Note that we may want to convert it to the current timezone and display</div><div class='del'>-	that as well. Also converted COMPLETED to the current timezone.</div><div class='del'>-	And fixed all uses of old timezone functions.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (commit_all_fields): added function to</div><div class='del'>-	set the focus in the window to NULL, so all fields lose their focus,</div><div class='del'>-	so they emit "changed" signals and update their values if needed.</div><div class='del'>-	We call this when most menu commands are used, e.g. 'Save and Close',</div><div class='del'>-	'Print' etc. Fixes bug #11434. In future we should also check fields</div><div class='del'>-	are valid and show dialogs if they are not.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_completed): use the completed value</div><div class='del'>-	properly. Fixes bug #13694.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): don't check</div><div class='del'>-	from_zone and to_zone != NULL. A NULL zone is valid, it is for</div><div class='del'>-	floating times.</div><div class='del'>-</div><div class='del'>-2001-10-27  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing</div><div class='del'>-	if the user presses Escape.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_text_item_event): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c: #include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-2001-10-27  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_editing_stopped): Delete</div><div class='del'>-	appointments with empty summaries.  Fixes Ximian bug #780.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Added an</div><div class='del'>-	argument to specify whether we unconditionally want single</div><div class='del'>-	components to be considered as not having a summary.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_confirm_delete_empty_comp): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/misc.[ch]: New files with miscellaneous utility functions;</div><div class='del'>-	moved string_is_empty() over from calendar-model.c.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Use the string_is_empty()</div><div class='del'>-	function from misc.c.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added misc.[ch] to</div><div class='del'>-	the list of sources.</div><div class='del'>-</div><div class='del'>-2001-10-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): touch on</div><div class='del'>-	lookup</div><div class='del'>-	(check_for_slow_setting): write touched only if slow sync</div><div class='del'>-	(match): touch on lookup</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	touch the record on lookup</div><div class='del'>-	(check_for_slow_setting): write touched only if slow sync</div><div class='del'>-	(pre_sync): don't touch on lookup</div><div class='del'>-	(match): touch on lookup</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/e-calendar.conduit.in: remove the merges as</div><div class='del'>-	valid sync types</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (pre_sync): write out only</div><div class='del'>-	the touched records if we are doing copies</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: as above</div><div class='del'>-	</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h</div><div class='del'>-	(calconduit_load_configuration): get the sync type</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: as above</div><div class='del'>-	</div><div class='del'>-2001-10-26  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_label_piece): convert the formatted</div><div class='del'>-	date to UTF-8.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (CAL_OBJ_DEBUG): turn off debug functions.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (parse_contact_string): handle UTF8</div><div class='del'>-	correctly. Bug #4450. Good enough for 1.0.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_draw_time): set the gc</div><div class='del'>-	color before drawing. Should fix bug #11469.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show or hide the</div><div class='del'>-	meeting page as appropriate. Note this may be called more than once,</div><div class='del'>-	if the task gets updated somewhere else and the user clicks 'Update</div><div class='del'>-	the object'. Hopefully fixes bug #12930.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_comp_item): printed more fields and made a little</div><div class='del'>-	prettier. Fixes bug #9352.</div><div class='del'>-	(print_date_label): used the correct timezones for each date field.</div><div class='del'>-</div><div class='del'>-	* *.c: removed several debug messages.</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):</div><div class='del'>-	make debug output more accurate</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): remove the uid from the</div><div class='del'>-	map if was archived and is now deleted</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-2001-10-26  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar_table.c (delete_selected_components):</div><div class='del'>-	(selection_received): added status bar messages</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_cut_clipboard):</div><div class='del'>-	(selection_received): likewise</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_cut_clipboard):</div><div class='del'>-	(selection_received): likewise</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: modify fields</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (print_remote): free the</div><div class='del'>-	struct after use</div><div class='del'>-	(e_calendar_context_new): explicitly init context fields</div><div class='del'>-	(e_calendar_context_destroy): free local records and properly free</div><div class='del'>-	changed hash elements</div><div class='del'>-	(start_calendar_server_cb): tidy</div><div class='del'>-	(start_calendar_server): ditto</div><div class='del'>-	(free_local): free a local record</div><div class='del'>-	(local_record_to_pilot_record): use a static buffer to avoid leaks</div><div class='del'>-	(local_record_from_comp): only copy over alarm stuff from the</div><div class='del'>-	original record, we sync everything else</div><div class='del'>-	(local_record_from_uid): unref the comp when we are done</div><div class='del'>-	(pre_sync): free change_id</div><div class='del'>-	(post_sync): ditto</div><div class='del'>-	(for_each): track locals</div><div class='del'>-	(for_each_modified): ditto</div><div class='del'>-	(free_match): use free_local</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: as above</div><div class='del'>-	</div><div class='del'>-2001-10-26  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_construct): Get a fresh CORBA_Environment for</div><div class='del'>-	every CORBA call.  Hopefully will fix #11978, but I'm not sure</div><div class='del'>-	about what else could be happening.</div><div class='del'>-	(cal_get_password): Free the exception.</div><div class='del'>-</div><div class='del'>-2001-10-25  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: used functions to get PUBLISH_OPTIONS etc.,</div><div class='del'>-	so we can translate them.</div><div class='del'>-</div><div class='del'>-2001-10-25  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_obj_bysetpos_filter): subtract 1 from</div><div class='del'>-	any positive BYSETPOS value, since our array is 0-based.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): </div><div class='del'>-	(recurrence_page_fill_widgets): Outlook (2000) will not accept monthly</div><div class='del'>-	recurrences like BYDAY=2TU. Instead it uses BYDAY=TU;BYSETPOS=2.</div><div class='del'>-	So to be compatable with it we now do the same, although we still</div><div class='del'>-	accept and convert the old format.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_component_as_string): new</div><div class='del'>-	function to return a complete VCALENDAR string containing a VEVENT</div><div class='del'>-	or VTODO with all the VTIMEZONEs it uses.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_as_ok): use above function so we</div><div class='del'>-	save the VTIMEZONE data with the VEVENT/VTODO. Fixes bug #8626.</div><div class='del'>-	Also made sure we output "METHOD:PUBLISH" since Outlook (2000) will</div><div class='del'>-	not import it otherwise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (page_mapped_cb): </div><div class='del'>-	(page_unmapped_cb): install/uninstall the GtkAccelGroup for the page.</div><div class='del'>-	(comp_editor_append_page): connect to the map/unmap signals to</div><div class='del'>-	install/uninstall the accelerators. (This is all for bug #11609,</div><div class='del'>-	though of course it doesn't work too well in GTK+ 1.2 anyway.)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/task-details-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/schedule-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/recurrence-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/meeting-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/event-page.c (get_widgets): </div><div class='del'>-	* gui/dialogs/alarm-page.c (get_widgets): got the GtkAccelGroup from</div><div class='del'>-	the original window, ref'ed it and placed it in the CompEditorPage</div><div class='del'>-	struct.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy): unref</div><div class='del'>-	any GtkAccelGroup for the page.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.glade: changed '_Confidential' to</div><div class='del'>-	'Con_fidential' as it clashed with '_Contacts'. It now matches the</div><div class='del'>-	event editor as well.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.glade: </div><div class='del'>-	* gui/dialogs/task-page.glade: Set CAN_FOCUS to TRUE for the custom</div><div class='del'>-	EDateEdit widgets, and set them as the accel targets of the labels.</div><div class='del'>-</div><div class='del'>-2001-10-25  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_comp): show an error message when</div><div class='del'>-	we can't update the object on the calendar server</div><div class='del'>-</div><div class='del'>-2001-10-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c: Ifdef-ed out the PersistFile bits.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: The tasks folder does not</div><div class='del'>-	support the PersistFile interface; removed it.  Removed it as well</div><div class='del'>-	from the calendar folder since it is aggregated but not actually</div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-2001-10-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (xfer_folder): Handle tasks folders as</div><div class='del'>-	well; was always using "calendar.ics" as the filename.</div><div class='del'>-</div><div class='del'>-2001-10-24  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: added sections for Tasks</div><div class='del'>-	factory and control. I hope someone checks these!</div><div class='del'>-</div><div class='del'>-2001-10-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (xfer_folder): Fixed to only copy the</div><div class='del'>-	`calendar.ics' and `calendar.ics~' files.</div><div class='del'>-</div><div class='del'>-2001-10-24  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): when</div><div class='del'>-	iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'.</div><div class='del'>-	That meant it wasn't working at all well when an entire VCALENDAR</div><div class='del'>-	was passed in.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: handle DURATION property used instead of</div><div class='del'>-	DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART</div><div class='del'>-	+ DURATION if necessary. In set_dtend/due we remove any DURATION</div><div class='del'>-	property. Fixes bug #11262.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (build_etable): </div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): use U_ for the</div><div class='del'>-	ECellCombo popdown strings, as it expects UTF-8 strings.</div><div class='del'>-</div><div class='del'>-2001-10-24  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_construct):</div><div class='del'>-	track the spacer vbox</div><div class='del'>-	(e_meeting_time_selector_style_set): make sure the rows are the</div><div class='del'>-	correct size for the style</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel-item.c</div><div class='del'>-	(e_meeting_time_selector_item_paint_day_top): slight adjustments</div><div class='del'>-	to where the text is drawn</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.h: new member</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (build_etable): ensure uniform row height</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): mark</div><div class='del'>-	status as completed in appropriate places and don't overwrite</div><div class='del'>-	legitimate percentages and such</div><div class='del'>-</div><div class='del'>-2001-10-24  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #5282.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (icaltimetype_to_tm_with_zone): New function</div><div class='del'>-	to avoid copying the same code all over the place.</div><div class='del'>-	(icaltimetype_to_tm): Also set the tm.tm_wday.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (queue_midnight_refresh): Use</div><div class='del'>-	time_day_end_with_zone().</div><div class='del'>-	(load_alarms_for_today): Likewise.  And oops, we were only</div><div class='del'>-	computing the times and not loading the alarms.</div><div class='del'>-	(obj_updated_cb): Likewise.</div><div class='del'>-	(load_alarms): Removed assertion that is no longer valid because</div><div class='del'>-	we may load the alarms for a client in two stages.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_alarm_string): Convert absolute</div><div class='del'>-	trigger times to the local timezone.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading):</div><div class='del'>-	Convert the times to the local timezone.</div><div class='del'>-	(alarm_notify_dialog): Likewise, for the window title.</div><div class='del'>-	(alarm_notify_dialog): Set the window layer to WIN_LAYER_ONTOP.</div><div class='del'>-</div><div class='del'>-	* gui/e-cell-date-edit-text.c (ecd_get_text): Use</div><div class='del'>-	icaltimetype_to_tm_with_zone().</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.c (get_config_db): Made public.</div><div class='del'>-	(discard_config_db): Made public.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/config-data.[ch]: New files with functions to</div><div class='del'>-	fetch the calendar configuration data used by the alarm daemon.</div><div class='del'>-</div><div class='del'>-2001-10-23  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_event_dates_match): make sure</div><div class='del'>-	we free all the CalComponentDateTime's when we are finished.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_notify_dates_shown_changed): just</div><div class='del'>-	return if no time range is set.</div><div class='del'>-</div><div class='del'>-2001-10-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_table_vadjustment_changed): adjust the</div><div class='del'>-	display canvas when the table scrolls</div><div class='del'>-	(e_meeting_time_selector_construct): listen for table scrolling</div><div class='del'>-</div><div class='del'>-2001-10-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-model.c (build_etable): no longer set the</div><div class='del'>-	scrollbar policy here</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_update_main_canvas_scroll_region): add an</div><div class='del'>-	extra row to the height so the click to add row can be properly</div><div class='del'>-	seen</div><div class='del'>-	(e_meeting_time_selector_construct): set the scrollbar policy for</div><div class='del'>-	the etable scrolled</div><div class='del'>-</div><div class='del'>-2001-10-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* cal-util/timeutil.c (icaltimetype_to_tm): convert an</div><div class='del'>-	icaltimetype to a tm</div><div class='del'>-	(tm_to_icaltimetype): vice versa</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.h: new protos</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: replace all mktime and</div><div class='del'>-	localtime calls (except for debugging calls)</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: ditto</div><div class='del'>-	(comp_from_remote_record): make sure the completed time is in UTC</div><div class='del'>-	</div><div class='del'>-2001-10-23  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-query.c (cal_query_construct) set priv-&gt;corba_query</div><div class='del'>-	to CORBA_OBJECT_NIL if there was an error</div><div class='del'>-</div><div class='del'>-2001-10-22  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: added setDefaultTimezone() method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_default_timezone): </div><div class='del'>-	(cal_backend_set_default_timezone): new functions to call class</div><div class='del'>-	methods.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: lots of changes to handle the default</div><div class='del'>-	timezone and use it.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c: use the default timezone.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (date_changed_cb): initialized</div><div class='del'>-	completed_tt.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c: changed it to handle DATE values. The</div><div class='del'>-	'All Day Event' checkbox is only set now when the DTSTART and DTEND</div><div class='del'>-	are DATE values.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_free_dates): free the</div><div class='del'>-	CalComponentDateTime structs as well.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: set the default timezone on the server.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c: </div><div class='del'>-	* gui/gnome-cal.c: </div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: updates to handle DATE values.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (date_compare_cb): updated to use the new</div><div class='del'>-	ECellDateEditValue values, so it now works.</div><div class='del'>-	(percent_compare_cb): updated to use GPOINTER_TO_INT values.</div><div class='del'>-	(e_calendar_table_init): use an ECellPercent for the percent field</div><div class='del'>-	and an ECellDateEditText for the date fields.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): return TRUE</div><div class='del'>-	if the DTSTART or DTEND is a DATE value. We don't want to show the</div><div class='del'>-	timezone icons for DATE values.</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c (resolve_pending_requests): set the default</div><div class='del'>-	timezone on the server.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: major changes to support sorting properly.</div><div class='del'>-	For date and percent fields we now use subclasses of ECellText, so</div><div class='del'>-	we don't use a char* as the model value. For the percent field we now</div><div class='del'>-	use a GINT_TO_POINTER. For the date fields we now use a</div><div class='del'>-	ECellDateEditValue* as the value.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): </div><div class='del'>-	set the timezone and use_24_hour flags of the new ECellDateEditText.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): </div><div class='del'>-	* conduits/calendar/calendar-conduit.c (pre_sync): set the default</div><div class='del'>-	timezone on the server.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_days_in_month): removed debug message.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: try to handle timezones in the iCalendar</div><div class='del'>-	file properly, and updated to pass default timezone.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_util_generate_alarms_for_comp):</div><div class='del'>-	(cal_util_generate_alarms_for_list): added default timezone argument.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: changed many of the functions to take a default</div><div class='del'>-	timezone, to use to resolve DATE and floating DATE-TIME values.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_set_default_timezone): new</div><div class='del'>-	function to set the default timezone.</div><div class='del'>-	(cal_client_ensure_timezone_on_server): new function to ensure that</div><div class='del'>-	a given timezone is on the server.</div><div class='del'>-</div><div class='del'>-	* gui/e-cell-date-edit-text.c: new subclass of ECellText to display</div><div class='del'>-	and edit a date value.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_obj_byday_expand_monthly): changed week_num</div><div class='del'>-	to -week_num when calculating the weeks to go back from the end of the</div><div class='del'>-	month for things like BYDAY=-2WE. Fixes bug #11525.</div><div class='del'>-	(cal_recur_generate_instances_of_rule): only go up to MAX_YEAR (2037).</div><div class='del'>-	We can't really handle anything past that anyway.</div><div class='del'>-	(cal_recur_ensure_rule_end_date): initialize cb_date.end_date to 0,</div><div class='del'>-	so if the RULE doesn't generate COUNT instances we save 0 as the</div><div class='del'>-	time_t.</div><div class='del'>-</div><div class='del'>-2001-10-22  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control-factory.c (tasks_control_factory_fn): Put up a</div><div class='del'>-	warning dialog box if we failed to create the tasks control.</div><div class='del'>-	Fixes bug #13033.</div><div class='del'>-</div><div class='del'>-2001-10-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (set_date_label): write out the correct</div><div class='del'>-	time in the control</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_fb_seq): utility function to build sequences of</div><div class='del'>-	f/b data</div><div class='del'>-	(impl_Cal_get_free_busy): use above so we never return a NULL</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h</div><div class='del'>-	(calconduit_save_configuration): fix c/p error</div><div class='del'>-	(calconduit_load_configuration): ditto</div><div class='del'>-</div><div class='del'>-2001-10-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/meeting-page.c (meeting_page_destroy): we don't need</div><div class='del'>-	to save the state</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_destroy):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (build_etable): listen for the etable</div><div class='del'>-	being destroyed</div><div class='del'>-	(table_destroy_cb): save the state when the etable is destroyed</div><div class='del'>-</div><div class='del'>-2001-10-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c (init_widgets): listen for changes</div><div class='del'>-	in the date editors</div><div class='del'>-	(schedule_page_set_dates): update the times when they change</div><div class='del'>-	elsewhere</div><div class='del'>-	(update_time): set the time in the dialog</div><div class='del'>-	(time_changed_cb): notify of changed times</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/comp-editor.c (page_dates_changed_cb): don't call</div><div class='del'>-	the set dates function on the page that noted the change</div><div class='del'>-	(page_summary_changed_cb): same for set summary function</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/event-page.c (update_time): move time setting stuff</div><div class='del'>-	to util function</div><div class='del'>-	(event_page_set_dates): use it</div><div class='del'>-	(event_page_fill_component): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.h: fix comment</div><div class='del'>-</div><div class='del'>-2001-10-19  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.c (add_uri_to_load): Do not assert</div><div class='del'>-	if we fail to load the URI list.  This would of course have been a</div><div class='del'>-	bonobo-conf activation problem.</div><div class='del'>-	(remove_uri_to_load): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (load_calendars): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (load_missed_alarms): Make the</div><div class='del'>-	time range half-open so that we do not display the last alarm</div><div class='del'>-	twice.</div><div class='del'>-</div><div class='del'>-2001-10-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_set_status_message): make</div><div class='del'>-	it a public function</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_open): display progress messages</div><div class='del'>-	(cal_opened_cb): clean up status bar messages</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): display progress messages</div><div class='del'>-	(client_cal_opened_cb): clean up status bar messages</div><div class='del'>-</div><div class='del'>-2001-10-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/calendar-model.c (set_status_message): new function</div><div class='del'>-	(update_query): call set_status_message</div><div class='del'>-	(query_query_done_cb):</div><div class='del'>-	(query_eval_error_cb): clean up status bar messages</div><div class='del'>-	(get_location, set_location): new functions for setting and</div><div class='del'>-	retrieving the location in the calendar model</div><div class='del'>-</div><div class='del'>-2001-10-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): keep a reference to the</div><div class='del'>-	EvolutionShellClient component</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_status_message): new function</div><div class='del'>-	(update_query): call e_week_view_set_status_message</div><div class='del'>-	(query_query_done_cb):</div><div class='del'>-	(query_eval_error_cb): clean up status bar messages</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_status_message): new function</div><div class='del'>-	(update_query): call e_day_view_set_status_message</div><div class='del'>-	(query_query_done_cb):</div><div class='del'>-	(query_eval_error_cb): clean up status bar messages</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added EVOLUTION_IMAGESDIR to CFLAGS</div><div class='del'>-	</div><div class='del'>-2001-10-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-	(e_meeting_time_selector_on_invite_others_button_clicked): call</div><div class='del'>-	the invite others dialog in the model</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-attendee.c (e_meeting_attendee_get_atype): pick</div><div class='del'>-	attendee type based on role and cutype</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-attendee.h: remove proto</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: compile select names idl</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: remove invite others dialogs bits</div><div class='del'>-	from here</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (e_meeting_model_invite_others_dialog):</div><div class='del'>-	and put them here</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/Makefile.am: compile corba bits in parent dir</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.h: reflect above in includes</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c: ditto and clean includes</div><div class='del'>-	</div><div class='del'>-2001-10-18  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify-dialog.c: add html widget</div><div class='del'>-	(url_requested_cb): add function to load images from file as they</div><div class='del'>-	are requested.</div><div class='del'>-	(write_html_heading): convert to using html.</div><div class='del'>-	(alarm_notify_dialog): convert to use html display.</div><div class='del'>-	(make_html_display): this is the function the custom widget in the</div><div class='del'>-	galde file uses to create the html widget.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.glade: add placeholder for the</div><div class='del'>-	custom html widget.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am: add flags for gtkhtml and gal.</div><div class='del'>-	</div><div class='del'>-2001-10-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Adds session management for the alarm daemon.  Also makes it store</div><div class='del'>-	a list of calendars to be monitored.  Those calendars will all be</div><div class='del'>-	loaded when the alarm daemon starts up.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (AlarmNotify): Removed the ::die()</div><div class='del'>-	method.  The alarm daemon now handles termination via the session</div><div class='del'>-	manager's commands.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (set_session_parameters): New</div><div class='del'>-	function, sets some parameters so that the session manager can</div><div class='del'>-	restart the daemon via the evolution-alarm-client program.  Also,</div><div class='del'>-	sets up the "die" signal so that the daemon can terminate when the</div><div class='del'>-	session ends.</div><div class='del'>-	(load_calendars): New function to load the calendars on startup.</div><div class='del'>-	(main): Set the session parameters.  Load the calendars on startup.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.c (alarm_notify_add_calendar): New</div><div class='del'>-	function, moved over from the impl_ function.  Added a</div><div class='del'>-	load_afterwards argument to indicate whether the calendar should</div><div class='del'>-	just be loaded or if it should also be added to the list of</div><div class='del'>-	calendars to load on startup.</div><div class='del'>-	(AlarmNotify_addCalendar): Use alarm_notify_add_calendar().</div><div class='del'>-	(AlarmNotify_removeCalendar): Remove the calendar from the list of</div><div class='del'>-	calendars to load on startup.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.c (save_calendars_to_load): New function,</div><div class='del'>-	saves a sequence of the URIs to load.</div><div class='del'>-	(get_calendars_to_load): New function, loads a sequence of</div><div class='del'>-	calendars to load.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.h: Removed stale prototype for alarm_init().</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (remove_folder): Ask the alarm daemon to</div><div class='del'>-	stop monitoring alarms for the folder that is being deleted.</div><div class='del'>-</div><div class='del'>-2001-10-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel-item.c</div><div class='del'>-	(e_meeting_time_selector_item_paint_day_top): use 12 or 24 hour</div><div class='del'>-	settings</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c: strings for 12 hour setting</div><div class='del'>-	(e_meeting_time_selector_construct): increase width slightly</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-time-sel.h: extern the new char array</div><div class='del'>-</div><div class='del'>-2001-10-18  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[ch] (cal_component_get_location):</div><div class='del'>-	(cal_component_set_location): new functions</div><div class='del'>-</div><div class='del'>-2001-10-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/e-meeting-model.c (process_callbacks): util routine to</div><div class='del'>-	handle calling back</div><div class='del'>-	(async_close): use above</div><div class='del'>-	(e_meeting_model_refresh_busy_periods): ditto</div><div class='del'>-</div><div class='del'>-2001-10-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): translate</div><div class='del'>-	1-5 priorites to 1-9 priorities better</div><div class='del'>-	(comp_from_remote_record): ditto</div><div class='del'>-</div><div class='del'>-2001-10-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* idl/evolution-calendar.idl: allow some decent exceptions</div><div class='del'>-</div><div class='del'>-2001-10-17  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (match_component): there may be cases when the backend</div><div class='del'>-	will return an invalid component from a valid UID (an UID returned</div><div class='del'>-	by the get_uids method), so don't abort if that's the case</div><div class='del'>-</div><div class='del'>-2001-10-15  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have</div><div class='del'>-	any others?</div><div class='del'>-</div><div class='del'>-2001-10-15  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (set_icon_from_comp): remove warnings.</div><div class='del'>-</div><div class='del'>-2001-10-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (process_multi_day):</div><div class='del'>-	function to break up multi day events into single events for both</div><div class='del'>-	evo and the pilot and create new CalClientChange structures</div><div class='del'>-	(pre_sync): call above function, and adjust changed list if</div><div class='del'>-	necessary</div><div class='del'>-</div><div class='del'>-2001-10-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (is_all_day): util function</div><div class='del'>-	to determine if event is all day</div><div class='del'>-	(local_record_from_comp): use new util function</div><div class='del'>-	(comp_from_remote_record): kill use of deprecated time functions</div><div class='del'>-</div><div class='del'>-2001-10-13  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (real_edit_comp): call</div><div class='del'>-	set_icon_from_comp.</div><div class='del'>-	(set_icon_from_comp): set the window icon from the comp.</div><div class='del'>-	(make_icon_from_comp): get the icon path based on comp type.</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/Makefile.am (iconsdir): EVOLUTION_ICONSDIR bits.</div><div class='del'>-</div><div class='del'>-2001-10-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_send_comp): send</div><div class='del'>-	cancellation comp if necessary</div><div class='del'>-</div><div class='del'>-2001-10-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c: return fill_component success</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: use e_notice instead of</div><div class='del'>-	duplicate_error</div><div class='del'>-	(meeting_page_get_cancel_comp): duh, deleted_attendees is an array</div><div class='del'>-	now</div><div class='del'>-	(meeting_page_fill_component): spew gui errors if there is no</div><div class='del'>-	organizer or no attendees, return success</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_send_comp): always call</div><div class='del'>-	parent method and don't send the cancellation comp if the method</div><div class='del'>-	is publish</div><div class='del'>-	(refresh_meeting_cmd): use the orginal comp to refresh</div><div class='del'>-	(forward_cmd): prompt the user for the version they want to send</div><div class='del'>-	(current, original)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (forward_cmd): as above</div><div class='del'>-	(refresh_task_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.c</div><div class='del'>-	(comp_editor_page_fill_component): return boolean of whether the</div><div class='del'>-	component could be filled or not</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.h: update proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (prompt_to_save_changes): take a param</div><div class='del'>-	on whether to try and send or not</div><div class='del'>-	(comp_editor_get_current_comp): only fill component if its changed</div><div class='del'>-	(comp_editor_save_comp): prompt user as well</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: change proto</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c: replace error_dialog with e_notice</div><div class='del'>-	(comp_content_type): specify charset</div><div class='del'>-</div><div class='del'>-2001-10-11  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: large reworking of i18n tagging and now</div><div class='del'>-	uses gtk_html_stream write and U_ where appropriate.  More to</div><div class='del'>-	come.</div><div class='del'>-</div><div class='del'>-2001-10-10  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (init): set the default character set to</div><div class='del'>-	utf-8.</div><div class='del'>-</div><div class='del'>-2001-10-10  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (lookup_backend): Return the original key in</div><div class='del'>-	the hash table if requested.</div><div class='del'>-	(backend_last_client_gone_cb): Use lookup_backend() so that we</div><div class='del'>-	have the URI mangling done for us.</div><div class='del'>-	(impl_CalFactory_open): The type should be GtkType *, not GtkType!</div><div class='del'>-</div><div class='del'>-2001-10-10  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_set_mode_cb): remove unneeded</div><div class='del'>-	assertions</div><div class='del'>-</div><div class='del'>-2001-10-10  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* pcs/cal-factory.c (add_uri): fix logic checks</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_init): init the</div><div class='del'>-	exisiting_org boolean</div><div class='del'>-	(set_menu_sens): base sensitivity on existing_org boolean</div><div class='del'>-	(event_editor_edit_comp): set exisiting_org boolean</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: same as above</div><div class='del'>-</div><div class='del'>-	* gui/calendar-offline-handler.c (add_connection): handle the</div><div class='del'>-	protocol or host being unknown</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_has_organizer):</div><div class='del'>-	implement</div><div class='del'>-</div><div class='del'>-2001-10-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #884.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/save.[ch]: New files with functions to</div><div class='del'>-	save/load the last notification time.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Save the last</div><div class='del'>-	notification time.</div><div class='del'>-	(alarm_queue_init): Load the last notification time when the</div><div class='del'>-	daemon is inited.</div><div class='del'>-	(alarm_queue_add_client): Load the alarms that we missed while the</div><div class='del'>-	alarm daemon was not running.</div><div class='del'>-	(cal_opened_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):</div><div class='del'>-	Added save.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-10-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (get_address): util function to get address</div><div class='del'>-	(itip_addresses_get_default): get only the default address</div><div class='del'>-	(itip_address_free): free single address</div><div class='del'>-	(itip_addresses_free): use above</div><div class='del'>-	(comp_limit_attendees): limit the number of attendees to one, the</div><div class='del'>-	user</div><div class='del'>-	(comp_sentby): set the sentby parameter if the user is not the</div><div class='del'>-	organizer</div><div class='del'>-	(comp_minimal): remove extraneous info for send (for refresh and</div><div class='del'>-	declinecounter)</div><div class='del'>-	(comp_compliant): remove all alarms, do various things to make the</div><div class='del'>-	components comply with itip spec based on method</div><div class='del'>-	(itip_send_comp): use comp_compliant method</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: rescan the component when necessary</div><div class='del'>-	(get_next): don't get stuck in infinite loop if there are no</div><div class='del'>-	viewable components</div><div class='del'>-	(e_itip_control_set_data): if there are no viewable components,</div><div class='del'>-	spit an error message</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.h: tidy</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): use</div><div class='del'>-	organizer's cn if possible</div><div class='del'>-	(other_clicked_cb): no longer doing the sent by stuff directly,</div><div class='del'>-	hide more widgets</div><div class='del'>-</div><div class='del'>-	* pcs/query.c: use bonobo exception stuff</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_rescan): have the comp</div><div class='del'>-	rescan its libical component (for when you change things directly)</div><div class='del'>-	(free_icalcomponent): take a param on whether to free the</div><div class='del'>-	component or just clean up the mappings</div><div class='del'>-	(cal_component_has_attendees): util function</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: new protos</div><div class='del'>-	</div><div class='del'>-2001-10-09  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (lookup_backend, add_backend): deal correctly with</div><div class='del'>-	URIs to be inserted into the hash table, so that we don't add the same</div><div class='del'>-	backend over and over because the URI strings were different (although</div><div class='del'>-	refering to the same backend)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (mail_account_*): moved to a common place</div><div class='del'>-	(cal_backend_file_open): check if "uristr != NULL" and not</div><div class='del'>-	"uri != NULL"</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-util.c: moved to here</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: add missing header file</div><div class='del'>-</div><div class='del'>-2001-10-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (process_free_busy_comp): Fix incorrect</div><div class='del'>-	variable name check.</div><div class='del'>-</div><div class='del'>-2001-10-03  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): refactor functionality into</div><div class='del'>-	several function</div><div class='del'>-	(comp_string): if we are publishing, empty the attendee list</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (schedule_meeting_cmd): when we</div><div class='del'>-	schedule a new meeting, mark the event editor as changed</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_class_init): get correct parent class</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_merge_ui): use the</div><div class='del'>-	generated ui component name</div><div class='del'>-</div><div class='del'>-2001-10-03  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c:</div><div class='del'>-	* gui/calendar-offline-handler.c:</div><div class='del'>-	* gui/comp-editor-factory.c: replace use of gnome_vfs_uri with e_uri</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (start_addressbook_server): make it return void,</div><div class='del'>-	since the return value does not mind</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c:</div><div class='del'>-	* pcs/cal-factory.c:</div><div class='del'>-	* pcs/cal-backend.[ch]: don't use GnomeVFS for URI management</div><div class='del'>-	</div><div class='del'>-	* pcs/cal-backend-file.c: ditto, only use GnomeVFS for internal</div><div class='del'>-	operations</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_open_calendar): don't CORBA_exception_free</div><div class='del'>-	before checking for exceptions</div><div class='del'>-</div><div class='del'>-2001-10-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.etspec: Added priorities to a bunch of</div><div class='del'>-	these columns.  Fixes Ximian bug #7158.</div><div class='del'>-</div><div class='del'>-2001-10-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_add_exdate): save the EXDATE as a</div><div class='del'>-	DATE-TIME value, since we know the exact time. Fixes bug #11278.</div><div class='del'>-	(Before we were setting is_date, but icaltime_from_timet_with_zone()</div><div class='del'>-	didn't convert it properly. We need to figure out how to handle DATEs</div><div class='del'>-	when using time_t's.)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (get_exception_string): use</div><div class='del'>-	e_time_format_date_and_time() so we show the time as well, if the</div><div class='del'>-	exception is a DATE-TIME value.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c: removed time_add_month(), time_year_begin(),</div><div class='del'>-	time_month_begin() &amp; time_week_begin() - old pre-timezone functions</div><div class='del'>-	which we no longer use.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_from_icalproperty): set</div><div class='del'>-	ir.until.is_date to FALSE before converting to a time_t.</div><div class='del'>-	Hopefully fixes bug #5034.</div><div class='del'>-</div><div class='del'>-2001-10-02  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (setup_widgets): Use</div><div class='del'>-	`bonobo_ui_component_new_default()', not</div><div class='del'>-	`bonobo_ui_component_new()'.</div><div class='del'>-</div><div class='del'>-2001-10-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-query.c: use bonobo-exception to tidy</div><div class='del'>-</div><div class='del'>-2001-10-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (nth_weekday): handle -1 as</div><div class='del'>-	well</div><div class='del'>-	(comp_from_remote_record): fix monthly by day recurrences and</div><div class='del'>-	handle "last" day type</div><div class='del'>-</div><div class='del'>-2001-10-01  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_destroy): unref the page</div><div class='del'>-	objects here, instead of in close_dialog(). (This was fixed a while</div><div class='del'>-	ago, but accidentally reverted.) Fixes bug #7543.</div><div class='del'>-</div><div class='del'>-2001-10-01  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):</div><div class='del'>-	Set the window state to sticky.  Thanks to Peter Teichman for the</div><div class='del'>-	suggestion.</div><div class='del'>-</div><div class='del'>-2001-10-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	Convert the comp exceptions to the pilot record</div><div class='del'>-	(comp_from_remote_record): record exceptions on the desktop and</div><div class='del'>-	use time zone stuff on recurrence end date</div><div class='del'>-</div><div class='del'>-2001-10-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):</div><div class='del'>-	strdup the uid to avoid double free, write out only after</div><div class='del'>-	everything is done</div><div class='del'>-</div><div class='del'>-2001-10-01  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): don't use</div><div class='del'>-	gnome_vfs_uri_is_local on URIs created with</div><div class='del'>-	gnome_vfs_uri_new_private</div><div class='del'>-</div><div class='del'>-2001-09-28  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_comp_item): use bound_text to print the summary,</div><div class='del'>-	so it wraps instead of being clipped to 1 line. Fixes part 3 of bug</div><div class='del'>-	#10285, I think.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.glade: left-aligned the Date/Time label.</div><div class='del'>-	Also set the width of the Summary &amp; Date/Time labels to 10, and set</div><div class='del'>-	expand to TRUE, to make sure that the dialog doesn't keep getting</div><div class='del'>-	wider as the summary text on the main page gets longer. Could possibly</div><div class='del'>-	use an EClippedLabel here instead, so we get a '...' at the end if it</div><div class='del'>-	is clipped.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.glade: changed Summary &amp; Date/Time</div><div class='del'>-	widths as above.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_calendar): use landscape mode for the month</div><div class='del'>-	preview.</div><div class='del'>-	(print_border_with_triangles): use EPSILON to account for floating</div><div class='del'>-	point errors. Hopefully fixes part 2b of bug #10285.</div><div class='del'>-</div><div class='del'>-2001-09-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	Handle the fields and category we don't sync by making sure we</div><div class='del'>-	don't overwrite them</div><div class='del'>-	(local_record_to_pilot_record): use local record category</div><div class='del'>-	(pre_sync): track db info</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: db info field</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.[hc]: same as above</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c</div><div class='del'>-	(cal_backend_file_compute_changes_foreach_key): create a dummy</div><div class='del'>-	component of the right type and strdup the uid</div><div class='del'>-	(cal_backend_file_compute_changes): sync the db hash after each</div><div class='del'>-	change and free the uid</div><div class='del'>-</div><div class='del'>-2001-09-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* cal-client/cal-client.c (cal_client_open_calendar): init the</div><div class='del'>-	execption rather than freeing it</div><div class='del'>-</div><div class='del'>-2001-09-28  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_construct): use bonobo-exception</div><div class='del'>-	for exceptions</div><div class='del'>-	(cal_client_open_calendar): likewise</div><div class='del'>-</div><div class='del'>-2001-09-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): Update pixmap menu paths;</div><div class='del'>-	/menu/ComponentToolsPlaceholder/Tools -&gt;</div><div class='del'>-	/menu/Tools/ComponentPlaceholder .</div><div class='del'>-	* gui/tasks-control.c: Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: added InvalidURI and UnsupportedMethod</div><div class='del'>-	exceptions to the CalFactory interface</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (impl_CalFactory_open): raise InvalidURI exception on</div><div class='del'>-	URI errors and UnsupportedMethod when we don't support the method for</div><div class='del'>-	a given URI</div><div class='del'>-	</div><div class='del'>-2001-09-26  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: added support for using multiple calendar</div><div class='del'>-	factories</div><div class='del'>-	(cal_client_uri_list): use the list of factories loaded for this</div><div class='del'>-	CalClient</div><div class='del'>-</div><div class='del'>-2001-09-26  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (date_compare_cb): </div><div class='del'>-	(percent_compare_cb): </div><div class='del'>-	(priority_compare_cb): added comparison functions for these special</div><div class='del'>-	cell types. But the date and percent ones don't work yet due to the</div><div class='del'>-	use of static text buffers for return cell values.</div><div class='del'>-	(e_calendar_table_init): added the comparison functions to the</div><div class='del'>-	ETableExtras. NOTE: task_compare_cb() never seems to be called.</div><div class='del'>-	I'm not sure why it is there.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.etspec: set the comparison function names for</div><div class='del'>-	the date/percent/priority fields.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_util_priority_to_string): </div><div class='del'>-	(cal_util_priority_from_string): new utility functions.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_priority): </div><div class='del'>-	(set_priority): used above utility functions, and removed the warning</div><div class='del'>-	dialog which isn't useful now that the field isn't editable.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (times_updated): handle timezones and for</div><div class='del'>-	all-day events make sure it stays an all-day event after adjusting.</div><div class='del'>-	Fixes bugs #5945 and #10222.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): fixed the E_PIXMAP paths - the</div><div class='del'>-	edit items were moved beneath 'EditPlaceholder'. This gets rid of</div><div class='del'>-	those long Bonobo warnings! (and we get the icons back)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): removed the PrintPreview toolbar</div><div class='del'>-	icon, since it doesn't appear in the xml file. Gets rid of warning.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (notify_dates_changed): new function to</div><div class='del'>-	emit the notification signal when the dates are changed. It also</div><div class='del'>-	handles timezones now.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.h (CompEditorPageDates): used</div><div class='del'>-	CalComponentDateTime for start/end/due so we have the timezone as well</div><div class='del'>-	as the time.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): updated to get</div><div class='del'>-	the timezones as well as the times.</div><div class='del'>-	(comp_editor_free_dates): new function needed to free all the structs.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): added call</div><div class='del'>-	to preview_recur() to make sure the preview gets updated.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): free the</div><div class='del'>-	CompEditorPageDates struct after use.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (tag_calendar_by_comp): added 'comp_is_on_server'</div><div class='del'>-	argument. If FALSE, we try to use builtin timezones first. This is</div><div class='del'>-	needed for the recurrence page of the event editor, because the</div><div class='del'>-	timezones may not have been added to the server yet. This and the</div><div class='del'>-	changes to the notification stuff should fix bug #5034.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (dn_query_obj_updated_cb): call above</div><div class='del'>-	tag_calendar_by_comp() with TRUE since the events will be on the</div><div class='del'>-	server in this case.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-layout.c:</div><div class='del'>-	* gui/e-day-view.c: made sure an event always takes up at least one</div><div class='del'>-	row, even when the start &amp; end times are the same. Fixes bug #5944.</div><div class='del'>-	I don't know if we should try to also handle events with the end time</div><div class='del'>-	before the start time.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_style_set): check that the small font</div><div class='del'>-	is actually smaller than the normal font. If it isn't, don't use it.</div><div class='del'>-	Hopefully fixes bug #6876.</div><div class='del'>-	(e_week_view_on_new_appointment): if only one day is selected, then</div><div class='del'>-	we set the initial time of the event to 1/2-hour from the start of the</div><div class='del'>-	working day, to differentiate 'New Appointment' from 'New All Day</div><div class='del'>-	Event'. Fixes bug #8892.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): do the same as the</div><div class='del'>-	above.</div><div class='del'>-</div><div class='del'>-2001-09-26  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes the GUI part of bug #7892.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_alarm_duration_string): Return</div><div class='del'>-	NULL if the duration is zero.</div><div class='del'>-	(get_alarm_string): Handle duration of zero.  Also, hopefully</div><div class='del'>-	make the strings be more l10n-friendly.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.c (alarm_ready_cb): I am a moron.  Fix</div><div class='del'>-	reversed test.</div><div class='del'>-</div><div class='del'>-2001-09-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_destroy): disconnect</div><div class='del'>-	signals first thing</div><div class='del'>-</div><div class='del'>-2001-09-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDFLAGS): Add</div><div class='del'>-	-export-dynamic to make glade custom widgets work on non-Linux.</div><div class='del'>-</div><div class='del'>-2001-09-26  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: added CAL_MODE_INVALID to CalMode enum</div><div class='del'>-</div><div class='del'>-2001-09-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h: new proto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (impl_Cal_set_mode): implement set mode method</div><div class='del'>-	(cal_class_init): set setMode function in epv</div><div class='del'>-	(cal_notify_mode): notify listener of mode change</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (add_uri): deal with UriType renaming</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: add new virtual methods and protos</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_class_init): init new virtual</div><div class='del'>-	methods to null</div><div class='del'>-	(cal_backend_set_mode): sets mode</div><div class='del'>-	(cal_backend_get_mode): gets mode</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_class_init): overide</div><div class='del'>-	get_mode and set_mode methods</div><div class='del'>-	(cal_backend_file_get_mode): return mode</div><div class='del'>-	(notify_mode): have listeners notified of the set mode call</div><div class='del'>-	(cal_backend_file_set_mode): set the mode by indicating not</div><div class='del'>-	supported</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h: update proto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (impl_notifyCalSetMode): implement set</div><div class='del'>-	mode callback</div><div class='del'>-	(cal_listener_construct): take set mode callback</div><div class='del'>-	(cal_listener_new): ditto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: update protos, add signal proto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_class_init): add</div><div class='del'>-	cal_set_mode signal</div><div class='del'>-	(cal_set_mode_cb): handle set mode callback from listener</div><div class='del'>-	(cal_client_open_calendar): pass additional param to cal_listener_new</div><div class='del'>-	(cal_client_set_mode): wrapper to set the calendar mode</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: make UriType into CalMode, add</div><div class='del'>-	SetModeStatus enum and notifyCalSetMode method to the listener</div><div class='del'>-</div><div class='del'>-	* gui/calendar-offline-handler.c (create_connection_list): fetch</div><div class='del'>-	the uri list ourselves</div><div class='del'>-	(impl_prepareForOffline): reflect param change of</div><div class='del'>-	create_connect_list</div><div class='del'>-	(update_offline): ditto</div><div class='del'>-	(backend_cal_set_mode): set mode call back</div><div class='del'>-	(backend_cal_opened): cal opened call back, set mode to local</div><div class='del'>-	(impl_goOffline): reflect UriType renaming</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: rename UriType to CalMode</div><div class='del'>-</div><div class='del'>-2001-09-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Warning fixes courtesy of Chris Lahey &lt;clahey@ximian.com&gt;.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_html): Warning fixes.  Also, don't</div><div class='del'>-	strdup() more than necessary.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.c (e_meeting_time_selector_refresh_cb):</div><div class='del'>-	Warning fixes.</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_addresses_get): Warning fixes.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_day_background): Warning fixes.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Warning</div><div class='del'>-	fixes.</div><div class='del'>-	(alarm_to_palarm_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c: #include "../calendar-config.h"</div><div class='del'>-</div><div class='del'>-2001-09-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.c (alarm_ready_cb): Check that the</div><div class='del'>-	timeout is not set up before we create a new one; the alarm_fn</div><div class='del'>-	callback may cause the alarm system to re-enter and add a new</div><div class='del'>-	alarm.  Fixes bug #10840.</div><div class='del'>-	(pop_alarm): Assert that there is at least one alarm in the queue.</div><div class='del'>-</div><div class='del'>-2001-09-25  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c: use bonobo-exception stuff to clean code</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (add_uri): add uri to the list if the type</div><div class='del'>-	matches</div><div class='del'>-	(impl_CalFactory_uriList): implement uriList method</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: new virtual function member</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_is_remote): call virtual function</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_class_init): override</div><div class='del'>-	virtual function</div><div class='del'>-	(cal_backend_file_is_remote): new virtual function, always return</div><div class='del'>-	FALSE</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: uriList factory call, with flags for</div><div class='del'>-	types to get</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_destroy): cast to remove</div><div class='del'>-	warning</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_label_piece): kill warnings by take</div><div class='del'>-	const char *</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_object): aggregate offline</div><div class='del'>-	interface</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: compile new files</div><div class='del'>-</div><div class='del'>-	* calobj.[hc]: Remove obsolete files</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: enum URI types for uriList call</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_uri_list): build list from string</div><div class='del'>-	sequence</div><div class='del'>-	(cal_client_uri_list): factory call to get uri list</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: new proto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: use bonobo exception stuff to clean</div><div class='del'>-	code</div><div class='del'>-</div><div class='del'>-	* gui/calendar-offline-handler.[hc]: Start some skeleton routines</div><div class='del'>-	for online/offline handling</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (launch_backend_for_uri): use accessor and</div><div class='del'>-	remove FIXME</div><div class='del'>-</div><div class='del'>-2001-09-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (set_date_label): base text on component</div><div class='del'>-	type</div><div class='del'>-</div><div class='del'>-2001-09-20  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: don't use gnome_vfs_uri_new_private</div><div class='del'>-	(fixes Ximian #10544)</div><div class='del'>-</div><div class='del'>-2001-09-20  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: #include a few files we were missing</div><div class='del'>-	from libgnomevfs.</div><div class='del'>-</div><div class='del'>-2001-09-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (load_db): gets a config db</div><div class='del'>-	(cal_backend_file_destroy): release config db</div><div class='del'>-	(cal_backend_file_init): use load_db</div><div class='del'>-	(mail_account_get): gets a mail account by number</div><div class='del'>-	(mail_account_get_default): gets the default mail account</div><div class='del'>-	(mail_account_is_valid): looks to see if any accounts have the</div><div class='del'>-	given address</div><div class='del'>-	(create_user_free_busy): modularize so we can call multiple times</div><div class='del'>-	if necessary, set organizer</div><div class='del'>-	(cal_backend_file_get_free_busy): if the list of users is null,</div><div class='del'>-	use the default account otherwise get the same info for each</div><div class='del'>-	address that is an identity in the mailer</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_addresses_get): s/gint/glong/ for bonobo</div><div class='del'>-	conf returns</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (publish_freebusy_cmd): fix problems</div><div class='del'>-	from a merge so that we publish 6 weeks of free/busy information</div><div class='del'>-	again</div><div class='del'>-</div><div class='del'>-2001-09-20  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (recurrence_page_destroy): make</div><div class='del'>-	sure to release the ref on priv-&gt;comp.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (real_edit_comp): make sure to release</div><div class='del'>-	the ref on priv-&gt;comp.</div><div class='del'>-</div><div class='del'>-2001-09-19  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (audio_notification): Display a</div><div class='del'>-	notification message always, in addition to playing the sound.</div><div class='del'>-	(procedure_notification): Present a confirmation dialog before</div><div class='del'>-	actually running the alarm's program.</div><div class='del'>-	(procedure_notification): Use gnome_execute_shell() instead of</div><div class='del'>-	gnome_execute_async() so that we handle multiple arguments</div><div class='del'>-	properly.  Plus, it is most likely what the user expects.</div><div class='del'>-	(mail_notification): Display a message about unsupported email</div><div class='del'>-	reminders instead of blindly dropping the alarm.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.glade: Added an explanatory message</div><div class='del'>-	about mail alarms not being supported.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.glade: Removed the "Send an email"</div><div class='del'>-	option.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.</div><div class='del'>-</div><div class='del'>-2001-09-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (init_widgets): listen for model</div><div class='del'>-	changes</div><div class='del'>-	(task_editor_edit_comp): add the attendees to the model and notify</div><div class='del'>-	of need send</div><div class='del'>-	(row_count_changed_cb): mark as changed when row added/deleted</div><div class='del'>-	(model_row_changed_cb): mark as changed when row changes</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/event-editor.c (init_widgets): listen for model</div><div class='del'>-	changes</div><div class='del'>-	(event_editor_init): flip page order</div><div class='del'>-	(event_editor_edit_comp): set needs send value</div><div class='del'>-	(schedule_meeting_cmd): flip page order</div><div class='del'>-	(row_count_changed_cb): mark as changed when row added/deleted</div><div class='del'>-	(model_row_changed_cb): mark as changed when row changes</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/schedule-page.c: remove model change notification</div><div class='del'>-	stuff</div><div class='del'>-	(schedule_page_fill_widgets): no need to do the needs_send here</div><div class='del'>-	because the editor handles this since it owns the model</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (init_widgets): listen for model</div><div class='del'>-	changes</div><div class='del'>-	(event_editor_init): flip page order</div><div class='del'>-	(event_editor_edit_comp): set needs send value</div><div class='del'>-	(schedule_meeting_cmd): flip page order</div><div class='del'>-	(row_count_changed_cb): mark as changed when row added/deleted</div><div class='del'>-	(model_row_changed_cb): mark as changed when row changes</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (meeting_page_fill_widgets): no need</div><div class='del'>-	to do the needs_send here because the editor handles this since it</div><div class='del'>-	owns the model</div><div class='del'>-	(invite_entry_changed): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_set_changed): new</div><div class='del'>-	accessor</div><div class='del'>-	(comp_editor_get_changed): ditto</div><div class='del'>-	(comp_editor_set_needs_send): ditto</div><div class='del'>-	(comp_editor_get_needs_send): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_addresses_get): reflect configuration</div><div class='del'>-	path changes in the mailer</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c: remove commented out code, ifdef one</div><div class='del'>-	section for later</div><div class='del'>-</div><div class='del'>-2001-09-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_oaf_register): add a new parameter</div><div class='del'>-	(const char *iid) to specify the OAFIID of the factory being</div><div class='del'>-	registered</div><div class='del'>-</div><div class='del'>-2001-09-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.c (e_meeting_model_refresh_busy_periods):</div><div class='del'>-	remove silly debug #if 0</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (publish_freebusy_cmd): g_list_free</div><div class='del'>-	rather than g_free</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_html): eliminate code path that</div><div class='del'>-	caused double freed memory</div><div class='del'>-</div><div class='del'>-2001-09-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/schedule-page.*: A page that shows the meeting time</div><div class='del'>-	selector and free/busy data for attendees</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: use the meeting model to track/edit</div><div class='del'>-	attendees, remove table value conversion routines and simple table</div><div class='del'>-	routines</div><div class='del'>-	(set_attendees): take a pointer array</div><div class='del'>-	(meeting_page_destroy): destroy the pointer array, save state</div><div class='del'>-	(meeting_page_init): new pointer array</div><div class='del'>-	(meeting_page_fill_widgets): don't null the deleted attendees</div><div class='del'>-	field</div><div class='del'>-	(popup_delegate_cb): array add</div><div class='del'>-	(popup_delete_cb): array add</div><div class='del'>-	(cleanup_attendees): iterate over the array to unref now</div><div class='del'>-	(meeting_page_fill_widgets): don't null out fields, no need to add</div><div class='del'>-	attendees here</div><div class='del'>-	(invite_entry_changed): use e_meeting_attendee routines</div><div class='del'>-	(popup_delegate_cb): ditto</div><div class='del'>-	(popup_delete_cb): ditto</div><div class='del'>-	(meeting_page_new): take new arg and pass it to construct</div><div class='del'>-	(meeting_page_construct): take new arg, use e-meeting-model</div><div class='del'>-	routines to construct table</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_init): new meeting model</div><div class='del'>-	(task_editor_destroy): unref the model</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_init): make new model</div><div class='del'>-	and pass it to meeting and schedule pages</div><div class='del'>-	(event_editor_set_cal_client): virtual function, set meeting model</div><div class='del'>-	client</div><div class='del'>-	(event_editor_edit_comp): add the attendees to the model</div><div class='del'>-	(event_editor_destroy): unref model</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/comp-editor.h: add virtual function</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): make</div><div class='del'>-	set_cal_client a virutal function</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-types.h: generally useful type defines</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel*.[hc]: Move here and use an e-table for</div><div class='del'>-	the attendee list and extract display information from the new</div><div class='del'>-	meeting model and attendees</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-time-sel.etspec: spec for the table</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-attendee.[hc]: meeting attendees for the model,</div><div class='del'>-	with to/from conversions for CalComponentAttendee structure, emits</div><div class='del'>-	changed signal and allows getting and setting of free busy</div><div class='del'>-	periods</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-model.[hc]: move the model out on its own</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_error_html): clean up warnings</div><div class='del'>-	</div><div class='del'>-2001-09-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #6350.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (remove_folder): Use a simplified method</div><div class='del'>-	for removing our folder data; we just need to remove calendar.ics</div><div class='del'>-	or tasks.ics and the corresponding backup files.</div><div class='del'>-</div><div class='del'>-2001-09-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #2830.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_get_confirm_delete): New</div><div class='del'>-	function.</div><div class='del'>-	(calendar_config_set_confirm_delete): New function.</div><div class='del'>-	(config_read): Get the default value for the ConfirmDelete option.</div><div class='del'>-	(calendar_config_write): Set the value of ConfirmDelete.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Handle the</div><div class='del'>-	configuration option for confirmation.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (CalPrefsDialogPrivate): Added</div><div class='del'>-	the fields for the Other page.</div><div class='del'>-	(get_widgets): Handle the new widgets.</div><div class='del'>-	(cal_prefs_dialog_show_config): Likewise.</div><div class='del'>-	(cal_prefs_dialog_update_config): Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-18  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client-multi.[ch]: new class for managing multiple</div><div class='del'>-	calendars, with an API very similar to the CalClient one,</div><div class='del'>-	for ease of transition from one to the other</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (xfer_folder, remove_folder, create_folder):</div><div class='del'>-	reworked to be able to manage folders for any calendar backend, and</div><div class='del'>-	not only the file: one</div><div class='del'>-</div><div class='del'>-2001-09-18  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* idl/evolution-calendar.idl: changed signature for the getFreeBusy</div><div class='del'>-	method, to return a sequence of CalObj's, and added sequence of users</div><div class='del'>-	as a new parameter to that method</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_free_busy): adapted to new</div><div class='del'>-	IDL method signature, by adding a new "GList *users" parameter, for</div><div class='del'>-	callers to be able to specify a list of users</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy):</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): add the</div><div class='del'>-	"GList *users" parameter. In cal_backend_file_get_free_busy, call</div><div class='del'>-	lookup_component to get the CalComponent for each uid, instead</div><div class='del'>-	of calling cal_backend_get_object, which meant converting the</div><div class='del'>-	component to a string and then parsing it again.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (cal_opened_cb):</div><div class='del'>-	* gui/e-itip-control.c (send_freebusy):</div><div class='del'>-	* gui/calendar-commands.c (publish_freebusy_cmd): adapted to</div><div class='del'>-	new getFreeBusy method signature</div><div class='del'>-</div><div class='del'>-2001-09-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: added a timeout to refresh the list every</div><div class='del'>-	10 minutes. Not ideal, as the user may be editing a task when it gets</div><div class='del'>-	refreshed.</div><div class='del'>-	(adjust_query_sexp): use the 'completed-before?' operator to filter</div><div class='del'>-	out tasks according to the config settings.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (task_details_page_fill_widgets): </div><div class='del'>-	added support for the 'Completed' date. This code must have got lost</div><div class='del'>-	somewhere, as it used to work.</div><div class='del'>-	(date_changed_cb): set the priv-&gt;updating flag while updating the other</div><div class='del'>-	widgets.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_objects): made sure</div><div class='del'>-	we freed the components.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (func_completed_before): added 'completed-before?'</div><div class='del'>-	operator.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_configure_e_cell_date_edit): </div><div class='del'>-	don't set the lower &amp; upper hour. Use 0-24 like the EDateEdit does.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config): set</div><div class='del'>-	the 12/24-hour time format options sensitive only if we support both.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): if the locale doesn't define</div><div class='del'>-	'am' and 'pm' strings then we must use 24-hour format.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_folder_bar_label): don't</div><div class='del'>-	translate the '%d' as it doesn't make much sense. Resolves bug #8027.</div><div class='del'>-</div><div class='del'>-2001-09-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Do not call</div><div class='del'>-	calendar_config_init() here.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Call calendar_config_init() here.</div><div class='del'>-</div><div class='del'>-2001-09-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.c (queue_alarm): Duh, only setup the</div><div class='del'>-	timeout if the list was empty.</div><div class='del'>-	(alarm_ready_cb): Notify with the ID of the original alarm.</div><div class='del'>-	(alarm_remove): Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Switch the alarm system from using SIGALRM to normal glib timers.</div><div class='del'>-	Also, use a more robust de-queueing mechanism.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.c (alarm_init): Removed.</div><div class='del'>-	(alarm_done): Remove the glib timeout instead of closing the pipes</div><div class='del'>-	and the signal handler.</div><div class='del'>-	(alarm_add): Allow adding alarms that happen before right now.</div><div class='del'>-	(queue_alarm): Use a glib timer instead of a signal.</div><div class='del'>-	(alarm_remove): Adjust the timeout as appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (main): There is no need to</div><div class='del'>-	initialize the alarm system now.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_init): get itip addresses</div><div class='del'>-	(calendar_model_destroy): destroy same</div><div class='del'>-	(calendar_model_value_at): do more thorough checking on whether to</div><div class='del'>-	use recurring, assigned, assigned to or regular task icons</div><div class='del'>-</div><div class='del'>-2001-09-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* cal-util/cal-component.c (for_each_remove_all_alarms): for each</div><div class='del'>-	call back, removes the alarms</div><div class='del'>-	(cal_component_remove_all_alarms): remove all alarms from the</div><div class='del'>-	component</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_error_html): writes error messages</div><div class='del'>-	rather than normal html</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): remove all alarms if the</div><div class='del'>-	method warrants it</div><div class='del'>-</div><div class='del'>-2001-09-16  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (build_etable): Updated this to match</div><div class='del'>-	the new ETableSimple interface.</div><div class='del'>-</div><div class='del'>-2001-09-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Automake 1.5 fixes pointed out by Richard Boulton</div><div class='del'>-	&lt;richard@tartarus.org&gt;, as per #9258.]</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Set CLEANFILES directly instead of using</div><div class='del'>-	`+='.</div><div class='del'>-	* gui/Makefile.am: Likewise.</div><div class='del'>-	* gui/alarm-notify/Makefile.am: Likewise.</div><div class='del'>-	* pcs/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (ok_clicked_cb): added space after 'identities'</div><div class='del'>-	in the message. Fixes bug #9896.</div><div class='del'>-</div><div class='del'>-2001-09-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/e-calendar.conduit.in: remove translation</div><div class='del'>-	marker for now	</div><div class='del'>-</div><div class='del'>-2001-09-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: use ical partstat, role, cutypes</div><div class='del'>-	directly </div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (find_my_address): set my addresses if the</div><div class='del'>-	addresses match</div><div class='del'>-	(find_attendee): strstr returns non-null on a match</div><div class='del'>-	(write_html): use new icon, select the name displayed (organizer</div><div class='del'>-	or attendee) based on method,</div><div class='del'>-	(ok_clicked_cb): when rsvp'ing strip off all but the attendee</div><div class='del'>-	being replied for as is specified in the spec</div><div class='del'>-	(find_attendee_partstat): new util function to extract the</div><div class='del'>-	partstat of an attendee</div><div class='del'>-	(update_attendee_status): updates the partstat of a specific</div><div class='del'>-	attendee in the reply message</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: use ical partstat, role, cutypes</div><div class='del'>-	directly</div><div class='del'>-	(popup_delegate_cb): if we delegate, notify of needs send and</div><div class='del'>-	changed</div><div class='del'>-	(popup_delete_cb): notify of needs send and changed for each</div><div class='del'>-	deletion</div><div class='del'>-	</div><div class='del'>-2001-09-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (publish_freebusy_cmd): send 6 weeks of</div><div class='del'>-	free busy info starting with the UTC start of day</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (get_label): create a text representation of</div><div class='del'>-	the given icaltime</div><div class='del'>-	(itip_send_comp): if the summary is empty, set the subject based</div><div class='del'>-	on the type of component, put the right extension on free/busy</div><div class='del'>-	components and base descriptions on type of component, include</div><div class='del'>-	start/end for free/busy info</div><div class='del'>-	</div><div class='del'>-2001-09-11  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (display_notification): Added an</div><div class='del'>-	use_description argument so that other alarms can fall back to</div><div class='del'>-	this type.</div><div class='del'>-	(audio_notification): Implemented.</div><div class='del'>-	(remove_comp): Call remove_queued_alarm() here; there is no longer</div><div class='del'>-	a destroy notification function for alarms so must we do this</div><div class='del'>-	manually.</div><div class='del'>-	(alarm_trigger_cb): Do not pass the alarm to the notification</div><div class='del'>-	functions so that we can free it ourselves before all the alarms</div><div class='del'>-	in the component get freed.</div><div class='del'>-	(display_notification): Get the alarm here instead of getting it</div><div class='del'>-	as an argument.</div><div class='del'>-	(procedure_notification): Implemented.</div><div class='del'>-</div><div class='del'>-2001-09-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (invite_entry_changed): free the</div><div class='del'>-	destination vector when we finish with it, if we actually add</div><div class='del'>-	anyone, notify listeners of the needs send and changed info. Fixes</div><div class='del'>-	bug #8632.</div><div class='del'>-</div><div class='del'>-2001-09-10  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c</div><div class='del'>-	(format_date): Convert string generated by strftime to UTF-8.</div><div class='del'>-	(print_week_view_background): Ditto.</div><div class='del'>-	(print_month_summary): Ditto.</div><div class='del'>-	(print_month_small): Use U_() instead of _().</div><div class='del'>-	(print_day_background): Ditto.</div><div class='del'>-	(print_todo_details): Ditto.</div><div class='del'>-	(print_date_label): Convert generated string to UTF-8.</div><div class='del'>-</div><div class='del'>-2001-09-10  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_get_attach):</div><div class='del'>-	Handle the new icalattach type instead of struct icalattachtype.</div><div class='del'>-	(cal_component_alarm_set_attach): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.c (alarm_to_aalarm_widgets): Likewise.</div><div class='del'>-	(alarm_to_palarm_widgets): Likewise.</div><div class='del'>-	(aalarm_widgets_to_alarm): Likewise.</div><div class='del'>-	(palarm_widgets_to_alarm): Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix #958, ShellComponents should not be created by factories, for</div><div class='del'>-	the calendar.]</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Remove the</div><div class='del'>-	ShellComponentFactory.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_object): Renamed from</div><div class='del'>-	`component_fn'.  Don't get any args.</div><div class='del'>-	(component_factory_init): Create the component using</div><div class='del'>-	`create_object()' and register it into OAF.</div><div class='del'>-	(COMPONENT_FACTORY_ID): Removed.</div><div class='del'>-	(COMPONENT_ID): New.</div><div class='del'>-</div><div class='del'>-2001-09-04  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (sc_user_create_new_item_cb):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (component_editor_factory_init): New function to</div><div class='del'>-	create the factory for the comp_editor_factory.</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.c: Finished implementation.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (edit_component): Implemented the</div><div class='del'>-	Edit command.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	comp-editor-factory.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-09-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): </div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): don't call</div><div class='del'>-	calendar_config_check_timezone_set() now, since the startup wizard</div><div class='del'>-	handles that.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_class_init): changed selection_changed signal</div><div class='del'>-	to GTK_RUN_LAST. It has no reason to be GTK_RUN_FIRST.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: </div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: added "selection_changed" signal,</div><div class='del'>-	XX_delete_event() and XX_get_num_events_selected().</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): fix the shadow</div><div class='del'>-	around the dates at the top - it was 1 pixel off.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: added sensitize_commands(), similar to in</div><div class='del'>-	tasks-control.c, so we only make Cut/Copy/Delete sensitive when an</div><div class='del'>-	event is selected. Also added delete_event_cmd().</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_set_summary): </div><div class='del'>-	* gui/dialogs/event-page.c (event_page_set_summary): do nothing,</div><div class='del'>-	since the summary only gets changed on the main event/task page now.</div><div class='del'>-	Fixes bug #6939.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received): </div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): check that we are</div><div class='del'>-	dragging an event from the same EDayView. We currently don't support</div><div class='del'>-	DnD from other widgets.</div><div class='del'>-	(e_day_view_update_top_canvas_drag): only get the summary if we</div><div class='del'>-	actually have an event. Fixes bug #5162.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_editing_stopped): if the text hasn't</div><div class='del'>-	changed we need to call e_day_view_update_event_label() to show the</div><div class='del'>-	times again if necessary. Fixes bug #1813.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_destroy): destroy the</div><div class='del'>-	CompEditorPage objects here rather than in close_dialog(), after the</div><div class='del'>-	widgets have been destroyed. We do this because the widgets have lots</div><div class='del'>-	of signal handlers connected with the CompEditorPage objects as the</div><div class='del'>-	signal data, so we want to ensure that the data pointer is always</div><div class='del'>-	valid. (Alternatively we could disconnect all the handlers when the</div><div class='del'>-	CompEditorPage objects are destroyed, or use connect_while_alive()).</div><div class='del'>-	Fixes bug #7543.</div><div class='del'>-</div><div class='del'>-	Note: there is still a small bug in that if you type in a time and</div><div class='del'>-	then hit 'Save and Close', the time won't be saved. I'm not sure</div><div class='del'>-	where this should be fixed - should the actions which close the</div><div class='del'>-	dialog grab the focus to the toplevel, so any widgets currently</div><div class='del'>-	being edited finish the edit and emit 'changed'?</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/recurrence-page.c (append_exception): use</div><div class='del'>-	gtk_clist_set_row_data_full() so freeing is handled automatically by</div><div class='del'>-	the GtkClist. This helps avoid problems at destroy-time.</div><div class='del'>-	(exception_delete_cb): just call gtk_clist_remove() now. No need to</div><div class='del'>-	free the row data as GtkCList now handles it.</div><div class='del'>-	(recurrence_page_destroy): no need to free the data in the clist.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c: ditto.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: ditto.</div><div class='del'>-	(etable_destroy_cb): save the ETable state in this new handler cb</div><div class='del'>-	rather than in the destroy method, since the widget will already be</div><div class='del'>-	destroyed by then.</div><div class='del'>-</div><div class='del'>-2001-08-31  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: changed 3 occurrences of 'Replyed' to 'replied'</div><div class='del'>-</div><div class='del'>-2001-08-31  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_html):</div><div class='del'>-	Marked strings for translation (with U_).</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp):</div><div class='del'>-	Ditto.</div><div class='del'>-</div><div class='del'>-2001-08-31  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_contacts_to_widget): </div><div class='del'>-	(comp_editor_contacts_to_component): fix debugging messages so they</div><div class='del'>-	use "" rather than NULL. Fixes bug #8559.</div><div class='del'>-</div><div class='del'>-2001-08-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_remove_object): See if</div><div class='del'>-	the set of categories changed by using the removed_categories hash</div><div class='del'>-	table.</div><div class='del'>-	(cal_backend_file_init): Create a table of removed categories.</div><div class='del'>-	This allows us to notify if and only if the set of category</div><div class='del'>-	changes when an object is updated/removed, instead of</div><div class='del'>-	unconditionally notifying if an object is updated.</div><div class='del'>-	(cal_backend_file_update_objects): Only notify if the set of</div><div class='del'>-	categories really changed.</div><div class='del'>-	(update_categories_from_comp): Shuffle the categories between the</div><div class='del'>-	priv-&gt;categories and priv-&gt;removed_categories lists.</div><div class='del'>-</div><div class='del'>-2001-08-28  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #7879, a query may receive an update notification from</div><div class='del'>-	the backend before the query itself gets populated.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (ensure_sexp): New function; ensures that the esexp</div><div class='del'>-	is created and notifies of parse errors.  It is the bulk of</div><div class='del'>-	start_query_cb() but put in a separate function so that we can</div><div class='del'>-	share it elsewhere.</div><div class='del'>-	(start_query_cb): Use ensure_sexp().</div><div class='del'>-	(process_component_cb): Oops, notify of a successfully finished</div><div class='del'>-	query.</div><div class='del'>-	(match_component): Call ensure_sexp().  This function can be</div><div class='del'>-	called by the backend notification callbacks before the query is</div><div class='del'>-	populated, so we need to make sure the esexp exists here.</div><div class='del'>-</div><div class='del'>-2001-08-22  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (cal_search_bar_construct): Set the</div><div class='del'>-	"category is" criterion as the default for the calendar and tasks.</div><div class='del'>-</div><div class='del'>-2001-08-22  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (recurrence_page_fill_widgets):</div><div class='del'>-	Unset the priv-&gt;updating flag before returning in the case the</div><div class='del'>-	component has no recurrence information.  Fixes bug #6850.</div><div class='del'>-</div><div class='del'>-2001-08-22  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (QueuedAlarm): Added a snooze</div><div class='del'>-	flag to differentiate snoozed alarms from real occurrences.</div><div class='del'>-	(add_component_alarms): Do not specify a destroy function for the</div><div class='del'>-	alarm trigger.  We handle this in the callbacks now.</div><div class='del'>-	(alarm_trigger_cb): Just remove the alarms for the unimplemented</div><div class='del'>-	notification types.</div><div class='del'>-	(create_snooze): Implemented snooze.</div><div class='del'>-	(notify_dialog_cb): Snooze as appropriate.</div><div class='del'>-</div><div class='del'>-2001-08-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (foreach_tzid_callback): call back to add</div><div class='del'>-	timezones to the top level</div><div class='del'>-	(itip_send_comp): call icalcomponent_foreach_tzid</div><div class='del'>-</div><div class='del'>-2001-08-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: #include &lt;libgnomevfs/gnome-vfs-types.h&gt; so</div><div class='del'>-	this will compile against gnome-vfs 1.0.1.</div><div class='del'>-</div><div class='del'>-2001-08-22  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): open the tasks folder</div><div class='del'>-	associated with the calendar being opened, and not always the local</div><div class='del'>-	tasks.ics file</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (open_fn): use gnome_vfs_uri_new_private when</div><div class='del'>-	parsing the URI to allow non-registered URIs</div><div class='del'>-</div><div class='del'>-2001-08-21  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.c (alarm_to_palarm_widgets): Handle</div><div class='del'>-	the case where there is no attachment.  Fixes bug #7257.</div><div class='del'>-</div><div class='del'>-2001-08-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (write_html): strip the mailto bit for the</div><div class='del'>-	email address if we display it</div><div class='del'>-</div><div class='del'>-2001-08-21  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (func_is_completed): added new e-sexp operator. We</div><div class='del'>-	don't currently use it though.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Changed '_Overdue' to 'O_verdue'</div><div class='del'>-	since we have an '_Other' notebook tab. Added '_Hide' accel.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c: hooked up config options to dialog.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: added config options for hiding completed</div><div class='del'>-	tasks.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): </div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): </div><div class='del'>-	* gui/e-day-view.c (e_day_view_reshape_long_event): added 2 pixels</div><div class='del'>-	extra space between icons and text for long events, and 1 pixel space</div><div class='del'>-	between icons in all events.</div><div class='del'>-	(e_day_view_realize): changed the background color to match the</div><div class='del'>-	EGrayBar in the shell.</div><div class='del'>-</div><div class='del'>-2001-08-21  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-util.[ch]: new files to contain utility functions</div><div class='del'>-	for calendar backends</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_add_cal): implement it here, and not in</div><div class='del'>-	the calendar backends. Add a "cal_added" signal, so that backends are</div><div class='del'>-	notified when a new Cal is added, if they need to</div><div class='del'>-	(cal_backend_get_type_by_uid): implement it here</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (fill_alarm_instances_seq): moved to</div><div class='del'>-	cal-backend-util.c</div><div class='del'>-	(cal_backend_file_add_cal): removed</div><div class='del'>-	(cal_backend_file_init): connect to the "cal_added" signal in the</div><div class='del'>-	CalBackend class so that we can update categories when a new Cal is</div><div class='del'>-	added</div><div class='del'>-	(cal_backend_file_get_type_by_uid): removed</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (fill_alarm_instances_seq): moved to</div><div class='del'>-	cal-backend-util.c</div><div class='del'>-	(cal_backend_db_add_cal): removed</div><div class='del'>-	(cal_backend_db_get_type_by_uid): removed</div><div class='del'>-</div><div class='del'>-	* AUTHORS: added JP and Damon to list of authors</div><div class='del'>-</div><div class='del'>-2001-08-20  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.[ch] (cal_util_generate_alarms_for_list):</div><div class='del'>-	(cal_util_generate_alarms_for_comp): </div><div class='del'>-	new functions moved from the CalBackendFile, to allow its use outside</div><div class='del'>-	of it. The signature has changed a little bit, since these functions</div><div class='del'>-	need a way to get the timezones from the callers, so a callback</div><div class='del'>-	function to resolve the timezones has been added to the list of</div><div class='del'>-	parameters</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (generate_alarms_for_list):</div><div class='del'>-	(generate_alarms_for_comp): moved to cal-util, with all their related</div><div class='del'>-	functions/structures</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c: removed functions that were moved to cal-util</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): use Delete icon in menu, and</div><div class='del'>-	change to bigger Save icon in toolbar.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: </div><div class='del'>-	* gui/calendar-commands.c (pixmaps): used new_task-16.png and</div><div class='del'>-	goto-16.png.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): added delete icons for menu</div><div class='del'>-	and toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: added Cut/Copy/Paste icons for toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: uses new delete icons in menu &amp; toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-19  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Update the folder list to include a</div><div class='del'>-	display name and a description.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): use new delete icon for toolbar.</div><div class='del'>-</div><div class='del'>-2001-08-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: fixed typo, 'send' -&gt; 'sent'. Bug #7621.</div><div class='del'>-</div><div class='del'>-2001-08-18  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: added option to hide completed</div><div class='del'>-	tasks after a given number of minutes/hours/days. Unfinished.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_component): initialize</div><div class='del'>-	zone to NULL to avoid a warning.</div><div class='del'>-	(contacts_clicked_cb): work around a bug in SelectNames by notifying</div><div class='del'>-	that the page has changed when you click the 'Contacts' button.</div><div class='del'>-	Otherwise it is easy to lose changes.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (contacts_clicked_cb): ditto.</div><div class='del'>-</div><div class='del'>-2001-08-18  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): used new Save/Save As icons.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c:</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): added new Cut/Copy/Paste icons,</div><div class='del'>-	and changed the 'New Task' icon to use the bigger one I made.</div><div class='del'>-</div><div class='del'>-2001-08-05  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (summary_changed_cb):</div><div class='del'>-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need</div><div class='del'>-	UTF-8 string).</div><div class='del'>-</div><div class='del'>-2001-08-18  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (locale_uses_24h_time_format): New.</div><div class='del'>-	(config_read): Use locale's setting as default for</div><div class='del'>-	/Calendar/Display/Use24HourFormat so that Europeans don't have to</div><div class='del'>-	switch to 24-hour format manually.</div><div class='del'>-</div><div class='del'>-2001-08-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (destroy): destroy the addresses</div><div class='del'>-	(clean_up): don't free the addresses, we need them</div><div class='del'>-</div><div class='del'>-2001-08-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_task): new function to open the</div><div class='del'>-	task editor to add a new task.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: added new_task_cb() to create a new task</div><div class='del'>-	in the calendar folder, and added menu commands for it, and a toolbar</div><div class='del'>-	button (I think that is what Ettore wanted. Maybe he just meant menu</div><div class='del'>-	commands. Anyway, it is easy to take out.) Note that we don't have a</div><div class='del'>-	decent icon for 'New Task' for the toolbar.</div><div class='del'>-	Also added the new Goto button (but we don't have a similar one for</div><div class='del'>-	the menu command).</div><div class='del'>-</div><div class='del'>-2001-08-16  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Add the libetimezonedialog.a lib link</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: Change the #include for the timezone dialog</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.c: Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: Remove the e-timezone-dialog stuff.</div><div class='del'>-</div><div class='del'>-2001-08-16  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c: hide the timezone fields for all-day</div><div class='del'>-	events. We will use DATE values for these eventually, and these</div><div class='del'>-	don't have timezones associated with them. Currently we just use the</div><div class='del'>-	default timezone for all-day events, as a workaround until we have</div><div class='del'>-	DATE values working.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit): added</div><div class='del'>-	make_time_insensitive flag. Though we may not use it.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.glade: made the 'All day event' toggle</div><div class='del'>-	right-aligned, so it doesn't move when the other widgets are shown</div><div class='del'>-	and hidden.</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.c (e_timezone_entry_set_default_timezone): new</div><div class='del'>-	function to set the default timezone of the widget. If the current</div><div class='del'>-	timezone setting matches the default then the entry field is hidden.</div><div class='del'>-	Most people won't use timezones so this makes the GUI simpler.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (init_widgets): </div><div class='del'>-	* gui/dialogs/task-page.c (init_widgets): set the default timezone</div><div class='del'>-	using the above function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_widgets): if the start date</div><div class='del'>-	or due date is not set, we use the default timezone, so the user</div><div class='del'>-	doesn't have to set this each time they set the date.</div><div class='del'>-</div><div class='del'>-2001-08-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (alarm_page_fill_widgets): If the</div><div class='del'>-	component has no alarms remember to set the priv-&gt;updating flag to</div><div class='del'>-	FALSE before returning.</div><div class='del'>-</div><div class='del'>-2001-08-16  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.c</div><div class='del'>-	(e_delegate_dialog_get_delegate_name): get the destinations</div><div class='del'>-	property, not the text property</div><div class='del'>-</div><div class='del'>-2001-08-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (clear_widgets): Set the default-to-add</div><div class='del'>-	notification to be display a message 15 minutes before the start</div><div class='del'>-	of the appointment.  Fixes bug #7175.</div><div class='del'>-</div><div class='del'>-2001-08-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_strip_categories):</div><div class='del'>-	New function to strip surrounding whitespace from a string of</div><div class='del'>-	categories entered by the user.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_component): Use</div><div class='del'>-	comp_editor_strip_categories().</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_configure_e_date_edit):</div><div class='del'>-	Do not set the time popup range.  We also want to be able to</div><div class='del'>-	create appointments that are not within nine-to-five!  Think of</div><div class='del'>-	going to the movies!  Fixes bug #7436.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: "am/pm" is now "AM/PM".</div><div class='del'>-	Fixes bug #7367.</div><div class='del'>-</div><div class='del'>-2001-08-16  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c: Changed to reflect my renaming of some of</div><div class='del'>-	the more hideously-named functions in the ESearchBar API.</div><div class='del'>-</div><div class='del'>-2001-08-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_comp): only fill the component</div><div class='del'>-	and save it if something has changed</div><div class='del'>-	(save_comp_with_send): only try to send if something has changed</div><div class='del'>-	and the editor needs a send</div><div class='del'>-</div><div class='del'>-2001-08-15  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: OK, re-added the default</div><div class='del'>-	alarm options.  Way too many people are asking for them.</div><div class='del'>-</div><div class='del'>-2001-08-15  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Add the user creatable</div><div class='del'>-	items.  The callback is not actually implemented yet; this is just</div><div class='del'>-	to finalize the GUI.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Added an option to ask for</div><div class='del'>-	confirmation when deleting items.  Added underlined shortcuts</div><div class='del'>-	(they may not all work currently).</div><div class='del'>-</div><div class='del'>-2001-08-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c: </div><div class='del'>-	* gui/dialogs/event-page.c: added support for the Contacts field.</div><div class='del'>-	Note that I'm not sure what we should put in the iCalendar CONTACT</div><div class='del'>-	properties. Currently we put "name &lt;email&gt;", but it isn't recognized</div><div class='del'>-	as a contact when we reopen the dialog, so we may need more info here.</div><div class='del'>-	Also we currently use a simple parser to parse the above format, and</div><div class='del'>-	we should maybe use some camel function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.glade: </div><div class='del'>-	* gui/dialogs/event-page.glade: replaced the GtkEntry fields for the</div><div class='del'>-	Contacts with a GtkEventBox which we put the BonoboControl in at</div><div class='del'>-	runtime.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (invite_entry_changed): added FIXMEs</div><div class='del'>-	since it doesn't seem to be freeing the EDestination stuff. JP?</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c: added bunch of utility functions to</div><div class='del'>-	handle the Contacts field in the main Event and Task pages.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: added visible_start and visible_end fields, so we</div><div class='del'>-	only emit the 'dates-shown-changed' signal when really necessary.</div><div class='del'>-	Currently changing the folder title bar label results in a complete</div><div class='del'>-	redraw of the Evolution window (silly GtkLabel queueing a resize),</div><div class='del'>-	so we want to avoid that as much as possible.</div><div class='del'>-	(gnome_calendar_new_appointment_for): only move the event's end time</div><div class='del'>-	to the end of the day if it is not already 00:00:00.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c: </div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: added support for double-clicking on an event to</div><div class='del'>-	open it, and for double-clicking on the background to create a new</div><div class='del'>-	event. There is still a minor problem to sort out, but it basically</div><div class='del'>-	works.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: added support for CONTACT properties,</div><div class='del'>-	mainly by copying the code for COMMENT properties which are exactly</div><div class='del'>-	the same type.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_realize): use the same color for the</div><div class='del'>-	top canvas background as the shortcut bar, to make it look a little</div><div class='del'>-	nicer (I think). Although we still have the theme problem with</div><div class='del'>-	hard-coded colors.</div><div class='del'>-</div><div class='del'>-2001-08-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.etspec: Made the click-to-add message</div><div class='del'>-	shorter.  Fixes bug #7177.</div><div class='del'>-</div><div class='del'>-2001-08-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): Added Tigert's new icons for</div><div class='del'>-	Prev and Next.</div><div class='del'>-</div><div class='del'>-2001-08-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (make_suboptions): Make the "Any Category"</div><div class='del'>-	item consistent with the one in the addressbook.  Also, free the</div><div class='del'>-	items correctly.</div><div class='del'>-</div><div class='del'>-2001-08-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (get_current_category): Handle an array of</div><div class='del'>-	categories in the CalSearchBar instead of our own menu items.</div><div class='del'>-	(notify_query_contains): Fetch the text from the search bar here</div><div class='del'>-	instead of in regen_query().</div><div class='del'>-	(regen_query): Handle category searches.</div><div class='del'>-	(notify_category_is): New function.</div><div class='del'>-	(cal_search_bar_construct): Do not create an option menu.</div><div class='del'>-	(make_suboptions): New function to create the suboption items from</div><div class='del'>-	the list of categories.</div><div class='del'>-	(notify_query_contains): Do not include a category sexp here.</div><div class='del'>-</div><div class='del'>-2001-08-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (update_item): add dialog for feedback</div><div class='del'>-	(remove_item): ditto</div><div class='del'>-	(send_item): ditto</div><div class='del'>-	(send_freebusy): ditto</div><div class='del'>-</div><div class='del'>-2001-08-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: rewrite the gui to use gtkhtml</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: define the icon dir</div><div class='del'>-</div><div class='del'>-2001-08-12  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.h: Remove #include &lt;config.h&gt; from here.</div><div class='del'>-	* gui/itip-utilss.h: Same here.</div><div class='del'>-	</div><div class='del'>-2001-08-11  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: Update the paths of the Tools menu</div><div class='del'>-	according to the changes in the XML [i.e. things are moved to the</div><div class='del'>-	ComponentToolsPlaceholder].</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-11  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (init_widgets): </div><div class='del'>-	* gui/dialogs/task-page.c (init_widgets): turn on word-wrap for the</div><div class='del'>-	description fields. Fixes bug #6821.</div><div class='del'>-</div><div class='del'>-2001-08-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c: Where we have ESearchBarItems, set their</div><div class='del'>-	subitems to NULL.</div><div class='del'>-</div><div class='del'>-2001-08-09  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_object_component): added new</div><div class='del'>-	backend method to get the component given a UID.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_object_component): </div><div class='del'>-	added implementation of above virtual method.</div><div class='del'>-	</div><div class='del'>-	* pcs/query.c (match_component): use the new backend function to get</div><div class='del'>-	the CalComponent rather than the string. This avoids converting all</div><div class='del'>-	the calendar components to strings and parsing them back into</div><div class='del'>-	components for every query! (That wasn't a good idea, was it ;)</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: use a timeout handler to layout the events,</div><div class='del'>-	to avoid doing a layout for each event we get from a query.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_day_add_event): </div><div class='del'>-	* gui/e-day-view.c (e_day_view_add_event): set start_row_or_col and</div><div class='del'>-	num_columns to 0. They are guint8's.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_free_events): hide all the jump</div><div class='del'>-	buttons. Fixes bug #5946.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_folder_bar_label): added the</div><div class='del'>-	day numbers for the month view.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.glade: changed "_Delete" to "_Remove",</div><div class='del'>-	since it clashed with "_Add". Also added underlined accelerators for</div><div class='del'>-	the recurrence radio buttons. Note that none of these accelerators</div><div class='del'>-	actually work at present, due to the way we are using .glade files</div><div class='del'>-	for each notebook page. I need to add a bug about this.</div><div class='del'>-	Also, the "_Action" menu doesn't popup when I press Alt+A, even though</div><div class='del'>-	the "_File" menu does popup when I press Alt+F. Strange.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone_object):</div><div class='del'>-	removed debug msgs.</div><div class='del'>-</div><div class='del'>-2001-08-09  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	unref the GdkPixmap and GdkBitmap returned by the function</div><div class='del'>-	e_categories_config_get_icon_for ()</div><div class='del'>-</div><div class='del'>-2001-08-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.*: Remove progress frame</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.*: Put in progress frame, remove</div><div class='del'>-	basics frame</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/task-editor.c (set_menu_sens): util function to set</div><div class='del'>-	menu sensitivity based on state</div><div class='del'>-	(task_editor_init): add meeting page</div><div class='del'>-	(task_editor_edit_comp): show page if necessary</div><div class='del'>-	(task_editor_destroy): unref meeting page</div><div class='del'>-	(assign_task_cmd): bring up meeting page</div><div class='del'>-	(refresh_task_cmd): save before sending</div><div class='del'>-	(forward_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_cmd): implement new save command</div><div class='del'>-</div><div class='del'>-2001-08-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (destroy): Chain to the destroy handler in</div><div class='del'>-	the parent class!</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.c (comp_editor_page_destroy):</div><div class='del'>-	Likewise.  Sigh.</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (cal_search_bar_destroy): Whoops, added a</div><div class='del'>-	destroy handler.</div><div class='del'>-</div><div class='del'>-2001-08-08  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade: removed underlined accelerator key from</div><div class='del'>-	"_Go To Today" button. GnomeDialog doesn't actually support underlined</div><div class='del'>-	accelerator keys for buttons. We could hack it, like Glade does, if</div><div class='del'>-	we really need to. Fixes bug #6418.</div><div class='del'>-</div><div class='del'>-2001-08-08  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (update_query): Stop editing any event.  Fixes</div><div class='del'>-	bug #5949.</div><div class='del'>-</div><div class='del'>-2001-08-08  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (alarm_page_fill_component): Duuuh, set</div><div class='del'>-	the alarm_copy on the component, not the original alarm.  Fixes</div><div class='del'>-	bug #5214.</div><div class='del'>-</div><div class='del'>-2001-08-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (set_attendees): set the attendees of</div><div class='del'>-	a component</div><div class='del'>-	(meeting_page_fill_component): use above</div><div class='del'>-	(meeting_page_get_cancel_comp): return a comp with the attendees</div><div class='del'>-	to be cancelled</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.h: get a component that will be sent as</div><div class='del'>-	a cancellation</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_class_init): override</div><div class='del'>-	send_comp class method</div><div class='del'>-	(event_editor_send_comp): send cancellation notices to deleted</div><div class='del'>-	attendees</div><div class='del'>-	(refresh_meeting_cmd): save before send</div><div class='del'>-	(forward_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_class_init): set default</div><div class='del'>-	send_comp method</div><div class='del'>-	(real_send_comp): do the real work</div><div class='del'>-	(comp_editor_send_comp): call class method</div><div class='del'>-	(save_comp): don't do any sending</div><div class='del'>-	(save_comp_with_send): save and send here</div><div class='del'>-	(prompt_to_save_changes): use above</div><div class='del'>-	(save_close_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: add virtual function</div><div class='del'>-</div><div class='del'>-2001-08-08  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c</div><div class='del'>-	(e_week_view_event_item_draw_icons): don't use a NULL mask in the</div><div class='del'>-	call to gdk_gc_set_clip_mask</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c</div><div class='del'>-	(e_day_view_main_item_draw_day_event): ditto</div><div class='del'>-</div><div class='del'>-2001-08-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: fix pre-processor</div><div class='del'>-	macros</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: fix pre-processor macros</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-2001-08-07  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (cal_listener_stop_notification): New</div><div class='del'>-	function to stop further notification from happening.</div><div class='del'>-	(impl_notifyCalOpened): Do not notify if requested.</div><div class='del'>-	(impl_notifyObjUpdated): Likewise.</div><div class='del'>-	(impl_notifyObjRemoved): Likewise.</div><div class='del'>-	(impl_notifyCategoriesChanged): Likewise.</div><div class='del'>-	(CalListenerPrivate): Do not keep a reference to the server-side</div><div class='del'>-	Cal.  This would create a circular reference since the server</div><div class='del'>-	keeps a reference to the listener.</div><div class='del'>-	(cal_listener_destroy): Likewise.</div><div class='del'>-	(impl_notifyCalOpened): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_destroy): bonobo_object_release_unref() the listener.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_destroy): Ask the listener</div><div class='del'>-	to stop notifications.  Also, do not unref it as the server does</div><div class='del'>-	that itself when we unref the Cal.</div><div class='del'>-</div><div class='del'>-2001-08-07  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_free_value): Only unref the</div><div class='del'>-	FIELD_COMPONENT if it is non-NULL.  We return a NULL for that</div><div class='del'>-	field from ::initialize_value(), after all.  Fixes bug #6098.</div><div class='del'>-</div><div class='del'>-2001-08-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): Make calendar.ics the</div><div class='del'>-	suggested name when attaching the ical object</div><div class='del'>-</div><div class='del'>-2001-08-06  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.h: </div><div class='del'>-	* gui/e-day-view.h: added 'different_timezone' fields to EDayViewEvent</div><div class='del'>-	and EWeekViewEvent, to note that the event is in a different timezone.</div><div class='del'>-	We now compute this once when we add the event to the array, rather</div><div class='del'>-	than each time we draw the event. If it is set, we will draw the</div><div class='del'>-	timezone icon next to the event.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c: take transparency into account when</div><div class='del'>-	drawing the blue vertical bars to represent busy time.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c: take transparency into account when tagging</div><div class='del'>-	the mini calendar.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): removed the "None"</div><div class='del'>-	options for transparency and classification, since these properties</div><div class='del'>-	have defaults anyway, so we may as well use those to keep it simple.</div><div class='del'>-	Also use "Free" and "Busy" for transparency, rather than "Transparent"</div><div class='del'>-	and "Opaque".</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: updated classification &amp; transparency code</div><div class='del'>-	as above.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.etspec: changed "Transparency" to "Show Time As"</div><div class='del'>-	since people have a chance of understanding that.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: </div><div class='del'>-	* gui/gnome-cal.c: added functions to get the visible time range.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: finished stuff to set the folder bar</div><div class='del'>-	label to the dates currently displayed.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (control_factory_new_control): connected</div><div class='del'>-	signal to update the folder title bar label when the dates shown</div><div class='del'>-	are changed. I had to connect it here since we need the BonoboControl</div><div class='del'>-	in the callback, and I don't know how to get the control from the</div><div class='del'>-	widget.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): clear the folder bar</div><div class='del'>-	label. We could display something here at some point.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.glade: changed "_Add" to "A_dd", since</div><div class='del'>-	we have an "_Actions" menu. (These also use Alt+key, right?)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.glade: </div><div class='del'>-	* gui/dialogs/event-page.c: added 'Show Time As' field, which is</div><div class='del'>-	really the TRANSP property but with a better name!</div><div class='del'>-	Also changed one of the "_Confidential" to "Con_fidential" since we</div><div class='del'>-	already have "_Contacts" using the same 'C' key.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): skip</div><div class='del'>-	events that are TRANSPARENT. Also added comment as this code looks</div><div class='del'>-	inefficient.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: removed stuff for comparing timezones.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_compare_event_timezones): moved the</div><div class='del'>-	above function here, and updated it to compare the UTC offsets of the</div><div class='del'>-	times as well as the TZIDs.</div><div class='del'>-</div><div class='del'>-2001-08-06  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: In process of fixing bug</div><div class='del'>-	#6005.  The "Calendar" page is now "Display", and it has no</div><div class='del'>-	frames.  The "Task list" page has colons between the labels and</div><div class='del'>-	the color pickers, and it has no frame.</div><div class='del'>-</div><div class='del'>-2001-08-06  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (destroy_wombat_client): added check for</div><div class='del'>-	NULL pointers. Maybe fixes #5203 (I can't reproduce it, so I'm not</div><div class='del'>-	sure)</div><div class='del'>-</div><div class='del'>-2001-08-03  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/query-listener.c (query_listener_stop_notification):</div><div class='del'>-	New function; stops further notification from happening.  This is</div><div class='del'>-	needed since the listener is destroyed asynchronously from the</div><div class='del'>-	Wombat and the corresponding CalQuery may already have died.</div><div class='del'>-	(impl_notifyObjUpdated): Do not notify if requested.</div><div class='del'>-	(impl_notifyObjRemoved): Likewise.</div><div class='del'>-	(impl_notifyQueryDone): Likewise.</div><div class='del'>-	(impl_notifyEvalError): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-query.c (cal_query_destroy): Use</div><div class='del'>-	query_listener_stop_notification().</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (cal_listener_destroy): Nullify the</div><div class='del'>-	pointers to the callback functions.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (update_query): Commit our state of no longer</div><div class='del'>-	having a query before unrefing it.  We may reenter from the ORBit</div><div class='del'>-	main loop and we *really* want this information to be committed.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (update_query): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (update_query): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (tag_calendar_by_comp): Added a "clear_first"</div><div class='del'>-	argument that indicates whether the ECalendar should be cleared of</div><div class='del'>-	any marks first.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Removed</div><div class='del'>-	ifdefed-out view buttons code from the Gnomecal days.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (client_categories_changed_cb): Merge the</div><div class='del'>-	categories of the calendar and tasks clients so that we can</div><div class='del'>-	display the categories in both sets.</div><div class='del'>-	(gnome_calendar_construct): Connect to "categories_changed" on</div><div class='del'>-	both clients.</div><div class='del'>-	(gnome_calendar_on_date_navigator_selection_changed): Removed call</div><div class='del'>-	to gnome_calendar_update_view_buttons().</div><div class='del'>-	(gnome_calendar_update_view_buttons): Removed.  We cannot have</div><div class='del'>-	this until Bonobo supports radio toolbar items.</div><div class='del'>-	(gnome_calendar_set_view_buttons): Removed.</div><div class='del'>-	(gnome_calendar_dayjump): Do not use priv-&gt;day_button.</div><div class='del'>-	(GnomeCalendarPrivate): Removed the {day,work_week,week,month}_button </div><div class='del'>-	fields.</div><div class='del'>-	(gnome_calendar_set_query): Start a retagging process of the date</div><div class='del'>-	navigator so that it reflects the current query.</div><div class='del'>-	(update_query): New function to restart a query for the date navigator.</div><div class='del'>-	(initial_load): Use update_query() instead of tagging the date</div><div class='del'>-	navigator directly.</div><div class='del'>-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.</div><div class='del'>-	(client_cal_opened_cb): Use update_query() instead of initial_load().</div><div class='del'>-	(initial_load): Removed.</div><div class='del'>-	(client_obj_updated_cb): Removed.</div><div class='del'>-	(client_obj_removed_cb): Removed.</div><div class='del'>-	(gnome_calendar_new_appointment_for): Set the default category of</div><div class='del'>-	the new component.</div><div class='del'>-	(search_bar_category_changed_cb): Set the default category for the</div><div class='del'>-	calendar views.</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (cal_search_bar_set_categories): Sort the</div><div class='del'>-	categories before creating the menu.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (adjust_query_sexp): Return NULL instead of</div><div class='del'>-	"#f" if the time range is not set yet.</div><div class='del'>-	(update_query): Do not start a query if the time range is not set.</div><div class='del'>-	(e_day_view_set_default_category): New function.</div><div class='del'>-	(e_day_view_key_press): Set the default category on the new</div><div class='del'>-	component.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (adjust_query_sexp): Analogous to the above.</div><div class='del'>-	(update_query): Analogous to the above.</div><div class='del'>-	(e_week_view_set_default_category): Analogous to the above.</div><div class='del'>-	(e_week_view_key_press): Analogous to the above.</div><div class='del'>-</div><div class='del'>-2001-08-03  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #1407.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Removed the alarm</div><div class='del'>-	preferences page, since we decided it was unnecessary.</div><div class='del'>-</div><div class='del'>-2001-08-03  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	I18n fixes.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (summary_changed_cb):</div><div class='del'>-	Use e_dialog_editable_get instead of gtk_editable_get_chars (we need</div><div class='del'>-	UTF-8 string).</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c:</div><div class='del'>-	Added missing #include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-2001-08-02  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added camel dependency (now needed by ebook).</div><div class='del'>-</div><div class='del'>-2001-08-01  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_is_empty): If the</div><div class='del'>-	default category is the same as the value passed in to this</div><div class='del'>-	function, return TRUE.  This could be a hack or not, but it</div><div class='del'>-	prevents two items from being added to the table if a category is</div><div class='del'>-	selected.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (setup_widgets): Allow the search bar to shrink</div><div class='del'>-	horizontally.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (clear_widgets): Pass valid values to</div><div class='del'>-	e_dialog_option_menu_set(); these need to come from the status map.</div><div class='del'>-</div><div class='del'>-2001-08-01  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: removed debugging messages.</div><div class='del'>-</div><div class='del'>-2001-08-01  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	The calendar search bar widget now includes a drop-down menu of</div><div class='del'>-	available categories.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (func_has_categories): Handle one and only one #f</div><div class='del'>-	value as meaning "unfiled", for components that have no categories</div><div class='del'>-	at all.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (open_cal): Duh, do not notify here about</div><div class='del'>-	changed categories since at this point we don't have any clients</div><div class='del'>-	bound to us yet.</div><div class='del'>-	(create_cal): Likewise.</div><div class='del'>-	(cal_backend_file_add_cal): Notify here.</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.h (CalSearchBarClass): New signal</div><div class='del'>-	"category_changed".</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.c (cal_search_bar_construct): Add a drop-down</div><div class='del'>-	menu for the list of categories.</div><div class='del'>-	(search_option_items): Removed the "Has category" option, since we</div><div class='del'>-	now have the drop-down menu instad and it would be confusing to</div><div class='del'>-	have both options.</div><div class='del'>-	(regen_query): Likewise.  Also, this function is now the old</div><div class='del'>-	cal_search_bar_query_changed() and is shared by that very function</div><div class='del'>-	and by the callback from the drop-down menu.</div><div class='del'>-	(notify_query_contains): Include the sub-sexp for the categories.</div><div class='del'>-	(cal_search_bar_set_categories): New function.</div><div class='del'>-	(cal_search_bar_get_category): New function.</div><div class='del'>-	(categories_selection_done_cb): Emit the "category_changed" signal.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (obj_updated_cb): Removed function since it did</div><div class='del'>-	not do anything; all updates are handled by the CalendarModel.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-	(ETasksPrivate): Removed the fields for the categories option</div><div class='del'>-	menu, since now it is in the ESearchBar.</div><div class='del'>-	(search_bar_sexp_changed_cb): Use calendar_model_set_query()</div><div class='del'>-	directly here, as we do not need to frob the sexp anymore.</div><div class='del'>-	(update_query): Removed.</div><div class='del'>-	(client_categories_changed_cb): New callback.</div><div class='del'>-	(search_bar_category_changed_cb): New callback.</div><div class='del'>-	(e_tasks_new_task): Set the default category on the component to</div><div class='del'>-	the one that is selected in the search bar.</div><div class='del'>-	(e_tasks_on_filter_selected): Removed.</div><div class='del'>-	(e_tasks_on_categories_changed): Removed.</div><div class='del'>-	(e_tasks_rebuild_categories_menu): Removed.</div><div class='del'>-	(e_tasks_add_menu_item): Removed.</div><div class='del'>-	(e_tasks_setup_view_menus): Sanitized not to sink objects wildly.</div><div class='del'>-	(e_tasks_discard_view_menus): New function.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.h (CalendarModelClass): Removed the</div><div class='del'>-	"categories_changed" signal since this is handled in the Wombat</div><div class='del'>-	now.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_get_categories): Removed.</div><div class='del'>-	(calendar_model_set_value_at): Do not collect the categories.</div><div class='del'>-	(query_obj_updated_cb): Likewise.</div><div class='del'>-	(calendar_model_collect_categories): Removed.</div><div class='del'>-	(calendar_model_set_default_category): Constify.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_deactivate): Call</div><div class='del'>-	e_tasks_discard_view_menus().</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (search_bar_category_changed_cb): Set the</div><div class='del'>-	default category for the task pad's model.</div><div class='del'>-</div><div class='del'>-2001-07-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	The Wombat now keeps track of which categories are present in the</div><div class='del'>-	objects of a calendar.  It will notify the clients of changes in</div><div class='del'>-	this set.  This is to make the category drop-down menus in the</div><div class='del'>-	calendar/tasks views be always up to date.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Listener): Added a</div><div class='del'>-	notifyCategoriesChanged() method.  The Wombat now keeps track of</div><div class='del'>-	the categories within a calendar.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.[ch]: Switched it to use BonoboXObject.</div><div class='del'>-	Also added the notifyCategoriesChanged implementation.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.[ch]: Added a "categories_changed" signal.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: Maintain a list of the live categories.</div><div class='del'>-	(update_categories_from_comp): New function to maintain the set of</div><div class='del'>-	live categories.</div><div class='del'>-	(add_component): Update the set of categories.</div><div class='del'>-	(remove_component): Likewise.</div><div class='del'>-	(open_cal): Notify about changes in the set of categories.</div><div class='del'>-	(create_cal): Likewise.</div><div class='del'>-	(cal_backend_file_update_objects): Likewise.</div><div class='del'>-	(cal_backend_file_remove_object): Likewise.</div><div class='del'>-	(notify_categories_changed): New function to notify the clients</div><div class='del'>-	about the current set of categories.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_notify_categories_changed): New function.</div><div class='del'>-</div><div class='del'>-2001-07-31  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-        * gui/e-day-view.c (selection_received):</div><div class='del'>-        * gui/e-week-view.c (selection_received): yes, set the end date, but</div><div class='del'>-	correctly calculated, not by using the component's duration, which</div><div class='del'>-	may not exist. Now really fixes #5836</div><div class='del'>-</div><div class='del'>-2001-07-31  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (selection_received):</div><div class='del'>-	* gui/e-week-view.c (selection_received): don't set the end date</div><div class='del'>-	for the pasted components, since it will be recalculated when the start</div><div class='del'>-	date is set, thus keeping the same duration than the original</div><div class='del'>-	cut/copied component. Fixes #5836</div><div class='del'>-</div><div class='del'>-2001-07-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: </div><div class='del'>-	* gui/calendar-commands.c (clear_folder_bar_label): started some code</div><div class='del'>-	to show the currently displayed dates in the folder title bar.</div><div class='del'>-	Unfinished.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (set_date_label):</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): </div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free</div><div class='del'>-	the CalComponentDateTimes. (Note the iTIP control needs updating for</div><div class='del'>-	timezone support.)</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: Changed CalComponentDateTime so that the</div><div class='del'>-	TZID is malloc'ed and freed rather than being a pointer to a static</div><div class='del'>-	string. This was causing problems as sometimes we were freeing the</div><div class='del'>-	string that was being pointed to, so we got corrupted TZIDs.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.</div><div class='del'>-	DATE values do not have timezones.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: </div><div class='del'>-	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,</div><div class='del'>-	since I think they are more commonly-used. Also added underlined</div><div class='del'>-	accelerator keys.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the</div><div class='del'>-	popup menu to be consistent with other folders, and separated from the</div><div class='del'>-	clipboard commands. Also changed to use EPopupMenu so the accelerators</div><div class='del'>-	work, and the masks may be useful at some point.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since</div><div class='del'>-	that makes it simpler. Fixes bug #5034.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (calendar_config_set_timezone): strdup the</div><div class='del'>-	location string. Fixes bug #4990.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times</div><div class='del'>-	don't include the end time.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed</div><div class='del'>-	days_shown. Fixes bug #5709.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_timezone): took out some</div><div class='del'>-	debugging messages.</div><div class='del'>-</div><div class='del'>-2001-07-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: added Help button. Though of</div><div class='del'>-	course it doesn't do anything yet.</div><div class='del'>-</div><div class='del'>-2001-07-30  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: Mark strings for translation</div><div class='del'>-</div><div class='del'>-2001-07-30  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (cal_opened_cb): call</div><div class='del'>-	cal_client_get_free_busy for testing the new method</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): implemented</div><div class='del'>-</div><div class='del'>-2001-07-28  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #5352.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show): Added a</div><div class='del'>-	`page' argument so that we can select which page to show when</div><div class='del'>-	popping up the dialog.</div><div class='del'>-	(cal_prefs_dialog_construct): Added the `page' argument as well.</div><div class='del'>-	(cal_prefs_dialog_new): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (settings_cmd): Set the page to the main</div><div class='del'>-	calendar settings one.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_settings_cmd): Implemented</div><div class='del'>-	callback for the "Task Settings" command.</div><div class='del'>-	(verbs): Added the "TasksSettings" verb.</div><div class='del'>-	(pixmaps): Added an icon for the tasks settings command.</div><div class='del'>-</div><div class='del'>-2001-07-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	recur is always in UTC</div><div class='del'>-	</div><div class='del'>-2001-07-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: handle timezones</div><div class='del'>-	everywhere</div><div class='del'>-	(get_timezone): new function to get a timezone based</div><div class='del'>-	on a tzid</div><div class='del'>-	(get_default_timezone): get default timezone</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: time zone field for the</div><div class='del'>-	context</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: link to bonobo conf</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: handle timezones</div><div class='del'>-	everywhere</div><div class='del'>-	(get_timezone): new function to get a timezone based</div><div class='del'>-	on a tzid</div><div class='del'>-	(get_default_timezone): get default timezone</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: time zone field for the</div><div class='del'>-	context</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: link to bonobo conf</div><div class='del'>-	</div><div class='del'>-2001-07-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): </div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): </div><div class='del'>-	initialize to NULL some pointers</div><div class='del'>-</div><div class='del'>-	* e-calendar-table.c (selection_received): deal correctly with</div><div class='del'>-	VCALENDAR objects</div><div class='del'>-	(e_calendar_table_copy_clipboard): g_strdup the value returned by</div><div class='del'>-	icalcomponent_get_as_ical_string</div><div class='del'>-</div><div class='del'>-2001-07-27  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_set_query): Constify and set the</div><div class='del'>-	query sexp on the task pad's model as well.</div><div class='del'>-</div><div class='del'>-2001-07-27  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/cal-search-bar.[ch]: New files with a derivative of</div><div class='del'>-	ESearchBar that generates sexps for calendar queries directly.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Use CalSearchBar instead of</div><div class='del'>-	ESearchBar.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.h (ECalendarTable): Removed the -&gt;colors</div><div class='del'>-	array since it is handled by ETableExtras now.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[ch]: Removed the subset_model.  Now we use</div><div class='del'>-	the live query facility to filter tasks.  Removed the filter</div><div class='del'>-	function stuff as well.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_construct): Use</div><div class='del'>-	calendar_model_set_cal_client() directly instead of</div><div class='del'>-	e_calendar_table_set_model().</div><div class='del'>-	(setup_widgets): Create a calendar search bar for the tasks</div><div class='del'>-	component.</div><div class='del'>-	(search_bar_sexp_changed_cb): Set the query sexp on the table model.</div><div class='del'>-	(e_tasks_on_filter_selected): Regenerate the query from the</div><div class='del'>-	selected category and the current sexp.</div><div class='del'>-	(update_query): New convenience function to recompute the real</div><div class='del'>-	query sexp.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_set_cal_client):</div><div class='del'>-	Removed function; people are now supposed to get the model from</div><div class='del'>-	the calendar table and operate on it.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (verbs): Consistency fixes with the XML</div><div class='del'>-	file.</div><div class='del'>-	(pixmaps): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	cal-search-bar.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-07-20  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CompEditorFactory): New interface to</div><div class='del'>-	a centralized factory for calendar component editors.  Has</div><div class='del'>-	editExisting() and editNew() methods to edit an existing component</div><div class='del'>-	from a URI/UID pair, and to create a new component in a calendar</div><div class='del'>-	that is in a particular URI, respectively.</div><div class='del'>-</div><div class='del'>-	* gui/comp-editor-factory.[ch]: Implementation files for the</div><div class='del'>-	component editor factory.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Added the CompEditorFactory</div><div class='del'>-	stuff.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	comp-editor-factory.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-07-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (invite_entry_changed): when an entry</div><div class='del'>-	has changed, iterate over the elements of the entry and add them</div><div class='del'>-	to the list if need be</div><div class='del'>-	(get_select_name_dialog): add a Chair Persons section</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): send the empty string as</div><div class='del'>-	subject if there is no summary</div><div class='del'>-	</div><div class='del'>-2001-07-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): send the empty string as</div><div class='del'>-	subject if there is no summary</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (cleanup_attendees): free a list of</div><div class='del'>-	attendees</div><div class='del'>-	(meeting_page_fill_widgets): clean up attendee lists and fix typo</div><div class='del'>-	(find_match): add ability to return pos of match</div><div class='del'>-	(popup_delete_cb): if deletion happens, make sure to tidy up</div><div class='del'>-	delegation chain</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.c (e_delegate_dialog_construct):</div><div class='del'>-	use the destination rather than text property</div><div class='del'>-	(e_delegate_dialog_get_delegate): ditto</div><div class='del'>-	(e_delegate_dialog_new): take name/address pair for dialog default</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.h: update protos</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (clean_up): only unref the object if we</div><div class='del'>-	have one</div><div class='del'>-	</div><div class='del'>-	* gui/itip-control-factory.c (stream_read): make sure we null</div><div class='del'>-	terminate the final buffer</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): strip the mailto: from the</div><div class='del'>-	organizer address if necessary</div><div class='del'>-</div><div class='del'>-2001-07-26  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (exception_select_row_cb): check that</div><div class='del'>-	the row passed in is valid. Sometimes we get the "row-selected"</div><div class='del'>-	signal for row 0 when there are no rows in the list. Fixes bug #4266.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): prefetch all the</div><div class='del'>-	timezone data needed by the object, to try to avoid making Corba</div><div class='del'>-	calls all over the place. They can cause problems because they call</div><div class='del'>-	the GTK+ main loop recursively. This currently leads to an assertion</div><div class='del'>-	failure in the GnomeCanvas occasionally.</div><div class='del'>-</div><div class='del'>-2001-07-25  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (e_itip_control_set_data): gracefully</div><div class='del'>-	handle the lack of a method</div><div class='del'>-</div><div class='del'>-2001-07-25  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (selection_received_cb): check type of component</div><div class='del'>-	before actually pasting.</div><div class='del'>-	Deal with VCALENDAR components also (fixes bug #5140)</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (selection_received_cb): ditto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_update_object): check the return</div><div class='del'>-	value from cal_component_get_as_string and don't call</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_updateObjects if NULL</div><div class='del'>-</div><div class='del'>-2001-07-25  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): used the new print preview icon.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): changed the 'Current day/week...'</div><div class='del'>-	strings to 'Selected day/week...' to make a little less confusing.</div><div class='del'>-	Fixes bug #5451.</div><div class='del'>-</div><div class='del'>-2001-07-25  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (is_duplicate): see if the address is</div><div class='del'>-	already in the list of attendees</div><div class='del'>-	(duplicate_error): throw up an error dialog</div><div class='del'>-	(popup_delegate_cb): if the attendee has already delegated, delete</div><div class='del'>-	the old delegatee</div><div class='del'>-	(value_at): cast to kill warnings</div><div class='del'>-	(append_row): don't add the new attendee if they are already in</div><div class='del'>-	the list</div><div class='del'>-</div><div class='del'>-2001-07-24  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (get_exception_string): calculate</div><div class='del'>-	tmp_tm.tm_wday ourselves. strftime has a habit of crashing if you</div><div class='del'>-	have weird values here. I think this fixes bug #4574.</div><div class='del'>-</div><div class='del'>-2001-07-24  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (value_at): stip the delto and</div><div class='del'>-	delfrom</div><div class='del'>-	(popup_delegate_cb): show a delegate dialog and add the new</div><div class='del'>-	delegatee and update the delegator</div><div class='del'>-	(add_section): listen for changes in a more direct manner</div><div class='del'>-	(get_select_name_dialog): add_section now takes a limit argument</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-delegate-dialog.[hc]: New dialog to query the user</div><div class='del'>-	for a person to delegate to</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: build/install new files</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: add ldadd line for ebook</div><div class='del'>-</div><div class='del'>-2001-07-21  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed</div><div class='del'>-	the test to see whether we should draw the icons.</div><div class='del'>-</div><div class='del'>-2001-07-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (get_local_file_name_for_folder_type):</div><div class='del'>-	New helper function.</div><div class='del'>-	(remove_folder): Add a @type arg and handle it, by deleting</div><div class='del'>-	"tasks.ics" instead of "calendar.ics" if the type is "tasks".  If</div><div class='del'>-	the type is not "tasks" or "calendar", report an</div><div class='del'>-	`UNSUPPORTED_TYPE' error.</div><div class='del'>-	(xfer_folder): Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Make folders of type "calendar" and</div><div class='del'>-	"tasks" user-creatable by setting `user_creatable' to %TRUE in the</div><div class='del'>-	`EvolutionShellComponentFolderType's.</div><div class='del'>-</div><div class='del'>-2001-07-19  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.h (event_editor_update_widgets):</div><div class='del'>-	Removed unused prototype.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.h (task_editor_update_widgets):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (clean_up): free various data related</div><div class='del'>-	settings</div><div class='del'>-	(destroy): use cleanup and unref the clients</div><div class='del'>-	(e_itip_control_set_data): clean up before setting the data and</div><div class='del'>-	store the timezones in a top level component</div><div class='del'>-	(update_item): use cal_client_update_objects and our top level</div><div class='del'>-	(including the timezones)</div><div class='del'>-</div><div class='del'>-2001-07-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (pixmaps): </div><div class='del'>-	* gui/calendar-commands.c (pixmaps): updated to use new print icon.</div><div class='del'>-</div><div class='del'>-2001-07-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (init_widgets): don't show the time</div><div class='del'>-	in the EDateEdit widget for adding EXDATEs.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): don't</div><div class='del'>-	set t.time.is_date to -1. It is a boolean flag, 0 or 1. We probably</div><div class='del'>-	don't want a date value, so we leave it at 0.</div><div class='del'>-</div><div class='del'>-2001-07-18  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	do not discard drawing icon if mask is NULL</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-2001-07-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (get_next): find the next displayable</div><div class='del'>-	component</div><div class='del'>-	(get_prev): find the previous displayable component</div><div class='del'>-	(e_itip_control_set_data): use above</div><div class='del'>-	(prev_clicked_cb): ditto</div><div class='del'>-	(next_clicked_cb): ditto</div><div class='del'>-</div><div class='del'>-2001-07-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Really fixes #4380.  The previous fix was necessary but not</div><div class='del'>-	sufficient; it worked for me because my system timezone happens to</div><div class='del'>-	match the Evolution timezone --- if they don't match, the bug</div><div class='del'>-	would persist.  Not matching is *not* an error; it is just a</div><div class='del'>-	matter of Unix sucking a lot and XST not being finished :)</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_to_gdate_with_zone): New function.  We</div><div class='del'>-	cannot use g_date_set_time() anymore because it does not take</div><div class='del'>-	timezones into account.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (get_days_shown): Use the function above.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_find_work_week_start): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_selected_time_range): Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-17  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (invite_entry_changed): Print</div><div class='del'>-	a g_message when the list of invited people changes</div><div class='del'>-	in the SelectNames control.</div><div class='del'>-	(add_section): #if 0/#endif out some (broken?) code.</div><div class='del'>-	(get_select_name_dialog): Listen for changes in the</div><div class='del'>-	SelectNames control.</div><div class='del'>-</div><div class='del'>-2001-07-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_destroy): destroy</div><div class='del'>-	the dialog widget here. Fixes bug #4198.</div><div class='del'>-</div><div class='del'>-2001-07-16  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_widgets): </div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_widgets): try to use</div><div class='del'>-	builtin timezones before getting them from the server. When creating</div><div class='del'>-	new events/tasks the timezones may not be on the server.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_widgets): for all-day</div><div class='del'>-	events we subtract a day from the end date rather than add it.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): ignore the event</div><div class='del'>-	if it isn't a GDK_CROSSING_NORMAL event. For some reason we are getting</div><div class='del'>-	leave events when the button is pressed, which meant that selecting</div><div class='del'>-	timezones in the map didn't work.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_dates): </div><div class='del'>-	* gui/print.c (print_date_label): only free icaltimetype if not NULL.</div><div class='del'>-</div><div class='del'>-2001-07-12  Taylor Hayward  &lt;taylorhayward@yahoo.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade:</div><div class='del'>-	* gui/meeting-mockup.glade:</div><div class='del'>-	* gui/alarm-notifyålarm-notify.glade:</div><div class='del'>-	* gui/dialogs/alarm-page.glade:</div><div class='del'>-	* gui/dialogs/meeting-page.glade:</div><div class='del'>-	* gui/dialogs/recurrence-page.glade: Added missing underlined</div><div class='del'>-	shortcuts.</div><div class='del'>-</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* cal-util/cal-util.h: new proto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_util_new_top_level): standard place to</div><div class='del'>-	get your top level calendar component</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (create_cal): use it</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): ditto</div><div class='del'>-	</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_copy_clipboard): fix</div><div class='del'>-	typo breaking compilation</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: fix include</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: build select names idl here</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: remove select names compilation from here</div><div class='del'>-	</div><div class='del'>-2001-07-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):</div><div class='del'>-	guard against infinite loops with the updating boolean, fixes 4270</div><div class='del'>-</div><div class='del'>-2001-07-12  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: added support for multiple selections in</div><div class='del'>-	cut/copy/paste. Also, it's now ready for the</div><div class='del'>-	s/update_object/update_objects change (I think)</div><div class='del'>-</div><div class='del'>-2001-07-11  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: renamed updateObject to updateObjects</div><div class='del'>-	and removed the UID argument, since it can add/update multiple objects</div><div class='del'>-	at once. (It can't yet, but it will!)</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c: </div><div class='del'>-	* pcs/cal-backend.[hc]: </div><div class='del'>-	* pcs/cal-backend-file.c: renamed update_object to update_objects and</div><div class='del'>-	got rid of the UID arg.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_update_objects): new function to</div><div class='del'>-	add/update multiple objects in one go, i.e for iTIP and for importing</div><div class='del'>-	calendars.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_date_label): fixed type bug.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.[hc]: </div><div class='del'>-	* gui/e-week-view-event-item.c: draw the timezone icons if the event's</div><div class='del'>-	DTSTART or DTEND is in a different timezone to the current one.</div><div class='del'>-	Note that we may want to change this so it compares the UTC offsets</div><div class='del'>-	rather than the TZIDs, since currently it will draw the icons for all</div><div class='del'>-	events coming from iTIP requests from other clients.</div><div class='del'>-</div><div class='del'>-2001-07-11  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #4380 as well as some leftovers from the days of struct</div><div class='del'>-	tm and some uninitialized values.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c</div><div class='del'>-	(gnome_calendar_on_date_navigator_selection_changed): Initialize</div><div class='del'>-	the icaltimetype structures completely.</div><div class='del'>-	(gnome_calendar_init): Do not reset priv-&gt;zone to NULL here, since</div><div class='del'>-	it was set by gnome_calendar_update_config_settings() from</div><div class='del'>-	setup_widgets().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (set_completed): Do not set is_daylight.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_convert_grid_position_to_time):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_timezone): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): Likewise,</div><div class='del'>-	and initialize start_tt and end_tt completely.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_year_begin_with_zone): Likewise.</div><div class='del'>-	(time_month_begin_with_zone): Likewise.</div><div class='del'>-	(time_week_begin_with_zone): Likewise.</div><div class='del'>-	(time_day_begin_with_zone): Likewise.</div><div class='del'>-	(time_day_end_with_zone): Likewise.</div><div class='del'>-	(time_from_isodate): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_fill_component): Initialize</div><div class='del'>-	icaltime before using it.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_component): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an</div><div class='del'>-	unused icaltimetype.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c</div><div class='del'>-	(task_details_page_fill_component): Initialize icaltime before</div><div class='del'>-	using it.</div><div class='del'>-</div><div class='del'>-2001-07-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: fix the calendar not exiting with a</div><div class='del'>-	gross hack because i don't have time to fix the ref counting right</div><div class='del'>-	now</div><div class='del'>-	</div><div class='del'>-2001-07-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: be careful about adding and</div><div class='del'>-	stripping MAILTO:'s properly</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.etspec: add missing columns</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_strip_mailto): point to the real start of</div><div class='del'>-	the email address</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.h: add proto</div><div class='del'>-</div><div class='del'>-	* gui/itip-control-factory.c: get rid of the my address property</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: use the users real identity to figure out</div><div class='del'>-	which attendee they are</div><div class='del'>-	(find_my_address): figure out who the user is among the attendees</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.h: remove protos</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: extra dist etspecs</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2001-07-11  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Added a hack to get the last</div><div class='del'>-	string translated since xml-i18n-tools doesn't recognize</div><div class='del'>-	_click-to-add-message="Click here to add a task".</div><div class='del'>-	</div><div class='del'>-2001-07-10  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (BUILT_SOURCES): Move this higher so that</div><div class='del'>-	Makefile properly depends on us. Fixes distcheck.</div><div class='del'>-</div><div class='del'>-2001-07-11  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix bug #4389: ETableSpecification still in e-calendar-table.c</div><div class='del'>-	file]</div><div class='del'>-	</div><div class='del'>-	* gui/e-calendar-table.etspec: New file containing the spec that</div><div class='del'>-	was in e-calendar-table.c as a big string.</div><div class='del'>-	</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Use the spec</div><div class='del'>-	file instead of a string.</div><div class='del'>-	(e_calendar_table_get_spec): Removed this function, we don't need</div><div class='del'>-	it anymore.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_setup_menus): Don't load from string,</div><div class='del'>-	from file instead.</div><div class='del'>-	</div><div class='del'>-	* gui/Makefile.am: Necessary changes to get the new .etspec file</div><div class='del'>-	installed.</div><div class='del'>-</div><div class='del'>-2001-07-10  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Fix bug #4388: ETableSpecification still in meeting-page.c file]</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.etspec: New file containing the spec</div><div class='del'>-	that was previously in meeting-page.c as a string.</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/meeting-page.c: One line change to get it to use</div><div class='del'>-	this spec file instead of a string.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: Necessary changes to get the new</div><div class='del'>-	meeting-page.etspec installed.</div><div class='del'>-</div><div class='del'>-2001-07-10  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c:</div><div class='del'>-	* gui/e-calendar-table.c:</div><div class='del'>-	* gui/e-day-view-main-item.c:</div><div class='del'>-	* gui/e-day-view-top-item.c:</div><div class='del'>-	* gui/e-day-view.[hc]:</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/gnome-cal.c:</div><div class='del'>-	* gui/print.c:</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c:</div><div class='del'>-	* gui/dialogs/comp-editor-util.c:</div><div class='del'>-	* gui/dialogs/event-page.c:</div><div class='del'>-	* pcs/cal-backend-file.c:</div><div class='del'>-	* pcs/query.c:</div><div class='del'>-	* cal-util/cal-component.[hc]: </div><div class='del'>-	* cal-util/cal-recur.c: </div><div class='del'>-	* cal-util/timeutil.[hc]: </div><div class='del'>-	* cal-client/cal-client.[hc]: more timezone updates. I'm pretty much</div><div class='del'>-	done with the calendar code now, except for alarms and conduits,</div><div class='del'>-	which Federico and JP know more about. And there are a couple of</div><div class='del'>-	other minor things to fix. But it is still pretty buggy.</div><div class='del'>-</div><div class='del'>-2001-07-10  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: Add popup support so you can delete</div><div class='del'>-	users from the list</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (setup_widgets): fix typo</div><div class='del'>-</div><div class='del'>-2001-07-10  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): Handle the</div><div class='del'>-	different alarm actions.</div><div class='del'>-	(display_notification): Do the alarm notification dialog here.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify-dialog.c (make_heading): Take in a</div><div class='del'>-	CalComponentVType, not a whole component.</div><div class='del'>-	(alarm_notify_dialog): Take in a CalComponentVType and the final</div><div class='del'>-	message instead of generating it ourselves.</div><div class='del'>-</div><div class='del'>-2001-07-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (generate_alarms_for_comp): Pass the</div><div class='del'>-	parent vCalendar component as the timezone closure of</div><div class='del'>-	cal_recur_generate_instances().</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_alarm_string): Make the string</div><div class='del'>-	consistent with the option menu text.</div><div class='del'>-	(get_alarm_string): Removed extra spaces from the last part of the</div><div class='del'>-	alarm string.</div><div class='del'>-</div><div class='del'>-2001-07-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): Use</div><div class='del'>-	e_utf8_from_gtk_event_key() so that we can input utf8 text</div><div class='del'>-	properly.</div><div class='del'>-	(e_day_view_cut_clipboard): Constify.</div><div class='del'>-	(e_day_view_on_cut): Constify.</div><div class='del'>-	(e_day_view_reshape_long_event): Remove unused variable.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Use</div><div class='del'>-	e_utf8_from_gtk_event_key() so that we can input utf8 text</div><div class='del'>-	properly.</div><div class='del'>-	(e_week_view_cut_clipboard): Constify.</div><div class='del'>-	(e_week_view_on_cut): Constify.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_resolve_tzid_cb): Fix the</div><div class='del'>-	prototype so that this matches CalRecurResolveTimezoneFn.  Also</div><div class='del'>-	renamed it so that it is clear that it is supposed to be a</div><div class='del'>-	callback.</div><div class='del'>-</div><div class='del'>-2001-07-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (init_widgets): connect to the entry</div><div class='del'>-	not the combo</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (set_menu_sens): set menu</div><div class='del'>-	sensitivities based on whether or not the meeting page is shown</div><div class='del'>-	(event_editor_init): call above</div><div class='del'>-	(event_editor_edit_comp): ditto</div><div class='del'>-	(schedule_meeting_cmd): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_set_ui_prop): new</div><div class='del'>-	function to allow for set of ui props (esp. "sensitive")</div><div class='del'>-	</div><div class='del'>-2001-07-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (clear_widgets): actually clear some</div><div class='del'>-	widgets and hide/show widgets in the default setup</div><div class='del'>-	(meeting_page_destroy): destroy the address lists</div><div class='del'>-	(meeting_page_fill_widgets): allow the user to select among their</div><div class='del'>-	identities as a new organizer, or show the existing organizer as</div><div class='del'>-	label</div><div class='del'>-	(meeting_page_fill_component): set the "MAILTO:" bit of the</div><div class='del'>-	organizer to match spec, set CN properly if we know it</div><div class='del'>-	(get_widgets): load new widgets</div><div class='del'>-	(other_clicked_cb): handle "Other Organizer" click</div><div class='del'>-	(change_clicked_cb): handle "Change Organizer" click</div><div class='del'>-	(init_widgets): listen for clicks on new buttons</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove the</div><div class='del'>-	page from our internal list and unref it</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_addresses_get): get the configure mail</div><div class='del'>-	identities</div><div class='del'>-	(itip_addresses_free): free a list of identities returned by</div><div class='del'>-	itip_addresses_get</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.h: remove obsolete protos, and new protos</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.html: Remove ancient file</div><div class='del'>-</div><div class='del'>-2001-07-04  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #4018 and what would be the analogous bugs for the other</div><div class='del'>-	component editors.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.h (CompEditorPageClass): New</div><div class='del'>-	virtual method "::focus_main_widget()".</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.c</div><div class='del'>-	(comp_editor_page_focus_main_widget): New function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_append_page): If we are</div><div class='del'>-	inserting the main page, ask it to focus its main widget.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (alarm_page_focus_main_widget):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_focus_main_widget):</div><div class='del'>-	Implemented.</div><div class='del'>-	#include "e-util/e-categories-config.h".</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (meeting_page_focus_main_widget):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c</div><div class='del'>-	(recurrence_page_focus_main_widget): Implemented.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c</div><div class='del'>-	(task_details_page_focus_main_widget): Implemented.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_focus_main_widget):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-2001-07-04  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (clear_folder_bar_label): New function.</div><div class='del'>-	(calendar_control_activate): Clear the folder bar label; we really</div><div class='del'>-	don't have anything interesting to display.</div><div class='del'>-</div><div class='del'>-2001-07-03  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: Add new columns for information</div><div class='del'>-	specification</div><div class='del'>-	(meeting_page_destroy): save the table state</div><div class='del'>-	(build_etable): load new table state</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_destroy): unref pages</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_destroy): unref pages</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (setup_widgets): kill warning</div><div class='del'>-	(comp_editor_append_page): ref page passed in</div><div class='del'>-	(close_dialog): unref pages</div><div class='del'>-</div><div class='del'>-2001-07-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (query_obj_updated_cb): fix warning, and added</div><div class='del'>-	some debug messages.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (write_label_piece): </div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): call mktime()</div><div class='del'>-	to set the weekday, though this is a temporary fix.</div><div class='del'>-</div><div class='del'>-2001-07-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE</div><div class='del'>-	component given a TZID. We need this to resolve TZIDs when expanding</div><div class='del'>-	an event using cal_recur_generate_instances() in query.c.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented</div><div class='del'>-	virtual method.</div><div class='del'>-	(cal_backend_file_update_object): fixed bug, kind -&gt; child_kind.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (func_occur_in_time_range): use the virtual method for</div><div class='del'>-	resolving TZIDs. The other way didn't work anyway, as we didn't have</div><div class='del'>-	the entire VCALENDAR with VTIMEZONEs in it.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (init_widgets): </div><div class='del'>-	(make_ending_until_special): moved the call to</div><div class='del'>-	e_date_edit_set_get_time_callback() from init_widgets to</div><div class='del'>-	make_ending_until_special(), since that is where the widget gets</div><div class='del'>-	created.</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone</div><div class='del'>-	being NULL.</div><div class='del'>-</div><div class='del'>-2001-07-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-options.[ch]: New files with the alarm options</div><div class='del'>-	dialog; this configures the repeat/duration properties and the</div><div class='del'>-	options specific to each alarm action type.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (AlarmPagePrivate): Added the alarm</div><div class='del'>-	options button.  Also, keep an alarm structure which we are</div><div class='del'>-	editing and an alarm options dialog.</div><div class='del'>-	(init_widgets): Connect to the options button.</div><div class='del'>-	(add_clicked_cb): Clone the component we are editing instead of</div><div class='del'>-	creating a new one so that we preserve the data from the alarm</div><div class='del'>-	options dialog.</div><div class='del'>-	(button_options_clicked_cb): Pop up the alarm options dialog.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_new): Doh,</div><div class='del'>-	initialize the other fields in the new alarm.</div><div class='del'>-</div><div class='del'>-2001-07-03  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.[hc]</div><div class='del'>-	* cal-util/cal-component.c</div><div class='del'>-	* cal-util/cal-recur.[hc]</div><div class='del'>-	* cal-util/test-recur.c</div><div class='del'>-	* cal-util/timeutil.c</div><div class='del'>-	* gui/calendar-config.c</div><div class='del'>-	* gui/calendar-model.[hc]</div><div class='del'>-	* gui/comp-util.[hc]</div><div class='del'>-	* gui/e-calendar-table.c</div><div class='del'>-	* gui/e-day-view-main-item.c</div><div class='del'>-	* gui/e-day-view-top-item.c</div><div class='del'>-	* gui/e-day-view.[hc]</div><div class='del'>-	* gui/e-itip-control.c</div><div class='del'>-	* gui/e-timezone-entry.[hc]</div><div class='del'>-	* gui/e-week-view.[hc]</div><div class='del'>-	* gui/gnome-cal.[hc]</div><div class='del'>-	* gui/goto.c</div><div class='del'>-	* gui/tag-calendar.[hc]</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c</div><div class='del'>-	* gui/dialogs/comp-editor-page.[hc]</div><div class='del'>-	* gui/dialogs/comp-editor-util.[hc]</div><div class='del'>-	* gui/dialogs/comp-editor.c</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.[hc]</div><div class='del'>-	* gui/dialogs/event-page.c</div><div class='del'>-	* gui/dialogs/meeting-page.c</div><div class='del'>-	* gui/dialogs/recurrence-page.c</div><div class='del'>-	* gui/dialogs/task-details-page.c</div><div class='del'>-	* gui/dialogs/task-details-page.glade</div><div class='del'>-	* gui/dialogs/task-page.c</div><div class='del'>-	* idl/evolution-calendar.idl</div><div class='del'>-	* pcs/cal-backend-file.c</div><div class='del'>-	* pcs/cal-backend.c</div><div class='del'>-	* pcs/cal-backend.h</div><div class='del'>-	* pcs/cal.c</div><div class='del'>-	* pcs/query.c: timezone changes everywhere. There's still quite a</div><div class='del'>-	few things to update, and its not working well at present.</div><div class='del'>-</div><div class='del'>-2001-07-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (publish_freebusy_cmd): publish</div><div class='del'>-	free/busy information for the currently viewed time range</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).</div><div class='del'>-	(evolution_calendar_LDADD): Added $(BONOBO_CONF_LIBS).</div><div class='del'>-</div><div class='del'>-2001-07-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Support for ATTACH, DESCRIPTION properties in alarm components.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_alarm_property):  Deal with</div><div class='del'>-	ATTACH, DESCRIPTION properties.</div><div class='del'>-	(cal_component_alarm_get_attach): New function.  Libical is</div><div class='del'>-	actually bogus; supposedly icalattachtype structures are</div><div class='del'>-	refcounted but the property functions return them by value.</div><div class='del'>-	(cal_copmonent_alarm_set_attach): New function.</div><div class='del'>-	(cal_component_alarm_get_description): New function.</div><div class='del'>-	(cal_component_alarm_set_description): New function.</div><div class='del'>-</div><div class='del'>-2001-07-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Support for repeat/duration properties in alarm components.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalAlarmRepeat): New structure that</div><div class='del'>-	pairs the repeat/duration values of an alarm component, which must</div><div class='del'>-	be set both together or not set at all.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (CalComponentAlarm): Added fields for</div><div class='del'>-	the repeat and duration properties.</div><div class='del'>-	(scan_alarm_property): Scan the DURATION and REPEAT properties.</div><div class='del'>-	(make_alarm): Nullify/initialize all the fields in the alarm.</div><div class='del'>-	(cal_component_alarm_get_repeat): New function.</div><div class='del'>-	(cal_component_alarm_set_repeat): New function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.glade: Changed the label of display</div><div class='del'>-	alarms from "Show a dialog" to "Display a message".</div><div class='del'>-</div><div class='del'>-2001-07-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c</div><div class='del'>-	(task_details_page_fill_widgets): fill in delegated from field</div><div class='del'>-	</div><div class='del'>-2001-07-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (categories_clicked_cb): </div><div class='del'>-	* gui/dialogs/event-page.c (categories_clicked_cb): use the new</div><div class='del'>-	self-contained e_categories_config_open_dialog_for_entry() function</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_item_draw_icons): </div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_reshape_long_event):</div><div class='del'>-	(e_day_view_reshape_day_event): ditto</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	use e_categories_config_get_icon_for() to retrieve the icon</div><div class='del'>-	associated with each category</div><div class='del'>-</div><div class='del'>-2001-07-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (send_freebusy): implement</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (set_attendee_list): add the delto</div><div class='del'>-	property rather than the delfrom property twice</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_edit_comp): show</div><div class='del'>-	delegation info if appropriate</div><div class='del'>-	(delegate_task_cmd): delegate command</div><div class='del'>-	(cancel_task_cmd): cancel command</div><div class='del'>-	(refresh_task_cmd): refresh command</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c: Load new widgets</div><div class='del'>-	(task_details_page_show_delegation): show/hide delegation info widgets</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_edit_comp): free</div><div class='del'>-	attendee list when finished</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (setup_widgets): explicitly show the</div><div class='del'>-	widgets, update pixmaps after the verbs have been added</div><div class='del'>-	(comp_editor_focus): don't do a show all</div><div class='del'>-</div><div class='del'>-2001-07-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #1406.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): Handle the options for the</div><div class='del'>-	task list colors.</div><div class='del'>-	(calendar_config_write): Ditto.</div><div class='del'>-	(calendar_config_get_tasks_due_today_color): New function.</div><div class='del'>-	(calendar_config_set_tasks_due_today_color): New function.</div><div class='del'>-	(calendar_config_get_tasks_overdue_color): New function.</div><div class='del'>-	(calendar_config_set_tasks_overdue_color): New function.</div><div class='del'>-	(calendar_config_configure_e_calendar_table): Use</div><div class='del'>-	e_table_model_changed() for the colors.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: Updated the options for the</div><div class='del'>-	task list and alarms.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_show_config):</div><div class='del'>-	Update the task list settings.</div><div class='del'>-	(cal_prefs_dialog_update_config): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_color): Deal with tasks for today as</div><div class='del'>-	well as overdue tasks.  Make it cleaner, even though we have to</div><div class='del'>-	duplicate a chunk of is_overdue().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (preferences_cmd): Renamed from</div><div class='del'>-	properties_cmd().</div><div class='del'>-</div><div class='del'>-2001-07-01  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c</div><div class='del'>-	(e_day_view_main_item_draw_day_event): draw icons per category</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c</div><div class='del'>-	(e_day_view_top_item_draw_long_event): draw icons per category</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c</div><div class='del'>-	(e_day_view_reshape_long_event):</div><div class='del'>-	(e_day_view_reshape_day_event): calculate space for category icons</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c</div><div class='del'>-	(e_week_view_event_item_draw_icons): draw icons per category</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c</div><div class='del'>-	(e_week_view_reshape_event_span): calculate space for category icons</div><div class='del'>-	</div><div class='del'>-2001-07-01  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_*_clipboard): fixed clibpoard</div><div class='del'>-	command activation from the menu entries. CTRL-C and CTRL-X don't</div><div class='del'>-	work though, since it seems the key presses are being captured by</div><div class='del'>-	the text item</div><div class='del'>-</div><div class='del'>-	gui/e-week-view.c (e_week_view_*_clipboard): ditto</div><div class='del'>-</div><div class='del'>-2001-06-30  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c</div><div class='del'>-	(e_week_view_event_item_button_press): Only set the</div><div class='del'>-	pressed_event_num and pressed_span_num if button 1 was pressed.</div><div class='del'>-	Fix up return values a bit.  This fixes bug #3780.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c</div><div class='del'>-	(gnome_calendar_on_date_navigator_selection_changed): Doh, the</div><div class='del'>-	call for the day view was supposed to be</div><div class='del'>-	gnome_calendar_set_view(), not set_view().  Fixes bug #3779.</div><div class='del'>-</div><div class='del'>-2001-06-30  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_cut_cmd): call</div><div class='del'>-	e_calendar_table_cut_clipboard with the correct object</div><div class='del'>-</div><div class='del'>-	(tasks_control_copy_cmd): ditto</div><div class='del'>-</div><div class='del'>-	(sensitize_commands): sensitize clipboard commands based on the</div><div class='del'>-	number of selected tasks</div><div class='del'>-</div><div class='del'>-2001-06-28  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[ch] (e_calendar_table_cut_clipboard),</div><div class='del'>-	(e_calendar_table_copy_clipboard),</div><div class='del'>-	(e_calendar_table_paste_clipboard): new functions for allowing the</div><div class='del'>-	execution of clipboard-related commands</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_cut_cmd),</div><div class='del'>-	(tasks_control_copy_cmd), (tasks_control_paste_cmd): added</div><div class='del'>-	callbacks for the new clipboard-related menu entries</div><div class='del'>-</div><div class='del'>-2001-06-28  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: removed not-uses-anymore parameter in</div><div class='del'>-	call to evolution_shell_component_new</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.[ch] (gnome_calendar_cut_clipboard),</div><div class='del'>-	(gnome_calendar_copy_clipboard), (gnome_calendar_paste_clipboard):</div><div class='del'>-	new functions for allowing execution of clipboard-related commands</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[ch] (e_day_view_cut_clipboard),</div><div class='del'>-	(e_day_view_copy_clipboard), (e_day_view_paste_clipboard): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.[ch] (e_week_view_cut_clipboard),</div><div class='del'>-	(e_week_view_copy_clipboard), (e_week_view_paste_clipboard): ditto</div><div class='del'>-</div><div class='del'>-2001-06-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (cut_event_cmd),</div><div class='del'>-	(copy_event_cmd), (paste_event_cmd): added callbacks for the new</div><div class='del'>-	clipboard-related menu entries</div><div class='del'>-</div><div class='del'>-2001-06-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Pass NULL as the</div><div class='del'>-	@external_uri_schemas argument to</div><div class='del'>-	`evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-2001-06-27  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/*/Makefile.am (INCLUDES): More srcdir != builddir</div><div class='del'>-	fixes.</div><div class='del'>-</div><div class='del'>-2001-06-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (selection_received): fixed</div><div class='del'>-	(e_calendar_table_on_copy): fixed</div><div class='del'>-</div><div class='del'>-2001-06-26  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalAlarmInstance): Renamed the occur</div><div class='del'>-	field to occur_start; added an occur_end field.  This way we can</div><div class='del'>-	present the complete times for the occurrence from the server.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalAlarmInstance): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (add_alarm_occurrences_cb): Fill the new</div><div class='del'>-	fields appropriately.</div><div class='del'>-	(generate_absolute_triggers): Likewise; we use -1 in case the</div><div class='del'>-	component has no DTSTART or DTEND because there are no meaningful</div><div class='del'>-	occurrence dates here.</div><div class='del'>-	(fill_alarm_instances_seq): Fill in the new fields.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_alarm_instance_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify-dialog.c (alarm_notify_dialog):</div><div class='del'>-	Take in both the occur_start and occur_end times.</div><div class='del'>-</div><div class='del'>-	* gui/goto.c (goto_dialog): Free the dlg structure on the bail-out</div><div class='del'>-	cases.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (get_widgets): Do not assert if we</div><div class='del'>-	cannot find the main widget; just return FALSE.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (get_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (get_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c (get_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-2001-06-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (INCLUDES): Fixes for</div><div class='del'>-	srcdir != builddir. Link to the static libwombat.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am (INCLUDES): Here too.</div><div class='del'>-</div><div class='del'>-2001-06-24  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (main): Initialize libglade.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (compute_alarm_range):</div><div class='del'>-	icaldurationtype_as_int() will now return a negative value if</div><div class='del'>-	dur-&gt;is_neg is true, so we need to flip the sign of some</div><div class='del'>-	operations here.</div><div class='del'>-	(add_alarm_occurrences_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (compute_alarm_range): Likewise.</div><div class='del'>-	(add_alarm_occurrences_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2001-06-24  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.c: Converted to use BonoboXObject.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): Ask the alarm</div><div class='del'>-	notification service to add the calendar and tasks URIs.</div><div class='del'>-	(add_alarms): New function.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (main): Doh, fixed typo in the</div><div class='del'>-	OAFIID.</div><div class='del'>-	(main): Initialize and shut down gnome-vfs.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (IDLS): Added evolution-calendar.idl, sigh.</div><div class='del'>-	(evolution_calendar_SOURCES): Added the files generated from the IDL.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.c (alarm_trigger_cb): New function</div><div class='del'>-	used when an alarm is triggered.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: Removed the alarm-notify-dialog files;</div><div class='del'>-	they are now in gui/alarm-notify.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am: Added the alarm-notify-dialog</div><div class='del'>-	files.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_forget_password): This was incorrectly named</div><div class='del'>-	cal_client_forget_password(); renamed it.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Initialize and shut down gnome-vfs.</div><div class='del'>-</div><div class='del'>-2001-06-23  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (task_compare_cb): New function to</div><div class='del'>-	compare tasks like the Pilot task list.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalComponentField): Added a</div><div class='del'>-	semi-hackish CAL_COMPONENT_FIELD_COMPONENT.  In the ETable model,</div><div class='del'>-	it is intended to return a pointer to the component itself.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_at): Return the</div><div class='del'>-	component itself for CAL_COMPONENT_FIELD_COMPONENT.  Be more</div><div class='del'>-	paranoid about invalid columns.</div><div class='del'>-	(calendar_model_set_value_at): Be more paranoid about invalid</div><div class='del'>-	columns.</div><div class='del'>-	(calendar_model_duplicate_value): Ref the component field.</div><div class='del'>-	(calendar_model_initialize_value): Deal with the component field.</div><div class='del'>-	(calendar_model_value_is_empty): Likewise.</div><div class='del'>-	(calendar_model_value_to_string): Likewise.</div><div class='del'>-</div><div class='del'>-2001-06-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added itip-control-factory.* to the build.</div><div class='del'>-</div><div class='del'>-2001-06-22  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.[ch] (cal_get_password): new function for the backends to</div><div class='del'>-	be able to call the getPassword method on the associated</div><div class='del'>-	WombatClient</div><div class='del'>-	(cal_forget_password): ditto for the forgetPassword method</div><div class='del'>-</div><div class='del'>-2001-06-22  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: changed getFreeBusy method to return</div><div class='del'>-	a CalObj instead of a sequence</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.[ch] (cal_client_get_free_busy): changed it to</div><div class='del'>-	work like the cal_client_get_object function, that is, it does not</div><div class='del'>-	return anymore a list of UIDs, but a CalClientGetStatus code, and</div><div class='del'>-	added a new parameter for the caller to get the component back when</div><div class='del'>-	this function returns</div><div class='del'>-	(cal_client_open): aggregate WombatClient interface to the CalListener</div><div class='del'>-	being used</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c, pcs/cal-backend-file.c (..get_free_busy): set</div><div class='del'>-	return value to "char *" as it will be returning a FreeBusy object,</div><div class='del'>-	and not a list of UIDs</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.[ch] (cal_backend_get_free_busy): ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (cal_construct): queryInterface on the listener to obtain</div><div class='del'>-	the WombatClient interface</div><div class='del'>-</div><div class='del'>-2001-06-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): update to new call</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.[hc]: break the widget bits out on their own</div><div class='del'>-	into a proper object, basic stuff seems to be working again</div><div class='del'>-	</div><div class='del'>-	* gui/itip-control-factory.c: put the control specific bits here</div><div class='del'>-	from e-itip-control.c</div><div class='del'>-</div><div class='del'>-	* gui/itip-control-factory.h: new header</div><div class='del'>-</div><div class='del'>-2001-06-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (gladedir): add include path</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (setup_widgets): remove buttons and</div><div class='del'>-	use evolution's standard ui config</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_comp_item): print description text</div><div class='del'>-</div><div class='del'>-2001-06-21  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.[ch]:</div><div class='del'>-	(cal_client_init): create a WombatClient when creating a CalClient</div><div class='del'>-	object, so that we can receive authentication notifications from</div><div class='del'>-	the wombat</div><div class='del'>-	(cal_client_destroy): destroy the WombatClient object when dying</div><div class='del'>-	(cal_client_set_auth_func): new function to set the authentication</div><div class='del'>-	function to be called when a password is required by the calendar</div><div class='del'>-	server (through the WombatClient object)</div><div class='del'>-	(cal_client_get_free_busy): new function for calling the new IDL</div><div class='del'>-	method Cal::getFreeBusy</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am: add libwombat to LDADD</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: add libwombat to LDADD</div><div class='del'>-</div><div class='del'>-2001-06-20  Dave Camp  &lt;dave@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): Changed attach_data</div><div class='del'>-	to be a GNOME_Evolution_Composer_AttachmentData rather than a</div><div class='del'>-	CORBA_char*.</div><div class='del'>-</div><div class='del'>-2001-06-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (print_cmd): print menu command</div><div class='del'>-	(print_preview_cmd): ditto for print preview</div><div class='del'>-	(print_setup_cmd): ditto for print setup</div><div class='del'>-	(comp_editor_set_cal_client): listen for updated and removed</div><div class='del'>-	signals</div><div class='del'>-	(obj_updated_cb): if the item changes else where, query the user</div><div class='del'>-	for the course of action</div><div class='del'>-	(obj_removed_cb): ditto for removal</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_setup): rudimentary page setup support</div><div class='del'>-	(print_comp): rudimentary individual event/task printing support</div><div class='del'>-</div><div class='del'>-	* gui/print.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/changed-comp.[hc]: dialog to query the user about</div><div class='del'>-	what to do when a item is changed elsewhere</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: build new files</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/send-comp.c (send_component_dialog): remove useless</div><div class='del'>-	assignment</div><div class='del'>-	</div><div class='del'>-2001-06-20  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: added getFreeBusy method</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (impl_Cal_get_free_busy): implementation of the new</div><div class='del'>-	getFreeBusy added method</div><div class='del'>-	</div><div class='del'>-	* pcs/cal-backend.[ch]: added new virtual method to the CalBackend</div><div class='del'>-	class (get_free_busy)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (cal_backend_db_get_free_busy): new function,</div><div class='del'>-	not implemented yet</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_free_busy): new funtion,</div><div class='del'>-	not implemented yet</div><div class='del'>-</div><div class='del'>-2001-06-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[hc]:</div><div class='del'>-	* gui/gnome-cal.[hc]: </div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): </div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): moved the</div><div class='del'>-	function to check for a default timezone to calendar-config.c, and</div><div class='del'>-	also used it in the tasks control.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.h: #include &lt;gtk/gtkwidget.h&gt; fix.</div><div class='del'>-</div><div class='del'>-2001-06-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): </div><div class='del'>-	* gui/gnome-cal.[hc]: added code to show the timezone dialog if the</div><div class='del'>-	user hasn't set a default timezone yet.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.c (e_timezone_dialog_add_timezones): </div><div class='del'>-	set the "None" item string before adding it to the combo, to stop the</div><div class='del'>-	combo putting "None" in the entry initially.</div><div class='del'>-</div><div class='del'>-2001-06-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[ch]: added cut/copy/paste support. It works</div><div class='del'>-	with single selections (a single component selected) and with</div><div class='del'>-	multiple ones (several components selected)</div><div class='del'>-</div><div class='del'>-2001-06-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c: if the timezones of the start and end of</div><div class='del'>-	the event are the same, then if the start timezone is changed we</div><div class='del'>-	change the end timezone as well, since that is what most users will</div><div class='del'>-	want.</div><div class='del'>-</div><div class='del'>-2001-06-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c: </div><div class='del'>-	* idl/evolution-calendar.idl: </div><div class='del'>-	* cal-client/cal-client.[hc]: removed stuff to get builtin timezone</div><div class='del'>-	info from the server.</div><div class='del'>-</div><div class='del'>-2001-06-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c: added a 'Time zone' setting. Also</div><div class='del'>-	rearranged a little, adding a new 'General' page, since we had too</div><div class='del'>-	many settings on the 'Calendar' page.</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.[hc]: </div><div class='del'>-	* gui/dialogs/e-timezone-dialog.[hc]: </div><div class='del'>-	* gui/dialogs/comp-editor.c: </div><div class='del'>-	* gui/dialogs/comp-editor-page.[hc]: </div><div class='del'>-	* gui/dialogs/event-page.c: </div><div class='del'>-	* gui/dialogs/task-details-page.c: </div><div class='del'>-	* gui/dialogs/task-page.c: removed CalClient stuff. The timezone dialog</div><div class='del'>-	now uses the timezone data directly from the client's libical library.</div><div class='del'>-</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_init): add ui</div><div class='del'>-	(forward_cmd): implement forward command</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (save_as_ok): bug fix, seems to work</div><div class='del'>-	now</div><div class='del'>-	</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (control_factory_init): add auto exit unref</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (destroy_cb): destroy our selves if we</div><div class='del'>-	have no more shells</div><div class='del'>-	(component_factory_init): add auto exit unref</div><div class='del'>-	</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: don't compile or install the old meeting edit</div><div class='del'>-	stuff</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Remove scheduling menu option</div><div class='del'>-	</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c: add some needed commas</div><div class='del'>-	(itip_send_comp): if publishing, don't set the to list and show</div><div class='del'>-	the message.  unless publishing, just send the email</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: remove typo</div><div class='del'>-	</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/send-comp.c: itip/imip send dialog</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/send-comp.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates): only</div><div class='del'>-	use the weekday picker if visible</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/meeting-page.c: just show the meeting list</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-editor.c (event_editor_edit_comp): remove the</div><div class='del'>-	meeting page if no attendees</div><div class='del'>-	(schedule_meeting_cmd): schedule a meeting menu item</div><div class='del'>-	(refresh_meeting_cmd): refresh meeting request menu item</div><div class='del'>-	(cancel_meeting_cmd): ditto for cancel</div><div class='del'>-	(forward_cmd): send as attachment</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_remove_page): remove page</div><div class='del'>-	from dialog</div><div class='del'>-	(comp_editor_show_page): show a given page</div><div class='del'>-	(comp_editor_get_current_comp): return a cal component</div><div class='del'>-	representing the current widget state</div><div class='del'>-	(comp_editor_save_comp): save the cal component</div><div class='del'>-	(comp_editor_delete_comp): delete the cal component</div><div class='del'>-	(comp_editor_send_comp): send the cal component</div><div class='del'>-	(comp_editor_merge_ui): merge xml in to the bonobo gui</div><div class='del'>-	(setup_widgets): use a bonobo window instead of a gtk window, add menus again</div><div class='del'>-	(save_as_cmd): save to file on disk - still broken</div><div class='del'>-	(save_close_cmd): close menu command</div><div class='del'>-	(save_close_cmd): save and close menu command</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.h: new protos</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cancel-comp.c (cancel_component_dialog): itip/imip</div><div class='del'>-	cancellation dialog</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cancel-comp.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: build new files</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.c</div><div class='del'>-	(comp_editor_page_notify_needs_send): emit needs_send signal</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.h: new signal protos</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c (itip_send_comp): new function to send cal</div><div class='del'>-	components</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (pstream_load): trim using cal-component</div><div class='del'>-	wrapper stuff</div><div class='del'>-	(accept_button_clicked_cb): use itip_send_comp</div><div class='del'>-	(tentative_button_clicked_cb): ditto</div><div class='del'>-	(decline_button_clicked_cb): ditto</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: compile select name idl stuff</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_organizer): get the organizer</div><div class='del'>-	(cal_component_set_organizer): set the organizer</div><div class='del'>-	(cal_component_get_recurid): get the recurrence id</div><div class='del'>-	(cal_component_set_recurid): set the recurrence id</div><div class='del'>-	(set_attendee_list): actually set the attendee list</div><div class='del'>-	(get_attendee_list): build the attendee list</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: new protos</div><div class='del'>-</div><div class='del'>-2001-06-19  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.glade: </div><div class='del'>-	* gui/dialogs/task-page.glade: </div><div class='del'>-	* gui/dialogs/event-page.glade: added timezone fields. Also moved the</div><div class='del'>-	'All Day' flag into an alignment so it doesn't mess up the height of</div><div class='del'>-	the other widgets.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c: </div><div class='del'>-	* gui/dialogs/task-page.c: </div><div class='del'>-	* gui/dialogs/event-page.c: added code to handle the timezone fields.</div><div class='del'>-	This still needs to be hooked up when the libical code is finished.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.c (on_map_leave): new function to</div><div class='del'>-	clear the preview label and turn off the highlighted point on the</div><div class='del'>-	map when you move the mouse outside it.</div><div class='del'>-	(find_selected_point): new function to try to find the point</div><div class='del'>-	corresponding to the text in the combo.</div><div class='del'>-	(on_combo_changed): call the above function to update the selected</div><div class='del'>-	point.</div><div class='del'>-	(on_map_leave): turn off the preview point &amp; label when the mouse</div><div class='del'>-	leaves the map.</div><div class='del'>-	(e_timezone_dialog_set_cal_client): changed it so that selecting "None"</div><div class='del'>-	clears the entry.</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/comp-editor-page.[hc]: added set_cal_client() virtual</div><div class='del'>-	method since some pages need to access the CalClient to get timezone</div><div class='del'>-	information. Also added comp_editor_page_set_cal_client() to call</div><div class='del'>-	the virtual method.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_set_cal_client): called</div><div class='del'>-	comp_editor_page_set_cal_client() on each page.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: added functions to get &amp; set the timezone.</div><div class='del'>-</div><div class='del'>-2001-06-18  Eskil Heyn Olsen  &lt;eskil@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: (comp_from_remote_record),</div><div class='del'>-	(check_for_slow_setting), (conduit_get_gpilot_conduit):</div><div class='del'>-	* conduits/todo/todo-conduit.c: (check_for_slow_setting),</div><div class='del'>-	(conduit_get_gpilot_conduit):</div><div class='del'>-	Tweaked for some gnome-pilot api changes</div><div class='del'>-</div><div class='del'>-2001-06-15  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-view.[ch]: New files with the generic calendar view</div><div class='del'>-	object.  It sucks that we have to implement at least two classes</div><div class='del'>-	to define a GalView and its factory.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-view-factory.[ch]: New files; factory for calendar</div><div class='del'>-	views.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendarViewType): Moved from gnome-cal.c</div><div class='del'>-	and renamed from ViewType.  We no longer use strings to identify</div><div class='del'>-	the view types.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_view_type): New function.</div><div class='del'>-	(set_view): Renamed from gnome_calendar_set_view_internal().</div><div class='del'>-	(gnome_calendar_set_query): Made public; renamed from set_query().</div><div class='del'>-	(gnome_calendar_setup_view_menus): New function to set up the view</div><div class='del'>-	collection and the GalViewMenus.</div><div class='del'>-	(gnome_calendar_discard_view_menus): New function to discard them.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Set up the</div><div class='del'>-	GalView menus.</div><div class='del'>-	(calendar_control_deactivate): Discard the GalView menus.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: #include &lt;gtk/gtkinvisible.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.c (comp_editor_get_type): The type info</div><div class='del'>-	structure should be static.</div><div class='del'>-</div><div class='del'>-2001-06-15  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (selection_received): generate a new UID</div><div class='del'>-	when pasting</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (selection_received): ditto</div><div class='del'>-</div><div class='del'>-2001-06-15  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (selection_received): finished implementation</div><div class='del'>-	of Paste stuff</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (selection_received): ditto</div><div class='del'>-</div><div class='del'>-2001-06-14  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[ch]: added popup menu items for cut/copy/paste</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.[ch]: ditto</div><div class='del'>-</div><div class='del'>-2001-06-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-timezone-entry.[hc]: new widget to enter a timezone.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): added the above.</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): had to move</div><div class='del'>-	libcal-dialogs.a above libmiscwidgets.a to get it to compile.</div><div class='del'>-</div><div class='del'>-2001-06-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/e-timezone-dialog.[hc]: </div><div class='del'>-	* gui/dialogs/e-timezone-dialog.glade: new dialog for setting the</div><div class='del'>-	time zone.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: added timezone dialog files.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: added CalTimezoneInfo struct and seq,</div><div class='del'>-	and getBuiltinTimezoneInfo method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (impl_Cal_get_builtin_timezone_info): implemented method.</div><div class='del'>-	(cal_class_init): added method to epv.</div><div class='del'>-	</div><div class='del'>-	* cal-client/cal-client.c (struct CalClientPrivate): added</div><div class='del'>-	timezone_info array to contain cached info on builtin timezone city</div><div class='del'>-	names and coordinates.</div><div class='del'>-	(cal_client_get_builtin_timezone_info): new function to get the info</div><div class='del'>-	about builtin timezones.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: added CalTimezoneInfo struct, to contain</div><div class='del'>-	the city names and coords of the builtin timezones.</div><div class='del'>-</div><div class='del'>-2001-06-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_date_label): remove</div><div class='del'>-	unnecessary space</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_set_summary): indicate we are</div><div class='del'>-	updating, Fixes #3307</div><div class='del'>-</div><div class='del'>-2001-06-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c (task_details_page_set_dates):</div><div class='del'>-	set the completed time in the date editor if appropriate</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_set_dates): if we are</div><div class='del'>-	updating, return</div><div class='del'>-	(complete_date_changed): don't returns if we are updating - the</div><div class='del'>-	guards are done in the calling function</div><div class='del'>-	(status_changed): indicate when we are updating and when we are</div><div class='del'>-	finished, round the completion time to the nearest minute</div><div class='del'>-	(percent_complete_changed): indicate when are updating and when we</div><div class='del'>-	are finished</div><div class='del'>-	(percent_complete_changed): notify of the date change after the</div><div class='del'>-	option menu is updated</div><div class='del'>-	</div><div class='del'>-2001-06-11  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[ch]: added cut&amp;paste support, by using a GtkInvisible</div><div class='del'>-	widget to manage the clipboard selections.</div><div class='del'>-	</div><div class='del'>-	* gui/e-week-view.[ch]: ditto</div><div class='del'>-</div><div class='del'>-2001-06-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Removed the executive-summary includes.</div><div class='del'>-	(component_factory_init): Don't init the summary factory.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.[ch]: Removed.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove executive-summary stuff, move some libs </div><div class='del'>-	around a bit.</div><div class='del'>-</div><div class='del'>-2001-06-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (recurrence_page_set_dates):</div><div class='del'>-	update the blocked/selected days if the starting day of the</div><div class='del'>-	appointment changes, fixes #2188</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.h: tidy proto</div><div class='del'>-</div><div class='del'>-2001-06-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: #include &lt;bonobo/bonobo-context.h&gt; instead</div><div class='del'>-	of &lt;bonobo/bonobo-running-context.h&gt;.</div><div class='del'>-	* gui/tasks-control-factory.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): Move `$(DB3_LDADD)'</div><div class='del'>-	before libeutil.</div><div class='del'>-</div><div class='del'>-2001-06-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: no longer build widget-util.*, the code has</div><div class='del'>-	been moved</div><div class='del'>-	</div><div class='del'>-2001-06-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (make_date_edit): use new func</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-details-page.c</div><div class='del'>-	(task_details_page_create_date_edit): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c (make_ending_until_special): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.c (comp_editor_new_date_edit):</div><div class='del'>-	rename date_edit_new function</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-util.h: new proto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-page.c (task_page_set_summary): no longer any</div><div class='del'>-	need to block/unblock the handler</div><div class='del'>-	(task_page_create_date_edit): use new func</div><div class='del'>-	</div><div class='del'>-2001-06-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/.cvsignore: Update</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: Remove dead file</div><div class='del'>-</div><div class='del'>-	* gui/*.vcf: Remove dead files</div><div class='del'>-	</div><div class='del'>-2001-06-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor-page.[hc]: renamed from editor-page for</div><div class='del'>-	consistency, more complete implementation</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/comp-editor.[hc]: More complete implementation</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/*-page.*: The various pages needed to construct the</div><div class='del'>-	event and task dialogs</div><div class='del'>-	</div><div class='del'>-	* gui/dialogs/comp-editor-util.[hc]: useful utility functions for the</div><div class='del'>-	component editor pages to use</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: Build and install new files</div><div class='del'>-</div><div class='del'>-	* gui/event-editor*: Remove, obsoleted by the new comp-editor</div><div class='del'>-	stuff</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (open_task): update to use comp editor</div><div class='del'>-	stuff</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_new_task): ditto</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: don't build non-existent files nor try to</div><div class='del'>-	install them</div><div class='del'>-</div><div class='del'>-2001-06-01  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (e_itip_control_factory_init): ditto</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control-factory.c (tasks_control_factory_init):</div><div class='del'>-	auto_exit_unref the factory</div><div class='del'>-</div><div class='del'>-2001-06-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): Add `$(DB3_LDADD)'.</div><div class='del'>-</div><div class='del'>-2001-05-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_get_calendar_table): New function.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): Connect to the</div><div class='del'>-	"selection_changed" signal of the tasks widget here, not in</div><div class='del'>-	tasks_control_new().  Also, update the sensitivity of the commands</div><div class='del'>-	here for the first time.</div><div class='del'>-	(tasks_control_deactivate): Disconnect from the signal here since</div><div class='del'>-	it only makes sense to monitor selection changes while the control</div><div class='del'>-	is active.</div><div class='del'>-	(selection_changed_cb): Removed hack that tested the presence of</div><div class='del'>-	the remote UI container.</div><div class='del'>-	(sensitize_commands): New function.</div><div class='del'>-</div><div class='del'>-2001-05-28  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-layout.[hc]: </div><div class='del'>-	* gui/e-day-view-layout.[hc]: new files to contain layout code split</div><div class='del'>-	off from EDayView an EWeekView, so we can use it for printing.</div><div class='del'>-</div><div class='del'>-	* gui/print.c: rewritten to use the same layout code as the EDayView</div><div class='del'>-	and EWeekView widgets.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_task_pad_cal_client): added</div><div class='del'>-	function so we can get the CalClient used for the TaskPad for printing.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): added</div><div class='del'>-	e-day-view-layout.[hc] amd e-week-view-layout.[hc].</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_week_begin): </div><div class='del'>-	(time_week_end): added week_start_day argument.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: added comments describing problems in it.</div><div class='del'>-</div><div class='del'>-2001-05-27  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (remove_folder): implemented the</div><div class='del'>-	'remove_folder' function for the calendar shell component</div><div class='del'>-	(xfer_folder): ditto for 'xfer_folder'</div><div class='del'>-</div><div class='del'>-2001-05-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: #include</div><div class='del'>-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"</div><div class='del'>-	for e_pixmaps_update.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: Likewise.</div><div class='del'>- </div><div class='del'>-2001-05-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Reference libeshell.la instead of libeshell.a.</div><div class='del'>-</div><div class='del'>-2001-05-23  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.c: Finished porting from the old</div><div class='del'>-	event-editor.c.  Made it store a clone of the component for when</div><div class='del'>-	we need to expand the recurrence set.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_get_dates): New function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from</div><div class='del'>-	editor_page_set_dtstart(); now sets both DTSTART and DTEND.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (alarm_page_set_dates): Ahem, it is a</div><div class='del'>-	label, not an entry.</div><div class='del'>-</div><div class='del'>-2001-05-21  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #2831; the tasks toolbar and menu now have a button to</div><div class='del'>-	delete the selected tasks.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_delete_selected): New</div><div class='del'>-	function.</div><div class='del'>-	(delete_cb): Use e_calendar_table_delete_selected().</div><div class='del'>-	(e_calendar_table_get_table): New function.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_new_task_cmd): Handle the</div><div class='del'>-	delete command.</div><div class='del'>-	(selection_changed_cb): Change the sensitivity of the TasksDelete</div><div class='del'>-	command when the selection in the table changes.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (table_selection_change_cb): Notify upstream when</div><div class='del'>-	the ETable selection changes.</div><div class='del'>-</div><div class='del'>-2001-05-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fix bug #2829.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Allow the</div><div class='del'>-	caller to specify whether just one or many components are to be</div><div class='del'>-	deleted.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (tasks_popup_one): Popup menu definition</div><div class='del'>-	for when one and only one task is selected.</div><div class='del'>-	(tasks_popup_many): Likewise, for more than one task.</div><div class='del'>-	(e_calendar_table_on_right_click): Do not create a structure for</div><div class='del'>-	the closure data; we can simply pass the cal_table.  Use a</div><div class='del'>-	different menu depending on the number of selected tasks.</div><div class='del'>-	(mark_as_complete_cb): Renamed; now iterates over the selected</div><div class='del'>-	rows.</div><div class='del'>-	(delete_selected_components): New function to delete all the</div><div class='del'>-	selected components.</div><div class='del'>-	(delete_cb): Adjusted for delete_component_dialog().</div><div class='del'>-	(open_task): New function, simply open a CalComponent in the task</div><div class='del'>-	editor.</div><div class='del'>-	(open_task_by_row): Renamed; use open_task().</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Updated</div><div class='del'>-	for delete_component_dialog().</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-2001-05-16  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): removed</div><div class='del'>-	editor-page.[ch] because they've now moved dialogs.</div><div class='del'>-</div><div class='del'>-2001-05-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Split the event and task editors into different objects for the</div><div class='del'>-	separate pages; this way they can be shared by both editors.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/editor-page.[ch]: New abstract class for a page in a</div><div class='del'>-	calendar component editor.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.[ch]: Main page of an event editor.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.[ch]: Alarm page of a calendar component</div><div class='del'>-	editor.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/recurrence-page.[ch]: Recurrence page of a calendar</div><div class='del'>-	component editor.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/event-page.c (event_page_fill_widgets): Eeek, this</div><div class='del'>-	was missing a bunch of break statements.</div><div class='del'>-	(event_page_fill_component): Use a temporary variable rather than</div><div class='del'>-	allocating a struct icaltimetype.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-page.c (get_alarm_string): Do not use</div><div class='del'>-	fixed-size buffers.</div><div class='del'>-	(alarm_page_fill_widgets): Use cal_obj_uid_list_free().</div><div class='del'>-	(append_reminder): Now the list stores the plain CalComponentAlarm</div><div class='del'>-	structures in the row data.  We do *NOT* want to be frobbing the</div><div class='del'>-	component's data directly.  Rather, we clone the alarms from the</div><div class='del'>-	component and maintain them on our own.</div><div class='del'>-	(alarm_page_fill_component): Clone the alarms before adding them</div><div class='del'>-	to the component so that we maintain the invariant that the alarm</div><div class='del'>-	structures in the list did *not* come from the component.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_add_alarm): Added</div><div class='del'>-	documentation.</div><div class='del'>-	(cal_component_remove_alarm): Added documentation.</div><div class='del'>-	(cal_component_remove_alarm): Do a lookup in our hash table of</div><div class='del'>-	alarms instead of scanning the whole component.</div><div class='del'>-	(CalComponentAlarm): Removed the `parent' field, since it was</div><div class='del'>-	unused.</div><div class='del'>-	(cal_component_free_alarm_uids): Removed function, since</div><div class='del'>-	cal_component_get_alarm_uids() is documented so that the user will</div><div class='del'>-	know that he must use cal_obj_uid_list_free().</div><div class='del'>-	(cal_component_alarm_clone): New function.</div><div class='del'>-</div><div class='del'>-2001-05-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	editor-page.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-05-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (reminder_add_cb): switch on the correct</div><div class='del'>-	widget and map</div><div class='del'>-</div><div class='del'>-2001-05-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (e_itip_control_factory): unref the</div><div class='del'>-	property bag when we finish with it</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (calendar_properties_init): ditto</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (calendar_properties_init): ditto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (create_summary_view): ditto</div><div class='del'>-</div><div class='del'>-2001-05-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_free):</div><div class='del'>-	(cal_component_alarm_free): free the alarm component if it doesn't</div><div class='del'>-	have a parent, rather than if it does</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool</div><div class='del'>-	lines are shorter (fixes problem on solaries due to sed)</div><div class='del'>-</div><div class='del'>-2001-05-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.[hc]: Convert to bonobo xobject</div><div class='del'>-</div><div class='del'>-	* pcs/cal.[hc]: Convert to bonobo xobject</div><div class='del'>-</div><div class='del'>-2001-05-07  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (make_title_from_comp): conversion summary</div><div class='del'>-	from utf8 here, use translated strings as is.</div><div class='del'>-	(set_title_from_comp): reflect this, simplify.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: updated copies of above functions here.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: use defines from widgets/misc/e-filter-bar.h for</div><div class='del'>-	consistency in "Show all".</div><div class='del'>-</div><div class='del'>-2001-05-04  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_append_row): unref the</div><div class='del'>-	calcomponent when we're done with it</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_gen_uid): free the iso</div><div class='del'>-	date string when we finish with it</div><div class='del'>-</div><div class='del'>-2001-04-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c (put_property_in_list): remove hardcoded</div><div class='del'>-	values</div><div class='del'>-	(edit_attendee): ditto, and there are only 4 roles now</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-dialog.glade: tweak</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.c: There shouldn't be an "other" role</div><div class='del'>-</div><div class='del'>-2001-04-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	 * gui/e-meeting-edit.c (edit_attendee): use enums not hard code</div><div class='del'>-	 values</div><div class='del'>-	</div><div class='del'>-2001-04-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c (add_button_clicked_cb):</div><div class='del'>-	icalparameter_new_rsvp now takes an enum</div><div class='del'>-</div><div class='del'>-2001-04-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): the</div><div class='del'>-	value type should be inited with ICAL_VALUE_* rather than</div><div class='del'>-	ICAL_*_VALUE because it is a param argument.</div><div class='del'>-</div><div class='del'>-2001-04-26  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_overdue): Replace "&lt;" by "&lt;=" in</div><div class='del'>-	the comparison for due dates against the current time.  This makes</div><div class='del'>-	tasks appear immediately as red when you click Now in the due date</div><div class='del'>-	popup field.</div><div class='del'>-</div><div class='del'>-	This is not a complete solution to the more general problem of</div><div class='del'>-	tasks staying the same color even if they become overdue while the</div><div class='del'>-	task list remains the same on the screen.  This has been logged as</div><div class='del'>-	bug #2399.</div><div class='del'>-</div><div class='del'>-2001-04-26  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Remove</div><div class='del'>-	UNICODE_LIBS</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): Remove -lunicode</div><div class='del'>-</div><div class='del'>-2001-04-24  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (funny_trigger_cb): Fixed</div><div class='del'>-	Strftime so it uses the locale prefered way to display date/time. </div><div class='del'>-	("%x %X" instead of "%Y/%m/%d %H:%M:%S")</div><div class='del'>-</div><div class='del'>-2001-04-21  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c: translate "Things to do" etc. and convert them</div><div class='del'>-	to utf8. Changed some link from helixcode to ximian.</div><div class='del'>-</div><div class='del'>-2001-04-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_srcdir)/calendar/cal-client',</div><div class='del'>-	`-I$(top_builddir)/calendar/cal-client'.</div><div class='del'>-	* gui/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-query.h: #include "evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-2001-04-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (init_widgets): Connect to the "changed"</div><div class='del'>-	signal of the categories entry so that they will be applied</div><div class='del'>-	correctly.</div><div class='del'>-	(EventEditorPrivate): Added fields for the contacts button and</div><div class='del'>-	entry.</div><div class='del'>-	(init_widgets): Disable the contacts widgets as we do not support</div><div class='del'>-	them yet.</div><div class='del'>-	(get_widgets): Get the contacts widgets.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (get_widgets): Get the contacts</div><div class='del'>-	button, which was missing.</div><div class='del'>-	(init_widgets): Disable the contacts widgets as we do not support</div><div class='del'>-	them yet.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp()</div><div class='del'>-	instead of plain e_utf8_strstrcase().</div><div class='del'>-	(matches_summary): Likewise.</div><div class='del'>-</div><div class='del'>-2001-04-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_action): the</div><div class='del'>-	libical action stuff uses enums rather than strings to enumerate</div><div class='del'>-	the various actions now</div><div class='del'>-	(cal_component_alarm_get_action): ditto</div><div class='del'>-</div><div class='del'>-2001-04-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (evolution_alarm_notify_SOURCES):</div><div class='del'>-	Add `$(CORBA_GENERATED)'.</div><div class='del'>-</div><div class='del'>-2001-04-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): Add EXTRA_GNOME_CFLAGS, for gal.</div><div class='del'>-</div><div class='del'>-2001-04-15  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Create the ESearchBar thingy.</div><div class='del'>-	(search_bar_query_changed_cb): Build the different queries based</div><div class='del'>-	on the type and string.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (backend_obj_updated_cb): Ref the query while we are</div><div class='del'>-	notifying the listener so that it will not disappear from under us.</div><div class='del'>-	(backend_obj_removed_cb): Likewise.</div><div class='del'>-	(process_component_cb): Likewise.</div><div class='del'>-	(func_contains): New function to match text fields.</div><div class='del'>-	(matches_comment): New function to match comment lists.</div><div class='del'>-	(matches_description): New function to match description lists.</div><div class='del'>-	(matches_summary): New function to match summaries.</div><div class='del'>-	(matches_any): New function to match any text field.</div><div class='del'>-	(func_has_categories): New function to match categories.</div><div class='del'>-</div><div class='del'>-2001-04-14  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/notify-main.c (main): Initialize the trigger</div><div class='del'>-	and queue systems.</div><div class='del'>-</div><div class='del'>-2001-04-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_from_isodate): Fix the syntactic bogon</div><div class='del'>-	here, and attempt to fix the logical bogon too. (tm_gmtoff and</div><div class='del'>-	timezone have opposite signs... I'm assuming Federico tested the</div><div class='del'>-	Linux case, so I'm flipping the sign of the BSD case. But maybe he</div><div class='del'>-	didn't and it's supposed to be the other way...)</div><div class='del'>-</div><div class='del'>-2001-04-12  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (update_query): New function to restart a query</div><div class='del'>-	for the day view.</div><div class='del'>-	(query_obj_updated_cb): Renamed from obj_updated_cb(); updated for</div><div class='del'>-	queries instead of calendar clients.</div><div class='del'>-	(query_obj_removed_cb): Likewise.</div><div class='del'>-	(cal_opened_cb): Just update_query() instead of queueing reloading</div><div class='del'>-	all the events.</div><div class='del'>-	(e_day_view_set_cal_client): Likewise.</div><div class='del'>-	(e_day_view_set_query): Likewise.</div><div class='del'>-	(e_day_view_set_selected_time_range): Likewise.</div><div class='del'>-	(e_day_view_set_days_shown): Likewise.</div><div class='del'>-	(e_day_view_recalc_work_week): Likewise.</div><div class='del'>-	(e_day_view_queue_reload_events): Removed function now that events</div><div class='del'>-	are updated entirely by the query.</div><div class='del'>-	(e_day_view_reload_events_idle_cb): Likewise.</div><div class='del'>-	(e_day_view_reload_events): Likewise.</div><div class='del'>-	(e_day_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: Analogous changes to the ones in e-day-view.c.</div><div class='del'>-	(e_week_view_init): Use a pretty arrow instead of GDK_TOP_LEFT_ARROW.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (isodate_from_time_t): Return a g_strdup()ed</div><div class='del'>-	version of the string instead of a pointer to a static buffer.</div><div class='del'>-	(time_from_isodate): Resurrected function.  Polished up to our</div><div class='del'>-	current standards of paranoia.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (func_time_now): New function (time-now).</div><div class='del'>-	(func_make_time): New function (make-time ISODATE).</div><div class='del'>-	(func_time_add_day): New function (time-add-day TIME N).</div><div class='del'>-	(func_time_day_begin): New function (time-day-begin TIME).</div><div class='del'>-	(func_time_day_end): New function (time-day-end TIME).</div><div class='del'>-	(func_occur_in_time_range): Use time_t values instead of ints.</div><div class='del'>-	(match_component): Free the stringized component.  Free the ESexp</div><div class='del'>-	result value.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: Removed a couple of unused prototypes.</div><div class='del'>-</div><div class='del'>-	* pcs/query.c (query_destroy): Oops, disconnect from the backend.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_query): Duplicate the query reference before</div><div class='del'>-	we return it.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (pixmaps): Fixed paths to image files.</div><div class='del'>-</div><div class='del'>-2001-04-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_compute_changes):</div><div class='del'>-	prepend to both changes and change_ids when different and mark as</div><div class='del'>-	modified, not added</div><div class='del'>-</div><div class='del'>-2001-04-11  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_append_row): Fix this to</div><div class='del'>-	just send the data to the wombat instead of inserting it</div><div class='del'>-	ourselves.</div><div class='del'>-</div><div class='del'>-2001-04-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	Display fixes, thanks to Kjartan for finding these.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for</div><div class='del'>-	strings which are never in utf-8.</div><div class='del'>-	* dialogs/delete-comp.c (delete_component_dialog): convert only</div><div class='del'>-	summary from utf-8 to gtk charset. Translated values are in correct</div><div class='del'>-	craset already.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Fix headers.</div><div class='del'>-	* gui/calendar-config.c: Same here.</div><div class='del'>-	* gui/calendar-model.c: Same here.</div><div class='del'>-	* gui/e-day-view-time-item.c: Same here.</div><div class='del'>-	* gui/e-day-view-top-item.c: Same here.</div><div class='del'>-	* gui/e-day-view.c: Same here.</div><div class='del'>-	* gui/e-meeting-edit.c: Same here.</div><div class='del'>-	* gui/e-week-view-main-item.c: Same here.</div><div class='del'>-	* gui/e-week-view.c: Same here.</div><div class='del'>-	* gui/event-editor.c: Same here.</div><div class='del'>-	* gui/gnome-cal.c: Same here.</div><div class='del'>-	* gui/goto.c: Same here.</div><div class='del'>-	* gui/main.c: Same her.</div><div class='del'>-	* gui/print.c: Same here.</div><div class='del'>-</div><div class='del'>-2001-04-02  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_setup_menus): Plug leak.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (obj_updated_cb): Do nothing for now until we</div><div class='del'>-	think of something sensible to do.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (obj_updated_cb): Likewise.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Plug leak.</div><div class='del'>-</div><div class='del'>-2001-04-01  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Client-side glue for the live query engine.</div><div class='del'>-</div><div class='del'>-	* cal-client/query-listener.[ch]: New files with the</div><div class='del'>-	implementation fo the QueryListener interface.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-query.[ch]: New files with the client-side</div><div class='del'>-	convenience object for live queries.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListenerClass): Removed unused</div><div class='del'>-	slots for signal handlers.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (libcal_clientinclude_HEADERS): Now we</div><div class='del'>-	install the evolution-calendar.h header.  This sucks a bit.</div><div class='del'>-</div><div class='del'>-2001-04-01  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: use new pixmap cache. Added some menu icons</div><div class='del'>-	and changed filenames of renamed icons.</div><div class='del'>-	* gui/tasks-control.c: added icons for new task and print in menu.</div><div class='del'>-</div><div class='del'>-2001-03-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Engine for live queries to calendars.  A query object watches a</div><div class='del'>-	CalBackend in the PCS and is otherwise completely separate from</div><div class='del'>-	it; backends need to do nothing to support live queries.  Right</div><div class='del'>-	now we have the following functions:</div><div class='del'>-</div><div class='del'>-		(get-vtype)</div><div class='del'>-</div><div class='del'>-			Returns a string indicating the type of component</div><div class='del'>-			(VEVENT, VTODO, VJOURNAL, VFREEBUSY, VTIMEZONE,</div><div class='del'>-			UNKNOWN).</div><div class='del'>-</div><div class='del'>-		(occur-in-time-range? START END)</div><div class='del'>-</div><div class='del'>-			START - int, time_t start of the time range</div><div class='del'>-			END - int, time_t end of the time range</div><div class='del'>-</div><div class='del'>-			Returns a boolean indicating whether the component</div><div class='del'>-			has any occurrences in the specified time range.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal::getQuery): New method that</div><div class='del'>-	initiates a live query.</div><div class='del'>-	(Query): New interface for a handle to a live query.</div><div class='del'>-	(QueryListener): New interface for a listener to changes in a live</div><div class='del'>-	query.</div><div class='del'>-</div><div class='del'>-	* pcs/query.[ch]: New files with the live query engine.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackendClass): Added notification signals</div><div class='del'>-	so that the query system can catch them.</div><div class='del'>-	(CalBackendClass): New virtual method ::get_load_state().</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_opened):</div><div class='del'>-	(cal_backend_obj_updated):</div><div class='del'>-	(cal_backend_obj_updated): New functions to emit the notification</div><div class='del'>-	signals; to be used only by backend implementations.</div><div class='del'>-	(cal_backend_get_load_state): New function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (notify_update): Call</div><div class='del'>-	cal_backend_obj_updated().</div><div class='del'>-	(notify_remove): Call call_backend_obj_removed().</div><div class='del'>-	(open_cal): Free the icalcomp if it is not of the correct type.</div><div class='del'>-	(cal_backend_file_get_load_state): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (cal_backend_db_update_object): Call</div><div class='del'>-	cal_backend_obj_updated().</div><div class='del'>-	(cal_backend_db_remove_object): Call cal_backend_obj_removed().</div><div class='del'>-	(cal_backend_db_get_load_state): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_query): Implementation of the ::getQuery()</div><div class='del'>-	method.</div><div class='del'>-</div><div class='del'>-2001-03-27 Anna Marie Dirks &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: fixed button placement to comply</div><div class='del'>-	with gnome standards.</div><div class='del'>-</div><div class='del'>-2001-03-27 Anna Marie Dirks &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: fixed spacing and label alignment to</div><div class='del'>-	comply with gnome standards. Also removed shadows from extraneous</div><div class='del'>-	scrolled windows to avoid bevelitous. There are many more changes</div><div class='del'>-	that need to happen to this viewer, but they all require a hacker</div><div class='del'>-	to do some c-coding, so I will avoid committing them until after the</div><div class='del'>-	.10 release.</div><div class='del'>-</div><div class='del'>-2001-03-26  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c: Replace includes of &lt;gnome.h&gt;, &lt;bonobo.h&gt;</div><div class='del'>-	and &lt;gtk/gtk.h&gt; with the needed headers to speed up compile.</div><div class='del'>-	* cal-util/test-recur.c: Same here for &lt;gtk/gtk.h&gt;</div><div class='del'>-	* gui/calendar-commands.c: Replace &lt;bonobo.h&gt; and remove</div><div class='del'>-	&lt;libgnorba/gnorba.h&gt;</div><div class='del'>-	* gui/calendar-summary.c: Replace &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* gui/calendar-summary.h: Added &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-	* gui/component-factory.c: Remove &lt;bonobo.h&gt;</div><div class='del'>-	* gui/control-factory.c: Replace &lt;bonobo.h&gt;</div><div class='del'>-	* gui/e-calendar-table.c: Remove &lt;gnome.h&gt;</div><div class='del'>-	* gui/e-itip-control.c: Replace &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* gui/e-meeting-edit.c: Replace &lt;bonobo.h&gt;</div><div class='del'>-	* gui/e-tasks.c: Replace &lt;gnome.h&gt;</div><div class='del'>-	* gui/e-tasks.h: Replace &lt;bonobo.h&gt;</div><div class='del'>-	* gui/gnome-cal.h: Remove &lt;bonobo.h&gt;</div><div class='del'>-	* gui/main.c: Replace &lt;bonobo.h&gt; and &lt;glade/glade.h&gt;</div><div class='del'>-	* gui/tasks-control-factory.c: Replace &lt;bonobo.h&gt;</div><div class='del'>-	* gui/tasks-control.c: Replace &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* gui/weekday-picker.c: Add &lt;string.h&gt; and &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-	* gui/alarm-notify/client-main.c: Remove &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* gui/alarm-notify/notify-main.c: Replace &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* gui/dialogs/alarm-notify-dialog.c: Replace &lt;gnome.h&gt;</div><div class='del'>-	* pcs/cal-backend.c: Replace &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-2001-03-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): The</div><div class='del'>-	model_rows_{inserted,deleted} signals changed names; deal with it.</div><div class='del'>-	(e_calendar_table_on_rows_inserted): Updated for new ETable API.</div><div class='del'>-	(e_calendar_table_on_rows_deleted): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed unused enum.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_open): Constify.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): Removed function,</div><div class='del'>-	since it was just calling gnome_calendar_open().</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (set_prop): Replace usage of</div><div class='del'>-	calendar_set_uri() with gnome_calendar_open().</div><div class='del'>-	(load_calendar): Likewise.</div><div class='del'>-	(calendar_persist_init): Made static.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: #include "calendar-config.h"</div><div class='del'>-	(e_tasks_update_all_config_settings): We are configuring a table,</div><div class='del'>-	not a calendar!  Use the appropriate function.</div><div class='del'>-</div><div class='del'>-2001-03-17  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_event,</div><div class='del'>-	e_day_view_on_new_appointment): Simplifed this function to use the</div><div class='del'>-	shared code.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_event,</div><div class='del'>-	e_week_view_on_new_appointment): ditto.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New</div><div class='del'>-	function used to launch editor components with a time range.   A</div><div class='del'>-	bunch of functions use this code now instead of duplicating code</div><div class='del'>-	all over the place</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_new_event): Moved functionality</div><div class='del'>-	here from e_day_view_on_new_appointment.  Allows setting for "full</div><div class='del'>-	day" event.</div><div class='del'>-	(e_week_view_on_new_full_day): New function for making a full day</div><div class='del'>-	event.</div><div class='del'>-	(e_week_view_on_goto_date): Go To support.</div><div class='del'>-	(e_week_view_on_goto_today): Goto today support.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_new_event): Moved functionality</div><div class='del'>-	here from e_day_view_on_new_appointment.  Allows setting for "full</div><div class='del'>-	day" event.</div><div class='del'>-	(e_day_view_on_new_full_day): New function for making a full day</div><div class='del'>-	event.</div><div class='del'>-	(e_day_view_on_goto_date): Go To support.</div><div class='del'>-	(e_day_view_on_goto_today): Goto today support.</div><div class='del'>-</div><div class='del'>-	* main_items: Add New All Day Event;  Go to Today; Go to Date.</div><div class='del'>-</div><div class='del'>-2001-03-07  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (calendar_persist_init): New function:</div><div class='del'>-	inits the BonoboPersistFile server.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Added BonoboPropertyBag to</div><div class='del'>-	the list of supported interfaces that were supported but not</div><div class='del'>-	reported.  Add the new PersistFile.</div><div class='del'>-</div><div class='del'>-	Add text/calendar mime type attribute.</div><div class='del'>-</div><div class='del'>-2001-03-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_start_editing_event):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_start_editing_event): Update</div><div class='del'>-	arguments to e_canvas_item_grab_focus.</div><div class='del'>-</div><div class='del'>-2001-03-15  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/*.xpm: moved to ../art.</div><div class='del'>-	* gui/Makefile.am: removed *.xpm and oaf_DATA from EXTRA_DIST.</div><div class='del'>-	* gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view.c:</div><div class='del'>-	#include "art/*.xpm".</div><div class='del'>-</div><div class='del'>-2001-03-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: PISOCK_INCLUDEDIR has become</div><div class='del'>-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2001-03-08  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Specify a NULL</div><div class='del'>-	`EvolutionShellComponentGetDndSelectionFn'.</div><div class='del'>-</div><div class='del'>-2001-02-27  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize</div><div class='del'>-	the menus to have entries always in a consistent fashion, as</div><div class='del'>-	reported to the genepool mailing list.</div><div class='del'>-	(e_day_view_on_event_right_click): Added a FIXME comment to the</div><div class='del'>-	FIXME comment without a FIXME.</div><div class='del'>-</div><div class='del'>-	Now we use e_popup_menu.  This allows us to hide/show items on</div><div class='del'>-	demand, and to sensitize/de-sensitize items depending on their</div><div class='del'>-	state.</div><div class='del'>-</div><div class='del'>-	This will also let us add icon support (when we get nice icons for</div><div class='del'>-	this)</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.</div><div class='del'>-</div><div class='del'>-	The files popup-menu.c and popup-menu.h can now be removed.</div><div class='del'>-</div><div class='del'>-2001-03-05  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: keep list of all Tasks folders so we can update the</div><div class='del'>-	preference settings when necessary.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: configure the TaskPad according to the settings.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: use ECellCombo and ECellDateEdit for fields,</div><div class='del'>-	so the tasks folders is almost usable now.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: added support for the Status property.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[hc]: added convenience functions to setup</div><div class='del'>-	ECalendarTable and ECellDateEdit objects.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: connected to "destroy" signal of calendars</div><div class='del'>-	so we can remove them from all_calendars list.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):</div><div class='del'>-	call e_tasks_update_all_config_settings() to update all the settings</div><div class='del'>-	in the Tasks folders as well.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: added CAL_COMPONENT_FIELD_STATUS.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_transparency): fixed</div><div class='del'>-	calls to strcasecmp so they check for '== 0'.</div><div class='del'>-</div><div class='del'>-	Applied patch from Miguel...</div><div class='del'>-</div><div class='del'>-2001-02-27  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): Reorganize</div><div class='del'>-	the menus to have entries always in a consistent fashion, as</div><div class='del'>-	reported to the genepool mailing list.</div><div class='del'>-	(e_day_view_on_event_right_click): Added a FIXME comment to the</div><div class='del'>-	FIXME comment without a FIXME.</div><div class='del'>-</div><div class='del'>-	Now we use e_popup_menu.  This allows us to hide/show items on</div><div class='del'>-	demand, and to sensitize/de-sensitize items depending on their</div><div class='del'>-	state.</div><div class='del'>-</div><div class='del'>-	This will also let us add icon support (when we get nice icons for</div><div class='del'>-	this)</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu): Ditto.</div><div class='del'>-</div><div class='del'>-	The files popup-menu.c and popup-menu.h can now be removed.</div><div class='del'>-</div><div class='del'>-2001-03-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: update for new pilot foo</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/e-calendar.conduit.in: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: update sed script</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2001-02-28  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (recurrence_exception_select_row_cb): New</div><div class='del'>-	function to set the EDateEdit's value when a row is selected in</div><div class='del'>-	the exception date list.  Fixes bug #1638.</div><div class='del'>-	(append_exception): Set the value as well. Block/unblock signals</div><div class='del'>-	from the clist as appropriate.  Gotta love non-model/view widgets.</div><div class='del'>-	(recurrence_exception_delete_cb): Be more paranoid about the</div><div class='del'>-	contents of the list row's data.</div><div class='del'>-	(recur_to_comp_object): Likewise.</div><div class='del'>-	(fill_exception_widgets): Select the first row after we are done</div><div class='del'>-	appending the exception dates.</div><div class='del'>-</div><div class='del'>-2001-02-26  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (libalarm_a_SOURCES): Create a</div><div class='del'>-	little stand-alone library for the low-level alarm trigger</div><div class='del'>-	mechanism.  This is so that the GUI parts of the calendar can use</div><div class='del'>-	it in addition to the alarm daemon.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: #include "alarm-notify/alarm.h".</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c: Likewise.</div><div class='del'>-	(alarm_fn): Do not remove the previous alarm; it is removed</div><div class='del'>-	automatically when it is triggered.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed alarm.[ch]</div><div class='del'>-	from the sources.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.[ch]: Removed obsolete files.</div><div class='del'>-</div><div class='del'>-2001-02-23  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.c (AlarmNotify_addCalendar):</div><div class='del'>-	Switched to using our own refcounted structure for loaded clients.</div><div class='del'>-	(AlarmNotify_removeCalendar): Ditto.  Also, do the full</div><div class='del'>-	destruction of the client.</div><div class='del'>-	(alarm_notify_destroy): Destroy each element in the hash table.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_construct): Test for</div><div class='del'>-	exceptions from OAF when activating the Wombat calendar factory.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in:</div><div class='del'>-	New .oaf.in file.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/Makefile.am (oaf_in_files): Updated.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oaf.in: Put all the servers here</div><div class='del'>-	instead of in a million files.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar_Control.oaf.in: Removed file.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar_gnomecal.oaf.in: Removed *REALLY*</div><div class='del'>-	obsolete file.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (oaf_in_files): Updated.</div><div class='del'>-</div><div class='del'>-2001-02-23  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (add_history): fixed generation of history records</div><div class='del'>-</div><div class='del'>-2001-02-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (CalFactoryPrivate): Added a `registered'</div><div class='del'>-	field.</div><div class='del'>-	(cal_factory_oaf_register): New function; now the factory performs</div><div class='del'>-	its own registration with OAF.</div><div class='del'>-	(cal_factory_destroy): Unregister from OAF if appropriate.</div><div class='del'>-</div><div class='del'>-2001-02-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Remove PISOCK_LIBDIR</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2001-02-16  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/calbackend-db.c (cal_backend_db_destroy): close DB environment.</div><div class='del'>-	Some compilation warnings removed</div><div class='del'>-</div><div class='del'>-2001-02-13  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): Added libmenus.la.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c, gui/e-calendar-table.h</div><div class='del'>-	(e_calendar_table_get_spec): Added this function.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c, gui/e-tasks.h (e_tasks_setup_menus): Added this</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_activate): Call</div><div class='del'>-	e_tasks_setup_menus.</div><div class='del'>-</div><div class='del'>-2001-02-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_new_task): call task_editor_focus</div><div class='del'>-</div><div class='del'>-2001-02-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new</div><div class='del'>-	appointment icon</div><div class='del'>-	(set_pixmap): load files rather than create from xpm file</div><div class='del'>-</div><div class='del'>-	* gui/*view.xpm: move to the art directory</div><div class='del'>-</div><div class='del'>-2001-02-13  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c (cal_backend_db_get_alarms_for_object):</div><div class='del'>-	implemented</div><div class='del'>-</div><div class='del'>-2001-02-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (update_pixmaps): Set toolbar new command</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Add titles to pixbuf column for grouping</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_class_init): override value</div><div class='del'>-	to string virtual method</div><div class='del'>-	(calendar_model_value_to_string): implement value to string for</div><div class='del'>-	etable (necessary for group by)</div><div class='del'>-</div><div class='del'>-2001-02-12  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c:</div><div class='del'>-	cal_backend_db_update_object(): manage both updates and additions/add notification</div><div class='del'>-	cal_backend_db_get_object(): don't use DB cursors</div><div class='del'>-	cal_backend_db_get_type_by_uid(): don't use DB cursors</div><div class='del'>-	cal_backend_db_remove_object(): don't use DB cursors/add notification</div><div class='del'>-	cal_backend_db_get_alarms_in_range(): implemented</div><div class='del'>-</div><div class='del'>-2001-02-12  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Hook up the xml-i18n-tools + .oaf.in stuff.</div><div class='del'>-	* gui/GNOME_Evolution_Calendar*.oaf.in: Marked strings for translation.</div><div class='del'>-</div><div class='del'>-2001-02-11  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-db.c: added DB3 transactions support</div><div class='del'>-	* pcs/cal-backend-db.[ch]: added the new DB3-based backend. This is just</div><div class='del'>-	the beginning, there are some missing things still.</div><div class='del'>-</div><div class='del'>-2001-02-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	Really use xml-i18n-tools.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/e-calendar-conduit-control-applet.desktop,</div><div class='del'>-	conduits/todo/e-todo-conduit-control-applet.desktop: removed.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/e-calendar-conduit-control-applet.desktop.in,</div><div class='del'>-	conduits/todo/e-todo-conduit-control-applet.desktop.in: added empty.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am, conduits/todo/Makefile.am:</div><div class='del'>-	reflect above changes, merge translations.</div><div class='del'>-</div><div class='del'>-	* gui/*.glade.h, gui/dialogs/*.glade.h: removed, xml-i18n-extract</div><div class='del'>-	takes care of strings itself.</div><div class='del'>-</div><div class='del'>-	* gui/*.glade, gui/dialogs/*.glade: do not output_translatable_strings</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am, gui/dialogs/Makefile.am: do not include removed</div><div class='del'>-	files in EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2001-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: Oops, remove old widget</div><div class='del'>-</div><div class='del'>-2001-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (fill_widgets): fill in new</div><div class='del'>-	classification stuff properly</div><div class='del'>-	(get_widgets): load new class. widgets</div><div class='del'>-	(init_widgets): if the class. widgets change, mark the dialog</div><div class='del'>-	dirty</div><div class='del'>-	(dialog_to_comp_object): set the comp class. from the new widgets</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: Make more consistent,</div><div class='del'>-	fixing bugs 1247 and 1249</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (fill_widgets):</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Gui tidying</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Remove old alarm cruft</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_url): Don't try and</div><div class='del'>-	write an empty string as a property</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2001-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: Move the get_change code here</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: Remove get_changes related stuff and</div><div class='del'>-	implement by calling the virtual method instead</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: New virtual method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (compute_alarm_range): Use</div><div class='del'>-	icaldurationtype_as_int (replace _as_timet)</div><div class='del'>-	(add_alarm_occurrences_cb): ditto</div><div class='del'>-</div><div class='del'>-2001-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (compute_alarm_range): Use</div><div class='del'>-	icaldurationtype_as_int (replace _as_timet)</div><div class='del'>-	(add_alarm_occurrences_cb): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_schedule_meet): new routine to</div><div class='del'>-	throw up the meeting schedule dialog</div><div class='del'>-	(e_week_view_show_popup_menu): add schedule meeting to the</div><div class='del'>-	contextual menu where appropriate</div><div class='del'>-</div><div class='del'>-2001-02-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Remove assorted menu/bonobo stuff</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: Remove assorted menu/bonobo stuff</div><div class='del'>-	(task_editor_construct): no longer suck out the glade contents</div><div class='del'>-	into a bonobo win, listen for apply and close signals</div><div class='del'>-	(tedit_apply_event_cb): listen for apply signal and save object</div><div class='del'>-	(tedit_close_event_cb): listen for close signal and prompt to save</div><div class='del'>-	if need be</div><div class='del'>-	(task_editor_focus): new function to bring the dialog to the front</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.h: new prototype</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c (schedule_button_clicked_cb): no need to</div><div class='del'>-	update widgets in the event editor since the event editor won't be</div><div class='del'>-	open</div><div class='del'>-	(e_meeting_editor_new): don't need the event editor reference any</div><div class='del'>-	more</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.h: Change prototype</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): Make</div><div class='del'>-	schedule meeting a new contextual menu item</div><div class='del'>-	(e_day_view_on_schedule_meet): new routine to schedule a meeting</div><div class='del'>-	from the contextual menu</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_open_task): Call</div><div class='del'>-	task_editor_focus</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Update to be a property box</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: Update to be a property</div><div class='del'>-	box</div><div class='del'>-</div><div class='del'>-2001-02-07  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (create_summary_view): Add a setter to the</div><div class='del'>-	property bag.</div><div class='del'>-	(set_property): The setter.</div><div class='del'>-	(generate_html_summary): Sort the UIDs accodring to time.</div><div class='del'>-</div><div class='del'>-2001-02-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (fill_reminder_widgets): Match new</div><div class='del'>-	append_alarm signature</div><div class='del'>-	(reminder_to_comp_object): only add alarms tagged as new, no</div><div class='del'>-	longer delete all alarms first</div><div class='del'>-	(append_reminder): the row data is now of type ReminderData,</div><div class='del'>-	rename from append_alarm</div><div class='del'>-	(reminder_add_cb): math new append_alarm signature</div><div class='del'>-	(reminder_delete_cb): if the alarm existed before the dialog was</div><div class='del'>-	loaded, delete it immediately from the cal component</div><div class='del'>-</div><div class='del'>-2001-02-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: ditto</div><div class='del'>-</div><div class='del'>-2001-02-07  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Fix spacing</div><div class='del'>-</div><div class='del'>-2001-02-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: ditto</div><div class='del'>-</div><div class='del'>-2001-02-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more</div><div class='del'>-	consistent</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: ditto</div><div class='del'>-</div><div class='del'>-2001-02-06  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_categories): If the</div><div class='del'>-	categories string is empty, remove the property</div><div class='del'>-	(get_period_list): Fixes from clahey to handle the new rdate</div><div class='del'>-	format in libical</div><div class='del'>-	(set_period_list): ditto</div><div class='del'>-</div><div class='del'>-2001-02-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set</div><div class='del'>-	the time and duration values in the trigger to null by default</div><div class='del'>-	(cal_component_free_alarm_uids): properly free the list of alarm</div><div class='del'>-	uids</div><div class='del'>-</div><div class='del'>-2001-02-05  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (get_widgets): get the new reminder widgets</div><div class='del'>-	(sync_entries): different callback data</div><div class='del'>-	(summary_changed_cb): take different data and handle various cases</div><div class='del'>-	(init_widgets): connect signals for the new widgets</div><div class='del'>-	(get_alarm_duration_string): give a text string of the alarm</div><div class='del'>-	duration</div><div class='del'>-	(get_alarm_string): give a string representing the alarm</div><div class='del'>-	(fill_widgets): make sure we don't loop infinitely and remove old</div><div class='del'>-	alarm cruft</div><div class='del'>-	(reminder_to_comp_object): dump alarm info in the gui into the cal</div><div class='del'>-	component</div><div class='del'>-	(append_alarm): add alarm to the clist</div><div class='del'>-	(reminder_add_cb): create new alarm</div><div class='del'>-	(reminder_delete_cb): remove the alarm from the list</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Update gui</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: include gnome.h for all the menu stuff</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c: for internationalization</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c: include gnome.h</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for</div><div class='del'>-	libical changes</div><div class='del'>-</div><div class='del'>-2001-02-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Fixed up these #includes.</div><div class='del'>-</div><div class='del'>-2001-02-03  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/save-comp.c (save_component_dialog):</div><div class='del'>-	gnome_dialog_grab_focus() on the Yes button.  Fixes bug #1242.</div><div class='del'>-</div><div class='del'>-2001-01-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Mark a string for translation.</div><div class='del'>-	* gui/e-itip-control.c: Mark a bunch of strings for translation.</div><div class='del'>-</div><div class='del'>-2001-01-30  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: #include &lt;sys/time.h&gt;.</div><div class='del'>-</div><div class='del'>-2001-01-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: &lt;gnome.h&gt; trimming to reduce compilation</div><div class='del'>-	time.</div><div class='del'>-	* gui/calendar-summary.c: Likewise.</div><div class='del'>-	* gui/e-calendar-table.c: Likewise.</div><div class='del'>-	* gui/e-day-view-time-item.c: Likewise.</div><div class='del'>-	* gui/e-day-view.c: Likewise.</div><div class='del'>-	* gui/e-itip-control.c: Likewise.</div><div class='del'>-	* gui/e-meeting-edit.c: Likewise.</div><div class='del'>-	* gui/e-meeting-edit.h: Likewise.</div><div class='del'>-	* gui/e-tasks.c: Likewise.</div><div class='del'>-	* gui/e-week-view.c: Likewise.</div><div class='del'>-	* gui/event-editor.c: Likewise.</div><div class='del'>-	* gui/gnome-cal.c: Likewise.</div><div class='del'>-	* gui/goto.c: Likewise.</div><div class='del'>-	* gui/itip-utils.h: Likewise.</div><div class='del'>-	* gui/main.c: Likewise.</div><div class='del'>-	* gui/popup-menu.c: Likewise.</div><div class='del'>-	* gui/print.c: Likewise.</div><div class='del'>-	* gui/tasks-control-factory.c: Likewise.</div><div class='del'>-	* gui/tasks-control.c: Likewise.</div><div class='del'>-	* gui/tasks-migrate.c: Likewise.</div><div class='del'>-</div><div class='del'>-2001-01-25  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c: &lt;gnome.h&gt; trimming to reduce compilation time.</div><div class='del'>-	* gui/dialogs/task-editor.c: Ditto.</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c: Ditto.</div><div class='del'>-	* gui/dialogs/save-comp.c: Ditto.</div><div class='del'>-	* gui/dialogs/delete-comp.c: Ditto.</div><div class='del'>-	* gui/calendar-commands.c: Ditto.</div><div class='del'>-	* gui/calendar-model.c: Ditto.</div><div class='del'>-</div><div class='del'>-2001-01-26  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (itip_control_destroy_cb): Don't attempt to</div><div class='del'>-	call `icalcomponent_remove_component()' on a NULL component or a</div><div class='del'>-	NULL subcomponent.</div><div class='del'>-</div><div class='del'>-2001-01-25  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c: don't tag the calendar if no dates are shown.</div><div class='del'>-	(e_calendar_item_get_date_range() now returns FALSE in this case.)</div><div class='del'>-</div><div class='del'>-2001-01-23  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (ensure_task_complete): make sure the status</div><div class='del'>-	is set to "Completed". Fixes bug #1253.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (e_tasks_open): load the ETable state after opening</div><div class='del'>-	the tasks folder, since it relies on the folder uri, which isn't set</div><div class='del'>-	now until you open the folder.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): add the categories from the</div><div class='del'>-	updated object to our tree, and emit the "categories-changed" signal</div><div class='del'>-	if they have changed. Fixes bug #1255.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: removed debug messages.</div><div class='del'>-</div><div class='del'>-2001-01-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	*  libical import cleanup</div><div class='del'>-</div><div class='del'>-2001-01-23  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): properly ref</div><div class='del'>-	the cal component when we use it, prevents double free</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): ditto</div><div class='del'>-</div><div class='del'>-2001-01-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: compile new stuff</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (prompt_to_save_changes): use new</div><div class='del'>-	standard dialog</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (prompt_to_save_changes): ditto</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/save-comp.h: new header</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/save-comp.c (save_component_dialog): shows the save</div><div class='del'>-	dialog</div><div class='del'>-</div><div class='del'>-2001-01-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate</div><div class='del'>-	message</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Remove vfs lib dependency</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now</div><div class='del'>-	(for_each_modified): remove duplicate message</div><div class='del'>-</div><div class='del'>-2001-01-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (delete_record): Remove</div><div class='del'>-	deleted records from the pilot map so we don't have dupes in the future</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (delete_record): ditto</div><div class='del'>-</div><div class='del'>-2001-01-21  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (file_delete_cb): Fix bug #1250; now</div><div class='del'>-	we present a confirmation dialog before deleting the component.</div><div class='del'>-</div><div class='del'>-2001-01-20  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Fix bug #1243.  Turn on the Y</div><div class='del'>-	expand/fill options for the date widgets in the General page.</div><div class='del'>-	This makes them be vertically aligned with the "All day event"</div><div class='del'>-	toggle so that they will get the focus in the proper order; the</div><div class='del'>-	toggle would get the focus before them because it was a pixel or</div><div class='del'>-	two above them.</div><div class='del'>-</div><div class='del'>-2001-01-19  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.c (weekday_picker_init): Unset the</div><div class='del'>-	GTK_CAN_FOCUS flag on the weekday picker.  This will do until it</div><div class='del'>-	supports being used with the keyboard.</div><div class='del'>-</div><div class='del'>-2001-01-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_new): create a new</div><div class='del'>-	cal component alarm</div><div class='del'>-	(cal_component_add_alarm): add alarm to the cal component</div><div class='del'>-	(cal_component_remove_alarm): remove alarm from the cal component</div><div class='del'>-	(remove_alarm): remove alarm from hash</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: new protos</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):</div><div class='del'>-	add alarm information, still needs to be hacked to replace an already</div><div class='del'>-	existing alarm.  questions abound about the heuristic for doing this.</div><div class='del'>-</div><div class='del'>-2001-01-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Properly set categories</div><div class='del'>-	to NULL if there are none</div><div class='del'>-</div><div class='del'>-2001-01-18  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/tasks-migrate.[ch]: New files with a simple sequence to</div><div class='del'>-	migrate the task components from the old calendar folder into the</div><div class='del'>-	new tasks folder.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Call tasks_migrate()</div><div class='del'>-	once evolution_dir is set.  It sucks to have to do this here.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uids): In the inline</div><div class='del'>-	docs, indicate how to free the return value.</div><div class='del'>-	(cal_opened_cb): Ahem, moved assertion to the right place.  Also,</div><div class='del'>-	ref() and unref() around our own signal emission because we are</div><div class='del'>-	not inside a signal handler, rather a simple callback from the</div><div class='del'>-	listener object; we want to have a chance to clean up even if the</div><div class='del'>-	client is unrefed during the emission.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	tasks-migrate.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (init_widgets): Use</div><div class='del'>-	e_calendar_item_set_max_days_sel() instead of setting GTK+ object</div><div class='del'>-	arguments.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_cal_client): Oops, we had a</div><div class='del'>-	reversed test for the client being loaded.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (tag_calendar_by_client): Fixed similarly</div><div class='del'>-	reversed test.</div><div class='del'>-</div><div class='del'>-2001-01-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view*.c</div><div class='del'>-	* gui/e-day-view*.c: don't use the theme colors at all within</div><div class='del'>-	the graphical parts of the widgets, since they may clash with</div><div class='del'>-	our colors. May make them configurable in future so people can tweak</div><div class='del'>-	them to go with their theme. At least the calendars are usable in any</div><div class='del'>-	theme now, even though the colors may not go well with the theme.</div><div class='del'>-	Also set the font of all the EText items in style_set.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't</div><div class='del'>-	draw the icons if we are editing the event.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: reinstated the optimizations so we don't do a</div><div class='del'>-	complete relayout if the event's dates haven't been changed.</div><div class='del'>-	(Though we still do a re-layout when recurring events change, since</div><div class='del'>-	comparing all the RDATES/RRULES/EXDATES/EXRULES is too much hassle.)</div><div class='del'>-	A side-effect of this change is that the EWeekView won't crash so</div><div class='del'>-	often - only recurring events will be a problem.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[hc]: added function to check if the start</div><div class='del'>-	and end dates of a component match. Used for optimizing the updating</div><div class='del'>-	of the EDayView &amp; EWeekView.</div><div class='del'>-</div><div class='del'>-2001-01-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check</div><div class='del'>-	for open error and handled</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto</div><div class='del'>-</div><div class='del'>-2001-01-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (start_calendar_server): Check</div><div class='del'>-	for open error and handled</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_compute_changes): Fix transposition</div><div class='del'>-	of sync db location</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* */*: Ximianified email addresses and copyrights.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalFactory::open): Renamed from</div><div class='del'>-	::load(), and added an only_if_exists argument.</div><div class='del'>-	(CalFactory::create): Removed method.</div><div class='del'>-	(Listener::OpenStatus): Removed the IN_USE error and replaced it</div><div class='del'>-	with a NOT_FOUND one; renamed the enum from LoadStatus.</div><div class='del'>-	(Listener::notifyCalOpened): Renamed from notifyCalLoaded().</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackend): Removed the uri field.</div><div class='del'>-	(CalBackendOpenStatus): Renamed from CalBackendLoadStatus and</div><div class='del'>-	added a NOT_FOUND value.</div><div class='del'>-	(CalBackendClass::open): Put in a slot for the open method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_create): Removed function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_open): Return the</div><div class='del'>-	appropriate value when only_if_exists is TRUE.</div><div class='del'>-	(create_cal): We are Ximian now, so set the PRODID property to</div><div class='del'>-	the appropriate foo.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (CalFactory_open): implemented, replacing</div><div class='del'>-	CalFactory_load() and CalFactory_create().</div><div class='del'>-	(CalFactory_open): Moved the queue_load_create_job() stuff to</div><div class='del'>-	here, since we now only need to contemplate the open case instead</div><div class='del'>-	of load/create ones.</div><div class='del'>-	(open_backend): Do everything here; replaces load_backend() and</div><div class='del'>-	create_backend().</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListenerClass::cal_opened):</div><div class='del'>-	Renamed from cal_loaded.</div><div class='del'>-	(CalListenerClass): Replaced the silly signals, which are</div><div class='del'>-	gratuitous abstraction, by a set of function pointers in the</div><div class='del'>-	instance structure.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (cal_listener_get_calendar): Removed</div><div class='del'>-	unused function.</div><div class='del'>-	(cal_listener_construct): Added the listener notification functions.</div><div class='del'>-	(cal_listener_new): Ditto.</div><div class='del'>-	(Listener_notifyCalOpened): Renamed to our new naming convention</div><div class='del'>-	for servant implementations.</div><div class='del'>-	(Listener_notifyObjUpdated): Ditto.</div><div class='del'>-	(Listener_notifyObjRemoved): Ditto.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClientOpenStatus): Renamed from</div><div class='del'>-	CalClientLoadStatus.</div><div class='del'>-	(CalClientClass::cal_opened): Renamed from ::cal_loaded().</div><div class='del'>-	(CalClientLoadState): New enum; basically make LoadState public so</div><div class='del'>-	that users of this code do not have to maintain their own states.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_create_calendar): Removed</div><div class='del'>-	function.</div><div class='del'>-	(cal_client_open_calendar): Moved the functionality over from</div><div class='del'>-	load_or_create(); now we do everything here.</div><div class='del'>-	(*): Use the CalClientLoadState enum values instead of the old</div><div class='del'>-	LoadState values.</div><div class='del'>-	(cal_client_get_load_state): Renamed from cal_client_is_loaded(),</div><div class='del'>-	and return the appropriate value.</div><div class='del'>-	(CalClientPrivate): Added an uri field.</div><div class='del'>-	(cal_client_init): Initialize priv-&gt;uri.</div><div class='del'>-	(cal_client_destroy): Free the priv-&gt;uri.</div><div class='del'>-	(cal_opened_cb): Maintain the priv-&gt;uri.</div><div class='del'>-	(cal_client_open_calendar): Fill in the priv-&gt;uri.</div><div class='del'>-	(cal_client_get_uri): New function.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_set_new_comp_vtype): New</div><div class='del'>-	function to configure the type of calendar components to create</div><div class='del'>-	when doing click-to-add.  This makes the model usable for</div><div class='del'>-	something other than task lists.</div><div class='del'>-	(calendar_model_get_new_comp_vtype): New function.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_get_model): New function.</div><div class='del'>-	(e_calendar_table_destroy): Unref the subset_model.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendarOpenMode): Removed enum.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (LoadState): Removed enum; we now use the</div><div class='del'>-	CalClientLoadState from the client objects.</div><div class='del'>-	(GnomeCalendarPrivate): Removed the loading_uri and</div><div class='del'>-	task_pad_loading_uri fields as well as the load_state and</div><div class='del'>-	task_pad_load_state fields, as we can now query them directly from</div><div class='del'>-	the CalClient.</div><div class='del'>-	(open_error): Renamed from load_error().</div><div class='del'>-	(create_error): Removed function.</div><div class='del'>-	(gnome_calendar_open): Do not take in the mode parameter.</div><div class='del'>-	(cal_opened_cb): Get rid of our beautifully-crafted state machine</div><div class='del'>-	and replace it with simple code; all the loading smarts are in the</div><div class='del'>-	Wombat now.</div><div class='del'>-	(setup_widgets): Set the new component vtype of the table model to</div><div class='del'>-	CAL_COMPONENT_TODO.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed</div><div class='del'>-	gnome-month-item.[ch] from the list of sources.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (CalSummary): Removed unused cal_loaded</div><div class='del'>-	field.</div><div class='del'>-	(create_summary_view): Do not check if the file exists; this is</div><div class='del'>-	the job of the Wombat.</div><div class='del'>-	(generate_html_summary): Fixed prototype.</div><div class='del'>-	(alarm_fn): Fixed prototype.</div><div class='del'>-	(property_dialog): Fixed prototype.  Wonder if/how this ever</div><div class='del'>-	worked.</div><div class='del'>-	(create_summary_view): Cast the component and view as</div><div class='del'>-	appropriate.  Removed unused html variable.</div><div class='del'>-</div><div class='del'>-	[Iain dude, are you compiling with -Wall?]</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (cal_opened_cb): Sigh, this function</div><div class='del'>-	signature was *very* wrong.  It was using CalClientGetStatus</div><div class='del'>-	instead of CalClientOpenStatus.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.h (ETasksOpenMode): Removed enum.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c (setup_widgets): Set the new component vtype of</div><div class='del'>-	the table model to CAL_COMPONENT_TODO.</div><div class='del'>-	(LoadState): Removed the state machine foo.</div><div class='del'>-	(e_tasks_open): Removed the mode parameter.</div><div class='del'>-	(initial_load): Removed function.</div><div class='del'>-	(create_error): Removed function.</div><div class='del'>-	(ETasksPrivate): Removed folder_uri field.</div><div class='del'>-	(cal_opened_cb): Remove the state machine.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: #include "tasks-control.h"</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h (ECalConduitContext):</div><div class='del'>-	Removed calendar_load_tried field.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (start_calendar_server_cb):</div><div class='del'>-	Sigh, fixed function prototype.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h (EToDoConduitContext): Removed</div><div class='del'>-	calendar_load_tried field.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (start_calendar_server_cb): Fixed</div><div class='del'>-	function prototype.</div><div class='del'>-</div><div class='del'>-2001-01-16  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (print_local): fix debug output</div><div class='del'>-	(print_remote): ditto</div><div class='del'>-</div><div class='del'>-2001-01-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_compute_changes): accomadate tasks</div><div class='del'>-	in their new dir</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (start_calendar_server): ditto</div><div class='del'>-</div><div class='del'>-2001-01-15  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (print_local): prevent segfaults and</div><div class='del'>-	buffer overflows.</div><div class='del'>-	(print_remote): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: as above</div><div class='del'>-</div><div class='del'>-2001-01-14  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): changed the expansion</div><div class='del'>-	values so that small text fields are 1.0, all the date fields and the</div><div class='del'>-	URL field are 2.0, and the Summary is 3.0. Hopefully the user will</div><div class='del'>-	resize the fields as desired, but at least this is a better start.</div><div class='del'>-</div><div class='del'>-2001-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: pass -module and -avoid-version to</div><div class='del'>-	conduit linker</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2001-01-14  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.[hc]: moved #include</div><div class='del'>-	&lt;cal-client/cal-client.h&gt; to the .h file.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.c: load &amp; save the Tasks folders' ETable layout.</div><div class='del'>-	Added an option menu to filter tasks by category.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: use the "Tasks" folder for the TaskPad.</div><div class='del'>-	(We may make the actual tasks folder shown a per-calendar option.)</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.c (tasks_control_new_task_cmd): added support for</div><div class='del'>-	the New Task icon on the toolbar.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[hc]: we now use an ETableSubsetVariable model</div><div class='del'>-	to filter the tasks by a category. And tidied up a little.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.[hc]: added way to get all the categories used by</div><div class='del'>-	the tasks, so we can show an option menu of them. Also a signal which</div><div class='del'>-	is emitted when they are changed.</div><div class='del'>-	Also allows a default category to be set, which is used to initialize</div><div class='del'>-	the 'click-to-add' row.</div><div class='del'>-	Also made sure the initialize_value()/get_value() functions don't</div><div class='del'>-	return NULL since that can cause a SEGV.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: set the "fill_color_rgba" arg of the EText items</div><div class='del'>-	to black since it doesn't seem to set up a default color properly.</div><div class='del'>-	Hopefully this fixes the bug on Solaris where the items appear with</div><div class='del'>-	strange colors.</div><div class='del'>-</div><div class='del'>-	* gui/widget-util.c (date_edit_new): use the calendar_config function</div><div class='del'>-	to set most of the options. It wasn't setting the 12/24 hour option</div><div class='del'>-	before.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: added "Undefined" priority.</div><div class='del'>-</div><div class='del'>-2001-01-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Pass NULL as the</div><div class='del'>-	@copy_folder_fn arg to `evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-2001-01-12  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Add translation strings.</div><div class='del'>-</div><div class='del'>-2001-01-08  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (create_summary_view): Add a PropertyControl</div><div class='del'>-	interface to set whether or not to show tasks and appointments. Add</div><div class='del'>-	a PersistStream to remember this.</div><div class='del'>-</div><div class='del'>-2001-01-09  Dave Camp  &lt;dave@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Replaced e-meet-dialog.glade.h with</div><div class='del'>-	e-meeting-dialog.glade in glade_messages.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-dialog.glade: Enabled the translatable string option.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: Likewise.</div><div class='del'>-</div><div class='del'>-2001-01-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (AlarmNotify): New interface for the</div><div class='del'>-	alarm notification system.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify: New directory for the alarm notification</div><div class='del'>-	daemon and its auxiliary stuff.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm.[ch]: Moved over from gui/alarm.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-queue.[ch]: Moved over from</div><div class='del'>-	gui/alarm-notify.[ch].  Renamed functions from alarm_notify_*() to</div><div class='del'>-	alarm_queue_*().</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify/alarm-notify.[ch]: Implementation of the</div><div class='del'>-	GNOME::Evolution::Calendar::AlarmNotify interface.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_LDADD): Removed the</div><div class='del'>-	LINK_FLAGS variable and reordered the libraries to remove some</div><div class='del'>-	duplicated ones.</div><div class='del'>-	(SUBDIRS): Added the alarm-notify directory.</div><div class='del'>-</div><div class='del'>-2001-01-08  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (generate_html_summary): Get the tasks</div><div class='del'>-	correctly.</div><div class='del'>-	(generate_html_summary): Mark the tasks as completed if so.</div><div class='del'>-</div><div class='del'>-2001-01-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added new source files for the Tasks folders.</div><div class='del'>-</div><div class='del'>-	* gui/e-tasks.[hc]: new widget to encapsulate the Tasks view.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control.[hc]: new files to implement the Tasks control.</div><div class='del'>-</div><div class='del'>-	* gui/tasks-control-factory.[hc]: new files to implement the factory</div><div class='del'>-	for the Tasks controls. (I think the way I've split the code up is a</div><div class='del'>-	lot cleaner than the GnomeCal implementation - the factory file just</div><div class='del'>-	contains the factory functions and the control file contains all the</div><div class='del'>-	control functions. Maybe we should make GnomeCal like this.)</div><div class='del'>-</div><div class='del'>-	* gui/main.c: initialize the Tasks control factory.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: added support for the Tasks control.</div><div class='del'>-	Also added a "create_folder" function so we can now create new Tasks</div><div class='del'>-	and Calendar folders within Evolution.</div><div class='del'>-	I'm not a Bonobo expert so someone might want to check these over.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[hc]: added convenience functions to configure</div><div class='del'>-	the common settings of ECalendar and EDateEdit widgets.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_create_date_edit):</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_update_config_settings):</div><div class='del'>-	* gui/event-editor.c: used function to configure the ECalendars</div><div class='del'>-	and EDateEdits.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	fixed minor bug in format strings.</div><div class='del'>-</div><div class='del'>-2001-01-06  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (generate_html_summary): Neaten the HTML,</div><div class='del'>-	and fix the time printing stuff. Add stuff the get Tasks.</div><div class='del'>-	(alarm_fn): Set up an alarm for midnight everynight and regenerate</div><div class='del'>-	the HTML for the new day.</div><div class='del'>-</div><div class='del'>-2001-01-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (get_widgets): get categories button</div><div class='del'>-	(init_widgets): listen for button click</div><div class='del'>-	(fill_widgets): fill in the categories area</div><div class='del'>-	(dialog_to_comp_object): set the cal component categories</div><div class='del'>-	(categories_clicked): throw up the categories dialog and update</div><div class='del'>-	when ok is clicked</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Add categories and contacts buttons</div><div class='del'>-	and fields</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: Rename button</div><div class='del'>-</div><div class='del'>-2001-01-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (get_widgets): get categories button</div><div class='del'>-	(init_widgets): listen for button click</div><div class='del'>-	(fill_widgets): fill in the categories area</div><div class='del'>-	(dialog_to_comp_object): set the cal component categories</div><div class='del'>-	(categories_clicked): throw up the categories dialog and update</div><div class='del'>-	when ok is clicked</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: Tweak to name the categories</div><div class='del'>-	button and make it active</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_categories): We can get the string list of</div><div class='del'>-	categories directly now</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_categories): new function</div><div class='del'>-	to get the categories list as a string</div><div class='del'>-	(cal_component_set_categories): same but for setting</div><div class='del'>-	(free_icalcomponent): init the categories var</div><div class='del'>-	(scan_categories): kill</div><div class='del'>-	(scan_property): assign the prop to the categories var</div><div class='del'>-	(cal_component_get_categories_list): deal with renaming var to categories</div><div class='del'>-	(cal_component_set_categories_list): fix brokeness</div><div class='del'>-</div><div class='del'>-2001-01-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_calendar): Handle the case where</div><div class='del'>-	the calendar view cannot be created; present a warning dialog box.</div><div class='del'>-	(new_calendar): Do not show the widget here, since we already show</div><div class='del'>-	it in control-factory.c.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (control_factory_new_control): Handle the</div><div class='del'>-	case where the calendar view cannot be created.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_view): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.h: Added prototype for</div><div class='del'>-	calendar_summary_factory_init().</div><div class='del'>-</div><div class='del'>-2001-01-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify.c (add_component_alarms): If the component has</div><div class='del'>-	no alarms, do not try to queue them.</div><div class='del'>-	(remove_client_alarms): New function to remove all the queued</div><div class='del'>-	alarms for a calendar client.</div><div class='del'>-	(alarm_notify_remove_client): Remove the client's alarms.</div><div class='del'>-</div><div class='del'>-2001-01-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Do not</div><div class='del'>-	compose strings so that they can be localized correctly.  Also,</div><div class='del'>-	convert from UTF8 into the font's encoding.  Fixes bug #1030.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (delete_component): Pass the widget</div><div class='del'>-	argument to delete_component_dialog().</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Use BONOBO_UI_VERB() instead of</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB().  Guess what, all of our handler</div><div class='del'>-	signatures were wrong.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade: Added some spacing between the month/year</div><div class='del'>-	widgets and the calendar widget.</div><div class='del'>-</div><div class='del'>-2001-01-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_destroy): Unconditionally remove</div><div class='del'>-	the client from the alarm notification system.</div><div class='del'>-	Removed all the obsolete alarm code.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Removed some crufty externs left over from</div><div class='del'>-	Gnomecal.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: #include "goto.h"</div><div class='del'>-	Removed crufty variables left over from Gnomecal.</div><div class='del'>-	(new_calendar): Do not take a full_name parameter.</div><div class='del'>-	(init_username): Removed function.</div><div class='del'>-	(init_calendar): Wheeeeeeee!  Removed crufty function.</div><div class='del'>-	(quit_cmd): Removed function.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (WEEK_STARTS_ON_MONDAY): Made it unconditionally</div><div class='del'>-	FALSE because we do not use the configuration setting anyways.</div><div class='del'>-	Sigh, all the printing code needs to be revamped.</div><div class='del'>-</div><div class='del'>-2000-12-26  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c (create_summary_view): Create a shared</div><div class='del'>-	BonoboEventSource object.</div><div class='del'>-</div><div class='del'>-2000-12-25  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_init): Set draw background to FALSE.</div><div class='del'>-	(e_day_view_reshape_long_event): ditto.</div><div class='del'>-	(e_day_view_reshape_day_event): ditto.</div><div class='del'>-</div><div class='del'>-2000-12-22  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.c (delete_component_dialog): Clean up</div><div class='del'>-	translatable strings for translators, fixes bug 993</div><div class='del'>-</div><div class='del'>-2000-12-22  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/goto.c (create_ecal): Make sure the current month is shown</div><div class='del'>-	when the dialog pops up.</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade: Remove flicker</div><div class='del'>-</div><div class='del'>-2000-12-22  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_alarms_for_object):</div><div class='del'>-	account for the case where there are no alarms, fixes crash</div><div class='del'>-</div><div class='del'>-2000-12-22  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/goto.c (ecal_date_range_changed): New function to keep the</div><div class='del'>-	ecal marked properly</div><div class='del'>-	(create_ecal): move more creation code here, update marks</div><div class='del'>-	(goto_dialog_init_widgets): listen for date_range_changed signal</div><div class='del'>-	in the ecal</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (init_calendar): Remove ancient gnomecal</div><div class='del'>-	cruft</div><div class='del'>-</div><div class='del'>-	* gui/mark.[hc], gui/prop.c: Remove ancient gnomecal code that is</div><div class='del'>-	no longer needed, last bit of bug 904</div><div class='del'>-</div><div class='del'>-2000-12-22  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade.h: translations</div><div class='del'>-</div><div class='del'>-	* gui/goto-dialog.glade: new glade file for goto dialog</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Set date navigator attributes</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: remove prototype</div><div class='del'>-</div><div class='del'>-	* gui/goto.h: Add prototype</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Add glade file stuff</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Use accessors to configure the</div><div class='del'>-	calendar item properly</div><div class='del'>-</div><div class='del'>-2000-12-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Alarm trigger queueing for the GUI part.</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify.[ch]: New files with the high-level alarm</div><div class='del'>-	notification system; mostly moved over from gnome-cal.c.  The</div><div class='del'>-	low-level timer stuff is still in alarm.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/alarm-notify.c (alarm_notify_init): New function to</div><div class='del'>-	initialize the alarm notification system.</div><div class='del'>-	(alarm_notify_done): New function to shut down the alarm</div><div class='del'>-	notification system.</div><div class='del'>-	(alarm_notify_add_client): New function to start monitoring a</div><div class='del'>-	calendar client for alarm notification.</div><div class='del'>-	(alarm_notify_remove_client): New function to stop monitoring a</div><div class='del'>-	client.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.h (AlarmDestroyNotify): Also pass in the alarm ID so</div><div class='del'>-	the callback may know which ID is being destroyed.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c (clear_itimer): New function.</div><div class='del'>-	(pop_alarm): Use clear_itimer().</div><div class='del'>-	(alarm_done): New function to shut down the timer system.</div><div class='del'>-	(alarm_add): Add some preconditions.  Do not call the destroy</div><div class='del'>-	notification function if we could not create the alarm.</div><div class='del'>-	(alarm_ready): Pass the alarm ID to the destroy notify function.</div><div class='del'>-	(alarm_remove): Likewise.  Also, add some preconditions.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Removed the alarm notification functions from</div><div class='del'>-	here since they are now in alarm-notify.c.</div><div class='del'>-	(gnome_calendar_construct): Register the client with</div><div class='del'>-	alarm_notify_add_client().</div><div class='del'>-	(gnome_calendar_destroy): Use alarm_notify_remove_client() to</div><div class='del'>-	unregister the client.</div><div class='del'>-	(obj_updated_cb): Do not do any alarm-related stuff.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Shut down the alarm timer system.</div><div class='del'>-	(main): Initialize and shut down the alarm notification system.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	alarm-notify.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_set_cal_client): Only</div><div class='del'>-	connect to the "cal_loaded" signal if the client is not already</div><div class='del'>-	loaded.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_cal_client): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_cal_client): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (update_calendar): Connect to "cal_loaded"</div><div class='del'>-	before issuing the load request.</div><div class='del'>-</div><div class='del'>-2000-12-21  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.c: Updated for new executive summary.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Reenabled the summary.</div><div class='del'>-</div><div class='del'>-	* gui/GNOME_Evolution_Calendar.oafinfo: Added the summary.</div><div class='del'>-</div><div class='del'>-2000-12-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Fix erroneous documentation</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): if</div><div class='del'>-	!is_empty_time rather than is_empty_time</div><div class='del'>-	(e_todo_context_new): Return a pointer rather than fill in</div><div class='del'>-	a parameter</div><div class='del'>-	(e_todo_context_foreach_change): Free just the key</div><div class='del'>-	(e_todo_context_destroy): Plug this enormous leakage.  I had assumed</div><div class='del'>-	i had done this earlier, which isn't too bright when anything beyond</div><div class='del'>-	2 minutes ago is fuzzy.</div><div class='del'>-	(comp_from_remote_record): Kill warnings</div><div class='del'>-	(post_sync): Destroy the map later</div><div class='del'>-	(conduit_get_gpilot_conduit): Fix e_todo_context_new params</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.[hc]: Similar to above</div><div class='del'>-</div><div class='del'>-2000-12-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Remove pointless comment</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (is_empty_time): add utility function</div><div class='del'>-	(comp_from_remote_record): use it</div><div class='del'>-</div><div class='del'>-2000-12-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	Convert cal component strings to pilot character set</div><div class='del'>-	(comp_from_remote_record): vice versa</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-2000-12-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (compute_alarm_range): Fix confusion in</div><div class='del'>-	the way the range is expanded.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarms_free): Doh,</div><div class='del'>-	alarms-&gt;alarms is a list, not a generic pointer.  Free it properly.</div><div class='del'>-	(cal_component_free_pilot_id): Removed unused function.</div><div class='del'>-	(cal_component_free_pilot_status): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (init_bonobo): Use VERSION instead of a hardcoded</div><div class='del'>-	string.  Pass argc by value, not by reference.  Test the return</div><div class='del'>-	value of gnome_init_with_popt_table().</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_free_alarms): Oops, missed</div><div class='del'>-	implementing this function.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (print_time_t): Better printing format.</div><div class='del'>-	(isodiff_to_secs): Removed unused function.</div><div class='del'>-	(isodiff_from_secs): Removed unused function.</div><div class='del'>-	(time_day_end): Removed crufty part.</div><div class='del'>-	(time_day_begin): Removed crufty part.</div><div class='del'>-	(time_day_hour): Removed unused function.</div><div class='del'>-	(format_simple_hour): Removed unused function.</div><div class='del'>-	(get_time_t_hour): Removed unused function.</div><div class='del'>-	(time_from_start_duration): Removed unused function.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.h (parse_date): Removed unimplemented, unused</div><div class='del'>-	function prototype.</div><div class='del'>-</div><div class='del'>-2000-12-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Removed prototype for setup_alarm to fix a</div><div class='del'>-	warning.</div><div class='del'>-</div><div class='del'>-2000-12-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Alarm instance generation support for the Wombat.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal::CalAlarmInstance): Changed to</div><div class='del'>-	have an alarm UID, the trigger time, and the actual occurrence</div><div class='del'>-	time.</div><div class='del'>-	(Cal::CalComponentAlarms): New structure to hold a pair of a</div><div class='del'>-	component and its alarms that trigger in a particular range of</div><div class='del'>-	time.</div><div class='del'>-	(Cal::getAlarmsInRange): Changed to return a CalComponentAlarmsSeq.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalAlarmInstance): New C-side</div><div class='del'>-	structure to match the one on the IDL.</div><div class='del'>-	(CalComponentAlarms): Ditto.</div><div class='del'>-	(CalAlarmAction): Renamed from CalComponentAlarmAction.</div><div class='del'>-	(CalAlarmTriggerType): Renamed from CalComponentAlarmTriggerType.</div><div class='del'>-	Encoded the START and END parameters for the RELATED parameter in</div><div class='del'>-	this enum, too.  Added a NONE value for invalid or missing trigger</div><div class='del'>-	specifications.</div><div class='del'>-	(CalComponentAlarmTriggerRelated): Removed.</div><div class='del'>-	(CalAlarmTrigger): Renamed from CalComponentAlarmTrigger.  Renamed</div><div class='del'>-	the duration/time fields to rel_duration/abs_time, respectively.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_get_trigger):</div><div class='del'>-	Changed to use the new trigger structure.</div><div class='del'>-	(cal_component_alarm_set_trigger): Likewise.</div><div class='del'>-	(cal_component_alarm_free_trigger): Removed function.</div><div class='del'>-	(cal_component_has_alarms): Count the elements in the</div><div class='del'>-	alarm_uid_hash instead of trying to fetch the first alarm subcomponent.</div><div class='del'>-	(cal_component_alarms_free): New function to free a</div><div class='del'>-	CalComponentAlarms structure.</div><div class='del'>-	(CalComponentAlarmPrivate): Added an uid property pointer.</div><div class='del'>-	(scan_alarm_property): Scan for the our extension UID property.</div><div class='del'>-	(cal_component_alarm_get_uid): New function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackendClass): Changed the signatures of</div><div class='del'>-	the ::get_alarms_in_range() and ::get_alarms_for_object() methods.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): Changed</div><div class='del'>-	signature; use the new method.</div><div class='del'>-	(cal_backend_get_alarms_for_object): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (compute_alarm_range): New spiffy</div><div class='del'>-	function to compute a range of time for alarm occurrences.</div><div class='del'>-	(add_alarm_occurrences_cb): New function to add alarms for a</div><div class='del'>-	particular occurrence of the component.</div><div class='del'>-	(generate_absolute_triggers): New function to add the absolute</div><div class='del'>-	alarm triggers.</div><div class='del'>-	(generate_alarms_for_comp): New function to generate all the alarm</div><div class='del'>-	instances for a component.</div><div class='del'>-	(cal_backend_file_get_alarms_in_range): Implemented.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_alarms_in_range): Use the new CalBackend API.</div><div class='del'>-	(Cal_get_alarms_for_object): Likewise.</div><div class='del'>-	(build_alarm_instance_seq): Removed old function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_alarm_instance_list_free): Removed</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_component_alarms_list): New</div><div class='del'>-	function to demarshal the component alarms sequence.</div><div class='del'>-	(build_alarm_instance_list): New function to demarshal the alarm</div><div class='del'>-	instances sequence.</div><div class='del'>-	(cal_client_get_alarms_in_range): Updated for the new API.</div><div class='del'>-	(cal_client_get_alarms_for_object): Updated for the new API.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Temporary #ifdef-ing out of alarm-related stuff</div><div class='del'>-	to make it build.</div><div class='del'>-</div><div class='del'>-2000-12-15  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.[ch] (time_from_isodate): Removed unused</div><div class='del'>-	function, a relic from Gnomecal.</div><div class='del'>-</div><div class='del'>-2000-12-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_from_isodate): Fix the sign in the</div><div class='del'>-	HAVE_TM_GMTOFF case</div><div class='del'>-</div><div class='del'>-2000-12-15  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed getdate.y.</div><div class='del'>-	We no longer use it; it is a relic from Gnomecal.</div><div class='del'>-</div><div class='del'>-	* gui/getdate.y: Removed file.</div><div class='del'>-</div><div class='del'>-2000-12-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #955.</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for</div><div class='del'>-	the week_start_day, to be used in the same way as</div><div class='del'>-	calendar-config.h defines it.  Removed the week_starts_on_monday</div><div class='del'>-	flag.</div><div class='del'>-	(day_event_cb): Use the week_start_day.</div><div class='del'>-	(colorize_items): Likewise.</div><div class='del'>-	(configure_items): Likewise.</div><div class='del'>-	(weekday_picker_set_week_start_day): New function.</div><div class='del'>-	(weekday_picker_get_week_start_day): New function.</div><div class='del'>-	(weekday_picker_set_week_starts_on_monday): Removed function.</div><div class='del'>-	(weekday_picker_get_week_starts_on_monday): Removed function.</div><div class='del'>-</div><div class='del'>-	* gui/widget-util.[ch]: New files with utilities for creating or</div><div class='del'>-	configuring widgets.</div><div class='del'>-</div><div class='del'>-	* gui/widget-util.c (date_edit_new): New function to create an</div><div class='del'>-	EDateEdit configured with the calendar's preferences; moved over</div><div class='del'>-	from event-editor.c.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (make_recur_weekly_special): Use</div><div class='del'>-	weekday_picker_set_week_start_day() and the corresponding function</div><div class='del'>-	from calendar-config.h.</div><div class='del'>-	(init_widgets): Likewise.</div><div class='del'>-	(make_date_edit_with_time): Removed function.</div><div class='del'>-	(make_recur_ending_until_special): Use date_edit_new().</div><div class='del'>-	(make_date_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Removed references to</div><div class='del'>-	make_date_edit_with_time(); replace them with make_date_edit().</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	widget-util.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2000-12-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reset the widths</div><div class='del'>-	of the columns with pixbufs to the actual pixbufs' sizes; now</div><div class='del'>-	ETable properly computes its column widths so we do not need to</div><div class='del'>-	add extra padding here.</div><div class='del'>-</div><div class='del'>-2000-12-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (_XOPEN_SOURCE): #define this to 500, not</div><div class='del'>-	nothing. Also, move this bit after the other #includes to</div><div class='del'>-	prevent potential messiness.</div><div class='del'>-</div><div class='del'>-2000-12-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (ensure_mandatory_properties): Even</div><div class='del'>-	though icaltime_from_timet() now properly ignores the is_utc</div><div class='del'>-	argument since time_t values *are* in UTC by definition, we were</div><div class='del'>-	passing FALSE for that argument's value in a bunch of places.  So</div><div class='del'>-	although it is ignored, changed them to TRUE for consistency.</div><div class='del'>-	Hopefully newer versions of libical will remove that argument</div><div class='del'>-	entirely since it does not make sense to speak of non-absolute</div><div class='del'>-	time_t values.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_finish_long_event_resize): Likewise.</div><div class='del'>-	(e_day_view_finish_resize): Likewise.</div><div class='del'>-	(e_day_view_key_press): Likewise.</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Likewise.</div><div class='del'>-	(e_week_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_week_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (simple_recur_to_comp_object): Likewise.</div><div class='del'>-	(recur_to_comp_object): Likewise.</div><div class='del'>-	(dialog_to_comp_object): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-2000-12-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func.</div><div class='del'>-	(cal_object_get_rdate_end): Changed this function to get rid of a</div><div class='del'>-	possible uninitialized error on the rdate function.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Fixed some warnings involving the #define</div><div class='del'>-	_XOPEN_SOURCE lines here.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: #ifdef WANT_THE_EXECUTIVE_SUMMARYed out</div><div class='del'>-	the summary_factory object since it's unused if</div><div class='del'>-	WANT_THE_EXCUTIVE_SUMMARY is not defined.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: #if 0ed out e_day_view_remove_event_cb.</div><div class='del'>-	(obj_updated_cb): #ifndef NO_WARNINGSed out a #warning.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): Made</div><div class='del'>-	it so that</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (obj_updated_cb): #ifndef NO_WARNINGSed out a</div><div class='del'>-	#warning.</div><div class='del'>-</div><div class='del'>-2000-12-13  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Revert federico's change for now</div><div class='del'>-	because of libtool limitations with ldadding shared libtool</div><div class='del'>-	libs</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2000-12-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_set_todo_object): Use</div><div class='del'>-	set_title_from_comp</div><div class='del'>-	(save_todo_object): ditto</div><div class='del'>-	(set_title_from_comp): Make sure the title is encoded properly (as in</div><div class='del'>-	event-editor)</div><div class='del'>-</div><div class='del'>-2000-12-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (get_text_list): Constify for new</div><div class='del'>-	libical API.</div><div class='del'>-	(set_text_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_get_rule_end_date): Likewise.</div><div class='del'>-	(cal_recur_set_rule_end_date): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (find_attendee): Likewise.</div><div class='del'>-	(pstream_load): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (released_event_object_cb): Removed unused function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (status_string_map): Removed unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-2000-12-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (test_recur_LDADD): Link to the libical</div><div class='del'>-	shared library.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): Likewise.</div><div class='del'>-</div><div class='del'>-2000-12-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	This is to make things work with libical 0.21helix1 and later.</div><div class='del'>-	Warnings remain because at last libical was constified; will take</div><div class='del'>-	care of those tomorrow.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.h: #include &lt;ical.h&gt; instead of &lt;icaltypes.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.h: Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (alarm_uid_from_prop): constify.</div><div class='del'>-	(cal_component_get_status): Updated for new libical API.</div><div class='del'>-	(cal_component_set_status): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (ensure_task_complete): Removed unused</div><div class='del'>-	status code.</div><div class='del'>-	(ensure_task_not_complete): Update for new status API.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (status_string_to_value): Removed</div><div class='del'>-	function.</div><div class='del'>-	(status_value_to_string): Removed function.</div><div class='del'>-	(status_string_map): Removed variable.</div><div class='del'>-	(fill_widgets): Update for new status API.</div><div class='del'>-	(dialog_to_comp_object): Likewise.</div><div class='del'>-</div><div class='del'>-2000-12-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): updated the</div><div class='del'>-	tests on the start &amp; end time just before calling the callback. It</div><div class='del'>-	was skipping occurrences that started before the required interval's</div><div class='del'>-	start time, which was wrong. We want all occurrences that intersect</div><div class='del'>-	the interval.</div><div class='del'>-	(cal_obj_time_weekday): removed the CalRecurrence* argument, since it</div><div class='del'>-	isn't needed.</div><div class='del'>-</div><div class='del'>-2000-12-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: added changed flags and added calls to a new</div><div class='del'>-	function event_editor_set_changed() to set &amp; reset this flag.</div><div class='del'>-	Added prompt_to_save_changed() which is called when the user</div><div class='del'>-	selects File/Close or the window's close button.</div><div class='del'>-	Fixed the 'All day event' toggle button.</div><div class='del'>-	Made the 'Alarm' page sensitive as appropriate when filling widgets.</div><div class='del'>-	(Though note that the alarm widgets are not being set yet.)</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: added changed flag as above.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: used good names for all the</div><div class='del'>-	classification radio buttons so we can access them in the code.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (init_widgets): use the "show week numbers" config</div><div class='del'>-	option in the recurrence preview calendar.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event_label): use 9:00 instead</div><div class='del'>-	of 09:00 in the main view, as we do everywhere else now. It means the</div><div class='del'>-	times won't line up, but they are easier to read which I think is</div><div class='del'>-	better.</div><div class='del'>-	Added support for Page Up/Down, though I think it should move the</div><div class='del'>-	selection rather than just scroll the canvas.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): removed the</div><div class='del'>-	end parameter since we should be using the chunk end time now.</div><div class='del'>-	Added single_rule parameter for when we are generating the</div><div class='del'>-	occurrences of a single RRULE, in which case the event's start date is</div><div class='del'>-	not included in the occurrences output (unless it results from the</div><div class='del'>-	RRULE expansion). Both of these fix problems when using COUNT.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed):</div><div class='del'>-	fixed bug when checking if the new start day starts on the week start</div><div class='del'>-	day. If you select a complete week it should now show the Week view.</div><div class='del'>-</div><div class='del'>-2000-12-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Free the strings we</div><div class='del'>-	get from the editables.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise.</div><div class='del'>-	This sucks; this code should be shared between the two dialogs.</div><div class='del'>-</div><div class='del'>-2000-12-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (fill_widgets): Free the dates we get from</div><div class='del'>-	the component.</div><div class='del'>-</div><div class='del'>-2000-12-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Attach signal</div><div class='del'>-	handlers to the e_scrolled_table's etable rather than to the</div><div class='del'>-	e_scrolled_table directly</div><div class='del'>-	(e_calendar_table_on_double_click): This signal provides more</div><div class='del'>-	params now</div><div class='del'>-</div><div class='del'>-2000-12-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Got rid of code referencing the</div><div class='del'>-	ETableScrolled proxy functions.</div><div class='del'>-</div><div class='del'>-2000-12-07  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (post_sync): Ugly hack for syncing</div><div class='del'>-	until pcs can be altered (longer term)</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (post_sync): ditto</div><div class='del'>-</div><div class='del'>-2000-12-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): add</div><div class='del'>-	EXTRA_GNOME_LIBS.</div><div class='del'>-</div><div class='del'>-2000-12-07  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Create</div><div class='del'>-	an empty cal component if the object has been deleted.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: Bit shift the change type constants</div><div class='del'>-	properly</div><div class='del'>-</div><div class='del'>-2000-12-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_generate_instances): Unref</div><div class='del'>-	the component from the objects list; it got referenced as many</div><div class='del'>-	times as appropriate for the instances list.</div><div class='del'>-</div><div class='del'>-2000-12-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Confirm before deleting the</div><div class='del'>-	event.</div><div class='del'>-</div><div class='del'>-2000-12-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_init): unref the pixbuf when</div><div class='del'>-	finished with it</div><div class='del'>-</div><div class='del'>-2000-12-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #920.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (delete_component): New function.</div><div class='del'>-	(e_calendar_table_on_delete_task): Use delete_component().</div><div class='del'>-	(e_calendar_table_on_key_press): Likewise.  Also, mark the event</div><div class='del'>-	as handled.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_get_component): Renamed</div><div class='del'>-	function from calendar_model_get_cal_object().</div><div class='del'>-	(calendar_model_delete_task): Removed function.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/delete-comp.[ch]: New files with the dialog for</div><div class='del'>-	deleting a calendar component.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): Confirm</div><div class='del'>-	before actually deleting the appointment.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (libcal_dialogs_a_SOURCES): Added</div><div class='del'>-	delete-comp.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_destroy): Free the alarm</div><div class='del'>-	UID hash.</div><div class='del'>-</div><div class='del'>-2000-12-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_change_seq): kill</div><div class='del'>-	(Cal_get_changes): return the corba sequence directly</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: update prototype</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_compute_changes_foreach_key): Build</div><div class='del'>-	the corba struct rather than the old calobjchange thing</div><div class='del'>-	(cal_backend_compute_changes): ditto.  build and return the actual</div><div class='del'>-	corba sequence rather than the list of calobjchanges</div><div class='del'>-	(cal_backend_get_changes): return the corba sequence</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: Remove CalObjChange cruft</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_change_list_free): Kill</div><div class='del'>-</div><div class='del'>-2000-12-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c:</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (map_name): Update so as not to conflict</div><div class='del'>-	with calendar</div><div class='del'>-	(next_changed_item): update to use CalClientChange instead of CalObjChange</div><div class='del'>-	(compute_status): ditto</div><div class='del'>-	(pre_sync): ditto</div><div class='del'>-	(for_each_modified): since we now have the cal component we can call</div><div class='del'>-	local_record_from_comp directly</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: same as above</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: Remove much logging cruft</div><div class='del'>-	(cal_backend_compute_changes): Calculate the changes based on the</div><div class='del'>-	hashed database</div><div class='del'>-	(cal_backend_get_changes): call cal_backend_compute_changes</div><div class='del'>-	(cal_backend_compute_changes_foreach_key): hash callback for</div><div class='del'>-	calculating deletions</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: update protype, remove logging cruft from</div><div class='del'>-	object</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_change_seq): dup the calobj rather than the uid</div><div class='del'>-	now</div><div class='del'>-	(Cal_get_changes): rename from Cal_get_changed_uids</div><div class='del'>-	(cal_get_epv): reflect name change in epv</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_change_list_free): update assertion</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: CalObjChange now returns the entire ical</div><div class='del'>-	component, update the change types.  This should all go away shortly</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: getChangedUIds -&gt; getChanges.</div><div class='del'>-	CalObjChange now contains the calobj rather than the uid, update</div><div class='del'>-	the change types</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_changes): rename from</div><div class='del'>-	cal_client_get_changed_uids to make idl and addressbook</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Update prototype</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_change_list): Build a list of</div><div class='del'>-	CalClientChange instead of CalObjChange</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client-types.c (cal_client_change_list_free): Free</div><div class='del'>-	a glist of CalClientChanges</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client-types.h: New file. Declarations for</div><div class='del'>-	CalClientChange.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Build new files</div><div class='del'>-</div><div class='del'>-2000-12-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Fix my build stupidty READ THE MACRO</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-2000-12-04  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_get_column_width):</div><div class='del'>-	Initialize max_large_digit_width to 0 to prevent crazy sizing issues.</div><div class='del'>-</div><div class='del'>-2000-12-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: Remove mysterious #include inserted by</div><div class='del'>-	mmeeks to break the build.</div><div class='del'>-</div><div class='del'>-2000-12-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #918.</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.c (WeekdayPickerPrivate): Added a field for a</div><div class='del'>-	set of blocked days.</div><div class='del'>-	(weekday_picker_set_blocked_days): New function to configure a set</div><div class='del'>-	of days that cannot be modified by the user.</div><div class='del'>-	(weekday_picker_get_blocked_days): Query function for the above.</div><div class='del'>-	(day_event_cb): Block the appropriate days from being modified.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (get_start_weekday_mask): New function to</div><div class='del'>-	compute a day mask for the start day of a calendar component.</div><div class='del'>-	(set_recur_special_defaults): New function to set sane defaults</div><div class='del'>-	for the recurrence special widgets.</div><div class='del'>-	(fill_recurrence_widgets): Use set_recur_special_defaults().</div><div class='del'>-	(make_recur_weekly_special): Block the appropriate days.</div><div class='del'>-</div><div class='del'>-2000-12-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (set_prop): Removed debugging message.</div><div class='del'>-	(control_factory_init): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (set_title_from_comp): New function to</div><div class='del'>-	generate a title and convert it from UTF8 before setting it on the</div><div class='del'>-	window.</div><div class='del'>-	(save_event_object): Uset set_title_from_comp().</div><div class='del'>-	(event_editor_set_event_object): Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c:  Debug message cleanups</div><div class='del'>-	(comp_from_remote_record): Properly set the ical description field</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (is_empty_time): New utility</div><div class='del'>-	functions that look for all 0's in a struct tm</div><div class='del'>-	(comp_from_remote_record): use above</div><div class='del'>-	(local_record_from_comp): Correctly set the repeatForever value so</div><div class='del'>-	that we repeat forever instead of a really long time</div><div class='del'>-	(comp_from_remote_record): Only set the cal component recurrence</div><div class='del'>-	until field when repeatForever is 0</div><div class='del'>-</div><div class='del'>-2000-11-30  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: fixed a bug that caused the calendar to</div><div class='del'>-	segfault when the iTip control was destroyed.</div><div class='del'>-</div><div class='del'>-2000-11-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Empty</div><div class='del'>-	by_day entries are no longer indicated by ICAL_RECURRENCE_ARRAY_MAX not</div><div class='del'>-	SHRT_MAX. Calculate weekly and monthly by date recurrences properly</div><div class='del'>-	(get_pilot_day): Convert ical day to corresponding integer for pilot day</div><div class='del'>-</div><div class='del'>-2000-11-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Debug message cleanups</div><div class='del'>-	(get_ical_day): Fix off-by-one error which affected weekly occurences.</div><div class='del'>-	(comp_from_remote_record): Monthly by day and by date were reversed</div><div class='del'>-	(nth_weekday): function taken from event-editor.c that encodes BYDAY</div><div class='del'>-	values - this needs to be in libical really.</div><div class='del'>-	(comp_from_remote_record): Don't set the description if the pilot note</div><div class='del'>-	is null.  Rejig so that we don't have to free objects.</div><div class='del'>-</div><div class='del'>-2000-11-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Upgrade of the alarm framework.  We now access alarms by a unique</div><div class='del'>-	identifier.  This UID is added as an extension property to alarm</div><div class='del'>-	subcomponents when their parent components are scanned by</div><div class='del'>-	CalComponent.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (CalComponentPrivate): Added a hash</div><div class='del'>-	table of alarm UIDs -&gt; alarm properties.</div><div class='del'>-	(cal_component_init): Initialize priv-&gt;alarm_uid_hash.</div><div class='del'>-	(free_icalcomponent): Free the elements in the</div><div class='del'>-	priv-&gt;alarm_uid_hash.</div><div class='del'>-	(scan_alarm): New function to add scan an alarm subcomponent and</div><div class='del'>-	ensure that it has an alarm UID extension property so that we can</div><div class='del'>-	add it to our mapping table.</div><div class='del'>-	(cal_component_get_first_alarm): Removed function.</div><div class='del'>-	(cal_component_get_next_alarm): Removed function.</div><div class='del'>-	(cal_component_get_alarm_uids): New function.</div><div class='del'>-	(cal_component_get_alarm): New function.</div><div class='del'>-</div><div class='del'>-2000-11-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_to_pilot_record): Return</div><div class='del'>-	a struct rather than a pointer to a struct</div><div class='del'>-	(compare): local_record_to_pilot_record now returns a struct</div><div class='del'>-	(prepare): ditto</div><div class='del'>-	(free_prepare): remove as per gnome-pilot changes</div><div class='del'>-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-2000-11-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Reformatted the</div><div class='del'>-	table spec to make it easier to read.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c: Oops, Damon wrote this, not me.  Fixed the</div><div class='del'>-	Authors line.</div><div class='del'>-</div><div class='del'>-2000-11-28  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view*.[hc]:</div><div class='del'>-	* gui/e-week-view*.[hc]: finished 12-hour support and tried to tidy</div><div class='del'>-	up &amp; comment the drawing code in places. Also fixed a couple of bugs I</div><div class='del'>-	spotted. All the options on the 'Calendar' page should now work.</div><div class='del'>-</div><div class='del'>-2000-11-28  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: removed some debugging code that I had,</div><div class='del'>-	which might have caused problems.</div><div class='del'>-</div><div class='del'>-2000-11-27  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: added a preliminary change to have</div><div class='del'>-	Assigned To-Do items have a corresponding icon.</div><div class='del'>-</div><div class='del'>-2000-11-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (free_prepare): Ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (free_prepare): Adjust</div><div class='del'>-	free_prepare to the correct signal parameters.  Don't actually</div><div class='del'>-	do anything - there is a semantic discrepancy that needs to be</div><div class='del'>-	resolved.</div><div class='del'>-</div><div class='del'>-2000-11-26  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_days_shown): == instead of =.</div><div class='del'>-</div><div class='del'>-2000-11-26  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: added more support for config settings.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.[hc]:</div><div class='del'>-	* gui/e-day-view.[hc]: added support for setting - show event end</div><div class='del'>-	times, week start day and 12-hour format (unfinished).</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c: started 12-hour support.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (prepare_tag): use end_day + 1 since we want to</div><div class='del'>-	include the last day.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (set_all_day): minor change when turning all_day</div><div class='del'>-	off - set the event end to one hour after the event start if it is on</div><div class='del'>-	or before the start time. Also added more comments to make it a bit</div><div class='del'>-	clearer.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_obj_time_add_days): use a gint for day</div><div class='del'>-	rather than a guint since we now support -ve days.</div><div class='del'>-	Also fixed bug with weekly recurrences.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_create_date_edit): use</div><div class='del'>-	config settings.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c (cal_prefs_dialog_update_config):</div><div class='del'>-	updated EDateEdit calls.</div><div class='del'>-</div><div class='del'>-2000-11-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Unref the ETable</div><div class='del'>-	extras.</div><div class='del'>-</div><div class='del'>-2000-11-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (free_icalcomponent): DOH, fixed</div><div class='del'>-	reversed test for the presence of the icalcomp's parent.  This was</div><div class='del'>-	causing memory leaks in the Wombat and elsewhere.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_set_node_timet): Plug leak.</div><div class='del'>-</div><div class='del'>-2000-11-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (scan_vcalendar): Use the new libical</div><div class='del'>-	external iterators (icalcomponent_begin_component() and friends);</div><div class='del'>-	the internal iterators are deprecated.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c (generate_occurrences): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c (pstream_load): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c (e_meeting_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_entry): Plug leak.</div><div class='del'>-	(cal_backend_log_sync): Free the entry-&gt;uid.</div><div class='del'>-</div><div class='del'>-	* util/icalendar-save.[ch]:</div><div class='del'>-	* util/icalendar-test.c:</div><div class='del'>-	* util/icalendar.[ch]: Removed obsolete files.</div><div class='del'>-</div><div class='del'>-2000-11-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/task.xpm: Remove the check because it makes it look like the</div><div class='del'>-	task is already completed.  This fixes bug #819.</div><div class='del'>-</div><div class='del'>-	* gui/task-recurring.xpm: Make it use a prettier overlaid icon.</div><div class='del'>-</div><div class='del'>-	* gui/task-*.xpm: Made the things look like little spiral-bound</div><div class='del'>-	notebooks.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): Make the default</div><div class='del'>-	column order be icon/completed/summary.  You may need to erase</div><div class='del'>-	your ~/evolution/config/TaskPad for this to appear.</div><div class='del'>-</div><div class='del'>-2000-11-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_is_cell_editable): The icon</div><div class='del'>-	column is not editable!</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (todo_properties_changed): Removed.</div><div class='del'>-	(time_format_changed): Removed.</div><div class='del'>-	(colors_changed): Removed.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h:</div><div class='del'>-	* gui/prop.c (prop_apply):</div><div class='del'>-	* gui/calendar-commands.c (init_calendar): Removed the old to-do</div><div class='del'>-	list crap.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.[ch]: Removed obsolete files.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed gncal-todo.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_todo_properties_changed): Removed.</div><div class='del'>-	(gnome_calendar_time_format_changed): Removed.</div><div class='del'>-	(gnome_calendar_colors_changed): Removed.</div><div class='del'>-</div><div class='del'>-2000-11-21   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: fixed the stupid Bonobo widget size</div><div class='del'>-	allocation bug that had been vexing me.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: I removed some hacks that were</div><div class='del'>-	necessary for said size bug.</div><div class='del'>-</div><div class='del'>-2000-11-16   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c, gui/e-meeting-edit.c: added cancellation</div><div class='del'>-	code to our program; people can cancel meetings, which is the best</div><div class='del'>-	thing to do for most meetings.</div><div class='del'>-</div><div class='del'>-2000-11-13   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: made the REPLY code actually work.</div><div class='del'>-</div><div class='del'>-2000-11-13   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/itip-utils.[ch]: I created this file to store some commonly used enumeration to</div><div class='del'>-	string mappings and functions.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: this was changed to reflect the addition of the above file.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: added code to take action on a REPLY message.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: bug fixes.</div><div class='del'>-</div><div class='del'>-2000-11-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	OK, bugzilla bug #829 is fixed and that does not redeem me from</div><div class='del'>-	extreme procrastination.  Wheeeeeeeeeeeeeeee!</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.c: Changed the "Rule view" label to</div><div class='del'>-	"Preview"</div><div class='del'>-</div><div class='del'>-2000-11-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (make_recur_ending_count_special): Misspelled</div><div class='del'>-	"occurrences".</div><div class='del'>-	(fill_recurrence_widgets): Sensitize the "Custom recurrence" radio</div><div class='del'>-	button as appropriate.</div><div class='del'>-	(sensitize_recur_widgets): Resurrected the recurrence custom</div><div class='del'>-	warning label.</div><div class='del'>-	(get_widgets): Load the recurrence custom warning bin.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Add an empty alignment for the</div><div class='del'>-	recurrence custom warning label.</div><div class='del'>-</div><div class='del'>-2000-11-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (recur_preview_date_range_changed_cb): New</div><div class='del'>-	function; re-tag the calendar when its date range changes.</div><div class='del'>-	(init_widgets): Connect to "date_range_changed" on the recurrence</div><div class='del'>-	preview calendar.</div><div class='del'>-	(make_recur_weekly_special): Connect to "changed" on the weekday</div><div class='del'>-	picker.</div><div class='del'>-	(recur_weekday_picker_changed_cb): New function; re-tag the calendar.</div><div class='del'>-	(month_day_menu_selection_done_cb): Re-tag the calendar.</div><div class='del'>-	(recur_month_index_value_changed_cb): Likewise.</div><div class='del'>-	(recur_ending_until_changed_cb): Likewise.</div><div class='del'>-	(recur_ending_count_value_changed_cb): Likewise.</div><div class='del'>-	(make_recur_monthly_special): Connect to "value_changed" on the</div><div class='del'>-	adjustment of the month index.</div><div class='del'>-	(make_recur_ending_until_special): Connect to "changed" on the</div><div class='del'>-	ending-until date picker.</div><div class='del'>-	(make_recur_ending_count_special): Connect to "value_changed" on</div><div class='del'>-	the ending-count adjustment.</div><div class='del'>-	(init_widgets): Set to zero the maximum number of selectable days</div><div class='del'>-	in the recurrence preview calendar.  Set the week_start_day from</div><div class='del'>-	the calendar's configuration.</div><div class='del'>-</div><div class='del'>-2000-11-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (clear_widgets): Block the signals as appropriate.</div><div class='del'>-	(fill_ending_date): Ditto.</div><div class='del'>-	(fill_recurrence_widgets): Ditto.</div><div class='del'>-	(recurrence_type_toggled_cb): Only sensitize the widgets and</div><div class='del'>-	preview the recurrence if the toggle button is active.</div><div class='del'>-</div><div class='del'>-2000-11-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and</div><div class='del'>-	exrule lists from the component if we are setting a simple</div><div class='del'>-	recurrence.</div><div class='del'>-	(recur_to_comp_object): Set the exdate list here instead of in</div><div class='del'>-	dialog_to_comp_object().</div><div class='del'>-	(preview_recur): New function to tag the recurrence preview</div><div class='del'>-	calendar based on the information from the dialog box.</div><div class='del'>-	(fill_exception_widgets): Fill the exception widgets here; moved</div><div class='del'>-	over from fill_widgets().</div><div class='del'>-	(fill_recurrence_widgets): Call preview_recur().  Also, call</div><div class='del'>-	fill_exception_widgets() first of all.</div><div class='del'>-	(recurrence_type_toggled_cb): Call preview_recur().</div><div class='del'>-	(recur_interval_selection_done_cb): Likewise.</div><div class='del'>-	(recur_ending_selection_done_cb): Likewise.</div><div class='del'>-	(recurrence_exception_add_cb): Likewise.</div><div class='del'>-	(recurrence_exception_modify_cb): Likewise.</div><div class='del'>-	(recurrence_exception_delete_cb): Likewise.</div><div class='del'>-	(date_changed_cb): Likewise.</div><div class='del'>-	(recur_interval_value_changed_cb): Likewise, new function.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.[ch]: New files with utilities for tagging</div><div class='del'>-	calendars.  mark.[ch] should go away some day.</div><div class='del'>-</div><div class='del'>-	* gui/tag-calendar.c (tag_calendar): Moved over from</div><div class='del'>-	gnome_calendar_tag_calendar().  Take in a CalClient instead of a</div><div class='del'>-	GnomeCalendar.  Added API docs.</div><div class='del'>-	(tag_calendar_by_comp): New function to tag a calendar based on a</div><div class='del'>-	single calendar component instead of a whole client.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().</div><div class='del'>-	(obj_updated_cb): Likewise.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.</div><div class='del'>-	(editor_closed_cb): Free the closure.</div><div class='del'>-	(destroy_editor_cb): Renamed from free_uid().  Do not free the</div><div class='del'>-	UID; just unref the event editor.  Our destroy handler to it will</div><div class='del'>-	free things properly.  This will also cause the corresponding</div><div class='del'>-	calendar client to be unrefed.</div><div class='del'>-	(editor_closed_cb): Use a flag on the GnomeCalendar to decide</div><div class='del'>-	whether to remove the editor from the hash table.  This is sort of</div><div class='del'>-	icky.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): If the object is new, we</div><div class='del'>-	have to use e_table_model_row_inserted(), not row_changed().</div><div class='del'>-	Thanks to JP Rosevear for reporting this.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	tag-calendar.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-2000-11-11  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo:</div><div class='del'>-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"</div><div class='del'>-	to sync up with yesterday's IDL re-scoping.</div><div class='del'>-</div><div class='del'>-2000-11-10  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am ($(IDL_GENERATED)): sort include order.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (idl_flags): ditto.</div><div class='del'>-</div><div class='del'>-2000-11-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (for_each_modified): Inc the</div><div class='del'>-	iterator before finding the next changed item.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (for_each_modified): ditto</div><div class='del'>-</div><div class='del'>-2000-11-09   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests</div><div class='del'>-	can reply appropriately.</div><div class='del'>-</div><div class='del'>-2000-11-09   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c:  fixed a bug that would make the calendar segfault</div><div class='del'>-	if the meeting editor were called up twice without first saving the</div><div class='del'>-	component.</div><div class='del'>-</div><div class='del'>-2000-11-08   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI</div><div class='del'>-	to allow the user to add PUBLISHed events to his calendar, and created</div><div class='del'>-	unworking buttons for meeting requests.</div><div class='del'>-</div><div class='del'>-2000-11-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	These changes fix bugzilla bugs #874 and #875.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_exdate_list): Return</div><div class='del'>-	a list of CalComponentDateTime instead of simple struct</div><div class='del'>-	icaltimetype objects.  Exception date properties *can* contain a</div><div class='del'>-	timezone parameter, so we need to include those if they are</div><div class='del'>-	present.</div><div class='del'>-	(cal_component_set_exdate_list): On the input, handle a list of</div><div class='del'>-	CalComponentDateTime structures.  On the internals, handle a list</div><div class='del'>-	of struct datetime instead of plain properties.</div><div class='del'>-	(cal_component_free_exdate_list): Handle a list of</div><div class='del'>-	CalComponentDateTime structures.</div><div class='del'>-	(scan_exdate): Create a list of struct datetime structures.</div><div class='del'>-	(free_icalcomponent): Free the exdate_list properly.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): Use the</div><div class='del'>-	proper types for exception dates.</div><div class='del'>-</div><div class='del'>-	* gui/comp-util.h:</div><div class='del'>-	* gui/comp-util.c: New files with utilities for manipulating</div><div class='del'>-	calendar component objects.</div><div class='del'>-	(cal_comp_util_add_exdate): New function.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	comp-util.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (add_exdate): New convenience function to add</div><div class='del'>-	an exception date to a calendar component.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate().</div><div class='del'>-	(e_day_view_on_delete_occurrence): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (nth_weekday): Be paranoid about valid</div><div class='del'>-	position values.</div><div class='del'>-	(fill_widgets): Use the proper types for exdates.</div><div class='del'>-	(dialog_to_comp_object): Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (adjust_day_index_spin): Adjust the valid</div><div class='del'>-	range of the month index spin button depending on the selection of</div><div class='del'>-	the day/weekday menu.</div><div class='del'>-</div><div class='del'>-2000-11-07   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed the GUI,</div><div class='del'>-	and added some extra feedback for the user.</div><div class='del'>-</div><div class='del'>-2000-11-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.h (WeekdayPickerClass): Added a "changed"</div><div class='del'>-	signal to notify of changes to the set of selected days.</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.c (weekday_picker_class_init): Create the</div><div class='del'>-	"changed" signal.</div><div class='del'>-	(weekday_picker_set_days): Emit the "changed" signal.</div><div class='del'>-</div><div class='del'>-2000-11-06   Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c, gui/e-itip-control.glade: changed to GUI to</div><div class='del'>-	accomodate dynamically generated buttons, which will be tailored to</div><div class='del'>-	the type of iTip message that is incoming.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-dialog.glade gui/e-meeting-edit.c: added a new button</div><div class='del'>-	to publish events, in addition to requesting meetings.</div><div class='del'>-</div><div class='del'>-2000-11-05  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Removed the old recurrence page.</div><div class='del'>-	Wheeeeeeeeee!</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (make_recurrence_special): Clear the monthly</div><div class='del'>-	widgets.</div><div class='del'>-	(make_recur_monthly_special): Create the monthly widgets.</div><div class='del'>-	(clear_widgets): Clear the monthly values.</div><div class='del'>-	(simple_recur_to_comp_object): Fill in the monthly values.</div><div class='del'>-	(fill_recurrence_widgets): Fill in the monthly and yearly source</div><div class='del'>-	values.</div><div class='del'>-	(dialog_to_comp_object): Take in a CalComponent instead of using</div><div class='del'>-	the event editor's directly.</div><div class='del'>-	(recur_to_comp_object): Likewise.</div><div class='del'>-	(simple_recur_to_comp_object): Likewise.</div><div class='del'>-	(EventEditorPrivate): Removed the widgets from the old recurrence</div><div class='del'>-	page.</div><div class='del'>-	(get_widgets): Likewise.</div><div class='del'>-	(clear_widgets): Likewise.</div><div class='del'>-	(dialog_to_comp_object): If the description or summary are empty,</div><div class='del'>-	just clear the description list or summary property, respectively,</div><div class='del'>-	instead of saving empty ones.</div><div class='del'>-	(simple_recur_to_comp_object): Set the week_start field.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: Fix includes, and add calendar-config.h.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages</div><div class='del'>-	file should not be in SOURCES.</div><div class='del'>-</div><div class='del'>-2000-11-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore</div><div class='del'>-	files.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (check_all_day): Block signals from the</div><div class='del'>-	toggle button.</div><div class='del'>-	(date_changed_cb): Merged check_dates() and check_times() into</div><div class='del'>-	this function; provide better behavior as well.</div><div class='del'>-	(check_dates): Removed function.</div><div class='del'>-	(check_times): Removed function.</div><div class='del'>-	(init_widgets): Connect to the "changed" signal on the start_time</div><div class='del'>-	and end_time widgets.</div><div class='del'>-	(check_all_day): Use a better test.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Clean the idl-generated sources properly.</div><div class='del'>-	* cal-client/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: added some checks for the type of an</div><div class='del'>-	incoming iCal component before passing it off to the CalComponent</div><div class='del'>-	routines.</div><div class='del'>-</div><div class='del'>-2000-11-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (init_widgets): The date editor's</div><div class='del'>-	signal is now "changed".</div><div class='del'>-	(completed_changed): Renamed callback to reflect the name of the</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so</div><div class='del'>-	all calendar gui shows up localized.</div><div class='del'>-</div><div class='del'>-2000-10-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to</div><div class='del'>-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.</div><div class='del'>-	(fill_recurrence_widgets): Likewise.</div><div class='del'>-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The</div><div class='del'>-	weekday picker is not the immediate child of the recurrence</div><div class='del'>-	special container.</div><div class='del'>-	(fill_recurrence_widgets): Call make_recurrence_special() after</div><div class='del'>-	setting the recurrence period type.</div><div class='del'>-	(fill_ending_date): Call make_recurrence_ending_special().  This</div><div class='del'>-	would be so much nicer if GTK+ were model/view all over.</div><div class='del'>-</div><div class='del'>-2000-10-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and</div><div class='del'>-	add changed_hash.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function</div><div class='del'>-	to get the next "really" changed item (changed status can be cleared now)</div><div class='del'>-	(compute_status): Compute status based on changed_hash</div><div class='del'>-	(pre_sync): Fill changed_hash and counts adds/mods/dels</div><div class='del'>-	(set_status_cleared): New callback handler - avoid double syncing</div><div class='del'>-	(for_each_modified): Use next_changed_item to iterate</div><div class='del'>-	(add_archive_record): kill</div><div class='del'>-	(delete_archive_record): kill</div><div class='del'>-	(archive_record): New callback handler - mark/unmark archive status</div><div class='del'>-	(conduit_get_gpilot_conduit): Adjust signal connects</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-2000-10-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We</div><div class='del'>-	split it from the radio callback so that we can call it explicitly</div><div class='del'>-	from fill_recurrence_widgets().</div><div class='del'>-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as</div><div class='del'>-	appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_calendar): Removed the geometry and</div><div class='del'>-	hidden arguments.  This code is ancient.</div><div class='del'>-	(all_calendars): Made static.  This sucks; configuration should be</div><div class='del'>-	notification-based instead of "let's iterate through all open</div><div class='del'>-	calendars".</div><div class='del'>-	(active_calendars): Removed.  Functions can check the length of</div><div class='del'>-	the all_calendars list if they are interested.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sync_entries): Do not take in an extra data</div><div class='del'>-	pointer.</div><div class='del'>-	(summary_changed_cb): Use a single call back to sync both entries.</div><div class='del'>-	(sync_date_edits): New function to sync two EDateEdit widgets.</div><div class='del'>-	(init_widgets): Connect the general and recurrence starting date</div><div class='del'>-	widgets.</div><div class='del'>-</div><div class='del'>-2000-10-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sync_entries): New function.</div><div class='del'>-	(general_summary_changed_cb): Sync the general summary to the</div><div class='del'>-	recurrence summary widget.</div><div class='del'>-	(recurrence_summary_changed_cb): Vice-versa.</div><div class='del'>-	(init_widgets): Hook to the summaries.</div><div class='del'>-</div><div class='del'>-	* event-editor-dialog.glade: Do not expand/fill the start and end</div><div class='del'>-	date so that the "all day event" button is not pushed all the way</div><div class='del'>-	to the right.</div><div class='del'>-	Decrease the spacing between the recurrence sentence widgets.</div><div class='del'>-	Remove a spurious empty label that was lurking around the</div><div class='del'>-	recurrence widgets.</div><div class='del'>-	Make the alarm widgets expand the right way.</div><div class='del'>-	Delete old recurrence widgets.</div><div class='del'>-</div><div class='del'>-2000-10-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (init_widgets): Connect to the recurrence</div><div class='del'>-	ending menu.</div><div class='del'>-	(recur_ending_selection_done_cb): Implemented.</div><div class='del'>-	(make_recurrence_ending_special): Implemented.</div><div class='del'>-	(make_recur_ending_until_special): Implemented.</div><div class='del'>-	(fill_ending_date): Implemented.</div><div class='del'>-	(make_recur_ending_count_special): Implemented.</div><div class='del'>-	(simple_recur_to_comp_object): Fill in the ending date.</div><div class='del'>-	(clear_widgets): Clear the recurrence ending widgets.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Moved the recurrence type radio</div><div class='del'>-	buttons to a single hbox to save space.</div><div class='del'>-	Fixed the lower value of the recurrence interval spin button.</div><div class='del'>-	Removed the stale widgets from the recurrence ending date part.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA</div><div class='del'>-	strings of 0 length, but then didn't NULL terminate them.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting):</div><div class='del'>-	Check boundary case of fast sync</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove</div><div class='del'>-	invalid test.</div><div class='del'>-	(local_record_from_comp): If the event is all day, mark it as timeless</div><div class='del'>-	(comp_from_remote_record): Timeless events take up all day</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (add_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper</div><div class='del'>-	number of parameters</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new</div><div class='del'>-	recurrence page.  Replace the old widget pointers with the new</div><div class='del'>-	ones.  Modified the relevant functions accordingly and added</div><div class='del'>-	plenty of new ones.</div><div class='del'>-	(event_editor_get_cal_client): New function.</div><div class='del'>-	(fill_recurrence_widgets): This is *THE* tricky function for you.</div><div class='del'>-	It has to discriminate whether we get a recurrence we support for</div><div class='del'>-	editing or not.  And this is not trivial.  Sigh.</div><div class='del'>-	(event_editor_update_widgets): Added preconditions and API docs.</div><div class='del'>-</div><div class='del'>-	* event-editor-dialog.glade: Fixed all the spacings/</div><div class='del'>-	paddings/packing options so that the widgets will look right if</div><div class='del'>-	the dialog box is resized.  Also fixes some misaligned widgets.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed</div><div class='del'>-	incorrect assertion.</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: brushed up some code to deal with</div><div class='del'>-	the organizer entry, and solidified the CORBA memory-freeing</div><div class='del'>-	issues.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* removed the Evolution-Composer generated files, due</div><div class='del'>-	to a tip on how we do things.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation</div><div class='del'>-	bugs, and finished the initial integration with the mailer.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: made the build us the Evolution-Composer.idl</div><div class='del'>-	from the composer directory.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Evolution-Composer.idl: added this from the composer IDL sources</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: changed to reflect the above IDL and the associated</div><div class='del'>-	orbit-idl generated files.</div><div class='del'>-</div><div class='del'>-	* gui/Evolution-Composer.h,</div><div class='del'>-	  gui/Evolution-Composer-common.c,</div><div class='del'>-	  gui/Evolution-Composer-stubs.c,</div><div class='del'>-	  gui/Evolution-Composer-skels.c:</div><div class='del'>-	the generated files, as per the above description.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: more work towards mailer integration.</div><div class='del'>-</div><div class='del'>-2000-10-24  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's</div><div class='del'>-	CORBA interfaces, though it's not yet working.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use</div><div class='del'>-	new e-pilot-map lookup function</div><div class='del'>-	(match): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use</div><div class='del'>-	new e-pilot-map lookup function</div><div class='del'>-	(match): ditto</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES):</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES):</div><div class='del'>-	* gui/Makefile.am (INCLUDES):</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES):</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and</div><div class='del'>-	abstraction</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Add libeconduit-static.la</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write</div><div class='del'>-	(pre_sync): Use e_pilot_map_read</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Add libeconduit-static.la</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write</div><div class='del'>-	(pre_sync): Use e_pilot_map_read</div><div class='del'>-</div><div class='del'>-2000-10-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c</div><div class='del'>-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function</div><div class='del'>-	to save the state of the table to a given file.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field</div><div class='del'>-	so we can access it to save the state.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_destroy): call</div><div class='del'>-	e_calendar_table_save_state() to save the state of the TaskPad.</div><div class='del'>-	(setup_widgets): load the state of the TaskPad.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: added support for the default view.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct):</div><div class='del'>-	(gnome_calendar_set_view_internal): use/set the default view setting.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-editor.c: added more (working) integration with the</div><div class='del'>-	meeting schedular.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion</div><div class='del'>-	of the code back into operation, because the icalproperty_remove_parameter()</div><div class='del'>-	function is now implemented.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-editor.c: added more (unworking) integration with the</div><div class='del'>-	meeting schedular.</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_destroy): New destroy</div><div class='del'>-	handler to properly stop the timer, sync the log and unref</div><div class='del'>-	the URI.</div><div class='del'>-	(cal_backend_last_client_gone): Just emit the signal,</div><div class='del'>-	clean up work is done in cal_backend_destroy now.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the</div><div class='del'>-	uri we are replacing NOT the new uri.</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Fix build</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Fix build</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (delete_archive_record):</div><div class='del'>-	Don't throw an error</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: Add defines</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions</div><div class='del'>-	can't make this a public interface in the usual way as then the</div><div class='del'>-	symbols would be exported</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be</div><div class='del'>-	happy! Add some defines to include only the necessary config functions.</div><div class='del'>-	(conduit_get_gpilot_conduit): Hook up archive signals</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (properties_cmd): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_at): use</div><div class='del'>-	cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-2000-10-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added</div><div class='del'>-	_click-to-add-message, though I'm not sure if i18n will work.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_obj_time_add_hours):</div><div class='del'>-	(cal_obj_time_add_minutes):</div><div class='del'>-	(cal_obj_time_add_seconds): updated to handle -ve args.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling</div><div class='del'>-	mktime().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the</div><div class='del'>-	callback if the event ends exactly on the interval start time.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reshape_event_span):</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reshape_long_event):</div><div class='del'>-	(e_day_view_reshape_day_event): use cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-2000-10-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): set default MonthVPanePosition</div><div class='del'>-	to 1 rather than 0, so if you move the hpane you'll see the date</div><div class='del'>-	navigator.</div><div class='del'>-</div><div class='del'>-2000-10-19  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: added a public function which causes the</div><div class='del'>-	event editor to reload its widgets to the associated CalComponent.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added rudimentary support for the phat</div><div class='del'>-	e-meeting-time-selector widget, though it has no effect on the</div><div class='del'>-	component yet.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: the meeting editor depends on the meeting widget</div><div class='del'>-	library, now.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: I added another toolbar button that summons</div><div class='del'>-	from the hoary deep the meeting time widget.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Add `$(glade_messages)'.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (create_menu, create_toolbar): kill.</div><div class='del'>-	(event_editor_destroy): upd.</div><div class='del'>-	(event_editor_construct): update to new UI handler, cast</div><div class='del'>-	priv-&gt;general_summary to a widget not an object.</div><div class='del'>-</div><div class='del'>-2000-10-18  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.</div><div class='del'>-	(debug_xml_cb): add debugging hook.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.</div><div class='del'>-</div><div class='del'>-2000-10-17  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: Add defines</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions</div><div class='del'>-	can't make this a public interface in the usual way as then the</div><div class='del'>-	symbols would be exported</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be</div><div class='del'>-	happy! Add some defines to include only the necessary config functions.</div><div class='del'>-	(conduit_get_gpilot_conduit): Hook up archive signals</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-2000-10-16  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: You can now add incoming iTip</div><div class='del'>-	messages to your calendar store.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: added a progress bar dialog</div><div class='del'>-	in case the calendar loading takes a long time.</div><div class='del'>-</div><div class='del'>-2000-10-16  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff</div><div class='del'>-	is in the conduits now and uses the logging facility.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h: ditto</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: ditto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	Take a stab at storing recurrence stuff on the pilot properly</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the</div><div class='del'>-	event until after the update in case its a new item</div><div class='del'>-</div><div class='del'>-2000-10-16  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm</div><div class='del'>-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know</div><div class='del'>-	if you like these or not, I might work on these some more but</div><div class='del'>-	I wanted to put these versions up anyway to get feedback..</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was</div><div class='del'>-	already in INCLUDES</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added an</div><div class='del'>-	"evolution:shell-component-icon" attribute.</div><div class='del'>-</div><div class='del'>-2000-10-12  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.{c,glade}: Made the control much more</div><div class='del'>-	relavent to the function at hand.</div><div class='del'>-</div><div class='del'>-2000-10-12  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon</div><div class='del'>-	columns to a min width of 18 and resizable to FALSE.</div><div class='del'>-</div><div class='del'>-2000-10-12  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate):</div><div class='del'>-	(update_pixmaps):</div><div class='del'>-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,</div><div class='del'>-	and removed a lot of old unused stuff. We'll use plain buttons for</div><div class='del'>-	the view buttons for now, until Bonobo toolbars support radio buttons.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not</div><div class='del'>-	NULL before using it.</div><div class='del'>-	(gnome_calendar_update_view_buttons): check button is not NULL.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24</div><div class='del'>-	hour format the wrong way round.</div><div class='del'>-</div><div class='del'>-2000-10-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):</div><div class='del'>-	Store recurrence stuff on the desktop properly</div><div class='del'>-	(get_ical_day): Utility function</div><div class='del'>-</div><div class='del'>-2000-10-12  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Disable the executive summary.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType</div><div class='del'>-	as a param because its impossible to determine after a delete.</div><div class='del'>-	(cal_backend_remove_object): Calculate CalObjType and pass</div><div class='del'>-	it to cal_backend_log_entry</div><div class='del'>-	(cal_backend_update_object): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill</div><div class='del'>-	unused variables.</div><div class='del'>-	(add_archive_record): Don't kill the sync if this happens</div><div class='del'>-	(update_record): Kill old function</div><div class='del'>-	(replace_record): New function to handle replace_record signal</div><div class='del'>-	(conduit_get_gpilot_conduit): Listen for replace record signal</div><div class='del'>-	(add_record): Always add a new record, never replace</div><div class='del'>-	(replace_record): Always replace an existing record</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-2000-10-10  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: set a default size for the control.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added information about the</div><div class='del'>-	text/calendar MIME type, so that the evolution-calendar is called</div><div class='del'>-	to deal with iMIP attachments.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.[ch]: These files implement a Bonobo</div><div class='del'>-	control that will eventually deal with iMIP/iTIP messages from</div><div class='del'>-	the mailer. Right now, it's not working.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned</div><div class='del'>-	control.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added references to the files I created.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: called the initialization function of the Bonobo</div><div class='del'>-	control factory.</div><div class='del'>-</div><div class='del'>-2000-10-11  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/task-assigned-to.xpm gui/task-assigned.xpm</div><div class='del'>-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:</div><div class='del'>-	New versions of the icons for the tasklist/pad.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir</div><div class='del'>-	as we need it to save the config settings.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): call calendar_config_write_on_exit() to write</div><div class='del'>-	out some special config settings (as the mail component does).</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (properties_cmd): changed to use the new</div><div class='del'>-	preferences dialog.</div><div class='del'>-	(update_all_config_settings): new function to iterate over all the</div><div class='del'>-	calendars and update the config settings.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[hc]: new files to handle loading/saving config</div><div class='del'>-	settings.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,</div><div class='del'>-	plus minor changes.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: updated.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c:</div><div class='del'>-	* gui/popup-menu.c: update to #include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.</div><div class='del'>-	(owner_set_cb):</div><div class='del'>-	(owner_unset_cb): updated the prototypes.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): added call to calendar_config_write_on_exit().</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.h:</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): added global evolution_dir</div><div class='del'>-	just like the mail component, so we know we to store config stuff.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Fixed the column elements here.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Updated to use the new ETable</div><div class='del'>-	specification stuff.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_sax_start_element): The</div><div class='del'>-	element is "pilot_id" not "pilotid".  Update both maps</div><div class='del'>-	(compute_pid): Utility function to set a local records pid</div><div class='del'>-	(local_record_from_comp): Compute the pid and status here,</div><div class='del'>-	no longer use the old cal_component pilot interfaces</div><div class='del'>-	(free_match): Its a *local not a **local</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: same as above</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Have both a uid and pid map</div><div class='del'>-</div><div class='del'>-	* conduits/todo/calendar-conduit.h: same as above</div><div class='del'>-</div><div class='del'>-2000-10-09  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which</div><div class='del'>-	is based on the latest pilot link changes.</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the executive-summary library and cflags</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added oaf servers for the</div><div class='del'>-	executive summary and executive summary factory.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.[ch]: New files to create the summary.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (summary_fn): Create the executive</div><div class='del'>-	summary component.</div><div class='del'>-	(component_factory_init): Start the summary factory as well.</div><div class='del'>-</div><div class='del'>-2000-10-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.[ch]: New widget to pick weekdays.</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: upd.</div><div class='del'>-	(calendar_control_activate): upd.</div><div class='del'>-	(calendar_control_deactivate): upd.</div><div class='del'>-</div><div class='del'>-2000-10-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: when the user types in a new event, don't create</div><div class='del'>-	it until the user hits Return or switches focus. Removed the</div><div class='del'>-	editing_new_event flags.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can</div><div class='del'>-	start testing the recurrence code.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: a few fixes.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to</div><div class='del'>-	return TRUE for long events, not FALSE.</div><div class='del'>-</div><div class='del'>-2000-10-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_todo_details): As a temporary solution to the</div><div class='del'>-	to-do printing, just print the summaries.  We'll use the ETable</div><div class='del'>-	printing stuff later.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.</div><div class='del'>-	(print_todo_details_cb): Likewise.</div><div class='del'>-	(print_day_summary): Initialize psi.events.  This code was</div><div class='del'>-	obviously never tested.</div><div class='del'>-	(print_todo_details): Likewise.</div><div class='del'>-	(print_day_details): Initialize pdi.slots.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b</div><div class='del'>-	confusion.  Fixes bugzilla #644.</div><div class='del'>-	(range_selector_new): Fix the whole localization mess by making</div><div class='del'>-	better use of strftime().  Now we generate whole date strings at a</div><div class='del'>-	time and compose them later.  Fixes bugzilla #643.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters</div><div class='del'>-	in both the GUI and underlying iCal.</div><div class='del'>-</div><div class='del'>-2000-09-29  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added support for organizers in the meeting</div><div class='del'>-	scheduler.</div><div class='del'>-</div><div class='del'>-2000-09-29  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added code that makes changes to the underlying</div><div class='del'>-	iCAL structure of an event, when the user changes meeting information.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog</div><div class='del'>-	and accoutrements.</div><div class='del'>-</div><div class='del'>-2000-09-29  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: updated to support RDATE end times or</div><div class='del'>-	durations. Note that if you have two RDATEs with the same start times,</div><div class='del'>-	but with different end dates/durations set, the results are</div><div class='del'>-	unpredictable. So the event editor dialog should check for this.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):</div><div class='del'>-	make strftime() strings translatable, and changed the formats a bit.</div><div class='del'>-</div><div class='del'>-	* NOTE: someone needs to check print.c to make sure strftime strings</div><div class='del'>-	are OK for i18n.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to</div><div class='del'>-	include the weekday if possible. Also changed EDayView struct so we</div><div class='del'>-	store the month &amp; weekdays with the longest names rather than the</div><div class='del'>-	actual widths. This helps i18n.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for</div><div class='del'>-	strftime strings, tried to see if weekday fits, and rearranged a</div><div class='del'>-	bit to make i18n easier.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for</div><div class='del'>-	strftime strings, and updated to use new formats.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: added use_24_hour_format boolean to</div><div class='del'>-	CalendarModelPrivate so we can display dates in 12-hour format if</div><div class='del'>-	requested. This meant adding a CalendarModel argument to a few</div><div class='del'>-	functions. Also added get/set functions to set use_24_hour_format.</div><div class='del'>-	I suppose ideally we should have an ECellDate renderer and this option</div><div class='del'>-	should go there.</div><div class='del'>-</div><div class='del'>-2000-09-27  Jesse Pavel	  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: changed a menu entry so that it will invoke</div><div class='del'>-	my meeting editor.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary</div><div class='del'>-	support for iTIP meeting scheduling. Currently, only the GUI works;</div><div class='del'>-	there is not yet any backend support.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]</div><div class='del'>-</div><div class='del'>-2000-09-24  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled</div><div class='del'>-	window for the description field, since the default window height</div><div class='del'>-	doesn't seem to be working.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: added functions to get the actual</div><div class='del'>-	icalproperty lists for RRULE and EXRULE properties.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to</div><div class='del'>-	test it a bit. Also fixed the call to generate_instances_for_year() so</div><div class='del'>-	it uses the chunk dates.</div><div class='del'>-</div><div class='del'>-2000-09-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (verbs): Removed the "about calendar"</div><div class='del'>-	command, since we don't want to have both "About Evolution" and</div><div class='del'>-	"About Calendar".</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler</div><div class='del'>-	update.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there</div><div class='del'>-	is no map file.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Add since field to context</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility</div><div class='del'>-	function</div><div class='del'>-	(map_sax_start_element): Look for the map timestamp as well</div><div class='del'>-	(map_write): Write the map timestamp</div><div class='del'>-	(pre_sync): Use the map time stamp when looking for changed entries</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure</div><div class='del'>-	we are in a valid timestamp</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file</div><div class='del'>-	name relevant to the actual calendar file, rather than just the</div><div class='del'>-	directory.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local</div><div class='del'>-	sax handler.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile</div><div class='del'>-	(map_sax_parse): Delete</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly</div><div class='del'>-	assign the CalObjChange type.</div><div class='del'>-	(cal_backend_log_sax_parse): Delete</div><div class='del'>-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile</div><div class='del'>-</div><div class='del'>-2000-09-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function</div><div class='del'>-	(cal_backend_load): use above</div><div class='del'>-	(cal_backend_create): use above</div><div class='del'>-	(cal_backend_log_name): Take a uri instead of a backend param</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: Get rid of useless hash functions</div><div class='del'>-	(cal_backend_file_load): Check to make sure path exists and is</div><div class='del'>-	local</div><div class='del'>-	(cal_backend_file_load): Unref the current uri if there is one</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before</div><div class='del'>-	shooting ourselves in the foot</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (save): Fully implement backing up the</div><div class='del'>-	calendar before writing out the new entry.</div><div class='del'>-</div><div class='del'>-2000-09-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some</div><div class='del'>-	other cases where a slow sync is in order</div><div class='del'>-	(pre_sync): Pre load the uids, the map and the add/mod/del lists</div><div class='del'>-	(match_record): Use the map hash to match records</div><div class='del'>-	(iterate): Iterate using the pre-loaded uid list</div><div class='del'>-	(iterate_specific): Iterate using the add/mod/del lists</div><div class='del'>-	(purge): Delete all entries in the del list</div><div class='del'>-	(set_status): Set status by adding to an appropriate list</div><div class='del'>-	(set_pilot_id): Set pilot_id by updating map hash</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Add lists for added, modified and</div><div class='del'>-	deleted objects</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id-&gt;uid map</div><div class='del'>-	file name</div><div class='del'>-	(map_sax_start_element): SAX handler to extract a pilot_id-&gt;uid</div><div class='del'>-	mapping</div><div class='del'>-	(map_sax_parse): Parse the given file and build a pilot_id-&gt;uid hash</div><div class='del'>-	(map_write_foreach): Write out individual mapping elements</div><div class='del'>-	(map_write): Write out the pilot_id-&gt;uid mapping</div><div class='del'>-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: A little renaming</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Fix build slightly</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list</div><div class='del'>-	of CalObjChanges</div><div class='del'>-	(Cal_get_objects_in_range): Implement new corba function</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL</div><div class='del'>-	(cal_backend_load): Track the uri so we can write the log file</div><div class='del'>-	to the same place</div><div class='del'>-	(cal_backend_log_name): Figure out the log filename/path based on</div><div class='del'>-	the calendar uri</div><div class='del'>-	(cal_backend_set_node_timet): Set an xml node property value from</div><div class='del'>-	a time_t</div><div class='del'>-	(cal_backend_log_entry): Adds a log entry to list waiting to be written</div><div class='del'>-	out</div><div class='del'>-	(cal_backend_log_sync): Syncs the log entries to disk</div><div class='del'>-	(cal_backend_log_sax_start_element): SAX callback for reading in</div><div class='del'>-	log entries</div><div class='del'>-	(cal_backend_log_sax_end_element): ditto</div><div class='del'>-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log</div><div class='del'>-	file looking for particular log entries and creating a CalObjChange</div><div class='del'>-	hash with the last change for each object</div><div class='del'>-	(cal_backend_get_log_entries): Returns a hash of objects of a given</div><div class='del'>-	type changed since the given time</div><div class='del'>-	(cal_backend_update_object): Add appropriate log entries</div><div class='del'>-	(cal_backend_remove_object): ditto</div><div class='del'>-	(cal_backend_get_changed_uids): Implement new idl interface call</div><div class='del'>-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.[hc]: Remove crufty files</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New</div><div class='del'>-	function that returns the CalObjType for a uid.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_change_list): Build a list</div><div class='del'>-	of CalObjChange items from a corba sequence.</div><div class='del'>-	(cal_client_get_changed_uids): New accessor method for the</div><div class='del'>-	similarly named addition to the idl file.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType</div><div class='del'>-	enum.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility</div><div class='del'>-	method to free a list of CalObjChange objects.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: Add get_changed_uids method</div><div class='del'>-	and associated types.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,</div><div class='del'>-	gui/e-week-view-event-item.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,</div><div class='del'>-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines</div><div class='del'>-	to deal properly with gal.</div><div class='del'>-</div><div class='del'>-	* gui/check-filled.xpm: New file since we can't include it from</div><div class='del'>-	e-table anymore.</div><div class='del'>-</div><div class='del'>-2000-09-16  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (INCLUDES): add datadir</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): use it.</div><div class='del'>-</div><div class='del'>-2000-09-14  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/.cvsignore: Shush</div><div class='del'>-</div><div class='del'>-2000-09-14  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Add headers with GPL notice and credit copyright to those appropriate</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,</div><div class='del'>-	authors, copyright for about dialog.</div><div class='del'>-	(activate_sync_type): Tidy</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*</div><div class='del'>-	to avoid conflicts.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo.conduit.in: Removed</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.desktop: Removed</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):</div><div class='del'>-	The config file will now be called e-todo-conduit</div><div class='del'>-	(todoconduit_save_configuration): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.</div><div class='del'>-	(pre_sync): Remove commented out function that does not exist.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Re-write most UI handler code.</div><div class='del'>-</div><div class='del'>-2000-09-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): Removed an unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): See if the new object</div><div class='del'>-	matches the type of objects we were told to deal with.</div><div class='del'>-	(load_objects): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-13  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot</div><div class='del'>-	item from the hash if it exists in the first place.</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (add_component): plug leakage</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*</div><div class='del'>-	for now</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make</div><div class='del'>-	this actually fill in the todo record.</div><div class='del'>-	(find_record_in_repository): Add debug stuff</div><div class='del'>-	(iterate_specific): Use the already exisiting utility function</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct</div><div class='del'>-	the status and id types. g_strdup the uid since this is not a</div><div class='del'>-	constified return</div><div class='del'>-	(cal_backend_file_get_uid_by_pilot_id): correct the id type</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove `ui.xml' stuff.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.</div><div class='del'>-</div><div class='del'>-2000-09-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the</div><div class='del'>-	"cal_loaded" signal of the client here.</div><div class='del'>-	(connect_load): Removed function.</div><div class='del'>-	(disconnect_load): Removed function.</div><div class='del'>-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal</div><div class='del'>-	structure instead of in a weird closure.  This gets rid of the</div><div class='del'>-	connect/disconnect mess as well.</div><div class='del'>-	(gnome_calendar_open): Store the URI in the GnomeCal.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Fixed a warning (removed unused variable</div><div class='del'>-	gfloat width from e_day_view_get_event_position.)</div><div class='del'>-</div><div class='del'>-2000-09-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to</div><div class='del'>-	EToDoLocalRecord, header cleanup</div><div class='del'>-</div><div class='del'>-2000-09-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use</div><div class='del'>-	description list instead of comment list for pilot todo note</div><div class='del'>-	(transmit): Check for null cal component properties, set priority</div><div class='del'>-	correctly, use description list instead of comment list.  Make</div><div class='del'>-	pilot record private when appropriate.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only</div><div class='del'>-	set the due date only if it exists</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): Relying on the status</div><div class='del'>-	field is somewhat faulty since it is related to group scheduling</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):</div><div class='del'>-	Make log output a little more sensible</div><div class='del'>-	(comp_from_remote_record): Minor correction when making a CalComponent</div><div class='del'>-	from scratch.</div><div class='del'>-	(update_record): Use comp_from_remote_record for new items, rather</div><div class='del'>-	than repeating the code here.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function</div><div class='del'>-	since its no longer useful.  Fix naming of various fields from</div><div class='del'>-	the header changes.  Use GnomePilotRecord* stuff instead of</div><div class='del'>-	ICAL_PILOT_SYNC_*</div><div class='del'>-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes</div><div class='del'>-	a pilot id and loads the configuration here</div><div class='del'>-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.</div><div class='del'>-	Unref the client and destroy the configuration if they exist here</div><div class='del'>-	(start_calendar_server): Change the default calendar name</div><div class='del'>-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid</div><div class='del'>-	(local_record_from_compobject): Rename from</div><div class='del'>-	local_record_from_icalobject.  Properly do the pilot id and status.</div><div class='del'>-	(comp_from_remote_record): Rename from ical_from_remote_record.</div><div class='del'>-	Handle due, complete, classification and pilot stuff properly</div><div class='del'>-	(pre_sync): Remove some old stuff.  We need to figure out how to</div><div class='del'>-	set some of the field values.</div><div class='del'>-	(set_status): Reflect pilot status changes from above</div><div class='del'>-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is</div><div class='del'>-	now done by e_todo_context_destroy</div><div class='del'>-	(conduit_get_gpilot_conduit): Only set the context as object</div><div class='del'>-	data of the conduit.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to</div><div class='del'>-	EToDoConduitContext.  Remove some unused struct fields.</div><div class='del'>-	For GCalLocalRecord, rename ical to comp.</div><div class='del'>-</div><div class='del'>-2000-09-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: changed to use EDateEdit.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: added "None" option to</div><div class='del'>-	Classification option menu, and used custom widgets for the date</div><div class='del'>-	entries so we can use EDateEdit widgets.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs</div><div class='del'>-	to be fixed at some point to handle invalid dates, i.e. when</div><div class='del'>-	e_date_edit_get_time returns -1.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (ensure_task_complete):</div><div class='del'>-	(ensure_task_not_complete): new functions to set the related properties</div><div class='del'>-	to make sure a task is marked as complete on not, i.e. "Date Completed"</div><div class='del'>-	"Status" and "Percent" properties.</div><div class='del'>-</div><div class='del'>-2000-09-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): use the status field rather</div><div class='del'>-	than the completed date, as it is more reliable.</div><div class='del'>-	(get_is_overdue): use get_is_complete().</div><div class='del'>-	(calendar_model_mark_task_complete): check if it is already complete,</div><div class='del'>-	and if so don't update it.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_status):</div><div class='del'>-	(cal_component_set_status): added functions to support the STATUS</div><div class='del'>-	property. Also added the property to CalComponentPrivate and set it</div><div class='del'>-	to NULL in free_icalcomponent(). Someone should check my code as I've</div><div class='del'>-	mainly done a Cut &amp; Paste job.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-	* conduits/todo/todo-conduit.c: Convert "//" style comments</div><div class='del'>-	(local_record_from_ical_uid): Remove iCalObject cruft</div><div class='del'>-	(ical_from_remote_record): ditto</div><div class='del'>-	(free_match): Properly unref the CalComponent</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use</div><div class='del'>-	cal component pilot stuff properly</div><div class='del'>-	(find_record_in_repository): Remove cruft</div><div class='del'>-	(ical_from_remote_record): Remove cruft</div><div class='del'>-	(update_record): Set the vtype immediately after creation. Remove cruft</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: Move all the config stuff</div><div class='del'>-	here, I need to kill the warnings at some point</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):</div><div class='del'>-	Set all the state variables correctly on a revert</div><div class='del'>-	(doSaveSettings): Update original state</div><div class='del'>-	(doHelp): Rename from about_cb</div><div class='del'>-	(main): Destroy configurations when done</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing</div><div class='del'>-	pilot ids</div><div class='del'>-	(cbf_pilot_equal): For hash table of pilot ids</div><div class='del'>-	(cal_backend_file_destroy): Destroy pilot id hash</div><div class='del'>-	(add_component): Insert the uid into the pilot hash</div><div class='del'>-	(remove_component): Remove the uid from the pilot hash</div><div class='del'>-	(cal_backend_file_load): Create the pilot hash</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash</div><div class='del'>-	(cal_backend_file_update_pilot_id): ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: Update prototypes</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement</div><div class='del'>-	using ical X properties</div><div class='del'>-	(cal_component_set_pilot_id): ditto</div><div class='del'>-	(cal_component_get_pilot_status): ditto</div><div class='del'>-	(cal_component_set_pilot_status): ditto</div><div class='del'>-	(cal_component_free_pilot_id): Free a pilot id</div><div class='del'>-	(cal_component_free_pilot_status): Free a pilot status</div><div class='del'>-</div><div class='del'>-2000-09-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/libical/src/libical' so that we get</div><div class='del'>-	`icalversion.h' from the build directory instead of taking it from</div><div class='del'>-	the installation directory, which is of course Wrong (tm).</div><div class='del'>-	* gui/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (cal_loaded_cb): New function with the</div><div class='del'>-	loading/creation state machine.  It is carefully modelled after</div><div class='del'>-	the state machine that started the Universe, so bow before it.</div><div class='del'>-	(gnome_calendar_construct): Do not connect to cal_loaded here.</div><div class='del'>-	(connect_load): The closure for the cal_loaded callback is a bit</div><div class='del'>-	tricky, so provide a function to create it and connect to the</div><div class='del'>-	signal.</div><div class='del'>-	(disconnect_load): Disconnect from the signal and free the</div><div class='del'>-	closure.</div><div class='del'>-	(gnome_calendar_load_cb): Removed obsolete buggy function.</div><div class='del'>-	(gnome_calendar_open): Use the new mechanism.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (set_prop): The default filename is now</div><div class='del'>-	calendar.ics.</div><div class='del'>-</div><div class='del'>-2000-09-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (transmit): Use</div><div class='del'>-	icaltime_as_timet</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,</div><div class='del'>-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-2000-09-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fall equinox cleanup!</div><div class='del'>-</div><div class='del'>-	OK, I know the equinox is not here yet, but weather has changed</div><div class='del'>-	enough to warrant it.</div><div class='del'>-</div><div class='del'>-	Sigh.  This place is definitely not the tropics.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (obj_updated_cb): Renamed from</div><div class='del'>-	gnome_calendar_object_updated_cb(); fixed prototype.</div><div class='del'>-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();</div><div class='del'>-	fixed prototype.</div><div class='del'>-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a</div><div class='del'>-	private structure so I don't have to rebuild the whole calendar</div><div class='del'>-	GUI directory every time something changes in the object.</div><div class='del'>-	(GnomeCalendarPrivate): Removed the property bag and the control</div><div class='del'>-	fields; they are local to the control-factory now.</div><div class='del'>-	(gnome_calendar_update_view_buttons): Remove the</div><div class='del'>-	ignore_view_button_clicks mess and just block the signal.</div><div class='del'>-	(gnome_calendar_set_view): Added a "focus" argument to indicate</div><div class='del'>-	whether we want the main widget in the specified view to grab the</div><div class='del'>-	focus.</div><div class='del'>-	(gnome_calendar_set_view_internal): Handle the focus argument here.</div><div class='del'>-	(gnome_calendar_set_view_buttons): Temporary hack to notify the</div><div class='del'>-	calendar about its buttons.</div><div class='del'>-	(gnome_calendar_get_selected_time_range): New function.</div><div class='del'>-	(gnome_calendar_get_cal_client): New function.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (calendar_properties_init): Keep the</div><div class='del'>-	property bag local to here; it does not need to be in the calendar</div><div class='del'>-	object yet.</div><div class='del'>-	(control_factory_fn): Renamed from control_factory().  Just use</div><div class='del'>-	control_factory_new_control().</div><div class='del'>-	(control_factory_new_control): Moved the stuff over from</div><div class='del'>-	create_control(), and keep the control local to here.  Check the</div><div class='del'>-	return value of bonobo_control_new().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (show_day_view_clicked): Remove the</div><div class='del'>-	ignore_view_button_clicks mess.</div><div class='del'>-	(new_calendar): Removed the useless "page" argument.</div><div class='del'>-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()</div><div class='del'>-	for now.</div><div class='del'>-</div><div class='del'>-2000-09-07  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Added -lunicode</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: More UTF-8 wrappers</div><div class='del'>-	(priority_index_to_value): Kill warning, add assertion</div><div class='del'>-</div><div class='del'>-2000-09-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	Use new cal_component_has_recurrences convenience function</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_at): ditto</div><div class='del'>-	(calendar_model_value_at): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_click): ditto</div><div class='del'>-	(e_day_view_on_event_right_click): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_reshape_day_event): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto</div><div class='del'>-</div><div class='del'>-2000-09-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use</div><div class='del'>-	new convenience functions and only get the recurrence</div><div class='del'>-	stuff if needed.  Free the recurrence stuff if used.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: Add new prototypes</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_has_exrules): Utility</div><div class='del'>-	function to determine whether a cal component has any exrules</div><div class='del'>-	(cal_component_has_exdates): Ditto for exdates</div><div class='del'>-	(cal_component_has_exceptions): Utility function to determine</div><div class='del'>-	whether a cal component has any exception rules</div><div class='del'>-	(cal_component_has_recurrences):Utility function to determine</div><div class='del'>-	whether a cal component has any recurrence rules</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if</div><div class='del'>-	there are no dates in the box</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special</div><div class='del'>-	case for when there are exceptions but no rrules or rdates.</div><div class='del'>-	(cal_obj_remove_exceptions): Use date only compare func</div><div class='del'>-	(cal_obj_date_only_compare_func): New compare function that</div><div class='del'>-	compares the date only, not the time.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the</div><div class='del'>-	yearly recurrence type</div><div class='del'>-	(dialog_to_comp_object): We need to allocate icaltimetypes for the</div><div class='del'>-	exdate list</div><div class='del'>-	(fill_widgets): Handle a weekly recurrence with no particular day set</div><div class='del'>-	(dialog_to_comp_object): Kill all rrules if "None" is selected as</div><div class='del'>-	the recurrence type by the user</div><div class='del'>-</div><div class='del'>-2000-09-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new</div><div class='del'>-	TaskEditor dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.[hc]:</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the</div><div class='del'>-	'Status' property (CalComponent doesn't support it yet), and use a</div><div class='del'>-	replacement for GnomeDateEdit, since we need to support setting 'None'</div><div class='del'>-	as the date.</div><div class='del'>-</div><div class='del'>-2000-09-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (obj_updated_cb):</div><div class='del'>-	(obj_removed_cb): compare the updated object's uid with the one we</div><div class='del'>-	are editing, and just return if it doesn't match.</div><div class='del'>-</div><div class='del'>-2000-09-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see</div><div class='del'>-	if the client has loaded successfully. Gets rid of a few warnings.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate</div><div class='del'>-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list</div><div class='del'>-	is a list of icaltimetypes, not CalComponentDateTimes</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append</div><div class='del'>-	the exdate to the list AFTER we create the date value.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_recur_list): Free</div><div class='del'>-	the data, not the list element.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute</div><div class='del'>-	the event duration using the event start/end times, not the</div><div class='del'>-	interval times.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check</div><div class='del'>-	to see if r-&gt;enddate is (time_t)-1 and set to 0 if so</div><div class='del'>-</div><div class='del'>-2000-09-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include</div><div class='del'>-	directories and `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	* conduits/todo/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: e_utf8_wrappers</div><div class='del'>-</div><div class='del'>-2000-09-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c,</div><div class='del'>-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): Use</div><div class='del'>-	gnome_calendar_construct() so that we can check for proper</div><div class='del'>-	creation of the client.</div><div class='del'>-	(gnome_calendar_destroy): Check that the client exists before we</div><div class='del'>-	unref it.</div><div class='del'>-	(gnome_calendar_construct): Do the CalClient creation here.  Bind</div><div class='del'>-	the views to it here as well instead of in setup_widgets().</div><div class='del'>-	(gnome_calendar_init): Call setup_widgets() here.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the</div><div class='del'>-	model.</div><div class='del'>-</div><div class='del'>-2000-09-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Update for new libical.</div><div class='del'>-	Conduits should atleast compile now.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Build the conduits only when they've been</div><div class='del'>-	enabled.</div><div class='del'>-</div><div class='del'>-2000-09-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Make toolbar save and close button.</div><div class='del'>-	We should put a similar menu option in sometime.</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (array_to_list): Use</div><div class='del'>-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Implement delete option</div><div class='del'>-	(dialog_to_comp_object): Set the weekday start value and use</div><div class='del'>-	local not UTC time</div><div class='del'>-</div><div class='del'>-2000-08-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): No need to spit a warning</div><div class='del'>-	if removal fails.</div><div class='del'>-	(event_editor_destroy): Free the exception clist data.  Unref the</div><div class='del'>-	calendar client here.</div><div class='del'>-	(close_dialog): Just call gtk_object_destroy() on the event</div><div class='del'>-	editor; the destroy handler will free everything else.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_object_exists): Removed</div><div class='del'>-	function; this is not useful because we operate asynchronously.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to</div><div class='del'>-	spit a warning if removal fails.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Implement delete option</div><div class='del'>-	(recurrence_toggled): Make an ugly hack to get the recurrence</div><div class='del'>-	pages showing properly since we don't yet implement all of the</div><div class='del'>-	recurrence rule stuff.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_object_exists): New function</div><div class='del'>-	to see if an object exists and is obtainable from the backend</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Add prototype</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed</div><div class='del'>-	callback to do hash cleanup</div><div class='del'>-	(gnome_calendar_edit_object): Set event editor calendar client.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Add new prototype</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Trash signal stuff.  We will manipulate</div><div class='del'>-	the client directly.  Make the toolbar save and menu save items</div><div class='del'>-	work identically.  Add icons to the toolbar.</div><div class='del'>-	(save_event_object): Call cal_client_update_object</div><div class='del'>-	(close_dialog): Unref the client and disconnect signals</div><div class='del'>-	Actually destroy the event editor object.</div><div class='del'>-	(obj_updated_cb): New function.  Doesn't really do anything</div><div class='del'>-	yet but it will inform the user the event has changed elsewhere</div><div class='del'>-	in the future.</div><div class='del'>-	(obj_removed_cb): ditto</div><div class='del'>-	(event_editor_set_cal_client): New function to set the calendar</div><div class='del'>-	client</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit</div><div class='del'>-	the sequence to the cal component and use non UTC times.</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: Countless small changes for gnome-print 0.21+</div><div class='del'>-</div><div class='del'>-2000-08-30  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]:</div><div class='del'>-	* gui/e-day-view-main-item.c:</div><div class='del'>-	* gui/e-week-view.[hc]:</div><div class='del'>-	* gui/e-week-view-main-item.c:</div><div class='del'>-	* gui/calendar-commands.c:</div><div class='del'>-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,</div><div class='del'>-	and a few other fixes.</div><div class='del'>-</div><div class='del'>-2000-08-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the</div><div class='del'>-	dtstart/dtend on the component before adding it.</div><div class='del'>-	(e_day_view_on_editing_stopped): No need to check for an UID.</div><div class='del'>-	Update the summary properly.</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: Make sure the is_utc flag is always</div><div class='del'>-	FALSE for icaltime_from_timet</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct</div><div class='del'>-	from the stack and make sure tzid is always NULL</div><div class='del'>-	(e_week_view_key_press): ditto</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Make sure the is_utc flag is always</div><div class='del'>-	FALSE for icaltime_from_timet</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct</div><div class='del'>-	from the stack and make sure tzid is always NULL</div><div class='del'>-	(e_day_view_finish_long_event_resize): ditto</div><div class='del'>-	(e_day_view_finish_resize): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (add_instance): Actually add the</div><div class='del'>-	comp_instance struct to the instances list.  We now appear</div><div class='del'>-	to able to keep events and todos between sessions. Yay!</div><div class='del'>-</div><div class='del'>-2000-08-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Now the views monitor the client by themselves; it does not make</div><div class='del'>-	sense to proxy all notifications through the GnomeCal.  The</div><div class='del'>-	GnomeCal should just be a meta-widget that holds all the views.</div><div class='del'>-</div><div class='del'>-	At some later point we'll want to decouple the views from the</div><div class='del'>-	GnomeCal so that they can be embedded anywhere; they should emit</div><div class='del'>-	signals to request appropriate actions from the toplevel GUI</div><div class='del'>-	instead of calling the GnomeCal directly.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now</div><div class='del'>-	the day view monitors the client by itself.</div><div class='del'>-	(cal_loaded_cb): New callback; moved over from</div><div class='del'>-	e_day_view_update_all_events().</div><div class='del'>-	(obj_updated_cb): New callback; moved over from</div><div class='del'>-	e_day_view_update_event().</div><div class='del'>-	(obj_removed_cb): New callback; moved over from</div><div class='del'>-	e_day_view_remove_event().</div><div class='del'>-	(e_day_view_update_all_events): Removed function.</div><div class='del'>-	(e_day_view_update_event): Removed function.</div><div class='del'>-	(e_day_view_remove_event): Removed function.</div><div class='del'>-	(*): Use the day_view-&gt;client directly instead of fetching it from</div><div class='del'>-	the GnomeCal.</div><div class='del'>-	(e_day_view_destroy): Unref the client.</div><div class='del'>-	(e_day_view_reload_events): Check if the client is loaded.</div><div class='del'>-	(e_day_view_key_press): Set the vtype of the new component.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.</div><div class='del'>-	(cal_loaded_cb): New callback.</div><div class='del'>-	(obj_updated_cb): New callback.</div><div class='del'>-	(obj_removed_cb): New callback.</div><div class='del'>-	(e_week_view_update_all_events): Removed function.</div><div class='del'>-	(e_week_view_update_event): Removed function.</div><div class='del'>-	(e_week_view_remove_event): Removed function.</div><div class='del'>-	(*): Use the week_view-&gt;client directly.</div><div class='del'>-	(e_week_view_destroy): Unref the client.</div><div class='del'>-	(e_week_view_reload_events): Check if the client is loaded.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the</div><div class='del'>-	views.</div><div class='del'>-	(gnome_calendar_update_all): Do not update the views, since now</div><div class='del'>-	they do it themselves.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Likewise.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Likewise.</div><div class='del'>-	(setup_widgets): Remove all to-do list cruft.</div><div class='del'>-	(gnome_calendar_colors_changed): Likewise.</div><div class='del'>-	(gnome_calendar_todo_properties_changed): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h (todo_style_changed): Removed variable.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: Removed old clist cruft; just left in the</div><div class='del'>-	temporary dialog box for now.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c:</div><div class='del'>-	* cal-client/cal-client.c:</div><div class='del'>-	* conduits/todo/todo-conduit.h:</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.</div><div class='del'>-</div><div class='del'>-2000-08-29  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use</div><div class='del'>-	event_editor_set_event_object</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_set_event_object): Rename</div><div class='del'>-	from event_editor_set_ical_object</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Update prototype</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment):</div><div class='del'>-	Call cal_component_commit_sequence after event changes. Default</div><div class='del'>-	to these being all day events.</div><div class='del'>-</div><div class='del'>-2000-08-29  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC</div><div class='del'>-	times</div><div class='del'>-</div><div class='del'>-2000-08-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_is_loaded): New function.</div><div class='del'>-	We need this from code that dynamically updates from a client and</div><div class='del'>-	could not have connected to the "cal_loaded" signal right after</div><div class='del'>-	the client was created.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (load_objects): Do not try to load the</div><div class='del'>-	objects if the client has not been loaded yet.</div><div class='del'>-	(cal_loaded_cb): Check the status value.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.h (CalendarModel): Declare the private</div><div class='del'>-	structure here so that gdb will give me love.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h (CalFactory): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h (Cal): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListener): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClient): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackend): This no longer has a private</div><div class='del'>-	structure, so remove it.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the</div><div class='del'>-	vCalendar and old iCalendar cruft.</div><div class='del'>-	(libcal_utilinclude_HEADERS): Likewise.</div><div class='del'>-	Removed the obsolete iCalendar test program.</div><div class='del'>-</div><div class='del'>-2000-08-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype</div><div class='del'>-	as libical has the API for this</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with</div><div class='del'>-	icaltime_as_timet</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: ditto</div><div class='del'>-</div><div class='del'>-2000-08-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (remove_component): Remove the</div><div class='del'>-	icalcomponent from the toplevel calendar here.</div><div class='del'>-	(cal_backend_file_update_object): Do not remove it here.</div><div class='del'>-	(cal_backend_file_remove_object): Do not remove it here.</div><div class='del'>-	(add_component): Add the icalcomponent to the toplevel calendar if</div><div class='del'>-	asked to.</div><div class='del'>-	(cal_backend_file_update_object): Do not add it here.</div><div class='del'>-</div><div class='del'>-2000-08-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to</div><div class='del'>-	null, only set recurrence rules and exception dates if there</div><div class='del'>-	are any</div><div class='del'>-</div><div class='del'>-2000-08-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (save): Write out the calendar object</div><div class='del'>-	(cal_backend_file_update_object): Remove/add the icalcomponent</div><div class='del'>-	from our master icalcomponent (the calendar)</div><div class='del'>-	(cal_backend_file_remove_object): Remove the icalcomponent</div><div class='del'>-	from our master icalcomponent</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/main.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/*.gnorba: ditto</div><div class='del'>-</div><div class='del'>-2000-08-25  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment</div><div class='del'>-	debug code.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (set_complete): Set the completed</div><div class='del'>-	date to the current date</div><div class='del'>-	(calendar_model_set_value_at): Handle complete field</div><div class='del'>-</div><div class='del'>-2000-08-25  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): Don't attempt to</div><div class='del'>-	free this if its null</div><div class='del'>-	(calendar_model_duplicate_value): Implement for summary field</div><div class='del'>-	value</div><div class='del'>-	(calendar_model_initialize_value): Remove debug code</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Correct etable init xml</div><div class='del'>-	(create_column): Pass the id to e_table_header_add_column</div><div class='del'>-	rather than a hard coded one</div><div class='del'>-	(e_calendar_table_init): Make sure summary column isn't</div><div class='del'>-	added twice.  Add an alarms column, else etable won't</div><div class='del'>-	work with columns who have an ID higher than that</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Properly append to list</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base</div><div class='del'>-	times are not UTC</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Update for libical 0.19</div><div class='del'>-</div><div class='del'>-2000-08-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc</div><div class='del'>-	the struct icaltimetype but point to one on the stack.  More</div><div class='del'>-	importantly, set the date.tzid to NULL.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (save_event_object_cb): Make signal</div><div class='del'>-	names saner</div><div class='del'>-	(released_event_object_cb): ditto</div><div class='del'>-	(gnome_calendar_edit_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Make signal names saner</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_class_init): Make signal</div><div class='del'>-	names saner now that we don't use ical object</div><div class='del'>-	(save_event_object): ditto with callback names</div><div class='del'>-	(file_save_cb): ditto</div><div class='del'>-	(tb_save_and_close_cb): ditto</div><div class='del'>-	(event_editor_set_ical_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): Umm,</div><div class='del'>-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)</div><div class='del'>-</div><div class='del'>-2000-08-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc</div><div class='del'>-	the struct icaltimetype but point to one on the stack.  More</div><div class='del'>-	importantly, set the date.tzid to NULL.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Remove owner field</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (clear_widgets): Forget about owner field</div><div class='del'>-	(get_widgets): ditto</div><div class='del'>-	(fill_widgets): ditto</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_initialize_value): Handle</div><div class='del'>-	summary field</div><div class='del'>-	(calendar_model_value_is_empty): ditto</div><div class='del'>-	(calendar_model_free_value): ditto</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Remove status bar</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow</div><div class='del'>-	a null list</div><div class='del'>-	(cal_component_set_rdate_list): Allow a null list</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit</div><div class='del'>-	the CalComponent sequence</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: #include &lt;e-util/e-cursors.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):</div><div class='del'>-	Initialize time_min_x1 and hour_r to keep gcc happy.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.</div><div class='del'>-	(e_day_view_update_main_canvas_drag): Initialize start_row.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):</div><div class='del'>-	Initialize time_y_small_min, icon_x.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Re-enable the gui directory.</div><div class='del'>-</div><div class='del'>-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0</div><div class='del'>-	out.</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new</div><div class='del'>-	CalComponent</div><div class='del'>-	(e_week_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/prop.c: #if out some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Updated</div><div class='del'>-	function.</div><div class='del'>-	(e_calendar_table_open_task): Updated function.</div><div class='del'>-</div><div class='del'>-2000-08-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated</div><div class='del'>-	function.</div><div class='del'>-	(calendar_model_free_value): Updated function.</div><div class='del'>-	(calendar_model_initialize_value): Updated function.</div><div class='del'>-	(calendar_model_value_is_empty): Updated function.</div><div class='del'>-	(remove_object): Updated function.</div><div class='del'>-	(obj_updated_cb): Updated function.</div><div class='del'>-	(calendar_model_get_cal_client): Added inline docs.</div><div class='del'>-	(calendar_model_delete_task): Updated.</div><div class='del'>-	(calendar_model_mark_task_complete): Updated.</div><div class='del'>-	(calendar_model_get_cal_object): Updated.</div><div class='del'>-</div><div class='del'>-2000-08-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (set_categories): New function.</div><div class='del'>-	(parse_time): Moved over from the old set_time_t().  This just</div><div class='del'>-	parses the time and leaves the warning dialog for the caller.</div><div class='del'>-	(set_datetime): New function.</div><div class='del'>-	(set_geo): Updated old function.</div><div class='del'>-	(set_percent): Updated old function.</div><div class='del'>-	(set_priority): Updated old function.</div><div class='del'>-	(set_summary): New function.</div><div class='del'>-	(set_url): New function.</div><div class='del'>-	(calendar_model_set_value_at): Updated function.</div><div class='del'>-	(calendar_model_is_cell_editable): Updated function.</div><div class='del'>-	(calendar_model_append_row): Updated.  Added an ugly hack to</div><div class='del'>-	accomodate ETable's lack of a real API for adding new items.</div><div class='del'>-	Also, don't try to set columns that are not editable.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reload_events):</div><div class='del'>-	Use CalObjType</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reload_events): ditto</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: Update prototypes</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):</div><div class='del'>-	Remove commented out portions.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):</div><div class='del'>-	Tidy.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c</div><div class='del'>-	(e_day_view_update_event): Use CalComponent</div><div class='del'>-	instead of iCalObject.  Work around not having a compare</div><div class='del'>-	dates routine for two CalComponents.</div><div class='del'>-	(e_day_view_reshape_long_event): Use CalComponent instead</div><div class='del'>-	of iCalObject, #if some alarm stuff</div><div class='del'>-	(e_day_view_reshape_day_event): ditto</div><div class='del'>-	(e_day_view_reload_events): Use revamped CalClient</div><div class='del'>-	(e_day_view_update_event_cb): Use CalComponent</div><div class='del'>-	instead of iCalObject</div><div class='del'>-	(e_day_view_foreach_event_with_uid): ditto</div><div class='del'>-	(e_day_view_remove_event_cb): ditto</div><div class='del'>-	(e_day_view_update_event_label): ditto</div><div class='del'>-	(e_day_view_find_event_from_uid): ditto</div><div class='del'>-	(e_day_view_on_event_click): ditto</div><div class='del'>-	(e_day_view_on_event_right_click): ditto</div><div class='del'>-	(e_day_view_on_new_appointment): ditto</div><div class='del'>-	(e_day_view_on_edit_appointment): ditto</div><div class='del'>-	(e_day_view_on_delete_occurrence): ditto</div><div class='del'>-	(e_day_view_on_delete_appointment): ditto</div><div class='del'>-	(e_day_view_on_unrecur_appointment): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_finish_long_event_resize): ditto</div><div class='del'>-	(e_day_view_finish_resize): ditto</div><div class='del'>-	(e_day_view_free_event_array): ditto</div><div class='del'>-	(e_day_view_add_event): ditto</div><div class='del'>-	(e_day_view_key_press): ditto</div><div class='del'>-	(e_day_view_on_editing_stopped): ditto</div><div class='del'>-	(e_day_view_update_top_canvas_drag): ditto</div><div class='del'>-	(e_day_view_update_main_canvas_drag): ditto</div><div class='del'>-	(e_day_view_on_drag_data_get): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-2000-08-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent</div><div class='del'>-	instead of iCalObject.  Work around not having a compare</div><div class='del'>-	dates routine for two CalComponents.</div><div class='del'>-	(e_week_view_reload_events): Use revamped CalClient</div><div class='del'>-	(e_week_view_reshape_event_span): Use CalComponent instead</div><div class='del'>-	of iCalObject, #if some alarm stuff</div><div class='del'>-	(e_week_view_update_event_cb): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(e_week_view_foreach_event_with_uid): ditto</div><div class='del'>-	(e_week_view_remove_event_cb): ditto</div><div class='del'>-	(e_week_view_free_events): ditto</div><div class='del'>-	(e_week_view_add_event): ditto</div><div class='del'>-	(e_week_view_on_editing_stopped): ditto</div><div class='del'>-	(e_week_view_find_event_from_uid): ditto</div><div class='del'>-	(e_week_view_key_press): ditto</div><div class='del'>-	(e_week_view_show_popup_menu): ditto</div><div class='del'>-	(e_week_view_on_new_appointment): ditto</div><div class='del'>-	(e_week_view_on_edit_appointment): ditto</div><div class='del'>-	(e_week_view_on_delete_occurrence): ditto</div><div class='del'>-	(e_week_view_on_delete_appointment): ditto</div><div class='del'>-	(e_week_view_on_unrecur_appointment): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-2000-08-18  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Need to come back here later to fix the</div><div class='del'>-	alarm stuff.  The gui also needs to be completely redone to</div><div class='del'>-	support the fancier CalComponent settings (exrules, rdates, etc)</div><div class='del'>-	There are some warnings that I put in to mark some of these</div><div class='del'>-	spots</div><div class='del'>-	(event_editor_destroy): Use Calcomponent instead</div><div class='del'>-	of iCalObject</div><div class='del'>-	(make_title_from_comp): ditto</div><div class='del'>-	(clear_widgets): ditto</div><div class='del'>-	(fill_widgets): ditto</div><div class='del'>-	(classification_get): ditto</div><div class='del'>-	(dialog_to_comp_object): ditto</div><div class='del'>-	(save_ical_object): ditto</div><div class='del'>-	(close_dialog): ditto</div><div class='del'>-	(event_editor_set_ical_object): ditto</div><div class='del'>-</div><div class='del'>-2000-08-17  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(cancel_button): ditto</div><div class='del'>-	(gncal_todo_edit): ditto</div><div class='del'>-	(add_todo): ditto</div><div class='del'>-	(edit_todo): ditto</div><div class='del'>-	(delete_todo): ditto</div><div class='del'>-	(insert_in_clist): ditto</div><div class='del'>-	(gncal_todo_update): ditto</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.h: Update prototypes</div><div class='del'>-</div><div class='del'>-2000-08-16  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Rework gnome-cal.c - alarms are a tad broken ATM so this</div><div class='del'>-	will need more cleaning later.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (snooze): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(edit): ditto</div><div class='del'>-	(audio_notification): ditto</div><div class='del'>-	(display_notification_cb): Use CalComponent member of</div><div class='del'>-	alarm_notify_closure rather than iCalObject</div><div class='del'>-	(display_notification): ditto</div><div class='del'>-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types</div><div class='del'>-	(gnome_calendar_tag_calendar_cb): New</div><div class='del'>-	cal_client_generate_instances callback to</div><div class='del'>-	mark_gtk_calendar_day's</div><div class='del'>-	(gnome_calendar_tag_calendar): Use above callback</div><div class='del'>-	(save_ical_object_cb): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(gnome_calendar_edit_object): ditto</div><div class='del'>-	(gnome_calendar_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-15  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/mark.c (mark_month_item_cb): Callback used to mark every</div><div class='del'>-	event in a month.</div><div class='del'>-	(mark_month_item): Use cal_client_generate_instances with</div><div class='del'>-	above callback</div><div class='del'>-</div><div class='del'>-2000-08-15  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_month_small): Use</div><div class='del'>-	cal_client_get_objects_in_range</div><div class='del'>-	(print_day_details_cb): Callback used to create columns and fill</div><div class='del'>-	events into a day view.  Code should be shared with e-day-view</div><div class='del'>-	in reality.  Maybe need to go back to layout.[hc] a bit later</div><div class='del'>-	(print_day_details): Use cal_client_generate_instances with</div><div class='del'>-	above callback. Iterate over results to expand events to fit.</div><div class='del'>-	(print_day_summary_cb): Callback to build list of event info</div><div class='del'>-	for a day</div><div class='del'>-	(print_day_summary): Use cal_client_generate_instances with</div><div class='del'>-	above callback to generate the required event info for printing</div><div class='del'>-	(print_todo_details_cb): Callback used create list of todo info</div><div class='del'>-	(print_todo_details): Use cal_client_generate_instances with</div><div class='del'>-	above callback to generate required todo info for printing.</div><div class='del'>-</div><div class='del'>-	* gui/layout.[hc]: No longer used.</div><div class='del'>-</div><div class='del'>-2000-08-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_overdue): Finished implementing.</div><div class='del'>-	(calendar_model_value_at): Handle the color field.</div><div class='del'>-</div><div class='del'>-2000-08-11  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_pilot_id):</div><div class='del'>-	(cal_component_set_pilot_id):  stubs for pilot id accessors</div><div class='del'>-	(cal_component_get_pilot_status):</div><div class='del'>-	(cal_component_set_pilot_status): stubs for pilot status accessors</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (transmit): start to</div><div class='del'>-	convert to cal-component interface</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (transmit): same</div><div class='del'>-</div><div class='del'>-2000-08-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_geo): Generate a prettier string for</div><div class='del'>-	the geographical position.</div><div class='del'>-	(get_classification): New function.</div><div class='del'>-	(get_categories): New function.</div><div class='del'>-	(get_completed): New function.</div><div class='del'>-	(get_dtend): New function.</div><div class='del'>-	(get_dtstart): New function.</div><div class='del'>-	(get_due): New function.</div><div class='del'>-	(get_percent): New function.</div><div class='del'>-	(get_priority): New function.</div><div class='del'>-	(get_summary): New function.</div><div class='del'>-	(get_transparency): New function.</div><div class='del'>-	(get_url): New function.</div><div class='del'>-	(get_has_alarms): New function.</div><div class='del'>-	(get_has_recurrences): New function.</div><div class='del'>-	(get_is_complete): New function.</div><div class='del'>-	(get_is_overdue): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the GEO</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_geo): Likewise.</div><div class='del'>-	(cal_component_set_geo): Likewise.</div><div class='del'>-	(cal_component_free_geo): Likewise.</div><div class='del'>-	(cal_component_set_exdate_list): Removed incorrect assertion.</div><div class='del'>-	(cal_component_set_exrule_list): Removed incorrect assertion.</div><div class='del'>-	(cal_component_get_next_alarm): Oops, this had not been</div><div class='del'>-	implemented at all.</div><div class='del'>-	(cal_component_has_rdates): New function.</div><div class='del'>-	(cal_component_has_rrules): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalComponentField): Added the GEO</div><div class='del'>-	property.</div><div class='del'>-</div><div class='del'>-2000-08-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the</div><div class='del'>-	PERCENT-COMPLETE property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_percent): Likewise.</div><div class='del'>-	(cal_component_set_percent): Likewise.</div><div class='del'>-	(cal_component_free_percent): Likewise.</div><div class='del'>-	(scan_property): Handle the PRIORITY property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_priority): Likewise.</div><div class='del'>-	(cal_component_set_priority): Likewise.</div><div class='del'>-	(cal_component_free_priority): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalComponentField): New enumeration</div><div class='del'>-	with the list of fields we support for ETable.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Update prototype.</div><div class='del'>-</div><div class='del'>-2000-08-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.</div><div class='del'>-	Mostly moved over from calendar-commands.c:display_objedit().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!</div><div class='del'>-	(display_objedit): Removed.</div><div class='del'>-	(new_appointment_cb): New function.  Just call</div><div class='del'>-	gnome_calendar_new_appointment().</div><div class='del'>-	(display_objedit_today): Removed.</div><div class='del'>-	(calendar_control_activate): Removed the "New appointment for</div><div class='del'>-	today" option, since it is pretty useless.</div><div class='del'>-</div><div class='del'>-2000-08-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_generate_instances): There.</div><div class='del'>-	A pretty function to generate recurrence instances atomically so</div><div class='del'>-	that clients don't have to jump through hoops.  Now we can get rid</div><div class='del'>-	of the ugly calendar_iterate() function.</div><div class='del'>-</div><div class='del'>-2000-08-09  Cody Russell  &lt;bratsche@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Make the toolbar honor the user's</div><div class='del'>-	gnomecc settings for detachable toolbars.</div><div class='del'>-</div><div class='del'>-2000-08-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger</div><div class='del'>-	time from the current time.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()</div><div class='del'>-	method.  Takes in a time range and the type of component we are</div><div class='del'>-	interested in; returns a list of UIDs.  The idea is that</div><div class='del'>-	ocurrences get computed in the client; we can have multiple</div><div class='del'>-	recurrences in iCalendar and we cannot identify them trivially</div><div class='del'>-	across the wire.</div><div class='del'>-	(Cal): Removed the get_events_in_range() method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.</div><div class='del'>-	(cal_backend_get_objects_in_range): New function.</div><div class='del'>-	(cal_backend_get_events_in_range): Removed.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):</div><div class='del'>-	Implemented new method.</div><div class='del'>-	(cal_backend_file_get_events_in_range): Removed.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_events_in_range): Removed.</div><div class='del'>-	(uncorba_obj_type): New function.</div><div class='del'>-	(Cal_get_uids): Use uncorba_obj_type().</div><div class='del'>-	(Cal_get_n_objects): Likewise.</div><div class='del'>-	(Cal_get_objects_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.</div><div class='del'>-	(cal_client_get_objects_in_range): Implemented.</div><div class='del'>-	(corba_obj_type): New function.</div><div class='del'>-	(cal_client_get_n_objects): Use corba_obj_type().</div><div class='del'>-	(cal_client_get_uids): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_clone): New function.</div><div class='del'>-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE</div><div class='del'>-	property does not need incrementing.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use</div><div class='del'>-	CalComponent.  Deal with an empty summary property.</div><div class='del'>-</div><div class='del'>-2000-08-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,</div><div class='del'>-	libical owns the string's memory, so do not free it.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (create_client): Connect to the destroy</div><div class='del'>-	signal of the client here.</div><div class='del'>-</div><div class='del'>-	* cal-client/test.ics: New test file, modified from Eric Busboom's</div><div class='del'>-	test file from RFC 2445.</div><div class='del'>-</div><div class='del'>-2000-08-05  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (dump_component): This was gone for</div><div class='del'>-	some reason.</div><div class='del'>-	(main): Load a new test file.</div><div class='del'>-</div><div class='del'>-2000-08-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_commit_sequence): New</div><div class='del'>-	function to commit changes to the SEQUENCE property.</div><div class='del'>-	(cal_component_get_as_string): Ensure that the sequence has been</div><div class='del'>-	committed.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Use</div><div class='del'>-	CalComponent instead of the old iCalObject.</div><div class='del'>-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE</div><div class='del'>-	property before stringifying the object and piping it over to the</div><div class='del'>-	Wombat.</div><div class='del'>-</div><div class='del'>-2000-08-04  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if</div><div class='del'>-	oaf isn't initialized by the time the conduit starts, start it</div><div class='del'>-	up.  we do this because we need to start wombat with oaf, and</div><div class='del'>-	gpilotd doesn't currently start oaf.</div><div class='del'>-</div><div class='del'>-2000-08-04  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): unref.</div><div class='del'>-</div><div class='del'>-2000-08-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):</div><div class='del'>-	Added stub for now.</div><div class='del'>-	(cal_backend_file_update_pilot_id): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]</div><div class='del'>-	from the list of sources.  The idea is to move vCalendar importing</div><div class='del'>-	to the GUI as a convenience function.</div><div class='del'>-</div><div class='del'>-2000-08-02  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call</div><div class='del'>-	save (cbimc) after setting the pilot id and status.</div><div class='del'>-</div><div class='del'>-2000-08-02  Joe Shaw  &lt;joe@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):</div><div class='del'>-	Fixed a g_return_if_fail that had two parameters and thus</div><div class='del'>-	wouldn't build.</div><div class='del'>-</div><div class='del'>-2000-08-03  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_append_row): updated to match</div><div class='del'>-	the new ETableModel append_row. This meant we could also get rid of</div><div class='del'>-	the row_being_added and idle_id hack.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Emit "model_pre_change" signals as</div><div class='del'>-	appropriate.</div><div class='del'>-</div><div class='del'>-2000-08-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file</div><div class='del'>-	backend.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_icalcomponent):</div><div class='del'>-	Return an operation success code for if we are passed a component</div><div class='del'>-	of a type we don't support.</div><div class='del'>-</div><div class='del'>-2000-07-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (*): Use CalComponent and the new property</div><div class='del'>-	types instead of the old iCalObject stuff.</div><div class='del'>-	(cal_recur_generate_instances): Renamed from</div><div class='del'>-	cal_object_generate_events().  Ensure that the component has the</div><div class='del'>-	DTSTART property.</div><div class='del'>-	(generate_instances_for_year): Renamed from</div><div class='del'>-	cal_object_generate_events_for_year().</div><div class='del'>-	(cal_obj_expand_recurrence): Made static.</div><div class='del'>-	(cal_recur_from_icalrecurrencetype): New function.  We should</div><div class='del'>-	really convert this whole file to use struct icalrecurrencetype</div><div class='del'>-	instead.</div><div class='del'>-	(cal_recur_free): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.</div><div class='del'>-	(CalRecurrence): Renamed from CalObjRecurrence.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_from_icaltimetype): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Commented out the test-recur program.</div><div class='del'>-</div><div class='del'>-2000-08-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Removed doc directory, since it is the old gnome-pim docs which</div><div class='del'>-	aren't used any more.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): removed doc.</div><div class='del'>-</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: compile fix for Solaris</div><div class='del'>-	(works under Linux, too; don't know about others)</div><div class='del'>-</div><div class='del'>-	* this is a test of whether CVS merge does what I</div><div class='del'>-	think it will do.</div><div class='del'>-</div><div class='del'>-2000-07-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	OK, it seems that we have all the interesting properties for</div><div class='del'>-	single-user calendars now.  RFC 2445 can bite me.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the RRULE</div><div class='del'>-	property.  Yay!.</div><div class='del'>-	(scan_recur): Likewise, yow!</div><div class='del'>-	(get_recur_list): Likewise, yeehaw!</div><div class='del'>-	(get_recur_list): Likewise, honk honk!</div><div class='del'>-	(set_recur_list): Likewise, booooga booooga!</div><div class='del'>-	(cal_component_get_rrule_list): Likewise, squeek squeek!</div><div class='del'>-	(cal_component_set_rrule_list): That's it, I ran out of sounds.</div><div class='del'>-	(cal_component_free_recur_list): Likewise.</div><div class='del'>-	(scan_property): Handle the EXRULE property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_exrule_list): Likewise.</div><div class='del'>-	(cal_component_set_exrule_list): Likewise.</div><div class='del'>-	(set_period_list): Oops, free the old properties as well as</div><div class='del'>-	removing them.</div><div class='del'>-	(set_text_list): Ditto.</div><div class='del'>-	(cal_component_set_exdate_list): Ditto.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: Put all the functions used to free</div><div class='del'>-	returned values all together.</div><div class='del'>-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be</div><div class='del'>-	incremented since the RFC requires it.</div><div class='del'>-	(scan_property): Handle the EXDATE property.</div><div class='del'>-	(scan_exdate): Likewise.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_exdate_list): Likewise.</div><div class='del'>-	(cal_component_set_exdate_list): Likewise.</div><div class='del'>-	(cal_component_free_exdate_list): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Fixed a typo</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section</div><div class='del'>-</div><div class='del'>-2000-07-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_period_list): New function.</div><div class='del'>-	(scan_property): Handle the RDATE property.</div><div class='del'>-	(scan_period): Likewise.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(get_period_list): Likewise.</div><div class='del'>-	(set_period_list): Likewise.</div><div class='del'>-	(cal_component_get_rdate_list): Likewise.</div><div class='del'>-	(cal_component_set_rdate_list): Likewise.</div><div class='del'>-	(scan_text): Simplify a bit since we only handle the ALTREP</div><div class='del'>-	parameter; there is no need to iterate over all parameters.</div><div class='del'>-	(scan_datetime): Simplify; just handle the TZID parameter.</div><div class='del'>-	(scan_summary): Simplify; just handle the ALTREP parameter.</div><div class='del'>-	(cal_component_get_as_string): New function.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;</div><div class='del'>-	now we only expose the types of objects we know about.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h (CalObjType): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.</div><div class='del'>-	(cal_client_get_uids): Likewise.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.</div><div class='del'>-	(check_for_slow_setting): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (count_objects): Likewise.</div><div class='del'>-	(build_uids_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uids): Likewise.</div><div class='del'>-	(Cal_get_n_objects): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-25  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view</div><div class='del'>-	for Todo/Event items.</div><div class='del'>-</div><div class='del'>-	* gui/task-assigned-to.xpm:</div><div class='del'>-	* gui/task-recurring.xpm:</div><div class='del'>-	* gui/task-assigned.xpm:</div><div class='del'>-	* gui/task.xpm: new pixmaps (all the same at present) to go in the</div><div class='del'>-	icon column of the ETable.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: hid the silly 'Calendar' labels on the</div><div class='del'>-	GnomeDateEdits and hid the times when you select 'All day event'.</div><div class='del'>-	Also adjusted the time_t's so that when an all day event finishes on</div><div class='del'>-	say midnight 13th May, we show 12th May in the dialog, since it</div><div class='del'>-	implicitly includes all of that day up to midnight.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade:</div><div class='del'>-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog</div><div class='del'>-	with our new ETable.</div><div class='del'>-</div><div class='del'>-2000-07-23  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h: added a few more fields.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a</div><div class='del'>-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.</div><div class='del'>-	For some reason an empty 'URL:' property appears and causes trouble.</div><div class='del'>-</div><div class='del'>-2000-07-20  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Update for the new</div><div class='del'>-	`evolution_shell_component_new()' arg.</div><div class='del'>-</div><div class='del'>-2000-07-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):</div><div class='del'>-	Finish filling the trigger.  What a pain, again.</div><div class='del'>-	(cal_component_alarm_free_trigger): Implemented.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.desktop:</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.desktop:</div><div class='del'>-		Added the Turkish desktop entries.</div><div class='del'>-</div><div class='del'>-2000-07-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_free): Free the</div><div class='del'>-	icalcomponent if this is an unattached alarm.</div><div class='del'>-	(scan_alarm_property): Handle the TRIGGER property.</div><div class='del'>-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.</div><div class='del'>-	(cal_component_alarm_set_trigger): Ditto.  Less pain.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline</div><div class='del'>-	docs.</div><div class='del'>-	(cal_client_new): Ditto.</div><div class='del'>-	(cal_client_get_n_objects): Added inline docs.</div><div class='del'>-</div><div class='del'>-2000-07-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (CalComponentAlarm): New internal</div><div class='del'>-	represntation for alarm components.  We really don't map them to a</div><div class='del'>-	CalComponent because it is more convenient to handle them as</div><div class='del'>-	"child" structures.</div><div class='del'>-	(make_alarm): New function to create a CalComponentAlarm from an</div><div class='del'>-	icalcomponent representing a VALARM.</div><div class='del'>-	(scan_alarm_property): New function to scan a property from an</div><div class='del'>-	alarm component.  We support ACTION.</div><div class='del'>-	(cal_component_get_first_alarm): New function to start an iterator</div><div class='del'>-	over the alarms in a calendar component.</div><div class='del'>-	(cal_component_alarm_get_action): New function.</div><div class='del'>-	(cal_component_alarm_set_action): New function.</div><div class='del'>-</div><div class='del'>-2000-07-13  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.</div><div class='del'>-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control</div><div class='del'>-	based on value from ical object during edit.</div><div class='del'>-</div><div class='del'>-2000-07-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: Revert Michael's GnomeFont patch until the</div><div class='del'>-	gnome-print API stabilizes.</div><div class='del'>-</div><div class='del'>-2000-07-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (titled_box, print_text, print_month_small),</div><div class='del'>-	(bound_text): GnomeFont update.</div><div class='del'>-</div><div class='del'>-2000-07-12  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: fixed various problems</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: build a static version of the library</div><div class='del'>-	to link with the conduits</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: same</div><div class='del'>-</div><div class='del'>-2000-07-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_completed): Ditto.</div><div class='del'>-	(cal_component_set_completed): Ditto.</div><div class='del'>-	(scan_property): Handle the TRANSPARENCY property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_transparency): Ditto.</div><div class='del'>-	(cal_component_set_transparency): Ditto.</div><div class='del'>-	(scan_property): Handle the URL property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_url): Ditto.</div><div class='del'>-	(cal_component_set_url): Ditto.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded</div><div class='del'>-	check for the URI.</div><div class='del'>-	(load_fn): Be more paranoid about the URI and notify the listener</div><div class='del'>-	if we got passed a bad URI.  Simplify the termination code a bit.</div><div class='del'>-	(create_fn): Likewise.</div><div class='del'>-	(queue_load_create_job): Be more paranoid about the URI.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove pilot stuff for now.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Remove `conduits'.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want</div><div class='del'>-	calendar.conduit.in, not calendar.conduit.</div><div class='del'>-</div><div class='del'>-2000-07-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS):</div><div class='del'>-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from</div><div class='del'>-	the gui directory to here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Remove</div><div class='del'>-	"close calendar" command.</div><div class='del'>-</div><div class='del'>-2000-07-08  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle</div><div class='del'>-	mouse wheel scrolling.</div><div class='del'>-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.</div><div class='del'>-</div><div class='del'>-2000-07-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_sequence): Ditto.</div><div class='del'>-	(cal_component_set_sequence): Ditto.</div><div class='del'>-	(cal_component_free_sequence): Ditto.</div><div class='del'>-	(cal_component_set_last_modified): Removed incorrect assertion.</div><div class='del'>-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence</div><div class='del'>-	number must be incremented when certain properties change, so we</div><div class='del'>-	store a flag that says if we need to bump it when piping the</div><div class='del'>-	object over the wire.</div><div class='del'>-	(free_icalcomponent): Reset need_sequence_inc.</div><div class='del'>-	(cal_component_set_dtstart): Set need_sequence_inc.</div><div class='del'>-	(cal_component_set_dtend): Ditto.</div><div class='del'>-	(cal_component_set_due): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the</div><div class='del'>-	LAST-MODIFIED property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_last_modified): Ditto.</div><div class='del'>-	(cal_component_set_last_modified): Ditto.</div><div class='del'>-	(get_icaltimetype): New function to get struct icaltimetype</div><div class='del'>-	values.</div><div class='del'>-	(cal_component_get_created): Use get_icaltimetype().</div><div class='del'>-	(set_icaltimetype): New function to set struct icaltimetype</div><div class='del'>-	values.</div><div class='del'>-	(cal_component_set_created): Use set_icaltimetype().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the CREATED</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_free_icaltimetype): Ditto.</div><div class='del'>-	(cal_component_get_created): Ditto.</div><div class='del'>-	(cal_component_set_created): Ditto.</div><div class='del'>-	(cal_component_init): Do not create an UID here.</div><div class='del'>-	(ensure_mandatory_properties): New function to ensure that the</div><div class='del'>-	mandatory RFC properties are indeed in the component.  If they are</div><div class='del'>-	not, we create them on the fly.</div><div class='del'>-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().</div><div class='del'>-	(cal_component_set_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_uid): Return the UID in a parameter, not as a</div><div class='del'>-	function return value, for consistency's sake.</div><div class='del'>-	(scan_property): Handle the DTSTAMP property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_dtstamp): Ditto.</div><div class='del'>-	(cal_component_set_dtstamp): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): Use &amp;obj instead of &amp;ico in</div><div class='del'>-	the call to cal_client_get_object(). The ToDo list should work now.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible</div><div class='del'>-	so it doesn't appear and then resize.</div><div class='del'>-</div><div class='del'>-2000-07-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_summary): Use</div><div class='del'>-	CalComponentText instead of CalComponentPropSummary.  Removed the</div><div class='del'>-	latter typedef.</div><div class='del'>-	(cal_component_set_summary): Likewise.</div><div class='del'>-	(scan_property): Handle the CLASSIFICATION property.</div><div class='del'>-	(cal_component_get_classification): Ditto.</div><div class='del'>-	(cal_component_set_classification): Ditto.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed</div><div class='del'>-	from cal_component_free_description_list().  We can share this</div><div class='del'>-	function since both comments and descriptions have the same form.</div><div class='del'>-	(scan_text): Ditto.</div><div class='del'>-	(get_text_list): New function.</div><div class='del'>-	(set_text_list): New function.</div><div class='del'>-	(cal_component_get_description_list): Use get_text_list().</div><div class='del'>-	(cal_component_set_description_list): Use set_text_list().</div><div class='del'>-	(cal_component_set_uid): Add sanity check.</div><div class='del'>-	(cal_component_get_summary): Ditto.</div><div class='del'>-	(cal_component_get_description_list): Ditto.</div><div class='del'>-	(cal_component_get_dtstart): Ditto.</div><div class='del'>-	(cal_component_get_dtend): Ditto.</div><div class='del'>-	(cal_component_get_due): Ditto.</div><div class='del'>-	(scan_property): Handle the COMMENT property.</div><div class='del'>-	(cal_component_get_comment_list): Ditto.</div><div class='del'>-	(cal_component_set_comment_list): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.</div><div class='del'>-	This can appear multiple times, so we maintain a list.  We</div><div class='del'>-	compress them later to a single property with multiple values.</div><div class='del'>-	(cal_component_get_categories_list): Ditto.</div><div class='del'>-	(cal_component_set_categories_list): Ditto.</div><div class='del'>-	(cal_component_free_categories_list): Ditto.</div><div class='del'>-	(free_icalcomponent): Properly free the mappings.</div><div class='del'>-</div><div class='del'>-2000-07-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_datetime): Handle date/time and</div><div class='del'>-	timezone pairs.</div><div class='del'>-	(scan_property): Handle DTSTART and DTEND.</div><div class='del'>-	(cal_component_free_datetime): Ditto.</div><div class='del'>-	(get_datetime): Ditto.</div><div class='del'>-	(cal_component_get_dtstart): Ditto.</div><div class='del'>-	(set_datetime): Ditto.</div><div class='del'>-	(cal_component_set_dtstart): Ditto.</div><div class='del'>-	(cal_component_get_dtend): Ditto.</div><div class='del'>-	(cal_component_set_dtend): Ditto.</div><div class='del'>-	(scan_property): Handle DUE date.</div><div class='del'>-	(cal_component_get_due): Ditto.</div><div class='del'>-	(cal_component_set_due): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_description_list):</div><div class='del'>-	Handle the DESCRIPTION property.  There can be multiple</div><div class='del'>-	descriptions with parameters each, so we deal with a list instead</div><div class='del'>-	of a single structure.</div><div class='del'>-	(cal_component_set_description_list): Ditto.</div><div class='del'>-	(cal_component_free_description_list): Ditto.</div><div class='del'>-	(scan_property): Ditto.</div><div class='del'>-	(scan_description): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_summary): To avoid</div><div class='del'>-	passing a million parameters to setters/getters for properties</div><div class='del'>-	that support parameters, we now pass client-side structures</div><div class='del'>-	instead.  Here we use CalComponentPropSummary.</div><div class='del'>-	(cal_component_set_summary): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Make calendar die when evolution quits.</div><div class='del'>-</div><div class='del'>-2000-06-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: Change of plans.  We use an</div><div class='del'>-	icalcomponent from libical as our core representation so that we</div><div class='del'>-	can preserve extension fields and fields that we don't (yet)</div><div class='del'>-	support.  CalComponent is just a wrapper with a nice API that</div><div class='del'>-	provides non-iterative, random access to the ical's fields.</div><div class='del'>-	(cal_component_destroy): Free the thing correctly.</div><div class='del'>-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.</div><div class='del'>-	(cal_component_set_icalcomponent): New function to set the</div><div class='del'>-	CalComponent's data from an existing icalcomponent.</div><div class='del'>-	(cal_component_get_icalcomponent): New function.</div><div class='del'>-	(cal_component_set_new_vtype): New convenience function to create</div><div class='del'>-	an empty component.</div><div class='del'>-	(scan_icalcomponent): Core scanning function.</div><div class='del'>-	(scan_property): Another core scanning function.</div><div class='del'>-	(cal_component_get_uid): Use the property directly.</div><div class='del'>-	(cal_component_get_summary): Ditto.  Handle the altrep parameter</div><div class='del'>-	as well.</div><div class='del'>-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.</div><div class='del'>-	It is ridiculous how much code this involves.</div><div class='del'>-	(scan_summary): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Do not link and include the pilot stuff for the</div><div class='del'>-	calendar component, just for the Pilot conduit.  Commented out the</div><div class='del'>-	Pilot part so that Evolution can build.  Sigh, we'll have to</div><div class='del'>-	modify gnome-pilot to use OAF.</div><div class='del'>-</div><div class='del'>-2000-06-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync</div><div class='del'>-	program conditional on HAVE_GNOME_PILOT, and add</div><div class='del'>-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the</div><div class='del'>-	appropriate places.</div><div class='del'>-</div><div class='del'>-2000-06-29  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uid_by_pilot_id):</div><div class='del'>-	(Cal_update_pilot_id):</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):</div><div class='del'>-	(cal_backend_imc_get_uid_by_pilot_id):</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):</div><div class='del'>-	(cal_backend_update_pilot_id):  server code to service these:</div><div class='del'>-</div><div class='del'>-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.</div><div class='del'>-	also uses dirty bits on both sides to aid in syncing.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new</div><div class='del'>-	function -- ask the cal server to return uid given an object's</div><div class='del'>-	pilot id.</div><div class='del'>-	(cal_client_update_pilot_id): new function -- inform the</div><div class='del'>-	cal server of an objects pilot id and pilot dirty-flag.</div><div class='del'>-</div><div class='del'>-2000-06-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[ch]: New files for the new iCalendar</div><div class='del'>-	component object.  Today's properties: basic component type, UID,</div><div class='del'>-	SUMMARY.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-2000-06-27  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler</div><div class='del'>-	assignment.</div><div class='del'>-</div><div class='del'>-2000-06-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_duplicate_value):</div><div class='del'>-	Implement.</div><div class='del'>-	(calendar_model_initialize_value): Implement.</div><div class='del'>-	(calendar_model_value_is_empty): Implement.</div><div class='del'>-</div><div class='del'>-2000-06-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before</div><div class='del'>-	using it!</div><div class='del'>-	(e_day_view_init): used new colors from tigert.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"</div><div class='del'>-	and "y" arguments.</div><div class='del'>-</div><div class='del'>-2000-06-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the</div><div class='del'>-	selection range. It just moves it on one day/week etc. This makes</div><div class='del'>-	it very handy for the keyboard shortcut code.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): fixed bug</div><div class='del'>-	setting the radio button active.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]: added support for keyboard navigation and</div><div class='del'>-	selection of the time range.</div><div class='del'>-</div><div class='del'>-2000-06-20  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.</div><div class='del'>-	(calendar_model_is_cell_editable): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_update_object): Take in an</div><div class='del'>-	iCalObject instead of a stringified version.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.</div><div class='del'>-	(gnome_calendar_remove_object): Removed.</div><div class='del'>-	(save_ical_object_cb): Use the CalClient function.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_finish_long_event_resize): Likewise.</div><div class='del'>-	(e_day_view_finish_resize): Likewise.</div><div class='del'>-	(e_day_view_key_press): Likewise.</div><div class='del'>-	(e_day_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_week_view_key_press): Likewise.</div><div class='del'>-	(e_week_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Likewise.</div><div class='del'>-	(delete_todo): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-19  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding</div><div class='del'>-	space etc.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.</div><div class='del'>-</div><div class='del'>-2000-06-18  Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES): Include from</div><div class='del'>-	`$(top_builddir)/libical/src/libical' too.  [For the generated</div><div class='del'>-	libical `icalversion.h' header.]</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-18  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):</div><div class='del'>-	fixed a DnD bug.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on</div><div class='del'>-	installed ical.h</div><div class='del'>-</div><div class='del'>-2000-06-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: added little buttons which are shown when there</div><div class='del'>-	are more events than will fit in a day. Clicking on the button takes</div><div class='del'>-	the user to the 1-Day view and shows the full day.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText</div><div class='del'>-	items so we get tooltips automatically. Though we may want to use our</div><div class='del'>-	own code to show tooltips so we can show the tips when the mouse is</div><div class='del'>-	around the edges of the event box, and we may want to show the start</div><div class='del'>-	and end times of the event in full.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate):</div><div class='del'>-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the</div><div class='del'>-	radio buttons in the code easily. We need this if we want to jump to</div><div class='del'>-	another view programmatically.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out</div><div class='del'>-	references to functions which don't exist yet, so evolution still</div><div class='del'>-	compiles.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: updated.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the</div><div class='del'>-	iCalObject struct being updated to support more of iCalendar.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: added icalendar-test.</div><div class='del'>-</div><div class='del'>-2000-06-15  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate</div><div class='del'>-	noinst_PROGRAMS declarations into one so automake accepts it.</div><div class='del'>-	(INCLUDES): include libical src dir so we don't depend on having</div><div class='del'>-	ical.h already installed</div><div class='del'>-</div><div class='del'>-2000-06-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the</div><div class='del'>-	middle of the array (!), so use plain GArray everywhere.  Sigh.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make</div><div class='del'>-	it use vCalendar again.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in</div><div class='del'>-	asynchronous fashion.  Finished implementing.</div><div class='del'>-	(obj_removed_cb): Implemented.  This one needs no juggling.</div><div class='del'>-	(calendar_model_set_cal_client): Only load the objects if we have</div><div class='del'>-	a client.</div><div class='del'>-	(calendar_model_destroy): Disconnect from the client's signals.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	calendar-model.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,</div><div class='del'>-	return the computed value.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of</div><div class='del'>-	objects and the hash table of UID-&gt;array index.</div><div class='del'>-	(calendar_model_row_count): Return the length directly from the</div><div class='del'>-	array instead of asking the Wombat.</div><div class='del'>-	(calendar_model_value_at): Implemented.</div><div class='del'>-	(calendar_model_new): Create an empty model.  We provide a new</div><div class='del'>-	setter function now.</div><div class='del'>-	(calendar_model_construct): Removed function.</div><div class='del'>-	(calendar_model_set_cal_client): New function to set the calendar</div><div class='del'>-	client and object type at any time.  This lets us reuse a calendar</div><div class='del'>-	model object.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h (iCalObjectField): Just report whether the</div><div class='del'>-	object has alarms; not every single alarm.</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_calendar_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Pass NULL for the new args</div><div class='del'>-	@create_folder_fn and @remove_folder_fn.</div><div class='del'>-	(create_view): Updated to match the new</div><div class='del'>-	`EvolutionShellComponentCreateViewFn'.  Return</div><div class='del'>-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not</div><div class='del'>-	"calendar".</div><div class='del'>-</div><div class='del'>-2000-06-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()</div><div class='del'>-	method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_n_objects): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.</div><div class='del'>-	(cal_client_get_n_objects): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify</div><div class='del'>-	the fields in an iCalObject.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_destroy): Free the private</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL</div><div class='del'>-	summaries.</div><div class='del'>-</div><div class='del'>-2000-06-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still</div><div class='del'>-	need icons, though.</div><div class='del'>-</div><div class='del'>-2000-06-07  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,</div><div class='del'>-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): instead of</div><div class='del'>-	returning a text representation, decode the text and return an</div><div class='del'>-	iCalObject.  Also added CalClientGetStatus which indicates</div><div class='del'>-	success or type of failure.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out</div><div class='del'>-	ical_object_find_in_string since it is unused now.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (list_uids): track get_object change</div><div class='del'>-	* gui/calendar-commands.c (calendar_iterate): same</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): same</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): same</div><div class='del'>-	* gui/print.c (print_day_details): same</div><div class='del'>-	(print_day_summary): same</div><div class='del'>-	(print_todo_details): same</div><div class='del'>-	* gui/gnome-cal.c (trigger_alarm_cb): same</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): same</div><div class='del'>-</div><div class='del'>-2000-06-06  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): use libical</div><div class='del'>-	instead of libversit</div><div class='del'>-	(ical_object_to_string): same</div><div class='del'>-	(dump_icalobject): prints the contents of an icalobject for debugging</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la</div><div class='del'>-	so we don't have to modify the build system of the released libical</div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): same</div><div class='del'>-	* cal-util/Makefile.am (icalendar_test_LDADD): same</div><div class='del'>-</div><div class='del'>-2000-06-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_destroy): Removed from the public</div><div class='del'>-	header; made static.  Now everyone should use refcounting.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (free_ical_object): Use</div><div class='del'>-	ical_object_unref().</div><div class='del'>-	(remove_object): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (print): New function to call the print</div><div class='del'>-	engine.</div><div class='del'>-	(calendar_toolbar): Added the Print button.</div><div class='del'>-	(calendar_control_activate): Added the File/Print item.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow</div><div class='del'>-	start_time and end_time to be NULL.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_get_selected_time_range):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): Show the range selector</div><div class='del'>-	widgets.  Use the correct radio group for all of them!</div><div class='del'>-	(print_calendar): Do the dialog box here.  We may want to split</div><div class='del'>-	this function later into smaller chunks.</div><div class='del'>-</div><div class='del'>-2000-06-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):</div><div class='del'>-	allow the right button to popup the menu, even when the event is</div><div class='del'>-	being edited.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView</div><div class='del'>-	when the right button is clicked, so that any event being edited is</div><div class='del'>-	saved before any action (e.g. opening the Event Editor dialog) is</div><div class='del'>-	started. Note that this won't work if we switch to asynchronous</div><div class='del'>-	notification.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.</div><div class='del'>-	(toolbar): Added an icon for the Save and Close command.</div><div class='del'>-	(save_ical_object): Recompute the title of the window here.  Maybe</div><div class='del'>-	it would be better to do it when we actually get the</div><div class='del'>-	"object_changed" signal from the CalClient.</div><div class='del'>-	(file_close_cb): Implemented.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.</div><div class='del'>-	(gnome_calendar_add_object): Removed function, since it was</div><div class='del'>-	identical to gnome_calendar_update_object().  Modified the rest</div><div class='del'>-	of the code to use only the latter.</div><div class='del'>-	(gnome_calendar_remove_object): Be more paranoid about the UID.</div><div class='del'>-	(gnome_calendar_update_object): Ditto.  Also, renamed this</div><div class='del'>-	function from gnome_calendar_object_changed(), for consistency</div><div class='del'>-	with the lower-level CalClient interface.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_class_init): New</div><div class='del'>-	"save_ical_object" signal to ask that our parent store the</div><div class='del'>-	calendar object to the backend.</div><div class='del'>-	(save_ical_object): New function to save the calendar object,</div><div class='del'>-	actually if just emits the signal.</div><div class='del'>-	(file_save_cb): Implemented.</div><div class='del'>-	(dialog_to_ical_object): We want priv-&gt;</div><div class='del'>-	alarm_program_run_program_entry (i.e. the entry inside the</div><div class='del'>-	GnomeFileEntry), not the file entry itself.</div><div class='del'>-	(dialog_to_ical_object): Only insert the recurrence ending date if</div><div class='del'>-	the event is recurrent!</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Fixed EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2000-06-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (editor_closed_cb): Handler for the</div><div class='del'>-	"editor_closed" signal of the event editor; we just destroy it</div><div class='del'>-	then.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (app_delete_event_cb): Callback used when the</div><div class='del'>-	dialog is closed.  Release the iCalObject here instead of the</div><div class='del'>-	event editor's destroy handler, and emit the new "editor_closed"</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-2000-06-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel</div><div class='del'>-	GnomeApp is now generated with Glade instead of being created in</div><div class='del'>-	the program code.  Otherwise we can't migrate the accelerators to</div><div class='del'>-	the new toplevel and they won't work.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.</div><div class='del'>-	This lets us use the GnomeApp created by libglade and still have</div><div class='del'>-	signals and stuff.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (create_menu): Tell the UI handler that the</div><div class='del'>-	menubar is the GnomeApp's existing one, not to create a new one.</div><div class='del'>-	(create_toolbar): Tell the UI handler to use the GnomeApp's</div><div class='del'>-	existing toolbar.</div><div class='del'>-	(event_editor_focus): New function to raise/focus an event editor.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use</div><div class='del'>-	event_editor_focus().</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Put the</div><div class='del'>-	toolbar into a frame to make it look like standard GNOME toolbars.</div><div class='del'>-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not</div><div class='del'>-	do evil things when its moved to the left or the right of the</div><div class='del'>-	window.</div><div class='del'>-</div><div class='del'>-2000-05-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map</div><div class='del'>-	calendar objects to their respective event editors.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_init): Create the</div><div class='del'>-	object_editor_hash.</div><div class='del'>-	(gnome_calendar_destroy): Free the object_editor_hash.</div><div class='del'>-	(gnome_calendar_edit_object): New function to centralize the</div><div class='del'>-	launching of event editors; if one already exists for a particular</div><div class='del'>-	calendar object, we just raise its window.</div><div class='del'>-	(edit): Use gnome_calendar_edit_object().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (display_objedit): Use</div><div class='del'>-	gnome_calendar_edit_object().</div><div class='del'>-	(display_objedit_today): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_edit_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_week_view_on_edit_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_new): Do not take in an</div><div class='del'>-	iCalObject; rather provide an event_editor_set_ical_object()</div><div class='del'>-	function.  We need this because a single editor may be switched</div><div class='del'>-	between different calendar objects.  Also, do not show the event</div><div class='del'>-	editor; leave it up to the client code.</div><div class='del'>-	(event_editor_construct): Likewise.</div><div class='del'>-	(clear_widgets): New function to clear the widgets to default</div><div class='del'>-	values.</div><div class='del'>-	(fill_widgets): New function to fill in the widgets from the</div><div class='del'>-	iCalObject.  We don't do this in init_widgets() anymore.</div><div class='del'>-	(free_exception_clist_data): New function to free the exceptions</div><div class='del'>-	clist data.  We were leaking the row data.</div><div class='del'>-	(init_widgets): Hook to the destroy signal of the exceptions</div><div class='del'>-	clist.</div><div class='del'>-	(event_editor_set_ical_object): New function.  Now it also makes a</div><div class='del'>-	copy of the calendar object for the event editor; clients do not</div><div class='del'>-	need to copy it anymore.</div><div class='del'>-	(event_editor_destroy): Unref the UI handler as well.</div><div class='del'>-	(event_editor_class_init): New "ical_object_released" signal to</div><div class='del'>-	notify the parent that we are no longer editing the calendar</div><div class='del'>-	object.</div><div class='del'>-	(make_title_from_ico): Handle NULL objects.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h (EventEditor): Removed fields that are no</div><div class='del'>-	longer used.</div><div class='del'>-</div><div class='del'>-2000-05-31  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: added test-recur test program.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: new file to test the recurrence code.</div><div class='del'>-</div><div class='del'>-	* cal-util/.cvsignore: added test-recur.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: updated.</div><div class='del'>-</div><div class='del'>-2000-05-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_construct): Create the UI</div><div class='del'>-	handler after we have constructed the parent GnomeApp.</div><div class='del'>-	(main_menu): Menu template is now in place.</div><div class='del'>-	(toolbar): Tollbar template is now in place.</div><div class='del'>-	(create_toolbar): Turn off labels in the toolbar since it sucks;</div><div class='del'>-	it should support non-homogeneous buttons with horizontal icons</div><div class='del'>-	and text.</div><div class='del'>-</div><div class='del'>-2000-05-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the</div><div class='del'>-	flags argument, since now we just proxy the calendar object to the</div><div class='del'>-	calendar client.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (alarm_unit_get): Moved over from</div><div class='del'>-	event-editor-utils.c.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.[ch]: Removed files, since the two</div><div class='del'>-	functions that were left there (i.e. the ones not present in</div><div class='del'>-	e-dialog-widgets) can simply be moved to event-editor.c.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed</div><div class='del'>-	event-editor-utils.[ch] from the list of sources.</div><div class='del'>-</div><div class='del'>-2000-05-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.c: Moved many functions to</div><div class='del'>-	e-util/e-dialog-widgets.c.</div><div class='del'>-</div><div class='del'>-2000-05-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Put the main notebook directly</div><div class='del'>-	under a simple GtkWindow.  We are going to pull out the notebook</div><div class='del'>-	and slap it into our custom-built GnomeApp, anwyays.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.</div><div class='del'>-	Added a BonoboUIHandler for its menu and toolbar.</div><div class='del'>-	(make_title_from_ico): Create a nice title for the window.</div><div class='del'>-	(get_widgets): Fetch the Glade widgets here instead of all over</div><div class='del'>-	the place.</div><div class='del'>-	(event_editor_new): Temporary hack to show the dialog here, just</div><div class='del'>-	so that I can test it.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.</div><div class='del'>-</div><div class='del'>-2000-05-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (init_bonobo): Do not initialize libglade twice.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_view): Set the folder_uri</div><div class='del'>-	property, otherwise the calendar will not get loaded into the</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: Make it so that warnings don't crash calendar.</div><div class='del'>-</div><div class='del'>-2000-05-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: Removed.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: New.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c: New.</div><div class='del'>-	* gui/control-factory.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-component-factory.c: New.</div><div class='del'>-	* gui/calendar-component-factory.c: New.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (calendar_control_factory):</div><div class='del'>-	Renamed from `calendar_factory'.</div><div class='del'>-	(calendar_control_factory_init): Renamed from</div><div class='del'>-	`calendar_factory_init'.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.gnorba: New.</div><div class='del'>-	* gui/evolution-calendar.oafinfo: New.</div><div class='del'>-</div><div class='del'>-2000-05-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): New function to create the</div><div class='del'>-	custom range selector.</div><div class='del'>-	(print_dialog): New function to show the print dialog.</div><div class='del'>-	(print_calendar): Use the print dialog.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added libepaned.a.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.</div><div class='del'>-</div><div class='del'>-2000-05-22  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/mark.c (mark_month_item): Use</div><div class='del'>-	cal_client_get_events_in_range().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,</div><div class='del'>-	since we don't have a year view.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.</div><div class='del'>-	(gnome_calendar_get_current_view_name): Likewise.</div><div class='del'>-	(gnome_calendar_update_view_times): Likewise.</div><div class='del'>-	(gnome_calendar_direction): Likewise.</div><div class='del'>-	(gnome_calendar_set_view): Likewise.</div><div class='del'>-	(gnome_calendar_update_all): Likewise.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Likewise.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Likewise.</div><div class='del'>-	(gnome_calendar_time_format_changed): Likewise.</div><div class='del'>-	(gnome_calendar_get_current_time_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],</div><div class='del'>-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they</div><div class='del'>-	are no longer used.  Removed all the old Pilot crap.</div><div class='del'>-</div><div class='del'>-2000-05-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence</div><div class='del'>-	rules. These are only part finished, but people may like to check that</div><div class='del'>-	the architecture seems OK.</div><div class='del'>-</div><div class='del'>-2000-05-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of</div><div class='del'>-	the iCalObject so we detect the change in the "update_event" callback.</div><div class='del'>-	Maybe we should just update the view ourselves and then we wouldn't</div><div class='del'>-	need to detect any change in the callback.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to</div><div class='del'>-	get rid of any recurrence rules. Used when we 'unrecur' an event.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it</div><div class='del'>-	won't fit, or we end up adding a new event for each key press.</div><div class='del'>-	(e_day_view_update_event_label): don't update it if it doesn't have</div><div class='del'>-	an EText item (i.e. it isn't visible).</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c: allow selection of times using this</div><div class='del'>-	column.</div><div class='del'>-</div><div class='del'>-2000-05-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.</div><div class='del'>-	(time_add_day): Likewise.</div><div class='del'>-	(time_add_month): Likewise.</div><div class='del'>-	(time_add_year): Likewise.</div><div class='del'>-	(time_from_day): Of all functions, *this* one had to have a bug.</div><div class='del'>-	Set the tm.tm_isdst to -1 to specify that we don't know whether</div><div class='del'>-	the time is in DST or not.  This fixes *many* bugs upstream.</div><div class='del'>-	(time_week_begin): Likewise.  We never noticed this since the week</div><div class='del'>-	functions are never used.</div><div class='del'>-	(time_week_end): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: hooked up more widget signals to callbacks</div><div class='del'>-	to the gladified dialog acts more like the original one.</div><div class='del'>-</div><div class='del'>-2000-05-16  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons</div><div class='del'>-	to the pages of the notebook.</div><div class='del'>-	(append_exception):</div><div class='del'>-	(recurrence_exception_added):</div><div class='del'>-	(recurrence_exception_deleted):</div><div class='del'>-	(recurrence_exception_changed): code to deal with the recurrence</div><div class='del'>-	exception list.</div><div class='del'>-</div><div class='del'>-2000-05-15  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: glade file used by event-editor.c</div><div class='del'>-</div><div class='del'>-2000-05-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (display_notification): Use the alarm</div><div class='del'>-	notification dialog.</div><div class='del'>-	(display_notification_cb): New callback for the result of the</div><div class='del'>-	alarm notification dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify.glade: New file with the alarm</div><div class='del'>-	notification dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: New file.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.</div><div class='del'>-</div><div class='del'>-2000-05-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and</div><div class='del'>-	plug leaks of str_ico and ico.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (main): Initialize libglade.</div><div class='del'>-</div><div class='del'>-2000-05-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/libical/src/libical'.</div><div class='del'>-</div><div class='del'>-2000-05-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to</div><div class='del'>-	compute the ending time of the occurrence.  This takes care of</div><div class='del'>-	recurring events that span multiple days.  Also, removed the DST</div><div class='del'>-	condition since it did not look right at all:  if you have a daily</div><div class='del'>-	appointment at 18:00, it still should happen at 18:00 even during</div><div class='del'>-	daylight savings.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil</div><div class='del'>-	functions instead of calculating the month's times by hand.  Use</div><div class='del'>-	cal_obj_instance_list_free() instead of freeing the list by hand.</div><div class='del'>-	Clip the range we pass to mark_gtk_calendar_day().</div><div class='del'>-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the</div><div class='del'>-	month by adding real day offsets.</div><div class='del'>-</div><div class='del'>-2000-05-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (add_alarms_for_object): New function to add</div><div class='del'>-	today's alarms for a single object.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Update the object's alarms.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a</div><div class='del'>-	get_alarms_for_object() method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Now that we</div><div class='del'>-	depend on current gnome-libs we can make the toolbar detachable</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone</div><div class='del'>-	variable to make this compile on BSD systems (where timezone is</div><div class='del'>-	the name of a function)</div><div class='del'>-</div><div class='del'>-2000-05-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused</div><div class='del'>-	arguments.  Load the initial alarms here.</div><div class='del'>-	(load_alarms): New function to load a day's worth of alarms.</div><div class='del'>-	(gnome_calendar_class_init): Eeeek!  This was taking in an</div><div class='del'>-	incorrect argument type.</div><div class='del'>-	(gnome_calendar_init): Now the calendar keeps a hash table of</div><div class='del'>-	UIDs-&gt;queued alarms.  Create the hash table here.</div><div class='del'>-	(gnome_calendar_destroy): Destroy the alarms hash table.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Remove the alarms for the</div><div class='del'>-	object and regenerate them.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Remove the alarms for the</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just</div><div class='del'>-	the trigger time, the callback and the closure data.  Return an</div><div class='del'>-	opaque identifier for the alarm so that it can be removed by the</div><div class='del'>-	client code if needed.  Use the queue_alarm() helper function.</div><div class='del'>-	(queue_alarm): Helper function to actually queue the alarm and set</div><div class='del'>-	up the itimer.  Deal with a nonzero return value from</div><div class='del'>-	setitimer().</div><div class='del'>-	(alarm_remove): New function to remove an alarm based on its ID.</div><div class='del'>-	(pop_alarm): New helper function; pops the first alarm of the</div><div class='del'>-	queue and resets the timer as appropriate.</div><div class='del'>-	(alarm_ready): Simplified a lot by using pop_alarm().</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_instance_seq): New function to build a CORBA</div><div class='del'>-	sequence from the internal list of instances.</div><div class='del'>-	(Cal_get_events_in_range): Use build_instance_seq().</div><div class='del'>-	(Cal_get_alarms_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New</div><div class='del'>-	function with the get_alarms_in_range() engine.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):</div><div class='del'>-	Implemented the get_alarms_in_range() method.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New</div><div class='del'>-	client-side function for getting the alarms.</div><div class='del'>-	(build_instance_list): New helper function to build the</div><div class='del'>-	CalObjInstance list from the CORBA sequence.</div><div class='del'>-	(cal_client_get_events_in_range): Use build_instance_list().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: #include &lt;cal-util/calobj.h&gt;.  #include</div><div class='del'>-	"gnome-cal.h".</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: #include "calendar-commands.h" instead of</div><div class='del'>-	main.h; the latter is an obsolete file and will be killed.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (main): Call init_bonobo()</div><div class='del'>-	before anything else.  We need the GTK+ object system initialized.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Move</div><div class='del'>-	"about" menuitem to the help menu.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST</div><div class='del'>-	sections.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c: Set the format when creating a new</div><div class='del'>-	calendar.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c: Removed double free of method_string in</div><div class='del'>-	uri-&gt;method_string.</div><div class='del'>-</div><div class='del'>-2000-05-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead</div><div class='del'>-	of "evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"</div><div class='del'>-	instead of "evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-2000-05-08  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call</div><div class='del'>-	e_day_view_stop_editing_event here to avoid a divide by zero</div><div class='del'>-	a bit further on.  i'm not sure if this is the best fix for this.</div><div class='del'>-</div><div class='del'>-2000-05-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just</div><div class='del'>-	an interface for calendar backends; this is an abstract class.</div><div class='del'>-	Put in the vtable for the backend methods.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_new): Removed function, since</div><div class='del'>-	CalBackend is not just an abstract class.</div><div class='del'>-	Removed implementation-specific functions and made public</div><div class='del'>-	functions call the virtual methods instead.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC</div><div class='del'>-	implementation; this implements a backend for iCalendar and</div><div class='del'>-	vCalendar files.  Moved the implementation-specific stuff from</div><div class='del'>-	cal-backend.[ch] to here.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to</div><div class='del'>-	here.  Added a CAL_UNKNOWN value for when the backend is not</div><div class='del'>-	loaded yet.</div><div class='del'>-	(cal_backend_imc_init): Initialize priv-&gt;format as CAL_UNKNOWN.</div><div class='del'>-	(save_to_vcal): Use the same VCProdIdProp value as in</div><div class='del'>-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the</div><div class='del'>-	vCalendar spec.</div><div class='del'>-	(ensure_uid): Return nothing, since the result value need not be</div><div class='del'>-	used anymore.</div><div class='del'>-	(add_object): Since we mark the calendar as dirty anyways, we do</div><div class='del'>-	not need to check the result value of ensure_uid() anymore.</div><div class='del'>-	(remove_object): Asssert that we know how to handle the object's</div><div class='del'>-	type.  We do this in add_object() anyways.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()</div><div class='del'>-	so that we can see the line number where they occur.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the</div><div class='del'>-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the</div><div class='del'>-	switch.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed</div><div class='del'>-	enumeration; it is stupid to translate all values for the</div><div class='del'>-	CalClient when it is going to translate them again.</div><div class='del'>-	(CalListenerClass::cal_loaded): This signal now passes the</div><div class='del'>-	LoadStatus directly from the CORBA side.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not</div><div class='del'>-	translate the status value.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClientLoadStatus): Added the</div><div class='del'>-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA</div><div class='del'>-	version of the LoadStatus result code.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the</div><div class='del'>-	hash table from method strings to the GtkTypes for backend class</div><div class='del'>-	types.</div><div class='del'>-	(cal_factory_init): Create the priv-&gt;methods hash table.</div><div class='del'>-	(cal_factory_destroy): Free the priv-&gt;methods hash table.</div><div class='del'>-	(cal_factory_register_method): New function to register a backend</div><div class='del'>-	class for a particular URI method.</div><div class='del'>-	(launch_backend_for_uri): New function to launch a backend for a</div><div class='del'>-	particular URI's method.</div><div class='del'>-	(load_backend): Use launch_backend_for_uri().  Move the error</div><div class='del'>-	notification code from load_fn() to here.</div><div class='del'>-	(create_backend): Use launch_backend_for_uri().  Move the error</div><div class='del'>-	notification code form create_fn() to here; it is #ifdefed out</div><div class='del'>-	since currently cal_backend_create() does not have any error</div><div class='del'>-	reporting capabilities.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a</div><div class='del'>-	PROTOCOL_NOT_SUPPORTED error code.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed</div><div class='del'>-	functions, since they were supposed to be internal only.</div><div class='del'>-	(CalFactory_load): Call queue_load_create_job() directly.</div><div class='del'>-	(CalFactory_create): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_remove_event_cb):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico-&gt;uid</div><div class='del'>-	to NULL or we won't find any other occurrences of the event. Set the</div><div class='del'>-	editing_event_day/num to -1 instead.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the</div><div class='del'>-	positioning of the icons for long events.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to</div><div class='del'>-	terminate the string.</div><div class='del'>-</div><div class='del'>-2000-05-07  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,</div><div class='del'>-	just in case it hasn't moved, otherwise it won't appear.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to</div><div class='del'>-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH</div><div class='del'>-	since it must be &gt;= the BAR_WIDTH.</div><div class='del'>-</div><div class='del'>-2000-05-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):</div><div class='del'>-	Changed to "folder_uri" from "calendar_uri".</div><div class='del'>-	(set_prop): The uri given to us is a directory, so we append a</div><div class='del'>-	filename onto the end before we use it.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_day_begin):</div><div class='del'>-	(time_day_end): changed these so they just do a simple localtime(),</div><div class='del'>-	update the struct tm, then do a mktime(). I don't know why it used to</div><div class='del'>-	look at the tm_isdst flags etc. From a little test program I wrote</div><div class='del'>-	which steps through testing every hour for a year it wasn't working</div><div class='del'>-	correctly, and the new code does.</div><div class='del'>-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.</div><div class='del'>-	My test program now works better.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	* gui/.cvsignore: ignore evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: add support for building evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: finish editing event when user hits Return key.</div><div class='del'>-	(e_week_view_on_text_item_event): stop event signals after doing any</div><div class='del'>-	other calls, since otherwise it will also stop any other resulting</div><div class='del'>-	event signals.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't</div><div class='del'>-	draw the start/end times while editing.</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we</div><div class='del'>-	now only want a single line of text.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_normalize_summary): new function to</div><div class='del'>-	convert the summary field to a single line of text, by converting any</div><div class='del'>-	sequence of CR &amp; LF characters to a single space.</div><div class='del'>-	(ical_object_create_from_vobject): call the above function. I think</div><div class='del'>-	all functions that load iCalObjects go through this.</div><div class='del'>-	(ical_new): called it here as well just in case.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/week-view.[hc]: removed.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-day-panel.[hc]:</div><div class='del'>-	* gui/gncal-day-view.[hc]:</div><div class='del'>-	* gui/gncal-full-day.[hc]:</div><div class='del'>-	* gui/gncal-week-view.[hc]:</div><div class='del'>-	* gui/layout.[hc]:</div><div class='del'>-	* gui/view-utils.[hc]: removed old calendar view files.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,</div><div class='del'>-	and ical_object_ref/unref() functions. I've updated all the gui/</div><div class='del'>-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe</div><div class='del'>-	just using ical_object_destroy() is OK there.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c:</div><div class='del'>-	* gui/calendar-commands.c:</div><div class='del'>-	* gui/eventedit.c:</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: use refcounting for iCalObjects.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c:</div><div class='del'>-	* gui/e-day-view-top-item.c:</div><div class='del'>-	* gui/e-day-view.c: try not to ever draw outside the event, even when</div><div class='del'>-	the event is very small.</div><div class='del'>-</div><div class='del'>-2000-05-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: don't allow recurring events to be resized or</div><div class='del'>-	dragged, and don't show the resize/drag cursors. Actually it may be</div><div class='del'>-	better to let the user do the resize/drag and then ask them what they</div><div class='del'>-	want to do - change the single occurrence or the entire series.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):</div><div class='del'>-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.</div><div class='del'>-</div><div class='del'>-	* gui/popup-menu.c: include e-gui-utils.h</div><div class='del'>-</div><div class='del'>-2000-05-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long</div><div class='del'>-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: when we switch views, grab the focus.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):</div><div class='del'>-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses</div><div class='del'>-	cal_client_get_events_in_range(), and doesn't load any objects.</div><div class='del'>-	Also just return if it isn't visible.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range): call</div><div class='del'>-	g_list_sort() to sort the list rather than g_list_insert_sorted() for</div><div class='del'>-	each element. It is much more efficient.</div><div class='del'>-	Also changed it so that the co-&gt;ev_start/end fields are copied from</div><div class='del'>-	the CalObjInstance rather than the parameters to the function</div><div class='del'>-	(that is right, isn't it?)</div><div class='del'>-	Also freed the list elements, and finally the list.</div><div class='del'>-	(calendar_iterate): changed this to use cal_client_get_events_in_range</div><div class='del'>-	since that is more efficient than getting all the uids and then loading</div><div class='del'>-	and parsing all the events.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save): output the '... saved' message before</div><div class='del'>-	freeing the string!</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update):</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event):</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range):</div><div class='del'>-	(calendar_iterate): free obj_string after it is parsed.</div><div class='del'>-</div><div class='del'>-2000-05-02  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): set the active</div><div class='del'>-	radio button here. Oops - it wasn't a Bonobo problem after all.</div><div class='del'>-</div><div class='del'>-	* gui/popup-menu.c (popup_menu): added call to</div><div class='del'>-	e_auto_kill_popup_menu_on_hide() to destroy the menu.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico-&gt;user_data</div><div class='del'>-	isn't useful any more, since the event editor keeps its own iCalObject.</div><div class='del'>-	So for now we make the menu commands available even when the event is</div><div class='del'>-	being edited in the event editor.</div><div class='del'>-	Also corrected misspellings of 'occurance' -&gt; 'occurrence'.</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.</div><div class='del'>-	The event editor now uses its own independent iCalObject.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new</div><div class='del'>-	uid for the new single instance. I'm not sure what we should do about</div><div class='del'>-	the creation/last modification times of the objects.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_edit_appointment):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the</div><div class='del'>-	iCalObject before passing it to the event editor, since it will change</div><div class='del'>-	the fields. If we don't duplicate it we won't know what has changed</div><div class='del'>-	when we get the "update_event" callback.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod</div><div class='del'>-	times of the new iCalObject. We may want to set the default alarm as</div><div class='del'>-	well.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_gen_uid): made this function public so we</div><div class='del'>-	can generate new uids if necessary.</div><div class='del'>-</div><div class='del'>-2000-05-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new</div><div class='del'>-	function to get the currently seleted time range form the current view.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (display_objedit): use the above function</div><div class='del'>-	to get the time for the new appointment.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: use a shallow copy of the ico when we update the</div><div class='del'>-	times (when resizing/dragging). Otherwise we won't detect that the</div><div class='del'>-	time has changed in the "update_event" callback.</div><div class='del'>-</div><div class='del'>-	Also added functions to get the currently selected time range.</div><div class='del'>-</div><div class='del'>-2000-04-30  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set</div><div class='del'>-	attendee and contact address correctly.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (icalendar_calendar_load): init priv-&gt;object_hash</div><div class='del'>-	when loading.</div><div class='del'>-	(cal_get_type_from_filename): if file extension is .ical, consider</div><div class='del'>-	the file an ical file.</div><div class='del'>-</div><div class='del'>-2000-05-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_compare_dates): new function to see</div><div class='del'>-	if the event dates have changed (including any recurrence rules).</div><div class='del'>-	It is used for optimization when we get the "object_changed" signal.</div><div class='del'>-	We have to do far less work if the dates are unchanged.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: only draw the selection when we have the keyboard</div><div class='del'>-	focus, since the user expects to be able to type in a new event when</div><div class='del'>-	the selection is shown. Also keep the selection when we lose focus,</div><div class='del'>-	but just don't show it.</div><div class='del'>-</div><div class='del'>-	Also quite a few changes to cope with the new client/server</div><div class='del'>-	architecture.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):</div><div class='del'>-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):</div><div class='del'>-	only draw the selection if the widget has the keyboard focus.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with</div><div class='del'>-	events longer than one day. And changed the code for updating events</div><div class='del'>-	in the new views.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c</div><div class='del'>-	(init_bonobo): OAFized.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: New #define</div><div class='del'>-	`CONTROL_FACTORY_ID', varying according to whether we are</div><div class='del'>-	`USING_OAF'.</div><div class='del'>-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Updated for OAF.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h: Explicitly #include</div><div class='del'>-	"calendar/pcs/evolution-calendar.h" instead of just</div><div class='del'>-	"evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use</div><div class='del'>-	OAF.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (init_corba): New function, implemented</div><div class='del'>-	differently depending on `USING_OAF'.</div><div class='del'>-</div><div class='del'>-2000-04-27    &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_load): fix memory leak</div><div class='del'>-	(save_to_vcal): same</div><div class='del'>-	(save): same</div><div class='del'>-	(cal_backend_load): same</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: Added *.la and *.lo.</div><div class='del'>-</div><div class='del'>-2000-04-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from</div><div class='del'>-	backend_destroy_cb.  Now we use it for the "last_client_gone"</div><div class='del'>-	signal from the backend.  Also, unref the backend to destroy it.</div><div class='del'>-	(add_backend): Connect to the "last_client_gone" signal of the</div><div class='del'>-	backend.</div><div class='del'>-	(cal_factory_get_n_backends): New function to query the number of</div><div class='del'>-	running backends.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_class_init): Register the new</div><div class='del'>-	"last_client_gone" signal.  It is emitted when the last Cal client</div><div class='del'>-	goes away.  It is used to notify the factory when a backend may be</div><div class='del'>-	safely destroyed.</div><div class='del'>-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last</div><div class='del'>-	client disconnects from the backend.</div><div class='del'>-</div><div class='del'>-2000-04-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare</div><div class='del'>-	iCalObjects by their UIDs instead of by their pointers.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.</div><div class='del'>-</div><div class='del'>-2000-04-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Add `$(datadir)/idl'.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.</div><div class='del'>-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-2000-04-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget</div><div class='del'>-	destroy -- used to unref the CalClient so wombat knows we are gone.</div><div class='del'>-	(gnome_calendar_class_init): added a class init for this widget.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico</div><div class='del'>-</div><div class='del'>-2000-04-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (main): The path to the test calendar</div><div class='del'>-	changed when we moved stuff around.  Users will have to tweak this</div><div class='del'>-	for their CVS setup, anyways.</div><div class='del'>-	(create_client): Create or load the calendar as appropriate.</div><div class='del'>-	(client_destroy_cb): Exit the main loop if both clients are gone.</div><div class='del'>-	(main): Connect to the "destroy" signal of the clients so that we</div><div class='del'>-	can terminate the test program.</div><div class='del'>-</div><div class='del'>-2000-04-24  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar.c (parse_person): allow for null CN</div><div class='del'>-	(parse_person): allow for null sent_by</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: build icalendar-test</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-test.c: a test which loads an ical file and</div><div class='del'>-	converts it to our internal format, and then saves it back out.</div><div class='del'>-</div><div class='del'>-2000-04-24  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added new source files and pixmaps, and removed</div><div class='del'>-	old source files, which can be deleted.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-titles-item.[hc]:</div><div class='del'>-	* gui/e-week-view-main-item.[hc]:</div><div class='del'>-	* gui/e-week-view-event-item.[hc]:</div><div class='del'>-	* gui/e-week-view.[hc]: new files implementing the week/month views.</div><div class='del'>-</div><div class='del'>-	* gui/yearview.xpm:</div><div class='del'>-	* gui/monthview.xpm:</div><div class='del'>-	* gui/weekview.xpm:</div><div class='del'>-	* gui/workweekview.xpm:</div><div class='del'>-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't</div><div class='del'>-	intended to be the final pixmaps.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: added radio buttons to the toolbar to</div><div class='del'>-	switch between the calendar views, and moved the am_pm_flag here so we</div><div class='del'>-	can get rid of view-utils.c.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the</div><div class='del'>-	widgets into 2 notebooks, and added the	selection_start_time and</div><div class='del'>-	selection_end_time fields.</div><div class='del'>-</div><div class='del'>-	* gui/goto.c: updated to use new selection time range.</div><div class='del'>-</div><div class='del'>-	* gui/quick-view.c: added '#include &lt;gtk/gtkwindow.h&gt;' so it compiles.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]: changed the interface to support the new</div><div class='del'>-	selection time range, got rid of a few debugging messages and changed</div><div class='del'>-	a few bits.</div><div class='del'>-</div><div class='del'>-2000-04-21  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c: start on code to do the opposite of</div><div class='del'>-	icalendar.c (convert from iCalObjects to libical's icalcomponents).</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): moved</div><div class='del'>-	"About Calendar" into the View menu so it shows up.</div><div class='del'>-</div><div class='del'>-2000-04-20  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback</div><div class='del'>-	for listener's object updated signal.</div><div class='del'>-	(gnome_calendar_object_removed_cb): new function: callback for</div><div class='del'>-	listener's object removed signal.</div><div class='del'>-	(gnome_calendar_new): hook up listener's "obj_updated" and</div><div class='del'>-	"obj_removed" signals so if evolution is running twice,</div><div class='del'>-	they will both see changes right away.</div><div class='del'>-	(gnome_calendar_object_changed): don't call update_all, since</div><div class='del'>-	it will be called by the listener.</div><div class='del'>-	(gnome_calendar_remove_object): don't call update_all</div><div class='del'>-	(gnome_calendar_add_object): don't call update_all</div><div class='del'>-</div><div class='del'>-	* gui/gncal-full-day.c (child_realize): create fullday's gcs</div><div class='del'>-	even if pixmap_bell has already been created.  this was</div><div class='del'>-	causing crashes if the calendar was run twice.</div><div class='del'>-</div><div class='del'>-2000-04-19  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (ee_rp_init_rule): changed the order around</div><div class='del'>-	a bit to avoid a Gtk-CRITICAL crash</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate</div><div class='del'>-	the todo clist</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uids): don't check</div><div class='del'>-	type against CALOBJ_TYPE_ANY since it will always match.</div><div class='del'>-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (remove_object): don't call save from here</div><div class='del'>-	because in all cases the caller of remove_object calls save</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open</div><div class='del'>-	instead of checking on disk and calling load or create.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use</div><div class='del'>-	cal_client_update_object -- editing and dragging events works again</div><div class='del'>-	(gnome_calendar_open): collapsed gnome_calendar_load and</div><div class='del'>-	gnome_calendar_create into this function.  added new type</div><div class='del'>-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or</div><div class='del'>-	CALENDAR_OPEN_OR_CREATE.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (calendar_properties_init): create</div><div class='del'>-	a property bag for this control</div><div class='del'>-	(set_prop): callback for property sets</div><div class='del'>-	(get_prop): callback for proprety gets</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): new function,</div><div class='del'>-	called when the "calendar_uri" property is set on the calendar-</div><div class='del'>-	control's property bag.</div><div class='del'>-</div><div class='del'>-2000-04-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES): Fix include path.</div><div class='del'>-</div><div class='del'>-2000-04-16  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h (CalFactoryClass): We have a new</div><div class='del'>-	"last_calendar_gone" signal that Wombat can use to terminate</div><div class='del'>-	itself properly.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_class_init): Register the</div><div class='del'>-	"last_calendar_gone" signal.</div><div class='del'>-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead</div><div class='del'>-	of killing the factory.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.</div><div class='del'>-	(INCLUDES): Make the log domain be "wombat-pcs".</div><div class='del'>-</div><div class='del'>-2000-04-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (add_object): removed implicit save, since</div><div class='del'>-	we don't want to save as we load from disk.</div><div class='del'>-	(cal_backend_update_object): added a call to save, since it</div><div class='del'>-	isn't done by add_object now.</div><div class='del'>-</div><div class='del'>-2000-04-16  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Renamed library from libcalutil to</div><div class='del'>-	libcal-util, to be consistent with libcal-client.  Install header</div><div class='del'>-	files in $(includedir)/evolution/cal-util.</div><div class='del'>-	(INCLUDES): Add "cal-util" log domain for glib.</div><div class='del'>-	(libcal_clientincludedir): The header files are now installed in</div><div class='del'>-	$(includedir)/evolution/cal-client.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: Fix includes.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c: Fix includes.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because</div><div class='del'>-	it is for internal use by Wombat only.  The header files should</div><div class='del'>-	not be installed, either.  Removed all the old Tlacuache stuff.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute</div><div class='del'>-	gncal.desktop.</div><div class='del'>-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log</div><div class='del'>-	domain.</div><div class='del'>-</div><div class='del'>-	* gui/*.[ch]: Fix cal-util and cal-client includes.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.</div><div class='del'>-</div><div class='del'>-	* pcs/*.[ch]: Fix cal-util includes.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch</div><div class='del'>-	between linux's timezone variable and *bsd's method of getting the</div><div class='del'>-	gmt offset.</div><div class='del'>-</div><div class='del'>-2000-04-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save_to_vcal): create and save an actual</div><div class='del'>-	vcalendar instead of a list of vcal objects.</div><div class='del'>-</div><div class='del'>-2000-04-10  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so</div><div class='del'>-	we search headers in the evolution tree before installed headers.</div><div class='del'>-	(Otherwise when you do 'make install' lots of files in gui/ get</div><div class='del'>-	rebuilt, since they depend on the installed cal-client.h which has just</div><div class='del'>-	been updated.)</div><div class='del'>-</div><div class='del'>-2000-04-09  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal</div><div class='del'>-	on the cal client.</div><div class='del'>-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved</div><div class='del'>-	gnome_calendar_update_all from gnome_calendar_load to here.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: minor cleanups</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim</div><div class='del'>-	to write vcal to a file</div><div class='del'>-	(save): filled it with more gnome-pim code</div><div class='del'>-	(add_object): call save () after changing</div><div class='del'>-	(remove_object): same</div><div class='del'>-	(cal_backend_create): same</div><div class='del'>-	(cal_backend_remove_object): same</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed linking with libetable and libeminicard</div><div class='del'>-	since they weren't being used.</div><div class='del'>-</div><div class='del'>-2000-04-08  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_create): new function:</div><div class='del'>-	friendly wrapper for cal_client_create_calendar</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create</div><div class='del'>-	if no filename is provided</div><div class='del'>-</div><div class='del'>-	* gui/prop.c (properties): calendar is a frame</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): sort out the</div><div class='del'>-	menus a bit, more of them show up now.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: don't build library or test, just the bonobo control</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead</div><div class='del'>-	of a window, now.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): same</div><div class='del'>-</div><div class='del'>-	* gui/goto.c (goto_dialog): same</div><div class='del'>-</div><div class='del'>-2000-04-06  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): removed</div><div class='del'>-	uih from the argument list, added cal.  use cal as user_data</div><div class='del'>-	in callbacks rather than the control.</div><div class='del'>-	(calendar_control_deactivate): removed uih from argument list</div><div class='del'>-</div><div class='del'>-2000-04-05  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (setup_menu): removed</div><div class='del'>-	(setup_appbar): removed</div><div class='del'>-	(calendar_control_activate): new function -- does the work</div><div class='del'>-	that setup_appbar and setup_menu used to do.</div><div class='del'>-	(calendar_control_deactivate): undoes what calendar_control_activate</div><div class='del'>-	does by removing the toolbar items and menu items.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,</div><div class='del'>-	common stuff is in a library</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget</div><div class='del'>-	based on a gtk_frame rather than a gnome_app</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: split out some of main.c</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: bonobo bung so evolution</div><div class='del'>-	can use the calendar widget</div><div class='del'>-</div><div class='del'>-2000-04-01  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: Added *.lo.</div><div class='del'>-</div><div class='del'>-2000-03-30  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-        * gui/main.c (calendar_get_events_in_range):</div><div class='del'>-        cal_client_get_events_in_range returns a list of CalObjInstance *, not</div><div class='del'>-        a list of (char *) uid.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): readded the gui directory</div><div class='del'>-</div><div class='del'>-	* gui/main.c: temporarily added alarm_defaults back in,</div><div class='del'>-	since the calendar doesn't link without it</div><div class='del'>-</div><div class='del'>-2000-03-29  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove the gui directory, which doesn't compile.</div><div class='del'>-</div><div class='del'>-2000-03-28  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: create a libpcs.la library, for use in the</div><div class='del'>-	wombat.</div><div class='del'>-</div><div class='del'>-2000-03-28  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a</div><div class='del'>-</div><div class='del'>-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to</div><div class='del'>-	ical_object_find_in_string</div><div class='del'>-	(calendar_get_events_in_range): same</div><div class='del'>-	(session_save_state): commented out references</div><div class='del'>-	to gcal-&gt;client-&gt;filename</div><div class='del'>-</div><div class='del'>-2000-03-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_object): Use</div><div class='del'>-	ical_object_to_string().</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_to_string): Moved over from</div><div class='del'>-	pcs/cal-backend.c (was string_from_ical_object).</div><div class='del'>-	(get_calendar_base_vobject): Likewise, moved over from</div><div class='del'>-	pcs/cal-backend.c.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c: Removed string_to_ical_object(); the</div><div class='del'>-	correct function is in calobj.[ch], called</div><div class='del'>-	ical_object_find_in_string().  Removed ical_object_to_string,</div><div class='del'>-	since we now implement it in calobj.c.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see</div><div class='del'>-	above.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object</div><div class='del'>-	instances now contain only the UID for the object, not the whole</div><div class='del'>-	string representation of the object.  This allows clients to</div><div class='del'>-	implement caching of objects if they wish.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_events_in_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (build_event_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_events_in_range):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h (CalObjInstance): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.</div><div class='del'>-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not</div><div class='del'>-	NULL.</div><div class='del'>-</div><div class='del'>-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also</div><div class='del'>-	supports the Unknown interface.</div><div class='del'>-</div><div class='del'>-2000-03-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Fix includes.</div><div class='del'>-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().</div><div class='del'>-	(e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_finish_long_event_resize): Likewise.</div><div class='del'>-	(e_day_view_finish_resize): Likewise.</div><div class='del'>-	(e_day_view_key_press): Likewise.</div><div class='del'>-	(e_day_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): Likewise.</div><div class='del'>-</div><div class='del'>-2000-03-13  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.</div><div class='del'>-</div><div class='del'>-2000-03-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (gnome_calendar_locate): Removed function now that it</div><div class='del'>-	is no CORBA server in the GUI.</div><div class='del'>-	(save_default_calendar): Removed function.  Now the personal</div><div class='del'>-	calendar server will take care of saving modified calendars when</div><div class='del'>-	appropriate.</div><div class='del'>-	(close_cmd): Do not call unregister_calendar_services().</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (ee_ok): Do not save the calendar.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Likewise.</div><div class='del'>-	(delete_todo): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-full-day.c (delete_occurance): Likewise.</div><div class='del'>-	(delete_appointment): Likewise.</div><div class='del'>-	(unrecur_appointment): Likewise.</div><div class='del'>-	(child_focus_out): Likewise.</div><div class='del'>-	(update_from_drag_info): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to</div><div class='del'>-	create the CORBA server.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to</div><div class='del'>-	`client'.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClient): Removed filename and</div><div class='del'>-	corba_server fields.</div><div class='del'>-</div><div class='del'>-2000-03-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Do not pass the INIT_SERVER flag to</div><div class='del'>-	gnome_CORBA_init_with_popt_table().  Check for exceptions</div><div class='del'>-	properly.</div><div class='del'>-	(main): Initialize Bonobo.</div><div class='del'>-	(main): Call process_dates() to parse the dates from the command</div><div class='del'>-	line before we dump the events or the TODOs.</div><div class='del'>-	(main): Use bonobo_main() instead of gtk_main().</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.</div><div class='del'>-	Do not call default_alarm() anymore, since that is a GUI issue.</div><div class='del'>-	(default_alarm): Removed function.</div><div class='del'>-	(alarm_defaults): Removed defaults data.</div><div class='del'>-</div><div class='del'>-	* pcs/tlacuache.c (calendar_notify): Removed stubs for</div><div class='del'>-	alarm_defaults, calendar_notify(), debug_alarms.</div><div class='del'>-</div><div class='del'>-2000-03-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the</div><div class='del'>-	Pilot conduit stuff for now.</div><div class='del'>-</div><div class='del'>-	* gui/calendar.c: Random #ifdefs to make it build, although this</div><div class='del'>-	file is going away.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/calendar-conduit.c: Fixup includes.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-conduit.h: Fixup includes.</div><div class='del'>-</div><div class='del'>-2000-03-09  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"</div><div class='del'>-	in the GnomeCalendar struct.</div><div class='del'>-</div><div class='del'>-	* gui/*.c: tracked change from Calendar * to CalClient</div><div class='del'>-</div><div class='del'>-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c</div><div class='del'>-	(calendar_get_events_in_range): pulled this out of calendar.c and</div><div class='del'>-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also</div><div class='del'>-</div><div class='del'>-2000-03-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the</div><div class='del'>-	list of sources.  This was a miscommunication on our part.</div><div class='del'>-</div><div class='del'>-2000-03-05  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client-alarm.c: stubs for client side</div><div class='del'>-	access to alarm structures.  this will probably change,</div><div class='del'>-	since i don't know what i'm doing.</div><div class='del'>-</div><div class='del'>-	* cal-util/alarm-enums.h: enums for alarms needed by</div><div class='del'>-	both the client and the server</div><div class='del'>-</div><div class='del'>-	* remaining source files in calendar/... have been moved</div><div class='del'>-	to calendar/gui.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c: start to decouple the view from the model</div><div class='del'>-	in the alarm editing code</div><div class='del'>-</div><div class='del'>-2000-03-03  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: new file -- things shared between</div><div class='del'>-	the client and server go in this directory</div><div class='del'>-</div><div class='del'>-	*  calobj.c calobj.h icalendar.c icalendar.h</div><div class='del'>-	timeutil.c timeutil.h cal-util.c cal-util.h where moved</div><div class='del'>-	backend stuff went into pcs.  shared stuff went into</div><div class='del'>-	cal-util.</div><div class='del'>-</div><div class='del'>-2000-03-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	At this point the calendar client and personal calendar server</div><div class='del'>-	files were moved to the idl/, cal-client/, and pcs/ directories.</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am: New file.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff</div><div class='del'>-	from calendar/Makefile.am to here.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from</div><div class='del'>-	calendar/Makefile.am to here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Removed the references to cal-backend.h and its</div><div class='del'>-	stuff.  This file is going away soon!</div><div class='del'>-</div><div class='del'>-	* icalendar.c: #include &lt;config.h&gt;.  Also, we don't need to</div><div class='del'>-	include cal-backend.h or gnome.h.</div><div class='del'>-</div><div class='del'>-	* icalendar.h: Protect from multiple inclusions.</div><div class='del'>-</div><div class='del'>-2000-03-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Use the gnome-config flags for orbit-idl.</div><div class='del'>-	Create a libcal-client library with the calendar client object.</div><div class='del'>-</div><div class='del'>-2000-02-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed stale rule for the conduit.</div><div class='del'>-</div><div class='del'>-2000-02-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Added *.lo.</div><div class='del'>-</div><div class='del'>-2000-02-19  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Added tlacuache and tl-test.</div><div class='del'>-</div><div class='del'>-2000-02-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of</div><div class='del'>-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.</div><div class='del'>-</div><div class='del'>-2000-02-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.h: moved CalendarFormat type def here</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_load): if extension suggests</div><div class='del'>-	an ical file, attempt to load an iCal file.</div><div class='del'>-	(cal_get_type_from_filename): returns CAL_ICAL if file</div><div class='del'>-	extension is 'ics' or 'ifb', else returns CAL_VCAL</div><div class='del'>-	(icalendar_calendar_load): moved this here from</div><div class='del'>-	icalendar.c because it needs to call the static function</div><div class='del'>-	add_object.</div><div class='del'>-</div><div class='del'>-2000-02-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_remove_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_notify_remove): Implemented.</div><div class='del'>-	(Cal_remove_object): Implemented.</div><div class='del'>-	(cal_get_epv): Fill in the remove_object field in the epv.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_object): Implemented.</div><div class='del'>-	(notify_remove): New function to notify clients that an object was</div><div class='del'>-	removed.</div><div class='del'>-</div><div class='del'>-2000-02-16  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer</div><div class='del'>-	from char* to iCalPerson*</div><div class='del'>-</div><div class='del'>-	* calobj.[ch]: Change iCalObject.related from list of char* to</div><div class='del'>-	list of iCalRelation*; assorted related fixes</div><div class='del'>-</div><div class='del'>-	* icalendar.c: interface between libical and the gnomecal</div><div class='del'>-	internal representation</div><div class='del'>-</div><div class='del'>-2000-02-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_update_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_notify_update): New function to notify the listener</div><div class='del'>-	about an updated object.</div><div class='del'>-	(Cal_update_object): Implemented.</div><div class='del'>-	(Cal_get_uids): set_release() the sequence to TRUE.</div><div class='del'>-	(Cal_get_events_in_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (remove_object): New function to remove objects</div><div class='del'>-	from a calendar backend.</div><div class='del'>-	(cal_backend_update_object): New public function to update an</div><div class='del'>-	object and notify clients about it.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added update_object() and</div><div class='del'>-	delete_object() methods.</div><div class='del'>-	(Listener): Removed the obj_changed method and renamed obj_added</div><div class='del'>-	to obj_updated.  We now only have updated and removed notifiers.</div><div class='del'>-</div><div class='del'>-	* cal-listener.[ch]: Removed the "changed" notification code.</div><div class='del'>-	Changed the "added" notification code to the "updated"</div><div class='del'>-	notification.</div><div class='del'>-</div><div class='del'>-	* cal-client.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the</div><div class='del'>-	factory and exit the main loop when the factory is destroyed.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (backend_destroy_cb): New callback used when a</div><div class='del'>-	backend is destroyed.  Removes the backend from the factory's hash</div><div class='del'>-	table and unrefs the factory if all backends go away.</div><div class='del'>-	(add_calendar_client): Free the environment.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to</div><div class='del'>-	initialize.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_new): Likewise.</div><div class='del'>-</div><div class='del'>-	* layout.c (layout_events): Plug li.partition memory leak.</div><div class='del'>-</div><div class='del'>-2000-02-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's</div><div class='del'>-	destroy signal.</div><div class='del'>-	(cal_backend_remove_cal): Killed function now that removal of Cal</div><div class='del'>-	objects is done in their destroy callback.</div><div class='del'>-	(cal_destroy_cb): New callback to remove a Cal from the backend's</div><div class='del'>-	list of clients.  Also, the backend destroys itself when there are</div><div class='del'>-	no more clients connected to it.</div><div class='del'>-	(save): New placeholder function to save a backend.</div><div class='del'>-	(destroy): New function to destroy a backend's data.</div><div class='del'>-	(cal_backend_destroy): Save the calendar and destroy it.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_destroy): Reset the priv-&gt;backend to NULL.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): There is no need to call</div><div class='del'>-	cal_backend_remove_cal(); we can now just destroy the Cal object.</div><div class='del'>-	(create_fn): Make sure we always unref the URI.</div><div class='del'>-	(load_fn): Move the URI unref to the end of the function for</div><div class='del'>-	safety.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): Unref the Cal only if</div><div class='del'>-	notification of the listener was unsuccessful.  Otherwise, the</div><div class='del'>-	calendar user agent (Listener side) keeps the reference.</div><div class='del'>-</div><div class='del'>-	* tl-test.c (list_uids): Free the calobj.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get</div><div class='del'>-	rid of the listener.</div><div class='del'>-	(load_or_create): Likewise.</div><div class='del'>-	(destroy_factory): New function to get rid of the factory.</div><div class='del'>-	(destroy_listener): New function to get rid of the listener.</div><div class='del'>-	(destroy_cal): New function to get rid of the calendar client</div><div class='del'>-	interface object.</div><div class='del'>-	(cal_client_destroy): Free all resources.</div><div class='del'>-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I</div><div class='del'>-	love memprof.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_destroy): Reset the priv-&gt;cal to</div><div class='del'>-	CORBA_OBJECT_NIL.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,</div><div class='del'>-	since the calendar user agent owns it.</div><div class='del'>-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user</div><div class='del'>-	agent owns it.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()</div><div class='del'>-	to get rid of the calendar client interface object.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Duplicate the</div><div class='del'>-	default "PUBLIC" string.</div><div class='del'>-</div><div class='del'>-2000-02-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (cal_factory_load): Added documentation comment.</div><div class='del'>-	(load_fn): Do not print a message if the backend could not be</div><div class='del'>-	loaded due to a non-fatal error.</div><div class='del'>-	(queue_load_create_job): Moved the stuff from cal_factory_load()</div><div class='del'>-	to here.  Now this function serves to queue load or create</div><div class='del'>-	requests.</div><div class='del'>-	(cal_factory_load): Use queue_load_create_job().</div><div class='del'>-	(cal_factory_create): Implemented; use queue_load_create_job().</div><div class='del'>-	(create_fn): New job handler for creating new calendars.</div><div class='del'>-	(create_backend): New function to create a new backend with a new</div><div class='del'>-	calendar.</div><div class='del'>-	(add_backend): New helper function to add backends to the</div><div class='del'>-	factory's hash table.</div><div class='del'>-	(load_backend): Use add_backend() instead of adding the backend by</div><div class='del'>-	ourselves.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (load_or_create): Moved the functionality from</div><div class='del'>-	cal_client_load_calendar() to here, and added an option to create</div><div class='del'>-	a new calendar instead of loading an existing one.</div><div class='del'>-	(cal_client_load_calendar): Use load_or_create().</div><div class='del'>-	(cal_client_create_calendar): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_create): Implemented.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for</div><div class='del'>-	create requests.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.</div><div class='del'>-</div><div class='del'>-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* tl-test.c: New test program for the calendar client side; it</div><div class='del'>-	also exercises the server side by sending commands to it.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the tl-test program.</div><div class='del'>-</div><div class='del'>-	* tlacuache.gnorba: Updated.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (create_cal_factory): Use the right GOAD id.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_construct): Use the right GOAD id.</div><div class='del'>-</div><div class='del'>-2000-02-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added get_uids() method to get a</div><div class='del'>-	list of UIDs based on object types.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in</div><div class='del'>-	the backend.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_uids): Implemented get_uids() method.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_uids): Implemented client-side</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,</div><div class='del'>-	not the last link.</div><div class='del'>-	(cal_obj_uid_list_free): New function to free a list of UIDs.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl (Repository): Removed unused method</div><div class='del'>-	get_object_by_id_list().  This is just for cleanup purposes and to</div><div class='del'>-	remind me exactly of what needs to be moved over to</div><div class='del'>-	evolution-calendar.idl.</div><div class='del'>-	(Repository): Removed unused get_objects() method.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (init_calendar_repo_class): Removed the unused</div><div class='del'>-	get_objects method.</div><div class='del'>-</div><div class='del'>-	* calobj.h (CalObjFindStatus): New status value enumeration for</div><div class='del'>-	the find function.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_find_in_string): New function to parse a</div><div class='del'>-	complete calendar and find a calendar object in it.  This should</div><div class='del'>-	be used instead ical_object_new_from_string() in the future.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (CalObjInstance): Added an uid field.</div><div class='del'>-	Now the idea is that whenever calendar object strings are passed</div><div class='del'>-	around, their UIDs are passed along with them so that the actual</div><div class='del'>-	object can be pulled from the whole VCAL object using its UID to</div><div class='del'>-	identify it.</div><div class='del'>-</div><div class='del'>-	* cal-util.h (CalObjInstance): Added uid field.</div><div class='del'>-</div><div class='del'>-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (build_event_list): Store the object's UID in the</div><div class='del'>-	instance structure.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_events_in_range): Copy the UID</div><div class='del'>-	field from the CORBA structure.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: #include "alarm.h"</div><div class='del'>-	(mail_notify): Made static.</div><div class='del'>-</div><div class='del'>-	* alarm.h: #include "calobj.h"</div><div class='del'>-</div><div class='del'>-	* corba-cal-factory.h (init_corba_server): Fixed prototype.</div><div class='del'>-</div><div class='del'>-	* quick-view.c (create_items_for_event): Made static.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (column_resized): Made static.</div><div class='del'>-</div><div class='del'>-	* layout.c (find_index): Made static.</div><div class='del'>-</div><div class='del'>-2000-02-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (CalObjInstance): New struct to wrap</div><div class='del'>-	instances of calendar objects for recurrencies and alarms.</div><div class='del'>-	(Cal::get_events_in_range): New method to get ocurring and</div><div class='del'>-	recurring events by time range.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_events_in_range): New function to</div><div class='del'>-	get a list of event instances in a time range.</div><div class='del'>-	(string_from_ical_object): New internal function.</div><div class='del'>-	(cal_backend_get_object): Use string_from_ical_object() instead of</div><div class='del'>-	doing everything ourselves.</div><div class='del'>-	(cal_backend_get_events_in_range): New function to get a list of</div><div class='del'>-	the events that occur or recur in a specified time range.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_events_in_range): Implemented</div><div class='del'>-	client-side function.</div><div class='del'>-</div><div class='del'>-	* cal-util.h:</div><div class='del'>-	* cal-util.c: New files with utilities and types common to the</div><div class='del'>-	client and server parts.</div><div class='del'>-	(CalObjInstance): New structure to hold an instance of an actual</div><div class='del'>-	occurrence, recurrence, or alarm trigger of a calendar object.</div><div class='del'>-	(cal_obj_instance_list_free): New function to free a list of</div><div class='del'>-	calendar object instances.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_events_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with</div><div class='del'>-	free(), not g_free(), since calendar_get_as_vcal_string() uses</div><div class='del'>-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as</div><div class='del'>-	well.</div><div class='del'>-</div><div class='del'>-2000-02-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (get_calendar_base_vobject): New function to</div><div class='del'>-	create the base VObject for a calendar.</div><div class='del'>-	(cal_backend_get_object): Create the base calendar and add the</div><div class='del'>-	sought object to it, then stringify it.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Listener::obj_added</div><div class='del'>-	Listener::obj_changed): Now these pass in just the UIDs, not the</div><div class='del'>-	complete objects.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,</div><div class='del'>-	not the object.</div><div class='del'>-	(Listener_obj_changed): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client.h (CalClientClass): Made the obj_added and</div><div class='del'>-	obj_changed signals take in the UIDs, not the full objects.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (obj_added_cb): Likewise.</div><div class='del'>-	(obj_changed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-02-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field</div><div class='del'>-	to object_hash.  Now we hash all the calendar's objects here based</div><div class='del'>-	on their UIDs.</div><div class='del'>-	(ensure_uid): New function to create UIDs for calendar objects</div><div class='del'>-	that don't have them.</div><div class='del'>-	(add_object): Ensure the object has an UID before inserting it in</div><div class='del'>-	the calendar.</div><div class='del'>-	(cal_backend_get_object): New function.</div><div class='del'>-</div><div class='del'>-2000-02-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added the get_object() method.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_object): New function to get a</div><div class='del'>-	calendar object by its UID.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_object): New unfinished backend</div><div class='del'>-	function.  We need some reorganizing of how the calendar objects</div><div class='del'>-	are stored.</div><div class='del'>-</div><div class='del'>-2000-02-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-2000-02-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the</div><div class='del'>-	listener.  Store the calendar client interface object, and emit</div><div class='del'>-	our own cal_loaded signal.</div><div class='del'>-	(cal_client_load_calendar): Connect to the listener's signals.</div><div class='del'>-	(cal_client_class_init): Added the "obj_added", "obj_removed",</div><div class='del'>-	öbj_changed" signals.</div><div class='del'>-	(obj_added_cb): Handle the signal from the listener.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-	(obj_changed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-01-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and</div><div class='del'>-	cal-listener.[ch].</div><div class='del'>-</div><div class='del'>-2000-01-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl: Changed the namespace from</div><div class='del'>-	GNOME::Calendar to Evolution::Calendar.</div><div class='del'>-	(Listener::LoadStatus): Fixed SUCESSS -&gt; SUCCESS typo.  And I</div><div class='del'>-	never noticed it in the implementation.  Ain't M-/ grand?</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to</div><div class='del'>-	evolution-calendar.idl.</div><div class='del'>-</div><div class='del'>-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to</div><div class='del'>-	Evolution_Calendar_foo.</div><div class='del'>-</div><div class='del'>-2000-01-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c cal-client.h: New files with the calendar client</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-01-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (CalFactory_load): Check that the listener is not</div><div class='del'>-	nil and emit and exception if it is.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now</div><div class='del'>-	these raise the NilListener exception.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (calendar_notify): Error stub for alarms.</div><div class='del'>-	(alarm_defaults): Stub array.</div><div class='del'>-	(debug_alarms): Stub variable.</div><div class='del'>-	(main): Initialize gnome-vfs.</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tlacuache.c: New main module for the Tlacuache personal calendar</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME</div><div class='del'>-	personal calendar server.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the stuff necessary to build Tlacuache.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_uri): Convert the URI to a string before</div><div class='del'>-	returning it.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (CalFactory_create): Doh, this function is void.</div><div class='del'>-</div><div class='del'>-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_cal): New function to remove a</div><div class='del'>-	calendar client interface object from a backend.</div><div class='del'>-	(cal_backend_load): Convert the URI to string and use</div><div class='del'>-	Parse_MIME_FromFileName().  The conversion is not very smart,</div><div class='del'>-	though.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (load_backend): Moved most of the error handling</div><div class='del'>-	upstream to load_fn().</div><div class='del'>-	(load_fn): Handle failure in case the backend could not be loaded.</div><div class='del'>-	(cal_factory_destroy): Free the backends and the backend hash</div><div class='del'>-	table.</div><div class='del'>-	(add_calendar_client): Implemented.  We create a Cal client</div><div class='del'>-	interface object and attach it to the backend, and we notify the</div><div class='del'>-	listener.</div><div class='del'>-</div><div class='del'>-2000-01-22  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().</div><div class='del'>-	Also, return a backend instead of a Cal client object.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Pass the load status to</div><div class='del'>-	the signal.</div><div class='del'>-	(cal_listener_destroy): Better error checking.</div><div class='del'>-	(cal_listener_new): Better error checking.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h (CalListenerLoadStatus): New enum for the load</div><div class='del'>-	status of a calendar.</div><div class='del'>-	(CalListenerClass): Added the status argument to the cal_loaded</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (cal_loaded): Added a load status code.</div><div class='del'>-</div><div class='del'>-	* cal-backend.h (CalBackendLoadStatus): Renamed from</div><div class='del'>-	CalBackendLoadResult.</div><div class='del'>-</div><div class='del'>-2000-01-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c cal-backend.h: Moved the calendar backend here.</div><div class='del'>-	This is the actual calendar-handling object.</div><div class='del'>-	(load_from_vobject): Moved over from calendar.c.  Modified to use</div><div class='del'>-	a CalBackend instead of the old Calendar structure.</div><div class='del'>-	(add_object): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal.c: Now the Cal object is just a calendar client interface</div><div class='del'>-	object; we use it as a "viewport" onto a CalBackend.  This also</div><div class='del'>-	lets us do correct resource management.</div><div class='del'>-</div><div class='del'>-	* cal-common.h: New file with common forward declarations; we</div><div class='del'>-	can't have circular dependencies between headers.</div><div class='del'>-</div><div class='del'>-2000-01-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (cal_factory_load): Queue a load job.</div><div class='del'>-	(load_fn): Load job handler.  Lookup the calendar by URI, load it</div><div class='del'>-	if it is not loaded, or just report it to the new listener if it is.</div><div class='del'>-</div><div class='del'>-	* job.c job.h: New files with a simple job queue manager.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the</div><div class='del'>-	whole calendar object string.  The client will be able to query</div><div class='del'>-	the calendar for the events it needs.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME</div><div class='del'>-	object.  We unref it when the listener is destroyed.</div><div class='del'>-</div><div class='del'>-2000-01-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	The files from the gncal directory of the gnome-pim module on CVS</div><div class='del'>-	were moved here, to evolution/calendar, in preparation for the</div><div class='del'>-	Evolution work.  The calendar is being split into a model/view</div><div class='del'>-	architecture.  The model is a personal calendar server (PAS):  it</div><div class='del'>-	provides storage, notification, and event generation; the</div><div class='del'>-	views/controllers are the calendar user agents and things like</div><div class='del'>-	Pilot synchronizers.</div><div class='del'>-</div><div class='del'>-2000-01-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal.c: Removed the CORBA listener methods, adjusted for the new</div><div class='del'>-	IDL.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_init): Create the private</div><div class='del'>-	structure.  In it we hold a reference to the calendar the listener</div><div class='del'>-	is watching.</div><div class='del'>-	(cal_listener_destroy): Destroy the private structure and unref</div><div class='del'>-	the calendar.</div><div class='del'>-	(Listener_cal_loaded): Stuff the calendar into our private data.</div><div class='del'>-	(Listener_obj_added): Adjusted for new IDL.</div><div class='del'>-	(Listener_obj_removed): Likewise.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl: New IDL for the personal calendar server.</div><div class='del'>-</div><div class='del'>-	* cal.h cal.c: New files with the calendar object.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h cal-listener.c: New files with the calendar</div><div class='del'>-	listener object.</div><div class='del'>-</div><div class='del'>-	* cal-factory.h cal-factory.c: New files with the calendar factory</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-01-09  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Changes to remove todo capplet stuff from distro.</div><div class='del'>-</div><div class='del'>-2000-01-08  Vadim Strizhevsky  &lt;vadim@optonline.net&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c: Added pilotID argument to</div><div class='del'>-	gpilotd_conduit_mgmt_new.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you</div><div class='del'>-	can choose which state the object should have</div><div class='del'>-	(any/new/modified/...). Will also add one to choose type</div><div class='del'>-	(event/journal etc).</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the</div><div class='del'>-	new version of get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Calls various</div><div class='del'>- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.</div><div class='del'>-</div><div class='del'>-2000-01-04  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (start_calendar_server): Let's not call</div><div class='del'>-	g_error, but g_warning instead.</div><div class='del'>-	(pre_sync): Get record numbers info, total, new, deleted etc, and</div><div class='del'>-	tell gpilotd.</div><div class='del'>-</div><div class='del'>-1999-12-31  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1</div><div class='del'>-	day) to the date chooses by the user. This ensures the recurrence</div><div class='del'>-	also occurs on that date.</div><div class='del'>-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to</div><div class='del'>-	redisplay the box.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Added an argument to calendar_new, to enable certain</div><div class='del'>-	features, such as initing alarms or nor.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Implemented support for the</div><div class='del'>-	CALENDAR_INIT_ALARMS option to calendar_new.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_updated_objects): Added</div><div class='del'>- 	CALENDAR_INIT_ALARMS to calendar_new calls.</div><div class='del'>-</div><div class='del'>-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This</div><div class='del'>- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess</div><div class='del'>- 	steintr should check it.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.</div><div class='del'>-</div><div class='del'>-1999-12-10  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to</div><div class='del'>-	create default alarm box (widgets in that box should always be</div><div class='del'>-	sensitive, even if the enabled checkbutton is not set)</div><div class='del'>-</div><div class='del'>-1999-12-08  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (setSettings): Capplets now</div><div class='del'>-	sets first_sync on enable, this should make the conduit copy old</div><div class='del'>-	entries from the pilot to gnomecal.</div><div class='del'>-</div><div class='del'>-1999-12-07  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Check if local store is</div><div class='del'>-	empty. If, force slow sync.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl (GNOME): Added get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the</div><div class='del'>- 	get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that</div><div class='del'>-	caused the capplet to always set the sync action to Disable upon start.</div><div class='del'>-</div><div class='del'>-1999-12-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (Conduits_second_DATA): Also install .desktop files</div><div class='del'>-	for conduit capplets in the gnome/apps menu dir.</div><div class='del'>-</div><div class='del'>-1999-12-04  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-1999-10-12  Clifford R. Conover  &lt;rusty@zootweb.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c Todo List improvements.</div><div class='del'>-</div><div class='del'>-	Cleaned up todo item highlighting, added support for highlighting</div><div class='del'>- 	events due today, and events not due yet.  Colors are configurable</div><div class='del'>- 	on the Colors Tab of the properties window.</div><div class='del'>-</div><div class='del'>-	Renamed Frame in Properties window to Colors rather then Month</div><div class='del'>- 	Colors since we are now asking for Todo item colors.</div><div class='del'>-</div><div class='del'>-	Added ability to display time until todo item is due in list, it</div><div class='del'>- 	automatically selects the best denomination of time (up to weeks)</div><div class='del'>- 	and down to seconds to display.  This should be made configurable</div><div class='del'>- 	in a future version.</div><div class='del'>-</div><div class='del'>-	Changed Todo dialog to ask for time that event is due.  This</div><div class='del'>- 	allows more accurate tracking of then the item is due, before the</div><div class='del'>- 	dialog was only asking for the date of the todo item.</div><div class='del'>-</div><div class='del'>-1999-12-03  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.</div><div class='del'>-</div><div class='del'>-1999-12-02  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c: Enhanced debug support: can be toggled on and off by</div><div class='del'>-	SIGUSR1, reports alarms which could not be added</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio</div><div class='del'>-	and display alarms.  Snooze interval can be configured in the</div><div class='del'>-	Properties box.</div><div class='del'>-</div><div class='del'>-1999-11-30  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up</div><div class='del'>-	some of the if's in set_status.</div><div class='del'>-</div><div class='del'>-1999-11-22  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Merged todo list coloring patch from stable</div><div class='del'>-	* Added myself to AUTHORS, about box (per Miguel)</div><div class='del'>-</div><div class='del'>-1999-11-22  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Writes some warning</div><div class='del'>- 	messages when pre_sync fails.</div><div class='del'>-</div><div class='del'>-1999-11-14  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an</div><div class='del'>-	install gnome-pilot... fixed... sorry.</div><div class='del'>-</div><div class='del'>-1999-11-12  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,</div><div class='del'>-	using solution suggested by James Henstridge, appears to be caused</div><div class='del'>-	by a (by now fixed) bug in my automake.</div><div class='del'>-</div><div class='del'>-1999-11-12  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c: Config code for timeout, make Alarms property page use a</div><div class='del'>-	vbox instead of an hbox so that the propbox stays a reasonable width.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load</div><div class='del'>-	from config file</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Give some static functions external linkage so they</div><div class='del'>-	can be used elsewhere (make_spin_button); add some prototypes to</div><div class='del'>-	appease gcc.</div><div class='del'>-</div><div class='del'>-1999-11-11  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_day_change): Add call to</div><div class='del'>-	calendar_init_alarms() to schedule another day change alarm.</div><div class='del'>-</div><div class='del'>-1999-11-09  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,</div><div class='del'>-	now version 0.8.5. Consistent use of GSList/GList. Implemented</div><div class='del'>-	compare, default uses one that compares the contents of a struct</div><div class='del'>-	Appointment, but also has #ifdeffed code that does a field level</div><div class='del'>-	comparison, not complete, but perhaps educational.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an</div><div class='del'>-	unwanted conditional on libcalendar_conduit_la_LDFLAGS</div><div class='del'>-</div><div class='del'>-1999-11-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (readStateCfg): Commented the</div><div class='del'>-	code out, thus the capplet works again.</div><div class='del'>-</div><div class='del'>-1999-11-04  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install</div><div class='del'>- 	dirs for their pilot-link. Also install a pretty icon for the</div><div class='del'>- 	calendar-conduit.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c: Modfied the</div><div class='del'>-	try/revert/ok/cancel scheme to be more intuitive, also uses a</div><div class='del'>-	GtkOptionMenu for the possible sync methods.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.desktop: use the nice icon...</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: Ack, had to define debug_alarms and</div><div class='del'>-	alarm_default, otherwise they are undefined. Is gncal code messy</div><div class='del'>-	or is this considered a way of configuring the cal engine ?</div><div class='del'>-	Implemented delete_all syncabs methods.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: also had to declare debug_alarms and</div><div class='del'>- 	alarm_defaults, just as ugly.</div><div class='del'>-</div><div class='del'>-1999-11-02  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c: Add new alarm page to properties box</div><div class='del'>-</div><div class='del'>-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default</div><div class='del'>-	alarms, configurable in the properties box.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display</div><div class='del'>-	alarms</div><div class='del'>-</div><div class='del'>-1999-10-23  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Correctly initialize calendar_day_end</div><div class='del'>-	and calendar_day_begin *before* installing day-change alarm.</div><div class='del'>-</div><div class='del'>-1999-10-21  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c, main.c: Added alarm debugging code</div><div class='del'>-</div><div class='del'>-	* main.c (open_ok): Show an error box if the user tries to open a</div><div class='del'>-	non-existent file; fixes bug #1818</div><div class='del'>-</div><div class='del'>-1999-10-19  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Fix typos which were causing</div><div class='del'>-	invalid times in audio notification dialogs; fixes Bug #2561</div><div class='del'>-</div><div class='del'>-1999-10-18  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various</div><div class='del'>-	elements of the day view in paned windows so that the user can</div><div class='del'>-	adjust the relative sizes of the daily schedule, monthly calendar,</div><div class='del'>-	and to-do list.</div><div class='del'>-</div><div class='del'>-1999-10-18  Martin Norbäck  &lt;norpan@bigfoot.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added swedish translation</div><div class='del'>-</div><div class='del'>-1999-10-13  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Hopefully the fixes the much-hated</div><div class='del'>-	gnome-pilot dependency.</div><div class='del'>-</div><div class='del'>-1999-10-07  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): moved the pilot_status =</div><div class='del'>-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: more _free calls, vamped the noise on output.</div><div class='del'>-</div><div class='del'>-1999-10-06  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* *conduit*[ch]: checks return values from gpilotd_init/connect.</div><div class='del'>-</div><div class='del'>-	* calender.c (vcalendar_create_from_calendar): removed a set</div><div class='del'>- 	of cleanVObject cleanStrTbl, since the freed memory that the</div><div class='del'>-	function returned.</div><div class='del'>-</div><div class='del'>-1999-09-27  Timur Bakeyev  &lt;mc@bat.ru&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get</div><div class='del'>-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.</div><div class='del'>-	See also 1999-07-19  Matt Martin &lt;matt@abacusnet.net&gt;</div><div class='del'>-</div><div class='del'>-1999-09-27  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (add_event): ditto</div><div class='del'>-	(mark_current_day): ditto</div><div class='del'>-	(month_view_set): ditto</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): ditto.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_init): ditto.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): ditto.</div><div class='del'>-</div><div class='del'>-	* getdate.c (RelativeDate): ditto.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (set_all_day): ditto.</div><div class='del'>-	(ee_rp_init_rule): ditto.</div><div class='del'>-</div><div class='del'>-	* calendar.c (vcalendar_create_from_calendar): ditto.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (update_record): ditto.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Get rid of pointers to</div><div class='del'>-	values returned from localtime, as it uses a static buffer.</div><div class='del'>-</div><div class='del'>-1999-09-26  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* corba-cal.c: the g_free that was commented out since glib said</div><div class='del'>-	was a duplicate free, was supposed to be a free.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a</div><div class='del'>-	get_objects_by_id_list. Latter is not done.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: rewrote the way the conduit iterates over</div><div class='del'>-	records. It no longers fetches all entries (since that didn't work</div><div class='del'>-	with more then 285 entries. It now fetches the id list, and gets</div><div class='del'>-	each record. (will be using get_objects_by_id_list to get records</div><div class='del'>-	in amounts of 10 or so later, to reduce amount of corba calls).</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: now sets alarm parameters when transferring</div><div class='del'>-	from gnomecal to pilot.</div><div class='del'>-</div><div class='del'>-1999-09-23  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: better merge of summary/description</div><div class='del'>- 	when doing ical_from_remote (update_record), also handles</div><div class='del'>-	import from gnomecal to pilot better, and on both ways, repeat</div><div class='del'>-	events are much better now.</div><div class='del'>-</div><div class='del'>-1999-09-22  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* corba-cal.c: commented out a g_free that glib reported</div><div class='del'>-	as being a duplicate free.</div><div class='del'>-	* calendar-conduit.c: got gnomecal-&gt;pilot up and runnning.</div><div class='del'>-</div><div class='del'>-1999-02-06  Lauris Kaplinski &lt;lauris@ariman.ee&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Estonian translations.</div><div class='del'>-</div><div class='del'>-1999-09-14  Federico Mena Quintero  &lt;federico@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): Set the data pointers for</div><div class='del'>-	all the items.</div><div class='del'>-</div><div class='del'>-1999-09-14  Kjartan Maraas  &lt;kmaraas@online.no&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest</div><div class='del'>-	user-guide.</div><div class='del'>-</div><div class='del'>-1999-09-01  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_buttons): Make the OK button the default</div><div class='del'>-	button per Russell's suggestion.</div><div class='del'>-</div><div class='del'>-1999-08-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Modify the</div><div class='del'>-	object-&gt;last_mod field.</div><div class='del'>-	(calendar_add_object): Ditto.</div><div class='del'>-</div><div class='del'>-	Closes bug #676</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Fix problem in which we warned the</div><div class='del'>-	user about the calendar being modified the first time the calendar</div><div class='del'>-	was used.</div><div class='del'>-</div><div class='del'>-1999-08-22  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gnomecal.gnorba: "GenericFactoy" is wrong...</div><div class='del'>-</div><div class='del'>-1999-08-15  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Fix the hostname part.</div><div class='del'>-</div><div class='del'>-1999-08-07  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects</div><div class='del'>-	created on the pilot, but not dirty (because they have been synced</div><div class='del'>-	with some other program in the past)</div><div class='del'>-</div><div class='del'>-1999-07-30  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Release points here.</div><div class='del'>-</div><div class='del'>-1999-08-02  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):</div><div class='del'>-	libcalendar_conduit now installs</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments</div><div class='del'>-	correctly, when they are deleted on the pilot</div><div class='del'>-	(conduit_free_Appointment): protect against double-freeing parts</div><div class='del'>-	of the Appointment structure</div><div class='del'>-	(update_record): all-day events from the pilot are handled a bit</div><div class='del'>-	more reasonably</div><div class='del'>-</div><div class='del'>-1999-08-01  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day</div><div class='del'>-	appointment corruption bug is dead. Whoo!</div><div class='del'>-</div><div class='del'>-1999-07-31  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: fixed this up slightly with respect to pilot conduits</div><div class='del'>-</div><div class='del'>-1999-07-30  Jonathan Blandford  &lt;jrb@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff</div><div class='del'>-</div><div class='del'>-1999-07-29  Jonathan Blandford  &lt;jrb@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.</div><div class='del'>-</div><div class='del'>-1999-07-28  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is</div><div class='del'>-	not set, set the repeatForever to 1.  This fixes all of the</div><div class='del'>-	birthdays problems I had.</div><div class='del'>-</div><div class='del'>-	Make the code not take arguments</div><div class='del'>-	(sync_cal_to_pilot): Nice event update information</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Add Event UID hash table.</div><div class='del'>-	(calendar_add_object): Add events to the hash table here.</div><div class='del'>-	(calendar_remove_object): Remove events here.</div><div class='del'>-	(calendar_object_find_event): Use the hash table here.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): The object is already destroyed by</div><div class='del'>-	gnome_dialog_run.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn</div><div class='del'>-	archived bit on.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.</div><div class='del'>-	(ical_gen_uid): Add a serial number.  Isodates can be small.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the</div><div class='del'>-	pilot status.</div><div class='del'>-	(cal_repo_get_updated_objects): New method.  Returns a list of</div><div class='del'>-	modified and not-sycned objects</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync</div><div class='del'>-	from the GnomeCalendar to the pilot.</div><div class='del'>-	(sync_object_to_pilot): Sync a single event to the pilot.</div><div class='del'>-	(try_alarm): Alarm syncing code.</div><div class='del'>-</div><div class='del'>-1999-07-27  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: New file.  Implements PalmPilot</div><div class='del'>-	syncronization with the Gnome Calendar.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_new_from_string): New function.  Creates</div><div class='del'>-	an iCalObject from a vCalendar string that is supposed to contain</div><div class='del'>-	only one vEvent.</div><div class='del'>-</div><div class='del'>-	* calendar.c:</div><div class='del'>-	(calendar_save): Split this routine in two.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.</div><div class='del'>-</div><div class='del'>-	* main.c: Include gnorba.h, and corba-cal-factory.h here</div><div class='del'>-	(close_cmd): Kill the calendar server on shutdown.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE</div><div class='del'>-	need to handle intervals in the years.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_find_in_list, calendar_object_find,</div><div class='del'>-	calendar_object_find_todo, calendar_object_find_event): New</div><div class='del'>-	functions for looking up information.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_calendar_locate): New function.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (calendar_create_object): New file.  Implements the</div><div class='del'>-	corba server.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.</div><div class='del'>-	(ical_object_create_from_vobject): Load syncing information for</div><div class='del'>-	pilot.  Do it in a way compatible with KOrganizer.</div><div class='del'>-</div><div class='del'>-1999-07-26  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs</div><div class='del'>-	on Vevents we load that lack it.  WE need this for the old</div><div class='del'>-	gnome calendar generated files (ie, before now :-).</div><div class='del'>-</div><div class='del'>-	Required to sync with the Palm</div><div class='del'>-</div><div class='del'>-1999-07-26  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs</div><div class='del'>-	on Vevents we load that lack it.  WE need this for the old</div><div class='del'>-	gnome calendar generated files (ie, before now :-).</div><div class='del'>-</div><div class='del'>-	Required to sync with the Palm</div><div class='del'>-</div><div class='del'>-1999-07-19  Matt Martin &lt;matt@abacusnet.net&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the</div><div class='del'>-	ISO date format to convert from GMT time.</div><div class='del'>-</div><div class='del'>-1999-07-17  Nat Friedman  &lt;nat@gnome-support.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_add_object): Copy the new UID into the</div><div class='del'>- 	iCalObject structure.</div><div class='del'>-</div><div class='del'>-1999-07-16  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from</div><div class='del'>-	gnome-pim-1-0: Fixed cut&amp;paste bug for day fontsets.</div><div class='del'>-</div><div class='del'>-1999-07-14  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Returns a UID.</div><div class='del'>-	(ical_object_new): Use a UID when creating an event.  Should get</div><div class='del'>-	syncing done easier.</div><div class='del'>-</div><div class='del'>-1999-07-14  Nicholas J Kreucher &lt;nick@poetic.com&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (skip_numbers): Actually skip over the numbers.</div><div class='del'>-	(ical_object_to_vobject): Test the proper variable for storing the</div><div class='del'>-	proper information.</div><div class='del'>-</div><div class='del'>-1999-07-14  Jean-Noel Guiheneuf &lt;jean-noel.guiheneuf@wanadoo.fr&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_month): Fixed the problem with next month</div><div class='del'>-	going from a 31-day to a 30-day by adjusting the date to the</div><div class='del'>-	closest day at the end of the month.</div><div class='del'>-</div><div class='del'>-1999-06-07  Mike McEwan  &lt;mike@lotusland.demon.co.uk&gt;</div><div class='del'>-</div><div class='del'>-        * timeutil.c (time_add_month): Tell ktime' that we don't know</div><div class='del'>-        about daylight saving time so that it does *not* make adjustments</div><div class='del'>-        when we traverse a DST boundary.</div><div class='del'>-        (time_year_begin): ditto.</div><div class='del'>-        (time_year_end): ditto.</div><div class='del'>-        (time_month_begin): ditto.</div><div class='del'>-        (time_month_end): ditto.</div><div class='del'>-</div><div class='del'>-1999-06-16  Anders Carlsson  &lt;anders.carlsson@tordata.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (new_calendar): Realize the toplevel widget when</div><div class='del'>-	--hidden is passed to gnomecal. This fixes a segfault.</div><div class='del'>-</div><div class='del'>-1999-06-04  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.</div><div class='del'>-	(Bug #1367). Thanks to Owen Cliffe &lt;oc197@ecs.soton.ac.uk&gt; for</div><div class='del'>-	helping track it down.</div><div class='del'>-</div><div class='del'>-1999-06-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.</div><div class='del'>-</div><div class='del'>-1999-06-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU</div><div class='del'>-	extension, not available in other systems.</div><div class='del'>-</div><div class='del'>-1999-06-01  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (daynumberlist): Work around broken software that</div><div class='del'>-	writes a broken month-of-day as "zero".  Use the dtstart date for</div><div class='del'>-	this on this event.</div><div class='del'>-</div><div class='del'>-1999-05-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-local): help files be gone.  They are</div><div class='del'>-	now installed from the Docbook stuff.</div><div class='del'>-</div><div class='del'>-1999-05-26  Russell Steinthal  &lt;steintr@condor.penguinpowered.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c main.c main.h prop.c: Added support for priorities</div><div class='del'>-	for todo items.  Doesn't do much, but you can set them and sort by</div><div class='del'>-	them.  (Use the properties box to enable them; should they be on</div><div class='del'>-	by default?)</div><div class='del'>-</div><div class='del'>-1999-05-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (parse_an_arg): Added missing break here.  It was causing</div><div class='del'>-	core dumps when invoked with --userfile.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,</div><div class='del'>-	to pin point the bug reported on gnome-list.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recurrence): Make intervals always exist.  a 0</div><div class='del'>-	interval is wrong.</div><div class='del'>-</div><div class='del'>-1999-05-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.</div><div class='del'>-</div><div class='del'>-1999-05-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (idle_handler): Set the canvas scroll region here,</div><div class='del'>-	not in size_allocate().  Also, use the correct width and height</div><div class='del'>-	based on the allocation and the precomputed minimum width/height</div><div class='del'>-	values.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the</div><div class='del'>-	scrolled window.</div><div class='del'>-</div><div class='del'>-	* main.c (setup_appbar): Use the correct type for the appbar.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c: Removed unused function switch_to_day().</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.</div><div class='del'>-</div><div class='del'>-1999-05-25  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/gnomecal.sgml: Fixed a typo.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into</div><div class='del'>- 	which the year view is placed.</div><div class='del'>-</div><div class='del'>-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view</div><div class='del'>- 	inside the scrolled window.</div><div class='del'>-	(idle_handler): Set the height of the year view to</div><div class='del'>- 	CALENDAR_HEIGHT.</div><div class='del'>-	(year_view_size_allocate): Set the scroll region of the year view</div><div class='del'>- 	canvas to allocation-&gt;width, CALENDAR_HEIGHT.</div><div class='del'>-</div><div class='del'>-1999-04-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (dump_todo): Add --todo flag to dump the todo contents.</div><div class='del'>-</div><div class='del'>-1999-04-19  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (add_activated): Use same hack used in edit_activated</div><div class='del'>-</div><div class='del'>-1999-04-16  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (edit_activated): Kill all grabs from the CList</div><div class='del'>-	before running the new dialog box.</div><div class='del'>-</div><div class='del'>-	This fixes the problem of button-3/Edit on the todo item blocking</div><div class='del'>-	the GUI (actually, the main window responds, but not the todo</div><div class='del'>-	window).</div><div class='del'>-</div><div class='del'>-1999-04-08  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for</div><div class='del'>-	button3.  The code for the nice popup menu was there but was not</div><div class='del'>-	getting invoked.</div><div class='del'>-</div><div class='del'>-1999-04-01 Steve Murphy &lt;murf@e-tools.com&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences</div><div class='del'>-	use the weekday field as a simple integer for a single weekday.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of</div><div class='del'>-	weekdaylist. The interface only lets the user input a single value</div><div class='del'>-	anyway.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): instead of code to output day</div><div class='del'>-	names from a bit array, use instead the value as an int and output</div><div class='del'>-	a single dayname.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): first_week_day gets the</div><div class='del'>-	day int instead of the first entry in the bit field. I inserted a</div><div class='del'>-	fair chunk of code to avoid calling generate if the day is out of</div><div class='del'>-	range for a month. It may be unneccessary, because mktime will</div><div class='del'>-	turn the extra days into a valid date the next month. But not all</div><div class='del'>-	mktimes are equal, I fear.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,</div><div class='del'>-	(Monthly), I added code to set the interval slot of the recur</div><div class='del'>-	struct; without this value, selecting a monthly recursing, by</div><div class='del'>-	date, would lead to an infinite loop broken only by a failure to</div><div class='del'>-	alloc more memory. Also, in the "by position" case, both</div><div class='del'>-	u.month_pos and u.month_day were being assigned values. This is a</div><div class='del'>-	mistake, as they are both part of an union, and the same</div><div class='del'>-	thing. The weekday field should get the recur_rr_month_weekday</div><div class='del'>-	value.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): set default day from the weekday</div><div class='del'>-	field instead of the u.month_day field, which is really the</div><div class='del'>-	month_pos value.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with</div><div class='del'>-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime</div><div class='del'>-	will generate a time corresponding to the end of the previous</div><div class='del'>-	month, which may have a mday anywhere from 28 to 31. The end time</div><div class='del'>-	just adds 1 to the month, so your end time may not cover the last</div><div class='del'>-	few days of this month, depending on what the biggest mday of last</div><div class='del'>-	month was. I changed it so tm_mday is set to 1 instead.</div><div class='del'>-</div><div class='del'>-1999-03-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use</div><div class='del'>-	the full year format for strftime().</div><div class='del'>-</div><div class='del'>-1999-03-27  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c: Include &lt;config.h&gt; So that strings get translated.</div><div class='del'>-</div><div class='del'>-1999-03-26  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (build_hours_menu): Made it respect 12/24h settings..</div><div class='del'>-	Doesn't show until next time you open the dialog.. yet..</div><div class='del'>-</div><div class='del'>-1999-03-24  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work</div><div class='del'>-	* eventedit.c (get_exception_string): Did some i18n work</div><div class='del'>-</div><div class='del'>-1999-03-24  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able</div><div class='del'>-	* main.c (poptOption): Added which views that are possible for</div><div class='del'>-	--view in the --help text (closes #367)</div><div class='del'>-	* main.c (dump_events): Added (short) month to the strftime and made</div><div class='del'>-	the strings i18n:able</div><div class='del'>-</div><div class='del'>-1999-03-23  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal/calobj.c: Added 2 paranthesis..</div><div class='del'>-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"</div><div class='del'>-	which caused heavy alarm-corruption with alarms between 2 hrs and</div><div class='del'>-	2 days.</div><div class='del'>-</div><div class='del'>-1999-03-23  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): Set the</div><div class='del'>- 	recur-&gt;interval to the value of the recur_rr_month_period spin</div><div class='del'>- 	button if the event is being set "by day."  This closes bug #675</div><div class='del'>- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!</div><div class='del'>-</div><div class='del'>-1999-03-10  Clifford R. Conover &lt;rconover@montana.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when</div><div class='del'>-	adding a TODO item here.</div><div class='del'>-	(column_resized): New function</div><div class='del'>-	(init_column_sorting): New function.</div><div class='del'>-	(todo_click_column): New function.</div><div class='del'>-	(convert_time_t_to_char, make_overdue_todo_style): New functions.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New</div><div class='del'>-	function used to update the TODO when the properties have been</div><div class='del'>-	chagned for it.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply_todo): Apply TODO properties.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (todo_list_properties_changed): Update the</div><div class='del'>-	TODO display here.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (date_edit_new): Made public</div><div class='del'>-</div><div class='del'>-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)</div><div class='del'>-</div><div class='del'>-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support</div><div class='del'>-	for daylight time savings.</div><div class='del'>-</div><div class='del'>-1999-02-28  Martin Baulig  &lt;martin@home-of-linux.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP</div><div class='del'>-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently</div><div class='del'>-	has the focus.</div><div class='del'>-</div><div class='del'>-1999-02-27  Changwoo Ryu  &lt;cwryu@adam.kaist.ac.kr&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the</div><div class='del'>-	fontset string.</div><div class='del'>-	* mark.h (*_FONTSET): Likewise.</div><div class='del'>-</div><div class='del'>-1999-02-23  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of</div><div class='del'>-	the event.</div><div class='del'>-	(ical_object_create_from_vobject): Load the owner/organizer of the event.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes</div><div class='del'>-	crash on "delete this occurrance").</div><div class='del'>-</div><div class='del'>-1999-02-22  Timur Bakeyev  &lt;mc@bat.ru&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c: According to configured values, use either tm.tm_zone</div><div class='del'>-	or tzname. In last case, also declare it extern.</div><div class='del'>-</div><div class='del'>-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works</div><div class='del'>-	fine without it.</div><div class='del'>-</div><div class='del'>-1999-02-20  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (init_username): Made use of g_get_{user,real}_name() instead</div><div class='del'>-	of our own home-brew...</div><div class='del'>-</div><div class='del'>-1999-02-17  Sergey Panov &lt;sipan@mit.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,</div><div class='del'>-	month-view.c,prop.c,quick-view.c,year-view.c: will define</div><div class='del'>-	fonts via fontset. Friendlier to locales that use iso8859-[^1]</div><div class='del'>-	and koi8-r encodings. Does not solve problem for Asian languiges</div><div class='del'>-	--- better solution is needed (e.g. standart GNOME fontstyles</div><div class='del'>-	defined in gtkrc).</div><div class='del'>-</div><div class='del'>-1999-02-16  Sergey Panov &lt;sipan@mit.edu&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Use N_() macro for color settings labels in</div><div class='del'>-	color_props structure.</div><div class='del'>-</div><div class='del'>-1999-02-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Indentation fixes.</div><div class='del'>-</div><div class='del'>-1999-02-15  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c: Made a private copy of what localtime() returns, to be able</div><div class='del'>-	to keep the data after more calls to localtime().</div><div class='del'>-</div><div class='del'>-1999-02-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (save_default_calendar): New function.  Saves the</div><div class='del'>-	calendar if it is the user's default calendar</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (unrecur_appointment):</div><div class='del'>-	* gncal-day-panel.c (day_view_range_activated):</div><div class='del'>-	* eventedit.c (ee_ok):</div><div class='del'>-	* gncal-todo.c (ok_button): Added autosave for the default</div><div class='del'>-	calendar.</div><div class='del'>-</div><div class='del'>-1999-02-09  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Removed the gtk_widget_realize call.</div><div class='del'>-</div><div class='del'>-1999-02-06  Changwoo Ryu  &lt;cwryu@adam.kaist.ac.kr&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Korean translations.</div><div class='del'>-</div><div class='del'>-1999-02-04  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (date_edit_new): New convenience function to create</div><div class='del'>-	a properly-configured date editor widget.</div><div class='del'>-</div><div class='del'>-1999-02-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start</div><div class='del'>-	weeks on Monday if appropriate.</div><div class='del'>-	(gncal_week_view_time_format_changed): New function to notify the</div><div class='del'>-	week view that the time format has changed.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start</div><div class='del'>-	weeks on Monday if appropriate.</div><div class='del'>-	(gncal_day_panel_time_format_changed): New function to notify the</div><div class='del'>-	day panel that the time format has changed.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day</div><div class='del'>-	and week views that the time format has changed.</div><div class='del'>-</div><div class='del'>-1999-02-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_init): Set the title of the event</div><div class='del'>-	editor window.</div><div class='del'>-</div><div class='del'>-1999-01-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the</div><div class='del'>-	clipping rectangle here.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Remove the clipping</div><div class='del'>-	rectangle here, since the user of this function should not know</div><div class='del'>-	about it.</div><div class='del'>-</div><div class='del'>-1999-01-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Improve this draw</div><div class='del'>-	routine.  Now it can split the text in lines and fit as many</div><div class='del'>-	events as possible.</div><div class='del'>-	(nicetime): Return strings without spaces at the beginning.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear</div><div class='del'>-	operation here.</div><div class='del'>-</div><div class='del'>-1999-01-29 Jason Tackaberry &lt;tack@dok.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): if the user clicks on an</div><div class='del'>-        event that is an occurance, the menu will allow the user to delete</div><div class='del'>-        all occurances of this event, or just the selected occurance.</div><div class='del'>-        (delete_occurance): added.</div><div class='del'>-</div><div class='del'>-        * eventedit.c (append_exception): force the clist to select the</div><div class='del'>-        new exception.  (fixes segfault)</div><div class='del'>-        (delete_exception): if the last exception in the clist is deleted,</div><div class='del'>-        move the selection index up. (fixes segfault)</div><div class='del'>-</div><div class='del'>-1999-01-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at</div><div class='del'>-	startup. Only works with GNOME window managers though :-(</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.</div><div class='del'>-</div><div class='del'>-	(calendar_init_alarms): Schedule an alarm for midnight to change</div><div class='del'>-	the calendar_day_begin/calendar_day_end.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_ready): If we reschedule, there is no need to</div><div class='del'>-	activate any pending alarms.</div><div class='del'>-</div><div class='del'>-1999-01-28  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_new): Insert the summary text here.</div><div class='del'>-	(child_focus_in): No need to raise the window, since we have</div><div class='del'>-	Spiffo(tm) layout code.  Boy, this is old code.</div><div class='del'>-	(gncal_full_day_focus_child): Now that GtkText works better, we</div><div class='del'>-	can avoid synthesizing a click which was causing grief, anyway.</div><div class='del'>-	(child_button_press): Grab the focus before popping up the menu.</div><div class='del'>-</div><div class='del'>-	* layout.c (find_index): Added a sanity check.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child</div><div class='del'>-	before unparenting/destroying it.</div><div class='del'>-	(child_unrealize): Unrealize the widget.  What was I thinking?</div><div class='del'>-	(child_new): Save the focus_out_event signal connection id in</div><div class='del'>-	Child structure (in a new field).</div><div class='del'>-	(child_destroy): Disconnect from the focus_out_event signal, since</div><div class='del'>-	we don't want to get such an event when the widget is destroyed.</div><div class='del'>-	(gncal_full_day_destroy): Destroy the children properly; it was</div><div class='del'>-	leaking memory.</div><div class='del'>-</div><div class='del'>-1999-01-27  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Warn if the calendar file has</div><div class='del'>-	changed.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_load, calendar_save): Keep track of the</div><div class='del'>-	modification time for the calendar file.</div><div class='del'>-</div><div class='del'>-1999-01-20  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable</div><div class='del'>- 	characters such that hotkeys work.</div><div class='del'>-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.</div><div class='del'>-</div><div class='del'>-	* prop.c (properties): Connect gnome_help_pbox_display to the</div><div class='del'>- 	GnomePropertyBox help button.</div><div class='del'>-</div><div class='del'>-1999-01-19  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here</div><div class='del'>-	(it was being grabbed incorrectly, anyways).</div><div class='del'>-	(quick_view_map_event): Grab the mouse when the window is mapped.</div><div class='del'>-	This avoids the ugly "while (xGrabPointer () != Success)" hack.</div><div class='del'>-	(quick_view_button_release): Handle button releases here.</div><div class='del'>-</div><div class='del'>-1999-01-19  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: do gtk_widget_realize on the toplevel window..</div><div class='del'>-</div><div class='del'>-1999-01-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Make the little</div><div class='del'>-	calendar start up with the correct date.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_set): Add the month to the</div><div class='del'>-	date range display label.</div><div class='del'>-</div><div class='del'>-1999-01-08  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Converted some more stuff to use the standards.</div><div class='del'>-</div><div class='del'>-1999-01-08  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (setup_appbar): New function to create the status bar.</div><div class='del'>-	(setup_menu): Install menu hints.</div><div class='del'>-</div><div class='del'>-	Menu items updated to match the standards.  New Settings menu</div><div class='del'>- 	created.</div><div class='del'>-</div><div class='del'>-1998-12-30  Jeff Garzik  &lt;jgarzik@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,</div><div class='del'>-	  gncal/quick-view.c:</div><div class='del'>-	s/g_copy_strings/g_strconcat/</div><div class='del'>-</div><div class='del'>-1998-12-16  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	Rewrote the old and broken alarm system.  It never actually</div><div class='del'>-	worked properly.  Now it works properly, and I figured a nice way</div><div class='del'>-	to get the Audio alarm do something nicer (it is now like an alarm</div><div class='del'>-	clock :-).</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to</div><div class='del'>-	actually distinguish which alarm was triggered.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_ready): The code was only activating the first</div><div class='del'>-	alarm.  Reschedule the timer upon delivery of an alarm.</div><div class='del'>-</div><div class='del'>-1998-12-14  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (idle_handler): Use the allocation size instead of</div><div class='del'>-	the old fields in the canvas structure.</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Use gtk_widget_set_usize() instead of</div><div class='del'>-	gnome_canvas_set_size().</div><div class='del'>-	* quick-view.c (setup_event_list): Likewise.</div><div class='del'>-</div><div class='del'>-1998-12-09  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.</div><div class='del'>-	* goto.c (goto_dialog): ditto</div><div class='del'>-	* prop.c (properties): ditto.</div><div class='del'>-</div><div class='del'>-1998-11-23  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.</div><div class='del'>-</div><div class='del'>-1998-11-23  Andrew T. Veliath  &lt;andrewtv@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Use</div><div class='del'>-	gtk_scrolled_window_add_with_viewport instead of</div><div class='del'>-	gtk_container_add (gtk changes).</div><div class='del'>-</div><div class='del'>-1998-11-23  Herbert V. Riedel &lt;hvr@hvrlab.ml.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: use GPOINTER_TO_INT</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c: same.</div><div class='del'>-</div><div class='del'>-1998-11-22  Matthew Wilson  &lt;msw@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Fixed the popt event parsing callback to have the</div><div class='del'>-	correct number of arguments.  This stops it from segfaulting.</div><div class='del'>-</div><div class='del'>-1998-11-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug</div><div class='del'>-	where the classification buttons were not being set correctly.</div><div class='del'>-	(ee_store_general_values_to_ical): Take into account the fact that</div><div class='del'>-	radio group lists are stored in reverse order of insertion.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the</div><div class='del'>-	clist into.</div><div class='del'>-</div><div class='del'>-1998-11-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_save): Backup the old file before saving</div><div class='del'>-	the caledar.</div><div class='del'>-</div><div class='del'>-1998-11-06  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c: Add ctype.h</div><div class='del'>-</div><div class='del'>-1998-10-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the</div><div class='del'>-	beginning of the current time unit (day/month/etc), otherwise it</div><div class='del'>-	does not work right, for example, you are on the 31st day of a</div><div class='del'>-	month and the next month is a 30-day one and you jump to the next</div><div class='del'>-	month.</div><div class='del'>-</div><div class='del'>-1998-10-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c: Changed a lot of stuff not to use the layout code</div><div class='del'>-	-- the month view's days are too small to display layout</div><div class='del'>-	usefully.  Now they display a little list of the events in each</div><div class='del'>-	day.  We also have a popup menu for the days in the month view.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_get_objects_in_range): Reverse the list so</div><div class='del'>-	that it is returned in increasing order.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_new_whole_day): New public function to</div><div class='del'>-	create an event for the complete span of day_begin to day_end.</div><div class='del'>-</div><div class='del'>-	* year-view.c (new_appointment): Use event_editor_new_whole_day().</div><div class='del'>-</div><div class='del'>-	* year-view.c (yv_popup_menu): Mark strings for i18n.</div><div class='del'>-</div><div class='del'>-1998-10-12  Ji Lee &lt;g@ucsd.edu&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was</div><div class='del'>-	never being loaded from the spin button.</div><div class='del'>-</div><div class='del'>-1998-10-09  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_update): Create a list of children and</div><div class='del'>-	lay them out nicely.  Lots of functions added for this purpose.</div><div class='del'>-	(adjust_segment): Main event segment adjustment routine.</div><div class='del'>-	(adjust_children): Adjusts all the children in the month view.</div><div class='del'>-	(child_create_segments): Creates the segments for a particular event.</div><div class='del'>-	(layout_children): Uses the generic layout engine to organize the children.</div><div class='del'>-</div><div class='del'>-1998-10-08  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the</div><div class='del'>-	edit/delete buttons.</div><div class='del'>-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the</div><div class='del'>-	bug report.</div><div class='del'>-</div><div class='del'>-	* layout.c: Do some cleanup; now we pass a struct with the layout</div><div class='del'>-	algorithm's state instead of passing a trillion parameters around.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_children): Use the new generic layout</div><div class='del'>-	engine.</div><div class='del'>-	(child_compare): Sort keys are start time then end time, not just</div><div class='del'>-	start time.  This produces somewhat nicer results for the layout</div><div class='del'>-	algorithm.</div><div class='del'>-</div><div class='del'>-	The new layout code uses a partition of the time range occupied by</div><div class='del'>-	the events, rather than using a fixed time granularity.  This is</div><div class='del'>-	better since the different parts of the program that use the</div><div class='del'>-	layout module will have different semantics regarding snapping the</div><div class='del'>-	event bounds to a fixed "time grid".</div><div class='del'>-</div><div class='del'>-1998-10-07  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* layout.[ch]: New files that abstract the event layout code from</div><div class='del'>-	gncal-full-day.c into something useful for other parts of the</div><div class='del'>-	program.  Now all event layout is done here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-1998-10-07  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (main): Replaced the 'gnome_client_new_default' call with</div><div class='del'>-	'gnome_master_client'.</div><div class='del'>-</div><div class='del'>-1998-10-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_day_begin): Changed name from</div><div class='del'>-	time_start_of_day() to be consistent with the other begin/end functions.</div><div class='del'>-	(time_day_end): Likewise.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_get_first_weekday): New public function to</div><div class='del'>-	get the first toggled day in a weekday mask.  Since we do not</div><div class='del'>-	support multiple weekdays in a monthly-by-pos rule, we just fetch</div><div class='del'>-	the first toggled one.</div><div class='del'>-	(ical_object_generate_events): Added a missing break statement.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_month_end): Made it consistent with the rest of</div><div class='del'>-	the time begin/end functions -- now it returns the first second of</div><div class='del'>-	the *next* month.</div><div class='del'>-	(time_week_end): Actually implemented this function.  It will be</div><div class='del'>-	used when the week view is rewritten.</div><div class='del'>-</div><div class='del'>-	* calobj.c (time_in_range): Fix off-by-one in the comparison of</div><div class='del'>-	the time against the end time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (expand_space): Fixed bug where the columns not</div><div class='del'>-	were being expanded due to a missing "slot + j".</div><div class='del'>-</div><div class='del'>-1998-10-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Use the font #defines.</div><div class='del'>-	(month_view_new): Set the colors of the month view upon creation.</div><div class='del'>-	(mark_current_day): New function to mark the current day in the</div><div class='del'>-	month view.</div><div class='del'>-	(month_view_set): Mark the current day.</div><div class='del'>-	(month_view_colors_changed): Mark the current day and colorify the</div><div class='del'>-	month item appropriately.</div><div class='del'>-</div><div class='del'>-	* month-view.h: Added year and month fields to the MonthView</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-	* main.c: Renamed the Appointments color property, since it will</div><div class='del'>-	be used by the month view as well.</div><div class='del'>-</div><div class='del'>-	* goto.c (update): Set the current day's font and color.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_init): Set the fonts of the month items</div><div class='del'>-	when creating them.</div><div class='del'>-</div><div class='del'>-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_init): Use the new font #defines.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply_colors): Fixed to work with the</div><div class='del'>-	I-am-paranoid-and-I-need-to-size-my-ints changes to</div><div class='del'>-	GnomeColorPicker.</div><div class='del'>-	(color_spec_from_picker): Likewise.</div><div class='del'>-</div><div class='del'>-1998-09-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Colorify the month item and prepare it for</div><div class='del'>-	prelighting here.</div><div class='del'>-</div><div class='del'>-	* main.c (color_props):  Changed the default colors to something</div><div class='del'>-	not dull.</div><div class='del'>-</div><div class='del'>-	* year-view.c (compute_min_size): New function to compute the</div><div class='del'>-	minimum size of the year view properly.</div><div class='del'>-	(year_view_size_request): Added two new fields to the year view</div><div class='del'>-	structure that contain the minimum size.  Return this in the</div><div class='del'>-	size_request method.</div><div class='del'>-	(year_view_new): Call compute_min_size to save the minimum size</div><div class='del'>-	for later use.</div><div class='del'>-	(idle_handler): Make it resize the items correctly.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when</div><div class='del'>-	necessary.  This is needed becaues we now actually calculate a</div><div class='del'>-	minimum size for the month item based on the font sizes and paddings.</div><div class='del'>-	(check_heading_sizes): New function to calculate a minimum size</div><div class='del'>-	based on the headings' dimensions.</div><div class='del'>-	(check_day_sizes): New function to calculate a minimum size based</div><div class='del'>-	on the day number labels' dimensions.</div><div class='del'>-	(check_sizes): New function that computes a minimum size for the</div><div class='del'>-	month item.</div><div class='del'>-	(reshape): Now calls check_sizes() to ensure a minimum size for</div><div class='del'>-	the month item.</div><div class='del'>-</div><div class='del'>-	* year-view.c (mark_current_day): New function to mark the current</div><div class='del'>-	day in the year view.</div><div class='del'>-</div><div class='del'>-	* mark.c: Removed mark_current_day from here.</div><div class='del'>-</div><div class='del'>-1998-09-29  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec</div><div class='del'>-	and made it conform to the new prelighting mechanism.</div><div class='del'>-	(fake_mark_days): Set the proper day attributes.</div><div class='del'>-	(reconfigure_month): Use colorify_month_item().</div><div class='del'>-	(fake_mark_days): Use mark_month_item_index().</div><div class='del'>-</div><div class='del'>-	* mark.c (colorify_month_item): New public function to reset the</div><div class='del'>-	colors in a month item.</div><div class='del'>-	(get_attributes): New internal function that creates an array of</div><div class='del'>-	attributes for the days in a month item.  This is the basis of all</div><div class='del'>-	the new optimizations to month item marking.</div><div class='del'>-	(unmark_month_item): Now it uses the attributes array to unmark</div><div class='del'>-	only the days that need unmarking.</div><div class='del'>-	(mark_event_in_month): Update the day attributes array.</div><div class='del'>-	(month_item_prepare_prelight): Changed the definition of the</div><div class='del'>-	prelight color query function.  Use the new function.</div><div class='del'>-	(day_event): Do color changes based on the day attributes array.</div><div class='del'>-	(mark_month_item_index): New public function to mark a single day</div><div class='del'>-	by index.</div><div class='del'>-	(mark_event_in_month): Use mark_month_item_index().</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an</div><div class='del'>-	int, not a GnomeMonthItemChild.</div><div class='del'>-	(gnome_month_item_child2num): Now returns an int, not a</div><div class='del'>-	GnomeMonthItemChild.</div><div class='del'>-	(gnome_month_item_num2day): Now takes an int, not a</div><div class='del'>-	GnomeMonthItemChild.</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Create the days before the year spin</div><div class='del'>-	button, because the year_changed callback expects the month item</div><div class='del'>-	to be created.  The new semantics of the spin button cause it to</div><div class='del'>-	emit a value_changed signal on the adjustment upon creation -- is</div><div class='del'>-	this the behavior we want from it?</div><div class='del'>-	(goto_dialog): Use gtk_window_set_modal() instead of the</div><div class='del'>-	deprectaed gnome_dialog_set_modal().</div><div class='del'>-</div><div class='del'>-	* quick-view.c (quick_view_new): Make it look not as crappy by</div><div class='del'>-	putting the title inside the frame.</div><div class='del'>-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.</div><div class='del'>-	(create_items_for_event): Query the text width/height from the</div><div class='del'>-	text item using the new object arguments, so that the size of the</div><div class='del'>-	popup window can be set properly.</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_quick_view_popup): Calculate a nice date string</div><div class='del'>-	for the popup window.</div><div class='del'>-</div><div class='del'>-1998-09-28  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.[ch]: New file that presents a quick view of the</div><div class='del'>-	events in a particular day when the mouse is clicked on the year</div><div class='del'>-	view.  Work in progress.</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_quick_view_popup): New function that creates a</div><div class='del'>-	quick view for the events in a day.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the</div><div class='del'>-	list of sources.</div><div class='del'>-</div><div class='del'>-1998-09-27  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Hotkey for File/Exit should be C-q, not C-x.</div><div class='del'>-</div><div class='del'>-1998-09-24  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_popup_menu): New function to execute the popup</div><div class='del'>-	menu in the year view.</div><div class='del'>-	(day_event): Invoke the popup menu with the context set to days.</div><div class='del'>-	(new_appointment): New function to create a new appointment from</div><div class='del'>-	the year view.</div><div class='del'>-	(do_jump): New function to do the appropriate view/date jumping</div><div class='del'>-	from the popup menu.</div><div class='del'>-</div><div class='del'>-	* main.c: Fixed two icons in the File menu.</div><div class='del'>-</div><div class='del'>-1998-09-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Added underlined shortcuts and accelerators to the main menu.</div><div class='del'>-</div><div class='del'>-1998-09-16  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (&lt;gtk/gtklabel.h&gt;): Include.</div><div class='del'>-	* gncal-week-view.h (&lt;gtk/gtkvbox.h&gt;): Include.</div><div class='del'>-</div><div class='del'>-1998-09-06  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail</div><div class='del'>-	notification not beint sent until the program was terminated.</div><div class='del'>-</div><div class='del'>-1998-09-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach -&gt;</div><div class='del'>-	forall from Gtk changes, bleah.</div><div class='del'>-</div><div class='del'>-	* year-view.c (day_event): New function to handle events from</div><div class='del'>-	days.  Jumps to the day that is clicked.</div><div class='del'>-</div><div class='del'>-	* main.c: Use a watch cursor while the previous/today/next</div><div class='del'>-	functions are doing their job.</div><div class='del'>-</div><div class='del'>-	* mark.c (month_item_prepare_prelight): New public utility</div><div class='del'>-	function to prepare a month item for prelighting.  It will store</div><div class='del'>-	the proper prelight information and attach the appropriate signals.</div><div class='del'>-	(mark_current_day): Make the current day bold as well (useful for</div><div class='del'>-	color-blind people, I guess).</div><div class='del'>-</div><div class='del'>-	* prop.c (set_current_day): Reset the date in the sample calendar</div><div class='del'>-	and mark the current day.</div><div class='del'>-	(fake_mark_days): Mark fake events in the sample calendar.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_set): Use the general prelighting engine.</div><div class='del'>-</div><div class='del'>-	* goto.c (day_event): Just process button presses, as prelighting</div><div class='del'>-	is done behind the scenes now.</div><div class='del'>-	(update): Use the general prelighting engine.</div><div class='del'>-</div><div class='del'>-	* prop.c (create_colors_page): We can now configure the colors of</div><div class='del'>-	the monthly calendars!  Wheeeeee!  There are still some nits to be</div><div class='del'>-	fixed, which are listed in the TODO file.</div><div class='del'>-	(build_color_spec): New function to build color specifications.</div><div class='del'>-	(parse_color_spec): New function to parse color specifications.</div><div class='del'>-</div><div class='del'>-	* mark.c: Modified all functions to use the configured colors.</div><div class='del'>-	* goto.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* main.c (colors_changed): New function that notifies all</div><div class='del'>-	calendars that colors have changed.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_colors_changed): New function that</div><div class='del'>-	notifies all the views that the colors have changed.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_colors_changed): New function that</div><div class='del'>-	notifies the month view that colors have changed.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_colors_changed): New function that</div><div class='del'>-	notifies the year view that colors have changed.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for</div><div class='del'>-	outline and day box colors.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Added</div><div class='del'>-	outline_color, outline_color_gdk, day_box_color, and</div><div class='del'>-	day_box_color_gdk arguments to month items.  These are convenient</div><div class='del'>-	to quickly set the colors of the month item.</div><div class='del'>-	(gnome_month_item_get_arg): Likewise.</div><div class='del'>-</div><div class='del'>-	* main.[ch]: Added a global array of structures for color preferences.</div><div class='del'>-</div><div class='del'>-1998-08-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c: Small code cleanup.</div><div class='del'>-	(day_event): Upon receiving a LeaveNotify event, Reset the day's</div><div class='del'>-	background to the correct color.</div><div class='del'>-</div><div class='del'>-1998-08-29  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* mark.[ch]: New files with utility functions to mark calendars</div><div class='del'>-	with their events.</div><div class='del'>-</div><div class='del'>-	* mark.c (mark_month_item): New public function to mark a month</div><div class='del'>-	item with events.</div><div class='del'>-	(unmark_month_item): New public function to unmark all the days in</div><div class='del'>-	a month item to their default appearance.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_set): Use the new unmark_month_item() and</div><div class='del'>-	mark_month_item() to mark the months with events.</div><div class='del'>-</div><div class='del'>-	* goto.c (update): New function that updates the calendar in the</div><div class='del'>-	Go-to dialog by marking the days.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_year_begin): Modified to take a time_t value.</div><div class='del'>-	(time_year_end): Likewise.</div><div class='del'>-	(time_month_begin): Actually implemented this function, which was</div><div class='del'>-	in the header file but not here.</div><div class='del'>-	(time_days_in_month): New public function that returns the number</div><div class='del'>-	of days in a month.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-	* year-view.c (unmark_days): Use unmark_month_item().</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when</div><div class='del'>-	destroying the full day view.  The full day's destroy method is</div><div class='del'>-	unusual in that it destroys the list of child widgets itself, as</div><div class='del'>-	it does not have a remove method, so it needs to reset the list to</div><div class='del'>-	NULL.</div><div class='del'>-</div><div class='del'>-1998-08-27  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (build_month): Now does the correct thing</div><div class='del'>-	when the user wants weeks to start on Monday.  Now all the Monday</div><div class='del'>-	special casing, as far as day numbering is concerned, is only in</div><div class='del'>-	this function.</div><div class='del'>-</div><div class='del'>-	* year-view.c (mark_days): This function marks the days that have</div><div class='del'>-	events in them.  It also fixes a memory leak in the old</div><div class='del'>-	implementation (it was leaking the whole list).</div><div class='del'>-	(unmark_days): New function used to unmark all the days in the</div><div class='del'>-	year view.</div><div class='del'>-	(mark_event): New function that marks all the days that are</div><div class='del'>-	spanned by a time range.  It also fixes the bug in the old</div><div class='del'>-	implementation where it could possibly mark days past the ends of</div><div class='del'>-	the year (if the event crosses year boundaries, for example).</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_year_begin): Take the year parameter since year</div><div class='del'>-	1, not 1900.</div><div class='del'>-	(time_year_end): Likewise.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_size_allocate): Now changing the size of</div><div class='del'>-	the calendars is done in the idle loop.</div><div class='del'>-	(idle_handler): This function actually does the resizing of the items.</div><div class='del'>-</div><div class='del'>-	* year-view.h (struct _YearView): Added idle_id and need_resize</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-1998-08-26  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c: Beginning of the new year view.  Sizing and event</div><div class='del'>-	marking needs to be finished.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Updated for year-view.</div><div class='del'>-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().</div><div class='del'>-</div><div class='del'>-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to</div><div class='del'>-	year-view.[ch].</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the</div><div class='del'>-	list of source files.</div><div class='del'>-</div><div class='del'>-1998-08-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Set the heading color of the month item.</div><div class='del'>-</div><div class='del'>-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,</div><div class='del'>-	instead of goto.xpm.  Also, removed goto.xpm from cvs.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for</div><div class='del'>-	the heading and day number fonts.  Added fields for heading and</div><div class='del'>-	day number label colors.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES</div><div class='del'>-	should be write-only.  Also, added arguments for heading and day</div><div class='del'>-	number fonts.  Added arguments for heading and day number colors.</div><div class='del'>-</div><div class='del'>-1998-08-24  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio</div><div class='del'>-	buttons properly.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_time_format_changed): New public</div><div class='del'>-	function that notifies the month view of a time format change.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_time_format_changed): New public</div><div class='del'>-	function that notifies the calendar of a time format change.</div><div class='del'>-</div><div class='del'>-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_update): New public function to update</div><div class='del'>-	the month view when an event changes.  This is still unfinished.</div><div class='del'>-	(month_view_set): New public function to set the month in the</div><div class='del'>-	month view.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.</div><div class='del'>-	(gnome_calendar_set_view): Likewise.</div><div class='del'>-	(gnome_calendar_update_all): Likewise.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_week): Implemented the time_add_week()</div><div class='del'>-	function, which was on the header file.</div><div class='del'>-	(time_add_month): Added public month-adding routine.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for</div><div class='del'>-	month view.</div><div class='del'>-	(gnome_calendar_goto): Likewise, and set the time on the month view.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_new): Now it takes the calendar plus</div><div class='del'>-	the time_t representing the month.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h: Added documentation on the object arguments</div><div class='del'>-	for the month item.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Added a month/year heading to</div><div class='del'>-	the month view.</div><div class='del'>-</div><div class='del'>-	* TODO: Updated the TODO list a bit.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_cal_file_menu): The preferences menu option should</div><div class='del'>-	go in the File menu.</div><div class='del'>-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.</div><div class='del'>-	(gnome_cal_menu): Renamed the Calendar menu to Edit.</div><div class='del'>-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".</div><div class='del'>-</div><div class='del'>-	* prop.c (hour_activated): Notify the property box that it has changed.</div><div class='del'>-</div><div class='del'>-	* main.c: Changed the Properties menu item to Preferences.  These</div><div class='del'>-	are global application preferences, not a single calendar's</div><div class='del'>-	properties.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the</div><div class='del'>-	configuration file.</div><div class='del'>-	(properties): Added a check button for weeks starting on Monday.</div><div class='del'>-	(properties): Beautified the Preferences dialog.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init):</div><div class='del'>-	* goto.c (create_days): Set the month item to start weeks on</div><div class='del'>-	Monday if appropriate.</div><div class='del'>-</div><div class='del'>-	* main.c (init_calendar): A boolean is not an hour, so don't</div><div class='del'>-	range_check_hour() on it.</div><div class='del'>-	(init_calendar): Added a global week_starts_on_monday flag.</div><div class='del'>-</div><div class='del'>-	* main.h: Added global week_starts_on_monday flag.</div><div class='del'>-</div><div class='del'>-1998-08-21  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): If mail alarm or</div><div class='del'>-	program alarm are missing the action, then set an empty default.</div><div class='del'>-</div><div class='del'>-1998-08-18  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_day2index): New public</div><div class='del'>-	function to get the displayed day index of the specified date.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_goto_today): New public function to</div><div class='del'>-	jump to the current day.</div><div class='del'>-</div><div class='del'>-	* goto.c (day_event): Jump to the selected day when the user</div><div class='del'>-	clicks the mouse, and prelight days as appropriate.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_day): New public function to build a</div><div class='del'>-	time_t from a year/month/day triplet.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_num2child):</div><div class='del'>-	(gnome_month_item_child2num): New public functions to convert an</div><div class='del'>-	index into a child and vice-versa, respectively.</div><div class='del'>-	(gnome_month_item_num2day): New public function to convert a child</div><div class='del'>-	number into a displayed day number.</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (create_items): Use g_strdup()ed day names</div><div class='del'>-	from the start.</div><div class='del'>-</div><div class='del'>-1998-08-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_toolbar): Made it use goto.xpm.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.</div><div class='del'>-</div><div class='del'>-1998-08-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually</div><div class='del'>-	recalculate the days using the month and year.</div><div class='del'>-</div><div class='del'>-	* main.c: Added "Go to" button to quickly jump to a specific date.</div><div class='del'>-</div><div class='del'>-	* goto.c: New file that defines the quick go-to date dialog.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.</div><div class='del'>-</div><div class='del'>-1998-08-11  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (new_calendar): Made title i18n friendly. This was bug</div><div class='del'>-	#215.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_end_to_ical): Set recur-&gt;enddate to</div><div class='del'>-	recur-&gt;_enddate, not to itself, when adding recurring event and</div><div class='del'>-	supplying an end date. This fixes (at least part of) bug #99.</div><div class='del'>-</div><div class='del'>-1998-08-10  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.[ch]: Start of the month view widget.  This will use</div><div class='del'>-	the generic month item and extend it to have the semantics desired</div><div class='del'>-	for the gnomecal month view.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.[ch]: New generic canvas item for the month</div><div class='del'>-	view and the "small calendars".  This is intended to be a</div><div class='del'>-	high-level display engine for monthly calendars.  This is a work</div><div class='del'>-	in progress.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h (GnomeCalendar): Added a month_view field.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Create the month view and insert it</div><div class='del'>-	into the notebook.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to</div><div class='del'>-	the sources.</div><div class='del'>-</div><div class='del'>-1998-08-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (about_calendar_cmd): Use an array of const strings to</div><div class='del'>-	keep gcc happy.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.</div><div class='del'>-	* calendar.c (calendar_object_compare_by_start): Likewise.</div><div class='del'>-	* gncal-full-day.c (child_compare_by_start): Likewise.</div><div class='del'>-</div><div class='del'>-1998-07-07  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Add support for --view flag.</div><div class='del'>-	(session_save_state): Save the view mode;</div><div class='del'>-	(new_calendar): Now takes a view mode flag.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_get_current_view_name): New</div><div class='del'>-	function for enhancing the session management support for</div><div class='del'>-	gnomecal.</div><div class='del'>-	(gnome_calendar_set_view): New function that makes a given page</div><div class='del'>-	active.</div><div class='del'>-</div><div class='del'>-1998-07-01  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Portuguese translation.</div><div class='del'>-</div><div class='del'>-Mon Jun 22 13:01:16 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (session_save_state): Use gnome_geometry_string to get</div><div class='del'>-	the geometry string.</div><div class='del'>-</div><div class='del'>-1998-06-04  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from</div><div class='del'>-	tm-&gt;tm_mday for the default_day.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_new):</div><div class='del'>-	(gnome_calendar_goto): Use the start of the day -- things expect</div><div class='del'>-	it to be that way.</div><div class='del'>-</div><div class='del'>-1998-05-27  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in</div><div class='del'>-	ical-&gt;recur-&gt;interval from value in spin_button. This ixed an</div><div class='del'>-	infinnite loop.</div><div class='del'>-</div><div class='del'>-1998-05-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_draw): Paint the decorations correctly.</div><div class='del'>-	(child_draw_decor): Paint the recurrence/bell icons correctly.</div><div class='del'>-</div><div class='del'>-1998-05-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): Use the contents of</div><div class='del'>-	ee-&gt;ical-&gt;dtstart for computing the predefined values of the recurrence.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc</div><div class='del'>-	destruction in the unrealization code and fix the pixmap unrefing.</div><div class='del'>-</div><div class='del'>-	* main.c (close_cmd): Remove a bad hack that disabled calendar</div><div class='del'>-	widget destruction.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Fix for the weekly event</div><div class='del'>-	generation.  Was reported on the bug tracking system.</div><div class='del'>-</div><div class='del'>-1998-05-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_children): Implemented ultra-cool</div><div class='del'>-	layout for the events that share the same time range.  Gals and</div><div class='del'>-	guys you can now drop Outlook on the recycle bin.</div><div class='del'>-</div><div class='del'>-	Which reminds me.  We do not have a recycle bin.  How could that</div><div class='del'>-	happen in a project as cool as this one?  Someone explain this to</div><div class='del'>-	me.</div><div class='del'>-</div><div class='del'>-1998-05-18  Federico Mena  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.</div><div class='del'>-</div><div class='del'>-Sun May 17 17:55:03 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.</div><div class='del'>-</div><div class='del'>-1998-05-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the</div><div class='del'>-	range computation in place.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (year_view_mark_day): Use the same new version</div><div class='del'>-	of the range computation here.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Fix the begin/end</div><div class='del'>-	condition.</div><div class='del'>-</div><div class='del'>-1998-05-14  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): Do not add the spurious</div><div class='del'>-	padding.</div><div class='del'>-</div><div class='del'>-	* calobj.c (store_date_list): Bug fix:  I was using the wrong</div><div class='del'>-	pointer when saving the exception date list.</div><div class='del'>-	(set_date_list): Bug fix:  load correctly the complete exception</div><div class='del'>-	date list.</div><div class='del'>-	(set_date_list): Use ',' for the exception date separator as the</div><div class='del'>-	versit people can not get their standard right.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (unrecur_appointment): Support for making an</div><div class='del'>-	existing recurrent event `movable' for a day.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_add_exdate): New routine, used to add</div><div class='del'>-	exception dates.</div><div class='del'>-	(ical_object_duplicate): New routine:  used to do the magic</div><div class='del'>-	recur-&gt;no-recur event.</div><div class='del'>-</div><div class='del'>-1998-05-08  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to</div><div class='del'>-	avoid the ugly warning.</div><div class='del'>-</div><div class='del'>-	* main.c (display_objedit): Default to the day the user is looking</div><div class='del'>-	at.</div><div class='del'>-</div><div class='del'>-1998-05-05  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value</div><div class='del'>-	changed signal if the value is the same.</div><div class='del'>-</div><div class='del'>-1998-05-04  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Only run the apply code once.</div><div class='del'>-</div><div class='del'>-1998-05-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (update): Draw the day at startup.</div><div class='del'>-	(gncal_day_panel_set): Fix selected-day display.</div><div class='del'>-	(gncal_day_panel_new): Switch day on double clicks, not on single</div><div class='del'>-	clicks.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_compute_end): Removed debug messages.</div><div class='del'>-</div><div class='del'>-1998-04-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using</div><div class='del'>-	GnomePropertyDialog.</div><div class='del'>-</div><div class='del'>-1998-04-29  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to</div><div class='del'>-	fill a gtk_calendar with the events on a GnomeCalendar object.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day</div><div class='del'>-	we double clicked.</div><div class='del'>-</div><div class='del'>-1998-04-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Apply black magic to get mail</div><div class='del'>-	notifications to work.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_focus_out): Temporary optimization, the</div><div class='del'>-	child_focus_out is constantly calling the</div><div class='del'>-	gnome_calendar_object_changed when the property editor has been</div><div class='del'>-	invoked.  This happens every time the mouse moves crosses the main</div><div class='del'>-	window.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Reschedule alarms when a</div><div class='del'>-	calendar object has changed its times.</div><div class='del'>-</div><div class='del'>-Sat Apr 25 22:20:45 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox</div><div class='del'>-	out of class structure; use GnomeDialog vbox</div><div class='del'>-	instead. gnome_dialog_set_destroy instead of destroying in button</div><div class='del'>-	callbacks. Don't create buttons, separator, or vbox manually.</div><div class='del'>-	#include &lt;libgnomeui/gnome-dialog.h&gt;.</div><div class='del'>-</div><div class='del'>-1998-04-24  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;</div><div class='del'>-	Load snooze time and snooze count</div><div class='del'>-</div><div class='del'>-1998-04-23  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_save): Actually save the to-do entries.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Now you can add and edit</div><div class='del'>-	to-do entries.</div><div class='del'>-</div><div class='del'>-1998-04-22  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: Made it use popup_menu().</div><div class='del'>-</div><div class='del'>-	* popup-menu.c: New file with utility functions for creating popup</div><div class='del'>-	menus.  Maybe such a thing would be useful in libgnomeui, a la</div><div class='del'>-	gnome-app-helper?</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-1998-04-22  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (properties): Added Calendar properties editor.</div><div class='del'>-	(properties): Make the code use a propery box.</div><div class='del'>-</div><div class='del'>-	* main.c: Save/load properties (fix to old commit).</div><div class='del'>-</div><div class='del'>-1998-04-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c: New widget for editing TODO lists.  This will be</div><div class='del'>-	worked on a lot.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c: Make it use the new TODO widget.</div><div class='del'>-</div><div class='del'>-1998-04-21  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): Do not save with the global</div><div class='del'>-	time flag (Z at the end of the isodate).  When we figure out a way</div><div class='del'>-	to load times in GMT time, we will add this back</div><div class='del'>-</div><div class='del'>-	* view-utils.c (popup_menu): Moved this routine here as there are</div><div class='del'>-	more users of this code.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_class_init): Add button press</div><div class='del'>-	handler.</div><div class='del'>-	(new_appointment): New routine for creating appointments on a day.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* main.c (save_ok): Added call to gtk_window_set_wmclass.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime</div><div class='del'>-	should substract 1900 and gtk_calendar stores years relative to</div><div class='del'>-	year 0.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Make the week view</div><div class='del'>-	descend from VBox so that we can add a label to it.</div><div class='del'>-	(gncal_week_view_set): Display the ending day of the week</div><div class='del'>-	correctly.</div><div class='del'>-</div><div class='del'>-	Added a label that displays the week range.</div><div class='del'>-</div><div class='del'>-1998-04-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Made it use GncalDayPanel.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c: New widget for the day view in the main</div><div class='del'>-	calendar toplevel.  It basically takes care of everything</div><div class='del'>-	gnome-cal did by hand with respect to the day view.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to</div><div class='del'>-	the rules.</div><div class='del'>-</div><div class='del'>-	* main.c: Added a separator between the About menu item and the</div><div class='del'>-	help topics.</div><div class='del'>-</div><div class='del'>-1998-04-20  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.</div><div class='del'>-</div><div class='del'>-1998-04-20  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New</div><div class='del'>-	public function that returns the y offset for the row</div><div class='del'>-	corresponding to the "day begin" time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable</div><div class='del'>-	keystroke (not just Return) will activate the selected range.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Made it use the new paint_row</div><div class='del'>-	function instead of painting everything directly.  We calculate</div><div class='del'>-	areas in a smarter way so there is even less flicker than before,</div><div class='del'>-	especially when selecting regions.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Sensitize recurrence widgets properly.</div><div class='del'>-</div><div class='del'>-	* calobj.c (duration_callback): Pass the correct pointer type to</div><div class='del'>-	is_date_in_list().</div><div class='del'>-</div><div class='del'>-1998-04-20  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (duration_callback): Take exception dates into</div><div class='del'>-	account.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (new_appointment): Setup the event editor dates</div><div class='del'>-	to those of the currently displayed day.</div><div class='del'>-	(gncal_full_day_selection_range): Use sensible values in the case</div><div class='del'>-	no range is selected.</div><div class='del'>-	(new_appointment): Events now use the current day for event creation.</div><div class='del'>-</div><div class='del'>-	* view-utils.c: Pretty up the time display.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_compute_end): Initialize</div><div class='del'>-	ico-&gt;recur-&gt;enddate, otherwise we loop forever during final date computation.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Now recurrence is toggled by a radio button in the</div><div class='del'>-	recurrence page, as the checkbox is confusing.</div><div class='del'>-</div><div class='del'>-	* calobj.c (is_date_in_list): Add support for the exclussion</div><div class='del'>-	dates.</div><div class='del'>-</div><div class='del'>-1998-04-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (double_click): Fix this routine as well.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to</div><div class='del'>-	the week.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the</div><div class='del'>-	proper range.  Now the year view actually matches this year.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.html: Added small documentation.</div><div class='del'>-</div><div class='del'>-	* main.c: Add more icons to the menus;  Rename some menubar</div><div class='del'>-	entries;  Add `new' icon to the toolbar.</div><div class='del'>-	(dump_events): Added argument handling and dumping of events from</div><div class='del'>-	the command line.  Extremely cool.</div><div class='del'>-</div><div class='del'>-	* getdate.y: Taken from the CVS source code.  Used for date</div><div class='del'>-	parsing in the command line.</div><div class='del'>-</div><div class='del'>-	Internationalized getdate.y.  Wee!  It even works with spanish.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Add Quoted printable property</div><div class='del'>-	to items containing new lines.</div><div class='del'>-	(duration): Use unsigned integers, to work around buggy calendar</div><div class='del'>-	files generated by korganizer.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Do not ask for file name if we are</div><div class='del'>-	saving.</div><div class='del'>-	(save_as_calendar_cmd): New command.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm</div><div class='del'>-	management framework.</div><div class='del'>-</div><div class='del'>-1998-04-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_new): Added mandatory status property.</div><div class='del'>-	(ical_object_to_vobject): Only store "related" list if it exists.</div><div class='del'>-	(store_list): Add terminating null char and free the correct data.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Implemented calendar saving.</div><div class='del'>-	(open_calendar_cmd): Implemented calendar loading.</div><div class='del'>-	(new_calendar_cmd): Implemented calendar creation.</div><div class='del'>-	(new_calendar): Don't load our test calendar by default.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_values_to_ical): Free/create</div><div class='del'>-	ical's recurrence appropriately.</div><div class='del'>-	(ee_rp_init_rule): Initialize all missing parameters from ical.</div><div class='del'>-	(ee_rp_init_ending_date): Initialize missing fields from ical.</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_remove_object): Add support for</div><div class='del'>-	removing objects.</div><div class='del'>-</div><div class='del'>-1998-04-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_init_recurrence_page): New function that creates</div><div class='del'>-	the recurrence page in the toplevel notebook.</div><div class='del'>-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Implement</div><div class='del'>-	RECUR_MONTHLY_BY_POS implemented.</div><div class='del'>-	(ical_object_create_from_vobject): Fix the alarm</div><div class='del'>-	initialization code.</div><div class='del'>-	(save_alarm): Save alarms.</div><div class='del'>-	(ical_object_generate_events): Fixed the recurrent code to take</div><div class='del'>-	into account the recur-&gt;endate field (if at all specified).</div><div class='del'>-</div><div class='del'>-	(ical_object_to_vobject): Implement recurrence rule saving.</div><div class='del'>-</div><div class='del'>-1998-04-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_alarm): Use menu_shell-&gt;children, not</div><div class='del'>-	menu-&gt;children.  Why does GtkMenu have a children field in the</div><div class='del'>-	object structure?</div><div class='del'>-	(check_dates): New function that insures that start_date &lt; end_date.</div><div class='del'>-	(check_times): In addition to checking whether the event spans the</div><div class='del'>-	whole day, now it insures that start_time &lt; end_time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_set_size): Now children get bigger</div><div class='del'>-	temporarily while they are focused.  This allows the handles not</div><div class='del'>-	to "overlap" the rows used by the child and thus allow editing of</div><div class='del'>-	very thin events.</div><div class='del'>-	(recompute_motion): Fix for new child coordinates.</div><div class='del'>-	(gncal_full_day_expose): Make it use find_child_by_window()</div><div class='del'>-	instead of looking for it by hand.</div><div class='del'>-</div><div class='del'>-	* bell.xpm recur.xpm: XPM files for events with alarm and</div><div class='del'>-	recurrence, respectively.</div><div class='del'>-</div><div class='del'>-1998-04-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_draw): Now children have a vertical</div><div class='del'>-	handle as well.  This can be used to move the child anytime, not</div><div class='del'>-	only when it is focused.</div><div class='del'>-	(recompute_motion): Modified for new drag behavior.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_init_general_page): The general_owner may be</div><div class='del'>-	null.  Do the proper thing when creating the label.</div><div class='del'>-	(ee_ok): Update the gnome calendar appropriately.</div><div class='del'>-</div><div class='del'>-	* timeutil.h:</div><div class='del'>-	* gncal-year-view.h: Add some missing prototypes.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu</div><div class='del'>-	items according to whether the ical object is being edited or not.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_new): Set the "being edited" flag on</div><div class='del'>-	the ical object (stored as the ical object's user data).</div><div class='del'>-	(event_editor_destroy): Release the flag.</div><div class='del'>-</div><div class='del'>-	* calobj.h: The iCalObject structure now has a generic user_data pointer.</div><div class='del'>-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):</div><div class='del'>-	Functions to set this data.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.</div><div class='del'>-</div><div class='del'>-	* main.c (about_calendar_cmd): Fixed my address and added Arturo</div><div class='del'>-	to the authors in the about box.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (find_child_by_window): Compare child's widget</div><div class='del'>-	windows by user_data (which will be the parent widget, that is,</div><div class='del'>-	the text widget).  We cannot assume that child-&gt;widget-&gt;window</div><div class='del'>-	will be *the* window we are interested on because there may be</div><div class='del'>-	child widgets with multiple windows.</div><div class='del'>-</div><div class='del'>-1998-04-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_foreach): Define iterator routine.</div><div class='del'>-</div><div class='del'>-1998-04-15  Arturo Espinosa Aldama  &lt;arturo@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.[hc]: Now using time_t for new and set.</div><div class='del'>-	  Random fixes, as well.</div><div class='del'>-</div><div class='del'>-1998-04-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (button_3): New popup menus activated with</div><div class='del'>-	mouse button 3.</div><div class='del'>-	(create_appointment): Create a new appointment from the popup</div><div class='del'>-	menus.  See the FIXME.</div><div class='del'>-</div><div class='del'>-1998-04-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows</div><div class='del'>-	array properly.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_new): Add missing year in</div><div class='del'>-	call to strftime.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks</div><div class='del'>-	from the return values of versit's fakeCString.</div><div class='del'>-</div><div class='del'>-1998-04-14  Arturo Espinosa Aldama  &lt;arturo@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.[hc]: New widget for the year view.</div><div class='del'>-	* Makefile.am: added required compilation of the new files.</div><div class='del'>-</div><div class='del'>-1998-04-14  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_setup_time_frame): Fixed some table</div><div class='del'>-	expansions to make the dialog look nicer when resized.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ignore_space): Fixed compiler warning about unused</div><div class='del'>-	computed value.</div><div class='del'>-	(ocurrencelist): Replace str by p confusion.  Removed unused</div><div class='del'>-	variables value and q.</div><div class='del'>-	(daynumber): Fixed a couple of warnings about unused values.</div><div class='del'>-	(load_recurrence): Removed unused variable c.  Added a default</div><div class='del'>-	clause to the switch(type).</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.</div><div class='del'>-	Fixed a compiler warning by adding a missing cast.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Make the</div><div class='del'>-	load_recurrence() part work correctly.  Eliminated use of</div><div class='del'>-	syntax_error variable.</div><div class='del'>-</div><div class='del'>-1998-04-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_key_press): Unfocus the child and focus</div><div class='del'>-	the parent fullday widget when the user presses Esc.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_update): Now takes object and</div><div class='del'>-	flags parameters.</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Likewise.</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_update): Likewise.</div><div class='del'>-	(child_focus_in): New function.  In conjunction with</div><div class='del'>-	child_focus_out(), these only display the handles in the child</div><div class='del'>-	when it is focused.  The result is that the user can see more of</div><div class='del'>-	the child's text when nothing is focused, and we can also display</div><div class='del'>-	fatter and nicer drag handles.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an</div><div class='del'>-	additional flags parameter</div><div class='del'>-	(gnome_calendar_update_all): Made function static.  Now takes</div><div class='del'>-	changed object and flags parameters as well.</div><div class='del'>-	(gnome_calendar_object_changed): Now takes additional flags</div><div class='del'>-	parameter to indicate what changed in the specified object.</div><div class='del'>-</div><div class='del'>-	* calobj.h (CalObjectChange): New enum with flags to describe what</div><div class='del'>-	has been changed in an object.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.h:</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_focus_child): New function to</div><div class='del'>-	let the outside world decide which child to focus.</div><div class='del'>-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a</div><div class='del'>-	click because GtkText will not set the cursor when you focus it.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (day_view_range_activated): Focus the new child in</div><div class='del'>-	the full day widget.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some</div><div class='del'>-	widgets to make it look prettier.</div><div class='del'>-	(ee_alarm_widgets): Likewise.</div><div class='del'>-	(ee_init_general_page): Likewise.</div><div class='del'>-	(ee_classification_widgets): Likewise.</div><div class='del'>-	(event_editor_init_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (day_view_range_activated): Create new object and</div><div class='del'>-	add it to the calendar.  You can now select a range in the</div><div class='del'>-	full-day view, hit Return, and a new event will be added at the</div><div class='del'>-	selected range.  I still have to figure out how to focus this new child.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Rewrote function to avoid</div><div class='del'>-	painting an area more than once -- eliminate flicker.</div><div class='del'>-	(paint_back_rows): New function that calls paint_back() only for</div><div class='del'>-	the area of the specified rows.</div><div class='del'>-	(gncal_full_day_button_press):</div><div class='del'>-	(gncal_full_day_button_release):</div><div class='del'>-	(gncal_full_day_motion): Made these functions use</div><div class='del'>-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!</div><div class='del'>-</div><div class='del'>-1998-04-12  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_day_view): We now connect to the</div><div class='del'>-	range_activated signal of the fullday widget instead of catching</div><div class='del'>-	key presses ourselves.</div><div class='del'>-	(day_view_range_activated): New function that creates a new</div><div class='del'>-	iCalObject and inserts it into the calendar, not finished yet.</div><div class='del'>-</div><div class='del'>-1998-04-11  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (get_time_from_rows): New function, calculates</div><div class='del'>-	a pair of time_t values from the specified start and number of rows.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.h (GncalFullDayClass): New signal</div><div class='del'>-	"range_activated".  It is emitted when a range is selected and the</div><div class='del'>-	user hits Return.</div><div class='del'>-	(gncal_full_day_selection_range): New function, returns the</div><div class='del'>-	selected range.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (struct drag_info): Moved selection information</div><div class='del'>-	to their own fields instead of sharing the child's drag fields.</div><div class='del'>-	This allows us to keep the selection when a child is moved.</div><div class='del'>-	(recompute_motion): Made the case when (row &lt; di-&gt;sel_click_row)</div><div class='del'>-	work correctly.</div><div class='del'>-</div><div class='del'>-1998-04-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating</div><div class='del'>-	on the day view.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):</div><div class='del'>-	New time manipulation functions.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_frequency): Add the different frequency</div><div class='del'>-	editors to a notebook.  Make the notebook startup on the entry</div><div class='del'>-	selected recurrence type;</div><div class='del'>-</div><div class='del'>-1998-04-11  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (recompute_motion): Now we support selecting a</div><div class='del'>-	range in the main window (by clicking+dragging).  It flickers</div><div class='del'>-	horribly and is not perfect, but it is a start.</div><div class='del'>-</div><div class='del'>-1998-04-09  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: #include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_map): Show instead of just map the child</div><div class='del'>-	widget (otherwise the text widget gets confused and will not focus).</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".</div><div class='del'>-</div><div class='del'>-	* calobj.h: Added prototype for ical_object_to_vobject().</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This</div><div class='del'>-	should be called when a calendar object is changed.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (update_from_drag_info): Call</div><div class='del'>-	gnome_calendar_object_changed() instead of updating manually.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_add_object):</div><div class='del'>-	(calendar_remove_object): Set the modified flag to true.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing</div><div class='del'>-	this function.</div><div class='del'>-</div><div class='del'>-1998-04-08  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.</div><div class='del'>-</div><div class='del'>-1998-04-07  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Removed unused global variable parent_class.</div><div class='del'>-</div><div class='del'>-	* eventedit.h: Renamed gtk_window field to window.</div><div class='del'>-	Made the parent_class field in the EventEditorClass structure be a</div><div class='del'>-	GtkWindowClass, not a gnome property box class.</div><div class='del'>-	Added prototype for event_editor_get_type().</div><div class='del'>-</div><div class='del'>-1998-04-06  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Use the new</div><div class='del'>-	gtk_table_set_homogeneous() instead of setting the variable directly.</div><div class='del'>-</div><div class='del'>-1998-04-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_ae): Make it return void.</div><div class='del'>-	(ee_alarm_widgets): Remove some unused variables.</div><div class='del'>-	(ee_store_alarm): Make it return void.</div><div class='del'>-	#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.h: #include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Add prototype for calendar_load().</div><div class='del'>-</div><div class='del'>-	* timeutil.h: Add prototypes for time_add_*().</div><div class='del'>-</div><div class='del'>-	* calendar.c:</div><div class='del'>-	* calobj.c:</div><div class='del'>-	* eventedit.c:</div><div class='del'>-	* gnome-cal.c: #include "timeutil.h"</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum</div><div class='del'>-	width equal or larger to the title width.</div><div class='del'>-</div><div class='del'>-	* main.c: #include "eventedit.h"</div><div class='del'>-	(main): Add a return statement.</div><div class='del'>-	(new_calendar): Show stuff *after* the calendar has been loaded.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_load): Update the day view.</div><div class='del'>-	(setup_widgets): Hackish setup of a day view widget - will fix later.</div><div class='del'>-	(gnome_calendar_init): Initialize all fields.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h: Added day_view field.  Maybe this should be changed</div><div class='del'>-	when the a complete day view panel is complete.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not</div><div class='del'>-	before.</div><div class='del'>-</div><div class='del'>-1998-04-06  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* versit/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-Fri Apr  3 22:31:54 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c: Include &lt;config.h&gt;.</div><div class='del'>-</div><div class='del'>-1998-04-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_year, time_add_year, time_add_week):</div><div class='del'>-	Routines for time manipulation.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_destroy): Full destruction of the object.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Finished the main event editor form;  It still</div><div class='del'>-	lacks the details and the recurrence bits.  It now adds events</div><div class='del'>-	and cancels.</div><div class='del'>-</div><div class='del'>-1998-04-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): The "better" format</div><div class='del'>-	string for strftime() wasn't better, after all :-(</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: New full-day widget.  It is still a work in</div><div class='del'>-	progress.  It will be similar to M$ Schedule's nifty full day view</div><div class='del'>-	widget, but with Gtk's elegance :-)</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Object editor widget.  We dropped ObjEdit.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Fix.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Changed the display</div><div class='del'>-	formats.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Use better format</div><div class='del'>-	specifier for strftime().</div><div class='del'>-	(view_utils_draw_textured_frame): Ultra-nifty function to draw</div><div class='del'>-	textured "metal" frames, like Netscape's handles.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Day events are now</div><div class='del'>-	cached inside the widget.  They get initialized at this time.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Use the list of events.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization</div><div class='del'>-	function.  We can't decide on a stupid border type :-)</div><div class='del'>-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default</div><div class='del'>-	shadow type.  Looks good.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: New main program that uses our new datatypes and</div><div class='del'>-	objects.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_load_from_vobject, calendar_load):</div><div class='del'>-	Implement loading of vCalendar objects and vCalendar files.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Implement loading of</div><div class='del'>-	vCalendar event and todo objects.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): New function.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived</div><div class='del'>-	from GnomeApp.  It holds all of the day views and arbitrates the</div><div class='del'>-	display.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.[ch]: New week view composite widget.  This</div><div class='del'>-	provides a full week view (7 day views plus busy time display --</div><div class='del'>-	the latter is currently unimplemented).</div><div class='del'>-</div><div class='del'>-1998-04-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c: New day view widget.  It is intended to be a</div><div class='del'>-	child widget of the week view composite widget.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_get_objects_in_range):</div><div class='del'>-	(calendar_get_events_in_range):</div><div class='del'>-	(calendar_get_journal_in_range):</div><div class='del'>-	(calendar_get_journal_in_range): These functions now take a</div><div class='del'>-	sort_func parameter, which is of type GCompareFunc.  If the</div><div class='del'>-	specified value is non-NULL, it will return a sorted list.</div><div class='del'>-	Otherwise, it will return an unordered list.</div><div class='del'>-	(calendar_compare_by_dtstart): Provide a generic sorting routine</div><div class='del'>-	for calendar objects.</div><div class='del'>-</div><div class='del'>-1998-04-01 Miguel de Icaza &lt;miguel@kernel.org&gt;</div><div class='del'>-</div><div class='del'>-	* Start from scratch</div><div class='del'>-</div><div class='del'>-Tue Mar 31 23:46:50 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (format_simple_hour): `buf' now static.</div><div class='del'>-</div><div class='del'>-1998-03-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes</div><div class='del'>-	from libgnomeui.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (format_simple_hour): New function, formats an</div><div class='del'>-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",</div><div class='del'>-	"19h", etc.  It is used by the day view widget for its labels.</div><div class='del'>-</div><div class='del'>-1998-03-31 Craig Small &lt;csmall@small.dropbear.id.au&gt;</div><div class='del'>-</div><div class='del'>-	* Now has (non working) session maangement</div><div class='del'>-	* Uses a clist for the dailylist like gtt</div><div class='del'>-</div><div class='del'>-Sat Mar 21 15:43:20 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.</div><div class='del'>-</div><div class='del'>-1998-03-12  Craig Small &lt;csmall@small.dropbear.id.au&gt;</div><div class='del'>-</div><div class='del'>-	* Now linked (in some horrible way) to the gtkcalendar widget.</div><div class='del'>-</div><div class='del'>-Sun Mar  8 16:38:10 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.</div><div class='del'>-	(gncal_LDADD): Don't include libsupport.a.</div><div class='del'>-</div><div class='del'>-	* gncal.c (main): Use new gnome_init.</div><div class='del'>-</div><div class='del'>-1998-02-19  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c (main): Added app_id "gncal".</div><div class='del'>-</div><div class='del'>-1998-02-19  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'</div><div class='del'>-</div><div class='del'>-1998-02-18  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.</div><div class='del'>-</div><div class='del'>-	* calcs.c (month_atoi): Replace buggy explicit loop string compare</div><div class='del'>-	with strcasecmp.</div><div class='del'>-	(day_atoi): Likewise.</div><div class='del'>-</div><div class='del'>-Sun Jan 25 23:38:30 1998  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* menus.c: Replace "Quit" with "Exit".</div><div class='head'>diff --git a/calendar/Makefile.am b/calendar/Makefile.am<br/>deleted file mode 100644<br/>index 89cea775bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-if ENABLE_PILOT_CONDUITS</div><div class='del'>-CONDUIT_DIR = conduits</div><div class='del'>-else</div><div class='del'>-CONDUIT_DIR =</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-SUBDIRS = idl cal-util pcs cal-client gui importers $(CONDUIT_DIR)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = zones.h</div><div class='head'>diff --git a/calendar/TODO b/calendar/TODO<br/>deleted file mode 100644<br/>index 4a5dd6c6ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/TODO?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-Cal-util:</div><div class='del'>-</div><div class='del'>-- calobj.h depends on libversit/vcc.h, because it uses a VObject for</div><div class='del'>-  ical_object_create_from_vobject().  This should be an internal</div><div class='del'>-  function in the PCS and nothing else (we do not install libversit,</div><div class='del'>-  so our public libraries should not depend on it).</div><div class='del'>-</div><div class='del'>-- Or maybe we *should* install libversit, since the addressbook code</div><div class='del'>-  uses it as well.</div><div class='del'>-</div><div class='del'>-- timeutil has a lot of crap and some namespace pollution.  Clean it</div><div class='del'>-  up.</div><div class='del'>-</div><div class='del'>-PCS:</div><div class='del'>-</div><div class='del'>-- When loading a calendar, substitute duplicated UIDs by new ones, and</div><div class='del'>-  possibly print out a warning message.</div><div class='del'>-</div><div class='del'>------ Old Gnomecal TODO starts here -----</div><div class='del'>-</div><div class='del'>-Pilot:</div><div class='del'>-</div><div class='del'>-* Better support for untimed events (we have none now).</div><div class='del'>-</div><div class='del'>-* Hash objects based on their UIDs.</div><div class='del'>-</div><div class='del'>-* Add placeholders for deleted events, so that we can kill those</div><div class='del'>-  when syncing to the pilot.</div><div class='del'>-</div><div class='del'>-BUGS:</div><div class='del'>-</div><div class='del'>-- Recurrence end date is wrong.  An event that repeats daily will not</div><div class='del'>-  be included in the ending date of the recurrence (off-by-one</div><div class='del'>-  error?).</div><div class='del'>-</div><div class='del'>-- X-fields (extensions) are stripped from a vCal file when it is</div><div class='del'>-  saved.  They should be preserved.</div><div class='del'>-</div><div class='del'>-Features:</div><div class='del'>-</div><div class='del'>-- Add a calendar-week so that people know which week of the year it is</div><div class='del'>-</div><div class='del'>-Year view:</div><div class='del'>-</div><div class='del'>-- See why it is so fucking slow when opening its notebook page for the</div><div class='del'>-  first time.</div><div class='del'>-</div><div class='del'>-Month view:</div><div class='del'>-</div><div class='del'>-- Popup menu like in the year view.</div><div class='del'>-</div><div class='del'>-- Double click on a day takes you to the day view.</div><div class='del'>-</div><div class='del'>-- DnD of appointments to move them around.</div><div class='del'>-</div><div class='del'>-Week view:</div><div class='del'>-</div><div class='del'>-- Nice display as in the Palm Pilot.</div><div class='del'>-</div><div class='del'>-Day view:</div><div class='del'>-</div><div class='del'>-- Rewrite in terms of the canvas and make it pretty.</div><div class='del'>-</div><div class='del'>-Preferences:</div><div class='del'>-</div><div class='del'>-- BUG: 12/24 hours stuff is not consistent - I remember that on editing</div><div class='del'>-  new appointment you get the time-selectors always on 12-hr format</div><div class='del'>-</div><div class='del'>-Event editor dialog:</div><div class='del'>-</div><div class='del'>-- Make it figure out whether the alarm is in</div><div class='del'>-  minutes/hours/days/etc. (via a cascade of conditions) and set the</div><div class='del'>-  widgets appropriately.</div><div class='del'>-</div><div class='del'>-Gnome date selection widget:</div><div class='del'>-</div><div class='del'>-- Make the displayed date be localized properly -- use strftime().</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-- Write online help.  Nice help.  Lots of help.</div><div class='del'>-</div><div class='del'>-- If you leave the calendar running overnight, the "current day"</div><div class='del'>-  marker in the GnomeMonthItems does not get updated.</div><div class='del'>-</div><div class='del'>-- Add categories support.  Color-coded categories.</div><div class='del'>-</div><div class='del'>-- Untimed events</div><div class='head'>diff --git a/calendar/cal-client/.cvsignore b/calendar/cal-client/.cvsignore<br/>deleted file mode 100644<br/>index 1537e6e01d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-evolution-calendar-stubs.c</div><div class='del'>-evolution-calendar-skels.c</div><div class='del'>-evolution-calendar-common.c</div><div class='del'>-evolution-calendar.h</div><div class='del'>-evolution-calendar-common.lo</div><div class='del'>-evolution-calendar-skels.lo</div><div class='del'>-evolution-calendar-stubs.lo</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-client-test</div><div class='head'>diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am<br/>deleted file mode 100644<br/>index de4b85e51f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-#</div><div class='del'>-# libcal-client</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-CORBA_GENERATED =				\</div><div class='del'>-	evolution-calendar-common.c		\</div><div class='del'>-	evolution-calendar-skels.c		\</div><div class='del'>-	evolution-calendar-stubs.c</div><div class='del'>-</div><div class='del'>-CORBA_HEADERS_GENERATED =			\</div><div class='del'>-	evolution-calendar.h</div><div class='del'>-</div><div class='del'>-idls =						\</div><div class='del'>-	$(srcdir)/../idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl</div><div class='del'>-</div><div class='del'>-$(CORBA_GENERATED): $(idls)</div><div class='del'>-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"cal-client\"			\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(srcdir) -I$(top_srcdir) 			\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libwombat			\</div><div class='del'>-	-I$(top_srcdir)/libwombat			\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcal-client.la</div><div class='del'>-</div><div class='del'>-libcal_clientincludedir = $(includedir)/evolution/cal-client</div><div class='del'>-</div><div class='del'>-libcal_client_la_SOURCES =	\</div><div class='del'>-	$(CORBA_GENERATED)	\</div><div class='del'>-	cal-client-multi.c	\</div><div class='del'>-	cal-client-types.c	\</div><div class='del'>-	cal-client.c		\</div><div class='del'>-	cal-listener.c		\</div><div class='del'>-	cal-listener.h		\</div><div class='del'>-	cal-query.c		\</div><div class='del'>-	query-listener.c	\</div><div class='del'>-	query-listener.h</div><div class='del'>-</div><div class='del'>-libcal_clientinclude_HEADERS =		\</div><div class='del'>-	$(CORBA_HEADERS_GENERATED)	\</div><div class='del'>-	cal-client-multi.h		\</div><div class='del'>-	cal-client-types.h 		\</div><div class='del'>-	cal-client.h			\</div><div class='del'>-	cal-query.h</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# make a static library for use by calendar conduit's shared library</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libcal-client-static.la</div><div class='del'>-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)</div><div class='del'>-libcal_client_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# client-test program</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS = client-test</div><div class='del'>-</div><div class='del'>-client_test_SOURCES =	\</div><div class='del'>-	client-test.c</div><div class='del'>-</div><div class='del'>-client_test_INCLUDES =			\</div><div class='del'>-	$(INCLUDES)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"client-test\"</div><div class='del'>-</div><div class='del'>-client_test_LDADD =							\</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)					\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a				\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-evolution.la	\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat.la				\</div><div class='del'>-	libcal-client.la</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/calendar/cal-client/cal-client-multi.c b/calendar/cal-client/cal-client-multi.c<br/>deleted file mode 100644<br/>index aeebc72fda..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client-multi.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client-multi.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,706 +0,0 @@</div><div class='del'>-/* Evolution calendar client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "cal-client-multi.h"</div><div class='del'>-</div><div class='del'>-/* Private part of the CalClientMulti structure */</div><div class='del'>-struct _CalClientMultiPrivate {</div><div class='del'>-	GHashTable *calendars;</div><div class='del'>-	GList *uris;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cal_client_multi_class_init (CalClientMultiClass *klass);</div><div class='del'>-static void cal_client_multi_init       (CalClientMulti *multi);</div><div class='del'>-static void cal_client_multi_destroy    (GtkObject *object);</div><div class='del'>-</div><div class='del'>-/* signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	CAL_OPENED,</div><div class='del'>-	OBJ_UPDATED,</div><div class='del'>-	OBJ_REMOVED,</div><div class='del'>-	CATEGORIES_CHANGED,</div><div class='del'>-	FORGET_PASSWORD,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint cal_multi_signals[LAST_SIGNAL];</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Private functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_type</div><div class='del'>- *</div><div class='del'>- * Registers the #CalClientMulti class if necessary, and returns the type ID</div><div class='del'>- * assigned to it.</div><div class='del'>- *</div><div class='del'>- * Returns: The type ID of the #CalClientMulti class</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-cal_client_multi_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"CalClientMulti",</div><div class='del'>-			sizeof (CalClientMulti),</div><div class='del'>-			sizeof (CalClientMultiClass),</div><div class='del'>-			(GtkClassInitFunc) cal_client_multi_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_client_multi_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* class initialization function for the multi calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_multi_class_init (CalClientMultiClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-	</div><div class='del'>-	cal_multi_signals[CAL_OPENED] =</div><div class='del'>-		gtk_signal_new ("cal_opened",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientMultiClass, cal_opened),</div><div class='del'>-				gtk_marshal_NONE__POINTER_INT,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_POINTER, GTK_TYPE_ENUM);</div><div class='del'>-	cal_multi_signals[OBJ_UPDATED] =</div><div class='del'>-		gtk_signal_new ("obj_updated",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_updated),</div><div class='del'>-				gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_POINTER, GTK_TYPE_STRING);</div><div class='del'>-	cal_multi_signals[OBJ_REMOVED] =</div><div class='del'>-		gtk_signal_new ("obj_removed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_removed),</div><div class='del'>-				gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_POINTER, GTK_TYPE_STRING);</div><div class='del'>-	cal_multi_signals[CATEGORIES_CHANGED] =</div><div class='del'>-		gtk_signal_new ("categories_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientMultiClass, categories_changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_POINTER, GTK_TYPE_POINTER);</div><div class='del'>-	cal_multi_signals[FORGET_PASSWORD] =</div><div class='del'>-		gtk_signal_new ("forget_password",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-                                object_class-&gt;type,</div><div class='del'>-                                GTK_SIGNAL_OFFSET (CalClientMultiClass, forget_password),</div><div class='del'>-                                gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-                                GTK_TYPE_NONE, 2,</div><div class='del'>-                                GTK_TYPE_STRING, GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_client_multi_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* object initialization function for the multi calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_multi_init (CalClientMulti *multi)</div><div class='del'>-{</div><div class='del'>-	multi-&gt;priv = g_new0 (CalClientMultiPrivate, 1);</div><div class='del'>-	multi-&gt;priv-&gt;calendars = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	multi-&gt;priv-&gt;uris = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_calendar (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	multi-&gt;priv-&gt;uris = g_list_remove (multi-&gt;priv-&gt;uris, key);</div><div class='del'>-</div><div class='del'>-	g_free (key);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* destroy handler for the multi calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_multi_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) object;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	/* free memory */</div><div class='del'>-	g_hash_table_foreach (multi-&gt;priv-&gt;calendars, free_calendar, multi);</div><div class='del'>-	g_hash_table_destroy (multi-&gt;priv-&gt;calendars);</div><div class='del'>-	g_list_free (multi-&gt;priv-&gt;uris);</div><div class='del'>-</div><div class='del'>-	g_free (multi-&gt;priv);</div><div class='del'>-	multi-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	/* chain to parent class' destroy handler */</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_new</div><div class='del'>- *</div><div class='del'>- * Creates a new multi-calendar client. This allows you to merge several</div><div class='del'>- * #CalClient objects into one entity, making it easier to manage</div><div class='del'>- * multiple calendars.</div><div class='del'>- *</div><div class='del'>- * Returns: A newly-created multi-calendar client.</div><div class='del'>- */</div><div class='del'>-CalClientMulti *</div><div class='del'>-cal_client_multi_new (void)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi;</div><div class='del'>-</div><div class='del'>-	multi = gtk_type_new (CAL_CLIENT_MULTI_TYPE);</div><div class='del'>-	return multi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CalClient's signal handlers */</div><div class='del'>-static void</div><div class='del'>-client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (multi),</div><div class='del'>-			 cal_multi_signals[CAL_OPENED],</div><div class='del'>-			 client, status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-client_obj_updated_cb (CalClient *client, const char *uid, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (multi),</div><div class='del'>-			 cal_multi_signals[OBJ_UPDATED],</div><div class='del'>-			 client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-client_obj_removed_cb (CalClient *client, const char *uid, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (multi),</div><div class='del'>-			 cal_multi_signals[OBJ_REMOVED],</div><div class='del'>-			 client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (multi),</div><div class='del'>-			 cal_multi_signals[CATEGORIES_CHANGED],</div><div class='del'>-			 client, categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-client_forget_password_cb (CalClient *client, const char *key, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalClientMulti *multi = (CalClientMulti *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (multi),</div><div class='del'>-			 cal_multi_signals[FORGET_PASSWORD],</div><div class='del'>-			 client, key);</div><div class='del'>-}</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_add_client</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @client: The #CalClient object to be added.</div><div class='del'>- *</div><div class='del'>- * Aggregates the given #CalClient to a #CalClientMulti object,</div><div class='del'>- * thus adding it to the list of managed calendars.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_client_multi_add_client (CalClientMulti *multi, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	CalClient *old_client;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	uri = g_strdup (cal_client_get_uri (client));</div><div class='del'>-	old_client = g_hash_table_lookup (multi-&gt;priv-&gt;calendars, uri);</div><div class='del'>-	if (old_client) {</div><div class='del'>-		g_free (uri);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-	multi-&gt;priv-&gt;uris = g_list_append (multi-&gt;priv-&gt;uris, uri);</div><div class='del'>-	g_hash_table_insert (multi-&gt;priv-&gt;calendars, uri, client);</div><div class='del'>-</div><div class='del'>-	/* set up CalClient's signal handlers */</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (client), multi);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client),</div><div class='del'>-			    "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_cal_opened_cb),</div><div class='del'>-			    multi);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client),</div><div class='del'>-			    "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_obj_updated_cb),</div><div class='del'>-			    multi);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client),</div><div class='del'>-			    "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_obj_removed_cb),</div><div class='del'>-			    multi);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client),</div><div class='del'>-			    "categories_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_categories_changed_cb),</div><div class='del'>-			    multi);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client),</div><div class='del'>-			    "forget_password",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_forget_password_cb),</div><div class='del'>-			    multi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalClientAuthFunc func;</div><div class='del'>-	gpointer user_data;</div><div class='del'>-} AuthFuncData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_auth_func (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	AuthFuncData *cb_data = (AuthFuncData *) user_data;</div><div class='del'>-	CalClient *client = (CalClient *) value;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-	g_return_if_fail (cb_data != NULL);</div><div class='del'>-</div><div class='del'>-	cal_client_set_auth_func (client, cb_data-&gt;func, cb_data-&gt;user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_set_auth_func</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @func: The authentication function.</div><div class='del'>- * @user_data: Data to be passed to the authentication function.</div><div class='del'>- *</div><div class='del'>- * Sets the authentication function for all the clients in the</div><div class='del'>- * given #CalClientMulti.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_client_multi_set_auth_func (CalClientMulti *multi,</div><div class='del'>-				CalClientAuthFunc func,</div><div class='del'>-				gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	AuthFuncData *cb_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	cb_data = g_new0 (AuthFuncData, 1);</div><div class='del'>-	cb_data-&gt;func = func;</div><div class='del'>-	cb_data-&gt;user_data = user_data;</div><div class='del'>-	g_hash_table_foreach (multi-&gt;priv-&gt;calendars, set_auth_func, cb_data);</div><div class='del'>-</div><div class='del'>-	g_free (cb_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_open_calendar</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @str_uri: The URI of the calendar to be open</div><div class='del'>- * @only_if_exists:</div><div class='del'>- *</div><div class='del'>- * Open a new calendar in the given #CalClientMulti object.</div><div class='del'>- *</div><div class='del'>- * Returns: a pointer to the new #CalClient</div><div class='del'>- */</div><div class='del'>-CalClient *</div><div class='del'>-cal_client_multi_open_calendar (CalClientMulti *multi,</div><div class='del'>-				const char *str_uri,</div><div class='del'>-				gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), FALSE);</div><div class='del'>-</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	result = cal_client_open_calendar (client, str_uri, only_if_exists);</div><div class='del'>-	if (result) {</div><div class='del'>-		cal_client_multi_add_client (multi, client);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-		return client;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_client_for_uri</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @uri: The URI for the client.</div><div class='del'>- *</div><div class='del'>- * Returns the #CalClient object associated with the given</div><div class='del'>- * @uri for the given #CalClientMulti object.</div><div class='del'>- *</div><div class='del'>- * Returns: a pointer to the client or NULL if no client is</div><div class='del'>- * associated with that URI.</div><div class='del'>- */</div><div class='del'>-CalClient *</div><div class='del'>-cal_client_multi_get_client_for_uri (CalClientMulti *multi, const char *uri)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-	g_return_val_if_fail (uri != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return g_hash_table_lookup (multi-&gt;priv-&gt;calendars, uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_n_objects</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @type: Type for objects</div><div class='del'>- *</div><div class='del'>- * Get the count of objects of the given type(s) for a #CalClientMulti</div><div class='del'>- * object.</div><div class='del'>- *</div><div class='del'>- * Returns: The count of objects of the given type(s).</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-cal_client_multi_get_n_objects (CalClientMulti *multi,</div><div class='del'>-				CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), -1);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client))</div><div class='del'>-			count += cal_client_get_n_objects (client, type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_object</div><div class='del'>- */</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_multi_get_object (CalClientMulti *multi,</div><div class='del'>-			     const char *uid,</div><div class='del'>-			     CalComponent **comp)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-			status = cal_client_get_object (client, uid, comp);</div><div class='del'>-			if (status == CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-				return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_timezone</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @tzid: ID for the timezone to be retrieved.</div><div class='del'>- * @zone: A pointer to where the icaltimezone object will be copied.</div><div class='del'>- */</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_multi_get_timezone (CalClientMulti *multi,</div><div class='del'>-			       const char *tzid,</div><div class='del'>-			       icaltimezone **zone)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-	g_return_val_if_fail (tzid != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-			status = cal_client_get_timezone (client, tzid, zone);</div><div class='del'>-			if (status == CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-				return status;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_uids</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @type: Type of objects whose IDs will be returned.</div><div class='del'>- *</div><div class='del'>- * Returns a list of UIDs for all the objects of the given</div><div class='del'>- * type(s) that are in the calendars managed by a</div><div class='del'>- * #CalClientMulti object</div><div class='del'>- *</div><div class='del'>- * Returns: a GList of UIDs.</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-cal_client_multi_get_uids (CalClientMulti *multi, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			GList *tmp;</div><div class='del'>-</div><div class='del'>-			tmp = cal_client_get_uids (client, type);</div><div class='del'>-			if (tmp)</div><div class='del'>-				result = g_list_concat (result, tmp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_changes</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @type: Object type.</div><div class='del'>- * @change_id: Change ID.</div><div class='del'>- *</div><div class='del'>- * Returns a list of changes for the given #CalClientMulti</div><div class='del'>- * object.</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-cal_client_multi_get_changes (CalClientMulti *multi,</div><div class='del'>-			      CalObjType type,</div><div class='del'>-			      const char *change_id)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			GList *tmp;</div><div class='del'>-</div><div class='del'>-			tmp = cal_client_get_changes (client, type, change_id);</div><div class='del'>-			if (tmp)</div><div class='del'>-				result = g_list_concat (result, tmp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_objects_in_range</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @type: Type for objects.</div><div class='del'>- * @start: Start time.</div><div class='del'>- * @end: End time.</div><div class='del'>- *</div><div class='del'>- * Retrieves a list of all calendar components that are</div><div class='del'>- * scheduled within the given time range. The information is</div><div class='del'>- * retrieved from all the calendars being managed by the</div><div class='del'>- * given #CalClientMulti object.</div><div class='del'>- *</div><div class='del'>- * Returns: A list of UID strings. This should be freed using the</div><div class='del'>- * #cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_multi_get_objects_in_range (CalClientMulti *multi,</div><div class='del'>-				       CalObjType type,</div><div class='del'>-				       time_t start,</div><div class='del'>-				       time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			GList *tmp;</div><div class='del'>-</div><div class='del'>-			tmp = cal_client_get_objects_in_range (client, type, start, end);</div><div class='del'>-			if (tmp)</div><div class='del'>-				result = g_list_concat (result, tmp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_free_busy</div><div class='del'>- * @multi: A #CalClientMulti object.</div><div class='del'>- * @users: List of users to retrieve F/B information for.</div><div class='del'>- * @start: Start time.</div><div class='del'>- * @end: End time.</div><div class='del'>- *</div><div class='del'>- * Retrieves Free/Busy information for the given users in all</div><div class='del'>- * the calendars being managed by the given #CalClient multi</div><div class='del'>- * object.</div><div class='del'>- *</div><div class='del'>- * Returns: A GList of VFREEBUSY CalComponents</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-cal_client_multi_get_free_busy (CalClientMulti *multi,</div><div class='del'>-				GList *users,</div><div class='del'>-				time_t start,</div><div class='del'>-				time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			GList *tmp;</div><div class='del'>-</div><div class='del'>-			tmp = cal_client_get_free_busy (client, users, start, end);</div><div class='del'>-			if (tmp)</div><div class='del'>-				result = g_list_concat (result, tmp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_generate_instances</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_client_multi_generate_instances (CalClientMulti *multi,</div><div class='del'>-				     CalObjType type,</div><div class='del'>-				     time_t start,</div><div class='del'>-				     time_t end,</div><div class='del'>-				     CalRecurInstanceFn cb,</div><div class='del'>-				     gpointer cb_data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT_MULTI (multi));</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			cal_client_generate_instances (</div><div class='del'>-				client, type, start, end, cb, cb_data);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_multi_get_alarms_in_range</div><div class='del'>- */</div><div class='del'>-GSList *</div><div class='del'>-cal_client_multi_get_alarms_in_range (CalClientMulti *multi, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *l;</div><div class='del'>-	GSList *result = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT_MULTI (multi), NULL);</div><div class='del'>-</div><div class='del'>-	for (l = multi-&gt;priv-&gt;uris; l; l = l-&gt;next) {</div><div class='del'>-		client = cal_client_multi_get_client_for_uri (multi,</div><div class='del'>-							      (const char *) l-&gt;data);</div><div class='del'>-		if (IS_CAL_CLIENT (client)) {</div><div class='del'>-			GSList *tmp;</div><div class='del'>-</div><div class='del'>-			tmp = cal_client_get_alarms_in_range (client, start, end);</div><div class='del'>-			if (tmp)</div><div class='del'>-				result = g_slist_concat (result, tmp);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/cal-client-multi.h b/calendar/cal-client/cal-client-multi.h<br/>deleted file mode 100644<br/>index cded02e194..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client-multi.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client-multi.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* Evolution calendar client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_CLIENT_MULTI_H</div><div class='del'>-#define CAL_CLIENT_MULTI_H</div><div class='del'>-</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define CAL_CLIENT_MULTI_TYPE            (cal_client_multi_get_type ())</div><div class='del'>-#define CAL_CLIENT_MULTI(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))</div><div class='del'>-#define CAL_CLIENT_MULTI_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass))</div><div class='del'>-#define IS_CAL_CLIENT_MULTI(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE))</div><div class='del'>-#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalClientMulti        CalClientMulti;</div><div class='del'>-typedef struct _CalClientMultiClass   CalClientMultiClass;</div><div class='del'>-typedef struct _CalClientMultiPrivate CalClientMultiPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalClientMulti {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalClientMultiPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalClientMultiClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* notification signals */</div><div class='del'>-	void (* cal_opened) (CalClientMulti *multi, CalClient *client, CalClientOpenStatus status);</div><div class='del'>-</div><div class='del'>-	void (* obj_updated) (CalClientMulti *multi, CalClient *client, const char *uid);</div><div class='del'>-	void (* obj_removed) (CalClientMulti *multi, CalClient *client, const char *uid);</div><div class='del'>-</div><div class='del'>-	void (* categories_changed) (CalClientMulti *multi, CalClient *client, GPtrArray *categories);</div><div class='del'>-</div><div class='del'>-	void (* forget_password) (CalClientMulti *multi, CalClient *client, const char *key);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType            cal_client_multi_get_type (void);</div><div class='del'>-</div><div class='del'>-CalClientMulti    *cal_client_multi_new (void);</div><div class='del'>-</div><div class='del'>-void               cal_client_multi_add_client (CalClientMulti *multi, CalClient *client);</div><div class='del'>-void               cal_client_multi_set_auth_func (CalClientMulti *multi,</div><div class='del'>-						   CalClientAuthFunc func,</div><div class='del'>-						   gpointer user_data);</div><div class='del'>-</div><div class='del'>-CalClient         *cal_client_multi_open_calendar (CalClientMulti *multi,</div><div class='del'>-						   const char *str_uri,</div><div class='del'>-						   gboolean only_if_exists);</div><div class='del'>-CalClient         *cal_client_multi_get_client_for_uri (CalClientMulti *multi,</div><div class='del'>-							const char *uri);</div><div class='del'>-</div><div class='del'>-int                cal_client_multi_get_n_objects (CalClientMulti *multi, CalObjType type);</div><div class='del'>-CalClientGetStatus cal_client_multi_get_object (CalClientMulti *multi,</div><div class='del'>-						const char *uid,</div><div class='del'>-						CalComponent **comp);</div><div class='del'>-CalClientGetStatus cal_client_multi_get_timezone (CalClientMulti *multi,</div><div class='del'>-						  const char *tzid,</div><div class='del'>-						  icaltimezone **zone);</div><div class='del'>-GList             *cal_client_multi_get_uids (CalClientMulti *multi, CalObjType type);</div><div class='del'>-GList             *cal_client_multi_get_changes (CalClientMulti *multi,</div><div class='del'>-						 CalObjType type,</div><div class='del'>-						 const char *change_id);</div><div class='del'>-GList             *cal_client_multi_get_objects_in_range (CalClientMulti *multi,</div><div class='del'>-							  CalObjType type,</div><div class='del'>-							  time_t start,</div><div class='del'>-							  time_t end);</div><div class='del'>-GList             *cal_client_multi_get_free_busy (CalClientMulti *multi,</div><div class='del'>-						   GList *users,</div><div class='del'>-						   time_t start,</div><div class='del'>-						   time_t end);</div><div class='del'>-void               cal_client_multi_generate_instances (CalClientMulti *multi,</div><div class='del'>-							CalObjType type,</div><div class='del'>-							time_t start,</div><div class='del'>-							time_t end,</div><div class='del'>-							CalRecurInstanceFn cb,</div><div class='del'>-							gpointer cb_data);</div><div class='del'>-GSList            *cal_client_multi_get_alarms_in_range (CalClientMulti *multi,</div><div class='del'>-							 time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-client/cal-client-types.c b/calendar/cal-client/cal-client-types.c<br/>deleted file mode 100644<br/>index 6ce98c02c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client-types.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client-types.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include "cal-client-types.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_change_list_free:</div><div class='del'>- * @list: List of #CalClientChange structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of #CalClientChange structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_client_change_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	CalClientChange *c;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		c = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (c != NULL);</div><div class='del'>-		g_assert (c-&gt;comp != NULL);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (c-&gt;comp));</div><div class='del'>-		g_free (c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/cal-client-types.h b/calendar/cal-client/cal-client-types.h<br/>deleted file mode 100644<br/>index 9727fc9b3d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_CLIENT_TYPES_H</div><div class='del'>-#define CAL_CLIENT_TYPES_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_CHANGE_ADDED = 1 &lt;&lt; 0,</div><div class='del'>-	CAL_CLIENT_CHANGE_MODIFIED = 1 &lt;&lt; 1,</div><div class='del'>-	CAL_CLIENT_CHANGE_DELETED = 1 &lt;&lt; 2</div><div class='del'>-} CalClientChangeType;</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientChangeType type;</div><div class='del'>-} CalClientChange;</div><div class='del'>-</div><div class='del'>-void cal_client_change_list_free (GList *list);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c<br/>deleted file mode 100644<br/>index 30402bf126..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2552 +0,0 @@</div><div class='del'>-/* Evolution calendar client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cal-client-types.h"</div><div class='del'>-#include "cal-client.h"</div><div class='del'>-#include "cal-listener.h"</div><div class='del'>-#include "wombat-client.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalClient structure */</div><div class='del'>-struct _CalClientPrivate {</div><div class='del'>-	/* Load state to avoid multiple loads */</div><div class='del'>-	CalClientLoadState load_state;</div><div class='del'>-</div><div class='del'>-	/* URI of the calendar that is being loaded or is already loaded, or</div><div class='del'>-	 * NULL if we are not loaded.</div><div class='del'>-	 */</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	/* The calendar factories we are contacting */</div><div class='del'>-	GList *factories;</div><div class='del'>-</div><div class='del'>-	/* Our calendar listener implementation */</div><div class='del'>-	CalListener *listener;</div><div class='del'>-</div><div class='del'>-	/* The calendar client interface object we are contacting */</div><div class='del'>-	GNOME_Evolution_Calendar_Cal cal;</div><div class='del'>-</div><div class='del'>-	/* The authentication function */</div><div class='del'>-	CalClientAuthFunc auth_func;</div><div class='del'>-	gpointer auth_user_data;</div><div class='del'>-</div><div class='del'>-	/* The WombatClient */</div><div class='del'>-	WombatClient *w_client;</div><div class='del'>-</div><div class='del'>-	/* A cache of timezones retrieved from the server, to avoid getting</div><div class='del'>-	   them repeatedly for each get_object() call. */</div><div class='del'>-	GHashTable *timezones;</div><div class='del'>-</div><div class='del'>-	/* The default timezone to use to resolve DATE and floating DATE-TIME</div><div class='del'>-	   values. */</div><div class='del'>-	icaltimezone *default_zone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	CAL_OPENED,</div><div class='del'>-	CAL_SET_MODE,</div><div class='del'>-	OBJ_UPDATED,</div><div class='del'>-	OBJ_REMOVED,</div><div class='del'>-	CATEGORIES_CHANGED,</div><div class='del'>-	FORGET_PASSWORD,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cal_client_class_init (CalClientClass *class);</div><div class='del'>-static void cal_client_init (CalClient *client);</div><div class='del'>-static void cal_client_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static char *client_get_password_cb (WombatClient *w_client,</div><div class='del'>-				     const gchar *prompt,</div><div class='del'>-				     const gchar *key,</div><div class='del'>-				     gpointer user_data);</div><div class='del'>-static void  client_forget_password_cb (WombatClient *w_client,</div><div class='del'>-					const gchar *key,</div><div class='del'>-					gpointer user_data);</div><div class='del'>-static void cal_client_get_object_timezones_cb (icalparameter *param,</div><div class='del'>-						void *data);</div><div class='del'>-</div><div class='del'>-static guint cal_client_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalClient class if necessary, and returns the type ID assigned</div><div class='del'>- * to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalClient class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_client_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_client_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_type) {</div><div class='del'>-		static const GtkTypeInfo cal_client_info = {</div><div class='del'>-			"CalClient",</div><div class='del'>-			sizeof (CalClient),</div><div class='del'>-			sizeof (CalClientClass),</div><div class='del'>-			(GtkClassInitFunc) cal_client_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_client_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;cal_client_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_client_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define marshal_NONE__ENUM_ENUM gtk_marshal_NONE__INT_INT</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_class_init (CalClientClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	cal_client_signals[CAL_OPENED] =</div><div class='del'>-		gtk_signal_new ("cal_opened",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, cal_opened),</div><div class='del'>-				gtk_marshal_NONE__ENUM,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_ENUM);</div><div class='del'>-	cal_client_signals[CAL_SET_MODE] =</div><div class='del'>-		gtk_signal_new ("cal_set_mode",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, cal_set_mode),</div><div class='del'>-				marshal_NONE__ENUM_ENUM,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_ENUM,</div><div class='del'>-				GTK_TYPE_ENUM);</div><div class='del'>-	cal_client_signals[OBJ_UPDATED] =</div><div class='del'>-		gtk_signal_new ("obj_updated",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, obj_updated),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-	cal_client_signals[OBJ_REMOVED] =</div><div class='del'>-		gtk_signal_new ("obj_removed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, obj_removed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-	cal_client_signals[CATEGORIES_CHANGED] =</div><div class='del'>-		gtk_signal_new ("categories_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalClientClass, categories_changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-	cal_client_signals[FORGET_PASSWORD] =</div><div class='del'>-		gtk_signal_new ("forget_password",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-                                object_class-&gt;type,</div><div class='del'>-                                GTK_SIGNAL_OFFSET (CalClientClass, forget_password),</div><div class='del'>-                                gtk_marshal_NONE__STRING,</div><div class='del'>-                                GTK_TYPE_NONE, 1,</div><div class='del'>-                                GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	class-&gt;cal_opened = NULL;</div><div class='del'>-	class-&gt;obj_updated = NULL;</div><div class='del'>-	class-&gt;obj_removed = NULL;</div><div class='del'>-	class-&gt;categories_changed = NULL;</div><div class='del'>-	class-&gt;forget_password = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_client_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_init (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalClientPrivate, 1);</div><div class='del'>-	client-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = CAL_CLIENT_LOAD_NOT_LOADED;</div><div class='del'>-	priv-&gt;uri = NULL;</div><div class='del'>-	priv-&gt;factories = NULL;</div><div class='del'>-	priv-&gt;timezones = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;w_client = NULL;</div><div class='del'>-	priv-&gt;default_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets rid of the factories that a client knows about */</div><div class='del'>-static void</div><div class='del'>-destroy_factories (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Object factory;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int result;</div><div class='del'>-	GList *f;</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	for (f = priv-&gt;factories; f; f = f-&gt;next) {</div><div class='del'>-		factory = f-&gt;data;</div><div class='del'>-</div><div class='del'>-		result = CORBA_Object_is_nil (factory, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			g_message ("destroy_factories(): could not see if a factory was nil");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (result)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		CORBA_Object_release (factory, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			g_message ("destroy_factories(): could not release a factory");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;factories);</div><div class='del'>-	priv-&gt;factories = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets rid of the calendar client interface object that a client knows about */</div><div class='del'>-static void</div><div class='del'>-destroy_cal (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	result = CORBA_Object_is_nil (priv-&gt;cal, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("destroy_cal(): could not see if the "</div><div class='del'>-			   "calendar client interface object was nil");</div><div class='del'>-		priv-&gt;cal = CORBA_OBJECT_NIL;</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (result)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_unref (priv-&gt;cal, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("destroy_cal(): could not unref the calendar client interface object");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (priv-&gt;cal, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("destroy_cal(): could not release the calendar client interface object");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	priv-&gt;cal = CORBA_OBJECT_NIL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_timezone (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	/* Note that the key comes from within the icaltimezone value, so we</div><div class='del'>-	   don't free that. */</div><div class='del'>-	icaltimezone_free (value, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar client */</div><div class='del'>-static void</div><div class='del'>-cal_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (object));</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (object);</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* The server unrefs the query listener, so we just NULL it out here */</div><div class='del'>-	if (priv-&gt;listener) {</div><div class='del'>-		cal_listener_stop_notification (priv-&gt;listener);</div><div class='del'>-		priv-&gt;listener = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;w_client = NULL;</div><div class='del'>-	destroy_factories (client);</div><div class='del'>-	destroy_cal (client);</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = CAL_CLIENT_LOAD_NOT_LOADED;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;uri) {</div><div class='del'>-		g_free (priv-&gt;uri);</div><div class='del'>-		priv-&gt;uri = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;timezones, free_timezone, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;timezones);</div><div class='del'>-	priv-&gt;timezones = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal handlers for the listener's signals */</div><div class='del'>-/* Handle the cal_opened notification from the listener */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalListener *listener,</div><div class='del'>-	       GNOME_Evolution_Calendar_Listener_OpenStatus status,</div><div class='del'>-	       GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_Cal cal_copy;</div><div class='del'>-	CalClientOpenStatus client_status;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADING);</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	client_status = CAL_CLIENT_OPEN_ERROR;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_SUCCESS:</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		cal_copy = CORBA_Object_duplicate (cal, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			g_message ("cal_opened_cb(): could not duplicate the "</div><div class='del'>-				   "calendar client interface");</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		priv-&gt;cal = cal_copy;</div><div class='del'>-		priv-&gt;load_state = CAL_CLIENT_LOAD_LOADED;</div><div class='del'>-</div><div class='del'>-		client_status = CAL_CLIENT_OPEN_SUCCESS;</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_ERROR:</div><div class='del'>-		client_status = CAL_CLIENT_OPEN_ERROR;</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_NOT_FOUND:</div><div class='del'>-		client_status = CAL_CLIENT_OPEN_NOT_FOUND;</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:</div><div class='del'>-		client_status = CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED;</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (priv-&gt;listener));</div><div class='del'>-	priv-&gt;listener = NULL;</div><div class='del'>-</div><div class='del'>-	/* We free the priv-&gt;uri and set the priv-&gt;load_state until after the</div><div class='del'>-	 * "cal_opened" signal has been emitted so that handlers will be able to</div><div class='del'>-	 * access this information.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	/* We are *not* inside a signal handler (this is just a simple callback</div><div class='del'>-	 * called from the listener), so there is not a temporary reference to</div><div class='del'>-	 * the client object.  We ref() so that we can safely emit our own</div><div class='del'>-	 * signal and clean up.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_OPENED],</div><div class='del'>-			 client_status);</div><div class='del'>-</div><div class='del'>-	if (client_status != CAL_CLIENT_OPEN_SUCCESS) {</div><div class='del'>-		priv-&gt;load_state = CAL_CLIENT_LOAD_NOT_LOADED;</div><div class='del'>-		g_free (priv-&gt;uri);</div><div class='del'>-		priv-&gt;uri = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;load_state != CAL_CLIENT_LOAD_LOADING);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle the cal_set_mode notification from the listener */</div><div class='del'>-static void</div><div class='del'>-cal_set_mode_cb (CalListener *listener,</div><div class='del'>-		 GNOME_Evolution_Calendar_Listener_SetModeStatus status,</div><div class='del'>-		 GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CalClientSetModeStatus client_status;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	client_status = CAL_CLIENT_OPEN_ERROR;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_MODE_SET:</div><div class='del'>-		client_status = CAL_CLIENT_SET_MODE_SUCCESS;</div><div class='del'>-		break;		</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_MODE_NOT_SET:</div><div class='del'>-		client_status = CAL_CLIENT_SET_MODE_ERROR;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_Evolution_Calendar_Listener_MODE_NOT_SUPPORTED:</div><div class='del'>-		client_status = CAL_CLIENT_SET_MODE_NOT_SUPPORTED;</div><div class='del'>-		break;		</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We are *not* inside a signal handler (this is just a simple callback</div><div class='del'>-	 * called from the listener), so there is not a temporary reference to</div><div class='del'>-	 * the client object.  We ref() so that we can safely emit our own</div><div class='del'>-	 * signal and clean up.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_SET_MODE],</div><div class='del'>-			 client_status, mode);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle the obj_updated signal from the listener */</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_UPDATED], uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle the obj_removed signal from the listener */</div><div class='del'>-static void</div><div class='del'>-obj_removed_cb (CalListener *listener, const GNOME_Evolution_Calendar_CalObjUID uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_REMOVED], uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle the categories_changed signal from the listener */</div><div class='del'>-static void</div><div class='del'>-categories_changed_cb (CalListener *listener, const GNOME_Evolution_Calendar_StringSeq *categories,</div><div class='del'>-		       gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GPtrArray *cats;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-</div><div class='del'>-	cats = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (cats, categories-&gt;_length);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;_length; i++)</div><div class='del'>-		cats-&gt;pdata[i] = categories-&gt;_buffer[i];</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CATEGORIES_CHANGED], cats);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (cats, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Handle the get_password signal from the Wombatclient */</div><div class='del'>-static gchar *</div><div class='del'>-client_get_password_cb (WombatClient *w_client,</div><div class='del'>-                        const gchar *prompt,</div><div class='del'>-                        const gchar *key,</div><div class='del'>-                        gpointer user_data)</div><div class='del'>-{</div><div class='del'>-        CalClient *client;</div><div class='del'>-</div><div class='del'>-        client = CAL_CLIENT (user_data);</div><div class='del'>-        g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-        if (client-&gt;priv-&gt;auth_func)</div><div class='del'>-                return client-&gt;priv-&gt;auth_func (client, prompt, key, client-&gt;priv-&gt;auth_user_data);</div><div class='del'>-</div><div class='del'>-        return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handle the forget_password signal from the WombatClient */</div><div class='del'>-static void</div><div class='del'>-client_forget_password_cb (WombatClient *w_client,</div><div class='del'>-                           const gchar *key,</div><div class='del'>-                           gpointer user_data)</div><div class='del'>-{</div><div class='del'>-        CalClient *client;</div><div class='del'>-</div><div class='del'>-        client = CAL_CLIENT (user_data);</div><div class='del'>-        g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-        gtk_signal_emit (GTK_OBJECT (client),</div><div class='del'>-                         cal_client_signals [FORGET_PASSWORD],</div><div class='del'>-                         key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_construct:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- *</div><div class='del'>- * Constructs a calendar client object by contacting all available</div><div class='del'>- * calendar factories.</div><div class='del'>- *</div><div class='del'>- * Return value: The same object as the @client argument, or NULL if the</div><div class='del'>- * calendar factory could not be contacted.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-cal_client_construct (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Calendar_CalFactory factory;</div><div class='del'>-	OAF_ServerInfoList *servers;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	servers = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/Calendar/CalFactory:1.0')", NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("Cannot perform OAF query for Calendar servers.");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (servers-&gt;_length == 0)</div><div class='del'>-		g_warning ("No Calendar servers installed.");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; servers-&gt;_length; i++) {</div><div class='del'>-		const OAF_ServerInfo *info;</div><div class='del'>-</div><div class='del'>-		info = servers-&gt;_buffer + i;</div><div class='del'>-</div><div class='del'>-		g_print ("Factory: %s\n", info-&gt;iid);</div><div class='del'>-		factory = (GNOME_Evolution_Calendar_CalFactory)</div><div class='del'>-			oaf_activate_from_id (info-&gt;iid, 0, NULL, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			g_warning ("cal_client_construct: Could not activate calendar server %s", info-&gt;iid);</div><div class='del'>-			CORBA_free (servers);</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;factories = g_list_prepend (priv-&gt;factories, factory);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_free (servers);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new calendar client.  It should be initialized by calling</div><div class='del'>- * cal_client_open_calendar().</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar client, or NULL if the client could</div><div class='del'>- * not be constructed because it could not contact the calendar server.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-cal_client_new (void)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	client = gtk_type_new (CAL_CLIENT_TYPE);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_construct (client)) {</div><div class='del'>-		g_message ("cal_client_new(): could not construct the calendar client");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_set_auth_func</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @func: The authentication function</div><div class='del'>- * @data: User data to be used when calling the authentication function</div><div class='del'>- *</div><div class='del'>- * Associates the given authentication function with a calendar client. This</div><div class='del'>- * function will be called any time the calendar server needs a password</div><div class='del'>- * from the client. So, calendar clients should provide such authentication</div><div class='del'>- * function, which, when called, should act accordingly (by showing a dialog</div><div class='del'>- * box, for example, to ask the user for the password).</div><div class='del'>- *</div><div class='del'>- * The authentication function must have the following form:</div><div class='del'>- *	char * auth_func (CalClient *client,</div><div class='del'>- *			  const gchar *prompt,</div><div class='del'>- *			  const gchar *key,</div><div class='del'>- *			  gpointer user_data)</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_client_set_auth_func (CalClient *client, CalClientAuthFunc func, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	client-&gt;priv-&gt;auth_func = func;</div><div class='del'>-	client-&gt;priv-&gt;auth_user_data = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-real_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists, gboolean *supported)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Calendar_Listener corba_listener;</div><div class='del'>-	int unsupported;</div><div class='del'>-	GList *f;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_NOT_LOADED, FALSE);</div><div class='del'>-	g_assert (priv-&gt;uri == NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (str_uri != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	priv-&gt;listener = cal_listener_new (cal_opened_cb,</div><div class='del'>-					   cal_set_mode_cb,</div><div class='del'>-					   obj_updated_cb,</div><div class='del'>-					   obj_removed_cb,</div><div class='del'>-					   categories_changed_cb,</div><div class='del'>-					   client);</div><div class='del'>-	if (!priv-&gt;listener) {</div><div class='del'>-		g_message ("cal_client_open_calendar(): could not create the listener");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create the WombatClient */</div><div class='del'>-	priv-&gt;w_client = wombat_client_new (</div><div class='del'>-		(WombatClientGetPasswordFn) client_get_password_cb,</div><div class='del'>-                (WombatClientForgetPasswordFn) client_forget_password_cb,</div><div class='del'>-                (gpointer) client);</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (priv-&gt;listener),</div><div class='del'>-				     BONOBO_OBJECT (priv-&gt;w_client));</div><div class='del'>-</div><div class='del'>-	corba_listener = (GNOME_Evolution_Calendar_Listener) (BONOBO_OBJREF (priv-&gt;listener));</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = CAL_CLIENT_LOAD_LOADING;</div><div class='del'>-	priv-&gt;uri = g_strdup (str_uri);</div><div class='del'>-</div><div class='del'>-	unsupported = 0;</div><div class='del'>-	for (f = priv-&gt;factories; f; f = f-&gt;next) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-		GNOME_Evolution_Calendar_CalFactory_open (f-&gt;data, str_uri,</div><div class='del'>-							  only_if_exists,</div><div class='del'>-							  corba_listener, &amp;ev);</div><div class='del'>-		if (!BONOBO_EX (&amp;ev))</div><div class='del'>-			break;</div><div class='del'>-		else if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod))</div><div class='del'>-			unsupported++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (supported != NULL) {</div><div class='del'>-		if (unsupported == g_list_length (priv-&gt;factories))</div><div class='del'>-			*supported = FALSE;</div><div class='del'>-		else</div><div class='del'>-			*supported = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;listener));</div><div class='del'>-		priv-&gt;listener = NULL;</div><div class='del'>-		priv-&gt;load_state = CAL_CLIENT_LOAD_NOT_LOADED;</div><div class='del'>-		g_free (priv-&gt;uri);</div><div class='del'>-		priv-&gt;uri = NULL;</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_open_calendar:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @str_uri: URI of calendar to open.</div><div class='del'>- * @only_if_exists: FALSE if the calendar should be opened even if there</div><div class='del'>- * was no storage for it, i.e. to create a new calendar or load an existing</div><div class='del'>- * one if it already exists.  TRUE if it should only try to load calendars</div><div class='del'>- * that already exist.</div><div class='del'>- *</div><div class='del'>- * Makes a calendar client initiate a request to open a calendar.  The calendar</div><div class='del'>- * client will emit the "cal_opened" signal when the response from the server is</div><div class='del'>- * received.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on failure to issue the open request.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	return real_open_calendar (client, str_uri, only_if_exists, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_fall_back_uri (gboolean tasks)</div><div class='del'>-{</div><div class='del'>-	if (tasks)</div><div class='del'>-		return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-					      "evolution/local/"</div><div class='del'>-					      "Tasks/tasks.ics");</div><div class='del'>-	else</div><div class='del'>-		return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-					      "evolution/local/"</div><div class='del'>-					      "Calendar/calendar.ics");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_default_uri (gboolean tasks)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	char *uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	if (tasks)</div><div class='del'>-		uri = bonobo_config_get_string (db, "/DefaultFolders/tasks_uri", &amp;ev);</div><div class='del'>-	else</div><div class='del'>-		uri = bonobo_config_get_string (db, "/DefaultFolders/calendar_uri", &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		uri = get_fall_back_uri (tasks);</div><div class='del'>-	} else {</div><div class='del'>-		uri = cal_util_expand_uri (uri, tasks);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_client_open_default_calendar (CalClient *client, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	char *default_uri, *fall_back;</div><div class='del'>-	gboolean result, supported;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	default_uri = get_default_uri (FALSE);</div><div class='del'>-	fall_back = get_fall_back_uri (FALSE);</div><div class='del'>-	</div><div class='del'>-	result = real_open_calendar (client, default_uri, only_if_exists, &amp;supported);</div><div class='del'>-	if (!supported &amp;&amp; strcmp (fall_back, default_uri))</div><div class='del'>-		result = real_open_calendar (client, fall_back, only_if_exists, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (default_uri);</div><div class='del'>-	g_free (fall_back);</div><div class='del'>-	</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_client_open_default_tasks (CalClient *client, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	char *default_uri, *fall_back;</div><div class='del'>-	gboolean result, supported;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	default_uri = get_default_uri (TRUE);</div><div class='del'>-	fall_back = get_fall_back_uri (TRUE);</div><div class='del'>-</div><div class='del'>-	result = real_open_calendar (client, default_uri, only_if_exists, &amp;supported);</div><div class='del'>-	if (!supported &amp;&amp; strcmp (fall_back, default_uri))</div><div class='del'>-		result = real_open_calendar (client, fall_back, only_if_exists, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (default_uri);</div><div class='del'>-	g_free (fall_back);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds an URI list out of a CORBA string sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_uri_list (GNOME_Evolution_Calendar_StringSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GList *uris = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++)</div><div class='del'>-		uris = g_list_prepend (uris, g_strdup (seq-&gt;_buffer[i]));</div><div class='del'>-</div><div class='del'>-	return uris;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_uri_list:</div><div class='del'>- * @client: A calendar client</div><div class='del'>- * @type: type of uri's to get</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: A list of URI's open on the wombat</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_uri_list (CalClient *client, CalMode mode)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *uri_seq;</div><div class='del'>-	GList *uris = NULL;	</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GList *f;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (f = priv-&gt;factories; f; f = f-&gt;next) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		uri_seq = GNOME_Evolution_Calendar_CalFactory_uriList (f-&gt;data, mode, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			g_message ("cal_client_uri_list(): request failed");</div><div class='del'>-</div><div class='del'>-			/* free memory and return */</div><div class='del'>-			g_list_foreach (uris, (GFunc) g_free, NULL);</div><div class='del'>-			g_list_free (uris);</div><div class='del'>-			uris = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			uris = g_list_concat (uris, build_uri_list (uri_seq));</div><div class='del'>-	</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return uris;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_load_state:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * </div><div class='del'>- * Queries the state of loading of a calendar client.</div><div class='del'>- * </div><div class='del'>- * Return value: A #CalClientLoadState value indicating whether the client has</div><div class='del'>- * not been loaded with cal_client_open_calendar() yet, whether it is being</div><div class='del'>- * loaded, or whether it is already loaded.</div><div class='del'>- **/</div><div class='del'>-CalClientLoadState</div><div class='del'>-cal_client_get_load_state (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	return priv-&gt;load_state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_uri:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * </div><div class='del'>- * Queries the URI that is open in a calendar client.</div><div class='del'>- * </div><div class='del'>- * Return value: The URI of the calendar that is already loaded or is being</div><div class='del'>- * loaded, or NULL if the client has not started a load request yet.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-cal_client_get_uri (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	return priv-&gt;uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts our representation of a calendar component type into its CORBA representation */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjType</div><div class='del'>-corba_obj_type (CalObjType type)</div><div class='del'>-{</div><div class='del'>-	return (((type &amp; CALOBJ_TYPE_EVENT) ? GNOME_Evolution_Calendar_TYPE_EVENT : 0)</div><div class='del'>-		| ((type &amp; CALOBJ_TYPE_TODO) ? GNOME_Evolution_Calendar_TYPE_TODO : 0)</div><div class='del'>-		| ((type &amp; CALOBJ_TYPE_JOURNAL) ? GNOME_Evolution_Calendar_TYPE_JOURNAL : 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_client_set_mode (CalClient *client, CalMode mode)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	gboolean retval = TRUE;	</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, -1);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_setMode (priv-&gt;cal, mode, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		retval = FALSE;</div><div class='del'>-		</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_n_objects:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Type of objects that will be counted.</div><div class='del'>- * </div><div class='del'>- * Counts the number of calendar components of the specified @type.  This can be</div><div class='del'>- * used to count how many events, to-dos, or journals there are, for example.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of components.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-cal_client_get_n_objects (CalClient *client, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int n;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, -1);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	n = GNOME_Evolution_Calendar_Cal_countObjects (priv-&gt;cal, t, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_n_objects(): could not get the number of objects");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used in the callback which fetches all the timezones needed for an</div><div class='del'>-   object. */</div><div class='del'>-typedef struct _CalClientGetTimezonesData CalClientGetTimezonesData;</div><div class='del'>-struct _CalClientGetTimezonesData {</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* This starts out at CAL_CLIENT_GET_SUCCESS. If an error occurs this</div><div class='del'>-	   contains the last error. */</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @uid: Unique identifier for a calendar component.</div><div class='del'>- * @comp: Return value for the calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for a calendar component object based on its unique</div><div class='del'>- * identifier.</div><div class='del'>- *</div><div class='del'>- * Return value: Result code based on the status of the operation.</div><div class='del'>- **/</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObj comp_str;</div><div class='del'>-	CalClientGetStatus retval;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	CalClientGetTimezonesData cb_data;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-	g_return_val_if_fail (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	retval = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	*comp = NULL;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	comp_str = GNOME_Evolution_Calendar_Cal_getObject (priv-&gt;cal, (char *) uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {		</div><div class='del'>-		g_message ("cal_client_get_object(): could not get the object");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse_string (comp_str);</div><div class='del'>-	CORBA_free (comp_str);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (*comp));</div><div class='del'>-		*comp = NULL;</div><div class='del'>-</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now make sure we have all timezones needed for this object.</div><div class='del'>-	   We do this to try to avoid any problems caused by getting a timezone</div><div class='del'>-	   in the middle of other code. Any calls to ORBit result in a </div><div class='del'>-	   recursive call of the GTK+ main loop, which can cause problems for</div><div class='del'>-	   code that doesn't expect it. Currently GnomeCanvas has problems if</div><div class='del'>-	   we try to get a timezone in the middle of a redraw, and there is a</div><div class='del'>-	   resize pending, which leads to an assert failure and an abort. */</div><div class='del'>-	cb_data.client = client;</div><div class='del'>-	cb_data.status = CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-	icalcomponent_foreach_tzid (icalcomp,</div><div class='del'>-				    cal_client_get_object_timezones_cb,</div><div class='del'>-				    &amp;cb_data);</div><div class='del'>-</div><div class='del'>-	retval = cb_data.status;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_client_get_object_timezones_cb (icalparameter *param,</div><div class='del'>-				    void *data)</div><div class='del'>-{</div><div class='del'>-	CalClientGetTimezonesData *cb_data = data;</div><div class='del'>-	const char *tzid;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	tzid = icalparameter_get_tzid (param);</div><div class='del'>-	if (!tzid) {</div><div class='del'>-		cb_data-&gt;status = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_timezone (cb_data-&gt;client, tzid, &amp;zone);</div><div class='del'>-	if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-		cb_data-&gt;status = status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_get_timezone (CalClient *client,</div><div class='del'>-			 const char *tzid,</div><div class='del'>-			 icaltimezone **zone)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObj comp_str;</div><div class='del'>-	CalClientGetStatus retval;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icaltimezone *tmp_zone;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED,</div><div class='del'>-			      CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (zone != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	/* If tzid is NULL or "" we return NULL, since it is a 'local time'. */</div><div class='del'>-	if (!tzid || !tzid[0]) {</div><div class='del'>-		*zone = NULL;</div><div class='del'>-		return CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If it is UTC, we return the special UTC timezone. */</div><div class='del'>-	if (!strcmp (tzid, "UTC")) {</div><div class='del'>-		*zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		return CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if we already have it in the cache. */</div><div class='del'>-	tmp_zone = g_hash_table_lookup (priv-&gt;timezones, tzid);</div><div class='del'>-	if (tmp_zone) {</div><div class='del'>-		*zone = tmp_zone;</div><div class='del'>-		return CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	*zone = NULL;</div><div class='del'>-</div><div class='del'>-	/* We don't already have it, so we try to get it from the server. */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	comp_str = GNOME_Evolution_Calendar_Cal_getTimezoneObject (priv-&gt;cal, (char *) tzid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_timezone(): could not get the object");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse_string (comp_str);</div><div class='del'>-	CORBA_free (comp_str);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp_zone = icaltimezone_new ();</div><div class='del'>-	if (!tmp_zone) {</div><div class='del'>-		/* FIXME: Needs better error code - out of memory. Or just</div><div class='del'>-		   abort like GTK+ does? */</div><div class='del'>-		retval = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!icaltimezone_set_component (tmp_zone, icalcomp)) {</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now add it to the cache, to avoid the server call in future. */</div><div class='del'>-	g_hash_table_insert (priv-&gt;timezones, icaltimezone_get_tzid (tmp_zone),</div><div class='del'>-			     tmp_zone);</div><div class='del'>-</div><div class='del'>-	*zone = tmp_zone;</div><div class='del'>-	retval = CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resolves TZIDs for the recurrence generator. */</div><div class='del'>-icaltimezone*</div><div class='del'>-cal_client_resolve_tzid_cb (const char *tzid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	icaltimezone *zone = NULL;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (data != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (data), NULL);</div><div class='del'>-	</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Handle errors. */</div><div class='del'>-	status = cal_client_get_timezone (client, tzid, &amp;zone);</div><div class='del'>-</div><div class='del'>-	return zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Builds an UID list out of a CORBA UID sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_uid_list (GNOME_Evolution_Calendar_CalObjUIDSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GList *uids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uids = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++)</div><div class='del'>-		uids = g_list_prepend (uids, g_strdup (seq-&gt;_buffer[i]));</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_uids:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for a list of unique identifiers corresponding to calendar</div><div class='del'>- * objects whose type matches one of the types specified in the @type flags.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of strings that are the sought UIDs.  This should be</div><div class='del'>- * freed using the cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_uids (CalClient *client, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	GList *uids;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_Cal_getUIDs (priv-&gt;cal, t, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_uids(): could not get the list of UIDs");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	uids = build_uid_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a GList of CalClientChange structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_change_list (GNOME_Evolution_Calendar_CalObjChangeSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Create the list in reverse order */</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjChange *corba_coc;</div><div class='del'>-		CalClientChange *ccc;</div><div class='del'>-</div><div class='del'>-		corba_coc = &amp;seq-&gt;_buffer[i];</div><div class='del'>-		ccc = g_new (CalClientChange, 1);</div><div class='del'>-</div><div class='del'>-		icalcomp = icalparser_parse_string (corba_coc-&gt;calobj);</div><div class='del'>-		if (!icalcomp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		ccc-&gt;comp = cal_component_new ();</div><div class='del'>-		if (!cal_component_set_icalcomponent (ccc-&gt;comp, icalcomp)) {</div><div class='del'>-			icalcomponent_free (icalcomp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (ccc-&gt;comp));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		ccc-&gt;type = corba_coc-&gt;type;</div><div class='del'>-</div><div class='del'>-		list = g_list_prepend (list, ccc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = g_list_reverse (list);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	GList *changes;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_Cal_getChanges (priv-&gt;cal, t, change_id, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_changes(): could not get the list of changes");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	changes = build_change_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return changes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Not used? */</div><div class='del'>-#if 0</div><div class='del'>-/* Builds a GList of CalObjInstance structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_object_instance_list (GNOME_Evolution_Calendar_CalObjInstanceSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Create the list in reverse order */</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjInstance *corba_icoi;</div><div class='del'>-		CalObjInstance *icoi;</div><div class='del'>-</div><div class='del'>-		corba_icoi = &amp;seq-&gt;_buffer[i];</div><div class='del'>-		icoi = g_new (CalObjInstance, 1);</div><div class='del'>-</div><div class='del'>-		icoi-&gt;uid = g_strdup (corba_icoi-&gt;uid);</div><div class='del'>-		icoi-&gt;start = corba_icoi-&gt;start;</div><div class='del'>-		icoi-&gt;end = corba_icoi-&gt;end;</div><div class='del'>-</div><div class='del'>-		list = g_list_prepend (list, icoi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = g_list_reverse (list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_objects_in_range:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for the objects that occur or recur in the specified range</div><div class='del'>- * of time.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of UID strings.  This should be freed using the</div><div class='del'>- * cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *uids;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_Cal_getObjectsInRange (priv-&gt;cal, t, start, end, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_objects_in_range(): could not get the objects");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	uids = build_uid_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_free_busy</div><div class='del'>- * @client:: A calendar client.</div><div class='del'>- * @users: List of users to retrieve free/busy information for.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- *</div><div class='del'>- * Gets free/busy information from the calendar server.</div><div class='del'>- *</div><div class='del'>- * Returns: a GList of VFREEBUSY CalComponents</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_free_busy (CalClient *client, GList *users,</div><div class='del'>-			  time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_UserList *corba_list;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjSeq *calobj_list;</div><div class='del'>-	GList *l;</div><div class='del'>-	GList *comp_list = NULL;</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	/* create the CORBA user list to be passed to the backend */</div><div class='del'>-	len = g_list_length (users);</div><div class='del'>-</div><div class='del'>-	corba_list = GNOME_Evolution_Calendar_UserList__alloc ();</div><div class='del'>-	CORBA_sequence_set_release (corba_list, TRUE);</div><div class='del'>-	corba_list-&gt;_length = len;</div><div class='del'>-	corba_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_User_allocbuf (len);</div><div class='del'>-</div><div class='del'>-	for (l = g_list_first (users), i = 0; l; l = l-&gt;next, i++)</div><div class='del'>-		corba_list-&gt;_buffer[i] = CORBA_string_dup ((CORBA_char *) l-&gt;data);</div><div class='del'>-</div><div class='del'>-	/* call the method on the backend */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	calobj_list = GNOME_Evolution_Calendar_Cal_getFreeBusy (priv-&gt;cal, corba_list,</div><div class='del'>-								start, end, &amp;ev);</div><div class='del'>-	CORBA_free (corba_list);</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || !calobj_list) {</div><div class='del'>-		g_message ("cal_client_get_free_busy(): could not get the objects");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; calobj_list-&gt;_length; i++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-		icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-		icalcomp = icalparser_parse_string (calobj_list-&gt;_buffer[i]);</div><div class='del'>-		if (!icalcomp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		kind = icalcomponent_isa (icalcomp);</div><div class='del'>-		if (kind == ICAL_VFREEBUSY_COMPONENT) {</div><div class='del'>-			comp = cal_component_new ();</div><div class='del'>-			if (!cal_component_set_icalcomponent (comp, icalcomp)) {</div><div class='del'>-				icalcomponent_free (icalcomp);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			comp_list = g_list_append (comp_list, comp);</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			icalcomponent_free (icalcomp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	CORBA_free (calobj_list);</div><div class='del'>-</div><div class='del'>-	return comp_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is updated and we must update the copy we have */</div><div class='del'>-static void</div><div class='del'>-generate_instances_obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const char *comp_uid;</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = data;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (uid_comp_hash, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		/* OK, so we don't care about new objects that may indeed be in</div><div class='del'>-		 * the requested time range.  We only care about the ones that</div><div class='del'>-		 * were returned by the first query to</div><div class='del'>-		 * cal_client_get_objects_in_range().</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (uid_comp_hash, uid);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* The hash key comes from the component's internal data */</div><div class='del'>-		cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-		g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* No longer in the server, too bad */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting "</div><div class='del'>-			   "object `%s'; ignoring...", uid);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is removed and we must delete the copy we have */</div><div class='del'>-static void</div><div class='del'>-generate_instances_obj_removed_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = data;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (uid_comp_hash, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (uid_comp_hash, uid);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds a component to the list; called from g_hash_table_foreach() */</div><div class='del'>-static void</div><div class='del'>-add_component (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	GList **list;</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (value);</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a list of components that recur within the specified range of time.  It</div><div class='del'>- * ensures that the resulting list of CalComponent objects contains only objects</div><div class='del'>- * that are actually in the server at the time the initial</div><div class='del'>- * cal_client_get_objects_in_range() query ends.</div><div class='del'>- */</div><div class='del'>-static GList *</div><div class='del'>-get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	GList *uids;</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	GList *objects;</div><div class='del'>-	guint obj_updated_id;</div><div class='del'>-	guint obj_removed_id;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_objects_in_range (client, type, start, end);</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* While we are getting the actual object data, keep track of changes */</div><div class='del'>-</div><div class='del'>-	obj_updated_id = gtk_signal_connect (GTK_OBJECT (client), "obj_updated",</div><div class='del'>-					     GTK_SIGNAL_FUNC (generate_instances_obj_updated_cb),</div><div class='del'>-					     uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	obj_removed_id = gtk_signal_connect (GTK_OBJECT (client), "obj_removed",</div><div class='del'>-					     GTK_SIGNAL_FUNC (generate_instances_obj_removed_cb),</div><div class='del'>-					     uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	/* Get the objects */</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		char *uid;</div><div class='del'>-		const char *comp_uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			/* The hash key comes from the component's internal data</div><div class='del'>-			 * instead of the duped UID from the list of UIDS.</div><div class='del'>-			 */</div><div class='del'>-			cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-			g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-			/* Object disappeared from the server, so don't log it */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-			g_message ("get_objects_atomically(): Syntax error when getting "</div><div class='del'>-				   "object `%s'; ignoring...", uid);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	/* Now our state is consistent with the server, so disconnect from the</div><div class='del'>-	 * notification signals and generate the final list of components.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect (GTK_OBJECT (client), obj_updated_id);</div><div class='del'>-	gtk_signal_disconnect (GTK_OBJECT (client), obj_removed_id);</div><div class='del'>-</div><div class='del'>-	objects = NULL;</div><div class='del'>-	g_hash_table_foreach (uid_comp_hash, add_component, &amp;objects);</div><div class='del'>-	g_hash_table_destroy (uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	return objects;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct comp_instance {</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Called from cal_recur_generate_instances(); adds an instance to the list */</div><div class='del'>-static gboolean</div><div class='del'>-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GList **list;</div><div class='del'>-	struct comp_instance *ci;</div><div class='del'>-</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	ci = g_new (struct comp_instance, 1);</div><div class='del'>-</div><div class='del'>-	ci-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ci-&gt;comp));</div><div class='del'>-	</div><div class='del'>-	ci-&gt;start = start;</div><div class='del'>-	ci-&gt;end = end;</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, ci);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_list_sort(); compares two struct comp_instance structures */</div><div class='del'>-static gint</div><div class='del'>-compare_comp_instance (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const struct comp_instance *cia, *cib;</div><div class='del'>-	time_t diff;</div><div class='del'>-</div><div class='del'>-	cia = a;</div><div class='del'>-	cib = b;</div><div class='del'>-</div><div class='del'>-	diff = cia-&gt;start - cib-&gt;start;</div><div class='del'>-	return (diff &lt; 0) ? -1 : (diff &gt; 0) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_generate_instances:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * @cb: Callback for each generated instance.</div><div class='del'>- * @cb_data: Closure data for the callback.</div><div class='del'>- * </div><div class='del'>- * Does a combination of cal_client_get_objects_in_range() and</div><div class='del'>- * cal_recur_generate_instances().  It fetches the list of objects in an atomic</div><div class='del'>- * way so that the generated instances are actually in the server at the time</div><div class='del'>- * the initial cal_client_get_objects_in_range() query ends.</div><div class='del'>- *</div><div class='del'>- * The callback function should do a gtk_object_ref() of the calendar component</div><div class='del'>- * it gets passed if it intends to keep it around.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_client_generate_instances (CalClient *client, CalObjType type,</div><div class='del'>-			       time_t start, time_t end,</div><div class='del'>-			       CalRecurInstanceFn cb, gpointer cb_data)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	GList *objects;</div><div class='del'>-	GList *instances;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (start != -1 &amp;&amp; end != -1);</div><div class='del'>-	g_return_if_fail (start &lt;= end);</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	/* Generate objects */</div><div class='del'>-</div><div class='del'>-	objects = get_objects_atomically (client, type, start, end);</div><div class='del'>-	instances = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = objects; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = l-&gt;data;</div><div class='del'>-		cal_recur_generate_instances (comp, start, end, add_instance, &amp;instances,</div><div class='del'>-					      cal_client_resolve_tzid_cb, client,</div><div class='del'>-					      priv-&gt;default_zone);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (objects);</div><div class='del'>-</div><div class='del'>-	/* Generate instances and spew them out */</div><div class='del'>-</div><div class='del'>-	instances = g_list_sort (instances, compare_comp_instance);</div><div class='del'>-</div><div class='del'>-	for (l = instances; l; l = l-&gt;next) {</div><div class='del'>-		struct comp_instance *ci;</div><div class='del'>-		gboolean result;</div><div class='del'>-		</div><div class='del'>-		ci = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		result = (* cb) (ci-&gt;comp, ci-&gt;start, ci-&gt;end, cb_data);</div><div class='del'>-</div><div class='del'>-		if (!result)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	for (l = instances; l; l = l-&gt;next) {</div><div class='del'>-		struct comp_instance *ci;</div><div class='del'>-</div><div class='del'>-		ci = l-&gt;data;</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ci-&gt;comp));</div><div class='del'>-		g_free (ci);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (instances);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of CalAlarmInstance structures */</div><div class='del'>-static GSList *</div><div class='del'>-build_alarm_instance_list (CalComponent *comp, GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GSList *alarms;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	alarms = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-		const char *auid;</div><div class='del'>-		CalAlarmInstance *instance;</div><div class='del'>-</div><div class='del'>-		corba_instance = seq-&gt;_buffer + i;</div><div class='del'>-</div><div class='del'>-		/* Since we want the in-commponent auid, we look for the alarm</div><div class='del'>-		 * in the component and fetch its "real" auid.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		alarm = cal_component_get_alarm (comp, corba_instance-&gt;auid);</div><div class='del'>-		if (!alarm)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		auid = cal_component_alarm_get_uid (alarm);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-		instance = g_new (CalAlarmInstance, 1);</div><div class='del'>-		instance-&gt;auid = auid;</div><div class='del'>-		instance-&gt;trigger = corba_instance-&gt;trigger;</div><div class='del'>-		instance-&gt;occur_start = corba_instance-&gt;occur_start;</div><div class='del'>-		instance-&gt;occur_end = corba_instance-&gt;occur_end;</div><div class='del'>-</div><div class='del'>-		alarms = g_slist_prepend (alarms, instance);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_slist_reverse (alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of CalComponentAlarms structures */</div><div class='del'>-static GSList *</div><div class='del'>-build_component_alarms_list (GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GSList *comp_alarms;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	comp_alarms = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalComponentAlarms *alarms;</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-		corba_alarms = seq-&gt;_buffer + i;</div><div class='del'>-</div><div class='del'>-		icalcomp = icalparser_parse_string (corba_alarms-&gt;calobj);</div><div class='del'>-		if (!icalcomp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		if (!cal_component_set_icalcomponent (comp, icalcomp)) {</div><div class='del'>-			icalcomponent_free (icalcomp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		alarms = g_new (CalComponentAlarms, 1);</div><div class='del'>-		alarms-&gt;comp = comp;</div><div class='del'>-		alarms-&gt;alarms = build_alarm_instance_list (comp, &amp;corba_alarms-&gt;alarms);</div><div class='del'>-</div><div class='del'>-		comp_alarms = g_slist_prepend (comp_alarms, alarms);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return comp_alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_alarms_in_range:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for the alarms that trigger in the specified range of</div><div class='del'>- * time.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of #CalComponentAlarms structures.  This should be freed</div><div class='del'>- * using the cal_client_free_alarms() function, or by freeing each element</div><div class='del'>- * separately with cal_component_alarms_free() and then freeing the list with</div><div class='del'>- * g_slist_free().</div><div class='del'>- **/</div><div class='del'>-GSList *</div><div class='del'>-cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;</div><div class='del'>-	GSList *alarms;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_Cal_getAlarmsInRange (priv-&gt;cal, start, end, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	alarms = build_component_alarms_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_free_alarms:</div><div class='del'>- * @comp_alarms: A list of #CalComponentAlarms structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of #CalComponentAlarms structures as returned by</div><div class='del'>- * cal_client_get_alarms_in_range().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_client_free_alarms (GSList *comp_alarms)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = comp_alarms; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-		alarms = l-&gt;data;</div><div class='del'>-		g_assert (alarms != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_alarms_free (alarms);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (comp_alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_alarms_for_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @uid: Unique identifier for a calendar component.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * @alarms: Return value for the component's alarm instances.  Will return NULL</div><div class='del'>- * if no instances occur within the specified time range.  This should be freed</div><div class='del'>- * using the cal_component_alarms_free() function.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for the alarms of a particular object that trigger in the</div><div class='del'>- * specified range of time.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE if the object was not found.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_get_alarms_for_object (CalClient *client, const char *uid,</div><div class='del'>-				  time_t start, time_t end,</div><div class='del'>-				  CalComponentAlarms **alarms)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;</div><div class='del'>-	gboolean retval;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, FALSE);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, FALSE);</div><div class='del'>-	g_return_val_if_fail (alarms != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	*alarms = NULL;</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	corba_alarms = GNOME_Evolution_Calendar_Cal_getAlarmsForObject (priv-&gt;cal, (char *) uid,</div><div class='del'>-									start, end, &amp;ev);</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse_string (corba_alarms-&gt;calobj);</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>-	*alarms = g_new (CalComponentAlarms, 1);</div><div class='del'>-	(*alarms)-&gt;comp = comp;</div><div class='del'>-	(*alarms)-&gt;alarms = build_alarm_instance_list (comp, &amp;corba_alarms-&gt;alarms);</div><div class='del'>-	CORBA_free (corba_alarms);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct _ForeachTZIDCallbackData ForeachTZIDCallbackData;</div><div class='del'>-struct _ForeachTZIDCallbackData {</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GHashTable *timezone_hash;</div><div class='del'>-	gboolean include_all_timezones;</div><div class='del'>-	gboolean success;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This adds the VTIMEZONE given by the TZID parameter to the GHashTable in</div><div class='del'>-   data. */</div><div class='del'>-static void</div><div class='del'>-foreach_tzid_callback (icalparameter *param, void *cbdata)</div><div class='del'>-{</div><div class='del'>-	ForeachTZIDCallbackData *data = cbdata;</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	const char *tzid;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	icalcomponent *vtimezone_comp;</div><div class='del'>-	char *vtimezone_as_string;</div><div class='del'>-</div><div class='del'>-	priv = data-&gt;client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Get the TZID string from the parameter. */</div><div class='del'>-	tzid = icalparameter_get_tzid (param);</div><div class='del'>-	if (!tzid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Check if we've already added it to the GHashTable. */</div><div class='del'>-	if (g_hash_table_lookup (data-&gt;timezone_hash, tzid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (data-&gt;include_all_timezones) {</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_timezone (data-&gt;client, tzid, &amp;zone);</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-			data-&gt;success = FALSE;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Check if it is in our cache. If it is, it must already be</div><div class='del'>-		   on the server so return. */</div><div class='del'>-		if (g_hash_table_lookup (priv-&gt;timezones, tzid))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* Check if it is a builtin timezone. If it isn't, return. */</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-		if (!zone)</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert it to a string and add it to the hash. */</div><div class='del'>-	vtimezone_comp = icaltimezone_get_component (zone);</div><div class='del'>-	if (!vtimezone_comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	vtimezone_as_string = icalcomponent_as_ical_string (vtimezone_comp);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (data-&gt;timezone_hash, (char*) tzid,</div><div class='del'>-			     g_strdup (vtimezone_as_string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This appends the value string to the GString given in data. */</div><div class='del'>-static void</div><div class='del'>-append_timezone_string (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GString *vcal_string = data;</div><div class='del'>-</div><div class='del'>-	g_string_append (vcal_string, value);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This simply frees the hash values. */</div><div class='del'>-static void</div><div class='del'>-free_timezone_string (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This converts the VEVENT/VTODO to a string. If include_all_timezones is</div><div class='del'>-   TRUE, it includes all the VTIMEZONE components needed for the VEVENT/VTODO.</div><div class='del'>-   If not, it only includes builtin timezones that may not be on the server.</div><div class='del'>-</div><div class='del'>-   To do that we check every TZID in the component to see if it is a builtin</div><div class='del'>-   timezone. If it is, we see if it it in our cache. If it is in our cache,</div><div class='del'>-   then we know the server already has it and we don't need to send it.</div><div class='del'>-   If it isn't in our cache, then we need to send it to the server.</div><div class='del'>-   If we need to send any timezones to the server, then we have to create a</div><div class='del'>-   complete VCALENDAR object, otherwise we can just send a single VEVENT/VTODO</div><div class='del'>-   as before. */</div><div class='del'>-static char*</div><div class='del'>-cal_client_get_component_as_string_internal (CalClient *client,</div><div class='del'>-					     CalComponent *comp,</div><div class='del'>-					     gboolean include_all_timezones)</div><div class='del'>-{</div><div class='del'>-	GHashTable *timezone_hash;</div><div class='del'>-	GString *vcal_string;</div><div class='del'>-	int initial_vcal_string_len;</div><div class='del'>-	ForeachTZIDCallbackData cbdata;</div><div class='del'>-	char *obj_string;</div><div class='del'>-</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	timezone_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* Add any timezones needed to the hash. We use a hash since we only</div><div class='del'>-	   want to add each timezone once at most. */</div><div class='del'>-	cbdata.client = client;</div><div class='del'>-	cbdata.timezone_hash = timezone_hash;</div><div class='del'>-	cbdata.include_all_timezones = include_all_timezones;</div><div class='del'>-	cbdata.success = TRUE;</div><div class='del'>-	icalcomponent_foreach_tzid (cal_component_get_icalcomponent (comp),</div><div class='del'>-				    foreach_tzid_callback, &amp;cbdata);</div><div class='del'>-	if (!cbdata.success) {</div><div class='del'>-		g_hash_table_foreach (timezone_hash, free_timezone_string,</div><div class='del'>-				      NULL);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create the start of a VCALENDAR, to add the VTIMEZONES to,</div><div class='del'>-	   and remember its length so we know if any VTIMEZONEs get added. */</div><div class='del'>-	vcal_string = g_string_new (NULL);</div><div class='del'>-	g_string_append (vcal_string,</div><div class='del'>-			 "BEGIN:VCALENDAR\n"</div><div class='del'>-			 "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"</div><div class='del'>-			 "VERSION:2.0\n"</div><div class='del'>-			 "METHOD:PUBLISH\n");</div><div class='del'>-	initial_vcal_string_len = vcal_string-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* Now concatenate all the timezone strings. This also frees the</div><div class='del'>-	   timezone strings as it goes. */</div><div class='del'>-	g_hash_table_foreach (timezone_hash, append_timezone_string,</div><div class='del'>-			      vcal_string);</div><div class='del'>-</div><div class='del'>-	/* Get the string for the VEVENT/VTODO. */</div><div class='del'>-	obj_string = cal_component_get_as_string (comp);</div><div class='del'>-</div><div class='del'>-	/* If there were any timezones to send, create a complete VCALENDAR,</div><div class='del'>-	   else just send the VEVENT/VTODO string. */</div><div class='del'>-	if (!include_all_timezones</div><div class='del'>-	    &amp;&amp; vcal_string-&gt;len == initial_vcal_string_len) {</div><div class='del'>-		g_string_free (vcal_string, TRUE);</div><div class='del'>-	} else {</div><div class='del'>-		g_string_append (vcal_string, obj_string);</div><div class='del'>-		g_string_append (vcal_string, "END:VCALENDAR\n");</div><div class='del'>-		g_free (obj_string);</div><div class='del'>-		obj_string = vcal_string-&gt;str;</div><div class='del'>-		g_string_free (vcal_string, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (timezone_hash);</div><div class='del'>-</div><div class='del'>-	return obj_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_component_as_string:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Gets a calendar component as an iCalendar string, with a toplevel</div><div class='del'>- * VCALENDAR component and all VTIMEZONEs needed for the component.</div><div class='del'>- *</div><div class='del'>- * Return value: the component as a complete iCalendar string, or NULL on</div><div class='del'>- * failure. The string should be freed after use.</div><div class='del'>- **/</div><div class='del'>-char*</div><div class='del'>-cal_client_get_component_as_string (CalClient *client,</div><div class='del'>-				    CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	return cal_client_get_component_as_string_internal (client, comp,</div><div class='del'>-							    TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_update_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Asks a calendar to update a component.  Any existing component with the</div><div class='del'>- * specified component's UID will be replaced.  The client program should not</div><div class='del'>- * assume that the object is actually in the server's storage until it has</div><div class='del'>- * received the "obj_updated" notification signal.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on specifying an invalid component.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_update_object (CalClient *client, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean retval;</div><div class='del'>-	char *obj_string;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	obj_string = cal_client_get_component_as_string_internal (client,</div><div class='del'>-								  comp, FALSE);</div><div class='del'>-	if (obj_string == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_updateObjects (priv-&gt;cal, obj_string, &amp;ev);</div><div class='del'>-	g_free (obj_string);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))</div><div class='del'>-	    goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_update_object(): could not update the object");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_update_objects:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @icalcomp: A toplevel VCALENDAR libical component.</div><div class='del'>- *</div><div class='del'>- * Asks a calendar to add or update one or more components, possibly including</div><div class='del'>- * VTIMEZONE data.  Any existing components with the same UIDs will be</div><div class='del'>- * replaced. The VTIMEZONE data will be compared to existing VTIMEZONEs in</div><div class='del'>- * the calendar, and the VTIMEZONEs may possibly be renamed, as well as all</div><div class='del'>- * references to them throughout the VCALENDAR.</div><div class='del'>- *</div><div class='del'>- * The client program should not assume that the objects are actually in the</div><div class='del'>- * server's storage until it has received the "obj_updated" notification</div><div class='del'>- * signal.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on specifying an invalid component.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_update_objects (CalClient *client, icalcomponent *icalcomp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean retval;</div><div class='del'>-	char *obj_string;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED,</div><div class='del'>-			      FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Libical owns this memory, using one of its temporary buffers. */</div><div class='del'>-	obj_string = icalcomponent_as_ical_string (icalcomp);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_updateObjects (priv-&gt;cal, obj_string, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_update_objects(): could not update the objects");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_remove_object:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @uid: Unique identifier of the calendar component to remove.</div><div class='del'>- * </div><div class='del'>- * Asks a calendar to remove a component.  If the server is able to remove the</div><div class='del'>- * component, all clients will be notified and they will emit the "obj_removed"</div><div class='del'>- * signal.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE on specifying a UID for a component that</div><div class='del'>- * is not in the server.  Returning FALSE is normal; the object may have</div><div class='del'>- * disappeared from the server before the client has had a chance to receive the</div><div class='del'>- * corresponding notification.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_remove_object (CalClient *client, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_removeObject (priv-&gt;cal, (char *) uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev,  ex_GNOME_Evolution_Calendar_Cal_NotFound))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_remove_object(): could not remove the object");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_query:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @sexp: S-expression representing the query.</div><div class='del'>- * </div><div class='del'>- * Creates a live query object from a loaded calendar.</div><div class='del'>- * </div><div class='del'>- * Return value: A query object that will emit notification signals as calendar</div><div class='del'>- * components are added and removed from the query in the server.</div><div class='del'>- **/</div><div class='del'>-CalQuery *</div><div class='del'>-cal_client_get_query (CalClient *client, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (sexp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return cal_query_new (priv-&gt;cal, sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This ensures that the given timezone is on the server. We use this to pass</div><div class='del'>-   the default timezone to the server, so it can resolve DATE and floating</div><div class='del'>-   DATE-TIME values into specific times. (Most of our IDL interface uses</div><div class='del'>-   time_t values to pass specific times from the server to the client.) */</div><div class='del'>-static gboolean</div><div class='del'>-cal_client_ensure_timezone_on_server (CalClient *client, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	char *tzid, *obj_string;</div><div class='del'>-	icaltimezone *tmp_zone;</div><div class='del'>-	GString *vcal_string;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-	icalcomponent *vtimezone_comp;</div><div class='del'>-	char *vtimezone_as_string;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the zone is NULL or UTC we don't need to do anything. */</div><div class='del'>-	if (!zone)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (tzid, "UTC"))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* See if we already have it in the cache. If we do, it must be on</div><div class='del'>-	   the server already. */</div><div class='del'>-	tmp_zone = g_hash_table_lookup (priv-&gt;timezones, tzid);</div><div class='del'>-	if (tmp_zone)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* Now we have to send it to the server, in case it doesn't already</div><div class='del'>-	   have it. */</div><div class='del'>-</div><div class='del'>-	vcal_string = g_string_new (NULL);</div><div class='del'>-	g_string_append (vcal_string,</div><div class='del'>-			 "BEGIN:VCALENDAR\n"</div><div class='del'>-			 "PRODID:-//Ximian//NONSGML Evolution Calendar//EN\n"</div><div class='del'>-			 "VERSION:2.0\n");</div><div class='del'>-</div><div class='del'>-	/* Convert the timezone to a string and add it. */</div><div class='del'>-	vtimezone_comp = icaltimezone_get_component (zone);</div><div class='del'>-	if (!vtimezone_comp) {</div><div class='del'>-		g_string_free (vcal_string, TRUE);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We don't need to free this string as libical owns it. */</div><div class='del'>-	vtimezone_as_string = icalcomponent_as_ical_string (vtimezone_comp);</div><div class='del'>-	g_string_append (vcal_string, vtimezone_as_string);</div><div class='del'>-</div><div class='del'>-	g_string_append (vcal_string, "END:VCALENDAR\n");</div><div class='del'>-</div><div class='del'>-	obj_string = vcal_string-&gt;str;</div><div class='del'>-	g_string_free (vcal_string, FALSE);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_updateObjects (priv-&gt;cal, obj_string, &amp;ev);</div><div class='del'>-	g_free (obj_string);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject))</div><div class='del'>-	    goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_ensure_timezone_on_server(): could not add the timezone to the server");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_client_set_default_timezone (CalClient *client, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	const char *tzid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-	g_return_val_if_fail (zone != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == CAL_CLIENT_LOAD_LOADED,</div><div class='del'>-			      FALSE);</div><div class='del'>-</div><div class='del'>-	/* Make sure the server has the VTIMEZONE data. */</div><div class='del'>-	if (!cal_client_ensure_timezone_on_server (client, zone))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Now set the default timezone on the server. */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-	GNOME_Evolution_Calendar_Cal_setDefaultTimezone (priv-&gt;cal,</div><div class='del'>-							 (char *) tzid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_NotFound))</div><div class='del'>-		goto out;</div><div class='del'>-	else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_client_set_default_timezone(): could not set the default timezone");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = TRUE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;default_zone = zone;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h<br/>deleted file mode 100644<br/>index a362059f3a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,183 +0,0 @@</div><div class='del'>-/* Evolution calendar client</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_CLIENT_H</div><div class='del'>-#define CAL_CLIENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-util.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-query.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_CLIENT_TYPE            (cal_client_get_type ())</div><div class='del'>-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))</div><div class='del'>-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))</div><div class='del'>-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))</div><div class='del'>-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalClient CalClient;</div><div class='del'>-typedef struct _CalClientClass CalClientClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalClientPrivate CalClientPrivate;</div><div class='del'>-</div><div class='del'>-/* Open status for the cal_opened signal */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_OPEN_SUCCESS,</div><div class='del'>-	CAL_CLIENT_OPEN_ERROR,</div><div class='del'>-	CAL_CLIENT_OPEN_NOT_FOUND,</div><div class='del'>-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED</div><div class='del'>-} CalClientOpenStatus;</div><div class='del'>-</div><div class='del'>-/* Set mode status for the cal_client_set_mode function */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_SET_MODE_SUCCESS,</div><div class='del'>-	CAL_CLIENT_SET_MODE_ERROR,</div><div class='del'>-	CAL_CLIENT_SET_MODE_NOT_SUPPORTED</div><div class='del'>-} CalClientSetModeStatus;</div><div class='del'>-</div><div class='del'>-/* Get status for the cal_client_get_object() function */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_GET_SUCCESS,</div><div class='del'>-	CAL_CLIENT_GET_NOT_FOUND,</div><div class='del'>-	CAL_CLIENT_GET_SYNTAX_ERROR</div><div class='del'>-} CalClientGetStatus;</div><div class='del'>-</div><div class='del'>-/* Whether the client is not loaded, is being loaded, or is already loaded */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_LOAD_NOT_LOADED,</div><div class='del'>-	CAL_CLIENT_LOAD_LOADING,</div><div class='del'>-	CAL_CLIENT_LOAD_LOADED</div><div class='del'>-} CalClientLoadState;</div><div class='del'>-</div><div class='del'>-struct _CalClient {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalClientClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* cal_opened) (CalClient *client, CalClientOpenStatus status);</div><div class='del'>-	void (* cal_set_mode) (CalClient *client, CalClientSetModeStatus status, CalMode mode);</div><div class='del'>-	</div><div class='del'>-	void (* obj_updated) (CalClient *client, const char *uid);</div><div class='del'>-	void (* obj_removed) (CalClient *client, const char *uid);</div><div class='del'>-</div><div class='del'>-	void (* categories_changed) (CalClient *client, GPtrArray *categories);</div><div class='del'>-</div><div class='del'>-	void (* forget_password) (CalClient *client, const char *key);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef gchar * (* CalClientAuthFunc) (CalClient *client,</div><div class='del'>-                                      const gchar *prompt,</div><div class='del'>-                                      const gchar *key,</div><div class='del'>-                                      gpointer user_data);</div><div class='del'>-</div><div class='del'>-GtkType cal_client_get_type (void);</div><div class='del'>-</div><div class='del'>-CalClient *cal_client_construct (CalClient *client);</div><div class='del'>-</div><div class='del'>-CalClient *cal_client_new (void);</div><div class='del'>-</div><div class='del'>-void cal_client_set_auth_func (CalClient *client, CalClientAuthFunc func, gpointer data);</div><div class='del'>-</div><div class='del'>-/* Sets the default timezone to use to resolve DATE and floating DATE-TIME</div><div class='del'>-   values. This will typically be from the user's timezone setting. Call this</div><div class='del'>-   before using any other functions. It will pass the default timezone on to</div><div class='del'>-   the server. Returns TRUE on success. */</div><div class='del'>-gboolean cal_client_set_default_timezone (CalClient *client, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-gboolean cal_client_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exists);</div><div class='del'>-gboolean cal_client_open_default_calendar (CalClient *client, gboolean only_if_exists);</div><div class='del'>-gboolean cal_client_open_default_tasks (CalClient *client, gboolean only_if_exists);</div><div class='del'>-</div><div class='del'>-GList *cal_client_uri_list (CalClient *client, CalMode mode);</div><div class='del'>-</div><div class='del'>-CalClientLoadState cal_client_get_load_state (CalClient *client);</div><div class='del'>-</div><div class='del'>-const char *cal_client_get_uri (CalClient *client);</div><div class='del'>-</div><div class='del'>-gboolean cal_client_set_mode (CalClient *client, CalMode mode);</div><div class='del'>-</div><div class='del'>-int cal_client_get_n_objects (CalClient *client, CalObjType type);</div><div class='del'>-</div><div class='del'>-CalClientGetStatus cal_client_get_object (CalClient *client,</div><div class='del'>-					  const char *uid,</div><div class='del'>-					  CalComponent **comp);</div><div class='del'>-</div><div class='del'>-CalClientGetStatus cal_client_get_timezone (CalClient *client,</div><div class='del'>-					    const char *tzid,</div><div class='del'>-					    icaltimezone **zone);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_uids (CalClient *client, CalObjType type);</div><div class='del'>-GList *cal_client_get_changes (CalClient *client, CalObjType type, const char *change_id);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,</div><div class='del'>-					time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_free_busy (CalClient *client, GList *users,</div><div class='del'>-				 time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-void cal_client_generate_instances (CalClient *client, CalObjType type,</div><div class='del'>-				    time_t start, time_t end,</div><div class='del'>-				    CalRecurInstanceFn cb, gpointer cb_data);</div><div class='del'>-</div><div class='del'>-GSList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-void cal_client_free_alarms (GSList *comp_alarms);</div><div class='del'>-</div><div class='del'>-gboolean cal_client_get_alarms_for_object (CalClient *client, const char *uid,</div><div class='del'>-					   time_t start, time_t end,</div><div class='del'>-					   CalComponentAlarms **alarms);</div><div class='del'>-</div><div class='del'>-/* Add or update a single object. When adding an object only builtin timezones</div><div class='del'>-   are allowed. To use external VTIMEZONE data call update_objects() instead.*/</div><div class='del'>-gboolean cal_client_update_object (CalClient *client, CalComponent *comp);</div><div class='del'>-</div><div class='del'>-/* Add or update multiple objects, possibly including VTIMEZONE data. */</div><div class='del'>-gboolean cal_client_update_objects (CalClient *client, icalcomponent *icalcomp);</div><div class='del'>-</div><div class='del'>-gboolean cal_client_remove_object (CalClient *client, const char *uid);</div><div class='del'>-</div><div class='del'>-CalQuery *cal_client_get_query (CalClient *client, const char *sexp);</div><div class='del'>-</div><div class='del'>-/* Resolves TZIDs for the recurrence generator. */</div><div class='del'>-icaltimezone *cal_client_resolve_tzid_cb (const char *tzid, gpointer data);</div><div class='del'>-</div><div class='del'>-/* Returns a complete VCALENDAR for a VEVENT/VTODO including all VTIMEZONEs</div><div class='del'>-   used by the component. It also includes a 'METHOD:PUBLISH' property. */</div><div class='del'>-char* cal_client_get_component_as_string (CalClient *client,</div><div class='del'>-					  CalComponent *comp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c<br/>deleted file mode 100644<br/>index c3fe31e60d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,364 +0,0 @@</div><div class='del'>-/* Evolution calendar listener</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "cal-listener.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalListener structure */</div><div class='del'>-struct CalListenerPrivate {</div><div class='del'>-	/* Notification functions and their closure data */</div><div class='del'>-	CalListenerCalOpenedFn cal_opened_fn;</div><div class='del'>-	CalListenerCalSetModeFn cal_set_mode_fn;</div><div class='del'>-	CalListenerObjUpdatedFn obj_updated_fn;</div><div class='del'>-	CalListenerObjRemovedFn obj_removed_fn;</div><div class='del'>-	CalListenerCategoriesChangedFn categories_changed_fn;</div><div class='del'>-	gpointer fn_data;</div><div class='del'>-</div><div class='del'>-	/* Whether notification is desired */</div><div class='del'>-	gboolean notify : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_listener_class_init (CalListenerClass *class);</div><div class='del'>-static void cal_listener_init (CalListener *listener);</div><div class='del'>-static void cal_listener_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void impl_notifyCalOpened (PortableServer_Servant servant,</div><div class='del'>-				  GNOME_Evolution_Calendar_Listener_OpenStatus status,</div><div class='del'>-				  GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-				  CORBA_Environment *ev);</div><div class='del'>-static void impl_notifyCalSetMode (PortableServer_Servant servant,</div><div class='del'>-				   GNOME_Evolution_Calendar_Listener_SetModeStatus status,</div><div class='del'>-				   GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-				   CORBA_Environment *ev);</div><div class='del'>-static void impl_notifyObjUpdated (PortableServer_Servant servant,</div><div class='del'>-				   GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-				   CORBA_Environment *ev);</div><div class='del'>-static void impl_notifyObjRemoved (PortableServer_Servant servant,</div><div class='del'>-				   GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-				   CORBA_Environment *ev);</div><div class='del'>-static void impl_notifyCategoriesChanged (PortableServer_Servant servant,</div><div class='del'>-					  const GNOME_Evolution_Calendar_StringSeq *categories,</div><div class='del'>-					  CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (CalListener,</div><div class='del'>-			 GNOME_Evolution_Calendar_Listener,</div><div class='del'>-			 BONOBO_X_OBJECT_TYPE,</div><div class='del'>-			 cal_listener);</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar listener */</div><div class='del'>-static void</div><div class='del'>-cal_listener_class_init (CalListenerClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	class-&gt;epv.notifyCalOpened = impl_notifyCalOpened;</div><div class='del'>-	class-&gt;epv.notifyCalSetMode = impl_notifyCalSetMode;</div><div class='del'>-	class-&gt;epv.notifyObjUpdated = impl_notifyObjUpdated;</div><div class='del'>-	class-&gt;epv.notifyObjRemoved = impl_notifyObjRemoved;</div><div class='del'>-	class-&gt;epv.notifyCategoriesChanged = impl_notifyCategoriesChanged;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_listener_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar listener */</div><div class='del'>-static void</div><div class='del'>-cal_listener_init (CalListener *listener)</div><div class='del'>-{</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalListenerPrivate, 1);</div><div class='del'>-	listener-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cal_opened_fn = NULL;</div><div class='del'>-	priv-&gt;obj_updated_fn = NULL;</div><div class='del'>-	priv-&gt;obj_removed_fn = NULL;</div><div class='del'>-	priv-&gt;categories_changed_fn = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar listener */</div><div class='del'>-static void</div><div class='del'>-cal_listener_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_LISTENER (object));</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (object);</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cal_opened_fn = NULL;</div><div class='del'>-	priv-&gt;obj_updated_fn = NULL;</div><div class='del'>-	priv-&gt;obj_removed_fn = NULL;</div><div class='del'>-	priv-&gt;categories_changed_fn = NULL;</div><div class='del'>-	priv-&gt;fn_data = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = FALSE;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	listener-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA servant implementation */</div><div class='del'>-</div><div class='del'>-/* ::notifyCalOpened method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyCalOpened (PortableServer_Servant servant,</div><div class='del'>-		      GNOME_Evolution_Calendar_Listener_OpenStatus status,</div><div class='del'>-		      GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-	CORBA_Environment aev;</div><div class='del'>-	GNOME_Evolution_Calendar_Cal cal_copy;</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;aev);</div><div class='del'>-	cal_copy = CORBA_Object_duplicate (cal, &amp;aev);</div><div class='del'>-</div><div class='del'>-	if (aev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("Listener_notifyCalOpened(): could not duplicate the calendar");</div><div class='del'>-		CORBA_exception_free (&amp;aev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;aev);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;cal_opened_fn != NULL);</div><div class='del'>-	(* priv-&gt;cal_opened_fn) (listener, status, cal, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyCalSetMode method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyCalSetMode (PortableServer_Servant servant,</div><div class='del'>-		       GNOME_Evolution_Calendar_Listener_SetModeStatus status,</div><div class='del'>-		       GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-		       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;cal_set_mode_fn != NULL);</div><div class='del'>-	(* priv-&gt;cal_set_mode_fn) (listener, status, mode, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyObjUpdated method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyObjUpdated (PortableServer_Servant servant,</div><div class='del'>-		       GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;obj_updated_fn != NULL);</div><div class='del'>-	(* priv-&gt;obj_updated_fn) (listener, uid, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyObjRemoved method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyObjRemoved (PortableServer_Servant servant,</div><div class='del'>-		       GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;obj_removed_fn != NULL);</div><div class='del'>-	(* priv-&gt;obj_removed_fn) (listener, uid, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyCategoriesChanged method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyCategoriesChanged (PortableServer_Servant servant,</div><div class='del'>-			      const GNOME_Evolution_Calendar_StringSeq *categories,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;categories_changed_fn != NULL);</div><div class='del'>-	(* priv-&gt;categories_changed_fn) (listener, categories, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_construct:</div><div class='del'>- * @listener: A calendar listener.</div><div class='del'>- * @cal_opened_fn: Function that will be called to notify that a calendar was</div><div class='del'>- * opened.</div><div class='del'>- * @obj_updated_fn: Function that will be called to notify that an object in the</div><div class='del'>- * calendar was updated.</div><div class='del'>- * @obj_removed_fn: Function that will be called to notify that an object in the</div><div class='del'>- * calendar was removed.</div><div class='del'>- * @categories_changed_fn: Function that will be called to notify that the list</div><div class='del'>- * of categories that are present in the calendar's objects has changed.</div><div class='del'>- * @fn_data: Closure data pointer that will be passed to the notification</div><div class='del'>- * functions.</div><div class='del'>- *</div><div class='del'>- * Constructs a calendar listener by setting the callbacks that it will use for</div><div class='del'>- * notification from the calendar server.</div><div class='del'>- *</div><div class='del'>- * Return value: the same object as the @listener argument.</div><div class='del'>- **/</div><div class='del'>-CalListener *</div><div class='del'>-cal_listener_construct (CalListener *listener,</div><div class='del'>-			CalListenerCalOpenedFn cal_opened_fn,</div><div class='del'>-			CalListenerCalSetModeFn cal_set_mode_fn,</div><div class='del'>-			CalListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-			CalListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-			CalListenerCategoriesChangedFn categories_changed_fn,</div><div class='del'>-			gpointer fn_data)</div><div class='del'>-{</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);</div><div class='del'>-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);</div><div class='del'>- 	g_return_val_if_fail (cal_set_mode_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (categories_changed_fn != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cal_opened_fn = cal_opened_fn;</div><div class='del'>-	priv-&gt;cal_set_mode_fn = cal_set_mode_fn;</div><div class='del'>-	priv-&gt;obj_updated_fn = obj_updated_fn;</div><div class='del'>-	priv-&gt;obj_removed_fn = obj_removed_fn;</div><div class='del'>-	priv-&gt;categories_changed_fn = categories_changed_fn;</div><div class='del'>-	priv-&gt;fn_data = fn_data;</div><div class='del'>-</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_new:</div><div class='del'>- * @cal_opened_fn: Function that will be called to notify that a calendar was</div><div class='del'>- * opened.</div><div class='del'>- * @obj_updated_fn: Function that will be called to notify that an object in the</div><div class='del'>- * calendar was updated.</div><div class='del'>- * @obj_removed_fn: Function that will be called to notify that an object in the</div><div class='del'>- * calendar was removed.</div><div class='del'>- * @categories_changed_fn: Function that will be called to notify that the list</div><div class='del'>- * of categories that are present in the calendar's objects has changed.</div><div class='del'>- * @fn_data: Closure data pointer that will be passed to the notification</div><div class='del'>- * functions.</div><div class='del'>- *</div><div class='del'>- * Creates a new #CalListener object.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created #CalListener object.</div><div class='del'>- **/</div><div class='del'>-CalListener *</div><div class='del'>-cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,</div><div class='del'>-		  CalListenerCalSetModeFn cal_set_mode_fn,</div><div class='del'>-		  CalListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-		  CalListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-		  CalListenerCategoriesChangedFn categories_changed_fn,</div><div class='del'>-		  gpointer fn_data)</div><div class='del'>-{</div><div class='del'>-	CalListener *listener;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal_opened_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (categories_changed_fn != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (CAL_LISTENER_TYPE);</div><div class='del'>-	return cal_listener_construct (listener,</div><div class='del'>-				       cal_opened_fn,</div><div class='del'>-				       cal_set_mode_fn,</div><div class='del'>-				       obj_updated_fn,</div><div class='del'>-				       obj_removed_fn,</div><div class='del'>-				       categories_changed_fn,</div><div class='del'>-				       fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_listener_stop_notification:</div><div class='del'>- * @listener: A calendar listener.</div><div class='del'>- * </div><div class='del'>- * Informs a calendar listener that no further notification is desired.  The</div><div class='del'>- * callbacks specified when the listener was created will no longer be invoked</div><div class='del'>- * after this function is called.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_listener_stop_notification (CalListener *listener)</div><div class='del'>-{</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (listener != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_LISTENER (listener));</div><div class='del'>-</div><div class='del'>-	priv = listener-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;notify != FALSE);</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h<br/>deleted file mode 100644<br/>index c7488e6e97..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* Evolution calendar listener</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_LISTENER_H</div><div class='del'>-#define CAL_LISTENER_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_LISTENER_TYPE            (cal_listener_get_type ())</div><div class='del'>-#define CAL_LISTENER(obj)            (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener))</div><div class='del'>-#define CAL_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE,	\</div><div class='del'>-				      CalListenerClass))</div><div class='del'>-#define IS_CAL_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE))</div><div class='del'>-#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct CalListenerPrivate CalListenerPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalListenerPrivate *priv;</div><div class='del'>-} CalListener;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_Listener__epv epv;</div><div class='del'>-} CalListenerClass;</div><div class='del'>-</div><div class='del'>-/* Notification functions */</div><div class='del'>-typedef void (* CalListenerCalOpenedFn) (CalListener *listener,</div><div class='del'>-					 GNOME_Evolution_Calendar_Listener_OpenStatus status,</div><div class='del'>-					 GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-					 gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* CalListenerCalSetModeFn) (CalListener *listener,</div><div class='del'>-					  GNOME_Evolution_Calendar_Listener_SetModeStatus status,</div><div class='del'>-					  GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-					  gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* CalListenerObjUpdatedFn) (CalListener *listener,</div><div class='del'>-					  const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					  gpointer data);</div><div class='del'>-typedef void (* CalListenerObjRemovedFn) (CalListener *listener,</div><div class='del'>-					  const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					  gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* CalListenerCategoriesChangedFn) (CalListener *listener,</div><div class='del'>-						 const GNOME_Evolution_Calendar_StringSeq *categories,</div><div class='del'>-						 gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType cal_listener_get_type (void);</div><div class='del'>-</div><div class='del'>-CalListener *cal_listener_construct (CalListener *listener,</div><div class='del'>-				     CalListenerCalOpenedFn cal_opened_fn,</div><div class='del'>-				     CalListenerCalSetModeFn cal_set_mode_fn,</div><div class='del'>-				     CalListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-				     CalListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-				     CalListenerCategoriesChangedFn categories_changed_fn,</div><div class='del'>-				     gpointer fn_data);</div><div class='del'>-</div><div class='del'>-CalListener *cal_listener_new (CalListenerCalOpenedFn cal_opened_fn,</div><div class='del'>-			       CalListenerCalSetModeFn cal_set_mode_fn,</div><div class='del'>-			       CalListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-			       CalListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-			       CalListenerCategoriesChangedFn categories_changed_fn,</div><div class='del'>-			       gpointer fn_data);</div><div class='del'>-</div><div class='del'>-void cal_listener_stop_notification (CalListener *listener);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c<br/>deleted file mode 100644<br/>index 97e7b81240..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-query.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-query.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,406 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live query client object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include "cal-query.h"</div><div class='del'>-#include "query-listener.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalQuery structure */</div><div class='del'>-struct _CalQueryPrivate {</div><div class='del'>-	/* Our query listener implementation */</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-</div><div class='del'>-	/* Handle to the query in the server */</div><div class='del'>-	GNOME_Evolution_Calendar_Query corba_query;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_query_class_init (CalQueryClass *class);</div><div class='del'>-static void cal_query_init (CalQuery *query);</div><div class='del'>-static void cal_query_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	OBJ_UPDATED,</div><div class='del'>-	OBJ_REMOVED,</div><div class='del'>-	QUERY_DONE,</div><div class='del'>-	EVAL_ERROR,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void marshal_obj_updated (GtkObject *object,</div><div class='del'>-				 GtkSignalFunc func, gpointer func_data,</div><div class='del'>-				 GtkArg *args);</div><div class='del'>-static void marshal_query_done (GtkObject *object,</div><div class='del'>-				GtkSignalFunc func, gpointer func_data,</div><div class='del'>-				GtkArg *args);</div><div class='del'>-</div><div class='del'>-static guint query_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_query_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #CalQuery class if necessary, and returns the type ID assigned</div><div class='del'>- * to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalQuery class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_query_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_query_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_query_type) {</div><div class='del'>-		static const GtkTypeInfo cal_query_info = {</div><div class='del'>-			"CalQuery",</div><div class='del'>-			sizeof (CalQuery),</div><div class='del'>-			sizeof (CalQueryClass),</div><div class='del'>-			(GtkClassInitFunc) cal_query_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_query_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_query_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;cal_query_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_query_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar query */</div><div class='del'>-static void</div><div class='del'>-cal_query_class_init (CalQueryClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	query_signals[OBJ_UPDATED] =</div><div class='del'>-		gtk_signal_new ("obj_updated",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalQueryClass, obj_updated),</div><div class='del'>-				marshal_obj_updated,</div><div class='del'>-				GTK_TYPE_NONE, 4,</div><div class='del'>-				GTK_TYPE_STRING,</div><div class='del'>-				GTK_TYPE_BOOL,</div><div class='del'>-				GTK_TYPE_INT,</div><div class='del'>-				GTK_TYPE_INT);</div><div class='del'>-	query_signals[OBJ_REMOVED] =</div><div class='del'>-		gtk_signal_new ("obj_removed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalQueryClass, obj_removed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-	query_signals[QUERY_DONE] =</div><div class='del'>-		gtk_signal_new ("query_done",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalQueryClass, query_done),</div><div class='del'>-				marshal_query_done,</div><div class='del'>-				GTK_TYPE_NONE, 2,</div><div class='del'>-				GTK_TYPE_ENUM,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-	query_signals[EVAL_ERROR] =</div><div class='del'>-		gtk_signal_new ("eval_error",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalQueryClass, eval_error),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, query_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	class-&gt;obj_updated = NULL;</div><div class='del'>-	class-&gt;obj_removed = NULL;</div><div class='del'>-	class-&gt;query_done = NULL;</div><div class='del'>-	class-&gt;eval_error = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_query_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar query */</div><div class='del'>-static void</div><div class='del'>-cal_query_init (CalQuery *query)</div><div class='del'>-{</div><div class='del'>-	CalQueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalQueryPrivate, 1);</div><div class='del'>-	query-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ql = NULL;</div><div class='del'>-	priv-&gt;corba_query = CORBA_OBJECT_NIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar query */</div><div class='del'>-static void</div><div class='del'>-cal_query_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-	CalQueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_QUERY (object));</div><div class='del'>-</div><div class='del'>-	query = CAL_QUERY (object);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* The server unrefs the query listener, so we just NULL it out here */</div><div class='del'>-	query_listener_stop_notification (priv-&gt;ql);</div><div class='del'>-	priv-&gt;ql = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;corba_query != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (priv-&gt;corba_query, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("cal_query_destroy(): Could not release/unref the query");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		priv-&gt;corba_query = CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	query-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Marshalers */</div><div class='del'>-</div><div class='del'>-typedef void (* ObjUpdatedFunc) (CalQuery *query, const char *uid,</div><div class='del'>-				 gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-				 gpointer data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-marshal_obj_updated (GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	ObjUpdatedFunc f;</div><div class='del'>-</div><div class='del'>-	f = (ObjUpdatedFunc) func;</div><div class='del'>-</div><div class='del'>-	(* f) (CAL_QUERY (object), GTK_VALUE_STRING (args[0]),</div><div class='del'>-	       GTK_VALUE_BOOL (args[1]), GTK_VALUE_INT (args[2]), GTK_VALUE_INT (args[3]),</div><div class='del'>-	       func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (* QueryDoneFunc) (CalQuery *query, CalQueryDoneStatus status, const char *error_str,</div><div class='del'>-				gpointer data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-marshal_query_done (GtkObject *object, GtkSignalFunc func, gpointer func_data, GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	QueryDoneFunc f;</div><div class='del'>-</div><div class='del'>-	f = (QueryDoneFunc) func;</div><div class='del'>-</div><div class='del'>-	(* f) (CAL_QUERY (object), GTK_VALUE_ENUM (args[0]), GTK_VALUE_STRING (args[1]),</div><div class='del'>-	       func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is updated in the query */</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (QueryListener *ql,</div><div class='del'>-		const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		CORBA_boolean query_in_progress,</div><div class='del'>-		CORBA_long n_scanned,</div><div class='del'>-		CORBA_long total,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	query = CAL_QUERY (data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (query), query_signals[OBJ_UPDATED],</div><div class='del'>-			 uid, query_in_progress, (int) n_scanned, (int) total);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is removed from the query */</div><div class='del'>-static void</div><div class='del'>-obj_removed_cb (QueryListener *ql,</div><div class='del'>-		const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	query = CAL_QUERY (data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (query), query_signals[OBJ_REMOVED],</div><div class='del'>-			 uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the query terminates */</div><div class='del'>-static void</div><div class='del'>-query_done_cb (QueryListener *ql,</div><div class='del'>-	       GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,</div><div class='del'>-	       const CORBA_char *error_str,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-	CalQueryDoneStatus status;</div><div class='del'>-</div><div class='del'>-	query = CAL_QUERY (data);</div><div class='del'>-</div><div class='del'>-	switch (corba_status) {</div><div class='del'>-	case GNOME_Evolution_Calendar_QueryListener_SUCCESS:</div><div class='del'>-		status = CAL_QUERY_DONE_SUCCESS;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_Evolution_Calendar_QueryListener_PARSE_ERROR:</div><div class='del'>-		status = CAL_QUERY_DONE_PARSE_ERROR;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (query), query_signals[QUERY_DONE],</div><div class='del'>-			 status, error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an error occurs when evaluating the query */</div><div class='del'>-static void</div><div class='del'>-eval_error_cb (QueryListener *ql,</div><div class='del'>-	       const CORBA_char *error_str,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	query = CAL_QUERY (data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (query), query_signals[EVAL_ERROR],</div><div class='del'>-			 error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_query_construct:</div><div class='del'>- * @query: A calendar query.</div><div class='del'>- * @cal: Handle to an open calendar.</div><div class='del'>- * @sexp: S-expression that defines the query.</div><div class='del'>- * </div><div class='del'>- * Constructs a query object by issuing the query creation request to the</div><div class='del'>- * calendar server.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @query on success, or NULL if the request</div><div class='del'>- * failed.</div><div class='del'>- **/</div><div class='del'>-CalQuery *</div><div class='del'>-cal_query_construct (CalQuery *query,</div><div class='del'>-		     GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-		     const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalQueryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener corba_ql;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (query != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_QUERY (query), NULL);</div><div class='del'>-	g_return_val_if_fail (sexp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ql = query_listener_new (obj_updated_cb,</div><div class='del'>-				       obj_removed_cb,</div><div class='del'>-				       query_done_cb,</div><div class='del'>-				       eval_error_cb,</div><div class='del'>-				       query);</div><div class='del'>-	if (!priv-&gt;ql) {</div><div class='del'>-		g_message ("cal_query_construct(): Could not create the query listener");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_ql = BONOBO_OBJREF (priv-&gt;ql);</div><div class='del'>-				 </div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	priv-&gt;corba_query = GNOME_Evolution_Calendar_Cal_getQuery (cal, sexp, corba_ql, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate)) {		</div><div class='del'>-		g_message ("cal_query_construct(): The server could not create the query");</div><div class='del'>-		goto error;</div><div class='del'>-	} else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_query_construct(): Could not issue the getQuery() request");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (priv-&gt;ql));</div><div class='del'>-	priv-&gt;ql = NULL;</div><div class='del'>-	priv-&gt;corba_query = CORBA_OBJECT_NIL;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_query_new:</div><div class='del'>- * @cal: Handle to an open calendar.</div><div class='del'>- * @sexp: S-expression that defines the query.</div><div class='del'>- * </div><div class='del'>- * Creates a new query object by issuing the query creation request to the</div><div class='del'>- * calendar server.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created query object, or NULL if the request failed.</div><div class='del'>- **/</div><div class='del'>-CalQuery *</div><div class='del'>-cal_query_new (GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-	       const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	query = gtk_type_new (CAL_QUERY_TYPE);</div><div class='del'>-</div><div class='del'>-	if (!cal_query_construct (query, cal, sexp)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (query));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/cal-query.h b/calendar/cal-client/cal-query.h<br/>deleted file mode 100644<br/>index 5af5f3864d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-query.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/cal-query.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live query client object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_QUERY_H</div><div class='del'>-#define CAL_QUERY_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_QUERY_TYPE            (cal_query_get_type ())</div><div class='del'>-#define CAL_QUERY(obj)            (GTK_CHECK_CAST ((obj), CAL_QUERY_TYPE, CalQuery))</div><div class='del'>-#define CAL_QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_QUERY_TYPE, CalQueryClass))</div><div class='del'>-#define IS_CAL_QUERY(obj)         (GTK_CHECK_TYPE ((obj), CAL_QUERY_TYPE))</div><div class='del'>-#define IS_CAL_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_QUERY_TYPE))</div><div class='del'>-</div><div class='del'>-/* Status values when a query terminates */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_QUERY_DONE_SUCCESS,</div><div class='del'>-	CAL_QUERY_DONE_PARSE_ERROR</div><div class='del'>-} CalQueryDoneStatus;</div><div class='del'>-</div><div class='del'>-typedef struct _CalQueryPrivate CalQueryPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalQueryPrivate *priv;</div><div class='del'>-} CalQuery;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* obj_updated) (CalQuery *query, const char *uid,</div><div class='del'>-			      gboolean query_in_progress, int n_scanned, int total);</div><div class='del'>-	void (* obj_removed) (CalQuery *query, const char *uid);</div><div class='del'>-</div><div class='del'>-	void (* query_done) (CalQuery *query, CalQueryDoneStatus status, const char *error_str);</div><div class='del'>-</div><div class='del'>-	void (* eval_error) (CalQuery *query, const char *error_str);</div><div class='del'>-} CalQueryClass;</div><div class='del'>-</div><div class='del'>-GtkType cal_query_get_type (void);</div><div class='del'>-</div><div class='del'>-CalQuery *cal_query_construct (CalQuery *query,</div><div class='del'>-			       GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-			       const char *sexp);</div><div class='del'>-</div><div class='del'>-CalQuery *cal_query_new (GNOME_Evolution_Calendar_Cal cal,</div><div class='del'>-			 const char *sexp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c<br/>deleted file mode 100644<br/>index 56651566eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/client-test.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/client-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,239 +0,0 @@</div><div class='del'>-/* Evolution calendar client - test program</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include "cal-client.h"</div><div class='del'>-#include "cal-util/cal-component.h"</div><div class='del'>-</div><div class='del'>-static CalClient *client1;</div><div class='del'>-static CalClient *client2;</div><div class='del'>-</div><div class='del'>-/* Prints a message with a client identifier */</div><div class='del'>-static void</div><div class='del'>-cl_printf (CalClient *client, const char *format, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	va_start (args, format);</div><div class='del'>-	printf ("Client %s: ",</div><div class='del'>-		client == client1 ? "1" :</div><div class='del'>-		client == client2 ? "2" :</div><div class='del'>-		"UNKNOWN");</div><div class='del'>-	vprintf (format, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Dumps some interesting data from a component */</div><div class='del'>-static void</div><div class='del'>-dump_component (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	printf ("UID %s\n", uid);</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value)</div><div class='del'>-		printf ("\tSummary: `%s', altrep `%s'\n",</div><div class='del'>-			summary.value,</div><div class='del'>-			summary.altrep ? summary.altrep : "NONE");</div><div class='del'>-	else</div><div class='del'>-		printf ("\tNo summary\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Lists the UIDs of objects in a calendar, called as an idle handler */</div><div class='del'>-static gboolean</div><div class='del'>-list_uids (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY);</div><div class='del'>-</div><div class='del'>-	cl_printf (client, "UIDs: ");</div><div class='del'>-</div><div class='del'>-	if (!uids)</div><div class='del'>-		printf ("none\n");</div><div class='del'>-	else {</div><div class='del'>-		for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-			char *uid;</div><div class='del'>-</div><div class='del'>-			uid = l-&gt;data;</div><div class='del'>-			printf ("`%s' ", uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printf ("\n");</div><div class='del'>-</div><div class='del'>-		for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-			char *uid;</div><div class='del'>-			CalComponent *comp;</div><div class='del'>-			CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-			uid = l-&gt;data;</div><div class='del'>-			status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-			if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-				printf ("------------------------------\n");</div><div class='del'>-				dump_component (comp);</div><div class='del'>-				printf ("------------------------------\n");</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			} else {</div><div class='del'>-				printf ("FAILED: %d\n", status);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a calendar is opened */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	cl_printf (client, "Load/create %s\n",</div><div class='del'>-		   ((status == CAL_CLIENT_OPEN_SUCCESS) ? "success" :</div><div class='del'>-		    (status == CAL_CLIENT_OPEN_ERROR) ? "error" :</div><div class='del'>-		    (status == CAL_CLIENT_OPEN_NOT_FOUND) ? "not found" :</div><div class='del'>-		    (status == CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED) ? "method not supported" :</div><div class='del'>-		    "unknown status value"));</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_OPEN_SUCCESS) {</div><div class='del'>-		GList *comp_list;</div><div class='del'>-</div><div class='del'>-		/* get free/busy information */</div><div class='del'>-		comp_list = cal_client_get_free_busy (client, NULL, 0, time (NULL));</div><div class='del'>-		if (comp_list) {</div><div class='del'>-			GList *l;</div><div class='del'>-</div><div class='del'>-			for (l = comp_list; l; l = l-&gt;next) {</div><div class='del'>-				char *comp_str;</div><div class='del'>-</div><div class='del'>-				comp_str = cal_component_get_as_string (CAL_COMPONENT (l-&gt;data));</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (l-&gt;data));</div><div class='del'>-				cl_printf (client, "Free/Busy -&gt; %s\n", comp_str);</div><div class='del'>-				g_free (comp_str);</div><div class='del'>-			}</div><div class='del'>-			g_list_free (comp_list);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_idle_add (list_uids, client);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is updated */</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	cl_printf (client, "Object updated: %s\n", uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a client is destroyed */</div><div class='del'>-static void</div><div class='del'>-client_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (CAL_CLIENT (object) == client1)</div><div class='del'>-		client1 = NULL;</div><div class='del'>-	else if (CAL_CLIENT (object) == client2)</div><div class='del'>-		client2 = NULL;</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	if (!client1 &amp;&amp; !client2)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a calendar client and tries to load the specified URI into it */</div><div class='del'>-static void</div><div class='del'>-create_client (CalClient **client, const char *uri, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	*client = cal_client_new ();</div><div class='del'>-	if (!*client) {</div><div class='del'>-		g_message ("create_client(): could not create the client");</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*client), "destroy",</div><div class='del'>-			    client_destroy_cb,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_opened_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*client), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_updated_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	printf ("Calendar loading `%s'...\n", uri);</div><div class='del'>-</div><div class='del'>-	result = cal_client_open_calendar (*client, uri, only_if_exists);</div><div class='del'>-</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_message ("create_client(): failure when issuing calendar open request `%s'",</div><div class='del'>-			   uri);</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	char *dir;</div><div class='del'>-</div><div class='del'>-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-	gnome_init ("tl-test", VERSION, argc, argv);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {</div><div class='del'>-		g_message ("main(): could not initialize Bonobo");</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dir = g_strdup_printf ("%s/evolution/local/Calendar/calendar.ics", g_get_home_dir ());</div><div class='del'>-	create_client (&amp;client1, dir, FALSE);</div><div class='del'>-	g_free (dir);</div><div class='del'>-	create_client (&amp;client2, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/query-listener.c b/calendar/cal-client/query-listener.c<br/>deleted file mode 100644<br/>index 1b21c1e667..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/query-listener.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/query-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,321 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live search query listener convenience object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "query-listener.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the QueryListener structure */</div><div class='del'>-</div><div class='del'>-struct _QueryListenerPrivate {</div><div class='del'>-	/* Callbacks for notification and their closure data */</div><div class='del'>-	QueryListenerObjUpdatedFn obj_updated_fn;</div><div class='del'>-	QueryListenerObjRemovedFn obj_removed_fn;</div><div class='del'>-	QueryListenerQueryDoneFn query_done_fn;</div><div class='del'>-	QueryListenerEvalErrorFn eval_error_fn;</div><div class='del'>-	gpointer fn_data;</div><div class='del'>-</div><div class='del'>-	/* Whether notification is desired */</div><div class='del'>-	gboolean notify : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void query_listener_class_init (QueryListenerClass *class);</div><div class='del'>-static void query_listener_init (QueryListener *ql);</div><div class='del'>-static void query_listener_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void impl_notifyObjUpdated (PortableServer_Servant servant,</div><div class='del'>-				   GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-				   CORBA_boolean query_in_progress,</div><div class='del'>-				   CORBA_long n_scanned,</div><div class='del'>-				   CORBA_long total,</div><div class='del'>-				   CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static void impl_notifyObjRemoved (PortableServer_Servant servant,</div><div class='del'>-				   GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-				   CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static void impl_notifyQueryDone (PortableServer_Servant servant,</div><div class='del'>-				  GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,</div><div class='del'>-				  const CORBA_char *error_str,</div><div class='del'>-				  CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static void impl_notifyEvalError (PortableServer_Servant servant,</div><div class='del'>-				  const CORBA_char *error_str,</div><div class='del'>-				  CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (QueryListener,</div><div class='del'>-			 GNOME_Evolution_Calendar_QueryListener,</div><div class='del'>-			 BONOBO_X_OBJECT_TYPE,</div><div class='del'>-			 query_listener);</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the live search query listener */</div><div class='del'>-static void</div><div class='del'>-query_listener_class_init (QueryListenerClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = query_listener_destroy;</div><div class='del'>-</div><div class='del'>-	class-&gt;epv.notifyObjUpdated = impl_notifyObjUpdated;</div><div class='del'>-	class-&gt;epv.notifyObjRemoved = impl_notifyObjRemoved;</div><div class='del'>-	class-&gt;epv.notifyQueryDone = impl_notifyQueryDone;</div><div class='del'>-	class-&gt;epv.notifyEvalError = impl_notifyEvalError;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the live search query listener */</div><div class='del'>-static void</div><div class='del'>-query_listener_init (QueryListener *ql)</div><div class='del'>-{</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (QueryListenerPrivate, 1);</div><div class='del'>-	ql-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;obj_updated_fn = NULL;</div><div class='del'>-	priv-&gt;obj_removed_fn = NULL;</div><div class='del'>-	priv-&gt;query_done_fn = NULL;</div><div class='del'>-	priv-&gt;eval_error_fn = NULL;</div><div class='del'>-	priv-&gt;fn_data = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the live search query listener */</div><div class='del'>-static void</div><div class='del'>-query_listener_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_QUERY_LISTENER (object));</div><div class='del'>-</div><div class='del'>-	ql = QUERY_LISTENER (object);</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;obj_updated_fn = NULL;</div><div class='del'>-	priv-&gt;obj_removed_fn = NULL;</div><div class='del'>-	priv-&gt;query_done_fn = NULL;</div><div class='del'>-	priv-&gt;eval_error_fn = NULL;</div><div class='del'>-	priv-&gt;fn_data = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = FALSE;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	ql-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA method implementations */</div><div class='del'>-</div><div class='del'>-/* ::notifyObjUpdated() method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyObjUpdated (PortableServer_Servant servant,</div><div class='del'>-		       GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		       CORBA_boolean query_in_progress,</div><div class='del'>-		       CORBA_long n_scanned,</div><div class='del'>-		       CORBA_long total,</div><div class='del'>-		       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;obj_updated_fn != NULL);</div><div class='del'>-	(* priv-&gt;obj_updated_fn) (ql, uid, query_in_progress, n_scanned, total, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyObjRemoved() method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyObjRemoved (PortableServer_Servant servant,</div><div class='del'>-		       GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;obj_removed_fn != NULL);</div><div class='del'>-	(* priv-&gt;obj_removed_fn) (ql, uid, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyQueryDone() method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyQueryDone (PortableServer_Servant servant,</div><div class='del'>-		      GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus corba_status,</div><div class='del'>-		      const CORBA_char *error_str,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;query_done_fn != NULL);</div><div class='del'>-	(* priv-&gt;query_done_fn) (ql, corba_status, error_str, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::notifyEvalError() method */</div><div class='del'>-static void</div><div class='del'>-impl_notifyEvalError (PortableServer_Servant servant,</div><div class='del'>-		      const CORBA_char *error_str,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ql = QUERY_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;notify)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;eval_error_fn != NULL);</div><div class='del'>-	(* priv-&gt;eval_error_fn) (ql, error_str, priv-&gt;fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_listener_construct:</div><div class='del'>- * @ql: A query listener.</div><div class='del'>- * @obj_updated_fn: Callback to use when a component is updated in the query.</div><div class='del'>- * @obj_removed_fn: Callback to use when a component is removed from the query.</div><div class='del'>- * @query_done_fn: Callback to use when a query is done.</div><div class='del'>- * @eval_error_fn: Callback to use when an evaluation error happens during a query.</div><div class='del'>- * @fn_data: Closure data to pass to the callbacks.</div><div class='del'>- * </div><div class='del'>- * Constructs a query listener by setting the callbacks it will use for</div><div class='del'>- * notification from the calendar server.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @ql.</div><div class='del'>- **/</div><div class='del'>-QueryListener *</div><div class='del'>-query_listener_construct (QueryListener *ql,</div><div class='del'>-			  QueryListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-			  QueryListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-			  QueryListenerQueryDoneFn query_done_fn,</div><div class='del'>-			  QueryListenerEvalErrorFn eval_error_fn,</div><div class='del'>-			  gpointer fn_data)</div><div class='del'>-{</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ql != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_QUERY_LISTENER (ql), NULL);</div><div class='del'>-	g_return_val_if_fail (obj_updated_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (obj_removed_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (query_done_fn != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (eval_error_fn != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;obj_updated_fn = obj_updated_fn;</div><div class='del'>-	priv-&gt;obj_removed_fn = obj_removed_fn;</div><div class='del'>-	priv-&gt;query_done_fn = query_done_fn;</div><div class='del'>-	priv-&gt;eval_error_fn = eval_error_fn;</div><div class='del'>-	priv-&gt;fn_data = fn_data;</div><div class='del'>-</div><div class='del'>-	return ql;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_listener_new:</div><div class='del'>- * @obj_updated_fn: Callback to use when a component is updated in the query.</div><div class='del'>- * @obj_removed_fn: Callback to use when a component is removed from the query.</div><div class='del'>- * @query_done_fn: Callback to use when a query is done.</div><div class='del'>- * @eval_error_fn: Callback to use when an evaluation error happens during a query.</div><div class='del'>- * @fn_data: Closure data to pass to the callbacks.</div><div class='del'>- * </div><div class='del'>- * Creates a new query listener object.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created query listener object.</div><div class='del'>- **/</div><div class='del'>-QueryListener *</div><div class='del'>-query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-		    QueryListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-		    QueryListenerQueryDoneFn query_done_fn,</div><div class='del'>-		    QueryListenerEvalErrorFn eval_error_fn,</div><div class='del'>-		    gpointer fn_data)</div><div class='del'>-{</div><div class='del'>-	QueryListener *ql;</div><div class='del'>-</div><div class='del'>-	ql = gtk_type_new (QUERY_LISTENER_TYPE);</div><div class='del'>-</div><div class='del'>-	return query_listener_construct (ql,</div><div class='del'>-					 obj_updated_fn,</div><div class='del'>-					 obj_removed_fn,</div><div class='del'>-					 query_done_fn,</div><div class='del'>-					 eval_error_fn,</div><div class='del'>-					 fn_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_listener_stop_notification:</div><div class='del'>- * @ql: A query listener.</div><div class='del'>- * </div><div class='del'>- * Informs a query listener that no further notification is desired.  The</div><div class='del'>- * callbacks specified when the listener was created will no longer be invoked</div><div class='del'>- * after this function is called.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-query_listener_stop_notification (QueryListener *ql)</div><div class='del'>-{</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ql != NULL);</div><div class='del'>-	g_return_if_fail (IS_QUERY_LISTENER (ql));</div><div class='del'>-</div><div class='del'>-	priv = ql-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;notify != FALSE);</div><div class='del'>-</div><div class='del'>-	priv-&gt;notify = FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h<br/>deleted file mode 100644<br/>index e553d37a49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/query-listener.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/query-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,97 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live search query listener implementation</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef QUERY_LISTENER_H</div><div class='del'>-#define QUERY_LISTENER_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define QUERY_LISTENER_TYPE            (query_listener_get_type ())</div><div class='del'>-#define QUERY_LISTENER(obj)            (GTK_CHECK_CAST ((obj), QUERY_LISTENER_TYPE, QueryListener))</div><div class='del'>-#define QUERY_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), QUERY_LISTENER_TYPE,	\</div><div class='del'>-					QueryListenerClass))</div><div class='del'>-#define IS_QUERY_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), QUERY_LISTENER_TYPE))</div><div class='del'>-#define IS_QUERY_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), QUERY_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _QueryListenerPrivate QueryListenerPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-} QueryListener;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_QueryListener__epv epv;</div><div class='del'>-} QueryListenerClass;</div><div class='del'>-</div><div class='del'>-/* Notification functions */</div><div class='del'>-</div><div class='del'>-typedef void (* QueryListenerObjUpdatedFn) (QueryListener *ql,</div><div class='del'>-					    const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					    CORBA_boolean query_in_progress,</div><div class='del'>-					    CORBA_long n_scanned,</div><div class='del'>-					    CORBA_long total,</div><div class='del'>-					    gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* QueryListenerObjRemovedFn) (QueryListener *ql,</div><div class='del'>-					    const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					    gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* QueryListenerQueryDoneFn) (</div><div class='del'>-	QueryListener *ql,</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus status,</div><div class='del'>-	const CORBA_char *error_str,</div><div class='del'>-	gpointer data);</div><div class='del'>-</div><div class='del'>-typedef void (* QueryListenerEvalErrorFn) (QueryListener *ql,</div><div class='del'>-					   const CORBA_char *error_str,</div><div class='del'>-					   gpointer data);</div><div class='del'>-</div><div class='del'>-GtkType query_listener_get_type (void);</div><div class='del'>-</div><div class='del'>-QueryListener *query_listener_construct (QueryListener *ql,</div><div class='del'>-					 QueryListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-					 QueryListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-					 QueryListenerQueryDoneFn query_done_fn,</div><div class='del'>-					 QueryListenerEvalErrorFn eval_error_fn,</div><div class='del'>-					 gpointer fn_data);</div><div class='del'>-</div><div class='del'>-QueryListener *query_listener_new (QueryListenerObjUpdatedFn obj_updated_fn,</div><div class='del'>-				   QueryListenerObjRemovedFn obj_removed_fn,</div><div class='del'>-				   QueryListenerQueryDoneFn query_done_fn,</div><div class='del'>-				   QueryListenerEvalErrorFn eval_error_fn,</div><div class='del'>-				   gpointer fn_data);</div><div class='del'>-</div><div class='del'>-void query_listener_stop_notification (QueryListener *ql);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-client/test.ics b/calendar/cal-client/test.ics<br/>deleted file mode 100644<br/>index 128251ee11..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/test.ics?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-client/test.ics</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,318 +0,0 @@</div><div class='del'>-BEGIN:VCALENDAR</div><div class='del'>-VERSION:2.0</div><div class='del'>-PRODID:-//hacksw/handcal//NONSGML v1.0//EN</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTART:19970714T170000Z</div><div class='del'>-DTEND:19970715T035959Z</div><div class='del'>-SUMMARY:Bastille Day Party</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123401@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970903T163000Z</div><div class='del'>-DTEND:19970903T190000Z</div><div class='del'>-SUMMARY:Annual Employee Review</div><div class='del'>-CLASS:PRIVATE</div><div class='del'>-CATEGORIES:BUSINESS,HUMAN RESOURCES</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123402@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970401T163000Z</div><div class='del'>-DTEND:19970402T010000Z</div><div class='del'>-SUMMARY:Laurel is in sensitivity awareness class.</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CATEGORIES:BUSINESS,HUMAN RESOURCES</div><div class='del'>-TRANSP:TRANSPARENT</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123403@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19971102</div><div class='del'>-SUMMARY:Our Blissful Anniversary</div><div class='del'>-CLASS:CONFIDENTIAL</div><div class='del'>-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION</div><div class='del'>-RRULE:FREQ=YEARLY</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:19970901T130000Z-123404@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970415T133000Z</div><div class='del'>-DUE:19970416T045959Z</div><div class='del'>-SUMMARY:1996 Income Tax Preparation</div><div class='del'>-CLASS:CONFIDENTIAL</div><div class='del'>-CATEGORIES:FAMILY,FINANCE</div><div class='del'>-PRIORITY:1</div><div class='del'>-STATUS:NEEDS-ACTION</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VJOURNAL</div><div class='del'>-UID:19970901T130000Z-123405@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART;VALUE=DATE:19970317</div><div class='del'>-SUMMARY:Staff meeting minutes</div><div class='del'>-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa</div><div class='del'>-  and Bob. Aurora project plans were reviewed. There is currently</div><div class='del'>-  no budget reserves for this project. Lisa will escalate to</div><div class='del'>-  management. Next meeting on Tuesday.\n</div><div class='del'>-  2. Telephone Conference: ABC Corp. sales representative called</div><div class='del'>-  to discuss new printer. Promised to get us a demo by Friday.\n</div><div class='del'>-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.</div><div class='del'>-  Is looking into a loaner car. 654-2323 (tel).</div><div class='del'>-END:VJOURNAL</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jane_doe@host1.com</div><div class='del'>-ATTENDEE:MAILTO:john_public@host2.com</div><div class='del'>-DTSTART:19971015T050000Z</div><div class='del'>-DTEND:19971016T050000Z</div><div class='del'>-DTSTAMP:19970901T083000Z</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jane_doe@host1.com</div><div class='del'>-ATTENDEE:MAILTO:john_public@host2.com</div><div class='del'>-DTSTAMP:19970901T100000Z</div><div class='del'>-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,</div><div class='del'>- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M</div><div class='del'>-URL:http://host2.com/pub/busy/jpublic-01.ifb</div><div class='del'>-COMMENT:This iCalendar file contains busy time information for</div><div class='del'>-  the next three months.</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:jsmith@host.com</div><div class='del'>-DTSTART:19980313T141711Z</div><div class='del'>-DTEND:19980410T141711Z</div><div class='del'>-FREEBUSY:19980314T233000Z/19980315T003000Z</div><div class='del'>-FREEBUSY:19980316T153000Z/19980316T163000Z</div><div class='del'>-FREEBUSY:19980318T030000Z/19980318T040000Z</div><div class='del'>-URL:http://www.host.com/calendar/busytime/jsmith.ifb</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19971026T020000</div><div class='del'>-RDATE:19971026T020000</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19971026T020000</div><div class='del'>-RDATE:19970406T020000</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-TZURL:http://zones.stds_r_us.net/tz/US-Eastern</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US--Fictitious-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US--Fictitious-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19990424T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER;VALUE=DATE-TIME:19970317T133000Z</div><div class='del'>-REPEAT:4</div><div class='del'>-DURATION:PT15M</div><div class='del'>-ACTION:AUDIO</div><div class='del'>-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud</div><div class='del'>-END:VALARM</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER:-PT30M</div><div class='del'>-REPEAT:2</div><div class='del'>-DURATION:PT15M</div><div class='del'>-ACTION:DISPLAY</div><div class='del'>-DESCRIPTION:Breakfast meeting with executive\n</div><div class='del'>- team at 8:30 AM EST.</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER:-P2D</div><div class='del'>-ACTION:EMAIL</div><div class='del'>-ATTENDEE:MAILTO:john_doe@host.com</div><div class='del'>-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***</div><div class='del'>-DESCRIPTION:A draft agenda needs to be sent out to the attendees</div><div class='del'>-  to the weekly managers meeting (MGR-LIST). Attached is a</div><div class='del'>-  pointer the document template for the agenda file.</div><div class='del'>-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen</div><div class='del'>- da.doc</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER;VALUE=DATE-TIME:19980101T050000Z</div><div class='del'>-REPEAT:23</div><div class='del'>-DURATION:PT1H</div><div class='del'>-ACTION:PROCEDURE</div><div class='del'>-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-</div><div class='del'>- procs/felizano.exe</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19981025T020000</div><div class='del'>-RDATE:19981025T020000</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19990404T020000</div><div class='del'>-RDATE:19990404T020000</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTAMP:19980309T231000Z</div><div class='del'>-UID:guid-1.host1.com</div><div class='del'>-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com</div><div class='del'>-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:</div><div class='del'>- MAILTO:employee-A@host.com</div><div class='del'>-DESCRIPTION:Project XYZ Review Meeting</div><div class='del'>-CATEGORIES:MEETING</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CREATED:19980309T130000Z</div><div class='del'>-SUMMARY:XYZ Project Review</div><div class='del'>-DTSTART;TZID=US-Eastern:19980312T083000</div><div class='del'>-DTEND;TZID=US-Eastern:19980312T093000</div><div class='del'>-LOCATION:1CP Conference Room 4350</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTAMP:19970324T1200Z</div><div class='del'>-SEQUENCE:0</div><div class='del'>-UID:uid3@host1.com</div><div class='del'>-ORGANIZER:MAILTO:jdoe@host1.com</div><div class='del'>-DTSTART:19970324T123000Z</div><div class='del'>-DTEND:19970324T210000Z</div><div class='del'>-CATEGORIES:MEETING,PROJECT</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-SUMMARY:Calendaring Interoperability Planning Meeting</div><div class='del'>-DESCRIPTION:Discuss how we can test c&amp;s interoperability\n</div><div class='del'>- using iCalendar and other IETF standards.</div><div class='del'>-LOCATION:LDB Lobby</div><div class='del'>-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/</div><div class='del'>- conf/bkgrnd.ps</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-DTSTAMP:19980130T134500Z</div><div class='del'>-SEQUENCE:2</div><div class='del'>-UID:uid4@host1.com</div><div class='del'>-ORGANIZER:MAILTO:unclesam@us.gov</div><div class='del'>-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com</div><div class='del'>-DUE:19980415T235959</div><div class='del'>-STATUS:NEEDS-ACTION</div><div class='del'>-SUMMARY:Submit Income Taxes</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-ACTION:AUDIO</div><div class='del'>-TRIGGER:19980403T120000</div><div class='del'>-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-</div><div class='del'>- files/ssbanner.aud</div><div class='del'>-REPEAT:4</div><div class='del'>-DURATION:PT1H</div><div class='del'>-END:VALARM</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VJOURNAL</div><div class='del'>-DTSTAMP:19970324T120000Z</div><div class='del'>-UID:uid5@host1.com</div><div class='del'>-ORGANIZER:MAILTO:jsmith@host.com</div><div class='del'>-STATUS:DRAFT</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CATEGORIES:Project Report, XYZ, Weekly Meeting</div><div class='del'>-DESCRIPTION:Project xyz Review Meeting Minutes\n</div><div class='del'>- Agenda\n1. Review of project version 1.0 requirements.\n2.</div><div class='del'>- Definition</div><div class='del'>- of project processes.\n3. Review of project schedule.\n</div><div class='del'>- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was</div><div class='del'>-  decided that the requirements need to be signed off by</div><div class='del'>-  product marketing.\n-Project processes were accepted.\n</div><div class='del'>- -Project schedule needs to account for scheduled holidays</div><div class='del'>-  and employee vacation time. Check with HR for specific</div><div class='del'>-  dates.\n-New schedule will be distributed by Friday.\n-</div><div class='del'>- Next weeks meeting is cancelled. No meeting until 3/23.</div><div class='del'>-END:VJOURNAL</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jsmith@host.com</div><div class='del'>-DTSTART:19980313T141711Z</div><div class='del'>-DTEND:19980410T141711Z</div><div class='del'>-FREEBUSY:19980314T233000Z/19980315T003000Z</div><div class='del'>-FREEBUSY:19980316T153000Z/19980316T163000Z</div><div class='del'>-FREEBUSY:19980318T030000Z/19980318T040000Z</div><div class='del'>-URL:http://www.host.com/calendar/busytime/jsmith.ifb</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-END:VCALENDAR</div><div class='head'>diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore<br/>deleted file mode 100644<br/>index 9f93120f8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.libs</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-recur</div><div class='head'>diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am<br/>deleted file mode 100644<br/>index bb94577c16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-noinst_PROGRAMS = test-recur</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"cal-util\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# cal util library</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcal-util.la</div><div class='del'>-</div><div class='del'>-libcal_util_la_SOURCES = 	\</div><div class='del'>-	cal-component.c		\</div><div class='del'>-	cal-recur.c		\</div><div class='del'>-	cal-util.c		\</div><div class='del'>-	timeutil.c</div><div class='del'>-</div><div class='del'>-libcal_utilincludedir = $(includedir)/evolution/cal-util</div><div class='del'>-</div><div class='del'>-libcal_utilinclude_HEADERS =	\</div><div class='del'>-	cal-component.h		\</div><div class='del'>-	cal-recur.h		\</div><div class='del'>-	cal-util.h		\</div><div class='del'>-	timeutil.h</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# static library for use in conduits' shared libraries</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libcal-util-static.la</div><div class='del'>-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)</div><div class='del'>-libcal_util_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-test_recur_SOURCES = 	\</div><div class='del'>-	 test-recur.c</div><div class='del'>-</div><div class='del'>-test_recur_LDADD = 							\</div><div class='del'>-	 libcal-util.la							\</div><div class='del'>-	 $(top_builddir)/libversit/libversit.a				\</div><div class='del'>-	 $(top_builddir)/libical/src/libical/libical-evolution.la	\</div><div class='del'>-	 $(EVOLUTION_CALENDAR_LIBS)</div><div class='head'>diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c<br/>deleted file mode 100644<br/>index a618e0ef4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-component.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5214 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar component object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "cal-component.h"</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Extension property for alarm components so that we can reference them by UID */</div><div class='del'>-#define EVOLUTION_ALARM_UID_PROPERTY "X-EVOLUTION-ALARM-UID"</div><div class='del'>-</div><div class='del'>-/* Private part of the CalComponent structure */</div><div class='del'>-struct _CalComponentPrivate {</div><div class='del'>-	/* The icalcomponent we wrap */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* Properties */</div><div class='del'>-</div><div class='del'>-	icalproperty *uid;</div><div class='del'>-</div><div class='del'>-	icalproperty *status;</div><div class='del'>-</div><div class='del'>-	struct attendee {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *cutype_param;</div><div class='del'>-		icalparameter *member_param;</div><div class='del'>-		icalparameter *role_param;</div><div class='del'>-		icalparameter *partstat_param;</div><div class='del'>-		icalparameter *rsvp_param;</div><div class='del'>-		icalparameter *delto_param;</div><div class='del'>-		icalparameter *delfrom_param;</div><div class='del'>-		icalparameter *sentby_param;</div><div class='del'>-		icalparameter *cn_param;</div><div class='del'>-		icalparameter *language_param;</div><div class='del'>-	};</div><div class='del'>-	</div><div class='del'>-	GSList *attendee_list;</div><div class='del'>-	</div><div class='del'>-	icalproperty *categories;</div><div class='del'>-</div><div class='del'>-	icalproperty *classification;</div><div class='del'>-</div><div class='del'>-	struct text {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *altrep_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GSList *comment_list; /* list of struct text */</div><div class='del'>-</div><div class='del'>-	icalproperty *completed;</div><div class='del'>-</div><div class='del'>-	GSList *contact_list; /* list of struct text */</div><div class='del'>-</div><div class='del'>-	icalproperty *created;</div><div class='del'>-</div><div class='del'>-	GSList *description_list; /* list of struct text */</div><div class='del'>-</div><div class='del'>-	struct datetime {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *tzid_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct datetime dtstart;</div><div class='del'>-	struct datetime dtend;</div><div class='del'>-</div><div class='del'>-	icalproperty *dtstamp;</div><div class='del'>-</div><div class='del'>-	/* The DURATION property can be used instead of the VEVENT DTEND or</div><div class='del'>-	   the VTODO DUE dates. We do not use it directly ourselves, but we</div><div class='del'>-	   must be able to handle it from incoming data. If a DTEND or DUE</div><div class='del'>-	   is requested, we convert the DURATION if necessary. If DTEND or</div><div class='del'>-	   DUE is set, we remove any DURATION. */</div><div class='del'>-	icalproperty *duration;</div><div class='del'>-</div><div class='del'>-	struct datetime due;</div><div class='del'>-</div><div class='del'>-	GSList *exdate_list; /* list of struct datetime */</div><div class='del'>-	GSList *exrule_list; /* list of icalproperty objects */</div><div class='del'>-</div><div class='del'>-	struct organizer {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *sentby_param;</div><div class='del'>-		icalparameter *cn_param;</div><div class='del'>-		icalparameter *language_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct organizer organizer;</div><div class='del'>-	</div><div class='del'>-	icalproperty *geo;</div><div class='del'>-	icalproperty *last_modified;</div><div class='del'>-	icalproperty *percent;</div><div class='del'>-	icalproperty *priority;</div><div class='del'>-</div><div class='del'>-	struct period {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *value_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct recur_id {</div><div class='del'>-		struct datetime recur_time;</div><div class='del'>-		</div><div class='del'>-		icalparameter *range_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct recur_id recur_id;</div><div class='del'>-	</div><div class='del'>-	GSList *rdate_list; /* list of struct period */</div><div class='del'>-</div><div class='del'>-	GSList *rrule_list; /* list of icalproperty objects */</div><div class='del'>-</div><div class='del'>-	icalproperty *sequence;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *altrep_param;</div><div class='del'>-	} summary;</div><div class='del'>-</div><div class='del'>-	icalproperty *transparency;</div><div class='del'>-	icalproperty *url;</div><div class='del'>-	icalproperty *location;</div><div class='del'>-</div><div class='del'>-	/* Subcomponents */</div><div class='del'>-</div><div class='del'>-	GHashTable *alarm_uid_hash;</div><div class='del'>-</div><div class='del'>-	/* Whether we should increment the sequence number when piping the</div><div class='del'>-	 * object over the wire.</div><div class='del'>-	 */</div><div class='del'>-	guint need_sequence_inc : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Private structure for alarms */</div><div class='del'>-struct _CalComponentAlarm {</div><div class='del'>-	/* Alarm icalcomponent we wrap */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* Our extension UID property */</div><div class='del'>-	icalproperty *uid;</div><div class='del'>-</div><div class='del'>-	/* Properties */</div><div class='del'>-</div><div class='del'>-	icalproperty *action;</div><div class='del'>-	icalproperty *attach; /* FIXME: see scan_alarm_property() below */</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *altrep_param;</div><div class='del'>-	} description;</div><div class='del'>-</div><div class='del'>-	icalproperty *duration;</div><div class='del'>-	icalproperty *repeat;</div><div class='del'>-	icalproperty *trigger;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_component_class_init (CalComponentClass *class);</div><div class='del'>-static void cal_component_init (CalComponent *comp);</div><div class='del'>-static void cal_component_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalComponent class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalComponent class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_component_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_component_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_component_type) {</div><div class='del'>-		static const GtkTypeInfo cal_component_info = {</div><div class='del'>-			"CalComponent",</div><div class='del'>-			sizeof (CalComponent),</div><div class='del'>-			sizeof (CalComponentClass),</div><div class='del'>-			(GtkClassInitFunc) cal_component_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_component_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_component_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;cal_component_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_component_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_class_init (CalComponentClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_component_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_init (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalComponentPrivate, 1);</div><div class='del'>-	comp-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;alarm_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Does a simple g_free() of the elements of a GSList and then frees the list</div><div class='del'>- * itself.  Returns NULL.</div><div class='del'>- */</div><div class='del'>-static GSList *</div><div class='del'>-free_slist (GSList *slist)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = slist; l; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_slist_free (slist);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach_remove() to free the alarm UIDs hash table.</div><div class='del'>- * We do not need to do anything to individual elements since we were storing</div><div class='del'>- * the UID pointers inside the icalproperties themselves.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-free_alarm_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees the internal icalcomponent only if it does not have a parent.  If it</div><div class='del'>- * does, it means we don't own it and we shouldn't free it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-free_icalcomponent (CalComponent *comp, gboolean free)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-	</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;icalcomp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Free the icalcomponent */</div><div class='del'>-</div><div class='del'>-	if (free &amp;&amp; icalcomponent_get_parent (priv-&gt;icalcomp) == NULL) {</div><div class='del'>-		icalcomponent_free (priv-&gt;icalcomp);</div><div class='del'>-		priv-&gt;icalcomp = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Free the mappings */</div><div class='del'>-</div><div class='del'>-	priv-&gt;uid = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;status = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;attendee_list; l != NULL; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-	g_slist_free (priv-&gt;attendee_list);</div><div class='del'>-	priv-&gt;attendee_list = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;classification = NULL;</div><div class='del'>-	priv-&gt;comment_list = NULL;</div><div class='del'>-	priv-&gt;completed = NULL;</div><div class='del'>-	priv-&gt;contact_list = NULL;</div><div class='del'>-	priv-&gt;created = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;description_list = free_slist (priv-&gt;description_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtend.prop = NULL;</div><div class='del'>-	priv-&gt;dtend.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtstamp = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtstart.prop = NULL;</div><div class='del'>-	priv-&gt;dtstart.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;due.prop = NULL;</div><div class='del'>-	priv-&gt;due.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;duration = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;exdate_list = free_slist (priv-&gt;exdate_list);</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;exrule_list);</div><div class='del'>-	priv-&gt;exrule_list = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;geo = NULL;</div><div class='del'>-	priv-&gt;last_modified = NULL;</div><div class='del'>-	priv-&gt;percent = NULL;</div><div class='del'>-	priv-&gt;priority = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rdate_list = free_slist (priv-&gt;rdate_list);</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;rrule_list);</div><div class='del'>-	priv-&gt;rrule_list = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;sequence = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary.prop = NULL;</div><div class='del'>-	priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;transparency = NULL;</div><div class='del'>-	priv-&gt;url = NULL;</div><div class='del'>-	priv-&gt;location = NULL;</div><div class='del'>-</div><div class='del'>-	/* Free the subcomponents */</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (priv-&gt;alarm_uid_hash, free_alarm_cb, NULL);</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (object));</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (object);</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp, TRUE);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;alarm_uid_hash);</div><div class='del'>-	priv-&gt;alarm_uid_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	comp-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_gen_uid:</div><div class='del'>- *</div><div class='del'>- * Generates a unique identifier suitable for calendar components.</div><div class='del'>- *</div><div class='del'>- * Return value: A unique identifier string.  Every time this function is called</div><div class='del'>- * a different string is returned.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_component_gen_uid (void)</div><div class='del'>-{</div><div class='del'>-        char *iso, *ret;</div><div class='del'>-	static char *hostname;</div><div class='del'>-	time_t t = time (NULL);</div><div class='del'>-	static int serial;</div><div class='del'>-</div><div class='del'>-	if (!hostname) {</div><div class='del'>-		static char buffer [512];</div><div class='del'>-</div><div class='del'>-		if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &amp;&amp;</div><div class='del'>-		    (buffer [0] != 0))</div><div class='del'>-			hostname = buffer;</div><div class='del'>-		else</div><div class='del'>-			hostname = "localhost";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iso = isodate_from_time_t (t);</div><div class='del'>-	ret = g_strdup_printf ("%s-%d-%d-%d-%d@%s",</div><div class='del'>-			       iso,</div><div class='del'>-			       getpid (),</div><div class='del'>-			       getgid (),</div><div class='del'>-			       getppid (),</div><div class='del'>-			       serial++,</div><div class='del'>-			       hostname);</div><div class='del'>-	g_free (iso);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new empty calendar component object.  You should set it from an</div><div class='del'>- * #icalcomponent structure by using cal_component_set_icalcomponent() or with a</div><div class='del'>- * new empty component type by using cal_component_set_new_vtype().</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar component object.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_component_new (void)</div><div class='del'>-{</div><div class='del'>-	return CAL_COMPONENT (gtk_type_new (CAL_COMPONENT_TYPE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_clone:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Creates a new calendar component object by copying the information from</div><div class='del'>- * another one.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar component with the same values as the</div><div class='del'>- * original one.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_component_clone (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	icalcomponent *new_icalcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	new_comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icalcomp) {</div><div class='del'>-		new_icalcomp = icalcomponent_new_clone (priv-&gt;icalcomp);</div><div class='del'>-		cal_component_set_icalcomponent (new_comp, new_icalcomp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an attendee property */</div><div class='del'>-static void</div><div class='del'>-scan_attendee (CalComponent *comp, GSList **attendee_list, icalproperty *prop) </div><div class='del'>-{</div><div class='del'>-	struct attendee *attendee;</div><div class='del'>-	</div><div class='del'>-	attendee = g_new (struct attendee, 1);</div><div class='del'>-	attendee-&gt;prop = prop;</div><div class='del'>-</div><div class='del'>-	attendee-&gt;cutype_param = icalproperty_get_first_parameter (prop, ICAL_CUTYPE_PARAMETER);</div><div class='del'>-	attendee-&gt;member_param = icalproperty_get_first_parameter (prop, ICAL_MEMBER_PARAMETER);</div><div class='del'>-	attendee-&gt;role_param = icalproperty_get_first_parameter (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-	attendee-&gt;partstat_param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);</div><div class='del'>-	attendee-&gt;rsvp_param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-	attendee-&gt;delto_param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);</div><div class='del'>-	attendee-&gt;delfrom_param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);</div><div class='del'>-	attendee-&gt;sentby_param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);</div><div class='del'>-	attendee-&gt;cn_param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);</div><div class='del'>-	attendee-&gt;language_param = icalproperty_get_first_parameter (prop, ICAL_LANGUAGE_PARAMETER);</div><div class='del'>-	</div><div class='del'>-	*attendee_list = g_slist_append (*attendee_list, attendee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans a date/time and timezone pair property */</div><div class='del'>-static void</div><div class='del'>-scan_datetime (CalComponent *comp, struct datetime *datetime, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	datetime-&gt;prop = prop;</div><div class='del'>-	datetime-&gt;tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an exception date property */</div><div class='del'>-static void</div><div class='del'>-scan_exdate (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	struct datetime *dt;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	dt = g_new (struct datetime, 1);</div><div class='del'>-	dt-&gt;prop = prop;</div><div class='del'>-	dt-&gt;tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);</div><div class='del'>-</div><div class='del'>-	priv-&gt;exdate_list = g_slist_append (priv-&gt;exdate_list, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans and attendee property */</div><div class='del'>-static void</div><div class='del'>-scan_organizer (CalComponent *comp, struct organizer *organizer, icalproperty *prop) </div><div class='del'>-{</div><div class='del'>-	organizer-&gt;prop = prop;</div><div class='del'>-</div><div class='del'>-	organizer-&gt;sentby_param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);</div><div class='del'>-	organizer-&gt;cn_param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);</div><div class='del'>-	organizer-&gt;language_param = icalproperty_get_first_parameter (prop, ICAL_LANGUAGE_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalperiodtype property */</div><div class='del'>-static void</div><div class='del'>-scan_period (CalComponent *comp, GSList **list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	struct period *period;</div><div class='del'>-</div><div class='del'>-	period = g_new (struct period, 1);</div><div class='del'>-	period-&gt;prop = prop;</div><div class='del'>-	period-&gt;value_param = icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER);</div><div class='del'>-</div><div class='del'>-	*list = g_slist_append (*list, period);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Scans an icalrecurtype property */</div><div class='del'>-static void</div><div class='del'>-scan_recur_id (CalComponent *comp, struct recur_id *recur_id, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	scan_datetime (comp, &amp;recur_id-&gt;recur_time, prop);</div><div class='del'>-</div><div class='del'>-	recur_id-&gt;range_param = icalproperty_get_first_parameter (prop, ICAL_RANGE_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalrecurtype property */</div><div class='del'>-static void</div><div class='del'>-scan_recur (CalComponent *comp, GSList **list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	*list = g_slist_append (*list, prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans the summary property */</div><div class='del'>-static void</div><div class='del'>-scan_summary (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary.prop = prop;</div><div class='del'>-	priv-&gt;summary.altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans a text (i.e. text + altrep) property */</div><div class='del'>-static void</div><div class='del'>-scan_text (CalComponent *comp, GSList **text_list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	struct text *text;</div><div class='del'>-</div><div class='del'>-	text = g_new (struct text, 1);</div><div class='del'>-	text-&gt;prop = prop;</div><div class='del'>-	text-&gt;altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-</div><div class='del'>-	*text_list = g_slist_append (*text_list, text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalproperty and adds its mapping to the component */</div><div class='del'>-static void</div><div class='del'>-scan_property (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalproperty_kind kind;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	kind = icalproperty_isa (prop);</div><div class='del'>-</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_STATUS_PROPERTY:</div><div class='del'>-		priv-&gt;status = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ATTENDEE_PROPERTY:</div><div class='del'>-		scan_attendee (comp, &amp;priv-&gt;attendee_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CATEGORIES_PROPERTY:</div><div class='del'>-		priv-&gt;categories = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CLASS_PROPERTY:</div><div class='del'>-		priv-&gt;classification = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_COMMENT_PROPERTY:</div><div class='del'>-		scan_text (comp, &amp;priv-&gt;comment_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_COMPLETED_PROPERTY:</div><div class='del'>-		priv-&gt;completed = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CONTACT_PROPERTY:</div><div class='del'>-		scan_text (comp, &amp;priv-&gt;contact_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CREATED_PROPERTY:</div><div class='del'>-		priv-&gt;created = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DESCRIPTION_PROPERTY:</div><div class='del'>-		scan_text (comp, &amp;priv-&gt;description_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTEND_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;dtend, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTSTAMP_PROPERTY:</div><div class='del'>-		priv-&gt;dtstamp = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTSTART_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;dtstart, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DUE_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;due, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DURATION_PROPERTY:</div><div class='del'>-		priv-&gt;duration = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_EXDATE_PROPERTY:</div><div class='del'>-		scan_exdate (comp, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_EXRULE_PROPERTY:</div><div class='del'>-		scan_recur (comp, &amp;priv-&gt;exrule_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_GEO_PROPERTY:</div><div class='del'>-		priv-&gt;geo = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_LASTMODIFIED_PROPERTY:</div><div class='del'>-		priv-&gt;last_modified = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ORGANIZER_PROPERTY:</div><div class='del'>-		scan_organizer (comp, &amp;priv-&gt;organizer, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_PERCENTCOMPLETE_PROPERTY:</div><div class='del'>-		priv-&gt;percent = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_PRIORITY_PROPERTY:</div><div class='del'>-		priv-&gt;priority = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_RECURRENCEID_PROPERTY:</div><div class='del'>-		scan_recur_id (comp, &amp;priv-&gt;recur_id, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_RDATE_PROPERTY:</div><div class='del'>-		scan_period (comp, &amp;priv-&gt;rdate_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_RRULE_PROPERTY:</div><div class='del'>-		scan_recur (comp, &amp;priv-&gt;rrule_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_SEQUENCE_PROPERTY:</div><div class='del'>-		priv-&gt;sequence = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_SUMMARY_PROPERTY:</div><div class='del'>-		scan_summary (comp, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TRANSP_PROPERTY:</div><div class='del'>-		priv-&gt;transparency = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_UID_PROPERTY:</div><div class='del'>-		priv-&gt;uid = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_URL_PROPERTY:</div><div class='del'>-		priv-&gt;url = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_LOCATION_PROPERTY :</div><div class='del'>-		priv-&gt;location = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets our alarm UID string from a property that is known to contain it */</div><div class='del'>-static const char *</div><div class='del'>-alarm_uid_from_prop (icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	const char *xstr;</div><div class='del'>-</div><div class='del'>-	g_assert (icalproperty_isa (prop) == ICAL_X_PROPERTY);</div><div class='del'>-</div><div class='del'>-	xstr = icalproperty_get_x (prop);</div><div class='del'>-	g_assert (xstr != NULL);</div><div class='del'>-</div><div class='del'>-	return xstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets our alarm UID extension property on an alarm component.  Returns a</div><div class='del'>- * pointer to the UID string inside the property itself.</div><div class='del'>- */</div><div class='del'>-static const char *</div><div class='del'>-set_alarm_uid (icalcomponent *alarm, const char *auid)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	const char *inprop_auid;</div><div class='del'>-</div><div class='del'>-	/* Create the new property */</div><div class='del'>-</div><div class='del'>-	prop = icalproperty_new_x ((char *) auid);</div><div class='del'>-	icalproperty_set_x_name (prop, EVOLUTION_ALARM_UID_PROPERTY);</div><div class='del'>-</div><div class='del'>-	icalcomponent_add_property (alarm, prop);</div><div class='del'>-</div><div class='del'>-	inprop_auid = alarm_uid_from_prop (prop);</div><div class='del'>-	return inprop_auid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes any alarm UID extension properties from an alarm subcomponent */</div><div class='del'>-static void</div><div class='del'>-remove_alarm_uid (icalcomponent *alarm)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	GSList *list, *l;</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {</div><div class='del'>-		const char *xname;</div><div class='del'>-</div><div class='del'>-		xname = icalproperty_get_x_name (prop);</div><div class='del'>-		g_assert (xname != NULL);</div><div class='del'>-</div><div class='del'>-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)</div><div class='del'>-			list = g_slist_prepend (list, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-		icalcomponent_remove_property (alarm, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds an alarm subcomponent to the calendar component's mapping table.  The</div><div class='del'>- * actual UID with which it gets added may not be the same as the specified one;</div><div class='del'>- * this function will change it if the table already had an alarm subcomponent</div><div class='del'>- * with the specified UID.  Returns the actual UID used.</div><div class='del'>- */</div><div class='del'>-static const char *</div><div class='del'>-add_alarm (CalComponent *comp, icalcomponent *alarm, const char *auid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *old_alarm;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* First we see if we already have an alarm with the requested UID.  In</div><div class='del'>-	 * that case, we need to change the new UID to something else.  This</div><div class='del'>-	 * should never happen, but who knows.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	old_alarm = g_hash_table_lookup (priv-&gt;alarm_uid_hash, auid);</div><div class='del'>-	if (old_alarm != NULL) {</div><div class='del'>-		char *new_auid;</div><div class='del'>-</div><div class='del'>-		g_message ("add_alarm(): Got alarm with duplicated UID `%s', changing it...", auid);</div><div class='del'>-</div><div class='del'>-		remove_alarm_uid (alarm);</div><div class='del'>-</div><div class='del'>-		new_auid = cal_component_gen_uid ();</div><div class='del'>-		auid = set_alarm_uid (alarm, new_auid);</div><div class='del'>-		g_free (new_auid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;alarm_uid_hash, (char *) auid, alarm);</div><div class='del'>-	return auid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an alarm subcomponent, adds an UID extension property to it (so that we</div><div class='del'>- * can reference alarms by unique IDs), and adds its mapping to the component.  */</div><div class='del'>-static void</div><div class='del'>-scan_alarm (CalComponent *comp, icalcomponent *alarm)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	const char *auid;</div><div class='del'>-	char *new_auid;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {</div><div class='del'>-		const char *xname;</div><div class='del'>-</div><div class='del'>-		xname = icalproperty_get_x_name (prop);</div><div class='del'>-		g_assert (xname != NULL);</div><div class='del'>-</div><div class='del'>-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {</div><div class='del'>-			auid = alarm_uid_from_prop (prop);</div><div class='del'>-			add_alarm (comp, alarm, auid);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The component has no alarm UID property, so we create one. */</div><div class='del'>-</div><div class='del'>-	new_auid = cal_component_gen_uid ();</div><div class='del'>-	auid = set_alarm_uid (alarm, new_auid);</div><div class='del'>-	g_free (new_auid);</div><div class='del'>-</div><div class='del'>-	add_alarm (comp, alarm, auid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalcomponent for its properties so that we can provide</div><div class='del'>- * random-access to them.  It also builds a hash table of the component's alarm</div><div class='del'>- * subcomponents.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-scan_icalcomponent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Scan properties */</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (priv-&gt;icalcomp, ICAL_ANY_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (priv-&gt;icalcomp, ICAL_ANY_PROPERTY))</div><div class='del'>-		scan_property (comp, prop);</div><div class='del'>-</div><div class='del'>-	/* Scan subcomponents */</div><div class='del'>-</div><div class='del'>-	for (iter = icalcomponent_begin_component (priv-&gt;icalcomp, ICAL_VALARM_COMPONENT);</div><div class='del'>-	     icalcompiter_deref (&amp;iter) != NULL;</div><div class='del'>-	     icalcompiter_next (&amp;iter)) {</div><div class='del'>-		icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-		subcomp = icalcompiter_deref (&amp;iter);</div><div class='del'>-		scan_alarm (comp, subcomp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that the mandatory calendar component properties (uid, dtstamp) do</div><div class='del'>- * exist.  If they don't exist, it creates them automatically.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ensure_mandatory_properties (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;uid) {</div><div class='del'>-		char *uid;</div><div class='del'>-</div><div class='del'>-		uid = cal_component_gen_uid ();</div><div class='del'>-		priv-&gt;uid = icalproperty_new_uid (uid);</div><div class='del'>-		g_free (uid);</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;dtstamp) {</div><div class='del'>-		time_t tim;</div><div class='del'>-		struct icaltimetype t;</div><div class='del'>-</div><div class='del'>-		tim = time (NULL);</div><div class='del'>-		t = icaltime_from_timet_with_zone (tim, FALSE, icaltimezone_get_utc_timezone ());</div><div class='del'>-</div><div class='del'>-		priv-&gt;dtstamp = icalproperty_new_dtstamp (t);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;dtstamp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_new_vtype:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @type: Type of calendar component to create.</div><div class='del'>- *</div><div class='del'>- * Clears any existing component data from a calendar component object and</div><div class='del'>- * creates a new #icalcomponent of the specified type for it.  The only property</div><div class='del'>- * that will be set in the new component will be its unique identifier.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp, TRUE);</div><div class='del'>-</div><div class='del'>-	if (type == CAL_COMPONENT_NO_TYPE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Figure out the kind and create the icalcomponent */</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		kind = ICAL_VEVENT_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		kind = ICAL_VTODO_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		kind = ICAL_VJOURNAL_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-		kind = ICAL_VFREEBUSY_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TIMEZONE:</div><div class='del'>-		kind = ICAL_VTIMEZONE_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		kind = ICAL_NO_COMPONENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icalcomp = icalcomponent_new (kind);</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Scan the component to build our mapping table */</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-	scan_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	/* Add missing stuff */</div><div class='del'>-</div><div class='del'>-	ensure_mandatory_properties (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_icalcomponent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @icalcomp: An #icalcomponent.</div><div class='del'>- *</div><div class='del'>- * Sets the contents of a calendar component object from an #icalcomponent</div><div class='del'>- * structure.  If the @comp already had an #icalcomponent set into it, it will</div><div class='del'>- * will be freed automatically if the #icalcomponent does not have a parent</div><div class='del'>- * component itself.</div><div class='del'>- *</div><div class='del'>- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component</div><div class='del'>- * type.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icalcomp == icalcomp)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp, TRUE);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		priv-&gt;icalcomp = NULL;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-</div><div class='del'>-	if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-	      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-	      || kind == ICAL_VJOURNAL_COMPONENT</div><div class='del'>-	      || kind == ICAL_VFREEBUSY_COMPONENT</div><div class='del'>-	      || kind == ICAL_VTIMEZONE_COMPONENT))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-</div><div class='del'>-	scan_icalcomponent (comp);</div><div class='del'>-	ensure_mandatory_properties (comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_icalcomponent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries the #icalcomponent structure that a calendar component object is</div><div class='del'>- * wrapping.</div><div class='del'>- *</div><div class='del'>- * Return value: An #icalcomponent structure, or NULL if the @comp has no</div><div class='del'>- * #icalcomponent set to it.</div><div class='del'>- **/</div><div class='del'>-icalcomponent *</div><div class='del'>-cal_component_get_icalcomponent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-cal_component_rescan (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Clear everything out */</div><div class='del'>-	free_icalcomponent (comp, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Rescan */</div><div class='del'>-	scan_icalcomponent (comp);</div><div class='del'>-	ensure_mandatory_properties (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_vtype:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries the type of a calendar component object.</div><div class='del'>- *</div><div class='del'>- * Return value: The type of the component, as defined by RFC 2445.</div><div class='del'>- **/</div><div class='del'>-CalComponentVType</div><div class='del'>-cal_component_get_vtype (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (priv-&gt;icalcomp);</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_VEVENT_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_EVENT;</div><div class='del'>-</div><div class='del'>-	case ICAL_VTODO_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_TODO;</div><div class='del'>-</div><div class='del'>-	case ICAL_VJOURNAL_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_JOURNAL;</div><div class='del'>-</div><div class='del'>-	case ICAL_VFREEBUSY_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_FREEBUSY;</div><div class='del'>-</div><div class='del'>-	case ICAL_VTIMEZONE_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_TIMEZONE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* We should have been loaded with a supported type! */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return CAL_COMPONENT_NO_TYPE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_as_string:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- *</div><div class='del'>- * Gets the iCalendar string representation of a calendar component.  You should</div><div class='del'>- * call cal_component_commit_sequence() before this function to ensure that the</div><div class='del'>- * component's sequence number is consistent with the state of the object.</div><div class='del'>- *</div><div class='del'>- * Return value: String representation of the calendar component according to</div><div class='del'>- * RFC 2445.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_component_get_as_string (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str, *buf;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	/* Ensure that the user has committed the new SEQUENCE */</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	/* We dup the string; libical owns that memory */</div><div class='del'>-</div><div class='del'>-	str = icalcomponent_as_ical_string (priv-&gt;icalcomp);</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		buf = g_strdup (str);</div><div class='del'>-	else</div><div class='del'>-		buf = NULL;</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(); ensures that an alarm subcomponent</div><div class='del'>- * has the mandatory properties it needs.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ensure_alarm_properties_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *alarm;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	enum icalproperty_action action;</div><div class='del'>-	const char *str;</div><div class='del'>-</div><div class='del'>-	alarm = value;</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (data);</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	prop = icalcomponent_get_first_property (alarm, ICAL_ACTION_PROPERTY);</div><div class='del'>-	if (!prop)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	action = icalproperty_get_action (prop);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case ICAL_ACTION_DISPLAY:</div><div class='del'>-		/* Ensure we have a DESCRIPTION property */</div><div class='del'>-		prop = icalcomponent_get_first_property (alarm, ICAL_DESCRIPTION_PROPERTY);</div><div class='del'>-		if (prop)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;summary.prop)</div><div class='del'>-			str = _("Untitled appointment");</div><div class='del'>-		else</div><div class='del'>-			str = icalproperty_get_summary (priv-&gt;summary.prop);</div><div class='del'>-</div><div class='del'>-		prop = icalproperty_new_description (str);</div><div class='del'>-		icalcomponent_add_property (alarm, prop);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-		/* FIXME: add other action types here */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that alarm subcomponents have the mandatory properties they need,</div><div class='del'>- * even when clients may not have set them properly.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ensure_alarm_properties (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;alarm_uid_hash, ensure_alarm_properties_cb, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_commit_sequence:</div><div class='del'>- * @comp:</div><div class='del'>- *</div><div class='del'>- * Increments the sequence number property in a calendar component object if it</div><div class='del'>- * needs it.  This needs to be done when any of a number of properties listed in</div><div class='del'>- * RFC 2445 change values, such as the start and end dates of a component.</div><div class='del'>- *</div><div class='del'>- * This function must be called before calling cal_component_get_as_string() to</div><div class='del'>- * ensure that the component is fully consistent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_commit_sequence (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	ensure_alarm_properties (comp);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;need_sequence_inc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sequence) {</div><div class='del'>-		int seq;</div><div class='del'>-</div><div class='del'>-		seq = icalproperty_get_sequence (priv-&gt;sequence);</div><div class='del'>-		icalproperty_set_sequence (priv-&gt;sequence, seq + 1);</div><div class='del'>-	} else {</div><div class='del'>-		/* The component had no SEQUENCE property, so assume that the</div><div class='del'>-		 * default would have been zero.  Since it needed incrementing</div><div class='del'>-		 * anyways, we use a value of 1 here.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;sequence = icalproperty_new_sequence (1);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_uid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @uid: Return value for the UID string.</div><div class='del'>- *</div><div class='del'>- * Queries the unique identifier of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_uid (CalComponent *comp, const char **uid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	*uid = icalproperty_get_uid (priv-&gt;uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_uid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @uid: Unique identifier.</div><div class='del'>- *</div><div class='del'>- * Sets the unique identifier string of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_uid (CalComponent *comp, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	icalproperty_set_uid (priv-&gt;uid, (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_categories:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categories:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_categories (CalComponent *comp, const char **categories)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (categories != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;categories)</div><div class='del'>-		*categories = icalproperty_get_categories (priv-&gt;categories);</div><div class='del'>-	else</div><div class='del'>-		*categories = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_categories:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categories:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_categories (CalComponent *comp, const char *categories)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!categories || !(*categories)) {</div><div class='del'>-		if (priv-&gt;categories) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;categories);</div><div class='del'>-			icalproperty_free (priv-&gt;categories);</div><div class='del'>-			priv-&gt;url = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;categories)</div><div class='del'>-		icalproperty_set_categories (priv-&gt;categories, (char *) categories);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;categories = icalproperty_new_categories ((char *) categories);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;categories);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_categories_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categ_list: Return value for the list of strings, where each string is a</div><div class='del'>- * category.  This should be freed using cal_component_free_categories_list().</div><div class='del'>- *</div><div class='del'>- * Queries the list of categories of a calendar component object.  Each element</div><div class='del'>- * in the returned categ_list is a string with the corresponding category.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_categories_list (CalComponent *comp, GSList **categ_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *categories;</div><div class='del'>-	const char *p;</div><div class='del'>-	const char *cat_start;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (categ_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;categories) {</div><div class='del'>-		*categ_list = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	categories = icalproperty_get_categories (priv-&gt;categories);</div><div class='del'>-	g_assert (categories != NULL);</div><div class='del'>-</div><div class='del'>-	cat_start = categories;</div><div class='del'>-	*categ_list = NULL;</div><div class='del'>-</div><div class='del'>-	for (p = categories; *p; p++)</div><div class='del'>-		if (*p == ',') {</div><div class='del'>-			str = g_strndup (cat_start, p - cat_start);</div><div class='del'>-			*categ_list = g_slist_prepend (*categ_list, str);</div><div class='del'>-</div><div class='del'>-			cat_start = p + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	str = g_strndup (cat_start, p - cat_start);</div><div class='del'>-	*categ_list = g_slist_prepend (*categ_list, str);</div><div class='del'>-</div><div class='del'>-	*categ_list = g_slist_reverse (*categ_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a comma-delimited string of categories */</div><div class='del'>-static char *</div><div class='del'>-stringify_categories (GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	GString *s;</div><div class='del'>-	GSList *l;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	s = g_string_new (NULL);</div><div class='del'>-</div><div class='del'>-	for (l = categ_list; l; l = l-&gt;next) {</div><div class='del'>-		g_string_append (s, l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (l-&gt;next != NULL)</div><div class='del'>-			g_string_append (s, ",");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str = s-&gt;str;</div><div class='del'>-	g_string_free (s, FALSE);</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_categories_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categ_list: List of strings, one for each category.</div><div class='del'>- *</div><div class='del'>- * Sets the list of categories of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_categories_list (CalComponent *comp, GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *categories_str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!categ_list) {</div><div class='del'>-		if (priv-&gt;categories) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;categories);</div><div class='del'>-			icalproperty_free (priv-&gt;categories);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a single string of categories */</div><div class='del'>-	categories_str = stringify_categories (categ_list);</div><div class='del'>-</div><div class='del'>-	/* Set the categories */</div><div class='del'>-	priv-&gt;categories = icalproperty_new_categories (categories_str);</div><div class='del'>-	g_free (categories_str);</div><div class='del'>-</div><div class='del'>-	icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_classification:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @classif: Return value for the classification.</div><div class='del'>- *</div><div class='del'>- * Queries the classification of a calendar component object.  If the</div><div class='del'>- * classification property is not set on this component, this function returns</div><div class='del'>- * #CAL_COMPONENT_CLASS_NONE.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *class;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (classif != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;classification) {</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	class = icalproperty_get_class (priv-&gt;classification);</div><div class='del'>-</div><div class='del'>-	if (strcasecmp (class, "PUBLIC") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_PUBLIC;</div><div class='del'>-	else if (strcasecmp (class, "PRIVATE") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_PRIVATE;</div><div class='del'>-	else if (strcasecmp (class, "CONFIDENTIAL") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;</div><div class='del'>-	else</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_classification:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @classif: Classification to use.</div><div class='del'>- *</div><div class='del'>- * Sets the classification property of a calendar component object.  To unset</div><div class='del'>- * the property, specify CAL_COMPONENT_CLASS_NONE for @classif.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_classification (CalComponent *comp, CalComponentClassification classif)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (classif != CAL_COMPONENT_CLASS_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_NONE) {</div><div class='del'>-		if (priv-&gt;classification) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;classification);</div><div class='del'>-			icalproperty_free (priv-&gt;classification);</div><div class='del'>-			priv-&gt;classification = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (classif) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-		str = "PUBLIC";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-		str = "PRIVATE";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-		str = "CONFIDENTIAL";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		str = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;classification)</div><div class='del'>-		icalproperty_set_class (priv-&gt;classification, str);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;classification = icalproperty_new_class (str);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;classification);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a text list value */</div><div class='del'>-static void</div><div class='del'>-get_text_list (GSList *text_list,</div><div class='del'>-	       const char *(* get_prop_func) (icalproperty *prop),</div><div class='del'>-	       GSList **tl)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*tl = NULL;</div><div class='del'>-</div><div class='del'>-	if (!text_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = text_list; l; l = l-&gt;next) {</div><div class='del'>-		struct text *text;</div><div class='del'>-		CalComponentText *t;</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_assert (text-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		t = g_new (CalComponentText, 1);</div><div class='del'>-		t-&gt;value = (* get_prop_func) (text-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (text-&gt;altrep_param)</div><div class='del'>-			t-&gt;altrep = icalparameter_get_altrep (text-&gt;altrep_param);</div><div class='del'>-		else</div><div class='del'>-			t-&gt;altrep = NULL;</div><div class='del'>-</div><div class='del'>-		*tl = g_slist_prepend (*tl, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*tl = g_slist_reverse (*tl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a text list value */</div><div class='del'>-static void</div><div class='del'>-set_text_list (CalComponent *comp,</div><div class='del'>-	       icalproperty *(* new_prop_func) (const char *value),</div><div class='del'>-	       GSList **text_list,</div><div class='del'>-	       GSList *tl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old texts */</div><div class='del'>-</div><div class='del'>-	for (l = *text_list; l; l = l-&gt;next) {</div><div class='del'>-		struct text *text;</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_assert (text-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, text-&gt;prop);</div><div class='del'>-		icalproperty_free (text-&gt;prop);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*text_list);</div><div class='del'>-	*text_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new texts */</div><div class='del'>-</div><div class='del'>-	for (l = tl; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *t;</div><div class='del'>-		struct text *text;</div><div class='del'>-</div><div class='del'>-		t = l-&gt;data;</div><div class='del'>-		g_return_if_fail (t-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-		text = g_new (struct text, 1);</div><div class='del'>-</div><div class='del'>-		text-&gt;prop = (* new_prop_func) ((char *) t-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, text-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (t-&gt;altrep) {</div><div class='del'>-			text-&gt;altrep_param = icalparameter_new_altrep ((char *) t-&gt;altrep);</div><div class='del'>-			icalproperty_add_parameter (text-&gt;prop, text-&gt;altrep_param);</div><div class='del'>-		} else</div><div class='del'>-			text-&gt;altrep_param = NULL;</div><div class='del'>-</div><div class='del'>-		*text_list = g_slist_prepend (*text_list, text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*text_list = g_slist_reverse (*text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_comment_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: Return value for the comment properties and their parameters, as</div><div class='del'>- * a list of #CalComponentText structures.  This should be freed using the</div><div class='del'>- * cal_component_free_text_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the comment of a calendar component object.  The comment property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText is returned.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_comment_list (CalComponent *comp, GSList **text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (text_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_text_list (priv-&gt;comment_list, icalproperty_get_comment, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_comment_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: List of #CalComponentText structures.</div><div class='del'>- *</div><div class='del'>- * Sets the comment of a calendar component object.  The comment property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText structures is used.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_comment_list (CalComponent *comp, GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_text_list (comp, icalproperty_new_comment, &amp;priv-&gt;comment_list, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_contact_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: Return value for the contact properties and their parameters, as</div><div class='del'>- * a list of #CalComponentText structures.  This should be freed using the</div><div class='del'>- * cal_component_free_text_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the contact of a calendar component object.  The contact property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText is returned.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_contact_list (CalComponent *comp, GSList **text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (text_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_text_list (priv-&gt;contact_list, icalproperty_get_contact, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_contact_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: List of #CalComponentText structures.</div><div class='del'>- *</div><div class='del'>- * Sets the contact of a calendar component object.  The contact property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText structures is used.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_contact_list (CalComponent *comp, GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_text_list (comp, icalproperty_new_contact, &amp;priv-&gt;contact_list, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a struct icaltimetype value */</div><div class='del'>-static void</div><div class='del'>-get_icaltimetype (icalproperty *prop,</div><div class='del'>-		  struct icaltimetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		  struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	if (!prop) {</div><div class='del'>-		*t = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*t = g_new (struct icaltimetype, 1);</div><div class='del'>-	**t = (* get_prop_func) (prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a struct icaltimetype value */</div><div class='del'>-static void</div><div class='del'>-set_icaltimetype (CalComponent *comp, icalproperty **prop,</div><div class='del'>-		  icalproperty *(* prop_new_func) (struct icaltimetype v),</div><div class='del'>-		  void (* prop_set_func) (icalproperty *prop, struct icaltimetype v),</div><div class='del'>-		  struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!t) {</div><div class='del'>-		if (*prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, *prop);</div><div class='del'>-			icalproperty_free (*prop);</div><div class='del'>-			*prop = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*prop)</div><div class='del'>-		(* prop_set_func) (*prop, *t);</div><div class='del'>-	else {</div><div class='del'>-		*prop = (* prop_new_func) (*t);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, *prop);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_completed:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the completion date.  This should be freed using the</div><div class='del'>- * cal_component_free_icaltimetype() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date at which a calendar compoment object was completed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_completed (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;completed, icalproperty_get_completed, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_completed:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the completion date.</div><div class='del'>- *</div><div class='del'>- * Sets the date at which a calendar component object was completed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_completed (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;completed,</div><div class='del'>-			  icalproperty_new_completed,</div><div class='del'>-			  icalproperty_set_completed,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_created:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the creation date.  This should be freed using the</div><div class='del'>- * cal_component_free_icaltimetype() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date in which a calendar component object was created in the</div><div class='del'>- * calendar store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_created (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;created, icalproperty_get_created, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_created:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the creation date.</div><div class='del'>- *</div><div class='del'>- * Sets the date in which a calendar component object is created in the calendar</div><div class='del'>- * store.  This should only be used inside a calendar store application, i.e.</div><div class='del'>- * not by calendar user agents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_created (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;created,</div><div class='del'>-			  icalproperty_new_created,</div><div class='del'>-			  icalproperty_set_created,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_description_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: Return value for the description properties and their parameters,</div><div class='del'>- * as a list of #CalComponentText structures.  This should be freed using the</div><div class='del'>- * cal_component_free_text_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the description of a calendar component object.  Journal components</div><div class='del'>- * may have more than one description, and as such this function returns a list</div><div class='del'>- * of #CalComponentText structures.  All other types of components can have at</div><div class='del'>- * most one description.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_description_list (CalComponent *comp, GSList **text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (text_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_text_list (priv-&gt;description_list, icalproperty_get_description, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_description_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: List of #CalComponentSummary structures.</div><div class='del'>- *</div><div class='del'>- * Sets the description of a calendar component object.  Journal components may</div><div class='del'>- * have more than one description, and as such this function takes in a list of</div><div class='del'>- * #CalComponentDescription structures.  All other types of components can have</div><div class='del'>- * at most one description.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_description_list (CalComponent *comp, GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_text_list (comp, icalproperty_new_description, &amp;priv-&gt;description_list, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a date/time and timezone pair */</div><div class='del'>-static void</div><div class='del'>-get_datetime (struct datetime *datetime,</div><div class='del'>-	      struct icaltimetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-	      CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	if (datetime-&gt;prop) {</div><div class='del'>-		dt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-		*dt-&gt;value = (* get_prop_func) (datetime-&gt;prop);</div><div class='del'>-	} else</div><div class='del'>-		dt-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	/* If the icaltimetype has is_utc set, we set "UTC" as the TZID.</div><div class='del'>-	   This makes the timezone code simpler. */</div><div class='del'>-	if (datetime-&gt;tzid_param)</div><div class='del'>-		dt-&gt;tzid = g_strdup (icalparameter_get_tzid (datetime-&gt;tzid_param));</div><div class='del'>-	else if (dt-&gt;value &amp;&amp; dt-&gt;value-&gt;is_utc)</div><div class='del'>-		dt-&gt;tzid = g_strdup ("UTC");</div><div class='del'>-	else</div><div class='del'>-		dt-&gt;tzid = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a date/time and timezone pair */</div><div class='del'>-static void</div><div class='del'>-set_datetime (CalComponent *comp, struct datetime *datetime,</div><div class='del'>-	      icalproperty *(* prop_new_func) (struct icaltimetype v),</div><div class='del'>-	      void (* prop_set_func) (icalproperty * prop, struct icaltimetype v),</div><div class='del'>-	      CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If we are setting the property to NULL (i.e. removing it), then</div><div class='del'>-	   we remove it if it exists. */</div><div class='del'>-	if (!dt) {</div><div class='del'>-		if (datetime-&gt;prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, datetime-&gt;prop);</div><div class='del'>-			icalproperty_free (datetime-&gt;prop);</div><div class='del'>-</div><div class='del'>-			datetime-&gt;prop = NULL;</div><div class='del'>-			datetime-&gt;tzid_param = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dt-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	/* If the TZID is set to "UTC", we set the is_utc flag. */</div><div class='del'>-	if (dt-&gt;tzid &amp;&amp; !strcmp (dt-&gt;tzid, "UTC"))</div><div class='del'>-		dt-&gt;value-&gt;is_utc = 1;</div><div class='del'>-	else</div><div class='del'>-		dt-&gt;value-&gt;is_utc = 0;</div><div class='del'>-</div><div class='del'>-	if (datetime-&gt;prop) {</div><div class='del'>-		(* prop_set_func) (datetime-&gt;prop, *dt-&gt;value);</div><div class='del'>-	} else {</div><div class='del'>-		datetime-&gt;prop = (* prop_new_func) (*dt-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, datetime-&gt;prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the TZID is set to "UTC", we don't want to save the TZID. */</div><div class='del'>-	if (dt-&gt;tzid &amp;&amp; strcmp (dt-&gt;tzid, "UTC")) {</div><div class='del'>-		g_assert (datetime-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (datetime-&gt;tzid_param) {</div><div class='del'>-			icalparameter_set_tzid (datetime-&gt;tzid_param, (char *) dt-&gt;tzid);</div><div class='del'>-		} else {</div><div class='del'>-			datetime-&gt;tzid_param = icalparameter_new_tzid ((char *) dt-&gt;tzid);</div><div class='del'>-			icalproperty_add_parameter (datetime-&gt;prop, datetime-&gt;tzid_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (datetime-&gt;tzid_param) {</div><div class='del'>-		icalproperty_remove_parameter (datetime-&gt;prop, ICAL_TZID_PARAMETER);</div><div class='del'>-		icalparameter_free (datetime-&gt;tzid_param);</div><div class='del'>-		datetime-&gt;tzid_param = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This tries to get the DTSTART + DURATION for a VEVENT or VTODO. In a</div><div class='del'>-   VEVENT this is used for the DTEND if no DTEND exists, In a VTOTO it is</div><div class='del'>-   used for the DUE date if DUE doesn't exist. */</div><div class='del'>-static void</div><div class='del'>-cal_component_get_start_plus_duration (CalComponent *comp,</div><div class='del'>-				       CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	struct icaldurationtype duration;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;duration)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the DTSTART time. */</div><div class='del'>-	get_datetime (&amp;priv-&gt;dtstart, icalproperty_get_dtstart, dt);</div><div class='del'>-	if (!dt-&gt;value)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	duration = icalproperty_get_duration (priv-&gt;duration);</div><div class='del'>-</div><div class='del'>-	/* The DURATION shouldn't be negative, but just return DTSTART if it</div><div class='del'>-	   is, i.e. assume it is 0. */</div><div class='del'>-	if (duration.is_neg)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If DTSTART is a DATE value, then we need to check if the DURATION</div><div class='del'>-	   includes any hours, minutes or seconds. If it does, we need to</div><div class='del'>-	   make the DTEND/DUE a DATE-TIME value. */</div><div class='del'>-	duration.days += duration.weeks * 7;</div><div class='del'>-	if (dt-&gt;value-&gt;is_date) {</div><div class='del'>-		if (duration.hours != 0 || duration.minutes != 0</div><div class='del'>-		    || duration.seconds != 0) {</div><div class='del'>-			dt-&gt;value-&gt;is_date = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add on the DURATION. */</div><div class='del'>-	icaltime_adjust (dt-&gt;value, duration.days, duration.hours,</div><div class='del'>-			 duration.minutes, duration.seconds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtend:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the date/time end.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date/time end of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;dtend, icalproperty_get_dtend, dt);</div><div class='del'>-</div><div class='del'>-	/* If we don't have a DTEND property, then we try to get DTSTART</div><div class='del'>-	   + DURATION. */</div><div class='del'>-	if (!dt-&gt;value)</div><div class='del'>-		cal_component_get_start_plus_duration (comp, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtend:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: End date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the date/time end property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;dtend,</div><div class='del'>-		      icalproperty_new_dtend,</div><div class='del'>-		      icalproperty_set_dtend,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	/* Make sure we remove any existing DURATION property, as it can't be</div><div class='del'>-	   used with a DTEND. If DTEND is set to NULL, i.e. removed, we also</div><div class='del'>-	   want to remove any DURATION. */</div><div class='del'>-	if (priv-&gt;duration) {</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;duration);</div><div class='del'>-		icalproperty_free (priv-&gt;duration);</div><div class='del'>-		priv-&gt;duration = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtstamp:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: A value for the date/timestamp.</div><div class='del'>- *</div><div class='del'>- * Queries the date/timestamp property of a calendar component object, which is</div><div class='del'>- * the last time at which the object was modified by a calendar user agent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;dtstamp != NULL);</div><div class='del'>-</div><div class='del'>-	*t = icalproperty_get_dtstamp (priv-&gt;dtstamp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtstamp:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Date/timestamp value.</div><div class='del'>- *</div><div class='del'>- * Sets the date/timestamp of a calendar component object.  This should be</div><div class='del'>- * called whenever a calendar user agent makes a change to a component's</div><div class='del'>- * properties.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;dtstamp != NULL);</div><div class='del'>-</div><div class='del'>-	icalproperty_set_dtstamp (priv-&gt;dtstamp, *t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtstart:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the date/time start.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date/time start of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;dtstart, icalproperty_get_dtstart, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtstart:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Start date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the date/time start property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;dtstart,</div><div class='del'>-		      icalproperty_new_dtstart,</div><div class='del'>-		      icalproperty_set_dtstart,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_due:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the due date/time.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the due date/time of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;due, icalproperty_get_due, dt);</div><div class='del'>-</div><div class='del'>-	/* If we don't have a DTEND property, then we try to get DTSTART</div><div class='del'>-	   + DURATION. */</div><div class='del'>-	if (!dt-&gt;value)</div><div class='del'>-		cal_component_get_start_plus_duration (comp, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_due:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: End date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the due date/time property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;due,</div><div class='del'>-		      icalproperty_new_due,</div><div class='del'>-		      icalproperty_set_due,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	/* Make sure we remove any existing DURATION property, as it can't be</div><div class='del'>-	   used with a DTEND. If DTEND is set to NULL, i.e. removed, we also</div><div class='del'>-	   want to remove any DURATION. */</div><div class='del'>-	if (priv-&gt;duration) {</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;duration);</div><div class='del'>-		icalproperty_free (priv-&gt;duration);</div><div class='del'>-		priv-&gt;duration = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */</div><div class='del'>-static void</div><div class='del'>-get_period_list (GSList *period_list,</div><div class='del'>-		 struct icaldatetimeperiodtype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		 GSList **list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*list = NULL;</div><div class='del'>-</div><div class='del'>-	if (!period_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = period_list; l; l = l-&gt;next) {</div><div class='del'>-		struct period *period;</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		struct icaldatetimeperiodtype ip;</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_assert (period-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		p = g_new (CalComponentPeriod, 1);</div><div class='del'>-</div><div class='del'>-		/* Get value parameter */</div><div class='del'>-</div><div class='del'>-		if (period-&gt;value_param) {</div><div class='del'>-			icalparameter_value value_type;</div><div class='del'>-</div><div class='del'>-			value_type = icalparameter_get_value (period-&gt;value_param);</div><div class='del'>-</div><div class='del'>-			if (value_type == ICAL_VALUE_DATE || value_type == ICAL_VALUE_DATETIME)</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-			else if (value_type == ICAL_VALUE_DURATION)</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DURATION;</div><div class='del'>-			else {</div><div class='del'>-				g_message ("get_period_list(): Unknown value for period %d; "</div><div class='del'>-					   "using DATETIME", value_type);</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-</div><div class='del'>-		/* Get start and end/duration */</div><div class='del'>-</div><div class='del'>-		ip = (* get_prop_func) (period-&gt;prop);</div><div class='del'>-</div><div class='del'>-		p-&gt;start = ip.period.start;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME)</div><div class='del'>-			p-&gt;u.end = ip.period.end;</div><div class='del'>-		else if (p-&gt;type == CAL_COMPONENT_PERIOD_DURATION)</div><div class='del'>-			p-&gt;u.duration = ip.period.duration;</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-		/* Put in list */</div><div class='del'>-</div><div class='del'>-		*list = g_slist_prepend (*list, p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*list = g_slist_reverse (*list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a period list value */</div><div class='del'>-static void</div><div class='del'>-set_period_list (CalComponent *comp,</div><div class='del'>-		 icalproperty *(* new_prop_func) (struct icaldatetimeperiodtype period),</div><div class='del'>-		 GSList **period_list,</div><div class='del'>-		 GSList *pl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old periods */</div><div class='del'>-</div><div class='del'>-	for (l = *period_list; l; l = l-&gt;next) {</div><div class='del'>-		struct period *period;</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_assert (period-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, period-&gt;prop);</div><div class='del'>-		icalproperty_free (period-&gt;prop);</div><div class='del'>-		g_free (period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*period_list);</div><div class='del'>-	*period_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new periods */</div><div class='del'>-</div><div class='del'>-	for (l = pl; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		struct period *period;</div><div class='del'>-		struct icaldatetimeperiodtype ip;</div><div class='del'>-		icalparameter_value value_type;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		p = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* Create libical value */</div><div class='del'>-</div><div class='del'>-		ip.period.start = p-&gt;start;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME) {</div><div class='del'>-			value_type = ICAL_VALUE_DATETIME;</div><div class='del'>-			ip.period.end = p-&gt;u.end;</div><div class='del'>-		} else if (p-&gt;type == CAL_COMPONENT_PERIOD_DURATION) {</div><div class='del'>-			value_type = ICAL_VALUE_DURATION;</div><div class='del'>-			ip.period.duration = p-&gt;u.duration;</div><div class='del'>-		} else {</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Create property */</div><div class='del'>-</div><div class='del'>-		period = g_new (struct period, 1);</div><div class='del'>-</div><div class='del'>-		period-&gt;prop = (* new_prop_func) (ip);</div><div class='del'>-		period-&gt;value_param = icalparameter_new_value (value_type);</div><div class='del'>-		icalproperty_add_parameter (period-&gt;prop, period-&gt;value_param);</div><div class='del'>-</div><div class='del'>-		/* Add to list */</div><div class='del'>-</div><div class='del'>-		*period_list = g_slist_prepend (*period_list, period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*period_list = g_slist_reverse (*period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @exdate_list: Return value for the list of exception dates, as a list of</div><div class='del'>- * #CalComponentDateTime structures.  This should be freed using the</div><div class='del'>- * cal_component_free_exdate_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the list of exception date properties in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (exdate_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*exdate_list = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		struct datetime *dt;</div><div class='del'>-		CalComponentDateTime *cdt;</div><div class='del'>-</div><div class='del'>-		dt = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		cdt = g_new (CalComponentDateTime, 1);</div><div class='del'>-		cdt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-</div><div class='del'>-		*cdt-&gt;value = icalproperty_get_exdate (dt-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (dt-&gt;tzid_param)</div><div class='del'>-			cdt-&gt;tzid = g_strdup (icalparameter_get_tzid (dt-&gt;tzid_param));</div><div class='del'>-		else</div><div class='del'>-			cdt-&gt;tzid = NULL;</div><div class='del'>-</div><div class='del'>-		*exdate_list = g_slist_prepend (*exdate_list, cdt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*exdate_list = g_slist_reverse (*exdate_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_exdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @exdate_list: List of #CalComponentDateTime structures.</div><div class='del'>- *</div><div class='del'>- * Sets the list of exception dates in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Remove old exception dates */</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		struct datetime *dt;</div><div class='del'>-</div><div class='del'>-		dt = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* Removing the DATE or DATE-TIME property will also remove</div><div class='del'>-		   any TZID parameter. */</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, dt-&gt;prop);</div><div class='del'>-		icalproperty_free (dt-&gt;prop);</div><div class='del'>-		g_free (dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;exdate_list);</div><div class='del'>-	priv-&gt;exdate_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new exception dates */</div><div class='del'>-</div><div class='del'>-	for (l = exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentDateTime *cdt;</div><div class='del'>-		struct datetime *dt;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		cdt = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (cdt-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-		dt = g_new (struct datetime, 1);</div><div class='del'>-		dt-&gt;prop = icalproperty_new_exdate (*cdt-&gt;value);</div><div class='del'>-</div><div class='del'>-		if (cdt-&gt;tzid) {</div><div class='del'>-			dt-&gt;tzid_param = icalparameter_new_tzid ((char *) cdt-&gt;tzid);</div><div class='del'>-			icalproperty_add_parameter (dt-&gt;prop, dt-&gt;tzid_param);</div><div class='del'>-		} else</div><div class='del'>-			dt-&gt;tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, dt-&gt;prop);</div><div class='del'>-		priv-&gt;exdate_list = g_slist_prepend (priv-&gt;exdate_list, dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;exdate_list = g_slist_reverse (priv-&gt;exdate_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exdates:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any exception dates defined</div><div class='del'>- * for it.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has exception dates, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_exdates (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;exdate_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a list of recurrence rules */</div><div class='del'>-static void</div><div class='del'>-get_recur_list (GSList *recur_list,</div><div class='del'>-		struct icalrecurrencetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		GSList **list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*list = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = recur_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icalrecurrencetype *r;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		r = g_new (struct icalrecurrencetype, 1);</div><div class='del'>-		*r = (* get_prop_func) (prop);</div><div class='del'>-</div><div class='del'>-		*list = g_slist_prepend (*list, r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*list = g_slist_reverse (*list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a list of recurrence rules */</div><div class='del'>-static void</div><div class='del'>-set_recur_list (CalComponent *comp,</div><div class='del'>-		icalproperty *(* new_prop_func) (struct icalrecurrencetype recur),</div><div class='del'>-		GSList **recur_list,</div><div class='del'>-		GSList *rl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old recurrences */</div><div class='del'>-</div><div class='del'>-	for (l = *recur_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*recur_list);</div><div class='del'>-	*recur_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new recurrences */</div><div class='del'>-</div><div class='del'>-	for (l = rl; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icalrecurrencetype *recur;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		recur = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		prop = (* new_prop_func) (*recur);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-		*recur_list = g_slist_prepend (*recur_list, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*recur_list = g_slist_reverse (*recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of exception rules as struct #icalrecurrencetype</div><div class='del'>- * structures.  This should be freed using the cal_component_free_recur_list()</div><div class='del'>- * function.</div><div class='del'>- *</div><div class='del'>- * Queries the list of exception rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_recur_list (priv-&gt;exrule_list, icalproperty_get_exrule, recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exrule_property_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: Returns a list of exception rule properties.</div><div class='del'>- *</div><div class='del'>- * Queries the list of exception rule properties of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*recur_list = priv-&gt;exrule_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_exrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- *</div><div class='del'>- * Sets the list of exception rules in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_recur_list (comp, icalproperty_new_exrule, &amp;priv-&gt;exrule_list, recur_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exrules:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any exception rules defined</div><div class='del'>- * for it.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has exception rules, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_exrules (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;exrule_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exceptions:</div><div class='del'>- * @comp: A calendar component object</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any exception dates</div><div class='del'>- * or exception rules.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has exceptions, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_exceptions (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	return cal_component_has_exdates (comp) || cal_component_has_exrules (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_geo:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @geo: Return value for the geographic position property.  This should be</div><div class='del'>- * freed using the cal_component_free_geo() function.</div><div class='del'>- *</div><div class='del'>- * Sets the geographic position property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (geo != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;geo) {</div><div class='del'>-		*geo = g_new (struct icalgeotype, 1);</div><div class='del'>-		**geo = icalproperty_get_geo (priv-&gt;geo);</div><div class='del'>-	} else</div><div class='del'>-		*geo = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_geo:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @geo: Value for the geographic position property.</div><div class='del'>- *</div><div class='del'>- * Sets the geographic position property on a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!geo) {</div><div class='del'>-		if (priv-&gt;geo) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;geo);</div><div class='del'>-			icalproperty_free (priv-&gt;geo);</div><div class='del'>-			priv-&gt;geo = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;geo)</div><div class='del'>-		icalproperty_set_geo (priv-&gt;geo, *geo);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;geo = icalproperty_new_geo (*geo);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;geo);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_last_modified:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the last modified time value.</div><div class='del'>- *</div><div class='del'>- * Queries the time at which a calendar component object was last modified in</div><div class='del'>- * the calendar store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;last_modified, icalproperty_get_lastmodified, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_last_modified:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the last time modified.</div><div class='del'>- *</div><div class='del'>- * Sets the time at which a calendar component object was last stored in the</div><div class='del'>- * calendar store.  This should not be called by plain calendar user agents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;last_modified,</div><div class='del'>-			  icalproperty_new_lastmodified,</div><div class='del'>-			  icalproperty_set_lastmodified,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_organizer:</div><div class='del'>- * @comp:  A calendar component object</div><div class='del'>- * @organizer: A value for the organizer</div><div class='del'>- * </div><div class='del'>- * Queries the organizer property of a calendar component object</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_organizer (CalComponent *comp, CalComponentOrganizer *organizer)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (organizer != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;organizer.prop)</div><div class='del'>-		organizer-&gt;value = icalproperty_get_organizer (priv-&gt;organizer.prop);</div><div class='del'>-	else</div><div class='del'>-		organizer-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;organizer.sentby_param)</div><div class='del'>-		organizer-&gt;sentby = icalparameter_get_sentby (priv-&gt;organizer.sentby_param);</div><div class='del'>-	else</div><div class='del'>-		organizer-&gt;sentby = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;organizer.cn_param)</div><div class='del'>-		organizer-&gt;cn = icalparameter_get_sentby (priv-&gt;organizer.cn_param);</div><div class='del'>-	else</div><div class='del'>-		organizer-&gt;cn = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;organizer.language_param)</div><div class='del'>-		organizer-&gt;language = icalparameter_get_sentby (priv-&gt;organizer.language_param);</div><div class='del'>-	else</div><div class='del'>-		organizer-&gt;language = NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_organizer:</div><div class='del'>- * @comp:  A calendar component object.</div><div class='del'>- * @organizer: Value for the organizer property</div><div class='del'>- * </div><div class='del'>- * Sets the organizer of a calendar component object</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_organizer (CalComponent *comp, CalComponentOrganizer *organizer)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!organizer) {</div><div class='del'>-		if (priv-&gt;organizer.prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;organizer.prop);</div><div class='del'>-			icalproperty_free (priv-&gt;organizer.prop);</div><div class='del'>-</div><div class='del'>-			priv-&gt;organizer.prop = NULL;</div><div class='del'>-			priv-&gt;organizer.sentby_param = NULL;</div><div class='del'>-			priv-&gt;organizer.cn_param = NULL;</div><div class='del'>-			priv-&gt;organizer.language_param = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (organizer-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;organizer.prop)</div><div class='del'>-		icalproperty_set_organizer (priv-&gt;organizer.prop, (char *) organizer-&gt;value);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;organizer.prop = icalproperty_new_organizer ((char *) organizer-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;organizer.prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (organizer-&gt;sentby) {</div><div class='del'>-		g_assert (priv-&gt;organizer.prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;organizer.sentby_param)</div><div class='del'>-			icalparameter_set_sentby (priv-&gt;organizer.sentby_param,</div><div class='del'>-						  (char *) organizer-&gt;sentby);</div><div class='del'>-		else {</div><div class='del'>-			priv-&gt;organizer.sentby_param = icalparameter_new_sentby (</div><div class='del'>-				(char *) organizer-&gt;sentby);</div><div class='del'>-			icalproperty_add_parameter (priv-&gt;organizer.prop,</div><div class='del'>-						    priv-&gt;organizer.sentby_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;organizer.sentby_param) {</div><div class='del'>-		icalproperty_remove_parameter (priv-&gt;organizer.prop, ICAL_SENTBY_PARAMETER);</div><div class='del'>-		icalparameter_free (priv-&gt;organizer.sentby_param);</div><div class='del'>-		priv-&gt;organizer.sentby_param = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (organizer-&gt;cn) {</div><div class='del'>-		g_assert (priv-&gt;organizer.prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;organizer.cn_param)</div><div class='del'>-			icalparameter_set_cn (priv-&gt;organizer.cn_param,</div><div class='del'>-						  (char *) organizer-&gt;cn);</div><div class='del'>-		else {</div><div class='del'>-			priv-&gt;organizer.cn_param = icalparameter_new_cn (</div><div class='del'>-				(char *) organizer-&gt;cn);</div><div class='del'>-			icalproperty_add_parameter (priv-&gt;organizer.prop,</div><div class='del'>-						    priv-&gt;organizer.cn_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;organizer.cn_param) {</div><div class='del'>-		icalproperty_remove_parameter (priv-&gt;organizer.prop, ICAL_CN_PARAMETER);</div><div class='del'>-		icalparameter_free (priv-&gt;organizer.cn_param);</div><div class='del'>-		priv-&gt;organizer.cn_param = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (organizer-&gt;language) {</div><div class='del'>-		g_assert (priv-&gt;organizer.prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;organizer.language_param)</div><div class='del'>-			icalparameter_set_language (priv-&gt;organizer.language_param,</div><div class='del'>-						  (char *) organizer-&gt;language);</div><div class='del'>-		else {</div><div class='del'>-			priv-&gt;organizer.language_param = icalparameter_new_language (</div><div class='del'>-				(char *) organizer-&gt;language);</div><div class='del'>-			icalproperty_add_parameter (priv-&gt;organizer.prop,</div><div class='del'>-						    priv-&gt;organizer.language_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;organizer.language_param) {</div><div class='del'>-		icalproperty_remove_parameter (priv-&gt;organizer.prop, ICAL_LANGUAGE_PARAMETER);</div><div class='del'>-		icalparameter_free (priv-&gt;organizer.language_param);</div><div class='del'>-		priv-&gt;organizer.language_param = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_organizer:</div><div class='del'>- * @comp: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_organizer (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;organizer.prop != NULL;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_percent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @percent: Return value for the percent-complete property.  This should be</div><div class='del'>- * freed using the cal_component_free_percent() function.</div><div class='del'>- *</div><div class='del'>- * Queries the percent-complete property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_percent (CalComponent *comp, int **percent)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (percent != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;percent) {</div><div class='del'>-		*percent = g_new (int, 1);</div><div class='del'>-		**percent = icalproperty_get_percentcomplete (priv-&gt;percent);</div><div class='del'>-	} else</div><div class='del'>-		*percent = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_percent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @percent: Value for the percent-complete property.</div><div class='del'>- *</div><div class='del'>- * Sets the percent-complete property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_percent (CalComponent *comp, int *percent)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!percent) {</div><div class='del'>-		if (priv-&gt;percent) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;percent);</div><div class='del'>-			icalproperty_free (priv-&gt;percent);</div><div class='del'>-			priv-&gt;percent = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (*percent &gt;= 0 &amp;&amp; *percent &lt;= 100);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;percent)</div><div class='del'>-		icalproperty_set_percentcomplete (priv-&gt;percent, *percent);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;percent = icalproperty_new_percentcomplete (*percent);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;percent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_priority:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @priority: Return value for the priority property.  This should be freed using</div><div class='del'>- * the cal_component_free_priority() function.</div><div class='del'>- *</div><div class='del'>- * Queries the priority property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_priority (CalComponent *comp, int **priority)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (priority != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;priority) {</div><div class='del'>-		*priority = g_new (int, 1);</div><div class='del'>-		**priority = icalproperty_get_priority (priv-&gt;priority);</div><div class='del'>-	} else</div><div class='del'>-		*priority = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_priority:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @priority: Value for the priority property.</div><div class='del'>- *</div><div class='del'>- * Sets the priority property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_priority (CalComponent *comp, int *priority)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priority) {</div><div class='del'>-		if (priv-&gt;priority) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;priority);</div><div class='del'>-			icalproperty_free (priv-&gt;priority);</div><div class='del'>-			priv-&gt;priority = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (*priority &gt;= 0 &amp;&amp; *priority &lt;= 9);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;priority)</div><div class='del'>-		icalproperty_set_priority (priv-&gt;priority, *priority);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;priority = icalproperty_new_priority (*priority);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;priority);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_recurid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_id: Return value for the recurrence id property</div><div class='del'>- * </div><div class='del'>- * Queries the recurrence id property of a calendar component object</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-cal_component_get_recurid (CalComponent *comp, CalComponentRange *recur_id)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_id != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;recur_id.recur_time, </div><div class='del'>-		      icalproperty_get_recurrenceid, </div><div class='del'>-		      &amp;recur_id-&gt;datetime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_recurid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_id: Value for the recurrence id property.</div><div class='del'>- * </div><div class='del'>- * Sets the recurrence id property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-	</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;recur_id.recur_time,</div><div class='del'>-		      icalproperty_new_recurrenceid,</div><div class='del'>-		      icalproperty_set_recurrenceid,</div><div class='del'>-		      &amp;recur_id-&gt;datetime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @period_list: Return value for the list of recurrence dates, as a list of</div><div class='del'>- * #CalComponentPeriod structures.  This should be freed using the</div><div class='del'>- * cal_component_free_period_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the list of recurrence date properties in a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rdate_list (CalComponent *comp, GSList **period_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (period_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_period_list (priv-&gt;rdate_list, icalproperty_get_rdate, period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_rdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @period_list: List of #CalComponentPeriod structures.</div><div class='del'>- *</div><div class='del'>- * Sets the list of recurrence dates in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_rdate_list (CalComponent *comp, GSList *period_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_period_list (comp, icalproperty_new_rdate, &amp;priv-&gt;rdate_list, period_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_rdates:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any recurrence dates defined</div><div class='del'>- * for it.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has recurrence dates, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_rdates (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;rdate_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of recurrence rules as struct #icalrecurrencetype</div><div class='del'>- * structures.  This should be freed using the cal_component_free_recur_list()</div><div class='del'>- * function.</div><div class='del'>- *</div><div class='del'>- * Queries the list of recurrence rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_recur_list (priv-&gt;rrule_list, icalproperty_get_rrule, recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rrule_property_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: Returns a list of recurrence rule properties.</div><div class='del'>- *</div><div class='del'>- * Queries a list of recurrence rule properties of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*recur_list = priv-&gt;rrule_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_rrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- *</div><div class='del'>- * Sets the list of recurrence rules in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_recur_list (comp, icalproperty_new_rrule, &amp;priv-&gt;rrule_list, recur_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_rrules:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any recurrence rules defined</div><div class='del'>- * for it.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has recurrence rules, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_rrules (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;rrule_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_recurrences:</div><div class='del'>- * @comp: A calendar component object</div><div class='del'>- *</div><div class='del'>- * Queries whether a calendar component object has any recurrence dates or</div><div class='del'>- * recurrence rules.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has recurrences, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_recurrences (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_sequence:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @sequence: Return value for the sequence number.  This should be freed using</div><div class='del'>- * cal_component_free_sequence().</div><div class='del'>- *</div><div class='del'>- * Queries the sequence number of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_sequence (CalComponent *comp, int **sequence)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (sequence != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;sequence) {</div><div class='del'>-		*sequence = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*sequence = g_new (int, 1);</div><div class='del'>-	**sequence = icalproperty_get_sequence (priv-&gt;sequence);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_sequence:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Sets the sequence number of a calendar component object.  Normally this</div><div class='del'>- * function should not be called, since the sequence number is incremented</div><div class='del'>- * automatically at the proper times.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_sequence (CalComponent *comp, int *sequence)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!sequence) {</div><div class='del'>-		if (priv-&gt;sequence) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-			icalproperty_free (priv-&gt;sequence);</div><div class='del'>-			priv-&gt;sequence = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sequence)</div><div class='del'>-		icalproperty_set_sequence (priv-&gt;sequence, *sequence);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;sequence = icalproperty_new_sequence (*sequence);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_status:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @status: Return value for the status value.  It is set to #ICAL_STATUS_NONE</div><div class='del'>- * if the component has no status property.</div><div class='del'>- *</div><div class='del'>- * Queries the status property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_status (CalComponent *comp, icalproperty_status *status)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (status != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;status) {</div><div class='del'>-		*status = ICAL_STATUS_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*status = icalproperty_get_status (priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_status:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @status: Status value.  You should use #ICAL_STATUS_NONE if you want to unset</div><div class='del'>- * this property.</div><div class='del'>- *</div><div class='del'>- * Sets the status property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_status (CalComponent *comp, icalproperty_status status)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-</div><div class='del'>-	if (status == ICAL_STATUS_NONE) {</div><div class='del'>-		if (priv-&gt;status) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;status);</div><div class='del'>-			icalproperty_free (priv-&gt;status);</div><div class='del'>-			priv-&gt;status = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;status) {</div><div class='del'>-		icalproperty_set_status (priv-&gt;status, status);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;status = icalproperty_new_status (status);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_summary:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @summary: Return value for the summary property and its parameters.</div><div class='del'>- *</div><div class='del'>- * Queries the summary of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_summary (CalComponent *comp, CalComponentText *summary)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.prop)</div><div class='del'>-		summary-&gt;value = icalproperty_get_summary (priv-&gt;summary.prop);</div><div class='del'>-	else</div><div class='del'>-		summary-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.altrep_param)</div><div class='del'>-		summary-&gt;altrep = icalparameter_get_altrep (priv-&gt;summary.altrep_param);</div><div class='del'>-	else</div><div class='del'>-		summary-&gt;altrep = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_summary:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @summary: Summary property and its parameters.</div><div class='del'>- *</div><div class='del'>- * Sets the summary of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_summary (CalComponent *comp, CalComponentText *summary)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!summary) {</div><div class='del'>-		if (priv-&gt;summary.prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;summary.prop);</div><div class='del'>-			icalproperty_free (priv-&gt;summary.prop);</div><div class='del'>-</div><div class='del'>-			priv-&gt;summary.prop = NULL;</div><div class='del'>-			priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (summary-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.prop)</div><div class='del'>-		icalproperty_set_summary (priv-&gt;summary.prop, (char *) summary-&gt;value);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;summary.prop = icalproperty_new_summary ((char *) summary-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;summary.prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;altrep) {</div><div class='del'>-		g_assert (priv-&gt;summary.prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;summary.altrep_param)</div><div class='del'>-			icalparameter_set_altrep (priv-&gt;summary.altrep_param,</div><div class='del'>-						  (char *) summary-&gt;altrep);</div><div class='del'>-		else {</div><div class='del'>-			priv-&gt;summary.altrep_param = icalparameter_new_altrep (</div><div class='del'>-				(char *) summary-&gt;altrep);</div><div class='del'>-			icalproperty_add_parameter (priv-&gt;summary.prop,</div><div class='del'>-						    priv-&gt;summary.altrep_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;summary.altrep_param) {</div><div class='del'>-		icalproperty_remove_parameter (priv-&gt;summary.prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-		icalparameter_free (priv-&gt;summary.altrep_param);</div><div class='del'>-		priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_transparency:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @transp: Return value for the time transparency.</div><div class='del'>- *</div><div class='del'>- * Queries the time transparency of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *val;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (transp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;transparency) {</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = icalproperty_get_transp (priv-&gt;transparency);</div><div class='del'>-</div><div class='del'>-	if (strcasecmp (val, "TRANSPARENT") == 0)</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;</div><div class='del'>-	else if (strcasecmp (val, "OPAQUE") == 0)</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_OPAQUE;</div><div class='del'>-	else</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_transparency:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @transp: Time transparency value.</div><div class='del'>- *</div><div class='del'>- * Sets the time transparency of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (transp != CAL_COMPONENT_TRANSP_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (transp == CAL_COMPONENT_TRANSP_NONE) {</div><div class='del'>-		if (priv-&gt;transparency) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;transparency);</div><div class='del'>-			icalproperty_free (priv-&gt;transparency);</div><div class='del'>-			priv-&gt;transparency = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (transp) {</div><div class='del'>-	case CAL_COMPONENT_TRANSP_TRANSPARENT:</div><div class='del'>-		str = "TRANSPARENT";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TRANSP_OPAQUE:</div><div class='del'>-		str = "OPAQUE";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		str = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;transparency)</div><div class='del'>-		icalproperty_set_transp (priv-&gt;transparency, str);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;transparency = icalproperty_new_transp (str);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;transparency);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_url:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: Return value for the URL.</div><div class='del'>- *</div><div class='del'>- * Queries the uniform resource locator property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_url (CalComponent *comp, const char **url)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (url != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;url)</div><div class='del'>-		*url = icalproperty_get_url (priv-&gt;url);</div><div class='del'>-	else</div><div class='del'>-		*url = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_url:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: URL value.</div><div class='del'>- *</div><div class='del'>- * Sets the uniform resource locator property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_url (CalComponent *comp, const char *url)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!url || !(*url)) {</div><div class='del'>-		if (priv-&gt;url) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;url);</div><div class='del'>-			icalproperty_free (priv-&gt;url);</div><div class='del'>-			priv-&gt;url = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;url)</div><div class='del'>-		icalproperty_set_url (priv-&gt;url, (char *) url);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;url = icalproperty_new_url ((char *) url);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;url);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a text list value */</div><div class='del'>-static void</div><div class='del'>-get_attendee_list (GSList *attendee_list, GSList **al)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*al = NULL;</div><div class='del'>-</div><div class='del'>-	if (!attendee_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = attendee_list; l; l = l-&gt;next) {</div><div class='del'>-		struct attendee *attendee;</div><div class='del'>-		CalComponentAttendee *a;</div><div class='del'>-</div><div class='del'>-		attendee = l-&gt;data;</div><div class='del'>-		g_assert (attendee-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		a = g_new0 (CalComponentAttendee, 1);</div><div class='del'>-		a-&gt;value = icalproperty_get_attendee (attendee-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (attendee-&gt;member_param)</div><div class='del'>-			a-&gt;member = icalparameter_get_member (attendee-&gt;member_param);		</div><div class='del'>-		if (attendee-&gt;cutype_param)</div><div class='del'>-			a-&gt;cutype = icalparameter_get_cutype (attendee-&gt;cutype_param);			</div><div class='del'>-		if (attendee-&gt;role_param)</div><div class='del'>-			a-&gt;role = icalparameter_get_role (attendee-&gt;role_param);</div><div class='del'>-		if (attendee-&gt;partstat_param)</div><div class='del'>-			a-&gt;status = icalparameter_get_role (attendee-&gt;partstat_param);</div><div class='del'>-		if (attendee-&gt;rsvp_param &amp;&amp; icalparameter_get_rsvp (attendee-&gt;rsvp_param) == ICAL_RSVP_TRUE)</div><div class='del'>-			a-&gt;rsvp = TRUE;</div><div class='del'>-		else</div><div class='del'>-			a-&gt;rsvp = FALSE;</div><div class='del'>-		if (attendee-&gt;delfrom_param)</div><div class='del'>-			a-&gt;delfrom = icalparameter_get_sentby (attendee-&gt;delfrom_param);</div><div class='del'>-		if (attendee-&gt;delto_param)</div><div class='del'>-			a-&gt;delto = icalparameter_get_sentby (attendee-&gt;delto_param);</div><div class='del'>-		if (attendee-&gt;sentby_param)</div><div class='del'>-			a-&gt;sentby = icalparameter_get_sentby (attendee-&gt;sentby_param);</div><div class='del'>-		if (attendee-&gt;cn_param)</div><div class='del'>-			a-&gt;cn = icalparameter_get_sentby (attendee-&gt;cn_param);</div><div class='del'>-		if (attendee-&gt;language_param)</div><div class='del'>-			a-&gt;language = icalparameter_get_sentby (attendee-&gt;language_param);</div><div class='del'>-</div><div class='del'>-		*al = g_slist_prepend (*al, a);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*al = g_slist_reverse (*al);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Sets a text list value */</div><div class='del'>-static void</div><div class='del'>-set_attendee_list (CalComponent *comp,</div><div class='del'>-		   GSList **attendee_list,</div><div class='del'>-		   GSList *al)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old attendees */</div><div class='del'>-</div><div class='del'>-	for (l = *attendee_list; l; l = l-&gt;next) {</div><div class='del'>-		struct attendee *attendee;</div><div class='del'>-</div><div class='del'>-		attendee = l-&gt;data;</div><div class='del'>-		g_assert (attendee-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, attendee-&gt;prop);</div><div class='del'>-		icalproperty_free (attendee-&gt;prop);</div><div class='del'>-		g_free (attendee);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*attendee_list);</div><div class='del'>-	*attendee_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new attendees */</div><div class='del'>-</div><div class='del'>-	for (l = al; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentAttendee *a;</div><div class='del'>-		struct attendee *attendee;</div><div class='del'>-</div><div class='del'>-		a = l-&gt;data;</div><div class='del'>-		g_return_if_fail (a-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-		attendee = g_new0 (struct attendee, 1);</div><div class='del'>-</div><div class='del'>-		attendee-&gt;prop = icalproperty_new_attendee (a-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, attendee-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (a-&gt;member) {</div><div class='del'>-			attendee-&gt;member_param = icalparameter_new_member (a-&gt;member);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;member_param);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		attendee-&gt;cutype_param = icalparameter_new_cutype (a-&gt;cutype);</div><div class='del'>-		icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;cutype_param);</div><div class='del'>-</div><div class='del'>-		attendee-&gt;role_param = icalparameter_new_role (a-&gt;role);</div><div class='del'>-		icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;role_param);</div><div class='del'>-</div><div class='del'>-		attendee-&gt;partstat_param = icalparameter_new_partstat (a-&gt;status);</div><div class='del'>-		icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;partstat_param);</div><div class='del'>-</div><div class='del'>-		if (a-&gt;rsvp)</div><div class='del'>-			attendee-&gt;rsvp_param = icalparameter_new_rsvp (ICAL_RSVP_TRUE);</div><div class='del'>-		else</div><div class='del'>-			attendee-&gt;rsvp_param = icalparameter_new_rsvp (ICAL_RSVP_FALSE);</div><div class='del'>-		icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;rsvp_param);</div><div class='del'>-	</div><div class='del'>-		if (a-&gt;delfrom) {</div><div class='del'>-			attendee-&gt;delfrom_param = icalparameter_new_delegatedfrom (a-&gt;delfrom);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;delfrom_param);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;delto) {</div><div class='del'>-			attendee-&gt;delto_param = icalparameter_new_delegatedto (a-&gt;delto);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;delto_param);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;sentby) {</div><div class='del'>-			attendee-&gt;sentby_param = icalparameter_new_sentby (a-&gt;sentby);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;sentby_param);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;cn) {</div><div class='del'>-			attendee-&gt;cn_param = icalparameter_new_cn (a-&gt;cn);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;cn_param);</div><div class='del'>-		}</div><div class='del'>-		if (a-&gt;language) {</div><div class='del'>-			attendee-&gt;language_param = icalparameter_new_language (a-&gt;language);</div><div class='del'>-			icalproperty_add_parameter (attendee-&gt;prop, attendee-&gt;language_param);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		*attendee_list = g_slist_prepend (*attendee_list, attendee);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*attendee_list = g_slist_reverse (*attendee_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_attendee_list: </div><div class='del'>- * @comp: A calendar component object. </div><div class='del'>- * @attendee_list: Return value for the attendee property.</div><div class='del'>- * This should be freed using the cal_component_free_attendee_list ()</div><div class='del'>- * function.</div><div class='del'>- * </div><div class='del'>- * Queries the attendee properties of the calendar component object</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_attendee_list (CalComponent *comp, GSList **attendee_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (attendee_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_attendee_list (priv-&gt;attendee_list, attendee_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_attendee_list:</div><div class='del'>- * @comp: A calendar component object. </div><div class='del'>- * @attendee_list: Values for attendee properties</div><div class='del'>- * </div><div class='del'>- * Sets the attendees of a calendar component object</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_attendee_list (CalComponent *comp, GSList *attendee_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_attendee_list (comp, &amp;priv-&gt;attendee_list, attendee_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_attendees (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (g_slist_length (priv-&gt;attendee_list) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_location:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: Return value for the location.</div><div class='del'>- *</div><div class='del'>- * Queries the location property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_location (CalComponent *comp, const char **location)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (location != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;location)</div><div class='del'>-		*location = icalproperty_get_location (priv-&gt;location);</div><div class='del'>-	else</div><div class='del'>-		*location = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_location:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: Location value.</div><div class='del'>- *</div><div class='del'>- * Sets the location property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_location (CalComponent *comp, const char *location)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!location || !(*location)) {</div><div class='del'>-		if (priv-&gt;location) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;location);</div><div class='del'>-			icalproperty_free (priv-&gt;location);</div><div class='del'>-			priv-&gt;location = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;location)</div><div class='del'>-		icalproperty_set_location (priv-&gt;location, (char *) location);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;location = icalproperty_new_location ((char *) location);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;location);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_categories_list:</div><div class='del'>- * @categ_list: List of category strings.</div><div class='del'>- *</div><div class='del'>- * Frees a list of category strings.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_categories_list (GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = categ_list; l; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_slist_free (categ_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_datetime:</div><div class='del'>- * @dt: A date/time structure.</div><div class='del'>- *</div><div class='del'>- * Frees a date/time structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_datetime (CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (dt-&gt;value);</div><div class='del'>-	g_free ((char*)dt-&gt;tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_exdate_list:</div><div class='del'>- * @exdate_list: List of #CalComponentDateTime structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalComponentDateTime structures as returned by the</div><div class='del'>- * cal_component_get_exdate_list() function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_exdate_list (GSList *exdate_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentDateTime *cdt;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		cdt = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (cdt-&gt;value != NULL);</div><div class='del'>-		g_free (cdt-&gt;value);</div><div class='del'>-		g_free ((char*)cdt-&gt;tzid);</div><div class='del'>-</div><div class='del'>-		g_free (cdt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (exdate_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_geo:</div><div class='del'>- * @geo: An #icalgeotype structure.</div><div class='del'>- *</div><div class='del'>- * Frees a struct #icalgeotype structure as returned by the calendar component</div><div class='del'>- * functions.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_geo (struct icalgeotype *geo)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (geo != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (geo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_icaltimetype:</div><div class='del'>- * @t: An #icaltimetype structure.</div><div class='del'>- *</div><div class='del'>- * Frees a struct #icaltimetype value as returned by the calendar component</div><div class='del'>- * functions.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_icaltimetype (struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_percent:</div><div class='del'>- * @percent: Percent value.</div><div class='del'>- *</div><div class='del'>- * Frees a percent value as returned by the cal_component_get_percent()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_percent (int *percent)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (percent != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (percent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_priority:</div><div class='del'>- * @priority: Priority value.</div><div class='del'>- *</div><div class='del'>- * Frees a priority value as returned by the cal_component_get_priority()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_priority (int *priority)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (priority != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (priority);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_period_list:</div><div class='del'>- * @period_list: List of #CalComponentPeriod structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalComponentPeriod structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_period_list (GSList *period_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = period_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentPeriod *period;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_free (period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_recur_list:</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of struct #icalrecurrencetype structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_recur_list (GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = recur_list; l; l = l-&gt;next) {</div><div class='del'>-		struct icalrecurrencetype *r;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		r = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_free (r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_sequence:</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Frees a sequence number value.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_sequence (int *sequence)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (sequence != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (sequence);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_text_list:</div><div class='del'>- * @text_list: List of #CalComponentText structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalComponentText structures.  This function should only be</div><div class='del'>- * used to free lists of text values as returned by the other getter functions</div><div class='del'>- * of #CalComponent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_text_list (GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = text_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *text;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_return_if_fail (text != NULL);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_attendee_list:</div><div class='del'>- * @attendee_list: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_attendee_list (GSList *attendee_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = attendee_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentAttendee *attendee;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-</div><div class='del'>-		attendee = l-&gt;data;</div><div class='del'>-		g_return_if_fail (attendee != NULL);</div><div class='del'>-		g_free (attendee);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (attendee_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_alarms:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Checks whether the component has any alarms.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has any alarms.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_alarms (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return g_hash_table_size (priv-&gt;alarm_uid_hash) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_add_alarm:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * </div><div class='del'>- * Adds an alarm subcomponent to a calendar component.  You should have created</div><div class='del'>- * the @alarm by using cal_component_alarm_new(); it is invalid to use a</div><div class='del'>- * #CalComponentAlarm structure that came from cal_component_get_alarm().  After</div><div class='del'>- * adding the alarm, the @alarm structure is no longer valid because the</div><div class='del'>- * internal structures may change and you should get rid of it by using</div><div class='del'>- * cal_component_alarm_free().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	add_alarm (comp, alarm-&gt;icalcomp, icalproperty_get_x (alarm-&gt;uid));</div><div class='del'>-	icalcomponent_add_component (priv-&gt;icalcomp, alarm-&gt;icalcomp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_remove_alarm:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * @auid: UID of the alarm to remove.</div><div class='del'>- * </div><div class='del'>- * Removes an alarm subcomponent from a calendar component.  If the alarm that</div><div class='del'>- * corresponds to the specified @auid had been fetched with</div><div class='del'>- * cal_component_get_alarm(), then those alarm structures will be invalid; you</div><div class='del'>- * should get rid of them with cal_component_alarm_free() before using this</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_remove_alarm (CalComponent *comp, const char *auid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *alarm;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (auid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	alarm = g_hash_table_lookup (priv-&gt;alarm_uid_hash, auid);</div><div class='del'>-	if (!alarm)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;alarm_uid_hash, auid);</div><div class='del'>-	icalcomponent_remove_component (priv-&gt;icalcomp, alarm);</div><div class='del'>-	icalcomponent_free (alarm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-for_each_remove_all_alarms (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp = CAL_COMPONENT (data);</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *alarm = value;</div><div class='del'>-	</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	icalcomponent_remove_component (priv-&gt;icalcomp, alarm);</div><div class='del'>-	icalcomponent_free (alarm);</div><div class='del'>-</div><div class='del'>-	return TRUE;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_remove_all_alarms:</div><div class='del'>- * @comp: A calendar component</div><div class='del'>- * </div><div class='del'>- * Remove all alarms from the calendar component</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_remove_all_alarms (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (priv-&gt;alarm_uid_hash, for_each_remove_all_alarms, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Scans an icalproperty from a calendar component and adds its mapping to our</div><div class='del'>- * own alarm structure.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-scan_alarm_property (CalComponentAlarm *alarm, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	icalproperty_kind kind;</div><div class='del'>-	const char *xname;</div><div class='del'>-</div><div class='del'>-	kind = icalproperty_isa (prop);</div><div class='del'>-</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_ACTION_PROPERTY:</div><div class='del'>-		alarm-&gt;action = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ATTACH_PROPERTY:</div><div class='del'>-		/* FIXME: mail alarms may have any number of these, not just one */</div><div class='del'>-		alarm-&gt;attach = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DESCRIPTION_PROPERTY:</div><div class='del'>-		alarm-&gt;description.prop = prop;</div><div class='del'>-		alarm-&gt;description.altrep_param = icalproperty_get_first_parameter (</div><div class='del'>-			prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DURATION_PROPERTY:</div><div class='del'>-		alarm-&gt;duration = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_REPEAT_PROPERTY:</div><div class='del'>-		alarm-&gt;repeat = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TRIGGER_PROPERTY:</div><div class='del'>-		alarm-&gt;trigger = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_X_PROPERTY:</div><div class='del'>-		xname = icalproperty_get_x_name (prop);</div><div class='del'>-		g_assert (xname != NULL);</div><div class='del'>-</div><div class='del'>-		if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0)</div><div class='del'>-			alarm-&gt;uid = prop;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a CalComponentAlarm from a libical alarm subcomponent */</div><div class='del'>-static CalComponentAlarm *</div><div class='del'>-make_alarm (icalcomponent *subcomp)</div><div class='del'>-{</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	alarm = g_new (CalComponentAlarm, 1);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;icalcomp = subcomp;</div><div class='del'>-	alarm-&gt;uid = NULL;</div><div class='del'>-</div><div class='del'>-	alarm-&gt;action = NULL;</div><div class='del'>-	alarm-&gt;attach = NULL;</div><div class='del'>-	alarm-&gt;description.prop = NULL;</div><div class='del'>-	alarm-&gt;description.altrep_param = NULL;</div><div class='del'>-	alarm-&gt;duration = NULL;</div><div class='del'>-	alarm-&gt;repeat = NULL;</div><div class='del'>-	alarm-&gt;trigger = NULL;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (subcomp, ICAL_ANY_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (subcomp, ICAL_ANY_PROPERTY))</div><div class='del'>-		scan_alarm_property (alarm, prop);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	return alarm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_alarm_uids:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- *</div><div class='del'>- * Builds a list of the unique identifiers of the alarm subcomponents inside a</div><div class='del'>- * calendar component.</div><div class='del'>- *</div><div class='del'>- * Return value: List of unique identifiers for alarms.  This should be freed</div><div class='del'>- * using cal_obj_uid_list_free().</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_component_get_alarm_uids (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	l = NULL;</div><div class='del'>-	for (iter = icalcomponent_begin_component (priv-&gt;icalcomp, ICAL_VALARM_COMPONENT);</div><div class='del'>-	     icalcompiter_deref (&amp;iter) != NULL;</div><div class='del'>-	     icalcompiter_next (&amp;iter)) {</div><div class='del'>-		icalcomponent *subcomp;</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		</div><div class='del'>-		subcomp = icalcompiter_deref (&amp;iter);</div><div class='del'>-		for (prop = icalcomponent_get_first_property (subcomp, ICAL_X_PROPERTY);</div><div class='del'>-		     prop;</div><div class='del'>-		     prop = icalcomponent_get_next_property (subcomp, ICAL_X_PROPERTY)) {</div><div class='del'>-			const char *xname;</div><div class='del'>-			</div><div class='del'>-			xname = icalproperty_get_x_name (prop);</div><div class='del'>-			g_assert (xname != NULL);</div><div class='del'>-			</div><div class='del'>-			if (strcmp (xname, EVOLUTION_ALARM_UID_PROPERTY) == 0) {</div><div class='del'>-				const char *auid;</div><div class='del'>-				</div><div class='del'>-				auid = alarm_uid_from_prop (prop);</div><div class='del'>-				l = g_list_append (l, g_strdup (auid));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_alarm:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * @auid: Unique identifier for the sought alarm subcomponent.</div><div class='del'>- *</div><div class='del'>- * Queries a particular alarm subcomponent of a calendar component.</div><div class='del'>- *</div><div class='del'>- * Return value: The alarm subcomponent that corresponds to the specified @auid,</div><div class='del'>- * or #NULL if no alarm exists with that UID.  This should be freed using</div><div class='del'>- * cal_component_alarm_free().</div><div class='del'>- **/</div><div class='del'>-CalComponentAlarm *</div><div class='del'>-cal_component_get_alarm (CalComponent *comp, const char *auid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *alarm;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (auid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	alarm = g_hash_table_lookup (priv-&gt;alarm_uid_hash, auid);</div><div class='del'>-</div><div class='del'>-	if (alarm)</div><div class='del'>-		return make_alarm (alarm);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarms_free:</div><div class='del'>- * @alarms: Component alarms structure.</div><div class='del'>- *</div><div class='del'>- * Frees a #CalComponentAlarms structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarms_free (CalComponentAlarms *alarms)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarms != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarms-&gt;comp != NULL);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (alarms-&gt;comp));</div><div class='del'>-</div><div class='del'>-	for (l = alarms-&gt;alarms; l; l = l-&gt;next) {</div><div class='del'>-		CalAlarmInstance *instance;</div><div class='del'>-</div><div class='del'>-		instance = l-&gt;data;</div><div class='del'>-		g_assert (instance != NULL);</div><div class='del'>-		g_free (instance);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (alarms-&gt;alarms);</div><div class='del'>-	g_free (alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_new:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Return value: a new alarm component</div><div class='del'>- **/</div><div class='del'>-CalComponentAlarm *</div><div class='del'>-cal_component_alarm_new (void)</div><div class='del'>-{</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	char *new_auid ;</div><div class='del'>-</div><div class='del'>-	alarm = g_new (CalComponentAlarm, 1);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;icalcomp = icalcomponent_new (ICAL_VALARM_COMPONENT);</div><div class='del'>-</div><div class='del'>-	new_auid = cal_component_gen_uid ();</div><div class='del'>-	alarm-&gt;uid = icalproperty_new_x (new_auid);</div><div class='del'>-	icalproperty_set_x_name (alarm-&gt;uid, EVOLUTION_ALARM_UID_PROPERTY);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;uid);</div><div class='del'>-	g_free (new_auid);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;action = NULL;</div><div class='del'>-	alarm-&gt;attach = NULL;</div><div class='del'>-	alarm-&gt;description.prop = NULL;</div><div class='del'>-	alarm-&gt;description.altrep_param = NULL;</div><div class='del'>-	alarm-&gt;duration = NULL;</div><div class='del'>-	alarm-&gt;repeat = NULL;</div><div class='del'>-	alarm-&gt;trigger = NULL;</div><div class='del'>-</div><div class='del'>-	return alarm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_clone:</div><div class='del'>- * @alarm: An alarm subcomponent.</div><div class='del'>- * </div><div class='del'>- * Creates a new alarm subcomponent by copying the information from another one.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created alarm subcomponent with the same values as the</div><div class='del'>- * original one.  Should be freed with cal_component_alarm_free().</div><div class='del'>- **/</div><div class='del'>-CalComponentAlarm *</div><div class='del'>-cal_component_alarm_clone (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (alarm != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	icalcomp = icalcomponent_new_clone (alarm-&gt;icalcomp);</div><div class='del'>-	return make_alarm (icalcomp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_free:</div><div class='del'>- * @alarm: A calendar alarm.</div><div class='del'>- *</div><div class='del'>- * Frees an alarm structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_free (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_get_parent (alarm-&gt;icalcomp) == NULL)</div><div class='del'>-		icalcomponent_free (alarm-&gt;icalcomp);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;icalcomp = NULL;</div><div class='del'>-	alarm-&gt;uid = NULL;</div><div class='del'>-	alarm-&gt;action = NULL;</div><div class='del'>-	alarm-&gt;attach = NULL;</div><div class='del'>-	alarm-&gt;description.prop = NULL;</div><div class='del'>-	alarm-&gt;description.altrep_param = NULL;</div><div class='del'>-	alarm-&gt;duration = NULL;</div><div class='del'>-	alarm-&gt;repeat = NULL;</div><div class='del'>-	alarm-&gt;trigger = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (alarm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_uid:</div><div class='del'>- * @alarm: An alarm subcomponent.</div><div class='del'>- *</div><div class='del'>- * Queries the unique identifier of an alarm subcomponent.</div><div class='del'>- *</div><div class='del'>- * Return value: UID of the alarm.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-cal_component_alarm_get_uid (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (alarm != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return alarm_uid_from_prop (alarm-&gt;uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_action:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @action: Return value for the alarm's action type.</div><div class='del'>- *</div><div class='del'>- * Queries the action type of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_action (CalComponentAlarm *alarm, CalAlarmAction *action)</div><div class='del'>-{</div><div class='del'>-	enum icalproperty_action ipa;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (action != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;action) {</div><div class='del'>-		*action = CAL_ALARM_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ipa = icalproperty_get_action (alarm-&gt;action);</div><div class='del'>-</div><div class='del'>-	switch (ipa) {</div><div class='del'>-	case ICAL_ACTION_AUDIO:</div><div class='del'>-		*action = CAL_ALARM_AUDIO;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ACTION_DISPLAY:</div><div class='del'>-		*action = CAL_ALARM_DISPLAY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ACTION_EMAIL:</div><div class='del'>-		*action = CAL_ALARM_EMAIL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ACTION_PROCEDURE:</div><div class='del'>-		*action = CAL_ALARM_PROCEDURE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_ACTION_NONE:</div><div class='del'>-		*action = CAL_ALARM_NONE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		*action = CAL_ALARM_UNKNOWN;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_action:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @action: Action type.</div><div class='del'>- *</div><div class='del'>- * Sets the action type for an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_action (CalComponentAlarm *alarm, CalAlarmAction action)</div><div class='del'>-{</div><div class='del'>-	enum icalproperty_action ipa;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (action != CAL_ALARM_NONE);</div><div class='del'>-	g_return_if_fail (action != CAL_ALARM_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_ALARM_AUDIO:</div><div class='del'>-		ipa = ICAL_ACTION_AUDIO;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_DISPLAY:</div><div class='del'>-		ipa = ICAL_ACTION_DISPLAY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_EMAIL:</div><div class='del'>-		ipa = ICAL_ACTION_EMAIL;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_PROCEDURE:</div><div class='del'>-		ipa = ICAL_ACTION_PROCEDURE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		ipa = ICAL_ACTION_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;action)</div><div class='del'>-		icalproperty_set_action (alarm-&gt;action, ipa);</div><div class='del'>-	else {</div><div class='del'>-		alarm-&gt;action = icalproperty_new_action (ipa);</div><div class='del'>-		icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;action);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_attach:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @attach: Return value for the attachment; should be freed using icalattach_unref().</div><div class='del'>- * </div><div class='del'>- * Queries the attachment property of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_attach (CalComponentAlarm *alarm, icalattach **attach)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (attach != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;attach) {</div><div class='del'>-		*attach = icalproperty_get_attach (alarm-&gt;attach);</div><div class='del'>-		icalattach_ref (*attach);</div><div class='del'>-	} else</div><div class='del'>-		*attach = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_attach:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @attach: Attachment property or NULL to remove an existing property.</div><div class='del'>- * </div><div class='del'>- * Sets the attachment property of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_attach (CalComponentAlarm *alarm, icalattach *attach)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;attach) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;attach);</div><div class='del'>-		icalproperty_free (alarm-&gt;attach);</div><div class='del'>-		alarm-&gt;attach = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attach) {</div><div class='del'>-		alarm-&gt;attach = icalproperty_new_attach (attach);</div><div class='del'>-		icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;attach);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_description:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @description: Return value for the description property and its parameters.</div><div class='del'>- * </div><div class='del'>- * Queries the description property of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_description (CalComponentAlarm *alarm, CalComponentText *description)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (description != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;description.prop)</div><div class='del'>-		description-&gt;value = icalproperty_get_description (alarm-&gt;description.prop);</div><div class='del'>-	else</div><div class='del'>-		description-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;description.altrep_param)</div><div class='del'>-		description-&gt;altrep = icalparameter_get_altrep (alarm-&gt;description.altrep_param);</div><div class='del'>-	else</div><div class='del'>-		description-&gt;altrep = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_description:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @description: Description property and its parameters, or NULL for no description.</div><div class='del'>- * </div><div class='del'>- * Sets the description property of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_description (CalComponentAlarm *alarm, CalComponentText *description)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;description.prop) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;description.prop);</div><div class='del'>-		icalproperty_free (alarm-&gt;description.prop);</div><div class='del'>-</div><div class='del'>-		alarm-&gt;description.prop = NULL;</div><div class='del'>-		alarm-&gt;description.altrep_param = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!description)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (description-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;description.prop = icalproperty_new_description (description-&gt;value);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;description.prop);</div><div class='del'>-</div><div class='del'>-	if (description-&gt;altrep) {</div><div class='del'>-		alarm-&gt;description.altrep_param = icalparameter_new_altrep (</div><div class='del'>-			(char *) description-&gt;altrep);</div><div class='del'>-		icalproperty_add_parameter (alarm-&gt;description.prop,</div><div class='del'>-					    alarm-&gt;description.altrep_param);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_repeat:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @repeat: Return value for the repeat/duration properties.</div><div class='del'>- * </div><div class='del'>- * Queries the repeat/duration properties of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_repeat (CalComponentAlarm *alarm, CalAlarmRepeat *repeat)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (repeat != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!(alarm-&gt;repeat &amp;&amp; alarm-&gt;duration)) {</div><div class='del'>-		repeat-&gt;repetitions = 0;</div><div class='del'>-		memset (&amp;repeat-&gt;duration, 0, sizeof (repeat-&gt;duration));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	repeat-&gt;repetitions = icalproperty_get_repeat (alarm-&gt;repeat);</div><div class='del'>-	repeat-&gt;duration = icalproperty_get_duration (alarm-&gt;duration);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_repeat:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @repeat: Repeat/duration values.  To remove any repetitions from the alarm,</div><div class='del'>- * set the @repeat.repetitions to 0.</div><div class='del'>- * </div><div class='del'>- * Sets the repeat/duration values for an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_repeat (CalComponentAlarm *alarm, CalAlarmRepeat repeat)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (repeat.repetitions &gt;= 0);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Delete old properties */</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;repeat) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;repeat);</div><div class='del'>-		icalproperty_free (alarm-&gt;repeat);</div><div class='del'>-		alarm-&gt;repeat = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;duration) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;duration);</div><div class='del'>-		icalproperty_free (alarm-&gt;duration);</div><div class='del'>-		alarm-&gt;duration = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the new properties */</div><div class='del'>-</div><div class='del'>-	if (repeat.repetitions == 0)</div><div class='del'>-		return; /* For zero extra repetitions the properties should not exist */</div><div class='del'>-</div><div class='del'>-	alarm-&gt;repeat = icalproperty_new_repeat (repeat.repetitions);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;repeat);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;duration = icalproperty_new_duration (repeat.duration);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;duration);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_trigger:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @trigger: Return value for the trigger time.</div><div class='del'>- *</div><div class='del'>- * Queries the trigger time for an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	struct icaltriggertype t;</div><div class='del'>-	gboolean relative;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (trigger != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;trigger) {</div><div class='del'>-		trigger-&gt;type = CAL_ALARM_TRIGGER_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get trigger type */</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_VALUE_PARAMETER);</div><div class='del'>-	if (param) {</div><div class='del'>-		icalparameter_value value;</div><div class='del'>-</div><div class='del'>-		value = icalparameter_get_value (param);</div><div class='del'>-</div><div class='del'>-		switch (value) {</div><div class='del'>-		case ICAL_VALUE_DURATION:</div><div class='del'>-			relative = TRUE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICAL_VALUE_DATETIME:</div><div class='del'>-			relative = FALSE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "</div><div class='del'>-				   "value %d; using RELATIVE", value);</div><div class='del'>-</div><div class='del'>-			relative = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		relative = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Get trigger value and the RELATED parameter */</div><div class='del'>-</div><div class='del'>-	t = icalproperty_get_trigger (alarm-&gt;trigger);</div><div class='del'>-</div><div class='del'>-	if (relative) {</div><div class='del'>-		trigger-&gt;u.rel_duration = t.duration;</div><div class='del'>-</div><div class='del'>-		param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_RELATED_PARAMETER);</div><div class='del'>-		if (param) {</div><div class='del'>-			icalparameter_related rel;</div><div class='del'>-</div><div class='del'>-			rel = icalparameter_get_related (param);</div><div class='del'>-</div><div class='del'>-			switch (rel) {</div><div class='del'>-			case ICAL_RELATED_START:</div><div class='del'>-				trigger-&gt;type = CAL_ALARM_TRIGGER_RELATIVE_START;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_RELATED_END:</div><div class='del'>-				trigger-&gt;type = CAL_ALARM_TRIGGER_RELATIVE_END;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				g_assert_not_reached ();</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			trigger-&gt;type = CAL_ALARM_TRIGGER_RELATIVE_START;</div><div class='del'>-	} else {</div><div class='del'>-		trigger-&gt;u.abs_time = t.time;</div><div class='del'>-		trigger-&gt;type = CAL_ALARM_TRIGGER_ABSOLUTE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_trigger:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @trigger: Trigger time structure.</div><div class='del'>- *</div><div class='del'>- * Sets the trigger time of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger trigger)</div><div class='del'>-{</div><div class='del'>-	struct icaltriggertype t;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalparameter_value value_type;</div><div class='del'>-	icalparameter_related related;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (trigger.type != CAL_ALARM_TRIGGER_NONE);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Delete old trigger */</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;trigger) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;trigger);</div><div class='del'>-		icalproperty_free (alarm-&gt;trigger);</div><div class='del'>-		alarm-&gt;trigger = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	related = ICAL_RELATED_START; /* Keep GCC happy */</div><div class='del'>-</div><div class='del'>-	t.time = icaltime_null_time ();</div><div class='del'>-	t.duration = icaldurationtype_null_duration ();</div><div class='del'>-	switch (trigger.type) {</div><div class='del'>-	case CAL_ALARM_TRIGGER_RELATIVE_START:</div><div class='del'>-		t.duration = trigger.u.rel_duration;</div><div class='del'>-		value_type = ICAL_VALUE_DURATION;</div><div class='del'>-		related = ICAL_RELATED_START;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_TRIGGER_RELATIVE_END:</div><div class='del'>-		t.duration = trigger.u.rel_duration;</div><div class='del'>-		value_type = ICAL_VALUE_DURATION;</div><div class='del'>-		related = ICAL_RELATED_END;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_TRIGGER_ABSOLUTE:</div><div class='del'>-		t.time = trigger.u.abs_time;</div><div class='del'>-		value_type = ICAL_VALUE_DATETIME;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alarm-&gt;trigger = icalproperty_new_trigger (t);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;trigger);</div><div class='del'>-</div><div class='del'>-	/* Value parameters */</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_VALUE_PARAMETER);</div><div class='del'>-	if (param)</div><div class='del'>-		icalparameter_set_value (param, value_type);</div><div class='del'>-	else {</div><div class='del'>-		param = icalparameter_new_value (value_type);</div><div class='del'>-		icalproperty_add_parameter (alarm-&gt;trigger, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Related parameter */</div><div class='del'>-</div><div class='del'>-	if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE) {</div><div class='del'>-		param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_RELATED_PARAMETER);</div><div class='del'>-</div><div class='del'>-		if (param)</div><div class='del'>-			icalparameter_set_related (param, related);</div><div class='del'>-		else {</div><div class='del'>-			param = icalparameter_new_related (related);</div><div class='del'>-			icalproperty_add_parameter (alarm-&gt;trigger, param);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if both strings match, i.e. they are both NULL or the</div><div class='del'>-   strings are equal. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_component_strings_match	(const gchar	*string1,</div><div class='del'>-				 const gchar	*string2)</div><div class='del'>-{</div><div class='del'>-	if (string1 == NULL || string2 == NULL)</div><div class='del'>-		return (string1 == string2) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (string1, string2))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_event_dates_match:</div><div class='del'>- * @comp1: A calendar component object.</div><div class='del'>- * @comp2: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Checks if the DTSTART and DTEND properties of the 2 components match.</div><div class='del'>- * Note that the events may have different recurrence properties which are not</div><div class='del'>- * taken into account here.</div><div class='del'>- *</div><div class='del'>- * Returns: TRUE if the DTSTART and DTEND properties of the 2 components match.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_event_dates_match	(CalComponent *comp1,</div><div class='del'>-				 CalComponent *comp2)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime comp1_dtstart, comp1_dtend;</div><div class='del'>-	CalComponentDateTime comp2_dtstart, comp2_dtend;</div><div class='del'>-	gboolean retval = TRUE;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp1, &amp;comp1_dtstart);</div><div class='del'>-	cal_component_get_dtend   (comp1, &amp;comp1_dtend);</div><div class='del'>-	cal_component_get_dtstart (comp2, &amp;comp2_dtstart);</div><div class='del'>-	cal_component_get_dtend   (comp2, &amp;comp2_dtend);</div><div class='del'>-</div><div class='del'>-	/* If either value is NULL they must both be NULL to match. */</div><div class='del'>-	if (comp1_dtstart.value == NULL || comp2_dtstart.value == NULL) {</div><div class='del'>-		if (comp1_dtstart.value != comp2_dtstart.value) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (icaltime_compare (*comp1_dtstart.value,</div><div class='del'>-				      *comp2_dtstart.value)) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp1_dtend.value == NULL || comp2_dtend.value == NULL) {</div><div class='del'>-		if (comp1_dtend.value != comp2_dtend.value) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (icaltime_compare (*comp1_dtend.value,</div><div class='del'>-				      *comp2_dtend.value)) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now check the timezones. */</div><div class='del'>-	if (!cal_component_strings_match (comp1_dtstart.tzid,</div><div class='del'>-					  comp2_dtstart.tzid)) {</div><div class='del'>-		retval = FALSE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cal_component_strings_match (comp1_dtend.tzid,</div><div class='del'>-					  comp2_dtend.tzid)) {</div><div class='del'>-		retval = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;comp1_dtstart);</div><div class='del'>-	cal_component_free_datetime (&amp;comp1_dtend);</div><div class='del'>-	cal_component_free_datetime (&amp;comp2_dtstart);</div><div class='del'>-	cal_component_free_datetime (&amp;comp2_dtend);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h<br/>deleted file mode 100644<br/>index 4961c504e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-component.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,438 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar component object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_COMPONENT_H</div><div class='del'>-#define CAL_COMPONENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())</div><div class='del'>-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))</div><div class='del'>-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\</div><div class='del'>-				       CalComponentClass))</div><div class='del'>-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))</div><div class='del'>-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))</div><div class='del'>-</div><div class='del'>-/* Types of calendar components to be stored by a CalComponent, as per RFC 2445.</div><div class='del'>- * We don't put the alarm component type here since we store alarms as separate</div><div class='del'>- * structures inside the other "real" components.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_NO_TYPE,</div><div class='del'>-	CAL_COMPONENT_EVENT,</div><div class='del'>-	CAL_COMPONENT_TODO,</div><div class='del'>-	CAL_COMPONENT_JOURNAL,</div><div class='del'>-	CAL_COMPONENT_FREEBUSY,</div><div class='del'>-	CAL_COMPONENT_TIMEZONE</div><div class='del'>-} CalComponentVType;</div><div class='del'>-</div><div class='del'>-/* Field identifiers for a calendar component; these are used by the data model</div><div class='del'>- * for ETable.</div><div class='del'>- *</div><div class='del'>- * NOTE: These are also used in the ETable specification, and the column</div><div class='del'>- *       numbers are saved in the user settings file. So don't reorder them!</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */</div><div class='del'>-	CAL_COMPONENT_FIELD_CLASSIFICATION,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETED,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTEND,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTSTART,</div><div class='del'>-	CAL_COMPONENT_FIELD_DUE,</div><div class='del'>-	CAL_COMPONENT_FIELD_GEO,</div><div class='del'>-	CAL_COMPONENT_FIELD_PERCENT,</div><div class='del'>-	CAL_COMPONENT_FIELD_PRIORITY,</div><div class='del'>-	CAL_COMPONENT_FIELD_SUMMARY,</div><div class='del'>-	CAL_COMPONENT_FIELD_TRANSPARENCY,</div><div class='del'>-	CAL_COMPONENT_FIELD_URL,</div><div class='del'>-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_STATUS,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPONENT,		/* not a real field */</div><div class='del'>-#if 0</div><div class='del'>-	CAL_COMPONENT_FIELD_LOCATION,</div><div class='del'>-#endif</div><div class='del'>-	CAL_COMPONENT_FIELD_NUM_FIELDS</div><div class='del'>-} CalComponentField;</div><div class='del'>-</div><div class='del'>-/* Structures and enumerations to return properties and their parameters */</div><div class='del'>-</div><div class='del'>-/* CLASSIFICATION property */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_CLASS_NONE,</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	CAL_COMPONENT_CLASS_UNKNOWN</div><div class='del'>-} CalComponentClassification;</div><div class='del'>-</div><div class='del'>-/* Properties that have time and timezone information */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Actual date/time value */</div><div class='del'>-	struct icaltimetype *value;</div><div class='del'>-</div><div class='del'>-	/* Timezone ID */</div><div class='del'>-	const char *tzid;</div><div class='del'>-} CalComponentDateTime;</div><div class='del'>-</div><div class='del'>-/* Way in which a period of time is specified */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_PERIOD_DATETIME,</div><div class='del'>-	CAL_COMPONENT_PERIOD_DURATION</div><div class='del'>-} CalComponentPeriodType;</div><div class='del'>-</div><div class='del'>-/* Period of time, can have explicit start/end times or start/duration instead */</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentPeriodType type;</div><div class='del'>-</div><div class='del'>-	struct icaltimetype start;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaltimetype end;</div><div class='del'>-		struct icaldurationtype duration;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentPeriod;</div><div class='del'>-</div><div class='del'>-/* The type of range */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_RANGE_SINGLE,</div><div class='del'>-	CAL_COMPONENT_RANGE_THISPRIOR,</div><div class='del'>-	CAL_COMPONENT_RANGE_THISFUTURE,</div><div class='del'>-} CalComponentRangeType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentRangeType type;</div><div class='del'>-	</div><div class='del'>-	CalComponentDateTime datetime;</div><div class='del'>-} CalComponentRange;</div><div class='del'>-</div><div class='del'>-/* Text properties */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Description string */</div><div class='del'>-	const char *value;</div><div class='del'>-</div><div class='del'>-	/* Alternate representation URI */</div><div class='del'>-	const char *altrep;</div><div class='del'>-} CalComponentText;</div><div class='del'>-</div><div class='del'>-/* Time transparency */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_TRANSP_NONE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-	CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_UNKNOWN</div><div class='del'>-} CalComponentTransparency;</div><div class='del'>-</div><div class='del'>-/* Organizer &amp; Attendee */	</div><div class='del'>-typedef struct {</div><div class='del'>-	const char *value;</div><div class='del'>-	</div><div class='del'>-	const char *member;</div><div class='del'>-	icalparameter_cutype cutype;</div><div class='del'>-	icalparameter_role role;</div><div class='del'>-	icalparameter_partstat status;</div><div class='del'>-	gboolean rsvp;</div><div class='del'>-	</div><div class='del'>-	const char *delto;</div><div class='del'>-	const char *delfrom;</div><div class='del'>-	const char *sentby;</div><div class='del'>-	const char *cn;</div><div class='del'>-	const char *language;</div><div class='del'>-} CalComponentAttendee;</div><div class='del'>-	</div><div class='del'>-typedef struct {</div><div class='del'>-	const char *value;</div><div class='del'>-	const char *sentby;</div><div class='del'>-	const char *cn;</div><div class='del'>-	const char *language;</div><div class='del'>-} CalComponentOrganizer;</div><div class='del'>-</div><div class='del'>-/* Main calendar component object */</div><div class='del'>-</div><div class='del'>-typedef struct _CalComponent CalComponent;</div><div class='del'>-typedef struct _CalComponentClass CalComponentClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalComponentPrivate CalComponentPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalComponent {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalComponentClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Calendar component */</div><div class='del'>-</div><div class='del'>-GtkType cal_component_get_type (void);</div><div class='del'>-</div><div class='del'>-char *cal_component_gen_uid (void);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_component_new (void);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_component_clone (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp);</div><div class='del'>-icalcomponent *cal_component_get_icalcomponent (CalComponent *comp);</div><div class='del'>-void cal_component_rescan (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-CalComponentVType cal_component_get_vtype (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-char *cal_component_get_as_string (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_commit_sequence (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_uid (CalComponent *comp, const char **uid);</div><div class='del'>-void cal_component_set_uid (CalComponent *comp, const char *uid);</div><div class='del'>-</div><div class='del'>-void cal_component_get_categories (CalComponent *comp, const char **categories);</div><div class='del'>-void cal_component_set_categories (CalComponent *comp, const char *categories);</div><div class='del'>-void cal_component_get_categories_list (CalComponent *comp, GSList **categ_list);</div><div class='del'>-void cal_component_set_categories_list (CalComponent *comp, GSList *categ_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif);</div><div class='del'>-void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif);</div><div class='del'>-</div><div class='del'>-void cal_component_get_comment_list (CalComponent *comp, GSList **text_list);</div><div class='del'>-void cal_component_set_comment_list (CalComponent *comp, GSList *text_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_completed (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_completed (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_contact_list (CalComponent *comp, GSList **text_list);</div><div class='del'>-void cal_component_set_contact_list (CalComponent *comp, GSList *text_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_created (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_created (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_description_list (CalComponent *comp, GSList **text_list);</div><div class='del'>-void cal_component_set_description_list (CalComponent *comp, GSList *text_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-void cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list);</div><div class='del'>-void cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list);</div><div class='del'>-gboolean cal_component_has_exdates (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list);</div><div class='del'>-gboolean cal_component_has_exrules (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_exceptions (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo);</div><div class='del'>-void cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo);</div><div class='del'>-</div><div class='del'>-void cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_organizer (CalComponent *comp, CalComponentOrganizer *organizer);</div><div class='del'>-void cal_component_set_organizer (CalComponent *comp, CalComponentOrganizer *organizer);</div><div class='del'>-gboolean cal_component_has_organizer (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_percent (CalComponent *comp, int **percent);</div><div class='del'>-void cal_component_set_percent (CalComponent *comp, int *percent);</div><div class='del'>-</div><div class='del'>-void cal_component_get_priority (CalComponent *comp, int **priority);</div><div class='del'>-void cal_component_set_priority (CalComponent *comp, int *priority);</div><div class='del'>-</div><div class='del'>-void cal_component_get_recurid (CalComponent *comp, CalComponentRange *recur_id);</div><div class='del'>-void cal_component_set_recurid (CalComponent *comp, CalComponentRange *recur_id);</div><div class='del'>-</div><div class='del'>-void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);</div><div class='del'>-void cal_component_set_rdate_list (CalComponent *comp, GSList *period_list);</div><div class='del'>-gboolean cal_component_has_rdates (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list);</div><div class='del'>-gboolean cal_component_has_rrules (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_recurrences (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_sequence (CalComponent *comp, int **sequence);</div><div class='del'>-void cal_component_set_sequence (CalComponent *comp, int *sequence);</div><div class='del'>-</div><div class='del'>-void cal_component_get_status (CalComponent *comp, icalproperty_status *status);</div><div class='del'>-void cal_component_set_status (CalComponent *comp, icalproperty_status status);</div><div class='del'>-</div><div class='del'>-void cal_component_get_summary (CalComponent *comp, CalComponentText *summary);</div><div class='del'>-void cal_component_set_summary (CalComponent *comp, CalComponentText *summary);</div><div class='del'>-</div><div class='del'>-void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp);</div><div class='del'>-void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_url (CalComponent *comp, const char **url);</div><div class='del'>-void cal_component_set_url (CalComponent *comp, const char *url);</div><div class='del'>-</div><div class='del'>-void cal_component_get_attendee_list (CalComponent *comp, GSList **attendee_list);</div><div class='del'>-void cal_component_set_attendee_list (CalComponent *comp, GSList *attendee_list);</div><div class='del'>-gboolean cal_component_has_attendees (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_location (CalComponent *comp, const char **location);</div><div class='del'>-void cal_component_set_location (CalComponent *comp, const char *location);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_event_dates_match (CalComponent *comp1, CalComponent *comp2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Functions to free returned values */</div><div class='del'>-</div><div class='del'>-void cal_component_free_categories_list (GSList *categ_list);</div><div class='del'>-void cal_component_free_datetime (CalComponentDateTime *dt);</div><div class='del'>-void cal_component_free_exdate_list (GSList *exdate_list);</div><div class='del'>-void cal_component_free_geo (struct icalgeotype *geo);</div><div class='del'>-void cal_component_free_icaltimetype (struct icaltimetype *t);</div><div class='del'>-void cal_component_free_percent (int *percent);</div><div class='del'>-void cal_component_free_priority (int *priority);</div><div class='del'>-void cal_component_free_period_list (GSList *period_list);</div><div class='del'>-void cal_component_free_recur_list (GSList *recur_list);</div><div class='del'>-void cal_component_free_sequence (int *sequence);</div><div class='del'>-void cal_component_free_text_list (GSList *text_list);</div><div class='del'>-void cal_component_free_attendee_list (GSList *attendee_list);</div><div class='del'>-</div><div class='del'>-/* Alarms */</div><div class='del'>-</div><div class='del'>-/* Opaque structure used to represent alarm subcomponents */</div><div class='del'>-typedef struct _CalComponentAlarm CalComponentAlarm;</div><div class='del'>-</div><div class='del'>-/* An alarm occurrence, i.e. a trigger instance */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* UID of the alarm that triggered */</div><div class='del'>-	const char *auid;</div><div class='del'>-</div><div class='del'>-	/* Trigger time, i.e. "5 minutes before the appointment" */</div><div class='del'>-	time_t trigger;</div><div class='del'>-</div><div class='del'>-	/* Actual event occurrence to which this trigger corresponds */</div><div class='del'>-	time_t occur_start;</div><div class='del'>-	time_t occur_end;</div><div class='del'>-} CalAlarmInstance;</div><div class='del'>-</div><div class='del'>-/* Alarm trigger instances for a particular component */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* The actual component */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* List of CalAlarmInstance structures */</div><div class='del'>-	GSList *alarms;</div><div class='del'>-} CalComponentAlarms;</div><div class='del'>-</div><div class='del'>-/* Alarm types */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_ALARM_NONE,</div><div class='del'>-	CAL_ALARM_AUDIO,</div><div class='del'>-	CAL_ALARM_DISPLAY,</div><div class='del'>-	CAL_ALARM_EMAIL,</div><div class='del'>-	CAL_ALARM_PROCEDURE,</div><div class='del'>-	CAL_ALARM_UNKNOWN</div><div class='del'>-} CalAlarmAction;</div><div class='del'>-</div><div class='del'>-/* Whether a trigger is relative to the start or end of an event occurrence, or</div><div class='del'>- * whether it is specified to occur at an absolute time.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_ALARM_TRIGGER_NONE,</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_START,</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_END,</div><div class='del'>-	CAL_ALARM_TRIGGER_ABSOLUTE</div><div class='del'>-} CalAlarmTriggerType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalAlarmTriggerType type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaldurationtype rel_duration;</div><div class='del'>-		struct icaltimetype abs_time;</div><div class='del'>-	} u;</div><div class='del'>-} CalAlarmTrigger;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Number of extra repetitions, zero for none */</div><div class='del'>-	int repetitions;</div><div class='del'>-</div><div class='del'>-	/* Interval between repetitions */</div><div class='del'>-	struct icaldurationtype duration;</div><div class='del'>-} CalAlarmRepeat;</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_alarms (CalComponent *comp);</div><div class='del'>-void cal_component_add_alarm (CalComponent *comp, CalComponentAlarm *alarm);</div><div class='del'>-void cal_component_remove_alarm (CalComponent *comp, const char *auid);</div><div class='del'>-void cal_component_remove_all_alarms (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-GList *cal_component_get_alarm_uids (CalComponent *comp);</div><div class='del'>-CalComponentAlarm *cal_component_get_alarm (CalComponent *comp, const char *auid);</div><div class='del'>-</div><div class='del'>-void cal_component_alarms_free (CalComponentAlarms *alarms);</div><div class='del'>-</div><div class='del'>-/* CalComponentAlarms */</div><div class='del'>-CalComponentAlarm *cal_component_alarm_new (void);</div><div class='del'>-CalComponentAlarm *cal_component_alarm_clone (CalComponentAlarm *alarm);</div><div class='del'>-void cal_component_alarm_free (CalComponentAlarm *alarm);</div><div class='del'>-</div><div class='del'>-const char *cal_component_alarm_get_uid (CalComponentAlarm *alarm);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalAlarmAction *action);</div><div class='del'>-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalAlarmAction action);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_attach (CalComponentAlarm *alarm, icalattach **attach);</div><div class='del'>-void cal_component_alarm_set_attach (CalComponentAlarm *alarm, icalattach *attach);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_description (CalComponentAlarm *alarm, CalComponentText *description);</div><div class='del'>-void cal_component_alarm_set_description (CalComponentAlarm *alarm, CalComponentText *description);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_repeat (CalComponentAlarm *alarm, CalAlarmRepeat *repeat);</div><div class='del'>-void cal_component_alarm_set_repeat (CalComponentAlarm *alarm, CalAlarmRepeat repeat);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalAlarmTrigger *trigger);</div><div class='del'>-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalAlarmTrigger trigger);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c<br/>deleted file mode 100644<br/>index e050004031..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3980 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Evolution calendar recurrence rule functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Introduction to The Recurrence Generation Functions:</div><div class='del'>- *</div><div class='del'>- * Note: This is pretty complicated. See the iCalendar spec (RFC 2445) for</div><div class='del'>- *       the specification of the recurrence rules and lots of examples</div><div class='del'>- *	 (sections 4.3.10 &amp; 4.8.5). We also want to support the older</div><div class='del'>- *	 vCalendar spec, though this should be easy since it is basically a</div><div class='del'>- *	 subset of iCalendar.</div><div class='del'>- *</div><div class='del'>- * o An iCalendar event can have any number of recurrence rules specifying</div><div class='del'>- *   occurrences of the event, as well as dates &amp; times of specific</div><div class='del'>- *   occurrences. It can also have any number of recurrence rules and</div><div class='del'>- *   specific dates &amp; times specifying exceptions to the occurrences.</div><div class='del'>- *   So we first merge all the occurrences generated, eliminating any</div><div class='del'>- *   duplicates, then we generate all the exceptions and remove these to</div><div class='del'>- *   form the final set of occurrences.</div><div class='del'>- *</div><div class='del'>- * o There are 7 frequencies of occurrences: YEARLY, MONTHLY, WEEKLY, DAILY,</div><div class='del'>- *   HOURLY, MINUTELY &amp; SECONDLY. The 'interval' property specifies the</div><div class='del'>- *   multiples of the frequency which we step by. We generate a 'set' of</div><div class='del'>- *   occurrences for each period defined by the frequency &amp; interval.</div><div class='del'>- *   So for a YEARLY frequency with an interval of 3, we generate a set of</div><div class='del'>- *   occurrences for every 3rd year. We use complete years here -  any</div><div class='del'>- *   generated occurrences that occur before the event's start (or after its</div><div class='del'>- *   end) are just discarded.</div><div class='del'>- *</div><div class='del'>- * o There are 8 frequency modifiers: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY,</div><div class='del'>- *   BYDAY, BYHOUR, BYMINUTE &amp; BYSECOND. These can either add extra occurrences</div><div class='del'>- *   or filter out occurrences. For example 'FREQ=YEARLY;BYMONTH=1,2' produces</div><div class='del'>- *   2 occurrences for each year rather than the default 1. And</div><div class='del'>- *   'FREQ=DAILY;BYMONTH=1' filters out all occurrences except those in Jan.</div><div class='del'>- *   If the modifier works on periods which are less than the recurrence</div><div class='del'>- *   frequency, then extra occurrences are added, otherwise occurrences are</div><div class='del'>- *   filtered. So we have 2 functions for each modifier - one to expand events</div><div class='del'>- *   and the other to filter. We use a table of functions for each frequency</div><div class='del'>- *   which points to the appropriate function to use for each modifier.</div><div class='del'>- *</div><div class='del'>- * o Any number of frequency modifiers can be used in a recurrence rule.</div><div class='del'>- *   (Though the iCalendar spec says that BYWEEKNO can only be used in a YEARLY</div><div class='del'>- *   rule, and some modifiers aren't appropriate for some frequencies - e.g.</div><div class='del'>- *   BYMONTHDAY is not really useful in a WEEKLY frequency, and BYYEARDAY is</div><div class='del'>- *   not useful in a MONTHLY or WEEKLY frequency).</div><div class='del'>- *   The frequency modifiers are applied in the order given above. The first 5</div><div class='del'>- *   modifier rules (BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY &amp; BYDAY) all</div><div class='del'>- *   produce the days on which the occurrences take place, and so we have to</div><div class='del'>- *   compute some of these in parallel rather than sequentially, or we may end</div><div class='del'>- *   up with too many days.</div><div class='del'>- *</div><div class='del'>- * o Note that some expansion functions may produce days which are invalid,</div><div class='del'>- *   e.g. 31st September, 30th Feb. These invalid days are removed before the</div><div class='del'>- *   BYHOUR, BYMINUTE &amp; BYSECOND modifier functions are applied.</div><div class='del'>- *</div><div class='del'>- * o After the set of occurrences for the frequency interval are generated,</div><div class='del'>- *   the BYSETPOS property is used to select which of the occurrences are</div><div class='del'>- *   finally output. If BYSETPOS is not specified then all the occurrences are</div><div class='del'>- *   output.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * FIXME: I think there are a few errors in this code:</div><div class='del'>- *</div><div class='del'>- *  1) I'm not sure it should be generating events in parallel like it says</div><div class='del'>- *     above. That needs to be checked.</div><div class='del'>- *</div><div class='del'>- *  2) I didn't think about timezone changes when implementing this. I just</div><div class='del'>- *     assumed all the occurrences of the event would be in local time.</div><div class='del'>- *     But when clocks go back or forwards due to daylight-saving time, some</div><div class='del'>- *     special handling may be needed, especially for the shorter frequencies.</div><div class='del'>- *     e.g. for a MINUTELY frequency it should probably iterate over all the</div><div class='del'>- *     minutes before and after clocks go back (i.e. some may be the same local</div><div class='del'>- *     time but have different UTC offsets). For longer frequencies, if an</div><div class='del'>- *     occurrence lands on the overlapping or non-existant time when clocks</div><div class='del'>- *     go back/forward, then it may need to choose which of the times to use</div><div class='del'>- *     or move the time forward or something. I'm not sure this is clear in the</div><div class='del'>- *     spec.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is the maximum year we will go up to (inclusive). Since we use time_t</div><div class='del'>-   values we can't go past 2037 anyway, and some of our VTIMEZONEs may stop</div><div class='del'>-   at 2037 as well. */</div><div class='del'>-#define MAX_YEAR	2037</div><div class='del'>-</div><div class='del'>-/* Define this for some debugging output. */</div><div class='del'>-#if 0</div><div class='del'>-#define CAL_OBJ_DEBUG	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* We will use icalrecurrencetype instead of this eventually. */</div><div class='del'>-typedef struct {</div><div class='del'>-	icalrecurrencetype_frequency freq;</div><div class='del'>-</div><div class='del'>-	int            interval;</div><div class='del'>-</div><div class='del'>-	/* Specifies the end of the recurrence, inclusive. No occurrences are</div><div class='del'>-	   generated after this date. If it is 0, the event recurs forever. */</div><div class='del'>-	time_t         enddate;</div><div class='del'>-</div><div class='del'>-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */</div><div class='del'>-	gint	       week_start_day;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* NOTE: I've used GList's here, but it doesn't matter if we use</div><div class='del'>-	   other data structures like arrays. The code should be easy to</div><div class='del'>-	   change. So long as it is easy to see if the modifier is set. */</div><div class='del'>-</div><div class='del'>-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */</div><div class='del'>-	GList	      *bymonth;</div><div class='del'>-</div><div class='del'>-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */</div><div class='del'>-	GList	      *byweekno;</div><div class='del'>-</div><div class='del'>-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */</div><div class='del'>-	GList	      *byyearday;</div><div class='del'>-</div><div class='del'>-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */</div><div class='del'>-	GList	      *bymonthday;</div><div class='del'>-</div><div class='del'>-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.</div><div class='del'>-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.</div><div class='del'>-	   The second of each pair is the week number [+-]0-53. */</div><div class='del'>-	GList	      *byday;</div><div class='del'>-</div><div class='del'>-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */</div><div class='del'>-	GList	      *byhour;</div><div class='del'>-</div><div class='del'>-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */</div><div class='del'>-	GList	      *byminute;</div><div class='del'>-</div><div class='del'>-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */</div><div class='del'>-	GList	      *bysecond;</div><div class='del'>-</div><div class='del'>-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */</div><div class='del'>-	GList	      *bysetpos;</div><div class='del'>-} CalRecurrence;</div><div class='del'>-</div><div class='del'>-/* This is what we use to pass to all the filter functions. */</div><div class='del'>-typedef struct _RecurData RecurData;</div><div class='del'>-struct _RecurData {</div><div class='del'>-	CalRecurrence *recur;</div><div class='del'>-</div><div class='del'>-	/* This is used for the WEEKLY frequency. It is the offset from the</div><div class='del'>-	   week_start_day. */</div><div class='del'>-	gint weekday_offset;</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYMONTH filtering. */</div><div class='del'>-	guint8 months[12];</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYYEARDAY filtering. */</div><div class='del'>-	guint8 yeardays[367], neg_yeardays[367]; /* Days are 1 - 366. */</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYMONTHDAY filtering. */</div><div class='del'>-	guint8 monthdays[32], neg_monthdays[32]; /* Days are 1 to 31. */</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYDAY filtering. */</div><div class='del'>-	guint8 weekdays[7];</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYHOUR filtering. */</div><div class='del'>-	guint8 hours[24];</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYMINUTE filtering. */</div><div class='del'>-	guint8 minutes[60];</div><div class='del'>-</div><div class='del'>-	/* This is used for fast lookup in BYSECOND filtering. */</div><div class='del'>-	guint8 seconds[62];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is what we use to represent a date &amp; time. */</div><div class='del'>-typedef struct _CalObjTime CalObjTime;</div><div class='del'>-struct _CalObjTime {</div><div class='del'>-	guint16 year;</div><div class='del'>-	guint8 month;		/* 0 - 11 */</div><div class='del'>-	guint8 day;		/* 1 - 31 */</div><div class='del'>-	guint8 hour;		/* 0 - 23 */</div><div class='del'>-	guint8 minute;		/* 0 - 59 */</div><div class='del'>-	guint8 second;		/* 0 - 59 (maybe up to 61 for leap seconds) */</div><div class='del'>-	guint8 flags;		/* The meaning of this depends on where the</div><div class='del'>-				   CalObjTime is used. In most cases this is</div><div class='del'>-				   set to TRUE to indicate that this is an</div><div class='del'>-				   RDATE with an end or a duration set.</div><div class='del'>-				   In the exceptions code, this is set to TRUE</div><div class='del'>-				   to indicate that this is an EXDATE with a</div><div class='del'>-				   DATE value. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is what we use to represent specific recurrence dates.</div><div class='del'>-   Note that we assume it starts with a CalObjTime when sorting. */</div><div class='del'>-typedef struct _CalObjRecurrenceDate CalObjRecurrenceDate;</div><div class='del'>-struct _CalObjRecurrenceDate {</div><div class='del'>-	CalObjTime start;</div><div class='del'>-	CalComponentPeriod *period;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The paramter we use to store the enddate in RRULE and EXRULE properties. */</div><div class='del'>-#define EVOLUTION_END_DATE_PARAMETER	"X-EVOLUTION-ENDDATE"</div><div class='del'>-</div><div class='del'>-typedef gboolean (*CalObjFindStartFn) (CalObjTime *event_start,</div><div class='del'>-				       CalObjTime *event_end,</div><div class='del'>-				       RecurData  *recur_data,</div><div class='del'>-				       CalObjTime *interval_start,</div><div class='del'>-				       CalObjTime *interval_end,</div><div class='del'>-				       CalObjTime *cotime);</div><div class='del'>-typedef gboolean (*CalObjFindNextFn)  (CalObjTime *cotime,</div><div class='del'>-				       CalObjTime *event_end,</div><div class='del'>-				       RecurData  *recur_data,</div><div class='del'>-				       CalObjTime *interval_end);</div><div class='del'>-typedef GArray*	 (*CalObjFilterFn)    (RecurData  *recur_data,</div><div class='del'>-				       GArray     *occs);</div><div class='del'>-</div><div class='del'>-typedef struct _CalRecurVTable CalRecurVTable;</div><div class='del'>-struct _CalRecurVTable {</div><div class='del'>-	CalObjFindStartFn find_start_position;</div><div class='del'>-	CalObjFindNextFn find_next_position;</div><div class='del'>-</div><div class='del'>-	CalObjFilterFn bymonth_filter;</div><div class='del'>-	CalObjFilterFn byweekno_filter;</div><div class='del'>-	CalObjFilterFn byyearday_filter;</div><div class='del'>-	CalObjFilterFn bymonthday_filter;</div><div class='del'>-	CalObjFilterFn byday_filter;</div><div class='del'>-	CalObjFilterFn byhour_filter;</div><div class='del'>-	CalObjFilterFn byminute_filter;</div><div class='del'>-	CalObjFilterFn bysecond_filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used to specify which parts of the CalObjTime to compare in</div><div class='del'>-   cal_obj_time_compare(). */</div><div class='del'>-typedef enum {</div><div class='del'>-	CALOBJ_YEAR,</div><div class='del'>-	CALOBJ_MONTH,</div><div class='del'>-	CALOBJ_DAY,</div><div class='del'>-	CALOBJ_HOUR,</div><div class='del'>-	CALOBJ_MINUTE,</div><div class='del'>-	CALOBJ_SECOND</div><div class='del'>-} CalObjTimeComparison;</div><div class='del'>-</div><div class='del'>-static void cal_recur_generate_instances_of_rule (CalComponent	*comp,</div><div class='del'>-						  icalproperty	*prop,</div><div class='del'>-						  time_t	 start,</div><div class='del'>-						  time_t	 end,</div><div class='del'>-						  CalRecurInstanceFn cb,</div><div class='del'>-						  gpointer       cb_data,</div><div class='del'>-						  CalRecurResolveTimezoneFn  tz_cb,</div><div class='del'>-						  gpointer	 tz_cb_data,</div><div class='del'>-						  icaltimezone	*default_timezone);</div><div class='del'>-</div><div class='del'>-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,</div><div class='del'>-						    gboolean exception,</div><div class='del'>-						    icaltimezone *zone,</div><div class='del'>-						    gboolean convert_end_date);</div><div class='del'>-static gint cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);</div><div class='del'>-static void	cal_recur_free			(CalRecurrence	*r);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,</div><div class='del'>-						 GArray		*rdate_periods);</div><div class='del'>-static void	cal_object_compute_duration	(CalObjTime	*start,</div><div class='del'>-						 CalObjTime	*end,</div><div class='del'>-						 gint		*days,</div><div class='del'>-						 gint		*seconds);</div><div class='del'>-</div><div class='del'>-static gboolean generate_instances_for_chunk	(CalComponent		*comp,</div><div class='del'>-						 time_t			 comp_dtstart,</div><div class='del'>-						 icaltimezone		*zone,</div><div class='del'>-						 GSList			*rrules,</div><div class='del'>-						 GSList			*rdates,</div><div class='del'>-						 GSList			*exrules,</div><div class='del'>-						 GSList			*exdates,</div><div class='del'>-						 gboolean		 single_rule,</div><div class='del'>-						 CalObjTime		*event_start,</div><div class='del'>-						 time_t			 interval_start,</div><div class='del'>-						 CalObjTime		*chunk_start,</div><div class='del'>-						 CalObjTime		*chunk_end,</div><div class='del'>-						 gint			 duration_days,</div><div class='del'>-						 gint			 duration_seconds,</div><div class='del'>-						 gboolean		 convert_end_date,</div><div class='del'>-						 CalRecurInstanceFn	 cb,</div><div class='del'>-						 gpointer		 cb_data);</div><div class='del'>-</div><div class='del'>-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,</div><div class='del'>-						 icaltimezone	  *zone,</div><div class='del'>-						 CalRecurrence	  *recur,</div><div class='del'>-						 CalObjTime	  *interval_start,</div><div class='del'>-						 CalObjTime	  *interval_end,</div><div class='del'>-						 gboolean	  *finished);</div><div class='del'>-</div><div class='del'>-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-static GArray*	cal_obj_generate_set_monthly	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);</div><div class='del'>-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurrence	*recur,</div><div class='del'>-						 CalObjTime	*event_start);</div><div class='del'>-static void	cal_obj_sort_occurrences	(GArray		*occs);</div><div class='del'>-static gint	cal_obj_time_compare_func	(const void	*arg1,</div><div class='del'>-						 const void	*arg2);</div><div class='del'>-static void	cal_obj_remove_duplicates_and_invalid_dates (GArray	*occs);</div><div class='del'>-static void	cal_obj_remove_exceptions	(GArray		*occs,</div><div class='del'>-						 GArray		*ex_occs);</div><div class='del'>-static GArray*	cal_obj_bysetpos_filter		(CalRecurrence	*recur,</div><div class='del'>-						 GArray		*occs);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_yearly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_monthly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						     CalObjTime *event_end,</div><div class='del'>-						     RecurData  *recur_data,</div><div class='del'>-						     CalObjTime *interval_start,</div><div class='del'>-						     CalObjTime *interval_end,</div><div class='del'>-						     CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_monthly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						     CalObjTime *event_end,</div><div class='del'>-						     RecurData  *recur_data,</div><div class='del'>-						     CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_weekly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_weekly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_daily_find_start_position  (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_daily_find_next_position   (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_hourly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_hourly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_minutely_find_start_position (CalObjTime *event_start,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_start,</div><div class='del'>-						      CalObjTime *interval_end,</div><div class='del'>-						      CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_minutely_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_secondly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_start,</div><div class='del'>-						      CalObjTime *interval_end,</div><div class='del'>-						      CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_secondly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static GArray* cal_obj_bymonth_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonth_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byweekno_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-#if 0</div><div class='del'>-/* This isn't used at present. */</div><div class='del'>-static GArray* cal_obj_byweekno_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-#endif</div><div class='del'>-static GArray* cal_obj_byyearday_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byyearday_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonthday_expand	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonthday_filter	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_yearly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_monthly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_weekly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byhour_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byhour_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byminute_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byminute_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bysecond_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bysecond_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-</div><div class='del'>-static void cal_obj_time_add_months		(CalObjTime *cotime,</div><div class='del'>-						 gint	     months);</div><div class='del'>-static void cal_obj_time_add_days		(CalObjTime *cotime,</div><div class='del'>-						 gint	     days);</div><div class='del'>-static void cal_obj_time_add_hours		(CalObjTime *cotime,</div><div class='del'>-						 gint	     hours);</div><div class='del'>-static void cal_obj_time_add_minutes		(CalObjTime *cotime,</div><div class='del'>-						 gint	     minutes);</div><div class='del'>-static void cal_obj_time_add_seconds		(CalObjTime *cotime,</div><div class='del'>-						 gint	     seconds);</div><div class='del'>-static gint cal_obj_time_compare		(CalObjTime *cotime1,</div><div class='del'>-						 CalObjTime *cotime2,</div><div class='del'>-						 CalObjTimeComparison type);</div><div class='del'>-static gint cal_obj_time_weekday		(CalObjTime *cotime);</div><div class='del'>-static gint cal_obj_time_weekday_offset		(CalObjTime *cotime,</div><div class='del'>-						 CalRecurrence *recur);</div><div class='del'>-static gint cal_obj_time_day_of_year		(CalObjTime *cotime);</div><div class='del'>-static void cal_obj_time_find_first_week	(CalObjTime *cotime,</div><div class='del'>-						 RecurData  *recur_data);</div><div class='del'>-static void cal_object_time_from_time		(CalObjTime *cotime,</div><div class='del'>-						 time_t      t,</div><div class='del'>-						 icaltimezone *zone);</div><div class='del'>-static gint cal_obj_date_only_compare_func	(const void *arg1,</div><div class='del'>-						 const void *arg2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_recur_ensure_end_dates	(CalComponent	*comp,</div><div class='del'>-						 gboolean	 refresh,</div><div class='del'>-						 CalRecurResolveTimezoneFn tz_cb,</div><div class='del'>-						 gpointer	 tz_cb_data);</div><div class='del'>-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,</div><div class='del'>-						 icalproperty	*prop,</div><div class='del'>-						 gboolean	 exception,</div><div class='del'>-						 gboolean	 refresh,</div><div class='del'>-						 CalRecurResolveTimezoneFn tz_cb,</div><div class='del'>-						 gpointer	 tz_cb_data);</div><div class='del'>-static gboolean cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,</div><div class='del'>-							 time_t		 instance_start,</div><div class='del'>-							 time_t		 instance_end,</div><div class='del'>-							 gpointer	 data);</div><div class='del'>-static time_t cal_recur_get_rule_end_date	(icalproperty	*prop,</div><div class='del'>-						 icaltimezone	*default_timezone);</div><div class='del'>-static void cal_recur_set_rule_end_date		(icalproperty	*prop,</div><div class='del'>-						 time_t		 end_date);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-static char* cal_obj_time_to_string		(CalObjTime	*cotime);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_yearly_vtable = {</div><div class='del'>-	cal_obj_yearly_find_start_position,</div><div class='del'>-	cal_obj_yearly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_expand,</div><div class='del'>-	cal_obj_byweekno_expand,</div><div class='del'>-	cal_obj_byyearday_expand,</div><div class='del'>-	cal_obj_bymonthday_expand,</div><div class='del'>-	cal_obj_byday_expand_yearly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_monthly_vtable = {</div><div class='del'>-	cal_obj_monthly_find_start_position,</div><div class='del'>-	cal_obj_monthly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	NULL, /* BYYEARDAY is not useful in a MONTHLY frequency. */</div><div class='del'>-	cal_obj_bymonthday_expand,</div><div class='del'>-	cal_obj_byday_expand_monthly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_weekly_vtable = {</div><div class='del'>-	cal_obj_weekly_find_start_position,</div><div class='del'>-	cal_obj_weekly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	NULL, /* BYYEARDAY is not useful in a WEEKLY frequency. */</div><div class='del'>-	NULL, /* BYMONTHDAY is not useful in a WEEKLY frequency. */</div><div class='del'>-	cal_obj_byday_expand_weekly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_daily_vtable = {</div><div class='del'>-	cal_obj_daily_find_start_position,</div><div class='del'>-	cal_obj_daily_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_hourly_vtable = {</div><div class='del'>-	cal_obj_hourly_find_start_position,</div><div class='del'>-	cal_obj_hourly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_minutely_vtable = {</div><div class='del'>-	cal_obj_minutely_find_start_position,</div><div class='del'>-	cal_obj_minutely_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_filter,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_secondly_vtable = {</div><div class='del'>-	cal_obj_secondly_find_start_position,</div><div class='del'>-	cal_obj_secondly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_filter,</div><div class='del'>-	cal_obj_bysecond_filter</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the event that</div><div class='del'>- * intersects the range between the given start and end times (the end time is</div><div class='del'>- * not included). Note that the occurrences may start before the given start</div><div class='del'>- * time.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_recur_generate_instances (CalComponent		*comp,</div><div class='del'>-			      time_t			 start,</div><div class='del'>-			      time_t			 end,</div><div class='del'>-			      CalRecurInstanceFn	 cb,</div><div class='del'>-			      gpointer                   cb_data,</div><div class='del'>-			      CalRecurResolveTimezoneFn  tz_cb,</div><div class='del'>-			      gpointer			 tz_cb_data,</div><div class='del'>-			      icaltimezone		*default_timezone)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In cal_recur_generate_instances comp: %p\n", comp);</div><div class='del'>-	g_print ("  start: %li - %s", start, ctime (&amp;start));</div><div class='del'>-	g_print ("  end  : %li - %s", end, ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-	cal_recur_generate_instances_of_rule (comp, NULL, start, end,</div><div class='del'>-					      cb, cb_data, tz_cb, tz_cb_data,</div><div class='del'>-					      default_timezone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the given</div><div class='del'>- * recurrence rule between the given start and end times. If the rule is NULL</div><div class='del'>- * it uses all the rules from the component.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * The use of the specific rule is for determining the end of a rule when</div><div class='del'>- * COUNT is set. The callback will count instances and store the enddate</div><div class='del'>- * when COUNT is reached.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-cal_recur_generate_instances_of_rule (CalComponent	 *comp,</div><div class='del'>-				      icalproperty	 *prop,</div><div class='del'>-				      time_t		  start,</div><div class='del'>-				      time_t		  end,</div><div class='del'>-				      CalRecurInstanceFn  cb,</div><div class='del'>-				      gpointer            cb_data,</div><div class='del'>-				      CalRecurResolveTimezoneFn  tz_cb,</div><div class='del'>-				      gpointer		  tz_cb_data,</div><div class='del'>-				      icaltimezone	 *default_timezone)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dtstart, dtend;</div><div class='del'>-	time_t dtstart_time, dtend_time;</div><div class='del'>-	GSList *rrules = NULL, *rdates = NULL, elem;</div><div class='del'>-	GSList *exrules = NULL, *exdates = NULL;</div><div class='del'>-	CalObjTime interval_start, interval_end, event_start, event_end;</div><div class='del'>-	CalObjTime chunk_start, chunk_end;</div><div class='del'>-	gint days, seconds, year;</div><div class='del'>-	gboolean single_rule, convert_end_date = FALSE;</div><div class='del'>-	icaltimezone *start_zone = NULL, *end_zone = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-	g_return_if_fail (tz_cb != NULL);</div><div class='del'>-	g_return_if_fail (start &gt;= -1);</div><div class='del'>-	g_return_if_fail (end &gt;= -1);</div><div class='del'>-</div><div class='del'>-	/* Get dtstart, dtend, recurrences, and exceptions. Note that</div><div class='del'>-	   cal_component_get_dtend() will convert a DURATION property to a</div><div class='del'>-	   DTEND so we don't need to worry about that. */</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dtstart);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	if (!dtstart.value) {</div><div class='del'>-		g_message ("cal_recur_generate_instances_of_rule(): bogus "</div><div class='del'>-			   "component, does not have DTSTART.  Skipping...");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* For DATE-TIME values with a TZID, we use the supplied callback to</div><div class='del'>-	   resolve the TZID. For DATE values and DATE-TIME values without a</div><div class='del'>-	   TZID (i.e. floating times) we use the default timezone. */</div><div class='del'>-	if (dtstart.tzid &amp;&amp; !dtstart.value-&gt;is_date) {</div><div class='del'>-		start_zone = (*tz_cb) (dtstart.tzid, tz_cb_data);</div><div class='del'>-	} else {</div><div class='del'>-		start_zone = default_timezone;</div><div class='del'>-</div><div class='del'>-		/* Flag that we need to convert the saved ENDDATE property</div><div class='del'>-		   to the default timezone. */</div><div class='del'>-		convert_end_date = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dtstart_time = icaltime_as_timet_with_zone (*dtstart.value,</div><div class='del'>-						    start_zone);</div><div class='del'>-	if (start == -1)</div><div class='del'>-		start = dtstart_time;</div><div class='del'>-</div><div class='del'>-	if (dtend.value) {</div><div class='del'>-		/* If both DTSTART and DTEND are DATE values, and they are the</div><div class='del'>-		   same day, we add 1 day to DTEND. This means that most</div><div class='del'>-		   events created with the old Evolution behavior will still</div><div class='del'>-		   work OK. I'm not sure what Outlook does in this case. */</div><div class='del'>-		if (dtstart.value-&gt;is_date &amp;&amp; dtend.value-&gt;is_date) {</div><div class='del'>-			if (icaltime_compare_date_only (*dtstart.value,</div><div class='del'>-							*dtend.value) == 0) {</div><div class='del'>-				icaltime_adjust (dtend.value, 1, 0, 0, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* If there is no DTEND, then if DTSTART is a DATE-TIME value</div><div class='del'>-		   we use the same time (so we have a single point in time).</div><div class='del'>-		   If DTSTART is a DATE value we add 1 day. */</div><div class='del'>-		dtend.value = g_new (struct icaltimetype, 1);</div><div class='del'>-		*dtend.value = *dtstart.value;</div><div class='del'>-</div><div class='del'>-		if (dtstart.value-&gt;is_date) {</div><div class='del'>-			icaltime_adjust (dtend.value, 1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dtend.tzid &amp;&amp; !dtend.value-&gt;is_date) {</div><div class='del'>-		end_zone = (*tz_cb) (dtend.tzid, tz_cb_data);</div><div class='del'>-	} else {</div><div class='del'>-		end_zone = default_timezone;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We don't do this any more, since Outlook assumes that the DTEND</div><div class='del'>-	   date is not included. */</div><div class='del'>-#if 0</div><div class='del'>-	/* If DTEND is a DATE value, we add 1 day to it so that it includes</div><div class='del'>-	   the entire day. */</div><div class='del'>-	if (dtend.value-&gt;is_date) {</div><div class='del'>-		dtend.value-&gt;hour = 0;</div><div class='del'>-		dtend.value-&gt;minute = 0;</div><div class='del'>-		dtend.value-&gt;second = 0;</div><div class='del'>-		icaltime_adjust (dtend.value, 1, 0, 0, 0);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	dtend_time = icaltime_as_timet_with_zone (*dtend.value, end_zone);</div><div class='del'>-</div><div class='del'>-	/* If there is no recurrence, just call the callback if the event</div><div class='del'>-	   intersects the given interval. */</div><div class='del'>-	if (!(cal_component_has_recurrences (comp)</div><div class='del'>-	      || cal_component_has_exceptions (comp))) {</div><div class='del'>-		if ((end == -1 || dtstart_time &lt; end) &amp;&amp; dtend_time &gt; start) {</div><div class='del'>-			(* cb) (comp, dtstart_time, dtend_time, cb_data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If a specific recurrence rule is being used, set up a simple list,</div><div class='del'>-	   else get the recurrence rules from the component. */</div><div class='del'>-	if (prop) {</div><div class='del'>-		single_rule = TRUE;</div><div class='del'>-</div><div class='del'>-		elem.data = prop;</div><div class='del'>-		elem.next = NULL;</div><div class='del'>-		rrules = &amp;elem;</div><div class='del'>-	} else {</div><div class='del'>-		single_rule = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Make sure all the enddates for the rules are set. */</div><div class='del'>-		cal_recur_ensure_end_dates (comp, FALSE, tz_cb, tz_cb_data);</div><div class='del'>-</div><div class='del'>-		cal_component_get_rrule_property_list (comp, &amp;rrules);</div><div class='del'>-		cal_component_get_rdate_list (comp, &amp;rdates);</div><div class='del'>-		cal_component_get_exrule_property_list (comp, &amp;exrules);</div><div class='del'>-		cal_component_get_exdate_list (comp, &amp;exdates);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the interval start &amp; end to CalObjTime. Note that if end</div><div class='del'>-	   is -1 interval_end won't be set, so don't use it!</div><div class='del'>-	   Also note that we use end - 1 since we want the interval to be</div><div class='del'>-	   inclusive as it makes the code simpler. We do all calculation</div><div class='del'>-	   in the timezone of the DTSTART. */</div><div class='del'>-	cal_object_time_from_time (&amp;interval_start, start, start_zone);</div><div class='del'>-	if (end != -1)</div><div class='del'>-		cal_object_time_from_time (&amp;interval_end, end - 1, start_zone);</div><div class='del'>-</div><div class='del'>-	cal_object_time_from_time (&amp;event_start, dtstart_time, start_zone);</div><div class='del'>-	cal_object_time_from_time (&amp;event_end, dtend_time, start_zone);</div><div class='del'>-	</div><div class='del'>-	/* Calculate the duration of the event, which we use for all</div><div class='del'>-	   occurrences. We can't just subtract start from end since that may</div><div class='del'>-	   be affected by daylight-saving time. So we want a value of days</div><div class='del'>-	   + seconds. */</div><div class='del'>-	cal_object_compute_duration (&amp;event_start, &amp;event_end,</div><div class='del'>-				     &amp;days, &amp;seconds);</div><div class='del'>-</div><div class='del'>-	/* Take off the duration from interval_start, so we get occurrences</div><div class='del'>-	   that start just before the start time but overlap it. But only do</div><div class='del'>-	   that if the interval is after the event's start time. */</div><div class='del'>-	if (start &gt; dtstart_time) {</div><div class='del'>-		cal_obj_time_add_days (&amp;interval_start, -days);</div><div class='del'>-		cal_obj_time_add_seconds (&amp;interval_start, -seconds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Expand the recurrence for each year between start &amp; end, or until</div><div class='del'>-	   the callback returns 0 if end is 0. We do a year at a time to</div><div class='del'>-	   give the callback function a chance to break out of the loop, and</div><div class='del'>-	   so we don't get into problems with infinite recurrences. Since we</div><div class='del'>-	   have to work on complete sets of occurrences, if there is a yearly</div><div class='del'>-	   frequency it wouldn't make sense to break it into smaller chunks,</div><div class='del'>-	   since we would then be calculating the same sets several times.</div><div class='del'>-	   Though this does mean that we sometimes do a lot more work than</div><div class='del'>-	   is necessary, e.g. if COUNT is set to something quite low. */</div><div class='del'>-	for (year = interval_start.year;</div><div class='del'>-	     (end == -1 || year &lt;= interval_end.year) &amp;&amp; year &lt;= MAX_YEAR;</div><div class='del'>-	     year++) {</div><div class='del'>-		chunk_start = interval_start;</div><div class='del'>-		chunk_start.year = year;</div><div class='del'>-		if (end != -1)</div><div class='del'>-			chunk_end = interval_end;</div><div class='del'>-		chunk_end.year = year;</div><div class='del'>-</div><div class='del'>-		if (year != interval_start.year) {</div><div class='del'>-			chunk_start.month  = 0;</div><div class='del'>-			chunk_start.day    = 1;</div><div class='del'>-			chunk_start.hour   = 0;</div><div class='del'>-			chunk_start.minute = 0;</div><div class='del'>-			chunk_start.second = 0;</div><div class='del'>-		}</div><div class='del'>-		if (end == -1 || year != interval_end.year) {</div><div class='del'>-			chunk_end.month  = 11;</div><div class='del'>-			chunk_end.day    = 31;</div><div class='del'>-			chunk_end.hour   = 23;</div><div class='del'>-			chunk_end.minute = 59;</div><div class='del'>-			chunk_end.second = 61;</div><div class='del'>-			chunk_end.flags  = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!generate_instances_for_chunk (comp, dtstart_time,</div><div class='del'>-						   start_zone,</div><div class='del'>-						   rrules, rdates,</div><div class='del'>-						   exrules, exdates,</div><div class='del'>-						   single_rule,</div><div class='del'>-						   &amp;event_start,</div><div class='del'>-						   start,</div><div class='del'>-						   &amp;chunk_start, &amp;chunk_end,</div><div class='del'>-						   days, seconds,</div><div class='del'>-						   convert_end_date,</div><div class='del'>-						   cb, cb_data))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!prop) {</div><div class='del'>-		cal_component_free_period_list (rdates);</div><div class='del'>-		cal_component_free_exdate_list (exdates);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	cal_component_free_datetime (&amp;dtstart);</div><div class='del'>-	cal_component_free_datetime (&amp;dtend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a</div><div class='del'>- * struct icalrecurrencetype.</div><div class='del'>- */</div><div class='del'>-static GList *</div><div class='del'>-array_to_list (short *array, int max_elements)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	l = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_elements &amp;&amp; array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)</div><div class='del'>-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));</div><div class='del'>-	return g_list_reverse (l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_recur_from_icalproperty:</div><div class='del'>- * @prop: An RRULE or EXRULE #icalproperty.</div><div class='del'>- * @exception: TRUE if this is an EXRULE rather than an RRULE.</div><div class='del'>- * @zone: The DTSTART timezone, used for converting the UNTIL property if it</div><div class='del'>- * is given as a DATE value.</div><div class='del'>- * @convert_end_date: TRUE if the saved end date needs to be converted to the</div><div class='del'>- * given @zone timezone. This is needed if the DTSTART is a DATE or floating</div><div class='del'>- * time.</div><div class='del'>- * </div><div class='del'>- * Converts an #icalproperty to a #CalRecurrence.  This should be</div><div class='del'>- * freed using the cal_recur_free() function.</div><div class='del'>- * </div><div class='del'>- * Return value: #CalRecurrence structure.</div><div class='del'>- **/</div><div class='del'>-static CalRecurrence *</div><div class='del'>-cal_recur_from_icalproperty (icalproperty *prop, gboolean exception,</div><div class='del'>-			     icaltimezone *zone, gboolean convert_end_date)</div><div class='del'>-{</div><div class='del'>-	struct icalrecurrencetype ir;</div><div class='del'>-	CalRecurrence *r;</div><div class='del'>-	gint max_elements, i;</div><div class='del'>-	GList *elem;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (prop != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	r = g_new (CalRecurrence, 1);</div><div class='del'>-</div><div class='del'>-	if (exception)</div><div class='del'>-		ir = icalproperty_get_exrule (prop);</div><div class='del'>-	else</div><div class='del'>-		ir = icalproperty_get_rrule (prop);</div><div class='del'>-</div><div class='del'>-	r-&gt;freq = ir.freq;</div><div class='del'>-	r-&gt;interval = ir.interval;</div><div class='del'>-</div><div class='del'>-	if (ir.count != 0) {</div><div class='del'>-		/* If COUNT is set, we use the pre-calculated enddate.</div><div class='del'>-		   Note that this can be 0 if the RULE doesn't actually</div><div class='del'>-		   generate COUNT instances. */</div><div class='del'>-		r-&gt;enddate = cal_recur_get_rule_end_date (prop, convert_end_date ? zone : NULL);</div><div class='del'>-	} else {</div><div class='del'>-		if (icaltime_is_null_time (ir.until)) {</div><div class='del'>-			/* If neither COUNT or UNTIL is set, the event</div><div class='del'>-			   recurs forever. */</div><div class='del'>-			r-&gt;enddate = 0;</div><div class='del'>-		} else if (ir.until.is_date) {</div><div class='del'>-			/* If UNTIL is a DATE, we stop at the end of</div><div class='del'>-			   the day, in local time (with the DTSTART timezone).</div><div class='del'>-			   Note that UNTIL is inclusive so we stop before</div><div class='del'>-			   midnight. */</div><div class='del'>-			ir.until.hour = 23;</div><div class='del'>-			ir.until.minute = 59;</div><div class='del'>-			ir.until.second = 59;</div><div class='del'>-			ir.until.is_date = FALSE;</div><div class='del'>-</div><div class='del'>-			r-&gt;enddate = icaltime_as_timet_with_zone (ir.until,</div><div class='del'>-								  zone);</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  until: %li - %s", r-&gt;enddate, ctime (&amp;r-&gt;enddate));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* If UNTIL is a DATE-TIME, it must be in UTC. */</div><div class='del'>-			icaltimezone *utc_zone;</div><div class='del'>-			utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-			r-&gt;enddate = icaltime_as_timet_with_zone (ir.until,</div><div class='del'>-								  utc_zone);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;week_start_day = cal_recur_ical_weekday_to_weekday (ir.week_start);</div><div class='del'>-</div><div class='del'>-	r-&gt;bymonth = array_to_list (ir.by_month,</div><div class='del'>-				    sizeof (ir.by_month) / sizeof (ir.by_month[0]));</div><div class='del'>-	for (elem = r-&gt;bymonth; elem; elem = elem-&gt;next) {</div><div class='del'>-		/* We need to convert from 1-12 to 0-11, i.e. subtract 1. */</div><div class='del'>-		int month = GPOINTER_TO_INT (elem-&gt;data) - 1;</div><div class='del'>-		elem-&gt;data = GINT_TO_POINTER (month);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;byweekno = array_to_list (ir.by_week_no,</div><div class='del'>-				     sizeof (ir.by_week_no) / sizeof (ir.by_week_no[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;byyearday = array_to_list (ir.by_year_day,</div><div class='del'>-				      sizeof (ir.by_year_day) / sizeof (ir.by_year_day[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bymonthday = array_to_list (ir.by_month_day,</div><div class='del'>-				       sizeof (ir.by_month_day) / sizeof (ir.by_month_day[0]));</div><div class='del'>-</div><div class='del'>-	/* FIXME: libical only supports 8 values, out of possible 107 * 7. */</div><div class='del'>-	r-&gt;byday = NULL;</div><div class='del'>-	max_elements = sizeof (ir.by_day) / sizeof (ir.by_day[0]);</div><div class='del'>-	for (i = 0; i &lt; max_elements &amp;&amp; ir.by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {</div><div class='del'>-		enum icalrecurrencetype_weekday day;</div><div class='del'>-		gint weeknum, weekday;</div><div class='del'>-</div><div class='del'>-		day = icalrecurrencetype_day_day_of_week (ir.by_day[i]);</div><div class='del'>-		weeknum = icalrecurrencetype_day_position (ir.by_day[i]);</div><div class='del'>-</div><div class='del'>-		weekday = cal_recur_ical_weekday_to_weekday (day);</div><div class='del'>-</div><div class='del'>-		r-&gt;byday = g_list_prepend (r-&gt;byday,</div><div class='del'>-					   GINT_TO_POINTER (weeknum));</div><div class='del'>-		r-&gt;byday = g_list_prepend (r-&gt;byday,</div><div class='del'>-					   GINT_TO_POINTER (weekday));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;byhour = array_to_list (ir.by_hour,</div><div class='del'>-				   sizeof (ir.by_hour) / sizeof (ir.by_hour[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;byminute = array_to_list (ir.by_minute,</div><div class='del'>-				     sizeof (ir.by_minute) / sizeof (ir.by_minute[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bysecond = array_to_list (ir.by_second,</div><div class='del'>-				     sizeof (ir.by_second) / sizeof (ir.by_second[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bysetpos = array_to_list (ir.by_set_pos,</div><div class='del'>-				     sizeof (ir.by_set_pos) / sizeof (ir.by_set_pos[0]));</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)</div><div class='del'>-{</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-	switch (day) {</div><div class='del'>-	case ICAL_NO_WEEKDAY:		/* Monday is the default in RFC2445. */</div><div class='del'>-	case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-		weekday = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-		weekday = 1;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-		weekday = 2;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-		weekday = 3;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-		weekday = 4;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-		weekday = 5;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-		weekday = 6;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("cal_recur_ical_weekday_to_weekday(): Unknown week day %d",</div><div class='del'>-			   day);</div><div class='del'>-		weekday = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return weekday;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_recur_free:</div><div class='del'>- * @r: A #CalRecurrence structure.</div><div class='del'>- * </div><div class='del'>- * Frees a #CalRecurrence structure.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-cal_recur_free (CalRecurrence *r)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (r != NULL);</div><div class='del'>-</div><div class='del'>-	g_list_free (r-&gt;bymonth);</div><div class='del'>-	g_list_free (r-&gt;byweekno);</div><div class='del'>-	g_list_free (r-&gt;byyearday);</div><div class='del'>-	g_list_free (r-&gt;bymonthday);</div><div class='del'>-	g_list_free (r-&gt;byday);</div><div class='del'>-	g_list_free (r-&gt;byhour);</div><div class='del'>-	g_list_free (r-&gt;byminute);</div><div class='del'>-	g_list_free (r-&gt;bysecond);</div><div class='del'>-	g_list_free (r-&gt;bysetpos);</div><div class='del'>-</div><div class='del'>-	g_free (r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generates one year's worth of recurrence instances.  Returns TRUE if all the</div><div class='del'>- * callback invocations returned TRUE, or FALSE when any one of them returns</div><div class='del'>- * FALSE, i.e. meaning that the instance generation should be stopped.</div><div class='del'>- *</div><div class='del'>- * This should only output instances whose start time is between chunk_start</div><div class='del'>- * and chunk_end (inclusive), or we may generate duplicates when we do the next</div><div class='del'>- * chunk. (This applies mainly to weekly recurrences, since weeks can span 2</div><div class='del'>- * years.)</div><div class='del'>- *</div><div class='del'>- * It should also only output instances that are on or after the event's</div><div class='del'>- * DTSTART property and that intersect the required interval, between</div><div class='del'>- * interval_start and interval_end.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-generate_instances_for_chunk (CalComponent	*comp,</div><div class='del'>-			      time_t             comp_dtstart,</div><div class='del'>-			      icaltimezone	*zone,</div><div class='del'>-			      GSList		*rrules,</div><div class='del'>-			      GSList		*rdates,</div><div class='del'>-			      GSList		*exrules,</div><div class='del'>-			      GSList		*exdates,</div><div class='del'>-			      gboolean		 single_rule,</div><div class='del'>-			      CalObjTime	*event_start,</div><div class='del'>-			      time_t		 interval_start,</div><div class='del'>-			      CalObjTime	*chunk_start,</div><div class='del'>-			      CalObjTime	*chunk_end,</div><div class='del'>-			      gint		 duration_days,</div><div class='del'>-			      gint		 duration_seconds,</div><div class='del'>-			      gboolean		 convert_end_date,</div><div class='del'>-			      CalRecurInstanceFn cb,</div><div class='del'>-			      gpointer           cb_data)</div><div class='del'>-{</div><div class='del'>-	GArray *occs, *ex_occs, *tmp_occs, *rdate_periods;</div><div class='del'>-	CalObjTime cotime, *occ;</div><div class='del'>-	GSList *elem;</div><div class='del'>-	gint i;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	gboolean cb_status = TRUE, rule_finished, finished = TRUE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In generate_instances_for_chunk rrules: %p\n"</div><div class='del'>-		 "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",</div><div class='del'>-		 rrules,</div><div class='del'>-		 chunk_start-&gt;day, chunk_start-&gt;month + 1,</div><div class='del'>-		 chunk_start-&gt;year, chunk_start-&gt;hour,</div><div class='del'>-		 chunk_start-&gt;minute, chunk_start-&gt;second,</div><div class='del'>-		 chunk_end-&gt;day, chunk_end-&gt;month + 1,</div><div class='del'>-		 chunk_end-&gt;year, chunk_end-&gt;hour,</div><div class='del'>-		 chunk_end-&gt;minute, chunk_end-&gt;second);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	rdate_periods = g_array_new (FALSE, FALSE,</div><div class='del'>-				     sizeof (CalObjRecurrenceDate));</div><div class='del'>-</div><div class='del'>-	/* The original DTSTART property is included in the occurrence set,</div><div class='del'>-	   but not if we are just generating occurrences for a single rule. */</div><div class='del'>-	if (!single_rule) {</div><div class='del'>-		/* We add it if it is in this chunk. If it is after this chunk</div><div class='del'>-		   we set finished to FALSE, since we know we aren't finished</div><div class='del'>-		   yet. */</div><div class='del'>-		if (cal_obj_time_compare_func (event_start, chunk_end) &gt;= 0)</div><div class='del'>-			finished = FALSE;</div><div class='del'>-		else if (cal_obj_time_compare_func (event_start, chunk_start) &gt;= 0)</div><div class='del'>-			g_array_append_vals (occs, event_start, 1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Expand each of the recurrence rules. */</div><div class='del'>-	for (elem = rrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		CalRecurrence *r;</div><div class='del'>-</div><div class='del'>-		prop = elem-&gt;data;</div><div class='del'>-		r = cal_recur_from_icalproperty (prop, FALSE, zone,</div><div class='del'>-						 convert_end_date);</div><div class='del'>-</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, zone, r,</div><div class='del'>-						      chunk_start,</div><div class='del'>-						      chunk_end,</div><div class='del'>-						      &amp;rule_finished);</div><div class='del'>-		cal_recur_free (r);</div><div class='del'>-</div><div class='del'>-		/* If any of the rules return FALSE for finished, we know we</div><div class='del'>-		   have to carry on so we set finished to FALSE. */</div><div class='del'>-		if (!rule_finished)</div><div class='del'>-			finished = FALSE;</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (occs, tmp_occs-&gt;data, tmp_occs-&gt;len);</div><div class='del'>-		g_array_free (tmp_occs, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add on specific RDATE occurrence dates. If they have an end time</div><div class='del'>-	   or duration set, flag them as RDATEs, and store a pointer to the</div><div class='del'>-	   period in the rdate_periods array. Otherwise we can just treat them</div><div class='del'>-	   as normal occurrences. */</div><div class='del'>-	for (elem = rdates; elem; elem = elem-&gt;next) {</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		CalObjRecurrenceDate rdate;</div><div class='del'>-</div><div class='del'>-		p = elem-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* FIXME: We currently assume RDATEs are in the same timezone</div><div class='del'>-		   as DTSTART. We should get the RDATE timezone and convert</div><div class='del'>-		   to the DTSTART timezone first. */</div><div class='del'>-		cotime.year     = p-&gt;start.year;</div><div class='del'>-		cotime.month    = p-&gt;start.month - 1;</div><div class='del'>-		cotime.day      = p-&gt;start.day;</div><div class='del'>-		cotime.hour     = p-&gt;start.hour;</div><div class='del'>-		cotime.minute   = p-&gt;start.minute;</div><div class='del'>-		cotime.second   = p-&gt;start.second;</div><div class='del'>-		cotime.flags    = FALSE;</div><div class='del'>-</div><div class='del'>-		/* If the rdate is after the current chunk we set finished</div><div class='del'>-		   to FALSE, and we skip it. */</div><div class='del'>-		if (cal_obj_time_compare_func (&amp;cotime, chunk_end) &gt;= 0) {</div><div class='del'>-			finished = FALSE;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check if the end date or duration is set. If it is we need</div><div class='del'>-		   to store it so we can get it later. (libical seems to set</div><div class='del'>-		   second to -1 to denote an unset time. See icalvalue.c)</div><div class='del'>-		   FIXME. */</div><div class='del'>-		if (p-&gt;type != CAL_COMPONENT_PERIOD_DATETIME</div><div class='del'>-		    || p-&gt;u.end.second != -1) {</div><div class='del'>-			cotime.flags = TRUE;</div><div class='del'>-</div><div class='del'>-			rdate.start = cotime;</div><div class='del'>-			rdate.period = p;</div><div class='del'>-			g_array_append_val (rdate_periods, rdate);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_array_append_val (occs, cotime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Expand each of the exception rules. */</div><div class='del'>-	for (elem = exrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		CalRecurrence *r;</div><div class='del'>-</div><div class='del'>-		prop = elem-&gt;data;</div><div class='del'>-		r = cal_recur_from_icalproperty (prop, FALSE, zone,</div><div class='del'>-						 convert_end_date);</div><div class='del'>-</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, zone, r,</div><div class='del'>-						      chunk_start,</div><div class='del'>-						      chunk_end,</div><div class='del'>-						      &amp;rule_finished);</div><div class='del'>-		cal_recur_free (r);</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (ex_occs, tmp_occs-&gt;data, tmp_occs-&gt;len);</div><div class='del'>-		g_array_free (tmp_occs, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add on specific exception dates. */</div><div class='del'>-	for (elem = exdates; elem; elem = elem-&gt;next) {</div><div class='del'>-		CalComponentDateTime *cdt;</div><div class='del'>-</div><div class='del'>-		cdt = elem-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* FIXME: We currently assume EXDATEs are in the same timezone</div><div class='del'>-		   as DTSTART. We should get the EXDATE timezone and convert</div><div class='del'>-		   to the DTSTART timezone first. */</div><div class='del'>-		cotime.year     = cdt-&gt;value-&gt;year;</div><div class='del'>-		cotime.month    = cdt-&gt;value-&gt;month - 1;</div><div class='del'>-		cotime.day      = cdt-&gt;value-&gt;day;</div><div class='del'>-</div><div class='del'>-		/* If the EXDATE has a DATE value, set the time to the start</div><div class='del'>-		   of the day and set flags to TRUE so we know to skip all</div><div class='del'>-		   occurrences on that date. */</div><div class='del'>-		if (cdt-&gt;value-&gt;is_date) {</div><div class='del'>-			cotime.hour     = 0;</div><div class='del'>-			cotime.minute   = 0;</div><div class='del'>-			cotime.second   = 0;</div><div class='del'>-			cotime.flags    = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			cotime.hour     = cdt-&gt;value-&gt;hour;</div><div class='del'>-			cotime.minute   = cdt-&gt;value-&gt;minute;</div><div class='del'>-			cotime.second   = cdt-&gt;value-&gt;second;</div><div class='del'>-			cotime.flags    = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_array_append_val (ex_occs, cotime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Sort all the arrays. */</div><div class='del'>-	cal_obj_sort_occurrences (occs);</div><div class='del'>-	cal_obj_sort_occurrences (ex_occs);</div><div class='del'>-</div><div class='del'>-	qsort (rdate_periods-&gt;data, rdate_periods-&gt;len,</div><div class='del'>-	       sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);</div><div class='del'>-</div><div class='del'>-	/* Create the final array, by removing the exceptions from the</div><div class='del'>-	   occurrences, and removing any duplicates. */</div><div class='del'>-	cal_obj_remove_exceptions (occs, ex_occs);</div><div class='del'>-</div><div class='del'>-	/* Call the callback for each occurrence. If it returns 0 we break</div><div class='del'>-	   out of the loop. */</div><div class='del'>-	for (i = 0; i &lt; occs-&gt;len; i++) {</div><div class='del'>-		/* Convert each CalObjTime into a start &amp; end time_t, and</div><div class='del'>-		   check it is within the bounds of the event &amp; interval. */</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("Checking occurrence: %s\n",</div><div class='del'>-			 cal_obj_time_to_string (occ));</div><div class='del'>-#endif</div><div class='del'>-		start_tt = icaltime_null_time ();</div><div class='del'>-		start_tt.year   = occ-&gt;year;</div><div class='del'>-		start_tt.month  = occ-&gt;month + 1;</div><div class='del'>-		start_tt.day    = occ-&gt;day;</div><div class='del'>-		start_tt.hour   = occ-&gt;hour;</div><div class='del'>-		start_tt.minute = occ-&gt;minute;</div><div class='del'>-		start_tt.second = occ-&gt;second;</div><div class='del'>-		start_time = icaltime_as_timet_with_zone (start_tt, zone);</div><div class='del'>-</div><div class='del'>-		if (start_time == -1) {</div><div class='del'>-			g_warning ("time_t out of range");</div><div class='del'>-			finished = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check to ensure that the start time is at or after the</div><div class='del'>-		   event's DTSTART time, and that it is inside the chunk that</div><div class='del'>-		   we are currently working on. (Note that the chunk_end time</div><div class='del'>-		   is never after the interval end time, so this also tests</div><div class='del'>-		   that we don't go past the end of the required interval). */</div><div class='del'>-		if (start_time &lt; comp_dtstart</div><div class='del'>-		    || cal_obj_time_compare_func (occ, chunk_start) &lt; 0</div><div class='del'>-		    || cal_obj_time_compare_func (occ, chunk_end) &gt; 0) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  start time invalid\n");</div><div class='del'>-#endif</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (occ-&gt;flags) {</div><div class='del'>-			/* If it is an RDATE, we see if the end date or</div><div class='del'>-			   duration was set. If not, we use the same duration</div><div class='del'>-			   as the original occurrence. */</div><div class='del'>-			if (!cal_object_get_rdate_end (occ, rdate_periods)) {</div><div class='del'>-				cal_obj_time_add_days (occ, duration_days);</div><div class='del'>-				cal_obj_time_add_seconds (occ,</div><div class='del'>-							  duration_seconds);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			cal_obj_time_add_days (occ, duration_days);</div><div class='del'>-			cal_obj_time_add_seconds (occ, duration_seconds);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		end_tt = icaltime_null_time ();</div><div class='del'>-		end_tt.year   = occ-&gt;year;</div><div class='del'>-		end_tt.month  = occ-&gt;month + 1;</div><div class='del'>-		end_tt.day    = occ-&gt;day;</div><div class='del'>-		end_tt.hour   = occ-&gt;hour;</div><div class='del'>-		end_tt.minute = occ-&gt;minute;</div><div class='del'>-		end_tt.second = occ-&gt;second;</div><div class='del'>-		end_time = icaltime_as_timet_with_zone (end_tt, zone);</div><div class='del'>-</div><div class='del'>-		if (end_time == -1) {</div><div class='del'>-			g_warning ("time_t out of range");</div><div class='del'>-			finished = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check that the end time is after the interval start, so we</div><div class='del'>-		   know that it intersects the required interval. */</div><div class='del'>-		if (end_time &lt;= interval_start) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  end time invalid\n");</div><div class='del'>-#endif</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cb_status = (*cb) (comp, start_time, end_time, cb_data);</div><div class='del'>-		if (!cb_status)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-	g_array_free (ex_occs, TRUE);</div><div class='del'>-	g_array_free (rdate_periods, TRUE);</div><div class='del'>-</div><div class='del'>-	/* We return TRUE (i.e. carry on) only if the callback has always</div><div class='del'>-	   returned TRUE and we know that we have more occurrences to generate</div><div class='del'>-	   (i.e. finished is FALSE). */</div><div class='del'>-	return cb_status &amp;&amp; !finished;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This looks up the occurrence time in the sorted rdate_periods array, and</div><div class='del'>-   tries to compute the end time of the occurrence. If no end time or duration</div><div class='del'>-   is set it returns FALSE and the default duration will be used. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_object_get_rdate_end	(CalObjTime	*occ,</div><div class='del'>-				 GArray		*rdate_periods)</div><div class='del'>-{</div><div class='del'>-	CalObjRecurrenceDate *rdate = NULL;</div><div class='del'>-	CalComponentPeriod *p;</div><div class='del'>-	gint lower, upper, middle, cmp = 0;</div><div class='del'>-</div><div class='del'>-	lower = 0;</div><div class='del'>-	upper = rdate_periods-&gt;len;</div><div class='del'>-</div><div class='del'>-	while (lower &lt; upper) {</div><div class='del'>-		middle = (lower + upper) &gt;&gt; 1;</div><div class='del'>-	  </div><div class='del'>-		rdate = &amp;g_array_index (rdate_periods, CalObjRecurrenceDate,</div><div class='del'>-					middle);</div><div class='del'>-</div><div class='del'>-		cmp = cal_obj_time_compare_func (occ, &amp;rdate-&gt;start);</div><div class='del'>-	  </div><div class='del'>-		if (cmp == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (cmp &lt; 0)</div><div class='del'>-			upper = middle;</div><div class='del'>-		else</div><div class='del'>-			lower = middle + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This should never happen. */</div><div class='del'>-	if (cmp == 0) {</div><div class='del'>-		g_warning ("Recurrence date not found");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = rdate-&gt;period;</div><div class='del'>-	if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME) {</div><div class='del'>-		/* FIXME: We currently assume RDATEs are in the same timezone</div><div class='del'>-		   as DTSTART. We should get the RDATE timezone and convert</div><div class='del'>-		   to the DTSTART timezone first. */</div><div class='del'>-		occ-&gt;year     = p-&gt;u.end.year;</div><div class='del'>-		occ-&gt;month    = p-&gt;u.end.month - 1;</div><div class='del'>-		occ-&gt;day      = p-&gt;u.end.day;</div><div class='del'>-		occ-&gt;hour     = p-&gt;u.end.hour;</div><div class='del'>-		occ-&gt;minute   = p-&gt;u.end.minute;</div><div class='del'>-		occ-&gt;second   = p-&gt;u.end.second;</div><div class='del'>-		occ-&gt;flags    = FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		cal_obj_time_add_days (occ, p-&gt;u.duration.weeks * 7</div><div class='del'>-				       + p-&gt;u.duration.days);</div><div class='del'>-		cal_obj_time_add_hours (occ, p-&gt;u.duration.hours);</div><div class='del'>-		cal_obj_time_add_minutes (occ, p-&gt;u.duration.minutes);</div><div class='del'>-		cal_obj_time_add_seconds (occ, p-&gt;u.duration.seconds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_object_compute_duration (CalObjTime *start,</div><div class='del'>-			     CalObjTime *end,</div><div class='del'>-			     gint	*days,</div><div class='del'>-			     gint	*seconds)</div><div class='del'>-{</div><div class='del'>-	GDate start_date, end_date;</div><div class='del'>-	gint start_seconds, end_seconds;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;start_date, 1);</div><div class='del'>-	g_date_clear (&amp;end_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;start_date, start-&gt;day, start-&gt;month + 1,</div><div class='del'>-			start-&gt;year);</div><div class='del'>-	g_date_set_dmy (&amp;end_date, end-&gt;day, end-&gt;month + 1,</div><div class='del'>-			end-&gt;year);</div><div class='del'>-</div><div class='del'>-	*days = g_date_julian (&amp;end_date) - g_date_julian (&amp;start_date);</div><div class='del'>-	start_seconds = start-&gt;hour * 3600 + start-&gt;minute * 60</div><div class='del'>-		+ start-&gt;second;</div><div class='del'>-	end_seconds = end-&gt;hour * 3600 + end-&gt;minute * 60 + end-&gt;second;</div><div class='del'>-</div><div class='del'>-	*seconds = end_seconds - start_seconds;</div><div class='del'>-	if (*seconds &lt; 0) {</div><div class='del'>-		*days = *days - 1;</div><div class='del'>-		*seconds += 24 * 60 * 60;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns an unsorted GArray of CalObjTime's resulting from expanding the</div><div class='del'>-   given recurrence rule within the given interval. Note that it doesn't</div><div class='del'>-   clip the generated occurrences to the interval, i.e. if the interval</div><div class='del'>-   starts part way through the year this function still returns all the</div><div class='del'>-   occurrences for the year. Clipping is done later.</div><div class='del'>-   The finished flag is set to FALSE if there are more occurrences to generate</div><div class='del'>-   after the given interval.*/</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_expand_recurrence		(CalObjTime	  *event_start,</div><div class='del'>-					 icaltimezone	  *zone,</div><div class='del'>-					 CalRecurrence	  *recur,</div><div class='del'>-					 CalObjTime	  *interval_start,</div><div class='del'>-					 CalObjTime	  *interval_end,</div><div class='del'>-					 gboolean	  *finished)</div><div class='del'>-{</div><div class='del'>-	CalRecurVTable *vtable;</div><div class='del'>-	CalObjTime *event_end = NULL, event_end_cotime;</div><div class='del'>-	RecurData recur_data;</div><div class='del'>-	CalObjTime occ, *cotime;</div><div class='del'>-	GArray *all_occs, *occs;</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	/* This is the resulting array of CalObjTime elements. */</div><div class='del'>-	all_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	*finished = TRUE;</div><div class='del'>-</div><div class='del'>-	vtable = cal_obj_get_vtable (recur-&gt;freq);</div><div class='del'>-	if (!vtable)</div><div class='del'>-		return all_occs;</div><div class='del'>-</div><div class='del'>-	/* Calculate some useful data such as some fast lookup tables. */</div><div class='del'>-	cal_obj_initialize_recur_data (&amp;recur_data, recur, event_start);</div><div class='del'>-</div><div class='del'>-	/* Compute the event_end, if the recur's enddate is set. */</div><div class='del'>-	if (recur-&gt;enddate &gt; 0) {</div><div class='del'>-		cal_object_time_from_time (&amp;event_end_cotime,</div><div class='del'>-					   recur-&gt;enddate, zone);</div><div class='del'>-		event_end = &amp;event_end_cotime;</div><div class='del'>-</div><div class='del'>-		/* If the enddate is before the requested interval return. */</div><div class='del'>-		if (cal_obj_time_compare_func (event_end, interval_start) &lt; 0)</div><div class='del'>-			return all_occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set finished to FALSE if we know there will be more occurrences to</div><div class='del'>-	   do after this interval. */</div><div class='del'>-	if (!interval_end || !event_end</div><div class='del'>-	    || cal_obj_time_compare_func (event_end, interval_end) &gt; 0)</div><div class='del'>-		*finished = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the first period based on the frequency and the interval that</div><div class='del'>-	   intersects the interval between start and end. */</div><div class='del'>-	if ((*vtable-&gt;find_start_position) (event_start, event_end,</div><div class='del'>-					    &amp;recur_data,</div><div class='del'>-					    interval_start, interval_end,</div><div class='del'>-					    &amp;occ))</div><div class='del'>-		return all_occs;</div><div class='del'>-</div><div class='del'>-	/* Loop until the event ends or we go past the end of the required</div><div class='del'>-	   interval. */</div><div class='del'>-	for (;;) {</div><div class='del'>-		/* Generate the set of occurrences for this period. */</div><div class='del'>-		switch (recur-&gt;freq) {</div><div class='del'>-		case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-			occs = cal_obj_generate_set_yearly (&amp;recur_data,</div><div class='del'>-							    vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-			occs = cal_obj_generate_set_monthly (&amp;recur_data,</div><div class='del'>-							     vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			occs = cal_obj_generate_set_default (&amp;recur_data,</div><div class='del'>-							     vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Sort the occurrences and remove duplicates. */</div><div class='del'>-		cal_obj_sort_occurrences (occs);</div><div class='del'>-		cal_obj_remove_duplicates_and_invalid_dates (occs);</div><div class='del'>-</div><div class='del'>-		/* Apply the BYSETPOS property. */</div><div class='del'>-		occs = cal_obj_bysetpos_filter (recur, occs);</div><div class='del'>-</div><div class='del'>-		/* Remove any occs after event_end. */</div><div class='del'>-		len = occs-&gt;len - 1;</div><div class='del'>-		if (event_end) {</div><div class='del'>-			while (len &gt;= 0) {</div><div class='del'>-				cotime = &amp;g_array_index (occs, CalObjTime,</div><div class='del'>-							 len);</div><div class='del'>-				if (cal_obj_time_compare_func (cotime,</div><div class='del'>-							       event_end) &lt;= 0)</div><div class='del'>-					break;</div><div class='del'>-				len--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add the occurrences onto the main array. */</div><div class='del'>-		if (len &gt;= 0)</div><div class='del'>-			g_array_append_vals (all_occs, occs-&gt;data, len + 1);</div><div class='del'>-</div><div class='del'>- 		g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-		/* Skip to the next period, or exit the loop if finished. */</div><div class='del'>-		if ((*vtable-&gt;find_next_position) (&amp;occ, event_end,</div><div class='del'>-						   &amp;recur_data, interval_end))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return all_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_yearly	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	CalRecurrence *recur = recur_data-&gt;recur;</div><div class='del'>-	GArray *occs_arrays[4], *occs, *occs2;</div><div class='del'>-	gint num_occs_arrays = 0, i;</div><div class='del'>-</div><div class='del'>-	/* This is a bit complicated, since the iCalendar spec says that</div><div class='del'>-	   several BYxxx modifiers can be used simultaneously. So we have to</div><div class='del'>-	   be quite careful when determining the days of the occurrences.</div><div class='del'>-	   The BYHOUR, BYMINUTE &amp; BYSECOND modifiers are no problem at all.</div><div class='del'>-</div><div class='del'>-	   The modifiers we have to worry about are: BYMONTH, BYWEEKNO,</div><div class='del'>-	   BYYEARDAY, BYMONTHDAY &amp; BYDAY. We can't do these sequentially</div><div class='del'>-	   since each filter will mess up the results of the previous one.</div><div class='del'>-	   But they aren't all completely independant, e.g. BYMONTHDAY and</div><div class='del'>-	   BYDAY are related to BYMONTH, and BYDAY is related to BYWEEKNO.</div><div class='del'>-</div><div class='del'>-	   BYDAY &amp; BYMONTHDAY can also be applied independently, which makes</div><div class='del'>-	   it worse. So we assume that if BYMONTH or BYWEEKNO is used, then</div><div class='del'>-	   the BYDAY modifier applies to those, else it is applied</div><div class='del'>-	   independantly.</div><div class='del'>-</div><div class='del'>-	   We expand the occurrences in parallel into the occs_arrays[] array,</div><div class='del'>-	   and then merge them all into one GArray before expanding BYHOUR,</div><div class='del'>-	   BYMINUTE &amp; BYSECOND. */</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;bymonth) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		/* If BYMONTHDAY &amp; BYDAY are both set we need to expand them</div><div class='del'>-		   in parallel and add the results. */</div><div class='del'>-		if (recur-&gt;bymonthday &amp;&amp; recur-&gt;byday) {</div><div class='del'>-			/* Copy the occs array. */</div><div class='del'>-			occs2 = g_array_new (FALSE, FALSE,</div><div class='del'>-					     sizeof (CalObjTime));</div><div class='del'>-			g_array_append_vals (occs2, occs-&gt;data, occs-&gt;len);</div><div class='del'>-</div><div class='del'>-			occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-			/* Note that we explicitly call the monthly version</div><div class='del'>-			   of the BYDAY expansion filter. */</div><div class='del'>-			occs2 = cal_obj_byday_expand_monthly (recur_data,</div><div class='del'>-							      occs2);</div><div class='del'>-</div><div class='del'>-			/* Add the 2 resulting arrays together. */</div><div class='del'>-			g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-			g_array_free (occs2, TRUE);</div><div class='del'>-		} else {</div><div class='del'>-			occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-			/* Note that we explicitly call the monthly version</div><div class='del'>-			   of the BYDAY expansion filter. */</div><div class='del'>-			occs = cal_obj_byday_expand_monthly (recur_data, occs);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;byweekno) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byweekno_filter) (recur_data, occs);</div><div class='del'>-		/* Note that we explicitly call the weekly version of the</div><div class='del'>-		   BYDAY expansion filter. */</div><div class='del'>-		occs = cal_obj_byday_expand_weekly (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;byyearday) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byyearday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY is set, and BYMONTH is not set, we need to</div><div class='del'>-	   expand BYMONTHDAY independantly. */</div><div class='del'>-	if (recur-&gt;bymonthday &amp;&amp; !recur-&gt;bymonth) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If BYDAY is set, and BYMONTH and BYWEEKNO are not set, we need to</div><div class='del'>-	   expand BYDAY independantly. */</div><div class='del'>-	if (recur-&gt;byday &amp;&amp; !recur-&gt;bymonth &amp;&amp; !recur-&gt;byweekno) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add all the arrays together. If no filters were used we just</div><div class='del'>-	   create an array with one element. */</div><div class='del'>-	if (num_occs_arrays &gt; 0) {</div><div class='del'>-		occs = occs_arrays[0];</div><div class='del'>-		for (i = 1; i &lt; num_occs_arrays; i++) {</div><div class='del'>-			occs2 = occs_arrays[i];</div><div class='del'>-			g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-			g_array_free (occs2, TRUE);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now expand BYHOUR, BYMINUTE &amp; BYSECOND. */</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_monthly	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	GArray *occs, *occs2;</div><div class='del'>-</div><div class='del'>-	/* We start with just the one time in each set. */</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	/* We need to combine the output of BYMONTHDAY &amp; BYDAY, by doing them</div><div class='del'>-	   in parallel rather than sequentially. If we did them sequentially</div><div class='del'>-	   then we would lose the occurrences generated by BYMONTHDAY, and</div><div class='del'>-	   instead have repetitions of the occurrences from BYDAY. */</div><div class='del'>-	if (recur_data-&gt;recur-&gt;bymonthday &amp;&amp; recur_data-&gt;recur-&gt;byday) {</div><div class='del'>-		occs2 = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs2, occs-&gt;data, occs-&gt;len);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-		occs2 = (*vtable-&gt;byday_filter) (recur_data, occs2);</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-		g_array_free (occs2, TRUE);</div><div class='del'>-	} else {</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-		occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_default	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	GArray *occs;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",</div><div class='del'>-		 occ-&gt;day, occ-&gt;month + 1, occ-&gt;year, occ-&gt;hour, occ-&gt;minute,</div><div class='del'>-		 occ-&gt;second);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* We start with just the one time in the set. */</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;byweekno_filter)</div><div class='del'>-		occs = (*vtable-&gt;byweekno_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;byyearday_filter)</div><div class='del'>-		occs = (*vtable-&gt;byyearday_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;bymonthday_filter)</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the function table corresponding to the recurrence frequency. */</div><div class='del'>-static CalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)</div><div class='del'>-{</div><div class='del'>-	CalRecurVTable* vtable;</div><div class='del'>-</div><div class='del'>-	switch (recur_type) {</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_yearly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_monthly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_weekly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_daily_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_HOURLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_hourly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_MINUTELY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_minutely_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SECONDLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_secondly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unknown recurrence frequency");</div><div class='del'>-		vtable = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return vtable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This creates a number of fast lookup tables used when filtering with the</div><div class='del'>-   modifier properties BYMONTH, BYYEARDAY etc. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_initialize_recur_data (RecurData  *recur_data,</div><div class='del'>-			       CalRecurrence *recur,</div><div class='del'>-			       CalObjTime *event_start)</div><div class='del'>-{</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint month, yearday, monthday, weekday, week_num, hour, minute, second;</div><div class='del'>-</div><div class='del'>-	/* Clear the entire RecurData. */</div><div class='del'>-	memset (recur_data, 0, sizeof (RecurData));</div><div class='del'>-</div><div class='del'>-	recur_data-&gt;recur = recur;</div><div class='del'>-</div><div class='del'>-	/* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO</div><div class='del'>-	   modifier. */</div><div class='del'>-	recur_data-&gt;weekday_offset = cal_obj_time_weekday_offset (event_start,</div><div class='del'>-								  recur);</div><div class='del'>-</div><div class='del'>-	/* Create an array of months from bymonths for fast lookup. */</div><div class='del'>-	elem = recur-&gt;bymonth;</div><div class='del'>-	while (elem) {</div><div class='del'>-		month = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		recur_data-&gt;months[month] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of yeardays from byyearday for fast lookup.</div><div class='del'>-	   We create a second array to handle the negative values. The first</div><div class='del'>-	   element there corresponds to the last day of the year. */</div><div class='del'>-	elem = recur-&gt;byyearday;</div><div class='del'>-	while (elem) {</div><div class='del'>-		yearday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		if (yearday &gt;= 0)</div><div class='del'>-			recur_data-&gt;yeardays[yearday] = 1;</div><div class='del'>-		else</div><div class='del'>-			recur_data-&gt;neg_yeardays[-yearday] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of monthdays from bymonthday for fast lookup.</div><div class='del'>-	   We create a second array to handle the negative values. The first</div><div class='del'>-	   element there corresponds to the last day of the month. */</div><div class='del'>-	elem = recur-&gt;bymonthday;</div><div class='del'>-	while (elem) {</div><div class='del'>-		monthday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		if (monthday &gt;= 0)</div><div class='del'>-			recur_data-&gt;monthdays[monthday] = 1;</div><div class='del'>-		else</div><div class='del'>-			recur_data-&gt;neg_monthdays[-monthday] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of weekdays from byday for fast lookup. */</div><div class='del'>-	elem = recur-&gt;byday;</div><div class='del'>-	while (elem) {</div><div class='del'>-		weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-		/* The week number is not used when filtering. */</div><div class='del'>-		week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-		recur_data-&gt;weekdays[weekday] = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of hours from byhour for fast lookup. */</div><div class='del'>-	elem = recur-&gt;byhour;</div><div class='del'>-	while (elem) {</div><div class='del'>-		hour = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		recur_data-&gt;hours[hour] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of minutes from byminutes for fast lookup. */</div><div class='del'>-	elem = recur-&gt;byminute;</div><div class='del'>-	while (elem) {</div><div class='del'>-		minute = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		recur_data-&gt;minutes[minute] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create an array of seconds from byseconds for fast lookup. */</div><div class='del'>-	elem = recur-&gt;bysecond;</div><div class='del'>-	while (elem) {</div><div class='del'>-		second = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-		recur_data-&gt;seconds[second] = 1;</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_obj_sort_occurrences (GArray *occs)</div><div class='del'>-{</div><div class='del'>-	qsort (occs-&gt;data, occs-&gt;len, sizeof (CalObjTime),</div><div class='del'>-	       cal_obj_time_compare_func);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)</div><div class='del'>-{</div><div class='del'>-	static const int days_in_month[12] = {</div><div class='del'>-		31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	CalObjTime *occ, *prev_occ = NULL;</div><div class='del'>-	gint len, i, j = 0, year, month, days;</div><div class='del'>-	gboolean keep_occ;</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		keep_occ = TRUE;</div><div class='del'>-</div><div class='del'>-		if (prev_occ &amp;&amp; cal_obj_time_compare_func (occ,</div><div class='del'>-							   prev_occ) == 0)</div><div class='del'>-			keep_occ = FALSE;</div><div class='del'>-</div><div class='del'>-		year = occ-&gt;year;</div><div class='del'>-		month = occ-&gt;month;</div><div class='del'>-		days = days_in_month[occ-&gt;month];</div><div class='del'>-		/* If it is february and a leap year, add a day. */</div><div class='del'>-		if (month == 1 &amp;&amp; (year % 4 == 0</div><div class='del'>-				   &amp;&amp; (year % 100 != 0</div><div class='del'>-				       || year % 400 == 0)))</div><div class='del'>-			days++;</div><div class='del'>-		if (occ-&gt;day &gt; days)</div><div class='del'>-			keep_occ = FALSE;</div><div class='del'>-</div><div class='del'>-		if (keep_occ) {</div><div class='del'>-			if (i != j)</div><div class='del'>-				g_array_index (occs, CalObjTime, j)</div><div class='del'>-					= g_array_index (occs, CalObjTime, i);</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev_occ = occ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (occs, j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes the exceptions from the ex_occs array from the occurrences in the</div><div class='del'>-   occs array, and removes any duplicates. Both arrays are sorted. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_remove_exceptions (GArray *occs,</div><div class='del'>-			   GArray *ex_occs)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *occ, *prev_occ = NULL, *ex_occ = NULL, *last_occ_kept;</div><div class='del'>-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;</div><div class='del'>-	gboolean keep_occ, current_time_is_exception = FALSE;</div><div class='del'>-</div><div class='del'>-	if (occs-&gt;len == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ex_index = 0;</div><div class='del'>-	occs_len = occs-&gt;len;</div><div class='del'>-	ex_occs_len = ex_occs-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (ex_occs_len &gt; 0)</div><div class='del'>-		ex_occ = &amp;g_array_index (ex_occs, CalObjTime, ex_index);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; occs_len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		keep_occ = TRUE;</div><div class='del'>-</div><div class='del'>-		/* If the occurrence is a duplicate of the previous one, skip</div><div class='del'>-		   it. */</div><div class='del'>-		if (prev_occ</div><div class='del'>-		    &amp;&amp; cal_obj_time_compare_func (occ, prev_occ) == 0) {</div><div class='del'>-			keep_occ = FALSE;</div><div class='del'>-</div><div class='del'>-			/* If this occurrence is an RDATE with an end or</div><div class='del'>-			   duration set, and the previous occurrence in the</div><div class='del'>-			   array was kept, set the RDATE flag of the last one,</div><div class='del'>-			   so we still use the end date or duration. */</div><div class='del'>-			if (occ-&gt;flags &amp;&amp; !current_time_is_exception) {</div><div class='del'>-				last_occ_kept = &amp;g_array_index (occs,</div><div class='del'>-								CalObjTime,</div><div class='del'>-								j - 1);</div><div class='del'>-				last_occ_kept-&gt;flags = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* We've found a new occurrence time. Reset the flag</div><div class='del'>-			   to indicate that it hasn't been found in the</div><div class='del'>-			   exceptions array (yet). */</div><div class='del'>-			current_time_is_exception = FALSE;</div><div class='del'>-</div><div class='del'>-			if (ex_occ) {</div><div class='del'>-				/* Step through the exceptions until we come</div><div class='del'>-				   to one that matches or follows this</div><div class='del'>-				   occurrence. */</div><div class='del'>-				while (ex_occ) {</div><div class='del'>-					/* If the exception is an EXDATE with</div><div class='del'>-					   a DATE value, we only have to</div><div class='del'>-					   compare the date. */</div><div class='del'>-					if (ex_occ-&gt;flags)</div><div class='del'>-						cmp = cal_obj_date_only_compare_func (ex_occ, occ);</div><div class='del'>-					else</div><div class='del'>-						cmp = cal_obj_time_compare_func (ex_occ, occ);</div><div class='del'>-</div><div class='del'>-					if (cmp &gt; 0)</div><div class='del'>-						break;</div><div class='del'>-</div><div class='del'>-					/* Move to the next exception, or set</div><div class='del'>-					   ex_occ to NULL when we reach the</div><div class='del'>-					   end of array. */</div><div class='del'>-					ex_index++;</div><div class='del'>-					if (ex_index &lt; ex_occs_len)</div><div class='del'>-						ex_occ = &amp;g_array_index (ex_occs, CalObjTime, ex_index);</div><div class='del'>-					else</div><div class='del'>-						ex_occ = NULL;</div><div class='del'>-</div><div class='del'>-					/* If the exception did match this</div><div class='del'>-					   occurrence we remove it, and set the</div><div class='del'>-					   flag to indicate that the current</div><div class='del'>-					   time is an exception. */</div><div class='del'>-					if (cmp == 0) {</div><div class='del'>-						current_time_is_exception = TRUE;</div><div class='del'>-						keep_occ = FALSE;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (keep_occ) {</div><div class='del'>-			/* We are keeping this occurrence, so we move it to</div><div class='del'>-			   the next free space, unless its position hasn't</div><div class='del'>-			   changed (i.e. all previous occurrences were also</div><div class='del'>-			   kept). */</div><div class='del'>-			if (i != j)</div><div class='del'>-				g_array_index (occs, CalObjTime, j)</div><div class='del'>-					= g_array_index (occs, CalObjTime, i);</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev_occ = occ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (occs, j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bysetpos_filter (CalRecurrence *recur,</div><div class='del'>-			 GArray	    *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, pos;</div><div class='del'>-</div><div class='del'>-	/* If BYSETPOS has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	elem = recur-&gt;bysetpos;</div><div class='del'>-	if (!elem || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	/* Iterate over the indices given in bysetpos, adding the corresponding</div><div class='del'>-	   element from occs to new_occs. */</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	while (elem) {</div><div class='del'>-		pos = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-</div><div class='del'>-		/* Negative values count back from the end of the array. */</div><div class='del'>-		if (pos &lt; 0)</div><div class='del'>-			pos += len;</div><div class='del'>-		/* Positive values need to be decremented since the array is</div><div class='del'>-		   0-based. */</div><div class='del'>-		else</div><div class='del'>-			pos--;</div><div class='del'>-</div><div class='del'>-		if (pos &gt;= 0 &amp;&amp; pos &lt; len) {</div><div class='del'>-			occ = &amp;g_array_index (occs, CalObjTime, pos);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-		elem = elem-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the first year from the event_start, counting in multiples of the</div><div class='del'>-   recurrence interval, that intersects the given interval. It returns TRUE</div><div class='del'>-   if there is no intersection. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_yearly_find_start_position (CalObjTime *event_start,</div><div class='del'>-				    CalObjTime *event_end,</div><div class='del'>-				    RecurData  *recur_data,</div><div class='del'>-				    CalObjTime *interval_start,</div><div class='del'>-				    CalObjTime *interval_end,</div><div class='del'>-				    CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	/* Move on to the next interval, if the event starts before the</div><div class='del'>-	   given interval. */</div><div class='del'>-	if (cotime-&gt;year &lt; interval_start-&gt;year) {</div><div class='del'>-		gint years = interval_start-&gt;year - cotime-&gt;year</div><div class='del'>-			+ recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		years -= years % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		/* NOTE: The day may now be invalid, e.g. 29th Feb. */</div><div class='del'>-		cotime-&gt;year += years;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((event_end &amp;&amp; cotime-&gt;year &gt; event_end-&gt;year)</div><div class='del'>-	    || (interval_end &amp;&amp; cotime-&gt;year &gt; interval_end-&gt;year))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_yearly_find_next_position (CalObjTime *cotime,</div><div class='del'>-				   CalObjTime *event_end,</div><div class='del'>-				   RecurData  *recur_data,</div><div class='del'>-				   CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	/* NOTE: The day may now be invalid, e.g. 29th Feb. */</div><div class='del'>-	cotime-&gt;year += recur_data-&gt;recur-&gt;interval;</div><div class='del'>-</div><div class='del'>-	if ((event_end &amp;&amp; cotime-&gt;year &gt; event_end-&gt;year)</div><div class='del'>-	    || (interval_end &amp;&amp; cotime-&gt;year &gt; interval_end-&gt;year))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_monthly_find_start_position (CalObjTime *event_start,</div><div class='del'>-				     CalObjTime *event_end,</div><div class='del'>-				     RecurData  *recur_data,</div><div class='del'>-				     CalObjTime *interval_start,</div><div class='del'>-				     CalObjTime *interval_end,</div><div class='del'>-				     CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	/* Move on to the next interval, if the event starts before the</div><div class='del'>-	   given interval. */</div><div class='del'>-	if (cal_obj_time_compare (cotime, interval_start, CALOBJ_MONTH) &lt; 0) {</div><div class='del'>-		gint months = (interval_start-&gt;year - cotime-&gt;year) * 12</div><div class='del'>-			+ interval_start-&gt;month - cotime-&gt;month</div><div class='del'>-			+ recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		months -= months % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		/* NOTE: The day may now be invalid, e.g. 31st Sep. */</div><div class='del'>-		cal_obj_time_add_months (cotime, months);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_MONTH) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_MONTH) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_monthly_find_next_position (CalObjTime *cotime,</div><div class='del'>-				    CalObjTime *event_end,</div><div class='del'>-				    RecurData  *recur_data,</div><div class='del'>-				    CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	/* NOTE: The day may now be invalid, e.g. 31st Sep. */</div><div class='del'>-	cal_obj_time_add_months (cotime, recur_data-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_MONTH) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_MONTH) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_weekly_find_start_position (CalObjTime *event_start,</div><div class='del'>-				    CalObjTime *event_end,</div><div class='del'>-				    RecurData  *recur_data,</div><div class='del'>-				    CalObjTime *interval_start,</div><div class='del'>-				    CalObjTime *interval_end,</div><div class='del'>-				    CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate event_start_date, interval_start_date;</div><div class='del'>-	guint32 event_start_julian, interval_start_julian;</div><div class='del'>-	gint interval_start_weekday_offset;</div><div class='del'>-	CalObjTime week_start;</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (event_end, interval_start,</div><div class='del'>-					       CALOBJ_DAY) &lt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (event_start, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	/* Convert the event start and interval start to GDates, so we can</div><div class='del'>-	   easily find the number of days between them. */</div><div class='del'>-	g_date_clear (&amp;event_start_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;event_start_date, event_start-&gt;day,</div><div class='del'>-			event_start-&gt;month + 1, event_start-&gt;year);</div><div class='del'>-	g_date_clear (&amp;interval_start_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;interval_start_date, interval_start-&gt;day,</div><div class='del'>-			interval_start-&gt;month + 1, interval_start-&gt;year);</div><div class='del'>-</div><div class='del'>-	/* Calculate the start of the weeks corresponding to the event start</div><div class='del'>-	   and interval start. */</div><div class='del'>-	event_start_julian = g_date_julian (&amp;event_start_date);</div><div class='del'>-	event_start_julian -= recur_data-&gt;weekday_offset;</div><div class='del'>-</div><div class='del'>-	interval_start_julian = g_date_julian (&amp;interval_start_date);</div><div class='del'>-	interval_start_weekday_offset = cal_obj_time_weekday_offset (interval_start, recur_data-&gt;recur);</div><div class='del'>-	interval_start_julian -= interval_start_weekday_offset;</div><div class='del'>-</div><div class='del'>-	/* We want to find the first full week using the recurrence interval</div><div class='del'>-	   that intersects the given interval dates. */</div><div class='del'>-	if (event_start_julian &lt; interval_start_julian) {</div><div class='del'>-		gint weeks = (interval_start_julian - event_start_julian) / 7;</div><div class='del'>-		weeks += recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		weeks -= weeks % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		cal_obj_time_add_days (cotime, weeks * 7);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	week_start = *cotime;</div><div class='del'>-	cal_obj_time_add_days (&amp;week_start, -recur_data-&gt;weekday_offset);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (&amp;week_start, event_end,</div><div class='del'>-					       CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (&amp;week_start, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_weekly_find_next_position (CalObjTime *cotime,</div><div class='del'>-				   CalObjTime *event_end,</div><div class='del'>-				   RecurData  *recur_data,</div><div class='del'>-				   CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	CalObjTime week_start;</div><div class='del'>-</div><div class='del'>-	cal_obj_time_add_days (cotime, recur_data-&gt;recur-&gt;interval * 7);</div><div class='del'>-</div><div class='del'>-	/* Return TRUE if the start of this week is after the event finishes</div><div class='del'>-	   or is after the end of the required interval. */</div><div class='del'>-	week_start = *cotime;</div><div class='del'>-	cal_obj_time_add_days (&amp;week_start, -recur_data-&gt;weekday_offset);</div><div class='del'>-</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-	g_print ("Next  day: %s\n", cal_obj_time_to_string (cotime));</div><div class='del'>-	g_print ("Week Start: %s\n", cal_obj_time_to_string (&amp;week_start));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (&amp;week_start, event_end,</div><div class='del'>-					       CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (&amp;week_start, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0) {</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-		g_print ("Interval end reached: %s\n",</div><div class='del'>-			 cal_obj_time_to_string (interval_end));</div><div class='del'>-#endif</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_daily_find_start_position  (CalObjTime *event_start,</div><div class='del'>-				    CalObjTime *event_end,</div><div class='del'>-				    RecurData  *recur_data,</div><div class='del'>-				    CalObjTime *interval_start,</div><div class='del'>-				    CalObjTime *interval_end,</div><div class='del'>-				    CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate event_start_date, interval_start_date;</div><div class='del'>-	guint32 event_start_julian, interval_start_julian, days;</div><div class='del'>-</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (event_start, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (event_end, interval_start,</div><div class='del'>-					       CALOBJ_DAY) &lt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	/* Convert the event start and interval start to GDates, so we can</div><div class='del'>-	   easily find the number of days between them. */</div><div class='del'>-	g_date_clear (&amp;event_start_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;event_start_date, event_start-&gt;day,</div><div class='del'>-			event_start-&gt;month + 1, event_start-&gt;year);</div><div class='del'>-	g_date_clear (&amp;interval_start_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;interval_start_date, interval_start-&gt;day,</div><div class='del'>-			interval_start-&gt;month + 1, interval_start-&gt;year);</div><div class='del'>-</div><div class='del'>-	event_start_julian = g_date_julian (&amp;event_start_date);</div><div class='del'>-	interval_start_julian = g_date_julian (&amp;interval_start_date);</div><div class='del'>-</div><div class='del'>-	if (event_start_julian &lt; interval_start_julian) {</div><div class='del'>-		days = interval_start_julian - event_start_julian</div><div class='del'>-			+ recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		days -= days % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		cal_obj_time_add_days (cotime, days);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_daily_find_next_position  (CalObjTime *cotime,</div><div class='del'>-				   CalObjTime *event_end,</div><div class='del'>-				   RecurData  *recur_data,</div><div class='del'>-				   CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	cal_obj_time_add_days (cotime, recur_data-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_DAY) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_hourly_find_start_position (CalObjTime *event_start,</div><div class='del'>-				    CalObjTime *event_end,</div><div class='del'>-				    RecurData  *recur_data,</div><div class='del'>-				    CalObjTime *interval_start,</div><div class='del'>-				    CalObjTime *interval_end,</div><div class='del'>-				    CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate event_start_date, interval_start_date;</div><div class='del'>-	guint32 event_start_julian, interval_start_julian, hours;</div><div class='del'>-</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (event_start, interval_end,</div><div class='del'>-						  CALOBJ_HOUR) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (event_end, interval_start,</div><div class='del'>-					       CALOBJ_HOUR) &lt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	if (cal_obj_time_compare (event_start, interval_start,</div><div class='del'>-				  CALOBJ_HOUR) &lt; 0) {</div><div class='del'>-		/* Convert the event start and interval start to GDates, so we</div><div class='del'>-		   can easily find the number of days between them. */</div><div class='del'>-		g_date_clear (&amp;event_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;event_start_date, event_start-&gt;day,</div><div class='del'>-				event_start-&gt;month + 1, event_start-&gt;year);</div><div class='del'>-		g_date_clear (&amp;interval_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;interval_start_date, interval_start-&gt;day,</div><div class='del'>-				interval_start-&gt;month + 1,</div><div class='del'>-				interval_start-&gt;year);</div><div class='del'>-</div><div class='del'>-		event_start_julian = g_date_julian (&amp;event_start_date);</div><div class='del'>-		interval_start_julian = g_date_julian (&amp;interval_start_date);</div><div class='del'>-</div><div class='del'>-		hours = (interval_start_julian - event_start_julian) * 24;</div><div class='del'>-		hours += interval_start-&gt;hour - event_start-&gt;hour;</div><div class='del'>-		hours += recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		hours -= hours % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		cal_obj_time_add_hours (cotime, hours);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_HOUR) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_HOUR) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_hourly_find_next_position (CalObjTime *cotime,</div><div class='del'>-				   CalObjTime *event_end,</div><div class='del'>-				   RecurData  *recur_data,</div><div class='del'>-				   CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	cal_obj_time_add_hours (cotime, recur_data-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_HOUR) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_HOUR) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_minutely_find_start_position (CalObjTime *event_start,</div><div class='del'>-				      CalObjTime *event_end,</div><div class='del'>-				      RecurData  *recur_data,</div><div class='del'>-				      CalObjTime *interval_start,</div><div class='del'>-				      CalObjTime *interval_end,</div><div class='del'>-				      CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate event_start_date, interval_start_date;</div><div class='del'>-	guint32 event_start_julian, interval_start_julian, minutes;</div><div class='del'>-</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (event_start, interval_end,</div><div class='del'>-						  CALOBJ_MINUTE) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (event_end, interval_start,</div><div class='del'>-					       CALOBJ_MINUTE) &lt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	if (cal_obj_time_compare (event_start, interval_start,</div><div class='del'>-				  CALOBJ_MINUTE) &lt; 0) {</div><div class='del'>-		/* Convert the event start and interval start to GDates, so we</div><div class='del'>-		   can easily find the number of days between them. */</div><div class='del'>-		g_date_clear (&amp;event_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;event_start_date, event_start-&gt;day,</div><div class='del'>-				event_start-&gt;month + 1, event_start-&gt;year);</div><div class='del'>-		g_date_clear (&amp;interval_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;interval_start_date, interval_start-&gt;day,</div><div class='del'>-				interval_start-&gt;month + 1,</div><div class='del'>-				interval_start-&gt;year);</div><div class='del'>-</div><div class='del'>-		event_start_julian = g_date_julian (&amp;event_start_date);</div><div class='del'>-		interval_start_julian = g_date_julian (&amp;interval_start_date);</div><div class='del'>-</div><div class='del'>-		minutes = (interval_start_julian - event_start_julian)</div><div class='del'>-			* 24 * 60;</div><div class='del'>-		minutes += (interval_start-&gt;hour - event_start-&gt;hour) * 24;</div><div class='del'>-		minutes += interval_start-&gt;minute - event_start-&gt;minute;</div><div class='del'>-		minutes += recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		minutes -= minutes % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		cal_obj_time_add_minutes (cotime, minutes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_MINUTE) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_MINUTE) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_minutely_find_next_position (CalObjTime *cotime,</div><div class='del'>-				     CalObjTime *event_end,</div><div class='del'>-				     RecurData  *recur_data,</div><div class='del'>-				     CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	cal_obj_time_add_minutes (cotime, recur_data-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_MINUTE) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_MINUTE) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_secondly_find_start_position (CalObjTime *event_start,</div><div class='del'>-				      CalObjTime *event_end,</div><div class='del'>-				      RecurData  *recur_data,</div><div class='del'>-				      CalObjTime *interval_start,</div><div class='del'>-				      CalObjTime *interval_end,</div><div class='del'>-				      CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate event_start_date, interval_start_date;</div><div class='del'>-	guint32 event_start_julian, interval_start_julian, seconds;</div><div class='del'>-</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (event_start, interval_end,</div><div class='del'>-						  CALOBJ_SECOND) &gt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (event_end, interval_start,</div><div class='del'>-					       CALOBJ_SECOND) &lt; 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	*cotime = *event_start;</div><div class='del'>-</div><div class='del'>-	if (cal_obj_time_compare (event_start, interval_start,</div><div class='del'>-				  CALOBJ_SECOND) &lt; 0) {</div><div class='del'>-		/* Convert the event start and interval start to GDates, so we</div><div class='del'>-		   can easily find the number of days between them. */</div><div class='del'>-		g_date_clear (&amp;event_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;event_start_date, event_start-&gt;day,</div><div class='del'>-				event_start-&gt;month + 1, event_start-&gt;year);</div><div class='del'>-		g_date_clear (&amp;interval_start_date, 1);</div><div class='del'>-		g_date_set_dmy (&amp;interval_start_date, interval_start-&gt;day,</div><div class='del'>-				interval_start-&gt;month + 1,</div><div class='del'>-				interval_start-&gt;year);</div><div class='del'>-</div><div class='del'>-		event_start_julian = g_date_julian (&amp;event_start_date);</div><div class='del'>-		interval_start_julian = g_date_julian (&amp;interval_start_date);</div><div class='del'>-</div><div class='del'>-		seconds = (interval_start_julian - event_start_julian)</div><div class='del'>-			* 24 * 60 * 60;</div><div class='del'>-		seconds += (interval_start-&gt;hour - event_start-&gt;hour)</div><div class='del'>-			* 24 * 60;</div><div class='del'>-		seconds += (interval_start-&gt;minute - event_start-&gt;minute) * 60;</div><div class='del'>-		seconds += interval_start-&gt;second - event_start-&gt;second;</div><div class='del'>-		seconds += recur_data-&gt;recur-&gt;interval - 1;</div><div class='del'>-		seconds -= seconds % recur_data-&gt;recur-&gt;interval;</div><div class='del'>-		cal_obj_time_add_seconds (cotime, seconds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_SECOND) &gt;= 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_SECOND) &gt;= 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_obj_secondly_find_next_position (CalObjTime *cotime,</div><div class='del'>-				     CalObjTime *event_end,</div><div class='del'>-				     RecurData  *recur_data,</div><div class='del'>-				     CalObjTime *interval_end)</div><div class='del'>-{</div><div class='del'>-	cal_obj_time_add_seconds (cotime, recur_data-&gt;recur-&gt;interval);</div><div class='del'>-</div><div class='del'>-	if (event_end &amp;&amp; cal_obj_time_compare (cotime, event_end,</div><div class='del'>-					       CALOBJ_SECOND) &gt;= 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (interval_end &amp;&amp; cal_obj_time_compare (cotime, interval_end,</div><div class='del'>-						  CALOBJ_SECOND) &gt;= 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYMONTH rule is specified it expands each occurrence in occs, by</div><div class='del'>-   using each of the months in the bymonth list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonth_expand		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTH has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonth || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;bymonth;</div><div class='del'>-		while (elem) {</div><div class='del'>-			/* NOTE: The day may now be invalid, e.g. 31st Feb. */</div><div class='del'>-			occ-&gt;month = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYMONTH rule is specified it filters out all occurrences in occs</div><div class='del'>-   which do not match one of the months in the bymonth list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonth_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTH has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonth || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;months[occ-&gt;month])</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byweekno_expand		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekno;</div><div class='del'>-</div><div class='del'>-	/* If BYWEEKNO has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byweekno || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to week 1 (note that</div><div class='del'>-		   week 1 is the first week starting from the specified week</div><div class='del'>-		   start day that has 4 days in the new year). */</div><div class='del'>-		year_start_cotime = *occ;</div><div class='del'>-		cal_obj_time_find_first_week (&amp;year_start_cotime,</div><div class='del'>-					      recur_data);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to week 1 of the next</div><div class='del'>-		   year, which we use for -ve week numbers. */</div><div class='del'>-		year_end_cotime = *occ;</div><div class='del'>-		year_end_cotime.year++;</div><div class='del'>-		cal_obj_time_find_first_week (&amp;year_end_cotime,</div><div class='del'>-					      recur_data);</div><div class='del'>-</div><div class='del'>-		/* Now iterate over the week numbers in byweekno, generating a</div><div class='del'>-		   new occurrence for each one. */</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byweekno;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekno = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			if (weekno &gt; 0) {</div><div class='del'>-				cotime = year_start_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime,</div><div class='del'>-						       (weekno - 1) * 7);</div><div class='del'>-			} else {</div><div class='del'>-				cotime = year_end_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, weekno * 7);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the year. */</div><div class='del'>-			if (cotime.year == occ-&gt;year)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* This isn't used at present. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byweekno_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byyearday_expand	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, dayno;</div><div class='del'>-</div><div class='del'>-	/* If BYYEARDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byyearday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1. */</div><div class='del'>-		year_start_cotime = *occ;</div><div class='del'>-		year_start_cotime.month = 0;</div><div class='del'>-		year_start_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1 of the next</div><div class='del'>-		   year, which we use for -ve day numbers. */</div><div class='del'>-		year_end_cotime = *occ;</div><div class='del'>-		year_end_cotime.year++;</div><div class='del'>-		year_end_cotime.month = 0;</div><div class='del'>-		year_end_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Now iterate over the day numbers in byyearday, generating a</div><div class='del'>-		   new occurrence for each one. */</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byyearday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			dayno = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			if (dayno &gt; 0) {</div><div class='del'>-				cotime = year_start_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno - 1);</div><div class='del'>-			} else {</div><div class='del'>-				cotime = year_end_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the year. */</div><div class='del'>-			if (cotime.year == occ-&gt;year)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note: occs must not contain invalid dates, e.g. 31st September. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byyearday_filter	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint yearday, len, i, days_in_year;</div><div class='del'>-</div><div class='del'>-	/* If BYYEARDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byyearday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		yearday = cal_obj_time_day_of_year (occ);</div><div class='del'>-		if (recur_data-&gt;yeardays[yearday]) {</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		} else {</div><div class='del'>-			days_in_year = g_date_is_leap_year (occ-&gt;year)</div><div class='del'>-				? 366 : 365;</div><div class='del'>-			if (recur_data-&gt;neg_yeardays[days_in_year + 1</div><div class='del'>-						    - yearday])</div><div class='del'>-				g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonthday_expand	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ, month_start_cotime, month_end_cotime, cotime;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, dayno;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonthday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1. */</div><div class='del'>-		month_start_cotime = *occ;</div><div class='del'>-		month_start_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1 of the next</div><div class='del'>-		   month, which we use for -ve day numbers. */</div><div class='del'>-		month_end_cotime = *occ;</div><div class='del'>-		month_end_cotime.month++;</div><div class='del'>-		month_end_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Now iterate over the day numbers in bymonthday, generating a</div><div class='del'>-		   new occurrence for each one. */</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;bymonthday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			dayno = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			if (dayno &gt; 0) {</div><div class='del'>-				cotime = month_start_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno - 1);</div><div class='del'>-			} else {</div><div class='del'>-				cotime = month_end_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the month. */</div><div class='del'>-			if (cotime.month == occ-&gt;month)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonthday_filter	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i, days_in_month;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonthday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;monthdays[occ-&gt;day]) {</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		} else {</div><div class='del'>-			days_in_month = time_days_in_month (occ-&gt;year,</div><div class='del'>-							    occ-&gt;month);</div><div class='del'>-			if (recur_data-&gt;neg_monthdays[days_in_month + 1</div><div class='del'>-						     - occ-&gt;day])</div><div class='del'>-				g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_yearly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint first_weekday, last_weekday, offset;</div><div class='del'>-	guint16 year;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-			week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			year = occ-&gt;year;</div><div class='del'>-			if (week_num == 0) {</div><div class='del'>-				/* Expand to every Mon/Tue/etc. in the year. */</div><div class='del'>-				occ-&gt;month = 0;</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-				offset = (weekday + 7 - first_weekday) % 7;</div><div class='del'>-				cal_obj_time_add_days (occ, offset);</div><div class='del'>-</div><div class='del'>-				while (occ-&gt;year == year) {</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-					cal_obj_time_add_days (occ, 7);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			} else if (week_num &gt; 0) {</div><div class='del'>-				/* Add the nth Mon/Tue/etc. in the year. */</div><div class='del'>-				occ-&gt;month = 0;</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-				offset = (weekday + 7 - first_weekday) % 7;</div><div class='del'>-				offset += (week_num - 1) * 7;</div><div class='del'>-				cal_obj_time_add_days (occ, offset);</div><div class='del'>-				if (occ-&gt;year == year)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				/* Add the -nth Mon/Tue/etc. in the year. */</div><div class='del'>-				occ-&gt;month = 11;</div><div class='del'>-				occ-&gt;day = 31;</div><div class='del'>-				last_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-				offset = (last_weekday + 7 - weekday) % 7;</div><div class='del'>-				offset += (week_num - 1) * 7;</div><div class='del'>-				cal_obj_time_add_days (occ, -offset);</div><div class='del'>-				if (occ-&gt;year == year)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reset the year, as we may have gone past the end. */</div><div class='del'>-			occ-&gt;year = year;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_monthly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint first_weekday, last_weekday, offset;</div><div class='del'>-	guint16 year;</div><div class='del'>-	guint8 month;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-			week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			year = occ-&gt;year;</div><div class='del'>-			month = occ-&gt;month;</div><div class='del'>-			if (week_num == 0) {</div><div class='del'>-				/* Expand to every Mon/Tue/etc. in the month.*/</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-				offset = (weekday + 7 - first_weekday) % 7;</div><div class='del'>-				cal_obj_time_add_days (occ, offset);</div><div class='del'>-</div><div class='del'>-				while (occ-&gt;year == year</div><div class='del'>-				       &amp;&amp; occ-&gt;month == month) {</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-					cal_obj_time_add_days (occ, 7);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			} else if (week_num &gt; 0) {</div><div class='del'>-				/* Add the nth Mon/Tue/etc. in the month. */</div><div class='del'>-				occ-&gt;day = 1;</div><div class='del'>-				first_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-				offset = (weekday + 7 - first_weekday) % 7;</div><div class='del'>-				offset += (week_num - 1) * 7;</div><div class='del'>-				cal_obj_time_add_days (occ, offset);</div><div class='del'>-				if (occ-&gt;year == year &amp;&amp; occ-&gt;month == month)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-</div><div class='del'>-			} else {</div><div class='del'>-				/* Add the -nth Mon/Tue/etc. in the month. */</div><div class='del'>-				occ-&gt;day = time_days_in_month (occ-&gt;year,</div><div class='del'>-							       occ-&gt;month);</div><div class='del'>-				last_weekday = cal_obj_time_weekday (occ);</div><div class='del'>-</div><div class='del'>-				/* This calculates the number of days to step</div><div class='del'>-				   backwards from the last day of the month</div><div class='del'>-				   to the weekday we want. */</div><div class='del'>-				offset = (last_weekday + 7 - weekday) % 7;</div><div class='del'>-</div><div class='del'>-				/* This adds on the weeks. */</div><div class='del'>-				offset += (-week_num - 1) * 7;</div><div class='del'>-</div><div class='del'>-				cal_obj_time_add_days (occ, -offset);</div><div class='del'>-				if (occ-&gt;year == year &amp;&amp; occ-&gt;month == month)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reset the year &amp; month, as we may have gone past</div><div class='del'>-			   the end. */</div><div class='del'>-			occ-&gt;year = year;</div><div class='del'>-			occ-&gt;month = month;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note: occs must not contain invalid dates, e.g. 31st September. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_weekly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint weekday_offset, new_weekday_offset;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			/* FIXME: Currently we just ignore this, but maybe we</div><div class='del'>-			   should skip all elements where week_num != 0.</div><div class='del'>-			   The spec isn't clear about this. */</div><div class='del'>-			week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			weekday_offset = cal_obj_time_weekday_offset (occ, recur_data-&gt;recur);</div><div class='del'>-			new_weekday_offset = (weekday + 7 - recur_data-&gt;recur-&gt;week_start_day) % 7;</div><div class='del'>-			cal_obj_time_add_days (occ, new_weekday_offset - weekday_offset);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note: occs must not contain invalid dates, e.g. 31st September. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i, weekday;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		weekday = cal_obj_time_weekday (occ);</div><div class='del'>-</div><div class='del'>-		/* See if the weekday on its own is set. */</div><div class='del'>-		if (recur_data-&gt;weekdays[weekday])</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYHOUR rule is specified it expands each occurrence in occs, by</div><div class='del'>-   using each of the hours in the byhour list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byhour_expand		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYHOUR has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byhour || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byhour;</div><div class='del'>-		while (elem) {</div><div class='del'>-			occ-&gt;hour = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYHOUR rule is specified it filters out all occurrences in occs</div><div class='del'>-   which do not match one of the hours in the byhour list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byhour_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYHOUR has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byhour || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;hours[occ-&gt;hour])</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYMINUTE rule is specified it expands each occurrence in occs, by</div><div class='del'>-   using each of the minutes in the byminute list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byminute_expand		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYMINUTE has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byminute || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byminute;</div><div class='del'>-		while (elem) {</div><div class='del'>-			occ-&gt;minute = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYMINUTE rule is specified it filters out all occurrences in occs</div><div class='del'>-   which do not match one of the minutes in the byminute list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byminute_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYMINUTE has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byminute || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;minutes[occ-&gt;minute])</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYSECOND rule is specified it expands each occurrence in occs, by</div><div class='del'>-   using each of the seconds in the bysecond list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bysecond_expand		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYSECOND has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bysecond || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;bysecond;</div><div class='del'>-		while (elem) {</div><div class='del'>-			occ-&gt;second = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If the BYSECOND rule is specified it filters out all occurrences in occs</div><div class='del'>-   which do not match one of the seconds in the bysecond list. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bysecond_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i;</div><div class='del'>-</div><div class='del'>-	/* If BYSECOND has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bysecond || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;seconds[occ-&gt;second])</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive or negative number of months to the given CalObjTime,</div><div class='del'>-   updating the year appropriately so we end up with a valid month.</div><div class='del'>-   Note that the day may be invalid, e.g. 30th Feb. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_add_months		(CalObjTime *cotime,</div><div class='del'>-				 gint	     months)</div><div class='del'>-{</div><div class='del'>-	guint month, years;</div><div class='del'>-</div><div class='del'>-	/* We use a guint to avoid overflow on the guint8. */</div><div class='del'>-	month = cotime-&gt;month + months;</div><div class='del'>-	cotime-&gt;month = month % 12;</div><div class='del'>-	if (month &gt; 0) {</div><div class='del'>-		cotime-&gt;year += month / 12;</div><div class='del'>-	} else {</div><div class='del'>-		years = month / 12;</div><div class='del'>-		if (cotime-&gt;month != 0) {</div><div class='del'>-			cotime-&gt;month += 12;</div><div class='del'>-			years -= 1;</div><div class='del'>-		}</div><div class='del'>-		cotime-&gt;year += years;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive or negative number of days to the given CalObjTime,</div><div class='del'>-   updating the month and year appropriately so we end up with a valid day. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_add_days		(CalObjTime *cotime,</div><div class='del'>-				 gint	     days)</div><div class='del'>-{</div><div class='del'>-	gint day, days_in_month;</div><div class='del'>-</div><div class='del'>-	/* We use a guint to avoid overflow on the guint8. */</div><div class='del'>-	day = cotime-&gt;day;</div><div class='del'>-	day += days;</div><div class='del'>-</div><div class='del'>-	if (days &gt;= 0) {</div><div class='del'>-		for (;;) {</div><div class='del'>-			days_in_month = time_days_in_month (cotime-&gt;year,</div><div class='del'>-							    cotime-&gt;month);</div><div class='del'>-			if (day &lt;= days_in_month)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			cotime-&gt;month++;</div><div class='del'>-			if (cotime-&gt;month &gt;= 12) {</div><div class='del'>-				cotime-&gt;year++;</div><div class='del'>-				cotime-&gt;month = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			day -= days_in_month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cotime-&gt;day = (guint8) day;</div><div class='del'>-	} else {</div><div class='del'>-		while (day &lt;= 0) {</div><div class='del'>-			if (cotime-&gt;month == 0) {</div><div class='del'>-				cotime-&gt;year--;</div><div class='del'>-				cotime-&gt;month = 11;</div><div class='del'>-			} else {</div><div class='del'>-				cotime-&gt;month--;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			days_in_month = time_days_in_month (cotime-&gt;year,</div><div class='del'>-							    cotime-&gt;month);</div><div class='del'>-			day += days_in_month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cotime-&gt;day = (guint8) day;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive or negative number of hours to the given CalObjTime,</div><div class='del'>-   updating the day, month &amp; year appropriately so we end up with a valid</div><div class='del'>-   time. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_add_hours		(CalObjTime *cotime,</div><div class='del'>-				 gint	     hours)</div><div class='del'>-{</div><div class='del'>-	gint hour, days;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	hour = cotime-&gt;hour + hours;</div><div class='del'>-	cotime-&gt;hour = hour % 24;</div><div class='del'>-	if (hour &gt;= 0) {</div><div class='del'>-		if (hour &gt;= 24)</div><div class='del'>-			cal_obj_time_add_days (cotime, hour / 24);</div><div class='del'>-	} else {</div><div class='del'>-		days = hour / 24;</div><div class='del'>-		if (cotime-&gt;hour != 0) {</div><div class='del'>-			cotime-&gt;hour += 24;</div><div class='del'>-			days -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_days (cotime, days);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive or negative number of minutes to the given CalObjTime,</div><div class='del'>-   updating the rest of the CalObjTime appropriately. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_add_minutes	(CalObjTime *cotime,</div><div class='del'>-				 gint	     minutes)</div><div class='del'>-{</div><div class='del'>-	gint minute, hours;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	minute = cotime-&gt;minute + minutes;</div><div class='del'>-	cotime-&gt;minute = minute % 60;</div><div class='del'>-	if (minute &gt;= 0) {</div><div class='del'>-		if (minute &gt;= 60)</div><div class='del'>-			cal_obj_time_add_hours (cotime, minute / 60);</div><div class='del'>-	} else {</div><div class='del'>-		hours = minute / 60;</div><div class='del'>-		if (cotime-&gt;minute != 0) {</div><div class='del'>-			cotime-&gt;minute += 60;</div><div class='del'>-			hours -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_hours (cotime, hours);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive or negative number of seconds to the given CalObjTime,</div><div class='del'>-   updating the rest of the CalObjTime appropriately. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_add_seconds	(CalObjTime *cotime,</div><div class='del'>-				 gint	     seconds)</div><div class='del'>-{</div><div class='del'>-	gint second, minutes;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	second = cotime-&gt;second + seconds;</div><div class='del'>-	cotime-&gt;second = second % 60;</div><div class='del'>-	if (second &gt;= 0) {</div><div class='del'>-		if (second &gt;= 60)</div><div class='del'>-			cal_obj_time_add_minutes (cotime, second / 60);</div><div class='del'>-	} else {</div><div class='del'>-		minutes = second / 60;</div><div class='del'>-		if (cotime-&gt;second != 0) {</div><div class='del'>-			cotime-&gt;second += 60;</div><div class='del'>-			minutes -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_minutes (cotime, minutes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if</div><div class='del'>-   they are the same, or 1 if cotime1 is after cotime2. The comparison type</div><div class='del'>-   specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY</div><div class='del'>-   is used we only want to know if the days are different. */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_compare		(CalObjTime *cotime1,</div><div class='del'>-				 CalObjTime *cotime2,</div><div class='del'>-				 CalObjTimeComparison type)</div><div class='del'>-{</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_YEAR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_MONTH)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_DAY)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;hour &lt; cotime2-&gt;hour)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;hour &gt; cotime2-&gt;hour)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_HOUR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;minute &lt; cotime2-&gt;minute)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;minute &gt; cotime2-&gt;minute)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_MINUTE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;second &lt; cotime2-&gt;second)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;second &gt; cotime2-&gt;second)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is the same as the above function, but without the comparison type.</div><div class='del'>-   It is used for qsort(). */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_compare_func (const void *arg1,</div><div class='del'>-			   const void *arg2)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *cotime1, *cotime2;</div><div class='del'>-	gint retval;</div><div class='del'>-</div><div class='del'>-	cotime1 = (CalObjTime*) arg1;</div><div class='del'>-	cotime2 = (CalObjTime*) arg2;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;hour &lt; cotime2-&gt;hour)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;hour &gt; cotime2-&gt;hour)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;minute &lt; cotime2-&gt;minute)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;minute &gt; cotime2-&gt;minute)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;second &lt; cotime2-&gt;second)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;second &gt; cotime2-&gt;second)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else</div><div class='del'>-		retval = 0;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("%s - ", cal_obj_time_to_string (cotime1));</div><div class='del'>-	g_print ("%s : %i\n", cal_obj_time_to_string (cotime2), retval);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-cal_obj_date_only_compare_func (const void *arg1,</div><div class='del'>-				const void *arg2)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *cotime1, *cotime2;</div><div class='del'>-</div><div class='del'>-	cotime1 = (CalObjTime*) arg1;</div><div class='del'>-	cotime2 = (CalObjTime*) arg2;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the weekday of the given CalObjTime, from 0 (Mon) - 6 (Sun). */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_weekday		(CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, cotime-&gt;day, cotime-&gt;month + 1, cotime-&gt;year);</div><div class='del'>-</div><div class='del'>-	/* This results in a value of 0 (Monday) - 6 (Sunday). */</div><div class='del'>-	weekday = g_date_weekday (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-	return weekday;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the weekday of the given CalObjTime, from 0 - 6. The week start</div><div class='del'>-   day is Monday by default, but can be set in the recurrence rule. */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_weekday_offset	(CalObjTime *cotime,</div><div class='del'>-				 CalRecurrence *recur)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	gint weekday, offset;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, cotime-&gt;day, cotime-&gt;month + 1, cotime-&gt;year);</div><div class='del'>-</div><div class='del'>-	/* This results in a value of 0 (Monday) - 6 (Sunday). */</div><div class='del'>-	weekday = g_date_weekday (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-	/* This calculates the offset of our day from the start of the week.</div><div class='del'>-	   We just add on a week (to avoid any possible negative values) and</div><div class='del'>-	   then subtract the specified week start day, then convert it into a</div><div class='del'>-	   value from 0-6. */</div><div class='del'>-	offset = (weekday + 7 - recur-&gt;week_start_day) % 7;</div><div class='del'>-</div><div class='del'>-	return offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the day of the year of the given CalObjTime, from 1 - 366. */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_day_of_year		(CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, cotime-&gt;day, cotime-&gt;month + 1, cotime-&gt;year);</div><div class='del'>-</div><div class='del'>-	return g_date_day_of_year (&amp;date);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the first week in the given CalObjTime's year, using the same weekday</div><div class='del'>-   as the event start day (i.e. from the RecurData).</div><div class='del'>-   The first week of the year is the first week starting from the specified</div><div class='del'>-   week start day that has 4 days in the new year. It may be in the previous</div><div class='del'>-   year. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_time_find_first_week	(CalObjTime *cotime,</div><div class='del'>-				 RecurData  *recur_data)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	gint weekday, week_start_day, first_full_week_start_offset, offset;</div><div class='del'>-</div><div class='del'>-	/* Find out the weekday of the 1st of the year, 0 (Mon) - 6 (Sun). */</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, 1, 1, cotime-&gt;year);</div><div class='del'>-	weekday = g_date_weekday (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-	/* Calculate the first day of the year that starts a new week, i.e. the</div><div class='del'>-	   first week_start_day after weekday, using 0 = 1st Jan.</div><div class='del'>-	   e.g. if the 1st Jan is a Tuesday (1) and week_start_day is a</div><div class='del'>-	   Monday (0), the result will be (0 + 7 - 1) % 7 = 6 (7th Jan). */</div><div class='del'>-	week_start_day = recur_data-&gt;recur-&gt;week_start_day;</div><div class='del'>-	first_full_week_start_offset = (week_start_day + 7 - weekday) % 7;</div><div class='del'>-</div><div class='del'>-	/* Now see if we have to move backwards 1 week, i.e. if the week</div><div class='del'>-	   starts on or after Jan 5th (since the previous week has 4 days in</div><div class='del'>-	   this year and so will be the first week of the year). */</div><div class='del'>-	if (first_full_week_start_offset &gt;= 4)</div><div class='del'>-		first_full_week_start_offset -= 7;</div><div class='del'>-</div><div class='del'>-	/* Now add the days to get to the event's weekday. */</div><div class='del'>-	offset = first_full_week_start_offset + recur_data-&gt;weekday_offset;</div><div class='del'>-</div><div class='del'>-	/* Now move the cotime to the appropriate day. */</div><div class='del'>-	cotime-&gt;month = 0;</div><div class='del'>-	cotime-&gt;day = 1;</div><div class='del'>-	cal_obj_time_add_days (cotime, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_object_time_from_time	(CalObjTime	*cotime,</div><div class='del'>-				 time_t		 t,</div><div class='del'>-				 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (t, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	cotime-&gt;year     = tt.year;</div><div class='del'>-	cotime-&gt;month    = tt.month - 1;</div><div class='del'>-	cotime-&gt;day      = tt.day;</div><div class='del'>-	cotime-&gt;hour     = tt.hour;</div><div class='del'>-	cotime-&gt;minute   = tt.minute;</div><div class='del'>-	cotime-&gt;second   = tt.second;</div><div class='del'>-	cotime-&gt;flags    = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Debugging function to convert a CalObjTime to a string. It uses a static</div><div class='del'>-   buffer so beware. */</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-static char*</div><div class='del'>-cal_obj_time_to_string		(CalObjTime	*cotime)</div><div class='del'>-{</div><div class='del'>-	static char buffer[20];</div><div class='del'>-	char *weekdays[] = { "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun",</div><div class='del'>-			     "   " };</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-	weekday = cal_obj_time_weekday (cotime);</div><div class='del'>-</div><div class='del'>-	sprintf (buffer, "%s %02i/%02i/%04i %02i:%02i:%02i",</div><div class='del'>-		 weekdays[weekday],</div><div class='del'>-		 cotime-&gt;day, cotime-&gt;month + 1, cotime-&gt;year,</div><div class='del'>-		 cotime-&gt;hour, cotime-&gt;minute, cotime-&gt;second);</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the end dates for recurrence &amp; exception rules which use</div><div class='del'>-   the COUNT property. If refresh is TRUE it will recalculate all enddates</div><div class='del'>-   for rules which use COUNT. If refresh is FALSE, it will only calculate</div><div class='del'>-   the enddate if it hasn't already been set. It returns TRUE if the component</div><div class='del'>-   was changed, i.e. if the component should be saved at some point.</div><div class='del'>-   We store the enddate in the "X-EVOLUTION-ENDDATE" parameter of the RRULE</div><div class='del'>-   or EXRULE. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_end_dates (CalComponent	*comp,</div><div class='del'>-			    gboolean		 refresh,</div><div class='del'>-			    CalRecurResolveTimezoneFn  tz_cb,</div><div class='del'>-			    gpointer		 tz_cb_data)</div><div class='del'>-{</div><div class='del'>-	GSList *rrules, *exrules, *elem;</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Do the RRULEs. */</div><div class='del'>-	cal_component_get_rrule_property_list (comp, &amp;rrules);</div><div class='del'>-	for (elem = rrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		changed |= cal_recur_ensure_rule_end_date (comp, elem-&gt;data,</div><div class='del'>-							   FALSE, refresh,</div><div class='del'>-							   tz_cb, tz_cb_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do the EXRULEs. */</div><div class='del'>-	cal_component_get_exrule_property_list (comp, &amp;exrules);</div><div class='del'>-	for (elem = exrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		changed |= cal_recur_ensure_rule_end_date (comp, elem-&gt;data,</div><div class='del'>-							   TRUE, refresh,</div><div class='del'>-							   tz_cb, tz_cb_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CalRecurEnsureEndDateData CalRecurEnsureEndDateData;</div><div class='del'>-struct _CalRecurEnsureEndDateData {</div><div class='del'>-	gint count;</div><div class='del'>-	gint instances;</div><div class='del'>-	time_t end_date;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_rule_end_date (CalComponent			*comp,</div><div class='del'>-				icalproperty			*prop,</div><div class='del'>-				gboolean			 exception,</div><div class='del'>-				gboolean			 refresh,</div><div class='del'>-				CalRecurResolveTimezoneFn	 tz_cb,</div><div class='del'>-				gpointer			 tz_cb_data)</div><div class='del'>-{</div><div class='del'>-	struct icalrecurrencetype rule;</div><div class='del'>-	CalRecurEnsureEndDateData cb_data;</div><div class='del'>-</div><div class='del'>-	if (exception)</div><div class='del'>-		rule = icalproperty_get_exrule (prop);</div><div class='del'>-	else</div><div class='del'>-		rule = icalproperty_get_rrule (prop);</div><div class='del'>-</div><div class='del'>-	/* If the rule doesn't use COUNT just return. */</div><div class='del'>-	if (rule.count == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If refresh is FALSE, we check if the enddate is already set, and</div><div class='del'>-	   if it is we just return. */</div><div class='del'>-	if (!refresh) {</div><div class='del'>-		if (cal_recur_get_rule_end_date (prop, NULL) != -1)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the end date. Note that we initialize end_date to 0, so</div><div class='del'>-	   if the RULE doesn't generate COUNT instances we save a time_t of 0.</div><div class='del'>-	   Also note that we use the UTC timezone as the default timezone.</div><div class='del'>-	   In get_end_date() if the DTSTART is a DATE or floating time, we will</div><div class='del'>-	   convert the ENDDATE to the current timezone. */</div><div class='del'>-	cb_data.count = rule.count;</div><div class='del'>-	cb_data.instances = 0;</div><div class='del'>-	cb_data.end_date = 0;</div><div class='del'>-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,</div><div class='del'>-					      cal_recur_ensure_rule_end_date_cb,</div><div class='del'>-					      &amp;cb_data, tz_cb, tz_cb_data,</div><div class='del'>-					      icaltimezone_get_utc_timezone ());</div><div class='del'>-</div><div class='del'>-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the</div><div class='del'>-	   rule. */</div><div class='del'>-	cal_recur_set_rule_end_date (prop, cb_data.end_date);</div><div class='del'>-		</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,</div><div class='del'>-					 time_t		 instance_start,</div><div class='del'>-					 time_t		 instance_end,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	CalRecurEnsureEndDateData *cb_data;</div><div class='del'>-</div><div class='del'>-	cb_data = (CalRecurEnsureEndDateData*) data;</div><div class='del'>-</div><div class='del'>-	cb_data-&gt;instances++;</div><div class='del'>-</div><div class='del'>-	if (cb_data-&gt;instances == cb_data-&gt;count) {</div><div class='del'>-		cb_data-&gt;end_date = instance_start;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* If default_timezone is set, the saved ENDDATE parameter is assumed to be</div><div class='del'>-   in that timezone. This is used when the DTSTART is a DATE or floating</div><div class='del'>-   value, since the RRULE end date will change depending on the timezone that</div><div class='del'>-   it is evaluated in. */</div><div class='del'>-static time_t</div><div class='del'>-cal_recur_get_rule_end_date	(icalproperty	*prop,</div><div class='del'>-				 icaltimezone	*default_timezone)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	const char *xname, *xvalue;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		xname = icalparameter_get_xname (param);</div><div class='del'>-		if (xname &amp;&amp; !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {</div><div class='del'>-			xvalue = icalparameter_get_x (param);</div><div class='del'>-			value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,</div><div class='del'>-							   xvalue);</div><div class='del'>-			if (value) {</div><div class='del'>-				icaltime = icalvalue_get_datetime (value);</div><div class='del'>-				icalvalue_free (value);</div><div class='del'>-</div><div class='del'>-				zone = default_timezone ? default_timezone : </div><div class='del'>-					icaltimezone_get_utc_timezone ();</div><div class='del'>-				return icaltime_as_timet_with_zone (icaltime,</div><div class='del'>-								    zone);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		param = icalproperty_get_next_parameter (prop,</div><div class='del'>-							 ICAL_X_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_recur_set_rule_end_date	(icalproperty	*prop,</div><div class='del'>-				 time_t		 end_date)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	icaltimezone *utc_zone;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	const char *end_date_string, *xname;</div><div class='del'>-</div><div class='del'>-	/* We save the value as a UTC DATE-TIME. */</div><div class='del'>-	utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	icaltime = icaltime_from_timet_with_zone (end_date, FALSE, utc_zone);</div><div class='del'>-	value = icalvalue_new_datetime (icaltime);</div><div class='del'>-	end_date_string = icalvalue_as_ical_string (value);</div><div class='del'>-	icalvalue_free (value);</div><div class='del'>-</div><div class='del'>-	/* If we already have an X-EVOLUTION-ENDDATE parameter, set the value</div><div class='del'>-	   to the new date-time. */</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		xname = icalparameter_get_xname (param);</div><div class='del'>-		if (xname &amp;&amp; !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {</div><div class='del'>-			icalparameter_set_x (param, end_date_string);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		param = icalproperty_get_next_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a new X-EVOLUTION-ENDDATE and add it to the property. */</div><div class='del'>-	param = icalparameter_new_x (end_date_string);</div><div class='del'>-	icalparameter_set_xname (param, EVOLUTION_END_DATE_PARAMETER);</div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h<br/>deleted file mode 100644<br/>index 6ffeb2cb8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-recur.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Evolution calendar recurrence rule functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_RECUR_H</div><div class='del'>-#define CAL_RECUR_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,</div><div class='del'>-					 time_t        instance_start,</div><div class='del'>-					 time_t        instance_end,</div><div class='del'>-					 gpointer      data);</div><div class='del'>-</div><div class='del'>-typedef icaltimezone* (* CalRecurResolveTimezoneFn)	(const char   *tzid,</div><div class='del'>-							 gpointer      data);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the event that</div><div class='del'>- * intersects the range between the given start and end times (the end time is</div><div class='del'>- * not included). Note that the occurrences may start before the given start</div><div class='del'>- * time.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- *</div><div class='del'>- * The tz_cb is used to resolve references to timezones. It is passed a TZID</div><div class='del'>- * and should return the icaltimezone* corresponding to that TZID. We need to</div><div class='del'>- * do this as we access timezones in different ways on the client &amp; server.</div><div class='del'>- *</div><div class='del'>- * The default_timezone argument is used for DTSTART or DTEND properties that</div><div class='del'>- * are DATE values or do not have a TZID (i.e. floating times).</div><div class='del'>- */</div><div class='del'>-void	cal_recur_generate_instances	(CalComponent		*comp,</div><div class='del'>-					 time_t			 start,</div><div class='del'>-					 time_t			 end,</div><div class='del'>-					 CalRecurInstanceFn	 cb,</div><div class='del'>-					 gpointer                cb_data,</div><div class='del'>-					 CalRecurResolveTimezoneFn tz_cb,</div><div class='del'>-					 gpointer		   tz_cb_data,</div><div class='del'>-					 icaltimezone		*default_timezone);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c<br/>deleted file mode 100644<br/>index 8ba1ff7d63..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,560 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include "cal-util.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_obj_instance_list_free:</div><div class='del'>- * @list: List of #CalObjInstance structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalObjInstance structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_obj_instance_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	CalObjInstance *i;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		i = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (i != NULL);</div><div class='del'>-		g_assert (i-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-		g_free (i-&gt;uid);</div><div class='del'>-		g_free (i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_obj_uid_list_free:</div><div class='del'>- * @list: List of strings with unique identifiers.</div><div class='del'>- *</div><div class='del'>- * Frees a list of unique identifiers for calendar objects.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_obj_uid_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		char *uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (uid != NULL);</div><div class='del'>-		g_free (uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icalcomponent *</div><div class='del'>-cal_util_new_top_level (void)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);</div><div class='del'>-</div><div class='del'>-	/* RFC 2445, section 4.7.1 */</div><div class='del'>-	prop = icalproperty_new_calscale ("GREGORIAN");</div><div class='del'>-	icalcomponent_add_property (icalcomp, prop);</div><div class='del'>-</div><div class='del'>-       /* RFC 2445, section 4.7.3 */</div><div class='del'>-	prop = icalproperty_new_prodid ("-//Ximian//NONSGML Evolution Calendar//EN");</div><div class='del'>-	icalcomponent_add_property (icalcomp, prop);</div><div class='del'>-</div><div class='del'>-	/* RFC 2445, section 4.7.4.  This is the iCalendar spec version, *NOT*</div><div class='del'>-	 * the product version!  Do not change this!</div><div class='del'>-	 */</div><div class='del'>-	prop = icalproperty_new_version ("2.0");</div><div class='del'>-	icalcomponent_add_property (icalcomp, prop);</div><div class='del'>-</div><div class='del'>-	return icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes the range of time in which recurrences should be generated for a</div><div class='del'>- * component in order to compute alarm trigger times.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-compute_alarm_range (CalComponent *comp, GList *alarm_uids, time_t start, time_t end,</div><div class='del'>-		     time_t *alarm_start, time_t *alarm_end)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	time_t repeat_time;</div><div class='del'>-</div><div class='del'>-	*alarm_start = start;</div><div class='del'>-	*alarm_end = end;</div><div class='del'>-</div><div class='del'>-	repeat_time = 0;</div><div class='del'>-</div><div class='del'>-	for (l = alarm_uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *auid;</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-		CalAlarmTrigger trigger;</div><div class='del'>-		struct icaldurationtype *dur;</div><div class='del'>-		time_t dur_time;</div><div class='del'>-		CalAlarmRepeat repeat;</div><div class='del'>-</div><div class='del'>-		auid = l-&gt;data;</div><div class='del'>-		alarm = cal_component_get_alarm (comp, auid);</div><div class='del'>-		g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-		cal_component_alarm_get_repeat (alarm, &amp;repeat);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-		switch (trigger.type) {</div><div class='del'>-		case CAL_ALARM_TRIGGER_NONE:</div><div class='del'>-		case CAL_ALARM_TRIGGER_ABSOLUTE:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_ALARM_TRIGGER_RELATIVE_START:</div><div class='del'>-		case CAL_ALARM_TRIGGER_RELATIVE_END:</div><div class='del'>-			dur = &amp;trigger.u.rel_duration;</div><div class='del'>-  			dur_time = icaldurationtype_as_int (*dur);</div><div class='del'>-</div><div class='del'>-			if (repeat.repetitions != 0) {</div><div class='del'>-				int rdur;</div><div class='del'>-</div><div class='del'>-				rdur = repeat.repetitions * icaldurationtype_as_int (repeat.duration);</div><div class='del'>-				repeat_time = MAX (repeat_time, rdur);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (dur-&gt;is_neg)</div><div class='del'>-				/* If the duration is negative then dur_time</div><div class='del'>-				 * will be negative as well; that is why we</div><div class='del'>-				 * subtract to expand the range.</div><div class='del'>-				 */</div><div class='del'>-				*alarm_end = MAX (*alarm_end, end - dur_time);</div><div class='del'>-			else</div><div class='del'>-				*alarm_start = MIN (*alarm_start, start - dur_time);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*alarm_start -= repeat_time;</div><div class='del'>-</div><div class='del'>-	g_assert (*alarm_start &lt;= *alarm_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Closure data to generate alarm occurrences */</div><div class='del'>-struct alarm_occurrence_data {</div><div class='del'>-	/* These are the info we have */</div><div class='del'>-	GList *alarm_uids;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-</div><div class='del'>-	/* This is what we compute */</div><div class='del'>-	GSList *triggers;</div><div class='del'>-	int n_triggers;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_trigger (struct alarm_occurrence_data *aod, const char *auid, time_t trigger,</div><div class='del'>-	     time_t occur_start, time_t occur_end)</div><div class='del'>-{</div><div class='del'>-	CalAlarmInstance *instance;</div><div class='del'>-</div><div class='del'>-	instance = g_new (CalAlarmInstance, 1);</div><div class='del'>-	instance-&gt;auid = auid;</div><div class='del'>-	instance-&gt;trigger = trigger;</div><div class='del'>-	instance-&gt;occur_start = occur_start;</div><div class='del'>-	instance-&gt;occur_end = occur_end;</div><div class='del'>-</div><div class='del'>-	aod-&gt;triggers = g_slist_prepend (aod-&gt;triggers, instance);</div><div class='del'>-	aod-&gt;n_triggers++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from cal_recur_generate_instances(); generates triggers for all</div><div class='del'>- * of a component's RELATIVE alarms.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-add_alarm_occurrences_cb (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct alarm_occurrence_data *aod;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	aod = data;</div><div class='del'>-</div><div class='del'>-	for (l = aod-&gt;alarm_uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *auid;</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-		CalAlarmTrigger trigger;</div><div class='del'>-		CalAlarmRepeat repeat;</div><div class='del'>-		struct icaldurationtype *dur;</div><div class='del'>-		time_t dur_time;</div><div class='del'>-		time_t occur_time, trigger_time;</div><div class='del'>-</div><div class='del'>-		auid = l-&gt;data;</div><div class='del'>-		alarm = cal_component_get_alarm (comp, auid);</div><div class='del'>-		g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-		cal_component_alarm_get_repeat (alarm, &amp;repeat);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-		if (trigger.type != CAL_ALARM_TRIGGER_RELATIVE_START</div><div class='del'>-		    &amp;&amp; trigger.type != CAL_ALARM_TRIGGER_RELATIVE_END)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		dur = &amp;trigger.u.rel_duration;</div><div class='del'>-  		dur_time = icaldurationtype_as_int (*dur);</div><div class='del'>-</div><div class='del'>-		if (trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START)</div><div class='del'>-			occur_time = start;</div><div class='del'>-		else</div><div class='del'>-			occur_time = end;</div><div class='del'>-</div><div class='del'>-		/* If dur-&gt;is_neg is true then dur_time will already be</div><div class='del'>-		 * negative.  So we do not need to test for dur-&gt;is_neg here; we</div><div class='del'>-		 * can simply add the dur_time value to the occur_time and get</div><div class='del'>-		 * the correct result.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		trigger_time = occur_time + dur_time;</div><div class='del'>-</div><div class='del'>-		/* Add repeating alarms */</div><div class='del'>-</div><div class='del'>-		if (repeat.repetitions != 0) {</div><div class='del'>-			int i;</div><div class='del'>-			time_t repeat_time;</div><div class='del'>-</div><div class='del'>-			repeat_time = icaldurationtype_as_int (repeat.duration);</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; repeat.repetitions; i++) {</div><div class='del'>-				time_t t;</div><div class='del'>-</div><div class='del'>-				t = trigger_time + (i + 1) * repeat_time;</div><div class='del'>-</div><div class='del'>-				if (t &gt;= aod-&gt;start &amp;&amp; t &lt; aod-&gt;end)</div><div class='del'>-					add_trigger (aod, auid, t, start, end);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add the trigger itself */</div><div class='del'>-</div><div class='del'>-		if (trigger_time &gt;= aod-&gt;start &amp;&amp; trigger_time &lt; aod-&gt;end)</div><div class='del'>-			add_trigger (aod, auid, trigger_time, start, end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generates the absolute triggers for a component */</div><div class='del'>-static void</div><div class='del'>-generate_absolute_triggers (CalComponent *comp, struct alarm_occurrence_data *aod,</div><div class='del'>-			    CalRecurResolveTimezoneFn resolve_tzid,</div><div class='del'>-			    gpointer user_data,</div><div class='del'>-			    icaltimezone *default_timezone)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	CalComponentDateTime dt_start, dt_end;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt_start);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dt_end);</div><div class='del'>-</div><div class='del'>-	for (l = aod-&gt;alarm_uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *auid;</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-		CalAlarmRepeat repeat;</div><div class='del'>-		CalAlarmTrigger trigger;</div><div class='del'>-		time_t abs_time;</div><div class='del'>-		time_t occur_start, occur_end;</div><div class='del'>-		icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-		auid = l-&gt;data;</div><div class='del'>-		alarm = cal_component_get_alarm (comp, auid);</div><div class='del'>-		g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-		cal_component_alarm_get_repeat (alarm, &amp;repeat);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-		if (trigger.type != CAL_ALARM_TRIGGER_ABSOLUTE)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Absolute triggers are always in UTC; see RFC 2445 section 4.8.6.3 */</div><div class='del'>-		zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-		abs_time = icaltime_as_timet_with_zone (trigger.u.abs_time, zone);</div><div class='del'>-</div><div class='del'>-		/* No particular occurrence, so just use the times from the component */</div><div class='del'>-</div><div class='del'>-		if (dt_start.value) {</div><div class='del'>-			if (dt_start.tzid &amp;&amp; !dt_start.value-&gt;is_date)</div><div class='del'>-				zone = (* resolve_tzid) (dt_start.tzid, user_data);</div><div class='del'>-			else</div><div class='del'>-				zone = default_timezone;</div><div class='del'>-</div><div class='del'>-			occur_start = icaltime_as_timet_with_zone (*dt_start.value, zone);</div><div class='del'>-		} else</div><div class='del'>-			occur_start = -1;</div><div class='del'>-</div><div class='del'>-		if (dt_end.value) {</div><div class='del'>-			if (dt_end.tzid &amp;&amp; !dt_end.value-&gt;is_date)</div><div class='del'>-				zone = (* resolve_tzid) (dt_end.tzid, user_data);</div><div class='del'>-			else</div><div class='del'>-				zone = default_timezone;</div><div class='del'>-</div><div class='del'>-			occur_end = icaltime_as_timet_with_zone (*dt_end.value, zone);</div><div class='del'>-		} else</div><div class='del'>-			occur_end = -1;</div><div class='del'>-</div><div class='del'>-		/* Add repeating alarms */</div><div class='del'>-</div><div class='del'>-		if (repeat.repetitions != 0) {</div><div class='del'>-			int i;</div><div class='del'>-			time_t repeat_time;</div><div class='del'>-</div><div class='del'>-			repeat_time = icaldurationtype_as_int (repeat.duration);</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; repeat.repetitions; i++) {</div><div class='del'>-				time_t t;</div><div class='del'>-</div><div class='del'>-				t = abs_time + (i + 1) * repeat_time;</div><div class='del'>-</div><div class='del'>-				if (t &gt;= aod-&gt;start &amp;&amp; t &lt; aod-&gt;end)</div><div class='del'>-					add_trigger (aod, auid, t, occur_start, occur_end);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add the trigger itself */</div><div class='del'>-</div><div class='del'>-		if (abs_time &gt;= aod-&gt;start &amp;&amp; abs_time &lt; aod-&gt;end)</div><div class='del'>-			add_trigger (aod, auid, abs_time, occur_start, occur_end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt_start);</div><div class='del'>-	cal_component_free_datetime (&amp;dt_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compares two alarm instances; called from g_slist_sort() */</div><div class='del'>-static gint</div><div class='del'>-compare_alarm_instance (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CalAlarmInstance *aia, *aib;</div><div class='del'>-</div><div class='del'>-	aia = a;</div><div class='del'>-	aib = b;</div><div class='del'>-</div><div class='del'>-	if (aia-&gt;trigger &lt; aib-&gt;trigger)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (aia-&gt;trigger &gt; aib-&gt;trigger)</div><div class='del'>-		return 1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_util_generate_alarms_for_comp</div><div class='del'>- * @comp: the CalComponent to generate alarms from</div><div class='del'>- * @start: start time</div><div class='del'>- * @end: end time</div><div class='del'>- * @resolve_tzid: callback for resolving timezones</div><div class='del'>- * @user_data: data to be passed to the resolve_tzid callback</div><div class='del'>- * @default_timezone: the timezone used to resolve DATE and floating DATE-TIME</div><div class='del'>- * values.</div><div class='del'>- *</div><div class='del'>- * Generates alarm instances for a calendar component.  Returns the instances</div><div class='del'>- * structure, or NULL if no alarm instances occurred in the specified time</div><div class='del'>- * range.</div><div class='del'>- */</div><div class='del'>-CalComponentAlarms *</div><div class='del'>-cal_util_generate_alarms_for_comp (CalComponent *comp,</div><div class='del'>-				   time_t start,</div><div class='del'>-				   time_t end,</div><div class='del'>-				   CalRecurResolveTimezoneFn resolve_tzid,</div><div class='del'>-				   gpointer user_data,</div><div class='del'>-				   icaltimezone *default_timezone)</div><div class='del'>-{</div><div class='del'>-	GList *alarm_uids;</div><div class='del'>-	time_t alarm_start, alarm_end;</div><div class='del'>-	struct alarm_occurrence_data aod;</div><div class='del'>-	CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-	if (!cal_component_has_alarms (comp))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	alarm_uids = cal_component_get_alarm_uids (comp);</div><div class='del'>-	compute_alarm_range (comp, alarm_uids, start, end, &amp;alarm_start, &amp;alarm_end);</div><div class='del'>-</div><div class='del'>-	aod.alarm_uids = alarm_uids;</div><div class='del'>-	aod.start = start;</div><div class='del'>-	aod.end = end;</div><div class='del'>-	aod.triggers = NULL;</div><div class='del'>-	aod.n_triggers = 0;</div><div class='del'>-</div><div class='del'>-	cal_recur_generate_instances (comp, alarm_start, alarm_end,</div><div class='del'>-				      add_alarm_occurrences_cb, &amp;aod,</div><div class='del'>-				      resolve_tzid, user_data,</div><div class='del'>-				      default_timezone);</div><div class='del'>-</div><div class='del'>-	/* We add the ABSOLUTE triggers separately */</div><div class='del'>-	generate_absolute_triggers (comp, &amp;aod, resolve_tzid, user_data, default_timezone);</div><div class='del'>-</div><div class='del'>-	if (aod.n_triggers == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the component alarm instances structure */</div><div class='del'>-</div><div class='del'>-	alarms = g_new (CalComponentAlarms, 1);</div><div class='del'>-	alarms-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (alarms-&gt;comp));</div><div class='del'>-	alarms-&gt;alarms = g_slist_sort (aod.triggers, compare_alarm_instance);</div><div class='del'>-</div><div class='del'>-	return alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_util_generate_alarms_for_list</div><div class='del'>- * @comps: list of CalComponent's</div><div class='del'>- * @start: start time</div><div class='del'>- * @end: end time</div><div class='del'>- * @comp_alarms: list to be returned</div><div class='del'>- * @resolve_tzid: callback for resolving timezones</div><div class='del'>- * @user_data: data to be passed to the resolve_tzid callback</div><div class='del'>- * @default_timezone: the timezone used to resolve DATE and floating DATE-TIME</div><div class='del'>- * values.</div><div class='del'>- *</div><div class='del'>- * Iterates through all the components in the comps list and generates alarm</div><div class='del'>- * instances for them; putting them in the comp_alarms list.</div><div class='del'>- *</div><div class='del'>- * Returns: the number of elements it added to that list.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-cal_util_generate_alarms_for_list (GList *comps,</div><div class='del'>-				   time_t start,</div><div class='del'>-				   time_t end,</div><div class='del'>-				   GSList **comp_alarms,</div><div class='del'>-				   CalRecurResolveTimezoneFn resolve_tzid,</div><div class='del'>-				   gpointer user_data,</div><div class='del'>-				   icaltimezone *default_timezone)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	n = 0;</div><div class='del'>-</div><div class='del'>-	for (l = comps; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-		alarms = cal_util_generate_alarms_for_comp (comp, start, end, resolve_tzid, user_data, default_timezone);</div><div class='del'>-</div><div class='del'>-		if (alarms) {</div><div class='del'>-			*comp_alarms = g_slist_prepend (*comp_alarms, alarms);</div><div class='del'>-			n++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts an iCalendar PRIORITY value to a translated string. Any unknown</div><div class='del'>-   priority value (i.e. not 0-9) will be returned as "" (undefined). */</div><div class='del'>-char *</div><div class='del'>-cal_util_priority_to_string (int priority)</div><div class='del'>-{</div><div class='del'>-	char *retval;</div><div class='del'>-</div><div class='del'>-	if (priority &lt;= 0)</div><div class='del'>-		retval = "";</div><div class='del'>-	else if (priority &lt;= 4)</div><div class='del'>-		retval = _("High");</div><div class='del'>-	else if (priority == 5)</div><div class='del'>-		retval = _("Normal");</div><div class='del'>-	else if (priority &lt;= 9)</div><div class='del'>-		retval = _("Low");</div><div class='del'>-	else</div><div class='del'>-		retval = "";</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts a translated priority string to an iCalendar priority value.</div><div class='del'>-   Returns -1 if the priority string is not valid. */</div><div class='del'>-int</div><div class='del'>-cal_util_priority_from_string (const char *string)</div><div class='del'>-{</div><div class='del'>-	int priority;</div><div class='del'>-</div><div class='del'>-	/* An empty string is the same as 'None'. */</div><div class='del'>-	if (!string || !string[0] || !g_strcasecmp (string, _("Undefined")))</div><div class='del'>-		priority = 0;</div><div class='del'>-	else if (!g_strcasecmp (string, _("High")))</div><div class='del'>-		priority = 3;</div><div class='del'>-	else if (!g_strcasecmp (string, _("Normal")))</div><div class='del'>-		priority = 5;</div><div class='del'>-	else if (!g_strcasecmp (string, _("Low")))</div><div class='del'>-		priority = 7;</div><div class='del'>-	else</div><div class='del'>-		priority = -1;</div><div class='del'>-</div><div class='del'>-	return priority;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-cal_util_expand_uri (char *uri, gboolean tasks)</div><div class='del'>-{</div><div class='del'>-	char *file_uri, *file_name;</div><div class='del'>-</div><div class='del'>-	if (!strncmp (uri, "file://", 7)) {</div><div class='del'>-		file_uri = uri + 7;</div><div class='del'>-		if (strlen (file_uri) &gt; 4</div><div class='del'>-		    &amp;&amp; !strcmp (file_uri + strlen (file_uri) - 4, ".ics")) {</div><div class='del'>-			</div><div class='del'>-			/* it's a .ics file */</div><div class='del'>-			return g_strdup (uri);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we assume it's a dir and glom &lt;type&gt;.ics onto the end. */</div><div class='del'>-		if (tasks)</div><div class='del'>-			file_name = g_concat_dir_and_file (file_uri, "tasks.ics");</div><div class='del'>-		else</div><div class='del'>-			file_name = g_concat_dir_and_file (file_uri, "calendar.ics");</div><div class='del'>-		file_uri = g_strdup_printf("file://%s", file_name);</div><div class='del'>-		g_free(file_name);</div><div class='del'>-	} else {</div><div class='del'>-		file_uri = g_strdup (uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return file_uri;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h<br/>deleted file mode 100644<br/>index d4ccfb5388..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/cal-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* Evolution calendar utilities and types</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_UTIL_H</div><div class='del'>-#define CAL_UTIL_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Instance of a calendar object.  This can be an actual occurrence, a</div><div class='del'>- * recurrence, or an alarm trigger of a `real' calendar object.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;			/* UID of the object */</div><div class='del'>-	time_t start;			/* Start time of instance */</div><div class='del'>-	time_t end;			/* End time of instance */</div><div class='del'>-} CalObjInstance;</div><div class='del'>-</div><div class='del'>-void cal_obj_instance_list_free (GList *list);</div><div class='del'>-</div><div class='del'>-/* Used for multiple UID queries */</div><div class='del'>-typedef enum {</div><div class='del'>-	CALOBJ_TYPE_EVENT   = 1 &lt;&lt; 0,</div><div class='del'>-	CALOBJ_TYPE_TODO    = 1 &lt;&lt; 1,</div><div class='del'>-	CALOBJ_TYPE_JOURNAL = 1 &lt;&lt; 2,</div><div class='del'>-	CALOBJ_TYPE_ANY     = 0x07</div><div class='del'>-} CalObjType;</div><div class='del'>-</div><div class='del'>-/* Used for mode stuff */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_MODE_INVALID = -1,</div><div class='del'>-	CAL_MODE_LOCAL   = 1 &lt;&lt; 0,</div><div class='del'>-	CAL_MODE_REMOTE  = 1 &lt;&lt; 1,</div><div class='del'>-	CAL_MODE_ANY     = 0x07</div><div class='del'>-} CalMode;</div><div class='del'>-</div><div class='del'>-void cal_obj_uid_list_free (GList *list);</div><div class='del'>-</div><div class='del'>-icalcomponent *cal_util_new_top_level (void);</div><div class='del'>-</div><div class='del'>-CalComponentAlarms *cal_util_generate_alarms_for_comp (CalComponent *comp,</div><div class='del'>-						       time_t start,</div><div class='del'>-						       time_t end,</div><div class='del'>-						       CalRecurResolveTimezoneFn resolve_tzid,</div><div class='del'>-						       gpointer user_data,</div><div class='del'>-						       icaltimezone *default_timezone);</div><div class='del'>-int cal_util_generate_alarms_for_list (GList *comps,</div><div class='del'>-				       time_t start,</div><div class='del'>-				       time_t end,</div><div class='del'>-				       GSList **comp_alarms,</div><div class='del'>-				       CalRecurResolveTimezoneFn resolve_tzid,</div><div class='del'>-				       gpointer user_data,</div><div class='del'>-				       icaltimezone *default_timezone);</div><div class='del'>-</div><div class='del'>-icaltimezone *cal_util_resolve_tzid (const char *tzid, gpointer data);</div><div class='del'>-</div><div class='del'>-char *cal_util_priority_to_string (int priority);</div><div class='del'>-int cal_util_priority_from_string (const char *string);</div><div class='del'>-</div><div class='del'>-char *cal_util_expand_uri (char *uri, gboolean tasks);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c<br/>deleted file mode 100644<br/>index 5078a1db94..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/test-recur.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/test-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This tests the recurrence rule expansion functions.</div><div class='del'>- *</div><div class='del'>- * NOTE: currently it starts from the event start date and continues</div><div class='del'>- * until all recurrence rules/dates end or we reach MAX_OCCURRENCES</div><div class='del'>- * occurrences. So it does not test generating occurrences for a specific</div><div class='del'>- * interval. A nice addition might be to do this automatically and compare</div><div class='del'>- * the results from the complete set to ensure they match.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Since events can recur infinitely, we set a limit to the number of</div><div class='del'>-   occurrences we output. */</div><div class='del'>-#define MAX_OCCURRENCES	1000</div><div class='del'>-</div><div class='del'>-static void usage			(void);</div><div class='del'>-static icalcomponent* scan_ics_file	(char		*filename);</div><div class='del'>-static char* get_line			(char		*s,</div><div class='del'>-					 size_t		 size,</div><div class='del'>-					 void		*data);</div><div class='del'>-static void generate_occurrences	(icalcomponent	*comp);</div><div class='del'>-static gboolean occurrence_cb		(CalComponent	*comp,</div><div class='del'>-					 time_t		 instance_start,</div><div class='del'>-					 time_t		 instance_end,</div><div class='del'>-					 gpointer	 data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main			(int		 argc,</div><div class='del'>-			 char		*argv[])</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	gtk_init (&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-	if (argc != 2)</div><div class='del'>-		usage ();</div><div class='del'>-</div><div class='del'>-	filename = argv[1];</div><div class='del'>-</div><div class='del'>-	icalcomp = scan_ics_file (filename);</div><div class='del'>-	if (icalcomp)</div><div class='del'>-		generate_occurrences	(icalcomp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-usage			(void)</div><div class='del'>-{</div><div class='del'>-	g_print ("Usage: test-recur &lt;filename&gt;\n");</div><div class='del'>-	exit (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static icalcomponent*</div><div class='del'>-scan_ics_file		(char		*filename)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalparser *parser;</div><div class='del'>-</div><div class='del'>-	g_print ("Opening file: %s\n", filename);</div><div class='del'>-	fp = fopen (filename, "r");</div><div class='del'>-</div><div class='del'>-	if (!fp) {</div><div class='del'>-		g_print ("Can't open file: %s\n", filename);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parser = icalparser_new ();</div><div class='del'>-	icalparser_set_gen_data (parser, fp);</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse (parser, get_line);</div><div class='del'>-	icalparser_free (parser);</div><div class='del'>-</div><div class='del'>-	return icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used from icalparser_parse() */</div><div class='del'>-static char *</div><div class='del'>-get_line		(char		*s,</div><div class='del'>-			 size_t		 size,</div><div class='del'>-			 void		*data)</div><div class='del'>-{</div><div class='del'>-	return fgets (s, size, (FILE*) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This resolves any TZIDs in the components. The VTIMEZONEs must be in the</div><div class='del'>-   file we are reading. */</div><div class='del'>-static icaltimezone*</div><div class='del'>-resolve_tzid_cb		(const char	*tzid,</div><div class='del'>-			 gpointer	 user_data)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *vcalendar_comp = user_data;</div><div class='del'>-</div><div class='del'>-        if (!tzid || !tzid[0])</div><div class='del'>-                return NULL;</div><div class='del'>-        else if (!strcmp (tzid, "UTC"))</div><div class='del'>-                return icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	return icalcomponent_get_timezone (vcalendar_comp, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-generate_occurrences	(icalcomponent	*icalcomp)</div><div class='del'>-{</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-	icaltimezone *default_timezone;</div><div class='del'>-</div><div class='del'>-	/* This is the timezone we will use for DATE and floating values. */</div><div class='del'>-	default_timezone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	for (iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-	     icalcompiter_deref (&amp;iter) != NULL;</div><div class='del'>-	     icalcompiter_next (&amp;iter)) {</div><div class='del'>-		icalcomponent *tmp_icalcomp;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		icalcomponent_kind kind;</div><div class='del'>-		gint occurrences;</div><div class='del'>-</div><div class='del'>-		tmp_icalcomp = icalcompiter_deref (&amp;iter);</div><div class='del'>-		kind = icalcomponent_isa (tmp_icalcomp);</div><div class='del'>-</div><div class='del'>-		if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-		      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-		      || kind == ICAL_VJOURNAL_COMPONENT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-		if (!cal_component_set_icalcomponent (comp, tmp_icalcomp))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		g_print ("#############################################################################\n");</div><div class='del'>-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));</div><div class='del'>-		g_print ("Instances:\n");</div><div class='del'>-</div><div class='del'>-		occurrences = 0;</div><div class='del'>-		/* I use specific times when I am trying to pin down a bug seen</div><div class='del'>-		   in one of the calendar views. */</div><div class='del'>-#if 0</div><div class='del'>-		cal_recur_generate_instances (comp, 982022400, 982108800,</div><div class='del'>-					      occurrence_cb, &amp;occurrences,</div><div class='del'>-					      resolve_tzid_cb, icalcomp,</div><div class='del'>-					      default_timezone);</div><div class='del'>-#else</div><div class='del'>-		cal_recur_generate_instances (comp, -1, -1,</div><div class='del'>-					      occurrence_cb, &amp;occurrences,</div><div class='del'>-					      resolve_tzid_cb, icalcomp,</div><div class='del'>-					      default_timezone);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* Print the component again so we can see the</div><div class='del'>-		   X-EVOLUTION-ENDDATE parameter (only set if COUNT is used).</div><div class='del'>-		*/</div><div class='del'>-		g_print ("#############################################################################\n");</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-occurrence_cb		(CalComponent	*comp,</div><div class='del'>-			 time_t		 instance_start,</div><div class='del'>-			 time_t		 instance_end,</div><div class='del'>-			 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	char start[32], finish[32];</div><div class='del'>-	gint *occurrences;</div><div class='del'>-</div><div class='del'>-	occurrences = (gint*) data;</div><div class='del'>-</div><div class='del'>-	strcpy (start, ctime (&amp;instance_start));</div><div class='del'>-	start[24] = '\0';</div><div class='del'>-	strcpy (finish, ctime (&amp;instance_end));</div><div class='del'>-	finish[24] = '\0';</div><div class='del'>-</div><div class='del'>-	g_print ("%s - %s\n", start, finish);</div><div class='del'>-</div><div class='del'>-	(*occurrences)++;</div><div class='del'>-	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c<br/>deleted file mode 100644<br/>index 3dcf8dc384..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/timeutil.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,600 +0,0 @@</div><div class='del'>-/* Miscellaneous time-related utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define REFORMATION_DAY 639787	/* First day of the reformation, counted from 1 Jan 1 */</div><div class='del'>-#define MISSING_DAYS 11		/* They corrected out 11 days */</div><div class='del'>-#define THURSDAY 4		/* First day of reformation */</div><div class='del'>-#define SATURDAY 6		/* Offset value; 1 Jan 1 was a Saturday */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Number of days in a month, using 0 (Jan) to 11 (Dec). For leap years,</div><div class='del'>-   add 1 to February (month 1). */</div><div class='del'>-static const int days_in_month[12] = {</div><div class='del'>-	31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * time_t manipulation functions.</div><div class='del'>- *</div><div class='del'>- * NOTE: these use the Unix timezone functions like mktime() and localtime()</div><div class='del'>- * and so should not be used in Evolution. New Evolution code should use</div><div class='del'>- * icaltimetype values rather than time_t values wherever possible.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_time_t (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm *tm = localtime (&amp;t);</div><div class='del'>-	</div><div class='del'>-	printf ("%d/%02d/%02d %02d:%02d:%02d",</div><div class='del'>-		1900 + tm-&gt;tm_year, tm-&gt;tm_mon+1, tm-&gt;tm_mday,</div><div class='del'>-		tm-&gt;tm_hour, tm-&gt;tm_min, tm-&gt;tm_sec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds a day onto the time, using local time.</div><div class='del'>-   Note that if clocks go forward due to daylight savings time, there are</div><div class='del'>-   some non-existent local times, so the hour may be changed to make it a</div><div class='del'>-   valid time. This also means that it may not be wise to keep calling</div><div class='del'>-   time_add_day() to step through a certain period - if the hour gets changed</div><div class='del'>-   to make it valid time, any further calls to time_add_day() will also return</div><div class='del'>-   this hour, which may not be what you want. */</div><div class='del'>-time_t</div><div class='del'>-time_add_day (time_t time, int days)</div><div class='del'>-{</div><div class='del'>-	struct tm *tm = localtime (&amp;time);</div><div class='del'>-	time_t new_time;</div><div class='del'>-</div><div class='del'>-	tm-&gt;tm_mday += days;</div><div class='del'>-	tm-&gt;tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	if ((new_time = mktime (tm)) == -1) {</div><div class='del'>-		g_message ("time_add_day(): mktime() could not handling adding %d days with\n",</div><div class='del'>-			   days);</div><div class='del'>-		print_time_t (time);</div><div class='del'>-		printf ("\n");</div><div class='del'>-		return time;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_time;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-time_add_week (time_t time, int weeks)</div><div class='del'>-{</div><div class='del'>-	return time_add_day (time, weeks * 7);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the start of the day, according to the local time. */</div><div class='del'>-time_t</div><div class='del'>-time_day_begin (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-	tm.tm_hour = 0;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	return mktime (&amp;tm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the end of the day, according to the local time. */</div><div class='del'>-time_t</div><div class='del'>-time_day_end (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;t);</div><div class='del'>-	tm.tm_mday++;</div><div class='del'>-	tm.tm_hour = 0;</div><div class='del'>-	tm.tm_min  = 0;</div><div class='del'>-	tm.tm_sec  = 0;</div><div class='del'>-	tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	return mktime (&amp;tm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * time_t manipulation functions, using timezones in libical.</div><div class='del'>- *</div><div class='del'>- * NOTE: these are only here to make the transition to the timezone</div><div class='del'>- * functions easier. New code should use icaltimetype values rather than</div><div class='del'>- * time_t values wherever possible.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of days to/from the given time_t value, using</div><div class='del'>-   the given timezone.</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_add_day_with_zone (time_t time, int days, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Add/subtract the number of days. */</div><div class='del'>-	icaltime_adjust (&amp;tt, days, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of weeks to/from the given time_t value, using</div><div class='del'>-   the given timezone.</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_add_week_with_zone (time_t time, int weeks, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	return time_add_day_with_zone (time, weeks * 7, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of months to/from the given time_t value, using</div><div class='del'>-   the given timezone.</div><div class='del'>-</div><div class='del'>-   If the day would be off the end of the month (e.g. adding 1 month to</div><div class='del'>-   30th January, would lead to an invalid day, 30th February), it moves it</div><div class='del'>-   down to the last day in the month, e.g. 28th Feb (or 29th in a leap year.)</div><div class='del'>-</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_add_month_with_zone (time_t time, int months, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	int day, days_in_month;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Add on the number of months. */</div><div class='del'>-	tt.month += months;</div><div class='del'>-</div><div class='del'>-	/* Save the day, and set it to 1, so we don't overflow into the next</div><div class='del'>-	   month. */</div><div class='del'>-	day = tt.day;</div><div class='del'>-	tt.day = 1;</div><div class='del'>-</div><div class='del'>-	/* Normalize it, fixing any month overflow. */</div><div class='del'>-	tt = icaltime_normalize (tt);</div><div class='del'>-</div><div class='del'>-	/* If we go past the end of a month, set it to the last day. */</div><div class='del'>-	days_in_month = time_days_in_month (tt.year, tt.month - 1);</div><div class='del'>-	if (day &gt; days_in_month)</div><div class='del'>-		day = days_in_month;</div><div class='del'>-</div><div class='del'>-	tt.day = day;</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the start of the year containing the given time_t, using the given</div><div class='del'>-   timezone.</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_year_begin_with_zone (time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Set it to the start of the year. */</div><div class='del'>-	tt.month  = 1;</div><div class='del'>-	tt.day    = 1;</div><div class='del'>-	tt.hour   = 0;</div><div class='del'>-	tt.minute = 0;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the start of the month containing the given time_t, using the given</div><div class='del'>-   timezone.</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_month_begin_with_zone (time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Set it to the start of the month. */</div><div class='del'>-	tt.day    = 1;</div><div class='del'>-	tt.hour   = 0;</div><div class='del'>-	tt.minute = 0;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the start of the week containing the given time_t, using the given</div><div class='del'>-   timezone. week_start_day should use the same values as mktime(),</div><div class='del'>-   i.e. 0 (Sun) to 6 (Sat).</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_week_begin_with_zone (time_t time, int week_start_day, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	int weekday, offset;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Get the weekday. */</div><div class='del'>-	weekday = time_day_of_week (tt.day, tt.month - 1, tt.year);</div><div class='del'>-</div><div class='del'>-	/* Calculate the current offset from the week start day. */</div><div class='del'>-	offset = (weekday + 7 - week_start_day) % 7;</div><div class='del'>-</div><div class='del'>-	/* Set it to the start of the month. */</div><div class='del'>-	tt.day -= offset;</div><div class='del'>-	tt.hour   = 0;</div><div class='del'>-	tt.minute = 0;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	/* Normalize it, to fix any overflow. */</div><div class='del'>-	tt = icaltime_normalize (tt);</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the start of the day containing the given time_t, using the given</div><div class='del'>-   timezone.</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_day_begin_with_zone (time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Set it to the start of the day. */</div><div class='del'>-	tt.hour   = 0;</div><div class='del'>-	tt.minute = 0;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the end of the day containing the given time_t, using the given</div><div class='del'>-   timezone. (The end of the day is the start of the next day.)</div><div class='del'>-   NOTE: this function is only here to make the transition to the timezone</div><div class='del'>-   functions easier. New code should use icaltimetype values and</div><div class='del'>-   icaltime_adjust() to add or subtract days, hours, minutes &amp; seconds. */</div><div class='del'>-time_t</div><div class='del'>-time_day_end_with_zone (time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Set it to the start of the next day. */</div><div class='del'>-	tt.day++;</div><div class='del'>-	tt.hour   = 0;</div><div class='del'>-	tt.minute = 0;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	/* Normalize it, to fix any overflow. */</div><div class='del'>-	tt = icaltime_normalize (tt);</div><div class='del'>-</div><div class='del'>-	/* Convert back to a time_t. */</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * time_to_gdate_with_zone:</div><div class='del'>- * @date: Destination #GDate value.</div><div class='del'>- * @time: A time value.</div><div class='del'>- * @zone: Desired timezone for destination @date, or NULL if the UTC timezone</div><div class='del'>- * is desired.</div><div class='del'>- * </div><div class='del'>- * Converts a time_t value to a #GDate structure using the specified timezone.</div><div class='del'>- * This is analogous to g_date_set_time() but takes the timezone into account.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-time_to_gdate_with_zone (GDate *date, time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (date != NULL);</div><div class='del'>-	g_return_if_fail (time != -1);</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE,</div><div class='del'>-					    zone ? zone : icaltimezone_get_utc_timezone ());</div><div class='del'>-</div><div class='del'>-	g_date_set_dmy (date, tt.day, tt.month, tt.year);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * General time functions.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of days in the month. Year is the normal year, e.g. 2001.</div><div class='del'>-   Month is 0 (Jan) to 11 (Dec). */</div><div class='del'>-int</div><div class='del'>-time_days_in_month (int year, int month)</div><div class='del'>-{</div><div class='del'>-	int days;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (year &gt;= 1900, 0);</div><div class='del'>-	g_return_val_if_fail ((month &gt;= 0) &amp;&amp; (month &lt; 12), 0);</div><div class='del'>-</div><div class='del'>-	days = days_in_month[month];</div><div class='del'>-	if (month == 1 &amp;&amp; time_is_leap_year (year))</div><div class='del'>-		days++;</div><div class='del'>-</div><div class='del'>-	return days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the 1-based day number within the year of the specified date.</div><div class='del'>-   Year is the normal year, e.g. 2001. Month is 0 to 11. */</div><div class='del'>-int</div><div class='del'>-time_day_of_year (int day, int month, int year)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; month; i++) {</div><div class='del'>-		day += days_in_month[i];</div><div class='del'>-</div><div class='del'>-		if (month == 1 &amp;&amp; time_is_leap_year (year))</div><div class='del'>-			day++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the day of the week for the specified date, 0 (Sun) to 6 (Sat).</div><div class='del'>-   For the days that were removed on the Gregorian reformation, it returns</div><div class='del'>-   Thursday. Year is the normal year, e.g. 2001. Month is 0 to 11. */</div><div class='del'>-int</div><div class='del'>-time_day_of_week (int day, int month, int year)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	n = (year - 1) * 365 + time_leap_years_up_to (year - 1)</div><div class='del'>-	  + time_day_of_year (day, month, year);</div><div class='del'>-</div><div class='del'>-	if (n &lt; REFORMATION_DAY)</div><div class='del'>-		return (n - 1 + SATURDAY) % 7;</div><div class='del'>-</div><div class='del'>-	if (n &gt;= (REFORMATION_DAY + MISSING_DAYS))</div><div class='del'>-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;</div><div class='del'>-</div><div class='del'>-	return THURSDAY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified year is a leap year. Year is the normal year,</div><div class='del'>-   e.g. 2001. */</div><div class='del'>-gboolean</div><div class='del'>-time_is_leap_year (int year)</div><div class='del'>-{</div><div class='del'>-	if (year &lt;= 1752)</div><div class='del'>-		return !(year % 4);</div><div class='del'>-	else</div><div class='del'>-		return (!(year % 4) &amp;&amp; (year % 100)) || !(year % 400);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of leap years since year 1 up to (but not including) the</div><div class='del'>-   specified year. Year is the normal year, e.g. 2001. */</div><div class='del'>-int</div><div class='del'>-time_leap_years_up_to (int year)</div><div class='del'>-{</div><div class='del'>-  /* There is normally a leap year every 4 years, except at the turn of</div><div class='del'>-     centuries since 1700. But there is a leap year on centuries since 1700</div><div class='del'>-     which are divisible by 400. */</div><div class='del'>-  return (year / 4</div><div class='del'>-	  - ((year &gt; 1700) ? (year / 100 - 17) : 0)</div><div class='del'>-	  + ((year &gt; 1600) ? ((year - 1600) / 400) : 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * isodate_from_time_t:</div><div class='del'>- * @t: A time value.</div><div class='del'>- * </div><div class='del'>- * Creates an ISO 8601 UTC representation from a time value.</div><div class='del'>- * </div><div class='del'>- * Return value: String with the ISO 8601 representation of the UTC time.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-isodate_from_time_t (time_t t)</div><div class='del'>-{</div><div class='del'>-	struct tm *tm;</div><div class='del'>-	char isotime[40];</div><div class='del'>-</div><div class='del'>-	tm = gmtime (&amp;t);</div><div class='del'>-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%SZ", tm);</div><div class='del'>-	return g_strdup (isotime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * time_from_isodate:</div><div class='del'>- * @str: Date/time value in ISO 8601 format.</div><div class='del'>- * </div><div class='del'>- * Converts an ISO 8601 UTC time string into a time_t value.</div><div class='del'>- * </div><div class='del'>- * Return value: Time_t corresponding to the specified ISO string.</div><div class='del'>- * Note that we only allow UTC times at present.</div><div class='del'>- **/</div><div class='del'>-time_t</div><div class='del'>-time_from_isodate (const char *str)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt = icaltime_null_time ();</div><div class='del'>-	icaltimezone *utc_zone;</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (str != NULL, -1);</div><div class='del'>-</div><div class='del'>-	/* yyyymmdd[Thhmmss[Z]] */</div><div class='del'>-</div><div class='del'>-	len = strlen (str);</div><div class='del'>-</div><div class='del'>-	if (!(len == 8 || len == 15 || len == 16))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++)</div><div class='del'>-		if (!((i != 8 &amp;&amp; i != 15 &amp;&amp; isdigit (str[i]))</div><div class='del'>-		      || (i == 8 &amp;&amp; str[i] == 'T')</div><div class='del'>-		      || (i == 15 &amp;&amp; str[i] == 'Z')))</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-#define digit_at(x,y) (x[y] - '0')</div><div class='del'>-</div><div class='del'>-	tt.year = digit_at (str, 0) * 1000</div><div class='del'>-		+ digit_at (str, 1) * 100</div><div class='del'>-		+ digit_at (str, 2) * 10</div><div class='del'>-		+ digit_at (str, 3);</div><div class='del'>-</div><div class='del'>-	tt.month = digit_at (str, 4) * 10</div><div class='del'>-		 + digit_at (str, 5);</div><div class='del'>-</div><div class='del'>-	tt.day = digit_at (str, 6) * 10</div><div class='del'>-	       + digit_at (str, 7);</div><div class='del'>-</div><div class='del'>-	if (len &gt; 8) {</div><div class='del'>-		tt.hour = digit_at (str, 9) * 10</div><div class='del'>-			+ digit_at (str, 10);</div><div class='del'>-		tt.minute  = digit_at (str, 11) * 10</div><div class='del'>-			   + digit_at (str, 12);</div><div class='del'>-		tt.second  = digit_at (str, 13) * 10</div><div class='del'>-			   + digit_at (str, 14);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, utc_zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct tm</div><div class='del'>-icaltimetype_to_tm (struct icaltimetype *itt)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-	</div><div class='del'>-	memset (&amp;tm, 0, sizeof (struct tm));</div><div class='del'>-</div><div class='del'>-	if (!itt-&gt;is_date) {</div><div class='del'>-		tm.tm_sec = itt-&gt;second;</div><div class='del'>-		tm.tm_min = itt-&gt;minute;</div><div class='del'>-		tm.tm_hour = itt-&gt;hour;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tm.tm_mday = itt-&gt;day;</div><div class='del'>-	tm.tm_mon = itt-&gt;month - 1;</div><div class='del'>-	tm.tm_year = itt-&gt;year - 1900;</div><div class='del'>-	tm.tm_wday = time_day_of_week (itt-&gt;day, itt-&gt;month - 1, itt-&gt;year);</div><div class='del'>-	tm.tm_isdst = -1;</div><div class='del'>-	</div><div class='del'>-	return tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * icaltimetype_to_tm_with_zone:</div><div class='del'>- * @itt: A time value.</div><div class='del'>- * @from_zone: Source timezone.</div><div class='del'>- * @to_zone: Destination timezone.</div><div class='del'>- * </div><div class='del'>- * Converts a time value from one timezone to another, and returns a struct tm</div><div class='del'>- * representation of the time.</div><div class='del'>- * </div><div class='del'>- * Return value: The converted time as a struct tm.  All fields will be</div><div class='del'>- * set properly except for tm.tm_yday.</div><div class='del'>- **/</div><div class='del'>-struct tm</div><div class='del'>-icaltimetype_to_tm_with_zone (struct icaltimetype *itt,</div><div class='del'>-			      icaltimezone *from_zone,</div><div class='del'>-			      icaltimezone *to_zone)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-	struct icaltimetype itt_copy;</div><div class='del'>-</div><div class='del'>-	memset (&amp;tm, 0, sizeof (tm));</div><div class='del'>-	tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (itt != NULL, tm);</div><div class='del'>-</div><div class='del'>-	itt_copy = *itt;</div><div class='del'>-</div><div class='del'>-	icaltimezone_convert_time (&amp;itt_copy, from_zone, to_zone);</div><div class='del'>-	tm = icaltimetype_to_tm (&amp;itt_copy);</div><div class='del'>-</div><div class='del'>-	return tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct icaltimetype</div><div class='del'>-tm_to_icaltimetype (struct tm *tm, gboolean is_date)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	memset (&amp;itt, 0, sizeof (struct icaltimetype));</div><div class='del'>-</div><div class='del'>-	if (!is_date) {</div><div class='del'>-		itt.second = tm-&gt;tm_sec;</div><div class='del'>-		itt.minute = tm-&gt;tm_min;</div><div class='del'>-		itt.hour = tm-&gt;tm_hour;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	itt.day = tm-&gt;tm_mday;</div><div class='del'>-	itt.month = tm-&gt;tm_mon + 1;</div><div class='del'>-	itt.year = tm-&gt;tm_year+ 1900;</div><div class='del'>-    </div><div class='del'>-	itt.is_utc = 0;</div><div class='del'>-	itt.is_date = is_date; </div><div class='del'>-	</div><div class='del'>-	return itt;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h<br/>deleted file mode 100644<br/>index 77a8f180e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/cal-util/timeutil.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-/* Miscellaneous time-related utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TIMEUTIL_H</div><div class='del'>-#define TIMEUTIL_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * General time functions.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Returns the number of days in the month. Year is the normal year, e.g. 2001.</div><div class='del'>-   Month is 0 (Jan) to 11 (Dec). */</div><div class='del'>-int	time_days_in_month	(int year, int month);</div><div class='del'>-</div><div class='del'>-/* Returns the 1-based day number within the year of the specified date.</div><div class='del'>-   Year is the normal year, e.g. 2001. Month is 0 to 11. */</div><div class='del'>-int	time_day_of_year	(int day, int month, int year);</div><div class='del'>-</div><div class='del'>-/* Returns the day of the week for the specified date, 0 (Sun) to 6 (Sat).</div><div class='del'>-   For the days that were removed on the Gregorian reformation, it returns</div><div class='del'>-   Thursday. Year is the normal year, e.g. 2001. Month is 0 to 11. */</div><div class='del'>-int	time_day_of_week	(int day, int month, int year);</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified year is a leap year. Year is the normal year,</div><div class='del'>-   e.g. 2001. */</div><div class='del'>-gboolean time_is_leap_year	(int year);</div><div class='del'>-</div><div class='del'>-/* Returns the number of leap years since year 1 up to (but not including) the</div><div class='del'>-   specified year. Year is the normal year, e.g. 2001. */</div><div class='del'>-int	time_leap_years_up_to	(int year);</div><div class='del'>-</div><div class='del'>-/* Convert to or from an ISO 8601 representation of a time, in UTC,</div><div class='del'>-   e.g. "20010708T183000Z". */</div><div class='del'>-char   *isodate_from_time_t     (time_t t);</div><div class='del'>-time_t	time_from_isodate	(const char *str);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * time_t manipulation functions.</div><div class='del'>- *</div><div class='del'>- * NOTE: these use the Unix timezone functions like mktime() and localtime()</div><div class='del'>- * and so should not be used in Evolution. New Evolution code should use</div><div class='del'>- * icaltimetype values rather than time_t values wherever possible.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Add or subtract a number of days, weeks or months. */</div><div class='del'>-time_t	time_add_day		(time_t time, int days);</div><div class='del'>-time_t	time_add_week		(time_t time, int weeks);</div><div class='del'>-</div><div class='del'>-/* Returns the beginning or end of the day. */</div><div class='del'>-time_t	time_day_begin		(time_t t);</div><div class='del'>-time_t	time_day_end		(time_t t);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * time_t manipulation functions, using timezones in libical.</div><div class='del'>- *</div><div class='del'>- * NOTE: these are only here to make the transition to the timezone</div><div class='del'>- * functions easier. New code should use icaltimetype values rather than</div><div class='del'>- * time_t values wherever possible.</div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of days to/from the given time_t value, using</div><div class='del'>-   the given timezone. */</div><div class='del'>-time_t	time_add_day_with_zone (time_t time, int days, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of weeks to/from the given time_t value, using</div><div class='del'>-   the given timezone. */</div><div class='del'>-time_t	time_add_week_with_zone (time_t time, int weeks, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Adds or subtracts a number of months to/from the given time_t value, using</div><div class='del'>-   the given timezone. */</div><div class='del'>-time_t	time_add_month_with_zone (time_t time, int months, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Returns the start of the year containing the given time_t, using the given</div><div class='del'>-   timezone. */</div><div class='del'>-time_t	time_year_begin_with_zone (time_t time, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Returns the start of the month containing the given time_t, using the given</div><div class='del'>-   timezone. */</div><div class='del'>-time_t	time_month_begin_with_zone (time_t time, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Returns the start of the week containing the given time_t, using the given</div><div class='del'>-   timezone. week_start_day should use the same values as mktime(),</div><div class='del'>-   i.e. 0 (Sun) to 6 (Sat). */</div><div class='del'>-time_t	time_week_begin_with_zone (time_t time, int week_start_day,</div><div class='del'>-				   icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Returns the start of the day containing the given time_t, using the given</div><div class='del'>-   timezone. */</div><div class='del'>-time_t	time_day_begin_with_zone (time_t time, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/* Returns the end of the day containing the given time_t, using the given</div><div class='del'>-   timezone. (The end of the day is the start of the next day.) */</div><div class='del'>-time_t	time_day_end_with_zone (time_t time, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-void time_to_gdate_with_zone (GDate *date, time_t time, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-/**************************************************************************</div><div class='del'>- * struct tm manipulation </div><div class='del'>- **************************************************************************/</div><div class='del'>-</div><div class='del'>-struct tm icaltimetype_to_tm (struct icaltimetype *itt);</div><div class='del'>-struct tm icaltimetype_to_tm_with_zone (struct icaltimetype *itt,</div><div class='del'>-					icaltimezone *from_zone,</div><div class='del'>-					icaltimezone *to_zone);</div><div class='del'>-struct icaltimetype tm_to_icaltimetype (struct tm *tm, gboolean is_date);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/conduits/.cvsignore b/calendar/conduits/.cvsignore<br/>deleted file mode 100644<br/>index b840c21800..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am<br/>deleted file mode 100644<br/>index 906ea61971..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = calendar todo</div><div class='head'>diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore<br/>deleted file mode 100644<br/>index e8ba6ad844..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-e-calendar.conduit</div><div class='del'>-*.lo</div><div class='del'>-.libs</div><div class='del'>-libecalendar_conduit.la</div><div class='del'>-e-calendar-conduit-control-applet</div><div class='del'>-e-calendar-conduit-control-applet.desktop</div><div class='head'>diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am<br/>deleted file mode 100644<br/>index d92667bb04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/calendar		\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client	\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical	\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)</div><div class='del'>-</div><div class='del'>-# Calendar Conduit</div><div class='del'>-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la</div><div class='del'>-</div><div class='del'>-libecalendar_conduit_la_SOURCES = 	\</div><div class='del'>-	calendar-conduit.c</div><div class='del'>-</div><div class='del'>-libecalendar_conduit_la_LDFLAGS = -module -avoid-version</div><div class='del'>-libecalendar_conduit_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a				\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-static.la		\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat-static.la		 	\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)</div><div class='del'>-</div><div class='del'>-e-calendar.conduit: e-calendar.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' 				\</div><div class='del'>-	    -e 's^\@datadir\@^$(datadir)^g' 				\</div><div class='del'>-	    &lt; $(srcdir)/e-calendar.conduit.in &gt; e-calendar.conduit.tmp 	\</div><div class='del'>-	&amp;&amp; mv e-calendar.conduit.tmp e-calendar.conduit</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-calendar.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-calendar.conduit.in</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c<br/>deleted file mode 100644<br/>index f86e753232..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/calendar/calendar-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1778 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Calendar Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client-types.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;pi-datebook.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-sync-abs.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-#include &lt;e-pilot-settings.h&gt;</div><div class='del'>-#include &lt;e-pilot-util.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.6"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "ecalconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_CALCONDUIT 1</div><div class='del'>-/* #undef DEBUG_CALCONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-#define PILOT_MAX_ADVANCE 99</div><div class='del'>-</div><div class='del'>-typedef struct _ECalLocalRecord ECalLocalRecord;</div><div class='del'>-typedef struct _ECalConduitCfg ECalConduitCfg;</div><div class='del'>-typedef struct _ECalConduitContext ECalConduitContext;</div><div class='del'>-</div><div class='del'>-/* Local Record */</div><div class='del'>-struct _ECalLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding Comp object */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-        /* pilot-link appointment structure */</div><div class='del'>-	struct Appointment *appt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calconduit_destroy_record (ECalLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	free_Appointment (local-&gt;appt);</div><div class='del'>-	g_free (local-&gt;appt);	</div><div class='del'>-	g_free (local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Configuration */</div><div class='del'>-struct _ECalConduitCfg {</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;</div><div class='del'>-</div><div class='del'>-	gboolean secret;</div><div class='del'>-	gchar *last_uri;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECalConduitCfg *</div><div class='del'>-calconduit_load_configuration (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	ECalConduitCfg *c;</div><div class='del'>-	GnomePilotConduitManagement *management;</div><div class='del'>-	GnomePilotConduitConfig *config;</div><div class='del'>- 	gchar prefix[256];</div><div class='del'>-	</div><div class='del'>-	c = g_new0 (ECalConduitCfg, 1);</div><div class='del'>-	g_assert (c != NULL);</div><div class='del'>-</div><div class='del'>-	/* Pilot ID */</div><div class='del'>-	c-&gt;pilot_id = pilot_id;</div><div class='del'>-</div><div class='del'>-	/* Sync Type */</div><div class='del'>-	management = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	config = gnome_pilot_conduit_config_new (management, pilot_id);</div><div class='del'>-	if (!gnome_pilot_conduit_config_is_enabled (config, &amp;c-&gt;sync_type))</div><div class='del'>-		c-&gt;sync_type = GnomePilotConduitSyncTypeNotSet;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (config));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (management));</div><div class='del'>-</div><div class='del'>-	/* Custom settings */</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", pilot_id);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-</div><div class='del'>-	c-&gt;secret = gnome_config_get_bool ("secret=FALSE");</div><div class='del'>-	c-&gt;last_uri = gnome_config_get_string ("last_uri");</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calconduit_save_configuration (ECalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-calendar-conduit/Pilot_%u/", c-&gt;pilot_id);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-</div><div class='del'>-	gnome_config_set_bool ("secret", c-&gt;secret);</div><div class='del'>-	gnome_config_set_string ("last_uri", c-&gt;last_uri);</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	gnome_config_drop_all ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECalConduitCfg*</div><div class='del'>-calconduit_dupe_configuration (ECalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	ECalConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (ECalConduitCfg, 1);</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;secret = c-&gt;secret;</div><div class='del'>-	retval-&gt;last_uri = g_strdup (c-&gt;last_uri);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-calconduit_destroy_configuration (ECalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (c-&gt;last_uri);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context */</div><div class='del'>-struct _ECalConduitContext {</div><div class='del'>-	ECalConduitCfg *cfg;</div><div class='del'>-	GnomePilotDBInfo *dbi;</div><div class='del'>-</div><div class='del'>-	ECalConduitCfg *new_cfg;</div><div class='del'>-	GtkWidget *ps;</div><div class='del'>-	</div><div class='del'>-	struct AppointmentAppInfo ai;</div><div class='del'>-</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	icaltimezone *timezone;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *changed;</div><div class='del'>-	GHashTable *changed_hash;</div><div class='del'>-	GList *locals;</div><div class='del'>-	</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECalConduitContext *</div><div class='del'>-e_calendar_context_new (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	ECalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = g_new0 (ECalConduitContext, 1);</div><div class='del'>-	g_assert (ctxt != NULL);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;cfg = calconduit_load_configuration (pilot_id);</div><div class='del'>-	ctxt-&gt;new_cfg = calconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-	ctxt-&gt;ps = NULL;</div><div class='del'>-	ctxt-&gt;dbi = NULL;</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-	ctxt-&gt;timezone = NULL;</div><div class='del'>-	ctxt-&gt;uids = NULL;</div><div class='del'>-	ctxt-&gt;changed = NULL;</div><div class='del'>-	ctxt-&gt;changed_hash = NULL;</div><div class='del'>-	ctxt-&gt;locals = NULL;</div><div class='del'>-	ctxt-&gt;map = NULL;</div><div class='del'>-	</div><div class='del'>-	return ctxt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_calendar_context_foreach_change (gpointer key, gpointer value, gpointer data) </div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_context_destroy (ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (ctxt != NULL);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;cfg != NULL)</div><div class='del'>-		calconduit_destroy_configuration (ctxt-&gt;cfg);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ctxt-&gt;client));</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;uids != NULL)</div><div class='del'>-		cal_obj_uid_list_free (ctxt-&gt;uids);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;changed != NULL)</div><div class='del'>-		cal_client_change_list_free (ctxt-&gt;changed);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;changed_hash != NULL) {</div><div class='del'>-		g_hash_table_foreach_remove (ctxt-&gt;changed_hash, e_calendar_context_foreach_change, NULL);</div><div class='del'>-		g_hash_table_destroy (ctxt-&gt;changed_hash);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;locals != NULL) {</div><div class='del'>-		for (l = ctxt-&gt;locals; l != NULL; l = l-&gt;next)</div><div class='del'>-			calconduit_destroy_record (l-&gt;data);</div><div class='del'>-		g_list_free (ctxt-&gt;locals);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;map != NULL)</div><div class='del'>-		e_pilot_map_destroy (ctxt-&gt;map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug routines */</div><div class='del'>-static char *</div><div class='del'>-print_local (ECalLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;appt &amp;&amp; local-&gt;appt-&gt;description) {</div><div class='del'>-		g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",</div><div class='del'>-			    mktime (&amp;local-&gt;appt-&gt;begin),</div><div class='del'>-			    mktime (&amp;local-&gt;appt-&gt;end),</div><div class='del'>-			    local-&gt;appt-&gt;description ?</div><div class='del'>-			    local-&gt;appt-&gt;description : "",</div><div class='del'>-			    local-&gt;appt-&gt;note ?</div><div class='del'>-			    local-&gt;appt-&gt;note : "");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct Appointment appt;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;appt, 0, sizeof (struct Appointment));</div><div class='del'>-	unpack_Appointment (&amp;appt, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",</div><div class='del'>-		    mktime (&amp;appt.begin),</div><div class='del'>-		    mktime (&amp;appt.end),</div><div class='del'>-		    appt.description ?</div><div class='del'>-		    appt.description : "",</div><div class='del'>-		    appt.note ?</div><div class='del'>-		    appt.note : "");</div><div class='del'>-</div><div class='del'>-	free_Appointment (&amp;appt);</div><div class='del'>-</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Calendar Server routines */</div><div class='del'>-static void</div><div class='del'>-start_calendar_server_cb (CalClient *cal_client,</div><div class='del'>-			  CalClientOpenStatus status,</div><div class='del'>-			  gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *success = data;</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_OPEN_SUCCESS) {</div><div class='del'>-		*success = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		*success = FALSE;</div><div class='del'>-		WARN ("Failed to open calendar!\n");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gboolean success = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ctxt != NULL, -2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ctxt-&gt;client), "cal_opened",</div><div class='del'>-			    start_calendar_server_cb, &amp;success);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_open_default_calendar (ctxt-&gt;client, FALSE))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static icaltimezone *</div><div class='del'>-get_timezone (CalClient *client, const char *tzid) </div><div class='del'>-{</div><div class='del'>-	icaltimezone *timezone = NULL;</div><div class='del'>-</div><div class='del'>-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-	if (timezone == NULL)</div><div class='del'>-		 cal_client_get_timezone (client, tzid, &amp;timezone);</div><div class='del'>-	</div><div class='del'>-	return timezone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icaltimezone *</div><div class='del'>-get_default_timezone (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	icaltimezone *timezone = NULL;</div><div class='del'>-	char *location;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	location = bonobo_config_get_string_with_default (db,</div><div class='del'>-		"/Calendar/Display/Timezone", "UTC", NULL);</div><div class='del'>-	if (!location || !location[0]) {</div><div class='del'>-		g_free (location);</div><div class='del'>-		location = g_strdup ("UTC");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	timezone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	g_free (location);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	return timezone;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-map_name (ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-calendar-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalrecurrencetype_weekday</div><div class='del'>-get_ical_day (int day) </div><div class='del'>-{</div><div class='del'>-	switch (day) {</div><div class='del'>-	case 0:</div><div class='del'>-		return ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-	case 1:</div><div class='del'>-		return ICAL_MONDAY_WEEKDAY;</div><div class='del'>-	case 2:</div><div class='del'>-		return ICAL_TUESDAY_WEEKDAY;</div><div class='del'>-	case 3:</div><div class='del'>-		return ICAL_WEDNESDAY_WEEKDAY;</div><div class='del'>-	case 4:</div><div class='del'>-		return ICAL_THURSDAY_WEEKDAY;</div><div class='del'>-	case 5:</div><div class='del'>-		return ICAL_FRIDAY_WEEKDAY;</div><div class='del'>-	case 6:</div><div class='del'>-		return ICAL_SATURDAY_WEEKDAY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ICAL_NO_WEEKDAY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_pilot_day (icalrecurrencetype_weekday wd) </div><div class='del'>-{</div><div class='del'>-	switch (wd) {</div><div class='del'>-	case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-		return 0;</div><div class='del'>-	case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-		return 1;</div><div class='del'>-	case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-		return 2;</div><div class='del'>-	case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-		return 3;</div><div class='del'>-	case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-		return 4;</div><div class='del'>-	case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-		return 5;</div><div class='del'>-	case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-		return 6;</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_empty_time (struct tm time) </div><div class='del'>-{</div><div class='del'>-	if (time.tm_sec || time.tm_min || time.tm_hour </div><div class='del'>-	    || time.tm_mday || time.tm_mon || time.tm_year) </div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_all_day (CalClient *client, CalComponentDateTime *dt_start, CalComponentDateTime *dt_end) </div><div class='del'>-{</div><div class='del'>-	time_t dt_start_time, dt_end_time;</div><div class='del'>-	icaltimezone *timezone;</div><div class='del'>-</div><div class='del'>-	if (dt_start-&gt;value-&gt;is_date &amp;&amp; dt_end-&gt;value-&gt;is_date)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	timezone = get_timezone (client, dt_start-&gt;tzid);</div><div class='del'>-	dt_start_time = icaltime_as_timet_with_zone (*dt_start-&gt;value, timezone);</div><div class='del'>-	dt_end_time = icaltime_as_timet_with_zone (*dt_end-&gt;value, get_timezone (client, dt_end-&gt;tzid));</div><div class='del'>-</div><div class='del'>-	if (dt_end_time == time_add_day_with_zone (dt_start_time, 1, timezone))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-process_multi_day (ECalConduitContext *ctxt, CalClientChange *ccc, GList **multi_uid, GList **multi_ccc)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt_start, dt_end;</div><div class='del'>-	icaltimezone *tz_start, *tz_end;</div><div class='del'>-	time_t event_start, event_end, day_end;</div><div class='del'>-	struct icaltimetype *old_start_value, *old_end_value;</div><div class='del'>-	const char *uid;</div><div class='del'>-	gboolean last = FALSE;</div><div class='del'>-	gboolean ret = TRUE;</div><div class='del'>-</div><div class='del'>-	*multi_ccc = NULL;</div><div class='del'>-	*multi_uid = NULL;</div><div class='del'>-	</div><div class='del'>-	if (ccc-&gt;type == CAL_CLIENT_CHANGE_DELETED)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Start time */</div><div class='del'>-	cal_component_get_dtstart (ccc-&gt;comp, &amp;dt_start);</div><div class='del'>-	if (dt_start.value-&gt;is_date)</div><div class='del'>-		tz_start = ctxt-&gt;timezone;</div><div class='del'>-	else</div><div class='del'>-		tz_start = get_timezone (ctxt-&gt;client, dt_start.tzid);</div><div class='del'>-	event_start = icaltime_as_timet_with_zone (*dt_start.value, tz_start);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (ccc-&gt;comp, &amp;dt_end);</div><div class='del'>-	if (dt_end.value-&gt;is_date)</div><div class='del'>-		tz_end = ctxt-&gt;timezone;</div><div class='del'>-	else</div><div class='del'>-		tz_end = get_timezone (ctxt-&gt;client, dt_end.tzid);</div><div class='del'>-	event_end = icaltime_as_timet_with_zone (*dt_end.value, tz_end);</div><div class='del'>-</div><div class='del'>-	day_end = time_day_end_with_zone (event_start, ctxt-&gt;timezone);			</div><div class='del'>-	if (day_end &gt;= event_end) {</div><div class='del'>-		ret = FALSE;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	} else if (cal_component_has_recurrences (ccc-&gt;comp)) {</div><div class='del'>-		ret = TRUE;</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_start_value = dt_start.value;</div><div class='del'>- 	old_end_value = dt_end.value;</div><div class='del'>-	while (!last) {</div><div class='del'>-		CalComponent *clone = cal_component_clone (ccc-&gt;comp);</div><div class='del'>-		char *new_uid = cal_component_gen_uid ();</div><div class='del'>-		struct icaltimetype start_value, end_value;</div><div class='del'>-		CalClientChange *c = g_new0 (CalClientChange, 1);</div><div class='del'>-		</div><div class='del'>-		if (day_end &gt;= event_end) {</div><div class='del'>-			day_end = event_end;</div><div class='del'>-			last = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cal_component_set_uid (clone, new_uid);</div><div class='del'>-</div><div class='del'>-		start_value = icaltime_from_timet_with_zone (event_start, FALSE, tz_start);</div><div class='del'>-		dt_start.value = &amp;start_value;</div><div class='del'>-		cal_component_set_dtstart (clone, &amp;dt_start);</div><div class='del'>-		</div><div class='del'>-		end_value = icaltime_from_timet_with_zone (day_end, FALSE, tz_end);</div><div class='del'>-		dt_end.value = &amp;end_value;</div><div class='del'>-		cal_component_set_dtend (clone, &amp;dt_end);</div><div class='del'>-</div><div class='del'>-		cal_client_update_object (ctxt-&gt;client, clone);</div><div class='del'>-</div><div class='del'>-		c-&gt;comp = clone;</div><div class='del'>-		c-&gt;type = CAL_CLIENT_CHANGE_ADDED;</div><div class='del'>-		</div><div class='del'>-		*multi_ccc = g_list_prepend (*multi_ccc, c);</div><div class='del'>-		*multi_uid = g_list_prepend (*multi_uid, new_uid);</div><div class='del'>-</div><div class='del'>-		event_start = day_end;</div><div class='del'>-		day_end = time_day_end_with_zone (event_start, ctxt-&gt;timezone);</div><div class='del'>-	}</div><div class='del'>-	dt_start.value = old_start_value;</div><div class='del'>-	dt_end.value = old_end_value;</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-	cal_client_remove_object (ctxt-&gt;client, uid);</div><div class='del'>-	ccc-&gt;type = CAL_CLIENT_CHANGE_DELETED;</div><div class='del'>-</div><div class='del'>- cleanup:</div><div class='del'>-	cal_component_free_datetime (&amp;dt_start);</div><div class='del'>-	cal_component_free_datetime (&amp;dt_end);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static short</div><div class='del'>-nth_weekday (int pos, icalrecurrencetype_weekday weekday)</div><div class='del'>-{</div><div class='del'>-	g_assert ((pos &gt; 0 &amp;&amp; pos &lt;= 5) || (pos == -1));</div><div class='del'>-</div><div class='del'>-	return ((abs (pos) * 8) + weekday) * (pos &lt; 0 ? -1 : 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-next_changed_item (ECalConduitContext *ctxt, GList *changes) </div><div class='del'>-{</div><div class='del'>-	CalClientChange *ccc;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = changes; l != NULL; l = l-&gt;next) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		ccc = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-		if (g_hash_table_lookup (ctxt-&gt;changed_hash, uid))</div><div class='del'>-			return l;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalClientChange *ccc;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-</div><div class='del'>-	ccc = g_hash_table_lookup (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-	if (ccc == NULL) {</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (ccc-&gt;type) {</div><div class='del'>-	case CAL_CLIENT_CHANGE_ADDED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNew;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case CAL_CLIENT_CHANGE_MODIFIED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordModified;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case CAL_CLIENT_CHANGE_DELETED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordDeleted;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord</div><div class='del'>-local_record_to_pilot_record (ECalLocalRecord *local,</div><div class='del'>-			      ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord p;</div><div class='del'>-	static char record[0xffff];</div><div class='del'>-</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-	g_assert (local-&gt;appt != NULL );</div><div class='del'>-	</div><div class='del'>-	p.ID = local-&gt;local.ID;</div><div class='del'>-	p.category = local-&gt;local.category;</div><div class='del'>-	p.attr = local-&gt;local.attr;</div><div class='del'>-	p.archived = local-&gt;local.archived;</div><div class='del'>-	p.secret = local-&gt;local.secret;</div><div class='del'>-</div><div class='del'>-	/* Generate pilot record structure */</div><div class='del'>-	p.record = record;</div><div class='del'>-	p.length = pack_Appointment (local-&gt;appt, p.record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * converts a CalComponent object to a ECalLocalRecord</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	GSList *d_list = NULL, *edl = NULL, *l;</div><div class='del'>-	CalComponentText *description;</div><div class='del'>-	CalComponentDateTime dt_start, dt_end;</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-	icaltimezone *default_tz = ctxt-&gt;timezone;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, uid, TRUE);</div><div class='del'>-	compute_status (ctxt, local, uid);</div><div class='del'>-</div><div class='del'>-	local-&gt;appt = g_new0 (struct Appointment, 1);</div><div class='del'>-</div><div class='del'>-	/* Handle the fields and category we don't sync by making sure</div><div class='del'>-         * we don't overwrite them </div><div class='del'>-	 */</div><div class='del'>-	if (local-&gt;local.ID != 0) {</div><div class='del'>-		struct Appointment appt;		</div><div class='del'>-		char record[0xffff];</div><div class='del'>-		int cat = 0;</div><div class='del'>-		</div><div class='del'>-		if (dlp_ReadRecordById (ctxt-&gt;dbi-&gt;pilot_socket, </div><div class='del'>-					ctxt-&gt;dbi-&gt;db_handle,</div><div class='del'>-					local-&gt;local.ID, &amp;record, </div><div class='del'>-					NULL, NULL, NULL, &amp;cat) &gt; 0) {</div><div class='del'>-			local-&gt;local.category = cat;</div><div class='del'>-			memset (&amp;appt, 0, sizeof (struct Appointment));</div><div class='del'>-			unpack_Appointment (&amp;appt, record, 0xffff);</div><div class='del'>-			local-&gt;appt-&gt;alarm = appt.alarm;</div><div class='del'>-			local-&gt;appt-&gt;advance = appt.advance;</div><div class='del'>-			local-&gt;appt-&gt;advanceUnits = appt.advanceUnits;</div><div class='del'>-			free_Appointment (&amp;appt);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* STOP: don't replace these with g_strdup, since free_Appointment</div><div class='del'>-	   uses free to deallocate */</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value) </div><div class='del'>-		local-&gt;appt-&gt;description = e_pilot_utf8_to_pchar (summary.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;d_list);</div><div class='del'>-	if (d_list) {</div><div class='del'>-		description = (CalComponentText *) d_list-&gt;data;</div><div class='del'>-		if (description &amp;&amp; description-&gt;value)</div><div class='del'>-			local-&gt;appt-&gt;note = e_pilot_utf8_to_pchar (description-&gt;value);</div><div class='del'>-		else</div><div class='del'>-			local-&gt;appt-&gt;note = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;appt-&gt;note = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Start/End */</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt_start);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dt_end);</div><div class='del'>-	if (dt_start.value) {</div><div class='del'>-		icaltimezone_convert_time (dt_start.value, </div><div class='del'>-					   get_timezone (ctxt-&gt;client, dt_start.tzid),</div><div class='del'>-					   default_tz);</div><div class='del'>-		local-&gt;appt-&gt;begin = icaltimetype_to_tm (dt_start.value);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (dt_start.value &amp;&amp; dt_end.value) {</div><div class='del'>-		if (is_all_day (ctxt-&gt;client, &amp;dt_start, &amp;dt_end)) {</div><div class='del'>-			local-&gt;appt-&gt;event = 1;</div><div class='del'>-		} else {</div><div class='del'>-			icaltimezone_convert_time (dt_end.value, </div><div class='del'>-						   get_timezone (ctxt-&gt;client, dt_end.tzid),</div><div class='del'>-						   default_tz);</div><div class='del'>-			local-&gt;appt-&gt;end = icaltimetype_to_tm (dt_end.value);</div><div class='del'>-			local-&gt;appt-&gt;event = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;appt-&gt;event = 1;</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;dt_start);</div><div class='del'>-	cal_component_free_datetime (&amp;dt_end);	</div><div class='del'>-</div><div class='del'>-	/* Recurrence Rules */</div><div class='del'>-	local-&gt;appt-&gt;repeatType = repeatNone;</div><div class='del'>-	</div><div class='del'>-	if (cal_component_has_rrules (comp)) {</div><div class='del'>-		GSList *list;</div><div class='del'>-		struct icalrecurrencetype *recur;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_rrule_list (comp, &amp;list);</div><div class='del'>-		recur = list-&gt;data;</div><div class='del'>-		</div><div class='del'>-		switch (recur-&gt;freq) {</div><div class='del'>-		case ICAL_DAILY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatDaily;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatWeekly;</div><div class='del'>-			for (i = 0; i &lt;= 7 &amp;&amp; recur-&gt;by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {</div><div class='del'>-				icalrecurrencetype_weekday wd;</div><div class='del'>-</div><div class='del'>-				wd = icalrecurrencetype_day_day_of_week (recur-&gt;by_day[i]);</div><div class='del'>-				local-&gt;appt-&gt;repeatDays[get_pilot_day (wd)] = 1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-			if (recur-&gt;by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {</div><div class='del'>-				local-&gt;appt-&gt;repeatType = repeatMonthlyByDate;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* FIX ME Not going to work with -ve by_day */</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatMonthlyByDay;</div><div class='del'>-			switch (icalrecurrencetype_day_position (recur-&gt;by_day[0])) {</div><div class='del'>-			case 1:</div><div class='del'>-				local-&gt;appt-&gt;repeatDay = dom1stSun;</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				local-&gt;appt-&gt;repeatDay = dom2ndSun;</div><div class='del'>-				break;</div><div class='del'>-			case 3:</div><div class='del'>-				local-&gt;appt-&gt;repeatDay = dom3rdSun;</div><div class='del'>-				break;</div><div class='del'>-			case 4:</div><div class='del'>-				local-&gt;appt-&gt;repeatDay = dom4thSun;</div><div class='del'>-				break;</div><div class='del'>-			case 5:</div><div class='del'>-				local-&gt;appt-&gt;repeatDay = domLastSun;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			local-&gt;appt-&gt;repeatDay += get_pilot_day (icalrecurrencetype_day_day_of_week (recur-&gt;by_day[0]));</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;appt-&gt;repeatType != repeatNone) {</div><div class='del'>-			local-&gt;appt-&gt;repeatFrequency = recur-&gt;interval;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (icaltime_is_null_time (recur-&gt;until)) {</div><div class='del'>-			local-&gt;appt-&gt;repeatForever = 1;</div><div class='del'>-		} else {</div><div class='del'>-			local-&gt;appt-&gt;repeatForever = 0;</div><div class='del'>-			icaltimezone_convert_time (&amp;recur-&gt;until, </div><div class='del'>-						   icaltimezone_get_utc_timezone (),</div><div class='del'>-						   default_tz);</div><div class='del'>-			local-&gt;appt-&gt;repeatEnd = icaltimetype_to_tm (&amp;recur-&gt;until);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		cal_component_free_recur_list (list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Exceptions */</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;edl);</div><div class='del'>-	local-&gt;appt-&gt;exceptions = g_slist_length (edl);</div><div class='del'>-	local-&gt;appt-&gt;exception = g_new0 (struct tm, local-&gt;appt-&gt;exceptions);	</div><div class='del'>-	for (l = edl, i = 0; l != NULL; l = l-&gt;next, i++) {</div><div class='del'>-		CalComponentDateTime *dt = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		icaltimezone_convert_time (dt-&gt;value, </div><div class='del'>-					   icaltimezone_get_utc_timezone (),</div><div class='del'>-					   default_tz);</div><div class='del'>-		*local-&gt;appt-&gt;exception = icaltimetype_to_tm (dt-&gt;value);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_exdate_list (edl);</div><div class='del'>-</div><div class='del'>-	/* Alarm */</div><div class='del'>-	local-&gt;appt-&gt;alarm = 0;</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		GList *uids, *l;		</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-		CalAlarmTrigger trigger;</div><div class='del'>-</div><div class='del'>-		uids = cal_component_get_alarm_uids (comp);</div><div class='del'>-		for (l = uids; l != NULL; l = l-&gt;next) {</div><div class='del'>-			alarm = cal_component_get_alarm (comp, l-&gt;data);</div><div class='del'>-			cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-			</div><div class='del'>-			if ((trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START</div><div class='del'>-			     &amp;&amp; trigger.u.rel_duration.is_neg)) {</div><div class='del'>-				local-&gt;appt-&gt;advanceUnits = advMinutes;</div><div class='del'>-				local-&gt;appt-&gt;advance = </div><div class='del'>-					trigger.u.rel_duration.minutes</div><div class='del'>-					+ trigger.u.rel_duration.hours * 60</div><div class='del'>-					+ trigger.u.rel_duration.days * 60 * 24</div><div class='del'>-					+ trigger.u.rel_duration.weeks * 7 * 60 * 24;</div><div class='del'>-</div><div class='del'>-				if (local-&gt;appt-&gt;advance &gt; PILOT_MAX_ADVANCE) {</div><div class='del'>-					local-&gt;appt-&gt;advanceUnits = advHours;</div><div class='del'>-					local-&gt;appt-&gt;advance = </div><div class='del'>-						trigger.u.rel_duration.minutes / 60</div><div class='del'>-						+ trigger.u.rel_duration.hours</div><div class='del'>-						+ trigger.u.rel_duration.days * 24</div><div class='del'>-						+ trigger.u.rel_duration.weeks * 7 * 24;</div><div class='del'>-				}</div><div class='del'>-				if (local-&gt;appt-&gt;advance &gt; PILOT_MAX_ADVANCE) {</div><div class='del'>-					local-&gt;appt-&gt;advanceUnits = advDays;</div><div class='del'>-					local-&gt;appt-&gt;advance =</div><div class='del'>-						trigger.u.rel_duration.minutes / (60 * 24)</div><div class='del'>-						+ trigger.u.rel_duration.hours / 24</div><div class='del'>-						+ trigger.u.rel_duration.days</div><div class='del'>-						+ trigger.u.rel_duration.weeks * 7;</div><div class='del'>-				}</div><div class='del'>-				if (local-&gt;appt-&gt;advance &gt; PILOT_MAX_ADVANCE)</div><div class='del'>-					local-&gt;appt-&gt;advance = PILOT_MAX_ADVANCE;</div><div class='del'>-</div><div class='del'>-				local-&gt;appt-&gt;alarm = 1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			cal_component_alarm_free (alarm);</div><div class='del'>-		}</div><div class='del'>-		cal_obj_uid_list_free (uids);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)</div><div class='del'>-		local-&gt;local.secret = 1;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;local.secret = 0;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = 0;  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (ECalLocalRecord *local,</div><div class='del'>-		       const char *uid,</div><div class='del'>-		       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (ctxt-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-		cal_component_set_uid (comp, uid);</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 CalComponent *in_comp,</div><div class='del'>-			 icaltimezone *timezone)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct Appointment appt;</div><div class='del'>-	struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;</div><div class='del'>-	struct icalrecurrencetype recur;</div><div class='del'>-	CalComponentText summary = {NULL, NULL};</div><div class='del'>-	CalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};</div><div class='del'>-	GSList *edl = NULL;	</div><div class='del'>-	char *txt;</div><div class='del'>-	int pos, i;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	memset (&amp;appt, 0, sizeof (struct Appointment));</div><div class='del'>-	unpack_Appointment (&amp;appt, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (in_comp == NULL) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-		cal_component_set_created (comp, &amp;now);</div><div class='del'>-	} else {</div><div class='del'>-		comp = cal_component_clone (in_comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_last_modified (comp, &amp;now);</div><div class='del'>-</div><div class='del'>-	summary.value = txt = e_pilot_utf8_from_pchar (appt.description);</div><div class='del'>-	cal_component_set_summary (comp, &amp;summary);</div><div class='del'>-	free (txt);</div><div class='del'>-</div><div class='del'>-	/* The iCal description field */</div><div class='del'>-	if (!appt.note) {</div><div class='del'>-		cal_component_set_description_list (comp, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		GSList l;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = txt = e_pilot_utf8_from_pchar (appt.note);</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-		l.data = &amp;text;</div><div class='del'>-		l.next = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_description_list (comp, &amp;l);</div><div class='del'>-		free (txt);</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	if (!is_empty_time (appt.begin)) {</div><div class='del'>-		it = tm_to_icaltimetype (&amp;appt.begin, FALSE);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (appt.event) {</div><div class='del'>-		it = tm_to_icaltimetype (&amp;appt.begin, FALSE);</div><div class='del'>-		icaltime_adjust (&amp;it, 1, 0, 0, 0);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-	} else if (!is_empty_time (appt.end)) {</div><div class='del'>-		it = tm_to_icaltimetype (&amp;appt.end, FALSE);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recurrence information */</div><div class='del'>-  	icalrecurrencetype_clear (&amp;recur);</div><div class='del'>-</div><div class='del'>-	switch (appt.repeatType) {</div><div class='del'>-	case repeatNone:</div><div class='del'>-		recur.freq = ICAL_NO_RECURRENCE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatDaily:</div><div class='del'>-		recur.freq = ICAL_DAILY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatWeekly:</div><div class='del'>-		recur.freq = ICAL_WEEKLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-</div><div class='del'>-		pos = 0;</div><div class='del'>-		for (i = 0; i &lt; 7; i++) {</div><div class='del'>-			if (appt.repeatDays[i])</div><div class='del'>-				recur.by_day[pos++] = get_ical_day (i);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatMonthlyByDay:</div><div class='del'>-		recur.freq = ICAL_MONTHLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		if (appt.repeatDay &lt; domLastSun)</div><div class='del'>-			recur.by_day[0] = nth_weekday ((appt.repeatDay / 7) + 1, </div><div class='del'>-						       get_ical_day (appt.repeatDay % 7));</div><div class='del'>-		else</div><div class='del'>-			recur.by_day[0] = nth_weekday (-1, get_ical_day (appt.repeatDay % 7));		</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case repeatMonthlyByDate:</div><div class='del'>-		recur.freq = ICAL_MONTHLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		recur.by_month_day[0] = appt.begin.tm_mday;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatYearly:</div><div class='del'>-		recur.freq = ICAL_YEARLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur.freq != ICAL_NO_RECURRENCE) {</div><div class='del'>-		GSList *list = NULL;</div><div class='del'>-		</div><div class='del'>-		/* recurrence start of week */</div><div class='del'>-		recur.week_start = get_ical_day (appt.repeatWeekstart);</div><div class='del'>-</div><div class='del'>-		if (!appt.repeatForever) {</div><div class='del'>-			recur.until = tm_to_icaltimetype (&amp;appt.repeatEnd, TRUE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list = g_slist_append (list, &amp;recur);</div><div class='del'>-		cal_component_set_rrule_list (comp, list);</div><div class='del'>-		g_slist_free (list);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_rrule_list (comp, NULL);		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Exceptions */</div><div class='del'>-	for (i = 0; i &lt; appt.exceptions; i++) {</div><div class='del'>-		struct tm ex;</div><div class='del'>-		CalComponentDateTime *dt = g_new0 (CalComponentDateTime, 1);</div><div class='del'>-</div><div class='del'>-		dt-&gt;value = g_new0 (struct icaltimetype, 1);</div><div class='del'>-		dt-&gt;tzid = NULL;		</div><div class='del'>-		</div><div class='del'>-		ex = appt.exception[i];</div><div class='del'>-		*dt-&gt;value = tm_to_icaltimetype (&amp;ex, TRUE);</div><div class='del'>-		</div><div class='del'>-		edl = g_slist_prepend (edl, dt);</div><div class='del'>-	}</div><div class='del'>-	cal_component_set_exdate_list (comp, edl);</div><div class='del'>-	cal_component_free_exdate_list (edl);</div><div class='del'>-</div><div class='del'>-	/* Alarm */</div><div class='del'>-	if (appt.alarm) {</div><div class='del'>-		CalComponentAlarm *alarm = NULL;</div><div class='del'>-		CalAlarmTrigger trigger;</div><div class='del'>-		gboolean found = FALSE;</div><div class='del'>-		</div><div class='del'>-		if (cal_component_has_alarms (comp)) {</div><div class='del'>-			GList *uids, *l;</div><div class='del'>-			</div><div class='del'>-			uids = cal_component_get_alarm_uids (comp);</div><div class='del'>-			for (l = uids; l != NULL; l = l-&gt;next) {</div><div class='del'>-				alarm = cal_component_get_alarm (comp, l-&gt;data);</div><div class='del'>-				cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-				if ((trigger.type == CAL_ALARM_TRIGGER_RELATIVE_START</div><div class='del'>-				     &amp;&amp; trigger.u.rel_duration.is_neg)) {</div><div class='del'>-					found = TRUE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				cal_component_alarm_free (alarm);</div><div class='del'>-			}</div><div class='del'>-			cal_obj_uid_list_free (uids);</div><div class='del'>-		}</div><div class='del'>-		if (!found)</div><div class='del'>-			alarm = cal_component_alarm_new ();</div><div class='del'>-</div><div class='del'>-		memset (&amp;trigger, 0, sizeof (CalAlarmTrigger));</div><div class='del'>-		trigger.type = CAL_ALARM_TRIGGER_RELATIVE_START;</div><div class='del'>-		trigger.u.rel_duration.is_neg = 1;</div><div class='del'>-		switch (appt.advanceUnits) {</div><div class='del'>-		case advMinutes:</div><div class='del'>-			trigger.u.rel_duration.minutes = appt.advance;</div><div class='del'>-			break;</div><div class='del'>-		case advHours:</div><div class='del'>-			trigger.u.rel_duration.hours = appt.advance;</div><div class='del'>-			break;</div><div class='del'>-		case advDays:</div><div class='del'>-			trigger.u.rel_duration.days = appt.advance;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		cal_component_alarm_set_trigger (alarm, trigger);</div><div class='del'>-		cal_component_alarm_set_action (alarm, CAL_ALARM_DISPLAY);</div><div class='del'>-</div><div class='del'>-		if (!found)</div><div class='del'>-			cal_component_add_alarm (comp, alarm);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);</div><div class='del'>-	else</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-	</div><div class='del'>-	free_Appointment (&amp;appt);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,</div><div class='del'>-	     ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (conduit != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	success = cal_client_update_object (ctxt-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-	if (!success)</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-	int map_count;</div><div class='del'>-	const char *uri;</div><div class='del'>-	</div><div class='del'>-	/* If there are objects but no log */</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);</div><div class='del'>-	if (map_count == 0)</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Or if the URI's don't match */</div><div class='del'>-	uri = cal_client_get_uri (ctxt-&gt;client);</div><div class='del'>-	LOG("  Current URI %s (%s)\n", uri, ctxt-&gt;cfg-&gt;last_uri ? ctxt-&gt;cfg-&gt;last_uri : "&lt;NONE&gt;");</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;last_uri != NULL &amp;&amp; strcmp (ctxt-&gt;cfg-&gt;last_uri, uri)) {</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-		e_pilot_map_clear (ctxt-&gt;map);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-	GList *removed = NULL, *added = NULL, *l;</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename, *change_id;</div><div class='del'>-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;dbi = dbi;	</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-</div><div class='del'>-	if (start_calendar_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the timezone */</div><div class='del'>-	ctxt-&gt;timezone = get_default_timezone ();</div><div class='del'>-	if (ctxt-&gt;timezone == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	LOG ("  Using timezone: %s", icaltimezone_get_tzid (ctxt-&gt;timezone));</div><div class='del'>-	</div><div class='del'>-	/* Set the default timezone on the backend. */</div><div class='del'>-	if (ctxt-&gt;timezone)</div><div class='del'>-		cal_client_set_default_timezone (ctxt-&gt;client, ctxt-&gt;timezone);</div><div class='del'>-</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id mapping */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Get the local database */</div><div class='del'>-	ctxt-&gt;uids = cal_client_get_uids (ctxt-&gt;client, CALOBJ_TYPE_EVENT);</div><div class='del'>-</div><div class='del'>-	/* Find the added, modified and deleted items */</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	ctxt-&gt;changed = cal_client_get_changes (ctxt-&gt;client, CALOBJ_TYPE_EVENT, change_id);</div><div class='del'>-	ctxt-&gt;changed_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	</div><div class='del'>-	/* See if we need to split up any events */</div><div class='del'>-	for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalClientChange *ccc = l-&gt;data;</div><div class='del'>-		GList *multi_uid = NULL, *multi_ccc = NULL;</div><div class='del'>-		</div><div class='del'>-		if (process_multi_day (ctxt, ccc, &amp;multi_uid, &amp;multi_ccc)) {</div><div class='del'>-			ctxt-&gt;uids = g_list_concat (ctxt-&gt;uids, multi_uid);</div><div class='del'>-			</div><div class='del'>-			added = g_list_concat (added, multi_ccc);</div><div class='del'>-			removed = g_list_prepend (removed, ccc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove the events that were split up */</div><div class='del'>-	g_list_concat (ctxt-&gt;changed, added);</div><div class='del'>-	for (l = removed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalClientChange *ccc = l-&gt;data;</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-		if (e_pilot_map_lookup_pid (ctxt-&gt;map, uid, FALSE) == 0) {</div><div class='del'>-			ctxt-&gt;changed = g_list_remove (ctxt-&gt;changed, ccc);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (ccc-&gt;comp));</div><div class='del'>-			g_free (ccc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_list_free (removed);</div><div class='del'>-	</div><div class='del'>-	for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalClientChange *ccc = l-&gt;data;</div><div class='del'>-		const char *uid;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, uid)) {</div><div class='del'>-</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, g_strdup (uid), ccc);</div><div class='del'>-</div><div class='del'>-			switch (ccc-&gt;type) {</div><div class='del'>-			case CAL_CLIENT_CHANGE_ADDED:</div><div class='del'>-				add_records++;</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_CHANGE_MODIFIED:</div><div class='del'>-				mod_records++;</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_CHANGE_DELETED:</div><div class='del'>-				del_records++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if (ccc-&gt;type == CAL_CLIENT_CHANGE_DELETED) {</div><div class='del'>-			e_pilot_map_remove_by_uid (ctxt-&gt;map, uid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Set the count information */</div><div class='del'>-	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_EVENT);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's Calendar application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's Calendar application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AppointmentAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyToPilot</div><div class='del'>-	    || ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyFromPilot)</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *changed;</div><div class='del'>-	gchar *filename, *change_id;</div><div class='del'>-	</div><div class='del'>-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	g_free (ctxt-&gt;cfg-&gt;last_uri);</div><div class='del'>-	ctxt-&gt;cfg-&gt;last_uri = g_strdup (cal_client_get_uri (ctxt-&gt;client));</div><div class='del'>-	calconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-	</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	/* FIX ME ugly hack - our changes musn't count, this does introduce</div><div class='del'>-	 * a race condition if anyone changes a record elsewhere during sycnc</div><div class='del'>-         */</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-calendar-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	changed = cal_client_get_changes (ctxt-&gt;client, CALOBJ_TYPE_EVENT, change_id);</div><div class='del'>-	cal_client_change_list_free (changed);</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      ECalLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    ECalLocalRecord *local,</div><div class='del'>-		    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  ECalLocalRecord **local,</div><div class='del'>-	  ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *uids, *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		uids = ctxt-&gt;uids;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (uids != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (uids));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, uids-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-</div><div class='del'>-			iterator = uids;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, iterator-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   ECalLocalRecord **local,</div><div class='del'>-		   ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("for_each_modified beginning\n");</div><div class='del'>-		</div><div class='del'>-		iterator = ctxt-&gt;changed;</div><div class='del'>-		</div><div class='del'>-		count = 0;</div><div class='del'>-	</div><div class='del'>-		LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-		</div><div class='del'>-		iterator = next_changed_item (ctxt, iterator);</div><div class='del'>-		if (iterator != NULL) {</div><div class='del'>-			CalClientChange *ccc = iterator-&gt;data;</div><div class='del'>-		</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_comp (*local, ccc-&gt;comp, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		iterator = g_list_next (iterator);</div><div class='del'>-		if (iterator &amp;&amp; (iterator = next_changed_item (ctxt, iterator))) {</div><div class='del'>-			CalClientChange *ccc = iterator-&gt;data;</div><div class='del'>-			</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_comp (*local, ccc-&gt;comp, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each_modified ending");</div><div class='del'>-</div><div class='del'>-			/* Signal the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 ECalLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	GnomePilotRecord local_pilot;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-		print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail (remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	local_pilot = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot.length</div><div class='del'>-	    || memcmp (local_pilot.record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	comp = comp_from_remote_record (conduit, remote, NULL, ctxt-&gt;timezone);</div><div class='del'>-	update_comp (conduit, comp, ctxt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		ECalLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	new_comp = comp_from_remote_record (conduit, remote, local-&gt;comp, ctxt-&gt;timezone);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	local-&gt;comp = new_comp;</div><div class='del'>-	update_comp (conduit, local-&gt;comp, ctxt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       ECalLocalRecord *local,</div><div class='del'>-	       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	LOG ("delete_record: deleting %s\n", uid);</div><div class='del'>-</div><div class='del'>-	e_pilot_map_remove_by_uid (ctxt-&gt;map, uid);</div><div class='del'>-	cal_client_remove_object (ctxt-&gt;client, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		ECalLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, local-&gt;local.ID, uid, archive);</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       ECalLocalRecord **local,</div><div class='del'>-       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*local = NULL;</div><div class='del'>-	uid = e_pilot_map_lookup_uid (ctxt-&gt;map, remote-&gt;ID, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (!uid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	LOG ("  matched\n");</div><div class='del'>-	</div><div class='del'>-	*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-	local_record_from_uid (*local, uid, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    ECalLocalRecord *local,</div><div class='del'>-	    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	calconduit_destroy_record (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 ECalLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-	*remote = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot Settings Callbacks */</div><div class='del'>-static void</div><div class='del'>-fill_widgets (ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt-&gt;ps),</div><div class='del'>-				     ctxt-&gt;cfg-&gt;secret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-create_settings_window (GnomePilotConduit *conduit,</div><div class='del'>-			GtkWidget *parent,</div><div class='del'>-			ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("create_settings_window");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ps = e_pilot_settings_new ();</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (parent), ctxt-&gt;ps);</div><div class='del'>-	gtk_widget_show (ctxt-&gt;ps);</div><div class='del'>-</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-display_settings (GnomePilotConduit *conduit, ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("display_settings");</div><div class='del'>-	</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_settings    (GnomePilotConduit *conduit, ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("save_settings");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;new_cfg-&gt;secret =</div><div class='del'>-		e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt-&gt;ps));</div><div class='del'>-	</div><div class='del'>-	calconduit_save_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-revert_settings  (GnomePilotConduit *conduit, ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("revert_settings");</div><div class='del'>-</div><div class='del'>-	calconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-	calconduit_destroy_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-	ctxt-&gt;new_cfg = calconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	ECalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in calendar's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	ctxt = e_calendar_context_new (pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	/* Sync signals */</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-</div><div class='del'>-	/* Gui Settings */</div><div class='del'>-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{ </div><div class='del'>-	GtkObject *obj = GTK_OBJECT (conduit);</div><div class='del'>-	ECalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = gtk_object_get_data (obj, "calconduit_context");</div><div class='del'>-	e_calendar_context_destroy (ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (obj);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in<br/>deleted file mode 100644<br/>index e75d889234..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/e-calendar.conduit.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/calendar/e-calendar.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-	&lt;conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/&gt;</div><div class='del'>-	&lt;name value="ECalendar"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/&gt;</div><div class='del'>-     	&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-calendar-conduit.png"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</div><div class='head'>diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore<br/>deleted file mode 100644<br/>index 3ee063c770..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/todo/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-e-todo-conduit-control-applet</div><div class='del'>-e-todo-conduit-control-applet.desktop</div><div class='del'>-e-todo.conduit</div><div class='head'>diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am<br/>deleted file mode 100644<br/>index 036e4f153a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/todo/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/calendar		\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client	\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical	\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)</div><div class='del'>-</div><div class='del'>-# ToDo Conduit</div><div class='del'>-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la</div><div class='del'>-</div><div class='del'>-libetodo_conduit_la_SOURCES = 	\</div><div class='del'>-	todo-conduit.c</div><div class='del'>-</div><div class='del'>-libetodo_conduit_la_LDFLAGS = -module -avoid-version</div><div class='del'>-libetodo_conduit_la_LIBADD = 						\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a				\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-static.la		\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat-static.la	 		\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)</div><div class='del'>-</div><div class='del'>-e-todo.conduit: e-todo.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' 				\</div><div class='del'>-	    -e 's^\@datadir\@^$(datadir)^g' 				\</div><div class='del'>-	    &lt; $(srcdir)/e-todo.conduit.in &gt; e-todo.conduit.tmp 		\</div><div class='del'>-	&amp;&amp; mv e-todo.conduit.tmp e-todo.conduit</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-todo.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-todo.conduit.in</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='head'>diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in<br/>deleted file mode 100644<br/>index a7bea27a8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/e-todo.conduit.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/todo/e-todo.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-	&lt;conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/&gt;</div><div class='del'>-	&lt;name value="EToDo"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/&gt;</div><div class='del'>-     	&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-	&lt;conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-todo-conduit.png"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c<br/>deleted file mode 100644<br/>index a460bd6ebc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/conduits/todo/todo-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1435 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client-types.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-dlp.h&gt;</div><div class='del'>-#include &lt;pi-todo.h&gt;</div><div class='del'>-#include &lt;libical/src/libical/icaltypes.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-sync-abs.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-#include &lt;e-pilot-settings.h&gt;</div><div class='del'>-#include &lt;e-pilot-util.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.4"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "etodoconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_TODOCONDUIT 1</div><div class='del'>-/* #undef DEBUG_TODOCONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_TODOCONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-typedef struct _EToDoLocalRecord EToDoLocalRecord;</div><div class='del'>-typedef struct _EToDoConduitCfg EToDoConduitCfg;</div><div class='del'>-typedef struct _EToDoConduitGui EToDoConduitGui;</div><div class='del'>-typedef struct _EToDoConduitContext EToDoConduitContext;</div><div class='del'>-</div><div class='del'>-/* Local Record */</div><div class='del'>-struct _EToDoLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding Comp object */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-        /* pilot-link todo structure */</div><div class='del'>-	struct ToDo *todo;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-todoconduit_destroy_record (EToDoLocalRecord *local) </div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	free_ToDo (local-&gt;todo);</div><div class='del'>-	g_free (local-&gt;todo);	</div><div class='del'>-	g_free (local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Configuration */</div><div class='del'>-struct _EToDoConduitCfg {</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;</div><div class='del'>-</div><div class='del'>-	gboolean secret;</div><div class='del'>-	gint priority;</div><div class='del'>-</div><div class='del'>-	gchar *last_uri;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EToDoConduitCfg *</div><div class='del'>-todoconduit_load_configuration (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	EToDoConduitCfg *c;</div><div class='del'>-	GnomePilotConduitManagement *management;</div><div class='del'>-	GnomePilotConduitConfig *config;</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    pilot_id);</div><div class='del'>-	</div><div class='del'>-	c = g_new0 (EToDoConduitCfg,1);</div><div class='del'>-	g_assert (c != NULL);</div><div class='del'>-</div><div class='del'>-	c-&gt;pilot_id = pilot_id;</div><div class='del'>-</div><div class='del'>-	management = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	config = gnome_pilot_conduit_config_new (management, pilot_id);</div><div class='del'>-	if (!gnome_pilot_conduit_config_is_enabled (config, &amp;c-&gt;sync_type))</div><div class='del'>-		c-&gt;sync_type = GnomePilotConduitSyncTypeNotSet;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (config));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (management));</div><div class='del'>-	</div><div class='del'>-	/* Custom settings */</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-</div><div class='del'>-	c-&gt;secret = gnome_config_get_bool ("secret=FALSE");</div><div class='del'>-	c-&gt;priority = gnome_config_get_int ("priority=3");</div><div class='del'>-	c-&gt;last_uri = gnome_config_get_string ("last_uri");</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-todoconduit_save_configuration (EToDoConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    c-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	gnome_config_set_bool ("secret", c-&gt;secret);</div><div class='del'>-	gnome_config_set_int ("priority", c-&gt;priority);</div><div class='del'>-	gnome_config_set_string ("last_uri", c-&gt;last_uri);</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	gnome_config_drop_all ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EToDoConduitCfg*</div><div class='del'>-todoconduit_dupe_configuration (EToDoConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	EToDoConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (EToDoConduitCfg, 1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-</div><div class='del'>-	retval-&gt;secret = c-&gt;secret;</div><div class='del'>-	retval-&gt;priority = c-&gt;priority;</div><div class='del'>-	retval-&gt;last_uri = g_strdup (c-&gt;last_uri);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-todoconduit_destroy_configuration (EToDoConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (c-&gt;last_uri);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gui */</div><div class='del'>-struct _EToDoConduitGui {</div><div class='del'>-	GtkWidget *priority;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EToDoConduitGui *</div><div class='del'>-e_todo_gui_new (EPilotSettings *ps) </div><div class='del'>-{</div><div class='del'>-	EToDoConduitGui *gui;</div><div class='del'>-	GtkWidget *lbl;</div><div class='del'>-	GtkObject *adj;</div><div class='del'>-	gint rows;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ps != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), NULL);</div><div class='del'>-</div><div class='del'>-	gtk_table_resize (GTK_TABLE (ps), E_PILOT_SETTINGS_TABLE_ROWS + 1, E_PILOT_SETTINGS_TABLE_COLS);</div><div class='del'>-</div><div class='del'>-	gui = g_new0 (EToDoConduitGui, 1);</div><div class='del'>-</div><div class='del'>-	rows = E_PILOT_SETTINGS_TABLE_ROWS;</div><div class='del'>-	lbl = gtk_label_new (_("Default Priority:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);</div><div class='del'>-	adj = gtk_adjustment_new (1, 1, 5, 1, 5, 5);</div><div class='del'>-	gui-&gt;priority = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1.0, 0);</div><div class='del'>-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (gui-&gt;priority), TRUE);</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, rows, rows + 1);</div><div class='del'>-        gtk_table_attach_defaults (GTK_TABLE (ps), gui-&gt;priority, 1, 2, rows, rows + 1);</div><div class='del'>-	gtk_widget_show (lbl);</div><div class='del'>-	gtk_widget_show (gui-&gt;priority);</div><div class='del'>-	</div><div class='del'>-	return gui;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_todo_gui_fill_widgets (EToDoConduitGui *gui, EToDoConduitCfg *cfg) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gui != NULL);</div><div class='del'>-	g_return_if_fail (cfg != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gui-&gt;priority), cfg-&gt;priority);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_todo_gui_fill_config (EToDoConduitGui *gui, EToDoConduitCfg *cfg) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gui != NULL);</div><div class='del'>-	g_return_if_fail (cfg != NULL);</div><div class='del'>-</div><div class='del'>-	cfg-&gt;priority = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (gui-&gt;priority));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_todo_gui_destroy (EToDoConduitGui *gui) </div><div class='del'>-{</div><div class='del'>-	g_free (gui);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context */</div><div class='del'>-struct _EToDoConduitContext {</div><div class='del'>-	GnomePilotDBInfo *dbi;</div><div class='del'>-</div><div class='del'>-	EToDoConduitCfg *cfg;</div><div class='del'>-	EToDoConduitCfg *new_cfg;</div><div class='del'>-	EToDoConduitGui *gui;</div><div class='del'>-	GtkWidget *ps;</div><div class='del'>-	</div><div class='del'>-	struct ToDoAppInfo ai;</div><div class='del'>-</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	icaltimezone *timezone;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *changed;</div><div class='del'>-	GHashTable *changed_hash;</div><div class='del'>-	GList *locals;</div><div class='del'>-	</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EToDoConduitContext *</div><div class='del'>-e_todo_context_new (guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	EToDoConduitContext *ctxt = g_new0 (EToDoConduitContext, 1);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;cfg = todoconduit_load_configuration (pilot_id);</div><div class='del'>-	ctxt-&gt;new_cfg = todoconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-	ctxt-&gt;gui = NULL;</div><div class='del'>-	ctxt-&gt;ps = NULL;</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-	ctxt-&gt;uids = NULL;</div><div class='del'>-	ctxt-&gt;changed_hash = NULL;</div><div class='del'>-	ctxt-&gt;changed = NULL;</div><div class='del'>-	ctxt-&gt;locals = NULL;</div><div class='del'>-	ctxt-&gt;map = NULL;</div><div class='del'>-</div><div class='del'>-	return ctxt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_todo_context_foreach_change (gpointer key, gpointer value, gpointer data) </div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_todo_context_destroy (EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (ctxt != NULL);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;cfg != NULL)</div><div class='del'>-		todoconduit_destroy_configuration (ctxt-&gt;cfg);</div><div class='del'>-	if (ctxt-&gt;new_cfg != NULL)</div><div class='del'>-		todoconduit_destroy_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-	if (ctxt-&gt;gui != NULL)</div><div class='del'>-		e_todo_gui_destroy (ctxt-&gt;gui);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ctxt-&gt;client));</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;uids != NULL)</div><div class='del'>-		cal_obj_uid_list_free (ctxt-&gt;uids);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;changed_hash != NULL) {</div><div class='del'>-		g_hash_table_foreach_remove (ctxt-&gt;changed_hash, e_todo_context_foreach_change, NULL);</div><div class='del'>-		g_hash_table_destroy (ctxt-&gt;changed_hash);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;locals != NULL) {</div><div class='del'>-		for (l = ctxt-&gt;locals; l != NULL; l = l-&gt;next)</div><div class='del'>-			todoconduit_destroy_record (l-&gt;data);</div><div class='del'>-		g_list_free (ctxt-&gt;locals);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;changed != NULL)</div><div class='del'>-		cal_client_change_list_free (ctxt-&gt;changed);</div><div class='del'>-	</div><div class='del'>-	if (ctxt-&gt;map != NULL)</div><div class='del'>-		e_pilot_map_destroy (ctxt-&gt;map);</div><div class='del'>-</div><div class='del'>-	g_free (ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug routines */</div><div class='del'>-static char *</div><div class='del'>-print_local (EToDoLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;todo &amp;&amp; local-&gt;todo-&gt;description) {</div><div class='del'>-		g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",</div><div class='del'>-			    local-&gt;todo-&gt;indefinite,</div><div class='del'>-			    mktime (&amp; local-&gt;todo-&gt;due),</div><div class='del'>-			    local-&gt;todo-&gt;priority,</div><div class='del'>-			    local-&gt;todo-&gt;complete,</div><div class='del'>-			    local-&gt;todo-&gt;description ?</div><div class='del'>-			    local-&gt;todo-&gt;description : "",</div><div class='del'>-			    local-&gt;todo-&gt;note ?</div><div class='del'>-			    local-&gt;todo-&gt;note : "");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct ToDo todo;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;todo, 0, sizeof (struct ToDo));</div><div class='del'>-	unpack_ToDo (&amp;todo, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s']",</div><div class='del'>-		    todo.indefinite,</div><div class='del'>-		    mktime (&amp;todo.due),</div><div class='del'>-		    todo.priority,</div><div class='del'>-		    todo.complete,</div><div class='del'>-		    todo.description ?</div><div class='del'>-		    todo.description : "",</div><div class='del'>-		    todo.note ?</div><div class='del'>-		    todo.note : "");</div><div class='del'>-</div><div class='del'>-	free_ToDo (&amp;todo);</div><div class='del'>-	</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Calendar Server routines */</div><div class='del'>-static void</div><div class='del'>-start_calendar_server_cb (CalClient *cal_client,</div><div class='del'>-			  CalClientOpenStatus status,</div><div class='del'>-			  gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *success = data;</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_OPEN_SUCCESS) {</div><div class='del'>-		*success = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		*success = FALSE;</div><div class='del'>-		WARN ("Failed to open calendar!\n");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gboolean success = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ctxt != NULL, -2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ctxt-&gt;client), "cal_opened",</div><div class='del'>-			    start_calendar_server_cb, &amp;success);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_open_default_tasks (ctxt-&gt;client,  FALSE))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-	</div><div class='del'>-	if (success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static icaltimezone *</div><div class='del'>-get_timezone (CalClient *client, const char *tzid) </div><div class='del'>-{</div><div class='del'>-	icaltimezone *timezone = NULL;</div><div class='del'>-</div><div class='del'>-	timezone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-	if (timezone == NULL)</div><div class='del'>-		 cal_client_get_timezone (client, tzid, &amp;timezone);</div><div class='del'>-	</div><div class='del'>-	return timezone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icaltimezone *</div><div class='del'>-get_default_timezone (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	icaltimezone *timezone = NULL;</div><div class='del'>-	char *location;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	location = bonobo_config_get_string_with_default (db,</div><div class='del'>-		"/Calendar/Display/Timezone", "UTC", NULL);</div><div class='del'>-	if (!location || !location[0]) {</div><div class='del'>-		g_free (location);</div><div class='del'>-		location = g_strdup ("UTC");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	timezone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	g_free (location);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	return timezone;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-map_name (EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Tasks/pilot-map-todo-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_empty_time (struct tm time) </div><div class='del'>-{</div><div class='del'>-	if (time.tm_sec || time.tm_min || time.tm_hour </div><div class='del'>-	    || time.tm_mday || time.tm_mon || time.tm_year) </div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-next_changed_item (EToDoConduitContext *ctxt, GList *changes) </div><div class='del'>-{</div><div class='del'>-	CalClientChange *ccc;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = changes; l != NULL; l = l-&gt;next) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		ccc = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-		if (g_hash_table_lookup (ctxt-&gt;changed_hash, uid))</div><div class='del'>-			return l;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalClientChange *ccc;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-</div><div class='del'>-	ccc = g_hash_table_lookup (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-	if (ccc == NULL) {</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (ccc-&gt;type) {</div><div class='del'>-	case CAL_CLIENT_CHANGE_ADDED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNew;</div><div class='del'>-		break;	</div><div class='del'>-	case CAL_CLIENT_CHANGE_MODIFIED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordModified;</div><div class='del'>-		break;</div><div class='del'>-	case CAL_CLIENT_CHANGE_DELETED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordDeleted;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord</div><div class='del'>-local_record_to_pilot_record (EToDoLocalRecord *local,</div><div class='del'>-			      EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord p;</div><div class='del'>-	static char record[0xffff];</div><div class='del'>-</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-	g_assert (local-&gt;todo != NULL );</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_to_pilot_record\n");</div><div class='del'>-</div><div class='del'>-	p.ID = local-&gt;local.ID;</div><div class='del'>-	p.category = local-&gt;local.category;</div><div class='del'>-	p.attr = local-&gt;local.attr;</div><div class='del'>-	p.archived = local-&gt;local.archived;</div><div class='del'>-	p.secret = local-&gt;local.secret;</div><div class='del'>-</div><div class='del'>-	/* Generate pilot record structure */</div><div class='del'>-	p.record = record;</div><div class='del'>-	p.length = pack_ToDo (local-&gt;todo, p.record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * converts a CalComponent object to a EToDoLocalRecord</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int *priority;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	GSList *d_list = NULL;</div><div class='del'>-	CalComponentText *description;</div><div class='del'>-	CalComponentDateTime due;</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-	icaltimezone *default_tz = get_default_timezone ();</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_from_comp\n");</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, uid, TRUE);</div><div class='del'>-</div><div class='del'>-	compute_status (ctxt, local, uid);</div><div class='del'>-</div><div class='del'>-	local-&gt;todo = g_new0 (struct ToDo,1);</div><div class='del'>-</div><div class='del'>-	/* Don't overwrite the category */</div><div class='del'>-	if (local-&gt;local.ID != 0) {</div><div class='del'>-		char record[0xffff];</div><div class='del'>-		int cat = 0;</div><div class='del'>-		</div><div class='del'>-		if (dlp_ReadRecordById (ctxt-&gt;dbi-&gt;pilot_socket, </div><div class='del'>-					ctxt-&gt;dbi-&gt;db_handle,</div><div class='del'>-					local-&gt;local.ID, &amp;record, </div><div class='del'>-					NULL, NULL, NULL, &amp;cat) &gt; 0) {</div><div class='del'>-			local-&gt;local.category = cat;			</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* STOP: don't replace these with g_strdup, since free_ToDo</div><div class='del'>-	   uses free to deallocate */</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value) </div><div class='del'>-		local-&gt;todo-&gt;description = e_pilot_utf8_to_pchar (summary.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;d_list);</div><div class='del'>-	if (d_list) {</div><div class='del'>-		description = (CalComponentText *) d_list-&gt;data;</div><div class='del'>-		if (description &amp;&amp; description-&gt;value)</div><div class='del'>-			local-&gt;todo-&gt;note = e_pilot_utf8_to_pchar (description-&gt;value);</div><div class='del'>-		else</div><div class='del'>-			local-&gt;todo-&gt;note = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;todo-&gt;note = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;due);	</div><div class='del'>-	if (due.value) {</div><div class='del'>-		icaltimezone_convert_time (due.value,</div><div class='del'>-					   get_timezone (ctxt-&gt;client, due.tzid),</div><div class='del'>-					   default_tz);</div><div class='del'>-		local-&gt;todo-&gt;due = icaltimetype_to_tm (due.value);</div><div class='del'>-		local-&gt;todo-&gt;indefinite = 0;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;todo-&gt;indefinite = 1;</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;due);	</div><div class='del'>-</div><div class='del'>-	cal_component_get_status (comp, &amp;status);	</div><div class='del'>-	if (status == ICAL_STATUS_COMPLETED)</div><div class='del'>-		local-&gt;todo-&gt;complete = 1;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;todo-&gt;complete = 0;</div><div class='del'>-	</div><div class='del'>-	cal_component_get_priority (comp, &amp;priority);</div><div class='del'>-	if (priority &amp;&amp; *priority != 0) {</div><div class='del'>-		if (*priority &lt;= 3)</div><div class='del'>-			local-&gt;todo-&gt;priority = 1;</div><div class='del'>-		else if (*priority == 4)</div><div class='del'>-			local-&gt;todo-&gt;priority = 2;</div><div class='del'>-		else if (*priority == 5)</div><div class='del'>-			local-&gt;todo-&gt;priority = 3;</div><div class='del'>-		else if (*priority &lt;= 7)</div><div class='del'>-			local-&gt;todo-&gt;priority = 4;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;todo-&gt;priority = 5;</div><div class='del'>-		</div><div class='del'>-		cal_component_free_priority (priority);</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;todo-&gt;priority = ctxt-&gt;cfg-&gt;priority;</div><div class='del'>-	}	</div><div class='del'>-	</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)</div><div class='del'>-		local-&gt;local.secret = 1;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;local.secret = 0;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (EToDoLocalRecord *local,</div><div class='del'>-		       const char *uid,</div><div class='del'>-		       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (ctxt-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-		cal_component_set_uid (comp, uid);</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 CalComponent *in_comp,</div><div class='del'>-			 icaltimezone *timezone)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct ToDo todo;</div><div class='del'>-	CalComponentText summary = {NULL, NULL};</div><div class='del'>-	CalComponentDateTime dt = {NULL, icaltimezone_get_tzid (timezone)};</div><div class='del'>-	struct icaltimetype due, now;</div><div class='del'>-	icaltimezone *utc_zone;</div><div class='del'>-	int priority;</div><div class='del'>-	char *txt;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	memset (&amp;todo, 0, sizeof (struct ToDo));</div><div class='del'>-	unpack_ToDo (&amp;todo, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	now = icaltime_from_timet_with_zone (time (NULL), FALSE, </div><div class='del'>-					     utc_zone);</div><div class='del'>-</div><div class='del'>-	if (in_comp == NULL) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-		cal_component_set_created (comp, &amp;now);</div><div class='del'>-	} else {</div><div class='del'>-		comp = cal_component_clone (in_comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_last_modified (comp, &amp;now);</div><div class='del'>-</div><div class='del'>-	summary.value = txt = e_pilot_utf8_from_pchar (todo.description);</div><div class='del'>-	cal_component_set_summary (comp, &amp;summary);</div><div class='del'>-	free (txt);</div><div class='del'>-	</div><div class='del'>-	/* The iCal description field */</div><div class='del'>-	if (!todo.note) {</div><div class='del'>-		cal_component_set_comment_list (comp, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		GSList l;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = txt = e_pilot_utf8_from_pchar (todo.note);</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-		l.data = &amp;text;</div><div class='del'>-		l.next = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_description_list (comp, &amp;l);</div><div class='del'>-		free (txt);</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	if (todo.complete) {</div><div class='del'>-		int percent = 100;</div><div class='del'>-</div><div class='del'>-		cal_component_set_completed (comp, &amp;now);</div><div class='del'>-		cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);</div><div class='del'>-	} else {</div><div class='del'>-		int *percent = NULL;</div><div class='del'>-		icalproperty_status status;</div><div class='del'>-		</div><div class='del'>-		cal_component_set_completed (comp, NULL);</div><div class='del'>-		</div><div class='del'>-		cal_component_get_percent (comp, &amp;percent);</div><div class='del'>-		if (percent == NULL || *percent == 100) {</div><div class='del'>-			int p = 0;</div><div class='del'>-			cal_component_set_percent (comp, &amp;p);</div><div class='del'>-		}</div><div class='del'>-		if (percent != NULL)</div><div class='del'>-			cal_component_free_percent (percent);</div><div class='del'>-</div><div class='del'>-		cal_component_get_status (comp, &amp;status);</div><div class='del'>-		if (status == ICAL_STATUS_COMPLETED)</div><div class='del'>-			cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!is_empty_time (todo.due)) {</div><div class='del'>-		due = tm_to_icaltimetype (&amp;todo.due, FALSE);</div><div class='del'>-		dt.value = &amp;due;</div><div class='del'>-		cal_component_set_due (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (todo.priority) {</div><div class='del'>-	case 1:</div><div class='del'>-		priority = 3;</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		priority = 4;</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		priority = 5;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		priority = 7;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		priority = 9;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_set_priority (comp, &amp;priority);</div><div class='del'>-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);</div><div class='del'>-	else</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-	</div><div class='del'>-	free_ToDo(&amp;todo);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,</div><div class='del'>-	     EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (conduit != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	success = cal_client_update_object (ctxt-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-	if (!success)</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-	int map_count;</div><div class='del'>-	const char *uri;</div><div class='del'>-	</div><div class='del'>-	/* If there are no objects or objects but no log */</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);</div><div class='del'>-	if (map_count == 0)</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Or if the URI's don't match */</div><div class='del'>-	uri = cal_client_get_uri (ctxt-&gt;client);</div><div class='del'>-	LOG("  Current URI %s (%s)\n", uri, ctxt-&gt;cfg-&gt;last_uri ? ctxt-&gt;cfg-&gt;last_uri : "&lt;NONE&gt;");</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;last_uri != NULL &amp;&amp; strcmp (ctxt-&gt;cfg-&gt;last_uri, uri)) {</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);</div><div class='del'>-		e_pilot_map_clear (ctxt-&gt;map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-	GList *l;</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename, *change_id;</div><div class='del'>-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;dbi = dbi;	</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-	</div><div class='del'>-	if (start_calendar_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the timezone */</div><div class='del'>-	ctxt-&gt;timezone = get_default_timezone ();</div><div class='del'>-	if (ctxt-&gt;timezone == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	LOG ("  Using timezone: %s", icaltimezone_get_tzid (ctxt-&gt;timezone));</div><div class='del'>-</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id map */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Get the local database */</div><div class='del'>-	ctxt-&gt;uids = cal_client_get_uids (ctxt-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	/* Count and hash the changes */</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	ctxt-&gt;changed = cal_client_get_changes (ctxt-&gt;client, CALOBJ_TYPE_TODO, change_id);</div><div class='del'>-	ctxt-&gt;changed_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	</div><div class='del'>-	for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalClientChange *ccc = l-&gt;data;</div><div class='del'>-		const char *uid;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_uid (ccc-&gt;comp, &amp;uid);</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, uid)) {</div><div class='del'>-			</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, g_strdup (uid), ccc);</div><div class='del'>-			</div><div class='del'>-			switch (ccc-&gt;type) {</div><div class='del'>-			case CAL_CLIENT_CHANGE_ADDED:</div><div class='del'>-				add_records++;</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_CHANGE_MODIFIED:</div><div class='del'>-				mod_records++;</div><div class='del'>-				break;</div><div class='del'>-			case CAL_CLIENT_CHANGE_DELETED:</div><div class='del'>-				del_records++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if (ccc-&gt;type == CAL_CLIENT_CHANGE_DELETED) {</div><div class='del'>-			e_pilot_map_remove_by_uid (ctxt-&gt;map, uid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the count information */</div><div class='del'>-	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's ToDo application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's ToDo application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_ToDoAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-	if (ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyToPilot</div><div class='del'>-	    || ctxt-&gt;cfg-&gt;sync_type == GnomePilotConduitSyncTypeCopyFromPilot)</div><div class='del'>-		ctxt-&gt;map-&gt;write_touched_only = TRUE;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *changed;</div><div class='del'>-	gchar *filename, *change_id;</div><div class='del'>-</div><div class='del'>-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	g_free (ctxt-&gt;cfg-&gt;last_uri);</div><div class='del'>-	ctxt-&gt;cfg-&gt;last_uri = g_strdup (cal_client_get_uri (ctxt-&gt;client));</div><div class='del'>-	todoconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-	</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* FIX ME ugly hack - our changes musn't count, this does introduce</div><div class='del'>-	 * a race condition if anyone changes a record elsewhere during sycnc</div><div class='del'>-         */</div><div class='del'>-	change_id = g_strdup_printf ("pilot-sync-evolution-todo-%d", ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-	changed = cal_client_get_changes (ctxt-&gt;client, CALOBJ_TYPE_TODO, change_id);</div><div class='del'>-	cal_client_change_list_free (changed);</div><div class='del'>-	g_free (change_id);</div><div class='del'>-	</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EToDoLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    EToDoLocalRecord *local,</div><div class='del'>-		    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  EToDoLocalRecord **local,</div><div class='del'>-	  EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *uids, *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		uids = ctxt-&gt;uids;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (uids != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (uids));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, uids-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-			</div><div class='del'>-			iterator = uids;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, iterator-&gt;data, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   EToDoLocalRecord **local,</div><div class='del'>-		   EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("for_each_modified beginning\n");</div><div class='del'>-		</div><div class='del'>-		iterator = ctxt-&gt;changed;</div><div class='del'>-		</div><div class='del'>-		count = 0;</div><div class='del'>-	</div><div class='del'>-		LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-		</div><div class='del'>-		iterator = next_changed_item (ctxt, iterator);</div><div class='del'>-		if (iterator != NULL) {</div><div class='del'>-			CalClientChange *ccc = iterator-&gt;data;</div><div class='del'>-		</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_comp (*local, ccc-&gt;comp, ctxt);</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		iterator = g_list_next (iterator);</div><div class='del'>-		if (iterator &amp;&amp; (iterator = next_changed_item (ctxt, iterator))) {</div><div class='del'>-			CalClientChange *ccc = iterator-&gt;data;</div><div class='del'>-			</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_comp (*local, ccc-&gt;comp, ctxt);			</div><div class='del'>-			g_list_prepend (ctxt-&gt;locals, *local);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each_modified ending");</div><div class='del'>-</div><div class='del'>-			/* Signal the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EToDoLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	GnomePilotRecord local_pilot;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail (remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	local_pilot = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot.length</div><div class='del'>-	    || memcmp (local_pilot.record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	comp = comp_from_remote_record (conduit, remote, NULL, ctxt-&gt;timezone);</div><div class='del'>-	update_comp (conduit, comp, ctxt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EToDoLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	new_comp = comp_from_remote_record (conduit, remote, local-&gt;comp, ctxt-&gt;timezone);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	local-&gt;comp = new_comp;</div><div class='del'>-	update_comp (conduit, local-&gt;comp, ctxt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       EToDoLocalRecord *local,</div><div class='del'>-	       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (local-&gt;comp != NULL, -1);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	LOG ("delete_record: deleting %s\n", uid);</div><div class='del'>-</div><div class='del'>-	e_pilot_map_remove_by_uid (ctxt-&gt;map, uid);</div><div class='del'>-	cal_client_remove_object (ctxt-&gt;client, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EToDoLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, local-&gt;local.ID, uid, archive);</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       EToDoLocalRecord **local,</div><div class='del'>-       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*local = NULL;</div><div class='del'>-	uid = e_pilot_map_lookup_uid (ctxt-&gt;map, remote-&gt;ID, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (!uid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	LOG ("  matched\n");</div><div class='del'>-	</div><div class='del'>-	*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-	local_record_from_uid (*local, uid, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    EToDoLocalRecord *local,</div><div class='del'>-	    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	todoconduit_destroy_record (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EToDoLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-	*remote = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot Settings Callbacks */</div><div class='del'>-static void</div><div class='del'>-fill_widgets (EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	e_pilot_settings_set_secret (E_PILOT_SETTINGS (ctxt-&gt;ps),</div><div class='del'>-				     ctxt-&gt;cfg-&gt;secret);</div><div class='del'>-</div><div class='del'>-	e_todo_gui_fill_widgets (ctxt-&gt;gui, ctxt-&gt;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-create_settings_window (GnomePilotConduit *conduit,</div><div class='del'>-			GtkWidget *parent,</div><div class='del'>-			EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("create_settings_window");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ps = e_pilot_settings_new ();</div><div class='del'>-	ctxt-&gt;gui = e_todo_gui_new (E_PILOT_SETTINGS (ctxt-&gt;ps));</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (parent), ctxt-&gt;ps);</div><div class='del'>-	gtk_widget_show (ctxt-&gt;ps);</div><div class='del'>-</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-display_settings (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("display_settings");</div><div class='del'>-	</div><div class='del'>-	fill_widgets (ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_settings    (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("save_settings");</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;new_cfg-&gt;secret = e_pilot_settings_get_secret (E_PILOT_SETTINGS (ctxt-&gt;ps));</div><div class='del'>-	e_todo_gui_fill_config (ctxt-&gt;gui, ctxt-&gt;new_cfg);</div><div class='del'>-	</div><div class='del'>-	todoconduit_save_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-revert_settings  (GnomePilotConduit *conduit, EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("revert_settings");</div><div class='del'>-</div><div class='del'>-	todoconduit_save_configuration (ctxt-&gt;cfg);</div><div class='del'>-	todoconduit_destroy_configuration (ctxt-&gt;new_cfg);</div><div class='del'>-	ctxt-&gt;new_cfg = todoconduit_dupe_configuration (ctxt-&gt;cfg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	EToDoConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in todo's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	ctxt = e_todo_context_new (pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-</div><div class='del'>-	/* Gui Settings */</div><div class='del'>-	gtk_signal_connect (retval, "create_settings_window", (GtkSignalFunc) create_settings_window, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "display_settings", (GtkSignalFunc) display_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "save_settings", (GtkSignalFunc) save_settings, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "revert_settings", (GtkSignalFunc) revert_settings, ctxt);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{ </div><div class='del'>-	GtkObject *obj = GTK_OBJECT (conduit);</div><div class='del'>-	EToDoConduitContext *ctxt;</div><div class='del'>-	</div><div class='del'>-	ctxt = gtk_object_get_data (obj, "todoconduit_context");</div><div class='del'>-	e_todo_context_destroy (ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (obj);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore<br/>deleted file mode 100644<br/>index cd98cc234e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-_libs</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-evolution-calendar</div><div class='del'>-evolution-calendar.pure</div><div class='del'>-evolution-calendar.h</div><div class='del'>-evolution-calendar-common.c</div><div class='del'>-evolution-calendar-skels.c</div><div class='del'>-evolution-calendar-stubs.c</div><div class='del'>-*.lo</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='del'>-Evolution-Composer-common.c</div><div class='del'>-Evolution-Composer-skels.c</div><div class='del'>-Evolution-Composer-stubs.c</div><div class='del'>-Evolution-Composer.h</div><div class='del'>-GNOME_Evolution_Calendar_Control.oaf</div><div class='del'>-GNOME_Evolution_Calendar.oaf</div><div class='del'>-GNOME_Evolution_Calendar_gnomecal.oaf</div><div class='head'>diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in<br/>deleted file mode 100644<br/>index ce53fba7e6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/GNOME_Evolution_Calendar.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,200 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iTip_Control"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       _value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ShellComponent"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/ShellComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               _value="Evolution component for handling the calendar."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME:ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			_value="Factory for the Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Summary_Component"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Calendar_Summary_ComponentFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Evolution calendar executive summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the sample Calendar control"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Control"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Calendar_ControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:BonoboControl/calendar-control:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PropertyBag:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               _value="A sample Bonobo control which displays an calendar."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Tasks_ControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the Evolution Tasks control"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Tasks_Control"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Tasks_ControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:BonoboControl/tasks-control:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PropertyBag:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               _value="A Bonobo control which displays a task list."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory to create a component editor factory"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Calendar/CompEditorFactory:1.0"/&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Unknown:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory to centralize calendar component editor dialogs"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ConfigControl"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/ConfigControl:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:title" type="string"</div><div class='del'>-		       _value="Calendar and Tasks"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:description" type="string"</div><div class='del'>-		       _value="This page can be used to configure Calendar and Task preferences"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:icon_name" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:type" type="stringv"&gt;</div><div class='del'>-		&lt;item value="calendar"/&gt;</div><div class='del'>-		&lt;item value="tasks"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:config_item:priority" type="string" value="-7"/&gt;</div><div class='del'>-    </div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       _value="Configuration control for the Evolution Calendar."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am<br/>deleted file mode 100644<br/>index 20e2207907..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,213 +0,0 @@</div><div class='del'>-## CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS =												   	\</div><div class='del'>-	$(top_srcdir)/composer/Evolution-Composer.idl						  	\</div><div class='del'>-	$(top_srcdir)/calendar/idl/evolution-calendar.idl						\</div><div class='del'>-	$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED =                 			\</div><div class='del'>-        Evolution-Composer.h              		\</div><div class='del'>-        Evolution-Composer-common.c       		\</div><div class='del'>-        Evolution-Composer-skels.c        		\</div><div class='del'>-        Evolution-Composer-stubs.c			\</div><div class='del'>-	Evolution-Addressbook-SelectNames.h		\</div><div class='del'>-	Evolution-Addressbook-SelectNames-common.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-skels.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-stubs.c	\</div><div class='del'>-	evolution-calendar.h				\</div><div class='del'>-	evolution-calendar-common.c			\</div><div class='del'>-	evolution-calendar-skels.c			\</div><div class='del'>-	evolution-calendar-stubs.c</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \</div><div class='del'>-                $(srcdir)/../../composer/Evolution-Composer.idl</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \</div><div class='del'>-                $(top_srcdir)/calendar/idl/evolution-calendar.idl</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \</div><div class='del'>-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-</div><div class='del'>-SUBDIRS = alarm-notify dialogs</div><div class='del'>-</div><div class='del'>-help_base = $(datadir)/gnome/help/cal</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS = evolution-calendar</div><div class='del'>-</div><div class='del'>-INCLUDES = 							\</div><div class='del'>-	-DG_LOG_DOMAIN=\"calendar-gui\"				\</div><div class='del'>-	-I$(top_builddir)/shell					\</div><div class='del'>-	-I$(top_srcdir)/shell					\</div><div class='del'>-	-I$(top_srcdir)						\</div><div class='del'>-	-I$(top_srcdir)/calendar				\</div><div class='del'>-	-I$(top_srcdir)/calendar/cal-client			\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client			\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical			\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical			\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend/ebook		\</div><div class='del'>-	-I$(top_srcdir)/widgets					\</div><div class='del'>-	-I$(includedir)						\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\</div><div class='del'>-        -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"        	\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-iconsdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = 					\</div><div class='del'>-	e-itip-control.glade			\</div><div class='del'>-	goto-dialog.glade</div><div class='del'>-</div><div class='del'>-etspecdir = $(datadir)/evolution/etspec/</div><div class='del'>-etspec_DATA = e-calendar-table.etspec e-meeting-time-sel.etspec</div><div class='del'>-</div><div class='del'>-evolution_calendar_SOURCES =			\</div><div class='del'>-	$(IDL_GENERATED)			\</div><div class='del'>-	cal-search-bar.c			\</div><div class='del'>-	cal-search-bar.h			\</div><div class='del'>-	calendar-config.c			\</div><div class='del'>-	calendar-config.h			\</div><div class='del'>-	calendar-commands.c			\</div><div class='del'>-	calendar-commands.h			\</div><div class='del'>-	calendar-model.c			\</div><div class='del'>-	calendar-model.h			\</div><div class='del'>-	calendar-offline-handler.c		\</div><div class='del'>-	calendar-offline-handler.h		\</div><div class='del'>-	calendar-view.c				\</div><div class='del'>-	calendar-view.h				\</div><div class='del'>-	calendar-view-factory.c			\</div><div class='del'>-	calendar-view-factory.h			\</div><div class='del'>-	comp-editor-factory.c			\</div><div class='del'>-	comp-editor-factory.h			\</div><div class='del'>-	comp-util.c				\</div><div class='del'>-	comp-util.h				\</div><div class='del'>-	config-control-factory.c		\</div><div class='del'>-	config-control-factory.h		\</div><div class='del'>-	control-factory.c			\</div><div class='del'>-	control-factory.h			\</div><div class='del'>-	component-factory.c			\</div><div class='del'>-	component-factory.h			\</div><div class='del'>-	e-calendar-table.h			\</div><div class='del'>-	e-calendar-table.c			\</div><div class='del'>-	e-cell-date-edit-text.h			\</div><div class='del'>-	e-cell-date-edit-text.c			\</div><div class='del'>-	e-day-view-layout.c			\</div><div class='del'>-	e-day-view-layout.h			\</div><div class='del'>-	e-day-view-main-item.c			\</div><div class='del'>-	e-day-view-main-item.h			\</div><div class='del'>-	e-day-view-time-item.c			\</div><div class='del'>-	e-day-view-time-item.h			\</div><div class='del'>-	e-day-view-top-item.c			\</div><div class='del'>-	e-day-view-top-item.h			\</div><div class='del'>-	e-day-view.c				\</div><div class='del'>-	e-day-view.h				\</div><div class='del'>-	e-itip-control.h			\</div><div class='del'>-	e-itip-control.c			\</div><div class='del'>-	e-meeting-attendee.c			\</div><div class='del'>-	e-meeting-attendee.h			\</div><div class='del'>-	e-meeting-model.c			\</div><div class='del'>-	e-meeting-model.h			\</div><div class='del'>-	e-meeting-time-sel.c			\</div><div class='del'>-	e-meeting-time-sel.h			\</div><div class='del'>-	e-meeting-time-sel-item.c		\</div><div class='del'>-	e-meeting-time-sel-item.h		\</div><div class='del'>-	e-meeting-types.h			\</div><div class='del'>-	e-meeting-utils.c			\</div><div class='del'>-	e-meeting-utils.h			\</div><div class='del'>-	e-week-view-event-item.c		\</div><div class='del'>-	e-week-view-event-item.h		\</div><div class='del'>-	e-week-view-layout.c			\</div><div class='del'>-	e-week-view-layout.h			\</div><div class='del'>-	e-week-view-main-item.c			\</div><div class='del'>-	e-week-view-main-item.h			\</div><div class='del'>-	e-week-view-titles-item.c		\</div><div class='del'>-	e-week-view-titles-item.h		\</div><div class='del'>-	e-week-view.c				\</div><div class='del'>-	e-week-view.h				\</div><div class='del'>-	e-tasks.c				\</div><div class='del'>-	e-tasks.h				\</div><div class='del'>-	e-timezone-entry.c			\</div><div class='del'>-	e-timezone-entry.h			\</div><div class='del'>-	gnome-cal.c				\</div><div class='del'>-	gnome-cal.h				\</div><div class='del'>-	goto.c					\</div><div class='del'>-	goto.h					\</div><div class='del'>-	itip-control-factory.c			\</div><div class='del'>-	itip-control-factory.h			\</div><div class='del'>-	itip-utils.c				\</div><div class='del'>-	itip-utils.h				\</div><div class='del'>-	main.c					\</div><div class='del'>-	misc.c					\</div><div class='del'>-	misc.h					\</div><div class='del'>-	print.c					\</div><div class='del'>-	print.h					\</div><div class='del'>-	tag-calendar.c				\</div><div class='del'>-	tag-calendar.h				\</div><div class='del'>-	tasks-control-factory.c			\</div><div class='del'>-	tasks-control-factory.h			\</div><div class='del'>-	tasks-control.c				\</div><div class='del'>-	tasks-control.h				\</div><div class='del'>-	tasks-migrate.c				\</div><div class='del'>-	tasks-migrate.h				\</div><div class='del'>-	weekday-picker.c			\</div><div class='del'>-	weekday-picker.h</div><div class='del'>-</div><div class='del'>-evolution_calendar_LDADD =								\</div><div class='del'>-	alarm-notify/libalarm.a								\</div><div class='del'>-	$(DB3_LDADD)									\</div><div class='del'>-	$(top_builddir)/widgets/menus/libmenus.la					\</div><div class='del'>-	$(top_builddir)/shell/libeshell.la						\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client.la				\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util.la				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la						\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-evolution.la			\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat.la						\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la				\</div><div class='del'>-	$(top_builddir)/camel/libcamel.la						\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a						\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la					\</div><div class='del'>-	dialogs/libcal-dialogs.a							\</div><div class='del'>-	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a			\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a					\</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)</div><div class='del'>-</div><div class='del'>-evolution_calendar_LDFLAGS = -export-dynamic</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = \</div><div class='del'>-	GNOME_Evolution_Calendar.oaf.in</div><div class='del'>-</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =	 			\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	$(etspec_DATA)			\</div><div class='del'>-	$(oaf_in_files)</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C</div><div class='del'>-	$(mkinstalldirs) $(Conduitsdir)</div><div class='del'>-</div><div class='del'>-if ENABLE_PURIFY</div><div class='del'>-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-all-local: evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-evolution-calendar.pure: evolution-calendar</div><div class='del'>-	@rm -f evolution-calendar.pure</div><div class='del'>-	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)</div><div class='del'>-</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/calendar/gui/alarm-notify/.cvsignore b/calendar/gui/alarm-notify/.cvsignore<br/>deleted file mode 100644<br/>index 479589e914..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-evolution-calendar-stubs.c</div><div class='del'>-evolution-calendar-skels.c</div><div class='del'>-evolution-calendar-common.c</div><div class='del'>-evolution-calendar.h</div><div class='del'>-evolution-alarm-notify</div><div class='del'>-GNOME_Evolution_Calendar_AlarmNotify.oaf</div><div class='head'>diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in<br/>deleted file mode 100644<br/>index 86f5c71493..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-alarm-notify"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory for the alarm notification service"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Alarm notification service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am<br/>deleted file mode 100644<br/>index 6d77398ade..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-CORBA_GENERATED =				\</div><div class='del'>-	evolution-calendar.h			\</div><div class='del'>-	evolution-calendar-common.c		\</div><div class='del'>-	evolution-calendar-skels.c		\</div><div class='del'>-	evolution-calendar-stubs.c</div><div class='del'>-</div><div class='del'>-idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl</div><div class='del'>-</div><div class='del'>-$(CORBA_GENERATED): $(idls)</div><div class='del'>-	$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS = evolution-alarm-notify</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libalarm.a</div><div class='del'>-</div><div class='del'>-libalarm_a_SOURCES =	\</div><div class='del'>-	alarm.c		\</div><div class='del'>-	alarm.h</div><div class='del'>-</div><div class='del'>-INCLUDES = 						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-alarm-notify\"	\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_builddir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/widgets				\</div><div class='del'>-	-I$(includedir)					\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-iconsdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA =		\</div><div class='del'>-	alarm-notify.glade</div><div class='del'>-</div><div class='del'>-evolution_alarm_notify_SOURCES =	\</div><div class='del'>-	$(CORBA_GENERATED)		\</div><div class='del'>-	alarm-notify.c			\</div><div class='del'>-	alarm-notify.h			\</div><div class='del'>-	alarm-notify-dialog.c		\</div><div class='del'>-	alarm-notify-dialog.h		\</div><div class='del'>-	alarm-queue.c			\</div><div class='del'>-	alarm-queue.h			\</div><div class='del'>-	config-data.c			\</div><div class='del'>-	config-data.h			\</div><div class='del'>-	notify-main.c			\</div><div class='del'>-	save.c				\</div><div class='del'>-	save.h</div><div class='del'>-</div><div class='del'>-evolution_alarm_notify_LDADD =						\</div><div class='del'>-	libalarm.a							\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client.la		\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util.la		\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-evolution.la	\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat.la				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la				\</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)</div><div class='del'>-</div><div class='del'>-evolution_alarm_notify_LDFLAGS = -export-dynamic</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = \</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify.oaf.in</div><div class='del'>-</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =		\</div><div class='del'>-	$(oaf_DATA)	\</div><div class='del'>-	$(oaf_in_files)	\</div><div class='del'>-	$(glade_DATA)</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c<br/>deleted file mode 100644<br/>index 2ad6783cf9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-notify-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,412 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-winhints.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-window-icon.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "alarm-notify-dialog.h"</div><div class='del'>-#include "config-data.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow);</div><div class='del'>-</div><div class='del'>-/* The useful contents of the alarm notify dialog */</div><div class='del'>-typedef struct {</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *close;</div><div class='del'>-	GtkWidget *snooze;</div><div class='del'>-	GtkWidget *edit;</div><div class='del'>-	GtkWidget *heading;</div><div class='del'>-	GtkWidget *message;</div><div class='del'>-	GtkWidget *snooze_time;</div><div class='del'>-	GtkWidget *html;</div><div class='del'>-</div><div class='del'>-	AlarmNotifyFunc func;</div><div class='del'>-	gpointer func_data;</div><div class='del'>-} AlarmNotify;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the notify dialog is destroyed */</div><div class='del'>-static void</div><div class='del'>-dialog_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = data;</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (an-&gt;xml));</div><div class='del'>-	g_free (an);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Delete_event handler for the alarm notify dialog */</div><div class='del'>-static gint</div><div class='del'>-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = data;</div><div class='del'>-	g_assert (an-&gt;func != NULL);</div><div class='del'>-</div><div class='del'>-	(* an-&gt;func) (ALARM_NOTIFY_CLOSE, -1, an-&gt;func_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (widget);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the close button */</div><div class='del'>-static void</div><div class='del'>-close_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = data;</div><div class='del'>-	g_assert (an-&gt;func != NULL);</div><div class='del'>-</div><div class='del'>-	(* an-&gt;func) (ALARM_NOTIFY_CLOSE, -1, an-&gt;func_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (an-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the snooze button */</div><div class='del'>-static void</div><div class='del'>-snooze_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	int snooze_time;</div><div class='del'>-</div><div class='del'>-	an = data;</div><div class='del'>-	g_assert (an-&gt;func != NULL);</div><div class='del'>-</div><div class='del'>-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an-&gt;snooze_time));</div><div class='del'>-	(* an-&gt;func) (ALARM_NOTIFY_SNOOZE, snooze_time, an-&gt;func_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (an-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the edit button */</div><div class='del'>-static void</div><div class='del'>-edit_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = data;</div><div class='del'>-	g_assert (an-&gt;func != NULL);</div><div class='del'>-</div><div class='del'>-	(* an-&gt;func) (ALARM_NOTIFY_EDIT, -1, an-&gt;func_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (an-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointer data)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (!strncmp ("file:///", url, strlen ("file:///"))) {</div><div class='del'>-		FILE *fp;</div><div class='del'>-		const char *filename = url + strlen ("file://");</div><div class='del'>-		char buf[4096];</div><div class='del'>-		size_t len;</div><div class='del'>-</div><div class='del'>-		fp = fopen (filename, "r");</div><div class='del'>-</div><div class='del'>-		if (fp == NULL) {</div><div class='del'>-			g_warning ("Error opening image: %s\n", url);</div><div class='del'>-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while ((len = fread (buf, 1, sizeof(buf), fp)) &gt; 0)</div><div class='del'>-			gtk_html_stream_write (stream, buf, len);</div><div class='del'>-</div><div class='del'>-		if (feof (fp)) {</div><div class='del'>-			fclose (fp);</div><div class='del'>-			gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fclose (fp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning ("Error loading image");</div><div class='del'>-	gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-make_html_display (gchar *widget_name, char *s1, char *s2, int scroll, int shadow)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *html, *frame;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual(gdk_rgb_get_visual());</div><div class='del'>-	gtk_widget_push_colormap(gdk_rgb_get_cmap());</div><div class='del'>-</div><div class='del'>-	html = gtk_html_new();</div><div class='del'>-</div><div class='del'>-	gtk_html_set_default_content_type (GTK_HTML (html),</div><div class='del'>-					   "charset=utf-8");</div><div class='del'>-	gtk_html_load_empty (GTK_HTML (html));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (html), "url_requested",</div><div class='del'>-			    GTK_SIGNAL_FUNC (url_requested_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_pop_colormap();</div><div class='del'>-	gtk_widget_pop_visual();</div><div class='del'>-</div><div class='del'>-	frame = e_scroll_frame_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	e_scroll_frame_set_policy(E_SCROLL_FRAME(frame),</div><div class='del'>-				  GTK_POLICY_AUTOMATIC,</div><div class='del'>-				  GTK_POLICY_AUTOMATIC);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (frame),</div><div class='del'>-					GTK_SHADOW_IN);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (frame, 300, 200);</div><div class='del'>-</div><div class='del'>-	gtk_container_add(GTK_CONTAINER (frame), html);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(frame);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_user_data(GTK_OBJECT (frame), html);</div><div class='del'>-	return frame;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-write_times (GtkHTMLStream *stream, char *start, char *end)</div><div class='del'>-{</div><div class='del'>-	if (start)</div><div class='del'>-		gtk_html_stream_printf (stream, "&lt;b&gt;%s&lt;/b&gt; %s&lt;br&gt;", U_("Starting:"), start);</div><div class='del'>-	if (end)</div><div class='del'>-		gtk_html_stream_printf (stream, "&lt;b&gt;%s&lt;/b&gt; %s&lt;br&gt;", U_("Ending:"), end);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts a time_t to a string, relative to the specified timezone */</div><div class='del'>-static char *</div><div class='del'>-timet_to_str_with_zone (time_t t, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	char buf[256];</div><div class='del'>-</div><div class='del'>-	if (t == -1)</div><div class='del'>-		return g_strdup (_("invalid time"));</div><div class='del'>-</div><div class='del'>-	itt = icaltime_from_timet_with_zone (t, FALSE, zone);</div><div class='del'>-	tm = icaltimetype_to_tm (&amp;itt);</div><div class='del'>-</div><div class='del'>-	e_time_format_date_and_time (&amp;tm, config_data_get_24_hour_format (),</div><div class='del'>-				     FALSE, FALSE, buf, sizeof (buf));</div><div class='del'>-	return g_strdup (buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a heading for the alarm notification dialog */</div><div class='del'>-static void</div><div class='del'>-write_html_heading (GtkHTMLStream *stream, const char *message,</div><div class='del'>-		    CalComponentVType vtype, time_t occur_start, time_t occur_end)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	char *start, *end;</div><div class='del'>-	char *bg_path = "file://" EVOLUTION_ICONSDIR "/bcg.png";</div><div class='del'>-	char *image_path = "file://" EVOLUTION_ICONSDIR "/alarm.png";</div><div class='del'>-	icaltimezone *current_zone;</div><div class='del'>-</div><div class='del'>-	/* Stringize the times */</div><div class='del'>-</div><div class='del'>-	current_zone = config_data_get_timezone ();</div><div class='del'>-</div><div class='del'>-	buf = timet_to_str_with_zone (occur_start, current_zone);</div><div class='del'>-	start = e_utf8_from_locale_string (buf);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	buf = timet_to_str_with_zone (occur_end, current_zone);</div><div class='del'>-	end = e_utf8_from_locale_string (buf);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	/* Write the header */</div><div class='del'>-</div><div class='del'>-	gtk_html_stream_printf (stream,</div><div class='del'>-				"&lt;HTML&gt;&lt;BODY background=\"%s\"&gt;"</div><div class='del'>-				"&lt;TABLE WIDTH=\"100%%\"&gt;"</div><div class='del'>-				"&lt;TR&gt;"</div><div class='del'>-				"&lt;TD&gt;&lt;IMG SRC=\"%s\" ALIGN=\"top\" BORDER=\"0\"&gt;&lt;/TD&gt;"</div><div class='del'>-				"&lt;TD&gt;&lt;H1&gt;%s&lt;/H1&gt;&lt;/TD&gt;"</div><div class='del'>-				"&lt;/TR&gt;"</div><div class='del'>-				"&lt;/TABLE&gt;",</div><div class='del'>-				bg_path,</div><div class='del'>-				image_path,</div><div class='del'>-				U_("Evolution Alarm"));</div><div class='del'>-</div><div class='del'>-	gtk_html_stream_printf (stream, "&lt;br&gt;&lt;br&gt;&lt;font size=\"+2\"&gt;%s&lt;/font&gt;&lt;br&gt;&lt;br&gt;", message);</div><div class='del'>-</div><div class='del'>-	/* Write the times */</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		write_times (stream, start, end);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		write_times (stream, start, end);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* Only VEVENTs and VTODOs can have alarms */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (start);</div><div class='del'>-	g_free (end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_notify_dialog:</div><div class='del'>- * @trigger: Trigger time for the alarm.</div><div class='del'>- * @occur_start: Start of occurrence time for the event.</div><div class='del'>- * @occur_end: End of occurrence time for the event.</div><div class='del'>- * @vtype: Type of the component which corresponds to the alarm.</div><div class='del'>- * @message; Message to display in the dialog; usually comes from the component.</div><div class='del'>- * @func: Function to be called when a dialog action is invoked.</div><div class='del'>- * @func_data: Closure data for @func.</div><div class='del'>- *</div><div class='del'>- * Runs the alarm notification dialog.  The specified @func will be used to</div><div class='del'>- * notify the client about result of the actions in the dialog.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE if the dialog could not be created.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,</div><div class='del'>-		     CalComponentVType vtype, const char *message,</div><div class='del'>-		     AlarmNotifyFunc func, gpointer func_data)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	GtkHTMLStream *stream;</div><div class='del'>-	icaltimezone *current_zone;</div><div class='del'>-	char *buf, *title;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (trigger != -1, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Only VEVENTs or VTODOs can have alarms */</div><div class='del'>-	g_return_val_if_fail (vtype == CAL_COMPONENT_EVENT || vtype == CAL_COMPONENT_TODO, FALSE);</div><div class='del'>-	g_return_val_if_fail (message != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (func != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	an = g_new0 (AlarmNotify, 1);</div><div class='del'>-</div><div class='del'>-	an-&gt;func = func;</div><div class='del'>-	an-&gt;func_data = func_data;</div><div class='del'>-</div><div class='del'>-	an-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);</div><div class='del'>-	if (!an-&gt;xml) {</div><div class='del'>-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");</div><div class='del'>-		g_free (an);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	an-&gt;dialog = glade_xml_get_widget (an-&gt;xml, "alarm-notify");</div><div class='del'>-	an-&gt;close = glade_xml_get_widget (an-&gt;xml, "close");</div><div class='del'>-	an-&gt;snooze = glade_xml_get_widget (an-&gt;xml, "snooze");</div><div class='del'>-	an-&gt;edit = glade_xml_get_widget (an-&gt;xml, "edit");</div><div class='del'>-	an-&gt;heading = glade_xml_get_widget (an-&gt;xml, "heading");</div><div class='del'>-	an-&gt;message = glade_xml_get_widget (an-&gt;xml, "message");</div><div class='del'>-	an-&gt;snooze_time = glade_xml_get_widget (an-&gt;xml, "snooze-time");</div><div class='del'>-	an-&gt;html = gtk_object_get_user_data (GTK_OBJECT (glade_xml_get_widget (an-&gt;xml, "frame")));</div><div class='del'>-</div><div class='del'>-	if (!(an-&gt;dialog &amp;&amp; an-&gt;close &amp;&amp; an-&gt;snooze &amp;&amp; an-&gt;edit &amp;&amp; an-&gt;heading &amp;&amp; an-&gt;message</div><div class='del'>-	      &amp;&amp; an-&gt;snooze_time)) {</div><div class='del'>-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (an-&gt;xml));</div><div class='del'>-		g_free (an);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (an-&gt;dialog), "alarm-notify", an);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (an-&gt;dialog), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);</div><div class='del'>-</div><div class='del'>-	/* Title */</div><div class='del'>-</div><div class='del'>-	current_zone = config_data_get_timezone ();</div><div class='del'>-</div><div class='del'>-	buf = timet_to_str_with_zone (trigger, current_zone);</div><div class='del'>-	title = g_strdup_printf (_("Alarm on %s"), buf);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (an-&gt;dialog), title);</div><div class='del'>-	g_free (title);</div><div class='del'>-</div><div class='del'>-	/* html heading */</div><div class='del'>-	stream = gtk_html_begin (GTK_HTML (an-&gt;html));</div><div class='del'>-	write_html_heading (stream, message, vtype, occur_start, occur_end);</div><div class='del'>-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);</div><div class='del'>-</div><div class='del'>-	/* Connect actions */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (an-&gt;dialog), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_event_cb),</div><div class='del'>-			    an);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (an-&gt;close), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (close_clicked_cb),</div><div class='del'>-			    an);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (an-&gt;snooze), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),</div><div class='del'>-			    an);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (an-&gt;edit), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (edit_clicked_cb),</div><div class='del'>-			    an);</div><div class='del'>-</div><div class='del'>-	/* Run! */</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (an-&gt;dialog))</div><div class='del'>-		gtk_widget_realize (an-&gt;dialog);</div><div class='del'>-</div><div class='del'>-	gnome_win_hints_set_state (an-&gt;dialog, WIN_STATE_STICKY);</div><div class='del'>-	gnome_win_hints_set_layer (an-&gt;dialog, WIN_LAYER_ONTOP);</div><div class='del'>-	gnome_window_icon_set_from_file (GTK_WINDOW (an-&gt;dialog), EVOLUTION_ICONSDIR "/alarm.png");</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (an-&gt;dialog);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h<br/>deleted file mode 100644<br/>index 812463de8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-notify-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* Evolution calendar - alarm notification dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_NOTIFY_DIALOG_H</div><div class='del'>-#define ALARM_NOTIFY_DIALOG_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ALARM_NOTIFY_CLOSE,</div><div class='del'>-	ALARM_NOTIFY_SNOOZE,</div><div class='del'>-	ALARM_NOTIFY_EDIT</div><div class='del'>-} AlarmNotifyResult;</div><div class='del'>-</div><div class='del'>-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);</div><div class='del'>-</div><div class='del'>-gboolean alarm_notify_dialog (time_t trigger, time_t occur_start, time_t occur_end,</div><div class='del'>-			      CalComponentVType vtype, const char *message,</div><div class='del'>-			      AlarmNotifyFunc func, gpointer func_data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c<br/>deleted file mode 100644<br/>index 7dbb77ceeb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-notify.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,426 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm notification service object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include "config.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "alarm-notify.h"</div><div class='del'>-#include "alarm-queue.h"</div><div class='del'>-#include "save.h"</div><div class='del'>-#include "e-util/e-url.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A loaded client */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* The actual client */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* The URI of the client in gnome-vfs's format.  This *is* the key that</div><div class='del'>-	 * is stored in the uri_client_hash hash table below.</div><div class='del'>-	 */</div><div class='del'>-	EUri *uri;</div><div class='del'>-</div><div class='del'>-	/* Number of times clients have requested this URI to be added to the</div><div class='del'>-	 * alarm notification system.</div><div class='del'>-	 */</div><div class='del'>-	int refcount;</div><div class='del'>-} LoadedClient;</div><div class='del'>-</div><div class='del'>-/* Private part of the AlarmNotify structure */</div><div class='del'>-struct _AlarmNotifyPrivate {</div><div class='del'>-	/* Mapping from EUri's to LoadedClient structures */</div><div class='del'>-	GHashTable *uri_client_hash;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alarm_notify_class_init (AlarmNotifyClass *class);</div><div class='del'>-static void alarm_notify_init (AlarmNotify *an);</div><div class='del'>-static void alarm_notify_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void AlarmNotify_addCalendar (PortableServer_Servant servant,</div><div class='del'>-				     const CORBA_char *str_uri,</div><div class='del'>-				     CORBA_Environment *ev);</div><div class='del'>-static void AlarmNotify_removeCalendar (PortableServer_Servant servant,</div><div class='del'>-					const CORBA_char *str_uri,</div><div class='del'>-					CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (AlarmNotify,</div><div class='del'>-			 GNOME_Evolution_Calendar_AlarmNotify,</div><div class='del'>-			 BONOBO_X_OBJECT_TYPE,</div><div class='del'>-			 alarm_notify);</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the alarm notify service */</div><div class='del'>-static void</div><div class='del'>-alarm_notify_class_init (AlarmNotifyClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	class-&gt;epv.addCalendar = AlarmNotify_addCalendar;</div><div class='del'>-	class-&gt;epv.removeCalendar = AlarmNotify_removeCalendar;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = alarm_notify_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the alarm notify system */</div><div class='del'>-static void</div><div class='del'>-alarm_notify_init (AlarmNotify *an)</div><div class='del'>-{</div><div class='del'>-	AlarmNotifyPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (AlarmNotifyPrivate, 1);</div><div class='del'>-	an-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from g_hash-table_forach(), used to destroy a loade client */</div><div class='del'>-static void</div><div class='del'>-destroy_loaded_client_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	LoadedClient *lc;</div><div class='del'>-	char *str_uri;</div><div class='del'>-</div><div class='del'>-	str_uri = key;</div><div class='del'>-	lc = value;</div><div class='del'>-	</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (lc-&gt;client));</div><div class='del'>-	e_uri_free (lc-&gt;uri);</div><div class='del'>-	g_free (lc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the alarm notify system */</div><div class='del'>-static void</div><div class='del'>-alarm_notify_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	AlarmNotifyPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_ALARM_NOTIFY (object));</div><div class='del'>-</div><div class='del'>-	an = ALARM_NOTIFY (object);</div><div class='del'>-	priv = an-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;uri_client_hash, destroy_loaded_client_cb, NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (priv-&gt;uri_client_hash);</div><div class='del'>-	priv-&gt;uri_client_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	an-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA servant implementation */</div><div class='del'>-</div><div class='del'>-/* Looks for a canonicalized URI inside an array of URIs; returns the index</div><div class='del'>- * within the array or -1 if not found.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-find_uri_index (GPtrArray *uris, const char *str_uri)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uris-&gt;len; i++) {</div><div class='del'>-		char *uri;</div><div class='del'>-</div><div class='del'>-		uri = uris-&gt;pdata[i];</div><div class='del'>-		if (strcmp (uri, str_uri) == 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i == uris-&gt;len)</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees an array of URIs and the URIs within it. */</div><div class='del'>-static void</div><div class='del'>-free_uris (GPtrArray *uris)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uris-&gt;len; i++) {</div><div class='del'>-		char *uri;</div><div class='del'>-</div><div class='del'>-		uri = uris-&gt;pdata[i];</div><div class='del'>-		g_free (uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (uris, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds an URI to the list of calendars to load on startup */</div><div class='del'>-static void</div><div class='del'>-add_uri_to_load (EUri *uri)</div><div class='del'>-{</div><div class='del'>-	char *str_uri;</div><div class='del'>-	GPtrArray *loaded_uris;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Canonicalize the URI */</div><div class='del'>-	str_uri = e_uri_to_string (uri, FALSE);</div><div class='del'>-	g_assert (str_uri != NULL);</div><div class='del'>-</div><div class='del'>-	loaded_uris = get_calendars_to_load ();</div><div class='del'>-	if (!loaded_uris) {</div><div class='del'>-		g_message ("add_uri_to_load(): Could not get the list of calendars to load; "</div><div class='del'>-			   "will not add `%s'", str_uri);</div><div class='del'>-		g_free (str_uri);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look for the URI in the list of calendars to load */</div><div class='del'>-</div><div class='del'>-	i = find_uri_index (loaded_uris, str_uri);</div><div class='del'>-</div><div class='del'>-	/* We only need to add the URI if we didn't find it among the list of</div><div class='del'>-	 * calendars.</div><div class='del'>-	 */</div><div class='del'>-	if (i != -1) {</div><div class='del'>-		g_free (str_uri);</div><div class='del'>-		free_uris (loaded_uris);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_add (loaded_uris, str_uri);</div><div class='del'>-	save_calendars_to_load (loaded_uris);</div><div class='del'>-</div><div class='del'>-	free_uris (loaded_uris);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes an URI from the list of calendars to load on startup */</div><div class='del'>-static void</div><div class='del'>-remove_uri_to_load (EUri *uri)</div><div class='del'>-{</div><div class='del'>-	char *str_uri;</div><div class='del'>-	GPtrArray *loaded_uris;</div><div class='del'>-	char *loaded_uri;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Canonicalize the URI */</div><div class='del'>-	str_uri = e_uri_to_string (uri, FALSE);</div><div class='del'>-	g_assert (str_uri != NULL);</div><div class='del'>-</div><div class='del'>-	loaded_uris = get_calendars_to_load ();</div><div class='del'>-	if (!loaded_uris) {</div><div class='del'>-		g_message ("remove_uri_to_load(): Could not get the list of calendars to load; "</div><div class='del'>-			   "will not add `%s'", str_uri);</div><div class='del'>-		g_free (str_uri);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look for the URI in the list of calendars to load */</div><div class='del'>-</div><div class='del'>-	i = find_uri_index (loaded_uris, str_uri);</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	/* If we didn't find it, there is no need to remove it */</div><div class='del'>-	if (i == -1) {</div><div class='del'>-		free_uris (loaded_uris);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	loaded_uri = loaded_uris-&gt;pdata[i];</div><div class='del'>-	g_free (loaded_uri);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_remove_index (loaded_uris, i);</div><div class='del'>-	save_calendars_to_load (loaded_uris);</div><div class='del'>-</div><div class='del'>-	free_uris (loaded_uris);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* AlarmNotify::addCalendar method */</div><div class='del'>-static void</div><div class='del'>-AlarmNotify_addCalendar (PortableServer_Servant servant,</div><div class='del'>-			 const CORBA_char *str_uri,</div><div class='del'>-			 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));</div><div class='del'>-	alarm_notify_add_calendar (an, str_uri, TRUE, ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* AlarmNotify::removeCalendar method */</div><div class='del'>-static void</div><div class='del'>-AlarmNotify_removeCalendar (PortableServer_Servant servant,</div><div class='del'>-			    const CORBA_char *str_uri,</div><div class='del'>-			    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-	AlarmNotifyPrivate *priv;</div><div class='del'>-	LoadedClient *lc;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	char *orig_str;</div><div class='del'>-	gboolean found;</div><div class='del'>-</div><div class='del'>-	an = ALARM_NOTIFY (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = an-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (str_uri);</div><div class='del'>-	if (!uri) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remove_uri_to_load (uri);</div><div class='del'>-</div><div class='del'>-	found = g_hash_table_lookup_extended (priv-&gt;uri_client_hash, str_uri,</div><div class='del'>-					      (gpointer *) &amp;orig_str,</div><div class='del'>-					      (gpointer *) &amp;lc);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	if (!lc) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (lc-&gt;refcount &gt; 0);</div><div class='del'>-</div><div class='del'>-	lc-&gt;refcount--;</div><div class='del'>-	if (lc-&gt;refcount &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uri_client_hash, str_uri);</div><div class='del'>-</div><div class='del'>-	g_free (orig_str);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (lc-&gt;client));</div><div class='del'>-	e_uri_free (lc-&gt;uri);</div><div class='del'>-	g_free (lc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_notify_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new #AlarmNotify object.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created #AlarmNotify, or NULL if its corresponding</div><div class='del'>- * CORBA object could not be created.</div><div class='del'>- **/</div><div class='del'>-AlarmNotify *</div><div class='del'>-alarm_notify_new (void)</div><div class='del'>-{</div><div class='del'>-	AlarmNotify *an;</div><div class='del'>-</div><div class='del'>-	an = gtk_type_new (TYPE_ALARM_NOTIFY);</div><div class='del'>-	return an;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_notify_add_calendar:</div><div class='del'>- * @an: An alarm notification service.</div><div class='del'>- * @uri: URI of the calendar to load.</div><div class='del'>- * @load_afterwards: Whether this calendar should be loaded in the future</div><div class='del'>- * when the alarm daemon starts up.</div><div class='del'>- * @ev: CORBA environment for exceptions.</div><div class='del'>- * </div><div class='del'>- * Tells the alarm notification service to load a calendar and start monitoring</div><div class='del'>- * its alarms.  It can optionally be made to save the URI of this calendar so</div><div class='del'>- * that it can be loaded in the future when the alarm daemon starts up.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	AlarmNotifyPrivate *priv;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	LoadedClient *lc;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (an != NULL);</div><div class='del'>-	g_return_if_fail (IS_ALARM_NOTIFY (an));</div><div class='del'>-	g_return_if_fail (str_uri != NULL);</div><div class='del'>-	g_return_if_fail (ev != NULL);</div><div class='del'>-</div><div class='del'>-	priv = an-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (str_uri);</div><div class='del'>-	if (!uri) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (load_afterwards)</div><div class='del'>-		add_uri_to_load (uri);</div><div class='del'>-</div><div class='del'>-	lc = g_hash_table_lookup (priv-&gt;uri_client_hash, str_uri);</div><div class='del'>-</div><div class='del'>-	if (lc) {</div><div class='del'>-		e_uri_free (uri);</div><div class='del'>-		g_assert (lc-&gt;refcount &gt; 0);</div><div class='del'>-		lc-&gt;refcount++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	if (client) {</div><div class='del'>-		if (cal_client_open_calendar (client, str_uri, FALSE)) {</div><div class='del'>-			lc = g_new (LoadedClient, 1);</div><div class='del'>-			lc-&gt;client = client;</div><div class='del'>-			lc-&gt;uri = uri;</div><div class='del'>-			lc-&gt;refcount = 1;</div><div class='del'>-			g_hash_table_insert (priv-&gt;uri_client_hash,</div><div class='del'>-					     g_strdup (str_uri), lc);</div><div class='del'>-</div><div class='del'>-			alarm_queue_add_client (client);</div><div class='del'>-		} else {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-			client = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!client) {</div><div class='del'>-		e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade<br/>deleted file mode 100644<br/>index e71828ca53..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-notify.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Evolution Calendar&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;evolution-calendar&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;alarm-notify&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_DIALOG&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_CENTER&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox3&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox5&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;heading&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;True&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;message&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;True&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;make_html_display&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Thu, 11 Oct 2001 08:19:04 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox4&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;close&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;C_lose&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;snooze&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Snoo_ze&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;edit&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Edit appointment&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hseparator1&lt;/name&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Snooze time (minutes)&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;snooze-time&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	&lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	&lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	&lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	&lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;value&gt;5&lt;/value&gt;</div><div class='del'>-	&lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-	&lt;upper&gt;1440&lt;/upper&gt;</div><div class='del'>-	&lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	&lt;page&gt;5&lt;/page&gt;</div><div class='del'>-	&lt;page_size&gt;5&lt;/page_size&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h<br/>deleted file mode 100644<br/>index 858c3a7d87..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-notify.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm notification service object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_NOTIFY_H</div><div class='del'>-#define ALARM_NOTIFY_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_ALARM_NOTIFY            (alarm_notify_get_type ())</div><div class='del'>-#define ALARM_NOTIFY(obj)            (GTK_CHECK_CAST ((obj), TYPE_ALARM_NOTIFY, AlarmNotify))</div><div class='del'>-#define ALARM_NOTIFY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_NOTIFY,		\</div><div class='del'>-				      AlarmNotifyClass))</div><div class='del'>-#define IS_ALARM_NOTIFY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_ALARM_NOTIFY))</div><div class='del'>-#define IS_ALARM_NOTIFY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_ALARM_NOTIFY))</div><div class='del'>-</div><div class='del'>-typedef struct _AlarmNotify AlarmNotify;</div><div class='del'>-typedef struct _AlarmNotifyClass AlarmNotifyClass;</div><div class='del'>-</div><div class='del'>-typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;</div><div class='del'>-</div><div class='del'>-struct _AlarmNotify {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	AlarmNotifyPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _AlarmNotifyClass {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_AlarmNotify__epv epv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType alarm_notify_get_type (void);</div><div class='del'>-</div><div class='del'>-AlarmNotify *alarm_notify_new (void);</div><div class='del'>-</div><div class='del'>-void alarm_notify_add_calendar (AlarmNotify *an, const char *str_uri, gboolean load_afterwards,</div><div class='del'>-				CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c<br/>deleted file mode 100644<br/>index fd22649e71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-queue.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-queue.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1031 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm queueing engine</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-exec.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-sound.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "alarm.h"</div><div class='del'>-#include "alarm-notify-dialog.h"</div><div class='del'>-#include "alarm-queue.h"</div><div class='del'>-#include "config-data.h"</div><div class='del'>-#include "save.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether the queueing system has been initialized */</div><div class='del'>-static gboolean alarm_queue_inited;</div><div class='del'>-</div><div class='del'>-/* When the alarm queue system is inited, this gets set to the last time an</div><div class='del'>- * alarm notification was issued.  This lets us present any notifications that</div><div class='del'>- * should have happened while the alarm daemon was not running.</div><div class='del'>- */</div><div class='del'>-static time_t saved_notification_time;</div><div class='del'>-</div><div class='del'>-/* Clients we are monitoring for alarms */</div><div class='del'>-static GHashTable *client_alarms_hash = NULL;</div><div class='del'>-</div><div class='del'>-/* Structure that stores a client we are monitoring */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Monitored client */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Number of times this client has been registered */</div><div class='del'>-	int refcount;</div><div class='del'>-</div><div class='del'>-	/* Hash table of component UID -&gt; CompQueuedAlarms.  If an element is</div><div class='del'>-	 * present here, then it means its cqa-&gt;queued_alarms contains at least</div><div class='del'>-	 * one queued alarm.  When all the alarms for a component have been</div><div class='del'>-	 * dequeued, the CompQueuedAlarms structure is removed from the hash</div><div class='del'>-	 * table.  Thus a CQA exists &lt;=&gt; it has queued alarms.</div><div class='del'>-	 */</div><div class='del'>-	GHashTable *uid_alarms_hash;</div><div class='del'>-} ClientAlarms;</div><div class='del'>-</div><div class='del'>-/* Pair of a CalComponentAlarms and the mapping from queued alarm IDs to the</div><div class='del'>- * actual alarm instance structures.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* The parent client alarms structure */</div><div class='del'>-	ClientAlarms *parent_client;</div><div class='del'>-</div><div class='del'>-	/* The actual component and its alarm instances */</div><div class='del'>-	CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-	/* List of QueuedAlarm structures */</div><div class='del'>-	GSList *queued_alarms;</div><div class='del'>-} CompQueuedAlarms;</div><div class='del'>-</div><div class='del'>-/* Pair of a queued alarm ID and the alarm trigger instance it refers to */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Alarm ID from alarm.h */</div><div class='del'>-	gpointer alarm_id;</div><div class='del'>-</div><div class='del'>-	/* Instance from our parent CompQueuedAlarms-&gt;alarms-&gt;alarms list */</div><div class='del'>-	CalAlarmInstance *instance;</div><div class='del'>-</div><div class='del'>-	/* Whether this is a snoozed queued alarm or a normal one */</div><div class='del'>-	guint snooze : 1;</div><div class='del'>-} QueuedAlarm;</div><div class='del'>-</div><div class='del'>-/* Alarm ID for the midnight refresh function */</div><div class='del'>-static gpointer midnight_refresh_id = NULL;</div><div class='del'>-</div><div class='del'>-static void display_notification (time_t trigger, CompQueuedAlarms *cqa,</div><div class='del'>-				  gpointer alarm_id, gboolean use_description);</div><div class='del'>-static void audio_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);</div><div class='del'>-static void mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);</div><div class='del'>-static void procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Alarm queue engine */</div><div class='del'>-</div><div class='del'>-static void load_alarms_for_today (ClientAlarms *ca);</div><div class='del'>-static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);</div><div class='del'>-</div><div class='del'>-/* Queues an alarm trigger for midnight so that we can load the next day's worth</div><div class='del'>- * of alarms.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-queue_midnight_refresh (void)</div><div class='del'>-{</div><div class='del'>-	time_t midnight;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	g_assert (midnight_refresh_id == NULL);</div><div class='del'>-</div><div class='del'>-	zone = config_data_get_timezone ();</div><div class='del'>-</div><div class='del'>-	midnight = time_day_end_with_zone (time (NULL), zone);</div><div class='del'>-</div><div class='del'>-	midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL);</div><div class='del'>-	if (!midnight_refresh_id) {</div><div class='del'>-		g_message ("queue_midnight_refresh(): Could not set up the midnight refresh alarm!");</div><div class='del'>-		/* FIXME: what to do? */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads a client's alarms; called from g_hash_table_foreach() */</div><div class='del'>-static void</div><div class='del'>-add_client_alarms_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-</div><div class='del'>-	ca = value;</div><div class='del'>-	load_alarms_for_today (ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads the alarms for the new day every midnight */</div><div class='del'>-static void</div><div class='del'>-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)</div><div class='del'>-{</div><div class='del'>-	/* Re-load the alarms for all clients */</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL);</div><div class='del'>-</div><div class='del'>-	/* Re-schedule the midnight update */</div><div class='del'>-</div><div class='del'>-	midnight_refresh_id = NULL;</div><div class='del'>-	queue_midnight_refresh ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Looks up a client in the client alarms hash table */</div><div class='del'>-static ClientAlarms *</div><div class='del'>-lookup_client (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	return g_hash_table_lookup (client_alarms_hash, client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Looks up a queued alarm based on its alarm ID */</div><div class='del'>-static QueuedAlarm *</div><div class='del'>-lookup_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-</div><div class='del'>-	qa = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = cqa-&gt;queued_alarms; l; l = l-&gt;next) {</div><div class='del'>-		qa = l-&gt;data;</div><div class='del'>-		if (qa-&gt;alarm_id == alarm_id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-	return qa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes an alarm from the list of alarms of a component.  If the alarm was</div><div class='del'>- * the last one listed for the component, it removes the component itself.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id)</div><div class='del'>-{</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	qa = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = cqa-&gt;queued_alarms; l; l = l-&gt;next) {</div><div class='del'>-		qa = l-&gt;data;</div><div class='del'>-		if (qa-&gt;alarm_id == alarm_id)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	cqa-&gt;queued_alarms = g_slist_remove_link (cqa-&gt;queued_alarms, l);</div><div class='del'>-	g_slist_free_1 (l);</div><div class='del'>-</div><div class='del'>-	g_free (qa);</div><div class='del'>-</div><div class='del'>-	/* If this was the last queued alarm for this component, remove the</div><div class='del'>-	 * component itself.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (cqa-&gt;queued_alarms != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (cqa-&gt;alarms-&gt;comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (cqa-&gt;parent_client-&gt;uid_alarms_hash, uid);</div><div class='del'>-	cqa-&gt;parent_client = NULL;</div><div class='del'>-</div><div class='del'>-	cal_component_alarms_free (cqa-&gt;alarms);</div><div class='del'>-	cqa-&gt;alarms = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (cqa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an alarm triggers */</div><div class='del'>-static void</div><div class='del'>-alarm_trigger_cb (gpointer alarm_id, time_t trigger, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompQueuedAlarms *cqa;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	CalAlarmAction action;</div><div class='del'>-</div><div class='del'>-	cqa = data;</div><div class='del'>-	comp = cqa-&gt;alarms-&gt;comp;</div><div class='del'>-</div><div class='del'>-	save_notification_time (trigger);</div><div class='del'>-</div><div class='del'>-	qa = lookup_queued_alarm (cqa, alarm_id);</div><div class='del'>-</div><div class='del'>-	/* Decide what to do based on the alarm action.  We use the trigger that</div><div class='del'>-	 * is passed to us instead of the one from the instance structure</div><div class='del'>-	 * because this may be a snoozed alarm instead of an original</div><div class='del'>-	 * occurrence.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	alarm = cal_component_get_alarm (comp, qa-&gt;instance-&gt;auid);</div><div class='del'>-	g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_action (alarm, &amp;action);</div><div class='del'>-	cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_ALARM_AUDIO:</div><div class='del'>-		audio_notification (trigger, cqa, alarm_id);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_DISPLAY:</div><div class='del'>-		display_notification (trigger, cqa, alarm_id, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_EMAIL:</div><div class='del'>-		mail_notification (trigger, cqa, alarm_id);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_PROCEDURE:</div><div class='del'>-		procedure_notification (trigger, cqa, alarm_id);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds the alarms in a CalComponentAlarms structure to the alarms queued for a</div><div class='del'>- * particular client.  Also puts the triggers in the alarm timer queue.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_component_alarms (ClientAlarms *ca, CalComponentAlarms *alarms)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CompQueuedAlarms *cqa;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	/* No alarms? */</div><div class='del'>-	if (alarms-&gt;alarms == NULL) {</div><div class='del'>-		cal_component_alarms_free (alarms);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cqa = g_new (CompQueuedAlarms, 1);</div><div class='del'>-	cqa-&gt;parent_client = ca;</div><div class='del'>-	cqa-&gt;alarms = alarms;</div><div class='del'>-</div><div class='del'>-	cqa-&gt;queued_alarms = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = alarms-&gt;alarms; l; l = l-&gt;next) {</div><div class='del'>-		CalAlarmInstance *instance;</div><div class='del'>-		gpointer alarm_id;</div><div class='del'>-		QueuedAlarm *qa;</div><div class='del'>-</div><div class='del'>-		instance = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		alarm_id = alarm_add (instance-&gt;trigger, alarm_trigger_cb, cqa, NULL);</div><div class='del'>-		if (!alarm_id) {</div><div class='del'>-			g_message ("add_component_alarms(): Could not schedule a trigger for "</div><div class='del'>-				   "%ld, discarding...", (long) instance-&gt;trigger);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		qa = g_new (QueuedAlarm, 1);</div><div class='del'>-		qa-&gt;alarm_id = alarm_id;</div><div class='del'>-		qa-&gt;instance = instance;</div><div class='del'>-		qa-&gt;snooze = FALSE;</div><div class='del'>-</div><div class='del'>-		cqa-&gt;queued_alarms = g_slist_prepend (cqa-&gt;queued_alarms, qa);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (alarms-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* If we failed to add all the alarms, then we should get rid of the cqa */</div><div class='del'>-	if (cqa-&gt;queued_alarms == NULL) {</div><div class='del'>-		g_message ("add_component_alarms(): Could not add any of the alarms "</div><div class='del'>-			   "for the component `%s'; discarding it...", uid);</div><div class='del'>-</div><div class='del'>-		cal_component_alarms_free (cqa-&gt;alarms);</div><div class='del'>-		cqa-&gt;alarms = NULL;</div><div class='del'>-</div><div class='del'>-		g_free (cqa);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cqa-&gt;queued_alarms = g_slist_reverse (cqa-&gt;queued_alarms);</div><div class='del'>-	g_hash_table_insert (ca-&gt;uid_alarms_hash, (char *) uid, cqa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads the alarms of a client for a given range of time */</div><div class='del'>-static void</div><div class='del'>-load_alarms (ClientAlarms *ca, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	GSList *comp_alarms;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	comp_alarms = cal_client_get_alarms_in_range (ca-&gt;client, start, end);</div><div class='del'>-</div><div class='del'>-	for (l = comp_alarms; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-		alarms = l-&gt;data;</div><div class='del'>-		add_component_alarms (ca, alarms);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (comp_alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads today's remaining alarms for a client */</div><div class='del'>-static void</div><div class='del'>-load_alarms_for_today (ClientAlarms *ca)</div><div class='del'>-{</div><div class='del'>-	time_t now, day_end;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-</div><div class='del'>-	zone = config_data_get_timezone ();</div><div class='del'>-</div><div class='del'>-	day_end = time_day_end_with_zone (now, zone);</div><div class='del'>-	load_alarms (ca, now, day_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds any alarms that should have occurred while the alarm daemon was not</div><div class='del'>- * running.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-load_missed_alarms (ClientAlarms *ca)</div><div class='del'>-{</div><div class='del'>-	time_t now;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (saved_notification_time != -1);</div><div class='del'>-</div><div class='del'>-	/* We add 1 to the saved_notification_time to make the time ranges</div><div class='del'>-	 * half-open; we do not want to display the "last" displayed alarm</div><div class='del'>-	 * twice, once when it occurs and once when the alarm daemon restarts.</div><div class='del'>-	 */</div><div class='del'>-	load_alarms (ca, saved_notification_time + 1, now);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when a calendar client finished loading; we load its alarms */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-</div><div class='del'>-	ca = data;</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_OPEN_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	load_alarms_for_today (ca);</div><div class='del'>-	load_missed_alarms (ca);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Looks up a component's queued alarm structure in a client alarms structure */</div><div class='del'>-static CompQueuedAlarms *</div><div class='del'>-lookup_comp_queued_alarms (ClientAlarms *ca, const char *uid)</div><div class='del'>-{</div><div class='del'>-	return g_hash_table_lookup (ca-&gt;uid_alarms_hash, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a component an its alarms */</div><div class='del'>-static void</div><div class='del'>-remove_comp (ClientAlarms *ca, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CompQueuedAlarms *cqa;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	cqa = lookup_comp_queued_alarms (ca, uid);</div><div class='del'>-	if (!cqa)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If a component is present, then it means we must have alarms queued</div><div class='del'>-	 * for it.</div><div class='del'>-	 */</div><div class='del'>-	g_assert (cqa-&gt;queued_alarms != NULL);</div><div class='del'>-</div><div class='del'>-	for (l = cqa-&gt;queued_alarms; l;) {</div><div class='del'>-		QueuedAlarm *qa;</div><div class='del'>-</div><div class='del'>-		qa = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* Get the next element here because the list element will go</div><div class='del'>-		 * away in remove_queued_alarm().  The qa will be freed there as</div><div class='del'>-		 * well.</div><div class='del'>-		 */</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-</div><div class='del'>-		alarm_remove (qa-&gt;alarm_id);</div><div class='del'>-		remove_queued_alarm (cqa, qa-&gt;alarm_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The list should be empty now, and thus the queued component alarms</div><div class='del'>-	 * structure should have been freed and removed from the hash table.</div><div class='del'>-	 */</div><div class='del'>-	g_assert (lookup_comp_queued_alarms (ca, uid) == NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when a calendar component changes; we must reload its corresponding</div><div class='del'>- * alarms.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-	time_t now, day_end;</div><div class='del'>-	CalComponentAlarms *alarms;</div><div class='del'>-	gboolean found;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	ca = data;</div><div class='del'>-</div><div class='del'>-	remove_comp (ca, uid);</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-</div><div class='del'>-	zone = config_data_get_timezone ();</div><div class='del'>-</div><div class='del'>-	day_end = time_day_end_with_zone (now, zone);</div><div class='del'>-</div><div class='del'>-	found = cal_client_get_alarms_for_object (ca-&gt;client, uid, now, day_end, &amp;alarms);</div><div class='del'>-</div><div class='del'>-	if (!found)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	add_component_alarms (ca, alarms);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called when a calendar component is removed; we must delete its corresponding</div><div class='del'>- * alarms.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-obj_removed_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-</div><div class='del'>-	ca = data;</div><div class='del'>-</div><div class='del'>-	remove_comp (ca, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Notification functions */</div><div class='del'>-</div><div class='del'>-/* Creates a snooze alarm based on an existing one.  The snooze offset is</div><div class='del'>- * compued with respect to the current time.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-create_snooze (CompQueuedAlarms *cqa, gpointer alarm_id, int snooze_mins)</div><div class='del'>-{</div><div class='del'>-	QueuedAlarm *orig_qa, *qa;</div><div class='del'>-	CalAlarmInstance *instance;</div><div class='del'>-	time_t t;</div><div class='del'>-	gpointer new_id;</div><div class='del'>-</div><div class='del'>-	orig_qa = lookup_queued_alarm (cqa, alarm_id);</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	t += snooze_mins * 60;</div><div class='del'>-</div><div class='del'>-	new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL);</div><div class='del'>-	if (!new_id) {</div><div class='del'>-		g_message ("create_snooze(): Could not schedule a trigger for "</div><div class='del'>-			   "%ld, discarding...", (long) t);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	instance = g_new (CalAlarmInstance, 1);</div><div class='del'>-	instance-&gt;auid = orig_qa-&gt;instance-&gt;auid;</div><div class='del'>-	instance-&gt;trigger = t;</div><div class='del'>-	instance-&gt;occur_start = orig_qa-&gt;instance-&gt;occur_start;</div><div class='del'>-	instance-&gt;occur_end = orig_qa-&gt;instance-&gt;occur_end;</div><div class='del'>-</div><div class='del'>-	cqa-&gt;alarms-&gt;alarms = g_slist_prepend (cqa-&gt;alarms-&gt;alarms, instance);</div><div class='del'>-</div><div class='del'>-	qa = g_new (QueuedAlarm, 1);</div><div class='del'>-	qa-&gt;alarm_id = new_id;</div><div class='del'>-	qa-&gt;instance = instance;</div><div class='del'>-	qa-&gt;snooze = TRUE;</div><div class='del'>-</div><div class='del'>-	cqa-&gt;queued_alarms = g_slist_prepend (cqa-&gt;queued_alarms, qa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Launches a component editor for a component */</div><div class='del'>-static void</div><div class='del'>-edit_component (CompQueuedAlarms *cqa)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	const char *uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory factory;</div><div class='del'>-</div><div class='del'>-	comp = cqa-&gt;alarms-&gt;comp;</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	uri = cal_client_get_uri (cqa-&gt;parent_client-&gt;client);</div><div class='del'>-</div><div class='del'>-	/* Get the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",</div><div class='del'>-					0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("edit_component(): Could not activate the component editor factory");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Edit the component */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory_editExisting (factory, uri, (char *) uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("edit_component(): Exception while editing the component");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (factory, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("edit_component(): Could not unref the calendar component factory");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct notify_dialog_closure {</div><div class='del'>-	CompQueuedAlarms *cqa;</div><div class='del'>-	gpointer alarm_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Callback used from the alarm notify dialog */</div><div class='del'>-static void</div><div class='del'>-notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct notify_dialog_closure *c;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-</div><div class='del'>-	switch (result) {</div><div class='del'>-	case ALARM_NOTIFY_SNOOZE:</div><div class='del'>-		create_snooze (c-&gt;cqa, c-&gt;alarm_id, snooze_mins);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_NOTIFY_EDIT:</div><div class='del'>-		edit_component (c-&gt;cqa);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ALARM_NOTIFY_CLOSE:</div><div class='del'>-		/* Do nothing */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	remove_queued_alarm (c-&gt;cqa, c-&gt;alarm_id);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Performs notification of a display alarm */</div><div class='del'>-static void</div><div class='del'>-display_notification (time_t trigger, CompQueuedAlarms *cqa,</div><div class='del'>-		      gpointer alarm_id, gboolean use_description)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-	const char *message;</div><div class='del'>-	struct notify_dialog_closure *c;</div><div class='del'>-	gboolean use_summary;</div><div class='del'>-</div><div class='del'>-	comp = cqa-&gt;alarms-&gt;comp;</div><div class='del'>-	qa = lookup_queued_alarm (cqa, alarm_id);</div><div class='del'>-	g_assert (qa != NULL);</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	/* Pick a sensible notification message.  First we try the DESCRIPTION</div><div class='del'>-	 * from the alarm, then the SUMMARY of the component.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	use_summary = TRUE;</div><div class='del'>-	message = NULL;</div><div class='del'>-</div><div class='del'>-	if (use_description) {</div><div class='del'>-		CalComponentAlarm *alarm;</div><div class='del'>-</div><div class='del'>-		alarm = cal_component_get_alarm (comp, qa-&gt;instance-&gt;auid);</div><div class='del'>-		g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_alarm_get_description (alarm, &amp;text);</div><div class='del'>-		cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-		if (text.value) {</div><div class='del'>-			message = text.value;</div><div class='del'>-			use_summary = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (use_summary) {</div><div class='del'>-		cal_component_get_summary (comp, &amp;text);</div><div class='del'>-		if (text.value)</div><div class='del'>-			message = text.value;</div><div class='del'>-		else</div><div class='del'>-			message = _("No description available.");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c = g_new (struct notify_dialog_closure, 1);</div><div class='del'>-	c-&gt;cqa = cqa;</div><div class='del'>-	c-&gt;alarm_id = alarm_id;</div><div class='del'>-</div><div class='del'>-	if (!alarm_notify_dialog (trigger,</div><div class='del'>-				  qa-&gt;instance-&gt;occur_start, qa-&gt;instance-&gt;occur_end,</div><div class='del'>-				  vtype, message,</div><div class='del'>-				  notify_dialog_cb, c))</div><div class='del'>-		g_message ("display_notification(): Could not create the alarm notify dialog");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Performs notification of an audio alarm */</div><div class='del'>-static void</div><div class='del'>-audio_notification (time_t trigger, CompQueuedAlarms *cqa,</div><div class='del'>-		    gpointer alarm_id)</div><div class='del'>-{</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	icalattach *attach;</div><div class='del'>-</div><div class='del'>-	comp = cqa-&gt;alarms-&gt;comp;</div><div class='del'>-	qa = lookup_queued_alarm (cqa, alarm_id);</div><div class='del'>-	g_assert (qa != NULL);</div><div class='del'>-</div><div class='del'>-	alarm = cal_component_get_alarm (comp, qa-&gt;instance-&gt;auid);</div><div class='del'>-	g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_attach (alarm, &amp;attach);</div><div class='del'>-	cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-	if (attach &amp;&amp; icalattach_get_is_url (attach)) {</div><div class='del'>-		const char *url;</div><div class='del'>-</div><div class='del'>-		url = icalattach_get_url (attach);</div><div class='del'>-		g_assert (url != NULL);</div><div class='del'>-</div><div class='del'>-		gnome_sound_play (url); /* this sucks */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (attach)</div><div class='del'>-		icalattach_unref (attach);</div><div class='del'>-</div><div class='del'>-	/* We present a notification message in addition to playing the sound */</div><div class='del'>-	display_notification (trigger, cqa, alarm_id, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Performs notification of a mail alarm */</div><div class='del'>-static void</div><div class='del'>-mail_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	display_notification (trigger, cqa, alarm_id, FALSE);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_warning_dialog (_("Evolution does not support calendar reminders with\n"</div><div class='del'>-					 "email notifications yet, but this reminder was\n"</div><div class='del'>-					 "configured to send an email.  Evolution will display\n"</div><div class='del'>-					 "a normal reminder dialog box instead."));</div><div class='del'>-	gnome_dialog_run (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Performs notification of a procedure alarm */</div><div class='del'>-static gboolean</div><div class='del'>-procedure_notification_dialog (const char *cmd, const char *url) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog, *label, *checkbox;</div><div class='del'>-	char *str;</div><div class='del'>-	int btn;</div><div class='del'>-	</div><div class='del'>-	if (is_blessed_program (url))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_dialog_new (_("Warning"),</div><div class='del'>-				   GNOME_STOCK_BUTTON_YES,</div><div class='del'>-				   GNOME_STOCK_BUTTON_NO,</div><div class='del'>-				   NULL);</div><div class='del'>-</div><div class='del'>-	str = g_strdup_printf (_("An Evolution Calendar reminder is about to trigger. "</div><div class='del'>-				 "This reminder is configured to run the following program:\n\n"</div><div class='del'>-				 "        %s\n\n"</div><div class='del'>-				 "Are you sure you want to run this program?"),</div><div class='del'>-			       cmd);</div><div class='del'>-	label = gtk_label_new (str);</div><div class='del'>-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);</div><div class='del'>-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox),</div><div class='del'>-			    label, TRUE, TRUE, 4);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	checkbox = gtk_check_button_new_with_label</div><div class='del'>-		(_("Do not ask me about this program again."));</div><div class='del'>-	gtk_widget_show (checkbox);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), </div><div class='del'>-			    checkbox, TRUE, TRUE, 4);</div><div class='del'>-</div><div class='del'>-	/* Run the dialog */</div><div class='del'>-	btn = gnome_dialog_run (GNOME_DIALOG (dialog));</div><div class='del'>-	if (btn == GNOME_YES &amp;&amp; gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))</div><div class='del'>-		save_blessed_program (url);</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	return (btn == GNOME_YES);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-procedure_notification (time_t trigger, CompQueuedAlarms *cqa, gpointer alarm_id)</div><div class='del'>-{</div><div class='del'>-	QueuedAlarm *qa;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	CalComponentText description;</div><div class='del'>-	icalattach *attach;</div><div class='del'>-	const char *url;</div><div class='del'>-	char *cmd;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	comp = cqa-&gt;alarms-&gt;comp;</div><div class='del'>-	qa = lookup_queued_alarm (cqa, alarm_id);</div><div class='del'>-	g_assert (qa != NULL);</div><div class='del'>-</div><div class='del'>-	alarm = cal_component_get_alarm (comp, qa-&gt;instance-&gt;auid);</div><div class='del'>-	g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_attach (alarm, &amp;attach);</div><div class='del'>-	cal_component_alarm_get_description (alarm, &amp;description);</div><div class='del'>-	cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-	/* If the alarm has no attachment, simply display a notification dialog. */</div><div class='del'>-	if (!attach)</div><div class='del'>-		goto fallback;</div><div class='del'>-</div><div class='del'>-	if (!icalattach_get_is_url (attach)) {</div><div class='del'>-		icalattach_unref (attach);</div><div class='del'>-		goto fallback;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	url = icalattach_get_url (attach);</div><div class='del'>-	g_assert (url != NULL);</div><div class='del'>-</div><div class='del'>-	/* Ask for confirmation before executing the stuff */</div><div class='del'>-	if (description.value)</div><div class='del'>-		cmd = g_strconcat (url, " ", description.value, NULL);</div><div class='del'>-	else</div><div class='del'>-		cmd = (char *) url;</div><div class='del'>-</div><div class='del'>-	result = 0;</div><div class='del'>-	if (procedure_notification_dialog (cmd, url))</div><div class='del'>-		result = gnome_execute_shell (NULL, cmd);</div><div class='del'>-	</div><div class='del'>-	if (cmd != (char *) url)</div><div class='del'>-		g_free (cmd);</div><div class='del'>-</div><div class='del'>-	icalattach_unref (attach);</div><div class='del'>-</div><div class='del'>-	/* Fall back to display notification if we got an error */</div><div class='del'>-	if (result &lt; 0)</div><div class='del'>-		goto fallback;</div><div class='del'>-</div><div class='del'>-	remove_queued_alarm (cqa, alarm_id);</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>- fallback:</div><div class='del'>-</div><div class='del'>-	display_notification (trigger, cqa, alarm_id, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_queue_init:</div><div class='del'>- *</div><div class='del'>- * Initializes the alarm queueing system.  This should be called near the</div><div class='del'>- * beginning of the program.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_queue_init (void)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm_queue_inited == FALSE);</div><div class='del'>-</div><div class='del'>-	client_alarms_hash = g_hash_table_new (g_direct_hash, g_direct_equal);</div><div class='del'>-	queue_midnight_refresh ();</div><div class='del'>-</div><div class='del'>-	saved_notification_time = get_saved_notification_time ();</div><div class='del'>-	if (saved_notification_time == -1) {</div><div class='del'>-		saved_notification_time = time (NULL);</div><div class='del'>-		save_notification_time (saved_notification_time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alarm_queue_inited = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_queue_done:</div><div class='del'>- *</div><div class='del'>- * Shuts down the alarm queueing system.  This should be called near the end</div><div class='del'>- * of the program.  All the monitored calendar clients should already have been</div><div class='del'>- * unregistered with alarm_queue_remove_client().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_queue_done (void)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm_queue_inited);</div><div class='del'>-</div><div class='del'>-	/* All clients must be unregistered by now */</div><div class='del'>-	g_return_if_fail (g_hash_table_size (client_alarms_hash) == 0);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (client_alarms_hash);</div><div class='del'>-	client_alarms_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_assert (midnight_refresh_id != NULL);</div><div class='del'>-	alarm_remove (midnight_refresh_id);</div><div class='del'>-	midnight_refresh_id = NULL;</div><div class='del'>-</div><div class='del'>-	alarm_queue_inited = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_queue_add_client:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- *</div><div class='del'>- * Adds a calendar client to the alarm queueing system.  Alarm trigger</div><div class='del'>- * notifications will be presented at the appropriate times.  The client should</div><div class='del'>- * be removed with alarm_queue_remove_client() when receiving notifications</div><div class='del'>- * from it is no longer desired.</div><div class='del'>- *</div><div class='del'>- * A client can be added any number of times to the alarm queueing system,</div><div class='del'>- * but any single alarm trigger will only be presented once for a particular</div><div class='del'>- * client.  The client must still be removed the same number of times from the</div><div class='del'>- * queueing system when it is no longer wanted.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_queue_add_client (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm_queue_inited);</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	ca = lookup_client (client);</div><div class='del'>-	if (ca) {</div><div class='del'>-		ca-&gt;refcount++;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ca = g_new (ClientAlarms, 1);</div><div class='del'>-</div><div class='del'>-	ca-&gt;client = client;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ca-&gt;client));</div><div class='del'>-</div><div class='del'>-	ca-&gt;refcount = 1;</div><div class='del'>-	g_hash_table_insert (client_alarms_hash, client, ca);</div><div class='del'>-</div><div class='del'>-	ca-&gt;uid_alarms_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (client), "cal_opened",</div><div class='del'>-				    GTK_SIGNAL_FUNC (cal_opened_cb), ca);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_updated_cb), ca);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_removed_cb), ca);</div><div class='del'>-</div><div class='del'>-	if (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED) {</div><div class='del'>-		load_alarms_for_today (ca);</div><div class='del'>-		load_missed_alarms (ca);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called from g_hash_table_foreach(); adds a component UID to a list */</div><div class='del'>-static void</div><div class='del'>-add_uid_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GSList **uids;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	uids = data;</div><div class='del'>-	uid = key;</div><div class='del'>-</div><div class='del'>-	*uids = g_slist_prepend (*uids, (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes all the alarms queued for a particular calendar client */</div><div class='del'>-static void</div><div class='del'>-remove_client_alarms (ClientAlarms *ca)</div><div class='del'>-{</div><div class='del'>-	GSList *uids;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	/* First we build a list of UIDs so that we can remove them one by one */</div><div class='del'>-</div><div class='del'>-	uids = NULL;</div><div class='del'>-	g_hash_table_foreach (ca-&gt;uid_alarms_hash, add_uid_cb, &amp;uids);</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		remove_comp (ca, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (uids);</div><div class='del'>-</div><div class='del'>-	/* The hash table should be empty now */</div><div class='del'>-</div><div class='del'>-	g_assert (g_hash_table_size (ca-&gt;uid_alarms_hash) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_queue_remove_client:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- *</div><div class='del'>- * Removes a calendar client from the alarm queueing system.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_queue_remove_client (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	ClientAlarms *ca;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm_queue_inited);</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	ca = lookup_client (client);</div><div class='del'>-	g_return_if_fail (ca != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (ca-&gt;refcount &gt; 0);</div><div class='del'>-	ca-&gt;refcount--;</div><div class='del'>-</div><div class='del'>-	if (ca-&gt;refcount &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	remove_client_alarms (ca);</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (ca-&gt;client), ca);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ca-&gt;client));</div><div class='del'>-	ca-&gt;client = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (ca-&gt;uid_alarms_hash);</div><div class='del'>-	ca-&gt;uid_alarms_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (ca);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (client_alarms_hash, client);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h<br/>deleted file mode 100644<br/>index a37119145f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-queue.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm-queue.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm queueing engine</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_QUEUE_H</div><div class='del'>-#define ALARM_QUEUE_H</div><div class='del'>-</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void alarm_queue_init (void);</div><div class='del'>-void alarm_queue_done (void);</div><div class='del'>-</div><div class='del'>-void alarm_queue_add_client (CalClient *client);</div><div class='del'>-void alarm_queue_remove_client (CalClient *client);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c<br/>deleted file mode 100644<br/>index 8c6c4c59cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,305 +0,0 @@</div><div class='del'>-/* Evolution calendar - Low-level alarm timer mechanism</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;gdk/gdk.h&gt;</div><div class='del'>-#include "alarm.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Our glib timeout */</div><div class='del'>-static guint timeout_id;</div><div class='del'>-</div><div class='del'>-/* The list of pending alarms */</div><div class='del'>-static GList *alarms = NULL;</div><div class='del'>-</div><div class='del'>-/* A queued alarm structure */</div><div class='del'>-typedef struct {</div><div class='del'>-	time_t             trigger;</div><div class='del'>-	AlarmFunction      alarm_fn;</div><div class='del'>-	gpointer           data;</div><div class='del'>-	AlarmDestroyNotify destroy_notify_fn;</div><div class='del'>-} AlarmRecord;</div><div class='del'>-</div><div class='del'>-static void setup_timeout (time_t now);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes the head alarm from the queue.  Does not touch the timeout_id. */</div><div class='del'>-static void</div><div class='del'>-pop_alarm (void)</div><div class='del'>-{</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_assert (alarms != NULL);</div><div class='del'>-</div><div class='del'>-	ar = alarms-&gt;data;</div><div class='del'>-</div><div class='del'>-	l = alarms;</div><div class='del'>-	alarms = g_list_remove_link (alarms, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	g_free (ar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the alarm timeout */</div><div class='del'>-static gboolean</div><div class='del'>-alarm_ready_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	time_t now;</div><div class='del'>-</div><div class='del'>-	g_assert (alarms != NULL);</div><div class='del'>-	timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	now = time (NULL);</div><div class='del'>-</div><div class='del'>-	while (alarms) {</div><div class='del'>-		AlarmRecord *notify_id, *ar;</div><div class='del'>-		AlarmRecord ar_copy;</div><div class='del'>-</div><div class='del'>-		ar = alarms-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (ar-&gt;trigger &gt; now)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		notify_id = ar;</div><div class='del'>-</div><div class='del'>-		ar_copy = *ar;</div><div class='del'>-		ar = &amp;ar_copy;</div><div class='del'>-</div><div class='del'>-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */</div><div class='del'>-</div><div class='del'>-		(* ar-&gt;alarm_fn) (notify_id, ar-&gt;trigger, ar-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (ar-&gt;destroy_notify_fn)</div><div class='del'>-			(* ar-&gt;destroy_notify_fn) (notify_id, ar-&gt;data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarms) {</div><div class='del'>-		/* We need this check because one of the alarm_fn above may have</div><div class='del'>-		 * re-entered and added an alarm of its own, so the timer will</div><div class='del'>-		 * already be set up.</div><div class='del'>-		 */</div><div class='del'>-		if (timeout_id == 0)</div><div class='del'>-			setup_timeout (now);</div><div class='del'>-	} else</div><div class='del'>-		g_assert (timeout_id == 0);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets up a timeout for the next minute.  We do not need to be concerned with</div><div class='del'>- * timezones here, as this is just a periodic check on the alarm queue.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-setup_timeout (time_t now)</div><div class='del'>-{</div><div class='del'>-	time_t next, diff;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	g_assert (timeout_id == 0);</div><div class='del'>-	g_assert (alarms != NULL);</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;now);</div><div class='del'>-	tm.tm_sec = 0;</div><div class='del'>-	tm.tm_min++; /* next minute */</div><div class='del'>-</div><div class='del'>-	next = mktime (&amp;tm);</div><div class='del'>-	g_assert (next != -1);</div><div class='del'>-</div><div class='del'>-	diff = next - now;</div><div class='del'>-</div><div class='del'>-	g_assert (diff &gt;= 0);</div><div class='del'>-	timeout_id = g_timeout_add (diff * 1000, alarm_ready_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */</div><div class='del'>-static int</div><div class='del'>-compare_alarm_by_time (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const AlarmRecord *ara = a;</div><div class='del'>-	const AlarmRecord *arb = b;</div><div class='del'>-	time_t diff;</div><div class='del'>-</div><div class='del'>-	diff = ara-&gt;trigger - arb-&gt;trigger;</div><div class='del'>-	return (diff &lt; 0) ? -1 : (diff &gt; 0) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds an alarm to the queue and sets up the timer */</div><div class='del'>-static void</div><div class='del'>-queue_alarm (AlarmRecord *ar)</div><div class='del'>-{</div><div class='del'>-	time_t now;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-</div><div class='del'>-	if (alarms) {</div><div class='del'>-		g_assert (timeout_id != 0);</div><div class='del'>-</div><div class='del'>-		old_head = alarms-&gt;data;</div><div class='del'>-	} else {</div><div class='del'>-		g_assert (timeout_id == 0);</div><div class='del'>-</div><div class='del'>-		old_head = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);</div><div class='del'>-</div><div class='del'>-	if (old_head == alarms-&gt;data)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set the timer for removal upon activation */</div><div class='del'>-</div><div class='del'>-	if (!old_head) {</div><div class='del'>-		now = time (NULL);</div><div class='del'>-		setup_timeout (now);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_add:</div><div class='del'>- * @trigger: Time at which alarm will trigger.</div><div class='del'>- * @alarm_fn: Callback for trigger.</div><div class='del'>- * @data: Closure data for callback.</div><div class='del'>- *</div><div class='del'>- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called</div><div class='del'>- * with the provided data and the alarm will be removed from the trigger list.</div><div class='del'>- *</div><div class='del'>- * Return value: An identifier for this alarm; it can be used to remove the</div><div class='del'>- * alarm later with alarm_remove().  If the trigger time occurs in the past, then</div><div class='del'>- * the alarm will not be queued and the function will return NULL.</div><div class='del'>- **/</div><div class='del'>-gpointer</div><div class='del'>-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,</div><div class='del'>-	   AlarmDestroyNotify destroy_notify_fn)</div><div class='del'>-{</div><div class='del'>-	AlarmRecord *ar;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (trigger != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (alarm_fn != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	ar = g_new (AlarmRecord, 1);</div><div class='del'>-	ar-&gt;trigger = trigger;</div><div class='del'>-	ar-&gt;alarm_fn = alarm_fn;</div><div class='del'>-	ar-&gt;data = data;</div><div class='del'>-	ar-&gt;destroy_notify_fn = destroy_notify_fn;</div><div class='del'>-</div><div class='del'>-	queue_alarm (ar);</div><div class='del'>-</div><div class='del'>-	return ar;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_remove:</div><div class='del'>- * @alarm: A queued alarm identifier.</div><div class='del'>- * </div><div class='del'>- * Removes an alarm from the alarm queue.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_remove (gpointer alarm)</div><div class='del'>-{</div><div class='del'>-	AlarmRecord *notify_id, *ar;</div><div class='del'>-	AlarmRecord ar_copy;</div><div class='del'>-	AlarmRecord *old_head;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	ar = alarm;</div><div class='del'>-</div><div class='del'>-	l = g_list_find (alarms, ar);</div><div class='del'>-	if (!l) {</div><div class='del'>-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	old_head = alarms-&gt;data;</div><div class='del'>-</div><div class='del'>-	notify_id = ar;</div><div class='del'>-</div><div class='del'>-	if (old_head == ar) {</div><div class='del'>-		ar_copy = *ar;</div><div class='del'>-		ar = &amp;ar_copy;</div><div class='del'>-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */</div><div class='del'>-	} else {</div><div class='del'>-		alarms = g_list_remove_link (alarms, l);</div><div class='del'>-		g_list_free_1 (l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset the timeout */</div><div class='del'>-</div><div class='del'>-	g_assert (timeout_id != 0);</div><div class='del'>-</div><div class='del'>-	if (!alarms) {</div><div class='del'>-		g_source_remove (timeout_id);</div><div class='del'>-		timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Notify about destructiono of the alarm */</div><div class='del'>-</div><div class='del'>-	if (ar-&gt;destroy_notify_fn)</div><div class='del'>-		(* ar-&gt;destroy_notify_fn) (notify_id, ar-&gt;data);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_done:</div><div class='del'>- * </div><div class='del'>- * Terminates the alarm timer mechanism.  This should be called at the end of</div><div class='del'>- * the program.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-alarm_done (void)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	if (timeout_id == 0) {</div><div class='del'>-		g_assert (alarms == NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (alarms != NULL);</div><div class='del'>-</div><div class='del'>-	g_source_remove (timeout_id);</div><div class='del'>-	timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	for (l = alarms; l; l = l-&gt;next) {</div><div class='del'>-		AlarmRecord *ar;</div><div class='del'>-</div><div class='del'>-		ar = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (ar-&gt;destroy_notify_fn)</div><div class='del'>-			(* ar-&gt;destroy_notify_fn) (ar, ar-&gt;data);</div><div class='del'>-</div><div class='del'>-		g_free (ar);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (alarms);</div><div class='del'>-	alarms = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h<br/>deleted file mode 100644<br/>index 23fde886c9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/alarm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* Evolution calendar - Low-level alarm timer mechanism</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_H</div><div class='del'>-#define ALARM_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);</div><div class='del'>-typedef void (* AlarmDestroyNotify) (gpointer alarm_id, gpointer data);</div><div class='del'>-</div><div class='del'>-void alarm_done (void);</div><div class='del'>-</div><div class='del'>-gpointer alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,</div><div class='del'>-		    AlarmDestroyNotify destroy_notify_fn);</div><div class='del'>-void alarm_remove (gpointer alarm);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c<br/>deleted file mode 100644<br/>index 71170a3ad6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/config-data.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/config-data.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/* Evolution calendar - Configuration values for the alarm notification daemon</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "config-data.h"</div><div class='del'>-#include "save.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we have initied ourselves by reading the data from the configuration engine */</div><div class='del'>-static gboolean inited;</div><div class='del'>-</div><div class='del'>-/* Configuration values */</div><div class='del'>-static icaltimezone *local_timezone;</div><div class='del'>-static gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Copied from ../calendar-config.c; returns whether the locale has 'am' and</div><div class='del'>- * 'pm' strings defined.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-locale_supports_12_hour_format (void)</div><div class='del'>-{  </div><div class='del'>-	char s[16];</div><div class='del'>-	time_t t = 0;</div><div class='del'>-</div><div class='del'>-	strftime (s, sizeof s, "%p", gmtime (&amp;t));</div><div class='del'>-	return s[0] != '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that the configuration values have been read */</div><div class='del'>-static void</div><div class='del'>-ensure_inited (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	char *location;</div><div class='del'>-</div><div class='del'>-	if (inited)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	inited = TRUE;</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL) {</div><div class='del'>-		/* This sucks */</div><div class='del'>-		local_timezone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-		/* This sucks as well */</div><div class='del'>-		use_24_hour_format = TRUE;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	location = bonobo_config_get_string_with_default (db,</div><div class='del'>-		"/Calendar/Display/Timezone", "UTC", NULL);</div><div class='del'>-	if (location &amp;&amp; location[0]) {</div><div class='del'>-		local_timezone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	} else {</div><div class='del'>-		local_timezone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	}</div><div class='del'>-	g_free (location);</div><div class='del'>-</div><div class='del'>-	if (locale_supports_12_hour_format ()) {</div><div class='del'>-		/* Wasn't the whole point of a configuration engine *NOT* to</div><div class='del'>-		 * have apps specify their own stupid defaults everywhere, but</div><div class='del'>-		 * just in a schema file?</div><div class='del'>-		 */</div><div class='del'>-		use_24_hour_format = bonobo_config_get_boolean_with_default (</div><div class='del'>-			db,</div><div class='del'>-			"/Calendar/Display/Use24HourFormat", FALSE, NULL);</div><div class='del'>-	} else</div><div class='del'>-		use_24_hour_format = TRUE;</div><div class='del'>-</div><div class='del'>-	discard_config_db (db);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icaltimezone *</div><div class='del'>-config_data_get_timezone (void)</div><div class='del'>-{</div><div class='del'>-	ensure_inited ();</div><div class='del'>-</div><div class='del'>-	return local_timezone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-config_data_get_24_hour_format (void)</div><div class='del'>-{</div><div class='del'>-	ensure_inited ();</div><div class='del'>-</div><div class='del'>-	return use_24_hour_format;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h<br/>deleted file mode 100644<br/>index 06a73ba562..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/config-data.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/config-data.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* Evolution calendar - Configuration values for the alarm notification daemon</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_DATA_H</div><div class='del'>-#define CONFIG_DATA_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-</div><div class='del'>-icaltimezone *config_data_get_timezone (void);</div><div class='del'>-</div><div class='del'>-gboolean config_data_get_24_hour_format (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c<br/>deleted file mode 100644<br/>index 8b6daab254..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/notify-main.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/notify-main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,205 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm notification service main file</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include "config.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-init.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include "alarm.h"</div><div class='del'>-#include "alarm-queue.h"</div><div class='del'>-#include "alarm-notify.h"</div><div class='del'>-#include "save.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeClient *master_client = NULL;</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory;</div><div class='del'>-</div><div class='del'>-static AlarmNotify *alarm_notify_service;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback for the master client's "die" signal.  We must terminate the daemon</div><div class='del'>- * since the session is ending.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-client_die_cb (GnomeClient *client)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sees if a session manager is present.  If so, it tells the SM how to restart</div><div class='del'>- * the daemon when the session starts.  It also sets the die callback so that</div><div class='del'>- * the daemon can terminate properly when the session ends.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-set_session_parameters (char **argv)</div><div class='del'>-{</div><div class='del'>-	int flags;</div><div class='del'>-	char *args[2];</div><div class='del'>-</div><div class='del'>-	master_client = gnome_master_client ();</div><div class='del'>-	flags = gnome_client_get_flags (master_client);</div><div class='del'>-</div><div class='del'>-	if (!(flags &amp; GNOME_CLIENT_IS_CONNECTED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The daemon should always be started up by the session manager when</div><div class='del'>-	 * the session starts.  The daemon will take care of loading whatever</div><div class='del'>-	 * calendars it was told to load.</div><div class='del'>-	 */</div><div class='del'>-	gnome_client_set_restart_style (master_client, GNOME_RESTART_ANYWAY);</div><div class='del'>-</div><div class='del'>-	args[0] = argv[0];</div><div class='del'>-	args[1] = NULL;</div><div class='del'>-</div><div class='del'>-	gnome_client_set_restart_command (master_client, 1, args);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (master_client), "die",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_die_cb), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the singleton alarm notify service object */</div><div class='del'>-static gboolean</div><div class='del'>-init_alarm_notify_service (void)</div><div class='del'>-{</div><div class='del'>-	g_assert (alarm_notify_service == NULL);</div><div class='del'>-</div><div class='del'>-	alarm_notify_service = alarm_notify_new ();</div><div class='del'>-	return (alarm_notify_service != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Factory function for the alarm notify service; just creates and references a</div><div class='del'>- * singleton service object.</div><div class='del'>- */</div><div class='del'>-static BonoboObject *</div><div class='del'>-alarm_notify_factory_fn (BonoboGenericFactory *factory, void *data)</div><div class='del'>-{</div><div class='del'>-	g_assert (alarm_notify_service != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref (BONOBO_OBJECT (alarm_notify_service));</div><div class='del'>-	return BONOBO_OBJECT (alarm_notify_service);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads the calendars that the alarm daemon has been told to load in the past */</div><div class='del'>-static void</div><div class='del'>-load_calendars (void)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uris;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uris = get_calendars_to_load ();</div><div class='del'>-	if (!uris) {</div><div class='del'>-		g_message ("load_calendars(): Could not get the list of calendars to load");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uris-&gt;len; i++) {</div><div class='del'>-		char *uri;</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		uri = uris-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		alarm_notify_add_calendar (alarm_notify_service, uri, FALSE, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major == CORBA_USER_EXCEPTION) {</div><div class='del'>-			char *ex_id;</div><div class='del'>-			</div><div class='del'>-			ex_id = CORBA_exception_id (&amp;ev);</div><div class='del'>-			if (strcmp (ex_id, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI) == 0)</div><div class='del'>-				g_message ("load_calendars(): Invalid URI `%s'; will not load "</div><div class='del'>-					   "that calendar.", uri);</div><div class='del'>-			else if (strcmp (ex_id,</div><div class='del'>-					 ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError)</div><div class='del'>-				 == 0)</div><div class='del'>-				g_message ("load_calendars(): Could not contact the backend "</div><div class='del'>-					   "while trying to load `%s'", uri);</div><div class='del'>-		} else if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("load_calendars(): Exception while loading calendar `%s'", uri);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		g_free (uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (uris, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	free (malloc (8));</div><div class='del'>-</div><div class='del'>-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-	if (gnome_init_with_popt_table ("evolution-alarm-notify", VERSION, argc, argv,</div><div class='del'>-					oaf_popt_options, 0, NULL) != 0)</div><div class='del'>-		g_error (_("Could not initialize GNOME"));</div><div class='del'>-</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-	if (!gnome_vfs_init ())</div><div class='del'>-		g_error (_("Could not initialize gnome-vfs"));</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-</div><div class='del'>-	alarm_queue_init ();</div><div class='del'>-</div><div class='del'>-	if (!init_alarm_notify_service ())</div><div class='del'>-		g_error (_("Could not create the alarm notify service"));</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory",</div><div class='del'>-					      alarm_notify_factory_fn, NULL);</div><div class='del'>-	if (!factory)</div><div class='del'>-		g_error (_("Could not create the alarm notify service factory"));</div><div class='del'>-</div><div class='del'>-	set_session_parameters (argv);</div><div class='del'>-</div><div class='del'>-	load_calendars ();</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (factory));</div><div class='del'>-	factory = NULL;</div><div class='del'>-</div><div class='del'>-	/* FIXME: free the alarm_notify_service */</div><div class='del'>-</div><div class='del'>-	alarm_queue_done ();</div><div class='del'>-	alarm_done ();</div><div class='del'>-</div><div class='del'>-	gnome_vfs_shutdown ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/save.c b/calendar/gui/alarm-notify/save.c<br/>deleted file mode 100644<br/>index 92dc94b65a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/save.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/save.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,315 +0,0 @@</div><div class='del'>-/* Evolution calendar - Functions to save alarm notification times</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-arg.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-#include "save.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Key names for the configuration values */</div><div class='del'>-</div><div class='del'>-#define KEY_LAST_NOTIFICATION_TIME "/Calendar/AlarmNotify/LastNotificationTime"</div><div class='del'>-#define KEY_NUM_CALENDARS_TO_LOAD "/Calendar/AlarmNotify/NumCalendarsToLoad"</div><div class='del'>-#define BASE_KEY_CALENDAR_TO_LOAD "/Calendar/AlarmNotify/CalendarToLoad"</div><div class='del'>-#define KEY_NUM_BLESSED_PROGRAMS "/Calendar/AlarmNotify/NumBlessedPrograms"</div><div class='del'>-#define BASE_KEY_BLESSED_PROGRAM "/Calendar/AlarmNotify/BlessedProgram"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Tries to get the config database object; returns CORBA_OBJECT_NIL on failure. */</div><div class='del'>-Bonobo_ConfigDatabase</div><div class='del'>-get_config_db (void)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_message ("get_config_db(): Could not get the config database object");</div><div class='del'>-		db = CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return db;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Syncs a database and unrefs it */</div><div class='del'>-void</div><div class='del'>-discard_config_db (Bonobo_ConfigDatabase db)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("discard_config_db(): Got an exception during the sync command");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("discard_config_db(): Could not release/unref the database");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * save_notification_time:</div><div class='del'>- * @t: A time value.</div><div class='del'>- * </div><div class='del'>- * Saves the last notification time so that it can be fetched the next time the</div><div class='del'>- * alarm daemon is run.  This way the daemon can show alarms that should have</div><div class='del'>- * triggered while it was not running.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-save_notification_time (time_t t)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (t != -1);</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_long (db, KEY_LAST_NOTIFICATION_TIME, (long) t, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("save_notification_time(): Could not save the value");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	discard_config_db (db);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_saved_notification_time:</div><div class='del'>- * </div><div class='del'>- * Queries the last saved value for alarm notification times.</div><div class='del'>- * </div><div class='del'>- * Return value: The last saved value, or -1 if no value had been saved before.</div><div class='del'>- **/</div><div class='del'>-time_t</div><div class='del'>-get_saved_notification_time (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	long t;</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	t = bonobo_config_get_long_with_default (db, KEY_LAST_NOTIFICATION_TIME, -1, NULL);</div><div class='del'>-</div><div class='del'>-	discard_config_db (db);</div><div class='del'>-</div><div class='del'>-	return (time_t) t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * save_calendars_to_load:</div><div class='del'>- * @uris: A list of URIs of calendars.</div><div class='del'>- * </div><div class='del'>- * Saves the list of calendars that should be loaded the next time the alarm</div><div class='del'>- * daemon starts up.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-save_calendars_to_load (GPtrArray *uris)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (uris != NULL);</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = uris-&gt;len;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_long (db, KEY_NUM_CALENDARS_TO_LOAD, len, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_warning ("Cannot save config key %s -- %s", KEY_NUM_CALENDARS_TO_LOAD, BONOBO_EX_ID (&amp;ev));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *uri;</div><div class='del'>-		char *key;</div><div class='del'>-</div><div class='del'>-		uri = uris-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		key = g_strdup_printf ("%s%d", BASE_KEY_CALENDAR_TO_LOAD, i);</div><div class='del'>-		bonobo_config_set_string (db, key, uri, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_warning ("Cannot save config key %s -- %s", key, BONOBO_EX_ID (&amp;ev));</div><div class='del'>-		g_free (key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	discard_config_db (db);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * get_calendars_to_load:</div><div class='del'>- * </div><div class='del'>- * Gets the list of calendars that should be loaded when the alarm daemon starts</div><div class='del'>- * up.</div><div class='del'>- * </div><div class='del'>- * Return value: A list of URIs, or NULL if the value could not be retrieved.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-get_calendars_to_load (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	GPtrArray *uris;</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Getting the default value below is not necessarily an error, as we</div><div class='del'>-	 * may not have saved the list of calendar yet.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, KEY_NUM_CALENDARS_TO_LOAD, 0, NULL);</div><div class='del'>-</div><div class='del'>-	uris = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (uris, len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		char *key;</div><div class='del'>-		gboolean used_default;</div><div class='del'>-</div><div class='del'>-		key = g_strdup_printf ("%s%d", BASE_KEY_CALENDAR_TO_LOAD, i);</div><div class='del'>-		uris-&gt;pdata[i] = bonobo_config_get_string_with_default (db, key, "", &amp;used_default);</div><div class='del'>-		if (used_default)</div><div class='del'>-			g_message ("get_calendars_to_load(): Could not read calendar name %d", i);</div><div class='del'>-</div><div class='del'>-		g_free (key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return uris;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * save_blessed_program:</div><div class='del'>- * @program: a program name</div><div class='del'>- * </div><div class='del'>- * Saves a program name as "blessed"</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-save_blessed_program (const char *program)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *key;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (program != NULL);</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Up the number saved */</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, KEY_NUM_BLESSED_PROGRAMS, 0, NULL);</div><div class='del'>-	len++;</div><div class='del'>-	</div><div class='del'>-	bonobo_config_set_long (db, KEY_NUM_BLESSED_PROGRAMS, len, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_warning ("Cannot save config key %s -- %s", KEY_NUM_BLESSED_PROGRAMS, BONOBO_EX_ID (&amp;ev));</div><div class='del'>-</div><div class='del'>-	/* Save the program name */</div><div class='del'>-	key = g_strdup_printf ("%s%d", BASE_KEY_BLESSED_PROGRAM, len - 1);</div><div class='del'>-	bonobo_config_set_string (db, key, program, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_warning ("Cannot save config key %s -- %s", key, BONOBO_EX_ID (&amp;ev));</div><div class='del'>-	g_free (key);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	discard_config_db (db);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * is_blessed_program:</div><div class='del'>- * @program: a program name</div><div class='del'>- * </div><div class='del'>- * Checks to see if a program is blessed</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if program is blessed, FALSE otherwise</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-is_blessed_program (const char *program)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	int len, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (program != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	db = get_config_db ();</div><div class='del'>-	if (db == CORBA_OBJECT_NIL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Getting the default value below is not necessarily an error, as we</div><div class='del'>-	 * may not have saved the list of calendar yet.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, KEY_NUM_BLESSED_PROGRAMS, 0, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		char *key, *value;</div><div class='del'>-		gboolean used_default;</div><div class='del'>-</div><div class='del'>-		key = g_strdup_printf ("%s%d", BASE_KEY_BLESSED_PROGRAM, i);</div><div class='del'>-		value = bonobo_config_get_string_with_default (db, key, "", &amp;used_default);</div><div class='del'>-		if (used_default)</div><div class='del'>-			g_message ("get_calendars_to_load(): Could not read calendar name %d", i);</div><div class='del'>-</div><div class='del'>-		if (value != NULL &amp;&amp; !strcmp (value, program)) {</div><div class='del'>-			g_free (key);</div><div class='del'>-			g_free (value);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (key);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/alarm-notify/save.h b/calendar/gui/alarm-notify/save.h<br/>deleted file mode 100644<br/>index 50371e0a5b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/save.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/alarm-notify/save.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* Evolution calendar - Functions to save alarm notification times</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef SAVE_H</div><div class='del'>-#define SAVE_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-</div><div class='del'>-Bonobo_ConfigDatabase get_config_db (void);</div><div class='del'>-void discard_config_db (Bonobo_ConfigDatabase db);</div><div class='del'>-</div><div class='del'>-void save_notification_time (time_t t);</div><div class='del'>-time_t get_saved_notification_time (void);</div><div class='del'>-</div><div class='del'>-void save_calendars_to_load (GPtrArray *uris);</div><div class='del'>-GPtrArray *get_calendars_to_load (void);</div><div class='del'>-</div><div class='del'>-void save_blessed_program (const char *program);</div><div class='del'>-gboolean is_blessed_program (const char *program);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c<br/>deleted file mode 100644<br/>index 2483b2b126..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/cal-search-bar.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/cal-search-bar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,544 +0,0 @@</div><div class='del'>-/* Evolution calendar - Search bar widget for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "cal-search-bar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* IDs and option items for the ESearchBar */</div><div class='del'>-enum {</div><div class='del'>-	SEARCH_ANY_FIELD_CONTAINS,</div><div class='del'>-	SEARCH_SUMMARY_CONTAINS,</div><div class='del'>-	SEARCH_DESCRIPTION_CONTAINS,</div><div class='del'>-	SEARCH_COMMENT_CONTAINS,</div><div class='del'>-	SEARCH_CATEGORY_IS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ESearchBarItem search_option_items[] = {</div><div class='del'>-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, NULL },</div><div class='del'>-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, NULL },</div><div class='del'>-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, NULL },</div><div class='del'>-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, NULL },</div><div class='del'>-	{ N_("Category is"), SEARCH_CATEGORY_IS, NULL },</div><div class='del'>-	{ NULL, -1, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* IDs for the categories suboptions */</div><div class='del'>-#define CATEGORIES_ALL 0</div><div class='del'>-#define CATEGORIES_UNMATCHED 1</div><div class='del'>-#define CATEGORIES_OFFSET 3</div><div class='del'>-</div><div class='del'>-/* Private part of the CalSearchBar structure */</div><div class='del'>-struct CalSearchBarPrivate {</div><div class='del'>-	/* Array of categories */</div><div class='del'>-	GPtrArray *categories;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_search_bar_class_init (CalSearchBarClass *class);</div><div class='del'>-static void cal_search_bar_init (CalSearchBar *cal_search);</div><div class='del'>-static void cal_search_bar_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void cal_search_bar_search_activated (ESearchBar *search);</div><div class='del'>-</div><div class='del'>-static ESearchBarClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	SEXP_CHANGED,</div><div class='del'>-	CATEGORY_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_search_bar_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #CalSearchBar class if necessary and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalSearchBar class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_search_bar_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_search_bar_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_search_bar_type) {</div><div class='del'>-		static const GtkTypeInfo cal_search_bar_info = {</div><div class='del'>-			"CalSearchBar",</div><div class='del'>-			sizeof (CalSearchBar),</div><div class='del'>-			sizeof (CalSearchBarClass),</div><div class='del'>-			(GtkClassInitFunc) cal_search_bar_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_search_bar_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_search_bar_type = gtk_type_unique (E_SEARCH_BAR_TYPE, &amp;cal_search_bar_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_search_bar_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-cal_search_bar_class_init (CalSearchBarClass *class)</div><div class='del'>-{</div><div class='del'>-	ESearchBarClass *e_search_bar_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	e_search_bar_class = (ESearchBarClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (E_SEARCH_BAR_TYPE);</div><div class='del'>-</div><div class='del'>-	cal_search_bar_signals[SEXP_CHANGED] =</div><div class='del'>-		gtk_signal_new ("sexp_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalSearchBarClass, sexp_changed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	cal_search_bar_signals[CATEGORY_CHANGED] =</div><div class='del'>-		gtk_signal_new ("category_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalSearchBarClass, category_changed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, cal_search_bar_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	class-&gt;sexp_changed = NULL;</div><div class='del'>-	class-&gt;category_changed = NULL;</div><div class='del'>-</div><div class='del'>-	e_search_bar_class-&gt;search_activated = cal_search_bar_search_activated;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_search_bar_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-cal_search_bar_init (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (CalSearchBarPrivate, 1);</div><div class='del'>-	cal_search-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (priv-&gt;categories, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees an array of categories */</div><div class='del'>-static void</div><div class='del'>-free_categories (GPtrArray *categories)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;len; i++) {</div><div class='del'>-		g_assert (categories-&gt;pdata[i] != NULL);</div><div class='del'>-		g_free (categories-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (categories, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-cal_search_bar_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalSearchBar *cal_search;</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_SEARCH_BAR (object));</div><div class='del'>-</div><div class='del'>-	cal_search = CAL_SEARCH_BAR (object);</div><div class='del'>-	priv = cal_search-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;categories) {</div><div class='del'>-		free_categories (priv-&gt;categories);</div><div class='del'>-		priv-&gt;categories = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cal_search-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Emits the "sexp_changed" signal for the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-notify_sexp_changed (CalSearchBar *cal_search, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[SEXP_CHANGED],</div><div class='del'>-			 sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the string of the currently selected category, NULL for "Unmatched",</div><div class='del'>- * or (const char *) 1 for "All".</div><div class='del'>- */</div><div class='del'>-static const char *</div><div class='del'>-get_current_category (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-	int id, subid;</div><div class='del'>-</div><div class='del'>-	priv = cal_search-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;categories != NULL);</div><div class='del'>-</div><div class='del'>-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));</div><div class='del'>-	if (id != SEARCH_CATEGORY_IS)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	subid = e_search_bar_get_subitem_id (E_SEARCH_BAR (cal_search));</div><div class='del'>-	if (subid == CATEGORIES_ALL)</div><div class='del'>-		return (const char *) 1;</div><div class='del'>-	else if (subid == CATEGORIES_UNMATCHED)</div><div class='del'>-		return NULL;</div><div class='del'>-	else {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		i = subid - CATEGORIES_OFFSET;</div><div class='del'>-		g_assert (i &gt;= 0 &amp;&amp; i &lt; priv-&gt;categories-&gt;len);</div><div class='del'>-</div><div class='del'>-		return priv-&gt;categories-&gt;pdata[i];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the query string to be (contains? "field" "text") */</div><div class='del'>-static void</div><div class='del'>-notify_query_contains (CalSearchBar *cal_search, const char *field)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	char *sexp;</div><div class='del'>-</div><div class='del'>-	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));</div><div class='del'>-	if (!text)</div><div class='del'>-		return; /* This is an error in the UTF8 conversion, not an empty string! */</div><div class='del'>-</div><div class='del'>-	sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-</div><div class='del'>-	notify_sexp_changed (cal_search, sexp);</div><div class='del'>-	g_free (sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a sexp for the selected category in the drop-down menu.  The "All"</div><div class='del'>- * option is returned as (const char *) 1, and the "Unfiled" option is returned</div><div class='del'>- * as NULL.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-get_category_sexp (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	category = get_current_category (cal_search);</div><div class='del'>-</div><div class='del'>-	if (category == NULL)</div><div class='del'>-		return g_strdup ("(has-categories? #f)"); /* Unfiled items */</div><div class='del'>-	else if (category == (const char *) 1)</div><div class='del'>-		return NULL; /* All items */</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf ("(has-categories? \"%s\")", category); /* Specific category */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the query string to the appropriate match for categories */</div><div class='del'>-static void</div><div class='del'>-notify_category_is (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	char *sexp;</div><div class='del'>-</div><div class='del'>-	sexp = get_category_sexp (cal_search);</div><div class='del'>-	if (!sexp)</div><div class='del'>-		notify_sexp_changed (cal_search, "#t"); /* Match all */</div><div class='del'>-	else</div><div class='del'>-		notify_sexp_changed (cal_search, sexp);</div><div class='del'>-</div><div class='del'>-	if (sexp)</div><div class='del'>-		g_free (sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a new query from the values in the widgets and notifies upstream */</div><div class='del'>-static void</div><div class='del'>-regen_query (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	priv = cal_search-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Fetch the data from the ESearchBar's entry widgets */</div><div class='del'>-</div><div class='del'>-	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));</div><div class='del'>-</div><div class='del'>-	/* Generate the different types of queries */</div><div class='del'>-</div><div class='del'>-	switch (id) {</div><div class='del'>-	case SEARCH_ANY_FIELD_CONTAINS:</div><div class='del'>-		notify_query_contains (cal_search, "any");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SEARCH_SUMMARY_CONTAINS:</div><div class='del'>-		notify_query_contains (cal_search, "summary");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SEARCH_DESCRIPTION_CONTAINS:</div><div class='del'>-		notify_query_contains (cal_search, "description");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SEARCH_COMMENT_CONTAINS:</div><div class='del'>-		notify_query_contains (cal_search, "comment");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case SEARCH_CATEGORY_IS:</div><div class='del'>-		notify_category_is (cal_search);</div><div class='del'>-</div><div class='del'>-		category = cal_search_bar_get_category (cal_search);</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],</div><div class='del'>-				 category);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* search_activated handler for the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-cal_search_bar_search_activated (ESearchBar *search)</div><div class='del'>-{</div><div class='del'>-	CalSearchBar *cal_search;</div><div class='del'>-</div><div class='del'>-	cal_search = CAL_SEARCH_BAR (search);</div><div class='del'>-	regen_query (cal_search);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates the suboptions menu for the ESearchBar with the list of categories */</div><div class='del'>-static void</div><div class='del'>-make_suboptions (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-	ESearchBarSubitem *subitems;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = cal_search-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;categories != NULL);</div><div class='del'>-</div><div class='del'>-	/* Categories plus "all", "unmatched", separator, terminator */</div><div class='del'>-	subitems = g_new (ESearchBarSubitem, priv-&gt;categories-&gt;len + 3 + 1);</div><div class='del'>-</div><div class='del'>-	/* All, unmatched, separator */</div><div class='del'>-</div><div class='del'>-	subitems[0].text = _("Any Category");</div><div class='del'>-	subitems[0].id = CATEGORIES_ALL;</div><div class='del'>-	subitems[0].translate = FALSE;</div><div class='del'>-</div><div class='del'>-	subitems[1].text = _("Unmatched");</div><div class='del'>-	subitems[1].id = CATEGORIES_UNMATCHED;</div><div class='del'>-	subitems[1].translate = FALSE;</div><div class='del'>-</div><div class='del'>-	/* All the other items */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;categories-&gt;len &gt; 0) {</div><div class='del'>-		subitems[2].text = NULL; /* separator */</div><div class='del'>-		subitems[2].id = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;categories-&gt;len; i++) {</div><div class='del'>-			const char *category;</div><div class='del'>-			char *str;</div><div class='del'>-</div><div class='del'>-			category = priv-&gt;categories-&gt;pdata[i];</div><div class='del'>-			str = e_utf8_to_gtk_string (GTK_WIDGET (cal_search), category);</div><div class='del'>-			if (!str)</div><div class='del'>-				str = g_strdup ("");</div><div class='del'>-</div><div class='del'>-			subitems[i + CATEGORIES_OFFSET].text      = str;</div><div class='del'>-			subitems[i + CATEGORIES_OFFSET].id        = i + CATEGORIES_OFFSET;</div><div class='del'>-			subitems[i + CATEGORIES_OFFSET].translate = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		subitems[i + CATEGORIES_OFFSET].id = -1; /* terminator */</div><div class='del'>-	} else</div><div class='del'>-		subitems[2].id = -1; /* terminator */</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_suboption (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, subitems);</div><div class='del'>-</div><div class='del'>-	/* Free the strings */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;categories-&gt;len; i++)</div><div class='del'>-		g_free (subitems[i + CATEGORIES_OFFSET].text);</div><div class='del'>-</div><div class='del'>-	g_free (subitems);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_search_bar_construct:</div><div class='del'>- * @cal_search: A calendar search bar.</div><div class='del'>- * </div><div class='del'>- * Constructs a calendar search bar by binding its menu and option items.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @cal_search.</div><div class='del'>- **/</div><div class='del'>-CalSearchBar *</div><div class='del'>-cal_search_bar_construct (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (cal_search != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_SEARCH_BAR (cal_search), NULL);</div><div class='del'>-</div><div class='del'>-	e_search_bar_construct (E_SEARCH_BAR (cal_search), NULL, search_option_items);</div><div class='del'>-	make_suboptions (cal_search);</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_ids (E_SEARCH_BAR (cal_search), SEARCH_CATEGORY_IS, CATEGORIES_ALL);</div><div class='del'>-</div><div class='del'>-	return cal_search;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_search_bar_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new calendar search bar.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created calendar search bar.  You should connect to the</div><div class='del'>- * "sexp_changed" signal to monitor changes in the generated sexps.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-cal_search_bar_new (void)</div><div class='del'>-{</div><div class='del'>-	CalSearchBar *cal_search;</div><div class='del'>-</div><div class='del'>-	cal_search = gtk_type_new (TYPE_CAL_SEARCH_BAR);</div><div class='del'>-	return GTK_WIDGET (cal_search_bar_construct (cal_search));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from qsort() */</div><div class='del'>-static int</div><div class='del'>-compare_categories_cb (const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	const char **ca, **cb;</div><div class='del'>-</div><div class='del'>-	ca = (const char **) a;</div><div class='del'>-	cb = (const char **) b;</div><div class='del'>-</div><div class='del'>-	/* FIXME: should use some utf8 strcoll() thingy */</div><div class='del'>-	return strcmp (*ca, *cb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a sorted array of categories based on the original one; copies the</div><div class='del'>- * string values.</div><div class='del'>- */</div><div class='del'>-static GPtrArray *</div><div class='del'>-sort_categories (GPtrArray *categories)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *c;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	c = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (c, categories-&gt;len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;len; i++)</div><div class='del'>-		c-&gt;pdata[i] = g_strdup (categories-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	qsort (c-&gt;pdata, c-&gt;len, sizeof (gpointer), compare_categories_cb);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_search_bar_set_categories:</div><div class='del'>- * @cal_search: A calendar search bar.</div><div class='del'>- * @categories: Array of pointers to strings for the category names.</div><div class='del'>- * </div><div class='del'>- * Sets the list of categories that are to be shown in the drop-down list</div><div class='del'>- * of a calendar search bar.  The search bar will automatically add an item</div><div class='del'>- * for "unfiled" components, that is, those that have no categories assigned</div><div class='del'>- * to them.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories)</div><div class='del'>-{</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal_search != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_SEARCH_BAR (cal_search));</div><div class='del'>-	g_return_if_fail (categories != NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal_search-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;categories != NULL);</div><div class='del'>-	free_categories (priv-&gt;categories);</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories = sort_categories (categories);</div><div class='del'>-	make_suboptions (cal_search);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_search_bar_get_category:</div><div class='del'>- * @cal_search: A calendar search bar.</div><div class='del'>- * </div><div class='del'>- * Queries the currently selected category name in a calendar search bar.</div><div class='del'>- * If "All" or "Unfiled" are selected, this function will return NULL.</div><div class='del'>- * </div><div class='del'>- * Return value: Name of the selected category, or NULL if there is no</div><div class='del'>- * selected category.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-cal_search_bar_get_category (CalSearchBar *cal_search)</div><div class='del'>-{</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	category = get_current_category (cal_search);</div><div class='del'>-</div><div class='del'>-	if (!category || category == (const char *) 1)</div><div class='del'>-		return NULL;</div><div class='del'>-	else</div><div class='del'>-		return category;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h<br/>deleted file mode 100644<br/>index 5cfb29fa76..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/cal-search-bar.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/cal-search-bar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-/* Evolution calendar - Search bar widget for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_SEARCH_BAR_H</div><div class='del'>-#define CAL_SEARCH_BAR_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "widgets/misc/e-search-bar.h"</div><div class='del'>-#include "widgets/misc/e-filter-bar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_CAL_SEARCH_BAR            (cal_search_bar_get_type ())</div><div class='del'>-#define CAL_SEARCH_BAR(obj)            (GTK_CHECK_CAST ((obj), TYPE_CAL_SEARCH_BAR, CalSearchBar))</div><div class='del'>-#define CAL_SEARCH_BAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CAL_SEARCH_BAR,	\</div><div class='del'>-					CalSearchBarClass))</div><div class='del'>-#define IS_CAL_SEARCH_BAR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CAL_SEARCH_BAR))</div><div class='del'>-#define IS_CAL_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CAL_SEARCH_BAR))</div><div class='del'>-</div><div class='del'>-typedef struct CalSearchBarPrivate CalSearchBarPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ESearchBar search_bar;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalSearchBarPrivate *priv;</div><div class='del'>-} CalSearchBar;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ESearchBarClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* sexp_changed) (CalSearchBar *cal_search, const char *sexp);</div><div class='del'>-	void (* category_changed) (CalSearchBar *cal_search, const char *category);</div><div class='del'>-} CalSearchBarClass;</div><div class='del'>-</div><div class='del'>-GtkType cal_search_bar_get_type (void);</div><div class='del'>-</div><div class='del'>-CalSearchBar *cal_search_bar_construct (CalSearchBar *cal_search);</div><div class='del'>-</div><div class='del'>-GtkWidget *cal_search_bar_new (void);</div><div class='del'>-</div><div class='del'>-void cal_search_bar_set_categories (CalSearchBar *cal_search, GPtrArray *categories);</div><div class='del'>-</div><div class='del'>-const char *cal_search_bar_get_category (CalSearchBar *cal_search);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c<br/>deleted file mode 100644<br/>index 30a1654f1b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-commands.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,811 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Commands for the calendar GUI control</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;pwd.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gtk/gtkfilesel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "shell/Evolution.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "goto.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-#include "dialogs/cal-prefs-dialog.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-/* A list of all of the calendars started */</div><div class='del'>-static GList *all_calendars = NULL;</div><div class='del'>-</div><div class='del'>-/* Focusing information for the calendar view.  We have to keep track of this</div><div class='del'>- * ourselves because with Bonobo controls, we may get unpaired focus_out events.</div><div class='del'>- */</div><div class='del'>-typedef struct {</div><div class='del'>-	guint calendar_focused : 1;</div><div class='del'>-	guint taskpad_focused : 1;</div><div class='del'>-} FocusData;</div><div class='del'>-</div><div class='del'>-/* Prints the calendar at its current view and time range */</div><div class='del'>-static void</div><div class='del'>-print (GnomeCalendar *gcal, gboolean preview)</div><div class='del'>-{</div><div class='del'>-	time_t start;</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-	PrintView print_view;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_current_time_range (gcal, &amp;start, NULL);</div><div class='del'>-	view_type = gnome_calendar_get_view (gcal);</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_DAY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_WEEK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_MONTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	print_calendar (gcal, preview, start, print_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Print callback */</div><div class='del'>-static void</div><div class='del'>-file_print_cb (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	print (gcal, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_print_preview_cb (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	print (gcal, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This iterates over each calendar telling them to update their config</div><div class='del'>-   settings. */</div><div class='del'>-void</div><div class='del'>-update_all_config_settings (void)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = all_calendars; l; l = l-&gt;next)</div><div class='del'>-		gnome_calendar_update_config_settings (GNOME_CALENDAR (l-&gt;data), FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Sets a clock cursor for the specified calendar window */</div><div class='del'>-static void</div><div class='del'>-set_clock_cursor (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GdkCursor *cursor;</div><div class='del'>-</div><div class='del'>-	cursor = gdk_cursor_new (GDK_WATCH);</div><div class='del'>-	gdk_window_set_cursor (GTK_WIDGET (gcal)-&gt;window, cursor);</div><div class='del'>-	gdk_cursor_destroy (cursor);</div><div class='del'>-	gdk_flush ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resets the normal cursor for the specified calendar window */</div><div class='del'>-static void</div><div class='del'>-set_normal_cursor (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	gdk_window_set_cursor (GTK_WIDGET (gcal)-&gt;window, NULL);</div><div class='del'>-	gdk_flush ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-previous_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_previous (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-next_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_next (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_goto_today (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_goto_today (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-today_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	calendar_goto_today (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-goto_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	goto_dialog (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_day_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_work_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, GNOME_CAL_WORK_WEEK_VIEW, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_week_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, GNOME_CAL_WEEK_VIEW, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const char *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_cut_clipboard (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_copy_clipboard (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-paste_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_paste_clipboard (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	set_clock_cursor (gcal);</div><div class='del'>-	gnome_calendar_delete_selection (gcal);</div><div class='del'>-	set_normal_cursor (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-publish_freebusy_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *comp_list;</div><div class='del'>-	icaltimezone *utc;</div><div class='del'>-	time_t start = time (NULL), end;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	utc = icaltimezone_get_utc_timezone ();</div><div class='del'>-	start = time_day_begin_with_zone (start, utc);</div><div class='del'>-	end = time_add_week_with_zone (start, 6, utc);</div><div class='del'>-</div><div class='del'>-	client = gnome_calendar_get_cal_client (gcal);</div><div class='del'>-	comp_list = cal_client_get_free_busy (client, NULL, start, end);</div><div class='del'>-	if (comp_list) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		for (l = comp_list; l; l = l-&gt;next) {</div><div class='del'>-			CalComponent *comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, client, NULL);</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		g_list_free (comp_list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Does a queryInterface on the control's parent control frame for the ShellView interface */</div><div class='del'>-static GNOME_Evolution_ShellView</div><div class='del'>-get_shell_view_interface (BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ControlFrame control_frame;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	control_frame = bonobo_control_get_control_frame (control);</div><div class='del'>-</div><div class='del'>-	g_assert (control_frame != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	shell_view = Bonobo_Unknown_queryInterface (control_frame,</div><div class='del'>-						    "IDL:GNOME/Evolution/ShellView:1.0",</div><div class='del'>-						    &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("get_shell_view_interface(): "</div><div class='del'>-			   "Could not queryInterface() on the control frame");</div><div class='del'>-		shell_view = CORBA_OBJECT_NIL;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	return shell_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays the currently displayed time range in the folder bar label on the</div><div class='del'>-   shell view, according to which view we are showing. */</div><div class='del'>-void</div><div class='del'>-calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-	struct tm start_tm, end_tm;</div><div class='del'>-	char buffer[512], end_buffer[256];</div><div class='del'>-	GnomeCalendarViewType view;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_visible_time_range (gcal, &amp;start_time, &amp;end_time);</div><div class='del'>-	zone = gnome_calendar_get_timezone (gcal);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (start_time, FALSE, zone);</div><div class='del'>-	start_tm.tm_year = start_tt.year - 1900;</div><div class='del'>-	start_tm.tm_mon = start_tt.month - 1;</div><div class='del'>-	start_tm.tm_mday = start_tt.day;</div><div class='del'>-	start_tm.tm_hour = start_tt.hour;</div><div class='del'>-	start_tm.tm_min = start_tt.minute;</div><div class='del'>-	start_tm.tm_sec = start_tt.second;</div><div class='del'>-	start_tm.tm_isdst = -1;</div><div class='del'>-	start_tm.tm_wday = time_day_of_week (start_tt.day, start_tt.month - 1,</div><div class='del'>-					     start_tt.year);</div><div class='del'>-</div><div class='del'>-	/* Take one off end_time so we don't get an extra day. */</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (end_time - 1, FALSE, zone);</div><div class='del'>-	end_tm.tm_year = end_tt.year - 1900;</div><div class='del'>-	end_tm.tm_mon = end_tt.month - 1;</div><div class='del'>-	end_tm.tm_mday = end_tt.day;</div><div class='del'>-	end_tm.tm_hour = end_tt.hour;</div><div class='del'>-	end_tm.tm_min = end_tt.minute;</div><div class='del'>-	end_tm.tm_sec = end_tt.second;</div><div class='del'>-	end_tm.tm_isdst = -1;</div><div class='del'>-	end_tm.tm_wday = time_day_of_week (end_tt.day, end_tt.month - 1,</div><div class='del'>-					   end_tt.year);</div><div class='del'>-</div><div class='del'>-	view = gnome_calendar_get_view (gcal);</div><div class='del'>-</div><div class='del'>-	switch (view) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		if (start_tm.tm_year == end_tm.tm_year</div><div class='del'>-		    &amp;&amp; start_tm.tm_mon == end_tm.tm_mon</div><div class='del'>-		    &amp;&amp; start_tm.tm_mday == end_tm.tm_mday) {</div><div class='del'>-			strftime (buffer, sizeof (buffer),</div><div class='del'>-				  _("%A %d %B %Y"), &amp;start_tm);</div><div class='del'>-		} else if (start_tm.tm_year == end_tm.tm_year) {</div><div class='del'>-			strftime (buffer, sizeof (buffer),</div><div class='del'>-				  _("%a %d %b"), &amp;start_tm);</div><div class='del'>-			strftime (end_buffer, sizeof (end_buffer),</div><div class='del'>-				  _("%a %d %b %Y"), &amp;end_tm);</div><div class='del'>-			strcat (buffer, " - ");</div><div class='del'>-			strcat (buffer, end_buffer);</div><div class='del'>-		} else {</div><div class='del'>-			strftime (buffer, sizeof (buffer),</div><div class='del'>-				  _("%a %d %b %Y"), &amp;start_tm);</div><div class='del'>-			strftime (end_buffer, sizeof (end_buffer),</div><div class='del'>-				  _("%a %d %b %Y"), &amp;end_tm);</div><div class='del'>-			strcat (buffer, " - ");</div><div class='del'>-			strcat (buffer, end_buffer);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		if (start_tm.tm_year == end_tm.tm_year) {</div><div class='del'>-			if (start_tm.tm_mon == end_tm.tm_mon) {</div><div class='del'>-				strftime (buffer, sizeof (buffer),</div><div class='del'>-					  "%d", &amp;start_tm);</div><div class='del'>-				strftime (end_buffer, sizeof (end_buffer),</div><div class='del'>-					  _("%d %B %Y"), &amp;end_tm);</div><div class='del'>-				strcat (buffer, " - ");</div><div class='del'>-				strcat (buffer, end_buffer);</div><div class='del'>-			} else {</div><div class='del'>-				strftime (buffer, sizeof (buffer),</div><div class='del'>-					  _("%d %B"), &amp;start_tm);</div><div class='del'>-				strftime (end_buffer, sizeof (end_buffer),</div><div class='del'>-					  _("%d %B %Y"), &amp;end_tm);</div><div class='del'>-				strcat (buffer, " - ");</div><div class='del'>-				strcat (buffer, end_buffer);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			strftime (buffer, sizeof (buffer),</div><div class='del'>-				  _("%d %B %Y"), &amp;start_tm);</div><div class='del'>-			strftime (end_buffer, sizeof (end_buffer),</div><div class='del'>-				  _("%d %B %Y"), &amp;end_tm);</div><div class='del'>-			strcat (buffer, " - ");</div><div class='del'>-			strcat (buffer, end_buffer);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	control_util_set_folder_bar_label (control, buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-control_util_set_folder_bar_label (BonoboControl *control, char *label)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_ShellView shell_view;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	shell_view = get_shell_view_interface (control);</div><div class='del'>-	if (shell_view == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_ShellView_setFolderBarLabel (shell_view, label, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("control_util_set_folder_bar_label(): Could not set the folder bar label");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-control_util_show_settings (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	control = gtk_object_get_data (GTK_OBJECT (gcal), "control");</div><div class='del'>-	if (control == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	shell_view = get_shell_view_interface (control);</div><div class='del'>-	if (shell_view == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ShellView_showSettings (shell_view, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("control_util_show_settings(): Could not show settings");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sensitizes the UI Component menu/toolbar calendar commands based on the</div><div class='del'>- * number of selected events. (This will always be 0 or 1 currently.)  If enable</div><div class='del'>- * is FALSE, all will be disabled.  Otherwise, the currently-selected number of</div><div class='del'>- * events will be used.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sensitize_calendar_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	int n_selected;</div><div class='del'>-	</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	n_selected = enable ? gnome_calendar_get_num_events_selected (gcal) : 0;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",</div><div class='del'>-				      enable ? "1" : "0",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sensitizes the UI Component menu/toolbar tasks commands based on the number</div><div class='del'>- * of selected tasks.  If enable is FALSE, all will be disabled.  Otherwise, the</div><div class='del'>- * currently-selected number of tasks will be used.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolean enable)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	int n_selected;</div><div class='del'>-	</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	n_selected = enable ? gnome_calendar_get_num_tasks_selected (gcal) : 0;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Cut", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Copy", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive",</div><div class='del'>-				      enable ? "1" : "0",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the dates shown by the GnomeCalendar are changed.</div><div class='del'>-   We want to update the dates in the folder bar. */</div><div class='del'>-static void</div><div class='del'>-gcal_calendar_dates_change_cb (GnomeCalendar *gcal, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	calendar_set_folder_bar_label (gcal, control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selection in the calendar views changes */</div><div class='del'>-static void</div><div class='del'>-gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	sensitize_calendar_commands (gcal, control, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selection in the taskpad changes */</div><div class='del'>-static void</div><div class='del'>-gcal_taskpad_selection_changed_cb (GnomeCalendar *gcal, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	sensitize_taskpad_commands (gcal, control, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the focus changes for a calendar view */</div><div class='del'>-static void</div><div class='del'>-gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	FocusData *focus;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");</div><div class='del'>-	g_assert (focus != NULL);</div><div class='del'>-</div><div class='del'>-	if (in) {</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (gcal), "calendar_selection_changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb), control);</div><div class='del'>-		sensitize_calendar_commands (gcal, control, TRUE);</div><div class='del'>-		focus-&gt;calendar_focused = TRUE;</div><div class='del'>-	} else if (focus-&gt;calendar_focused) {</div><div class='del'>-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),</div><div class='del'>-					       GTK_SIGNAL_FUNC (gcal_calendar_selection_changed_cb),</div><div class='del'>-					       control);</div><div class='del'>-		sensitize_calendar_commands (gcal, control, FALSE);</div><div class='del'>-		focus-&gt;calendar_focused = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the taskpad focus changes */</div><div class='del'>-static void</div><div class='del'>-gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	FocusData *focus;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");</div><div class='del'>-	g_assert (focus != NULL);</div><div class='del'>-</div><div class='del'>-	if (in) {</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_selection_changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb), control);</div><div class='del'>-		sensitize_taskpad_commands (gcal, control, TRUE);</div><div class='del'>-		focus-&gt;taskpad_focused = TRUE;</div><div class='del'>-	} else if (focus-&gt;taskpad_focused) {</div><div class='del'>-		/* With Bonobo controls, we may get unpaired focus_out events.</div><div class='del'>-		 * That is why we have to keep track of this ourselves instead</div><div class='del'>-		 * of blindly assumming that we are getting this event because</div><div class='del'>-		 * the taskpad was in fact focused.</div><div class='del'>-		 */</div><div class='del'>-		gtk_signal_disconnect_by_func (GTK_OBJECT (gcal),</div><div class='del'>-					       GTK_SIGNAL_FUNC (gcal_taskpad_selection_changed_cb),</div><div class='del'>-					       control);</div><div class='del'>-		sensitize_taskpad_commands (gcal, control, FALSE);</div><div class='del'>-		focus-&gt;taskpad_focused = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),</div><div class='del'>-	BONOBO_UI_VERB ("CalendarPrintPreview", file_print_preview_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB ("Cut", cut_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("Copy", copy_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("Paste", paste_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("Delete", delete_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("CalendarToday", today_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("CalendarNext", next_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB ("ShowDayView", show_day_view_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("ShowWorkWeekView", show_work_week_view_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("ShowWeekView", show_week_view_clicked),</div><div class='del'>-	BONOBO_UI_VERB ("ShowMonthView", show_month_view_clicked),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB ("PublishFreeBusy", publish_freebusy_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps [] =</div><div class='del'>-{</div><div class='del'>-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewAppointment",	              "new_appointment.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewMeeting",	              "meeting.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",	              "new_task-16.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Cut",			      "16_cut.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Copy",			      "16_copy.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Paste",			      "16_paste.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/Delete",			      "evolution-trash-mini.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/Print",				      "print.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/PrintPreview",			      "print-preview.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/View/ViewBegin/Goto",				      "goto-16.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/Toolbar/New",					      "buttons/new_appointment.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/NewTask",					      "buttons/new_task.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Print",					      "buttons/print.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Delete",					      "buttons/delete-message.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Prev",					      "buttons/arrow-left-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Next",					      "buttons/arrow-right-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Goto",					      "buttons/goto-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/DayView",					      "buttons/dayview.xpm"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/WorkWeekView",				      "buttons/workweekview.xpm"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/WeekView",					      "buttons/weekview.xpm"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/MonthView",					      "buttons/monthview.xpm"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_control_activate (BonoboControl *control,</div><div class='del'>-			   GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer remote_uih;</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	FocusData *focus;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (uic, remote_uih);</div><div class='del'>-	bonobo_object_release_unref (remote_uih, NULL);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_ui_component (gcal, uic);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, gcal);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_freeze (uic, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-calendar.xml",</div><div class='del'>-			       "evolution-calendar");</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (uic, pixmaps);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_setup_view_menus (gcal, uic);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal), "dates_shown_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gcal_calendar_dates_change_cb),</div><div class='del'>-			    control);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal), "calendar_focus_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gcal_calendar_focus_change_cb), control);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal), "taskpad_focus_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gcal_taskpad_focus_change_cb), control);</div><div class='del'>-</div><div class='del'>-	sensitize_calendar_commands (gcal, control, FALSE);</div><div class='del'>-	sensitize_taskpad_commands (gcal, control, FALSE);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (uic, NULL);</div><div class='del'>-</div><div class='del'>-	/* Show the dialog for setting the timezone if the user hasn't chosen</div><div class='del'>-	   a default timezone already. This is done in the startup wizard now,</div><div class='del'>-	   so we don't do it here. */</div><div class='del'>-#if 0</div><div class='del'>-	calendar_config_check_timezone_set ();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	calendar_set_folder_bar_label (gcal, control);</div><div class='del'>-</div><div class='del'>-	focus = g_new (FocusData, 1);</div><div class='del'>-	focus-&gt;calendar_focused = FALSE;</div><div class='del'>-	focus-&gt;taskpad_focused = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (control), "focus_data", focus);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	FocusData *focus;</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_ui_component (gcal, uic);</div><div class='del'>-</div><div class='del'>-	focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");</div><div class='del'>-	g_assert (focus != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_remove_data (GTK_OBJECT (control), "focus_data");</div><div class='del'>-	g_free (focus);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_discard_view_menus (gcal);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (gcal), control);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_rm (uic, "/", NULL);</div><div class='del'>- 	bonobo_ui_component_unset_container (uic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a calendar from our list of all calendars when it is destroyed. */</div><div class='del'>-static void</div><div class='del'>-on_calendar_destroyed (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	all_calendars = g_list_remove (all_calendars, gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCalendar *</div><div class='del'>-new_calendar (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = gnome_calendar_new ();</div><div class='del'>-	if (!gcal) {</div><div class='del'>-		gnome_warning_dialog (_("Could not create the calendar view.  Please check your "</div><div class='del'>-					"ORBit and OAF setup."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gcal), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (on_calendar_destroyed), NULL);</div><div class='del'>-</div><div class='del'>-	all_calendars = g_list_prepend (all_calendars, gcal);</div><div class='del'>-</div><div class='del'>-	return GNOME_CALENDAR (gcal);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h<br/>deleted file mode 100644<br/>index 9ebac6eef4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-commands.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* Evolution calendar - Commands for the calendar GUI control</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CALENDAR_COMMANDS_H</div><div class='del'>-#define CALENDAR_COMMANDS_H</div><div class='del'>-</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-</div><div class='del'>-/* This tells all the calendars to reload the config settings. */</div><div class='del'>-void update_all_config_settings (void);</div><div class='del'>-</div><div class='del'>-GnomeCalendar *new_calendar (void);</div><div class='del'>-</div><div class='del'>-void calendar_control_activate (BonoboControl *control, GnomeCalendar *gcal);</div><div class='del'>-void calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-void calendar_goto_today (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-void calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control);</div><div class='del'>-</div><div class='del'>-/* Used by calendar and tasks control to set the folder title bar label. */</div><div class='del'>-void control_util_set_folder_bar_label (BonoboControl *control, char *label);</div><div class='del'>-</div><div class='del'>-/* Used by calendar views and tasks to show the settings dialog */</div><div class='del'>-void control_util_show_settings (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-#endif /* CALENDAR_COMMANDS_H */</div><div class='head'>diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c<br/>deleted file mode 100644<br/>index b4a2b3ab89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,729 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-types.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-uri.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-ops.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-directory.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-file-info.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "calendar-offline-handler.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "tasks-control-factory.h"</div><div class='del'>-#include "config-control-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "tasks-control.h"</div><div class='del'>-#include "tasks-migrate.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* OAFIID for the component.  */</div><div class='del'>-#define COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"</div><div class='del'>- </div><div class='del'>-/* Folder type IDs */</div><div class='del'>-#define FOLDER_CALENDAR "calendar"</div><div class='del'>-#define FOLDER_TASKS "tasks"</div><div class='del'>-</div><div class='del'>-/* IDs for user creatable items */</div><div class='del'>-#define CREATE_EVENT_ID "event"</div><div class='del'>-#define CREATE_ALLDAY_EVENT_ID "allday-event"</div><div class='del'>-#define CREATE_MEETING_ID "meeting"</div><div class='del'>-#define CREATE_TASK_ID "task"</div><div class='del'>-</div><div class='del'>-char *evolution_dir;</div><div class='del'>-EvolutionShellClient *global_shell_client = NULL;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ FOLDER_CALENDAR,</div><div class='del'>-	  "evolution-calendar.png",</div><div class='del'>-	  N_("Calendar"),</div><div class='del'>-	  N_("Folder containing appointments and events"),</div><div class='del'>-	  TRUE, NULL, NULL },</div><div class='del'>-	{ FOLDER_TASKS,</div><div class='del'>-	  "evolution-tasks.png",</div><div class='del'>-	  N_("Tasks"),</div><div class='del'>-	  N_("Folder containing to-do items"),</div><div class='del'>-	  TRUE, NULL, NULL },</div><div class='del'>-	{ NULL, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* EvolutionShellComponent methods and signals.  */</div><div class='del'>-</div><div class='del'>-static EvolutionShellComponentResult</div><div class='del'>-create_view (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     const char *view_info,</div><div class='del'>-	     BonoboControl **control_return,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (type, "calendar")) {</div><div class='del'>-		control = control_factory_new_control ();</div><div class='del'>-		if (!control)</div><div class='del'>-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;</div><div class='del'>-	} else if (!g_strcasecmp (type, "tasks")) {</div><div class='del'>-		control = tasks_control_new ();</div><div class='del'>-		if (!control)</div><div class='del'>-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;</div><div class='del'>-	} else {</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);</div><div class='del'>-	if (!g_strcasecmp (type, "calendar") &amp;&amp; *view_info)</div><div class='del'>-		bonobo_control_set_property (control, "view", view_info, NULL);</div><div class='del'>-</div><div class='del'>-	*control_return = control;</div><div class='del'>-</div><div class='del'>-	return EVOLUTION_SHELL_COMPONENT_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (physical_uri);</div><div class='del'>-	if (uri) {</div><div class='del'>-		/* we don't need to do anything */</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_OK, &amp;ev);</div><div class='del'>-		gnome_vfs_uri_unref (uri);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Asks the alarm daemon to stop monitoring the specified URI */</div><div class='del'>-static void</div><div class='del'>-stop_alarms (GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	char *str_uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify an;</div><div class='del'>-</div><div class='del'>-	/* Activate the alarm notification service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("stop_alarms(): Could not activate the alarm notification service");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Ask the service to remove the URI from its list of calendars */</div><div class='del'>-</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-	g_assert (str_uri != NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify_removeCalendar (an, str_uri, &amp;ev);</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI)) {</div><div class='del'>-		g_message ("stop_alarms(): Invalid URI reported from the alarm notification service");</div><div class='del'>-	} else if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound)) {</div><div class='del'>-		/* This is OK; the service may not have loaded that calendar */</div><div class='del'>-	} else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("stop_alarms(): Could not issue the removeCalendar request");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (an, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("stop_alarms(): Could not unref the alarm notification service");</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSURI *dir_uri, *data_uri, *backup_uri;</div><div class='del'>-	GnomeVFSResult data_result, backup_result;</div><div class='del'>-</div><div class='del'>-	/* check type */</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener of "</div><div class='del'>-				   "an unsupported folder type");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check URI */</div><div class='del'>-	dir_uri = gnome_vfs_uri_new (physical_uri);</div><div class='del'>-	if (!dir_uri) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Compute the URIs of the appropriate files */</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) == 0) {</div><div class='del'>-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics");</div><div class='del'>-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics~");</div><div class='del'>-	} else if (strcmp (type, FOLDER_TASKS) == 0) {</div><div class='del'>-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics");</div><div class='del'>-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics~");</div><div class='del'>-	} else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!data_uri || !backup_uri) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		g_message ("remove_folder(): Could not generate the data/backup URIs");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener "</div><div class='del'>-				   "of an invalid URI");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ask the alarm daemon to stop monitoring this URI */</div><div class='del'>-</div><div class='del'>-	stop_alarms (data_uri);</div><div class='del'>-</div><div class='del'>-	/* Delete the data and backup files; the shell will take care of the rest */</div><div class='del'>-</div><div class='del'>-	data_result = gnome_vfs_unlink_from_uri (data_uri);</div><div class='del'>-	backup_result = gnome_vfs_unlink_from_uri (backup_uri);</div><div class='del'>-</div><div class='del'>-	if ((data_result == GNOME_VFS_OK || data_result == GNOME_VFS_ERROR_NOT_FOUND)</div><div class='del'>-	    &amp;&amp; (backup_result == GNOME_VFS_OK || backup_result == GNOME_VFS_ERROR_NOT_FOUND)) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_OK,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener about success");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	} else {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener about failure");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (dir_uri);</div><div class='del'>-</div><div class='del'>-	if (data_uri)</div><div class='del'>-		gnome_vfs_uri_unref (data_uri);</div><div class='del'>-</div><div class='del'>-	if (backup_uri)</div><div class='del'>-		gnome_vfs_uri_unref (backup_uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_ShellComponentListener_Result</div><div class='del'>-xfer_file (GnomeVFSURI *base_src_uri,</div><div class='del'>-	   GnomeVFSURI *base_dest_uri,</div><div class='del'>-	   const char *file_name,</div><div class='del'>-	   int remove_source)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSURI *src_uri, *dest_uri;</div><div class='del'>-	GnomeVFSHandle *hin, *hout;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GnomeVFSFileInfo file_info;</div><div class='del'>-	GnomeVFSFileSize size;</div><div class='del'>-	char *buffer;</div><div class='del'>-</div><div class='del'>-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_open_uri (&amp;hin, src_uri, GNOME_VFS_OPEN_READ);</div><div class='del'>-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */</div><div class='del'>-	}</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_get_file_info_uri (src_uri, &amp;file_info, GNOME_VFS_FILE_INFO_DEFAULT);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_create_uri (&amp;hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write source file to destination file */</div><div class='del'>-	buffer = g_malloc (file_info.size);</div><div class='del'>-	result = gnome_vfs_read (hin, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_write (hout, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (remove_source) {</div><div class='del'>-		char *text_uri;</div><div class='del'>-</div><div class='del'>-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */</div><div class='del'>-</div><div class='del'>-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-		result = gnome_vfs_unlink (text_uri);</div><div class='del'>-		g_free (text_uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (hin);</div><div class='del'>-	gnome_vfs_close (hout);</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-	g_free (buffer);</div><div class='del'>-</div><div class='del'>-	return GNOME_Evolution_ShellComponentListener_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xfer_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *source_physical_uri,</div><div class='del'>-	     const char *destination_physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     gboolean remove_source,</div><div class='del'>-	     const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GnomeVFSURI *src_uri;</div><div class='del'>-	GnomeVFSURI *dest_uri;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	char *filename, *backup_filename;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* check type */</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check URIs */</div><div class='del'>-	src_uri = gnome_vfs_uri_new (source_physical_uri);</div><div class='del'>-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);</div><div class='del'>-	if (!src_uri || ! dest_uri) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) == 0) {</div><div class='del'>-		filename = "calendar.ics";</div><div class='del'>-		backup_filename = "calendar.ics~";</div><div class='del'>-	} else if (strcmp (type, FOLDER_TASKS) == 0) {</div><div class='del'>-		filename = "tasks.ics";</div><div class='del'>-		backup_filename = "tasks.ics~";</div><div class='del'>-	} else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = xfer_file (src_uri, dest_uri, filename, remove_source);</div><div class='del'>-	if (result == GNOME_Evolution_ShellComponentListener_OK)</div><div class='del'>-		result = xfer_file (src_uri, dest_uri, backup_filename, remove_source);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-</div><div class='del'>-        CORBA_exception_free (&amp;ev);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *shells = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	static gboolean migrated = FALSE;</div><div class='del'>-	</div><div class='del'>-	evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-</div><div class='del'>-	if (!migrated) {</div><div class='del'>-		tasks_migrate ();</div><div class='del'>-		migrated = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shells = g_list_append (shells, shell_component);</div><div class='del'>-</div><div class='del'>-	global_shell_client = shell_client;</div><div class='del'>-</div><div class='del'>-	config_control_factory_register (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	shells = g_list_remove (shells, shell_component);</div><div class='del'>-	</div><div class='del'>-	if (g_list_length (shells) == 0)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes the final URI for a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_data_uri (const char *uri, CalComponentVType vtype)</div><div class='del'>-{</div><div class='del'>-	if (uri) {</div><div class='del'>-		if (*uri != '/' &amp;&amp; strncmp (uri, "file:", 5) != 0)</div><div class='del'>-			return g_strdup (uri);</div><div class='del'>-		if (vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-			return g_concat_dir_and_file (uri, "calendar.ics");</div><div class='del'>-		else if (vtype == CAL_COMPONENT_TODO)</div><div class='del'>-			return g_concat_dir_and_file (uri, "tasks.ics");</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	} else {</div><div class='del'>-		if (vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-			return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-						      "evolution/local/Calendar/calendar.ics");</div><div class='del'>-		else if (vtype == CAL_COMPONENT_TODO)</div><div class='del'>-			return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-						      "evolution/local/Tasks/tasks.ics");</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a calendar component at a specified URI.  If the URI is NULL then it</div><div class='del'>- * uses the default folder for that type of component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-create_component (const char *uri, GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)</div><div class='del'>-{</div><div class='del'>-	char *real_uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory factory;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:</div><div class='del'>-		vtype = CAL_COMPONENT_EVENT;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:</div><div class='del'>-		vtype = CAL_COMPONENT_TODO;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	real_uri = get_data_uri (uri, vtype);</div><div class='del'>-</div><div class='del'>-	/* Get the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",</div><div class='del'>-					0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("create_component(): Could not activate the component editor factory");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_free (real_uri);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Create the item */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory_editNew (factory, real_uri, type, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("create_component(): Exception while creating the component");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (real_uri);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (factory, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("create_component(): Could not unref the calendar component factory");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when we must create a user-creatable item */</div><div class='del'>-static void</div><div class='del'>-sc_user_create_new_item_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-			    const char *id,</div><div class='del'>-			    const char *parent_folder_physical_uri,</div><div class='del'>-			    const char *parent_folder_type)</div><div class='del'>-{</div><div class='del'>-	if (strcmp (id, CREATE_EVENT_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);</div><div class='del'>- 	} else if (strcmp (id, CREATE_ALLDAY_EVENT_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);</div><div class='del'>-	} else if (strcmp (id, CREATE_MEETING_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);</div><div class='del'>-	} else if (strcmp (id, CREATE_TASK_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_TASKS) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);</div><div class='del'>-	} else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The factory function.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_creatable_item (EvolutionShellComponent *shell_component,</div><div class='del'>-		    const char *id,</div><div class='del'>-		    const char *description,</div><div class='del'>-		    const char *menu_description,</div><div class='del'>-		    char menu_shortcut,</div><div class='del'>-		    const char *icon_name)</div><div class='del'>-{</div><div class='del'>-	char *icon_path;</div><div class='del'>-	GdkPixbuf *icon;</div><div class='del'>-</div><div class='del'>-	if (icon_name == NULL) {</div><div class='del'>-		icon_path = NULL;</div><div class='del'>-		icon = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);</div><div class='del'>-		icon = gdk_pixbuf_new_from_file (icon_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_shell_component_add_user_creatable_item (shell_component,</div><div class='del'>-							   id,</div><div class='del'>-							   description,</div><div class='del'>-							   menu_description,</div><div class='del'>-							   menu_shortcut,</div><div class='del'>-							   icon);</div><div class='del'>-</div><div class='del'>-	if (icon != NULL)</div><div class='del'>-		gdk_pixbuf_unref (icon);</div><div class='del'>-	g_free (icon_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-create_object (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellComponent *shell_component;</div><div class='del'>-	CalendarOfflineHandler *offline_handler;	</div><div class='del'>-</div><div class='del'>-	shell_component = evolution_shell_component_new (folder_types,</div><div class='del'>-							 NULL,</div><div class='del'>-							 create_view,</div><div class='del'>-							 create_folder,</div><div class='del'>-							 remove_folder,</div><div class='del'>-							 xfer_folder,</div><div class='del'>-							 NULL, /* populate_folder_context_menu_fn */</div><div class='del'>-							 NULL, /* get_dnd_selection_fn */</div><div class='del'>-							 NULL  /* closure */);</div><div class='del'>-</div><div class='del'>-	/* Offline handler */</div><div class='del'>-	offline_handler = calendar_offline_handler_new ();</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), </div><div class='del'>-				     BONOBO_OBJECT (offline_handler));</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);</div><div class='del'>-</div><div class='del'>-	/* User creatable items */</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_MEETING_ID,</div><div class='del'>-			    _("New meeting"), _("_Meeting"),</div><div class='del'>-			    's', "meeting-request.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_TASK_ID,</div><div class='del'>-			    _("New task"), _("_Task"),</div><div class='del'>-			    't', "new_task-16.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_ALLDAY_EVENT_ID,</div><div class='del'>-			    _("New All Day Appointment"), _("All _Day Appointment"),</div><div class='del'>-			    'd', "new_all_day_event.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_EVENT_ID,</div><div class='del'>-			    _("New appointment"), _("_Appointment"),</div><div class='del'>-			    'a', "new_appointment.xpm");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",</div><div class='del'>-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (shell_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *object;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	object = create_object ();</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object));</div><div class='del'>-</div><div class='del'>-	if (result == OAF_REG_ERROR)</div><div class='del'>-		g_error ("Cannot initialize Evolution's calendar component.");</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h<br/>deleted file mode 100644<br/>index 576255cb6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _COMPONENT_FACTORY_H_</div><div class='del'>-#define _COMPONENT_FACTORY_H_</div><div class='del'>-</div><div class='del'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-void  component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _COMPONENT_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c<br/>deleted file mode 100644<br/>index 572db1fe2c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-config.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-config.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1203 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * calendar-config.c - functions to load/save/get/set user settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-config.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;widgets/e-timezone-dialog/e-timezone-dialog.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "e-tasks.h"</div><div class='del'>-#include "e-cell-date-edit-text.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	gchar	       *timezone;</div><div class='del'>-	CalWeekdays	working_days;</div><div class='del'>-	gboolean	use_24_hour_format;</div><div class='del'>-	gint		week_start_day;</div><div class='del'>-	gint		day_start_hour;</div><div class='del'>-	gint		day_start_minute;</div><div class='del'>-	gint		day_end_hour;</div><div class='del'>-	gint		day_end_minute;</div><div class='del'>-	gint		time_divisions;</div><div class='del'>-	gboolean	dnav_show_week_no;</div><div class='del'>-	gint		view;</div><div class='del'>-	gfloat		hpane_pos;</div><div class='del'>-	gfloat		vpane_pos;</div><div class='del'>-	gfloat		month_hpane_pos;</div><div class='del'>-	gfloat		month_vpane_pos;</div><div class='del'>-	gboolean	compress_weekend;</div><div class='del'>-	gboolean	show_event_end;</div><div class='del'>-	char           *tasks_due_today_color;</div><div class='del'>-	char           *tasks_overdue_color;</div><div class='del'>-	gboolean	hide_completed_tasks;</div><div class='del'>-	CalUnits	hide_completed_tasks_units;</div><div class='del'>-	gint		hide_completed_tasks_value;</div><div class='del'>-	gboolean	confirm_delete;</div><div class='del'>-	gboolean	confirm_expunge;</div><div class='del'>-	gboolean        use_default_reminder;</div><div class='del'>-	int             default_reminder_interval;</div><div class='del'>-	CalUnits        default_reminder_units;</div><div class='del'>-} CalendarConfig;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalendarConfig *config = NULL;</div><div class='del'>-</div><div class='del'>-static void config_read			(void);</div><div class='del'>-</div><div class='del'>-static void on_timezone_set		(GnomeDialog	*dialog,</div><div class='del'>-					 int		 button,</div><div class='del'>-					 ETimezoneDialog *etd);</div><div class='del'>-static gboolean on_timezone_dialog_delete_event	(GnomeDialog	*dialog,</div><div class='del'>-						 GdkEvent	*event,</div><div class='del'>-						 ETimezoneDialog *etd);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_init			(void)</div><div class='del'>-{</div><div class='del'>-	if (config)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	config = g_new0 (CalendarConfig, 1);</div><div class='del'>-</div><div class='del'>-	config_read ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, in which</div><div class='del'>-   case the user can choose between 12 and 24-hour time formats. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_locale_supports_12_hour_format (void)</div><div class='del'>-{</div><div class='del'>-	char s[16];</div><div class='del'>-	time_t t = 0;</div><div class='del'>-</div><div class='del'>-	strftime (s, sizeof s, "%p", gmtime (&amp;t));</div><div class='del'>-	return s[0] != '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-config_read				(void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *units;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Default to UTC if the timezone is not set or is "". */</div><div class='del'>-	config-&gt;timezone =  bonobo_config_get_string_with_default (db,</div><div class='del'>-                "/Calendar/Display/Timezone", "UTC", NULL);</div><div class='del'>-	if (!config-&gt;timezone || !config-&gt;timezone[0]) {</div><div class='del'>-		g_free (config-&gt;timezone);</div><div class='del'>-		config-&gt;timezone = g_strdup ("UTC");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	config-&gt;working_days = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/WorkingDays", CAL_MONDAY | CAL_TUESDAY |</div><div class='del'>-		CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;week_start_day = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/WeekStartDay", 1, NULL);</div><div class='del'>-</div><div class='del'>-	/* If the locale defines 'am' and 'pm' strings then the user has the</div><div class='del'>-	   choice of 12-hour or 24-hour time format, with 12-hour as the</div><div class='del'>-	   default. If the locale doesn't have 'am' and 'pm' strings we have</div><div class='del'>-	   to use 24-hour format, or strftime()/strptime() won't work. */</div><div class='del'>-	if (calendar_config_locale_supports_12_hour_format ()) {</div><div class='del'>-		config-&gt;use_24_hour_format = bonobo_config_get_boolean_with_default (db, "/Calendar/Display/Use24HourFormat", FALSE, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		config-&gt;use_24_hour_format = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	config-&gt;week_start_day = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/WeekStartDay", 1, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;day_start_hour = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/DayStartHour", 9, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;day_start_minute = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/DayStartMinute", 0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;day_end_hour =  bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/DayEndHour", 17, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;day_end_minute = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/DayEndMinute", 0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;time_divisions = bonobo_config_get_long_with_default (db,</div><div class='del'>-                "/Calendar/Display/TimeDivisions", 30, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;view = bonobo_config_get_long_with_default (db,</div><div class='del'>-		"/Calendar/Display/View", 0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;hpane_pos = bonobo_config_get_float_with_default (db,</div><div class='del'>-                "/Calendar/Display/HPanePosition", 1.0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;vpane_pos = bonobo_config_get_float_with_default (db,</div><div class='del'>-                "/Calendar/Display/VPanePosition", 1.0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;month_hpane_pos = bonobo_config_get_float_with_default (db,</div><div class='del'>-                "/Calendar/Display/MonthHPanePosition", 0.0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;month_vpane_pos = bonobo_config_get_float_with_default (db,</div><div class='del'>-                "/Calendar/Display/MonthVPanePosition", 1.0, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;compress_weekend =  bonobo_config_get_boolean_with_default (db,</div><div class='del'>-                "/Calendar/Display/CompressWeekend", TRUE, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;show_event_end =  bonobo_config_get_boolean_with_default (db,</div><div class='del'>-                "/Calendar/Display/ShowEventEndTime", TRUE, NULL);</div><div class='del'>-</div><div class='del'>-	/* 'DateNavigator' settings. */</div><div class='del'>-</div><div class='del'>-	config-&gt;dnav_show_week_no = bonobo_config_get_boolean_with_default (db,</div><div class='del'>-                "/Calendar/DateNavigator/ShowWeekNumbers", FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	/* Task list settings */</div><div class='del'>-</div><div class='del'>-	config-&gt;tasks_due_today_color = bonobo_config_get_string_with_default (</div><div class='del'>-		db, "/Calendar/Tasks/Colors/TasksDueToday", "blue", NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;tasks_overdue_color = bonobo_config_get_string_with_default (</div><div class='del'>-		db, "/Calendar/Tasks/Colors/TasksOverdue", "red", NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;hide_completed_tasks = bonobo_config_get_boolean_with_default (</div><div class='del'>-		db, "/Calendar/Tasks/HideCompletedTasks", FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	units = bonobo_config_get_string_with_default (db,</div><div class='del'>-		"/Calendar/Tasks/HideCompletedTasksUnits", "days", NULL);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (units, "minutes"))</div><div class='del'>-		config-&gt;hide_completed_tasks_units = CAL_MINUTES;</div><div class='del'>-	else if (!strcmp (units, "hours"))</div><div class='del'>-		config-&gt;hide_completed_tasks_units = CAL_HOURS;</div><div class='del'>-	else</div><div class='del'>-		config-&gt;hide_completed_tasks_units = CAL_DAYS;</div><div class='del'>-</div><div class='del'>-	g_free (units);</div><div class='del'>-</div><div class='del'>-	config-&gt;hide_completed_tasks_value = bonobo_config_get_long_with_default (</div><div class='del'>-		db, "/Calendar/Tasks/HideCompletedTasksValue", 1, NULL);</div><div class='del'>-</div><div class='del'>-	/* Confirmation */</div><div class='del'>-	config-&gt;confirm_delete = bonobo_config_get_boolean_with_default (</div><div class='del'>-		db, "/Calendar/Other/ConfirmDelete", TRUE, NULL);</div><div class='del'>-	config-&gt;confirm_expunge = bonobo_config_get_boolean_with_default (</div><div class='del'>-		db, "/Calendar/Other/ConfirmExpunge", TRUE, NULL);</div><div class='del'>-</div><div class='del'>-	/* Default reminders */</div><div class='del'>-	config-&gt;use_default_reminder = bonobo_config_get_boolean_with_default (</div><div class='del'>-		db, "/Calendar/Other/UseDefaultReminder", FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	config-&gt;default_reminder_interval = bonobo_config_get_long_with_default (</div><div class='del'>-		db, "/Calendar/Other/DefaultReminderInterval", 15, NULL);</div><div class='del'>-</div><div class='del'>-	units = bonobo_config_get_string_with_default (db,</div><div class='del'>-		"/Calendar/Other/DefaultReminderUnits", "minutes", NULL);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (units, "days"))</div><div class='del'>-		config-&gt;default_reminder_units = CAL_DAYS;</div><div class='del'>-	else if (!strcmp (units, "hours"))</div><div class='del'>-		config-&gt;default_reminder_units = CAL_HOURS;</div><div class='del'>-	else</div><div class='del'>-		config-&gt;default_reminder_units = CAL_MINUTES; /* changed from above because</div><div class='del'>-							       * if bonobo-config fucks up</div><div class='del'>-							       * we want minutes, not days!</div><div class='del'>-							       */</div><div class='del'>-	g_free (units);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the string representation of a units value */</div><div class='del'>-static const char *</div><div class='del'>-units_to_string (CalUnits units)</div><div class='del'>-{</div><div class='del'>-	switch (units) {</div><div class='del'>-	case CAL_DAYS:</div><div class='del'>-		return "days";</div><div class='del'>-</div><div class='del'>-	case CAL_HOURS:</div><div class='del'>-		return "hours";</div><div class='del'>-</div><div class='del'>-	case CAL_MINUTES:</div><div class='del'>-		return "minutes";</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_write			(void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	if (config-&gt;timezone)</div><div class='del'>-		bonobo_config_set_string (db, "/Calendar/Display/Timezone",</div><div class='del'>-					  config-&gt;timezone, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/WorkingDays",</div><div class='del'>-				config-&gt;working_days, NULL);</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Display/Use24HourFormat",</div><div class='del'>-				   config-&gt;use_24_hour_format, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/WeekStartDay",</div><div class='del'>-				config-&gt;week_start_day, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/DayStartHour",</div><div class='del'>-				config-&gt;day_start_hour, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/DayStartMinute",</div><div class='del'>-				config-&gt;day_start_minute, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/DayEndHour",</div><div class='del'>-				config-&gt;day_end_hour, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/DayEndMinute",</div><div class='del'>-				config-&gt;day_end_minute, NULL);</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Display/CompressWeekend",</div><div class='del'>-				   config-&gt;compress_weekend, NULL);</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Display/ShowEventEndTime",</div><div class='del'>-				   config-&gt;show_event_end, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_boolean (db,</div><div class='del'>-				   "/Calendar/DateNavigator/ShowWeekNumbers",</div><div class='del'>-				   config-&gt;dnav_show_week_no, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (db, "/Calendar/Tasks/Colors/TasksDueToday",</div><div class='del'>-				  config-&gt;tasks_due_today_color, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (db, "/Calendar/Tasks/Colors/TasksOverdue",</div><div class='del'>-				  config-&gt;tasks_overdue_color, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Tasks/HideCompletedTasks",</div><div class='del'>-				   config-&gt;hide_completed_tasks, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (db,</div><div class='del'>-				  "/Calendar/Tasks/HideCompletedTasksUnits",</div><div class='del'>-				  units_to_string (config-&gt;hide_completed_tasks_units), NULL);</div><div class='del'>-	bonobo_config_set_long (db,</div><div class='del'>-				"/Calendar/Tasks/HideCompletedTasksValue",</div><div class='del'>-				config-&gt;hide_completed_tasks_value, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmDelete", config-&gt;confirm_delete, NULL);</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge", config-&gt;confirm_expunge, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Other/UseDefaultReminder",</div><div class='del'>-				   config-&gt;use_default_reminder, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Other/DefaultReminderInterval",</div><div class='del'>-				config-&gt;default_reminder_interval, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (db, "/Calendar/Other/DefaultReminderUnits",</div><div class='del'>-				  units_to_string (config-&gt;default_reminder_units), NULL);</div><div class='del'>-</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_write_on_exit		(void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/View",</div><div class='del'>-				config-&gt;view, NULL);</div><div class='del'>-	bonobo_config_set_long (db, "/Calendar/Display/TimeDivisions",</div><div class='del'>-				config-&gt;time_divisions, NULL);</div><div class='del'>-	bonobo_config_set_float (db, "/Calendar/Display/HPanePosition",</div><div class='del'>-				 config-&gt;hpane_pos, NULL);</div><div class='del'>-	bonobo_config_set_float (db, "/Calendar/Display/VPanePosition",</div><div class='del'>-				 config-&gt;vpane_pos, NULL);</div><div class='del'>-	bonobo_config_set_float (db, "/Calendar/Display/MonthHPanePosition",</div><div class='del'>-				 config-&gt;month_hpane_pos, NULL);</div><div class='del'>-	bonobo_config_set_float (db, "/Calendar/Display/MonthVPanePosition",</div><div class='del'>-				 config-&gt;month_vpane_pos, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_boolean (db, "/Calendar/Other/ConfirmExpunge",</div><div class='del'>-				   config-&gt;confirm_expunge, NULL);</div><div class='del'>-</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calendar Settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The current timezone, e.g. "Europe/London". It may be NULL, in which case</div><div class='del'>-   you should assume UTC (though Evolution will show the timezone-setting</div><div class='del'>-   dialog the next time a calendar or task folder is selected). */</div><div class='del'>-gchar*</div><div class='del'>-calendar_config_get_timezone		(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;timezone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Sets the timezone. If set to NULL it defaults to UTC.</div><div class='del'>-   FIXME: Should check it is being set to a valid timezone. */</div><div class='del'>-void</div><div class='del'>-calendar_config_set_timezone		(gchar	     *timezone)</div><div class='del'>-{</div><div class='del'>-	g_free (config-&gt;timezone);</div><div class='del'>-</div><div class='del'>-	if (timezone &amp;&amp; timezone[0])</div><div class='del'>-		config-&gt;timezone = g_strdup (timezone);</div><div class='del'>-	else</div><div class='del'>-		config-&gt;timezone = g_strdup ("UTC");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 24-hour format or 12-hour format (AM/PM). */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_24_hour_format	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_24_hour_format	(gboolean     use_24_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The start day of the week (0 = Sun to 6 = Mon). */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_week_start_day	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_week_start_day	(gint	      week_start_day)</div><div class='del'>-{</div><div class='del'>-	config-&gt;week_start_day = week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The start and end times of the work-day. */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_start_hour	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_start_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_start_hour	(gint	      day_start_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_start_hour = day_start_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_start_minute	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_start_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_start_minute	(gint	      day_start_min)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_start_minute = day_start_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_end_hour	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_end_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_end_hour	(gint	      day_end_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_end_hour = day_end_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_end_minute	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_end_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_end_minute	(gint	      day_end_min)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_end_minute = day_end_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_time_divisions	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;time_divisions;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_time_divisions	(gint	      divisions)</div><div class='del'>-{</div><div class='del'>-	config-&gt;time_divisions = divisions;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we show week numbers in the Date Navigator. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_dnav_show_week_no	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;dnav_show_week_no;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)</div><div class='del'>-{</div><div class='del'>-	config-&gt;dnav_show_week_no = show_week_no;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_default_view	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_default_view	(gint	      view)</div><div class='del'>-{</div><div class='del'>-	config-&gt;view = view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The positions of the panes in the normal and month views. */</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_hpane_pos		(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_hpane_pos		(gfloat	      hpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;hpane_pos = hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_vpane_pos		(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_vpane_pos		(gfloat	      vpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;vpane_pos = vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_month_hpane_pos	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;month_hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;month_hpane_pos = hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_month_vpane_pos	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;month_vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;month_vpane_pos = vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we compress the weekend in the week/month views. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_compress_weekend	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;compress_weekend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_compress_weekend	(gboolean     compress)</div><div class='del'>-{</div><div class='del'>-	config-&gt;compress_weekend = compress;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we show event end times. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_show_event_end	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;show_event_end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_show_event_end	(gboolean     show_end)</div><div class='del'>-{</div><div class='del'>-	config-&gt;show_event_end = show_end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The working days of the week, a bit-wise combination of flags. */</div><div class='del'>-CalWeekdays</div><div class='del'>-calendar_config_get_working_days	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;working_days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_working_days	(CalWeekdays  days)</div><div class='del'>-{</div><div class='del'>-	config-&gt;working_days = days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Settings to hide completed tasks. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_hide_completed_tasks	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;hide_completed_tasks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_hide_completed_tasks	(gboolean	hide)</div><div class='del'>-{</div><div class='del'>-	config-&gt;hide_completed_tasks = hide;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CalUnits</div><div class='del'>-calendar_config_get_hide_completed_tasks_units	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;hide_completed_tasks_units;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_hide_completed_tasks_units	(CalUnits	units)</div><div class='del'>-{</div><div class='del'>-	config-&gt;hide_completed_tasks_units = units;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_hide_completed_tasks_value	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;hide_completed_tasks_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_hide_completed_tasks_value	(gint		value)</div><div class='del'>-{</div><div class='del'>-	config-&gt;hide_completed_tasks_value = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_confirm_delete:</div><div class='del'>- *</div><div class='del'>- * Queries the configuration value for whether a confirmation dialog is</div><div class='del'>- * presented when deleting calendar/tasks items.</div><div class='del'>- *</div><div class='del'>- * Return value: Whether confirmation is required when deleting items.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_confirm_delete (void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;confirm_delete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_confirm_delete:</div><div class='del'>- * @confirm: Whether confirmation is required when deleting items.</div><div class='del'>- *</div><div class='del'>- * Sets the configuration value for whether a confirmation dialog is presented</div><div class='del'>- * when deleting calendar/tasks items.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_confirm_delete (gboolean confirm)</div><div class='del'>-{</div><div class='del'>-	config-&gt;confirm_delete = confirm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_confirm_expunge:</div><div class='del'>- *</div><div class='del'>- * Queries the configuration value for whether a confirmation dialog is</div><div class='del'>- * presented when expunging calendar/tasks items.</div><div class='del'>- *</div><div class='del'>- * Return value: Whether confirmation is required when expunging items.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_confirm_expunge (void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;confirm_expunge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_confirm_expunge:</div><div class='del'>- * @confirm: Whether confirmation is required when expunging items.</div><div class='del'>- *</div><div class='del'>- * Sets the configuration value for whether a confirmation dialog is presented</div><div class='del'>- * when expunging calendar/tasks items.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_confirm_expunge (gboolean confirm)</div><div class='del'>-{</div><div class='del'>-	config-&gt;confirm_expunge = confirm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This sets all the common config settings for an ECalendar widget.</div><div class='del'>-   These are the week start day, and whether we show week numbers. */</div><div class='del'>-void</div><div class='del'>-calendar_config_configure_e_calendar	(ECalendar	*cal)</div><div class='del'>-{</div><div class='del'>-	gboolean dnav_show_week_no;</div><div class='del'>-	gint week_start_day;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR (cal));</div><div class='del'>-</div><div class='del'>-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();</div><div class='del'>-</div><div class='del'>-	/* Note that this is 0 (Sun) to 6 (Sat). */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-</div><div class='del'>-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */</div><div class='del'>-	week_start_day = (week_start_day + 6) % 7;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (cal-&gt;calitem),</div><div class='del'>-			       "show_week_numbers", dnav_show_week_no,</div><div class='del'>-			       "week_start_day", week_start_day,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets all the common config settings for an EDateEdit widget.</div><div class='del'>-   These are the week start day, whether we show week numbers, and whether we</div><div class='del'>-   use 24 hour format. */</div><div class='del'>-void</div><div class='del'>-calendar_config_configure_e_date_edit	(EDateEdit	*dedit)</div><div class='del'>-{</div><div class='del'>-	gboolean dnav_show_week_no, use_24_hour;</div><div class='del'>-	gint week_start_day;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DATE_EDIT (dedit));</div><div class='del'>-</div><div class='del'>-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();</div><div class='del'>-</div><div class='del'>-	/* Note that this is 0 (Sun) to 6 (Sat). */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-</div><div class='del'>-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */</div><div class='del'>-	week_start_day = (week_start_day + 6) % 7;</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_week_start_day (dedit, week_start_day);</div><div class='del'>-	e_date_edit_set_show_week_numbers (dedit, dnav_show_week_no);</div><div class='del'>-	e_date_edit_set_use_24_hour_format (dedit, use_24_hour);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets all the common config settings for an ECellDateEdit ETable item.</div><div class='del'>-   These are the settings for the ECalendar popup and the time list (if we use</div><div class='del'>-   24 hour format, and the hours of the working day). */</div><div class='del'>-void</div><div class='del'>-calendar_config_configure_e_cell_date_edit	(ECellDateEdit	*ecde)</div><div class='del'>-{</div><div class='del'>-	gboolean use_24_hour;</div><div class='del'>-	gint start_hour, end_hour;</div><div class='del'>-	ECellPopup *ecp;</div><div class='del'>-	ECellDateEditText *ecd;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));</div><div class='del'>-</div><div class='del'>-	ecp = E_CELL_POPUP (ecde);</div><div class='del'>-	ecd = E_CELL_DATE_EDIT_TEXT (ecp-&gt;child);</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	calendar_config_configure_e_calendar (E_CALENDAR (ecde-&gt;calendar));</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	start_hour = calendar_config_get_day_start_hour ();</div><div class='del'>-	end_hour = calendar_config_get_day_end_hour ();</div><div class='del'>-</div><div class='del'>-	/* Round up the end hour. */</div><div class='del'>-	if (calendar_config_get_day_end_minute () != 0)</div><div class='del'>-		end_hour++;</div><div class='del'>-</div><div class='del'>-	e_cell_date_edit_freeze (ecde);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (ecde),</div><div class='del'>-			"use_24_hour_format", use_24_hour,</div><div class='del'>-#if 0</div><div class='del'>-			/* We use the default 0 - 24 now. */</div><div class='del'>-			"lower_hour", start_hour,</div><div class='del'>-			"upper_hour", end_hour,</div><div class='del'>-#endif</div><div class='del'>-			NULL);</div><div class='del'>-	e_cell_date_edit_thaw (ecde);</div><div class='del'>-</div><div class='del'>-	e_cell_date_edit_text_set_timezone (ecd, zone);</div><div class='del'>-	e_cell_date_edit_text_set_use_24_hour_format (ecd, use_24_hour);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets all the common config settings for an ECalendarTable widget.</div><div class='del'>-   These are the settings for the ECalendar popup and the time list (if we use</div><div class='del'>-   24 hour format, and the hours of the working day). */</div><div class='del'>-void</div><div class='del'>-calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	gboolean use_24_hour;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (cal_table);</div><div class='del'>-	calendar_model_set_use_24_hour_format (model, use_24_hour);</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	calendar_model_set_timezone (model, zone);</div><div class='del'>-</div><div class='del'>-	calendar_config_configure_e_cell_date_edit (cal_table-&gt;dates_cell);</div><div class='del'>-</div><div class='del'>-	/* Reload the event/tasks, since the 'Hide Completed Tasks' option</div><div class='del'>-	   may have been changed, so the query needs to be updated. */</div><div class='del'>-	calendar_model_refresh (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_check_timezone_set ()</div><div class='del'>-{</div><div class='del'>-	ETimezoneDialog *timezone_dialog;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GList *elem;</div><div class='del'>-	char *zone;</div><div class='del'>-</div><div class='del'>-	zone = calendar_config_get_timezone ();</div><div class='del'>-	if (zone &amp;&amp; zone[0])</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Show timezone dialog. */</div><div class='del'>-	timezone_dialog = e_timezone_dialog_new ();</div><div class='del'>-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);</div><div class='del'>-</div><div class='del'>-	/* Hide the cancel button, which is the 2nd button. */</div><div class='del'>-	elem = g_list_nth (GNOME_DIALOG (dialog)-&gt;buttons, 1);</div><div class='del'>-	gtk_widget_hide (elem-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (on_timezone_set),</div><div class='del'>-			    timezone_dialog);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog), "delete-event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (on_timezone_dialog_delete_event),</div><div class='del'>-			    timezone_dialog);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-on_timezone_set			(GnomeDialog	*dialog,</div><div class='del'>-				 int		 button,</div><div class='del'>-				 ETimezoneDialog *etd)</div><div class='del'>-{</div><div class='del'>-	char *display_name;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	e_timezone_dialog_get_timezone (etd, &amp;display_name);</div><div class='del'>-</div><div class='del'>-	/* We know it can only be a builtin timezone, since there is no way</div><div class='del'>-	   to set it to anything else. */</div><div class='del'>-	zone = e_timezone_dialog_get_builtin_timezone (display_name);</div><div class='del'>-	if (zone) {</div><div class='del'>-		calendar_config_set_timezone (icaltimezone_get_location (zone));</div><div class='del'>-</div><div class='del'>-		calendar_config_write ();</div><div class='del'>-		update_all_config_settings ();</div><div class='del'>-		e_tasks_update_all_config_settings ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (etd));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-on_timezone_dialog_delete_event	(GnomeDialog	*dialog,</div><div class='del'>-				 GdkEvent	*event,</div><div class='del'>-				 ETimezoneDialog *etd)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (etd));</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_tasks_due_today_color:</div><div class='del'>- *</div><div class='del'>- * Queries the color to be used to display tasks that are due today.</div><div class='del'>- *</div><div class='del'>- * Return value: An X color specification.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-calendar_config_get_tasks_due_today_color (void)</div><div class='del'>-{</div><div class='del'>-	g_assert (config-&gt;tasks_due_today_color != NULL);</div><div class='del'>-	return config-&gt;tasks_due_today_color;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_tasks_due_today_color:</div><div class='del'>- * @color: X color specification</div><div class='del'>- *</div><div class='del'>- * Sets the color to be used to display tasks that are due today.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_tasks_due_today_color (const char *color)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (color != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (config-&gt;tasks_due_today_color != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (config-&gt;tasks_due_today_color);</div><div class='del'>-	config-&gt;tasks_due_today_color = g_strdup (color);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_tasks_overdue_color:</div><div class='del'>- *</div><div class='del'>- * Queries the color to be used to display overdue tasks.</div><div class='del'>- *</div><div class='del'>- * Return value: An X color specification.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-calendar_config_get_tasks_overdue_color (void)</div><div class='del'>-{</div><div class='del'>-	g_assert (config-&gt;tasks_overdue_color != NULL);</div><div class='del'>-	return config-&gt;tasks_overdue_color;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_tasks_overdue_color:</div><div class='del'>- * @color: X color specification</div><div class='del'>- *</div><div class='del'>- * Sets the color to be used to display overdue tasks.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_tasks_overdue_color (const char *color)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (color != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (config-&gt;tasks_overdue_color != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (config-&gt;tasks_overdue_color);</div><div class='del'>-	config-&gt;tasks_overdue_color = g_strdup (color);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_use_default_reminder:</div><div class='del'>- *</div><div class='del'>- * Queries whether new appointments should be created with a default reminder.</div><div class='del'>- *</div><div class='del'>- * Return value: Boolean value indicating whether new appointments should be</div><div class='del'>- * created with a default reminder from the values of</div><div class='del'>- * calendar_config_get_default_reminder_interval() and</div><div class='del'>- * calendar_config_get_default_reminder_units().</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_use_default_reminder (void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;use_default_reminder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_use_default_reminder:</div><div class='del'>- * @value: Whether to create new appointments with a default reminder.</div><div class='del'>- *</div><div class='del'>- * Sets whether newly-created appointments should get a default reminder set</div><div class='del'>- * them.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_use_default_reminder (gboolean value)</div><div class='del'>-{</div><div class='del'>-	config-&gt;use_default_reminder = value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_default_reminder_interval:</div><div class='del'>- *</div><div class='del'>- * Queries the interval for the default reminder of newly-created</div><div class='del'>- * appointments, i.e. 5 in "5 minutes".</div><div class='del'>- *</div><div class='del'>- * Return value: Interval for default reminders.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-calendar_config_get_default_reminder_interval (void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;default_reminder_interval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_default_reminder_interval:</div><div class='del'>- * @interval: Interval value, e.g. 5 for "5 minutes".</div><div class='del'>- *</div><div class='del'>- * Sets the interval that should be used for the default reminder in new</div><div class='del'>- * appointments.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_default_reminder_interval (int interval)</div><div class='del'>-{</div><div class='del'>-	config-&gt;default_reminder_interval = interval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_default_reminder_units:</div><div class='del'>- *</div><div class='del'>- * Queries the units of time in which default reminders should be created for</div><div class='del'>- * new appointments, e.g. CAL_MINUTES for "5 minutes".</div><div class='del'>- *</div><div class='del'>- * Return value: Time units for default reminders.</div><div class='del'>- **/</div><div class='del'>-CalUnits</div><div class='del'>-calendar_config_get_default_reminder_units (void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;default_reminder_units;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_set_default_reminder_units:</div><div class='del'>- * @units: Time units, e.g. CAL_MINUTES for "5 minutes".</div><div class='del'>- *</div><div class='del'>- * Sets the units to be used for default reminders in new appointments.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_config_set_default_reminder_units (CalUnits units)</div><div class='del'>-{</div><div class='del'>-	config-&gt;default_reminder_units = units;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_config_get_hide_completed_tasks_sexp:</div><div class='del'>- *</div><div class='del'>- * Returns the subexpression to use to filter out completed tasks according</div><div class='del'>- * to the config settings. The returned sexp should be freed.</div><div class='del'>- **/</div><div class='del'>-char*</div><div class='del'>-calendar_config_get_hide_completed_tasks_sexp (void)</div><div class='del'>-{</div><div class='del'>-	char *sexp = NULL;</div><div class='del'>-</div><div class='del'>-	if (calendar_config_get_hide_completed_tasks ()) {</div><div class='del'>-		CalUnits units;</div><div class='del'>-		gint value;</div><div class='del'>-</div><div class='del'>-		units = calendar_config_get_hide_completed_tasks_units ();</div><div class='del'>-		value = calendar_config_get_hide_completed_tasks_value ();</div><div class='del'>-</div><div class='del'>-		if (value == 0) {</div><div class='del'>-			/* If the value is 0, we want to hide completed tasks</div><div class='del'>-			   immediately, so we filter out all completed tasks.*/</div><div class='del'>-			sexp = g_strdup ("(not is-completed?)");</div><div class='del'>-		} else {</div><div class='del'>-			char *location, *isodate;</div><div class='del'>-			icaltimezone *zone;</div><div class='del'>-			struct icaltimetype tt;</div><div class='del'>-			time_t t;</div><div class='del'>-</div><div class='del'>-			/* Get the current time, and subtract the appropriate</div><div class='del'>-			   number of days/hours/minutes. */</div><div class='del'>-			location = calendar_config_get_timezone ();</div><div class='del'>-			zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-			tt = icaltime_current_time_with_zone (zone);</div><div class='del'>-</div><div class='del'>-			switch (units) {</div><div class='del'>-			case CAL_DAYS:</div><div class='del'>-				icaltime_adjust (&amp;tt, -value, 0, 0, 0);</div><div class='del'>-				break;</div><div class='del'>-			case CAL_HOURS:</div><div class='del'>-				icaltime_adjust (&amp;tt, 0, -value, 0, 0);</div><div class='del'>-				break;</div><div class='del'>-			case CAL_MINUTES:</div><div class='del'>-				icaltime_adjust (&amp;tt, 0, 0, -value, 0);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				g_assert_not_reached ();</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			t = icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-</div><div class='del'>-			/* Convert the time to an ISO date string, and build</div><div class='del'>-			   the query sub-expression. */</div><div class='del'>-			isodate = isodate_from_time_t (t);</div><div class='del'>-			sexp = g_strdup_printf ("(not (completed-before? (make-time \"%s\")))", isodate);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-calendar_config_default_calendar_folder (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	char *uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	uri = bonobo_config_get_string (db, "/DefaultFolders/calendar_uri", &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return uri;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-calendar_config_default_tasks_folder (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	char *uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	uri = bonobo_config_get_string (db, "/DefaultFolders/tasks_uri", &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (db, NULL);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return uri;	</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h<br/>deleted file mode 100644<br/>index 6f0a9ee0fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-config.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,189 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * calendar-config.h - functions to load/save/get/set user settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CALENDAR_CONFIG_H_</div><div class='del'>-#define _CALENDAR_CONFIG_H_</div><div class='del'>-</div><div class='del'>-#include &lt;widgets/misc/e-calendar.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-cell-date-edit.h&gt;</div><div class='del'>-#include "e-calendar-table.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are used to get/set the working days in the week. The bit-flags are</div><div class='del'>-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the</div><div class='del'>-   day values used by localtime etc. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAL_SUNDAY	= 1 &lt;&lt; 0,</div><div class='del'>-	CAL_MONDAY	= 1 &lt;&lt; 1,</div><div class='del'>-	CAL_TUESDAY	= 1 &lt;&lt; 2,</div><div class='del'>-	CAL_WEDNESDAY	= 1 &lt;&lt; 3,</div><div class='del'>-	CAL_THURSDAY	= 1 &lt;&lt; 4,</div><div class='del'>-	CAL_FRIDAY	= 1 &lt;&lt; 5,</div><div class='del'>-	CAL_SATURDAY	= 1 &lt;&lt; 6</div><div class='del'>-} CalWeekdays;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Units for settings. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAL_DAYS,</div><div class='del'>-	CAL_HOURS,</div><div class='del'>-	CAL_MINUTES</div><div class='del'>-} CalUnits;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void	  calendar_config_init			(void);</div><div class='del'>-void	  calendar_config_write			(void);</div><div class='del'>-void	  calendar_config_write_on_exit		(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calendar Settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The current timezone, e.g. "Europe/London". */</div><div class='del'>-gchar*	  calendar_config_get_timezone		(void);</div><div class='del'>-void	  calendar_config_set_timezone		(gchar	     *timezone);</div><div class='del'>-</div><div class='del'>-/* The working days of the week, a bit-wise combination of flags. */</div><div class='del'>-CalWeekdays calendar_config_get_working_days	(void);</div><div class='del'>-void	  calendar_config_set_working_days	(CalWeekdays  days);</div><div class='del'>-</div><div class='del'>-/* The start day of the week (0 = Sun to 6 = Sat). */</div><div class='del'>-gint	  calendar_config_get_week_start_day	(void);</div><div class='del'>-void	  calendar_config_set_week_start_day	(gint	      week_start_day);</div><div class='del'>-</div><div class='del'>-/* The start and end times of the work-day. */</div><div class='del'>-gint	  calendar_config_get_day_start_hour	(void);</div><div class='del'>-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_start_minute	(void);</div><div class='del'>-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_end_hour	(void);</div><div class='del'>-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_end_minute	(void);</div><div class='del'>-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);</div><div class='del'>-</div><div class='del'>-/* Whether we use 24-hour format or 12-hour format (AM/PM). */</div><div class='del'>-gboolean  calendar_config_get_24_hour_format	(void);</div><div class='del'>-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);</div><div class='del'>-</div><div class='del'>-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */</div><div class='del'>-gint	  calendar_config_get_time_divisions	(void);</div><div class='del'>-void	  calendar_config_set_time_divisions	(gint	      divisions);</div><div class='del'>-</div><div class='del'>-/* Whether we show event end times. */</div><div class='del'>-gboolean  calendar_config_get_show_event_end	(void);</div><div class='del'>-void	  calendar_config_set_show_event_end	(gboolean     show_end);</div><div class='del'>-</div><div class='del'>-/* Whether we compress the weekend in the week/month views. */</div><div class='del'>-gboolean  calendar_config_get_compress_weekend	(void);</div><div class='del'>-void	  calendar_config_set_compress_weekend	(gboolean     compress);</div><div class='del'>-</div><div class='del'>-/* Whether we show week numbers in the Date Navigator. */</div><div class='del'>-gboolean  calendar_config_get_dnav_show_week_no	(void);</div><div class='del'>-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);</div><div class='del'>-</div><div class='del'>-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */</div><div class='del'>-gint	  calendar_config_get_default_view	(void);</div><div class='del'>-void	  calendar_config_set_default_view	(gint	      view);</div><div class='del'>-</div><div class='del'>-/* The positions of the panes in the normal and month views. */</div><div class='del'>-gfloat    calendar_config_get_hpane_pos		(void);</div><div class='del'>-void	  calendar_config_set_hpane_pos		(gfloat	      hpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_vpane_pos		(void);</div><div class='del'>-void	  calendar_config_set_vpane_pos		(gfloat	      vpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_month_hpane_pos	(void);</div><div class='del'>-void	  calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_month_vpane_pos	(void);</div><div class='del'>-void	  calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos);</div><div class='del'>-</div><div class='del'>-/* Colors for the task list */</div><div class='del'>-const char *calendar_config_get_tasks_due_today_color	(void);</div><div class='del'>-void	    calendar_config_set_tasks_due_today_color	(const char *color);</div><div class='del'>-</div><div class='del'>-const char *calendar_config_get_tasks_overdue_color	(void);</div><div class='del'>-void	    calendar_config_set_tasks_overdue_color	(const char *color);</div><div class='del'>-</div><div class='del'>-/* Settings to hide completed tasks. */</div><div class='del'>-gboolean  calendar_config_get_hide_completed_tasks	(void);</div><div class='del'>-void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);</div><div class='del'>-</div><div class='del'>-CalUnits  calendar_config_get_hide_completed_tasks_units(void);</div><div class='del'>-void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_hide_completed_tasks_value(void);</div><div class='del'>-void	  calendar_config_set_hide_completed_tasks_value(gint		value);</div><div class='del'>-</div><div class='del'>-char*	  calendar_config_get_hide_completed_tasks_sexp (void);</div><div class='del'>-</div><div class='del'>-/* Confirmation options */</div><div class='del'>-gboolean  calendar_config_get_confirm_delete (void);</div><div class='del'>-void      calendar_config_set_confirm_delete (gboolean confirm);</div><div class='del'>-</div><div class='del'>-gboolean  calendar_config_get_confirm_expunge (void);</div><div class='del'>-void      calendar_config_set_confirm_expunge (gboolean confirm);</div><div class='del'>-</div><div class='del'>-/* Default reminder options */</div><div class='del'>-gboolean calendar_config_get_use_default_reminder (void);</div><div class='del'>-void     calendar_config_set_use_default_reminder (gboolean value);</div><div class='del'>-</div><div class='del'>-int      calendar_config_get_default_reminder_interval (void);</div><div class='del'>-void     calendar_config_set_default_reminder_interval (int interval);</div><div class='del'>-</div><div class='del'>-CalUnits calendar_config_get_default_reminder_units (void);</div><div class='del'>-void     calendar_config_set_default_reminder_units (CalUnits units);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Convenience functions to configure common properties of ECalendar,</div><div class='del'>-   EDateEdit &amp; ECalendarTable widgets, and the ECellDateEdit ETable cell. */</div><div class='del'>-void	  calendar_config_configure_e_calendar		(ECalendar	*cal);</div><div class='del'>-void	  calendar_config_configure_e_date_edit		(EDateEdit	*dedit);</div><div class='del'>-void	  calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table);</div><div class='del'>-void	  calendar_config_configure_e_cell_date_edit	(ECellDateEdit	*ecde);</div><div class='del'>-</div><div class='del'>-/* Shows the timezone dialog if the user hasn't set a default timezone. */</div><div class='del'>-void	  calendar_config_check_timezone_set	(void);</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it</div><div class='del'>-   supports 12-hour time format. */</div><div class='del'>-gboolean  calendar_config_locale_supports_12_hour_format(void);</div><div class='del'>-</div><div class='del'>-/* Default folders, read-only */</div><div class='del'>-char *calendar_config_default_calendar_folder (void);</div><div class='del'>-char *calendar_config_default_tasks_folder (void);</div><div class='del'>-</div><div class='del'>-#endif /* _CALENDAR_CONFIG_H_ */</div><div class='head'>diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c<br/>deleted file mode 100644<br/>index e8317402ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2465 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* Evolution calendar - Data model for ETable</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-#include "evolution-activity-client.h"</div><div class='del'>-#include "e-cell-date-edit-text.h"</div><div class='del'>-#include "misc.h"</div><div class='del'>-</div><div class='del'>-/* This specifies how often we refresh the list, so that completed tasks are</div><div class='del'>-   hidden according to the config setting, and overdue tasks change color etc.</div><div class='del'>-   It is in milliseconds, so this is 10 minutes.</div><div class='del'>-   Note that if the user is editing an item in the list, they will probably</div><div class='del'>-   lose their edit, so this isn't ideal. */</div><div class='del'>-#define CALENDAR_MODEL_REFRESH_TIMEOUT	1000 * 60 * 10</div><div class='del'>-</div><div class='del'>-/* These hold the date values of the objects, so we can free the values when</div><div class='del'>-   we no longer need them. */</div><div class='del'>-typedef struct _CalendarModelObjectData CalendarModelObjectData;</div><div class='del'>-struct _CalendarModelObjectData {</div><div class='del'>-	ECellDateEditValue *dtstart;</div><div class='del'>-	ECellDateEditValue *dtend;</div><div class='del'>-	ECellDateEditValue *due;</div><div class='del'>-	ECellDateEditValue *completed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* We use a pointer to this value to indicate that the property is not set. */</div><div class='del'>-static ECellDateEditValue unset_date_edit_value;</div><div class='del'>-</div><div class='del'>-/* Private part of the ECalendarModel structure */</div><div class='del'>-struct _CalendarModelPrivate {</div><div class='del'>-	/* Calendar client we are using */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Types of objects we are dealing with */</div><div class='del'>-	CalObjType type;</div><div class='del'>-</div><div class='del'>-	/* S-expression for query and the query object */</div><div class='del'>-	char *sexp;</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	/* Array of pointers to calendar objects */</div><div class='del'>-	GArray *objects;</div><div class='del'>-</div><div class='del'>-	/* Array of CalendarModelObjectData* holding data for each of the</div><div class='del'>-	   objects in the objects array above. */</div><div class='del'>-	GArray *objects_data;</div><div class='del'>-</div><div class='del'>-	/* UID -&gt; array index hash */</div><div class='del'>-	GHashTable *uid_index_hash;</div><div class='del'>-</div><div class='del'>-	/* Type of components to create when using click-to-add in the table */</div><div class='del'>-	CalComponentVType new_comp_vtype;</div><div class='del'>-</div><div class='del'>-	/* Whether we display dates in 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-	/* The default category to use when creating new tasks, e.g. when the</div><div class='del'>-	   filter is set to a certain category we use that category when</div><div class='del'>-	   creating a new task. */</div><div class='del'>-	gchar *default_category;</div><div class='del'>-</div><div class='del'>-	/* Addresses for determining icons */</div><div class='del'>-	GList *addresses;</div><div class='del'>-	</div><div class='del'>-	/* The current timezone. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* The id of our timeout function for refreshing the list. */</div><div class='del'>-	gint timeout_id;</div><div class='del'>-</div><div class='del'>-	/* The activity client used to show messages on the status bar. */</div><div class='del'>-	EvolutionActivityClient *activity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void calendar_model_class_init (CalendarModelClass *class);</div><div class='del'>-static void calendar_model_init (CalendarModel *model);</div><div class='del'>-static void calendar_model_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static int calendar_model_column_count (ETableModel *etm);</div><div class='del'>-static int calendar_model_row_count (ETableModel *etm);</div><div class='del'>-static void *calendar_model_value_at (ETableModel *etm, int col, int row);</div><div class='del'>-static void calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value);</div><div class='del'>-static gboolean calendar_model_is_cell_editable (ETableModel *etm, int col, int row);</div><div class='del'>-static void calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row);</div><div class='del'>-static void *calendar_model_duplicate_value (ETableModel *etm, int col, const void *value);</div><div class='del'>-static void calendar_model_free_value (ETableModel *etm, int col, void *value);</div><div class='del'>-static void *calendar_model_initialize_value (ETableModel *etm, int col);</div><div class='del'>-static gboolean calendar_model_value_is_empty (ETableModel *etm, int col, const void *value);</div><div class='del'>-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);</div><div class='del'>-static int remove_object (CalendarModel *model, const char *uid);</div><div class='del'>-static void ensure_task_complete (CalComponent *comp,</div><div class='del'>-				  time_t completed_date);</div><div class='del'>-static void ensure_task_not_complete (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-static ETableModelClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalendarModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalendarModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-calendar_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType calendar_model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!calendar_model_type) {</div><div class='del'>-		static GtkTypeInfo calendar_model_info = {</div><div class='del'>-			"CalendarModel",</div><div class='del'>-			sizeof (CalendarModel),</div><div class='del'>-			sizeof (CalendarModelClass),</div><div class='del'>-			(GtkClassInitFunc) calendar_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) calendar_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		calendar_model_type = gtk_type_unique (E_TABLE_MODEL_TYPE, &amp;calendar_model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return calendar_model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_class_init (CalendarModelClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETableModelClass *etm_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	etm_class = (ETableModelClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = calendar_model_destroy;</div><div class='del'>-</div><div class='del'>-	etm_class-&gt;column_count = calendar_model_column_count;</div><div class='del'>-	etm_class-&gt;row_count = calendar_model_row_count;</div><div class='del'>-	etm_class-&gt;value_at = calendar_model_value_at;</div><div class='del'>-	etm_class-&gt;set_value_at = calendar_model_set_value_at;</div><div class='del'>-	etm_class-&gt;is_cell_editable = calendar_model_is_cell_editable;</div><div class='del'>-	etm_class-&gt;append_row = calendar_model_append_row;</div><div class='del'>-	etm_class-&gt;duplicate_value = calendar_model_duplicate_value;</div><div class='del'>-	etm_class-&gt;free_value = calendar_model_free_value;</div><div class='del'>-	etm_class-&gt;initialize_value = calendar_model_initialize_value;</div><div class='del'>-	etm_class-&gt;value_is_empty = calendar_model_value_is_empty;</div><div class='del'>-	etm_class-&gt;value_to_string = calendar_model_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-calendar_model_timeout_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (data), FALSE);</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	calendar_model_refresh (model);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE ();</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_init (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalendarModelPrivate, 1);</div><div class='del'>-	model-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;sexp = g_strdup ("#t"); /* match all by default */</div><div class='del'>-	priv-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));</div><div class='del'>-	priv-&gt;objects_data = g_array_new (FALSE, FALSE, sizeof (CalendarModelObjectData));</div><div class='del'>-	priv-&gt;uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;new_comp_vtype = CAL_COMPONENT_EVENT;</div><div class='del'>-	priv-&gt;use_24_hour_format = TRUE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;timeout_id = g_timeout_add (CALENDAR_MODEL_REFRESH_TIMEOUT,</div><div class='del'>-					  calendar_model_timeout_cb, model);</div><div class='del'>-</div><div class='del'>-	priv-&gt;addresses = itip_addresses_get ();</div><div class='del'>-	</div><div class='del'>-	priv-&gt;zone = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;activity = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_model_free_object_data (CalendarModel *model,</div><div class='del'>-				 CalendarModelObjectData *object_data)</div><div class='del'>-{</div><div class='del'>-	if (object_data-&gt;dtstart != &amp;unset_date_edit_value)</div><div class='del'>-		g_free (object_data-&gt;dtstart);</div><div class='del'>-</div><div class='del'>-	if (object_data-&gt;dtend != &amp;unset_date_edit_value)</div><div class='del'>-		g_free (object_data-&gt;dtend);</div><div class='del'>-</div><div class='del'>-	if (object_data-&gt;due != &amp;unset_date_edit_value)</div><div class='del'>-		g_free (object_data-&gt;due);</div><div class='del'>-</div><div class='del'>-	if (object_data-&gt;completed != &amp;unset_date_edit_value)</div><div class='del'>-		g_free (object_data-&gt;completed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called from g_hash_table_foreach_remove(), frees a stored UID-&gt;index</div><div class='del'>- * mapping.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-free_uid_index (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int *idx;</div><div class='del'>-</div><div class='del'>-	idx = value;</div><div class='del'>-	g_free (idx);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees the objects stored in the calendar model */</div><div class='del'>-static void</div><div class='del'>-free_objects (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (priv-&gt;uid_index_hash, free_uid_index, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalendarModelObjectData *object_data;</div><div class='del'>-</div><div class='del'>-		comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-		g_assert (comp != NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-		object_data = &amp;g_array_index (priv-&gt;objects_data,</div><div class='del'>-					      CalendarModelObjectData, i);</div><div class='del'>-		calendar_model_free_object_data (model, object_data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (priv-&gt;objects, 0);</div><div class='del'>-	g_array_set_size (priv-&gt;objects_data, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (object));</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (object);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;timeout_id) {</div><div class='del'>-		g_source_remove (priv-&gt;timeout_id);</div><div class='del'>-		priv-&gt;timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the calendar client interface object */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client), model);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sexp) {</div><div class='del'>-		g_free (priv-&gt;sexp);</div><div class='del'>-		priv-&gt;sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;query), model);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;query));</div><div class='del'>-		priv-&gt;query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the uid-&gt;index hash data and the array of UIDs */</div><div class='del'>-</div><div class='del'>-	free_objects (model);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy (priv-&gt;uid_index_hash);</div><div class='del'>-	priv-&gt;uid_index_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_array_free (priv-&gt;objects, TRUE);</div><div class='del'>-	priv-&gt;objects = NULL;</div><div class='del'>-</div><div class='del'>-	g_array_free (priv-&gt;objects_data, TRUE);</div><div class='del'>-	priv-&gt;objects_data = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;default_category);</div><div class='del'>-</div><div class='del'>-	itip_addresses_free (priv-&gt;addresses);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;activity) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;activity));</div><div class='del'>-		priv-&gt;activity = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the private structure */</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	model-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ETableModel methods */</div><div class='del'>-</div><div class='del'>-/* column_count handler for the calendar table model */</div><div class='del'>-static int</div><div class='del'>-calendar_model_column_count (ETableModel *etm)</div><div class='del'>-{</div><div class='del'>-	return CAL_COMPONENT_FIELD_NUM_FIELDS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* row_count handler for the calendar table model */</div><div class='del'>-static int</div><div class='del'>-calendar_model_row_count (ETableModel *etm)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;objects-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string based on the list of CATEGORIES properties of a calendar</div><div class='del'>- * component.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-get_categories (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *categories;</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories (comp, &amp;categories);</div><div class='del'>-</div><div class='del'>-	return categories ? (char*) categories : "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a string based on the CLASSIFICATION property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_classification (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	switch (classif) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-		return _("Private");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-		return _("Confidential");</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return _("Public");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns an ECellDateEditValue* for a COMPLETED property of a</div><div class='del'>-   calendar component. Note that we cache these in the objects_data array so</div><div class='del'>-   we can free them eventually. */</div><div class='del'>-static ECellDateEditValue*</div><div class='del'>-get_completed	(CalendarModel *model,</div><div class='del'>-		 CalComponent  *comp,</div><div class='del'>-		 int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalendarModelObjectData *object_data;</div><div class='del'>-	struct icaltimetype *completed;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	object_data = &amp;g_array_index (priv-&gt;objects_data,</div><div class='del'>-				      CalendarModelObjectData, row);</div><div class='del'>-</div><div class='del'>-	if (!object_data-&gt;completed) {</div><div class='del'>-		cal_component_get_completed (comp, &amp;completed);</div><div class='del'>-</div><div class='del'>-		if (completed) {</div><div class='del'>-			object_data-&gt;completed = g_new (ECellDateEditValue, 1);</div><div class='del'>-			object_data-&gt;completed-&gt;tt = *completed;</div><div class='del'>-			object_data-&gt;completed-&gt;zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-			cal_component_free_icaltimetype (completed);</div><div class='del'>-		} else {</div><div class='del'>-			object_data-&gt;completed = &amp;unset_date_edit_value;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (object_data-&gt;completed == &amp;unset_date_edit_value)</div><div class='del'>-		? NULL : object_data-&gt;completed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns an ECellDateEditValue* for a DTSTART, DTEND or DUE property of a</div><div class='del'>-   calendar component. Note that we cache these in the objects_data array so</div><div class='del'>-   we can free them eventually. */</div><div class='del'>-static ECellDateEditValue*</div><div class='del'>-get_date_edit_value (CalendarModel *model, CalComponent *comp,</div><div class='del'>-		     int col, int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	CalendarModelObjectData *object_data;</div><div class='del'>-	ECellDateEditValue **value;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	object_data = &amp;g_array_index (priv-&gt;objects_data,</div><div class='del'>-				      CalendarModelObjectData, row);</div><div class='del'>-</div><div class='del'>-	if (col == CAL_COMPONENT_FIELD_DTSTART)</div><div class='del'>-		value = &amp;object_data-&gt;dtstart;</div><div class='del'>-	else if (col == CAL_COMPONENT_FIELD_DTEND)</div><div class='del'>-		value = &amp;object_data-&gt;dtend;</div><div class='del'>-	else</div><div class='del'>-		value = &amp;object_data-&gt;due;</div><div class='del'>-</div><div class='del'>-	if (!(*value)) {</div><div class='del'>-		if (col == CAL_COMPONENT_FIELD_DTSTART)</div><div class='del'>-			cal_component_get_dtstart (comp, &amp;dt);</div><div class='del'>-		else if (col == CAL_COMPONENT_FIELD_DTEND)</div><div class='del'>-			cal_component_get_dtend (comp, &amp;dt);</div><div class='del'>-		else</div><div class='del'>-			cal_component_get_due (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-		if (dt.value) {</div><div class='del'>-			CalClientGetStatus status;</div><div class='del'>-			icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-			/* For a DTEND with a DATE value, we subtract 1 from</div><div class='del'>-			   the day to display it. */</div><div class='del'>-			if (col == CAL_COMPONENT_FIELD_DTEND</div><div class='del'>-			    &amp;&amp; dt.value-&gt;is_date) {</div><div class='del'>-				icaltime_adjust (dt.value, -1, 0, 0, 0);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			*value = g_new (ECellDateEditValue, 1);</div><div class='del'>-			(*value)-&gt;tt = *dt.value;</div><div class='del'>-</div><div class='del'>-			/* FIXME: TIMEZONES: Handle error. */</div><div class='del'>-			status = cal_client_get_timezone (model-&gt;priv-&gt;client,</div><div class='del'>-							  dt.tzid, &amp;zone);</div><div class='del'>-			(*value)-&gt;zone = zone;</div><div class='del'>-		} else {</div><div class='del'>-			*value = &amp;unset_date_edit_value;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cal_component_free_datetime (&amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (*value == &amp;unset_date_edit_value) ? NULL : *value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the GEO property of a calendar component */</div><div class='del'>-static char*</div><div class='del'>-get_geo (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	struct icalgeotype *geo;</div><div class='del'>-	static gchar buf[32];</div><div class='del'>-</div><div class='del'>-	cal_component_get_geo (comp, &amp;geo);</div><div class='del'>-</div><div class='del'>-	if (!geo)</div><div class='del'>-		buf[0] = '\0';</div><div class='del'>-	else {</div><div class='del'>-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",</div><div class='del'>-			    fabs (geo-&gt;lat),</div><div class='del'>-			    geo-&gt;lat &gt;= 0.0 ? _("N") : _("S"),</div><div class='del'>-			    fabs (geo-&gt;lon),</div><div class='del'>-			    geo-&gt;lon &gt;= 0.0 ? _("E") : _("W"));</div><div class='del'>-		cal_component_free_geo (geo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the PERCENT property of a calendar component */</div><div class='del'>-static int</div><div class='del'>-get_percent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	int *percent, retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-	if (percent) {</div><div class='del'>-		retval = *percent;</div><div class='del'>-		cal_component_free_percent (percent);</div><div class='del'>-	} else {</div><div class='del'>-		retval = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the PRIORITY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_priority (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	int *priority;</div><div class='del'>-	char *retval = "";</div><div class='del'>-</div><div class='del'>-	cal_component_get_priority (comp, &amp;priority);</div><div class='del'>-</div><div class='del'>-	if (priority) {</div><div class='del'>-		retval = cal_util_priority_to_string (*priority);</div><div class='del'>-		cal_component_free_priority (priority);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the SUMMARY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_summary (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	if (summary.value)</div><div class='del'>-		return (char *) summary.value;</div><div class='del'>-	else</div><div class='del'>-		return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the TRANSPARENCY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_transparency (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentTransparency transp;</div><div class='del'>-</div><div class='del'>-	cal_component_get_transparency (comp, &amp;transp);</div><div class='del'>-</div><div class='del'>-	if (transp == CAL_COMPONENT_TRANSP_TRANSPARENT)</div><div class='del'>-		return _("Free");</div><div class='del'>-	else</div><div class='del'>-		return _("Busy");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the URL property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_url (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *url;</div><div class='del'>-</div><div class='del'>-	cal_component_get_url (comp, &amp;url);</div><div class='del'>-</div><div class='del'>-	if (url)</div><div class='del'>-		return (char *) url;</div><div class='del'>-	else</div><div class='del'>-		return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the completion date has been set on a component */</div><div class='del'>-static gboolean</div><div class='del'>-is_complete (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype *t;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;t);</div><div class='del'>-	retval = (t != NULL);</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		cal_component_free_icaltimetype (t);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether a component is overdue.  Sigh, this is very similar to</div><div class='del'>- * get_color() below.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-is_overdue (CalendarModel *model, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	/* First, do we have a due date? */</div><div class='del'>-</div><div class='del'>-	if (!dt.value)</div><div class='del'>-		retval = FALSE;</div><div class='del'>-	else {</div><div class='del'>-		struct icaltimetype now_tt;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-		/* Second, is it already completed? */</div><div class='del'>-</div><div class='del'>-		if (is_complete (comp)) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Third, are we overdue as of right now? */</div><div class='del'>-</div><div class='del'>-		/* Get the current time in the same timezone as the DUE date.*/</div><div class='del'>-		/* FIXME: TIMEZONES: Handle error. */</div><div class='del'>-		status = cal_client_get_timezone (model-&gt;priv-&gt;client, dt.tzid,</div><div class='del'>-						  &amp;zone);</div><div class='del'>-		now_tt = icaltime_current_time_with_zone (zone);</div><div class='del'>-</div><div class='del'>-		if (icaltime_compare (*dt.value, now_tt) &lt;= 0)</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		else</div><div class='del'>-			retval = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes the color to be used to display a component */</div><div class='del'>-static const char *</div><div class='del'>-get_color (CalendarModel *model, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	const char *retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	/* First, do we have a due date? */</div><div class='del'>-</div><div class='del'>-	if (!dt.value)</div><div class='del'>-		retval = NULL;</div><div class='del'>-	else {</div><div class='del'>-		struct icaltimetype now_tt;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-		/* Second, is it already completed? */</div><div class='del'>-</div><div class='del'>-		if (is_complete (comp)) {</div><div class='del'>-			retval = NULL;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Third, is it due today? */</div><div class='del'>-</div><div class='del'>-		/* Get the current time in the same timezone as the DUE date.*/</div><div class='del'>-		/* FIXME: TIMEZONES: Handle error. */</div><div class='del'>-		status = cal_client_get_timezone (model-&gt;priv-&gt;client, dt.tzid,</div><div class='del'>-						  &amp;zone);</div><div class='del'>-		now_tt = icaltime_current_time_with_zone (zone);</div><div class='del'>-</div><div class='del'>-		if (icaltime_compare_date_only (*dt.value, now_tt) == 0) {</div><div class='del'>-			retval = calendar_config_get_tasks_due_today_color ();</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Fourth, are we overdue as of right now?  We use &lt;= in the</div><div class='del'>-		 * comparison below so that the table entries change color</div><div class='del'>-		 * immediately.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		if (icaltime_compare (*dt.value, now_tt) &lt;= 0)</div><div class='del'>-			retval = calendar_config_get_tasks_overdue_color ();</div><div class='del'>-		else</div><div class='del'>-			retval = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-get_status (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-</div><div class='del'>-	cal_component_get_status (comp, &amp;status);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case ICAL_STATUS_NONE:</div><div class='del'>-		return "";</div><div class='del'>-</div><div class='del'>-	case ICAL_STATUS_NEEDSACTION:</div><div class='del'>-		return _("Not Started");</div><div class='del'>-</div><div class='del'>-	case ICAL_STATUS_INPROCESS:</div><div class='del'>-		return _("In Progress");</div><div class='del'>-</div><div class='del'>-	case ICAL_STATUS_COMPLETED:</div><div class='del'>-		return _("Completed");</div><div class='del'>-</div><div class='del'>-	case ICAL_STATUS_CANCELLED:</div><div class='del'>-		return _("Cancelled");</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void *</div><div class='del'>-get_location (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *location;</div><div class='del'>-</div><div class='del'>-	cal_component_get_location (comp, &amp;location);</div><div class='del'>-	return (void*) location;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* value_at handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_value_at (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-	g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, NULL);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In calendar_model_value_at: %i\n", col);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		return get_categories (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		return get_classification (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-		return get_completed (model, comp, row);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		return get_date_edit_value (model, comp, col, row);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-		return get_geo (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		return GINT_TO_POINTER (get_percent (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-		return get_priority (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		return get_summary (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		return get_transparency (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		return get_url (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-		return GINT_TO_POINTER (cal_component_has_alarms (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	{</div><div class='del'>-		ItipAddress *ia;		</div><div class='del'>-		CalComponentOrganizer organizer;		</div><div class='del'>-		GSList *attendees = NULL, *sl;		</div><div class='del'>-		gint retval = 0;</div><div class='del'>-</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			return GINT_TO_POINTER (1);</div><div class='del'>-		</div><div class='del'>-		cal_component_get_organizer (comp, &amp;organizer);</div><div class='del'>-		if (organizer.value != NULL) {</div><div class='del'>-			GList *l;</div><div class='del'>-			const char *text = itip_strip_mailto (organizer.value);</div><div class='del'>-			</div><div class='del'>-			for (l = priv-&gt;addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-				ia = l-&gt;data;</div><div class='del'>-				</div><div class='del'>-				if (!strcmp (text, ia-&gt;address)) {</div><div class='del'>-					retval = 3;</div><div class='del'>-					goto cleanup;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}		</div><div class='del'>-		</div><div class='del'>-		cal_component_get_attendee_list (comp, &amp;attendees);</div><div class='del'>-		for (sl = attendees; sl != NULL; sl = sl-&gt;next) {</div><div class='del'>-			CalComponentAttendee *ca = sl-&gt;data;</div><div class='del'>-			const char *text;</div><div class='del'>-			GList *l;</div><div class='del'>-</div><div class='del'>-			text = itip_strip_mailto (ca-&gt;value);</div><div class='del'>-			for (l = priv-&gt;addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-				ia = l-&gt;data;</div><div class='del'>-				</div><div class='del'>-				if (!strcmp (text, ia-&gt;address)) {</div><div class='del'>-					if (ca-&gt;delto != NULL)</div><div class='del'>-						retval = 3;</div><div class='del'>-					else</div><div class='del'>-						retval = 2;</div><div class='del'>-					goto cleanup;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cleanup:</div><div class='del'>-		cal_component_free_attendee_list (attendees);</div><div class='del'>-		return GINT_TO_POINTER (retval);		</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-		return GINT_TO_POINTER (is_complete (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-		return GINT_TO_POINTER (cal_component_has_recurrences (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-		return GINT_TO_POINTER (is_overdue (model, comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return (void *) get_color (model, comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return get_status (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT:</div><div class='del'>-		return comp;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	case CAL_COMPONENT_FIELD_LOCATION :</div><div class='del'>-		return get_location (comp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of categories from a comma-delimited string */</div><div class='del'>-static GSList *</div><div class='del'>-categories_from_string (const char *value)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	const char *categ_start;</div><div class='del'>-	const char *categ_end;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	if (!value)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	categ_start = categ_end = NULL;</div><div class='del'>-</div><div class='del'>-	for (p = value; *p; p++) {</div><div class='del'>-		if (categ_start) {</div><div class='del'>-			if (*p == ',') {</div><div class='del'>-				char *c;</div><div class='del'>-</div><div class='del'>-				c = g_strndup (categ_start, categ_end - categ_start + 1);</div><div class='del'>-				list = g_slist_prepend (list, c);</div><div class='del'>-</div><div class='del'>-				categ_start = categ_end = NULL;</div><div class='del'>-			} else if (!isspace (*p))</div><div class='del'>-				categ_end = p;</div><div class='del'>-		} else if (!isspace (*p) &amp;&amp; *p != ',')</div><div class='del'>-			categ_start = categ_end = p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (categ_start) {</div><div class='del'>-		char *c;</div><div class='del'>-</div><div class='del'>-		c = g_strndup (categ_start, categ_end - categ_start + 1);</div><div class='del'>-		list = g_slist_prepend (list, c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_slist_reverse (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the list of categories from a comma-delimited string */</div><div class='del'>-static void</div><div class='del'>-set_categories (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	list = categories_from_string (value);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories_list (comp, list);</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		char *s;</div><div class='del'>-</div><div class='del'>-		s = l-&gt;data;</div><div class='del'>-		g_free (s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_classification (CalComponent *comp,</div><div class='del'>-		    const char *value)</div><div class='del'>-{</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (value, _("Private")))</div><div class='del'>-		classif = CAL_COMPONENT_CLASS_PRIVATE;</div><div class='del'>-	else if (!g_strcasecmp (value, _("Confidential")))</div><div class='del'>-		classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;</div><div class='del'>-	else</div><div class='del'>-		classif = CAL_COMPONENT_CLASS_PUBLIC;</div><div class='del'>-</div><div class='del'>-	cal_component_set_classification (comp, classif);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called to set the "Date Completed" field. We also need to update the</div><div class='del'>-   Status and Percent fields to make sure they match. */</div><div class='del'>-static void</div><div class='del'>-set_completed (CalendarModel *model, CalComponent *comp, const void *value)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditValue *dv = (ECellDateEditValue*) value;</div><div class='del'>-</div><div class='del'>-	if (!dv) {</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-	} else {</div><div class='del'>-		time_t t;</div><div class='del'>-</div><div class='del'>-		/* We assume that COMPLETED is entered in the current timezone,</div><div class='del'>-		   even though it gets stored in UTC. */</div><div class='del'>-		t = icaltime_as_timet_with_zone (dv-&gt;tt, dv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		ensure_task_complete (comp, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a CalComponentDateTime value */</div><div class='del'>-static void</div><div class='del'>-set_datetime (CalendarModel *model, CalComponent *comp, const void *value,</div><div class='del'>-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt),</div><div class='del'>-	      gboolean is_dtend)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditValue *dv = (ECellDateEditValue*) value;</div><div class='del'>-</div><div class='del'>-	if (!dv) {</div><div class='del'>-		(* set_func) (comp, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		CalComponentDateTime dt;</div><div class='del'>-</div><div class='del'>-		dt.value = &amp;dv-&gt;tt;</div><div class='del'>-		dt.tzid = icaltimezone_get_tzid (dv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		/* For a DTEND with a DATE value, we add 1 day to it. */</div><div class='del'>-		if (is_dtend &amp;&amp; dt.value-&gt;is_date) {</div><div class='del'>-			icaltime_adjust (dt.value, 1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		(* set_func) (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog, but the</div><div class='del'>- * model doesn't know anything about the windows.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-show_geo_warning (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("The geographical position must be entered "</div><div class='del'>-					  "in the format: \n\n45.436845,125.862501"),</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the geographical position value of a component */</div><div class='del'>-static void</div><div class='del'>-set_geo (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	double latitude, longitude;</div><div class='del'>-	int matched;</div><div class='del'>-	struct icalgeotype geo;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_geo (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = sscanf (value, "%lg , %lg", &amp;latitude, &amp;longitude);</div><div class='del'>-</div><div class='del'>-	if (matched != 2) {</div><div class='del'>-		show_geo_warning ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	geo.lat = latitude;</div><div class='del'>-	geo.lon = longitude;</div><div class='del'>-	cal_component_set_geo (comp, &amp;geo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the percent value of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_percent (CalComponent *comp, const void *value)</div><div class='del'>-{</div><div class='del'>-	gint percent = GPOINTER_TO_INT (value);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (percent &gt;= -1);</div><div class='del'>-	g_return_if_fail (percent &lt;= 100);</div><div class='del'>-</div><div class='del'>-	/* A value of -1 means it isn't set. */</div><div class='del'>-	if (percent == -1) {</div><div class='del'>-		cal_component_set_percent (comp, NULL);</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-		if (percent == 100)</div><div class='del'>-			ensure_task_complete (comp, -1);</div><div class='del'>-		else</div><div class='del'>-			ensure_task_not_complete (comp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the priority of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_priority (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	int priority;</div><div class='del'>-</div><div class='del'>-	priority = cal_util_priority_from_string (value);</div><div class='del'>-	/* If the priority is invalid (which should never happen) output a</div><div class='del'>-	   warning and set it to undefined. */</div><div class='del'>-	if (priority == -1) {</div><div class='del'>-		g_warning ("Invalid priority");</div><div class='del'>-		priority = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_priority (comp, &amp;priority);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the summary of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_summary (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	CalComponentText text;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_summary (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	text.value = value;</div><div class='del'>-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */</div><div class='del'>-</div><div class='del'>-	cal_component_set_summary (comp, &amp;text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the transparency of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_transparency (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	CalComponentTransparency transp;</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (value, _("Free")))</div><div class='del'>-		transp = CAL_COMPONENT_TRANSP_TRANSPARENT;</div><div class='del'>-	else</div><div class='del'>-		transp = CAL_COMPONENT_TRANSP_OPAQUE;</div><div class='del'>-</div><div class='del'>-	cal_component_set_transparency (comp, transp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the URI of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_url (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_url (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_url (comp, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called to set the checkbutton field which indicates whether a task is</div><div class='del'>-   complete. */</div><div class='del'>-static void</div><div class='del'>-set_complete (CalComponent *comp, const void *value)</div><div class='del'>-{</div><div class='del'>-	gint state = GPOINTER_TO_INT (value);</div><div class='del'>-</div><div class='del'>-	if (state) {</div><div class='del'>-		ensure_task_complete (comp, -1);</div><div class='del'>-	} else {</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the status of a calendar component. */</div><div class='del'>-static void</div><div class='del'>-set_status (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	int percent;</div><div class='del'>-</div><div class='del'>-	/* An empty string is the same as 'None'. */</div><div class='del'>-	if (!value[0] || !g_strcasecmp (value, _("None")))</div><div class='del'>-		status = ICAL_STATUS_NONE;</div><div class='del'>-	else if (!g_strcasecmp (value, _("Not Started")))</div><div class='del'>-		status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-	else if (!g_strcasecmp (value, _("In Progress")))</div><div class='del'>-		status = ICAL_STATUS_INPROCESS;</div><div class='del'>-	else if (!g_strcasecmp (value, _("Completed")))</div><div class='del'>-		status = ICAL_STATUS_COMPLETED;</div><div class='del'>-	else if (!g_strcasecmp (value, _("Cancelled")))</div><div class='del'>-		status = ICAL_STATUS_CANCELLED;</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("Invalid status: %s\n", value);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_status (comp, status);</div><div class='del'>-</div><div class='del'>-	if (status == ICAL_STATUS_NEEDSACTION) {</div><div class='del'>-		percent = 0;</div><div class='del'>-		cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-		cal_component_set_completed (comp, NULL);</div><div class='del'>-	} else if (status == ICAL_STATUS_COMPLETED) {</div><div class='del'>-		ensure_task_complete (comp, -1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-set_location (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_location (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_location (comp, value);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* set_value_at handler for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS);</div><div class='del'>-	g_return_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In calendar_model_set_value_at: %i\n", col);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		set_categories (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		set_classification (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-		set_completed (model, comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-		/* FIXME: Need to reset dtstart if dtend happens before it */</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_dtend,</div><div class='del'>-			      TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-		/* FIXME: Need to reset dtend if dtstart happens after it */</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_dtstart,</div><div class='del'>-			      FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_due,</div><div class='del'>-			      FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-		set_geo (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		set_percent (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-		set_priority (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		set_summary (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		set_transparency (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		set_url (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-		set_complete (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		set_status (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	case CAL_COMPONENT_FIELD_LOCATION :</div><div class='del'>-		set_location (comp, value);</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_set_value_at(): Requested invalid column %d", col);</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp))</div><div class='del'>-		g_message ("calendar_model_set_value_at(): Could not update the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is_cell_editable handler for the calendar table model */</div><div class='del'>-static gboolean</div><div class='del'>-calendar_model_is_cell_editable (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, FALSE);</div><div class='del'>-</div><div class='del'>-	/* FIXME: We can't check this as 'click-to-add' passes row 0. */</div><div class='del'>-	/*g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, FALSE);*/</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* append_row handler for the calendar model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* FIXME: This should support other types of components, but for now it</div><div class='del'>-	 * is only used for the task list.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;new_comp_vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-		comp = cal_comp_event_new_with_defaults ();</div><div class='del'>-	else {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, priv-&gt;new_comp_vtype);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_categories (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_CATEGORIES, row));</div><div class='del'>-	set_classification (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_CLASSIFICATION, row));</div><div class='del'>-	set_completed (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_COMPLETED, row));</div><div class='del'>-	/* FIXME: Need to reset dtstart if dtend happens before it */</div><div class='del'>-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DTEND, row), cal_component_set_dtend, TRUE);</div><div class='del'>-	/* FIXME: Need to reset dtend if dtstart happens after it */</div><div class='del'>-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DTSTART, row), cal_component_set_dtstart, FALSE);</div><div class='del'>-	set_datetime (model, comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_DUE, row), cal_component_set_due, FALSE);</div><div class='del'>-	set_geo (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_GEO, row));</div><div class='del'>-	set_percent (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_PERCENT, row));</div><div class='del'>-	set_priority (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_PRIORITY, row));</div><div class='del'>-	set_summary (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_SUMMARY, row));</div><div class='del'>-	set_transparency (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_TRANSPARENCY, row));</div><div class='del'>-	set_url (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_URL, row));</div><div class='del'>-	set_complete (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_COMPLETE, row));</div><div class='del'>-	set_status (comp, e_table_model_value_at(source, CAL_COMPONENT_FIELD_STATUS, row));</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp)) {</div><div class='del'>-		/* FIXME: Show error dialog. */</div><div class='del'>-		g_message ("calendar_model_append_row(): Could not add new object!");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Duplicates a string value */</div><div class='del'>-static char *</div><div class='del'>-dup_string (const char *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void*</div><div class='del'>-dup_date_edit_value (const void *value)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditValue *dv, *orig_dv;</div><div class='del'>-</div><div class='del'>-	if (value == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	orig_dv = (ECellDateEditValue*) value;</div><div class='del'>-</div><div class='del'>-	dv = g_new (ECellDateEditValue, 1);</div><div class='del'>-	*dv = *orig_dv;</div><div class='del'>-</div><div class='del'>-	return dv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* duplicate_value handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_duplicate_value (ETableModel *etm, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	/* They are almost all dup_string()s for now, but we'll have real fields</div><div class='del'>-	 * later.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return dup_string (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		return dup_date_edit_value (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return (void *) value;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT: {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (value);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-		return comp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_duplicate_value(): Requested invalid column %d", col);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free_value handler for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_free_value (ETableModel *etm, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		if (value)</div><div class='del'>-			g_free (value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		if (value)</div><div class='del'>-			g_free (value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		if (value)</div><div class='del'>-			g_free (value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT:</div><div class='del'>-		if (value)</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (value));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initializes a string value */</div><div class='del'>-static char *</div><div class='del'>-init_string (void)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize_value handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_initialize_value (ETableModel *etm, int col)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		return g_strdup (model-&gt;priv-&gt;default_category ? model-&gt;priv-&gt;default_category : "");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return init_string ();</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		return GINT_TO_POINTER (-1);</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* value_is_empty handler for the calendar model. This should return TRUE</div><div class='del'>-   unless a significant value has been set. The 'click-to-add' feature</div><div class='del'>-   checks all fields to see if any are not empty and if so it adds a new</div><div class='del'>-   row, so we only want to return FALSE if we have a useful object. */</div><div class='del'>-static gboolean</div><div class='del'>-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		/* This could be a hack or not.  If the categories field only</div><div class='del'>-		 * contains the default category, then it possibly means that</div><div class='del'>-		 * the user has not entered anything at all in the click-to-add;</div><div class='del'>-		 * the category is in the value because we put it there in</div><div class='del'>-		 * calendar_model_initialize_value().</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;default_category &amp;&amp; value &amp;&amp; strcmp (priv-&gt;default_category, value) == 0)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return string_is_empty (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return string_is_empty (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		return value ? FALSE : TRUE;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		return (GPOINTER_TO_INT (value) &lt; 0) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT:</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-date_value_to_string (ETableModel *etm, const void *value)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	ECellDateEditValue *dv = (ECellDateEditValue *) value;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	struct tm tmp_tm;</div><div class='del'>-	char buffer[64];</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!dv)</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-</div><div class='del'>-	/* We currently convert all the dates to the current timezone. */</div><div class='del'>-	tt = dv-&gt;tt;</div><div class='del'>-	icaltimezone_convert_time (&amp;tt, dv-&gt;zone, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_year = tt.year - 1900;</div><div class='del'>-	tmp_tm.tm_mon = tt.month - 1;</div><div class='del'>-	tmp_tm.tm_mday = tt.day;</div><div class='del'>-	tmp_tm.tm_hour = tt.hour;</div><div class='del'>-	tmp_tm.tm_min = tt.minute;</div><div class='del'>-	tmp_tm.tm_sec = tt.second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);</div><div class='del'>-</div><div class='del'>-	e_time_format_date_and_time (&amp;tmp_tm, priv-&gt;use_24_hour_format,</div><div class='del'>-				     TRUE, FALSE,</div><div class='del'>-				     buffer, sizeof (buffer));</div><div class='del'>-	return e_utf8_from_locale_string (buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-calendar_model_value_to_string (ETableModel *etm, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_STATUS:</div><div class='del'>-		return g_strdup (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		return date_value_to_string (etm, value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-		if (GPOINTER_TO_INT (value) == 0)</div><div class='del'>-			return e_utf8_from_locale_string (_("Normal"));</div><div class='del'>-		else if (GPOINTER_TO_INT (value) == 1)</div><div class='del'>-			return e_utf8_from_locale_string (_("Recurring"));</div><div class='del'>-		else</div><div class='del'>-			return e_utf8_from_locale_string (_("Assigned"));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-		return e_utf8_from_locale_string (value ? _("Yes") : _("No"));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPONENT:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		if (GPOINTER_TO_INT (value) &lt; 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		else</div><div class='del'>-			return g_strdup_printf ("%i%%", GPOINTER_TO_INT (value));</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_value_as_string(): Requested invalid column %d", col);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new calendar model.  It must be told about the calendar client</div><div class='del'>- * interface object it will monitor with calendar_model_set_cal_client().</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar model.</div><div class='del'>- **/</div><div class='del'>-CalendarModel *</div><div class='del'>-calendar_model_new (void)</div><div class='del'>-{</div><div class='del'>-	return CALENDAR_MODEL (gtk_type_new (TYPE_CALENDAR_MODEL));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is updated in the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_updated_cb (CalQuery *query, const char *uid,</div><div class='del'>-		      gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-		      gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int orig_idx;</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	const char *new_comp_uid;</div><div class='del'>-	int *new_idx;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CalendarModelObjectData new_object_data = { NULL, NULL, NULL, NULL };</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-	orig_idx = remove_object (model, uid);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (priv-&gt;client, uid, &amp;new_comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Insert the object into the model */</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (new_comp, &amp;new_comp_uid);</div><div class='del'>-</div><div class='del'>-		if (orig_idx == -1) {</div><div class='del'>-			/* The object not in the model originally, so we just append it */</div><div class='del'>-</div><div class='del'>-			g_array_append_val (priv-&gt;objects, new_comp);</div><div class='del'>-			g_array_append_val (priv-&gt;objects_data, new_object_data);</div><div class='del'>-</div><div class='del'>-			new_idx = g_new (int, 1);</div><div class='del'>-			*new_idx = priv-&gt;objects-&gt;len - 1;</div><div class='del'>-</div><div class='del'>-			g_hash_table_insert (priv-&gt;uid_index_hash, (char *) new_comp_uid, new_idx);</div><div class='del'>-			e_table_model_row_inserted (E_TABLE_MODEL (model), *new_idx);</div><div class='del'>-		} else {</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			/* Insert the new version of the object in its old position */</div><div class='del'>-</div><div class='del'>-			g_array_insert_val (priv-&gt;objects, orig_idx, new_comp);</div><div class='del'>-			g_array_insert_val (priv-&gt;objects_data, orig_idx,</div><div class='del'>-					    new_object_data);</div><div class='del'>-</div><div class='del'>-			new_idx = g_new (int, 1);</div><div class='del'>-			*new_idx = orig_idx;</div><div class='del'>-			g_hash_table_insert (priv-&gt;uid_index_hash, (char *) new_comp_uid, new_idx);</div><div class='del'>-</div><div class='del'>-			/* Increase the indices of all subsequent objects */</div><div class='del'>-</div><div class='del'>-			for (i = orig_idx + 1; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-				CalComponent *comp;</div><div class='del'>-				int *comp_idx;</div><div class='del'>-				const char *comp_uid;</div><div class='del'>-</div><div class='del'>-				comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-				g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-				cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-</div><div class='del'>-				comp_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, comp_uid);</div><div class='del'>-				g_assert (comp_idx != NULL);</div><div class='del'>-</div><div class='del'>-				(*comp_idx)++;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			e_table_model_row_changed (E_TABLE_MODEL (model), *new_idx);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* Nothing; the object may have been removed from the server.  We just</div><div class='del'>-		 * notify that the old object was deleted.</div><div class='del'>-		 */</div><div class='del'>-		if (orig_idx != -1)</div><div class='del'>-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);</div><div class='del'>-		else</div><div class='del'>-			e_table_model_no_change (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-</div><div class='del'>-		/* Same notification as above */</div><div class='del'>-		if (orig_idx != -1)</div><div class='del'>-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);</div><div class='del'>-		else</div><div class='del'>-			e_table_model_no_change (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is removed from the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_removed_cb (CalQuery *query, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-	idx = remove_object (model, uid);</div><div class='del'>-</div><div class='del'>-	if (idx != -1)</div><div class='del'>-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);</div><div class='del'>-	else</div><div class='del'>-		e_table_model_no_change (E_TABLE_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a query ends */</div><div class='del'>-static void</div><div class='del'>-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (model, NULL);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_QUERY_DONE_SUCCESS)</div><div class='del'>-		g_warning ("query done: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an evaluation error occurs when running a query */</div><div class='del'>-static void</div><div class='del'>-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (model, NULL);</div><div class='del'>-</div><div class='del'>-	g_warning ("eval error: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a complete query sexp for the calendar model by adding the predicates</div><div class='del'>- * to filter only for the type of objects that the model supports, and</div><div class='del'>- * whether we want completed tasks.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-adjust_query_sexp (CalendarModel *model, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalObjType type;</div><div class='del'>-	char *type_sexp;</div><div class='del'>-	char *completed_sexp;</div><div class='del'>-	char *new_sexp;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = priv-&gt;type;</div><div class='del'>-</div><div class='del'>-	if (!(type &amp; CALOBJ_TYPE_ANY))</div><div class='del'>-		type_sexp = g_strdup ("#t");</div><div class='del'>-	else</div><div class='del'>-		type_sexp = g_strdup_printf (</div><div class='del'>-			"(or %s %s %s)",</div><div class='del'>-			(type &amp; CALOBJ_TYPE_EVENT) ? "(= (get-vtype) \"VEVENT\")" : "",</div><div class='del'>-			(type &amp; CALOBJ_TYPE_TODO) ? "(= (get-vtype) \"VTODO\")" : "",</div><div class='del'>-			(type &amp; CALOBJ_TYPE_JOURNAL) ? "(= (get-vtype) \"VJOURNAL\")" : "");</div><div class='del'>-</div><div class='del'>-	/* Create a sub-expression for filtering out completed tasks, based on</div><div class='del'>-	   the config settings. */</div><div class='del'>-	completed_sexp = calendar_config_get_hide_completed_tasks_sexp ();</div><div class='del'>-</div><div class='del'>-	new_sexp = g_strdup_printf ("(and %s %s %s)", type_sexp,</div><div class='del'>-				    completed_sexp ? completed_sexp : "",</div><div class='del'>-				    sexp);</div><div class='del'>-	g_free (type_sexp);</div><div class='del'>-	g_free (completed_sexp);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Calendar model sexp:\n%s\n", new_sexp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return new_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Restarts a query */</div><div class='del'>-static void</div><div class='del'>-update_query (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalQuery *old_query;</div><div class='del'>-	char *real_sexp;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-	free_objects (model);</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;client</div><div class='del'>-	      &amp;&amp; cal_client_get_load_state (priv-&gt;client) == CAL_CLIENT_LOAD_LOADED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	old_query = priv-&gt;query;</div><div class='del'>-	priv-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	if (old_query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), model);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (old_query));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;sexp != NULL);</div><div class='del'>-	real_sexp = adjust_query_sexp (model, priv-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (model, _("Searching"));</div><div class='del'>-	priv-&gt;query = cal_client_get_query (priv-&gt;client, real_sexp);</div><div class='del'>-	g_free (real_sexp);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;query) {</div><div class='del'>-		g_message ("update_query(): Could not create the query");</div><div class='del'>-		calendar_model_set_status_message (model, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), model);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), model);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "query_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_query_done_cb), model);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "eval_error",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_eval_error_cb), model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a calendar is opened into the server */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (data);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_OPEN_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	update_query (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes an object from the model and updates all the indices that follow.</div><div class='del'>- * Returns the index of the object that was removed, or -1 if no object with</div><div class='del'>- * such UID was found.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-remove_object (CalendarModel *model, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int *idx;</div><div class='del'>-	CalComponent *orig_comp;</div><div class='del'>-	int i;</div><div class='del'>-	int n;</div><div class='del'>-	CalendarModelObjectData *object_data;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Find the index of the object to be removed */</div><div class='del'>-</div><div class='del'>-	idx = g_hash_table_lookup (priv-&gt;uid_index_hash, uid);</div><div class='del'>-	if (!idx)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	orig_comp = g_array_index (priv-&gt;objects, CalComponent *, *idx);</div><div class='del'>-	g_assert (orig_comp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Decrease the indices of all the objects that follow in the array */</div><div class='del'>-</div><div class='del'>-	for (i = *idx + 1; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		int *comp_idx;</div><div class='del'>-		const char *comp_uid;</div><div class='del'>-</div><div class='del'>-		comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-		g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-</div><div class='del'>-		comp_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, comp_uid);</div><div class='del'>-		g_assert (comp_idx != NULL);</div><div class='del'>-</div><div class='del'>-		(*comp_idx)--;</div><div class='del'>-		g_assert (*comp_idx &gt;= 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove this object from the array and hash */</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uid_index_hash, uid);</div><div class='del'>-	g_array_remove_index (priv-&gt;objects, *idx);</div><div class='del'>-</div><div class='del'>-	object_data = &amp;g_array_index (priv-&gt;objects_data,</div><div class='del'>-				      CalendarModelObjectData, *idx);</div><div class='del'>-	calendar_model_free_object_data (model, object_data);</div><div class='del'>-	g_array_remove_index (priv-&gt;objects_data, *idx);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (orig_comp));</div><div class='del'>-</div><div class='del'>-	n = *idx;</div><div class='del'>-	g_free (idx);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays messages on the status bar */</div><div class='del'>-#define EVOLUTION_TASKS_PROGRESS_IMAGE "evolution-tasks-mini.png"</div><div class='del'>-static GdkPixbuf *progress_icon[2] = { NULL, NULL };</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_set_status_message (CalendarModel *model, const char *message)</div><div class='del'>-{</div><div class='del'>-	extern EvolutionShellClient *global_shell_client; /* ugly */</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!message || !*message) {</div><div class='del'>-		if (priv-&gt;activity) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (priv-&gt;activity));</div><div class='del'>-			priv-&gt;activity = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (!priv-&gt;activity) {</div><div class='del'>-		int display;</div><div class='del'>-		char *client_id = g_strdup_printf ("%p", model);</div><div class='del'>-</div><div class='del'>-		if (progress_icon[0] == NULL)</div><div class='del'>-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_TASKS_PROGRESS_IMAGE);</div><div class='del'>-		priv-&gt;activity = evolution_activity_client_new (</div><div class='del'>-			global_shell_client, client_id,</div><div class='del'>-			progress_icon, message, TRUE, &amp;display);</div><div class='del'>-</div><div class='del'>-		g_free (client_id);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		evolution_activity_client_update (priv-&gt;activity, message, -1.0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_get_cal_client:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- *</div><div class='del'>- * Queries the calendar client interface object that a calendar model is using.</div><div class='del'>- *</div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-calendar_model_get_cal_client (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_set_cal_client:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- * @type: Type of objects to present.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a calendar model will monitor.</div><div class='del'>- * It also sets the types of objects this model will present to an #ETable.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client == client &amp;&amp; priv-&gt;type == type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client), model);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-	priv-&gt;type = type;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		if (cal_client_get_load_state (priv-&gt;client) == CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-			update_query (model);</div><div class='del'>-		else</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "cal_opened",</div><div class='del'>-					    GTK_SIGNAL_FUNC (cal_opened_cb), model);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_set_query:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * @sexp: Sexp that defines the query.</div><div class='del'>- * </div><div class='del'>- * Sets the query sexp that a calendar model will use to filter its contents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_model_set_query (CalendarModel *model, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-	g_return_if_fail (sexp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sexp)</div><div class='del'>-		g_free (priv-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	priv-&gt;sexp = g_strdup (sexp);</div><div class='del'>-</div><div class='del'>-	update_query (model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_set_new_comp_vtype:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * @vtype: Type of calendar components to create.</div><div class='del'>- *</div><div class='del'>- * Sets the type of calendar components that will be created by a calendar table</div><div class='del'>- * model when the click-to-add functionality of the table is used.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_model_set_new_comp_vtype (CalendarModel *model, CalComponentVType vtype)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-	g_return_if_fail (vtype != CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-	priv-&gt;new_comp_vtype = vtype;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_get_new_comp_vtype:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- *</div><div class='del'>- * Queries the type of calendar components that are created by a calendar table</div><div class='del'>- * model when using the click-to-add functionality in a table.</div><div class='del'>- *</div><div class='del'>- * Return value: Type of components that are created.</div><div class='del'>- **/</div><div class='del'>-CalComponentVType</div><div class='del'>-calendar_model_get_new_comp_vtype (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-	return priv-&gt;new_comp_vtype;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_mark_task_complete (CalendarModel *model,</div><div class='del'>-				   gint row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-	ensure_task_complete (comp, -1);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp))</div><div class='del'>-		g_message ("calendar_model_mark_task_complete(): Could not update the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_get_component:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * @row: Row number of sought calendar component.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar component from a calendar model based on its row number.</div><div class='del'>- *</div><div class='del'>- * Return value: The sought calendar component.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-calendar_model_get_component (CalendarModel *model,</div><div class='del'>-			       gint	      row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, NULL);</div><div class='del'>-</div><div class='del'>-	return g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This makes sure a task is marked as complete.</div><div class='del'>-   It makes sure the "Date Completed" property is set. If the completed_date</div><div class='del'>-   is not -1, then that is used, otherwise if the "Date Completed" property</div><div class='del'>-   is not already set it is set to the current time.</div><div class='del'>-   It makes sure the percent is set to 100, and that the status is "Completed".</div><div class='del'>-   Note that this doesn't update the component on the server. */</div><div class='del'>-static void</div><div class='del'>-ensure_task_complete (CalComponent *comp,</div><div class='del'>-		      time_t completed_date)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype *old_completed = NULL;</div><div class='del'>-	int *old_percent, new_percent;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	gboolean set_completed = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Date Completed. */</div><div class='del'>-	if (completed_date == -1) {</div><div class='del'>-		cal_component_get_completed (comp, &amp;old_completed);</div><div class='del'>-</div><div class='del'>-		if (old_completed) {</div><div class='del'>-			cal_component_free_icaltimetype (old_completed);</div><div class='del'>-			set_completed = FALSE;</div><div class='del'>-		} else {</div><div class='del'>-			completed_date = time (NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_completed) {</div><div class='del'>-		icaltimezone *utc_zone;</div><div class='del'>-		struct icaltimetype new_completed;</div><div class='del'>-</div><div class='del'>-		/* COMPLETED is stored in UTC. */</div><div class='del'>-		utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		new_completed = icaltime_from_timet_with_zone (completed_date,</div><div class='del'>-							       FALSE,</div><div class='del'>-							       utc_zone);</div><div class='del'>-		cal_component_set_completed (comp, &amp;new_completed);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Percent. */</div><div class='del'>-	cal_component_get_percent (comp, &amp;old_percent);</div><div class='del'>-	if (!old_percent || *old_percent != 100) {</div><div class='del'>-		new_percent = 100;</div><div class='del'>-		cal_component_set_percent (comp, &amp;new_percent);</div><div class='del'>-	}</div><div class='del'>-	if (old_percent)</div><div class='del'>-		cal_component_free_percent (old_percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (comp, &amp;status);</div><div class='del'>-	if (status != ICAL_STATUS_COMPLETED) {</div><div class='del'>-		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This makes sure a task is marked as incomplete. It clears the</div><div class='del'>-   "Date Completed" property. If the percent is set to 100 it removes it,</div><div class='del'>-   and if the status is "Completed" it sets it to "Needs Action".</div><div class='del'>-   Note that this doesn't update the component on the client. */</div><div class='del'>-static void</div><div class='del'>-ensure_task_not_complete (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	icalproperty_status old_status;</div><div class='del'>-	int *old_percent;</div><div class='del'>-</div><div class='del'>-	/* Date Completed. */</div><div class='del'>-	cal_component_set_completed (comp, NULL);</div><div class='del'>-</div><div class='del'>-	/* Percent. */</div><div class='del'>-	cal_component_get_percent (comp, &amp;old_percent);</div><div class='del'>-	if (old_percent &amp;&amp; *old_percent == 100)</div><div class='del'>-		cal_component_set_percent (comp, NULL);</div><div class='del'>-	if (old_percent)</div><div class='del'>-		cal_component_free_percent (old_percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (comp, &amp;old_status);</div><div class='del'>-	if (old_status == ICAL_STATUS_COMPLETED)</div><div class='del'>-		cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 24 hour format to display the times. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_model_get_use_24_hour_format (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), TRUE);</div><div class='del'>-</div><div class='del'>-	return model-&gt;priv-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_set_use_24_hour_format (CalendarModel *model,</div><div class='del'>-				       gboolean	      use_24_hour_format)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;use_24_hour_format != use_24_hour_format) {</div><div class='del'>-		e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-		model-&gt;priv-&gt;use_24_hour_format = use_24_hour_format;</div><div class='del'>-		/* Get the views to redraw themselves. */</div><div class='del'>-		e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_set_default_category	(CalendarModel	*model,</div><div class='del'>-					 const char	*default_category)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	g_free (model-&gt;priv-&gt;default_category);</div><div class='del'>-	model-&gt;priv-&gt;default_category = g_strdup (default_category);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone*</div><div class='del'>-calendar_model_get_timezone		(CalendarModel	*model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	return model-&gt;priv-&gt;zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_set_timezone		(CalendarModel	*model,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;zone != zone) {</div><div class='del'>-		e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-		model-&gt;priv-&gt;zone = zone;</div><div class='del'>-</div><div class='del'>-		/* The timezone affects the times shown for COMPLETED and</div><div class='del'>-		   maybe other fields, so we need to redisplay everything. */</div><div class='del'>-		e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_refresh:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * </div><div class='del'>- * Refreshes the calendar model, reloading the events/tasks from the server.</div><div class='del'>- * Be careful about doing this when the user is editing an event/task.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_model_refresh (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	update_query (model);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h<br/>deleted file mode 100644<br/>index 6ac175034c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* Evolution calendar - Data model for ETable</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CALENDAR_MODEL_H</div><div class='del'>-#define CALENDAR_MODEL_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_CALENDAR_MODEL            (calendar_model_get_type ())</div><div class='del'>-#define CALENDAR_MODEL(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_MODEL, CalendarModel))</div><div class='del'>-#define CALENDAR_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_MODEL,	\</div><div class='del'>-					CalendarModelClass))</div><div class='del'>-#define IS_CALENDAR_MODEL(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_MODEL))</div><div class='del'>-#define IS_CALENDAR_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarModel CalendarModel;</div><div class='del'>-typedef struct _CalendarModelClass CalendarModelClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarModelPrivate CalendarModelPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalendarModel {</div><div class='del'>-	ETableModel model;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalendarModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType		calendar_model_get_type		  (void);</div><div class='del'>-</div><div class='del'>-CalendarModel*	calendar_model_new		  (void);</div><div class='del'>-</div><div class='del'>-CalClient*	calendar_model_get_cal_client	  (CalendarModel   *model);</div><div class='del'>-void		calendar_model_set_cal_client	  (CalendarModel   *model,</div><div class='del'>-						   CalClient	   *client,</div><div class='del'>-						   CalObjType	    type);</div><div class='del'>-</div><div class='del'>-void		calendar_model_set_query	  (CalendarModel   *model,</div><div class='del'>-						   const char      *sexp);</div><div class='del'>-</div><div class='del'>-void		calendar_model_refresh		  (CalendarModel   *model);</div><div class='del'>-</div><div class='del'>-void		calendar_model_set_new_comp_vtype  (CalendarModel     *model,</div><div class='del'>-						    CalComponentVType  vtype);</div><div class='del'>-CalComponentVType calendar_model_get_new_comp_vtype (CalendarModel    *model);</div><div class='del'>-</div><div class='del'>-void		calendar_model_mark_task_complete (CalendarModel   *model,</div><div class='del'>-						   gint		    row);</div><div class='del'>-</div><div class='del'>-CalComponent*	calendar_model_get_component	  (CalendarModel   *model,</div><div class='del'>-						   gint		    row);</div><div class='del'>-</div><div class='del'>-/* Whether we use 24 hour format to display the times. */</div><div class='del'>-gboolean	calendar_model_get_use_24_hour_format (CalendarModel *model);</div><div class='del'>-void		calendar_model_set_use_24_hour_format (CalendarModel *model,</div><div class='del'>-						       gboolean	      use_24_hour_format);</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone*	calendar_model_get_timezone	    (CalendarModel *model);</div><div class='del'>-void		calendar_model_set_timezone	    (CalendarModel *model,</div><div class='del'>-						     icaltimezone  *zone);</div><div class='del'>-</div><div class='del'>-void		calendar_model_set_default_category (CalendarModel	*model,</div><div class='del'>-						     const char		*default_category);</div><div class='del'>-</div><div class='del'>-void            calendar_model_set_status_message   (CalendarModel      *model,</div><div class='del'>-						     const char         *message);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/calendar-offline-handler.c b/calendar/gui/calendar-offline-handler.c<br/>deleted file mode 100644<br/>index a01d3fa160..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-offline-handler.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-offline-handler.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,282 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* calendar-offline-handler.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include "e-util/e-url.h"</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "calendar-offline-handler.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE bonobo_x_object_get_type ()</div><div class='del'>-static BonoboXObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _CalendarOfflineHandlerPrivate {</div><div class='del'>-	CalClient *client;</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_OfflineProgressListener listener_interface;</div><div class='del'>-</div><div class='del'>-	gboolean is_offline;	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_connection (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EUri *uri = e_uri_new (data);	</div><div class='del'>-	GNOME_Evolution_ConnectionList *list = user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (uri != NULL);</div><div class='del'>-	</div><div class='del'>-	if (uri-&gt;host != NULL)</div><div class='del'>-		list-&gt;_buffer[list-&gt;_length].hostName = CORBA_string_dup (uri-&gt;host);</div><div class='del'>-	else</div><div class='del'>-		list-&gt;_buffer[list-&gt;_length].hostName = CORBA_string_dup ("Unknown");</div><div class='del'>-	if (uri-&gt;protocol != NULL)</div><div class='del'>-		list-&gt;_buffer[list-&gt;_length].type = CORBA_string_dup (uri-&gt;protocol);</div><div class='del'>-	else</div><div class='del'>-		list-&gt;_buffer[list-&gt;_length].type = CORBA_string_dup ("Unknown");</div><div class='del'>-	list-&gt;_length++;</div><div class='del'>-</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_ConnectionList *</div><div class='del'>-create_connection_list (CalendarOfflineHandler *offline_handler)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ConnectionList *list;</div><div class='del'>-	GList *uris;</div><div class='del'>-</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>- 	uris = cal_client_uri_list (priv-&gt;client, CAL_MODE_REMOTE);	</div><div class='del'>-</div><div class='del'>-	list = GNOME_Evolution_ConnectionList__alloc ();</div><div class='del'>-	list-&gt;_length = 0;</div><div class='del'>-	list-&gt;_maximum = g_list_length (uris);</div><div class='del'>-	list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list-&gt;_maximum);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (uris, add_connection, list);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GNOME::Evolution::Offline methods.  */</div><div class='del'>-static CORBA_boolean</div><div class='del'>-impl__get_isOffline (PortableServer_Servant servant,</div><div class='del'>-		     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler;</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;is_offline;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_prepareForOffline (PortableServer_Servant servant,</div><div class='del'>-			GNOME_Evolution_ConnectionList **active_connection_list,</div><div class='del'>-			CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler;</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>-	*active_connection_list = create_connection_list (offline_handler);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_offline (CalendarOfflineHandler *offline_handler)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ConnectionList *connection_list;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>-	connection_list = create_connection_list (offline_handler);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_OfflineProgressListener_updateProgress (priv-&gt;listener_interface, </div><div class='del'>-								connection_list, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_warning ("Error updating offline progress");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-backend_cal_set_mode (CalClient *client, CalClientSetModeStatus status, CalMode mode, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler = data;</div><div class='del'>-</div><div class='del'>-	update_offline (offline_handler);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-backend_cal_opened (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler = data;</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_OPEN_SUCCESS) {</div><div class='del'>-		update_offline (offline_handler);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "cal_set_mode", </div><div class='del'>-			    backend_cal_set_mode, offline_handler);</div><div class='del'>-	cal_client_set_mode (client, CAL_MODE_LOCAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-backend_go_offline (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler = user_data;</div><div class='del'>-	char *uri = data;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	gboolean success;</div><div class='del'>-	</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened", </div><div class='del'>-			    backend_cal_opened, offline_handler);</div><div class='del'>-	success = cal_client_open_calendar (client, uri, TRUE);</div><div class='del'>-	if (!success) {</div><div class='del'>-		update_offline (offline_handler);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-		return;		</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_goOffline (PortableServer_Servant servant,</div><div class='del'>-		const GNOME_Evolution_OfflineProgressListener progress_listener,</div><div class='del'>-		CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler;</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-	GList *uris;</div><div class='del'>-	</div><div class='del'>-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* To update the status */</div><div class='del'>-	priv-&gt;listener_interface = CORBA_Object_duplicate (progress_listener, ev);</div><div class='del'>-</div><div class='del'>-	uris = cal_client_uri_list (priv-&gt;client, CAL_MODE_REMOTE);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (uris, backend_go_offline, offline_handler);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_goOnline (PortableServer_Servant servant,</div><div class='del'>-	       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler;</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	offline_handler = CALENDAR_OFFLINE_HANDLER (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *offline_handler;</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	offline_handler = CALENDAR_OFFLINE_HANDLER (object);</div><div class='del'>-	priv = offline_handler-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;listener_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		CORBA_Object_release (priv-&gt;listener_interface, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GTK+ type initialization.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_offline_handler_class_init (CalendarOfflineHandlerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	POA_GNOME_Evolution_Offline__epv *epv;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = impl_destroy;</div><div class='del'>-</div><div class='del'>-	epv = &amp; klass-&gt;epv;</div><div class='del'>-	epv-&gt;_get_isOffline    = impl__get_isOffline;</div><div class='del'>-	epv-&gt;prepareForOffline = impl_prepareForOffline;</div><div class='del'>-	epv-&gt;goOffline         = impl_goOffline;</div><div class='del'>-	epv-&gt;goOnline          = impl_goOnline;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_offline_handler_init (CalendarOfflineHandler *offline_handler)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (CalendarOfflineHandlerPrivate, 1);</div><div class='del'>-	offline_handler-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = cal_client_new ();</div><div class='del'>-	priv-&gt;listener_interface = CORBA_OBJECT_NIL;</div><div class='del'>-	priv-&gt;is_offline = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CalendarOfflineHandler *</div><div class='del'>-calendar_offline_handler_new (void)</div><div class='del'>-{</div><div class='del'>-	CalendarOfflineHandler *new;</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (calendar_offline_handler_get_type ());</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (CalendarOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, calendar_offline_handler);</div><div class='head'>diff --git a/calendar/gui/calendar-offline-handler.h b/calendar/gui/calendar-offline-handler.h<br/>deleted file mode 100644<br/>index 4b87fd659f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-offline-handler.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-offline-handler.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* calendar-offline-handler.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CALENDAR_OFFLINE_HANDLER_H_</div><div class='del'>-#define _CALENDAR_OFFLINE_HANDLER_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CALENDAR_TYPE_OFFLINE_HANDLER			(calendar_offline_handler_get_type ())</div><div class='del'>-#define CALENDAR_OFFLINE_HANDLER(obj)			(GTK_CHECK_CAST ((obj), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandler))</div><div class='del'>-#define CALENDAR_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_OFFLINE_HANDLER, CalendarOfflineHandlerClass))</div><div class='del'>-#define CALENDAR_IS_OFFLINE_HANDLER(obj)			(GTK_CHECK_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))</div><div class='del'>-#define CALENDAR_IS_OFFLINE_HANDLER_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_OFFLINE_HANDLER))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarOfflineHandler        CalendarOfflineHandler;</div><div class='del'>-typedef struct _CalendarOfflineHandlerPrivate CalendarOfflineHandlerPrivate;</div><div class='del'>-typedef struct _CalendarOfflineHandlerClass   CalendarOfflineHandlerClass;</div><div class='del'>-</div><div class='del'>-struct _CalendarOfflineHandler {</div><div class='del'>-	BonoboXObject parent;</div><div class='del'>-</div><div class='del'>-	CalendarOfflineHandlerPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalendarOfflineHandlerClass {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Offline__epv epv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType             calendar_offline_handler_get_type  (void);</div><div class='del'>-CalendarOfflineHandler *calendar_offline_handler_new       (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _CALENDAR_OFFLINE_HANDLER_H_ */</div><div class='head'>diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c<br/>deleted file mode 100644<br/>index 0c3f0562f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-view-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-view-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,252 +0,0 @@</div><div class='del'>-/* Evolution calendar - Generic view factory for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "calendar-view-factory.h"</div><div class='del'>-#include "calendar-view.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalendarViewFactory structure */</div><div class='del'>-struct _CalendarViewFactoryPrivate {</div><div class='del'>-	/* Type of views created by this factory */</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void calendar_view_factory_class_init (CalendarViewFactoryClass *class);</div><div class='del'>-static void calendar_view_factory_init (CalendarViewFactory *cal_view_factory);</div><div class='del'>-static void calendar_view_factory_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static const char *calendar_view_factory_get_title (GalViewFactory *factory);</div><div class='del'>-static const char *calendar_view_factory_get_type_code (GalViewFactory *factory);</div><div class='del'>-static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name);</div><div class='del'>-</div><div class='del'>-static GalViewFactoryClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_factory_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #CalendarViewFactory class if necessary, and returns the type</div><div class='del'>- * ID associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalendarViewFactory class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-calendar_view_factory_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType calendar_view_factory_type;</div><div class='del'>-</div><div class='del'>-	if (!calendar_view_factory_type) {</div><div class='del'>-		static const GtkTypeInfo calendar_view_factory_info = {</div><div class='del'>-			"CalendarViewFactory",</div><div class='del'>-			sizeof (CalendarViewFactory),</div><div class='del'>-			sizeof (CalendarViewFactoryClass),</div><div class='del'>-			(GtkClassInitFunc) calendar_view_factory_class_init,</div><div class='del'>-			(GtkObjectInitFunc) calendar_view_factory_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		calendar_view_factory_type = gtk_type_unique (GAL_VIEW_FACTORY_TYPE,</div><div class='del'>-							      &amp;calendar_view_factory_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return calendar_view_factory_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar view factory */</div><div class='del'>-static void</div><div class='del'>-calendar_view_factory_class_init (CalendarViewFactoryClass *class)</div><div class='del'>-{</div><div class='del'>-	GalViewFactoryClass *gal_view_factory_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GAL_VIEW_FACTORY_TYPE);</div><div class='del'>-</div><div class='del'>-	gal_view_factory_class = (GalViewFactoryClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	gal_view_factory_class-&gt;get_title = calendar_view_factory_get_title;</div><div class='del'>-	gal_view_factory_class-&gt;get_type_code = calendar_view_factory_get_type_code;</div><div class='del'>-	gal_view_factory_class-&gt;new_view = calendar_view_factory_new_view;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = calendar_view_factory_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization class for the calendar view factory */</div><div class='del'>-static void</div><div class='del'>-calendar_view_factory_init (CalendarViewFactory *cal_view_factory)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalendarViewFactoryPrivate, 1);</div><div class='del'>-	cal_view_factory-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy method for the calendar view factory */</div><div class='del'>-static void</div><div class='del'>-calendar_view_factory_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactory *cal_view_factory;</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_VIEW_FACTORY (object));</div><div class='del'>-</div><div class='del'>-	cal_view_factory = CALENDAR_VIEW_FACTORY (object);</div><div class='del'>-	priv = cal_view_factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cal_view_factory-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_title method for the calendar view factory */</div><div class='del'>-static const char *</div><div class='del'>-calendar_view_factory_get_title (GalViewFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactory *cal_view_factory;</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);</div><div class='del'>-	priv = cal_view_factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		return _("Day View");</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		return _("Work Week View");</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		return _("Week View");</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		return _("Month View");</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get_type_code method for the calendar view factory */</div><div class='del'>-static const char *</div><div class='del'>-calendar_view_factory_get_type_code (GalViewFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactory *cal_view_factory;</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);</div><div class='del'>-	priv = cal_view_factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		return "day_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		return "work_week_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		return "week_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		return "month_view";</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* new_view method for the calendar view factory */</div><div class='del'>-static GalView *</div><div class='del'>-calendar_view_factory_new_view (GalViewFactory *factory, const char *name)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactory *cal_view_factory;</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-</div><div class='del'>-	cal_view_factory = CALENDAR_VIEW_FACTORY (factory);</div><div class='del'>-	priv = cal_view_factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_view = calendar_view_new (priv-&gt;view_type, name);</div><div class='del'>-	return GAL_VIEW (cal_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_factory_construct:</div><div class='del'>- * @cal_view_factory: A calendar view factory.</div><div class='del'>- * @view_type: Type of calendar views that the factory will create.</div><div class='del'>- * </div><div class='del'>- * Constructs a calendar view factory by setting the type of views it will</div><div class='del'>- * create.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @cal_view_factory.</div><div class='del'>- **/</div><div class='del'>-CalendarViewFactory *</div><div class='del'>-calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,</div><div class='del'>-				 GnomeCalendarViewType view_type)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal_view_factory != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_VIEW_FACTORY (cal_view_factory), NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal_view_factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_type = view_type;</div><div class='del'>-</div><div class='del'>-	return cal_view_factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_factory_new:</div><div class='del'>- * @view_type: Type of calendar views that the factory will create.</div><div class='del'>- * </div><div class='del'>- * Creates a new factory for calendar views.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created calendar view factory.</div><div class='del'>- **/</div><div class='del'>-CalendarViewFactory *</div><div class='del'>-calendar_view_factory_new (GnomeCalendarViewType view_type)</div><div class='del'>-{</div><div class='del'>-	CalendarViewFactory *cal_view_factory;</div><div class='del'>-</div><div class='del'>-	cal_view_factory = gtk_type_new (TYPE_CALENDAR_VIEW_FACTORY);</div><div class='del'>-	return calendar_view_factory_construct (cal_view_factory, view_type);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h<br/>deleted file mode 100644<br/>index 6b3409afeb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-view-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-view-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* Evolution calendar - Generic view factory for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CALENDAR_VIEW_FACTORY_H</div><div class='del'>-#define CALENDAR_VIEW_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-factory.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_CALENDAR_VIEW_FACTORY            (calendar_view_factory_get_type ())</div><div class='del'>-#define CALENDAR_VIEW_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW_FACTORY,  \</div><div class='del'>-					       CalendarViewFactory))</div><div class='del'>-#define CALENDAR_VIEW_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			   \</div><div class='del'>-					       TYPE_CALENDAR_VIEW_FACTORY, CalendarViewClass))</div><div class='del'>-#define IS_CALENDAR_VIEW_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW_FACTORY))</div><div class='del'>-#define IS_CALENDAR_VIEW_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),			   \</div><div class='del'>-					       TYPE_CALENDAR_VIEW_FACTORY))</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarViewFactoryPrivate CalendarViewFactoryPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewFactory factory;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalendarViewFactoryPrivate *priv;</div><div class='del'>-} CalendarViewFactory;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewFactoryClass parent_class;</div><div class='del'>-} CalendarViewFactoryClass;</div><div class='del'>-</div><div class='del'>-GtkType calendar_view_factory_get_type (void);</div><div class='del'>-</div><div class='del'>-CalendarViewFactory *calendar_view_factory_construct (CalendarViewFactory *cal_view_factory,</div><div class='del'>-						      GnomeCalendarViewType view_type);</div><div class='del'>-</div><div class='del'>-CalendarViewFactory *calendar_view_factory_new (GnomeCalendarViewType view_type);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c<br/>deleted file mode 100644<br/>index 7ab5e9f13c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,316 +0,0 @@</div><div class='del'>-/* Evolution calendar - Generic view object for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "calendar-view.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalendarView structure */</div><div class='del'>-struct _CalendarViewPrivate {</div><div class='del'>-	/* Type of the view */</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-</div><div class='del'>-	/* Title of the view */</div><div class='del'>-	char *title;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void calendar_view_class_init (CalendarViewClass *class);</div><div class='del'>-static void calendar_view_init (CalendarView *cview);</div><div class='del'>-static void calendar_view_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void calendar_view_edit (GalView *view);</div><div class='del'>-static void calendar_view_load (GalView *view, const char *filename);</div><div class='del'>-static void calendar_view_save (GalView *view, const char *filename);</div><div class='del'>-static const char *calendar_view_get_title (GalView *view);</div><div class='del'>-static void calendar_view_set_title (GalView *view, const char *title);</div><div class='del'>-static const char *calendar_view_get_type_code (GalView *view);</div><div class='del'>-static GalView *calendar_view_clone (GalView *view);</div><div class='del'>-</div><div class='del'>-static GalViewClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #CalendarView class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalendarView class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-calendar_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType calendar_view_type;</div><div class='del'>-</div><div class='del'>-	if (!calendar_view_type) {</div><div class='del'>-		static const GtkTypeInfo calendar_view_info = {</div><div class='del'>-			"CalendarView",</div><div class='del'>-			sizeof (CalendarView),</div><div class='del'>-			sizeof (CalendarViewClass),</div><div class='del'>-			(GtkClassInitFunc) calendar_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) calendar_view_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		calendar_view_type = gtk_type_unique (GAL_VIEW_TYPE, &amp;calendar_view_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return calendar_view_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_class_init (CalendarViewClass *class)</div><div class='del'>-{</div><div class='del'>-	GalViewClass *gal_view_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GAL_VIEW_TYPE);</div><div class='del'>-</div><div class='del'>-	gal_view_class = (GalViewClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	gal_view_class-&gt;edit = calendar_view_edit;</div><div class='del'>-	gal_view_class-&gt;load = calendar_view_load;</div><div class='del'>-	gal_view_class-&gt;save = calendar_view_save;</div><div class='del'>-	gal_view_class-&gt;get_title = calendar_view_get_title;</div><div class='del'>-	gal_view_class-&gt;set_title = calendar_view_set_title;</div><div class='del'>-	gal_view_class-&gt;get_type_code = calendar_view_get_type_code;</div><div class='del'>-	gal_view_class-&gt;clone = calendar_view_clone;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = calendar_view_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_init (CalendarView *cal_view)</div><div class='del'>-{</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalendarViewPrivate, 1);</div><div class='del'>-	cal_view-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;title = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy method for the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_VIEW (object));</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (object);</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;title) {</div><div class='del'>-		g_free (priv-&gt;title);</div><div class='del'>-		priv-&gt;title = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cal_view-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* edit method of the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_edit (GalView *view)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* load method of the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_load (GalView *view, const char *filename)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* save method of the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_save (GalView *view, const char *filename)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get_title method of the calendar view */</div><div class='del'>-static const char *</div><div class='del'>-calendar_view_get_title (GalView *view)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (view);</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;title;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_title method of the calendar view */</div><div class='del'>-static void</div><div class='del'>-calendar_view_set_title (GalView *view, const char *title)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (view);</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;title)</div><div class='del'>-		g_free (priv-&gt;title);</div><div class='del'>-</div><div class='del'>-	priv-&gt;title = g_strdup (title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get_type_code method for the calendar view */</div><div class='del'>-static const char *</div><div class='del'>-calendar_view_get_type_code (GalView *view)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (view);</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		return "day_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		return "work_week_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		return "week_view";</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		return "month_view";</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* clone method for the calendar view */</div><div class='del'>-static GalView *</div><div class='del'>-calendar_view_clone (GalView *view)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-	CalendarView *new_view;</div><div class='del'>-	CalendarViewPrivate *new_priv;</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (view);</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	new_view = gtk_type_new (TYPE_CALENDAR_VIEW);</div><div class='del'>-	new_priv = new_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	new_priv-&gt;view_type = priv-&gt;view_type;</div><div class='del'>-	new_priv-&gt;title = g_strdup (priv-&gt;title);</div><div class='del'>-</div><div class='del'>-	return GAL_VIEW (new_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_construct:</div><div class='del'>- * @cal_view: A calendar view.</div><div class='del'>- * @view_type: The type of calendar view that this object will represent.</div><div class='del'>- * @title: Title for the view.</div><div class='del'>- * </div><div class='del'>- * Constructs a calendar view by setting its view type and title.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @cal_view.</div><div class='del'>- **/</div><div class='del'>-CalendarView *</div><div class='del'>-calendar_view_construct (CalendarView *cal_view,</div><div class='del'>-			 GnomeCalendarViewType view_type,</div><div class='del'>-			 const char *title)</div><div class='del'>-{</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal_view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), NULL);</div><div class='del'>-	g_return_val_if_fail (title != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_type = view_type;</div><div class='del'>-	priv-&gt;title = g_strdup (title);</div><div class='del'>-</div><div class='del'>-	return cal_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_new:</div><div class='del'>- * @view_type: The type of calendar view that this object will represent.</div><div class='del'>- * @title: Title for the view.</div><div class='del'>- * </div><div class='del'>- * Creates a new calendar view object.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created calendar view.</div><div class='del'>- **/</div><div class='del'>-CalendarView *</div><div class='del'>-calendar_view_new (GnomeCalendarViewType view_type, const char *title)</div><div class='del'>-{</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-</div><div class='del'>-	cal_view = gtk_type_new (TYPE_CALENDAR_VIEW);</div><div class='del'>-	return calendar_view_construct (cal_view, view_type, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_view_get_view_type:</div><div class='del'>- * @cal_view: A calendar view.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar view type of a calendar view.</div><div class='del'>- * </div><div class='del'>- * Return value: Type of calendar view.</div><div class='del'>- **/</div><div class='del'>-GnomeCalendarViewType</div><div class='del'>-calendar_view_get_view_type (CalendarView *cal_view)</div><div class='del'>-{</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal_view != NULL, GNOME_CAL_DAY_VIEW);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_VIEW (cal_view), GNOME_CAL_DAY_VIEW);</div><div class='del'>-</div><div class='del'>-	priv = cal_view-&gt;priv;</div><div class='del'>-	return priv-&gt;view_type;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h<br/>deleted file mode 100644<br/>index 515038d874..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/calendar-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* Evolution calendar - Generic view object for calendar views</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CALENDAR_VIEW_H</div><div class='del'>-#define CALENDAR_VIEW_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_CALENDAR_VIEW            (calendar_view_get_type ())</div><div class='del'>-#define CALENDAR_VIEW(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))</div><div class='del'>-#define CALENDAR_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW,      	\</div><div class='del'>-				       CalendarViewClass))</div><div class='del'>-#define IS_CALENDAR_VIEW(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_VIEW))</div><div class='del'>-#define IS_CALENDAR_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarViewPrivate CalendarViewPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalView view;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalendarViewPrivate *priv;</div><div class='del'>-} CalendarView;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GalViewClass parent_class;</div><div class='del'>-} CalendarViewClass;</div><div class='del'>-</div><div class='del'>-GtkType calendar_view_get_type (void);</div><div class='del'>-</div><div class='del'>-CalendarView *calendar_view_construct (CalendarView *cal_view,</div><div class='del'>-				       GnomeCalendarViewType view_type,</div><div class='del'>-				       const char *title);</div><div class='del'>-</div><div class='del'>-CalendarView *calendar_view_new (GnomeCalendarViewType view_type,</div><div class='del'>-				 const char *title);</div><div class='del'>-</div><div class='del'>-GnomeCalendarViewType calendar_view_get_view_type (CalendarView *cal_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c<br/>deleted file mode 100644<br/>index 805e0a5c0b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/comp-editor-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/comp-editor-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,714 +0,0 @@</div><div class='del'>-/* Evolution calendar - Component editor factory object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;evolution-calendar.h&gt;</div><div class='del'>-#include &lt;e-util/e-url.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "comp-editor-factory.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "dialogs/event-editor.h"</div><div class='del'>-#include "dialogs/task-editor.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A pending request */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	REQUEST_EXISTING,</div><div class='del'>-	REQUEST_NEW</div><div class='del'>-} RequestType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	RequestType type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			char *uid;</div><div class='del'>-		} existing;</div><div class='del'>-</div><div class='del'>-		struct {</div><div class='del'>-			 GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type;</div><div class='del'>-		} new;</div><div class='del'>-	} u;</div><div class='del'>-} Request;</div><div class='del'>-</div><div class='del'>-/* A client we have open */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Our parent CompEditorFactory */</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-</div><div class='del'>-	/* Uri of the calendar, used as key in the clients hash table */</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	/* Client of the calendar */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Hash table of Component structures that belong to this client */</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-</div><div class='del'>-	/* Pending requests; they are pending if the client is still being opened */</div><div class='del'>-	GSList *pending;</div><div class='del'>-</div><div class='del'>-	/* Whether this is open or still waiting */</div><div class='del'>-	guint open : 1;</div><div class='del'>-} OpenClient;</div><div class='del'>-</div><div class='del'>-/* A component that is being edited */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Our parent client */</div><div class='del'>-	OpenClient *parent;</div><div class='del'>-</div><div class='del'>-	/* UID of the component we are editing, used as the key in the hash table */</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	/* Component we are editing */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* Component editor that is open */</div><div class='del'>-	CompEditor *editor;</div><div class='del'>-} Component;</div><div class='del'>-</div><div class='del'>-/* Private part of the CompEditorFactory structure */</div><div class='del'>-struct CompEditorFactoryPrivate {</div><div class='del'>-	/* Hash table of URI-&gt;OpenClient */</div><div class='del'>-	GHashTable *uri_client_hash;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void comp_editor_factory_class_init (CompEditorFactoryClass *class);</div><div class='del'>-static void comp_editor_factory_init (CompEditorFactory *factory);</div><div class='del'>-static void comp_editor_factory_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void impl_editExisting (PortableServer_Servant servant,</div><div class='del'>-			       const CORBA_char *str_uri,</div><div class='del'>-			       const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-			       CORBA_Environment *ev);</div><div class='del'>-static void impl_editNew (PortableServer_Servant servant,</div><div class='del'>-			  const CORBA_char *str_uri,</div><div class='del'>-			  const GNOME_Evolution_Calendar_CalObjType type,</div><div class='del'>-			  CORBA_Environment *ev);</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (CompEditorFactory,</div><div class='del'>-			 GNOME_Evolution_Calendar_CompEditorFactory,</div><div class='del'>-			 BONOBO_X_OBJECT_TYPE,</div><div class='del'>-			 comp_editor_factory);</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the component editor factory */</div><div class='del'>-static void</div><div class='del'>-comp_editor_factory_class_init (CompEditorFactoryClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	class-&gt;epv.editExisting = impl_editExisting;</div><div class='del'>-	class-&gt;epv.editNew = impl_editNew;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = comp_editor_factory_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the component editor factory */</div><div class='del'>-static void</div><div class='del'>-comp_editor_factory_init (CompEditorFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (CompEditorFactoryPrivate, 1);</div><div class='del'>-	factory-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri_client_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(); frees a component structure */</div><div class='del'>-static void</div><div class='del'>-free_component_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Component *c;</div><div class='del'>-</div><div class='del'>-	c = value;</div><div class='del'>-</div><div class='del'>-	c-&gt;parent = NULL;</div><div class='del'>-	c-&gt;uid = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (c-&gt;comp));</div><div class='del'>-	c-&gt;comp = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees a Request structure */</div><div class='del'>-static void</div><div class='del'>-free_request (Request *r)</div><div class='del'>-{</div><div class='del'>-	if (r-&gt;type == REQUEST_EXISTING) {</div><div class='del'>-		g_assert (r-&gt;u.existing.uid != NULL);</div><div class='del'>-		g_free (r-&gt;u.existing.uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees an OpenClient structure */</div><div class='del'>-static void</div><div class='del'>-free_client (OpenClient *oc)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_free (oc-&gt;uri);</div><div class='del'>-	oc-&gt;uri = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (oc-&gt;client));</div><div class='del'>-	oc-&gt;client = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (oc-&gt;uid_comp_hash, free_component_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (oc-&gt;uid_comp_hash);</div><div class='del'>-	oc-&gt;uid_comp_hash = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = oc-&gt;pending; l; l = l-&gt;next) {</div><div class='del'>-		Request *r;</div><div class='del'>-</div><div class='del'>-		r = l-&gt;data;</div><div class='del'>-		free_request (r);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free (oc-&gt;pending);</div><div class='del'>-	oc-&gt;pending = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (oc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(); frees a client structure */</div><div class='del'>-static void</div><div class='del'>-free_client_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-</div><div class='del'>-	oc = value;</div><div class='del'>-	free_client (oc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the component editor factory */</div><div class='del'>-static void</div><div class='del'>-comp_editor_factory_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_FACTORY (object));</div><div class='del'>-</div><div class='del'>-	factory = COMP_EDITOR_FACTORY (object);</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;uri_client_hash, free_client_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;uri_client_hash);</div><div class='del'>-	priv-&gt;uri_client_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	factory-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a component editor gets destroyed */</div><div class='del'>-static void</div><div class='del'>-editor_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Component *c;</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	c = data;</div><div class='del'>-	oc = c-&gt;parent;</div><div class='del'>-	factory = oc-&gt;factory;</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Free the Component */</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (oc-&gt;uid_comp_hash, c-&gt;uid);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (c-&gt;comp));</div><div class='del'>-	g_free (c);</div><div class='del'>-</div><div class='del'>-	/* See if we need to free the client */</div><div class='del'>-</div><div class='del'>-	g_assert (oc-&gt;pending == NULL);</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_size (oc-&gt;uid_comp_hash) != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uri_client_hash, oc-&gt;uri);</div><div class='del'>-	free_client (oc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Starts editing an existing component on a client that is already open */</div><div class='del'>-static void</div><div class='del'>-edit_existing (OpenClient *oc, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CompEditor *editor;</div><div class='del'>-	Component *c;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-</div><div class='del'>-	g_assert (oc-&gt;open);</div><div class='del'>-</div><div class='del'>-	/* Get the object */</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (oc-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* see below */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object disappeared from the server */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("edit_exiting(): Syntax error while getting component `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create the appropriate type of editor */</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		editor = COMP_EDITOR (event_editor_new ());</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		editor = COMP_EDITOR (task_editor_new ());</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("edit_exiting(): Unsupported object type %d", (int) vtype);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the client/object on the editor */</div><div class='del'>-</div><div class='del'>-	c = g_new (Component, 1);</div><div class='del'>-	c-&gt;parent = oc;</div><div class='del'>-	cal_component_get_uid (comp, &amp;c-&gt;uid);</div><div class='del'>-	c-&gt;comp = comp;</div><div class='del'>-	c-&gt;editor = editor;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (oc-&gt;uid_comp_hash, (char *) c-&gt;uid, c);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_destroy_cb), c);</div><div class='del'>-</div><div class='del'>-	comp_editor_set_cal_client (editor, oc-&gt;client);</div><div class='del'>-	comp_editor_edit_comp (editor, comp);</div><div class='del'>-	comp_editor_focus (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a component with the appropriate defaults for the specified component</div><div class='del'>- * type.</div><div class='del'>- */</div><div class='del'>-static CalComponent *</div><div class='del'>-get_default_event (gboolean all_day) </div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	comp = cal_comp_event_new_with_defaults ();</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	if (all_day) {</div><div class='del'>-		itt = icaltime_today ();</div><div class='del'>-</div><div class='del'>-		dt.value = &amp;itt;</div><div class='del'>-		dt.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);		</div><div class='del'>-	} else {</div><div class='del'>-		itt = icaltime_current_time_with_zone (zone);</div><div class='del'>-		itt.hour++;</div><div class='del'>-		itt.minute = 0;</div><div class='del'>-		itt.second = 0;</div><div class='del'>-		</div><div class='del'>-		dt.value = &amp;itt;</div><div class='del'>-		dt.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-		itt.hour++;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-get_default_task (void)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Edits a new object in the context of a client */</div><div class='del'>-static void</div><div class='del'>-edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	Component *c;</div><div class='del'>-	CompEditor *editor;</div><div class='del'>-	</div><div class='del'>-	switch (type) {</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:</div><div class='del'>-		editor = COMP_EDITOR (event_editor_new ());</div><div class='del'>-		comp = get_default_event (FALSE);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:</div><div class='del'>-		editor = COMP_EDITOR (event_editor_new ());</div><div class='del'>-		comp = get_default_event (TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:</div><div class='del'>-		editor = COMP_EDITOR (task_editor_new ());</div><div class='del'>-		comp = get_default_task ();</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c = g_new (Component, 1);</div><div class='del'>-	c-&gt;parent = oc;</div><div class='del'>-	cal_component_get_uid (comp, &amp;c-&gt;uid);</div><div class='del'>-	c-&gt;comp = comp;</div><div class='del'>-</div><div class='del'>-	c-&gt;editor = editor;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (oc-&gt;uid_comp_hash, (char *) c-&gt;uid, c);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (editor), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editor_destroy_cb), c);</div><div class='del'>-</div><div class='del'>-	comp_editor_set_cal_client (editor, oc-&gt;client);</div><div class='del'>-	comp_editor_edit_comp (editor, comp);</div><div class='del'>-	if (type == GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING)</div><div class='del'>-		event_editor_show_meeting (EVENT_EDITOR (editor));</div><div class='del'>-	comp_editor_focus (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resolves all the pending requests for a client */</div><div class='del'>-static void</div><div class='del'>-resolve_pending_requests (OpenClient *oc)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	factory = oc-&gt;factory;</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (oc-&gt;pending != NULL);</div><div class='del'>-</div><div class='del'>-	/* Set the default timezone in the backend. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	if (zone)</div><div class='del'>-		cal_client_set_default_timezone (oc-&gt;client, zone);</div><div class='del'>-</div><div class='del'>-	for (l = oc-&gt;pending; l; l = l-&gt;next) {</div><div class='del'>-		Request *request;</div><div class='del'>-</div><div class='del'>-		request = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		switch (request-&gt;type) {</div><div class='del'>-		case REQUEST_EXISTING:</div><div class='del'>-			edit_existing (oc, request-&gt;u.existing.uid);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case REQUEST_NEW:</div><div class='del'>-			edit_new (oc, request-&gt;u.new.type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		free_request (request);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (oc-&gt;pending);</div><div class='del'>-	oc-&gt;pending = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a client is finished opening.  We resolve all the pending</div><div class='del'>- * requests.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	oc = data;</div><div class='del'>-	factory = oc-&gt;factory;</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_OPEN_SUCCESS:</div><div class='del'>-		oc-&gt;open = TRUE;</div><div class='del'>-		resolve_pending_requests (oc);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_ERROR:</div><div class='del'>-		g_message ("cal_opened_cb(): Error while opening the calendar");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_NOT_FOUND:</div><div class='del'>-		/* bullshit; we specified only_if_exists = FALSE */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:</div><div class='del'>-		g_message ("cal_opened_cb(): Method not supported when opening the calendar");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uri_client_hash, oc-&gt;uri);</div><div class='del'>-	free_client (oc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a new OpenClient structure and queues the component editing/creation</div><div class='del'>- * process until the client is open.  Returns NULL if it could not issue the</div><div class='del'>- * open request.</div><div class='del'>- */</div><div class='del'>-static OpenClient *</div><div class='del'>-open_client (CompEditorFactory *factory, const char *uristr)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-	if (!client)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	oc = g_new (OpenClient, 1);</div><div class='del'>-	oc-&gt;factory = factory;</div><div class='del'>-</div><div class='del'>-	oc-&gt;uri = g_strdup (uristr);</div><div class='del'>-</div><div class='del'>-	oc-&gt;client = client;</div><div class='del'>-	oc-&gt;uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	oc-&gt;pending = NULL;</div><div class='del'>-	oc-&gt;open = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (oc-&gt;client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_opened_cb), oc);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_open_calendar (oc-&gt;client, uristr, FALSE)) {</div><div class='del'>-		g_free (oc-&gt;uri);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (oc-&gt;client));</div><div class='del'>-		g_hash_table_destroy (oc-&gt;uid_comp_hash);</div><div class='del'>-		g_free (oc);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;uri_client_hash, oc-&gt;uri, oc);</div><div class='del'>-</div><div class='del'>-	return oc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Looks up an open client or queues it for being opened.  Returns the client or</div><div class='del'>- * NULL on failure; in the latter case it sets the ev exception.</div><div class='del'>- */</div><div class='del'>-static OpenClient *</div><div class='del'>-lookup_open_client (CompEditorFactory *factory, const char *str_uri, CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-	EUri *uri;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Look up the client */</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (str_uri);</div><div class='del'>-	if (!uri) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_InvalidURI);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	oc = g_hash_table_lookup (priv-&gt;uri_client_hash, str_uri);</div><div class='del'>-	if (!oc) {</div><div class='del'>-		oc = open_client (factory, str_uri);</div><div class='del'>-		if (!oc) {</div><div class='del'>-			bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_CompEditorFactory_BackendContactError);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return oc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Queues a request for editing an existing object */</div><div class='del'>-static void</div><div class='del'>-queue_edit_existing (OpenClient *oc, const char *uid)</div><div class='del'>-{</div><div class='del'>-	Request *request;</div><div class='del'>-</div><div class='del'>-	g_assert (!oc-&gt;open);</div><div class='del'>-</div><div class='del'>-	request = g_new (Request, 1);</div><div class='del'>-	request-&gt;type = REQUEST_EXISTING;</div><div class='del'>-	request-&gt;u.existing.uid = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-	oc-&gt;pending = g_slist_append (oc-&gt;pending, request);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::editExisting() method implementation */</div><div class='del'>-static void</div><div class='del'>-impl_editExisting (PortableServer_Servant servant,</div><div class='del'>-		   const CORBA_char *str_uri,</div><div class='del'>-		   const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-	OpenClient *oc;</div><div class='del'>-	Component *c;</div><div class='del'>-</div><div class='del'>-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	oc = lookup_open_client (factory, str_uri, ev);</div><div class='del'>-	if (!oc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!oc-&gt;open) {</div><div class='del'>-		queue_edit_existing (oc, uid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look up the component */</div><div class='del'>-</div><div class='del'>-	c = g_hash_table_lookup (oc-&gt;uid_comp_hash, uid);</div><div class='del'>-	if (!c)</div><div class='del'>-		edit_existing (oc, uid);</div><div class='del'>-	else {</div><div class='del'>-		g_assert (c-&gt;editor != NULL);</div><div class='del'>-		comp_editor_focus (c-&gt;editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Queues a request for creating a new object */</div><div class='del'>-static void</div><div class='del'>-queue_edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)</div><div class='del'>-{</div><div class='del'>-	Request *request;</div><div class='del'>-</div><div class='del'>-	g_assert (!oc-&gt;open);</div><div class='del'>-</div><div class='del'>-	request = g_new (Request, 1);</div><div class='del'>-	request-&gt;type = REQUEST_NEW;</div><div class='del'>-	request-&gt;u.new.type = type;</div><div class='del'>-</div><div class='del'>-	oc-&gt;pending = g_slist_append (oc-&gt;pending, request);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ::editNew() method implementation */</div><div class='del'>-static void</div><div class='del'>-impl_editNew (PortableServer_Servant servant,</div><div class='del'>-	      const CORBA_char *str_uri,</div><div class='del'>-	      const GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode corba_type,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CompEditorFactory *factory;</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-	OpenClient *oc;</div><div class='del'>- </div><div class='del'>-	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	oc = lookup_open_client (factory, str_uri, ev);</div><div class='del'>-	if (!oc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!oc-&gt;open)</div><div class='del'>-		queue_edit_new (oc, corba_type);</div><div class='del'>-	else</div><div class='del'>-		edit_new (oc, corba_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_factory_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new calendar component editor factory.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created component editor factory.</div><div class='del'>- **/</div><div class='del'>-CompEditorFactory *</div><div class='del'>-comp_editor_factory_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (TYPE_COMP_EDITOR_FACTORY);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h<br/>deleted file mode 100644<br/>index 21e27941fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/comp-editor-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/comp-editor-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* Evolution calendar - Component editor factory object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef COMP_EDITOR_FACTORY_H</div><div class='del'>-#define COMP_EDITOR_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_COMP_EDITOR_FACTORY            (comp_editor_factory_get_type ())</div><div class='del'>-#define COMP_EDITOR_FACTORY(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_FACTORY,	\</div><div class='del'>-					     CompEditorFactory))</div><div class='del'>-#define COMP_EDITOR_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass),			\</div><div class='del'>-					     TYPE_COMP_EDITOR_FACTORY, CompEditorFactoryClass))</div><div class='del'>-#define IS_COMP_EDITOR_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_FACTORY))</div><div class='del'>-#define IS_COMP_EDITOR_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR_FACTORY))</div><div class='del'>-</div><div class='del'>-typedef struct CompEditorFactoryPrivate CompEditorFactoryPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CompEditorFactoryPrivate *priv;</div><div class='del'>-} CompEditorFactory;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_CompEditorFactory__epv epv;</div><div class='del'>-} CompEditorFactoryClass;</div><div class='del'>-</div><div class='del'>-GtkType comp_editor_factory_get_type (void);</div><div class='del'>-</div><div class='del'>-CompEditorFactory *comp_editor_factory_new (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c<br/>deleted file mode 100644<br/>index 5edfb90af5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/comp-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/comp-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,325 +0,0 @@</div><div class='del'>-/* Evolution calendar - Utilities for manipulating CalComponent objects</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "dialogs/delete-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_comp_util_add_exdate:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @itt: Time for the exception.</div><div class='del'>- * </div><div class='del'>- * Adds an exception date to the current list of EXDATE properties in a calendar</div><div class='del'>- * component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	CalComponentDateTime *cdt;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-</div><div class='del'>-	cdt = g_new (CalComponentDateTime, 1);</div><div class='del'>-	cdt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-	*cdt-&gt;value = icaltime_from_timet_with_zone (t, FALSE, zone);</div><div class='del'>-	cdt-&gt;tzid = g_strdup (icaltimezone_get_tzid (zone));</div><div class='del'>-</div><div class='del'>-	list = g_slist_append (list, cdt);</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_component_compare_tzid (const char *tzid1, const char *tzid2)</div><div class='del'>-{</div><div class='del'>-	gboolean retval = TRUE;</div><div class='del'>-</div><div class='del'>-	if (tzid1) {</div><div class='del'>-		if (!tzid2 || strcmp (tzid1, tzid2))</div><div class='del'>-			retval = FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		if (tzid2)</div><div class='del'>-			retval = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_comp_util_compare_event_timezones:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @client: A #CalClient.</div><div class='del'>- * </div><div class='del'>- * Checks if the component uses the given timezone for both the start and</div><div class='del'>- * the end time, or if the UTC offsets of the start and end times are the same</div><div class='del'>- * as in the given zone.</div><div class='del'>- *</div><div class='del'>- * Returns: TRUE if the component's start and end time are at the same UTC</div><div class='del'>- * offset in the given timezone.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_comp_util_compare_event_timezones (CalComponent *comp,</div><div class='del'>-				       CalClient *client,</div><div class='del'>-				       icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CalComponentDateTime start_datetime, end_datetime;</div><div class='del'>-	const char *tzid;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-	icaltimezone *start_zone, *end_zone;</div><div class='del'>-	int offset1, offset2;</div><div class='del'>-</div><div class='del'>-	tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;start_datetime);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;end_datetime);</div><div class='del'>-</div><div class='del'>-	/* If either the DTSTART or the DTEND is a DATE value, we return TRUE.</div><div class='del'>-	   Maybe if one was a DATE-TIME we should check that, but that should</div><div class='del'>-	   not happen often. */</div><div class='del'>-	if ((start_datetime.value &amp;&amp; start_datetime.value-&gt;is_date)</div><div class='del'>-	    || (end_datetime.value &amp;&amp; end_datetime.value-&gt;is_date)) {</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event uses UTC for DTSTART &amp; DTEND, return TRUE. Outlook</div><div class='del'>-	   will send single events as UTC, so we don't want to mark all of</div><div class='del'>-	   these. */</div><div class='del'>-	if ((!start_datetime.value || start_datetime.value-&gt;is_utc)</div><div class='del'>-	    &amp;&amp; (!end_datetime.value || end_datetime.value-&gt;is_utc)) {</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event uses floating time for DTSTART &amp; DTEND, return TRUE.</div><div class='del'>-	   Imported vCalendar files will use floating times, so we don't want</div><div class='del'>-	   to mark all of these. */</div><div class='del'>-	if (!start_datetime.tzid &amp;&amp; !end_datetime.tzid) {</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: DURATION may be used instead. */</div><div class='del'>-	if (cal_component_compare_tzid (tzid, start_datetime.tzid)</div><div class='del'>-	    &amp;&amp; cal_component_compare_tzid (tzid, end_datetime.tzid)) {</div><div class='del'>-		/* If both TZIDs are the same as the given zone's TZID, then</div><div class='del'>-		   we know the timezones are the same so we return TRUE. */</div><div class='del'>-		retval = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		/* If the TZIDs differ, we have to compare the UTC offsets</div><div class='del'>-		   of the start and end times, using their own timezones and</div><div class='del'>-		   the given timezone. */</div><div class='del'>-		status = cal_client_get_timezone (client,</div><div class='del'>-						  start_datetime.tzid,</div><div class='del'>-						  &amp;start_zone);</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (start_datetime.value) {</div><div class='del'>-			offset1 = icaltimezone_get_utc_offset (start_zone,</div><div class='del'>-							       start_datetime.value,</div><div class='del'>-							       NULL);</div><div class='del'>-			offset2 = icaltimezone_get_utc_offset (zone,</div><div class='del'>-							       start_datetime.value,</div><div class='del'>-							       NULL);</div><div class='del'>-			if (offset1 != offset2)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_timezone (client,</div><div class='del'>-						  end_datetime.tzid,</div><div class='del'>-						  &amp;end_zone);</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		if (end_datetime.value) {</div><div class='del'>-			offset1 = icaltimezone_get_utc_offset (end_zone,</div><div class='del'>-							       end_datetime.value,</div><div class='del'>-							       NULL);</div><div class='del'>-			offset2 = icaltimezone_get_utc_offset (zone,</div><div class='del'>-							       end_datetime.value,</div><div class='del'>-							       NULL);</div><div class='del'>-			if (offset1 != offset2)</div><div class='del'>-				goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;start_datetime);</div><div class='del'>-	cal_component_free_datetime (&amp;end_datetime);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_comp_confirm_delete_empty_comp:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * @client: Calendar client where the component purportedly lives.</div><div class='del'>- * @widget: Widget to be used as the basis for UTF8 conversion.</div><div class='del'>- * </div><div class='del'>- * Assumming a calendar component with an empty SUMMARY property (as per</div><div class='del'>- * string_is_empty()), asks whether the user wants to delete it based on</div><div class='del'>- * whether the appointment is on the calendar server or not.  If the</div><div class='del'>- * component is on the server, this function will present a confirmation</div><div class='del'>- * dialog and delete the component if the user tells it to.  If the component</div><div class='del'>- * is not on the server it will just return TRUE.</div><div class='del'>- * </div><div class='del'>- * Return value: A result code indicating whether the component</div><div class='del'>- * was not on the server and is to be deleted locally, whether it</div><div class='del'>- * was on the server and the user deleted it, or whether the</div><div class='del'>- * user cancelled the deletion.</div><div class='del'>- **/</div><div class='del'>-ConfirmDeleteEmptyCompResult</div><div class='del'>-cal_comp_confirm_delete_empty_comp (CalComponent *comp, CalClient *client, GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CalComponent *server_comp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-	g_return_val_if_fail (client != NULL, EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-	g_return_val_if_fail (widget != NULL, EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_WIDGET (widget), EMPTY_COMP_DO_NOT_REMOVE);</div><div class='del'>-</div><div class='del'>-	/* See if the component is on the server.  If it is not, then it likely</div><div class='del'>-	 * means that the appointment is new, only in the day view, and we</div><div class='del'>-	 * haven't added it yet to the server.  In that case, we don't need to</div><div class='del'>-	 * confirm and we can just delete the event.  Otherwise, we ask</div><div class='del'>-	 * the user.</div><div class='del'>-	 */</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (client, uid, &amp;server_comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (server_comp));</div><div class='del'>-		/* Will handle confirmation below */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("confirm_delete_empty_appointment(): Syntax error when getting "</div><div class='del'>-			   "object `%s'",</div><div class='del'>-			   uid);</div><div class='del'>-		/* However, the object *is* in the server, so confirm */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		return EMPTY_COMP_REMOVE_LOCALLY;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The event exists in the server, so confirm whether to delete it */</div><div class='del'>-</div><div class='del'>-	if (delete_component_dialog (comp, TRUE, 1, CAL_COMPONENT_EVENT, widget)) {</div><div class='del'>-		cal_client_remove_object (client, uid);</div><div class='del'>-		return EMPTY_COMP_REMOVED_FROM_SERVER;</div><div class='del'>-	} else</div><div class='del'>-		return EMPTY_COMP_DO_NOT_REMOVE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_comp_event_new_with_defaults:</div><div class='del'>- * </div><div class='del'>- * Creates a new VEVENT component and adds any default alarms to it as set in</div><div class='del'>- * the program's configuration values.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created calendar component.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_comp_event_new_with_defaults (void)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	int interval;</div><div class='del'>-	CalUnits units;</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	CalAlarmTrigger trigger;</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-	if (!calendar_config_get_use_default_reminder ())</div><div class='del'>-		return comp;</div><div class='del'>-</div><div class='del'>-	interval = calendar_config_get_default_reminder_interval ();</div><div class='del'>-	units = calendar_config_get_default_reminder_units ();</div><div class='del'>-</div><div class='del'>-	alarm = cal_component_alarm_new ();</div><div class='del'>-</div><div class='del'>-	/* We don't set the description of the alarm; we'll copy it from the</div><div class='del'>-	 * summary when it gets committed to the server.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_action (alarm, CAL_ALARM_DISPLAY);</div><div class='del'>-</div><div class='del'>-	trigger.type = CAL_ALARM_TRIGGER_RELATIVE_START;</div><div class='del'>-</div><div class='del'>-	memset (&amp;trigger.u.rel_duration, 0, sizeof (trigger.u.rel_duration));</div><div class='del'>-</div><div class='del'>-	trigger.u.rel_duration.is_neg = TRUE;</div><div class='del'>-</div><div class='del'>-	switch (units) {</div><div class='del'>-	case CAL_MINUTES:</div><div class='del'>-		trigger.u.rel_duration.minutes = interval;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_HOURS:	</div><div class='del'>-		trigger.u.rel_duration.hours = interval;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_DAYS:	</div><div class='del'>-		trigger.u.rel_duration.days = interval;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_trigger (alarm, trigger);</div><div class='del'>-</div><div class='del'>-	cal_component_add_alarm (comp, alarm);</div><div class='del'>-	cal_component_alarm_free (alarm);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h<br/>deleted file mode 100644<br/>index a4a55c0a2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/comp-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/comp-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* Evolution calendar - Utilities for manipulating CalComponent objects</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef COMP_UTIL_H</div><div class='del'>-#define COMP_UTIL_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-void cal_comp_util_add_exdate (CalComponent *comp, time_t t, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the component uses the given timezone for both DTSTART</div><div class='del'>-   and DTEND, or if the UTC offsets of the start and end times are the same</div><div class='del'>-   as in the given zone. */</div><div class='del'>-gboolean cal_comp_util_compare_event_timezones (CalComponent *comp,</div><div class='del'>-						CalClient *client,</div><div class='del'>-						icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	EMPTY_COMP_REMOVE_LOCALLY,</div><div class='del'>-	EMPTY_COMP_REMOVED_FROM_SERVER,</div><div class='del'>-	EMPTY_COMP_DO_NOT_REMOVE</div><div class='del'>-} ConfirmDeleteEmptyCompResult;</div><div class='del'>-</div><div class='del'>-ConfirmDeleteEmptyCompResult cal_comp_confirm_delete_empty_comp (CalComponent *comp,</div><div class='del'>-								 CalClient *client,</div><div class='del'>-								 GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_comp_event_new_with_defaults (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c<br/>deleted file mode 100644<br/>index b4a2b3ab89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/component-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,729 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-types.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-uri.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-ops.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-directory.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-file-info.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include "calendar-offline-handler.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "tasks-control-factory.h"</div><div class='del'>-#include "config-control-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "tasks-control.h"</div><div class='del'>-#include "tasks-migrate.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* OAFIID for the component.  */</div><div class='del'>-#define COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"</div><div class='del'>- </div><div class='del'>-/* Folder type IDs */</div><div class='del'>-#define FOLDER_CALENDAR "calendar"</div><div class='del'>-#define FOLDER_TASKS "tasks"</div><div class='del'>-</div><div class='del'>-/* IDs for user creatable items */</div><div class='del'>-#define CREATE_EVENT_ID "event"</div><div class='del'>-#define CREATE_ALLDAY_EVENT_ID "allday-event"</div><div class='del'>-#define CREATE_MEETING_ID "meeting"</div><div class='del'>-#define CREATE_TASK_ID "task"</div><div class='del'>-</div><div class='del'>-char *evolution_dir;</div><div class='del'>-EvolutionShellClient *global_shell_client = NULL;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ FOLDER_CALENDAR,</div><div class='del'>-	  "evolution-calendar.png",</div><div class='del'>-	  N_("Calendar"),</div><div class='del'>-	  N_("Folder containing appointments and events"),</div><div class='del'>-	  TRUE, NULL, NULL },</div><div class='del'>-	{ FOLDER_TASKS,</div><div class='del'>-	  "evolution-tasks.png",</div><div class='del'>-	  N_("Tasks"),</div><div class='del'>-	  N_("Folder containing to-do items"),</div><div class='del'>-	  TRUE, NULL, NULL },</div><div class='del'>-	{ NULL, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* EvolutionShellComponent methods and signals.  */</div><div class='del'>-</div><div class='del'>-static EvolutionShellComponentResult</div><div class='del'>-create_view (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     const char *view_info,</div><div class='del'>-	     BonoboControl **control_return,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (type, "calendar")) {</div><div class='del'>-		control = control_factory_new_control ();</div><div class='del'>-		if (!control)</div><div class='del'>-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;</div><div class='del'>-	} else if (!g_strcasecmp (type, "tasks")) {</div><div class='del'>-		control = tasks_control_new ();</div><div class='del'>-		if (!control)</div><div class='del'>-			return EVOLUTION_SHELL_COMPONENT_CORBAERROR;</div><div class='del'>-	} else {</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);</div><div class='del'>-	if (!g_strcasecmp (type, "calendar") &amp;&amp; *view_info)</div><div class='del'>-		bonobo_control_set_property (control, "view", view_info, NULL);</div><div class='del'>-</div><div class='del'>-	*control_return = control;</div><div class='del'>-</div><div class='del'>-	return EVOLUTION_SHELL_COMPONENT_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (physical_uri);</div><div class='del'>-	if (uri) {</div><div class='del'>-		/* we don't need to do anything */</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_OK, &amp;ev);</div><div class='del'>-		gnome_vfs_uri_unref (uri);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Asks the alarm daemon to stop monitoring the specified URI */</div><div class='del'>-static void</div><div class='del'>-stop_alarms (GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	char *str_uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify an;</div><div class='del'>-</div><div class='del'>-	/* Activate the alarm notification service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("stop_alarms(): Could not activate the alarm notification service");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Ask the service to remove the URI from its list of calendars */</div><div class='del'>-</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-	g_assert (str_uri != NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify_removeCalendar (an, str_uri, &amp;ev);</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI)) {</div><div class='del'>-		g_message ("stop_alarms(): Invalid URI reported from the alarm notification service");</div><div class='del'>-	} else if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_NotFound)) {</div><div class='del'>-		/* This is OK; the service may not have loaded that calendar */</div><div class='del'>-	} else if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("stop_alarms(): Could not issue the removeCalendar request");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (an, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("stop_alarms(): Could not unref the alarm notification service");</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	       const char *physical_uri,</div><div class='del'>-	       const char *type,</div><div class='del'>-	       const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSURI *dir_uri, *data_uri, *backup_uri;</div><div class='del'>-	GnomeVFSResult data_result, backup_result;</div><div class='del'>-</div><div class='del'>-	/* check type */</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener of "</div><div class='del'>-				   "an unsupported folder type");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check URI */</div><div class='del'>-	dir_uri = gnome_vfs_uri_new (physical_uri);</div><div class='del'>-	if (!dir_uri) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Compute the URIs of the appropriate files */</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) == 0) {</div><div class='del'>-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics");</div><div class='del'>-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "calendar.ics~");</div><div class='del'>-	} else if (strcmp (type, FOLDER_TASKS) == 0) {</div><div class='del'>-		data_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics");</div><div class='del'>-		backup_uri = gnome_vfs_uri_append_file_name (dir_uri, "tasks.ics~");</div><div class='del'>-	} else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!data_uri || !backup_uri) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		g_message ("remove_folder(): Could not generate the data/backup URIs");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener "</div><div class='del'>-				   "of an invalid URI");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ask the alarm daemon to stop monitoring this URI */</div><div class='del'>-</div><div class='del'>-	stop_alarms (data_uri);</div><div class='del'>-</div><div class='del'>-	/* Delete the data and backup files; the shell will take care of the rest */</div><div class='del'>-</div><div class='del'>-	data_result = gnome_vfs_unlink_from_uri (data_uri);</div><div class='del'>-	backup_result = gnome_vfs_unlink_from_uri (backup_uri);</div><div class='del'>-</div><div class='del'>-	if ((data_result == GNOME_VFS_OK || data_result == GNOME_VFS_ERROR_NOT_FOUND)</div><div class='del'>-	    &amp;&amp; (backup_result == GNOME_VFS_OK || backup_result == GNOME_VFS_ERROR_NOT_FOUND)) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_OK,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener about success");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	} else {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("remove_folder(): Could not notify the listener about failure");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (dir_uri);</div><div class='del'>-</div><div class='del'>-	if (data_uri)</div><div class='del'>-		gnome_vfs_uri_unref (data_uri);</div><div class='del'>-</div><div class='del'>-	if (backup_uri)</div><div class='del'>-		gnome_vfs_uri_unref (backup_uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_ShellComponentListener_Result</div><div class='del'>-xfer_file (GnomeVFSURI *base_src_uri,</div><div class='del'>-	   GnomeVFSURI *base_dest_uri,</div><div class='del'>-	   const char *file_name,</div><div class='del'>-	   int remove_source)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSURI *src_uri, *dest_uri;</div><div class='del'>-	GnomeVFSHandle *hin, *hout;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GnomeVFSFileInfo file_info;</div><div class='del'>-	GnomeVFSFileSize size;</div><div class='del'>-	char *buffer;</div><div class='del'>-</div><div class='del'>-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_open_uri (&amp;hin, src_uri, GNOME_VFS_OPEN_READ);</div><div class='del'>-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */</div><div class='del'>-	}</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_get_file_info_uri (src_uri, &amp;file_info, GNOME_VFS_FILE_INFO_DEFAULT);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_create_uri (&amp;hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write source file to destination file */</div><div class='del'>-	buffer = g_malloc (file_info.size);</div><div class='del'>-	result = gnome_vfs_read (hin, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_write (hout, buffer, file_info.size, &amp;size);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_close (hin);</div><div class='del'>-		gnome_vfs_close (hout);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		g_free (buffer);</div><div class='del'>-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (remove_source) {</div><div class='del'>-		char *text_uri;</div><div class='del'>-</div><div class='del'>-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */</div><div class='del'>-</div><div class='del'>-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-		result = gnome_vfs_unlink (text_uri);</div><div class='del'>-		g_free (text_uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (hin);</div><div class='del'>-	gnome_vfs_close (hout);</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-	g_free (buffer);</div><div class='del'>-</div><div class='del'>-	return GNOME_Evolution_ShellComponentListener_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xfer_folder (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *source_physical_uri,</div><div class='del'>-	     const char *destination_physical_uri,</div><div class='del'>-	     const char *type,</div><div class='del'>-	     gboolean remove_source,</div><div class='del'>-	     const GNOME_Evolution_ShellComponentListener listener,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GnomeVFSURI *src_uri;</div><div class='del'>-	GnomeVFSURI *dest_uri;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	char *filename, *backup_filename;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* check type */</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) &amp;&amp; strcmp (type, FOLDER_TASKS)) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check URIs */</div><div class='del'>-	src_uri = gnome_vfs_uri_new (source_physical_uri);</div><div class='del'>-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);</div><div class='del'>-	if (!src_uri || ! dest_uri) {</div><div class='del'>-		GNOME_Evolution_ShellComponentListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ShellComponentListener_INVALID_URI,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		gnome_vfs_uri_unref (src_uri);</div><div class='del'>-		gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strcmp (type, FOLDER_CALENDAR) == 0) {</div><div class='del'>-		filename = "calendar.ics";</div><div class='del'>-		backup_filename = "calendar.ics~";</div><div class='del'>-	} else if (strcmp (type, FOLDER_TASKS) == 0) {</div><div class='del'>-		filename = "tasks.ics";</div><div class='del'>-		backup_filename = "tasks.ics~";</div><div class='del'>-	} else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = xfer_file (src_uri, dest_uri, filename, remove_source);</div><div class='del'>-	if (result == GNOME_Evolution_ShellComponentListener_OK)</div><div class='del'>-		result = xfer_file (src_uri, dest_uri, backup_filename, remove_source);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (src_uri);</div><div class='del'>-	gnome_vfs_uri_unref (dest_uri);</div><div class='del'>-</div><div class='del'>-        CORBA_exception_free (&amp;ev);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *shells = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	static gboolean migrated = FALSE;</div><div class='del'>-	</div><div class='del'>-	evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-</div><div class='del'>-	if (!migrated) {</div><div class='del'>-		tasks_migrate ();</div><div class='del'>-		migrated = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	shells = g_list_append (shells, shell_component);</div><div class='del'>-</div><div class='del'>-	global_shell_client = shell_client;</div><div class='del'>-</div><div class='del'>-	config_control_factory_register (bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	shells = g_list_remove (shells, shell_component);</div><div class='del'>-	</div><div class='del'>-	if (g_list_length (shells) == 0)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes the final URI for a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_data_uri (const char *uri, CalComponentVType vtype)</div><div class='del'>-{</div><div class='del'>-	if (uri) {</div><div class='del'>-		if (*uri != '/' &amp;&amp; strncmp (uri, "file:", 5) != 0)</div><div class='del'>-			return g_strdup (uri);</div><div class='del'>-		if (vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-			return g_concat_dir_and_file (uri, "calendar.ics");</div><div class='del'>-		else if (vtype == CAL_COMPONENT_TODO)</div><div class='del'>-			return g_concat_dir_and_file (uri, "tasks.ics");</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	} else {</div><div class='del'>-		if (vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-			return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-						      "evolution/local/Calendar/calendar.ics");</div><div class='del'>-		else if (vtype == CAL_COMPONENT_TODO)</div><div class='del'>-			return g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-						      "evolution/local/Tasks/tasks.ics");</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a calendar component at a specified URI.  If the URI is NULL then it</div><div class='del'>- * uses the default folder for that type of component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-create_component (const char *uri, GNOME_Evolution_Calendar_CompEditorFactory_CompEditorMode type)</div><div class='del'>-{</div><div class='del'>-	char *real_uri;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory factory;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT:</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT:</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING:</div><div class='del'>-		vtype = CAL_COMPONENT_EVENT;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:</div><div class='del'>-		vtype = CAL_COMPONENT_TODO;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	real_uri = get_data_uri (uri, vtype);</div><div class='del'>-</div><div class='del'>-	/* Get the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	factory = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory",</div><div class='del'>-					0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("create_component(): Could not activate the component editor factory");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_free (real_uri);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Create the item */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_CompEditorFactory_editNew (factory, real_uri, type, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("create_component(): Exception while creating the component");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (real_uri);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the factory */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (factory, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("create_component(): Could not unref the calendar component factory");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when we must create a user-creatable item */</div><div class='del'>-static void</div><div class='del'>-sc_user_create_new_item_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-			    const char *id,</div><div class='del'>-			    const char *parent_folder_physical_uri,</div><div class='del'>-			    const char *parent_folder_type)</div><div class='del'>-{</div><div class='del'>-	if (strcmp (id, CREATE_EVENT_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT);</div><div class='del'>- 	} else if (strcmp (id, CREATE_ALLDAY_EVENT_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT);</div><div class='del'>-	} else if (strcmp (id, CREATE_MEETING_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_CALENDAR) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING);</div><div class='del'>-	} else if (strcmp (id, CREATE_TASK_ID) == 0) {</div><div class='del'>-		if (strcmp (parent_folder_type, FOLDER_TASKS) == 0)</div><div class='del'>-			create_component (parent_folder_physical_uri,</div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);</div><div class='del'>-		else</div><div class='del'>-			create_component (NULL, </div><div class='del'>-					  GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO);</div><div class='del'>-	} else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The factory function.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_creatable_item (EvolutionShellComponent *shell_component,</div><div class='del'>-		    const char *id,</div><div class='del'>-		    const char *description,</div><div class='del'>-		    const char *menu_description,</div><div class='del'>-		    char menu_shortcut,</div><div class='del'>-		    const char *icon_name)</div><div class='del'>-{</div><div class='del'>-	char *icon_path;</div><div class='del'>-	GdkPixbuf *icon;</div><div class='del'>-</div><div class='del'>-	if (icon_name == NULL) {</div><div class='del'>-		icon_path = NULL;</div><div class='del'>-		icon = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		icon_path = g_concat_dir_and_file (EVOLUTION_ICONSDIR, icon_name);</div><div class='del'>-		icon = gdk_pixbuf_new_from_file (icon_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	evolution_shell_component_add_user_creatable_item (shell_component,</div><div class='del'>-							   id,</div><div class='del'>-							   description,</div><div class='del'>-							   menu_description,</div><div class='del'>-							   menu_shortcut,</div><div class='del'>-							   icon);</div><div class='del'>-</div><div class='del'>-	if (icon != NULL)</div><div class='del'>-		gdk_pixbuf_unref (icon);</div><div class='del'>-	g_free (icon_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-create_object (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellComponent *shell_component;</div><div class='del'>-	CalendarOfflineHandler *offline_handler;	</div><div class='del'>-</div><div class='del'>-	shell_component = evolution_shell_component_new (folder_types,</div><div class='del'>-							 NULL,</div><div class='del'>-							 create_view,</div><div class='del'>-							 create_folder,</div><div class='del'>-							 remove_folder,</div><div class='del'>-							 xfer_folder,</div><div class='del'>-							 NULL, /* populate_folder_context_menu_fn */</div><div class='del'>-							 NULL, /* get_dnd_selection_fn */</div><div class='del'>-							 NULL  /* closure */);</div><div class='del'>-</div><div class='del'>-	/* Offline handler */</div><div class='del'>-	offline_handler = calendar_offline_handler_new ();</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component), </div><div class='del'>-				     BONOBO_OBJECT (offline_handler));</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);</div><div class='del'>-</div><div class='del'>-	/* User creatable items */</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_MEETING_ID,</div><div class='del'>-			    _("New meeting"), _("_Meeting"),</div><div class='del'>-			    's', "meeting-request.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_TASK_ID,</div><div class='del'>-			    _("New task"), _("_Task"),</div><div class='del'>-			    't', "new_task-16.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_ALLDAY_EVENT_ID,</div><div class='del'>-			    _("New All Day Appointment"), _("All _Day Appointment"),</div><div class='del'>-			    'd', "new_all_day_event.png");</div><div class='del'>-</div><div class='del'>-	add_creatable_item (shell_component, CREATE_EVENT_ID,</div><div class='del'>-			    _("New appointment"), _("_Appointment"),</div><div class='del'>-			    'a', "new_appointment.xpm");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",</div><div class='del'>-			    GTK_SIGNAL_FUNC (sc_user_create_new_item_cb), NULL);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (shell_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *object;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	object = create_object ();</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (COMPONENT_ID, bonobo_object_corba_objref (object));</div><div class='del'>-</div><div class='del'>-	if (result == OAF_REG_ERROR)</div><div class='del'>-		g_error ("Cannot initialize Evolution's calendar component.");</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h<br/>deleted file mode 100644<br/>index 576255cb6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/component-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _COMPONENT_FACTORY_H_</div><div class='del'>-#define _COMPONENT_FACTORY_H_</div><div class='del'>-</div><div class='del'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-void  component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _COMPONENT_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/config-control-factory.c b/calendar/gui/config-control-factory.c<br/>deleted file mode 100644<br/>index f2a9b48383..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/config-control-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/config-control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* config-control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "config-control-factory.h"</div><div class='del'>-</div><div class='del'>-#include "dialogs/cal-prefs-dialog.h"</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControlFactory"</div><div class='del'>-static BonoboGenericFactory *generic_factory = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *generic_factory,</div><div class='del'>-	    void *data)</div><div class='del'>-{</div><div class='del'>-	EvolutionConfigControl *config_control;</div><div class='del'>-</div><div class='del'>-	config_control = cal_prefs_dialog_new ();</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-config_control_factory_register (GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	generic_factory = bonobo_generic_factory_new (CONFIG_CONTROL_FACTORY_ID,</div><div class='del'>-						      factory_fn, shell);</div><div class='del'>-</div><div class='del'>-	if (generic_factory == NULL) {</div><div class='del'>-		g_warning ("Cannot register %s", CONFIG_CONTROL_FACTORY_ID);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/config-control-factory.h b/calendar/gui/config-control-factory.h<br/>deleted file mode 100644<br/>index b0ff927fa9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/config-control-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/config-control-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* config-control-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CONFIG_CONTROL_FACTORY_H</div><div class='del'>-#define CONFIG_CONTROL_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-</div><div class='del'>-gboolean  config_control_factory_register  (GNOME_Evolution_Shell shell);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c<br/>deleted file mode 100644<br/>index a17790f197..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,267 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-file.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;gui/gnome-cal.h&gt;</div><div class='del'>-#include &lt;gui/calendar-commands.h&gt;</div><div class='del'>-</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-</div><div class='del'>-#define PROPERTY_CALENDAR_URI      "folder_uri"</div><div class='del'>-#define PROPERTY_CALENDAR_URI_IDX  1</div><div class='del'>-</div><div class='del'>-#define PROPERTY_CALENDAR_VIEW     "view"</div><div class='del'>-#define PROPERTY_CALENDAR_VIEW_IDX 2</div><div class='del'>-</div><div class='del'>-#define CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ControlFactory"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	if (activate)</div><div class='del'>-		calendar_control_activate (control, gcal);</div><div class='del'>-	else</div><div class='del'>-		calendar_control_deactivate (control, gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = user_data;</div><div class='del'>-	const char *uri;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_CALENDAR_URI_IDX:</div><div class='del'>-		uri = cal_client_get_uri (gnome_calendar_get_cal_client (gcal));</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, uri);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_CALENDAR_VIEW_IDX:</div><div class='del'>-		switch (gnome_calendar_get_view (gcal)) {</div><div class='del'>-		case GNOME_CAL_DAY_VIEW:</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "day");</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "week");</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "workweek");</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-			BONOBO_ARG_SET_STRING (arg, "month");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  const BonoboArg   *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = user_data;</div><div class='del'>-	char *string;</div><div class='del'>-	GnomeCalendarViewType view;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case PROPERTY_CALENDAR_URI_IDX:</div><div class='del'>-		string = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		if (!gnome_calendar_open (gcal, string)) {</div><div class='del'>-			char *msg;</div><div class='del'>-</div><div class='del'>-			msg = g_strdup_printf (_("Could not open the folder in '%s'"), string);</div><div class='del'>-			gnome_error_dialog_parented (</div><div class='del'>-				msg,</div><div class='del'>-				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-			g_free (msg);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_CALENDAR_VIEW_IDX:</div><div class='del'>-		string = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		if (!g_strcasecmp (string, "week"))</div><div class='del'>-			view = GNOME_CAL_WEEK_VIEW;</div><div class='del'>-		else if (!g_strcasecmp (string, "workweek"))</div><div class='del'>-			view = GNOME_CAL_WORK_WEEK_VIEW;</div><div class='del'>-		else if (!g_strcasecmp (string, "month"))</div><div class='del'>-			view = GNOME_CAL_MONTH_VIEW;</div><div class='del'>-		else</div><div class='del'>-			view = GNOME_CAL_DAY_VIEW;</div><div class='del'>-</div><div class='del'>-		/* This doesn't actually work, because the GalView</div><div class='del'>-		 * comes along and resets the view. FIXME.</div><div class='del'>-		 */</div><div class='del'>-		gnome_calendar_set_view (gcal, view, FALSE, TRUE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	BonoboPropertyBag *pbag;</div><div class='del'>-</div><div class='del'>-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (pbag,</div><div class='del'>-				 PROPERTY_CALENDAR_URI,</div><div class='del'>-				 PROPERTY_CALENDAR_URI_IDX,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 _("The URI that the calendar will display"),</div><div class='del'>-				 0);</div><div class='del'>-	bonobo_property_bag_add (pbag,</div><div class='del'>-				 PROPERTY_CALENDAR_VIEW,</div><div class='del'>-				 PROPERTY_CALENDAR_VIEW_IDX,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 _("The type of view to show"),</div><div class='del'>-				 0);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, pbag);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (pbag));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback factory function for calendar controls */</div><div class='del'>-static BonoboObject *</div><div class='del'>-control_factory_fn (BonoboGenericFactory *Factory, void *data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = control_factory_new_control ();</div><div class='del'>-</div><div class='del'>-	if (control)</div><div class='del'>-		return BONOBO_OBJECT (control);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL);</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));</div><div class='del'>-	</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register a Calendar control factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int</div><div class='del'>-load_calendar (BonoboPersistFile *pf, const CORBA_char *filename, CORBA_Environment *ev, void *closure)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal = closure;</div><div class='del'>-	</div><div class='del'>-	return gnome_calendar_open (gcal, filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-save_calendar (BonoboPersistFile *pf, const CORBA_char *filename,</div><div class='del'>-	       CORBA_Environment *ev,</div><div class='del'>-	       void *closure)</div><div class='del'>-{</div><div class='del'>-	/* Do not know how to save stuff yet */</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-calendar_persist_init (GnomeCalendar *gcal, BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	BonoboPersistFile *f;</div><div class='del'>-</div><div class='del'>-	f = bonobo_persist_file_new (load_calendar, save_calendar, gcal);</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control), BONOBO_OBJECT (f));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-BonoboControl *</div><div class='del'>-control_factory_new_control (void)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = new_calendar ();</div><div class='del'>-	if (!gcal)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (gcal));</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (GTK_WIDGET (gcal));</div><div class='del'>-	if (!control) {</div><div class='del'>-		g_message ("control_factory_fn(): could not create the control!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (gcal), "control", control);</div><div class='del'>-</div><div class='del'>-	calendar_properties_init (gcal, control);</div><div class='del'>-#if 0</div><div class='del'>-	calendar_persist_init (gcal, control);</div><div class='del'>-#endif</div><div class='del'>-					      </div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h<br/>deleted file mode 100644<br/>index 322b5a4a4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/control-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CONTROL_FACTORY_H_</div><div class='del'>-#define _CONTROL_FACTORY_H_</div><div class='del'>-</div><div class='del'>-void           control_factory_init         (void);</div><div class='del'>-BonoboControl *control_factory_new_control  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _CONTROL_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore<br/>deleted file mode 100644<br/>index 64968755b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='head'>diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am<br/>deleted file mode 100644<br/>index aa107d84e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-IDLS = $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED =                 			\</div><div class='del'>-	Evolution-Addressbook-SelectNames.h		\</div><div class='del'>-	Evolution-Addressbook-SelectNames-common.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-skels.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \</div><div class='del'>-                $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-</div><div class='del'>-INCLUDES = 								\</div><div class='del'>-	-DG_LOG_DOMAIN=\"calendar-gui\"					\</div><div class='del'>-	-I$(top_srcdir)							\</div><div class='del'>-	-I$(top_srcdir)/calendar					\</div><div class='del'>-	-I$(top_srcdir)/calendar/cal-client				\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client				\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical				\</div><div class='del'>-	-I$(top_builddir)/shell						\</div><div class='del'>-	-I$(top_srcdir)/shell						\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook			\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend/ebook			\</div><div class='del'>-	-I$(includedir)							\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"				\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"				\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"				\</div><div class='del'>-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"				\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libcal-dialogs.a</div><div class='del'>-</div><div class='del'>-libcal_dialogs_a_SOURCES =	\</div><div class='del'>-	$(IDL_GENERATED)	\</div><div class='del'>-	alarm-options.c		\</div><div class='del'>-	alarm-options.h		\</div><div class='del'>-	alarm-page.c		\</div><div class='del'>-	alarm-page.h		\</div><div class='del'>-	cal-prefs-dialog.c	\</div><div class='del'>-	cal-prefs-dialog.h	\</div><div class='del'>-	cancel-comp.c		\</div><div class='del'>-	cancel-comp.h		\</div><div class='del'>-	changed-comp.c		\</div><div class='del'>-	changed-comp.h		\</div><div class='del'>-	comp-editor.c		\</div><div class='del'>-	comp-editor.h		\</div><div class='del'>-	comp-editor-page.c	\</div><div class='del'>-	comp-editor-page.h	\</div><div class='del'>-	comp-editor-util.c	\</div><div class='del'>-	comp-editor-util.h	\</div><div class='del'>-	delete-comp.c		\</div><div class='del'>-	delete-comp.h		\</div><div class='del'>-	e-delegate-dialog.c	\</div><div class='del'>-	e-delegate-dialog.h	\</div><div class='del'>-	event-editor.c		\</div><div class='del'>-	event-editor.h		\</div><div class='del'>-	event-page.c		\</div><div class='del'>-	event-page.h		\</div><div class='del'>-	meeting-page.c		\</div><div class='del'>-	meeting-page.h		\</div><div class='del'>-	recurrence-page.c	\</div><div class='del'>-	recurrence-page.h	\</div><div class='del'>-	save-comp.c		\</div><div class='del'>-	save-comp.h		\</div><div class='del'>-	schedule-page.c		\</div><div class='del'>-	schedule-page.h		\</div><div class='del'>-	send-comp.c		\</div><div class='del'>-	send-comp.h		\</div><div class='del'>-	task-editor.c		\</div><div class='del'>-	task-editor.h		\</div><div class='del'>-	task-details-page.c	\</div><div class='del'>-	task-details-page.h	\</div><div class='del'>-	task-page.c		\</div><div class='del'>-	task-page.h</div><div class='del'>-</div><div class='del'>-iconsdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA =				\</div><div class='del'>-	alarm-options.glade		\</div><div class='del'>-	alarm-page.glade		\</div><div class='del'>-	cal-prefs-dialog.glade		\</div><div class='del'>-	e-delegate-dialog.glade		\</div><div class='del'>-	event-page.glade		\</div><div class='del'>-	meeting-page.glade		\</div><div class='del'>-	recurrence-page.glade		\</div><div class='del'>-	schedule-page.glade		\</div><div class='del'>-	task-details-page.glade		\</div><div class='del'>-	task-page.glade</div><div class='del'>-</div><div class='del'>-etspecdir = $(datadir)/evolution/etspec/</div><div class='del'>-etspec_DATA = meeting-page.etspec</div><div class='del'>-</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	$(etspec_DATA)</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c<br/>deleted file mode 100644<br/>index 2ea6938633..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-options.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-options.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,585 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm options dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "e-util/e-dialog-widgets.h"</div><div class='del'>-#include "alarm-options.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Whether the dialog was accepted or canceled */</div><div class='del'>-	gboolean canceled;</div><div class='del'>-</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Toplevel */</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	/* Buttons */</div><div class='del'>-	GtkWidget *button_ok;</div><div class='del'>-	GtkWidget *button_cancel;</div><div class='del'>-</div><div class='del'>-	/* Alarm repeat widgets */</div><div class='del'>-	GtkWidget *repeat_toggle;</div><div class='del'>-	GtkWidget *repeat_group;</div><div class='del'>-	GtkWidget *repeat_quantity;</div><div class='del'>-	GtkWidget *repeat_value;</div><div class='del'>-	GtkWidget *repeat_unit;</div><div class='del'>-</div><div class='del'>-	/* Display alarm widgets */</div><div class='del'>-	GtkWidget *dalarm_group;</div><div class='del'>-	GtkWidget *dalarm_description;</div><div class='del'>-</div><div class='del'>-	/* Audio alarm widgets */</div><div class='del'>-	GtkWidget *aalarm_group;</div><div class='del'>-	GtkWidget *aalarm_attach;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Mail alarm widgets */</div><div class='del'>-	GtkWidget *malarm_group;</div><div class='del'>-</div><div class='del'>-	/* Procedure alarm widgets */</div><div class='del'>-	GtkWidget *palarm_group;</div><div class='del'>-	GtkWidget *palarm_program;</div><div class='del'>-	GtkWidget *palarm_args;</div><div class='del'>-} Dialog;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (Dialog *dialog)</div><div class='del'>-{</div><div class='del'>-#define GW(name) glade_xml_get_widget (dialog-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	dialog-&gt;toplevel = GW ("alarm-options-toplevel");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;button_ok = GW ("button-ok");</div><div class='del'>-	dialog-&gt;button_cancel = GW ("button-cancel");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;repeat_toggle = GW ("repeat-toggle");</div><div class='del'>-	dialog-&gt;repeat_group = GW ("repeat-group");</div><div class='del'>-	dialog-&gt;repeat_quantity = GW ("repeat-quantity");</div><div class='del'>-	dialog-&gt;repeat_value = GW ("repeat-value");</div><div class='del'>-	dialog-&gt;repeat_unit = GW ("repeat-unit");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;dalarm_group = GW ("dalarm-group");</div><div class='del'>-	dialog-&gt;dalarm_description = GW ("dalarm-description");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;aalarm_group = GW ("aalarm-group");</div><div class='del'>-	dialog-&gt;aalarm_attach = GW ("aalarm-attach");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;malarm_group = GW ("malarm-group");</div><div class='del'>-</div><div class='del'>-	dialog-&gt;palarm_group = GW ("palarm-group");</div><div class='del'>-	dialog-&gt;palarm_program = GW ("palarm-program");</div><div class='del'>-	dialog-&gt;palarm_args = GW ("palarm-args");</div><div class='del'>-</div><div class='del'>-	return (dialog-&gt;toplevel</div><div class='del'>-		&amp;&amp; dialog-&gt;button_ok</div><div class='del'>-		&amp;&amp; dialog-&gt;button_cancel</div><div class='del'>-		&amp;&amp; dialog-&gt;repeat_toggle</div><div class='del'>-		&amp;&amp; dialog-&gt;repeat_group</div><div class='del'>-		&amp;&amp; dialog-&gt;repeat_quantity</div><div class='del'>-		&amp;&amp; dialog-&gt;repeat_value</div><div class='del'>-		&amp;&amp; dialog-&gt;repeat_unit</div><div class='del'>-		&amp;&amp; dialog-&gt;dalarm_group</div><div class='del'>-		&amp;&amp; dialog-&gt;dalarm_description</div><div class='del'>-		&amp;&amp; dialog-&gt;aalarm_group</div><div class='del'>-		&amp;&amp; dialog-&gt;aalarm_attach</div><div class='del'>-		&amp;&amp; dialog-&gt;malarm_group</div><div class='del'>-		&amp;&amp; dialog-&gt;palarm_group</div><div class='del'>-		&amp;&amp; dialog-&gt;palarm_program</div><div class='del'>-		&amp;&amp; dialog-&gt;palarm_args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Closes the dialog by terminating its main loop */</div><div class='del'>-static void</div><div class='del'>-close_dialog (Dialog *dialog, gboolean canceled)</div><div class='del'>-{</div><div class='del'>-	dialog-&gt;canceled = canceled;</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the toplevel window is deleted */</div><div class='del'>-static guint</div><div class='del'>-toplevel_delete_event_cb (GtkWidget *widget, GdkEventAny *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Dialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = data;</div><div class='del'>-	close_dialog (dialog, TRUE);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the OK button is clicked */</div><div class='del'>-static void</div><div class='del'>-button_ok_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Dialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = data;</div><div class='del'>-	close_dialog (dialog, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the Cancel button is clicked */</div><div class='del'>-static void</div><div class='del'>-button_cancel_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Dialog *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = data;</div><div class='del'>-	close_dialog (dialog, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the repeat toggle button is toggled.  We sensitize the</div><div class='del'>- * repeat group options as appropriate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Dialog *dialog;</div><div class='del'>-	gboolean active;</div><div class='del'>-</div><div class='del'>-	dialog = data;</div><div class='del'>-</div><div class='del'>-	active = gtk_toggle_button_get_active (toggle);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;repeat_group, active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (Dialog *dialog)</div><div class='del'>-{</div><div class='del'>-	/* Toplevel, buttons */</div><div class='del'>-</div><div class='del'>-	dialog-&gt;canceled = TRUE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;toplevel), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (toplevel_delete_event_cb), dialog);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;button_ok), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (button_ok_clicked_cb), dialog);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;button_cancel), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (button_cancel_clicked_cb), dialog);</div><div class='del'>-</div><div class='del'>-	/* Alarm repeat */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog-&gt;repeat_toggle), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (repeat_toggle_toggled_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the audio alarm widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_aalarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	icalattach *attach;</div><div class='del'>-	const char *url;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_attach (alarm, &amp;attach);</div><div class='del'>-</div><div class='del'>-	if (!attach) {</div><div class='del'>-		e_dialog_editable_set (dialog-&gt;aalarm_attach, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: this does not support inline data */</div><div class='del'>-</div><div class='del'>-	url = NULL;</div><div class='del'>-</div><div class='del'>-	if (icalattach_get_is_url (attach))</div><div class='del'>-		url = icalattach_get_url (attach);</div><div class='del'>-	else</div><div class='del'>-		g_message ("alarm_to_aalarm_widgets(): FIXME: we don't support inline data yet");</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (dialog-&gt;aalarm_attach, url);</div><div class='del'>-</div><div class='del'>-	icalattach_unref (attach);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the display alarm widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_dalarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalComponentText description;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_description (alarm, &amp;description);</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (dialog-&gt;dalarm_description, description.value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the mail alarm widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_malarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: nothing for now; we don't support mail alarms */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the procedure alarm widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_palarm_widgets (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	icalattach *attach;</div><div class='del'>-	CalComponentText description;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_attach (alarm, &amp;attach);</div><div class='del'>-	cal_component_alarm_get_description (alarm, &amp;description);</div><div class='del'>-</div><div class='del'>-	if (attach) {</div><div class='del'>-		const char *url;</div><div class='del'>-</div><div class='del'>-		if (icalattach_get_is_url (attach)) {</div><div class='del'>-			url = icalattach_get_url (attach);</div><div class='del'>-			e_dialog_editable_set (dialog-&gt;palarm_program, url);</div><div class='del'>-		} else</div><div class='del'>-			g_message ("alarm_to_palarm_widgets(): Don't know what to do with non-URL "</div><div class='del'>-				   "attachments");</div><div class='del'>-</div><div class='del'>-		icalattach_unref (attach);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (dialog-&gt;palarm_args, description.value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum duration_units {</div><div class='del'>-	DUR_MINUTES,</div><div class='del'>-	DUR_HOURS,</div><div class='del'>-	DUR_DAYS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int duration_units_map[] = {</div><div class='del'>-	DUR_MINUTES,</div><div class='del'>-	DUR_HOURS,</div><div class='del'>-	DUR_DAYS,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Sigh.  Takes an overcomplicated duration value and reduces it to its lowest</div><div class='del'>- * common denominator.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-normalize_duration (struct icaldurationtype dur, int *value, enum duration_units *units)</div><div class='del'>-{</div><div class='del'>-	if (dur.seconds != 0 || dur.minutes != 0) {</div><div class='del'>-		*value = ((((dur.weeks * 7 + dur.days) * 24 + dur.hours) * 60) + dur.minutes</div><div class='del'>-			  + dur.seconds / 60 + ((dur.seconds % 60) &gt;= 30 ? 1 : 0));</div><div class='del'>-		*units = DUR_MINUTES;</div><div class='del'>-	} else if (dur.hours) {</div><div class='del'>-		*value = ((dur.weeks * 7) + dur.days) * 24 + dur.hours;</div><div class='del'>-		*units = DUR_HOURS;</div><div class='del'>-	} else if (dur.days != 0 || dur.weeks != 0) {</div><div class='del'>-		*value = dur.weeks * 7 + dur.days;</div><div class='del'>-		*units = DUR_DAYS;</div><div class='del'>-	} else {</div><div class='del'>-		*value = 0;</div><div class='del'>-		*units = DUR_MINUTES;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the repeat widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_repeat_widgets (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalAlarmRepeat repeat;</div><div class='del'>-	int value;</div><div class='del'>-	enum duration_units units;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_repeat (alarm, &amp;repeat);</div><div class='del'>-</div><div class='del'>-	/* Sensitivity */</div><div class='del'>-</div><div class='del'>-	if (repeat.repetitions == 0) {</div><div class='del'>-		gtk_widget_set_sensitive (dialog-&gt;repeat_group, FALSE);</div><div class='del'>-		e_dialog_toggle_set (dialog-&gt;repeat_toggle, FALSE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog-&gt;repeat_group, TRUE);</div><div class='del'>-	e_dialog_toggle_set (dialog-&gt;repeat_toggle, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Repetitions */</div><div class='del'>-	e_dialog_spin_set (dialog-&gt;repeat_quantity, repeat.repetitions);</div><div class='del'>-</div><div class='del'>-	/* Duration */</div><div class='del'>-</div><div class='del'>-	normalize_duration (repeat.duration, &amp;value, &amp;units);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (dialog-&gt;repeat_value, value);</div><div class='del'>-	e_dialog_option_menu_set (dialog-&gt;repeat_unit, units, duration_units_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with the values from the alarm component */</div><div class='del'>-static void</div><div class='del'>-alarm_to_dialog (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalAlarmAction action;</div><div class='del'>-</div><div class='del'>-	alarm_to_repeat_widgets (dialog, alarm);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_action (alarm, &amp;action);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_ALARM_NONE:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_AUDIO:</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog-&gt;toplevel), _("Audio Alarm Options"));</div><div class='del'>-		gtk_widget_show (dialog-&gt;aalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;dalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;malarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;palarm_group);</div><div class='del'>-		alarm_to_aalarm_widgets (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_DISPLAY:</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog-&gt;toplevel), _("Message Alarm Options"));</div><div class='del'>-		gtk_widget_hide (dialog-&gt;aalarm_group);</div><div class='del'>-		gtk_widget_show (dialog-&gt;dalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;malarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;palarm_group);</div><div class='del'>-		alarm_to_dalarm_widgets (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_EMAIL:</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog-&gt;toplevel), _("Mail Alarm Options"));</div><div class='del'>-		gtk_widget_hide (dialog-&gt;aalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;dalarm_group);</div><div class='del'>-		gtk_widget_show (dialog-&gt;malarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;palarm_group);</div><div class='del'>-		alarm_to_malarm_widgets (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_PROCEDURE:</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog-&gt;toplevel), _("Program Alarm Options"));</div><div class='del'>-		gtk_widget_hide (dialog-&gt;aalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;dalarm_group);</div><div class='del'>-		gtk_widget_hide (dialog-&gt;malarm_group);</div><div class='del'>-		gtk_widget_show (dialog-&gt;palarm_group);</div><div class='del'>-		alarm_to_palarm_widgets (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_UNKNOWN:</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog-&gt;toplevel), _("Unknown Alarm Options"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Fills the alarm data with the values from the repeat/duration widgets */</div><div class='del'>-static void</div><div class='del'>-repeat_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalAlarmRepeat repeat;</div><div class='del'>-</div><div class='del'>-	if (!e_dialog_toggle_get (dialog-&gt;repeat_toggle)) {</div><div class='del'>-		repeat.repetitions = 0;</div><div class='del'>-</div><div class='del'>-		cal_component_alarm_set_repeat (alarm, repeat);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	repeat.repetitions = e_dialog_spin_get_int (dialog-&gt;repeat_quantity);</div><div class='del'>-</div><div class='del'>-	memset (&amp;repeat.duration, 0, sizeof (repeat.duration));</div><div class='del'>-	switch (e_dialog_option_menu_get (dialog-&gt;repeat_unit, duration_units_map)) {</div><div class='del'>-	case DUR_MINUTES:</div><div class='del'>-		repeat.duration.minutes = e_dialog_spin_get_int (dialog-&gt;repeat_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DUR_HOURS:</div><div class='del'>-		repeat.duration.hours = e_dialog_spin_get_int (dialog-&gt;repeat_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DUR_DAYS:</div><div class='del'>-		repeat.duration.days = e_dialog_spin_get_int (dialog-&gt;repeat_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_repeat (alarm, repeat);</div><div class='del'>-		</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the audio alarm data with the values from the widgets */</div><div class='del'>-static void</div><div class='del'>-aalarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	char *url;</div><div class='del'>-	icalattach *attach;</div><div class='del'>-</div><div class='del'>-	url = e_dialog_editable_get (dialog-&gt;aalarm_attach);</div><div class='del'>-	attach = icalattach_new_from_url (url ? url : "");</div><div class='del'>-	g_free (url);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_attach (alarm, attach);</div><div class='del'>-	icalattach_unref (attach);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the display alarm data with the values from the widgets */</div><div class='del'>-static void</div><div class='del'>-dalarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	CalComponentText description;</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (dialog-&gt;dalarm_description);</div><div class='del'>-	description.value = str;</div><div class='del'>-	description.altrep = NULL;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_description (alarm, &amp;description);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the mail alarm data with the values from the widgets */</div><div class='del'>-static void</div><div class='del'>-malarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: nothing for now; we don't support mail alarms */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the procedure alarm data with the values from the widgets */</div><div class='del'>-static void</div><div class='del'>-palarm_widgets_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	char *program;</div><div class='del'>-	icalattach *attach;</div><div class='del'>-	char *str;</div><div class='del'>-	CalComponentText description;</div><div class='del'>-</div><div class='del'>-	program = e_dialog_editable_get (dialog-&gt;palarm_program);</div><div class='del'>-	attach = icalattach_new_from_url (program ? program : "");</div><div class='del'>-	g_free (program);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_attach (alarm, attach);</div><div class='del'>-	icalattach_unref (attach);</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (dialog-&gt;palarm_args);</div><div class='del'>-	description.value = str;</div><div class='del'>-	description.altrep = NULL;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_description (alarm, &amp;description);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the alarm data with the values from the widgets */</div><div class='del'>-static void</div><div class='del'>-dialog_to_alarm (Dialog *dialog, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalAlarmAction action;</div><div class='del'>-</div><div class='del'>-	repeat_widgets_to_alarm (dialog, alarm);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_action (alarm, &amp;action);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_ALARM_NONE:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_AUDIO:</div><div class='del'>-		aalarm_widgets_to_alarm (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_DISPLAY:</div><div class='del'>-		dalarm_widgets_to_alarm (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_EMAIL:</div><div class='del'>-		malarm_widgets_to_alarm (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_PROCEDURE:</div><div class='del'>-		palarm_widgets_to_alarm (dialog, alarm);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_UNKNOWN:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_options_dialog_run:</div><div class='del'>- * @alarm: Alarm that is to be edited.</div><div class='del'>- * </div><div class='del'>- * Runs an alarm options dialog modally.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the dialog could be created, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-alarm_options_dialog_run (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	Dialog dialog;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (alarm != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	dialog.xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-options.glade", NULL);</div><div class='del'>-	if (!dialog.xml) {</div><div class='del'>-		g_message ("alarm_options_dialog_new(): Could not load the Glade XML file!");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (&amp;dialog)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dialog.xml));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_widgets (&amp;dialog);</div><div class='del'>-</div><div class='del'>-	alarm_to_dialog (&amp;dialog, alarm);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (dialog.toplevel);</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (!dialog.canceled)</div><div class='del'>-		dialog_to_alarm (&amp;dialog, alarm);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (dialog.toplevel);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dialog.xml));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-options.glade b/calendar/gui/dialogs/alarm-options.glade<br/>deleted file mode 100644<br/>index 00c38b9390..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-options.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-options.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,398 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Dialogs&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;dialogs&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;alarm-options-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_DIALOG&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;True&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Alarm Repeat&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;repeat-toggle&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	  &lt;label&gt;Repeat the alarm&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;repeat-group&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;repeat-quantity&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;999&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;extra times every&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;repeat-value&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;999&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;repeat-unit&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;minutes</div><div class='del'>-hours</div><div class='del'>-days</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;dalarm-group&lt;/name&gt;</div><div class='del'>-      &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Message to Display&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	&lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-	&lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	&lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	&lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dalarm-description&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;aalarm-group&lt;/name&gt;</div><div class='del'>-      &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Play sound:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GnomeFileEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;file-entry1&lt;/name&gt;</div><div class='del'>-	&lt;max_saved&gt;10&lt;/max_saved&gt;</div><div class='del'>-	&lt;directory&gt;False&lt;/directory&gt;</div><div class='del'>-	&lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GnomeEntry:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;aalarm-attach&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;malarm-group&lt;/name&gt;</div><div class='del'>-      &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-      &lt;label&gt;This is an email reminder, but Evolution does not yet support this kind of reminders.  You will not be able to edit the options for this reminder.&lt;/label&gt;</div><div class='del'>-      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-      &lt;wrap&gt;True&lt;/wrap&gt;</div><div class='del'>-      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;palarm-group&lt;/name&gt;</div><div class='del'>-      &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Run program:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;palarm-program&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;With these arguments:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;palarm-args&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;30&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button-ok&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button-cancel&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-options.h b/calendar/gui/dialogs/alarm-options.h<br/>deleted file mode 100644<br/>index 388b737541..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-options.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-options.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm options dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_OPTIONS_H</div><div class='del'>-#define ALARM_OPTIONS_H</div><div class='del'>-</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean alarm_options_dialog_run (CalComponentAlarm *alarm);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c<br/>deleted file mode 100644<br/>index c06e975ed7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,869 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm page of the calendar component dialogs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "e-util/e-dialog-widgets.h"</div><div class='del'>-#include "e-util/e-time-utils.h"</div><div class='del'>-#include "cal-util/cal-util.h"</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "alarm-options.h"</div><div class='del'>-#include "alarm-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the AlarmPage structure */</div><div class='del'>-struct _AlarmPagePrivate {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	GtkWidget *summary;</div><div class='del'>-	GtkWidget *date_time;</div><div class='del'>-</div><div class='del'>-	GtkWidget *list;</div><div class='del'>-	GtkWidget *add;</div><div class='del'>-	GtkWidget *delete;</div><div class='del'>-</div><div class='del'>-	GtkWidget *action;</div><div class='del'>-	GtkWidget *interval_value;</div><div class='del'>-	GtkWidget *value_units;</div><div class='del'>-	GtkWidget *relative;</div><div class='del'>-	GtkWidget *time;</div><div class='del'>-</div><div class='del'>-	GtkWidget *button_options;</div><div class='del'>-</div><div class='del'>-	/* Alarm options dialog and the alarm we maintain */</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* "relative" types */</div><div class='del'>-enum {</div><div class='del'>-	BEFORE,</div><div class='del'>-	AFTER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Time units */</div><div class='del'>-enum {</div><div class='del'>-	MINUTES,</div><div class='del'>-	HOURS,</div><div class='del'>-	DAYS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Option menu maps */</div><div class='del'>-static const int action_map[] = {</div><div class='del'>-	CAL_ALARM_DISPLAY,</div><div class='del'>-	CAL_ALARM_AUDIO,</div><div class='del'>-	CAL_ALARM_PROCEDURE,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int value_map[] = {</div><div class='del'>-	MINUTES,</div><div class='del'>-	HOURS,</div><div class='del'>-	DAYS,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int relative_map[] = {</div><div class='del'>-	BEFORE,</div><div class='del'>-	AFTER,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int time_map[] = {</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_START,</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_END,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void alarm_page_class_init (AlarmPageClass *class);</div><div class='del'>-static void alarm_page_init (AlarmPage *apage);</div><div class='del'>-static void alarm_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *alarm_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void alarm_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean alarm_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static void alarm_page_set_summary (CompEditorPage *page, const char *summary);</div><div class='del'>-static void alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_page_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #AlarmPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #AlarmPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-alarm_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType alarm_page_type;</div><div class='del'>-</div><div class='del'>-	if (!alarm_page_type) {</div><div class='del'>-		static const GtkTypeInfo alarm_page_info = {</div><div class='del'>-			"AlarmPage",</div><div class='del'>-			sizeof (AlarmPage),</div><div class='del'>-			sizeof (AlarmPageClass),</div><div class='del'>-			(GtkClassInitFunc) alarm_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) alarm_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		alarm_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-						   &amp;alarm_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return alarm_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_class_init (AlarmPageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = alarm_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = alarm_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = alarm_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = alarm_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = alarm_page_set_summary;</div><div class='del'>-	editor_page_class-&gt;set_dates = alarm_page_set_dates;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = alarm_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_init (AlarmPage *apage)</div><div class='del'>-{</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (AlarmPagePrivate, 1);</div><div class='del'>-	apage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-	priv-&gt;summary = NULL;</div><div class='del'>-	priv-&gt;date_time = NULL;</div><div class='del'>-	priv-&gt;list = NULL;</div><div class='del'>-	priv-&gt;add = NULL;</div><div class='del'>-	priv-&gt;delete = NULL;</div><div class='del'>-	priv-&gt;action = NULL;</div><div class='del'>-	priv-&gt;interval_value = NULL;</div><div class='del'>-	priv-&gt;value_units = NULL;</div><div class='del'>-	priv-&gt;relative = NULL;</div><div class='del'>-	priv-&gt;time = NULL;</div><div class='del'>-	priv-&gt;button_options = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;alarm = cal_component_alarm_new ();</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_ALARM_PAGE (object));</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (object);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;alarm) {</div><div class='del'>-		cal_component_alarm_free (priv-&gt;alarm);</div><div class='del'>-		priv-&gt;alarm = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	apage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the alarm page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-alarm_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (priv-&gt;action);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (AlarmPage *apage)</div><div class='del'>-{</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;summary), "");</div><div class='del'>-</div><div class='del'>-	/* Start date */</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;date_time), "");</div><div class='del'>-</div><div class='del'>-	/* Sane defaults */</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;action, CAL_ALARM_DISPLAY, action_map);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;interval_value, 15);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;value_units, MINUTES, value_map);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;relative, BEFORE, relative_map);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;time, CAL_ALARM_TRIGGER_RELATIVE_START, time_map);</div><div class='del'>-</div><div class='del'>-	/* List data */</div><div class='del'>-	gtk_clist_clear (GTK_CLIST (priv-&gt;list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the duration of the alarm.  If the duration is zero, returns NULL. */</div><div class='del'>-static char *</div><div class='del'>-get_alarm_duration_string (struct icaldurationtype *duration)</div><div class='del'>-{</div><div class='del'>-	GString *string = g_string_new (NULL);</div><div class='del'>-	char *ret;</div><div class='del'>-	gboolean have_something;</div><div class='del'>-</div><div class='del'>-	have_something = FALSE;</div><div class='del'>-</div><div class='del'>-	if (duration-&gt;days &gt; 1) {</div><div class='del'>-		g_string_sprintf (string, _("%d days"), duration-&gt;days);</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	} else if (duration-&gt;days == 1) {</div><div class='del'>-		g_string_append (string, _("1 day"));</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (duration-&gt;weeks &gt; 1) {</div><div class='del'>-		g_string_sprintf (string, _("%d weeks"), duration-&gt;weeks);</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	} else if (duration-&gt;weeks == 1) {</div><div class='del'>-		g_string_append (string, _("1 week"));</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (duration-&gt;hours &gt; 1) {</div><div class='del'>-		g_string_sprintf (string, _("%d hours"), duration-&gt;hours);</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	} else if (duration-&gt;hours == 1) {</div><div class='del'>-		g_string_append (string, _("1 hour"));</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (duration-&gt;minutes &gt; 1) {</div><div class='del'>-		g_string_sprintf (string, _("%d minutes"), duration-&gt;minutes);</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	} else if (duration-&gt;minutes == 1) {</div><div class='del'>-		g_string_append (string, _("1 minute"));</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (duration-&gt;seconds &gt; 1) {</div><div class='del'>-		g_string_sprintf (string, _("%d seconds"), duration-&gt;seconds);</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	} else if (duration-&gt;seconds == 1) {</div><div class='del'>-		g_string_append (string, _("1 second"));</div><div class='del'>-		have_something = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (have_something) {</div><div class='del'>-		ret = string-&gt;str;</div><div class='del'>-		g_string_free (string, FALSE);</div><div class='del'>-		return ret;</div><div class='del'>-	} else {</div><div class='del'>-		g_string_free (string, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_alarm_string (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	CalAlarmAction action;</div><div class='del'>-	CalAlarmTrigger trigger;</div><div class='del'>-	char string[256];</div><div class='del'>-	char *base, *str = NULL, *dur;</div><div class='del'>-</div><div class='del'>-	string [0] = '\0';</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_get_action (alarm, &amp;action);</div><div class='del'>-	cal_component_alarm_get_trigger (alarm, &amp;trigger);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_ALARM_AUDIO:</div><div class='del'>-		base = _("Play a sound");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_DISPLAY:</div><div class='del'>-		base = _("Display a message");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_EMAIL:</div><div class='del'>-		base = _("Send an email");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_PROCEDURE:</div><div class='del'>-		base = _("Run a program");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_NONE:</div><div class='del'>-	case CAL_ALARM_UNKNOWN:</div><div class='del'>-	default:</div><div class='del'>-		base = _("Unknown action to be performed");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: This does not look like it will localize correctly. */</div><div class='del'>-</div><div class='del'>-	switch (trigger.type) {</div><div class='del'>-	case CAL_ALARM_TRIGGER_RELATIVE_START:</div><div class='del'>-		dur = get_alarm_duration_string (&amp;trigger.u.rel_duration);</div><div class='del'>-</div><div class='del'>-		if (dur) {</div><div class='del'>-			if (trigger.u.rel_duration.is_neg)</div><div class='del'>-				str = g_strdup_printf (_("%s %s before the start of the appointment"),</div><div class='del'>-						       base, dur);</div><div class='del'>-			else</div><div class='del'>-				str = g_strdup_printf (_("%s %s after the start of the appointment"),</div><div class='del'>-						       base, dur);</div><div class='del'>-</div><div class='del'>-			g_free (dur);</div><div class='del'>-		} else</div><div class='del'>-			str = g_strdup_printf (_("%s at the start of the appointment"), base);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_TRIGGER_RELATIVE_END:</div><div class='del'>-		dur = get_alarm_duration_string (&amp;trigger.u.rel_duration);</div><div class='del'>-</div><div class='del'>-		if (dur) {</div><div class='del'>-			if (trigger.u.rel_duration.is_neg)</div><div class='del'>-				str = g_strdup_printf (_("%s %s before the end of the appointment"),</div><div class='del'>-						       base, dur);</div><div class='del'>-			else</div><div class='del'>-				str = g_strdup_printf (_("%s %s after the end of the appointment"),</div><div class='del'>-						       base, dur);</div><div class='del'>-</div><div class='del'>-			g_free (dur);</div><div class='del'>-		} else</div><div class='del'>-			str = g_strdup_printf (_("%s at the end of the appointment"), base);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_TRIGGER_ABSOLUTE: {</div><div class='del'>-		struct icaltimetype itt;</div><div class='del'>-		icaltimezone *utc_zone, *current_zone;</div><div class='del'>-		char *location;</div><div class='del'>-		struct tm tm;</div><div class='del'>-		char buf[256];</div><div class='del'>-</div><div class='del'>-		/* Absolute triggers come in UTC, so convert them to the local timezone */</div><div class='del'>-</div><div class='del'>-		itt = trigger.u.abs_time;</div><div class='del'>-</div><div class='del'>-		utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		location = calendar_config_get_timezone ();</div><div class='del'>-		current_zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-		tm = icaltimetype_to_tm_with_zone (&amp;itt, utc_zone, current_zone);</div><div class='del'>-</div><div class='del'>-		e_time_format_date_and_time (&amp;tm, calendar_config_get_24_hour_format (),</div><div class='del'>-					     FALSE, FALSE, buf, sizeof (buf));</div><div class='del'>-</div><div class='del'>-		str = g_strdup_printf (_("%s at %s"), base, buf);</div><div class='del'>-</div><div class='del'>-		break; }</div><div class='del'>-</div><div class='del'>-	case CAL_ALARM_TRIGGER_NONE:</div><div class='del'>-	default:</div><div class='del'>-		str = g_strdup_printf (_("%s for an unknown trigger type"), base);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Appends an alarm to the list */</div><div class='del'>-static void</div><div class='del'>-append_reminder (AlarmPage *apage, CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	char *c[1];</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;list);</div><div class='del'>-</div><div class='del'>-	c[0] = get_alarm_string (alarm);</div><div class='del'>-	i = gtk_clist_append (clist, c);</div><div class='del'>-</div><div class='del'>-	gtk_clist_set_row_data_full (clist, i, alarm, (GtkDestroyNotify) cal_component_alarm_free);</div><div class='del'>-	gtk_clist_select_row (clist, i, 0);</div><div class='del'>-	g_free (c[0]);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;delete, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	GList *alarms, *l;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	CompEditorPageDates dates;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Don't send off changes during this time */</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Clean the page */</div><div class='del'>-	clear_widgets (apage);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	alarm_page_set_summary (page, text.value);</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-	comp_editor_dates (&amp;dates, comp);</div><div class='del'>-	alarm_page_set_dates (page, &amp;dates);</div><div class='del'>-	comp_editor_free_dates (&amp;dates);</div><div class='del'>-</div><div class='del'>-	/* List */</div><div class='del'>-	if (!cal_component_has_alarms (comp))</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	alarms = cal_component_get_alarm_uids (comp);</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;list);</div><div class='del'>-	for (l = alarms; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalComponentAlarm *ca, *ca_copy;</div><div class='del'>-		const char *auid;</div><div class='del'>-</div><div class='del'>-		auid = l-&gt;data;</div><div class='del'>-		ca = cal_component_get_alarm (comp, auid);</div><div class='del'>-		g_assert (ca != NULL);</div><div class='del'>-</div><div class='del'>-		ca_copy = cal_component_alarm_clone (ca);</div><div class='del'>-		cal_component_alarm_free (ca);</div><div class='del'>-</div><div class='del'>-		append_reminder (apage, ca_copy);</div><div class='del'>-	}</div><div class='del'>-	cal_obj_uid_list_free (alarms);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the alarm page */</div><div class='del'>-static gboolean</div><div class='del'>-alarm_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	GList *list, *l;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove all the alarms from the component */</div><div class='del'>-</div><div class='del'>-	list = cal_component_get_alarm_uids (comp);</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		const char *auid;</div><div class='del'>-</div><div class='del'>-		auid = l-&gt;data;</div><div class='del'>-		cal_component_remove_alarm (comp, auid);</div><div class='del'>-	}</div><div class='del'>-	cal_obj_uid_list_free (list);</div><div class='del'>-</div><div class='del'>-	/* Add the new alarms */</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;list);</div><div class='del'>-	for (i = 0; i &lt; clist-&gt;rows; i++) {</div><div class='del'>-		CalComponentAlarm *alarm, *alarm_copy;</div><div class='del'>-</div><div class='del'>-		alarm = gtk_clist_get_row_data (clist, i);</div><div class='del'>-		g_assert (alarm != NULL);</div><div class='del'>-</div><div class='del'>-		/* We clone the alarm to maintain the invariant that the alarm</div><div class='del'>-		 * structures in the list did *not* come from the component.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		alarm_copy = cal_component_alarm_clone (alarm);</div><div class='del'>-		cal_component_add_alarm (comp, alarm_copy);</div><div class='del'>-		cal_component_alarm_free (alarm_copy);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_summary handler for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_set_summary (CompEditorPage *page, const char *summary)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	gchar *s;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	s = e_utf8_to_gtk_string (priv-&gt;summary, summary);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;summary), s);</div><div class='del'>-	g_free (s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_dates handler for the alarm page */</div><div class='del'>-static void</div><div class='del'>-alarm_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (page);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp_editor_date_label (dates, priv-&gt;date_time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (AlarmPage *apage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (apage);</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("alarm-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary = GW ("summary");</div><div class='del'>-	priv-&gt;date_time = GW ("date-time");</div><div class='del'>-</div><div class='del'>-	priv-&gt;list = GW ("list");</div><div class='del'>-	priv-&gt;add = GW ("add");</div><div class='del'>-	priv-&gt;delete = GW ("delete");</div><div class='del'>-</div><div class='del'>-	priv-&gt;action = GW ("action");</div><div class='del'>-	priv-&gt;interval_value = GW ("interval-value");</div><div class='del'>-	priv-&gt;value_units = GW ("value-units");</div><div class='del'>-	priv-&gt;relative = GW ("relative");</div><div class='del'>-	priv-&gt;time = GW ("time");</div><div class='del'>-</div><div class='del'>-	priv-&gt;button_options = GW ("button-options");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;summary</div><div class='del'>-		&amp;&amp; priv-&gt;date_time</div><div class='del'>-		&amp;&amp; priv-&gt;list</div><div class='del'>-		&amp;&amp; priv-&gt;add</div><div class='del'>-		&amp;&amp; priv-&gt;delete</div><div class='del'>-		&amp;&amp; priv-&gt;action</div><div class='del'>-		&amp;&amp; priv-&gt;interval_value</div><div class='del'>-		&amp;&amp; priv-&gt;value_units</div><div class='del'>-		&amp;&amp; priv-&gt;relative</div><div class='del'>-		&amp;&amp; priv-&gt;time</div><div class='del'>-		&amp;&amp; priv-&gt;button_options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (data);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (apage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used for the "add reminder" button */</div><div class='del'>-static void</div><div class='del'>-add_clicked_cb (GtkButton *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	CalAlarmTrigger trigger;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (data);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	alarm = cal_component_alarm_clone (priv-&gt;alarm);</div><div class='del'>-</div><div class='del'>-	memset (&amp;trigger, 0, sizeof (CalAlarmTrigger));</div><div class='del'>-	trigger.type = e_dialog_option_menu_get (priv-&gt;time, time_map);</div><div class='del'>-	if (e_dialog_option_menu_get (priv-&gt;relative, relative_map) == BEFORE)</div><div class='del'>-		trigger.u.rel_duration.is_neg = 1;</div><div class='del'>-	else</div><div class='del'>-		trigger.u.rel_duration.is_neg = 0;</div><div class='del'>-</div><div class='del'>-	switch (e_dialog_option_menu_get (priv-&gt;value_units, value_map)) {</div><div class='del'>-	case MINUTES:</div><div class='del'>-		trigger.u.rel_duration.minutes =</div><div class='del'>-			e_dialog_spin_get_int (priv-&gt;interval_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HOURS:</div><div class='del'>-		trigger.u.rel_duration.hours =</div><div class='del'>-			e_dialog_spin_get_int (priv-&gt;interval_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case DAYS:</div><div class='del'>-		trigger.u.rel_duration.days =</div><div class='del'>-			e_dialog_spin_get_int (priv-&gt;interval_value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-	cal_component_alarm_set_trigger (alarm, trigger);</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_action (alarm, e_dialog_option_menu_get (priv-&gt;action, action_map));</div><div class='del'>-</div><div class='del'>-	append_reminder (apage, alarm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used for the "delete reminder" button */</div><div class='del'>-static void</div><div class='del'>-delete_clicked_cb (GtkButton *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	int sel;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (data);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;list);</div><div class='del'>-	if (!clist-&gt;selection)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sel = GPOINTER_TO_INT (clist-&gt;selection-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_clist_remove (clist, sel);</div><div class='del'>-	if (sel &gt;= clist-&gt;rows)</div><div class='del'>-		sel--;</div><div class='del'>-</div><div class='del'>-	if (clist-&gt;rows &gt; 0)</div><div class='del'>-		gtk_clist_select_row (clist, sel, 0);</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;delete, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the alarm options button is clicked */</div><div class='del'>-static void</div><div class='del'>-button_options_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	apage = ALARM_PAGE (data);</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_alarm_set_action (priv-&gt;alarm,</div><div class='del'>-					e_dialog_option_menu_get (priv-&gt;action, action_map));</div><div class='del'>-</div><div class='del'>-	if (!alarm_options_dialog_run (priv-&gt;alarm))</div><div class='del'>-		g_message ("button_options_clicked_cb(): Could not create the alarm options dialog");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (AlarmPage *apage)</div><div class='del'>-{</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Reminder buttons */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;add), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_clicked_cb), apage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;delete), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_clicked_cb), apage);</div><div class='del'>-</div><div class='del'>-	/* Connect the default signal handler to use to make sure we notify</div><div class='del'>-	 * upstream of changes to the widget values.</div><div class='del'>-	 */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;add), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), apage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;delete), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), apage);</div><div class='del'>-</div><div class='del'>-	/* Options button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;button_options), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (button_options_clicked_cb), apage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_page_construct:</div><div class='del'>- * @apage: An alarm page.</div><div class='del'>- *</div><div class='del'>- * Constructs an alarm page by loading its Glade data.</div><div class='del'>- *</div><div class='del'>- * Return value: The same object as @apage, or NULL if the widgets could not be</div><div class='del'>- * created.</div><div class='del'>- **/</div><div class='del'>-AlarmPage *</div><div class='del'>-alarm_page_construct (AlarmPage *apage)</div><div class='del'>-{</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = apage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-page.glade",</div><div class='del'>-				   NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("alarm_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (apage)) {</div><div class='del'>-		g_message ("alarm_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_widgets (apage);</div><div class='del'>-</div><div class='del'>-	return apage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * alarm_page_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new alarm page.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created alarm page, or NULL if the page could not be</div><div class='del'>- * created.</div><div class='del'>- **/</div><div class='del'>-AlarmPage *</div><div class='del'>-alarm_page_new (void)</div><div class='del'>-{</div><div class='del'>-	AlarmPage *apage;</div><div class='del'>-</div><div class='del'>-	apage = gtk_type_new (TYPE_ALARM_PAGE);</div><div class='del'>-	if (!alarm_page_construct (apage)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (apage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return apage;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade<br/>deleted file mode 100644<br/>index 56c6f6ada1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,381 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;alarm-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;alarm-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;.&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;alarm-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;alarm-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame33&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Basics&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table13&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;2&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label62&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Summary:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label63&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Date/Time:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;summary&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;10&lt;/width&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;date-time&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;10&lt;/width&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame34&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Reminders&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox53&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox54&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;action&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;Display a message</div><div class='del'>-Play a sound</div><div class='del'>-Run a program</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;interval-value&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;True&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;999&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;value-units&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;minute(s)</div><div class='del'>-hour(s)</div><div class='del'>-day(s)</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;relative&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;before</div><div class='del'>-after</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;time&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;start of appointment</div><div class='del'>-end of appointment</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-options&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;_Options...&lt;/label&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox55&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;scrolledwindow13&lt;/name&gt;</div><div class='del'>-	    &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-	    &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;list&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-	      &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-	      &lt;selection_mode&gt;GTK_SELECTION_BROWSE&lt;/selection_mode&gt;</div><div class='del'>-	      &lt;show_titles&gt;False&lt;/show_titles&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-		&lt;name&gt;label64&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;label55&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbuttonbox2&lt;/name&gt;</div><div class='del'>-	    &lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	    &lt;spacing&gt;10&lt;/spacing&gt;</div><div class='del'>-	    &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	    &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	    &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	    &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;add&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;delete&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Delete&lt;/label&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/alarm-page.h b/calendar/gui/dialogs/alarm-page.h<br/>deleted file mode 100644<br/>index aa1a6be26b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/alarm-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Alarm page of the calendar component dialogs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ALARM_PAGE_H</div><div class='del'>-#define ALARM_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_ALARM_PAGE            (alarm_page_get_type ())</div><div class='del'>-#define ALARM_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_ALARM_PAGE, AlarmPage))</div><div class='del'>-#define ALARM_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_PAGE, AlarmPageClass))</div><div class='del'>-#define IS_ALARM_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_ALARM_PAGE))</div><div class='del'>-#define IS_ALARM_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_ALARM_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _AlarmPagePrivate AlarmPagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	AlarmPagePrivate *priv;</div><div class='del'>-} AlarmPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} AlarmPageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    alarm_page_get_type  (void);</div><div class='del'>-AlarmPage *alarm_page_construct (AlarmPage *apage);</div><div class='del'>-AlarmPage *alarm_page_new       (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c<br/>deleted file mode 100644<br/>index 639738c3bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/cal-prefs-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,629 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, 2001, 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog</div><div class='del'>- * to edit the calendar preference settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "../e-timezone-entry.h"</div><div class='del'>-#include "cal-prefs-dialog.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../calendar-commands.h"</div><div class='del'>-#include "../e-tasks.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-color-picker.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _DialogData {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	GtkWidget *timezone;</div><div class='del'>-	GtkWidget *working_days[7];</div><div class='del'>-	GtkWidget *week_start_day;</div><div class='del'>-	GtkWidget *start_of_day;</div><div class='del'>-	GtkWidget *end_of_day;</div><div class='del'>-	GtkWidget *use_12_hour;</div><div class='del'>-	GtkWidget *use_24_hour;</div><div class='del'>-	GtkWidget *time_divisions;</div><div class='del'>-	GtkWidget *show_end_times;</div><div class='del'>-	GtkWidget *compress_weekend;</div><div class='del'>-	GtkWidget *dnav_show_week_no;</div><div class='del'>-</div><div class='del'>-	/* Widgets for the task list options */</div><div class='del'>-	GtkWidget *tasks_due_today_color;</div><div class='del'>-	GtkWidget *tasks_overdue_color;</div><div class='del'>-</div><div class='del'>-	GtkWidget *tasks_hide_completed_checkbutton;</div><div class='del'>-	GtkWidget *tasks_hide_completed_spinbutton;</div><div class='del'>-	GtkWidget *tasks_hide_completed_optionmenu;</div><div class='del'>-</div><div class='del'>-	/* Other page options */</div><div class='del'>-	GtkWidget *confirm_delete;</div><div class='del'>-	GtkWidget *default_reminder;</div><div class='del'>-	GtkWidget *default_reminder_interval;</div><div class='del'>-	GtkWidget *default_reminder_units;</div><div class='del'>-};</div><div class='del'>-typedef struct _DialogData DialogData;</div><div class='del'>-</div><div class='del'>-static const int week_start_day_map[] = {</div><div class='del'>-	1, 2, 3, 4, 5, 6, 0, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int time_division_map[] = {</div><div class='del'>-	60, 30, 15, 10, 5, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The following two are kept separate in case we need to re-order each menu individually */</div><div class='del'>-static const int hide_completed_units_map[] = {</div><div class='del'>-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int default_reminder_units_map[] = {</div><div class='del'>-	CAL_MINUTES, CAL_HOURS, CAL_DAYS, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean get_widgets (DialogData *data);</div><div class='del'>-</div><div class='del'>-static void widget_changed_callback (GtkWidget *, void *data);</div><div class='del'>-static void connect_changed (GtkWidget *widget, const char *signal_name, EvolutionConfigControl *config_control);</div><div class='del'>-static void setup_changes (DialogData *data, EvolutionConfigControl *config_control);</div><div class='del'>-</div><div class='del'>-static void init_widgets (DialogData *data);</div><div class='del'>-static void show_config (DialogData *data);</div><div class='del'>-static void update_config (DialogData *dialog_data);</div><div class='del'>-</div><div class='del'>-static void config_control_apply_callback (EvolutionConfigControl *config_control, void *data);</div><div class='del'>-static void config_control_destroy_callback (GtkObject *object, void *data);</div><div class='del'>-</div><div class='del'>-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget *button, void *data);</div><div class='del'>-static void cal_prefs_dialog_hide_completed_tasks_toggled (GtkWidget *button, void *data);</div><div class='del'>-</div><div class='del'>-GtkWidget *cal_prefs_dialog_create_time_edit (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_prefs_dialog_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new #CalPrefsDialog.</div><div class='del'>- *</div><div class='del'>- * Return value: a new #CalPrefsDialog.</div><div class='del'>- **/</div><div class='del'>-EvolutionConfigControl *</div><div class='del'>-cal_prefs_dialog_new (void)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	EvolutionConfigControl *config_control;</div><div class='del'>-</div><div class='del'>-	dialog_data = g_new0 (DialogData, 1);</div><div class='del'>-</div><div class='del'>-	/* Load the content widgets */</div><div class='del'>-</div><div class='del'>-	dialog_data-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);</div><div class='del'>-	if (!dialog_data-&gt;xml) {</div><div class='del'>-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (dialog_data)) {</div><div class='del'>-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_widgets (dialog_data);</div><div class='del'>-	show_config (dialog_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (dialog_data-&gt;page);</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (dialog_data-&gt;page-&gt;parent), dialog_data-&gt;page);</div><div class='del'>-	config_control = evolution_config_control_new (dialog_data-&gt;page);</div><div class='del'>-	gtk_widget_unref (dialog_data-&gt;page);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (config_control), "apply",</div><div class='del'>-			    GTK_SIGNAL_FUNC (config_control_apply_callback), dialog_data);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (config_control), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (config_control_destroy_callback), dialog_data);</div><div class='del'>-</div><div class='del'>-	setup_changes (dialog_data, config_control);</div><div class='del'>-</div><div class='del'>-	return config_control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-widget_changed_callback (GtkWidget *widget,</div><div class='del'>-			 void *data)</div><div class='del'>-{</div><div class='del'>-	EvolutionConfigControl *config_control;</div><div class='del'>-</div><div class='del'>-	config_control = EVOLUTION_CONFIG_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	evolution_config_control_changed (config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ^*&amp;%!!#! GnomeColorPicker.  */</div><div class='del'>-static void</div><div class='del'>-color_set_callback (GnomeColorPicker *cp,</div><div class='del'>-		    guint r,</div><div class='del'>-		    guint g,</div><div class='del'>-		    guint b,</div><div class='del'>-		    guint a,</div><div class='del'>-		    void *data)</div><div class='del'>-{</div><div class='del'>-	EvolutionConfigControl *config_control;</div><div class='del'>-</div><div class='del'>-	config_control = EVOLUTION_CONFIG_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	evolution_config_control_changed (config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_changed (GtkWidget *widget,</div><div class='del'>-		 const char *signal_name,</div><div class='del'>-		 EvolutionConfigControl *config_control)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (widget), signal_name,</div><div class='del'>-			    GTK_SIGNAL_FUNC (widget_changed_callback), config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_changes (DialogData *dialog_data,</div><div class='del'>-	       EvolutionConfigControl *config_control)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i ++)</div><div class='del'>-		connect_changed (dialog_data-&gt;working_days[i], "toggled", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;timezone, "changed", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;start_of_day, "changed", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;end_of_day, "changed", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (GTK_OPTION_MENU (dialog_data-&gt;week_start_day)-&gt;menu, "selection_done", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;use_12_hour, "toggled", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (GTK_OPTION_MENU (dialog_data-&gt;time_divisions)-&gt;menu, "selection_done", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;show_end_times, "toggled", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;compress_weekend, "toggled", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;dnav_show_week_no, "toggled", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;tasks_hide_completed_checkbutton, "toggled", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;tasks_hide_completed_spinbutton, "changed", config_control);</div><div class='del'>-	connect_changed (GTK_OPTION_MENU (dialog_data-&gt;tasks_hide_completed_spinbutton)-&gt;menu, "selection_done", config_control);</div><div class='del'>-</div><div class='del'>-	connect_changed (dialog_data-&gt;confirm_delete, "toggled", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;default_reminder, "toggled", config_control);</div><div class='del'>-	connect_changed (dialog_data-&gt;default_reminder_interval, "changed", config_control);</div><div class='del'>-	connect_changed (GTK_OPTION_MENU (dialog_data-&gt;default_reminder_units)-&gt;menu, "selection_done", config_control);</div><div class='del'>-</div><div class='del'>-	/* These use GnomeColorPicker so we have to use a different signal.  */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog_data-&gt;tasks_due_today_color), "color_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (color_set_callback), config_control);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog_data-&gt;tasks_overdue_color), "color_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (color_set_callback), config_control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (DialogData *data)</div><div class='del'>-{</div><div class='del'>-#define GW(name) glade_xml_get_widget (data-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	data-&gt;page = GW ("toplevel-notebook");</div><div class='del'>-</div><div class='del'>-	/* The indices must be 0 (Sun) to 6 (Sat). */</div><div class='del'>-	data-&gt;working_days[0] = GW ("sun_button");</div><div class='del'>-	data-&gt;working_days[1] = GW ("mon_button");</div><div class='del'>-	data-&gt;working_days[2] = GW ("tue_button");</div><div class='del'>-	data-&gt;working_days[3] = GW ("wed_button");</div><div class='del'>-	data-&gt;working_days[4] = GW ("thu_button");</div><div class='del'>-	data-&gt;working_days[5] = GW ("fri_button");</div><div class='del'>-	data-&gt;working_days[6] = GW ("sat_button");</div><div class='del'>-</div><div class='del'>-	data-&gt;timezone = GW ("timezone");</div><div class='del'>-	data-&gt;week_start_day = GW ("first_day_of_week");</div><div class='del'>-	data-&gt;start_of_day = GW ("start_of_day");</div><div class='del'>-	data-&gt;end_of_day = GW ("end_of_day");</div><div class='del'>-	data-&gt;use_12_hour = GW ("use_12_hour");</div><div class='del'>-	data-&gt;use_24_hour = GW ("use_24_hour");</div><div class='del'>-	data-&gt;time_divisions = GW ("time_divisions");</div><div class='del'>-	data-&gt;show_end_times = GW ("show_end_times");</div><div class='del'>-	data-&gt;compress_weekend = GW ("compress_weekend");</div><div class='del'>-	data-&gt;dnav_show_week_no = GW ("dnav_show_week_no");</div><div class='del'>-</div><div class='del'>-	data-&gt;tasks_due_today_color = GW ("tasks_due_today_color");</div><div class='del'>-	data-&gt;tasks_overdue_color = GW ("tasks_overdue_color");</div><div class='del'>-</div><div class='del'>-	data-&gt;tasks_hide_completed_checkbutton = GW ("tasks-hide-completed-checkbutton");</div><div class='del'>-	data-&gt;tasks_hide_completed_spinbutton = GW ("tasks-hide-completed-spinbutton");</div><div class='del'>-	data-&gt;tasks_hide_completed_optionmenu = GW ("tasks-hide-completed-optionmenu");</div><div class='del'>-</div><div class='del'>-	data-&gt;confirm_delete = GW ("confirm-delete");</div><div class='del'>-	data-&gt;default_reminder = GW ("default-reminder");</div><div class='del'>-	data-&gt;default_reminder_interval = GW ("default-reminder-interval");</div><div class='del'>-	data-&gt;default_reminder_units = GW ("default-reminder-units");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (data-&gt;page</div><div class='del'>-		&amp;&amp; data-&gt;timezone</div><div class='del'>-		&amp;&amp; data-&gt;working_days[0]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[1]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[2]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[3]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[4]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[5]</div><div class='del'>-		&amp;&amp; data-&gt;working_days[6]</div><div class='del'>-		&amp;&amp; data-&gt;week_start_day</div><div class='del'>-		&amp;&amp; data-&gt;start_of_day</div><div class='del'>-		&amp;&amp; data-&gt;end_of_day</div><div class='del'>-		&amp;&amp; data-&gt;use_12_hour</div><div class='del'>-		&amp;&amp; data-&gt;use_24_hour</div><div class='del'>-		&amp;&amp; data-&gt;time_divisions</div><div class='del'>-		&amp;&amp; data-&gt;show_end_times</div><div class='del'>-		&amp;&amp; data-&gt;compress_weekend</div><div class='del'>-		&amp;&amp; data-&gt;dnav_show_week_no</div><div class='del'>-		&amp;&amp; data-&gt;tasks_due_today_color</div><div class='del'>-		&amp;&amp; data-&gt;tasks_overdue_color</div><div class='del'>-		&amp;&amp; data-&gt;tasks_hide_completed_checkbutton</div><div class='del'>-		&amp;&amp; data-&gt;tasks_hide_completed_spinbutton</div><div class='del'>-		&amp;&amp; data-&gt;tasks_hide_completed_optionmenu</div><div class='del'>-		&amp;&amp; data-&gt;confirm_delete</div><div class='del'>-		&amp;&amp; data-&gt;default_reminder</div><div class='del'>-		&amp;&amp; data-&gt;default_reminder_interval</div><div class='del'>-		&amp;&amp; data-&gt;default_reminder_units);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-config_control_destroy_callback (GtkObject *object,</div><div class='del'>-				 void *data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dialog_data-&gt;xml));</div><div class='del'>-	</div><div class='del'>-	g_free (dialog_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-config_control_apply_callback (EvolutionConfigControl *control,</div><div class='del'>-			       void *data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-</div><div class='del'>-	update_config (dialog_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called by libglade to create our custom EDateEdit widgets. */</div><div class='del'>-GtkWidget *</div><div class='del'>-cal_prefs_dialog_create_time_edit (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = e_date_edit_new ();</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);</div><div class='del'>-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);</div><div class='del'>-</div><div class='del'>-	return dedit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Connects any necessary signal handlers. */</div><div class='del'>-static void</div><div class='del'>-init_widgets (DialogData *dialog_data)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog_data-&gt;use_24_hour), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),</div><div class='del'>-			    dialog_data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog_data-&gt;tasks_hide_completed_checkbutton),</div><div class='del'>-			    "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_hide_completed_tasks_toggled),</div><div class='del'>-			    dialog_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_use_24_hour_toggled (GtkWidget	*button,</div><div class='del'>-				      void *data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	gboolean use_24_hour;</div><div class='del'>-</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-</div><div class='del'>-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data-&gt;use_24_hour));</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data-&gt;start_of_day), use_24_hour);</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (dialog_data-&gt;end_of_day), use_24_hour);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_hide_completed_tasks_toggled	(GtkWidget *button,</div><div class='del'>-						 void *data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	gboolean hide_completed_tasks;</div><div class='del'>-</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-</div><div class='del'>-	hide_completed_tasks = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog_data-&gt;tasks_hide_completed_checkbutton));</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;tasks_hide_completed_spinbutton, hide_completed_tasks);</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;tasks_hide_completed_optionmenu, hide_completed_tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the color in a color picker from an X color spec */</div><div class='del'>-static void</div><div class='del'>-set_color_picker (GtkWidget *picker, const char *spec)</div><div class='del'>-{</div><div class='del'>-	GdkColor color;</div><div class='del'>-</div><div class='del'>-	g_assert (spec != NULL);</div><div class='del'>-</div><div class='del'>-	if (!gdk_color_parse (spec, &amp;color)) {</div><div class='del'>-		color.red = color.green = color.blue = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker),</div><div class='del'>-				    color.red,</div><div class='del'>-				    color.green,</div><div class='del'>-				    color.blue,</div><div class='del'>-				    65535);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Shows the current task list settings in the dialog */</div><div class='del'>-static void</div><div class='del'>-show_task_list_config (DialogData *dialog_data)</div><div class='del'>-{</div><div class='del'>-	CalUnits units;</div><div class='del'>-	gboolean hide_completed_tasks;</div><div class='del'>-</div><div class='del'>-	set_color_picker (dialog_data-&gt;tasks_due_today_color, calendar_config_get_tasks_due_today_color ());</div><div class='del'>-	set_color_picker (dialog_data-&gt;tasks_overdue_color, calendar_config_get_tasks_overdue_color ());</div><div class='del'>-</div><div class='del'>-	/* Hide Completed Tasks. */</div><div class='del'>-	hide_completed_tasks = calendar_config_get_hide_completed_tasks ();</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;tasks_hide_completed_checkbutton,</div><div class='del'>-			     hide_completed_tasks);</div><div class='del'>-</div><div class='del'>-	/* Hide Completed Tasks Units. */</div><div class='del'>-	units = calendar_config_get_hide_completed_tasks_units ();</div><div class='del'>-	e_dialog_option_menu_set (dialog_data-&gt;tasks_hide_completed_optionmenu,</div><div class='del'>-				  units, hide_completed_units_map);</div><div class='del'>-</div><div class='del'>-	/* Hide Completed Tasks Value. */</div><div class='del'>-	e_dialog_spin_set (dialog_data-&gt;tasks_hide_completed_spinbutton,</div><div class='del'>-			   calendar_config_get_hide_completed_tasks_value ());</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;tasks_hide_completed_spinbutton,</div><div class='del'>-				  hide_completed_tasks);</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;tasks_hide_completed_optionmenu,</div><div class='del'>-				  hide_completed_tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Shows the current config settings in the dialog. */</div><div class='del'>-static void</div><div class='del'>-show_config (DialogData *dialog_data)</div><div class='del'>-{</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint mask, day, week_start_day, time_divisions;</div><div class='del'>-	char *zone_name;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	gboolean sensitive;</div><div class='del'>-</div><div class='del'>-	/* Timezone. */</div><div class='del'>-	zone_name = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (zone_name);</div><div class='del'>-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (dialog_data-&gt;timezone),</div><div class='del'>-				       zone);</div><div class='del'>-</div><div class='del'>-	/* Working Days. */</div><div class='del'>-	working_days = calendar_config_get_working_days ();</div><div class='del'>-	mask = 1 &lt;&lt; 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		e_dialog_toggle_set (dialog_data-&gt;working_days[day], (working_days &amp; mask) ? TRUE : FALSE);</div><div class='del'>-		mask &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Week Start Day. */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	e_dialog_option_menu_set (dialog_data-&gt;week_start_day, week_start_day,</div><div class='del'>-				  week_start_day_map);</div><div class='del'>-</div><div class='del'>-	/* Start of Day. */</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data-&gt;start_of_day),</div><div class='del'>-				     calendar_config_get_day_start_hour (),</div><div class='del'>-				     calendar_config_get_day_start_minute ());</div><div class='del'>-</div><div class='del'>-	/* End of Day. */</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (dialog_data-&gt;end_of_day),</div><div class='del'>-				     calendar_config_get_day_end_hour (),</div><div class='del'>-				     calendar_config_get_day_end_minute ());</div><div class='del'>-</div><div class='del'>-	/* 12/24 Hour Format. */</div><div class='del'>-	if (calendar_config_get_24_hour_format ())</div><div class='del'>-		e_dialog_toggle_set (dialog_data-&gt;use_24_hour, TRUE);</div><div class='del'>-	else</div><div class='del'>-		e_dialog_toggle_set (dialog_data-&gt;use_12_hour, TRUE);</div><div class='del'>-</div><div class='del'>-	sensitive = calendar_config_locale_supports_12_hour_format ();</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;use_12_hour, sensitive);</div><div class='del'>-	gtk_widget_set_sensitive (dialog_data-&gt;use_24_hour, sensitive);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Time Divisions. */</div><div class='del'>-	time_divisions = calendar_config_get_time_divisions ();</div><div class='del'>-	e_dialog_option_menu_set (dialog_data-&gt;time_divisions, time_divisions,</div><div class='del'>-				  time_division_map);</div><div class='del'>-</div><div class='del'>-	/* Show Appointment End Times. */</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;show_end_times, calendar_config_get_show_event_end ());</div><div class='del'>-</div><div class='del'>-	/* Compress Weekend. */</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;compress_weekend, calendar_config_get_compress_weekend ());</div><div class='del'>-</div><div class='del'>-	/* Date Navigator - Show Week Numbers. */</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;dnav_show_week_no, calendar_config_get_dnav_show_week_no ());</div><div class='del'>-</div><div class='del'>-	/* Task list */</div><div class='del'>-</div><div class='del'>-	show_task_list_config (dialog_data);</div><div class='del'>-</div><div class='del'>-	/* Other page */</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;confirm_delete, calendar_config_get_confirm_delete ());</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (dialog_data-&gt;default_reminder,</div><div class='del'>-			     calendar_config_get_use_default_reminder ());</div><div class='del'>-	e_dialog_spin_set (dialog_data-&gt;default_reminder_interval,</div><div class='del'>-			   calendar_config_get_default_reminder_interval ());</div><div class='del'>-	e_dialog_option_menu_set (dialog_data-&gt;default_reminder_units,</div><div class='del'>-				  calendar_config_get_default_reminder_units (),</div><div class='del'>-				  default_reminder_units_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a pointer to a static string with an X color spec for the current</div><div class='del'>- * value of a color picker.</div><div class='del'>- */</div><div class='del'>-static const char *</div><div class='del'>-spec_from_picker (GtkWidget *picker)</div><div class='del'>-{</div><div class='del'>-	static char spec[8];</div><div class='del'>-	guint8 r, g, b;</div><div class='del'>-</div><div class='del'>-	gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &amp;r, &amp;g, &amp;b, NULL);</div><div class='del'>-	g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b);</div><div class='del'>-</div><div class='del'>-	return spec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Updates the task list config values from the settings in the dialog */</div><div class='del'>-static void</div><div class='del'>-update_task_list_config (DialogData *dialog_data)</div><div class='del'>-{</div><div class='del'>-	calendar_config_set_tasks_due_today_color (spec_from_picker (dialog_data-&gt;tasks_due_today_color));</div><div class='del'>-	calendar_config_set_tasks_overdue_color (spec_from_picker (dialog_data-&gt;tasks_overdue_color));</div><div class='del'>-</div><div class='del'>-	calendar_config_set_hide_completed_tasks (e_dialog_toggle_get (dialog_data-&gt;tasks_hide_completed_checkbutton));</div><div class='del'>-	calendar_config_set_hide_completed_tasks_units (e_dialog_option_menu_get (dialog_data-&gt;tasks_hide_completed_optionmenu, hide_completed_units_map));</div><div class='del'>-	calendar_config_set_hide_completed_tasks_value (e_dialog_spin_get_int (dialog_data-&gt;tasks_hide_completed_spinbutton));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Updates the config values based on the settings in the dialog. */</div><div class='del'>-static void</div><div class='del'>-update_config (DialogData *dialog_data)</div><div class='del'>-{</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint mask, day, week_start_day, time_divisions, hour, minute;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* Timezone. */</div><div class='del'>-	zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (dialog_data-&gt;timezone));</div><div class='del'>-	calendar_config_set_timezone (icaltimezone_get_location (zone));</div><div class='del'>-</div><div class='del'>-	/* Working Days. */</div><div class='del'>-	working_days = 0;</div><div class='del'>-	mask = 1 &lt;&lt; 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		if (e_dialog_toggle_get (dialog_data-&gt;working_days[day]))</div><div class='del'>-			working_days |= mask;</div><div class='del'>-		mask &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-	calendar_config_set_working_days (working_days);</div><div class='del'>-</div><div class='del'>-	/* Week Start Day. */</div><div class='del'>-	week_start_day = e_dialog_option_menu_get (dialog_data-&gt;week_start_day, week_start_day_map);</div><div class='del'>-	calendar_config_set_week_start_day (week_start_day);</div><div class='del'>-</div><div class='del'>-	/* Start of Day. */</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data-&gt;start_of_day), &amp;hour, &amp;minute);</div><div class='del'>-	calendar_config_set_day_start_hour (hour);</div><div class='del'>-	calendar_config_set_day_start_minute (minute);</div><div class='del'>-</div><div class='del'>-	/* End of Day. */</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (dialog_data-&gt;end_of_day), &amp;hour, &amp;minute);</div><div class='del'>-	calendar_config_set_day_end_hour (hour);</div><div class='del'>-	calendar_config_set_day_end_minute (minute);</div><div class='del'>-</div><div class='del'>-	/* 12/24 Hour Format. */</div><div class='del'>-	calendar_config_set_24_hour_format (e_dialog_toggle_get (dialog_data-&gt;use_24_hour));</div><div class='del'>-</div><div class='del'>-	/* Time Divisions. */</div><div class='del'>-	time_divisions = e_dialog_option_menu_get (dialog_data-&gt;time_divisions, time_division_map);</div><div class='del'>-	calendar_config_set_time_divisions (time_divisions);</div><div class='del'>-</div><div class='del'>-	/* Show Appointment End Times. */</div><div class='del'>-	calendar_config_set_show_event_end (e_dialog_toggle_get (dialog_data-&gt;show_end_times));</div><div class='del'>-</div><div class='del'>-	/* Compress Weekend. */</div><div class='del'>-	calendar_config_set_compress_weekend (e_dialog_toggle_get (dialog_data-&gt;compress_weekend));</div><div class='del'>-</div><div class='del'>-	/* Date Navigator - Show Week Numbers. */</div><div class='del'>-	calendar_config_set_dnav_show_week_no (e_dialog_toggle_get (dialog_data-&gt;dnav_show_week_no));</div><div class='del'>-</div><div class='del'>-	/* Task list */</div><div class='del'>-	update_task_list_config (dialog_data);</div><div class='del'>-</div><div class='del'>-	/* Other page */</div><div class='del'>-</div><div class='del'>-	calendar_config_set_confirm_delete (e_dialog_toggle_get (dialog_data-&gt;confirm_delete));</div><div class='del'>-</div><div class='del'>-	calendar_config_set_use_default_reminder (e_dialog_toggle_get (dialog_data-&gt;default_reminder));</div><div class='del'>-</div><div class='del'>-	calendar_config_set_default_reminder_interval (</div><div class='del'>-		e_dialog_spin_get_int (dialog_data-&gt;default_reminder_interval));</div><div class='del'>-</div><div class='del'>-	calendar_config_set_default_reminder_units (</div><div class='del'>-		e_dialog_option_menu_get (dialog_data-&gt;default_reminder_units, default_reminder_units_map));</div><div class='del'>-</div><div class='del'>-	/* Done */</div><div class='del'>-</div><div class='del'>-	calendar_config_write ();</div><div class='del'>-	update_all_config_settings ();</div><div class='del'>-	e_tasks_update_all_config_settings ();</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade<br/>deleted file mode 100644<br/>index 311e378826..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/cal-prefs-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,949 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;preferences&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;preferences&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;cal-prefs-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Calendar and Tasks Settings&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;True&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CLOSE&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;toplevel-notebook&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox10&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;6&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame12&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;label&gt;Time&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table5&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label22&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Time _zone:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label20&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Time format:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox10&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;alignment2&lt;/name&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xscale&gt;3.35276e-08&lt;/xscale&gt;</div><div class='del'>-		&lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;use_12_hour&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;_12 hour (AM/PM)&lt;/label&gt;</div><div class='del'>-		  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		  &lt;group&gt;time_format_group&lt;/group&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;use_24_hour&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_24 hour&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;group&gt;time_format_group&lt;/group&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;timezone&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;make_timezone_entry&lt;/creation_function&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Wed, 20 Jun 2001 02:22:46 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame9&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;label&gt;Work Week&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox9&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox8&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;mon_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Mon&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tue_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;T_ue&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;wed_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Wed&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;thu_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;T_hu&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;fri_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Fri&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;sat_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Sat&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;sun_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Su_n&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox9&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;first_day_of_week&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;Monday</div><div class='del'>-Tuesday</div><div class='del'>-Wednesday</div><div class='del'>-Thursday</div><div class='del'>-Friday</div><div class='del'>-Saturday</div><div class='del'>-Sunday</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox11&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Sta_rt of day:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;start_of_day&lt;/name&gt;</div><div class='del'>-		&lt;creation_function&gt;cal_prefs_dialog_create_time_edit&lt;/creation_function&gt;</div><div class='del'>-		&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		&lt;last_modification_time&gt;Tue, 10 Oct 2000 15:12:12 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;_End of day:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;end_of_day&lt;/name&gt;</div><div class='del'>-		&lt;creation_function&gt;cal_prefs_dialog_create_time_edit&lt;/creation_function&gt;</div><div class='del'>-		&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		&lt;last_modification_time&gt;Tue, 10 Oct 2000 15:12:21 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;confirm-delete&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Ask for confirmation when deleting items&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox16&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;default-reminder&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Sh_ow a default reminder&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;default-reminder-interval&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;0&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;9999&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;default-reminder-units&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;Minutes</div><div class='del'>-Hours</div><div class='del'>-Days</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label30&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;before the start of the appointment&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label21&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox8&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;6&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox12&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label25&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Time divisions:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;time_divisions&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;time_divisions&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;60 minutes</div><div class='del'>-30 minutes</div><div class='del'>-15 minutes</div><div class='del'>-10 minutes</div><div class='del'>-05 minutes</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;show_end_times&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Show appointment end times in week and month views&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;compress_weekend&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Compress weekends in month view&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;dnav_show_week_no&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Show week _numbers in date navigator&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame13&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Task List&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox12&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;table7&lt;/name&gt;</div><div class='del'>-	      &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	      &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label28&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;T_asks due today:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;default_focus_target&gt;tasks_due_today_color&lt;/default_focus_target&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label29&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;_Overdue tasks:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;default_focus_target&gt;tasks_overdue_color&lt;/default_focus_target&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GnomeColorPicker&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tasks_overdue_color&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;dither&gt;True&lt;/dither&gt;</div><div class='del'>-		&lt;use_alpha&gt;False&lt;/use_alpha&gt;</div><div class='del'>-		&lt;title&gt;Color for overdue tasks&lt;/title&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GnomeColorPicker&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tasks_due_today_color&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;dither&gt;True&lt;/dither&gt;</div><div class='del'>-		&lt;use_alpha&gt;False&lt;/use_alpha&gt;</div><div class='del'>-		&lt;title&gt;Color for tasks due today&lt;/title&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox15&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tasks-hide-completed-checkbutton&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Hide completed tasks after&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tasks-hide-completed-spinbutton&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		&lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		&lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-		&lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		&lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;value&gt;1&lt;/value&gt;</div><div class='del'>-		&lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-		&lt;upper&gt;9999&lt;/upper&gt;</div><div class='del'>-		&lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		&lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		&lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tasks-hide-completed-optionmenu&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;Minutes</div><div class='del'>-Hours</div><div class='del'>-Days</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Display&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h<br/>deleted file mode 100644<br/>index ce3f46736c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/cal-prefs-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog</div><div class='del'>- * to edit the calendar preference settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAL_PREFS_DIALOG_H_</div><div class='del'>-#define _CAL_PREFS_DIALOG_H_</div><div class='del'>-</div><div class='del'>-#include "evolution-config-control.h"</div><div class='del'>-</div><div class='del'>-EvolutionConfigControl *cal_prefs_dialog_new (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _CAL_PREFS_DIALOG_H_ */</div><div class='head'>diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c<br/>deleted file mode 100644<br/>index 92590cfa40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cancel-comp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/cancel-comp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* Evolution calendar - Send calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "cancel-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cancel_component_dialog:</div><div class='del'>- * </div><div class='del'>- * Pops up a dialog box asking the user whether he wants to send a</div><div class='del'>- * cancel and delete an iTip/iMip message</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the user clicked Yes, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cancel_component_dialog (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	str = _("The meeting status has changed. Send an updated version?");</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		str = g_strdup_printf (_("Are you sure you want to cancel "</div><div class='del'>-					 "and delete this meeting?"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		str = g_strdup_printf (_("Are you sure you want to cancel "</div><div class='del'>-					 "and delete this task?"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		str = g_strdup_printf (_("Are you sure you want to cancel "</div><div class='del'>-					 "and delete this journal entry?"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("send_component_dialog(): "</div><div class='del'>-			   "Cannot handle object of type %d", vtype);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_question_dialog_modal (str, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h<br/>deleted file mode 100644<br/>index d12466ffa1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cancel-comp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/cancel-comp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Send calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CANCEL_COMP_H</div><div class='del'>-#define CANCEL_COMP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean cancel_component_dialog (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c<br/>deleted file mode 100644<br/>index 4282307859..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/changed-comp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/changed-comp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,111 +0,0 @@</div><div class='del'>-/* Evolution calendar - Send calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "changed-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * changed_component_dialog:</div><div class='del'>- * @comp: A calendar component</div><div class='del'>- * @deleted: Whether the object is being deleted or updated</div><div class='del'>- * @changed: Whether or not the user has made changes</div><div class='del'>- * </div><div class='del'>- * Pops up a dialog box asking the user whether changes made (if any)</div><div class='del'>- * should be thrown away because the item has been updated elsewhere</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the user clicked Yes, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	if (deleted) {</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			str = _("This event has been deleted.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			str = _("This task has been deleted.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_JOURNAL:</div><div class='del'>-			str = _("This journal entry has been deleted.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("changed_component_dialog(): "</div><div class='del'>-				   "Cannot handle object of type %d", vtype);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (changed)</div><div class='del'>-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and close the editor?"), str);</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup_printf (_("%s  You have made no changes, close the editor?"), str); </div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			str = _("This event has been changed.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			str = _("This task has been changed.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_JOURNAL:</div><div class='del'>-			str = _("This journal entry has been changed.");</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("changed_component_dialog(): "</div><div class='del'>-				   "Cannot handle object of type %d", vtype);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (changed)</div><div class='del'>-			str = g_strdup_printf (_("%s  You have made changes. Forget those changes and update the editor?"), str);</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup_printf (_("%s  You have made no changes, update the editor?"), str); </div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_question_dialog_modal (str, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h<br/>deleted file mode 100644<br/>index 915d7a5372..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/changed-comp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/changed-comp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Changed calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CHANGED_COMP_H</div><div class='del'>-#define CHANGED_COMP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean changed_component_dialog (CalComponent *comp, gboolean deleted, gboolean changed);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c<br/>deleted file mode 100644<br/>index 0d7f315837..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,361 +0,0 @@</div><div class='del'>-/* Evolution calendar - Base class for calendar component editor pages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void comp_editor_page_class_init (CompEditorPageClass *class);</div><div class='del'>-static void comp_editor_page_init (CompEditorPage *page);</div><div class='del'>-static void comp_editor_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	SUMMARY_CHANGED,</div><div class='del'>-	DATES_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint comp_editor_page_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-#define CLASS(page) (COMP_EDITOR_PAGE_CLASS (GTK_OBJECT (page)-&gt;klass))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #CompEditorPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CompEditorPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-comp_editor_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType comp_editor_page_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!comp_editor_page_type) {</div><div class='del'>-		static const GtkTypeInfo comp_editor_page_info = {</div><div class='del'>-			"CompEditorPage",</div><div class='del'>-			sizeof (CompEditorPage),</div><div class='del'>-			sizeof (CompEditorPageClass),</div><div class='del'>-			(GtkClassInitFunc) comp_editor_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) comp_editor_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		comp_editor_page_type =</div><div class='del'>-			gtk_type_unique (GTK_TYPE_OBJECT,</div><div class='del'>-					 &amp;comp_editor_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return comp_editor_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the abstract editor page */</div><div class='del'>-static void</div><div class='del'>-comp_editor_page_class_init (CompEditorPageClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	comp_editor_page_signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CompEditorPageClass,</div><div class='del'>-						   changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	comp_editor_page_signals[SUMMARY_CHANGED] =</div><div class='del'>-		gtk_signal_new ("summary_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CompEditorPageClass,</div><div class='del'>-						   summary_changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	comp_editor_page_signals[DATES_CHANGED] =</div><div class='del'>-		gtk_signal_new ("dates_changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CompEditorPageClass,</div><div class='del'>-						   dates_changed),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class,</div><div class='del'>-				      comp_editor_page_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	class-&gt;changed = NULL;</div><div class='del'>-	class-&gt;summary_changed = NULL;</div><div class='del'>-	class-&gt;dates_changed = NULL;</div><div class='del'>-</div><div class='del'>-	class-&gt;get_widget = NULL;</div><div class='del'>-	class-&gt;focus_main_widget = NULL;</div><div class='del'>-	class-&gt;fill_widgets = NULL;</div><div class='del'>-	class-&gt;fill_component = NULL;</div><div class='del'>-	class-&gt;set_summary = NULL;</div><div class='del'>-	class-&gt;set_dates = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = comp_editor_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-comp_editor_page_init (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	page-&gt;client = NULL;</div><div class='del'>-	page-&gt;accel_group = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-comp_editor_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (object));</div><div class='del'>-</div><div class='del'>-	page = COMP_EDITOR_PAGE (object);</div><div class='del'>-</div><div class='del'>-	if (page-&gt;client) {</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (page-&gt;client));</div><div class='del'>-		page-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (page-&gt;accel_group) {</div><div class='del'>-		gtk_accel_group_unref (page-&gt;accel_group);</div><div class='del'>-		page-&gt;accel_group = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_get_widget:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * </div><div class='del'>- * Queries the main widget of an editor page.</div><div class='del'>- * </div><div class='del'>- * Return value: The widget that is the page's upper container.  It should</div><div class='del'>- * normally be inserted in a notebook widget.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-comp_editor_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (page != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (page)-&gt;get_widget != NULL);</div><div class='del'>-	return (* CLASS (page)-&gt;get_widget) (page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_focus_main_widget:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * </div><div class='del'>- * Makes an editor page focus its main widget.  This is used by the component</div><div class='del'>- * editor when it first pops up so that it can focus the main widget in the</div><div class='del'>- * first page.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (page)-&gt;focus_main_widget != NULL);</div><div class='del'>-	(* CLASS (page)-&gt;focus_main_widget) (page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_fill_widgets:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * </div><div class='del'>- * Fills the widgets of an editor page with the data from a calendar component.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (page)-&gt;fill_widgets != NULL);</div><div class='del'>-	(* CLASS (page)-&gt;fill_widgets) (page, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_fill_component:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- * </div><div class='del'>- * Takes the data from the widgets of an editor page and sets it on a calendar</div><div class='del'>- * component, replacing the contents of the properties that the editor page</div><div class='del'>- * knows how to manipulate.</div><div class='del'>- *</div><div class='del'>- * Returns: TRUE if the component could be filled, FALSE otherwise</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-comp_editor_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (page != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_COMP_EDITOR_PAGE (page), FALSE);</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	if (CLASS (page)-&gt;fill_component != NULL)</div><div class='del'>-		return (* CLASS (page)-&gt;fill_component) (page, comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_set_cal_client:</div><div class='del'>- * @page: An editor page</div><div class='del'>- * @client: A #CalClient object</div><div class='del'>- *</div><div class='del'>- * Sets the #CalClient for the dialog page to use.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_set_cal_client (CompEditorPage *page, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-        g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	if (page-&gt;client)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	page-&gt;client = client;</div><div class='del'>-	if (page-&gt;client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_set_summary:</div><div class='del'>- * @page: An editor page</div><div class='del'>- * @summary: The text of the new summary value</div><div class='del'>- * </div><div class='del'>- * Sets the summary value for this group of widgets</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_set_summary (CompEditorPage *page, const char *summary)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	if (CLASS (page)-&gt;set_summary != NULL)</div><div class='del'>-		(* CLASS (page)-&gt;set_summary) (page, summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_set_dates:</div><div class='del'>- * @page: An editor page</div><div class='del'>- * @dates: A collection of various dates in time_t format</div><div class='del'>- * </div><div class='del'>- * Sets the date values for this group of widgets</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	if (CLASS (page)-&gt;set_dates != NULL)</div><div class='del'>-		(* CLASS (page)-&gt;set_dates) (page, dates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_notify_changed:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * </div><div class='del'>- * Makes an editor page emit the "changed" signal.  This is meant to be</div><div class='del'>- * used only by page implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_notify_changed (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_notify_summary_changed:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * </div><div class='del'>- * Makes an editor page emit the "summary_changed" signal.  This is meant to be</div><div class='del'>- * used only by page implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_notify_summary_changed (CompEditorPage *page,</div><div class='del'>-					 const char *summary)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (page),</div><div class='del'>-			 comp_editor_page_signals[SUMMARY_CHANGED],</div><div class='del'>-			 summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_page_notify_dates_changed:</div><div class='del'>- * @page: An editor page.</div><div class='del'>- * </div><div class='del'>- * Makes an editor page emit the "dates_changed" signal.  This is meant to be</div><div class='del'>- * used only by page implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_page_notify_dates_changed (CompEditorPage *page,</div><div class='del'>-				       CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (page),</div><div class='del'>-			 comp_editor_page_signals[DATES_CHANGED],</div><div class='del'>-			 dates);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h<br/>deleted file mode 100644<br/>index 6ef5549219..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-/* Evolution calendar - Base class for calendar component editor pages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef COMP_EDITOR_PAGE_H</div><div class='del'>-#define COMP_EDITOR_PAGE_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include "cal-client.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_COMP_EDITOR_PAGE            (comp_editor_page_get_type ())</div><div class='del'>-#define COMP_EDITOR_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPage))</div><div class='del'>-#define COMP_EDITOR_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR_PAGE,	CompEditorPageClass))</div><div class='del'>-#define IS_COMP_EDITOR_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))</div><div class='del'>-#define IS_COMP_EDITOR_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_COMP_EDITOR_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentDateTime *start;</div><div class='del'>-	CalComponentDateTime *end;</div><div class='del'>-	CalComponentDateTime *due;</div><div class='del'>-	struct icaltimetype *complete;</div><div class='del'>-} CompEditorPageDates;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Some of the pages need the CalClient to access timezone data. */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* The GtkAccelGroup for the page. We install this when the page is</div><div class='del'>-	   mapped, and uninstall when it is unmapped. libglade would do this</div><div class='del'>-	   normally, but we create our pages individually so have to do it</div><div class='del'>-	   ourselves. */</div><div class='del'>-	GtkAccelGroup *accel_group;</div><div class='del'>-} CompEditorPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* changed)    (CompEditorPage *page);</div><div class='del'>-	void (* needs_send) (CompEditorPage *page);</div><div class='del'>-</div><div class='del'>-	void (* summary_changed) (CompEditorPage *page, const char *summary);</div><div class='del'>-	void (* dates_changed)   (CompEditorPage *page, const char *dates);</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-</div><div class='del'>-	GtkWidget *(* get_widget) (CompEditorPage *page);</div><div class='del'>-	void (* focus_main_widget) (CompEditorPage *page);</div><div class='del'>-</div><div class='del'>-	void     (* fill_widgets) (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-	gboolean (* fill_component) (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-</div><div class='del'>-	void (* set_summary) (CompEditorPage *page, const char *summary);</div><div class='del'>-	void (* set_dates) (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-} CompEditorPageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    comp_editor_page_get_type               (void);</div><div class='del'>-GtkWidget *comp_editor_page_get_widget             (CompEditorPage      *page);</div><div class='del'>-void       comp_editor_page_focus_main_widget      (CompEditorPage      *page);</div><div class='del'>-void       comp_editor_page_fill_widgets           (CompEditorPage      *page,</div><div class='del'>-						    CalComponent        *comp);</div><div class='del'>-gboolean   comp_editor_page_fill_component         (CompEditorPage      *page,</div><div class='del'>-						    CalComponent        *comp);</div><div class='del'>-void       comp_editor_page_set_cal_client         (CompEditorPage      *page,</div><div class='del'>-						    CalClient           *client);</div><div class='del'>-void       comp_editor_page_set_summary            (CompEditorPage      *page,</div><div class='del'>-						    const char          *summary);</div><div class='del'>-void       comp_editor_page_set_dates              (CompEditorPage      *page,</div><div class='del'>-						    CompEditorPageDates *dates);</div><div class='del'>-void       comp_editor_page_notify_changed         (CompEditorPage      *page);</div><div class='del'>-void       comp_editor_page_notify_summary_changed (CompEditorPage      *page,</div><div class='del'>-						    const char          *summary);</div><div class='del'>-void       comp_editor_page_notify_dates_changed   (CompEditorPage      *page,</div><div class='del'>-						    CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c<br/>deleted file mode 100644<br/>index 34d4e71e81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,590 +0,0 @@</div><div class='del'>-/* Evolution calendar - Widget utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;e-destination.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_dates:</div><div class='del'>- * @dates: A structure to be filled out with dates of a component</div><div class='del'>- * @comp: The component to extract the dates from</div><div class='del'>- * </div><div class='del'>- * Extracts the dates from the calendar component into the</div><div class='del'>- * CompEditorPageDates structure. Call comp_editor_free_dates() to free the</div><div class='del'>- * results.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_dates (CompEditorPageDates *dates, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-</div><div class='del'>-	dates-&gt;start = NULL;</div><div class='del'>-	dates-&gt;end = NULL;</div><div class='del'>-	dates-&gt;due = NULL;</div><div class='del'>-	dates-&gt;complete = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Note that the CalComponentDateTime's returned contain allocated</div><div class='del'>-	   icaltimetype and tzid values, so we just take over ownership of</div><div class='del'>-	   those. */</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt);</div><div class='del'>-	if (dt.value) {</div><div class='del'>-		dates-&gt;start = g_new (CalComponentDateTime, 1);</div><div class='del'>-		*dates-&gt;start = dt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dt);</div><div class='del'>-	if (dt.value) {</div><div class='del'>-		dates-&gt;end = g_new (CalComponentDateTime, 1);</div><div class='del'>-		*dates-&gt;end = dt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;dt);</div><div class='del'>-	if (dt.value) {</div><div class='del'>-		dates-&gt;due = g_new (CalComponentDateTime, 1);</div><div class='del'>-		*dates-&gt;due = dt;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;dates-&gt;complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This frees the dates in the CompEditorPageDates struct. But it doesn't free</div><div class='del'>- * the struct (as that is usually static).</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-comp_editor_free_dates (CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	/* Note that cal_component_free_datetime() only frees the fields in</div><div class='del'>-	   the struct. It doesn't free the struct itself, so we do that. */</div><div class='del'>-	if (dates-&gt;start) {</div><div class='del'>-		cal_component_free_datetime (dates-&gt;start);</div><div class='del'>-		g_free (dates-&gt;start);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dates-&gt;end) {</div><div class='del'>-		cal_component_free_datetime (dates-&gt;end);</div><div class='del'>-		g_free (dates-&gt;end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dates-&gt;due) {</div><div class='del'>-		cal_component_free_datetime (dates-&gt;due);</div><div class='del'>-		g_free (dates-&gt;due);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dates-&gt;complete)</div><div class='del'>-		cal_component_free_icaltimetype (dates-&gt;complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* dtstart is only passed in if tt is the dtend. */</div><div class='del'>-static void</div><div class='del'>-write_label_piece (struct icaltimetype *tt, char *buffer, int size,</div><div class='del'>-		   char *stext, char *etext, struct icaltimetype *dtstart)</div><div class='del'>-{</div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-	struct icaltimetype tt_copy = *tt;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: May want to convert the time to an appropriate zone. */</div><div class='del'>-</div><div class='del'>-	if (stext != NULL)</div><div class='del'>-		strcat (buffer, stext);</div><div class='del'>-</div><div class='del'>-	/* If we are writing the DTEND (i.e. DTSTART is set), and</div><div class='del'>-	   DTEND &gt; DTSTART, subtract 1 day. The DTEND date is not inclusive. */</div><div class='del'>-	if (tt_copy.is_date &amp;&amp; dtstart</div><div class='del'>-	    &amp;&amp; icaltime_compare_date_only (tt_copy, *dtstart) &gt; 0) {</div><div class='del'>-		icaltime_adjust (&amp;tt_copy, -1, 0, 0, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_year = tt_copy.year - 1900;</div><div class='del'>-	tmp_tm.tm_mon = tt_copy.month - 1;</div><div class='del'>-	tmp_tm.tm_mday = tt_copy.day;</div><div class='del'>-	tmp_tm.tm_hour = tt_copy.hour;</div><div class='del'>-	tmp_tm.tm_min = tt_copy.minute;</div><div class='del'>-	tmp_tm.tm_sec = tt_copy.second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_wday = time_day_of_week (tt_copy.day, tt_copy.month - 1,</div><div class='del'>-					   tt_copy.year);</div><div class='del'>-</div><div class='del'>-	len = strlen (buffer);</div><div class='del'>-	e_time_format_date_and_time (&amp;tmp_tm,</div><div class='del'>-				     calendar_config_get_24_hour_format (), </div><div class='del'>-				     !tt_copy.is_date, FALSE,</div><div class='del'>-				     &amp;buffer[len], size - len);</div><div class='del'>-	if (etext != NULL)</div><div class='del'>-		strcat (buffer, etext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_date_label:</div><div class='del'>- * @dates: The dates to use in constructing a label</div><div class='del'>- * @label: The label whose text is to be set</div><div class='del'>- * </div><div class='del'>- * Set the text of a label based on the dates available and the user's</div><div class='del'>- * formatting preferences</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label)</div><div class='del'>-{</div><div class='del'>-	char buffer[1024];</div><div class='del'>-	gboolean start_set = FALSE, end_set = FALSE;</div><div class='del'>-	gboolean complete_set = FALSE, due_set = FALSE;</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-</div><div class='del'>-	if (dates-&gt;start &amp;&amp; !icaltime_is_null_time (*dates-&gt;start-&gt;value))</div><div class='del'>-		start_set = TRUE;</div><div class='del'>-	if (dates-&gt;end &amp;&amp; !icaltime_is_null_time (*dates-&gt;end-&gt;value))</div><div class='del'>-		end_set = TRUE;</div><div class='del'>-	if (dates-&gt;complete &amp;&amp; !icaltime_is_null_time (*dates-&gt;complete))</div><div class='del'>-		complete_set = TRUE;</div><div class='del'>-	if (dates-&gt;due &amp;&amp; !icaltime_is_null_time (*dates-&gt;due-&gt;value))</div><div class='del'>-		due_set = TRUE;</div><div class='del'>-</div><div class='del'>-	if (start_set)</div><div class='del'>-		write_label_piece (dates-&gt;start-&gt;value, buffer, 1024,</div><div class='del'>-				   NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (start_set &amp;&amp; end_set)</div><div class='del'>-		write_label_piece (dates-&gt;end-&gt;value, buffer, 1024,</div><div class='del'>-				   _(" to "), NULL, dates-&gt;start-&gt;value);</div><div class='del'>-</div><div class='del'>-	if (complete_set) {</div><div class='del'>-		if (start_set)</div><div class='del'>-			write_label_piece (dates-&gt;complete, buffer, 1024, _(" (Completed "), ")", NULL);</div><div class='del'>-		else</div><div class='del'>-			write_label_piece (dates-&gt;complete, buffer, 1024, _("Completed "), NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (due_set &amp;&amp; dates-&gt;complete == NULL) {</div><div class='del'>-		if (start_set)</div><div class='del'>-			write_label_piece (dates-&gt;due-&gt;value, buffer, 1024, _(" (Due "), ")", NULL);</div><div class='del'>-		else</div><div class='del'>-			write_label_piece (dates-&gt;due-&gt;value, buffer, 1024, _("Due "), NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (label), buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_new_date_edit:</div><div class='del'>- * @show_date: Whether to show a date picker in the widget.</div><div class='del'>- * @show_time: Whether to show a time picker in the widget.</div><div class='del'>- * @make_time_insensitive: Whether the time field is made insensitive rather</div><div class='del'>- * than hiding it. This is useful if you want to preserve the layout of the</div><div class='del'>- * widgets.</div><div class='del'>- * </div><div class='del'>- * Creates a new #EDateEdit widget, configured using the calendar's preferences.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created #EDateEdit widget.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-comp_editor_new_date_edit (gboolean show_date, gboolean show_time,</div><div class='del'>-			   gboolean make_time_insensitive)</div><div class='del'>-{</div><div class='del'>-	EDateEdit *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = E_DATE_EDIT (e_date_edit_new ());</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_show_date (dedit, show_date);</div><div class='del'>-	e_date_edit_set_show_time (dedit, show_time);</div><div class='del'>-#if 0</div><div class='del'>-	e_date_edit_set_make_time_insensitive (dedit, make_time_insensitive);</div><div class='del'>-#else</div><div class='del'>-	e_date_edit_set_make_time_insensitive (dedit, FALSE);</div><div class='del'>-#endif</div><div class='del'>-	calendar_config_configure_e_date_edit (dedit);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (dedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the current time, for EDateEdit widgets and ECalendar items in the</div><div class='del'>-   dialogs.</div><div class='del'>-   FIXME: Should probably use the timezone from somewhere in the component</div><div class='del'>-   rather than the current timezone. */</div><div class='del'>-struct tm</div><div class='del'>-comp_editor_get_current_time (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-</div><div class='del'>-	/* Get the current timezone. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Now copy it to the struct tm and return it. */</div><div class='del'>-	tmp_tm.tm_year  = tt.year - 1900;</div><div class='del'>-	tmp_tm.tm_mon   = tt.month - 1;</div><div class='del'>-	tmp_tm.tm_mday  = tt.day;</div><div class='del'>-	tmp_tm.tm_hour  = tt.hour;</div><div class='del'>-	tmp_tm.tm_min   = tt.minute;</div><div class='del'>-	tmp_tm.tm_sec   = tt.second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	return tmp_tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * These are utility functions to handle the SelectNames control we use</div><div class='del'>- * for the contacts field, and its related dialog.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Addressbook_SelectNames</div><div class='del'>-comp_editor_create_contacts_component (void)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0,</div><div class='del'>-						   NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without</div><div class='del'>-           raising an exception in `ev'.  */</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION</div><div class='del'>-	    || corba_select_names == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return corba_select_names;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-comp_editor_create_contacts_control (GNOME_Evolution_Addressbook_SelectNames corba_select_names)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Control corba_control;</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *name = _("Contacts");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_addSection (</div><div class='del'>-		corba_select_names, name, name, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_control =</div><div class='del'>-		GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (</div><div class='del'>-			corba_select_names, name, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	control_widget = bonobo_widget_new_control_from_objref (</div><div class='del'>-		corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (control_widget);</div><div class='del'>-</div><div class='del'>-	return control_widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Bonobo_EventSource_ListenerId</div><div class='del'>-comp_editor_connect_contacts_changed (GtkWidget *contacts_entry,</div><div class='del'>-				      BonoboListenerCallbackFn changed_cb,</div><div class='del'>-				      gpointer changed_cb_data)</div><div class='del'>-{</div><div class='del'>-	BonoboControlFrame *cf;</div><div class='del'>-	Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;</div><div class='del'>-</div><div class='del'>-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (contacts_entry));</div><div class='del'>-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);</div><div class='del'>-</div><div class='del'>-	return bonobo_event_source_client_add_listener (</div><div class='del'>-		pb, changed_cb,</div><div class='del'>-		"Bonobo/Property:change:entry_changed",</div><div class='del'>-		NULL, changed_cb_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-comp_editor_show_contacts_dialog (GNOME_Evolution_Addressbook_SelectNames corba_select_names)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (</div><div class='del'>-		corba_select_names, _("Contacts"), &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A simple 'name &lt;email&gt;' parser. Input should be UTF8.</div><div class='del'>-   FIXME: Should probably use camel functions or something. */</div><div class='del'>-static void</div><div class='del'>-parse_contact_string (const char *value, char **name, char **email)</div><div class='del'>-{</div><div class='del'>-	char *lbracket, *rbracket, *name_end, *tmp_name, *tmp_email;</div><div class='del'>-</div><div class='del'>-	if (!value) {</div><div class='del'>-		*name = g_strdup ("");</div><div class='del'>-		*email = g_strdup ("");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lbracket = g_utf8_strchr (value, '&lt;');</div><div class='del'>-	rbracket = g_utf8_strchr (value, '&gt;');</div><div class='del'>-</div><div class='del'>-	if (!lbracket || !rbracket || rbracket &lt; lbracket) {</div><div class='del'>-		*name = g_strdup (value);</div><div class='del'>-		*email = g_strdup ("");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name_end = g_utf8_prev_char (lbracket);</div><div class='del'>-	while (name_end &gt; value &amp;&amp; g_unichar_isspace (g_utf8_get_char (name_end)))</div><div class='del'>-		name_end = g_utf8_prev_char (name_end);</div><div class='del'>-</div><div class='del'>-	tmp_name = g_malloc (name_end - value + 2);</div><div class='del'>-	strncpy (tmp_name, value, name_end - value + 1);</div><div class='del'>-	tmp_name[name_end - value + 1] = '\0';</div><div class='del'>-	*name = tmp_name;</div><div class='del'>-</div><div class='del'>-	tmp_email = g_malloc (rbracket - lbracket);</div><div class='del'>-	strncpy (tmp_email, lbracket + 1, rbracket - lbracket - 1);</div><div class='del'>-	tmp_email[rbracket - lbracket - 1] = '\0';</div><div class='del'>-	*email = tmp_email;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Parsed: %s\n  Name:'%s'\nEmail:'%s'\n",</div><div class='del'>-		 value, *name, *email);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-comp_editor_contacts_to_widget (GtkWidget *contacts_entry,</div><div class='del'>-				CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *dest_array;</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	GSList *contact_list, *elem;</div><div class='del'>-	char *contacts_string;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cal_component_get_contact_list (comp, &amp;contact_list);</div><div class='del'>-	dest_array = g_ptr_array_new ();</div><div class='del'>-	for (elem = contact_list; elem; elem = elem-&gt;next) {</div><div class='del'>-		CalComponentText *t = elem-&gt;data;</div><div class='del'>-		char *name, *email;</div><div class='del'>-</div><div class='del'>-		parse_contact_string (t-&gt;value, &amp;name, &amp;email);</div><div class='del'>-</div><div class='del'>-		dest = e_destination_new ();</div><div class='del'>-		e_destination_set_name (dest, name);</div><div class='del'>-		e_destination_set_email (dest, email);</div><div class='del'>-		g_ptr_array_add (dest_array, dest);</div><div class='del'>-		g_free (name);</div><div class='del'>-		g_free (email);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (contact_list);</div><div class='del'>-</div><div class='del'>-	/* we need destv to be NULL terminated */</div><div class='del'>-	g_ptr_array_add (dest_array, NULL);</div><div class='del'>-</div><div class='del'>-	contacts_string = e_destination_exportv ((EDestination**) dest_array-&gt;pdata);</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Destinations: %s\n", contacts_string ? contacts_string : "");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (contacts_entry),</div><div class='del'>-				    "destinations", contacts_string, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (contacts_string);</div><div class='del'>-</div><div class='del'>-	/* We free all dest_array except the last NULL we added. */</div><div class='del'>-	for (i = 0; i &lt; dest_array-&gt;len - 1; i++) {</div><div class='del'>-		dest = g_ptr_array_index (dest_array, i);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (dest_array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-comp_editor_contacts_to_component (GtkWidget *contacts_entry,</div><div class='del'>-				   CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EDestination **contact_destv;</div><div class='del'>-	GSList *contact_list = NULL, *elem;</div><div class='del'>-	char *contacts_string = NULL;</div><div class='del'>-	CalComponentText *t;</div><div class='del'>-	const char *name, *email;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (contacts_entry),</div><div class='del'>-				    "destinations", &amp;contacts_string, NULL);</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Contacts string: %s\n", contacts_string ? contacts_string : "");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	contact_destv = e_destination_importv (contacts_string);</div><div class='del'>-	if (contact_destv) {</div><div class='del'>-		for (i = 0; contact_destv[i] != NULL; i++) {</div><div class='del'>-			name = e_destination_get_name (contact_destv[i]);</div><div class='del'>-			email = e_destination_get_email (contact_destv[i]);</div><div class='del'>-</div><div class='del'>-			t = g_new0 (CalComponentText, 1);</div><div class='del'>-			t-&gt;altrep = NULL;</div><div class='del'>-</div><div class='del'>-			/* If both name and email are given, use the standard</div><div class='del'>-			   '"name" &lt;email&gt;' form, otherwise use just the name</div><div class='del'>-			   or the email address.</div><div class='del'>-			   FIXME: I'm not sure this is correct syntax etc. */</div><div class='del'>-			if (name &amp;&amp; name[0] &amp;&amp; email &amp;&amp; email[0])</div><div class='del'>-				t-&gt;value = g_strdup_printf ("\"%s\" &lt;%s&gt;",</div><div class='del'>-							    name, email);</div><div class='del'>-			else if (name &amp;&amp; name[0])</div><div class='del'>-				t-&gt;value = g_strdup_printf ("\"%s\"",</div><div class='del'>-							    name);</div><div class='del'>-			else</div><div class='del'>-				t-&gt;value = g_strdup_printf ("&lt;%s&gt;",</div><div class='del'>-							    email);</div><div class='del'>-</div><div class='del'>-			contact_list = g_slist_prepend (contact_list, t);</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (contact_destv[i]));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free (contact_destv);</div><div class='del'>-</div><div class='del'>-	contact_list = g_slist_reverse (contact_list);</div><div class='del'>-	cal_component_set_contact_list (comp, contact_list);</div><div class='del'>-</div><div class='del'>-	for (elem = contact_list; elem; elem = elem-&gt;next) {</div><div class='del'>-		t = elem-&gt;data;</div><div class='del'>-		g_free ((char*)t-&gt;value);</div><div class='del'>-		g_free (t);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free (contact_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_strip_categories:</div><div class='del'>- * @categories: A string of category names entered by the user.</div><div class='del'>- * </div><div class='del'>- * Takes a string of the form "categ, categ, categ, ..." and removes the</div><div class='del'>- * whitespace between categories to result in "categ,categ,categ,..."</div><div class='del'>- * </div><div class='del'>- * Return value: The category names stripped of surrounding whitespace</div><div class='del'>- * and separated with commas.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-comp_editor_strip_categories (const char *categories)</div><div class='del'>-{</div><div class='del'>-	char *new_categories;</div><div class='del'>-	const char *start, *end;</div><div class='del'>-	const char *p;</div><div class='del'>-	char *new_p;</div><div class='del'>-</div><div class='del'>-	if (!categories)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	new_categories = g_new (char, strlen (categories) + 1);</div><div class='del'>-</div><div class='del'>-	start = end = NULL;</div><div class='del'>-	new_p = new_categories;</div><div class='del'>-</div><div class='del'>-	for (p = categories; *p; p++) {</div><div class='del'>-		int c;</div><div class='del'>-</div><div class='del'>-		c = *p;</div><div class='del'>-</div><div class='del'>-		if (isspace (c))</div><div class='del'>-			continue;</div><div class='del'>-		else if (c == ',') {</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			if (!start)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			g_assert (start &lt;= end);</div><div class='del'>-</div><div class='del'>-			len = end - start + 1;</div><div class='del'>-			strncpy (new_p, start, len);</div><div class='del'>-			new_p[len] = ',';</div><div class='del'>-			new_p += len + 1;</div><div class='del'>-</div><div class='del'>-			start = end = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			if (!start) {</div><div class='del'>-				start = p;</div><div class='del'>-				end = p;</div><div class='del'>-			} else</div><div class='del'>-				end = p;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start) {</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		g_assert (start &lt;= end);</div><div class='del'>-</div><div class='del'>-		len = end - start + 1;</div><div class='del'>-		strncpy (new_p, start, len);</div><div class='del'>-		new_p += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*new_p = '\0';</div><div class='del'>-</div><div class='del'>-	return new_categories;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h<br/>deleted file mode 100644<br/>index 948b34221c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* Evolution calendar - Widget utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _COMP_EDITOR_UTIL_H_</div><div class='del'>-#define _COMP_EDITOR_UTIL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-void comp_editor_dates (CompEditorPageDates *date, CalComponent *comp);</div><div class='del'>-void comp_editor_free_dates (CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label);</div><div class='del'>-</div><div class='del'>-GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,</div><div class='del'>-				      gboolean make_time_insensitive);</div><div class='del'>-</div><div class='del'>-struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Addressbook_SelectNames comp_editor_create_contacts_component (void);</div><div class='del'>-GtkWidget * comp_editor_create_contacts_control (GNOME_Evolution_Addressbook_SelectNames corba_select_names);</div><div class='del'>-Bonobo_EventSource_ListenerId comp_editor_connect_contacts_changed (GtkWidget *contacts_entry,</div><div class='del'>-								    BonoboListenerCallbackFn changed_cb,</div><div class='del'>-								    gpointer changed_cb_data);</div><div class='del'>-void comp_editor_show_contacts_dialog (GNOME_Evolution_Addressbook_SelectNames corba_select_names);</div><div class='del'>-</div><div class='del'>-void comp_editor_contacts_to_widget (GtkWidget *contacts_entry,</div><div class='del'>-				     CalComponent *comp);</div><div class='del'>-void comp_editor_contacts_to_component (GtkWidget *contacts_entry,</div><div class='del'>-					CalComponent *comp);</div><div class='del'>-</div><div class='del'>-char *comp_editor_strip_categories (const char *categories);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c<br/>deleted file mode 100644<br/>index cad55ebf08..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1259 +0,0 @@</div><div class='del'>-/* Evolution calendar - Framework for a calendar component editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-window-icon.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-container.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-utils.h&gt;</div><div class='del'>-#include &lt;evolution-shell-component-utils.h&gt;</div><div class='del'>-#include "../print.h"</div><div class='del'>-#include "save-comp.h"</div><div class='del'>-#include "delete-comp.h"</div><div class='del'>-#include "send-comp.h"</div><div class='del'>-#include "changed-comp.h"</div><div class='del'>-#include "comp-editor.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CompEditor structure */</div><div class='del'>-struct _CompEditorPrivate {</div><div class='del'>-	/* Client to use */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Calendar object/uid we are editing; this is an internal copy */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* The pages we have */</div><div class='del'>-	GList *pages;</div><div class='del'>-</div><div class='del'>-	/* UI Component for the dialog */</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	/* Notebook to hold the pages */</div><div class='del'>-	GtkNotebook *notebook;</div><div class='del'>-</div><div class='del'>-	GtkWidget *filesel;</div><div class='del'>-</div><div class='del'>-	gboolean changed;</div><div class='del'>-	gboolean needs_send;</div><div class='del'>-	gboolean needs_send_new;</div><div class='del'>-	gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void comp_editor_class_init (CompEditorClass *class);</div><div class='del'>-static void comp_editor_init (CompEditor *editor);</div><div class='del'>-static gint comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e);</div><div class='del'>-static void comp_editor_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void real_set_cal_client (CompEditor *editor, CalClient *client);</div><div class='del'>-static void real_edit_comp (CompEditor *editor, CalComponent *comp);</div><div class='del'>-static void real_send_comp (CompEditor *editor, CalComponentItipMethod method);</div><div class='del'>-static gboolean prompt_to_save_changes (CompEditor *editor, gboolean send);</div><div class='del'>-static void delete_comp (CompEditor *editor);</div><div class='del'>-static void close_dialog (CompEditor *editor);</div><div class='del'>-</div><div class='del'>-static void page_changed_cb (GtkObject *obj, gpointer data);</div><div class='del'>-static void page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data);</div><div class='del'>-static void page_dates_changed_cb (GtkObject *obj, CompEditorPageDates *dates, gpointer data);</div><div class='del'>-</div><div class='del'>-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);</div><div class='del'>-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);</div><div class='del'>-</div><div class='del'>-static void save_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void save_close_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void save_as_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void delete_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void print_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void print_preview_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void print_setup_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void close_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static gint delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps [] =</div><div class='del'>-{</div><div class='del'>-	E_PIXMAP ("/menu/File/FileSave",			"save-16.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/FileSaveAndClose",		"save-16.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/FileSaveAs",			"save-as-16.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/menu/File/FileDelete",			"evolution-trash-mini.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/menu/File/FilePrint",			"print.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/FilePrintPreview",		"print-preview.xpm"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP ("/Toolbar/FileSaveAndClose",		        "buttons/save-24.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/FilePrint",			        "buttons/print.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/FileDelete",			"buttons/delete-message.png"),</div><div class='del'>-</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSave", save_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", save_close_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSaveAs", save_as_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileDelete", delete_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FilePrint", print_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FilePrintPreview", print_preview_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FilePrintSetup", print_setup_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileClose", close_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-comp_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType comp_editor_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!comp_editor_type) {</div><div class='del'>-		static const GtkTypeInfo comp_editor_info = {</div><div class='del'>-			"CompEditor",</div><div class='del'>-			sizeof (CompEditor),</div><div class='del'>-			sizeof (CompEditorClass),</div><div class='del'>-			(GtkClassInitFunc) comp_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) comp_editor_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		comp_editor_type = gtk_type_unique (BONOBO_TYPE_WINDOW,</div><div class='del'>-						    &amp;comp_editor_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return comp_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar component editor */</div><div class='del'>-static void</div><div class='del'>-comp_editor_class_init (CompEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_TYPE_WINDOW);</div><div class='del'>-</div><div class='del'>-	klass-&gt;set_cal_client = real_set_cal_client;</div><div class='del'>-	klass-&gt;edit_comp = real_edit_comp;</div><div class='del'>-	klass-&gt;send_comp = real_send_comp;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;key_press_event = comp_editor_key_press_event;</div><div class='del'>-	object_class-&gt;destroy = comp_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the basic in the editor */</div><div class='del'>-static void</div><div class='del'>-setup_widgets (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Window and basic vbox */</div><div class='del'>-	bonobo_window_construct (BONOBO_WINDOW (editor),</div><div class='del'>-				 "event-editor", "iCalendar Editor");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (editor), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_event_cb), editor);</div><div class='del'>-</div><div class='del'>-	priv-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor));</div><div class='del'>-	bonobo_ui_component_set_container (priv-&gt;uic, BONOBO_OBJREF (container));</div><div class='del'>-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (editor)),</div><div class='del'>-					  "/evolution/UIConf/kvps");</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (priv-&gt;uic, verbs, editor);</div><div class='del'>-	bonobo_ui_util_set_ui (priv-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-comp-editor.xml",</div><div class='del'>-			       "evolution-calendar");</div><div class='del'>-	e_pixmaps_update (priv-&gt;uic, pixmaps);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);</div><div class='del'>-	bonobo_window_set_contents (BONOBO_WINDOW (editor), vbox);</div><div class='del'>-</div><div class='del'>-	/* Notebook */</div><div class='del'>-	priv-&gt;notebook = GTK_NOTEBOOK (gtk_notebook_new ());</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (priv-&gt;notebook));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv-&gt;notebook),</div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar component editor */</div><div class='del'>-static void</div><div class='del'>-comp_editor_init (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CompEditorPrivate, 1);</div><div class='del'>-	editor-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	setup_widgets (editor);</div><div class='del'>-</div><div class='del'>-	priv-&gt;pages = NULL;</div><div class='del'>-	priv-&gt;changed = FALSE;</div><div class='del'>-	priv-&gt;needs_send = FALSE;</div><div class='del'>-	priv-&gt;needs_send_new = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-comp_editor_key_press_event (GtkWidget *d, GdkEventKey *e)</div><div class='del'>-{</div><div class='del'>-	if (e-&gt;keyval == GDK_Escape) {</div><div class='del'>-		if (prompt_to_save_changes (COMP_EDITOR (d), TRUE))</div><div class='del'>-			close_dialog (COMP_EDITOR (d));</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;key_press_event)</div><div class='del'>-		return (* GTK_WIDGET_CLASS (parent_class)-&gt;key_press_event) (d, e);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar component editor */</div><div class='del'>-static void</div><div class='del'>-comp_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor;</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	editor = COMP_EDITOR (object);</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client), editor);</div><div class='del'>-</div><div class='del'>-	/* We want to destroy the pages after the widgets get destroyed,</div><div class='del'>-	   since they have lots of signal handlers connected to the widgets</div><div class='del'>-	   with the pages as the data. */</div><div class='del'>-	for (l = priv-&gt;pages; l != NULL; l = l-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (l-&gt;data));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	editor-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-save_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	CalComponent *clone;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;changed)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	clone = cal_component_clone (priv-&gt;comp);</div><div class='del'>-	for (l = priv-&gt;pages; l != NULL; l = l-&gt;next) {</div><div class='del'>-		if (!comp_editor_page_fill_component (l-&gt;data, clone)) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (clone));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	cal_component_commit_sequence (clone);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-	priv-&gt;comp = clone;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, priv-&gt;comp)) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-</div><div class='del'>-		dlg = gnome_error_dialog (_("Could not update object!"));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;changed = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-save_comp_with_send (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	gboolean send;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	send = priv-&gt;changed &amp;&amp; priv-&gt;needs_send;</div><div class='del'>-</div><div class='del'>-	if (!save_comp (editor))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (send &amp;&amp; send_component_dialog (priv-&gt;comp, priv-&gt;needs_send_new))</div><div class='del'>-		comp_editor_send_comp (editor, CAL_COMPONENT_METHOD_REQUEST);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-	cal_client_remove_object (priv-&gt;client, uid);</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-	close_dialog (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-prompt_to_save_changes (CompEditor *editor, gboolean send)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;changed)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	switch (save_component_dialog (GTK_WINDOW (editor))) {</div><div class='del'>-	case 0: /* Save */</div><div class='del'>-		if (send &amp;&amp; save_comp_with_send (editor))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else if (!send &amp;&amp; save_comp (editor))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	case 1: /* Discard */</div><div class='del'>-		return TRUE;</div><div class='del'>-	case 2: /* Cancel */</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Closes the dialog box and emits the appropriate signals */</div><div class='del'>-static void</div><div class='del'>-close_dialog (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (editor));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_set_changed:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @changed: Value to set the changed state to</div><div class='del'>- *</div><div class='del'>- * Set the dialog changed state to the given value</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_set_changed (CompEditor *editor, gboolean changed)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;changed = changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_get_changed:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- *</div><div class='del'>- * Gets the changed state of the dialog</div><div class='del'>- *</div><div class='del'>- * Return value: A boolean indicating if the dialog is in a changed</div><div class='del'>- * state</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-comp_editor_get_changed (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_set_needs_send:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @needs_send: Value to set the needs send state to</div><div class='del'>- *</div><div class='del'>- * Set the dialog needs send state to the given value</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_set_needs_send (CompEditor *editor, gboolean needs_send)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;needs_send = needs_send;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_get_needs_send:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- *</div><div class='del'>- * Gets the needs send state of the dialog</div><div class='del'>- *</div><div class='del'>- * Return value: A boolean indicating if the dialog is in a needs send</div><div class='del'>- * state</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-comp_editor_get_needs_send (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;needs_send;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void page_mapped_cb (GtkWidget *page_widget,</div><div class='del'>-			    CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (page_widget);</div><div class='del'>-	if (!GTK_IS_WINDOW (toplevel))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (page-&gt;accel_group) {</div><div class='del'>-		gtk_window_add_accel_group (GTK_WINDOW (toplevel),</div><div class='del'>-					    page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void page_unmapped_cb (GtkWidget *page_widget,</div><div class='del'>-			      CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (page_widget);</div><div class='del'>-	if (!GTK_IS_WINDOW (toplevel))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (page-&gt;accel_group) {</div><div class='del'>-		gtk_window_remove_accel_group (GTK_WINDOW (toplevel),</div><div class='del'>-					       page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_append_page:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @page: A component editor page</div><div class='del'>- * @label: Label of the page</div><div class='del'>- *</div><div class='del'>- * Appends a page to the editor notebook with the given label</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_append_page (CompEditor *editor,</div><div class='del'>-			 CompEditorPage *page,</div><div class='del'>-			 const char *label)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GtkWidget *page_widget;</div><div class='del'>-	GtkWidget *label_widget;</div><div class='del'>-	gboolean is_first_page;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-	g_return_if_fail (label != NULL);</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (page));</div><div class='del'>-</div><div class='del'>-	/* If we are editing something, fill the widgets with current info */</div><div class='del'>-	if (priv-&gt;comp != NULL) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = comp_editor_get_current_comp (editor);</div><div class='del'>-		comp_editor_page_fill_widgets (page, comp);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	page_widget = comp_editor_page_get_widget (page);</div><div class='del'>-	g_assert (page_widget != NULL);</div><div class='del'>-</div><div class='del'>-	label_widget = gtk_label_new (label);</div><div class='del'>-</div><div class='del'>-	is_first_page = (priv-&gt;pages == NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;pages = g_list_append (priv-&gt;pages, page);</div><div class='del'>-	gtk_notebook_append_page (priv-&gt;notebook, page_widget, label_widget);</div><div class='del'>-</div><div class='del'>-	/* Listen for things happening on the page */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (page), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (page_changed_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (page), "summary_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (page_summary_changed_cb), editor);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (page), "dates_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (page_dates_changed_cb), editor);</div><div class='del'>-</div><div class='del'>-	/* Listen for when the page is mapped/unmapped so we can</div><div class='del'>-	   install/uninstall the appropriate GtkAccelGroup. */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (page_widget), "map",</div><div class='del'>-			    GTK_SIGNAL_FUNC (page_mapped_cb), page);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (page_widget), "unmap",</div><div class='del'>-			    GTK_SIGNAL_FUNC (page_unmapped_cb), page);</div><div class='del'>-</div><div class='del'>-	/* The first page is the main page of the editor, so we ask it to focus</div><div class='del'>-	 * its main widget.</div><div class='del'>-	 */</div><div class='del'>-	if (is_first_page)</div><div class='del'>-		comp_editor_page_focus_main_widget (page);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_remove_page:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @page: A component editor page</div><div class='del'>- *</div><div class='del'>- * Removes the page from the component editor</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_remove_page (CompEditor *editor, CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GtkWidget *page_widget;</div><div class='del'>-	gint page_num;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page_widget = comp_editor_page_get_widget (page);</div><div class='del'>-	page_num = gtk_notebook_page_num (priv-&gt;notebook, page_widget);</div><div class='del'>-	if (page_num == -1)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* Disconnect all the signals added in append_page(). */</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (page), editor);</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (page_widget), page);</div><div class='del'>-</div><div class='del'>-	gtk_notebook_remove_page (priv-&gt;notebook, page_num);</div><div class='del'>-</div><div class='del'>-	priv-&gt;pages = g_list_remove (priv-&gt;pages, page);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_show_page:</div><div class='del'>- * @editor:</div><div class='del'>- * @page:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_show_page (CompEditor *editor, CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GtkWidget *page_widget;</div><div class='del'>-	gint page_num;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-	g_return_if_fail (page != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page_widget = comp_editor_page_get_widget (page);</div><div class='del'>-	page_num = gtk_notebook_page_num (priv-&gt;notebook, page_widget);</div><div class='del'>-	gtk_notebook_set_page (priv-&gt;notebook, page_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_set_cal_client:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @client: The calendar client to use</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client used by the editor to update components</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_set_cal_client (CompEditor *editor, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CompEditorClass *klass;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)-&gt;klass);</div><div class='del'>-</div><div class='del'>-	if (klass-&gt;set_cal_client)</div><div class='del'>-		klass-&gt;set_cal_client (editor, client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_get_cal_client:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- *</div><div class='del'>- * Returns the calendar client of the editor</div><div class='del'>- *</div><div class='del'>- * Return value: The calendar client of the editor</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-comp_editor_get_cal_client (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (editor != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates an appropriate title for the event editor dialog */</div><div class='del'>-static char *</div><div class='del'>-make_title_from_comp (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	char *title;</div><div class='del'>-	const char *type_string;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-</div><div class='del'>-	if (!comp)</div><div class='del'>-		return g_strdup (_("Edit Appointment"));</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		type_string = _("Appointment - %s");</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		type_string = _("Task - %s");</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		type_string = _("Journal entry - %s");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	if (text.value) {</div><div class='del'>-		char *summary;</div><div class='del'>-		summary = e_utf8_to_locale_string (text.value);</div><div class='del'>-		title = g_strdup_printf (type_string, summary);</div><div class='del'>-		g_free (summary);</div><div class='del'>-	} else</div><div class='del'>-		title = g_strdup_printf (type_string, _("No summary"));</div><div class='del'>-</div><div class='del'>-	return title;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-make_icon_from_comp (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-</div><div class='del'>-	if (!comp)</div><div class='del'>-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		return EVOLUTION_ICONSDIR "/buttons/new_appointment.png";</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		return EVOLUTION_ICONSDIR "/buttons/new_task.png";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return EVOLUTION_ICONSDIR "/evolution-calendar-mini.png";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the event editor's window title from a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_title_from_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	char *title;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-	title = make_title_from_comp (priv-&gt;comp);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (editor), title);</div><div class='del'>-	g_free (title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_icon_from_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	const char *file;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-	file = make_icon_from_comp (priv-&gt;comp);</div><div class='del'>-	gnome_window_icon_set_from_file (GTK_WINDOW (editor), file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_widgets (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;pages; l != NULL; l = l-&gt;next)</div><div class='del'>-		comp_editor_page_fill_widgets (l-&gt;data, priv-&gt;comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_set_cal_client (CompEditor *editor, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GList *elem;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (client == priv-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client) {</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-		g_return_if_fail (cal_client_get_load_state (client) ==</div><div class='del'>-				  CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client),</div><div class='del'>-					       editor);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	/* Pass the client to any pages that need it. */</div><div class='del'>-	for (elem = priv-&gt;pages; elem; elem = elem-&gt;next)</div><div class='del'>-		comp_editor_page_set_cal_client (elem-&gt;data, client);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_updated_cb), editor);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_removed_cb), editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_edit_comp (CompEditor *editor, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp)</div><div class='del'>-		priv-&gt;comp = cal_component_clone (comp);</div><div class='del'>-</div><div class='del'>-	priv-&gt;needs_send_new = !priv-&gt;needs_send;</div><div class='del'>-	</div><div class='del'>-	set_title_from_comp (editor);</div><div class='del'>-	set_icon_from_comp (editor);</div><div class='del'>-	fill_widgets (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_send_comp (CompEditor *editor, CalComponentItipMethod method)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	itip_send_comp (method, priv-&gt;comp, priv-&gt;client, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_edit_comp:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- * @comp: A calendar component</div><div class='del'>- *</div><div class='del'>- * Starts the editor editing the given component</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_edit_comp (CompEditor *editor, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CompEditorClass *klass;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)-&gt;klass);</div><div class='del'>-</div><div class='del'>-	if (klass-&gt;edit_comp)</div><div class='del'>-		klass-&gt;edit_comp (editor, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CalComponent *</div><div class='del'>-comp_editor_get_current_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (editor != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_COMP_EDITOR (editor), NULL);</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp = cal_component_clone (priv-&gt;comp);</div><div class='del'>-	if (priv-&gt;changed) {</div><div class='del'>-		for (l = priv-&gt;pages; l != NULL; l = l-&gt;next)</div><div class='del'>-			comp_editor_page_fill_component (l-&gt;data, comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_save_comp:</div><div class='del'>- * @editor:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-comp_editor_save_comp (CompEditor *editor, gboolean send)</div><div class='del'>-{</div><div class='del'>-	return prompt_to_save_changes (editor, send);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_delete_comp:</div><div class='del'>- * @editor:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_delete_comp (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	delete_comp (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_send_comp:</div><div class='del'>- * @editor:</div><div class='del'>- * @method:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)</div><div class='del'>-{</div><div class='del'>-	CompEditorClass *klass;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)-&gt;klass);</div><div class='del'>-</div><div class='del'>-	if (klass-&gt;send_comp)</div><div class='del'>-		klass-&gt;send_comp (editor, method);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_merge_ui:</div><div class='del'>- * @editor:</div><div class='del'>- * @filename:</div><div class='del'>- * @verbs:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_merge_ui (CompEditor *editor, const char *filename, BonoboUIVerb *verbs)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (priv-&gt;uic, EVOLUTION_DATADIR, filename, "evolution-calendar");</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (priv-&gt;uic, verbs, editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_set_ui_prop:</div><div class='del'>- * @editor:</div><div class='del'>- * @path:</div><div class='del'>- * @attr:</div><div class='del'>- * @val:</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_set_ui_prop (CompEditor *editor,</div><div class='del'>-			 const char *path,</div><div class='del'>-			 const char *attr,</div><div class='del'>-			 const char *val)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (priv-&gt;uic, path, attr, val, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Brings attention to a window by raising it and giving it focus */</div><div class='del'>-static void</div><div class='del'>-raise_and_focus (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_assert (GTK_WIDGET_REALIZED (widget));</div><div class='del'>-	gdk_window_show (widget-&gt;window);</div><div class='del'>-	gtk_widget_grab_focus (widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * comp_editor_focus:</div><div class='del'>- * @editor: A component editor</div><div class='del'>- *</div><div class='del'>- * Brings the editor window to the front and gives it focus</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-comp_editor_focus (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-	g_return_if_fail (IS_COMP_EDITOR (editor));</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (editor));</div><div class='del'>-	raise_and_focus (GTK_WIDGET (editor));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This sets the focus to the toplevel, so any field being edited is committed.</div><div class='del'>-   FIXME: In future we may also want to check some of the fields are valid,</div><div class='del'>-   e.g. the EDateEdit fields. */</div><div class='del'>-static void</div><div class='del'>-commit_all_fields (CompEditor *editor)</div><div class='del'>-{</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_window_set_focus (GTK_WINDOW (editor), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu Commands */</div><div class='del'>-static void</div><div class='del'>-save_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	save_comp_with_send (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_close_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	if (save_comp_with_send (editor))</div><div class='del'>-		close_dialog (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *ical_string;</div><div class='del'>-	FILE *file;</div><div class='del'>-	</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	filename = e_file_dialog_save (_("Save as..."));</div><div class='del'>-	if (filename == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	ical_string = cal_client_get_component_as_string (priv-&gt;client, priv-&gt;comp);</div><div class='del'>-	if (ical_string == NULL) {</div><div class='del'>-		g_warning ("Couldn't convert item to a string");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	file = fopen (filename, "w");</div><div class='del'>-	if (file == NULL) {</div><div class='del'>-		g_warning ("Couldn't save item");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fprintf (file, ical_string);</div><div class='del'>-	g_free (ical_string);</div><div class='del'>-	fclose (file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	if (delete_component_dialog (priv-&gt;comp, FALSE, 1, vtype, GTK_WIDGET (editor)))</div><div class='del'>-		delete_comp (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	comp = comp_editor_get_current_comp (editor);</div><div class='del'>-	print_comp (comp, editor-&gt;priv-&gt;client, FALSE);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_preview_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	comp = comp_editor_get_current_comp (editor);</div><div class='del'>-	print_comp (comp, editor-&gt;priv-&gt;client, TRUE);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_setup_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	print_setup ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	commit_all_fields (editor);</div><div class='del'>-</div><div class='del'>-	if (prompt_to_save_changes (editor, TRUE))</div><div class='del'>-		close_dialog (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-page_changed_cb (GtkObject *obj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Page signal callbacks */</div><div class='del'>-static void</div><div class='del'>-page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;pages; l != NULL; l = l-&gt;next)</div><div class='del'>-		if (obj != l-&gt;data)</div><div class='del'>-			comp_editor_page_set_summary (l-&gt;data, summary);</div><div class='del'>-</div><div class='del'>-	priv-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-page_dates_changed_cb (GtkObject *obj,</div><div class='del'>-		       CompEditorPageDates *dates,</div><div class='del'>-		       gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;pages; l != NULL; l = l-&gt;next)</div><div class='del'>-		if (obj != l-&gt;data)</div><div class='del'>-			comp_editor_page_set_dates (l-&gt;data, dates);</div><div class='del'>-</div><div class='del'>-	priv-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp = NULL;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const char *edit_uid;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;edit_uid);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (uid, edit_uid) &amp;&amp; !priv-&gt;updating) {</div><div class='del'>-		if (changed_component_dialog (priv-&gt;comp, FALSE, priv-&gt;changed)) {</div><div class='del'>-			status = cal_client_get_object (priv-&gt;client, uid, &amp;comp);</div><div class='del'>-			if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-				comp_editor_edit_comp (editor, comp);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			} else {</div><div class='del'>-				GtkWidget *dlg;</div><div class='del'>-</div><div class='del'>-				dlg = gnome_error_dialog (_("Unable to obtain current version!"));</div><div class='del'>-				gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_removed_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-	const char *edit_uid;</div><div class='del'>-</div><div class='del'>-	priv = editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;edit_uid);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (uid, edit_uid) &amp;&amp; !priv-&gt;updating) {</div><div class='del'>-		if (changed_component_dialog (priv-&gt;comp, TRUE, priv-&gt;changed))</div><div class='del'>-			close_dialog (editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CompEditor *editor = COMP_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	if (prompt_to_save_changes (editor, TRUE))</div><div class='del'>-		close_dialog (editor);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h<br/>deleted file mode 100644<br/>index f789515ab1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/comp-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/comp-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,99 +0,0 @@</div><div class='del'>-/* Evolution calendar - Framework for a calendar component editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef COMP_EDITOR_H</div><div class='del'>-#define COMP_EDITOR_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-win.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-engine.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include "cal-client.h"</div><div class='del'>-#include "../itip-utils.h"</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_COMP_EDITOR            (comp_editor_get_type ())</div><div class='del'>-#define COMP_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR, CompEditor))</div><div class='del'>-#define COMP_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass))</div><div class='del'>-#define IS_COMP_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR))</div><div class='del'>-#define IS_COMP_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR))</div><div class='del'>-</div><div class='del'>-typedef struct _CompEditorPrivate CompEditorPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboWindow object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CompEditorPrivate *priv;</div><div class='del'>-} CompEditor;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboWindowClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual functions */</div><div class='del'>-	void (* set_cal_client) (CompEditor *page, CalClient *client);</div><div class='del'>-	void (* edit_comp) (CompEditor *page, CalComponent *comp);</div><div class='del'>-	void (* send_comp) (CompEditor *page, CalComponentItipMethod method);</div><div class='del'>-} CompEditorClass;</div><div class='del'>-</div><div class='del'>-GtkType       comp_editor_get_type         (void);</div><div class='del'>-void          comp_editor_set_changed      (CompEditor             *editor,</div><div class='del'>-					    gboolean                changed);</div><div class='del'>-gboolean      comp_editor_get_changed      (CompEditor             *editor);</div><div class='del'>-void          comp_editor_set_needs_send   (CompEditor             *editor,</div><div class='del'>-					    gboolean                needs_send);</div><div class='del'>-gboolean      comp_editor_get_needs_send   (CompEditor             *editor);</div><div class='del'>-void          comp_editor_append_page      (CompEditor             *editor,</div><div class='del'>-					    CompEditorPage         *page,</div><div class='del'>-					    const char             *label);</div><div class='del'>-void          comp_editor_remove_page      (CompEditor             *editor,</div><div class='del'>-					    CompEditorPage         *page);</div><div class='del'>-void          comp_editor_show_page        (CompEditor             *editor,</div><div class='del'>-					    CompEditorPage         *page);</div><div class='del'>-void          comp_editor_set_cal_client   (CompEditor             *editor,</div><div class='del'>-					    CalClient              *client);</div><div class='del'>-CalClient    *comp_editor_get_cal_client   (CompEditor             *editor);</div><div class='del'>-void          comp_editor_edit_comp        (CompEditor             *ee,</div><div class='del'>-					    CalComponent           *comp);</div><div class='del'>-CalComponent *comp_editor_get_current_comp (CompEditor             *editor);</div><div class='del'>-gboolean      comp_editor_save_comp        (CompEditor             *editor,</div><div class='del'>-					    gboolean                send);</div><div class='del'>-void          comp_editor_delete_comp      (CompEditor             *editor);</div><div class='del'>-void          comp_editor_send_comp        (CompEditor             *editor,</div><div class='del'>-					    CalComponentItipMethod  method);</div><div class='del'>-void          comp_editor_merge_ui         (CompEditor             *editor,</div><div class='del'>-					    const char             *filename,</div><div class='del'>-					    BonoboUIVerb           *verbs);</div><div class='del'>-void          comp_editor_set_ui_prop      (CompEditor             *editor,</div><div class='del'>-					    const char             *path,</div><div class='del'>-					    const char             *attr,</div><div class='del'>-					    const char             *val);</div><div class='del'>-void          comp_editor_focus            (CompEditor             *editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c<br/>deleted file mode 100644<br/>index 405a9445b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/delete-comp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/delete-comp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,165 +0,0 @@</div><div class='del'>-/* Evolution calendar - Delete calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "widgets/misc/e-messagebox.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "delete-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * delete_component_dialog:</div><div class='del'>- * @comp: A calendar component if a single component is to be deleted, or NULL</div><div class='del'>- * if more that one component is to be deleted.</div><div class='del'>- * @consider_as_untitled: If deleting more than one component, this is ignored.</div><div class='del'>- * Otherwise, whether to consider the component as not having a summary; if</div><div class='del'>- * FALSE then the component's summary string will be used.</div><div class='del'>- * @n_comps: Number of components that are to be deleted.</div><div class='del'>- * @vtype: Type of the components that are to be deleted.  This is ignored</div><div class='del'>- * if only one component is to be deleted, and the vtype is extracted from</div><div class='del'>- * the component instead.</div><div class='del'>- * @widget: A widget to use as a basis for conversion from UTF8 into font</div><div class='del'>- * encoding.</div><div class='del'>- * </div><div class='del'>- * Pops up a dialog box asking the user whether he wants to delete a number of</div><div class='del'>- * calendar components.  The dialog will not appear, however, if the</div><div class='del'>- * configuration option for confirmation is turned off.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the user clicked Yes, FALSE otherwise.  If the</div><div class='del'>- * configuration option for confirmation is turned off, this function will</div><div class='del'>- * unconditionally return TRUE.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-delete_component_dialog (CalComponent *comp,</div><div class='del'>-			 gboolean consider_as_untitled,</div><div class='del'>-			 int n_comps, CalComponentVType vtype,</div><div class='del'>-			 GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	if (comp) {</div><div class='del'>-		g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-		g_return_val_if_fail (n_comps == 1, FALSE);</div><div class='del'>-	} else {</div><div class='del'>-		g_return_val_if_fail (n_comps &gt; 1, FALSE);</div><div class='del'>-		g_return_val_if_fail (vtype != CAL_COMPONENT_NO_TYPE, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);</div><div class='del'>-</div><div class='del'>-	if (!calendar_config_get_confirm_delete ())</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (comp) {</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-		char *tmp;</div><div class='del'>-</div><div class='del'>-		vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-		if (!consider_as_untitled) {</div><div class='del'>-			cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-			tmp = e_utf8_to_gtk_string (widget, summary.value);</div><div class='del'>-		} else</div><div class='del'>-			tmp = NULL;</div><div class='del'>-</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			if (tmp)</div><div class='del'>-				str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-							 "the appointment `%s'?"), tmp);</div><div class='del'>-			else</div><div class='del'>-				str = g_strdup (_("Are you sure you want to delete this "</div><div class='del'>-						  "untitled appointment?"));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			if (tmp)</div><div class='del'>-				str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-							 "the task `%s'?"), tmp);</div><div class='del'>-			else</div><div class='del'>-				str = g_strdup (_("Are you sure you want to delete this "</div><div class='del'>-						  "untitled task?"));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_JOURNAL:</div><div class='del'>-			if (tmp)</div><div class='del'>-				str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-							 "the journal entry `%s'?"), tmp);</div><div class='del'>-			else</div><div class='del'>-				str = g_strdup (_("Are you sure want to delete this "</div><div class='del'>-						  "untitled journal entry?"));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("delete_component_dialog(): Cannot handle object of type %d",</div><div class='del'>-				   vtype);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (tmp);</div><div class='del'>-	} else {</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-						 "%d appointments?"), n_comps);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-						 "%d tasks?"), n_comps);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_JOURNAL:</div><div class='del'>-			str = g_strdup_printf (_("Are you sure you want to delete "</div><div class='del'>-						 "%d journal entries?"), n_comps);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("delete_component_dialog(): Cannot handle objects of type %d",</div><div class='del'>-				   vtype);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dialog = e_message_box_new (str, E_MESSAGE_BOX_QUESTION,</div><div class='del'>-				    GNOME_STOCK_BUTTON_YES,</div><div class='del'>-				    GNOME_STOCK_BUTTON_NO,</div><div class='del'>-				    NULL);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	gtk_widget_hide (e_message_box_get_checkbox (E_MESSAGE_BOX (dialog)));</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h<br/>deleted file mode 100644<br/>index 64945b5bee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/delete-comp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/delete-comp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* Evolution calendar - Delete calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef DELETE_COMP_H</div><div class='del'>-#define DELETE_COMP_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean delete_component_dialog (CalComponent *comp,</div><div class='del'>-				  gboolean consider_as_untitled,</div><div class='del'>-				  int n_comps, CalComponentVType vtype,</div><div class='del'>-				  GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c<br/>deleted file mode 100644<br/>index 159d27e6a3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/e-delegate-dialog.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/e-delegate-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Delegate selector dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcombo.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-map.h&gt;</div><div class='del'>-#include &lt;e-destination.h&gt;</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-#include "e-delegate-dialog.h"</div><div class='del'>-</div><div class='del'>-struct _EDelegateDialogPrivate {</div><div class='del'>-	char *name;</div><div class='del'>-	char *address;</div><div class='del'>-</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *addressbook;</div><div class='del'>-</div><div class='del'>-        GNOME_Evolution_Addressbook_SelectNames corba_select_names;	</div><div class='del'>-	GtkWidget *entry;	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"</div><div class='del'>-static const char *section_name = "Delegate To";</div><div class='del'>-</div><div class='del'>-static void e_delegate_dialog_class_init	(EDelegateDialogClass *class);</div><div class='del'>-static void e_delegate_dialog_init		(EDelegateDialog      *edd);</div><div class='del'>-static void e_delegate_dialog_destroy		(GtkObject	*object);</div><div class='del'>-</div><div class='del'>-static gboolean get_widgets			(EDelegateDialog *edd);</div><div class='del'>-static void addressbook_clicked_cb              (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_delegate_dialog_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_delegate_dialog_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_delegate_dialog_type) {</div><div class='del'>-		static const GtkTypeInfo e_delegate_dialog_info = {</div><div class='del'>-			"EDelegateDialog",</div><div class='del'>-			sizeof (EDelegateDialog),</div><div class='del'>-			sizeof (EDelegateDialogClass),</div><div class='del'>-			(GtkClassInitFunc) e_delegate_dialog_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_delegate_dialog_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_delegate_dialog_type = gtk_type_unique (GTK_TYPE_OBJECT,</div><div class='del'>-							  &amp;e_delegate_dialog_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_delegate_dialog_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the event editor */</div><div class='del'>-static void</div><div class='del'>-e_delegate_dialog_class_init (EDelegateDialogClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_delegate_dialog_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the event editor */</div><div class='del'>-static void</div><div class='del'>-e_delegate_dialog_init (EDelegateDialog *edd)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EDelegateDialogPrivate, 1);</div><div class='del'>-	edd-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;address = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the event editor */</div><div class='del'>-static void</div><div class='del'>-e_delegate_dialog_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialog *edd;</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_DELEGATE_DIALOG (object));</div><div class='del'>-</div><div class='del'>-	edd = E_DELEGATE_DIALOG (object);</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Destroy the actual dialog. */</div><div class='del'>-	dialog = e_delegate_dialog_get_toplevel (edd);</div><div class='del'>-	gtk_widget_destroy (dialog);</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;address);</div><div class='del'>-	priv-&gt;address = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	edd-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EDelegateDialog *</div><div class='del'>-e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char *address)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-	EDestination *dest;</div><div class='del'>-	EDestination *destv[2] = {NULL, NULL};</div><div class='del'>-	Bonobo_Control corba_control;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (edd != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);</div><div class='del'>-</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Load the content widgets */</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-delegate-dialog.glade",</div><div class='del'>-				   NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("e_delegate_dialog_construct(): Could not load the Glade XML file!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (edd)) {</div><div class='del'>-		g_message ("e_delegate_dialog_construct(): Could not find all widgets in the XML file!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &amp;ev);</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_addSectionWithLimit (priv-&gt;corba_select_names, </div><div class='del'>-								     section_name, </div><div class='del'>-								     section_name,</div><div class='del'>-								     1, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("e_delegate_dialog_construct(): Unable to add section!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (priv-&gt;corba_select_names, </div><div class='del'>-										   section_name, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("e_delegate_dialog_construct(): Unable to get addressbook entry!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;entry = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-	gtk_widget_show (priv-&gt;entry);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (priv-&gt;hbox), priv-&gt;entry, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	dest = e_destination_new ();</div><div class='del'>-	destv[0] = dest;</div><div class='del'>-	if (name != NULL &amp;&amp; *name)</div><div class='del'>-		e_destination_set_name (dest, name);</div><div class='del'>-	if (address != NULL &amp;&amp; *address)</div><div class='del'>-		e_destination_set_email (dest, address);</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (priv-&gt;entry), "destinations", e_destination_exportv (destv), NULL);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dest));</div><div class='del'>-		</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;addressbook), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_clicked_cb), edd);</div><div class='del'>-</div><div class='del'>-	return edd;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (edd));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (EDelegateDialog *edd)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;app		= GW ("delegate-dialog");</div><div class='del'>-	priv-&gt;hbox              = GW ("delegate-hbox");</div><div class='del'>-	priv-&gt;addressbook	= GW ("addressbook");	</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;app</div><div class='del'>-		&amp;&amp; priv-&gt;hbox</div><div class='del'>-		&amp;&amp; priv-&gt;addressbook);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialog *edd = data;</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (priv-&gt;corba_select_names, section_name, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_delegate_dialog_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new event editor dialog.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created event editor dialog, or NULL if the event</div><div class='del'>- * editor could not be created.</div><div class='del'>- **/</div><div class='del'>-EDelegateDialog *</div><div class='del'>-e_delegate_dialog_new (const char *name, const char *address)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialog *edd;</div><div class='del'>-</div><div class='del'>-	edd = E_DELEGATE_DIALOG (gtk_type_new (E_TYPE_DELEGATE_DIALOG));</div><div class='del'>-	return e_delegate_dialog_construct (E_DELEGATE_DIALOG (edd), name, address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	char *string = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (edd != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);</div><div class='del'>-</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (priv-&gt;entry), "destinations", &amp;string, NULL);</div><div class='del'>-	destv = e_destination_importv (string);</div><div class='del'>-	</div><div class='del'>-	if (destv &amp;&amp; destv[0] != NULL) {</div><div class='del'>-		g_free (priv-&gt;address);</div><div class='del'>-		priv-&gt;address = g_strdup (e_destination_get_email (destv[0]));</div><div class='del'>-		g_free (destv);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (string);</div><div class='del'>-	</div><div class='del'>-	return g_strdup (priv-&gt;address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	char *string = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (edd != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);</div><div class='del'>-</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (priv-&gt;entry), "destinations", &amp;string, NULL);</div><div class='del'>-	destv = e_destination_importv (string);</div><div class='del'>-	</div><div class='del'>-	g_message ("importv: [%s]", string);</div><div class='del'>-	</div><div class='del'>-	if (destv &amp;&amp; destv[0] != NULL) {</div><div class='del'>-		g_free (priv-&gt;name);</div><div class='del'>-		priv-&gt;name = g_strdup (e_destination_get_name (destv[0]));</div><div class='del'>-		g_free (destv);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (string);</div><div class='del'>-	</div><div class='del'>-	return g_strdup (priv-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_delegate_dialog_get_toplevel	(EDelegateDialog  *edd)</div><div class='del'>-{</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (edd != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL);</div><div class='del'>-</div><div class='del'>-	priv = edd-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;app;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/dialogs/e-delegate-dialog.glade b/calendar/gui/dialogs/e-delegate-dialog.glade<br/>deleted file mode 100644<br/>index 394c191682..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/e-delegate-dialog.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/e-delegate-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;timezone-dialog&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;timezone-dialog&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;delegate-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Enter Delegate&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;True&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;True&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;ok-button&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;cancel-button&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;delegate-hbox&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Delegate To:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;addressbook&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Addressbook...&lt;/label&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h<br/>deleted file mode 100644<br/>index 311d22b4c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/e-delegate-dialog.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/e-delegate-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* Evolution calendar - Delegate selector dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_DELEGATE_DIALOG_H__</div><div class='del'>-#define __E_DELEGATE_DIALOG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_TYPE_DELEGATE_DIALOG       (e_delegate_dialog_get_type ())</div><div class='del'>-#define E_DELEGATE_DIALOG(obj)       (GTK_CHECK_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog))</div><div class='del'>-#define E_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG,	\</div><div class='del'>-				      EDelegateDialogClass))</div><div class='del'>-#define E_IS_DELEGATE_DIALOG(obj)    (GTK_CHECK_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))</div><div class='del'>-#define E_IS_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EDelegateDialog		EDelegateDialog;</div><div class='del'>-typedef struct _EDelegateDialogClass	EDelegateDialogClass;</div><div class='del'>-typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;</div><div class='del'>-</div><div class='del'>-struct _EDelegateDialog {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	EDelegateDialogPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EDelegateDialogClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType          e_delegate_dialog_get_type          (void);</div><div class='del'>-</div><div class='del'>-EDelegateDialog* e_delegate_dialog_construct         (EDelegateDialog *etd,</div><div class='del'>-						      const char      *name,</div><div class='del'>-						      const char      *address);</div><div class='del'>-</div><div class='del'>-EDelegateDialog* e_delegate_dialog_new               (const char      *name,</div><div class='del'>-						      const char      *address);</div><div class='del'>-</div><div class='del'>-char*            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);</div><div class='del'>-</div><div class='del'>-char*            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);</div><div class='del'>-</div><div class='del'>-void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,</div><div class='del'>-						      const char      *address);</div><div class='del'>-</div><div class='del'>-GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_DELEGATE_DIALOG_H__ */</div><div class='head'>diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c<br/>deleted file mode 100644<br/>index 4c0862c9f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/event-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/event-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,450 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* Evolution calendar - Event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-</div><div class='del'>-#include "event-page.h"</div><div class='del'>-#include "alarm-page.h"</div><div class='del'>-#include "recurrence-page.h"</div><div class='del'>-#include "meeting-page.h"</div><div class='del'>-#include "schedule-page.h"</div><div class='del'>-#include "cancel-comp.h"</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-</div><div class='del'>-struct _EventEditorPrivate {</div><div class='del'>-	EventPage *event_page;</div><div class='del'>-	AlarmPage *alarm_page;</div><div class='del'>-	RecurrencePage *recur_page;</div><div class='del'>-	MeetingPage *meet_page;</div><div class='del'>-	SchedulePage *sched_page;</div><div class='del'>-</div><div class='del'>-	EMeetingModel *model;</div><div class='del'>-</div><div class='del'>-	gboolean meeting_shown;</div><div class='del'>-	gboolean existing_org;</div><div class='del'>-	gboolean updating;	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void event_editor_class_init (EventEditorClass *class);</div><div class='del'>-static void event_editor_init (EventEditor *ee);</div><div class='del'>-static void event_editor_set_cal_client (CompEditor *editor, CalClient *client);</div><div class='del'>-static void event_editor_edit_comp (CompEditor *editor, CalComponent *comp);</div><div class='del'>-static void event_editor_send_comp (CompEditor *editor, CalComponentItipMethod method);</div><div class='del'>-static void event_editor_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void schedule_meeting_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void refresh_meeting_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void cancel_meeting_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void forward_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static void model_row_changed_cb (ETableModel *etm, int row, gpointer data);</div><div class='del'>-static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data);</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionRefreshMeeting", refresh_meeting_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionCancelMeeting", cancel_meeting_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionForward", forward_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CompEditorClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #EventEditor class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #EventEditor class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-event_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType event_editor_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!event_editor_type) {</div><div class='del'>-		static const GtkTypeInfo event_editor_info = {</div><div class='del'>-			"EventEditor",</div><div class='del'>-			sizeof (EventEditor),</div><div class='del'>-			sizeof (EventEditorClass),</div><div class='del'>-			(GtkClassInitFunc) event_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) event_editor_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		event_editor_type = gtk_type_unique (TYPE_COMP_EDITOR,</div><div class='del'>-						     &amp;event_editor_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return event_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the event editor */</div><div class='del'>-static void</div><div class='del'>-event_editor_class_init (EventEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	CompEditorClass *editor_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) klass;</div><div class='del'>-	editor_class = (CompEditorClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR);</div><div class='del'>-</div><div class='del'>-	editor_class-&gt;set_cal_client = event_editor_set_cal_client;</div><div class='del'>-	editor_class-&gt;edit_comp = event_editor_edit_comp;</div><div class='del'>-	editor_class-&gt;send_comp = event_editor_send_comp;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = event_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_menu_sens (EventEditor *ee) </div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	gboolean sens;</div><div class='del'>-	</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	sens = priv-&gt;meeting_shown;</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (ee), </div><div class='del'>-				 "/commands/ActionScheduleMeeting", </div><div class='del'>-				 "sensitive", sens ? "0" : "1");</div><div class='del'>-</div><div class='del'>-	sens = sens &amp;&amp; priv-&gt;existing_org;</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (ee), </div><div class='del'>-				 "/commands/ActionRefreshMeeting", </div><div class='del'>-				 "sensitive", sens ? "1" : "0");</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (ee), </div><div class='del'>-				 "/commands/ActionCancelMeeting", </div><div class='del'>-				 "sensitive", sens ? "1" : "0");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_widgets (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_row_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (model_row_changed_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_rows_inserted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (row_count_changed_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_rows_deleted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (row_count_changed_cb), ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the event editor */</div><div class='del'>-static void</div><div class='del'>-event_editor_init (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (EventEditorPrivate, 1);</div><div class='del'>-	ee-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;event_page = event_page_new ();</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (ee), </div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;event_page),</div><div class='del'>-				 _("Appointment"));</div><div class='del'>-</div><div class='del'>-	priv-&gt;alarm_page = alarm_page_new ();</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;alarm_page),</div><div class='del'>-				 _("Reminder"));</div><div class='del'>-</div><div class='del'>-	priv-&gt;recur_page = recurrence_page_new ();</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;recur_page),</div><div class='del'>-				 _("Recurrence"));</div><div class='del'>-	</div><div class='del'>-	priv-&gt;model = E_MEETING_MODEL (e_meeting_model_new ());</div><div class='del'>-	</div><div class='del'>-	priv-&gt;sched_page = schedule_page_new (priv-&gt;model);</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;sched_page),</div><div class='del'>-				 _("Scheduling"));</div><div class='del'>-</div><div class='del'>-	priv-&gt;meet_page = meeting_page_new (priv-&gt;model);</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-				 _("Meeting"));</div><div class='del'>-</div><div class='del'>- 	comp_editor_merge_ui (COMP_EDITOR (ee), "evolution-event-editor.xml", verbs);</div><div class='del'>-</div><div class='del'>-	priv-&gt;meeting_shown = TRUE;</div><div class='del'>-	priv-&gt;existing_org = FALSE;</div><div class='del'>-	priv-&gt;updating = FALSE;	</div><div class='del'>-</div><div class='del'>-	init_widgets (ee);</div><div class='del'>-	set_menu_sens (ee);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-event_editor_set_cal_client (CompEditor *editor, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	ee = EVENT_EDITOR (editor);</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_meeting_model_set_cal_client (priv-&gt;model, client);</div><div class='del'>-	</div><div class='del'>-	if (parent_class-&gt;set_cal_client)</div><div class='del'>-		parent_class-&gt;set_cal_client (editor, client);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-event_editor_edit_comp (CompEditor *editor, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GSList *attendees = NULL;</div><div class='del'>-	</div><div class='del'>-	ee = EVENT_EDITOR (editor);</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;existing_org = cal_component_has_organizer (comp);</div><div class='del'>-	cal_component_get_attendee_list (comp, &amp;attendees);</div><div class='del'>-</div><div class='del'>-	e_meeting_model_remove_all_attendees (priv-&gt;model);</div><div class='del'>-	if (attendees == NULL) {</div><div class='del'>-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv-&gt;meet_page));</div><div class='del'>-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv-&gt;sched_page));</div><div class='del'>-		priv-&gt;meeting_shown = FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		GSList *l;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;meeting_shown) {</div><div class='del'>-			comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-						 COMP_EDITOR_PAGE (priv-&gt;sched_page),</div><div class='del'>-						 _("Scheduling"));</div><div class='del'>-			comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-						 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-						 _("Meeting"));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (l = attendees; l != NULL; l = l-&gt;next) {</div><div class='del'>-			CalComponentAttendee *ca = l-&gt;data;</div><div class='del'>-			EMeetingAttendee *ia;</div><div class='del'>-</div><div class='del'>-			ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));</div><div class='del'>-			e_meeting_model_add_attendee (priv-&gt;model, ia);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (ia));</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;meeting_shown = TRUE;</div><div class='del'>-	}	</div><div class='del'>-	cal_component_free_attendee_list (attendees);</div><div class='del'>-</div><div class='del'>-	set_menu_sens (ee);</div><div class='del'>-	comp_editor_set_needs_send (COMP_EDITOR (ee), priv-&gt;meeting_shown);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-	</div><div class='del'>-	if (parent_class-&gt;edit_comp)</div><div class='del'>-		parent_class-&gt;edit_comp (editor, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-event_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (editor);</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp = NULL;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Don't cancel more than once or when just publishing */</div><div class='del'>-	if (method == CAL_COMPONENT_METHOD_PUBLISH ||</div><div class='del'>-	    method == CAL_COMPONENT_METHOD_CANCEL)</div><div class='del'>-		goto parent;</div><div class='del'>-	</div><div class='del'>-	comp = meeting_page_get_cancel_comp (priv-&gt;meet_page);</div><div class='del'>-	if (comp != NULL) {</div><div class='del'>-		CalClient *client;</div><div class='del'>-		</div><div class='del'>-		client = e_meeting_model_get_cal_client (priv-&gt;model);</div><div class='del'>-		itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- parent:</div><div class='del'>-	if (parent_class-&gt;send_comp)</div><div class='del'>-		parent_class-&gt;send_comp (editor, method);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the event editor */</div><div class='del'>-static void</div><div class='del'>-event_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_EVENT_EDITOR (object));</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (object);</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;event_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;alarm_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;recur_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;meet_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;sched_page));</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new event editor dialog.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created event editor dialog, or NULL if the event</div><div class='del'>- * editor could not be created.</div><div class='del'>- **/</div><div class='del'>-EventEditor *</div><div class='del'>-event_editor_new (void)</div><div class='del'>-{</div><div class='del'>-	return EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_meeting (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;meeting_shown) {</div><div class='del'>-		comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-					 COMP_EDITOR_PAGE (priv-&gt;sched_page),</div><div class='del'>-					 _("Scheduling"));</div><div class='del'>-		comp_editor_append_page (COMP_EDITOR (ee),</div><div class='del'>-					 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-					 _("Meeting"));</div><div class='del'>-		priv-&gt;meeting_shown = TRUE;</div><div class='del'>-</div><div class='del'>-		set_menu_sens (ee);</div><div class='del'>- 		comp_editor_set_changed (COMP_EDITOR (ee), priv-&gt;meeting_shown);</div><div class='del'>-		comp_editor_set_needs_send (COMP_EDITOR (ee), priv-&gt;meeting_shown);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	comp_editor_show_page (COMP_EDITOR (ee),</div><div class='del'>-			       COMP_EDITOR_PAGE (priv-&gt;meet_page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-event_editor_show_meeting (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (ee != NULL);</div><div class='del'>-	g_return_if_fail (IS_EVENT_EDITOR (ee));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	show_meeting (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-schedule_meeting_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	show_meeting (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_meeting_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-	</div><div class='del'>-	comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_REFRESH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_meeting_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	</div><div class='del'>-	comp = comp_editor_get_current_comp (COMP_EDITOR (ee));</div><div class='del'>-	if (cancel_component_dialog (comp)) {</div><div class='del'>-		comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_CANCEL);</div><div class='del'>-		comp_editor_delete_comp (COMP_EDITOR (ee));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-forward_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	if (comp_editor_save_comp (COMP_EDITOR (ee), TRUE))</div><div class='del'>-		comp_editor_send_comp (COMP_EDITOR (ee), CAL_COMPONENT_METHOD_PUBLISH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-model_row_changed_cb (ETableModel *etm, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_set_changed (COMP_EDITOR (ee), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_set_changed (COMP_EDITOR (ee), TRUE);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h<br/>deleted file mode 100644<br/>index d27bb8e52d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/event-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/event-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __EVENT_EDITOR_H__</div><div class='del'>-#define __EVENT_EDITOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include "comp-editor.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_EVENT_EDITOR            (event_editor_get_type ())</div><div class='del'>-#define EVENT_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor))</div><div class='del'>-#define EVENT_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR,	EventEditorClass))</div><div class='del'>-#define IS_EVENT_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_EDITOR))</div><div class='del'>-#define IS_EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR))</div><div class='del'>-</div><div class='del'>-typedef struct _EventEditor EventEditor;</div><div class='del'>-typedef struct _EventEditorClass EventEditorClass;</div><div class='del'>-typedef struct _EventEditorPrivate EventEditorPrivate;</div><div class='del'>-</div><div class='del'>-struct _EventEditor {</div><div class='del'>-	CompEditor parent;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EventEditorClass {</div><div class='del'>-	CompEditorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType      event_editor_get_type     (void);</div><div class='del'>-EventEditor *event_editor_construct    (EventEditor *ee);</div><div class='del'>-EventEditor *event_editor_new          (void);</div><div class='del'>-void         event_editor_show_meeting (EventEditor *ee);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __EVENT_EDITOR_H__ */</div><div class='head'>diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c<br/>deleted file mode 100644<br/>index a12bce2c47..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/event-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/event-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1439 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-categories.h&gt;</div><div class='del'>-#include "e-util/e-categories-config.h"</div><div class='del'>-#include "e-util/e-dialog-widgets.h"</div><div class='del'>-#include "widgets/misc/e-dateedit.h"</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../e-timezone-entry.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "event-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the EventPage structure */</div><div class='del'>-struct _EventPagePrivate {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	GtkWidget *summary;</div><div class='del'>-	GtkWidget *location;</div><div class='del'>-</div><div class='del'>-	GtkWidget *start_time;</div><div class='del'>-	GtkWidget *end_time;</div><div class='del'>-	GtkWidget *start_timezone;</div><div class='del'>-	GtkWidget *end_timezone;</div><div class='del'>-	GtkWidget *all_day_event;</div><div class='del'>-</div><div class='del'>-	GtkWidget *description;</div><div class='del'>-</div><div class='del'>-	GtkWidget *classification_public;</div><div class='del'>-	GtkWidget *classification_private;</div><div class='del'>-	GtkWidget *classification_confidential;</div><div class='del'>-</div><div class='del'>-	GtkWidget *show_time_as_free;</div><div class='del'>-	GtkWidget *show_time_as_busy;</div><div class='del'>-</div><div class='del'>-	GtkWidget *contacts_btn;</div><div class='del'>-	GtkWidget *contacts_box;</div><div class='del'>-</div><div class='del'>-	GtkWidget *categories_btn;</div><div class='del'>-	GtkWidget *categories;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-</div><div class='del'>-	/* This is TRUE if both the start &amp; end timezone are the same. If the</div><div class='del'>-	   start timezone is then changed, we updated the end timezone to the</div><div class='del'>-	   same value, since 99% of events start and end in one timezone. */</div><div class='del'>-	gboolean sync_timezones;</div><div class='del'>-</div><div class='del'>-	/* The Corba component for selecting contacts, and the entry field</div><div class='del'>-	   which we place in the dialog. */</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	GtkWidget *contacts_entry;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void event_page_class_init (EventPageClass *class);</div><div class='del'>-static void event_page_init (EventPage *epage);</div><div class='del'>-static void event_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *event_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void event_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void event_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean event_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static void event_page_set_summary (CompEditorPage *page, const char *summary);</div><div class='del'>-static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #EventPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #EventPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-event_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType event_page_type;</div><div class='del'>-</div><div class='del'>-	if (!event_page_type) {</div><div class='del'>-		static const GtkTypeInfo event_page_info = {</div><div class='del'>-			"EventPage",</div><div class='del'>-			sizeof (EventPage),</div><div class='del'>-			sizeof (EventPageClass),</div><div class='del'>-			(GtkClassInitFunc) event_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) event_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		event_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE, </div><div class='del'>-						   &amp;event_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return event_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_class_init (EventPageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = event_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = event_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = event_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = event_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = event_page_set_summary;</div><div class='del'>-	editor_page_class-&gt;set_dates = event_page_set_dates;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = event_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_init (EventPage *epage)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EventPagePrivate, 1);</div><div class='del'>-	epage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-	priv-&gt;summary = NULL;</div><div class='del'>-	priv-&gt;location = NULL;</div><div class='del'>-	priv-&gt;start_time = NULL;</div><div class='del'>-	priv-&gt;end_time = NULL;</div><div class='del'>-	priv-&gt;start_timezone = NULL;</div><div class='del'>-	priv-&gt;end_timezone = NULL;</div><div class='del'>-	priv-&gt;all_day_event = NULL;</div><div class='del'>-	priv-&gt;description = NULL;</div><div class='del'>-	priv-&gt;classification_public = NULL;</div><div class='del'>-	priv-&gt;classification_private = NULL;</div><div class='del'>-	priv-&gt;classification_confidential = NULL;</div><div class='del'>-	priv-&gt;show_time_as_free = NULL;</div><div class='del'>-	priv-&gt;show_time_as_busy = NULL;</div><div class='del'>-	priv-&gt;contacts_btn = NULL;</div><div class='del'>-	priv-&gt;contacts_box = NULL;</div><div class='del'>-	priv-&gt;categories_btn = NULL;</div><div class='del'>-	priv-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-	priv-&gt;sync_timezones = FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;corba_select_names = CORBA_OBJECT_NIL;</div><div class='del'>-	priv-&gt;contacts_entry = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_EVENT_PAGE (object));</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (object);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		CORBA_Object_release (priv-&gt;corba_select_names, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	epage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const int classification_map[] = {</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int transparency_map[] = {</div><div class='del'>-	CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-	CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the event page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-event_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (page);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (page);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (priv-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the 'All Day Event' flag to the given value (without emitting signals),</div><div class='del'>- * and shows or hides the widgets as appropriate. */</div><div class='del'>-static void</div><div class='del'>-set_all_day (EventPage *epage, gboolean all_day)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;all_day_event),</div><div class='del'>-					  epage);</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;all_day_event, all_day);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;all_day_event),</div><div class='del'>-					    epage);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (priv-&gt;start_time), !all_day);</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (priv-&gt;end_time), !all_day);</div><div class='del'>-</div><div class='del'>-	/* DATE values do not have timezones, so we hide the fields. */</div><div class='del'>-	if (all_day) {</div><div class='del'>-		gtk_widget_hide (priv-&gt;start_timezone);</div><div class='del'>-		gtk_widget_hide (priv-&gt;end_timezone);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_show (priv-&gt;start_timezone);</div><div class='del'>-		gtk_widget_show (priv-&gt;end_timezone);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_time (EventPage *epage, CalComponentDateTime *start_date, CalComponentDateTime *end_date)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	struct icaltimetype *start_tt, *end_tt;</div><div class='del'>-	icaltimezone *start_zone = NULL, *end_zone = NULL;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gboolean all_day_event;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Note that if we are creating a new event, the timezones may not be</div><div class='del'>-	   on the server, so we try to get the builtin timezone with the TZID</div><div class='del'>-	   first. */</div><div class='del'>-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date-&gt;tzid);</div><div class='del'>-	if (!start_zone) {</div><div class='del'>-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (epage)-&gt;client,</div><div class='del'>-						  start_date-&gt;tzid,</div><div class='del'>-						  &amp;start_zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-				   start_date-&gt;tzid ? start_date-&gt;tzid : "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date-&gt;tzid);</div><div class='del'>-	if (!end_zone) {</div><div class='del'>-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (epage)-&gt;client,</div><div class='del'>-						  end_date-&gt;tzid,</div><div class='del'>-						  &amp;end_zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-		  g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-			     end_date-&gt;tzid ? end_date-&gt;tzid : "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If both times are DATE values, we set the 'All Day Event' checkbox.</div><div class='del'>-	   Also, if DTEND is after DTSTART, we subtract 1 day from it. */</div><div class='del'>-	all_day_event = FALSE;</div><div class='del'>-	start_tt = start_date-&gt;value;</div><div class='del'>-	end_tt = end_date-&gt;value;</div><div class='del'>-	if (start_tt-&gt;is_date &amp;&amp; end_tt-&gt;is_date) {</div><div class='del'>-		all_day_event = TRUE;</div><div class='del'>-		if (icaltime_compare_date_only (*end_tt, *start_tt) &gt; 0) {</div><div class='del'>-			icaltime_adjust (end_tt, -1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_all_day (epage, all_day_event);</div><div class='del'>-</div><div class='del'>-	/* If it is an all day event, we set both timezones to the current</div><div class='del'>-	   timezone, so that if the user toggles the 'All Day Event' checkbox</div><div class='del'>-	   the event uses the current timezone rather than none at all. */</div><div class='del'>-	if (all_day_event) {</div><div class='del'>-		char *location = calendar_config_get_timezone ();</div><div class='del'>-		start_zone = end_zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					  epage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), epage);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;start_time), start_tt-&gt;year,</div><div class='del'>-			      start_tt-&gt;month, start_tt-&gt;day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-				     start_tt-&gt;hour, start_tt-&gt;minute);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;end_time), end_tt-&gt;year,</div><div class='del'>-			      end_tt-&gt;month, end_tt-&gt;day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-				     end_tt-&gt;hour, end_tt-&gt;minute);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					    epage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time),</div><div class='del'>-					    epage);</div><div class='del'>-</div><div class='del'>-	/* Set the timezones, and set sync_timezones to TRUE if both timezones</div><div class='del'>-	   are the same. */</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_timezone),</div><div class='del'>-					  epage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_timezone), epage);</div><div class='del'>-	</div><div class='del'>-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone),</div><div class='del'>-				       start_zone);</div><div class='del'>-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone),</div><div class='del'>-				       end_zone);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_timezone),</div><div class='del'>-					    epage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_timezone),</div><div class='del'>-					    epage);</div><div class='del'>-</div><div class='del'>-	priv-&gt;sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (EventPage *epage)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary, description */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;summary, NULL);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;location, NULL);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;description, NULL);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					  epage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), epage);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_time), 0);</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;end_time), 0);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					    epage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time),</div><div class='del'>-					    epage);</div><div class='del'>-</div><div class='del'>-	set_all_day (epage, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);</div><div class='del'>-</div><div class='del'>-	/* Show Time As (Transparency) */</div><div class='del'>-	e_dialog_radio_set (priv-&gt;show_time_as_free,</div><div class='del'>-			    CAL_COMPONENT_TRANSP_OPAQUE, transparency_map);</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;categories, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-contacts_changed_cb (BonoboListener    *listener,</div><div class='del'>-		     char              *event_name,</div><div class='del'>-		     CORBA_any         *arg,</div><div class='del'>-		     CORBA_Environment *ev,</div><div class='del'>-		     gpointer           data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In contacts_changed_cb\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CalComponentClassification cl;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-	CalComponentDateTime start_date, end_date;</div><div class='del'>-	const char *location;</div><div class='del'>-	const char *categories;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (page-&gt;client != NULL);</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (page);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Don't send off changes during this time */</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Clean the page */</div><div class='del'>-	clear_widgets (epage);</div><div class='del'>-</div><div class='del'>-	/* Summary, location, description(s) */</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;summary, text.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_location (comp, &amp;location);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;location, location);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;l);</div><div class='del'>-	if (l) {</div><div class='del'>-		text = *(CalComponentText *)l-&gt;data;</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, text.value);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;start_date);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;end_date);</div><div class='del'>-</div><div class='del'>-	update_time (epage, &amp;start_date, &amp;end_date);</div><div class='del'>-	</div><div class='del'>-	cal_component_free_datetime (&amp;start_date);</div><div class='del'>-	cal_component_free_datetime (&amp;end_date);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-</div><div class='del'>-	cal_component_get_classification (comp, &amp;cl);</div><div class='del'>-</div><div class='del'>-	switch (cl) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* default to PUBLIC */</div><div class='del'>-		e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Show Time As (Transparency) */</div><div class='del'>-	cal_component_get_transparency (comp, &amp;transparency);</div><div class='del'>-	switch (transparency) {</div><div class='del'>-	case CAL_COMPONENT_TRANSP_TRANSPARENT:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;show_time_as_free,</div><div class='del'>-				    CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-				    transparency_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;show_time_as_free,</div><div class='del'>-				    CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-				    transparency_map);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	cal_component_get_categories (comp, &amp;categories);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;categories, categories);</div><div class='del'>-</div><div class='del'>-	/* Contacts */</div><div class='del'>-	comp_editor_contacts_to_widget (priv-&gt;contacts_entry, comp);</div><div class='del'>-</div><div class='del'>-	/* We connect the contacts changed signal here, as we have to be a bit</div><div class='del'>-	   more careful with it due to the use of Corba. The priv-&gt;updating</div><div class='del'>-	   flag won't work as we won't get the changed event immediately.</div><div class='del'>-	   FIXME: Unfortunately this doesn't work either. We never get the</div><div class='del'>-	   changed event now. */</div><div class='del'>-	comp_editor_connect_contacts_changed (priv-&gt;contacts_entry,</div><div class='del'>-					      contacts_changed_cb, epage);</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the event page */</div><div class='del'>-static gboolean</div><div class='del'>-event_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	CalComponentDateTime start_date, end_date;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	gboolean all_day_event, start_date_set, end_date_set;</div><div class='del'>-	char *cat, *str;</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (page);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;summary);</div><div class='del'>-	if (!str || strlen (str) == 0)</div><div class='del'>-		cal_component_set_summary (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_summary (comp, &amp;text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Location */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;location);</div><div class='del'>-	if (!str || strlen (str) == 0)</div><div class='del'>-		cal_component_set_location (comp, NULL);</div><div class='del'>-	else</div><div class='del'>-		cal_component_set_location (comp, str);</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Description */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;description);</div><div class='del'>-	if (!str || strlen (str) == 0)</div><div class='del'>-		cal_component_set_description_list (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		GSList l;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-		l.data = &amp;text;</div><div class='del'>-		l.next = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_description_list (comp, &amp;l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_null_time ();</div><div class='del'>-	start_date.value = &amp;start_tt;</div><div class='del'>-	start_date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	end_tt = icaltime_null_time ();</div><div class='del'>-	end_date.value = &amp;end_tt;</div><div class='del'>-	end_date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	start_date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					       &amp;start_tt.year,</div><div class='del'>-					       &amp;start_tt.month,</div><div class='del'>-					       &amp;start_tt.day);</div><div class='del'>-	g_assert (start_date_set);</div><div class='del'>-</div><div class='del'>-	end_date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					     &amp;end_tt.year,</div><div class='del'>-					     &amp;end_tt.month,</div><div class='del'>-					     &amp;end_tt.day);</div><div class='del'>-	g_assert (end_date_set);</div><div class='del'>-</div><div class='del'>-	/* If the all_day toggle is set, we use DATE values for DTSTART and</div><div class='del'>-	   DTEND. If not, we fetch the hour &amp; minute from the widgets. */</div><div class='del'>-	all_day_event = e_dialog_toggle_get (priv-&gt;all_day_event);</div><div class='del'>-</div><div class='del'>-	if (all_day_event) {</div><div class='del'>-		start_tt.is_date = TRUE;</div><div class='del'>-		end_tt.is_date = TRUE;</div><div class='del'>-</div><div class='del'>-		/* We have to add 1 day to DTEND, as it is not inclusive. */</div><div class='del'>-		icaltime_adjust (&amp;end_tt, 1, 0, 0, 0);</div><div class='del'>-	} else {</div><div class='del'>-		icaltimezone *start_zone, *end_zone;</div><div class='del'>-</div><div class='del'>-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					     &amp;start_tt.hour,</div><div class='del'>-					     &amp;start_tt.minute);</div><div class='del'>-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					     &amp;end_tt.hour,</div><div class='del'>-					     &amp;end_tt.minute);</div><div class='del'>-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-		start_date.tzid = icaltimezone_get_tzid (start_zone);</div><div class='del'>-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone));</div><div class='del'>-		end_date.tzid = icaltimezone_get_tzid (end_zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;start_date);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;end_date);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-</div><div class='del'>-	cat = e_dialog_editable_get (priv-&gt;categories);</div><div class='del'>-	str = comp_editor_strip_categories (cat);</div><div class='del'>-	if (cat)</div><div class='del'>-		g_free (cat);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories (comp, str);</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-</div><div class='del'>-	classif = e_dialog_radio_get (priv-&gt;classification_public,</div><div class='del'>-				      classification_map);</div><div class='del'>-	cal_component_set_classification (comp, classif);</div><div class='del'>-</div><div class='del'>-	/* Show Time As (Transparency) */</div><div class='del'>-</div><div class='del'>-	transparency = e_dialog_radio_get (priv-&gt;show_time_as_free,</div><div class='del'>-					   transparency_map);</div><div class='del'>-	cal_component_set_transparency (comp, transparency);</div><div class='del'>-</div><div class='del'>-	/* Contacts */</div><div class='del'>-</div><div class='del'>-	comp_editor_contacts_to_component (priv-&gt;contacts_entry, comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_summary handler for the event page */</div><div class='del'>-static void</div><div class='del'>-event_page_set_summary (CompEditorPage *page, const char *summary)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{	</div><div class='del'>-	update_time (EVENT_PAGE (page), dates-&gt;start, dates-&gt;end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (EventPage *epage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (epage);</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("event-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary = GW ("general-summary");</div><div class='del'>-	priv-&gt;location = GW ("location");</div><div class='del'>-</div><div class='del'>-	priv-&gt;start_time = GW ("start-time");</div><div class='del'>-	priv-&gt;end_time = GW ("end-time");</div><div class='del'>-	priv-&gt;start_timezone = GW ("start-timezone");</div><div class='del'>-	priv-&gt;end_timezone = GW ("end-timezone");</div><div class='del'>-	priv-&gt;all_day_event = GW ("all-day-event");</div><div class='del'>-</div><div class='del'>-	priv-&gt;description = GW ("description");</div><div class='del'>-</div><div class='del'>-	priv-&gt;classification_public = GW ("classification-public");</div><div class='del'>-	priv-&gt;classification_private = GW ("classification-private");</div><div class='del'>-	priv-&gt;classification_confidential = GW ("classification-confidential");</div><div class='del'>-</div><div class='del'>-	priv-&gt;show_time_as_free = GW ("show-time-as-free");</div><div class='del'>-	priv-&gt;show_time_as_busy = GW ("show-time-as-busy");</div><div class='del'>-</div><div class='del'>-	priv-&gt;contacts_btn = GW ("contacts-button");</div><div class='del'>-	priv-&gt;contacts_box = GW ("contacts-box");</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories_btn = GW ("categories-button");</div><div class='del'>-	priv-&gt;categories = GW ("categories");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;summary</div><div class='del'>-		&amp;&amp; priv-&gt;location</div><div class='del'>-		&amp;&amp; priv-&gt;start_time</div><div class='del'>-		&amp;&amp; priv-&gt;end_time</div><div class='del'>-		&amp;&amp; priv-&gt;start_timezone</div><div class='del'>-		&amp;&amp; priv-&gt;end_timezone</div><div class='del'>-		&amp;&amp; priv-&gt;all_day_event</div><div class='del'>-		&amp;&amp; priv-&gt;description</div><div class='del'>-		&amp;&amp; priv-&gt;classification_public</div><div class='del'>-		&amp;&amp; priv-&gt;classification_private</div><div class='del'>-		&amp;&amp; priv-&gt;classification_confidential</div><div class='del'>-		&amp;&amp; priv-&gt;show_time_as_free</div><div class='del'>-		&amp;&amp; priv-&gt;show_time_as_busy</div><div class='del'>-		&amp;&amp; priv-&gt;contacts_btn</div><div class='del'>-		&amp;&amp; priv-&gt;contacts_box</div><div class='del'>-		&amp;&amp; priv-&gt;categories_btn</div><div class='del'>-		&amp;&amp; priv-&gt;categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the summary changes; we emit the notification signal. */</div><div class='del'>-static void</div><div class='del'>-summary_changed_cb (GtkEditable *editable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	gchar *summary;</div><div class='del'>-	</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	summary = e_dialog_editable_get (GTK_WIDGET (editable));</div><div class='del'>-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (epage),</div><div class='del'>-						 summary);</div><div class='del'>-	g_free (summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note that this assumes that the start_tt and end_tt passed to it are the</div><div class='del'>-   dates visible to the user. For DATE values, we have to add 1 day to the</div><div class='del'>-   end_tt before emitting the signal. */</div><div class='del'>-static void</div><div class='del'>-notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,</div><div class='del'>-		      struct icaltimetype *end_tt)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	CompEditorPageDates dates;</div><div class='del'>-	CalComponentDateTime start_dt, end_dt;</div><div class='del'>-	gboolean all_day_event;</div><div class='del'>-	icaltimezone *start_zone = NULL, *end_zone = NULL;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	all_day_event = e_dialog_toggle_get (priv-&gt;all_day_event);</div><div class='del'>-</div><div class='del'>-	start_dt.value = start_tt;</div><div class='del'>-	end_dt.value = end_tt;</div><div class='del'>-</div><div class='del'>-	if (all_day_event) {</div><div class='del'>-		/* The actual DTEND is 1 day after the displayed date for</div><div class='del'>-		   DATE values. */</div><div class='del'>-		icaltime_adjust (end_tt, 1, 0, 0, 0);</div><div class='del'>-	} else {</div><div class='del'>-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_dt.tzid = start_zone ? icaltimezone_get_tzid (start_zone) : NULL;</div><div class='del'>-	end_dt.tzid = end_zone ? icaltimezone_get_tzid (end_zone) : NULL;</div><div class='del'>-</div><div class='del'>-	dates.start = &amp;start_dt;</div><div class='del'>-	dates.end = &amp;end_dt;</div><div class='del'>-</div><div class='del'>-	dates.due = NULL;</div><div class='del'>-	dates.complete = NULL;</div><div class='del'>-</div><div class='del'>-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (epage),</div><div class='del'>-					       &amp;dates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-check_start_before_end (struct icaltimetype *start_tt,</div><div class='del'>-			icaltimezone *start_zone,</div><div class='del'>-			struct icaltimetype *end_tt,</div><div class='del'>-			icaltimezone *end_zone,</div><div class='del'>-			gboolean adjust_end_time)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype end_tt_copy;</div><div class='del'>-	int cmp;</div><div class='del'>-</div><div class='del'>-	/* Convert the end time to the same timezone as the start time. */</div><div class='del'>-	end_tt_copy = *end_tt;</div><div class='del'>-	icaltimezone_convert_time (&amp;end_tt_copy, end_zone, start_zone);</div><div class='del'>-</div><div class='del'>-	/* Now check if the start time is after the end time. If it is,</div><div class='del'>-	   we need to modify one of the times. */</div><div class='del'>-	cmp = icaltime_compare (*start_tt, end_tt_copy);</div><div class='del'>-	if (cmp &gt; 0) {</div><div class='del'>-		if (adjust_end_time) {</div><div class='del'>-			/* Modify the end time, to be the start + 1 hour. */</div><div class='del'>-			*end_tt = *start_tt;</div><div class='del'>-			icaltime_adjust (end_tt, 0, 1, 0, 0);</div><div class='del'>-			icaltimezone_convert_time (end_tt, start_zone,</div><div class='del'>-						   end_zone);</div><div class='del'>-		} else {</div><div class='del'>-			/* Modify the start time, to be the end - 1 hour. */</div><div class='del'>-			*start_tt = *end_tt;</div><div class='del'>-			icaltime_adjust (start_tt, 0, -1, 0, 0);</div><div class='del'>-			icaltimezone_convert_time (start_tt, end_zone,</div><div class='del'>-						   start_zone);</div><div class='del'>-		}</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This is called whenever the start or end dates or timezones is changed.</div><div class='del'>- * It makes sure that the start date &lt; end date. It also emits the notification</div><div class='del'>- * signals so the other event editor pages update their labels etc.</div><div class='del'>- *</div><div class='del'>- * If adjust_end_time is TRUE, if the start time &lt; end time it will adjust</div><div class='del'>- * the end time. If FALSE it will adjust the start time. If the user sets the</div><div class='del'>- * start or end time, the other time is adjusted to make it valid.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-times_updated (EventPage *epage, gboolean adjust_end_time)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time();</div><div class='del'>-	struct icaltimetype end_tt = icaltime_null_time();</div><div class='del'>-	gboolean date_set, all_day_event;</div><div class='del'>-	gboolean set_start_date = FALSE, set_end_date = FALSE;</div><div class='del'>-	icaltimezone *start_zone, *end_zone;</div><div class='del'>-	</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Fetch the start and end times and timezones from the widgets. */</div><div class='del'>-	all_day_event = e_dialog_toggle_get (priv-&gt;all_day_event);</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					 &amp;start_tt.year,</div><div class='del'>-					 &amp;start_tt.month,</div><div class='del'>-					 &amp;start_tt.day);</div><div class='del'>-	g_assert (date_set);</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					 &amp;end_tt.year,</div><div class='del'>-					 &amp;end_tt.month,</div><div class='del'>-					 &amp;end_tt.day);</div><div class='del'>-	g_assert (date_set);</div><div class='del'>-</div><div class='del'>-	if (all_day_event) {</div><div class='del'>-		/* All Day Events are simple. We just compare the dates and if</div><div class='del'>-		   start &gt; end we copy one of them to the other. */</div><div class='del'>-		int cmp = icaltime_compare_date_only (start_tt, end_tt);</div><div class='del'>-		if (cmp &gt; 0) {</div><div class='del'>-			if (adjust_end_time) {</div><div class='del'>-				end_tt = start_tt;</div><div class='del'>-				set_end_date = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				start_tt = end_tt;</div><div class='del'>-				set_start_date = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start_tt.is_date = TRUE;</div><div class='del'>-		end_tt.is_date = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		/* For DATE-TIME events, we have to convert to the same</div><div class='del'>-		   timezone before comparing. */</div><div class='del'>-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					     &amp;start_tt.hour,</div><div class='del'>-					     &amp;start_tt.minute);</div><div class='del'>-		e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					     &amp;end_tt.hour,</div><div class='del'>-					     &amp;end_tt.minute);</div><div class='del'>-</div><div class='del'>-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone));</div><div class='del'>-</div><div class='del'>-		if (check_start_before_end (&amp;start_tt, start_zone,</div><div class='del'>-					    &amp;end_tt, end_zone,</div><div class='del'>-					    adjust_end_time)) {</div><div class='del'>-			if (adjust_end_time)</div><div class='del'>-				set_end_date = TRUE;</div><div class='del'>-			else</div><div class='del'>-				set_start_date = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (set_start_date) {</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), epage);</div><div class='del'>-		e_date_edit_set_date (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-				      start_tt.year, start_tt.month,</div><div class='del'>-				      start_tt.day);</div><div class='del'>-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					     start_tt.hour, start_tt.minute);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time), epage);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_end_date) {</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), epage);</div><div class='del'>-		e_date_edit_set_date (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-				      end_tt.year, end_tt.month, end_tt.day);</div><div class='del'>-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					     end_tt.hour, end_tt.minute);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time), epage);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Notify upstream */</div><div class='del'>-	notify_dates_changed (epage, &amp;start_tt, &amp;end_tt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the start or end date widgets change.  We check that the</div><div class='del'>- * start date &lt; end date and we set the "all day event" button as appropriate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-date_changed_cb (GtkWidget *dedit, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-</div><div class='del'>-	times_updated (epage, dedit == epage-&gt;priv-&gt;start_time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the start timezone is changed. If sync_timezones is set,</div><div class='del'>- * we set the end timezone to the same value. It also updates the start time</div><div class='del'>- * labels on the other notebook pages.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-start_timezone_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sync_timezones) {</div><div class='del'>-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-		priv-&gt;updating = TRUE;</div><div class='del'>-		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone), zone);</div><div class='del'>-		priv-&gt;updating = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	times_updated (epage, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the end timezone is changed. It checks if the end</div><div class='del'>- * timezone is the same as the start timezone and sets sync_timezones if so.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-end_timezone_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	icaltimezone *start_zone, *end_zone;</div><div class='del'>-	</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-	end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone));</div><div class='del'>-</div><div class='del'>-	priv-&gt;sync_timezones = (start_zone == end_zone) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	times_updated (epage, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback: all day event button toggled.</div><div class='del'>- * Note that this should only be called when the user explicitly toggles the</div><div class='del'>- * button. Be sure to block this handler when the toggle button's state is set</div><div class='del'>- * within the code.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-all_day_event_toggled_cb (GtkWidget *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	gboolean all_day;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time();</div><div class='del'>-	struct icaltimetype end_tt = icaltime_null_time();</div><div class='del'>-	gboolean date_set;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* When the all_day toggle is turned on, the start date is</div><div class='del'>-	 * rounded down to the start of the day, and end date is</div><div class='del'>-	 * rounded down to the start of the day on which the event</div><div class='del'>-	 * ends. The event is then taken to be inclusive of the days</div><div class='del'>-	 * between the start and end days.  Note that if the event end</div><div class='del'>-	 * is at midnight, we round it down to the previous day, so the</div><div class='del'>-	 * event times stay the same.</div><div class='del'>-	 *</div><div class='del'>-	 * When the all_day_toggle is turned off, then if the event is within</div><div class='del'>-	 * one day, we set the event start to the start of the working day,</div><div class='del'>-	 * and set the event end to one hour after it. If the event is longer</div><div class='del'>-	 * than one day, we set the event end to the end of the day it is on,</div><div class='del'>-	 * so that the actual event times remain the same.</div><div class='del'>-	 *</div><div class='del'>-	 * This may need tweaking to work well with different timezones used</div><div class='del'>-	 * in the event start &amp; end.</div><div class='del'>-	 */</div><div class='del'>-	all_day = GTK_TOGGLE_BUTTON (toggle)-&gt;active;</div><div class='del'>-</div><div class='del'>-	set_all_day (epage, all_day);</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					 &amp;start_tt.year,</div><div class='del'>-					 &amp;start_tt.month,</div><div class='del'>-					 &amp;start_tt.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-				     &amp;start_tt.hour,</div><div class='del'>-				     &amp;start_tt.minute);</div><div class='del'>-	g_assert (date_set);</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					 &amp;end_tt.year,</div><div class='del'>-					 &amp;end_tt.month,</div><div class='del'>-					 &amp;end_tt.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-				     &amp;end_tt.hour,</div><div class='del'>-				     &amp;end_tt.minute);</div><div class='del'>-	g_assert (date_set);</div><div class='del'>-</div><div class='del'>-	if (all_day) {</div><div class='del'>-		/* Round down to the start of the day. */</div><div class='del'>-		start_tt.hour = 0;</div><div class='del'>-		start_tt.minute  = 0;</div><div class='del'>-		start_tt.second  = 0;</div><div class='del'>-		start_tt.is_date = TRUE;</div><div class='del'>-</div><div class='del'>-		/* Round down to the start of the day, or the start of the</div><div class='del'>-		   previous day if it is midnight. */</div><div class='del'>-		icaltime_adjust (&amp;end_tt, 0, 0, 0, -1);</div><div class='del'>-		end_tt.hour = 0;</div><div class='del'>-		end_tt.minute  = 0;</div><div class='del'>-		end_tt.second  = 0;</div><div class='del'>-		end_tt.is_date = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		icaltimezone *start_zone, *end_zone;</div><div class='del'>-</div><div class='del'>-		if (end_tt.year == start_tt.year</div><div class='del'>-		    &amp;&amp; end_tt.month == start_tt.month</div><div class='del'>-		    &amp;&amp; end_tt.day == start_tt.day) {</div><div class='del'>-			/* The event is within one day, so we set the event</div><div class='del'>-			   start to the start of the working day, and the end</div><div class='del'>-			   to one hour later. */</div><div class='del'>-			start_tt.hour = calendar_config_get_day_start_hour ();</div><div class='del'>-			start_tt.minute  = calendar_config_get_day_start_minute ();</div><div class='del'>-			start_tt.second  = 0;</div><div class='del'>-</div><div class='del'>-			end_tt = start_tt;</div><div class='del'>-			icaltime_adjust (&amp;end_tt, 0, 1, 0, 0);</div><div class='del'>-		} else {</div><div class='del'>-			/* The event is longer than 1 day, so we keep exactly</div><div class='del'>-			   the same times, just using DATE-TIME rather than</div><div class='del'>-			   DATE. */</div><div class='del'>-			icaltime_adjust (&amp;end_tt, 1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Make sure that end &gt; start using the timezones. */</div><div class='del'>-		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-		end_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone));</div><div class='del'>-		check_start_before_end (&amp;start_tt, start_zone,</div><div class='del'>-					&amp;end_tt, end_zone,</div><div class='del'>-					TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					  epage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time),</div><div class='del'>-					  epage);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;start_time), start_tt.year,</div><div class='del'>-			      start_tt.month, start_tt.day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-				     start_tt.hour, start_tt.minute);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;end_time), end_tt.year,</div><div class='del'>-			      end_tt.month, end_tt.day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-				     end_tt.hour, end_tt.minute);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;start_time),</div><div class='del'>-					    epage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;end_time),</div><div class='del'>-					    epage);</div><div class='del'>-</div><div class='del'>-	/* Notify upstream */</div><div class='del'>-	notify_dates_changed (epage, &amp;start_tt, &amp;end_tt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the contacts button is clicked; we must bring up the</div><div class='del'>- * contact list dialog.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-contacts_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp_editor_show_contacts_dialog (priv-&gt;corba_select_names);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Currently we aren't getting the changed event from the</div><div class='del'>-	   SelectNames component correctly, so we aren't saving the event</div><div class='del'>-	   if just the contacts are changed. To work around that, we assume</div><div class='del'>-	   that if the contacts button is clicked it is changed. */</div><div class='del'>-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the categories button is clicked; we must bring up the</div><div class='del'>- * category list dialog.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-categories_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	entry = priv-&gt;categories;</div><div class='del'>-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	epage = EVENT_PAGE (data);</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static gboolean</div><div class='del'>-init_widgets (EventPage *epage)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Make sure the EDateEdit widgets use our timezones to get the</div><div class='del'>-	   current time. */</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;start_time),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   epage, NULL);</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;end_time),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   epage, NULL);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;summary), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (summary_changed_cb), epage);</div><div class='del'>-</div><div class='del'>-	/* Description - turn on word wrap. */</div><div class='del'>-	gtk_text_set_word_wrap (GTK_TEXT (priv-&gt;description), TRUE);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), epage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (start_timezone_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (end_timezone_changed_cb), epage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;all_day_event), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (all_day_event_toggled_cb), epage);</div><div class='del'>-</div><div class='del'>-	/* Contacts button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;contacts_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (contacts_clicked_cb), epage);</div><div class='del'>-</div><div class='del'>-	/* Categories button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;categories_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (categories_clicked_cb), epage);</div><div class='del'>-</div><div class='del'>-	/* Connect the default signal handler to use to make sure we notify</div><div class='del'>-	 * upstream of changes to the widget values.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;summary), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;location), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;all_day_event), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;description), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_public),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),</div><div class='del'>-			    epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_private),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),</div><div class='del'>-			    epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_confidential),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),</div><div class='del'>-			    epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;show_time_as_free),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),</div><div class='del'>-			    epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;show_time_as_busy),</div><div class='del'>-			    "toggled", GTK_SIGNAL_FUNC (field_changed_cb),</div><div class='del'>-			    epage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;categories), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), epage);</div><div class='del'>-</div><div class='del'>-	/* Create the contacts entry, a corba control from the address book. */</div><div class='del'>-	priv-&gt;corba_select_names = comp_editor_create_contacts_component ();</div><div class='del'>-	if (priv-&gt;corba_select_names == CORBA_OBJECT_NIL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;contacts_entry = comp_editor_create_contacts_control (priv-&gt;corba_select_names);</div><div class='del'>-	if (priv-&gt;contacts_entry == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;contacts_box),</div><div class='del'>-			   priv-&gt;contacts_entry);</div><div class='del'>-</div><div class='del'>-	/* Set the default timezone, so the timezone entry may be hidden. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone), zone);</div><div class='del'>-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv-&gt;end_timezone), zone);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_page_construct:</div><div class='del'>- * @epage: An event page.</div><div class='del'>- * </div><div class='del'>- * Constructs an event page by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @epage, or NULL if the widgets could not be</div><div class='del'>- * created.</div><div class='del'>- **/</div><div class='del'>-EventPage *</div><div class='del'>-event_page_construct (EventPage *epage)</div><div class='del'>-{</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = epage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-page.glade", </div><div class='del'>-				   NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("event_page_construct(): " </div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (epage)) {</div><div class='del'>-		g_message ("event_page_construct(): " </div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!init_widgets (epage)) {</div><div class='del'>-		g_message ("event_page_construct(): " </div><div class='del'>-			   "Could not initialize the widgets!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return epage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_page_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new event page.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created event page, or NULL if the page could</div><div class='del'>- * not be created.</div><div class='del'>- **/</div><div class='del'>-EventPage *</div><div class='del'>-event_page_new (void)</div><div class='del'>-{</div><div class='del'>-	EventPage *epage;</div><div class='del'>-</div><div class='del'>-	epage = gtk_type_new (TYPE_EVENT_PAGE);</div><div class='del'>-	if (!event_page_construct (epage)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (epage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return epage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *make_date_edit (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-make_date_edit (void)</div><div class='del'>-{</div><div class='del'>-	return comp_editor_new_date_edit (TRUE, TRUE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *make_timezone_entry (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-make_timezone_entry (void)</div><div class='del'>-{</div><div class='del'>-	return e_timezone_entry_new ();</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade<br/>deleted file mode 100644<br/>index 6be310448a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/event-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/event-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,601 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;event-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;event-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;.&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;event-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;event-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;6&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table11&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label56&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Su_mmary:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;default_focus_target&gt;general-summary&lt;/default_focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;general-summary&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label61&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;L_ocation:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;default_focus_target&gt;location&lt;/default_focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;location&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame31&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Date &amp;amp; Time&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table12&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label57&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Start time:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;start-time&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label58&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_End time:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;focus_target&gt;end-time&lt;/focus_target&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;start-time&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;creation_function&gt;make_date_edit&lt;/creation_function&gt;</div><div class='del'>-	  &lt;string1&gt;&lt;/string1&gt;</div><div class='del'>-	  &lt;string2&gt;&lt;/string2&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 16 May 2000 19:11:05 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;end-time&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;creation_function&gt;make_date_edit&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Tue, 16 May 2000 19:11:10 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;end-timezone&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;make_timezone_entry&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Mon, 18 Jun 2001 23:51:40 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;start-timezone&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;make_timezone_entry&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Mon, 18 Jun 2001 23:51:34 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;7.45058e-09&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;all-day-event&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;A_ll day event&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;scrolledwindow12&lt;/name&gt;</div><div class='del'>-      &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-      &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-      &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-      &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;description&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox54&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame32&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Classification&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox52&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;classification-public&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Pu_blic&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;True&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;classification-private&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Pri_vate&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;classification-confidential&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Con_fidential&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame33&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Show Time As&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox55&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;show-time-as-free&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;F_ree&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;group&gt;show_time_as_radio_group&lt;/group&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;show-time-as-busy&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;B_usy&lt;/label&gt;</div><div class='del'>-	    &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	    &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	    &lt;group&gt;show_time_as_radio_group&lt;/group&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox53&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;contacts-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label59&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Contacts...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;contacts-box&lt;/name&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;categories-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label60&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Ca_tegories...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h<br/>deleted file mode 100644<br/>index 3da59f4ada..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/event-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/event-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the event editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef EVENT_PAGE_H</div><div class='del'>-#define EVENT_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_EVENT_PAGE            (event_page_get_type ())</div><div class='del'>-#define EVENT_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_PAGE, EventPage))</div><div class='del'>-#define EVENT_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass))</div><div class='del'>-#define IS_EVENT_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_PAGE))</div><div class='del'>-#define IS_EVENT_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _EventPagePrivate EventPagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	EventPagePrivate *priv;</div><div class='del'>-} EventPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} EventPageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    event_page_get_type  (void);</div><div class='del'>-EventPage *event_page_construct (EventPage *epage);</div><div class='del'>-EventPage *event_page_new       (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c<br/>deleted file mode 100644<br/>index 2504ed3993..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/meeting-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/meeting-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,862 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-combo.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include "../component-factory.h"</div><div class='del'>-#include "../e-meeting-attendee.h"</div><div class='del'>-#include "../e-meeting-model.h"</div><div class='del'>-#include "../itip-utils.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "e-delegate-dialog.h"</div><div class='del'>-#include "meeting-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum columns {</div><div class='del'>-	MEETING_ATTENDEE_COL,</div><div class='del'>-	MEETING_MEMBER_COL,</div><div class='del'>-	MEETING_TYPE_COL,</div><div class='del'>-	MEETING_ROLE_COL,</div><div class='del'>-	MEETING_RSVP_COL,</div><div class='del'>-	MEETING_DELTO_COL,</div><div class='del'>-	MEETING_DELFROM_COL,</div><div class='del'>-	MEETING_STATUS_COL,</div><div class='del'>-	MEETING_CN_COL,</div><div class='del'>-	MEETING_LANG_COL,</div><div class='del'>-	MEETING_COLUMN_COUNT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Private part of the MeetingPage structure */</div><div class='del'>-struct _MeetingPagePrivate {</div><div class='del'>-	/* Lists of attendees */</div><div class='del'>-	GPtrArray *deleted_attendees;</div><div class='del'>-</div><div class='del'>-	/* To use in case of cancellation */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	</div><div class='del'>-	/* List of identities */</div><div class='del'>-	GList *addresses;</div><div class='del'>-	GList *address_strings;</div><div class='del'>-	gchar *default_address;</div><div class='del'>-	</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-	GtkWidget *organizer_table;</div><div class='del'>-	GtkWidget *organizer;</div><div class='del'>-	GtkWidget *organizer_lbl;</div><div class='del'>-	GtkWidget *other_organizer;</div><div class='del'>-	GtkWidget *other_organizer_lbl;</div><div class='del'>-	GtkWidget *other_organizer_btn;</div><div class='del'>-	GtkWidget *existing_organizer_table;</div><div class='del'>-	GtkWidget *existing_organizer;</div><div class='del'>-	GtkWidget *existing_organizer_btn;</div><div class='del'>-	GtkWidget *invite;</div><div class='del'>-	</div><div class='del'>-	/* E Table stuff */</div><div class='del'>-	EMeetingModel *model;</div><div class='del'>-	ETableScrolled *etable;</div><div class='del'>-	gint row;</div><div class='del'>-	</div><div class='del'>-	/* For handling who the organizer is */</div><div class='del'>-	gboolean other;</div><div class='del'>-	gboolean existing;</div><div class='del'>-        gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void meeting_page_class_init (MeetingPageClass *class);</div><div class='del'>-static void meeting_page_init (MeetingPage *mpage);</div><div class='del'>-static void meeting_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *meeting_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void meeting_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean meeting_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-</div><div class='del'>-static gint right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer data);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * meeting_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #MeetingPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #MeetingPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-meeting_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType meeting_page_type;</div><div class='del'>-</div><div class='del'>-	if (!meeting_page_type) {</div><div class='del'>-		static const GtkTypeInfo meeting_page_info = {</div><div class='del'>-			"MeetingPage",</div><div class='del'>-			sizeof (MeetingPage),</div><div class='del'>-			sizeof (MeetingPageClass),</div><div class='del'>-			(GtkClassInitFunc) meeting_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) meeting_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		meeting_page_type = </div><div class='del'>-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-					 &amp;meeting_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return meeting_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-meeting_page_class_init (MeetingPageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = meeting_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = meeting_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = meeting_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = meeting_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = NULL;</div><div class='del'>-	editor_page_class-&gt;set_dates = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = meeting_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-meeting_page_init (MeetingPage *mpage)</div><div class='del'>-{</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (MeetingPagePrivate, 1);</div><div class='del'>-	mpage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;deleted_attendees = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-	priv-&gt;invite = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;model = NULL;</div><div class='del'>-	priv-&gt;etable = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_attendees (CalComponent *comp, const GPtrArray *attendees)</div><div class='del'>-{</div><div class='del'>-	GSList *comp_attendees = NULL, *l;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; attendees-&gt;len; i++) {</div><div class='del'>-		EMeetingAttendee *ia = g_ptr_array_index (attendees, i);</div><div class='del'>-		CalComponentAttendee *ca;</div><div class='del'>-		</div><div class='del'>-		ca = e_meeting_attendee_as_cal_component_attendee (ia);</div><div class='del'>-		</div><div class='del'>-		comp_attendees = g_slist_prepend (comp_attendees, ca);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	comp_attendees = g_slist_reverse (comp_attendees);</div><div class='del'>-	cal_component_set_attendee_list (comp, comp_attendees);</div><div class='del'>-	</div><div class='del'>-	for (l = comp_attendees; l != NULL; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);	</div><div class='del'>-	g_slist_free (comp_attendees);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cleanup_attendees (GPtrArray *attendees)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; attendees-&gt;len; i++)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (attendees, i)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the task page */</div><div class='del'>-static void</div><div class='del'>-meeting_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_MEETING_PAGE (object));</div><div class='del'>-</div><div class='del'>-	mpage = MEETING_PAGE (object);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-	</div><div class='del'>-	cleanup_attendees (priv-&gt;deleted_attendees);</div><div class='del'>-	g_ptr_array_free (priv-&gt;deleted_attendees, FALSE);</div><div class='del'>-	</div><div class='del'>-	itip_addresses_free (priv-&gt;addresses);</div><div class='del'>-	g_list_foreach (priv-&gt;address_strings, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free (priv-&gt;address_strings);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	mpage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the task page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-meeting_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	mpage = MEETING_PAGE (page);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the task page */</div><div class='del'>-static void</div><div class='del'>-meeting_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	mpage = MEETING_PAGE (page);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (priv-&gt;organizer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (MeetingPage *mpage)</div><div class='del'>-{</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (priv-&gt;organizer)-&gt;entry), "");</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (priv-&gt;other_organizer), "");</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;existing_organizer), _("None"));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;organizer_table);</div><div class='del'>-	gtk_widget_hide (priv-&gt;existing_organizer_table);	</div><div class='del'>-</div><div class='del'>-	gtk_widget_hide (priv-&gt;other_organizer_lbl);</div><div class='del'>-	gtk_widget_hide (priv-&gt;other_organizer);</div><div class='del'>-</div><div class='del'>-	priv-&gt;existing = FALSE;</div><div class='del'>-	priv-&gt;other = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the meeting page */</div><div class='del'>-static void</div><div class='del'>-meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	CalComponentOrganizer organizer;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	mpage = MEETING_PAGE (page);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Clean out old data */</div><div class='del'>-	if (priv-&gt;comp != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-	priv-&gt;comp = NULL;</div><div class='del'>-	</div><div class='del'>-	cleanup_attendees (priv-&gt;deleted_attendees);</div><div class='del'>-</div><div class='del'>-	/* Clean the screen */</div><div class='del'>-	clear_widgets (mpage);</div><div class='del'>-</div><div class='del'>-	/* Component for cancellation */</div><div class='del'>-	priv-&gt;comp = cal_component_clone (comp);</div><div class='del'>-	</div><div class='del'>-	/* Organizer */</div><div class='del'>-	cal_component_get_organizer (comp, &amp;organizer);</div><div class='del'>-	priv-&gt;addresses = itip_addresses_get ();</div><div class='del'>-	for (l = priv-&gt;addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ItipAddress *a = l-&gt;data;</div><div class='del'>-		char *s;</div><div class='del'>-		</div><div class='del'>-		s = e_utf8_to_gtk_string (GTK_COMBO (priv-&gt;organizer)-&gt;entry, a-&gt;full);</div><div class='del'>-		priv-&gt;address_strings = g_list_append (priv-&gt;address_strings, s);</div><div class='del'>-		if (a-&gt;default_address)</div><div class='del'>-			priv-&gt;default_address = s;</div><div class='del'>-	}</div><div class='del'>-	gtk_combo_set_popdown_strings (GTK_COMBO (priv-&gt;organizer), priv-&gt;address_strings);</div><div class='del'>-</div><div class='del'>-	if (organizer.value != NULL) {</div><div class='del'>-		const gchar *strip = itip_strip_mailto (organizer.value);</div><div class='del'>-		gchar *s, *string;</div><div class='del'>-</div><div class='del'>-		gtk_widget_hide (priv-&gt;organizer_table);</div><div class='del'>-		gtk_widget_show (priv-&gt;existing_organizer_table);</div><div class='del'>-		gtk_widget_hide (priv-&gt;invite);</div><div class='del'>-		</div><div class='del'>-		if (organizer.cn != NULL)</div><div class='del'>-			string = g_strdup_printf ("%s &lt;%s&gt;", organizer.cn, strip);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup (strip);</div><div class='del'>-		s = e_utf8_to_gtk_string (priv-&gt;existing_organizer, string);</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (priv-&gt;existing_organizer), s);</div><div class='del'>-		g_free (s);</div><div class='del'>-		g_free (string);</div><div class='del'>-</div><div class='del'>-		priv-&gt;existing = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (priv-&gt;other_organizer_lbl);</div><div class='del'>-		gtk_widget_hide (priv-&gt;other_organizer);</div><div class='del'>-</div><div class='del'>-		e_dialog_editable_set (GTK_COMBO (priv-&gt;organizer)-&gt;entry, priv-&gt;default_address);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the meeting page */</div><div class='del'>-static gboolean</div><div class='del'>-meeting_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	CalComponentOrganizer organizer = {NULL, NULL, NULL, NULL};</div><div class='del'>-</div><div class='del'>-	mpage = MEETING_PAGE (page);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;existing) {</div><div class='del'>-		gchar *addr = NULL, *cn = NULL;</div><div class='del'>-		GList *l;</div><div class='del'>-		</div><div class='del'>-		if (priv-&gt;other) {</div><div class='del'>-			addr = e_dialog_editable_get (priv-&gt;other_organizer);</div><div class='del'>-		} else {</div><div class='del'>-			gchar *str = e_dialog_editable_get (GTK_COMBO (priv-&gt;organizer)-&gt;entry);</div><div class='del'>-			for (l = priv-&gt;addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-				ItipAddress *a = l-&gt;data;</div><div class='del'>-				</div><div class='del'>-				if (!strcmp (a-&gt;full, str)) {</div><div class='del'>-					addr = g_strdup (a-&gt;address);</div><div class='del'>-					cn = g_strdup (a-&gt;name);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free (str);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (addr == NULL || strlen (addr) == 0) {</div><div class='del'>-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-				  _("An organizer is required."));</div><div class='del'>-			g_free (addr);</div><div class='del'>-			g_free (cn);</div><div class='del'>-			return FALSE;</div><div class='del'>-		} else {</div><div class='del'>-			gchar *tmp;</div><div class='del'>-			</div><div class='del'>-			tmp = addr;</div><div class='del'>-			addr = g_strdup_printf ("MAILTO:%s", addr);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-		}</div><div class='del'>-	</div><div class='del'>-		organizer.value = addr;</div><div class='del'>-		organizer.cn = cn;</div><div class='del'>-		cal_component_set_organizer (comp, &amp;organizer);</div><div class='del'>-		g_free (addr);</div><div class='del'>-		g_free (cn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (e_meeting_model_count_actual_attendees (priv-&gt;model) &lt; 1) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("At least one attendee is required."));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	set_attendees (comp, e_meeting_model_get_attendees (priv-&gt;model));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (MeetingPage *mpage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (mpage);</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("meeting-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;organizer_table = GW ("organizer-table");</div><div class='del'>-	priv-&gt;organizer = GW ("organizer");</div><div class='del'>-	priv-&gt;organizer_lbl = GW ("organizer-label");</div><div class='del'>-	priv-&gt;other_organizer = GW ("other-organizer");</div><div class='del'>-	priv-&gt;other_organizer_lbl = GW ("other-organizer-label");</div><div class='del'>-	priv-&gt;other_organizer_btn = GW ("other-organizer-button");</div><div class='del'>-	priv-&gt;existing_organizer_table = GW ("existing-organizer-table");</div><div class='del'>-	priv-&gt;existing_organizer = GW ("existing-organizer");</div><div class='del'>-	priv-&gt;existing_organizer_btn = GW ("existing-organizer-button");</div><div class='del'>-	priv-&gt;invite = GW ("invite");</div><div class='del'>-	</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;invite</div><div class='del'>-		&amp;&amp; priv-&gt;organizer_table</div><div class='del'>-		&amp;&amp; priv-&gt;organizer</div><div class='del'>-		&amp;&amp; priv-&gt;organizer_lbl</div><div class='del'>-		&amp;&amp; priv-&gt;other_organizer</div><div class='del'>-		&amp;&amp; priv-&gt;other_organizer_lbl</div><div class='del'>-		&amp;&amp; priv-&gt;other_organizer_btn</div><div class='del'>-		&amp;&amp; priv-&gt;existing_organizer_table</div><div class='del'>-		&amp;&amp; priv-&gt;existing_organizer</div><div class='del'>-		&amp;&amp; priv-&gt;existing_organizer_btn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	mpage = MEETING_PAGE (data);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function called to make the organizer other than the user */</div><div class='del'>-static void</div><div class='del'>-other_clicked_cb (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	mpage = MEETING_PAGE (data);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_hide (priv-&gt;organizer_lbl);</div><div class='del'>-	gtk_widget_hide (priv-&gt;organizer);</div><div class='del'>-	gtk_widget_hide (priv-&gt;other_organizer_btn);</div><div class='del'>-	gtk_widget_show (priv-&gt;other_organizer_lbl);</div><div class='del'>-	gtk_widget_show (priv-&gt;other_organizer);</div><div class='del'>-</div><div class='del'>-	priv-&gt;other = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function called to change the organizer */</div><div class='del'>-static void</div><div class='del'>-change_clicked_cb (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	mpage = MEETING_PAGE (data);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;organizer_table);</div><div class='del'>-	gtk_widget_hide (priv-&gt;existing_organizer_table);</div><div class='del'>-	gtk_widget_show (priv-&gt;invite);</div><div class='del'>-</div><div class='del'>-	gtk_combo_set_popdown_strings (GTK_COMBO (priv-&gt;organizer), priv-&gt;address_strings);</div><div class='del'>-	e_dialog_editable_set (GTK_COMBO (priv-&gt;organizer)-&gt;entry, priv-&gt;default_address);</div><div class='del'>-</div><div class='del'>-	priv-&gt;existing = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Function called to invite more people */</div><div class='del'>-static void</div><div class='del'>-invite_cb (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	mpage = MEETING_PAGE (data);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_meeting_model_invite_others_dialog (priv-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (MeetingPage *mpage)</div><div class='del'>-{</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Organizer */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv-&gt;organizer)-&gt;entry), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), mpage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;other_organizer_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (other_clicked_cb), mpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;existing_organizer_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (change_clicked_cb), mpage);</div><div class='del'>-</div><div class='del'>-	/* Invite button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;invite), "clicked", </div><div class='del'>-			    GTK_SIGNAL_FUNC (invite_cb), mpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-popup_delegate_cb (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage = MEETING_PAGE (data);</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	EDelegateDialog *edd;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	char *address = NULL, *name = NULL;</div><div class='del'>-	</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ia = e_meeting_model_find_attendee_at_row (priv-&gt;model, priv-&gt;row);</div><div class='del'>-</div><div class='del'>-	/* Show dialog. */</div><div class='del'>-	edd = e_delegate_dialog_new (NULL, itip_strip_mailto (e_meeting_attendee_get_delto (ia)));</div><div class='del'>-	dialog = e_delegate_dialog_get_toplevel (edd);</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0){</div><div class='del'>-		EMeetingAttendee *ic;</div><div class='del'>-		</div><div class='del'>-		name = e_delegate_dialog_get_delegate_name (edd);</div><div class='del'>-		address = e_delegate_dialog_get_delegate (edd);</div><div class='del'>-</div><div class='del'>-		/* Make sure we can add the new delegatee person */</div><div class='del'>-		if (e_meeting_model_find_attendee (priv-&gt;model, address, NULL) != NULL) {</div><div class='del'>-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-				  _("That person is already attending the meeting!"));</div><div class='del'>-			goto cleanup;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Update information for attendee */</div><div class='del'>-		if (e_meeting_attendee_is_set_delto (ia)) {</div><div class='del'>-			EMeetingAttendee *ib;</div><div class='del'>-			</div><div class='del'>-			ib = e_meeting_model_find_attendee (priv-&gt;model, itip_strip_mailto (e_meeting_attendee_get_delto (ia)), NULL);</div><div class='del'>-			if (ib != NULL) {</div><div class='del'>-				gtk_object_ref (GTK_OBJECT (ib));</div><div class='del'>-				g_ptr_array_add (priv-&gt;deleted_attendees, ib);</div><div class='del'>-				</div><div class='del'>-				e_meeting_model_remove_attendee (priv-&gt;model, ib);</div><div class='del'>-			}			</div><div class='del'>-		}</div><div class='del'>-		e_meeting_attendee_set_delto (ia, g_strdup_printf ("MAILTO:%s", address));</div><div class='del'>-</div><div class='del'>-		/* Construct delegatee information */</div><div class='del'>-		ic = e_meeting_model_add_attendee_with_defaults (priv-&gt;model);</div><div class='del'>-		</div><div class='del'>- 		e_meeting_attendee_set_address (ic, g_strdup_printf ("MAILTO:%s", address));</div><div class='del'>-		e_meeting_attendee_set_delfrom (ic, g_strdup (e_meeting_attendee_get_address (ia)));</div><div class='del'>-		e_meeting_attendee_set_cn (ic, g_strdup (name));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- cleanup:</div><div class='del'>-	g_free (name);</div><div class='del'>-	g_free (address);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (edd));</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_delete_cb (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage = MEETING_PAGE (data);</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	int pos = 0;</div><div class='del'>-	</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ia = e_meeting_model_find_attendee_at_row (priv-&gt;model, priv-&gt;row);</div><div class='del'>-</div><div class='del'>-	/* If this was a delegatee, no longer delegate */</div><div class='del'>-	if (e_meeting_attendee_is_set_delfrom (ia)) {</div><div class='del'>-		EMeetingAttendee *ib;</div><div class='del'>-		</div><div class='del'>-		ib = e_meeting_model_find_attendee (priv-&gt;model, e_meeting_attendee_get_delfrom (ia), &amp;pos);</div><div class='del'>-		if (ib != NULL)</div><div class='del'>-			e_meeting_attendee_set_delto (ib, NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Handle deleting all attendees in the delegation chain */	</div><div class='del'>-	while (ia != NULL) {</div><div class='del'>-		EMeetingAttendee *ib = NULL;</div><div class='del'>-</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (ia));</div><div class='del'>-		g_ptr_array_add (priv-&gt;deleted_attendees, ia);</div><div class='del'>-		e_meeting_model_remove_attendee (priv-&gt;model, ia);</div><div class='del'>-</div><div class='del'>-		if (e_meeting_attendee_get_delto (ia) != NULL)</div><div class='del'>-			ib = e_meeting_model_find_attendee (priv-&gt;model, e_meeting_attendee_get_delto (ia), NULL);</div><div class='del'>-		ia = ib;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAN_DELEGATE = 2,</div><div class='del'>-	CAN_DELETE = 4</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPopupMenu context_menu[] = {</div><div class='del'>-#if 0</div><div class='del'>-	E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb),  CAN_DELEGATE),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb),   CAN_DELETE),</div><div class='del'>-	</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* handle context menu over message-list */</div><div class='del'>-static gint</div><div class='del'>-right_click_cb (ETable *etable, gint row, gint col, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage = MEETING_PAGE (data);</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	GtkMenu *menu;</div><div class='del'>-	int enable_mask = 0, hide_mask = 0, view_row;</div><div class='del'>-</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	view_row = e_table_model_to_view_row (etable, row);</div><div class='del'>-	priv-&gt;row = e_meeting_model_etable_view_to_model_row (etable, priv-&gt;model, view_row);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: if you enable Delegate, then change index to '1' */</div><div class='del'>-	context_menu[0].pixmap_widget = gnome_stock_new_with_icon (GNOME_STOCK_MENU_TRASH);</div><div class='del'>-	</div><div class='del'>-	menu = e_popup_menu_create (context_menu, enable_mask, hide_mask, data);</div><div class='del'>-	e_auto_kill_popup_menu_on_hide (menu);</div><div class='del'>-	</div><div class='del'>-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL,</div><div class='del'>-			event-&gt;button.button, event-&gt;button.time);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the ETable gets a focus-out event.  We have to commit any</div><div class='del'>- * pending click-to-add state for if the event editor is being destroyed.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-table_canvas_focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	mpage = MEETING_PAGE (data);</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (priv-&gt;etable);</div><div class='del'>-</div><div class='del'>-	e_table_commit_click_to_add (etable);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * meeting_page_construct:</div><div class='del'>- * @mpage: An task details page.</div><div class='del'>- * </div><div class='del'>- * Constructs an task page by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @mpage, or NULL if the widgets could not </div><div class='del'>- * be created.</div><div class='del'>- **/</div><div class='del'>-MeetingPage *</div><div class='del'>-meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR </div><div class='del'>-				   "/meeting-page.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("meeting_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (mpage)) {</div><div class='del'>-		g_message ("meeting_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* The etable displaying attendees and their status */</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (emm));</div><div class='del'>-	priv-&gt;model = emm;</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/config/et-header-meeting-page", evolution_dir);</div><div class='del'>-	priv-&gt;etable = e_meeting_model_etable_from_model (priv-&gt;model, </div><div class='del'>-							  EVOLUTION_ETSPECDIR "/meeting-page.etspec", </div><div class='del'>-							  filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	real_table = e_table_scrolled_get_table (priv-&gt;etable);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (real_table),</div><div class='del'>-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (real_table-&gt;table_canvas), "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_canvas_focus_out_cb), mpage);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (priv-&gt;etable));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (priv-&gt;main), GTK_WIDGET (priv-&gt;etable), TRUE, TRUE, 2);</div><div class='del'>-	</div><div class='del'>-	/* Init the widget signals */</div><div class='del'>-	init_widgets (mpage);</div><div class='del'>-</div><div class='del'>-	return mpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * meeting_page_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new task details page.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created task details page, or NULL if the page could</div><div class='del'>- * not be created.</div><div class='del'>- **/</div><div class='del'>-MeetingPage *</div><div class='del'>-meeting_page_new (EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	MeetingPage *mpage;</div><div class='del'>-</div><div class='del'>-	mpage = gtk_type_new (TYPE_MEETING_PAGE);</div><div class='del'>-	if (!meeting_page_construct (mpage, emm)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (mpage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * meeting_page_get_cancel_comp:</div><div class='del'>- * @mpage: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-meeting_page_get_cancel_comp (MeetingPage *mpage)</div><div class='del'>-{</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (mpage != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_MEETING_PAGE (mpage), NULL);</div><div class='del'>-</div><div class='del'>-	priv = mpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;deleted_attendees-&gt;len == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	set_attendees (priv-&gt;comp, priv-&gt;deleted_attendees);</div><div class='del'>-	</div><div class='del'>-	return cal_component_clone (priv-&gt;comp);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/meeting-page.etspec b/calendar/gui/dialogs/meeting-page.etspec<br/>deleted file mode 100644<br/>index 96bc480fe9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/meeting-page.etspec?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/meeting-page.etspec</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-&lt;ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true"&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-</div><div class='del'>-  &lt;ETableState&gt;</div><div class='del'>-     &lt;column source="0"/&gt;</div><div class='del'>-     &lt;column source="2"/&gt;</div><div class='del'>-     &lt;column source="3"/&gt;</div><div class='del'>-     &lt;column source="4"/&gt;</div><div class='del'>-     &lt;column source="7"/&gt;</div><div class='del'>-     &lt;grouping&gt;&lt;/grouping&gt;</div><div class='del'>-  &lt;/ETableState&gt;</div><div class='del'>-&lt;/ETableSpecification&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/meeting-page.glade b/calendar/gui/dialogs/meeting-page.glade<br/>deleted file mode 100644<br/>index f06f457d16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/meeting-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/meeting-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,306 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-details-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-details-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;meeting-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;meeting-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;organizer-table&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;organizer&lt;/name&gt;</div><div class='del'>-	  &lt;value_in_list&gt;True&lt;/value_in_list&gt;</div><div class='del'>-	  &lt;ok_if_empty&gt;False&lt;/ok_if_empty&gt;</div><div class='del'>-	  &lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	  &lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	  &lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	  &lt;items&gt;&lt;/items&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	    &lt;name&gt;entry2&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;other-organizer-button&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Other Organizer&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;other-organizer&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;organizer-label&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Organizer:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;other-organizer-label&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Organizer:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;existing-organizer-table&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Organizer:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;existing-organizer-button&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;_Change Organizer&lt;/label&gt;</div><div class='del'>-	  &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;existing-organizer&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;None&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;invite&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;label&gt;_Invite Others...&lt;/label&gt;</div><div class='del'>-      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h<br/>deleted file mode 100644<br/>index b7c8571b44..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/meeting-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/meeting-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MEETING_PAGE_H</div><div class='del'>-#define MEETING_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "../e-meeting-model.h"</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_MEETING_PAGE            (meeting_page_get_type ())</div><div class='del'>-#define MEETING_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_MEETING_PAGE, MeetingPage))</div><div class='del'>-#define MEETING_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_MEETING_PAGE, MeetingPageClass))</div><div class='del'>-#define IS_MEETING_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_MEETING_PAGE))</div><div class='del'>-#define IS_MEETING_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_MEETING_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _MeetingPagePrivate MeetingPagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	MeetingPagePrivate *priv;</div><div class='del'>-} MeetingPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} MeetingPageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType       meeting_page_get_type          (void);</div><div class='del'>-MeetingPage  *meeting_page_construct         (MeetingPage   *mpage,</div><div class='del'>-					      EMeetingModel *emm);</div><div class='del'>-MeetingPage  *meeting_page_new               (EMeetingModel *emm);</div><div class='del'>-CalComponent *meeting_page_get_cancel_comp   (MeetingPage   *mpage);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c<br/>deleted file mode 100644<br/>index a096e403a8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/recurrence-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/recurrence-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2446 +0,0 @@</div><div class='del'>-/* Evolution calendar - Recurrence page of the calendar component dialogs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../tag-calendar.h"</div><div class='del'>-#include "../weekday-picker.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "recurrence-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum month_num_options {</div><div class='del'>-	MONTH_NUM_FIRST,</div><div class='del'>-	MONTH_NUM_SECOND,</div><div class='del'>-	MONTH_NUM_THIRD,</div><div class='del'>-	MONTH_NUM_FOURTH,</div><div class='del'>-	MONTH_NUM_LAST,</div><div class='del'>-	MONTH_NUM_DAY,</div><div class='del'>-	MONTH_NUM_OTHER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int month_num_options_map[] = {</div><div class='del'>-	MONTH_NUM_FIRST,</div><div class='del'>-	MONTH_NUM_SECOND,</div><div class='del'>-	MONTH_NUM_THIRD,</div><div class='del'>-	MONTH_NUM_FOURTH,</div><div class='del'>-	MONTH_NUM_LAST,</div><div class='del'>-	MONTH_NUM_DAY,</div><div class='del'>-	MONTH_NUM_OTHER,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum month_day_options {</div><div class='del'>-	MONTH_DAY_NTH,</div><div class='del'>-	MONTH_DAY_MON,</div><div class='del'>-	MONTH_DAY_TUE,</div><div class='del'>-	MONTH_DAY_WED,</div><div class='del'>-	MONTH_DAY_THU,</div><div class='del'>-	MONTH_DAY_FRI,</div><div class='del'>-	MONTH_DAY_SAT,</div><div class='del'>-	MONTH_DAY_SUN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int month_day_options_map[] = {</div><div class='del'>-	MONTH_DAY_NTH,</div><div class='del'>-	MONTH_DAY_MON,</div><div class='del'>-	MONTH_DAY_TUE,</div><div class='del'>-	MONTH_DAY_WED,</div><div class='del'>-	MONTH_DAY_THU,</div><div class='del'>-	MONTH_DAY_FRI,</div><div class='del'>-	MONTH_DAY_SAT,</div><div class='del'>-	MONTH_DAY_SUN,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum recur_type {</div><div class='del'>-	RECUR_NONE,</div><div class='del'>-	RECUR_SIMPLE,</div><div class='del'>-	RECUR_CUSTOM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int type_map[] = {</div><div class='del'>-	RECUR_NONE,</div><div class='del'>-	RECUR_SIMPLE,</div><div class='del'>-	RECUR_CUSTOM,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int freq_map[] = {</div><div class='del'>-	ICAL_DAILY_RECURRENCE,</div><div class='del'>-	ICAL_WEEKLY_RECURRENCE,</div><div class='del'>-	ICAL_MONTHLY_RECURRENCE,</div><div class='del'>-	ICAL_YEARLY_RECURRENCE,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum ending_type {</div><div class='del'>-	ENDING_FOR,</div><div class='del'>-	ENDING_UNTIL,</div><div class='del'>-	ENDING_FOREVER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int ending_types_map[] = {</div><div class='del'>-	ENDING_FOR,</div><div class='del'>-	ENDING_UNTIL,</div><div class='del'>-	ENDING_FOREVER,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char *date_suffix[] = {</div><div class='del'>-	N_("st"),</div><div class='del'>-	N_("nd"),</div><div class='del'>-	N_("rd"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("st"),</div><div class='del'>-	N_("nd"),</div><div class='del'>-	N_("rd"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("th"),</div><div class='del'>-	N_("st")</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Private part of the RecurrencePage structure */</div><div class='del'>-struct _RecurrencePagePrivate {</div><div class='del'>-	/* Component we use to expand the recurrence rules for the preview */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	GtkWidget *summary;</div><div class='del'>-	GtkWidget *date_time;</div><div class='del'>-		   </div><div class='del'>-	GtkWidget *none;</div><div class='del'>-	GtkWidget *simple;</div><div class='del'>-	GtkWidget *custom;</div><div class='del'>-		   </div><div class='del'>-	GtkWidget *params;</div><div class='del'>-	GtkWidget *interval_value;</div><div class='del'>-	GtkWidget *interval_unit;</div><div class='del'>-	GtkWidget *special;</div><div class='del'>-	GtkWidget *ending_menu;</div><div class='del'>-	GtkWidget *ending_special;</div><div class='del'>-	GtkWidget *custom_warning_bin;</div><div class='del'>-</div><div class='del'>-	/* For weekly recurrences, created by hand */</div><div class='del'>-	GtkWidget *weekday_picker;</div><div class='del'>-	guint8 weekday_day_mask;</div><div class='del'>-	guint8 weekday_blocked_day_mask;</div><div class='del'>-</div><div class='del'>-	/* For monthly recurrences, created by hand */</div><div class='del'>-	int month_index;</div><div class='del'>-</div><div class='del'>-	GtkWidget *month_day_menu;</div><div class='del'>-	enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-	GtkWidget *month_num_menu;</div><div class='del'>-	enum month_num_options month_num;</div><div class='del'>-	</div><div class='del'>-	/* For ending date, created by hand */</div><div class='del'>-	GtkWidget *ending_date_edit;</div><div class='del'>-	struct icaltimetype ending_date_tt;</div><div class='del'>-</div><div class='del'>-	/* For ending count of occurrences, created by hand */</div><div class='del'>-	GtkWidget *ending_count_spin;</div><div class='del'>-	int ending_count;</div><div class='del'>-</div><div class='del'>-	/* More widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *exception_date;</div><div class='del'>-	GtkWidget *exception_list;</div><div class='del'>-	GtkWidget *exception_add;</div><div class='del'>-	GtkWidget *exception_modify;</div><div class='del'>-	GtkWidget *exception_delete;</div><div class='del'>-</div><div class='del'>-	GtkWidget *preview_bin;</div><div class='del'>-</div><div class='del'>-	/* For the recurrence preview, the actual widget */</div><div class='del'>-	GtkWidget *preview_calendar;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void recurrence_page_class_init (RecurrencePageClass *class);</div><div class='del'>-static void recurrence_page_init (RecurrencePage *rpage);</div><div class='del'>-static void recurrence_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *recurrence_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void recurrence_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void recurrence_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean recurrence_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static void recurrence_page_set_summary (CompEditorPage *page, const char *summary);</div><div class='del'>-static void recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-static void field_changed (RecurrencePage *apage);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * recurrence_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #RecurrencePage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #RecurrencePage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-recurrence_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType recurrence_page_type;</div><div class='del'>-</div><div class='del'>-	if (!recurrence_page_type) {</div><div class='del'>-		static const GtkTypeInfo recurrence_page_info = {</div><div class='del'>-			"RecurrencePage",</div><div class='del'>-			sizeof (RecurrencePage),</div><div class='del'>-			sizeof (RecurrencePageClass),</div><div class='del'>-			(GtkClassInitFunc) recurrence_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) recurrence_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		recurrence_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-							&amp;recurrence_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return recurrence_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_class_init (RecurrencePageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = recurrence_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = recurrence_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = recurrence_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = recurrence_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = recurrence_page_set_summary;</div><div class='del'>-	editor_page_class-&gt;set_dates = recurrence_page_set_dates;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = recurrence_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_init (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (RecurrencePagePrivate, 1);</div><div class='del'>-	rpage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-	priv-&gt;summary = NULL;</div><div class='del'>-	priv-&gt;date_time = NULL;</div><div class='del'>-	priv-&gt;none = NULL;</div><div class='del'>-	priv-&gt;simple = NULL;</div><div class='del'>-	priv-&gt;custom = NULL;</div><div class='del'>-	priv-&gt;params = NULL;</div><div class='del'>-	priv-&gt;interval_value = NULL;</div><div class='del'>-	priv-&gt;interval_unit = NULL;</div><div class='del'>-	priv-&gt;special = NULL;</div><div class='del'>-	priv-&gt;ending_menu = NULL;</div><div class='del'>-	priv-&gt;ending_special = NULL;</div><div class='del'>-	priv-&gt;custom_warning_bin = NULL;</div><div class='del'>-	priv-&gt;weekday_picker = NULL;</div><div class='del'>-	priv-&gt;month_day_menu = NULL;</div><div class='del'>-	priv-&gt;month_num_menu = NULL;</div><div class='del'>-	priv-&gt;ending_date_edit = NULL;</div><div class='del'>-	priv-&gt;ending_count_spin = NULL;</div><div class='del'>-	priv-&gt;exception_date = NULL;</div><div class='del'>-	priv-&gt;exception_list = NULL;</div><div class='del'>-	priv-&gt;exception_add = NULL;</div><div class='del'>-	priv-&gt;exception_modify = NULL;</div><div class='del'>-	priv-&gt;exception_delete = NULL;</div><div class='del'>-	priv-&gt;preview_bin = NULL;</div><div class='del'>-	priv-&gt;preview_calendar = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees the CalComponentDateTime stored in the GtkCList */</div><div class='del'>-static void</div><div class='del'>-free_exception_date_time (CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	g_free (dt-&gt;value);</div><div class='del'>-	g_free ((char*)dt-&gt;tzid);</div><div class='del'>-	g_free (dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_RECURRENCE_PAGE (object));</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (object);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	rpage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the recurrence page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-recurrence_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (e_dialog_toggle_get (priv-&gt;none))</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;none);</div><div class='del'>-	else if (e_dialog_toggle_get (priv-&gt;simple))</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;simple);</div><div class='del'>-	else if (e_dialog_toggle_get (priv-&gt;custom))</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;custom);</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;weekday_day_mask = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;month_index = 1;</div><div class='del'>-	priv-&gt;month_num = MONTH_NUM_DAY;</div><div class='del'>-	priv-&gt;month_day = MONTH_DAY_NTH;</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-	e_dialog_radio_set (priv-&gt;none, RECUR_NONE, type_map);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv-&gt;interval_value));</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), rpage);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;interval_value, 1);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), rpage);</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;interval_unit,</div><div class='del'>-				  ICAL_DAILY_RECURRENCE,</div><div class='del'>-				  freq_map);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ending_date_tt = icaltime_today ();</div><div class='del'>-	priv-&gt;ending_count = 1;</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;ending_menu));</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;ending_menu, </div><div class='del'>-				  ENDING_FOREVER,</div><div class='del'>-				  ending_types_map);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-</div><div class='del'>-	/* Exceptions list */</div><div class='del'>-	gtk_clist_clear (GTK_CLIST (priv-&gt;exception_list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a static string out of an exception date */</div><div class='del'>-static char *</div><div class='del'>-get_exception_string (CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	static char buf[256];</div><div class='del'>-	struct tm tmp_tm;</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_year = dt-&gt;value-&gt;year - 1900;</div><div class='del'>-	tmp_tm.tm_mon = dt-&gt;value-&gt;month - 1;</div><div class='del'>-	tmp_tm.tm_mday = dt-&gt;value-&gt;day;</div><div class='del'>-	tmp_tm.tm_hour = dt-&gt;value-&gt;hour;</div><div class='del'>-	tmp_tm.tm_min = dt-&gt;value-&gt;minute;</div><div class='del'>-	tmp_tm.tm_sec = dt-&gt;value-&gt;second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	tmp_tm.tm_wday = time_day_of_week (dt-&gt;value-&gt;day,</div><div class='del'>-					   dt-&gt;value-&gt;month - 1,</div><div class='del'>-					   dt-&gt;value-&gt;year);</div><div class='del'>-</div><div class='del'>-	e_time_format_date_and_time (&amp;tmp_tm, calendar_config_get_24_hour_format(), FALSE, FALSE, buf, sizeof (buf));</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Appends an exception date to the list */</div><div class='del'>-static void</div><div class='del'>-append_exception (RecurrencePage *rpage, CalComponentDateTime *datetime)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponentDateTime *dt;</div><div class='del'>-	char *c[1];</div><div class='del'>-	int i;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	struct icaltimetype *tt;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	dt = g_new (CalComponentDateTime, 1);</div><div class='del'>-	dt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-	*dt-&gt;value = *datetime-&gt;value;</div><div class='del'>-	dt-&gt;tzid = g_strdup (datetime-&gt;tzid);</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;exception_list);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (clist), rpage);</div><div class='del'>-</div><div class='del'>-	c[0] = get_exception_string (dt);</div><div class='del'>-	i = gtk_clist_append (clist, c);</div><div class='del'>-</div><div class='del'>-	gtk_clist_set_row_data_full (clist, i, dt, (GtkDestroyNotify) free_exception_date_time);</div><div class='del'>-</div><div class='del'>-	gtk_clist_select_row (clist, i, 0);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (clist), rpage);</div><div class='del'>-</div><div class='del'>-	tt = dt-&gt;value;</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;exception_date), </div><div class='del'>-			      tt-&gt;year, tt-&gt;month, tt-&gt;day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;exception_date), </div><div class='del'>-				     tt-&gt;hour, tt-&gt;minute);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;exception_modify, TRUE);</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;exception_delete, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills in the exception widgets with the data from the calendar component */</div><div class='del'>-static void</div><div class='del'>-fill_exception_widgets (RecurrencePage *rpage, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GSList *list, *l;</div><div class='del'>-	gboolean added;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-</div><div class='del'>-	added = FALSE;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentDateTime *cdt;</div><div class='del'>-</div><div class='del'>-		added = TRUE;</div><div class='del'>-</div><div class='del'>-		cdt = l-&gt;data;</div><div class='del'>-		append_exception (rpage, cdt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-</div><div class='del'>-	if (added)</div><div class='del'>-		gtk_clist_select_row (GTK_CLIST (priv-&gt;exception_list), 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes a weekday mask for the start day of a calendar component,</div><div class='del'>- * for use in a WeekdayPicker widget.</div><div class='del'>- */</div><div class='del'>-static guint8</div><div class='del'>-get_start_weekday_mask (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	guint8 retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	if (dt.value) {</div><div class='del'>-		short weekday;</div><div class='del'>-</div><div class='del'>-		weekday = icaltime_day_of_week (*dt.value);</div><div class='del'>-		retval = 0x1 &lt;&lt; (weekday - 1);</div><div class='del'>-	} else</div><div class='del'>-		retval = 0;</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets some sane defaults for the data sources for the recurrence special</div><div class='del'>- * widgets, even if they will not be used immediately.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-set_special_defaults (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	guint8 mask;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	mask = get_start_weekday_mask (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	priv-&gt;weekday_day_mask = mask;</div><div class='del'>-	priv-&gt;weekday_blocked_day_mask = mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sensitizes the recurrence widgets based on the state of the recurrence type</div><div class='del'>- * radio group.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sensitize_recur_widgets (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	enum recur_type type;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = e_dialog_radio_get (priv-&gt;none, type_map);</div><div class='del'>-</div><div class='del'>-	if (GTK_BIN (priv-&gt;custom_warning_bin)-&gt;child)</div><div class='del'>-		gtk_widget_destroy (GTK_BIN (priv-&gt;custom_warning_bin)-&gt;child);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case RECUR_NONE:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;params, FALSE);</div><div class='del'>-		gtk_widget_show (priv-&gt;params);</div><div class='del'>-		gtk_widget_hide (priv-&gt;custom_warning_bin);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_SIMPLE:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;params, TRUE);</div><div class='del'>-		gtk_widget_show (priv-&gt;params);</div><div class='del'>-		gtk_widget_hide (priv-&gt;custom_warning_bin);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_CUSTOM:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;params, FALSE);</div><div class='del'>-		gtk_widget_hide (priv-&gt;params);</div><div class='del'>-</div><div class='del'>-		label = gtk_label_new (_("This appointment contains "</div><div class='del'>-					 "recurrences that Evolution "</div><div class='del'>-					 "cannot edit."));</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (priv-&gt;custom_warning_bin),</div><div class='del'>-				   label);</div><div class='del'>-		gtk_widget_show_all (priv-&gt;custom_warning_bin);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Encondes a position/weekday pair into the proper format for</div><div class='del'>- * icalrecurrencetype.by_day. Not needed at present.</div><div class='del'>- */</div><div class='del'>-static short</div><div class='del'>-nth_weekday (int pos, icalrecurrencetype_weekday weekday)</div><div class='del'>-{</div><div class='del'>-	g_assert (pos &gt; 0 &amp;&amp; pos &lt;= 5);</div><div class='del'>-</div><div class='del'>-	return (pos &lt;&lt; 3) | (int) weekday;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Gets the simple recurrence data from the recurrence widgets and stores it in</div><div class='del'>- * the calendar component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-simple_recur_to_comp (RecurrencePage *rpage, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	struct icalrecurrencetype r;</div><div class='del'>-	GSList l;</div><div class='del'>-	enum ending_type ending_type;</div><div class='del'>-	gboolean date_set;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	icalrecurrencetype_clear (&amp;r);</div><div class='del'>-</div><div class='del'>-	/* Frequency, interval, week start */</div><div class='del'>-</div><div class='del'>-	r.freq = e_dialog_option_menu_get (priv-&gt;interval_unit, freq_map);</div><div class='del'>-	r.interval = e_dialog_spin_get_int (priv-&gt;interval_value);</div><div class='del'>-	r.week_start = ICAL_SUNDAY_WEEKDAY</div><div class='del'>-		+ calendar_config_get_week_start_day ();</div><div class='del'>-</div><div class='del'>-	/* Frequency-specific data */</div><div class='del'>-</div><div class='del'>-	switch (r.freq) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		/* Nothing else is required */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE: {</div><div class='del'>-		guint8 day_mask;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		g_assert (GTK_BIN (priv-&gt;special)-&gt;child != NULL);</div><div class='del'>-		g_assert (priv-&gt;weekday_picker != NULL);</div><div class='del'>-		g_assert (IS_WEEKDAY_PICKER (priv-&gt;weekday_picker));</div><div class='del'>-</div><div class='del'>-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv-&gt;weekday_picker));</div><div class='del'>-</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-			r.by_day[i++] = ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 1))</div><div class='del'>-			r.by_day[i++] = ICAL_MONDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 2))</div><div class='del'>-			r.by_day[i++] = ICAL_TUESDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 3))</div><div class='del'>-			r.by_day[i++] = ICAL_WEDNESDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 4))</div><div class='del'>-			r.by_day[i++] = ICAL_THURSDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 5))</div><div class='del'>-			r.by_day[i++] = ICAL_FRIDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 6))</div><div class='del'>-			r.by_day[i++] = ICAL_SATURDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE: {</div><div class='del'>-		enum month_num_options month_num;</div><div class='del'>-		enum month_day_options month_day;</div><div class='del'>-		</div><div class='del'>-		g_assert (GTK_BIN (priv-&gt;special)-&gt;child != NULL);</div><div class='del'>-		g_assert (priv-&gt;month_day_menu != NULL);</div><div class='del'>-		g_assert (GTK_IS_OPTION_MENU (priv-&gt;month_day_menu));</div><div class='del'>-		g_assert (priv-&gt;month_num_menu != NULL);</div><div class='del'>-		g_assert (GTK_IS_OPTION_MENU (priv-&gt;month_num_menu));</div><div class='del'>-</div><div class='del'>-		month_num = e_dialog_option_menu_get (priv-&gt;month_num_menu,</div><div class='del'>-						      month_num_options_map );</div><div class='del'>-		month_day = e_dialog_option_menu_get (priv-&gt;month_day_menu,</div><div class='del'>-						      month_day_options_map);</div><div class='del'>-</div><div class='del'>-		if (month_num == MONTH_NUM_LAST)</div><div class='del'>-			month_num = -1;</div><div class='del'>-</div><div class='del'>-		switch (month_day) {</div><div class='del'>-		case MONTH_DAY_NTH:</div><div class='del'>-			if (month_num == -1)</div><div class='del'>-				r.by_month_day[0] = -1;</div><div class='del'>-			else</div><div class='del'>-				r.by_month_day[0] = priv-&gt;month_index;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not</div><div class='del'>-		   accept BYDAY=2TU. So we now use the same as Outlook</div><div class='del'>-		   by default. */</div><div class='del'>-		case MONTH_DAY_MON:</div><div class='del'>-			r.by_day[0] = ICAL_MONDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_TUE:</div><div class='del'>-			r.by_day[0] = ICAL_TUESDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_WED:</div><div class='del'>-			r.by_day[0] = ICAL_WEDNESDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_THU:</div><div class='del'>-			r.by_day[0] = ICAL_THURSDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_FRI:</div><div class='del'>-			r.by_day[0] = ICAL_FRIDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_SAT:</div><div class='del'>-			r.by_day[0] = ICAL_SATURDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_SUN:</div><div class='del'>-			r.by_day[0] = ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-			r.by_set_pos[0] = month_num;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		/* Nothing else is required */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ending date */</div><div class='del'>-</div><div class='del'>-	ending_type = e_dialog_option_menu_get (priv-&gt;ending_menu,</div><div class='del'>-						ending_types_map);</div><div class='del'>-</div><div class='del'>-	switch (ending_type) {</div><div class='del'>-	case ENDING_FOR:</div><div class='del'>-		g_assert (priv-&gt;ending_count_spin != NULL);</div><div class='del'>-		g_assert (GTK_IS_SPIN_BUTTON (priv-&gt;ending_count_spin));</div><div class='del'>-</div><div class='del'>-		r.count = e_dialog_spin_get_int (priv-&gt;ending_count_spin);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_UNTIL:</div><div class='del'>-		g_assert (priv-&gt;ending_date_edit != NULL);</div><div class='del'>-		g_assert (E_IS_DATE_EDIT (priv-&gt;ending_date_edit));</div><div class='del'>-</div><div class='del'>-		/* We only allow a DATE value to be set for the UNTIL property,</div><div class='del'>-		   since we don't support sub-day recurrences. */</div><div class='del'>-		date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;ending_date_edit),</div><div class='del'>-						 &amp;r.until.year,</div><div class='del'>-						 &amp;r.until.month,</div><div class='del'>-						 &amp;r.until.day);</div><div class='del'>-		g_assert (date_set);</div><div class='del'>-</div><div class='del'>-		r.until.is_date = 1;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_FOREVER:</div><div class='del'>-		/* Nothing to be done */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the recurrence */</div><div class='del'>-</div><div class='del'>-	l.data = &amp;r;</div><div class='del'>-	l.next = NULL;</div><div class='del'>-</div><div class='del'>-	cal_component_set_rrule_list (comp, &amp;l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills a component with the data from the recurrence page; in the case of a</div><div class='del'>- * custom recurrence, it leaves it intact.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-fill_component (RecurrencePage *rpage, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	enum recur_type recur_type;</div><div class='del'>-	GtkCList *exception_list;</div><div class='del'>-	GSList *list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	recur_type = e_dialog_radio_get (priv-&gt;none, type_map);</div><div class='del'>-</div><div class='del'>-	switch (recur_type) {</div><div class='del'>-	case RECUR_NONE:</div><div class='del'>-		cal_component_set_rdate_list (comp, NULL);</div><div class='del'>-		cal_component_set_rrule_list (comp, NULL);</div><div class='del'>-		cal_component_set_exrule_list (comp, NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_SIMPLE:</div><div class='del'>-		cal_component_set_rdate_list (comp, NULL);</div><div class='del'>-		cal_component_set_exrule_list (comp, NULL);</div><div class='del'>-		simple_recur_to_comp (rpage, comp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_CUSTOM:</div><div class='del'>-		/* We just keep whatever the component has currently */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set exceptions */</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-	exception_list = GTK_CLIST (priv-&gt;exception_list);</div><div class='del'>-	for (i = 0; i &lt; exception_list-&gt;rows; i++) {</div><div class='del'>-		CalComponentDateTime *cdt, *dt;</div><div class='del'>-</div><div class='del'>-		cdt = g_new (CalComponentDateTime, 1);</div><div class='del'>-		cdt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-</div><div class='del'>-		dt = gtk_clist_get_row_data (exception_list, i);</div><div class='del'>-		g_assert (dt != NULL);</div><div class='del'>-</div><div class='del'>-		*cdt-&gt;value = *dt-&gt;value;</div><div class='del'>-		cdt-&gt;tzid = g_strdup (dt-&gt;tzid);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("Adding exception is_date: %i\n", cdt-&gt;value-&gt;is_date);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		list = g_slist_prepend (list, cdt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Re-tags the recurrence preview calendar based on the current information of</div><div class='del'>- * the widgets in the recurrence page.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-preview_recur (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime cdt;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If our component has not been set yet through ::fill_widgets(), we</div><div class='del'>-	 * cannot preview the recurrence.</div><div class='del'>-	 */</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Create a scratch component with the start/end and</div><div class='del'>-	 * recurrence/exception information from the one we are editing.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (priv-&gt;comp, &amp;cdt);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;cdt);</div><div class='del'>-	cal_component_free_datetime (&amp;cdt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (priv-&gt;comp, &amp;cdt);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;cdt);</div><div class='del'>-	cal_component_free_datetime (&amp;cdt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_exdate_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	cal_component_set_exdate_list (comp, l);</div><div class='del'>-	cal_component_free_exdate_list (l);</div><div class='del'>-</div><div class='del'>-	cal_component_get_exrule_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	cal_component_set_exrule_list (comp, l);</div><div class='del'>-	cal_component_free_recur_list (l);</div><div class='del'>-</div><div class='del'>-	cal_component_get_rdate_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	cal_component_set_rdate_list (comp, l);</div><div class='del'>-	cal_component_free_period_list (l);</div><div class='del'>-</div><div class='del'>-	cal_component_get_rrule_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	cal_component_set_rrule_list (comp, l);</div><div class='del'>-	cal_component_free_recur_list (l);</div><div class='del'>-</div><div class='del'>-	fill_component (rpage, comp);</div><div class='del'>-</div><div class='del'>-	tag_calendar_by_comp (E_CALENDAR (priv-&gt;preview_calendar), comp,</div><div class='del'>-			      COMP_EDITOR_PAGE (rpage)-&gt;client, TRUE, FALSE);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence weekday picker changes */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_changed_cb (WeekdayPicker *wp, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for weekly recurrences */</div><div class='del'>-static void</div><div class='del'>-make_weekly_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;weekday_picker == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;special), hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("on"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (weekday_picker_new ());</div><div class='del'>-</div><div class='del'>-	priv-&gt;weekday_picker = GTK_WIDGET (wp);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the weekdays */</div><div class='del'>-</div><div class='del'>-	weekday_picker_set_week_start_day (wp, calendar_config_get_week_start_day ());</div><div class='del'>-	weekday_picker_set_days (wp, priv-&gt;weekday_day_mask);</div><div class='del'>-	weekday_picker_set_blocked_days (wp, priv-&gt;weekday_blocked_day_mask);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wp), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (weekday_picker_changed_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-month_num_submenu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	int month_index;</div><div class='del'>-	</div><div class='del'>-	item = gtk_menu_get_active (GTK_MENU (menu_shell));</div><div class='del'>-	item = gtk_menu_get_active (GTK_MENU (GTK_MENU_ITEM (item)-&gt;submenu));</div><div class='del'>-</div><div class='del'>-	month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));</div><div class='del'>-	gtk_object_set_user_data (GTK_OBJECT (data), GINT_TO_POINTER (month_index));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the option menu for the monthly recurrence number */</div><div class='del'>-static GtkWidget *</div><div class='del'>-make_recur_month_num_submenu (const char *title, int start, int end)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *submenu, *item;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	submenu = gtk_menu_new ();</div><div class='del'>-	for (i = start; i &lt; end; i++) {</div><div class='del'>-		char *date;</div><div class='del'>-		</div><div class='del'>-		date = g_strdup_printf ("%d%s", i + 1, _(date_suffix[i]));</div><div class='del'>-		item = gtk_menu_item_new_with_label (date);</div><div class='del'>-		g_free (date);</div><div class='del'>-		gtk_menu_append (GTK_MENU (submenu), item);</div><div class='del'>-		gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1));</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	item = gtk_menu_item_new_with_label (_(title));</div><div class='del'>-	gtk_widget_show (item);</div><div class='del'>-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);</div><div class='del'>-</div><div class='del'>-	return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-make_recur_month_num_menu (int month_index)</div><div class='del'>-{</div><div class='del'>-	static const char *options[] = {</div><div class='del'>-		N_("first"),</div><div class='del'>-		N_("second"),</div><div class='del'>-		N_("third"),</div><div class='del'>-		N_("fourth"),</div><div class='del'>-		N_("last")</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GtkWidget *menu, *submenu, *item, *submenu_item;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	char *date;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-</div><div class='del'>-	/* Relation */</div><div class='del'>-	for (i = 0; i &lt; sizeof (options) / sizeof (options[0]); i++) {</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(options[i]));</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Current date */</div><div class='del'>-	date = g_strdup_printf ("%d%s", month_index, _(date_suffix[month_index - 1]));</div><div class='del'>-	item = gtk_menu_item_new_with_label (date);</div><div class='del'>-	g_free (date);</div><div class='del'>-	gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-	gtk_widget_show (item);</div><div class='del'>-</div><div class='del'>-	/* Other Submenu */</div><div class='del'>-	submenu = gtk_menu_new ();</div><div class='del'>-	submenu_item = gtk_menu_item_new_with_label (_("Other Date"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (menu), submenu_item);</div><div class='del'>-	gtk_widget_show (submenu_item);</div><div class='del'>-</div><div class='del'>-	item = make_recur_month_num_submenu ("1st to 10th", 0, 10);</div><div class='del'>-	gtk_menu_append (GTK_MENU (submenu), item);</div><div class='del'>-	item = make_recur_month_num_submenu ("11th to 20th", 10, 20);</div><div class='del'>-	gtk_menu_append (GTK_MENU (submenu), item);</div><div class='del'>-	item = make_recur_month_num_submenu ("21st to 31st", 20, 31);</div><div class='del'>-	gtk_menu_append (GTK_MENU (submenu), item);</div><div class='del'>-</div><div class='del'>-	gtk_menu_item_set_submenu (GTK_MENU_ITEM (submenu_item), submenu);</div><div class='del'>-	gtk_object_set_user_data (GTK_OBJECT (submenu_item), GINT_TO_POINTER (month_index));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (submenu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (month_num_submenu_selection_done_cb),</div><div class='del'>-			    submenu_item);</div><div class='del'>-</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the option menu for the monthly recurrence days */</div><div class='del'>-static GtkWidget *</div><div class='del'>-make_recur_month_menu (void)</div><div class='del'>-{</div><div class='del'>-	static const char *options[] = {</div><div class='del'>-		N_("day"),</div><div class='del'>-		N_("Monday"),</div><div class='del'>-		N_("Tuesday"),</div><div class='del'>-		N_("Wednesday"),</div><div class='del'>-		N_("Thursday"),</div><div class='del'>-		N_("Friday"),</div><div class='del'>-		N_("Saturday"),</div><div class='del'>-		N_("Sunday")</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof (options) / sizeof (options[0]); i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(options[i]));</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-month_num_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	enum month_num_options month_num;</div><div class='del'>-	enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	month_num = e_dialog_option_menu_get (priv-&gt;month_num_menu,</div><div class='del'>-					      month_num_options_map);</div><div class='del'>-	month_day = e_dialog_option_menu_get (priv-&gt;month_day_menu,</div><div class='del'>-					      month_day_options_map);</div><div class='del'>-</div><div class='del'>-	if (month_num == MONTH_NUM_OTHER) {</div><div class='del'>-		GtkWidget *label, *item;</div><div class='del'>-		char *date;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_get_active (GTK_MENU (menu_shell));</div><div class='del'>-		priv-&gt;month_index = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (item)));</div><div class='del'>-</div><div class='del'>-		month_num = MONTH_NUM_DAY;</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_num_menu, month_num, month_num_options_map);</div><div class='del'>-</div><div class='del'>-		label = GTK_BIN (priv-&gt;month_num_menu)-&gt;child;</div><div class='del'>-		date = g_strdup_printf ("%d%s", priv-&gt;month_index, _(date_suffix[priv-&gt;month_index - 1]));</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (label), date);</div><div class='del'>-		g_free (date);</div><div class='del'>-</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_num_menu, 0, month_num_options_map);</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_num_menu, month_num, month_num_options_map);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (month_num == MONTH_NUM_DAY &amp;&amp; month_day != MONTH_DAY_NTH)</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_day_menu,</div><div class='del'>-					  MONTH_DAY_NTH,</div><div class='del'>-					  month_day_options_map);</div><div class='del'>-	else if (month_num != MONTH_NUM_DAY &amp;&amp; month_num != MONTH_NUM_LAST &amp;&amp; month_day == MONTH_DAY_NTH)</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_day_menu,</div><div class='del'>-					  MONTH_DAY_MON,</div><div class='del'>-					  month_num_options_map);</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the monthly day selection menu changes.  We need</div><div class='del'>- * to change the valid range of the day index spin button; e.g. days</div><div class='del'>- * are 1-31 while a Sunday is the 1st through 5th.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-month_day_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	enum month_num_options month_num;</div><div class='del'>-	enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	month_num = e_dialog_option_menu_get (priv-&gt;month_num_menu,</div><div class='del'>-					      month_num_options_map);</div><div class='del'>-	month_day = e_dialog_option_menu_get (priv-&gt;month_day_menu,</div><div class='del'>-					      month_day_options_map);</div><div class='del'>-	if (month_day == MONTH_DAY_NTH &amp;&amp; month_num != MONTH_NUM_LAST &amp;&amp; month_num != MONTH_NUM_DAY)</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_num_menu,</div><div class='del'>-					  MONTH_NUM_DAY,</div><div class='del'>-					  month_num_options_map);</div><div class='del'>-	else if (month_day != MONTH_DAY_NTH &amp;&amp; month_num == MONTH_NUM_DAY)</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;month_num_menu,</div><div class='del'>-					  MONTH_NUM_FIRST,</div><div class='del'>-					  month_num_options_map);</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the month index value changes. */</div><div class='del'>-static void</div><div class='del'>-month_index_value_changed_cb (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for monthly recurrences */</div><div class='del'>-static void</div><div class='del'>-make_monthly_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;month_day_menu == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;special), hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("on the"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));</div><div class='del'>-</div><div class='del'>-	priv-&gt;month_num_menu = make_recur_month_num_menu (priv-&gt;month_index);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;month_num_menu,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	priv-&gt;month_day_menu = make_recur_month_menu ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;month_day_menu,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the options */</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;month_num_menu,</div><div class='del'>-				  priv-&gt;month_num,</div><div class='del'>-				  month_num_options_map);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;month_day_menu,</div><div class='del'>-				  priv-&gt;month_day,</div><div class='del'>-				  month_day_options_map);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",			    GTK_SIGNAL_FUNC (month_index_value_changed_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;month_num_menu));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (month_num_menu_selection_done_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;month_day_menu));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (month_day_menu_selection_done_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Changes the recurrence-special widget to match the interval units.</div><div class='del'>- *</div><div class='del'>- * For daily recurrences: nothing.</div><div class='del'>- * For weekly recurrences: weekday selector.</div><div class='del'>- * For monthly recurrences: "on the" &lt;nth&gt; [day, Weekday]</div><div class='del'>- * For yearly recurrences: nothing.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-make_recurrence_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	icalrecurrencetype_frequency frequency;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_BIN (priv-&gt;special)-&gt;child != NULL) {</div><div class='del'>-		gtk_widget_destroy (GTK_BIN (priv-&gt;special)-&gt;child);</div><div class='del'>-</div><div class='del'>-		priv-&gt;weekday_picker = NULL;</div><div class='del'>-		priv-&gt;month_day_menu = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;month_num_menu != NULL) {</div><div class='del'>-		gtk_widget_destroy (priv-&gt;month_num_menu);</div><div class='del'>-		priv-&gt;month_num_menu = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	frequency = e_dialog_option_menu_get (priv-&gt;interval_unit, freq_map);</div><div class='del'>-</div><div class='del'>-	switch (frequency) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		gtk_widget_hide (priv-&gt;special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-		make_weekly_special (rpage);</div><div class='del'>-		gtk_widget_show (priv-&gt;special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		make_monthly_special (rpage);</div><div class='del'>-		gtk_widget_show (priv-&gt;special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		gtk_widget_hide (priv-&gt;special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Counts the elements in the by_xxx fields of an icalrecurrencetype */</div><div class='del'>-static int</div><div class='del'>-count_by_xxx (short *field, int max_elements)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_elements; i++)</div><div class='del'>-		if (field[i] == ICAL_RECURRENCE_ARRAY_MAX)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the ending-until date editor changes */</div><div class='del'>-static void</div><div class='del'>-ending_until_changed_cb (EDateEdit *de, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for "ending until" (end date) recurrences */</div><div class='del'>-static void</div><div class='del'>-make_ending_until_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	EDateEdit *de;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;ending_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;ending_date_edit == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widget */</div><div class='del'>-</div><div class='del'>-	priv-&gt;ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE,</div><div class='del'>-							    FALSE);</div><div class='del'>-	de = E_DATE_EDIT (priv-&gt;ending_date_edit);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;ending_special),</div><div class='del'>-			   GTK_WIDGET (de));</div><div class='del'>-	gtk_widget_show_all (GTK_WIDGET (de));</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (de, priv-&gt;ending_date_tt.year,</div><div class='del'>-			      priv-&gt;ending_date_tt.month,</div><div class='del'>-			      priv-&gt;ending_date_tt.day);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (de), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ending_until_changed_cb), rpage);</div><div class='del'>-</div><div class='del'>-	/* Make sure the EDateEdit widget uses our timezones to get the</div><div class='del'>-	   current time. */</div><div class='del'>-	e_date_edit_set_get_time_callback (de,</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   rpage, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the ending-count value changes */</div><div class='del'>-static void</div><div class='del'>-ending_count_value_changed_cb (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for the occurrence count case */</div><div class='del'>-static void</div><div class='del'>-make_ending_count_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;ending_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;ending_count_spin == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;ending_special), hbox);</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));</div><div class='del'>-	priv-&gt;ending_count_spin = gtk_spin_button_new (adj, 1, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;ending_count_spin,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("occurrences"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the values */</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;ending_count_spin, priv-&gt;ending_count);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ending_count_value_changed_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Changes the recurrence-ending-special widget to match the ending date option</div><div class='del'>- *</div><div class='del'>- * For: &lt;n&gt; [days, weeks, months, years, occurrences]</div><div class='del'>- * Until: &lt;date selector&gt;</div><div class='del'>- * Forever: nothing.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-make_ending_special (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	enum ending_type ending_type;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_BIN (priv-&gt;ending_special)-&gt;child != NULL) {</div><div class='del'>-		gtk_widget_destroy (GTK_BIN (priv-&gt;ending_special)-&gt;child);</div><div class='del'>-</div><div class='del'>-		priv-&gt;ending_date_edit = NULL;</div><div class='del'>-		priv-&gt;ending_count_spin = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ending_type = e_dialog_option_menu_get (priv-&gt;ending_menu,</div><div class='del'>-						ending_types_map);</div><div class='del'>-</div><div class='del'>-	switch (ending_type) {</div><div class='del'>-	case ENDING_FOR:</div><div class='del'>-		make_ending_count_special (rpage);</div><div class='del'>-		gtk_widget_show (priv-&gt;ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_UNTIL:</div><div class='del'>-		make_ending_until_special (rpage);</div><div class='del'>-		gtk_widget_show (priv-&gt;ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_FOREVER:</div><div class='del'>-		gtk_widget_hide (priv-&gt;ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the recurrence ending date widgets with the values from the calendar</div><div class='del'>- * component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;ending_menu));</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-</div><div class='del'>-	if (r-&gt;count == 0) {</div><div class='del'>-		if (r-&gt;until.year == 0) {</div><div class='del'>-			/* Forever */</div><div class='del'>-</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;ending_menu,</div><div class='del'>-						  ENDING_FOREVER,</div><div class='del'>-						  ending_types_map);</div><div class='del'>-		} else {</div><div class='del'>-			/* Ending date */</div><div class='del'>-</div><div class='del'>-			priv-&gt;ending_date_tt = r-&gt;until;</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;ending_menu,</div><div class='del'>-						  ENDING_UNTIL,</div><div class='del'>-						  ending_types_map);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Count of occurrences */</div><div class='del'>-</div><div class='del'>-		priv-&gt;ending_count = r-&gt;count;</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;ending_menu,</div><div class='del'>-					  ENDING_FOR,</div><div class='del'>-					  ending_types_map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-</div><div class='del'>-	make_ending_special (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the recurrence page.  This function is particularly</div><div class='del'>- * tricky because it has to discriminate between recurrences we support for</div><div class='del'>- * editing and the ones we don't.  We only support at most one recurrence rule;</div><div class='del'>- * no rdates or exrules (exdates are handled just fine elsewhere).</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CompEditorPageDates dates;	</div><div class='del'>-	GSList *rrule_list;</div><div class='del'>-	int len;</div><div class='del'>-	struct icalrecurrencetype *r;</div><div class='del'>-	int n_by_second, n_by_minute, n_by_hour;</div><div class='del'>-	int n_by_day, n_by_month_day, n_by_year_day;</div><div class='del'>-	int n_by_week_no, n_by_month, n_by_set_pos;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Keep a copy of the component so that we can expand the recurrence </div><div class='del'>-	 * set for the preview.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = cal_component_clone (comp);</div><div class='del'>-</div><div class='del'>-	/* Don't send off changes during this time */</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Clean the page */</div><div class='del'>-	clear_widgets (rpage);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	recurrence_page_set_summary (page, text.value);</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-	comp_editor_dates (&amp;dates, comp);</div><div class='del'>-	recurrence_page_set_dates (page, &amp;dates);</div><div class='del'>-	comp_editor_free_dates (&amp;dates);</div><div class='del'>-</div><div class='del'>-	/* Exceptions */</div><div class='del'>-	fill_exception_widgets (rpage, comp);</div><div class='del'>-</div><div class='del'>-	/* Set up defaults for the special widgets */</div><div class='del'>-	set_special_defaults (rpage);</div><div class='del'>-</div><div class='del'>-	/* No recurrences? */</div><div class='del'>-</div><div class='del'>-	if (!cal_component_has_rdates (comp)</div><div class='del'>-	    &amp;&amp; !cal_component_has_rrules (comp)</div><div class='del'>-	    &amp;&amp; !cal_component_has_exrules (comp)) {</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;none),</div><div class='del'>-						  rpage);</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;simple),</div><div class='del'>-						  rpage);</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;custom),</div><div class='del'>-						  rpage);</div><div class='del'>-		e_dialog_radio_set (priv-&gt;none, RECUR_NONE, type_map);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;none),</div><div class='del'>-						    rpage);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;simple),</div><div class='del'>-						    rpage);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;custom),</div><div class='del'>-						    rpage);</div><div class='del'>-</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;custom, FALSE);</div><div class='del'>-</div><div class='del'>-		sensitize_recur_widgets (rpage);</div><div class='del'>-		preview_recur (rpage);</div><div class='del'>-</div><div class='del'>-		priv-&gt;updating = FALSE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if it is a custom set we don't support */</div><div class='del'>-</div><div class='del'>-	cal_component_get_rrule_list (comp, &amp;rrule_list);</div><div class='del'>-	len = g_slist_length (rrule_list);</div><div class='del'>-	if (len &gt; 1</div><div class='del'>-	    || cal_component_has_rdates (comp)</div><div class='del'>-	    || cal_component_has_exrules (comp))</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Down to one rule, so test that one */</div><div class='del'>-</div><div class='del'>-	g_assert (len == 1);</div><div class='del'>-	r = rrule_list-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* Any funky frequency? */</div><div class='del'>-</div><div class='del'>-	if (r-&gt;freq == ICAL_SECONDLY_RECURRENCE</div><div class='del'>-	    || r-&gt;freq == ICAL_MINUTELY_RECURRENCE</div><div class='del'>-	    || r-&gt;freq == ICAL_HOURLY_RECURRENCE)</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Any funky shit? */</div><div class='del'>-</div><div class='del'>-#define N_HAS_BY(field) (count_by_xxx (field, sizeof (field) / sizeof (field[0])))</div><div class='del'>-</div><div class='del'>-	n_by_second = N_HAS_BY (r-&gt;by_second);</div><div class='del'>-	n_by_minute = N_HAS_BY (r-&gt;by_minute);</div><div class='del'>-	n_by_hour = N_HAS_BY (r-&gt;by_hour);</div><div class='del'>-	n_by_day = N_HAS_BY (r-&gt;by_day);</div><div class='del'>-	n_by_month_day = N_HAS_BY (r-&gt;by_month_day);</div><div class='del'>-	n_by_year_day = N_HAS_BY (r-&gt;by_year_day);</div><div class='del'>-	n_by_week_no = N_HAS_BY (r-&gt;by_week_no);</div><div class='del'>-	n_by_month = N_HAS_BY (r-&gt;by_month);</div><div class='del'>-	n_by_set_pos = N_HAS_BY (r-&gt;by_set_pos);</div><div class='del'>-</div><div class='del'>-	if (n_by_second != 0</div><div class='del'>-	    || n_by_minute != 0</div><div class='del'>-	    || n_by_hour != 0)</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Filter the funky shit based on the frequency; if there is nothing</div><div class='del'>-	 * weird we can actually set the widgets.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (r-&gt;freq) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		if (n_by_day != 0</div><div class='del'>-		    || n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;interval_unit,</div><div class='del'>-					  ICAL_DAILY_RECURRENCE,</div><div class='del'>-					  freq_map);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE: {</div><div class='del'>-		int i;</div><div class='del'>-		guint8 day_mask;</div><div class='del'>-</div><div class='del'>-		if (n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		day_mask = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8 &amp;&amp; r-&gt;by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {</div><div class='del'>-			enum icalrecurrencetype_weekday weekday;</div><div class='del'>-			int pos;</div><div class='del'>-</div><div class='del'>-			weekday = icalrecurrencetype_day_day_of_week (r-&gt;by_day[i]);</div><div class='del'>-			pos = icalrecurrencetype_day_position (r-&gt;by_day[i]);</div><div class='del'>-</div><div class='del'>-			if (pos != 0)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			switch (weekday) {</div><div class='del'>-			case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 0;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 1;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 2;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 3;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 4;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 5;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 6;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;weekday_day_mask = day_mask;</div><div class='del'>-</div><div class='del'>-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;interval_unit,</div><div class='del'>-					  ICAL_WEEKLY_RECURRENCE,</div><div class='del'>-					  freq_map);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		if (n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos &gt; 1)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		if (n_by_month_day == 1) {</div><div class='del'>-			int nth;</div><div class='del'>-</div><div class='del'>-			if (n_by_set_pos != 0)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			nth = r-&gt;by_month_day[0];</div><div class='del'>-			if (nth &lt; 1 &amp;&amp; nth != -1)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			if (nth == -1) {</div><div class='del'>-				CalComponentDateTime dt;</div><div class='del'>-				</div><div class='del'>-				cal_component_get_dtstart (comp, &amp;dt);</div><div class='del'>-				priv-&gt;month_index = dt.value-&gt;day;</div><div class='del'>-				priv-&gt;month_num = MONTH_NUM_LAST;</div><div class='del'>-			} else {</div><div class='del'>-				priv-&gt;month_index = nth;</div><div class='del'>-				priv-&gt;month_num = MONTH_NUM_DAY;</div><div class='del'>-			}</div><div class='del'>-			priv-&gt;month_day = MONTH_DAY_NTH;</div><div class='del'>-			</div><div class='del'>-		} else if (n_by_day == 1) {</div><div class='del'>-			enum icalrecurrencetype_weekday weekday;</div><div class='del'>-			int pos;</div><div class='del'>-			enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not</div><div class='del'>-			   accept BYDAY=2TU. So we now use the same as Outlook</div><div class='del'>-			   by default. */</div><div class='del'>-</div><div class='del'>-			weekday = icalrecurrencetype_day_day_of_week (r-&gt;by_day[0]);</div><div class='del'>-			pos = icalrecurrencetype_day_position (r-&gt;by_day[0]);</div><div class='del'>-</div><div class='del'>-			if (pos == 0) {</div><div class='del'>-				if (n_by_set_pos != 1)</div><div class='del'>-					goto custom;</div><div class='del'>-				pos = r-&gt;by_set_pos[0];</div><div class='del'>-			} else if (pos &lt; 0) {</div><div class='del'>-				goto custom;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			switch (weekday) {</div><div class='del'>-			case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_MON;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_TUE;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_WED;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_THU;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_FRI;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_SAT;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_SUN;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				goto custom;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (pos == -1)</div><div class='del'>-				priv-&gt;month_num = MONTH_NUM_LAST;</div><div class='del'>-			else </div><div class='del'>-				priv-&gt;month_num = pos;</div><div class='del'>-			priv-&gt;month_day = month_day;</div><div class='del'>-		} else</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;interval_unit,</div><div class='del'>-					  ICAL_MONTHLY_RECURRENCE,</div><div class='del'>-					  freq_map);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		if (n_by_day != 0</div><div class='del'>-		    || n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;interval_unit,</div><div class='del'>-					  ICAL_YEARLY_RECURRENCE,</div><div class='del'>-					  freq_map);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (menu), rpage);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		goto custom;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we got here it means it is a simple recurrence */</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-	e_dialog_radio_set (priv-&gt;simple, RECUR_SIMPLE, type_map);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;custom, FALSE);</div><div class='del'>-</div><div class='del'>-	sensitize_recur_widgets (rpage);</div><div class='del'>-	make_recurrence_special (rpage);</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv-&gt;interval_value));</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (adj), rpage);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;interval_value, r-&gt;interval);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (adj), rpage);</div><div class='del'>-</div><div class='del'>-	fill_ending_date (rpage, r);</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>- custom:</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-	e_dialog_radio_set (priv-&gt;custom, RECUR_CUSTOM, type_map);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;none), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;simple), rpage);</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;custom), rpage);</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;custom, TRUE);</div><div class='del'>-	sensitize_recur_widgets (rpage);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_recur_list (rrule_list);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the recurrence page */</div><div class='del'>-static gboolean</div><div class='del'>-recurrence_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	fill_component (rpage, comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_summary handler for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_set_summary (CompEditorPage *page, const char *summary)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	gchar *s;</div><div class='del'>-	</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	s = e_utf8_to_gtk_string (priv-&gt;summary, summary);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;summary), s);</div><div class='del'>-	g_free (s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_dates handler for the recurrence page */</div><div class='del'>-static void</div><div class='del'>-recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	guint8 mask;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (page);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp_editor_date_label (dates, priv-&gt;date_time);</div><div class='del'>-</div><div class='del'>-	/* Copy the dates to our component */</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dt.value = &amp;icaltime;</div><div class='del'>-</div><div class='del'>-	if (dates-&gt;start) {</div><div class='del'>-		icaltime = *dates-&gt;start-&gt;value;</div><div class='del'>-		dt.tzid = dates-&gt;start-&gt;tzid;</div><div class='del'>-		cal_component_set_dtstart (priv-&gt;comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (dates-&gt;end) {</div><div class='del'>-		icaltime = *dates-&gt;end-&gt;value;</div><div class='del'>-		dt.tzid = dates-&gt;end-&gt;tzid;</div><div class='del'>-		cal_component_set_dtend (priv-&gt;comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the weekday picker if necessary */</div><div class='del'>-	mask = get_start_weekday_mask (priv-&gt;comp);</div><div class='del'>-	if (mask == priv-&gt;weekday_blocked_day_mask)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;weekday_day_mask = priv-&gt;weekday_day_mask | mask;</div><div class='del'>-	priv-&gt;weekday_blocked_day_mask = mask;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;weekday_picker != NULL) {</div><div class='del'>-		weekday_picker_set_days (WEEKDAY_PICKER (priv-&gt;weekday_picker),</div><div class='del'>-					 priv-&gt;weekday_day_mask);</div><div class='del'>-		weekday_picker_set_blocked_days (WEEKDAY_PICKER (priv-&gt;weekday_picker),</div><div class='del'>-						 priv-&gt;weekday_blocked_day_mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure the preview gets updated. */</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (rpage);</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("recurrence-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary = GW ("summary");</div><div class='del'>-	priv-&gt;date_time = GW ("date-time");</div><div class='del'>-	      </div><div class='del'>-	priv-&gt;none = GW ("none");</div><div class='del'>-	priv-&gt;simple = GW ("simple");</div><div class='del'>-	priv-&gt;custom = GW ("custom");</div><div class='del'>-	priv-&gt;params = GW ("params");</div><div class='del'>-	      </div><div class='del'>-	priv-&gt;interval_value = GW ("interval-value");</div><div class='del'>-	priv-&gt;interval_unit = GW ("interval-unit");</div><div class='del'>-	priv-&gt;special = GW ("special");</div><div class='del'>-	priv-&gt;ending_menu = GW ("ending-menu");</div><div class='del'>-	priv-&gt;ending_special = GW ("ending-special");</div><div class='del'>-	priv-&gt;custom_warning_bin = GW ("custom-warning-bin");</div><div class='del'>-	      </div><div class='del'>-	priv-&gt;exception_date = GW ("exception-date");</div><div class='del'>-	priv-&gt;exception_list = GW ("exception-list");</div><div class='del'>-	priv-&gt;exception_add = GW ("exception-add");</div><div class='del'>-	priv-&gt;exception_modify = GW ("exception-modify");</div><div class='del'>-	priv-&gt;exception_delete = GW ("exception-delete");</div><div class='del'>-	      </div><div class='del'>-	priv-&gt;preview_bin = GW ("preview-bin");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-	</div><div class='del'>-	return (priv-&gt;summary</div><div class='del'>-		&amp;&amp; priv-&gt;date_time</div><div class='del'>-		&amp;&amp; priv-&gt;none</div><div class='del'>-		&amp;&amp; priv-&gt;simple</div><div class='del'>-		&amp;&amp; priv-&gt;custom</div><div class='del'>-		&amp;&amp; priv-&gt;params</div><div class='del'>-		&amp;&amp; priv-&gt;interval_value</div><div class='del'>-		&amp;&amp; priv-&gt;interval_unit</div><div class='del'>-		&amp;&amp; priv-&gt;special</div><div class='del'>-		&amp;&amp; priv-&gt;ending_menu</div><div class='del'>-		&amp;&amp; priv-&gt;ending_special</div><div class='del'>-		&amp;&amp; priv-&gt;custom_warning_bin</div><div class='del'>-		&amp;&amp; priv-&gt;exception_date</div><div class='del'>-		&amp;&amp; priv-&gt;exception_list</div><div class='del'>-		&amp;&amp; priv-&gt;exception_add</div><div class='del'>-		&amp;&amp; priv-&gt;exception_modify</div><div class='del'>-		&amp;&amp; priv-&gt;exception_delete</div><div class='del'>-		&amp;&amp; priv-&gt;preview_bin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the displayed date range in the recurrence preview</div><div class='del'>- * calendar changes.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-preview_date_range_changed_cb (ECalendarItem *item, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when one of the recurrence type radio buttons is toggled.  We</div><div class='del'>- * enable or disable the recurrence parameters.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-type_toggled_cb (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-</div><div class='del'>-	if (toggle-&gt;active) {</div><div class='del'>-		sensitize_recur_widgets (rpage);</div><div class='del'>-		preview_recur (rpage);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence interval value spin button changes. */</div><div class='del'>-static void</div><div class='del'>-interval_value_changed_cb (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence interval option menu changes.  We need to</div><div class='del'>- * change the contents of the recurrence special widget.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-interval_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	make_recurrence_special (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence ending option menu changes.  We need to</div><div class='del'>- * change the contents of the ending special widget.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ending_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-	make_ending_special (rpage);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "add exception" button */</div><div class='del'>-static void</div><div class='del'>-exception_add_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	struct icaltimetype icaltime = icaltime_null_time ();</div><div class='del'>-	gboolean date_set;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-</div><div class='del'>-	dt.value = &amp;icaltime;</div><div class='del'>-</div><div class='del'>-	/* We use DATE values for exceptions, so we don't need a TZID. */</div><div class='del'>-	dt.tzid = NULL;</div><div class='del'>-	icaltime.is_date = 1;</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;exception_date),</div><div class='del'>-					 &amp;icaltime.year,</div><div class='del'>-					 &amp;icaltime.month,</div><div class='del'>-					 &amp;icaltime.day);</div><div class='del'>-	g_assert (date_set);</div><div class='del'>-</div><div class='del'>-	append_exception (rpage, &amp;dt);</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "modify exception" button */</div><div class='del'>-static void</div><div class='del'>-exception_modify_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	CalComponentDateTime *dt;</div><div class='del'>-	struct icaltimetype *tt;</div><div class='del'>-	int sel;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;exception_list);</div><div class='del'>-	if (!clist-&gt;selection)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-</div><div class='del'>-	sel = GPOINTER_TO_INT (clist-&gt;selection-&gt;data);</div><div class='del'>-</div><div class='del'>-	dt = gtk_clist_get_row_data (clist, sel);</div><div class='del'>-	tt = dt-&gt;value;</div><div class='del'>-	e_date_edit_get_date (E_DATE_EDIT (priv-&gt;exception_date), </div><div class='del'>-			      &amp;tt-&gt;year, &amp;tt-&gt;month, &amp;tt-&gt;day);</div><div class='del'>-	tt-&gt;hour = 0;</div><div class='del'>-	tt-&gt;minute = 0;</div><div class='del'>-	tt-&gt;second = 0;</div><div class='del'>-	tt-&gt;is_date = 1;</div><div class='del'>-</div><div class='del'>-	/* We get rid of any old TZID, since we are using a DATE value now. */</div><div class='del'>-	g_free ((char*)dt-&gt;tzid);</div><div class='del'>-	dt-&gt;tzid = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_clist_set_text (clist, sel, 0, get_exception_string (dt));</div><div class='del'>-</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "delete exception" button */</div><div class='del'>-static void</div><div class='del'>-exception_delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	GtkCList *clist;</div><div class='del'>-	int sel;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clist = GTK_CLIST (priv-&gt;exception_list);</div><div class='del'>-	if (!clist-&gt;selection)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	field_changed (rpage);</div><div class='del'>-</div><div class='del'>-	sel = GPOINTER_TO_INT (clist-&gt;selection-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_clist_remove (clist, sel);</div><div class='del'>-	if (sel &gt;= clist-&gt;rows)</div><div class='del'>-		sel--;</div><div class='del'>-</div><div class='del'>-	if (clist-&gt;rows &gt; 0)</div><div class='del'>-		gtk_clist_select_row (clist, sel, 0);</div><div class='del'>-	else {</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;exception_modify, FALSE);</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;exception_delete, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	preview_recur (rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a row is selected in the list of exception</div><div class='del'>- * dates.  We must update the date/time widgets to reflect the</div><div class='del'>- * exception's value.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-exception_select_row_cb (GtkCList *clist, gint row, gint col,</div><div class='del'>-			 GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	CalComponentDateTime *dt;</div><div class='del'>-	struct icaltimetype *t;</div><div class='del'>-</div><div class='del'>-	rpage = RECURRENCE_PAGE (data);</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Sometimes GtkCList emits a 'row-selected' signal for row 0 when</div><div class='del'>-	   there are 0 rows in the list (after you delete the last row).</div><div class='del'>-	   So we check that the row is valid here. */</div><div class='del'>-	if (row &gt;= clist-&gt;rows)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dt = gtk_clist_get_row_data (clist, row);</div><div class='del'>-	g_assert (dt != NULL);</div><div class='del'>-</div><div class='del'>-	t = dt-&gt;value;</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;exception_date), </div><div class='del'>-			      t-&gt;year, t-&gt;month, t-&gt;day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;exception_date), </div><div class='del'>-				     t-&gt;hour, t-&gt;minute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (rpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-	ECalendar *ecal;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Recurrence preview */</div><div class='del'>-</div><div class='del'>-	priv-&gt;preview_calendar = e_calendar_new ();</div><div class='del'>-	ecal = E_CALENDAR (priv-&gt;preview_calendar);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ecal-&gt;calitem), "date_range_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (preview_date_range_changed_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-	calendar_config_configure_e_calendar (ecal);</div><div class='del'>-	e_calendar_item_set_max_days_sel (ecal-&gt;calitem, 0);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;preview_bin),</div><div class='del'>-			   priv-&gt;preview_calendar);</div><div class='del'>-	gtk_widget_show (priv-&gt;preview_calendar);</div><div class='del'>-</div><div class='del'>-	/* Make sure the EDateEdit widgets and ECalendarItem use our timezones</div><div class='del'>-	   to get the current time. */</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (priv-&gt;exception_date), FALSE);</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;exception_date),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   rpage, NULL);</div><div class='del'>-	e_calendar_item_set_get_time_callback (ecal-&gt;calitem,</div><div class='del'>-					       (ECalendarItemGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					       rpage, NULL);</div><div class='del'>-</div><div class='del'>-	/* Recurrence types */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;none), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;simple), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;custom), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (type_toggled_cb), rpage);</div><div class='del'>-</div><div class='del'>-	/* Recurrence interval */</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv-&gt;interval_value));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (interval_value_changed_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-</div><div class='del'>-	/* Recurrence units */</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;interval_unit));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (interval_selection_done_cb),</div><div class='del'>-			    rpage);</div><div class='del'>-</div><div class='del'>-	/* Recurrence ending */</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;ending_menu));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ending_selection_done_cb), rpage);</div><div class='del'>-</div><div class='del'>-	/* Exception buttons */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;exception_add), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (exception_add_cb), rpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;exception_modify), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (exception_modify_cb), rpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;exception_delete), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (exception_delete_cb), rpage);</div><div class='del'>-</div><div class='del'>-	/* Selections in the exceptions list */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;exception_list), "select_row",</div><div class='del'>-			    GTK_SIGNAL_FUNC (exception_select_row_cb), rpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * recurrence_page_construct:</div><div class='del'>- * @rpage: A recurrence page.</div><div class='del'>- *</div><div class='del'>- * Constructs a recurrence page by loading its Glade data.</div><div class='del'>- *</div><div class='del'>- * Return value: The same object as @rpage, or NULL if the widgets could not be</div><div class='del'>- * created.</div><div class='del'>- **/</div><div class='del'>-RecurrencePage *</div><div class='del'>-recurrence_page_construct (RecurrencePage *rpage)</div><div class='del'>-{</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = rpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR </div><div class='del'>-				   "/recurrence-page.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("recurrence_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (rpage)) {</div><div class='del'>-		g_message ("recurrence_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_widgets (rpage);</div><div class='del'>-</div><div class='del'>-	return rpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * recurrence_page_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new recurrence page.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created recurrence page, or NULL if the page could not</div><div class='del'>- * be created.</div><div class='del'>- **/</div><div class='del'>-RecurrencePage *</div><div class='del'>-recurrence_page_new (void)</div><div class='del'>-{</div><div class='del'>-	RecurrencePage *rpage;</div><div class='del'>-</div><div class='del'>-	rpage = gtk_type_new (TYPE_RECURRENCE_PAGE);</div><div class='del'>-	if (!recurrence_page_construct (rpage)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (rpage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *make_exdate_date_edit (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-make_exdate_date_edit (void)</div><div class='del'>-{</div><div class='del'>-	return comp_editor_new_date_edit (TRUE, TRUE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/dialogs/recurrence-page.glade b/calendar/gui/dialogs/recurrence-page.glade<br/>deleted file mode 100644<br/>index a044a771aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/recurrence-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/recurrence-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,602 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;recurrence-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;recurrence-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;.&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;recurrence-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;recurrence-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame35&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Basics&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;table14&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;2&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label66&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Summary:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label67&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Date/Time:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;summary&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;10&lt;/width&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;date-time&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;10&lt;/width&gt;</div><div class='del'>-	  &lt;label&gt;&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox55&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame36&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Recurrence Rule&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox56&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox56&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;none&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_No recurrence&lt;/label&gt;</div><div class='del'>-	      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	      &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;simple&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Simple recurrence&lt;/label&gt;</div><div class='del'>-	      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	      &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;custom&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Custom recurrence&lt;/label&gt;</div><div class='del'>-	      &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	      &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	      &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox57&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;params&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label68&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Every&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;interval-value&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		&lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		&lt;numeric&gt;True&lt;/numeric&gt;</div><div class='del'>-		&lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		&lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;value&gt;1&lt;/value&gt;</div><div class='del'>-		&lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-		&lt;upper&gt;10000&lt;/upper&gt;</div><div class='del'>-		&lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		&lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		&lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;interval-unit&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;day(s)</div><div class='del'>-week(s)</div><div class='del'>-month(s)</div><div class='del'>-year(s)</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;special&lt;/name&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		&lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;ending-menu&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;for</div><div class='del'>-until</div><div class='del'>-forever</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;ending-special&lt;/name&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		&lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;custom-warning-bin&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox59&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame37&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Exceptions&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox60&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox57&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;exception-add&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;A_dd&lt;/label&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;exception-modify&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Modify&lt;/label&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;exception-delete&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Remove&lt;/label&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox58&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;exception-date&lt;/name&gt;</div><div class='del'>-		&lt;creation_function&gt;make_exdate_date_edit&lt;/creation_function&gt;</div><div class='del'>-		&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		&lt;last_modification_time&gt;Tue, 16 May 2000 01:42:29 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;scrolledwindow14&lt;/name&gt;</div><div class='del'>-		&lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-		&lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-		&lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-		&lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;exception-list&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-		  &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-		  &lt;selection_mode&gt;GTK_SELECTION_BROWSE&lt;/selection_mode&gt;</div><div class='del'>-		  &lt;show_titles&gt;False&lt;/show_titles&gt;</div><div class='del'>-		  &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		    &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-		    &lt;name&gt;label69&lt;/name&gt;</div><div class='del'>-		    &lt;label&gt;label21&lt;/label&gt;</div><div class='del'>-		    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox59&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label70&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Preview&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;preview-bin&lt;/name&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	    &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	    &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h<br/>deleted file mode 100644<br/>index 29395f586f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/recurrence-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/recurrence-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Recurrence page of the calendar component dialogs</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef RECURRENCE_PAGE_H</div><div class='del'>-#define RECURRENCE_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_RECURRENCE_PAGE            (recurrence_page_get_type ())</div><div class='del'>-#define RECURRENCE_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_RECURRENCE_PAGE, RecurrencePage))</div><div class='del'>-#define RECURRENCE_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_RECURRENCE_PAGE, RecurrencePageClass))</div><div class='del'>-#define IS_RECURRENCE_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_RECURRENCE_PAGE))</div><div class='del'>-#define IS_RECURRENCE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_RECURRENCE_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _RecurrencePagePrivate RecurrencePagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	RecurrencePagePrivate *priv;</div><div class='del'>-} RecurrencePage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} RecurrencePageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType         recurrence_page_get_type  (void);</div><div class='del'>-RecurrencePage *recurrence_page_construct (RecurrencePage *rpage);</div><div class='del'>-RecurrencePage *recurrence_page_new       (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c<br/>deleted file mode 100644<br/>index 67a43a7320..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/save-comp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/save-comp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* Evolution calendar - Delete calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "save-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * save_component_dialog:</div><div class='del'>- * @parent: Window to use as the transient dialog's parent.</div><div class='del'>- * </div><div class='del'>- * Pops up a dialog box asking the user whether he wants to save changes for</div><div class='del'>- * a calendar component.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if changes shold be saved, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gint</div><div class='del'>-save_component_dialog (GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("Do you want to save changes?"),</div><div class='del'>-					GNOME_MESSAGE_BOX_QUESTION,</div><div class='del'>-					GNOME_STOCK_BUTTON_YES,</div><div class='del'>-					GNOME_STOCK_BUTTON_NO,</div><div class='del'>-					GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-					NULL);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);</div><div class='del'>-</div><div class='del'>-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h<br/>deleted file mode 100644<br/>index 7090464a4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/save-comp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/save-comp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Delete calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef SAVE_COMP_H</div><div class='del'>-#define SAVE_COMP_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-</div><div class='del'>-gint save_component_dialog (GtkWindow *parent);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c<br/>deleted file mode 100644<br/>index 6ae7924355..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/schedule-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/schedule-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,542 +0,0 @@</div><div class='del'>-/* Evolution calendar - Scheduling page</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-combo.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../e-meeting-time-sel.h"</div><div class='del'>-#include "../itip-utils.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "e-delegate-dialog.h"</div><div class='del'>-#include "schedule-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the SchedulePage structure */</div><div class='del'>-struct _SchedulePagePrivate {	</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	/* Model */</div><div class='del'>-	EMeetingModel *model;</div><div class='del'>-	</div><div class='del'>-	/* Selector */</div><div class='del'>-	EMeetingTimeSelector *sel;</div><div class='del'>-	</div><div class='del'>-	/* The timezone we use. Note that we use the same timezone for the</div><div class='del'>-	   start and end date. We convert the end date if it is passed in in</div><div class='del'>-	   another timezone. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void schedule_page_class_init (SchedulePageClass *class);</div><div class='del'>-static void schedule_page_init (SchedulePage *spage);</div><div class='del'>-static void schedule_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *schedule_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void schedule_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void schedule_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean schedule_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static void schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-static void times_changed_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * schedule_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #SchedulePage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #SchedulePage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-schedule_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType schedule_page_type;</div><div class='del'>-</div><div class='del'>-	if (!schedule_page_type) {</div><div class='del'>-		static const GtkTypeInfo schedule_page_info = {</div><div class='del'>-			"SchedulePage",</div><div class='del'>-			sizeof (SchedulePage),</div><div class='del'>-			sizeof (SchedulePageClass),</div><div class='del'>-			(GtkClassInitFunc) schedule_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) schedule_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		schedule_page_type = </div><div class='del'>-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-					 &amp;schedule_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return schedule_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the schedule page */</div><div class='del'>-static void</div><div class='del'>-schedule_page_class_init (SchedulePageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = schedule_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = schedule_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = schedule_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = schedule_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = NULL;</div><div class='del'>-	editor_page_class-&gt;set_dates = schedule_page_set_dates;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = schedule_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the schedule page */</div><div class='del'>-static void</div><div class='del'>-schedule_page_init (SchedulePage *spage)</div><div class='del'>-{</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (SchedulePagePrivate, 1);</div><div class='del'>-	spage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;zone = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the schedule page */</div><div class='del'>-static void</div><div class='del'>-schedule_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_SCHEDULE_PAGE (object));</div><div class='del'>-</div><div class='del'>-	spage = SCHEDULE_PAGE (object);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	spage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the schedule page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-schedule_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	spage = SCHEDULE_PAGE (page);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the schedule page */</div><div class='del'>-static void</div><div class='del'>-schedule_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	spage = SCHEDULE_PAGE (page);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (GTK_WIDGET (priv-&gt;sel));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set date/time */</div><div class='del'>-static void</div><div class='del'>-update_time (SchedulePage *spage, CalComponentDateTime *start_date, CalComponentDateTime *end_date) </div><div class='del'>-{</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	icaltimezone *start_zone = NULL, *end_zone = NULL;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gboolean all_day;</div><div class='del'>-</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Note that if we are creating a new event, the timezones may not be</div><div class='del'>-	   on the server, so we try to get the builtin timezone with the TZID</div><div class='del'>-	   first. */</div><div class='del'>-	start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date-&gt;tzid);</div><div class='del'>-	if (!start_zone) {</div><div class='del'>-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (spage)-&gt;client,</div><div class='del'>-						  start_date-&gt;tzid,</div><div class='del'>-						  &amp;start_zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-				   start_date-&gt;tzid ? start_date-&gt;tzid : "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	end_zone = icaltimezone_get_builtin_timezone_from_tzid (end_date-&gt;tzid);</div><div class='del'>-	if (!end_zone) {</div><div class='del'>-		status = cal_client_get_timezone (COMP_EDITOR_PAGE (spage)-&gt;client,</div><div class='del'>-						  end_date-&gt;tzid,</div><div class='del'>-						  &amp;end_zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-		  g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-			     end_date-&gt;tzid ? end_date-&gt;tzid : "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_tt = *start_date-&gt;value;</div><div class='del'>-	end_tt = *end_date-&gt;value;</div><div class='del'>-	</div><div class='del'>-	/* If the end zone is not the same as the start zone, we convert it. */</div><div class='del'>-	priv-&gt;zone = start_zone;</div><div class='del'>-	if (start_zone != end_zone) {</div><div class='del'>-		icaltimezone_convert_time (&amp;end_tt, end_zone, start_zone);</div><div class='del'>-	}</div><div class='del'>-	e_meeting_model_set_zone (priv-&gt;model, priv-&gt;zone);</div><div class='del'>-	</div><div class='del'>-	all_day = (start_tt.is_date &amp;&amp; end_tt.is_date) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	/* For All Day Events, if DTEND is after DTSTART, we subtract 1 day</div><div class='del'>-	   from it. */</div><div class='del'>-	if (all_day) {</div><div class='del'>-		if (icaltime_compare_date_only (end_tt, start_tt) &gt; 0) {</div><div class='del'>-			icaltime_adjust (&amp;end_tt, -1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_set_all_day (priv-&gt;sel, all_day);</div><div class='del'>-	</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;sel-&gt;start_date_edit), start_tt.year,</div><div class='del'>-			      start_tt.month, start_tt.day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;sel-&gt;start_date_edit),</div><div class='del'>-				     start_tt.hour, start_tt.minute);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date (E_DATE_EDIT (priv-&gt;sel-&gt;end_date_edit), end_tt.year,</div><div class='del'>-			      end_tt.month, end_tt.day);</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;sel-&gt;end_date_edit),</div><div class='del'>-				     end_tt.hour, end_tt.minute);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-		</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (SchedulePage *spage)</div><div class='del'>-{</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the schedule page */</div><div class='del'>-static void</div><div class='del'>-schedule_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	CalComponentDateTime start_date, end_date;</div><div class='del'>-</div><div class='del'>-	spage = SCHEDULE_PAGE (page);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Clean the screen */</div><div class='del'>-	clear_widgets (spage);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;start_date);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;end_date);</div><div class='del'>-	update_time (spage, &amp;start_date, &amp;end_date);</div><div class='del'>-	</div><div class='del'>-	cal_component_free_datetime (&amp;start_date);</div><div class='del'>-	cal_component_free_datetime (&amp;end_date);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the schedule page */</div><div class='del'>-static gboolean</div><div class='del'>-schedule_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	spage = SCHEDULE_PAGE (page);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	spage = SCHEDULE_PAGE (page);</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-	</div><div class='del'>-	update_time (spage, dates-&gt;start, dates-&gt;end);</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (SchedulePage *spage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (spage);</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("schedule-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-init_widgets (SchedulePage *spage) </div><div class='del'>-{</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;sel), </div><div class='del'>-			    "changed", times_changed_cb, spage);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * schedule_page_construct:</div><div class='del'>- * @spage: An schedule page.</div><div class='del'>- * </div><div class='del'>- * Constructs an schedule page by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @spage, or NULL if the widgets could not </div><div class='del'>- * be created.</div><div class='del'>- **/</div><div class='del'>-SchedulePage *</div><div class='del'>-schedule_page_construct (SchedulePage *spage, EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR </div><div class='del'>-				   "/schedule-page.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("schedule_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (spage)) {</div><div class='del'>-		g_message ("schedule_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Model */</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (emm));</div><div class='del'>-	priv-&gt;model = emm;</div><div class='del'>-	</div><div class='del'>-	/* Selector */</div><div class='del'>-	priv-&gt;sel = E_MEETING_TIME_SELECTOR (e_meeting_time_selector_new (emm));</div><div class='del'>-	e_meeting_time_selector_set_working_hours (priv-&gt;sel,</div><div class='del'>-						   calendar_config_get_day_start_hour (),</div><div class='del'>-						   calendar_config_get_day_start_minute (),</div><div class='del'>-						   calendar_config_get_day_end_hour (),</div><div class='del'>-						   calendar_config_get_day_end_minute ());</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (priv-&gt;sel));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (priv-&gt;main), GTK_WIDGET (priv-&gt;sel), TRUE, TRUE, 2);</div><div class='del'>-</div><div class='del'>-	if (!init_widgets (spage)) {</div><div class='del'>-		g_message ("schedule_page_construct(): " </div><div class='del'>-			   "Could not initialize the widgets!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return spage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * schedule_page_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new schedule page.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created schedule page, or NULL if the page could</div><div class='del'>- * not be created.</div><div class='del'>- **/</div><div class='del'>-SchedulePage *</div><div class='del'>-schedule_page_new (EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage;</div><div class='del'>-</div><div class='del'>-	spage = gtk_type_new (TYPE_SCHEDULE_PAGE);</div><div class='del'>-	if (!schedule_page_construct (spage, emm)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (spage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return spage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-times_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	SchedulePage *spage = data;</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-	CompEditorPageDates dates;</div><div class='del'>-	CalComponentDateTime start_dt, end_dt;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time ();</div><div class='del'>-	struct icaltimetype end_tt = icaltime_null_time ();</div><div class='del'>-	</div><div class='del'>-	priv = spage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_date_edit_get_date (E_DATE_EDIT (priv-&gt;sel-&gt;start_date_edit),</div><div class='del'>-			      &amp;start_tt.year,</div><div class='del'>-			      &amp;start_tt.month,</div><div class='del'>-			      &amp;start_tt.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;sel-&gt;start_date_edit),</div><div class='del'>-				     &amp;start_tt.hour,</div><div class='del'>-				     &amp;start_tt.minute);</div><div class='del'>-	e_date_edit_get_date (E_DATE_EDIT (priv-&gt;sel-&gt;end_date_edit),</div><div class='del'>-			      &amp;end_tt.year,</div><div class='del'>-			      &amp;end_tt.month,</div><div class='del'>-			      &amp;end_tt.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;sel-&gt;end_date_edit),</div><div class='del'>-				     &amp;end_tt.hour,</div><div class='del'>-				     &amp;end_tt.minute);</div><div class='del'>-</div><div class='del'>-	start_dt.value = &amp;start_tt;</div><div class='del'>-	end_dt.value = &amp;end_tt;</div><div class='del'>-</div><div class='del'>-	if (e_date_edit_get_show_time (E_DATE_EDIT (priv-&gt;sel-&gt;start_date_edit))) {</div><div class='del'>-		/* We set the start and end to the same timezone. */</div><div class='del'>-		start_dt.tzid = icaltimezone_get_tzid (priv-&gt;zone);</div><div class='del'>-		end_dt.tzid = start_dt.tzid;</div><div class='del'>-	} else {</div><div class='del'>-		/* For All-Day Events, we set the timezone to NULL, and add</div><div class='del'>-		   1 day to DTEND. */</div><div class='del'>-		start_dt.value-&gt;is_date = TRUE;</div><div class='del'>-		start_dt.tzid = NULL;</div><div class='del'>-		end_dt.value-&gt;is_date = TRUE;</div><div class='del'>-		icaltime_adjust (&amp;end_tt, 1, 0, 0, 0);</div><div class='del'>-		end_dt.tzid = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dates.start = &amp;start_dt;</div><div class='del'>-	dates.end = &amp;end_dt;	</div><div class='del'>-	dates.due = NULL;</div><div class='del'>-	dates.complete = NULL;</div><div class='del'>-</div><div class='del'>-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (spage),</div><div class='del'>-					       &amp;dates);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/schedule-page.glade b/calendar/gui/dialogs/schedule-page.glade<br/>deleted file mode 100644<br/>index 95a2147659..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/schedule-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/schedule-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-details-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-details-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;schedule-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;schedule-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h<br/>deleted file mode 100644<br/>index c485ba0f9e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/schedule-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/schedule-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* Evolution calendar - Scheduling page</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef SCHEDULE_PAGE_H</div><div class='del'>-#define SCHEDULE_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "../e-meeting-model.h"</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_SCHEDULE_PAGE            (schedule_page_get_type ())</div><div class='del'>-#define SCHEDULE_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_SCHEDULE_PAGE, SchedulePage))</div><div class='del'>-#define SCHEDULE_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_SCHEDULE_PAGE, SchedulePageClass))</div><div class='del'>-#define IS_SCHEDULE_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_SCHEDULE_PAGE))</div><div class='del'>-#define IS_SCHEDULE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_SCHEDULE_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _SchedulePagePrivate SchedulePagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	SchedulePagePrivate *priv;</div><div class='del'>-} SchedulePage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} SchedulePageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType      schedule_page_get_type  (void);</div><div class='del'>-SchedulePage *schedule_page_construct (SchedulePage *mpage, EMeetingModel *emm);</div><div class='del'>-SchedulePage *schedule_page_new       (EMeetingModel *emm);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c<br/>deleted file mode 100644<br/>index 2afd92320e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/send-comp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/send-comp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/* Evolution calendar - Send calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "send-comp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * send_component_dialog:</div><div class='del'>- * </div><div class='del'>- * Pops up a dialog box asking the user whether he wants to send a</div><div class='del'>- * iTip/iMip message</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the user clicked Yes, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-send_component_dialog (CalComponent *comp, gboolean new)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		if (new)</div><div class='del'>-			str = g_strdup_printf (_("The meeting information has "</div><div class='del'>-						 "been created. Send it?"));</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup_printf (_("The meeting information has "</div><div class='del'>-						 "changed. Send an updated "</div><div class='del'>-						 "version?"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		if (new)</div><div class='del'>-			str = g_strdup_printf (_("The task assignment "</div><div class='del'>-						 "information has been "</div><div class='del'>-						 "created. Send it?"));</div><div class='del'>-		else</div><div class='del'>-			str = g_strdup_printf (_("The task information has "</div><div class='del'>-						 "changed. Send an updated "</div><div class='del'>-						 "version?"));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("send_component_dialog(): "</div><div class='del'>-			   "Cannot handle object of type %d", vtype);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_question_dialog_modal (str, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h<br/>deleted file mode 100644<br/>index 9a77d8bd4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/send-comp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/send-comp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Send calendar component dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef SEND_COMP_H</div><div class='del'>-#define SEND_COMP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean send_component_dialog (CalComponent *comp, gboolean new);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c<br/>deleted file mode 100644<br/>index 84070ff541..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-details-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-details-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,772 +0,0 @@</div><div class='del'>-/* Evolution calendar - task details page</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-url-entry.h&gt;</div><div class='del'>-#include "e-util/e-dialog-widgets.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../e-timezone-entry.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "task-details-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the TaskDetailsPage structure */</div><div class='del'>-struct _TaskDetailsPagePrivate {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	GtkWidget *status;</div><div class='del'>-	GtkWidget *priority;</div><div class='del'>-	GtkWidget *percent_complete;</div><div class='del'>-</div><div class='del'>-	GtkWidget *completed_date;</div><div class='del'>-</div><div class='del'>-	GtkWidget *url_entry;</div><div class='del'>-	GtkWidget *url;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Note that these two arrays must match. */</div><div class='del'>-static const int status_map[] = {</div><div class='del'>-	ICAL_STATUS_NEEDSACTION,</div><div class='del'>-	ICAL_STATUS_INPROCESS,</div><div class='del'>-	ICAL_STATUS_COMPLETED,</div><div class='del'>-	ICAL_STATUS_CANCELLED,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	PRIORITY_HIGH,</div><div class='del'>-	PRIORITY_NORMAL,</div><div class='del'>-	PRIORITY_LOW,</div><div class='del'>-	PRIORITY_UNDEFINED,</div><div class='del'>-} TaskEditorPriority;</div><div class='del'>-</div><div class='del'>-static const int priority_map[] = {</div><div class='del'>-	PRIORITY_HIGH,</div><div class='del'>-	PRIORITY_NORMAL,</div><div class='del'>-	PRIORITY_LOW,</div><div class='del'>-	PRIORITY_UNDEFINED,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void task_details_page_class_init (TaskDetailsPageClass *class);</div><div class='del'>-static void task_details_page_init (TaskDetailsPage *tdpage);</div><div class='del'>-static void task_details_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *task_details_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void task_details_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void task_details_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean task_details_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_details_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #TaskDetailsPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #TaskDetailsPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-task_details_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType task_details_page_type;</div><div class='del'>-</div><div class='del'>-	if (!task_details_page_type) {</div><div class='del'>-		static const GtkTypeInfo task_details_page_info = {</div><div class='del'>-			"TaskDetailsPage",</div><div class='del'>-			sizeof (TaskDetailsPage),</div><div class='del'>-			sizeof (TaskDetailsPageClass),</div><div class='del'>-			(GtkClassInitFunc) task_details_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) task_details_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		task_details_page_type = </div><div class='del'>-			gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-					 &amp;task_details_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return task_details_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-task_details_page_class_init (TaskDetailsPageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = task_details_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = task_details_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = task_details_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = task_details_page_fill_component;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = task_details_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-task_details_page_init (TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (TaskDetailsPagePrivate, 1);</div><div class='del'>-	tdpage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;status = NULL;</div><div class='del'>-	priv-&gt;priority = NULL;</div><div class='del'>-	priv-&gt;percent_complete = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;completed_date = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;url_entry = NULL;</div><div class='del'>-	priv-&gt;url = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_details_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_DETAILS_PAGE (object));</div><div class='del'>-</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (object);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	tdpage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the task page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-task_details_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (page);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_details_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (page);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static TaskEditorPriority</div><div class='del'>-priority_value_to_index (int priority_value)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPriority retval;</div><div class='del'>-</div><div class='del'>-	if (priority_value == 0)</div><div class='del'>-		retval = PRIORITY_UNDEFINED;</div><div class='del'>-	else if (priority_value &lt;= 4)</div><div class='del'>-		retval = PRIORITY_HIGH;</div><div class='del'>-	else if (priority_value == 5)</div><div class='del'>-		retval = PRIORITY_NORMAL;</div><div class='del'>-	else</div><div class='del'>-		retval = PRIORITY_LOW;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-priority_index_to_value (TaskEditorPriority priority)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	switch (priority) {</div><div class='del'>-	case PRIORITY_UNDEFINED:</div><div class='del'>-		retval = 0;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_HIGH:</div><div class='del'>-		retval = 3;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_NORMAL:</div><div class='del'>-		retval = 5;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_LOW:</div><div class='del'>-		retval = 7;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		retval = -1;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Date completed */</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), -1);</div><div class='del'>-</div><div class='del'>-	/* URL */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;url, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_details_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	int *priority_value, *percent;</div><div class='del'>-	TaskEditorPriority priority;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	const char *url;</div><div class='del'>-	struct icaltimetype *completed = NULL;</div><div class='del'>-</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (page);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Clean the screen */</div><div class='del'>-	clear_widgets (tdpage);</div><div class='del'>-	</div><div class='del'>-	/* Percent Complete. */</div><div class='del'>-	cal_component_get_percent (comp, &amp;percent);</div><div class='del'>-	if (percent) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, *percent);</div><div class='del'>-		cal_component_free_percent (percent);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Could check if task is completed and set 100%. */</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (comp, &amp;status);</div><div class='del'>-	if (status == ICAL_STATUS_NONE) {</div><div class='del'>-		/* Try to use the percent value. */</div><div class='del'>-		if (percent) {</div><div class='del'>-			if (*percent == 0)</div><div class='del'>-				status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-			else if (*percent == 100)</div><div class='del'>-				status = ICAL_STATUS_COMPLETED;</div><div class='del'>-			else</div><div class='del'>-				status = ICAL_STATUS_INPROCESS;</div><div class='del'>-		} else</div><div class='del'>-			status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-	}</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;status, status, status_map);</div><div class='del'>-</div><div class='del'>-	/* Completed Date. */</div><div class='del'>-	cal_component_get_completed (comp, &amp;completed);</div><div class='del'>-	if (completed) {</div><div class='del'>-		icaltimezone *utc_zone, *zone;</div><div class='del'>-		char *location;</div><div class='del'>-</div><div class='del'>-		/* Completed is in UTC, but that would confuse the user, so</div><div class='del'>-		   we convert it to local time. */</div><div class='del'>-		utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		location = calendar_config_get_timezone ();</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-		icaltimezone_convert_time (completed, utc_zone, zone);</div><div class='del'>-</div><div class='del'>-		e_date_edit_set_date (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-				      completed-&gt;year, completed-&gt;month,</div><div class='del'>-				      completed-&gt;day);</div><div class='del'>-		e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-					     completed-&gt;hour,</div><div class='del'>-					     completed-&gt;minute);</div><div class='del'>-</div><div class='del'>-		cal_component_free_icaltimetype (completed);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Priority. */</div><div class='del'>-	cal_component_get_priority (comp, &amp;priority_value);</div><div class='del'>-	if (priority_value) {</div><div class='del'>-		priority = priority_value_to_index (*priority_value);</div><div class='del'>-		cal_component_free_priority (priority_value);</div><div class='del'>-	} else {</div><div class='del'>-		priority = PRIORITY_UNDEFINED;</div><div class='del'>-	}</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;priority, priority, priority_map);</div><div class='del'>-</div><div class='del'>-	/* URL */</div><div class='del'>-	cal_component_get_url (comp, &amp;url);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;url, url);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the task page */</div><div class='del'>-static gboolean</div><div class='del'>-task_details_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	TaskEditorPriority priority;</div><div class='del'>-	int priority_value, percent;</div><div class='del'>-	char *url;</div><div class='del'>-	gboolean date_set;</div><div class='del'>-	</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (page);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Percent Complete. */</div><div class='del'>-	percent = e_dialog_spin_get_int (priv-&gt;percent_complete);</div><div class='del'>-	cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	status = e_dialog_option_menu_get (priv-&gt;status, status_map);</div><div class='del'>-	cal_component_set_status (comp, status);</div><div class='del'>-</div><div class='del'>-	/* Priority. */</div><div class='del'>-	priority = e_dialog_option_menu_get (priv-&gt;priority, priority_map);</div><div class='del'>-	priority_value = priority_index_to_value (priority);</div><div class='del'>-	cal_component_set_priority (comp, &amp;priority_value);</div><div class='del'>-</div><div class='del'>-	icaltime = icaltime_null_time ();</div><div class='del'>-</div><div class='del'>-	/* COMPLETED must be in UTC. */</div><div class='del'>-	icaltime.is_utc = 1;</div><div class='del'>-</div><div class='del'>-	/* Completed Date. */</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-					 &amp;icaltime.year,</div><div class='del'>-					 &amp;icaltime.month,</div><div class='del'>-					 &amp;icaltime.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-				     &amp;icaltime.hour,</div><div class='del'>-				     &amp;icaltime.minute);</div><div class='del'>-	if (date_set) {</div><div class='del'>-		/* COMPLETED must be in UTC, so we assume that the date in the</div><div class='del'>-		   dialog is in the current timezone, and we now convert it</div><div class='del'>-		   to UTC. FIXME: We should really use one timezone for the</div><div class='del'>-		   entire time the dialog is shown. Otherwise if the user</div><div class='del'>-		   changes the timezone, the COMPLETED date may get changed</div><div class='del'>-		   as well. */</div><div class='del'>-		char *location = calendar_config_get_timezone ();</div><div class='del'>-		icaltimezone *zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-		icaltimezone_convert_time (&amp;icaltime, zone,</div><div class='del'>-					   icaltimezone_get_utc_timezone ());</div><div class='del'>-		cal_component_set_completed (comp, &amp;icaltime);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_completed (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* URL. */</div><div class='del'>-	url = e_dialog_editable_get (priv-&gt;url);</div><div class='del'>-	cal_component_set_url (comp, url);</div><div class='del'>-	if (url)</div><div class='del'>-		g_free (url);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (tdpage);</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("task-details-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;status = GW ("status");</div><div class='del'>-	priv-&gt;priority = GW ("priority");</div><div class='del'>-	priv-&gt;percent_complete = GW ("percent-complete");</div><div class='del'>-</div><div class='del'>-	priv-&gt;completed_date = GW ("completed-date");</div><div class='del'>-</div><div class='del'>-	priv-&gt;url_entry = GW ("url_entry");</div><div class='del'>-	priv-&gt;url = e_url_entry_get_entry (E_URL_ENTRY (priv-&gt;url_entry));</div><div class='del'>-	</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;status</div><div class='del'>-		&amp;&amp; priv-&gt;priority</div><div class='del'>-		&amp;&amp; priv-&gt;percent_complete</div><div class='del'>-		&amp;&amp; priv-&gt;completed_date</div><div class='del'>-		&amp;&amp; priv-&gt;url);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	struct icaltimetype completed_tt = icaltime_null_time();</div><div class='del'>-</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Get the current time in UTC. */</div><div class='del'>-	zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	completed_tt = icaltime_from_timet_with_zone (ctime, FALSE, zone);</div><div class='del'>-	completed_tt.is_utc = TRUE;</div><div class='del'>-</div><div class='del'>-	dates.start = NULL;</div><div class='del'>-	dates.end = NULL;</div><div class='del'>-	dates.due = NULL;	</div><div class='del'>-	if (complete)</div><div class='del'>-		dates.complete = &amp;completed_tt;</div><div class='del'>-	</div><div class='del'>-	/* Notify upstream */</div><div class='del'>-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage),</div><div class='del'>-					       &amp;dates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-date_changed_cb (EDateEdit *dedit, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};</div><div class='del'>-	struct icaltimetype completed_tt = icaltime_null_time ();</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	gboolean date_set;</div><div class='del'>-</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (data);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-					 &amp;completed_tt.year,</div><div class='del'>-					 &amp;completed_tt.month,</div><div class='del'>-					 &amp;completed_tt.day);</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-				     &amp;completed_tt.hour,</div><div class='del'>-				     &amp;completed_tt.minute);</div><div class='del'>-</div><div class='del'>-	status = e_dialog_option_menu_get (priv-&gt;status, status_map);</div><div class='del'>-</div><div class='del'>-	if (!date_set) {</div><div class='del'>-		completed_tt = icaltime_null_time ();</div><div class='del'>-		if (status == ICAL_STATUS_COMPLETED) {</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;status,</div><div class='del'>-						  ICAL_STATUS_NEEDSACTION,</div><div class='del'>-						  status_map);</div><div class='del'>-			e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (status != ICAL_STATUS_COMPLETED) {</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;status,</div><div class='del'>-						  ICAL_STATUS_COMPLETED,</div><div class='del'>-						  status_map);</div><div class='del'>-		}</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 100);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Notify upstream */</div><div class='del'>-	dates.complete = &amp;completed_tt;</div><div class='del'>-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage), &amp;dates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_changed (GtkMenu	*menu, TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	time_t ctime = -1;</div><div class='del'>-	</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	status = e_dialog_option_menu_get (priv-&gt;status, status_map);</div><div class='del'>-	if (status == ICAL_STATUS_NEEDSACTION) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), ctime);</div><div class='del'>-		complete_date_changed (tdpage, 0, FALSE);</div><div class='del'>-	} else if (status == ICAL_STATUS_INPROCESS) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 50);</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), ctime);</div><div class='del'>-		complete_date_changed (tdpage, 0, FALSE);</div><div class='del'>-	} else if (status == ICAL_STATUS_COMPLETED) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 100);</div><div class='del'>-		ctime = time (NULL);</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), ctime);</div><div class='del'>-		complete_date_changed (tdpage, ctime, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-</div><div class='del'>-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-percent_complete_changed (GtkAdjustment	*adj, TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	gint percent;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	gboolean complete;</div><div class='del'>-	time_t ctime = -1;</div><div class='del'>-	</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	percent = e_dialog_spin_get_int (priv-&gt;percent_complete);</div><div class='del'>-	if (percent == 100) {</div><div class='del'>-		complete = TRUE;</div><div class='del'>-		ctime = time (NULL);</div><div class='del'>-		status = ICAL_STATUS_COMPLETED;</div><div class='del'>-	} else {</div><div class='del'>-		complete = FALSE;</div><div class='del'>-</div><div class='del'>-		if (percent == 0)</div><div class='del'>-			status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-		else</div><div class='del'>-			status = ICAL_STATUS_INPROCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;status, status, status_map);</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), ctime);</div><div class='del'>-	complete_date_changed (tdpage, ctime, complete);</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-</div><div class='del'>-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tdpage = TASK_DETAILS_PAGE (data);</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tdpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Make sure the EDateEdit widgets use our timezones to get the</div><div class='del'>-	   current time. */</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   tdpage, NULL);</div><div class='del'>-</div><div class='del'>-	/* Connect signals. The Status, Percent Complete &amp; Date Completed</div><div class='del'>-	   properties are closely related so whenever one changes we may need</div><div class='del'>-	   to update the other 2. */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv-&gt;status)-&gt;menu),</div><div class='del'>-			    "deactivate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (status_changed), tdpage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv-&gt;percent_complete)-&gt;adjustment),</div><div class='del'>-			    "value_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (percent_complete_changed), tdpage);</div><div class='del'>-</div><div class='del'>-	/* Priority */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv-&gt;priority)-&gt;menu),</div><div class='del'>-			    "deactivate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tdpage);</div><div class='del'>-</div><div class='del'>-	/* Completed Date */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;completed_date), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), tdpage);</div><div class='del'>-</div><div class='del'>-	/* URL */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;url), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tdpage);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_details_page_construct:</div><div class='del'>- * @tdpage: An task details page.</div><div class='del'>- * </div><div class='del'>- * Constructs an task page by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @tdpage, or NULL if the widgets could not </div><div class='del'>- * be created.</div><div class='del'>- **/</div><div class='del'>-TaskDetailsPage *</div><div class='del'>-task_details_page_construct (TaskDetailsPage *tdpage)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tdpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR </div><div class='del'>-				   "/task-details-page.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("task_details_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (tdpage)) {</div><div class='del'>-		g_message ("task_details_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_widgets (tdpage);</div><div class='del'>-</div><div class='del'>-	return tdpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_details_page_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new task details page.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created task details page, or NULL if the page could</div><div class='del'>- * not be created.</div><div class='del'>- **/</div><div class='del'>-TaskDetailsPage *</div><div class='del'>-task_details_page_new (void)</div><div class='del'>-{</div><div class='del'>-	TaskDetailsPage *tdpage;</div><div class='del'>-</div><div class='del'>-	tdpage = gtk_type_new (TYPE_TASK_DETAILS_PAGE);</div><div class='del'>-	if (!task_details_page_construct (tdpage)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (tdpage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tdpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *task_details_page_create_date_edit (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-task_details_page_create_date_edit (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = comp_editor_new_date_edit (TRUE, TRUE, FALSE);</div><div class='del'>-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);</div><div class='del'>-</div><div class='del'>-	return dedit;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade<br/>deleted file mode 100644<br/>index 28bf6a3bcc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-details-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-details-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,309 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-details-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-details-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;task-details-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;task-details-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame2&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Progress&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Status:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;status&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;status&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;Not Started</div><div class='del'>-In Progress</div><div class='del'>-Completed</div><div class='del'>-Cancelled</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Priority:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;priority&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;priority&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;High</div><div class='del'>-Normal</div><div class='del'>-Low</div><div class='del'>-Undefined</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label19&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;% Complete&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;percent-complete&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	    &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	    &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	    &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	    &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	    &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	    &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-	    &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	    &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	    &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label12&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Date Completed:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;completed-date&lt;/name&gt;</div><div class='del'>-	    &lt;creation_function&gt;task_details_page_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Fri, 01 Jun 2001 18:58:51 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table2&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label14&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;URL:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;url_entry&lt;/name&gt;</div><div class='del'>-	&lt;creation_function&gt;e_url_entry_new&lt;/creation_function&gt;</div><div class='del'>-	&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	&lt;last_modification_time&gt;Fri, 08 Feb 2002 21:02:37 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h<br/>deleted file mode 100644<br/>index 580388cb8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-details-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-details-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TASK_DETAILS_PAGE_H</div><div class='del'>-#define TASK_DETAILS_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_TASK_DETAILS_PAGE            (task_details_page_get_type ())</div><div class='del'>-#define TASK_DETAILS_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPage))</div><div class='del'>-#define TASK_DETAILS_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_DETAILS_PAGE, TaskDetailsPageClass))</div><div class='del'>-#define IS_TASK_DETAILS_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))</div><div class='del'>-#define IS_TASK_DETAILS_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_DETAILS_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _TaskDetailsPagePrivate TaskDetailsPagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	TaskDetailsPagePrivate *priv;</div><div class='del'>-} TaskDetailsPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} TaskDetailsPageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType          task_details_page_get_type        (void);</div><div class='del'>-TaskDetailsPage *task_details_page_construct       (TaskDetailsPage *tdpage);</div><div class='del'>-TaskDetailsPage *task_details_page_new             (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c<br/>deleted file mode 100644<br/>index 1ede12fff3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,405 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include "task-page.h"</div><div class='del'>-#include "task-details-page.h"</div><div class='del'>-#include "meeting-page.h"</div><div class='del'>-#include "cancel-comp.h"</div><div class='del'>-#include "task-editor.h"</div><div class='del'>-</div><div class='del'>-struct _TaskEditorPrivate {</div><div class='del'>-	TaskPage *task_page;</div><div class='del'>-	TaskDetailsPage *task_details_page;</div><div class='del'>-	MeetingPage *meet_page;</div><div class='del'>-</div><div class='del'>-	EMeetingModel *model;</div><div class='del'>-	</div><div class='del'>-	gboolean assignment_shown;</div><div class='del'>-	gboolean existing_org;</div><div class='del'>-	gboolean updating;	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void task_editor_class_init (TaskEditorClass *class);</div><div class='del'>-static void task_editor_init (TaskEditor *te);</div><div class='del'>-static void task_editor_edit_comp (CompEditor *editor, CalComponent *comp);</div><div class='del'>-static void task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method);</div><div class='del'>-static void task_editor_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void assign_task_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void refresh_task_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void cancel_task_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-static void forward_cmd (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static void model_row_changed_cb (ETableModel *etm, int row, gpointer data);</div><div class='del'>-static void row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data);</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionAssignTask", assign_task_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionRefreshTask", refresh_task_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionCancelTask", cancel_task_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionForward", forward_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CompEditorClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_editor_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #TaskEditor class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #TaskEditor class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-task_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType task_editor_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!task_editor_type) {</div><div class='del'>-		static const GtkTypeInfo task_editor_info = {</div><div class='del'>-			"TaskEditor",</div><div class='del'>-			sizeof (TaskEditor),</div><div class='del'>-			sizeof (TaskEditorClass),</div><div class='del'>-			(GtkClassInitFunc) task_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) task_editor_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		task_editor_type = gtk_type_unique (TYPE_COMP_EDITOR,</div><div class='del'>-						     &amp;task_editor_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return task_editor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the event editor */</div><div class='del'>-static void</div><div class='del'>-task_editor_class_init (TaskEditorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	CompEditorClass *editor_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) klass;</div><div class='del'>-	editor_class = (CompEditorClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR);</div><div class='del'>-</div><div class='del'>-	editor_class-&gt;edit_comp = task_editor_edit_comp;</div><div class='del'>-	editor_class-&gt;send_comp = task_editor_send_comp;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = task_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_menu_sens (TaskEditor *te) </div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	gboolean sens;</div><div class='del'>-	</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	sens = priv-&gt;assignment_shown;</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (te), </div><div class='del'>-				 "/commands/ActionAssignTask", </div><div class='del'>-				 "sensitive", sens ? "0" : "1");</div><div class='del'>-</div><div class='del'>-	sens = sens &amp;&amp; priv-&gt;existing_org;</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (te), </div><div class='del'>-				 "/commands/ActionRefreshTask", </div><div class='del'>-				 "sensitive", sens ? "1" : "0");</div><div class='del'>-	comp_editor_set_ui_prop (COMP_EDITOR (te), </div><div class='del'>-				 "/commands/ActionCancelTask", </div><div class='del'>-				 "sensitive", sens ? "1" : "0");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_widgets (TaskEditor *te)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_row_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (model_row_changed_cb), te);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_rows_inserted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (row_count_changed_cb), te);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;model), "model_rows_deleted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (row_count_changed_cb), te);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the task editor */</div><div class='del'>-static void</div><div class='del'>-task_editor_init (TaskEditor *te)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (TaskEditorPrivate, 1);</div><div class='del'>-	te-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;task_page = task_page_new ();</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (te), </div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;task_page),</div><div class='del'>-				 _("Basic"));</div><div class='del'>-</div><div class='del'>-	priv-&gt;task_details_page = task_details_page_new ();</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (te),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;task_details_page),</div><div class='del'>-				 _("Details"));</div><div class='del'>-</div><div class='del'>-	priv-&gt;model = E_MEETING_MODEL (e_meeting_model_new ());</div><div class='del'>-</div><div class='del'>-	priv-&gt;meet_page = meeting_page_new (priv-&gt;model);</div><div class='del'>-	comp_editor_append_page (COMP_EDITOR (te),</div><div class='del'>-				 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-				 _("Assignment"));</div><div class='del'>-</div><div class='del'>-	comp_editor_merge_ui (COMP_EDITOR (te), "evolution-task-editor.xml", verbs);</div><div class='del'>-</div><div class='del'>-	priv-&gt;assignment_shown = TRUE;</div><div class='del'>-	priv-&gt;existing_org = FALSE;</div><div class='del'>-	priv-&gt;updating = FALSE;	</div><div class='del'>-</div><div class='del'>-	init_widgets (te);</div><div class='del'>-	set_menu_sens (te);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_editor_edit_comp (CompEditor *editor, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	GSList *attendees = NULL;</div><div class='del'>-	</div><div class='del'>-	te = TASK_EDITOR (editor);</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;existing_org = cal_component_has_organizer (comp);</div><div class='del'>-	cal_component_get_attendee_list (comp, &amp;attendees);</div><div class='del'>-</div><div class='del'>-	e_meeting_model_remove_all_attendees (priv-&gt;model);</div><div class='del'>-	if (attendees == NULL) {</div><div class='del'>-		comp_editor_remove_page (editor, COMP_EDITOR_PAGE (priv-&gt;meet_page));</div><div class='del'>-		priv-&gt;assignment_shown = FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		GSList *l;</div><div class='del'>-</div><div class='del'>-		if (!priv-&gt;assignment_shown)</div><div class='del'>-			comp_editor_append_page (COMP_EDITOR (te),</div><div class='del'>-						 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-						 _("Assignment"));</div><div class='del'>-</div><div class='del'>-		for (l = attendees; l != NULL; l = l-&gt;next) {</div><div class='del'>-			CalComponentAttendee *ca = l-&gt;data;</div><div class='del'>-			EMeetingAttendee *ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca));</div><div class='del'>-			</div><div class='del'>-			e_meeting_model_add_attendee (priv-&gt;model, ia);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (ia));</div><div class='del'>-		}</div><div class='del'>-		priv-&gt;assignment_shown = TRUE;		</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_attendee_list (attendees);</div><div class='del'>-</div><div class='del'>-	set_menu_sens (te);</div><div class='del'>-	comp_editor_set_needs_send (COMP_EDITOR (te), priv-&gt;assignment_shown);</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-	</div><div class='del'>-	if (parent_class-&gt;edit_comp)</div><div class='del'>-		parent_class-&gt;edit_comp (editor, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (editor);</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp = NULL;</div><div class='del'>-</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Don't cancel more than once or when just publishing */</div><div class='del'>-	if (method == CAL_COMPONENT_METHOD_PUBLISH ||</div><div class='del'>-	    method == CAL_COMPONENT_METHOD_CANCEL)</div><div class='del'>-		goto parent;</div><div class='del'>-	</div><div class='del'>-	comp = meeting_page_get_cancel_comp (priv-&gt;meet_page);</div><div class='del'>-	if (comp != NULL) {</div><div class='del'>-		CalClient *client;</div><div class='del'>-		</div><div class='del'>-		client = e_meeting_model_get_cal_client (priv-&gt;model);</div><div class='del'>-		itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- parent:</div><div class='del'>-	if (parent_class-&gt;send_comp)</div><div class='del'>-		parent_class-&gt;send_comp (editor, method);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the event editor */</div><div class='del'>-static void</div><div class='del'>-task_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (object));</div><div class='del'>-</div><div class='del'>-	te = TASK_EDITOR (object);</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;task_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;task_details_page));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;meet_page));</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;model));</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_editor_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new event editor dialog.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created event editor dialog, or NULL if the event</div><div class='del'>- * editor could not be created.</div><div class='del'>- **/</div><div class='del'>-TaskEditor *</div><div class='del'>-task_editor_new (void)</div><div class='del'>-{</div><div class='del'>-	return TASK_EDITOR (gtk_type_new (TYPE_TASK_EDITOR));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_assignment (TaskEditor *te)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;assignment_shown) {</div><div class='del'>-		comp_editor_append_page (COMP_EDITOR (te),</div><div class='del'>-					 COMP_EDITOR_PAGE (priv-&gt;meet_page),</div><div class='del'>-					 _("Assignment"));</div><div class='del'>-		priv-&gt;assignment_shown = TRUE;</div><div class='del'>-</div><div class='del'>-		set_menu_sens (te);</div><div class='del'>-		comp_editor_set_needs_send (COMP_EDITOR (te), priv-&gt;assignment_shown);</div><div class='del'>-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_editor_show_page (COMP_EDITOR (te),</div><div class='del'>-			       COMP_EDITOR_PAGE (priv-&gt;meet_page));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-task_editor_show_assignment (TaskEditor *te)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (te != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (te));</div><div class='del'>-</div><div class='del'>-	show_assignment (te);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-assign_task_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	show_assignment (te);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_task_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_REFRESH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_task_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	</div><div class='del'>-	comp = comp_editor_get_current_comp (COMP_EDITOR (te));</div><div class='del'>-	if (cancel_component_dialog (comp)) {</div><div class='del'>-		comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_CANCEL);</div><div class='del'>-		comp_editor_delete_comp (COMP_EDITOR (te));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-forward_cmd (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-	</div><div class='del'>-	if (comp_editor_save_comp (COMP_EDITOR (te), TRUE))</div><div class='del'>-		comp_editor_send_comp (COMP_EDITOR (te), CAL_COMPONENT_METHOD_PUBLISH);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-model_row_changed_cb (ETableModel *etm, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-row_count_changed_cb (ETableModel *etm, int row, int count, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *te = TASK_EDITOR (data);</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = te-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_set_changed (COMP_EDITOR (te), TRUE);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h<br/>deleted file mode 100644<br/>index e9888f446a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* Evolution calendar - Task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __TASK_EDITOR_H__</div><div class='del'>-#define __TASK_EDITOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include "comp-editor.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_TASK_EDITOR            (task_editor_get_type ())</div><div class='del'>-#define TASK_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor))</div><div class='del'>-#define TASK_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR,	\</div><div class='del'>-				      TaskEditorClass))</div><div class='del'>-#define IS_TASK_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_EDITOR))</div><div class='del'>-#define IS_TASK_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR))</div><div class='del'>-</div><div class='del'>-typedef struct _TaskEditor TaskEditor;</div><div class='del'>-typedef struct _TaskEditorClass TaskEditorClass;</div><div class='del'>-typedef struct _TaskEditorPrivate TaskEditorPrivate;</div><div class='del'>-</div><div class='del'>-struct _TaskEditor {</div><div class='del'>-	CompEditor parent;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _TaskEditorClass {</div><div class='del'>-	CompEditorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType     task_editor_get_type       (void);</div><div class='del'>-TaskEditor *task_editor_construct      (TaskEditor *te);</div><div class='del'>-TaskEditor *task_editor_new            (void);</div><div class='del'>-void        task_editor_show_assignment(TaskEditor *te);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __TASK_EDITOR_H__ */</div><div class='head'>diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c<br/>deleted file mode 100644<br/>index 6b55b58c84..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-page.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-page.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,992 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtktext.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-categories.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include "e-util/e-dialog-widgets.h"</div><div class='del'>-#include "e-util/e-categories-config.h"</div><div class='del'>-#include "../e-timezone-entry.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "comp-editor-util.h"</div><div class='del'>-#include "task-page.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the TaskPage structure */</div><div class='del'>-struct _TaskPagePrivate {</div><div class='del'>-	/* Glade XML data */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-</div><div class='del'>-	/* Widgets from the Glade file */</div><div class='del'>-	GtkWidget *main;</div><div class='del'>-</div><div class='del'>-	GtkWidget *summary;</div><div class='del'>-</div><div class='del'>-	GtkWidget *due_date;</div><div class='del'>-	GtkWidget *start_date;</div><div class='del'>-	GtkWidget *due_timezone;</div><div class='del'>-	GtkWidget *start_timezone;</div><div class='del'>-</div><div class='del'>-	GtkWidget *description;</div><div class='del'>-</div><div class='del'>-	GtkWidget *classification_public;</div><div class='del'>-	GtkWidget *classification_private;</div><div class='del'>-	GtkWidget *classification_confidential;</div><div class='del'>-</div><div class='del'>-	GtkWidget *contacts_btn;	</div><div class='del'>-	GtkWidget *contacts_box;</div><div class='del'>-</div><div class='del'>-	GtkWidget *categories_btn;</div><div class='del'>-	GtkWidget *categories;</div><div class='del'>-</div><div class='del'>-	gboolean updating;</div><div class='del'>-</div><div class='del'>-	/* The Corba component for selecting contacts, and the entry field</div><div class='del'>-	   which we place in the dialog. */</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	GtkWidget *contacts_entry;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int classification_map[] = {</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void task_page_class_init (TaskPageClass *class);</div><div class='del'>-static void task_page_init (TaskPage *tpage);</div><div class='del'>-static void task_page_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkWidget *task_page_get_widget (CompEditorPage *page);</div><div class='del'>-static void task_page_focus_main_widget (CompEditorPage *page);</div><div class='del'>-static void task_page_fill_widgets (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static gboolean task_page_fill_component (CompEditorPage *page, CalComponent *comp);</div><div class='del'>-static void task_page_set_summary (CompEditorPage *page, const char *summary);</div><div class='del'>-static void task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);</div><div class='del'>-</div><div class='del'>-static CompEditorPageClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_page_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #TaskPage class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #TaskPage class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-task_page_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType task_page_type;</div><div class='del'>-</div><div class='del'>-	if (!task_page_type) {</div><div class='del'>-		static const GtkTypeInfo task_page_info = {</div><div class='del'>-			"TaskPage",</div><div class='del'>-			sizeof (TaskPage),</div><div class='del'>-			sizeof (TaskPageClass),</div><div class='del'>-			(GtkClassInitFunc) task_page_class_init,</div><div class='del'>-			(GtkObjectInitFunc) task_page_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		task_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,</div><div class='del'>-						  &amp;task_page_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return task_page_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_class_init (TaskPageClass *class)</div><div class='del'>-{</div><div class='del'>-	CompEditorPageClass *editor_page_class;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	editor_page_class = (CompEditorPageClass *) class;</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE);</div><div class='del'>-</div><div class='del'>-	editor_page_class-&gt;get_widget = task_page_get_widget;</div><div class='del'>-	editor_page_class-&gt;focus_main_widget = task_page_focus_main_widget;</div><div class='del'>-	editor_page_class-&gt;fill_widgets = task_page_fill_widgets;</div><div class='del'>-	editor_page_class-&gt;fill_component = task_page_fill_component;</div><div class='del'>-	editor_page_class-&gt;set_summary = task_page_set_summary;</div><div class='del'>-	editor_page_class-&gt;set_dates = task_page_set_dates;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = task_page_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_init (TaskPage *tpage)</div><div class='del'>-{</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (TaskPagePrivate, 1);</div><div class='del'>-	tpage-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = NULL;</div><div class='del'>-	priv-&gt;summary = NULL;</div><div class='del'>-	priv-&gt;due_date = NULL;</div><div class='del'>-	priv-&gt;start_date = NULL;</div><div class='del'>-	priv-&gt;due_timezone = NULL;</div><div class='del'>-	priv-&gt;start_timezone = NULL;</div><div class='del'>-	priv-&gt;description = NULL;</div><div class='del'>-	priv-&gt;classification_public = NULL;</div><div class='del'>-	priv-&gt;classification_private = NULL;</div><div class='del'>-	priv-&gt;classification_confidential = NULL;</div><div class='del'>-	priv-&gt;contacts_btn = NULL;</div><div class='del'>-	priv-&gt;contacts_box = NULL;</div><div class='del'>-	priv-&gt;categories_btn = NULL;</div><div class='del'>-	priv-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;corba_select_names = CORBA_OBJECT_NIL;</div><div class='del'>-	priv-&gt;contacts_entry = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_PAGE (object));</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (object);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		CORBA_Object_release (priv-&gt;corba_select_names, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;xml) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-		priv-&gt;xml = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	tpage-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* get_widget handler for the task page */</div><div class='del'>-static GtkWidget *</div><div class='del'>-task_page_get_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (page);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;main;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* focus_main_widget handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_focus_main_widget (CompEditorPage *page)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (page);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (priv-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the widgets with default values */</div><div class='del'>-static void</div><div class='del'>-clear_widgets (TaskPage *tpage)</div><div class='del'>-{</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary, description */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;summary, NULL);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;description, NULL);</div><div class='del'>-</div><div class='del'>-	/* Start, due times */</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_date), 0);</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;due_date), 0);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;categories, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Decode the radio button group for classifications */</div><div class='del'>-static CalComponentClassification</div><div class='del'>-classification_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	return e_dialog_radio_get (widget, classification_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-contacts_changed_cb (BonoboListener    *listener,</div><div class='del'>-		     char              *event_name,</div><div class='del'>-		     CORBA_any         *arg,</div><div class='del'>-		     CORBA_Environment *ev,</div><div class='del'>-		     gpointer           data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_widgets handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_fill_widgets (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CalComponentDateTime d;</div><div class='del'>-	CalComponentClassification cl;</div><div class='del'>-	CalClientGetStatus get_tz_status;</div><div class='del'>-	GSList *l;</div><div class='del'>-	const char *categories;</div><div class='del'>-	icaltimezone *zone, *default_zone;</div><div class='del'>-	char *location;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (page);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Clean the screen */</div><div class='del'>-	clear_widgets (tpage);</div><div class='del'>-</div><div class='del'>-        /* Summary, description(s) */</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;summary, text.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;l);</div><div class='del'>-	if (l) {</div><div class='del'>-		text = *(CalComponentText *)l-&gt;data;</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, text.value);</div><div class='del'>-	} else {</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, NULL);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	default_zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	/* Due Date. */</div><div class='del'>-	cal_component_get_due (comp, &amp;d);</div><div class='del'>-	zone = NULL;</div><div class='del'>-	if (d.value) {</div><div class='del'>-		struct icaltimetype *due_tt = d.value;</div><div class='del'>-		e_date_edit_set_date (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-				      due_tt-&gt;year, due_tt-&gt;month,</div><div class='del'>-				      due_tt-&gt;day);</div><div class='del'>-		if (due_tt-&gt;is_date) {</div><div class='del'>-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-						     -1, -1);</div><div class='del'>-			zone = default_zone;</div><div class='del'>-		} else {</div><div class='del'>-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-						     due_tt-&gt;hour,</div><div class='del'>-						     due_tt-&gt;minute);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;due_date), -1);</div><div class='del'>-</div><div class='del'>-		/* If no time is set, we use the default timezone, so the</div><div class='del'>-		   user usually doesn't have to set this when they set the</div><div class='del'>-		   date. */</div><div class='del'>-		zone = default_zone;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Note that if we are creating a new task, the timezones may not be</div><div class='del'>-	   on the server, so we try to get the builtin timezone with the TZID</div><div class='del'>-	   first. */</div><div class='del'>-	if (!zone)</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);</div><div class='del'>-	if (!zone) {</div><div class='del'>-		get_tz_status = cal_client_get_timezone (page-&gt;client, d.tzid,</div><div class='del'>-							 &amp;zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (get_tz_status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-		  g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-			     d.tzid ? d.tzid : "");</div><div class='del'>-	}</div><div class='del'>-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv-&gt;due_timezone),</div><div class='del'>-				       zone);</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;d);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Start Date. */</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;d);</div><div class='del'>-	zone = NULL;</div><div class='del'>-	if (d.value) {</div><div class='del'>-		struct icaltimetype *start_tt = d.value;</div><div class='del'>-		e_date_edit_set_date (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-				      start_tt-&gt;year, start_tt-&gt;month,</div><div class='del'>-				      start_tt-&gt;day);</div><div class='del'>-		if (start_tt-&gt;is_date) {</div><div class='del'>-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-						     -1, -1);</div><div class='del'>-			zone = default_zone;</div><div class='del'>-		} else {</div><div class='del'>-			e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-						     start_tt-&gt;hour,</div><div class='del'>-						     start_tt-&gt;minute);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_date), -1);</div><div class='del'>-</div><div class='del'>-		/* If no time is set, we use the default timezone, so the</div><div class='del'>-		   user usually doesn't have to set this when they set the</div><div class='del'>-		   date. */</div><div class='del'>-		zone = default_zone;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!zone)</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone_from_tzid (d.tzid);</div><div class='del'>-	if (!zone) {</div><div class='del'>-		get_tz_status = cal_client_get_timezone (page-&gt;client, d.tzid,</div><div class='del'>-							 &amp;zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (get_tz_status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-				   d.tzid ? d.tzid : "");</div><div class='del'>-	}</div><div class='del'>-	e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone),</div><div class='del'>-				       zone);</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;d);</div><div class='del'>-</div><div class='del'>-	/* Classification. */</div><div class='del'>-	cal_component_get_classification (comp, &amp;cl);</div><div class='del'>-</div><div class='del'>-	switch (cl) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-				    CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-				    classification_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* default to PUBLIC */</div><div class='del'>-                e_dialog_radio_set (priv-&gt;classification_public,</div><div class='del'>-                                    CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-                                    classification_map);</div><div class='del'>-                break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	cal_component_get_categories (comp, &amp;categories);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;categories, categories);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Contacts */</div><div class='del'>-	comp_editor_contacts_to_widget (priv-&gt;contacts_entry, comp);</div><div class='del'>-</div><div class='del'>-	/* We connect the contacts changed signal here, as we have to be a bit</div><div class='del'>-	   more careful with it due to the use or Corba. The priv-&gt;updating</div><div class='del'>-	   flag won't work as we won't get the changed event immediately.</div><div class='del'>-	   FIXME: Unfortunately this doesn't work either. We never get the</div><div class='del'>-	   changed event now. */</div><div class='del'>-	comp_editor_connect_contacts_changed (priv-&gt;contacts_entry,</div><div class='del'>-					      contacts_changed_cb, tpage);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* fill_component handler for the task page */</div><div class='del'>-static gboolean</div><div class='del'>-task_page_fill_component (CompEditorPage *page, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	char *cat, *str;</div><div class='del'>-	gboolean date_set, time_set;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (page);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary. */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;summary);</div><div class='del'>-	if (!str || strlen (str) == 0)</div><div class='del'>-		cal_component_set_summary (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_summary (comp, &amp;text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Description */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;description);</div><div class='del'>-	if (!str || strlen (str) == 0)</div><div class='del'>-		cal_component_set_description_list (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		GSList l;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-		l.data = &amp;text;</div><div class='del'>-		l.next = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_description_list (comp, &amp;l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-</div><div class='del'>-	icaltime = icaltime_null_time ();</div><div class='del'>-</div><div class='del'>-	date.value = &amp;icaltime;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* Due Date. */</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-					 &amp;icaltime.year,</div><div class='del'>-					 &amp;icaltime.month,</div><div class='del'>-					 &amp;icaltime.day);</div><div class='del'>-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-						&amp;icaltime.hour,</div><div class='del'>-						&amp;icaltime.minute);</div><div class='del'>-	if (date_set) {</div><div class='del'>-		if (time_set) {</div><div class='del'>-			zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;due_timezone));</div><div class='del'>-			date.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		} else {</div><div class='del'>-			icaltime.is_date = TRUE;</div><div class='del'>-			date.tzid = NULL;</div><div class='del'>-		}</div><div class='del'>-		cal_component_set_due (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_due (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Start Date. */</div><div class='del'>-	icaltime = icaltime_null_time ();</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-					 &amp;icaltime.year,</div><div class='del'>-					 &amp;icaltime.month,</div><div class='del'>-					 &amp;icaltime.day);</div><div class='del'>-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-						&amp;icaltime.hour,</div><div class='del'>-						&amp;icaltime.minute);</div><div class='del'>-	if (date_set) {</div><div class='del'>-		if (time_set) {</div><div class='del'>-			zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-			date.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		} else {</div><div class='del'>-			icaltime.is_date = TRUE;</div><div class='del'>-			date.tzid = NULL;</div><div class='del'>-		}</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_dtstart (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Classification. */</div><div class='del'>-	cal_component_set_classification (comp, classification_get (priv-&gt;classification_public));</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	cat = e_dialog_editable_get (priv-&gt;categories);</div><div class='del'>-	str = comp_editor_strip_categories (cat);</div><div class='del'>-	if (cat)</div><div class='del'>-		g_free (cat);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories (comp, str);</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		g_free (str);</div><div class='del'>-</div><div class='del'>-	/* Contacts */</div><div class='del'>-	comp_editor_contacts_to_component (priv-&gt;contacts_entry, comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_summary handler for the task page */</div><div class='del'>-static void</div><div class='del'>-task_page_set_summary (CompEditorPage *page, const char *summary)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (page);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-	        return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = TRUE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;updating = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (TaskPage *tpage)</div><div class='del'>-{</div><div class='del'>-	CompEditorPage *page = COMP_EDITOR_PAGE (tpage);</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	GSList *accel_groups;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-#define GW(name) glade_xml_get_widget (priv-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	priv-&gt;main = GW ("task-page");</div><div class='del'>-	if (!priv-&gt;main)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the GtkAccelGroup from the toplevel window, so we can install</div><div class='del'>-	   it when the notebook page is mapped. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (priv-&gt;main);</div><div class='del'>-	accel_groups = gtk_accel_groups_from_object (GTK_OBJECT (toplevel));</div><div class='del'>-	if (accel_groups) {</div><div class='del'>-		page-&gt;accel_group = accel_groups-&gt;data;</div><div class='del'>-		gtk_accel_group_ref (page-&gt;accel_group);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_ref (priv-&gt;main);</div><div class='del'>-	gtk_widget_unparent (priv-&gt;main);</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary = GW ("summary");</div><div class='del'>-</div><div class='del'>-	priv-&gt;due_date = GW ("due-date");</div><div class='del'>-	priv-&gt;start_date = GW ("start-date");</div><div class='del'>-	priv-&gt;due_timezone = GW ("due-timezone");</div><div class='del'>-	priv-&gt;start_timezone = GW ("start-timezone");</div><div class='del'>-</div><div class='del'>-	priv-&gt;description = GW ("description");</div><div class='del'>-</div><div class='del'>-	priv-&gt;classification_public = GW ("classification-public");</div><div class='del'>-	priv-&gt;classification_private = GW ("classification-private");</div><div class='del'>-	priv-&gt;classification_confidential = GW ("classification-confidential");</div><div class='del'>-</div><div class='del'>-	priv-&gt;contacts_btn = GW ("contacts-button");</div><div class='del'>-	priv-&gt;contacts_box = GW ("contacts-box");</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories_btn = GW ("categories-button");</div><div class='del'>-	priv-&gt;categories = GW ("categories");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;summary</div><div class='del'>-		&amp;&amp; priv-&gt;due_date</div><div class='del'>-		&amp;&amp; priv-&gt;start_date</div><div class='del'>-		&amp;&amp; priv-&gt;due_timezone</div><div class='del'>-		&amp;&amp; priv-&gt;start_timezone</div><div class='del'>-		&amp;&amp; priv-&gt;classification_public</div><div class='del'>-		&amp;&amp; priv-&gt;classification_private</div><div class='del'>-		&amp;&amp; priv-&gt;classification_confidential</div><div class='del'>-		&amp;&amp; priv-&gt;description</div><div class='del'>-		&amp;&amp; priv-&gt;contacts_btn</div><div class='del'>-		&amp;&amp; priv-&gt;contacts_box</div><div class='del'>-		&amp;&amp; priv-&gt;categories_btn</div><div class='del'>-		&amp;&amp; priv-&gt;categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the summary changes; we emit the notification signal. */</div><div class='del'>-static void</div><div class='del'>-summary_changed_cb (GtkEditable *editable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	gchar *summary;</div><div class='del'>-	</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	summary = e_dialog_editable_get (GTK_WIDGET (editable));</div><div class='del'>-	comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), </div><div class='del'>-						 summary);</div><div class='del'>-	g_free (summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the start or due date widgets change.  We notify the</div><div class='del'>- * other pages in the task editor, so they can update any labels. </div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-date_changed_cb (EDateEdit *dedit, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	CompEditorPageDates dates;</div><div class='del'>-	gboolean date_set, time_set;</div><div class='del'>-	CalComponentDateTime start_dt, due_dt;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time();</div><div class='del'>-	struct icaltimetype due_tt = icaltime_null_time();</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;updating)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-					 &amp;start_tt.year,</div><div class='del'>-					 &amp;start_tt.month,</div><div class='del'>-					 &amp;start_tt.day);</div><div class='del'>-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-						&amp;start_tt.hour,</div><div class='del'>-						&amp;start_tt.minute);</div><div class='del'>-	if (date_set) {</div><div class='del'>-		if (time_set) {</div><div class='del'>-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone));</div><div class='del'>-			start_dt.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		} else {</div><div class='del'>-			start_tt.is_date = TRUE;</div><div class='del'>-			start_dt.tzid = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		start_tt = icaltime_null_time ();</div><div class='del'>-		start_dt.tzid = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	date_set = e_date_edit_get_date (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-					 &amp;due_tt.year,</div><div class='del'>-					 &amp;due_tt.month,</div><div class='del'>-					 &amp;due_tt.day);</div><div class='del'>-	time_set = e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-						&amp;due_tt.hour,</div><div class='del'>-						&amp;due_tt.minute);</div><div class='del'>-	if (date_set) {</div><div class='del'>-		if (time_set) {</div><div class='del'>-			icaltimezone *zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv-&gt;due_timezone));</div><div class='del'>-			due_dt.tzid = icaltimezone_get_tzid (zone);</div><div class='del'>-		} else {</div><div class='del'>-			due_tt.is_date = TRUE;</div><div class='del'>-			due_dt.tzid = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		due_tt = icaltime_null_time ();</div><div class='del'>-		due_dt.tzid = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_dt.value = &amp;start_tt;</div><div class='del'>-	dates.start = &amp;start_dt;</div><div class='del'>-	dates.end = NULL;</div><div class='del'>-	due_dt.value = &amp;due_tt;</div><div class='del'>-	dates.due = &amp;due_dt;</div><div class='del'>-	dates.complete = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Notify upstream */</div><div class='del'>-	comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage),</div><div class='del'>-					       &amp;dates);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the contacts button is clicked; we must bring up the</div><div class='del'>- * contact list dialog.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-contacts_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp_editor_show_contacts_dialog (priv-&gt;corba_select_names);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Currently we aren't getting the changed event from the</div><div class='del'>-	   SelectNames component correctly, so we aren't saving the event</div><div class='del'>-	   if just the contacts are changed. To work around that, we assume</div><div class='del'>-	   that if the contacts button is clicked it is changed. */</div><div class='del'>-	comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the categories button is clicked; we must bring up the</div><div class='del'>- * category list dialog.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-categories_clicked_cb (GtkWidget *button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	entry = priv-&gt;categories;</div><div class='del'>-	e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is called when any field is changed; it notifies upstream. */</div><div class='del'>-static void</div><div class='del'>-field_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tpage = TASK_PAGE (data);</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!priv-&gt;updating)</div><div class='del'>-		comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static gboolean</div><div class='del'>-init_widgets (TaskPage *tpage)</div><div class='del'>-{</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Make sure the EDateEdit widgets use our timezones to get the</div><div class='del'>-	   current time. */</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;start_date),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   tpage, NULL);</div><div class='del'>-	e_date_edit_set_get_time_callback (E_DATE_EDIT (priv-&gt;due_date),</div><div class='del'>-					   (EDateEditGetTimeCallback) comp_editor_get_current_time,</div><div class='del'>-					   tpage, NULL);</div><div class='del'>-	</div><div class='del'>-	/* Summary */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;summary), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (summary_changed_cb), tpage);</div><div class='del'>-</div><div class='del'>-	/* Description - turn on word wrap. */</div><div class='del'>-	gtk_text_set_word_wrap (GTK_TEXT (priv-&gt;description), TRUE);</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_date), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), tpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;due_date), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), tpage);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;due_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_timezone), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-</div><div class='del'>-	/* Classification */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_public),</div><div class='del'>-			    "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_private),</div><div class='del'>-			    "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;classification_confidential),</div><div class='del'>-			    "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-</div><div class='del'>-	/* Connect the default signal handler to use to make sure the "changed"</div><div class='del'>-	   field gets set whenever a field is changed. */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;description), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;categories), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (field_changed_cb), tpage);</div><div class='del'>-</div><div class='del'>-	/* Contacts button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;contacts_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (contacts_clicked_cb), tpage);</div><div class='del'>-</div><div class='del'>-	/* Categories button */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;categories_btn), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (categories_clicked_cb), tpage);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Create the contacts entry, a corba control from the address book. */</div><div class='del'>-	priv-&gt;corba_select_names = comp_editor_create_contacts_component ();</div><div class='del'>-	if (priv-&gt;corba_select_names == CORBA_OBJECT_NIL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;contacts_entry = comp_editor_create_contacts_control (priv-&gt;corba_select_names);</div><div class='del'>-	if (priv-&gt;contacts_entry == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;contacts_box),</div><div class='del'>-			   priv-&gt;contacts_entry);</div><div class='del'>-</div><div class='del'>-	/* Set the default timezone, so the timezone entry may be hidden. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv-&gt;start_timezone), zone);</div><div class='del'>-	e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv-&gt;due_timezone), zone);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_page_construct:</div><div class='del'>- * @tpage: An task page.</div><div class='del'>- * </div><div class='del'>- * Constructs an task page by loading its Glade data.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @tpage, or NULL if the widgets could not be</div><div class='del'>- * created.</div><div class='del'>- **/</div><div class='del'>-TaskPage *</div><div class='del'>-task_page_construct (TaskPage *tpage)</div><div class='del'>-{</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tpage-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-page.glade",</div><div class='del'>-				   NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("task_page_construct(): "</div><div class='del'>-			   "Could not load the Glade XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (tpage)) {</div><div class='del'>-		g_message ("task_page_construct(): "</div><div class='del'>-			   "Could not find all widgets in the XML file!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!init_widgets (tpage)) {</div><div class='del'>-		g_message ("event_page_construct(): " </div><div class='del'>-			   "Could not initialize the widgets!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_page_new:</div><div class='del'>- * </div><div class='del'>- * Creates a new task page.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created task page, or NULL if the page could</div><div class='del'>- * not be created.</div><div class='del'>- **/</div><div class='del'>-TaskPage *</div><div class='del'>-task_page_new (void)</div><div class='del'>-{</div><div class='del'>-	TaskPage *tpage;</div><div class='del'>-</div><div class='del'>-	tpage = gtk_type_new (TYPE_TASK_PAGE);</div><div class='del'>-	if (!task_page_construct (tpage)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (tpage));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tpage;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *task_page_create_date_edit (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-task_page_create_date_edit (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = comp_editor_new_date_edit (TRUE, TRUE, TRUE);</div><div class='del'>-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);</div><div class='del'>-</div><div class='del'>-	return dedit;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade<br/>deleted file mode 100644<br/>index 31a7ba2cbe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-page.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,493 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-page&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-page&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;task-toplevel&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;task-page&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table3&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Su_mmary:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;default_focus_target&gt;summary&lt;/default_focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;summary&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame2&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Date &amp;amp; Time&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-	  &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Sta_rt Date:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;start-date&lt;/focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Due Date:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;focus_target&gt;due-date&lt;/focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;due-date&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;creation_function&gt;task_page_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Fri, 01 Jun 2001 18:59:52 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;start-date&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;creation_function&gt;task_page_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Fri, 01 Jun 2001 18:59:57 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;due-timezone&lt;/name&gt;</div><div class='del'>-	    &lt;creation_function&gt;make_timezone_entry&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Tue, 19 Jun 2001 04:43:54 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;start-timezone&lt;/name&gt;</div><div class='del'>-	    &lt;creation_function&gt;make_timezone_entry&lt;/creation_function&gt;</div><div class='del'>-	    &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	    &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	    &lt;last_modification_time&gt;Tue, 19 Jun 2001 04:43:46 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Description:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	&lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-	&lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	&lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	&lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;description&lt;/name&gt;</div><div class='del'>-	  &lt;height&gt;80&lt;/height&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame24&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Classification&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox6&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;classification-public&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Pu_blic&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;True&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;classification-private&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Pri_vate&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;classification-confidential&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Con_fidential&lt;/label&gt;</div><div class='del'>-	  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	  &lt;group&gt;classification_radio_group&lt;/group&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;contacts-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;_Contacts...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;contacts-box&lt;/name&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;categories-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Ca_tegories...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h<br/>deleted file mode 100644<br/>index 55c8ebc923..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-page.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/dialogs/task-page.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main page of the task editor dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TASK_PAGE_H</div><div class='del'>-#define TASK_PAGE_H</div><div class='del'>-</div><div class='del'>-#include "comp-editor-page.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_TASK_PAGE            (task_page_get_type ())</div><div class='del'>-#define TASK_PAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_TASK_PAGE, TaskPage))</div><div class='del'>-#define TASK_PAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_PAGE, TaskPageClass))</div><div class='del'>-#define IS_TASK_PAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_TASK_PAGE))</div><div class='del'>-#define IS_TASK_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_PAGE))</div><div class='del'>-</div><div class='del'>-typedef struct _TaskPagePrivate TaskPagePrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPage page;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	TaskPagePrivate *priv;</div><div class='del'>-} TaskPage;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CompEditorPageClass parent_class;</div><div class='del'>-} TaskPageClass;</div><div class='del'>-</div><div class='del'>-GtkType   task_page_get_type  (void);</div><div class='del'>-TaskPage *task_page_construct (TaskPage *epage);</div><div class='del'>-TaskPage *task_page_new       (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c<br/>deleted file mode 100644<br/>index 8a7d3dd631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-calendar-table.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-calendar-table.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1345 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECalendarTable - displays the CalComponent objects in a table (an ETable).</div><div class='del'>- * Used for calendar events and tasks.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gtk/gtkinvisible.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-checkbox.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-toggle.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-combo.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-utils.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-cell-date-edit.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-cell-percent.h&gt;</div><div class='del'>-#include "e-calendar-table.h"</div><div class='del'>-#include "e-cell-date-edit-text.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-#include "dialogs/delete-comp.h"</div><div class='del'>-#include "dialogs/task-editor.h"</div><div class='del'>-</div><div class='del'>-/* Pixmaps. */</div><div class='del'>-#include "art/task.xpm"</div><div class='del'>-#include "art/task-recurring.xpm"</div><div class='del'>-#include "art/task-assigned.xpm"</div><div class='del'>-#include "art/task-assigned-to.xpm"</div><div class='del'>-</div><div class='del'>-#include "art/check-filled.xpm"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_calendar_table_class_init		(ECalendarTableClass *class);</div><div class='del'>-static void e_calendar_table_init		(ECalendarTable	*cal_table);</div><div class='del'>-static void e_calendar_table_destroy		(GtkObject	*object);</div><div class='del'>-</div><div class='del'>-static void e_calendar_table_on_double_click	(ETable		*table,</div><div class='del'>-						 gint		 row,</div><div class='del'>-						 gint		 col,</div><div class='del'>-						 GdkEvent	*event,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static gint e_calendar_table_on_right_click	(ETable		*table,</div><div class='del'>-						 gint		 row,</div><div class='del'>-						 gint		 col,</div><div class='del'>-						 GdkEventButton *event,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static void e_calendar_table_on_open_task	(GtkWidget	*menuitem,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-static void e_calendar_table_on_save_as	        (GtkWidget	*menuitem,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-static void e_calendar_table_on_print_task      (GtkWidget	*menuitem,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-static void e_calendar_table_on_cut             (GtkWidget      *menuitem,</div><div class='del'>-						 gpointer        data);</div><div class='del'>-static void e_calendar_table_on_copy            (GtkWidget      *menuitem,</div><div class='del'>-						 gpointer        data);</div><div class='del'>-static void e_calendar_table_on_paste           (GtkWidget      *menuitem,</div><div class='del'>-						 gpointer        data);</div><div class='del'>-static void e_calendar_table_on_assign          (GtkWidget      *menuitem,</div><div class='del'>-						 gpointer        data);</div><div class='del'>-static void e_calendar_table_on_forward         (GtkWidget      *menuitem,</div><div class='del'>-						 gpointer        data);</div><div class='del'>-static gint e_calendar_table_on_key_press	(ETable		*table,</div><div class='del'>-						 gint		 row,</div><div class='del'>-						 gint		 col,</div><div class='del'>-						 GdkEventKey	*event,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-static void selection_clear_event               (GtkWidget *invisible,</div><div class='del'>-						 GdkEventSelection *event,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static void selection_received                  (GtkWidget *invisible,</div><div class='del'>-						 GtkSelectionData *selection_data,</div><div class='del'>-						 guint time,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static void selection_get                       (GtkWidget *invisible,</div><div class='del'>-						 GtkSelectionData *selection_data,</div><div class='del'>-						 guint info,</div><div class='del'>-						 guint time_stamp,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static void invisible_destroyed                 (GtkWidget *invisible,</div><div class='del'>-						 ECalendarTable *cal_table);</div><div class='del'>-static struct tm e_calendar_table_get_current_time (ECellDateEdit *ecde,</div><div class='del'>-						    gpointer data);</div><div class='del'>-static void mark_row_complete_cb (int model_row, gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The icons to represent the task. */</div><div class='del'>-#define E_CALENDAR_MODEL_NUM_ICONS	4</div><div class='del'>-static char** icon_xpm_data[E_CALENDAR_MODEL_NUM_ICONS] = {</div><div class='del'>-	task_xpm, task_recurring_xpm, task_assigned_xpm, task_assigned_to_xpm</div><div class='del'>-};</div><div class='del'>-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-static GdkAtom clipboard_atom = GDK_NONE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_calendar_table_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_calendar_table_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_calendar_table_type){</div><div class='del'>-		GtkTypeInfo e_calendar_table_info = {</div><div class='del'>-			"ECalendarTable",</div><div class='del'>-			sizeof (ECalendarTable),</div><div class='del'>-			sizeof (ECalendarTableClass),</div><div class='del'>-			(GtkClassInitFunc) e_calendar_table_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_calendar_table_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		parent_class = gtk_type_class (GTK_TYPE_TABLE);</div><div class='del'>-		e_calendar_table_type = gtk_type_unique (GTK_TYPE_TABLE,</div><div class='del'>-							 &amp;e_calendar_table_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_calendar_table_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_class_init (ECalendarTableClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	/* Method override */</div><div class='del'>-	object_class-&gt;destroy		= e_calendar_table_destroy;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	widget_class-&gt;realize		= e_calendar_table_realize;</div><div class='del'>-	widget_class-&gt;unrealize		= e_calendar_table_unrealize;</div><div class='del'>-	widget_class-&gt;style_set		= e_calendar_table_style_set;</div><div class='del'>- 	widget_class-&gt;size_allocate	= e_calendar_table_size_allocate;</div><div class='del'>-	widget_class-&gt;focus_in_event	= e_calendar_table_focus_in;</div><div class='del'>-	widget_class-&gt;focus_out_event	= e_calendar_table_focus_out;</div><div class='del'>-	widget_class-&gt;key_press_event	= e_calendar_table_key_press;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* clipboard atom */</div><div class='del'>-	if (!clipboard_atom)</div><div class='del'>-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Compares two priority values, which may not exist */</div><div class='del'>-static int</div><div class='del'>-compare_priorities (int *a, int *b)</div><div class='del'>-{</div><div class='del'>-	if (a &amp;&amp; b) {</div><div class='del'>-		if (*a &lt; *b)</div><div class='del'>-			return -1;</div><div class='del'>-		else if (*a &gt; *b)</div><div class='del'>-			return 1;</div><div class='del'>-		else</div><div class='del'>-			return 0;</div><div class='del'>-	} else if (a)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (b)</div><div class='del'>-		return 1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Comparison function for the task-sort column.  Sorts by due date and then by</div><div class='del'>- * priority.</div><div class='del'>- *</div><div class='del'>- * FIXME: Does this ever get called?? It doesn't seem to.</div><div class='del'>- * I specified that the table should be sorted by this column, but it still</div><div class='del'>- * never calls this function.</div><div class='del'>- * Also, this assumes it is passed pointers to CalComponents, but I think it</div><div class='del'>- * may just be passed pointers to the 2 cell values.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-task_compare_cb (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	CalComponent *ca, *cb;</div><div class='del'>-	CalComponentDateTime due_a, due_b;</div><div class='del'>-	int *prio_a, *prio_b;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	ca = CAL_COMPONENT (a);</div><div class='del'>-	cb = CAL_COMPONENT (b);</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (ca, &amp;due_a);</div><div class='del'>-	cal_component_get_due (cb, &amp;due_b);</div><div class='del'>-	cal_component_get_priority (ca, &amp;prio_a);</div><div class='del'>-	cal_component_get_priority (cb, &amp;prio_b);</div><div class='del'>-</div><div class='del'>-	if (due_a.value &amp;&amp; due_b.value) {</div><div class='del'>-		int v;</div><div class='del'>-</div><div class='del'>-		/* FIXME: TIMEZONES. But currently we have no way to get the</div><div class='del'>-		   CalClient, so we can't get the timezone. */</div><div class='del'>-		v = icaltime_compare (*due_a.value, *due_b.value);</div><div class='del'>-</div><div class='del'>-		if (v == 0)</div><div class='del'>-			retval = compare_priorities (prio_a, prio_b);</div><div class='del'>-		else</div><div class='del'>-			retval = v;</div><div class='del'>-	} else if (due_a.value)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (due_b.value)</div><div class='del'>-		retval = 1;</div><div class='del'>-	else</div><div class='del'>-		retval = compare_priorities (prio_a, prio_b);</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;due_a);</div><div class='del'>-	cal_component_free_datetime (&amp;due_b);</div><div class='del'>-</div><div class='del'>-	if (prio_a)</div><div class='del'>-		cal_component_free_priority (prio_a);</div><div class='del'>-</div><div class='del'>-	if (prio_b)</div><div class='del'>-		cal_component_free_priority (prio_b);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-date_compare_cb (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditValue *dv1 = (ECellDateEditValue *) a;</div><div class='del'>-	ECellDateEditValue *dv2 = (ECellDateEditValue *) b;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* First check if either is NULL. NULL dates sort last. */</div><div class='del'>-	if (!dv1 || !dv2) {</div><div class='del'>-		if (dv1 == dv2)</div><div class='del'>-			return 0;</div><div class='del'>-		else if (dv1)</div><div class='del'>-			return -1;</div><div class='del'>-		else</div><div class='del'>-			return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy the 2nd value and convert it to the same timezone as the</div><div class='del'>-	   first. */</div><div class='del'>-	tt = dv2-&gt;tt;</div><div class='del'>-</div><div class='del'>-	icaltimezone_convert_time (&amp;tt, dv2-&gt;zone, dv1-&gt;zone);</div><div class='del'>-</div><div class='del'>-	/* Now we can compare them. */</div><div class='del'>-</div><div class='del'>-	return icaltime_compare (dv1-&gt;tt, tt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-percent_compare_cb (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	int percent1 = GPOINTER_TO_INT (a);</div><div class='del'>-	int percent2 = GPOINTER_TO_INT (b);</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	if (percent1 &gt; percent2)</div><div class='del'>-		retval = 1;</div><div class='del'>-	else if (percent1 &lt; percent2)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else</div><div class='del'>-		retval = 0;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-priority_compare_cb (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	int priority1, priority2;</div><div class='del'>-</div><div class='del'>-	priority1 = cal_util_priority_from_string ((const char*) a);</div><div class='del'>-	priority2 = cal_util_priority_from_string ((const char*) b);</div><div class='del'>-</div><div class='del'>-	/* We change undefined priorities so they appear after 'Low'. */</div><div class='del'>-	if (priority1 &lt;= 0)</div><div class='del'>-		priority1 = 10;</div><div class='del'>-	if (priority2 &lt;= 0)</div><div class='del'>-		priority2 = 10;</div><div class='del'>-</div><div class='del'>-	/* We'll just use the ordering of the priority values. */</div><div class='del'>-	if (priority1 &lt; priority2)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (priority1 &gt; priority2)</div><div class='del'>-		return 1;</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_init (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETable *e_table;</div><div class='del'>-	ECell *cell, *popup_cell;</div><div class='del'>-	ETableExtras *extras;</div><div class='del'>-	gint i;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	GList *strings;</div><div class='del'>-</div><div class='del'>-	/* Create the model */</div><div class='del'>-</div><div class='del'>-	cal_table-&gt;model = calendar_model_new ();</div><div class='del'>-</div><div class='del'>-	/* Create the header columns */</div><div class='del'>-</div><div class='del'>-	extras = e_table_extras_new();</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Normal string fields.</div><div class='del'>-	 */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "calstring", cell);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Date fields.</div><div class='del'>-	 */</div><div class='del'>-	cell = e_cell_date_edit_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_date_edit_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-	e_table_extras_add_cell (extras, "dateedit", popup_cell);</div><div class='del'>-	cal_table-&gt;dates_cell = E_CELL_DATE_EDIT (popup_cell);</div><div class='del'>-</div><div class='del'>-	e_cell_date_edit_set_get_time_callback (E_CELL_DATE_EDIT (popup_cell),</div><div class='del'>-						e_calendar_table_get_current_time,</div><div class='del'>-						cal_table, NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Combo fields.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Classification field. */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			"editable", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Public"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Private"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Confidential"));</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),</div><div class='del'>-					  strings);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "classification", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* Priority field. */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			"editable", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("High"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Normal"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Low"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Undefined"));</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),</div><div class='del'>-					  strings);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "priority", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* Percent field. */</div><div class='del'>-	cell = e_cell_percent_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("0%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("10%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("20%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("30%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("40%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("50%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("60%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("70%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("80%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("90%"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("100%"));</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),</div><div class='del'>-					  strings);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "percent", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* Transparency field. */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			"editable", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Free"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Busy"));</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),</div><div class='del'>-					  strings);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "transparency", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* Status field. */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			"editable", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Not Started"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("In Progress"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Completed"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Cancelled"));</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell),</div><div class='del'>-					  strings);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_cell (extras, "calstatus", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* Task sorting field */</div><div class='del'>-	/* FIXME: This column should not be displayed, but ETableExtras requires</div><div class='del'>-	 * its shit to be visible columns listed in the XML spec.</div><div class='del'>-	 */</div><div class='del'>-	e_table_extras_add_compare (extras, "task-sort", task_compare_cb);</div><div class='del'>-</div><div class='del'>-	e_table_extras_add_compare (extras, "date-compare",</div><div class='del'>-				    date_compare_cb);</div><div class='del'>-	e_table_extras_add_compare (extras, "percent-compare",</div><div class='del'>-				    percent_compare_cb);</div><div class='del'>-	e_table_extras_add_compare (extras, "priority-compare",</div><div class='del'>-				    priority_compare_cb);</div><div class='del'>-</div><div class='del'>-	/* Create pixmaps */</div><div class='del'>-</div><div class='del'>-	if (!icon_pixbufs[0])</div><div class='del'>-		for (i = 0; i &lt; E_CALENDAR_MODEL_NUM_ICONS; i++) {</div><div class='del'>-			icon_pixbufs[i] = gdk_pixbuf_new_from_xpm_data (</div><div class='del'>-				(const char **) icon_xpm_data[i]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);</div><div class='del'>-	e_table_extras_add_cell(extras, "icon", cell);</div><div class='del'>-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);</div><div class='del'>-</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) check_filled_xpm);</div><div class='del'>-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);</div><div class='del'>-	gdk_pixbuf_unref(pixbuf);</div><div class='del'>-</div><div class='del'>-	/* Create the table */</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new_from_spec_file (E_TABLE_MODEL (cal_table-&gt;model),</div><div class='del'>-						     extras,</div><div class='del'>-						     EVOLUTION_ETSPECDIR "/e-calendar-table.etspec",</div><div class='del'>-						     NULL);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (extras));</div><div class='del'>-</div><div class='del'>-	cal_table-&gt;etable = table;</div><div class='del'>-	gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (table);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_table), "double_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),</div><div class='del'>-			    cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_table), "right_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),</div><div class='del'>-			    cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_table), "key_press",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),</div><div class='del'>-			    cal_table);</div><div class='del'>-</div><div class='del'>-	/* Set up the invisible widget for the clipboard selections */</div><div class='del'>-	cal_table-&gt;invisible = gtk_invisible_new ();</div><div class='del'>-	gtk_selection_add_target (cal_table-&gt;invisible,</div><div class='del'>-				  clipboard_atom,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING,</div><div class='del'>-				  0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cal_table-&gt;invisible),</div><div class='del'>-			    "selection_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_get),</div><div class='del'>-			    (gpointer) cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cal_table-&gt;invisible),</div><div class='del'>-			    "selection_clear_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_clear_event),</div><div class='del'>-			    (gpointer) cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cal_table-&gt;invisible),</div><div class='del'>-			    "selection_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_received),</div><div class='del'>-			    (gpointer) cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cal_table-&gt;invisible),</div><div class='del'>-			    "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (invisible_destroyed),</div><div class='del'>-			    (gpointer) cal_table);</div><div class='del'>-	cal_table-&gt;clipboard_selection = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_new:</div><div class='del'>- * @Returns: a new #ECalendarTable.</div><div class='del'>- *</div><div class='del'>- * Creates a new #ECalendarTable.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-e_calendar_table_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = GTK_WIDGET (gtk_type_new (e_calendar_table_get_type ()));</div><div class='del'>-</div><div class='del'>-	return cal_table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_get_model:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar data model that a calendar table is using.</div><div class='del'>- * </div><div class='del'>- * Return value: A calendar model.</div><div class='del'>- **/</div><div class='del'>-CalendarModel *</div><div class='del'>-e_calendar_table_get_model (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (cal_table != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);</div><div class='del'>-</div><div class='del'>-	return cal_table-&gt;model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cal_table-&gt;model));</div><div class='del'>-	cal_table-&gt;model = NULL;</div><div class='del'>-</div><div class='del'>-	if (cal_table-&gt;invisible)</div><div class='del'>-		gtk_widget_destroy (cal_table-&gt;invisible);</div><div class='del'>-	if (cal_table-&gt;clipboard_selection) {</div><div class='del'>-		g_free (cal_table-&gt;clipboard_selection);</div><div class='del'>-		cal_table-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_get_table:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- * </div><div class='del'>- * Queries the #ETable widget that the calendar table is using.</div><div class='del'>- * </div><div class='del'>- * Return value: The #ETable widget that the calendar table uses to display its</div><div class='del'>- * data.</div><div class='del'>- **/</div><div class='del'>-ETable *</div><div class='del'>-e_calendar_table_get_table (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (cal_table != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_CALENDAR_TABLE (cal_table), NULL);</div><div class='del'>-</div><div class='del'>-	return e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_complete_selected:</div><div class='del'>- * @cal_table: A calendar table</div><div class='del'>- * </div><div class='del'>- * Marks the selected items as completed</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_calendar_table_complete_selected (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal_table != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from e_table_selected_row_foreach(); puts the selected row number in an</div><div class='del'>- * int pointed to by the closure data.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-get_selected_row_cb (int model_row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int *row;</div><div class='del'>-</div><div class='del'>-	row = data;</div><div class='del'>-	*row = model_row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the component that is selected in the table; only works if there is</div><div class='del'>- * one and only one selected row.</div><div class='del'>- */</div><div class='del'>-static CalComponent *</div><div class='del'>-get_selected_comp (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	ETable *etable;</div><div class='del'>-	int row;</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-	if (e_table_selected_count (etable) != 1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	row = -1;</div><div class='del'>-	e_table_selected_row_foreach (etable,</div><div class='del'>-				      get_selected_row_cb,</div><div class='del'>-				      &amp;row);</div><div class='del'>-	g_assert (row != -1);</div><div class='del'>-</div><div class='del'>-	return calendar_model_get_component (cal_table-&gt;model, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct get_selected_uids_closure {</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	GSList *uids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Used from e_table_selected_row_foreach(), builds a list of the selected UIDs */</div><div class='del'>-static void</div><div class='del'>-add_uid_cb (int model_row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct get_selected_uids_closure *closure;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	closure = data;</div><div class='del'>-</div><div class='del'>-	comp = calendar_model_get_component (closure-&gt;cal_table-&gt;model, model_row);</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	closure-&gt;uids = g_slist_prepend (closure-&gt;uids, (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GSList *</div><div class='del'>-get_selected_uids (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	struct get_selected_uids_closure closure;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	closure.cal_table = cal_table;</div><div class='del'>-	closure.uids = NULL;</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-	e_table_selected_row_foreach (etable, add_uid_cb, &amp;closure);</div><div class='del'>-</div><div class='del'>-	return closure.uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Deletes all of the selected components in the table */</div><div class='del'>-static void</div><div class='del'>-delete_selected_components (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GSList *uids, *l;</div><div class='del'>-</div><div class='del'>-	uids = get_selected_uids (cal_table);</div><div class='del'>-</div><div class='del'>-	client = calendar_model_get_cal_client (cal_table-&gt;model);</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table),</div><div class='del'>-					   _("Deleting selected objects"));</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* We don't check the return value; FALSE can mean the object</div><div class='del'>-		 * was not in the server anyways.</div><div class='del'>-		 */</div><div class='del'>-		cal_client_remove_object (client, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table), NULL);</div><div class='del'>-</div><div class='del'>-	g_slist_free (uids);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_delete_selected:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- * </div><div class='del'>- * Deletes the selected components in the table; asks the user first.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_calendar_table_delete_selected (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	ETable *etable;</div><div class='del'>-	int n_selected;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal_table != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-</div><div class='del'>-	n_selected = e_table_selected_count (etable);</div><div class='del'>-	if (n_selected &lt;= 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (n_selected == 1)</div><div class='del'>-		comp = get_selected_comp (cal_table);</div><div class='del'>-	else</div><div class='del'>-		comp = NULL;</div><div class='del'>-</div><div class='del'>-	/* FIXME: this may be something other than a TODO component */</div><div class='del'>-</div><div class='del'>-	if (delete_component_dialog (comp, FALSE, n_selected, CAL_COMPONENT_TODO,</div><div class='del'>-				     GTK_WIDGET (cal_table)))</div><div class='del'>-		delete_selected_components (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_cut_clipboard:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- *</div><div class='del'>- * Cuts selected tasks in the given calendar table</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_cut_clipboard (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	e_calendar_table_copy_clipboard (cal_table);</div><div class='del'>-	delete_selected_components (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* callback for e_table_selected_row_foreach */</div><div class='del'>-static void</div><div class='del'>-copy_row_cb (int model_row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gchar *comp_str;</div><div class='del'>-	icalcomponent *child;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal_table-&gt;tmp_vcal != NULL);</div><div class='del'>-</div><div class='del'>-	comp = calendar_model_get_component (cal_table-&gt;model, model_row);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* add the new component to the VCALENDAR component */</div><div class='del'>-	comp_str = cal_component_get_as_string (comp);</div><div class='del'>-	child = icalparser_parse_string (comp_str);</div><div class='del'>-	if (child) {</div><div class='del'>-		icalcomponent_add_component (cal_table-&gt;tmp_vcal,</div><div class='del'>-					     icalcomponent_new_clone (child));</div><div class='del'>-		icalcomponent_free (child);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (comp_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_copy_clipboard:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- *</div><div class='del'>- * Copies selected tasks into the clipboard</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_copy_clipboard (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	ETable *etable;</div><div class='del'>-	char *comp_str;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	if (cal_table-&gt;clipboard_selection) {</div><div class='del'>-		g_free (cal_table-&gt;clipboard_selection);</div><div class='del'>-		cal_table-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create temporary VCALENDAR object */</div><div class='del'>-	cal_table-&gt;tmp_vcal = cal_util_new_top_level ();</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-	e_table_selected_row_foreach (etable, copy_row_cb, cal_table);</div><div class='del'>-</div><div class='del'>-	comp_str = icalcomponent_as_ical_string (cal_table-&gt;tmp_vcal);</div><div class='del'>-	cal_table-&gt;clipboard_selection = g_strdup (comp_str);</div><div class='del'>-	icalcomponent_free (cal_table-&gt;tmp_vcal);</div><div class='del'>-	cal_table-&gt;tmp_vcal = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_selection_owner_set (cal_table-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_paste_clipboard:</div><div class='del'>- * @cal_table: A calendar table.</div><div class='del'>- *</div><div class='del'>- * Pastes tasks currently in the clipboard into the given calendar table</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_paste_clipboard (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	gtk_selection_convert (cal_table-&gt;invisible,</div><div class='del'>-			       clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Opens a task in the task editor */</div><div class='del'>-static void</div><div class='del'>-open_task (ECalendarTable *cal_table, CalComponent *comp, gboolean assign)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	tedit = task_editor_new ();</div><div class='del'>-	comp_editor_set_cal_client (COMP_EDITOR (tedit), calendar_model_get_cal_client (cal_table-&gt;model));</div><div class='del'>-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);</div><div class='del'>-	if (assign)</div><div class='del'>-		task_editor_show_assignment (TASK_EDITOR (tedit));</div><div class='del'>-	comp_editor_focus (COMP_EDITOR (tedit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Opens the task in the specified row */</div><div class='del'>-static void</div><div class='del'>-open_task_by_row (ECalendarTable *cal_table, int row)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = calendar_model_get_component (cal_table-&gt;model, row);</div><div class='del'>-	open_task (cal_table, comp, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_double_click (ETable *table,</div><div class='del'>-				  gint row, </div><div class='del'>-				  gint col,</div><div class='del'>-				  GdkEvent *event,</div><div class='del'>-				  ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	open_task_by_row (cal_table, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from e_table_selected_row_foreach() */</div><div class='del'>-static void</div><div class='del'>-mark_row_complete_cb (int model_row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-	calendar_model_mark_task_complete (cal_table-&gt;model, model_row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used for the "mark tasks as complete" menu item */</div><div class='del'>-static void</div><div class='del'>-mark_as_complete_cb (GtkWidget *menuitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (cal_table-&gt;etable));</div><div class='del'>-	e_table_selected_row_foreach (etable, mark_row_complete_cb, cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "delete tasks" menu item */</div><div class='del'>-static void</div><div class='del'>-delete_cb (GtkWidget *menuitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-	e_calendar_table_delete_selected (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MASK_SINGLE	= 1 &lt;&lt; 0,	/* For commands that work on 1 task. */</div><div class='del'>-	MASK_MULTIPLE	= 1 &lt;&lt; 1,	/* For commands for multiple tasks. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EPopupMenu tasks_popup_menu [] = {</div><div class='del'>-	E_POPUP_ITEM (N_("_Open"), e_calendar_table_on_open_task, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Save as..."), e_calendar_table_on_save_as, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Print..."), e_calendar_table_on_print_task, MASK_SINGLE),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-	</div><div class='del'>-	E_POPUP_ITEM (N_("C_ut"), e_calendar_table_on_cut, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Copy"), e_calendar_table_on_copy, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Paste"), e_calendar_table_on_paste, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Assign Task"), e_calendar_table_on_assign, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Forward as iCalendar"), e_calendar_table_on_forward, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Mark as Complete"), mark_as_complete_cb, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, MASK_MULTIPLE),</div><div class='del'>-	</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Delete"), delete_cb, MASK_SINGLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Delete Selected Tasks"), delete_cb, MASK_MULTIPLE),</div><div class='del'>-</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_calendar_table_on_right_click (ETable *table,</div><div class='del'>-				 gint row,</div><div class='del'>-				 gint col,</div><div class='del'>-				 GdkEventButton *event,</div><div class='del'>-				 ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	int n_selected;</div><div class='del'>-	int hide_mask = 0;</div><div class='del'>-	int disable_mask = 0;</div><div class='del'>-</div><div class='del'>-	n_selected = e_table_selected_count (table);</div><div class='del'>-	if (n_selected &lt;= 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (n_selected == 1)</div><div class='del'>-		hide_mask = MASK_MULTIPLE;</div><div class='del'>-	else</div><div class='del'>-		hide_mask = MASK_SINGLE;</div><div class='del'>-</div><div class='del'>-	e_popup_menu_run (tasks_popup_menu, (GdkEvent *) event,</div><div class='del'>-			  disable_mask, hide_mask, cal_table);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_open_task (GtkWidget *menuitem,</div><div class='del'>-			       gpointer	  data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	comp = get_selected_comp (cal_table);</div><div class='del'>-	if (comp)</div><div class='del'>-		open_task (cal_table, comp, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_save_as (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *ical_string;</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	client = calendar_model_get_cal_client (cal_table-&gt;model);</div><div class='del'>-	comp = get_selected_comp (cal_table);</div><div class='del'>-	if (comp == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	filename = e_file_dialog_save (_("Save as..."));</div><div class='del'>-	if (filename == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	ical_string = cal_client_get_component_as_string (client, comp);</div><div class='del'>-	if (ical_string == NULL) {</div><div class='del'>-		g_warning ("Couldn't convert item to a string");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	file = fopen (filename, "w");</div><div class='del'>-	if (file == NULL) {</div><div class='del'>-		g_warning ("Couldn't save item");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fprintf (file, ical_string);</div><div class='del'>-	g_free (ical_string);</div><div class='del'>-	fclose (file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_print_task (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	client = calendar_model_get_cal_client (cal_table-&gt;model);</div><div class='del'>-	comp = get_selected_comp (cal_table);</div><div class='del'>-	if (comp == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	print_comp (comp, client, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_cut (GtkWidget *menuitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-	e_calendar_table_cut_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_copy (GtkWidget *menuitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-	e_calendar_table_copy_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_paste (GtkWidget *menuitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-	e_calendar_table_paste_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_assign (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	comp = get_selected_comp (cal_table);</div><div class='del'>-	if (comp)</div><div class='del'>-		open_task (cal_table, comp, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_forward (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (data);</div><div class='del'>-</div><div class='del'>-	client = calendar_model_get_cal_client (cal_table-&gt;model);</div><div class='del'>-	comp = get_selected_comp (cal_table);</div><div class='del'>-	if (comp)</div><div class='del'>-		itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp,</div><div class='del'>-				client, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_calendar_table_on_key_press (ETable *table,</div><div class='del'>-			       gint row,</div><div class='del'>-			       gint col,</div><div class='del'>-			       GdkEventKey *event,</div><div class='del'>-			       ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;keyval == GDK_Delete) {</div><div class='del'>-		delete_cb (NULL, cal_table);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Loads the state of the table (headers shown etc.) from the given file. */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_load_state	(ECalendarTable *cal_table,</div><div class='del'>-				 gchar		*filename)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	if (stat (filename, &amp;st) == 0 &amp;&amp; st.st_size &gt; 0</div><div class='del'>-	    &amp;&amp; S_ISREG (st.st_mode)) {</div><div class='del'>-		e_table_load_state (e_table_scrolled_get_table(E_TABLE_SCROLLED (cal_table-&gt;etable)), filename);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Saves the state of the table (headers shown etc.) to the given file. */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_save_state (ECalendarTable	*cal_table,</div><div class='del'>-			     gchar		*filename)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	e_table_save_state (e_table_scrolled_get_table(E_TABLE_SCROLLED (cal_table-&gt;etable)),</div><div class='del'>-			    filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-invisible_destroyed (GtkWidget *invisible, ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	cal_table-&gt;invisible = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_get (GtkWidget *invisible,</div><div class='del'>-	       GtkSelectionData *selection_data,</div><div class='del'>-	       guint info,</div><div class='del'>-	       guint time_stamp,</div><div class='del'>-	       ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	if (cal_table-&gt;clipboard_selection != NULL) {</div><div class='del'>-		gtk_selection_data_set (selection_data,</div><div class='del'>-					GDK_SELECTION_TYPE_STRING,</div><div class='del'>-					8,</div><div class='del'>-					cal_table-&gt;clipboard_selection,</div><div class='del'>-					strlen (cal_table-&gt;clipboard_selection));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_clear_event (GtkWidget *invisible,</div><div class='del'>-		       GdkEventSelection *event,</div><div class='del'>-		       ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	if (cal_table-&gt;clipboard_selection != NULL) {</div><div class='del'>-		g_free (cal_table-&gt;clipboard_selection);</div><div class='del'>-		cal_table-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_received (GtkWidget *invisible,</div><div class='del'>-		    GtkSelectionData *selection_data,</div><div class='del'>-		    guint time,</div><div class='del'>-		    ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	char *comp_str;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	char *uid;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	if (selection_data-&gt;length &lt; 0 ||</div><div class='del'>-	    selection_data-&gt;type != GDK_SELECTION_TYPE_STRING) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_str = (char *) selection_data-&gt;data;</div><div class='del'>-	icalcomp = icalparser_parse_string ((const char *) comp_str);</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check the type of the component */</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-	if (kind != ICAL_VCALENDAR_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VEVENT_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VTODO_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table),</div><div class='del'>-					   _("Updating objects"));</div><div class='del'>-</div><div class='del'>-	if (kind == ICAL_VCALENDAR_COMPONENT) {</div><div class='del'>-		icalcomponent_kind child_kind;</div><div class='del'>-		icalcomponent *subcomp;</div><div class='del'>-		icalcomponent *vcal_comp;</div><div class='del'>-</div><div class='del'>-		vcal_comp = icalcomp;</div><div class='del'>-		subcomp = icalcomponent_get_first_component (</div><div class='del'>-			vcal_comp, ICAL_ANY_COMPONENT);</div><div class='del'>-		while (subcomp) {</div><div class='del'>-			child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-			if (child_kind == ICAL_VEVENT_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VTODO_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-				CalComponent *tmp_comp;</div><div class='del'>-</div><div class='del'>-				uid = cal_component_gen_uid ();</div><div class='del'>-				tmp_comp = cal_component_new ();</div><div class='del'>-				cal_component_set_icalcomponent (</div><div class='del'>-					tmp_comp, icalcomponent_new_clone (subcomp));</div><div class='del'>-				cal_component_set_uid (tmp_comp, uid);</div><div class='del'>-</div><div class='del'>-				cal_client_update_object (</div><div class='del'>-					calendar_model_get_cal_client (cal_table-&gt;model),</div><div class='del'>-					tmp_comp);</div><div class='del'>-				free (uid);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (tmp_comp));</div><div class='del'>-			}</div><div class='del'>-			subcomp = icalcomponent_get_next_component (</div><div class='del'>-				vcal_comp, ICAL_ANY_COMPONENT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_icalcomponent (comp, icalcomp);</div><div class='del'>-		uid = cal_component_gen_uid ();</div><div class='del'>-		cal_component_set_uid (comp, (const char *) uid);</div><div class='del'>-		free (uid);</div><div class='del'>-</div><div class='del'>-		cal_client_update_object (</div><div class='del'>-			calendar_model_get_cal_client (cal_table-&gt;model),</div><div class='del'>-			comp);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	calendar_model_set_status_message (e_calendar_table_get_model (cal_table), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the current time, for the ECellDateEdit items.</div><div class='del'>-   FIXME: Should probably use the timezone of the item rather than the</div><div class='del'>-   current timezone, though that may be difficult to get from here. */</div><div class='del'>-static struct tm</div><div class='del'>-e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Get the current timezone. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Now copy it to the struct tm and return it. */</div><div class='del'>-	tmp_tm.tm_year  = tt.year - 1900;</div><div class='del'>-	tmp_tm.tm_mon   = tt.month - 1;</div><div class='del'>-	tmp_tm.tm_mday  = tt.day;</div><div class='del'>-	tmp_tm.tm_hour  = tt.hour;</div><div class='del'>-	tmp_tm.tm_min   = tt.minute;</div><div class='del'>-	tmp_tm.tm_sec   = tt.second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	return tmp_tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef TRANSLATORS_ONLY</div><div class='del'>-</div><div class='del'>-static char *test[] = {</div><div class='del'>-    N_("Click to add a task")</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/e-calendar-table.etspec b/calendar/gui/e-calendar-table.etspec<br/>deleted file mode 100644<br/>index 2e47b817d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-calendar-table.etspec?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-calendar-table.etspec</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-&lt;ETableSpecification click-to-add="true" _click-to-add-message="Click to add a task" draw-grid="true"&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "0" _title="Categories" expansion="1.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "1" _title="Classification" expansion="1.0" minimum_width="10" resizable="true" cell="classification" compare="string" priority="-1"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "2" _title="Completion Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "3" _title="End Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2" disabled="true"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "4" _title="Start Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "5" _title="Due Date" expansion="2.0" minimum_width="10" resizable="true" cell="dateedit" compare="date-compare" priority="-2"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "6" _title="Geographical Position" expansion="1.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "7" _title="% Complete" expansion="1.0" minimum_width="10" resizable="true" cell="percent" compare="percent-compare" priority="-3"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "8" _title="Priority" expansion="1.0" minimum_width="10" resizable="true" cell="priority" compare="priority-compare" priority="-3"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "9" _title="Summary" expansion="3.0" minimum_width="10" resizable="true" cell="calstring" compare="string" priority="10"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="10" _title="Show Time As" expansion="1.0" minimum_width="10" resizable="true" cell="transparency" compare="string" priority="-1" disabled="true"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="11" _title="URL" expansion="2.0" minimum_width="10" resizable="true" cell="calstring" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="12" _title="Alarms" expansion="1.0" minimum_width="10" resizable="true" cell="calstring" compare="string" disabled="true"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="13" pixbuf="icon" _title="Type" expansion="1.0" minimum_width="16" resizable="false" cell="icon" compare="integer" priority="-4"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="14" pixbuf="complete" _title="Complete" expansion="1.0" minimum_width="16" resizable="false" cell="checkbox" compare="integer" priority="-4"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="18" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="calstatus" compare="string" priority="-1"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col="19" _title="Task sort" cell="task-sort" compare="task-sort" priority="-4"/&gt;</div><div class='del'>-</div><div class='del'>-  &lt;ETableState&gt;</div><div class='del'>-    &lt;column source="13"/&gt;</div><div class='del'>-    &lt;column source="14"/&gt;</div><div class='del'>-    &lt;column source= "9"/&gt;</div><div class='del'>-    &lt;grouping&gt;&lt;/grouping&gt;</div><div class='del'>-  &lt;/ETableState&gt;</div><div class='del'>-&lt;/ETableSpecification&gt;</div><div class='head'>diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h<br/>deleted file mode 100644<br/>index fab3afd85d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-calendar-table.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-calendar-table.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_CALENDAR_TABLE_H_</div><div class='del'>-#define _E_CALENDAR_TABLE_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-cell-date-edit.h&gt;</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECalendarTable - displays the iCalendar objects in a table (an ETable).</div><div class='del'>- * Used for calendar events and tasks.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)</div><div class='del'>-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)</div><div class='del'>-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ECalendarTable       ECalendarTable;</div><div class='del'>-typedef struct _ECalendarTableClass  ECalendarTableClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _ECalendarTable</div><div class='del'>-{</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	/* The model that we use */</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	GtkWidget *etable;</div><div class='del'>-</div><div class='del'>-	/* The ECell used to view &amp; edit dates. */</div><div class='del'>-	ECellDateEdit *dates_cell;</div><div class='del'>-</div><div class='del'>-	/* The invisible widget used for cut/copy/paste */</div><div class='del'>-	GtkWidget *invisible;</div><div class='del'>-	gchar *clipboard_selection;</div><div class='del'>-	icalcomponent *tmp_vcal;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECalendarTableClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType	   e_calendar_table_get_type		(void);</div><div class='del'>-GtkWidget* e_calendar_table_new			(void);</div><div class='del'>-</div><div class='del'>-CalendarModel *e_calendar_table_get_model	(ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-ETable *e_calendar_table_get_table (ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-void e_calendar_table_complete_selected (ECalendarTable *cal_table);</div><div class='del'>-void e_calendar_table_delete_selected (ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-/* Clipboard related functions */</div><div class='del'>-void       e_calendar_table_cut_clipboard       (ECalendarTable *cal_table);</div><div class='del'>-void       e_calendar_table_copy_clipboard      (ECalendarTable *cal_table);</div><div class='del'>-void       e_calendar_table_paste_clipboard     (ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-/* These load and save the state of the table (headers shown etc.) to/from</div><div class='del'>-   the given file. */</div><div class='del'>-void	   e_calendar_table_load_state		(ECalendarTable *cal_table,</div><div class='del'>-						 gchar		*filename);</div><div class='del'>-void	   e_calendar_table_save_state		(ECalendarTable *cal_table,</div><div class='del'>-						 gchar		*filename);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_CALENDAR_TABLE_H_ */</div><div class='head'>diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c<br/>deleted file mode 100644<br/>index 96cf911a1a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-cell-date-edit-text.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-cell-date-edit-text.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,235 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECellDateEditText - a subclass of ECellText used to show and edit the text</div><div class='del'>- * representation of the date, from a CalComponentDateTime* model value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-cell-date-edit-text.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_cell_text_get_type ()</div><div class='del'>-</div><div class='del'>-static ECellTextClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,</div><div class='del'>-				    icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));</div><div class='del'>-</div><div class='del'>-	ecd-&gt;zone = zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,</div><div class='del'>-					      gboolean use_24_hour)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_CELL_DATE_EDIT_TEXT (ecd));</div><div class='del'>-</div><div class='del'>-	ecd-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-ecd_get_text (ECellText *cell, ETableModel *model, int col, int row)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);</div><div class='del'>-	ECellDateEditValue *dv = e_table_model_value_at (model, col, row);</div><div class='del'>-	struct tm tmp_tm;</div><div class='del'>-	char buffer[64];</div><div class='del'>-</div><div class='del'>-	if (!dv)</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-</div><div class='del'>-	/* Note that although the property may be in a different</div><div class='del'>-	   timezone, we convert it to the current timezone to display</div><div class='del'>-	   it in the table. If the user actually edits the value,</div><div class='del'>-	   it will be set to the current timezone. See set_value(). */</div><div class='del'>-	tmp_tm = icaltimetype_to_tm_with_zone (&amp;dv-&gt;tt, dv-&gt;zone, ecd-&gt;zone);</div><div class='del'>-</div><div class='del'>-	e_time_format_date_and_time (&amp;tmp_tm, ecd-&gt;use_24_hour_format,</div><div class='del'>-				     !dv-&gt;tt.is_date, FALSE,</div><div class='del'>-				     buffer, sizeof (buffer));</div><div class='del'>-	return e_utf8_from_locale_string (buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecd_free_text (ECellText *cell, char *text)</div><div class='del'>-{</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog. */</div><div class='del'>-static void</div><div class='del'>-show_date_warning (ECellDateEditText *ecd)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	char buffer[64], message[256], *format;</div><div class='del'>-	time_t t;</div><div class='del'>-	struct tm *tmp_tm;</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	/* We are only using this as an example, so the timezone doesn't</div><div class='del'>-	   matter. */</div><div class='del'>-	tmp_tm = localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-	if (ecd-&gt;use_24_hour_format)</div><div class='del'>-		/* strftime format of a weekday, a date and a time, 24-hour. */</div><div class='del'>-		format = _("%a %m/%d/%Y %H:%M:%S");</div><div class='del'>-	else</div><div class='del'>-		/* strftime format of a weekday, a date and a time, 12-hour. */</div><div class='del'>-		format = _("%a %m/%d/%Y %I:%M:%S %p");</div><div class='del'>-</div><div class='del'>-	strftime (buffer, sizeof (buffer), format, tmp_tm);</div><div class='del'>-</div><div class='del'>-	g_snprintf (message, 256,</div><div class='del'>-		    _("The date must be entered in the format: \n\n%s"),</div><div class='del'>-		    buffer);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (message,</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecd_set_value (ECellText *cell, ETableModel *model, int col, int row,</div><div class='del'>-	       const char *text)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (cell);</div><div class='del'>-	ETimeParseStatus status;</div><div class='del'>-	struct tm tmp_tm;</div><div class='del'>-	ECellDateEditValue *value;</div><div class='del'>-	gboolean is_date = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Try to parse just a date first. If the value is only a date, we</div><div class='del'>-	   use a DATE value. */</div><div class='del'>-	status = e_time_parse_date (text, &amp;tmp_tm);</div><div class='del'>-	if (status == E_TIME_PARSE_INVALID) {</div><div class='del'>-		is_date = FALSE;</div><div class='del'>-		status = e_time_parse_date_and_time (text, &amp;tmp_tm);</div><div class='del'>-</div><div class='del'>-		if (status == E_TIME_PARSE_INVALID) {</div><div class='del'>-			show_date_warning (ecd);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == E_TIME_PARSE_NONE) {</div><div class='del'>-		value = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		ECellDateEditValue dv;</div><div class='del'>-</div><div class='del'>-		dv.tt = icaltime_null_time ();</div><div class='del'>-</div><div class='del'>-		dv.tt.year   = tmp_tm.tm_year + 1900;</div><div class='del'>-		dv.tt.month  = tmp_tm.tm_mon + 1;</div><div class='del'>-		dv.tt.day    = tmp_tm.tm_mday;</div><div class='del'>-		dv.tt.hour   = tmp_tm.tm_hour;</div><div class='del'>-		dv.tt.minute = tmp_tm.tm_min;</div><div class='del'>-		dv.tt.second = tmp_tm.tm_sec;</div><div class='del'>-		dv.tt.is_date = is_date;</div><div class='del'>-</div><div class='del'>-		/* FIXME: We assume it is being set to the current timezone.</div><div class='del'>-		   Is that OK? */</div><div class='del'>-		if (is_date) {</div><div class='del'>-			dv.zone = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			dv.zone = ecd-&gt;zone;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		value = &amp;dv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_table_model_set_value_at (model, col, row, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cell_date_edit_text_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	ECellTextClass *ectc = (ECellTextClass *) object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	ectc-&gt;get_text  = ecd_get_text;</div><div class='del'>-	ectc-&gt;free_text = ecd_free_text;</div><div class='del'>-	ectc-&gt;set_value = ecd_set_value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cell_date_edit_text_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditText *ecd = E_CELL_DATE_EDIT_TEXT (object);</div><div class='del'>-</div><div class='del'>-	ecd-&gt;zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	ecd-&gt;use_24_hour_format = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_cell_date_edit_text_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new ECell renderer that can be used to render and edit dates that</div><div class='del'>- * that come from the model.  The value returned from the model is</div><div class='del'>- * interpreted as being a CalComponentDateTime*.</div><div class='del'>- *</div><div class='del'>- * Returns: an ECell object that can be used to render dates.</div><div class='del'>- */</div><div class='del'>-ECell *</div><div class='del'>-e_cell_date_edit_text_new (const char *fontname,</div><div class='del'>-			   GtkJustification justify)</div><div class='del'>-{</div><div class='del'>-	ECellDateEditText *ecd = gtk_type_new (e_cell_date_edit_text_get_type ());</div><div class='del'>-</div><div class='del'>-	e_cell_text_construct (E_CELL_TEXT (ecd), fontname, justify);</div><div class='del'>-      </div><div class='del'>-	return (ECell *) ecd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_cell_date_edit_text, "ECellDateEditText", ECellDateEditText,</div><div class='del'>-	     e_cell_date_edit_text_class_init, e_cell_date_edit_text_init,</div><div class='del'>-	     PARENT_TYPE);</div><div class='head'>diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h<br/>deleted file mode 100644<br/>index bb00590622..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-cell-date-edit-text.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-cell-date-edit-text.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECellDateEditText - a subclass of ECellText used to show and edit the text</div><div class='del'>- * representation of the date, from a CalComponentDateTime* model value.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_CELL_DATE_EDIT_TEXT_H_</div><div class='del'>-#define _E_CELL_DATE_EDIT_TEXT_H_</div><div class='del'>-</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_CELL_DATE_EDIT_TEXT_TYPE        (e_cell_date_edit_text_get_type ())</div><div class='del'>-#define E_CELL_DATE_EDIT_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditText))</div><div class='del'>-#define E_CELL_DATE_EDIT_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_DATE_EDIT_TEXT_TYPE, ECellDateEditTextClass))</div><div class='del'>-#define E_IS_CELL_DATE_EDIT_TEXT(o)       (GTK_CHECK_TYPE ((o), E_CELL_DATE_EDIT_TEXT_TYPE))</div><div class='del'>-#define E_IS_CELL_DATE_EDIT_TEXT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ECellDateEditValue ECellDateEditValue;</div><div class='del'>-struct _ECellDateEditValue {</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ECellText base;</div><div class='del'>-</div><div class='del'>-	/* The timezone to display the date in. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* Whether to display in 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-} ECellDateEditText;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ECellTextClass parent_class;</div><div class='del'>-} ECellDateEditTextClass;</div><div class='del'>-</div><div class='del'>-GtkType    e_cell_date_edit_text_get_type (void);</div><div class='del'>-ECell     *e_cell_date_edit_text_new      (const char *fontname,</div><div class='del'>-					   GtkJustification justify);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void	   e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,</div><div class='del'>-					       icaltimezone *zone);</div><div class='del'>-void	   e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,</div><div class='del'>-							 gboolean use_24_hour);</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _E_CELL_DATE_EDIT_TEXT_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c<br/>deleted file mode 100644<br/>index ba843b828c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-layout.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-layout.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,352 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lays out events for the Day &amp; Work-Week views of the calendar. It is also</div><div class='del'>- * used for printing.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-day-view-layout.h"</div><div class='del'>-</div><div class='del'>-static void e_day_view_layout_long_event (EDayViewEvent	  *event,</div><div class='del'>-					  guint8	  *grid,</div><div class='del'>-					  gint		   days_shown,</div><div class='del'>-					  time_t	  *day_starts,</div><div class='del'>-					  gint		  *rows_in_top_display);</div><div class='del'>-</div><div class='del'>-static void e_day_view_layout_day_event (EDayViewEvent    *event,</div><div class='del'>-					 guint8	          *grid,</div><div class='del'>-					 guint16	  *group_starts,</div><div class='del'>-					 gint8	          *cols_per_row,</div><div class='del'>-					 gint	           rows,</div><div class='del'>-					 gint	           mins_per_row);</div><div class='del'>-static void e_day_view_expand_day_event (EDayViewEvent    *event,</div><div class='del'>-					 guint8	          *grid,</div><div class='del'>-					 gint8	          *cols_per_row,</div><div class='del'>-					 gint	           mins_per_row);</div><div class='del'>-static void e_day_view_recalc_cols_per_row (gint           rows,</div><div class='del'>-					    gint8	  *cols_per_row,</div><div class='del'>-					    guint16       *group_starts);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_layout_long_events (GArray	   *events,</div><div class='del'>-			       gint	   days_shown,</div><div class='del'>-			       time_t	  *day_starts,</div><div class='del'>-			       gint	   *rows_in_top_display)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-	guint8 *grid;</div><div class='del'>-</div><div class='del'>-	/* This is a temporary 2-d grid which is used to place events.</div><div class='del'>-	   Each element is 0 if the position is empty, or 1 if occupied.</div><div class='del'>-	   We allocate the maximum size possible here, assuming that each</div><div class='del'>-	   event will need its own row. */</div><div class='del'>-	grid = g_new0 (guint8, events-&gt;len * E_DAY_VIEW_MAX_DAYS);</div><div class='del'>-</div><div class='del'>-	/* Reset the number of rows in the top display to 0. It will be</div><div class='del'>-	   updated as events are layed out below. */</div><div class='del'>-	*rows_in_top_display = 0;</div><div class='del'>-</div><div class='del'>-	/* Iterate over the events, finding which days they cover, and putting</div><div class='del'>-	   them in the first free row available. */</div><div class='del'>-	for (event_num = 0; event_num &lt; events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (events, EDayViewEvent, event_num);</div><div class='del'>-		e_day_view_layout_long_event (event, grid,</div><div class='del'>-					      days_shown, day_starts,</div><div class='del'>-					      rows_in_top_display);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the grid. */</div><div class='del'>-	g_free (grid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_layout_long_event (EDayViewEvent *event,</div><div class='del'>-			      guint8	   *grid,</div><div class='del'>-			      gint	    days_shown,</div><div class='del'>-			      time_t	   *day_starts,		</div><div class='del'>-			      gint	   *rows_in_top_display)</div><div class='del'>-{</div><div class='del'>-	gint start_day, end_day, free_row, day, row;</div><div class='del'>-</div><div class='del'>-	event-&gt;num_columns = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_find_long_event_days (event,</div><div class='del'>-					      days_shown, day_starts,</div><div class='del'>-					      &amp;start_day, &amp;end_day))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Try each row until we find a free one. */</div><div class='del'>-	row = 0;</div><div class='del'>-	do {</div><div class='del'>-		free_row = row;</div><div class='del'>-		for (day = start_day; day &lt;= end_day; day++) {</div><div class='del'>-			if (grid[row * E_DAY_VIEW_MAX_DAYS + day]) {</div><div class='del'>-				free_row = -1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		row++;</div><div class='del'>-	} while (free_row == -1);</div><div class='del'>-</div><div class='del'>-	event-&gt;start_row_or_col = free_row;</div><div class='del'>-	event-&gt;num_columns = 1;</div><div class='del'>-</div><div class='del'>-	/* Mark the cells as full. */</div><div class='del'>-	for (day = start_day; day &lt;= end_day; day++) {</div><div class='del'>-		grid[free_row * E_DAY_VIEW_MAX_DAYS + day] = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the number of rows in the top canvas if necessary. */</div><div class='del'>-	*rows_in_top_display = MAX (*rows_in_top_display, free_row + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_layout_day_events (GArray	   *events,</div><div class='del'>-			      gint	    rows,</div><div class='del'>-			      gint	    mins_per_row,</div><div class='del'>-			      gint8	   *cols_per_row)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint row, event_num;</div><div class='del'>-	guint8 *grid;</div><div class='del'>-</div><div class='del'>-	/* This is a temporary array which keeps track of rows which are</div><div class='del'>-	   connected. When an appointment spans multiple rows then the number</div><div class='del'>-	   of columns in each of these rows must be the same (i.e. the maximum</div><div class='del'>-	   of all of them). Each element in the array corresponds to one row</div><div class='del'>-	   and contains the index of the first row in the group of connected</div><div class='del'>-	   rows. */</div><div class='del'>-	guint16 group_starts[12 * 24];</div><div class='del'>-</div><div class='del'>-	/* Reset the cols_per_row array, and initialize the connected rows so</div><div class='del'>-	   that all rows are not connected - each row is the start of a new</div><div class='del'>-	   group. */</div><div class='del'>-	for (row = 0; row &lt; rows; row++) {</div><div class='del'>-		cols_per_row[row] = 0;</div><div class='del'>-		group_starts[row] = row;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This is a temporary 2-d grid which is used to place events.</div><div class='del'>-	   Each element is 0 if the position is empty, or 1 if occupied. */</div><div class='del'>-	grid = g_new0 (guint8, rows * E_DAY_VIEW_MAX_COLUMNS);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Iterate over the events, finding which rows they cover, and putting</div><div class='del'>-	   them in the first free column available. Increment the number of</div><div class='del'>-	   events in each of the rows it covers, and make sure they are all</div><div class='del'>-	   in one group. */</div><div class='del'>-	for (event_num = 0; event_num &lt; events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (events, EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		e_day_view_layout_day_event (event, grid, group_starts,</div><div class='del'>-					     cols_per_row, rows, mins_per_row);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recalculate the number of columns needed in each row. */</div><div class='del'>-	e_day_view_recalc_cols_per_row (rows, cols_per_row, group_starts);</div><div class='del'>-</div><div class='del'>-	/* Iterate over the events again, trying to expand events horizontally</div><div class='del'>-	   if there is enough space. */</div><div class='del'>-	for (event_num = 0; event_num &lt; events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (events, EDayViewEvent, event_num);</div><div class='del'>-		e_day_view_expand_day_event (event, grid, cols_per_row,</div><div class='del'>-					     mins_per_row);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the grid. */</div><div class='del'>-	g_free (grid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the first free position to place the event in.</div><div class='del'>-   Increments the number of events in each of the rows it covers, and makes</div><div class='del'>-   sure they are all in one group. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_layout_day_event (EDayViewEvent *event,</div><div class='del'>-			     guint8	   *grid,</div><div class='del'>-			     guint16	   *group_starts,</div><div class='del'>-			     gint8	   *cols_per_row,</div><div class='del'>-			     gint	    rows,</div><div class='del'>-			     gint	    mins_per_row)</div><div class='del'>-{</div><div class='del'>-	gint start_row, end_row, free_col, col, row, group_start;</div><div class='del'>-</div><div class='del'>-	start_row = event-&gt;start_minute / mins_per_row;</div><div class='del'>-	end_row = (event-&gt;end_minute - 1) / mins_per_row;</div><div class='del'>-	if (end_row &lt; start_row)</div><div class='del'>-		end_row = start_row;</div><div class='del'>-</div><div class='del'>-	event-&gt;num_columns = 0;</div><div class='del'>-</div><div class='del'>-	/* If the event can't currently be seen, just return. */</div><div class='del'>-	if (start_row &gt;= rows || end_row &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Make sure we don't go outside the visible times. */</div><div class='del'>-	start_row = CLAMP (start_row, 0, rows - 1);</div><div class='del'>-	end_row = CLAMP (end_row, 0, rows - 1);</div><div class='del'>-</div><div class='del'>-	/* Try each column until we find a free one. */</div><div class='del'>-	for (col = 0; col &lt; E_DAY_VIEW_MAX_COLUMNS; col++) {</div><div class='del'>-		free_col = col;</div><div class='del'>-		for (row = start_row; row &lt;= end_row; row++) {</div><div class='del'>-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {</div><div class='del'>-				free_col = -1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (free_col != -1)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we can't find space for the event, just return. */</div><div class='del'>-	if (free_col == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The event is assigned 1 col initially, but may be expanded later. */</div><div class='del'>-	event-&gt;start_row_or_col = free_col;</div><div class='del'>-	event-&gt;num_columns = 1;</div><div class='del'>-</div><div class='del'>-	/* Determine the start index of the group. */</div><div class='del'>-	group_start = group_starts[start_row];</div><div class='del'>-</div><div class='del'>-	/* Increment number of events in each of the rows the event covers.</div><div class='del'>-	   We use the cols_per_row array for this. It will be sorted out after</div><div class='del'>-	   all the events have been layed out. Also make sure all the rows that</div><div class='del'>-	   the event covers are in one group. */</div><div class='del'>-	for (row = start_row; row &lt;= end_row; row++) {</div><div class='del'>-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;</div><div class='del'>-		cols_per_row[row]++;</div><div class='del'>-		group_starts[row] = group_start;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If any following rows should be in the same group, add them. */</div><div class='del'>-	for (row = end_row + 1; row &lt; rows; row++) {</div><div class='del'>-		if (group_starts[row] &gt; end_row)</div><div class='del'>-			break;</div><div class='del'>-		group_starts[row] = group_start;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* For each group of rows, find the max number of events in all the</div><div class='del'>-   rows, and set the number of cols in each of the rows to that. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_cols_per_row (gint      rows,</div><div class='del'>-				gint8	 *cols_per_row,</div><div class='del'>-				guint16  *group_starts)</div><div class='del'>-{</div><div class='del'>-	gint start_row = 0, row, next_start_row, max_events;</div><div class='del'>-</div><div class='del'>-	while (start_row &lt; rows) {</div><div class='del'>-		max_events = 0;</div><div class='del'>-		for (row = start_row; row &lt; rows &amp;&amp; group_starts[row] == start_row; row++)</div><div class='del'>-			max_events = MAX (max_events, cols_per_row[row]);</div><div class='del'>-</div><div class='del'>-		next_start_row = row;</div><div class='del'>-</div><div class='del'>-		for (row = start_row; row &lt; next_start_row; row++)</div><div class='del'>-			cols_per_row[row] = max_events;</div><div class='del'>-</div><div class='del'>-		start_row = next_start_row;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Expands the event horizontally to fill any free space. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_expand_day_event (EDayViewEvent *event,</div><div class='del'>-			     guint8	   *grid,</div><div class='del'>-			     gint8	   *cols_per_row,</div><div class='del'>-			     gint	    mins_per_row)</div><div class='del'>-{</div><div class='del'>-	gint start_row, end_row, col, row;</div><div class='del'>-	gboolean clashed;</div><div class='del'>-</div><div class='del'>-	start_row = event-&gt;start_minute / mins_per_row;</div><div class='del'>-	end_row = (event-&gt;end_minute - 1) / mins_per_row;</div><div class='del'>-	if (end_row &lt; start_row)</div><div class='del'>-		end_row = start_row;</div><div class='del'>-</div><div class='del'>-	/* Try each column until we find a free one. */</div><div class='del'>-	clashed = FALSE;</div><div class='del'>-	for (col = event-&gt;start_row_or_col + 1; col &lt; cols_per_row[start_row]; col++) {</div><div class='del'>-		for (row = start_row; row &lt;= end_row; row++) {</div><div class='del'>-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {</div><div class='del'>-				clashed = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (clashed)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		event-&gt;num_columns++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Find the start and end days for the event. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_find_long_event_days (EDayViewEvent	*event,</div><div class='del'>-				 gint		 days_shown,</div><div class='del'>-				 time_t		*day_starts,		</div><div class='del'>-				 gint		*start_day_return,</div><div class='del'>-				 gint		*end_day_return)</div><div class='del'>-{</div><div class='del'>-	gint day, start_day, end_day;</div><div class='del'>-</div><div class='del'>-	start_day = -1;</div><div class='del'>-	end_day = -1;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; days_shown; day++) {</div><div class='del'>-		if (start_day == -1</div><div class='del'>-		    &amp;&amp; event-&gt;start &lt; day_starts[day + 1])</div><div class='del'>-			start_day = day;</div><div class='del'>-		if (event-&gt;end &gt; day_starts[day])</div><div class='del'>-			end_day = day;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sanity check. */</div><div class='del'>-	if (start_day &lt; 0 || start_day &gt;= days_shown</div><div class='del'>-	    || end_day &lt; 0 || end_day &gt;= days_shown</div><div class='del'>-	    || end_day &lt; start_day) {</div><div class='del'>-		g_warning ("Invalid date range for event");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*start_day_return = start_day;</div><div class='del'>-	*end_day_return = end_day;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h<br/>deleted file mode 100644<br/>index 70d0dd6394..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-layout.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-layout.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_DAY_VIEW_LAYOUT_H_</div><div class='del'>-#define _E_DAY_VIEW_LAYOUT_H_</div><div class='del'>-</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* I've split these functions away from EDayView so we can use them for</div><div class='del'>-   printing. */</div><div class='del'>-</div><div class='del'>-void e_day_view_layout_long_events	(GArray	   *events,</div><div class='del'>-					 gint	    days_shown,</div><div class='del'>-					 time_t	   *day_starts,</div><div class='del'>-					 gint	   *rows_in_top_display);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void e_day_view_layout_day_events	(GArray	   *events,</div><div class='del'>-					 gint	    rows,</div><div class='del'>-					 gint	    mins_per_row,</div><div class='del'>-					 gint8	   *cols_per_row);</div><div class='del'>-</div><div class='del'>-gboolean   e_day_view_find_long_event_days	(EDayViewEvent	*event,</div><div class='del'>-						 gint		 days_shown,</div><div class='del'>-						 time_t		*day_starts,</div><div class='del'>-						 gint		*start_day,</div><div class='del'>-						 gint		*end_day);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_DAY_VIEW_LAYOUT_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c<br/>deleted file mode 100644<br/>index f7f86c6660..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-main-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-main-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,756 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewMainItem - canvas item which displays most of the appointment</div><div class='del'>- * data in the main Day/Work Week display.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-util/e-categories-config.h"</div><div class='del'>-#include "e-day-view-layout.h"</div><div class='del'>-#include "e-day-view-main-item.h"</div><div class='del'>-</div><div class='del'>-static void e_day_view_main_item_class_init (EDayViewMainItemClass *class);</div><div class='del'>-static void e_day_view_main_item_init (EDayViewMainItem *dvtitem);</div><div class='del'>-</div><div class='del'>-static void e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg,</div><div class='del'>-					  guint arg_id);</div><div class='del'>-static void e_day_view_main_item_update (GnomeCanvasItem *item,</div><div class='del'>-					 double *affine,</div><div class='del'>-					 ArtSVP *clip_path, int flags);</div><div class='del'>-static void e_day_view_main_item_draw (GnomeCanvasItem *item,</div><div class='del'>-				       GdkDrawable *drawable,</div><div class='del'>-				       int x, int y,</div><div class='del'>-				       int width, int height);</div><div class='del'>-static double e_day_view_main_item_point (GnomeCanvasItem *item,</div><div class='del'>-					  double x, double y,</div><div class='del'>-					  int cx, int cy,</div><div class='del'>-					  GnomeCanvasItem **actual_item);</div><div class='del'>-static gint e_day_view_main_item_event (GnomeCanvasItem *item,</div><div class='del'>-					GdkEvent *event);</div><div class='del'>-</div><div class='del'>-static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,</div><div class='del'>-							    GdkDrawable *drawable,</div><div class='del'>-							    int x,</div><div class='del'>-							    int y,</div><div class='del'>-							    int width,</div><div class='del'>-							    int height);</div><div class='del'>-static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,</div><div class='del'>-						       GdkDrawable *drawable,</div><div class='del'>-						       int x, int y,</div><div class='del'>-						       int width, int height,</div><div class='del'>-						       gint day);</div><div class='del'>-static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,</div><div class='del'>-						  GdkDrawable *drawable,</div><div class='del'>-						  int x, int y,</div><div class='del'>-						  int width, int height,</div><div class='del'>-						  gint day);</div><div class='del'>-static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,</div><div class='del'>-						 GdkDrawable *drawable,</div><div class='del'>-						 int x, int y,</div><div class='del'>-						 int width, int height,</div><div class='del'>-						 gint day, gint event_num);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_DAY_VIEW</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_day_view_main_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_day_view_main_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_main_item_type) {</div><div class='del'>-		GtkTypeInfo e_day_view_main_item_info = {</div><div class='del'>-			"EDayViewMainItem",</div><div class='del'>-			sizeof (EDayViewMainItem),</div><div class='del'>-			sizeof (EDayViewMainItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_day_view_main_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_day_view_main_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_day_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_day_view_main_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_day_view_main_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_class_init (EDayViewMainItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EDayViewMainItem::day_view",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_DAY_VIEW);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_day_view_main_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_day_view_main_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_day_view_main_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_day_view_main_item_point;</div><div class='del'>-	item_class-&gt;event       = e_day_view_main_item_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_init (EDayViewMainItem *dvtitem)</div><div class='del'>-{</div><div class='del'>-	dvtitem-&gt;day_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EDayViewMainItem *dvmitem;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	dvmitem = E_DAY_VIEW_MAIN_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_DAY_VIEW:</div><div class='del'>-		dvmitem-&gt;day_view = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_update (GnomeCanvasItem *item,</div><div class='del'>-			    double *affine,</div><div class='del'>-			    ArtSVP *clip_path,</div><div class='del'>-			    int flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The item covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,</div><div class='del'>-			   int x, int y, int width, int height)</div><div class='del'>-{</div><div class='del'>-	EDayViewMainItem *dvmitem;</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint row, row_y, grid_x1, grid_x2;</div><div class='del'>-	gint day, grid_y1, grid_y2;</div><div class='del'>-	gint work_day_start_row, work_day_end_row;</div><div class='del'>-	gint work_day_start_y, work_day_end_y;</div><div class='del'>-	gint day_x, day_w, work_day;</div><div class='del'>-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;</div><div class='del'>-	struct icaltimetype day_start_tt;</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_main_item_draw %i,%i %ix%i\n",</div><div class='del'>-		 x, y, width, height);</div><div class='del'>-#endif</div><div class='del'>-	dvmitem = E_DAY_VIEW_MAIN_ITEM (canvas_item);</div><div class='del'>-	day_view = dvmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Paint the background colors. */</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	work_day_start_row = e_day_view_convert_time_to_row (day_view, day_view-&gt;work_day_start_hour, day_view-&gt;work_day_start_minute);</div><div class='del'>-	work_day_start_y = work_day_start_row * day_view-&gt;row_height - y;</div><div class='del'>-	work_day_end_row = e_day_view_convert_time_to_row (day_view, day_view-&gt;work_day_end_hour, day_view-&gt;work_day_end_minute);</div><div class='del'>-	work_day_end_y = work_day_end_row * day_view-&gt;row_height - y;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_start_tt = icaltime_from_timet_with_zone (day_view-&gt;day_starts[day], FALSE, day_view-&gt;zone);</div><div class='del'>-		weekday = icaltime_day_of_week (day_start_tt) - 1;</div><div class='del'>-		</div><div class='del'>-		work_day = day_view-&gt;working_days &amp; (1 &lt;&lt; weekday);</div><div class='del'>-</div><div class='del'>-		day_x = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-		day_w = day_view-&gt;day_widths[day];</div><div class='del'>-</div><div class='del'>-		if (work_day) {</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, 0 - y,</div><div class='del'>-					    day_w, work_day_start_y - (0 - y));</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, work_day_start_y,</div><div class='del'>-					    day_w, work_day_end_y - work_day_start_y);</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, work_day_end_y,</div><div class='del'>-					    day_w, height - work_day_end_y);</div><div class='del'>-		} else {</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, 0,</div><div class='del'>-					    day_w, height);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Paint the selection background. */</div><div class='del'>-	if (GTK_WIDGET_HAS_FOCUS (day_view)</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day != -1</div><div class='del'>-	    &amp;&amp; !day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		for (day = day_view-&gt;selection_start_day;</div><div class='del'>-		     day &lt;= day_view-&gt;selection_end_day;</div><div class='del'>-		     day++) {</div><div class='del'>-			if (day == day_view-&gt;selection_start_day</div><div class='del'>-			    &amp;&amp; day_view-&gt;selection_start_row != -1)</div><div class='del'>-				start_row = day_view-&gt;selection_start_row;</div><div class='del'>-			else</div><div class='del'>-				start_row = 0;</div><div class='del'>-			if (day == day_view-&gt;selection_end_day</div><div class='del'>-			    &amp;&amp; day_view-&gt;selection_end_row != -1)</div><div class='del'>-				end_row = day_view-&gt;selection_end_row;</div><div class='del'>-			else</div><div class='del'>-				end_row = day_view-&gt;rows - 1;</div><div class='del'>-</div><div class='del'>-			rect_x = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-			rect_width = day_view-&gt;day_widths[day];</div><div class='del'>-			rect_y = start_row * day_view-&gt;row_height - y;</div><div class='del'>-			rect_height = (end_row - start_row + 1) * day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_SELECTED]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    rect_x, rect_y,</div><div class='del'>-					    rect_width, rect_height);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Drawing the horizontal grid lines. */</div><div class='del'>-	grid_x1 = day_view-&gt;day_offsets[0] - x;</div><div class='del'>-	grid_x2 = day_view-&gt;day_offsets[day_view-&gt;days_shown] - x;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_GRID]);</div><div class='del'>-	for (row = 0, row_y = 0 - y;</div><div class='del'>-	     row &lt; day_view-&gt;rows &amp;&amp; row_y &lt; height;</div><div class='del'>-	     row++, row_y += day_view-&gt;row_height) {</div><div class='del'>-		if (row_y &gt;= 0 &amp;&amp; row_y &lt; height)</div><div class='del'>-			gdk_draw_line (drawable, gc,</div><div class='del'>-				       grid_x1, row_y, grid_x2, row_y);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the vertical bars down the left of each column. */</div><div class='del'>-	grid_y1 = 0;</div><div class='del'>-	grid_y2 = height;</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		grid_x1 = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-</div><div class='del'>-		/* Skip if it isn't visible. */</div><div class='del'>-		if (grid_x1 &gt;= width || grid_x1 + E_DAY_VIEW_BAR_WIDTH &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		gdk_draw_line (drawable, style-&gt;black_gc,</div><div class='del'>-			       grid_x1, grid_y1,</div><div class='del'>-			       grid_x1, grid_y2);</div><div class='del'>-		gdk_draw_line (drawable, style-&gt;black_gc,</div><div class='del'>-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y1,</div><div class='del'>-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y2);</div><div class='del'>-		gdk_draw_rectangle (drawable, style-&gt;white_gc, TRUE,</div><div class='del'>-			       grid_x1 + 1, grid_y1,</div><div class='del'>-			       E_DAY_VIEW_BAR_WIDTH - 2, grid_y2 - grid_y1);</div><div class='del'>-</div><div class='del'>-		/* Fill in the bars when the user is busy. */</div><div class='del'>-		e_day_view_main_item_draw_events_in_vbars (dvmitem, drawable,</div><div class='del'>-							   x, y,</div><div class='del'>-							   width, height,</div><div class='del'>-							   day);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fill in the vertical bars corresponding to the busy times from the</div><div class='del'>-	   long events. */</div><div class='del'>-	e_day_view_main_item_draw_long_events_in_vbars (dvmitem, drawable,</div><div class='del'>-							x, y, width, height);</div><div class='del'>-</div><div class='del'>-	/* Draw the event borders and backgrounds, and the vertical bars</div><div class='del'>-	   down the left edges. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		e_day_view_main_item_draw_day_events (dvmitem, drawable,</div><div class='del'>-						      x, y, width, height,</div><div class='del'>-						      day);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,</div><div class='del'>-					   GdkDrawable *drawable,</div><div class='del'>-					   int x, int y,</div><div class='del'>-					   int width, int height,</div><div class='del'>-					   gint day)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint grid_x, event_num, bar_y, bar_h;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-</div><div class='del'>-	day_view = dvmitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);</div><div class='del'>-</div><div class='del'>-	grid_x = day_view-&gt;day_offsets[day] + 1 - x;</div><div class='del'>-</div><div class='del'>-	/* Draw the busy times corresponding to the events in the day. */</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		/* If the event is TRANSPARENT, skip it. */</div><div class='del'>-		cal_component_get_transparency (event-&gt;comp, &amp;transparency);</div><div class='del'>-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* We can skip the events in the first column since they will</div><div class='del'>-		   draw over this anyway. */</div><div class='del'>-		if (event-&gt;num_columns &gt; 0 &amp;&amp; event-&gt;start_row_or_col == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		bar_y = event-&gt;start_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row;</div><div class='del'>-		bar_h = event-&gt;end_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row - bar_y;</div><div class='del'>-		bar_y -= y;</div><div class='del'>-</div><div class='del'>-		/* Skip it if it isn't visible. */</div><div class='del'>-		if (bar_y &gt;= height || bar_y + bar_h &lt;= 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    grid_x, bar_y,</div><div class='del'>-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_h);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,</div><div class='del'>-						GdkDrawable *drawable,</div><div class='del'>-						int x, int y,</div><div class='del'>-						int width, int height)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-</div><div class='del'>-	day_view = dvmitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		/* If the event is TRANSPARENT, skip it. */</div><div class='del'>-		cal_component_get_transparency (event-&gt;comp, &amp;transparency);</div><div class='del'>-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!e_day_view_find_long_event_days (event,</div><div class='del'>-						      day_view-&gt;days_shown,</div><div class='del'>-						      day_view-&gt;day_starts,</div><div class='del'>-						      &amp;start_day, &amp;end_day))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		for (day = start_day; day &lt;= end_day; day++) {</div><div class='del'>-			grid_x = day_view-&gt;day_offsets[day] + 1 - x;</div><div class='del'>-</div><div class='del'>-			/* Skip if it isn't visible. */</div><div class='del'>-			if (grid_x &gt;= width</div><div class='del'>-			    || grid_x + E_DAY_VIEW_BAR_WIDTH &lt;= 0)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			if (event-&gt;start &lt;= day_view-&gt;day_starts[day]) {</div><div class='del'>-				bar_y1 = 0;</div><div class='del'>-			} else {</div><div class='del'>-				bar_y1 = event-&gt;start_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row - y;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (event-&gt;end &gt;= day_view-&gt;day_starts[day + 1]) {</div><div class='del'>-				bar_y2 = height;</div><div class='del'>-			} else {</div><div class='del'>-				bar_y2 = event-&gt;end_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row - y;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (bar_y1 &lt; height &amp;&amp; bar_y2 &gt; 0 &amp;&amp; bar_y2 &gt; bar_y1) {</div><div class='del'>-				gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-						    grid_x, bar_y1,</div><div class='del'>-						    E_DAY_VIEW_BAR_WIDTH - 2,</div><div class='del'>-						    bar_y2 - bar_y1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,</div><div class='del'>-				      GdkDrawable *drawable,</div><div class='del'>-				      int x, int y, int width, int height,</div><div class='del'>-				      gint day)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	day_view = dvmitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		e_day_view_main_item_draw_day_event (dvmitem, drawable,</div><div class='del'>-						     x, y, width, height,</div><div class='del'>-						     day, event_num);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,</div><div class='del'>-				     GdkDrawable *drawable,</div><div class='del'>-				     int x, int y, int width, int height,</div><div class='del'>-				     gint day, gint event_num)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;</div><div class='del'>-	gint max_icon_w, max_icon_h;</div><div class='del'>-	gboolean draw_reminder_icon, draw_recurrence_icon, draw_timezone_icon;</div><div class='del'>-	GSList *categories_list, *elem;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-</div><div class='del'>-	day_view = dvmitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	/* If the event is currently being dragged, don't draw it. It will</div><div class='del'>-	   be drawn in the special drag items. */</div><div class='del'>-	if (day_view-&gt;drag_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_num == event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);</div><div class='del'>-</div><div class='del'>-	/* Get the position of the event. If it is not shown skip it.*/</div><div class='del'>-	if (!e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-					    &amp;item_x, &amp;item_y,</div><div class='del'>-					    &amp;item_w, &amp;item_h))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	item_x -= x;</div><div class='del'>-	item_y -= y;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* Fill in the white background. Note that for events in the first</div><div class='del'>-	   column of the day, we might not want to paint over the vertical bar,</div><div class='del'>-	   since that is used for multiple events. But then you can't see</div><div class='del'>-	   where the event in the first column finishes. */</div><div class='del'>-#if 1</div><div class='del'>-	if (event-&gt;start_row_or_col == 0)</div><div class='del'>-		gdk_draw_rectangle (drawable, style-&gt;white_gc, TRUE,</div><div class='del'>-				    item_x + E_DAY_VIEW_BAR_WIDTH, item_y + 1,</div><div class='del'>-				    MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1, 0),</div><div class='del'>-				    item_h - 2);</div><div class='del'>-	else</div><div class='del'>-#endif</div><div class='del'>-		gdk_draw_rectangle (drawable, style-&gt;white_gc, TRUE,</div><div class='del'>-				    item_x + 1, item_y + 1,</div><div class='del'>-				    MAX (item_w - 2, 0), item_h - 2);</div><div class='del'>-</div><div class='del'>-	/* Draw the right edge of the vertical bar. */</div><div class='del'>-	gdk_draw_line (drawable, style-&gt;black_gc,</div><div class='del'>-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-		       item_y + 1,</div><div class='del'>-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-		       item_y + item_h - 2);</div><div class='del'>-</div><div class='del'>-	/* Draw the vertical colored bar showing when the appointment</div><div class='del'>-	   begins &amp; ends. */</div><div class='del'>-	bar_y1 = event-&gt;start_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row - y;</div><div class='del'>-	bar_y2 = event-&gt;end_minute * day_view-&gt;row_height / day_view-&gt;mins_per_row - y;</div><div class='del'>-</div><div class='del'>-	/* When an item is being resized, we fill the bar up to the new row. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num) {</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)</div><div class='del'>-			bar_y1 = item_y + 1;</div><div class='del'>-		else if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)</div><div class='del'>-			bar_y2 = item_y + item_h - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only fill it in if the event isn't TRANSPARENT. */</div><div class='del'>-	cal_component_get_transparency (event-&gt;comp, &amp;transparency);</div><div class='del'>-	if (transparency != CAL_COMPONENT_TRANSP_TRANSPARENT) {</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    item_x + 1, bar_y1,</div><div class='del'>-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_y2 - bar_y1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the box around the entire event. Do this after drawing</div><div class='del'>-	   the colored bar so we don't have to worry about being 1</div><div class='del'>-	   pixel out. */</div><div class='del'>-	gdk_draw_rectangle (drawable, style-&gt;black_gc, FALSE,</div><div class='del'>-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* Draw the horizontal bars above and beneath the event if it</div><div class='del'>-	   is currently being edited. */</div><div class='del'>-	if (day_view-&gt;editing_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num) {</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    item_x,</div><div class='del'>-				    item_y - E_DAY_VIEW_BAR_HEIGHT,</div><div class='del'>-				    item_w,</div><div class='del'>-				    E_DAY_VIEW_BAR_HEIGHT);</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    item_x, item_y + item_h,</div><div class='del'>-				    item_w, E_DAY_VIEW_BAR_HEIGHT);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Draw the reminder &amp; recurrence icons, if needed. */</div><div class='del'>-	num_icons = 0;</div><div class='del'>-	draw_reminder_icon = FALSE;</div><div class='del'>-	draw_recurrence_icon = FALSE;</div><div class='del'>-	draw_timezone_icon = FALSE;</div><div class='del'>-	icon_x = item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_ICON_X_PAD;</div><div class='del'>-	icon_y = item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_DAY_VIEW_ICON_Y_PAD;</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		draw_reminder_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_recurrences (comp)) {</div><div class='del'>-		draw_recurrence_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the DTSTART or DTEND are in a different timezone to our current</div><div class='del'>-	   timezone, we display the timezone icon. */</div><div class='del'>-	if (event-&gt;different_timezone) {</div><div class='del'>-		draw_timezone_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-	num_icons += g_slist_length (categories_list);</div><div class='del'>-</div><div class='del'>-	if (num_icons != 0) {</div><div class='del'>-		if (item_h &gt;= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD)</div><div class='del'>-		    * num_icons) {</div><div class='del'>-			icon_x_inc = 0;</div><div class='del'>-			icon_y_inc = E_DAY_VIEW_ICON_HEIGHT</div><div class='del'>-				+ E_DAY_VIEW_ICON_Y_PAD;</div><div class='del'>-		} else {</div><div class='del'>-			icon_x_inc = E_DAY_VIEW_ICON_WIDTH</div><div class='del'>-				+ E_DAY_VIEW_ICON_X_PAD;</div><div class='del'>-			icon_y_inc = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_reminder_icon) {</div><div class='del'>-			max_icon_w = item_x + item_w - icon_x</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;</div><div class='del'>-			max_icon_h = item_y + item_h - icon_y</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			gdk_gc_set_clip_mask (gc, day_view-&gt;reminder_mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 day_view-&gt;reminder_icon,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-					      max_icon_w),</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_HEIGHT,</div><div class='del'>-					      max_icon_h));</div><div class='del'>-			icon_x += icon_x_inc;</div><div class='del'>-			icon_y += icon_y_inc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_recurrence_icon) {</div><div class='del'>-			max_icon_w = item_x + item_w - icon_x</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;</div><div class='del'>-			max_icon_h = item_y + item_h - icon_y</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			gdk_gc_set_clip_mask (gc, day_view-&gt;recurrence_mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 day_view-&gt;recurrence_icon,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-					      max_icon_w),</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_HEIGHT,</div><div class='del'>-					      max_icon_h));</div><div class='del'>-</div><div class='del'>-			icon_x += icon_x_inc;</div><div class='del'>-			icon_y += icon_y_inc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_timezone_icon) {</div><div class='del'>-			max_icon_w = item_x + item_w - icon_x</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;</div><div class='del'>-			max_icon_h = item_y + item_h - icon_y</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			gdk_gc_set_clip_mask (gc, day_view-&gt;timezone_mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 day_view-&gt;timezone_icon,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-					      max_icon_w),</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_HEIGHT,</div><div class='del'>-					      max_icon_h));</div><div class='del'>-			icon_x += icon_x_inc;</div><div class='del'>-			icon_y += icon_y_inc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* draw categories icons */</div><div class='del'>-		for (elem = categories_list; elem; elem = elem-&gt;next) {</div><div class='del'>-			char *category;</div><div class='del'>-			GdkPixmap *pixmap = NULL;</div><div class='del'>-			GdkBitmap *mask = NULL;</div><div class='del'>-</div><div class='del'>-			category = (char *) elem-&gt;data;</div><div class='del'>-			e_categories_config_get_icon_for (category, &amp;pixmap, &amp;mask);</div><div class='del'>-			if (pixmap == NULL)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			max_icon_w = item_x + item_w - icon_x</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;</div><div class='del'>-			max_icon_h = item_y + item_h - icon_y</div><div class='del'>-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			if (mask != NULL)</div><div class='del'>-				gdk_gc_set_clip_mask (gc, mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 pixmap,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-					      max_icon_w),</div><div class='del'>-					 MIN (E_DAY_VIEW_ICON_HEIGHT,</div><div class='del'>-					      max_icon_h));</div><div class='del'>-</div><div class='del'>-			gdk_pixmap_unref (pixmap);</div><div class='del'>-			if (mask != NULL)</div><div class='del'>-				gdk_bitmap_unref (mask);</div><div class='del'>-</div><div class='del'>-			icon_x += icon_x_inc;</div><div class='del'>-			icon_y += icon_y_inc;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gdk_gc_set_clip_mask (gc, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* free memory */</div><div class='del'>-	cal_component_free_categories_list (categories_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item to the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			    int cx, int cy,</div><div class='del'>-			    GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayViewMainItem *dvtitem;</div><div class='del'>-</div><div class='del'>-	dvtitem = E_DAY_VIEW_MAIN_ITEM (item);</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h<br/>deleted file mode 100644<br/>index be7f130606..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-main-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-main-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_DAY_VIEW_MAIN_ITEM_H_</div><div class='del'>-#define _E_DAY_VIEW_MAIN_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewMainItem - canvas item which displays most of the appointment</div><div class='del'>- * data in the main Day/Work Week display.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_DAY_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_day_view_main_item_get_type (), EDayViewMainItem))</div><div class='del'>-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_day_view_main_item_get_type ()))</div><div class='del'>-#define E_IS_DAY_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_day_view_main_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EDayView widget. */</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-} EDayViewMainItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EDayViewMainItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_day_view_main_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c<br/>deleted file mode 100644<br/>index 94af4ee00c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-time-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,659 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewTimeItem - canvas item which displays the times down the left of</div><div class='del'>- * the EDayView.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include "e-day-view-time-item.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The spacing between items in the time column. GRID_X_PAD is the space down</div><div class='del'>-   either side of the column, i.e. outside the main horizontal grid lines.</div><div class='del'>-   HOUR_L_PAD &amp; HOUR_R_PAD are the spaces on the left &amp; right side of the</div><div class='del'>-   big hour number (this is inside the horizontal grid lines).</div><div class='del'>-   MIN_X_PAD is the spacing either side of the minute number. The smaller</div><div class='del'>-   horizontal grid lines match with this.</div><div class='del'>-   60_MIN_X_PAD is the space either side of the HH:MM display used when</div><div class='del'>-   we are displaying 60 mins per row (inside the main grid lines).</div><div class='del'>-   LARGE_HOUR_Y_PAD is the offset of the large hour string from the top of the</div><div class='del'>-   row.</div><div class='del'>-   SMALL_FONT_Y_PAD is the offset of the small time/minute string from the top</div><div class='del'>-   of the row. */</div><div class='del'>-#define E_DVTMI_TIME_GRID_X_PAD		4</div><div class='del'>-#define E_DVTMI_HOUR_L_PAD		4</div><div class='del'>-#define E_DVTMI_HOUR_R_PAD		2</div><div class='del'>-#define E_DVTMI_MIN_X_PAD		2</div><div class='del'>-#define E_DVTMI_60_MIN_X_PAD		4</div><div class='del'>-#define E_DVTMI_LARGE_HOUR_Y_PAD	1</div><div class='del'>-#define E_DVTMI_SMALL_FONT_Y_PAD	1</div><div class='del'>-</div><div class='del'>-static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class);</div><div class='del'>-static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem);</div><div class='del'>-static void e_day_view_time_item_set_arg (GtkObject *o,</div><div class='del'>-					  GtkArg *arg,</div><div class='del'>-					  guint arg_id);</div><div class='del'>-</div><div class='del'>-static void e_day_view_time_item_update (GnomeCanvasItem *item,</div><div class='del'>-					 double *affine,</div><div class='del'>-					 ArtSVP *clip_path, int flags);</div><div class='del'>-static void e_day_view_time_item_draw (GnomeCanvasItem *item,</div><div class='del'>-				       GdkDrawable *drawable,</div><div class='del'>-				       int x, int y,</div><div class='del'>-				       int width, int height);</div><div class='del'>-static double e_day_view_time_item_point (GnomeCanvasItem *item,</div><div class='del'>-					  double x, double y,</div><div class='del'>-					  int cx, int cy,</div><div class='del'>-					  GnomeCanvasItem **actual_item);</div><div class='del'>-static gint e_day_view_time_item_event (GnomeCanvasItem *item,</div><div class='del'>-					GdkEvent *event);</div><div class='del'>-static void e_day_view_time_item_increment_time	(gint	*hour,</div><div class='del'>-						 gint	*minute,</div><div class='del'>-						 gint	 mins_per_row);</div><div class='del'>-static void e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,</div><div class='del'>-						  GdkEvent *event);</div><div class='del'>-static void e_day_view_time_item_on_set_divisions (GtkWidget *item,</div><div class='del'>-						   EDayViewTimeItem *dvtmitem);</div><div class='del'>-static void e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,</div><div class='del'>-						  GdkEvent *event);</div><div class='del'>-static void e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,</div><div class='del'>-						    GdkEvent *event);</div><div class='del'>-static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,</div><div class='del'>-						   GdkEvent *event);</div><div class='del'>-static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,</div><div class='del'>-							  gint y);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_DAY_VIEW</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_day_view_time_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_day_view_time_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_time_item_type) {</div><div class='del'>-		GtkTypeInfo e_day_view_time_item_info = {</div><div class='del'>-			"EDayViewTimeItem",</div><div class='del'>-			sizeof (EDayViewTimeItem),</div><div class='del'>-			sizeof (EDayViewTimeItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_day_view_time_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_day_view_time_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_day_view_time_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_day_view_time_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_day_view_time_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_class_init (EDayViewTimeItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EDayViewTimeItem::day_view",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_DAY_VIEW);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_day_view_time_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_day_view_time_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_day_view_time_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_day_view_time_item_point;</div><div class='del'>-	item_class-&gt;event       = e_day_view_time_item_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)</div><div class='del'>-{</div><div class='del'>-	dvtmitem-&gt;dragging_selection = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EDayViewTimeItem *dvtmitem;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	dvtmitem = E_DAY_VIEW_TIME_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_DAY_VIEW:</div><div class='del'>-		dvtmitem-&gt;day_view = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_update (GnomeCanvasItem *item,</div><div class='del'>-			    double *affine,</div><div class='del'>-			    ArtSVP *clip_path,</div><div class='del'>-			    int flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The item covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the minimum width needed for the column, by adding up all the</div><div class='del'>-   maximum widths of the strings. The string widths are all calculated in</div><div class='del'>-   the style_set handlers of EDayView and EDayViewTimeCanvas. */</div><div class='del'>-gint</div><div class='del'>-e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkFont *small_font, *large_font;</div><div class='del'>-	gint digit, large_digit_width, max_large_digit_width = 0;</div><div class='del'>-	gint max_suffix_width, max_minute_or_suffix_width;</div><div class='del'>-	gint column_width_default, column_width_60_min_rows;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_val_if_fail (day_view != NULL, 0);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	g_return_val_if_fail (style != NULL, 0);</div><div class='del'>-	small_font = style-&gt;font;</div><div class='del'>-	g_return_val_if_fail (small_font != NULL, 0);</div><div class='del'>-	large_font = day_view-&gt;large_font;</div><div class='del'>-	g_return_val_if_fail (large_font != NULL, 0);</div><div class='del'>-</div><div class='del'>-	for (digit = '0'; digit &lt;= '9'; digit++) {</div><div class='del'>-		large_digit_width = gdk_char_width (large_font, digit);</div><div class='del'>-		max_large_digit_width = MAX (max_large_digit_width,</div><div class='del'>-					     large_digit_width);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the width of each time column, using the maximum of the</div><div class='del'>-	   default format with large hour numbers, and the 60-min divisions</div><div class='del'>-	   format which uses small text. */</div><div class='del'>-	max_suffix_width = MAX (day_view-&gt;am_string_width,</div><div class='del'>-				day_view-&gt;pm_string_width);</div><div class='del'>-</div><div class='del'>-	max_minute_or_suffix_width = MAX (max_suffix_width,</div><div class='del'>-					  day_view-&gt;max_minute_width);</div><div class='del'>-</div><div class='del'>-	column_width_default = max_large_digit_width * 2</div><div class='del'>-		+ max_minute_or_suffix_width</div><div class='del'>-		+ E_DVTMI_MIN_X_PAD * 2</div><div class='del'>-		+ E_DVTMI_HOUR_L_PAD</div><div class='del'>-		+ E_DVTMI_HOUR_R_PAD</div><div class='del'>-		+ E_DVTMI_TIME_GRID_X_PAD * 2;</div><div class='del'>-</div><div class='del'>-	column_width_60_min_rows = day_view-&gt;max_small_hour_width</div><div class='del'>-		+ day_view-&gt;colon_width</div><div class='del'>-		+ max_minute_or_suffix_width</div><div class='del'>-		+ E_DVTMI_60_MIN_X_PAD * 2</div><div class='del'>-		+ E_DVTMI_TIME_GRID_X_PAD * 2;</div><div class='del'>-</div><div class='del'>-	dvtmitem-&gt;column_width = MAX (column_width_default,</div><div class='del'>-				      column_width_60_min_rows);</div><div class='del'>-</div><div class='del'>-	return dvtmitem-&gt;column_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,</div><div class='del'>-			   GdkDrawable	   *drawable,</div><div class='del'>-			   int		    x,</div><div class='del'>-			   int		    y,</div><div class='del'>-			   int		    width,</div><div class='del'>-			   int		    height)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewTimeItem *dvtmitem;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkFont *small_font, *large_font;</div><div class='del'>-	GdkGC *fg_gc, *dark_gc;</div><div class='del'>-	gchar buffer[64], *suffix;</div><div class='del'>-	gint hour, display_hour, minute, row;</div><div class='del'>-	gint row_y, start_y, large_hour_y_offset, small_font_y_offset;</div><div class='del'>-	gint long_line_x1, long_line_x2, short_line_x1;</div><div class='del'>-	gint large_hour_x2, minute_x2;</div><div class='del'>-	gint hour_width, minute_width, suffix_width;</div><div class='del'>-	gint max_suffix_width, max_minute_or_suffix_width;</div><div class='del'>-</div><div class='del'>-	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	small_font = style-&gt;font;</div><div class='del'>-	large_font = day_view-&gt;large_font;</div><div class='del'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	dark_gc = style-&gt;dark_gc[GTK_STATE_NORMAL];</div><div class='del'>-</div><div class='del'>-	/* The start and end of the long horizontal line between hours. */</div><div class='del'>-	long_line_x1 = E_DVTMI_TIME_GRID_X_PAD - x;</div><div class='del'>-	long_line_x2 = dvtmitem-&gt;column_width - E_DVTMI_TIME_GRID_X_PAD - x;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;mins_per_row == 60) {</div><div class='del'>-		/* The right edge of the complete time string in 60-min</div><div class='del'>-		   divisions, e.g. "14:00" or "2 pm". */</div><div class='del'>-		minute_x2 = long_line_x2 - E_DVTMI_60_MIN_X_PAD;</div><div class='del'>-</div><div class='del'>-		/* These aren't used for 60-minute divisions, but we initialize</div><div class='del'>-		   them to keep gcc happy. */</div><div class='del'>-		short_line_x1 = 0;</div><div class='del'>-		large_hour_x2 = 0;</div><div class='del'>-	} else {</div><div class='del'>-		max_suffix_width = MAX (day_view-&gt;am_string_width,</div><div class='del'>-					day_view-&gt;pm_string_width);</div><div class='del'>-</div><div class='del'>-		max_minute_or_suffix_width = MAX (max_suffix_width,</div><div class='del'>-						  day_view-&gt;max_minute_width);</div><div class='del'>-</div><div class='del'>-		/* The start of the short horizontal line between the periods</div><div class='del'>-		   within each hour. */</div><div class='del'>-		short_line_x1 = long_line_x2 - E_DVTMI_MIN_X_PAD * 2</div><div class='del'>-			- max_minute_or_suffix_width;</div><div class='del'>-</div><div class='del'>-		/* The right edge of the large hour string. */</div><div class='del'>-		large_hour_x2 = short_line_x1 - E_DVTMI_HOUR_R_PAD;</div><div class='del'>-</div><div class='del'>-		/* The right edge of the minute part of the time. */</div><div class='del'>-		minute_x2 = long_line_x2 - E_DVTMI_MIN_X_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Start with the first hour &amp; minute shown in the EDayView. */</div><div class='del'>-	hour = day_view-&gt;first_hour_shown;</div><div class='del'>-	minute = day_view-&gt;first_minute_shown;</div><div class='del'>-</div><div class='del'>-	/* The offset of the large hour string from the top of the row. */</div><div class='del'>-	large_hour_y_offset = large_font-&gt;ascent + E_DVTMI_LARGE_HOUR_Y_PAD;</div><div class='del'>-</div><div class='del'>-	/* The offset of the small time/minute string from top of row. */</div><div class='del'>-	small_font_y_offset = small_font-&gt;ascent + E_DVTMI_SMALL_FONT_Y_PAD;</div><div class='del'>-</div><div class='del'>-	/* Calculate the minimum y position of the first row we need to draw.</div><div class='del'>-	   This is normally one row height above the 0 position, but if we</div><div class='del'>-	   are using the large font we may have to go back a bit further. */</div><div class='del'>-	start_y = 0 - MAX (day_view-&gt;row_height,</div><div class='del'>-			   large_hour_y_offset + large_font-&gt;descent);</div><div class='del'>-</div><div class='del'>-	/* Step through each row, drawing the times and the horizontal lines</div><div class='del'>-	   between them. */</div><div class='del'>-	for (row = 0, row_y = 0 - y;</div><div class='del'>-	     row &lt; day_view-&gt;rows &amp;&amp; row_y &lt; height;</div><div class='del'>-	     row++, row_y += day_view-&gt;row_height) {</div><div class='del'>-</div><div class='del'>-		/* If the row is above the first row we want to draw just</div><div class='del'>-		   increment the time and skip to the next row. */</div><div class='del'>-		if (row_y &lt; start_y) {</div><div class='del'>-			e_day_view_time_item_increment_time (&amp;hour, &amp;minute,</div><div class='del'>-							     day_view-&gt;mins_per_row);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Calculate the actual hour number to display. For 12-hour</div><div class='del'>-		   format we convert 0-23 to 12-11am/12-11pm. */</div><div class='del'>-		e_day_view_convert_time_to_display (day_view, hour,</div><div class='del'>-						    &amp;display_hour,</div><div class='del'>-						    &amp;suffix, &amp;suffix_width);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;mins_per_row == 60) {</div><div class='del'>-			/* 60 minute intervals - draw a long horizontal line</div><div class='del'>-			   between hours and display as one long string,</div><div class='del'>-			   e.g. "14:00" or "2 pm". */</div><div class='del'>-			gdk_draw_line (drawable, dark_gc,</div><div class='del'>-				       long_line_x1, row_y,</div><div class='del'>-				       long_line_x2, row_y);</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;use_24_hour_format) {</div><div class='del'>-				g_snprintf (buffer, sizeof (buffer), "%i:%02i",</div><div class='del'>-					    display_hour, minute);</div><div class='del'>-			} else {</div><div class='del'>-				g_snprintf (buffer, sizeof (buffer), "%i %s",</div><div class='del'>-					    display_hour, suffix);</div><div class='del'>-			}</div><div class='del'>-			minute_width = gdk_string_width (small_font, buffer);</div><div class='del'>-			gdk_draw_string (drawable, small_font, fg_gc,</div><div class='del'>-					 minute_x2 - minute_width,</div><div class='del'>-					 row_y + small_font_y_offset,</div><div class='del'>-					 buffer);</div><div class='del'>-		} else {</div><div class='del'>-			/* 5/10/15/30 minute intervals. */</div><div class='del'>-</div><div class='del'>-			if (minute == 0) {</div><div class='del'>-				/* On the hour - draw a long horizontal line</div><div class='del'>-				   before the hour and display the hour in the</div><div class='del'>-				   large font. */</div><div class='del'>-				gdk_draw_line (drawable, dark_gc,</div><div class='del'>-					       long_line_x1, row_y,</div><div class='del'>-					       long_line_x2, row_y);</div><div class='del'>-</div><div class='del'>-				g_snprintf (buffer, sizeof (buffer), "%i",</div><div class='del'>-					    display_hour);</div><div class='del'>-				hour_width = gdk_string_width (large_font,</div><div class='del'>-							       buffer);</div><div class='del'>-				gdk_draw_string (drawable, large_font, fg_gc,</div><div class='del'>-						 large_hour_x2 - hour_width,</div><div class='del'>-						 row_y + large_hour_y_offset,</div><div class='del'>-						 buffer);</div><div class='del'>-			} else {</div><div class='del'>-				/* Within the hour - draw a short line before</div><div class='del'>-				   the time. */</div><div class='del'>-				gdk_draw_line (drawable, dark_gc,</div><div class='del'>-					       short_line_x1, row_y,</div><div class='del'>-					       long_line_x2, row_y);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Normally we display the minute in each</div><div class='del'>-			   interval, but when using 30-minute intervals</div><div class='del'>-			   we don't display the '30'. */</div><div class='del'>-			if (day_view-&gt;mins_per_row != 30 || minute != 30) {</div><div class='del'>-				/* In 12-hour format we display 'am' or 'pm'</div><div class='del'>-				   instead of '00'. */</div><div class='del'>-				if (minute == 0</div><div class='del'>-				    &amp;&amp; !day_view-&gt;use_24_hour_format) {</div><div class='del'>-					strcpy (buffer, suffix);</div><div class='del'>-				} else {</div><div class='del'>-					g_snprintf (buffer, sizeof (buffer),</div><div class='del'>-						    "%02i", minute);</div><div class='del'>-				}</div><div class='del'>-				minute_width = gdk_string_width (small_font,</div><div class='del'>-								 buffer);</div><div class='del'>-				gdk_draw_string (drawable, small_font, fg_gc,</div><div class='del'>-						 minute_x2 - minute_width,</div><div class='del'>-						 row_y + small_font_y_offset,</div><div class='del'>-						 buffer);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_day_view_time_item_increment_time (&amp;hour, &amp;minute,</div><div class='del'>-						     day_view-&gt;mins_per_row);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Increment the time by the 5/10/15/30/60 minute interval.</div><div class='del'>-   Note that mins_per_row is never &gt; 60, so we never have to</div><div class='del'>-   worry about adding more than 60 minutes. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_increment_time	(gint	*hour,</div><div class='del'>-					 gint	*minute,</div><div class='del'>-					 gint	 mins_per_row)</div><div class='del'>-{</div><div class='del'>-	*minute += mins_per_row;</div><div class='del'>-	if (*minute &gt;= 60) {</div><div class='del'>-		*minute -= 60;</div><div class='del'>-		/* Currently we never wrap around to the next day, but</div><div class='del'>-		   we may do if we display extra timezones. */</div><div class='del'>-		*hour = (*hour + 1) % 24;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			    int cx, int cy,</div><div class='del'>-			    GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_time_item_event (GnomeCanvasItem *item,</div><div class='del'>-			    GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayViewTimeItem *dvtmitem;</div><div class='del'>-</div><div class='del'>-	dvtmitem = E_DAY_VIEW_TIME_ITEM (item);</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			e_day_view_time_item_on_button_press (dvtmitem, event);</div><div class='del'>-		} else if (event-&gt;button.button == 3) {</div><div class='del'>-			e_day_view_time_item_show_popup_menu (dvtmitem, event);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (event-&gt;button.button == 1)</div><div class='del'>-			e_day_view_time_item_on_button_release (dvtmitem,</div><div class='del'>-								event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		e_day_view_time_item_on_motion_notify (dvtmitem, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,</div><div class='del'>-				      GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	static gint divisions[] = { 60, 30, 15, 10, 5 };</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint num_divisions = sizeof (divisions) / sizeof (divisions[0]);</div><div class='del'>-	GtkWidget *menu, *item;</div><div class='del'>-	gchar buffer[256];</div><div class='del'>-	GSList *group = NULL;</div><div class='del'>-	gint current_divisions, i;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	current_divisions = e_day_view_get_mins_per_row (day_view);</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-</div><div class='del'>-	/* Make sure the menu is destroyed when it disappears. */</div><div class='del'>-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_divisions; i++) {</div><div class='del'>-		g_snprintf (buffer, sizeof (buffer),</div><div class='del'>-			    _("%02i minute divisions"), divisions[i]);</div><div class='del'>-		item = gtk_radio_menu_item_new_with_label (group, buffer);</div><div class='del'>-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-</div><div class='del'>-		if (current_divisions == divisions[i])</div><div class='del'>-			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "divisions",</div><div class='del'>-				     GINT_TO_POINTER (divisions[i]));</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "toggled",</div><div class='del'>-				    e_day_view_time_item_on_set_divisions,</div><div class='del'>-				    dvtmitem);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,</div><div class='del'>-			event-&gt;button.button, event-&gt;button.time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_set_divisions (GtkWidget *item,</div><div class='del'>-				       EDayViewTimeItem *dvtmitem)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint divisions;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	if (!GTK_CHECK_MENU_ITEM (item)-&gt;active)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	divisions = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item),</div><div class='del'>-							  "divisions"));</div><div class='del'>-	e_day_view_set_mins_per_row (day_view, divisions);</div><div class='del'>-	calendar_config_set_time_divisions (divisions);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,</div><div class='del'>-				      GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	gint row;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	canvas = GNOME_CANVAS_ITEM (dvtmitem)-&gt;canvas;</div><div class='del'>-</div><div class='del'>-	row = e_day_view_time_item_convert_position_to_row (dvtmitem,</div><div class='del'>-							    event-&gt;button.y);</div><div class='del'>-</div><div class='del'>-	if (row == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-		gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)-&gt;bin_window, FALSE,</div><div class='del'>-			      GDK_POINTER_MOTION_MASK</div><div class='del'>-			      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-			      FALSE, NULL, event-&gt;button.time) == 0) {</div><div class='del'>-		e_day_view_start_selection (day_view, -1, row);</div><div class='del'>-		dvtmitem-&gt;dragging_selection = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,</div><div class='del'>-					GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	if (dvtmitem-&gt;dragging_selection) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;button.time);</div><div class='del'>-		e_day_view_finish_selection (day_view);</div><div class='del'>-		e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dvtmitem-&gt;dragging_selection = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,</div><div class='del'>-				       GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	gdouble window_y;</div><div class='del'>-	gint y, row;</div><div class='del'>-</div><div class='del'>-	if (!dvtmitem-&gt;dragging_selection)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	canvas = GNOME_CANVAS_ITEM (dvtmitem)-&gt;canvas;</div><div class='del'>-</div><div class='del'>-	y = event-&gt;motion.y;</div><div class='del'>-	row = e_day_view_time_item_convert_position_to_row (dvtmitem, y);</div><div class='del'>-</div><div class='del'>-	if (row != -1) {</div><div class='del'>-		gnome_canvas_world_to_window (canvas, 0, event-&gt;motion.y,</div><div class='del'>-					      NULL, &amp;window_y);</div><div class='del'>-		e_day_view_update_selection (day_view, -1, row);</div><div class='del'>-		e_day_view_check_auto_scroll (day_view, -1, (gint) window_y);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the row corresponding to the y position, or -1. */</div><div class='del'>-static gint</div><div class='del'>-e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,</div><div class='del'>-					      gint y)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint row;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_val_if_fail (day_view != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (y &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	row = y / day_view-&gt;row_height;</div><div class='del'>-	if (row &gt;= day_view-&gt;rows)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return row;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h<br/>deleted file mode 100644<br/>index f425363c98..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-time-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_DAY_VIEW_TIME_ITEM_H_</div><div class='del'>-#define _E_DAY_VIEW_TIME_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewTimeItem - canvas item which displays the times down the left of</div><div class='del'>- * the EDayView.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_DAY_VIEW_TIME_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_day_view_time_item_get_type (), EDayViewTimeItem))</div><div class='del'>-#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_day_view_time_item_get_type ()))</div><div class='del'>-#define E_IS_DAY_VIEW_TIME_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_day_view_time_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EDayView widget. */</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	/* The width of the time column. */</div><div class='del'>-	gint column_width;</div><div class='del'>-</div><div class='del'>-	/* TRUE if we are currently dragging the selection times. */</div><div class='del'>-	gboolean dragging_selection;</div><div class='del'>-} EDayViewTimeItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EDayViewTimeItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_day_view_time_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_DAY_VIEW_TIME_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c<br/>deleted file mode 100644<br/>index c2fd76f86a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-top-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-top-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,695 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "e-util/e-categories-config.h"</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "e-day-view-top-item.h"</div><div class='del'>-</div><div class='del'>-static void e_day_view_top_item_class_init	(EDayViewTopItemClass *class);</div><div class='del'>-static void e_day_view_top_item_init		(EDayViewTopItem *dvtitem);</div><div class='del'>-</div><div class='del'>-static void e_day_view_top_item_set_arg		(GtkObject	 *o,</div><div class='del'>-						 GtkArg		 *arg,</div><div class='del'>-						 guint		  arg_id);</div><div class='del'>-static void e_day_view_top_item_update		(GnomeCanvasItem *item,</div><div class='del'>-						 double		 *affine,</div><div class='del'>-						 ArtSVP		 *clip_path,</div><div class='del'>-						 int		  flags);</div><div class='del'>-static void e_day_view_top_item_draw		(GnomeCanvasItem *item,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 int		  x,</div><div class='del'>-						 int		  y,</div><div class='del'>-						 int		  width,</div><div class='del'>-						 int		  height);</div><div class='del'>-static void e_day_view_top_item_draw_long_event	(EDayViewTopItem *dvtitem,</div><div class='del'>-						 gint		  event_num,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 int		  x,</div><div class='del'>-						 int		  y,</div><div class='del'>-						 int		  width,</div><div class='del'>-						 int		  height);</div><div class='del'>-static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 gint		  x,</div><div class='del'>-						 gint		  y,</div><div class='del'>-						 gint		  w,</div><div class='del'>-						 gint		  h);</div><div class='del'>-static double e_day_view_top_item_point		(GnomeCanvasItem *item,</div><div class='del'>-						 double		  x,</div><div class='del'>-						 double		  y,</div><div class='del'>-						 int		  cx,</div><div class='del'>-						 int		  cy,</div><div class='del'>-						 GnomeCanvasItem **actual_item);</div><div class='del'>-static gint e_day_view_top_item_event		(GnomeCanvasItem *item,</div><div class='del'>-						 GdkEvent	 *event);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_DAY_VIEW</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_day_view_top_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_day_view_top_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_top_item_type) {</div><div class='del'>-		GtkTypeInfo e_day_view_top_item_info = {</div><div class='del'>-			"EDayViewTopItem",</div><div class='del'>-			sizeof (EDayViewTopItem),</div><div class='del'>-			sizeof (EDayViewTopItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_day_view_top_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_day_view_top_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_day_view_top_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_day_view_top_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_day_view_top_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_class_init (EDayViewTopItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EDayViewTopItem::day_view",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_DAY_VIEW);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_day_view_top_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_day_view_top_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_day_view_top_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_day_view_top_item_point;</div><div class='del'>-	item_class-&gt;event       = e_day_view_top_item_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_init (EDayViewTopItem *dvtitem)</div><div class='del'>-{</div><div class='del'>-	dvtitem-&gt;day_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EDayViewTopItem *dvtitem;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	dvtitem = E_DAY_VIEW_TOP_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_DAY_VIEW:</div><div class='del'>-		dvtitem-&gt;day_view = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_update (GnomeCanvasItem *item,</div><div class='del'>-			    double	    *affine,</div><div class='del'>-			    ArtSVP	    *clip_path,</div><div class='del'>-			    int		     flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The item covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,</div><div class='del'>-			  GdkDrawable	  *drawable,</div><div class='del'>-			  int		   x,</div><div class='del'>-			  int		   y,</div><div class='del'>-			  int		   width,</div><div class='del'>-			  int		   height)</div><div class='del'>-{</div><div class='del'>-	EDayViewTopItem *dvtitem;</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc, *fg_gc, *bg_gc, *light_gc, *dark_gc;</div><div class='del'>-	gchar buffer[128], *format;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;</div><div class='del'>-	gint item_height, event_num;</div><div class='del'>-	struct tm day_start = { 0 };</div><div class='del'>-	struct icaltimetype day_start_tt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_top_item_draw %i,%i %ix%i\n",</div><div class='del'>-		 x, y, width, height);</div><div class='del'>-#endif</div><div class='del'>-	dvtitem = E_DAY_VIEW_TOP_ITEM (canvas_item);</div><div class='del'>-	day_view = dvtitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	bg_gc = style-&gt;bg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	light_gc = style-&gt;light_gc[GTK_STATE_NORMAL];</div><div class='del'>-	dark_gc = style-&gt;dark_gc[GTK_STATE_NORMAL];</div><div class='del'>-	canvas_width = GTK_WIDGET (canvas_item-&gt;canvas)-&gt;allocation.width;</div><div class='del'>-	canvas_height = GTK_WIDGET (canvas_item-&gt;canvas)-&gt;allocation.height;</div><div class='del'>-	left_edge = 0;</div><div class='del'>-	item_height = day_view-&gt;top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;</div><div class='del'>-</div><div class='del'>-	/* Draw the shadow around the dates. */</div><div class='del'>-	gdk_draw_line (drawable, light_gc,</div><div class='del'>-		       left_edge - x, 1 - y,</div><div class='del'>-		       canvas_width - 2 - x, 1 - y);</div><div class='del'>-	gdk_draw_line (drawable, light_gc,</div><div class='del'>-		       left_edge - x, 2 - y,</div><div class='del'>-		       left_edge - x, item_height - 2 - y);</div><div class='del'>-	gdk_draw_line (drawable, dark_gc,</div><div class='del'>-		       left_edge - x, item_height - 1 - y,</div><div class='del'>-		       canvas_width - 1 - x, item_height - 1 - y);</div><div class='del'>-	gdk_draw_line (drawable, dark_gc,</div><div class='del'>-		       canvas_width - 1 - x, 1 - y,</div><div class='del'>-		       canvas_width - 1 - x, item_height - 1 - y);</div><div class='del'>-</div><div class='del'>-	/* Draw the background for the dates. */</div><div class='del'>-	gdk_draw_rectangle (drawable, bg_gc, TRUE,</div><div class='del'>-			    left_edge + 2 - x, 2 - y,</div><div class='del'>-			    canvas_width - left_edge - 3,</div><div class='del'>-			    item_height - 3);</div><div class='del'>-</div><div class='del'>-	/* Clear the main area background. */</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS]);</div><div class='del'>-	gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-			    left_edge - x, item_height - y,</div><div class='del'>-			    canvas_width - left_edge,</div><div class='del'>-			    canvas_height - item_height);</div><div class='del'>-</div><div class='del'>-	/* Draw the selection background. */</div><div class='del'>-	if (GTK_WIDGET_HAS_FOCUS (day_view)</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day != -1) {</div><div class='del'>-		gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;</div><div class='del'>-</div><div class='del'>-		start_col = day_view-&gt;selection_start_day;</div><div class='del'>-		end_col = day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-		if (end_col &gt; start_col</div><div class='del'>-		    || day_view-&gt;selection_start_row == -1</div><div class='del'>-		    || day_view-&gt;selection_end_row == -1) {</div><div class='del'>-			rect_x = day_view-&gt;day_offsets[start_col];</div><div class='del'>-			rect_y = item_height;</div><div class='del'>-			rect_w = day_view-&gt;day_offsets[end_col + 1] - rect_x;</div><div class='del'>-			rect_h = canvas_height - 1 - rect_y;</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    rect_x - x, rect_y - y,</div><div class='del'>-					    rect_w, rect_h);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the date. Set a clipping rectangle so we don't draw over the</div><div class='del'>-	   next day. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_start_tt = icaltime_from_timet_with_zone (day_view-&gt;day_starts[day], FALSE, day_view-&gt;zone);</div><div class='del'>-		day_start.tm_year = day_start_tt.year - 1900;</div><div class='del'>-		day_start.tm_mon = day_start_tt.month - 1;</div><div class='del'>-		day_start.tm_mday = day_start_tt.day;</div><div class='del'>-		day_start.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		day_start.tm_wday = time_day_of_week (day_start_tt.day,</div><div class='del'>-						      day_start_tt.month - 1,</div><div class='del'>-						      day_start_tt.year);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;date_format == E_DAY_VIEW_DATE_FULL)</div><div class='del'>-			/* strftime format %A = full weekday name, %d = day of month,</div><div class='del'>-			   %B = full month name. Don't use any other specifiers. */</div><div class='del'>-			format = _("%A %d %B");</div><div class='del'>-		else if (day_view-&gt;date_format == E_DAY_VIEW_DATE_ABBREVIATED)</div><div class='del'>-			/* strftime format %a = abbreviated weekday name, %d = day of month,</div><div class='del'>-			   %b = abbreviated month name. Don't use any other specifiers. */</div><div class='del'>-			format = _("%a %d %b");</div><div class='del'>-		else if (day_view-&gt;date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)</div><div class='del'>-			/* strftime format %d = day of month, %b = abbreviated month name.</div><div class='del'>-			   Don't use any other specifiers. */</div><div class='del'>-			format = _("%d %b");</div><div class='del'>-		else</div><div class='del'>-			format = "%d";</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), format, &amp;day_start);</div><div class='del'>-			</div><div class='del'>-		clip_rect.x = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-		clip_rect.y = 2 - y;</div><div class='del'>-		clip_rect.width = day_view-&gt;day_widths[day];</div><div class='del'>-		clip_rect.height = item_height - 2;</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, &amp;clip_rect);</div><div class='del'>-</div><div class='del'>-		date_width = gdk_string_width (font, buffer);</div><div class='del'>-		date_x = day_view-&gt;day_offsets[day] + (day_view-&gt;day_widths[day] - date_width) / 2;</div><div class='del'>-		gdk_draw_string (drawable, font, fg_gc,</div><div class='del'>-				 date_x - x, 3 + font-&gt;ascent - y, buffer);</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, NULL);</div><div class='del'>-</div><div class='del'>-		/* Draw the lines down the left and right of the date cols. */</div><div class='del'>-		if (day != 0) {</div><div class='del'>-			gdk_draw_line (drawable, light_gc,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - x,</div><div class='del'>-				       4 - y,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - x,</div><div class='del'>-				       item_height - 4 - y);</div><div class='del'>-</div><div class='del'>-			gdk_draw_line (drawable, dark_gc,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - 1 - x,</div><div class='del'>-				       4 - y,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - 1 - x,</div><div class='del'>-				       item_height - 4 - y);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Draw the lines between each column. */</div><div class='del'>-		if (day != 0) {</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID]);</div><div class='del'>-			gdk_draw_line (drawable, gc,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - x,</div><div class='del'>-				       item_height - y,</div><div class='del'>-				       day_view-&gt;day_offsets[day] - x,</div><div class='del'>-				       canvas_height - y);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the long events. */</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		e_day_view_top_item_draw_long_event (dvtitem, event_num,</div><div class='del'>-						     drawable,</div><div class='del'>-						     x, y, width, height);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This draws one event in the top canvas. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,</div><div class='del'>-				     gint	      event_num,</div><div class='del'>-				     GdkDrawable     *drawable,</div><div class='del'>-				     int	      x,</div><div class='del'>-				     int	      y,</div><div class='del'>-				     int	      width,</div><div class='del'>-				     int	      height)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc, *fg_gc, *bg_gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint start_day, end_day;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-	gint text_x, icon_x, icon_y, icon_x_inc;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gchar buffer[16];</div><div class='del'>-	gint hour, display_hour, minute, offset, time_width, time_x;</div><div class='del'>-	gint min_end_time_x, suffix_width, max_icon_x;</div><div class='del'>-	gchar *suffix;</div><div class='del'>-	gboolean draw_start_triangle, draw_end_triangle;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-	GSList *categories_list, *elem;</div><div class='del'>-</div><div class='del'>-	day_view = dvtitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	/* If the event is currently being dragged, don't draw it. It will</div><div class='del'>-	   be drawn in the special drag items. */</div><div class='del'>-	if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_num == event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-						 &amp;start_day, &amp;end_day,</div><div class='del'>-						 &amp;item_x, &amp;item_y,</div><div class='del'>-						 &amp;item_w, &amp;item_h))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	bg_gc = style-&gt;bg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	/* Draw the lines across the top &amp; bottom of the entire event. */</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);</div><div class='del'>-	gdk_draw_line (drawable, gc,</div><div class='del'>-		       item_x - x, item_y - y,</div><div class='del'>-		       item_x + item_w - 1 - x, item_y - y);</div><div class='del'>-	gdk_draw_line (drawable, gc,</div><div class='del'>-		       item_x - x, item_y + item_h - 1 - y,</div><div class='del'>-		       item_x + item_w - 1 - x, item_y + item_h - 1 - y);</div><div class='del'>-</div><div class='del'>-	/* Fill it in. */</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);</div><div class='del'>-	gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-			    item_x - x, item_y + 1 - y,</div><div class='del'>-			    item_w, item_h - 2);</div><div class='del'>-</div><div class='del'>-	/* When resizing we don't draw the triangles.*/</div><div class='del'>-	draw_start_triangle = TRUE;</div><div class='del'>-	draw_end_triangle = TRUE;</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num) {</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)</div><div class='del'>-			draw_start_triangle = FALSE;</div><div class='del'>-</div><div class='del'>-		if  (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)</div><div class='del'>-			draw_end_triangle = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event starts before the first day shown, draw a triangle,</div><div class='del'>-	   else just draw a vertical line down the left. */</div><div class='del'>-	if (draw_start_triangle</div><div class='del'>-	    &amp;&amp; event-&gt;start &lt; day_view-&gt;day_starts[start_day]) {</div><div class='del'>-		e_day_view_top_item_draw_triangle (dvtitem, drawable,</div><div class='del'>-						   item_x - x, item_y - y,</div><div class='del'>-						   -E_DAY_VIEW_BAR_WIDTH,</div><div class='del'>-						   item_h);</div><div class='del'>-	} else {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);</div><div class='del'>-		gdk_draw_line (drawable, gc,</div><div class='del'>-			       item_x - x, item_y - y,</div><div class='del'>-			       item_x - x, item_y + item_h - 1 - y);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Similar for the event end. */</div><div class='del'>-	if (draw_end_triangle</div><div class='del'>-	    &amp;&amp; event-&gt;end &gt; day_view-&gt;day_starts[end_day + 1]) {</div><div class='del'>-		e_day_view_top_item_draw_triangle (dvtitem, drawable,</div><div class='del'>-						   item_x + item_w - 1 - x,</div><div class='del'>-						   item_y - y,</div><div class='del'>-						   E_DAY_VIEW_BAR_WIDTH,</div><div class='del'>-						   item_h);</div><div class='del'>-	} else {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);</div><div class='del'>-		gdk_draw_line (drawable, gc,</div><div class='del'>-			       item_x + item_w - 1 - x,</div><div class='del'>-			       item_y - y,</div><div class='del'>-			       item_x + item_w - 1 - x,</div><div class='del'>-			       item_y + item_h - 1 - y);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we are editing the event we don't show the icons or the start</div><div class='del'>-	   &amp; end times. */</div><div class='del'>-	if (day_view-&gt;editing_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Determine the position of the label, so we know where to place the</div><div class='del'>-	   icons. Note that since the top canvas never scrolls we don't need</div><div class='del'>-	   to take the scroll offset into account. It will always be 0. */</div><div class='del'>-	text_x = event-&gt;canvas_item-&gt;x1;</div><div class='del'>-</div><div class='del'>-	/* Draw the start &amp; end times, if necessary. */</div><div class='del'>-	min_end_time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;</div><div class='del'>-</div><div class='del'>-	time_width = e_day_view_get_time_string_width (day_view);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;start &gt; day_view-&gt;day_starts[start_day]) {</div><div class='del'>-		offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-			+ day_view-&gt;first_minute_shown + event-&gt;start_minute;</div><div class='del'>-		hour = offset / 60;</div><div class='del'>-		minute = offset % 60;</div><div class='del'>-		/* Calculate the actual hour number to display. For 12-hour</div><div class='del'>-		   format we convert 0-23 to 12-11am/12-11pm. */</div><div class='del'>-		e_day_view_convert_time_to_display (day_view, hour,</div><div class='del'>-						    &amp;display_hour,</div><div class='del'>-						    &amp;suffix, &amp;suffix_width);</div><div class='del'>-		if (day_view-&gt;use_24_hour_format) {</div><div class='del'>-			g_snprintf (buffer, sizeof (buffer), "%i:%02i",</div><div class='del'>-				    display_hour, minute);</div><div class='del'>-		} else {</div><div class='del'>-			g_snprintf (buffer, sizeof (buffer), "%i:%02i%s",</div><div class='del'>-				    display_hour, minute, suffix);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clip_rect.x = item_x - x;</div><div class='del'>-		clip_rect.y = item_y - y;</div><div class='del'>-		clip_rect.width = item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH;</div><div class='del'>-		clip_rect.height = item_h;</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, &amp;clip_rect);</div><div class='del'>-</div><div class='del'>-		time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;</div><div class='del'>-		if (display_hour &lt; 10)</div><div class='del'>-			time_x += day_view-&gt;digit_width;</div><div class='del'>-</div><div class='del'>-		gdk_draw_string (drawable, font, fg_gc,</div><div class='del'>-				 time_x,</div><div class='del'>-				 item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT</div><div class='del'>-				 + E_DAY_VIEW_LONG_EVENT_Y_PAD</div><div class='del'>-				 + font-&gt;ascent - y,</div><div class='del'>-				 buffer);</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, NULL);</div><div class='del'>-</div><div class='del'>-		min_end_time_x += time_width</div><div class='del'>-			+ E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	max_icon_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD</div><div class='del'>-		- E_DAY_VIEW_ICON_WIDTH;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;end &lt; day_view-&gt;day_starts[end_day + 1]) {</div><div class='del'>-		offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-			+ day_view-&gt;first_minute_shown</div><div class='del'>-			+ event-&gt;end_minute;</div><div class='del'>-		hour = offset / 60;</div><div class='del'>-		minute = offset % 60;</div><div class='del'>-		time_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD - time_width - E_DAY_VIEW_LONG_EVENT_TIME_X_PAD - x;</div><div class='del'>-</div><div class='del'>-		if (time_x &gt;= min_end_time_x) {</div><div class='del'>-			/* Calculate the actual hour number to display. */</div><div class='del'>-			e_day_view_convert_time_to_display (day_view, hour,</div><div class='del'>-							    &amp;display_hour,</div><div class='del'>-							    &amp;suffix,</div><div class='del'>-							    &amp;suffix_width);</div><div class='del'>-			if (day_view-&gt;use_24_hour_format) {</div><div class='del'>-				g_snprintf (buffer, sizeof (buffer),</div><div class='del'>-					    "%i:%02i", display_hour, minute);</div><div class='del'>-			} else {</div><div class='del'>-				g_snprintf (buffer, sizeof (buffer),</div><div class='del'>-					    "%i:%02i%s", display_hour, minute,</div><div class='del'>-					    suffix);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (display_hour &lt; 10)</div><div class='del'>-				time_x += day_view-&gt;digit_width;</div><div class='del'>-</div><div class='del'>-			gdk_draw_string (drawable, font, fg_gc,</div><div class='del'>-					 time_x,</div><div class='del'>-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD</div><div class='del'>-					 + font-&gt;ascent + 1 - y,</div><div class='del'>-					 buffer);</div><div class='del'>-</div><div class='del'>-			max_icon_x -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the icons. */</div><div class='del'>-	icon_x_inc = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD;</div><div class='del'>-	icon_x = text_x - E_DAY_VIEW_LONG_EVENT_ICON_R_PAD</div><div class='del'>-		- icon_x_inc - x;</div><div class='del'>-	icon_y = item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_DAY_VIEW_ICON_Y_PAD - y;</div><div class='del'>-</div><div class='del'>-	if (icon_x &lt;= max_icon_x &amp;&amp; cal_component_has_recurrences (comp)) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, day_view-&gt;recurrence_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 day_view-&gt;recurrence_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_DAY_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x -= icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icon_x &lt;= max_icon_x &amp;&amp; cal_component_has_alarms (comp)) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, day_view-&gt;reminder_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 day_view-&gt;reminder_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_DAY_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x -= icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* draw categories icons */</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-	for (elem = categories_list; elem; elem = elem-&gt;next) {</div><div class='del'>-		char *category;</div><div class='del'>-		GdkPixmap *pixmap = NULL;</div><div class='del'>-		GdkBitmap *mask = NULL;</div><div class='del'>-</div><div class='del'>-		category = (char *) elem-&gt;data;</div><div class='del'>-		e_categories_config_get_icon_for (category, &amp;pixmap, &amp;mask);</div><div class='del'>-		if (pixmap == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (icon_x &lt;= max_icon_x) {</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			if (mask != NULL)</div><div class='del'>-				gdk_gc_set_clip_mask (gc, mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 pixmap,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-					 E_DAY_VIEW_ICON_HEIGHT);</div><div class='del'>-			icon_x -= icon_x_inc;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gdk_pixmap_unref (pixmap);</div><div class='del'>-		if (mask != NULL)</div><div class='del'>-			gdk_bitmap_unref (mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_categories_list (categories_list);</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_clip_mask (gc, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This draws a little triangle to indicate that an event extends past</div><div class='del'>-   the days visible on screen. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,</div><div class='del'>-				   GdkDrawable	   *drawable,</div><div class='del'>-				   gint		    x,</div><div class='del'>-				   gint		    y,</div><div class='del'>-				   gint		    w,</div><div class='del'>-				   gint		    h)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkPoint points[3];</div><div class='del'>-	gint c1, c2;</div><div class='del'>-</div><div class='del'>-	day_view = dvtitem-&gt;day_view;</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (day_view)-&gt;style;</div><div class='del'>-	gc = day_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	points[0].x = x;</div><div class='del'>-	points[0].y = y;</div><div class='del'>-	points[1].x = x + w;</div><div class='del'>-	points[1].y = y + (h / 2) - 1;</div><div class='del'>-	points[2].x = x;</div><div class='del'>-	points[2].y = y + h - 1;</div><div class='del'>-</div><div class='del'>-	/* If the height is odd we can use the same central point for both</div><div class='del'>-	   lines. If it is even we use different end-points. */</div><div class='del'>-	c1 = c2 = y + (h / 2);</div><div class='del'>-	if (h % 2 == 0)</div><div class='del'>-		c1--;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND]);</div><div class='del'>-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER]);</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y, x + w, c1);</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item the the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			   int cx, int cy,</div><div class='del'>-			   GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayViewTopItem *dvtitem;</div><div class='del'>-</div><div class='del'>-	dvtitem = E_DAY_VIEW_TOP_ITEM (item);</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h<br/>deleted file mode 100644<br/>index daeb37aca7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-top-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view-top-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_DAY_VIEW_TOP_ITEM_H_</div><div class='del'>-#define _E_DAY_VIEW_TOP_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_DAY_VIEW_TOP_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_day_view_top_item_get_type (), EDayViewTopItem))</div><div class='del'>-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_day_view_top_item_get_type ()))</div><div class='del'>-#define E_IS_DAY_VIEW_TOP_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_day_view_top_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EDayView widget. */</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-} EDayViewTopItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EDayViewTopItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_day_view_top_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_DAY_VIEW_TOP_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c<br/>deleted file mode 100644<br/>index 2a346cdbf9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7570 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayView - displays the Day &amp; Work-Week views of the calendar.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;gdk/gdkx.h&gt;</div><div class='del'>-#include &lt;gtk/gtkdnd.h&gt;</div><div class='del'>-#include &lt;gtk/gtkinvisible.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvscrollbar.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-exec.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "dialogs/delete-comp.h"</div><div class='del'>-#include "dialogs/send-comp.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "goto.h"</div><div class='del'>-#include "e-day-view-time-item.h"</div><div class='del'>-#include "e-day-view-top-item.h"</div><div class='del'>-#include "e-day-view-layout.h"</div><div class='del'>-#include "e-day-view-main-item.h"</div><div class='del'>-#include "misc.h"</div><div class='del'>-</div><div class='del'>-/* Images */</div><div class='del'>-#include "art/bell.xpm"</div><div class='del'>-#include "art/recur.xpm"</div><div class='del'>-#include "art/timezone-16.xpm"</div><div class='del'>-</div><div class='del'>-/* The minimum amount of space wanted on each side of the date string. */</div><div class='del'>-#define E_DAY_VIEW_DATE_X_PAD	4</div><div class='del'>-</div><div class='del'>-#define E_DAY_VIEW_LARGE_FONT	\</div><div class='del'>-	"-adobe-utopia-regular-r-normal-*-*-240-*-*-p-*-iso8859-*"</div><div class='del'>-#define E_DAY_VIEW_LARGE_FONT_FALLBACK	\</div><div class='del'>-	"-adobe-helvetica-bold-r-normal-*-*-240-*-*-p-*-iso8859-*"</div><div class='del'>-</div><div class='del'>-/* The offset from the top/bottom of the canvas before auto-scrolling starts.*/</div><div class='del'>-#define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16</div><div class='del'>-</div><div class='del'>-/* The time between each auto-scroll, in milliseconds. */</div><div class='del'>-#define E_DAY_VIEW_AUTO_SCROLL_TIMEOUT	50</div><div class='del'>-</div><div class='del'>-/* The number of timeouts we skip before we start scrolling. */</div><div class='del'>-#define E_DAY_VIEW_AUTO_SCROLL_DELAY	5</div><div class='del'>-</div><div class='del'>-/* The number of pixels the mouse has to be moved with the button down before</div><div class='del'>-   we start a drag. */</div><div class='del'>-#define E_DAY_VIEW_DRAG_START_OFFSET	4</div><div class='del'>-</div><div class='del'>-/* The amount we scroll the main canvas when the Page Up/Down keys are pressed,</div><div class='del'>-   as a fraction of the page size. */</div><div class='del'>-#define E_DAY_VIEW_PAGE_STEP		0.5</div><div class='del'>-</div><div class='del'>-/* The amount we scroll the main canvas when the mouse wheel buttons are</div><div class='del'>-   pressed, as a fraction of the page size. */</div><div class='del'>-#define E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE	0.25</div><div class='del'>-</div><div class='del'>-/* The timeout before we do a layout, so we don't do a layout for each event</div><div class='del'>-   we get from the server. */</div><div class='del'>-#define E_DAY_VIEW_LAYOUT_TIMEOUT	100</div><div class='del'>-</div><div class='del'>-/* Used for the status bar messages */</div><div class='del'>-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "evolution-calendar-mini.png"</div><div class='del'>-static GdkPixbuf *progress_icon[2] = { NULL, NULL };</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	SELECTION_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-static guint e_day_view_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Drag and Drop stuff. */</div><div class='del'>-enum {</div><div class='del'>-	TARGET_CALENDAR_EVENT</div><div class='del'>-};</div><div class='del'>-static GtkTargetEntry target_table[] = {</div><div class='del'>-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT }</div><div class='del'>-};</div><div class='del'>-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);</div><div class='del'>-</div><div class='del'>-static void e_day_view_class_init (EDayViewClass *class);</div><div class='del'>-static void e_day_view_init (EDayView *day_view);</div><div class='del'>-static void e_day_view_destroy (GtkObject *object);</div><div class='del'>-static void e_day_view_realize (GtkWidget *widget);</div><div class='del'>-static void e_day_view_unrealize (GtkWidget *widget);</div><div class='del'>-static void e_day_view_style_set (GtkWidget *widget,</div><div class='del'>-				  GtkStyle  *previous_style);</div><div class='del'>-static void e_day_view_size_allocate (GtkWidget *widget,</div><div class='del'>-				      GtkAllocation *allocation);</div><div class='del'>-static gboolean e_day_view_update_scroll_regions (EDayView *day_view);</div><div class='del'>-static gint e_day_view_focus_in (GtkWidget *widget,</div><div class='del'>-				 GdkEventFocus *event);</div><div class='del'>-static gint e_day_view_focus_out (GtkWidget *widget,</div><div class='del'>-				  GdkEventFocus *event);</div><div class='del'>-static gint e_day_view_key_press (GtkWidget *widget,</div><div class='del'>-				  GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_up_shifted (EDayView *day_view,</div><div class='del'>-					      GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_down_shifted (EDayView *day_view,</div><div class='del'>-						GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_left_shifted (EDayView *day_view,</div><div class='del'>-						GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_right_shifted (EDayView *day_view,</div><div class='del'>-						 GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_up (EDayView *day_view,</div><div class='del'>-				      GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_down (EDayView *day_view,</div><div class='del'>-					GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_left (EDayView *day_view,</div><div class='del'>-					GdkEventKey *event);</div><div class='del'>-static void e_day_view_cursor_key_right (EDayView *day_view,</div><div class='del'>-					 GdkEventKey *event);</div><div class='del'>-static void e_day_view_ensure_rows_visible (EDayView *day_view,</div><div class='del'>-					    gint start_row,</div><div class='del'>-					    gint end_row);</div><div class='del'>-static void e_day_view_scroll	(EDayView	*day_view,</div><div class='del'>-				 gfloat		 pages_to_scroll);</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_on_canvas_realized (GtkWidget *widget,</div><div class='del'>-					   EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_on_top_canvas_button_press (GtkWidget *widget,</div><div class='del'>-						       GdkEventButton *event,</div><div class='del'>-						       EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_top_canvas_button_release (GtkWidget *widget,</div><div class='del'>-							 GdkEventButton *event,</div><div class='del'>-							 EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_top_canvas_motion (GtkWidget *widget,</div><div class='del'>-						 GdkEventMotion *event,</div><div class='del'>-						 EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_on_main_canvas_button_press (GtkWidget *widget,</div><div class='del'>-							GdkEventButton *event,</div><div class='del'>-							EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_main_canvas_button_release (GtkWidget *widget,</div><div class='del'>-							  GdkEventButton *event,</div><div class='del'>-							  EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_on_time_canvas_button_press (GtkWidget *widget,</div><div class='del'>-							GdkEventButton *event,</div><div class='del'>-							EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_update_calendar_selection_time (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,</div><div class='del'>-						  GdkEventMotion *event,</div><div class='del'>-						  EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_convert_event_coords (EDayView *day_view,</div><div class='del'>-						 GdkEvent *event,</div><div class='del'>-						 GdkWindow *window,</div><div class='del'>-						 gint *x_return,</div><div class='del'>-						 gint *y_return);</div><div class='del'>-static void e_day_view_update_long_event_resize (EDayView *day_view,</div><div class='del'>-						 gint day);</div><div class='del'>-static void e_day_view_update_resize (EDayView *day_view,</div><div class='del'>-				      gint row);</div><div class='del'>-static void e_day_view_finish_long_event_resize (EDayView *day_view);</div><div class='del'>-static void e_day_view_finish_resize (EDayView *day_view);</div><div class='del'>-static void e_day_view_abort_resize (EDayView *day_view,</div><div class='del'>-				     guint32 time);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,</div><div class='del'>-						       gint		 event_num,</div><div class='del'>-						       GdkEventButton	*event,</div><div class='del'>-						       EDayViewPosition  pos,</div><div class='del'>-						       gint		 event_x,</div><div class='del'>-						       gint		 event_y);</div><div class='del'>-static gboolean e_day_view_on_event_button_press (EDayView	 *day_view,</div><div class='del'>-						  gint		  day,</div><div class='del'>-						  gint		  event_num,</div><div class='del'>-						  GdkEventButton *event,</div><div class='del'>-						  EDayViewPosition pos,</div><div class='del'>-						  gint		  event_x,</div><div class='del'>-						  gint		  event_y);</div><div class='del'>-static void e_day_view_on_long_event_click (EDayView *day_view,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    GdkEventButton  *bevent,</div><div class='del'>-					    EDayViewPosition pos,</div><div class='del'>-					    gint	     event_x,</div><div class='del'>-					    gint	     event_y);</div><div class='del'>-static void e_day_view_on_event_click (EDayView *day_view,</div><div class='del'>-				       gint day,</div><div class='del'>-				       gint event_num,</div><div class='del'>-				       GdkEventButton  *event,</div><div class='del'>-				       EDayViewPosition pos,</div><div class='del'>-				       gint		event_x,</div><div class='del'>-				       gint		event_y);</div><div class='del'>-static void e_day_view_on_event_double_click (EDayView *day_view,</div><div class='del'>-					      gint day,</div><div class='del'>-					      gint event_num);</div><div class='del'>-static void e_day_view_on_event_right_click (EDayView *day_view,</div><div class='del'>-					     GdkEventButton *bevent,</div><div class='del'>-					     gint day,</div><div class='del'>-					     gint event_num);</div><div class='del'>-</div><div class='del'>-static void e_day_view_recalc_day_starts (EDayView *day_view,</div><div class='del'>-					  time_t start_time);</div><div class='del'>-static void e_day_view_recalc_num_rows	(EDayView	*day_view);</div><div class='del'>-static void e_day_view_recalc_cell_sizes	(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-static EDayViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,</div><div class='del'>-								   gint x,</div><div class='del'>-								   gint y,</div><div class='del'>-								   gint *day_return,</div><div class='del'>-								   gint *event_num_return);</div><div class='del'>-static EDayViewPosition e_day_view_convert_position_in_main_canvas (EDayView *day_view,</div><div class='del'>-								    gint x,</div><div class='del'>-								    gint y,</div><div class='del'>-								    gint *day_return,</div><div class='del'>-								    gint *row_return,</div><div class='del'>-								    gint *event_num_return);</div><div class='del'>-static gboolean e_day_view_find_event_from_item (EDayView *day_view,</div><div class='del'>-						 GnomeCanvasItem *item,</div><div class='del'>-						 gint *day_return,</div><div class='del'>-						 gint *event_num_return);</div><div class='del'>-static gboolean e_day_view_find_event_from_uid (EDayView *day_view,</div><div class='del'>-						const gchar *uid,</div><div class='del'>-						gint *day_return,</div><div class='del'>-						gint *event_num_return);</div><div class='del'>-</div><div class='del'>-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,</div><div class='del'>-						   gint day,</div><div class='del'>-						   gint event_num,</div><div class='del'>-						   gpointer data);</div><div class='del'>-</div><div class='del'>-static void e_day_view_foreach_event		(EDayView	*day_view,</div><div class='del'>-						 EDayViewForeachEventCallback callback,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-static void e_day_view_foreach_event_with_uid (EDayView *day_view,</div><div class='del'>-					       const gchar *uid,</div><div class='del'>-					       EDayViewForeachEventCallback callback,</div><div class='del'>-					       gpointer data);</div><div class='del'>-</div><div class='del'>-static void e_day_view_free_events (EDayView *day_view);</div><div class='del'>-static void e_day_view_free_event_array (EDayView *day_view,</div><div class='del'>-					 GArray *array);</div><div class='del'>-static int e_day_view_add_event (CalComponent *comp,</div><div class='del'>-				 time_t	  start,</div><div class='del'>-				 time_t	  end,</div><div class='del'>-				 gpointer data);</div><div class='del'>-static void e_day_view_update_event_label (EDayView *day_view,</div><div class='del'>-					   gint day,</div><div class='del'>-					   gint event_num);</div><div class='del'>-static void e_day_view_update_long_event_label (EDayView *day_view,</div><div class='del'>-						gint event_num);</div><div class='del'>-</div><div class='del'>-static void e_day_view_reshape_long_events (EDayView *day_view);</div><div class='del'>-static void e_day_view_reshape_long_event (EDayView *day_view,</div><div class='del'>-					   gint event_num);</div><div class='del'>-static void e_day_view_reshape_day_events (EDayView *day_view,</div><div class='del'>-					   gint day);</div><div class='del'>-static void e_day_view_reshape_day_event (EDayView *day_view,</div><div class='del'>-					  gint	day,</div><div class='del'>-					  gint	event_num);</div><div class='del'>-static void e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view);</div><div class='del'>-static void e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view);</div><div class='del'>-static void e_day_view_reshape_resize_rect_item (EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_ensure_events_sorted (EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_start_editing_event (EDayView *day_view,</div><div class='del'>-					    gint day,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    gchar *initial_text);</div><div class='del'>-static void e_day_view_stop_editing_event (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,</div><div class='del'>-					       GdkEvent *event,</div><div class='del'>-					       EDayView *day_view);</div><div class='del'>-static void e_day_view_on_editing_started (EDayView *day_view,</div><div class='del'>-					   GnomeCanvasItem *item);</div><div class='del'>-static void e_day_view_on_editing_stopped (EDayView *day_view,</div><div class='del'>-					   GnomeCanvasItem *item);</div><div class='del'>-</div><div class='del'>-static time_t e_day_view_convert_grid_position_to_time (EDayView *day_view,</div><div class='del'>-							gint col,</div><div class='del'>-							gint row);</div><div class='del'>-static gboolean e_day_view_convert_time_to_grid_position (EDayView *day_view,</div><div class='del'>-							  time_t time,</div><div class='del'>-							  gint *col,</div><div class='del'>-							  gint *row);</div><div class='del'>-</div><div class='del'>-static void e_day_view_start_auto_scroll (EDayView *day_view,</div><div class='del'>-					  gboolean scroll_up);</div><div class='del'>-static gboolean e_day_view_auto_scroll_handler (gpointer data);</div><div class='del'>-</div><div class='del'>-static void e_day_view_on_new_appointment (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_day_view_on_new_event       (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_day_view_on_new_meeting (GtkWidget *widget,</div><div class='del'>-				       gpointer data);</div><div class='del'>-static void e_day_view_on_new_task (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_day_view_on_goto_today      (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_day_view_on_goto_date       (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_day_view_on_edit_appointment (GtkWidget *widget,</div><div class='del'>-					    gpointer data);</div><div class='del'>-static void e_day_view_on_save_as (GtkWidget *widget, </div><div class='del'>-				   gpointer data);</div><div class='del'>-static void e_day_view_on_print (GtkWidget *widget,</div><div class='del'>-				 gpointer data);</div><div class='del'>-static void e_day_view_on_print_event (GtkWidget *widget, </div><div class='del'>-				       gpointer data);</div><div class='del'>-static void e_day_view_on_meeting (GtkWidget *widget,</div><div class='del'>-				   gpointer data);</div><div class='del'>-static void e_day_view_on_forward (GtkWidget *widget,</div><div class='del'>-				   gpointer data);</div><div class='del'>-static void e_day_view_on_publish (GtkWidget *widget,</div><div class='del'>-				   gpointer data);</div><div class='del'>-static void e_day_view_on_settings (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_day_view_on_pilot_settings (GtkWidget *widget,</div><div class='del'>-					  gpointer data);</div><div class='del'>-static void e_day_view_on_delete_occurrence (GtkWidget *widget,</div><div class='del'>-					     gpointer data);</div><div class='del'>-static void e_day_view_on_delete_appointment (GtkWidget *widget,</div><div class='del'>-					      gpointer data);</div><div class='del'>-static void e_day_view_on_cut (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_day_view_on_copy (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_day_view_on_paste (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_day_view_on_unrecur_appointment (GtkWidget *widget,</div><div class='del'>-					       gpointer data);</div><div class='del'>-static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static gint e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,</div><div class='del'>-						  GdkDragContext *context,</div><div class='del'>-						  gint            x,</div><div class='del'>-						  gint            y,</div><div class='del'>-						  guint           time,</div><div class='del'>-						  EDayView	  *day_view);</div><div class='del'>-static void e_day_view_update_top_canvas_drag (EDayView *day_view,</div><div class='del'>-					       gint day);</div><div class='del'>-static void e_day_view_reshape_top_canvas_drag_item (EDayView *day_view);</div><div class='del'>-static gint e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,</div><div class='del'>-						   GdkDragContext *context,</div><div class='del'>-						   gint            x,</div><div class='del'>-						   gint            y,</div><div class='del'>-						   guint           time,</div><div class='del'>-						   EDayView	  *day_view);</div><div class='del'>-static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view);</div><div class='del'>-static void e_day_view_update_main_canvas_drag (EDayView *day_view,</div><div class='del'>-						gint row,</div><div class='del'>-						gint day);</div><div class='del'>-static void e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-						 GdkDragContext *context,</div><div class='del'>-						 guint           time,</div><div class='del'>-						 EDayView	     *day_view);</div><div class='del'>-static void e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-						  GdkDragContext *context,</div><div class='del'>-						  guint           time,</div><div class='del'>-						  EDayView	 *day_view);</div><div class='del'>-static void e_day_view_on_drag_begin (GtkWidget      *widget,</div><div class='del'>-				      GdkDragContext *context,</div><div class='del'>-				      EDayView	   *day_view);</div><div class='del'>-static void e_day_view_on_drag_end (GtkWidget      *widget,</div><div class='del'>-				    GdkDragContext *context,</div><div class='del'>-				    EDayView       *day_view);</div><div class='del'>-static void e_day_view_on_drag_data_get (GtkWidget          *widget,</div><div class='del'>-					 GdkDragContext     *context,</div><div class='del'>-					 GtkSelectionData   *selection_data,</div><div class='del'>-					 guint               info,</div><div class='del'>-					 guint               time,</div><div class='del'>-					 EDayView		*day_view);</div><div class='del'>-static void e_day_view_on_top_canvas_drag_data_received (GtkWidget	*widget,</div><div class='del'>-							 GdkDragContext *context,</div><div class='del'>-							 gint            x,</div><div class='del'>-							 gint            y,</div><div class='del'>-							 GtkSelectionData *data,</div><div class='del'>-							 guint           info,</div><div class='del'>-							 guint           time,</div><div class='del'>-							 EDayView	*day_view);</div><div class='del'>-static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget,</div><div class='del'>-							  GdkDragContext *context,</div><div class='del'>-							  gint            x,</div><div class='del'>-							  gint            y,</div><div class='del'>-							  GtkSelectionData *data,</div><div class='del'>-							  guint           info,</div><div class='del'>-							  guint           time,</div><div class='del'>-							  EDayView	 *day_view);</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_update_event_cb (EDayView *day_view,</div><div class='del'>-					    gint day,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    gpointer data);</div><div class='del'>-static gboolean e_day_view_remove_event_cb (EDayView *day_view,</div><div class='del'>-					    gint day,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    gpointer data);</div><div class='del'>-static void e_day_view_normalize_selection (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_set_show_times_cb	(EDayView	*day_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-static time_t e_day_view_find_work_week_start	(EDayView	*day_view,</div><div class='del'>-						 time_t		 start_time);</div><div class='del'>-static void e_day_view_recalc_work_week		(EDayView	*day_view);</div><div class='del'>-static void e_day_view_recalc_work_week_days_shown	(EDayView	*day_view);</div><div class='del'>-static gboolean e_day_view_set_event_font_cb	(EDayView	*day_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gpointer	 data);</div><div class='del'>-</div><div class='del'>-static void selection_clear_event (GtkWidget *invisible,</div><div class='del'>-				   GdkEventSelection *event,</div><div class='del'>-				   EDayView *day_view);</div><div class='del'>-static void selection_received (GtkWidget *invisible,</div><div class='del'>-				GtkSelectionData *selection_data,</div><div class='del'>-				guint time,</div><div class='del'>-				EDayView *day_view);</div><div class='del'>-static void selection_get (GtkWidget *invisible,</div><div class='del'>-			   GtkSelectionData *selection_data,</div><div class='del'>-			   guint info,</div><div class='del'>-			   guint time_stamp,</div><div class='del'>-			   EDayView *day_view);</div><div class='del'>-static void invisible_destroyed (GtkWidget *invisible, EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_queue_layout (EDayView *day_view);</div><div class='del'>-static void e_day_view_cancel_layout (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_layout_timeout_cb (gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-static GdkAtom clipboard_atom = GDK_NONE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_day_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_day_view_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_type){</div><div class='del'>-		GtkTypeInfo e_day_view_info = {</div><div class='del'>-			"EDayView",</div><div class='del'>-			sizeof (EDayView),</div><div class='del'>-			sizeof (EDayViewClass),</div><div class='del'>-			(GtkClassInitFunc) e_day_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_day_view_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		parent_class = gtk_type_class (GTK_TYPE_TABLE);</div><div class='del'>-		e_day_view_type = gtk_type_unique (GTK_TYPE_TABLE,</div><div class='del'>-						   &amp;e_day_view_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_day_view_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_class_init (EDayViewClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	e_day_view_signals[SELECTION_CHANGED] =</div><div class='del'>-		gtk_signal_new ("selection_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EDayViewClass, selection_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_day_view_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	/* Method override */</div><div class='del'>-	object_class-&gt;destroy		= e_day_view_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize		= e_day_view_realize;</div><div class='del'>-	widget_class-&gt;unrealize		= e_day_view_unrealize;</div><div class='del'>-	widget_class-&gt;style_set		= e_day_view_style_set;</div><div class='del'>- 	widget_class-&gt;size_allocate	= e_day_view_size_allocate;</div><div class='del'>-	widget_class-&gt;focus_in_event	= e_day_view_focus_in;</div><div class='del'>-	widget_class-&gt;focus_out_event	= e_day_view_focus_out;</div><div class='del'>-	widget_class-&gt;key_press_event	= e_day_view_key_press;</div><div class='del'>-</div><div class='del'>-	class-&gt;selection_changed = NULL;</div><div class='del'>-</div><div class='del'>-	/* clipboard atom */</div><div class='del'>-	if (!clipboard_atom)</div><div class='del'>-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_init (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-	GnomeCanvasGroup *canvas_group;</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;calendar = NULL;</div><div class='del'>-	day_view-&gt;client = NULL;</div><div class='del'>-	day_view-&gt;sexp = g_strdup ("#t"); /* match all by default */</div><div class='del'>-	day_view-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;long_events = g_array_new (FALSE, FALSE,</div><div class='del'>-					     sizeof (EDayViewEvent));</div><div class='del'>-	day_view-&gt;long_events_sorted = TRUE;</div><div class='del'>-	day_view-&gt;long_events_need_layout = FALSE;</div><div class='del'>-	day_view-&gt;long_events_need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;layout_timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++) {</div><div class='del'>-		day_view-&gt;events[day] = g_array_new (FALSE, FALSE,</div><div class='del'>-						     sizeof (EDayViewEvent));</div><div class='del'>-		day_view-&gt;events_sorted[day] = TRUE;</div><div class='del'>-		day_view-&gt;need_layout[day] = FALSE;</div><div class='del'>-		day_view-&gt;need_reshape[day] = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* These indicate that the times haven't been set. */</div><div class='del'>-	day_view-&gt;lower = 0;</div><div class='del'>-	day_view-&gt;upper = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_week_view = FALSE;</div><div class='del'>-	day_view-&gt;days_shown = 1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;zone = NULL;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;mins_per_row = 30;</div><div class='del'>-	day_view-&gt;date_format = E_DAY_VIEW_DATE_FULL;</div><div class='del'>-	day_view-&gt;rows_in_top_display = 0;</div><div class='del'>-</div><div class='del'>-	/* Note that these don't work yet. It would need a few fixes to the</div><div class='del'>-	   way event-&gt;start_minute and event-&gt;end_minute are used, and there</div><div class='del'>-	   may be problems with events that go outside the visible times. */</div><div class='del'>-	day_view-&gt;first_hour_shown = 0;</div><div class='del'>-	day_view-&gt;first_minute_shown = 0;</div><div class='del'>-	day_view-&gt;last_hour_shown = 24;</div><div class='del'>-	day_view-&gt;last_minute_shown = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_gc = NULL;</div><div class='del'>-	e_day_view_recalc_num_rows (day_view);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;working_days = E_DAY_VIEW_MONDAY | E_DAY_VIEW_TUESDAY</div><div class='del'>-		| E_DAY_VIEW_WEDNESDAY | E_DAY_VIEW_THURSDAY</div><div class='del'>-		| E_DAY_VIEW_FRIDAY;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_day_start_hour = 9;</div><div class='del'>-	day_view-&gt;work_day_start_minute = 0;</div><div class='del'>-	day_view-&gt;work_day_end_hour = 17;</div><div class='del'>-	day_view-&gt;work_day_end_minute = 0;</div><div class='del'>-	day_view-&gt;show_event_end_times = TRUE;</div><div class='del'>-	day_view-&gt;week_start_day = 0;</div><div class='del'>-	day_view-&gt;scroll_to_work_day = TRUE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_row = -1;</div><div class='del'>-	day_view-&gt;selection_start_day = -1;</div><div class='del'>-	day_view-&gt;selection_end_row = -1;</div><div class='del'>-	day_view-&gt;selection_end_day = -1;</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = FALSE;</div><div class='del'>-	day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;auto_scroll_timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;default_category = NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the large font. */</div><div class='del'>-	day_view-&gt;large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT);</div><div class='del'>-	if (!day_view-&gt;large_font)</div><div class='del'>-		day_view-&gt;large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT_FALLBACK);</div><div class='del'>-	if (!day_view-&gt;large_font)</div><div class='del'>-		g_warning ("Couldn't load font");</div><div class='del'>-</div><div class='del'>-	/* String to use in 12-hour time format for times in the morning. */</div><div class='del'>-	day_view-&gt;am_string = _("am");</div><div class='del'>-</div><div class='del'>-	/* String to use in 12-hour time format for times in the afternoon. */</div><div class='del'>-	day_view-&gt;pm_string = _("pm");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Top Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;top_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;top_canvas,</div><div class='del'>-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "button_release_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "motion_notify_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-				  "drag_motion",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-				  "drag_leave",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_end",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_data_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),</div><div class='del'>-			    day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;top_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;top_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_top_item_get_type (),</div><div class='del'>-				       "EDayViewTopItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_long_event_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_long_event_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_long_event_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_text_get_type (),</div><div class='del'>-				       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				       "line_wrap", TRUE,</div><div class='del'>-				       "clip", TRUE,</div><div class='del'>-				       "max_lines", 1,</div><div class='del'>-				       "editable", TRUE,</div><div class='del'>-				       "draw_background", FALSE,</div><div class='del'>-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_item);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Main Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;main_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;main_canvas,</div><div class='del'>-			  1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;main_canvas);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "button_release_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "motion_notify_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "drag_motion",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "drag_leave",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_end",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_data_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),</div><div class='del'>-			    day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;main_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_main_item_get_type (),</div><div class='del'>-				       "EDayViewMainItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_top_resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_bottom_resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_text_get_type (),</div><div class='del'>-				       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				       "line_wrap", TRUE,</div><div class='del'>-				       "clip", TRUE,</div><div class='del'>-				       "editable", TRUE,</div><div class='del'>-				       "draw_background", FALSE,</div><div class='del'>-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Times Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;time_canvas = e_canvas_new ();</div><div class='del'>-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view-&gt;time_canvas),</div><div class='del'>-				    GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;time_canvas,</div><div class='del'>-			  0, 1, 1, 2,</div><div class='del'>-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;time_canvas);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;time_canvas),</div><div class='del'>-				  "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;time_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;time_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_time_item_get_type (),</div><div class='del'>-				       "EDayViewTimeItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Scrollbar.</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;vscrollbar,</div><div class='del'>-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;vscrollbar);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	day_view-&gt;normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);</div><div class='del'>-	day_view-&gt;move_cursor = gdk_cursor_new (GDK_FLEUR);</div><div class='del'>-	day_view-&gt;resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);</div><div class='del'>-	day_view-&gt;resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);</div><div class='del'>-	day_view-&gt;last_cursor_set_in_top_canvas = NULL;</div><div class='del'>-	day_view-&gt;last_cursor_set_in_main_canvas = NULL;</div><div class='del'>-</div><div class='del'>-	/* Set up the drop sites. */</div><div class='del'>-	gtk_drag_dest_set (day_view-&gt;top_canvas,</div><div class='del'>-			   GTK_DEST_DEFAULT_ALL,</div><div class='del'>-			   target_table, n_targets,</div><div class='del'>-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);</div><div class='del'>-	gtk_drag_dest_set (day_view-&gt;main_canvas,</div><div class='del'>-			   GTK_DEST_DEFAULT_ALL,</div><div class='del'>-			   target_table, n_targets,</div><div class='del'>-			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);</div><div class='del'>-</div><div class='del'>-	/* Set up the invisible widget for the clipboard selections */</div><div class='del'>-	day_view-&gt;invisible = gtk_invisible_new ();</div><div class='del'>-	gtk_selection_add_target (day_view-&gt;invisible,</div><div class='del'>-				  clipboard_atom,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING,</div><div class='del'>-				  0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;invisible),</div><div class='del'>-			    "selection_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_get),</div><div class='del'>-			    (gpointer) day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;invisible),</div><div class='del'>-			    "selection_clear_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_clear_event),</div><div class='del'>-			    (gpointer) day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;invisible),</div><div class='del'>-			    "selection_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_received),</div><div class='del'>-			    (gpointer) day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;invisible),</div><div class='del'>-			    "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (invisible_destroyed),</div><div class='del'>-			    (gpointer) day_view);</div><div class='del'>-	day_view-&gt;clipboard_selection = NULL;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;activity = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Turn off the background of the canvas windows. This reduces flicker</div><div class='del'>-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_canvas_realized (GtkWidget *widget,</div><div class='del'>-			       EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-				    NULL, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_day_view_new:</div><div class='del'>- * @Returns: a new #EDayView.</div><div class='del'>- *</div><div class='del'>- * Creates a new #EDayView.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-e_day_view_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = GTK_WIDGET (gtk_type_new (e_day_view_get_type ()));</div><div class='del'>-</div><div class='del'>-	return day_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (object);</div><div class='del'>-</div><div class='del'>-	e_day_view_cancel_layout (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view-&gt;client), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;client));</div><div class='del'>-		day_view-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;sexp) {</div><div class='del'>-		g_free (day_view-&gt;sexp);</div><div class='del'>-		day_view-&gt;sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view-&gt;query), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;query));</div><div class='del'>-		day_view-&gt;query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;large_font) {</div><div class='del'>-		gdk_font_unref (day_view-&gt;large_font);</div><div class='del'>-		day_view-&gt;large_font = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;default_category) {</div><div class='del'>-		g_free (day_view-&gt;default_category);</div><div class='del'>-		day_view-&gt;default_category = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gdk_cursor_destroy (day_view-&gt;normal_cursor);</div><div class='del'>-	gdk_cursor_destroy (day_view-&gt;move_cursor);</div><div class='del'>-	gdk_cursor_destroy (day_view-&gt;resize_width_cursor);</div><div class='del'>-	gdk_cursor_destroy (day_view-&gt;resize_height_cursor);</div><div class='del'>-</div><div class='del'>-	e_day_view_free_events (day_view);</div><div class='del'>-	g_array_free (day_view-&gt;long_events, TRUE);</div><div class='del'>-	day_view-&gt;long_events = NULL;</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++) {</div><div class='del'>-		g_array_free (day_view-&gt;events[day], TRUE);</div><div class='del'>-		day_view-&gt;events[day] = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;invisible)</div><div class='del'>-		gtk_widget_destroy (day_view-&gt;invisible);</div><div class='del'>-	if (day_view-&gt;clipboard_selection) {</div><div class='del'>-		g_free (day_view-&gt;clipboard_selection);</div><div class='del'>-		day_view-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;activity) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;activity));</div><div class='del'>-		day_view-&gt;activity = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_DAY_VIEW_COLOR_LAST];</div><div class='del'>-	gint nfailed;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;realize)(widget);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	day_view-&gt;main_gc = gdk_gc_new (widget-&gt;window);</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 247 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 244 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 216 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 214 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_SELECTED].red   = 0 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_SELECTED].green = 0 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_SELECTED].blue  = 156 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_GRID].red   = 0x8000;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_GRID].green = 0x8000;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_GRID].blue  = 0x8000;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].red   = 0x8000;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].green = 0x8000;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS].blue  = 0x8000;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].red   = 65535;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].green = 65535;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED].blue  = 65535;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].red   = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].green = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID].blue  = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR].red   = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR].green = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR].blue  = 65535;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red   = 65535;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green = 65535;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue  = 65535;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER].red   = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER].green = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER].blue  = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].red   = 213 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].green = 213 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND].blue  = 213 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].red   = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].green = 0;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_LONG_EVENT_BORDER].blue  = 0;</div><div class='del'>-</div><div class='del'>-	nfailed = gdk_colormap_alloc_colors (colormap, day_view-&gt;colors,</div><div class='del'>-					     E_DAY_VIEW_COLOR_LAST, FALSE,</div><div class='del'>-					     TRUE, success);</div><div class='del'>-	if (nfailed)</div><div class='del'>-		g_warning ("Failed to allocate all colors");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Create the pixmaps. */</div><div class='del'>-	day_view-&gt;reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;day_view-&gt;reminder_mask, NULL, bell_xpm);</div><div class='del'>-	day_view-&gt;recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;day_view-&gt;recurrence_mask, NULL, recur_xpm);</div><div class='del'>-	day_view-&gt;timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;day_view-&gt;timezone_mask, NULL, timezone_16_xpm);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set the canvas item colors. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_long_event_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_top_resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_bottom_resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_unrealize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (day_view-&gt;main_gc);</div><div class='del'>-	day_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-	for (i = 0; i &lt; E_DAY_VIEW_COLOR_LAST; i++)</div><div class='del'>-		gdk_colors_free (colormap, &amp;day_view-&gt;colors[i].pixel, 1, 0);</div><div class='del'>-</div><div class='del'>-	gdk_pixmap_unref (day_view-&gt;reminder_icon);</div><div class='del'>-	day_view-&gt;reminder_icon = NULL;</div><div class='del'>-	gdk_pixmap_unref (day_view-&gt;recurrence_icon);</div><div class='del'>-	day_view-&gt;recurrence_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_style_set (GtkWidget *widget,</div><div class='del'>-		      GtkStyle  *previous_style)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint top_rows, top_canvas_height;</div><div class='del'>-	gint hour, max_large_hour_width;</div><div class='del'>-	gint minute, max_minute_width, i;</div><div class='del'>-	gint month, day, width;</div><div class='del'>-	gint longest_month_width, longest_abbreviated_month_width;</div><div class='del'>-	gint longest_weekday_width, longest_abbreviated_weekday_width;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	gchar buffer[128];</div><div class='del'>-	gint times_width;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;style_set)(widget, previous_style);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Recalculate the height of each row based on the font size. */</div><div class='del'>-	day_view-&gt;row_height = font-&gt;ascent + font-&gt;descent + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;</div><div class='del'>-	day_view-&gt;row_height = MAX (day_view-&gt;row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);</div><div class='del'>-	GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment-&gt;step_increment = day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;top_row_height = font-&gt;ascent + font-&gt;descent + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP;</div><div class='del'>-	day_view-&gt;top_row_height = MAX (day_view-&gt;top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);</div><div class='del'>-</div><div class='del'>-	/* Set the height of the top canvas based on the row height and the</div><div class='del'>-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/</div><div class='del'>-	top_rows = MAX (1, day_view-&gt;rows_in_top_display);</div><div class='del'>-	top_canvas_height = (top_rows + 2) * day_view-&gt;top_row_height;</div><div class='del'>-	gtk_widget_set_usize (day_view-&gt;top_canvas, -1, top_canvas_height);</div><div class='del'>-</div><div class='del'>-	/* Find the longest full &amp; abbreviated month names. */</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-	date_tm.tm_mday = 1;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	longest_month_width = 0;</div><div class='del'>-	longest_abbreviated_month_width = 0;</div><div class='del'>-	for (month = 0; month &lt; 12; month++) {</div><div class='del'>-		date_tm.tm_mon = month;</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%B", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_month_width) {</div><div class='del'>-			longest_month_width = width;</div><div class='del'>-			day_view-&gt;longest_month_name = month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%b", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_abbreviated_month_width) {</div><div class='del'>-			longest_abbreviated_month_width = width;</div><div class='del'>-			day_view-&gt;longest_abbreviated_month_name = month;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find the longest full &amp; abbreviated weekday names. */</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-	date_tm.tm_mon = 0;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	longest_weekday_width = 0;</div><div class='del'>-	longest_abbreviated_weekday_width = 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		date_tm.tm_mday = 2 + day;</div><div class='del'>-		date_tm.tm_wday = day;</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%A", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_weekday_width) {</div><div class='del'>-			longest_weekday_width = width;</div><div class='del'>-			day_view-&gt;longest_weekday_name = day;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%a", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_abbreviated_weekday_width) {</div><div class='del'>-			longest_abbreviated_weekday_width = width;</div><div class='del'>-			day_view-&gt;longest_abbreviated_weekday_name = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Calculate the widths of all the time strings necessary. */</div><div class='del'>-	day_view-&gt;max_small_hour_width = 0;</div><div class='del'>-	max_large_hour_width = 0;</div><div class='del'>-	for (hour = 0; hour &lt; 24; hour++) {</div><div class='del'>-		g_snprintf (buffer, sizeof (buffer), "%02i", hour);</div><div class='del'>-		day_view-&gt;small_hour_widths[hour] = gdk_string_width (font, buffer);</div><div class='del'>-		day_view-&gt;max_small_hour_width = MAX (day_view-&gt;max_small_hour_width, day_view-&gt;small_hour_widths[hour]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	max_minute_width = 0;</div><div class='del'>-	for (minute = 0, i = 0; minute &lt; 60; minute += 5, i++) {</div><div class='del'>-		gint minute_width;</div><div class='del'>-</div><div class='del'>-		g_snprintf (buffer, sizeof (buffer), "%02i", minute);</div><div class='del'>-		minute_width = gdk_string_width (font, buffer);</div><div class='del'>-		max_minute_width = MAX (max_minute_width, minute_width);</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;max_minute_width = max_minute_width;</div><div class='del'>-	day_view-&gt;colon_width = gdk_string_width (font, ":");</div><div class='del'>-	day_view-&gt;digit_width = gdk_string_width (font, "0");</div><div class='del'>-</div><div class='del'>-	day_view-&gt;am_string_width = gdk_string_width (font,</div><div class='del'>-						      day_view-&gt;am_string);</div><div class='del'>-	day_view-&gt;pm_string_width = gdk_string_width (font,</div><div class='del'>-						      day_view-&gt;pm_string);</div><div class='del'>-</div><div class='del'>-	/* Calculate the width of the time column. */</div><div class='del'>-	times_width = e_day_view_time_item_get_column_width (E_DAY_VIEW_TIME_ITEM (day_view-&gt;time_canvas_item));</div><div class='del'>-	gtk_widget_set_usize (day_view-&gt;time_canvas, times_width, -1);</div><div class='del'>-</div><div class='del'>-	/* Set the font of all the EText items. */</div><div class='del'>-	e_day_view_foreach_event (day_view, e_day_view_set_event_font_cb,</div><div class='del'>-				  font);</div><div class='del'>-</div><div class='del'>-	/* Set the fonts for the text items used when dragging. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_item,</div><div class='del'>-			       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-			       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_set_event_font_cb		(EDayView	*day_view,</div><div class='del'>-					 gint		 day,</div><div class='del'>-					 gint		 event_num,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	GdkFont *font = data;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;canvas_item)</div><div class='del'>-		gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-				       "font_gdk", font,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the sizes of each column. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint day, scroll_y;</div><div class='del'>-	gboolean need_reshape;</div><div class='del'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_size_allocate\n");</div><div class='del'>-#endif</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	(*GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	e_day_view_recalc_cell_sizes (day_view);</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the top canvas to its allocated size. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view-&gt;top_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = day_view-&gt;top_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = day_view-&gt;top_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view-&gt;top_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-	need_reshape = e_day_view_update_scroll_regions (day_view);</div><div class='del'>-</div><div class='del'>-	/* Scroll to the start of the working day, if this is the initial</div><div class='del'>-	   allocation. */</div><div class='del'>-	if (day_view-&gt;scroll_to_work_day) {</div><div class='del'>-		scroll_y = e_day_view_convert_time_to_position (day_view, day_view-&gt;work_day_start_hour, day_view-&gt;work_day_start_minute);</div><div class='del'>-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-					0, scroll_y);</div><div class='del'>-		day_view-&gt;scroll_to_work_day = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Flag that we need to reshape the events. Note that changes in height</div><div class='del'>-	   don't matter, since the rows are always the same height. */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		day_view-&gt;long_events_need_reshape = TRUE;</div><div class='del'>-		for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++)</div><div class='del'>-			day_view-&gt;need_reshape[day] = TRUE;</div><div class='del'>-</div><div class='del'>-		e_day_view_check_layout (day_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_cell_sizes	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	/* An array of dates, one for each month in the year 2000. They must</div><div class='del'>-	   all be Sundays. */</div><div class='del'>-	static const int days[12] = { 23, 20, 19, 23, 21, 18,</div><div class='del'>-				      23, 20, 17, 22, 19, 24 };</div><div class='del'>-	gfloat width, offset;</div><div class='del'>-	gint day, max_width;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	char buffer[128];</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (((GtkWidget*)day_view)-&gt;style != NULL);</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Calculate the column sizes, using floating point so that pixels</div><div class='del'>-	   get divided evenly. Note that we use one more element than the</div><div class='del'>-	   number of columns, to make it easy to get the column widths. */</div><div class='del'>-	width = day_view-&gt;main_canvas-&gt;allocation.width;</div><div class='del'>-	width /= day_view-&gt;days_shown;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (day = 0; day &lt;= day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_view-&gt;day_offsets[day] = floor (offset + 0.5);</div><div class='del'>-		offset += width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the days widths based on the offsets. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_view-&gt;day_widths[day] = day_view-&gt;day_offsets[day + 1] - day_view-&gt;day_offsets[day];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Determine which date format to use, based on the column widths.</div><div class='del'>-	   We want to check the widths using the longest full or abbreviated</div><div class='del'>-	   month name and the longest full or abbreviated weekday name, as</div><div class='del'>-	   appropriate. */</div><div class='del'>-	max_width = day_view-&gt;day_widths[0];</div><div class='del'>-</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-</div><div class='del'>-	/* Try "Thursday 21 January". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_month_name;</div><div class='del'>-	date_tm.tm_mday = days[date_tm.tm_mon]</div><div class='del'>-		+ day_view-&gt;longest_weekday_name;</div><div class='del'>-	date_tm.tm_wday = day_view-&gt;longest_weekday_name;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %A = full weekday name, %d = day of month,</div><div class='del'>-	   %B = full month name. Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%A %d %B"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width) {</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_FULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try "Thu 21 Jan". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_abbreviated_month_name;</div><div class='del'>-	date_tm.tm_mday = days[date_tm.tm_mon]</div><div class='del'>-		+ day_view-&gt;longest_abbreviated_weekday_name;</div><div class='del'>-	date_tm.tm_wday = day_view-&gt;longest_abbreviated_weekday_name;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %a = abbreviated weekday name, %d = day of month,</div><div class='del'>-	   %b = abbreviated month name. Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%a %d %b"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width) {</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_ABBREVIATED;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try "23 Jan". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_abbreviated_month_name;</div><div class='del'>-	date_tm.tm_mday = 23;</div><div class='del'>-	date_tm.tm_wday = 0;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %d = day of month, %b = abbreviated month name.</div><div class='del'>-	   Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%d %b"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width)</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;</div><div class='del'>-	else</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_SHORT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_WIDGET_REALIZED (day_view-&gt;main_canvas));</div><div class='del'>-	if (E_CANVAS (day_view-&gt;main_canvas)-&gt;ic)</div><div class='del'>-		gdk_im_begin (E_CANVAS (day_view-&gt;main_canvas)-&gt;ic,</div><div class='del'>-			      GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;bin_window);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_WIDGET_REALIZED (day_view-&gt;main_canvas));</div><div class='del'>-	if (E_CANVAS (day_view-&gt;main_canvas)-&gt;ic)</div><div class='del'>-		gdk_im_end ();</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_calendar		(EDayView	*day_view,</div><div class='del'>-				 GnomeCalendar	*calendar)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	day_view-&gt;calendar = calendar;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is updated in the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_updated_cb (CalQuery *query, const char *uid,</div><div class='del'>-		      gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-		      gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* If our time hasn't been set yet, just return. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the event from the server. */</div><div class='del'>-	status = cal_client_get_object (day_view-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("query_obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event already exists and the dates didn't change, we can</div><div class='del'>-	   update the event fairly easily without changing the events arrays</div><div class='del'>-	   or computing a new layout. */</div><div class='del'>-	if (e_day_view_find_event_from_uid (day_view, uid, &amp;day, &amp;event_num)) {</div><div class='del'>-		if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-		else</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		if (!cal_component_has_recurrences (comp)</div><div class='del'>-		    &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)</div><div class='del'>-		    &amp;&amp; cal_component_event_dates_match (comp, event-&gt;comp)) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("updated object's dates unchanged\n");</div><div class='del'>-#endif</div><div class='del'>-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, comp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-			gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The dates have changed, so we need to remove the</div><div class='del'>-		   old occurrrences before adding the new ones. */</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("dates changed - removing occurrences\n");</div><div class='del'>-#endif</div><div class='del'>-		e_day_view_foreach_event_with_uid (day_view, uid,</div><div class='del'>-						   e_day_view_remove_event_cb,</div><div class='del'>-						   NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add the occurrences of the event. */</div><div class='del'>-	cal_recur_generate_instances (comp, day_view-&gt;lower,</div><div class='del'>-				      day_view-&gt;upper,</div><div class='del'>-				      e_day_view_add_event, day_view,</div><div class='del'>-				      cal_client_resolve_tzid_cb, day_view-&gt;client,</div><div class='del'>-				      day_view-&gt;zone);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	e_day_view_queue_layout (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is removed from the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_removed_cb (CalQuery *query, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	e_day_view_foreach_event_with_uid (day_view, uid,</div><div class='del'>-					   e_day_view_remove_event_cb, NULL);</div><div class='del'>-</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a query ends */</div><div class='del'>-static void</div><div class='del'>-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, NULL);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_QUERY_DONE_SUCCESS)</div><div class='del'>-		fprintf (stderr, "query done: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an evaluation error occurs when running a query */</div><div class='del'>-static void</div><div class='del'>-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, NULL);</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "eval error: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Builds a complete query sexp for the day view by adding the predicates to</div><div class='del'>- * filter only for VEVENTS that fit in the day view's time range.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-adjust_query_sexp (EDayView *day_view, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	char *start, *end;</div><div class='del'>-	char *new_sexp;</div><div class='del'>-</div><div class='del'>-	/* If the dates have not been set yet, we just want an empty query. */</div><div class='del'>-	if (day_view-&gt;lower == 0 || day_view-&gt;upper == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	start = isodate_from_time_t (day_view-&gt;lower);</div><div class='del'>-	end = isodate_from_time_t (day_view-&gt;upper);</div><div class='del'>-</div><div class='del'>-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"</div><div class='del'>-				    "     (occur-in-time-range? (make-time \"%s\")"</div><div class='del'>-				    "                           (make-time \"%s\"))"</div><div class='del'>-				    "     %s)",</div><div class='del'>-				    start, end,</div><div class='del'>-				    sexp);</div><div class='del'>-</div><div class='del'>-	g_free (start);</div><div class='del'>-	g_free (end);</div><div class='del'>-</div><div class='del'>-	return new_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Restarts a query for the day view */</div><div class='del'>-static void</div><div class='del'>-update_query (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	CalQuery *old_query;</div><div class='del'>-	char *real_sexp;</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_editing_event (day_view);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	e_day_view_free_events (day_view);</div><div class='del'>-	e_day_view_queue_layout (day_view);</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;client</div><div class='del'>-	      &amp;&amp; cal_client_get_load_state (day_view-&gt;client) == CAL_CLIENT_LOAD_LOADED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	old_query = day_view-&gt;query;</div><div class='del'>-	day_view-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	if (old_query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (old_query));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (day_view-&gt;sexp != NULL);</div><div class='del'>-</div><div class='del'>-	real_sexp = adjust_query_sexp (day_view, day_view-&gt;sexp);</div><div class='del'>-	if (!real_sexp)</div><div class='del'>-		return; /* No time range is set, so don't start a query */</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, _("Searching"));</div><div class='del'>-	day_view-&gt;query = cal_client_get_query (day_view-&gt;client, real_sexp);</div><div class='del'>-	g_free (real_sexp);</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;query) {</div><div class='del'>-		g_message ("update_query(): Could not create the query");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;query), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;query), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;query), "query_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_query_done_cb), day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;query), "eval_error",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_eval_error_cb), day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client finishes opening */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_OPEN_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	update_query (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_day_view_set_cal_client:</div><div class='del'>- * @day_view: A day view.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a day view will monitor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_day_view_set_cal_client	(EDayView	*day_view,</div><div class='del'>-				 CalClient	*client)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (client == day_view-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view-&gt;client), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		if (cal_client_get_load_state (day_view-&gt;client) == CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-			update_query (day_view);</div><div class='del'>-		else</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (day_view-&gt;client), "cal_opened",</div><div class='del'>-					    GTK_SIGNAL_FUNC (cal_opened_cb), day_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_day_view_set_query:</div><div class='del'>- * @day_view: A day view.</div><div class='del'>- * @sexp: S-expression that defines the query.</div><div class='del'>- * </div><div class='del'>- * Sets the query sexp that the day view will use for filtering the displayed</div><div class='del'>- * events.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_day_view_set_query (EDayView *day_view, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-	g_return_if_fail (sexp != NULL);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;sexp)</div><div class='del'>-		g_free (day_view-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;sexp = g_strdup (sexp);</div><div class='del'>-</div><div class='del'>-	update_query (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_day_view_set_default_category:</div><div class='del'>- * @day_view: A day view.</div><div class='del'>- * @category: Default category name or NULL for no category.</div><div class='del'>- * </div><div class='del'>- * Sets the default category that will be used when creating new calendar</div><div class='del'>- * components from the day view.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_day_view_set_default_category (EDayView *day_view, const char *category)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;default_category)</div><div class='del'>-		g_free (day_view-&gt;default_category);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;default_category = g_strdup (category);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_update_event_cb (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint event_num,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = data;</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	event-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		e_day_view_update_long_event_label (day_view, event_num);</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-	} else {</div><div class='del'>-		e_day_view_update_event_label (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This calls a given function for each event instance (in both views).</div><div class='del'>-   If the callback returns FALSE the iteration is stopped.</div><div class='del'>-   Note that it is safe for the callback to remove the event (since we</div><div class='del'>-   step backwards through the arrays). */</div><div class='del'>-static void</div><div class='del'>-e_day_view_foreach_event		(EDayView	*day_view,</div><div class='del'>-					 EDayViewForeachEventCallback callback,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = day_view-&gt;events[day]-&gt;len - 1;</div><div class='del'>-		     event_num &gt;= 0;</div><div class='del'>-		     event_num--) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			if (!(*callback) (day_view, day, event_num, data))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = day_view-&gt;long_events-&gt;len - 1;</div><div class='del'>-	     event_num &gt;= 0;</div><div class='del'>-	     event_num--) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT, event_num,</div><div class='del'>-				  data))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This calls a given function for each event instance that matches the given</div><div class='del'>-   uid. If the callback returns FALSE the iteration is stopped.</div><div class='del'>-   Note that it is safe for the callback to remove the event (since we</div><div class='del'>-   step backwards through the arrays). */</div><div class='del'>-static void</div><div class='del'>-e_day_view_foreach_event_with_uid (EDayView *day_view,</div><div class='del'>-				   const gchar *uid,</div><div class='del'>-				   EDayViewForeachEventCallback callback,</div><div class='del'>-				   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	const char *u;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = day_view-&gt;events[day]-&gt;len - 1;</div><div class='del'>-		     event_num &gt;= 0;</div><div class='del'>-		     event_num--) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-			if (uid &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-				if (!(*callback) (day_view, day, event_num,</div><div class='del'>-						  data))</div><div class='del'>-					return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = day_view-&gt;long_events-&gt;len - 1;</div><div class='del'>-	     event_num &gt;= 0;</div><div class='del'>-	     event_num--) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT,</div><div class='del'>-					  event_num, data))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_remove_event_cb (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint event_num,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_remove_event_cb day:%i event_num:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	/* If we were editing this event, set editing_event_day to -1 so</div><div class='del'>-	   on_editing_stopped doesn't try to update the event. */</div><div class='del'>-	if (day_view-&gt;editing_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num)</div><div class='del'>-		day_view-&gt;editing_event_day = -1;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;canvas_item)</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		g_array_remove_index (day_view-&gt;long_events, event_num);</div><div class='del'>-		day_view-&gt;long_events_need_layout = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		g_array_remove_index (day_view-&gt;events[day], event_num);</div><div class='del'>-		day_view-&gt;need_layout[day] = TRUE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the text shown for an event. If the event start or end do not</div><div class='del'>-   lie on a row boundary, the time is displayed before the summary. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_event_label (EDayView *day_view,</div><div class='del'>-			       gint day,</div><div class='del'>-			       gint event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	char *text, *start_suffix, *end_suffix;</div><div class='del'>-	gboolean free_text = FALSE, editing_event = FALSE;</div><div class='del'>-	gint offset;</div><div class='del'>-	gint start_hour, start_display_hour, start_minute, start_suffix_width;</div><div class='del'>-	gint end_hour, end_display_hour, end_minute, end_suffix_width;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event isn't visible just return. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	text = summary.value ? (char*) summary.value : "";</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num)</div><div class='del'>-		editing_event = TRUE;</div><div class='del'>-</div><div class='del'>-	if (!editing_event</div><div class='del'>-	    &amp;&amp; (event-&gt;start_minute % day_view-&gt;mins_per_row != 0</div><div class='del'>-		|| (day_view-&gt;show_event_end_times</div><div class='del'>-		    &amp;&amp; event-&gt;end_minute % day_view-&gt;mins_per_row != 0))) {</div><div class='del'>-		offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-			+ day_view-&gt;first_minute_shown;</div><div class='del'>-		start_minute = offset + event-&gt;start_minute;</div><div class='del'>-		end_minute = offset + event-&gt;end_minute;</div><div class='del'>-</div><div class='del'>-		start_hour = start_minute / 60;</div><div class='del'>-		start_minute = start_minute % 60;</div><div class='del'>-</div><div class='del'>-		end_hour = end_minute / 60;</div><div class='del'>-		end_minute = end_minute % 60;</div><div class='del'>-</div><div class='del'>-		e_day_view_convert_time_to_display (day_view, start_hour,</div><div class='del'>-						    &amp;start_display_hour,</div><div class='del'>-						    &amp;start_suffix,</div><div class='del'>-						    &amp;start_suffix_width);</div><div class='del'>-		e_day_view_convert_time_to_display (day_view, end_hour,</div><div class='del'>-						    &amp;end_display_hour,</div><div class='del'>-						    &amp;end_suffix,</div><div class='del'>-						    &amp;end_suffix_width);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;use_24_hour_format) {</div><div class='del'>-			if (day_view-&gt;show_event_end_times) {</div><div class='del'>-				/* 24 hour format with end time. */</div><div class='del'>-				text = g_strdup_printf</div><div class='del'>-					("%2i:%02i-%2i:%02i %s",</div><div class='del'>-					 start_display_hour, start_minute,</div><div class='del'>-					 end_display_hour, end_minute,</div><div class='del'>-					 text);</div><div class='del'>-			} else {</div><div class='del'>-				/* 24 hour format without end time. */</div><div class='del'>-				text = g_strdup_printf</div><div class='del'>-					("%2i:%02i %s",</div><div class='del'>-					 start_display_hour, start_minute,</div><div class='del'>-					 text);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (day_view-&gt;show_event_end_times) {</div><div class='del'>-				/* 12 hour format with end time. */</div><div class='del'>-				text = g_strdup_printf</div><div class='del'>-					("%2i:%02i%s-%2i:%02i%s %s",</div><div class='del'>-					 start_display_hour, start_minute,</div><div class='del'>-					 start_suffix,</div><div class='del'>-					 end_display_hour, end_minute,</div><div class='del'>-					 end_suffix,</div><div class='del'>-					 text);</div><div class='del'>-			} else {</div><div class='del'>-				/* 12 hour format without end time. */</div><div class='del'>-				text = g_strdup_printf</div><div class='del'>-					("%2i:%02i%s %s",</div><div class='del'>-					 start_display_hour, start_minute,</div><div class='del'>-					 start_suffix,</div><div class='del'>-					 text);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		free_text = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "text", text,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	if (free_text)</div><div class='del'>-		g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_long_event_label (EDayView *day_view,</div><div class='del'>-				    gint      event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event isn't visible just return. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "text", summary.value ? summary.value : "",</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the day and index of the event with the given canvas item.</div><div class='del'>-   If is is a long event, -1 is returned as the day.</div><div class='del'>-   Returns TRUE if the event was found. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_find_event_from_item (EDayView *day_view,</div><div class='del'>-				 GnomeCanvasItem *item,</div><div class='del'>-				 gint *day_return,</div><div class='del'>-				 gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-		     event_num++) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-			if (event-&gt;canvas_item == item) {</div><div class='del'>-				*day_return = day;</div><div class='del'>-				*event_num_return = event_num;</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-		if (event-&gt;canvas_item == item) {</div><div class='del'>-			*day_return = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the day and index of the event with the given uid.</div><div class='del'>-   If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.</div><div class='del'>-   Returns TRUE if an event with the uid was found.</div><div class='del'>-   Note that for recurring events there may be several EDayViewEvents, one</div><div class='del'>-   for each instance, all with the same iCalObject and uid. So only use this</div><div class='del'>-   function if you know the event doesn't recur or you are just checking to</div><div class='del'>-   see if any events with the uid exist. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_find_event_from_uid (EDayView *day_view,</div><div class='del'>-				const gchar *uid,</div><div class='del'>-				gint *day_return,</div><div class='del'>-				gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	const char *u;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-		     event_num++) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-			if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-				*day_return = day;</div><div class='del'>-				*event_num_return = event_num;</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			*day_return = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the selected time range. The EDayView will show the day or week</div><div class='del'>-   corresponding to the start time. If the start_time &amp; end_time are not equal</div><div class='del'>-   and are both visible in the view, then the selection is set to those times,</div><div class='del'>-   otherwise it is set to 1 hour from the start of the working day. */</div><div class='del'>-void</div><div class='del'>-e_day_view_set_selected_time_range	(EDayView	*day_view,</div><div class='del'>-					 time_t		 start_time,</div><div class='del'>-					 time_t		 end_time)</div><div class='del'>-{</div><div class='del'>-	time_t lower;</div><div class='del'>-	gint start_row, start_col, end_row, end_col;</div><div class='del'>-	gboolean need_redraw = FALSE, start_in_grid, end_in_grid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	/* Calculate the first day that should be shown, based on start_time</div><div class='del'>-	   and the days_shown setting. If we are showing 1 day it is just the</div><div class='del'>-	   start of the day given by start_time, otherwise it is the previous</div><div class='del'>-	   work-week start day. */</div><div class='del'>-	if (!day_view-&gt;work_week_view) {</div><div class='del'>-		lower = time_day_begin_with_zone (start_time, day_view-&gt;zone);</div><div class='del'>-	} else {</div><div class='del'>-		lower = e_day_view_find_work_week_start (day_view, start_time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if we need to change the days shown. */</div><div class='del'>-	if (lower != day_view-&gt;lower) {</div><div class='del'>-		e_day_view_recalc_day_starts (day_view, lower);</div><div class='del'>-		update_query (day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the selection. */</div><div class='del'>-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,</div><div class='del'>-								  start_time,</div><div class='del'>-								  &amp;start_col,</div><div class='del'>-								  &amp;start_row);</div><div class='del'>-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,</div><div class='del'>-								end_time - 60,</div><div class='del'>-								&amp;end_col,</div><div class='del'>-								&amp;end_row);</div><div class='del'>-</div><div class='del'>-	/* If either of the times isn't in the grid, or the selection covers</div><div class='del'>-	   an entire day, we set the selection to 1 row from the start of the</div><div class='del'>-	   working day, in the day corresponding to the start time. */</div><div class='del'>-	if (!start_in_grid || !end_in_grid</div><div class='del'>-	    || (start_row == 0 &amp;&amp; end_row == day_view-&gt;rows - 1)) {</div><div class='del'>-		end_col = start_col;</div><div class='del'>-</div><div class='del'>-		start_row = e_day_view_convert_time_to_row (day_view, day_view-&gt;work_day_start_hour, day_view-&gt;work_day_start_minute);</div><div class='del'>-		start_row = CLAMP (start_row, 0, day_view-&gt;rows - 1);</div><div class='del'>-		end_row = start_row;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_row != day_view-&gt;selection_start_row</div><div class='del'>-	    || start_col != day_view-&gt;selection_start_day) {</div><div class='del'>-		need_redraw = TRUE;</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_start_row = start_row;</div><div class='del'>-		day_view-&gt;selection_start_day = start_col;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (end_row != day_view-&gt;selection_end_row</div><div class='del'>-	    || end_col != day_view-&gt;selection_end_day) {</div><div class='del'>-		need_redraw = TRUE;</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_end_row = end_row;</div><div class='del'>-		day_view-&gt;selection_end_day = end_col;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (need_redraw) {</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the start of the working week which includes the given time. */</div><div class='del'>-static time_t</div><div class='del'>-e_day_view_find_work_week_start		(EDayView	*day_view,</div><div class='del'>-					 time_t		 start_time)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	gint weekday, day, i, offset;</div><div class='del'>-	struct icaltimetype tt = icaltime_null_time ();</div><div class='del'>-</div><div class='del'>-	time_to_gdate_with_zone (&amp;date, start_time, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	/* The start of the work-week is the first working day after the</div><div class='del'>-	   week start day. */</div><div class='del'>-</div><div class='del'>-	/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */</div><div class='del'>-	weekday = g_date_weekday (&amp;date) % 7;</div><div class='del'>-</div><div class='del'>-	/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).</div><div class='del'>-	   It will automatically default to the week start day if no days</div><div class='del'>-	   are set as working days. */</div><div class='del'>-	day = (day_view-&gt;week_start_day + 1) % 7;</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		if (day_view-&gt;working_days &amp; (1 &lt;&lt; day))</div><div class='del'>-			break;</div><div class='del'>-		day = (day + 1) % 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate how many days we need to go back to the first workday. */</div><div class='del'>-	offset = (weekday + 7 - day) % 7;</div><div class='del'>-</div><div class='del'>-	g_date_subtract_days (&amp;date, offset);</div><div class='del'>-</div><div class='del'>-	tt.year = g_date_year (&amp;date);</div><div class='del'>-	tt.month = g_date_month (&amp;date);</div><div class='del'>-	tt.day = g_date_day (&amp;date);</div><div class='del'>-</div><div class='del'>-	return icaltime_as_timet_with_zone (tt, day_view-&gt;zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range. */</div><div class='del'>-void</div><div class='del'>-e_day_view_get_selected_time_range	(EDayView	*day_view,</div><div class='del'>-					 time_t		*start_time,</div><div class='del'>-					 time_t		*end_time)</div><div class='del'>-{</div><div class='del'>-	gint start_col, start_row, end_col, end_row;</div><div class='del'>-	time_t start, end;</div><div class='del'>-</div><div class='del'>-	start_col = day_view-&gt;selection_start_day;</div><div class='del'>-	start_row = day_view-&gt;selection_start_row;</div><div class='del'>-	end_col = day_view-&gt;selection_end_day;</div><div class='del'>-	end_row = day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	if (start_col == -1) {</div><div class='del'>-		start_col = 0;</div><div class='del'>-		start_row = 0;</div><div class='del'>-		end_col = 0;</div><div class='del'>-		end_row = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check if the selection is only in the top canvas, in which case</div><div class='del'>-	   we can simply use the day_starts array. */</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		start = day_view-&gt;day_starts[start_col];</div><div class='del'>-		end = day_view-&gt;day_starts[end_col + 1];</div><div class='del'>-	} else {</div><div class='del'>-		/* Convert the start col + row into a time. */</div><div class='del'>-		start = e_day_view_convert_grid_position_to_time (day_view, start_col, start_row);</div><div class='del'>-		end = e_day_view_convert_grid_position_to_time (day_view, end_col, end_row + 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_time)</div><div class='del'>-		*start_time = start;</div><div class='del'>-</div><div class='del'>-	if (end_time)</div><div class='del'>-		*end_time = end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_day_starts (EDayView *day_view,</div><div class='del'>-			      time_t start_time)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;day_starts[0] = start_time;</div><div class='del'>-	for (day = 1; day &lt;= day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_view-&gt;day_starts[day] = time_add_day_with_zone (day_view-&gt;day_starts[day - 1], 1, day_view-&gt;zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	for (day = 0; day &lt;= day_view-&gt;days_shown; day++)</div><div class='del'>-		g_print ("Day Starts %i: %s", day, ctime (&amp;day_view-&gt;day_starts[day]));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	day_view-&gt;lower = start_time;</div><div class='del'>-	day_view-&gt;upper = day_view-&gt;day_starts[day_view-&gt;days_shown];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we are displaying a work-week, in which case the display always</div><div class='del'>-   starts on the first day of the working week. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_work_week_view	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;work_week_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_work_week_view	(EDayView	*day_view,</div><div class='del'>-				 gboolean	 work_week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;work_week_view == work_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_week_view = work_week_view;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;work_week_view)</div><div class='del'>-		e_day_view_recalc_work_week (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_days_shown	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;days_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_days_shown	(EDayView	*day_view,</div><div class='del'>-				 gint		 days_shown)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-	g_return_if_fail (days_shown &gt;= 1);</div><div class='del'>-	g_return_if_fail (days_shown &lt;= E_DAY_VIEW_MAX_DAYS);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;days_shown == days_shown)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;days_shown = days_shown;</div><div class='del'>-</div><div class='del'>-	/* If the date isn't set, just return. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_day_view_recalc_day_starts (day_view, day_view-&gt;lower);</div><div class='del'>-	e_day_view_recalc_cell_sizes (day_view);</div><div class='del'>-</div><div class='del'>-	update_query (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_mins_per_row	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;mins_per_row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_mins_per_row	(EDayView	*day_view,</div><div class='del'>-				 gint		 mins_per_row)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (mins_per_row != 5 &amp;&amp; mins_per_row != 10 &amp;&amp; mins_per_row != 15</div><div class='del'>-	    &amp;&amp; mins_per_row != 30 &amp;&amp; mins_per_row != 60) {</div><div class='del'>-		g_warning ("Invalid minutes per row setting");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;mins_per_row == mins_per_row)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;mins_per_row = mins_per_row;</div><div class='del'>-	e_day_view_recalc_num_rows (day_view);</div><div class='del'>-</div><div class='del'>-	/* If we aren't visible, we'll sort it out later. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (day_view))</div><div class='del'>-	    return;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++)</div><div class='del'>-		day_view-&gt;need_layout[day] = TRUE;</div><div class='del'>-</div><div class='del'>-	/* We need to update all the day event labels since the start &amp; end</div><div class='del'>-	   times may or may not be on row boundaries any more. */</div><div class='del'>-	e_day_view_foreach_event (day_view,</div><div class='del'>-				  e_day_view_set_show_times_cb, NULL);</div><div class='del'>-</div><div class='del'>-	/* We must layout the events before updating the scroll region, since</div><div class='del'>-	   that will result in a redraw which would crash otherwise. */</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;time_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_scroll_regions (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This specifies the working days in the week. The value is a bitwise</div><div class='del'>-   combination of day flags. Defaults to Mon-Fri. */</div><div class='del'>-EDayViewDays</div><div class='del'>-e_day_view_get_working_days	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;working_days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_working_days	(EDayView	*day_view,</div><div class='del'>-				 EDayViewDays	 days)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;working_days == days)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;working_days = days;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;work_week_view)</div><div class='del'>-		e_day_view_recalc_work_week (day_view);</div><div class='del'>-</div><div class='del'>-	/* We have to do this, as the new working days may have no effect on</div><div class='del'>-	   the days shown, but we still want the background color to change. */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	gint first_day, last_day, i, days_shown;</div><div class='del'>-	gboolean has_working_days = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */</div><div class='del'>-	first_day = (day_view-&gt;week_start_day + 1) % 7;</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		if (day_view-&gt;working_days &amp; (1 &lt;&lt; first_day)) {</div><div class='del'>-			has_working_days = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		first_day = (first_day + 1) % 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (has_working_days) {</div><div class='del'>-		/* Now find the last working day of the week, backwards. */</div><div class='del'>-		last_day = day_view-&gt;week_start_day % 7;</div><div class='del'>-		for (i = 0; i &lt; 7; i++) {</div><div class='del'>-			if (day_view-&gt;working_days &amp; (1 &lt;&lt; last_day))</div><div class='del'>-				break;</div><div class='del'>-			last_day = (last_day + 6) % 7;</div><div class='del'>-		}</div><div class='del'>-		/* Now calculate the days we need to show to include all the</div><div class='del'>-		   working days in the week. Add 1 to make it inclusive. */</div><div class='del'>-		days_shown = (last_day + 7 - first_day) % 7 + 1;</div><div class='del'>-	} else {</div><div class='del'>-		/* If no working days are set, just use 7. */</div><div class='del'>-		days_shown = 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_set_days_shown (day_view, days_shown);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The start and end time of the working day. This only affects the background</div><div class='del'>-   colors. */</div><div class='del'>-void</div><div class='del'>-e_day_view_get_working_day		(EDayView	*day_view,</div><div class='del'>-					 gint		*start_hour,</div><div class='del'>-					 gint		*start_minute,</div><div class='del'>-					 gint		*end_hour,</div><div class='del'>-					 gint		*end_minute)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	*start_hour = day_view-&gt;work_day_start_hour;</div><div class='del'>-	*start_minute = day_view-&gt;work_day_start_minute;</div><div class='del'>-	*end_hour = day_view-&gt;work_day_end_hour;</div><div class='del'>-	*end_minute = day_view-&gt;work_day_end_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_working_day		(EDayView	*day_view,</div><div class='del'>-					 gint		 start_hour,</div><div class='del'>-					 gint		 start_minute,</div><div class='del'>-					 gint		 end_hour,</div><div class='del'>-					 gint		 end_minute)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_day_start_hour = start_hour;</div><div class='del'>-	day_view-&gt;work_day_start_minute = start_minute;</div><div class='del'>-	day_view-&gt;work_day_end_hour = end_hour;</div><div class='del'>-	day_view-&gt;work_day_end_minute = end_minute;</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_24_hour_format	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_24_hour_format	(EDayView	*day_view,</div><div class='del'>-				 gboolean	 use_24_hour)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;use_24_hour_format == use_24_hour)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-</div><div class='del'>-	/* We need to update all the text in the events since they may contain</div><div class='del'>-	   the time in the old format. */</div><div class='del'>-	e_day_view_foreach_event (day_view, e_day_view_set_show_times_cb,</div><div class='del'>-				  NULL);</div><div class='del'>-</div><div class='del'>-	/* FIXME: We need to re-layout the top canvas since the time</div><div class='del'>-	   format affects the sizes. */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;time_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we display event end times in the main canvas. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_show_event_end_times	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), TRUE);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;show_event_end_times;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_show_event_end_times	(EDayView	*day_view,</div><div class='del'>-					 gboolean	 show)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;show_event_end_times != show) {</div><div class='del'>-		day_view-&gt;show_event_end_times = show;</div><div class='del'>-		e_day_view_foreach_event (day_view,</div><div class='del'>-					  e_day_view_set_show_times_cb, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone*</div><div class='del'>-e_day_view_get_timezone			(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_timezone			(EDayView	*day_view,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *old_zone;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	time_t lower;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	old_zone = day_view-&gt;zone;</div><div class='del'>-	if (old_zone == zone)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;zone = zone;</div><div class='del'>-</div><div class='del'>-	/* If our time hasn't been set yet, just return. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Recalculate the new start of the first day. We just use exactly</div><div class='del'>-	   the same time, but with the new timezone. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (day_view-&gt;lower, FALSE,</div><div class='del'>-					    old_zone);</div><div class='del'>-</div><div class='del'>-	lower = icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-</div><div class='del'>-	e_day_view_recalc_day_starts (day_view, lower);</div><div class='del'>-	update_query (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is a callback used to update all day event labels. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_set_show_times_cb		(EDayView	*day_view,</div><div class='del'>-					 gint		 day,</div><div class='del'>-					 gint		 event_num,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	if (day != E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		e_day_view_update_event_label (day_view, day, event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_week_start_day	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_week_start_day	(EDayView	*day_view,</div><div class='del'>-				 gint		 week_start_day)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-	g_return_if_fail (week_start_day &gt;= 0);</div><div class='del'>-	g_return_if_fail (week_start_day &lt; 7);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;week_start_day == week_start_day)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;week_start_day = week_start_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;work_week_view)</div><div class='del'>-		e_day_view_recalc_work_week (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EDayViewEvent *</div><div class='del'>-get_current_event (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), NULL);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;editing_event_num);</div><div class='del'>-	else</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;events[day_view-&gt;editing_event_day],</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;editing_event_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_cut_clipboard (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	event = get_current_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, _("Deleting selected objects"));</div><div class='del'>-</div><div class='del'>-	e_day_view_copy_clipboard (day_view);</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-	cal_client_remove_object (day_view-&gt;client, uid);</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_copy_clipboard (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	char *comp_str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	event = get_current_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	comp_str = cal_component_get_as_string (event-&gt;comp);</div><div class='del'>-	if (day_view-&gt;clipboard_selection != NULL)</div><div class='del'>-		g_free (day_view-&gt;clipboard_selection);</div><div class='del'>-	day_view-&gt;clipboard_selection = comp_str;</div><div class='del'>-	gtk_selection_owner_set (day_view-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_paste_clipboard (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	gtk_selection_convert (day_view-&gt;invisible,</div><div class='del'>-			       clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_work_week	(EDayView	*day_view)</div><div class='del'>-{		</div><div class='del'>-	time_t lower;</div><div class='del'>-</div><div class='del'>-	/* If we aren't showing the work week, just return. */</div><div class='del'>-	if (!day_view-&gt;work_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_day_view_recalc_work_week_days_shown	(day_view);</div><div class='del'>-	</div><div class='del'>-	/* If the date isn't set, just return. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	lower = e_day_view_find_work_week_start (day_view, day_view-&gt;lower);</div><div class='del'>-	if (lower != day_view-&gt;lower) {</div><div class='del'>-		/* Reset the selection, as it may disappear. */</div><div class='del'>-		day_view-&gt;selection_start_day = -1;</div><div class='del'>-</div><div class='del'>-		e_day_view_recalc_day_starts (day_view, lower);</div><div class='del'>-		update_query (day_view);</div><div class='del'>-</div><div class='del'>-		/* This updates the date navigator. */</div><div class='del'>-		e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_update_scroll_regions (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-	gboolean need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the time canvas to its allocated width,</div><div class='del'>-	   but with the height the same as the main canvas. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view-&gt;time_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = day_view-&gt;time_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = MAX (day_view-&gt;rows * day_view-&gt;row_height,</div><div class='del'>-		      day_view-&gt;main_canvas-&gt;allocation.height) - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view-&gt;time_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the main canvas to its allocated width,</div><div class='del'>-	   but with the height depending on the number of rows needed. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = day_view-&gt;main_canvas-&gt;allocation.width - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2) {</div><div class='del'>-		need_reshape = TRUE;</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return need_reshape;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the number of rows to display, based on the time range</div><div class='del'>-   shown and the minutes per row. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_num_rows	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	gint hours, minutes, total_minutes;</div><div class='del'>-</div><div class='del'>-	hours = day_view-&gt;last_hour_shown - day_view-&gt;first_hour_shown;</div><div class='del'>-	/* This could be negative but it works out OK. */</div><div class='del'>-	minutes = day_view-&gt;last_minute_shown - day_view-&gt;first_minute_shown;</div><div class='del'>-	total_minutes = hours * 60 + minutes;</div><div class='del'>-	day_view-&gt;rows = total_minutes / day_view-&gt;mins_per_row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts an hour and minute to a row in the canvas. Note that if we aren't</div><div class='del'>-   showing all 24 hours of the day, the returned row may be negative or</div><div class='del'>-   greater than day_view-&gt;rows. */</div><div class='del'>-gint</div><div class='del'>-e_day_view_convert_time_to_row	(EDayView	*day_view,</div><div class='del'>-				 gint		 hour,</div><div class='del'>-				 gint		 minute)</div><div class='del'>-{</div><div class='del'>-	gint total_minutes, start_minute, offset;</div><div class='del'>-</div><div class='del'>-	total_minutes = hour * 60 + minute;</div><div class='del'>-	start_minute = day_view-&gt;first_hour_shown * 60</div><div class='del'>-		+ day_view-&gt;first_minute_shown;</div><div class='del'>-	offset = total_minutes - start_minute;</div><div class='del'>-	if (offset &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return offset / day_view-&gt;mins_per_row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts an hour and minute to a y coordinate in the canvas. */</div><div class='del'>-gint</div><div class='del'>-e_day_view_convert_time_to_position (EDayView	*day_view,</div><div class='del'>-				     gint	 hour,</div><div class='del'>-				     gint	 minute)</div><div class='del'>-{</div><div class='del'>-	gint total_minutes, start_minute, offset;</div><div class='del'>-</div><div class='del'>-	total_minutes = hour * 60 + minute;</div><div class='del'>-	start_minute = day_view-&gt;first_hour_shown * 60</div><div class='del'>-		+ day_view-&gt;first_minute_shown;</div><div class='del'>-	offset = total_minutes - start_minute;</div><div class='del'>-</div><div class='del'>-	return offset * day_view-&gt;row_height / day_view-&gt;mins_per_row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_top_canvas_button_press (GtkWidget *widget,</div><div class='del'>-				       GdkEventButton *event,</div><div class='del'>-				       EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint event_x, event_y, scroll_x, scroll_y, day, event_num;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-</div><div class='del'>-	/* Convert the coords to the main canvas window, or return if the</div><div class='del'>-	   window is not found. */</div><div class='del'>-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,</div><div class='del'>-					      GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-					      &amp;event_x, &amp;event_y))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* The top canvas doesn't scroll, but just in case. */</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	event_x += scroll_x;</div><div class='del'>-	event_y += scroll_y;</div><div class='del'>-</div><div class='del'>-	pos = e_day_view_convert_position_in_top_canvas (day_view,</div><div class='del'>-							 event_x, event_y,</div><div class='del'>-							 &amp;day, &amp;event_num);</div><div class='del'>-</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_OUTSIDE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (pos != E_DAY_VIEW_POS_NONE)</div><div class='del'>-		return e_day_view_on_long_event_button_press (day_view,</div><div class='del'>-							      event_num,</div><div class='del'>-							      event, pos,</div><div class='del'>-							      event_x,</div><div class='del'>-							      event_y);</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_editing_event (day_view);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button == 1) {</div><div class='del'>-		if (event-&gt;type == GDK_2BUTTON_PRESS) {</div><div class='del'>-			time_t dtstart, dtend;</div><div class='del'>-</div><div class='del'>-			e_day_view_get_selected_time_range (day_view, &amp;dtstart,</div><div class='del'>-							    &amp;dtend);</div><div class='del'>-			gnome_calendar_new_appointment_for (day_view-&gt;calendar,</div><div class='del'>-							    dtstart, dtend,</div><div class='del'>-							    TRUE, FALSE);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (gdk_pointer_grab (GTK_LAYOUT (widget)-&gt;bin_window, FALSE,</div><div class='del'>-				      GDK_POINTER_MOTION_MASK</div><div class='del'>-				      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				      FALSE, NULL, event-&gt;time) == 0) {</div><div class='del'>-			e_day_view_start_selection (day_view, day, -1);</div><div class='del'>-		}</div><div class='del'>-	} else if (event-&gt;button == 3) {</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		e_day_view_on_event_right_click (day_view, event, -1, -1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_convert_event_coords (EDayView *day_view,</div><div class='del'>-				 GdkEvent *event,</div><div class='del'>-				 GdkWindow *window,</div><div class='del'>-				 gint *x_return,</div><div class='del'>-				 gint *y_return)</div><div class='del'>-{</div><div class='del'>-	gint event_x, event_y, win_x, win_y;</div><div class='del'>-	GdkWindow *event_window;;</div><div class='del'>-</div><div class='del'>-	/* Get the event window, x &amp; y from the appropriate event struct. */</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		event_x = event-&gt;button.x;</div><div class='del'>-		event_y = event-&gt;button.y;</div><div class='del'>-		event_window = event-&gt;button.window;</div><div class='del'>-		break;</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		event_x = event-&gt;motion.x;</div><div class='del'>-		event_y = event-&gt;motion.y;</div><div class='del'>-		event_window = event-&gt;motion.window;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Shouldn't get here. */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (event_window &amp;&amp; event_window != window</div><div class='del'>-	       &amp;&amp; event_window != GDK_ROOT_PARENT()) {</div><div class='del'>-		gdk_window_get_position (event_window, &amp;win_x, &amp;win_y);</div><div class='del'>-		event_x += win_x;</div><div class='del'>-		event_y += win_y;</div><div class='del'>-		event_window = gdk_window_get_parent (event_window);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*x_return = event_x;</div><div class='del'>-	*y_return = event_y;</div><div class='del'>-</div><div class='del'>-	if (event_window != window)</div><div class='del'>-		g_warning ("Couldn't find event window\n");</div><div class='del'>-</div><div class='del'>-	return (event_window == window) ? TRUE : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_main_canvas_button_press (GtkWidget *widget,</div><div class='del'>-					GdkEventButton *event,</div><div class='del'>-					EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint event_x, event_y, scroll_x, scroll_y, row, day, event_num;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_main_canvas_button_press\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4) {</div><div class='del'>-		/* The wheel has been moved up, so scroll the canvas down. */</div><div class='del'>-		e_day_view_scroll (day_view, E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	if (event-&gt;button == 5) {</div><div class='del'>-		/* The wheel has been moved down, so scroll the canvas up. */</div><div class='del'>-		e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the coords to the main canvas window, or return if the</div><div class='del'>-	   window is not found. */</div><div class='del'>-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,</div><div class='del'>-					      GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-					      &amp;event_x, &amp;event_y))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	event_x += scroll_x;</div><div class='del'>-	event_y += scroll_y;</div><div class='del'>-</div><div class='del'>-	/* Find out where the mouse is. */</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-							  event_x, event_y,</div><div class='del'>-							  &amp;day, &amp;row,</div><div class='del'>-							  &amp;event_num);</div><div class='del'>-</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_OUTSIDE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (pos != E_DAY_VIEW_POS_NONE)</div><div class='del'>-		return e_day_view_on_event_button_press (day_view, day,</div><div class='del'>-							 event_num, event, pos,</div><div class='del'>-							 event_x, event_y);</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_editing_event (day_view);</div><div class='del'>-</div><div class='del'>-	/* Start the selection drag. */</div><div class='del'>-	if (event-&gt;button == 1) {</div><div class='del'>-		if (event-&gt;type == GDK_2BUTTON_PRESS) {</div><div class='del'>-			time_t dtstart, dtend;</div><div class='del'>-</div><div class='del'>-			e_day_view_get_selected_time_range (day_view, &amp;dtstart,</div><div class='del'>-							    &amp;dtend);</div><div class='del'>-			gnome_calendar_new_appointment_for (day_view-&gt;calendar,</div><div class='del'>-							    dtstart, dtend,</div><div class='del'>-							    FALSE, FALSE);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (gdk_pointer_grab (GTK_LAYOUT (widget)-&gt;bin_window, FALSE,</div><div class='del'>-				      GDK_POINTER_MOTION_MASK</div><div class='del'>-				      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				      FALSE, NULL, event-&gt;time) == 0) {</div><div class='del'>-			e_day_view_start_selection (day_view, day, row);</div><div class='del'>-		}</div><div class='del'>-	} else if (event-&gt;button == 3) {</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		e_day_view_on_event_right_click (day_view, event, -1, -1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_time_canvas_button_press (GtkWidget      *widget,</div><div class='del'>-					GdkEventButton *event,</div><div class='del'>-					EDayView       *day_view)</div><div class='del'>-{</div><div class='del'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4 || event-&gt;button == 5) {</div><div class='del'>-		GtkAdjustment *adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-		gfloat new_value;</div><div class='del'>-</div><div class='del'>-		new_value = adj-&gt;value + ((event-&gt;button == 4) ?</div><div class='del'>-					  -adj-&gt;page_increment / 2:</div><div class='del'>-					  adj-&gt;page_increment / 2);</div><div class='del'>-		new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-		gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is destroyed.  Expects the closure data to be</div><div class='del'>- * a pointer to a boolean; will set it to TRUE.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-comp_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *destroyed;</div><div class='del'>-</div><div class='del'>-	destroyed = data;</div><div class='del'>-	*destroyed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_long_event_button_press (EDayView		*day_view,</div><div class='del'>-				       gint		 event_num,</div><div class='del'>-				       GdkEventButton	*event,</div><div class='del'>-				       EDayViewPosition  pos,</div><div class='del'>-				       gint		 event_x,</div><div class='del'>-				       gint		 event_y)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;button == 1) {</div><div class='del'>-		if (event-&gt;type == GDK_BUTTON_PRESS) {</div><div class='del'>-			e_day_view_on_long_event_click (day_view, event_num,</div><div class='del'>-							event, pos,</div><div class='del'>-							event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		} else if (event-&gt;type == GDK_2BUTTON_PRESS) {</div><div class='del'>-			e_day_view_on_event_double_click (day_view, -1,</div><div class='del'>-							  event_num);</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-						      "button_press_event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (event-&gt;button == 3) {</div><div class='del'>-		EDayViewEvent *e;</div><div class='del'>-		gboolean destroyed;</div><div class='del'>-		guint id;</div><div class='del'>-</div><div class='del'>-		e = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent, event_num);</div><div class='del'>-		destroyed = FALSE;</div><div class='del'>-		id = gtk_signal_connect (GTK_OBJECT (e-&gt;comp), "destroy",</div><div class='del'>-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (!destroyed) {</div><div class='del'>-			gtk_signal_disconnect (GTK_OBJECT (e-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-			e_day_view_on_event_right_click (day_view, event,</div><div class='del'>-							 E_DAY_VIEW_LONG_EVENT,</div><div class='del'>-							 event_num);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_event_button_press (EDayView	  *day_view,</div><div class='del'>-				  gint		   day,</div><div class='del'>-				  gint		   event_num,</div><div class='del'>-				  GdkEventButton  *event,</div><div class='del'>-				  EDayViewPosition pos,</div><div class='del'>-				  gint		   event_x,</div><div class='del'>-				  gint		   event_y)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;button == 1) {</div><div class='del'>-		if (event-&gt;type == GDK_BUTTON_PRESS) {</div><div class='del'>-			e_day_view_on_event_click (day_view, day, event_num,</div><div class='del'>-						   event, pos,</div><div class='del'>-						   event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		} else if (event-&gt;type == GDK_2BUTTON_PRESS) {</div><div class='del'>-			e_day_view_on_event_double_click (day_view, day,</div><div class='del'>-							  event_num);</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-						      "button_press_event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (event-&gt;button == 3) {</div><div class='del'>-		EDayViewEvent *e;</div><div class='del'>-		gboolean destroyed;</div><div class='del'>-		guint id;</div><div class='del'>-</div><div class='del'>-		e = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		destroyed = FALSE;</div><div class='del'>-		id = gtk_signal_connect (GTK_OBJECT (e-&gt;comp), "destroy",</div><div class='del'>-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (!destroyed) {</div><div class='del'>-			gtk_signal_disconnect (GTK_OBJECT (e-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-			e_day_view_on_event_right_click (day_view, event,</div><div class='del'>-							 day, event_num);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_long_event_click (EDayView *day_view,</div><div class='del'>-				gint event_num,</div><div class='del'>-				GdkEventButton  *bevent,</div><div class='del'>-				EDayViewPosition pos,</div><div class='del'>-				gint	     event_x,</div><div class='del'>-				gint	     event_y)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint start_day, end_day, day;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* Ignore clicks on the EText while editing. */</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_EVENT</div><div class='del'>-	    &amp;&amp; E_TEXT (event-&gt;canvas_item)-&gt;editing)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-	    &amp;&amp; (pos == E_DAY_VIEW_POS_LEFT_EDGE</div><div class='del'>-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {</div><div class='del'>-		gboolean destroyed;</div><div class='del'>-		guint id;</div><div class='del'>-</div><div class='del'>-		if (!e_day_view_find_long_event_days (event,</div><div class='del'>-						      day_view-&gt;days_shown,</div><div class='del'>-						      day_view-&gt;day_starts,</div><div class='del'>-						      &amp;start_day, &amp;end_day))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		destroyed = FALSE;</div><div class='del'>-		id = gtk_signal_connect (GTK_OBJECT (event-&gt;comp), "destroy",</div><div class='del'>-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-		/* Grab the keyboard focus, so the event being edited is saved</div><div class='del'>-		   and we can use the Escape key to abort the resize. */</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (destroyed)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (event-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-		if (gdk_pointer_grab (GTK_LAYOUT (day_view-&gt;top_canvas)-&gt;bin_window, FALSE,</div><div class='del'>-				      GDK_POINTER_MOTION_MASK</div><div class='del'>-				      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				      FALSE, NULL, bevent-&gt;time) == 0) {</div><div class='del'>-</div><div class='del'>-			day_view-&gt;resize_event_day = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-			day_view-&gt;resize_event_num = event_num;</div><div class='del'>-			day_view-&gt;resize_drag_pos = pos;</div><div class='del'>-			day_view-&gt;resize_start_row = start_day;</div><div class='del'>-			day_view-&gt;resize_end_row = end_day;</div><div class='del'>-</div><div class='del'>-			/* Create the edit rect if necessary. */</div><div class='del'>-			e_day_view_reshape_resize_long_event_rect_item (day_view);</div><div class='del'>-</div><div class='del'>-			/* Make sure the text item is on top. */</div><div class='del'>-			gnome_canvas_item_raise_to_top (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-			/* Raise the event's item, above the rect as well. */</div><div class='del'>-			gnome_canvas_item_raise_to_top (event-&gt;canvas_item);</div><div class='del'>-		}</div><div class='del'>-	} else if (e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-						       &amp;start_day, &amp;end_day,</div><div class='del'>-						       &amp;item_x, &amp;item_y,</div><div class='del'>-						       &amp;item_w, &amp;item_h)) {</div><div class='del'>-		/* Remember the item clicked and the mouse position,</div><div class='del'>-		   so we can start a drag if the mouse moves. */</div><div class='del'>-		day_view-&gt;pressed_event_day = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-		day_view-&gt;pressed_event_num = event_num;</div><div class='del'>-</div><div class='del'>-		day_view-&gt;drag_event_x = event_x;</div><div class='del'>-		day_view-&gt;drag_event_y = event_y;</div><div class='del'>-</div><div class='del'>-		e_day_view_convert_position_in_top_canvas (day_view,</div><div class='del'>-							   event_x, event_y,</div><div class='del'>-							   &amp;day, NULL);</div><div class='del'>-		day_view-&gt;drag_event_offset = day - start_day;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_event_click (EDayView *day_view,</div><div class='del'>-			   gint day,</div><div class='del'>-			   gint event_num,</div><div class='del'>-			   GdkEventButton  *bevent,</div><div class='del'>-			   EDayViewPosition pos,</div><div class='del'>-			   gint		  event_x,</div><div class='del'>-			   gint		  event_y)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint tmp_day, row, start_row;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* Ignore clicks on the EText while editing. */</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_EVENT</div><div class='del'>-	    &amp;&amp; E_TEXT (event-&gt;canvas_item)-&gt;editing)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-	    &amp;&amp; (pos == E_DAY_VIEW_POS_TOP_EDGE</div><div class='del'>-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {</div><div class='del'>-		gboolean destroyed;</div><div class='del'>-		guint id;</div><div class='del'>-</div><div class='del'>-		destroyed = FALSE;</div><div class='del'>-		id = gtk_signal_connect (GTK_OBJECT (event-&gt;comp), "destroy",</div><div class='del'>-					 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-		/* Grab the keyboard focus, so the event being edited is saved</div><div class='del'>-		   and we can use the Escape key to abort the resize. */</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		if (destroyed)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (event-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-		if (gdk_pointer_grab (GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;bin_window, FALSE,</div><div class='del'>-				      GDK_POINTER_MOTION_MASK</div><div class='del'>-				      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				      FALSE, NULL, bevent-&gt;time) == 0) {</div><div class='del'>-</div><div class='del'>-			day_view-&gt;resize_event_day = day;</div><div class='del'>-			day_view-&gt;resize_event_num = event_num;</div><div class='del'>-			day_view-&gt;resize_drag_pos = pos;</div><div class='del'>-			day_view-&gt;resize_start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-			day_view-&gt;resize_end_row = (event-&gt;end_minute - 1) / day_view-&gt;mins_per_row;</div><div class='del'>-			if (day_view-&gt;resize_end_row &lt; day_view-&gt;resize_start_row)</div><div class='del'>-				day_view-&gt;resize_end_row = day_view-&gt;resize_start_row;</div><div class='del'>-</div><div class='del'>-			day_view-&gt;resize_bars_event_day = day;</div><div class='del'>-			day_view-&gt;resize_bars_event_num = event_num;</div><div class='del'>-</div><div class='del'>-			/* Create the edit rect if necessary. */</div><div class='del'>-			e_day_view_reshape_resize_rect_item (day_view);</div><div class='del'>-</div><div class='del'>-			e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-</div><div class='del'>-			/* Make sure the text item is on top. */</div><div class='del'>-			gnome_canvas_item_raise_to_top (day_view-&gt;resize_rect_item);</div><div class='del'>-			gnome_canvas_item_raise_to_top (day_view-&gt;resize_bar_item);</div><div class='del'>-</div><div class='del'>-			/* Raise the event's item, above the rect as well. */</div><div class='del'>-			gnome_canvas_item_raise_to_top (event-&gt;canvas_item);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		/* Remember the item clicked and the mouse position,</div><div class='del'>-		   so we can start a drag if the mouse moves. */</div><div class='del'>-		day_view-&gt;pressed_event_day = day;</div><div class='del'>-		day_view-&gt;pressed_event_num = event_num;</div><div class='del'>-</div><div class='del'>-		day_view-&gt;drag_event_x = event_x;</div><div class='del'>-		day_view-&gt;drag_event_y = event_y;</div><div class='del'>-</div><div class='del'>-		e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-							    event_x, event_y,</div><div class='del'>-							    &amp;tmp_day, &amp;row,</div><div class='del'>-							    NULL);</div><div class='del'>-		start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-		day_view-&gt;drag_event_offset = row - start_row;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num, start_day, end_day;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-	gdouble x1, y1, x2, y2;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-</div><div class='del'>-	/* If we're not resizing an event, or the event is not shown,</div><div class='del'>-	   hide the resize bars. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_NONE</div><div class='del'>-	    || !e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-						    &amp;start_day, &amp;end_day,</div><div class='del'>-						    &amp;item_x, &amp;item_y,</div><div class='del'>-						    &amp;item_w, &amp;item_h)) {</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	x1 = item_x;</div><div class='del'>-	y1 = item_y;</div><div class='del'>-	x2 = item_x + item_w - 1;</div><div class='del'>-	y2 = item_y + item_h - 1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_long_event_rect_item,</div><div class='del'>-			       "x1", x1,</div><div class='del'>-			       "y1", y1,</div><div class='del'>-			       "x2", x2,</div><div class='del'>-			       "y2", y2,</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_canvas_item_show (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_resize_rect_item (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-	gdouble x1, y1, x2, y2;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-</div><div class='del'>-	/* If we're not resizing an event, or the event is not shown,</div><div class='del'>-	   hide the resize bars. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_NONE</div><div class='del'>-	    || !e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-					       &amp;item_x, &amp;item_y,</div><div class='del'>-					       &amp;item_w, &amp;item_h)) {</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	x1 = item_x;</div><div class='del'>-	y1 = item_y;</div><div class='del'>-	x2 = item_x + item_w - 1;</div><div class='del'>-	y2 = item_y + item_h - 1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_rect_item,</div><div class='del'>-			       "x1", x1 + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y1", y1,</div><div class='del'>-			       "x2", x2,</div><div class='del'>-			       "y2", y2,</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_canvas_item_show (day_view-&gt;resize_rect_item);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_bar_item,</div><div class='del'>-			       "x1", x1,</div><div class='del'>-			       "y1", y1,</div><div class='del'>-			       "x2", x1 + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y2", y2,</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_canvas_item_show (day_view-&gt;resize_bar_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_event_double_click (EDayView *day_view,</div><div class='del'>-				  gint day,</div><div class='del'>-				  gint event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gboolean destroyed;</div><div class='del'>-	guint id;</div><div class='del'>-</div><div class='del'>-	if (day == -1)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	else </div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	destroyed = FALSE;</div><div class='del'>-	id = gtk_signal_connect (GTK_OBJECT (event-&gt;comp), "destroy",</div><div class='del'>-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_editing_event (day_view);</div><div class='del'>-</div><div class='del'>-	if (!destroyed) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (event-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_edit_object (day_view-&gt;calendar, event-&gt;comp, FALSE);</div><div class='del'>-		else</div><div class='del'>-			g_warning ("Calendar not set");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	/*</div><div class='del'>-	 * This is used to "flag" events that can not be edited</div><div class='del'>-	 */</div><div class='del'>-	MASK_EDITABLE = 1,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To disable recurring actions to be displayed</div><div class='del'>-	 */</div><div class='del'>-	MASK_RECURRING = 2,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To disable actions for non-recurring items to be displayed</div><div class='del'>-	 */</div><div class='del'>-	MASK_SINGLE   = 4,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is used to when an event is currently being edited</div><div class='del'>-	 * in another window and we want to disable the event</div><div class='del'>-	 * from being edited twice</div><div class='del'>-	 */</div><div class='del'>-	MASK_EDITING  = 8</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPopupMenu main_items [] = {</div><div class='del'>-	E_POPUP_ITEM (N_("New _Appointment"),</div><div class='del'>-	  e_day_view_on_new_appointment, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New All Day _Event"),</div><div class='del'>-	  e_day_view_on_new_event, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New Meeting"),</div><div class='del'>-	  e_day_view_on_new_meeting, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New Task"),</div><div class='del'>-	  e_day_view_on_new_task, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("Print..."),</div><div class='del'>-	  e_day_view_on_print, 0),</div><div class='del'>-	</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Paste"),</div><div class='del'>-	  e_day_view_on_paste, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_SUBMENU (N_("Current View"), NULL, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("Go to _Today"),</div><div class='del'>-	  e_day_view_on_goto_today, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Go to Date..."),</div><div class='del'>-	  e_day_view_on_goto_date, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Publish Free/Busy Information"),</div><div class='del'>-	  e_day_view_on_publish, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Configure..."),</div><div class='del'>-	  e_day_view_on_settings, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Configure Pilot..."),</div><div class='del'>-	  e_day_view_on_pilot_settings, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPopupMenu child_items [] = {</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Open"), e_day_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Save As..."), e_day_view_on_save_as, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Print..."), e_day_view_on_print_event, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-</div><div class='del'>-	/* Only show this separator if one of the above is shown. */</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("C_ut"), e_day_view_on_cut, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Copy"), e_day_view_on_copy, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Paste"), e_day_view_on_paste, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_day_view_on_meeting, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_day_view_on_forward, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Delete"), e_day_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_day_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_day_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_day_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_view_popup (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;view_menu == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	gnome_calendar_discard_view_popup (day_view-&gt;calendar, day_view-&gt;view_menu);</div><div class='del'>-	day_view-&gt;view_menu = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_event_right_click (EDayView *day_view,</div><div class='del'>-				 GdkEventButton *bevent,</div><div class='del'>-				 gint day,</div><div class='del'>-				 gint event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	int have_selection;</div><div class='del'>-	gboolean being_edited;</div><div class='del'>-	EPopupMenu *context_menu;</div><div class='del'>-	GtkMenu *popup;</div><div class='del'>-	int hide_mask = 0;</div><div class='del'>-	int disable_mask = 0;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * FIXME:</div><div class='del'>-	 * This used to be set only if the event wasn't being edited</div><div class='del'>-	 * in the event editor, but we can't check that at present.</div><div class='del'>-	 * We could possibly set up another method of checking it.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	being_edited = FALSE;</div><div class='del'>-	</div><div class='del'>-	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)</div><div class='del'>-		&amp;&amp; day_view-&gt;selection_start_day != -1;</div><div class='del'>-</div><div class='del'>-	if (event_num == -1) {</div><div class='del'>-		day_view-&gt;view_menu = gnome_calendar_setup_view_popup (day_view-&gt;calendar);</div><div class='del'>-		main_items[9].submenu = day_view-&gt;view_menu;</div><div class='del'>-		context_menu = main_items;</div><div class='del'>-	} else {</div><div class='del'>-		context_menu = child_items;</div><div class='del'>-		</div><div class='del'>-		if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-		else</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		if (cal_component_has_recurrences (event-&gt;comp)) </div><div class='del'>-			hide_mask |= MASK_SINGLE;</div><div class='del'>-		else</div><div class='del'>-			hide_mask |= MASK_RECURRING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (being_edited)</div><div class='del'>-		disable_mask |= MASK_EDITING;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;popup_event_day = day;</div><div class='del'>-	day_view-&gt;popup_event_num = event_num;</div><div class='del'>-	</div><div class='del'>-	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (free_view_popup), day_view);</div><div class='del'>-	e_popup_menu (popup, (GdkEvent *) bevent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	</div><div class='del'>-	/* Edit a new event. If only one day is selected in the top canvas,</div><div class='del'>-	   we set the time to the first 1/2-hour of the working day. */</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day != -1</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day == day_view-&gt;selection_end_day) {</div><div class='del'>-		dtstart = day_view-&gt;day_starts[day_view-&gt;selection_start_day];</div><div class='del'>-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,</div><div class='del'>-						     day_view-&gt;zone);</div><div class='del'>-		itt.hour = calendar_config_get_day_start_hour ();</div><div class='del'>-		itt.minute = calendar_config_get_day_start_minute ();</div><div class='del'>-		dtstart = icaltime_as_timet_with_zone (itt, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		icaltime_adjust (&amp;itt, 0, 0, 30, 0);</div><div class='del'>-		dtend = icaltime_as_timet_with_zone (itt, day_view-&gt;zone);</div><div class='del'>-	} else {</div><div class='del'>-		e_day_view_get_selected_time_range (day_view, &amp;dtstart,</div><div class='del'>-						    &amp;dtend);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		day_view-&gt;calendar, dtstart, dtend, FALSE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_new_event (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;dtstart, &amp;dtend);</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		day_view-&gt;calendar, dtstart, dtend, TRUE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_new_meeting (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	</div><div class='del'>-	/* Edit a new event. If only one day is selected in the top canvas,</div><div class='del'>-	   we set the time to the first 1/2-hour of the working day. */</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day != -1</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day == day_view-&gt;selection_end_day) {</div><div class='del'>-		dtstart = day_view-&gt;day_starts[day_view-&gt;selection_start_day];</div><div class='del'>-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,</div><div class='del'>-						     day_view-&gt;zone);</div><div class='del'>-		itt.hour = calendar_config_get_day_start_hour ();</div><div class='del'>-		itt.minute = calendar_config_get_day_start_minute ();</div><div class='del'>-		dtstart = icaltime_as_timet_with_zone (itt, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		icaltime_adjust (&amp;itt, 0, 0, 30, 0);</div><div class='del'>-		dtend = icaltime_as_timet_with_zone (itt, day_view-&gt;zone);</div><div class='del'>-	} else {</div><div class='del'>-		e_day_view_get_selected_time_range (day_view, &amp;dtstart,</div><div class='del'>-						    &amp;dtend);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		day_view-&gt;calendar, dtstart, dtend, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_new_task (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_task (day_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_goto_date (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	goto_dialog (day_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_goto_today (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	calendar_goto_today (day_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_edit_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_edit_object (day_view-&gt;calendar, event-&gt;comp, FALSE);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Calendar not set");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_save_as (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *ical_string;</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	filename = e_file_dialog_save (_("Save as..."));</div><div class='del'>-	if (filename == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	ical_string = cal_client_get_component_as_string (day_view-&gt;client, event-&gt;comp);</div><div class='del'>-	if (ical_string == NULL) {</div><div class='del'>-		g_warning ("Couldn't convert item to a string");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	file = fopen (filename, "w");</div><div class='del'>-	if (file == NULL) {</div><div class='del'>-		g_warning ("Couldn't save item");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fprintf (file, ical_string);</div><div class='del'>-	g_free (ical_string);</div><div class='del'>-	fclose (file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_print (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	time_t start;</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-	PrintView print_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_current_time_range (day_view-&gt;calendar, &amp;start, NULL);</div><div class='del'>-	view_type = gnome_calendar_get_view (day_view-&gt;calendar);</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_DAY;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_WEEK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	print_calendar (day_view-&gt;calendar, FALSE, start, print_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_print_event (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	print_comp (event-&gt;comp, day_view-&gt;client, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_meeting (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_edit_object (day_view-&gt;calendar, event-&gt;comp, TRUE);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Calendar not set");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_forward (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, event-&gt;comp, </div><div class='del'>-			day_view-&gt;client, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_publish (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	icaltimezone *utc;</div><div class='del'>-	time_t start = time (NULL), end;</div><div class='del'>-	GList *comp_list;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	utc = icaltimezone_get_utc_timezone ();</div><div class='del'>-	start = time_day_begin_with_zone (start, utc);</div><div class='del'>-	end = time_add_week_with_zone (start, 6, utc);</div><div class='del'>-</div><div class='del'>-	comp_list = cal_client_get_free_busy (day_view-&gt;client, NULL, start, end);</div><div class='del'>-	if (comp_list) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		for (l = comp_list; l; l = l-&gt;next) {</div><div class='del'>-			CalComponent *comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, </div><div class='del'>-					day_view-&gt;client, NULL);</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		g_list_free (comp_list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_settings (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	control_util_show_settings (day_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_pilot_settings (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-        char *args[] = {</div><div class='del'>-                "gpilotd-control-applet",</div><div class='del'>-                NULL</div><div class='del'>-        };</div><div class='del'>-        int pid;</div><div class='del'>-</div><div class='del'>-        args[0] = gnome_is_program_in_path ("gpilotd-control-applet");</div><div class='del'>-        if (!args[0]) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("The GNOME Pilot tools do not appear to be installed on this system."));</div><div class='del'>-		return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        pid = gnome_execute_async (NULL, 4, args);</div><div class='del'>-        if (pid == -1)</div><div class='del'>-                e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]);</div><div class='del'>-</div><div class='del'>-        g_free (args[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We must duplicate the CalComponent, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_comp_util_add_exdate (comp, event-&gt;start, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_delete_event_internal (EDayView *day_view, EDayViewEvent *event)</div><div class='del'>-{</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	if (delete_component_dialog (event-&gt;comp, FALSE, 1, vtype,</div><div class='del'>-				     GTK_WIDGET (day_view))) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-		/* We don't check the return value; FALSE can mean the object</div><div class='del'>-		 * was not in the server anyways.</div><div class='del'>-		 */</div><div class='del'>-		cal_client_remove_object (day_view-&gt;client, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gboolean destroyed;</div><div class='del'>-	guint id;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	destroyed = FALSE;</div><div class='del'>-	id = gtk_signal_connect (GTK_OBJECT (event-&gt;comp), "destroy",</div><div class='del'>-				 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day &gt;= 0)</div><div class='del'>-		e_day_view_stop_editing_event (day_view);</div><div class='del'>-</div><div class='del'>-	if (!destroyed) {</div><div class='del'>-		gtk_signal_disconnect (GTK_OBJECT (event-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-		e_day_view_delete_event_internal (day_view, event);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_delete_event		(EDayView       *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent,</div><div class='del'>-					day_view-&gt;editing_event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;editing_event_day],</div><div class='del'>-					EDayViewEvent,</div><div class='del'>-					day_view-&gt;editing_event_num);</div><div class='del'>-</div><div class='del'>-	e_day_view_delete_event_internal (day_view, event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_cut (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_day_view_on_copy (widget, data);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-	cal_client_remove_object (day_view-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_copy (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	char *comp_str;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	comp_str = cal_component_get_as_string (event-&gt;comp);</div><div class='del'>-	if (day_view-&gt;clipboard_selection)</div><div class='del'>-		g_free (day_view-&gt;clipboard_selection);</div><div class='del'>-	day_view-&gt;clipboard_selection = comp_str;</div><div class='del'>-</div><div class='del'>-	gtk_selection_owner_set (day_view-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_paste (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gtk_selection_convert (day_view-&gt;invisible,</div><div class='del'>-			       clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp, *new_comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* For the recurring object, we add an exception to get rid of the</div><div class='del'>-	   instance. */</div><div class='del'>-</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_comp_util_add_exdate (comp, event-&gt;start, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	/* For the unrecurred instance we duplicate the original object,</div><div class='del'>-	   create a new uid for it, get rid of the recurrence rules, and set</div><div class='del'>-	   the start &amp; end times to the instances times. */</div><div class='del'>-	new_comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_set_uid (new_comp, cal_component_gen_uid ());</div><div class='del'>-	cal_component_set_rdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_rrule_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exrule_list (new_comp, NULL);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (event-&gt;start, FALSE,</div><div class='del'>-						     day_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtstart (new_comp, &amp;date);</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (event-&gt;end, FALSE,</div><div class='del'>-						     day_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtend (new_comp, &amp;date);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Now update both CalComponents. Note that we do this last since at</div><div class='del'>-	 * present the updates happen synchronously so our event may disappear.</div><div class='del'>-	 */</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, new_comp))</div><div class='del'>-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EDayViewEvent*</div><div class='del'>-e_day_view_get_popup_menu_event (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;popup_event_num == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;popup_event_day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;popup_event_num);</div><div class='del'>-	else</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;events[day_view-&gt;popup_event_day],</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;popup_event_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_top_canvas_button_release (GtkWidget *widget,</div><div class='del'>-					 GdkEventButton *event,</div><div class='del'>-					 EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		e_day_view_finish_selection (day_view);</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		e_day_view_finish_long_event_resize (day_view);</div><div class='del'>-	} else if (day_view-&gt;pressed_event_day != -1) {</div><div class='del'>-		e_day_view_start_editing_event (day_view,</div><div class='del'>-						day_view-&gt;pressed_event_day,</div><div class='del'>-						day_view-&gt;pressed_event_num,</div><div class='del'>-						NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_main_canvas_button_release (GtkWidget *widget,</div><div class='del'>-					  GdkEventButton *event,</div><div class='del'>-					  EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_main_canvas_button_release\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		e_day_view_finish_selection (day_view);</div><div class='del'>-		e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		e_day_view_finish_resize (day_view);</div><div class='del'>-		e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-	} else if (day_view-&gt;pressed_event_day != -1) {</div><div class='del'>-		e_day_view_start_editing_event (day_view,</div><div class='del'>-						day_view-&gt;pressed_event_day,</div><div class='del'>-						day_view-&gt;pressed_event_num,</div><div class='del'>-						NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_calendar_selection_time (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	time_t start, end;</div><div class='del'>-</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;start, &amp;end);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Start: %s", ctime (&amp;start));</div><div class='del'>-	g_print ("End  : %s", ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_set_selected_time_range (day_view-&gt;calendar,</div><div class='del'>-							start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_top_canvas_motion (GtkWidget *widget,</div><div class='del'>-				 GdkEventMotion *mevent,</div><div class='del'>-				 EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	GdkCursor *cursor;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_top_canvas_motion\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Convert the coords to the main canvas window, or return if the</div><div class='del'>-	   window is not found. */</div><div class='del'>-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,</div><div class='del'>-					      GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-					      &amp;event_x, &amp;event_y))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* The top canvas doesn't scroll, but just in case. */</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_x = event_x + scroll_x;</div><div class='del'>-	canvas_y = event_y + scroll_y;</div><div class='del'>-</div><div class='del'>-	pos = e_day_view_convert_position_in_top_canvas (day_view,</div><div class='del'>-							 canvas_x, canvas_y,</div><div class='del'>-							 &amp;day, &amp;event_num);</div><div class='del'>-	if (event_num != -1)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		e_day_view_update_selection (day_view, day, -1);</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			e_day_view_update_long_event_resize (day_view, day);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (day_view-&gt;pressed_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		GtkTargetList *target_list;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					day_view-&gt;pressed_event_num);</div><div class='del'>-</div><div class='del'>-		if (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x)</div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y)</div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET)) {</div><div class='del'>-			day_view-&gt;drag_event_day = day_view-&gt;pressed_event_day;</div><div class='del'>-			day_view-&gt;drag_event_num = day_view-&gt;pressed_event_num;</div><div class='del'>-			day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Hide the horizontal bars. */</div><div class='del'>-			if (day_view-&gt;resize_bars_event_day != -1) {</div><div class='del'>-				day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-				day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			target_list = gtk_target_list_new (target_table,</div><div class='del'>-							   n_targets);</div><div class='del'>-			gtk_drag_begin (widget, target_list,</div><div class='del'>-					GDK_ACTION_COPY | GDK_ACTION_MOVE,</div><div class='del'>-					1, (GdkEvent*)mevent);</div><div class='del'>-			gtk_target_list_unref (target_list);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cursor = day_view-&gt;normal_cursor;</div><div class='del'>-</div><div class='del'>-		/* Recurring events can't be resized. */</div><div class='del'>-		if (event &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)) {</div><div class='del'>-			switch (pos) {</div><div class='del'>-			case E_DAY_VIEW_POS_LEFT_EDGE:</div><div class='del'>-			case E_DAY_VIEW_POS_RIGHT_EDGE:</div><div class='del'>-				cursor = day_view-&gt;resize_width_cursor;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Only set the cursor if it is different to last one set. */</div><div class='del'>-		if (day_view-&gt;last_cursor_set_in_top_canvas != cursor) {</div><div class='del'>-			day_view-&gt;last_cursor_set_in_top_canvas = cursor;</div><div class='del'>-			gdk_window_set_cursor (widget-&gt;window, cursor);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_main_canvas_motion (GtkWidget *widget,</div><div class='del'>-				  GdkEventMotion *mevent,</div><div class='del'>-				  EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;</div><div class='del'>-	gint row, day, event_num;</div><div class='del'>-	GdkCursor *cursor;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_main_canvas_motion\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Convert the coords to the main canvas window, or return if the</div><div class='del'>-	   window is not found. */</div><div class='del'>-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,</div><div class='del'>-					      GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-					      &amp;event_x, &amp;event_y))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_x = event_x + scroll_x;</div><div class='del'>-	canvas_y = event_y + scroll_y;</div><div class='del'>-</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-							  canvas_x, canvas_y,</div><div class='del'>-							  &amp;day, &amp;row,</div><div class='del'>-							  &amp;event_num);</div><div class='del'>-	if (event_num != -1)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			e_day_view_update_selection (day_view, day, row);</div><div class='del'>-			e_day_view_check_auto_scroll (day_view,</div><div class='del'>-						      event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			e_day_view_update_resize (day_view, row);</div><div class='del'>-			e_day_view_check_auto_scroll (day_view,</div><div class='del'>-						      event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (day_view-&gt;pressed_event_day != -1</div><div class='del'>-		   &amp;&amp; day_view-&gt;pressed_event_day != E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		GtkTargetList *target_list;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;pressed_event_day], EDayViewEvent, day_view-&gt;pressed_event_num);</div><div class='del'>-</div><div class='del'>-		if (!cal_component_has_recurrences (event-&gt;comp)</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x)</div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y)</div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET)) {</div><div class='del'>-			day_view-&gt;drag_event_day = day_view-&gt;pressed_event_day;</div><div class='del'>-			day_view-&gt;drag_event_num = day_view-&gt;pressed_event_num;</div><div class='del'>-			day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Hide the horizontal bars. */</div><div class='del'>-			if (day_view-&gt;resize_bars_event_day != -1) {</div><div class='del'>-				day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-				day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			target_list = gtk_target_list_new (target_table,</div><div class='del'>-							   n_targets);</div><div class='del'>-			gtk_drag_begin (widget, target_list,</div><div class='del'>-					GDK_ACTION_COPY | GDK_ACTION_MOVE,</div><div class='del'>-					1, (GdkEvent*)mevent);</div><div class='del'>-			gtk_target_list_unref (target_list);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cursor = day_view-&gt;normal_cursor;</div><div class='del'>-</div><div class='del'>-		/* Recurring events can't be resized. */</div><div class='del'>-		if (event &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)) {</div><div class='del'>-			switch (pos) {</div><div class='del'>-			case E_DAY_VIEW_POS_LEFT_EDGE:</div><div class='del'>-				cursor = day_view-&gt;move_cursor;</div><div class='del'>-				break;</div><div class='del'>-			case E_DAY_VIEW_POS_TOP_EDGE:</div><div class='del'>-			case E_DAY_VIEW_POS_BOTTOM_EDGE:</div><div class='del'>-				cursor = day_view-&gt;resize_height_cursor;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Only set the cursor if it is different to last one set. */</div><div class='del'>-		if (day_view-&gt;last_cursor_set_in_main_canvas != cursor) {</div><div class='del'>-			day_view-&gt;last_cursor_set_in_main_canvas = cursor;</div><div class='del'>-			gdk_window_set_cursor (widget-&gt;window, cursor);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the selection to a single cell. If day is -1 then the current</div><div class='del'>-   start day is reused. If row is -1 then the selection is in the top canvas.</div><div class='del'>-*/</div><div class='del'>-void</div><div class='del'>-e_day_view_start_selection (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint row)</div><div class='del'>-{</div><div class='del'>-	if (day == -1) {</div><div class='del'>-		day = day_view-&gt;selection_start_day;</div><div class='del'>-		if (day == -1)</div><div class='del'>-			day = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_day = day;</div><div class='del'>-	day_view-&gt;selection_end_day = day;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_row = row;</div><div class='del'>-	day_view-&gt;selection_end_row = row;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = TRUE;</div><div class='del'>-	day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = (row == -1) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Updates the selection during a drag. If day is -1 the selection day is</div><div class='del'>-   unchanged. */</div><div class='del'>-void</div><div class='del'>-e_day_view_update_selection (EDayView *day_view,</div><div class='del'>-			     gint day,</div><div class='del'>-			     gint row)</div><div class='del'>-{</div><div class='del'>-	gboolean need_redraw = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating selection %i,%i\n", day, row);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = (row == -1) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	if (day == -1)</div><div class='del'>-		day = (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-			? day_view-&gt;selection_start_day</div><div class='del'>-			: day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START) {</div><div class='del'>-		if (row != day_view-&gt;selection_start_row</div><div class='del'>-		    || day != day_view-&gt;selection_start_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			day_view-&gt;selection_start_row = row;</div><div class='del'>-			day_view-&gt;selection_start_day = day;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (row != day_view-&gt;selection_end_row</div><div class='del'>-		    || day != day_view-&gt;selection_end_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			day_view-&gt;selection_end_row = row;</div><div class='del'>-			day_view-&gt;selection_end_day = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_redraw) {</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_normalize_selection (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint tmp_row, tmp_day;</div><div class='del'>-</div><div class='del'>-	/* Switch the drag position if necessary. */</div><div class='del'>-	if (day_view-&gt;selection_start_day &gt; day_view-&gt;selection_end_day</div><div class='del'>-	    || (day_view-&gt;selection_start_day == day_view-&gt;selection_end_day</div><div class='del'>-		&amp;&amp; day_view-&gt;selection_start_row &gt; day_view-&gt;selection_end_row)) {</div><div class='del'>-		tmp_row = day_view-&gt;selection_start_row;</div><div class='del'>-		tmp_day = day_view-&gt;selection_start_day;</div><div class='del'>-		day_view-&gt;selection_start_day = day_view-&gt;selection_end_day;</div><div class='del'>-		day_view-&gt;selection_start_row = day_view-&gt;selection_end_row;</div><div class='del'>-		day_view-&gt;selection_end_day = tmp_day;</div><div class='del'>-		day_view-&gt;selection_end_row = tmp_row;</div><div class='del'>-		if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-			day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-		else</div><div class='del'>-			day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_START;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_finish_selection (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = FALSE;</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_long_event_resize (EDayView *day_view,</div><div class='del'>-				     gint day)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-	gboolean need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating resize Day:%i\n", day);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {</div><div class='del'>-		day = MIN (day, day_view-&gt;resize_end_row);</div><div class='del'>-		if (day != day_view-&gt;resize_start_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_start_row = day;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		day = MAX (day, day_view-&gt;resize_start_row);</div><div class='del'>-		if (day != day_view-&gt;resize_end_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_end_row = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-		e_day_view_reshape_resize_long_event_rect_item (day_view);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_resize (EDayView *day_view,</div><div class='del'>-			  gint row)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gboolean need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating resize Row:%i\n", row);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {</div><div class='del'>-		row = MIN (row, day_view-&gt;resize_end_row);</div><div class='del'>-		if (row != day_view-&gt;resize_start_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_start_row = row;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		row = MAX (row, day_view-&gt;resize_start_row);</div><div class='del'>-		if (row != day_view-&gt;resize_end_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_end_row = row;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_resize_rect_item (day_view);</div><div class='del'>-		e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This converts the resize start or end row back to a time and updates the</div><div class='del'>-   event. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_finish_long_event_resize (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* We use a temporary copy of the comp since we don't want to</div><div class='del'>-	   change the original comp here. Otherwise we would not detect that</div><div class='del'>-	   the event's time had changed in the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	/* FIXME: Should probably keep the timezone of the original start</div><div class='del'>-	   and end times. */</div><div class='del'>-	date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {</div><div class='del'>-		dt = day_view-&gt;day_starts[day_view-&gt;resize_start_row];</div><div class='del'>-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		dt = day_view-&gt;day_starts[day_view-&gt;resize_end_row + 1];</div><div class='del'>-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-		cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (cal_client_update_object (day_view-&gt;client, comp)) {</div><div class='del'>-		if (cal_component_has_attendees (comp) &amp;&amp; send_component_dialog (comp, FALSE))</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view-&gt;client, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This converts the resize start or end row back to a time and updates the</div><div class='del'>-   event. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_finish_resize (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* We use a temporary shallow copy of the ico since we don't want to</div><div class='del'>-	   change the original ico here. Otherwise we would not detect that</div><div class='del'>-	   the event's time had changed in the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	/* FIXME: Should probably keep the timezone of the original start</div><div class='del'>-	   and end times. */</div><div class='del'>-	date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {</div><div class='del'>-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_start_row);</div><div class='del'>-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_end_row + 1);</div><div class='del'>-		*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-		cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_bar_item);</div><div class='del'>-</div><div class='del'>-	/* Hide the horizontal bars. */</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (cal_client_update_object (day_view-&gt;client, comp)) {</div><div class='del'>-		if (cal_component_has_attendees (comp) &amp;&amp; send_component_dialog (comp, FALSE))</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view-&gt;client, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		g_message ("e_day_view_finish_resize(): Could not update the object!");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_abort_resize (EDayView *day_view,</div><div class='del'>-			 guint32 time)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_NONE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-	gdk_pointer_ungrab (time);</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-</div><div class='del'>-		day_view-&gt;last_cursor_set_in_top_canvas = day_view-&gt;normal_cursor;</div><div class='del'>-		gdk_window_set_cursor (day_view-&gt;top_canvas-&gt;window,</div><div class='del'>-				       day_view-&gt;normal_cursor);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-	} else {</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-		day_view-&gt;last_cursor_set_in_main_canvas = day_view-&gt;normal_cursor;</div><div class='del'>-		gdk_window_set_cursor (day_view-&gt;main_canvas-&gt;window,</div><div class='del'>-				       day_view-&gt;normal_cursor);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;resize_bar_item);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_free_events (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	/* Reset all our indices. */</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;popup_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_event_day = -1;</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-	e_day_view_free_event_array (day_view, day_view-&gt;long_events);</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++)</div><div class='del'>-		e_day_view_free_event_array (day_view, day_view-&gt;events[day]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_free_event_array (EDayView *day_view,</div><div class='del'>-			     GArray *array)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; array-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (array, EDayViewEvent, event_num);</div><div class='del'>-		if (event-&gt;canvas_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (array, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_add_event (CalComponent *comp,</div><div class='del'>-		      time_t	  start,</div><div class='del'>-		      time_t	  end,</div><div class='del'>-		      gpointer	  data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent event;</div><div class='del'>-	gint day, offset;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Day view lower: %s", ctime (&amp;day_view-&gt;lower));</div><div class='del'>-	g_print ("Day view upper: %s", ctime (&amp;day_view-&gt;upper));</div><div class='del'>-	g_print ("Event start: %s", ctime (&amp;start));</div><div class='del'>-	g_print ("Event end  : %s\n", ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Check that the event times are valid. */</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, TRUE);</div><div class='del'>-	g_return_val_if_fail (start &lt; day_view-&gt;upper, TRUE);</div><div class='del'>-	g_return_val_if_fail (end &gt; day_view-&gt;lower, TRUE);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (start, FALSE,</div><div class='del'>-						  day_view-&gt;zone);</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (end, FALSE,</div><div class='del'>-						day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.canvas_item = NULL;</div><div class='del'>-</div><div class='del'>-	/* Calculate the start &amp; end minute, relative to the top of the</div><div class='del'>-	   display. */</div><div class='del'>-	offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-		+ day_view-&gt;first_minute_shown;</div><div class='del'>-	event.start_minute = start_tt.hour * 60 + start_tt.minute - offset;</div><div class='del'>-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;</div><div class='del'>-</div><div class='del'>-	event.start_row_or_col = 0;</div><div class='del'>-	event.num_columns = 0;</div><div class='del'>-</div><div class='del'>-	event.different_timezone = FALSE;</div><div class='del'>-	if (!cal_comp_util_compare_event_timezones (comp, day_view-&gt;client,</div><div class='del'>-						    day_view-&gt;zone))</div><div class='del'>-		event.different_timezone = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Find out which array to add the event to. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		if (start &gt;= day_view-&gt;day_starts[day]</div><div class='del'>-		    &amp;&amp; end &lt;= day_view-&gt;day_starts[day + 1]) {</div><div class='del'>-</div><div class='del'>-			/* Special case for when the appointment ends at</div><div class='del'>-			   midnight, i.e. the start of the next day. */</div><div class='del'>-			if (end == day_view-&gt;day_starts[day + 1]) {</div><div class='del'>-</div><div class='del'>-				/* If the event last the entire day, then we</div><div class='del'>-				   skip it here so it gets added to the top</div><div class='del'>-				   canvas. */</div><div class='del'>-				if (start == day_view-&gt;day_starts[day])</div><div class='del'>-				    break;</div><div class='del'>-</div><div class='del'>-				event.end_minute = 24 * 60;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_array_append_val (day_view-&gt;events[day], event);</div><div class='del'>-			day_view-&gt;events_sorted[day] = FALSE;</div><div class='del'>-			day_view-&gt;need_layout[day] = TRUE;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The event wasn't within one day so it must be a long event,</div><div class='del'>-	   i.e. shown in the top canvas. */</div><div class='del'>-	g_array_append_val (day_view-&gt;long_events, event);</div><div class='del'>-	day_view-&gt;long_events_sorted = FALSE;</div><div class='del'>-	day_view-&gt;long_events_need_layout = TRUE;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This lays out the short (less than 1 day) events in the columns.</div><div class='del'>-   Any long events are simply skipped. */</div><div class='del'>-void</div><div class='del'>-e_day_view_check_layout (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day, rows_in_top_display, top_canvas_height, top_rows;</div><div class='del'>-</div><div class='del'>-	/* Don't bother if we aren't visible. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (day_view))</div><div class='del'>-	    return;</div><div class='del'>-</div><div class='del'>-	/* Make sure the events are sorted (by start and size). */</div><div class='del'>-	e_day_view_ensure_events_sorted (day_view);</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		if (day_view-&gt;need_layout[day])</div><div class='del'>-			e_day_view_layout_day_events (day_view-&gt;events[day],</div><div class='del'>-						      day_view-&gt;rows,</div><div class='del'>-						      day_view-&gt;mins_per_row,</div><div class='del'>-						      day_view-&gt;cols_per_row[day]);</div><div class='del'>-</div><div class='del'>-		if (day_view-&gt;need_layout[day]</div><div class='del'>-		    || day_view-&gt;need_reshape[day]) {</div><div class='del'>-			e_day_view_reshape_day_events (day_view, day);</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;resize_bars_event_day == day)</div><div class='del'>-				e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		day_view-&gt;need_layout[day] = FALSE;</div><div class='del'>-		day_view-&gt;need_reshape[day] = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;long_events_need_layout) {</div><div class='del'>-		e_day_view_layout_long_events (day_view-&gt;long_events,</div><div class='del'>-					       day_view-&gt;days_shown,</div><div class='del'>-					       day_view-&gt;day_starts,</div><div class='del'>-					       &amp;rows_in_top_display);</div><div class='del'>-</div><div class='del'>-		/* Set the height of the top canvas based on the row height</div><div class='del'>-		   and the number of rows needed (min 1 + 1 for the dates + 1</div><div class='del'>-		   space for DnD).*/</div><div class='del'>-		if (day_view-&gt;rows_in_top_display != rows_in_top_display) {</div><div class='del'>-			day_view-&gt;rows_in_top_display = rows_in_top_display;</div><div class='del'>-			top_rows = MAX (1, rows_in_top_display);</div><div class='del'>-			top_canvas_height = (top_rows + 2)</div><div class='del'>-				* day_view-&gt;top_row_height;</div><div class='del'>-			gtk_widget_set_usize (day_view-&gt;top_canvas, -1,</div><div class='del'>-					      top_canvas_height);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;long_events_need_layout</div><div class='del'>-	    || day_view-&gt;long_events_need_reshape)</div><div class='del'>-		e_day_view_reshape_long_events (day_view);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;long_events_need_layout = FALSE;</div><div class='del'>-	day_view-&gt;long_events_need_reshape = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_long_events (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		if (event-&gt;num_columns == 0) {</div><div class='del'>-			if (event-&gt;canvas_item) {</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-				event-&gt;canvas_item = NULL;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_long_event (EDayView *day_view,</div><div class='del'>-			       gint	 event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint start_day, end_day, item_x, item_y, item_w, item_h;</div><div class='del'>-	gint text_x, text_w, num_icons, icons_width, width, time_width;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint min_text_x, max_text_w, text_width, line_len;</div><div class='del'>-	gchar *text, *end_of_line;</div><div class='del'>-	gboolean show_icons = TRUE, use_max_width = FALSE;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-						 &amp;start_day, &amp;end_day,</div><div class='del'>-						 &amp;item_x, &amp;item_y,</div><div class='del'>-						 &amp;item_w, &amp;item_h)) {</div><div class='del'>-		if (event-&gt;canvas_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-			event-&gt;canvas_item = NULL;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Take off the border and padding. */</div><div class='del'>-	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;</div><div class='del'>-	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;</div><div class='del'>-	item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD;</div><div class='del'>-	item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2;</div><div class='del'>-</div><div class='del'>-	/* We don't show the icons while resizing, since we'd have to</div><div class='del'>-	   draw them on top of the resize rect. Nor when editing. */</div><div class='del'>-	num_icons = 0;</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num)</div><div class='del'>-		show_icons = FALSE;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num) {</div><div class='del'>-		show_icons = FALSE;</div><div class='del'>-		use_max_width = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (show_icons) {</div><div class='del'>-		GSList *categories_list;</div><div class='del'>-</div><div class='del'>-		if (cal_component_has_alarms (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (event-&gt;different_timezone)</div><div class='del'>-			num_icons++;</div><div class='del'>-</div><div class='del'>-		cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-		num_icons += g_slist_length (categories_list);</div><div class='del'>-		cal_component_free_categories_list (categories_list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!event-&gt;canvas_item) {</div><div class='del'>-		event-&gt;canvas_item =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;top_canvas)-&gt;root),</div><div class='del'>-					       e_text_get_type (),</div><div class='del'>-					       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-					       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-					       "clip", TRUE,</div><div class='del'>-					       "max_lines", 1,</div><div class='del'>-					       "editable", TRUE,</div><div class='del'>-					       "use_ellipsis", TRUE,</div><div class='del'>-					       "draw_background", FALSE,</div><div class='del'>-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),</div><div class='del'>-					       NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (event-&gt;canvas_item), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),</div><div class='del'>-				    day_view);</div><div class='del'>-		e_day_view_update_long_event_label (day_view, event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate its position. We first calculate the ideal position which</div><div class='del'>-	   is centered with the icons. We then make sure we haven't gone off</div><div class='del'>-	   the left edge of the available space. Finally we make sure we don't</div><div class='del'>-	   go off the right edge. */</div><div class='del'>-	icons_width = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD)</div><div class='del'>-		* num_icons + E_DAY_VIEW_LONG_EVENT_ICON_R_PAD;</div><div class='del'>-	time_width = e_day_view_get_time_string_width (day_view);</div><div class='del'>-</div><div class='del'>-	if (use_max_width) {</div><div class='del'>-		text_x = item_x;</div><div class='del'>-		text_w = item_w;</div><div class='del'>-	} else {</div><div class='del'>-		/* Get the requested size of the label. */</div><div class='del'>-		gtk_object_get (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-				"text", &amp;text,</div><div class='del'>-				NULL);</div><div class='del'>-		text_width = 0;</div><div class='del'>-		if (text) {</div><div class='del'>-			end_of_line = strchr (text, '\n');</div><div class='del'>-			if (end_of_line)</div><div class='del'>-				line_len = end_of_line - text;</div><div class='del'>-			else</div><div class='del'>-				line_len = strlen (text);</div><div class='del'>-			text_width = gdk_text_width (font, text, line_len);</div><div class='del'>-			g_free (text);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		width = text_width + icons_width;</div><div class='del'>-		text_x = item_x + (item_w - width) / 2;</div><div class='del'>-</div><div class='del'>-		min_text_x = item_x;</div><div class='del'>-		if (event-&gt;start &gt; day_view-&gt;day_starts[start_day])</div><div class='del'>-			min_text_x += time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;</div><div class='del'>-</div><div class='del'>-		text_x = MAX (text_x, min_text_x);</div><div class='del'>-</div><div class='del'>-		max_text_w = item_x + item_w - text_x;</div><div class='del'>-		if (event-&gt;end &lt; day_view-&gt;day_starts[end_day + 1])</div><div class='del'>-			max_text_w -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;</div><div class='del'>-</div><div class='del'>-		text_w = MIN (width, max_text_w);</div><div class='del'>-</div><div class='del'>-		/* Now take out the space for the icons. */</div><div class='del'>-		text_x += icons_width;</div><div class='del'>-		text_w -= icons_width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	text_w = MAX (text_w, 0);</div><div class='del'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "clip_width", (gdouble) text_w,</div><div class='del'>-			       "clip_height", (gdouble) item_h,</div><div class='del'>-			       NULL);</div><div class='del'>-	e_canvas_item_move_absolute(event-&gt;canvas_item,</div><div class='del'>-				    text_x, item_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This creates or updates the sizes of the canvas items for one day of the</div><div class='del'>-   main canvas. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_day_events (EDayView *day_view,</div><div class='del'>-			       gint	 day)</div><div class='del'>-{</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_day_event (EDayView *day_view,</div><div class='del'>-			      gint	day,</div><div class='del'>-			      gint	event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-	gint num_icons, icons_offset;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-					    &amp;item_x, &amp;item_y,</div><div class='del'>-					    &amp;item_w, &amp;item_h)) {</div><div class='del'>-		if (event-&gt;canvas_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-			event-&gt;canvas_item = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Skip the border and padding. */</div><div class='del'>-		item_x += E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD;</div><div class='del'>-		item_w -= E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD * 2;</div><div class='del'>-		item_y += E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD;</div><div class='del'>-		item_h -= (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2;</div><div class='del'>-</div><div class='del'>-		/* We don't show the icons while resizing, since we'd have to</div><div class='del'>-		   draw them on top of the resize rect. */</div><div class='del'>-		num_icons = 0;</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_NONE</div><div class='del'>-		    || day_view-&gt;resize_event_day != day</div><div class='del'>-		    || day_view-&gt;resize_event_num != event_num) {</div><div class='del'>-			GSList *categories_list;</div><div class='del'>-</div><div class='del'>-			if (cal_component_has_alarms (comp))</div><div class='del'>-				num_icons++;</div><div class='del'>-			if (cal_component_has_recurrences (comp))</div><div class='del'>-				num_icons++;</div><div class='del'>-			if (event-&gt;different_timezone)</div><div class='del'>-				num_icons++;</div><div class='del'>-</div><div class='del'>-			cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-			num_icons += g_slist_length (categories_list);</div><div class='del'>-			cal_component_free_categories_list (categories_list);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (num_icons &gt; 0) {</div><div class='del'>-			if (item_h &gt;= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)</div><div class='del'>-				icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;</div><div class='del'>-			else</div><div class='del'>-				icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;</div><div class='del'>-			item_x += icons_offset;</div><div class='del'>-			item_w -= icons_offset;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!event-&gt;canvas_item) {</div><div class='del'>-			event-&gt;canvas_item =</div><div class='del'>-				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;main_canvas)-&gt;root),</div><div class='del'>-						       e_text_get_type (),</div><div class='del'>-						       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-						       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-						       "line_wrap", TRUE,</div><div class='del'>-						       "editable", TRUE,</div><div class='del'>-						       "clip", TRUE,</div><div class='del'>-						       "use_ellipsis", TRUE,</div><div class='del'>-						       "draw_background", FALSE,</div><div class='del'>-						       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),</div><div class='del'>-						       NULL);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-					    "event",</div><div class='del'>-					    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),</div><div class='del'>-					    day_view);</div><div class='del'>-			e_day_view_update_event_label (day_view, day,</div><div class='del'>-						       event_num);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		item_w = MAX (item_w, 0);</div><div class='del'>-		gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-				       "clip_width", (gdouble) item_w,</div><div class='del'>-				       "clip_height", (gdouble) item_h,</div><div class='del'>-				       NULL);</div><div class='del'>-		e_canvas_item_move_absolute(event-&gt;canvas_item,</div><div class='del'>-					    item_x, item_y);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This creates or resizes the horizontal bars used to resize events in the</div><div class='del'>-   main canvas. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-	gdouble x, y, w, h;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_bars_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_bars_event_num;</div><div class='del'>-</div><div class='del'>-	/* If we're not editing an event, or the event is not shown,</div><div class='del'>-	   hide the resize bars. */</div><div class='del'>-	if (day != -1 &amp;&amp; day == day_view-&gt;drag_event_day</div><div class='del'>-	    &amp;&amp; event_num == day_view-&gt;drag_event_num) {</div><div class='del'>-		gtk_object_get (GTK_OBJECT (day_view-&gt;drag_rect_item),</div><div class='del'>-				"x1", &amp;x,</div><div class='del'>-				"y1", &amp;y,</div><div class='del'>-				"x2", &amp;w,</div><div class='del'>-				"y2", &amp;h,</div><div class='del'>-				NULL);</div><div class='del'>-		w -= x;</div><div class='del'>-		x++;</div><div class='del'>-		h -= y;</div><div class='del'>-	} else if (day != -1</div><div class='del'>-		   &amp;&amp; e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-						     &amp;item_x, &amp;item_y,</div><div class='del'>-						     &amp;item_w, &amp;item_h)) {</div><div class='del'>-		x = item_x + E_DAY_VIEW_BAR_WIDTH;</div><div class='del'>-		y = item_y;</div><div class='del'>-		w = item_w - E_DAY_VIEW_BAR_WIDTH;</div><div class='del'>-		h = item_h;</div><div class='del'>-	} else {</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_top_resize_bar_item,</div><div class='del'>-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,</div><div class='del'>-			       "y1", y - E_DAY_VIEW_BAR_HEIGHT,</div><div class='del'>-			       "x2", x + w - 1,</div><div class='del'>-			       "y2", y - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_canvas_item_show (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_bottom_resize_bar_item,</div><div class='del'>-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,</div><div class='del'>-			       "y1", y + h,</div><div class='del'>-			       "x2", x + w - 1,</div><div class='del'>-			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_canvas_item_show (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_ensure_events_sorted (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	/* Sort the long events. */</div><div class='del'>-	if (!day_view-&gt;long_events_sorted) {</div><div class='del'>-		qsort (day_view-&gt;long_events-&gt;data,</div><div class='del'>-		       day_view-&gt;long_events-&gt;len,</div><div class='del'>-		       sizeof (EDayViewEvent),</div><div class='del'>-		       e_day_view_event_sort_func);</div><div class='del'>-		day_view-&gt;long_events_sorted = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sort the events for each day. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		if (!day_view-&gt;events_sorted[day]) {</div><div class='del'>-			qsort (day_view-&gt;events[day]-&gt;data,</div><div class='del'>-			       day_view-&gt;events[day]-&gt;len,</div><div class='del'>-			       sizeof (EDayViewEvent),</div><div class='del'>-			       e_day_view_event_sort_func);</div><div class='del'>-			day_view-&gt;events_sorted[day] = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_day_view_event_sort_func (const void *arg1,</div><div class='del'>-			    const void *arg2)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event1, *event2;</div><div class='del'>-</div><div class='del'>-	event1 = (EDayViewEvent*) arg1;</div><div class='del'>-	event2 = (EDayViewEvent*) arg2;</div><div class='del'>-</div><div class='del'>-	if (event1-&gt;start &lt; event2-&gt;start)</div><div class='del'>-		return -1;</div><div class='del'>-	if (event1-&gt;start &gt; event2-&gt;start)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (event1-&gt;end &gt; event2-&gt;end)</div><div class='del'>-		return -1;</div><div class='del'>-	if (event1-&gt;end &lt; event2-&gt;end)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gchar *initial_text;</div><div class='del'>-	guint keyval;</div><div class='del'>-	gboolean stop_emission;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	CalComponentDateTime start_dt, end_dt;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	keyval = event-&gt;keyval;</div><div class='del'>-</div><div class='del'>-	/* The Escape key aborts a resize operation. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		if (keyval == GDK_Escape) {</div><div class='del'>-			e_day_view_abort_resize (day_view, event-&gt;time);</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle the cursor keys for moving &amp; extending the selection. */</div><div class='del'>-	stop_emission = TRUE;</div><div class='del'>-	if (event-&gt;state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-		switch (keyval) {</div><div class='del'>-		case GDK_Up:</div><div class='del'>-			e_day_view_cursor_key_up_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Down:</div><div class='del'>-			e_day_view_cursor_key_down_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Left:</div><div class='del'>-			e_day_view_cursor_key_left_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Right:</div><div class='del'>-			e_day_view_cursor_key_right_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			stop_emission = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (keyval) {</div><div class='del'>-		case GDK_Up:</div><div class='del'>-			e_day_view_cursor_key_up (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Down:</div><div class='del'>-			e_day_view_cursor_key_down (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Left:</div><div class='del'>-			e_day_view_cursor_key_left (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Right:</div><div class='del'>-			e_day_view_cursor_key_right (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Page_Up:</div><div class='del'>-			e_day_view_scroll (day_view, E_DAY_VIEW_PAGE_STEP);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Page_Down:</div><div class='del'>-			e_day_view_scroll (day_view, -E_DAY_VIEW_PAGE_STEP);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			stop_emission = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (stop_emission)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_start_day == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Check if there is room for a new event to be typed in. If there</div><div class='del'>-	   isn't we don't want to add an event as we will then add a new</div><div class='del'>-	   event for every key press. */</div><div class='del'>-	if (!e_day_view_check_if_new_event_fits (day_view)) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only want to start an edit with a return key or a simple</div><div class='del'>-	   character. */</div><div class='del'>-	if (keyval == GDK_Return) {</div><div class='del'>-		initial_text = NULL;</div><div class='del'>-	} else if (((keyval &gt;= 0x20) &amp;&amp; (keyval &lt;= 0xFF)</div><div class='del'>-		    &amp;&amp; (event-&gt;state &amp; (GDK_CONTROL_MASK | GDK_MOD1_MASK)))</div><div class='del'>-		   || (event-&gt;length == 0)</div><div class='del'>-		   || (keyval == GDK_Tab)) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else</div><div class='del'>-		initial_text = e_utf8_from_gtk_event_key (widget, event-&gt;keyval, event-&gt;string);</div><div class='del'>-</div><div class='del'>-	/* Add a new event covering the selected range */</div><div class='del'>-</div><div class='del'>-	comp = cal_comp_event_new_with_defaults ();</div><div class='del'>-</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;dtstart, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (dtstart, FALSE,</div><div class='del'>-						  day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (dtend, FALSE,</div><div class='del'>-						day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		start_dt.tzid = NULL;</div><div class='del'>-		start_tt.is_date = 1;</div><div class='del'>-		end_tt.is_date = 1;</div><div class='del'>-	} else {</div><div class='del'>-		start_dt.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_dt.value = &amp;start_tt;</div><div class='del'>-	end_dt.value = &amp;end_tt;</div><div class='del'>-	end_dt.tzid = start_dt.tzid;</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;start_dt);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;end_dt);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories (comp, day_view-&gt;default_category);</div><div class='del'>-</div><div class='del'>-	/* We add the event locally and start editing it. We don't send it</div><div class='del'>-	   to the server until the user finishes editing it. */</div><div class='del'>-	e_day_view_add_event (comp, dtstart, dtend, day_view);</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	if (e_day_view_find_event_from_uid (day_view, uid, &amp;day, &amp;event_num)) {</div><div class='del'>-		e_day_view_start_editing_event (day_view, day, event_num,</div><div class='del'>-						initial_text);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Couldn't find event to start editing.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (initial_text)</div><div class='del'>-		g_free (initial_text);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *row;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		row = &amp;day_view-&gt;selection_start_row;</div><div class='del'>-	else</div><div class='del'>-		row = &amp;day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	if (*row == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*row = *row - 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_ensure_rows_visible (day_view, *row, *row);</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *row;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		row = &amp;day_view-&gt;selection_start_row;</div><div class='del'>-	else</div><div class='del'>-		row = &amp;day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	if (*row &gt;= day_view-&gt;rows - 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*row = *row + 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_ensure_rows_visible (day_view, *row, *row);</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		day = &amp;day_view-&gt;selection_start_day;</div><div class='del'>-	else</div><div class='del'>-		day = &amp;day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (*day == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*day = *day - 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		day = &amp;day_view-&gt;selection_start_day;</div><div class='del'>-	else</div><div class='del'>-		day = &amp;day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (*day &gt;= day_view-&gt;days_shown - 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*day = *day + 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == -1) {</div><div class='del'>-		day_view-&gt;selection_start_day = 0;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_day = day_view-&gt;selection_start_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		return;</div><div class='del'>-	} else if (day_view-&gt;selection_start_row == 0) {</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = TRUE;</div><div class='del'>-		day_view-&gt;selection_start_row = -1;</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_row--;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_row = day_view-&gt;selection_start_row;</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		e_day_view_ensure_rows_visible (day_view,</div><div class='del'>-						day_view-&gt;selection_start_row,</div><div class='del'>-						day_view-&gt;selection_end_row);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == -1) {</div><div class='del'>-		day_view-&gt;selection_start_day = 0;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_day = day_view-&gt;selection_start_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	} else if (day_view-&gt;selection_start_row &gt;= day_view-&gt;rows - 1) {</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_row++;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_row = day_view-&gt;selection_start_row;</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		e_day_view_ensure_rows_visible (day_view,</div><div class='del'>-						day_view-&gt;selection_start_row,</div><div class='del'>-						day_view-&gt;selection_end_row);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == 0) {</div><div class='del'>-		if (day_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_previous (day_view-&gt;calendar);</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_day--;</div><div class='del'>-		day_view-&gt;selection_end_day--;</div><div class='del'>-</div><div class='del'>-		e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-		/* FIXME: Optimise? */</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_end_day == day_view-&gt;days_shown - 1) {</div><div class='del'>-		if (day_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_next (day_view-&gt;calendar);</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_day++;</div><div class='del'>-		day_view-&gt;selection_end_day++;</div><div class='del'>-</div><div class='del'>-		e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-		/* FIXME: Optimise? */</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Scrolls the main canvas up or down. The pages_to_scroll argument</div><div class='del'>-   is multiplied with the adjustment's page size and added to the adjustment's</div><div class='del'>-   value, while ensuring we stay within the bounds. A positive value will</div><div class='del'>-   scroll the canvas down and a negative value will scroll it up. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_scroll	(EDayView	*day_view,</div><div class='del'>-			 gfloat		 pages_to_scroll)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-	gfloat new_value;</div><div class='del'>-</div><div class='del'>-	new_value = adj-&gt;value - adj-&gt;page_size * pages_to_scroll;</div><div class='del'>-	new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-	gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_check_if_new_event_fits (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint day, start_row, end_row, row;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;selection_start_day;</div><div class='del'>-	start_row = day_view-&gt;selection_start_row;</div><div class='del'>-	end_row = day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	/* Long events always fit, since we keep adding rows to the top</div><div class='del'>-	   canvas. */</div><div class='del'>-	if (day != day_view-&gt;selection_end_day)</div><div class='del'>-		return TRUE;</div><div class='del'>-	if (start_row == 0 &amp;&amp; end_row == day_view-&gt;rows)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,</div><div class='del'>-	   return FALSE. */</div><div class='del'>-	for (row = start_row; row &lt;= end_row; row++) {</div><div class='del'>-		if (day_view-&gt;cols_per_row[day][row] &gt;= E_DAY_VIEW_MAX_COLUMNS)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_ensure_rows_visible (EDayView *day_view,</div><div class='del'>-				gint start_row,</div><div class='del'>-				gint end_row)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	gfloat value, min_value, max_value;</div><div class='del'>-</div><div class='del'>-	adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-</div><div class='del'>-	value = adj-&gt;value;</div><div class='del'>-</div><div class='del'>-	min_value = (end_row + 1) * day_view-&gt;row_height - adj-&gt;page_size;</div><div class='del'>-	if (value &lt; min_value)</div><div class='del'>-		value = min_value;</div><div class='del'>-</div><div class='del'>-	max_value = start_row * day_view-&gt;row_height;</div><div class='del'>-	if (value &gt; max_value)</div><div class='del'>-		value = max_value;</div><div class='del'>-</div><div class='del'>-	if (value != adj-&gt;value) {</div><div class='del'>-		adj-&gt;value = value;</div><div class='del'>-		gtk_adjustment_value_changed (adj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_start_editing_event (EDayView *day_view,</div><div class='del'>-				gint	  day,</div><div class='del'>-				gint	  event_num,</div><div class='del'>-				gchar    *initial_text)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	ETextEventProcessor *event_processor = NULL;</div><div class='del'>-	ETextEventProcessorCommand command;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_start_editing_event\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If we are already editing the event, just return. */</div><div class='del'>-	if (day == day_view-&gt;editing_event_day</div><div class='del'>-	    &amp;&amp; event_num == day_view-&gt;editing_event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event is not shown, don't try to edit it. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We must grab the focus before setting the initial text, since</div><div class='del'>-	   grabbing the focus will result in a call to</div><div class='del'>-	   e_day_view_on_editing_started(), which will reset the text to get</div><div class='del'>-	   rid of the start and end times. */</div><div class='del'>-	e_canvas_item_grab_focus (event-&gt;canvas_item, TRUE);</div><div class='del'>-</div><div class='del'>-	if (initial_text) {</div><div class='del'>-		gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-				       "text", initial_text,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to move the cursor to the end of the text. */</div><div class='del'>-	gtk_object_get (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-			"event_processor", &amp;event_processor,</div><div class='del'>-			NULL);</div><div class='del'>-	if (event_processor) {</div><div class='del'>-		command.action = E_TEP_MOVE;</div><div class='del'>-		command.position = E_TEP_END_OF_BUFFER;</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),</div><div class='del'>-					 "command", &amp;command);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This stops the current edit. If accept is TRUE the event summary is update,</div><div class='del'>-   else the edit is cancelled. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_stop_editing_event (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	/* Check we are editing an event. */</div><div class='del'>-	if (day_view-&gt;editing_event_day == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set focus to the toplevel so the item loses focus. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));</div><div class='del'>-	if (toplevel &amp;&amp; GTK_IS_WINDOW (toplevel))</div><div class='del'>-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Cancels the current edition by resetting the appointment's text to its original value */</div><div class='del'>-static void</div><div class='del'>-cancel_editing (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	int day, event_num;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;editing_event_day;</div><div class='del'>-	event_num = day_view-&gt;editing_event_num;</div><div class='del'>-</div><div class='del'>-	g_assert (day != -1);</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	/* Reset the text to what was in the component */</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-			"text", summary.value ? summary.value : "",</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* Stop editing */</div><div class='del'>-	e_day_view_stop_editing_event (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_text_item_event (GnomeCanvasItem *item,</div><div class='del'>-			       GdkEvent *event,</div><div class='del'>-			       EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_KEY_PRESS:</div><div class='del'>-		if (event &amp;&amp; event-&gt;key.keyval == GDK_Return) {</div><div class='del'>-			/* We set the keyboard focus to the EDayView, so the</div><div class='del'>-			   EText item loses it and stops the edit. */</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-			/* Stop the signal last or we will also stop any</div><div class='del'>-			   other events getting to the EText item. */</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),</div><div class='del'>-						      "event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		} else if (event-&gt;key.keyval == GDK_Escape) {</div><div class='del'>-			cancel_editing (day_view);</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("Item got double-click\n");</div><div class='del'>-#endif</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		/* Only let the EText handle the event while editing. */</div><div class='del'>-		if (!E_TEXT (item)-&gt;editing)</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),</div><div class='del'>-						      "event");</div><div class='del'>-		break;</div><div class='del'>-	case GDK_FOCUS_CHANGE:</div><div class='del'>-		if (event-&gt;focus_change.in)</div><div class='del'>-			e_day_view_on_editing_started (day_view, item);</div><div class='del'>-		else</div><div class='del'>-			e_day_view_on_editing_stopped (day_view, item);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_editing_started (EDayView *day_view,</div><div class='del'>-			       GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_find_event_from_item (day_view, item,</div><div class='del'>-					      &amp;day, &amp;event_num))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_editing_started Day:%i Event:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* FIXME: This is a temporary workaround for a bug which seems to stop</div><div class='del'>-	   us getting focus_out signals. It is not a complete fix since if we</div><div class='del'>-	   don't get focus_out signals we don't save the appointment text so</div><div class='del'>-	   this may be lost. */</div><div class='del'>-	if (day_view-&gt;editing_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;editing_event_day = day;</div><div class='del'>-	day_view-&gt;editing_event_num = event_num;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;resize_bars_event_day = day;</div><div class='del'>-		day_view-&gt;resize_bars_event_num = event_num;</div><div class='del'>-		e_day_view_update_event_label (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (day_view),</div><div class='del'>-			 e_day_view_signals[SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_editing_stopped (EDayView *day_view,</div><div class='del'>-			       GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gboolean editing_long_event = FALSE;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gchar *text = NULL;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	/* Note: the item we are passed here isn't reliable, so we just stop</div><div class='del'>-	   the edit of whatever item was being edited. We also receive this</div><div class='del'>-	   event twice for some reason. */</div><div class='del'>-	day = day_view-&gt;editing_event_day;</div><div class='del'>-	event_num = day_view-&gt;editing_event_num;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If no item is being edited, just return. */</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		editing_long_event = TRUE;</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		/* Hide the horizontal bars. */</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset the edit fields. */</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-			"text", &amp;text,</div><div class='del'>-			NULL);</div><div class='del'>-	g_assert (text != NULL);</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (text)) {</div><div class='del'>-		ConfirmDeleteEmptyCompResult result;</div><div class='del'>-</div><div class='del'>-		result = cal_comp_confirm_delete_empty_comp (event-&gt;comp, day_view-&gt;client,</div><div class='del'>-							     GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-		switch (result) {</div><div class='del'>-		case EMPTY_COMP_REMOVE_LOCALLY: {</div><div class='del'>-			const char *uid;</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-			e_day_view_foreach_event_with_uid (day_view, uid,</div><div class='del'>-							   e_day_view_remove_event_cb, NULL);</div><div class='del'>-			e_day_view_check_layout (day_view);</div><div class='del'>-			gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-			gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-			goto out; }</div><div class='del'>-</div><div class='del'>-		case EMPTY_COMP_REMOVED_FROM_SERVER:</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		case EMPTY_COMP_DO_NOT_REMOVE:</div><div class='del'>-			/* But we cannot keep an empty summary, so make the</div><div class='del'>-			 * canvas item refresh itself from the text that the</div><div class='del'>-			 * component already had.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-				e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-			else</div><div class='del'>-				e_day_view_update_event_label (day_view, day, event_num);</div><div class='del'>-</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	if (summary.value &amp;&amp; !strcmp (text, summary.value)) {</div><div class='del'>-		if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-			e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-		else</div><div class='del'>-			e_day_view_update_event_label (day_view, day,</div><div class='del'>-						       event_num);</div><div class='del'>-	} else {</div><div class='del'>-		summary.value = text;</div><div class='del'>-		summary.altrep = NULL;</div><div class='del'>-		cal_component_set_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-		if (cal_client_update_object (day_view-&gt;client, event-&gt;comp)) {</div><div class='del'>-			if (cal_component_has_attendees (event-&gt;comp) &amp;&amp; send_component_dialog (event-&gt;comp, FALSE))</div><div class='del'>-				itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event-&gt;comp,</div><div class='del'>-						day_view-&gt;client, NULL);</div><div class='del'>-		} else {</div><div class='del'>-			g_message ("e_day_view_on_editing_stopped(): Could not update the object!");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	g_free (text);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (day_view),</div><div class='del'>-			 e_day_view_signals[SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: It is possible that we may produce an invalid time due to daylight</div><div class='del'>-   saving times (i.e. when clocks go forward there is a range of time which</div><div class='del'>-   is not valid). I don't know the best way to handle daylight saving time. */</div><div class='del'>-static time_t</div><div class='del'>-e_day_view_convert_grid_position_to_time (EDayView *day_view,</div><div class='del'>-					  gint col,</div><div class='del'>-					  gint row)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	time_t val;</div><div class='del'>-	gint minutes;</div><div class='del'>-</div><div class='del'>-	/* Calulate the number of minutes since the start of the day. */</div><div class='del'>-	minutes = day_view-&gt;first_hour_shown * 60</div><div class='del'>-		+ day_view-&gt;first_minute_shown</div><div class='del'>-		+ row * day_view-&gt;mins_per_row;</div><div class='del'>-</div><div class='del'>-	/* A special case for midnight, where we can use the start of the</div><div class='del'>-	   next day. */</div><div class='del'>-	if (minutes == 60 * 24)</div><div class='del'>-		return day_view-&gt;day_starts[col + 1];</div><div class='del'>-</div><div class='del'>-	/* Create an icaltimetype and convert to a time_t. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (day_view-&gt;day_starts[col],</div><div class='del'>-					    FALSE, day_view-&gt;zone);</div><div class='del'>-	tt.hour = minutes / 60;</div><div class='del'>-	tt.minute = minutes % 60;</div><div class='del'>-	tt.second = 0;</div><div class='del'>-</div><div class='del'>-	val = icaltime_as_timet_with_zone (tt, day_view-&gt;zone);</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_convert_time_to_grid_position (EDayView *day_view,</div><div class='del'>-					  time_t time,</div><div class='del'>-					  gint *col,</div><div class='del'>-					  gint *row)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	gint day, minutes;</div><div class='del'>-</div><div class='del'>-	*col = *row = 0;</div><div class='del'>-</div><div class='del'>-	if (time &lt; day_view-&gt;lower || time &gt;= day_view-&gt;upper)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* We can find the column easily using the day_starts array. */</div><div class='del'>-	for (day = 1; day &lt;= day_view-&gt;days_shown; day++) {</div><div class='del'>-		if (time &lt; day_view-&gt;day_starts[day]) {</div><div class='del'>-			*col = day - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* To find the row we need to convert the time to an icaltimetype,</div><div class='del'>-	   calculate the offset in minutes from the top of the display and</div><div class='del'>-	   divide it by the mins per row setting. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	minutes = tt.hour * 60 + tt.minute;</div><div class='del'>-	minutes -= day_view-&gt;first_hour_shown * 60 + day_view-&gt;first_minute_shown;</div><div class='del'>-</div><div class='del'>-	*row = minutes / day_view-&gt;mins_per_row;</div><div class='del'>-</div><div class='del'>-	if (*row &lt; 0 || *row &gt;= day_view-&gt;rows)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This starts or stops auto-scrolling when dragging a selection or resizing</div><div class='del'>-   an event. */</div><div class='del'>-void</div><div class='del'>-e_day_view_check_auto_scroll (EDayView *day_view,</div><div class='del'>-			      gint event_x,</div><div class='del'>-			      gint event_y)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;last_mouse_x = event_x;</div><div class='del'>-	day_view-&gt;last_mouse_y = event_y;</div><div class='del'>-</div><div class='del'>-	if (event_y &lt; E_DAY_VIEW_AUTO_SCROLL_OFFSET)</div><div class='del'>-		e_day_view_start_auto_scroll (day_view, TRUE);</div><div class='del'>-	else if (event_y &gt;= day_view-&gt;main_canvas-&gt;allocation.height</div><div class='del'>-		 - E_DAY_VIEW_AUTO_SCROLL_OFFSET)</div><div class='del'>-		e_day_view_start_auto_scroll (day_view, FALSE);</div><div class='del'>-	else</div><div class='del'>-		e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_start_auto_scroll (EDayView *day_view,</div><div class='del'>-			      gboolean scroll_up)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;auto_scroll_timeout_id == 0) {</div><div class='del'>-		day_view-&gt;auto_scroll_timeout_id = g_timeout_add (E_DAY_VIEW_AUTO_SCROLL_TIMEOUT, e_day_view_auto_scroll_handler, day_view);</div><div class='del'>-		day_view-&gt;auto_scroll_delay = E_DAY_VIEW_AUTO_SCROLL_DELAY;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;auto_scroll_up = scroll_up;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_stop_auto_scroll (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;auto_scroll_timeout_id != 0) {</div><div class='del'>-		gtk_timeout_remove (day_view-&gt;auto_scroll_timeout_id);</div><div class='del'>-		day_view-&gt;auto_scroll_timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_auto_scroll_handler (gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint scroll_x, scroll_y, new_scroll_y, canvas_x, canvas_y, row, day;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;auto_scroll_delay &gt; 0) {</div><div class='del'>-		day_view-&gt;auto_scroll_delay--;</div><div class='del'>-		GDK_THREADS_LEAVE ();</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-</div><div class='del'>-	adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;auto_scroll_up)</div><div class='del'>-		new_scroll_y = MAX (scroll_y - adj-&gt;step_increment, 0);</div><div class='del'>-	else</div><div class='del'>-		new_scroll_y = MIN (scroll_y + adj-&gt;step_increment,</div><div class='del'>-				    adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-</div><div class='del'>-	if (new_scroll_y != scroll_y) {</div><div class='del'>-		/* NOTE: This reduces flicker, but only works if we don't use</div><div class='del'>-		   canvas items which have X windows. */</div><div class='del'>-		gtk_layout_freeze (GTK_LAYOUT (day_view-&gt;main_canvas));</div><div class='del'>-</div><div class='del'>-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-					scroll_x, new_scroll_y);</div><div class='del'>-</div><div class='del'>-		gtk_layout_thaw (GTK_LAYOUT (day_view-&gt;main_canvas));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	canvas_x = day_view-&gt;last_mouse_x + scroll_x;</div><div class='del'>-	canvas_y = day_view-&gt;last_mouse_y + new_scroll_y;</div><div class='del'>-</div><div class='del'>-	/* The last_mouse_x position is set to -1 when we are selecting using</div><div class='del'>-	   the time column. In this case we set canvas_x to 0 and we ignore</div><div class='del'>-	   the resulting day. */</div><div class='del'>-	if (day_view-&gt;last_mouse_x == -1)</div><div class='del'>-		canvas_x = 0;</div><div class='del'>-</div><div class='del'>-	/* Update the selection/resize/drag if necessary. */</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-							  canvas_x, canvas_y,</div><div class='del'>-							  &amp;day, &amp;row, NULL);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;last_mouse_x == -1)</div><div class='del'>-		day = -1;</div><div class='del'>-</div><div class='del'>-	if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-		if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-			e_day_view_update_selection (day_view, day, row);</div><div class='del'>-		} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-			e_day_view_update_resize (day_view, row);</div><div class='del'>-		} else if (day_view-&gt;drag_item-&gt;object.flags</div><div class='del'>-			   &amp; GNOME_CANVAS_ITEM_VISIBLE) {</div><div class='del'>-			e_day_view_update_main_canvas_drag (day_view, row,</div><div class='del'>-							    day);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE ();</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_event_position (EDayView *day_view,</div><div class='del'>-			       gint day,</div><div class='del'>-			       gint event_num,</div><div class='del'>-			       gint *item_x,</div><div class='del'>-			       gint *item_y,</div><div class='del'>-			       gint *item_w,</div><div class='del'>-			       gint *item_h)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint start_row, end_row, cols_in_row, start_col, num_columns;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event is flagged as not displayed, return FALSE. */</div><div class='del'>-	if (event-&gt;num_columns == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-	end_row = (event-&gt;end_minute - 1) / day_view-&gt;mins_per_row;</div><div class='del'>-	if (end_row &lt; start_row)</div><div class='del'>-		end_row = start_row;</div><div class='del'>-</div><div class='del'>-	cols_in_row = day_view-&gt;cols_per_row[day][start_row];</div><div class='del'>-	start_col = event-&gt;start_row_or_col;</div><div class='del'>-	num_columns = event-&gt;num_columns;</div><div class='del'>-</div><div class='del'>-	if (cols_in_row == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If the event is being resize, use the resize position. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num) {</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)</div><div class='del'>-			start_row = day_view-&gt;resize_start_row;</div><div class='del'>-		else if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)</div><div class='del'>-			end_row = day_view-&gt;resize_end_row;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	*item_x = day_view-&gt;day_offsets[day]</div><div class='del'>-		+ day_view-&gt;day_widths[day] * start_col / cols_in_row;</div><div class='del'>-	*item_w = day_view-&gt;day_widths[day] * num_columns / cols_in_row</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	*item_w = MAX (*item_w, 0);</div><div class='del'>-	*item_y = start_row * day_view-&gt;row_height;</div><div class='del'>-#if 0</div><div class='del'>-	*item_h = (end_row - start_row + 1) * day_view-&gt;row_height;</div><div class='del'>-#else</div><div class='del'>-	/* This makes the event end on the grid line of the next row,</div><div class='del'>-	   which maybe looks nicer if you have 2 events on consecutive rows. */</div><div class='del'>-	*item_h = (end_row - start_row + 1) * day_view-&gt;row_height + 1;</div><div class='del'>-#endif</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_long_event_position	(EDayView	*day_view,</div><div class='del'>-					 gint		 event_num,</div><div class='del'>-					 gint		*start_day,</div><div class='del'>-					 gint		*end_day,</div><div class='del'>-					 gint		*item_x,</div><div class='del'>-					 gint		*item_y,</div><div class='del'>-					 gint		*item_w,</div><div class='del'>-					 gint		*item_h)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event is flagged as not displayed, return FALSE. */</div><div class='del'>-	if (event-&gt;num_columns == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_find_long_event_days (event,</div><div class='del'>-					      day_view-&gt;days_shown,</div><div class='del'>-					      day_view-&gt;day_starts,</div><div class='del'>-					      start_day, end_day))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If the event is being resize, use the resize position. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num) {</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)</div><div class='del'>-			*start_day = day_view-&gt;resize_start_row;</div><div class='del'>-		else if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)</div><div class='del'>-			*end_day = day_view-&gt;resize_end_row;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*item_x = day_view-&gt;day_offsets[*start_day] + E_DAY_VIEW_BAR_WIDTH;</div><div class='del'>-	*item_w = day_view-&gt;day_offsets[*end_day + 1] - *item_x</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	*item_w = MAX (*item_w, 0);</div><div class='del'>-	*item_y = (event-&gt;start_row_or_col + 1) * day_view-&gt;top_row_height;</div><div class='del'>-	*item_h = day_view-&gt;top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts a position within the entire top canvas to a day &amp; event and</div><div class='del'>-   a place within the event if appropriate. If event_num_return is NULL, it</div><div class='del'>-   simply returns the grid position without trying to find the event. */</div><div class='del'>-static EDayViewPosition</div><div class='del'>-e_day_view_convert_position_in_top_canvas (EDayView *day_view,</div><div class='del'>-					   gint x,</div><div class='del'>-					   gint y,</div><div class='del'>-					   gint *day_return,</div><div class='del'>-					   gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, row, col;</div><div class='del'>-	gint event_num, start_day, end_day, item_x, item_y, item_w, item_h;</div><div class='del'>-</div><div class='del'>-	*day_return = -1;</div><div class='del'>-	if (event_num_return)</div><div class='del'>-		*event_num_return = -1;</div><div class='del'>-</div><div class='del'>-	if (x &lt; 0 || y &lt; 0)</div><div class='del'>-		return E_DAY_VIEW_POS_OUTSIDE;</div><div class='del'>-</div><div class='del'>-	row = y / day_view-&gt;top_row_height - 1;</div><div class='del'>-</div><div class='del'>-	day = -1;</div><div class='del'>-	for (col = 1; col &lt;= day_view-&gt;days_shown; col++) {</div><div class='del'>-		if (x &lt; day_view-&gt;day_offsets[col]) {</div><div class='del'>-			day = col - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return E_DAY_VIEW_POS_OUTSIDE;</div><div class='del'>-</div><div class='del'>-	*day_return = day;</div><div class='del'>-</div><div class='del'>-	/* If only the grid position is wanted, return. */</div><div class='del'>-	if (event_num_return == NULL)</div><div class='del'>-		return E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		if (event-&gt;start_row_or_col != row)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (!e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-							 &amp;start_day, &amp;end_day,</div><div class='del'>-							 &amp;item_x, &amp;item_y,</div><div class='del'>-							 &amp;item_w, &amp;item_h))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (x &lt; item_x)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (x &gt;= item_x + item_w)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		*event_num_return = event_num;</div><div class='del'>-</div><div class='del'>-		if (x &lt; item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH</div><div class='del'>-		    + E_DAY_VIEW_LONG_EVENT_X_PAD)</div><div class='del'>-			return E_DAY_VIEW_POS_LEFT_EDGE;</div><div class='del'>-</div><div class='del'>-		if (x &gt;= item_x + item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH</div><div class='del'>-		    - E_DAY_VIEW_LONG_EVENT_X_PAD)</div><div class='del'>-			return E_DAY_VIEW_POS_RIGHT_EDGE;</div><div class='del'>-</div><div class='del'>-		return E_DAY_VIEW_POS_EVENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_DAY_VIEW_POS_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts a position within the entire main canvas to a day, row, event and</div><div class='del'>-   a place within the event if appropriate. If event_num_return is NULL, it</div><div class='del'>-   simply returns the grid position without trying to find the event. */</div><div class='del'>-static EDayViewPosition</div><div class='del'>-e_day_view_convert_position_in_main_canvas (EDayView *day_view,</div><div class='del'>-					    gint x,</div><div class='del'>-					    gint y,</div><div class='del'>-					    gint *day_return,</div><div class='del'>-					    gint *row_return,</div><div class='del'>-					    gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	gint day, row, col, event_num;</div><div class='del'>-	gint item_x, item_y, item_w, item_h;</div><div class='del'>-</div><div class='del'>-	*day_return = -1;</div><div class='del'>-	*row_return = -1;</div><div class='del'>-	if (event_num_return)</div><div class='del'>-		*event_num_return = -1;</div><div class='del'>-</div><div class='del'>-	/* Check the position is inside the canvas, and determine the day</div><div class='del'>-	   and row. */</div><div class='del'>-	if (x &lt; 0 || y &lt; 0)</div><div class='del'>-		return E_DAY_VIEW_POS_OUTSIDE;</div><div class='del'>-</div><div class='del'>-	row = y / day_view-&gt;row_height;</div><div class='del'>-	if (row &gt;= day_view-&gt;rows)</div><div class='del'>-		return E_DAY_VIEW_POS_OUTSIDE;</div><div class='del'>-</div><div class='del'>-	day = -1;</div><div class='del'>-	for (col = 1; col &lt;= day_view-&gt;days_shown; col++) {</div><div class='del'>-		if (x &lt; day_view-&gt;day_offsets[col]) {</div><div class='del'>-			day = col - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return E_DAY_VIEW_POS_OUTSIDE;</div><div class='del'>-</div><div class='del'>-	*day_return = day;</div><div class='del'>-	*row_return = row;</div><div class='del'>-</div><div class='del'>-	/* If only the grid position is wanted, return. */</div><div class='del'>-	if (event_num_return == NULL)</div><div class='del'>-		return E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	/* Check the selected item first, since the horizontal resizing bars</div><div class='del'>-	   may be above other events. */</div><div class='del'>-	if (day_view-&gt;resize_bars_event_day == day) {</div><div class='del'>-		if (e_day_view_get_event_position (day_view, day,</div><div class='del'>-						   day_view-&gt;resize_bars_event_num,</div><div class='del'>-						   &amp;item_x, &amp;item_y,</div><div class='del'>-						   &amp;item_w, &amp;item_h)) {</div><div class='del'>-			if (x &gt;= item_x &amp;&amp; x &lt; item_x + item_w) {</div><div class='del'>-				*event_num_return = day_view-&gt;resize_bars_event_num;</div><div class='del'>-				if (y &gt;= item_y - E_DAY_VIEW_BAR_HEIGHT</div><div class='del'>-				    &amp;&amp; y &lt; item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT)</div><div class='del'>-					return E_DAY_VIEW_POS_TOP_EDGE;</div><div class='del'>-				if (y &gt;= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-				    &amp;&amp; y &lt; item_y + item_h + E_DAY_VIEW_BAR_HEIGHT)</div><div class='del'>-					return E_DAY_VIEW_POS_BOTTOM_EDGE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to find the event at the found position. */</div><div class='del'>-	*event_num_return = -1;</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		if (!e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-						    &amp;item_x, &amp;item_y,</div><div class='del'>-						    &amp;item_w, &amp;item_h))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (x &lt; item_x || x &gt;= item_x + item_w</div><div class='del'>-		    || y &lt; item_y || y &gt;= item_y + item_h)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		*event_num_return = event_num;</div><div class='del'>-</div><div class='del'>-		if (x &lt; item_x + E_DAY_VIEW_BAR_WIDTH)</div><div class='del'>-			return E_DAY_VIEW_POS_LEFT_EDGE;</div><div class='del'>-</div><div class='del'>-		if (y &lt; item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		    + E_DAY_VIEW_EVENT_Y_PAD)</div><div class='del'>-			return E_DAY_VIEW_POS_TOP_EDGE;</div><div class='del'>-</div><div class='del'>-		if (y &gt;= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		    - E_DAY_VIEW_EVENT_Y_PAD)</div><div class='del'>-			return E_DAY_VIEW_POS_BOTTOM_EDGE;</div><div class='del'>-</div><div class='del'>-		return E_DAY_VIEW_POS_EVENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_DAY_VIEW_POS_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,</div><div class='del'>-				      GdkDragContext *context,</div><div class='del'>-				      gint            x,</div><div class='del'>-				      gint            y,</div><div class='del'>-				      guint           time,</div><div class='del'>-				      EDayView	     *day_view)</div><div class='del'>-{</div><div class='del'>-	gint scroll_x, scroll_y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	day_view-&gt;drag_event_x = x + scroll_x;</div><div class='del'>-	day_view-&gt;drag_event_y = y + scroll_y;</div><div class='del'>-</div><div class='del'>-	e_day_view_reshape_top_canvas_drag_item (day_view);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint x, y, day;</div><div class='del'>-</div><div class='del'>-	/* Calculate the day &amp; start row of the event being dragged, using</div><div class='del'>-	   the current mouse position. */</div><div class='del'>-	x = day_view-&gt;drag_event_x;</div><div class='del'>-	y = day_view-&gt;drag_event_y;</div><div class='del'>-	pos = e_day_view_convert_position_in_top_canvas (day_view, x, y,</div><div class='del'>-							 &amp;day, NULL);</div><div class='del'>-	/* This shouldn't really happen in a drag. */</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_OUTSIDE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		day -= day_view-&gt;drag_event_offset;</div><div class='del'>-	day = MAX (day, 0);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_top_canvas_drag (day_view, day);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_top_canvas_drag (EDayView *day_view,</div><div class='del'>-				   gint day)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	gint row, num_days, start_day, end_day;</div><div class='del'>-	gdouble item_x, item_y, item_w, item_h;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Calculate the event's position. If the event is in the same</div><div class='del'>-	   position we started in, we use the same columns. */</div><div class='del'>-	row = day_view-&gt;rows_in_top_display + 1;</div><div class='del'>-	num_days = 1;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-		row = event-&gt;start_row_or_col + 1;</div><div class='del'>-</div><div class='del'>-		if (!e_day_view_find_long_event_days (event,</div><div class='del'>-						      day_view-&gt;days_shown,</div><div class='del'>-						      day_view-&gt;day_starts,</div><div class='del'>-						      &amp;start_day, &amp;end_day))</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		num_days = end_day - start_day + 1;</div><div class='del'>-</div><div class='del'>-		/* Make sure we don't go off the screen. */</div><div class='del'>-		day = MIN (day, day_view-&gt;days_shown - num_days);</div><div class='del'>-</div><div class='del'>-	} else if (day_view-&gt;drag_event_day != -1) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;drag_event_day],</div><div class='del'>-					EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the position hasn't changed, just return. */</div><div class='del'>-	if (day_view-&gt;drag_last_day == day</div><div class='del'>-	    &amp;&amp; (day_view-&gt;drag_long_event_item-&gt;object.flags</div><div class='del'>-		&amp; GNOME_CANVAS_ITEM_VISIBLE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_last_day = day;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	item_x = day_view-&gt;day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;</div><div class='del'>-	item_w = day_view-&gt;day_offsets[day + num_days] - item_x</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	item_y = row * day_view-&gt;top_row_height;</div><div class='del'>-	item_h = day_view-&gt;top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set the positions of the event &amp; associated items. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_rect_item,</div><div class='del'>-			       "x1", item_x,</div><div class='del'>-			       "y1", item_y,</div><div class='del'>-			       "x2", item_x + item_w - 1,</div><div class='del'>-			       "y2", item_y + item_h - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_item,</div><div class='del'>-			       "font_gdk", font,</div><div class='del'>-			       "clip_width", item_w - (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2,</div><div class='del'>-			       "clip_height", item_h - (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2,</div><div class='del'>-			       NULL);</div><div class='del'>-	e_canvas_item_move_absolute (day_view-&gt;drag_long_event_item,</div><div class='del'>-				     item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD,</div><div class='del'>-				     item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD);</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;drag_long_event_rect_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the text, if necessary. We don't want to set the text every</div><div class='del'>-	   time it moves, so we check if it is currently invisible and only</div><div class='del'>-	   set the text then. */</div><div class='del'>-	if (!(day_view-&gt;drag_long_event_item-&gt;object.flags</div><div class='del'>-	      &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-</div><div class='del'>-		if (event) {</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-			text = g_strdup (summary.value);</div><div class='del'>-		} else {</div><div class='del'>-			text = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (day_view-&gt;drag_long_event_item,</div><div class='del'>-				       "text", text ? text : "",</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_long_event_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_long_event_item);</div><div class='del'>-</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,</div><div class='del'>-				       GdkDragContext *context,</div><div class='del'>-				       gint            x,</div><div class='del'>-				       gint            y,</div><div class='del'>-				       guint           time,</div><div class='del'>-				       EDayView	      *day_view)</div><div class='del'>-{</div><div class='del'>-	gint scroll_x, scroll_y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	day_view-&gt;drag_event_x = x + scroll_x;</div><div class='del'>-	day_view-&gt;drag_event_y = y + scroll_y;</div><div class='del'>-</div><div class='del'>-	e_day_view_reshape_main_canvas_drag_item (day_view);</div><div class='del'>-	e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_check_auto_scroll (day_view, x, y);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint x, y, day, row;</div><div class='del'>-</div><div class='del'>-	/* Calculate the day &amp; start row of the event being dragged, using</div><div class='del'>-	   the current mouse position. */</div><div class='del'>-	x = day_view-&gt;drag_event_x;</div><div class='del'>-	y = day_view-&gt;drag_event_y;</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,</div><div class='del'>-							  &amp;day, &amp;row, NULL);</div><div class='del'>-	/* This shouldn't really happen in a drag. */</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_OUTSIDE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day != -1</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_day != E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		row -= day_view-&gt;drag_event_offset;</div><div class='del'>-	row = MAX (row, 0);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_main_canvas_drag (day_view, row, day);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_main_canvas_drag (EDayView *day_view,</div><div class='del'>-				    gint row,</div><div class='del'>-				    gint day)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;</div><div class='del'>-	gdouble item_x, item_y, item_w, item_h;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	/* If the position hasn't changed, just return. */</div><div class='del'>-	if (day_view-&gt;drag_last_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_last_row == row</div><div class='del'>-	    &amp;&amp; (day_view-&gt;drag_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_last_day = day;</div><div class='del'>-	day_view-&gt;drag_last_row = row;</div><div class='del'>-</div><div class='del'>-	/* Calculate the event's position. If the event is in the same</div><div class='del'>-	   position we started in, we use the same columns. */</div><div class='del'>-	cols_in_row = 1;</div><div class='del'>-	start_row = 0;</div><div class='del'>-	start_col = 0;</div><div class='del'>-	num_columns = 1;</div><div class='del'>-	num_rows = 1;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-	} else if (day_view-&gt;drag_event_day != -1) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;drag_event_day],</div><div class='del'>-					EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-		start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-		end_row = (event-&gt;end_minute - 1) / day_view-&gt;mins_per_row;</div><div class='del'>-		if (end_row &lt; start_row)</div><div class='del'>-			end_row = start_row;</div><div class='del'>-</div><div class='del'>-		num_rows = end_row - start_row + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == day &amp;&amp; start_row == row) {</div><div class='del'>-		cols_in_row = day_view-&gt;cols_per_row[day][row];</div><div class='del'>-		start_col = event-&gt;start_row_or_col;</div><div class='del'>-		num_columns = event-&gt;num_columns;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	item_x = day_view-&gt;day_offsets[day]</div><div class='del'>-		+ day_view-&gt;day_widths[day] * start_col / cols_in_row;</div><div class='del'>-	item_w = day_view-&gt;day_widths[day] * num_columns / cols_in_row</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	item_y = row * day_view-&gt;row_height;</div><div class='del'>-	item_h = num_rows * day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-	/* Set the positions of the event &amp; associated items. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_rect_item,</div><div class='del'>-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y1", item_y,</div><div class='del'>-			       "x2", item_x + item_w - 1,</div><div class='del'>-			       "y2", item_y + item_h - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_bar_item,</div><div class='del'>-			       "x1", item_x,</div><div class='del'>-			       "y1", item_y,</div><div class='del'>-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y2", item_y + item_h - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-			       "font_gdk", font,</div><div class='del'>-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,</div><div class='del'>-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,</div><div class='del'>-			       NULL);</div><div class='del'>-	e_canvas_item_move_absolute (day_view-&gt;drag_item,</div><div class='del'>-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,</div><div class='del'>-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;drag_bar_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_bar_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_bar_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;drag_rect_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_rect_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_rect_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the text, if necessary. We don't want to set the text every</div><div class='del'>-	   time it moves, so we check if it is currently invisible and only</div><div class='del'>-	   set the text then. */</div><div class='del'>-	if (!(day_view-&gt;drag_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-</div><div class='del'>-		if (event) {</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-			text = g_strdup (summary.value);</div><div class='del'>-		} else {</div><div class='del'>-			text = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-				       "text", text ? text : "",</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-				     GdkDragContext *context,</div><div class='del'>-				     guint           time,</div><div class='del'>-				     EDayView	     *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-				      GdkDragContext *context,</div><div class='del'>-				      guint           time,</div><div class='del'>-				      EDayView	     *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_bar_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-	/* Hide the resize bars if they are being used in the drag. */</div><div class='del'>-	if (day_view-&gt;drag_event_day == day_view-&gt;resize_bars_event_day</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_num == day_view-&gt;resize_bars_event_num) {</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_begin (GtkWidget      *widget,</div><div class='del'>-			  GdkDragContext *context,</div><div class='del'>-			  EDayView	 *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* These should both be set. */</div><div class='del'>-	g_return_if_fail (day != -1);</div><div class='del'>-	g_return_if_fail (event_num != -1);</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	/* Hide the text item, since it will be shown in the special drag</div><div class='del'>-	   items. */</div><div class='del'>-	gnome_canvas_item_hide (event-&gt;canvas_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_end (GtkWidget      *widget,</div><div class='del'>-			GdkDragContext *context,</div><div class='del'>-			EDayView       *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* If the calendar has already been updated in drag_data_received()</div><div class='del'>-	   we just return. */</div><div class='del'>-	if (day == -1 || event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Show the text item again. */</div><div class='del'>-	gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_event_num = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_data_get (GtkWidget          *widget,</div><div class='del'>-			     GdkDragContext     *context,</div><div class='del'>-			     GtkSelectionData   *selection_data,</div><div class='del'>-			     guint               info,</div><div class='del'>-			     guint               time,</div><div class='del'>-			     EDayView		*day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	const char *event_uid;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* These should both be set. */</div><div class='del'>-	g_return_if_fail (day != -1);</div><div class='del'>-	g_return_if_fail (event_num != -1);</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;event_uid);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (event_uid != NULL);</div><div class='del'>-</div><div class='del'>-	if (info == TARGET_CALENDAR_EVENT) {</div><div class='del'>-		gtk_selection_data_set (selection_data,	selection_data-&gt;target,</div><div class='del'>-					8, event_uid, strlen (event_uid));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,</div><div class='del'>-					      GdkDragContext     *context,</div><div class='del'>-					      gint                x,</div><div class='del'>-					      gint                y,</div><div class='del'>-					      GtkSelectionData   *data,</div><div class='del'>-					      guint               info,</div><div class='del'>-					      guint               time,</div><div class='del'>-					      EDayView	         *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event=NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint day, start_day, end_day, num_days;</div><div class='del'>-	gint start_offset, end_offset;</div><div class='del'>-	gchar *event_uid;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-	gboolean all_day_event;</div><div class='del'>-</div><div class='del'>-	/* Note that we only support DnD within the EDayView at present. */</div><div class='del'>-	if ((data-&gt;length &gt;= 0) &amp;&amp; (data-&gt;format == 8)</div><div class='del'>-	    &amp;&amp; (day_view-&gt;drag_event_day != -1)) {</div><div class='del'>-		pos = e_day_view_convert_position_in_top_canvas (day_view,</div><div class='del'>-								 x, y, &amp;day,</div><div class='del'>-								 NULL);</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			const char *uid;</div><div class='del'>-			num_days = 1;</div><div class='del'>-			start_offset = 0;</div><div class='del'>-			end_offset = 0;</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-				event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-							day_view-&gt;drag_event_num);</div><div class='del'>-				day -= day_view-&gt;drag_event_offset;</div><div class='del'>-				day = MAX (day, 0);</div><div class='del'>-</div><div class='del'>-				e_day_view_find_long_event_days (event,</div><div class='del'>-								 day_view-&gt;days_shown,</div><div class='del'>-								 day_view-&gt;day_starts,</div><div class='del'>-								 &amp;start_day,</div><div class='del'>-								 &amp;end_day);</div><div class='del'>-				num_days = end_day - start_day + 1;</div><div class='del'>-				/* Make sure we don't go off the screen. */</div><div class='del'>-				day = MIN (day, day_view-&gt;days_shown - num_days);</div><div class='del'>-</div><div class='del'>-				start_offset = event-&gt;start_minute;</div><div class='del'>-				end_offset = event-&gt;end_minute;</div><div class='del'>-			} else {</div><div class='del'>-				event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;drag_event_day],</div><div class='del'>-							EDayViewEvent,</div><div class='del'>-							day_view-&gt;drag_event_num);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			event_uid = data-&gt;data;</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-			if (!event_uid || !uid || strcmp (event_uid, uid))</div><div class='del'>-				g_warning ("Unexpected event UID");</div><div class='del'>-</div><div class='del'>-			/* We clone the event since we don't want to change</div><div class='del'>-			   the original comp here.</div><div class='del'>-			   Otherwise we would not detect that the event's time</div><div class='del'>-			   had changed in the "update_event" callback. */</div><div class='del'>-</div><div class='del'>-			comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-			if (start_offset == 0 &amp;&amp; end_offset == 0)</div><div class='del'>-				all_day_event = TRUE;</div><div class='del'>-			else</div><div class='del'>-				all_day_event = FALSE;</div><div class='del'>-</div><div class='del'>-			date.value = &amp;itt;</div><div class='del'>-</div><div class='del'>-			dt = day_view-&gt;day_starts[day] + start_offset * 60;</div><div class='del'>-			itt = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-			if (all_day_event) {</div><div class='del'>-				itt.is_date = TRUE;</div><div class='del'>-				date.tzid = NULL;</div><div class='del'>-			} else {</div><div class='del'>-				/* FIXME: Should probably keep the timezone of</div><div class='del'>-				   the original start and end times. */</div><div class='del'>-				date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-			}</div><div class='del'>-			cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-			if (end_offset == 0)</div><div class='del'>-				dt = day_view-&gt;day_starts[day + num_days];</div><div class='del'>-			else</div><div class='del'>-				dt = day_view-&gt;day_starts[day + num_days - 1] + end_offset * 60;</div><div class='del'>-			itt = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-							     day_view-&gt;zone);</div><div class='del'>-			if (all_day_event) {</div><div class='del'>-				itt.is_date = TRUE;</div><div class='del'>-				date.tzid = NULL;</div><div class='del'>-			} else {</div><div class='del'>-				/* FIXME: Should probably keep the timezone of</div><div class='del'>-				   the original start and end times. */</div><div class='del'>-				date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-			}</div><div class='del'>-			cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-			gtk_drag_finish (context, TRUE, TRUE, time);</div><div class='del'>-</div><div class='del'>-			/* Reset this since it will be invalid. */</div><div class='del'>-			day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Show the text item again, just in case it hasn't</div><div class='del'>-			   moved. If we don't do this it may not appear. */</div><div class='del'>-			if (event-&gt;canvas_item)</div><div class='del'>-				gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-			if (cal_client_update_object (day_view-&gt;client, comp)) {</div><div class='del'>-				if (cal_component_has_attendees (comp) &amp;&amp; send_component_dialog (comp, FALSE))</div><div class='del'>-					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,</div><div class='del'>-							day_view-&gt;client, NULL);</div><div class='del'>-			} else {</div><div class='del'>-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "</div><div class='del'>-					   "not update the object!");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_drag_finish (context, FALSE, FALSE, time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,</div><div class='del'>-					       GdkDragContext     *context,</div><div class='del'>-					       gint                x,</div><div class='del'>-					       gint                y,</div><div class='del'>-					       GtkSelectionData   *data,</div><div class='del'>-					       guint               info,</div><div class='del'>-					       guint               time,</div><div class='del'>-					       EDayView		  *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;</div><div class='del'>-	gint start_offset, end_offset;</div><div class='del'>-	gchar *event_uid;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	x += scroll_x;</div><div class='del'>-	y += scroll_y;</div><div class='del'>-</div><div class='del'>-	/* Note that we only support DnD within the EDayView at present. */</div><div class='del'>-	if ((data-&gt;length &gt;= 0) &amp;&amp; (data-&gt;format == 8)</div><div class='del'>-	    &amp;&amp; (day_view-&gt;drag_event_day != -1)) {</div><div class='del'>-		pos = e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-								  x, y, &amp;day,</div><div class='del'>-								  &amp;row, NULL);</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			const char *uid;</div><div class='del'>-			num_rows = 1;</div><div class='del'>-			start_offset = 0;</div><div class='del'>-			end_offset = 0;</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-				event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-							day_view-&gt;drag_event_num);</div><div class='del'>-			} else {</div><div class='del'>-				event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;drag_event_day],</div><div class='del'>-							EDayViewEvent,</div><div class='del'>-							day_view-&gt;drag_event_num);</div><div class='del'>-				row -= day_view-&gt;drag_event_offset;</div><div class='del'>-</div><div class='del'>-				/* Calculate time offset from start row. */</div><div class='del'>-				start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-				end_row = (event-&gt;end_minute - 1) / day_view-&gt;mins_per_row;</div><div class='del'>-				if (end_row &lt; start_row)</div><div class='del'>-					end_row = start_row;</div><div class='del'>-</div><div class='del'>-				num_rows = end_row - start_row + 1;</div><div class='del'>-</div><div class='del'>-				start_offset = event-&gt;start_minute % day_view-&gt;mins_per_row;</div><div class='del'>-				end_offset = event-&gt;end_minute % day_view-&gt;mins_per_row;</div><div class='del'>-				if (end_offset != 0)</div><div class='del'>-					end_offset = day_view-&gt;mins_per_row - end_offset;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			event_uid = data-&gt;data;</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-			if (!event_uid || !uid || strcmp (event_uid, uid))</div><div class='del'>-				g_warning ("Unexpected event UID");</div><div class='del'>-</div><div class='del'>-			/* We use a temporary shallow copy of comp since we</div><div class='del'>-			   don't want to change the original comp here.</div><div class='del'>-			   Otherwise we would not detect that the event's time</div><div class='del'>-			   had changed in the "update_event" callback. */</div><div class='del'>-			comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-			date.value = &amp;itt;</div><div class='del'>-			date.tzid = icaltimezone_get_tzid (day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-								     day_view-&gt;zone);</div><div class='del'>-			cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet_with_zone (dt, FALSE,</div><div class='del'>-								     day_view-&gt;zone);</div><div class='del'>-			cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-			gtk_drag_finish (context, TRUE, TRUE, time);</div><div class='del'>-</div><div class='del'>-			/* Reset this since it will be invalid. */</div><div class='del'>-			day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Show the text item again, just in case it hasn't</div><div class='del'>-			   moved. If we don't do this it may not appear. */</div><div class='del'>-			if (event-&gt;canvas_item)</div><div class='del'>-				gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-			if (cal_client_update_object (day_view-&gt;client, comp)) {</div><div class='del'>-				if (cal_component_has_attendees (comp) &amp;&amp; send_component_dialog (comp, FALSE))</div><div class='del'>-					itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp,</div><div class='del'>-							day_view-&gt;client, NULL);</div><div class='del'>-			} else {</div><div class='del'>-				g_message ("e_day_view_on_main_canvas_drag_data_received(): "</div><div class='del'>-					   "Could not update the object!");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_drag_finish (context, FALSE, FALSE, time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts an hour from 0-23 to the preferred time format, and returns the</div><div class='del'>-   suffix to add and the width of it in the normal font. */</div><div class='del'>-void</div><div class='del'>-e_day_view_convert_time_to_display	(EDayView	*day_view,</div><div class='del'>-					 gint		 hour,</div><div class='del'>-					 gint		*display_hour,</div><div class='del'>-					 gchar	       **suffix,</div><div class='del'>-					 gint		*suffix_width)</div><div class='del'>-{</div><div class='del'>-	/* Calculate the actual hour number to display. For 12-hour</div><div class='del'>-	   format we convert 0-23 to 12-11am/12-11pm. */</div><div class='del'>-	*display_hour = hour;</div><div class='del'>-	if (day_view-&gt;use_24_hour_format) {</div><div class='del'>-		*suffix = "";</div><div class='del'>-		*suffix_width = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (hour &lt; 12) {</div><div class='del'>-			*suffix = day_view-&gt;am_string;</div><div class='del'>-			*suffix_width = day_view-&gt;am_string_width;</div><div class='del'>-		} else {</div><div class='del'>-			*display_hour -= 12;</div><div class='del'>-			*suffix = day_view-&gt;pm_string;</div><div class='del'>-			*suffix_width = day_view-&gt;pm_string_width;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* 12-hour uses 12:00 rather than 0:00. */</div><div class='del'>-		if (*display_hour == 0)</div><div class='del'>-			*display_hour = 12;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_time_string_width	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	gint time_width;</div><div class='del'>-</div><div class='del'>-	time_width = day_view-&gt;digit_width * 4 + day_view-&gt;colon_width;</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;use_24_hour_format)</div><div class='del'>-		time_width += MAX (day_view-&gt;am_string_width,</div><div class='del'>-				   day_view-&gt;pm_string_width);</div><div class='del'>-</div><div class='del'>-	return time_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-invisible_destroyed (GtkWidget *invisible, EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;invisible = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_get (GtkWidget *invisible,</div><div class='del'>-	       GtkSelectionData *selection_data,</div><div class='del'>-	       guint info,</div><div class='del'>-	       guint time_stamp,</div><div class='del'>-	       EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;clipboard_selection != NULL) {</div><div class='del'>-		gtk_selection_data_set (selection_data,</div><div class='del'>-					GDK_SELECTION_TYPE_STRING,</div><div class='del'>-					8,</div><div class='del'>-					day_view-&gt;clipboard_selection,</div><div class='del'>-					strlen (day_view-&gt;clipboard_selection));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_clear_event (GtkWidget *invisible,</div><div class='del'>-		       GdkEventSelection *event,</div><div class='del'>-		       EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;clipboard_selection != NULL) {</div><div class='del'>-		g_free (day_view-&gt;clipboard_selection);</div><div class='del'>-		day_view-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_received (GtkWidget *invisible,</div><div class='del'>-		    GtkSelectionData *selection_data,</div><div class='del'>-		    guint time,</div><div class='del'>-		    EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	char *comp_str;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itime;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	char *uid;</div><div class='del'>-	time_t tt_start, tt_end;</div><div class='del'>-	struct icaldurationtype ic_dur;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (selection_data-&gt;length &lt; 0 ||</div><div class='del'>-	    selection_data-&gt;type != GDK_SELECTION_TYPE_STRING) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_str = (char *) selection_data-&gt;data;</div><div class='del'>-	icalcomp = icalparser_parse_string ((const char *) comp_str);</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check the type of the component */</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-	if (kind != ICAL_VCALENDAR_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VEVENT_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VTODO_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, _("Updating objects"));</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;dtstart, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	if (kind == ICAL_VCALENDAR_COMPONENT) {</div><div class='del'>-		icalcomponent_kind child_kind;</div><div class='del'>-		icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-		subcomp = icalcomponent_get_first_component (</div><div class='del'>-			icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		while (subcomp) {</div><div class='del'>-			child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-			if (child_kind == ICAL_VEVENT_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VTODO_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-				tt_start = icaltime_as_timet (icalcomponent_get_dtstart (subcomp));</div><div class='del'>-				tt_end = icaltime_as_timet (icalcomponent_get_dtend (subcomp));</div><div class='del'>-				ic_dur = icaldurationtype_from_int (tt_end - tt_start);</div><div class='del'>-				itime = icaltime_from_timet_with_zone (dtstart, FALSE, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-				icalcomponent_set_dtstart (subcomp, itime);</div><div class='del'>-				itime = icaltime_add (itime, ic_dur);</div><div class='del'>-				icalcomponent_set_dtend (subcomp, itime);</div><div class='del'>-</div><div class='del'>-				uid = cal_component_gen_uid ();</div><div class='del'>-				comp = cal_component_new ();</div><div class='del'>-				cal_component_set_icalcomponent (</div><div class='del'>-					comp, icalcomponent_new_clone (subcomp));</div><div class='del'>-				cal_component_set_uid (comp, uid);</div><div class='del'>-</div><div class='del'>-				cal_client_update_object (day_view-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-				free (uid);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-			subcomp = icalcomponent_get_next_component (</div><div class='del'>-				icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		tt_start = icaltime_as_timet (icalcomponent_get_dtstart (icalcomp));</div><div class='del'>-		tt_end = icaltime_as_timet (icalcomponent_get_dtend (icalcomp));</div><div class='del'>-		ic_dur = icaldurationtype_from_int (tt_end - tt_start);</div><div class='del'>-		itime = icaltime_from_timet_with_zone (dtstart, FALSE, day_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		icalcomponent_set_dtstart (icalcomp, itime);</div><div class='del'>-		itime = icaltime_add (itime, ic_dur);</div><div class='del'>-		icalcomponent_set_dtend (icalcomp, itime);</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_icalcomponent (comp, icalcomp);</div><div class='del'>-</div><div class='del'>-		uid = cal_component_gen_uid ();</div><div class='del'>-		cal_component_set_uid (comp, (const char *) uid);</div><div class='del'>-		free (uid);</div><div class='del'>-</div><div class='del'>-		cal_client_update_object (day_view-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_set_status_message (day_view, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range. Returns FALSE if no time range has been set. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_visible_time_range	(EDayView	*day_view,</div><div class='del'>-					 time_t		*start_time,</div><div class='del'>-					 time_t		*end_time)</div><div class='del'>-{</div><div class='del'>-	/* If the date isn't set, return FALSE. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	*start_time = day_view-&gt;day_starts[0];</div><div class='del'>-	*end_time = day_view-&gt;day_starts[day_view-&gt;days_shown];</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Queues a layout, unless one is already queued. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_queue_layout (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;layout_timeout_id == 0) {</div><div class='del'>-		day_view-&gt;layout_timeout_id = g_timeout_add (E_DAY_VIEW_LAYOUT_TIMEOUT, e_day_view_layout_timeout_cb, day_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes any queued layout. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_cancel_layout (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;layout_timeout_id != 0) {</div><div class='del'>-		gtk_timeout_remove (day_view-&gt;layout_timeout_id);</div><div class='del'>-		day_view-&gt;layout_timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_layout_timeout_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;layout_timeout_id = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_num_events_selected (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);</div><div class='del'>-</div><div class='del'>-	return (day_view-&gt;editing_event_day != -1) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays messages on the status bar. */</div><div class='del'>-void</div><div class='del'>-e_day_view_set_status_message (EDayView *day_view, const char *message)</div><div class='del'>-{</div><div class='del'>-	extern EvolutionShellClient *global_shell_client; /* ugly */</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (!message || !*message) {</div><div class='del'>-		if (day_view-&gt;activity) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (day_view-&gt;activity));</div><div class='del'>-			day_view-&gt;activity = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (!day_view-&gt;activity) {</div><div class='del'>-		int display;</div><div class='del'>-		char *client_id = g_strdup_printf ("%p", day_view);</div><div class='del'>-</div><div class='del'>-		if (progress_icon[0] == NULL)</div><div class='del'>-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CALENDAR_PROGRESS_IMAGE);</div><div class='del'>-		day_view-&gt;activity = evolution_activity_client_new (</div><div class='del'>-			global_shell_client, client_id,</div><div class='del'>-			progress_icon, message, TRUE, &amp;display);</div><div class='del'>-</div><div class='del'>-		g_free (client_id);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		evolution_activity_client_update (day_view-&gt;activity, message, -1.0);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h<br/>deleted file mode 100644<br/>index 25f9181218..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-day-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,672 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_DAY_VIEW_H_</div><div class='del'>-#define _E_DAY_VIEW_H_</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "evolution-activity-client.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EDayView - displays the Day &amp; Work-Week views of the calendar.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The maximum number of days shown. We use the week view for anything more</div><div class='del'>-   than about 9 days. */</div><div class='del'>-#define E_DAY_VIEW_MAX_DAYS		10</div><div class='del'>-</div><div class='del'>-/* This is used as a special code to signify a long event instead of the day</div><div class='del'>-   of a normal event. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS</div><div class='del'>-</div><div class='del'>-/* The maximum number of columns of appointments within a day. */</div><div class='del'>-#define E_DAY_VIEW_MAX_COLUMNS		6</div><div class='del'>-</div><div class='del'>-/* The width of the gap between appointments. This should be at least</div><div class='del'>-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw</div><div class='del'>-   the triangle to represent continuing events. */</div><div class='del'>-#define E_DAY_VIEW_GAP_WIDTH		7</div><div class='del'>-</div><div class='del'>-/* The width of the bars down the left of each column and appointment.</div><div class='del'>-   This includes the borders on each side of it. */</div><div class='del'>-#define E_DAY_VIEW_BAR_WIDTH		7</div><div class='del'>-</div><div class='del'>-/* The height of the horizontal bar above &amp; beneath the selected event.</div><div class='del'>-   This includes the borders on the top and bottom. */</div><div class='del'>-#define E_DAY_VIEW_BAR_HEIGHT		6</div><div class='del'>-</div><div class='del'>-/* The size of the reminder &amp; recurrence icons, and padding around them. */</div><div class='del'>-#define E_DAY_VIEW_ICON_WIDTH		16</div><div class='del'>-#define E_DAY_VIEW_ICON_HEIGHT		16</div><div class='del'>-#define E_DAY_VIEW_ICON_X_PAD		1</div><div class='del'>-#define E_DAY_VIEW_ICON_Y_PAD		1</div><div class='del'>-</div><div class='del'>-/* The space between the icons and the long event text. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_ICON_R_PAD	1</div><div class='del'>-</div><div class='del'>-/* The size of the border around the event. */</div><div class='del'>-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1</div><div class='del'>-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1</div><div class='del'>-</div><div class='del'>-/* The padding on each side of the event text. */</div><div class='del'>-#define E_DAY_VIEW_EVENT_X_PAD		2</div><div class='del'>-#define E_DAY_VIEW_EVENT_Y_PAD		1</div><div class='del'>-</div><div class='del'>-/* The padding on each side of the event text for events in the top canvas. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2</div><div class='del'>-</div><div class='del'>-/* The size of the border around the long events in the top canvas. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1</div><div class='del'>-</div><div class='del'>-/* The space between the time and the icon/text in the top canvas. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2</div><div class='del'>-</div><div class='del'>-/* The gap between rows in the top canvas. */</div><div class='del'>-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are used to get/set the working days in the week. The bit-flags are</div><div class='del'>-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the</div><div class='del'>-   day values used by localtime etc. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_SUNDAY	= 1 &lt;&lt; 0,</div><div class='del'>-	E_DAY_VIEW_MONDAY	= 1 &lt;&lt; 1,</div><div class='del'>-	E_DAY_VIEW_TUESDAY	= 1 &lt;&lt; 2,</div><div class='del'>-	E_DAY_VIEW_WEDNESDAY	= 1 &lt;&lt; 3,</div><div class='del'>-	E_DAY_VIEW_THURSDAY	= 1 &lt;&lt; 4,</div><div class='del'>-	E_DAY_VIEW_FRIDAY	= 1 &lt;&lt; 5,</div><div class='del'>-	E_DAY_VIEW_SATURDAY	= 1 &lt;&lt; 6</div><div class='del'>-} EDayViewDays;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are used to specify the type of an appointment. They match those</div><div class='del'>-   used in EMeetingTimeSelector. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,</div><div class='del'>-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,</div><div class='del'>-	E_DAY_VIEW_BUSY_BUSY		= 2,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_BUSY_LAST		= 3</div><div class='del'>-} EDayViewBusyType;</div><div class='del'>-</div><div class='del'>-/* This is used to specify the format used when displaying the dates.</div><div class='del'>-   The full format is like 'Thursday 12 September'. The abbreviated format is</div><div class='del'>-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format</div><div class='del'>-   is like '12'. The actual format used is determined in</div><div class='del'>-   e_day_view_recalc_cell_sizes(), once we know the font being used. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_DATE_FULL,</div><div class='del'>-	E_DAY_VIEW_DATE_ABBREVIATED,</div><div class='del'>-	E_DAY_VIEW_DATE_NO_WEEKDAY,</div><div class='del'>-	E_DAY_VIEW_DATE_SHORT</div><div class='del'>-} EDayViewDateFormat;</div><div class='del'>-</div><div class='del'>-/* These index our colors array. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_WORKING,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_SELECTED,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_GRID,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_SELECTED,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_TOP_CANVAS_GRID,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_COLOR_EVENT_VBAR,</div><div class='del'>-	E_DAY_VIEW_COLOR_EVENT_BACKGROUND,</div><div class='del'>-	E_DAY_VIEW_COLOR_EVENT_BORDER,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_COLOR_LONG_EVENT_BACKGROUND,</div><div class='del'>-	E_DAY_VIEW_COLOR_LONG_EVENT_BORDER,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_COLOR_LAST</div><div class='del'>-} EDayViewColors;</div><div class='del'>-</div><div class='del'>-/* These specify which part of the selection we are dragging, if any. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_DRAG_START,</div><div class='del'>-	E_DAY_VIEW_DRAG_END</div><div class='del'>-} EDayViewDragPosition;</div><div class='del'>-</div><div class='del'>-/* Specifies the position of the mouse. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_POS_OUTSIDE,</div><div class='del'>-	E_DAY_VIEW_POS_NONE,</div><div class='del'>-	E_DAY_VIEW_POS_EVENT,</div><div class='del'>-	E_DAY_VIEW_POS_LEFT_EDGE,</div><div class='del'>-	E_DAY_VIEW_POS_RIGHT_EDGE,</div><div class='del'>-	E_DAY_VIEW_POS_TOP_EDGE,</div><div class='del'>-	E_DAY_VIEW_POS_BOTTOM_EDGE</div><div class='del'>-} EDayViewPosition;</div><div class='del'>-</div><div class='del'>-typedef struct _EDayViewEvent EDayViewEvent;</div><div class='del'>-struct _EDayViewEvent {</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* These are the times of this specific occurrence of the event. */</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-</div><div class='del'>-	/* For events in the main canvas, this contains the start column.</div><div class='del'>-	   For long events in the top canvas, this is its row. */</div><div class='del'>-	guint8 start_row_or_col;</div><div class='del'>-</div><div class='del'>-	/* For events in the main canvas, this is the number of columns that</div><div class='del'>-	   it covers. For long events this is set to 1 if the event is shown.</div><div class='del'>-	   For both types of events this is set to 0 if the event is not shown,</div><div class='del'>-	   i.e. it couldn't fit into the display. Currently long events are</div><div class='del'>-	   always shown as we just increase the height of the top canvas. */</div><div class='del'>-	guint8 num_columns;</div><div class='del'>-</div><div class='del'>-	/* TRUE if the event is at a different UTC offset than our current</div><div class='del'>-	   timezone, i.e. it is in a different timezone. */</div><div class='del'>-	guint different_timezone : 1;</div><div class='del'>-</div><div class='del'>-	/* These are minute offsets from the first time shown in the view.</div><div class='del'>-	   They range from 0 to 24 * 60. Currently the main canvas always</div><div class='del'>-	   starts at 12am  and the code to handle starting at other times</div><div class='del'>-	   isn't finished. */</div><div class='del'>-	guint16 start_minute;</div><div class='del'>-	guint16 end_minute;</div><div class='del'>-</div><div class='del'>-	/* This is the EText item containing the event summary. */</div><div class='del'>-	GnomeCanvasItem *canvas_item;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_DAY_VIEW(obj)          GTK_CHECK_CAST (obj, e_day_view_get_type (), EDayView)</div><div class='del'>-#define E_DAY_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)</div><div class='del'>-#define E_IS_DAY_VIEW(obj)       GTK_CHECK_TYPE (obj, e_day_view_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EDayView       EDayView;</div><div class='del'>-typedef struct _EDayViewClass  EDayViewClass;</div><div class='del'>-</div><div class='del'>-struct _EDayView</div><div class='del'>-{</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	/* The top canvas where the dates and long appointments are shown. */</div><div class='del'>-	GtkWidget *top_canvas;</div><div class='del'>-	GnomeCanvasItem *top_canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The main canvas where the rest of the appointments are shown. */</div><div class='del'>-	GtkWidget *main_canvas;</div><div class='del'>-	GnomeCanvasItem *main_canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The canvas displaying the times of the day. */</div><div class='del'>-	GtkWidget *time_canvas;</div><div class='del'>-	GnomeCanvasItem *time_canvas_item;</div><div class='del'>-</div><div class='del'>-	GtkWidget *vscrollbar;</div><div class='del'>-</div><div class='del'>-	/* The calendar we are associated with. */</div><div class='del'>-	GnomeCalendar *calendar;</div><div class='del'>-</div><div class='del'>-	/* Calendar client object we are monitoring */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* S-expression for query and the query object */</div><div class='del'>-	char *sexp;</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	/* The start and end of the days shown. */</div><div class='del'>-	time_t lower;</div><div class='del'>-	time_t upper;</div><div class='del'>-</div><div class='del'>-	/* Whether we are showing the work-week view. */</div><div class='del'>-	gboolean work_week_view;</div><div class='del'>-</div><div class='del'>-	/* The number of days we are showing. Usually 1 or 5, but can be up</div><div class='del'>-	   to E_DAY_VIEW_MAX_DAYS, e.g. when the user selects a range of</div><div class='del'>-	   days in the date navigator. */</div><div class='del'>-	gint days_shown;</div><div class='del'>-</div><div class='del'>-	/* The start of each day &amp; an extra element to hold the last time. */</div><div class='del'>-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];</div><div class='del'>-</div><div class='del'>-	/* The timezone. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* An array of EDayViewEvent elements for the top view and each day. */</div><div class='del'>-	GArray *long_events;</div><div class='del'>-	GArray *events[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-</div><div class='del'>-	/* These are set to FALSE whenever an event in the corresponding array</div><div class='del'>-	   is changed. Any function that needs the events sorted calls</div><div class='del'>-	   e_day_view_ensure_events_sorted(). */</div><div class='del'>-	gboolean long_events_sorted;</div><div class='del'>-	gboolean events_sorted[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-</div><div class='del'>-	/* This is TRUE if we need to relayout the events before drawing. */</div><div class='del'>-	gboolean long_events_need_layout;</div><div class='del'>-	gboolean need_layout[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-</div><div class='del'>-	/* This is TRUE if we need to reshape the canvas items, but a full</div><div class='del'>-	   layout is not necessary. */</div><div class='del'>-	gboolean long_events_need_reshape;</div><div class='del'>-	gboolean need_reshape[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-</div><div class='del'>-	/* The ID of the timeout function for doing a new layout. */</div><div class='del'>-	gint layout_timeout_id;</div><div class='del'>-</div><div class='del'>-	/* The number of minutes per row. 5, 10, 15, 30 or 60. */</div><div class='del'>-	gint mins_per_row;</div><div class='del'>-</div><div class='del'>-	/* The number of rows needed, depending on the times shown and the</div><div class='del'>-	   minutes per row. */</div><div class='del'>-	gint rows;</div><div class='del'>-</div><div class='del'>-	/* The height of each row. */</div><div class='del'>-	gint row_height;</div><div class='del'>-</div><div class='del'>-	/* The number of rows in the top display. */</div><div class='del'>-	gint rows_in_top_display;</div><div class='del'>-</div><div class='del'>-	/* The height of each row in the top canvas. */</div><div class='del'>-	gint top_row_height;</div><div class='del'>-</div><div class='del'>-	/* The first and last times shown in the display. The last time isn't</div><div class='del'>-	   included in the range. Default is 0:00-24:00 */</div><div class='del'>-	gint first_hour_shown;</div><div class='del'>-	gint first_minute_shown;</div><div class='del'>-	gint last_hour_shown;</div><div class='del'>-	gint last_minute_shown;</div><div class='del'>-</div><div class='del'>-	/* Bitwise combination of working days. Defaults to Mon-Fri. */</div><div class='del'>-	EDayViewDays working_days;</div><div class='del'>-</div><div class='del'>-	/* The start and end of the work day, rounded to the nearest row. */</div><div class='del'>-	gint work_day_start_hour;</div><div class='del'>-	gint work_day_start_minute;</div><div class='del'>-	gint work_day_end_hour;</div><div class='del'>-	gint work_day_end_minute;</div><div class='del'>-</div><div class='del'>-	/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-	/* Whether we use show event end times in the main canvas. */</div><div class='del'>-	gboolean show_event_end_times;</div><div class='del'>-</div><div class='del'>-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-	gint week_start_day;</div><div class='del'>-</div><div class='del'>-	/* This is set to TRUE when the widget is created, so it scrolls to</div><div class='del'>-	   the start of the working day when first shown. */</div><div class='del'>-	gboolean scroll_to_work_day;</div><div class='del'>-</div><div class='del'>-	/* This is the width &amp; offset of each of the day columns in the</div><div class='del'>-	   display. */</div><div class='del'>-	gint day_widths[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-	gint day_offsets[E_DAY_VIEW_MAX_DAYS + 1];</div><div class='del'>-</div><div class='del'>-	/* An array holding the number of columns in each row, in each day.</div><div class='del'>-	   Note that there are a maximum of 12 * 24 rows (when a row is 5 mins)</div><div class='del'>-	   but we don't always have that many rows. */</div><div class='del'>-	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];</div><div class='del'>-</div><div class='del'>-	/* Sizes of the various time strings. */</div><div class='del'>-	gint small_hour_widths[24];</div><div class='del'>-	gint max_small_hour_width;</div><div class='del'>-	gint max_minute_width;</div><div class='del'>-	gint colon_width;</div><div class='del'>-	gint digit_width;	/* Size of '0' character. */</div><div class='del'>-</div><div class='del'>-	/* This specifies how we are displaying the dates at the top. */</div><div class='del'>-	EDayViewDateFormat date_format;</div><div class='del'>-</div><div class='del'>-	/* These are the longest month &amp; weekday names in the current font.</div><div class='del'>-	   Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */</div><div class='del'>-	gint longest_month_name;</div><div class='del'>-	gint longest_abbreviated_month_name;</div><div class='del'>-	gint longest_weekday_name;</div><div class='del'>-	gint longest_abbreviated_weekday_name;</div><div class='del'>-</div><div class='del'>-	/* The large font used to display the hours. I don't think we need a</div><div class='del'>-	   fontset since we only display numbers. */</div><div class='del'>-	GdkFont *large_font;</div><div class='del'>-</div><div class='del'>-	/* The GC used for painting in different colors. */</div><div class='del'>-	GdkGC *main_gc;</div><div class='del'>-</div><div class='del'>-	/* The icons. */</div><div class='del'>-	GdkPixmap *reminder_icon;</div><div class='del'>-	GdkBitmap *reminder_mask;</div><div class='del'>-	GdkPixmap *recurrence_icon;</div><div class='del'>-	GdkBitmap *recurrence_mask;</div><div class='del'>-	GdkPixmap *timezone_icon;</div><div class='del'>-	GdkBitmap *timezone_mask;</div><div class='del'>-</div><div class='del'>-	/* Colors for drawing. */</div><div class='del'>-	GdkColor colors[E_DAY_VIEW_COLOR_LAST];</div><div class='del'>-</div><div class='del'>-	/* The normal &amp; resizing cursors. */</div><div class='del'>-	GdkCursor *normal_cursor;</div><div class='del'>-	GdkCursor *move_cursor;</div><div class='del'>-	GdkCursor *resize_width_cursor;</div><div class='del'>-	GdkCursor *resize_height_cursor;</div><div class='del'>-</div><div class='del'>-	/* This remembers the last cursor set on the window. */</div><div class='del'>-	GdkCursor *last_cursor_set_in_top_canvas;</div><div class='del'>-	GdkCursor *last_cursor_set_in_main_canvas;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Editing, Selection &amp; Dragging data</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* The horizontal bars to resize events in the main canvas. */</div><div class='del'>-	GnomeCanvasItem *main_canvas_top_resize_bar_item;</div><div class='del'>-	GnomeCanvasItem *main_canvas_bottom_resize_bar_item;</div><div class='del'>-</div><div class='del'>-	/* The event currently being edited. The day is -1 if no event is</div><div class='del'>-	 being edited, or E_DAY_VIEW_LONG_EVENT if a long event is edited. */</div><div class='del'>-	gint editing_event_day;</div><div class='del'>-	gint editing_event_num;</div><div class='del'>-</div><div class='del'>-	/* This is a GnomeCanvasRect which is placed around an item while it</div><div class='del'>-	   is being resized, so we can raise it above all other EText items. */</div><div class='del'>-	GnomeCanvasItem *resize_long_event_rect_item;</div><div class='del'>-	GnomeCanvasItem *resize_rect_item;</div><div class='del'>-	GnomeCanvasItem *resize_bar_item;</div><div class='del'>-</div><div class='del'>-	/* The event for which a popup menu is being displayed, as above. */</div><div class='del'>-	gint popup_event_day;</div><div class='del'>-	gint popup_event_num;</div><div class='del'>-	EPopupMenu *view_menu;</div><div class='del'>-	</div><div class='del'>-	/* The currently selected region. If selection_start_day is -1 there is</div><div class='del'>-	   no current selection. If start_row or end_row is -1 then the</div><div class='del'>-	   selection is in the top canvas. */</div><div class='del'>-	gint selection_start_day;</div><div class='del'>-	gint selection_end_day;</div><div class='del'>-	gint selection_start_row;</div><div class='del'>-	gint selection_end_row;</div><div class='del'>-</div><div class='del'>-	/* This is TRUE if the selection is currently being dragged using the</div><div class='del'>-	   mouse. */</div><div class='del'>-	gboolean selection_is_being_dragged;</div><div class='del'>-</div><div class='del'>-	/* This specifies which end of the selection is being dragged. */</div><div class='del'>-	EDayViewDragPosition selection_drag_pos;</div><div class='del'>-</div><div class='del'>-	/* This is TRUE if the selection is in the top canvas only (i.e. if the</div><div class='del'>-	   last motion event was in the top canvas). */</div><div class='del'>-	gboolean selection_in_top_canvas;</div><div class='del'>-</div><div class='del'>-	/* The last mouse position, relative to the main canvas window.</div><div class='del'>-	   Used when auto-scrolling to update the selection. */</div><div class='del'>-	gint last_mouse_x;</div><div class='del'>-	gint last_mouse_y;</div><div class='del'>-</div><div class='del'>-	/* Auto-scroll info for when selecting an area or dragging an item. */</div><div class='del'>-	gint auto_scroll_timeout_id;</div><div class='del'>-	gint auto_scroll_delay;</div><div class='del'>-	gboolean auto_scroll_up;</div><div class='del'>-</div><div class='del'>-	/* These are used for the resize bars. */</div><div class='del'>-	gint resize_bars_event_day;</div><div class='del'>-	gint resize_bars_event_num;</div><div class='del'>-</div><div class='del'>-	/* These are used when resizing events. */</div><div class='del'>-	gint resize_event_day;</div><div class='del'>-	gint resize_event_num;</div><div class='del'>-	EDayViewPosition resize_drag_pos;</div><div class='del'>-	gint resize_start_row;</div><div class='del'>-	gint resize_end_row;</div><div class='del'>-</div><div class='del'>-	/* This is the event the mouse button was pressed on. If the button</div><div class='del'>-	   is released we start editing it, but if the mouse is dragged we set</div><div class='del'>-	   this to -1. */</div><div class='del'>-	gint pressed_event_day;</div><div class='del'>-	gint pressed_event_num;</div><div class='del'>-</div><div class='del'>-	/* These are used when dragging events. If drag_event_day is not -1 we</div><div class='del'>-	   know that we are dragging one of the EDayView events around. */</div><div class='del'>-	gint drag_event_day;</div><div class='del'>-	gint drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* The last mouse position when dragging, in the entire canvas. */</div><div class='del'>-	gint drag_event_x;</div><div class='del'>-	gint drag_event_y;</div><div class='del'>-</div><div class='del'>-	/* The offset of the mouse from the top of the event, in rows.</div><div class='del'>-	   In the top canvas this is the offset from the left, in days. */</div><div class='del'>-	gint drag_event_offset;</div><div class='del'>-</div><div class='del'>-	/* The last day &amp; row dragged to, so we know when we need to update</div><div class='del'>-	   the dragged event's position. */</div><div class='del'>-	gint drag_last_day;</div><div class='del'>-	gint drag_last_row;</div><div class='del'>-</div><div class='del'>-	/* This is a GnomeCanvasRect which is placed around an item while it</div><div class='del'>-	   is being resized, so we can raise it above all other EText items. */</div><div class='del'>-	GnomeCanvasItem *drag_long_event_rect_item;</div><div class='del'>-	GnomeCanvasItem *drag_long_event_item;</div><div class='del'>-	GnomeCanvasItem *drag_rect_item;</div><div class='del'>-	GnomeCanvasItem *drag_bar_item;</div><div class='del'>-	GnomeCanvasItem *drag_item;</div><div class='del'>-</div><div class='del'>-	/* "am" and "pm" in the current locale, and their widths. */</div><div class='del'>-	gchar *am_string;</div><div class='del'>-	gchar *pm_string;</div><div class='del'>-	gint am_string_width;</div><div class='del'>-	gint pm_string_width;</div><div class='del'>-</div><div class='del'>-	/* the invisible widget to manage the clipboard selections */</div><div class='del'>-	GtkWidget *invisible;</div><div class='del'>-	gchar *clipboard_selection;</div><div class='del'>-</div><div class='del'>-	/* The default category for new events */</div><div class='del'>-	char *default_category;</div><div class='del'>-</div><div class='del'>-	/* The activity client used to show messages on the status bar. */</div><div class='del'>-	EvolutionActivityClient *activity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EDayViewClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* selection_changed) (EDayView *day_view);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType	   e_day_view_get_type			(void);</div><div class='del'>-GtkWidget* e_day_view_new			(void);</div><div class='del'>-</div><div class='del'>-void       e_day_view_set_calendar		(EDayView	*day_view,</div><div class='del'>-						 GnomeCalendar	*calendar);</div><div class='del'>-</div><div class='del'>-void       e_day_view_set_cal_client		(EDayView	*day_view,</div><div class='del'>-						 CalClient	*client);</div><div class='del'>-</div><div class='del'>-void       e_day_view_set_query			(EDayView	*day_view,</div><div class='del'>-						 const char	*sexp);</div><div class='del'>-</div><div class='del'>-void       e_day_view_set_default_category	(EDayView	*day_view,</div><div class='del'>-						 const char	*category);</div><div class='del'>-</div><div class='del'>-/* This sets the selected time range. The EDayView will show the day or week</div><div class='del'>-   corresponding to the start time. If the start_time &amp; end_time are not equal</div><div class='del'>-   and are both visible in the view, then the selection is set to those times,</div><div class='del'>-   otherwise it is set to 1 hour from the start of the working day. */</div><div class='del'>-void       e_day_view_set_selected_time_range	(EDayView	*day_view,</div><div class='del'>-						 time_t		 start_time,</div><div class='del'>-						 time_t		 end_time);</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range. */</div><div class='del'>-void       e_day_view_get_selected_time_range	(EDayView	*day_view,</div><div class='del'>-						 time_t		*start_time,</div><div class='del'>-						 time_t		*end_time);</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range. Returns FALSE if no time range has been set. */</div><div class='del'>-gboolean   e_day_view_get_visible_time_range	(EDayView	*day_view,</div><div class='del'>-						 time_t		*start_time,</div><div class='del'>-						 time_t		*end_time);</div><div class='del'>-</div><div class='del'>-/* Whether we are displaying a work-week, in which case the display always</div><div class='del'>-   starts on the first day of the working week. */</div><div class='del'>-gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_work_week_view	(EDayView	*day_view,</div><div class='del'>-						 gboolean	 work_week_view);</div><div class='del'>-</div><div class='del'>-/* The number of days shown in the EDayView, from 1 to 7. This is normally</div><div class='del'>-   either 1 or 5 (for the Work-Week view). */</div><div class='del'>-gint	   e_day_view_get_days_shown		(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_days_shown		(EDayView	*day_view,</div><div class='del'>-						 gint		 days_shown);</div><div class='del'>-</div><div class='del'>-/* This specifies how many minutes are represented by one row in the display.</div><div class='del'>-   It can be 60, 30, 15, 10 or 5. The default is 30. */</div><div class='del'>-gint	   e_day_view_get_mins_per_row		(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_mins_per_row		(EDayView	*day_view,</div><div class='del'>-						 gint		 mins_per_row);</div><div class='del'>-</div><div class='del'>-/* This specifies the working days in the week. The value is a bitwise</div><div class='del'>-   combination of day flags. Defaults to Mon-Fri. */</div><div class='del'>-EDayViewDays e_day_view_get_working_days	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_working_days		(EDayView	*day_view,</div><div class='del'>-						 EDayViewDays	 days);</div><div class='del'>-</div><div class='del'>-/* The start and end time of the working day. This only affects the background</div><div class='del'>-   colors. */</div><div class='del'>-void	   e_day_view_get_working_day		(EDayView	*day_view,</div><div class='del'>-						 gint		*start_hour,</div><div class='del'>-						 gint		*start_minute,</div><div class='del'>-						 gint		*end_hour,</div><div class='del'>-						 gint		*end_minute);</div><div class='del'>-void	   e_day_view_set_working_day		(EDayView	*day_view,</div><div class='del'>-						 gint		 start_hour,</div><div class='del'>-						 gint		 start_minute,</div><div class='del'>-						 gint		 end_hour,</div><div class='del'>-						 gint		 end_minute);</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour or 24-hour format. */</div><div class='del'>-gboolean   e_day_view_get_24_hour_format	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_24_hour_format	(EDayView	*day_view,</div><div class='del'>-						 gboolean	 use_24_hour);</div><div class='del'>-</div><div class='del'>-/* Whether we display event end times in the main canvas. */</div><div class='del'>-gboolean   e_day_view_get_show_event_end_times	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_show_event_end_times	(EDayView	*day_view,</div><div class='del'>-						 gboolean	 show);</div><div class='del'>-</div><div class='del'>-/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-gint	   e_day_view_get_week_start_day	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_week_start_day	(EDayView	*day_view,</div><div class='del'>-						 gint		 week_start_day);</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone* e_day_view_get_timezone		(EDayView	*day_view);</div><div class='del'>-void	      e_day_view_set_timezone		(EDayView	*day_view,</div><div class='del'>-						 icaltimezone	*zone);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Clipboard-related functions */</div><div class='del'>-void       e_day_view_cut_clipboard             (EDayView       *day_view);</div><div class='del'>-void       e_day_view_copy_clipboard            (EDayView       *day_view);</div><div class='del'>-void       e_day_view_paste_clipboard           (EDayView       *day_view);</div><div class='del'>-</div><div class='del'>-void       e_day_view_delete_event		(EDayView       *day_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint	   e_day_view_get_num_events_selected	(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Internal functions called by the associated canvas items.</div><div class='del'>- */</div><div class='del'>-void	   e_day_view_check_layout		(EDayView	*day_view);</div><div class='del'>-gint	   e_day_view_convert_time_to_row	(EDayView	*day_view,</div><div class='del'>-						 gint		 hour,</div><div class='del'>-						 gint		 minute);</div><div class='del'>-gint	   e_day_view_convert_time_to_position	(EDayView	*day_view,</div><div class='del'>-						 gint		 hour,</div><div class='del'>-						 gint		 minute);</div><div class='del'>-gboolean   e_day_view_get_event_position	(EDayView	*day_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gint		*item_x,</div><div class='del'>-						 gint		*item_y,</div><div class='del'>-						 gint		*item_w,</div><div class='del'>-						 gint		*item_h);</div><div class='del'>-gboolean   e_day_view_get_long_event_position	(EDayView	*day_view,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gint		*start_day,</div><div class='del'>-						 gint		*end_day,</div><div class='del'>-						 gint		*item_x,</div><div class='del'>-						 gint		*item_y,</div><div class='del'>-						 gint		*item_w,</div><div class='del'>-						 gint		*item_h);</div><div class='del'>-</div><div class='del'>-void	   e_day_view_start_selection		(EDayView	*day_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		 row);</div><div class='del'>-void	   e_day_view_update_selection		(EDayView	*day_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		 row);</div><div class='del'>-void	   e_day_view_finish_selection		(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-void	   e_day_view_check_auto_scroll		(EDayView	*day_view,</div><div class='del'>-						 gint		 event_x,</div><div class='del'>-						 gint		 event_y);</div><div class='del'>-void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-void	   e_day_view_convert_time_to_display	(EDayView	*day_view,</div><div class='del'>-						 gint		 hour,</div><div class='del'>-						 gint		*display_hour,</div><div class='del'>-						 gchar	       **suffix,</div><div class='del'>-						 gint		*suffix_width);</div><div class='del'>-gint	   e_day_view_get_time_string_width	(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint	   e_day_view_event_sort_func		(const void	*arg1,</div><div class='del'>-						 const void	*arg2);</div><div class='del'>-</div><div class='del'>-void       e_day_view_set_status_message        (EDayView       *day_view,</div><div class='del'>-						 const char     *message);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_DAY_VIEW_H_ */</div><div class='head'>diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c<br/>deleted file mode 100644<br/>index f8cfe2fea3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-itip-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2020 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-itip-control.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmisc.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;evolution-shell-client.h&gt;</div><div class='del'>-#include &lt;evolution-folder-selector-button.h&gt;</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "e-itip-control.h"</div><div class='del'>-</div><div class='del'>-struct _EItipControlPrivate {</div><div class='del'>-	GtkWidget *html;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	GtkWidget *count;</div><div class='del'>-	GtkWidget *next;</div><div class='del'>-	GtkWidget *prev;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	GPtrArray *event_clients;</div><div class='del'>-	CalClient *event_client;</div><div class='del'>-	GPtrArray *task_clients;</div><div class='del'>-	CalClient *task_client;</div><div class='del'>-	</div><div class='del'>-	char *vcalendar;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	icalcomponent *main_comp;</div><div class='del'>-	icalcomponent *ical_comp;</div><div class='del'>-	icalcomponent *top_level;</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-	icalproperty_method method;</div><div class='del'>-</div><div class='del'>-	int current;</div><div class='del'>-	int total;</div><div class='del'>-</div><div class='del'>-	GList *addresses;</div><div class='del'>-	gchar *from_address;</div><div class='del'>-	gchar *my_address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* HTML Strings */</div><div class='del'>-#define HTML_BODY_START "&lt;body bgcolor=\"#ffffff\" text=\"#000000\" link=\"#336699\"&gt;"</div><div class='del'>-#define HTML_SEP        "&lt;hr color=#336699 align=\"left\" width=450&gt;"</div><div class='del'>-#define HTML_BODY_END   "&lt;/body&gt;"</div><div class='del'>-#define HTML_FOOTER     "&lt;/html&gt;"</div><div class='del'>-</div><div class='del'>-/* We don't use these now, as we need to be able to translate the text.</div><div class='del'>-   But I've left these here, in case there are problems with the new code. */</div><div class='del'>-#if 0</div><div class='del'>-#define PUBLISH_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&amp;nbsp&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"U\"&gt;Update&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp \</div><div class='del'>-&lt;input TYPE=Submit name=\"ok\" value=\"OK\"&gt;&lt;/form&gt;"</div><div class='del'>-</div><div class='del'>-#define REQUEST_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&amp;nbsp&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"A\"&gt;Accept&lt;/option&gt; \</div><div class='del'>-&lt;option VALUE=\"T\"&gt;Tentatively accept&lt;/option&gt; \</div><div class='del'>-&lt;option VALUE=\"D\"&gt;Decline&lt;/option&gt;&lt;/select&gt;&amp;nbsp \</div><div class='del'>-&lt;input TYPE=\"checkbox\" name=\"rsvp\" value=\"1\" checked&gt;RSVP&amp;nbsp&amp;nbsp\</div><div class='del'>-&lt;input TYPE=\"submit\" name=\"ok\" value=\"OK\"&gt;&lt;br&gt; \</div><div class='del'>-&lt;/form&gt;"</div><div class='del'>-</div><div class='del'>-#define REQUEST_FB_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"F\"&gt;Send Free/Busy Information&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp \</div><div class='del'>-&lt;input TYPE=Submit name=\"ok\" value=\"OK\"&gt;&lt;/form&gt;"</div><div class='del'>-</div><div class='del'>-#define REPLY_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"R\"&gt;Update respondent status&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp \</div><div class='del'>-&lt;input TYPE=Submit name=\"ok\" value=\"OK\"&gt;&lt;/form&gt;"</div><div class='del'>-</div><div class='del'>-#define REFRESH_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"S\"&gt;Send Latest Information&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp \</div><div class='del'>-&lt;input TYPE=Submit name=\"ok\" value=\"OK\"&gt;&lt;/form&gt;"</div><div class='del'>-</div><div class='del'>-#define CANCEL_OPTIONS "&lt;form&gt;&lt;b&gt;Choose an action:&lt;/b&gt;&lt;select NAME=\"action\" SIZE=\"1\"&gt; \</div><div class='del'>-&lt;option VALUE=\"C\"&gt;Cancel&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp \</div><div class='del'>-&lt;input TYPE=Submit name=\"ok\" value=\"OK\"&gt;&lt;/form&gt;"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-extern EvolutionShellClient *global_shell_client;	</div><div class='del'>-</div><div class='del'>-static const char *calendar_types[] = { "calendar", NULL };</div><div class='del'>-static const char *tasks_types[] = { "tasks", NULL };</div><div class='del'>-</div><div class='del'>-static void class_init	(EItipControlClass	 *klass);</div><div class='del'>-static void init	(EItipControl		 *itip);</div><div class='del'>-static void destroy	(GtkObject               *obj);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void prev_clicked_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-static void next_clicked_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-#endif</div><div class='del'>-static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data);</div><div class='del'>-static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data);</div><div class='del'>-static void ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar *encoding, gpointer data);</div><div class='del'>-</div><div class='del'>-static GtkVBoxClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_itip_control_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EItipControl",</div><div class='del'>-			sizeof (EItipControl),</div><div class='del'>-			sizeof (EItipControlClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_vbox_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EItipControlClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_vbox_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Calendar Server routines */</div><div class='del'>-static void</div><div class='del'>-start_calendar_server_cb (CalClient *cal_client,</div><div class='del'>-			  CalClientOpenStatus status,</div><div class='del'>-			  gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *success = data;</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_OPEN_SUCCESS)</div><div class='del'>-		*success = TRUE;</div><div class='del'>-	else</div><div class='del'>-		*success = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalClient *</div><div class='del'>-start_calendar_server (char *uri)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	gboolean success = FALSE;</div><div class='del'>-</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",</div><div class='del'>-			    start_calendar_server_cb, &amp;success);</div><div class='del'>-</div><div class='del'>-	cal_client_open_calendar (client, uri, TRUE);</div><div class='del'>-			</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		return client;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalClient *</div><div class='del'>-start_default_server (gboolean tasks)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	gboolean success = FALSE;</div><div class='del'>-</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (client), "cal_opened",</div><div class='del'>-			    start_calendar_server_cb, &amp;success);</div><div class='del'>-</div><div class='del'>-	if (tasks) {</div><div class='del'>-		if (!cal_client_open_default_tasks (client, FALSE))</div><div class='del'>-			goto error;</div><div class='del'>-	} else {</div><div class='del'>-		if (!cal_client_open_default_calendar (client, FALSE))</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		return client;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_servers (EvolutionShellClient *shell_client, const char *possible_types[], gboolean tasks)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_StorageRegistry registry;</div><div class='del'>-	GNOME_Evolution_StorageRegistry_StorageList *storage_list;</div><div class='del'>-	GPtrArray *servers;</div><div class='del'>-	int i, j, k;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	servers = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	bonobo_object_ref (BONOBO_OBJECT (shell_client));</div><div class='del'>-	registry = evolution_shell_client_get_storage_registry_interface (shell_client);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	storage_list = GNOME_Evolution_StorageRegistry_getStorageList (registry, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return servers;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; storage_list-&gt;_length; i++) {</div><div class='del'>-		GNOME_Evolution_Storage storage;</div><div class='del'>-		GNOME_Evolution_FolderList *folder_list;</div><div class='del'>-		</div><div class='del'>-		storage = storage_list-&gt;_buffer[i];</div><div class='del'>-		folder_list = GNOME_Evolution_Storage__get_folderList (storage, &amp;ev);</div><div class='del'>-</div><div class='del'>-		for (j = 0; j &lt; folder_list-&gt;_length; j++) {</div><div class='del'>-			GNOME_Evolution_Folder folder;</div><div class='del'>-			</div><div class='del'>-			folder = folder_list-&gt;_buffer[j];</div><div class='del'>-			for (k = 0; possible_types[k] != NULL; k++) {</div><div class='del'>-				CalClient *client;</div><div class='del'>-				char *uri;</div><div class='del'>-</div><div class='del'>-				if (strcmp (possible_types[k], folder.type))</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				uri = cal_util_expand_uri (folder.physicalUri, tasks);</div><div class='del'>-				client = start_calendar_server (uri);</div><div class='del'>-				if (client != NULL)</div><div class='del'>-					g_ptr_array_add (servers, client);			</div><div class='del'>-				g_free (uri);</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_free (folder_list);		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (shell_client));</div><div class='del'>-</div><div class='del'>-	return servers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalClient *</div><div class='del'>-find_server (GPtrArray *servers, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);	</div><div class='del'>-	for (i = 0; i &lt; servers-&gt;len; i++) {</div><div class='del'>-		CalClient *client;</div><div class='del'>-		CalComponent *found_comp;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		</div><div class='del'>-		client = g_ptr_array_index (servers, i);</div><div class='del'>-		status = cal_client_get_object (client, uid, &amp;found_comp);</div><div class='del'>-		if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (found_comp));</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-			return client;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	GtkWidget *scrolled_window;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EItipControlPrivate, 1);</div><div class='del'>-</div><div class='del'>-	itip-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	/* Addresses */</div><div class='del'>-	priv-&gt;addresses = itip_addresses_get ();</div><div class='del'>-</div><div class='del'>-	/* Header */</div><div class='del'>-#if 0</div><div class='del'>-	priv-&gt;prev = gnome_stock_button (GNOME_STOCK_BUTTON_PREV);</div><div class='del'>-	gtk_widget_show (priv-&gt;prev);</div><div class='del'>-	priv-&gt;next = gnome_stock_button (GNOME_STOCK_BUTTON_NEXT);</div><div class='del'>-	gtk_widget_show (priv-&gt;next);</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;prev, FALSE, FALSE, 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;count, TRUE, TRUE, 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;next, FALSE, FALSE, 4);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;prev), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (prev_clicked_cb), itip);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;next), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (next_clicked_cb), itip);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Get the cal clients */</div><div class='del'>-	priv-&gt;event_clients = get_servers (global_shell_client, calendar_types, FALSE);</div><div class='del'>-	priv-&gt;event_client = NULL;</div><div class='del'>-	priv-&gt;task_clients = get_servers (global_shell_client, tasks_types, TRUE);</div><div class='del'>-	priv-&gt;task_client = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Html Widget */</div><div class='del'>-	priv-&gt;html = gtk_html_new ();</div><div class='del'>-	gtk_html_set_default_content_type (GTK_HTML (priv-&gt;html), </div><div class='del'>-					   "text/html; charset=utf-8");</div><div class='del'>-	gtk_widget_show (priv-&gt;html);</div><div class='del'>-</div><div class='del'>-	scrolled_window = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),</div><div class='del'>-					GTK_POLICY_AUTOMATIC,</div><div class='del'>-					GTK_POLICY_AUTOMATIC);</div><div class='del'>-	gtk_widget_show (scrolled_window);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (scrolled_window), priv-&gt;html);</div><div class='del'>-	gtk_widget_set_usize (scrolled_window, 600, 400);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (itip), scrolled_window, FALSE, FALSE, 4);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "url_requested",</div><div class='del'>-			    url_requested_cb, itip);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "object_requested",</div><div class='del'>-			    GTK_SIGNAL_FUNC (object_requested_cb),</div><div class='del'>-			    itip);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "submit",</div><div class='del'>-			    ok_clicked_cb, itip);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clean_up (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;vcalendar);</div><div class='del'>-	priv-&gt;vcalendar = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-	priv-&gt;comp = NULL;</div><div class='del'>-</div><div class='del'>-	icalcomponent_free (priv-&gt;top_level);</div><div class='del'>-	priv-&gt;top_level = NULL;</div><div class='del'>-	icalcomponent_free (priv-&gt;main_comp);</div><div class='del'>-	priv-&gt;main_comp = NULL;</div><div class='del'>-	priv-&gt;ical_comp = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;current = 0;</div><div class='del'>-	priv-&gt;total = 0;</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;my_address);</div><div class='del'>-	priv-&gt;my_address = NULL;</div><div class='del'>-	g_free (priv-&gt;from_address);</div><div class='del'>-	priv-&gt;from_address = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (obj);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clean_up (itip);</div><div class='del'>-</div><div class='del'>-	itip_addresses_free (priv-&gt;addresses);</div><div class='del'>-	priv-&gt;addresses = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;event_clients-&gt;len; i++) </div><div class='del'>-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv-&gt;event_clients, i)));</div><div class='del'>-	g_ptr_array_free (priv-&gt;event_clients, TRUE);</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;task_clients-&gt;len; i++) </div><div class='del'>-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv-&gt;task_clients, i)));</div><div class='del'>-	g_ptr_array_free (priv-&gt;task_clients, TRUE);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_itip_control_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (E_TYPE_ITIP_CONTROL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-find_my_address (EItipControl *itip, icalcomponent *ical_comp)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	char *my_alt_address = NULL;</div><div class='del'>-	</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-	     prop != NULL;</div><div class='del'>-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))</div><div class='del'>-	{</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		icalparameter *param;</div><div class='del'>-		const char *attendee, *name;</div><div class='del'>-		char *attendee_clean, *name_clean;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		value = icalproperty_get_value (prop);</div><div class='del'>-		if (value != NULL) {</div><div class='del'>-			attendee = icalvalue_get_string (value);</div><div class='del'>-			attendee_clean = g_strdup (itip_strip_mailto (attendee));</div><div class='del'>-			attendee_clean = g_strstrip (attendee_clean);</div><div class='del'>-		} else {</div><div class='del'>-			attendee = NULL;</div><div class='del'>-			attendee_clean = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);</div><div class='del'>-		if (param != NULL) {</div><div class='del'>-			name = icalparameter_get_cn (param);</div><div class='del'>-			name_clean = g_strdup (name);</div><div class='del'>-			name_clean = g_strstrip (name_clean);</div><div class='del'>-		} else {</div><div class='del'>-			name = NULL;</div><div class='del'>-			name_clean = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (l = priv-&gt;addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-			ItipAddress *a = l-&gt;data;</div><div class='del'>-			</div><div class='del'>-			/* Check for a matching address */</div><div class='del'>-			if (attendee_clean != NULL</div><div class='del'>-			    &amp;&amp; !g_strcasecmp (a-&gt;address, attendee_clean)) {</div><div class='del'>-				priv-&gt;my_address = g_strdup (a-&gt;address);</div><div class='del'>-				g_free (attendee_clean);</div><div class='del'>-				g_free (name_clean);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* Check for a matching cname to fall back on */</div><div class='del'>-			if (name_clean != NULL </div><div class='del'>-			    &amp;&amp; !g_strcasecmp (a-&gt;name, name_clean))</div><div class='del'>-				my_alt_address = g_strdup (attendee_clean);</div><div class='del'>-		}</div><div class='del'>-		g_free (attendee_clean);</div><div class='del'>-		g_free (name_clean);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;my_address = my_alt_address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalproperty *</div><div class='del'>-find_attendee (icalcomponent *ical_comp, const char *address)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	if (address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-	     prop != NULL;</div><div class='del'>-	     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))</div><div class='del'>-	{</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		const char *attendee;</div><div class='del'>-		char *text;</div><div class='del'>-</div><div class='del'>-		value = icalproperty_get_value (prop);</div><div class='del'>-		if (!value)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		attendee = icalvalue_get_string (value);</div><div class='del'>-</div><div class='del'>-		text = g_strdup (itip_strip_mailto (attendee));</div><div class='del'>-		text = g_strstrip (text);</div><div class='del'>-		if (!g_strcasecmp (address, text)) {</div><div class='del'>-			g_free (text);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return prop;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-set_label (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	text = g_strdup_printf ("%d of %d", priv-&gt;current, priv-&gt;total);</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (priv-&gt;count), text);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_button_status (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current == priv-&gt;total)</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;next, FALSE);</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;next, TRUE);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current == 1)</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;prev, FALSE);</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;prev, TRUE);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-write_label_piece (EItipControl *itip, CalComponentDateTime *dt,</div><div class='del'>-		   char *buffer, int size,</div><div class='del'>-		   const char *stext, const char *etext)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	struct tm tmp_tm;</div><div class='del'>-	char time_buf[64], *time_utf8;</div><div class='del'>-	icaltimezone *zone = NULL;</div><div class='del'>-	char *display_name;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* UTC times get converted to the current timezone. This is done for</div><div class='del'>-	   the COMPLETED property, which is always in UTC, and also because</div><div class='del'>-	   Outlook sends simple events as UTC times. */</div><div class='del'>-	if (dt-&gt;value-&gt;is_utc) {</div><div class='del'>-		char *location = calendar_config_get_timezone ();</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-		icaltimezone_convert_time (dt-&gt;value, icaltimezone_get_utc_timezone (), zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp_tm = icaltimetype_to_tm (dt-&gt;value);</div><div class='del'>-</div><div class='del'>-	if (stext != NULL)</div><div class='del'>-		strcat (buffer, stext);</div><div class='del'>-</div><div class='del'>-	e_time_format_date_and_time (&amp;tmp_tm,</div><div class='del'>-				     calendar_config_get_24_hour_format (),</div><div class='del'>-				     FALSE, FALSE,</div><div class='del'>-				     time_buf, sizeof (time_buf));</div><div class='del'>-</div><div class='del'>-	time_utf8 = e_utf8_from_locale_string (time_buf);</div><div class='del'>-	strcat (buffer, time_utf8);</div><div class='del'>-	g_free (time_utf8);</div><div class='del'>-</div><div class='del'>-	if (!dt-&gt;value-&gt;is_utc &amp;&amp; dt-&gt;tzid) {</div><div class='del'>-		zone = icalcomponent_get_timezone (priv-&gt;top_level, dt-&gt;tzid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Output timezone after time, e.g. " America/New_York". */</div><div class='del'>-	if (zone) {</div><div class='del'>-		/* Note that this returns UTF-8, since all iCalendar data is</div><div class='del'>-		   UTF-8. But it probably is not translated. */</div><div class='del'>-		display_name = icaltimezone_get_display_name (zone);</div><div class='del'>-		if (display_name &amp;&amp; *display_name) {</div><div class='del'>-			strcat (buffer, " ");</div><div class='del'>-</div><div class='del'>-			/* We check if it is one of our builtin timezone names,</div><div class='del'>-			   in which case we call gettext to translate it, and</div><div class='del'>-			   we need to convert to UTF-8. If it isn't a builtin</div><div class='del'>-			   timezone name, we use it as-is, as it is already</div><div class='del'>-			   UTF-8. */</div><div class='del'>-			if (icaltimezone_get_builtin_timezone (display_name)) {</div><div class='del'>-				strcat (buffer, U_(display_name));</div><div class='del'>-			} else {</div><div class='del'>-				strcat (buffer, display_name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (etext != NULL)</div><div class='del'>-		strcat (buffer, etext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,</div><div class='del'>-		CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponentDateTime datetime;</div><div class='del'>-	static char buffer[1024];</div><div class='del'>-	gboolean wrote = FALSE, task_completed = FALSE;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;datetime);</div><div class='del'>-	if (datetime.value) {</div><div class='del'>-		switch (type) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024,</div><div class='del'>-					   U_("Meeting begins: &lt;b&gt;"),</div><div class='del'>-					   "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-			break;</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024,</div><div class='del'>-					   U_("Task begins: &lt;b&gt;"),</div><div class='del'>-					   "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-			break;</div><div class='del'>-		case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024,</div><div class='del'>-					   U_("Free/Busy info begins: &lt;b&gt;"),</div><div class='del'>-					   "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Begins: &lt;b&gt;"), "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-		}</div><div class='del'>-		gtk_html_write (html, html_stream, buffer, strlen(buffer));</div><div class='del'>-		wrote = TRUE;</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-	cal_component_get_dtend (comp, &amp;datetime);</div><div class='del'>-	if (datetime.value){</div><div class='del'>-		switch (type) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Meeting ends: &lt;b&gt;"), "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-			break;</div><div class='del'>-		case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Free/Busy info ends: &lt;b&gt;"),</div><div class='del'>-					   "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Ends: &lt;b&gt;"), "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-		}</div><div class='del'>-		gtk_html_write (html, html_stream, buffer, strlen (buffer));</div><div class='del'>-		wrote = TRUE;</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-	datetime.tzid = NULL;</div><div class='del'>-	cal_component_get_completed (comp, &amp;datetime.value);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO &amp;&amp; datetime.value) {</div><div class='del'>-		/* Pass TRUE as is_utc, so it gets converted to the current</div><div class='del'>-		   timezone. */</div><div class='del'>-		datetime.value-&gt;is_utc = TRUE;</div><div class='del'>-		write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Task Completed: &lt;b&gt;"), "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-		gtk_html_write (html, html_stream, buffer, strlen (buffer));</div><div class='del'>-		wrote = TRUE;</div><div class='del'>-		task_completed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-	cal_component_get_due (comp, &amp;datetime);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO &amp;&amp; !task_completed &amp;&amp; datetime.value) {</div><div class='del'>-		write_label_piece (itip, &amp;datetime, buffer, 1024, U_("Task Due: &lt;b&gt;"), "&lt;/b&gt;&lt;br&gt;");</div><div class='del'>-		gtk_html_write (html, html_stream, buffer, strlen (buffer));</div><div class='del'>-		wrote = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	if (wrote)</div><div class='del'>-		gtk_html_stream_printf (html_stream, "&lt;br&gt;");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gboolean err)</div><div class='del'>-{</div><div class='del'>-	if (message == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (err) {</div><div class='del'>-		gtk_html_stream_printf (html_stream, "&lt;b&gt;&lt;font color=\"#ff0000\"&gt;%s&lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;", message);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_html_stream_printf (html_stream, "&lt;b&gt;%s&lt;/b&gt;&lt;br&gt;&lt;br&gt;", message);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-write_error_html (EItipControl *itip, const gchar *itip_err)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	GtkHTMLStream *html_stream;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Html widget */</div><div class='del'>-	html_stream = gtk_html_begin (GTK_HTML (priv-&gt;html));</div><div class='del'>-	gtk_html_stream_printf (html_stream,</div><div class='del'>-				"&lt;html&gt;&lt;head&gt;&lt;title&gt;%s&lt;/title&gt;&lt;/head&gt;",</div><div class='del'>-				U_("iCalendar Information"));</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_BODY_START, strlen(HTML_BODY_START));</div><div class='del'>-</div><div class='del'>-	/* The table */</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\"&gt;");</div><div class='del'>-	/* The column for the image */</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;tr&gt;&lt;td width=48 align=\"center\" valign=\"top\" rowspan=\"8\"&gt;");</div><div class='del'>-	/* The image */</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;img src=\"/meeting-request.png\"&gt;&lt;/td&gt;");</div><div class='del'>-</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;td align=\"left\" valign=\"top\"&gt;");</div><div class='del'>-</div><div class='del'>-	/* Title */</div><div class='del'>-	set_message (GTK_HTML (priv-&gt;html), html_stream, U_("iCalendar Error"), TRUE);</div><div class='del'>-</div><div class='del'>-	/* Error */</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, itip_err, strlen(itip_err));</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;");</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_BODY_END, strlen(HTML_BODY_END));</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_FOOTER, strlen(HTML_FOOTER));</div><div class='del'>-</div><div class='del'>-	gtk_html_end (GTK_HTML (priv-&gt;html), html_stream, GTK_HTML_STREAM_OK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, const gchar *options)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	GtkHTMLStream *html_stream;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CalComponentOrganizer organizer;</div><div class='del'>-	CalComponentAttendee *attendee;</div><div class='del'>-	GSList *attendees, *l = NULL;</div><div class='del'>-	gchar *html;</div><div class='del'>-	const gchar *const_html;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Html widget */</div><div class='del'>-	html_stream = gtk_html_begin (GTK_HTML (priv-&gt;html));</div><div class='del'>-	gtk_html_stream_printf (html_stream,</div><div class='del'>-				"&lt;html&gt;&lt;head&gt;&lt;title&gt;%s&lt;/title&gt;&lt;/head&gt;",</div><div class='del'>-				U_("iCalendar Information"));</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_BODY_START, strlen(HTML_BODY_START));</div><div class='del'>-</div><div class='del'>-	/* The table */</div><div class='del'>-	const_html = "&lt;table width=450 cellspacing=\"0\" cellpadding=\"4\" border=\"0\"&gt;";</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	/* The column for the image */</div><div class='del'>-	const_html = "&lt;tr&gt;&lt;td width=48 align=\"center\" valign=\"top\" rowspan=\"8\"&gt;";</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	/* The image */</div><div class='del'>-	const_html = "&lt;img src=\"/meeting-request.png\"&gt;&lt;/td&gt;";</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	const_html = "&lt;td align=\"left\" valign=\"top\"&gt;";</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;method) {</div><div class='del'>-	case ICAL_METHOD_REFRESH:</div><div class='del'>-	case ICAL_METHOD_REPLY:</div><div class='del'>-		/* An attendee sent this */</div><div class='del'>-		cal_component_get_attendee_list (priv-&gt;comp, &amp;attendees);</div><div class='del'>-		if (attendees != NULL) {</div><div class='del'>-			attendee = attendees-&gt;data;</div><div class='del'>-			html = g_strdup_printf (itip_desc,</div><div class='del'>-						attendee-&gt;cn ?</div><div class='del'>-						attendee-&gt;cn :</div><div class='del'>-						itip_strip_mailto (attendee-&gt;value));</div><div class='del'>-		} else {</div><div class='del'>-			html = g_strdup_printf (itip_desc, U_("An unknown person"));</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_PUBLISH:</div><div class='del'>-	case ICAL_METHOD_REQUEST:</div><div class='del'>-	case ICAL_METHOD_ADD:</div><div class='del'>-	case ICAL_METHOD_CANCEL:</div><div class='del'>-	default:</div><div class='del'>-		/* The organizer sent this */</div><div class='del'>-		cal_component_get_organizer (priv-&gt;comp, &amp;organizer);</div><div class='del'>-		if (organizer.value != NULL)</div><div class='del'>-			html = g_strdup_printf (itip_desc,</div><div class='del'>-						organizer.cn ?</div><div class='del'>-						organizer.cn :</div><div class='del'>-						itip_strip_mailto (organizer.value));</div><div class='del'>-		else</div><div class='del'>-			html = g_strdup_printf (itip_desc, U_("An unknown person"));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, html, strlen(html));</div><div class='del'>-	g_free (html);</div><div class='del'>-</div><div class='del'>-	/* Describe what the user can do */</div><div class='del'>-	const_html = U_("&lt;br&gt; Please review the following information, "</div><div class='del'>-			"and then select an action from the menu below.");</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	/* Separator */</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, HTML_SEP, strlen (HTML_SEP));</div><div class='del'>-</div><div class='del'>-	/* Title */</div><div class='del'>-	set_message (GTK_HTML (priv-&gt;html), html_stream, itip_title, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Date information */</div><div class='del'>-	set_date_label (itip, GTK_HTML (priv-&gt;html), html_stream, priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	cal_component_get_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-	gtk_html_stream_printf (html_stream, "&lt;b&gt;%s&lt;/b&gt; %s&lt;br&gt;&lt;br&gt;",</div><div class='del'>-				U_("Summary:"), text.value ? text.value : U_("&lt;i&gt;None&lt;/i&gt;"));</div><div class='del'>-</div><div class='del'>-	/* Status */</div><div class='del'>-	if (priv-&gt;method == ICAL_METHOD_REPLY) {</div><div class='del'>-		GSList *alist;</div><div class='del'>-</div><div class='del'>-		cal_component_get_attendee_list (priv-&gt;comp, &amp;alist);</div><div class='del'>-		</div><div class='del'>-		if (alist != NULL) {</div><div class='del'>-			CalComponentAttendee *a = alist-&gt;data;</div><div class='del'>-</div><div class='del'>-			gtk_html_stream_printf (html_stream, "&lt;b&gt;%s&lt;/b&gt; ",</div><div class='del'>-						U_("Status:"));</div><div class='del'>-			</div><div class='del'>-			switch (a-&gt;status) {</div><div class='del'>-			case ICAL_PARTSTAT_ACCEPTED:</div><div class='del'>-				gtk_html_stream_printf (html_stream, "%s&lt;br&gt;&lt;br&gt;",</div><div class='del'>-							U_("Accepted"));</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_PARTSTAT_TENTATIVE:</div><div class='del'>-				gtk_html_stream_printf (html_stream, "%s&lt;br&gt;&lt;br&gt;",</div><div class='del'>-							U_("Tentatively Accepted"));</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_PARTSTAT_DECLINED:</div><div class='del'>-				gtk_html_stream_printf (html_stream, "%s&lt;br&gt;&lt;br&gt;",</div><div class='del'>-							U_("Declined"));</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				gtk_html_stream_printf (html_stream, "%s&lt;br&gt;&lt;br&gt;",</div><div class='del'>-							U_("Unknown"));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		cal_component_free_attendee_list (alist);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Description */</div><div class='del'>-	cal_component_get_description_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	if (l)</div><div class='del'>-		text = *((CalComponentText *)l-&gt;data);</div><div class='del'>-</div><div class='del'>-	if (l &amp;&amp; text.value) {</div><div class='del'>-		gtk_html_stream_printf (html_stream, "&lt;b&gt;%s&lt;/b&gt; %s",</div><div class='del'>-					U_("Description:"), text.value);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-</div><div class='del'>-	/* Separator */</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, HTML_SEP, strlen (HTML_SEP));</div><div class='del'>-</div><div class='del'>-	/* Options */</div><div class='del'>-	if (options != NULL) {</div><div class='del'>-		const_html = "&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td valign=\"center\"&gt;";</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen (const_html));</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, options, strlen (options));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	const_html = "&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;";</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream, const_html, strlen(const_html));</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_BODY_END, strlen(HTML_BODY_END));</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), html_stream,</div><div class='del'>-			HTML_FOOTER, strlen(HTML_FOOTER));</div><div class='del'>-</div><div class='del'>-	gtk_html_end (GTK_HTML (priv-&gt;html), html_stream, GTK_HTML_STREAM_OK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_publish_options (gboolean selector)</div><div class='del'>-{</div><div class='del'>-	char *html;</div><div class='del'>-	</div><div class='del'>-	html = g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"U\"&gt;%s&lt;/option&gt;"</div><div class='del'>-				"&lt;/select&gt;&amp;nbsp &amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=Submit name=\"ok\" value=\"%s\"&gt;"</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Update"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-</div><div class='del'>-	if (selector) {</div><div class='del'>-		char *sel;</div><div class='del'>-		</div><div class='del'>-		sel = g_strconcat (html, "&lt;object classid=\"gtk:label\"&gt;", NULL);</div><div class='del'>-		g_free (html);</div><div class='del'>-		html = sel;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_request_options (gboolean selector)</div><div class='del'>-{</div><div class='del'>-	char *html;</div><div class='del'>-	</div><div class='del'>-	html = g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"A\"&gt;%s&lt;/option&gt; "</div><div class='del'>-				"&lt;option VALUE=\"T\"&gt;%s&lt;/option&gt; "</div><div class='del'>-				"&lt;option VALUE=\"D\"&gt;%s&lt;/option&gt;&lt;/select&gt;&amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=\"checkbox\" name=\"rsvp\" value=\"1\" checked&gt;%s&amp;nbsp&amp;nbsp"</div><div class='del'>-				"&lt;input TYPE=\"submit\" name=\"ok\" value=\"%s\"&gt;&lt;br&gt; "</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Accept"),</div><div class='del'>-				U_("Tentatively accept"),</div><div class='del'>-				U_("Decline"),</div><div class='del'>-				U_("RSVP"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-</div><div class='del'>-	if (selector) {</div><div class='del'>-		char *sel;</div><div class='del'>-		</div><div class='del'>-		sel = g_strconcat (html, "&lt;object classid=\"gtk:label\"&gt;", NULL);</div><div class='del'>-		g_free (html);</div><div class='del'>-		html = sel;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_request_fb_options ()</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"F\"&gt;%s&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=Submit name=\"ok\" value=\"%s\"&gt;"</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Send Free/Busy Information"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_reply_options ()</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"R\"&gt;%s&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=Submit name=\"ok\" value=\"%s\"&gt;"</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Update respondent status"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_refresh_options ()</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"S\"&gt;%s&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=Submit name=\"ok\" value=\"%s\"&gt;"</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Send Latest Information"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_cancel_options ()</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("&lt;form&gt;&lt;b&gt;%s&lt;/b&gt;&amp;nbsp"</div><div class='del'>-				"&lt;select NAME=\"action\" SIZE=\"1\"&gt; "</div><div class='del'>-				"&lt;option VALUE=\"C\"&gt;%s&lt;/option&gt;&lt;/select&gt;&amp;nbsp &amp;nbsp "</div><div class='del'>-				"&lt;input TYPE=Submit name=\"ok\" value=\"%s\"&gt;"</div><div class='del'>-				"&lt;/form&gt;",</div><div class='del'>-				U_("Choose an action:"),</div><div class='del'>-				U_("Cancel"),</div><div class='del'>-				U_("OK"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-get_real_item (EItipControl *itip) </div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	CalClientGetStatus status = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		if (priv-&gt;event_client != NULL)</div><div class='del'>-			status = cal_client_get_object (priv-&gt;event_client, uid, &amp;comp);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		if (priv-&gt;task_client != NULL)</div><div class='del'>-			status = cal_client_get_object (priv-&gt;task_client, uid, &amp;comp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		status = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_current_event (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const gchar *itip_title, *itip_desc;</div><div class='del'>-	char *options;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;event_client = find_server (priv-&gt;event_clients, priv-&gt;comp);</div><div class='del'>-	</div><div class='del'>-	switch (priv-&gt;method) {</div><div class='del'>-	case ICAL_METHOD_PUBLISH:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has published meeting information.");</div><div class='del'>-		itip_title = U_("Meeting Information");</div><div class='del'>-		options = get_publish_options (priv-&gt;event_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REQUEST:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; requests your presence at a meeting.");</div><div class='del'>-		itip_title = U_("Meeting Proposal");</div><div class='del'>-		options = get_request_options (priv-&gt;event_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_ADD:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; wishes to add to an existing meeting.");</div><div class='del'>-		itip_title = U_("Meeting Update");</div><div class='del'>-		options = get_publish_options (priv-&gt;event_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REFRESH:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; wishes to receive the latest meeting information.");</div><div class='del'>-		itip_title = U_("Meeting Update Request");</div><div class='del'>-		options = get_refresh_options ();</div><div class='del'>-</div><div class='del'>-		/* Provide extra info, since its not in the component */</div><div class='del'>-		comp = get_real_item (itip);</div><div class='del'>-		if (comp != NULL) {</div><div class='del'>-			CalComponentText text;</div><div class='del'>-			GSList *l;</div><div class='del'>-			</div><div class='del'>-			cal_component_get_summary (comp, &amp;text);</div><div class='del'>-			cal_component_set_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-			cal_component_get_description_list (comp, &amp;l);</div><div class='del'>-			cal_component_set_description_list (priv-&gt;comp, l);</div><div class='del'>-			cal_component_free_text_list (l);</div><div class='del'>-			</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		} else {</div><div class='del'>-			CalComponentText text = {_("Unknown"), NULL};</div><div class='del'>-			</div><div class='del'>-			cal_component_set_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REPLY:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has replied to a meeting request.");</div><div class='del'>-		itip_title = U_("Meeting Reply");</div><div class='del'>-		options = get_reply_options ();</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_CANCEL:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has cancelled a meeting.");</div><div class='del'>-		itip_title = U_("Meeting Cancellation");</div><div class='del'>-		options = get_cancel_options ();</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has sent an unintelligible message.");</div><div class='del'>-		itip_title = U_("Bad Meeting Message");</div><div class='del'>-		options = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_html (itip, itip_desc, itip_title, options);</div><div class='del'>-	g_free (options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_current_todo (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const gchar *itip_title, *itip_desc;</div><div class='del'>-	char *options;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;task_client = find_server (priv-&gt;task_clients, priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;method) {</div><div class='del'>-	case ICAL_METHOD_PUBLISH:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has published task information.");</div><div class='del'>-		itip_title = U_("Task Information");</div><div class='del'>-		options = get_publish_options (priv-&gt;task_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REQUEST:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; requests you perform a task.");</div><div class='del'>-		itip_title = U_("Task Proposal");</div><div class='del'>-		options = get_request_options (priv-&gt;task_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_ADD:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; wishes to add to an existing task.");</div><div class='del'>-		itip_title = U_("Task Update");</div><div class='del'>-		options = get_publish_options (priv-&gt;task_client ? FALSE : TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REFRESH:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; wishes to receive the latest task information.");</div><div class='del'>-		itip_title = U_("Task Update Request");</div><div class='del'>-		options = get_refresh_options ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Provide extra info, since its not in the component */</div><div class='del'>-		comp = get_real_item (itip);</div><div class='del'>-		if (comp != NULL) {</div><div class='del'>-			CalComponentText text;</div><div class='del'>-			GSList *l;</div><div class='del'>-			</div><div class='del'>-			cal_component_get_summary (comp, &amp;text);</div><div class='del'>-			cal_component_set_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-			cal_component_get_description_list (comp, &amp;l);</div><div class='del'>-			cal_component_set_description_list (priv-&gt;comp, l);</div><div class='del'>-			cal_component_free_text_list (l);</div><div class='del'>-			</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		} else {</div><div class='del'>-			CalComponentText text = {_("Unknown"), NULL};</div><div class='del'>-			</div><div class='del'>-			cal_component_set_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REPLY:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has replied to a task assignment.");</div><div class='del'>-		itip_title = U_("Task Reply");</div><div class='del'>-		options = get_reply_options ();</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_CANCEL:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has cancelled a task.");</div><div class='del'>-		itip_title = U_("Task Cancellation");</div><div class='del'>-		options = get_cancel_options ();</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has sent an unintelligible message.");</div><div class='del'>-		itip_title = U_("Bad Task Message");</div><div class='del'>-		options = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_html (itip, itip_desc, itip_title, options);</div><div class='del'>-	g_free (options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_current_freebusy (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	const gchar *itip_title, *itip_desc;</div><div class='del'>-	char *options;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;method) {</div><div class='del'>-	case ICAL_METHOD_PUBLISH:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has published free/busy information.");</div><div class='del'>-		itip_title = U_("Free/Busy Information");</div><div class='del'>-		options = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REQUEST:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; requests your free/busy information.");</div><div class='del'>-		itip_title = U_("Free/Busy Request");</div><div class='del'>-		options = get_request_fb_options ();</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_METHOD_REPLY:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has replied to a free/busy request.");</div><div class='del'>-		itip_title = U_("Free/Busy Reply");</div><div class='del'>-		options = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		itip_desc = U_("&lt;b&gt;%s&lt;/b&gt; has sent an unintelligible message.");</div><div class='del'>-		itip_title = U_("Bad Free/Busy Message");</div><div class='del'>-		options = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	write_html (itip, itip_desc, itip_title, options);</div><div class='del'>-	g_free (options);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalcomponent *</div><div class='del'>-get_next (icalcompiter *iter)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *ret = NULL;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		icalcompiter_next (iter);</div><div class='del'>-		ret = icalcompiter_deref (iter);</div><div class='del'>-		kind = icalcomponent_isa (ret);</div><div class='del'>-	} while (ret != NULL </div><div class='del'>-		 &amp;&amp; kind != ICAL_VEVENT_COMPONENT</div><div class='del'>-		 &amp;&amp; kind != ICAL_VTODO_COMPONENT</div><div class='del'>-		 &amp;&amp; kind != ICAL_VFREEBUSY_COMPONENT);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static icalcomponent *</div><div class='del'>-get_prev (icalcompiter *iter)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *ret = NULL;</div><div class='del'>-	icalcomponent_kind kind = ICAL_NO_COMPONENT;</div><div class='del'>-</div><div class='del'>-	while (kind != ICAL_VEVENT_COMPONENT</div><div class='del'>-	       &amp;&amp; kind != ICAL_VTODO_COMPONENT</div><div class='del'>-	       &amp;&amp; kind != ICAL_VFREEBUSY_COMPONENT) {</div><div class='del'>-		icalcompiter_prior (iter);</div><div class='del'>-		ret = icalcompiter_deref (iter);</div><div class='del'>-		kind = icalcomponent_isa (ret);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_current (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	icalcomponent *alarm_comp;</div><div class='del'>-	icalcompiter alarm_iter;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	set_label (itip);</div><div class='del'>-	set_button_status (itip);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-	if (priv-&gt;event_client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;event_client));</div><div class='del'>-	priv-&gt;event_client = NULL;</div><div class='del'>-	if (priv-&gt;task_client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;task_client));</div><div class='del'>-	priv-&gt;task_client = NULL;</div><div class='del'>-</div><div class='del'>-	/* Strip out alarms for security purposes */</div><div class='del'>-	alarm_iter = icalcomponent_begin_component (priv-&gt;ical_comp, ICAL_VALARM_COMPONENT);</div><div class='del'>-	while ((alarm_comp = icalcompiter_deref (&amp;alarm_iter)) != NULL) {</div><div class='del'>-		icalcomponent_remove_component (priv-&gt;ical_comp, alarm_comp);</div><div class='del'>-</div><div class='del'>-		icalcompiter_next (&amp;alarm_iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (priv-&gt;comp, priv-&gt;ical_comp)) {</div><div class='del'>-		write_error_html (itip, U_("The message does not appear to be properly formed"));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-		return;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		show_current_event (itip);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		show_current_todo (itip);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-		show_current_freebusy (itip);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		write_error_html (itip, U_("The message contains only unsupported requests."));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	find_my_address (itip, priv-&gt;ical_comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_itip_control_set_data (EItipControl *itip, const gchar *text)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalcomponent_kind kind = ICAL_NO_COMPONENT;</div><div class='del'>-	icalcomponent *tz_comp;</div><div class='del'>-	icalcompiter tz_iter;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clean_up (itip);</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = NULL;</div><div class='del'>-	priv-&gt;total = 0;</div><div class='del'>-	priv-&gt;current = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;vcalendar = g_strdup (text);</div><div class='del'>-	priv-&gt;top_level = cal_util_new_top_level ();</div><div class='del'>-</div><div class='del'>-	priv-&gt;main_comp = icalparser_parse_string (priv-&gt;vcalendar);</div><div class='del'>-	if (priv-&gt;main_comp == NULL) {</div><div class='del'>-		write_error_html (itip, U_("The attachment does not contain a valid calendar message"));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prop = icalcomponent_get_first_property (priv-&gt;main_comp, ICAL_METHOD_PROPERTY);</div><div class='del'>-	if (prop == NULL) {</div><div class='del'>-		write_error_html (itip, U_("The attachment does not contain a valid calendar message"));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;method = icalproperty_get_method (prop);</div><div class='del'>-</div><div class='del'>-	tz_iter = icalcomponent_begin_component (priv-&gt;main_comp, ICAL_VTIMEZONE_COMPONENT);</div><div class='del'>-	while ((tz_comp = icalcompiter_deref (&amp;tz_iter)) != NULL) {</div><div class='del'>-		icalcomponent *clone;</div><div class='del'>-</div><div class='del'>-		clone = icalcomponent_new_clone (tz_comp);</div><div class='del'>-		icalcomponent_add_component (priv-&gt;top_level, clone);</div><div class='del'>-</div><div class='del'>-		icalcompiter_next (&amp;tz_iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;iter = icalcomponent_begin_component (priv-&gt;main_comp, ICAL_ANY_COMPONENT);</div><div class='del'>-	priv-&gt;ical_comp = icalcompiter_deref (&amp;priv-&gt;iter);</div><div class='del'>-	kind = icalcomponent_isa (priv-&gt;ical_comp);</div><div class='del'>-	if (kind != ICAL_VEVENT_COMPONENT</div><div class='del'>-	    &amp;&amp; kind != ICAL_VTODO_COMPONENT</div><div class='del'>-	    &amp;&amp; kind != ICAL_VFREEBUSY_COMPONENT)</div><div class='del'>-		priv-&gt;ical_comp = get_next (&amp;priv-&gt;iter);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ical_comp == NULL) {</div><div class='del'>-		write_error_html (itip, U_("The attachment has no viewable calendar items"));		</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;total = icalcomponent_count_components (priv-&gt;main_comp, ICAL_VEVENT_COMPONENT);</div><div class='del'>-	priv-&gt;total += icalcomponent_count_components (priv-&gt;main_comp, ICAL_VTODO_COMPONENT);</div><div class='del'>-	priv-&gt;total += icalcomponent_count_components (priv-&gt;main_comp, ICAL_VFREEBUSY_COMPONENT);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;total &gt; 0)</div><div class='del'>-		priv-&gt;current = 1;</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;current = 0;</div><div class='del'>-</div><div class='del'>-	show_current (itip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_itip_control_get_data (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return g_strdup (priv-&gt;vcalendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_itip_control_get_data_size (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;vcalendar == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return strlen (priv-&gt;vcalendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_itip_control_set_from_address (EItipControl *itip, const gchar *address)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;from_address)</div><div class='del'>-		g_free (priv-&gt;from_address);</div><div class='del'>-</div><div class='del'>-	priv-&gt;from_address = g_strdup (address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_itip_control_get_from_address (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;from_address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-change_status (icalcomponent *ical_comp, const char *address, icalparameter_partstat status)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	prop = find_attendee (ical_comp, address);</div><div class='del'>-	if (prop) {</div><div class='del'>-		icalparameter *param;</div><div class='del'>-</div><div class='del'>-		icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);</div><div class='del'>-		param = icalparameter_new_partstat (status);</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-	} else {</div><div class='del'>-		icalparameter *param;</div><div class='del'>-		</div><div class='del'>-		if (address != NULL) {</div><div class='del'>-			prop = icalproperty_new_attendee (address);</div><div class='del'>-			icalcomponent_add_property (ical_comp, prop);</div><div class='del'>-</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-</div><div class='del'>-			param = icalparameter_new_partstat (status);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-		} else {</div><div class='del'>-			ItipAddress *a;</div><div class='del'>-</div><div class='del'>-			a = itip_addresses_get_default ();</div><div class='del'>-			</div><div class='del'>-			prop = icalproperty_new_attendee (a-&gt;address);</div><div class='del'>-			icalcomponent_add_property (ical_comp, prop);</div><div class='del'>-			</div><div class='del'>-			param = icalparameter_new_cn (a-&gt;name);</div><div class='del'>-			icalproperty_add_parameter (prop, param);	</div><div class='del'>-</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-			</div><div class='del'>-			param = icalparameter_new_partstat (status);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-			</div><div class='del'>-			itip_address_free (a);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_item (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	icalcomponent *clone;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO)</div><div class='del'>-		client = priv-&gt;task_client;</div><div class='del'>-	else</div><div class='del'>-		client = priv-&gt;event_client;</div><div class='del'>-</div><div class='del'>-	clone = icalcomponent_new_clone (priv-&gt;ical_comp);</div><div class='del'>-	icalcomponent_add_component (priv-&gt;top_level, clone);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_objects (client, priv-&gt;top_level))</div><div class='del'>-		dialog = gnome_warning_dialog (_("Calendar file could not be updated!\n"));</div><div class='del'>-	else</div><div class='del'>-		dialog = gnome_ok_dialog (_("Update complete\n"));</div><div class='del'>-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	icalcomponent_remove_component (priv-&gt;top_level, clone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_attendee_status (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	CalComponent *comp = NULL;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO)</div><div class='del'>-		client = priv-&gt;task_client;</div><div class='del'>-	else</div><div class='del'>-		client = priv-&gt;event_client;</div><div class='del'>-</div><div class='del'>-	if (client == NULL) {</div><div class='del'>-		dialog = gnome_warning_dialog (_("Attendee status can not be updated "</div><div class='del'>-						 "because the item no longer exists"));</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Obtain our version */</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-	status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		GSList *attendees;</div><div class='del'>-</div><div class='del'>-		cal_component_get_attendee_list (priv-&gt;comp, &amp;attendees);</div><div class='del'>-		if (attendees != NULL) {</div><div class='del'>-			CalComponentAttendee *a = attendees-&gt;data;</div><div class='del'>-			icalproperty *prop;</div><div class='del'>-</div><div class='del'>-			prop = find_attendee (cal_component_get_icalcomponent (comp),</div><div class='del'>-					      itip_strip_mailto (a-&gt;value));</div><div class='del'>-			</div><div class='del'>-			if (prop == NULL) {</div><div class='del'>-				dialog = gnome_question_dialog_modal (_("This response is not from a current "</div><div class='del'>-									"attendee.  Add as an attendee?"),</div><div class='del'>-								      NULL, NULL);</div><div class='del'>-				if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == GNOME_YES) {</div><div class='del'>-					change_status (cal_component_get_icalcomponent (comp),</div><div class='del'>-						       itip_strip_mailto (a-&gt;value),</div><div class='del'>-						       a-&gt;status);</div><div class='del'>-					cal_component_rescan (comp);</div><div class='del'>-				} else {</div><div class='del'>-					goto cleanup;</div><div class='del'>-				}</div><div class='del'>-			} else if (a-&gt;status == ICAL_PARTSTAT_NONE || a-&gt;status == ICAL_PARTSTAT_X) {</div><div class='del'>-				dialog = gnome_warning_dialog (_("Attendee status could "</div><div class='del'>-								 "not be updated because "</div><div class='del'>-								 "of an invalid status!\n"));</div><div class='del'>-				goto cleanup;</div><div class='del'>-			} else {</div><div class='del'>-				change_status (cal_component_get_icalcomponent (comp),</div><div class='del'>-					       itip_strip_mailto (a-&gt;value),</div><div class='del'>-					       a-&gt;status);</div><div class='del'>-				cal_component_rescan (comp);				</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!cal_client_update_object (client, comp))</div><div class='del'>-			dialog = gnome_warning_dialog (_("Attendee status could not be updated!\n"));</div><div class='del'>-		else</div><div class='del'>-			dialog = gnome_ok_dialog (_("Attendee status updated\n"));</div><div class='del'>-	} else {</div><div class='del'>-		dialog = gnome_warning_dialog (_("Attendee status can not be updated "</div><div class='del'>-						 "because the item no longer exists"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- cleanup:</div><div class='del'>-	if (comp != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_item (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO)</div><div class='del'>-		client = priv-&gt;task_client;</div><div class='del'>-	else</div><div class='del'>-		client = priv-&gt;event_client;</div><div class='del'>-</div><div class='del'>-	if (client == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-	if (cal_client_remove_object (client, uid)) {</div><div class='del'>-		dialog = gnome_ok_dialog (_("Removal Complete"));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_item (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp = get_real_item (itip);</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-	</div><div class='del'>-	if (comp != NULL) {</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, priv-&gt;event_client, NULL);</div><div class='del'>-			break;</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, priv-&gt;task_client, NULL);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, NULL, NULL);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		dialog = gnome_ok_dialog (_("Item sent!\n"));</div><div class='del'>-	} else {</div><div class='del'>-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-send_freebusy (EItipControl *itip)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponentDateTime datetime;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GList *comp_list;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (priv-&gt;comp, &amp;datetime);</div><div class='del'>-	if (datetime.tzid) {</div><div class='del'>-		zone = icalcomponent_get_timezone (priv-&gt;top_level,</div><div class='del'>-						   datetime.tzid);</div><div class='del'>-	} else {</div><div class='del'>-		zone = NULL;</div><div class='del'>-	}</div><div class='del'>-	start = icaltime_as_timet_with_zone (*datetime.value, zone);</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (priv-&gt;comp, &amp;datetime);</div><div class='del'>-	if (datetime.tzid) {</div><div class='del'>-		zone = icalcomponent_get_timezone (priv-&gt;top_level,</div><div class='del'>-						   datetime.tzid);</div><div class='del'>-	} else {</div><div class='del'>-		zone = NULL;</div><div class='del'>-	}</div><div class='del'>-	end = icaltime_as_timet_with_zone (*datetime.value, zone);</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	comp_list = cal_client_get_free_busy (priv-&gt;event_client, NULL, start, end);</div><div class='del'>-</div><div class='del'>-	if (comp_list) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		for (l = comp_list; l; l = l-&gt;next) {</div><div class='del'>-			CalComponent *comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp, priv-&gt;event_client, NULL);</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		}</div><div class='del'>-		dialog = gnome_ok_dialog (_("Item sent!\n"));</div><div class='del'>-</div><div class='del'>-		g_list_free (comp_list);</div><div class='del'>-	} else {</div><div class='del'>-		dialog = gnome_warning_dialog (_("The item could not be sent!\n"));</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-prev_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (data);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;current--;</div><div class='del'>-	priv-&gt;ical_comp = get_prev (&amp;priv-&gt;iter);</div><div class='del'>-</div><div class='del'>-	show_current (itip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-next_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (data);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;current++;</div><div class='del'>-	priv-&gt;ical_comp = get_next (&amp;priv-&gt;iter);</div><div class='del'>-</div><div class='del'>-	show_current (itip);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_selected_cb (EvolutionFolderSelectorButton *button, GNOME_Evolution_Folder *folder, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (data);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	char *uri;</div><div class='del'>-	</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	type = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-	if (type == CAL_COMPONENT_TODO)</div><div class='del'>-		uri = cal_util_expand_uri (folder-&gt;physicalUri, TRUE);</div><div class='del'>-	else</div><div class='del'>-		uri = cal_util_expand_uri (folder-&gt;physicalUri, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;event_client));</div><div class='del'>-	priv-&gt;event_client = start_calendar_server (uri);</div><div class='del'>-</div><div class='del'>-	g_free (uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data)</div><div class='del'>-{	unsigned char buffer[4096];</div><div class='del'>-	int len, fd;</div><div class='del'>-        char *path;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/%s", EVOLUTION_ICONSDIR, url);</div><div class='del'>-</div><div class='del'>-	if ((fd = open (path, O_RDONLY)) == -1) {</div><div class='del'>-		g_warning ("%s", g_strerror (errno));</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-       	while ((len = read (fd, buffer, 4096)) &gt; 0) {</div><div class='del'>-		gtk_html_write (html, handle, buffer, len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		/* check to see if we stopped because of an error */</div><div class='del'>-		gtk_html_end (html, handle, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		g_warning ("%s", g_strerror (errno));</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-	/* done with no errors */</div><div class='del'>-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);</div><div class='del'>-	close (fd);</div><div class='del'>-</div><div class='del'>- cleanup:</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data) </div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (data);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	</div><div class='del'>-	priv = itip-&gt;priv;	</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		button = evolution_folder_selector_button_new (</div><div class='del'>-			global_shell_client, _("Select Calendar Folder"),</div><div class='del'>-			calendar_config_default_calendar_folder (), </div><div class='del'>-			calendar_types);</div><div class='del'>-		priv-&gt;event_client = start_default_server (FALSE);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		button = evolution_folder_selector_button_new (</div><div class='del'>-			global_shell_client, _("Select Tasks Folder"),</div><div class='del'>-			calendar_config_default_tasks_folder (), </div><div class='del'>-			tasks_types);</div><div class='del'>-		priv-&gt;task_client = start_default_server (TRUE);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		button = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "selected", </div><div class='del'>-			    button_selected_cb, itip);</div><div class='del'>-	</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (eb), button);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ok_clicked_cb (GtkHTML *html, const gchar *method, const gchar *url, const gchar *encoding, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = E_ITIP_CONTROL (data);</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-	gchar **fields;</div><div class='del'>-	gboolean rsvp = FALSE, status = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = itip-&gt;priv;</div><div class='del'>-</div><div class='del'>-	fields = g_strsplit (encoding, "&amp;", -1);</div><div class='del'>-	for (i = 0; fields[i] != NULL; i++) {</div><div class='del'>-		gchar **key_value;</div><div class='del'>-</div><div class='del'>-		key_value = g_strsplit (fields[i], "=", 2);</div><div class='del'>-</div><div class='del'>-		if (key_value[0] != NULL &amp;&amp; !strcmp (key_value[0], "action")) {</div><div class='del'>-			if (key_value[1] == NULL)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			switch (key_value[1][0]) {</div><div class='del'>-			case 'U':</div><div class='del'>-				update_item (itip);</div><div class='del'>-				break;</div><div class='del'>-			case 'A':</div><div class='del'>-				status = change_status (priv-&gt;ical_comp, priv-&gt;my_address, </div><div class='del'>-							ICAL_PARTSTAT_ACCEPTED);</div><div class='del'>-				if (status) {</div><div class='del'>-					cal_component_rescan (priv-&gt;comp);</div><div class='del'>-					update_item (itip);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 'T':</div><div class='del'>-				status = change_status (priv-&gt;ical_comp, priv-&gt;my_address,</div><div class='del'>-							ICAL_PARTSTAT_TENTATIVE);</div><div class='del'>-				if (status) {</div><div class='del'>-					cal_component_rescan (priv-&gt;comp);</div><div class='del'>-					update_item (itip);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 'D':</div><div class='del'>-				status = change_status (priv-&gt;ical_comp, priv-&gt;my_address,</div><div class='del'>-							ICAL_PARTSTAT_DECLINED);</div><div class='del'>-				if (status) {</div><div class='del'>-					cal_component_rescan (priv-&gt;comp);</div><div class='del'>-					remove_item (itip);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 'F':</div><div class='del'>-				send_freebusy (itip);</div><div class='del'>-				break;</div><div class='del'>-			case 'R':</div><div class='del'>-				update_attendee_status (itip);</div><div class='del'>-				break;</div><div class='del'>-			case 'S':</div><div class='del'>-				send_item (itip);</div><div class='del'>-				break;</div><div class='del'>-			case 'C':</div><div class='del'>-				remove_item (itip);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (key_value[0] != NULL &amp;&amp; !strcmp (key_value[0], "rsvp"))</div><div class='del'>-			if (*key_value[1] == '1')</div><div class='del'>-				rsvp = TRUE;</div><div class='del'>-</div><div class='del'>-		g_strfreev (key_value);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	g_strfreev (fields);</div><div class='del'>-</div><div class='del'>-	if (rsvp &amp;&amp; status) {</div><div class='del'>-		CalComponent *comp = NULL;</div><div class='del'>-		CalComponentVType vtype;</div><div class='del'>-		icalcomponent *ical_comp;</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		const char *attendee;</div><div class='del'>-		GSList *l, *list = NULL;</div><div class='del'>-		</div><div class='del'>-		comp = cal_component_clone (priv-&gt;comp);</div><div class='del'>-		if (comp == NULL)</div><div class='del'>-			return;</div><div class='del'>-		vtype = cal_component_get_vtype (comp);</div><div class='del'>-		</div><div class='del'>-		if (priv-&gt;my_address == NULL)</div><div class='del'>-			find_my_address (itip, priv-&gt;ical_comp);</div><div class='del'>-		g_assert (priv-&gt;my_address != NULL);</div><div class='del'>-		</div><div class='del'>-		ical_comp = cal_component_get_icalcomponent (comp);</div><div class='del'>-		</div><div class='del'>-		for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-		     prop != NULL;</div><div class='del'>-		     prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))</div><div class='del'>-		{</div><div class='del'>-			char *text;</div><div class='del'>-			</div><div class='del'>-			value = icalproperty_get_value (prop);</div><div class='del'>-			if (!value)</div><div class='del'>-				continue;</div><div class='del'>-			</div><div class='del'>-			attendee = icalvalue_get_string (value);</div><div class='del'>-			</div><div class='del'>-			text = g_strdup (itip_strip_mailto (attendee));</div><div class='del'>-			text = g_strstrip (text);</div><div class='del'>-			if (g_strcasecmp (priv-&gt;my_address, text))</div><div class='del'>-				list = g_slist_prepend (list, prop);</div><div class='del'>-			g_free (text);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (l = list; l; l = l-&gt;next) {</div><div class='del'>-			prop = l-&gt;data;</div><div class='del'>-			icalcomponent_remove_property (ical_comp, prop);</div><div class='del'>-			icalproperty_free (prop);</div><div class='del'>-		}</div><div class='del'>-		g_slist_free (list);</div><div class='del'>-		</div><div class='del'>-		cal_component_rescan (comp);</div><div class='del'>-		switch (vtype) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp,</div><div class='del'>-					priv-&gt;event_client, priv-&gt;top_level);</div><div class='del'>-			break;</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp,</div><div class='del'>-					priv-&gt;task_client, priv-&gt;top_level);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_REPLY, comp, NULL, NULL);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade<br/>deleted file mode 100644<br/>index 68e15d6989..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-itip-control.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,478 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-itip-control&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-itip-control&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window1&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;main_frame&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;label&gt;Calendar Message&lt;/label&gt;</div><div class='del'>-    &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-    &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-      &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-      &lt;vscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/vscrollbar_policy&gt;</div><div class='del'>-      &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-      &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;viewport1&lt;/name&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_NONE&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;3&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;3&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;6&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;organizer_entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;summary_entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;scrolledwindow2&lt;/name&gt;</div><div class='del'>-	      &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	      &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	      &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	      &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;description_box&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-		&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;dtstart_label&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;date-start&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;--to--&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;19&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;dtend_label&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;date-end&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Organizer:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Summary:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Description:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label12&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Server Message:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;3&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;scrolledwindow3&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;width&gt;365&lt;/width&gt;</div><div class='del'>-	    &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-	    &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;message_text&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button_box&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-	    &lt;height&gt;30&lt;/height&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;loading_window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Loading Calendar&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_DIALOG&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_CENTER&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;label&gt;&lt;/label&gt;</div><div class='del'>-    &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-    &lt;shadow_type&gt;GTK_SHADOW_ETCHED_OUT&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;1&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;9&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label10&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Loading calendar...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkProgressBar&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;loading_progress&lt;/name&gt;</div><div class='del'>-	  &lt;value&gt;0&lt;/value&gt;</div><div class='del'>-	  &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	  &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-	  &lt;bar_style&gt;GTK_PROGRESS_CONTINUOUS&lt;/bar_style&gt;</div><div class='del'>-	  &lt;orientation&gt;GTK_PROGRESS_LEFT_TO_RIGHT&lt;/orientation&gt;</div><div class='del'>-	  &lt;activity_mode&gt;False&lt;/activity_mode&gt;</div><div class='del'>-	  &lt;show_text&gt;False&lt;/show_text&gt;</div><div class='del'>-	  &lt;format&gt;%P %%&lt;/format&gt;</div><div class='del'>-	  &lt;text_xalign&gt;0.5&lt;/text_xalign&gt;</div><div class='del'>-	  &lt;text_yalign&gt;0.5&lt;/text_yalign&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h<br/>deleted file mode 100644<br/>index 30917fb13d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-itip-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-itip-control.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_ITIP_CONTROL_H_</div><div class='del'>-#define _E_ITIP_CONTROL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_ITIP_CONTROL			(e_itip_control_get_type ())</div><div class='del'>-#define E_ITIP_CONTROL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_ITIP_CONTROL, EItipControl))</div><div class='del'>-#define E_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITIP_CONTROL, EItipControlClass))</div><div class='del'>-#define E_IS_ITIP_CONTROL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_ITIP_CONTROL))</div><div class='del'>-#define E_IS_ITIP_CONTROL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_ITIP_CONTROL))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EItipControl        EItipControl;</div><div class='del'>-typedef struct _EItipControlPrivate EItipControlPrivate;</div><div class='del'>-typedef struct _EItipControlClass   EItipControlClass;</div><div class='del'>-</div><div class='del'>-struct _EItipControl {</div><div class='del'>-	GtkVBox parent;</div><div class='del'>-</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EItipControlClass {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType      e_itip_control_get_type         (void);</div><div class='del'>-GtkWidget *  e_itip_control_new              (void);</div><div class='del'>-void         e_itip_control_set_data         (EItipControl *itip,</div><div class='del'>-					      const gchar  *text);</div><div class='del'>-gchar *      e_itip_control_get_data         (EItipControl *itip);</div><div class='del'>-gint         e_itip_control_get_data_size    (EItipControl *itip);</div><div class='del'>-void         e_itip_control_set_from_address (EItipControl *itip,</div><div class='del'>-					      const gchar  *address);</div><div class='del'>-const gchar *e_itip_control_get_from_address (EItipControl *itip);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_ITIP_CONTROL_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c<br/>deleted file mode 100644<br/>index 3d4a8a4f48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-attendee.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-attendee.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,990 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-attendee.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "e-meeting-attendee.h"</div><div class='del'>-</div><div class='del'>-struct _EMeetingAttendeePrivate {</div><div class='del'>-	gchar *address;</div><div class='del'>-	gchar *member;</div><div class='del'>-</div><div class='del'>-	icalparameter_cutype cutype;</div><div class='del'>-	icalparameter_role role;</div><div class='del'>-</div><div class='del'>-	gboolean rsvp;</div><div class='del'>-</div><div class='del'>-	gchar *delto;</div><div class='del'>-	gchar *delfrom;</div><div class='del'>-</div><div class='del'>-	icalparameter_partstat status;</div><div class='del'>-	</div><div class='del'>-	gchar *sentby;</div><div class='del'>-	gchar *cn;</div><div class='del'>-	gchar *language;</div><div class='del'>-</div><div class='del'>-	gboolean has_calendar_info;</div><div class='del'>-</div><div class='del'>-	GArray *busy_periods;</div><div class='del'>-	gboolean busy_periods_sorted;</div><div class='del'>-</div><div class='del'>-	EMeetingTime busy_periods_start;</div><div class='del'>-	EMeetingTime busy_periods_end;</div><div class='del'>-	gboolean start_busy_range_set;</div><div class='del'>-	gboolean end_busy_range_set;</div><div class='del'>-	</div><div class='del'>-	gint longest_period_in_days;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-static guint signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static void class_init	(EMeetingAttendeeClass *klass);</div><div class='del'>-static void init	(EMeetingAttendee *ia);</div><div class='del'>-static void destroy	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_meeting_attendee_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (type == 0)</div><div class='del'>-	{</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EMeetingAttendee",</div><div class='del'>-			sizeof (EMeetingAttendee),</div><div class='del'>-			sizeof (EMeetingAttendeeClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMeetingAttendeeClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMeetingAttendeeClass, changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-string_test (gchar *string)</div><div class='del'>-{</div><div class='del'>-	return string != NULL ? string : g_strdup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-string_is_set (gchar *string) </div><div class='del'>-{</div><div class='del'>-	if (string != NULL &amp;&amp; *string != '\0')</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-notify_changed (EMeetingAttendee *ia) </div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (ia), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EMeetingAttendeePrivate, 1);</div><div class='del'>-</div><div class='del'>-	ia-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;address = string_test (NULL);</div><div class='del'>-	priv-&gt;member = string_test (NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;cutype = ICAL_CUTYPE_NONE;</div><div class='del'>-	priv-&gt;role = ICAL_ROLE_NONE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rsvp = FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;delto = string_test (NULL);</div><div class='del'>-	priv-&gt;delfrom = string_test (NULL);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;status = ICAL_PARTSTAT_NONE;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;sentby = string_test (NULL);</div><div class='del'>-	priv-&gt;cn = string_test (NULL);</div><div class='del'>-	priv-&gt;language = string_test (NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;has_calendar_info = FALSE;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;busy_periods = g_array_new (FALSE, FALSE, sizeof (EMeetingFreeBusyPeriod));</div><div class='del'>-	priv-&gt;busy_periods_sorted = FALSE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_start.date, 1);</div><div class='del'>-	priv-&gt;busy_periods_start.hour = 0;</div><div class='del'>-	priv-&gt;busy_periods_start.minute = 0;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_end.date, 1);</div><div class='del'>-	priv-&gt;busy_periods_end.hour = 0;</div><div class='del'>-	priv-&gt;busy_periods_end.minute = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;start_busy_range_set = FALSE;</div><div class='del'>-	priv-&gt;end_busy_range_set = FALSE;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;longest_period_in_days = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendee *ia = E_MEETING_ATTENDEE (obj);</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;address);</div><div class='del'>-	g_free (priv-&gt;member);</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;delto);</div><div class='del'>-	g_free (priv-&gt;delfrom);</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;sentby);</div><div class='del'>-	g_free (priv-&gt;cn);</div><div class='del'>-	g_free (priv-&gt;language);</div><div class='del'>-	</div><div class='del'>-	g_array_free (priv-&gt;busy_periods, TRUE);</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkObject *</div><div class='del'>-e_meeting_attendee_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (E_TYPE_MEETING_ATTENDEE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkObject *</div><div class='del'>-e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	</div><div class='del'>-	ia = E_MEETING_ATTENDEE (gtk_type_new (E_TYPE_MEETING_ATTENDEE));</div><div class='del'>-</div><div class='del'>-	e_meeting_attendee_set_address (ia, g_strdup (ca-&gt;value));</div><div class='del'>-	e_meeting_attendee_set_member (ia, g_strdup (ca-&gt;member));</div><div class='del'>-	e_meeting_attendee_set_cutype (ia, ca-&gt;cutype);</div><div class='del'>-	e_meeting_attendee_set_role (ia, ca-&gt;role);</div><div class='del'>-	e_meeting_attendee_set_status (ia, ca-&gt;status);</div><div class='del'>-	e_meeting_attendee_set_rsvp (ia, ca-&gt;rsvp);</div><div class='del'>-	e_meeting_attendee_set_delto (ia, g_strdup (ca-&gt;delto));</div><div class='del'>-	e_meeting_attendee_set_delfrom (ia, g_strdup (ca-&gt;delfrom));</div><div class='del'>-	e_meeting_attendee_set_sentby (ia, g_strdup (ca-&gt;sentby));</div><div class='del'>-	e_meeting_attendee_set_cn (ia, g_strdup (ca-&gt;cn));</div><div class='del'>-	e_meeting_attendee_set_language (ia, g_strdup (ca-&gt;language));</div><div class='del'>-	</div><div class='del'>-	return GTK_OBJECT (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CalComponentAttendee *</div><div class='del'>-e_meeting_attendee_as_cal_component_attendee (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	CalComponentAttendee *ca;</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	ca = g_new0 (CalComponentAttendee, 1);</div><div class='del'>-</div><div class='del'>-	ca-&gt;value = priv-&gt;address;</div><div class='del'>-	ca-&gt;member = string_is_set (priv-&gt;member) ? priv-&gt;member : NULL;</div><div class='del'>-	ca-&gt;cutype= priv-&gt;cutype;</div><div class='del'>-	ca-&gt;role = priv-&gt;role;</div><div class='del'>-	ca-&gt;status = priv-&gt;status;</div><div class='del'>-	ca-&gt;rsvp = priv-&gt;rsvp;</div><div class='del'>-	ca-&gt;delto = string_is_set (priv-&gt;delto) ? priv-&gt;delto : NULL;</div><div class='del'>-	ca-&gt;delfrom = string_is_set (priv-&gt;delfrom) ? priv-&gt;delfrom : NULL;</div><div class='del'>-	ca-&gt;sentby = string_is_set (priv-&gt;sentby) ? priv-&gt;sentby : NULL;</div><div class='del'>-	ca-&gt;cn = string_is_set (priv-&gt;cn) ? priv-&gt;cn : NULL;</div><div class='del'>-	ca-&gt;language = string_is_set (priv-&gt;language) ? priv-&gt;language : NULL;</div><div class='del'>-</div><div class='del'>-	return ca;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_address (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;address != NULL)</div><div class='del'>-		g_free (priv-&gt;address);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;address = string_test (address);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_address (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return string_is_set (priv-&gt;address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_member (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;member;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;member != NULL)</div><div class='del'>-		g_free (priv-&gt;member);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;member = string_test (member);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_member (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;member);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icalparameter_cutype</div><div class='del'>-e_meeting_attendee_get_cutype (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;cutype;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;cutype = cutype;</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icalparameter_role</div><div class='del'>-e_meeting_attendee_get_role (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;role;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;role = role;</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_meeting_attendee_get_rsvp (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;rsvp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;rsvp = rsvp;</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_delto (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;delto;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;delto != NULL)</div><div class='del'>-		g_free (priv-&gt;delto);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;delto = string_test (delto);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_delto (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;delto);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_delfrom (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;delfrom;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;delfrom != NULL)</div><div class='del'>-		g_free (priv-&gt;delfrom);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;delfrom = string_test (delfrom);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;delfrom);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icalparameter_partstat</div><div class='del'>-e_meeting_attendee_get_status (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;status = status;</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_sentby (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;sentby;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;sentby != NULL)</div><div class='del'>-		g_free (priv-&gt;sentby);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;sentby = string_test (sentby);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;sentby);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_cn (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;cn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;cn != NULL)</div><div class='del'>-		g_free (priv-&gt;cn);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;cn = string_test (cn);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_cn (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;cn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-e_meeting_attendee_get_language (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;language;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;language != NULL)</div><div class='del'>-		g_free (priv-&gt;language);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;language = string_test (language);</div><div class='del'>-</div><div class='del'>-	notify_changed (ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_is_set_language (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return string_is_set (priv-&gt;language);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingAttendeeType</div><div class='del'>-e_meeting_attendee_get_atype (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cutype == ICAL_CUTYPE_ROOM</div><div class='del'>-	    || priv-&gt;cutype == ICAL_CUTYPE_RESOURCE)</div><div class='del'>-		return E_MEETING_ATTENDEE_RESOURCE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;role == ICAL_ROLE_CHAIR</div><div class='del'>-	    || priv-&gt;role == ICAL_ROLE_REQPARTICIPANT)</div><div class='del'>-		return E_MEETING_ATTENDEE_REQUIRED_PERSON;</div><div class='del'>-	</div><div class='del'>-	return E_MEETING_ATTENDEE_OPTIONAL_PERSON;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare_times (EMeetingTime *time1,</div><div class='del'>-	       EMeetingTime *time2)</div><div class='del'>-{</div><div class='del'>-	gint day_comparison;</div><div class='del'>-</div><div class='del'>-	day_comparison = g_date_compare (&amp;time1-&gt;date,</div><div class='del'>-					 &amp;time2-&gt;date);</div><div class='del'>-	if (day_comparison != 0)</div><div class='del'>-		return day_comparison;</div><div class='del'>-</div><div class='del'>-	if (time1-&gt;hour &lt; time2-&gt;hour)</div><div class='del'>-		return -1;</div><div class='del'>-	if (time1-&gt;hour &gt; time2-&gt;hour)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (time1-&gt;minute &lt; time2-&gt;minute)</div><div class='del'>-		return -1;</div><div class='del'>-	if (time1-&gt;minute &gt; time2-&gt;minute)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* The start times are exactly the same. */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare_period_starts (const void *arg1,</div><div class='del'>-		       const void *arg2)</div><div class='del'>-{</div><div class='del'>-	EMeetingFreeBusyPeriod *period1, *period2;</div><div class='del'>-</div><div class='del'>-	period1 = (EMeetingFreeBusyPeriod *) arg1;</div><div class='del'>-	period2 = (EMeetingFreeBusyPeriod *) arg2;</div><div class='del'>-</div><div class='del'>-	return compare_times (&amp;period1-&gt;start, &amp;period2-&gt;start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ensure_periods_sorted (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;busy_periods_sorted)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	qsort (priv-&gt;busy_periods-&gt;data, priv-&gt;busy_periods-&gt;len,</div><div class='del'>-	       sizeof (EMeetingFreeBusyPeriod),</div><div class='del'>-	       compare_period_starts);</div><div class='del'>-</div><div class='del'>-	priv-&gt;busy_periods_sorted = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;has_calendar_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;has_calendar_info = has_calendar_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const GArray *</div><div class='del'>-e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ensure_periods_sorted (ia);</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;busy_periods;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	EMeetingFreeBusyPeriod *period;</div><div class='del'>-	gint lower, upper, middle = 0, cmp = 0;</div><div class='del'>-	GDate tmp_date;</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Make sure the busy periods have been sorted. */</div><div class='del'>-	ensure_periods_sorted (ia);</div><div class='del'>-</div><div class='del'>-	/* Calculate the first day which could have a busy period which</div><div class='del'>-	   continues onto our given date. */</div><div class='del'>-	tmp_date = *date;</div><div class='del'>-	g_date_subtract_days (&amp;tmp_date, priv-&gt;longest_period_in_days);</div><div class='del'>-</div><div class='del'>-	/* We want the first busy period which starts on tmp_date. */</div><div class='del'>-	lower = 0;</div><div class='del'>-	upper = priv-&gt;busy_periods-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (upper == 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	while (lower &lt; upper) {</div><div class='del'>-		middle = (lower + upper) &gt;&gt; 1;</div><div class='del'>-	  </div><div class='del'>-		period = &amp;g_array_index (priv-&gt;busy_periods,</div><div class='del'>-					 EMeetingFreeBusyPeriod, middle);</div><div class='del'>-</div><div class='del'>-		cmp = g_date_compare (&amp;tmp_date, &amp;period-&gt;start.date);</div><div class='del'>-	  </div><div class='del'>-		if (cmp == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (cmp &lt; 0)</div><div class='del'>-			upper = middle;</div><div class='del'>-		else</div><div class='del'>-			lower = middle + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* There may be several busy periods on the same day so we step</div><div class='del'>-	   backwards to the first one. */</div><div class='del'>-	if (cmp == 0) {</div><div class='del'>-		while (middle &gt; 0) {</div><div class='del'>-			period = &amp;g_array_index (priv-&gt;busy_periods,</div><div class='del'>-						 EMeetingFreeBusyPeriod, middle - 1);</div><div class='del'>-			if (g_date_compare (&amp;tmp_date, &amp;period-&gt;start.date) != 0)</div><div class='del'>-				break;</div><div class='del'>-			middle--;</div><div class='del'>-		}</div><div class='del'>-	} else if (cmp &gt; 0) {</div><div class='del'>-		/* This means we couldn't find a period on the given day, and</div><div class='del'>-		   the last one we looked at was before it, so if there are</div><div class='del'>-		   any more periods after this one we return it. */</div><div class='del'>-		middle++;</div><div class='del'>-		if (priv-&gt;busy_periods-&gt;len &lt;= middle)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return middle;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, </div><div class='del'>-				    gint start_year,</div><div class='del'>-				    gint start_month,</div><div class='del'>-				    gint start_day,</div><div class='del'>-				    gint start_hour,</div><div class='del'>-				    gint start_minute,</div><div class='del'>-				    gint end_year,</div><div class='del'>-				    gint end_month,</div><div class='del'>-				    gint end_day,</div><div class='del'>-				    gint end_hour,</div><div class='del'>-				    gint end_minute,</div><div class='del'>-				    EMeetingFreeBusyType busy_type)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	EMeetingFreeBusyPeriod period;</div><div class='del'>-	gint period_in_days;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ia != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);</div><div class='del'>-	g_return_val_if_fail (busy_type &gt;= 0, FALSE);</div><div class='del'>-	g_return_val_if_fail (busy_type &lt; E_MEETING_FREE_BUSY_LAST, FALSE);</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Check the dates are valid. */</div><div class='del'>-	if (!g_date_valid_dmy (start_day, start_month, start_year))</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (!g_date_valid_dmy (end_day, end_month, end_year))</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (start_hour &lt; 0 || start_hour &gt; 23)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (end_hour &lt; 0 || end_hour &gt; 23)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (start_minute &lt; 0 || start_minute &gt; 59)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (end_minute &lt; 0 || end_minute &gt; 59)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;period.start.date, 1);</div><div class='del'>-	g_date_clear (&amp;period.end.date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;period.start.date, start_day, start_month, start_year);</div><div class='del'>-	g_date_set_dmy (&amp;period.end.date, end_day, end_month, end_year);</div><div class='del'>-	period.start.hour = start_hour;</div><div class='del'>-	period.start.minute = start_minute;</div><div class='del'>-	period.end.hour = end_hour;</div><div class='del'>-	period.end.minute = end_minute;</div><div class='del'>-	period.busy_type = busy_type;</div><div class='del'>-</div><div class='del'>-	/* Check that the start time is before or equal to the end time. */</div><div class='del'>-	if (compare_times (&amp;period.start, &amp;period.end) &gt; 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If the busy range is not set elsewhere, track it as best we can */</div><div class='del'>-	if (!priv-&gt;start_busy_range_set) {</div><div class='del'>-		if (!g_date_valid (&amp;priv-&gt;busy_periods_start.date)) {</div><div class='del'>-			priv-&gt;busy_periods_start.date = period.start.date;</div><div class='del'>-			priv-&gt;busy_periods_start.hour = period.start.hour;</div><div class='del'>-			priv-&gt;busy_periods_start.minute = period.start.minute;			</div><div class='del'>-		} else {</div><div class='del'>-			switch (g_date_compare (&amp;period.start.date, &amp;priv-&gt;busy_periods_start.date)) {</div><div class='del'>-			case -1:</div><div class='del'>-				priv-&gt;busy_periods_start.date = period.start.date;</div><div class='del'>-				priv-&gt;busy_periods_start.hour = period.start.hour;</div><div class='del'>-				priv-&gt;busy_periods_start.minute = period.start.minute;			</div><div class='del'>-				break;</div><div class='del'>-			case 0:</div><div class='del'>-				if (period.start.hour &lt; priv-&gt;busy_periods_start.hour</div><div class='del'>-				    || (period.start.hour == priv-&gt;busy_periods_start.hour</div><div class='del'>-					&amp;&amp; period.start.minute &lt; priv-&gt;busy_periods_start.minute)) {</div><div class='del'>-					priv-&gt;busy_periods_start.date = period.start.date;</div><div class='del'>-					priv-&gt;busy_periods_start.hour = period.start.hour;</div><div class='del'>-					priv-&gt;busy_periods_start.minute = period.start.minute;			</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!priv-&gt;end_busy_range_set) {</div><div class='del'>-		if (!g_date_valid (&amp;priv-&gt;busy_periods_end.date)) {</div><div class='del'>-			priv-&gt;busy_periods_end.date = period.end.date;</div><div class='del'>-			priv-&gt;busy_periods_end.hour = period.end.hour;</div><div class='del'>-			priv-&gt;busy_periods_end.minute = period.end.minute;			</div><div class='del'>-		} else {</div><div class='del'>-			switch (g_date_compare (&amp;period.end.date, &amp;priv-&gt;busy_periods_end.date)) {</div><div class='del'>-			case 0:</div><div class='del'>-				if (period.end.hour &gt; priv-&gt;busy_periods_end.hour</div><div class='del'>-				    || (period.end.hour == priv-&gt;busy_periods_end.hour</div><div class='del'>-					&amp;&amp; period.end.minute &gt; priv-&gt;busy_periods_end.minute)) {</div><div class='del'>-					priv-&gt;busy_periods_end.date = period.end.date;</div><div class='del'>-					priv-&gt;busy_periods_end.hour = period.end.hour;</div><div class='del'>-					priv-&gt;busy_periods_end.minute = period.end.minute;			</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				priv-&gt;busy_periods_end.date = period.end.date;</div><div class='del'>-				priv-&gt;busy_periods_end.hour = period.end.hour;</div><div class='del'>-				priv-&gt;busy_periods_end.minute = period.end.minute;			</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_array_append_val (priv-&gt;busy_periods, period);</div><div class='del'>-	priv-&gt;has_calendar_info = TRUE;</div><div class='del'>-	priv-&gt;busy_periods_sorted = FALSE;</div><div class='del'>-</div><div class='del'>-	period_in_days = g_date_julian (&amp;period.end.date) - g_date_julian (&amp;period.start.date) + 1;</div><div class='del'>-	priv-&gt;longest_period_in_days = MAX (priv-&gt;longest_period_in_days, period_in_days);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingTime</div><div class='del'>-e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;busy_periods_start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingTime</div><div class='del'>-e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;busy_periods_end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,</div><div class='del'>-					 gint start_year,</div><div class='del'>-					 gint start_month,</div><div class='del'>-					 gint start_day,</div><div class='del'>-					 gint start_hour,</div><div class='del'>-					 gint start_minute)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Check the dates are valid. */</div><div class='del'>-	if (!g_date_valid_dmy (start_day, start_month, start_year))</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (start_hour &lt; 0 || start_hour &gt; 23)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (start_minute &lt; 0 || start_minute &gt; 59)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_start.date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;priv-&gt;busy_periods_start.date,</div><div class='del'>-			start_day, start_month, start_year);</div><div class='del'>-	priv-&gt;busy_periods_start.hour = start_hour;</div><div class='del'>-	priv-&gt;busy_periods_start.minute = start_minute;</div><div class='del'>-</div><div class='del'>-	priv-&gt;start_busy_range_set = TRUE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,</div><div class='del'>-				       gint end_year,</div><div class='del'>-				       gint end_month,</div><div class='del'>-				       gint end_day,</div><div class='del'>-				       gint end_hour,</div><div class='del'>-				       gint end_minute)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Check the dates are valid. */</div><div class='del'>-	if (!g_date_valid_dmy (end_day, end_month, end_year))</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (end_hour &lt; 0 || end_hour &gt; 23)</div><div class='del'>-		return FALSE;</div><div class='del'>-	if (end_minute &lt; 0 || end_minute &gt; 59)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_end.date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;priv-&gt;busy_periods_end.date,</div><div class='del'>-			end_day, end_month, end_year);</div><div class='del'>-	priv-&gt;busy_periods_end.hour = end_hour;</div><div class='del'>-	priv-&gt;busy_periods_end.minute = end_minute;</div><div class='del'>-</div><div class='del'>-	priv-&gt;end_busy_range_set = TRUE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Clears all busy times for the given attendee. */</div><div class='del'>-void</div><div class='del'>-e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_MEETING_ATTENDEE (ia));</div><div class='del'>-</div><div class='del'>-	priv = ia-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	g_array_set_size (priv-&gt;busy_periods, 0);</div><div class='del'>-	priv-&gt;busy_periods_sorted = TRUE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_start.date, 1);</div><div class='del'>-	priv-&gt;busy_periods_start.hour = 0;</div><div class='del'>-	priv-&gt;busy_periods_start.minute = 0;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;priv-&gt;busy_periods_end.date, 1);</div><div class='del'>-	priv-&gt;busy_periods_end.hour = 0;</div><div class='del'>-	priv-&gt;busy_periods_end.minute = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;longest_period_in_days = 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h<br/>deleted file mode 100644<br/>index 69f2ced837..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-attendee.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-attendee.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-meeting_attendee.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MEETING_ATTENDEE_H_</div><div class='del'>-#define _E_MEETING_ATTENDEE_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include "e-meeting-types.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MEETING_ATTENDEE			(e_meeting_attendee_get_type ())</div><div class='del'>-#define E_MEETING_ATTENDEE(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MEETING_ATTENDEE, EMeetingAttendee))</div><div class='del'>-#define E_MEETING_ATTENDEE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_ATTENDEE, EMeetingAttendeeClass))</div><div class='del'>-#define E_IS_MEETING_ATTENDEE(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))</div><div class='del'>-#define E_IS_MEETING_ATTENDEE_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_ATTENDEE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingAttendee         EMeetingAttendee;</div><div class='del'>-typedef struct _EMeetingAttendeePrivate  EMeetingAttendeePrivate;</div><div class='del'>-typedef struct _EMeetingAttendeeClass    EMeetingAttendeeClass;</div><div class='del'>-</div><div class='del'>-/* These specify the type of attendee. Either a person or a resource (e.g. a</div><div class='del'>-   meeting room). These are used for the Autopick options, where the user can</div><div class='del'>-   ask for a time when, for example, all people and one resource are free.</div><div class='del'>-   The default is E_MEETING_ATTENDEE_REQUIRED_PERSON. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_MEETING_ATTENDEE_REQUIRED_PERSON,</div><div class='del'>-	E_MEETING_ATTENDEE_OPTIONAL_PERSON,</div><div class='del'>-	E_MEETING_ATTENDEE_RESOURCE</div><div class='del'>-} EMeetingAttendeeType;</div><div class='del'>-</div><div class='del'>-struct _EMeetingAttendee {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	EMeetingAttendeePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMeetingAttendeeClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed) (EMeetingAttendee *ia);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_meeting_attendee_get_type (void);</div><div class='del'>-GtkObject *e_meeting_attendee_new      (void);</div><div class='del'>-GtkObject *e_meeting_attendee_new_from_cal_component_attendee (CalComponentAttendee *ca);</div><div class='del'>-</div><div class='del'>-CalComponentAttendee *e_meeting_attendee_as_cal_component_attendee (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_address (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_address (EMeetingAttendee *ia, gchar *address);</div><div class='del'>-gboolean e_meeting_attendee_is_set_address (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_member (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_member (EMeetingAttendee *ia, gchar *member);</div><div class='del'>-gboolean e_meeting_attendee_is_set_member (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-icalparameter_cutype e_meeting_attendee_get_cutype (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_cutype (EMeetingAttendee *ia, icalparameter_cutype cutype);</div><div class='del'>-</div><div class='del'>-icalparameter_role e_meeting_attendee_get_role (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_role (EMeetingAttendee *ia, icalparameter_role role);</div><div class='del'>-</div><div class='del'>-gboolean e_meeting_attendee_get_rsvp (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_rsvp (EMeetingAttendee *ia, gboolean rsvp);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_delto (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_delto (EMeetingAttendee *ia, gchar *delto);</div><div class='del'>-gboolean e_meeting_attendee_is_set_delto (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_delfrom (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_delfrom (EMeetingAttendee *ia, gchar *delfrom);</div><div class='del'>-gboolean e_meeting_attendee_is_set_delfrom (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-icalparameter_partstat e_meeting_attendee_get_status (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_status (EMeetingAttendee *ia, icalparameter_partstat status);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_sentby (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_sentby (EMeetingAttendee *ia, gchar *sentby);</div><div class='del'>-gboolean e_meeting_attendee_is_set_sentby (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_cn (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_cn (EMeetingAttendee *ia, gchar *cn);</div><div class='del'>-gboolean e_meeting_attendee_is_set_cn (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-const gchar *e_meeting_attendee_get_language (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_language (EMeetingAttendee *ia, gchar *language);</div><div class='del'>-gboolean e_meeting_attendee_is_set_language (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-EMeetingAttendeeType e_meeting_attendee_get_atype (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-gboolean e_meeting_attendee_get_has_calendar_info (EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_attendee_set_has_calendar_info (EMeetingAttendee *ia, gboolean has_calendar_info);</div><div class='del'>-</div><div class='del'>-const GArray *e_meeting_attendee_get_busy_periods (EMeetingAttendee *ia);</div><div class='del'>-gint e_meeting_attendee_find_first_busy_period (EMeetingAttendee *ia, GDate *date);</div><div class='del'>-gboolean e_meeting_attendee_add_busy_period (EMeetingAttendee *ia, </div><div class='del'>-					gint start_year,</div><div class='del'>-					gint start_month,</div><div class='del'>-					gint start_day,</div><div class='del'>-					gint start_hour,</div><div class='del'>-					gint start_minute,</div><div class='del'>-					gint end_year,</div><div class='del'>-					gint end_month,</div><div class='del'>-					gint end_day,</div><div class='del'>-					gint end_hour,</div><div class='del'>-					gint end_minute,</div><div class='del'>-					EMeetingFreeBusyType busy_type);</div><div class='del'>-</div><div class='del'>-EMeetingTime e_meeting_attendee_get_start_busy_range (EMeetingAttendee *ia);</div><div class='del'>-EMeetingTime e_meeting_attendee_get_end_busy_range (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-gboolean e_meeting_attendee_set_start_busy_range (EMeetingAttendee *ia,</div><div class='del'>-						  gint start_year,</div><div class='del'>-						  gint start_month,</div><div class='del'>-						  gint start_day,</div><div class='del'>-						  gint start_hour,</div><div class='del'>-						  gint start_minute);</div><div class='del'>-gboolean e_meeting_attendee_set_end_busy_range (EMeetingAttendee *ia,</div><div class='del'>-						gint end_year,</div><div class='del'>-						gint end_month,</div><div class='del'>-						gint end_day,</div><div class='del'>-						gint end_hour,</div><div class='del'>-						gint end_minute);</div><div class='del'>-</div><div class='del'>-void e_meeting_attendee_clear_busy_periods (EMeetingAttendee *ia);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_ATTENDEE_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c<br/>deleted file mode 100644<br/>index 6adfb9c1c9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-model.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1748 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* itip-model.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-without.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-popup.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-combo.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;e-book.h&gt;</div><div class='del'>-#include &lt;e-card-types.h&gt;</div><div class='del'>-#include &lt;e-card-cursor.h&gt;</div><div class='del'>-#include &lt;e-card.h&gt;</div><div class='del'>-#include &lt;e-card-simple.h&gt;</div><div class='del'>-#include &lt;e-destination.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-util.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "e-meeting-utils.h"</div><div class='del'>-#include "e-meeting-attendee.h"</div><div class='del'>-#include "e-meeting-model.h"</div><div class='del'>-</div><div class='del'>-#define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"</div><div class='del'>-</div><div class='del'>-struct _EMeetingModelPrivate </div><div class='del'>-{</div><div class='del'>-	GPtrArray *attendees;</div><div class='del'>-	ETableWithout *without;</div><div class='del'>-	</div><div class='del'>-	CalClient *client;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	</div><div class='del'>-	EBook *ebook;</div><div class='del'>-	gboolean book_loaded;</div><div class='del'>-	gboolean book_load_wait;</div><div class='del'>-</div><div class='del'>-	GPtrArray *refresh_queue;</div><div class='del'>-	GHashTable *refresh_data;</div><div class='del'>-	gint refresh_idle_id;</div><div class='del'>-</div><div class='del'>-	/* For invite others dialogs */</div><div class='del'>-        GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BUF_SIZE 1024</div><div class='del'>-</div><div class='del'>-static char *sections[] = {N_("Chair Persons"), </div><div class='del'>-			   N_("Required Participants"), </div><div class='del'>-			   N_("Optional Participants"), </div><div class='del'>-			   N_("Non-Participants"),</div><div class='del'>-			   NULL};</div><div class='del'>-static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,</div><div class='del'>-				     ICAL_ROLE_REQPARTICIPANT,</div><div class='del'>-				     ICAL_ROLE_OPTPARTICIPANT,</div><div class='del'>-				     ICAL_ROLE_NONPARTICIPANT,</div><div class='del'>-				     ICAL_ROLE_NONE};</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingModelQueueData EMeetingModelQueueData;</div><div class='del'>-struct _EMeetingModelQueueData {</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-</div><div class='del'>-	gboolean refreshing;</div><div class='del'>-	</div><div class='del'>-	EMeetingTime start;</div><div class='del'>-	EMeetingTime end;</div><div class='del'>-</div><div class='del'>-	char buffer[BUF_SIZE];</div><div class='del'>-	GString *string;</div><div class='del'>-	</div><div class='del'>-	GPtrArray *call_backs;</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void class_init	(EMeetingModelClass	 *klass);</div><div class='del'>-static void init	(EMeetingModel		 *model);</div><div class='del'>-static void destroy	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static void refresh_queue_add (EMeetingModel *im, int row,</div><div class='del'>-			       EMeetingTime *start,</div><div class='del'>-			       EMeetingTime *end,</div><div class='del'>-			       EMeetingModelRefreshCallback call_back,</div><div class='del'>-			       gpointer data);</div><div class='del'>-static void refresh_queue_remove (EMeetingModel *im,</div><div class='del'>-				  EMeetingAttendee *ia);</div><div class='del'>-static gboolean refresh_busy_periods (gpointer data);</div><div class='del'>-</div><div class='del'>-static void attendee_changed_cb (EMeetingAttendee *ia, gpointer data);</div><div class='del'>-static void select_names_ok_cb (BonoboListener    *listener,</div><div class='del'>-				char              *event_name,</div><div class='del'>-				CORBA_any         *arg,</div><div class='del'>-				CORBA_Environment *ev,</div><div class='del'>-				gpointer           data);</div><div class='del'>-</div><div class='del'>-static void table_destroy_cb (ETableScrolled *etable, gpointer data);</div><div class='del'>-</div><div class='del'>-static ETableModelClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_meeting_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (type == 0)</div><div class='del'>-	{</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EMeetingModel",</div><div class='del'>-			sizeof (EMeetingModel),</div><div class='del'>-			sizeof (EMeetingModelClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (e_table_model_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im = E_MEETING_MODEL (data);</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		priv-&gt;book_loaded = TRUE;</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Book not loaded");</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;book_load_wait) {</div><div class='del'>-		priv-&gt;book_load_wait = FALSE;</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-start_addressbook_server (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	gchar *uri, *path;</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;ebook = e_book_new ();</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	e_book_load_uri (priv-&gt;ebook, uri, book_open_cb, im);</div><div class='del'>-</div><div class='del'>-	g_free (uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMeetingAttendee *</div><div class='del'>-find_match (EMeetingModel *im, const char *address, int *pos)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	const gchar *ia_address;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Make sure we can add the new delegatee person */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++) {</div><div class='del'>-		ia = g_ptr_array_index (priv-&gt;attendees, i);</div><div class='del'>-</div><div class='del'>-		ia_address = e_meeting_attendee_get_address (ia);</div><div class='del'>-		if (ia_address != NULL &amp;&amp; !g_strcasecmp (itip_strip_mailto (ia_address), itip_strip_mailto (address))) {</div><div class='del'>-			if (pos != NULL)</div><div class='del'>-				*pos = i;</div><div class='del'>-			return ia;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalparameter_cutype</div><div class='del'>-text_to_type (const char *type)</div><div class='del'>-{</div><div class='del'>-	if (!g_strcasecmp (type, _("Individual")))</div><div class='del'>-		return ICAL_CUTYPE_INDIVIDUAL;</div><div class='del'>-	else if (!g_strcasecmp (type, _("Group")))</div><div class='del'>-		return ICAL_CUTYPE_GROUP;</div><div class='del'>-	else if (!g_strcasecmp (type, _("Resource")))</div><div class='del'>-		return ICAL_CUTYPE_RESOURCE;</div><div class='del'>-	else if (!g_strcasecmp (type, _("Room")))</div><div class='del'>-		return ICAL_CUTYPE_ROOM;</div><div class='del'>-	else</div><div class='del'>-		return ICAL_CUTYPE_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-type_to_text (icalparameter_cutype type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case ICAL_CUTYPE_INDIVIDUAL:</div><div class='del'>-		return _("Individual");</div><div class='del'>-	case ICAL_CUTYPE_GROUP:</div><div class='del'>-		return _("Group");</div><div class='del'>-	case ICAL_CUTYPE_RESOURCE:</div><div class='del'>-		return _("Resource");</div><div class='del'>-	case ICAL_CUTYPE_ROOM:</div><div class='del'>-		return _("Room");</div><div class='del'>-	default:</div><div class='del'>-		return _("Unknown");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalparameter_role</div><div class='del'>-text_to_role (const char *role)</div><div class='del'>-{</div><div class='del'>-	if (!g_strcasecmp (role, _("Chair")))</div><div class='del'>-		return ICAL_ROLE_CHAIR;</div><div class='del'>-	else if (!g_strcasecmp (role, _("Required Participant")))</div><div class='del'>-		return ICAL_ROLE_REQPARTICIPANT;</div><div class='del'>-	else if (!g_strcasecmp (role, _("Optional Participant")))</div><div class='del'>-		return ICAL_ROLE_OPTPARTICIPANT;</div><div class='del'>-	else if (!g_strcasecmp (role, _("Non-Participant")))</div><div class='del'>-		return ICAL_ROLE_NONPARTICIPANT;</div><div class='del'>-	else</div><div class='del'>-		return ICAL_ROLE_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-role_to_text (icalparameter_role role) </div><div class='del'>-{</div><div class='del'>-	switch (role) {</div><div class='del'>-	case ICAL_ROLE_CHAIR:</div><div class='del'>-		return _("Chair");</div><div class='del'>-	case ICAL_ROLE_REQPARTICIPANT:</div><div class='del'>-		return _("Required Participant");</div><div class='del'>-	case ICAL_ROLE_OPTPARTICIPANT:</div><div class='del'>-		return _("Optional Participant");</div><div class='del'>-	case ICAL_ROLE_NONPARTICIPANT:</div><div class='del'>-		return _("Non-Participant");</div><div class='del'>-	default:</div><div class='del'>-		return _("Unknown");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-text_to_boolean (const char *role)</div><div class='del'>-{</div><div class='del'>-	if (!g_strcasecmp (role, _("Yes")))</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-boolean_to_text (gboolean b) </div><div class='del'>-{</div><div class='del'>-	if (b)</div><div class='del'>-		return _("Yes");</div><div class='del'>-	else</div><div class='del'>-		return _("No");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalparameter_partstat</div><div class='del'>-text_to_partstat (const char *partstat)</div><div class='del'>-{</div><div class='del'>-	if (!g_strcasecmp (partstat, _("Needs Action")))</div><div class='del'>-		return ICAL_PARTSTAT_NEEDSACTION;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("Accepted")))</div><div class='del'>-		return ICAL_PARTSTAT_ACCEPTED;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("Declined")))</div><div class='del'>-		return ICAL_PARTSTAT_DECLINED;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("Tentative")))</div><div class='del'>-		return ICAL_PARTSTAT_TENTATIVE;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("Delegated")))</div><div class='del'>-		return ICAL_PARTSTAT_DELEGATED;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("Completed")))</div><div class='del'>-		return ICAL_PARTSTAT_COMPLETED;</div><div class='del'>-	else if (!g_strcasecmp (partstat, _("In Process")))</div><div class='del'>-		return ICAL_PARTSTAT_INPROCESS;</div><div class='del'>-	else</div><div class='del'>-		return ICAL_PARTSTAT_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-partstat_to_text (icalparameter_partstat partstat) </div><div class='del'>-{</div><div class='del'>-	switch (partstat) {</div><div class='del'>-	case ICAL_PARTSTAT_NEEDSACTION:</div><div class='del'>-		return _("Needs Action");</div><div class='del'>-	case ICAL_PARTSTAT_ACCEPTED:</div><div class='del'>-		return _("Accepted");</div><div class='del'>-	case ICAL_PARTSTAT_DECLINED:</div><div class='del'>-		return _("Declined");</div><div class='del'>-	case ICAL_PARTSTAT_TENTATIVE:</div><div class='del'>-		return _("Tentative");</div><div class='del'>-	case ICAL_PARTSTAT_DELEGATED:</div><div class='del'>-		return _("Delegated");</div><div class='del'>-	case ICAL_PARTSTAT_COMPLETED:</div><div class='del'>-		return _("Completed");</div><div class='del'>-	case ICAL_PARTSTAT_INPROCESS:</div><div class='del'>-		return _("In Process");</div><div class='del'>-	case ICAL_PARTSTAT_NONE:</div><div class='del'>-	default:</div><div class='del'>-		return _("Unknown");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-column_count (ETableModel *etm)</div><div class='del'>-{</div><div class='del'>-	return E_MEETING_MODEL_COLUMN_COUNT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-row_count (ETableModel *etm)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	im = E_MEETING_MODEL (etm);	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;attendees-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-append_row (ETableModel *etm, ETableModel *source, int row)</div><div class='del'>-{	</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	char *address;</div><div class='del'>-	</div><div class='del'>-	im = E_MEETING_MODEL (etm);	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	address = (char *) e_table_model_value_at (source, E_MEETING_MODEL_ADDRESS_COL, row);</div><div class='del'>-	if (find_match (im, address, NULL) != NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ia = E_MEETING_ATTENDEE (e_meeting_attendee_new ());</div><div class='del'>-	</div><div class='del'>-	e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", address));</div><div class='del'>-	e_meeting_attendee_set_member (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_MEMBER_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_cutype (ia, text_to_type (e_table_model_value_at (source, E_MEETING_MODEL_TYPE_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_role (ia, text_to_role (e_table_model_value_at (source, E_MEETING_MODEL_ROLE_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_rsvp (ia, text_to_boolean (e_table_model_value_at (source, E_MEETING_MODEL_RSVP_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_delto (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_DELTO_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_delfrom (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_DELFROM_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_status (ia, text_to_partstat (e_table_model_value_at (source, E_MEETING_MODEL_STATUS_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_cn (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_CN_COL, row)));</div><div class='del'>-	e_meeting_attendee_set_language (ia, g_strdup (e_table_model_value_at (source, E_MEETING_MODEL_LANGUAGE_COL, row)));</div><div class='del'>-</div><div class='del'>-	e_meeting_model_add_attendee (E_MEETING_MODEL (etm), ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-value_at (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-</div><div class='del'>-	im = E_MEETING_MODEL (etm);	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ia = g_ptr_array_index (priv-&gt;attendees, row);</div><div class='del'>-	</div><div class='del'>-	switch (col) {</div><div class='del'>-	case E_MEETING_MODEL_ADDRESS_COL:</div><div class='del'>-		return (void *)itip_strip_mailto (e_meeting_attendee_get_address (ia));</div><div class='del'>-	case E_MEETING_MODEL_MEMBER_COL:</div><div class='del'>-		return (void *)e_meeting_attendee_get_member (ia);</div><div class='del'>-	case E_MEETING_MODEL_TYPE_COL:</div><div class='del'>-		return type_to_text (e_meeting_attendee_get_cutype (ia));</div><div class='del'>-	case E_MEETING_MODEL_ROLE_COL:</div><div class='del'>-		return role_to_text (e_meeting_attendee_get_role (ia));</div><div class='del'>-	case E_MEETING_MODEL_RSVP_COL:</div><div class='del'>-		return boolean_to_text (e_meeting_attendee_get_rsvp (ia));</div><div class='del'>-	case E_MEETING_MODEL_DELTO_COL:</div><div class='del'>-		return (void *)itip_strip_mailto (e_meeting_attendee_get_delto (ia));</div><div class='del'>-	case E_MEETING_MODEL_DELFROM_COL:</div><div class='del'>-		return (void *)itip_strip_mailto (e_meeting_attendee_get_delfrom (ia));</div><div class='del'>-	case E_MEETING_MODEL_STATUS_COL:</div><div class='del'>-		return partstat_to_text (e_meeting_attendee_get_status (ia));</div><div class='del'>-	case E_MEETING_MODEL_CN_COL:</div><div class='del'>-		return (void *)e_meeting_attendee_get_cn (ia);</div><div class='del'>-	case E_MEETING_MODEL_LANGUAGE_COL:</div><div class='del'>-		return (void *)e_meeting_attendee_get_language (ia);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_value_at (ETableModel *etm, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-</div><div class='del'>-	im = E_MEETING_MODEL (etm);	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ia = g_ptr_array_index (priv-&gt;attendees, row);</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (etm);</div><div class='del'>-	</div><div class='del'>-	switch (col) {</div><div class='del'>-	case E_MEETING_MODEL_ADDRESS_COL:</div><div class='del'>-		e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", (char *) val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_MEMBER_COL:</div><div class='del'>-		e_meeting_attendee_set_member (ia, g_strdup (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_TYPE_COL:</div><div class='del'>-		e_meeting_attendee_set_cutype (ia, text_to_type (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_ROLE_COL:</div><div class='del'>-		e_meeting_attendee_set_role (ia, text_to_role (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_RSVP_COL:</div><div class='del'>-		e_meeting_attendee_set_rsvp (ia, text_to_boolean (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_DELTO_COL:</div><div class='del'>-		e_meeting_attendee_set_delto (ia, g_strdup (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_DELFROM_COL:</div><div class='del'>-		e_meeting_attendee_set_delfrom (ia, g_strdup (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_STATUS_COL:</div><div class='del'>-		e_meeting_attendee_set_status (ia, text_to_partstat (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_CN_COL:</div><div class='del'>-		e_meeting_attendee_set_cn (ia, g_strdup (val));</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_MODEL_LANGUAGE_COL:</div><div class='del'>-		e_meeting_attendee_set_language (ia, g_strdup (val));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_table_model_cell_changed (etm, col, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_cell_editable (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	switch (col) {</div><div class='del'>-	case E_MEETING_MODEL_DELTO_COL:</div><div class='del'>-	case E_MEETING_MODEL_DELFROM_COL:</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-duplicate_value (ETableModel *etm, int col, const void *val)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_value (ETableModel *etm, int col, void *val)</div><div class='del'>-{</div><div class='del'>-	g_free (val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-init_value (ETableModel *etm, int col)</div><div class='del'>-{</div><div class='del'>-	switch (col) {</div><div class='del'>-	case E_MEETING_MODEL_ADDRESS_COL:</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	case E_MEETING_MODEL_MEMBER_COL:</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	case E_MEETING_MODEL_TYPE_COL:</div><div class='del'>-		return g_strdup (_("Individual"));</div><div class='del'>-	case E_MEETING_MODEL_ROLE_COL:</div><div class='del'>-		return g_strdup (_("Required Participant"));</div><div class='del'>-	case E_MEETING_MODEL_RSVP_COL:</div><div class='del'>-		return g_strdup (_("Yes"));</div><div class='del'>-	case E_MEETING_MODEL_DELTO_COL:</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	case E_MEETING_MODEL_DELFROM_COL:</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	case E_MEETING_MODEL_STATUS_COL:</div><div class='del'>-		return g_strdup (_("Needs Action"));</div><div class='del'>-	case E_MEETING_MODEL_CN_COL:</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	case E_MEETING_MODEL_LANGUAGE_COL:</div><div class='del'>-		return g_strdup ("en");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return g_strdup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-value_is_empty (ETableModel *etm, int col, const void *val)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	switch (col) {</div><div class='del'>-	case E_MEETING_MODEL_ADDRESS_COL:</div><div class='del'>-	case E_MEETING_MODEL_MEMBER_COL:</div><div class='del'>-	case E_MEETING_MODEL_DELTO_COL:</div><div class='del'>-	case E_MEETING_MODEL_DELFROM_COL:</div><div class='del'>-	case E_MEETING_MODEL_CN_COL:</div><div class='del'>-		if (val &amp;&amp; !g_strcasecmp (val, ""))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-value_to_string (ETableModel *etm, int col, const void *val)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-get_key (ETableModel *source, int row, gpointer data) </div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	im = E_MEETING_MODEL (source);</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	str = value_at (source, E_MEETING_MODEL_DELTO_COL, row);</div><div class='del'>-	if (str &amp;&amp; *str)</div><div class='del'>-		return g_strdup ("delegator");</div><div class='del'>-</div><div class='del'>-	return g_strdup ("none");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-duplicate_key (const void *key, gpointer data) </div><div class='del'>-{</div><div class='del'>-	return g_strdup (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_gotten_key (void *key, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_duplicated_key (void *key, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMeetingModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETableModelClass *etm_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	etm_class = E_TABLE_MODEL_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	etm_class-&gt;column_count = column_count;</div><div class='del'>-	etm_class-&gt;row_count = row_count;</div><div class='del'>-	etm_class-&gt;value_at = value_at;</div><div class='del'>-	etm_class-&gt;set_value_at = set_value_at;</div><div class='del'>-	etm_class-&gt;is_cell_editable = is_cell_editable;</div><div class='del'>-	etm_class-&gt;append_row = append_row;</div><div class='del'>-	etm_class-&gt;duplicate_value = duplicate_value;</div><div class='del'>-	etm_class-&gt;free_value = free_value;</div><div class='del'>-	etm_class-&gt;initialize_value = init_value;</div><div class='del'>-	etm_class-&gt;value_is_empty = value_is_empty;</div><div class='del'>-	etm_class-&gt;value_to_string = value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EMeetingModelPrivate, 1);</div><div class='del'>-</div><div class='del'>-	im-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;attendees = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	priv-&gt;without = E_TABLE_WITHOUT (e_table_without_new (E_TABLE_MODEL (im),</div><div class='del'>-							      g_str_hash,</div><div class='del'>-							      g_str_equal,</div><div class='del'>-							      get_key,</div><div class='del'>-							      duplicate_key,</div><div class='del'>-							      free_gotten_key,</div><div class='del'>-							      free_duplicated_key,</div><div class='del'>-							      NULL));</div><div class='del'>-	e_table_without_hide (priv-&gt;without, g_strdup ("delegator"));</div><div class='del'>-	</div><div class='del'>-	priv-&gt;client = NULL;</div><div class='del'>-	priv-&gt;zone = icaltimezone_get_builtin_timezone (calendar_config_get_timezone ());</div><div class='del'>-	</div><div class='del'>-	priv-&gt;ebook = NULL;</div><div class='del'>-	priv-&gt;book_loaded = FALSE;</div><div class='del'>-	priv-&gt;book_load_wait = FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;refresh_queue = g_ptr_array_new ();</div><div class='del'>-	priv-&gt;refresh_data = g_hash_table_new (g_direct_hash, g_direct_equal);</div><div class='del'>-	priv-&gt;refresh_idle_id = -1;</div><div class='del'>-	</div><div class='del'>-	start_addressbook_server (im);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im = E_MEETING_MODEL (obj);</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (g_ptr_array_index (priv-&gt;attendees, i)));</div><div class='del'>-	g_ptr_array_free (priv-&gt;attendees, TRUE); </div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ebook != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;ebook));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (priv-&gt;corba_select_names, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	while (priv-&gt;refresh_queue-&gt;len &gt; 0)</div><div class='del'>- 		refresh_queue_remove (im, g_ptr_array_index (priv-&gt;refresh_queue, 0));</div><div class='del'>- 	g_ptr_array_free (priv-&gt;refresh_queue, TRUE);</div><div class='del'>- 	g_hash_table_destroy (priv-&gt;refresh_data);</div><div class='del'>- 	</div><div class='del'>- 	if (priv-&gt;refresh_idle_id)</div><div class='del'>- 		g_source_remove (priv-&gt;refresh_idle_id);</div><div class='del'>- 		</div><div class='del'>-	g_free (priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkObject *</div><div class='del'>-e_meeting_model_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (E_TYPE_MEETING_MODEL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CalClient *</div><div class='del'>-e_meeting_model_get_cal_client (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_set_cal_client (EMeetingModel *im, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-	</div><div class='del'>-	if (client != NULL)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-icaltimezone *</div><div class='del'>-e_meeting_model_get_zone (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (im != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_set_zone (EMeetingModel *im, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (im != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MEETING_MODEL (im));</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;zone = zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ETableScrolled *</div><div class='del'>-build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_file)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *etable;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	ETableExtras *extras;</div><div class='del'>-	GList *strings;</div><div class='del'>-	ECell *popup_cell, *cell;</div><div class='del'>-	</div><div class='del'>-	extras = e_table_extras_new ();</div><div class='del'>-</div><div class='del'>-	/* For type */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-	</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Individual"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Group"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Resource"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Room"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Unknown"));</div><div class='del'>-</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);</div><div class='del'>-	e_table_extras_add_cell (extras, "typeedit", popup_cell);</div><div class='del'>-	</div><div class='del'>-	/* For role */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-	</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Chair"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Required Participant"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Optional Participant"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Non-Participant"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Unknown"));</div><div class='del'>-</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);</div><div class='del'>-	e_table_extras_add_cell (extras, "roleedit", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* For rsvp */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Yes"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("No"));</div><div class='del'>-</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);</div><div class='del'>-	e_table_extras_add_cell (extras, "rsvpedit", popup_cell);</div><div class='del'>-</div><div class='del'>-	/* For status */</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	popup_cell = e_cell_combo_new ();</div><div class='del'>-	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cell));</div><div class='del'>-</div><div class='del'>-	strings = NULL;</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Needs Action"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Accepted"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Declined"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Tentative"));</div><div class='del'>-	strings = g_list_append (strings, (char*) U_("Delegated"));</div><div class='del'>-</div><div class='del'>-	e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings);</div><div class='del'>-	e_table_extras_add_cell (extras, "statusedit", popup_cell);</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_new_from_spec_file (model, extras, spec_file, NULL);</div><div class='del'>-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (etable));</div><div class='del'>-	gtk_object_set (GTK_OBJECT (real_table), "uniform_row_height", TRUE, NULL);</div><div class='del'>-	e_table_load_state (real_table, state_file);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (real_table),</div><div class='del'>-			    "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (etable), "destroy", </div><div class='del'>-			    GTK_SIGNAL_FUNC (table_destroy_cb), g_strdup (state_file));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (extras));</div><div class='del'>-	</div><div class='del'>-	return E_TABLE_SCROLLED (etable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_add_attendee (EMeetingModel *im, EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (im));</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ia));</div><div class='del'>-	g_ptr_array_add (priv-&gt;attendees, ia);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ia), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (attendee_changed_cb), im);</div><div class='del'>-</div><div class='del'>-	e_table_model_row_inserted (E_TABLE_MODEL (im), row_count (E_TABLE_MODEL (im)) - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingAttendee *</div><div class='del'>-e_meeting_model_add_attendee_with_defaults (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	ia = E_MEETING_ATTENDEE (e_meeting_attendee_new ());</div><div class='del'>-</div><div class='del'>-	e_meeting_attendee_set_address (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_ADDRESS_COL));</div><div class='del'>-	e_meeting_attendee_set_member (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_MEMBER_COL));</div><div class='del'>-</div><div class='del'>-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_TYPE_COL);</div><div class='del'>-	e_meeting_attendee_set_cutype (ia, text_to_type (str));</div><div class='del'>-	g_free (str);</div><div class='del'>-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_ROLE_COL);</div><div class='del'>-	e_meeting_attendee_set_role (ia, text_to_role (str));</div><div class='del'>-	g_free (str);	</div><div class='del'>-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_RSVP_COL);</div><div class='del'>-	e_meeting_attendee_set_role (ia, text_to_boolean (str));</div><div class='del'>-	g_free (str);</div><div class='del'>-	</div><div class='del'>-	e_meeting_attendee_set_delto (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_DELTO_COL));</div><div class='del'>-	e_meeting_attendee_set_delfrom (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_DELFROM_COL));</div><div class='del'>-</div><div class='del'>-	str = init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_STATUS_COL);</div><div class='del'>-	e_meeting_attendee_set_status (ia, text_to_partstat (str));</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	e_meeting_attendee_set_cn (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_CN_COL));</div><div class='del'>-	e_meeting_attendee_set_language (ia, init_value (E_TABLE_MODEL (im), E_MEETING_MODEL_LANGUAGE_COL));</div><div class='del'>-</div><div class='del'>-	e_meeting_model_add_attendee (im, ia);</div><div class='del'>-</div><div class='del'>-	return ia;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_remove_attendee (EMeetingModel *im, EMeetingAttendee *ia)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	gint i, row = -1;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++) {</div><div class='del'>-		if (ia == g_ptr_array_index (priv-&gt;attendees, i)) {</div><div class='del'>-			row = i;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (row != -1) {</div><div class='del'>-		e_table_model_pre_change (E_TABLE_MODEL (im));</div><div class='del'>-</div><div class='del'>-		g_ptr_array_remove_index (priv-&gt;attendees, row);		</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ia));</div><div class='del'>-</div><div class='del'>-		e_table_model_row_deleted (E_TABLE_MODEL (im), row);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_remove_all_attendees (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	gint i, len;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (im));</div><div class='del'>-</div><div class='del'>-	len = priv-&gt;attendees-&gt;len;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		EMeetingAttendee *ia = g_ptr_array_index (priv-&gt;attendees, i);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ia));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_set_size (priv-&gt;attendees, 0);</div><div class='del'>-	e_table_model_rows_deleted (E_TABLE_MODEL (im), 0, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingAttendee *</div><div class='del'>-e_meeting_model_find_attendee (EMeetingModel *im, const gchar *address, gint *row)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++) {</div><div class='del'>-		const gchar *ia_address;</div><div class='del'>-		</div><div class='del'>-		ia = g_ptr_array_index (priv-&gt;attendees, i);</div><div class='del'>-			</div><div class='del'>-		ia_address = e_meeting_attendee_get_address (ia);</div><div class='del'>-		if (ia_address &amp;&amp; !g_strcasecmp (itip_strip_mailto (ia_address), itip_strip_mailto (address))) {</div><div class='del'>-			if (row != NULL)</div><div class='del'>-				*row = i;</div><div class='del'>-</div><div class='del'>-			return ia;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingAttendee *</div><div class='del'>-e_meeting_model_find_attendee_at_row (EMeetingModel *im, gint row)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (im != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);</div><div class='del'>-	g_return_val_if_fail (row &gt;= 0, NULL);</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (row &lt; priv-&gt;attendees-&gt;len, NULL);</div><div class='del'>-</div><div class='del'>-	return g_ptr_array_index (priv-&gt;attendees, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-e_meeting_model_count_actual_attendees (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return e_table_model_row_count (E_TABLE_MODEL (priv-&gt;without));	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const GPtrArray *</div><div class='del'>-e_meeting_model_get_attendees (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;attendees;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icaltimezone *</div><div class='del'>-find_zone (icalproperty *ip, icalcomponent *tz_top_level)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalcomponent *sub_comp;</div><div class='del'>-	const char *tzid;</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-</div><div class='del'>-	if (tz_top_level == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	param = icalproperty_get_first_parameter (ip, ICAL_TZID_PARAMETER);</div><div class='del'>-	if (param == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	tzid = icalparameter_get_tzid (param);</div><div class='del'>-</div><div class='del'>-	iter = icalcomponent_begin_component (tz_top_level, ICAL_VTIMEZONE_COMPONENT);</div><div class='del'>-	while ((sub_comp = icalcompiter_deref (&amp;iter)) != NULL) {</div><div class='del'>-		icalcomponent *clone;</div><div class='del'>-		const char *tz_tzid;</div><div class='del'>-		</div><div class='del'>-		tz_tzid = icalproperty_get_tzid (sub_comp);</div><div class='del'>-		if (!strcmp (tzid, tz_tzid)) {</div><div class='del'>-			icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-			zone = icaltimezone_new ();</div><div class='del'>-			clone = icalcomponent_new_clone (sub_comp);</div><div class='del'>-			icaltimezone_set_component (zone, clone);</div><div class='del'>-			</div><div class='del'>-			return zone;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		icalcompiter_next (&amp;iter);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_queue_add (EMeetingModel *im, int row,</div><div class='del'>-		   EMeetingTime *start,</div><div class='del'>-		   EMeetingTime *end,</div><div class='del'>-		   EMeetingModelRefreshCallback call_back,</div><div class='del'>-		   gpointer data) </div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	EMeetingModelQueueData *qdata;</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	ia = g_ptr_array_index (priv-&gt;attendees, row);</div><div class='del'>-	if (ia == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	qdata = g_hash_table_lookup (priv-&gt;refresh_data, ia);</div><div class='del'>-	if (qdata == NULL) {</div><div class='del'>-		qdata = g_new0 (EMeetingModelQueueData, 1);</div><div class='del'>-</div><div class='del'>-		qdata-&gt;im = im;</div><div class='del'>-		qdata-&gt;ia = ia;</div><div class='del'>-		e_meeting_attendee_clear_busy_periods (ia);</div><div class='del'>-		e_meeting_attendee_set_has_calendar_info (ia, FALSE);</div><div class='del'>-</div><div class='del'>-	        qdata-&gt;start = *start;</div><div class='del'>-	        qdata-&gt;end = *end;</div><div class='del'>-		qdata-&gt;string = g_string_new (NULL);</div><div class='del'>-		qdata-&gt;call_backs = g_ptr_array_new ();</div><div class='del'>-		qdata-&gt;data = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_add (qdata-&gt;call_backs, call_back);</div><div class='del'>-		g_ptr_array_add (qdata-&gt;data, data);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (priv-&gt;refresh_data, ia, qdata);</div><div class='del'>-	} else {</div><div class='del'>-		if (e_meeting_time_compare_times (start, &amp;qdata-&gt;start) == -1)</div><div class='del'>-			qdata-&gt;start = *start;</div><div class='del'>-		if (e_meeting_time_compare_times (end, &amp;qdata-&gt;end) == 1)</div><div class='del'>-			qdata-&gt;end = *end;</div><div class='del'>-		g_ptr_array_add (qdata-&gt;call_backs, call_back);</div><div class='del'>-		g_ptr_array_add (qdata-&gt;data, data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ia));</div><div class='del'>-	g_ptr_array_add (priv-&gt;refresh_queue, ia);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;refresh_idle_id == -1)</div><div class='del'>-		priv-&gt;refresh_idle_id = g_idle_add (refresh_busy_periods, im);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_queue_remove (EMeetingModel *im, EMeetingAttendee *ia) </div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingModelQueueData *qdata;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* Free the queue data */</div><div class='del'>-	qdata = g_hash_table_lookup (priv-&gt;refresh_data, ia);</div><div class='del'>-	g_assert (qdata != NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;refresh_data, ia);</div><div class='del'>-	g_ptr_array_free (qdata-&gt;call_backs, TRUE);</div><div class='del'>-	g_ptr_array_free (qdata-&gt;data, TRUE);</div><div class='del'>-	g_free (qdata);</div><div class='del'>-</div><div class='del'>-	/* Unref the attendee */</div><div class='del'>-	g_ptr_array_remove (priv-&gt;refresh_queue, ia);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ia));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_callbacks (EMeetingModelQueueData *qdata) </div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; qdata-&gt;call_backs-&gt;len; i++) {</div><div class='del'>-		EMeetingModelRefreshCallback call_back;</div><div class='del'>-		gpointer *data;</div><div class='del'>-</div><div class='del'>-		call_back = g_ptr_array_index (qdata-&gt;call_backs, i);</div><div class='del'>-		data = g_ptr_array_index (qdata-&gt;data, i);</div><div class='del'>-</div><div class='del'>-		call_back (data);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	refresh_queue_remove (qdata-&gt;im, qdata-&gt;ia);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_free_busy_comp (EMeetingAttendee *ia,</div><div class='del'>-			icalcomponent *fb_comp,</div><div class='del'>-			icaltimezone *zone,</div><div class='del'>-			icalcomponent *tz_top_level)</div><div class='del'>-{</div><div class='del'>-	icalproperty *ip;</div><div class='del'>-	</div><div class='del'>-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTSTART_PROPERTY);</div><div class='del'>-	if (ip != NULL) {</div><div class='del'>-		struct icaltimetype dtstart;</div><div class='del'>-		icaltimezone *ds_zone;</div><div class='del'>-		</div><div class='del'>-		dtstart = icalproperty_get_dtstart (ip);</div><div class='del'>-		if (!dtstart.is_utc)</div><div class='del'>-			ds_zone = find_zone (ip, tz_top_level);</div><div class='del'>-		else</div><div class='del'>-			ds_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		icaltimezone_convert_time (&amp;dtstart, ds_zone, zone);</div><div class='del'>-		e_meeting_attendee_set_start_busy_range (ia,</div><div class='del'>-							 dtstart.year,</div><div class='del'>-							 dtstart.month,</div><div class='del'>-							 dtstart.day,</div><div class='del'>-							 dtstart.hour,</div><div class='del'>-							 dtstart.minute);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ip = icalcomponent_get_first_property (fb_comp, ICAL_DTEND_PROPERTY);</div><div class='del'>-	if (ip != NULL) {</div><div class='del'>-		struct icaltimetype dtend;</div><div class='del'>-		icaltimezone *de_zone;</div><div class='del'>-		</div><div class='del'>-		dtend = icalproperty_get_dtend (ip);</div><div class='del'>-		if (!dtend.is_utc)</div><div class='del'>-			de_zone = find_zone (ip, tz_top_level);</div><div class='del'>-		else</div><div class='del'>-			de_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		icaltimezone_convert_time (&amp;dtend, de_zone, zone);</div><div class='del'>-		e_meeting_attendee_set_end_busy_range (ia,</div><div class='del'>-						       dtend.year,</div><div class='del'>-						       dtend.month,</div><div class='del'>-						       dtend.day,</div><div class='del'>-						       dtend.hour,</div><div class='del'>-						       dtend.minute);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ip = icalcomponent_get_first_property (fb_comp, ICAL_FREEBUSY_PROPERTY);</div><div class='del'>-	while (ip != NULL) {</div><div class='del'>-		icalparameter *param;</div><div class='del'>-		struct icalperiodtype fb;</div><div class='del'>-		EMeetingFreeBusyType busy_type = E_MEETING_FREE_BUSY_LAST;</div><div class='del'>-		icalparameter_fbtype fbtype = ICAL_FBTYPE_BUSY;</div><div class='del'>-			</div><div class='del'>-		fb = icalproperty_get_freebusy (ip);</div><div class='del'>-		param = icalproperty_get_first_parameter (ip, ICAL_FBTYPE_PARAMETER);</div><div class='del'>-		if (param != NULL)</div><div class='del'>-			fbtype =  icalparameter_get_fbtype (param);</div><div class='del'>-			</div><div class='del'>-		switch (fbtype) {</div><div class='del'>-		case ICAL_FBTYPE_BUSY:</div><div class='del'>-			busy_type = E_MEETING_FREE_BUSY_BUSY;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICAL_FBTYPE_BUSYUNAVAILABLE:</div><div class='del'>-			busy_type = E_MEETING_FREE_BUSY_OUT_OF_OFFICE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICAL_FBTYPE_BUSYTENTATIVE:</div><div class='del'>-			busy_type = E_MEETING_FREE_BUSY_TENTATIVE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		if (busy_type != E_MEETING_FREE_BUSY_LAST) {</div><div class='del'>-			icaltimezone *utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-			icaltimezone_convert_time (&amp;fb.start, utc_zone, zone);</div><div class='del'>-			icaltimezone_convert_time (&amp;fb.end, utc_zone, zone);</div><div class='del'>-			e_meeting_attendee_add_busy_period (ia,</div><div class='del'>-							    fb.start.year,</div><div class='del'>-							    fb.start.month,</div><div class='del'>-							    fb.start.day,</div><div class='del'>-							    fb.start.hour,</div><div class='del'>-							    fb.start.minute,</div><div class='del'>-							    fb.end.year,</div><div class='del'>-							    fb.end.month,</div><div class='del'>-							    fb.end.day,</div><div class='del'>-							    fb.end.hour,</div><div class='del'>-							    fb.end.minute,</div><div class='del'>-							    busy_type);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		ip = icalcomponent_get_next_property (fb_comp, ICAL_FREEBUSY_PROPERTY);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_free_busy (EMeetingModelQueueData *qdata, char *text)</div><div class='del'>-{</div><div class='del'>- 	EMeetingModel *im = qdata-&gt;im;</div><div class='del'>- 	EMeetingModelPrivate *priv;</div><div class='del'>- 	EMeetingAttendee *ia = qdata-&gt;ia;</div><div class='del'>-	icalcomponent *main_comp;</div><div class='del'>-	icalcomponent_kind kind = ICAL_NO_COMPONENT;</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	main_comp = icalparser_parse_string (text);</div><div class='del'>- 	if (main_comp == NULL) {</div><div class='del'>- 		process_callbacks (qdata);</div><div class='del'>-  		return;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (main_comp);</div><div class='del'>-	if (kind == ICAL_VCALENDAR_COMPONENT) {	</div><div class='del'>-		icalcompiter iter;</div><div class='del'>-		icalcomponent *tz_top_level, *sub_comp;</div><div class='del'>-</div><div class='del'>-		tz_top_level = cal_util_new_top_level ();</div><div class='del'>-		</div><div class='del'>-		iter = icalcomponent_begin_component (main_comp, ICAL_VTIMEZONE_COMPONENT);</div><div class='del'>-		while ((sub_comp = icalcompiter_deref (&amp;iter)) != NULL) {</div><div class='del'>-			icalcomponent *clone;</div><div class='del'>-			</div><div class='del'>-			clone = icalcomponent_new_clone (sub_comp);</div><div class='del'>-			icalcomponent_add_component (tz_top_level, clone);</div><div class='del'>-			</div><div class='del'>-			icalcompiter_next (&amp;iter);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iter = icalcomponent_begin_component (main_comp, ICAL_VFREEBUSY_COMPONENT);</div><div class='del'>-		while ((sub_comp = icalcompiter_deref (&amp;iter)) != NULL) {</div><div class='del'>-			process_free_busy_comp (ia, sub_comp, priv-&gt;zone, tz_top_level);</div><div class='del'>-</div><div class='del'>-			icalcompiter_next (&amp;iter);</div><div class='del'>-		}</div><div class='del'>-		icalcomponent_free (tz_top_level);</div><div class='del'>-	} else if (kind == ICAL_VFREEBUSY_COMPONENT) {</div><div class='del'>-		process_free_busy_comp (ia, main_comp, priv-&gt;zone, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	icalcomponent_free (main_comp);</div><div class='del'>-</div><div class='del'>-	process_callbacks (qdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-async_close (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	     GnomeVFSResult result,</div><div class='del'>-	     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelQueueData *qdata = data;</div><div class='del'>-</div><div class='del'>-	process_free_busy (qdata, qdata-&gt;string-&gt;str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-async_read (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	    GnomeVFSResult result,</div><div class='del'>-	    gpointer buffer,</div><div class='del'>-	    GnomeVFSFileSize requested,</div><div class='del'>-	    GnomeVFSFileSize read,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelQueueData *qdata = data;</div><div class='del'>-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;</div><div class='del'>-</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_async_close (handle, async_close, qdata);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	((char *)buffer)[read] = '\0';</div><div class='del'>-	qdata-&gt;string = g_string_append (qdata-&gt;string, buffer);</div><div class='del'>-	</div><div class='del'>-	if (read &lt; requested) {</div><div class='del'>-		gnome_vfs_async_close (handle, async_close, qdata);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_async_read (handle, qdata-&gt;buffer, buf_size, async_read, qdata);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-async_open (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	    GnomeVFSResult result,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelQueueData *qdata = data;</div><div class='del'>-	GnomeVFSFileSize buf_size = BUF_SIZE - 1;</div><div class='del'>-</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gnome_vfs_async_close (handle, async_close, qdata);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_async_read (handle, qdata-&gt;buffer, buf_size, async_read, qdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelQueueData *qdata = data;</div><div class='del'>-	int length, i;</div><div class='del'>-</div><div class='del'>-	if (status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	length = e_card_cursor_get_length (cursor);</div><div class='del'>-	for (i = 0; i &lt; length; i ++) {</div><div class='del'>-		GnomeVFSAsyncHandle *handle;</div><div class='del'>-		ECard *card = e_card_cursor_get_nth (cursor, i);</div><div class='del'>-		const char *addr;</div><div class='del'>-		</div><div class='del'>-		if (card-&gt;fburl == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		addr = itip_strip_mailto (e_meeting_attendee_get_address (qdata-&gt;ia));</div><div class='del'>-		if (!e_card_email_match_string (card, addr))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Read in free/busy data from the url */</div><div class='del'>-		gnome_vfs_async_open (&amp;handle, card-&gt;fburl, GNOME_VFS_OPEN_READ, async_open, qdata);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	process_callbacks (qdata);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-refresh_busy_periods (gpointer data)</div><div class='del'>-{	</div><div class='del'>-	EMeetingModel *im = E_MEETING_MODEL (data);</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	EMeetingAttendee *ia = NULL;</div><div class='del'>-	EMeetingModelQueueData *qdata = NULL;</div><div class='del'>-	char *query;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Check to see if there are any remaining attendees in the queue */</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;refresh_queue-&gt;len; i++) {</div><div class='del'>-		ia = g_ptr_array_index (priv-&gt;refresh_queue, i);</div><div class='del'>-		g_assert (ia != NULL);</div><div class='del'>-</div><div class='del'>-		qdata = g_hash_table_lookup (priv-&gt;refresh_data, ia);</div><div class='del'>-		g_assert (qdata != NULL);</div><div class='del'>-</div><div class='del'>-		if (!qdata-&gt;refreshing)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The everything in the queue is being refreshed */</div><div class='del'>-	if (i &gt;= priv-&gt;refresh_queue-&gt;len) {</div><div class='del'>-		priv-&gt;refresh_idle_id = -1;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Indicate we are trying to refresh it */</div><div class='del'>-	qdata-&gt;refreshing = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Check the server for free busy data */	</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		GList *fb_data, *users = NULL;</div><div class='del'>-		struct icaltimetype itt;</div><div class='del'>-		time_t startt, endt;</div><div class='del'>-		const char *user;</div><div class='del'>-		</div><div class='del'>-		itt = icaltime_null_time ();</div><div class='del'>-		itt.year = g_date_year (&amp;qdata-&gt;start.date);</div><div class='del'>-		itt.month = g_date_month (&amp;qdata-&gt;start.date);</div><div class='del'>-		itt.day = g_date_day (&amp;qdata-&gt;start.date);</div><div class='del'>-		itt.hour = qdata-&gt;start.hour;</div><div class='del'>-		itt.minute = qdata-&gt;start.minute;</div><div class='del'>-		startt = icaltime_as_timet_with_zone (itt, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		itt = icaltime_null_time ();</div><div class='del'>-		itt.year = g_date_year (&amp;qdata-&gt;end.date);</div><div class='del'>-		itt.month = g_date_month (&amp;qdata-&gt;end.date);</div><div class='del'>-		itt.day = g_date_day (&amp;qdata-&gt;end.date);</div><div class='del'>-		itt.hour = qdata-&gt;end.hour;</div><div class='del'>-		itt.minute = qdata-&gt;end.minute;</div><div class='del'>-		endt = icaltime_as_timet_with_zone (itt, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		user = itip_strip_mailto (e_meeting_attendee_get_address (ia));</div><div class='del'>-		users = g_list_append (users, g_strdup (user));</div><div class='del'>-		fb_data = cal_client_get_free_busy (priv-&gt;client, users, startt, endt);</div><div class='del'>-</div><div class='del'>-		g_list_foreach (users, (GFunc)g_free, NULL);</div><div class='del'>-		g_list_free (users);</div><div class='del'>-</div><div class='del'>-		if (fb_data != NULL) {</div><div class='del'>-			CalComponent *comp = fb_data-&gt;data;</div><div class='del'>-			char *comp_str;</div><div class='del'>-				</div><div class='del'>-			comp_str = cal_component_get_as_string (comp);</div><div class='del'>-			process_free_busy (qdata, comp_str);</div><div class='del'>-			g_free (comp_str);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look for fburl's of attendee with no free busy info on server */</div><div class='del'>-	if (!priv-&gt;book_loaded) {</div><div class='del'>-		priv-&gt;book_load_wait = TRUE;</div><div class='del'>-		gtk_main ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!e_meeting_attendee_is_set_address (ia)) {</div><div class='del'>-		process_callbacks (qdata);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	query = g_strdup_printf ("(contains \"email\" \"%s\")", </div><div class='del'>-				 itip_strip_mailto (e_meeting_attendee_get_address (ia)));</div><div class='del'>-	e_book_get_cursor (priv-&gt;ebook, query, cursor_cb, qdata);</div><div class='del'>-	g_free (query);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-void</div><div class='del'>-e_meeting_model_refresh_all_busy_periods (EMeetingModel *im,</div><div class='del'>-					  EMeetingTime *start,</div><div class='del'>-					  EMeetingTime *end,</div><div class='del'>-					  EMeetingModelRefreshCallback call_back,</div><div class='del'>-					  gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (im != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MEETING_MODEL (im));</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++)</div><div class='del'>-		refresh_queue_add (im, i, start, end, call_back, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_meeting_model_refresh_busy_periods (EMeetingModel *im,</div><div class='del'>-				      int row,</div><div class='del'>-				      EMeetingTime *start,</div><div class='del'>-				      EMeetingTime *end,</div><div class='del'>-				      EMeetingModelRefreshCallback call_back,</div><div class='del'>-				      gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (im != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MEETING_MODEL (im));</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	refresh_queue_add (im, row, start, end, call_back, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableScrolled *</div><div class='del'>-e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, const gchar *state_file)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (im != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), NULL);</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return build_etable (E_TABLE_MODEL (priv-&gt;without), spec_file, state_file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_meeting_model_etable_model_to_view_row (ETable *et, EMeetingModel *im, int model_row)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	int row;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (im != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1);</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	row = e_table_model_to_view_row (et, model_row);</div><div class='del'>-	if (row == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return e_table_subset_model_to_view_row (E_TABLE_SUBSET (priv-&gt;without), row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_meeting_model_etable_view_to_model_row (ETable *et, EMeetingModel *im, int view_row)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	int row;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (im != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1);</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	row = e_table_view_to_model_row (et, view_row);</div><div class='del'>-	if (row == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return e_table_subset_view_to_model_row (E_TABLE_SUBSET (priv-&gt;without), row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_section (GNOME_Evolution_Addressbook_SelectNames corba_select_names, const char *name)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_addSection (corba_select_names,</div><div class='del'>-							    name, </div><div class='del'>-							    gettext (name),</div><div class='del'>-							    &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_select_name_dialog (EMeetingModel *im) </div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Control corba_control;</div><div class='del'>-		GtkWidget *control_widget;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		for (i = 0; sections[i] != NULL; i++) {			</div><div class='del'>-			corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection </div><div class='del'>-				(priv-&gt;corba_select_names, sections[i], &amp;ev);</div><div class='del'>-			if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-				CORBA_exception_free (&amp;ev);</div><div class='del'>-				return FALSE;				</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-			</div><div class='del'>-			bonobo_widget_set_property (BONOBO_WIDGET (control_widget), "text", "", NULL);		</div><div class='del'>-		}</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	for (i = 0; sections[i] != NULL; i++)</div><div class='del'>-		add_section (priv-&gt;corba_select_names, sections[i]);</div><div class='del'>-</div><div class='del'>-	bonobo_event_source_client_add_listener (priv-&gt;corba_select_names,</div><div class='del'>-						 select_names_ok_cb,</div><div class='del'>-						 "GNOME/Evolution:ok:dialog",</div><div class='del'>-						 NULL, im);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_model_invite_others_dialog (EMeetingModel *im)</div><div class='del'>-{</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!get_select_name_dialog (im))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (</div><div class='del'>-		priv-&gt;corba_select_names, _("Required Participants"), &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_section (EMeetingModel *im, EDestination **destv, icalparameter_role role)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; destv[i] != NULL; i++) {</div><div class='del'>-		EMeetingAttendee *ia;</div><div class='del'>-		const char *name, *address;</div><div class='del'>-		</div><div class='del'>-		name = e_destination_get_name (destv[i]);		</div><div class='del'>-		address = e_destination_get_email (destv[i]);</div><div class='del'>-		</div><div class='del'>-		if (address == NULL || *address == '\0')</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (e_meeting_model_find_attendee (im, address, NULL) == NULL) {</div><div class='del'>-			ia = e_meeting_model_add_attendee_with_defaults (im);</div><div class='del'>-</div><div class='del'>-			e_meeting_attendee_set_address (ia, g_strdup_printf ("MAILTO:%s", address));</div><div class='del'>-			e_meeting_attendee_set_role (ia, role);</div><div class='del'>-			e_meeting_attendee_set_cn (ia, g_strdup (name));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_names_ok_cb (BonoboListener    *listener,</div><div class='del'>-		    char              *event_name,</div><div class='del'>-		    CORBA_any         *arg,</div><div class='del'>-		    CORBA_Environment *ev,</div><div class='del'>-		    gpointer           data)</div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im = data;</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	Bonobo_Control corba_control;</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	char *string = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; sections[i] != NULL; i++) {</div><div class='del'>-		corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection </div><div class='del'>-			(priv-&gt;corba_select_names, sections[i], ev);</div><div class='del'>-		control_widget = bonobo_widget_new_control_from_objref</div><div class='del'>-			(corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-		</div><div class='del'>-		bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations", &amp;string, NULL);</div><div class='del'>-		destv = e_destination_importv (string);</div><div class='del'>-		if (destv != NULL) {</div><div class='del'>-			process_section (im, destv, roles[i]);</div><div class='del'>-			e_destination_freev (destv);</div><div class='del'>-		}		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attendee_changed_cb (EMeetingAttendee *ia, gpointer data) </div><div class='del'>-{</div><div class='del'>-	EMeetingModel *im = E_MEETING_MODEL (data);</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-	gint row = -1, i;</div><div class='del'>-	</div><div class='del'>-	priv = im-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;attendees-&gt;len; i++) {</div><div class='del'>-		if (ia == g_ptr_array_index (priv-&gt;attendees, i)) {</div><div class='del'>-			row = 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (row == -1)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Ideally I think you are supposed to call pre_change() before</div><div class='del'>-	   the data structures are changed. */</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (im));</div><div class='del'>-	e_table_model_row_changed (E_TABLE_MODEL (im), row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_destroy_cb (ETableScrolled *etable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	char *filename = data;</div><div class='del'>-	</div><div class='del'>-	real_table = e_table_scrolled_get_table (etable);</div><div class='del'>-	e_table_save_state (real_table, filename);</div><div class='del'>-</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-meeting-model.h b/calendar/gui/e-meeting-model.h<br/>deleted file mode 100644<br/>index 7e1aa0758b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-model.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-model.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MODEL_H_</div><div class='del'>-#define _E_MODEL_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "e-meeting-attendee.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MEETING_MODEL			(e_meeting_model_get_type ())</div><div class='del'>-#define E_MEETING_MODEL(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MEETING_MODEL, EMeetingModel))</div><div class='del'>-#define E_MEETING_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MEETING_MODEL, EMeetingModelClass))</div><div class='del'>-#define E_IS_MEETING_MODEL(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_MEETING_MODEL))</div><div class='del'>-#define E_IS_MEETING_MODEL_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_MODEL))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingModel        EMeetingModel;</div><div class='del'>-typedef struct _EMeetingModelPrivate EMeetingModelPrivate;</div><div class='del'>-typedef struct _EMeetingModelClass   EMeetingModelClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_MEETING_MODEL_ADDRESS_COL,</div><div class='del'>-	E_MEETING_MODEL_MEMBER_COL,</div><div class='del'>-	E_MEETING_MODEL_TYPE_COL,</div><div class='del'>-	E_MEETING_MODEL_ROLE_COL,</div><div class='del'>-	E_MEETING_MODEL_RSVP_COL,</div><div class='del'>-	E_MEETING_MODEL_DELTO_COL,</div><div class='del'>-	E_MEETING_MODEL_DELFROM_COL,</div><div class='del'>-	E_MEETING_MODEL_STATUS_COL,</div><div class='del'>-	E_MEETING_MODEL_CN_COL,</div><div class='del'>-	E_MEETING_MODEL_LANGUAGE_COL,</div><div class='del'>-	E_MEETING_MODEL_COLUMN_COUNT</div><div class='del'>-} EMeetingModelColumns;</div><div class='del'>-</div><div class='del'>-struct _EMeetingModel {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	EMeetingModelPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMeetingModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void	(* EMeetingModelRefreshCallback) (gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_meeting_model_get_type (void);</div><div class='del'>-GtkObject *e_meeting_model_new      (void);</div><div class='del'>-</div><div class='del'>-CalClient *e_meeting_model_get_cal_client (EMeetingModel *im);</div><div class='del'>-void e_meeting_model_set_cal_client (EMeetingModel *im, CalClient *client);</div><div class='del'>-</div><div class='del'>-icaltimezone *e_meeting_model_get_zone (EMeetingModel *im);</div><div class='del'>-void e_meeting_model_set_zone (EMeetingModel *im, icaltimezone *zone);</div><div class='del'>-</div><div class='del'>-void e_meeting_model_add_attendee (EMeetingModel *im, EMeetingAttendee *ia);</div><div class='del'>-EMeetingAttendee *e_meeting_model_add_attendee_with_defaults (EMeetingModel *im);</div><div class='del'>-</div><div class='del'>-void e_meeting_model_remove_attendee (EMeetingModel *im, EMeetingAttendee *ia);</div><div class='del'>-void e_meeting_model_remove_all_attendees (EMeetingModel *im);</div><div class='del'>-</div><div class='del'>-EMeetingAttendee *e_meeting_model_find_attendee (EMeetingModel *im, const gchar *address, gint *row);</div><div class='del'>-EMeetingAttendee *e_meeting_model_find_attendee_at_row (EMeetingModel *im, gint row);</div><div class='del'>-</div><div class='del'>-gint e_meeting_model_count_actual_attendees (EMeetingModel *im);</div><div class='del'>-const GPtrArray *e_meeting_model_get_attendees (EMeetingModel *im);</div><div class='del'>-</div><div class='del'>-void e_meeting_model_refresh_all_busy_periods (EMeetingModel *im,</div><div class='del'>-					       EMeetingTime *start,</div><div class='del'>-					       EMeetingTime *end,</div><div class='del'>-					       EMeetingModelRefreshCallback call_back,</div><div class='del'>-					       gpointer data);</div><div class='del'>-void e_meeting_model_refresh_busy_periods (EMeetingModel *im,</div><div class='del'>-					   int row,</div><div class='del'>-					   EMeetingTime *start,</div><div class='del'>-					   EMeetingTime *end,</div><div class='del'>-					   EMeetingModelRefreshCallback call_back,</div><div class='del'>-					   gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Helpful functions */</div><div class='del'>-ETableScrolled    *e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, const gchar *state_file);</div><div class='del'>-int e_meeting_model_etable_model_to_view_row (ETable *et, EMeetingModel *im, int model_row);</div><div class='del'>-int e_meeting_model_etable_view_to_model_row (ETable *et, EMeetingModel *im, int view_row);</div><div class='del'>-</div><div class='del'>-void e_meeting_model_invite_others_dialog (EMeetingModel *im);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_MODEL_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c<br/>deleted file mode 100644<br/>index d44a1f436d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-time-sel-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-time-sel-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1020 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@gtk.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EMeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main</div><div class='del'>- * display canvas and the top display (with the dates, times &amp; All Attendees).</div><div class='del'>- * I didn't make these separate GnomeCanvasItems since they share a lot of</div><div class='del'>- * code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "e-meeting-time-sel-item.h"</div><div class='del'>-#include "e-meeting-time-sel.h"</div><div class='del'>-</div><div class='del'>-/* Initially the grid lines were drawn at the bottom of cells, but this didn't</div><div class='del'>-   line up well with the GtkEntry widgets, which in the default theme draw a</div><div class='del'>-   black shadow line across the top. So I've switched our code to draw the</div><div class='del'>-   lines across the top of cells. */</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM 0</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class);</div><div class='del'>-static void e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item);</div><div class='del'>-static void e_meeting_time_selector_item_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg,</div><div class='del'>-						  guint arg_id);</div><div class='del'>-static void e_meeting_time_selector_item_realize (GnomeCanvasItem *item);</div><div class='del'>-static void e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item);</div><div class='del'>-static void e_meeting_time_selector_item_update (GnomeCanvasItem *item,</div><div class='del'>-						 double *affine,</div><div class='del'>-						 ArtSVP *clip_path, int flags);</div><div class='del'>-static void e_meeting_time_selector_item_draw (GnomeCanvasItem *item,</div><div class='del'>-					       GdkDrawable *drawable,</div><div class='del'>-					       int x, int y,</div><div class='del'>-					       int width, int height);</div><div class='del'>-static double e_meeting_time_selector_item_point (GnomeCanvasItem *item,</div><div class='del'>-						  double x, double y,</div><div class='del'>-						  int cx, int cy,</div><div class='del'>-						  GnomeCanvasItem **actual_item);</div><div class='del'>-static gint e_meeting_time_selector_item_event (GnomeCanvasItem *item,</div><div class='del'>-						GdkEvent *event);</div><div class='del'>-static gint e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-						       GdkEvent *event);</div><div class='del'>-static gint e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-							 GdkEvent *event);</div><div class='del'>-static gint e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-							GdkEvent *event);</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-							GdkDrawable *drawable,</div><div class='del'>-							GDate *date,</div><div class='del'>-							int x, int scroll_y,</div><div class='del'>-							int width, int height);</div><div class='del'>-static void e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int y, int width, int height);</div><div class='del'>-static void e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-						    GdkDrawable *drawable,</div><div class='del'>-						    GDate *date,</div><div class='del'>-						    int x, int scroll_y,</div><div class='del'>-						    int width, int height);</div><div class='del'>-static void e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height);</div><div class='del'>-static gint e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row);</div><div class='del'>-static void e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int row, int x, int y, int width, int first_period, EMeetingFreeBusyType busy_type);</div><div class='del'>-</div><div class='del'>-static EMeetingTimeSelectorPosition e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item, gint x, gint y);</div><div class='del'>-static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,</div><div class='del'>-								   gint row,</div><div class='del'>-								   gint x,</div><div class='del'>-								   gint width,</div><div class='del'>-								   gint *start_x,</div><div class='del'>-								   gint *end_x);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_MEETING_TIME_SELECTOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_meeting_time_selector_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_meeting_time_selector_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_meeting_time_selector_item_type) {</div><div class='del'>-		GtkTypeInfo e_meeting_time_selector_item_info = {</div><div class='del'>-			"EMeetingTimeSelectorItem",</div><div class='del'>-			sizeof (EMeetingTimeSelectorItem),</div><div class='del'>-			sizeof (EMeetingTimeSelectorItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_meeting_time_selector_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_meeting_time_selector_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_meeting_time_selector_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_meeting_time_selector_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_meeting_time_selector_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) mts_item_class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) mts_item_class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EMeetingTimeSelectorItem::meeting_time_selector",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_MEETING_TIME_SELECTOR);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_meeting_time_selector_item_destroy;</div><div class='del'>-	object_class-&gt;set_arg = e_meeting_time_selector_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;realize     = e_meeting_time_selector_item_realize;</div><div class='del'>-	item_class-&gt;unrealize   = e_meeting_time_selector_item_unrealize;</div><div class='del'>-	item_class-&gt;update      = e_meeting_time_selector_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_meeting_time_selector_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_meeting_time_selector_item_point;</div><div class='del'>-	item_class-&gt;event       = e_meeting_time_selector_item_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (mts_item);</div><div class='del'>-	</div><div class='del'>-	mts_item-&gt;mts = NULL;</div><div class='del'>-</div><div class='del'>-	mts_item-&gt;main_gc = NULL;</div><div class='del'>-	mts_item-&gt;stipple_gc = NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	mts_item-&gt;normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);</div><div class='del'>-	mts_item-&gt;resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);</div><div class='del'>-	mts_item-&gt;last_cursor_set = NULL;</div><div class='del'>-</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = 0;</div><div class='del'>-	item-&gt;y2 = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (object);</div><div class='del'>-</div><div class='del'>-	gdk_cursor_destroy (mts_item-&gt;normal_cursor);</div><div class='del'>-	gdk_cursor_destroy (mts_item-&gt;resize_cursor);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;destroy)(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_MEETING_TIME_SELECTOR:</div><div class='del'>-		mts_item-&gt;mts = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize)(item);</div><div class='del'>-</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);</div><div class='del'>-</div><div class='del'>-	canvas = item-&gt;canvas;</div><div class='del'>-	window = GTK_WIDGET (canvas)-&gt;window;</div><div class='del'>-</div><div class='del'>-	mts_item-&gt;main_gc = gdk_gc_new (window);</div><div class='del'>-	mts_item-&gt;stipple_gc = gdk_gc_new (window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (mts_item-&gt;main_gc);</div><div class='del'>-	mts_item-&gt;main_gc = NULL;</div><div class='del'>-	gdk_gc_unref (mts_item-&gt;stipple_gc);</div><div class='del'>-	mts_item-&gt;stipple_gc = NULL;</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize)(item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The grid covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	gint day_x, meeting_start_x, meeting_end_x, bar_y, bar_height;</div><div class='del'>-	gint row, row_y, start_x, end_x;</div><div class='del'>-	GDate date, last_date, current_date;</div><div class='del'>-	gboolean is_display_top, show_meeting_time;</div><div class='del'>-	GdkGC *gc, *stipple_gc;</div><div class='del'>-</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	g_return_if_fail (mts != NULL);</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-	stipple_gc = mts_item-&gt;stipple_gc;</div><div class='del'>-</div><div class='del'>-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts-&gt;etable));	</div><div class='del'>-</div><div class='del'>-	is_display_top = (GTK_WIDGET (item-&gt;canvas) == mts-&gt;display_top)</div><div class='del'>-		? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	/* Calculate the first and last visible days and positions. */</div><div class='del'>-	e_meeting_time_selector_calculate_day_and_position (mts, x,</div><div class='del'>-							    &amp;date, &amp;day_x);</div><div class='del'>-	e_meeting_time_selector_calculate_day_and_position (mts, x + width,</div><div class='del'>-							    &amp;last_date, NULL);</div><div class='del'>-</div><div class='del'>-	/* For the top display draw the 'All Attendees' row background. */</div><div class='del'>-	if (is_display_top) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;all_attendees_bg_color);</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    0, mts-&gt;row_height * 2 - y,</div><div class='del'>-				    width, mts-&gt;row_height);</div><div class='del'>-	} else {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;bg_color);</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the x coordinates of the meeting time. */</div><div class='del'>-	show_meeting_time = e_meeting_time_selector_get_meeting_time_positions (mts, &amp;meeting_start_x, &amp;meeting_end_x);</div><div class='del'>-</div><div class='del'>-	/* Draw the meeting time background. */</div><div class='del'>-	if (show_meeting_time</div><div class='del'>-	    &amp;&amp; (meeting_end_x - 1 &gt;= x) &amp;&amp; (meeting_start_x + 1 &lt; x + width)</div><div class='del'>-	    &amp;&amp; (meeting_end_x - meeting_start_x &gt; 2)) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;meeting_time_bg_color);</div><div class='del'>-		if (is_display_top)</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    meeting_start_x + 1 - x, mts-&gt;row_height * 2 - y,</div><div class='del'>-					    meeting_end_x - meeting_start_x - 2, mts-&gt;row_height);</div><div class='del'>-		else</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    meeting_start_x + 1 - x, 0,</div><div class='del'>-					    meeting_end_x - meeting_start_x - 2, height);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* For the main display draw the stipple background for attendee's</div><div class='del'>-	   that have no calendar information. */</div><div class='del'>-	if (!is_display_top) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-		gdk_gc_set_foreground (stipple_gc, &amp;mts-&gt;grid_color);</div><div class='del'>-		gdk_gc_set_background (stipple_gc, &amp;mts-&gt;stipple_bg_color);</div><div class='del'>-		gdk_gc_set_stipple (stipple_gc, mts-&gt;stipple);</div><div class='del'>-		gnome_canvas_set_stipple_origin (item-&gt;canvas, stipple_gc);</div><div class='del'>-		gdk_gc_set_fill (stipple_gc, GDK_OPAQUE_STIPPLED);</div><div class='del'>-		row = y / mts-&gt;row_height;</div><div class='del'>-		row_y = row * mts-&gt;row_height - y;</div><div class='del'>-		while (row &lt; e_meeting_model_count_actual_attendees (mts-&gt;model) &amp;&amp; row_y &lt; height) {</div><div class='del'>-			gint model_row = e_meeting_model_etable_view_to_model_row (real_table, </div><div class='del'>-										   mts-&gt;model, row);</div><div class='del'>-</div><div class='del'>-			ia = e_meeting_model_find_attendee_at_row (mts-&gt;model, model_row);</div><div class='del'>-</div><div class='del'>-			if (e_meeting_attendee_get_has_calendar_info (ia)) {</div><div class='del'>-				if (e_meeting_time_selector_item_calculate_busy_range (mts, model_row, x, width, &amp;start_x, &amp;end_x)) {</div><div class='del'>-					if (start_x &gt;= width || end_x &lt;= 0) {</div><div class='del'>-						gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, width, mts-&gt;row_height);</div><div class='del'>-					} else {</div><div class='del'>-						if (start_x &gt;= 0) {</div><div class='del'>-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, 0, row_y, start_x, mts-&gt;row_height);</div><div class='del'>-							gdk_draw_line (drawable, gc, start_x, row_y, start_x, row_y + mts-&gt;row_height);</div><div class='del'>-						}</div><div class='del'>-						if (end_x &lt;= width) {</div><div class='del'>-							gdk_draw_rectangle (drawable, stipple_gc, TRUE, end_x, row_y, width - end_x, mts-&gt;row_height);</div><div class='del'>-							gdk_draw_line (drawable, gc, end_x, row_y, end_x, row_y + mts-&gt;row_height);</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				gdk_draw_rectangle (drawable, stipple_gc, TRUE,</div><div class='del'>-						    0, row_y,</div><div class='del'>-						    width, mts-&gt;row_height);</div><div class='del'>-			}</div><div class='del'>-			row++;</div><div class='del'>-			row_y += mts-&gt;row_height;</div><div class='del'>-		}</div><div class='del'>-		gdk_gc_set_fill (gc, GDK_SOLID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now paint the visible days one by one. */</div><div class='del'>-	current_date = date;</div><div class='del'>-	for (;;) {</div><div class='del'>-		/* Currently we use the same GnomeCanvasItem class for the</div><div class='del'>-		   top display and the main display. We may use separate</div><div class='del'>-		   classes in future if necessary. */</div><div class='del'>-		if (is_display_top)</div><div class='del'>-			e_meeting_time_selector_item_paint_day_top (mts_item, drawable, &amp;current_date, day_x, y, width, height);</div><div class='del'>-		else</div><div class='del'>-			e_meeting_time_selector_item_paint_day (mts_item, drawable, &amp;current_date, day_x, y, width, height);</div><div class='del'>-</div><div class='del'>-		day_x += mts_item-&gt;mts-&gt;day_width;</div><div class='del'>-		if (g_date_compare (&amp;current_date, &amp;last_date) == 0)</div><div class='del'>-			break;</div><div class='del'>-		g_date_add_days (&amp;current_date, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the busy periods. */</div><div class='del'>-	if (is_display_top)</div><div class='del'>-		e_meeting_time_selector_item_paint_all_attendees_busy_periods (mts_item, drawable, &amp;date, x, y, width, height);</div><div class='del'>-	else</div><div class='del'>-		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &amp;date, x, y, width, height);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Draw the currently-selected meeting time vertical bars. */</div><div class='del'>-	if (show_meeting_time) {</div><div class='del'>-		if (is_display_top) {</div><div class='del'>-			bar_y = mts-&gt;row_height * 2 - y;</div><div class='del'>-			bar_height = mts-&gt;row_height;</div><div class='del'>-		} else {</div><div class='del'>-			bar_y = 0;</div><div class='del'>-			bar_height = height;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-</div><div class='del'>-		if ((meeting_start_x + 2 &gt;= x)</div><div class='del'>-		    &amp;&amp; (meeting_start_x - 2 &lt; x + width)) {</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    meeting_start_x - 2 - x, bar_y,</div><div class='del'>-					    5, bar_height);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((meeting_end_x + 2 &gt;= x)</div><div class='del'>-		    &amp;&amp; (meeting_end_x - 2 &lt; x + width)) {</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    meeting_end_x - 2 - x, bar_y,</div><div class='del'>-					    5, bar_height);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-					    GdkDrawable *drawable, GDate *date,</div><div class='del'>-					    int x, int scroll_y,</div><div class='del'>-					    int width, int height)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint y, grid_x;</div><div class='del'>-	gchar buffer[128], *format;</div><div class='del'>-	gint hour, hour_x, hour_y;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-</div><div class='del'>-	/* Draw the horizontal lines. */</div><div class='del'>-	y = mts-&gt;row_height - 1 - scroll_y;</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y, x + mts-&gt;day_width - 1, y);</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_shadow_color);</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y + 1, x + mts-&gt;day_width - 1, y + 1);</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-	y += mts-&gt;row_height;</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y, x + mts-&gt;day_width - 1, y);</div><div class='del'>-	y += mts-&gt;row_height;</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y, x + mts-&gt;day_width - 1, y);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Draw the vertical grid lines. */</div><div class='del'>-	for (grid_x = mts-&gt;col_width - 1;</div><div class='del'>-	     grid_x &lt; mts-&gt;day_width - mts-&gt;col_width;</div><div class='del'>-	     grid_x += mts-&gt;col_width) {</div><div class='del'>-		gdk_draw_line (drawable, gc,</div><div class='del'>-			       x + grid_x, mts-&gt;row_height * 2 - 4 - scroll_y,</div><div class='del'>-			       x + grid_x, height);</div><div class='del'>-	}</div><div class='del'>-	grid_x = mts-&gt;day_width - 2;</div><div class='del'>-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);</div><div class='del'>-	grid_x++;</div><div class='del'>-	gdk_draw_line (drawable, gc, x + grid_x, 0, x + grid_x, height);</div><div class='del'>-</div><div class='del'>-	/* Draw the date. Set a clipping rectangle so we don't draw over the</div><div class='del'>-	   next day. */</div><div class='del'>-	font = GTK_WIDGET (mts)-&gt;style-&gt;font;</div><div class='del'>-	if (mts-&gt;date_format == E_MEETING_TIME_SELECTOR_DATE_FULL)</div><div class='del'>-		/* This is a strftime() format string %A = full weekday name,</div><div class='del'>-		   %B = full month name, %d = month day, %Y = full year. */</div><div class='del'>-		format = _("%A, %B %d, %Y");</div><div class='del'>-	else if (mts-&gt;date_format == E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY)</div><div class='del'>-		/* This is a strftime() format string %a = abbreviated weekday</div><div class='del'>-		   name, %m = month number, %d = month day, %Y = full year. */</div><div class='del'>-		format = _("%a %m/%d/%Y");</div><div class='del'>-	else</div><div class='del'>-		/* This is a strftime() format string %m = month number,</div><div class='del'>-		   %d = month day, %Y = full year. */</div><div class='del'>-		format = _("%m/%d/%Y");</div><div class='del'>-</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer), format, date);</div><div class='del'>-</div><div class='del'>-	clip_rect.x = x;</div><div class='del'>-	clip_rect.y = -scroll_y;</div><div class='del'>-	clip_rect.width = mts-&gt;day_width - 2;</div><div class='del'>-	clip_rect.height = mts-&gt;row_height - 2;</div><div class='del'>-	gdk_gc_set_clip_rectangle (gc, &amp;clip_rect);</div><div class='del'>-	gdk_draw_string (drawable, font, gc,</div><div class='del'>-			 x + 2, 4 + font-&gt;ascent - scroll_y, buffer);</div><div class='del'>-	gdk_gc_set_clip_rectangle (gc, NULL);</div><div class='del'>-</div><div class='del'>-	/* Draw the hours. */</div><div class='del'>-	hour = mts-&gt;first_hour_shown;</div><div class='del'>-	hour_x = x + 2;</div><div class='del'>-	hour_y = mts-&gt;row_height + 4 + font-&gt;ascent - scroll_y;</div><div class='del'>-	while (hour &lt; mts-&gt;last_hour_shown) {</div><div class='del'>-		if (calendar_config_get_24_hour_format ())</div><div class='del'>-			gdk_draw_string (drawable, font, gc,</div><div class='del'>-					 hour_x, hour_y,</div><div class='del'>-					 EMeetingTimeSelectorHours[hour]);</div><div class='del'>-		else</div><div class='del'>-			gdk_draw_string (drawable, font, gc,</div><div class='del'>-					 hour_x, hour_y,</div><div class='del'>-					 EMeetingTimeSelectorHours12[hour]);</div><div class='del'>-</div><div class='del'>-		hour += mts-&gt;zoomed_out ? 3 : 1;</div><div class='del'>-		hour_x += mts-&gt;col_width;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This paints the colored bars representing busy periods for the combined</div><div class='del'>-   list of attendees. For now we just paint the bars for each attendee of</div><div class='del'>-   each other. If we want to speed it up we could optimise it later. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	EMeetingFreeBusyType busy_type;</div><div class='del'>-	gint row, y;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint *first_periods;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	/* Calculate the y coordinate to paint the row at in the drawable. */</div><div class='del'>-	y = 2 * mts-&gt;row_height - scroll_y - 1;</div><div class='del'>-</div><div class='del'>-	/* Get the first visible busy periods for all the attendees. */</div><div class='del'>-	first_periods = g_new (gint, e_meeting_model_count_actual_attendees (mts-&gt;model));</div><div class='del'>-	for (row = 0; row &lt; e_meeting_model_count_actual_attendees (mts-&gt;model); row++) {</div><div class='del'>-		ia = e_meeting_model_find_attendee_at_row (mts-&gt;model, row);</div><div class='del'>-		first_periods[row] = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (busy_type = 0;</div><div class='del'>-	     busy_type &lt; E_MEETING_FREE_BUSY_LAST;</div><div class='del'>-	     busy_type++) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;busy_colors[busy_type]);</div><div class='del'>-		for (row = 0; row &lt; e_meeting_model_count_actual_attendees (mts-&gt;model); row++) {</div><div class='del'>-			if (first_periods[row] == -1)</div><div class='del'>-				continue;</div><div class='del'>-			e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, row, first_periods[row], busy_type);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (first_periods);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-					GdkDrawable *drawable, GDate *date,</div><div class='del'>-					int x, int scroll_y,</div><div class='del'>-					int width, int height)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint grid_x, grid_y, attendee_index, unused_y;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	/* Draw the grid lines. The grid lines around unused rows are drawn in</div><div class='del'>-	   a different color. */</div><div class='del'>-</div><div class='del'>-	/* Draw the horizontal grid lines. */</div><div class='del'>-	attendee_index = scroll_y / mts-&gt;row_height;</div><div class='del'>-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM</div><div class='del'>-	for (grid_y = mts-&gt;row_height - 1 - (scroll_y % mts-&gt;row_height);</div><div class='del'>-#else</div><div class='del'>-	for (grid_y = - (scroll_y % mts-&gt;row_height);</div><div class='del'>-#endif</div><div class='del'>-	     grid_y &lt; height;</div><div class='del'>-	     grid_y += mts-&gt;row_height)</div><div class='del'>-	  {</div><div class='del'>-		  if (attendee_index &lt;= e_meeting_model_count_actual_attendees (mts-&gt;model)) {</div><div class='del'>-			  gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-			  gdk_draw_line (drawable, gc, 0, grid_y,</div><div class='del'>-					 width, grid_y);</div><div class='del'>-		  } else {</div><div class='del'>-			  gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_unused_color);</div><div class='del'>-			  gdk_draw_line (drawable, gc, 0, grid_y,</div><div class='del'>-					 width, grid_y);</div><div class='del'>-		  }</div><div class='del'>-		  attendee_index++;</div><div class='del'>-	  }</div><div class='del'>-</div><div class='del'>-	/* Draw the vertical grid lines. */</div><div class='del'>-	unused_y = (e_meeting_model_count_actual_attendees (mts-&gt;model) * mts-&gt;row_height) - scroll_y;</div><div class='del'>-	if (unused_y &gt;= 0) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-		for (grid_x = mts-&gt;col_width - 1;</div><div class='del'>-		     grid_x &lt; mts-&gt;day_width - mts-&gt;col_width;</div><div class='del'>-		     grid_x += mts-&gt;col_width)</div><div class='del'>-			{</div><div class='del'>-				gdk_draw_line (drawable, gc,</div><div class='del'>-					       x + grid_x, 0,</div><div class='del'>-					       x + grid_x, unused_y - 1);</div><div class='del'>-			}</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    x + mts-&gt;day_width - 2, 0,</div><div class='del'>-				    2, unused_y);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unused_y &lt; height) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_unused_color);</div><div class='del'>-		for (grid_x = mts-&gt;col_width - 1;</div><div class='del'>-		     grid_x &lt; mts-&gt;day_width - mts-&gt;col_width;</div><div class='del'>-		     grid_x += mts-&gt;col_width)</div><div class='del'>-			{</div><div class='del'>-				gdk_draw_line (drawable, gc,</div><div class='del'>-					       x + grid_x, unused_y,</div><div class='del'>-					       x + grid_x, height);</div><div class='del'>-			}</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    x + mts-&gt;day_width - 2, unused_y,</div><div class='del'>-				    2, height - unused_y);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This paints the colored bars representing busy periods for the individual</div><div class='del'>-   attendees. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, GDate *date, int x, int scroll_y, int width, int height)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingFreeBusyType busy_type;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	gint row, model_row, y, first_period;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts-&gt;etable));</div><div class='del'>-</div><div class='del'>-	/* Calculate the first visible attendee row. */</div><div class='del'>-	row = scroll_y / mts-&gt;row_height;</div><div class='del'>-</div><div class='del'>-	/* Calculate the y coordinate to paint the row at in the drawable. */</div><div class='del'>-	y = row * mts-&gt;row_height - scroll_y;</div><div class='del'>-</div><div class='del'>-	/* Step through the attendees painting the busy periods. */</div><div class='del'>-	while (y &lt; height &amp;&amp; row &lt; e_meeting_model_count_actual_attendees (mts-&gt;model)) {</div><div class='del'>-		model_row = e_meeting_model_etable_view_to_model_row (real_table, mts-&gt;model, row);</div><div class='del'>-</div><div class='del'>-		/* Find the first visible busy period. */</div><div class='del'>-		first_period = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, model_row);</div><div class='del'>-		if (first_period != -1) {</div><div class='del'>-			/* Paint the different types of busy periods, in</div><div class='del'>-			   reverse order of precedence, so the highest</div><div class='del'>-			   precedences are displayed. */</div><div class='del'>-			for (busy_type = 0;</div><div class='del'>-			     busy_type &lt; E_MEETING_FREE_BUSY_LAST;</div><div class='del'>-			     busy_type++) {</div><div class='del'>-				gdk_gc_set_foreground (gc, &amp;mts-&gt;busy_colors[busy_type]);</div><div class='del'>-				e_meeting_time_selector_item_paint_attendee_busy_periods (mts_item, drawable, x, y, width, model_row, first_period, busy_type);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		y += mts-&gt;row_height;</div><div class='del'>-		row++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This subtracts the attendees longest_period_in_days from the given date,</div><div class='del'>-   and does a binary search of the attendee's busy periods array to find the</div><div class='del'>-   first one which could possible end on the given day or later.</div><div class='del'>-   If none are found it returns -1. */</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *mts_item, GDate *date, gint row)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	const GArray *busy_periods;</div><div class='del'>-	EMeetingFreeBusyPeriod *period;</div><div class='del'>-	gint period_num;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-</div><div class='del'>-	ia = e_meeting_model_find_attendee_at_row (mts-&gt;model, row);</div><div class='del'>-</div><div class='del'>-	period_num = e_meeting_attendee_find_first_busy_period (ia, date);</div><div class='del'>-	if (period_num == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Check if the period starts after the end of the current canvas</div><div class='del'>-	   scroll area. */</div><div class='del'>-	busy_periods = e_meeting_attendee_get_busy_periods (ia);</div><div class='del'>-	period = &amp;g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);</div><div class='del'>-	if (g_date_compare (&amp;mts-&gt;last_date_shown, &amp;period-&gt;start.date) &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return period_num;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This paints the visible busy periods for one attendee which are of a certain</div><div class='del'>-   busy type, e.g out of office. It is passed the index of the first visible</div><div class='del'>-   busy period of the attendee and continues until it runs off the screen. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorItem *mts_item, GdkDrawable *drawable, int x, int y, int width, int row, int first_period, EMeetingFreeBusyType busy_type)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>- 	const GArray *busy_periods;</div><div class='del'>-	EMeetingFreeBusyPeriod *period;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint period_num, x1, x2, x2_within_day, x2_within_col;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	gc = mts_item-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	ia = e_meeting_model_find_attendee_at_row (mts-&gt;model, row);</div><div class='del'>-</div><div class='del'>-	busy_periods = e_meeting_attendee_get_busy_periods (ia);</div><div class='del'>-	for (period_num = first_period;</div><div class='del'>-	     period_num &lt; busy_periods-&gt;len;</div><div class='del'>-	     period_num++) {</div><div class='del'>-		period = &amp;g_array_index (busy_periods, EMeetingFreeBusyPeriod, period_num);</div><div class='del'>-</div><div class='del'>-		if (period-&gt;busy_type != busy_type)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* Convert the period start and end times to x coordinates. */</div><div class='del'>-		x1 = e_meeting_time_selector_calculate_time_position (mts, &amp;period-&gt;start);</div><div class='del'>-		/* If the period is off the right of the area being drawn, we</div><div class='del'>-		   are finished. */</div><div class='del'>-		if (x1 &gt;= x + width)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		x2 = e_meeting_time_selector_calculate_time_position (mts, &amp;period-&gt;end);</div><div class='del'>-		/* If the period is off the left edge of the area skip it. */</div><div class='del'>-		if (x2 &lt;= x)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* We paint from x1 to x2 - 1, so that for example a time</div><div class='del'>-		   from 5:00-6:00 is distinct from 6:00-7:00.</div><div class='del'>-		   We never finish on a grid line separating days, and we only</div><div class='del'>-		   ever paint on a normal vertical grid line if the period is</div><div class='del'>-		   only 1 pixel wide. */</div><div class='del'>-		x2_within_day = x2 % mts-&gt;day_width;</div><div class='del'>-		if (x2_within_day == 0) {</div><div class='del'>-			x2 -= 2;</div><div class='del'>-		} else if (x2_within_day == mts-&gt;day_width - 1) {</div><div class='del'>-			x2 -= 1;</div><div class='del'>-		} else {</div><div class='del'>-			x2_within_col = x2_within_day % mts-&gt;col_width;</div><div class='del'>-			if (x2_within_col == 0 &amp;&amp; x2 &gt; x1 + 1)</div><div class='del'>-				x2 -= 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Paint the rectangle. We leave a gap of 2 pixels at the</div><div class='del'>-		 top and bottom, remembering that the grid is painted along</div><div class='del'>-		 the top/bottom line of each row. */</div><div class='del'>-		if (x2 - x1 &gt; 0) {</div><div class='del'>-#if E_MEETING_TIME_SELECTOR_DRAW_GRID_LINES_AT_BOTTOM</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    x1 - x, y + 2,</div><div class='del'>-					    x2 - x1, mts-&gt;row_height - 5);</div><div class='del'>-#else</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    x1 - x, y + 3,</div><div class='del'>-					    x2 - x1, mts-&gt;row_height - 5);</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item the the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-				    int cx, int cy,</div><div class='del'>-				    GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelectorItem *mts_item;</div><div class='del'>-</div><div class='del'>-	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		return e_meeting_time_selector_item_button_press (mts_item,</div><div class='del'>-								  event);</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		return e_meeting_time_selector_item_button_release (mts_item,</div><div class='del'>-								    event);</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		return e_meeting_time_selector_item_motion_notify (mts_item,</div><div class='del'>-								   event);</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This handles all button press events for the item. If the cursor is over</div><div class='del'>-   one of the meeting time vertical bars we start a drag. If not we set the</div><div class='del'>-   meeting time to the nearest half-hour interval.</div><div class='del'>-   Note that GnomeCanvas converts the event coords to world coords,</div><div class='del'>-   i.e. relative to the entire canvas scroll area. */</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-					   GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTime start_time, end_time;</div><div class='del'>-	EMeetingTimeSelectorPosition position;</div><div class='del'>-	GDate *start_date, *end_date;</div><div class='del'>-	gint x, y;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	x = (gint) event-&gt;button.x;</div><div class='del'>-	y = (gint) event-&gt;button.y;</div><div class='del'>-</div><div class='del'>-	/* Check if we are starting a drag of the vertical meeting time bars.*/</div><div class='del'>-	position = e_meeting_time_selector_item_get_drag_position (mts_item,</div><div class='del'>-								   x, y);</div><div class='del'>-	if (position != E_MEETING_TIME_SELECTOR_POS_NONE) {</div><div class='del'>-		if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (mts_item),</div><div class='del'>-					    GDK_POINTER_MOTION_MASK</div><div class='del'>-					    | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-					    mts_item-&gt;resize_cursor,</div><div class='del'>-					    event-&gt;button.time) == 0 /*Success*/) {</div><div class='del'>-			mts-&gt;dragging_position = position;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the x coordinate into a EMeetingTimeSelectorTime. */</div><div class='del'>-	e_meeting_time_selector_calculate_time (mts, x, &amp;start_time);</div><div class='del'>-	start_date = &amp;start_time.date;</div><div class='del'>-	end_date = &amp;end_time.date;</div><div class='del'>-</div><div class='del'>-	/* Find the nearest half-hour or hour interval, depending on whether</div><div class='del'>-	   zoomed_out is set. */</div><div class='del'>-	if (!mts-&gt;all_day) {</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			start_time.minute = 0;</div><div class='del'>-			end_time = start_time;</div><div class='del'>-			end_time.hour += 1;</div><div class='del'>-		} else {</div><div class='del'>-			start_time.minute -= start_time.minute % 30;</div><div class='del'>-			end_time = start_time;</div><div class='del'>-			end_time.minute += 30;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		start_time.hour = 0;</div><div class='del'>-		start_time.minute = 0;</div><div class='del'>-		end_time = start_time;</div><div class='del'>-		g_date_add_days (&amp;end_time.date, 1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Fix any overflows. */</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (&amp;end_time);</div><div class='del'>-</div><div class='del'>-	/* Set the new meeting time. */</div><div class='del'>-	e_meeting_time_selector_set_meeting_time (mts_item-&gt;mts,</div><div class='del'>-						  g_date_year (start_date),</div><div class='del'>-						  g_date_month (start_date),</div><div class='del'>-						  g_date_day (start_date),</div><div class='del'>-						  start_time.hour,</div><div class='del'>-						  start_time.minute,</div><div class='del'>-						  g_date_year (end_date),</div><div class='del'>-						  g_date_month (end_date),</div><div class='del'>-						  g_date_day (end_date),</div><div class='del'>-						  end_time.hour,</div><div class='del'>-						  end_time.minute);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This handles all button release events for the item. If we were dragging,</div><div class='del'>-   we finish the drag. */</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-					     GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-</div><div class='del'>-	/* Reset any drag. */</div><div class='del'>-	if (mts-&gt;dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {</div><div class='del'>-		mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;</div><div class='del'>-		e_meeting_time_selector_remove_timeout (mts);</div><div class='del'>-		gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (mts_item),</div><div class='del'>-					  event-&gt;button.time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This handles all motion notify events for the item. If button1 is pressed</div><div class='del'>-   we check if a drag is in progress. If not, we set the cursor if we are over</div><div class='del'>-   the meeting time vertical bars. Note that GnomeCanvas doesn't use motion</div><div class='del'>-   hints, which may affect performance. */</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-					    GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTimeSelectorPosition position;</div><div class='del'>-	GdkCursor *cursor;</div><div class='del'>-	gint x, y;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-	x = (gint) event-&gt;motion.x;</div><div class='del'>-	y = (gint) event-&gt;motion.y;</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;dragging_position != E_MEETING_TIME_SELECTOR_POS_NONE) {</div><div class='del'>-		e_meeting_time_selector_drag_meeting_time (mts, x);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	position = e_meeting_time_selector_item_get_drag_position (mts_item,</div><div class='del'>-								   x, y);</div><div class='del'>-</div><div class='del'>-	/* Determine which cursor should be used. */</div><div class='del'>-	if (position == E_MEETING_TIME_SELECTOR_POS_NONE)</div><div class='del'>-		cursor = mts_item-&gt;normal_cursor;</div><div class='del'>-	else</div><div class='del'>-		cursor = mts_item-&gt;resize_cursor;</div><div class='del'>-</div><div class='del'>-	/* Only set the cursor if it is different to the last one we set. */</div><div class='del'>-	if (mts_item-&gt;last_cursor_set != cursor) {</div><div class='del'>-		mts_item-&gt;last_cursor_set = cursor;</div><div class='del'>-		gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)-&gt;canvas)-&gt;window, cursor);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EMeetingTimeSelectorPosition</div><div class='del'>-e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,</div><div class='del'>-						gint x, gint y)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	gboolean is_display_top;</div><div class='del'>-	gint meeting_start_x, meeting_end_x;</div><div class='del'>-</div><div class='del'>-	mts = mts_item-&gt;mts;</div><div class='del'>-</div><div class='del'>-	is_display_top = (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)-&gt;canvas) == mts-&gt;display_top) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	if (is_display_top &amp;&amp; y &lt; mts-&gt;row_height * 2)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (!e_meeting_time_selector_get_meeting_time_positions (mts, &amp;meeting_start_x, &amp;meeting_end_x))</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (x &gt;= meeting_end_x - 2 &amp;&amp; x &lt;= meeting_end_x + 2)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_POS_END;</div><div class='del'>-</div><div class='del'>-	if (x &gt;= meeting_start_x - 2 &amp;&amp; x &lt;= meeting_start_x + 2)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_POS_START;</div><div class='del'>-</div><div class='del'>-	return E_MEETING_TIME_SELECTOR_POS_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,</div><div class='del'>-						   gint row,</div><div class='del'>-						   gint x,</div><div class='del'>-						   gint width,</div><div class='del'>-						   gint *start_x,</div><div class='del'>-						   gint *end_x)</div><div class='del'>-{</div><div class='del'>-	EMeetingAttendee *ia;</div><div class='del'>-	EMeetingTime busy_periods_start;</div><div class='del'>-	EMeetingTime busy_periods_end;</div><div class='del'>-	</div><div class='del'>-	ia = e_meeting_model_find_attendee_at_row (mts-&gt;model, row);</div><div class='del'>-	busy_periods_start = e_meeting_attendee_get_start_busy_range (ia);</div><div class='del'>-	busy_periods_end = e_meeting_attendee_get_end_busy_range (ia);</div><div class='del'>-	</div><div class='del'>-	*start_x = -1;</div><div class='del'>-	*end_x = -1;</div><div class='del'>-</div><div class='del'>-	if (!g_date_valid (&amp;busy_periods_start.date)</div><div class='del'>-	    || !g_date_valid (&amp;busy_periods_end.date))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	*start_x = e_meeting_time_selector_calculate_time_position (mts, &amp;busy_periods_start) - x - 1;</div><div class='del'>-</div><div class='del'>-	*end_x = e_meeting_time_selector_calculate_time_position (mts, &amp;busy_periods_end) - x;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h<br/>deleted file mode 100644<br/>index 11b355dfa0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-time-sel-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-time-sel-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@gtk.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * MeetingTimeSelectorItem - A GnomeCanvasItem which is used for both the main</div><div class='del'>- * display canvas and the top display (with the dates, times &amp; All Attendees).</div><div class='del'>- * I didn't make these separate GnomeCanvasItems since they share a lot of</div><div class='del'>- * code.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MEETING_TIME_SELECTOR_ITEM_H_</div><div class='del'>-#define _E_MEETING_TIME_SELECTOR_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-meeting-time-sel.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_ITEM(obj)          (GTK_CHECK_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (GTK_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))</div><div class='del'>-#define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (GTK_CHECK_TYPE((o), e_meeting_time_selector_item_get_type ()))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;</div><div class='del'>-typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;</div><div class='del'>-</div><div class='del'>-struct _EMeetingTimeSelectorItem</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EMeetingTimeSelector widget. */</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	/* This GC is used for most of the drawing. The fg/bg colors are</div><div class='del'>-	   changed for each bit. */</div><div class='del'>-	GdkGC *main_gc;</div><div class='del'>-	GdkGC *stipple_gc;</div><div class='del'>-</div><div class='del'>-	/* The normal &amp; resize cursors. */</div><div class='del'>-	GdkCursor *normal_cursor;</div><div class='del'>-	GdkCursor *resize_cursor;</div><div class='del'>-</div><div class='del'>-	/* This remembers the last cursor set on the window. */</div><div class='del'>-	GdkCursor *last_cursor_set;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EMeetingTimeSelectorItemClass</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_meeting_time_selector_item_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c<br/>deleted file mode 100644<br/>index 50ba2af777..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-time-sel.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-time-sel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2884 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@gtk.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-meeting-time-sel.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;gtk/gtkalignment.h&gt;</div><div class='del'>-#include &lt;gtk/gtkarrow.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkdrawingarea.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtkfixed.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhscrollbar.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhseparator.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkradiomenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvscrollbar.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dateedit.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-combo.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-header-item.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-header-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "e-meeting-utils.h"</div><div class='del'>-#include "e-meeting-time-sel-item.h"</div><div class='del'>-</div><div class='del'>-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */</div><div class='del'>-const gchar *EMeetingTimeSelectorHours[24] = {</div><div class='del'>-	"0:00", "1:00", "2:00", "3:00", "4:00", "5:00", "6:00", "7:00", </div><div class='del'>-	"8:00", "9:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", </div><div class='del'>-	"16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00", "23:00"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */</div><div class='del'>-const gchar *EMeetingTimeSelectorHours12[24] = {</div><div class='del'>-	"12:00am", "1:00am", "2:00am", "3:00am", "4:00am", "5:00am", "6:00am", </div><div class='del'>-	"7:00am", "8:00am", "9:00am", "10:00am", "11:00am", "12:00pm", </div><div class='del'>-	"1:00pm", "2:00pm", "3:00pm", "4:00pm", "5:00pm", "6:00pm", "7:00pm",</div><div class='del'>-	"8:00pm", "9:00pm", "10:00pm", "11:00pm"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The number of days shown in the entire canvas. */</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN		365</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE	 60</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE            7</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER            28</div><div class='del'>-</div><div class='del'>-/* This is the number of pixels between the mouse has to move before the</div><div class='del'>-   scroll speed is incremented. */</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH	10</div><div class='del'>-</div><div class='del'>-/* This is the maximum scrolling speed. */</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED	4</div><div class='del'>-</div><div class='del'>-/* Signals */</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint mts_signals [LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass);</div><div class='del'>-static void e_meeting_time_selector_init (EMeetingTimeSelector * mts);</div><div class='del'>-static void e_meeting_time_selector_destroy (GtkObject *object);</div><div class='del'>-static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,</div><div class='del'>-						       const char *name, GdkColor *c);</div><div class='del'>-static void e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,</div><div class='del'>-						   GtkWidget *hbox,</div><div class='del'>-						   gchar *label_text,</div><div class='del'>-						   GdkColor *color);</div><div class='del'>-static gint e_meeting_time_selector_expose_key_color (GtkWidget *darea,</div><div class='del'>-						      GdkEventExpose *event,</div><div class='del'>-						      GdkColor *color);</div><div class='del'>-static void e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,</div><div class='del'>-							   GtkMenu   *menu);</div><div class='del'>-static void e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,</div><div class='del'>-							    GtkMenu   *menu);</div><div class='del'>-static void e_meeting_time_selector_realize (GtkWidget *widget);</div><div class='del'>-static void e_meeting_time_selector_unrealize (GtkWidget *widget);</div><div class='del'>-static void e_meeting_time_selector_style_set (GtkWidget *widget,</div><div class='del'>-					       GtkStyle  *previous_style);</div><div class='del'>-static gint e_meeting_time_selector_expose_event (GtkWidget *widget,</div><div class='del'>-						  GdkEventExpose *event);</div><div class='del'>-static void e_meeting_time_selector_draw (GtkWidget    *widget,</div><div class='del'>-					  GdkRectangle *area);</div><div class='del'>-static void e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-							 EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-							 EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_table_vadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-							       EMeetingTimeSelector *mts);</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,</div><div class='del'>-							EMeetingTimeSelector *mts);</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,</div><div class='del'>-							       EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,</div><div class='del'>-								    gint *x,</div><div class='del'>-								    gint *y,</div><div class='del'>-								    gpointer user_data);</div><div class='del'>-static void e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *button,</div><div class='del'>-							   EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_working_hours_toggled (GtkWidget *button,</div><div class='del'>-							      EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,</div><div class='del'>-								     EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_update_free_busy (GtkWidget *button,</div><div class='del'>-							 EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,</div><div class='del'>-								EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,</div><div class='del'>-								     gint *x,</div><div class='del'>-								     gint *y,</div><div class='del'>-								     gpointer user_data);</div><div class='del'>-static void e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,</div><div class='del'>-								EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,</div><div class='del'>-							    EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,</div><div class='del'>-							    EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,</div><div class='del'>-					      gboolean forward);</div><div class='del'>-static void e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,</div><div class='del'>-							       EMeetingTime*end,</div><div class='del'>-							       gint *days,</div><div class='del'>-							       gint *hours,</div><div class='del'>-							       gint *minutes);</div><div class='del'>-static void e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,</div><div class='del'>-							   EMeetingTime*start_time,</div><div class='del'>-							   EMeetingTime*end_time,</div><div class='del'>-							   gint days, gint hours, gint mins);</div><div class='del'>-static void e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,</div><div class='del'>-								    EMeetingTime *start_time,</div><div class='del'>-								    EMeetingTime *end_time,</div><div class='del'>-								    gint days, gint hours, gint mins);</div><div class='del'>-static void e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,</div><div class='del'>-						 gint days, gint hours, gint minutes);</div><div class='del'>-static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,</div><div class='del'>-									EMeetingAttendee *attendee,</div><div class='del'>-									EMeetingTime *start_time,</div><div class='del'>-									EMeetingTime *end_time);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,</div><div class='del'>-						   EMeetingTime *mtstime);</div><div class='del'>-static void e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,</div><div class='del'>-						      EMeetingTime*mtstime);</div><div class='del'>-static void e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,</div><div class='del'>-							   EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,</div><div class='del'>-							 EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,</div><div class='del'>-							     GtkAllocation *allocation,</div><div class='del'>-							     EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts);</div><div class='del'>-static gboolean e_meeting_time_selector_timeout_handler (gpointer data);</div><div class='del'>-static void e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts);</div><div class='del'>-static void e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts);</div><div class='del'>-</div><div class='del'>-static void rows_inserted_cb (ETableModel *etm, int row, int count, gpointer data);</div><div class='del'>-static void cell_changed_cb (ETableModel *etm, int row, int col, gpointer data);</div><div class='del'>-static void rows_deleted_cb (ETableModel *etm, int row, int count, gpointer data);</div><div class='del'>-static void sort_info_changed_cb (ETableSortInfo *info, gpointer data);</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_meeting_time_selector_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint e_meeting_time_selector_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_meeting_time_selector_type) {</div><div class='del'>-		GtkTypeInfo e_meeting_time_selector_info =</div><div class='del'>-		{</div><div class='del'>-			"EMeetingTimeSelector",</div><div class='del'>-			sizeof (EMeetingTimeSelector),</div><div class='del'>-			sizeof (EMeetingTimeSelectorClass),</div><div class='del'>-			(GtkClassInitFunc) e_meeting_time_selector_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_meeting_time_selector_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_meeting_time_selector_type = gtk_type_unique (GTK_TYPE_TABLE,</div><div class='del'>-								&amp;e_meeting_time_selector_info);</div><div class='del'>-	}</div><div class='del'>-	return e_meeting_time_selector_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_table_get_type());</div><div class='del'>-	object_class = (GtkObjectClass *) klass;</div><div class='del'>-	widget_class = (GtkWidgetClass *) klass;</div><div class='del'>-</div><div class='del'>-	mts_signals [CHANGED] = </div><div class='del'>-		gtk_signal_new ("changed", GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMeetingTimeSelectorClass, </div><div class='del'>-						   changed),</div><div class='del'>-				gtk_signal_default_marshaller,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, mts_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_meeting_time_selector_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize      = e_meeting_time_selector_realize;</div><div class='del'>-	widget_class-&gt;unrealize    = e_meeting_time_selector_unrealize;</div><div class='del'>-	widget_class-&gt;style_set    = e_meeting_time_selector_style_set;</div><div class='del'>-	widget_class-&gt;expose_event = e_meeting_time_selector_expose_event;</div><div class='del'>-	widget_class-&gt;draw	   = e_meeting_time_selector_draw;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_init (EMeetingTimeSelector * mts)</div><div class='del'>-{</div><div class='del'>-	/* The shadow is drawn in the border so it must be &gt;= 2 pixels. */</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (mts), 2);</div><div class='del'>-</div><div class='del'>-	mts-&gt;accel_group = gtk_accel_group_new ();</div><div class='del'>-</div><div class='del'>-	mts-&gt;working_hours_only = TRUE;</div><div class='del'>-	mts-&gt;day_start_hour = 9;</div><div class='del'>-	mts-&gt;day_start_minute = 0;</div><div class='del'>-	mts-&gt;day_end_hour = 18;</div><div class='del'>-	mts-&gt;day_end_minute = 0;</div><div class='del'>-	mts-&gt;zoomed_out = TRUE;</div><div class='del'>-	mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_NONE;</div><div class='del'>-</div><div class='del'>-	mts-&gt;etable = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *hbox, *vbox, *separator, *button, *label, *table;</div><div class='del'>-	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;</div><div class='del'>-	GSList *group;</div><div class='del'>-	GdkVisual *visual;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	guint accel_key;</div><div class='del'>-	GtkAccelGroup *menu_accel_group;</div><div class='del'>-	time_t meeting_start_time;</div><div class='del'>-	struct tm *meeting_start_tm;</div><div class='del'>-	char *filename;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	guchar stipple_bits[] = {</div><div class='del'>-		0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* The default meeting time is the nearest half-hour interval in the</div><div class='del'>-	   future, in working hours. */</div><div class='del'>-	meeting_start_time = time (NULL);</div><div class='del'>-	g_date_clear (&amp;mts-&gt;meeting_start_time.date, 1);</div><div class='del'>-	g_date_set_time (&amp;mts-&gt;meeting_start_time.date, meeting_start_time);</div><div class='del'>-	meeting_start_tm = localtime (&amp;meeting_start_time);</div><div class='del'>-	mts-&gt;meeting_start_time.hour = meeting_start_tm-&gt;tm_hour;</div><div class='del'>-	mts-&gt;meeting_start_time.minute = meeting_start_tm-&gt;tm_min;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_find_nearest_interval (mts, &amp;mts-&gt;meeting_start_time,</div><div class='del'>-						       &amp;mts-&gt;meeting_end_time,</div><div class='del'>-						       0, 0, 30);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_update_dates_shown (mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-</div><div class='del'>-	mts-&gt;row_height = 19;</div><div class='del'>-	mts-&gt;col_width = 55;</div><div class='del'>-	mts-&gt;day_width = 55 * 24 + 1;</div><div class='del'>-</div><div class='del'>-	mts-&gt;auto_scroll_timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts),</div><div class='del'>-			  vbox, 0, 1, 0, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-</div><div class='del'>-	mts-&gt;attendees_vbox_spacer = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), mts-&gt;attendees_vbox_spacer, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;attendees_vbox_spacer);</div><div class='del'>-	</div><div class='del'>-	mts-&gt;attendees_vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), mts-&gt;attendees_vbox, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;attendees_vbox);</div><div class='del'>-</div><div class='del'>-	/* build the etable */</div><div class='del'>-	filename = g_strdup_printf ("%s/config/et-header-meeting-time-sel", evolution_dir);</div><div class='del'>-	mts-&gt;model = emm;</div><div class='del'>-	if (mts-&gt;model)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (mts-&gt;model));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;model), "model_rows_inserted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (rows_inserted_cb), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;model), "model_cell_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cell_changed_cb), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;model), "model_rows_deleted",</div><div class='del'>-			    GTK_SIGNAL_FUNC (rows_deleted_cb), mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;etable = GTK_WIDGET (e_meeting_model_etable_from_model (mts-&gt;model,</div><div class='del'>-								EVOLUTION_ETSPECDIR "/e-meeting-time-sel.etspec",</div><div class='del'>-								filename));</div><div class='del'>-	e_scroll_frame_set_policy (E_SCROLL_FRAME (mts-&gt;etable), GTK_POLICY_NEVER, GTK_POLICY_NEVER);</div><div class='del'>-	e_scroll_frame_set_scrollbar_spacing (E_SCROLL_FRAME (mts-&gt;etable), 0);</div><div class='del'>-</div><div class='del'>-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts-&gt;etable));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (real_table-&gt;sort_info), "sort_info_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (sort_info_changed_cb), mts);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (mts-&gt;attendees_vbox), mts-&gt;etable, TRUE, TRUE, 2);</div><div class='del'>-	gtk_widget_show (mts-&gt;etable);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* The free/busy information */</div><div class='del'>-	mts-&gt;display_top = gnome_canvas_new ();</div><div class='del'>-	gtk_widget_set_usize (mts-&gt;display_top, -1, mts-&gt;row_height * 3);</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts-&gt;display_top),</div><div class='del'>-					0, 0,</div><div class='del'>-					mts-&gt;day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,</div><div class='del'>-					mts-&gt;row_height * 3);</div><div class='del'>-	/* Add some horizontal padding for the shadow around the display. */</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), mts-&gt;display_top,</div><div class='del'>-			  1, 4, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;display_top);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;display_top), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;display_main = gnome_canvas_new ();</div><div class='del'>-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);</div><div class='del'>-	/* Add some horizontal padding for the shadow around the display. */</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), mts-&gt;display_main,</div><div class='del'>-			  1, 4, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;display_main);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;display_main), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_realized), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;display_main), "size_allocate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_canvas_size_allocate), mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;hscrollbar = gtk_hscrollbar_new (GTK_LAYOUT (mts-&gt;display_main)-&gt;hadjustment);</div><div class='del'>-	GTK_LAYOUT (mts-&gt;display_main)-&gt;hadjustment-&gt;step_increment = mts-&gt;col_width;</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), mts-&gt;hscrollbar,</div><div class='del'>-			  1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;hscrollbar);</div><div class='del'>-</div><div class='del'>-	mts-&gt;vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment);</div><div class='del'>-	GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment-&gt;step_increment = mts-&gt;row_height;</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), mts-&gt;vscrollbar,</div><div class='del'>-			  4, 5, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;vscrollbar);</div><div class='del'>-</div><div class='del'>-	/* Create the item in the top canvas. */</div><div class='del'>-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts-&gt;display_top)-&gt;root),</div><div class='del'>-			       e_meeting_time_selector_item_get_type (),</div><div class='del'>-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the item in the main canvas. */</div><div class='del'>-	gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (mts-&gt;display_main)-&gt;root),</div><div class='del'>-			       e_meeting_time_selector_item_get_type (),</div><div class='del'>-			       "EMeetingTimeSelectorItem::meeting_time_selector", mts,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the hbox containing the color key. */</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), hbox,</div><div class='del'>-			  1, 4, 3, 4, GTK_FILL, 0, 0, 8);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_add_key_color (mts, hbox, _("Tentative"), &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);</div><div class='del'>-	e_meeting_time_selector_add_key_color (mts, hbox, _("Busy"), &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_BUSY]);</div><div class='del'>-	e_meeting_time_selector_add_key_color (mts, hbox, _("Out of Office"), &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);</div><div class='del'>-	e_meeting_time_selector_add_key_color (mts, hbox, _("No Information"),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-	separator = gtk_hseparator_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), separator,</div><div class='del'>-			  0, 5, 4, 5, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (separator);</div><div class='del'>-</div><div class='del'>-	/* Create the Invite Others &amp; Options buttons on the left. */</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), hbox,</div><div class='del'>-			  0, 1, 3, 4, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)-&gt;child),</div><div class='del'>-					   _("_Invite Others..."));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-	gtk_widget_add_accelerator (button, "clicked", mts-&gt;accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_invite_others_button_clicked), mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;options_button = gtk_button_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), mts-&gt;options_button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;options_button);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;options_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_options_button_clicked), mts);</div><div class='del'>-</div><div class='del'>-	child_hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (mts-&gt;options_button), child_hbox);</div><div class='del'>-	gtk_widget_show (child_hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Options"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gtk_widget_add_accelerator (mts-&gt;options_button, "clicked", mts-&gt;accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-</div><div class='del'>-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);</div><div class='del'>-	gtk_widget_show (arrow);</div><div class='del'>-</div><div class='del'>-	/* Create the Options menu. */</div><div class='del'>-	mts-&gt;options_menu = gtk_menu_new ();</div><div class='del'>-	gtk_menu_attach_to_widget (GTK_MENU (mts-&gt;options_menu), mts-&gt;options_button,</div><div class='del'>-				   e_meeting_time_selector_options_menu_detacher);</div><div class='del'>-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts-&gt;options_menu));</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_check_menu_item_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("Show _Only Working Hours"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;options_menu), menuitem);</div><div class='del'>-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),</div><div class='del'>-					mts-&gt;working_hours_only);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_working_hours_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_check_menu_item_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("Show _Zoomed Out"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;options_menu), menuitem);</div><div class='del'>-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),</div><div class='del'>-					mts-&gt;zoomed_out);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_zoomed_out_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_menu_item_new ();</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;options_menu), menuitem);</div><div class='del'>-	gtk_widget_set_sensitive (menuitem, FALSE);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_menu_item_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("_Update Free/Busy"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;options_menu), menuitem);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_update_free_busy), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	/* Create the 3 AutoPick buttons on the left. */</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), hbox,</div><div class='del'>-			  0, 1, 5, 6, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)-&gt;child),</div><div class='del'>-					   _("_&lt;&lt;"));</div><div class='del'>-	gtk_widget_add_accelerator (button, "clicked", mts-&gt;accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_prev_button_clicked), mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;autopick_button = gtk_button_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), mts-&gt;autopick_button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;autopick_button);</div><div class='del'>-</div><div class='del'>-	child_hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (mts-&gt;autopick_button), child_hbox);</div><div class='del'>-	gtk_widget_show (child_hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (label), _("_Autopick"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gtk_widget_add_accelerator (mts-&gt;autopick_button, "clicked", mts-&gt;accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;autopick_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_button_clicked), mts);</div><div class='del'>-</div><div class='del'>-	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), arrow, FALSE, FALSE, 2);</div><div class='del'>-	gtk_widget_show (arrow);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (button)-&gt;child),</div><div class='del'>-					   _("&gt;_&gt;"));</div><div class='del'>-	gtk_widget_add_accelerator (button, "clicked", mts-&gt;accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK | GDK_SHIFT_MASK, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_next_button_clicked), mts);</div><div class='del'>-</div><div class='del'>-	/* Create the Autopick menu. */</div><div class='del'>-	mts-&gt;autopick_menu = gtk_menu_new ();</div><div class='del'>-	gtk_menu_attach_to_widget (GTK_MENU (mts-&gt;autopick_menu), mts-&gt;autopick_button,</div><div class='del'>-				   e_meeting_time_selector_autopick_menu_detacher);</div><div class='del'>-	menu_accel_group = gtk_menu_ensure_uline_accel_group (GTK_MENU (mts-&gt;autopick_menu));</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_radio_menu_item_new_with_label (NULL, "");</div><div class='del'>-	mts-&gt;autopick_all_item = menuitem;</div><div class='del'>-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("_All People and Resources"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;autopick_menu), menuitem);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_radio_menu_item_new_with_label (group, "");</div><div class='del'>-	mts-&gt;autopick_all_people_one_resource_item = menuitem;</div><div class='del'>-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("All _People and One Resource"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;autopick_menu), menuitem);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_radio_menu_item_new_with_label (group, "");</div><div class='del'>-	mts-&gt;autopick_required_people_item = menuitem;</div><div class='del'>-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("_Required People"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;autopick_menu), menuitem);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_radio_menu_item_new_with_label (group, "");</div><div class='del'>-	mts-&gt;autopick_required_people_one_resource_item = menuitem;</div><div class='del'>-	group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menuitem));</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menuitem)-&gt;child), _("Required People and _One Resource"));</div><div class='del'>-	gtk_menu_append (GTK_MENU (mts-&gt;autopick_menu), menuitem);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, 0, 0);</div><div class='del'>-	gtk_widget_add_accelerator (menuitem, "activate", menu_accel_group,</div><div class='del'>-				    accel_key, GDK_MOD1_MASK, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menuitem), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_autopick_option_toggled), mts);</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	/* Create the date entry fields on the right. */</div><div class='del'>-	alignment = gtk_alignment_new (0.0, 0.5, 0, 0);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (mts), alignment,</div><div class='del'>-			  1, 4, 5, 6, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (alignment);</div><div class='del'>-</div><div class='del'>-	table = gtk_table_new (2, 2, FALSE);</div><div class='del'>-	gtk_table_set_row_spacings (GTK_TABLE (table), 4);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (alignment), table);</div><div class='del'>-	gtk_widget_show (table);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),</div><div class='del'>-					   _("Meeting _start time:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), label,</div><div class='del'>-			  0, 1, 0, 1, GTK_FILL, 0, 4, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-</div><div class='del'>-	mts-&gt;start_date_edit = e_date_edit_new ();</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (mts-&gt;start_date_edit), TRUE);</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts-&gt;start_date_edit),</div><div class='del'>-					    calendar_config_get_24_hour_format ());</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), mts-&gt;start_date_edit,</div><div class='del'>-			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;start_date_edit);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;start_date_edit), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_start_time_changed), mts);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("");</div><div class='del'>-	accel_key = gtk_label_parse_uline (GTK_LABEL (label),</div><div class='del'>-					   _("Meeting _end time:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), label,</div><div class='del'>-			  0, 1, 1, 2, GTK_FILL, 0, 4, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-</div><div class='del'>-	mts-&gt;end_date_edit = e_date_edit_new ();</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (mts-&gt;end_date_edit), TRUE);</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (mts-&gt;end_date_edit),</div><div class='del'>-					    calendar_config_get_24_hour_format ());</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (table), mts-&gt;end_date_edit,</div><div class='del'>-			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (mts-&gt;end_date_edit);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (mts-&gt;end_date_edit), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_on_end_time_changed), mts);</div><div class='del'>-</div><div class='del'>-	gtk_table_set_col_spacing (GTK_TABLE (mts), 0, 4);</div><div class='del'>-	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-	visual = gtk_widget_get_visual (GTK_WIDGET (mts));</div><div class='del'>-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));</div><div class='del'>-	mts-&gt;color_context = gdk_color_context_new (visual, colormap);</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "gray75", &amp;mts-&gt;bg_color);</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &amp;mts-&gt;all_attendees_bg_color);</div><div class='del'>-	gdk_color_black (colormap, &amp;mts-&gt;grid_color);</div><div class='del'>-	gdk_color_white (colormap, &amp;mts-&gt;grid_shadow_color);</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "gray50", &amp;mts-&gt;grid_unused_color);</div><div class='del'>-	gdk_color_white (colormap, &amp;mts-&gt;meeting_time_bg_color);</div><div class='del'>-	gdk_color_white (colormap, &amp;mts-&gt;stipple_bg_color);</div><div class='del'>-	gdk_color_white (colormap, &amp;mts-&gt;attendee_list_bg_color);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "LightSkyBlue2", &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "blue", &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_BUSY]);</div><div class='del'>-	e_meeting_time_selector_alloc_named_color (mts, "HotPink3", &amp;mts-&gt;busy_colors[E_MEETING_FREE_BUSY_OUT_OF_OFFICE]);</div><div class='del'>-</div><div class='del'>-	/* Create the stipple, for attendees with no data. */</div><div class='del'>-	mts-&gt;stipple = gdk_bitmap_create_from_data (NULL, (gchar*)stipple_bits,</div><div class='del'>-						    8, 8);</div><div class='del'>-</div><div class='del'>-	/* Connect handlers to the adjustments  scroll the other items. */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts-&gt;display_main)-&gt;hadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_hadjustment_changed), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_vadjustment_changed), mts);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts-&gt;etable))), "value_changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts-&gt;etable))), "changed", GTK_SIGNAL_FUNC (e_meeting_time_selector_table_vadjustment_changed), mts);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_ensure_meeting_time_shown (mts);</div><div class='del'>-	e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-	e_meeting_time_selector_update_end_date_edit (mts);	</div><div class='del'>-	e_meeting_time_selector_update_date_popup_menus (mts);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds a color to the color key beneath the main display. If color is</div><div class='del'>-   NULL, it displays the No Info stipple instead. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_add_key_color (EMeetingTimeSelector * mts,</div><div class='del'>-				       GtkWidget *hbox,</div><div class='del'>-				       gchar *label_text, GdkColor *color)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *child_hbox, *darea, *label;</div><div class='del'>-</div><div class='del'>-	child_hbox = gtk_hbox_new (FALSE, 4);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), child_hbox, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (child_hbox);</div><div class='del'>-</div><div class='del'>-	darea = gtk_drawing_area_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), darea, FALSE, FALSE, 0);</div><div class='del'>-	gtk_object_set_user_data (GTK_OBJECT (darea), mts);</div><div class='del'>-	gtk_widget_set_usize (darea, 14, 14);</div><div class='del'>-	gtk_widget_show (darea);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (label_text);</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (child_hbox), label, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (darea), "expose_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_meeting_time_selector_expose_key_color),</div><div class='del'>-			    color);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_expose_key_color (GtkWidget *darea,</div><div class='del'>-					  GdkEventExpose *event,</div><div class='del'>-					  GdkColor *color)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector * mts;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint width, height;</div><div class='del'>-</div><div class='del'>-	mts = gtk_object_get_user_data (GTK_OBJECT (darea));</div><div class='del'>-	gc = mts-&gt;color_key_gc;</div><div class='del'>-	width = darea-&gt;allocation.width;</div><div class='del'>-	height = darea-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	gtk_draw_shadow (darea-&gt;style, darea-&gt;window, GTK_STATE_NORMAL,</div><div class='del'>-			 GTK_SHADOW_IN, 0, 0, width, height);</div><div class='del'>-</div><div class='del'>-	if (color) {</div><div class='del'>-		gdk_gc_set_foreground (gc, color);</div><div class='del'>-		gdk_draw_rectangle (darea-&gt;window, gc, TRUE, 1, 1,</div><div class='del'>-				    width - 2, height - 2);</div><div class='del'>-	} else {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;mts-&gt;grid_color);</div><div class='del'>-		gdk_gc_set_background (gc, &amp;mts-&gt;stipple_bg_color);</div><div class='del'>-		gdk_gc_set_stipple (gc, mts-&gt;stipple);</div><div class='del'>-		gdk_gc_set_fill (gc, GDK_OPAQUE_STIPPLED);</div><div class='del'>-		gdk_draw_rectangle (darea-&gt;window, gc, TRUE, 1, 1,</div><div class='del'>-				    width - 2, height - 2);</div><div class='del'>-		gdk_gc_set_fill (gc, GDK_SOLID);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,</div><div class='del'>-					   const char *name, GdkColor *c)</div><div class='del'>-{</div><div class='del'>-	int failed;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (name != NULL);</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-</div><div class='del'>-	gdk_color_parse (name, c);</div><div class='del'>-	c-&gt;pixel = 0;</div><div class='del'>-	c-&gt;pixel = gdk_color_context_get_pixel (mts-&gt;color_context,</div><div class='del'>-						c-&gt;red, c-&gt;green, c-&gt;blue,</div><div class='del'>-						&amp;failed);</div><div class='del'>-	if (failed)</div><div class='del'>-		g_warning ("Failed to allocate color: %s\n", name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,</div><div class='del'>-					       GtkMenu   *menu)</div><div class='del'>-{</div><div class='del'>-  EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));</div><div class='del'>-</div><div class='del'>-  mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-  g_return_if_fail (mts-&gt;options_menu == (GtkWidget*) menu);</div><div class='del'>-</div><div class='del'>-  mts-&gt;options_menu = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,</div><div class='del'>-						GtkMenu   *menu)</div><div class='del'>-{</div><div class='del'>-  EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (widget));</div><div class='del'>-</div><div class='del'>-  mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-  g_return_if_fail (mts-&gt;autopick_menu == (GtkWidget*) menu);</div><div class='del'>-</div><div class='del'>-  mts-&gt;autopick_menu = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_meeting_time_selector_new (EMeetingModel *emm)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *mts;</div><div class='del'>-</div><div class='del'>-	mts = GTK_WIDGET (gtk_type_new (e_meeting_time_selector_get_type ()));</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_construct (E_MEETING_TIME_SELECTOR (mts), emm);</div><div class='del'>-	</div><div class='del'>-	return mts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (object);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_remove_timeout (mts);</div><div class='del'>-</div><div class='del'>-	gdk_color_context_free (mts-&gt;color_context);</div><div class='del'>-	gdk_bitmap_unref (mts-&gt;stipple);</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;model)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (mts-&gt;model));</div><div class='del'>-		</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;destroy)(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;realize)(widget);</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-</div><div class='del'>-	mts-&gt;color_key_gc = gdk_gc_new (widget-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_unrealize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (mts-&gt;color_key_gc);</div><div class='del'>-	mts-&gt;color_key_gc = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_style_set (GtkWidget *widget,</div><div class='del'>-				   GtkStyle  *previous_style)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTime saved_time;</div><div class='del'>-	ETable *real_table;</div><div class='del'>-	ETableHeader *eth;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	EFont *efont;</div><div class='del'>-	int hour, max_hour_width;</div><div class='del'>-	int numcols, col;</div><div class='del'>-	int maxheight;      </div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;style_set)(widget, previous_style);</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-	efont = e_font_from_gdk_font (font);</div><div class='del'>-	</div><div class='del'>-	/* Calculate the widths of the hour strings in the style's font. */</div><div class='del'>-	max_hour_width = 0;</div><div class='del'>-	for (hour = 0; hour &lt; 24; hour++) {</div><div class='del'>-		if (calendar_config_get_24_hour_format ())</div><div class='del'>-			mts-&gt;hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours[hour]);</div><div class='del'>-		else</div><div class='del'>-			mts-&gt;hour_widths[hour] = gdk_string_width (font, EMeetingTimeSelectorHours12[hour]);</div><div class='del'>-		max_hour_width = MAX (max_hour_width, mts-&gt;hour_widths[hour]);</div><div class='del'>-	}</div><div class='del'>-              </div><div class='del'>-	/* FIXME the 5 is for the padding etable adds on */</div><div class='del'>-	mts-&gt;row_height = e_font_height (efont) + 5;</div><div class='del'>-	mts-&gt;col_width = max_hour_width + 6;</div><div class='del'>-</div><div class='del'>-	e_font_unref (efont);</div><div class='del'>-              </div><div class='del'>-	e_meeting_time_selector_save_position (mts, &amp;saved_time);</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_restore_position (mts, &amp;saved_time);</div><div class='del'>-              </div><div class='del'>-	gtk_widget_set_usize (mts-&gt;display_top, -1, mts-&gt;row_height * 3);</div><div class='del'>-</div><div class='del'>-	/* Calculate header height */</div><div class='del'>-	real_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (mts-&gt;etable));</div><div class='del'>-	eth = real_table-&gt;full_header;</div><div class='del'>-	numcols = e_table_header_count (eth);</div><div class='del'>-	maxheight = 0;</div><div class='del'>-	for (col = 0; col &lt; numcols; col++) {</div><div class='del'>-		ETableCol *ecol = e_table_header_get_column (eth, col);</div><div class='del'>-		int height;</div><div class='del'>-</div><div class='del'>-		height = e_table_header_compute_height (ecol, widget-&gt;style, font);</div><div class='del'>-</div><div class='del'>-		if (height &gt; maxheight)</div><div class='del'>-			maxheight = height;</div><div class='del'>-	}</div><div class='del'>-	/* FIXME the 5 is for the padding etable adds on */</div><div class='del'>-	gtk_widget_set_usize (mts-&gt;attendees_vbox_spacer, 1, mts-&gt;row_height * 3 - maxheight - 5);</div><div class='del'>-</div><div class='del'>-	GTK_LAYOUT (mts-&gt;display_main)-&gt;hadjustment-&gt;step_increment = mts-&gt;col_width;</div><div class='del'>-	GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment-&gt;step_increment = mts-&gt;row_height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This draws a shadow around the top display and main display. */</div><div class='del'>-static gint</div><div class='del'>-e_meeting_time_selector_expose_event (GtkWidget *widget,</div><div class='del'>-				      GdkEventExpose *event)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_draw_shadow (mts);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;expose_event)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;expose_event)(widget, event);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_draw (GtkWidget    *widget,</div><div class='del'>-			      GdkRectangle *area)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (widget);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_draw_shadow (mts);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;draw)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;draw)(widget, area);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	gint x, y, w, h;</div><div class='del'>-</div><div class='del'>-	widget = GTK_WIDGET (mts);</div><div class='del'>-</div><div class='del'>-	/* Draw the shadow around the graphical displays. */</div><div class='del'>-	x = mts-&gt;display_top-&gt;allocation.x - 2;</div><div class='del'>-	y = mts-&gt;display_top-&gt;allocation.y - 2;</div><div class='del'>-	w = mts-&gt;display_top-&gt;allocation.width + 4;</div><div class='del'>-	h = mts-&gt;display_top-&gt;allocation.height + mts-&gt;display_main-&gt;allocation.height + 4;</div><div class='del'>-</div><div class='del'>-	gtk_draw_shadow (widget-&gt;style, widget-&gt;window, GTK_STATE_NORMAL,</div><div class='del'>-			 GTK_SHADOW_IN, x, y, w, h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* When the main canvas scrolls, we scroll the other canvases. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-					     EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	adj = GTK_LAYOUT (mts-&gt;display_top)-&gt;hadjustment;</div><div class='del'>-	if (adj-&gt;value != adjustment-&gt;value) {</div><div class='del'>-		adj-&gt;value = adjustment-&gt;value;</div><div class='del'>-		gtk_adjustment_value_changed (adj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-					     EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (mts-&gt;etable));</div><div class='del'>-	if (adj-&gt;value != adjustment-&gt;value) {</div><div class='del'>-		adj-&gt;value = adjustment-&gt;value;</div><div class='del'>-		gtk_adjustment_value_changed (adj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_table_vadjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-						   EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	adj = GTK_LAYOUT (mts-&gt;display_main)-&gt;vadjustment;</div><div class='del'>-	if (adj-&gt;value != adjustment-&gt;value) {</div><div class='del'>-		adj-&gt;value = adjustment-&gt;value;</div><div class='del'>-		gtk_adjustment_value_changed (adj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-					  gint *start_year,</div><div class='del'>-					  gint *start_month,</div><div class='del'>-					  gint *start_day,</div><div class='del'>-					  gint *start_hour,</div><div class='del'>-					  gint *start_minute,</div><div class='del'>-					  gint *end_year,</div><div class='del'>-					  gint *end_month,</div><div class='del'>-					  gint *end_day,</div><div class='del'>-					  gint *end_hour,</div><div class='del'>-					  gint *end_minute)</div><div class='del'>-{</div><div class='del'>-	*start_year = g_date_year (&amp;mts-&gt;meeting_start_time.date);</div><div class='del'>-	*start_month = g_date_month (&amp;mts-&gt;meeting_start_time.date);</div><div class='del'>-	*start_day = g_date_day (&amp;mts-&gt;meeting_start_time.date);</div><div class='del'>-	*start_hour = mts-&gt;meeting_start_time.hour;</div><div class='del'>-	*start_minute = mts-&gt;meeting_start_time.minute;</div><div class='del'>-</div><div class='del'>-	*end_year = g_date_year (&amp;mts-&gt;meeting_end_time.date);</div><div class='del'>-	*end_month = g_date_month (&amp;mts-&gt;meeting_end_time.date);</div><div class='del'>-	*end_day = g_date_day (&amp;mts-&gt;meeting_end_time.date);</div><div class='del'>-	*end_hour = mts-&gt;meeting_end_time.hour;</div><div class='del'>-	*end_minute = mts-&gt;meeting_end_time.minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-					  gint start_year,</div><div class='del'>-					  gint start_month,</div><div class='del'>-					  gint start_day,</div><div class='del'>-					  gint start_hour,</div><div class='del'>-					  gint start_minute,</div><div class='del'>-					  gint end_year,</div><div class='del'>-					  gint end_month,</div><div class='del'>-					  gint end_day,</div><div class='del'>-					  gint end_hour,</div><div class='del'>-					  gint end_minute)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (IS_E_MEETING_TIME_SELECTOR (mts), FALSE);</div><div class='del'>-</div><div class='del'>-	/* Check the dates are valid. */</div><div class='del'>-	if (!g_date_valid_dmy (start_day, start_month, start_year)</div><div class='del'>-	    || !g_date_valid_dmy (end_day, end_month, end_year)</div><div class='del'>-	    || start_hour &lt; 0 || start_hour &gt; 23</div><div class='del'>-	    || end_hour &lt; 0 || end_hour &gt; 23</div><div class='del'>-	    || start_minute &lt; 0 || start_minute &gt; 59</div><div class='del'>-	    || end_minute &lt; 0 || end_minute &gt; 59)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_date_set_dmy (&amp;mts-&gt;meeting_start_time.date, start_day, start_month,</div><div class='del'>-			start_year);</div><div class='del'>-	mts-&gt;meeting_start_time.hour = start_hour;</div><div class='del'>-	mts-&gt;meeting_start_time.minute = start_minute;</div><div class='del'>-	g_date_set_dmy (&amp;mts-&gt;meeting_end_time.date, end_day, end_month,</div><div class='del'>-			end_year);</div><div class='del'>-	mts-&gt;meeting_end_time.hour = end_hour;</div><div class='del'>-	mts-&gt;meeting_end_time.minute = end_minute;</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-	/* Set the times in the EDateEdit widgets. */</div><div class='del'>-	e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-	e_meeting_time_selector_update_end_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,</div><div class='del'>-				     gboolean all_day)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime saved_time;</div><div class='del'>-</div><div class='del'>-	mts-&gt;all_day = all_day;</div><div class='del'>-	</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (mts-&gt;start_date_edit),</div><div class='del'>-				   !all_day);</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (mts-&gt;end_date_edit),</div><div class='del'>-				   !all_day);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_save_position (mts, &amp;saved_time);</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_restore_position (mts, &amp;saved_time);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-	e_meeting_time_selector_update_date_popup_menus (mts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,</div><div class='del'>-						gboolean working_hours_only)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime saved_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;working_hours_only == working_hours_only)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mts-&gt;working_hours_only = working_hours_only;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_save_position (mts, &amp;saved_time);</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_restore_position (mts, &amp;saved_time);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-	e_meeting_time_selector_update_date_popup_menus (mts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,</div><div class='del'>-					   gint day_start_hour,</div><div class='del'>-					   gint day_start_minute,</div><div class='del'>-					   gint day_end_hour,</div><div class='del'>-					   gint day_end_minute)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime saved_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;day_start_hour == day_start_hour</div><div class='del'>-	    &amp;&amp; mts-&gt;day_start_minute == day_start_minute</div><div class='del'>-	    &amp;&amp; mts-&gt;day_end_hour == day_end_hour</div><div class='del'>-	    &amp;&amp; mts-&gt;day_end_minute == day_end_minute)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mts-&gt;day_start_hour = day_start_hour;</div><div class='del'>-	mts-&gt;day_start_minute = day_start_minute;</div><div class='del'>-	mts-&gt;day_end_hour = day_end_hour;</div><div class='del'>-	mts-&gt;day_end_minute = day_end_minute;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_save_position (mts, &amp;saved_time);</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_restore_position (mts, &amp;saved_time);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-	e_meeting_time_selector_update_date_popup_menus (mts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,</div><div class='del'>-					gboolean zoomed_out)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime saved_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;zoomed_out == zoomed_out)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	mts-&gt;zoomed_out = zoomed_out;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_save_position (mts, &amp;saved_time);</div><div class='del'>-	e_meeting_time_selector_recalc_grid (mts);</div><div class='del'>-	e_meeting_time_selector_restore_position (mts, &amp;saved_time);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_refresh_cb (gpointer data) </div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts = data;</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_refresh_free_busy (EMeetingTimeSelector *mts, int row, gboolean all)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime start, end;</div><div class='del'>-	</div><div class='del'>-	start = mts-&gt;meeting_start_time;</div><div class='del'>-	g_date_subtract_days (&amp;start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE);</div><div class='del'>-	start.hour = 0;</div><div class='del'>-	start.minute = 0;</div><div class='del'>-	end = mts-&gt;meeting_end_time;</div><div class='del'>-	g_date_add_days (&amp;end.date, E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER);</div><div class='del'>-	end.hour = 0;</div><div class='del'>-	end.minute = 0;	</div><div class='del'>-</div><div class='del'>-	if (all)</div><div class='del'>-		e_meeting_model_refresh_all_busy_periods (mts-&gt;model, &amp;start, &amp;end, </div><div class='del'>-							  e_meeting_time_selector_refresh_cb, mts);</div><div class='del'>-	else</div><div class='del'>-		e_meeting_model_refresh_busy_periods (mts-&gt;model, row, &amp;start, &amp;end, </div><div class='del'>-						      e_meeting_time_selector_refresh_cb, mts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMeetingTimeSelectorAutopickOption</div><div class='del'>-e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	if (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_all_item)-&gt;active)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES;</div><div class='del'>-	if (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_all_people_one_resource_item)-&gt;active)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE;</div><div class='del'>-	if (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_required_people_item)-&gt;active)</div><div class='del'>-		return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE;</div><div class='del'>-	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,</div><div class='del'>-					     EMeetingTimeSelectorAutopickOption autopick_option)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-</div><div class='del'>-	switch (autopick_option) {</div><div class='del'>-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES:</div><div class='del'>-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_all_item), TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE:</div><div class='del'>-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_all_people_one_resource_item), TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE:</div><div class='del'>-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_required_people_item), TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE:</div><div class='del'>-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mts-&gt;autopick_required_people_one_resource_item), TRUE);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,</div><div class='del'>-						      gint row,</div><div class='del'>-						      gboolean send_meeting_to)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelectorAttendee *attendee;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-	g_return_if_fail (row &gt;= 0);</div><div class='del'>-	g_return_if_fail (row &lt; mts-&gt;attendees-&gt;len);</div><div class='del'>-</div><div class='del'>-	attendee = &amp;g_array_index (mts-&gt;attendees,</div><div class='del'>-				   EMeetingTimeSelectorAttendee, row);</div><div class='del'>-	attendee-&gt;send_meeting_to = send_meeting_to;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DEBUGGING ROUTINES - functions to output various bits of data.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef E_MEETING_TIME_SELECTOR_DEBUG</div><div class='del'>-</div><div class='del'>-/* Debugging function to dump information on all attendees. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_dump (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelectorAttendee *attendee;</div><div class='del'>-	EMeetingTimeSelectorPeriod *period;</div><div class='del'>-	gint row, period_num;</div><div class='del'>-	gchar buffer[128];</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_E_MEETING_TIME_SELECTOR (mts));</div><div class='del'>-</div><div class='del'>-	g_print ("\n\nAttendee Information:\n");</div><div class='del'>-</div><div class='del'>-	for (row = 0; row &lt; mts-&gt;attendees-&gt;len; row++) {</div><div class='del'>-		attendee = &amp;g_array_index (mts-&gt;attendees,</div><div class='del'>-					   EMeetingTimeSelectorAttendee, row);</div><div class='del'>-		g_print ("Attendee: %s\n", attendee-&gt;name);</div><div class='del'>-		g_print ("  Longest Busy Period: %i days\n",</div><div class='del'>-			 attendee-&gt;longest_period_in_days);</div><div class='del'>-</div><div class='del'>-		e_meeting_time_selector_attendee_ensure_periods_sorted (mts, attendee);</div><div class='del'>-#if 1</div><div class='del'>-		for (period_num = 0;</div><div class='del'>-		     period_num &lt; attendee-&gt;busy_periods-&gt;len;</div><div class='del'>-		     period_num++) {</div><div class='del'>-			period = &amp;g_array_index (attendee-&gt;busy_periods,</div><div class='del'>-						 EMeetingTimeSelectorPeriod,</div><div class='del'>-						 period_num);</div><div class='del'>-</div><div class='del'>-			/* These are just for debugging so don't need i18n. */</div><div class='del'>-			g_date_strftime (buffer, sizeof (buffer),</div><div class='del'>-					 "%A, %B %d, %Y", &amp;period-&gt;start.date);</div><div class='del'>-			g_print ("  Start: %s %i:%02i\n", buffer,</div><div class='del'>-				 period-&gt;start.hour, period-&gt;start.minute);</div><div class='del'>-</div><div class='del'>-			g_date_strftime (buffer, sizeof (buffer),</div><div class='del'>-					 "%A, %B %d, %Y", &amp;period-&gt;end.date);</div><div class='del'>-			g_print ("  End  : %s %i:%02i\n", buffer,</div><div class='del'>-				 period-&gt;end.hour, period-&gt;end.minute);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This formats a EMeetingTimein a string and returns it.</div><div class='del'>-   Note that it uses a static buffer. */</div><div class='del'>-gchar*</div><div class='del'>-e_meeting_time_selector_dump_time (EMeetingTime*mtstime)</div><div class='del'>-{</div><div class='del'>-	static gchar buffer[128];</div><div class='del'>-</div><div class='del'>-	gchar buffer2[128];</div><div class='del'>-</div><div class='del'>-	/* This is just for debugging so doesn't need i18n. */</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y",</div><div class='del'>-			 &amp;mtstime-&gt;date);</div><div class='del'>-	sprintf (buffer2, " at %i:%02i", (gint) mtstime-&gt;hour,</div><div class='del'>-		 (gint) mtstime-&gt;minute);</div><div class='del'>-	strcat (buffer, buffer2);</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This formats a GDate in a string and returns it.</div><div class='del'>-   Note that it uses a static buffer. */</div><div class='del'>-gchar*</div><div class='del'>-e_meeting_time_selector_dump_date (GDate *date)</div><div class='del'>-{</div><div class='del'>-	static gchar buffer[128];</div><div class='del'>-</div><div class='del'>-	/* This is just for debugging so doesn't need i18n. */</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer), "%A, %B %d, %Y", date);</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,</div><div class='del'>-							 EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	e_meeting_model_invite_others_dialog (mts-&gt;model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,</div><div class='del'>-						   EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gtk_menu_popup (GTK_MENU (mts-&gt;options_menu), NULL, NULL,</div><div class='del'>-			e_meeting_time_selector_options_menu_position_callback,</div><div class='del'>-			mts, 1, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,</div><div class='del'>-							gint *x,</div><div class='del'>-							gint *y,</div><div class='del'>-							gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	GtkRequisition menu_requisition;</div><div class='del'>-	gint max_x, max_y;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (user_data);</div><div class='del'>-</div><div class='del'>-	/* Calculate our preferred position. */</div><div class='del'>-	gdk_window_get_origin (mts-&gt;options_button-&gt;window, x, y);</div><div class='del'>-	*y += mts-&gt;options_button-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	/* Now make sure we are on the screen. */</div><div class='del'>-	gtk_widget_size_request (mts-&gt;options_menu, &amp;menu_requisition);</div><div class='del'>-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);</div><div class='del'>-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);</div><div class='del'>-	*x = CLAMP (*x, 0, max_x);</div><div class='del'>-	*y = CLAMP (*y, 0, max_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_update_free_busy (GtkWidget *button,</div><div class='del'>-					     EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the menu pops down, which doesn't happen by default if</div><div class='del'>-	   keyboard accelerators are used. */</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (mts-&gt;options_menu))</div><div class='del'>-		gtk_menu_popdown (GTK_MENU (mts-&gt;options_menu));</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,</div><div class='del'>-						    EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gtk_menu_popup (GTK_MENU (mts-&gt;autopick_menu), NULL, NULL,</div><div class='del'>-			e_meeting_time_selector_autopick_menu_position_callback,</div><div class='del'>-			mts, 1, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,</div><div class='del'>-							 gint *x,</div><div class='del'>-							 gint *y,</div><div class='del'>-							 gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	GtkRequisition menu_requisition;</div><div class='del'>-	gint max_x, max_y;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (user_data);</div><div class='del'>-</div><div class='del'>-	/* Calculate our preferred position. */</div><div class='del'>-	gdk_window_get_origin (mts-&gt;autopick_button-&gt;window, x, y);</div><div class='del'>-	*y += mts-&gt;autopick_button-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	/* Now make sure we are on the screen. */</div><div class='del'>-	gtk_widget_size_request (mts-&gt;autopick_menu, &amp;menu_requisition);</div><div class='del'>-	max_x = MAX (0, gdk_screen_width () - menu_requisition.width);</div><div class='del'>-	max_y = MAX (0, gdk_screen_height () - menu_requisition.height);</div><div class='del'>-	*x = CLAMP (*x, 0, max_x);</div><div class='del'>-	*y = CLAMP (*y, 0, max_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,</div><div class='del'>-						    EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the menu pops down, which doesn't happen by default if</div><div class='del'>-	   keyboard accelerators are used. */</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (mts-&gt;autopick_menu))</div><div class='del'>-		gtk_menu_popdown (GTK_MENU (mts-&gt;autopick_menu));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,</div><div class='del'>-						EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	e_meeting_time_selector_autopick (mts, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,</div><div class='del'>-						EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	e_meeting_time_selector_autopick (mts, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This tries to find the previous or next meeting time for which all</div><div class='del'>-   attendees will be available. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,</div><div class='del'>-				  gboolean forward)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime start_time, end_time, *resource_free;</div><div class='del'>-	EMeetingAttendee *attendee;</div><div class='del'>-	EMeetingFreeBusyPeriod *period;</div><div class='del'>-	EMeetingTimeSelectorAutopickOption autopick_option;</div><div class='del'>-	gint duration_days, duration_hours, duration_minutes, row;</div><div class='del'>-	gboolean meeting_time_ok, skip_optional = FALSE;</div><div class='del'>-	gboolean need_one_resource = FALSE, found_resource;</div><div class='del'>-</div><div class='del'>-	/* Get the current meeting duration in days + hours + minutes. */</div><div class='del'>-	e_meeting_time_selector_calculate_time_difference (&amp;mts-&gt;meeting_start_time, &amp;mts-&gt;meeting_end_time, &amp;duration_days, &amp;duration_hours, &amp;duration_minutes);</div><div class='del'>-	</div><div class='del'>-	/* Find the first appropriate start time. */</div><div class='del'>-	start_time = mts-&gt;meeting_start_time;</div><div class='del'>-	if (forward)</div><div class='del'>-		e_meeting_time_selector_find_nearest_interval (mts, &amp;start_time, &amp;end_time, duration_days, duration_hours, duration_minutes);</div><div class='del'>-	else</div><div class='del'>-		e_meeting_time_selector_find_nearest_interval_backward (mts, &amp;start_time, &amp;end_time, duration_days, duration_hours, duration_minutes);</div><div class='del'>-</div><div class='del'>-	/* Determine if we can skip optional people and if we only need one</div><div class='del'>-	   resource based on the autopick option. */</div><div class='del'>-	autopick_option = e_meeting_time_selector_get_autopick_option (mts);</div><div class='del'>-	if (autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE</div><div class='del'>-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)</div><div class='del'>-		skip_optional = TRUE;</div><div class='del'>-	if (autopick_option == E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE</div><div class='del'>-	    || autopick_option == E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE)</div><div class='del'>-		need_one_resource = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Keep moving forward or backward until we find a possible meeting</div><div class='del'>-	   time. */</div><div class='del'>-	for (;;) {</div><div class='del'>-		meeting_time_ok = TRUE;</div><div class='del'>-		found_resource = FALSE;</div><div class='del'>-		resource_free = NULL;</div><div class='del'>-</div><div class='del'>-		/* Step through each attendee, checking if the meeting time</div><div class='del'>-		   intersects one of the attendees busy periods. */</div><div class='del'>-		for (row = 0; row &lt;  e_meeting_model_count_actual_attendees (mts-&gt;model); row++) {</div><div class='del'>-			attendee = e_meeting_model_find_attendee_at_row (mts-&gt;model, row);</div><div class='del'>-</div><div class='del'>-			/* Skip optional people if they don't matter. */</div><div class='del'>-			if (skip_optional &amp;&amp; e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_OPTIONAL_PERSON)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			period = e_meeting_time_selector_find_time_clash (mts, attendee, &amp;start_time, &amp;end_time);</div><div class='del'>-</div><div class='del'>-			if (need_one_resource &amp;&amp; e_meeting_attendee_get_atype (attendee) == E_MEETING_ATTENDEE_RESOURCE) {</div><div class='del'>-				if (period) {</div><div class='del'>-					/* We want to remember the closest</div><div class='del'>-					   prev/next time that one resource is</div><div class='del'>-					   available, in case we don't find any</div><div class='del'>-					   free resources. */</div><div class='del'>-					if (forward) {</div><div class='del'>-						if (!resource_free || e_meeting_time_compare_times (resource_free, &amp;period-&gt;end) &gt; 0)</div><div class='del'>-							resource_free = &amp;period-&gt;end;</div><div class='del'>-					} else {</div><div class='del'>-						if (!resource_free || e_meeting_time_compare_times (resource_free, &amp;period-&gt;start) &lt; 0)</div><div class='del'>-							resource_free = &amp;period-&gt;start;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-				} else {</div><div class='del'>-					found_resource = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} else if (period) {</div><div class='del'>-				/* Skip the period which clashed. */</div><div class='del'>-				if (forward) {</div><div class='del'>-					start_time = period-&gt;end;</div><div class='del'>-				} else {</div><div class='del'>-					start_time = period-&gt;start;</div><div class='del'>-					e_meeting_time_selector_adjust_time (&amp;start_time, -duration_days, -duration_hours, -duration_minutes);</div><div class='del'>-				}</div><div class='del'>-				meeting_time_ok = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check that we found one resource if necessary. If not, skip</div><div class='del'>-		   to the closest time that a resource is free. Note that if</div><div class='del'>-		   there are no resources, resource_free will never get set,</div><div class='del'>-		   so we assume the meeting time is OK. */</div><div class='del'>-		if (meeting_time_ok &amp;&amp; need_one_resource &amp;&amp; !found_resource</div><div class='del'>-		    &amp;&amp; resource_free) {</div><div class='del'>-			if (forward) {</div><div class='del'>-				start_time = *resource_free;</div><div class='del'>-			} else {</div><div class='del'>-				start_time = *resource_free;</div><div class='del'>-				e_meeting_time_selector_adjust_time (&amp;start_time, -duration_days, -duration_hours, -duration_minutes);</div><div class='del'>-				}</div><div class='del'>-			meeting_time_ok = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (meeting_time_ok) {</div><div class='del'>-			mts-&gt;meeting_start_time = start_time;</div><div class='del'>-			mts-&gt;meeting_end_time = end_time;</div><div class='del'>-			mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-			gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-			gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-			/* Make sure the time is shown. */</div><div class='del'>-			e_meeting_time_selector_ensure_meeting_time_shown (mts);</div><div class='del'>-</div><div class='del'>-			/* Set the times in the EDateEdit widgets. */</div><div class='del'>-			e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-			e_meeting_time_selector_update_end_date_edit (mts);</div><div class='del'>-</div><div class='del'>-			gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Move forward to the next possible interval. */</div><div class='del'>-		if (forward)</div><div class='del'>-			e_meeting_time_selector_find_nearest_interval (mts, &amp;start_time, &amp;end_time, duration_days, duration_hours, duration_minutes);</div><div class='del'>-		else</div><div class='del'>-			e_meeting_time_selector_find_nearest_interval_backward (mts, &amp;start_time, &amp;end_time, duration_days, duration_hours, duration_minutes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,</div><div class='del'>-						   EMeetingTime*end,</div><div class='del'>-						   gint *days,</div><div class='del'>-						   gint *hours,</div><div class='del'>-						   gint *minutes)</div><div class='del'>-{</div><div class='del'>-	*days = g_date_julian (&amp;end-&gt;date) - g_date_julian (&amp;start-&gt;date);</div><div class='del'>-	*hours = end-&gt;hour - start-&gt;hour;</div><div class='del'>-	*minutes = end-&gt;minute - start-&gt;minute;</div><div class='del'>-	if (*minutes &lt; 0) {</div><div class='del'>-		*minutes += 60;</div><div class='del'>-		*hours = *hours - 1;</div><div class='del'>-	}</div><div class='del'>-	if (*hours &lt; 0) {</div><div class='del'>-		*hours += 24;</div><div class='del'>-		*days = *days - 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This moves the given time forward to the next suitable start of a meeting.</div><div class='del'>-   If zoomed_out is set, this means every hour. If not every half-hour. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,</div><div class='del'>-					       EMeetingTime*start_time,</div><div class='del'>-					       EMeetingTime*end_time,</div><div class='del'>-					       gint days, gint hours, gint mins)</div><div class='del'>-{</div><div class='del'>-	gint minutes_shown;</div><div class='del'>-	gboolean set_to_start_of_working_day = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!mts-&gt;all_day) {</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			start_time-&gt;hour++;</div><div class='del'>-			start_time-&gt;minute = 0;</div><div class='del'>-		} else {</div><div class='del'>-			start_time-&gt;minute += 30;</div><div class='del'>-			start_time-&gt;minute -= start_time-&gt;minute % 30;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_date_add_days (&amp;start_time-&gt;date, 1);</div><div class='del'>-		start_time-&gt;hour = 0;</div><div class='del'>-		start_time-&gt;minute = 0;	</div><div class='del'>-	}</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (start_time);</div><div class='del'>-	</div><div class='del'>-	*end_time = *start_time;</div><div class='del'>-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);</div><div class='del'>-</div><div class='del'>-	/* Check if the interval is less than a day as seen in the display.</div><div class='del'>-	   If it isn't we don't worry about the working day. */</div><div class='del'>-	if (!mts-&gt;working_hours_only || days &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-	minutes_shown = (mts-&gt;day_end_hour - mts-&gt;day_start_hour) * 60;</div><div class='del'>-	minutes_shown += mts-&gt;day_end_minute - mts-&gt;day_start_minute;</div><div class='del'>-	if (hours * 60 + mins &gt; minutes_shown)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If the meeting time finishes past the end of the working day, move</div><div class='del'>-	   onto the start of the next working day. If the meeting time starts</div><div class='del'>-	   before the working day, move it on as well. */</div><div class='del'>-	if (start_time-&gt;hour &gt; mts-&gt;day_end_hour</div><div class='del'>-	    || (start_time-&gt;hour == mts-&gt;day_end_hour</div><div class='del'>-		&amp;&amp; start_time-&gt;minute &gt; mts-&gt;day_end_minute)</div><div class='del'>-	    || end_time-&gt;hour &gt; mts-&gt;day_end_hour</div><div class='del'>-	    || (end_time-&gt;hour == mts-&gt;day_end_hour</div><div class='del'>-		&amp;&amp; end_time-&gt;minute &gt; mts-&gt;day_end_minute)) {</div><div class='del'>-		g_date_add_days (&amp;start_time-&gt;date, 1);</div><div class='del'>-		set_to_start_of_working_day = TRUE;</div><div class='del'>-	} else if (start_time-&gt;hour &lt; mts-&gt;day_start_hour</div><div class='del'>-		   || (start_time-&gt;hour == mts-&gt;day_start_hour</div><div class='del'>-		       &amp;&amp; start_time-&gt;minute &lt; mts-&gt;day_start_minute)) {</div><div class='del'>-		set_to_start_of_working_day = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_to_start_of_working_day) {</div><div class='del'>-		start_time-&gt;hour = mts-&gt;day_start_hour;</div><div class='del'>-		start_time-&gt;minute = mts-&gt;day_start_minute;</div><div class='del'>-</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			if (start_time-&gt;minute &gt; 0) {</div><div class='del'>-				start_time-&gt;hour++;</div><div class='del'>-				start_time-&gt;minute = 0;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			start_time-&gt;minute += 29;</div><div class='del'>-			start_time-&gt;minute -= start_time-&gt;minute % 30;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_meeting_time_selector_fix_time_overflows (start_time);</div><div class='del'>-</div><div class='del'>-		*end_time = *start_time;</div><div class='del'>-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This moves the given time backward to the next suitable start of a meeting.</div><div class='del'>-   If zoomed_out is set, this means every hour. If not every half-hour. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mts,</div><div class='del'>-							EMeetingTime*start_time,</div><div class='del'>-							EMeetingTime*end_time,</div><div class='del'>-							gint days, gint hours, gint mins)</div><div class='del'>-{</div><div class='del'>-	gint new_hour, minutes_shown;</div><div class='del'>-	gboolean set_to_end_of_working_day = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!mts-&gt;all_day) {</div><div class='del'>-		new_hour = start_time-&gt;hour;</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			if (start_time-&gt;minute == 0)</div><div class='del'>-				new_hour--;</div><div class='del'>-			start_time-&gt;minute = 0;</div><div class='del'>-		} else {</div><div class='del'>-			if (start_time-&gt;minute == 0) {</div><div class='del'>-				start_time-&gt;minute = 30;</div><div class='del'>-				new_hour--;</div><div class='del'>-			} else if (start_time-&gt;minute &lt;= 30)</div><div class='del'>-				start_time-&gt;minute = 0;</div><div class='del'>-			else</div><div class='del'>-				start_time-&gt;minute = 30;</div><div class='del'>-		}</div><div class='del'>-		if (new_hour &lt; 0) {</div><div class='del'>-			new_hour += 24;</div><div class='del'>-			g_date_subtract_days (&amp;start_time-&gt;date, 1);</div><div class='del'>-		}</div><div class='del'>-		start_time-&gt;hour = new_hour;</div><div class='del'>-	} else {</div><div class='del'>-		g_date_subtract_days (&amp;start_time-&gt;date, 1);</div><div class='del'>-		start_time-&gt;hour = 0;</div><div class='del'>-		start_time-&gt;minute = 0;	</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*end_time = *start_time;</div><div class='del'>-	e_meeting_time_selector_adjust_time (end_time, days, hours, mins);</div><div class='del'>-</div><div class='del'>-	/* Check if the interval is less than a day as seen in the display.</div><div class='del'>-	   If it isn't we don't worry about the working day. */</div><div class='del'>-	if (!mts-&gt;working_hours_only || days &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-	minutes_shown = (mts-&gt;day_end_hour - mts-&gt;day_start_hour) * 60;</div><div class='del'>-	minutes_shown += mts-&gt;day_end_minute - mts-&gt;day_start_minute;</div><div class='del'>-	if (hours * 60 + mins &gt; minutes_shown)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If the meeting time finishes past the end of the working day, move</div><div class='del'>-	   back to the end of the working day. If the meeting time starts</div><div class='del'>-	   before the working day, move it back to the end of the previous</div><div class='del'>-	   working day. */</div><div class='del'>-	if (start_time-&gt;hour &gt; mts-&gt;day_end_hour</div><div class='del'>-	    || (start_time-&gt;hour == mts-&gt;day_end_hour</div><div class='del'>-		&amp;&amp; start_time-&gt;minute &gt; mts-&gt;day_end_minute)</div><div class='del'>-	    || end_time-&gt;hour &gt; mts-&gt;day_end_hour</div><div class='del'>-	    || (end_time-&gt;hour == mts-&gt;day_end_hour</div><div class='del'>-		&amp;&amp; end_time-&gt;minute &gt; mts-&gt;day_end_minute)) {</div><div class='del'>-		set_to_end_of_working_day = TRUE;</div><div class='del'>-	} else if (start_time-&gt;hour &lt; mts-&gt;day_start_hour</div><div class='del'>-		   || (start_time-&gt;hour == mts-&gt;day_start_hour</div><div class='del'>-		       &amp;&amp; start_time-&gt;minute &lt; mts-&gt;day_start_minute)) {</div><div class='del'>-		g_date_subtract_days (&amp;end_time-&gt;date, 1);</div><div class='del'>-		set_to_end_of_working_day = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_to_end_of_working_day) {</div><div class='del'>-		end_time-&gt;hour = mts-&gt;day_end_hour;</div><div class='del'>-		end_time-&gt;minute = mts-&gt;day_end_minute;</div><div class='del'>-		*start_time = *end_time;</div><div class='del'>-		e_meeting_time_selector_adjust_time (start_time, -days, -hours, -mins);</div><div class='del'>-</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			start_time-&gt;minute = 0;</div><div class='del'>-		} else {</div><div class='del'>-			start_time-&gt;minute -= start_time-&gt;minute % 30;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		*end_time = *start_time;</div><div class='del'>-		e_meeting_time_selector_adjust_time (end_time, days, hours, mins);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds on the given days, hours &amp; minutes to a EMeetingTimeSelectorTime.</div><div class='del'>-   It is used to calculate the end of a period given a start &amp; duration.</div><div class='del'>-   Days, hours &amp; minutes can be negative, to move backwards, but they should</div><div class='del'>-   be within normal ranges, e.g. hours should be between -23 and 23. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,</div><div class='del'>-				     gint days, gint hours, gint minutes)</div><div class='del'>-{</div><div class='del'>-	gint new_hours, new_minutes;</div><div class='del'>-</div><div class='del'>-	/* We have to handle negative values for hous and minutes here, since</div><div class='del'>-	   EMeetingTimeuses guint8s to store them. */</div><div class='del'>-	new_minutes = mtstime-&gt;minute + minutes;</div><div class='del'>-	if (new_minutes &lt; 0) {</div><div class='del'>-		new_minutes += 60;</div><div class='del'>-		hours -= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_hours = mtstime-&gt;hour + hours;</div><div class='del'>-	if (new_hours &lt; 0) {</div><div class='del'>-		new_hours += 24;</div><div class='del'>-		days -= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_date_add_days (&amp;mtstime-&gt;date, days);</div><div class='del'>-	mtstime-&gt;hour = new_hours;</div><div class='del'>-	mtstime-&gt;minute = new_minutes;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (mtstime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This looks for any busy period of the given attendee which clashes with</div><div class='del'>-   the start and end time. It uses a binary search. */</div><div class='del'>-static EMeetingFreeBusyPeriod *</div><div class='del'>-e_meeting_time_selector_find_time_clash (EMeetingTimeSelector *mts,</div><div class='del'>-					 EMeetingAttendee *attendee,</div><div class='del'>-					 EMeetingTime*start_time,</div><div class='del'>-					 EMeetingTime*end_time)</div><div class='del'>-{</div><div class='del'>-	EMeetingFreeBusyPeriod *period;</div><div class='del'>-	const GArray *busy_periods;</div><div class='del'>-	gint period_num;</div><div class='del'>-</div><div class='del'>-	busy_periods = e_meeting_attendee_get_busy_periods (attendee);</div><div class='del'>-	period_num = e_meeting_attendee_find_first_busy_period (attendee, &amp;start_time-&gt;date);</div><div class='del'>-</div><div class='del'>-	if (period_num == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Step forward through the busy periods until we find a clash or we</div><div class='del'>-	   go past the end_time. */</div><div class='del'>-	while (period_num &lt; busy_periods-&gt;len) {</div><div class='del'>-		period = &amp;g_array_index (busy_periods,  EMeetingFreeBusyPeriod, period_num);</div><div class='del'>-</div><div class='del'>-		/* If the period starts at or after the end time, there is no</div><div class='del'>-		   clash and we are finished. The busy periods are sorted by</div><div class='del'>-		   their start times, so all the rest will be later. */</div><div class='del'>-		if (e_meeting_time_compare_times (&amp;period-&gt;start, end_time) &gt;= 0)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		/* If the period ends after the start time, we have found a</div><div class='del'>-		   clash. From the above test we already know the busy period</div><div class='del'>-		   isn't completely after the meeting time. */</div><div class='del'>-		if (e_meeting_time_compare_times (&amp;period-&gt;end, start_time) &gt; 0)</div><div class='del'>-			return period;</div><div class='del'>-</div><div class='del'>-		period_num++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,</div><div class='del'>-					       EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the menu pops down, which doesn't happen by default if</div><div class='del'>-	   keyboard accelerators are used. */</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (mts-&gt;options_menu))</div><div class='del'>-		gtk_menu_popdown (GTK_MENU (mts-&gt;options_menu));</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_set_zoomed_out (mts, GTK_CHECK_MENU_ITEM (menuitem)-&gt;active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,</div><div class='del'>-						  EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	/* Make sure the menu pops down, which doesn't happen by default if</div><div class='del'>-	   keyboard accelerators are used. */</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (mts-&gt;options_menu))</div><div class='del'>-		gtk_menu_popdown (GTK_MENU (mts-&gt;options_menu));</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_set_working_hours_only (mts, GTK_CHECK_MENU_ITEM (menuitem)-&gt;active);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates day_width, first_hour_shown and last_hour_shown. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	if (mts-&gt;working_hours_only) {</div><div class='del'>-		mts-&gt;first_hour_shown = mts-&gt;day_start_hour;</div><div class='del'>-		mts-&gt;last_hour_shown = mts-&gt;day_end_hour;</div><div class='del'>-		if (mts-&gt;day_end_minute != 0)</div><div class='del'>-			mts-&gt;last_hour_shown += 1;</div><div class='del'>-	} else {</div><div class='del'>-		mts-&gt;first_hour_shown = 0;</div><div class='del'>-		mts-&gt;last_hour_shown = 24;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* In the brief view we use the nearest hours divisible by 3. */</div><div class='del'>-	if (mts-&gt;zoomed_out) {</div><div class='del'>-		mts-&gt;first_hour_shown -= mts-&gt;first_hour_shown % 3;</div><div class='del'>-		mts-&gt;last_hour_shown += 2;</div><div class='del'>-		mts-&gt;last_hour_shown -= mts-&gt;last_hour_shown % 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mts-&gt;day_width = mts-&gt;col_width	* (mts-&gt;last_hour_shown - mts-&gt;first_hour_shown);</div><div class='del'>-	if (mts-&gt;zoomed_out)</div><div class='del'>-		mts-&gt;day_width /= 3;</div><div class='del'>-</div><div class='del'>-	/* Add one pixel for the extra vertical grid line. */</div><div class='del'>-	mts-&gt;day_width++;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts-&gt;display_top),</div><div class='del'>-					0, 0,</div><div class='del'>-					mts-&gt;day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,</div><div class='del'>-					mts-&gt;row_height * 3);</div><div class='del'>-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_recalc_date_format (mts);</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This saves the first visible time in the given EMeetingTimeSelectorTime. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,</div><div class='del'>-				       EMeetingTime*mtstime)</div><div class='del'>-{</div><div class='del'>-	gint scroll_x, scroll_y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This restores a saved position. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,</div><div class='del'>-					  EMeetingTime*mtstime)</div><div class='del'>-{</div><div class='del'>-	gint scroll_x, scroll_y, new_scroll_x;</div><div class='del'>-</div><div class='del'>-	new_scroll_x = e_meeting_time_selector_calculate_time_position (mts,</div><div class='del'>-								      mtstime);</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-				new_scroll_x, scroll_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This returns the x pixel coords of the meeting time in the entire scroll</div><div class='del'>-   region. It recalculates them if they have been marked as invalid.</div><div class='del'>-   If it returns FALSE then no meeting time is set or the meeting time is</div><div class='del'>-   not visible in the current scroll area. */</div><div class='del'>-gboolean</div><div class='del'>-e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,</div><div class='del'>-						    gint *start_x,</div><div class='del'>-						    gint *end_x)</div><div class='del'>-{</div><div class='del'>-	if (mts-&gt;meeting_positions_valid) {</div><div class='del'>-		if (mts-&gt;meeting_positions_in_scroll_area) {</div><div class='del'>-			*start_x = mts-&gt;meeting_start_x;</div><div class='del'>-			*end_x = mts-&gt;meeting_end_x;</div><div class='del'>-			return TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_valid = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Check if the days aren't in our current range. */</div><div class='del'>-	if (g_date_compare (&amp;mts-&gt;meeting_start_time.date, &amp;mts-&gt;last_date_shown) &gt; 0</div><div class='del'>-	    || g_date_compare (&amp;mts-&gt;meeting_end_time.date, &amp;mts-&gt;first_date_shown) &lt; 0) {</div><div class='del'>-		mts-&gt;meeting_positions_in_scroll_area = FALSE;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_in_scroll_area = TRUE;</div><div class='del'>-	*start_x = mts-&gt;meeting_start_x = e_meeting_time_selector_calculate_time_position (mts, &amp;mts-&gt;meeting_start_time);</div><div class='del'>-	*end_x = mts-&gt;meeting_end_x = e_meeting_time_selector_calculate_time_position (mts, &amp;mts-&gt;meeting_end_time);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the date format to used, by computing the width of the</div><div class='del'>-   longest date strings in the widget's font and seeing if they fit. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	/* An array of dates, one for each month in the year 2000. They must</div><div class='del'>-	   all be Sundays. */</div><div class='del'>-	static const int days[12] = { 23, 20, 19, 23, 21, 18,</div><div class='del'>-				      23, 20, 17, 22, 19, 24 };</div><div class='del'>-	GDate date;</div><div class='del'>-	gint max_date_width, longest_weekday_width, longest_month_width, width;</div><div class='del'>-	gint day, longest_weekday, month, longest_month;</div><div class='del'>-	gchar buffer[128];</div><div class='del'>-	GdkFont *font;</div><div class='del'>-</div><div class='del'>-	font = GTK_WIDGET (mts)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Calculate the maximum date width we can fit into the display. */</div><div class='del'>-	max_date_width = mts-&gt;day_width - 2;</div><div class='del'>-</div><div class='del'>-	/* Find the biggest full weekday name. We start on a particular</div><div class='del'>-	   Monday and go through seven days. */</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */</div><div class='del'>-	longest_weekday_width = 0;</div><div class='del'>-	longest_weekday = G_DATE_MONDAY;</div><div class='del'>-	for (day = G_DATE_MONDAY; day &lt;= G_DATE_SUNDAY; day++) {</div><div class='del'>-		g_date_strftime (buffer, sizeof (buffer), "%A", &amp;date);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_weekday_width) {</div><div class='del'>-			longest_weekday = day;</div><div class='del'>-			longest_weekday_width = width;</div><div class='del'>-		}</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now find the biggest month name. */</div><div class='del'>-	longest_month_width = 0;</div><div class='del'>-	longest_month = G_DATE_JANUARY;</div><div class='del'>-	for (month = G_DATE_JANUARY; month &lt;= G_DATE_DECEMBER; month++) {</div><div class='del'>-		g_date_set_month (&amp;date, month);</div><div class='del'>-		g_date_strftime (buffer, sizeof (buffer), "%B", &amp;date);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_month_width) {</div><div class='del'>-			longest_month = month;</div><div class='del'>-			longest_month_width = width;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if we can use the full date. We want to use a date with a</div><div class='del'>-	   month day &gt; 20 and also the longest weekday. We use a</div><div class='del'>-	   pre-calculated array of days for each month and add on the</div><div class='del'>-	   weekday (which is 1 (Mon) to 7 (Sun). */</div><div class='del'>-	g_date_set_dmy (&amp;date, days[longest_month - 1] + longest_weekday,</div><div class='del'>-			longest_month, 2000);</div><div class='del'>-	/* This is a strftime() format string %A = full weekday name,</div><div class='del'>-	   %B = full month name, %d = month day, %Y = full year. */</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer), _("%A, %B %d, %Y"), &amp;date);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",</div><div class='del'>-		 longest_month, longest_weekday, buffer);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_date_width) {</div><div class='del'>-		mts-&gt;date_format = E_MEETING_TIME_SELECTOR_DATE_FULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now try it with abbreviated weekday names. */</div><div class='del'>-	longest_weekday_width = 0;</div><div class='del'>-	longest_weekday = G_DATE_MONDAY;</div><div class='del'>-	g_date_set_dmy (&amp;date, 3, 1, 2000);	/* Monday 3rd Jan 2000. */</div><div class='del'>-	for (day = G_DATE_MONDAY; day &lt;= G_DATE_SUNDAY; day++) {</div><div class='del'>-		g_date_strftime (buffer, sizeof (buffer), "%a", &amp;date);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_weekday_width) {</div><div class='del'>-			longest_weekday = day;</div><div class='del'>-			longest_weekday_width = width;</div><div class='del'>-		}</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_date_set_dmy (&amp;date, days[longest_month - 1] + longest_weekday,</div><div class='del'>-			longest_month, 2000);</div><div class='del'>-	/* This is a strftime() format string %a = abbreviated weekday name,</div><div class='del'>-	   %m = month number, %d = month day, %Y = full year. */</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer), _("%a %m/%d/%Y"), &amp;date);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("longest_month: %i longest_weekday: %i date: %s\n",</div><div class='del'>-		 longest_month, longest_weekday, buffer);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_date_width)</div><div class='del'>-		mts-&gt;date_format = E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY;</div><div class='del'>-	else</div><div class='del'>-		mts-&gt;date_format = E_MEETING_TIME_SELECTOR_DATE_SHORT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Turn off the background of the canvas windows. This reduces flicker</div><div class='del'>-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,</div><div class='del'>-					    EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-				    NULL, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is called when the meeting start time GnomeDateEdit is changed,</div><div class='del'>-   either via the "date_changed". "time_changed" or "activate" signals on one</div><div class='del'>-   of the GtkEntry widgets. So don't use the widget parameter since it may be</div><div class='del'>-   one of the child GtkEntry widgets. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,</div><div class='del'>-					       EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gint duration_days, duration_hours, duration_minutes;</div><div class='del'>-	EMeetingTime mtstime;</div><div class='del'>-	gint hour = 0, minute = 0;</div><div class='del'>-	time_t newtime;</div><div class='del'>-</div><div class='del'>-	/* Date */</div><div class='del'>-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts-&gt;start_date_edit));</div><div class='del'>-	g_date_clear (&amp;mtstime.date, 1);</div><div class='del'>-	g_date_set_time (&amp;mtstime.date, newtime);</div><div class='del'>-</div><div class='del'>-	/* Time */</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts-&gt;start_date_edit), &amp;hour, &amp;minute);</div><div class='del'>-	mtstime.hour = hour;</div><div class='del'>-	mtstime.minute = minute;</div><div class='del'>-</div><div class='del'>-	/* If the time hasn't changed, just return. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;mtstime, &amp;mts-&gt;meeting_start_time) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Calculate the current meeting duration. */</div><div class='del'>-	e_meeting_time_selector_calculate_time_difference (&amp;mts-&gt;meeting_start_time, &amp;mts-&gt;meeting_end_time, &amp;duration_days, &amp;duration_hours, &amp;duration_minutes);</div><div class='del'>-</div><div class='del'>-	/* Set the new start time. */</div><div class='del'>-	mts-&gt;meeting_start_time = mtstime;</div><div class='del'>-</div><div class='del'>-	/* Update the end time so the meeting duration stays the same. */</div><div class='del'>-	mts-&gt;meeting_end_time = mts-&gt;meeting_start_time;</div><div class='del'>-	e_meeting_time_selector_adjust_time (&amp;mts-&gt;meeting_end_time, duration_days, duration_hours, duration_minutes);</div><div class='del'>-	e_meeting_time_selector_update_end_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-	e_meeting_time_selector_ensure_meeting_time_shown (mts);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is called when the meeting end time GnomeDateEdit is changed,</div><div class='del'>-   either via the "date_changed", "time_changed" or "activate" signals on one</div><div class='del'>-   of the GtkEntry widgets. So don't use the widget parameter since it may be</div><div class='del'>-   one of the child GtkEntry widgets. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,</div><div class='del'>-					     EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime mtstime;</div><div class='del'>-	gint hour = 0, minute = 0;</div><div class='del'>-	time_t newtime;</div><div class='del'>-</div><div class='del'>-	/* Date */</div><div class='del'>-	newtime = e_date_edit_get_time (E_DATE_EDIT (mts-&gt;end_date_edit));</div><div class='del'>-	g_date_clear (&amp;mtstime.date, 1);</div><div class='del'>-	g_date_set_time (&amp;mtstime.date, newtime);</div><div class='del'>-	if (mts-&gt;all_day)</div><div class='del'>-		g_date_add_days (&amp;mtstime.date, 1);</div><div class='del'>-</div><div class='del'>-	/* Time */</div><div class='del'>-	e_date_edit_get_time_of_day (E_DATE_EDIT (mts-&gt;end_date_edit), &amp;hour, &amp;minute);</div><div class='del'>-	mtstime.hour = hour;</div><div class='del'>-	mtstime.minute = minute;</div><div class='del'>-</div><div class='del'>-	/* If the time hasn't changed, just return. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;mtstime, &amp;mts-&gt;meeting_end_time) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set the new end time. */</div><div class='del'>-	mts-&gt;meeting_end_time = mtstime;</div><div class='del'>-</div><div class='del'>-	/* If the start time is after the end time, set it to the same time. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;mtstime, &amp;mts-&gt;meeting_start_time) &lt;= 0) {</div><div class='del'>-		/* We set it first, before updating the widget, so the signal</div><div class='del'>-		   handler will just return. */</div><div class='del'>-		mts-&gt;meeting_start_time = mtstime;</div><div class='del'>-		if (mts-&gt;all_day)</div><div class='del'>-			g_date_subtract_days (&amp;mts-&gt;meeting_start_time.date, 1);</div><div class='del'>-		e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-	e_meeting_time_selector_ensure_meeting_time_shown (mts);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the ranges shown in the GnomeDateEdit popup menus, according</div><div class='del'>-   to working_hours_only etc. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	EDateEdit *start_edit, *end_edit;</div><div class='del'>-	gint low_hour, high_hour;</div><div class='del'>-</div><div class='del'>-	start_edit = E_DATE_EDIT (mts-&gt;start_date_edit);</div><div class='del'>-	end_edit = E_DATE_EDIT (mts-&gt;end_date_edit);</div><div class='del'>-</div><div class='del'>-	if (mts-&gt;working_hours_only) {</div><div class='del'>-		low_hour = mts-&gt;day_start_hour;</div><div class='del'>-		high_hour = mts-&gt;day_end_hour;</div><div class='del'>-	} else {</div><div class='del'>-		low_hour = 0;</div><div class='del'>-		high_hour = 23;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time_popup_range (start_edit, low_hour, high_hour);</div><div class='del'>-	e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,</div><div class='del'>-						 GtkAllocation *allocation,</div><div class='del'>-						 EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_ensure_meeting_time_shown (mts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This updates the canvas scroll regions according to the number of attendees.</div><div class='del'>-   If the total height needed is less than the height of the canvas, we must</div><div class='del'>-   use the height of the canvas, or it causes problems. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gint height, canvas_height;</div><div class='del'>-</div><div class='del'>-	height = mts-&gt;row_height * (e_meeting_model_count_actual_attendees (mts-&gt;model) + 2);</div><div class='del'>-	canvas_height = GTK_WIDGET (mts-&gt;display_main)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	height = MAX (height,  canvas_height);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					0, 0,</div><div class='del'>-					mts-&gt;day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN,</div><div class='del'>-					height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This changes the meeting time based on the given x coordinate and whether</div><div class='del'>-   we are dragging the start or end bar. It returns the new position, which</div><div class='del'>-   will be swapped if the start bar is dragged past the end bar or vice versa.</div><div class='del'>-   It make sure the meeting time is never dragged outside the visible canvas</div><div class='del'>-   area. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-					   gint x)</div><div class='del'>-{</div><div class='del'>-	EMeetingTime first_time, last_time, drag_time, *time_to_set;</div><div class='del'>-	gint scroll_x, scroll_y, canvas_width;</div><div class='del'>-	gboolean set_both_times = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the x coords of visible part of the canvas. */</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_width = mts-&gt;display_main-&gt;allocation.width;</div><div class='del'>-</div><div class='del'>-	/* Save the x coordinate for the timeout handler. */</div><div class='del'>-	mts-&gt;last_drag_x = (x &lt; scroll_x) ? x - scroll_x</div><div class='del'>-		: x - scroll_x - canvas_width + 1;</div><div class='del'>-</div><div class='del'>-	/* Check if the mouse is off the edge of the canvas. */</div><div class='del'>-	if (x &lt; scroll_x || x &gt; scroll_x + canvas_width) {</div><div class='del'>-		/* If we haven't added a timeout function, add one. */</div><div class='del'>-		if (mts-&gt;auto_scroll_timeout_id == 0) {</div><div class='del'>-			mts-&gt;auto_scroll_timeout_id = g_timeout_add (60, e_meeting_time_selector_timeout_handler, mts);</div><div class='del'>-			mts-&gt;scroll_count = 0;</div><div class='del'>-</div><div class='del'>-			/* Call the handler to start scrolling now. */</div><div class='del'>-			e_meeting_time_selector_timeout_handler (mts);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_meeting_time_selector_remove_timeout (mts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the minimum &amp; maximum times we can use, based on the</div><div class='del'>-	   scroll offsets and whether zoomed_out is set. */</div><div class='del'>-	e_meeting_time_selector_calculate_time (mts, scroll_x, &amp;first_time);</div><div class='del'>-	e_meeting_time_selector_calculate_time (mts, scroll_x + canvas_width - 1,</div><div class='del'>-						&amp;last_time);</div><div class='del'>-	if (!mts-&gt;all_day) {</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			if (first_time.minute &gt; 30)</div><div class='del'>-				first_time.hour++;</div><div class='del'>-			first_time.minute = 0;</div><div class='del'>-			last_time.minute = 0;</div><div class='del'>-		} else {</div><div class='del'>-			first_time.minute += 15;</div><div class='del'>-			first_time.minute -= first_time.minute % 30;</div><div class='del'>-			last_time.minute -= last_time.minute % 30;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (first_time.hour &gt; 0 || first_time.minute &gt; 0)</div><div class='del'>-			g_date_add_days (&amp;first_time.date, 1);</div><div class='del'>-		first_time.hour = 0;</div><div class='del'>-		first_time.minute = 0;</div><div class='del'>-		last_time.hour = 0;</div><div class='del'>-		last_time.minute = 0;</div><div class='del'>-	}</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (&amp;first_time);</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (&amp;last_time);</div><div class='del'>-</div><div class='del'>-	/* Calculate the time from x coordinate. */</div><div class='del'>-	e_meeting_time_selector_calculate_time (mts, x, &amp;drag_time);</div><div class='del'>-</div><div class='del'>-	/* Calculate the nearest half-hour or hour, depending on whether</div><div class='del'>-	   zoomed_out is set. */</div><div class='del'>-	if (!mts-&gt;all_day) {</div><div class='del'>-		if (mts-&gt;zoomed_out) {</div><div class='del'>-			if (drag_time.minute &gt; 30)</div><div class='del'>-				drag_time.hour++;</div><div class='del'>-			drag_time.minute = 0;</div><div class='del'>-		} else {</div><div class='del'>-			drag_time.minute += 15;</div><div class='del'>-			drag_time.minute -= drag_time.minute % 30;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (drag_time.hour &gt; 12)</div><div class='del'>-			g_date_add_days (&amp;drag_time.date, 1);</div><div class='del'>-		drag_time.hour = 0;</div><div class='del'>-		drag_time.minute = 0;		</div><div class='del'>-	}</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (&amp;drag_time);</div><div class='del'>-</div><div class='del'>-	/* Now make sure we are between first_time &amp; last_time. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;drag_time, &amp;first_time) &lt; 0)</div><div class='del'>-		drag_time = first_time;</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;drag_time, &amp;last_time) &gt; 0)</div><div class='del'>-		drag_time = last_time;</div><div class='del'>-</div><div class='del'>-	/* Set the meeting start or end time to drag_time. */</div><div class='del'>-	if (mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		time_to_set = &amp;mts-&gt;meeting_start_time;</div><div class='del'>-	else</div><div class='del'>-		time_to_set = &amp;mts-&gt;meeting_end_time;</div><div class='del'>-</div><div class='del'>-	/* If the time is unchanged, just return. */</div><div class='del'>-	if (e_meeting_time_compare_times (time_to_set, &amp;drag_time) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Don't let an empty occur for all day events */</div><div class='del'>-	if (mts-&gt;all_day</div><div class='del'>-	    &amp;&amp; mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START</div><div class='del'>-	    &amp;&amp; e_meeting_time_compare_times (&amp;mts-&gt;meeting_end_time, &amp;drag_time) == 0)</div><div class='del'>-		return;</div><div class='del'>-	else if (mts-&gt;all_day</div><div class='del'>-		&amp;&amp; mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END</div><div class='del'>-		&amp;&amp; e_meeting_time_compare_times (&amp;mts-&gt;meeting_start_time, &amp;drag_time) == 0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	*time_to_set = drag_time;</div><div class='del'>-</div><div class='del'>-	/* Check if the start time and end time need to be switched. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;mts-&gt;meeting_start_time,</div><div class='del'>-						   &amp;mts-&gt;meeting_end_time) &gt; 0) {</div><div class='del'>-		drag_time = mts-&gt;meeting_start_time;</div><div class='del'>-		mts-&gt;meeting_start_time = mts-&gt;meeting_end_time;</div><div class='del'>-		mts-&gt;meeting_end_time = drag_time;</div><div class='del'>-</div><div class='del'>-		if (mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-			mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_END;</div><div class='del'>-		else</div><div class='del'>-			mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_START;</div><div class='del'>-</div><div class='del'>-		set_both_times = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	/* Mark the calculated positions as invalid. */</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Redraw the canvases. */</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-	/* Set the times in the GnomeDateEdit widgets. */</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END)</div><div class='del'>-		e_meeting_time_selector_update_end_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is the timeout function which handles auto-scrolling when the user is</div><div class='del'>-   dragging one of the meeting time vertical bars outside the left or right</div><div class='del'>-   edge of the canvas. */</div><div class='del'>-static gboolean</div><div class='del'>-e_meeting_time_selector_timeout_handler (gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTime drag_time, *time_to_set;</div><div class='del'>-	gint scroll_x, max_scroll_x, scroll_y, canvas_width;</div><div class='del'>-	gint scroll_speed, scroll_offset;</div><div class='del'>-	gboolean set_both_times = FALSE;</div><div class='del'>-</div><div class='del'>-	mts = E_MEETING_TIME_SELECTOR (data);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	/* Return if we don't need to scroll yet. */</div><div class='del'>-	if (mts-&gt;scroll_count-- &gt; 0) {</div><div class='del'>-		GDK_THREADS_LEAVE ();</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the x coords of visible part of the canvas. */</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_width = mts-&gt;display_main-&gt;allocation.width;</div><div class='del'>-</div><div class='del'>-	/* Calculate the scroll delay, between 0 and MAX_SCROLL_SPEED. */</div><div class='del'>-	scroll_speed = abs (mts-&gt;last_drag_x / E_MEETING_TIME_SELECTOR_SCROLL_INCREMENT_WIDTH);</div><div class='del'>-	scroll_speed = MIN (scroll_speed,</div><div class='del'>-			    E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED);</div><div class='del'>-</div><div class='del'>-	/* Reset the scroll count. */</div><div class='del'>-	mts-&gt;scroll_count = E_MEETING_TIME_SELECTOR_MAX_SCROLL_SPEED - scroll_speed;</div><div class='del'>-</div><div class='del'>-	/* Calculate how much we need to scroll. */</div><div class='del'>-	if (mts-&gt;last_drag_x &gt;= 0)</div><div class='del'>-		scroll_offset = mts-&gt;col_width;</div><div class='del'>-	else</div><div class='del'>-		scroll_offset = -mts-&gt;col_width;</div><div class='del'>-</div><div class='del'>-	scroll_x += scroll_offset;</div><div class='del'>-	max_scroll_x = (mts-&gt;day_width * E_MEETING_TIME_SELECTOR_DAYS_SHOWN)</div><div class='del'>-		- canvas_width;</div><div class='del'>-	scroll_x = CLAMP (scroll_x, 0, max_scroll_x);</div><div class='del'>-</div><div class='del'>-	/* Calculate the minimum or maximum visible time in the canvas, which</div><div class='del'>-	   we will now set the dragged time to. */</div><div class='del'>-	if (scroll_offset &gt; 0) {</div><div class='del'>-		e_meeting_time_selector_calculate_time (mts,</div><div class='del'>-						      scroll_x + canvas_width - 1,</div><div class='del'>-						      &amp;drag_time);</div><div class='del'>-		if (!mts-&gt;all_day) {</div><div class='del'>-			if (mts-&gt;zoomed_out) {</div><div class='del'>-				drag_time.minute = 0;</div><div class='del'>-			} else {</div><div class='del'>-				drag_time.minute -= drag_time.minute % 30;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			drag_time.hour = 0;</div><div class='del'>-			drag_time.minute = 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_meeting_time_selector_calculate_time (mts, scroll_x,</div><div class='del'>-							&amp;drag_time);</div><div class='del'>-		if (!mts-&gt;all_day) {</div><div class='del'>-			if (mts-&gt;zoomed_out) {</div><div class='del'>-				if (drag_time.minute &gt; 30)</div><div class='del'>-					drag_time.hour++;</div><div class='del'>-				drag_time.minute = 0;</div><div class='del'>-			} else {</div><div class='del'>-				drag_time.minute += 15;</div><div class='del'>-				drag_time.minute -= drag_time.minute % 30;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (drag_time.hour &gt; 0 || drag_time.minute &gt; 0)</div><div class='del'>-				g_date_add_days (&amp;drag_time.date, 1);</div><div class='del'>-			drag_time.hour = 0;</div><div class='del'>-			drag_time.minute = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	e_meeting_time_selector_fix_time_overflows (&amp;drag_time);</div><div class='del'>-</div><div class='del'>-	/* Set the meeting start or end time to drag_time. */</div><div class='del'>-	if (mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		time_to_set = &amp;mts-&gt;meeting_start_time;</div><div class='del'>-	else</div><div class='del'>-		time_to_set = &amp;mts-&gt;meeting_end_time;</div><div class='del'>-</div><div class='del'>-	/* If the time is unchanged, just return. */</div><div class='del'>-	if (e_meeting_time_compare_times (time_to_set, &amp;drag_time) == 0) {</div><div class='del'>-		GDK_THREADS_LEAVE ();</div><div class='del'>-		goto scroll;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Don't let an empty occur for all day events */</div><div class='del'>-	if (mts-&gt;all_day</div><div class='del'>-	    &amp;&amp; mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START</div><div class='del'>-	    &amp;&amp; e_meeting_time_compare_times (&amp;mts-&gt;meeting_end_time, &amp;drag_time) == 0)</div><div class='del'>-		goto scroll;</div><div class='del'>-	else if (mts-&gt;all_day</div><div class='del'>-		&amp;&amp; mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END</div><div class='del'>-		&amp;&amp; e_meeting_time_compare_times (&amp;mts-&gt;meeting_start_time, &amp;drag_time) == 0)</div><div class='del'>-		goto scroll;</div><div class='del'>-</div><div class='del'>-	*time_to_set = drag_time;</div><div class='del'>-</div><div class='del'>-	/* Check if the start time and end time need to be switched. */</div><div class='del'>-	if (e_meeting_time_compare_times (&amp;mts-&gt;meeting_start_time, &amp;mts-&gt;meeting_end_time) &gt; 0) {</div><div class='del'>-		drag_time = mts-&gt;meeting_start_time;</div><div class='del'>-		mts-&gt;meeting_start_time = mts-&gt;meeting_end_time;</div><div class='del'>-		mts-&gt;meeting_end_time = drag_time;</div><div class='del'>-</div><div class='del'>-		if (mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-			mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_END;</div><div class='del'>-		else</div><div class='del'>-			mts-&gt;dragging_position = E_MEETING_TIME_SELECTOR_POS_START;</div><div class='del'>-</div><div class='del'>-		set_both_times = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Mark the calculated positions as invalid. */</div><div class='del'>-	mts-&gt;meeting_positions_valid = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Set the times in the GnomeDateEdit widgets. */</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		e_meeting_time_selector_update_start_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END)</div><div class='del'>-		e_meeting_time_selector_update_end_date_edit (mts);</div><div class='del'>-</div><div class='del'>-	if (set_both_times</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_END</div><div class='del'>-	    || mts-&gt;dragging_position == E_MEETING_TIME_SELECTOR_POS_START)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (mts), mts_signals [CHANGED]);</div><div class='del'>-</div><div class='del'>- scroll:</div><div class='del'>-	/* Redraw the canvases. We freeze and thaw the layouts so that they</div><div class='del'>-	   get redrawn completely. Otherwise the pixels get scrolled left or</div><div class='del'>-	   right which is not good for us (since our vertical bars have been</div><div class='del'>-	   moved) and causes flicker. */</div><div class='del'>-	gtk_layout_freeze (GTK_LAYOUT (mts-&gt;display_main));</div><div class='del'>-	gtk_layout_freeze (GTK_LAYOUT (mts-&gt;display_top));</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-				scroll_x, scroll_y);</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (mts-&gt;display_top),</div><div class='del'>-				scroll_x, scroll_y);</div><div class='del'>-	gtk_layout_thaw (GTK_LAYOUT (mts-&gt;display_main));</div><div class='del'>-	gtk_layout_thaw (GTK_LAYOUT (mts-&gt;display_top));</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE ();</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This removes our auto-scroll timeout function, if we have one installed. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	if (mts-&gt;auto_scroll_timeout_id) {</div><div class='del'>-		g_source_remove (mts-&gt;auto_scroll_timeout_id);</div><div class='del'>-		mts-&gt;auto_scroll_timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the GnomeDateEdit widget displaying the meeting start time. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts-&gt;start_date_edit),</div><div class='del'>-					      g_date_year (&amp;mts-&gt;meeting_start_time.date),</div><div class='del'>-					      g_date_month (&amp;mts-&gt;meeting_start_time.date),</div><div class='del'>-					      g_date_day (&amp;mts-&gt;meeting_start_time.date),</div><div class='del'>-					      mts-&gt;meeting_start_time.hour,</div><div class='del'>-					      mts-&gt;meeting_start_time.minute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the GnomeDateEdit widget displaying the meeting end time. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	</div><div class='del'>-	date = mts-&gt;meeting_end_time.date;</div><div class='del'>-	if (mts-&gt;all_day)</div><div class='del'>-		g_date_subtract_days (&amp;date, 1);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts-&gt;end_date_edit),</div><div class='del'>-					      g_date_year (&amp;date),</div><div class='del'>-					      g_date_month (&amp;date),</div><div class='del'>-					      g_date_day (&amp;date),</div><div class='del'>-					      mts-&gt;meeting_end_time.hour,</div><div class='del'>-					      mts-&gt;meeting_end_time.minute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This ensures that the meeting time is shown on screen, by scrolling the</div><div class='del'>-   canvas and possibly by changing the range of dates shown in the canvas. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	gint start_x, end_x, scroll_x, scroll_y, canvas_width;</div><div class='del'>-	gint new_scroll_x;</div><div class='del'>-	gboolean fits_in_canvas;</div><div class='del'>-</div><div class='del'>-	/* Check if we need to change the range of dates shown. */</div><div class='del'>-	if (g_date_compare (&amp;mts-&gt;meeting_start_time.date,</div><div class='del'>-			    &amp;mts-&gt;first_date_shown) &lt; 0</div><div class='del'>-	    || g_date_compare (&amp;mts-&gt;meeting_end_time.date,</div><div class='del'>-			       &amp;mts-&gt;last_date_shown) &gt; 0) {</div><div class='del'>-		e_meeting_time_selector_update_dates_shown (mts);</div><div class='del'>-		gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-		gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If all of the meeting time is visible, just return. */</div><div class='del'>-	e_meeting_time_selector_get_meeting_time_positions (mts, &amp;start_x,</div><div class='del'>-							    &amp;end_x);</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_width = mts-&gt;display_main-&gt;allocation.width;</div><div class='del'>-	if (start_x &gt; scroll_x &amp;&amp; end_x &lt;= scroll_x + canvas_width)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	fits_in_canvas = end_x - start_x &lt; canvas_width ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	/* If the meeting is not entirely visible, either center it if it is</div><div class='del'>-	   smaller than the canvas, or show the start of it if it is big. */</div><div class='del'>-	if (fits_in_canvas) {</div><div class='del'>-		new_scroll_x = (start_x + end_x - canvas_width) / 2;</div><div class='del'>-	} else {</div><div class='del'>-		new_scroll_x = start_x;</div><div class='del'>-	}</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (mts-&gt;display_main),</div><div class='del'>-				new_scroll_x, scroll_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the range of dates shown in the canvas, to make sure that the</div><div class='del'>-   currently selected meeting time is in the range. */</div><div class='del'>-static void</div><div class='del'>-e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)</div><div class='del'>-{</div><div class='del'>-	mts-&gt;first_date_shown = mts-&gt;meeting_start_time.date;</div><div class='del'>-	g_date_subtract_days (&amp;mts-&gt;first_date_shown,</div><div class='del'>-			      E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE);</div><div class='del'>-</div><div class='del'>-	mts-&gt;last_date_shown = mts-&gt;first_date_shown;</div><div class='del'>-	g_date_add_days (&amp;mts-&gt;last_date_shown,</div><div class='del'>-			 E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This checks if the time's hour is over 24 or its minute is over 60 and if</div><div class='del'>-   so it updates the day/hour appropriately. Note that hours and minutes are</div><div class='del'>-   stored in guint8's so they can't overflow by much. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime)</div><div class='del'>-{</div><div class='del'>-	gint hours_to_add, days_to_add;</div><div class='del'>-</div><div class='del'>-	hours_to_add = mtstime-&gt;minute / 60;</div><div class='del'>-	if (hours_to_add &gt; 0) {</div><div class='del'>-		mtstime-&gt;minute -= hours_to_add * 60;</div><div class='del'>-		mtstime-&gt;hour += hours_to_add;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	days_to_add = mtstime-&gt;hour / 24;</div><div class='del'>-	if (days_to_add &gt; 0) {</div><div class='del'>-		mtstime-&gt;hour -= days_to_add * 24;</div><div class='del'>-		g_date_add_days (&amp;mtstime-&gt;date, days_to_add);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CONVERSION ROUTINES - functions to convert between different coordinate</div><div class='del'>- *			 spaces and dates.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This takes an x pixel coordinate within the entire canvas scroll region and</div><div class='del'>-   returns the date in which it falls. If day_position is not NULL it also</div><div class='del'>-   returns the x coordinate within the date, relative to the visible part of</div><div class='del'>-   the canvas. It is used when painting the days in the item_draw function.</div><div class='del'>-   Note that it must handle negative x coordinates in case we are dragging off</div><div class='del'>-   the edge of the canvas. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,</div><div class='del'>-						    gint x,</div><div class='del'>-						    GDate *date,</div><div class='del'>-						    gint *day_position)</div><div class='del'>-{</div><div class='del'>-	gint days_from_first_shown;</div><div class='del'>-</div><div class='del'>-	*date = mts-&gt;first_date_shown;</div><div class='del'>-</div><div class='del'>-	if (x &gt;= 0) {</div><div class='del'>-		days_from_first_shown = x / mts-&gt;day_width;</div><div class='del'>-		g_date_add_days (date, days_from_first_shown);</div><div class='del'>-		if (day_position)</div><div class='del'>-			*day_position = - x % mts-&gt;day_width;</div><div class='del'>-	} else {</div><div class='del'>-		days_from_first_shown = -x / mts-&gt;day_width + 1;</div><div class='del'>-		g_date_subtract_days (date, days_from_first_shown);</div><div class='del'>-		if (day_position)</div><div class='del'>-			*day_position = -mts-&gt;day_width - x % mts-&gt;day_width;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This takes an x pixel coordinate within a day, and converts it to hours</div><div class='del'>-   and minutes, depending on working_hours_only and zoomed_out. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes)</div><div class='del'>-{</div><div class='del'>-	if (mts-&gt;zoomed_out)</div><div class='del'>-		day_position *= 3;</div><div class='del'>-</div><div class='del'>-	/* Calculate the hours &amp; minutes from the first displayed. */</div><div class='del'>-	*hours = day_position / mts-&gt;col_width;</div><div class='del'>-	*minutes = (day_position % mts-&gt;col_width) * 60 / mts-&gt;col_width;</div><div class='del'>-</div><div class='del'>-	/* Now add on the first hour shown. */</div><div class='del'>-	*hours += mts-&gt;first_hour_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This takes an x pixel coordinate within the entire canvas scroll region and</div><div class='del'>-   returns the time in which it falls. Note that it won't be extremely</div><div class='del'>-   accurate since hours may only be a few pixels wide in the display.</div><div class='del'>-   With zoomed_out set each pixel may represent 5 minutes or more, depending</div><div class='del'>-   on how small the font is. */</div><div class='del'>-void</div><div class='del'>-e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,</div><div class='del'>-					gint x,</div><div class='del'>-					EMeetingTime*time)</div><div class='del'>-{</div><div class='del'>-	gint day_position;</div><div class='del'>-</div><div class='del'>-	/* First get the day and the x position within the day. */</div><div class='del'>-	e_meeting_time_selector_calculate_day_and_position (mts, x, &amp;time-&gt;date,</div><div class='del'>-							    NULL);</div><div class='del'>-</div><div class='del'>-	/* Now convert the day_position into an hour and minute. */</div><div class='del'>-	if (x &gt;= 0)</div><div class='del'>-		day_position = x % mts-&gt;day_width;</div><div class='del'>-	else</div><div class='del'>-		day_position = mts-&gt;day_width + x % mts-&gt;day_width;</div><div class='del'>-</div><div class='del'>-	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &amp;time-&gt;hour, &amp;time-&gt;minute);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This takes a EMeetingTime and calculates the x pixel coordinate</div><div class='del'>-   within the entire canvas scroll region. It is used to draw the selected</div><div class='del'>-   meeting time and all the busy periods. */</div><div class='del'>-gint</div><div class='del'>-e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,</div><div class='del'>-						 EMeetingTime *mtstime)</div><div class='del'>-{</div><div class='del'>-	gint x, date_offset, day_offset;</div><div class='del'>-</div><div class='del'>-	/* Calculate the number of days since the first date shown in the</div><div class='del'>-	   entire canvas scroll region. */</div><div class='del'>-	date_offset = g_date_julian (&amp;mtstime-&gt;date) - g_date_julian (&amp;mts-&gt;first_date_shown);</div><div class='del'>-</div><div class='del'>-	/* Calculate the x pixel coordinate of the start of the day. */</div><div class='del'>-	x = date_offset * mts-&gt;day_width;</div><div class='del'>-</div><div class='del'>-	/* Add on the hours and minutes, depending on whether zoomed_out and</div><div class='del'>-	   working_hours_only are set. */</div><div class='del'>-	day_offset = (mtstime-&gt;hour - mts-&gt;first_hour_shown) * 60</div><div class='del'>-		+ mtstime-&gt;minute;</div><div class='del'>-	/* The day width includes an extra vertical grid line so subtract 1. */</div><div class='del'>-	day_offset *= (mts-&gt;day_width - 1);</div><div class='del'>-	day_offset /= (mts-&gt;last_hour_shown - mts-&gt;first_hour_shown) * 60;</div><div class='del'>-</div><div class='del'>-	/* Clamp the day_offset in case the time isn't actually visible. */</div><div class='del'>-	x += CLAMP (day_offset, 0, mts-&gt;day_width);</div><div class='del'>-</div><div class='del'>-	return x;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rows_inserted_cb (ETableModel *etm, int row, int count, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* Update the scroll region. */</div><div class='del'>-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);</div><div class='del'>-</div><div class='del'>-	/* Redraw */</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-</div><div class='del'>-	/* Get the latest free/busy info */</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		e_meeting_time_selector_refresh_free_busy (mts, row + i, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cell_changed_cb (ETableModel *etm, int col, int row, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);</div><div class='del'>-</div><div class='del'>-	if (col != E_MEETING_MODEL_ADDRESS_COL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the latest free/busy info */</div><div class='del'>-	e_meeting_time_selector_refresh_free_busy (mts, row, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rows_deleted_cb (ETableModel *etm, int row, int count, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);</div><div class='del'>-</div><div class='del'>-	/* Update the scroll region. */</div><div class='del'>-	e_meeting_time_selector_update_main_canvas_scroll_region (mts);</div><div class='del'>-</div><div class='del'>-	/* Redraw */</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sort_info_changed_cb (ETableSortInfo *info, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data);</div><div class='del'>-</div><div class='del'>-	/* Redraw */</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_top);</div><div class='del'>-	gtk_widget_queue_draw (mts-&gt;display_main);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-meeting-time-sel.etspec b/calendar/gui/e-meeting-time-sel.etspec<br/>deleted file mode 100644<br/>index c0b5c721dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-time-sel.etspec?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-time-sel.etspec</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-&lt;ETableSpecification click-to-add="true" click-to-add-end="true" _click-to-add-message="Click here to add an attendee" draw-grid="true"&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "0" _title="Attendee" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "1" _title="Member" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "2" _title="Type" expansion="1.0" minimum_width="10" resizable="true" cell="typeedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "3" _title="Role" expansion="1.0" minimum_width="10" resizable="true" cell="roleedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "4" _title="RSVP" expansion="1.0" minimum_width="10" resizable="true" cell="rsvpedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "5" _title="Delegated To" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "6" _title="Delegated From" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "7" _title="Status" expansion="1.0" minimum_width="10" resizable="true" cell="statusedit" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "8" _title="Common Name" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-  &lt;ETableColumn model_col= "9" _title="Language" expansion="2.0" minimum_width="10" resizable="true" cell="string" compare="string"/&gt;</div><div class='del'>-</div><div class='del'>-  &lt;ETableState&gt;</div><div class='del'>-     &lt;column source="0"/&gt;</div><div class='del'>-     &lt;column source="2"/&gt;</div><div class='del'>-     &lt;column source="7"/&gt;</div><div class='del'>-     &lt;grouping&gt;&lt;/grouping&gt;</div><div class='del'>-  &lt;/ETableState&gt;</div><div class='del'>-&lt;/ETableSpecification&gt;</div><div class='head'>diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h<br/>deleted file mode 100644<br/>index 30c1abefa7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-time-sel.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-time-sel.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,384 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@gtk.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_MEETING_TIME_SELECTOR_H_</div><div class='del'>-#define _E_MEETING_TIME_SELECTOR_H_</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkaccelgroup.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table.h&gt;</div><div class='del'>-#include "e-meeting-model.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EMeetingTimeSelector displays a list of attendees for a meeting and a</div><div class='del'>- * graphical summary of the times which they are free and busy, allowing the</div><div class='del'>- * user to select an appropriate time for a meeting.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Define this to include the debugging functions. */</div><div class='del'>-#undef E_MEETING_TIME_SELECTOR_DEBUG</div><div class='del'>-</div><div class='del'>-/* This is the width of the icon column in the attendees list. */</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_ICON_COLUMN_WIDTH	24</div><div class='del'>-</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used to specify the format used when displaying the dates.</div><div class='del'>-   The full format is like 'Sunday, September 12, 1999'. The abbreviated format</div><div class='del'>-   is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual</div><div class='del'>-   format used is determined in e_meeting_time_selector_style_set(), once we</div><div class='del'>-   know the font being used. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_MEETING_TIME_SELECTOR_DATE_FULL,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_DATE_ABBREVIATED_DAY,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_DATE_SHORT</div><div class='del'>-} EMeetingTimeSelectorDateFormat;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used to specify a position regarding the vertical bars around the</div><div class='del'>-   current meeting time, so we know which one is being dragged. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_MEETING_TIME_SELECTOR_POS_NONE,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_POS_START,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_POS_END</div><div class='del'>-} EMeetingTimeSelectorPosition;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used to specify the autopick option, which determines how we choose</div><div class='del'>-   the previous/next appropriate meeting time. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_RESOURCES,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_ALL_PEOPLE_AND_ONE_RESOURCE,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE,</div><div class='del'>-	E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE</div><div class='del'>-} EMeetingTimeSelectorAutopickOption;</div><div class='del'>-</div><div class='del'>-/* An array of hour strings for 24 hour time, "0:00" .. "23:00". */</div><div class='del'>-extern const gchar *EMeetingTimeSelectorHours[24];</div><div class='del'>-/* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */</div><div class='del'>-extern const gchar *EMeetingTimeSelectorHours12[24];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_MEETING_TIME_SELECTOR(obj)          GTK_CHECK_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)</div><div class='del'>-#define E_MEETING_TIME_SELECTOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)</div><div class='del'>-#define IS_E_MEETING_TIME_SELECTOR(obj)       GTK_CHECK_TYPE (obj, e_meeting_time_selector_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;</div><div class='del'>-typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;</div><div class='del'>-</div><div class='del'>-struct _EMeetingTimeSelector</div><div class='del'>-{</div><div class='del'>-	/* We subclass a GtkTable which makes it easy to add extra widgets</div><div class='del'>-	   if neccesary. */</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * User Interface stuff - widgets, colors etc.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* This contains our keyboard accelerators, which need to be added to</div><div class='del'>-	   the toplevel window. */</div><div class='del'>-	GtkAccelGroup *accel_group;</div><div class='del'>-</div><div class='del'>-	/* The vbox in the top-left corner, containing the 'All Attendees'</div><div class='del'>-	   title bar packed at the end. Extra widgets can be added here</div><div class='del'>-	   with PACK_START if necessary. */</div><div class='del'>-	GtkWidget *attendees_vbox;</div><div class='del'>-	GtkWidget *attendees_vbox_spacer;</div><div class='del'>-	</div><div class='del'>-	/* The etable and model */</div><div class='del'>-	EMeetingModel *model;</div><div class='del'>-	GtkWidget *etable;</div><div class='del'>-	</div><div class='del'>-	/* The canvas displaying the dates, times, and the summary</div><div class='del'>-	   'All Attendees' free/busy display. */</div><div class='del'>-	GtkWidget *display_top;</div><div class='del'>-</div><div class='del'>-	/* The canvas containing the free/busy displays of individual</div><div class='del'>-	   attendees. This is separate from display_top since it also scrolls</div><div class='del'>-	   vertically. */</div><div class='del'>-	GtkWidget *display_main;</div><div class='del'>-</div><div class='del'>-	/* This is the 'Options' button &amp; menu. */</div><div class='del'>-	GtkWidget *options_button;</div><div class='del'>-	GtkWidget *options_menu;</div><div class='del'>-</div><div class='del'>-	/* This is the 'Autopick' button, menu &amp; radio menu items. */</div><div class='del'>-	GtkWidget *autopick_button;</div><div class='del'>-	GtkWidget *autopick_menu;</div><div class='del'>-	GtkWidget *autopick_all_item;</div><div class='del'>-	GtkWidget *autopick_all_people_one_resource_item;</div><div class='del'>-	GtkWidget *autopick_required_people_item;</div><div class='del'>-	GtkWidget *autopick_required_people_one_resource_item;</div><div class='del'>-</div><div class='del'>-	/* The horizontal scrollbar which scrolls display_top &amp; display_main.*/</div><div class='del'>-	GtkWidget *hscrollbar;</div><div class='del'>-</div><div class='del'>-	/* The vertical scrollbar which scrolls attendees &amp; display_main. */</div><div class='del'>-	GtkWidget *vscrollbar;</div><div class='del'>-</div><div class='del'>-	/* The 2 EDateEdit widgets for the meeting start &amp; end times. */</div><div class='del'>-	GtkWidget *start_date_edit;</div><div class='del'>-	GtkWidget *end_date_edit;</div><div class='del'>-</div><div class='del'>-	/* Colors. */</div><div class='del'>-	GdkColorContext *color_context;</div><div class='del'>-	GdkColor bg_color;</div><div class='del'>-	GdkColor all_attendees_bg_color;</div><div class='del'>-	GdkColor meeting_time_bg_color;</div><div class='del'>-	GdkColor stipple_bg_color;</div><div class='del'>-	GdkColor attendee_list_bg_color;</div><div class='del'>-	GdkColor grid_color;</div><div class='del'>-	GdkColor grid_shadow_color;</div><div class='del'>-	GdkColor grid_unused_color;</div><div class='del'>-	GdkColor busy_colors[E_MEETING_FREE_BUSY_LAST];</div><div class='del'>-</div><div class='del'>-	/* The stipple used for attendees with no data. */</div><div class='del'>-	GdkPixmap *stipple;</div><div class='del'>-</div><div class='del'>-	/* GC for drawing the color key. */</div><div class='del'>-	GdkGC *color_key_gc;</div><div class='del'>-</div><div class='del'>-	/* Width of the hours strings (e.g. "1:00") in the current font. */</div><div class='del'>-	gint hour_widths[24];</div><div class='del'>-</div><div class='del'>-	/* Whether we are using the full, abbreviated or short date format. */</div><div class='del'>-	EMeetingTimeSelectorDateFormat date_format;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Option Settings.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* True if we are selecting all day events */</div><div class='del'>-	gboolean all_day;</div><div class='del'>-	</div><div class='del'>-	/* If this is TRUE we only show hours between day_start_hour and</div><div class='del'>-	   day_end_hour, defaults to TRUE (9am-6pm). */</div><div class='del'>-	gboolean working_hours_only;</div><div class='del'>-	gint day_start_hour;</div><div class='del'>-	gint day_start_minute;</div><div class='del'>-	gint day_end_hour;</div><div class='del'>-	gint day_end_minute;</div><div class='del'>-</div><div class='del'>-	/* If TRUE, view is compressed, with one cell for every 3 hours rather</div><div class='del'>-	   than every hour. Defaults to FALSE. */</div><div class='del'>-	gboolean zoomed_out;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Internal Data.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* These are the first &amp; last dates shown in the current scroll area.</div><div class='del'>-	   We show E_MEETING_TIME_SELECTOR_DAYS_SHOWN days at a time. */</div><div class='del'>-	GDate first_date_shown;</div><div class='del'>-	GDate last_date_shown;</div><div class='del'>-</div><div class='del'>-	/* This is the current selection of the meeting time. */</div><div class='del'>-	EMeetingTime meeting_start_time;</div><div class='del'>-	EMeetingTime meeting_end_time;</div><div class='del'>-</div><div class='del'>-	/* These are the x pixel coordinates in the entire scroll region of</div><div class='del'>-	   the start and end times. Set to meeting_positions_valid to FALSE to</div><div class='del'>-	   invalidate. They will then be recomputed when needed. Always access</div><div class='del'>-	   with e_meeting_time_selector_get_meeting_time_positions(). */</div><div class='del'>-	gint meeting_positions_valid;</div><div class='del'>-	gint meeting_positions_in_scroll_area;</div><div class='del'>-	gint meeting_start_x;</div><div class='del'>-	gint meeting_end_x;</div><div class='del'>-</div><div class='del'>-	/* These are the width and height of the cells, including the grid</div><div class='del'>-	   lines which are displayed on the right and top or bottom of cells.*/</div><div class='del'>-	gint row_height;</div><div class='del'>-	gint col_width;</div><div class='del'>-</div><div class='del'>-	/* This is the width of a day in the display, which depends on</div><div class='del'>-	   col_width, working_hours_only and zoomed_out. */</div><div class='del'>-	gint day_width;</div><div class='del'>-</div><div class='del'>-	/* These are the first and last hour of each day we display, depending</div><div class='del'>-	   on working_hours_only and zoomed_out. */</div><div class='del'>-	gint first_hour_shown;</div><div class='del'>-	gint last_hour_shown;</div><div class='del'>-</div><div class='del'>-	/* The id of the source function for auto-scroll timeouts. */</div><div class='del'>-	guint auto_scroll_timeout_id;</div><div class='del'>-</div><div class='del'>-	/* This specifies if we are dragging one of the vertical bars around</div><div class='del'>-	   the meeting time. */</div><div class='del'>-	EMeetingTimeSelectorPosition dragging_position;</div><div class='del'>-</div><div class='del'>-	/* The last x coordinate of the mouse, relative to either the left or</div><div class='del'>-	   right edge of the canvas. Used in the auto_scroll_timeout function</div><div class='del'>-	   to determine which way to scroll and how fast. */</div><div class='del'>-	gint last_drag_x;</div><div class='del'>-</div><div class='del'>-	/* This is used to determine the delay between scrolls. */</div><div class='del'>-	gint scroll_count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EMeetingTimeSelectorClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed) (EMeetingTimeSelector *mts);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * PUBLIC INTERFACE - note that this interface will probably change, when I</div><div class='del'>- * know where the data is coming from. This is mainly just for testing for now.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-GtkType e_meeting_time_selector_get_type (void);</div><div class='del'>-GtkWidget* e_meeting_time_selector_new (EMeetingModel *emm);</div><div class='del'>-void e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingModel *emm);</div><div class='del'>-</div><div class='del'>-/* This returns the currently selected meeting time.</div><div class='del'>-   Note that months are 1-12 and days are 1-31. The start time is guaranteed to</div><div class='del'>-   be before or equal to the end time. You may want to check if they are equal</div><div class='del'>-   if that if it is a problem. */</div><div class='del'>-void e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-					       gint *start_year,</div><div class='del'>-					       gint *start_month,</div><div class='del'>-					       gint *start_day,</div><div class='del'>-					       gint *start_hour,</div><div class='del'>-					       gint *start_minute,</div><div class='del'>-					       gint *end_year,</div><div class='del'>-					       gint *end_month,</div><div class='del'>-					       gint *end_day,</div><div class='del'>-					       gint *end_hour,</div><div class='del'>-					       gint *end_minute);</div><div class='del'>-</div><div class='del'>-/* This sets the meeting time, returning TRUE if it is valid. */</div><div class='del'>-gboolean e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-						   gint start_year,</div><div class='del'>-						   gint start_month,</div><div class='del'>-						   gint start_day,</div><div class='del'>-						   gint start_hour,</div><div class='del'>-						   gint start_minute,</div><div class='del'>-						   gint end_year,</div><div class='del'>-						   gint end_month,</div><div class='del'>-						   gint end_day,</div><div class='del'>-						   gint end_hour,</div><div class='del'>-						   gint end_minute);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,</div><div class='del'>-					  gboolean all_day);</div><div class='del'>-void e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,</div><div class='del'>-						     gboolean working_hours_only);</div><div class='del'>-void e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,</div><div class='del'>-						gint day_start_hour,</div><div class='del'>-						gint day_start_minute,</div><div class='del'>-						gint day_end_hour,</div><div class='del'>-						gint day_end_minute);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,</div><div class='del'>-					     gboolean zoomed_out);</div><div class='del'>-</div><div class='del'>-EMeetingTimeSelectorAutopickOption e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts);</div><div class='del'>-void e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,</div><div class='del'>-						  EMeetingTimeSelectorAutopickOption autopick_option);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_attendee_set_send_meeting_to (EMeetingTimeSelector *mts,</div><div class='del'>-							   gint row,</div><div class='del'>-							   gboolean send_meeting_to);</div><div class='del'>-</div><div class='del'>-/* Clears all busy times for the given attendee. */</div><div class='del'>-void e_meeting_time_selector_attendee_clear_busy_periods (EMeetingTimeSelector *mts,</div><div class='del'>-							  gint row);</div><div class='del'>-/* Adds one busy time for the given attendee. */</div><div class='del'>-gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector *mts,</div><div class='del'>-							   gint row,</div><div class='del'>-							   gint start_year,</div><div class='del'>-							   gint start_month,</div><div class='del'>-							   gint start_day,</div><div class='del'>-							   gint start_hour,</div><div class='del'>-							   gint start_minute,</div><div class='del'>-							   gint end_year,</div><div class='del'>-							   gint end_month,</div><div class='del'>-							   gint end_day,</div><div class='del'>-							   gint end_hour,</div><div class='del'>-							   gint end_minute,</div><div class='del'>-							   EMeetingFreeBusyType busy_type);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * INTERNAL ROUTINES - functions to communicate with the canvas items within</div><div class='del'>- *		       the EMeetingTimeSelector.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This returns the x pixel coordinates of the meeting start and end times,</div><div class='del'>-   in the entire canvas scroll area. If it returns FALSE, then the meeting</div><div class='del'>-   time isn't in the current scroll area (which shouldn't really happen). */</div><div class='del'>-gboolean e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,</div><div class='del'>-							     gint *start_x,</div><div class='del'>-							     gint *end_x);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,</div><div class='del'>-						gint x);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_fix_time_overflows (EMeetingTime*mtstime);</div><div class='del'>-</div><div class='del'>-void e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,</div><div class='del'>-							 gint x,</div><div class='del'>-							 GDate *date,</div><div class='del'>-							 gint *day_position);</div><div class='del'>-void e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSelector *mts, gint day_position, guint8 *hours, guint8 *minutes);</div><div class='del'>-void e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,</div><div class='del'>-					     gint x,</div><div class='del'>-					     EMeetingTime*time);</div><div class='del'>-gint e_meeting_time_selector_calculate_time_position (EMeetingTimeSelector *mts,</div><div class='del'>-						      EMeetingTime *mtstime);</div><div class='del'>-</div><div class='del'>-/* Debugging function to dump information on all attendees. */</div><div class='del'>-#ifdef E_MEETING_TIME_SELECTOR_DEBUG</div><div class='del'>-void e_meeting_time_selector_dump (EMeetingTimeSelector *mts);</div><div class='del'>-gchar* e_meeting_time_selector_dump_time (EMeetingTime*mtstime);</div><div class='del'>-gchar* e_meeting_time_selector_dump_date (GDate *date);</div><div class='del'>-#endif /* E_MEETING_TIME_SELECTOR_DEBUG */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_TIME_SELECTOR_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h<br/>deleted file mode 100644<br/>index ab330a6d40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* itip-attendee.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MEETING_TYPES_H_</div><div class='del'>-#define _E_MEETING_TYPES_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "e-meeting-types.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingTime               EMeetingTime;</div><div class='del'>-typedef struct _EMeetingFreeBusyPeriod     EMeetingFreeBusyPeriod;</div><div class='del'>-</div><div class='del'>-/* These are used to specify whether an attendee is free or busy at a</div><div class='del'>-   particular time. We'll probably replace this with a global calendar type.</div><div class='del'>-   These should be ordered in increasing order of preference. Higher precedence</div><div class='del'>-   busy periods will be painted over lower precedence ones. These are also</div><div class='del'>-   used as for loop counters, so they should start at 0 and be ordered. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_MEETING_FREE_BUSY_TENTATIVE       = 0,</div><div class='del'>-	E_MEETING_FREE_BUSY_OUT_OF_OFFICE	= 1,</div><div class='del'>-	E_MEETING_FREE_BUSY_BUSY		= 2,</div><div class='del'>-</div><div class='del'>-	E_MEETING_FREE_BUSY_LAST		= 3</div><div class='del'>-} EMeetingFreeBusyType;</div><div class='del'>-</div><div class='del'>-/* This is our representation of a time. We use a GDate to store the day,</div><div class='del'>-   and guint8s for the hours and minutes. */</div><div class='del'>-struct _EMeetingTime</div><div class='del'>-{</div><div class='del'>-	GDate	date;</div><div class='del'>-	guint8	hour;</div><div class='del'>-	guint8	minute;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This represents a busy period. */</div><div class='del'>-struct _EMeetingFreeBusyPeriod</div><div class='del'>-{</div><div class='del'>-	EMeetingTime start;</div><div class='del'>-	EMeetingTime end;</div><div class='del'>-	EMeetingFreeBusyType busy_type;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_TYPES_H_ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c<br/>deleted file mode 100644<br/>index 496bb8ebaa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* itip-model.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-meeting-utils.h"</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_meeting_time_compare_times (EMeetingTime*time1,</div><div class='del'>-			      EMeetingTime*time2)</div><div class='del'>-{</div><div class='del'>-	gint day_comparison;</div><div class='del'>-</div><div class='del'>-	day_comparison = g_date_compare (&amp;time1-&gt;date,</div><div class='del'>-					 &amp;time2-&gt;date);</div><div class='del'>-	if (day_comparison != 0)</div><div class='del'>-		return day_comparison;</div><div class='del'>-</div><div class='del'>-	if (time1-&gt;hour &lt; time2-&gt;hour)</div><div class='del'>-		return -1;</div><div class='del'>-	if (time1-&gt;hour &gt; time2-&gt;hour)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (time1-&gt;minute &lt; time2-&gt;minute)</div><div class='del'>-		return -1;</div><div class='del'>-	if (time1-&gt;minute &gt; time2-&gt;minute)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	/* The start times are exactly the same. */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h<br/>deleted file mode 100644<br/>index 4c2798fcf0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-meeting-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* itip-attendee.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MEETING_UTILS_H_</div><div class='del'>-#define _E_MEETING_UTILS_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "e-meeting-types.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint e_meeting_time_compare_times (EMeetingTime *time1,</div><div class='del'>-				   EMeetingTime *time2);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_MEETING_UTILS_H_ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c<br/>deleted file mode 100644<br/>index 23bd46f34f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-tasks.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-tasks.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,831 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-tasks.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-instance.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-factory-etable.h&gt;</div><div class='del'>-#include &lt;gal/menus/gal-view-etable.h&gt;</div><div class='del'>-#include "e-util/e-url.h"</div><div class='del'>-#include "widgets/menus/gal-view-menus.h"</div><div class='del'>-#include "dialogs/task-editor.h"</div><div class='del'>-#include "cal-search-bar.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-</div><div class='del'>-#include "e-tasks.h"</div><div class='del'>-</div><div class='del'>-/* A list of all of the ETasks widgets in use. We use this to update the</div><div class='del'>-   user preference settings. This will change when we switch to GConf. */</div><div class='del'>-static GList *all_tasks = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the GnomeCalendar structure */</div><div class='del'>-struct _ETasksPrivate {</div><div class='del'>-	/* The calendar client object we monitor */</div><div class='del'>-	CalClient   *client;</div><div class='del'>-	CalQuery    *query;</div><div class='del'>-	</div><div class='del'>-	/* The ECalendarTable showing the tasks. */</div><div class='del'>-	GtkWidget   *tasks_view;</div><div class='del'>-</div><div class='del'>-	/* Calendar search bar for tasks */</div><div class='del'>-	GtkWidget *search_bar;</div><div class='del'>-</div><div class='del'>-	/* View instance and the view menus handler */</div><div class='del'>-	GalViewInstance *view_instance;</div><div class='del'>-	GalViewMenus *view_menus;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_tasks_class_init (ETasksClass *class);</div><div class='del'>-static void e_tasks_init (ETasks *tasks);</div><div class='del'>-static void setup_widgets (ETasks *tasks);</div><div class='del'>-static void e_tasks_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data);</div><div class='del'>-</div><div class='del'>-static char* e_tasks_get_config_filename (ETasks *tasks);</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	SELECTION_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-static guint e_tasks_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_tasks, "ETasks", ETasks,</div><div class='del'>-	     e_tasks_class_init, e_tasks_init,</div><div class='del'>-	     GTK_TYPE_TABLE)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-e_tasks_class_init (ETasksClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_TABLE);</div><div class='del'>-</div><div class='del'>-	e_tasks_signals[SELECTION_CHANGED] =</div><div class='del'>-		gtk_signal_new ("selection_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ETasksClass, selection_changed),</div><div class='del'>-				gtk_marshal_NONE__INT,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_INT);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_tasks_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_tasks_destroy;</div><div class='del'>-</div><div class='del'>-	class-&gt;selection_changed = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-e_tasks_init (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (ETasksPrivate, 1);</div><div class='del'>-	tasks-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = NULL;</div><div class='del'>-	priv-&gt;query = NULL;</div><div class='del'>-	priv-&gt;view_instance = NULL;</div><div class='del'>-	priv-&gt;view_menus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selection changes in the table. */</div><div class='del'>-static void</div><div class='del'>-table_selection_change_cb (ETable *etable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	int n_selected;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-</div><div class='del'>-	n_selected = e_table_selected_count (etable);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (tasks), e_tasks_signals[SELECTION_CHANGED],</div><div class='del'>-			 n_selected);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the sexp in the search bar changes */</div><div class='del'>-static void</div><div class='del'>-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-	calendar_model_set_query (model, sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selected category in the search bar changes */</div><div class='del'>-static void</div><div class='del'>-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-	calendar_model_set_default_category (model, category);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define E_TASKS_TABLE_DEFAULT_STATE					\</div><div class='del'>-	"&lt;?xml version=\"1.0\"?&gt;"					\</div><div class='del'>-	"&lt;ETableState&gt;"							\</div><div class='del'>-	"&lt;column source=\"13\"/&gt;"					\</div><div class='del'>-	"&lt;column source=\"14\"/&gt;"					\</div><div class='del'>-	"&lt;column source=\"9\"/&gt;"					\</div><div class='del'>-	"&lt;column source=\"5\"/&gt;"					\</div><div class='del'>-	"&lt;grouping/&gt;"							\</div><div class='del'>-	"&lt;/ETableState&gt;"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_widgets (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	ETable *etable;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;search_bar = cal_search_bar_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;search_bar), "sexp_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), tasks);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;search_bar), "category_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), tasks);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (GTK_TABLE (tasks), priv-&gt;search_bar, 0, 1, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (priv-&gt;search_bar);</div><div class='del'>-</div><div class='del'>-	priv-&gt;tasks_view = e_calendar_table_new ();</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	etable = e_table_scrolled_get_table (</div><div class='del'>-		E_TABLE_SCROLLED (E_CALENDAR_TABLE (priv-&gt;tasks_view)-&gt;etable));</div><div class='del'>-	e_table_set_state (etable, E_TASKS_TABLE_DEFAULT_STATE);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (tasks), priv-&gt;tasks_view, 0, 1, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (priv-&gt;tasks_view);</div><div class='del'>-</div><div class='del'>-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_selection_change_cb), tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the set of categories changes in the calendar client */</div><div class='del'>-static void</div><div class='del'>-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_search_bar_set_categories (CAL_SEARCH_BAR (priv-&gt;search_bar), categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_tasks_construct (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (tasks != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	setup_widgets (tasks);</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = cal_client_new ();</div><div class='del'>-	if (!priv-&gt;client)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_opened_cb), tasks);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "categories_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), tasks);</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-	g_assert (model != NULL);</div><div class='del'>-</div><div class='del'>-	calendar_model_set_cal_client (model, priv-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_tasks_new (void)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = gtk_type_new (e_tasks_get_type ());</div><div class='del'>-</div><div class='del'>-	if (!e_tasks_construct (tasks)) {</div><div class='del'>-		g_message ("e_tasks_new(): Could not construct the tasks GUI");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (tasks));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	all_tasks = g_list_prepend (all_tasks, tasks);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_tasks_set_ui_component (ETasks *tasks,</div><div class='del'>-			  BonoboUIComponent *ui_component)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks-&gt;priv-&gt;search_bar), ui_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_tasks_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	char *config_filename;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (object));</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (object);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Save the ETable layout. */</div><div class='del'>-	config_filename = e_tasks_get_config_filename (tasks);</div><div class='del'>-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv-&gt;tasks_view),</div><div class='del'>-				     config_filename);</div><div class='del'>-	g_free (config_filename);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	tasks-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	all_tasks = g_list_remove (all_tasks, tasks);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_status_message (ETasks *tasks, const char *message)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-	calendar_model_set_status_message (model, message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_tasks_open			(ETasks		*tasks,</div><div class='del'>-				 char		*file)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	char *config_filename;</div><div class='del'>-	char *message;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	char *real_uri;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (tasks != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_TASKS (tasks), FALSE);</div><div class='del'>-	g_return_val_if_fail (file != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (file);</div><div class='del'>-	if (!uri || !g_strncasecmp (uri-&gt;protocol, "file", 4))</div><div class='del'>-		real_uri = g_concat_dir_and_file (file, "tasks.ics");</div><div class='del'>-	else</div><div class='del'>-		real_uri = g_strdup (file);</div><div class='del'>-</div><div class='del'>-	message = g_strdup_printf (_("Opening tasks at %s"), real_uri);</div><div class='del'>-	set_status_message (tasks, message);</div><div class='del'>-	g_free (message);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_open_calendar (priv-&gt;client, real_uri, FALSE)) {</div><div class='del'>-		g_message ("e_tasks_open(): Could not issue the request");</div><div class='del'>-		g_free (real_uri);</div><div class='del'>-		e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	config_filename = e_tasks_get_config_filename (tasks);</div><div class='del'>-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv-&gt;tasks_view),</div><div class='del'>-				     config_filename);</div><div class='del'>-	g_free (config_filename);</div><div class='del'>-	g_free (real_uri);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that loading a calendar failed */</div><div class='del'>-static void</div><div class='del'>-load_error				(ETasks		*tasks,</div><div class='del'>-					 const char	*uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("Could not load the tasks in `%s'"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that the specified URI method is not supported */</div><div class='del'>-static void</div><div class='del'>-method_error				(ETasks		*tasks,</div><div class='del'>-					 const char	*uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("The method required to load `%s' is not supported"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when a calendar is opened */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb				(CalClient	*client,</div><div class='del'>-					 CalClientOpenStatus status,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	set_status_message (tasks, NULL);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_OPEN_SUCCESS:</div><div class='del'>-		/* Everything is OK */</div><div class='del'>-</div><div class='del'>-		/* Set the client's default timezone, if we have one. */</div><div class='del'>-		location = calendar_config_get_timezone ();</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-		if (zone)</div><div class='del'>-			cal_client_set_default_timezone (client, zone);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_ERROR:</div><div class='del'>-		load_error (tasks, cal_client_get_uri (client));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_NOT_FOUND:</div><div class='del'>-		/* bullshit; we did not specify only_if_exists */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:</div><div class='del'>-		method_error (tasks, cal_client_get_uri (client));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-e_tasks_get_config_filename		(ETasks		*tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	char *url, *filename;</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	url = g_strdup (cal_client_get_uri (priv-&gt;client));</div><div class='del'>-</div><div class='del'>-	/* This turns all funny characters into '_', in the string itself. */</div><div class='del'>-	e_filename_make_safe (url);</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/config/et-header-%s", evolution_dir,</div><div class='del'>-				    url);</div><div class='del'>-	g_free (url);</div><div class='del'>-	</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_get_cal_client:</div><div class='del'>- * @tasks: An #ETasks.</div><div class='del'>- *</div><div class='del'>- * Queries the calendar client interface object that a tasks view is using.</div><div class='del'>- *</div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-e_tasks_get_cal_client			(ETasks		*tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_tasks_new_task			(ETasks		*tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	tedit = task_editor_new ();</div><div class='del'>-	comp_editor_set_cal_client (COMP_EDITOR (tedit), priv-&gt;client);</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv-&gt;search_bar));</div><div class='del'>-	cal_component_set_categories (comp, category);</div><div class='del'>-</div><div class='del'>-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	comp_editor_focus (COMP_EDITOR (tedit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_complete_selected:</div><div class='del'>- * @tasks: A tasks control widget</div><div class='del'>- * </div><div class='del'>- * Marks the selected tasks complete</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_tasks_complete_selected (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tasks != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (priv-&gt;tasks_view);</div><div class='del'>-</div><div class='del'>-	set_status_message (tasks, _("Completing tasks..."));</div><div class='del'>-	e_calendar_table_complete_selected (cal_table);</div><div class='del'>-	set_status_message (tasks, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_delete_selected:</div><div class='del'>- * @tasks: A tasks control widget.</div><div class='del'>- * </div><div class='del'>- * Deletes the selected tasks in the task list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_tasks_delete_selected (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tasks != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (priv-&gt;tasks_view);</div><div class='del'>-	set_status_message (tasks, _("Deleting selected objects..."));</div><div class='del'>-	e_calendar_table_delete_selected (cal_table);</div><div class='del'>-	set_status_message (tasks, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-create_sexp (void)</div><div class='del'>-{</div><div class='del'>-	char *sexp;</div><div class='del'>-</div><div class='del'>-	sexp = g_strdup ("(and (= (get-vtype) \"VTODO\") (is-completed?))");</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Calendar model sexp:\n%s\n", sexp);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is updated in the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_updated_cb (CalQuery *query, const char *uid,</div><div class='del'>-		      gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-		      gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	cal_client_remove_object (priv-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an evaluation error occurs when running a query */</div><div class='del'>-static void</div><div class='del'>-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	g_warning ("eval error: %s\n", error_str);</div><div class='del'>-</div><div class='del'>-	set_status_message (tasks, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;query), tasks);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;query));</div><div class='del'>-	priv-&gt;query = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (status != CAL_QUERY_DONE_SUCCESS)</div><div class='del'>-		g_warning ("query done: %s\n", error_str);</div><div class='del'>-</div><div class='del'>-	set_status_message (tasks, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;query), tasks);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;query));</div><div class='del'>-	priv-&gt;query = NULL;</div><div class='del'>-}</div><div class='del'>-/**</div><div class='del'>- * e_tasks_expunge:</div><div class='del'>- * @tasks: A tasks control widget</div><div class='del'>- * </div><div class='del'>- * Removes all tasks marked as completed</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_tasks_delete_completed (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	char *sexp;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (tasks != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If we have a query, we are already expunging */</div><div class='del'>-	if (priv-&gt;query)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	sexp = create_sexp ();</div><div class='del'>-</div><div class='del'>-	set_status_message (tasks, _("Expunging"));</div><div class='del'>-	priv-&gt;query = cal_client_get_query (priv-&gt;client, sexp);</div><div class='del'>-	g_free (sexp);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;query) {</div><div class='del'>-		set_status_message (tasks, NULL);</div><div class='del'>-		g_message ("update_query(): Could not create the query");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), tasks);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "query_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_query_done_cb), tasks);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;query), "eval_error",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_eval_error_cb), tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from the view collection when we need to display a new view */</div><div class='del'>-static void</div><div class='del'>-display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-</div><div class='del'>-	if (GAL_IS_VIEW_ETABLE (view)) {</div><div class='del'>-		e_table_set_state_object (e_table_scrolled_get_table (E_TABLE_SCROLLED (E_CALENDAR_TABLE (tasks-&gt;priv-&gt;tasks_view)-&gt;etable)),</div><div class='del'>-					  GAL_VIEW_ETABLE (view)-&gt;state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_setup_view_menus:</div><div class='del'>- * @tasks: A tasks widget.</div><div class='del'>- * @uic: UI controller to use for the menus.</div><div class='del'>- * </div><div class='del'>- * Sets up the #GalView menus for a tasks control.  This function should be</div><div class='del'>- * called from the Bonobo control activation callback for this tasks control.</div><div class='del'>- * Also, the menus should be discarded using e_tasks_discard_view_menus().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	GalViewFactory *factory;</div><div class='del'>-	ETableSpecification *spec;</div><div class='del'>-	char *dir;</div><div class='del'>-	static GalViewCollection *collection = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tasks != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-	g_return_if_fail (uic != NULL);</div><div class='del'>-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;view_instance == NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;view_instance == NULL);</div><div class='del'>-	g_assert (priv-&gt;view_menus == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the view instance */</div><div class='del'>-</div><div class='del'>-	if (collection == NULL) {</div><div class='del'>-		collection = gal_view_collection_new ();</div><div class='del'>-</div><div class='del'>-		dir = gnome_util_prepend_user_home ("/evolution/views/tasks/");</div><div class='del'>-		gal_view_collection_set_storage_directories (collection,</div><div class='del'>-							     EVOLUTION_DATADIR "/evolution/views/tasks/",</div><div class='del'>-							     dir);</div><div class='del'>-		g_free (dir);</div><div class='del'>-</div><div class='del'>-		/* Create the views */</div><div class='del'>-</div><div class='del'>-		spec = e_table_specification_new ();</div><div class='del'>-		e_table_specification_load_from_file (spec, </div><div class='del'>-						      EVOLUTION_ETSPECDIR "/e-calendar-table.etspec");</div><div class='del'>-</div><div class='del'>-		factory = gal_view_factory_etable_new (spec);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (spec));</div><div class='del'>-		gal_view_collection_add_factory (collection, factory);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		/* Load the collection and create the menus */</div><div class='del'>-</div><div class='del'>-		gal_view_collection_load (collection);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_instance = gal_view_instance_new (collection, cal_client_get_uri (priv-&gt;client));</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_menus = gal_view_menus_new (priv-&gt;view_instance);</div><div class='del'>-	gal_view_menus_apply (priv-&gt;view_menus, uic, NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;view_instance), "display_view",</div><div class='del'>-			    GTK_SIGNAL_FUNC (display_view_cb), tasks);</div><div class='del'>-	display_view_cb (priv-&gt;view_instance, gal_view_instance_get_current_view (priv-&gt;view_instance), tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_discard_view_menus:</div><div class='del'>- * @tasks: A tasks widget.</div><div class='del'>- * </div><div class='del'>- * Discards the #GalView menus used by a tasks control.  This function should be</div><div class='del'>- * called from the Bonobo control deactivation callback for this tasks control.</div><div class='del'>- * The menus should have been set up with e_tasks_setup_view_menus().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_tasks_discard_view_menus (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tasks != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;view_instance != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;view_instance != NULL);</div><div class='del'>-	g_assert (priv-&gt;view_menus != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;view_instance));</div><div class='del'>-	priv-&gt;view_instance = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;view_menus));</div><div class='del'>-	priv-&gt;view_menus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_tasks_get_calendar_table:</div><div class='del'>- * @tasks: A tasks widget.</div><div class='del'>- * </div><div class='del'>- * Queries the #ECalendarTable contained in a tasks widget.</div><div class='del'>- * </div><div class='del'>- * Return value: The #ECalendarTable that the tasks widget uses to display its</div><div class='del'>- * information.</div><div class='del'>- **/</div><div class='del'>-ECalendarTable *</div><div class='del'>-e_tasks_get_calendar_table (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (tasks != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_TASKS (tasks), NULL);</div><div class='del'>-</div><div class='del'>-	priv = tasks-&gt;priv;</div><div class='del'>-	return E_CALENDAR_TABLE (priv-&gt;tasks_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This updates all the preference settings for all the ETasks widgets in use.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_tasks_update_all_config_settings	(void)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-	GList *elem;</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	for (elem = all_tasks; elem; elem = elem-&gt;next) {</div><div class='del'>-		tasks = E_TASKS (elem-&gt;data);</div><div class='del'>-		priv = tasks-&gt;priv;</div><div class='del'>-</div><div class='del'>-		calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv-&gt;tasks_view));</div><div class='del'>-</div><div class='del'>-		if (zone)</div><div class='del'>-			cal_client_set_default_timezone (priv-&gt;client, zone);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h<br/>deleted file mode 100644<br/>index b88e495dcc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-tasks.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-tasks.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-tasks.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_TASKS_H_</div><div class='del'>-#define _E_TASKS_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "e-calendar-table.h"</div><div class='del'>-</div><div class='del'>-#define E_TYPE_TASKS            (e_tasks_get_type ())</div><div class='del'>-#define E_TASKS(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks))</div><div class='del'>-#define E_TASKS_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), E_TYPE_TASKS, \</div><div class='del'>-				 ETasksClass))</div><div class='del'>-#define E_IS_TASKS(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TASKS))</div><div class='del'>-#define E_IS_TASKS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TASKS))</div><div class='del'>-</div><div class='del'>-typedef struct _ETasks ETasks;</div><div class='del'>-typedef struct _ETasksClass ETasksClass;</div><div class='del'>-typedef struct _ETasksPrivate ETasksPrivate;</div><div class='del'>-</div><div class='del'>-struct _ETasks {</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	ETasksPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETasksClass {</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* selection_changed) (ETasks *tasks, int n_selected);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_tasks_get_type        (void);</div><div class='del'>-GtkWidget *e_tasks_construct       (ETasks *tasks);</div><div class='del'>-</div><div class='del'>-GtkWidget *e_tasks_new             (void);</div><div class='del'>-</div><div class='del'>-void  e_tasks_set_ui_component  (ETasks            *tasks,</div><div class='del'>-				 BonoboUIComponent *ui_component);</div><div class='del'>-</div><div class='del'>-gboolean   e_tasks_open            (ETasks            *tasks,</div><div class='del'>-				    char              *file);</div><div class='del'>-</div><div class='del'>-CalClient *e_tasks_get_cal_client  (ETasks            *tasks);</div><div class='del'>-</div><div class='del'>-void       e_tasks_new_task          (ETasks            *tasks);</div><div class='del'>-void       e_tasks_complete_selected (ETasks            *tasks);</div><div class='del'>-void       e_tasks_delete_selected   (ETasks            *tasks);</div><div class='del'>-void       e_tasks_delete_completed  (ETasks            *tasks);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void e_tasks_setup_view_menus (ETasks *tasks, BonoboUIComponent *uic);</div><div class='del'>-void e_tasks_discard_view_menus (ETasks *tasks);</div><div class='del'>-</div><div class='del'>-ECalendarTable *e_tasks_get_calendar_table (ETasks *tasks);</div><div class='del'>-</div><div class='del'>-/* This updates all the preference settings for all the ETasks widgets in use.</div><div class='del'>- */</div><div class='del'>-void	   e_tasks_update_all_config_settings	(void);</div><div class='del'>-</div><div class='del'>-#endif /* _E_TASKS_H_ */</div><div class='head'>diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c<br/>deleted file mode 100644<br/>index 84c512b574..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-timezone-entry.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-timezone-entry.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,387 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in</div><div class='del'>- * a GtkEntry with a '...' button beside it which shows a dialog for changing</div><div class='del'>- * the timezone. The dialog contains a map of the world with a point for each</div><div class='del'>- * timezone, and an option menu as an alternative way of selecting the</div><div class='del'>- * timezone.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;widgets/e-timezone-dialog/e-timezone-dialog.h&gt;</div><div class='del'>-#include "e-timezone-entry.h"</div><div class='del'>-</div><div class='del'>-/* The timezone icon for the button. */</div><div class='del'>-#include "art/timezone-16.xpm"</div><div class='del'>-</div><div class='del'>-struct _ETimezoneEntryPrivate {</div><div class='del'>-	/* This is the timezone set in e_timezone_entry_set_timezone().</div><div class='del'>-	   Note that we don't copy it or use a ref count - we assume it is</div><div class='del'>-	   never destroyed for the lifetime of this widget. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	</div><div class='del'>-	/* This is TRUE if the timezone has been changed since being set.</div><div class='del'>-	   If it hasn't, we can just return zone, If it has, we return the</div><div class='del'>-	   builtin timezone with tzid. (It can only be changed to a builtin</div><div class='del'>-	   timezone, or to 'local time', i.e. no timezone.) */</div><div class='del'>-	gboolean changed;</div><div class='del'>-</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-</div><div class='del'>-	/* This can be set to the default timezone. If the current timezone</div><div class='del'>-	   setting in the ETimezoneEntry matches this, then the entry field</div><div class='del'>-	   is hidden. This makes the user interface simpler. */</div><div class='del'>-	icaltimezone *default_zone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-  CHANGED,</div><div class='del'>-  LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_timezone_entry_class_init	(ETimezoneEntryClass	*class);</div><div class='del'>-static void e_timezone_entry_init	(ETimezoneEntry	*tentry);</div><div class='del'>-static void e_timezone_entry_destroy	(GtkObject	*object);</div><div class='del'>-</div><div class='del'>-static void on_entry_changed		(GtkEntry	*entry,</div><div class='del'>-					 ETimezoneEntry *tentry);</div><div class='del'>-static void on_button_clicked		(GtkWidget	*widget,</div><div class='del'>-					 ETimezoneEntry	*tentry);</div><div class='del'>-</div><div class='del'>-static char* e_timezone_entry_get_display_name	(ETimezoneEntry *tentry,</div><div class='del'>-						 icaltimezone	*zone);</div><div class='del'>-</div><div class='del'>-static void e_timezone_entry_set_entry_visibility (ETimezoneEntry *tentry);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkHBoxClass *parent_class;</div><div class='del'>-static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_timezone_entry_get_type:</div><div class='del'>- *</div><div class='del'>- * Returns the GtkType for the ETimezoneEntry widget</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_timezone_entry_get_type		(void)</div><div class='del'>-{</div><div class='del'>-	static guint timezone_entry_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!timezone_entry_type){</div><div class='del'>-		GtkTypeInfo timezone_entry_info = {</div><div class='del'>-			"ETimezoneEntry",</div><div class='del'>-			sizeof (ETimezoneEntry),</div><div class='del'>-			sizeof (ETimezoneEntryClass),</div><div class='del'>-			(GtkClassInitFunc) e_timezone_entry_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_timezone_entry_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		timezone_entry_type = gtk_type_unique (gtk_hbox_get_type (), &amp;timezone_entry_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return timezone_entry_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_timezone_entry_class_init		(ETimezoneEntryClass	*class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_hbox_get_type ());</div><div class='del'>-</div><div class='del'>-	timezone_entry_signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ETimezoneEntryClass,</div><div class='del'>-						   changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, timezone_entry_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy		= e_timezone_entry_destroy;</div><div class='del'>-</div><div class='del'>-	class-&gt;changed = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_timezone_entry_init		(ETimezoneEntry	*tentry)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	GdkPixmap *timezone_icon;</div><div class='del'>-	GdkBitmap *timezone_mask;</div><div class='del'>-	GtkWidget *pixmap;</div><div class='del'>-</div><div class='del'>-	tentry-&gt;priv = priv = g_new0 (ETimezoneEntryPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;zone = NULL;</div><div class='del'>-	priv-&gt;changed = FALSE;</div><div class='del'>-	priv-&gt;default_zone = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;entry  = gtk_entry_new ();</div><div class='del'>-	gtk_entry_set_editable (GTK_ENTRY (priv-&gt;entry), FALSE);</div><div class='del'>-	/*gtk_widget_set_usize (priv-&gt;date_entry, 90, 0);*/</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (tentry), priv-&gt;entry, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (priv-&gt;entry);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;entry), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (on_entry_changed), tentry);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;button = gtk_button_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (on_button_clicked), tentry);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (tentry), priv-&gt;button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (priv-&gt;button);</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (priv-&gt;button);</div><div class='del'>-	timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;timezone_mask, NULL, timezone_16_xpm);</div><div class='del'>-</div><div class='del'>-	pixmap = gtk_pixmap_new (timezone_icon, timezone_mask);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;button), pixmap);</div><div class='del'>-	gtk_widget_show (pixmap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_timezone_entry_new:</div><div class='del'>- *</div><div class='del'>- * Description: Creates a new #ETimezoneEntry widget which can be used</div><div class='del'>- * to provide an easy to use way for entering dates and times.</div><div class='del'>- * </div><div class='del'>- * Returns: a new #ETimezoneEntry widget.</div><div class='del'>- */</div><div class='del'>-GtkWidget *</div><div class='del'>-e_timezone_entry_new			(void)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntry *tentry;</div><div class='del'>-</div><div class='del'>-	tentry = gtk_type_new (e_timezone_entry_get_type ());</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (tentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_timezone_entry_destroy		(GtkObject	*object)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntry *tentry;</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (object));</div><div class='del'>-</div><div class='del'>-	tentry = E_TIMEZONE_ENTRY (object);</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (tentry-&gt;priv);</div><div class='del'>-	tentry-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The arrow button beside the date field has been clicked, so we show the</div><div class='del'>-   popup with the ECalendar in. */</div><div class='del'>-static void</div><div class='del'>-on_button_clicked		(GtkWidget	*widget,</div><div class='del'>-				 ETimezoneEntry	*tentry)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-	ETimezoneDialog *timezone_dialog;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	char *tzid = NULL, *display_name, *old_display_name;</div><div class='del'>-</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	display_name = gtk_entry_get_text (GTK_ENTRY (priv-&gt;entry));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;zone)</div><div class='del'>-		tzid = icaltimezone_get_tzid (priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	timezone_dialog = e_timezone_dialog_new ();</div><div class='del'>-	e_timezone_dialog_set_timezone (timezone_dialog, tzid, display_name);</div><div class='del'>-</div><div class='del'>-	dialog = e_timezone_dialog_get_toplevel (timezone_dialog);</div><div class='del'>-</div><div class='del'>-	if (gnome_dialog_run_and_close (GNOME_DIALOG (dialog)) == 0) {</div><div class='del'>-		tzid = e_timezone_dialog_get_timezone (E_TIMEZONE_DIALOG (timezone_dialog), &amp;display_name);</div><div class='del'>-		old_display_name = gtk_entry_get_text (GTK_ENTRY (priv-&gt;entry));</div><div class='del'>-		/* See if the timezone has been changed. It can only have been</div><div class='del'>-		   changed to a builtin timezone, in which case the returned</div><div class='del'>-		   TZID will be NULL. */</div><div class='del'>-		if (strcmp (old_display_name, display_name)</div><div class='del'>-		    || (!tzid &amp;&amp; priv-&gt;zone)) {</div><div class='del'>-			priv-&gt;changed = TRUE;</div><div class='del'>-			priv-&gt;zone = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (priv-&gt;entry), display_name);</div><div class='del'>-		e_timezone_entry_set_entry_visibility (tentry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (timezone_dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-on_entry_changed			(GtkEntry	*entry,</div><div class='del'>-					 ETimezoneEntry *tentry)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-icaltimezone*</div><div class='del'>-e_timezone_entry_get_timezone		(ETimezoneEntry	*tentry)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-	char *display_name;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_TIMEZONE_ENTRY (tentry), NULL);</div><div class='del'>-</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the timezone hasn't been change, we can just return the same</div><div class='del'>-	   zone we were passed in. */</div><div class='del'>-	if (!priv-&gt;changed)</div><div class='del'>-		return priv-&gt;zone;</div><div class='del'>-</div><div class='del'>-	/* If the timezone has changed, it can only have been changed to a</div><div class='del'>-	   builtin timezone or 'local time' (i.e. no timezone). */</div><div class='del'>-	display_name = gtk_entry_get_text (GTK_ENTRY (priv-&gt;entry));</div><div class='del'>-</div><div class='del'>-	return e_timezone_dialog_get_builtin_timezone (display_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-	gchar *display_name;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));</div><div class='del'>-</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;zone = zone;</div><div class='del'>-	priv-&gt;changed = FALSE;</div><div class='del'>-</div><div class='del'>-	display_name = e_timezone_entry_get_display_name (tentry, zone);</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (priv-&gt;entry),</div><div class='del'>-			    display_name ? display_name : "");</div><div class='del'>-	g_free (display_name);</div><div class='del'>-</div><div class='del'>-	e_timezone_entry_set_entry_visibility (tentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the timezone name to display to the user, in the locale's encoding.</div><div class='del'>-   We prefer to use the Olson city name, but fall back on the TZNAME, or</div><div class='del'>-   finally the TZID. We don't want to use "" as it may be wrongly interpreted</div><div class='del'>-   as a 'local time'. If zone is NULL, NULL is returned. The returned string</div><div class='del'>-   should be freed. */</div><div class='del'>-static char*</div><div class='del'>-e_timezone_entry_get_display_name	(ETimezoneEntry *tentry,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	char *display_name;</div><div class='del'>-</div><div class='del'>-	if (!zone)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Get the UTF-8 display name from the icaltimezone. */</div><div class='del'>-	display_name = icaltimezone_get_display_name (zone);</div><div class='del'>-</div><div class='del'>-	/* We check if it is one of our builtin timezone names, in which case</div><div class='del'>-	   we call gettext to translate it. If it isn't a builtin timezone</div><div class='del'>-	   name, we need to convert it to the GTK+ encoding. */</div><div class='del'>-	if (icaltimezone_get_builtin_timezone (display_name)) {</div><div class='del'>-		return g_strdup (_(display_name));</div><div class='del'>-	} else {</div><div class='del'>-		return e_utf8_to_gtk_string (GTK_WIDGET (tentry),</div><div class='del'>-					     display_name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Sets the default timezone. If the current timezone matches this, then the</div><div class='del'>-   entry field is hidden. This is useful since most people do not use timezones</div><div class='del'>-   so it makes the user interface simpler. */</div><div class='del'>-void</div><div class='del'>-e_timezone_entry_set_default_timezone	(ETimezoneEntry	*tentry,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_TIMEZONE_ENTRY (tentry));</div><div class='del'>-</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;default_zone = zone;</div><div class='del'>-</div><div class='del'>-	e_timezone_entry_set_entry_visibility (tentry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_timezone_entry_set_entry_visibility (ETimezoneEntry	*tentry)</div><div class='del'>-{</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	gboolean show_entry = TRUE;</div><div class='del'>-</div><div class='del'>-	priv = tentry-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;default_zone) {</div><div class='del'>-		zone = e_timezone_entry_get_timezone (tentry);</div><div class='del'>-		if (zone == priv-&gt;default_zone)</div><div class='del'>-			show_entry = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (show_entry)</div><div class='del'>-		gtk_widget_show (priv-&gt;entry);</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_hide (priv-&gt;entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h<br/>deleted file mode 100644<br/>index 4a057f681f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-timezone-entry.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-timezone-entry.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ETimezoneEntry - a field for setting a timezone. It shows the timezone in</div><div class='del'>- * a GtkEntry with a '...' button beside it which shows a dialog for changing</div><div class='del'>- * the timezone. The dialog contains a map of the world with a point for each</div><div class='del'>- * timezone, and an option menu as an alternative way of selecting the</div><div class='del'>- * timezone.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_TIMEZONE_ENTRY_H_</div><div class='del'>-#define __E_TIMEZONE_ENTRY_H_ </div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>- </div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_TYPE_TIMEZONE_ENTRY            (e_timezone_entry_get_type ())</div><div class='del'>-#define E_TIMEZONE_ENTRY(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))</div><div class='del'>-#define E_TIMEZONE_ENTRY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))</div><div class='del'>-#define E_IS_TIMEZONE_ENTRY(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))</div><div class='del'>-#define E_IS_TIMEZONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ETimezoneEntry        ETimezoneEntry;</div><div class='del'>-typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;</div><div class='del'>-typedef struct _ETimezoneEntryClass   ETimezoneEntryClass;</div><div class='del'>-</div><div class='del'>-struct _ETimezoneEntry {</div><div class='del'>-	GtkHBox hbox;</div><div class='del'>-</div><div class='del'>-	/*&lt; private &gt;*/</div><div class='del'>-	ETimezoneEntryPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETimezoneEntryClass {</div><div class='del'>-	GtkHBoxClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed)      (ETimezoneEntry    *tentry);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint      e_timezone_entry_get_type		(void);</div><div class='del'>-GtkWidget* e_timezone_entry_new			(void);</div><div class='del'>-</div><div class='del'>-icaltimezone*   e_timezone_entry_get_timezone	(ETimezoneEntry	*tentry);</div><div class='del'>-void		e_timezone_entry_set_timezone	(ETimezoneEntry	*tentry,</div><div class='del'>-						 icaltimezone	*zone);</div><div class='del'>-</div><div class='del'>-/* Sets the default timezone. If the current timezone matches this, then the</div><div class='del'>-   entry field is hidden. This is useful since most people do not use timezones</div><div class='del'>-   so it makes the user interface simpler. */</div><div class='del'>-void	   e_timezone_entry_set_default_timezone(ETimezoneEntry	*tentry,</div><div class='del'>-						 icaltimezone	*zone);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* __E_TIMEZONE_ENTRY_H_ */</div><div class='head'>diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c<br/>deleted file mode 100644<br/>index 4d532be5bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-event-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-event-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,901 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewEventItem - displays the background, times and icons for an event</div><div class='del'>- * in the week/month views. A separate EText canvas item is used to display &amp;</div><div class='del'>- * edit the text.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-categories-config.h"</div><div class='del'>-#include "e-week-view-event-item.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_week_view_event_item_class_init	(EWeekViewEventItemClass *class);</div><div class='del'>-static void e_week_view_event_item_init		(EWeekViewEventItem *wveitem);</div><div class='del'>-</div><div class='del'>-static void e_week_view_event_item_set_arg	(GtkObject	 *o,</div><div class='del'>-						 GtkArg		 *arg,</div><div class='del'>-						 guint		  arg_id);</div><div class='del'>-static void e_week_view_event_item_update	(GnomeCanvasItem *item,</div><div class='del'>-						 double		 *affine,</div><div class='del'>-						 ArtSVP		 *clip_path,</div><div class='del'>-						 int		  flags);</div><div class='del'>-static void e_week_view_event_item_draw		(GnomeCanvasItem *item,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 int		  x,</div><div class='del'>-						 int		  y,</div><div class='del'>-						 int		  width,</div><div class='del'>-						 int		  height);</div><div class='del'>-static void e_week_view_draw_time		(EWeekView	*week_view,</div><div class='del'>-						 GdkDrawable	*drawable,</div><div class='del'>-						 gint		 time_x,</div><div class='del'>-						 gint		 time_y,</div><div class='del'>-						 gint		 hour,</div><div class='del'>-						 gint		 minute);</div><div class='del'>-static void e_week_view_event_item_draw_icons	(EWeekViewEventItem *wveitem,</div><div class='del'>-						 GdkDrawable        *drawable,</div><div class='del'>-						 gint		     icon_x,</div><div class='del'>-						 gint		     icon_y,</div><div class='del'>-						 gint		     x2,</div><div class='del'>-						 gboolean	     right_align);</div><div class='del'>-static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,</div><div class='del'>-						  GdkDrawable	     *drawable,</div><div class='del'>-						  gint		      x,</div><div class='del'>-						  gint		      y,</div><div class='del'>-						  gint		      w,</div><div class='del'>-						  gint		      h);</div><div class='del'>-static double e_week_view_event_item_point	(GnomeCanvasItem *item,</div><div class='del'>-						 double		  x,</div><div class='del'>-						 double		  y,</div><div class='del'>-						 int		  cx,</div><div class='del'>-						 int		  cy,</div><div class='del'>-						 GnomeCanvasItem **actual_item);</div><div class='del'>-static gint e_week_view_event_item_event	(GnomeCanvasItem *item,</div><div class='del'>-						 GdkEvent	 *event);</div><div class='del'>-static gboolean e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,</div><div class='del'>-						     GdkEvent		*event);</div><div class='del'>-static gboolean e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,</div><div class='del'>-						       GdkEvent		  *event);</div><div class='del'>-static gboolean e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,</div><div class='del'>-						     GdkEvent		*bevent);</div><div class='del'>-static EWeekViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,</div><div class='del'>-							      gdouble x,</div><div class='del'>-							      gdouble y);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_EVENT_NUM,</div><div class='del'>-	ARG_SPAN_NUM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_week_view_event_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_week_view_event_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_event_item_type) {</div><div class='del'>-		GtkTypeInfo e_week_view_event_item_info = {</div><div class='del'>-			"EWeekViewEventItem",</div><div class='del'>-			sizeof (EWeekViewEventItem),</div><div class='del'>-			sizeof (EWeekViewEventItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_week_view_event_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_week_view_event_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_week_view_event_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_week_view_event_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_week_view_event_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EWeekViewEventItem::event_num",</div><div class='del'>-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_EVENT_NUM);</div><div class='del'>-	gtk_object_add_arg_type ("EWeekViewEventItem::span_num",</div><div class='del'>-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_SPAN_NUM);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_week_view_event_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_week_view_event_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_week_view_event_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_week_view_event_item_point;</div><div class='del'>-	item_class-&gt;event       = e_week_view_event_item_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_init (EWeekViewEventItem *wveitem)</div><div class='del'>-{</div><div class='del'>-	wveitem-&gt;event_num = -1;</div><div class='del'>-	wveitem-&gt;span_num = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EWeekViewEventItem *wveitem;</div><div class='del'>-	gboolean needs_update = FALSE;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	wveitem = E_WEEK_VIEW_EVENT_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_EVENT_NUM:</div><div class='del'>-		wveitem-&gt;event_num = GTK_VALUE_INT (*arg);</div><div class='del'>-		needs_update = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPAN_NUM:</div><div class='del'>-		wveitem-&gt;span_num = GTK_VALUE_INT (*arg);</div><div class='del'>-		needs_update = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (needs_update)</div><div class='del'>-		gnome_canvas_item_request_update (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_update (GnomeCanvasItem *item,</div><div class='del'>-			       double	       *affine,</div><div class='del'>-			       ArtSVP	       *clip_path,</div><div class='del'>-			       int	        flags)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEventItem *wveitem;</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	gint span_x, span_y, span_w;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_event_item_update\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = 0;</div><div class='del'>-	item-&gt;y2 = 0;</div><div class='del'>-</div><div class='del'>-	if (wveitem-&gt;event_num != -1 &amp;&amp; wveitem-&gt;span_num != -1) {</div><div class='del'>-		if (e_week_view_get_span_position (week_view,</div><div class='del'>-						   wveitem-&gt;event_num,</div><div class='del'>-						   wveitem-&gt;span_num,</div><div class='del'>-						   &amp;span_x, &amp;span_y,</div><div class='del'>-						   &amp;span_w)) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  Event:%i Span:%i %i,%i W:%i\n",</div><div class='del'>-				 wveitem-&gt;event_num, wveitem-&gt;span_num,</div><div class='del'>-				 span_x, span_y, span_w);</div><div class='del'>-#endif</div><div class='del'>-			item-&gt;x1 = span_x;</div><div class='del'>-			item-&gt;y1 = span_y;</div><div class='del'>-			item-&gt;x2 = span_x + span_w - 1;</div><div class='del'>-			item-&gt;y2 = span_y + week_view-&gt;row_height - 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,</div><div class='del'>-			     GdkDrawable      *drawable,</div><div class='del'>-			     int	       x,</div><div class='del'>-			     int	       y,</div><div class='del'>-			     int	       width,</div><div class='del'>-			     int	       height)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEventItem *wveitem;</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint x1, y1, x2, y2, time_x, time_y;</div><div class='del'>-	gint icon_x, icon_y, time_width, min_end_time_x, max_icon_x;</div><div class='del'>-	gint rect_x, rect_w, rect_x2;</div><div class='del'>-	gboolean one_day_event, editing_span = FALSE;</div><div class='del'>-	gint start_hour, start_minute, end_hour, end_minute;</div><div class='del'>-	gboolean draw_start, draw_end;</div><div class='del'>-	gboolean draw_start_triangle = FALSE, draw_end_triangle = FALSE;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_event_item_draw %i,%i %ix%i\n",</div><div class='del'>-		 x, y, width, height);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	wveitem = E_WEEK_VIEW_EVENT_ITEM (canvas_item);</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (canvas_item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (wveitem-&gt;event_num == -1 || wveitem-&gt;span_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				wveitem-&gt;event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + wveitem-&gt;span_num);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (week_view)-&gt;style;</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	x1 = canvas_item-&gt;x1 - x;</div><div class='del'>-	y1 = canvas_item-&gt;y1 - y;</div><div class='del'>-	x2 = canvas_item-&gt;x2 - x;</div><div class='del'>-	y2 = canvas_item-&gt;y2 - y;</div><div class='del'>-</div><div class='del'>-	if (x1 == x2 || y1 == y2)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icon_x = 0;</div><div class='del'>-	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;</div><div class='del'>-</div><div class='del'>-	/* Get the start &amp; end times in 24-hour format. */</div><div class='del'>-	start_hour = event-&gt;start_minute / 60;</div><div class='del'>-	start_minute = event-&gt;start_minute % 60;</div><div class='del'>-	end_hour = event-&gt;end_minute / 60;</div><div class='del'>-	end_minute = event-&gt;end_minute % 60;</div><div class='del'>-</div><div class='del'>-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;</div><div class='del'>-</div><div class='del'>-	time_width = e_week_view_get_time_string_width (week_view);</div><div class='del'>-</div><div class='del'>-	one_day_event = e_week_view_is_one_day_event (week_view,</div><div class='del'>-						      wveitem-&gt;event_num);</div><div class='del'>-	if (one_day_event) {</div><div class='del'>-		time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;</div><div class='del'>-</div><div class='del'>-		/* Draw the start and end times, as required. */</div><div class='del'>-		switch (week_view-&gt;time_format) {</div><div class='del'>-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:</div><div class='del'>-		case E_WEEK_VIEW_TIME_BOTH:</div><div class='del'>-			draw_start = TRUE;</div><div class='del'>-			draw_end = TRUE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:</div><div class='del'>-		case E_WEEK_VIEW_TIME_START:</div><div class='del'>-			draw_start = TRUE;</div><div class='del'>-			draw_end = FALSE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case E_WEEK_VIEW_TIME_NONE:</div><div class='del'>-			draw_start = FALSE;</div><div class='del'>-			draw_end = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached();</div><div class='del'>-			draw_start = FALSE;</div><div class='del'>-			draw_end = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_start) {</div><div class='del'>-			e_week_view_draw_time (week_view, drawable,</div><div class='del'>-					       time_x, time_y,</div><div class='del'>-					       start_hour, start_minute);</div><div class='del'>-			time_x += time_width;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_end) {</div><div class='del'>-			time_x += E_WEEK_VIEW_EVENT_TIME_SPACING;</div><div class='del'>-			e_week_view_draw_time (week_view, drawable,</div><div class='del'>-					       time_x, time_y,</div><div class='del'>-					       end_hour, end_minute);</div><div class='del'>-			time_x += time_width;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icon_x = time_x;</div><div class='del'>-		if (draw_start)</div><div class='del'>-			icon_x += E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-</div><div class='del'>-		/* Draw the icons. */</div><div class='del'>-		e_week_view_event_item_draw_icons (wveitem, drawable,</div><div class='del'>-						   icon_x, icon_y,</div><div class='del'>-						   x2, FALSE);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		rect_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;</div><div class='del'>-		rect_w = x2 - x1 - E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-			- E_WEEK_VIEW_EVENT_R_PAD + 1;</div><div class='del'>-</div><div class='del'>-		/* Draw the triangles at the start &amp; end, if needed.</div><div class='del'>-		   They also use the first few pixels at the edge of the</div><div class='del'>-		   event so we update rect_x &amp; rect_w so we don't draw over</div><div class='del'>-		   them. */</div><div class='del'>-		if (event-&gt;start &lt; week_view-&gt;day_starts[span-&gt;start_day]) {</div><div class='del'>-			draw_start_triangle = TRUE;</div><div class='del'>-			rect_x += 2;</div><div class='del'>-			rect_w -= 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (event-&gt;end &gt; week_view-&gt;day_starts[span-&gt;start_day</div><div class='del'>-						      + span-&gt;num_days]) {</div><div class='del'>-			draw_end_triangle = TRUE;</div><div class='del'>-			rect_w -= 2;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);</div><div class='del'>-		gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-				    rect_x, y1 + 1, rect_w, y2 - y1 - 1);</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);</div><div class='del'>-		rect_x2 = rect_x + rect_w - 1;</div><div class='del'>-		gdk_draw_line (drawable, gc, rect_x,  y1, rect_x2, y1);</div><div class='del'>-		gdk_draw_line (drawable, gc, rect_x,  y2, rect_x2, y2);</div><div class='del'>-</div><div class='del'>-		if (draw_start_triangle) {</div><div class='del'>-			e_week_view_event_item_draw_triangle (wveitem, drawable, x1 + E_WEEK_VIEW_EVENT_L_PAD + 2, y1, -3, y2 - y1 + 1);</div><div class='del'>-		} else {</div><div class='del'>-			gdk_draw_line (drawable, gc, rect_x,  y1, rect_x, y2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (draw_end_triangle) {</div><div class='del'>-			e_week_view_event_item_draw_triangle (wveitem, drawable, x2 - E_WEEK_VIEW_EVENT_R_PAD - 2, y1, 3, y2 - y1 + 1);</div><div class='del'>-		} else {</div><div class='del'>-			gdk_draw_line (drawable, gc, rect_x2, y1, rect_x2, y2);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (span-&gt;text_item &amp;&amp; E_TEXT (span-&gt;text_item)-&gt;editing)</div><div class='del'>-			editing_span = TRUE;</div><div class='del'>-</div><div class='del'>-		/* Draw the start &amp; end times, if they are not on day</div><div class='del'>-		   boundaries. The start time would always be shown if it was</div><div class='del'>-		   needed, though it may be clipped as the window shrinks.</div><div class='del'>-		   The end time is only displayed if there is enough room.</div><div class='del'>-		   We calculate the minimum position for the end time, which</div><div class='del'>-		   depends on whether the start time is displayed. If the end</div><div class='del'>-		   time doesn't fit, then we don't draw it. */</div><div class='del'>-		min_end_time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-			+ E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-			+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;</div><div class='del'>-		if (!editing_span</div><div class='del'>-		    &amp;&amp; event-&gt;start &gt; week_view-&gt;day_starts[span-&gt;start_day]) {</div><div class='del'>-			time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;</div><div class='del'>-</div><div class='del'>-			clip_rect.x = x1;</div><div class='del'>-			clip_rect.y = y1;</div><div class='del'>-			clip_rect.width = x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1;</div><div class='del'>-			clip_rect.height = y2 - y1 + 1;</div><div class='del'>-			gdk_gc_set_clip_rectangle (gc, &amp;clip_rect);</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);</div><div class='del'>-</div><div class='del'>-			e_week_view_draw_time (week_view, drawable,</div><div class='del'>-					       time_x, time_y,</div><div class='del'>-					       start_hour, start_minute);</div><div class='del'>-</div><div class='del'>-			gdk_gc_set_clip_rectangle (gc, NULL);</div><div class='del'>-</div><div class='del'>-			/* We don't want the end time to be drawn over the</div><div class='del'>-			   start time, so we increase the minimum position. */</div><div class='del'>-			min_end_time_x += time_width</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		max_icon_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-			- E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-			- E_WEEK_VIEW_EVENT_EDGE_X_PAD;</div><div class='del'>-</div><div class='del'>-		if (!editing_span</div><div class='del'>-		    &amp;&amp; event-&gt;end &lt; week_view-&gt;day_starts[span-&gt;start_day</div><div class='del'>-							 + span-&gt;num_days]) {</div><div class='del'>-			/* Calculate where the end time should be displayed. */</div><div class='del'>-			time_x = x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD</div><div class='del'>-				- time_width;</div><div class='del'>-</div><div class='del'>-			/* Draw the end time, if the position is greater than</div><div class='del'>-			   the minimum calculated above. */</div><div class='del'>-			if (time_x &gt;= min_end_time_x) {</div><div class='del'>-				e_week_view_draw_time (week_view, drawable,</div><div class='del'>-						       time_x, time_y,</div><div class='del'>-						       end_hour, end_minute);</div><div class='del'>-				max_icon_x -= time_width</div><div class='del'>-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Draw the icons. */</div><div class='del'>-		if (span-&gt;text_item</div><div class='del'>-		    &amp;&amp; (week_view-&gt;editing_event_num != wveitem-&gt;event_num</div><div class='del'>-			|| week_view-&gt;editing_span_num != wveitem-&gt;span_num)) {</div><div class='del'>-			icon_x = span-&gt;text_item-&gt;x1 - E_WEEK_VIEW_ICON_R_PAD - x;</div><div class='del'>-			e_week_view_event_item_draw_icons (wveitem, drawable,</div><div class='del'>-							   icon_x, icon_y,</div><div class='del'>-							   max_icon_x, TRUE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_draw_time	(EWeekView	*week_view,</div><div class='del'>-			 GdkDrawable	*drawable,</div><div class='del'>-			 gint		 time_x,</div><div class='del'>-			 gint		 time_y,</div><div class='del'>-			 gint		 hour,</div><div class='del'>-			 gint		 minute)</div><div class='del'>-{</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkFont *font, *small_font;</div><div class='del'>-	gint hour_to_display, suffix_width;</div><div class='del'>-	gint time_y_normal_font, time_y_small_font;</div><div class='del'>-	gchar buffer[128], *suffix;</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (week_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-	small_font = week_view-&gt;small_font;</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_TEXT]);</div><div class='del'>-</div><div class='del'>-	time_y_normal_font = time_y_small_font = time_y + font-&gt;ascent;</div><div class='del'>-	if (small_font)</div><div class='del'>-		time_y_small_font = time_y + small_font-&gt;ascent;</div><div class='del'>-</div><div class='del'>-	e_week_view_convert_time_to_display (week_view, hour, &amp;hour_to_display,</div><div class='del'>-					     &amp;suffix, &amp;suffix_width);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;use_small_font &amp;&amp; week_view-&gt;small_font) {</div><div class='del'>-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i",</div><div class='del'>-			    hour_to_display, minute);</div><div class='del'>-</div><div class='del'>-		/* Draw the hour. */</div><div class='del'>-		if (hour_to_display &lt; 10)</div><div class='del'>-			gdk_draw_text (drawable, font, gc,</div><div class='del'>-				       time_x + week_view-&gt;digit_width,</div><div class='del'>-				       time_y_normal_font, buffer + 1, 1);</div><div class='del'>-		else</div><div class='del'>-			gdk_draw_text (drawable, font, gc,</div><div class='del'>-				       time_x, time_y_normal_font, buffer, 2);</div><div class='del'>-</div><div class='del'>-		time_x += week_view-&gt;digit_width * 2;</div><div class='del'>-</div><div class='del'>-		/* Draw the start minute, in the small font. */</div><div class='del'>-		gdk_draw_text (drawable, week_view-&gt;small_font, gc,</div><div class='del'>-			       time_x, time_y_small_font, buffer + 3, 2);</div><div class='del'>-</div><div class='del'>-		time_x += week_view-&gt;small_digit_width * 2;</div><div class='del'>-</div><div class='del'>-		/* Draw the 'am'/'pm' suffix, if 12-hour format. */</div><div class='del'>-		if (!week_view-&gt;use_24_hour_format) {</div><div class='del'>-			gdk_draw_string (drawable, font, gc,</div><div class='del'>-					 time_x, time_y_normal_font, suffix);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Draw the start time in one go. */</div><div class='del'>-		g_snprintf (buffer, sizeof (buffer), "%2i:%02i%s",</div><div class='del'>-			    hour_to_display, minute, suffix);</div><div class='del'>-		if (hour_to_display &lt; 10)</div><div class='del'>-			gdk_draw_string (drawable, font, gc,</div><div class='del'>-					 time_x + week_view-&gt;digit_width,</div><div class='del'>-					 time_y_normal_font, buffer + 1);</div><div class='del'>-		else</div><div class='del'>-			gdk_draw_string (drawable, font, gc,</div><div class='del'>-					 time_x, time_y_normal_font,</div><div class='del'>-					 buffer);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,</div><div class='del'>-				   GdkDrawable        *drawable,</div><div class='del'>-				   gint		       icon_x,</div><div class='del'>-				   gint		       icon_y,</div><div class='del'>-				   gint		       x2,</div><div class='del'>-				   gboolean	       right_align)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint num_icons = 0, icon_x_inc;</div><div class='del'>-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;</div><div class='del'>-	gboolean draw_timezone_icon = FALSE;</div><div class='del'>-	GSList *categories_list, *elem;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)-&gt;canvas)-&gt;parent);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				wveitem-&gt;event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + wveitem-&gt;span_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		draw_reminder_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_recurrences (comp)) {</div><div class='del'>-		draw_recurrence_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event-&gt;different_timezone) {</div><div class='del'>-		draw_timezone_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-	num_icons += g_slist_length (categories_list);</div><div class='del'>-</div><div class='del'>-	icon_x_inc = E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD;</div><div class='del'>-</div><div class='del'>-	if (right_align)</div><div class='del'>-		icon_x -= icon_x_inc * num_icons;</div><div class='del'>-</div><div class='del'>-	if (draw_reminder_icon &amp;&amp; icon_x + E_WEEK_VIEW_ICON_WIDTH &lt;= x2) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, week_view-&gt;reminder_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 week_view-&gt;reminder_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_WEEK_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_WEEK_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x += icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (draw_recurrence_icon &amp;&amp; icon_x + E_WEEK_VIEW_ICON_WIDTH &lt;= x2) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, week_view-&gt;recurrence_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 week_view-&gt;recurrence_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_WEEK_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_WEEK_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x += icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (draw_timezone_icon &amp;&amp; icon_x + E_WEEK_VIEW_ICON_WIDTH &lt;= x2) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, week_view-&gt;timezone_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 week_view-&gt;timezone_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_WEEK_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_WEEK_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x += icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* draw categories icons */</div><div class='del'>-	for (elem = categories_list; elem; elem = elem-&gt;next) {</div><div class='del'>-		char *category;</div><div class='del'>-		GdkPixmap *pixmap = NULL;</div><div class='del'>-		GdkBitmap *mask = NULL;</div><div class='del'>-</div><div class='del'>-		category = (char *) elem-&gt;data;</div><div class='del'>-		e_categories_config_get_icon_for (category, &amp;pixmap, &amp;mask);</div><div class='del'>-		if (pixmap == NULL)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (icon_x + E_WEEK_VIEW_ICON_WIDTH &lt;= x2) {</div><div class='del'>-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-			if (mask != NULL)</div><div class='del'>-				gdk_gc_set_clip_mask (gc, mask);</div><div class='del'>-			gdk_draw_pixmap (drawable, gc,</div><div class='del'>-					 pixmap,</div><div class='del'>-					 0, 0, icon_x, icon_y,</div><div class='del'>-					 E_WEEK_VIEW_ICON_WIDTH,</div><div class='del'>-					 E_WEEK_VIEW_ICON_HEIGHT);</div><div class='del'>-			icon_x += icon_x_inc;</div><div class='del'>-		}</div><div class='del'>-		gdk_pixmap_unref (pixmap);</div><div class='del'>-		if (mask != NULL)</div><div class='del'>-			gdk_bitmap_unref (mask);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_categories_list (categories_list);</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_clip_mask (gc, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This draws a little triangle to indicate that an event extends past</div><div class='del'>-   the days visible on screen. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,</div><div class='del'>-				      GdkDrawable	 *drawable,</div><div class='del'>-				      gint		  x,</div><div class='del'>-				      gint		  y,</div><div class='del'>-				      gint		  w,</div><div class='del'>-				      gint		  h)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkPoint points[3];</div><div class='del'>-	gint c1, c2;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)-&gt;canvas)-&gt;parent);</div><div class='del'>-</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	points[0].x = x;</div><div class='del'>-	points[0].y = y;</div><div class='del'>-	points[1].x = x + w;</div><div class='del'>-	points[1].y = y + (h / 2) - 1;</div><div class='del'>-	points[2].x = x;</div><div class='del'>-	points[2].y = y + h - 1;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);</div><div class='del'>-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);</div><div class='del'>-</div><div class='del'>-	/* If the height is odd we can use the same central point for both</div><div class='del'>-	   lines. If it is even we use different end-points. */</div><div class='del'>-	c1 = c2 = y + (h / 2);</div><div class='del'>-	if (h % 2 == 0)</div><div class='del'>-		c1--;</div><div class='del'>-</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y, x + w, c1);</div><div class='del'>-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item the the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			      int cx, int cy,</div><div class='del'>-			      GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEventItem *wveitem;</div><div class='del'>-</div><div class='del'>-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		return e_week_view_event_item_double_click (wveitem, event);</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		return e_week_view_event_item_button_press (wveitem, event);</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		return e_week_view_event_item_button_release (wveitem, event);</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,</div><div class='del'>-				     GdkEvent		*bevent)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewPosition pos;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (wveitem);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				wveitem-&gt;event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + wveitem-&gt;span_num);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_event_item_button_press\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	pos = e_week_view_event_item_get_position (wveitem, bevent-&gt;button.x,</div><div class='del'>-						   bevent-&gt;button.y);</div><div class='del'>-	if (pos == E_WEEK_VIEW_POS_NONE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (bevent-&gt;button.button == 1) {</div><div class='del'>-		week_view-&gt;pressed_event_num = wveitem-&gt;event_num;</div><div class='del'>-		week_view-&gt;pressed_span_num = wveitem-&gt;span_num;</div><div class='del'>-</div><div class='del'>-		/* Ignore clicks on the event while editing. */</div><div class='del'>-		if (E_TEXT (span-&gt;text_item)-&gt;editing)</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		/* Remember the item clicked and the mouse position,</div><div class='del'>-		   so we can start a drag if the mouse moves. */</div><div class='del'>-		week_view-&gt;drag_event_x = bevent-&gt;button.x;</div><div class='del'>-		week_view-&gt;drag_event_y = bevent-&gt;button.y;</div><div class='del'>-</div><div class='del'>-		/* FIXME: Remember the day offset from the start of the event.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (bevent-&gt;button.button == 3) {</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (week_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (week_view));</div><div class='del'>-		e_week_view_show_popup_menu (week_view,</div><div class='del'>-					     (GdkEventButton*) bevent,</div><div class='del'>-					     wveitem-&gt;event_num);</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item-&gt;canvas),</div><div class='del'>-					      "button_press_event");</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,</div><div class='del'>-				       GdkEvent		  *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (wveitem);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_event_item_button_release\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;pressed_event_num != -1</div><div class='del'>-	    &amp;&amp; week_view-&gt;pressed_event_num == wveitem-&gt;event_num</div><div class='del'>-	    &amp;&amp; week_view-&gt;pressed_span_num == wveitem-&gt;span_num) {</div><div class='del'>-		e_week_view_start_editing_event (week_view,</div><div class='del'>-						 wveitem-&gt;event_num,</div><div class='del'>-						 wveitem-&gt;span_num,</div><div class='del'>-						 NULL);</div><div class='del'>-		week_view-&gt;pressed_event_num = -1;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	week_view-&gt;pressed_event_num = -1;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,</div><div class='del'>-				     GdkEvent		*bevent)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (wveitem);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				wveitem-&gt;event_num);</div><div class='del'>-</div><div class='del'>-	e_week_view_stop_editing_event (week_view);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_edit_object (week_view-&gt;calendar, event-&gt;comp, FALSE);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Calendar not set");</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EWeekViewPosition</div><div class='del'>-e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,</div><div class='del'>-				     gdouble x,</div><div class='del'>-				     gdouble y)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (wveitem);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (item-&gt;canvas)-&gt;parent);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), E_WEEK_VIEW_POS_NONE);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_event_item_get_position item: %g,%g %g,%g point: %g,%g\n", item-&gt;x1, item-&gt;y1, item-&gt;x2, item-&gt;y2, x, y);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (x &lt; item-&gt;x1 + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-	    || x &gt;= item-&gt;x2 - E_WEEK_VIEW_EVENT_R_PAD)</div><div class='del'>-		return E_WEEK_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	/* Support left/right edge for long events only. */</div><div class='del'>-	if (!e_week_view_is_one_day_event (week_view, wveitem-&gt;event_num)) {</div><div class='del'>-		if (x &lt; item-&gt;x1 + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-		    + E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-		    + E_WEEK_VIEW_EVENT_EDGE_X_PAD)</div><div class='del'>-			return E_WEEK_VIEW_POS_LEFT_EDGE;</div><div class='del'>-</div><div class='del'>-		if (x &gt;= item-&gt;x2 + 1 - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-		    - E_WEEK_VIEW_EVENT_EDGE_X_PAD)</div><div class='del'>-			return E_WEEK_VIEW_POS_RIGHT_EDGE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_WEEK_VIEW_POS_EVENT;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h<br/>deleted file mode 100644<br/>index 20cace0132..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-event-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-event-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_WEEK_VIEW_EVENT_ITEM_H_</div><div class='del'>-#define _E_WEEK_VIEW_EVENT_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewEventItem - displays the background, times and icons for an event</div><div class='del'>- * in the week/month views. A separate EText canvas item is used to display &amp;</div><div class='del'>- * edit the text.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_EVENT_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_week_view_event_item_get_type (), EWeekViewEventItem))</div><div class='del'>-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_week_view_event_item_get_type ()))</div><div class='del'>-#define E_IS_WEEK_VIEW_EVENT_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_week_view_event_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The event index in the EWeekView events array. */</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	/* The span index within the event. */</div><div class='del'>-	gint span_num;</div><div class='del'>-} EWeekViewEventItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EWeekViewEventItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_week_view_event_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c<br/>deleted file mode 100644<br/>index 4ab1cf1fd9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-layout.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-layout.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,425 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Lays out events for the Week &amp; Month views of the calendar. It is also</div><div class='del'>- * used for printing.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-week-view-layout.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_week_view_layout_event	(EWeekViewEvent	*event,</div><div class='del'>-					 guint8		*grid,</div><div class='del'>-					 GArray		*spans,</div><div class='del'>-					 GArray		*old_spans,</div><div class='del'>-					 gboolean	 multi_week_view,</div><div class='del'>-					 gint		 weeks_shown,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		 start_weekday,</div><div class='del'>-					 time_t		*day_starts,</div><div class='del'>-					 gint		*rows_per_day);</div><div class='del'>-static gint e_week_view_find_day	(time_t		 time_to_find,</div><div class='del'>-					 gboolean	 include_midnight_in_prev_day,</div><div class='del'>-					 gint		 days_shown,</div><div class='del'>-					 time_t		*day_starts);</div><div class='del'>-static gint e_week_view_find_span_end	(gboolean	 multi_week_view,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		 display_start_day,</div><div class='del'>-					 gint		 day);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GArray*</div><div class='del'>-e_week_view_layout_events	(GArray		*events,</div><div class='del'>-				 GArray		*old_spans,</div><div class='del'>-				 gboolean	 multi_week_view,</div><div class='del'>-				 gint		 weeks_shown,</div><div class='del'>-				 gboolean	 compress_weekend,</div><div class='del'>-				 gint		 start_weekday,</div><div class='del'>-				 time_t		*day_starts,</div><div class='del'>-				 gint		*rows_per_day)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint num_days, day, event_num, span_num;</div><div class='del'>-	guint8 *grid;</div><div class='del'>-	GArray *spans;</div><div class='del'>-</div><div class='del'>-	/* This is a temporary 2-d grid which is used to place events.</div><div class='del'>-	   Each element is 0 if the position is empty, or 1 if occupied.</div><div class='del'>-	   We allocate the maximum size possible here, assuming that each</div><div class='del'>-	   event will need its own row. */</div><div class='del'>-	grid = g_new0 (guint8, E_WEEK_VIEW_MAX_ROWS_PER_CELL * 7</div><div class='del'>-		       * E_WEEK_VIEW_MAX_WEEKS);</div><div class='del'>-</div><div class='del'>-	/* We create a new array of spans, which will replace the old one. */</div><div class='del'>-	spans = g_array_new (FALSE, FALSE, sizeof (EWeekViewEventSpan));</div><div class='del'>-</div><div class='del'>-	/* Clear the number of rows used per day. */</div><div class='del'>-	num_days = multi_week_view ? weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-		rows_per_day[day] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Iterate over the events, finding which weeks they cover, and putting</div><div class='del'>-	   them in the first free row available. */</div><div class='del'>-	for (event_num = 0; event_num &lt; events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (events, EWeekViewEvent, event_num);</div><div class='del'>-		e_week_view_layout_event (event, grid, spans, old_spans,</div><div class='del'>-					  multi_week_view,</div><div class='del'>-					  weeks_shown, compress_weekend,</div><div class='del'>-					  start_weekday, day_starts,</div><div class='del'>-					  rows_per_day);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Free the grid. */</div><div class='del'>-	g_free (grid);</div><div class='del'>-</div><div class='del'>-	/* Destroy the old spans array, destroying any unused canvas items. */</div><div class='del'>-	if (old_spans) {</div><div class='del'>-		for (span_num = 0; span_num &lt; old_spans-&gt;len; span_num++) {</div><div class='del'>-			span = &amp;g_array_index (old_spans, EWeekViewEventSpan,</div><div class='del'>-					       span_num);</div><div class='del'>-			if (span-&gt;background_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-			if (span-&gt;text_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-		}</div><div class='del'>-		g_array_free (old_spans, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return spans;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_layout_event	(EWeekViewEvent	*event,</div><div class='del'>-				 guint8		*grid,</div><div class='del'>-				 GArray		*spans,</div><div class='del'>-				 GArray		*old_spans,</div><div class='del'>-				 gboolean	 multi_week_view,</div><div class='del'>-				 gint		 weeks_shown,</div><div class='del'>-				 gboolean	 compress_weekend,</div><div class='del'>-				 gint		 start_weekday,</div><div class='del'>-				 time_t		*day_starts,</div><div class='del'>-				 gint		*rows_per_day)</div><div class='del'>-{</div><div class='del'>-	gint start_day, end_day, span_start_day, span_end_day, rows_per_cell;</div><div class='del'>-	gint free_row, row, day, span_num, spans_index, num_spans, days_shown;</div><div class='del'>-	EWeekViewEventSpan span, *old_span;</div><div class='del'>-</div><div class='del'>-	days_shown = multi_week_view ? weeks_shown * 7 : 7;</div><div class='del'>-	start_day = e_week_view_find_day (event-&gt;start, FALSE, days_shown,</div><div class='del'>-					  day_starts);</div><div class='del'>-	end_day = e_week_view_find_day (event-&gt;end, TRUE, days_shown,</div><div class='del'>-					day_starts);</div><div class='del'>-	start_day = CLAMP (start_day, 0, days_shown - 1);</div><div class='del'>-	end_day = CLAMP (end_day, 0, days_shown - 1);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_layout_event Start:%i End: %i\n",</div><div class='del'>-		 start_day, end_day);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Iterate through each of the spans of the event, where each span</div><div class='del'>-	   is a sequence of 1 or more days displayed next to each other. */</div><div class='del'>-	span_start_day = start_day;</div><div class='del'>-	rows_per_cell = E_WEEK_VIEW_MAX_ROWS_PER_CELL;</div><div class='del'>-	span_num = 0;</div><div class='del'>-	spans_index = spans-&gt;len;</div><div class='del'>-	num_spans = 0;</div><div class='del'>-	while (span_start_day &lt;= end_day) {</div><div class='del'>-		span_end_day = e_week_view_find_span_end (multi_week_view,</div><div class='del'>-							  compress_weekend,</div><div class='del'>-							  start_weekday,</div><div class='del'>-							  span_start_day);</div><div class='del'>-		span_end_day = MIN (span_end_day, end_day);</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("  Span start:%i end:%i\n", span_start_day,</div><div class='del'>-			 span_end_day);</div><div class='del'>-#endif</div><div class='del'>-		/* Try each row until we find a free one or we fall off the</div><div class='del'>-		   bottom of the available rows. */</div><div class='del'>-		row = 0;</div><div class='del'>-		free_row = -1;</div><div class='del'>-		while (free_row == -1 &amp;&amp; row &lt; rows_per_cell) {</div><div class='del'>-			free_row = row;</div><div class='del'>-			for (day = span_start_day; day &lt;= span_end_day;</div><div class='del'>-			     day++) {</div><div class='del'>-				if (grid[day * rows_per_cell + row]) {</div><div class='del'>-					free_row = -1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			row++;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		if (free_row != -1) {</div><div class='del'>-			/* Mark the cells as full. */</div><div class='del'>-			for (day = span_start_day; day &lt;= span_end_day;</div><div class='del'>-			     day++) {</div><div class='del'>-				grid[day * rows_per_cell + free_row] = 1;</div><div class='del'>-				rows_per_day[day] = MAX (rows_per_day[day],</div><div class='del'>-							 free_row + 1);</div><div class='del'>-			}</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  Span start:%i end:%i row:%i\n",</div><div class='del'>-				 span_start_day, span_end_day, free_row);</div><div class='del'>-#endif</div><div class='del'>-			/* Add the span to the array, and try to reuse any</div><div class='del'>-			   canvas items from the old spans. */</div><div class='del'>-			span.start_day = span_start_day;</div><div class='del'>-			span.num_days = span_end_day - span_start_day + 1;</div><div class='del'>-			span.row = free_row;</div><div class='del'>-			span.background_item = NULL;</div><div class='del'>-			span.text_item = NULL;</div><div class='del'>-			if (event-&gt;num_spans &gt; span_num) {</div><div class='del'>-				old_span = &amp;g_array_index (old_spans, EWeekViewEventSpan, event-&gt;spans_index + span_num);</div><div class='del'>-				span.background_item = old_span-&gt;background_item;</div><div class='del'>-				span.text_item = old_span-&gt;text_item;</div><div class='del'>-				old_span-&gt;background_item = NULL;</div><div class='del'>-				old_span-&gt;text_item = NULL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_array_append_val (spans, span);</div><div class='del'>-			num_spans++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		span_start_day = span_end_day + 1;</div><div class='del'>-		span_num++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the event's spans. */</div><div class='del'>-	event-&gt;spans_index = spans_index;</div><div class='del'>-	event-&gt;num_spans = num_spans;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the day containing the given time.</div><div class='del'>-   If include_midnight_in_prev_day is TRUE then if the time exactly</div><div class='del'>-   matches the start of a day the previous day is returned. This is useful</div><div class='del'>-   when calculating the end day of an event. */</div><div class='del'>-static gint</div><div class='del'>-e_week_view_find_day		(time_t		 time_to_find,</div><div class='del'>-				 gboolean	 include_midnight_in_prev_day,</div><div class='del'>-				 gint		 days_shown,</div><div class='del'>-				 time_t		*day_starts)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	if (time_to_find &lt; day_starts[0])</div><div class='del'>-		return -1;</div><div class='del'>-	if (time_to_find &gt; day_starts[days_shown])</div><div class='del'>-		return days_shown;</div><div class='del'>-</div><div class='del'>-	for (day = 1; day &lt;= days_shown; day++) {</div><div class='del'>-		if (time_to_find &lt;= day_starts[day]) {</div><div class='del'>-			if (time_to_find == day_starts[day]</div><div class='del'>-			    &amp;&amp; !include_midnight_in_prev_day)</div><div class='del'>-				return day;</div><div class='del'>-			return day - 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return days_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This returns the last possible day in the same span as the given day.</div><div class='del'>-   A span is all the days which are displayed next to each other from left to</div><div class='del'>-   right. In the week view all spans are only 1 day, since Tuesday is below</div><div class='del'>-   Monday rather than beside it etc. In the month view, if the weekends are not</div><div class='del'>-   compressed then each week is a span, otherwise we have to break a span up</div><div class='del'>-   on Saturday, use a separate span for Sunday, and start again on Monday. */</div><div class='del'>-static gint</div><div class='del'>-e_week_view_find_span_end	(gboolean	 multi_week_view,</div><div class='del'>-				 gboolean	 compress_weekend,</div><div class='del'>-				 gint		 display_start_day,</div><div class='del'>-				 gint		 day)</div><div class='del'>-{</div><div class='del'>-	gint week, col, sat_col, end_col;</div><div class='del'>-</div><div class='del'>-	if (multi_week_view) {</div><div class='del'>-		week = day / 7;</div><div class='del'>-		col = day % 7;</div><div class='del'>-</div><div class='del'>-		/* We default to the last column in the row. */</div><div class='del'>-		end_col = 6;</div><div class='del'>-</div><div class='del'>-		/* If the weekend is compressed we must end any spans on</div><div class='del'>-		   Saturday and Sunday. */</div><div class='del'>-		if (compress_weekend) {</div><div class='del'>-			sat_col = (5 + 7 - display_start_day) % 7;</div><div class='del'>-			if (col &lt;= sat_col)</div><div class='del'>-				end_col = sat_col;</div><div class='del'>-			else if (col == sat_col + 1)</div><div class='del'>-				end_col = sat_col + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return week * 7 + end_col;</div><div class='del'>-	} else {</div><div class='del'>-		return day;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_layout_get_day_position	(gint		 day,</div><div class='del'>-					 gboolean	 multi_week_view,</div><div class='del'>-					 gint		 weeks_shown,</div><div class='del'>-					 gint		 display_start_day,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		*day_x,</div><div class='del'>-					 gint		*day_y,</div><div class='del'>-					 gint		*rows)</div><div class='del'>-{</div><div class='del'>-	gint week, day_of_week, row, col, weekend_col, box, weekend_box;</div><div class='del'>-</div><div class='del'>-	*day_x = *day_y = *rows = 0;</div><div class='del'>-	g_return_if_fail (day &gt;= 0);</div><div class='del'>-</div><div class='del'>-	if (multi_week_view) {</div><div class='del'>-		g_return_if_fail (day &lt; weeks_shown * 7);</div><div class='del'>-</div><div class='del'>-		week = day / 7;</div><div class='del'>-		col = day % 7;</div><div class='del'>-		day_of_week = (display_start_day + day) % 7;</div><div class='del'>-		if (compress_weekend &amp;&amp; day_of_week &gt;= 5) {</div><div class='del'>-			/* In the compressed view Saturday is above Sunday and</div><div class='del'>-			   both have just one row as opposed to 2 for all the</div><div class='del'>-			   other days. */</div><div class='del'>-			if (day_of_week == 5) {</div><div class='del'>-				*day_y = week * 2;</div><div class='del'>-				*rows = 1;</div><div class='del'>-			} else {</div><div class='del'>-				*day_y = week * 2 + 1;</div><div class='del'>-				*rows = 1;</div><div class='del'>-				col--;</div><div class='del'>-			}</div><div class='del'>-			/* Both Saturday and Sunday are in the same column. */</div><div class='del'>-			*day_x = col;</div><div class='del'>-		} else {</div><div class='del'>-			/* If the weekend is compressed and the day is after</div><div class='del'>-			   the weekend we have to move back a column. */</div><div class='del'>-			if (compress_weekend) {</div><div class='del'>-				/* Calculate where the weekend column is.</div><div class='del'>-				   Note that 5 is Saturday. */</div><div class='del'>-				weekend_col = (5 + 7 - display_start_day) % 7;</div><div class='del'>-				if (col &gt; weekend_col)</div><div class='del'>-					col--;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			*day_y = week * 2;</div><div class='del'>-			*rows = 2;</div><div class='del'>-			*day_x = col;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_return_if_fail (day &lt; 7);</div><div class='del'>-</div><div class='del'>-		/* Calculate which box to place the day in, from 0-5.</div><div class='del'>-		   Note that in the week view the weekends are always</div><div class='del'>-		   compressed and share a box. */</div><div class='del'>-		box = day;</div><div class='del'>-		day_of_week = (display_start_day + day) % 7;</div><div class='del'>-		weekend_box = (5 + 7 - display_start_day) % 7;</div><div class='del'>-		if (box &gt; weekend_box)</div><div class='del'>-			box--;</div><div class='del'>-</div><div class='del'>-		if (box &lt; 3)</div><div class='del'>-			*day_x = 0;</div><div class='del'>-		else</div><div class='del'>-			*day_x = 1;</div><div class='del'>-</div><div class='del'>-		row = (box % 3) * 2;</div><div class='del'>-		if (day_of_week &lt; 5) {</div><div class='del'>-			*day_y = row;</div><div class='del'>-			*rows = 2;</div><div class='del'>-		} else if (day_of_week == 5) {</div><div class='del'>-			/* Saturday. */</div><div class='del'>-			*day_y = row;</div><div class='del'>-			*rows = 1;</div><div class='del'>-</div><div class='del'>-		} else {</div><div class='del'>-			/* Sunday. */</div><div class='del'>-			*day_y = row + 1;</div><div class='del'>-			*rows = 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the event span is visible or FALSE if it isn't.</div><div class='del'>-   It also returns the number of days of the span that are visible.</div><div class='del'>-   Usually this can easily be determined by the start &amp; end days and row of</div><div class='del'>-   the span, which are set in e_week_view_layout_event(). Though we need a</div><div class='del'>-   special case for the weekends when they are compressed, since the span may</div><div class='del'>-   not fit. */</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_layout_get_span_position	(EWeekViewEvent *event,</div><div class='del'>-					 EWeekViewEventSpan *span,</div><div class='del'>-					 gint		 rows_per_cell,</div><div class='del'>-					 gint		 rows_per_compressed_cell,</div><div class='del'>-					 gint		 display_start_day,</div><div class='del'>-					 gboolean	 multi_week_view,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		*span_num_days)</div><div class='del'>-{</div><div class='del'>-	gint end_day_of_week;</div><div class='del'>-</div><div class='del'>-	if (span-&gt;row &gt;= rows_per_cell)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	end_day_of_week = (display_start_day + span-&gt;start_day</div><div class='del'>-			   + span-&gt;num_days - 1) % 7;</div><div class='del'>-	*span_num_days = span-&gt;num_days;</div><div class='del'>-	/* Check if the row will not be visible in compressed cells. */</div><div class='del'>-	if (span-&gt;row &gt;= rows_per_compressed_cell) {</div><div class='del'>-		if (multi_week_view) {</div><div class='del'>-			if (compress_weekend) {</div><div class='del'>-				/* If it ends on a Saturday and is 1 day long</div><div class='del'>-				   we skip it, else we shorten it. If it ends</div><div class='del'>-				   on a Sunday it must be 1 day long and we</div><div class='del'>-				   skip it. */</div><div class='del'>-				if (end_day_of_week == 5) {	   /* Sat */</div><div class='del'>-					if (*span_num_days == 1) {</div><div class='del'>-						return FALSE;</div><div class='del'>-					} else {</div><div class='del'>-						(*span_num_days)--;</div><div class='del'>-					}</div><div class='del'>-				} else if (end_day_of_week == 6) { /* Sun */</div><div class='del'>-					return FALSE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* All spans are 1 day long in the week view, so we</div><div class='del'>-			   just skip it. */</div><div class='del'>-			if (end_day_of_week &gt; 4)</div><div class='del'>-				return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h<br/>deleted file mode 100644<br/>index 2c6d5a29d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-layout.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-layout.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_WEEK_VIEW_LAYOUT_H_</div><div class='del'>-#define _E_WEEK_VIEW_LAYOUT_H_</div><div class='del'>-</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* I've split these functions away from EWeekView so we can use them for</div><div class='del'>-   printing. */</div><div class='del'>-</div><div class='del'>-GArray* e_week_view_layout_events	(GArray		*events,</div><div class='del'>-					 GArray		*old_spans,</div><div class='del'>-					 gboolean	 multi_week_view,</div><div class='del'>-					 gint		 weeks_shown,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		 start_weekday,</div><div class='del'>-					 time_t		*day_starts,</div><div class='del'>-					 gint		*rows_per_day);</div><div class='del'>-</div><div class='del'>-/* Returns which 'cell' in the table the day appears in. Note that most days</div><div class='del'>-   have a height of 2 rows, but Sat/Sun are sometimes compressed so they have</div><div class='del'>-   a height of only 1 row. */</div><div class='del'>-void e_week_view_layout_get_day_position(gint		 day,</div><div class='del'>-					 gboolean	 multi_week_view,</div><div class='del'>-					 gint		 weeks_shown,</div><div class='del'>-					 gint		 display_start_day,</div><div class='del'>-					 gboolean	 compress_weekend,</div><div class='del'>-					 gint		*cell_x,</div><div class='del'>-					 gint		*cell_y,</div><div class='del'>-					 gint		*rows);</div><div class='del'>-</div><div class='del'>-gboolean e_week_view_layout_get_span_position (EWeekViewEvent *event,</div><div class='del'>-					       EWeekViewEventSpan *span,</div><div class='del'>-					       gint	 rows_per_cell,</div><div class='del'>-					       gint	 rows_per_compressed_cell,</div><div class='del'>-					       gint	 display_start_day,</div><div class='del'>-					       gboolean	 multi_week_view,</div><div class='del'>-					       gboolean	 compress_weekend,</div><div class='del'>-					       gint	*span_num_days);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_WEEK_VIEW_LAYOUT_H_ */</div><div class='head'>diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c<br/>deleted file mode 100644<br/>index 60d71f0631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-main-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-main-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,401 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewMainItem - displays the background grid and dates for the Week and</div><div class='del'>- * Month calendar views.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "e-week-view-main-item.h"</div><div class='del'>-</div><div class='del'>-static void e_week_view_main_item_class_init	(EWeekViewMainItemClass *class);</div><div class='del'>-static void e_week_view_main_item_init		(EWeekViewMainItem *wvmitem);</div><div class='del'>-</div><div class='del'>-static void e_week_view_main_item_set_arg	(GtkObject	 *o,</div><div class='del'>-						 GtkArg		 *arg,</div><div class='del'>-						 guint		  arg_id);</div><div class='del'>-static void e_week_view_main_item_update	(GnomeCanvasItem *item,</div><div class='del'>-						 double		 *affine,</div><div class='del'>-						 ArtSVP		 *clip_path,</div><div class='del'>-						 int		  flags);</div><div class='del'>-static void e_week_view_main_item_draw		(GnomeCanvasItem *item,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 int		  x,</div><div class='del'>-						 int		  y,</div><div class='del'>-						 int		  width,</div><div class='del'>-						 int		  height);</div><div class='del'>-static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,</div><div class='del'>-						 gint		   day,</div><div class='del'>-						 GDate		  *date,</div><div class='del'>-						 GdkDrawable       *drawable,</div><div class='del'>-						 gint		   x,</div><div class='del'>-						 gint		   y,</div><div class='del'>-						 gint		   width,</div><div class='del'>-						 gint		   height);</div><div class='del'>-static double e_week_view_main_item_point	(GnomeCanvasItem *item,</div><div class='del'>-						 double		  x,</div><div class='del'>-						 double		  y,</div><div class='del'>-						 int		  cx,</div><div class='del'>-						 int		  cy,</div><div class='del'>-						 GnomeCanvasItem **actual_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_WEEK_VIEW</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_week_view_main_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_week_view_main_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_main_item_type) {</div><div class='del'>-		GtkTypeInfo e_week_view_main_item_info = {</div><div class='del'>-			"EWeekViewMainItem",</div><div class='del'>-			sizeof (EWeekViewMainItem),</div><div class='del'>-			sizeof (EWeekViewMainItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_week_view_main_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_week_view_main_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_week_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_week_view_main_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_week_view_main_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_class_init (EWeekViewMainItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EWeekViewMainItem::week_view",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_WEEK_VIEW);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_week_view_main_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_week_view_main_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_week_view_main_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_week_view_main_item_point;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_init (EWeekViewMainItem *wvmitem)</div><div class='del'>-{</div><div class='del'>-	wvmitem-&gt;week_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EWeekViewMainItem *wvmitem;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_WEEK_VIEW:</div><div class='del'>-		wvmitem-&gt;week_view = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_update (GnomeCanvasItem *item,</div><div class='del'>-			      double	      *affine,</div><div class='del'>-			      ArtSVP	      *clip_path,</div><div class='del'>-			      int	       flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The item covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,</div><div class='del'>-			    GdkDrawable      *drawable,</div><div class='del'>-			    int		      x,</div><div class='del'>-			    int		      y,</div><div class='del'>-			    int		      width,</div><div class='del'>-			    int		      height)</div><div class='del'>-{</div><div class='del'>-	EWeekViewMainItem *wvmitem;</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GDate date;</div><div class='del'>-	gint num_days, day, day_x, day_y, day_w, day_h;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_main_item_draw %i,%i %ix%i\n",</div><div class='del'>-		 x, y, width, height);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (canvas_item);</div><div class='del'>-	week_view = wvmitem-&gt;week_view;</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-</div><div class='del'>-	/* Step through each of the days. */</div><div class='del'>-	date = week_view-&gt;first_day_shown;</div><div class='del'>-</div><div class='del'>-	/* If no date has been set, we just use Dec 1999/January 2000. */</div><div class='del'>-	if (!g_date_valid (&amp;date))</div><div class='del'>-		g_date_set_dmy (&amp;date, 27, 12, 1999);</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-		e_week_view_get_day_position (week_view, day,</div><div class='del'>-					      &amp;day_x, &amp;day_y,</div><div class='del'>-					      &amp;day_w, &amp;day_h);</div><div class='del'>-		/* Skip any days which are outside the area. */</div><div class='del'>-		if (day_x &lt; x + width &amp;&amp; day_x + day_w &gt;= x</div><div class='del'>-		    &amp;&amp; day_y &lt; y + height &amp;&amp; day_y + day_h &gt;= y) {</div><div class='del'>-			e_week_view_main_item_draw_day (wvmitem, day, &amp;date,</div><div class='del'>-							drawable,</div><div class='del'>-							day_x - x, day_y - y,</div><div class='del'>-							day_w, day_h);</div><div class='del'>-		}</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,</div><div class='del'>-				gint		   day,</div><div class='del'>-				GDate		  *date,</div><div class='del'>-				GdkDrawable       *drawable,</div><div class='del'>-				gint		   x,</div><div class='del'>-				gint		   y,</div><div class='del'>-				gint		   width,</div><div class='del'>-				gint		   height)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint right_edge, bottom_edge, date_width, date_x, line_y;</div><div class='del'>-	gboolean show_day_name, show_month_name, selected;</div><div class='del'>-	gchar buffer[128], *format_string;</div><div class='del'>-	gint month, day_of_month, max_width;</div><div class='del'>-	GdkColor *bg_color;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Drawing Day:%i at %i,%i\n", day, x, y);</div><div class='del'>-#endif</div><div class='del'>-	week_view = wvmitem-&gt;week_view;</div><div class='del'>-	style = GTK_WIDGET (week_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gc != NULL);</div><div class='del'>-</div><div class='del'>-	month = g_date_month (date);</div><div class='del'>-	day_of_month = g_date_day (date);</div><div class='del'>-	line_y = y + E_WEEK_VIEW_DATE_T_PAD + font-&gt;ascent</div><div class='del'>-		+ font-&gt;descent	+ E_WEEK_VIEW_DATE_LINE_T_PAD;</div><div class='del'>-</div><div class='del'>-	/* Draw the background of the day. In the month view odd months are</div><div class='del'>-	   one color and even months another, so you can easily see when each</div><div class='del'>-	   month starts (defaults are white for odd - January, March, ... and</div><div class='del'>-	   light gray for even). In the week view the background is always the</div><div class='del'>-	   same color, the color used for the odd months in the month view. */</div><div class='del'>-	if (week_view-&gt;multi_week_view &amp;&amp; (month % 2 == 0))</div><div class='del'>-		bg_color = &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];</div><div class='del'>-	else</div><div class='del'>-		bg_color = &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, bg_color);</div><div class='del'>-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);</div><div class='del'>-</div><div class='del'>-	/* Draw the lines on the right and bottom of the cell. The canvas is</div><div class='del'>-	   sized so that the lines on the right &amp; bottom edges will be off the</div><div class='del'>-	   edge of the canvas, so we don't have to worry about them. */</div><div class='del'>-	right_edge = x + width - 1;</div><div class='del'>-	bottom_edge = y + height - 1;</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_GRID]);</div><div class='del'>-	gdk_draw_line (drawable, gc,</div><div class='del'>-		       right_edge, y, right_edge, bottom_edge);</div><div class='del'>-	gdk_draw_line (drawable, gc,</div><div class='del'>-		       x, bottom_edge, right_edge, bottom_edge);</div><div class='del'>-</div><div class='del'>-	/* If the day is selected, draw the blue background. */</div><div class='del'>-	selected = TRUE;</div><div class='del'>-	if (!GTK_WIDGET_HAS_FOCUS (week_view)</div><div class='del'>-	    || week_view-&gt;selection_start_day == -1</div><div class='del'>-	    || week_view-&gt;selection_start_day &gt; day</div><div class='del'>-	    || week_view-&gt;selection_end_day &lt; day)</div><div class='del'>-		selected = FALSE;</div><div class='del'>-	if (selected) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_SELECTED]);</div><div class='del'>-		if (week_view-&gt;multi_week_view) {</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    x + 2, y + 1,</div><div class='del'>-					    width - 5,</div><div class='del'>-					    E_WEEK_VIEW_DATE_T_PAD - 1</div><div class='del'>-					    + font-&gt;ascent + font-&gt;descent);</div><div class='del'>-		} else {</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    x + 2, y + 1,</div><div class='del'>-					    width - 5, line_y - y);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Display the date in the top of the cell.</div><div class='del'>-	   In the week view, display the long format "10 January" in all cells,</div><div class='del'>-	   or abbreviate it to "10 Jan" or "10" if that doesn't fit.</div><div class='del'>-	   In the month view, only use the long format for the first cell and</div><div class='del'>-	   the 1st of each month, otherwise use "10". */</div><div class='del'>-	show_day_name = FALSE;</div><div class='del'>-	show_month_name = FALSE;</div><div class='del'>-	if (!week_view-&gt;multi_week_view) {</div><div class='del'>-		show_day_name = TRUE;</div><div class='del'>-		show_month_name = TRUE;</div><div class='del'>-	} else if (day == 0 || day_of_month == 1) {</div><div class='del'>-		show_month_name = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now find the longest form of the date that will fit. */</div><div class='del'>-	max_width = width - 4;</div><div class='del'>-	format_string = NULL;</div><div class='del'>-	if (show_day_name) {</div><div class='del'>-		if (week_view-&gt;max_day_width + week_view-&gt;digit_width * 2</div><div class='del'>-		    + week_view-&gt;space_width * 2</div><div class='del'>-		    + week_view-&gt;month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %A = full weekday name, %d = day of</div><div class='del'>-			   month, %B = full month name. You can change the</div><div class='del'>-			   order but don't change the specifiers or add</div><div class='del'>-			   anything. */</div><div class='del'>-			format_string = _("%A %d %B");</div><div class='del'>-		else if (week_view-&gt;max_abbr_day_width</div><div class='del'>-			 + week_view-&gt;digit_width * 2</div><div class='del'>-			 + week_view-&gt;space_width * 2</div><div class='del'>-			 + week_view-&gt;abbr_month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %a = abbreviated weekday name,</div><div class='del'>-			   %d = day of month, %b = abbreviated month name.</div><div class='del'>-			   You can change the order but don't change the</div><div class='del'>-			   specifiers or add anything. */</div><div class='del'>-			format_string = _("%a %d %b");</div><div class='del'>-	}</div><div class='del'>-	if (!format_string &amp;&amp; show_month_name) {</div><div class='del'>-		if (week_view-&gt;digit_width * 2 + week_view-&gt;space_width</div><div class='del'>-		    + week_view-&gt;month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %d = day of month, %B = full</div><div class='del'>-			   month name. You can change the order but don't</div><div class='del'>-			   change the specifiers or add anything. */</div><div class='del'>-			format_string = _("%d %B");</div><div class='del'>-		else if (week_view-&gt;digit_width * 2 + week_view-&gt;space_width</div><div class='del'>-		    + week_view-&gt;abbr_month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %d = day of month, %b = abbreviated</div><div class='del'>-			   month name. You can change the order but don't</div><div class='del'>-			   change the specifiers or add anything. */</div><div class='del'>-			format_string = _("%d %b");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer),</div><div class='del'>-			 format_string ? format_string : "%d", date);</div><div class='del'>-	date_width = gdk_string_width (font, buffer);</div><div class='del'>-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;</div><div class='del'>-	date_x = MAX (date_x, x + 1);</div><div class='del'>-</div><div class='del'>-	if (selected) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES_SELECTED]);</div><div class='del'>-	} else if (week_view-&gt;multi_week_view) {</div><div class='del'>-		struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-		/* Check if we are drawing today */		</div><div class='del'>-		tt = icaltime_from_timet_with_zone (time (NULL), FALSE, week_view-&gt;zone);</div><div class='del'>-		if (g_date_year (date) == tt.year </div><div class='del'>-		    &amp;&amp; g_date_month (date) == tt.month</div><div class='del'>-		    &amp;&amp; g_date_day (date) == tt.day)</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_TODAY]);</div><div class='del'>-		else</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES]);</div><div class='del'>-	} else {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gdk_draw_string (drawable, font, gc,</div><div class='del'>-			 date_x, y + E_WEEK_VIEW_DATE_T_PAD + font-&gt;ascent,</div><div class='del'>-			 buffer);</div><div class='del'>-</div><div class='del'>-	/* Draw the line under the date. */</div><div class='del'>-	if (!week_view-&gt;multi_week_view) {</div><div class='del'>-		gdk_gc_set_foreground (gc, &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_GRID]);</div><div class='del'>-		gdk_draw_line (drawable, gc,</div><div class='del'>-			       x + E_WEEK_VIEW_DATE_LINE_L_PAD, line_y,</div><div class='del'>-			       right_edge, line_y);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item the the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			     int cx, int cy,</div><div class='del'>-			     GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h<br/>deleted file mode 100644<br/>index 35740479da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-main-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-main-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_WEEK_VIEW_MAIN_ITEM_H_</div><div class='del'>-#define _E_WEEK_VIEW_MAIN_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewMainItem - displays the background grid and dates for the Week and</div><div class='del'>- * Month calendar views.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_week_view_main_item_get_type (), EWeekViewMainItem))</div><div class='del'>-#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_week_view_main_item_get_type ()))</div><div class='del'>-#define E_IS_WEEK_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_week_view_main_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EWeekView widget. */</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-} EWeekViewMainItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EWeekViewMainItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_week_view_main_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c<br/>deleted file mode 100644<br/>index d201a50e35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-titles-item.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-titles-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,310 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of</div><div class='del'>- * the Month calendar view.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-week-view-titles-item.h"</div><div class='del'>-</div><div class='del'>-static void e_week_view_titles_item_class_init	(EWeekViewTitlesItemClass *class);</div><div class='del'>-static void e_week_view_titles_item_init	(EWeekViewTitlesItem *wvtitem);</div><div class='del'>-</div><div class='del'>-static void e_week_view_titles_item_set_arg	(GtkObject	 *o,</div><div class='del'>-						 GtkArg		 *arg,</div><div class='del'>-						 guint		  arg_id);</div><div class='del'>-static void e_week_view_titles_item_update	(GnomeCanvasItem *item,</div><div class='del'>-						 double		 *affine,</div><div class='del'>-						 ArtSVP		 *clip_path,</div><div class='del'>-						 int		  flags);</div><div class='del'>-static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,</div><div class='del'>-						 GdkDrawable	 *drawable,</div><div class='del'>-						 int		  x,</div><div class='del'>-						 int		  y,</div><div class='del'>-						 int		  width,</div><div class='del'>-						 int		  height);</div><div class='del'>-static double e_week_view_titles_item_point	(GnomeCanvasItem *item,</div><div class='del'>-						 double		  x,</div><div class='del'>-						 double		  y,</div><div class='del'>-						 int		  cx,</div><div class='del'>-						 int		  cy,</div><div class='del'>-						 GnomeCanvasItem **actual_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasItemClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_WEEK_VIEW</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_week_view_titles_item_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_week_view_titles_item_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_titles_item_type) {</div><div class='del'>-		GtkTypeInfo e_week_view_titles_item_info = {</div><div class='del'>-			"EWeekViewTitlesItem",</div><div class='del'>-			sizeof (EWeekViewTitlesItem),</div><div class='del'>-			sizeof (EWeekViewTitlesItemClass),</div><div class='del'>-			(GtkClassInitFunc) e_week_view_titles_item_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_week_view_titles_item_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		e_week_view_titles_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &amp;e_week_view_titles_item_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_week_view_titles_item_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_item_get_type());</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) class;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,</div><div class='del'>-				 ARG_WEEK_VIEW);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_week_view_titles_item_set_arg;</div><div class='del'>-</div><div class='del'>-	/* GnomeCanvasItem method overrides */</div><div class='del'>-	item_class-&gt;update      = e_week_view_titles_item_update;</div><div class='del'>-	item_class-&gt;draw        = e_week_view_titles_item_draw;</div><div class='del'>-	item_class-&gt;point       = e_week_view_titles_item_point;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)</div><div class='del'>-{</div><div class='del'>-	wvtitem-&gt;week_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	EWeekViewTitlesItem *wvtitem;</div><div class='del'>-</div><div class='del'>-	item = GNOME_CANVAS_ITEM (o);</div><div class='del'>-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_WEEK_VIEW:</div><div class='del'>-		wvtitem-&gt;week_view = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_titles_item_update (GnomeCanvasItem *item,</div><div class='del'>-				double	    *affine,</div><div class='del'>-				ArtSVP	    *clip_path,</div><div class='del'>-				int		     flags)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;update) (item, affine, clip_path, flags);</div><div class='del'>-</div><div class='del'>-	/* The item covers the entire canvas area. */</div><div class='del'>-	item-&gt;x1 = 0;</div><div class='del'>-	item-&gt;y1 = 0;</div><div class='del'>-	item-&gt;x2 = INT_MAX;</div><div class='del'>-	item-&gt;y2 = INT_MAX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * DRAWING ROUTINES - functions to paint the canvas item.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,</div><div class='del'>-			      GdkDrawable      *drawable,</div><div class='del'>-			      int		x,</div><div class='del'>-			      int		y,</div><div class='del'>-			      int		width,</div><div class='del'>-			      int		height)</div><div class='del'>-{</div><div class='del'>-	EWeekViewTitlesItem *wvtitem;</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;</div><div class='del'>-	gchar buffer[128], *date_format;</div><div class='del'>-	GDate date;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-	gboolean long_format;</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_titles_item_draw %i,%i %ix%i\n",</div><div class='del'>-		 x, y, width, height);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (canvas_item);</div><div class='del'>-	week_view = wvtitem-&gt;week_view;</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (week_view)-&gt;style;</div><div class='del'>-	font = style-&gt;font;</div><div class='del'>-	fg_gc = style-&gt;fg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	bg_gc = style-&gt;bg_gc[GTK_STATE_NORMAL];</div><div class='del'>-	light_gc = style-&gt;light_gc[GTK_STATE_NORMAL];</div><div class='del'>-	dark_gc = style-&gt;dark_gc[GTK_STATE_NORMAL];</div><div class='del'>-	canvas_width = GTK_WIDGET (canvas_item-&gt;canvas)-&gt;allocation.width;</div><div class='del'>-	canvas_height = GTK_WIDGET (canvas_item-&gt;canvas)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	/* Draw the shadow around the dates. */</div><div class='del'>-	gdk_draw_line (drawable, light_gc,</div><div class='del'>-		       1 - x, 1 - y,</div><div class='del'>-		       canvas_width - 2 - x, 1 - y);</div><div class='del'>-	gdk_draw_line (drawable, light_gc,</div><div class='del'>-		       1 - x, 2 - y,</div><div class='del'>-		       1 - x, canvas_height - 1 - y);</div><div class='del'>-</div><div class='del'>-	gdk_draw_rectangle (drawable, dark_gc, FALSE,</div><div class='del'>-			    0 - x, 0 - y,</div><div class='del'>-			    canvas_width - 1, canvas_height);</div><div class='del'>-</div><div class='del'>-	/* Determine the format to use. */</div><div class='del'>-	col_width = canvas_width / week_view-&gt;columns;</div><div class='del'>-	if (col_width &gt; week_view-&gt;max_day_width + 2) {</div><div class='del'>-	  date_format = "%A";</div><div class='del'>-	  long_format = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-	  date_format = "%a";</div><div class='del'>-	  long_format = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Shift right one pixel to account for the shadow around the main</div><div class='del'>-	   canvas. */</div><div class='del'>-	x--;</div><div class='del'>-</div><div class='del'>-	/* Draw the date. Set a clipping rectangle so we don't draw over the</div><div class='del'>-	   next day. */</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	/* Note that 20th March 2000 is a Monday. We only care about the</div><div class='del'>-	   weekday. */</div><div class='del'>-	weekday = week_view-&gt;display_start_day;</div><div class='del'>-	g_date_set_dmy (&amp;date, 20 + weekday, 3, 2000);</div><div class='del'>-	for (col = 0; col &lt; week_view-&gt;columns; col++) {</div><div class='del'>-		if (weekday == 5 &amp;&amp; week_view-&gt;compress_weekend) {</div><div class='del'>-			g_date_strftime (buffer, 128, "%a/", &amp;date);</div><div class='del'>-			g_date_add_days (&amp;date, 1);</div><div class='del'>-			g_date_strftime (buffer + strlen (buffer), 100,</div><div class='del'>-					 "%a", &amp;date);</div><div class='del'>-		} else {</div><div class='del'>-			g_date_strftime (buffer, 128, date_format, &amp;date);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		clip_rect.x = week_view-&gt;col_offsets[col] - x;</div><div class='del'>-		clip_rect.y = 2 - y;</div><div class='del'>-		clip_rect.width = week_view-&gt;col_widths[col];</div><div class='del'>-		clip_rect.height = canvas_height - 2;</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, &amp;clip_rect);</div><div class='del'>-</div><div class='del'>-		if (weekday == 5 &amp;&amp; week_view-&gt;compress_weekend)</div><div class='del'>-			date_width = week_view-&gt;abbr_day_widths[5]</div><div class='del'>-				+ week_view-&gt;slash_width</div><div class='del'>-				+ week_view-&gt;abbr_day_widths[6];</div><div class='del'>-		else if (long_format)</div><div class='del'>-			date_width = week_view-&gt;day_widths[weekday];</div><div class='del'>-		else</div><div class='del'>-			date_width = week_view-&gt;abbr_day_widths[weekday];</div><div class='del'>-</div><div class='del'>-		date_x = week_view-&gt;col_offsets[col]</div><div class='del'>-			+ (week_view-&gt;col_widths[col] - date_width) / 2;</div><div class='del'>-		date_x = MAX (date_x, week_view-&gt;col_offsets[col]);</div><div class='del'>-		gdk_draw_string (drawable, font, fg_gc,</div><div class='del'>-				 date_x - x, 3 + font-&gt;ascent - y, buffer);</div><div class='del'>-</div><div class='del'>-		gdk_gc_set_clip_rectangle (fg_gc, NULL);</div><div class='del'>-</div><div class='del'>-		/* Draw the lines down the left and right of the date cols. */</div><div class='del'>-		if (col != 0) {</div><div class='del'>-			gdk_draw_line (drawable, light_gc,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - x,</div><div class='del'>-				       4 - y,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - x,</div><div class='del'>-				       canvas_height - 4 - y);</div><div class='del'>-</div><div class='del'>-			gdk_draw_line (drawable, dark_gc,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - 1 - x,</div><div class='del'>-				       4 - y,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - 1 - x,</div><div class='del'>-				       canvas_height - 4 - y);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Draw the lines between each column. */</div><div class='del'>-		if (col != 0) {</div><div class='del'>-			gdk_draw_line (drawable, style-&gt;black_gc,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - x,</div><div class='del'>-				       canvas_height - y,</div><div class='del'>-				       week_view-&gt;col_offsets[col] - x,</div><div class='del'>-				       canvas_height - y);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (weekday == 5 &amp;&amp; week_view-&gt;compress_weekend)</div><div class='del'>-			weekday += 2;</div><div class='del'>-		else</div><div class='del'>-			weekday++;</div><div class='del'>-</div><div class='del'>-		weekday = weekday % 7;</div><div class='del'>-</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is supposed to return the nearest item the the point and the distance.</div><div class='del'>-   Since we are the only item we just return ourself and 0 for the distance.</div><div class='del'>-   This is needed so that we get button/motion events. */</div><div class='del'>-static double</div><div class='del'>-e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,</div><div class='del'>-			       int cx, int cy,</div><div class='del'>-			       GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h<br/>deleted file mode 100644<br/>index 77fed506c8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-titles-item.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view-titles-item.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_WEEK_VIEW_TITLES_ITEM_H_</div><div class='del'>-#define _E_WEEK_VIEW_TITLES_ITEM_H_</div><div class='del'>-</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of</div><div class='del'>- * the Month calendar view.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_TITLES_ITEM(obj)     (GTK_CHECK_CAST((obj), \</div><div class='del'>-        e_week_view_titles_item_get_type (), EWeekViewTitlesItem))</div><div class='del'>-#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\</div><div class='del'>-	e_week_view_titles_item_get_type ()))</div><div class='del'>-#define E_IS_WEEK_VIEW_TITLES_ITEM(o)    (GTK_CHECK_TYPE((o), \</div><div class='del'>-	e_week_view_titles_item_get_type ()))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItem canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The parent EWeekView widget. */</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-} EWeekViewTitlesItem;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GnomeCanvasItemClass parent_class;</div><div class='del'>-</div><div class='del'>-} EWeekViewTitlesItemClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType  e_week_view_titles_item_get_type      (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */</div><div class='head'>diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c<br/>deleted file mode 100644<br/>index f0913e3e28..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4379 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors :</div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekView - displays the Week &amp; Month views of the calendar.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;gtk/gtkinvisible.h&gt;</div><div class='del'>-#include &lt;gtk/gtkselection.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvscrollbar.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-exec.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-utils.h&gt;</div><div class='del'>-#include "dialogs/delete-comp.h"</div><div class='del'>-#include "dialogs/send-comp.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-#include "cal-util/timeutil.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-#include "goto.h"</div><div class='del'>-#include "e-week-view-event-item.h"</div><div class='del'>-#include "e-week-view-layout.h"</div><div class='del'>-#include "e-week-view-main-item.h"</div><div class='del'>-#include "e-week-view-titles-item.h"</div><div class='del'>-#include "misc.h"</div><div class='del'>-</div><div class='del'>-/* Images */</div><div class='del'>-#include "art/bell.xpm"</div><div class='del'>-#include "art/recur.xpm"</div><div class='del'>-#include "art/timezone-16.xpm"</div><div class='del'>-#include "art/jump.xpm"</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_SMALL_FONT	\</div><div class='del'>-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"</div><div class='del'>-#define E_WEEK_VIEW_SMALL_FONT_FALLBACK	\</div><div class='del'>-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_JUMP_BUTTON_WIDTH	16</div><div class='del'>-#define E_WEEK_VIEW_JUMP_BUTTON_HEIGHT	8</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW_JUMP_BUTTON_X_PAD	3</div><div class='del'>-#define E_WEEK_VIEW_JUMP_BUTTON_Y_PAD	3</div><div class='del'>-</div><div class='del'>-/* The timeout before we do a layout, so we don't do a layout for each event</div><div class='del'>-   we get from the server. */</div><div class='del'>-#define E_WEEK_VIEW_LAYOUT_TIMEOUT	100</div><div class='del'>-</div><div class='del'>-/* Used for the status bar messages */</div><div class='del'>-#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "evolution-calendar-mini.png"</div><div class='del'>-static GdkPixbuf *progress_icon[2] = { NULL, NULL };</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	SELECTION_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-static guint e_week_view_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_week_view_class_init (EWeekViewClass *class);</div><div class='del'>-static void e_week_view_init (EWeekView *week_view);</div><div class='del'>-static void e_week_view_destroy (GtkObject *object);</div><div class='del'>-static void e_week_view_realize (GtkWidget *widget);</div><div class='del'>-static void e_week_view_unrealize (GtkWidget *widget);</div><div class='del'>-static void e_week_view_style_set (GtkWidget *widget,</div><div class='del'>-				   GtkStyle  *previous_style);</div><div class='del'>-static void e_week_view_size_allocate (GtkWidget *widget,</div><div class='del'>-				       GtkAllocation *allocation);</div><div class='del'>-static void e_week_view_recalc_cell_sizes (EWeekView *week_view);</div><div class='del'>-static gint e_week_view_focus_in (GtkWidget *widget,</div><div class='del'>-				  GdkEventFocus *event);</div><div class='del'>-static gint e_week_view_focus_out (GtkWidget *widget,</div><div class='del'>-				   GdkEventFocus *event);</div><div class='del'>-static gint e_week_view_expose_event (GtkWidget *widget,</div><div class='del'>-				      GdkEventExpose *event);</div><div class='del'>-static void e_week_view_draw (GtkWidget    *widget,</div><div class='del'>-			      GdkRectangle *area);</div><div class='del'>-static void e_week_view_draw_shadow (EWeekView *week_view);</div><div class='del'>-</div><div class='del'>-static gboolean e_week_view_on_button_press (GtkWidget *widget,</div><div class='del'>-					     GdkEventButton *event,</div><div class='del'>-					     EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_on_button_release (GtkWidget *widget,</div><div class='del'>-					       GdkEventButton *event,</div><div class='del'>-					       EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_on_motion (GtkWidget *widget,</div><div class='del'>-				       GdkEventMotion *event,</div><div class='del'>-				       EWeekView *week_view);</div><div class='del'>-static gint e_week_view_convert_position_to_day (EWeekView *week_view,</div><div class='del'>-						 gint x,</div><div class='del'>-						 gint y);</div><div class='del'>-static void e_week_view_update_selection (EWeekView *week_view,</div><div class='del'>-					  gint day);</div><div class='del'>-</div><div class='del'>-static void e_week_view_free_events (EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_add_event (CalComponent *comp,</div><div class='del'>-				       time_t	  start,</div><div class='del'>-				       time_t	  end,</div><div class='del'>-				       gpointer	  data);</div><div class='del'>-static void e_week_view_check_layout (EWeekView *week_view);</div><div class='del'>-static void e_week_view_ensure_events_sorted (EWeekView *week_view);</div><div class='del'>-static void e_week_view_reshape_events (EWeekView *week_view);</div><div class='del'>-static void e_week_view_reshape_event_span (EWeekView *week_view,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    gint span_num);</div><div class='del'>-static void e_week_view_recalc_day_starts (EWeekView *week_view,</div><div class='del'>-					   time_t lower);</div><div class='del'>-static void e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-					       EWeekView *week_view);</div><div class='del'>-static void e_week_view_on_editing_started (EWeekView *week_view,</div><div class='del'>-					    GnomeCanvasItem *item);</div><div class='del'>-static void e_week_view_on_editing_stopped (EWeekView *week_view,</div><div class='del'>-					    GnomeCanvasItem *item);</div><div class='del'>-static gboolean e_week_view_find_event_from_item (EWeekView	  *week_view,</div><div class='del'>-						  GnomeCanvasItem *item,</div><div class='del'>-						  gint		  *event_num,</div><div class='del'>-						  gint		  *span_num);</div><div class='del'>-static gboolean e_week_view_find_event_from_uid (EWeekView	  *week_view,</div><div class='del'>-						 const gchar	  *uid,</div><div class='del'>-						 gint		  *event_num_return);</div><div class='del'>-typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,</div><div class='del'>-						    gint event_num,</div><div class='del'>-						    gpointer data);</div><div class='del'>-</div><div class='del'>-static void e_week_view_foreach_event_with_uid (EWeekView *week_view,</div><div class='del'>-						const gchar *uid,</div><div class='del'>-						EWeekViewForeachEventCallback callback,</div><div class='del'>-						gpointer data);</div><div class='del'>-static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,</div><div class='del'>-						GdkEvent *event,</div><div class='del'>-						EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item,</div><div class='del'>-						  GdkEvent *event,</div><div class='del'>-						  EWeekView *week_view);</div><div class='del'>-static gint e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);</div><div class='del'>-static void e_week_view_on_new_appointment (GtkWidget *widget,</div><div class='del'>-					    gpointer data);</div><div class='del'>-static void e_week_view_on_new_event       (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_week_view_on_new_meeting (GtkWidget *widget,</div><div class='del'>-					gpointer data);</div><div class='del'>-static void e_week_view_on_new_task (GtkWidget *widget,</div><div class='del'>-				     gpointer data);</div><div class='del'>-static void e_week_view_on_goto_today      (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_week_view_on_goto_date       (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_week_view_on_edit_appointment (GtkWidget *widget,</div><div class='del'>-					     gpointer data);</div><div class='del'>-static void e_week_view_on_save_as (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_week_view_on_print (GtkWidget *widget,</div><div class='del'>-				  gpointer data);</div><div class='del'>-static void e_week_view_on_print_event (GtkWidget *widget,</div><div class='del'>-					gpointer data);</div><div class='del'>-static void e_week_view_on_meeting (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_week_view_on_forward (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_week_view_on_publish (GtkWidget *widget,</div><div class='del'>-				    gpointer data);</div><div class='del'>-static void e_week_view_on_settings (GtkWidget *widget,</div><div class='del'>-				     gpointer data);</div><div class='del'>-static void e_week_view_on_pilot_settings (GtkWidget *widget,</div><div class='del'>-					   gpointer data);</div><div class='del'>-static void e_week_view_on_delete_occurrence (GtkWidget *widget,</div><div class='del'>-					      gpointer data);</div><div class='del'>-static void e_week_view_on_delete_appointment (GtkWidget *widget,</div><div class='del'>-					       gpointer data);</div><div class='del'>-static void e_week_view_on_cut (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_week_view_on_copy (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_week_view_on_paste (GtkWidget *widget, gpointer data);</div><div class='del'>-static void e_week_view_on_unrecur_appointment (GtkWidget *widget,</div><div class='del'>-						gpointer data);</div><div class='del'>-</div><div class='del'>-static gboolean e_week_view_update_event_cb (EWeekView *week_view,</div><div class='del'>-					     gint event_num,</div><div class='del'>-					     gpointer data);</div><div class='del'>-static gboolean e_week_view_remove_event_cb (EWeekView *week_view,</div><div class='del'>-					     gint event_num,</div><div class='del'>-					     gpointer data);</div><div class='del'>-static gboolean e_week_view_recalc_display_start_day	(EWeekView	*week_view);</div><div class='del'>-</div><div class='del'>-static void invisible_destroyed   (GtkWidget *invisible, EWeekView *week_view);</div><div class='del'>-static void selection_get         (GtkWidget *invisible,</div><div class='del'>-				   GtkSelectionData *selection_data,</div><div class='del'>-				   guint info,</div><div class='del'>-				   guint time_stamp,</div><div class='del'>-				   EWeekView *week_view);</div><div class='del'>-static void selection_clear_event (GtkWidget *invisible,</div><div class='del'>-				   GdkEventSelection *event,</div><div class='del'>-				   EWeekView *week_view);</div><div class='del'>-static void selection_received    (GtkWidget *invisible,</div><div class='del'>-				   GtkSelectionData *selection_data,</div><div class='del'>-				   guint time,</div><div class='del'>-				   EWeekView *week_view);</div><div class='del'>-</div><div class='del'>-static void e_week_view_queue_layout (EWeekView *week_view);</div><div class='del'>-static void e_week_view_cancel_layout (EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_layout_timeout_cb (gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-static GdkAtom clipboard_atom = GDK_NONE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_week_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_week_view_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_type){</div><div class='del'>-		GtkTypeInfo e_week_view_info = {</div><div class='del'>-			"EWeekView",</div><div class='del'>-			sizeof (EWeekView),</div><div class='del'>-			sizeof (EWeekViewClass),</div><div class='del'>-			(GtkClassInitFunc) e_week_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_week_view_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		parent_class = gtk_type_class (GTK_TYPE_TABLE);</div><div class='del'>-		e_week_view_type = gtk_type_unique (GTK_TYPE_TABLE,</div><div class='del'>-						    &amp;e_week_view_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_week_view_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_class_init (EWeekViewClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	e_week_view_signals[SELECTION_CHANGED] =</div><div class='del'>-		gtk_signal_new ("selection_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EWeekViewClass, selection_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_week_view_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	/* Method override */</div><div class='del'>-	object_class-&gt;destroy		= e_week_view_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize		= e_week_view_realize;</div><div class='del'>-	widget_class-&gt;unrealize		= e_week_view_unrealize;</div><div class='del'>-	widget_class-&gt;style_set		= e_week_view_style_set;</div><div class='del'>- 	widget_class-&gt;size_allocate	= e_week_view_size_allocate;</div><div class='del'>-	widget_class-&gt;focus_in_event	= e_week_view_focus_in;</div><div class='del'>-	widget_class-&gt;focus_out_event	= e_week_view_focus_out;</div><div class='del'>-	widget_class-&gt;key_press_event	= e_week_view_key_press;</div><div class='del'>-	widget_class-&gt;expose_event	= e_week_view_expose_event;</div><div class='del'>-	widget_class-&gt;draw		= e_week_view_draw;</div><div class='del'>-</div><div class='del'>-	class-&gt;selection_changed = NULL;</div><div class='del'>-</div><div class='del'>-	/* clipboard atom */</div><div class='del'>-	if (!clipboard_atom)</div><div class='del'>-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_init (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroup *canvas_group;</div><div class='del'>-	GtkObject *adjustment;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;calendar = NULL;</div><div class='del'>-	week_view-&gt;client = NULL;</div><div class='del'>-	week_view-&gt;sexp = g_strdup ("#t"); /* match all by default */</div><div class='del'>-	week_view-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;events = g_array_new (FALSE, FALSE,</div><div class='del'>-					 sizeof (EWeekViewEvent));</div><div class='del'>-	week_view-&gt;events_sorted = TRUE;</div><div class='del'>-	week_view-&gt;events_need_layout = FALSE;</div><div class='del'>-	week_view-&gt;events_need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;layout_timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;spans = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;zone = NULL;</div><div class='del'>-	week_view-&gt;multi_week_view = FALSE;</div><div class='del'>-	week_view-&gt;weeks_shown = 6;</div><div class='del'>-	week_view-&gt;rows = 6;</div><div class='del'>-	week_view-&gt;columns = 2;</div><div class='del'>-	week_view-&gt;compress_weekend = TRUE;</div><div class='del'>-	week_view-&gt;show_event_end_times = TRUE;</div><div class='del'>-	week_view-&gt;week_start_day = 0;		/* Monday. */</div><div class='del'>-	week_view-&gt;display_start_day = 0;	/* Monday. */</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;week_view-&gt;base_date, 1);</div><div class='del'>-	g_date_clear (&amp;week_view-&gt;first_day_shown, 1);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;row_height = 10;</div><div class='del'>-	week_view-&gt;rows_per_cell = 1;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;selection_start_day = -1;</div><div class='del'>-	week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;pressed_event_num = -1;</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;default_category = NULL;</div><div class='del'>-</div><div class='del'>-	/* Create the small font. */</div><div class='del'>-	week_view-&gt;use_small_font = TRUE;</div><div class='del'>-	week_view-&gt;small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT);</div><div class='del'>-	if (!week_view-&gt;small_font)</div><div class='del'>-		week_view-&gt;small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT_FALLBACK);</div><div class='del'>-	if (!week_view-&gt;small_font)</div><div class='del'>-		g_warning ("Couldn't load font");</div><div class='del'>-</div><div class='del'>-	/* String to use in 12-hour time format for times in the morning. */</div><div class='del'>-	week_view-&gt;am_string = _("am");</div><div class='del'>-</div><div class='del'>-	/* String to use in 12-hour time format for times in the afternoon. */</div><div class='del'>-	week_view-&gt;pm_string = _("pm");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Titles Canvas. Note that we don't show it is only shown in the</div><div class='del'>-	 * Month view.</div><div class='del'>-	 */</div><div class='del'>-	week_view-&gt;titles_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (week_view), week_view-&gt;titles_canvas,</div><div class='del'>-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;titles_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;titles_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_week_view_titles_item_get_type (),</div><div class='del'>-				       "EWeekViewTitlesItem::week_view", week_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Main Canvas</div><div class='del'>-	 */</div><div class='del'>-	week_view-&gt;main_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (week_view), week_view-&gt;main_canvas,</div><div class='del'>-			  1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);</div><div class='del'>-	gtk_widget_show (week_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;main_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;main_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_week_view_main_item_get_type (),</div><div class='del'>-				       "EWeekViewMainItem::week_view", week_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (week_view-&gt;main_canvas),</div><div class='del'>-				  "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_week_view_on_button_press),</div><div class='del'>-				  week_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (week_view-&gt;main_canvas),</div><div class='del'>-				  "button_release_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_week_view_on_button_release),</div><div class='del'>-				  week_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (week_view-&gt;main_canvas),</div><div class='del'>-				  "motion_notify_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_week_view_on_motion),</div><div class='del'>-				  week_view);</div><div class='del'>-</div><div class='del'>-	/* Create the buttons to jump to each days. */</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; E_WEEK_VIEW_MAX_WEEKS * 7; i++) {</div><div class='del'>-		week_view-&gt;jump_buttons[i] = gnome_canvas_item_new</div><div class='del'>-			(canvas_group,</div><div class='del'>-			 gnome_canvas_pixbuf_get_type (),</div><div class='del'>-			 "GnomeCanvasPixbuf::pixbuf", pixbuf,</div><div class='del'>-			 NULL);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (week_view-&gt;jump_buttons[i]),</div><div class='del'>-				    "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (e_week_view_on_jump_button_event),</div><div class='del'>-				    week_view);</div><div class='del'>-	}</div><div class='del'>-	gdk_pixbuf_unref (pixbuf);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Scrollbar.</div><div class='del'>-	 */</div><div class='del'>-	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);</div><div class='del'>-	gtk_signal_connect (adjustment, "value_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_week_view_on_adjustment_changed),</div><div class='del'>-			    week_view);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));</div><div class='del'>-	gtk_table_attach (GTK_TABLE (week_view), week_view-&gt;vscrollbar,</div><div class='del'>-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (week_view-&gt;vscrollbar);</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	week_view-&gt;normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);</div><div class='del'>-	week_view-&gt;move_cursor = gdk_cursor_new (GDK_FLEUR);</div><div class='del'>-	week_view-&gt;resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);</div><div class='del'>-	week_view-&gt;last_cursor_set = NULL;</div><div class='del'>-</div><div class='del'>-	/* Set up the inivisible widget for the clipboard selections */</div><div class='del'>-	week_view-&gt;invisible = gtk_invisible_new ();</div><div class='del'>-	gtk_selection_add_target (week_view-&gt;invisible,</div><div class='del'>-				  clipboard_atom,</div><div class='del'>-				  GDK_SELECTION_TYPE_STRING,</div><div class='del'>-				  0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;invisible),</div><div class='del'>-			    "selection_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_get),</div><div class='del'>-			    (gpointer) week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;invisible),</div><div class='del'>-			    "selection_clear_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_clear_event),</div><div class='del'>-			    (gpointer) week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;invisible),</div><div class='del'>-			    "selection_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_received),</div><div class='del'>-			    (gpointer) week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;invisible),</div><div class='del'>-			    "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (invisible_destroyed),</div><div class='del'>-			    (gpointer) week_view);</div><div class='del'>-	week_view-&gt;clipboard_selection = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;activity = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_week_view_new:</div><div class='del'>- * @Returns: a new #EWeekView.</div><div class='del'>- *</div><div class='del'>- * Creates a new #EWeekView.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-e_week_view_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = GTK_WIDGET (gtk_type_new (e_week_view_get_type ()));</div><div class='del'>-</div><div class='del'>-	return week_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (object);</div><div class='del'>-</div><div class='del'>-	e_week_view_cancel_layout (week_view);</div><div class='del'>-</div><div class='del'>-	e_week_view_free_events (week_view);</div><div class='del'>-	g_array_free (week_view-&gt;events, TRUE);</div><div class='del'>-	week_view-&gt;events = NULL;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view-&gt;client), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;client));</div><div class='del'>-		week_view-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;sexp) {</div><div class='del'>-		g_free (week_view-&gt;sexp);</div><div class='del'>-		week_view-&gt;sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view-&gt;query), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;query));</div><div class='del'>-		week_view-&gt;query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;small_font) {</div><div class='del'>-		gdk_font_unref (week_view-&gt;small_font);</div><div class='del'>-		week_view-&gt;small_font = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;default_category) {</div><div class='del'>-		g_free (week_view-&gt;default_category);</div><div class='del'>-		week_view-&gt;default_category = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gdk_cursor_destroy (week_view-&gt;normal_cursor);</div><div class='del'>-	gdk_cursor_destroy (week_view-&gt;move_cursor);</div><div class='del'>-	gdk_cursor_destroy (week_view-&gt;resize_width_cursor);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;invisible)</div><div class='del'>-		gtk_widget_destroy (week_view-&gt;invisible);</div><div class='del'>-	if (week_view-&gt;clipboard_selection) {</div><div class='del'>-		g_free (week_view-&gt;clipboard_selection);</div><div class='del'>-		week_view-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;activity) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;activity));</div><div class='del'>-		week_view-&gt;activity = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_WEEK_VIEW_COLOR_LAST];</div><div class='del'>-	gint nfailed;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;realize)(widget);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-	week_view-&gt;main_gc = gdk_gc_new (widget-&gt;window);</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xe0e0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xe0e0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xe0e0;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].red   = 65535;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].green = 65535;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].blue  = 65535;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red   = 213 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 213 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 213 * 257;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].red   = 0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].green = 0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].blue  = 0;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].red   = 0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].green = 0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVENT_TEXT].blue  = 0;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_GRID].red   = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_GRID].green = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_GRID].blue  = 0 * 257;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_SELECTED].red   = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_SELECTED].green = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_SELECTED].blue  = 156 * 257;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES].red   = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES].green = 0 * 257;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES].blue  = 0 * 257;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].red   = 65535;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].green = 65535;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_DATES_SELECTED].blue  = 65535;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_TODAY].red   = 65535;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_TODAY].green = 0;</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_TODAY].blue  = 0;</div><div class='del'>-</div><div class='del'>-	nfailed = gdk_colormap_alloc_colors (colormap, week_view-&gt;colors,</div><div class='del'>-					     E_WEEK_VIEW_COLOR_LAST, FALSE,</div><div class='del'>-					     TRUE, success);</div><div class='del'>-	if (nfailed)</div><div class='del'>-		g_warning ("Failed to allocate all colors");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Create the pixmaps. */</div><div class='del'>-	week_view-&gt;reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;week_view-&gt;reminder_mask, NULL, bell_xpm);</div><div class='del'>-	week_view-&gt;recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;week_view-&gt;recurrence_mask, NULL, recur_xpm);</div><div class='del'>-	week_view-&gt;timezone_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &amp;week_view-&gt;timezone_mask, NULL, timezone_16_xpm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_unrealize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (week_view-&gt;main_gc);</div><div class='del'>-	week_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-	for (i = 0; i &lt; E_WEEK_VIEW_COLOR_LAST; i++)</div><div class='del'>-		gdk_colors_free (colormap, &amp;week_view-&gt;colors[i].pixel, 1, 0);</div><div class='del'>-</div><div class='del'>-	gdk_pixmap_unref (week_view-&gt;reminder_icon);</div><div class='del'>-	week_view-&gt;reminder_icon = NULL;</div><div class='del'>-	gdk_pixmap_unref (week_view-&gt;recurrence_icon);</div><div class='del'>-	week_view-&gt;recurrence_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_style_set (GtkWidget *widget,</div><div class='del'>-		      GtkStyle  *previous_style)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint day, day_width, max_day_width, max_abbr_day_width;</div><div class='del'>-	gint month, month_width, max_month_width, max_abbr_month_width;</div><div class='del'>-	gint span_num;</div><div class='del'>-	GDate date;</div><div class='del'>-	gchar buffer[128];</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;style_set)(widget, previous_style);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Recalculate the height of each row based on the font size. */</div><div class='del'>-	week_view-&gt;row_height = font-&gt;ascent + font-&gt;descent + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2 + E_WEEK_VIEW_EVENT_TEXT_Y_PAD * 2;</div><div class='del'>-	week_view-&gt;row_height = MAX (week_view-&gt;row_height, E_WEEK_VIEW_ICON_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2);</div><div class='del'>-</div><div class='del'>-	/* Check that the small font is smaller than the default font.</div><div class='del'>-	   If it isn't, we won't use it. */</div><div class='del'>-	if (week_view-&gt;small_font) {</div><div class='del'>-		if (font-&gt;ascent + font-&gt;descent &lt;= week_view-&gt;small_font-&gt;ascent + week_view-&gt;small_font-&gt;descent)</div><div class='del'>-			week_view-&gt;use_small_font = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the height of the top canvas. */</div><div class='del'>-	gtk_widget_set_usize (week_view-&gt;titles_canvas, -1,</div><div class='del'>-			      font-&gt;ascent + font-&gt;descent + 5);</div><div class='del'>-</div><div class='del'>-	/* Save the sizes of various strings in the font, so we can quickly</div><div class='del'>-	   decide which date formats to use. */</div><div class='del'>-	g_date_clear (&amp;date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;date, 27, 3, 2000);	/* Must be a Monday. */</div><div class='del'>-</div><div class='del'>-	max_day_width = 0;</div><div class='del'>-	max_abbr_day_width = 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		g_date_strftime (buffer, 128, "%A", &amp;date);</div><div class='del'>-		day_width = gdk_string_width (font, buffer);</div><div class='del'>-		week_view-&gt;day_widths[day] = day_width;</div><div class='del'>-		max_day_width = MAX (max_day_width, day_width);</div><div class='del'>-</div><div class='del'>-		g_date_strftime (buffer, 128, "%a", &amp;date);</div><div class='del'>-		day_width = gdk_string_width (font, buffer);</div><div class='del'>-		week_view-&gt;abbr_day_widths[day] = day_width;</div><div class='del'>-		max_abbr_day_width = MAX (max_abbr_day_width, day_width);</div><div class='del'>-</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	max_month_width = 0;</div><div class='del'>-	max_abbr_month_width = 0;</div><div class='del'>-	for (month = 0; month &lt; 12; month++) {</div><div class='del'>-		g_date_set_month (&amp;date, month + 1);</div><div class='del'>-</div><div class='del'>-		g_date_strftime (buffer, 128, "%B", &amp;date);</div><div class='del'>-		month_width = gdk_string_width (font, buffer);</div><div class='del'>-		week_view-&gt;month_widths[month] = month_width;</div><div class='del'>-		max_month_width = MAX (max_month_width, month_width);</div><div class='del'>-</div><div class='del'>-		g_date_strftime (buffer, 128, "%b", &amp;date);</div><div class='del'>-		month_width = gdk_string_width (font, buffer);</div><div class='del'>-		week_view-&gt;abbr_month_widths[month] = month_width;</div><div class='del'>-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	week_view-&gt;space_width = gdk_string_width (font, " ");</div><div class='del'>-	week_view-&gt;colon_width = gdk_string_width (font, ":");</div><div class='del'>-	week_view-&gt;slash_width = gdk_string_width (font, "/");</div><div class='del'>-	week_view-&gt;digit_width = gdk_string_width (font, "5");</div><div class='del'>-	if (week_view-&gt;small_font)</div><div class='del'>-		week_view-&gt;small_digit_width = gdk_string_width (week_view-&gt;small_font, "5");</div><div class='del'>-	week_view-&gt;max_day_width = max_day_width;</div><div class='del'>-	week_view-&gt;max_abbr_day_width = max_abbr_day_width;</div><div class='del'>-	week_view-&gt;max_month_width = max_month_width;</div><div class='del'>-	week_view-&gt;max_abbr_month_width = max_abbr_month_width;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;am_string_width = gdk_string_width (font,</div><div class='del'>-						       week_view-&gt;am_string);</div><div class='del'>-	week_view-&gt;pm_string_width = gdk_string_width (font,</div><div class='del'>-						       week_view-&gt;pm_string);</div><div class='del'>-</div><div class='del'>-	/* Set the font of all the EText items. */</div><div class='del'>-	if (week_view-&gt;spans) {</div><div class='del'>-		for (span_num = 0; span_num &lt; week_view-&gt;spans-&gt;len;</div><div class='del'>-		     span_num++) {</div><div class='del'>-			span = &amp;g_array_index (week_view-&gt;spans,</div><div class='del'>-					       EWeekViewEventSpan, span_num);</div><div class='del'>-			if (span-&gt;text_item)</div><div class='del'>-				gnome_canvas_item_set (span-&gt;text_item,</div><div class='del'>-						       "font_gdk", font,</div><div class='del'>-						       NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the sizes of each column. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	(*GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the top canvas to its allocated size. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view-&gt;titles_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = week_view-&gt;titles_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = week_view-&gt;titles_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view-&gt;titles_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the main canvas to its allocated width,</div><div class='del'>-	   but with the height depending on the number of rows needed. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view-&gt;main_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = week_view-&gt;main_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = week_view-&gt;main_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view-&gt;main_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-	/* Flag that we need to reshape the events. */</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2) {</div><div class='del'>-		week_view-&gt;events_need_reshape = TRUE;</div><div class='del'>-		e_week_view_check_layout (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_recalc_cell_sizes (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gfloat canvas_width, canvas_height, offset;</div><div class='del'>-	gint row, col;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint width, height, time_width;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		week_view-&gt;rows = week_view-&gt;weeks_shown * 2;</div><div class='del'>-		week_view-&gt;columns = week_view-&gt;compress_weekend ? 6 : 7;</div><div class='del'>-	} else {</div><div class='del'>-		week_view-&gt;rows = 6;</div><div class='del'>-		week_view-&gt;columns = 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the column sizes, using floating point so that pixels</div><div class='del'>-	   get divided evenly. Note that we use one more element than the</div><div class='del'>-	   number of columns, to make it easy to get the column widths.</div><div class='del'>-	   We also add one to the width so that the right border of the last</div><div class='del'>-	   column is off the edge of the displayed area. */</div><div class='del'>-	canvas_width = week_view-&gt;main_canvas-&gt;allocation.width + 1;</div><div class='del'>-	canvas_width /= week_view-&gt;columns;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (col = 0; col &lt;= week_view-&gt;columns; col++) {</div><div class='del'>-		week_view-&gt;col_offsets[col] = floor (offset + 0.5);</div><div class='del'>-		offset += canvas_width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the cell widths based on the offsets. */</div><div class='del'>-	for (col = 0; col &lt; week_view-&gt;columns; col++) {</div><div class='del'>-		week_view-&gt;col_widths[col] = week_view-&gt;col_offsets[col + 1]</div><div class='del'>-			- week_view-&gt;col_offsets[col];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now do the same for the row heights. */</div><div class='del'>-	canvas_height = week_view-&gt;main_canvas-&gt;allocation.height + 1;</div><div class='del'>-	canvas_height /= week_view-&gt;rows;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (row = 0; row &lt;= week_view-&gt;rows; row++) {</div><div class='del'>-		week_view-&gt;row_offsets[row] = floor (offset + 0.5);</div><div class='del'>-		offset += canvas_height;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the cell heights based on the offsets. */</div><div class='del'>-	for (row = 0; row &lt; week_view-&gt;rows; row++) {</div><div class='del'>-		week_view-&gt;row_heights[row] = week_view-&gt;row_offsets[row + 1]</div><div class='del'>-			- week_view-&gt;row_offsets[row];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* If the font hasn't been set yet just return. */</div><div class='del'>-	widget = GTK_WIDGET (week_view);</div><div class='del'>-	if (!widget-&gt;style || ! widget-&gt;style-&gt;font)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Calculate the number of rows of events in each cell, for the large</div><div class='del'>-	   cells and the compressed weekend cells. */</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		week_view-&gt;events_y_offset = E_WEEK_VIEW_DATE_T_PAD</div><div class='del'>-			+ font-&gt;ascent + font-&gt;descent</div><div class='del'>-			+ E_WEEK_VIEW_DATE_B_PAD;</div><div class='del'>-	} else {</div><div class='del'>-		week_view-&gt;events_y_offset = E_WEEK_VIEW_DATE_T_PAD</div><div class='del'>-			+ font-&gt;ascent + font-&gt;descent</div><div class='del'>-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1</div><div class='del'>-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	height = week_view-&gt;row_heights[0];</div><div class='del'>-	week_view-&gt;rows_per_cell = (height * 2 - week_view-&gt;events_y_offset)</div><div class='del'>-		/ (week_view-&gt;row_height + E_WEEK_VIEW_EVENT_Y_SPACING);</div><div class='del'>-	week_view-&gt;rows_per_cell = MIN (week_view-&gt;rows_per_cell,</div><div class='del'>-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;rows_per_compressed_cell =</div><div class='del'>-		(height - week_view-&gt;events_y_offset)</div><div class='del'>-		/ (week_view-&gt;row_height + E_WEEK_VIEW_EVENT_Y_SPACING);</div><div class='del'>-	week_view-&gt;rows_per_compressed_cell = MIN (week_view-&gt;rows_per_compressed_cell,</div><div class='del'>-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);</div><div class='del'>-</div><div class='del'>-	/* Determine which time format to use, based on the width of the cells.</div><div class='del'>-	   We only allow the time to take up about half of the width. */</div><div class='del'>-	width = week_view-&gt;col_widths[0];</div><div class='del'>-</div><div class='del'>-	time_width = e_week_view_get_time_string_width (week_view);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;time_format = E_WEEK_VIEW_TIME_NONE;</div><div class='del'>-	if (week_view-&gt;use_small_font &amp;&amp; week_view-&gt;small_font) {</div><div class='del'>-		if (week_view-&gt;show_event_end_times</div><div class='del'>-		    &amp;&amp; width / 2 &gt; time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)</div><div class='del'>-			week_view-&gt;time_format = E_WEEK_VIEW_TIME_BOTH_SMALL_MIN;</div><div class='del'>-		else if (width / 2 &gt; time_width)</div><div class='del'>-			week_view-&gt;time_format = E_WEEK_VIEW_TIME_START_SMALL_MIN;</div><div class='del'>-	} else {</div><div class='del'>-		if (week_view-&gt;show_event_end_times</div><div class='del'>-		    &amp;&amp; width / 2 &gt; time_width * 2 + E_WEEK_VIEW_EVENT_TIME_SPACING)</div><div class='del'>-			week_view-&gt;time_format = E_WEEK_VIEW_TIME_BOTH;</div><div class='del'>-		else if (width / 2 &gt; time_width)</div><div class='del'>-			week_view-&gt;time_format = E_WEEK_VIEW_TIME_START;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This draws a shadow around the top display and main display. */</div><div class='del'>-static gint</div><div class='del'>-e_week_view_expose_event (GtkWidget *widget,</div><div class='del'>-			  GdkEventExpose *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	e_week_view_draw_shadow (week_view);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;expose_event)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;expose_event)(widget, event);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_draw (GtkWidget    *widget,</div><div class='del'>-		  GdkRectangle *area)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	e_week_view_draw_shadow (week_view);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;draw)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;draw)(widget, area);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_draw_shadow (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint x1, y1, x2, y2;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *light_gc, *dark_gc;</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-</div><div class='del'>-	/* Draw the shadow around the graphical displays. */</div><div class='del'>-	x1 = week_view-&gt;main_canvas-&gt;allocation.x - 1;</div><div class='del'>-	y1 = week_view-&gt;main_canvas-&gt;allocation.y - 1;</div><div class='del'>-	x2 = x1 + week_view-&gt;main_canvas-&gt;allocation.width + 2;</div><div class='del'>-	y2 = y1 + week_view-&gt;main_canvas-&gt;allocation.height + 2;</div><div class='del'>-</div><div class='del'>-	style = GTK_WIDGET (week_view)-&gt;style;</div><div class='del'>-	dark_gc = style-&gt;dark_gc[GTK_STATE_NORMAL];</div><div class='del'>-	light_gc = style-&gt;light_gc[GTK_STATE_NORMAL];</div><div class='del'>-</div><div class='del'>-	window = GTK_WIDGET (week_view)-&gt;window;</div><div class='del'>-	gdk_draw_line (window, dark_gc, x1, y1, x1, y2);</div><div class='del'>-	gdk_draw_line (window, dark_gc, x1, y1, x2, y1);</div><div class='del'>-	gdk_draw_line (window, light_gc, x2, y1, x2, y2);</div><div class='del'>-	gdk_draw_line (window, light_gc, x1, y2, x2, y2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_calendar	(EWeekView	*week_view,</div><div class='del'>-				 GnomeCalendar	*calendar)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	week_view-&gt;calendar = calendar;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is updated in the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_updated_cb (CalQuery *query, const char *uid,</div><div class='del'>-		      gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-		      gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, num_days;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* If we don't have a valid date set yet, just return. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the event from the server. */</div><div class='del'>-	status = cal_client_get_object (week_view-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event already exists and the dates didn't change, we can</div><div class='del'>-	   update the event fairly easily without changing the events arrays</div><div class='del'>-	   or computing a new layout. */</div><div class='del'>-	if (e_week_view_find_event_from_uid (week_view, uid, &amp;event_num)) {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		if (!cal_component_has_recurrences (comp)</div><div class='del'>-		    &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)</div><div class='del'>-		    &amp;&amp; cal_component_event_dates_match (comp, event-&gt;comp)) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("updated object's dates unchanged\n");</div><div class='del'>-#endif</div><div class='del'>-			e_week_view_foreach_event_with_uid (week_view, uid, e_week_view_update_event_cb, comp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The dates have changed, so we need to remove the</div><div class='del'>-		   old occurrrences before adding the new ones. */</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("dates changed - removing occurrences\n");</div><div class='del'>-#endif</div><div class='del'>-		e_week_view_foreach_event_with_uid (week_view, uid,</div><div class='del'>-						    e_week_view_remove_event_cb,</div><div class='del'>-						    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add the occurrences of the event. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-	cal_recur_generate_instances (comp,</div><div class='del'>-				      week_view-&gt;day_starts[0],</div><div class='del'>-				      week_view-&gt;day_starts[num_days],</div><div class='del'>-				      e_week_view_add_event, week_view,</div><div class='del'>-				      cal_client_resolve_tzid_cb, week_view-&gt;client,</div><div class='del'>-				      week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	e_week_view_queue_layout (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is removed from the live query */</div><div class='del'>-static void</div><div class='del'>-query_obj_removed_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	e_week_view_foreach_event_with_uid (week_view, uid,</div><div class='del'>-					    e_week_view_remove_event_cb, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-	e_week_view_check_layout (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a query ends */</div><div class='del'>-static void</div><div class='del'>-query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, NULL);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_QUERY_DONE_SUCCESS)</div><div class='del'>-		fprintf (stderr, "query done: %s\n", error_str);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an evaluation error occurs when running a query */</div><div class='del'>-static void</div><div class='del'>-query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, NULL);</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "eval error: %s\n", error_str);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a complete query sexp for the week view by adding the predicates to</div><div class='del'>- * filter only for VEVENTS that fit in the week view's time range.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-adjust_query_sexp (EWeekView *week_view, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	int num_days;</div><div class='del'>-	char *start, *end;</div><div class='del'>-	char *new_sexp;</div><div class='del'>-</div><div class='del'>-	/* If the dates have not been set yet, we just want an empty query. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-	start = isodate_from_time_t (week_view-&gt;day_starts[0]);</div><div class='del'>-	end = isodate_from_time_t (week_view-&gt;day_starts[num_days]);</div><div class='del'>-</div><div class='del'>-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"</div><div class='del'>-				    "     (occur-in-time-range? (make-time \"%s\")"</div><div class='del'>-				    "                           (make-time \"%s\"))"</div><div class='del'>-				    "     %s)",</div><div class='del'>-				    start, end,</div><div class='del'>-				    sexp);</div><div class='del'>-</div><div class='del'>-	g_free (start);</div><div class='del'>-	g_free (end);</div><div class='del'>-</div><div class='del'>-	return new_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Restarts a query for the week view */</div><div class='del'>-static void</div><div class='del'>-update_query (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	CalQuery *old_query;</div><div class='del'>-	char *real_sexp;</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-	e_week_view_free_events (week_view);</div><div class='del'>-	e_week_view_queue_layout (week_view);</div><div class='del'>-</div><div class='del'>-	if (!(week_view-&gt;client</div><div class='del'>-	      &amp;&amp; cal_client_get_load_state (week_view-&gt;client) == CAL_CLIENT_LOAD_LOADED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	old_query = week_view-&gt;query;</div><div class='del'>-	week_view-&gt;query = NULL;</div><div class='del'>-</div><div class='del'>-	if (old_query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (old_query));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (week_view-&gt;sexp != NULL);</div><div class='del'>-</div><div class='del'>-	real_sexp = adjust_query_sexp (week_view, week_view-&gt;sexp);</div><div class='del'>-	if (!real_sexp) {</div><div class='del'>-		return; /* No time range is set, so don't start a query */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, _("Searching"));</div><div class='del'>-	week_view-&gt;query = cal_client_get_query (week_view-&gt;client, real_sexp);</div><div class='del'>-	g_free (real_sexp);</div><div class='del'>-</div><div class='del'>-	if (!week_view-&gt;query) {</div><div class='del'>-		g_message ("update_query(): Could not create the query");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;query), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_updated_cb), week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;query), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_obj_removed_cb), week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;query), "query_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_query_done_cb), week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (week_view-&gt;query), "eval_error",</div><div class='del'>-			    GTK_SIGNAL_FUNC (query_eval_error_cb), week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client finishes opening */</div><div class='del'>-static void</div><div class='del'>-cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_OPEN_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	update_query (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_week_view_set_cal_client:</div><div class='del'>- * @week_view: A week view.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a week view will monitor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_week_view_set_cal_client	(EWeekView	*week_view,</div><div class='del'>-				 CalClient	*client)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (client == week_view-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view-&gt;client), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	week_view-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		if (cal_client_get_load_state (week_view-&gt;client) == CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-			update_query (week_view);</div><div class='del'>-		else</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (week_view-&gt;client), "cal_opened",</div><div class='del'>-					    GTK_SIGNAL_FUNC (cal_opened_cb), week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_week_view_set_query:</div><div class='del'>- * @week_view: A week view.</div><div class='del'>- * @sexp: S-expression that defines the query.</div><div class='del'>- *</div><div class='del'>- * Sets the query sexp that the week view will use for filtering the displayed</div><div class='del'>- * events.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_week_view_set_query (EWeekView *week_view, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-	g_return_if_fail (sexp != NULL);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;sexp)</div><div class='del'>-		g_free (week_view-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;sexp = g_strdup (sexp);</div><div class='del'>-</div><div class='del'>-	update_query (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_week_view_set_default_category:</div><div class='del'>- * @week_view: A week view.</div><div class='del'>- * @category: Default category name or NULL for no category.</div><div class='del'>- *</div><div class='del'>- * Sets the default category that will be used when creating new calendar</div><div class='del'>- * components from the week view.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_week_view_set_default_category (EWeekView *week_view, const char *category)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;default_category)</div><div class='del'>-		g_free (week_view-&gt;default_category);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;default_category = g_strdup (category);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the selected time range. The EWeekView will show the corresponding</div><div class='del'>-   month and the days between start_time and end_time will be selected.</div><div class='del'>-   To select a single day, use the same value for start_time &amp; end_time. */</div><div class='del'>-void</div><div class='del'>-e_week_view_set_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-					 time_t		 start_time,</div><div class='del'>-					 time_t		 end_time)</div><div class='del'>-{</div><div class='del'>-	GDate date, base_date, end_date;</div><div class='del'>-	gint day_offset, weekday, week_start_offset, num_days;</div><div class='del'>-	gboolean update_adjustment_value = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	time_to_gdate_with_zone (&amp;date, start_time, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		/* Find the number of days since the start of the month. */</div><div class='del'>-		day_offset = g_date_day (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-		/* Find the 1st week which starts at or before the start of</div><div class='del'>-		   the month. */</div><div class='del'>-		base_date = date;</div><div class='del'>-		g_date_set_day (&amp;base_date, 1);</div><div class='del'>-</div><div class='del'>-		/* Calculate the weekday of the 1st of the month, 0 = Mon. */</div><div class='del'>-		weekday = g_date_weekday (&amp;base_date) - 1;</div><div class='del'>-</div><div class='del'>-		/* Convert it to an offset from the start of the display. */</div><div class='del'>-		week_start_offset = (weekday + 7 - week_view-&gt;display_start_day) % 7;</div><div class='del'>-</div><div class='del'>-		/* Add it to the day offset so we go back to the 1st week at</div><div class='del'>-		   or before the start of the month. */</div><div class='del'>-		day_offset += week_start_offset;</div><div class='del'>-	} else {</div><div class='del'>-		/* Calculate the weekday of the given date, 0 = Mon. */</div><div class='del'>-		weekday = g_date_weekday (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-		/* Convert it to an offset from the start of the display. */</div><div class='del'>-		week_start_offset = (weekday + 7 - week_view-&gt;display_start_day) % 7;</div><div class='del'>-</div><div class='del'>-		/* Set the day_offset to the result, so we move back to the</div><div class='del'>-		   start of the week. */</div><div class='del'>-		day_offset = week_start_offset;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the base date, i.e. the first day shown when the</div><div class='del'>-	   scrollbar adjustment value is 0. */</div><div class='del'>-	base_date = date;</div><div class='del'>-	g_date_subtract_days (&amp;base_date, day_offset);</div><div class='del'>-</div><div class='del'>-	/* See if we need to update the base date. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;base_date)</div><div class='del'>-	    || g_date_compare (&amp;week_view-&gt;base_date, &amp;base_date)) {</div><div class='del'>-		week_view-&gt;base_date = base_date;</div><div class='del'>-		update_adjustment_value = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if we need to update the first day shown. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown)</div><div class='del'>-	    || g_date_compare (&amp;week_view-&gt;first_day_shown, &amp;base_date)) {</div><div class='del'>-		week_view-&gt;first_day_shown = base_date;</div><div class='del'>-		start_time = time_add_day_with_zone (start_time, -day_offset,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-		start_time = time_day_begin_with_zone (start_time,</div><div class='del'>-						       week_view-&gt;zone);</div><div class='del'>-		e_week_view_recalc_day_starts (week_view, start_time);</div><div class='del'>-		update_query (week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the selection to the given days. */</div><div class='del'>-	week_view-&gt;selection_start_day = g_date_julian (&amp;date)</div><div class='del'>-		- g_date_julian (&amp;base_date);</div><div class='del'>-	if (end_time == start_time</div><div class='del'>-	    || end_time &lt;= time_add_day_with_zone (start_time, 1,</div><div class='del'>-						   week_view-&gt;zone))</div><div class='del'>-		week_view-&gt;selection_end_day = week_view-&gt;selection_start_day;</div><div class='del'>-	else {</div><div class='del'>-		time_to_gdate_with_zone (&amp;end_date, end_time - 60, week_view-&gt;zone);</div><div class='del'>-		week_view-&gt;selection_end_day = g_date_julian (&amp;end_date)</div><div class='del'>-			- g_date_julian (&amp;base_date);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure the selection is valid. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	num_days--;</div><div class='del'>-	week_view-&gt;selection_start_day = CLAMP (week_view-&gt;selection_start_day,</div><div class='del'>-						0, num_days);</div><div class='del'>-	week_view-&gt;selection_end_day = CLAMP (week_view-&gt;selection_end_day,</div><div class='del'>-					      week_view-&gt;selection_start_day,</div><div class='del'>-					      num_days);</div><div class='del'>-</div><div class='del'>-	/* Reset the adjustment value to 0 if the base address has changed.</div><div class='del'>-	   Note that we do this after updating first_day_shown so that our</div><div class='del'>-	   signal handler will not try to reload the events. */</div><div class='del'>-	if (update_adjustment_value)</div><div class='del'>-		gtk_adjustment_set_value (GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range. */</div><div class='del'>-void</div><div class='del'>-e_week_view_get_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-					 time_t		*start_time,</div><div class='del'>-					 time_t		*end_time)</div><div class='del'>-{</div><div class='del'>-	gint start_day, end_day;</div><div class='del'>-</div><div class='del'>-	start_day = week_view-&gt;selection_start_day;</div><div class='del'>-	end_day = week_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (start_day == -1) {</div><div class='del'>-		start_day = 0;</div><div class='del'>-		end_day = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_time)</div><div class='del'>-		*start_time = week_view-&gt;day_starts[start_day];</div><div class='del'>-</div><div class='del'>-	if (end_time)</div><div class='del'>-		*end_time = week_view-&gt;day_starts[end_day + 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note that the returned date may be invalid if no date has been set yet. */</div><div class='del'>-void</div><div class='del'>-e_week_view_get_first_day_shown		(EWeekView	*week_view,</div><div class='del'>-					 GDate		*date)</div><div class='del'>-{</div><div class='del'>-	*date = week_view-&gt;first_day_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the first day shown in the view. It will be rounded down to the</div><div class='del'>-   nearest week. */</div><div class='del'>-void</div><div class='del'>-e_week_view_set_first_day_shown		(EWeekView	*week_view,</div><div class='del'>-					 GDate		*date)</div><div class='del'>-{</div><div class='del'>-	GDate base_date;</div><div class='del'>-	gint weekday, day_offset, num_days;</div><div class='del'>-	gboolean update_adjustment_value = FALSE;</div><div class='del'>-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time ();</div><div class='del'>-	time_t start_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	/* Calculate the old selection range. */</div><div class='del'>-	if (week_view-&gt;selection_start_day != -1) {</div><div class='del'>-		old_selection_start_julian =</div><div class='del'>-			g_date_julian (&amp;week_view-&gt;base_date)</div><div class='del'>-			+ week_view-&gt;selection_start_day;</div><div class='del'>-		old_selection_end_julian =</div><div class='del'>-			g_date_julian (&amp;week_view-&gt;base_date)</div><div class='del'>-			+ week_view-&gt;selection_end_day;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the weekday of the given date, 0 = Mon. */</div><div class='del'>-	weekday = g_date_weekday (date) - 1;</div><div class='del'>-</div><div class='del'>-	/* Convert it to an offset from the start of the display. */</div><div class='del'>-	day_offset = (weekday + 7 - week_view-&gt;display_start_day) % 7;</div><div class='del'>-</div><div class='del'>-	/* Calculate the base date, i.e. the first day shown when the</div><div class='del'>-	   scrollbar adjustment value is 0. */</div><div class='del'>-	base_date = *date;</div><div class='del'>-	g_date_subtract_days (&amp;base_date, day_offset);</div><div class='del'>-</div><div class='del'>-	/* See if we need to update the base date. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;base_date)</div><div class='del'>-	    || g_date_compare (&amp;week_view-&gt;base_date, &amp;base_date)) {</div><div class='del'>-		week_view-&gt;base_date = base_date;</div><div class='del'>-		update_adjustment_value = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if we need to update the first day shown. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown)</div><div class='del'>-	    || g_date_compare (&amp;week_view-&gt;first_day_shown, &amp;base_date)) {</div><div class='del'>-		week_view-&gt;first_day_shown = base_date;</div><div class='del'>-</div><div class='del'>-		start_tt.year = g_date_year (&amp;base_date);</div><div class='del'>-		start_tt.month = g_date_month (&amp;base_date);</div><div class='del'>-		start_tt.day = g_date_day (&amp;base_date);</div><div class='del'>-</div><div class='del'>-		start_time = icaltime_as_timet_with_zone (start_tt,</div><div class='del'>-							  week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		e_week_view_recalc_day_starts (week_view, start_time);</div><div class='del'>-		update_query (week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to keep the previous selection, but if it is no longer shown</div><div class='del'>-	   just select the first day. */</div><div class='del'>-	if (week_view-&gt;selection_start_day != -1) {</div><div class='del'>-		week_view-&gt;selection_start_day = old_selection_start_julian</div><div class='del'>-			- g_date_julian (&amp;base_date);</div><div class='del'>-		week_view-&gt;selection_end_day = old_selection_end_julian</div><div class='del'>-			- g_date_julian (&amp;base_date);</div><div class='del'>-</div><div class='del'>-		/* Make sure the selection is valid. */</div><div class='del'>-		num_days = week_view-&gt;multi_week_view</div><div class='del'>-			? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-		num_days--;</div><div class='del'>-		week_view-&gt;selection_start_day =</div><div class='del'>-			CLAMP (week_view-&gt;selection_start_day, 0, num_days);</div><div class='del'>-		week_view-&gt;selection_end_day =</div><div class='del'>-			CLAMP (week_view-&gt;selection_end_day,</div><div class='del'>-			       week_view-&gt;selection_start_day,</div><div class='del'>-			       num_days);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset the adjustment value to 0 if the base address has changed.</div><div class='del'>-	   Note that we do this after updating first_day_shown so that our</div><div class='del'>-	   signal handler will not try to reload the events. */</div><div class='del'>-	if (update_adjustment_value)</div><div class='del'>-		gtk_adjustment_set_value (GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Recalculates the time_t corresponding to the start of each day. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_recalc_day_starts (EWeekView *week_view,</div><div class='del'>-			       time_t lower)</div><div class='del'>-{</div><div class='del'>-	gint num_days, day;</div><div class='del'>-	time_t tmp_time;</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-	tmp_time = lower;</div><div class='del'>-	week_view-&gt;day_starts[0] = tmp_time;</div><div class='del'>-	for (day = 1; day &lt;= num_days; day++) {</div><div class='del'>-		tmp_time = time_add_day_with_zone (tmp_time, 1,</div><div class='del'>-						   week_view-&gt;zone);</div><div class='del'>-		week_view-&gt;day_starts[day] = tmp_time;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_multi_week_view	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;multi_week_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_multi_week_view	(EWeekView	*week_view,</div><div class='del'>-				 gboolean	 multi_week_view)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-	gint page_increment, page_size;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view == multi_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;multi_week_view = multi_week_view;</div><div class='del'>-</div><div class='del'>-	if (multi_week_view) {</div><div class='del'>-		gtk_widget_show (week_view-&gt;titles_canvas);</div><div class='del'>-		page_increment = 4;</div><div class='del'>-		page_size = 5;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (week_view-&gt;titles_canvas);</div><div class='del'>-		page_increment = page_size = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adjustment = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-	adjustment-&gt;page_increment = page_increment;</div><div class='del'>-	adjustment-&gt;page_size = page_size;</div><div class='del'>-	gtk_adjustment_changed (adjustment);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-</div><div class='del'>-	if (g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		e_week_view_set_first_day_shown (week_view,</div><div class='del'>-						 &amp;week_view-&gt;first_day_shown);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_week_view_get_weeks_shown	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 1);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;weeks_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_weeks_shown	(EWeekView	*week_view,</div><div class='del'>-				 gint		 weeks_shown)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-	gint page_increment, page_size;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	weeks_shown = MIN (weeks_shown, E_WEEK_VIEW_MAX_WEEKS);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;weeks_shown == weeks_shown)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;weeks_shown = weeks_shown;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		page_increment = 4;</div><div class='del'>-		page_size = 5;</div><div class='del'>-</div><div class='del'>-		adjustment = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-		adjustment-&gt;page_increment = page_increment;</div><div class='del'>-		adjustment-&gt;page_size = page_size;</div><div class='del'>-		gtk_adjustment_changed (adjustment);</div><div class='del'>-</div><div class='del'>-		e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-</div><div class='del'>-		if (g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-			e_week_view_set_first_day_shown (week_view, &amp;week_view-&gt;first_day_shown);</div><div class='del'>-</div><div class='del'>-		update_query (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_compress_weekend	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;compress_weekend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_compress_weekend	(EWeekView	*week_view,</div><div class='del'>-					 gboolean	 compress)</div><div class='del'>-{</div><div class='del'>-	gboolean need_reload = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;compress_weekend == compress)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;compress_weekend = compress;</div><div class='del'>-</div><div class='del'>-	/* The option only affects the month view. */</div><div class='del'>-	if (!week_view-&gt;multi_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-</div><div class='del'>-	need_reload = e_week_view_recalc_display_start_day (week_view);</div><div class='del'>-</div><div class='del'>-	/* If the display_start_day has changed we need to recalculate the</div><div class='del'>-	   date range shown and reload all events, otherwise we only need to</div><div class='del'>-	   do a reshape. */</div><div class='del'>-	if (need_reload) {</div><div class='del'>-		/* Recalculate the days shown and reload if necessary. */</div><div class='del'>-		if (g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-			e_week_view_set_first_day_shown (week_view, &amp;week_view-&gt;first_day_shown);</div><div class='del'>-	} else {</div><div class='del'>-		week_view-&gt;events_need_reshape = TRUE;</div><div class='del'>-		e_week_view_check_layout (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we display event end times. */</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_show_event_end_times	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), TRUE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;show_event_end_times;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_show_event_end_times	(EWeekView	*week_view,</div><div class='del'>-					 gboolean	 show)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;show_event_end_times != show) {</div><div class='del'>-		week_view-&gt;show_event_end_times = show;</div><div class='del'>-		e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-		week_view-&gt;events_need_reshape = TRUE;</div><div class='del'>-		e_week_view_check_layout (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-gint</div><div class='del'>-e_week_view_get_week_start_day	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_week_start_day	(EWeekView	*week_view,</div><div class='del'>-				 gint		 week_start_day)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-	g_return_if_fail (week_start_day &gt;= 0);</div><div class='del'>-	g_return_if_fail (week_start_day &lt; 7);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;week_start_day == week_start_day)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;week_start_day = week_start_day;</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_display_start_day (week_view);</div><div class='del'>-</div><div class='del'>-	/* Recalculate the days shown and reload if necessary. */</div><div class='del'>-	if (g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		e_week_view_set_first_day_shown (week_view,</div><div class='del'>-						 &amp;week_view-&gt;first_day_shown);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour or 24-hour format. */</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_24_hour_format	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_24_hour_format	(EWeekView	*week_view,</div><div class='del'>-				 gboolean	 use_24_hour)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;use_24_hour_format == use_24_hour)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-</div><div class='del'>-	/* We need to re-layout the events since the time format affects the</div><div class='del'>-	   sizes. */</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-	week_view-&gt;events_need_reshape = TRUE;</div><div class='del'>-	e_week_view_check_layout (week_view);</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone*</div><div class='del'>-e_week_view_get_timezone		(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), NULL);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_timezone		(EWeekView	*week_view,</div><div class='del'>-					 icaltimezone	*zone)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *old_zone;</div><div class='del'>-	struct icaltimetype tt = icaltime_null_time ();</div><div class='del'>-	time_t lower;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	old_zone = week_view-&gt;zone;</div><div class='del'>-	if (old_zone == zone)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;zone = zone;</div><div class='del'>-</div><div class='del'>-	/* If we don't have a valid date set yet, just return. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Recalculate the new start of the first week. We just use exactly</div><div class='del'>-	   the same time, but with the new timezone. */</div><div class='del'>-	tt.year = g_date_year (&amp;week_view-&gt;first_day_shown);</div><div class='del'>-	tt.month = g_date_month (&amp;week_view-&gt;first_day_shown);</div><div class='del'>-	tt.day = g_date_day (&amp;week_view-&gt;first_day_shown);</div><div class='del'>-</div><div class='del'>-	lower = icaltime_as_timet_with_zone (tt, zone);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_day_starts (week_view, lower);</div><div class='del'>-	update_query (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_cut_clipboard (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;editing_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;editing_event_num);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, _("Deleting selected objects"));</div><div class='del'>-</div><div class='del'>-	e_week_view_copy_clipboard (week_view);</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-	cal_client_remove_object (week_view-&gt;client, uid);</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_copy_clipboard (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	char *comp_str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;editing_event_num);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	comp_str = cal_component_get_as_string (event-&gt;comp);</div><div class='del'>-	if (week_view-&gt;clipboard_selection != NULL)</div><div class='del'>-		g_free (week_view-&gt;clipboard_selection);</div><div class='del'>-	week_view-&gt;clipboard_selection = comp_str;</div><div class='del'>-	gtk_selection_owner_set (week_view-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_paste_clipboard (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	gtk_selection_convert (week_view-&gt;invisible,</div><div class='del'>-			       clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_recalc_display_start_day	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	gint display_start_day;</div><div class='del'>-</div><div class='del'>-	/* The display start day defaults to week_start_day, but we have</div><div class='del'>-	   to use Saturday if the weekend is compressed and week_start_day</div><div class='del'>-	   is Sunday. */</div><div class='del'>-	display_start_day = week_view-&gt;week_start_day;</div><div class='del'>-</div><div class='del'>-	if (display_start_day == 6</div><div class='del'>-	    &amp;&amp; (!week_view-&gt;multi_week_view || week_view-&gt;compress_weekend))</div><div class='del'>-		display_start_day = 5;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;display_start_day != display_start_day) {</div><div class='del'>-		week_view-&gt;display_start_day = display_start_day;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_update_event_cb (EWeekView *week_view,</div><div class='del'>-			     gint event_num,</div><div class='del'>-			     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint span_num;</div><div class='del'>-	gchar *text;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = data;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	event-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-		span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-				       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-		if (span-&gt;text_item) {</div><div class='del'>-			CalComponentText t;</div><div class='del'>-</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;t);</div><div class='del'>-			text = (char*) t.value;</div><div class='del'>-			gnome_canvas_item_set (span-&gt;text_item,</div><div class='del'>-					       "text", text ? text : "",</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			e_week_view_reshape_event_span (week_view, event_num,</div><div class='del'>-							span_num);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This calls a given function for each event instance that matches the given</div><div class='del'>-   uid. Note that it is safe for the callback to remove the event (since we</div><div class='del'>-   step backwards through the arrays). */</div><div class='del'>-static void</div><div class='del'>-e_week_view_foreach_event_with_uid (EWeekView *week_view,</div><div class='del'>-				    const gchar *uid,</div><div class='del'>-				    EWeekViewForeachEventCallback callback,</div><div class='del'>-				    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = week_view-&gt;events-&gt;len - 1;</div><div class='del'>-	     event_num &gt;= 0;</div><div class='del'>-	     event_num--) {</div><div class='del'>-		const char *u;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			if (!(*callback) (week_view, event_num, data))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_remove_event_cb (EWeekView *week_view,</div><div class='del'>-			     gint event_num,</div><div class='del'>-			     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint span_num;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	/* If we were editing this event, set editing_event_num to -1 so</div><div class='del'>-	   on_editing_stopped doesn't try to update the event. */</div><div class='del'>-	if (week_view-&gt;editing_event_num == event_num)</div><div class='del'>-		week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	/* We leave the span elements in the array, but set the canvas item</div><div class='del'>-	   pointers to NULL. */</div><div class='del'>-	for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-		span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-				       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-		if (span-&gt;text_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-			span-&gt;text_item = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (span-&gt;background_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-			span-&gt;background_item = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-</div><div class='del'>-	g_array_remove_index (week_view-&gt;events, event_num);</div><div class='del'>-	week_view-&gt;events_need_layout = TRUE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_get_day_position	(EWeekView	*week_view,</div><div class='del'>-				 gint		 day,</div><div class='del'>-				 gint		*day_x,</div><div class='del'>-				 gint		*day_y,</div><div class='del'>-				 gint		*day_w,</div><div class='del'>-				 gint		*day_h)</div><div class='del'>-{</div><div class='del'>-	gint cell_x, cell_y, cell_h;</div><div class='del'>-</div><div class='del'>-	e_week_view_layout_get_day_position (day,</div><div class='del'>-					     week_view-&gt;multi_week_view,</div><div class='del'>-					     week_view-&gt;weeks_shown,</div><div class='del'>-					     week_view-&gt;display_start_day,</div><div class='del'>-					     week_view-&gt;compress_weekend,</div><div class='del'>-					     &amp;cell_x, &amp;cell_y, &amp;cell_h);</div><div class='del'>-</div><div class='del'>-	*day_x = week_view-&gt;col_offsets[cell_x];</div><div class='del'>-	*day_y = week_view-&gt;row_offsets[cell_y];</div><div class='del'>-</div><div class='del'>-	*day_w = week_view-&gt;col_widths[cell_x];</div><div class='del'>-	*day_h = week_view-&gt;row_heights[cell_y];</div><div class='del'>-	if (cell_h == 2)</div><div class='del'>-		*day_h += week_view-&gt;row_heights[cell_y + 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the bounding box for a span of an event. Usually this can easily</div><div class='del'>-   be determined by the start &amp; end days and row of the span, which are set in</div><div class='del'>-   e_week_view_layout_event(). Though we need a special case for the weekends</div><div class='del'>-   when they are compressed, since the span may not fit.</div><div class='del'>-   The bounding box includes the entire width of the days in the view (but</div><div class='del'>-   not the vertical line down the right of the last day), though the displayed</div><div class='del'>-   event doesn't normally extend to the edges of the day.</div><div class='del'>-   It returns FALSE if the span isn't visible. */</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_span_position	(EWeekView	*week_view,</div><div class='del'>-				 gint		 event_num,</div><div class='del'>-				 gint		 span_num,</div><div class='del'>-				 gint		*span_x,</div><div class='del'>-				 gint		*span_y,</div><div class='del'>-				 gint		*span_w)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint num_days;</div><div class='del'>-	gint start_x, start_y, start_w, start_h;</div><div class='del'>-	gint end_x, end_y, end_w, end_h;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-	g_return_val_if_fail (event_num &lt; week_view-&gt;events-&gt;len, FALSE);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (span_num &lt; event-&gt;num_spans, FALSE);</div><div class='del'>-</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_layout_get_span_position (event, span,</div><div class='del'>-						   week_view-&gt;rows_per_cell,</div><div class='del'>-						   week_view-&gt;rows_per_compressed_cell,</div><div class='del'>-						   week_view-&gt;display_start_day,</div><div class='del'>-						   week_view-&gt;multi_week_view,</div><div class='del'>-						   week_view-&gt;compress_weekend,</div><div class='del'>-						   &amp;num_days)) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_get_day_position (week_view, span-&gt;start_day,</div><div class='del'>-				      &amp;start_x, &amp;start_y, &amp;start_w, &amp;start_h);</div><div class='del'>-	*span_y = start_y + week_view-&gt;events_y_offset</div><div class='del'>-		+ span-&gt;row * (week_view-&gt;row_height</div><div class='del'>-			       + E_WEEK_VIEW_EVENT_Y_SPACING);</div><div class='del'>-	if (num_days == 1) {</div><div class='del'>-		*span_x = start_x;</div><div class='del'>-		*span_w = start_w - 1;</div><div class='del'>-	} else {</div><div class='del'>-		e_week_view_get_day_position (week_view,</div><div class='del'>-					      span-&gt;start_day + num_days - 1,</div><div class='del'>-					      &amp;end_x, &amp;end_y, &amp;end_w, &amp;end_h);</div><div class='del'>-		*span_x = start_x;</div><div class='del'>-		*span_w = end_x + end_w - start_x - 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_button_press (GtkWidget *widget,</div><div class='del'>-			     GdkEventButton *event,</div><div class='del'>-			     EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint x, y, day;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_on_button_press\n");</div><div class='del'>-	if (event-&gt;type == GDK_2BUTTON_PRESS)</div><div class='del'>-		g_print (" is a double-click\n");</div><div class='del'>-	if (week_view-&gt;pressed_event_num != -1)</div><div class='del'>-		g_print (" item is pressed\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4 || event-&gt;button == 5) {</div><div class='del'>-		GtkAdjustment *adj = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-		gfloat new_value;</div><div class='del'>-</div><div class='del'>-		new_value = adj-&gt;value + ((event-&gt;button == 4) ?</div><div class='del'>-					  -adj-&gt;page_increment:</div><div class='del'>-					  adj-&gt;page_increment);</div><div class='del'>-		new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-		gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the mouse position to a week &amp; day. */</div><div class='del'>-	x = event-&gt;x;</div><div class='del'>-	y = event-&gt;y;</div><div class='del'>-	day = e_week_view_convert_position_to_day (week_view, x, y);</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If an event is pressed just return. */</div><div class='del'>-	if (week_view-&gt;pressed_event_num != -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button == 1 &amp;&amp; event-&gt;type == GDK_2BUTTON_PRESS) {</div><div class='del'>-		time_t dtstart, dtend;</div><div class='del'>-</div><div class='del'>-		dtstart = week_view-&gt;day_starts[day];</div><div class='del'>-		dtend = week_view-&gt;day_starts[day + 1];</div><div class='del'>-		gnome_calendar_new_appointment_for (week_view-&gt;calendar,</div><div class='del'>-						    dtstart, dtend,</div><div class='del'>-						    TRUE, FALSE);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button == 1) {</div><div class='del'>-		/* Start the selection drag. */</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (week_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (week_view));</div><div class='del'>-</div><div class='del'>-		if (gdk_pointer_grab (GTK_LAYOUT (widget)-&gt;bin_window, FALSE,</div><div class='del'>-				      GDK_POINTER_MOTION_MASK</div><div class='del'>-				      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				      FALSE, NULL, event-&gt;time) == 0) {</div><div class='del'>-			week_view-&gt;selection_start_day = day;</div><div class='del'>-			week_view-&gt;selection_end_day = day;</div><div class='del'>-			week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_END;</div><div class='del'>-</div><div class='del'>-			/* FIXME: Optimise? */</div><div class='del'>-			gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-		}</div><div class='del'>-	} else if (event-&gt;button == 3) {</div><div class='del'>-		if (!GTK_WIDGET_HAS_FOCUS (week_view))</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (week_view));</div><div class='del'>-		e_week_view_show_popup_menu (week_view, event, -1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_button_release (GtkWidget *widget,</div><div class='del'>-			       GdkEventButton *event,</div><div class='del'>-			       EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	time_t start, end;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_on_button_release\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {</div><div class='del'>-		week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		start = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		end = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-</div><div class='del'>-		if (week_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_set_selected_time_range (week_view-&gt;calendar, start, end);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_motion (GtkWidget *widget,</div><div class='del'>-		       GdkEventMotion *mevent,</div><div class='del'>-		       EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint x, y, day;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_on_motion\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Convert the mouse position to a week &amp; day. */</div><div class='del'>-	x = mevent-&gt;x;</div><div class='del'>-	y = mevent-&gt;y;</div><div class='del'>-	day = e_week_view_convert_position_to_day (week_view, x, y);</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {</div><div class='del'>-		e_week_view_update_selection (week_view, day);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts a position in the canvas window to a day offset from the first</div><div class='del'>-   day displayed. Returns -1 if the position is outside the grid. */</div><div class='del'>-static gint</div><div class='del'>-e_week_view_convert_position_to_day (EWeekView *week_view,</div><div class='del'>-				     gint x,</div><div class='del'>-				     gint y)</div><div class='del'>-{</div><div class='del'>-	gint col, row, grid_x = -1, grid_y = -1, week, day;</div><div class='del'>-	gint weekend_col, box, weekend_box;</div><div class='del'>-</div><div class='del'>-	/* First we convert it to a grid position. */</div><div class='del'>-	for (col = 0; col &lt;= week_view-&gt;columns; col++) {</div><div class='del'>-		if (x &lt; week_view-&gt;col_offsets[col]) {</div><div class='del'>-			grid_x = col - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (row = 0; row &lt;= week_view-&gt;rows; row++) {</div><div class='del'>-		if (y &lt; week_view-&gt;row_offsets[row]) {</div><div class='del'>-			grid_y = row - 1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the mouse is outside the grid return FALSE. */</div><div class='del'>-	if (grid_x == -1 || grid_y == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Now convert the grid position to a week and day. */</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		week = grid_y / 2;</div><div class='del'>-		day = grid_x;</div><div class='del'>-</div><div class='del'>-		if (week_view-&gt;compress_weekend) {</div><div class='del'>-			weekend_col = (5 + 7 - week_view-&gt;display_start_day) % 7;</div><div class='del'>-			if (grid_x &gt; weekend_col</div><div class='del'>-			    || (grid_x == weekend_col &amp;&amp; grid_y % 2 == 1))</div><div class='del'>-				day++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		week = 0;</div><div class='del'>-</div><div class='del'>-		box = grid_x * 3 + grid_y / 2;</div><div class='del'>-		weekend_box = (5 + 7 - week_view-&gt;display_start_day) % 7;</div><div class='del'>-		day = box;</div><div class='del'>-		if (box &gt; weekend_box</div><div class='del'>-		    ||( box == weekend_box &amp;&amp; grid_y % 2 == 1))</div><div class='del'>-			day++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return week * 7 + day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_update_selection (EWeekView *week_view,</div><div class='del'>-			      gint day)</div><div class='del'>-{</div><div class='del'>-	gint tmp_day;</div><div class='del'>-	gboolean need_redraw = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating selection %i,%i\n", week, day);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_drag_pos == E_WEEK_VIEW_DRAG_START) {</div><div class='del'>-		if (day != week_view-&gt;selection_start_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			week_view-&gt;selection_start_day = day;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (day != week_view-&gt;selection_end_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			week_view-&gt;selection_end_day = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Switch the drag position if necessary. */</div><div class='del'>-	if (week_view-&gt;selection_start_day &gt; week_view-&gt;selection_end_day) {</div><div class='del'>-		tmp_day = week_view-&gt;selection_start_day;</div><div class='del'>-		week_view-&gt;selection_start_day = week_view-&gt;selection_end_day;</div><div class='del'>-		week_view-&gt;selection_end_day = tmp_day;</div><div class='del'>-		if (week_view-&gt;selection_drag_pos == E_WEEK_VIEW_DRAG_START)</div><div class='del'>-			week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_END;</div><div class='del'>-		else</div><div class='del'>-			week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_START;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_redraw) {</div><div class='del'>-		gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_free_events (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint event_num, span_num, num_days, day;</div><div class='del'>-</div><div class='del'>-	/* Reset all our indices. */</div><div class='del'>-	week_view-&gt;pressed_event_num = -1;</div><div class='del'>-	week_view-&gt;pressed_span_num = -1;</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-	week_view-&gt;editing_span_num = -1;</div><div class='del'>-	week_view-&gt;popup_event_num = -1;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; week_view-&gt;events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (week_view-&gt;events, 0);</div><div class='del'>-</div><div class='del'>-	/* Destroy all the old canvas items. */</div><div class='del'>-	if (week_view-&gt;spans) {</div><div class='del'>-		for (span_num = 0; span_num &lt; week_view-&gt;spans-&gt;len;</div><div class='del'>-		     span_num++) {</div><div class='del'>-			span = &amp;g_array_index (week_view-&gt;spans,</div><div class='del'>-					       EWeekViewEventSpan, span_num);</div><div class='del'>-			if (span-&gt;background_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-			if (span-&gt;text_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-		}</div><div class='del'>-		g_array_free (week_view-&gt;spans, TRUE);</div><div class='del'>-		week_view-&gt;spans = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear the number of rows used per day. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt;= num_days; day++) {</div><div class='del'>-		week_view-&gt;rows_per_day[day] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Hide all the jump buttons. */</div><div class='del'>-	for (day = 0; day &lt; E_WEEK_VIEW_MAX_WEEKS * 7; day++) {</div><div class='del'>-		gnome_canvas_item_hide (week_view-&gt;jump_buttons[day]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_add_event (CalComponent *comp,</div><div class='del'>-		       time_t	  start,</div><div class='del'>-		       time_t	  end,</div><div class='del'>-		       gpointer	  data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent event;</div><div class='del'>-	gint num_days;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* Check that the event times are valid. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",</div><div class='del'>-		 week_view-&gt;day_starts[0], week_view-&gt;day_starts[num_days],</div><div class='del'>-		 start, end);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, TRUE);</div><div class='del'>-	g_return_val_if_fail (start &lt; week_view-&gt;day_starts[num_days], TRUE);</div><div class='del'>-	g_return_val_if_fail (end &gt; week_view-&gt;day_starts[0], TRUE);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (start, FALSE,</div><div class='del'>-						  week_view-&gt;zone);</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (end, FALSE,</div><div class='del'>-						week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (event.comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.spans_index = 0;</div><div class='del'>-	event.num_spans = 0;</div><div class='del'>-</div><div class='del'>-	event.start_minute = start_tt.hour * 60 + start_tt.minute;</div><div class='del'>-	event.end_minute = end_tt.hour * 60 + end_tt.minute;</div><div class='del'>-	if (event.end_minute == 0 &amp;&amp; start != end)</div><div class='del'>-		event.end_minute = 24 * 60;</div><div class='del'>-</div><div class='del'>-	event.different_timezone = FALSE;</div><div class='del'>-	if (!cal_comp_util_compare_event_timezones (comp, week_view-&gt;client,</div><div class='del'>-						    week_view-&gt;zone))</div><div class='del'>-		event.different_timezone = TRUE;</div><div class='del'>-</div><div class='del'>-	g_array_append_val (week_view-&gt;events, event);</div><div class='del'>-	week_view-&gt;events_sorted = FALSE;</div><div class='del'>-	week_view-&gt;events_need_layout = TRUE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This lays out the events, or reshapes them, as necessary. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_check_layout (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	/* Don't bother if we aren't visible. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (week_view))</div><div class='del'>-	    return;</div><div class='del'>-</div><div class='del'>-	/* Make sure the events are sorted (by start and size). */</div><div class='del'>-	e_week_view_ensure_events_sorted (week_view);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;events_need_layout)</div><div class='del'>-		week_view-&gt;spans = e_week_view_layout_events</div><div class='del'>-			(week_view-&gt;events, week_view-&gt;spans,</div><div class='del'>-			 week_view-&gt;multi_week_view,</div><div class='del'>-			 week_view-&gt;weeks_shown,</div><div class='del'>-			 week_view-&gt;compress_weekend,</div><div class='del'>-			 week_view-&gt;display_start_day,</div><div class='del'>-			 week_view-&gt;day_starts,</div><div class='del'>-			 week_view-&gt;rows_per_day);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;events_need_layout || week_view-&gt;events_need_reshape)</div><div class='del'>-		e_week_view_reshape_events (week_view);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;events_need_layout = FALSE;</div><div class='del'>-	week_view-&gt;events_need_reshape = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_ensure_events_sorted (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	if (!week_view-&gt;events_sorted) {</div><div class='del'>-		qsort (week_view-&gt;events-&gt;data,</div><div class='del'>-		       week_view-&gt;events-&gt;len,</div><div class='del'>-		       sizeof (EWeekViewEvent),</div><div class='del'>-		       e_week_view_event_sort_func);</div><div class='del'>-		week_view-&gt;events_sorted = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_week_view_event_sort_func (const void *arg1,</div><div class='del'>-			     const void *arg2)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event1, *event2;</div><div class='del'>-</div><div class='del'>-	event1 = (EWeekViewEvent*) arg1;</div><div class='del'>-	event2 = (EWeekViewEvent*) arg2;</div><div class='del'>-</div><div class='del'>-	if (event1-&gt;start &lt; event2-&gt;start)</div><div class='del'>-		return -1;</div><div class='del'>-	if (event1-&gt;start &gt; event2-&gt;start)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (event1-&gt;end &gt; event2-&gt;end)</div><div class='del'>-		return -1;</div><div class='del'>-	if (event1-&gt;end &lt; event2-&gt;end)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_reshape_events (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, span_num;</div><div class='del'>-	gint num_days, day, day_x, day_y, day_w, day_h, max_rows;</div><div class='del'>-	gboolean is_weekend;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; week_view-&gt;events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-			e_week_view_reshape_event_span (week_view, event_num,</div><div class='del'>-							span_num);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reshape the jump buttons and show/hide them as appropriate. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-</div><div class='del'>-		is_weekend = ((week_view-&gt;display_start_day + day) % 7 &gt;= 5) ? TRUE : FALSE;</div><div class='del'>-		if (!is_weekend || (week_view-&gt;multi_week_view</div><div class='del'>-				    &amp;&amp; !week_view-&gt;compress_weekend))</div><div class='del'>-			max_rows = week_view-&gt;rows_per_cell;</div><div class='del'>-		else</div><div class='del'>-			max_rows = week_view-&gt;rows_per_compressed_cell;</div><div class='del'>-</div><div class='del'>-		/* Determine whether the jump button should be shown. */</div><div class='del'>-		if (week_view-&gt;rows_per_day[day] &lt;= max_rows) {</div><div class='del'>-			gnome_canvas_item_hide (week_view-&gt;jump_buttons[day]);</div><div class='del'>-		} else {</div><div class='del'>-			e_week_view_get_day_position (week_view, day,</div><div class='del'>-						      &amp;day_x, &amp;day_y,</div><div class='del'>-						      &amp;day_w, &amp;day_h);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (week_view-&gt;jump_buttons[day],</div><div class='del'>-					       "GnomeCanvasPixbuf::x", (gdouble) (day_x + day_w - E_WEEK_VIEW_JUMP_BUTTON_X_PAD - E_WEEK_VIEW_JUMP_BUTTON_WIDTH),</div><div class='del'>-					       "GnomeCanvasPixbuf::y", (gdouble) (day_y + day_h - E_WEEK_VIEW_JUMP_BUTTON_Y_PAD - E_WEEK_VIEW_JUMP_BUTTON_HEIGHT),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_show (week_view-&gt;jump_buttons[day]);</div><div class='del'>-			gnome_canvas_item_raise_to_top (week_view-&gt;jump_buttons[day]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (day = num_days; day &lt; E_WEEK_VIEW_MAX_WEEKS * 7; day++) {</div><div class='del'>-		gnome_canvas_item_hide (week_view-&gt;jump_buttons[day]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_reshape_event_span (EWeekView *week_view,</div><div class='del'>-				gint event_num,</div><div class='del'>-				gint span_num)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint span_x, span_y, span_w, num_icons, icons_width, time_width;</div><div class='del'>-	gint min_text_x, max_text_w, width;</div><div class='del'>-	gboolean show_icons = TRUE, use_max_width = FALSE;</div><div class='del'>-	gboolean one_day_event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gdouble text_x, text_y, text_w, text_h;</div><div class='del'>-	gchar *text, *end_of_line;</div><div class='del'>-	gint line_len, text_width;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-	font = GTK_WIDGET (week_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	one_day_event = e_week_view_is_one_day_event (week_view, event_num);</div><div class='del'>-</div><div class='del'>-	/* If the span will not be visible destroy the canvas items and</div><div class='del'>-	   return. */</div><div class='del'>-	if (!e_week_view_get_span_position (week_view, event_num, span_num,</div><div class='del'>-					    &amp;span_x, &amp;span_y, &amp;span_w)) {</div><div class='del'>-		if (span-&gt;background_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-		if (span-&gt;text_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-		span-&gt;background_item = NULL;</div><div class='del'>-		span-&gt;text_item = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we are editing a long event we don't show the icons and the EText</div><div class='del'>-	   item uses the maximum width available. */</div><div class='del'>-	if (!one_day_event &amp;&amp; week_view-&gt;editing_event_num == event_num</div><div class='del'>-	    &amp;&amp; week_view-&gt;editing_span_num == span_num) {</div><div class='del'>-		show_icons = FALSE;</div><div class='del'>-		use_max_width = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate how many icons we need to show. */</div><div class='del'>-	num_icons = 0;</div><div class='del'>-	if (show_icons) {</div><div class='del'>-		GSList *categories_list;</div><div class='del'>-</div><div class='del'>-		if (cal_component_has_alarms (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (event-&gt;different_timezone)</div><div class='del'>-			num_icons++;</div><div class='del'>-</div><div class='del'>-		cal_component_get_categories_list (comp, &amp;categories_list);</div><div class='del'>-		num_icons += g_slist_length (categories_list);</div><div class='del'>-</div><div class='del'>-		cal_component_free_categories_list (categories_list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create the background canvas item if necessary. */</div><div class='del'>-	if (!span-&gt;background_item) {</div><div class='del'>-		span-&gt;background_item =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;main_canvas)-&gt;root),</div><div class='del'>-					       e_week_view_event_item_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (span-&gt;background_item,</div><div class='del'>-			       "event_num", event_num,</div><div class='del'>-			       "span_num", span_num,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the text item if necessary. */</div><div class='del'>-	if (!span-&gt;text_item) {</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		cal_component_get_summary (comp, &amp;text);</div><div class='del'>-		span-&gt;text_item =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;main_canvas)-&gt;root),</div><div class='del'>-					       e_text_get_type (),</div><div class='del'>-					       "font_gdk", GTK_WIDGET (week_view)-&gt;style-&gt;font,</div><div class='del'>-					       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-					       "clip", TRUE,</div><div class='del'>-#if 0</div><div class='del'>-					       "max_lines", 1,</div><div class='del'>-#endif</div><div class='del'>-					       "editable", TRUE,</div><div class='del'>-					       "text", text.value ? text.value : "",</div><div class='del'>-					       "use_ellipsis", TRUE,</div><div class='del'>-					       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),</div><div class='del'>-					       NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (span-&gt;text_item), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (e_week_view_on_text_item_event),</div><div class='del'>-				    week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the position of the text item.</div><div class='del'>-	   For events &lt; 1 day it starts after the times &amp; icons and ends at the</div><div class='del'>-	   right edge of the span.</div><div class='del'>-	   For events &gt;= 1 day we need to determine whether times are shown at</div><div class='del'>-	   the start and end of the span, then try to center the text item with</div><div class='del'>-	   the icons in the middle, but making sure we don't go over the times.</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Calculate the space necessary to display a time, e.g. "13:00". */</div><div class='del'>-	time_width = e_week_view_get_time_string_width (week_view);</div><div class='del'>-</div><div class='del'>-	/* Calculate the space needed for the icons. */</div><div class='del'>-	icons_width = (E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD)</div><div class='del'>-		* num_icons - E_WEEK_VIEW_ICON_X_PAD + E_WEEK_VIEW_ICON_R_PAD;</div><div class='del'>-</div><div class='del'>-	/* The y position and height are the same for both event types. */</div><div class='del'>-	text_y = span_y + E_WEEK_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;</div><div class='del'>-	text_h = font-&gt;ascent + font-&gt;descent;</div><div class='del'>-</div><div class='del'>-	if (one_day_event) {</div><div class='del'>-		/* Note that 1-day events don't have a border. Although we</div><div class='del'>-		   still use the border height to position the events</div><div class='del'>-		   vertically so they still line up neatly (see above),</div><div class='del'>-		   we don't use the border width or edge padding at all. */</div><div class='del'>-		text_x = span_x	+ E_WEEK_VIEW_EVENT_L_PAD;</div><div class='del'>-</div><div class='del'>-		switch (week_view-&gt;time_format) {</div><div class='del'>-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:</div><div class='del'>-		case E_WEEK_VIEW_TIME_BOTH:</div><div class='del'>-			/* These have 2 time strings with a small space between</div><div class='del'>-			   them and some space before the EText item. */</div><div class='del'>-			text_x += time_width * 2</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TIME_SPACING</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:</div><div class='del'>-		case E_WEEK_VIEW_TIME_START:</div><div class='del'>-			/* These have just 1 time string with some space</div><div class='del'>-			   before the EText item. */</div><div class='del'>-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-			break;</div><div class='del'>-		case E_WEEK_VIEW_TIME_NONE:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The icons_width includes space on the right of the icons. */</div><div class='del'>-		text_x += icons_width;</div><div class='del'>-</div><div class='del'>-		/* The width of the EText item extends right to the edge of the</div><div class='del'>-		   event, just inside the border. */</div><div class='del'>-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD - text_x;</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-		if (use_max_width) {</div><div class='del'>-			/* When we are editing the event we use all the</div><div class='del'>-			   available width. */</div><div class='del'>-			text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;</div><div class='del'>-			text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD - text_x;</div><div class='del'>-		} else {</div><div class='del'>-			/* Get the width of the text of the event. This is a</div><div class='del'>-			   bit of a hack. It would be better if EText could</div><div class='del'>-			   tell us this. */</div><div class='del'>-			gtk_object_get (GTK_OBJECT (span-&gt;text_item),</div><div class='del'>-					"text", &amp;text,</div><div class='del'>-					NULL);</div><div class='del'>-			text_width = 0;</div><div class='del'>-			if (text) {</div><div class='del'>-				/* It should only have one line of text in it.</div><div class='del'>-				   I'm not sure we need this any more. */</div><div class='del'>-				end_of_line = strchr (text, '\n');</div><div class='del'>-				if (end_of_line)</div><div class='del'>-					line_len = end_of_line - text;</div><div class='del'>-				else</div><div class='del'>-					line_len = strlen (text);</div><div class='del'>-				text_width = gdk_text_width (font, text,</div><div class='del'>-							     line_len);</div><div class='del'>-				g_free (text);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Add on the width of the icons and find the default</div><div class='del'>-			   position, which centers the icons + text. */</div><div class='del'>-			width = text_width + icons_width;</div><div class='del'>-			text_x = span_x + (span_w - width) / 2;</div><div class='del'>-</div><div class='del'>-			/* Now calculate the left-most valid position, and make</div><div class='del'>-			   sure we don't go to the left of that. */</div><div class='del'>-			min_text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				+ E_WEEK_VIEW_EVENT_EDGE_X_PAD;</div><div class='del'>-			/* See if we will want to display the start time, and</div><div class='del'>-			   if so take that into account. */</div><div class='del'>-			if (event-&gt;start &gt; week_view-&gt;day_starts[span-&gt;start_day])</div><div class='del'>-				min_text_x += time_width</div><div class='del'>-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-</div><div class='del'>-			/* Now make sure we don't go to the left of the minimum</div><div class='del'>-			   position. */</div><div class='del'>-			text_x = MAX (text_x, min_text_x);</div><div class='del'>-</div><div class='del'>-			/* Now calculate the largest valid width, using the</div><div class='del'>-			   calculated x position, and make sure we don't</div><div class='del'>-			   exceed that. */</div><div class='del'>-			max_text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD</div><div class='del'>-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH</div><div class='del'>-				- E_WEEK_VIEW_EVENT_EDGE_X_PAD - text_x;</div><div class='del'>-			if (event-&gt;end &lt; week_view-&gt;day_starts[span-&gt;start_day</div><div class='del'>-							      + span-&gt;num_days])</div><div class='del'>-				max_text_w -= time_width</div><div class='del'>-					+ E_WEEK_VIEW_EVENT_TIME_X_PAD;</div><div class='del'>-</div><div class='del'>-			text_w = MIN (width, max_text_w);</div><div class='del'>-</div><div class='del'>-			/* Now take out the space for the icons. */</div><div class='del'>-			text_x += icons_width;</div><div class='del'>-			text_w -= icons_width;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure we don't try to use a negative width. */</div><div class='del'>-	text_w = MAX (text_w, 0);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (span-&gt;text_item,</div><div class='del'>-			       "clip_width", (gdouble) text_w,</div><div class='del'>-			       "clip_height", (gdouble) text_h,</div><div class='del'>-			       NULL);</div><div class='del'>-	e_canvas_item_move_absolute (span-&gt;text_item, text_x, text_y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,</div><div class='del'>-				   EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	GDate date;</div><div class='del'>-	gint week_offset;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time ();</div><div class='del'>-	time_t lower, start, end;</div><div class='del'>-	guint32 old_first_day_julian, new_first_day_julian;</div><div class='del'>-</div><div class='del'>-	/* If we don't have a valid date set yet, just return. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Determine the first date shown. */</div><div class='del'>-	date = week_view-&gt;base_date;</div><div class='del'>-	week_offset = floor (adjustment-&gt;value + 0.5);</div><div class='del'>-	g_date_add_days (&amp;date, week_offset * 7);</div><div class='del'>-</div><div class='del'>-	/* Convert the old &amp; new first days shown to julian values. */</div><div class='del'>-	old_first_day_julian = g_date_julian (&amp;week_view-&gt;first_day_shown);</div><div class='del'>-	new_first_day_julian = g_date_julian (&amp;date);</div><div class='del'>-</div><div class='del'>-	/* If we are already showing the date, just return. */</div><div class='del'>-	if (old_first_day_julian == new_first_day_julian)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set the new first day shown. */</div><div class='del'>-	week_view-&gt;first_day_shown = date;</div><div class='del'>-</div><div class='del'>-	/* Convert it to a time_t. */</div><div class='del'>-	start_tt.year = g_date_year (&amp;date);</div><div class='del'>-	start_tt.month = g_date_month (&amp;date);</div><div class='del'>-	start_tt.day = g_date_day (&amp;date);</div><div class='del'>-</div><div class='del'>-	lower = icaltime_as_timet_with_zone (start_tt, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_day_starts (week_view, lower);</div><div class='del'>-	update_query (week_view);</div><div class='del'>-</div><div class='del'>-	/* Update the selection, if needed. */</div><div class='del'>-	if (week_view-&gt;selection_start_day != -1) {</div><div class='del'>-		start = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		end = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-		if (week_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_set_selected_time_range (week_view-&gt;calendar, start, end);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_start_editing_event (EWeekView *week_view,</div><div class='del'>-				 gint	    event_num,</div><div class='del'>-				 gint	    span_num,</div><div class='del'>-				 gchar     *initial_text)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	ETextEventProcessor *event_processor = NULL;</div><div class='del'>-	ETextEventProcessorCommand command;</div><div class='del'>-</div><div class='del'>-	/* If we are already editing the event, just return. */</div><div class='del'>-	if (event_num == week_view-&gt;editing_event_num</div><div class='del'>-	    &amp;&amp; span_num == week_view-&gt;editing_span_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-	/* If the event is not shown, don't try to edit it. */</div><div class='del'>-	if (!span-&gt;text_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (initial_text) {</div><div class='del'>-		gnome_canvas_item_set (span-&gt;text_item,</div><div class='del'>-				       "text", initial_text,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: This implicitly stops any edit of another item, causing it</div><div class='del'>-	   to be sent to the server and resulting in a call to obj_updated_cb()</div><div class='del'>-	   which may reload all the events and so our span and text item may</div><div class='del'>-	   actually be destroyed. So we often get a SEGV. */</div><div class='del'>-	e_canvas_item_grab_focus (span-&gt;text_item, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Try to move the cursor to the end of the text. */</div><div class='del'>-	gtk_object_get (GTK_OBJECT (span-&gt;text_item),</div><div class='del'>-			"event_processor", &amp;event_processor,</div><div class='del'>-			NULL);</div><div class='del'>-	if (event_processor) {</div><div class='del'>-		command.action = E_TEP_MOVE;</div><div class='del'>-		command.position = E_TEP_END_OF_BUFFER;</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),</div><div class='del'>-					 "command", &amp;command);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This stops any current edit. */</div><div class='del'>-void</div><div class='del'>-e_week_view_stop_editing_event (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	/* Check we are editing an event. */</div><div class='del'>-	if (week_view-&gt;editing_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set focus to the toplevel so the item loses focus. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));</div><div class='del'>-	if (toplevel &amp;&amp; GTK_IS_WINDOW (toplevel))</div><div class='del'>-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Cancels the current edition by resetting the appointment's text to its original value */</div><div class='del'>-static void</div><div class='del'>-cancel_editing (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	int event_num, span_num;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	event_num = week_view-&gt;editing_event_num;</div><div class='del'>-	span_num = week_view-&gt;editing_span_num;</div><div class='del'>-</div><div class='del'>-	g_assert (event_num != -1);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan, event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-	/* Reset the text to what was in the component */</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (span-&gt;text_item),</div><div class='del'>-			"text", summary.value ? summary.value : "",</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* Stop editing */</div><div class='del'>-	e_week_view_stop_editing_event (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is destroyed.  Expects the closure data to be</div><div class='del'>- * a pointer to a boolean; will set it to TRUE.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-comp_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *destroyed;</div><div class='del'>-</div><div class='del'>-	destroyed = data;</div><div class='del'>-	*destroyed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_text_item_event (GnomeCanvasItem *item,</div><div class='del'>-				GdkEvent *gdkevent,</div><div class='del'>-				EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, span_num;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_on_text_item_event\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	switch (gdkevent-&gt;type) {</div><div class='del'>-	case GDK_KEY_PRESS:</div><div class='del'>-		if (gdkevent &amp;&amp; gdkevent-&gt;key.keyval == GDK_Return) {</div><div class='del'>-			/* We set the keyboard focus to the EDayView, so the</div><div class='del'>-			   EText item loses it and stops the edit. */</div><div class='del'>-			gtk_widget_grab_focus (GTK_WIDGET (week_view));</div><div class='del'>-</div><div class='del'>-			/* Stop the signal last or we will also stop any</div><div class='del'>-			   other events getting to the EText item. */</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),</div><div class='del'>-						      "event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		} else if (gdkevent-&gt;key.keyval == GDK_Escape) {</div><div class='del'>-			cancel_editing (week_view);</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		if (!e_week_view_find_event_from_item (week_view, item,</div><div class='del'>-						       &amp;event_num, &amp;span_num))</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		if (week_view-&gt;calendar)</div><div class='del'>-			gnome_calendar_edit_object (week_view-&gt;calendar,</div><div class='del'>-						    event-&gt;comp, FALSE);</div><div class='del'>-		else</div><div class='del'>-			g_warning ("Calendar not set");</div><div class='del'>-</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");</div><div class='del'>-		return TRUE;</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (!e_week_view_find_event_from_item (week_view, item,</div><div class='del'>-						       &amp;event_num, &amp;span_num))</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		if (gdkevent-&gt;button.button == 3) {</div><div class='del'>-			EWeekViewEvent *e;</div><div class='del'>-			gboolean destroyed;</div><div class='del'>-			int id;</div><div class='del'>-</div><div class='del'>-			e = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			destroyed = FALSE;</div><div class='del'>-			id = gtk_signal_connect (GTK_OBJECT (e-&gt;comp), "destroy",</div><div class='del'>-						 GTK_SIGNAL_FUNC (comp_destroy_cb), &amp;destroyed);</div><div class='del'>-</div><div class='del'>-			if (!GTK_WIDGET_HAS_FOCUS (week_view))</div><div class='del'>-				gtk_widget_grab_focus (GTK_WIDGET (week_view));</div><div class='del'>-</div><div class='del'>-			if (!destroyed) {</div><div class='del'>-				gtk_signal_disconnect (GTK_OBJECT (e-&gt;comp), id);</div><div class='del'>-</div><div class='del'>-				e_week_view_show_popup_menu (week_view,</div><div class='del'>-							     (GdkEventButton*) gdkevent,</div><div class='del'>-							     event_num);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item-&gt;canvas),</div><div class='del'>-						      "button_press_event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		week_view-&gt;pressed_event_num = event_num;</div><div class='del'>-		week_view-&gt;pressed_span_num = span_num;</div><div class='del'>-</div><div class='del'>-		/* Only let the EText handle the event while editing. */</div><div class='del'>-		if (!E_TEXT (item)-&gt;editing) {</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),</div><div class='del'>-						      "event");</div><div class='del'>-</div><div class='del'>-			if (gdkevent) {</div><div class='del'>-				week_view-&gt;drag_event_x = gdkevent-&gt;button.x;</div><div class='del'>-				week_view-&gt;drag_event_y = gdkevent-&gt;button.y;</div><div class='del'>-			} else</div><div class='del'>-				g_warning ("No GdkEvent");</div><div class='del'>-</div><div class='del'>-			/* FIXME: Remember the day offset from the start of</div><div class='del'>-			   the event, for DnD. */</div><div class='del'>-</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (!E_TEXT (item)-&gt;editing) {</div><div class='del'>-			/* This shouldn't ever happen. */</div><div class='del'>-			if (!e_week_view_find_event_from_item (week_view,</div><div class='del'>-							       item,</div><div class='del'>-							       &amp;event_num,</div><div class='del'>-							       &amp;span_num))</div><div class='del'>-				return FALSE;</div><div class='del'>-</div><div class='del'>-			if (week_view-&gt;pressed_event_num != -1</div><div class='del'>-			    &amp;&amp; week_view-&gt;pressed_event_num == event_num</div><div class='del'>-			    &amp;&amp; week_view-&gt;pressed_span_num == span_num) {</div><div class='del'>-				e_week_view_start_editing_event (week_view,</div><div class='del'>-								 event_num,</div><div class='del'>-								 span_num,</div><div class='del'>-								 NULL);</div><div class='del'>-				week_view-&gt;pressed_event_num = -1;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Stop the signal last or we will also stop any</div><div class='del'>-			   other events getting to the EText item. */</div><div class='del'>-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),</div><div class='del'>-						      "event");</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		week_view-&gt;pressed_event_num = -1;</div><div class='del'>-		break;</div><div class='del'>-	case GDK_FOCUS_CHANGE:</div><div class='del'>-		if (gdkevent-&gt;focus_change.in) {</div><div class='del'>-			e_week_view_on_editing_started (week_view, item);</div><div class='del'>-		} else {</div><div class='del'>-			e_week_view_on_editing_stopped (week_view, item);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_editing_started (EWeekView *week_view,</div><div class='del'>-				GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	gint event_num, span_num;</div><div class='del'>-</div><div class='del'>-	if (!e_week_view_find_event_from_item (week_view, item,</div><div class='del'>-					       &amp;event_num, &amp;span_num))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_week_view_on_editing_started event_num:%i span_num:%i\n", event_num, span_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	week_view-&gt;editing_event_num = event_num;</div><div class='del'>-	week_view-&gt;editing_span_num = span_num;</div><div class='del'>-</div><div class='del'>-	/* We need to reshape long events so the whole width is used while</div><div class='del'>-	   editing. */</div><div class='del'>-	if (!e_week_view_is_one_day_event (week_view, event_num)) {</div><div class='del'>-		e_week_view_reshape_event_span (week_view, event_num,</div><div class='del'>-						span_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (week_view),</div><div class='del'>-			 e_week_view_signals[SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_editing_stopped (EWeekView *week_view,</div><div class='del'>-				GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	gint event_num, span_num;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gchar *text = NULL;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	/* Note: the item we are passed here isn't reliable, so we just stop</div><div class='del'>-	   the edit of whatever item was being edited. We also receive this</div><div class='del'>-	   event twice for some reason. */</div><div class='del'>-	event_num = week_view-&gt;editing_event_num;</div><div class='del'>-	span_num = week_view-&gt;editing_span_num;</div><div class='del'>-</div><div class='del'>-	/* If no item is being edited, just return. */</div><div class='del'>-	if (event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-	/* Reset the edit fields. */</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	/* Check that the event is still valid. */</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-	if (!uid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (span-&gt;text_item),</div><div class='del'>-			"text", &amp;text,</div><div class='del'>-			NULL);</div><div class='del'>-	g_assert (text != NULL);</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (text)) {</div><div class='del'>-		ConfirmDeleteEmptyCompResult result;</div><div class='del'>-</div><div class='del'>-		result = cal_comp_confirm_delete_empty_comp (event-&gt;comp, week_view-&gt;client,</div><div class='del'>-							     GTK_WIDGET (week_view));</div><div class='del'>-</div><div class='del'>-		switch (result) {</div><div class='del'>-		case EMPTY_COMP_REMOVE_LOCALLY: {</div><div class='del'>-			const char *uid;</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-			e_week_view_foreach_event_with_uid (week_view, uid,</div><div class='del'>-							    e_week_view_remove_event_cb, NULL);</div><div class='del'>-			gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-			e_week_view_check_layout (week_view);</div><div class='del'>-			goto out; }</div><div class='del'>-</div><div class='del'>-		case EMPTY_COMP_REMOVED_FROM_SERVER:</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		case EMPTY_COMP_DO_NOT_REMOVE:</div><div class='del'>-			/* But we cannot keep an empty summary, so make the</div><div class='del'>-			 * canvas item refresh itself from the text that the</div><div class='del'>-			 * component already had.</div><div class='del'>-			 */</div><div class='del'>-</div><div class='del'>-			gtk_object_ref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-			e_week_view_update_event_cb (week_view, event_num, event-&gt;comp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-			goto out;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	if (summary.value &amp;&amp; !strcmp (text, summary.value)) {</div><div class='del'>-		if (!e_week_view_is_one_day_event (week_view, event_num))</div><div class='del'>-			e_week_view_reshape_event_span (week_view, event_num,</div><div class='del'>-							span_num);</div><div class='del'>-	} else {</div><div class='del'>-		summary.value = text;</div><div class='del'>-		summary.altrep = NULL;</div><div class='del'>-		cal_component_set_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-		if (cal_client_update_object (week_view-&gt;client, event-&gt;comp)) {</div><div class='del'>-			if (cal_component_has_attendees (event-&gt;comp) &amp;&amp; send_component_dialog (event-&gt;comp, FALSE))</div><div class='del'>-				itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event-&gt;comp,</div><div class='del'>-						week_view-&gt;client, NULL);</div><div class='del'>-		} else {</div><div class='del'>-			g_message ("e_week_view_on_editing_stopped(): Could not update the object!");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	g_free (text);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (week_view),</div><div class='del'>-			 e_week_view_signals[SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_find_event_from_item (EWeekView	  *week_view,</div><div class='del'>-				  GnomeCanvasItem *item,</div><div class='del'>-				  gint		  *event_num_return,</div><div class='del'>-				  gint		  *span_num_return)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint event_num, span_num, num_events;</div><div class='del'>-</div><div class='del'>-	num_events = week_view-&gt;events-&gt;len;</div><div class='del'>-	for (event_num = 0; event_num &lt; num_events; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-			span = &amp;g_array_index (week_view-&gt;spans,</div><div class='del'>-					       EWeekViewEventSpan,</div><div class='del'>-					       event-&gt;spans_index + span_num);</div><div class='del'>-			if (span-&gt;text_item == item) {</div><div class='del'>-				*event_num_return = event_num;</div><div class='del'>-				*span_num_return = span_num;</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the index of the event with the given uid.</div><div class='del'>-   Returns TRUE if an event with the uid was found.</div><div class='del'>-   Note that for recurring events there may be several EWeekViewEvents, one</div><div class='del'>-   for each instance, all with the same iCalObject and uid. So only use this</div><div class='del'>-   function if you know the event doesn't recur or you are just checking to</div><div class='del'>-   see if any events with the uid exist. */</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_find_event_from_uid (EWeekView	  *week_view,</div><div class='del'>-				 const gchar	  *uid,</div><div class='del'>-				 gint		  *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, num_events;</div><div class='del'>-</div><div class='del'>-	num_events = week_view-&gt;events-&gt;len;</div><div class='del'>-	for (event_num = 0; event_num &lt; num_events; event_num++) {</div><div class='del'>-		const char *u;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_is_one_day_event	(EWeekView	*week_view,</div><div class='del'>-				 gint		 event_num)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	if (event-&gt;num_spans != 1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;start == week_view-&gt;day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end == week_view-&gt;day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (span-&gt;num_days == 1</div><div class='del'>-	    &amp;&amp; event-&gt;start &gt;= week_view-&gt;day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end &lt;= week_view-&gt;day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint event_num;</div><div class='del'>-	gchar *initial_text;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	/* The Escape key aborts a resize operation. */</div><div class='del'>-#if 0</div><div class='del'>-	if (week_view-&gt;resize_drag_pos != E_WEEK_VIEW_POS_NONE) {</div><div class='del'>-		if (event-&gt;keyval == GDK_Escape) {</div><div class='del'>-			e_week_view_abort_resize (week_view, event-&gt;time);</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_start_day == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* We only want to start an edit with a return key or a simple</div><div class='del'>-	   character. */</div><div class='del'>-	if (event-&gt;keyval == GDK_Return) {</div><div class='del'>-		initial_text = NULL;</div><div class='del'>-	} else if (((event-&gt;keyval &gt;= 0x20) &amp;&amp; (event-&gt;keyval &lt;= 0xFF)</div><div class='del'>-		    &amp;&amp; (event-&gt;state &amp; (GDK_CONTROL_MASK | GDK_MOD1_MASK)))</div><div class='del'>-		   || (event-&gt;length == 0)</div><div class='del'>-		   || (event-&gt;keyval == GDK_Tab)) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else</div><div class='del'>-		initial_text = e_utf8_from_gtk_event_key (widget, event-&gt;keyval, event-&gt;string);</div><div class='del'>-</div><div class='del'>-	/* Add a new event covering the selected range. */</div><div class='del'>-	comp = cal_comp_event_new_with_defaults ();</div><div class='del'>-</div><div class='del'>-	dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* We use DATE values now, so we don't need the timezone. */</div><div class='del'>-	/*date.tzid = icaltimezone_get_tzid (week_view-&gt;zone);*/</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (dtstart, TRUE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (dtend, TRUE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories (comp, week_view-&gt;default_category);</div><div class='del'>-</div><div class='del'>-	/* We add the event locally and start editing it. We don't send it</div><div class='del'>-	   to the server until the user finishes editing it. */</div><div class='del'>-	e_week_view_add_event (comp, dtstart, dtend, week_view);</div><div class='del'>-	e_week_view_check_layout (week_view);</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	if (e_week_view_find_event_from_uid (week_view, uid, &amp;event_num)) {</div><div class='del'>-		e_week_view_start_editing_event (week_view, event_num, 0,</div><div class='del'>-						 initial_text);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Couldn't find event to start editing.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (initial_text)</div><div class='del'>-		g_free (initial_text);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	/*</div><div class='del'>-	 * This is used to "flag" events that can not be editted</div><div class='del'>-	 */</div><div class='del'>-	MASK_EDITABLE = 1,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To disable recurring actions to be displayed</div><div class='del'>-	 */</div><div class='del'>-	MASK_RECURRING = 2,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * To disable actions for non-recurring items to be displayed</div><div class='del'>-	 */</div><div class='del'>-	MASK_SINGLE   = 4,</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This is used to when an event is currently being edited</div><div class='del'>-	 * in another window and we want to disable the event</div><div class='del'>-	 * from being edited twice</div><div class='del'>-	 */</div><div class='del'>-	MASK_EDITING  = 8</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPopupMenu main_items [] = {</div><div class='del'>-	E_POPUP_ITEM (N_("New _Appointment..."), e_week_view_on_new_appointment, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New All Day _Event"), e_week_view_on_new_event, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New Meeting"), e_week_view_on_new_meeting, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("New Task"), e_week_view_on_new_task, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_SUBMENU (N_("Current View"), NULL, 0),</div><div class='del'>-	</div><div class='del'>-	E_POPUP_ITEM (N_("Go to _Today"), e_week_view_on_goto_today, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Go to Date..."), e_week_view_on_goto_date, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Publish Free/Busy Information"), e_week_view_on_publish, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Configure..."), e_week_view_on_settings, 0),</div><div class='del'>-	E_POPUP_ITEM (N_("_Configure Pilot..."), e_week_view_on_pilot_settings, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPopupMenu child_items [] = {</div><div class='del'>-	E_POPUP_ITEM (N_("_Open"), e_week_view_on_edit_appointment, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Save As..."), e_week_view_on_save_as, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Print..."), e_week_view_on_print_event, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-</div><div class='del'>-	/* Only show this separator if one of the above is shown. */</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("C_ut"), e_week_view_on_cut, MASK_EDITING | MASK_EDITABLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Copy"), e_week_view_on_copy, MASK_EDITING | MASK_EDITABLE),</div><div class='del'>-	E_POPUP_ITEM (N_("_Paste"), e_week_view_on_paste, 0),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Schedule Meeting..."), e_week_view_on_meeting, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("_Forward as iCalendar..."), e_week_view_on_forward, MASK_EDITABLE | MASK_EDITING),</div><div class='del'>-</div><div class='del'>-	E_POPUP_SEPARATOR,</div><div class='del'>-</div><div class='del'>-	E_POPUP_ITEM (N_("_Delete this Appointment"), e_week_view_on_delete_appointment, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Make this Occurrence _Movable"), e_week_view_on_unrecur_appointment, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Delete this _Occurrence"), e_week_view_on_delete_occurrence, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-	E_POPUP_ITEM (N_("Delete _All Occurrences"), e_week_view_on_delete_appointment, MASK_RECURRING | MASK_EDITING),</div><div class='del'>-</div><div class='del'>-	E_POPUP_TERMINATOR</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_view_popup (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;view_menu == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	gnome_calendar_discard_view_popup (week_view-&gt;calendar, week_view-&gt;view_menu);</div><div class='del'>-	week_view-&gt;view_menu = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_show_popup_menu (EWeekView	     *week_view,</div><div class='del'>-			     GdkEventButton  *bevent,</div><div class='del'>-			     gint	      event_num)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	int have_selection;</div><div class='del'>-	gboolean being_edited;</div><div class='del'>-	guint32 disable_mask = 0, hide_mask = 0;</div><div class='del'>-	EPopupMenu *context_menu;</div><div class='del'>-	GtkMenu *popup;</div><div class='del'>-	</div><div class='del'>-	have_selection = GTK_WIDGET_HAS_FOCUS (week_view)</div><div class='del'>-		&amp;&amp; week_view-&gt;selection_start_day != -1;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * This used to be set only if the event wasn't being edited</div><div class='del'>-	 * in the event editor, but we can't check that at present.</div><div class='del'>-	 * We could possibly set up another method of checking it.</div><div class='del'>-	 */</div><div class='del'>-	being_edited = FALSE;</div><div class='del'>-</div><div class='del'>-	if (event_num == -1) {</div><div class='del'>-		week_view-&gt;view_menu = gnome_calendar_setup_view_popup (week_view-&gt;calendar);</div><div class='del'>-		main_items[9].submenu = week_view-&gt;view_menu;</div><div class='del'>-		context_menu = main_items;</div><div class='del'>-	} else {</div><div class='del'>-		context_menu = child_items;</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events,</div><div class='del'>-					EWeekViewEvent, event_num);</div><div class='del'>-		if (cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-			hide_mask |= MASK_SINGLE;</div><div class='del'>-		else</div><div class='del'>-			hide_mask |= MASK_RECURRING;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (being_edited)</div><div class='del'>-		disable_mask |= MASK_EDITING;</div><div class='del'>-	week_view-&gt;popup_event_num = event_num;</div><div class='del'>-</div><div class='del'>-	popup = e_popup_menu_create (context_menu, disable_mask, hide_mask, week_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (popup), "selection-done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (free_view_popup), week_view);</div><div class='del'>-	e_popup_menu (popup, (GdkEvent *) bevent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	/* Edit a new event. If only one day is selected we set the time to</div><div class='del'>-	   the first 1/2-hour of the working day. */</div><div class='del'>-	if (week_view-&gt;selection_start_day == week_view-&gt;selection_end_day) {</div><div class='del'>-		dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-		itt.hour = calendar_config_get_day_start_hour ();</div><div class='del'>-		itt.minute = calendar_config_get_day_start_minute ();</div><div class='del'>-		dtstart = icaltime_as_timet_with_zone (itt, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		icaltime_adjust (&amp;itt, 0, 0, 30, 0);</div><div class='del'>-		dtend = icaltime_as_timet_with_zone (itt, week_view-&gt;zone);</div><div class='del'>-	} else {</div><div class='del'>-		dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		week_view-&gt;calendar, dtstart, dtend, FALSE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_new_event (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-</div><div class='del'>-	dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		week_view-&gt;calendar, dtstart, dtend, TRUE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_new_meeting (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_start_day == week_view-&gt;selection_end_day) {</div><div class='del'>-		dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		itt = icaltime_from_timet_with_zone (dtstart, FALSE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-		itt.hour = calendar_config_get_day_start_hour ();</div><div class='del'>-		itt.minute = calendar_config_get_day_start_minute ();</div><div class='del'>-		dtstart = icaltime_as_timet_with_zone (itt, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-		icaltime_adjust (&amp;itt, 0, 0, 30, 0);</div><div class='del'>-		dtend = icaltime_as_timet_with_zone (itt, week_view-&gt;zone);</div><div class='del'>-	} else {</div><div class='del'>-		dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-		dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_appointment_for (</div><div class='del'>-		week_view-&gt;calendar, dtstart, dtend, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_new_task (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_new_task (week_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_goto_date (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	goto_dialog (week_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_goto_today (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	calendar_goto_today (week_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_edit_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_edit_object (week_view-&gt;calendar, event-&gt;comp, </div><div class='del'>-					    FALSE);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Calendar not set");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_print (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	time_t start;</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-	PrintView print_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_current_time_range (week_view-&gt;calendar, &amp;start, NULL);</div><div class='del'>-	view_type = gnome_calendar_get_view (week_view-&gt;calendar);</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_WEEK;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		print_view = PRINT_VIEW_MONTH;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	print_calendar (week_view-&gt;calendar, FALSE, start, print_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_save_as (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	char *filename;</div><div class='del'>-	char *ical_string;</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-	</div><div class='del'>-	filename = e_file_dialog_save (_("Save as..."));</div><div class='del'>-	if (filename == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	ical_string = cal_client_get_component_as_string (week_view-&gt;client, event-&gt;comp);</div><div class='del'>-	if (ical_string == NULL) {</div><div class='del'>-		g_warning ("Couldn't convert item to a string");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	file = fopen (filename, "w");</div><div class='del'>-	if (file == NULL) {</div><div class='del'>-		g_warning ("Couldn't save item");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fprintf (file, ical_string);</div><div class='del'>-	g_free (ical_string);</div><div class='del'>-	fclose (file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_print_event (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	print_comp (event-&gt;comp, week_view-&gt;client, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_meeting (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;calendar)</div><div class='del'>-		gnome_calendar_edit_object (week_view-&gt;calendar, event-&gt;comp, TRUE);</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Calendar not set");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_forward (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, event-&gt;comp, </div><div class='del'>-			week_view-&gt;client, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_publish (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	icaltimezone *utc;</div><div class='del'>-	time_t start = time (NULL), end;</div><div class='del'>-	GList *comp_list;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	utc = icaltimezone_get_utc_timezone ();</div><div class='del'>-	start = time_day_begin_with_zone (start, utc);</div><div class='del'>-	end = time_add_week_with_zone (start, 6, utc);</div><div class='del'>-</div><div class='del'>-	comp_list = cal_client_get_free_busy (week_view-&gt;client, NULL, start, end);</div><div class='del'>-	if (comp_list) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		for (l = comp_list; l; l = l-&gt;next) {</div><div class='del'>-			CalComponent *comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-			itip_send_comp (CAL_COMPONENT_METHOD_PUBLISH, comp, </div><div class='del'>-					week_view-&gt;client, NULL);</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>- 		g_list_free (comp_list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_settings (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	control_util_show_settings (week_view-&gt;calendar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_pilot_settings (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-        char *args[] = {</div><div class='del'>-                "gpilotd-control-applet",</div><div class='del'>-                NULL</div><div class='del'>-        };</div><div class='del'>-        int pid;</div><div class='del'>-</div><div class='del'>-        args[0] = gnome_is_program_in_path ("gpilotd-control-applet");</div><div class='del'>-        if (!args[0]) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("The GNOME Pilot tools do not appear to be installed on this system."));</div><div class='del'>-		return;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        pid = gnome_execute_async (NULL, 4, args);</div><div class='del'>-        if (pid == -1)</div><div class='del'>-                e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, _("Error executing %s."), args[0]);</div><div class='del'>-</div><div class='del'>-        g_free (args[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	/* We must duplicate the CalComponent, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_comp_util_add_exdate (comp, event-&gt;start, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_delete_event_internal (EWeekView *week_view, gint event_num)</div><div class='del'>-{</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	if (delete_component_dialog (event-&gt;comp, FALSE, 1, vtype,</div><div class='del'>-				     GTK_WIDGET (week_view))) {</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-		/* We don't check the return value; FALSE can mean the object</div><div class='del'>-		 * was not in the server anyways.</div><div class='del'>-		 */</div><div class='del'>-		cal_client_remove_object (week_view-&gt;client, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_delete_event_internal (week_view,</div><div class='del'>-					   week_view-&gt;popup_event_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_delete_event		(EWeekView       *week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;editing_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_delete_event_internal (week_view,</div><div class='del'>-					   week_view-&gt;editing_event_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_cut (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	e_week_view_on_copy (widget, data);</div><div class='del'>- </div><div class='del'>- 	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>- 		return;</div><div class='del'>- </div><div class='del'>- 	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>- 				week_view-&gt;popup_event_num);</div><div class='del'>- </div><div class='del'>- 	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>- 	cal_client_remove_object (week_view-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_copy (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	char *comp_str;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	comp_str = cal_component_get_as_string (event-&gt;comp);</div><div class='del'>-	if (week_view-&gt;clipboard_selection)</div><div class='del'>-		g_free (week_view-&gt;clipboard_selection);</div><div class='del'>-	week_view-&gt;clipboard_selection = comp_str;</div><div class='del'>-</div><div class='del'>-	gtk_selection_owner_set (week_view-&gt;invisible, clipboard_atom, GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_paste (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gtk_selection_convert (week_view-&gt;invisible,</div><div class='del'>-			       clipboard_atom,</div><div class='del'>-			       GDK_SELECTION_TYPE_STRING,</div><div class='del'>-			       GDK_CURRENT_TIME);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	CalComponent *comp, *new_comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	/* For the recurring object, we add a exception to get rid of the</div><div class='del'>-	   instance. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_comp_util_add_exdate (comp, event-&gt;start, week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	/* For the unrecurred instance we duplicate the original object,</div><div class='del'>-	   create a new uid for it, get rid of the recurrence rules, and set</div><div class='del'>-	   the start &amp; end times to the instances times. */</div><div class='del'>-	new_comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_set_uid (new_comp, cal_component_gen_uid ());</div><div class='del'>-	cal_component_set_rdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_rrule_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exrule_list (new_comp, NULL);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = icaltimezone_get_tzid (week_view-&gt;zone);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (event-&gt;start, FALSE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtstart (new_comp, &amp;date);</div><div class='del'>-	*date.value = icaltime_from_timet_with_zone (event-&gt;end, FALSE,</div><div class='del'>-						     week_view-&gt;zone);</div><div class='del'>-	cal_component_set_dtend (new_comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	/* Now update both CalComponents. Note that we do this last since at</div><div class='del'>-	   present the updates happen synchronously so our event may disappear.</div><div class='del'>-	*/</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, new_comp))</div><div class='del'>-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_jump_button_event (GnomeCanvasItem *item,</div><div class='del'>-				  GdkEvent *event,</div><div class='del'>-				  EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;type == GDK_BUTTON_PRESS) {</div><div class='del'>-		for (day = 0; day &lt; E_WEEK_VIEW_MAX_WEEKS * 7; day++) {</div><div class='del'>-			if (item == week_view-&gt;jump_buttons[day]) {</div><div class='del'>-				if (week_view-&gt;calendar)</div><div class='del'>-					gnome_calendar_dayjump</div><div class='del'>-						(week_view-&gt;calendar,</div><div class='del'>-						 week_view-&gt;day_starts[day]);</div><div class='del'>-				else</div><div class='del'>-					g_warning ("Calendar not set");</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Converts an hour from 0-23 to the preferred time format, and returns the</div><div class='del'>-   suffix to add and the width of it in the normal font. */</div><div class='del'>-void</div><div class='del'>-e_week_view_convert_time_to_display	(EWeekView	*week_view,</div><div class='del'>-					 gint		 hour,</div><div class='del'>-					 gint		*display_hour,</div><div class='del'>-					 gchar	       **suffix,</div><div class='del'>-					 gint		*suffix_width)</div><div class='del'>-{</div><div class='del'>-	/* Calculate the actual hour number to display. For 12-hour</div><div class='del'>-	   format we convert 0-23 to 12-11am/12-11pm. */</div><div class='del'>-	*display_hour = hour;</div><div class='del'>-	if (week_view-&gt;use_24_hour_format) {</div><div class='del'>-		*suffix = "";</div><div class='del'>-		*suffix_width = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (hour &lt; 12) {</div><div class='del'>-			*suffix = week_view-&gt;am_string;</div><div class='del'>-			*suffix_width = week_view-&gt;am_string_width;</div><div class='del'>-		} else {</div><div class='del'>-			*display_hour -= 12;</div><div class='del'>-			*suffix = week_view-&gt;pm_string;</div><div class='del'>-			*suffix_width = week_view-&gt;pm_string_width;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* 12-hour uses 12:00 rather than 0:00. */</div><div class='del'>-		if (*display_hour == 0)</div><div class='del'>-			*display_hour = 12;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_week_view_get_time_string_width	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	gint time_width;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;use_small_font &amp;&amp; week_view-&gt;small_font)</div><div class='del'>-		time_width = week_view-&gt;digit_width * 2</div><div class='del'>-			+ week_view-&gt;small_digit_width * 2;</div><div class='del'>-	else</div><div class='del'>-		time_width = week_view-&gt;digit_width * 4</div><div class='del'>-			+ week_view-&gt;colon_width;</div><div class='del'>-</div><div class='del'>-	if (!week_view-&gt;use_24_hour_format)</div><div class='del'>-		time_width += MAX (week_view-&gt;am_string_width,</div><div class='del'>-				   week_view-&gt;pm_string_width);</div><div class='del'>-</div><div class='del'>-	return time_width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-invisible_destroyed (GtkWidget *invisible, EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	week_view-&gt;invisible = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_get (GtkWidget *invisible,</div><div class='del'>-	       GtkSelectionData *selection_data,</div><div class='del'>-	       guint info,</div><div class='del'>-	       guint time_stamp,</div><div class='del'>-	       EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	if (week_view-&gt;clipboard_selection != NULL) {</div><div class='del'>-		gtk_selection_data_set (selection_data,</div><div class='del'>-					GDK_SELECTION_TYPE_STRING,</div><div class='del'>-					8,</div><div class='del'>-					week_view-&gt;clipboard_selection,</div><div class='del'>-					strlen (week_view-&gt;clipboard_selection));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_clear_event (GtkWidget *invisible,</div><div class='del'>-		       GdkEventSelection *event,</div><div class='del'>-		       EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	if (week_view-&gt;clipboard_selection != NULL) {</div><div class='del'>-		g_free (week_view-&gt;clipboard_selection);</div><div class='del'>-		week_view-&gt;clipboard_selection = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-selection_received (GtkWidget *invisible,</div><div class='del'>-		    GtkSelectionData *selection_data,</div><div class='del'>-		    guint time,</div><div class='del'>-		    EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	char *comp_str;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t selected_time;</div><div class='del'>-	struct icaltimetype itime;</div><div class='del'>-	struct icaltimetype tmp_itime;</div><div class='del'>-	time_t tt_start, tt_end;</div><div class='del'>-	struct icaldurationtype ic_dur;</div><div class='del'>-	char *uid;</div><div class='del'>-	CalComponentDateTime ccdt;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (selection_data-&gt;length &lt; 0 ||</div><div class='del'>-	    selection_data-&gt;type != GDK_SELECTION_TYPE_STRING) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_str = (char *) selection_data-&gt;data;</div><div class='del'>-	icalcomp = icalparser_parse_string ((const char *) comp_str);</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check the type of the component */</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-	if (kind != ICAL_VCALENDAR_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VEVENT_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VTODO_COMPONENT &amp;&amp;</div><div class='del'>-	    kind != ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, _("Updating objects"));</div><div class='del'>-	selected_time = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-</div><div class='del'>-	if (kind == ICAL_VCALENDAR_COMPONENT) {</div><div class='del'>-		icalcomponent_kind child_kind;</div><div class='del'>-		icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-		subcomp = icalcomponent_get_first_component (</div><div class='del'>-			icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		while (subcomp) {</div><div class='del'>-			child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-			if (child_kind == ICAL_VEVENT_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VTODO_COMPONENT ||</div><div class='del'>-			    child_kind == ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-				icalcomponent *new_icalcomp;</div><div class='del'>-</div><div class='del'>-				new_icalcomp = icalcomponent_new_clone (subcomp);</div><div class='del'>-				comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-				/* change the day for the event */</div><div class='del'>-				tt_start = icaltime_as_timet (</div><div class='del'>-					icalcomponent_get_dtstart (new_icalcomp));</div><div class='del'>-				tt_end = icaltime_as_timet (</div><div class='del'>-					icalcomponent_get_dtend (new_icalcomp));</div><div class='del'>-				ic_dur = icaldurationtype_from_int (tt_end - tt_start);</div><div class='del'>-</div><div class='del'>-				tmp_itime = icaltime_from_timet_with_zone (</div><div class='del'>-					selected_time, FALSE, week_view-&gt;zone);</div><div class='del'>-				itime = icalcomponent_get_dtstart (new_icalcomp);</div><div class='del'>-				itime.year = tmp_itime.year;</div><div class='del'>-				itime.month = tmp_itime.month;</div><div class='del'>-				itime.day = tmp_itime.day;</div><div class='del'>-</div><div class='del'>-				cal_component_set_icalcomponent (comp, new_icalcomp);</div><div class='del'>-				ccdt.value = &amp;itime;</div><div class='del'>-				ccdt.tzid = icaltimezone_get_tzid (week_view-&gt;zone);</div><div class='del'>-				cal_component_set_dtstart (comp, &amp;ccdt);</div><div class='del'>-</div><div class='del'>-				itime = icaltime_add (itime, ic_dur);</div><div class='del'>-				ccdt.value = &amp;itime;</div><div class='del'>-				cal_component_set_dtend (comp, &amp;ccdt);</div><div class='del'>-</div><div class='del'>-				uid = cal_component_gen_uid ();</div><div class='del'>-				cal_component_set_uid (comp, uid);</div><div class='del'>-</div><div class='del'>-				cal_client_update_object (week_view-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-				g_free (uid);</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			}</div><div class='del'>-			subcomp = icalcomponent_get_next_component (</div><div class='del'>-				icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-		/* change the day for the event */</div><div class='del'>-		tt_start = icaltime_as_timet (icalcomponent_get_dtstart (icalcomp));</div><div class='del'>-		tt_end = icaltime_as_timet (icalcomponent_get_dtend (icalcomp));</div><div class='del'>-		ic_dur = icaldurationtype_from_int (tt_end - tt_start);</div><div class='del'>-</div><div class='del'>-		tmp_itime = icaltime_from_timet_with_zone (</div><div class='del'>-			selected_time, FALSE, week_view-&gt;zone);</div><div class='del'>-		itime = icalcomponent_get_dtstart (icalcomp);</div><div class='del'>-		itime.year = tmp_itime.year;</div><div class='del'>-		itime.month = tmp_itime.month;</div><div class='del'>-		itime.day = tmp_itime.day;</div><div class='del'>-</div><div class='del'>-		cal_component_set_icalcomponent (comp, icalcomp);</div><div class='del'>-		ccdt.value = &amp;itime;</div><div class='del'>-		ccdt.tzid = icaltimezone_get_tzid (week_view-&gt;zone);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;ccdt);</div><div class='del'>-</div><div class='del'>-		itime = icaltime_add (itime, ic_dur);</div><div class='del'>-		ccdt.value = &amp;itime;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;ccdt);</div><div class='del'>-</div><div class='del'>-		uid = cal_component_gen_uid ();</div><div class='del'>-		cal_component_set_uid (comp, (const char *) uid);</div><div class='del'>-</div><div class='del'>-		cal_client_update_object (week_view-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-		g_free (uid);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (week_view, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range. Returns FALSE if no time range has been set. */</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_visible_time_range	(EWeekView	*week_view,</div><div class='del'>-					 time_t		*start_time,</div><div class='del'>-					 time_t		*end_time)</div><div class='del'>-{</div><div class='del'>-	gint num_days;</div><div class='del'>-</div><div class='del'>-	/* If we don't have a valid date set yet, return FALSE. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	*start_time = week_view-&gt;day_starts[0];</div><div class='del'>-	*end_time = week_view-&gt;day_starts[num_days];</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Queues a layout, unless one is already queued. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_queue_layout (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	if (week_view-&gt;layout_timeout_id == 0) {</div><div class='del'>-		week_view-&gt;layout_timeout_id = g_timeout_add (E_WEEK_VIEW_LAYOUT_TIMEOUT, e_week_view_layout_timeout_cb, week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes any queued layout. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_cancel_layout (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	if (week_view-&gt;layout_timeout_id != 0) {</div><div class='del'>-		gtk_timeout_remove (week_view-&gt;layout_timeout_id);</div><div class='del'>-		week_view-&gt;layout_timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_layout_timeout_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-	e_week_view_check_layout (week_view);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;layout_timeout_id = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint</div><div class='del'>-e_week_view_get_num_events_selected (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 0);</div><div class='del'>-</div><div class='del'>-	return (week_view-&gt;editing_event_num != -1) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays a message on the activity client. */</div><div class='del'>-void</div><div class='del'>-e_week_view_set_status_message (EWeekView *week_view, const char *message)</div><div class='del'>-{</div><div class='del'>-	extern EvolutionShellClient *global_shell_client; /* ugly */</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (!message || !*message) {</div><div class='del'>-		if (week_view-&gt;activity) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (week_view-&gt;activity));</div><div class='del'>-			week_view-&gt;activity = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else if (!week_view-&gt;activity) {</div><div class='del'>-		int display;</div><div class='del'>-		char *client_id = g_strdup_printf ("%p", week_view);</div><div class='del'>-</div><div class='del'>-		if (progress_icon[0] == NULL)</div><div class='del'>-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CALENDAR_PROGRESS_IMAGE);</div><div class='del'>-		week_view-&gt;activity = evolution_activity_client_new (</div><div class='del'>-			global_shell_client, client_id,</div><div class='del'>-			progress_icon, message, TRUE, &amp;display);</div><div class='del'>-</div><div class='del'>-		g_free (client_id);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		evolution_activity_client_update (week_view-&gt;activity, message, -1.0);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h<br/>deleted file mode 100644<br/>index 689874cc25..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/e-week-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,511 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, Ximian, Inc.</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-#ifndef _E_WEEK_VIEW_H_</div><div class='del'>-#define _E_WEEK_VIEW_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "evolution-activity-client.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * EWeekView - displays the Week &amp; Month views of the calendar.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The maximum number of weeks we show. 5 is usually enough for 1 month,</div><div class='del'>-   but we allow 6 for longer selections. */</div><div class='del'>-#define E_WEEK_VIEW_MAX_WEEKS		6</div><div class='del'>-</div><div class='del'>-/* The size of the reminder &amp; recurrence icons, and padding around them.</div><div class='del'>-   X_PAD is the padding between icons. R_PAD is the padding on the right of</div><div class='del'>-   the last icon, before the event text. */</div><div class='del'>-#define E_WEEK_VIEW_ICON_WIDTH		16</div><div class='del'>-#define E_WEEK_VIEW_ICON_HEIGHT		16</div><div class='del'>-#define E_WEEK_VIEW_ICON_X_PAD		1</div><div class='del'>-#define E_WEEK_VIEW_ICON_Y_PAD		1</div><div class='del'>-#define E_WEEK_VIEW_ICON_R_PAD		1</div><div class='del'>-</div><div class='del'>-/* The space on the left &amp; right outside of the event. (The triangle to</div><div class='del'>-   indicate the event continues is displayed in this space). */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_L_PAD		2</div><div class='del'>-#define E_WEEK_VIEW_EVENT_R_PAD		2</div><div class='del'>-</div><div class='del'>-/* The vertical spacing between rows of events. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_Y_SPACING	1</div><div class='del'>-</div><div class='del'>-/* The size of the border around long events. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_BORDER_WIDTH	1</div><div class='del'>-#define E_WEEK_VIEW_EVENT_BORDER_HEIGHT	1</div><div class='del'>-</div><div class='del'>-/* The padding on the top and bottom of the event text. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1</div><div class='del'>-</div><div class='del'>-/* The space between the start and end times. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TIME_SPACING	2</div><div class='del'>-</div><div class='del'>-/* The space between the time and the event text or icons. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_TIME_X_PAD	2</div><div class='del'>-</div><div class='del'>-/* The space between the borders of long events and any text of icons. */</div><div class='del'>-#define E_WEEK_VIEW_EVENT_EDGE_X_PAD	2</div><div class='del'>-</div><div class='del'>-/* The padding above and on the right of the date string at the top of each</div><div class='del'>-   cell. */</div><div class='del'>-#define E_WEEK_VIEW_DATE_T_PAD		2</div><div class='del'>-#define E_WEEK_VIEW_DATE_R_PAD		4</div><div class='del'>-</div><div class='del'>-/* The padding above and below the line under the date string, in the Week</div><div class='del'>-   view, and also the space on the left of it. */</div><div class='del'>-#define E_WEEK_VIEW_DATE_LINE_T_PAD	1</div><div class='del'>-#define E_WEEK_VIEW_DATE_LINE_B_PAD	1</div><div class='del'>-#define E_WEEK_VIEW_DATE_LINE_L_PAD	10</div><div class='del'>-</div><div class='del'>-/* The padding below the date string in the Month view. */</div><div class='del'>-#define E_WEEK_VIEW_DATE_B_PAD		1</div><div class='del'>-</div><div class='del'>-/* We use a 7-bit field to store row numbers in EWeekViewEventSpan, so the</div><div class='del'>-   maximum number or rows we can allow is 127. It is very unlikely to be</div><div class='del'>-   reached anyway. */</div><div class='del'>-#define E_WEEK_VIEW_MAX_ROWS_PER_CELL	127</div><div class='del'>-</div><div class='del'>-/* These index our colors array. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_WEEK_VIEW_COLOR_EVEN_MONTHS,</div><div class='del'>-	E_WEEK_VIEW_COLOR_ODD_MONTHS,</div><div class='del'>-	E_WEEK_VIEW_COLOR_EVENT_BACKGROUND,</div><div class='del'>-	E_WEEK_VIEW_COLOR_EVENT_BORDER,</div><div class='del'>-	E_WEEK_VIEW_COLOR_EVENT_TEXT,</div><div class='del'>-	E_WEEK_VIEW_COLOR_GRID,</div><div class='del'>-	E_WEEK_VIEW_COLOR_SELECTED,</div><div class='del'>-	E_WEEK_VIEW_COLOR_DATES,</div><div class='del'>-	E_WEEK_VIEW_COLOR_DATES_SELECTED,</div><div class='del'>-	E_WEEK_VIEW_COLOR_TODAY,</div><div class='del'>-	</div><div class='del'>-	E_WEEK_VIEW_COLOR_LAST</div><div class='del'>-} EWeekViewColors;</div><div class='del'>-</div><div class='del'>-/* These specify which part of the selection we are dragging, if any. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_WEEK_VIEW_DRAG_NONE,</div><div class='del'>-	E_WEEK_VIEW_DRAG_START,</div><div class='del'>-	E_WEEK_VIEW_DRAG_END</div><div class='del'>-} EWeekViewDragPosition;</div><div class='del'>-</div><div class='del'>-/* These specify which times are shown for the 1-day events. We use the small</div><div class='del'>-   font for the minutes if it can be loaded and the option is on. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_WEEK_VIEW_TIME_NONE,</div><div class='del'>-	E_WEEK_VIEW_TIME_START,</div><div class='del'>-	E_WEEK_VIEW_TIME_BOTH,</div><div class='del'>-	E_WEEK_VIEW_TIME_START_SMALL_MIN,</div><div class='del'>-	E_WEEK_VIEW_TIME_BOTH_SMALL_MIN</div><div class='del'>-} EWeekViewTimeFormat;</div><div class='del'>-</div><div class='del'>-/* Specifies the position of the mouse. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_WEEK_VIEW_POS_OUTSIDE,</div><div class='del'>-	E_WEEK_VIEW_POS_NONE,</div><div class='del'>-	E_WEEK_VIEW_POS_EVENT,</div><div class='del'>-	E_WEEK_VIEW_POS_LEFT_EDGE,</div><div class='del'>-	E_WEEK_VIEW_POS_RIGHT_EDGE</div><div class='del'>-} EWeekViewPosition;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EWeekViewEventSpan EWeekViewEventSpan;</div><div class='del'>-struct _EWeekViewEventSpan {</div><div class='del'>-	guint start_day : 6;</div><div class='del'>-	guint num_days : 3;</div><div class='del'>-	guint row : 7;</div><div class='del'>-	GnomeCanvasItem *background_item;</div><div class='del'>-	GnomeCanvasItem *text_item;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _EWeekViewEvent EWeekViewEvent;</div><div class='del'>-struct _EWeekViewEvent {</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	guint16 start_minute;	/* Minutes from the start of the day. */</div><div class='del'>-	guint16 end_minute;</div><div class='del'>-	gint spans_index;</div><div class='del'>-	guint8 num_spans;</div><div class='del'>-</div><div class='del'>-	/* TRUE if the event is at a different UTC offset than our current</div><div class='del'>-	   timezone, i.e. it is in a different timezone. */</div><div class='del'>-	guint different_timezone : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_WEEK_VIEW(obj)          GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)</div><div class='del'>-#define E_WEEK_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)</div><div class='del'>-#define E_IS_WEEK_VIEW(obj)       GTK_CHECK_TYPE (obj, e_week_view_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EWeekView       EWeekView;</div><div class='del'>-typedef struct _EWeekViewClass  EWeekViewClass;</div><div class='del'>-</div><div class='del'>-struct _EWeekView</div><div class='del'>-{</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	/* The top canvas where the dates are shown. */</div><div class='del'>-	GtkWidget *titles_canvas;</div><div class='del'>-	GnomeCanvasItem *titles_canvas_item;</div><div class='del'>-</div><div class='del'>-	/* The main canvas where the appointments are shown. */</div><div class='del'>-	GtkWidget *main_canvas;</div><div class='del'>-	GnomeCanvasItem *main_canvas_item;</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *jump_buttons[E_WEEK_VIEW_MAX_WEEKS * 7];</div><div class='del'>-</div><div class='del'>-	GtkWidget *vscrollbar;</div><div class='del'>-</div><div class='del'>-	/* The calendar we are associated with. */</div><div class='del'>-	GnomeCalendar *calendar;</div><div class='del'>-</div><div class='del'>-	/* Calendar client object we are monitoring */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* S-expression for query and the query object */</div><div class='del'>-	char *sexp;</div><div class='del'>-	CalQuery *query;</div><div class='del'>-</div><div class='del'>-	/* The array of EWeekViewEvent elements. */</div><div class='del'>-	GArray *events;</div><div class='del'>-	gboolean events_sorted;</div><div class='del'>-	gboolean events_need_layout;</div><div class='del'>-	gboolean events_need_reshape;</div><div class='del'>-</div><div class='del'>-	/* The ID of the timeout function for doing a new layout. */</div><div class='del'>-	gint layout_timeout_id;</div><div class='del'>-</div><div class='del'>-	/* An array of EWeekViewEventSpan elements. Each event has its own</div><div class='del'>-	   space within this array, and uses the spans_index and num_spans</div><div class='del'>-	   fields of the EWeekViewEvent struct to access it. */</div><div class='del'>-	GArray *spans;</div><div class='del'>-</div><div class='del'>-	/* The start of each day displayed. */</div><div class='del'>-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];</div><div class='del'>-</div><div class='del'>-	/* The timezone. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* The base date, where the adjustment value is 0. */</div><div class='del'>-	GDate base_date;</div><div class='del'>-</div><div class='del'>-	/* The first day shown in the view. */</div><div class='del'>-	GDate first_day_shown;</div><div class='del'>-</div><div class='del'>-	/* If we are displaying multiple weeks in rows. If this is FALSE only</div><div class='del'>-	   one week is shown, with a different layout. */</div><div class='del'>-	gboolean multi_week_view;</div><div class='del'>-</div><div class='del'>-	/* How many weeks we are showing. This is only relevant if</div><div class='del'>-	   display_month is TRUE. */</div><div class='del'>-	gint weeks_shown;</div><div class='del'>-</div><div class='del'>-	/* If Sat &amp; Sun are compressed. Only applicable in month view, since</div><div class='del'>-	   they are always compressed into 1 cell in the week view. */</div><div class='del'>-	gboolean compress_weekend;</div><div class='del'>-</div><div class='del'>-	/* Whether we use show event end times. */</div><div class='del'>-	gboolean show_event_end_times;</div><div class='del'>-</div><div class='del'>-	/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-	gint week_start_day;</div><div class='del'>-</div><div class='del'>-	/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-	/* The first day of the week we display, 0 (Monday) to 6 (Sunday).</div><div class='del'>-	   This will usually be week_start_day, but if the weekend is</div><div class='del'>-	   compressed, and week_start_day is Sunday we have to use Saturday. */</div><div class='del'>-	gint display_start_day;</div><div class='del'>-</div><div class='del'>-	/* The vertical offset of the events from the top of the cells. */</div><div class='del'>-	gint events_y_offset;</div><div class='del'>-</div><div class='del'>-	/* The height of the events, not including spacing between them. */</div><div class='del'>-	gint row_height;</div><div class='del'>-</div><div class='del'>-	/* The number of rows of events in each cell. */</div><div class='del'>-	gint rows_per_cell;</div><div class='del'>-	gint rows_per_compressed_cell;</div><div class='del'>-</div><div class='del'>-	/* The number of rows we have used for each day (i.e. each cell) */</div><div class='del'>-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7];</div><div class='del'>-</div><div class='del'>-	/* If the small font is used for displaying the minutes. */</div><div class='del'>-	gboolean use_small_font;</div><div class='del'>-</div><div class='del'>-	/* Small font to display the minutes. */</div><div class='del'>-	GdkFont *small_font;</div><div class='del'>-</div><div class='del'>-	/* The widths of various pieces of text, used to determine which of</div><div class='del'>-	   several date formats to display, set in e_week_view_style_set(). */</div><div class='del'>-	gint space_width;		/* One space character ' '. */</div><div class='del'>-	gint colon_width;		/* Size of ':' in the font. */</div><div class='del'>-	gint slash_width;		/* Size of '/' in the font. */</div><div class='del'>-	gint digit_width;		/* Size of a '0' digit. */</div><div class='del'>-	gint small_digit_width;		/* Size of a small_font '0' digit. */</div><div class='del'>-	gint day_widths[7];		/* Monday first. */</div><div class='del'>-	gint max_day_width;</div><div class='del'>-	gint abbr_day_widths[7];</div><div class='del'>-	gint max_abbr_day_width;</div><div class='del'>-	gint month_widths[12];</div><div class='del'>-	gint max_month_width;</div><div class='del'>-	gint abbr_month_widths[12];</div><div class='del'>-	gint max_abbr_month_width;</div><div class='del'>-</div><div class='del'>-	/* The size of the main grid of days and of the cells. A row</div><div class='del'>-	   corresponds to a compressed day, so normal days usually take</div><div class='del'>-	   up 2 rows. Note that the offsets arrays have one more element</div><div class='del'>-	   than the widths/heights arrays since they also contain the</div><div class='del'>-	   right/bottom edge. */</div><div class='del'>-	gint rows;</div><div class='del'>-	gint columns;</div><div class='del'>-	gint col_widths[7];</div><div class='del'>-	gint col_offsets[8];</div><div class='del'>-	gint row_heights[E_WEEK_VIEW_MAX_WEEKS * 2];</div><div class='del'>-	gint row_offsets[E_WEEK_VIEW_MAX_WEEKS * 2 + 1];</div><div class='del'>-</div><div class='del'>-	/* This specifies which times we are showing for the events, depending</div><div class='del'>-	   on how much room is available. */</div><div class='del'>-	EWeekViewTimeFormat time_format;</div><div class='del'>-</div><div class='del'>-	/* The GC used for painting in different colors. */</div><div class='del'>-	GdkGC *main_gc;</div><div class='del'>-</div><div class='del'>-	/* The icons. */</div><div class='del'>-	GdkPixmap *reminder_icon;</div><div class='del'>-	GdkBitmap *reminder_mask;</div><div class='del'>-	GdkPixmap *recurrence_icon;</div><div class='del'>-	GdkBitmap *recurrence_mask;</div><div class='del'>-	GdkPixmap *timezone_icon;</div><div class='del'>-	GdkBitmap *timezone_mask;</div><div class='del'>-</div><div class='del'>-	/* Colors for drawing. */</div><div class='del'>-	GdkColor colors[E_WEEK_VIEW_COLOR_LAST];</div><div class='del'>-</div><div class='del'>-	/* The normal &amp; resizing cursors. */</div><div class='del'>-	GdkCursor *normal_cursor;</div><div class='del'>-	GdkCursor *move_cursor;</div><div class='del'>-	GdkCursor *resize_width_cursor;</div><div class='del'>-</div><div class='del'>-	/* This remembers the last cursor set on the window. */</div><div class='del'>-	GdkCursor *last_cursor_set;</div><div class='del'>-</div><div class='del'>-	/* The currently selected region, in days from the first day shown.</div><div class='del'>-	   If selection_start_day is -1 there is no current selection. */</div><div class='del'>-	gint selection_start_day;</div><div class='del'>-	gint selection_end_day;</div><div class='del'>-</div><div class='del'>-	/* This specifies which end of the selection is being dragged, or is</div><div class='del'>-	   E_WEEK_VIEW_DRAG_NONE if the selection isn't being dragged. */</div><div class='del'>-	EWeekViewDragPosition selection_drag_pos;</div><div class='del'>-</div><div class='del'>-	/* This is the event the mouse button was pressed on. If the button</div><div class='del'>-	   is released we start editing it, but if the mouse is dragged we set</div><div class='del'>-	   this to -1. */</div><div class='del'>-	gint pressed_event_num;</div><div class='del'>-	gint pressed_span_num;</div><div class='del'>-</div><div class='del'>-	/* The event span currently being edited. The num is -1 if no event is</div><div class='del'>-	   being edited. */</div><div class='del'>-	gint editing_event_num;</div><div class='del'>-	gint editing_span_num;</div><div class='del'>-</div><div class='del'>-	/* The event that the context menu is for. */</div><div class='del'>-	gint popup_event_num;</div><div class='del'>-	EPopupMenu *view_menu;</div><div class='del'>-</div><div class='del'>-	/* The last mouse position when dragging, in the entire canvas. */</div><div class='del'>-	gint drag_event_x;</div><div class='del'>-	gint drag_event_y;</div><div class='del'>-</div><div class='del'>-	/* "am" and "pm" in the current locale, and their widths. */</div><div class='del'>-	gchar *am_string;</div><div class='del'>-	gchar *pm_string;</div><div class='del'>-	gint am_string_width;</div><div class='del'>-	gint pm_string_width;</div><div class='del'>-</div><div class='del'>-	/* the invisible widget to manage the clipboard selections */</div><div class='del'>-	GtkWidget *invisible;</div><div class='del'>-	gchar *clipboard_selection;</div><div class='del'>-</div><div class='del'>-	/* The default category for new events */</div><div class='del'>-	char *default_category;</div><div class='del'>-</div><div class='del'>-	/* The activity client used to show messages on the status bar. */</div><div class='del'>-	EvolutionActivityClient *activity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EWeekViewClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* selection_changed) (EWeekView *week_view);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType	   e_week_view_get_type			(void);</div><div class='del'>-GtkWidget* e_week_view_new			(void);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_calendar		(EWeekView	*week_view,</div><div class='del'>-						 GnomeCalendar	*calendar);</div><div class='del'>-</div><div class='del'>-/* The first day shown. Note that it will be rounded down to the start of a</div><div class='del'>-   week when set. The returned value will be invalid if no date has been set</div><div class='del'>-   yet. */</div><div class='del'>-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,</div><div class='del'>-						 GDate		*date);</div><div class='del'>-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,</div><div class='del'>-						 GDate		*date);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_cal_client		(EWeekView	*week_view,</div><div class='del'>-						 CalClient	*client);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_query		(EWeekView	*week_view,</div><div class='del'>-						 const char	*sexp);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_default_category	(EWeekView	*week_view,</div><div class='del'>-						 const char	*category);</div><div class='del'>-</div><div class='del'>-/* The selected time range. The EWeekView will show the corresponding</div><div class='del'>-   month and the days between start_time and end_time will be selected.</div><div class='del'>-   To select a single day, use the same value for start_time &amp; end_time. */</div><div class='del'>-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-						 time_t		*start_time,</div><div class='del'>-						 time_t		*end_time);</div><div class='del'>-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-						 time_t		 start_time,</div><div class='del'>-						 time_t		 end_time);</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range. Returns FALSE if no time range has been set. */</div><div class='del'>-gboolean   e_week_view_get_visible_time_range	(EWeekView	*week_view,</div><div class='del'>-						 time_t		*start_time,</div><div class='del'>-						 time_t		*end_time);</div><div class='del'>-</div><div class='del'>-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */</div><div class='del'>-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);</div><div class='del'>-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 multi_week_view);</div><div class='del'>-</div><div class='del'>-/* The number of weeks shown in the multi-week view. */</div><div class='del'>-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);</div><div class='del'>-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,</div><div class='del'>-						 gint		 weeks_shown);</div><div class='del'>-</div><div class='del'>-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month</div><div class='del'>-   view. In the Week view they are always compressed. */</div><div class='del'>-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);</div><div class='del'>-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 compress);</div><div class='del'>-</div><div class='del'>-/* Whether we display event end times. */</div><div class='del'>-gboolean   e_week_view_get_show_event_end_times	(EWeekView	*week_view);</div><div class='del'>-void	   e_week_view_set_show_event_end_times	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 show);</div><div class='del'>-</div><div class='del'>-/* The first day of the week, 0 (Monday) to 6 (Sunday). */</div><div class='del'>-gint	   e_week_view_get_week_start_day	(EWeekView	*week_view);</div><div class='del'>-void	   e_week_view_set_week_start_day	(EWeekView	*week_view,</div><div class='del'>-						 gint		 week_start_day);</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour or 24-hour format. */</div><div class='del'>-gboolean   e_week_view_get_24_hour_format	(EWeekView	*week_view);</div><div class='del'>-void	   e_week_view_set_24_hour_format	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 use_24_hour);</div><div class='del'>-</div><div class='del'>-/* The current timezone. */</div><div class='del'>-icaltimezone* e_week_view_get_timezone		(EWeekView	*week_view);</div><div class='del'>-void	      e_week_view_set_timezone		(EWeekView	*week_view,</div><div class='del'>-						 icaltimezone	*zone);</div><div class='del'>-</div><div class='del'>-/* Clipboard related functions */</div><div class='del'>-void       e_week_view_cut_clipboard            (EWeekView      *week_view);</div><div class='del'>-void       e_week_view_copy_clipboard           (EWeekView      *week_view);</div><div class='del'>-void       e_week_view_paste_clipboard          (EWeekView      *week_view);</div><div class='del'>-</div><div class='del'>-void       e_week_view_delete_event		(EWeekView      *week_view);</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint	   e_week_view_get_num_events_selected	(EWeekView	*week_view);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Internal functions called by the associated canvas items.</div><div class='del'>- */</div><div class='del'>-void       e_week_view_get_day_position		(EWeekView	*week_view,</div><div class='del'>-						 gint		 day,</div><div class='del'>-						 gint		*day_x,</div><div class='del'>-						 gint		*day_y,</div><div class='del'>-						 gint		*day_w,</div><div class='del'>-						 gint		*day_h);</div><div class='del'>-gboolean   e_week_view_get_span_position	(EWeekView	*week_view,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gint		 span_num,</div><div class='del'>-						 gint		*span_x,</div><div class='del'>-						 gint		*span_y,</div><div class='del'>-						 gint		*span_w);</div><div class='del'>-gboolean   e_week_view_is_one_day_event		(EWeekView	*week_view,</div><div class='del'>-						 gint		 event_num);</div><div class='del'>-void	   e_week_view_start_editing_event	(EWeekView	*week_view,</div><div class='del'>-						 gint		 event_num,</div><div class='del'>-						 gint		 span_num,</div><div class='del'>-						 gchar		*initial_text);</div><div class='del'>-void	   e_week_view_stop_editing_event	(EWeekView	*week_view);</div><div class='del'>-</div><div class='del'>-void	   e_week_view_show_popup_menu		(EWeekView	*week_view,</div><div class='del'>-						 GdkEventButton *event,</div><div class='del'>-						 gint		 event_num);</div><div class='del'>-</div><div class='del'>-void	   e_week_view_convert_time_to_display	(EWeekView	*week_view,</div><div class='del'>-						 gint		 hour,</div><div class='del'>-						 gint		*display_hour,</div><div class='del'>-						 gchar	       **suffix,</div><div class='del'>-						 gint		*suffix_width);</div><div class='del'>-gint	   e_week_view_get_time_string_width	(EWeekView	*week_view);</div><div class='del'>-</div><div class='del'>-gint	   e_week_view_event_sort_func		(const void	*arg1,</div><div class='del'>-						 const void	*arg2);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_status_message       (EWeekView      *week_view,</div><div class='del'>-						 const char     *message);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_WEEK_VIEW_H_ */</div><div class='head'>diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c<br/>deleted file mode 100644<br/>index ad6b485a6c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/gnome-cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2893 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Main calendar view widget</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;gal/e-paned/e-hpaned.h&gt;</div><div class='del'>-#include &lt;gal/e-paned/e-vpaned.h&gt;</div><div class='del'>-#include "e-util/e-url.h"</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "widgets/menus/gal-view-menus.h"</div><div class='del'>-#include "dialogs/event-editor.h"</div><div class='del'>-#include "dialogs/task-editor.h"</div><div class='del'>-#include "comp-util.h"</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "cal-search-bar.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "calendar-view.h"</div><div class='del'>-#include "calendar-view-factory.h"</div><div class='del'>-#include "tag-calendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the GnomeCalendar structure */</div><div class='del'>-struct _GnomeCalendarPrivate {</div><div class='del'>-	/*</div><div class='del'>-	 * The Calendar Folder.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* The calendar client object we monitor */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Set of categories from the calendar client */</div><div class='del'>-	GPtrArray *cal_categories;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * The TaskPad Folder.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* The calendar client object we monitor */</div><div class='del'>-	CalClient   *task_pad_client;</div><div class='del'>-</div><div class='del'>-	/* Set of categories from the tasks client */</div><div class='del'>-	GPtrArray *tasks_categories;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Fields for the calendar view</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Mapping of component UIDs to event editors */</div><div class='del'>-	GHashTable  *object_editor_hash;</div><div class='del'>-</div><div class='del'>-	/* This is the last selection explicitly selected by the user. We try</div><div class='del'>-	   to keep it the same when we switch views, but we may have to alter</div><div class='del'>-	   it depending on the view (e.g. the week views only select days, so</div><div class='del'>-	   any times are lost. */</div><div class='del'>-	time_t      selection_start_time;</div><div class='del'>-	time_t      selection_end_time;</div><div class='del'>-</div><div class='del'>-	/* Widgets */</div><div class='del'>-</div><div class='del'>-	GtkWidget   *search_bar;</div><div class='del'>-</div><div class='del'>-	GtkWidget   *hpane;</div><div class='del'>-	GtkWidget   *notebook;</div><div class='del'>-	GtkWidget   *vpane;</div><div class='del'>-	ECalendar   *date_navigator;</div><div class='del'>-	GtkWidget   *todo;</div><div class='del'>-</div><div class='del'>-	GtkWidget   *day_view;</div><div class='del'>-	GtkWidget   *work_week_view;</div><div class='del'>-	GtkWidget   *week_view;</div><div class='del'>-	GtkWidget   *month_view;</div><div class='del'>-</div><div class='del'>-	/* Calendar query for the date navigator */</div><div class='del'>-	CalQuery    *dn_query;</div><div class='del'>-	char        *sexp;</div><div class='del'>-</div><div class='del'>-	/* This is the view currently shown. We use it to keep track of the</div><div class='del'>-	   positions of the panes. range_selected is TRUE if a range of dates</div><div class='del'>-	   was selected in the date navigator to show the view. */</div><div class='del'>-	GnomeCalendarViewType current_view_type;</div><div class='del'>-	gboolean range_selected;</div><div class='del'>-</div><div class='del'>-	/* These are the saved positions of the panes. They are multiples of</div><div class='del'>-	   calendar month widths &amp; heights in the date navigator, so that they</div><div class='del'>-	   will work OK after theme changes. */</div><div class='del'>-	gfloat	     hpane_pos;</div><div class='del'>-	gfloat	     vpane_pos;</div><div class='del'>-	gfloat	     hpane_pos_month_view;</div><div class='del'>-	gfloat	     vpane_pos_month_view;</div><div class='del'>-</div><div class='del'>-	/* The signal handler id for our GtkCalendar "day_selected" handler. */</div><div class='del'>-	guint	     day_selected_id;</div><div class='del'>-</div><div class='del'>-	/* View instance and menus for the control */</div><div class='del'>-	GalViewInstance *view_instance;</div><div class='del'>-	GalViewMenus *view_menus;</div><div class='del'>-</div><div class='del'>-	/* Whether we are being destroyed and should not mess with the object</div><div class='del'>-	 * editor hash table.</div><div class='del'>-	 */</div><div class='del'>-	guint in_destroy : 1;</div><div class='del'>-</div><div class='del'>-	/* Our current timezone. */</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* The dates currently shown. If they are -1 then we have no dates</div><div class='del'>-	   shown. We only use these to check if we need to emit a</div><div class='del'>-	   'dates-shown-changed' signal.*/</div><div class='del'>-	time_t visible_start;</div><div class='del'>-	time_t visible_end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DATES_SHOWN_CHANGED,</div><div class='del'>-	CALENDAR_SELECTION_CHANGED,</div><div class='del'>-	TASKPAD_SELECTION_CHANGED,</div><div class='del'>-	CALENDAR_FOCUS_CHANGE,</div><div class='del'>-	TASKPAD_FOCUS_CHANGE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Used to indicate who has the focus within the calendar view */</div><div class='del'>-typedef enum {</div><div class='del'>-	FOCUS_CALENDAR,</div><div class='del'>-	FOCUS_TASKPAD,</div><div class='del'>-	FOCUS_OTHER</div><div class='del'>-} FocusLocation;</div><div class='del'>-</div><div class='del'>-static guint gnome_calendar_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void gnome_calendar_class_init (GnomeCalendarClass *class);</div><div class='del'>-static void gnome_calendar_init (GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);</div><div class='del'>-static void gnome_calendar_update_view_times (GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-static void gnome_calendar_on_date_navigator_style_set (GtkWidget *widget,</div><div class='del'>-							GtkStyle  *previous_style,</div><div class='del'>-							gpointer data);</div><div class='del'>-static void gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal);</div><div class='del'>-static void gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,</div><div class='del'>-							    GtkAllocation *allocation,</div><div class='del'>-							    gpointer data);</div><div class='del'>-static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,</div><div class='del'>-								 GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,</div><div class='del'>-								GnomeCalendar    *gcal);</div><div class='del'>-static void gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-static void update_query (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkVBoxClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-gnome_calendar_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType gnome_calendar_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!gnome_calendar_type) {</div><div class='del'>-		static const GtkTypeInfo gnome_calendar_info = {</div><div class='del'>-			"GnomeCalendar",</div><div class='del'>-			sizeof (GnomeCalendar),</div><div class='del'>-			sizeof (GnomeCalendarClass),</div><div class='del'>-			(GtkClassInitFunc) gnome_calendar_class_init,</div><div class='del'>-			(GtkObjectInitFunc) gnome_calendar_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gnome_calendar_type = gtk_type_unique (GTK_TYPE_VBOX, &amp;gnome_calendar_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gnome_calendar_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_class_init (GnomeCalendarClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_VBOX);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_signals[DATES_SHOWN_CHANGED] =</div><div class='del'>-		gtk_signal_new ("dates_shown_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (GnomeCalendarClass,</div><div class='del'>-						   dates_shown_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_signals[CALENDAR_SELECTION_CHANGED] =</div><div class='del'>-		gtk_signal_new ("calendar_selection_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_selection_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_signals[TASKPAD_SELECTION_CHANGED] =</div><div class='del'>-		gtk_signal_new ("taskpad_selection_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_selection_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =</div><div class='del'>-		gtk_signal_new ("calendar_focus_change",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, calendar_focus_change),</div><div class='del'>-				gtk_marshal_NONE__BOOL,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_BOOL);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_signals[TASKPAD_FOCUS_CHANGE] =</div><div class='del'>-		gtk_signal_new ("taskpad_focus_change",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (GnomeCalendarClass, taskpad_focus_change),</div><div class='del'>-				gtk_marshal_NONE__BOOL,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_BOOL);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class,</div><div class='del'>-				      gnome_calendar_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = gnome_calendar_destroy;</div><div class='del'>-</div><div class='del'>-	class-&gt;dates_shown_changed = NULL;</div><div class='del'>-	class-&gt;calendar_selection_changed = NULL;</div><div class='del'>-	class-&gt;taskpad_selection_changed = NULL;</div><div class='del'>-	class-&gt;calendar_focus_change = NULL;</div><div class='del'>-	class-&gt;taskpad_focus_change = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar query reports of an updated object */</div><div class='del'>-static void</div><div class='del'>-dn_query_obj_updated_cb (CalQuery *query, const char *uid,</div><div class='del'>-			 gboolean query_in_progress, int n_scanned, int total,</div><div class='del'>-			 gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If this is an update that is not part of an ongoing query, we have to</div><div class='del'>-	 * retag the whole thing:  an event may change dates and the</div><div class='del'>-	 * tag_calendar_by_comp() below would not know how to untag the old</div><div class='del'>-	 * dates.</div><div class='del'>-	 */</div><div class='del'>-	if (!query_in_progress) {</div><div class='del'>-		update_query (gcal);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (priv-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("dn_query_obj_updated_cb(): Syntax error while getting object `%s'", uid);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag_calendar_by_comp (priv-&gt;date_navigator, comp, priv-&gt;client, FALSE,</div><div class='del'>-			      TRUE);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar query reports of a removed object */</div><div class='del'>-static void</div><div class='del'>-dn_query_obj_removed_cb (CalQuery *query, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	/* Just retag the whole thing */</div><div class='del'>-	update_query (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar query is done */</div><div class='del'>-static void</div><div class='del'>-dn_query_query_done_cb (CalQuery *query, CalQueryDoneStatus status, const char *error_str,</div><div class='del'>-			gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	if (status != CAL_QUERY_DONE_SUCCESS)</div><div class='del'>-		fprintf (stderr, "query done: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar query reports an evaluation error */</div><div class='del'>-static void</div><div class='del'>-dn_query_eval_error_cb (CalQuery *query, const char *error_str, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "eval error: %s\n", error_str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the current view widget, a EDayView or EWeekView. */</div><div class='del'>-static GtkWidget*</div><div class='del'>-gnome_calendar_get_current_view_widget (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *retval = NULL;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		retval = priv-&gt;day_view;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		retval = priv-&gt;work_week_view;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		retval = priv-&gt;week_view;</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		retval = priv-&gt;month_view;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the focus location based on who is the focused widget within the</div><div class='del'>- * calendar view.</div><div class='del'>- */</div><div class='del'>-static FocusLocation</div><div class='del'>-get_focus_location (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_HAS_FOCUS (etable-&gt;table_canvas))</div><div class='del'>-		return FOCUS_TASKPAD;</div><div class='del'>-	else {</div><div class='del'>-		GtkWidget *widget;</div><div class='del'>-		EDayView *dv;</div><div class='del'>-		EWeekView *wv;</div><div class='del'>-</div><div class='del'>-		widget = gnome_calendar_get_current_view_widget (gcal);</div><div class='del'>-</div><div class='del'>-		switch (priv-&gt;current_view_type) {</div><div class='del'>-		case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-			dv = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-			if (GTK_WIDGET_HAS_FOCUS (dv-&gt;top_canvas)</div><div class='del'>-			    || GTK_WIDGET_HAS_FOCUS (dv-&gt;main_canvas))</div><div class='del'>-				return FOCUS_CALENDAR;</div><div class='del'>-			else</div><div class='del'>-				return FOCUS_OTHER;</div><div class='del'>-</div><div class='del'>-		case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-			wv = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-			if (GTK_WIDGET_HAS_FOCUS (wv-&gt;main_canvas))</div><div class='del'>-				return FOCUS_CALENDAR;</div><div class='del'>-			else</div><div class='del'>-				return FOCUS_OTHER;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-			return FOCUS_OTHER;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Computes the range of time that the date navigator is showing */</div><div class='del'>-static void</div><div class='del'>-get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint start_year, start_month, start_day;</div><div class='del'>-	gint end_year, end_month, end_day;</div><div class='del'>-	struct icaltimetype start_tt;</div><div class='del'>-	struct icaltimetype end_tt;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_null_time ();</div><div class='del'>-	end_tt = icaltime_null_time ();</div><div class='del'>-</div><div class='del'>-	if (!e_calendar_item_get_date_range (priv-&gt;date_navigator-&gt;calitem,</div><div class='del'>-					     &amp;start_year, &amp;start_month, &amp;start_day,</div><div class='del'>-					     &amp;end_year, &amp;end_month, &amp;end_day)) {</div><div class='del'>-		*start_time = -1;</div><div class='del'>-		*end_time = -1;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_tt.year = start_year;</div><div class='del'>-	start_tt.month = start_month + 1;</div><div class='del'>-	start_tt.day = start_day;</div><div class='del'>-</div><div class='del'>-	end_tt.year = end_year;</div><div class='del'>-	end_tt.month = end_month + 1;</div><div class='del'>-	end_tt.day = end_day;</div><div class='del'>-</div><div class='del'>-	icaltime_adjust (&amp;end_tt, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	*start_time = icaltime_as_timet_with_zone (start_tt, priv-&gt;zone);</div><div class='del'>-	*end_time = icaltime_as_timet_with_zone (end_tt, priv-&gt;zone);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adjusts a given query sexp with the time range of the date navigator */</div><div class='del'>-static char *</div><div class='del'>-adjust_query_sexp (GnomeCalendar *gcal, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-	char *start, *end;</div><div class='del'>-	char *new_sexp;</div><div class='del'>-</div><div class='del'>-	get_date_navigator_range (gcal, &amp;start_time, &amp;end_time);</div><div class='del'>-	if (start_time == -1 || end_time == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	start = isodate_from_time_t (start_time);</div><div class='del'>-	end = isodate_from_time_t (end_time);</div><div class='del'>-</div><div class='del'>-	new_sexp = g_strdup_printf ("(and (= (get-vtype) \"VEVENT\")"</div><div class='del'>-				    "     (occur-in-time-range? (make-time \"%s\")"</div><div class='del'>-				    "                           (make-time \"%s\"))"</div><div class='del'>-				    "     %s)",</div><div class='del'>-				    start, end,</div><div class='del'>-				    sexp);</div><div class='del'>-</div><div class='del'>-	g_free (start);</div><div class='del'>-	g_free (end);</div><div class='del'>-</div><div class='del'>-	return new_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Restarts a query for the date navigator in the calendar */</div><div class='del'>-static void</div><div class='del'>-update_query (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalQuery *old_query;</div><div class='del'>-	char *real_sexp;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_calendar_item_clear_marks (priv-&gt;date_navigator-&gt;calitem);</div><div class='del'>-</div><div class='del'>-	if (!(priv-&gt;client</div><div class='del'>-	      &amp;&amp; cal_client_get_load_state (priv-&gt;client) == CAL_CLIENT_LOAD_LOADED))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	old_query = priv-&gt;dn_query;</div><div class='del'>-	priv-&gt;dn_query = NULL;</div><div class='del'>-</div><div class='del'>-	if (old_query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (old_query), gcal);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (old_query));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;sexp != NULL);</div><div class='del'>-</div><div class='del'>-	real_sexp = adjust_query_sexp (gcal, priv-&gt;sexp);</div><div class='del'>-	if (!real_sexp)</div><div class='del'>-		return; /* No time range is set, so don't start a query */</div><div class='del'>-</div><div class='del'>-	priv-&gt;dn_query = cal_client_get_query (priv-&gt;client, real_sexp);</div><div class='del'>-	g_free (real_sexp);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;dn_query) {</div><div class='del'>-		g_message ("update_query(): Could not create the query");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;dn_query), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (dn_query_obj_updated_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;dn_query), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (dn_query_obj_removed_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;dn_query), "query_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (dn_query_query_done_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;dn_query), "eval_error",</div><div class='del'>-			    GTK_SIGNAL_FUNC (dn_query_eval_error_cb), gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_set_query:</div><div class='del'>- * @gcal: A calendar.</div><div class='del'>- * @sexp: Sexp that defines the query.</div><div class='del'>- * </div><div class='del'>- * Sets the query sexp for all the views in a calendar.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (sexp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Set the query on the date navigator */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sexp)</div><div class='del'>-		g_free (priv-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	priv-&gt;sexp = g_strdup (sexp);</div><div class='del'>-</div><div class='del'>-	update_query (gcal);</div><div class='del'>-</div><div class='del'>-	/* Set the query on the main view */</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		e_day_view_set_query (E_DAY_VIEW (priv-&gt;day_view), sexp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		e_day_view_set_query (E_DAY_VIEW (priv-&gt;work_week_view), sexp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		e_week_view_set_query (E_WEEK_VIEW (priv-&gt;week_view), sexp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		e_week_view_set_query (E_WEEK_VIEW (priv-&gt;month_view), sexp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("A penguin bit my hand!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the query on the task pad */</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	calendar_model_set_query (model, sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the current time, for the ECalendarItem. */</div><div class='del'>-static struct tm</div><div class='del'>-get_current_time (ECalendarItem *calitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *cal = data;</div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal != NULL, tmp_tm);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (cal), tmp_tm);</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE,</div><div class='del'>-					    cal-&gt;priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	/* Now copy it to the struct tm and return it. */</div><div class='del'>-	tmp_tm = icaltimetype_to_tm (&amp;tt);</div><div class='del'>-</div><div class='del'>-	return tmp_tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the sexp changes in the calendar search bar */</div><div class='del'>-static void</div><div class='del'>-search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	gnome_calendar_set_query (gcal, sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selected category in the search bar changes */</div><div class='del'>-static void</div><div class='del'>-search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_day_view_set_default_category (E_DAY_VIEW (priv-&gt;day_view), category);</div><div class='del'>-	e_day_view_set_default_category (E_DAY_VIEW (priv-&gt;work_week_view), category);</div><div class='del'>-	e_week_view_set_default_category (E_WEEK_VIEW (priv-&gt;week_view), category);</div><div class='del'>-	e_week_view_set_default_category (E_WEEK_VIEW (priv-&gt;month_view), category);</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	calendar_model_set_default_category (model, category);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (gcal),</div><div class='del'>-			 gnome_calendar_signals[CALENDAR_SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the taskpad receives a focus event.  We emit the</div><div class='del'>- * corresponding signal so that parents can change the menus as appropriate.</div><div class='del'>- */</div><div class='del'>-static gint</div><div class='del'>-table_canvas_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [TASKPAD_FOCUS_CHANGE],</div><div class='del'>-			 event-&gt;in ? TRUE : FALSE);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-calendar_focus_change_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals [CALENDAR_FOCUS_CHANGE],</div><div class='del'>-			 event-&gt;in ? TRUE : FALSE);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Connects to the focus change signals of a day view widget */</div><div class='del'>-static void</div><div class='del'>-connect_day_view_focus (GnomeCalendar *gcal, EDayView *dv)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dv-&gt;top_canvas), "focus_in_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dv-&gt;top_canvas), "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dv-&gt;main_canvas), "focus_in_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dv-&gt;main_canvas), "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Connects to the focus change signals of a week view widget */</div><div class='del'>-static void</div><div class='del'>-connect_week_view_focus (GnomeCalendar *gcal, EWeekView *wv)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wv-&gt;main_canvas), "focus_in_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (wv-&gt;main_canvas), "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_focus_change_cb), gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selection in the taskpad table changes.  We just proxy</div><div class='del'>- * the signal with our own one.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-table_selection_change_cb (ETable *etable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	int n_selected;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	n_selected = e_table_selected_count (etable);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[TASKPAD_SELECTION_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_widgets (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;search_bar = cal_search_bar_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;search_bar), "sexp_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (search_bar_sexp_changed_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;search_bar), "category_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (search_bar_category_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;search_bar);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gcal), priv-&gt;search_bar, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* The main HPaned, with the notebook of calendar views on the left</div><div class='del'>-	   and the ECalendar and ToDo list on the right. */</div><div class='del'>-	priv-&gt;hpane = e_hpaned_new ();</div><div class='del'>-	gtk_widget_show (priv-&gt;hpane);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gcal), priv-&gt;hpane, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* The Notebook containing the 4 calendar views. */</div><div class='del'>-	priv-&gt;notebook = gtk_notebook_new ();</div><div class='del'>-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv-&gt;notebook), FALSE);</div><div class='del'>-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv-&gt;notebook), FALSE);</div><div class='del'>-	gtk_widget_show (priv-&gt;notebook);</div><div class='del'>-	e_paned_pack1 (E_PANED (priv-&gt;hpane), priv-&gt;notebook, TRUE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The VPaned widget, to contain the GtkCalendar &amp; ToDo list. */</div><div class='del'>-	priv-&gt;vpane = e_vpaned_new ();</div><div class='del'>-	gtk_widget_show (priv-&gt;vpane);</div><div class='del'>-	e_paned_pack2 (E_PANED (priv-&gt;hpane), priv-&gt;vpane, FALSE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The ECalendar. */</div><div class='del'>-	w = e_calendar_new ();</div><div class='del'>-	priv-&gt;date_navigator = E_CALENDAR (w);</div><div class='del'>-	e_calendar_item_set_days_start_week_sel (priv-&gt;date_navigator-&gt;calitem, 9);</div><div class='del'>-	e_calendar_item_set_max_days_sel (priv-&gt;date_navigator-&gt;calitem, 42);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-	e_calendar_item_set_get_time_callback (priv-&gt;date_navigator-&gt;calitem,</div><div class='del'>-					       (ECalendarItemGetTimeCallback) get_current_time,</div><div class='del'>-					       gcal, NULL);</div><div class='del'>-</div><div class='del'>-	e_paned_pack1 (E_PANED (priv-&gt;vpane), w, FALSE, TRUE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator),</div><div class='del'>-			    "style_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),</div><div class='del'>-			    gcal);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (priv-&gt;date_navigator),</div><div class='del'>-				  "size_allocate",</div><div class='del'>-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,</div><div class='del'>-				  gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			    "selection_changed",</div><div class='del'>-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,</div><div class='del'>-			    gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			    "date_range_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),</div><div class='del'>-			    gcal);</div><div class='del'>-</div><div class='del'>-	/* The ToDo list. */</div><div class='del'>-	priv-&gt;todo = e_calendar_table_new ();</div><div class='del'>-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	calendar_model_set_new_comp_vtype (model, CAL_COMPONENT_TODO);</div><div class='del'>-	e_paned_pack2 (E_PANED (priv-&gt;vpane), priv-&gt;todo, TRUE, TRUE);</div><div class='del'>-	gtk_widget_show (priv-&gt;todo);</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);</div><div class='del'>-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv-&gt;todo), filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (etable-&gt;table_canvas), "focus_in_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (etable-&gt;table_canvas), "focus_out_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_canvas_focus_change_cb), gcal);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (etable), "selection_change",</div><div class='del'>-			    GTK_SIGNAL_FUNC (table_selection_change_cb), gcal);</div><div class='del'>-</div><div class='del'>-	/* The Day View. */</div><div class='del'>-	priv-&gt;day_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (priv-&gt;day_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;day_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;day_view, gtk_label_new (""));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;day_view), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	connect_day_view_focus (gcal, E_DAY_VIEW (priv-&gt;day_view));</div><div class='del'>-</div><div class='del'>-	/* The Work Week View. */</div><div class='del'>-	priv-&gt;work_week_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_work_week_view (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       TRUE);</div><div class='del'>-	e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;work_week_view), 5);</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (priv-&gt;work_week_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;work_week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;work_week_view, gtk_label_new (""));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;work_week_view), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	connect_day_view_focus (gcal, E_DAY_VIEW (priv-&gt;work_week_view));</div><div class='del'>-</div><div class='del'>-	/* The Week View. */</div><div class='del'>-	priv-&gt;week_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (priv-&gt;week_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;week_view, gtk_label_new (""));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;week_view), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv-&gt;week_view));</div><div class='del'>-</div><div class='del'>-	/* The Month View. */</div><div class='del'>-	priv-&gt;month_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (priv-&gt;month_view), gcal);</div><div class='del'>-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv-&gt;month_view), TRUE);</div><div class='del'>-	gtk_widget_show (priv-&gt;month_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;month_view, gtk_label_new (""));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;month_view), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_selection_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	connect_week_view_focus (gcal, E_WEEK_VIEW (priv-&gt;month_view));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_config_settings (gcal, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_init (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (GnomeCalendarPrivate, 1);</div><div class='del'>-	gcal-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;cal_categories = NULL;</div><div class='del'>-	priv-&gt;tasks_categories = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_view_type = GNOME_CAL_DAY_VIEW;</div><div class='del'>-	priv-&gt;range_selected = FALSE;</div><div class='del'>-</div><div class='del'>-	setup_widgets (gcal);</div><div class='del'>-	priv-&gt;dn_query = NULL;</div><div class='del'>-	priv-&gt;sexp = g_strdup ("#t"); /* Match all */</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin_with_zone (time (NULL),</div><div class='del'>-							       priv-&gt;zone);</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day_with_zone (priv-&gt;selection_start_time, 1, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_instance = NULL;</div><div class='del'>-	priv-&gt;view_menus = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;visible_start = -1;</div><div class='del'>-	priv-&gt;visible_end = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees a set of categories */</div><div class='del'>-static void</div><div class='del'>-free_categories (GPtrArray *categories)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!categories)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;len; i++)</div><div class='del'>-		g_free (categories-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (categories, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(); frees an UID string */</div><div class='del'>-static void</div><div class='del'>-destroy_editor_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (value);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ee));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gchar *filename;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (object));</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (object);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_categories (priv-&gt;cal_categories);</div><div class='del'>-	priv-&gt;cal_categories = NULL;</div><div class='del'>-</div><div class='del'>-	free_categories (priv-&gt;tasks_categories);</div><div class='del'>-	priv-&gt;tasks_categories = NULL;</div><div class='del'>-</div><div class='del'>-	/* Save the TaskPad layout. */</div><div class='del'>-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);</div><div class='del'>-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv-&gt;todo), filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;dn_query) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;dn_query), gcal);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;dn_query));</div><div class='del'>-		priv-&gt;dn_query = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sexp) {</div><div class='del'>-		g_free (priv-&gt;sexp);</div><div class='del'>-		priv-&gt;sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;task_pad_client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;task_pad_client));</div><div class='del'>-		priv-&gt;task_pad_client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;in_destroy = TRUE;</div><div class='del'>-	g_hash_table_foreach (priv-&gt;object_editor_hash, destroy_editor_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;object_editor_hash);</div><div class='del'>-	priv-&gt;object_editor_hash = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;view_instance) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;view_instance));</div><div class='del'>-		priv-&gt;view_instance = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;view_menus) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;view_menus));</div><div class='del'>-		priv-&gt;view_menus = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	gcal-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (new_time != -1);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin_with_zone (new_time,</div><div class='del'>-							       priv-&gt;zone);</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day_with_zone (priv-&gt;selection_start_time, 1, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_view_times (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		e_day_view_set_selected_time_range (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-						    priv-&gt;selection_start_time,</div><div class='del'>-						    priv-&gt;selection_end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		e_day_view_set_selected_time_range (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-						    priv-&gt;selection_start_time,</div><div class='del'>-						    priv-&gt;selection_end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		e_week_view_set_selected_time_range (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-						     priv-&gt;selection_start_time,</div><div class='del'>-						     priv-&gt;selection_end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		e_week_view_set_selected_time_range (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-						     priv-&gt;selection_start_time,</div><div class='del'>-						     priv-&gt;selection_end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("My penguin is gone!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_direction (GnomeCalendar *gcal, int direction)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	start_time = priv-&gt;selection_start_time;</div><div class='del'>-	end_time = priv-&gt;selection_end_time;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		start_time = time_add_day_with_zone (start_time, direction,</div><div class='del'>-						     priv-&gt;zone);</div><div class='del'>-		end_time = time_add_day_with_zone (end_time, direction,</div><div class='del'>-						   priv-&gt;zone);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		start_time = time_add_week_with_zone (start_time, direction,</div><div class='del'>-						      priv-&gt;zone);</div><div class='del'>-		end_time = time_add_week_with_zone (end_time, direction,</div><div class='del'>-						    priv-&gt;zone);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		start_time = time_add_week_with_zone (start_time, direction,</div><div class='del'>-						      priv-&gt;zone);</div><div class='del'>-		end_time = time_add_week_with_zone (end_time, direction,</div><div class='del'>-						    priv-&gt;zone);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		start_time = time_add_month_with_zone (start_time, direction,</div><div class='del'>-						       priv-&gt;zone);</div><div class='del'>-		end_time = time_add_month_with_zone (end_time, direction,</div><div class='del'>-						     priv-&gt;zone);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Weee!  Where did the penguin go?");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = start_time;</div><div class='del'>-	priv-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_next (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_direction (gcal, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_previous (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_direction (gcal, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin_with_zone (time,</div><div class='del'>-							       priv-&gt;zone);</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day_with_zone (priv-&gt;selection_start_time, 1, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-focus_current_view (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;day_view);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;work_week_view);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;week_view);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		gtk_widget_grab_focus (priv-&gt;month_view);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("A penguin fell on its face!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_goto_today (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_goto (gcal, time (NULL));</div><div class='del'>-	focus_current_view (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_view:</div><div class='del'>- * @gcal: A calendar.</div><div class='del'>- *</div><div class='del'>- * Queries the type of the view that is being shown in a calendar.</div><div class='del'>- *</div><div class='del'>- * Return value: Type of the view that is currently shown.</div><div class='del'>- **/</div><div class='del'>-GnomeCalendarViewType</div><div class='del'>-gnome_calendar_get_view (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, GNOME_CAL_DAY_VIEW);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), GNOME_CAL_DAY_VIEW);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-	return priv-&gt;current_view_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the view without changing the selection or updating the date</div><div class='del'>- * navigator. If a range of dates isn't selected it will also reset the number</div><div class='del'>- * of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks</div><div class='del'>- * for the month view).</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-set_view (GnomeCalendar	*gcal, GnomeCalendarViewType view_type,</div><div class='del'>-	  gboolean range_selected, gboolean grab_focus)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gboolean round_selection;</div><div class='del'>-	GtkWidget *focus_widget;</div><div class='del'>-	const char *view_id;</div><div class='del'>-	</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	round_selection = FALSE;</div><div class='del'>-	focus_widget = NULL;</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		view_id = "Day_View";</div><div class='del'>-		focus_widget = priv-&gt;day_view;</div><div class='del'>-		</div><div class='del'>-		if (!range_selected)</div><div class='del'>-			e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;day_view), 1);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		view_id = "Work_Week_View";</div><div class='del'>-		focus_widget = priv-&gt;work_week_view;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		view_id = "Week_View";</div><div class='del'>-		focus_widget = priv-&gt;week_view;</div><div class='del'>-		round_selection = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		view_id = "Month_View";</div><div class='del'>-		focus_widget = priv-&gt;month_view;</div><div class='del'>-</div><div class='del'>-		if (!range_selected)</div><div class='del'>-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv-&gt;month_view), 5);</div><div class='del'>-</div><div class='del'>-		round_selection = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("A penguin is loose!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_view_type = view_type;</div><div class='del'>-	priv-&gt;range_selected = range_selected;</div><div class='del'>-</div><div class='del'>-	g_assert (focus_widget != NULL);</div><div class='del'>-</div><div class='del'>-	calendar_config_set_default_view (view_type);</div><div class='del'>-</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK (priv-&gt;notebook), (int) view_type);</div><div class='del'>-	gal_view_instance_set_current_view_id (priv-&gt;view_instance, view_id);</div><div class='del'>-</div><div class='del'>-	if (grab_focus)</div><div class='del'>-		gtk_widget_grab_focus (focus_widget);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_pane_positions (gcal);</div><div class='del'>-</div><div class='del'>-	/* For the week &amp; month views we want the selection in the date</div><div class='del'>-	   navigator to be rounded to the nearest week when the arrow buttons</div><div class='del'>-	   are pressed to move to the previous/next month. */</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"round_selection_when_moving", round_selection,</div><div class='del'>-			NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_set_view:</div><div class='del'>- * @gcal: A calendar.</div><div class='del'>- * @view_type: Type of view to show.</div><div class='del'>- * @range_selected: If false, the range of days/weeks shown will be reset to the</div><div class='del'>- * default value (1 for day view, 5 for week view, respectively).  If true, the</div><div class='del'>- * currently displayed range will be kept.</div><div class='del'>- * @grab_focus: Whether the view widget should grab the focus.</div><div class='del'>- *</div><div class='del'>- * Sets the view that should be shown in a calendar.  If @reset_range is true,</div><div class='del'>- * this function will automatically set the number of days or weeks shown in</div><div class='del'>- * the view; otherwise the last configuration will be kept.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type,</div><div class='del'>-			 gboolean range_selected, gboolean grab_focus)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	set_view (gcal, view_type, range_selected, grab_focus);</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the view collection asks us to display a particular view */</div><div class='del'>-static void</div><div class='del'>-display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	CalendarView *cal_view;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-</div><div class='del'>-	if (!IS_CALENDAR_VIEW (view))</div><div class='del'>-		g_error ("display_view_cb(): Unknown type of view for GnomeCalendar");</div><div class='del'>-</div><div class='del'>-	cal_view = CALENDAR_VIEW (view);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, calendar_view_get_view_type (cal_view), FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_setup_view_menus:</div><div class='del'>- * @gcal: A calendar.</div><div class='del'>- * @uic: UI controller to use for the menus.</div><div class='del'>- * </div><div class='del'>- * Sets up the #GalView menus for a calendar.  This function should be called</div><div class='del'>- * from the Bonobo control activation callback for this calendar.  Also, the</div><div class='del'>- * menus should be discarded using gnome_calendar_discard_view_menus().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	char *path;</div><div class='del'>-	CalendarViewFactory *factory;</div><div class='del'>-	static GalViewCollection *collection = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (uic != NULL);</div><div class='del'>-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;view_instance == NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;view_instance == NULL);</div><div class='del'>-	g_assert (priv-&gt;view_menus == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the view instance */</div><div class='del'>-</div><div class='del'>-	if (collection == NULL) {</div><div class='del'>-		collection = gal_view_collection_new ();</div><div class='del'>-</div><div class='del'>-		path = gnome_util_prepend_user_home ("/evolution/views/calendar/");</div><div class='del'>-		gal_view_collection_set_storage_directories (collection,</div><div class='del'>-							     EVOLUTION_DATADIR "/evolution/views/calendar/",</div><div class='del'>-							     path);</div><div class='del'>-		g_free (path);</div><div class='del'>-</div><div class='del'>-		/* Create the views */</div><div class='del'>-</div><div class='del'>-		factory = calendar_view_factory_new (GNOME_CAL_DAY_VIEW);</div><div class='del'>-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		factory = calendar_view_factory_new (GNOME_CAL_WORK_WEEK_VIEW);</div><div class='del'>-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		factory = calendar_view_factory_new (GNOME_CAL_WEEK_VIEW);</div><div class='del'>-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		factory = calendar_view_factory_new (GNOME_CAL_MONTH_VIEW);</div><div class='del'>-		gal_view_collection_add_factory (collection, GAL_VIEW_FACTORY (factory));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-		/* Load the collection and create the menus */</div><div class='del'>-</div><div class='del'>-		gal_view_collection_load (collection);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_instance = gal_view_instance_new (collection, cal_client_get_uri (priv-&gt;client));</div><div class='del'>-</div><div class='del'>-	priv-&gt;view_menus = gal_view_menus_new (priv-&gt;view_instance);</div><div class='del'>-	gal_view_menus_apply (priv-&gt;view_menus, uic, NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;view_instance), "display_view",</div><div class='del'>-			    GTK_SIGNAL_FUNC (display_view_cb), gcal);</div><div class='del'>-	display_view_cb (priv-&gt;view_instance, gal_view_instance_get_current_view (priv-&gt;view_instance), gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_discard_view_menus:</div><div class='del'>- * @gcal: A calendar.</div><div class='del'>- * </div><div class='del'>- * Discards the #GalView menus used by a calendar.  This function should be</div><div class='del'>- * called from the Bonobo control deactivation callback for this calendar.  The</div><div class='del'>- * menus should have been set up with gnome_calendar_setup_view_menus().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_discard_view_menus (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;view_instance != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;view_instance != NULL);</div><div class='del'>-	g_assert (priv-&gt;view_menus != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;view_instance));</div><div class='del'>-	priv-&gt;view_instance = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;view_menus));</div><div class='del'>-	priv-&gt;view_menus = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EPopupMenu *</div><div class='del'>-gnome_calendar_setup_view_popup (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;view_instance != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return gal_view_instance_get_popup_menu (priv-&gt;view_instance);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_discard_view_popup (GnomeCalendar *gcal, EPopupMenu *popup)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;view_instance != NULL);</div><div class='del'>-</div><div class='del'>-	gal_view_instance_free_popup_menu (priv-&gt;view_instance, popup);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-	gint col_width, row_height;</div><div class='del'>-	gfloat right_pane_width, top_pane_height;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Get the size of the calendar month width &amp; height. */</div><div class='del'>-	e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-				    &amp;top_border, &amp;bottom_border,</div><div class='del'>-				    &amp;left_border, &amp;right_border);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"row_height", &amp;row_height,</div><div class='del'>-			"column_width", &amp;col_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current_view_type == GNOME_CAL_MONTH_VIEW &amp;&amp; !priv-&gt;range_selected) {</div><div class='del'>-		right_pane_width = priv-&gt;hpane_pos_month_view;</div><div class='del'>-		top_pane_height = priv-&gt;vpane_pos_month_view;</div><div class='del'>-	} else {</div><div class='del'>-		right_pane_width = priv-&gt;hpane_pos;</div><div class='del'>-		top_pane_height = priv-&gt;vpane_pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We add the borders before multiplying due to the way we are using</div><div class='del'>-	   the EPaned quantum feature. */</div><div class='del'>-	if (right_pane_width &lt; 0.001)</div><div class='del'>-		right_pane_width = 0.0;</div><div class='del'>-	else</div><div class='del'>-		right_pane_width = (right_pane_width * (col_width + left_border + right_border)</div><div class='del'>-				    + 0.5);</div><div class='del'>-	if (top_pane_height &lt; 0.001)</div><div class='del'>-		top_pane_height = 0.0;</div><div class='del'>-	else</div><div class='del'>-		top_pane_height = (top_pane_height * (row_height + top_border + bottom_border)</div><div class='del'>-				   + 0.5);</div><div class='del'>-</div><div class='del'>-	e_paned_set_position (E_PANED (priv-&gt;hpane), -1);</div><div class='del'>-	e_paned_set_position (E_PANED (priv-&gt;vpane), -1);</div><div class='del'>-</div><div class='del'>-	/* We add one to each dimension since we can't use 0. */</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (priv-&gt;vpane, right_pane_width + 1, -2);</div><div class='del'>-	gtk_widget_set_usize (GTK_WIDGET (priv-&gt;date_navigator), -2, top_pane_height + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that opening a calendar failed */</div><div class='del'>-static void</div><div class='del'>-open_error (GnomeCalendar *gcal, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("Could not open the folder in `%s'"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that the specified URI method is not supported */</div><div class='del'>-static void</div><div class='del'>-method_error (GnomeCalendar *gcal, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("The method required to open `%s' is not supported"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when a calendar is loaded */</div><div class='del'>-static void</div><div class='del'>-client_cal_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_week_view_set_status_message (E_WEEK_VIEW (priv-&gt;week_view), NULL);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_OPEN_SUCCESS:</div><div class='del'>-		/* If this is the main CalClient, update the Date Navigator. */</div><div class='del'>-		if (client == priv-&gt;client) {</div><div class='del'>-			update_query (gcal);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Set the client's default timezone, if we have one. */</div><div class='del'>-		if (priv-&gt;zone) {</div><div class='del'>-			cal_client_set_default_timezone (client, priv-&gt;zone);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_ERROR:</div><div class='del'>-		open_error (gcal, cal_client_get_uri (client));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_NOT_FOUND:</div><div class='del'>-		/* bullshit; we did not specify only_if_exists */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:</div><div class='del'>-		method_error (gcal, cal_client_get_uri (client));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Duplicates an array of categories */</div><div class='del'>-static GPtrArray *</div><div class='del'>-copy_categories (GPtrArray *categories)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *c;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	c = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (c, categories-&gt;len);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; categories-&gt;len; i++)</div><div class='del'>-		c-&gt;pdata[i] = g_strdup (categories-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds the categories from an array to a hash table if they don't exist there</div><div class='del'>- * already.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_categories (GHashTable *categories, GPtrArray *c)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!c)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; c-&gt;len; i++) {</div><div class='del'>-		const char *cat;</div><div class='del'>-		const char *str;</div><div class='del'>-</div><div class='del'>-		cat = c-&gt;pdata[i];</div><div class='del'>-		str = g_hash_table_lookup (categories, cat);</div><div class='del'>-</div><div class='del'>-		if (!str)</div><div class='del'>-			g_hash_table_insert (categories, (char *) cat, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used to append categories from a hash table to an array */</div><div class='del'>-struct append_category_closure {</div><div class='del'>-	GPtrArray *c;</div><div class='del'>-</div><div class='del'>-	int i;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Appends a category from the hash table to the array */</div><div class='del'>-static void</div><div class='del'>-append_category_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct append_category_closure *closure;</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	category = key;</div><div class='del'>-	closure = data;</div><div class='del'>-</div><div class='del'>-	closure-&gt;c-&gt;pdata[closure-&gt;i] = g_strdup (category);</div><div class='del'>-	closure-&gt;i++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the union of two sets of categories */</div><div class='del'>-static GPtrArray *</div><div class='del'>-merge_categories (GPtrArray *a, GPtrArray *b)</div><div class='del'>-{</div><div class='del'>-	GHashTable *categories;</div><div class='del'>-	int n;</div><div class='del'>-	GPtrArray *c;</div><div class='del'>-	struct append_category_closure closure;</div><div class='del'>-</div><div class='del'>-	categories = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	add_categories (categories, a);</div><div class='del'>-	add_categories (categories, b);</div><div class='del'>-</div><div class='del'>-	n = g_hash_table_size (categories);</div><div class='del'>-</div><div class='del'>-	c = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (c, n);</div><div class='del'>-</div><div class='del'>-	closure.c = c;</div><div class='del'>-	closure.i = 0;</div><div class='del'>-	g_hash_table_foreach (categories, append_category_cb, &amp;closure);</div><div class='del'>-	g_hash_table_destroy (categories);</div><div class='del'>-</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when the set of categories changes.  We</div><div class='del'>- * have to merge the categories of the calendar and tasks clients.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-client_categories_changed_cb (CalClient *client, GPtrArray *categories, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GPtrArray *merged;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (client == priv-&gt;client) {</div><div class='del'>-		free_categories (priv-&gt;cal_categories);</div><div class='del'>-		priv-&gt;cal_categories = copy_categories (categories);</div><div class='del'>-	} else if (client == priv-&gt;task_pad_client) {</div><div class='del'>-		free_categories (priv-&gt;tasks_categories);</div><div class='del'>-		priv-&gt;tasks_categories = copy_categories (categories);</div><div class='del'>-	} else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	merged = merge_categories (priv-&gt;cal_categories, priv-&gt;tasks_categories);</div><div class='del'>-	cal_search_bar_set_categories (CAL_SEARCH_BAR (priv-&gt;search_bar), merged);</div><div class='del'>-	free_categories (merged);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gnome_calendar_construct (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GnomeCalendarViewType view_type;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Calendar Folder Client.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;client = cal_client_new ();</div><div class='del'>-	if (!priv-&gt;client)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "categories_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	e_day_view_set_cal_client (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				   priv-&gt;client);</div><div class='del'>-	e_day_view_set_cal_client (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				   priv-&gt;client);</div><div class='del'>-	e_week_view_set_cal_client (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-				    priv-&gt;client);</div><div class='del'>-	e_week_view_set_cal_client (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-				    priv-&gt;client);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * TaskPad Folder Client.</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;task_pad_client = cal_client_new ();</div><div class='del'>-	if (!priv-&gt;task_pad_client)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;task_pad_client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_cal_opened_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;task_pad_client), "categories_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (client_categories_changed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	g_assert (model != NULL);</div><div class='del'>-</div><div class='del'>-	calendar_model_set_cal_client (model, priv-&gt;task_pad_client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	/* Get the default view to show. */</div><div class='del'>-	view_type = calendar_config_get_default_view ();</div><div class='del'>-	if (view_type &lt; GNOME_CAL_DAY_VIEW || view_type &gt; GNOME_CAL_MONTH_VIEW)</div><div class='del'>-		view_type = GNOME_CAL_DAY_VIEW;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, view_type, FALSE, FALSE);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gnome_calendar_new (void)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = gtk_type_new (gnome_calendar_get_type ());</div><div class='del'>-</div><div class='del'>-	if (!gnome_calendar_construct (gcal)) {</div><div class='del'>-		g_message ("gnome_calendar_new(): Could not construct the calendar GUI");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (gcal));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_ui_component (GnomeCalendar *gcal,</div><div class='del'>-				 BonoboUIComponent *ui_component)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (ui_component == NULL || BONOBO_IS_UI_COMPONENT (ui_component));</div><div class='del'>-</div><div class='del'>-	e_search_bar_set_ui_component (E_SEARCH_BAR (gcal-&gt;priv-&gt;search_bar), ui_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_cal_client:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- *</div><div class='del'>- * Queries the calendar client interface object that a calendar view is using.</div><div class='del'>- *</div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-gnome_calendar_get_cal_client (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_task_pad_cal_client:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- *</div><div class='del'>- * Queries the calendar client interface object that a calendar view is using</div><div class='del'>- * for the Task Pad.</div><div class='del'>- *</div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-gnome_calendar_get_task_pad_cal_client (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;task_pad_client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds the specified URI to the alarm notification service */</div><div class='del'>-static void</div><div class='del'>-add_alarms (const char *uri)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify an;</div><div class='del'>-</div><div class='del'>-	/* Activate the alarm notification service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("add_alarms(): Could not activate the alarm notification service");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Ask the service to load the URI */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify_addCalendar (an, uri, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_InvalidURI))</div><div class='del'>-		g_message ("add_calendar(): Invalid URI reported from the "</div><div class='del'>-			   "alarm notification service");</div><div class='del'>-	else if (BONOBO_USER_EX (&amp;ev, ex_GNOME_Evolution_Calendar_AlarmNotify_BackendContactError))</div><div class='del'>-		g_message ("add_calendar(): The alarm notification service could "</div><div class='del'>-			   "not contact the backend");		</div><div class='del'>-	else if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("add_calendar(): Could not issue the addCalendar request");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Get rid of the service */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (an, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("add_alarms(): Could not unref the alarm notification service");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	char *tasks_uri;</div><div class='del'>-	gboolean success;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	char *message;</div><div class='del'>-	char *real_uri;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);</div><div class='del'>-	g_return_val_if_fail (str_uri != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (</div><div class='del'>-		cal_client_get_load_state (priv-&gt;client) == CAL_CLIENT_LOAD_NOT_LOADED,</div><div class='del'>-		FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (</div><div class='del'>-		cal_client_get_load_state (priv-&gt;task_pad_client) == CAL_CLIENT_LOAD_NOT_LOADED,</div><div class='del'>-		FALSE);</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (str_uri);</div><div class='del'>-	if (!uri || !g_strncasecmp (uri-&gt;protocol, "file", 4))</div><div class='del'>-		real_uri = g_concat_dir_and_file (str_uri, "calendar.ics");</div><div class='del'>-	else</div><div class='del'>-		real_uri = g_strdup (str_uri);</div><div class='del'>-</div><div class='del'>-	message = g_strdup_printf (_("Opening calendar at %s"), real_uri);</div><div class='del'>-	e_week_view_set_status_message (E_WEEK_VIEW (priv-&gt;week_view), message);</div><div class='del'>-	g_free (message);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_open_calendar (priv-&gt;client, real_uri, FALSE)) {</div><div class='del'>-		g_message ("gnome_calendar_open(): Could not issue the request");</div><div class='del'>-		g_free (real_uri);</div><div class='del'>-		e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	add_alarms (real_uri);</div><div class='del'>-</div><div class='del'>-	/* Open the appropriate Tasks folder to show in the TaskPad */</div><div class='del'>-</div><div class='del'>-	if (!uri) {</div><div class='del'>-		tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);</div><div class='del'>-		success = cal_client_open_calendar (priv-&gt;task_pad_client, tasks_uri, FALSE);</div><div class='del'>-		g_free (tasks_uri);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (!g_strncasecmp (uri-&gt;protocol, "file", 4)) {</div><div class='del'>-			tasks_uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);</div><div class='del'>-			success = cal_client_open_calendar (priv-&gt;task_pad_client, tasks_uri, FALSE);</div><div class='del'>-			g_free (tasks_uri);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			success = cal_client_open_default_tasks (priv-&gt;task_pad_client, FALSE);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (real_uri);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		add_alarms (cal_client_get_uri (priv-&gt;task_pad_client));</div><div class='del'>-	else {</div><div class='del'>-		g_message ("gnome_calendar_open(): Could not issue the request");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Tells the calendar to reload all config settings.</div><div class='del'>-   If initializing is TRUE it sets the pane positions as well. (We don't</div><div class='del'>-   want to reset the pane positions after the user clicks 'Apply' in the</div><div class='del'>-   preferences dialog.) */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_update_config_settings (GnomeCalendar *gcal,</div><div class='del'>-				       gboolean	      initializing)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint week_start_day, time_divisions;</div><div class='del'>-	gint start_hour, start_minute, end_hour, end_minute;</div><div class='del'>-	gboolean use_24_hour, show_event_end, compress_weekend;</div><div class='del'>-	char *location;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	working_days = calendar_config_get_working_days ();</div><div class='del'>-	/* CalWeekdays and EDayViewDays use the same bit-masks, so we can</div><div class='del'>-	   use the same value. */</div><div class='del'>-	e_day_view_set_working_days (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				     (EDayViewDays) working_days);</div><div class='del'>-	e_day_view_set_working_days (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				     (EDayViewDays) working_days);</div><div class='del'>-</div><div class='del'>-	/* Note that this is 0 (Sun) to 6 (Sat). */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-</div><div class='del'>-	/* Convert it to 0 (Mon) to 6 (Sun), which is what we use. */</div><div class='del'>-	week_start_day = (week_start_day + 6) % 7;</div><div class='del'>-</div><div class='del'>-	e_day_view_set_week_start_day (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-	e_day_view_set_week_start_day (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-</div><div class='del'>-	start_hour = calendar_config_get_day_start_hour ();</div><div class='del'>-	start_minute = calendar_config_get_day_start_minute ();</div><div class='del'>-	end_hour = calendar_config_get_day_end_hour ();</div><div class='del'>-	end_minute = calendar_config_get_day_end_minute ();</div><div class='del'>-	e_day_view_set_working_day (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				    start_hour, start_minute,</div><div class='del'>-				    end_hour, end_minute);</div><div class='del'>-	e_day_view_set_working_day (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				    start_hour, start_minute,</div><div class='del'>-				    end_hour, end_minute);</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				       use_24_hour);</div><div class='del'>-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       use_24_hour);</div><div class='del'>-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					use_24_hour);</div><div class='del'>-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					use_24_hour);</div><div class='del'>-</div><div class='del'>-	time_divisions = calendar_config_get_time_divisions ();</div><div class='del'>-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				     time_divisions);</div><div class='del'>-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				     time_divisions);</div><div class='del'>-</div><div class='del'>-	show_event_end = calendar_config_get_show_event_end ();</div><div class='del'>-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-					     show_event_end);</div><div class='del'>-	e_day_view_set_show_event_end_times (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-					     show_event_end);</div><div class='del'>-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					      show_event_end);</div><div class='del'>-	e_week_view_set_show_event_end_times (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					      show_event_end);</div><div class='del'>-</div><div class='del'>-	compress_weekend = calendar_config_get_compress_weekend ();</div><div class='del'>-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					  compress_weekend);</div><div class='del'>-</div><div class='del'>-	calendar_config_configure_e_calendar (E_CALENDAR (priv-&gt;date_navigator));</div><div class='del'>-</div><div class='del'>-	calendar_config_configure_e_calendar_table (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	priv-&gt;zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client</div><div class='del'>-	    &amp;&amp; cal_client_get_load_state (priv-&gt;client) == CAL_CLIENT_LOAD_LOADED) {</div><div class='del'>-		cal_client_set_default_timezone (priv-&gt;client, priv-&gt;zone);</div><div class='del'>-	}</div><div class='del'>-	if (priv-&gt;task_pad_client</div><div class='del'>-	    &amp;&amp; cal_client_get_load_state (priv-&gt;task_pad_client) == CAL_CLIENT_LOAD_LOADED) {</div><div class='del'>-		cal_client_set_default_timezone (priv-&gt;task_pad_client,</div><div class='del'>-						 priv-&gt;zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_set_timezone (E_DAY_VIEW (priv-&gt;day_view), priv-&gt;zone);</div><div class='del'>-	e_day_view_set_timezone (E_DAY_VIEW (priv-&gt;work_week_view), priv-&gt;zone);</div><div class='del'>-	e_week_view_set_timezone (E_WEEK_VIEW (priv-&gt;week_view), priv-&gt;zone);</div><div class='del'>-	e_week_view_set_timezone (E_WEEK_VIEW (priv-&gt;month_view), priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	if (initializing) {</div><div class='del'>-		priv-&gt;hpane_pos = calendar_config_get_hpane_pos ();</div><div class='del'>-		priv-&gt;vpane_pos = calendar_config_get_vpane_pos ();</div><div class='del'>-		priv-&gt;hpane_pos_month_view = calendar_config_get_month_hpane_pos ();</div><div class='del'>-		priv-&gt;vpane_pos_month_view = calendar_config_get_month_vpane_pos ();</div><div class='del'>-	} else {</div><div class='del'>-		gnome_calendar_update_paned_quanta (gcal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The range of days shown may have changed, so we update the date</div><div class='del'>-	   navigator if needed. */</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-					time_t	       start_time,</div><div class='del'>-					time_t	       end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = start_time;</div><div class='del'>-	priv-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_selected_time_range:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- * @start_time: Return value for the start of the time selection.</div><div class='del'>- * @end_time: Return value for the end of the time selection.</div><div class='del'>- *</div><div class='del'>- * Queries the time selection range on the calendar view.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-					time_t	 *start_time,</div><div class='del'>-					time_t	 *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (start_time)</div><div class='del'>-		*start_time = priv-&gt;selection_start_time;</div><div class='del'>-</div><div class='del'>-	if (end_time)</div><div class='del'>-		*end_time = priv-&gt;selection_end_time;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when an event editor dialog is closed */</div><div class='del'>-struct editor_closure</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	char *uid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	struct editor_closure *ec;</div><div class='del'>-	gboolean result;</div><div class='del'>-	gpointer orig_key;</div><div class='del'>-	char *orig_uid;</div><div class='del'>-</div><div class='del'>-	ec = (struct editor_closure *) data;</div><div class='del'>-	gcal = ec-&gt;gcal;</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	result = g_hash_table_lookup_extended (priv-&gt;object_editor_hash, ec-&gt;uid, &amp;orig_key, NULL);</div><div class='del'>-	g_assert (result != FALSE);</div><div class='del'>-</div><div class='del'>-	orig_uid = orig_key;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;in_destroy)</div><div class='del'>-		g_hash_table_remove (priv-&gt;object_editor_hash, orig_uid);</div><div class='del'>-</div><div class='del'>-	g_free (orig_uid);</div><div class='del'>-</div><div class='del'>-	g_free (ec);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp, </div><div class='del'>-			    gboolean meeting)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	struct editor_closure *ec;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	ee = g_hash_table_lookup (priv-&gt;object_editor_hash, uid);</div><div class='del'>-	if (!ee) {</div><div class='del'>-		ec = g_new0 (struct editor_closure, 1);</div><div class='del'>-</div><div class='del'>-		ee = event_editor_new ();</div><div class='del'>-		if (!ee) {</div><div class='del'>-			g_message ("gnome_calendar_edit_object(): Could not create the event editor");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		ec-&gt;gcal = gcal;</div><div class='del'>-		ec-&gt;uid = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (priv-&gt;object_editor_hash, ec-&gt;uid, ee);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ee), "destroy",</div><div class='del'>-				    GTK_SIGNAL_FUNC (editor_closed_cb),</div><div class='del'>-				    ec);</div><div class='del'>-</div><div class='del'>-		comp_editor_set_cal_client (COMP_EDITOR (ee), priv-&gt;client);</div><div class='del'>-		comp_editor_edit_comp (COMP_EDITOR (ee), comp);</div><div class='del'>-		if (meeting)</div><div class='del'>-			event_editor_show_meeting (ee);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_editor_focus (COMP_EDITOR (ee));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_new_appointment_for:</div><div class='del'>- * @gcal: An Evolution calendar.</div><div class='del'>- * @dtstart: a Unix time_t that marks the beginning of the appointment.</div><div class='del'>- * @dtend: a Unix time_t that marks the end of the appointment.</div><div class='del'>- * @all_day: if true, the dtstart and dtend are expanded to cover the entire</div><div class='del'>- * day, and the event is set to TRANSPARENT.</div><div class='del'>- *</div><div class='del'>- * Opens an event editor dialog for a new appointment.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_new_appointment_for (GnomeCalendar *cal,</div><div class='del'>-				    time_t dtstart, time_t dtend,</div><div class='del'>-				    gboolean all_day,</div><div class='del'>-				    gboolean meeting)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (cal));</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	dt.value = &amp;itt;</div><div class='del'>-	if (all_day)</div><div class='del'>-		dt.tzid = NULL;</div><div class='del'>-	else</div><div class='del'>-		dt.tzid = icaltimezone_get_tzid (priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-	comp = cal_comp_event_new_with_defaults ();</div><div class='del'>-</div><div class='del'>-	/* DTSTART, DTEND */</div><div class='del'>-</div><div class='del'>-	itt = icaltime_from_timet_with_zone (dtstart, FALSE, priv-&gt;zone);</div><div class='del'>-	if (all_day) {</div><div class='del'>-		itt.hour = itt.minute = itt.second = 0;</div><div class='del'>-		itt.is_date = TRUE;</div><div class='del'>-	}</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	itt = icaltime_from_timet_with_zone (dtend, FALSE, priv-&gt;zone);</div><div class='del'>-	if (all_day) {</div><div class='del'>-		/* We round it up to the end of the day, unless it is already</div><div class='del'>-		   set to midnight. */</div><div class='del'>-		if (itt.hour != 0 || itt.minute != 0 || itt.second != 0) {</div><div class='del'>-			icaltime_adjust (&amp;itt, 1, 0, 0, 0);</div><div class='del'>-		}</div><div class='del'>-		itt.hour = itt.minute = itt.second = 0;</div><div class='del'>-		itt.is_date = TRUE;</div><div class='del'>-	}</div><div class='del'>-	cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	transparency = all_day ? CAL_COMPONENT_TRANSP_TRANSPARENT</div><div class='del'>-		: CAL_COMPONENT_TRANSP_OPAQUE;</div><div class='del'>-	cal_component_set_transparency (comp, transparency);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Category */</div><div class='del'>-</div><div class='del'>-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv-&gt;search_bar));</div><div class='del'>-	cal_component_set_categories (comp, category);</div><div class='del'>-</div><div class='del'>-	/* Edit! */</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (cal, comp, meeting);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_new_appointment:</div><div class='del'>- * @gcal: An Evolution calendar.</div><div class='del'>- *</div><div class='del'>- * Opens an event editor dialog for a new appointment.  The appointment's start</div><div class='del'>- * and end times are set to the currently selected time range in the calendar</div><div class='del'>- * views.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_new_appointment (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_current_time_range (gcal, &amp;dtstart, &amp;dtend);</div><div class='del'>-	gnome_calendar_new_appointment_for (gcal, dtstart, dtend, FALSE, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_new_task:</div><div class='del'>- * @gcal: An Evolution calendar.</div><div class='del'>- *</div><div class='del'>- * Opens a task editor dialog for a new task.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_new_task		(GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *category;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	tedit = task_editor_new ();</div><div class='del'>-	comp_editor_set_cal_client (COMP_EDITOR (tedit), priv-&gt;task_pad_client);</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	category = cal_search_bar_get_category (CAL_SEARCH_BAR (priv-&gt;search_bar));</div><div class='del'>-	cal_component_set_categories (comp, category);</div><div class='del'>-</div><div class='del'>-	comp_editor_edit_comp (COMP_EDITOR (tedit), comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	comp_editor_focus (COMP_EDITOR (tedit));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range for the current view. Note that this may be</div><div class='del'>-   different from the fields in the GnomeCalendar, since the view may clip</div><div class='del'>-   this or choose a more appropriate time. */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,</div><div class='del'>-				       time_t	 *start_time,</div><div class='del'>-				       time_t	 *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		e_day_view_get_selected_time_range (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-						    start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		e_day_view_get_selected_time_range (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-						    start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		e_week_view_get_selected_time_range (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-						     start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		e_week_view_get_selected_time_range (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-						     start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("My penguin is gone!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range for the current view. Returns FALSE if no</div><div class='del'>-   time range has been set yet. */</div><div class='del'>-gboolean</div><div class='del'>-gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,</div><div class='del'>-				       time_t	 *start_time,</div><div class='del'>-				       time_t	 *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		retval = e_day_view_get_visible_time_range (E_DAY_VIEW (priv-&gt;day_view), start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		retval = e_day_view_get_visible_time_range (E_DAY_VIEW (priv-&gt;work_week_view), start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		retval = e_week_view_get_visible_time_range (E_WEEK_VIEW (priv-&gt;week_view), start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		retval = e_week_view_get_visible_time_range (E_WEEK_VIEW (priv-&gt;month_view), start_time, end_time);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_days_shown (GnomeCalendar *gcal, GDate *start_date, gint *days_shown)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;current_view_type) {</div><div class='del'>-	case GNOME_CAL_DAY_VIEW:</div><div class='del'>-		time_to_gdate_with_zone (start_date,</div><div class='del'>-					 E_DAY_VIEW (priv-&gt;day_view)-&gt;lower,</div><div class='del'>-					 priv-&gt;zone);</div><div class='del'>-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (priv-&gt;day_view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WORK_WEEK_VIEW:</div><div class='del'>-		time_to_gdate_with_zone (start_date,</div><div class='del'>-					 E_DAY_VIEW (priv-&gt;work_week_view)-&gt;lower,</div><div class='del'>-					 priv-&gt;zone);</div><div class='del'>-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (priv-&gt;work_week_view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_WEEK_VIEW:</div><div class='del'>-		*start_date = E_WEEK_VIEW (priv-&gt;week_view)-&gt;first_day_shown;</div><div class='del'>-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (priv-&gt;week_view)))</div><div class='del'>-			*days_shown = e_week_view_get_weeks_shown (</div><div class='del'>-				E_WEEK_VIEW (priv-&gt;week_view)) * 7;</div><div class='del'>-		else</div><div class='del'>-			*days_shown = 7;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_CAL_MONTH_VIEW:</div><div class='del'>-		*start_date = E_WEEK_VIEW (priv-&gt;month_view)-&gt;first_day_shown;</div><div class='del'>-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (priv-&gt;month_view)))</div><div class='del'>-			*days_shown = e_week_view_get_weeks_shown (</div><div class='del'>-				E_WEEK_VIEW (priv-&gt;month_view)) * 7;</div><div class='del'>-		else</div><div class='del'>-			*days_shown = 7;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the month shown and the days selected in the calendar, if</div><div class='del'>-   necessary. */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_date_navigator (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GDate start_date, end_date;</div><div class='del'>-	gint days_shown;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the ECalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (priv-&gt;date_navigator))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	get_days_shown (gcal, &amp;start_date, &amp;days_shown);</div><div class='del'>-</div><div class='del'>-	end_date = start_date;</div><div class='del'>-	g_date_add_days (&amp;end_date, days_shown - 1);</div><div class='del'>-</div><div class='del'>-	e_calendar_item_set_selection (priv-&gt;date_navigator-&gt;calitem,</div><div class='del'>-				       &amp;start_date, &amp;end_date);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,</div><div class='del'>-						    GnomeCalendar    *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GDate start_date, end_date, new_start_date, new_end_date;</div><div class='del'>-	gint days_shown, new_days_shown;</div><div class='del'>-	gboolean starts_on_week_start_day;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	starts_on_week_start_day = FALSE;</div><div class='del'>-</div><div class='del'>-	get_days_shown (gcal, &amp;start_date, &amp;days_shown);</div><div class='del'>-</div><div class='del'>-	end_date = start_date;</div><div class='del'>-	g_date_add_days (&amp;end_date, days_shown - 1);</div><div class='del'>-</div><div class='del'>-	e_calendar_item_get_selection (calitem, &amp;new_start_date, &amp;new_end_date);</div><div class='del'>-</div><div class='del'>-	/* If the selection hasn't changed just return. */</div><div class='del'>-	if (!g_date_compare (&amp;start_date, &amp;new_start_date)</div><div class='del'>-	    &amp;&amp; !g_date_compare (&amp;end_date, &amp;new_end_date))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	new_days_shown = g_date_julian (&amp;new_end_date) - g_date_julian (&amp;new_start_date) + 1;</div><div class='del'>-</div><div class='del'>-	/* If a complete week is selected we show the Week view.</div><div class='del'>-	   Note that if weekends are compressed and the week start day is set</div><div class='del'>-	   to Sunday we don't actually show complete weeks in the Week view,</div><div class='del'>-	   so this may need tweaking. */</div><div class='del'>-	if (g_date_weekday (&amp;new_start_date) % 7 == calendar_config_get_week_start_day ())</div><div class='del'>-		starts_on_week_start_day = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Switch views as appropriate, and change the number of days or weeks</div><div class='del'>-	   shown. */</div><div class='del'>-	if (new_days_shown &gt; 9) {</div><div class='del'>-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					     (new_days_shown + 6) / 7);</div><div class='del'>-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv-&gt;month_view), &amp;new_start_date);</div><div class='del'>-</div><div class='del'>-		set_view (gcal, GNOME_CAL_MONTH_VIEW, TRUE, FALSE);</div><div class='del'>-		gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-		gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-	} else if (new_days_shown == 7 &amp;&amp; starts_on_week_start_day) {</div><div class='del'>-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv-&gt;week_view), &amp;new_start_date);</div><div class='del'>-</div><div class='del'>-		set_view (gcal, GNOME_CAL_WEEK_VIEW, TRUE, FALSE);</div><div class='del'>-		gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-		gnome_calendar_notify_dates_shown_changed (gcal);</div><div class='del'>-	} else {</div><div class='del'>-		gint start_year, start_month, start_day;</div><div class='del'>-		gint end_year, end_month, end_day;</div><div class='del'>-		struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-		start_year = g_date_year (&amp;new_start_date);</div><div class='del'>-		start_month = g_date_month (&amp;new_start_date);</div><div class='del'>-		start_day = g_date_day (&amp;new_start_date);</div><div class='del'>-		end_year = g_date_year (&amp;new_end_date);</div><div class='del'>-		end_month = g_date_month (&amp;new_end_date);</div><div class='del'>-		end_day = g_date_day (&amp;new_end_date);</div><div class='del'>-</div><div class='del'>-		tt = icaltime_null_time ();</div><div class='del'>-		tt.year = start_year;</div><div class='del'>-		tt.month  = start_month;</div><div class='del'>-		tt.day = start_day;</div><div class='del'>-		priv-&gt;selection_start_time = icaltime_as_timet_with_zone (tt, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		tt = icaltime_null_time ();</div><div class='del'>-		tt.year = end_year;</div><div class='del'>-		tt.month  = end_month;</div><div class='del'>-		tt.day = end_day;</div><div class='del'>-		icaltime_adjust (&amp;tt, 1, 0, 0, 0);</div><div class='del'>-		priv-&gt;selection_end_time = icaltime_as_timet_with_zone (tt, priv-&gt;zone);</div><div class='del'>-</div><div class='del'>-		e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;day_view), new_days_shown);</div><div class='del'>-		gnome_calendar_set_view (gcal, GNOME_CAL_DAY_VIEW, TRUE, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	focus_current_view (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,</div><div class='del'>-						     GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	update_query (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_style_set (GtkWidget     *widget,</div><div class='del'>-					    GtkStyle      *previous_style,</div><div class='del'>-					    gpointer       data)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_update_paned_quanta (GNOME_CALENDAR (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint row_height, col_width;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-				    &amp;top_border, &amp;bottom_border,</div><div class='del'>-				    &amp;left_border, &amp;right_border);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"row_height", &amp;row_height,</div><div class='del'>-			"column_width", &amp;col_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* The EPaned quantum feature works better if we add on the calendar</div><div class='del'>-	   borders to the quantum size. Otherwise if you shrink the date</div><div class='del'>-	   navigator you get left with the border widths/heights which looks</div><div class='del'>-	   bad. EPaned should be more flexible really. */</div><div class='del'>-	col_width += left_border + right_border;</div><div class='del'>-	row_height += top_border + bottom_border;</div><div class='del'>-</div><div class='del'>-	/* We don't have to use the EPaned quantum feature. We could just let</div><div class='del'>-	   the calendar expand to fill the allocated space, showing as many</div><div class='del'>-	   months as will fit. But for that to work nicely the EPaned should</div><div class='del'>-	   resize the widgets as the bar is dragged. Otherwise the user has</div><div class='del'>-	   to mess around to get the number of months that they want. */</div><div class='del'>-#if 1</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;hpane),</div><div class='del'>-			"quantum", (guint) col_width,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;vpane),</div><div class='del'>-			"quantum", (guint) row_height,</div><div class='del'>-			NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_pane_positions (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,</div><div class='del'>-						GtkAllocation *allocation,</div><div class='del'>-						gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint width, height, row_height, col_width;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-	gfloat hpane_pos, vpane_pos;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-				    &amp;top_border, &amp;bottom_border,</div><div class='del'>-				    &amp;left_border, &amp;right_border);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"row_height", &amp;row_height,</div><div class='del'>-			"column_width", &amp;col_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* We subtract one from each dimension since we added 1 in</div><div class='del'>-	   set_view(). */</div><div class='del'>-	width = allocation-&gt;width - 1;</div><div class='del'>-	height = allocation-&gt;height - 1;</div><div class='del'>-</div><div class='del'>-	/* We add the border sizes to work around the EPaned</div><div class='del'>-	   quantized feature. */</div><div class='del'>-	col_width += left_border + right_border;</div><div class='del'>-	row_height += top_border + bottom_border;</div><div class='del'>-</div><div class='del'>-	hpane_pos = (gfloat) width / col_width;</div><div class='del'>-	vpane_pos = (gfloat) height / row_height;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current_view_type == GNOME_CAL_MONTH_VIEW &amp;&amp; !priv-&gt;range_selected) {</div><div class='del'>-		priv-&gt;hpane_pos_month_view = hpane_pos;</div><div class='del'>-		priv-&gt;vpane_pos_month_view = vpane_pos;</div><div class='del'>-		calendar_config_set_month_hpane_pos (hpane_pos);</div><div class='del'>-		calendar_config_set_month_vpane_pos (vpane_pos);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;hpane_pos = hpane_pos;</div><div class='del'>-		priv-&gt;vpane_pos = vpane_pos;</div><div class='del'>-		calendar_config_set_hpane_pos (hpane_pos);</div><div class='del'>-		calendar_config_set_vpane_pos (vpane_pos);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_cut_clipboard (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	FocusLocation location;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	location = get_focus_location (gcal);</div><div class='del'>-</div><div class='del'>-	if (location == FOCUS_CALENDAR) {</div><div class='del'>-		switch (priv-&gt;current_view_type) {</div><div class='del'>-		case GNOME_CAL_DAY_VIEW :</div><div class='del'>-			e_day_view_cut_clipboard (E_DAY_VIEW (priv-&gt;day_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WORK_WEEK_VIEW :</div><div class='del'>-			e_day_view_cut_clipboard (E_DAY_VIEW (priv-&gt;work_week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WEEK_VIEW :</div><div class='del'>-			e_week_view_cut_clipboard (E_WEEK_VIEW (priv-&gt;week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_MONTH_VIEW :</div><div class='del'>-			e_week_view_cut_clipboard (E_WEEK_VIEW (priv-&gt;month_view));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	} else if (location == FOCUS_TASKPAD)</div><div class='del'>-		e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_copy_clipboard (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	FocusLocation location;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	location = get_focus_location (gcal);</div><div class='del'>-</div><div class='del'>-	if (location == FOCUS_CALENDAR) {</div><div class='del'>-		switch (priv-&gt;current_view_type) {</div><div class='del'>-		case GNOME_CAL_DAY_VIEW :</div><div class='del'>-			e_day_view_copy_clipboard (E_DAY_VIEW (priv-&gt;day_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WORK_WEEK_VIEW :</div><div class='del'>-			e_day_view_copy_clipboard (E_DAY_VIEW (priv-&gt;work_week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WEEK_VIEW :</div><div class='del'>-			e_week_view_copy_clipboard (E_WEEK_VIEW (priv-&gt;week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_MONTH_VIEW :</div><div class='del'>-			e_week_view_copy_clipboard (E_WEEK_VIEW (priv-&gt;month_view));</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	} else if (location == FOCUS_TASKPAD)</div><div class='del'>-		e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_paste_clipboard (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	FocusLocation location;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	location = get_focus_location (gcal);</div><div class='del'>-</div><div class='del'>-	if (location == FOCUS_CALENDAR) {</div><div class='del'>-		switch (priv-&gt;current_view_type) {</div><div class='del'>-		case GNOME_CAL_DAY_VIEW :</div><div class='del'>-			e_day_view_paste_clipboard (E_DAY_VIEW (priv-&gt;day_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WORK_WEEK_VIEW :</div><div class='del'>-			e_day_view_paste_clipboard (E_DAY_VIEW (priv-&gt;work_week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_WEEK_VIEW :</div><div class='del'>-			e_week_view_paste_clipboard (E_WEEK_VIEW (priv-&gt;week_view));</div><div class='del'>-			break;</div><div class='del'>-		case GNOME_CAL_MONTH_VIEW :</div><div class='del'>-			e_week_view_paste_clipboard (E_WEEK_VIEW (priv-&gt;month_view));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (location == FOCUS_TASKPAD)</div><div class='del'>-		e_calendar_table_paste_clipboard (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Get the current timezone. */</div><div class='del'>-icaltimezone*</div><div class='del'>-gnome_calendar_get_timezone	(GnomeCalendar	*gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	return gcal-&gt;priv-&gt;zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If no time range is set yet, just return. */</div><div class='del'>-	if (!gnome_calendar_get_visible_time_range (gcal, &amp;start_time,</div><div class='del'>-						    &amp;end_time))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We check if the visible date range has changed, and only emit the</div><div class='del'>-	   signal if it has. (This makes sure we only change the folder title</div><div class='del'>-	   bar label in the shell when we need to.) */</div><div class='del'>-	if (priv-&gt;visible_start != start_time</div><div class='del'>-	    || priv-&gt;visible_end != end_time) {</div><div class='del'>-		priv-&gt;visible_start = start_time;</div><div class='del'>-		priv-&gt;visible_end = end_time;</div><div class='del'>-</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (gcal),</div><div class='del'>-				 gnome_calendar_signals[DATES_SHOWN_CHANGED]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint</div><div class='del'>-gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *view;</div><div class='del'>-	gint retval = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), 0);</div><div class='del'>-</div><div class='del'>-	view = gnome_calendar_get_current_view_widget (gcal);</div><div class='del'>-	if (E_IS_DAY_VIEW (view))</div><div class='del'>-		retval = e_day_view_get_num_events_selected (E_DAY_VIEW (view));</div><div class='del'>-	else</div><div class='del'>-		retval = e_week_view_get_num_events_selected (E_WEEK_VIEW (view));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_num_tasks_selected:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- * </div><div class='del'>- * Queries the number of tasks that are currently selected in the task pad of a</div><div class='del'>- * calendar view.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of selected tasks.</div><div class='del'>- **/</div><div class='del'>-gint</div><div class='del'>-gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), -1);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	return e_table_selected_count (etable);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_delete_selection		(GnomeCalendar  *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	FocusLocation location;</div><div class='del'>-	GtkWidget *view;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	location = get_focus_location (gcal);</div><div class='del'>-</div><div class='del'>-	if (location == FOCUS_CALENDAR) {</div><div class='del'>-		view = gnome_calendar_get_current_view_widget (gcal);</div><div class='del'>-</div><div class='del'>-		if (E_IS_DAY_VIEW (view))</div><div class='del'>-			e_day_view_delete_event (E_DAY_VIEW (view));</div><div class='del'>-		else</div><div class='del'>-			e_week_view_delete_event (E_WEEK_VIEW (view));</div><div class='del'>-	} else if (location == FOCUS_TASKPAD)</div><div class='del'>-		e_calendar_table_delete_selected (E_CALENDAR_TABLE (priv-&gt;todo));</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ECalendarTable*</div><div class='del'>-gnome_calendar_get_task_pad	(GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	return E_CALENDAR_TABLE (gcal-&gt;priv-&gt;todo);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h<br/>deleted file mode 100644<br/>index ebad45c99f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/gnome-cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,176 +0,0 @@</div><div class='del'>-/* Evolution calendar - Main calendar view widget</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 The Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Seth Alves &lt;alves@hungry.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef GNOME_CALENDAR_APP_H</div><div class='del'>-#define GNOME_CALENDAR_APP_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-calendar.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-calendar-table.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())</div><div class='del'>-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))</div><div class='del'>-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\</div><div class='del'>-					GnomeCalendarClass))</div><div class='del'>-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))</div><div class='del'>-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))</div><div class='del'>-</div><div class='del'>-typedef struct _GnomeCalendar GnomeCalendar;</div><div class='del'>-typedef struct _GnomeCalendarClass GnomeCalendarClass;</div><div class='del'>-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;</div><div class='del'>-</div><div class='del'>-/* View types */</div><div class='del'>-typedef enum {</div><div class='del'>-	GNOME_CAL_DAY_VIEW,</div><div class='del'>-	GNOME_CAL_WORK_WEEK_VIEW,</div><div class='del'>-	GNOME_CAL_WEEK_VIEW,</div><div class='del'>-	GNOME_CAL_MONTH_VIEW</div><div class='del'>-} GnomeCalendarViewType;</div><div class='del'>-</div><div class='del'>-struct _GnomeCalendar {</div><div class='del'>-	GtkVBox vbox;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _GnomeCalendarClass {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* dates_shown_changed)    (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-	void (* calendar_selection_changed) (GnomeCalendar *gcal);</div><div class='del'>-	void (* taskpad_selection_changed) (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-	void (* calendar_focus_change)  (GnomeCalendar *gcal, gboolean in);</div><div class='del'>-	void (* taskpad_focus_change)   (GnomeCalendar *gcal, gboolean in);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    gnome_calendar_get_type         	(void);</div><div class='del'>-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-GtkWidget *gnome_calendar_new			(void);</div><div class='del'>-</div><div class='del'>-void gnome_calendar_set_ui_component (GnomeCalendar *cal,</div><div class='del'>-				      BonoboUIComponent *ui_component);</div><div class='del'>-</div><div class='del'>-ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);</div><div class='del'>-CalClient *gnome_calendar_get_task_pad_cal_client(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-gboolean   gnome_calendar_open                  (GnomeCalendar *gcal, const char *str_uri);</div><div class='del'>-</div><div class='del'>-void gnome_calendar_set_query (GnomeCalendar *gcal, const char *sexp);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_next             	(GnomeCalendar *gcal);</div><div class='del'>-void       gnome_calendar_previous         	(GnomeCalendar *gcal);</div><div class='del'>-void       gnome_calendar_goto             	(GnomeCalendar *gcal,</div><div class='del'>-						 time_t new_time);</div><div class='del'>-void       gnome_calendar_dayjump          	(GnomeCalendar *gcal,</div><div class='del'>-						 time_t time);</div><div class='del'>-/* Jumps to the current day */</div><div class='del'>-void       gnome_calendar_goto_today            (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-GnomeCalendarViewType gnome_calendar_get_view (GnomeCalendar *gcal);</div><div class='del'>-void gnome_calendar_set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type,</div><div class='del'>-			      gboolean range_selected, gboolean grab_focus);</div><div class='del'>-</div><div class='del'>-void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic);</div><div class='del'>-void gnome_calendar_discard_view_menus (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-EPopupMenu *gnome_calendar_setup_view_popup (GnomeCalendar *gcal);</div><div class='del'>-void gnome_calendar_discard_view_popup (GnomeCalendar *gcal, EPopupMenu *popup);</div><div class='del'>-</div><div class='del'>-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-						   time_t	  start_time,</div><div class='del'>-						   time_t	  end_time);</div><div class='del'>-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-						   time_t	 *start_time,</div><div class='del'>-						   time_t	 *end_time);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,</div><div class='del'>-						 CalComponent  *comp,</div><div class='del'>-						 gboolean meeting);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);</div><div class='del'>-void       gnome_calendar_new_appointment_for   (GnomeCalendar *cal,</div><div class='del'>-						 time_t dtstart, time_t dtend,</div><div class='del'>-						 gboolean all_day,</div><div class='del'>-						 gboolean meeting);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_new_task		(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range for the current view. Note that this may be</div><div class='del'>-   different from the fields in the GnomeCalendar, since the view may clip</div><div class='del'>-   this or choose a more appropriate time. */</div><div class='del'>-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,</div><div class='del'>-						  time_t	 *start_time,</div><div class='del'>-						  time_t	 *end_time);</div><div class='del'>-</div><div class='del'>-/* Gets the visible time range for the current view. Returns FALSE if no</div><div class='del'>-   time range has been set yet. */</div><div class='del'>-gboolean   gnome_calendar_get_visible_time_range (GnomeCalendar *gcal,</div><div class='del'>-						  time_t	 *start_time,</div><div class='del'>-						  time_t	 *end_time);</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected events (0 or 1 at present). */</div><div class='del'>-gint	   gnome_calendar_get_num_events_selected (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Returns the number of selected tasks */</div><div class='del'>-gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Tells the calendar to reload all config settings. initializing should be</div><div class='del'>-   TRUE when we are setting the config settings for the first time. */</div><div class='del'>-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,</div><div class='del'>-						  gboolean	 initializing);</div><div class='del'>-</div><div class='del'>-/* Get the current timezone. */</div><div class='del'>-icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Clipboard operations */</div><div class='del'>-void       gnome_calendar_cut_clipboard         (GnomeCalendar  *gcal);</div><div class='del'>-void       gnome_calendar_copy_clipboard        (GnomeCalendar  *gcal);</div><div class='del'>-void       gnome_calendar_paste_clipboard       (GnomeCalendar  *gcal);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_delete_selection	(GnomeCalendar  *gcal);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png<br/>deleted file mode 100644<br/>index e867ba90b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-calendar-conduit.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/gnome-calendar-conduit.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/calendar/gui/goto-dialog.glade b/calendar/gui/goto-dialog.glade<br/>deleted file mode 100644<br/>index 289ad7ab69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/goto-dialog.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/goto-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;preferences&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;preferences&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;goto-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Go To Date&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button4&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Go To Today&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_JUMP_TO&lt;/stock_pixmap&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button5&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox12&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;month&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;items&gt;January</div><div class='del'>-February</div><div class='del'>-March</div><div class='del'>-April</div><div class='del'>-May</div><div class='del'>-June</div><div class='del'>-July</div><div class='del'>-August</div><div class='del'>-September</div><div class='del'>-October</div><div class='del'>-November</div><div class='del'>-December</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;year&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	  &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	  &lt;numeric&gt;True&lt;/numeric&gt;</div><div class='del'>-	  &lt;update_policy&gt;GTK_UPDATE_IF_VALID&lt;/update_policy&gt;</div><div class='del'>-	  &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;value&gt;1969&lt;/value&gt;</div><div class='del'>-	  &lt;lower&gt;1969&lt;/lower&gt;</div><div class='del'>-	  &lt;upper&gt;2038&lt;/upper&gt;</div><div class='del'>-	  &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	  &lt;page&gt;5&lt;/page&gt;</div><div class='del'>-	  &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c<br/>deleted file mode 100644<br/>index 06250a1a70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/goto.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/goto.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,257 +0,0 @@</div><div class='del'>-/* Go to date dialog for Evolution</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@ximian.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "tag-calendar.h"</div><div class='del'>-#include "goto.h"</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-	GtkWidget *dialog;	</div><div class='del'>-</div><div class='del'>-	GtkWidget *month;</div><div class='del'>-	GtkWidget *year;</div><div class='del'>-	ECalendar *ecal;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	gint year_val;</div><div class='del'>-	gint month_val;</div><div class='del'>-	gint day_val;</div><div class='del'>-	</div><div class='del'>-} GoToDialog;</div><div class='del'>-</div><div class='del'>-GoToDialog *dlg = NULL;</div><div class='del'>-</div><div class='del'>-/* Callback used when the year adjustment is changed */</div><div class='del'>-static void</div><div class='del'>-year_changed (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GoToDialog *dlg = data;</div><div class='del'>-</div><div class='del'>-	dlg-&gt;year_val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dlg-&gt;year));</div><div class='del'>-	e_calendar_item_set_first_month (dlg-&gt;ecal-&gt;calitem, dlg-&gt;year_val, dlg-&gt;month_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a month button is toggled */</div><div class='del'>-static void</div><div class='del'>-month_changed (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GoToDialog *dlg = data;</div><div class='del'>-	GtkWidget *menu, *active;</div><div class='del'>-	</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg-&gt;month));</div><div class='del'>-	active = gtk_menu_get_active (GTK_MENU (menu));</div><div class='del'>-	dlg-&gt;month_val = g_list_index (GTK_MENU_SHELL (menu)-&gt;children, active);</div><div class='del'>-</div><div class='del'>-	e_calendar_item_set_first_month (dlg-&gt;ecal-&gt;calitem, dlg-&gt;year_val, dlg-&gt;month_val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GoToDialog *dlg = user_data;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	</div><div class='del'>-	client = gnome_calendar_get_cal_client (dlg-&gt;gcal);</div><div class='del'>-	if (client)</div><div class='del'>-		tag_calendar_by_client (dlg-&gt;ecal, client);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for day groups in the month item.  A button press makes the calendar jump to the</div><div class='del'>- * selected day and destroys the Go-to dialog box.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ecal_event (ECalendarItem *calitem, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GoToDialog *dlg = user_data;</div><div class='del'>-	GDate start_date, end_date;</div><div class='del'>-	struct icaltimetype tt = icaltime_null_time ();</div><div class='del'>-	time_t et;</div><div class='del'>-	</div><div class='del'>-	e_calendar_item_get_selection (calitem, &amp;start_date, &amp;end_date);</div><div class='del'>-</div><div class='del'>-	tt.year = g_date_year (&amp;start_date);</div><div class='del'>-	tt.month = g_date_month (&amp;start_date);</div><div class='del'>-	tt.day = g_date_day (&amp;start_date);</div><div class='del'>-</div><div class='del'>-	et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg-&gt;gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_goto (dlg-&gt;gcal, et);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dlg-&gt;dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the current time, for the ECalendarItem. */</div><div class='del'>-static struct tm</div><div class='del'>-get_current_time (ECalendarItem *calitem, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *location;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Get the current timezone. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time (NULL), FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Now copy it to the struct tm and return it. */</div><div class='del'>-	tmp_tm.tm_year  = tt.year - 1900;</div><div class='del'>-	tmp_tm.tm_mon   = tt.month - 1;</div><div class='del'>-	tmp_tm.tm_mday  = tt.day;</div><div class='del'>-	tmp_tm.tm_hour  = tt.hour;</div><div class='del'>-	tmp_tm.tm_min   = tt.minute;</div><div class='del'>-	tmp_tm.tm_sec   = tt.second;</div><div class='del'>-	tmp_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	return tmp_tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the ecalendar */</div><div class='del'>-static void</div><div class='del'>-create_ecal (GoToDialog *dlg)</div><div class='del'>-{</div><div class='del'>-	ECalendarItem *calitem;</div><div class='del'>-	</div><div class='del'>-	dlg-&gt;ecal = E_CALENDAR (e_calendar_new ());</div><div class='del'>-	calitem = dlg-&gt;ecal-&gt;calitem;</div><div class='del'>-	</div><div class='del'>-	e_calendar_item_set_display_popup (calitem, FALSE);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (dlg-&gt;ecal));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (dlg-&gt;vbox), GTK_WIDGET (dlg-&gt;ecal), TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	e_calendar_item_set_first_month (calitem, dlg-&gt;year_val, dlg-&gt;month_val);</div><div class='del'>-	e_calendar_item_set_get_time_callback (calitem,</div><div class='del'>-					       get_current_time,</div><div class='del'>-					       dlg, NULL);</div><div class='del'>-	</div><div class='del'>-	ecal_date_range_changed (calitem, dlg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-goto_today (GoToDialog *dlg)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_goto_today (dlg-&gt;gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the widgets from the XML file and returns if they are all available. */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (GoToDialog *dlg)</div><div class='del'>-{</div><div class='del'>-#define GW(name) glade_xml_get_widget (dlg-&gt;xml, name)</div><div class='del'>-</div><div class='del'>-	dlg-&gt;dialog = GW ("goto-dialog");</div><div class='del'>-</div><div class='del'>-	dlg-&gt;month = GW ("month");</div><div class='del'>-	dlg-&gt;year = GW ("year");</div><div class='del'>-	dlg-&gt;vbox = GW ("vbox");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (dlg-&gt;dialog</div><div class='del'>-		&amp;&amp; dlg-&gt;month</div><div class='del'>-		&amp;&amp; dlg-&gt;year</div><div class='del'>-		&amp;&amp; dlg-&gt;vbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-goto_dialog_init_widgets (GoToDialog *dlg) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg-&gt;month));</div><div class='del'>-	for (l = GTK_MENU_SHELL (menu)-&gt;children; l != NULL; l = l-&gt;next)</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-				    GTK_SIGNAL_FUNC (month_changed), dlg);</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dlg-&gt;year));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-			    (GtkSignalFunc) year_changed, dlg);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dlg-&gt;ecal-&gt;calitem),</div><div class='del'>-			    "date_range_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (ecal_date_range_changed),</div><div class='del'>-			    dlg);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dlg-&gt;ecal-&gt;calitem),</div><div class='del'>-			    "selection_changed",</div><div class='del'>-			    (GtkSignalFunc) ecal_event,</div><div class='del'>-			    dlg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a "goto date" dialog and runs it */</div><div class='del'>-void</div><div class='del'>-goto_dialog (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	time_t start_time;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	int b;</div><div class='del'>-</div><div class='del'>-	if (dlg) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	dlg = g_new0 (GoToDialog, 1);</div><div class='del'>-	</div><div class='del'>-	/* Load the content widgets */</div><div class='del'>-	dlg-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/goto-dialog.glade", NULL);</div><div class='del'>-	if (!dlg-&gt;xml) {</div><div class='del'>-		g_message ("goto_dialog(): Could not load the Glade XML file!");</div><div class='del'>-		g_free (dlg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (dlg)) {</div><div class='del'>-		g_message ("goto_dialog(): Could not find all widgets in the XML file!");</div><div class='del'>-		g_free (dlg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	dlg-&gt;gcal = gcal;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_selected_time_range (dlg-&gt;gcal, &amp;start_time, NULL);</div><div class='del'>-	tt = icaltime_from_timet_with_zone (start_time, FALSE, gnome_calendar_get_timezone (gcal));</div><div class='del'>-	dlg-&gt;year_val = tt.year;</div><div class='del'>-	dlg-&gt;month_val = tt.month - 1;</div><div class='del'>-	dlg-&gt;day_val = tt.day;</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg-&gt;month));</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (dlg-&gt;month), dlg-&gt;month_val);</div><div class='del'>-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg-&gt;year), dlg-&gt;year_val);</div><div class='del'>-	</div><div class='del'>-	create_ecal (dlg);</div><div class='del'>-</div><div class='del'>-	goto_dialog_init_widgets (dlg);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (dlg-&gt;dialog),</div><div class='del'>-				 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-</div><div class='del'>-	b = gnome_dialog_run_and_close (GNOME_DIALOG (dlg-&gt;dialog));</div><div class='del'>-	if (b == 0)</div><div class='del'>-		goto_today (dlg);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (dlg-&gt;xml));</div><div class='del'>-	g_free (dlg);</div><div class='del'>-	dlg = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h<br/>deleted file mode 100644<br/>index 9ecfeeeb83..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/goto.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/goto.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* Evolution calendar - Go To Date dialog</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Red Hat, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena &lt;federico@ximian.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef GOTO_DIALOG_H</div><div class='del'>-#define GOTO_DIALOG_H</div><div class='del'>-</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-void goto_dialog (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c<br/>deleted file mode 100644<br/>index d05cee6d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-bonobo-control.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-bonobo-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,252 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Control for displaying iTIP mail messages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Jesse Pavel &lt;jpavel@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-stream.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-client.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-itip-control.h"</div><div class='del'>-#include "itip-control-factory.h"</div><div class='del'>-</div><div class='del'>-extern gchar *evolution_dir;</div><div class='del'>-</div><div class='del'>-enum E_ITIP_BONOBO_ARGS {</div><div class='del'>-	FROM_ADDRESS_ARG_ID,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bonobo::PersistStream</div><div class='del'>- *</div><div class='del'>- * These two functions implement the Bonobo::PersistStream load and</div><div class='del'>- * save methods which allow data to be loaded into and out of the</div><div class='del'>- * BonoboObject.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-stream_read (Bonobo_Stream stream)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gchar *data = NULL;</div><div class='del'>-	gint length = 0;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	do {</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,</div><div class='del'>-				    &amp;buffer, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data = g_realloc (data, length + buffer-&gt;_length + 1);</div><div class='del'>-		memcpy (data + length, buffer-&gt;_buffer, buffer-&gt;_length);</div><div class='del'>-		length += buffer-&gt;_length;</div><div class='del'>-		data[length] = '\0';</div><div class='del'>-		</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-#undef READ_CHUNK_SIZE</div><div class='del'>-	} while (1);</div><div class='del'>-	</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (data == NULL)</div><div class='del'>-		data = g_strdup("");</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-} /* stream_read */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:load method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gchar *text;</div><div class='del'>-	</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {</div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((text = stream_read (stream)) == NULL) {</div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_FileNotFound);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_itip_control_set_data (itip, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:save method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gchar *text;</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    </div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	text = e_itip_control_get_data (itip);</div><div class='del'>-	len = e_itip_control_get_data_size (itip);</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_write (stream, text, len, ev);</div><div class='del'>-	g_free (text);</div><div class='del'>-} /* pstream_save */</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-pstream_get_max_size (BonoboPersistStream *ps, void *data,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gint len;</div><div class='del'>-	</div><div class='del'>-	len = e_itip_control_get_data_size (itip);</div><div class='del'>-	</div><div class='del'>-  	if (len &gt; 0)</div><div class='del'>-		return len;</div><div class='del'>-</div><div class='del'>-	return 0L;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-pstream_get_content_types (BonoboPersistStream *ps, void *closure,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag, </div><div class='del'>-	   BonoboArg *arg,</div><div class='del'>-	   guint arg_id, 	      </div><div class='del'>-	   CORBA_Environment *ev,</div><div class='del'>-	   gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case FROM_ADDRESS_ARG_ID:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop ( BonoboPropertyBag *bag, </div><div class='del'>-	   const BonoboArg *arg,</div><div class='del'>-	   guint arg_id, </div><div class='del'>-	   CORBA_Environment *ev,</div><div class='del'>-	   gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case FROM_ADDRESS_ARG_ID:</div><div class='del'>-		e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-itip_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl      *control;</div><div class='del'>-	BonoboPropertyBag *prop_bag;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	GtkWidget *itip;</div><div class='del'>-</div><div class='del'>-	itip = e_itip_control_new ();</div><div class='del'>-	gtk_widget_show (itip);</div><div class='del'>-	control = bonobo_control_new (itip);</div><div class='del'>-	</div><div class='del'>-	/* create a property bag */</div><div class='del'>-	prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip);</div><div class='del'>-	bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,</div><div class='del'>-				 "from_address", 0 );</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, prop_bag);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (prop_bag));</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_automerge (control, TRUE);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,</div><div class='del'>-					    pstream_get_max_size,</div><div class='del'>-					    pstream_get_content_types,</div><div class='del'>-					    itip);</div><div class='del'>-</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (control));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				     BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-itip_control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (</div><div class='del'>-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",</div><div class='del'>-		itip_control_factory, NULL);</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));;</div><div class='del'>-	</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register an iTip control factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h<br/>deleted file mode 100644<br/>index 6f8a95ec71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-bonobo-control.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-bonobo-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Control for displaying iTIP mail messages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: </div><div class='del'>- *   Jesse Pavel &lt;jpavel@ximian.com&gt;</div><div class='del'>- *   JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ITIP_CONTROL_FACTORY_H__</div><div class='del'>-#define __ITIP_CONTROL_FACTORY_H__</div><div class='del'>-</div><div class='del'>-void             itip_control_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif /* __ITIP_CONTROL_H__ */</div><div class='head'>diff --git a/calendar/gui/itip-control-factory.c b/calendar/gui/itip-control-factory.c<br/>deleted file mode 100644<br/>index d05cee6d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-control-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,252 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Control for displaying iTIP mail messages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Jesse Pavel &lt;jpavel@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-stream.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-client.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-itip-control.h"</div><div class='del'>-#include "itip-control-factory.h"</div><div class='del'>-</div><div class='del'>-extern gchar *evolution_dir;</div><div class='del'>-</div><div class='del'>-enum E_ITIP_BONOBO_ARGS {</div><div class='del'>-	FROM_ADDRESS_ARG_ID,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bonobo::PersistStream</div><div class='del'>- *</div><div class='del'>- * These two functions implement the Bonobo::PersistStream load and</div><div class='del'>- * save methods which allow data to be loaded into and out of the</div><div class='del'>- * BonoboObject.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-stream_read (Bonobo_Stream stream)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gchar *data = NULL;</div><div class='del'>-	gint length = 0;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	do {</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,</div><div class='del'>-				    &amp;buffer, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data = g_realloc (data, length + buffer-&gt;_length + 1);</div><div class='del'>-		memcpy (data + length, buffer-&gt;_buffer, buffer-&gt;_length);</div><div class='del'>-		length += buffer-&gt;_length;</div><div class='del'>-		data[length] = '\0';</div><div class='del'>-		</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-#undef READ_CHUNK_SIZE</div><div class='del'>-	} while (1);</div><div class='del'>-	</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (data == NULL)</div><div class='del'>-		data = g_strdup("");</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-} /* stream_read */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:load method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gchar *text;</div><div class='del'>-	</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {</div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((text = stream_read (stream)) == NULL) {</div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_FileNotFound);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_itip_control_set_data (itip, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:save method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gchar *text;</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    </div><div class='del'>-		bonobo_exception_set (ev, ex_Bonobo_Persist_WrongDataType);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	text = e_itip_control_get_data (itip);</div><div class='del'>-	len = e_itip_control_get_data_size (itip);</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_write (stream, text, len, ev);</div><div class='del'>-	g_free (text);</div><div class='del'>-} /* pstream_save */</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-pstream_get_max_size (BonoboPersistStream *ps, void *data,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = data;</div><div class='del'>-	gint len;</div><div class='del'>-	</div><div class='del'>-	len = e_itip_control_get_data_size (itip);</div><div class='del'>-	</div><div class='del'>-  	if (len &gt; 0)</div><div class='del'>-		return len;</div><div class='del'>-</div><div class='del'>-	return 0L;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-pstream_get_content_types (BonoboPersistStream *ps, void *closure,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag, </div><div class='del'>-	   BonoboArg *arg,</div><div class='del'>-	   guint arg_id, 	      </div><div class='del'>-	   CORBA_Environment *ev,</div><div class='del'>-	   gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case FROM_ADDRESS_ARG_ID:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop ( BonoboPropertyBag *bag, </div><div class='del'>-	   const BonoboArg *arg,</div><div class='del'>-	   guint arg_id, </div><div class='del'>-	   CORBA_Environment *ev,</div><div class='del'>-	   gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EItipControl *itip = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case FROM_ADDRESS_ARG_ID:</div><div class='del'>-		e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-itip_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl      *control;</div><div class='del'>-	BonoboPropertyBag *prop_bag;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	GtkWidget *itip;</div><div class='del'>-</div><div class='del'>-	itip = e_itip_control_new ();</div><div class='del'>-	gtk_widget_show (itip);</div><div class='del'>-	control = bonobo_control_new (itip);</div><div class='del'>-	</div><div class='del'>-	/* create a property bag */</div><div class='del'>-	prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip);</div><div class='del'>-	bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL,</div><div class='del'>-				 "from_address", 0 );</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, prop_bag);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (prop_bag));</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_automerge (control, TRUE);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,</div><div class='del'>-					    pstream_get_max_size,</div><div class='del'>-					    pstream_get_content_types,</div><div class='del'>-					    itip);</div><div class='del'>-</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (control));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				     BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-itip_control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (</div><div class='del'>-		"OAFIID:GNOME_Evolution_Calendar_iTip_ControlFactory",</div><div class='del'>-		itip_control_factory, NULL);</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));;</div><div class='del'>-	</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register an iTip control factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/itip-control-factory.h b/calendar/gui/itip-control-factory.h<br/>deleted file mode 100644<br/>index 6f8a95ec71..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-control-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-control-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Control for displaying iTIP mail messages</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: </div><div class='del'>- *   Jesse Pavel &lt;jpavel@ximian.com&gt;</div><div class='del'>- *   JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __ITIP_CONTROL_FACTORY_H__</div><div class='del'>-#define __ITIP_CONTROL_FACTORY_H__</div><div class='del'>-</div><div class='del'>-void             itip_control_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif /* __ITIP_CONTROL_H__ */</div><div class='head'>diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c<br/>deleted file mode 100644<br/>index 7e9efdbb57..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,820 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *  JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object-client.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;Evolution-Composer.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-util.h&gt;</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "itip-utils.h"</div><div class='del'>-</div><div class='del'>-#define GNOME_EVOLUTION_COMPOSER_OAFIID "OAFIID:GNOME_Evolution_Mail_Composer"</div><div class='del'>-</div><div class='del'>-static gchar *itip_methods[] = {</div><div class='del'>-	"PUBLISH",</div><div class='del'>-	"REQUEST",</div><div class='del'>-	"REPLY",</div><div class='del'>-	"ADD",</div><div class='del'>-	"CANCEL",</div><div class='del'>-	"RERESH",</div><div class='del'>-	"COUNTER",</div><div class='del'>-	"DECLINECOUNTER"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static icalproperty_method itip_methods_enum[] = {</div><div class='del'>-    ICAL_METHOD_PUBLISH,</div><div class='del'>-    ICAL_METHOD_REQUEST,</div><div class='del'>-    ICAL_METHOD_REPLY,</div><div class='del'>-    ICAL_METHOD_ADD,</div><div class='del'>-    ICAL_METHOD_CANCEL,</div><div class='del'>-    ICAL_METHOD_REFRESH,</div><div class='del'>-    ICAL_METHOD_COUNTER,</div><div class='del'>-    ICAL_METHOD_DECLINECOUNTER,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static Bonobo_ConfigDatabase db = NULL;</div><div class='del'>-</div><div class='del'>-static ItipAddress *</div><div class='del'>-get_address (long num) </div><div class='del'>-{</div><div class='del'>-	ItipAddress *a;</div><div class='del'>-	gchar *path;</div><div class='del'>-		</div><div class='del'>-	a = g_new0 (ItipAddress, 1);</div><div class='del'>-</div><div class='del'>-	/* get the identity info */</div><div class='del'>-	path = g_strdup_printf ("/Mail/Accounts/identity_name_%ld", num);</div><div class='del'>-	a-&gt;name = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("/Mail/Accounts/identity_address_%ld", num);</div><div class='del'>-	a-&gt;address = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-	a-&gt;address = g_strstrip (a-&gt;address);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	a-&gt;full = g_strdup_printf ("%s &lt;%s&gt;", a-&gt;name, a-&gt;address);</div><div class='del'>-</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-itip_addresses_get (void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GList *addresses = NULL;</div><div class='del'>-	glong len, def, i;</div><div class='del'>-</div><div class='del'>-	if (db == NULL) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>- </div><div class='del'>-		db = bonobo_get_object ("wombat:", </div><div class='del'>-					"Bonobo/ConfigDatabase", </div><div class='del'>-					&amp;ev);</div><div class='del'>-	</div><div class='del'>-		if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);</div><div class='del'>-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		ItipAddress *a;</div><div class='del'>-</div><div class='del'>-		a = get_address (i);</div><div class='del'>-		if (i == def)</div><div class='del'>-			a-&gt;default_address = TRUE;</div><div class='del'>-</div><div class='del'>-		addresses = g_list_append (addresses, a);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return addresses;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ItipAddress *</div><div class='del'>-itip_addresses_get_default (void)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	ItipAddress *a;</div><div class='del'>-	glong def;</div><div class='del'>-</div><div class='del'>-	if (db == NULL) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>- </div><div class='del'>-		db = bonobo_get_object ("wombat:", </div><div class='del'>-					"Bonobo/ConfigDatabase", </div><div class='del'>-					&amp;ev);</div><div class='del'>-	</div><div class='del'>-		if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);</div><div class='del'>-	a = get_address (def);</div><div class='del'>-	a-&gt;default_address = TRUE;</div><div class='del'>-</div><div class='del'>-	return a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-itip_address_free (ItipAddress *address) </div><div class='del'>-{</div><div class='del'>-	g_free (address-&gt;name);</div><div class='del'>-	g_free (address-&gt;address);</div><div class='del'>-	g_free (address-&gt;full);</div><div class='del'>-	g_free (address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-itip_addresses_free (GList *addresses)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ItipAddress *a = l-&gt;data;</div><div class='del'>-		itip_address_free (a);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (addresses);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-itip_strip_mailto (const gchar *address) </div><div class='del'>-{</div><div class='del'>-	if (address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (!g_strncasecmp (address, "mailto:", 7))</div><div class='del'>-		address += 7;</div><div class='del'>-</div><div class='del'>-	return address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GHashTable *tzids;</div><div class='del'>-	icalcomponent *icomp;	</div><div class='del'>-	CalClient *client;</div><div class='del'>-	icalcomponent *zones;</div><div class='del'>-} ItipUtilTZData;</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Composer_RecipientList *</div><div class='del'>-comp_to_list (CalComponentItipMethod method, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *to_list;</div><div class='del'>-	GNOME_Evolution_Composer_Recipient *recipient;</div><div class='del'>-	CalComponentOrganizer organizer;</div><div class='del'>-	GSList *attendees, *l;</div><div class='del'>-	gint cntr, len;</div><div class='del'>-</div><div class='del'>-	switch (method) {</div><div class='del'>-	case CAL_COMPONENT_METHOD_REQUEST:</div><div class='del'>-	case CAL_COMPONENT_METHOD_CANCEL:</div><div class='del'>-		cal_component_get_attendee_list (comp, &amp;attendees);</div><div class='del'>-		len = g_slist_length (attendees);</div><div class='del'>-		if (len &lt;= 0) {</div><div class='del'>-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-				  _("At least one attendee is necessary"));</div><div class='del'>-			cal_component_free_attendee_list (attendees);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		to_list-&gt;_maximum = len;</div><div class='del'>-		to_list-&gt;_length = len;</div><div class='del'>-		to_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);</div><div class='del'>-		</div><div class='del'>-		for (cntr = 0, l = attendees; cntr &lt; len; cntr++, l = l-&gt;next) {</div><div class='del'>-			CalComponentAttendee *att = l-&gt;data;</div><div class='del'>-			</div><div class='del'>-			recipient = &amp;(to_list-&gt;_buffer[cntr]);</div><div class='del'>-			if (att-&gt;cn)</div><div class='del'>-				recipient-&gt;name = CORBA_string_dup (att-&gt;cn);</div><div class='del'>-			else</div><div class='del'>-				recipient-&gt;name = CORBA_string_dup ("");</div><div class='del'>-			recipient-&gt;address = CORBA_string_dup (itip_strip_mailto (att-&gt;value));</div><div class='del'>-		}</div><div class='del'>-		cal_component_free_attendee_list (attendees);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_REPLY:</div><div class='del'>-	case CAL_COMPONENT_METHOD_ADD:</div><div class='del'>-	case CAL_COMPONENT_METHOD_REFRESH:</div><div class='del'>-	case CAL_COMPONENT_METHOD_COUNTER:</div><div class='del'>-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:</div><div class='del'>-		cal_component_get_organizer (comp, &amp;organizer);</div><div class='del'>-		if (organizer.value == NULL) {</div><div class='del'>-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-				  _("An organizer must be set."));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		len = 1;</div><div class='del'>-</div><div class='del'>-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		to_list-&gt;_maximum = len;</div><div class='del'>-		to_list-&gt;_length = len;</div><div class='del'>-		to_list-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);</div><div class='del'>-		recipient = &amp;(to_list-&gt;_buffer[0]);</div><div class='del'>-</div><div class='del'>-		if (organizer.cn != NULL)</div><div class='del'>-			recipient-&gt;name = CORBA_string_dup (organizer.cn);</div><div class='del'>-		else</div><div class='del'>-			recipient-&gt;name = CORBA_string_dup ("");</div><div class='del'>-		recipient-&gt;address = CORBA_string_dup (itip_strip_mailto (organizer.value));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-		to_list-&gt;_maximum = to_list-&gt;_length = 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	CORBA_sequence_set_release (to_list, TRUE);</div><div class='del'>-</div><div class='del'>-	return to_list;	</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static CORBA_char *</div><div class='del'>-comp_subject (CalComponentItipMethod method, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentText caltext;</div><div class='del'>-	const char *description, *prefix = NULL;</div><div class='del'>-	GSList *alist;</div><div class='del'>-	int *sequence;</div><div class='del'>-	CORBA_char *subject;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;caltext);</div><div class='del'>-	if (caltext.value != NULL)	</div><div class='del'>-		description = caltext.value;</div><div class='del'>-	else {</div><div class='del'>-		switch (cal_component_get_vtype (comp)) {</div><div class='del'>-		case CAL_COMPONENT_EVENT:</div><div class='del'>-			description = U_("Event information");</div><div class='del'>-		case CAL_COMPONENT_TODO:</div><div class='del'>-			description = U_("Task information");</div><div class='del'>-		case CAL_COMPONENT_JOURNAL:</div><div class='del'>-			description = U_("Journal information");</div><div class='del'>-		case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-			description = U_("Free/Busy information");</div><div class='del'>-		default:</div><div class='del'>-			description = U_("Calendar information");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (method) {</div><div class='del'>-	case CAL_COMPONENT_METHOD_PUBLISH:</div><div class='del'>-	case CAL_COMPONENT_METHOD_REQUEST:</div><div class='del'>-		/* FIXME: If this is an update to a previous</div><div class='del'>-		 * PUBLISH or REQUEST, then</div><div class='del'>-			prefix = U_("Updated");</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_REPLY:</div><div class='del'>-		cal_component_get_attendee_list (comp, &amp;alist);</div><div class='del'>-		if (alist != NULL) {</div><div class='del'>-			CalComponentAttendee *a = alist-&gt;data;</div><div class='del'>-</div><div class='del'>-			switch (a-&gt;status) {</div><div class='del'>-			case ICAL_PARTSTAT_ACCEPTED:</div><div class='del'>-				prefix = U_("Accepted");</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_PARTSTAT_TENTATIVE:</div><div class='del'>-				prefix = U_("Tentatively Accepted");</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_PARTSTAT_DECLINED:</div><div class='del'>-				prefix = U_("Declined");</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			cal_component_free_attendee_list (alist);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_ADD:</div><div class='del'>-		prefix = U_("Updated");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_CANCEL:</div><div class='del'>-		prefix = U_("Cancel");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_REFRESH:</div><div class='del'>-		prefix = U_("Refresh");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_COUNTER:</div><div class='del'>-		prefix = U_("Counter-proposal");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:</div><div class='del'>-		prefix = U_("Declined");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (prefix) {</div><div class='del'>-		subject = CORBA_string_alloc (strlen (description) +</div><div class='del'>-					      strlen (prefix) + 3);</div><div class='del'>-		sprintf (subject, "%s: %s", prefix, description);</div><div class='del'>-	} else</div><div class='del'>-		subject = CORBA_string_dup (description);</div><div class='del'>-</div><div class='del'>-	return subject;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_char *</div><div class='del'>-comp_content_type (CalComponent *comp, CalComponentItipMethod method)</div><div class='del'>-{</div><div class='del'>-	char tmp[256];	</div><div class='del'>-</div><div class='del'>-	sprintf (tmp, "text/calendar; name=\"%s\"; charset=utf-8; METHOD=%s",</div><div class='del'>-		 cal_component_get_vtype (comp) == CAL_COMPONENT_FREEBUSY ?</div><div class='del'>-		 "freebusy.ifb" : "calendar.ics", itip_methods[method]);</div><div class='del'>-	return CORBA_string_dup (tmp);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-foreach_tzid_callback (icalparameter *param, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ItipUtilTZData *tz_data = data;	</div><div class='del'>-	const char *tzid;</div><div class='del'>-	icaltimezone *zone = NULL;</div><div class='del'>-	icalcomponent *vtimezone_comp;</div><div class='del'>-</div><div class='del'>-	/* Get the TZID string from the parameter. */</div><div class='del'>-	tzid = icalparameter_get_tzid (param);</div><div class='del'>-	if (!tzid || g_hash_table_lookup (tz_data-&gt;tzids, tzid))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Look for the timezone */</div><div class='del'>-	if (tz_data-&gt;zones != NULL)</div><div class='del'>-		zone = icalcomponent_get_timezone (tz_data-&gt;zones, tzid);</div><div class='del'>-	if (zone == NULL)</div><div class='del'>-		zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-	if (zone == NULL &amp;&amp; tz_data-&gt;client != NULL)</div><div class='del'>-		cal_client_get_timezone (tz_data-&gt;client, tzid, &amp;zone);</div><div class='del'>-	if (zone == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Convert it to a string and add it to the hash. */</div><div class='del'>-	vtimezone_comp = icaltimezone_get_component (zone);</div><div class='del'>-	if (!vtimezone_comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icalcomponent_add_component (tz_data-&gt;icomp, icalcomponent_new_clone (vtimezone_comp));</div><div class='del'>-	g_hash_table_insert (tz_data-&gt;tzids, (char *)tzid, (char *)tzid);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-comp_string (CalComponentItipMethod method, CalComponent *comp, CalClient *client, icalcomponent *zones)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *top_level, *icomp;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	gchar *ical_string;</div><div class='del'>-	ItipUtilTZData tz_data;</div><div class='del'>-		</div><div class='del'>-	top_level = cal_util_new_top_level ();</div><div class='del'>-</div><div class='del'>-	prop = icalproperty_new (ICAL_METHOD_PROPERTY);</div><div class='del'>-	value = icalvalue_new_method (itip_methods_enum[method]);</div><div class='del'>-	icalproperty_set_value (prop, value);</div><div class='del'>-	icalcomponent_add_property (top_level, prop);</div><div class='del'>-</div><div class='del'>-	icomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	if (method == CAL_COMPONENT_METHOD_REPLY) {</div><div class='del'>-		struct icaltimetype dtstamp;</div><div class='del'>-		gboolean add_it = FALSE;</div><div class='del'>-</div><div class='del'>-		/* workaround for Outlook expecting a X-MICROSOFT-CDO-REPLYTIME</div><div class='del'>-		   on every METHOD=REPLY message. If the component has any of</div><div class='del'>-		   the X-MICROSOFT-* properties, we add the REPLYTIME one */</div><div class='del'>-		prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);</div><div class='del'>-		while (prop) {</div><div class='del'>-			const char *x_name;</div><div class='del'>-</div><div class='del'>-			x_name = icalproperty_get_x_name (prop);</div><div class='del'>-			if (!strncmp (x_name, "X-MICROSOFT-", strlen ("X-MICROSOFT-"))) {</div><div class='del'>-				add_it = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (add_it) {</div><div class='del'>-			dtstamp = icaltime_from_timet_with_zone (</div><div class='del'>-				time (NULL), 0, icaltimezone_get_utc_timezone ());</div><div class='del'>-			prop = icalproperty_new_x (icaltime_as_ical_string (dtstamp));</div><div class='del'>-			icalproperty_set_x_name (prop, "X-MICROSOFT-CDO-REPLYTIME");</div><div class='del'>-			icalcomponent_add_property (icomp, prop);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	/* Add the timezones */</div><div class='del'>-	tz_data.tzids = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	tz_data.icomp = top_level;</div><div class='del'>-	tz_data.client = client;</div><div class='del'>-	tz_data.zones = zones;</div><div class='del'>-	icalcomponent_foreach_tzid (icomp, foreach_tzid_callback, &amp;tz_data);</div><div class='del'>-	g_hash_table_destroy (tz_data.tzids);</div><div class='del'>-</div><div class='del'>-	icalcomponent_add_component (top_level, icomp);</div><div class='del'>-	ical_string = icalcomponent_as_ical_string (top_level);</div><div class='del'>-	icalcomponent_remove_component (top_level, icomp);</div><div class='del'>-	</div><div class='del'>-	icalcomponent_free (top_level);</div><div class='del'>-	</div><div class='del'>-	return ical_string;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-comp_limit_attendees (CalComponent *comp) </div><div class='del'>-{</div><div class='del'>-	icalcomponent *icomp;</div><div class='del'>-	GList *addresses;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	gboolean found = FALSE, match = FALSE;</div><div class='del'>-	GSList *l, *list = NULL;</div><div class='del'>-</div><div class='del'>-	icomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-	addresses = itip_addresses_get ();	</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (icomp, ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-	     prop != NULL;</div><div class='del'>-	     prop = icalcomponent_get_next_property (icomp, ICAL_ATTENDEE_PROPERTY))</div><div class='del'>-	{</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		const char *attendee;</div><div class='del'>-		char *text;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		/* If we've already found something, just erase the rest */</div><div class='del'>-		if (found) {</div><div class='del'>-			list = g_slist_prepend (list, prop);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		value = icalproperty_get_value (prop);</div><div class='del'>-		if (!value)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		attendee = icalvalue_get_string (value);</div><div class='del'>-</div><div class='del'>-		text = g_strdup (itip_strip_mailto (attendee));</div><div class='del'>-		text = g_strstrip (text);</div><div class='del'>-		for (l = addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-			ItipAddress *a = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (!g_strcasecmp (a-&gt;address, text))</div><div class='del'>-				found = match = TRUE;</div><div class='del'>-		}</div><div class='del'>-		g_free (text);</div><div class='del'>-		</div><div class='del'>-		if (!match)</div><div class='del'>-			list = g_slist_prepend (list, prop);</div><div class='del'>-		match = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (l = list; l != NULL; l = l-&gt;next) {</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (icomp, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-</div><div class='del'>-	itip_addresses_free (addresses);</div><div class='del'>-</div><div class='del'>-	return found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-comp_sentby (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentOrganizer organizer;</div><div class='del'>-	GList *addresses, *l;</div><div class='del'>-	const char *strip;</div><div class='del'>-	gboolean is_user = FALSE;</div><div class='del'>-	</div><div class='del'>-	cal_component_get_organizer (comp, &amp;organizer);</div><div class='del'>-	if (!organizer.value) {</div><div class='del'>-		ItipAddress *a = itip_addresses_get_default ();</div><div class='del'>-</div><div class='del'>-		organizer.value = g_strdup_printf ("MAILTO:%s", a-&gt;address);</div><div class='del'>-		organizer.sentby = NULL;</div><div class='del'>-		organizer.cn = a-&gt;name;</div><div class='del'>-		organizer.language = NULL;</div><div class='del'>-		</div><div class='del'>-		cal_component_set_organizer (comp, &amp;organizer);</div><div class='del'>-		g_free ((char *) organizer.value);</div><div class='del'>-		itip_address_free (a);</div><div class='del'>-		</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	strip = itip_strip_mailto (organizer.value);</div><div class='del'>-</div><div class='del'>-	addresses = itip_addresses_get ();</div><div class='del'>-	for (l = addresses; l != NULL; l = l-&gt;next) {</div><div class='del'>-		ItipAddress *a = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (!strcmp (a-&gt;address, strip)) {</div><div class='del'>-			is_user = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!is_user) {</div><div class='del'>-		ItipAddress *a = itip_addresses_get_default ();</div><div class='del'>-		</div><div class='del'>-		organizer.value = g_strdup (organizer.value);</div><div class='del'>-		organizer.sentby = g_strdup_printf ("MAILTO:%s", a-&gt;address);</div><div class='del'>-		organizer.cn = g_strdup (organizer.cn);</div><div class='del'>-		organizer.language = g_strdup (organizer.language);</div><div class='del'>-		</div><div class='del'>-		cal_component_set_organizer (comp, &amp;organizer);</div><div class='del'>-</div><div class='del'>-		g_free ((char *)organizer.value);</div><div class='del'>-		g_free ((char *)organizer.sentby);</div><div class='del'>-		g_free ((char *)organizer.cn);</div><div class='del'>-		g_free ((char *)organizer.language);</div><div class='del'>-		itip_address_free (a);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	itip_addresses_free (addresses);</div><div class='del'>-}</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_minimal (CalComponent *comp, gboolean attendee)</div><div class='del'>-{</div><div class='del'>-	CalComponent *clone;</div><div class='del'>-	icalcomponent *icomp, *icomp_clone;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	CalComponentOrganizer organizer;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GSList *comments;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	CalComponentRange recur_id;</div><div class='del'>-	</div><div class='del'>-	clone = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (clone, cal_component_get_vtype (comp));</div><div class='del'>-</div><div class='del'>-	if (attendee) {</div><div class='del'>-		GSList *attendees;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_attendee_list (comp, &amp;attendees);</div><div class='del'>-		cal_component_set_attendee_list (clone, attendees);</div><div class='del'>-</div><div class='del'>-		if (!comp_limit_attendees (clone)) {</div><div class='del'>-			e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-				  _("You must be an attendee of the event."));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,</div><div class='del'>-					     icaltimezone_get_utc_timezone ());</div><div class='del'>-	cal_component_set_dtstamp (clone, &amp;itt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_organizer (comp, &amp;organizer);</div><div class='del'>-	if (organizer.value == NULL)</div><div class='del'>-		goto error;</div><div class='del'>-	cal_component_set_organizer (clone, &amp;organizer);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	cal_component_set_uid (clone, uid);</div><div class='del'>-</div><div class='del'>-	cal_component_get_comment_list (comp, &amp;comments);</div><div class='del'>-	if (g_slist_length (comments) &lt;= 1) {</div><div class='del'>-		cal_component_set_comment_list (clone, comments);</div><div class='del'>-	} else {</div><div class='del'>-		GSList *l = comments;</div><div class='del'>-		</div><div class='del'>-		comments = g_slist_remove_link (comments, l);</div><div class='del'>-		cal_component_set_comment_list (clone, l);</div><div class='del'>-		cal_component_free_text_list (l);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (comments);</div><div class='del'>-	</div><div class='del'>-	cal_component_get_recurid (comp, &amp;recur_id);</div><div class='del'>-	if (recur_id.datetime.value != NULL)</div><div class='del'>-		cal_component_set_recurid (clone, &amp;recur_id);</div><div class='del'>-	</div><div class='del'>-	icomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-	icomp_clone = cal_component_get_icalcomponent (clone);</div><div class='del'>-	for (prop = icalcomponent_get_first_property (icomp, ICAL_X_PROPERTY);</div><div class='del'>-	     prop != NULL;</div><div class='del'>-	     prop = icalcomponent_get_next_property (icomp, ICAL_X_PROPERTY))</div><div class='del'>-	{</div><div class='del'>-		icalproperty *p;</div><div class='del'>-		</div><div class='del'>-		p = icalproperty_new_clone (prop);</div><div class='del'>-		icalcomponent_add_property (icomp_clone, p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_rescan (clone);</div><div class='del'>-	</div><div class='del'>-	return clone;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (clone));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_compliant (CalComponentItipMethod method, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponent *clone, *temp_clone;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	</div><div class='del'>-	clone = cal_component_clone (comp);</div><div class='del'>-	itt = icaltime_from_timet_with_zone (time (NULL), FALSE,</div><div class='del'>-					     icaltimezone_get_utc_timezone ());</div><div class='del'>-	cal_component_set_dtstamp (clone, &amp;itt);</div><div class='del'>-</div><div class='del'>-	/* We delete incoming alarms anyhow, and this helps with outlook */</div><div class='del'>-	cal_component_remove_all_alarms (clone);</div><div class='del'>-</div><div class='del'>-	/* Comply with itip spec */</div><div class='del'>-	switch (method) {</div><div class='del'>-	case CAL_COMPONENT_METHOD_PUBLISH:</div><div class='del'>-		comp_sentby (clone);</div><div class='del'>-		cal_component_set_attendee_list (clone, NULL);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_REQUEST:</div><div class='del'>-		comp_sentby (clone);</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_CANCEL:</div><div class='del'>-		comp_sentby (clone);</div><div class='del'>-		break;	</div><div class='del'>-	case CAL_COMPONENT_METHOD_REPLY:</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_ADD:</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_REFRESH:</div><div class='del'>-		/* Need to remove almost everything */</div><div class='del'>-		temp_clone = comp_minimal (clone, TRUE);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (clone));</div><div class='del'>-		clone = temp_clone;</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_COUNTER:</div><div class='del'>-		break;</div><div class='del'>-	case CAL_COMPONENT_METHOD_DECLINECOUNTER:</div><div class='del'>-		/* Need to remove almost everything */</div><div class='del'>-		temp_clone = comp_minimal (clone, FALSE);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (clone));</div><div class='del'>-		clone = temp_clone;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return clone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-itip_send_comp (CalComponentItipMethod method, CalComponent *send_comp,</div><div class='del'>-		CalClient *client, icalcomponent *zones)</div><div class='del'>-{</div><div class='del'>-	BonoboObjectClient *bonobo_server;</div><div class='del'>-	GNOME_Evolution_Composer composer_server;</div><div class='del'>-	CalComponent *comp = NULL;</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *to_list = NULL;</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *cc_list = NULL;</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *bcc_list = NULL;</div><div class='del'>-	CORBA_char *subject = NULL, *body = NULL, *content_type = NULL;</div><div class='del'>-	CORBA_char *filename = NULL, *description = NULL;</div><div class='del'>-	GNOME_Evolution_Composer_AttachmentData *attach_data = NULL;</div><div class='del'>-	char *ical_string;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Obtain an object reference for the Composer. */</div><div class='del'>-	bonobo_server = bonobo_object_activate (GNOME_EVOLUTION_COMPOSER_OAFIID, 0);</div><div class='del'>-	g_return_if_fail (bonobo_server != NULL);</div><div class='del'>-	composer_server = BONOBO_OBJREF (bonobo_server);</div><div class='del'>-</div><div class='del'>-	comp = comp_compliant (method, send_comp);</div><div class='del'>-	if (comp == NULL)</div><div class='del'>-		goto cleanup;</div><div class='del'>-	</div><div class='del'>-	to_list = comp_to_list (method, comp);</div><div class='del'>-	if (to_list == NULL)</div><div class='del'>-		goto cleanup;</div><div class='del'>-	</div><div class='del'>-	cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	cc_list-&gt;_maximum = cc_list-&gt;_length = 0;</div><div class='del'>-	bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	bcc_list-&gt;_maximum = bcc_list-&gt;_length = 0;</div><div class='del'>-	</div><div class='del'>-	/* Subject information */</div><div class='del'>-	subject = comp_subject (method, comp);</div><div class='del'>-	</div><div class='del'>-	/* Set recipients, subject */</div><div class='del'>-	GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {		</div><div class='del'>-		g_warning ("Unable to set composer headers while sending iTip message");</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Content type */</div><div class='del'>-	content_type = comp_content_type (comp, method);</div><div class='del'>-</div><div class='del'>-	ical_string = comp_string (method, comp, client, zones);</div><div class='del'>-	attach_data = GNOME_Evolution_Composer_AttachmentData__alloc ();</div><div class='del'>-	attach_data-&gt;_length = strlen (ical_string) + 1;</div><div class='del'>-	attach_data-&gt;_maximum = attach_data-&gt;_length;	</div><div class='del'>-	attach_data-&gt;_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data-&gt;_length);</div><div class='del'>-	strcpy (attach_data-&gt;_buffer, ical_string);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Composer_setBody (composer_server, ical_string, content_type, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_warning ("Unable to attach data to the composer while sending iTip message");</div><div class='del'>-		goto cleanup;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (method == CAL_COMPONENT_METHOD_PUBLISH) {</div><div class='del'>-		GNOME_Evolution_Composer_show (composer_server, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_warning ("Unable to show the composer while sending iTip message");</div><div class='del'>-	} else {		</div><div class='del'>-		GNOME_Evolution_Composer_send (composer_server, &amp;ev);</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_warning ("Unable to send iTip message");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>- cleanup:</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (comp != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		</div><div class='del'>-	if (to_list != NULL)</div><div class='del'>-		CORBA_free (to_list);</div><div class='del'>-	if (cc_list != NULL)</div><div class='del'>-		CORBA_free (cc_list);</div><div class='del'>-	if (bcc_list != NULL)</div><div class='del'>-		CORBA_free (bcc_list);</div><div class='del'>-</div><div class='del'>-	if (subject != NULL)</div><div class='del'>-		CORBA_free (subject);</div><div class='del'>-	if (body != NULL)</div><div class='del'>-		CORBA_free (body);</div><div class='del'>-	if (content_type != NULL)</div><div class='del'>-		CORBA_free (content_type);</div><div class='del'>-	if (filename != NULL)</div><div class='del'>-		CORBA_free (filename);</div><div class='del'>-	if (description != NULL)</div><div class='del'>-		CORBA_free (description);</div><div class='del'>-	if (attach_data != NULL)</div><div class='del'>-		CORBA_free (attach_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h<br/>deleted file mode 100644<br/>index 2863d871e2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/itip-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/itip-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-</div><div class='del'>-#ifndef ITIP_UTILS_HEADER</div><div class='del'>-#define ITIP_UTILS_HEADER</div><div class='del'>-</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_METHOD_PUBLISH,</div><div class='del'>-	CAL_COMPONENT_METHOD_REQUEST,</div><div class='del'>-	CAL_COMPONENT_METHOD_REPLY,</div><div class='del'>-	CAL_COMPONENT_METHOD_ADD,</div><div class='del'>-	CAL_COMPONENT_METHOD_CANCEL,</div><div class='del'>-	CAL_COMPONENT_METHOD_REFRESH,</div><div class='del'>-	CAL_COMPONENT_METHOD_COUNTER,</div><div class='del'>-	CAL_COMPONENT_METHOD_DECLINECOUNTER</div><div class='del'>-} CalComponentItipMethod;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gchar *name;</div><div class='del'>-	gchar *address;</div><div class='del'>-	gchar *full;</div><div class='del'>-</div><div class='del'>-	gboolean default_address;</div><div class='del'>-} ItipAddress;</div><div class='del'>-</div><div class='del'>-GList *itip_addresses_get (void);</div><div class='del'>-ItipAddress *itip_addresses_get_default (void);</div><div class='del'>-void itip_address_free (ItipAddress *address);</div><div class='del'>-void itip_addresses_free (GList *addresses);</div><div class='del'>-</div><div class='del'>-const gchar *itip_strip_mailto (const gchar *address);</div><div class='del'>-</div><div class='del'>-void itip_send_comp (CalComponentItipMethod method, CalComponent *comp,</div><div class='del'>-		     CalClient *client, icalcomponent *zones);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/main.c b/calendar/gui/main.c<br/>deleted file mode 100644<br/>index 5c7a2bc08f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/main.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,168 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-init.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-cursors.h&gt;</div><div class='del'>-</div><div class='del'>-#include "alarm-notify/alarm.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "comp-editor-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "itip-control-factory.h"</div><div class='del'>-#include "tasks-control-factory.h"</div><div class='del'>-</div><div class='del'>-/* The component editor factory */</div><div class='del'>-static CompEditorFactory *comp_editor_factory = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (gnome_init_with_popt_table ("evolution-calendar", VERSION, argc, argv,</div><div class='del'>-					oaf_popt_options, 0, NULL) != 0)</div><div class='del'>-		g_error (_("Could not initialize GNOME"));</div><div class='del'>-</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Factory function for the calendar component factory; just creates and</div><div class='del'>- * references a singleton service object.</div><div class='del'>- */</div><div class='del'>-static BonoboObject *</div><div class='del'>-comp_editor_factory_fn (BonoboGenericFactory *factory, void *data)</div><div class='del'>-{</div><div class='del'>-	if (!comp_editor_factory) {</div><div class='del'>-		comp_editor_factory = comp_editor_factory_new ();</div><div class='del'>-		if (!comp_editor_factory)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref (BONOBO_OBJECT (comp_editor_factory));</div><div class='del'>-	return BONOBO_OBJECT (comp_editor_factory);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates and registers the component editor factory */</div><div class='del'>-static void</div><div class='del'>-component_editor_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	BonoboGenericFactory *factory;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (</div><div class='del'>-		"OAFIID:GNOME_Evolution_Calendar_CompEditorFactory_Factory",</div><div class='del'>-		comp_editor_factory_fn, NULL);</div><div class='del'>-	if (!factory)</div><div class='del'>-		g_error (_("Could not create the component editor factory"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Does a simple activation and unreffing of the alarm notification service so</div><div class='del'>- * that the daemon will be launched if it is not running yet.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-launch_alarm_daemon (void)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Calendar_AlarmNotify an;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	an = oaf_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify", 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("add_alarms(): Could not activate the alarm notification service");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Just get rid of it; what we are interested in is that it gets launched */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (an, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("add_alarms(): Could not unref the alarm notification service");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	free (malloc (8));</div><div class='del'>-</div><div class='del'>-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain(PACKAGE);</div><div class='del'>-</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (!gnome_vfs_init ())</div><div class='del'>-		g_error (_("Could not initialize gnome-vfs"));</div><div class='del'>-</div><div class='del'>-	glade_gnome_init ();</div><div class='del'>-	e_cursors_init ();</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);</div><div class='del'>-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |</div><div class='del'>-				G_LOG_LEVEL_CRITICAL |</div><div class='del'>-				G_LOG_LEVEL_WARNING);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	calendar_config_init ();</div><div class='del'>-</div><div class='del'>-	control_factory_init ();</div><div class='del'>-	component_factory_init ();</div><div class='del'>-	itip_control_factory_init ();</div><div class='del'>-	tasks_control_factory_init ();</div><div class='del'>-	component_editor_factory_init ();</div><div class='del'>-</div><div class='del'>-	launch_alarm_daemon ();</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	alarm_done ();</div><div class='del'>-	calendar_config_write_on_exit ();</div><div class='del'>-</div><div class='del'>-	gnome_vfs_shutdown ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c<br/>deleted file mode 100644<br/>index 15dcf93e09..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/misc.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/misc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* Evolution calendar - Miscellaneous utility functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include "misc.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * string_is_empty:</div><div class='del'>- * @value: A string.</div><div class='del'>- * </div><div class='del'>- * Returns whether a string is NULL, the empty string, or completely made up of</div><div class='del'>- * whitespace characters.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the string is empty, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-string_is_empty (const char *value)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	gboolean empty;</div><div class='del'>-</div><div class='del'>-	empty = TRUE;</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		p = value;</div><div class='del'>-		while (*p) {</div><div class='del'>-			if (!isspace ((unsigned char) *p)) {</div><div class='del'>-				empty = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return empty;</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h<br/>deleted file mode 100644<br/>index 81e2a13afe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/misc.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/misc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* Evolution calendar - Miscellaneous utility functions</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef MISC_H</div><div class='del'>-#define MISC_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean string_is_empty (const char *value);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/print.c b/calendar/gui/print.c<br/>deleted file mode 100644<br/>index b353fc24fb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/print.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2646 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* Evolution calendar - Print support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-paper-selector.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-copies.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-preview.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-printer-dialog.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;e-util/e-time-utils.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "e-day-view.h"</div><div class='del'>-#include "e-day-view-layout.h"</div><div class='del'>-#include "e-week-view.h"</div><div class='del'>-#include "e-week-view-layout.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note that most dimensions are in points (1/72 of an inch) since that is</div><div class='del'>- * what gnome-print uses.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The font to use */</div><div class='del'>-#define DEFAULT_FONT "Times"</div><div class='del'>-</div><div class='del'>-/* The font size to use for normal text. */</div><div class='del'>-#define DAY_NORMAL_FONT_SIZE	12</div><div class='del'>-#define WEEK_NORMAL_FONT_SIZE	12</div><div class='del'>-#define MONTH_NORMAL_FONT_SIZE	8</div><div class='del'>-</div><div class='del'>-/* The height of the header bar across the top of the Day, Week &amp; Month views,</div><div class='del'>-   which contains the dates shown and the 2 small calendar months. */</div><div class='del'>-#define HEADER_HEIGHT		80</div><div class='del'>-</div><div class='del'>-/* The width of the small calendar months, the space from the right edge of</div><div class='del'>-   the header rectangle, and the space between the months. */</div><div class='del'>-#define SMALL_MONTH_WIDTH	80</div><div class='del'>-#define SMALL_MONTH_PAD		4</div><div class='del'>-#define SMALL_MONTH_SPACING	12</div><div class='del'>-</div><div class='del'>-/* The minimum number of rows we leave space for for the long events in the</div><div class='del'>-   day view. */</div><div class='del'>-#define DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY	2</div><div class='del'>-</div><div class='del'>-/* The row height for long events in the day view. */</div><div class='del'>-#define DAY_VIEW_ROW_HEIGHT		20</div><div class='del'>-</div><div class='del'>-/* The minutes per row in the day view printout. */</div><div class='del'>-#define DAY_VIEW_MINS_PER_ROW		30</div><div class='del'>-</div><div class='del'>-#define DAY_VIEW_ROWS			((60 / DAY_VIEW_MINS_PER_ROW) * 24)</div><div class='del'>-</div><div class='del'>-/* The width of the column with all the times in it. */</div><div class='del'>-#define DAY_VIEW_TIME_COLUMN_WIDTH	36</div><div class='del'>-</div><div class='del'>-/* The space on the right of each event. */</div><div class='del'>-#define DAY_VIEW_EVENT_X_PAD		8</div><div class='del'>-</div><div class='del'>-/* Allowance for small errors in floating point comparisons. */</div><div class='del'>-#define EPSILON			0.01</div><div class='del'>-</div><div class='del'>-/* The weird month of September 1752, where 3 Sep through 13 Sep were</div><div class='del'>-   eliminated due to the Gregorian reformation. */</div><div class='del'>-static const int sept_1752[42] = {</div><div class='del'>-	 0,  0,  1,  2, 14, 15, 16,</div><div class='del'>-	17, 18, 19, 20, 21, 22, 23,</div><div class='del'>-	24, 25, 26, 27, 28, 29, 30,</div><div class='del'>-	 0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	 0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	 0,  0,  0,  0,  0,  0,  0</div><div class='del'>-};</div><div class='del'>-#define SEPT_1752_START 2		/* Start day within month */</div><div class='del'>-#define SEPT_1752_END 20		/* End day within month */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct pdinfo</div><div class='del'>-{</div><div class='del'>-	gint days_shown;</div><div class='del'>-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];</div><div class='del'>-</div><div class='del'>-	GArray *long_events;</div><div class='del'>-	GArray *events[E_DAY_VIEW_MAX_DAYS];</div><div class='del'>-</div><div class='del'>-	gint start_hour;</div><div class='del'>-	gint end_hour;</div><div class='del'>-	gint start_minute_offset;</div><div class='del'>-	gint end_minute_offset;</div><div class='del'>-	gint rows;</div><div class='del'>-	gint mins_per_row;</div><div class='del'>-	gint8 cols_per_row[DAY_VIEW_ROWS];</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct psinfo</div><div class='del'>-{</div><div class='del'>-	gint days_shown;</div><div class='del'>-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];</div><div class='del'>-</div><div class='del'>-	GArray *events;</div><div class='del'>-</div><div class='del'>-	int rows_per_cell;</div><div class='del'>-	int rows_per_compressed_cell;</div><div class='del'>-	int display_start_weekday;</div><div class='del'>-	gboolean multi_week_view;</div><div class='del'>-	int weeks_shown;</div><div class='del'>-	int month;</div><div class='del'>-	gboolean compress_weekend;</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-	double row_height;</div><div class='del'>-	double header_row_height;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ptinfo</div><div class='del'>-{</div><div class='del'>-	GList *todos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct einfo</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	int count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const GnomePaper *paper_info = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Convenience function to help the transition to timezone functions.</div><div class='del'>-   It returns the current timezone. */</div><div class='del'>-static icaltimezone*</div><div class='del'>-get_timezone (void)</div><div class='del'>-{</div><div class='del'>-	char *location = calendar_config_get_timezone ();</div><div class='del'>-	return icaltimezone_get_builtin_timezone (location);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Convenience function to help the transition to timezone functions.</div><div class='del'>-   It converts a time_t to a struct tm. */</div><div class='del'>-static struct tm*</div><div class='del'>-convert_timet_to_struct_tm (time_t time, icaltimezone *zone)</div><div class='del'>-{</div><div class='del'>-	static struct tm my_tm;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-	/* Convert it to an icaltimetype. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (time, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	/* Fill in the struct tm. */</div><div class='del'>-	my_tm.tm_year = tt.year - 1900;</div><div class='del'>-	my_tm.tm_mon = tt.month - 1;</div><div class='del'>-	my_tm.tm_mday = tt.day;</div><div class='del'>-	my_tm.tm_hour = tt.hour;</div><div class='del'>-	my_tm.tm_min = tt.minute;</div><div class='del'>-	my_tm.tm_sec = tt.second;</div><div class='del'>-	my_tm.tm_isdst = tt.is_daylight;</div><div class='del'>-</div><div class='del'>-	my_tm.tm_wday = time_day_of_week (tt.day, tt.month - 1, tt.year);</div><div class='del'>-</div><div class='del'>-	return &amp;my_tm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the</div><div class='del'>- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are</div><div class='del'>- * returned in the start and end arguments.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-build_month (int month, int year, int *days, int *start, int *end)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int d_month, d_week, week_start_day;</div><div class='del'>-</div><div class='del'>-	/* Note that months are zero-based, so September is month 8 */</div><div class='del'>-</div><div class='del'>-	if ((year == 1752) &amp;&amp; (month == 8)) {</div><div class='del'>-		memcpy (days, sept_1752, 42 * sizeof (int));</div><div class='del'>-</div><div class='del'>-		if (start)</div><div class='del'>-			*start = SEPT_1752_START;</div><div class='del'>-</div><div class='del'>-		if (end)</div><div class='del'>-			*end = SEPT_1752_END;</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 42; i++)</div><div class='del'>-		days[i] = 0;</div><div class='del'>-</div><div class='del'>-	d_month = time_days_in_month (year, month);</div><div class='del'>-	/* Get the start weekday in the month, 0=Sun to 6=Sat. */</div><div class='del'>-	d_week = time_day_of_week (1, month, year);</div><div class='del'>-</div><div class='del'>-	/* Get the configuration setting specifying which weekday we put on</div><div class='del'>-	   the left column, 0=Sun to 6=Sat. */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-</div><div class='del'>-	/* Figure out which square we want to put the 1 in. */</div><div class='del'>-	d_week = (d_week + 7 - week_start_day) % 7;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; d_month; i++)</div><div class='del'>-		days[d_week + i] = i + 1;</div><div class='del'>-</div><div class='del'>-	if (start)</div><div class='del'>-		*start = d_week;</div><div class='del'>-</div><div class='del'>-	if (end)</div><div class='del'>-		*end = d_week + d_month - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeFont *</div><div class='del'>-get_font_for_size (double h, GnomeFontWeight weight, gboolean italic)</div><div class='del'>-{</div><div class='del'>-	GnomeFontFace *face;</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	double asc, desc, size;</div><div class='del'>-	</div><div class='del'>-	face = gnome_font_unsized_closest (DEFAULT_FONT, weight, italic);</div><div class='del'>-	asc = gnome_font_face_get_ascender (face);</div><div class='del'>-	desc = gnome_font_face_get_descender (face);</div><div class='del'>-	size = h * 1000 / (asc + desc);</div><div class='del'>-	g_print ("Print Info: %f, %f, %f\n", asc, desc, size);</div><div class='del'>-	</div><div class='del'>-	font = gnome_font_new_closest (DEFAULT_FONT, weight, italic, size);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (face));</div><div class='del'>-	</div><div class='del'>-	return font;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum align_box {</div><div class='del'>-	ALIGN_LEFT=1,</div><div class='del'>-	ALIGN_RIGHT,</div><div class='del'>-	ALIGN_CENTER,</div><div class='del'>-	ALIGN_BORDER= 1&lt;&lt;8</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Prints a rectangle, with or without a border, filled or outline, and</div><div class='del'>-   possibly with triangular arrows at one or both horizontal edges.</div><div class='del'>-   width      = width of border, -ve means no border.</div><div class='del'>-   fillcolor = shade of fill,   -ve means no fill.</div><div class='del'>-   left_triangle_width, right_triangle_width = width from edge of rectangle to</div><div class='del'>-          point of triangle, or -ve for no triangle. */</div><div class='del'>-static void</div><div class='del'>-print_border_with_triangles (GnomePrintContext *pc,</div><div class='del'>-			     double l, double r, double t, double b,</div><div class='del'>-			     double width, double fillcolor,</div><div class='del'>-			     double left_triangle_width,</div><div class='del'>-			     double right_triangle_width)</div><div class='del'>-{</div><div class='del'>-	gnome_print_gsave (pc);</div><div class='del'>-</div><div class='del'>-	/* Fill in the interior of the rectangle, if desired. */</div><div class='del'>-	if (fillcolor &gt;= -EPSILON) {</div><div class='del'>-		gnome_print_moveto (pc, l, t);</div><div class='del'>-		if (left_triangle_width &gt; 0.0)</div><div class='del'>-			gnome_print_lineto (pc, l - left_triangle_width,</div><div class='del'>-					    (t + b) / 2);</div><div class='del'>-		gnome_print_lineto (pc, l, b);</div><div class='del'>-		gnome_print_lineto (pc, r, b);</div><div class='del'>-		if (right_triangle_width &gt; 0.0)</div><div class='del'>-			gnome_print_lineto (pc, r + right_triangle_width,</div><div class='del'>-					    (t + b) / 2);</div><div class='del'>-		gnome_print_lineto (pc, r, t);</div><div class='del'>-		gnome_print_closepath (pc);</div><div class='del'>-		gnome_print_setrgbcolor (pc, fillcolor, fillcolor,</div><div class='del'>-					 fillcolor);</div><div class='del'>-		gnome_print_fill (pc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Draw the outline, if desired. */</div><div class='del'>-	if (width &gt;= -EPSILON) {</div><div class='del'>-		gnome_print_moveto (pc, l, t);</div><div class='del'>-		if (left_triangle_width &gt; 0.0)</div><div class='del'>-			gnome_print_lineto (pc, l - left_triangle_width,</div><div class='del'>-					    (t + b) / 2);</div><div class='del'>-		gnome_print_lineto (pc, l, b);</div><div class='del'>-		gnome_print_lineto (pc, r, b);</div><div class='del'>-		if (right_triangle_width &gt; 0.0)</div><div class='del'>-			gnome_print_lineto (pc, r + right_triangle_width,</div><div class='del'>-					    (t + b) / 2);</div><div class='del'>-		gnome_print_lineto (pc, r, t);</div><div class='del'>-		gnome_print_closepath (pc);</div><div class='del'>-		gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-		gnome_print_setlinewidth (pc, width);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_print_grestore (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Prints a rectangle, with or without a border, and filled or outline.</div><div class='del'>-   width      = width of border, -ve means no border.</div><div class='del'>-   fillcolor = shade of fill,   -ve means no fill. */</div><div class='del'>-static void</div><div class='del'>-print_border (GnomePrintContext *pc,</div><div class='del'>-	      double l, double r, double t, double b,</div><div class='del'>-	      double width, double fillcolor)</div><div class='del'>-{</div><div class='del'>-	print_border_with_triangles (pc, l, r, t, b, width, fillcolor,</div><div class='del'>-				     -1.0, -1.0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Prints 1 line of aligned text in a box. It is centered vertically, and</div><div class='del'>-   the horizontal alignment can be either ALIGN_LEFT, ALIGN_RIGHT, or</div><div class='del'>-   ALIGN_CENTER. */</div><div class='del'>-static void</div><div class='del'>-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text,</div><div class='del'>-	   enum align_box align, double l, double r, double t, double b)</div><div class='del'>-{</div><div class='del'>-	double w, x, y;</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave (pc);</div><div class='del'>-</div><div class='del'>-	w = gnome_font_get_width_utf8 (font, text);</div><div class='del'>-</div><div class='del'>-	switch (align &amp; 3) {</div><div class='del'>-	case ALIGN_LEFT:</div><div class='del'>-	default:</div><div class='del'>-		x = l;</div><div class='del'>-		break;</div><div class='del'>-	case ALIGN_RIGHT:</div><div class='del'>-		x = r - w;</div><div class='del'>-		break;</div><div class='del'>-	case ALIGN_CENTER:</div><div class='del'>-		x = l + ((r - l) - w) / 2;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Make sure we don't go off the left edge. */</div><div class='del'>-	x = MAX (l, x);</div><div class='del'>-</div><div class='del'>-	/* Now calculate the baseline. */</div><div class='del'>-	y = t - gnome_font_get_ascender (font);</div><div class='del'>-	</div><div class='del'>-	/* Set a clipping rectangle. */</div><div class='del'>-	gnome_print_moveto (pc, l, t);</div><div class='del'>-	gnome_print_lineto (pc, r, t);</div><div class='del'>-	gnome_print_lineto (pc, r, b);</div><div class='del'>-	gnome_print_lineto (pc, l, b);</div><div class='del'>-	gnome_print_closepath (pc);</div><div class='del'>-	gnome_print_clip (pc);</div><div class='del'>-</div><div class='del'>-	gnome_print_newpath (pc);</div><div class='del'>-	gnome_print_moveto (pc, x, y);</div><div class='del'>-	gnome_print_setfont (pc, font);</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-	gnome_print_show (pc, text);</div><div class='del'>-</div><div class='del'>-	gnome_print_grestore (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* gets/frees the font for you, as a book font */</div><div class='del'>-static void</div><div class='del'>-print_text_size(GnomePrintContext *pc, const char *text,</div><div class='del'>-		     enum align_box align, double l, double r, double t, double b)</div><div class='del'>-{</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-</div><div class='del'>-	font = get_font_for_size (t - b, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-	print_text(pc, font, text, align, l, r, t, b);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* gets/frees the font for you, as a bold font */</div><div class='del'>-static void</div><div class='del'>-print_text_size_bold(GnomePrintContext *pc, const char *text,</div><div class='del'>-		     enum align_box align, double l, double r, double t, double b)</div><div class='del'>-{</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-</div><div class='del'>-	font = get_font_for_size (t - b, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-	print_text(pc, font, text, align, l, r, t, b);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-titled_box (GnomePrintContext *pc, const char *text, GnomeFont *font,</div><div class='del'>-	    enum align_box align, double *l, double *r, double *t, double *b,</div><div class='del'>-	    double linewidth)</div><div class='del'>-{</div><div class='del'>-	double size;</div><div class='del'>-</div><div class='del'>-	size = gnome_font_get_size (font);</div><div class='del'>-</div><div class='del'>-	if (align &amp; ALIGN_BORDER) {</div><div class='del'>-		print_border (pc, *l, *r, *t, *t - size * 1.4,</div><div class='del'>-			      linewidth, 0.9);</div><div class='del'>-		print_border (pc, *l, *r, *t - size * 1.4, *b,</div><div class='del'>-			      linewidth, -1.0);</div><div class='del'>-</div><div class='del'>-		*l += 2;</div><div class='del'>-		*r -= 2;</div><div class='del'>-		*b += 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	print_text (pc, font, text, align, *l, *r, *t, *t - size * 1.4);</div><div class='del'>-	*t -= size * 1.4;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum datefmt {</div><div class='del'>-	DATE_MONTH	= 1 &lt;&lt; 0,</div><div class='del'>-	DATE_DAY	= 1 &lt;&lt; 1,</div><div class='del'>-	DATE_DAYNAME	= 1 &lt;&lt; 2,</div><div class='del'>-	DATE_YEAR	= 1 &lt;&lt; 3</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *days[] = {</div><div class='del'>-	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),</div><div class='del'>-	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),</div><div class='del'>-	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),</div><div class='del'>-	N_("16th"), N_("17th"), N_("18th"), N_("19th"), N_("20th"),</div><div class='del'>-	N_("21st"), N_("22nd"), N_("23rd"), N_("24th"), N_("25th"),</div><div class='del'>-	N_("26th"), N_("27th"), N_("28th"), N_("29th"),	N_("30th"),</div><div class='del'>-	N_("31st")</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  format the date 'nicely' and consistently for various headers</div><div class='del'>-*/</div><div class='del'>-static char *</div><div class='del'>-format_date(time_t time, int flags, char *buffer, int bufflen)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	char fmt[64];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	char *utf_str;</div><div class='del'>-</div><div class='del'>-	tm = *convert_timet_to_struct_tm (time, zone);</div><div class='del'>-</div><div class='del'>-	fmt[0] = 0;</div><div class='del'>-	if (flags &amp; DATE_DAYNAME) {</div><div class='del'>-		strcat(fmt, "%A");</div><div class='del'>-	}</div><div class='del'>-	if (flags &amp; DATE_DAY) {</div><div class='del'>-		if (flags &amp; DATE_DAYNAME)</div><div class='del'>-			strcat(fmt, " ");</div><div class='del'>-		strcat(fmt, gettext(days[tm.tm_mday-1]));</div><div class='del'>-	}</div><div class='del'>-	if (flags &amp; DATE_MONTH) {</div><div class='del'>-		if (flags &amp; (DATE_DAY|DATE_DAYNAME))</div><div class='del'>-			strcat(fmt, " ");</div><div class='del'>-		strcat(fmt, "%B");</div><div class='del'>-		if ((flags &amp; (DATE_DAY|DATE_YEAR)) == (DATE_DAY|DATE_YEAR))</div><div class='del'>-			strcat(fmt, ",");</div><div class='del'>-	}</div><div class='del'>-	if (flags &amp; DATE_YEAR) {</div><div class='del'>-		if (flags &amp; (DATE_DAY|DATE_DAYNAME|DATE_MONTH))</div><div class='del'>-			strcat(fmt, " ");</div><div class='del'>-		strcat(fmt, "%Y");</div><div class='del'>-	}</div><div class='del'>-	strftime(buffer, bufflen, fmt, &amp;tm);</div><div class='del'>-	utf_str = e_utf8_from_locale_string (buffer);</div><div class='del'>-	strncpy (buffer, utf_str, bufflen - 1);</div><div class='del'>-	buffer[bufflen - 1] = '\0';</div><div class='del'>-	g_free (utf_str);</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  print out the month small, embolden any days with events.</div><div class='del'>-*/</div><div class='del'>-static void</div><div class='del'>-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal, time_t month,</div><div class='del'>-		   double left, double right, double top, double bottom,</div><div class='del'>-		   int titleflags, time_t greystart, time_t greyend,</div><div class='del'>-		   int bordertitle)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GnomeFont *font, *font_bold, *font_normal;</div><div class='del'>-	time_t now, next;</div><div class='del'>-	int x, y;</div><div class='del'>-	int days[42];</div><div class='del'>-	int day, weekday, week_start_day;</div><div class='del'>-	char buf[100];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	double font_size, max_font_size;</div><div class='del'>-	double header_size, col_width, row_height, text_xpad, w;</div><div class='del'>-	double cell_top, cell_bottom, cell_left, cell_right, text_right;</div><div class='del'>-	char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),</div><div class='del'>-			     N_("Th"), N_("Fr"), N_("Sa") };</div><div class='del'>-</div><div class='del'>-	/* Print the title, e.g. 'June 2001', in the top 16% of the area. */</div><div class='del'>-	format_date (month, titleflags, buf, 100);</div><div class='del'>-	header_size = (top - bottom) * 0.16;</div><div class='del'>-	font = get_font_for_size (header_size, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-	if (bordertitle) {</div><div class='del'>-		print_border (pc, left, right, top, top - header_size,</div><div class='del'>-			      1.0, 0.9);</div><div class='del'>-	}</div><div class='del'>-	print_text (pc, font, buf, ALIGN_CENTER, left, right,</div><div class='del'>-		    top, top - header_size);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	top -= header_size;</div><div class='del'>-</div><div class='del'>-	client = gnome_calendar_get_cal_client (gcal);</div><div class='del'>-</div><div class='del'>-	col_width = (right - left) / 7;</div><div class='del'>-</div><div class='del'>-	/* The top row with the day abbreviations gets an extra bit of</div><div class='del'>-	   vertical space around it. */</div><div class='del'>-	row_height = (top - bottom) / 7.4;</div><div class='del'>-</div><div class='del'>-	/* First we need to calculate a reasonable font size. We start with a</div><div class='del'>-	   rough guess of just under the height of each row. */</div><div class='del'>-	font_size = row_height;</div><div class='del'>-</div><div class='del'>-	/* Check that it isn't going to be too wide. The characters are about</div><div class='del'>-	   twice as high as they are wide, but we need to fit two characters</div><div class='del'>-	   into each cell, so we don't want to go over col_width. */</div><div class='del'>-	max_font_size = col_width * 0.65;</div><div class='del'>-</div><div class='del'>-	font_size = row_height;</div><div class='del'>-</div><div class='del'>-	/* get month days */</div><div class='del'>-	tm = *convert_timet_to_struct_tm (month, zone);</div><div class='del'>-	build_month (tm.tm_mon, tm.tm_year + 1900, days, 0, 0);</div><div class='del'>-</div><div class='del'>-	font_normal = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-	font_bold = get_font_for_size (font_size, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Get a reasonable estimate of the largest number we will need,</div><div class='del'>-	   and use it to calculate the offset from the right edge of the</div><div class='del'>-	   cell that we should put the numbers. */</div><div class='del'>-	w = gnome_font_get_width_utf8 (font_bold, "23");</div><div class='del'>-	text_xpad = (col_width - w) / 2;</div><div class='del'>-</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	/* Print the abbreviated day names across the top in bold. */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	weekday = week_start_day;</div><div class='del'>-	for (x = 0; x &lt; 7; x++) {</div><div class='del'>-		print_text (pc, font_bold, U_(daynames[weekday]), ALIGN_CENTER,</div><div class='del'>-			    left + x * col_width, left + (x + 1) * col_width,</div><div class='del'>-			    top, top - row_height * 1.4);</div><div class='del'>-		weekday = (weekday + 1) % 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	top -= row_height * 1.4;</div><div class='del'>-</div><div class='del'>-	now = time_month_begin_with_zone (month, zone);</div><div class='del'>-	for (y = 0; y &lt; 6; y++) {</div><div class='del'>-</div><div class='del'>-		cell_top = top - y * row_height;</div><div class='del'>-		cell_bottom = cell_top - row_height;</div><div class='del'>-</div><div class='del'>-		for (x = 0; x &lt; 7; x++) {</div><div class='del'>-</div><div class='del'>-			cell_left = left + x * col_width;</div><div class='del'>-			/* We add a 0.05 to make sure the cells meet up with</div><div class='del'>-			   each other. Otherwise you sometimes get lines</div><div class='del'>-			   between them which looks bad. Maybe I'm not using</div><div class='del'>-			   coords in the way gnome-print expects. */</div><div class='del'>-			cell_right = cell_left + col_width + 0.05;</div><div class='del'>-			text_right = cell_right - text_xpad;</div><div class='del'>-</div><div class='del'>-			day = days[y * 7 + x];</div><div class='del'>-			if (day != 0) {</div><div class='del'>-				GList *uids;</div><div class='del'>-</div><div class='del'>-				sprintf (buf, "%d", day);</div><div class='del'>-</div><div class='del'>-				/* this is a slow messy way to do this ... but easy ... */</div><div class='del'>-				uids = cal_client_get_objects_in_range (client,</div><div class='del'>-									CALOBJ_TYPE_EVENT,</div><div class='del'>-									now, time_day_end_with_zone (now, zone));</div><div class='del'>-				font = uids ? font_bold : font_normal;</div><div class='del'>-				cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-				next = time_add_day_with_zone (now, 1, zone);</div><div class='del'>-				if ((now &gt;= greystart &amp;&amp; now &lt; greyend)</div><div class='del'>-				    || (greystart &gt;= now &amp;&amp; greystart &lt; next)) {</div><div class='del'>-					print_border (pc,</div><div class='del'>-						      cell_left, cell_right,</div><div class='del'>-						      cell_top, cell_bottom,</div><div class='del'>-						      -1.0, 0.75);</div><div class='del'>-				}</div><div class='del'>-				print_text (pc, font, buf, ALIGN_RIGHT,</div><div class='del'>-					    cell_left, text_right,</div><div class='del'>-					    cell_top, cell_bottom);</div><div class='del'>-</div><div class='del'>-				now = next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_normal));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_bold));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* wraps text into the print context, not taking up more than its allowed space */</div><div class='del'>-static double</div><div class='del'>-bound_text(GnomePrintContext *pc, GnomeFont *font, const char *text,</div><div class='del'>-	   double left, double right, double top, double bottom, double indent)</div><div class='del'>-{</div><div class='del'>-	double maxwidth = right-left;</div><div class='del'>-	double width;</div><div class='del'>-	const char *p;</div><div class='del'>-	char *wordstart;</div><div class='del'>-	int c;</div><div class='del'>-	char *outbuffer, *o, *outbuffendmarker;</div><div class='del'>-	int outbufflen;</div><div class='del'>-	int dump=0;</div><div class='del'>-	int first=1;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(text!=NULL, top);</div><div class='del'>-</div><div class='del'>-	if (top&lt;bottom) {</div><div class='del'>-		/* too much to fit in appointment printout */</div><div class='del'>-		return top;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outbufflen = 1024;</div><div class='del'>-	outbuffer = g_malloc(outbufflen);</div><div class='del'>-	outbuffendmarker = outbuffer+outbufflen-2;</div><div class='del'>-</div><div class='del'>-	top -= gnome_font_get_size (font);</div><div class='del'>-	gnome_print_setfont (pc, font);</div><div class='del'>-</div><div class='del'>-	width=0;</div><div class='del'>-	p = text;</div><div class='del'>-	wordstart = outbuffer;</div><div class='del'>-	o = outbuffer;</div><div class='del'>-	while ((c=*p)) {</div><div class='del'>-		if (c=='\n') {</div><div class='del'>-			wordstart=o;</div><div class='del'>-			dump=1;</div><div class='del'>-		} else {</div><div class='del'>-			/* grow output buffer if required */</div><div class='del'>-			if (o&gt;=outbuffendmarker) {</div><div class='del'>-				char *newbuf;</div><div class='del'>-				outbufflen*=2;</div><div class='del'>-				newbuf = g_realloc(outbuffer, outbufflen);</div><div class='del'>-				o = newbuf+(o-outbuffer);</div><div class='del'>-				wordstart = newbuf+(o-outbuffer);</div><div class='del'>-				outbuffer = newbuf;</div><div class='del'>-				outbuffendmarker = outbuffer+outbufflen-2;</div><div class='del'>-			}</div><div class='del'>-			*o++=c;</div><div class='del'>-			if (c==' ')</div><div class='del'>-				wordstart = o;</div><div class='del'>-			width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));</div><div class='del'>-			if (width&gt;maxwidth)</div><div class='del'>-				dump=1;</div><div class='del'>-			else</div><div class='del'>-				dump=0;</div><div class='del'>-		}</div><div class='del'>-		if (dump) {</div><div class='del'>-			if (wordstart==outbuffer)</div><div class='del'>-				wordstart=o;</div><div class='del'>-			c=*wordstart;</div><div class='del'>-			*wordstart=0;</div><div class='del'>-			gnome_print_moveto(pc, left, top);</div><div class='del'>-			gnome_print_show(pc, outbuffer);</div><div class='del'>-			*wordstart=c;</div><div class='del'>-			memcpy(outbuffer, wordstart, o-wordstart);</div><div class='del'>-			width = gnome_font_get_width_utf8_sized(font, outbuffer, o-wordstart);</div><div class='del'>-			o=outbuffer+(o-wordstart);</div><div class='del'>-			wordstart = outbuffer;</div><div class='del'>-			top -= gnome_font_get_size (font);</div><div class='del'>-			if (top&lt;bottom) {</div><div class='del'>-				/* too much to fit, drop the rest */</div><div class='del'>-				g_free(outbuffer);</div><div class='del'>-				return top;</div><div class='del'>-			}</div><div class='del'>-			if (first) {</div><div class='del'>-				left += indent;</div><div class='del'>-				maxwidth -= indent;</div><div class='del'>-				first=0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-	if (dump==0) {</div><div class='del'>-		*o=0;</div><div class='del'>-		gnome_print_moveto(pc, left, top);</div><div class='del'>-		gnome_print_show(pc, outbuffer);</div><div class='del'>-		top -= gnome_font_get_size (font);</div><div class='del'>-	}</div><div class='del'>-	g_free(outbuffer);</div><div class='del'>-	return top;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Draw the borders, lines, and times down the left of the day view. */</div><div class='del'>-static void</div><div class='del'>-print_day_background (GnomePrintContext *pc, GnomeCalendar *gcal,</div><div class='del'>-		      time_t whence, struct pdinfo *pdi,</div><div class='del'>-		      double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	GnomeFont *font_hour, *font_minute;</div><div class='del'>-	double yinc, y;</div><div class='del'>-	double width = DAY_VIEW_TIME_COLUMN_WIDTH;</div><div class='del'>-	double font_size, max_font_size, hour_font_size, minute_font_size;</div><div class='del'>-	char buf[20];</div><div class='del'>-	const char *minute;</div><div class='del'>-	gboolean use_24_hour;</div><div class='del'>-	int i, hour, row;</div><div class='del'>-</div><div class='del'>-	/* Fill the time column in light-gray. */</div><div class='del'>-	print_border (pc, left, left + width, top, bottom, -1.0, 0.9);</div><div class='del'>-</div><div class='del'>-	/* Draw the border around the entire view. */</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-	print_border (pc, left, right, top, bottom, 1.0, -1.0);</div><div class='del'>-</div><div class='del'>-	/* Draw the vertical line on the right of the time column. */</div><div class='del'>-	gnome_print_setlinewidth (pc, 0.0);</div><div class='del'>-	gnome_print_moveto (pc, left + width, bottom);</div><div class='del'>-	gnome_print_lineto (pc, left + width, top);</div><div class='del'>-	gnome_print_stroke (pc);</div><div class='del'>-</div><div class='del'>-	/* Calculate the row height. */</div><div class='del'>-	yinc = (top - bottom) / (pdi-&gt;end_hour - pdi-&gt;start_hour);</div><div class='del'>-</div><div class='del'>-        /* Get the 2 fonts we need. */</div><div class='del'>-	font_size = yinc * 0.6;</div><div class='del'>-	max_font_size = width * 0.5;</div><div class='del'>-	hour_font_size = MIN (font_size, max_font_size);</div><div class='del'>-	font_hour = get_font_for_size (hour_font_size, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-</div><div class='del'>-	font_size = yinc * 0.33;</div><div class='del'>-	max_font_size = width * 0.25;</div><div class='del'>-	minute_font_size = MIN (font_size, max_font_size);</div><div class='del'>-	font_minute = get_font_for_size (minute_font_size, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	row = 0;</div><div class='del'>-	for (i = pdi-&gt;start_hour; i &lt; pdi-&gt;end_hour; i++) {</div><div class='del'>-		y = top - yinc * (row + 1);</div><div class='del'>-		gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-		if (use_24_hour) {</div><div class='del'>-			hour = i;</div><div class='del'>-			minute = "00";</div><div class='del'>-		} else {</div><div class='del'>-			if (i &lt; 12)</div><div class='del'>-				minute = U_("am");</div><div class='del'>-			else</div><div class='del'>-				minute = U_("pm");</div><div class='del'>-</div><div class='del'>-			hour = i % 12;</div><div class='del'>-			if (hour == 0)</div><div class='del'>-				hour = 12;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* the hour label/minute */</div><div class='del'>-		sprintf (buf, "%d", hour);</div><div class='del'>-		print_text (pc, font_hour, buf, ALIGN_RIGHT,</div><div class='del'>-			    left, left + width * 0.58,</div><div class='del'>-			    y + yinc - 4, y + yinc - 4 - hour_font_size);</div><div class='del'>-		print_text (pc, font_minute, minute, ALIGN_RIGHT,</div><div class='del'>-			    left, left + width - 3,</div><div class='del'>-			    y + yinc - 3, y + yinc - 3 - minute_font_size);</div><div class='del'>-</div><div class='del'>-		/* Draw the horizontal line between hours, across the entire</div><div class='del'>-		   width of the day view. */</div><div class='del'>-		gnome_print_moveto (pc, left, y);</div><div class='del'>-		gnome_print_lineto (pc, right, y);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-</div><div class='del'>-		/* Draw the horizontal line for the 1/2-hours, across the</div><div class='del'>-		   entire width except for part of the time column. */</div><div class='del'>-		gnome_print_moveto (pc, left + width * 0.6, y + yinc / 2);</div><div class='del'>-		gnome_print_lineto (pc, right, y + yinc / 2);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-</div><div class='del'>-		row++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_hour));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_minute));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gint</div><div class='del'>-print_day_add_event (CalComponent *comp,</div><div class='del'>-		     time_t	    start,</div><div class='del'>-		     time_t	    end,</div><div class='del'>-		     gint	    days_shown,</div><div class='del'>-		     time_t	   *day_starts,</div><div class='del'>-		     GArray	   *long_events,</div><div class='del'>-		     GArray	  **events)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	EDayViewEvent event;</div><div class='del'>-	gint day, offset;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Day view lower: %s", ctime (&amp;day_starts[0]));</div><div class='del'>-	g_print ("Day view upper: %s", ctime (&amp;day_starts[days_shown]));</div><div class='del'>-	g_print ("Event start: %s", ctime (&amp;start));</div><div class='del'>-	g_print ("Event end  : %s\n", ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Check that the event times are valid. */</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, -1);</div><div class='del'>-	g_return_val_if_fail (start &lt; day_starts[days_shown], -1);</div><div class='del'>-	g_return_val_if_fail (end &gt; day_starts[0], -1);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.canvas_item = NULL;</div><div class='del'>-</div><div class='del'>-	/* Calculate the start &amp; end minute, relative to the top of the</div><div class='del'>-	   display. */</div><div class='del'>-	/*offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-	  + day_view-&gt;first_minute_shown;*/</div><div class='del'>-	offset = 0;</div><div class='del'>-	event.start_minute = start_tt.hour * 60 + start_tt.minute - offset;</div><div class='del'>-	event.end_minute = end_tt.hour * 60 + end_tt.minute - offset;</div><div class='del'>-</div><div class='del'>-	event.start_row_or_col = 0;</div><div class='del'>-	event.num_columns = 0;</div><div class='del'>-</div><div class='del'>-	/* Find out which array to add the event to. */</div><div class='del'>-	for (day = 0; day &lt; days_shown; day++) {</div><div class='del'>-		if (start &gt;= day_starts[day] &amp;&amp; end &lt;= day_starts[day + 1]) {</div><div class='del'>-</div><div class='del'>-			/* Special case for when the appointment ends at</div><div class='del'>-			   midnight, i.e. the start of the next day. */</div><div class='del'>-			if (end == day_starts[day + 1]) {</div><div class='del'>-</div><div class='del'>-				/* If the event last the entire day, then we</div><div class='del'>-				   skip it here so it gets added to the top</div><div class='del'>-				   canvas. */</div><div class='del'>-				if (start == day_starts[day])</div><div class='del'>-				    break;</div><div class='del'>-</div><div class='del'>-				event.end_minute = 24 * 60;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_array_append_val (events[day], event);</div><div class='del'>-			return day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The event wasn't within one day so it must be a long event,</div><div class='del'>-	   i.e. shown in the top canvas. */</div><div class='del'>-	g_array_append_val (long_events, event);</div><div class='del'>-	return E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend,</div><div class='del'>-		      gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct pdinfo *pdi = (struct pdinfo *)data;</div><div class='del'>-</div><div class='del'>-	print_day_add_event (comp, istart, iend,</div><div class='del'>-			     pdi-&gt;days_shown, pdi-&gt;day_starts,</div><div class='del'>-			     pdi-&gt;long_events, pdi-&gt;events);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_event_array (GArray *array)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; array-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (array, EDayViewEvent, event_num);</div><div class='del'>-		if (event-&gt;canvas_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (array, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_day_long_event (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-		      double left, double right, double top, double bottom,</div><div class='del'>-		      double row_height, EDayViewEvent *event,</div><div class='del'>-		      struct pdinfo *pdi)</div><div class='del'>-{</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	double x1, x2, y1, y2;</div><div class='del'>-	double left_triangle_width = -1.0, right_triangle_width = -1.0;</div><div class='del'>-	char *text;</div><div class='del'>-	char buffer[32];</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-</div><div class='del'>-	/* If the event starts before the first day being printed, draw a</div><div class='del'>-	   triangle. (Note that I am assuming we are just showing 1 day at</div><div class='del'>-	   the moment.) */</div><div class='del'>-	if (event-&gt;start &lt; pdi-&gt;day_starts[0])</div><div class='del'>-		left_triangle_width = 4;</div><div class='del'>-</div><div class='del'>-	/* If the event ends after the last day being printed, draw a</div><div class='del'>-	   triangle. */</div><div class='del'>-	if (event-&gt;end &gt; pdi-&gt;day_starts[1])</div><div class='del'>-		right_triangle_width = 4;</div><div class='del'>-</div><div class='del'>-	x1 = left + 10;</div><div class='del'>-	x2 = right - 10;</div><div class='del'>-	y1 = top - event-&gt;start_row_or_col * row_height - 4;</div><div class='del'>-	y2 = y1 - row_height + 4;</div><div class='del'>-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, 0.95,</div><div class='del'>-				     left_triangle_width,</div><div class='del'>-				     right_triangle_width);</div><div class='del'>-</div><div class='del'>-	/* If the event starts after the first day being printed, we need to</div><div class='del'>-	   print the start time. */</div><div class='del'>-	if (event-&gt;start &gt; pdi-&gt;day_starts[0]) {</div><div class='del'>-		date_tm.tm_year = 2001;</div><div class='del'>-		date_tm.tm_mon = 0;</div><div class='del'>-		date_tm.tm_mday = 1;</div><div class='del'>-		date_tm.tm_hour = event-&gt;start_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;start_minute % 60;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-		date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, pdi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-		x1 += 4;</div><div class='del'>-		print_text (pc, font, buffer, ALIGN_LEFT, x1, x2, y1, y2);</div><div class='del'>-		x1 += gnome_font_get_width_utf8 (font, buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event ends before the end of the last day being printed,</div><div class='del'>-	   we need to print the end time. */</div><div class='del'>-	if (event-&gt;end &lt; pdi-&gt;day_starts[1]) {</div><div class='del'>-		date_tm.tm_year = 2001;</div><div class='del'>-		date_tm.tm_mon = 0;</div><div class='del'>-		date_tm.tm_mday = 1;</div><div class='del'>-		date_tm.tm_hour = event-&gt;end_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;end_minute % 60;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-		date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, pdi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-		x2 -= 4;</div><div class='del'>-		print_text (pc, font, buffer, ALIGN_RIGHT, x1, x2, y1, y2);</div><div class='del'>-		x2 -= gnome_font_get_width_utf8 (font, buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Print the text. */</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	text = summary.value ? (char*) summary.value : "";</div><div class='del'>-</div><div class='del'>-	x1 += 4;</div><div class='del'>-	x2 -= 4;</div><div class='del'>-	print_text (pc, font, text, ALIGN_CENTER, x1, x2, y1, y2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_day_event (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-		 double left, double right, double top, double bottom,</div><div class='del'>-		 EDayViewEvent *event, struct pdinfo *pdi)</div><div class='del'>-{</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	double x1, x2, y1, y2, col_width, row_height;</div><div class='del'>-	int start_offset, end_offset, start_row, end_row;</div><div class='del'>-	char *text, start_buffer[32], end_buffer[32];</div><div class='del'>-	gboolean display_times = FALSE, free_text = FALSE;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-</div><div class='del'>-	if ((event-&gt;start_minute &gt;= pdi-&gt;end_minute_offset)</div><div class='del'>-	    || (event-&gt;end_minute &lt;= pdi-&gt;start_minute_offset))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	start_offset = event-&gt;start_minute - pdi-&gt;start_minute_offset;</div><div class='del'>-	end_offset = event-&gt;end_minute - pdi-&gt;start_minute_offset;</div><div class='del'>-</div><div class='del'>-	start_row = start_offset / pdi-&gt;mins_per_row;</div><div class='del'>-	start_row = MAX (0, start_row);</div><div class='del'>-	end_row = (end_offset - 1) / pdi-&gt;mins_per_row;</div><div class='del'>-	end_row = MIN (pdi-&gt;rows - 1, end_row);</div><div class='del'>-	col_width = (right - left) / pdi-&gt;cols_per_row[event-&gt;start_minute / pdi-&gt;mins_per_row];</div><div class='del'>-</div><div class='del'>-	if (start_offset != start_row * pdi-&gt;mins_per_row</div><div class='del'>-	    || end_offset != (end_row + 1) * pdi-&gt;mins_per_row)</div><div class='del'>-		display_times = TRUE;</div><div class='del'>-</div><div class='del'>-	x1 = left + event-&gt;start_row_or_col * col_width;</div><div class='del'>-	x2 = x1 + event-&gt;num_columns * col_width - DAY_VIEW_EVENT_X_PAD;</div><div class='del'>-</div><div class='del'>-	row_height = (top - bottom) / pdi-&gt;rows;</div><div class='del'>-	y1 = top - start_row * row_height;</div><div class='del'>-	y2 = top - (end_row + 1) * row_height;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Event: %g,%g %g,%g\n  row_height: %g start_row: %i top: %g rows: %i\n",</div><div class='del'>-		 x1, y1, x2, y2, row_height, start_row, top, pdi-&gt;rows);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	print_border (pc, x1, x2, y1, y2, 1.0, 0.95);</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	text = summary.value ? (char*) summary.value : "";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (display_times) {</div><div class='del'>-		date_tm.tm_year = 2001;</div><div class='del'>-		date_tm.tm_mon = 0;</div><div class='del'>-		date_tm.tm_mday = 1;</div><div class='del'>-		date_tm.tm_hour = event-&gt;start_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;start_minute % 60;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-		date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, pdi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    start_buffer, sizeof (start_buffer));</div><div class='del'>-</div><div class='del'>-		date_tm.tm_hour = event-&gt;end_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;end_minute % 60;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, pdi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    end_buffer, sizeof (end_buffer));</div><div class='del'>-</div><div class='del'>-		text = g_strdup_printf ("%s - %s %s ", start_buffer,</div><div class='del'>-					end_buffer, text);</div><div class='del'>-</div><div class='del'>-		free_text = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bound_text (pc, font, text, x1 + 2, x2 - 2, y1, y2, 0);</div><div class='del'>-</div><div class='del'>-	if (free_text)</div><div class='del'>-		g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,</div><div class='del'>-		   double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	CalClient *client;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	struct pdinfo pdi;</div><div class='del'>-	gint rows_in_top_display, i;</div><div class='del'>-	double font_size, max_font_size;</div><div class='del'>-</div><div class='del'>-	start = time_day_begin_with_zone (whence, zone);</div><div class='del'>-	end = time_day_end_with_zone (start, zone);</div><div class='del'>-</div><div class='del'>-	pdi.days_shown = 1;</div><div class='del'>-	pdi.day_starts[0] = start;</div><div class='del'>-	pdi.day_starts[1] = end;</div><div class='del'>-	pdi.long_events = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));</div><div class='del'>-	pdi.events[0] = g_array_new (FALSE, FALSE, sizeof (EDayViewEvent));</div><div class='del'>-	pdi.start_hour = calendar_config_get_day_start_hour ();</div><div class='del'>-	pdi.end_hour = calendar_config_get_day_end_hour ();</div><div class='del'>-	if (calendar_config_get_day_end_minute () != 0)</div><div class='del'>-		pdi.end_hour++;</div><div class='del'>-	pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;</div><div class='del'>-	pdi.mins_per_row = 30;</div><div class='del'>-	pdi.start_minute_offset = pdi.start_hour * 60;</div><div class='del'>-	pdi.end_minute_offset = pdi.end_hour * 60;</div><div class='del'>-	pdi.use_24_hour_format = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	/* Get the events from the server. */</div><div class='del'>-	client = gnome_calendar_get_cal_client (gcal);</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,</div><div class='del'>-				       print_day_details_cb, &amp;pdi);</div><div class='del'>-	qsort (pdi.long_events-&gt;data, pdi.long_events-&gt;len,</div><div class='del'>-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);</div><div class='del'>-	qsort (pdi.events[0]-&gt;data, pdi.events[0]-&gt;len,</div><div class='del'>-	       sizeof (EDayViewEvent), e_day_view_event_sort_func);</div><div class='del'>-</div><div class='del'>-	/* Also print events outside of work hours */</div><div class='del'>-	if (pdi.events[0]-&gt;len &gt; 0) {</div><div class='del'>-		icaltimezone *zone = get_timezone ();</div><div class='del'>-		struct icaltimetype tt;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (pdi.events[0], EDayViewEvent, 0);		</div><div class='del'>-		tt = icaltime_from_timet_with_zone (event-&gt;start, FALSE, zone);</div><div class='del'>-		if (tt.hour &lt; pdi.start_hour)</div><div class='del'>-			pdi.start_hour = tt.hour;</div><div class='del'>-		pdi.start_minute_offset = pdi.start_hour * 60;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (pdi.events[0], EDayViewEvent, pdi.events[0]-&gt;len - 1);</div><div class='del'>-		tt = icaltime_from_timet_with_zone (event-&gt;end, FALSE, zone);</div><div class='del'>-		if (tt.hour &gt; pdi.end_hour || tt.hour == 0) {</div><div class='del'>-			pdi.end_hour = tt.hour ? tt.hour : 24;</div><div class='del'>-			if (tt.minute &gt; 0)</div><div class='del'>-				pdi.end_hour++;</div><div class='del'>-		}</div><div class='del'>-		pdi.end_minute_offset = pdi.end_hour * 60;</div><div class='del'>-</div><div class='del'>-		pdi.rows = (pdi.end_hour - pdi.start_hour) * 2;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Lay them out the long events, across the top of the page. */</div><div class='del'>-	e_day_view_layout_long_events (pdi.long_events, pdi.days_shown,</div><div class='del'>-				       pdi.day_starts, &amp;rows_in_top_display);</div><div class='del'>-</div><div class='del'>-	/* Print the long events. */</div><div class='del'>-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-	for (i = 0; i &lt; pdi.long_events-&gt;len; i++) {</div><div class='del'>-		event = &amp;g_array_index (pdi.long_events, EDayViewEvent, i);</div><div class='del'>-		print_day_long_event (pc, font, left, right, top, bottom,</div><div class='del'>-				      DAY_VIEW_ROW_HEIGHT, event, &amp;pdi);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	/* We always leave space for DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY in the</div><div class='del'>-	   top display, but we may have more rows than that, in which case</div><div class='del'>-	   the main display area will be compressed. */</div><div class='del'>-	rows_in_top_display = MAX (rows_in_top_display,</div><div class='del'>-				   DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY);</div><div class='del'>-</div><div class='del'>-	/* Draw the border around the long events. */</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-	print_border (pc, left, right,</div><div class='del'>-		      top, top - rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,</div><div class='del'>-		      1.0, -1.0);</div><div class='del'>-</div><div class='del'>-	/* Adjust the area containing the main display. */</div><div class='del'>-	top -= rows_in_top_display * DAY_VIEW_ROW_HEIGHT + 4;</div><div class='del'>-</div><div class='del'>-	/* Draw the borders, lines, and times down the left. */</div><div class='del'>-	print_day_background (pc, gcal, whence, &amp;pdi,</div><div class='del'>-			      left, right, top, bottom);</div><div class='del'>-</div><div class='del'>-	/* Now adjust to get rid of the time column. */</div><div class='del'>-	left += DAY_VIEW_TIME_COLUMN_WIDTH;</div><div class='del'>-</div><div class='del'>-	/* Lay out the short events, within the day. */</div><div class='del'>-	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,</div><div class='del'>-				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row);</div><div class='del'>-</div><div class='del'>-	/* Print the short events. */</div><div class='del'>-	max_font_size = ((top - bottom) / pdi.rows) - 4;</div><div class='del'>-	font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);</div><div class='del'>-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-	for (i = 0; i &lt; pdi.events[0]-&gt;len; i++) {</div><div class='del'>-		event = &amp;g_array_index (pdi.events[0], EDayViewEvent, i);</div><div class='del'>-		print_day_event (pc, font, left, right, top, bottom,</div><div class='del'>-				 event, &amp;pdi);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	/* Free everything. */</div><div class='del'>-	free_event_array (pdi.long_events);</div><div class='del'>-	g_array_free (pdi.long_events, TRUE);</div><div class='del'>-	free_event_array (pdi.events[0]);</div><div class='del'>-	g_array_free (pdi.events[0], TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gboolean</div><div class='del'>-print_week_summary_cb (CalComponent *comp,</div><div class='del'>-		       time_t	  start,</div><div class='del'>-		       time_t	  end,</div><div class='del'>-		       gpointer	  data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	EWeekViewEvent event;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-</div><div class='del'>-	struct psinfo *psi = (struct psinfo *)data;</div><div class='del'>-</div><div class='del'>-	/* Check that the event times are valid. */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",</div><div class='del'>-		 psi-&gt;day_starts[0], psi-&gt;day_starts[psi-&gt;days_shown],</div><div class='del'>-		 start, end);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, TRUE);</div><div class='del'>-	g_return_val_if_fail (start &lt; psi-&gt;day_starts[psi-&gt;days_shown], TRUE);</div><div class='del'>-	g_return_val_if_fail (end &gt; psi-&gt;day_starts[0], TRUE);</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (event.comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.spans_index = 0;</div><div class='del'>-	event.num_spans = 0;</div><div class='del'>-</div><div class='del'>-	event.start_minute = start_tt.hour * 60 + start_tt.minute;</div><div class='del'>-	event.end_minute = end_tt.hour * 60 + end_tt.minute;</div><div class='del'>-	if (event.end_minute == 0 &amp;&amp; start != end)</div><div class='del'>-		event.end_minute = 24 * 60;</div><div class='del'>-</div><div class='del'>-	g_array_append_val (psi-&gt;events, event);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the event is a one-day event (i.e. not a long event). */</div><div class='del'>-static gboolean</div><div class='del'>-print_is_one_day_week_event (EWeekViewEvent *event,</div><div class='del'>-			     EWeekViewEventSpan *span,</div><div class='del'>-			     time_t *day_starts)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;start == day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end == day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (span-&gt;num_days == 1</div><div class='del'>-	    &amp;&amp; event-&gt;start &gt;= day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end &lt;= day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_long_event (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-		       struct psinfo *psi,</div><div class='del'>-		       double x1, double x2, double y1, double y2,</div><div class='del'>-		       EWeekViewEvent *event, EWeekViewEventSpan *span,</div><div class='del'>-		       char *text)</div><div class='del'>-{</div><div class='del'>-	double left_triangle_width = -1.0, right_triangle_width = -1.0;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	char buffer[32];</div><div class='del'>-</div><div class='del'>-	/* If the event starts before the first day of the span, draw a</div><div class='del'>-	   triangle to indicate it continues. */</div><div class='del'>-	if (event-&gt;start &lt; psi-&gt;day_starts[span-&gt;start_day])</div><div class='del'>-		left_triangle_width = 4;</div><div class='del'>-</div><div class='del'>-	/* If the event ends after the last day of the span, draw a</div><div class='del'>-	   triangle. */</div><div class='del'>-	if (event-&gt;end &gt; psi-&gt;day_starts[span-&gt;start_day + span-&gt;num_days])</div><div class='del'>-		right_triangle_width = 4;</div><div class='del'>-</div><div class='del'>-	print_border_with_triangles (pc, x1, x2, y1, y2, 0.5, 0.9,</div><div class='del'>-				     left_triangle_width,</div><div class='del'>-				     right_triangle_width);</div><div class='del'>-</div><div class='del'>-	/* If the event starts after the first day being printed, we need to</div><div class='del'>-	   print the start time. */</div><div class='del'>-	if (event-&gt;start &gt; psi-&gt;day_starts[span-&gt;start_day]) {</div><div class='del'>-		date_tm.tm_year = 2001;</div><div class='del'>-		date_tm.tm_mon = 0;</div><div class='del'>-		date_tm.tm_mday = 1;</div><div class='del'>-		date_tm.tm_hour = event-&gt;start_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;start_minute % 60;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-		date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, psi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-		x1 += 4;</div><div class='del'>-		print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);</div><div class='del'>-		x1 += gnome_font_get_width_utf8 (font, buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event ends before the end of the last day being printed,</div><div class='del'>-	   we need to print the end time. */</div><div class='del'>-	if (event-&gt;end &lt; psi-&gt;day_starts[span-&gt;start_day + span-&gt;num_days]) {</div><div class='del'>-		date_tm.tm_year = 2001;</div><div class='del'>-		date_tm.tm_mon = 0;</div><div class='del'>-		date_tm.tm_mday = 1;</div><div class='del'>-		date_tm.tm_hour = event-&gt;end_minute / 60;</div><div class='del'>-		date_tm.tm_min = event-&gt;end_minute % 60;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-		date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-		e_time_format_time (&amp;date_tm, psi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-				    buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-		x2 -= 4;</div><div class='del'>-		print_text_size (pc, buffer, ALIGN_RIGHT, x1, x2, y1, y2);</div><div class='del'>-		x2 -= gnome_font_get_width_utf8 (font, buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	x1 += 4;</div><div class='del'>-	x2 -= 4;</div><div class='del'>-	print_text_size (pc, text, ALIGN_CENTER, x1, x2, y1, y2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_day_event (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-		      struct psinfo *psi,</div><div class='del'>-		      double x1, double x2, double y1, double y2,</div><div class='del'>-		      EWeekViewEvent *event, EWeekViewEventSpan *span,</div><div class='del'>-		      char *text)</div><div class='del'>-{</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	char buffer[32];</div><div class='del'>-</div><div class='del'>-	date_tm.tm_year = 2001;</div><div class='del'>-	date_tm.tm_mon = 0;</div><div class='del'>-	date_tm.tm_mday = 1;</div><div class='del'>-	date_tm.tm_hour = event-&gt;start_minute / 60;</div><div class='del'>-	date_tm.tm_min = event-&gt;start_minute % 60;</div><div class='del'>-	date_tm.tm_sec = 0;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	e_time_format_time (&amp;date_tm, psi-&gt;use_24_hour_format, FALSE,</div><div class='del'>-			    buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-	print_text_size (pc, buffer, ALIGN_LEFT, x1, x2, y1, y2);</div><div class='del'>-	x1 += gnome_font_get_width_utf8 (font, buffer);</div><div class='del'>-</div><div class='del'>-	x1 += 4;</div><div class='del'>-	print_text_size (pc, text, ALIGN_LEFT, x1, x2, y1, y2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_event (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-		  struct psinfo *psi,</div><div class='del'>-		  double left, double top,</div><div class='del'>-		  double cell_width, double cell_height,</div><div class='del'>-		  EWeekViewEvent *event, GArray *spans)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint span_num;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	char *text;</div><div class='del'>-	int num_days, start_x, start_y, start_h, end_x, end_y, end_h;</div><div class='del'>-	double x1, x2, y1, y2;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	text = summary.value ? (char*) summary.value : "";</div><div class='del'>-</div><div class='del'>-	for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-		span = &amp;g_array_index (spans, EWeekViewEventSpan,</div><div class='del'>-				       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-		if (e_week_view_layout_get_span_position</div><div class='del'>-		    (event, span,</div><div class='del'>-		     psi-&gt;rows_per_cell,</div><div class='del'>-		     psi-&gt;rows_per_compressed_cell,</div><div class='del'>-		     psi-&gt;display_start_weekday,</div><div class='del'>-		     psi-&gt;multi_week_view,</div><div class='del'>-		     psi-&gt;compress_weekend,</div><div class='del'>-		     &amp;num_days)) {</div><div class='del'>-</div><div class='del'>-			e_week_view_layout_get_day_position</div><div class='del'>-				(span-&gt;start_day,</div><div class='del'>-				 psi-&gt;multi_week_view,</div><div class='del'>-				 psi-&gt;weeks_shown,</div><div class='del'>-				 psi-&gt;display_start_weekday,</div><div class='del'>-				 psi-&gt;compress_weekend,</div><div class='del'>-				 &amp;start_x, &amp;start_y, &amp;start_h);</div><div class='del'>-</div><div class='del'>-			if (num_days == 1) {</div><div class='del'>-				end_x = start_x;</div><div class='del'>-				end_y = start_y;</div><div class='del'>-				end_h = start_h;</div><div class='del'>-			} else {</div><div class='del'>-				e_week_view_layout_get_day_position</div><div class='del'>-					(span-&gt;start_day + num_days - 1,</div><div class='del'>-					 psi-&gt;multi_week_view,</div><div class='del'>-					 psi-&gt;weeks_shown,</div><div class='del'>-					 psi-&gt;display_start_weekday,</div><div class='del'>-					 psi-&gt;compress_weekend,</div><div class='del'>-					 &amp;end_x, &amp;end_y, &amp;end_h);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			x1 = left + start_x * cell_width + 6;</div><div class='del'>-			x2 = left + (end_x + 1) * cell_width - 6;</div><div class='del'>-			y1 = top - start_y * cell_height</div><div class='del'>-				- psi-&gt;header_row_height</div><div class='del'>-				- span-&gt;row * psi-&gt;row_height;</div><div class='del'>-			y2 = y1 - psi-&gt;row_height * 0.9;</div><div class='del'>-</div><div class='del'>-			if (print_is_one_day_week_event (event, span,</div><div class='del'>-							 psi-&gt;day_starts)) {</div><div class='del'>-				print_week_day_event (pc, font, psi,</div><div class='del'>-						      x1, x2, y1, y2,</div><div class='del'>-						      event, span, text);</div><div class='del'>-			} else {</div><div class='del'>-				print_week_long_event (pc, font, psi,</div><div class='del'>-						       x1, x2, y1, y2,</div><div class='del'>-						       event, span, text);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_view_background (GnomePrintContext *pc, GnomeFont *font,</div><div class='del'>-			    struct psinfo *psi,</div><div class='del'>-			    double left, double top,</div><div class='del'>-			    double cell_width, double cell_height)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	int day, day_x, day_y, day_h;</div><div class='del'>-	double x1, x2, y1, y2, font_size, fillcolor;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	char *format_string, buffer[128], *utf_str;</div><div class='del'>-</div><div class='del'>-	font_size = gnome_font_get_size (font);</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; psi-&gt;days_shown; day++) {</div><div class='del'>-		e_week_view_layout_get_day_position</div><div class='del'>-			(day, psi-&gt;multi_week_view, psi-&gt;weeks_shown,</div><div class='del'>-			 psi-&gt;display_start_weekday, psi-&gt;compress_weekend,</div><div class='del'>-			 &amp;day_x, &amp;day_y, &amp;day_h);</div><div class='del'>-</div><div class='del'>-		x1 = left + day_x * cell_width;</div><div class='del'>-		x2 = left + (day_x + 1) * cell_width;</div><div class='del'>-		y1 = top - day_y * cell_height;</div><div class='del'>-		y2 = y1 - day_h * cell_height;</div><div class='del'>-</div><div class='del'>-		tm = *convert_timet_to_struct_tm (psi-&gt;day_starts[day], zone);</div><div class='del'>-</div><div class='del'>-		/* In the month view we draw a grey background for the end</div><div class='del'>-		   of the previous month and the start of the following. */</div><div class='del'>-		fillcolor = -1.0;</div><div class='del'>-		if (psi-&gt;multi_week_view &amp;&amp; (tm.tm_mon != psi-&gt;month))</div><div class='del'>-			fillcolor = 0.9;</div><div class='del'>-</div><div class='del'>-		print_border (pc, x1, x2, y1, y2, 1.0, fillcolor);</div><div class='del'>-</div><div class='del'>-		if (psi-&gt;multi_week_view) {</div><div class='del'>-			if (tm.tm_mday == 1)</div><div class='del'>-				format_string = _("%d %B");</div><div class='del'>-			else</div><div class='del'>-				format_string = "%d";</div><div class='del'>-		} else {</div><div class='del'>-			gnome_print_moveto (pc, x1 + 0.1 * cell_width,</div><div class='del'>-					    y1 - psi-&gt;header_row_height + 3);</div><div class='del'>-			gnome_print_lineto (pc, x2,</div><div class='del'>-					    y1 - psi-&gt;header_row_height + 3);</div><div class='del'>-			gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-			gnome_print_setlinewidth (pc, 0.5);</div><div class='del'>-			gnome_print_stroke (pc);</div><div class='del'>-</div><div class='del'>-			/* strftime format %A = full weekday name, %d = day of</div><div class='del'>-			   month, %B = full month name. You can change the</div><div class='del'>-			   order but don't change the specifiers or add</div><div class='del'>-			   anything. */</div><div class='del'>-			format_string = _("%A %d %B");</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), format_string, &amp;tm);</div><div class='del'>-		utf_str = e_utf8_from_locale_string (buffer);</div><div class='del'>-		print_text_size (pc, utf_str, ALIGN_RIGHT,</div><div class='del'>-				 x1, x2 - 4, y1 - 2, y1 - 2 - font_size);</div><div class='del'>-		g_free (utf_str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal,</div><div class='del'>-		    time_t whence, gboolean multi_week_view, int weeks_shown,</div><div class='del'>-		    int month, double font_size,</div><div class='del'>-		    double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	CalClient *client;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	struct psinfo psi;</div><div class='del'>-	time_t day_start;</div><div class='del'>-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;</div><div class='del'>-	GArray *spans;</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	double cell_width, cell_height;</div><div class='del'>-</div><div class='del'>-	psi.days_shown = weeks_shown * 7;</div><div class='del'>-	psi.events = g_array_new (FALSE, FALSE, sizeof (EWeekViewEvent));</div><div class='del'>-	psi.multi_week_view = multi_week_view;</div><div class='del'>-	psi.weeks_shown = weeks_shown;</div><div class='del'>-	psi.month = month;</div><div class='del'>-</div><div class='del'>-	/* Get a few config settings. */</div><div class='del'>-	if (multi_week_view)</div><div class='del'>-		psi.compress_weekend = calendar_config_get_compress_weekend ();</div><div class='del'>-	else</div><div class='del'>-		psi.compress_weekend = TRUE;</div><div class='del'>-	psi.use_24_hour_format = calendar_config_get_24_hour_format ();</div><div class='del'>-</div><div class='del'>-	/* We convert this from (0 = Sun, 6 = Sat) to (0 = Mon, 6 = Sun). */</div><div class='del'>-	psi.display_start_weekday = calendar_config_get_week_start_day ();</div><div class='del'>-	psi.display_start_weekday = (psi.display_start_weekday + 6) % 7;</div><div class='del'>-</div><div class='del'>-	/* If weekends are compressed then we can't start on a Sunday. */</div><div class='del'>-	if (psi.compress_weekend &amp;&amp; psi.display_start_weekday == 6)</div><div class='del'>-		psi.display_start_weekday = 5;</div><div class='del'>-</div><div class='del'>-	day_start = time_day_begin_with_zone (whence, zone);</div><div class='del'>-	for (day = 0; day &lt;= psi.days_shown; day++) {</div><div class='del'>-		psi.day_starts[day] = day_start;</div><div class='del'>-		day_start = time_add_day_with_zone (day_start, 1, zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the events from the server. */</div><div class='del'>-	client = gnome_calendar_get_cal_client (gcal);</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT,</div><div class='del'>-				       psi.day_starts[0],</div><div class='del'>-				       psi.day_starts[psi.days_shown],</div><div class='del'>-				       print_week_summary_cb, &amp;psi);</div><div class='del'>-	qsort (psi.events-&gt;data, psi.events-&gt;len,</div><div class='del'>-	       sizeof (EWeekViewEvent), e_week_view_event_sort_func);</div><div class='del'>-</div><div class='del'>-	/* Layout the events. */</div><div class='del'>-	spans = e_week_view_layout_events (psi.events, NULL,</div><div class='del'>-					   psi.multi_week_view,</div><div class='del'>-					   psi.weeks_shown,</div><div class='del'>-					   psi.compress_weekend,</div><div class='del'>-					   psi.display_start_weekday,</div><div class='del'>-					   psi.day_starts, rows_per_day);</div><div class='del'>-</div><div class='del'>-	/* Calculate the size of the cells. */</div><div class='del'>-	if (multi_week_view) {</div><div class='del'>-		cell_width = (right - left) / (psi.compress_weekend ? 6 : 7);</div><div class='del'>-		cell_height = (top - bottom) / (weeks_shown * 2);</div><div class='del'>-	} else {</div><div class='del'>-		cell_width = (right - left) / 2;</div><div class='del'>-		cell_height = (top - bottom) / 6;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the row height, using the normal font and with room for</div><div class='del'>-	   space or a rectangle around it. */</div><div class='del'>-	psi.row_height = font_size * 1.2;</div><div class='del'>-	psi.header_row_height = font_size * 1.5;</div><div class='del'>-</div><div class='del'>-	/* Calculate how many rows we can fit into each type of cell. */</div><div class='del'>-	psi.rows_per_cell = ((cell_height * 2) - psi.header_row_height)</div><div class='del'>-		/ psi.row_height;</div><div class='del'>-	psi.rows_per_compressed_cell = (cell_height - psi.header_row_height)</div><div class='del'>-		/ psi.row_height;</div><div class='del'>-</div><div class='del'>-	font = get_font_for_size (font_size, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Draw the grid and the day names/numbers. */</div><div class='del'>-	print_week_view_background (pc, font, &amp;psi, left, top,</div><div class='del'>-				    cell_width, cell_height);</div><div class='del'>-</div><div class='del'>-	/* Print the events. */</div><div class='del'>-	for (event_num = 0; event_num &lt; psi.events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (psi.events, EWeekViewEvent, event_num);</div><div class='del'>-		print_week_event (pc, font, &amp;psi, left, top,</div><div class='del'>-				  cell_width, cell_height, event, spans);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	/* Free everything. */</div><div class='del'>-	for (event_num = 0; event_num &lt; psi.events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (psi.events, EWeekViewEvent, event_num);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-	g_array_free (psi.events, TRUE);</div><div class='del'>-	g_array_free (spans, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,</div><div class='del'>-		    double left, double right, double top, double bottom,</div><div class='del'>-		    int morerows)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	double row_height, col_width, l, r, t, b;</div><div class='del'>-	time_t now;</div><div class='del'>-	int col, row, rows, cols;</div><div class='del'>-</div><div class='del'>-	l = left;</div><div class='del'>-	t = top;</div><div class='del'>-</div><div class='del'>-	/* If morerows is set we do 4 rows and 3 columns instead of 3 rows and</div><div class='del'>-	   4 columns. This is useful if we switch paper orientation. */</div><div class='del'>-	if (morerows) {</div><div class='del'>-		rows = 4;</div><div class='del'>-		cols = 3;</div><div class='del'>-	} else {</div><div class='del'>-		rows = 3;</div><div class='del'>-		cols = 4;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	row_height = (top - bottom) / rows;</div><div class='del'>-	col_width = (right - left) / cols;</div><div class='del'>-	r = l + col_width;</div><div class='del'>-	b = top - row_height;</div><div class='del'>-	now = time_year_begin_with_zone (whence, zone);</div><div class='del'>-</div><div class='del'>-	for (row = 0; row &lt; rows; row++) {</div><div class='del'>-		t = top - row_height * row;</div><div class='del'>-		b = t - row_height;</div><div class='del'>-		for (col = 0; col &lt; cols; col++) {</div><div class='del'>-			l = left + col_width * col;</div><div class='del'>-			r = l + col_width;</div><div class='del'>-			print_month_small (pc, gcal, now,</div><div class='del'>-					   l + 8, r - 8, t - 8, b + 8,</div><div class='del'>-					   DATE_MONTH, 0, 0, TRUE);</div><div class='del'>-			now = time_add_month_with_zone (now, 1, zone);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,</div><div class='del'>-		     double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	time_t date;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	struct icaltimetype tt;</div><div class='del'>-	char buffer[100];</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	gboolean compress_weekend;</div><div class='del'>-	int columns, col, weekday, len, month;</div><div class='del'>-	double font_size, cell_width, x1, x2, y1, y2;</div><div class='del'>-</div><div class='del'>-	weekday = calendar_config_get_week_start_day ();</div><div class='del'>-	compress_weekend = calendar_config_get_compress_weekend ();</div><div class='del'>-</div><div class='del'>-	/* Remember which month we want. */</div><div class='del'>-	tt = icaltime_from_timet_with_zone (whence, FALSE, zone);</div><div class='del'>-	month = tt.month - 1;</div><div class='del'>-</div><div class='del'>-	/* Find the start of the month, and then the start of the week on</div><div class='del'>-	   or before that day. */</div><div class='del'>-	date = time_month_begin_with_zone (whence, zone);</div><div class='del'>-	date = time_week_begin_with_zone (date, weekday, zone);</div><div class='del'>-</div><div class='del'>-	/* If weekends are compressed then we can't start on a Sunday. */</div><div class='del'>-	if (compress_weekend &amp;&amp; weekday == 0)</div><div class='del'>-		date = time_add_day_with_zone (date, -1, zone);</div><div class='del'>-</div><div class='del'>-	/* do day names ... */</div><div class='del'>-</div><div class='del'>-	/* We are only interested in outputting the weekday here, but we want</div><div class='del'>-	   to be able to step through the week without worrying about</div><div class='del'>-	   overflows making strftime choke, so we move near to the start of</div><div class='del'>-	   the month. */</div><div class='del'>-	tm = *convert_timet_to_struct_tm (date, zone);</div><div class='del'>-	tm.tm_mday = (tm.tm_mday % 7) + 7;</div><div class='del'>-</div><div class='del'>-	font = get_font_for_size (MONTH_NORMAL_FONT_SIZE, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-	font_size = gnome_font_get_size (font);</div><div class='del'>-	gnome_print_setfont (pc, font);</div><div class='del'>-</div><div class='del'>-	columns = compress_weekend ? 6 : 7;</div><div class='del'>-	cell_width = (right - left) / columns;</div><div class='del'>-	y1 = top;</div><div class='del'>-	y2 = top - font_size * 1.5;</div><div class='del'>-</div><div class='del'>-	for (col = 0; col &lt; columns; col++) {</div><div class='del'>-		char *utf_str;</div><div class='del'>-</div><div class='del'>-		if (tm.tm_wday == 6 &amp;&amp; compress_weekend) {</div><div class='del'>-			strftime (buffer, sizeof (buffer), "%a/", &amp;tm);</div><div class='del'>-			len = strlen (buffer);</div><div class='del'>-			tm.tm_mday++;</div><div class='del'>-			tm.tm_wday = (tm.tm_wday + 1) % 7;</div><div class='del'>-			strftime (buffer + len, sizeof (buffer) - len,</div><div class='del'>-				  "%a", &amp;tm);</div><div class='del'>-		} else {</div><div class='del'>-			strftime (buffer, sizeof (buffer), "%A", &amp;tm);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		x1 = left + cell_width * col;</div><div class='del'>-		x2 = x1 + cell_width;</div><div class='del'>-</div><div class='del'>-		print_border (pc, x1, x2, y1, y2, 1.0, -1.0);</div><div class='del'>-		utf_str = e_utf8_from_locale_string (buffer);</div><div class='del'>-		print_text_size (pc, utf_str, ALIGN_CENTER, x1, x2, y1, y2);</div><div class='del'>-		g_free (utf_str);</div><div class='del'>-</div><div class='del'>-		tm.tm_mday++;</div><div class='del'>-		tm.tm_wday = (tm.tm_wday + 1) % 7;</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	top = y2;</div><div class='del'>-	print_week_summary (pc, gcal, date, TRUE, 6, month,</div><div class='del'>-			    MONTH_NORMAL_FONT_SIZE,</div><div class='del'>-			    left, right, top, bottom);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal,</div><div class='del'>-		    time_t start, time_t end,</div><div class='del'>-		    double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GnomeFont *font_summary;</div><div class='del'>-	double y, yend, x, xend;</div><div class='del'>-	struct icaltimetype *tt;</div><div class='del'>-	ECalendarTable *task_pad;</div><div class='del'>-	ETable *table;</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	gint rows, row;</div><div class='del'>-</div><div class='del'>-	/* We get the tasks directly from the TaskPad ETable. This means we</div><div class='del'>-	   get them filtered &amp; sorted for free. */</div><div class='del'>-	task_pad = gnome_calendar_get_task_pad (gcal);</div><div class='del'>-	table = e_calendar_table_get_table (task_pad);</div><div class='del'>-	model = e_calendar_table_get_model (task_pad);</div><div class='del'>-	client = gnome_calendar_get_task_pad_cal_client (gcal);</div><div class='del'>-</div><div class='del'>-	font_summary = get_font_for_size (10, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-	gnome_print_setlinewidth (pc, 0.0);</div><div class='del'>-</div><div class='del'>-	titled_box (pc, U_("Tasks"), font_summary, ALIGN_CENTER | ALIGN_BORDER,</div><div class='del'>-		    &amp;left, &amp;right, &amp;top, &amp;bottom, 1.0);</div><div class='del'>-</div><div class='del'>-	y = top - 3;</div><div class='del'>-	yend = bottom - 2;</div><div class='del'>-</div><div class='del'>-	rows = e_table_model_row_count (E_TABLE_MODEL (model));</div><div class='del'>-	for (row = 0; row &lt; rows; row++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-		int model_row;</div><div class='del'>-</div><div class='del'>-		model_row = e_table_view_to_model_row (table, row);</div><div class='del'>-		comp = calendar_model_get_component (model, model_row);</div><div class='del'>-</div><div class='del'>-		cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-		if (!summary.value)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		x = left;</div><div class='del'>-		xend = right - 2;</div><div class='del'>-</div><div class='del'>-		if (y &lt; bottom)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* Print the box to put the tick in. */</div><div class='del'>-		print_border (pc, x + 2, x + 8, y - 3, y - 11, 0.1, -1.0);</div><div class='del'>-</div><div class='del'>-		/* If the task is complete, print a tick in the box. */</div><div class='del'>-		cal_component_get_completed (comp, &amp;tt);</div><div class='del'>-		if (tt) {</div><div class='del'>-			cal_component_free_icaltimetype (tt);</div><div class='del'>-</div><div class='del'>-			gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-			gnome_print_setlinewidth (pc, 1.0);</div><div class='del'>-			gnome_print_moveto (pc, x + 3, y - 8);</div><div class='del'>-			gnome_print_lineto (pc, x + 5, y - 10);</div><div class='del'>-			gnome_print_lineto (pc, x + 7, y - 3.5);</div><div class='del'>-			gnome_print_stroke (pc);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		y = bound_text (pc, font_summary, summary.value,</div><div class='del'>-				x + 10, xend, y, yend, 0);</div><div class='del'>-		y += gnome_font_get_size (font_summary) - 6;</div><div class='del'>-		gnome_print_moveto (pc, x, y);</div><div class='del'>-		gnome_print_lineto (pc, xend, y);</div><div class='del'>-		gnome_print_stroke (pc);</div><div class='del'>-		y -= 3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font_summary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Value for the PrintView enum */</div><div class='del'>-static const int print_view_map[] = {</div><div class='del'>-	PRINT_VIEW_DAY,</div><div class='del'>-	PRINT_VIEW_WEEK,</div><div class='del'>-	PRINT_VIEW_MONTH,</div><div class='del'>-	PRINT_VIEW_YEAR,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creates the range selector widget for printing a calendar */</div><div class='del'>-static GtkWidget *</div><div class='del'>-range_selector_new (GtkWidget *dialog, time_t at, int *view)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	GtkWidget *box;</div><div class='del'>-	GtkWidget *radio;</div><div class='del'>-	GSList *group;</div><div class='del'>-	char text[1024];</div><div class='del'>-	char str1[512];</div><div class='del'>-	char str2[512];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t week_begin, week_end;</div><div class='del'>-	struct tm week_begin_tm, week_end_tm;</div><div class='del'>-	gint week_start_day;</div><div class='del'>-</div><div class='del'>-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);</div><div class='del'>-</div><div class='del'>-	tm = *convert_timet_to_struct_tm (at, zone);</div><div class='del'>-</div><div class='del'>-	/* Day */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("Selected day (%a %b %d %Y)"), &amp;tm);</div><div class='del'>-	radio = gtk_radio_button_new_with_label (NULL, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Week */</div><div class='del'>-</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	week_begin = time_week_begin_with_zone (at, week_start_day, zone);</div><div class='del'>-	/* If the week starts on a Sunday, we have to show the Saturday first,</div><div class='del'>-	   since the weekend is compressed. If the original date passed in was</div><div class='del'>-	   a Saturday, we need to move on to the next Saturday, else we move</div><div class='del'>-	   back to the last one. */</div><div class='del'>-	if (week_start_day == 0) {</div><div class='del'>-		if (tm.tm_wday == 6)</div><div class='del'>-			week_begin = time_add_day_with_zone (week_begin, 6, zone);</div><div class='del'>-		else</div><div class='del'>-			week_begin = time_add_day_with_zone (week_begin, -1, zone);</div><div class='del'>-	}</div><div class='del'>-	week_end = time_add_day_with_zone (week_begin, 6, zone);</div><div class='del'>-</div><div class='del'>-	week_begin_tm = *convert_timet_to_struct_tm (week_begin, zone);</div><div class='del'>-	week_end_tm = *convert_timet_to_struct_tm (week_end, zone);</div><div class='del'>-</div><div class='del'>-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {</div><div class='del'>-		strftime (str1, sizeof (str1), _("%a %b %d"), &amp;week_begin_tm);</div><div class='del'>-		strftime (str2, sizeof (str2), _("%a %d %Y"), &amp;week_end_tm);</div><div class='del'>-	} else {</div><div class='del'>-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {</div><div class='del'>-			strftime (str1, sizeof (str1), _("%a %b %d"), &amp;week_begin_tm);</div><div class='del'>-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &amp;week_end_tm);</div><div class='del'>-		} else {</div><div class='del'>-			strftime (str1, sizeof (str1), _("%a %b %d %Y"), &amp;week_begin_tm);</div><div class='del'>-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &amp;week_end_tm);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_snprintf (text, sizeof (text), _("Selected week (%s - %s)"), str1, str2);</div><div class='del'>-</div><div class='del'>-	radio = gtk_radio_button_new_with_label (group, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Month */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("Selected month (%b %Y)"), &amp;tm);</div><div class='del'>-	radio = gtk_radio_button_new_with_label (group, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Year */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("Selected year (%Y)"), &amp;tm);</div><div class='del'>-	radio = gtk_radio_button_new_with_label (group, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Select default */</div><div class='del'>-</div><div class='del'>-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (box);</div><div class='del'>-	return box;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_day_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,</div><div class='del'>-		double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	int i, days = 1;</div><div class='del'>-	double todo, header, l;</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; days; i++) {</div><div class='del'>-		todo = (right - left) * 0.75 + left;</div><div class='del'>-		header = top - HEADER_HEIGHT;</div><div class='del'>-</div><div class='del'>-		/* FIXME: What is the name supposed to be for? */</div><div class='del'>-		gnome_print_beginpage (pc, "Calendar Day View");</div><div class='del'>-</div><div class='del'>-		/* Print the main view with all the events in. */</div><div class='del'>-		print_day_details (pc, gcal, date,</div><div class='del'>-				   left, todo - 2.0, header, bottom);</div><div class='del'>-</div><div class='del'>-		/* Print the TaskPad down the right. */</div><div class='del'>-		print_todo_details (pc, gcal, 0, INT_MAX,</div><div class='del'>-				    todo, right, header, bottom);</div><div class='del'>-</div><div class='del'>-		/* Print the filled border around the header. */</div><div class='del'>-		print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-		/* Print the 2 mini calendar-months. */</div><div class='del'>-		l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2</div><div class='del'>-			- SMALL_MONTH_SPACING;</div><div class='del'>-		print_month_small (pc, gcal, date,</div><div class='del'>-				   l, l + SMALL_MONTH_WIDTH,</div><div class='del'>-				   top - 4, header + 4,</div><div class='del'>-				   DATE_MONTH | DATE_YEAR, date, date, FALSE);</div><div class='del'>-</div><div class='del'>-		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;</div><div class='del'>-		print_month_small (pc, gcal,</div><div class='del'>-				   time_add_month_with_zone (date, 1, zone),</div><div class='del'>-				   l, l + SMALL_MONTH_WIDTH,</div><div class='del'>-				   top - 4, header + 4,</div><div class='del'>-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-</div><div class='del'>-		/* Print the date, e.g. '8th May, 2001'. */</div><div class='del'>-		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,</div><div class='del'>-			     buf, 100);</div><div class='del'>-		print_text_size_bold (pc, buf, ALIGN_LEFT,</div><div class='del'>-				      left + 4, todo, top - 4, top - 4 - 24);</div><div class='del'>-</div><div class='del'>-		/* Print the day, e.g. 'Tuesday'. */</div><div class='del'>-		format_date (date, DATE_DAYNAME, buf, 100);</div><div class='del'>-		print_text_size_bold (pc, buf, ALIGN_LEFT,</div><div class='del'>-				 left + 4, todo, top - 32, top - 32 - 18);</div><div class='del'>-</div><div class='del'>-		gnome_print_showpage (pc);</div><div class='del'>-		date = time_add_day_with_zone (date, 1, zone);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_week_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,</div><div class='del'>-		 double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	double header, l;</div><div class='del'>-	char buf[100];</div><div class='del'>-	time_t when;</div><div class='del'>-	gint week_start_day;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	header = top - HEADER_HEIGHT;</div><div class='del'>-</div><div class='del'>-	/* FIXME: What is the name supposed to be for? */</div><div class='del'>-	gnome_print_beginpage (pc, "Calendar Week View");</div><div class='del'>-</div><div class='del'>-	tm = *convert_timet_to_struct_tm (date, zone);</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	when = time_week_begin_with_zone (date, week_start_day, zone);</div><div class='del'>-	/* If the week starts on a Sunday, we have to show the Saturday first,</div><div class='del'>-	   since the weekend is compressed. */</div><div class='del'>-	if (week_start_day == 0) {</div><div class='del'>-		if (tm.tm_wday == 6)</div><div class='del'>-			when = time_add_day_with_zone (when, 6, zone);</div><div class='del'>-		else</div><div class='del'>-			when = time_add_day_with_zone (when, -1, zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Print the main week view. */</div><div class='del'>-	print_week_summary (pc, gcal, when, FALSE, 1, 0,</div><div class='del'>-			    WEEK_NORMAL_FONT_SIZE,</div><div class='del'>-			    left, right, header, bottom);</div><div class='del'>-</div><div class='del'>-	/* Print the border around the main view. */</div><div class='del'>-	print_border (pc, left, right, header, bottom, 1.0, -1.0);</div><div class='del'>-</div><div class='del'>-	/* Print the border around the header area. */</div><div class='del'>-	print_border (pc, left, right, top, header + 2.0, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-	/* Print the 2 mini calendar-months. */</div><div class='del'>-	l = right - SMALL_MONTH_PAD - SMALL_MONTH_WIDTH * 2</div><div class='del'>-		- SMALL_MONTH_SPACING;</div><div class='del'>-	print_month_small (pc, gcal, when,</div><div class='del'>-			   l, l + SMALL_MONTH_WIDTH,</div><div class='del'>-			   top - 4, header + 4,</div><div class='del'>-			   DATE_MONTH | DATE_YEAR, when,</div><div class='del'>-			   time_add_week_with_zone (when, 1, zone), FALSE);</div><div class='del'>-</div><div class='del'>-	l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;</div><div class='del'>-	print_month_small (pc, gcal,</div><div class='del'>-			   time_add_month_with_zone (when, 1, zone),</div><div class='del'>-			   l, l + SMALL_MONTH_WIDTH,</div><div class='del'>-			   top - 4, header + 4,</div><div class='del'>-			   DATE_MONTH | DATE_YEAR, when,</div><div class='del'>-			   time_add_week_with_zone (when, 1, zone), FALSE);</div><div class='del'>-</div><div class='del'>-	/* Print the start day of the week, e.g. '7th May 2001'. */</div><div class='del'>-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-	print_text_size_bold (pc, buf, ALIGN_LEFT,</div><div class='del'>-			      left + 3, right, top - 4, top - 4 - 24);</div><div class='del'>-	</div><div class='del'>-	/* Print the end day of the week, e.g. '13th May 2001'. */</div><div class='del'>-	when = time_add_day_with_zone (when, 6, zone);</div><div class='del'>-	format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-	print_text_size_bold (pc, buf, ALIGN_LEFT,</div><div class='del'>-			      left + 3, right, top - 24 - 3, top - 24 - 3 - 24);</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_month_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,</div><div class='del'>-		  double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	double header;</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	header = top - HEADER_HEIGHT;</div><div class='del'>-</div><div class='del'>-	/* FIXME: What is the name supposed to be for? */</div><div class='del'>-	gnome_print_beginpage (pc, "Calendar Month View");</div><div class='del'>-</div><div class='del'>-	/* Print the main month view. */</div><div class='del'>-	print_month_summary (pc, gcal, date, left, right, header, bottom);</div><div class='del'>-</div><div class='del'>-	/* Print the border around the header. */</div><div class='del'>-	print_border (pc, left, right, top, header, 1.0, 0.9);</div><div class='del'>-</div><div class='del'>-	/* Print the 2 mini calendar-months. */</div><div class='del'>-	print_month_small (pc, gcal,</div><div class='del'>-			   time_add_month_with_zone (date, 1, zone),</div><div class='del'>-			   right - (right - left) / 7 + 2, right - 8,</div><div class='del'>-			   top - 4, header,</div><div class='del'>-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-	print_month_small (pc, gcal,</div><div class='del'>-			   time_add_month_with_zone (date, -1, zone),</div><div class='del'>-			   left + 8, left + (right - left) / 7 - 2,</div><div class='del'>-			   top - 4, header,</div><div class='del'>-			   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Print the month, e.g. 'May 2001'. */</div><div class='del'>-	format_date (date, DATE_MONTH | DATE_YEAR, buf, 100);</div><div class='del'>-	print_text_size_bold (pc, buf, ALIGN_CENTER,</div><div class='del'>-			      left + 3, right - 3, top - 3, top - 3 - 24);</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_year_view (GnomePrintContext *pc, GnomeCalendar *gcal, time_t date,</div><div class='del'>-		 double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	char buf[100];</div><div class='del'>-</div><div class='del'>-	/* FIXME: What is the name supposed to be for? */</div><div class='del'>-	gnome_print_beginpage (pc, "Calendar Year View");</div><div class='del'>-</div><div class='del'>-	print_year_summary (pc, gcal, date, left, right, top - 50, bottom,</div><div class='del'>-			    TRUE);</div><div class='del'>-</div><div class='del'>-	/* centered title */</div><div class='del'>-	format_date (date, DATE_YEAR, buf, 100);</div><div class='del'>-	print_text_size_bold (pc, buf, ALIGN_CENTER,</div><div class='del'>-			      left+3, right, top-3, top - 27);</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone = get_timezone ();</div><div class='del'>-	struct tm *tmp_tm;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	tmp_tm = convert_timet_to_struct_tm (t, zone);</div><div class='del'>-</div><div class='del'>-	if (stext != NULL)</div><div class='del'>-		strcat (buffer, stext);</div><div class='del'>-</div><div class='del'>-	len = strlen (buffer);</div><div class='del'>-	e_time_format_date_and_time (tmp_tm,</div><div class='del'>-				     calendar_config_get_24_hour_format (),</div><div class='del'>-				     FALSE, FALSE,</div><div class='del'>-				     &amp;buffer[len], size - len);</div><div class='del'>-	if (etext != NULL)</div><div class='del'>-		strcat (buffer, etext);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icaltimezone*</div><div class='del'>-get_zone_from_tzid (CalClient *client, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	/* Note that the timezones may not be on the server, so we try to get</div><div class='del'>-	   the builtin timezone with the TZID first. */</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-	if (!zone) {</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_timezone (client, tzid, &amp;zone);</div><div class='del'>-		/* FIXME: Handle error better. */</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			g_warning ("Couldn't get timezone from server: %s",</div><div class='del'>-				   tzid ? tzid : "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_date_label (GnomePrintContext *pc, CalComponent *comp, CalClient *client,</div><div class='del'>-		  double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;</div><div class='del'>-	CalComponentDateTime datetime;</div><div class='del'>-	time_t start = 0, end = 0, complete = 0, due = 0;</div><div class='del'>-	static char buffer[1024], *utf_text;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;datetime);</div><div class='del'>-	if (datetime.value) {</div><div class='del'>-		start_zone = get_zone_from_tzid (client, datetime.tzid);</div><div class='del'>-		start = icaltime_as_timet_with_zone (*datetime.value,</div><div class='del'>-						     start_zone);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (comp, &amp;datetime);</div><div class='del'>-	if (datetime.value) {</div><div class='del'>-		end_zone = get_zone_from_tzid (client, datetime.tzid);</div><div class='del'>-		end = icaltime_as_timet_with_zone (*datetime.value,</div><div class='del'>-						   end_zone);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;datetime);</div><div class='del'>-	if (datetime.value) {</div><div class='del'>-		due_zone = get_zone_from_tzid (client, datetime.tzid);</div><div class='del'>-		due = icaltime_as_timet_with_zone (*datetime.value,</div><div class='del'>-						   due_zone);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_datetime (&amp;datetime);</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;datetime.value);</div><div class='del'>-	if (datetime.value) {</div><div class='del'>-		completed_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		complete = icaltime_as_timet_with_zone (*datetime.value,</div><div class='del'>-							completed_zone);</div><div class='del'>-		cal_component_free_icaltimetype (datetime.value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buffer[0] = '\0';</div><div class='del'>-</div><div class='del'>-	if (start &gt; 0)</div><div class='del'>-		write_label_piece (start, buffer, 1024, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (end &gt; 0 &amp;&amp; start &gt; 0)</div><div class='del'>-		write_label_piece (end, buffer, 1024, _(" to "), NULL);</div><div class='del'>-</div><div class='del'>-	if (complete &gt; 0) {</div><div class='del'>-		if (start &gt; 0)</div><div class='del'>-			write_label_piece (complete, buffer, 1024, _(" (Completed "), ")");</div><div class='del'>-		else</div><div class='del'>-			write_label_piece (complete, buffer, 1024, _("Completed "), NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (due &gt; 0 &amp;&amp; complete == 0) {</div><div class='del'>-		if (start &gt; 0)</div><div class='del'>-			write_label_piece (due, buffer, 1024, _(" (Due "), ")");</div><div class='del'>-		else</div><div class='del'>-			write_label_piece (due, buffer, 1024, _("Due "), NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	utf_text = e_utf8_from_locale_string (buffer);</div><div class='del'>-	print_text_size_bold (pc, utf_text, ALIGN_LEFT,</div><div class='del'>-			      left, right, top, top - 15);</div><div class='del'>-	g_free (utf_text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_comp_item (GnomePrintContext *pc, CalComponent *comp, CalClient *client,</div><div class='del'>-		 double left, double right, double top, double bottom)</div><div class='del'>-{</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	GSList *desc, *l;</div><div class='del'>-	const char *title, *categories;</div><div class='del'>-	char *categories_string;</div><div class='del'>-	GSList *contact_list, *elem;</div><div class='del'>-	gint header_size;</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	/* We should only be asked to print VEVENTs or VTODOs. */</div><div class='del'>-	if (vtype == CAL_COMPONENT_EVENT)</div><div class='del'>-		title = U_("Appointment");</div><div class='del'>-	else if (vtype == CAL_COMPONENT_TODO)</div><div class='del'>-		title = U_("Task");</div><div class='del'>-	else</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Print the title in a box at the top of the page. */</div><div class='del'>-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-	header_size = 50;</div><div class='del'>-	print_border (pc, left, right, top, top - header_size,</div><div class='del'>-		      1.0, 0.9);</div><div class='del'>-	print_text (pc, font, title, ALIGN_CENTER, left, right,</div><div class='del'>-		    top - header_size * 0.1, top - header_size);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	top -= header_size + 10;</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	top = bound_text (pc, font, text.value, left, right,</div><div class='del'>-			  top - 3, bottom, 0);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	/* Date information */</div><div class='del'>-	print_date_label (pc, comp, client, left, right, top-3, top - 15);</div><div class='del'>-	top -= 20;</div><div class='del'>-</div><div class='del'>-	font = get_font_for_size (12, GNOME_FONT_BOOK, FALSE);</div><div class='del'>-</div><div class='del'>-	/* For a VTODO we print the Status, Priority, % Complete and URL. */</div><div class='del'>-	if (vtype == CAL_COMPONENT_TODO) {</div><div class='del'>-		icalproperty_status status;</div><div class='del'>-		const char *status_string = NULL;</div><div class='del'>-		int *percent;</div><div class='del'>-		int *priority;</div><div class='del'>-		const char *url;</div><div class='del'>-</div><div class='del'>-		/* Status */</div><div class='del'>-		cal_component_get_status (comp, &amp;status);</div><div class='del'>-		if (status != ICAL_STATUS_NONE) {</div><div class='del'>-			switch (status) {</div><div class='del'>-			case ICAL_STATUS_NEEDSACTION:</div><div class='del'>-				status_string = U_("Not Started");</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_STATUS_INPROCESS:</div><div class='del'>-				status_string = U_("In Progress");</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_STATUS_COMPLETED:</div><div class='del'>-				status_string = U_("Completed");</div><div class='del'>-				break;</div><div class='del'>-			case ICAL_STATUS_CANCELLED:</div><div class='del'>-				status_string = U_("Cancelled");</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (status_string) {</div><div class='del'>-				char *text = g_strdup_printf (U_("Status: %s"),</div><div class='del'>-							      status_string);</div><div class='del'>-				top = bound_text (pc, font, text,</div><div class='del'>-						  left, right, top, bottom, 0);</div><div class='del'>-				top += gnome_font_get_size (font) - 6;</div><div class='del'>-				g_free (text);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Priority */</div><div class='del'>-		cal_component_get_priority (comp, &amp;priority);</div><div class='del'>-		if (priority &amp;&amp; *priority &gt;= 0) {</div><div class='del'>-			char *priority_string, *priority_utf8, *text;</div><div class='del'>-</div><div class='del'>-			priority_string = cal_util_priority_to_string (*priority);</div><div class='del'>-			cal_component_free_priority (priority);</div><div class='del'>-</div><div class='del'>-			priority_utf8 = e_utf8_from_locale_string (priority_string);</div><div class='del'>-			text = g_strdup_printf (U_("Priority: %s"),</div><div class='del'>-						priority_utf8);</div><div class='del'>-			top = bound_text (pc, font, text,</div><div class='del'>-					  left, right, top, bottom, 0);</div><div class='del'>-			top += gnome_font_get_size (font) - 6;</div><div class='del'>-			g_free (text);</div><div class='del'>-			g_free (priority_utf8);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Percent Complete */</div><div class='del'>-		cal_component_get_percent (comp, &amp;percent);</div><div class='del'>-		if (percent) {</div><div class='del'>-			char *percent_string;</div><div class='del'>-</div><div class='del'>-			percent_string = g_strdup_printf (U_("Percent Complete: %i"), *percent);</div><div class='del'>-			cal_component_free_percent (percent);</div><div class='del'>-</div><div class='del'>-			top = bound_text (pc, font, percent_string,</div><div class='del'>-					  left, right, top, bottom, 0);</div><div class='del'>-			top += gnome_font_get_size (font) - 6;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* URL */</div><div class='del'>-		cal_component_get_url (comp, &amp;url);</div><div class='del'>-		if (url &amp;&amp; url[0]) {</div><div class='del'>-			char *url_string = g_strdup_printf (U_("URL: %s"),</div><div class='del'>-							    url);</div><div class='del'>-</div><div class='del'>-			top = bound_text (pc, font, url_string,</div><div class='del'>-					  left, right, top, bottom, 0);</div><div class='del'>-			top += gnome_font_get_size (font) - 6;</div><div class='del'>-</div><div class='del'>-			g_free (url_string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Categories */</div><div class='del'>-	cal_component_get_categories (comp, &amp;categories);</div><div class='del'>-	if (categories &amp;&amp; categories[0]) {</div><div class='del'>-		categories_string = g_strdup_printf (U_("Categories: %s"),</div><div class='del'>-						     categories);</div><div class='del'>-		top = bound_text (pc, font, categories_string,</div><div class='del'>-				  left, right, top, bottom, 0);</div><div class='del'>-		top += gnome_font_get_size (font) - 6;</div><div class='del'>-		g_free (categories_string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Contacts */</div><div class='del'>-	cal_component_get_contact_list (comp, &amp;contact_list);</div><div class='del'>-	if (contact_list) {</div><div class='del'>-		GString *contacts = g_string_new (U_("Contacts: "));</div><div class='del'>-		for (elem = contact_list; elem; elem = elem-&gt;next) {</div><div class='del'>-			CalComponentText *t = elem-&gt;data;</div><div class='del'>-			/* Put a comma between contacts. */</div><div class='del'>-			if (elem != contact_list)</div><div class='del'>-				g_string_append (contacts, ", ");</div><div class='del'>-			g_string_append (contacts, t-&gt;value);</div><div class='del'>-		}</div><div class='del'>-		cal_component_free_text_list (contact_list);</div><div class='del'>-</div><div class='del'>-		top = bound_text (pc, font, contacts-&gt;str,</div><div class='del'>-				  left, right, top, bottom, 0);</div><div class='del'>-		top += gnome_font_get_size (font) - 6;</div><div class='del'>-</div><div class='del'>-		g_string_free (contacts, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	top -= 16;</div><div class='del'>-</div><div class='del'>-	/* Description */</div><div class='del'>-	cal_component_get_description_list (comp, &amp;desc);</div><div class='del'>-	for (l = desc; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *text = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (text-&gt;value != NULL)</div><div class='del'>-			top = bound_text (pc, font, text-&gt;value, left, right, top-3, bottom, 0);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (desc);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage (pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,</div><div class='del'>-		PrintView default_view)</div><div class='del'>-{</div><div class='del'>-	GnomePrinter *printer;</div><div class='del'>-	GnomePrintMaster *gpm;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	int copies, collate;</div><div class='del'>-	double l, r, t, b;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	printer = NULL;</div><div class='del'>-	copies = 1;</div><div class='del'>-	collate = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!preview) {</div><div class='del'>-		GtkWidget *gpd;</div><div class='del'>-		GtkWidget *range;</div><div class='del'>-		int view;</div><div class='del'>-</div><div class='del'>-		gpd = gnome_print_dialog_new (_("Print Calendar"),</div><div class='del'>-					      GNOME_PRINT_DIALOG_RANGE</div><div class='del'>-					      | GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-		view = (int) default_view;</div><div class='del'>-		range = range_selector_new (gpd, date, &amp;view);</div><div class='del'>-		gnome_print_dialog_construct_range_custom (GNOME_PRINT_DIALOG (gpd), range);</div><div class='del'>-</div><div class='del'>-		gnome_dialog_set_default (GNOME_DIALOG (gpd),</div><div class='del'>-					  GNOME_PRINT_PRINT);</div><div class='del'>-</div><div class='del'>-		/* Run dialog */</div><div class='del'>-</div><div class='del'>-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {</div><div class='del'>-		case GNOME_PRINT_PRINT:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case GNOME_PRINT_PREVIEW:</div><div class='del'>-			preview = TRUE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case -1:</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_dialog_get_values (gpd);</div><div class='del'>-		default_view = (PrintView) view;</div><div class='del'>-</div><div class='del'>-		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd),</div><div class='del'>-					       &amp;copies, &amp;collate);</div><div class='del'>-		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));</div><div class='del'>-</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: allow configuration of paper size */</div><div class='del'>-</div><div class='del'>-	gpm = gnome_print_master_new ();</div><div class='del'>-</div><div class='del'>-	if (paper_info == NULL)</div><div class='del'>-		paper_info = gnome_paper_with_name (gnome_paper_name_default ());</div><div class='del'>-	gnome_print_master_set_paper (gpm, paper_info);</div><div class='del'>-</div><div class='del'>-	if (printer)</div><div class='del'>-		gnome_print_master_set_printer (gpm, printer);</div><div class='del'>-</div><div class='del'>-	gnome_print_master_set_copies (gpm, copies, collate);</div><div class='del'>-</div><div class='del'>-	pc = gnome_print_master_get_context (gpm);</div><div class='del'>-</div><div class='del'>-	l = gnome_paper_lmargin (paper_info);</div><div class='del'>-	r = gnome_paper_pswidth (paper_info)</div><div class='del'>-		- gnome_paper_rmargin (paper_info);</div><div class='del'>-	t = gnome_paper_psheight (paper_info)</div><div class='del'>-		- gnome_paper_tmargin (paper_info);</div><div class='del'>-	b = gnome_paper_bmargin (paper_info);</div><div class='del'>-</div><div class='del'>-	/* depending on the view, do a different output */</div><div class='del'>-	switch (default_view) {</div><div class='del'>-	case PRINT_VIEW_DAY:</div><div class='del'>-		print_day_view (pc, gcal, date, l, r, t, b);</div><div class='del'>-		break;</div><div class='del'>-	case PRINT_VIEW_WEEK:</div><div class='del'>-		print_week_view (pc, gcal, date, l, r, t, b);</div><div class='del'>-		break;</div><div class='del'>-	case PRINT_VIEW_MONTH:</div><div class='del'>-		gnome_print_rotate (pc, 90);</div><div class='del'>-		gnome_print_translate (pc, 0,</div><div class='del'>-				       -gnome_paper_pswidth (paper_info));</div><div class='del'>-		print_month_view (pc, gcal, date, b, t, r, l);</div><div class='del'>-		break;</div><div class='del'>-	case PRINT_VIEW_YEAR:</div><div class='del'>-		print_year_view (pc, gcal, date, l, r, t, b);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_print_master_close (gpm);</div><div class='del'>-</div><div class='del'>-	if (preview) {</div><div class='del'>-		GnomePrintMasterPreview *gpmp;</div><div class='del'>-		gboolean landscape = FALSE;</div><div class='del'>-</div><div class='del'>-		if (default_view == PRINT_VIEW_MONTH)</div><div class='del'>-			landscape = TRUE;</div><div class='del'>-</div><div class='del'>-		gpmp = gnome_print_master_preview_new_with_orientation (gpm, _("Print Preview"), landscape);</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (gpmp));</div><div class='del'>-	} else {</div><div class='del'>-		gnome_print_master_print (gpm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gpm));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-print_comp (CalComponent *comp, CalClient *client, gboolean preview)</div><div class='del'>-{</div><div class='del'>-	GnomePrinter *printer;</div><div class='del'>-	GnomePrintMaster *gpm;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	int copies, collate;</div><div class='del'>-	double l, r, t, b;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	printer = NULL;</div><div class='del'>-	copies = 1;</div><div class='del'>-	collate = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!preview) {</div><div class='del'>-		GtkWidget *gpd;</div><div class='del'>-</div><div class='del'>-		gpd = gnome_print_dialog_new (_("Print Item"),</div><div class='del'>-					      GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-		gnome_dialog_set_default (GNOME_DIALOG (gpd),</div><div class='del'>-					  GNOME_PRINT_PRINT);</div><div class='del'>-</div><div class='del'>-		/* Run dialog */</div><div class='del'>-</div><div class='del'>-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {</div><div class='del'>-		case GNOME_PRINT_PRINT:</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case GNOME_PRINT_PREVIEW:</div><div class='del'>-			preview = TRUE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case -1:</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_dialog_get_values (gpd);</div><div class='del'>-</div><div class='del'>-		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd),</div><div class='del'>-					       &amp;copies, &amp;collate);</div><div class='del'>-		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));</div><div class='del'>-</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: allow configuration of paper size */</div><div class='del'>-</div><div class='del'>-	gpm = gnome_print_master_new ();</div><div class='del'>-</div><div class='del'>-	if (paper_info == NULL)</div><div class='del'>-		paper_info = gnome_paper_with_name (gnome_paper_name_default ());</div><div class='del'>-	gnome_print_master_set_paper (gpm, paper_info);</div><div class='del'>-</div><div class='del'>-	if (printer)</div><div class='del'>-		gnome_print_master_set_printer (gpm, printer);</div><div class='del'>-</div><div class='del'>-	gnome_print_master_set_copies (gpm, copies, collate);</div><div class='del'>-</div><div class='del'>-	pc = gnome_print_master_get_context (gpm);</div><div class='del'>-</div><div class='del'>-	l = gnome_paper_lmargin (paper_info);</div><div class='del'>-	r = gnome_paper_pswidth (paper_info)</div><div class='del'>-		- gnome_paper_rmargin (paper_info);</div><div class='del'>-	t = gnome_paper_psheight (paper_info)</div><div class='del'>-		- gnome_paper_tmargin (paper_info);</div><div class='del'>-	b = gnome_paper_bmargin (paper_info);</div><div class='del'>-</div><div class='del'>-	print_comp_item (pc, comp, client, l, r, t, b);</div><div class='del'>-</div><div class='del'>-	gnome_print_master_close (gpm);</div><div class='del'>-</div><div class='del'>-	if (preview) {</div><div class='del'>-		GnomePrintMasterPreview *gpmp;</div><div class='del'>-</div><div class='del'>-		gpmp = gnome_print_master_preview_new (gpm,</div><div class='del'>-						       _("Print Preview"));</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (gpmp));</div><div class='del'>-	} else {</div><div class='del'>-		gnome_print_master_print (gpm);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gpm));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-print_setup (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dlg, *ps;</div><div class='del'>-	gint btn;</div><div class='del'>-</div><div class='del'>-	ps = gnome_paper_selector_new ();</div><div class='del'>-	gtk_widget_show (ps);</div><div class='del'>-</div><div class='del'>-	dlg = gnome_dialog_new (_("Print Setup"),</div><div class='del'>-				GNOME_STOCK_BUTTON_OK,</div><div class='del'>-				GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				NULL);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)-&gt;vbox), ps, TRUE, TRUE, 2);</div><div class='del'>-</div><div class='del'>-	btn = gnome_dialog_run (GNOME_DIALOG (dlg));</div><div class='del'>-	if (btn == 0) {</div><div class='del'>-		gchar *name;</div><div class='del'>-</div><div class='del'>-		name  = gnome_paper_selector_get_name (GNOME_PAPER_SELECTOR (ps));</div><div class='del'>-		paper_info = gnome_paper_with_name (name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dlg));</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/print.h b/calendar/gui/print.h<br/>deleted file mode 100644<br/>index 4571b36976..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/print.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/print.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* Evolution calendar - Print support</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef PRINT_H</div><div class='del'>-#define PRINT_H</div><div class='del'>-</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	PRINT_VIEW_DAY,</div><div class='del'>-	PRINT_VIEW_WEEK,</div><div class='del'>-	PRINT_VIEW_MONTH,</div><div class='del'>-	PRINT_VIEW_YEAR</div><div class='del'>-} PrintView;</div><div class='del'>-</div><div class='del'>-void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);</div><div class='del'>-void print_comp (CalComponent *comp, CalClient *client, gboolean preview);</div><div class='del'>-</div><div class='del'>-void print_setup (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c<br/>deleted file mode 100644<br/>index cda93a1d64..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tag-calendar.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tag-calendar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,227 +0,0 @@</div><div class='del'>-/* Evolution calendar - Utilities for tagging ECalendar widgets</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "tag-calendar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct calendar_tag_closure {</div><div class='del'>-	ECalendarItem *calitem;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	time_t start_time;</div><div class='del'>-	time_t end_time;</div><div class='del'>-</div><div class='del'>-	gboolean skip_transparent_events;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Clears all the tags in a calendar and fills a closure structure with the</div><div class='del'>- * necessary information for iterating over occurrences.</div><div class='del'>- * Returns FALSE if the calendar has no dates shown.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-prepare_tag (ECalendar *ecal, struct calendar_tag_closure *c, gboolean clear_first)</div><div class='del'>-{</div><div class='del'>-	gint start_year, start_month, start_day;</div><div class='del'>-	gint end_year, end_month, end_day;</div><div class='del'>-	struct icaltimetype start_tt = icaltime_null_time ();</div><div class='del'>-	struct icaltimetype end_tt = icaltime_null_time ();</div><div class='del'>-	char *location;</div><div class='del'>-</div><div class='del'>-	if (clear_first)</div><div class='del'>-		e_calendar_item_clear_marks (ecal-&gt;calitem);</div><div class='del'>-</div><div class='del'>-	if (!e_calendar_item_get_date_range (ecal-&gt;calitem,</div><div class='del'>-					     &amp;start_year, &amp;start_month,</div><div class='del'>-					     &amp;start_day,</div><div class='del'>-					     &amp;end_year, &amp;end_month, &amp;end_day))</div><div class='del'>-	    return FALSE;</div><div class='del'>-</div><div class='del'>-	start_tt.year = start_year;</div><div class='del'>-	start_tt.month = start_month + 1;</div><div class='del'>-	start_tt.day = start_day;</div><div class='del'>-</div><div class='del'>-	end_tt.year = end_year;</div><div class='del'>-	end_tt.month = end_month + 1;</div><div class='del'>-	end_tt.day = end_day;</div><div class='del'>-</div><div class='del'>-	icaltime_adjust (&amp;end_tt, 1, 0, 0, 0);</div><div class='del'>-</div><div class='del'>-	c-&gt;calitem = ecal-&gt;calitem;</div><div class='del'>-</div><div class='del'>-	/* FIXME. It may be better if the timezone is passed in. */</div><div class='del'>-	location = calendar_config_get_timezone ();</div><div class='del'>-	c-&gt;zone = icaltimezone_get_builtin_timezone (location);</div><div class='del'>-</div><div class='del'>-	c-&gt;start_time = icaltime_as_timet_with_zone (start_tt, c-&gt;zone);</div><div class='del'>-	c-&gt;end_time = icaltime_as_timet_with_zone (end_tt, c-&gt;zone);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Marks the specified range in an ECalendar; called from cal_client_generate_instances() */</div><div class='del'>-static gboolean</div><div class='del'>-tag_calendar_cb (CalComponent *comp,</div><div class='del'>-		 time_t istart,</div><div class='del'>-		 time_t iend,</div><div class='del'>-		 gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct calendar_tag_closure *c = data;</div><div class='del'>-	struct icaltimetype start_tt, end_tt;</div><div class='del'>-	CalComponentTransparency transparency;</div><div class='del'>-</div><div class='del'>-	/* If we are skipping TRANSPARENT events, return if the event is</div><div class='del'>-	   transparent. */</div><div class='del'>-	if (c-&gt;skip_transparent_events) {</div><div class='del'>-		cal_component_get_transparency (comp, &amp;transparency);</div><div class='del'>-		if (transparency == CAL_COMPONENT_TRANSP_TRANSPARENT)</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	start_tt = icaltime_from_timet_with_zone (istart, FALSE, c-&gt;zone);</div><div class='del'>-	end_tt = icaltime_from_timet_with_zone (iend - 1, FALSE, c-&gt;zone);</div><div class='del'>-	e_calendar_item_mark_days (c-&gt;calitem,</div><div class='del'>-				   start_tt.year, start_tt.month - 1,</div><div class='del'>-				   start_tt.day,</div><div class='del'>-				   end_tt.year, end_tt.month - 1,</div><div class='del'>-				   end_tt.day,</div><div class='del'>-				   E_CALENDAR_ITEM_MARK_BOLD);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tag_calendar_by_client:</div><div class='del'>- * @ecal: Calendar widget to tag.</div><div class='del'>- * @client: A calendar client object.</div><div class='del'>- * </div><div class='del'>- * Tags an #ECalendar widget with the events that occur in its current time</div><div class='del'>- * range.  The occurrences are extracted from the specified calendar @client.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-tag_calendar_by_client (ECalendar *ecal, CalClient *client)</div><div class='del'>-{</div><div class='del'>-	struct calendar_tag_closure c;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ecal != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR (ecal));</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	/* If the ECalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (ecal))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (cal_client_get_load_state (client) != CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!prepare_tag (ecal, &amp;c, TRUE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	c.skip_transparent_events = TRUE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("DateNavigator generating instances\n");</div><div class='del'>-#endif</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT,</div><div class='del'>-				       c.start_time, c.end_time,</div><div class='del'>-				       tag_calendar_cb, &amp;c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Resolves TZIDs for the recurrence generator, for when the comp is not on</div><div class='del'>-   the server. We need to try to use builtin timezones first, as they may not</div><div class='del'>-   be added to the server yet. */</div><div class='del'>-static icaltimezone*</div><div class='del'>-resolve_tzid_cb (const char *tzid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	icaltimezone *zone = NULL;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (data != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (data), NULL);</div><div class='del'>-	</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-</div><div class='del'>-	/* Try to find the builtin timezone first. */</div><div class='del'>-	zone = icaltimezone_get_builtin_timezone_from_tzid (tzid);</div><div class='del'>-</div><div class='del'>-	if (!zone) {</div><div class='del'>-		/* FIXME: Handle errors. */</div><div class='del'>-		status = cal_client_get_timezone (client, tzid, &amp;zone);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tag_calendar_by_comp:</div><div class='del'>- * @ecal: Calendar widget to tag.</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @clear_first: Whether the #ECalendar should be cleared of any marks first.</div><div class='del'>- * </div><div class='del'>- * Tags an #ECalendar widget with any occurrences of a specific calendar</div><div class='del'>- * component that occur within the calendar's current time range.</div><div class='del'>- * Note that TRANSPARENT events are also tagged here.</div><div class='del'>- *</div><div class='del'>- * If comp_is_on_server is FALSE, it will try to resolve TZIDs using builtin</div><div class='del'>- * timezones first, before querying the server, since the timezones may not</div><div class='del'>- * have been added to the calendar on the server yet.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp, CalClient *client, gboolean clear_first, gboolean comp_is_on_server)</div><div class='del'>-{</div><div class='del'>-	struct calendar_tag_closure c;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ecal != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR (ecal));</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	/* If the ECalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (ecal))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!prepare_tag (ecal, &amp;c, clear_first))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	c.skip_transparent_events = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("DateNavigator generating instances\n");</div><div class='del'>-#endif</div><div class='del'>-	if (comp_is_on_server) {</div><div class='del'>-		cal_recur_generate_instances (comp, c.start_time, c.end_time,</div><div class='del'>-					      tag_calendar_cb, &amp;c,</div><div class='del'>-					      cal_client_resolve_tzid_cb,</div><div class='del'>-					      client, c.zone);</div><div class='del'>-	} else {</div><div class='del'>-		cal_recur_generate_instances (comp, c.start_time, c.end_time,</div><div class='del'>-					      tag_calendar_cb, &amp;c,</div><div class='del'>-					      resolve_tzid_cb,</div><div class='del'>-					      client, c.zone);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h<br/>deleted file mode 100644<br/>index 32c7eb475c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tag-calendar.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tag-calendar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* Evolution calendar - Utilities for tagging ECalendar widgets</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TAG_CALENDAR_H</div><div class='del'>-#define TAG_CALENDAR_H</div><div class='del'>-</div><div class='del'>-#include &lt;widgets/misc/e-calendar.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-void tag_calendar_by_client (ECalendar *ecal, CalClient *client);</div><div class='del'>-void tag_calendar_by_comp (ECalendar *ecal, CalComponent *comp,</div><div class='del'>-			   CalClient *client, gboolean clear_first,</div><div class='del'>-			   gboolean comp_is_on_server);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/tasks-control-factory.c b/calendar/gui/tasks-control-factory.c<br/>deleted file mode 100644<br/>index 5fd8d61346..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-control-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* tasks-control-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Ettore Perazzoli</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include "tasks-control-factory.h"</div><div class='del'>-#include "tasks-control.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TASKS_CONTROL_FACTORY_ID   "OAFIID:GNOME_Evolution_Tasks_ControlFactory"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-static BonoboObject *tasks_control_factory_fn	(BonoboGenericFactory	*Factory,</div><div class='del'>-						 void			*data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Registers the factory with Bonobo. Should be called on startup. */</div><div class='del'>-void</div><div class='del'>-tasks_control_factory_init		(void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (TASKS_CONTROL_FACTORY_ID,</div><div class='del'>-					      tasks_control_factory_fn, NULL);</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register a Tasks control factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback factory function to create a tasks control. */</div><div class='del'>-static BonoboObject *</div><div class='del'>-tasks_control_factory_fn		(BonoboGenericFactory	*Factory,</div><div class='del'>-					 void			*data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = tasks_control_new ();</div><div class='del'>-</div><div class='del'>-	if (control)</div><div class='del'>-		return BONOBO_OBJECT (control);</div><div class='del'>-	else {</div><div class='del'>-		gnome_warning_dialog (_("Could not create the tasks view.  Please check your "</div><div class='del'>-					"ORBit and OAF setup."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/tasks-control-factory.h b/calendar/gui/tasks-control-factory.h<br/>deleted file mode 100644<br/>index 468f03b9e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-control-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-control-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* tasks-control-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _TASKS_CONTROL_FACTORY_H_</div><div class='del'>-#define _TASKS_CONTROL_FACTORY_H_</div><div class='del'>-</div><div class='del'>-void           tasks_control_factory_init         (void);</div><div class='del'>-BonoboControl *tasks_control_factory_new_control  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _TASKS_CONTROL_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c<br/>deleted file mode 100644<br/>index 53e3eb239f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-control.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,684 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* tasks-control.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- *	    Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-paper.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-copies.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-preview.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-printer-dialog.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-utils.h&gt;</div><div class='del'>-#include "dialogs/cal-prefs-dialog.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "e-tasks.h"</div><div class='del'>-#include "tasks-control.h"</div><div class='del'>-#include "evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-#define TASKS_CONTROL_PROPERTY_URI		"folder_uri"</div><div class='del'>-#define TASKS_CONTROL_PROPERTY_URI_IDX		1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void tasks_control_properties_init	(BonoboControl		*control,</div><div class='del'>-						 ETasks			*tasks);</div><div class='del'>-static void tasks_control_get_property		(BonoboPropertyBag	*bag,</div><div class='del'>-						 BonoboArg		*arg,</div><div class='del'>-						 guint			 arg_id,</div><div class='del'>-						 CORBA_Environment      *ev,</div><div class='del'>-						 gpointer		 user_data);</div><div class='del'>-static void tasks_control_set_property		(BonoboPropertyBag	*bag,</div><div class='del'>-						 const BonoboArg	*arg,</div><div class='del'>-						 guint			 arg_id,</div><div class='del'>-						 CORBA_Environment      *ev,</div><div class='del'>-						 gpointer		 user_data);</div><div class='del'>-static void tasks_control_activate_cb		(BonoboControl		*control,</div><div class='del'>-						 gboolean		 activate,</div><div class='del'>-						 gpointer		 user_data);</div><div class='del'>-static void tasks_control_activate		(BonoboControl		*control,</div><div class='del'>-						 ETasks			*tasks);</div><div class='del'>-static void tasks_control_deactivate		(BonoboControl		*control,</div><div class='del'>-						 ETasks			*tasks);</div><div class='del'>-</div><div class='del'>-static void tasks_control_new_task_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-static void tasks_control_cut_cmd               (BonoboUIComponent      *uic,</div><div class='del'>-						 gpointer                data,</div><div class='del'>-						 const gchar            *path);</div><div class='del'>-static void tasks_control_copy_cmd              (BonoboUIComponent      *uic,</div><div class='del'>-						 gpointer                data,</div><div class='del'>-						 const gchar            *path);</div><div class='del'>-static void tasks_control_paste_cmd             (BonoboUIComponent      *uic,</div><div class='del'>-						 gpointer                data,</div><div class='del'>-						 const gchar            *path);</div><div class='del'>-static void tasks_control_delete_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-static void tasks_control_complete_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-static void tasks_control_expunge_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-static void tasks_control_print_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-static void tasks_control_print_preview_cmd	(BonoboUIComponent	*uic,</div><div class='del'>-						 gpointer		 data,</div><div class='del'>-						 const char		*path);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BonoboControl *</div><div class='del'>-tasks_control_new (void)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	GtkWidget *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = e_tasks_new ();</div><div class='del'>-	if (!tasks)</div><div class='del'>-		return NULL;</div><div class='del'>-	gtk_widget_show (tasks);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (tasks);</div><div class='del'>-	if (!control) {</div><div class='del'>-		gtk_widget_destroy (tasks);</div><div class='del'>-		g_message ("control_factory_fn(): could not create the control!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tasks_control_properties_init (control, E_TASKS (tasks));</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (tasks_control_activate_cb),</div><div class='del'>-			    tasks);</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates the property bag for our new control. */</div><div class='del'>-static void</div><div class='del'>-tasks_control_properties_init		(BonoboControl		*control,</div><div class='del'>-					 ETasks			*tasks)</div><div class='del'>-					 </div><div class='del'>-{</div><div class='del'>-	BonoboPropertyBag *pbag;</div><div class='del'>-</div><div class='del'>-	pbag = bonobo_property_bag_new (tasks_control_get_property,</div><div class='del'>-					tasks_control_set_property, tasks);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (pbag,</div><div class='del'>-				 TASKS_CONTROL_PROPERTY_URI,</div><div class='del'>-				 TASKS_CONTROL_PROPERTY_URI_IDX,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 _("The URI of the tasks folder to display"),</div><div class='del'>-				 0);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, pbag);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (pbag));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Gets a property of our control. FIXME: Finish. */</div><div class='del'>-static void</div><div class='del'>-tasks_control_get_property		(BonoboPropertyBag	*bag,</div><div class='del'>-					 BonoboArg		*arg,</div><div class='del'>-					 guint			 arg_id,</div><div class='del'>-					 CORBA_Environment      *ev,</div><div class='del'>-					 gpointer		 user_data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks = user_data;</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case TASKS_CONTROL_PROPERTY_URI_IDX:</div><div class='del'>-		uri = cal_client_get_uri (e_tasks_get_cal_client (tasks));</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, uri);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_set_property		(BonoboPropertyBag	*bag,</div><div class='del'>-					 const BonoboArg	*arg,</div><div class='del'>-					 guint			 arg_id,</div><div class='del'>-					 CORBA_Environment      *ev,</div><div class='del'>-					 gpointer		 user_data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks = user_data;</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case TASKS_CONTROL_PROPERTY_URI_IDX:</div><div class='del'>-		uri = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		if (!e_tasks_open (tasks, uri)) {</div><div class='del'>-			char *msg;</div><div class='del'>-</div><div class='del'>-			msg = g_strdup_printf (_("Could not load the tasks in `%s'"), uri);</div><div class='del'>-			gnome_error_dialog_parented (</div><div class='del'>-				msg,</div><div class='del'>-				GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (tasks))));</div><div class='del'>-			g_free (msg);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_activate_cb		(BonoboControl		*control,</div><div class='del'>-					 gboolean		 activate,</div><div class='del'>-					 gpointer		 user_data)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (user_data);</div><div class='del'>-</div><div class='del'>-	if (activate)</div><div class='del'>-		tasks_control_activate (control, tasks);</div><div class='del'>-	else</div><div class='del'>-		tasks_control_deactivate (control, tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sensitizes the UI Component menu/toolbar commands based on the number of</div><div class='del'>- * selected tasks.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sensitize_commands (ETasks *tasks, BonoboControl *control, int n_selected)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/TasksCut", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/TasksCopy", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/TasksDelete", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (uic, "/commands/TasksMarkComplete", "sensitive",</div><div class='del'>-				      n_selected == 0 ? "0" : "1",</div><div class='del'>-				      NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the selection in the table changes */</div><div class='del'>-static void</div><div class='del'>-selection_changed_cb (ETasks *tasks, int n_selected, gpointer data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = BONOBO_CONTROL (data);</div><div class='del'>-</div><div class='del'>-	sensitize_commands (tasks, control, n_selected);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksCut", tasks_control_cut_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksCopy", tasks_control_copy_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksPaste", tasks_control_paste_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksDelete", tasks_control_delete_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksMarkComplete", tasks_control_complete_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksExpunge", tasks_control_expunge_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksPrint", tasks_control_print_cmd),</div><div class='del'>-	BONOBO_UI_VERB ("TasksPrintPreview", tasks_control_print_preview_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps [] = {</div><div class='del'>-	E_PIXMAP ("/menu/File/New/NewFirstItem/NewTask",            "new_task-16.png"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/Print",			    "print.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/File/Print/PrintPreview",		    "print-preview.xpm"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCut",            "16_cut.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksCopy",           "16_copy.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksPaste",          "16_paste.png"),</div><div class='del'>-	E_PIXMAP ("/menu/EditPlaceholder/Edit/TasksDelete",         "evolution-trash-mini.png"),</div><div class='del'>-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/TasksSettings", "configure_16_calendar.xpm"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/New",                                   "buttons/new_task.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Cut",                                   "buttons/cut.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Copy",                                  "buttons/copy.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Paste",                                 "buttons/paste.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Delete",                                "buttons/delete-message.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/Print",				    "buttons/print.png"),</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_activate (BonoboControl *control, ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer remote_uih;</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	int n_selected;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	ETable *etable;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	e_tasks_set_ui_component (tasks, uic);</div><div class='del'>-</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (uic, remote_uih);</div><div class='del'>-	bonobo_object_release_unref (remote_uih, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (uic, verbs, tasks);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_freeze (uic, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-tasks.xml",</div><div class='del'>-			       "evolution-tasks");</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (uic, pixmaps);</div><div class='del'>-</div><div class='del'>-	e_tasks_setup_view_menus (tasks, uic);</div><div class='del'>-</div><div class='del'>-	/* Signals from the tasks widget; also sensitize the menu items as appropriate */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (tasks), "selection_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (selection_changed_cb), control);</div><div class='del'>-</div><div class='del'>-	cal_table = e_tasks_get_calendar_table (tasks);</div><div class='del'>-	etable = e_calendar_table_get_table (cal_table);</div><div class='del'>-	n_selected = e_table_selected_count (etable);</div><div class='del'>-</div><div class='del'>-	sensitize_commands (tasks, control, n_selected);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (uic, NULL);</div><div class='del'>-</div><div class='del'>-	/* Show the dialog for setting the timezone if the user hasn't chosen</div><div class='del'>-	   a default timezone already. This is done in the startup wizard now,</div><div class='del'>-	   so we don't do it here. */</div><div class='del'>-#if 0</div><div class='del'>-	calendar_config_check_timezone_set ();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	control_util_set_folder_bar_label (control, "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_deactivate (BonoboControl *control, ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);</div><div class='del'>-</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	e_tasks_set_ui_component (tasks, NULL);</div><div class='del'>-</div><div class='del'>-	e_tasks_discard_view_menus (tasks);</div><div class='del'>-</div><div class='del'>-	/* Stop monitoring the "selection_changed" signal */</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (tasks), control);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_rm (uic, "/", NULL);</div><div class='del'>- 	bonobo_ui_component_unset_container (uic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_new_task_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-					 gpointer		 data,</div><div class='del'>-					 const char		*path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	e_tasks_new_task (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_cut_cmd                   (BonoboUIComponent      *uic,</div><div class='del'>-					 gpointer                data,</div><div class='del'>-					 const char             *path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	cal_table = e_tasks_get_calendar_table (tasks);</div><div class='del'>-	e_calendar_table_cut_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_copy_cmd                  (BonoboUIComponent      *uic,</div><div class='del'>-					 gpointer                data,</div><div class='del'>-					 const char             *path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	cal_table = e_tasks_get_calendar_table (tasks);</div><div class='del'>-	e_calendar_table_copy_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_paste_cmd                 (BonoboUIComponent      *uic,</div><div class='del'>-					 gpointer                data,</div><div class='del'>-					 const char             *path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	cal_table = e_tasks_get_calendar_table (tasks);</div><div class='del'>-	e_calendar_table_paste_clipboard (cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_delete_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-					 gpointer		 data,</div><div class='del'>-					 const char		*path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	e_tasks_delete_selected (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_complete_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-					 gpointer		 data,</div><div class='del'>-					 const char		*path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	e_tasks_complete_selected (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-confirm_expunge (ETasks *tasks)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog, *label, *checkbox;</div><div class='del'>-	int button;</div><div class='del'>-	</div><div class='del'>-	if (!calendar_config_get_confirm_expunge ())</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_dialog_new (_("Warning"),</div><div class='del'>-				   GNOME_STOCK_BUTTON_YES,</div><div class='del'>-				   GNOME_STOCK_BUTTON_NO,</div><div class='del'>-				   NULL);</div><div class='del'>-	e_gnome_dialog_set_parent (GNOME_DIALOG (dialog), </div><div class='del'>-				   GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (tasks),</div><div class='del'>-									GTK_TYPE_WINDOW)));</div><div class='del'>-	</div><div class='del'>-	label = gtk_label_new (_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?"));</div><div class='del'>-	</div><div class='del'>-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);</div><div class='del'>-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), label, TRUE, TRUE, 4);</div><div class='del'>-	</div><div class='del'>-	checkbox = gtk_check_button_new_with_label (_("Do not ask me again."));</div><div class='del'>-	gtk_widget_show (checkbox);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), checkbox, TRUE, TRUE, 4);</div><div class='del'>-	</div><div class='del'>-	button = gnome_dialog_run (GNOME_DIALOG (dialog));	</div><div class='del'>-	if (button == 0 &amp;&amp; gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)))</div><div class='del'>-		calendar_config_set_confirm_expunge (FALSE);</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-	</div><div class='del'>-	if (button == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_expunge_cmd		(BonoboUIComponent	*uic,</div><div class='del'>-					 gpointer		 data,</div><div class='del'>-					 const char		*path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-	</div><div class='del'>-	if (confirm_expunge (tasks))</div><div class='del'>-	    e_tasks_delete_completed (tasks);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_title (GnomePrintContext *pc,</div><div class='del'>-	     double page_width, double page_height)</div><div class='del'>-{</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	char *text;</div><div class='del'>-	double w, x, y;</div><div class='del'>-</div><div class='del'>-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 18);</div><div class='del'>-</div><div class='del'>-	text = _("Tasks");</div><div class='del'>-	w = gnome_font_get_width_utf8 (font, text);</div><div class='del'>-</div><div class='del'>-	x = (page_width - w) / 2;</div><div class='del'>-	y = page_height - gnome_font_get_ascender (font);</div><div class='del'>-</div><div class='del'>-	gnome_print_moveto (pc, x, y);</div><div class='del'>-	gnome_print_setfont (pc, font);</div><div class='del'>-	gnome_print_setrgbcolor (pc, 0, 0, 0);</div><div class='del'>-	gnome_print_show (pc, text);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (font));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_tasks (ETasks *tasks, gboolean preview, gboolean landscape,</div><div class='del'>-	     int copies, gboolean collate)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	EPrintable *printable;</div><div class='del'>-	ETable *etable;</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	const GnomePaper *paper_info;</div><div class='del'>-	double l, r, t, b, page_width, page_height, left_margin, bottom_margin;</div><div class='del'>-</div><div class='del'>-	cal_table = e_tasks_get_calendar_table (tasks);</div><div class='del'>-	etable = e_calendar_table_get_table (E_CALENDAR_TABLE (cal_table));</div><div class='del'>-	printable = e_table_get_printable (etable);</div><div class='del'>-</div><div class='del'>-	master = gnome_print_master_new ();</div><div class='del'>-</div><div class='del'>-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());</div><div class='del'>-	gnome_print_master_set_paper (master, paper_info);</div><div class='del'>-</div><div class='del'>-	gnome_print_master_set_copies (master, copies, collate);</div><div class='del'>-	pc = gnome_print_master_get_context (master);</div><div class='del'>-	e_printable_reset (printable);</div><div class='del'>-</div><div class='del'>-	l = gnome_paper_lmargin (paper_info);</div><div class='del'>-	r = gnome_paper_pswidth (paper_info)</div><div class='del'>-		- gnome_paper_rmargin (paper_info);</div><div class='del'>-	t = gnome_paper_psheight (paper_info)</div><div class='del'>-		- gnome_paper_tmargin (paper_info);</div><div class='del'>-	b = gnome_paper_bmargin (paper_info);</div><div class='del'>-</div><div class='del'>-	if (landscape) {</div><div class='del'>-		page_width = t - b;</div><div class='del'>-		page_height = r - l;</div><div class='del'>-		left_margin = b;</div><div class='del'>-		bottom_margin = gnome_paper_rmargin (paper_info);</div><div class='del'>-	} else {</div><div class='del'>-		page_width = r - l;</div><div class='del'>-		page_height = t - b;</div><div class='del'>-		left_margin = l;</div><div class='del'>-		bottom_margin = b;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (e_printable_data_left (printable)) {</div><div class='del'>-		gnome_print_beginpage (pc, "Tasks");</div><div class='del'>-		gnome_print_gsave (pc);</div><div class='del'>-		if (landscape) {</div><div class='del'>-			gnome_print_rotate (pc, 90);</div><div class='del'>-			gnome_print_translate (pc, 0, -gnome_paper_pswidth (paper_info));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_print_translate (pc, left_margin, bottom_margin);</div><div class='del'>-</div><div class='del'>-		print_title (pc, page_width, page_height);</div><div class='del'>-</div><div class='del'>-		e_printable_print_page (printable, pc,</div><div class='del'>-					page_width, page_height - 24, TRUE);</div><div class='del'>-</div><div class='del'>-		gnome_print_grestore (pc);</div><div class='del'>-		gnome_print_showpage (pc);</div><div class='del'>-	}</div><div class='del'>-	gnome_print_master_close (master);</div><div class='del'>-</div><div class='del'>-	if (preview) {</div><div class='del'>-		GnomePrintMasterPreview *gpmp;</div><div class='del'>-		gpmp = gnome_print_master_preview_new_with_orientation (master, _("Print Preview"), landscape);</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (gpmp));</div><div class='del'>-	} else {</div><div class='del'>-		gnome_print_master_print (master);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (master));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (printable));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* File/Print callback */</div><div class='del'>-static void</div><div class='del'>-tasks_control_print_cmd (BonoboUIComponent *uic,</div><div class='del'>-			 gpointer data,</div><div class='del'>-			 const char *path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-	GtkWidget *gpd, *mode_box, *portrait_radio, *landscape_radio;</div><div class='del'>-	GtkWidget *dialog_vbox, *dialog_hbox, *mode_frame;</div><div class='del'>-	GList *children;</div><div class='del'>-	GSList *group;</div><div class='del'>-	gboolean preview = FALSE, landscape = FALSE;</div><div class='del'>-	GnomePrinter *printer;</div><div class='del'>-	int copies;</div><div class='del'>-	gboolean collate;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-</div><div class='del'>-	gpd = gnome_print_dialog_new (_("Print Tasks"),</div><div class='del'>-				      GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	mode_frame = gtk_frame_new (_("Orientation"));</div><div class='del'>-</div><div class='del'>-	mode_box = gtk_vbox_new (FALSE, 4);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (mode_frame), mode_box);</div><div class='del'>-</div><div class='del'>-	/* Portrait */</div><div class='del'>-	portrait_radio = gtk_radio_button_new_with_label (NULL, _("Portrait"));</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (portrait_radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (mode_box), portrait_radio,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Landscape */</div><div class='del'>-	landscape_radio = gtk_radio_button_new_with_label (group,</div><div class='del'>-							   _("Landscape"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (mode_box), landscape_radio,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (mode_frame);</div><div class='del'>-</div><div class='del'>-	/* A bit of a hack to insert our own Orientation option. */</div><div class='del'>-	dialog_vbox = GNOME_DIALOG (gpd)-&gt;vbox;</div><div class='del'>-	children = gtk_container_children (GTK_CONTAINER (dialog_vbox));</div><div class='del'>-	dialog_hbox = children-&gt;next-&gt;data;</div><div class='del'>-	g_list_free (children);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (dialog_hbox), mode_frame,</div><div class='del'>-			    FALSE, FALSE, 3);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);</div><div class='del'>-</div><div class='del'>-	/* Run dialog */</div><div class='del'>-	switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		preview = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case -1:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd),</div><div class='del'>-				       &amp;copies, &amp;collate);</div><div class='del'>-	if (GTK_TOGGLE_BUTTON (landscape_radio)-&gt;active)</div><div class='del'>-		landscape = TRUE;</div><div class='del'>-</div><div class='del'>-	printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (gpd));</div><div class='del'>-</div><div class='del'>-	print_tasks (tasks, preview, landscape, copies, collate);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-tasks_control_print_preview_cmd (BonoboUIComponent *uic,</div><div class='del'>-				 gpointer data,</div><div class='del'>-				 const char *path)</div><div class='del'>-{</div><div class='del'>-	ETasks *tasks;</div><div class='del'>-</div><div class='del'>-	tasks = E_TASKS (data);</div><div class='del'>-</div><div class='del'>-	print_tasks (tasks, TRUE, FALSE, 1, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h<br/>deleted file mode 100644<br/>index 2d701f0c85..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-control.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* tasks-control.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *	    Damon Chaplin &lt;damon@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _TASKS_CONTROL_H_</div><div class='del'>-#define _TASKS_CONTROL_H_</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BonoboControl *tasks_control_new		(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* _TASKS_CONTROL_H_ */</div><div class='head'>diff --git a/calendar/gui/tasks-migrate.c b/calendar/gui/tasks-migrate.c<br/>deleted file mode 100644<br/>index 5c9a4fa7c5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-migrate.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-migrate.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,307 +0,0 @@</div><div class='del'>-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include "config.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "tasks-migrate.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Client for the calendar folder */</div><div class='del'>-static CalClient *calendar_client = NULL;</div><div class='del'>-</div><div class='del'>-/* Client for the tasks folder */</div><div class='del'>-static CalClient *tasks_client = NULL;</div><div class='del'>-</div><div class='del'>-/* Whether we have done the migration yet */</div><div class='del'>-static gboolean migrated = FALSE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Performs the actual migration process */</div><div class='del'>-static void</div><div class='del'>-migrate (void)</div><div class='del'>-{</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-	gboolean success;</div><div class='del'>-	gboolean at_least_one;</div><div class='del'>-</div><div class='del'>-	g_assert (calendar_client != NULL);</div><div class='del'>-	g_assert (tasks_client != NULL);</div><div class='del'>-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-	g_assert (cal_client_get_load_state (tasks_client) == CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_uids (calendar_client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	success = TRUE;</div><div class='del'>-	at_least_one = FALSE;</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		const char *uid;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-		at_least_one = TRUE;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		status = cal_client_get_object (calendar_client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			if (cal_client_update_object (tasks_client, comp))</div><div class='del'>-				cal_client_remove_object (calendar_client, uid);</div><div class='del'>-			else</div><div class='del'>-				success = FALSE;</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-			/* This is OK; the object may have disappeared from the server */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-			success = FALSE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	if (!at_least_one)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		gnome_ok_dialog (_("Evolution has taken the tasks that were in your calendar folder "</div><div class='del'>-				   "and automatically migrated them to the new tasks folder."));</div><div class='del'>-	else</div><div class='del'>-		gnome_ok_dialog (_("Evolution has tried to take the tasks that were in your "</div><div class='del'>-				   "calendar folder and migrate them to the new tasks folder.\n"</div><div class='del'>-				   "Some of the tasks could not be migrated, so "</div><div class='del'>-				   "this process may be attempted again in the future."));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that a calendar could not be opened */</div><div class='del'>-static void</div><div class='del'>-open_error (const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("Could not open `%s'; no items from the calendar folder "</div><div class='del'>-				 "will be migrated to the tasks folder."),</div><div class='del'>-				 uri);</div><div class='del'>-	gnome_error_dialog (msg);</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that a URI method is not supported */</div><div class='del'>-static void</div><div class='del'>-method_error (const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("The method required to load `%s' is not supported; "</div><div class='del'>-				 "no items from the calendar folder will be migrated "</div><div class='del'>-				 "to the tasks folder."),</div><div class='del'>-			       uri);</div><div class='del'>-	gnome_error_dialog (msg);</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the tasks client is finished loading */</div><div class='del'>-static void</div><div class='del'>-tasks_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_assert (calendar_client != NULL);</div><div class='del'>-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_OPEN_SUCCESS:</div><div class='del'>-		migrate ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_ERROR:</div><div class='del'>-		open_error (cal_client_get_uri (client));</div><div class='del'>-		migrated = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_NOT_FOUND:</div><div class='del'>-		/* This can't happen because we did not specify only_if_exists when</div><div class='del'>-		 * issuing the open request.</div><div class='del'>-		 */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:</div><div class='del'>-		method_error (cal_client_get_uri (client));</div><div class='del'>-		migrated = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (calendar_client));</div><div class='del'>-	calendar_client = NULL;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (tasks_client));</div><div class='del'>-	tasks_client = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initiates the loading process for the tasks client */</div><div class='del'>-static gboolean</div><div class='del'>-load_tasks_client (void)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	g_assert (calendar_client != NULL);</div><div class='del'>-	g_assert (cal_client_get_load_state (calendar_client) == CAL_CLIENT_LOAD_LOADED);</div><div class='del'>-</div><div class='del'>-	tasks_client = cal_client_new ();</div><div class='del'>-	if (!tasks_client)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (tasks_client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (tasks_opened_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	uri = g_strdup_printf ("%s/local/Tasks/tasks.ics", evolution_dir);</div><div class='del'>-	success = cal_client_open_calendar (tasks_client, uri, FALSE);</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	g_message ("load_tasks_client(): could not issue open request for the tasks client");</div><div class='del'>-</div><div class='del'>-	if (tasks_client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (tasks_client));</div><div class='del'>-		tasks_client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client finishes loading */</div><div class='del'>-static void</div><div class='del'>-calendar_opened_cb (CalClient *client, CalClientOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_OPEN_SUCCESS:</div><div class='del'>-		if (!load_tasks_client ()) {</div><div class='del'>-			migrated = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_ERROR:</div><div class='del'>-		open_error (cal_client_get_uri (client));</div><div class='del'>-		migrated = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_NOT_FOUND:</div><div class='del'>-		/* This is OK; the calendar folder did not exist in the first</div><div class='del'>-		 * place so there is nothing to migrate.</div><div class='del'>-		 */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED:</div><div class='del'>-		method_error (cal_client_get_uri (client));</div><div class='del'>-		migrated = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (calendar_client));</div><div class='del'>-	calendar_client = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initiates the loading process for the calendar client */</div><div class='del'>-static gboolean</div><div class='del'>-load_calendar_client (void)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	/* First we load the calendar client; the tasks client will be loaded</div><div class='del'>-	 * later only if the former one succeeds.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	calendar_client = cal_client_new ();</div><div class='del'>-	if (!calendar_client)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (calendar_client), "cal_opened",</div><div class='del'>-			    GTK_SIGNAL_FUNC (calendar_opened_cb),</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	uri = g_strdup_printf ("%s/local/Calendar/calendar.ics", evolution_dir);</div><div class='del'>-	success = cal_client_open_calendar (calendar_client, uri, TRUE);</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	if (success)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	g_message ("load_calendar_client(): could not issue open request for the calendar client");</div><div class='del'>-</div><div class='del'>-	if (calendar_client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (calendar_client));</div><div class='del'>-		calendar_client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * tasks_migrate:</div><div class='del'>- *</div><div class='del'>- * Initiates the asynchronous process that migrates the tasks from the default</div><div class='del'>- * user calendar folder to the default tasks folder.  This is because Evolution</div><div class='del'>- * used to store tasks in the same folder as the calendar by default, but they</div><div class='del'>- * are separate folders now.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-tasks_migrate (void)</div><div class='del'>-{</div><div class='del'>-	g_assert (!migrated);</div><div class='del'>-	migrated = TRUE;</div><div class='del'>-</div><div class='del'>-	if (!load_calendar_client ())</div><div class='del'>-		migrated = FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/tasks-migrate.h b/calendar/gui/tasks-migrate.h<br/>deleted file mode 100644<br/>index 0307d533b9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/tasks-migrate.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/tasks-migrate.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-/* Evolution calendar - Migrate tasks from the calendar folder to the tasks folder</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef TASKS_MIGRATE_H</div><div class='del'>-#define TASKS_MIGRATE_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void tasks_migrate (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c<br/>deleted file mode 100644<br/>index 890d46f92e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekday-picker.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/weekday-picker.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,574 +0,0 @@</div><div class='del'>-/* Evolution calendar - Week day picker widget</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-text.h&gt;</div><div class='del'>-#include "weekday-picker.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PADDING 2</div><div class='del'>-</div><div class='del'>-/* Private part of the WeekdayPicker structure */</div><div class='del'>-struct _WeekdayPickerPrivate {</div><div class='del'>-	/* Selected days; see weekday_picker_set_days() */</div><div class='del'>-	guint8 day_mask;</div><div class='del'>-</div><div class='del'>-	/* Blocked days; these cannot be modified */</div><div class='del'>-	guint8 blocked_day_mask;</div><div class='del'>-</div><div class='del'>-	/* Day that defines the start of the week; 0 = Sunday, ..., 6 = Saturday */</div><div class='del'>-	int week_start_day;</div><div class='del'>-</div><div class='del'>-	/* Metrics */</div><div class='del'>-	int font_ascent, font_descent;</div><div class='del'>-	int max_letter_width;</div><div class='del'>-</div><div class='del'>-	/* Components */</div><div class='del'>-	GnomeCanvasItem *boxes[7];</div><div class='del'>-	GnomeCanvasItem *labels[7];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void weekday_picker_class_init (WeekdayPickerClass *class);</div><div class='del'>-static void weekday_picker_init (WeekdayPicker *wp);</div><div class='del'>-static void weekday_picker_finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void weekday_picker_realize (GtkWidget *widget);</div><div class='del'>-static void weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition);</div><div class='del'>-static void weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation);</div><div class='del'>-static void weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasClass *parent_class;</div><div class='del'>-</div><div class='del'>-static guint wp_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #WeekdayPicker class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #WeekdayPicker class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-weekday_picker_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType weekday_picker_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!weekday_picker_type) {</div><div class='del'>-		static const GtkTypeInfo weekday_picker_info = {</div><div class='del'>-			"WeekdayPicker",</div><div class='del'>-			sizeof (WeekdayPicker),</div><div class='del'>-			sizeof (WeekdayPickerClass),</div><div class='del'>-			(GtkClassInitFunc) weekday_picker_class_init,</div><div class='del'>-			(GtkObjectInitFunc) weekday_picker_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		weekday_picker_type = gtk_type_unique (GNOME_TYPE_CANVAS, &amp;weekday_picker_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return weekday_picker_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_class_init (WeekdayPickerClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GNOME_TYPE_CANVAS);</div><div class='del'>-</div><div class='del'>-	wp_signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (WeekdayPickerClass, changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, wp_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = weekday_picker_finalize;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize = weekday_picker_realize;</div><div class='del'>-	widget_class-&gt;size_request = weekday_picker_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = weekday_picker_size_allocate;</div><div class='del'>-	widget_class-&gt;style_set = weekday_picker_style_set;</div><div class='del'>-</div><div class='del'>-	class-&gt;changed = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for the day items */</div><div class='del'>-static gint</div><div class='del'>-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	guint8 day_mask;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (data);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!(event-&gt;type == GDK_BUTTON_PRESS &amp;&amp; event-&gt;button.button == 1))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Find which box was clicked */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++)</div><div class='del'>-		if (priv-&gt;boxes[i] == item || priv-&gt;labels[i] == item)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	g_assert (i != 7);</div><div class='del'>-</div><div class='del'>-	/* Turn on that day */</div><div class='del'>-</div><div class='del'>-	i += priv-&gt;week_start_day;</div><div class='del'>-	if (i &gt;= 7)</div><div class='del'>-		i -= 7;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;blocked_day_mask &amp; (0x1 &lt;&lt; i))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; i))</div><div class='del'>-		day_mask = priv-&gt;day_mask &amp; ~(0x1 &lt;&lt; i);</div><div class='del'>-	else</div><div class='del'>-		day_mask = priv-&gt;day_mask | (0x1 &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	weekday_picker_set_days (wp, day_mask);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates the canvas items for the weekday picker.  The items are empty until</div><div class='del'>- * they are configured elsewhere.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-create_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	GnomeCanvasGroup *parent;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	parent = gnome_canvas_root (GNOME_CANVAS (wp));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		priv-&gt;boxes[i] = gnome_canvas_item_new (parent,</div><div class='del'>-							GNOME_TYPE_CANVAS_RECT,</div><div class='del'>-							NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;boxes[i]), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (day_event_cb),</div><div class='del'>-				    wp);</div><div class='del'>-</div><div class='del'>-		priv-&gt;labels[i] = gnome_canvas_item_new (parent,</div><div class='del'>-							 GNOME_TYPE_CANVAS_TEXT,</div><div class='del'>-							 NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;labels[i]), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (day_event_cb),</div><div class='del'>-				    wp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_init (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_UNSET_FLAGS (wp, GTK_CAN_FOCUS);</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (WeekdayPickerPrivate, 1);</div><div class='del'>-</div><div class='del'>-	wp-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	create_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Finalize handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (object));</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (object);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	wp-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;finalize) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-colorize_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	GdkColor *outline;</div><div class='del'>-	GdkColor *fill, *sel_fill;</div><div class='del'>-	GdkColor *text_fill, *sel_text_fill;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	outline = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_WIDGET_STATE (wp)];</div><div class='del'>-</div><div class='del'>-	fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;base[GTK_WIDGET_STATE (wp)];</div><div class='del'>-	text_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_WIDGET_STATE (wp)];</div><div class='del'>-</div><div class='del'>-	sel_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;bg[GTK_STATE_SELECTED];</div><div class='del'>-	sel_text_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_STATE_SELECTED];</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		int day;</div><div class='del'>-		GdkColor *f, *t;</div><div class='del'>-</div><div class='del'>-		day = i + priv-&gt;week_start_day;</div><div class='del'>-		if (day &gt;= 7)</div><div class='del'>-			day -= 7;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; day)) {</div><div class='del'>-			f = sel_fill;</div><div class='del'>-			t = sel_text_fill;</div><div class='del'>-		} else {</div><div class='del'>-			f = fill;</div><div class='del'>-			t = text_fill;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;boxes[i],</div><div class='del'>-				       "fill_color_gdk", f,</div><div class='del'>-				       "outline_color_gdk", outline,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;labels[i],</div><div class='del'>-				       "fill_color_gdk", t,</div><div class='del'>-				       NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Configures the items in the weekday picker by setting their attributes. */</div><div class='del'>-static void</div><div class='del'>-configure_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int width, height;</div><div class='del'>-	int box_width;</div><div class='del'>-	const char *str;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	width = GTK_WIDGET (wp)-&gt;allocation.width;</div><div class='del'>-	height = GTK_WIDGET (wp)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	box_width = (width - 1) / 7;</div><div class='del'>-	str = _("SMTWTFS");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		char *c;</div><div class='del'>-		int day;</div><div class='del'>-</div><div class='del'>-		day = i + priv-&gt;week_start_day;</div><div class='del'>-		if (day &gt;= 7)</div><div class='del'>-			day -= 7;</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;boxes[i],</div><div class='del'>-				       "x1", (double) (i * box_width),</div><div class='del'>-				       "y1", (double) 0,</div><div class='del'>-				       "x2", (double) ((i + 1) * box_width),</div><div class='del'>-				       "y2", (double) (height - 1),</div><div class='del'>-				       "width_pixels", 0,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		c = g_strndup (str + day, 1);</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;labels[i],</div><div class='del'>-				       "text", c,</div><div class='del'>-				       "font_gdk", GTK_WIDGET (wp)-&gt;style-&gt;font,</div><div class='del'>-				       "x", (double) (i * box_width) + box_width / 2.0,</div><div class='del'>-				       "y", (double) (1 + PADDING),</div><div class='del'>-				       "anchor", GTK_ANCHOR_N,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_free (c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	colorize_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Realize handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;realize) (widget);</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Size_request handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	requisition-&gt;width = (priv-&gt;max_letter_width + 2 * PADDING + 1) * 7 + 1;</div><div class='del'>-	requisition-&gt;height = (priv-&gt;font_ascent + priv-&gt;font_descent + 2 * PADDING + 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Size_allocate handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (wp),</div><div class='del'>-					0, 0, allocation-&gt;width, allocation-&gt;height);</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Style_set handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int max_width;</div><div class='del'>-	const char *str;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;font_ascent = widget-&gt;style-&gt;font-&gt;ascent;</div><div class='del'>-	priv-&gt;font_descent = widget-&gt;style-&gt;font-&gt;descent;</div><div class='del'>-</div><div class='del'>-	max_width = 0;</div><div class='del'>-</div><div class='del'>-	str = _("SMTWTFS");</div><div class='del'>-	len = strlen (str);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		int w;</div><div class='del'>-</div><div class='del'>-		w = gdk_char_measure (widget-&gt;style-&gt;font, str[i]);</div><div class='del'>-		if (w &gt; max_width)</div><div class='del'>-			max_width = w;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;max_letter_width = max_width;</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;style_set) (widget, previous_style);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_new:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Creates a new weekday picker widget.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created weekday picker.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-weekday_picker_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (TYPE_WEEKDAY_PICKER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_set_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * @day_mask: Bitmask with the days to be selected.</div><div class='del'>- * </div><div class='del'>- * Sets the days that are selected in a weekday picker.  In the @day_mask,</div><div class='del'>- * Sunday is bit 0, Monday is bit 1, etc.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (wp != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;day_mask = day_mask;</div><div class='del'>-	colorize_items (wp);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (wp), wp_signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * </div><div class='del'>- * Queries the days that are selected in a weekday picker.</div><div class='del'>- * </div><div class='del'>- * Return value: Bit mask of selected days.  Sunday is bit 0, Monday is bit 1,</div><div class='del'>- * etc.</div><div class='del'>- **/</div><div class='del'>-guint8</div><div class='del'>-weekday_picker_get_days (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (wp != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	return priv-&gt;day_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_set_blocked_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * @blocked_day_mask: Bitmask with the days to be blocked.</div><div class='del'>- * </div><div class='del'>- * Sets the days that the weekday picker will prevent from being modified by the</div><div class='del'>- * user.  The @blocked_day_mask is specified in the same way as in</div><div class='del'>- * weekday_picker_set_days().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (wp != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	priv-&gt;blocked_day_mask = blocked_day_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_blocked_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * </div><div class='del'>- * Queries the set of days that the weekday picker prevents from being modified</div><div class='del'>- * by the user.</div><div class='del'>- * </div><div class='del'>- * Return value: Bit mask of blocked days, with the same format as that returned</div><div class='del'>- * by weekday_picker_get_days().</div><div class='del'>- **/</div><div class='del'>-guint</div><div class='del'>-weekday_picker_get_blocked_days (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (wp != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	return priv-&gt;blocked_day_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_set_week_start_day:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * @week_start_day: Index of the day that defines the start of the week; 0 is</div><div class='del'>- * Sunday, 1 is Monday, etc.</div><div class='del'>- * </div><div class='del'>- * Sets the day that defines the start of the week for a weekday picker.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (wp != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));</div><div class='del'>-	g_return_if_fail (week_start_day &gt;= 0 &amp;&amp; week_start_day &lt; 7);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	priv-&gt;week_start_day = week_start_day;</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_week_start_day:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * </div><div class='del'>- * Queries the day that defines the start of the week in a weekday picker.</div><div class='del'>- * </div><div class='del'>- * Return value: Index of the day that defines the start of the week.  See</div><div class='del'>- * weekday_picker_set_week_start_day() to see how this is represented.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-weekday_picker_get_week_start_day (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (wp != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), -1);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	return priv-&gt;week_start_day;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h<br/>deleted file mode 100644<br/>index 928dcac353..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekday-picker.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/gui/weekday-picker.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/* Evolution calendar - Week day picker widget</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef WEEKDAY_PICKER_H</div><div class='del'>-#define WEEKDAY_PICKER_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())</div><div class='del'>-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))</div><div class='del'>-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\</div><div class='del'>-					WeekdayPickerClass))</div><div class='del'>-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))</div><div class='del'>-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))</div><div class='del'>-</div><div class='del'>-typedef struct _WeekdayPicker WeekdayPicker;</div><div class='del'>-typedef struct _WeekdayPickerClass WeekdayPickerClass;</div><div class='del'>-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;</div><div class='del'>-</div><div class='del'>-struct _WeekdayPicker {</div><div class='del'>-	GnomeCanvas canvas;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _WeekdayPickerClass {</div><div class='del'>-	GnomeCanvasClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed) (WeekdayPicker *wp);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType weekday_picker_get_type (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *weekday_picker_new (void);</div><div class='del'>-</div><div class='del'>-void weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask);</div><div class='del'>-guint8 weekday_picker_get_days (WeekdayPicker *wp);</div><div class='del'>-</div><div class='del'>-void weekday_picker_set_blocked_days (WeekdayPicker *wp, guint8 blocked_day_mask);</div><div class='del'>-guint weekday_picker_get_blocked_days (WeekdayPicker *wp);</div><div class='del'>-</div><div class='del'>-void weekday_picker_set_week_start_day (WeekdayPicker *wp, int week_start_day);</div><div class='del'>-int weekday_picker_get_week_start_day (WeekdayPicker *wp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/idl/.cvsignore b/calendar/idl/.cvsignore<br/>deleted file mode 100644<br/>index b840c21800..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/idl/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/idl/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am<br/>deleted file mode 100644<br/>index ec6b4e45f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/idl/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/idl/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-idldir = $(datadir)/idl</div><div class='del'>-</div><div class='del'>-idl_DATA = 			\</div><div class='del'>-	evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =		\</div><div class='del'>-	$(idl_DATA)</div><div class='head'>diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl<br/>deleted file mode 100644<br/>index 7ad011aecf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/idl/evolution-calendar.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/idl/evolution-calendar.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,350 +0,0 @@</div><div class='del'>-/* Evolution calendar interface</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Eskil Heyn Olsen</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>- *          Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EVOLUTION_CALENDAR_IDL_</div><div class='del'>-#define _EVOLUTION_CALENDAR_IDL_</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-</div><div class='del'>-module Calendar {</div><div class='del'>-	/* A calendar component (event/todo/journal/etc), represented as an</div><div class='del'>-	 * iCalendar string.</div><div class='del'>-	 */</div><div class='del'>-	typedef string CalObj;</div><div class='del'>-	typedef sequence&lt;CalObj&gt; CalObjSeq;</div><div class='del'>-</div><div class='del'>-	/* A unique identifier for a calendar component */</div><div class='del'>-	typedef string CalObjUID;</div><div class='del'>-</div><div class='del'>-	/* Simple sequence of strings */</div><div class='del'>-	typedef sequence&lt;string&gt; StringSeq;</div><div class='del'>-</div><div class='del'>-	/* Sequence of unique identifiers */</div><div class='del'>-	typedef sequence&lt;CalObjUID&gt; CalObjUIDSeq;</div><div class='del'>-</div><div class='del'>-	/* A VTIMEZONE component, represented as an iCalendar string. */</div><div class='del'>-	typedef string CalTimezoneObj;</div><div class='del'>-</div><div class='del'>-	/* A unique identifier for a VTIMEZONE component, i.e. its TZID. */</div><div class='del'>-	typedef string CalTimezoneObjUID;</div><div class='del'>-</div><div class='del'>-	/* A unique identifier for an alarm subcomponent */</div><div class='del'>-	typedef string CalAlarmUID;</div><div class='del'>-</div><div class='del'>-	/* Flags for getting UID sequences */</div><div class='del'>-	typedef long CalObjType;</div><div class='del'>-	const CalObjType TYPE_EVENT   = 1 &lt;&lt; 0;</div><div class='del'>-	const CalObjType TYPE_TODO    = 1 &lt;&lt; 1;</div><div class='del'>-	const CalObjType TYPE_JOURNAL = 1 &lt;&lt; 2;</div><div class='del'>-	const CalObjType TYPE_ANY     = 0x07;</div><div class='del'>-</div><div class='del'>-	/* Flags for getting URI sequences */</div><div class='del'>-	typedef long CalMode;</div><div class='del'>-	const CalMode MODE_LOCAL   = 1 &lt;&lt; 0;</div><div class='del'>-	const CalMode MODE_REMOTE  = 1 &lt;&lt; 1;</div><div class='del'>-	const CalMode MODE_ANY     = 0x07;</div><div class='del'>-</div><div class='del'>-	/* Types of object changes made */</div><div class='del'>-	typedef long CalObjChangeType;</div><div class='del'>-	const CalObjChangeType ADDED = 1 &lt;&lt; 0;</div><div class='del'>-	const CalObjChangeType MODIFIED = 1 &lt;&lt; 1;</div><div class='del'>-	const CalObjChangeType DELETED = 1 &lt;&lt; 2;</div><div class='del'>-	</div><div class='del'>-	/* Types of alarms */</div><div class='del'>-	enum AlarmType {</div><div class='del'>-		MAIL,</div><div class='del'>-		PROGRAM,</div><div class='del'>-		DISPLAY,</div><div class='del'>-		AUDIO</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Used to store a time_t */</div><div class='del'>-	typedef unsigned long Time_t;</div><div class='del'>-</div><div class='del'>-	/* An instance of a calendar component that actually occurs.  These are</div><div class='del'>-	 * "virtual" objects in that they are used to represent instances of</div><div class='del'>-	 * recurring events and alarms.  "Real" objects just contain the</div><div class='del'>-	 * information required to figure out the times at which they recur or</div><div class='del'>-	 * trigger.  </div><div class='del'>-	 */</div><div class='del'>-	struct CalObjInstance {</div><div class='del'>-		CalObjUID uid;</div><div class='del'>-		Time_t start;</div><div class='del'>-		Time_t end;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Used to transfer a list of component occurrences */</div><div class='del'>-	typedef sequence&lt;CalObjInstance&gt; CalObjInstanceSeq;</div><div class='del'>-</div><div class='del'>-	/* An object change */</div><div class='del'>-	struct CalObjChange {</div><div class='del'>-		CalObj calobj;</div><div class='del'>-		CalObjChangeType type;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Used to transfer a list of changed components */</div><div class='del'>-	typedef sequence&lt;CalObjChange&gt; CalObjChangeSeq;</div><div class='del'>-</div><div class='del'>-	/* An alarm trigger instance */</div><div class='del'>-	struct CalAlarmInstance {</div><div class='del'>-		CalAlarmUID auid;</div><div class='del'>-		Time_t trigger;</div><div class='del'>-		Time_t occur_start;</div><div class='del'>-		Time_t occur_end;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Used to represent a list of alarm triggers for a single component */</div><div class='del'>-	typedef sequence&lt;CalAlarmInstance&gt; CalAlarmInstanceSeq;</div><div class='del'>-</div><div class='del'>-	/* Alarms for a component */</div><div class='del'>-	struct CalComponentAlarms {</div><div class='del'>-		CalObj calobj;</div><div class='del'>-		CalAlarmInstanceSeq alarms;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Used to represent a list of components plus their triggers */</div><div class='del'>-	typedef sequence&lt;CalComponentAlarms&gt; CalComponentAlarmsSeq;</div><div class='del'>-</div><div class='del'>-	/* Used to represent users and lists of users */</div><div class='del'>-	typedef string User;</div><div class='del'>-	typedef sequence&lt;User&gt; UserList;</div><div class='del'>-</div><div class='del'>-	interface Query;</div><div class='del'>-</div><div class='del'>-	interface Listener;</div><div class='del'>-</div><div class='del'>-	interface QueryListener;</div><div class='del'>-</div><div class='del'>-	/* Calendar client interface */</div><div class='del'>-	interface Cal : Bonobo::Unknown {</div><div class='del'>-		exception NotFound {};</div><div class='del'>-		exception InvalidRange {};</div><div class='del'>-		exception InvalidObject {};</div><div class='del'>-		exception CouldNotCreate {};</div><div class='del'>-		</div><div class='del'>-		/* A calendar is identified by its URI */</div><div class='del'>-		readonly attribute string uri;</div><div class='del'>-</div><div class='del'>-		/* For going online/offline */</div><div class='del'>-		void setMode (in CalMode mode);</div><div class='del'>-		</div><div class='del'>-		/* Gets the number of components of the specified types */</div><div class='del'>-		long countObjects (in CalObjType type);</div><div class='del'>-</div><div class='del'>-		/* Gets a component based on its URI */</div><div class='del'>-		CalObj getObject (in CalObjUID uid)</div><div class='del'>-			raises (NotFound);</div><div class='del'>-</div><div class='del'>-		/* Sets the default timezone to be used for resolving DATE</div><div class='del'>-		   and floating DATE-TIME values. */</div><div class='del'>-		void setDefaultTimezone (in CalTimezoneObjUID tzid)</div><div class='del'>-			raises (NotFound);</div><div class='del'>-</div><div class='del'>-		/* Gets a VTIMEZONE component based on its TZID */</div><div class='del'>-		CalTimezoneObj getTimezoneObject (in CalTimezoneObjUID tzid)</div><div class='del'>-			raises (NotFound);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of UIDs based on component type */</div><div class='del'>-		CalObjUIDSeq getUIDs (in CalObjType type);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of components that changed based on object type */</div><div class='del'>-		CalObjChangeSeq getChanges (in CalObjType type, in string change_id);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of components that occur or recur in the specified time range */</div><div class='del'>-		CalObjUIDSeq getObjectsInRange (in CalObjType type, </div><div class='del'>-						in Time_t start, in Time_t end)</div><div class='del'>-			raises (InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of the components that have alarms that trigger</div><div class='del'>-		 * in the specified range of time, and the trigger/occurrence</div><div class='del'>-		 * structures themselves.  </div><div class='del'>-		 */</div><div class='del'>-		CalComponentAlarmsSeq getAlarmsInRange (in Time_t start, in Time_t end)</div><div class='del'>-			raises (InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Returns free/busy objects for the given interval */</div><div class='del'>-		CalObjSeq getFreeBusy (in UserList users, in Time_t start, in Time_t end)</div><div class='del'>-			raises (NotFound, InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Gets the alarms for the specified component that trigger in</div><div class='del'>-		 * the specified time range.  </div><div class='del'>-		 */</div><div class='del'>-		CalComponentAlarms getAlarmsForObject (in CalObjUID uid,</div><div class='del'>-						       in Time_t start, in Time_t end)</div><div class='del'>-			raises (NotFound, InvalidRange);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/* Adds or updates one or more VEVENT/VTODO/VTIMEZONE</div><div class='del'>-		 * components. The calobj should be a string representation of</div><div class='del'>-		 * a complete VCALENDAR object (we also support single</div><div class='del'>-		 * VEVENT/VTODO strings, but that is deprecated).</div><div class='del'>-		 *</div><div class='del'>-		 * The VTIMEZONE data will be merged into the calendar,</div><div class='del'>-		 * possibly by renaming TZIDs (though not for builtin</div><div class='del'>-		 * VTIMEZONEs, which have unique TZIDs), so don't rely on the</div><div class='del'>-		 * TZIDs being the same in the new object on the server.</div><div class='del'>-		 *</div><div class='del'>-		 * The client should probably immediately free its copy of the</div><div class='del'>-		 * object after this call, and call getObject to get the</div><div class='del'>-		 * updated version.</div><div class='del'>-		 */</div><div class='del'>-		void updateObjects (in CalObj calobj)</div><div class='del'>-			raises (InvalidObject);</div><div class='del'>-</div><div class='del'>-		/* Removes a component */</div><div class='del'>-		void removeObject (in CalObjUID uid)</div><div class='del'>-			raises (NotFound);</div><div class='del'>-</div><div class='del'>-		/* Initiates a live query of the calendar.  Returns a handle</div><div class='del'>-		 * to the live query itself; changes to components that are</div><div class='del'>-		 * present in the query are notified to the listener.</div><div class='del'>-		 */</div><div class='del'>-		Query getQuery (in string sexp, in QueryListener ql)</div><div class='del'>-			raises (CouldNotCreate);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Listener for changes in a calendar */</div><div class='del'>-	interface Listener : Bonobo::Unknown {</div><div class='del'>-		/* Return status when opening a calendar */</div><div class='del'>-		enum OpenStatus {</div><div class='del'>-			SUCCESS,		/* All OK */</div><div class='del'>-			ERROR,			/* Generic error */</div><div class='del'>-			NOT_FOUND,		/* Requested opening in only_if_exists mode</div><div class='del'>-						 * when the URI did not exist.</div><div class='del'>-						 */</div><div class='del'>-			METHOD_NOT_SUPPORTED	/* A method handler is not registered */</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* Return status when setting calendar mode */</div><div class='del'>-		enum SetModeStatus {</div><div class='del'>-			MODE_SET,                    /* All OK */</div><div class='del'>-			MODE_NOT_SET,                /* Generic error */</div><div class='del'>-			MODE_NOT_SUPPORTED           /* Mode not supported */</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* Called from a CalFactory when a calendar is initially opened.</div><div class='del'>-		 * The listener must remember the cal object.  </div><div class='del'>-		 */</div><div class='del'>-		void notifyCalOpened (in OpenStatus status, in Cal cal);</div><div class='del'>-</div><div class='del'>-                /* Called from a Calendar when the mode is changed */</div><div class='del'>-		void notifyCalSetMode (in SetModeStatus status, in CalMode mode);</div><div class='del'>-		</div><div class='del'>-		/* Called from a Calendar when a component is added or changed */</div><div class='del'>-		void notifyObjUpdated (in CalObjUID uid);</div><div class='del'>-</div><div class='del'>-		/* Called from a Calendar when a component is removed */</div><div class='del'>-		void notifyObjRemoved (in CalObjUID uid);</div><div class='del'>-</div><div class='del'>-		/* Called from a Calendar when the list of categories changes */</div><div class='del'>-		void notifyCategoriesChanged (in StringSeq categories);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Handle to a live query on a calendar */</div><div class='del'>-	interface Query : Bonobo::Unknown {</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Listener for changes in a query of a calendar */</div><div class='del'>-	interface QueryListener : Bonobo::Unknown {</div><div class='del'>-		/* Called when a component is added or changed.  If</div><div class='del'>-		 * query_in_progress is true, then the initial query results are</div><div class='del'>-		 * being populated and the other arguments indicate the</div><div class='del'>-		 * percentage of completion Otherwise, the percent value is</div><div class='del'>-		 * unspecified.  */</div><div class='del'>-		void notifyObjUpdated (in CalObjUID uid, </div><div class='del'>-				       in boolean query_in_progress, </div><div class='del'>-				       in long n_scanned,</div><div class='del'>-				       in long total);</div><div class='del'>-</div><div class='del'>-		/* Called when a component is removed */</div><div class='del'>-		void notifyObjRemoved (in CalObjUID uid);</div><div class='del'>-</div><div class='del'>-		/* Reported when a query ends */</div><div class='del'>-		enum QueryDoneStatus {</div><div class='del'>-			SUCCESS,</div><div class='del'>-			PARSE_ERROR</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* Called when the query finishes populating itself some time</div><div class='del'>-		 * after it is created.  Before this is called,</div><div class='del'>-		 * notifyObjUpdated() may have been called several times to</div><div class='del'>-		 * indicate which objects are actually in the query, unless the</div><div class='del'>-		 * status result is a parse error.  </div><div class='del'>-		 */</div><div class='del'>-		void notifyQueryDone (in QueryDoneStatus status, in string error_str);</div><div class='del'>-</div><div class='del'>-		/* Called when an evaluation error occurs while performing a query */</div><div class='del'>-		void notifyEvalError (in string error_str);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* A calendar factory, can load and create calendars */</div><div class='del'>-	interface CalFactory : Bonobo::Unknown {</div><div class='del'>-		exception NilListener {};</div><div class='del'>-		exception InvalidURI {};</div><div class='del'>-		exception UnsupportedMethod {};</div><div class='del'>-</div><div class='del'>-		/* Open a calendar from an URI */</div><div class='del'>-		void open (in string uri, in boolean only_if_exists, in Listener listener)</div><div class='del'>-			raises (NilListener, InvalidURI, UnsupportedMethod);</div><div class='del'>-</div><div class='del'>-		/* List of open URI's */</div><div class='del'>-		StringSeq uriList (in CalMode mode);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Interface to the alarm notification service */</div><div class='del'>-	interface AlarmNotify : Bonobo::Unknown {</div><div class='del'>-		exception InvalidURI {};</div><div class='del'>-		exception BackendContactError {};</div><div class='del'>-		exception NotFound {};</div><div class='del'>-</div><div class='del'>-		/* Adds a calendar to the alarm notification system so that</div><div class='del'>-		 * alarms will be triggered for it.  The calendar will be loaded</div><div class='del'>-		 * automatically whenever the alarm daemon starts up.  </div><div class='del'>-		 */</div><div class='del'>-		void addCalendar (in string uri)</div><div class='del'>-			raises (InvalidURI, BackendContactError);</div><div class='del'>-</div><div class='del'>-		/* Removes a calendar from the alarm notification system and</div><div class='del'>-		 * alarms will no longer be triggered for it.  The calendar will</div><div class='del'>-		 * no longer be loaded when the alarm daemon starts up. </div><div class='del'>-		 */</div><div class='del'>-		void removeCalendar (in string uri)</div><div class='del'>-			raises (InvalidURI, NotFound);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	/* Factory to centralize calendar component editor dialogs */</div><div class='del'>-	interface CompEditorFactory : Bonobo::Unknown {</div><div class='del'>-		exception InvalidURI {};</div><div class='del'>-		exception BackendContactError {};</div><div class='del'>-		exception UnsupportedType {};</div><div class='del'>-</div><div class='del'>-		typedef long CompEditorMode;</div><div class='del'>-		const CompEditorMode EDITOR_MODE_EVENT        = 1 &lt;&lt; 0;</div><div class='del'>-		const CompEditorMode EDITOR_MODE_ALLDAY_EVENT = 1 &lt;&lt; 1;</div><div class='del'>-		const CompEditorMode EDITOR_MODE_MEETING      = 1 &lt;&lt; 2;</div><div class='del'>-		const CompEditorMode EDITOR_MODE_TODO         = 1 &lt;&lt; 3;</div><div class='del'>-</div><div class='del'>-		/* Loads a calendar and opens an editor for the specified object */</div><div class='del'>-		void editExisting (in string uri, in CalObjUID uid)</div><div class='del'>-			raises (InvalidURI, BackendContactError);</div><div class='del'>-</div><div class='del'>-		/* Loads a calendar and creates a new component of the specified type */</div><div class='del'>-		void editNew (in string uri, in CompEditorMode mode)</div><div class='del'>-			raises (InvalidURI, BackendContactError, UnsupportedType);</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/importers/.cvsignore b/calendar/importers/.cvsignore<br/>deleted file mode 100644<br/>index dfa0930c53..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-evolution-calendar-importer</div><div class='del'>-GNOME_Evolution_Calendar_Importer.oaf</div><div class='head'>diff --git a/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in b/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in<br/>deleted file mode 100644<br/>index 710567dbc0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"</div><div class='del'>-	    type="exe"</div><div class='del'>-	    location="evolution-calendar-importer"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Factory to import iCalendar files into Evolution"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Importer:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-	&lt;oaf_attribute name="evolution:menu-name" type="string"</div><div class='del'>-                       value="iCalendar files (.ics)"/&gt;</div><div class='del'>-        &lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Imports iCalendar files into Evolution"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/Importer:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-	&lt;oaf_attribute name="evolution:menu-name" type="string"</div><div class='del'>-                       value="vCalendar files (.vcf)"/&gt;</div><div class='del'>-        &lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       _value="Imports vCalendar files into Evolution"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:GNOME_Evolution_Calendar_ImporterFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/IntelligentImporter:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am<br/>deleted file mode 100644<br/>index 4015e12f86..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-bin_PROGRAMS = evolution-calendar-importer</div><div class='del'>-</div><div class='del'>-sounddir = $(datadir)/evolution/sounds</div><div class='del'>-</div><div class='del'>-INCLUDES = 						\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\</div><div class='del'>-	-DEVOLUTION_SOUNDDIR=\""$(sounddir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"Evolution-Importer\"		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/calendar/cal-client		\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client		\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_builddir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libicalvcal		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-evolution_calendar_importer_SOURCES = 	\</div><div class='del'>-	evolution-calendar-importer.h	\</div><div class='del'>-	icalendar-importer.c		\</div><div class='del'>-	main.c</div><div class='del'>-</div><div class='del'>-evolution_calendar_importer_LDADD =				\</div><div class='del'>-	$(top_builddir)/shell/importer/libevolution-importer.la \</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util.la	\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client.la	\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat.la			\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-evolution.la	\</div><div class='del'>-	$(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = GNOME_Evolution_Calendar_Importer.oaf.in</div><div class='del'>-</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='head'>diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h<br/>deleted file mode 100644<br/>index b4c59da340..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/evolution-calendar-importer.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/evolution-calendar-importer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar importer component</div><div class='del'>- *</div><div class='del'>- * Authors: Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef EVOLUTION_CALENDAR_IMPORTER_H</div><div class='del'>-#define EVOLUTION_CALENDAR_IMPORTER_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-BonoboObject *ical_importer_new (void);</div><div class='del'>-BonoboObject *vcal_importer_new (void);</div><div class='del'>-</div><div class='del'>-BonoboObject *gnome_calendar_importer_new (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c<br/>deleted file mode 100644<br/>index 6a7a6f363f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/icalendar-importer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/icalendar-importer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,683 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar importer component</div><div class='del'>- *</div><div class='del'>- * Authors: Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;cal-client.h&gt;</div><div class='del'>-#include &lt;importer/evolution-importer.h&gt;</div><div class='del'>-#include &lt;importer/evolution-intelligent-importer.h&gt;</div><div class='del'>-#include &lt;importer/GNOME_Evolution_Importer.h&gt;</div><div class='del'>-#include "icalvcal.h"</div><div class='del'>-#include "evolution-calendar-importer.h"</div><div class='del'>-</div><div class='del'>-/* We timeout after 2 minutes, when opening the folders. */</div><div class='del'>-#define IMPORTER_TIMEOUT_SECONDS 120</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalClient *client;</div><div class='del'>-	CalClient *tasks_client;</div><div class='del'>-	EvolutionImporter *importer;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	gboolean folder_contains_events;</div><div class='del'>-	gboolean folder_contains_tasks;</div><div class='del'>-} ICalImporter;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gboolean do_calendar;</div><div class='del'>-	gboolean do_tasks;</div><div class='del'>-} ICalIntelligentImporter;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions shared by iCalendar &amp; vCalendar importer.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-importer_destroy_cb (GtkObject *object, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ICalImporter *ici = (ICalImporter *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ici != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ici-&gt;client));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (ici-&gt;tasks_client));</div><div class='del'>-	if (ici-&gt;icalcomp != NULL)</div><div class='del'>-		icalcomponent_free (ici-&gt;icalcomp);</div><div class='del'>-	g_free (ici);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This reads in an entire file and returns it. It returns NULL on error.</div><div class='del'>-   The returned string should be freed. */</div><div class='del'>-static char*</div><div class='del'>-read_file (const char *filename)</div><div class='del'>-{</div><div class='del'>-	int fd, n;</div><div class='del'>-	GString *str;</div><div class='del'>-	char buffer[2049];</div><div class='del'>-	gboolean error = FALSE;</div><div class='del'>-</div><div class='del'>-	/* read file contents */</div><div class='del'>-	fd = open (filename, O_RDONLY);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	str = g_string_new ("");</div><div class='del'>-	while (1) {</div><div class='del'>-		memset (buffer, 0, sizeof(buffer));</div><div class='del'>-		n = read (fd, buffer, sizeof (buffer) - 1);</div><div class='del'>-		if (n &gt; 0) {</div><div class='del'>-			str = g_string_append (str, buffer);</div><div class='del'>-		} else if (n == 0) {</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			error = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close (fd);</div><div class='del'>-</div><div class='del'>-	if (error) {</div><div class='del'>-		g_string_free (str, FALSE);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		gchar *retval = str-&gt;str;</div><div class='del'>-		g_string_free (str, FALSE);</div><div class='del'>-		return retval;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the URI to load given a folder path. Currently this is just a full</div><div class='del'>-   pathname. The returned string should be freed. */</div><div class='del'>-static char*</div><div class='del'>-get_uri_from_folder_path (const char *folderpath)</div><div class='del'>-{</div><div class='del'>-	const char *name;</div><div class='del'>-	char *parent;</div><div class='del'>-</div><div class='del'>-	if (folderpath == NULL || *folderpath == '\0') {</div><div class='del'>-		return g_strdup_printf ("%s/evolution/local/Calendar/calendar.ics",</div><div class='del'>-					g_get_home_dir ());</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name = strrchr (folderpath, '/');</div><div class='del'>-	if (name == NULL || name == folderpath) {</div><div class='del'>-		parent = "evolution/local/";</div><div class='del'>-		if (folderpath[0] == '/')</div><div class='del'>-			name = folderpath + 1;</div><div class='del'>-		else</div><div class='del'>-			name = folderpath;</div><div class='del'>-	} else {</div><div class='del'>-		name += 1;</div><div class='del'>-		parent = "evolution/local/Calendar/subfolders/";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_strdup_printf ("%s/%s%s/calendar.ics", g_get_home_dir (),</div><div class='del'>-				parent, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Determine whether it is a calendar or tasks folder, or both. If it starts</div><div class='del'>-   with 'file:' we know it is a local folder so we see if it ends with</div><div class='del'>-   calendar.ics or tasks.ics. For remote folders (i.e. Exchange folders at</div><div class='del'>-   present), we import both calendar events and tasks into it. */</div><div class='del'>-static void</div><div class='del'>-check_folder_type (ICalImporter *ici,</div><div class='del'>-		   const char *folderpath)</div><div class='del'>-{</div><div class='del'>-	ici-&gt;folder_contains_events = TRUE;</div><div class='del'>-	ici-&gt;folder_contains_tasks = TRUE;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Finish. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This removes all components except VEVENTs and VTIMEZONEs from the toplevel</div><div class='del'>-   icalcomponent, and returns a GList of the VTODO components. */</div><div class='del'>-static GList*</div><div class='del'>-prepare_events (icalcomponent *icalcomp)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *subcomp, *next_subcomp;</div><div class='del'>-	GList *vtodos = NULL;</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_first_component (icalcomp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-		next_subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		if (child_kind != ICAL_VEVENT_COMPONENT</div><div class='del'>-		    &amp;&amp; child_kind != ICAL_VTIMEZONE_COMPONENT) {</div><div class='del'>-</div><div class='del'>-			icalcomponent_remove_component (icalcomp,</div><div class='del'>-							subcomp);</div><div class='del'>-			if (child_kind == ICAL_VTODO_COMPONENT)</div><div class='del'>-				vtodos = g_list_prepend (vtodos, subcomp);</div><div class='del'>-			else</div><div class='del'>-				icalcomponent_free (subcomp);</div><div class='del'>-		}</div><div class='del'>-		subcomp = next_subcomp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return vtodos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This removes all components except VTODOs and VTIMEZONEs from the toplevel</div><div class='del'>-   icalcomponent, and adds the given list of VTODO components. The list is</div><div class='del'>-   freed afterwards. */</div><div class='del'>-static void</div><div class='del'>-prepare_tasks (icalcomponent *icalcomp, GList *vtodos)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *subcomp, *next_subcomp;</div><div class='del'>-	GList *elem;</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_first_component (icalcomp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-		next_subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-		if (child_kind != ICAL_VTODO_COMPONENT</div><div class='del'>-		    &amp;&amp; child_kind != ICAL_VTIMEZONE_COMPONENT) {</div><div class='del'>-			icalcomponent_remove_component (icalcomp, subcomp);</div><div class='del'>-			icalcomponent_free (subcomp);</div><div class='del'>-		}</div><div class='del'>-		subcomp = next_subcomp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (elem = vtodos; elem; elem = elem-&gt;next) {</div><div class='del'>-		icalcomponent_add_component (icalcomp, elem-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (vtodos);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-process_item_fn (EvolutionImporter *importer,</div><div class='del'>-		 CORBA_Object listener,</div><div class='del'>-		 void *closure,</div><div class='del'>-		 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalClientLoadState state, tasks_state;</div><div class='del'>-	ICalImporter *ici = (ICalImporter *) closure;</div><div class='del'>-	GNOME_Evolution_ImporterListener_ImporterResult result;</div><div class='del'>-</div><div class='del'>-	result = GNOME_Evolution_ImporterListener_OK;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ici != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (ici-&gt;client));</div><div class='del'>-	g_return_if_fail (ici-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	state = cal_client_get_load_state (ici-&gt;client);</div><div class='del'>-	tasks_state = cal_client_get_load_state (ici-&gt;tasks_client);</div><div class='del'>-	if (state == CAL_CLIENT_LOAD_LOADING</div><div class='del'>-	    || tasks_state == CAL_CLIENT_LOAD_LOADING) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ImporterListener_NOT_READY,</div><div class='del'>-			TRUE, ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else if (state != CAL_CLIENT_LOAD_LOADED</div><div class='del'>-		 || tasks_state != CAL_CLIENT_LOAD_LOADED) {</div><div class='del'>-		GNOME_Evolution_ImporterListener_notifyResult (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,</div><div class='del'>-			FALSE, ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the folder contains events &amp; tasks we can just import everything</div><div class='del'>-	   into it. If it contains just events, we have to strip out the</div><div class='del'>-	   VTODOs and import them into the default tasks folder. If the folder</div><div class='del'>-	   contains just tasks, we strip out the VEVENTs, which do not get</div><div class='del'>-	   imported at all. */</div><div class='del'>-	if (ici-&gt;folder_contains_events &amp;&amp; ici-&gt;folder_contains_tasks) {</div><div class='del'>-		if (!cal_client_update_objects (ici-&gt;client, ici-&gt;icalcomp))</div><div class='del'>-			result = GNOME_Evolution_ImporterListener_BAD_DATA;</div><div class='del'>-	} else if (ici-&gt;folder_contains_events) {</div><div class='del'>-		GList *vtodos = prepare_events (ici-&gt;icalcomp);</div><div class='del'>-		if (!cal_client_update_objects (ici-&gt;client, ici-&gt;icalcomp))</div><div class='del'>-			result = GNOME_Evolution_ImporterListener_BAD_DATA;</div><div class='del'>-</div><div class='del'>-		prepare_tasks (ici-&gt;icalcomp, vtodos);</div><div class='del'>-		if (!cal_client_update_objects (ici-&gt;tasks_client,</div><div class='del'>-						ici-&gt;icalcomp))</div><div class='del'>-			result = GNOME_Evolution_ImporterListener_BAD_DATA;</div><div class='del'>-	} else {</div><div class='del'>-		prepare_tasks (ici-&gt;icalcomp, NULL);</div><div class='del'>-		if (!cal_client_update_objects (ici-&gt;client, ici-&gt;icalcomp))</div><div class='del'>-			result = GNOME_Evolution_ImporterListener_BAD_DATA;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_ImporterListener_notifyResult (listener, result, FALSE,</div><div class='del'>-						       ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * iCalendar importer functions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-support_format_fn (EvolutionImporter *importer,</div><div class='del'>-		   const char *filename,</div><div class='del'>-		   void *closure)</div><div class='del'>-{</div><div class='del'>-	char *contents;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	gboolean ret = FALSE;</div><div class='del'>-</div><div class='del'>-	contents = read_file (filename);</div><div class='del'>-</div><div class='del'>-	/* parse the file */</div><div class='del'>-	if (contents) {</div><div class='del'>-		icalcomp = icalparser_parse_string (contents);</div><div class='del'>-		if (icalcomp) {</div><div class='del'>-			icalcomponent_free (icalcomp);</div><div class='del'>-			ret = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (contents);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-load_file_fn (EvolutionImporter *importer,</div><div class='del'>-	      const char *filename,</div><div class='del'>-	      const char *folderpath,</div><div class='del'>-	      void *closure)</div><div class='del'>-{</div><div class='del'>-	char *uri_str, *contents;</div><div class='del'>-	gboolean ret = FALSE;</div><div class='del'>-	ICalImporter *ici = (ICalImporter *) closure;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ici != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	uri_str = get_uri_from_folder_path (folderpath);</div><div class='del'>-	check_folder_type (ici, folderpath);</div><div class='del'>-</div><div class='del'>-	contents = read_file (filename);</div><div class='del'>-</div><div class='del'>-	/* parse the file */</div><div class='del'>-	if (contents) {</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-		icalcomp = icalparser_parse_string (contents);</div><div class='del'>-		if (icalcomp) {</div><div class='del'>-			if (cal_client_open_calendar (ici-&gt;client, uri_str, TRUE)</div><div class='del'>-			    &amp;&amp; cal_client_open_default_tasks (ici-&gt;tasks_client, FALSE)) {</div><div class='del'>-				ici-&gt;icalcomp = icalcomp;</div><div class='del'>-				ret = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (contents);</div><div class='del'>-	g_free (uri_str);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-ical_importer_new (void)</div><div class='del'>-{</div><div class='del'>-	ICalImporter *ici;</div><div class='del'>-</div><div class='del'>-	ici = g_new0 (ICalImporter, 1);</div><div class='del'>-	ici-&gt;client = cal_client_new ();</div><div class='del'>-	ici-&gt;tasks_client = cal_client_new ();</div><div class='del'>-	ici-&gt;icalcomp = NULL;</div><div class='del'>-	ici-&gt;importer = evolution_importer_new (support_format_fn,</div><div class='del'>-						load_file_fn,</div><div class='del'>-						process_item_fn,</div><div class='del'>-						NULL,</div><div class='del'>-						ici);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ici-&gt;importer), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (importer_destroy_cb), ici);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (ici-&gt;importer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * vCalendar importer functions.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-vcal_support_format_fn (EvolutionImporter *importer,</div><div class='del'>-			const char *filename,</div><div class='del'>-			void *closure)</div><div class='del'>-{</div><div class='del'>-	char *contents;</div><div class='del'>-	gboolean ret = FALSE;</div><div class='del'>-</div><div class='del'>-	contents = read_file (filename);</div><div class='del'>-</div><div class='del'>-	/* parse the file */</div><div class='del'>-	if (contents) {</div><div class='del'>-		VObject *vcal;</div><div class='del'>-</div><div class='del'>-		vcal = Parse_MIME (contents, strlen (contents));</div><div class='del'>-</div><div class='del'>-		if (vcal) {</div><div class='del'>-			icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-			icalcomp = icalvcal_convert (vcal);</div><div class='del'>-		</div><div class='del'>-			if (icalcomp) {</div><div class='del'>-				icalcomponent_free (icalcomp);</div><div class='del'>-				ret = TRUE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			cleanVObject (vcal);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (contents);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This tries to load in a vCalendar file and convert it to an icalcomponent.</div><div class='del'>-   It returns NULL on failure. */</div><div class='del'>-static icalcomponent*</div><div class='del'>-load_vcalendar_file (const char *filename)</div><div class='del'>-{</div><div class='del'>-	icalvcal_defaults defaults = { 0 };</div><div class='del'>-	icalcomponent *icalcomp = NULL;</div><div class='del'>-	char *contents;</div><div class='del'>-</div><div class='del'>-	defaults.alarm_audio_url = "file://" EVOLUTION_SOUNDDIR "/default_alarm.wav";</div><div class='del'>-	defaults.alarm_audio_fmttype = "audio/x-wav";</div><div class='del'>-	defaults.alarm_description = (char*) U_("Reminder!!");</div><div class='del'>-</div><div class='del'>-	contents = read_file (filename);</div><div class='del'>-</div><div class='del'>-	/* parse the file */</div><div class='del'>-	if (contents) {</div><div class='del'>-		VObject *vcal;</div><div class='del'>-</div><div class='del'>-		vcal = Parse_MIME (contents, strlen (contents));</div><div class='del'>-</div><div class='del'>-		if (vcal) {</div><div class='del'>-			icalcomp = icalvcal_convert_with_defaults (vcal,</div><div class='del'>-								   &amp;defaults);</div><div class='del'>-			cleanVObject (vcal);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (contents);</div><div class='del'>-</div><div class='del'>-	return icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-vcal_load_file_fn (EvolutionImporter *importer,</div><div class='del'>-		   const char *filename,</div><div class='del'>-		   const char *folderpath,</div><div class='del'>-		   void *closure)</div><div class='del'>-{</div><div class='del'>-	char *uri_str;</div><div class='del'>-	gboolean ret = FALSE;</div><div class='del'>-	ICalImporter *ici = (ICalImporter *) closure;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (ici != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	uri_str = get_uri_from_folder_path (folderpath);</div><div class='del'>-	check_folder_type (ici, folderpath);</div><div class='del'>-</div><div class='del'>-	icalcomp = load_vcalendar_file (filename);</div><div class='del'>-	if (icalcomp) {</div><div class='del'>-		if (cal_client_open_calendar (ici-&gt;client, uri_str, TRUE)</div><div class='del'>-		    &amp;&amp; cal_client_open_default_tasks (ici-&gt;tasks_client, FALSE)) {</div><div class='del'>-			ici-&gt;icalcomp = icalcomp;</div><div class='del'>-			ret = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (uri_str);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-vcal_importer_new (void)</div><div class='del'>-{</div><div class='del'>-	ICalImporter *ici;</div><div class='del'>-</div><div class='del'>-	ici = g_new0 (ICalImporter, 1);</div><div class='del'>-	ici-&gt;client = cal_client_new ();</div><div class='del'>-	ici-&gt;tasks_client = cal_client_new ();</div><div class='del'>-	ici-&gt;icalcomp = NULL;</div><div class='del'>-	ici-&gt;importer = evolution_importer_new (vcal_support_format_fn,</div><div class='del'>-						vcal_load_file_fn,</div><div class='del'>-						process_item_fn,</div><div class='del'>-						NULL,</div><div class='del'>-						ici);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ici-&gt;importer), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (importer_destroy_cb), ici);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (ici-&gt;importer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_importer_destroy_cb (GtkObject *object, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ICalIntelligentImporter *ici = (ICalIntelligentImporter *) user_data;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (ici != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (ici);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-gnome_calendar_can_import_fn (EvolutionIntelligentImporter *ii,</div><div class='del'>-			      void *closure)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	gboolean gnome_calendar_exists;</div><div class='del'>-</div><div class='del'>-	filename = gnome_util_home_file ("user-cal.vcf");</div><div class='del'>-	gnome_calendar_exists = g_file_exists (filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	return gnome_calendar_exists;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_import_data_fn (EvolutionIntelligentImporter *ii,</div><div class='del'>-			       void *closure)</div><div class='del'>-{</div><div class='del'>-	ICalIntelligentImporter *ici = closure;</div><div class='del'>-	icalcomponent *icalcomp = NULL;</div><div class='del'>-	char *filename;</div><div class='del'>-	GList *vtodos;</div><div class='del'>-	CalClient *calendar_client = NULL, *tasks_client = NULL;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	/* If neither is selected, just return. */</div><div class='del'>-	if (!ici-&gt;do_calendar &amp;&amp; !ici-&gt;do_tasks) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to open the default calendar &amp; tasks folders. */</div><div class='del'>-	if (ici-&gt;do_calendar) {</div><div class='del'>-		calendar_client = cal_client_new ();</div><div class='del'>-		if (!cal_client_open_default_calendar (calendar_client, FALSE))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ici-&gt;do_tasks) {</div><div class='del'>-		tasks_client = cal_client_new ();</div><div class='del'>-		if (!cal_client_open_default_tasks (tasks_client, FALSE))</div><div class='del'>-			goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the Gnome Calendar file and convert to iCalendar. */</div><div class='del'>-	filename = gnome_util_home_file ("user-cal.vcf");</div><div class='del'>-	icalcomp = load_vcalendar_file (filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* If we couldn't load the file, just return. FIXME: Error message? */</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Import the calendar events into the default calendar folder.</div><div class='del'>-	 */</div><div class='del'>-	vtodos = prepare_events (icalcomp);</div><div class='del'>-</div><div class='del'>-	/* Wait for client to finish opening the calendar &amp; tasks folders. */</div><div class='del'>-	for (t = 0; t &lt; IMPORTER_TIMEOUT_SECONDS; t++) {</div><div class='del'>-		CalClientLoadState calendar_state, tasks_state;</div><div class='del'>-</div><div class='del'>-		calendar_state = tasks_state = CAL_CLIENT_LOAD_LOADED;</div><div class='del'>-</div><div class='del'>-		/* We need this so the CalClient gets notified that the</div><div class='del'>-		   folder is opened, via Corba. */</div><div class='del'>-		while (gtk_events_pending ())</div><div class='del'>-			gtk_main_iteration ();</div><div class='del'>-</div><div class='del'>-		if (ici-&gt;do_calendar)</div><div class='del'>-			calendar_state = cal_client_get_load_state (calendar_client);</div><div class='del'>-</div><div class='del'>-		if (ici-&gt;do_tasks)</div><div class='del'>-			tasks_state = cal_client_get_load_state (tasks_client);</div><div class='del'>-</div><div class='del'>-		if (calendar_state == CAL_CLIENT_LOAD_LOADED</div><div class='del'>-		    &amp;&amp; tasks_state == CAL_CLIENT_LOAD_LOADED)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		sleep (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we timed out, just return. */</div><div class='del'>-	if (t == IMPORTER_TIMEOUT_SECONDS)</div><div class='del'>-		goto out;</div><div class='del'>-</div><div class='del'>-	/* Import the calendar events. */</div><div class='del'>-	/* FIXME: What do intelligent importers do about errors? */</div><div class='del'>-	if (ici-&gt;do_calendar)</div><div class='del'>-		cal_client_update_objects (calendar_client, icalcomp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Import the tasks into the default tasks folder.</div><div class='del'>-	 */</div><div class='del'>-	prepare_tasks (icalcomp, vtodos);</div><div class='del'>-	if (ici-&gt;do_tasks)</div><div class='del'>-		cal_client_update_objects (tasks_client, icalcomp);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (icalcomp)</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-	if (calendar_client)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (calendar_client));</div><div class='del'>-	if (tasks_client)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (tasks_client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Fun with aggregation */</div><div class='del'>-static void</div><div class='del'>-checkbox_toggle_cb (GtkToggleButton *tb,</div><div class='del'>-		    gboolean *do_item)</div><div class='del'>-{</div><div class='del'>-	*do_item = gtk_toggle_button_get_active (tb);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboControl *</div><div class='del'>-create_checkboxes_control (ICalIntelligentImporter *ici)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *hbox, *calendar_checkbox, *tasks_checkbox;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	calendar_checkbox = gtk_check_button_new_with_label (_("Calendar Events"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (calendar_checkbox), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),</div><div class='del'>-			    &amp;ici-&gt;do_calendar);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), calendar_checkbox,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	tasks_checkbox = gtk_check_button_new_with_label (_("Tasks"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (tasks_checkbox), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (checkbox_toggle_cb),</div><div class='del'>-			    &amp;ici-&gt;do_tasks);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), tasks_checkbox,</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-	control = bonobo_control_new (hbox);</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-gnome_calendar_importer_new (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionIntelligentImporter *importer;</div><div class='del'>-	ICalIntelligentImporter *ici;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	char *message = N_("Evolution has found Gnome Calendar files.\n"</div><div class='del'>-			   "Would you like to import them into Evolution?");</div><div class='del'>-</div><div class='del'>-	ici = g_new0 (ICalIntelligentImporter, 1);</div><div class='del'>-</div><div class='del'>-	importer = evolution_intelligent_importer_new (gnome_calendar_can_import_fn,</div><div class='del'>-						       gnome_calendar_import_data_fn,</div><div class='del'>-						       _("Gnome Calendar"),</div><div class='del'>-						       _(message),</div><div class='del'>-						       ici);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_importer_destroy_cb), ici);</div><div class='del'>-</div><div class='del'>-	control = create_checkboxes_control (ici);</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (importer),</div><div class='del'>-				     BONOBO_OBJECT (control));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (importer);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/importers/main.c b/calendar/importers/main.c<br/>deleted file mode 100644<br/>index f6d5788d93..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/importers/main.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/importers/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar importer component</div><div class='del'>- *</div><div class='del'>- * Authors: Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include "evolution-calendar-importer.h"</div><div class='del'>-</div><div class='del'>-#define IMPORTER_FACTORY_ID   "OAFIID:GNOME_Evolution_Calendar_ImporterFactory"</div><div class='del'>-#define ICALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_iCalendar_Importer"</div><div class='del'>-#define VCALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Calendar_vCalendar_Importer"</div><div class='del'>-#define GNOME_CALENDAR_IMPORTER_ID "OAFIID:GNOME_Evolution_Gnome_Calendar_Intelligent_Importer"</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-importer_factory_fn (BonoboGenericFactory *factory, const char *id, void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *object = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (id, ICALENDAR_IMPORTER_ID))</div><div class='del'>-		object = ical_importer_new ();</div><div class='del'>-	else if (!strcmp (id, VCALENDAR_IMPORTER_ID))</div><div class='del'>-		object = vcal_importer_new ();</div><div class='del'>-	else if (!strcmp (id, GNOME_CALENDAR_IMPORTER_ID))</div><div class='del'>-		object = gnome_calendar_importer_new ();</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Component not supporte by this factory");</div><div class='del'>-</div><div class='del'>-	return object;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_importer (void)</div><div class='del'>-{</div><div class='del'>-	BonoboGenericFactory *factory;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new_multi (IMPORTER_FACTORY_ID,</div><div class='del'>-						    importer_factory_fn, NULL);</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_error ("Unable to create factory");</div><div class='del'>-		exit (0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char *argv[])</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain(PACKAGE);</div><div class='del'>-	</div><div class='del'>-	gnome_init_with_popt_table ("evolution-calendar-importer",</div><div class='del'>-				    VERSION, argc, argv, oaf_popt_options, 0,</div><div class='del'>-				    NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo.");</div><div class='del'>-		exit (0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	init_importer ();</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore<br/>deleted file mode 100644<br/>index ac51a554db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-*.la</div><div class='del'>-*.lo</div><div class='del'>-evolution-calendar-stubs.c</div><div class='del'>-evolution-calendar-skels.c</div><div class='del'>-evolution-calendar-common.c</div><div class='del'>-evolution-calendar.h</div><div class='head'>diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am<br/>deleted file mode 100644<br/>index 57c24d3130..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"wombat-pcs\"			\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libwombat			\</div><div class='del'>-	-I$(top_builddir)/libwombat			\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-CORBA_GENERATED =				\</div><div class='del'>-	evolution-calendar.h			\</div><div class='del'>-	evolution-calendar-common.c		\</div><div class='del'>-	evolution-calendar-skels.c		\</div><div class='del'>-	evolution-calendar-stubs.c</div><div class='del'>-</div><div class='del'>-idls =						\</div><div class='del'>-	$(srcdir)/../idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl</div><div class='del'>-</div><div class='del'>-$(CORBA_GENERATED): $(idls)</div><div class='del'>-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libpcs.a</div><div class='del'>-</div><div class='del'>-libpcs_a_SOURCES =		\</div><div class='del'>-	$(CORBA_GENERATED)	\</div><div class='del'>-	cal.c			\</div><div class='del'>-	cal.h			\</div><div class='del'>-	cal-backend.c		\</div><div class='del'>-	cal-backend.h		\</div><div class='del'>-	cal-backend-file.c	\</div><div class='del'>-	cal-backend-file.h	\</div><div class='del'>-	cal-backend-util.c	\</div><div class='del'>-	cal-backend-util.h	\</div><div class='del'>-	cal-common.h		\</div><div class='del'>-	cal-factory.c		\</div><div class='del'>-	cal-factory.h		\</div><div class='del'>-	job.c			\</div><div class='del'>-	job.h			\</div><div class='del'>-	query.c			\</div><div class='del'>-	query.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='del'>-</div><div class='head'>diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c<br/>deleted file mode 100644<br/>index 5ca5a06f0e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-file.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1949 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar file backend</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include "e-util/e-dbhash.h"</div><div class='del'>-#include "cal-util/cal-recur.h"</div><div class='del'>-#include "cal-util/cal-util.h"</div><div class='del'>-#include "cal-backend-file.h"</div><div class='del'>-#include "cal-backend-util.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A category that exists in some of the objects of the calendar */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Category name, also used as the key in the categories hash table */</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	/* Number of objects that have this category */</div><div class='del'>-	int refcount;</div><div class='del'>-} Category;</div><div class='del'>-</div><div class='del'>-/* Private part of the CalBackendFile structure */</div><div class='del'>-struct _CalBackendFilePrivate {</div><div class='del'>-	/* URI where the calendar data is stored */</div><div class='del'>-	char *uri;</div><div class='del'>-</div><div class='del'>-	/* List of Cal objects with their listeners */</div><div class='del'>-	GList *clients;</div><div class='del'>-</div><div class='del'>-	/* Toplevel VCALENDAR component */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* All the CalComponent objects in the calendar, hashed by UID.  The</div><div class='del'>-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not</div><div class='del'>-	 * copied, so don't free it when you remove an object from the hash</div><div class='del'>-	 * table.</div><div class='del'>-	 */</div><div class='del'>-	GHashTable *comp_uid_hash;</div><div class='del'>-</div><div class='del'>-	/* All event, to-do, and journal components in the calendar; they are</div><div class='del'>-	 * here just for easy access (i.e. so that you don't have to iterate</div><div class='del'>-	 * over the comp_uid_hash).  If you need *all* the components in the</div><div class='del'>-	 * calendar, iterate over the hash instead.</div><div class='del'>-	 */</div><div class='del'>-	GList *events;</div><div class='del'>-	GList *todos;</div><div class='del'>-	GList *journals;</div><div class='del'>-</div><div class='del'>-	/* Hash table of live categories, and a temporary hash of removed categories */</div><div class='del'>-	GHashTable *categories;</div><div class='del'>-	GHashTable *removed_categories;</div><div class='del'>-</div><div class='del'>-	/* Config database handle for free/busy organizer information */</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	</div><div class='del'>-	/* Idle handler for saving the calendar when it is dirty */</div><div class='del'>-	guint idle_id;</div><div class='del'>-</div><div class='del'>-	/* The calendar's default timezone, used for resolving DATE and</div><div class='del'>-	   floating DATE-TIME values. */</div><div class='del'>-	icaltimezone *default_zone;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_backend_file_class_init (CalBackendFileClass *class);</div><div class='del'>-static void cal_backend_file_init (CalBackendFile *cbfile);</div><div class='del'>-static void cal_backend_file_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static const char *cal_backend_file_get_uri (CalBackend *backend);</div><div class='del'>-static CalBackendOpenStatus cal_backend_file_open (CalBackend *backend,</div><div class='del'>-						   const char *uristr,</div><div class='del'>-						   gboolean only_if_exists);</div><div class='del'>-static gboolean cal_backend_file_is_loaded (CalBackend *backend);</div><div class='del'>-static Query *cal_backend_file_get_query (CalBackend *backend,</div><div class='del'>-					  GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-					  const char *sexp);</div><div class='del'>-</div><div class='del'>-static CalMode cal_backend_file_get_mode (CalBackend *backend);</div><div class='del'>-static void cal_backend_file_set_mode (CalBackend *backend, CalMode mode);</div><div class='del'>-</div><div class='del'>-static int cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type);</div><div class='del'>-static char *cal_backend_file_get_object (CalBackend *backend, const char *uid);</div><div class='del'>-static CalComponent *cal_backend_file_get_object_component (CalBackend *backend, const char *uid);</div><div class='del'>-static char *cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid);</div><div class='del'>-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);</div><div class='del'>-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-						     time_t start, time_t end);</div><div class='del'>-static GList *cal_backend_file_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end);</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjChangeSeq *cal_backend_file_get_changes (</div><div class='del'>-	CalBackend *backend, CalObjType type, const char *change_id);</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_file_get_alarms_in_range (</div><div class='del'>-	CalBackend *backend, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_file_get_alarms_for_object (</div><div class='del'>-	CalBackend *backend, const char *uid,</div><div class='del'>-	time_t start, time_t end, gboolean *object_found);</div><div class='del'>-</div><div class='del'>-static gboolean cal_backend_file_update_objects (CalBackend *backend, const char *calobj);</div><div class='del'>-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-static icaltimezone* cal_backend_file_get_timezone (CalBackend *backend, const char *tzid);</div><div class='del'>-static icaltimezone* cal_backend_file_get_default_timezone (CalBackend *backend);</div><div class='del'>-static gboolean cal_backend_file_set_default_timezone (CalBackend *backend,</div><div class='del'>-						       const char *tzid);</div><div class='del'>-</div><div class='del'>-static void notify_categories_changed (CalBackendFile *cbfile);</div><div class='del'>-</div><div class='del'>-static CalBackendClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_file_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the #CalBackendFile class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalBackendFile class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_backend_file_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_backend_file_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_file_type) {</div><div class='del'>-		static const GtkTypeInfo cal_backend_file_info = {</div><div class='del'>-			"CalBackendFile",</div><div class='del'>-			sizeof (CalBackendFile),</div><div class='del'>-			sizeof (CalBackendFileClass),</div><div class='del'>-			(GtkClassInitFunc) cal_backend_file_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_backend_file_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &amp;cal_backend_file_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_backend_file_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_class_init (CalBackendFileClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	CalBackendClass *backend_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	backend_class = (CalBackendClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_backend_file_destroy;</div><div class='del'>-</div><div class='del'>-	backend_class-&gt;get_uri = cal_backend_file_get_uri;</div><div class='del'>-	backend_class-&gt;open = cal_backend_file_open;</div><div class='del'>-	backend_class-&gt;is_loaded = cal_backend_file_is_loaded;</div><div class='del'>-	backend_class-&gt;get_query = cal_backend_file_get_query;</div><div class='del'>-	backend_class-&gt;get_mode = cal_backend_file_get_mode;</div><div class='del'>-	backend_class-&gt;set_mode = cal_backend_file_set_mode;	</div><div class='del'>-	backend_class-&gt;get_n_objects = cal_backend_file_get_n_objects;</div><div class='del'>-	backend_class-&gt;get_object = cal_backend_file_get_object;</div><div class='del'>-	backend_class-&gt;get_object_component = cal_backend_file_get_object_component;</div><div class='del'>-	backend_class-&gt;get_timezone_object = cal_backend_file_get_timezone_object;</div><div class='del'>-	backend_class-&gt;get_uids = cal_backend_file_get_uids;</div><div class='del'>-	backend_class-&gt;get_objects_in_range = cal_backend_file_get_objects_in_range;</div><div class='del'>-	backend_class-&gt;get_free_busy = cal_backend_file_get_free_busy;</div><div class='del'>-	backend_class-&gt;get_changes = cal_backend_file_get_changes;</div><div class='del'>-	backend_class-&gt;get_alarms_in_range = cal_backend_file_get_alarms_in_range;</div><div class='del'>-	backend_class-&gt;get_alarms_for_object = cal_backend_file_get_alarms_for_object;</div><div class='del'>-	backend_class-&gt;update_objects = cal_backend_file_update_objects;</div><div class='del'>-	backend_class-&gt;remove_object = cal_backend_file_remove_object;</div><div class='del'>-</div><div class='del'>-	backend_class-&gt;get_timezone = cal_backend_file_get_timezone;</div><div class='del'>-	backend_class-&gt;get_default_timezone = cal_backend_file_get_default_timezone;</div><div class='del'>-	backend_class-&gt;set_default_timezone = cal_backend_file_set_default_timezone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_ConfigDatabase</div><div class='del'>-load_db (void)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db = CORBA_OBJECT_NIL;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>- </div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		db = CORBA_OBJECT_NIL;</div><div class='del'>-		</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return db;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_added_cb (CalBackend *backend, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	notify_categories_changed (CAL_BACKEND_FILE (backend));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_init (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalBackendFilePrivate, 1);</div><div class='del'>-	cbfile-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri = NULL;</div><div class='del'>-	priv-&gt;icalcomp = NULL;</div><div class='del'>-	priv-&gt;comp_uid_hash = NULL;</div><div class='del'>-	priv-&gt;events = NULL;</div><div class='del'>-	priv-&gt;todos = NULL;</div><div class='del'>-	priv-&gt;journals = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;removed_categories = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* The timezone defaults to UTC. */</div><div class='del'>-	priv-&gt;default_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	priv-&gt;db = load_db ();</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cbfile), "cal_added",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_added_cb), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* g_hash_table_foreach() callback to destroy a CalComponent */</div><div class='del'>-static void</div><div class='del'>-free_cal_component (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (value);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the calendar data */</div><div class='del'>-static void</div><div class='del'>-save (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-	GnomeVFSHandle *handle = NULL;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GnomeVFSFileSize out;</div><div class='del'>-	gchar *tmp;</div><div class='del'>-	char *buf;</div><div class='del'>-	</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (priv-&gt;uri);</div><div class='del'>-</div><div class='del'>-	/* Make a backup copy of the file if it exists */</div><div class='del'>-	tmp = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		GnomeVFSURI *backup_uri;</div><div class='del'>-		gchar *backup_uristr;</div><div class='del'>-		</div><div class='del'>-		backup_uristr = g_strconcat (tmp, "~", NULL);</div><div class='del'>-		backup_uri = gnome_vfs_uri_new (backup_uristr);</div><div class='del'>-		</div><div class='del'>-		result = gnome_vfs_move_uri (uri, backup_uri, TRUE);</div><div class='del'>-		gnome_vfs_uri_unref (backup_uri);</div><div class='del'>-		</div><div class='del'>-		g_free (tmp);</div><div class='del'>-		g_free (backup_uristr);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now write the new file out */</div><div class='del'>-	result = gnome_vfs_create_uri (&amp;handle, uri, </div><div class='del'>-				       GNOME_VFS_OPEN_WRITE,</div><div class='del'>-				       FALSE, 0666);</div><div class='del'>-	</div><div class='del'>-	if (result != GNOME_VFS_OK)</div><div class='del'>-		goto error;</div><div class='del'>-	</div><div class='del'>-	buf = icalcomponent_as_ical_string (priv-&gt;icalcomp);</div><div class='del'>-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &amp;out);</div><div class='del'>-</div><div class='del'>-	if (result != GNOME_VFS_OK)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (handle);</div><div class='del'>-	gnome_vfs_uri_unref (uri);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>- error:</div><div class='del'>-	g_warning ("Error writing calendar file.");</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(), frees a Category structure */</div><div class='del'>-static void</div><div class='del'>-free_category_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Category *c;</div><div class='del'>-</div><div class='del'>-	c = value;</div><div class='del'>-	g_free (c-&gt;name);</div><div class='del'>-	g_free (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *clients;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (object);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clients = CAL_BACKEND (cbfile)-&gt;clients;</div><div class='del'>-	g_assert (clients == NULL);</div><div class='del'>-</div><div class='del'>-	/* Save if necessary */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;idle_id != 0) {</div><div class='del'>-		save (cbfile);</div><div class='del'>-		g_source_remove (priv-&gt;idle_id);</div><div class='del'>-		priv-&gt;idle_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;uri) {</div><div class='del'>-	        g_free (priv-&gt;uri);</div><div class='del'>-		priv-&gt;uri = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp_uid_hash) {</div><div class='del'>-		g_hash_table_foreach (priv-&gt;comp_uid_hash, </div><div class='del'>-				      free_cal_component, NULL);</div><div class='del'>-		g_hash_table_destroy (priv-&gt;comp_uid_hash);</div><div class='del'>-		priv-&gt;comp_uid_hash = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;events);</div><div class='del'>-	g_list_free (priv-&gt;todos);</div><div class='del'>-	g_list_free (priv-&gt;journals);</div><div class='del'>-	priv-&gt;events = NULL;</div><div class='del'>-	priv-&gt;todos = NULL;</div><div class='del'>-	priv-&gt;journals = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;categories, free_category_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;categories);</div><div class='del'>-	priv-&gt;categories = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;removed_categories, free_category_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;removed_categories);</div><div class='del'>-	priv-&gt;removed_categories = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icalcomp) {</div><div class='del'>-		icalcomponent_free (priv-&gt;icalcomp);</div><div class='del'>-		priv-&gt;icalcomp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (priv-&gt;db, NULL);</div><div class='del'>-	priv-&gt;db = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cbfile-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Looks up a component by its UID on the backend's component hash table */</div><div class='del'>-static CalComponent *</div><div class='del'>-lookup_component (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Calendar backend methods */</div><div class='del'>-</div><div class='del'>-/* Get_uri handler for the file backend */</div><div class='del'>-static const char *</div><div class='del'>-cal_backend_file_get_uri (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	return (const char *) priv-&gt;uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(), adds a category name to the sequence */</div><div class='del'>-static void</div><div class='del'>-add_category_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Category *c;</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *seq;</div><div class='del'>-</div><div class='del'>-	c = value;</div><div class='del'>-	seq = data;</div><div class='del'>-</div><div class='del'>-	seq-&gt;_buffer[seq-&gt;_length] = CORBA_string_dup (c-&gt;name);</div><div class='del'>-	seq-&gt;_length++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Notifies the clients with the current list of categories */</div><div class='del'>-static void</div><div class='del'>-notify_categories_changed (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *seq;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Build the sequence of category names */</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_StringSeq__alloc ();</div><div class='del'>-	seq-&gt;_length = 0;</div><div class='del'>-	seq-&gt;_maximum = g_hash_table_size (priv-&gt;categories);</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_CORBA_string_allocbuf (seq-&gt;_maximum);</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;categories, add_category_cb, seq);</div><div class='del'>-	g_assert (seq-&gt;_length == seq-&gt;_maximum);</div><div class='del'>-</div><div class='del'>-	/* Notify the clients */</div><div class='del'>-</div><div class='del'>-	for (l = CAL_BACKEND (cbfile)-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		Cal *cal;</div><div class='del'>-</div><div class='del'>-		cal = CAL (l-&gt;data);</div><div class='del'>-		cal_notify_categories_changed (cal, seq);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Idle handler; we save the calendar since it is dirty */</div><div class='del'>-static gboolean</div><div class='del'>-save_idle (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (data);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	save (cbfile);</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle_id = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Marks the file backend as dirty and queues a save operation */</div><div class='del'>-static void</div><div class='del'>-mark_dirty (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;idle_id != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle_id = g_idle_add (save_idle, cbfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Checks if the specified component has a duplicated UID and if so changes it */</div><div class='del'>-static void</div><div class='del'>-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *old_comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	char *new_uid;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	old_comp = g_hash_table_lookup (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-	if (!old_comp)</div><div class='del'>-		return; /* Everything is fine */</div><div class='del'>-</div><div class='del'>-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);</div><div class='del'>-</div><div class='del'>-	new_uid = cal_component_gen_uid ();</div><div class='del'>-	cal_component_set_uid (comp, new_uid);</div><div class='del'>-	g_free (new_uid);</div><div class='del'>-</div><div class='del'>-	/* FIXME: I think we need to reset the SEQUENCE property and reset the</div><div class='del'>-	 * CREATED/DTSTAMP/LAST-MODIFIED.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Updates the hash table of categories by adding or removing those in the</div><div class='del'>- * component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-update_categories_from_comp (CalBackendFile *cbfile, CalComponent *comp, gboolean add)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GSList *categories, *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories);</div><div class='del'>-</div><div class='del'>-	for (l = categories; l; l = l-&gt;next) {</div><div class='del'>-		const char *name;</div><div class='del'>-		Category *c;</div><div class='del'>-</div><div class='del'>-		name = l-&gt;data;</div><div class='del'>-		c = g_hash_table_lookup (priv-&gt;categories, name);</div><div class='del'>-</div><div class='del'>-		if (add) {</div><div class='del'>-			/* Add the category to the set */</div><div class='del'>-			if (c)</div><div class='del'>-				c-&gt;refcount++;</div><div class='del'>-			else {</div><div class='del'>-				/* See if it was in the removed categories */</div><div class='del'>-</div><div class='del'>-				c = g_hash_table_lookup (priv-&gt;removed_categories, name);</div><div class='del'>-				if (c) {</div><div class='del'>-					/* Move it to the set of live categories */</div><div class='del'>-					g_assert (c-&gt;refcount == 0);</div><div class='del'>-					g_hash_table_remove (priv-&gt;removed_categories, c-&gt;name);</div><div class='del'>-</div><div class='del'>-					c-&gt;refcount = 1;</div><div class='del'>-					g_hash_table_insert (priv-&gt;categories, c-&gt;name, c);</div><div class='del'>-				} else {</div><div class='del'>-					/* Create a new category */</div><div class='del'>-					c = g_new (Category, 1);</div><div class='del'>-					c-&gt;name = g_strdup (name);</div><div class='del'>-					c-&gt;refcount = 1;</div><div class='del'>-</div><div class='del'>-					g_hash_table_insert (priv-&gt;categories, c-&gt;name, c);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* Remove the category from the set --- it *must* have existed */</div><div class='del'>-</div><div class='del'>-			g_assert (c != NULL);</div><div class='del'>-			g_assert (c-&gt;refcount &gt; 0);</div><div class='del'>-</div><div class='del'>-			c-&gt;refcount--;</div><div class='del'>-</div><div class='del'>-			if (c-&gt;refcount == 0) {</div><div class='del'>-				g_hash_table_remove (priv-&gt;categories, c-&gt;name);</div><div class='del'>-				g_hash_table_insert (priv-&gt;removed_categories, c-&gt;name, c);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_categories_list (categories);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Tries to add an icalcomponent to the file backend.  We only store the objects</div><div class='del'>- * of the types we support; all others just remain in the toplevel component so</div><div class='del'>- * that we don't lose them.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList **list;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (cal_component_get_vtype (comp)) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		list = &amp;priv-&gt;events;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		list = &amp;priv-&gt;todos;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		list = &amp;priv-&gt;journals;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ensure that the UID is unique; some broken implementations spit</div><div class='del'>-	 * components with duplicated UIDs.</div><div class='del'>-	 */</div><div class='del'>-	check_dup_uid (cbfile, comp);</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	g_hash_table_insert (priv-&gt;comp_uid_hash, (char *)uid, comp);</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, comp);</div><div class='del'>-</div><div class='del'>-	/* Put the object in the toplevel component if required */</div><div class='del'>-</div><div class='del'>-	if (add_to_toplevel) {</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-		icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-		g_assert (icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_component (priv-&gt;icalcomp, icalcomp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the set of categories */</div><div class='del'>-</div><div class='del'>-	update_categories_from_comp (cbfile, comp, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a component from the backend's hash and lists.  Does not perform</div><div class='del'>- * notification on the clients.  Also removes the component from the toplevel</div><div class='del'>- * icalcomponent.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-remove_component (CalBackendFile *cbfile, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GList **list, *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove the icalcomp from the toplevel */</div><div class='del'>-</div><div class='del'>-	icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-	g_assert (icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	icalcomponent_remove_component (priv-&gt;icalcomp, icalcomp);</div><div class='del'>-</div><div class='del'>-	/* Remove it from our mapping */</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-	</div><div class='del'>-	switch (cal_component_get_vtype (comp)) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		list = &amp;priv-&gt;events;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		list = &amp;priv-&gt;todos;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		list = &amp;priv-&gt;journals;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-                /* Make the compiler shut up. */</div><div class='del'>-	        list = NULL;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l = g_list_find (*list, comp);</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	*list = g_list_remove_link (*list, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	/* Update the set of categories */</div><div class='del'>-</div><div class='del'>-	update_categories_from_comp (cbfile, comp, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans the toplevel VCALENDAR component and stores the objects it finds */</div><div class='del'>-static void</div><div class='del'>-scan_vcalendar (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcompiter iter;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	for (iter = icalcomponent_begin_component (priv-&gt;icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-	     icalcompiter_deref (&amp;iter) != NULL;</div><div class='del'>-	     icalcompiter_next (&amp;iter)) {</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-		icalcomponent_kind kind;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		icalcomp = icalcompiter_deref (&amp;iter);</div><div class='del'>-		</div><div class='del'>-		kind = icalcomponent_isa (icalcomp);</div><div class='del'>-</div><div class='del'>-		if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-		      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-		      || kind == ICAL_VJOURNAL_COMPONENT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-		if (!cal_component_set_icalcomponent (comp, icalcomp))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		add_component (cbfile, comp, FALSE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from icalparser_parse() */</div><div class='del'>-static char *</div><div class='del'>-get_line_fn (char *s, size_t size, void *data)</div><div class='del'>-{</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	file = data;</div><div class='del'>-	return fgets (s, size, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parses an open iCalendar file and returns a toplevel component with the contents */</div><div class='del'>-static icalcomponent *</div><div class='del'>-parse_file (FILE *file)</div><div class='del'>-{</div><div class='del'>-	icalparser *parser;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	parser = icalparser_new ();</div><div class='del'>-	icalparser_set_gen_data (parser, file);</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse (parser, get_line_fn);</div><div class='del'>-	icalparser_free (parser);</div><div class='del'>-</div><div class='del'>-	return icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parses an open iCalendar file and loads it into the backend */</div><div class='del'>-static CalBackendOpenStatus</div><div class='del'>-open_cal (CalBackendFile *cbfile, const char *uristr, FILE *file)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	icalcomp = parse_file (file);</div><div class='del'>-</div><div class='del'>-	if (fclose (file) != 0) {</div><div class='del'>-		if (icalcomp)</div><div class='del'>-			icalcomponent_free (icalcomp);</div><div class='del'>-</div><div class='del'>-		return CAL_BACKEND_OPEN_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return CAL_BACKEND_OPEN_ERROR;</div><div class='del'>-		</div><div class='del'>-	/* FIXME: should we try to demangle XROOT components and</div><div class='del'>-	 * individual components as well?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT) {</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		return CAL_BACKEND_OPEN_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	scan_vcalendar (cbfile);</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri = g_strdup (uristr);</div><div class='del'>-</div><div class='del'>-	return CAL_BACKEND_OPEN_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalBackendOpenStatus</div><div class='del'>-create_cal (CalBackendFile *cbfile, const char *uristr)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Create the new calendar information */</div><div class='del'>-	priv-&gt;icalcomp = cal_util_new_top_level ();</div><div class='del'>-</div><div class='del'>-	/* Create our internal data */</div><div class='del'>-	priv-&gt;comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	priv-&gt;uri = g_strdup (uristr);</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-</div><div class='del'>-	return CAL_BACKEND_OPEN_SUCCESS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Open handler for the file backend */</div><div class='del'>-static CalBackendOpenStatus</div><div class='del'>-cal_backend_file_open (CalBackend *backend, const char *uristr, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	FILE *file;</div><div class='del'>-	char *str_uri;</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-	CalBackendOpenStatus status;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp == NULL, CAL_BACKEND_OPEN_ERROR);</div><div class='del'>-	g_return_val_if_fail (uristr != NULL, CAL_BACKEND_OPEN_ERROR);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;uri == NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash == NULL);</div><div class='del'>-</div><div class='del'>-	uri = gnome_vfs_uri_new (uristr);</div><div class='del'>-	if (!uri)</div><div class='del'>-		return CAL_BACKEND_OPEN_ERROR;</div><div class='del'>-</div><div class='del'>-	if (!gnome_vfs_uri_is_local (uri)) {</div><div class='del'>-		gnome_vfs_uri_unref (uri);</div><div class='del'>-		return CAL_BACKEND_OPEN_ERROR;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (uri,</div><div class='del'>-					   (GNOME_VFS_URI_HIDE_USER_NAME</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_PASSWORD</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_HOST_NAME</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_HOST_PORT</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));</div><div class='del'>-</div><div class='del'>-	/* Load! */</div><div class='del'>-	file = fopen (str_uri, "r");</div><div class='del'>-</div><div class='del'>-	if (file)</div><div class='del'>-		status = open_cal (cbfile, str_uri, file);</div><div class='del'>-	else {</div><div class='del'>-		if (only_if_exists)</div><div class='del'>-			status = CAL_BACKEND_OPEN_NOT_FOUND;</div><div class='del'>-		else</div><div class='del'>-			status = create_cal (cbfile, str_uri);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-	gnome_vfs_uri_unref (uri);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is_loaded handler for the file backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_is_loaded (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;icalcomp != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get_query handler for the file backend */</div><div class='del'>-static Query *</div><div class='del'>-cal_backend_file_get_query (CalBackend *backend,</div><div class='del'>-			    GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-			    const char *sexp)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	return query_new (backend, ql, sexp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is_remote handler for the file backend */</div><div class='del'>-static CalMode</div><div class='del'>-cal_backend_file_get_mode (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return CAL_MODE_LOCAL;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-notify_mode (CalBackendFile *cbfile, </div><div class='del'>-	     GNOME_Evolution_Calendar_Listener_SetModeStatus status, </div><div class='del'>-	     GNOME_Evolution_Calendar_CalMode mode)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = CAL_BACKEND (cbfile)-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		Cal *cal;</div><div class='del'>-</div><div class='del'>-		cal = CAL (l-&gt;data);</div><div class='del'>-		cal_notify_mode (cal, status, mode);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set_mode handler for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_set_mode (CalBackend *backend, CalMode mode)</div><div class='del'>-{</div><div class='del'>-	notify_mode (CAL_BACKEND_FILE (backend),</div><div class='del'>-		     GNOME_Evolution_Calendar_Listener_MODE_NOT_SUPPORTED,</div><div class='del'>-		     GNOME_Evolution_Calendar_MODE_LOCAL);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_n_objects handler for the file backend */</div><div class='del'>-static int</div><div class='del'>-cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, -1);</div><div class='del'>-</div><div class='del'>-	n = 0;</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		n += g_list_length (priv-&gt;events);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		n += g_list_length (priv-&gt;todos);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		n += g_list_length (priv-&gt;journals);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_object handler for the file backend */</div><div class='del'>-static char *</div><div class='del'>-cal_backend_file_get_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-</div><div class='del'>-	if (!comp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return cal_component_get_as_string (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_object handler for the file backend */</div><div class='del'>-static CalComponent *</div><div class='del'>-cal_backend_file_get_object_component (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	return lookup_component (cbfile, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_object handler for the file backend */</div><div class='del'>-static char *</div><div class='del'>-cal_backend_file_get_timezone_object (CalBackend *backend, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	char *ical_string;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (tzid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	zone = icalcomponent_get_timezone (priv-&gt;icalcomp, tzid);</div><div class='del'>-	if (!zone)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	icalcomp = icaltimezone_get_component (zone);</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	ical_string = icalcomponent_as_ical_string (icalcomp);</div><div class='del'>-	/* We dup the string; libical owns that memory. */</div><div class='del'>-	if (ical_string)</div><div class='del'>-	  return g_strdup (ical_string);</div><div class='del'>-	else</div><div class='del'>-	  return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of UIDs from a list of CalComponent objects */</div><div class='del'>-static void</div><div class='del'>-build_uids_list (GList **list, GList *components)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = components; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-		cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-		*list = g_list_prepend (*list, g_strdup (uid));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_uids handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;events);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;todos);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;journals);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* function to resolve timezones */</div><div class='del'>-static icaltimezone *</div><div class='del'>-resolve_tzid (const char *tzid, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *vcalendar_comp = user_data;</div><div class='del'>-</div><div class='del'>-        if (!tzid || !tzid[0])</div><div class='del'>-                return NULL;</div><div class='del'>-        else if (!strcmp (tzid, "UTC"))</div><div class='del'>-                return icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	return icalcomponent_get_timezone (vcalendar_comp, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from cal_recur_generate_instances(); adds the component's UID</div><div class='del'>- * to our hash table.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_hash;</div><div class='del'>-	const char *uid;</div><div class='del'>-	const char *old_uid;</div><div class='del'>-</div><div class='del'>-	uid_hash = data;</div><div class='del'>-</div><div class='del'>-	/* We only care that the component's UID is listed in the hash table;</div><div class='del'>-	 * that's why we only allow generation of one instance (i.e. return</div><div class='del'>-	 * FALSE every time).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	old_uid = g_hash_table_lookup (uid_hash, uid);</div><div class='del'>-	if (old_uid)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (uid_hash, (char *) uid, NULL);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Populates a hash table with the UIDs of the components that occur or recur</div><div class='del'>- * within a specific time range.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end, icaltimezone *default_zone)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = components; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		icalcomponent *icalcomp, *vcalendar_comp;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		/* Get the parent VCALENDAR component, so we can resolve</div><div class='del'>-		   TZIDs. */</div><div class='del'>-		icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-		vcalendar_comp = icalcomponent_get_parent (icalcomp);</div><div class='del'>-		g_assert (vcalendar_comp != NULL);</div><div class='del'>-</div><div class='del'>-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash, resolve_tzid, vcalendar_comp, default_zone);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */</div><div class='del'>-static void</div><div class='del'>-add_uid_to_list (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GList **list;</div><div class='del'>-	const char *uid;</div><div class='del'>-	char *uid_copy;</div><div class='del'>-</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	uid = key;</div><div class='del'>-	uid_copy = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, uid_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_objects_in_range handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-				       time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *event_list;</div><div class='del'>-	GHashTable *uid_hash;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;events, start, end,</div><div class='del'>-					priv-&gt;default_zone);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;todos, start, end,</div><div class='del'>-					priv-&gt;default_zone);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;journals, start, end,</div><div class='del'>-					priv-&gt;default_zone);</div><div class='del'>-</div><div class='del'>-	event_list = NULL;</div><div class='del'>-	g_hash_table_foreach (uid_hash, add_uid_to_list, &amp;event_list);</div><div class='del'>-	g_hash_table_destroy (uid_hash);</div><div class='del'>-</div><div class='del'>-	return event_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-free_busy_instance (CalComponent *comp,</div><div class='del'>-		    time_t        instance_start,</div><div class='del'>-		    time_t        instance_end,</div><div class='del'>-		    gpointer      data)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *vfb = data;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	struct icalperiodtype ipt;</div><div class='del'>-	icaltimezone *utc_zone;</div><div class='del'>-</div><div class='del'>-	utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-</div><div class='del'>-	ipt.start = icaltime_from_timet_with_zone (instance_start, FALSE, utc_zone);</div><div class='del'>-	ipt.end = icaltime_from_timet_with_zone (instance_end, FALSE, utc_zone);</div><div class='del'>-	ipt.duration = icaldurationtype_null_duration ();</div><div class='del'>-	</div><div class='del'>-        /* add busy information to the vfb component */</div><div class='del'>-	prop = icalproperty_new (ICAL_FREEBUSY_PROPERTY);</div><div class='del'>-	icalproperty_set_freebusy (prop, ipt);</div><div class='del'>-	</div><div class='del'>-	param = icalparameter_new_fbtype (ICAL_FBTYPE_BUSY);</div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-	</div><div class='del'>-	icalcomponent_add_property (vfb, prop);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalcomponent *</div><div class='del'>-create_user_free_busy (CalBackendFile *cbfile, const char *address, const char *cn,</div><div class='del'>-		       time_t start, time_t end)</div><div class='del'>-{	</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-	icalcomponent *vfb;</div><div class='del'>-	icaltimezone *utc_zone;</div><div class='del'>-	</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* create the (unique) VFREEBUSY object that we'll return */</div><div class='del'>-	vfb = icalcomponent_new_vfreebusy ();</div><div class='del'>-	if (address != NULL) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *param;</div><div class='del'>-		</div><div class='del'>-		prop = icalproperty_new_organizer (address);</div><div class='del'>-		if (prop != NULL &amp;&amp; cn != NULL) {</div><div class='del'>-			param = icalparameter_new_cn (cn);</div><div class='del'>-			icalproperty_add_parameter (prop, param);			</div><div class='del'>-		}</div><div class='del'>-		if (prop != NULL)</div><div class='del'>-			icalcomponent_add_property (vfb, prop);		</div><div class='del'>-	}</div><div class='del'>-	utc_zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-	icalcomponent_set_dtstart (vfb, icaltime_from_timet_with_zone (start, FALSE, utc_zone));</div><div class='del'>-	icalcomponent_set_dtend (vfb, icaltime_from_timet_with_zone (end, FALSE, utc_zone));</div><div class='del'>-</div><div class='del'>-	/* add all objects in the given interval */</div><div class='del'>-</div><div class='del'>-	uids = cal_backend_get_objects_in_range (CAL_BACKEND (cbfile),</div><div class='del'>-						 CALOBJ_TYPE_ANY, start, end);</div><div class='del'>-	for (l = uids; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		icalcomponent *icalcomp, *vcalendar_comp;</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		char *uid = (char *) l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* get the component from our internal list */</div><div class='del'>-		comp = lookup_component (cbfile, uid);</div><div class='del'>-		if (!comp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-		if (!icalcomp)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* If the event is TRANSPARENT, skip it. */</div><div class='del'>-		prop = icalcomponent_get_first_property (icalcomp,</div><div class='del'>-							 ICAL_TRANSP_PROPERTY);</div><div class='del'>-		if (prop) {</div><div class='del'>-			const char *transp_val = icalproperty_get_transp (prop);</div><div class='del'>-			if (transp_val</div><div class='del'>-			    &amp;&amp; !strcasecmp (transp_val, "TRANSPARENT"))</div><div class='del'>-				continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		vcalendar_comp = icalcomponent_get_parent (icalcomp);</div><div class='del'>-		cal_recur_generate_instances (comp, start, end,</div><div class='del'>-					      free_busy_instance,</div><div class='del'>-					      vfb,</div><div class='del'>-					      resolve_tzid,</div><div class='del'>-					      vcalendar_comp,</div><div class='del'>-					      priv-&gt;default_zone);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	return vfb;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_free_busy handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	gchar *address, *name;	</div><div class='del'>-	icalcomponent *vfb;</div><div class='del'>-	char *calobj;</div><div class='del'>-	GList *obj_list = NULL;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	if (users == NULL) {</div><div class='del'>-		if (cal_backend_mail_account_get_default (priv-&gt;db, &amp;address, &amp;name)) {			</div><div class='del'>-			vfb = create_user_free_busy (cbfile, address, name, start, end);</div><div class='del'>-			calobj = icalcomponent_as_ical_string (vfb);</div><div class='del'>-			obj_list = g_list_append (obj_list, g_strdup (calobj));</div><div class='del'>-			icalcomponent_free (vfb);</div><div class='del'>-			g_free (address);</div><div class='del'>-			g_free (name);</div><div class='del'>-		}		</div><div class='del'>-	} else {</div><div class='del'>-		for (l = users; l != NULL; l = l-&gt;next ) {</div><div class='del'>-			address = l-&gt;data;			</div><div class='del'>-			if (cal_backend_mail_account_is_valid (priv-&gt;db, address, &amp;name)) {</div><div class='del'>-				vfb = create_user_free_busy (cbfile, address, name, start, end);</div><div class='del'>-				calobj = icalcomponent_as_ical_string (vfb);</div><div class='del'>-				obj_list = g_list_append (obj_list, g_strdup (calobj));</div><div class='del'>-				icalcomponent_free (vfb);</div><div class='del'>-				g_free (name);</div><div class='del'>-			}</div><div class='del'>-		}		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return obj_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CalObjType type;	</div><div class='del'>-	GList *changes;</div><div class='del'>-	GList *change_ids;</div><div class='del'>-} CalBackendFileComputeChangesData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_compute_changes_foreach_key (const char *key, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalBackendFileComputeChangesData *be_data = data;</div><div class='del'>-	char *calobj = cal_backend_get_object (be_data-&gt;backend, key);</div><div class='del'>-	</div><div class='del'>-	if (calobj == NULL) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjChange *coc;</div><div class='del'>-		char *calobj;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		if (be_data-&gt;type == GNOME_Evolution_Calendar_TYPE_TODO)</div><div class='del'>-			cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-		else</div><div class='del'>-			cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-		cal_component_set_uid (comp, key);</div><div class='del'>-		calobj = cal_component_get_as_string (comp);</div><div class='del'>-</div><div class='del'>-		coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();</div><div class='del'>-		coc-&gt;calobj =  CORBA_string_dup (calobj);</div><div class='del'>-		coc-&gt;type = GNOME_Evolution_Calendar_DELETED;</div><div class='del'>-		be_data-&gt;changes = g_list_prepend (be_data-&gt;changes, coc);</div><div class='del'>-		be_data-&gt;change_ids = g_list_prepend (be_data-&gt;change_ids, g_strdup (key));</div><div class='del'>-</div><div class='del'>-		g_free (calobj);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>- 	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-cal_backend_file_compute_changes (CalBackend *backend, CalObjType type, const char *change_id)</div><div class='del'>-{</div><div class='del'>-	char    *filename;</div><div class='del'>-	EDbHash *ehash;</div><div class='del'>-	CalBackendFileComputeChangesData be_data;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjChangeSeq *seq;</div><div class='del'>-	GList *uids, *changes = NULL, *change_ids = NULL;</div><div class='del'>-	GList *i, *j;</div><div class='del'>-	int n;</div><div class='del'>-	</div><div class='del'>-	/* Find the changed ids - FIX ME, path should not be hard coded */</div><div class='del'>-	if (type == GNOME_Evolution_Calendar_TYPE_TODO)</div><div class='del'>-		filename = g_strdup_printf ("%s/evolution/local/Tasks/%s.db", g_get_home_dir (), change_id);</div><div class='del'>-	else </div><div class='del'>-		filename = g_strdup_printf ("%s/evolution/local/Calendar/%s.db", g_get_home_dir (), change_id);</div><div class='del'>-	ehash = e_dbhash_new (filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	uids = cal_backend_get_uids (backend, type);</div><div class='del'>-	</div><div class='del'>-	/* Calculate adds and modifies */</div><div class='del'>-	for (i = uids; i != NULL; i = i-&gt;next) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjChange *coc;</div><div class='del'>-		char *uid = i-&gt;data;</div><div class='del'>-		char *calobj = cal_backend_get_object (backend, uid);</div><div class='del'>-</div><div class='del'>-		g_assert (calobj != NULL);</div><div class='del'>-</div><div class='del'>-		/* check what type of change has occurred, if any */</div><div class='del'>-		switch (e_dbhash_compare (ehash, uid, calobj)) {</div><div class='del'>-		case E_DBHASH_STATUS_SAME:</div><div class='del'>-			break;</div><div class='del'>-		case E_DBHASH_STATUS_NOT_FOUND:</div><div class='del'>-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();</div><div class='del'>-			coc-&gt;calobj =  CORBA_string_dup (calobj);</div><div class='del'>-			coc-&gt;type = GNOME_Evolution_Calendar_ADDED;</div><div class='del'>-			changes = g_list_prepend (changes, coc);</div><div class='del'>-			change_ids = g_list_prepend (change_ids, g_strdup (uid));</div><div class='del'>-			break;</div><div class='del'>-		case E_DBHASH_STATUS_DIFFERENT:</div><div class='del'>-			coc = GNOME_Evolution_Calendar_CalObjChange__alloc ();</div><div class='del'>-			coc-&gt;calobj =  CORBA_string_dup (calobj);</div><div class='del'>-			coc-&gt;type = GNOME_Evolution_Calendar_MODIFIED;</div><div class='del'>-			changes = g_list_prepend (changes, coc);</div><div class='del'>-			change_ids = g_list_prepend (change_ids, g_strdup (uid));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate deletions */</div><div class='del'>-	be_data.backend = backend;</div><div class='del'>-	be_data.type = type;	</div><div class='del'>-	be_data.changes = changes;</div><div class='del'>-	be_data.change_ids = change_ids;</div><div class='del'>-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)cal_backend_file_compute_changes_foreach_key, &amp;be_data);</div><div class='del'>-	changes = be_data.changes;</div><div class='del'>-	change_ids = be_data.change_ids;</div><div class='del'>-	</div><div class='del'>-	/* Build the sequence and update the hash */</div><div class='del'>-	n = g_list_length (changes);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_CalObjChangeSeq__alloc ();</div><div class='del'>-	seq-&gt;_length = n;</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjChange_allocbuf (n);</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-</div><div class='del'>-	for (i = changes, j = change_ids, n = 0; i != NULL; i = i-&gt;next, j = j-&gt;next, n++) {</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjChange *coc = i-&gt;data;</div><div class='del'>-		GNOME_Evolution_Calendar_CalObjChange *seq_coc;</div><div class='del'>-		char *uid = j-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* sequence building */</div><div class='del'>-		seq_coc = &amp;seq-&gt;_buffer[n];</div><div class='del'>-		seq_coc-&gt;calobj = CORBA_string_dup (coc-&gt;calobj);</div><div class='del'>-		seq_coc-&gt;type = coc-&gt;type;</div><div class='del'>-</div><div class='del'>-		/* hash updating */</div><div class='del'>-		if (coc-&gt;type == GNOME_Evolution_Calendar_ADDED </div><div class='del'>-		    || coc-&gt;type == GNOME_Evolution_Calendar_MODIFIED) {</div><div class='del'>-			e_dbhash_add (ehash, uid, coc-&gt;calobj);</div><div class='del'>-		} else {</div><div class='del'>-			e_dbhash_remove (ehash, uid);</div><div class='del'>-		}		</div><div class='del'>-</div><div class='del'>-		CORBA_free (coc);</div><div class='del'>-		g_free (uid);</div><div class='del'>-	}	</div><div class='del'>-	e_dbhash_write (ehash);</div><div class='del'>-  	e_dbhash_destroy (ehash);</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-	g_list_free (change_ids);</div><div class='del'>-	g_list_free (changes);</div><div class='del'>-	</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_changes handler for the file backend */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-cal_backend_file_get_changes (CalBackend *backend, CalObjType type, const char *change_id)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	return cal_backend_file_compute_changes (backend, type, change_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_in_range handler for the file backend */</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *</div><div class='del'>-cal_backend_file_get_alarms_in_range (CalBackend *backend,</div><div class='del'>-				      time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	int n_comp_alarms;</div><div class='del'>-	GSList *comp_alarms;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int i;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	/* Per RFC 2445, only VEVENTs and VTODOs can have alarms */</div><div class='del'>-</div><div class='del'>-	n_comp_alarms = 0;</div><div class='del'>-	comp_alarms = NULL;</div><div class='del'>-</div><div class='del'>-	n_comp_alarms += cal_util_generate_alarms_for_list (priv-&gt;events, start, end,</div><div class='del'>-							    &amp;comp_alarms, resolve_tzid,</div><div class='del'>-							    priv-&gt;icalcomp,</div><div class='del'>-							    priv-&gt;default_zone);</div><div class='del'>-	n_comp_alarms += cal_util_generate_alarms_for_list (priv-&gt;todos, start, end,</div><div class='del'>-							    &amp;comp_alarms, resolve_tzid,</div><div class='del'>-							    priv-&gt;icalcomp,</div><div class='del'>-							    priv-&gt;default_zone);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_CalComponentAlarmsSeq__alloc ();</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-	seq-&gt;_length = n_comp_alarms;</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalComponentAlarms_allocbuf (</div><div class='del'>-		n_comp_alarms);</div><div class='del'>-</div><div class='del'>-	for (l = comp_alarms, i = 0; l; l = l-&gt;next, i++) {</div><div class='del'>-		CalComponentAlarms *alarms;</div><div class='del'>-		char *comp_str;</div><div class='del'>-</div><div class='del'>-		alarms = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		comp_str = cal_component_get_as_string (alarms-&gt;comp);</div><div class='del'>-		seq-&gt;_buffer[i].calobj = CORBA_string_dup (comp_str);</div><div class='del'>-		g_free (comp_str);</div><div class='del'>-</div><div class='del'>-		cal_backend_util_fill_alarm_instances_seq (&amp;seq-&gt;_buffer[i].alarms, alarms-&gt;alarms);</div><div class='del'>-</div><div class='del'>-		cal_component_alarms_free (alarms);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (comp_alarms);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_for_object handler for the file backend */</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarms *</div><div class='del'>-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-					time_t start, time_t end,</div><div class='del'>-					gboolean *object_found)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	char *comp_str;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarms *corba_alarms;</div><div class='del'>-	CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-	g_return_val_if_fail (object_found != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-	if (!comp) {</div><div class='del'>-		*object_found = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*object_found = TRUE;</div><div class='del'>-</div><div class='del'>-	comp_str = cal_component_get_as_string (comp);</div><div class='del'>-	corba_alarms = GNOME_Evolution_Calendar_CalComponentAlarms__alloc ();</div><div class='del'>-</div><div class='del'>-	corba_alarms-&gt;calobj = CORBA_string_dup (comp_str);</div><div class='del'>-	g_free (comp_str);</div><div class='del'>-</div><div class='del'>-	alarms = cal_util_generate_alarms_for_comp (comp, start, end, resolve_tzid, priv-&gt;icalcomp, priv-&gt;default_zone);</div><div class='del'>-	if (alarms) {</div><div class='del'>-		cal_backend_util_fill_alarm_instances_seq (&amp;corba_alarms-&gt;alarms, alarms-&gt;alarms);</div><div class='del'>-		cal_component_alarms_free (alarms);</div><div class='del'>-	} else</div><div class='del'>-		cal_backend_util_fill_alarm_instances_seq (&amp;corba_alarms-&gt;alarms, NULL);</div><div class='del'>-</div><div class='del'>-	return corba_alarms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Notifies a backend's clients that an object was updated */</div><div class='del'>-static void</div><div class='del'>-notify_update (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_backend_obj_updated (CAL_BACKEND (cbfile), uid);</div><div class='del'>-</div><div class='del'>-	for (l = CAL_BACKEND (cbfile)-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		Cal *cal;</div><div class='del'>-</div><div class='del'>-		cal = CAL (l-&gt;data);</div><div class='del'>-		cal_notify_update (cal, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Notifies a backend's clients that an object was removed */</div><div class='del'>-static void</div><div class='del'>-notify_remove (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_backend_obj_removed (CAL_BACKEND (cbfile), uid);</div><div class='del'>-</div><div class='del'>-	for (l = CAL_BACKEND (cbfile)-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		Cal *cal;</div><div class='del'>-</div><div class='del'>-		cal = CAL (l-&gt;data);</div><div class='del'>-		cal_notify_remove (cal, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach_remove(); removes and frees a category */</div><div class='del'>-static gboolean</div><div class='del'>-remove_category_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Category *c;</div><div class='del'>-</div><div class='del'>-	c = value;</div><div class='del'>-	g_free (c-&gt;name);</div><div class='del'>-	g_free (c);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Clears the table of removed categories */</div><div class='del'>-static void</div><div class='del'>-clean_removed_categories (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (priv-&gt;removed_categories,</div><div class='del'>-				     remove_category_cb,</div><div class='del'>-				     NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates a CalComponent for the given icalcomponent and adds it to our</div><div class='del'>-   cache. Note that the icalcomponent is not added to the toplevel</div><div class='del'>-   icalcomponent here. That needs to be done elsewhere. It returns the uid</div><div class='del'>-   of the added component, or NULL if it failed. */</div><div class='del'>-static const char*</div><div class='del'>-cal_backend_file_update_object (CalBackendFile *cbfile,</div><div class='del'>-				icalcomponent *icalcomp)</div><div class='del'>-{</div><div class='del'>-	CalComponent *old_comp;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *comp_uid;</div><div class='del'>-</div><div class='del'>-	/* Create a CalComponent wrapper for the icalcomponent. */</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the UID, and check it isn't empty. */</div><div class='del'>-	cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-	if (!comp_uid || !comp_uid[0]) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove any old version of the component. */</div><div class='del'>-	old_comp = lookup_component (cbfile, comp_uid);</div><div class='del'>-	if (old_comp)</div><div class='del'>-		remove_component (cbfile, old_comp);</div><div class='del'>-</div><div class='del'>-	/* Now add the component to our local cache, but we pass FALSE as</div><div class='del'>-	   the last argument, since the libical component is assumed to have</div><div class='del'>-	   been added already. */</div><div class='del'>-	add_component (cbfile, comp, FALSE);</div><div class='del'>-</div><div class='del'>-	return comp_uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Update_objects handler for the file backend. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_update_objects (CalBackend *backend, const char *calobj)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *toplevel_comp, *icalcomp = NULL;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-	int old_n_categories, new_n_categories;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-	gboolean retval = TRUE;</div><div class='del'>-	GList *comp_uid_list = NULL, *elem;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (calobj != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Pull the component from the string and ensure that it is sane */</div><div class='del'>-</div><div class='del'>-	toplevel_comp = icalparser_parse_string ((char *) calobj);</div><div class='del'>-</div><div class='del'>-	if (!toplevel_comp)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (toplevel_comp);</div><div class='del'>-</div><div class='del'>-	if (kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-	    || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-	    || kind == ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-		/* Create a temporary toplevel component and put the VEVENT</div><div class='del'>-		   or VTODO in it, to simplify the code below. */</div><div class='del'>-		icalcomp = toplevel_comp;</div><div class='del'>-		toplevel_comp = cal_util_new_top_level ();</div><div class='del'>-		icalcomponent_add_component (toplevel_comp, icalcomp);</div><div class='del'>-	} else if (kind != ICAL_VCALENDAR_COMPONENT) {</div><div class='del'>-		/* We don't support this type of component */</div><div class='del'>-		icalcomponent_free (toplevel_comp);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* The list of removed categories must be empty because we are about to</div><div class='del'>-	 * start a new scanning process.</div><div class='del'>-	 */</div><div class='del'>-	g_assert (g_hash_table_size (priv-&gt;removed_categories) == 0);</div><div class='del'>-</div><div class='del'>-	old_n_categories = g_hash_table_size (priv-&gt;categories);</div><div class='del'>-</div><div class='del'>-	/* Step throught the VEVENT/VTODOs being added, create CalComponents</div><div class='del'>-	   for them, and add them to our cache. */</div><div class='del'>-	subcomp = icalcomponent_get_first_component (toplevel_comp,</div><div class='del'>-						     ICAL_ANY_COMPONENT);</div><div class='del'>-	while (subcomp) {</div><div class='del'>-		/* We ignore anything except VEVENT, VTODO and VJOURNAL</div><div class='del'>-		   components. */</div><div class='del'>-		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);</div><div class='del'>-		if (child_kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-		    || child_kind == ICAL_VTODO_COMPONENT</div><div class='del'>-		    || child_kind == ICAL_VJOURNAL_COMPONENT) {</div><div class='del'>-			const char *comp_uid;</div><div class='del'>-</div><div class='del'>-			comp_uid = cal_backend_file_update_object (cbfile,</div><div class='del'>-								   subcomp);</div><div class='del'>-			if (comp_uid) {</div><div class='del'>-				/* We add a copy of the UID to a list, so we</div><div class='del'>-				   can emit notification signals later. We do</div><div class='del'>-				   a g_strdup() in case any of the components</div><div class='del'>-				   get removed while we are emitting</div><div class='del'>-				   notification signals. */</div><div class='del'>-				comp_uid_list = g_list_prepend (comp_uid_list,</div><div class='del'>-								g_strdup (comp_uid));</div><div class='del'>-			} else {</div><div class='del'>-				retval = FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		subcomp = icalcomponent_get_next_component (toplevel_comp,</div><div class='del'>-							    ICAL_ANY_COMPONENT);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Merge the iCalendar components with our existing VCALENDAR,</div><div class='del'>-	   resolving any conflicting TZIDs. */</div><div class='del'>-	icalcomponent_merge_component (priv-&gt;icalcomp, toplevel_comp);</div><div class='del'>-</div><div class='del'>-	new_n_categories = g_hash_table_size (priv-&gt;categories);</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-</div><div class='del'>-	/* Now emit notification signals for all of the added components.</div><div class='del'>-	   We do this after adding them all to make sure the calendar is in a</div><div class='del'>-	   stable state before emitting signals. */</div><div class='del'>-	for (elem = comp_uid_list; elem; elem = elem-&gt;next) {</div><div class='del'>-		char *comp_uid = elem-&gt;data;</div><div class='del'>-		notify_update (cbfile, comp_uid);</div><div class='del'>-		g_free (comp_uid);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (comp_uid_list);</div><div class='del'>-</div><div class='del'>-	if (old_n_categories != new_n_categories ||</div><div class='del'>-	    g_hash_table_size (priv-&gt;removed_categories) != 0) {</div><div class='del'>-		clean_removed_categories (cbfile);</div><div class='del'>-		notify_categories_changed (cbfile);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Remove_object handler for the file backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_remove_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* The list of removed categories must be empty because we are about to</div><div class='del'>-	 * start a new scanning process.</div><div class='del'>-	 */</div><div class='del'>-	g_assert (g_hash_table_size (priv-&gt;removed_categories) == 0);</div><div class='del'>-</div><div class='del'>-	remove_component (cbfile, comp);</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-</div><div class='del'>-	notify_remove (cbfile, uid);</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_size (priv-&gt;removed_categories) != 0) {</div><div class='del'>-		clean_removed_categories (cbfile);</div><div class='del'>-		notify_categories_changed (cbfile);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static icaltimezone*</div><div class='del'>-cal_backend_file_get_timezone (CalBackend *backend, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!strcmp (tzid, "UTC"))</div><div class='del'>-		return icaltimezone_get_utc_timezone ();</div><div class='del'>-	else</div><div class='del'>-		return icalcomponent_get_timezone (priv-&gt;icalcomp, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static icaltimezone*</div><div class='del'>-cal_backend_file_get_default_timezone (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;default_zone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_set_default_timezone (CalBackend *backend,</div><div class='del'>-				       const char *tzid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Look up the VTIMEZONE in our icalcomponent. */</div><div class='del'>-	zone = icalcomponent_get_timezone (priv-&gt;icalcomp, tzid);</div><div class='del'>-	if (!zone)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Set the default timezone to it. */</div><div class='del'>-	priv-&gt;default_zone = zone;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h<br/>deleted file mode 100644<br/>index c90feddea3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-file.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar file backend</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_BACKEND_FILE_H</div><div class='del'>-#define CAL_BACKEND_FILE_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())</div><div class='del'>-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\</div><div class='del'>-					  CalBackendFile))</div><div class='del'>-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\</div><div class='del'>-					  CalBackendFileClass))</div><div class='del'>-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))</div><div class='del'>-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackendFile CalBackendFile;</div><div class='del'>-typedef struct _CalBackendFileClass CalBackendFileClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;</div><div class='del'>-</div><div class='del'>-struct _CalBackendFile {</div><div class='del'>-	CalBackend backend;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalBackendFileClass {</div><div class='del'>-	CalBackendClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType cal_backend_file_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal-backend-util.c b/calendar/pcs/cal-backend-util.c<br/>deleted file mode 100644<br/>index 6ae480e30b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,116 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - generic backend class</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Rodrigo Moya &lt;rodrigo@ximian.com&gt;    </div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "cal-backend-util.h"</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-cal_backend_util_fill_alarm_instances_seq (GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq,</div><div class='del'>-					   GSList *alarms)</div><div class='del'>-{</div><div class='del'>-	int n_alarms;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (seq != NULL);</div><div class='del'>-</div><div class='del'>-	n_alarms = g_slist_length (alarms);</div><div class='del'>-</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-	seq-&gt;_length = n_alarms;</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalAlarmInstance_allocbuf (n_alarms);</div><div class='del'>-</div><div class='del'>-	for (l = alarms, i = 0; l; l = l-&gt;next, i++) {</div><div class='del'>-		CalAlarmInstance *instance;</div><div class='del'>-		GNOME_Evolution_Calendar_CalAlarmInstance *corba_instance;</div><div class='del'>-</div><div class='del'>-		instance = l-&gt;data;</div><div class='del'>-		corba_instance = seq-&gt;_buffer + i;</div><div class='del'>-</div><div class='del'>-		corba_instance-&gt;auid = CORBA_string_dup (instance-&gt;auid);</div><div class='del'>-		corba_instance-&gt;trigger = (long) instance-&gt;trigger;</div><div class='del'>-		corba_instance-&gt;occur_start = (long) instance-&gt;occur_start;</div><div class='del'>-		corba_instance-&gt;occur_end = (long) instance-&gt;occur_end;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-cal_backend_mail_account_get (Bonobo_ConfigDatabase db,</div><div class='del'>-			      gint def,</div><div class='del'>-			      char **address,</div><div class='del'>-			      char **name)</div><div class='del'>-{</div><div class='del'>-	gchar *path;</div><div class='del'>-	</div><div class='del'>-	*address = NULL;</div><div class='del'>-	*name = NULL;</div><div class='del'>-	</div><div class='del'>-	/* get the identity info */</div><div class='del'>-	path = g_strdup_printf ("/Mail/Accounts/identity_name_%d", def);</div><div class='del'>-	*name = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-	g_free (path);</div><div class='del'>-	</div><div class='del'>-	path = g_strdup_printf ("/Mail/Accounts/identity_address_%d", def);</div><div class='del'>-	*address = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_mail_account_get_default (Bonobo_ConfigDatabase db,</div><div class='del'>-				      char **address,</div><div class='del'>-				      char **name)</div><div class='del'>-{</div><div class='del'>-	glong def, len;</div><div class='del'>-	</div><div class='del'>-	*address = NULL;</div><div class='del'>-	*name = NULL;</div><div class='del'>-	</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);</div><div class='del'>-	def = bonobo_config_get_long_with_default (db, "/Mail/Accounts/default_account", 0, NULL);</div><div class='del'>-</div><div class='del'>-	if (def &lt; len)</div><div class='del'>-		cal_backend_mail_account_get (db, def, address, name);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_mail_account_is_valid (Bonobo_ConfigDatabase db, char *user, char **name)</div><div class='del'>-{</div><div class='del'>-	gchar *address;</div><div class='del'>-	glong len, i;</div><div class='del'>-	</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		cal_backend_mail_account_get (db, i, &amp;address, name);</div><div class='del'>-		if (address != NULL &amp;&amp; !strcmp (address, user)) {</div><div class='del'>-			g_free (address);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}		</div><div class='del'>-		g_free (address);</div><div class='del'>-		g_free (*name);		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;	</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/cal-backend-util.h b/calendar/pcs/cal-backend-util.h<br/>deleted file mode 100644<br/>index f10267453a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - generic backend class</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Rodrigo Moya &lt;rodrigo@ximian.com&gt;    </div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_BACKEND_UTIL_H</div><div class='del'>-#define CAL_BACKEND_UTIL_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;cal-backend.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * CORBA utility functions</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void cal_backend_util_fill_alarm_instances_seq (</div><div class='del'>-	GNOME_Evolution_Calendar_CalAlarmInstanceSeq *seq, GSList *alarms);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Functions for accessing mail configuration</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-void     cal_backend_mail_account_get (Bonobo_ConfigDatabase db, gint def,</div><div class='del'>-				       char **address, char **name);</div><div class='del'>-gboolean cal_backend_mail_account_get_default (Bonobo_ConfigDatabase db,</div><div class='del'>-					       char **address, char **name);</div><div class='del'>-gboolean cal_backend_mail_account_is_valid (Bonobo_ConfigDatabase db,</div><div class='del'>-					    char *user, char **name);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c<br/>deleted file mode 100644<br/>index 95dc9957e6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,849 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - generic backend class</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *          Rodrigo Moya &lt;rodrigo@ximian.com&gt;    </div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parserInternals.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-#include "libversit/vcc.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	LAST_CLIENT_GONE,</div><div class='del'>-	CAL_ADDED,</div><div class='del'>-	OPENED,</div><div class='del'>-	OBJ_UPDATED,</div><div class='del'>-	OBJ_REMOVED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cal_backend_class_init (CalBackendClass *class);</div><div class='del'>-</div><div class='del'>-static guint cal_backend_signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-#define CLASS(backend) (CAL_BACKEND_CLASS (GTK_OBJECT (backend)-&gt;klass))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalBackend class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalBackend class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_backend_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_backend_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_type) {</div><div class='del'>-		static const GtkTypeInfo cal_backend_info = {</div><div class='del'>-			"CalBackend",</div><div class='del'>-			sizeof (CalBackend),</div><div class='del'>-			sizeof (CalBackendClass),</div><div class='del'>-			(GtkClassInitFunc) cal_backend_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_backend_type =</div><div class='del'>-			gtk_type_unique (GTK_TYPE_OBJECT, &amp;cal_backend_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_backend_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_class_init (CalBackendClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	cal_backend_signals[LAST_CLIENT_GONE] =</div><div class='del'>-		gtk_signal_new ("last_client_gone",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalBackendClass, last_client_gone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	cal_backend_signals[CAL_ADDED] =</div><div class='del'>-		gtk_signal_new ("cal_added",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalBackendClass, cal_added),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-	cal_backend_signals[OPENED] =</div><div class='del'>-		gtk_signal_new ("opened",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalBackendClass, opened),</div><div class='del'>-				gtk_marshal_NONE__ENUM,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_ENUM);</div><div class='del'>-	cal_backend_signals[OBJ_UPDATED] =</div><div class='del'>-		gtk_signal_new ("obj_updated",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalBackendClass, obj_updated),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-	cal_backend_signals[OBJ_REMOVED] =</div><div class='del'>-		gtk_signal_new ("obj_removed",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalBackendClass, obj_removed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	class-&gt;last_client_gone = NULL;</div><div class='del'>-	class-&gt;opened = NULL;</div><div class='del'>-	class-&gt;obj_updated = NULL;</div><div class='del'>-	class-&gt;obj_removed = NULL;</div><div class='del'>-</div><div class='del'>-	class-&gt;get_uri = NULL;</div><div class='del'>-	class-&gt;open = NULL;</div><div class='del'>-	class-&gt;is_loaded = NULL;</div><div class='del'>-	class-&gt;get_query = NULL;</div><div class='del'>-	class-&gt;get_mode = NULL;</div><div class='del'>-	class-&gt;set_mode = NULL;	</div><div class='del'>-	class-&gt;get_n_objects = NULL;</div><div class='del'>-	class-&gt;get_object = NULL;</div><div class='del'>-	class-&gt;get_object_component = NULL;</div><div class='del'>-	class-&gt;get_timezone_object = NULL;</div><div class='del'>-	class-&gt;get_uids = NULL;</div><div class='del'>-	class-&gt;get_objects_in_range = NULL;</div><div class='del'>-	class-&gt;get_free_busy = NULL;</div><div class='del'>-	class-&gt;get_changes = NULL;</div><div class='del'>-	class-&gt;get_alarms_in_range = NULL;</div><div class='del'>-	class-&gt;get_alarms_for_object = NULL;</div><div class='del'>-	class-&gt;update_objects = NULL;</div><div class='del'>-	class-&gt;remove_object = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_uri:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- *</div><div class='del'>- * Queries the URI of a calendar backend, which must already have an open</div><div class='del'>- * calendar.</div><div class='del'>- *</div><div class='del'>- * Return value: The URI where the calendar is stored.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-cal_backend_get_uri (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_uri != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_uri) (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a Cal is destroyed */</div><div class='del'>-static void</div><div class='del'>-cal_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	Cal *lcal;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	cal = CAL (object);</div><div class='del'>-</div><div class='del'>-	backend = CAL_BACKEND (data);</div><div class='del'>-</div><div class='del'>-	/* Find the cal in the list of clients */</div><div class='del'>-</div><div class='del'>-	for (l = backend-&gt;clients; l; l = l-&gt;next) {</div><div class='del'>-		lcal = CAL (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (lcal == cal)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	/* Disconnect */</div><div class='del'>-</div><div class='del'>-	backend-&gt;clients = g_list_remove_link (backend-&gt;clients, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	/* When all clients go away, notify the parent factory about it so that</div><div class='del'>-	 * it may decide whether to kill the backend or not.</div><div class='del'>-	 */</div><div class='del'>-	if (!backend-&gt;clients)</div><div class='del'>-		cal_backend_last_client_gone (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_add_cal:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @cal: A calendar client interface object.</div><div class='del'>- *</div><div class='del'>- * Adds a calendar client interface object to a calendar @backend.</div><div class='del'>- * The calendar backend must already have an open calendar.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_add_cal (CalBackend *backend, Cal *cal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-</div><div class='del'>-	/* we do not keep a reference to the Cal since the Calendar</div><div class='del'>-	 * user agent owns it */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cal), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_destroy_cb),</div><div class='del'>-			    backend);</div><div class='del'>-</div><div class='del'>-	backend-&gt;clients = g_list_prepend (backend-&gt;clients, cal);</div><div class='del'>-</div><div class='del'>-	/* notify backend that a new Cal has been added */</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend),</div><div class='del'>-			 cal_backend_signals[CAL_ADDED],</div><div class='del'>-			 cal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_open:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uristr: URI that contains the calendar data.</div><div class='del'>- * @only_if_exists: Whether the calendar should be opened only if it already</div><div class='del'>- * exists.  If FALSE, a new calendar will be created when the specified @uri</div><div class='del'>- * does not exist.</div><div class='del'>- *</div><div class='del'>- * Opens a calendar backend with data from a calendar stored at the specified</div><div class='del'>- * URI.</div><div class='del'>- *</div><div class='del'>- * Return value: An operation status code.</div><div class='del'>- **/</div><div class='del'>-CalBackendOpenStatus</div><div class='del'>-cal_backend_open (CalBackend *backend, const char *uristr, gboolean only_if_exists)</div><div class='del'>-{</div><div class='del'>-	CalBackendOpenStatus result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_OPEN_ERROR);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_OPEN_ERROR);</div><div class='del'>-	g_return_val_if_fail (uristr != NULL, CAL_BACKEND_OPEN_ERROR);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;open != NULL);</div><div class='del'>-	result = (* CLASS (backend)-&gt;open) (backend, uristr, only_if_exists);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_is_loaded:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar backend has been loaded yet.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the backend has been loaded with data, FALSE</div><div class='del'>- * otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_is_loaded (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;is_loaded != NULL);</div><div class='del'>-	result = (* CLASS (backend)-&gt;is_loaded) (backend);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_query:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @ql: The query listener.</div><div class='del'>- * @sexp: Search expression.</div><div class='del'>- *</div><div class='del'>- * Create a query object for this backend.</div><div class='del'>- */</div><div class='del'>-Query *</div><div class='del'>-cal_backend_get_query (CalBackend *backend,</div><div class='del'>-		       GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-		       const char *sexp)</div><div class='del'>-{</div><div class='del'>-	Query *result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-</div><div class='del'>-	if (CLASS (backend)-&gt;get_query != NULL)</div><div class='del'>-		result = (* CLASS (backend)-&gt;get_query) (backend, ql, sexp);</div><div class='del'>-	else</div><div class='del'>-		result = query_new (backend, ql, sexp);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_mode:</div><div class='del'>- * @backend: A calendar backend. </div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar backend is connected remotely.</div><div class='del'>- * </div><div class='del'>- * Return value: The current mode the calendar is in</div><div class='del'>- **/</div><div class='del'>-CalMode</div><div class='del'>-cal_backend_get_mode (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalMode result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_mode != NULL);</div><div class='del'>-	result = (* CLASS (backend)-&gt;get_mode) (backend);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_set_mode:</div><div class='del'>- * @backend: A calendar backend</div><div class='del'>- * @mode: Mode to change to</div><div class='del'>- * </div><div class='del'>- * Sets the mode of the calendar</div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_set_mode (CalBackend *backend, CalMode mode)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;set_mode != NULL);</div><div class='del'>-	(* CLASS (backend)-&gt;set_mode) (backend, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_n_objects:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @type: Types of objects that will be included in the count.</div><div class='del'>- * </div><div class='del'>- * Queries the number of calendar objects of a particular type.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of objects of the specified @type.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-cal_backend_get_n_objects (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), -1);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_n_objects != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_n_objects) (backend, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_object:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier for a calendar object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar backend for a calendar object based on its unique</div><div class='del'>- * identifier.</div><div class='del'>- *</div><div class='del'>- * Return value: The string representation of a complete calendar wrapping the</div><div class='del'>- * the sought object, or NULL if no object had the specified UID.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_backend_get_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_object != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_object) (backend, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_object_component:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier for a calendar object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar backend for a calendar object based on its unique</div><div class='del'>- * identifier. It returns the CalComponent rather than the string</div><div class='del'>- * representation.</div><div class='del'>- *</div><div class='del'>- * Return value: The CalComponent of the sought object, or NULL if no object</div><div class='del'>- * had the specified UID.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_backend_get_object_component (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_object_component != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_object_component) (backend, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_timezone_object:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @tzid: Unique identifier for a calendar VTIMEZONE object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar backend for a VTIMEZONE calendar object based on its</div><div class='del'>- * unique TZID identifier.</div><div class='del'>- *</div><div class='del'>- * Return value: The string representation of a VTIMEZONE component, or NULL</div><div class='del'>- * if no VTIMEZONE object had the specified TZID.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_backend_get_timezone_object (CalBackend *backend, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (tzid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_timezone_object != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_timezone_object) (backend, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_type_by_uid</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier for a Calendar object.</div><div class='del'>- *</div><div class='del'>- * Returns the type of the object identified by the @uid argument</div><div class='del'>- */</div><div class='del'>-CalObjType</div><div class='del'>-cal_backend_get_type_by_uid (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	char *comp_str;</div><div class='del'>-	CalObjType type = CAL_COMPONENT_NO_TYPE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_COMPONENT_NO_TYPE);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	comp_str = cal_backend_get_object (backend, uid);</div><div class='del'>-	if (!comp_str)</div><div class='del'>-		return CAL_COMPONENT_NO_TYPE;</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse_string (comp_str);</div><div class='del'>-	if (icalcomp) {</div><div class='del'>-		switch (icalcomponent_isa (icalcomp)) {</div><div class='del'>-		case ICAL_VEVENT_COMPONENT :</div><div class='del'>-			type = CALOBJ_TYPE_EVENT;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_VTODO_COMPONENT :</div><div class='del'>-			type = CALOBJ_TYPE_TODO;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_VJOURNAL_COMPONENT :</div><div class='del'>-			type = CALOBJ_TYPE_JOURNAL;</div><div class='del'>-			break;</div><div class='del'>-		default :</div><div class='del'>-			type = CAL_COMPONENT_NO_TYPE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (comp_str);</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_uids:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- *</div><div class='del'>- * Builds a list of unique identifiers corresponding to calendar objects whose</div><div class='del'>- * type matches one of the types specified in the @type flags.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of strings that are the sought UIDs.  The list should be</div><div class='del'>- * freed using the cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_uids (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_uids != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_uids) (backend, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_objects_in_range:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * </div><div class='del'>- * Builds a list of unique identifiers corresponding to calendar objects of the</div><div class='del'>- * specified type that occur or recur within the specified time range.</div><div class='del'>- * </div><div class='del'>- * Return value: A list of UID strings.  The list should be freed using the</div><div class='del'>- * cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-				  time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_objects_in_range != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_objects_in_range) (backend, type, start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_free_busy:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @users: List of users to get free/busy information for.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * </div><div class='del'>- * Gets a free/busy object for the given time interval</div><div class='del'>- * </div><div class='del'>- * Return value: a list of CalObj's</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_free_busy != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_free_busy) (backend, users, start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_changes:</div><div class='del'>- * @backend: A calendar backend</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @change_id: A unique uid for the callers change list</div><div class='del'>- * </div><div class='del'>- * Builds a sequence of objects and the type of change that occurred on them since</div><div class='del'>- * the last time the give change_id was seen</div><div class='del'>- * </div><div class='del'>- * Return value: A list of the objects that changed and the type of change</div><div class='del'>- **/</div><div class='del'>-GNOME_Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-cal_backend_get_changes (CalBackend *backend, CalObjType type, const char *change_id) </div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (change_id != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_changes != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_changes) (backend, type, change_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_alarms_in_range:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * @valid_range: Return value that says whether the range is valid or not.</div><div class='del'>- * </div><div class='del'>- * Builds a sorted list of the alarms that trigger in the specified time range.</div><div class='del'>- * </div><div class='del'>- * Return value: A sequence of component alarm instances structures, or NULL</div><div class='del'>- * if @valid_range returns FALSE.</div><div class='del'>- **/</div><div class='del'>-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *</div><div class='del'>-cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end,</div><div class='del'>-				 gboolean *valid_range)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (valid_range != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_alarms_in_range != NULL);</div><div class='del'>-</div><div class='del'>-	if (!(start != -1 &amp;&amp; end != -1 &amp;&amp; start &lt;= end)) {</div><div class='del'>-		*valid_range = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		*valid_range = TRUE;</div><div class='del'>-		return (* CLASS (backend)-&gt;get_alarms_in_range) (backend, start, end);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_alarms_for_object:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier for a calendar object.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * @result: Return value for the result code for the operation.</div><div class='del'>- * </div><div class='del'>- * Builds a sorted list of the alarms of the specified event that trigger in a</div><div class='del'>- * particular time range.</div><div class='del'>- * </div><div class='del'>- * Return value: A structure of the component's alarm instances, or NULL if @result</div><div class='del'>- * returns something other than #CAL_BACKEND_GET_ALARMS_SUCCESS.</div><div class='del'>- **/</div><div class='del'>-GNOME_Evolution_Calendar_CalComponentAlarms *</div><div class='del'>-cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-				   time_t start, time_t end,</div><div class='del'>-				   CalBackendGetAlarmsForObjectResult *result)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (result != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_alarms_for_object != NULL);</div><div class='del'>-</div><div class='del'>-	if (!(start != -1 &amp;&amp; end != -1 &amp;&amp; start &lt;= end)) {</div><div class='del'>-		*result = CAL_BACKEND_GET_ALARMS_INVALID_RANGE;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		gboolean object_found;</div><div class='del'>-		GNOME_Evolution_Calendar_CalComponentAlarms *alarms;</div><div class='del'>-</div><div class='del'>-		alarms = (* CLASS (backend)-&gt;get_alarms_for_object) (backend, uid, start, end,</div><div class='del'>-								     &amp;object_found);</div><div class='del'>-</div><div class='del'>-		if (object_found)</div><div class='del'>-			*result = CAL_BACKEND_GET_ALARMS_SUCCESS;</div><div class='del'>-		else</div><div class='del'>-			*result = CAL_BACKEND_GET_ALARMS_NOT_FOUND;</div><div class='del'>-</div><div class='del'>-		return alarms;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_update_objects:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @calobj: String representation of the new calendar object(s).</div><div class='del'>- * </div><div class='del'>- * Updates an object in a calendar backend.  It will replace any existing</div><div class='del'>- * object that has the same UID as the specified one.  The backend will in</div><div class='del'>- * turn notify all of its clients about the change.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE on being passed an invalid object or one</div><div class='del'>- * with an unsupported type.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_update_objects (CalBackend *backend, const char *calobj)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-	g_return_val_if_fail (calobj != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;update_objects != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;update_objects) (backend, calobj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_remove_object:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier of the object to remove.</div><div class='del'>- * </div><div class='del'>- * Removes an object in a calendar backend.  The backend will notify all of its</div><div class='del'>- * clients about the change.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE on being passed an UID for an object</div><div class='del'>- * that does not exist in the backend.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_remove_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;remove_object != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;remove_object) (backend, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_last_client_gone:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * </div><div class='del'>- * Emits the "last_client_gone" signal of a calendar backend.  This function is</div><div class='del'>- * to be used only by backend implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_last_client_gone (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[LAST_CLIENT_GONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_opened:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @status: Open status code.</div><div class='del'>- * </div><div class='del'>- * Emits the "opened" signal of a calendar backend.  This function is to be used</div><div class='del'>- * only by backend implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_opened (CalBackend *backend, CalBackendOpenStatus status)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OPENED],</div><div class='del'>-			 status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_obj_updated:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier of the component that was updated.</div><div class='del'>- * </div><div class='del'>- * Emits the "obj_updated" signal of a calendar backend.  This function is to be</div><div class='del'>- * used only by backend implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_obj_updated (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OBJ_UPDATED],</div><div class='del'>-			 uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_obj_removed:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @uid: Unique identifier of the component that was removed.</div><div class='del'>- * </div><div class='del'>- * Emits the "obj_removed" signal of a calendar backend.  This function is to be</div><div class='del'>- * used only by backend implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_obj_removed (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[OBJ_REMOVED],</div><div class='del'>-			 uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_timezone:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @tzid: Unique identifier of a VTIMEZONE object. Note that this must not be</div><div class='del'>- * NULL.</div><div class='del'>- * </div><div class='del'>- * Returns the icaltimezone* corresponding to the TZID, or NULL if the TZID</div><div class='del'>- * can't be found.</div><div class='del'>- * </div><div class='del'>- * Returns: The icaltimezone* corresponding to the given TZID, or NULL.</div><div class='del'>- **/</div><div class='del'>-icaltimezone*</div><div class='del'>-cal_backend_get_timezone (CalBackend *backend, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (tzid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_timezone != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_timezone) (backend, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_default_timezone:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * </div><div class='del'>- * Returns the default timezone for the calendar, which is used to resolve</div><div class='del'>- * DATE and floating DATE-TIME values.</div><div class='del'>- * </div><div class='del'>- * Returns: The default icaltimezone* for the calendar.</div><div class='del'>- **/</div><div class='del'>-icaltimezone*</div><div class='del'>-cal_backend_get_default_timezone (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_default_timezone != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_default_timezone) (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_set_default_timezone:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @tzid: The TZID identifying the timezone.</div><div class='del'>- * </div><div class='del'>- * Sets the default timezone for the calendar, which is used to resolve</div><div class='del'>- * DATE and floating DATE-TIME values.</div><div class='del'>- * </div><div class='del'>- * Returns: TRUE if the VTIMEZONE data for the timezone was found, or FALSE if</div><div class='del'>- * not.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_set_default_timezone (CalBackend *backend, const char *tzid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-	g_return_val_if_fail (tzid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;set_default_timezone != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;set_default_timezone) (backend, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h<br/>deleted file mode 100644<br/>index 4fd0a42bd0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-backend.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,189 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - generic backend class</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_BACKEND_H</div><div class='del'>-#define CAL_BACKEND_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-util.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-#include "cal-common.h"</div><div class='del'>-#include "cal.h"</div><div class='del'>-#include "query.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_BACKEND_TYPE            (cal_backend_get_type ())</div><div class='del'>-#define CAL_BACKEND(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_TYPE, CalBackend))</div><div class='del'>-#define CAL_BACKEND_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_TYPE,		\</div><div class='del'>-				     CalBackendClass))</div><div class='del'>-#define IS_CAL_BACKEND(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_TYPE))</div><div class='del'>-#define IS_CAL_BACKEND_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_TYPE))</div><div class='del'>-</div><div class='del'>-/* Open status values */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_BACKEND_OPEN_SUCCESS,	/* Loading OK */</div><div class='del'>-	CAL_BACKEND_OPEN_ERROR,		/* We need better error reporting in libversit */</div><div class='del'>-	CAL_BACKEND_OPEN_NOT_FOUND</div><div class='del'>-} CalBackendOpenStatus;</div><div class='del'>-</div><div class='del'>-/* Result codes for ::get_alarms_in_range() */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_BACKEND_GET_ALARMS_SUCCESS,</div><div class='del'>-	CAL_BACKEND_GET_ALARMS_NOT_FOUND,</div><div class='del'>-	CAL_BACKEND_GET_ALARMS_INVALID_RANGE</div><div class='del'>-} CalBackendGetAlarmsForObjectResult;</div><div class='del'>-</div><div class='del'>-struct _CalBackend {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	GList *clients;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalBackendClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* last_client_gone) (CalBackend *backend);</div><div class='del'>-	void (* cal_added) (CalBackend *backend, Cal *cal);</div><div class='del'>-</div><div class='del'>-	void (* opened) (CalBackend *backend, CalBackendOpenStatus status);</div><div class='del'>-	void (* obj_updated) (CalBackend *backend, const char *uid);</div><div class='del'>-	void (* obj_removed) (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	const char *(* get_uri) (CalBackend *backend);</div><div class='del'>-</div><div class='del'>-	CalBackendOpenStatus (* open) (CalBackend *backend, const char *uristr,</div><div class='del'>-				       gboolean only_if_exists);</div><div class='del'>-</div><div class='del'>-	gboolean (* is_loaded) (CalBackend *backend);</div><div class='del'>-</div><div class='del'>-	Query *(* get_query) (CalBackend *backend,</div><div class='del'>-			      GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-			      const char *sexp);</div><div class='del'>-</div><div class='del'>-	/* Mode relate virtual methods */</div><div class='del'>-	CalMode (* get_mode) (CalBackend *backend);</div><div class='del'>-	void    (* set_mode) (CalBackend *backend, CalMode mode);	</div><div class='del'>-</div><div class='del'>-	/* General object acquirement and information related virtual methods */</div><div class='del'>-	int (* get_n_objects) (CalBackend *backend, CalObjType type);</div><div class='del'>-	char *(* get_object) (CalBackend *backend, const char *uid);</div><div class='del'>-	CalComponent *(* get_object_component) (CalBackend *backend, const char *uid);</div><div class='del'>-	char *(* get_timezone_object) (CalBackend *backend, const char *tzid);</div><div class='del'>-	GList *(* get_uids) (CalBackend *backend, CalObjType type);</div><div class='del'>-</div><div class='del'>-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,</div><div class='del'>-					 time_t start, time_t end);</div><div class='del'>-	GList *(* get_free_busy) (CalBackend *backend, GList *users, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-	/* Change related virtual methods */</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjChangeSeq * (* get_changes) (</div><div class='del'>-		CalBackend *backend, CalObjType type, const char *change_id);</div><div class='del'>-</div><div class='del'>-	/* Alarm related virtual methods */</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *(* get_alarms_in_range) (</div><div class='del'>-		CalBackend *backend, time_t start, time_t end);</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarms *(* get_alarms_for_object) (</div><div class='del'>-		CalBackend *backend, const char *uid,</div><div class='del'>-		time_t start, time_t end, gboolean *object_found);</div><div class='del'>-</div><div class='del'>-	/* Object manipulation virtual methods */</div><div class='del'>-	gboolean (* update_objects) (CalBackend *backend, const char *calobj);</div><div class='del'>-	gboolean (* remove_object) (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-	/* Timezone related virtual methods */</div><div class='del'>-	icaltimezone *(* get_timezone) (CalBackend *backend, const char *tzid);</div><div class='del'>-	icaltimezone *(* get_default_timezone) (CalBackend *backend);</div><div class='del'>-	gboolean (* set_default_timezone) (CalBackend *backend, const char *tzid);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType cal_backend_get_type (void);</div><div class='del'>-</div><div class='del'>-const char *cal_backend_get_uri (CalBackend *backend);</div><div class='del'>-</div><div class='del'>-void cal_backend_add_cal (CalBackend *backend, Cal *cal);</div><div class='del'>-</div><div class='del'>-CalBackendOpenStatus cal_backend_open (CalBackend *backend, const char *uristr,</div><div class='del'>-				       gboolean only_if_exists);</div><div class='del'>-</div><div class='del'>-gboolean cal_backend_is_loaded (CalBackend *backend);</div><div class='del'>-</div><div class='del'>-Query *cal_backend_get_query (CalBackend *backend,</div><div class='del'>-			      GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-			      const char *sexp);</div><div class='del'>-</div><div class='del'>-CalMode cal_backend_get_mode (CalBackend *backend);</div><div class='del'>-void cal_backend_set_mode (CalBackend *backend, CalMode mode);</div><div class='del'>-</div><div class='del'>-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);</div><div class='del'>-</div><div class='del'>-char *cal_backend_get_object (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_backend_get_object_component (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-gboolean cal_backend_set_default_timezone (CalBackend *backend, const char *tzid);</div><div class='del'>-</div><div class='del'>-char *cal_backend_get_timezone_object (CalBackend *backend, const char *tzid);</div><div class='del'>-</div><div class='del'>-CalObjType cal_backend_get_type_by_uid (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-					 time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_free_busy (CalBackend *backend, GList *users, time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Calendar_CalObjChangeSeq * cal_backend_get_changes (</div><div class='del'>-	CalBackend *backend, CalObjType type, const char *change_id);</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Calendar_CalComponentAlarmsSeq *cal_backend_get_alarms_in_range (</div><div class='del'>-	CalBackend *backend, time_t start, time_t end, gboolean *valid_range);</div><div class='del'>-</div><div class='del'>-GNOME_Evolution_Calendar_CalComponentAlarms *cal_backend_get_alarms_for_object (</div><div class='del'>-	CalBackend *backend, const char *uid,</div><div class='del'>-	time_t start, time_t end,</div><div class='del'>-	CalBackendGetAlarmsForObjectResult *result);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean cal_backend_update_objects (CalBackend *backend, const char *calobj);</div><div class='del'>-</div><div class='del'>-gboolean cal_backend_remove_object (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-icaltimezone* cal_backend_get_timezone (CalBackend *backend, const char *tzid);</div><div class='del'>-icaltimezone* cal_backend_get_default_timezone (CalBackend *backend);</div><div class='del'>-</div><div class='del'>-void cal_backend_last_client_gone (CalBackend *backend);</div><div class='del'>-void cal_backend_opened (CalBackend *backend, CalBackendOpenStatus status);</div><div class='del'>-void cal_backend_obj_updated (CalBackend *backend, const char *uid);</div><div class='del'>-void cal_backend_obj_removed (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h<br/>deleted file mode 100644<br/>index 228a67fcfe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-common.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-common.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* Evolution calendar server - common declarations</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_COMMON_H</div><div class='del'>-#define CAL_COMMON_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackend CalBackend;</div><div class='del'>-typedef struct _CalBackendClass CalBackendClass;</div><div class='del'>-</div><div class='del'>-typedef struct _Cal Cal;</div><div class='del'>-typedef struct _CalClass CalClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c<br/>deleted file mode 100644<br/>index 1df133ea90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,820 +0,0 @@</div><div class='del'>-/* Evolution calendar factory</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include "e-util/e-url.h"</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-#include "cal.h"</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-#include "cal-factory.h"</div><div class='del'>-#include "job.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE                BONOBO_X_OBJECT_TYPE</div><div class='del'>-#define DEFAULT_CAL_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_CalendarFactory"</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* Private part of the CalFactory structure */</div><div class='del'>-struct _CalFactoryPrivate {</div><div class='del'>-	/* Hash table from URI method strings to GtkType * for backend class types */</div><div class='del'>-	GHashTable *methods;</div><div class='del'>-</div><div class='del'>-	/* Hash table from GnomeVFSURI structures to CalBackend objects */</div><div class='del'>-	GHashTable *backends;</div><div class='del'>-</div><div class='del'>-	/* OAFIID of the factory */</div><div class='del'>-	char *iid;</div><div class='del'>-</div><div class='del'>-	/* Whether we have been registered with OAF yet */</div><div class='del'>-	guint registered : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;	</div><div class='del'>-	GNOME_Evolution_Calendar_CalMode mode;	</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *list;</div><div class='del'>-} CalFactoryUriData;</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum SIGNALS {</div><div class='del'>-	LAST_CALENDAR_GONE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-/* Frees a method/GtkType * pair from the methods hash table */</div><div class='del'>-static void</div><div class='del'>-free_method (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *method;</div><div class='del'>-	GtkType *type;</div><div class='del'>-</div><div class='del'>-	method = key;</div><div class='del'>-	type = value;</div><div class='del'>-</div><div class='del'>-	g_free (method);</div><div class='del'>-	g_free (type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees a uri/backend pair from the backends hash table */</div><div class='del'>-static void</div><div class='del'>-free_backend (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	uri = key;</div><div class='del'>-	backend = value;</div><div class='del'>-</div><div class='del'>-	g_free (uri);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Opening calendars */</div><div class='del'>-</div><div class='del'>-/* Looks up a calendar backend in a factory's hash table of uri-&gt;cal.  If</div><div class='del'>- * *non-NULL, orig_uri_return will be set to point to the original key in the</div><div class='del'>- * *hash table.</div><div class='del'>- */</div><div class='del'>-static CalBackend *</div><div class='del'>-lookup_backend (CalFactory *factory, const char *uristr, char **orig_uri_return)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	char *tmp;</div><div class='del'>-	gboolean found;</div><div class='del'>-	gpointer orig_key;</div><div class='del'>-	gpointer data;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (uristr);</div><div class='del'>-	if (!uri) {</div><div class='del'>-		if (orig_uri_return)</div><div class='del'>-			*orig_uri_return = NULL;</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp = e_uri_to_string (uri, FALSE);</div><div class='del'>-	found = g_hash_table_lookup_extended (priv-&gt;backends, tmp, &amp;orig_key, &amp;data);</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	if (found) {</div><div class='del'>-		if (orig_uri_return)</div><div class='del'>-			*orig_uri_return = orig_key;</div><div class='del'>-</div><div class='del'>-		return CAL_BACKEND (data);</div><div class='del'>-	} else {</div><div class='del'>-		if (orig_uri_return)</div><div class='del'>-			*orig_uri_return = FALSE;</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a backend loses its last connected client */</div><div class='del'>-static void</div><div class='del'>-backend_last_client_gone_cb (CalBackend *backend, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalBackend *ret_backend;</div><div class='del'>-	const char *uristr;</div><div class='del'>-	char *orig_uristr;</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");</div><div class='del'>-</div><div class='del'>-	factory = CAL_FACTORY (data);</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove the backend from the hash table */</div><div class='del'>-</div><div class='del'>-	uristr = cal_backend_get_uri (backend);</div><div class='del'>-	g_assert (uristr != NULL);</div><div class='del'>-</div><div class='del'>-	ret_backend = lookup_backend (factory, uristr, &amp;orig_uristr);</div><div class='del'>-	g_assert (ret_backend != NULL);</div><div class='del'>-	g_assert (ret_backend == backend);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;backends, orig_uristr);</div><div class='del'>-	g_free (orig_uristr);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-	/* Notify upstream if there are no more backends */</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_size (priv-&gt;backends) == 0)</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (factory), signals[LAST_CALENDAR_GONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds a backend to the calendar factory's hash table */</div><div class='del'>-static void</div><div class='del'>-add_backend (CalFactory *factory, const char *uristr, CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	EUri *uri;</div><div class='del'>-	char *tmp;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (uristr);</div><div class='del'>-	if (!uri)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	tmp = e_uri_to_string (uri, FALSE);</div><div class='del'>-	g_hash_table_insert (priv-&gt;backends, tmp, backend);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",</div><div class='del'>-			    GTK_SIGNAL_FUNC (backend_last_client_gone_cb),</div><div class='del'>-			    factory);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Tries to launch a backend for the method of the specified URI.  If there is</div><div class='del'>- * no such method registered in the factory, it sends the listener the</div><div class='del'>- * MethodNotSupported error code.</div><div class='del'>- */</div><div class='del'>-static CalBackend *</div><div class='del'>-launch_backend_for_uri (CalFactory *factory,</div><div class='del'>-			const char *uristr,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	const char *method;</div><div class='del'>-	GtkType *type;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	EUri *uri;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (uristr);</div><div class='del'>-	if (!uri)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	method = uri-&gt;protocol;</div><div class='del'>-	type = g_hash_table_lookup (priv-&gt;methods, method);</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("launch_backend_for_uri(): could not notify the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	backend = gtk_type_new (*type);</div><div class='del'>-	if (!backend)</div><div class='del'>-		g_message ("launch_backend_for_uri(): could not launch the backend");</div><div class='del'>-</div><div class='del'>-	return backend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Opens a calendar backend and puts it in the factory's backend hash table */</div><div class='del'>-static CalBackend *</div><div class='del'>-open_backend (CalFactory *factory, const char *uristr, gboolean only_if_exists,</div><div class='del'>-	      GNOME_Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CalBackendOpenStatus status;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	backend = launch_backend_for_uri (factory, uristr, listener);</div><div class='del'>-	if (!backend)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	status = cal_backend_open (backend, uristr, only_if_exists);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_BACKEND_OPEN_SUCCESS:</div><div class='del'>-		add_backend (factory, uristr, backend);</div><div class='del'>-		return backend;</div><div class='del'>-</div><div class='del'>-	case CAL_BACKEND_OPEN_ERROR:</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener_ERROR,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("open_backend(): could not notify the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_BACKEND_OPEN_NOT_FOUND:</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener_NOT_FOUND,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("open_backend(): could not notify the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds a listener to a calendar backend by creating a calendar client interface</div><div class='del'>- * object.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_calendar_client (CalFactory *factory,</div><div class='del'>-		     CalBackend *backend,</div><div class='del'>-		     GNOME_Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	cal = cal_new (backend, listener);</div><div class='del'>-	if (!cal) {</div><div class='del'>-		g_message ("add_calendar_client(): could not create the calendar client interface");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener_ERROR,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("add_calendar_client(): could not notify the listener");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_backend_add_cal (backend, cal);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-		listener,</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_SUCCESS,</div><div class='del'>-		BONOBO_OBJREF (cal),</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("add_calendar_client(): could not notify the listener");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (cal));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add a uri to a string list */</div><div class='del'>-static void</div><div class='del'>-add_uri (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalFactoryUriData *cfud = data;</div><div class='del'>-	CalFactory *factory = cfud-&gt;factory;	</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *list = cfud-&gt;list;</div><div class='del'>-	GNOME_Evolution_Calendar_CalMode mode = cfud-&gt;mode;</div><div class='del'>-	char *uri_string = key;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case GNOME_Evolution_Calendar_MODE_LOCAL:</div><div class='del'>-		backend = lookup_backend (factory, uri_string, NULL);</div><div class='del'>-		if (backend == NULL || cal_backend_get_mode (backend) != CAL_MODE_LOCAL)</div><div class='del'>-			return;</div><div class='del'>-		break;		</div><div class='del'>-	case GNOME_Evolution_Calendar_MODE_REMOTE:</div><div class='del'>-		backend = lookup_backend (factory, uri_string, NULL);</div><div class='del'>-		if (backend == NULL || cal_backend_get_mode (backend) != CAL_MODE_REMOTE)</div><div class='del'>-			return;</div><div class='del'>-		break;		</div><div class='del'>-	case GNOME_Evolution_Calendar_MODE_ANY:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	list-&gt;_buffer[list-&gt;_length] = CORBA_string_dup (uri_string);</div><div class='del'>-	list-&gt;_length++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Job data */</div><div class='del'>-typedef struct {</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	char *uri;</div><div class='del'>-	gboolean only_if_exists;</div><div class='del'>-	GNOME_Evolution_Calendar_Listener listener;</div><div class='del'>-} OpenJobData;</div><div class='del'>-</div><div class='del'>-/* Job handler for the open calendar command */</div><div class='del'>-static void</div><div class='del'>-open_fn (gpointer data)</div><div class='del'>-{</div><div class='del'>-	OpenJobData *jd;</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	gboolean only_if_exists;</div><div class='del'>-	GNOME_Evolution_Calendar_Listener listener;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *uri_string;</div><div class='del'>-</div><div class='del'>-	jd = data;</div><div class='del'>-	g_assert (jd-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	/* Check the URI */</div><div class='del'>-	uri_string = g_strdup (jd-&gt;uri);</div><div class='del'>-	g_free (jd-&gt;uri);</div><div class='del'>-</div><div class='del'>-	only_if_exists = jd-&gt;only_if_exists;</div><div class='del'>-	factory = jd-&gt;factory;</div><div class='del'>-	listener = jd-&gt;listener;</div><div class='del'>-	g_free (jd);</div><div class='del'>-</div><div class='del'>-	if (!uri_string) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_Listener_notifyCalOpened (</div><div class='del'>-			listener,</div><div class='del'>-			GNOME_Evolution_Calendar_Listener_ERROR,</div><div class='del'>-			CORBA_OBJECT_NIL,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-			g_message ("open_fn(): Could not notify the listener!");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look up the backend and create it if needed */</div><div class='del'>-</div><div class='del'>-	backend = lookup_backend (factory, uri_string, NULL);</div><div class='del'>-</div><div class='del'>-	if (!backend)</div><div class='del'>-		backend = open_backend (factory, uri_string, only_if_exists, listener);</div><div class='del'>-</div><div class='del'>-	if (backend)</div><div class='del'>-		add_calendar_client (factory, backend, listener);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("open_fn(): could not release the listener");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_CalFactory_open (PortableServer_Servant servant,</div><div class='del'>-		      const CORBA_char *str_uri,</div><div class='del'>-		      CORBA_boolean only_if_exists,</div><div class='del'>-		      GNOME_Evolution_Calendar_Listener listener,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CORBA_Environment ev2;</div><div class='del'>-	gboolean result;</div><div class='del'>-	OpenJobData *jd;</div><div class='del'>-	GNOME_Evolution_Calendar_Listener listener_copy;</div><div class='del'>-	GtkType *type;</div><div class='del'>-	EUri *uri;</div><div class='del'>-</div><div class='del'>-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* check URI to see if we support it */</div><div class='del'>-</div><div class='del'>-	uri = e_uri_new (str_uri);</div><div class='del'>-	if (!uri) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_CalFactory_InvalidURI,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	type = g_hash_table_lookup (priv-&gt;methods, uri-&gt;protocol);</div><div class='del'>-</div><div class='del'>-	e_uri_free (uri);</div><div class='del'>-	if (!type) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	/* duplicate the listener object */</div><div class='del'>-	CORBA_exception_init (&amp;ev2);</div><div class='del'>-	result = CORBA_Object_is_nil (listener, &amp;ev2);</div><div class='del'>-</div><div class='del'>-	if (ev2._major != CORBA_NO_EXCEPTION || result) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,</div><div class='del'>-				     NULL);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev2);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev2);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev2);</div><div class='del'>-	listener_copy = CORBA_Object_duplicate (listener, &amp;ev2);</div><div class='del'>-</div><div class='del'>-	if (ev2._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("CalFactory_open(): could not duplicate the listener");</div><div class='del'>-		CORBA_exception_free (&amp;ev2);</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Calendar_CalFactory_NilListener,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev2);</div><div class='del'>-</div><div class='del'>-	/* add new asynchronous job */</div><div class='del'>-	jd = g_new (OpenJobData, 1);</div><div class='del'>-	jd-&gt;factory = factory;</div><div class='del'>-	jd-&gt;uri = g_strdup (str_uri);</div><div class='del'>-	jd-&gt;only_if_exists = only_if_exists;</div><div class='del'>-	jd-&gt;listener = listener_copy;</div><div class='del'>-</div><div class='del'>-	job_add (open_fn, jd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_StringSeq *</div><div class='del'>-impl_CalFactory_uriList (PortableServer_Servant servant,</div><div class='del'>-			 GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-			 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	CalFactoryUriData cfud;</div><div class='del'>-	GNOME_Evolution_Calendar_StringSeq *list;</div><div class='del'>-</div><div class='del'>-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	list = GNOME_Evolution_Calendar_StringSeq__alloc ();</div><div class='del'>-	list-&gt;_length = 0;</div><div class='del'>-	list-&gt;_maximum = g_hash_table_size (priv-&gt;backends); </div><div class='del'>-	list-&gt;_buffer = CORBA_sequence_CORBA_string_allocbuf (list-&gt;_maximum);</div><div class='del'>-</div><div class='del'>-	cfud.factory = factory;	</div><div class='del'>-	cfud.mode = mode;	</div><div class='del'>-	cfud.list = list;</div><div class='del'>-	g_hash_table_foreach (priv-&gt;backends, add_uri, &amp;cfud);</div><div class='del'>-	</div><div class='del'>-	return list;	</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_new:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Creates a new #CalFactory object.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created #CalFactory, or NULL if its corresponding CORBA</div><div class='del'>- * object could not be created.</div><div class='del'>- **/</div><div class='del'>-CalFactory *</div><div class='del'>-cal_factory_new (void)</div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-</div><div class='del'>-	factory = gtk_type_new (CAL_FACTORY_TYPE);</div><div class='del'>-</div><div class='del'>-	return factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar */</div><div class='del'>-static void</div><div class='del'>-cal_factory_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalFactory *factory;</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_FACTORY (object));</div><div class='del'>-</div><div class='del'>-	factory = CAL_FACTORY (object);</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;methods, free_method, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;methods);</div><div class='del'>-	priv-&gt;methods = NULL;</div><div class='del'>-</div><div class='del'>-	/* Should we assert that there are no more backends? */</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;backends, free_backend, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;backends);</div><div class='del'>-	priv-&gt;backends = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;registered) {</div><div class='del'>-		oaf_active_server_unregister (priv-&gt;iid, BONOBO_OBJREF (factory));</div><div class='del'>-		priv-&gt;registered = FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (priv-&gt;iid);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	factory-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar factory */</div><div class='del'>-static void</div><div class='del'>-cal_factory_class_init (CalFactoryClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	POA_GNOME_Evolution_Calendar_CalFactory__epv *epv = &amp;klass-&gt;epv;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	signals[LAST_CALENDAR_GONE] =</div><div class='del'>-		gtk_signal_new ("last_calendar_gone",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (CalFactoryClass, last_calendar_gone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	/* Class method overrides */</div><div class='del'>-	object_class-&gt;destroy = cal_factory_destroy;</div><div class='del'>-</div><div class='del'>-	/* Epv methods */</div><div class='del'>-	epv-&gt;open = impl_CalFactory_open;</div><div class='del'>-	epv-&gt;uriList = impl_CalFactory_uriList;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar factory */</div><div class='del'>-static void</div><div class='del'>-cal_factory_init (CalFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalFactoryPrivate, 1);</div><div class='del'>-	factory-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;methods = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;backends = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;registered = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (CalFactory,</div><div class='del'>-			 GNOME_Evolution_Calendar_CalFactory,</div><div class='del'>-			 PARENT_TYPE,</div><div class='del'>-			 cal_factory);</div><div class='del'>-</div><div class='del'>-/* Returns the lowercase version of a string */</div><div class='del'>-static char *</div><div class='del'>-str_tolower (const char *s)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	unsigned char *p;</div><div class='del'>-</div><div class='del'>-	str = g_strdup (s);</div><div class='del'>-	for (p = str; *p; p++)</div><div class='del'>-		if (isalpha (*p))</div><div class='del'>-			*p = tolower (*p);</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_oaf_register:</div><div class='del'>- * @factory: A calendar factory.</div><div class='del'>- * @iid: OAFIID for the factory to be registered.</div><div class='del'>- * </div><div class='del'>- * Registers a calendar factory with the OAF object activation daemon.  This</div><div class='del'>- * function must be called before any clients can activate the factory.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_factory_oaf_register (CalFactory *factory, const char *iid)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	OAF_RegistrationResult result;</div><div class='del'>-	char *tmp_iid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (factory != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_FACTORY (factory), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (!priv-&gt;registered, FALSE);</div><div class='del'>-</div><div class='del'>-	/* if iid is NULL, use the default factory OAFIID */</div><div class='del'>-	if (iid)</div><div class='del'>-		tmp_iid = g_strdup (iid);</div><div class='del'>-	else</div><div class='del'>-		tmp_iid = g_strdup (DEFAULT_CAL_FACTORY_OAF_ID);</div><div class='del'>-</div><div class='del'>-	result = oaf_active_server_register (tmp_iid, BONOBO_OBJREF (factory));</div><div class='del'>-</div><div class='del'>-	switch (result) {</div><div class='del'>-	case OAF_REG_SUCCESS:</div><div class='del'>-		priv-&gt;registered = TRUE;</div><div class='del'>-		priv-&gt;iid = tmp_iid;</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	case OAF_REG_NOT_LISTED:</div><div class='del'>-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "</div><div class='del'>-			   "not listed");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case OAF_REG_ALREADY_ACTIVE:</div><div class='del'>-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "</div><div class='del'>-			   "already active");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case OAF_REG_ERROR:</div><div class='del'>-	default:</div><div class='del'>-		g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: "</div><div class='del'>-			   "generic error");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (tmp_iid);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_register_method:</div><div class='del'>- * @factory: A calendar factory.</div><div class='del'>- * @method: Method for the URI, i.e. "http", "file", etc.</div><div class='del'>- * @backend_type: Class type of the backend to create for this @method.</div><div class='del'>- * </div><div class='del'>- * Registers the type of a #CalBackend subclass that will be used to handle URIs</div><div class='del'>- * with a particular method.  When the factory is asked to open a particular</div><div class='del'>- * URI, it will look in its list of registered methods and create a backend of</div><div class='del'>- * the appropriate type.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-	GtkType *type;</div><div class='del'>-	char *method_str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (factory != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_FACTORY (factory));</div><div class='del'>-	g_return_if_fail (method != NULL);</div><div class='del'>-	g_return_if_fail (backend_type != 0);</div><div class='del'>-	g_return_if_fail (gtk_type_is_a (backend_type, CAL_BACKEND_TYPE));</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	method_str = str_tolower (method);</div><div class='del'>-</div><div class='del'>-	type = g_hash_table_lookup (priv-&gt;methods, method_str);</div><div class='del'>-	if (type) {</div><div class='del'>-		g_message ("cal_factory_register_method(): Method `%s' already registered!",</div><div class='del'>-			   method_str);</div><div class='del'>-		g_free (method_str);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	type = g_new (GtkType, 1);</div><div class='del'>-	*type = backend_type;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;methods, method_str, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_get_n_backends:</div><div class='del'>- * @factory: A calendar factory.</div><div class='del'>- * </div><div class='del'>- * Queries the number of running calendar backends in a calendar factory.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of running backends.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-cal_factory_get_n_backends (CalFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (factory != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_FACTORY (factory), -1);</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-	return g_hash_table_size (priv-&gt;backends);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees a uri/backend pair from the backends hash table */</div><div class='del'>-static void</div><div class='del'>-dump_backend (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uri;</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	uri = key;</div><div class='del'>-	backend = value;</div><div class='del'>-</div><div class='del'>-	g_message ("  %s: %p", uri, backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-cal_factory_dump_active_backends   (CalFactory *factory)</div><div class='del'>-{</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_message ("Active PCS backends");</div><div class='del'>-</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-	g_hash_table_foreach (priv-&gt;backends, dump_backend, NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h<br/>deleted file mode 100644<br/>index 46a66ed9a0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* Evolution calendar factory</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_FACTORY_H</div><div class='del'>-#define CAL_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_FACTORY_TYPE            (cal_factory_get_type ())</div><div class='del'>-#define CAL_FACTORY(obj)            (GTK_CHECK_CAST ((obj), CAL_FACTORY_TYPE, CalFactory))</div><div class='del'>-#define CAL_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_FACTORY_TYPE,		\</div><div class='del'>-				     CalFactoryClass))</div><div class='del'>-#define IS_CAL_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), CAL_FACTORY_TYPE))</div><div class='del'>-#define IS_CAL_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_FACTORY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalFactory CalFactory;</div><div class='del'>-typedef struct _CalFactoryClass CalFactoryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalFactoryPrivate CalFactoryPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalFactory {</div><div class='del'>-	BonoboXObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalFactoryPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalFactoryClass {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	POA_GNOME_Evolution_Calendar_CalFactory__epv epv;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* last_calendar_gone) (CalFactory *factory);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType     cal_factory_get_type        (void);</div><div class='del'>-CalFactory *cal_factory_new             (void);</div><div class='del'>-</div><div class='del'>-gboolean    cal_factory_oaf_register    (CalFactory *factory, const char *iid);</div><div class='del'>-void        cal_factory_register_method (CalFactory *factory,</div><div class='del'>-					 const char *method,</div><div class='del'>-					 GtkType     backend_type);</div><div class='del'>-int         cal_factory_get_n_backends  (CalFactory *factory);</div><div class='del'>-void        cal_factory_dump_active_backends   (CalFactory *factory);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c<br/>deleted file mode 100644<br/>index 5225b5680e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,871 +0,0 @@</div><div class='del'>-/* Evolution calendar client interface object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include "cal.h"</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-#include "query.h"</div><div class='del'>-#include "wombat.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE         BONOBO_X_OBJECT_TYPE</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/* Private part of the Cal structure */</div><div class='del'>-struct _CalPrivate {</div><div class='del'>-	/* Our backend */</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	/* Listener on the client we notify */</div><div class='del'>-	GNOME_Evolution_Calendar_Listener listener;</div><div class='del'>-</div><div class='del'>-	/* A reference to the WombatClient interface */</div><div class='del'>-	GNOME_Evolution_WombatClient wombat_client;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Cal::get_uri method */</div><div class='del'>-static CORBA_char *</div><div class='del'>-impl_Cal_get_uri (PortableServer_Servant servant,</div><div class='del'>-	     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	const char *str_uri;</div><div class='del'>-	CORBA_char *str_uri_copy;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	str_uri = cal_backend_get_uri (priv-&gt;backend);</div><div class='del'>-	str_uri_copy = CORBA_string_dup (str_uri);</div><div class='del'>-</div><div class='del'>-	return str_uri_copy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts a calendar object type from its CORBA representation to our own</div><div class='del'>- * representation.</div><div class='del'>- */</div><div class='del'>-static CalObjType</div><div class='del'>-uncorba_obj_type (GNOME_Evolution_Calendar_CalObjType type)</div><div class='del'>-{</div><div class='del'>-	return (((type &amp; GNOME_Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)</div><div class='del'>-		| ((type &amp; GNOME_Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)</div><div class='del'>-		| ((type &amp; GNOME_Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Cal_set_mode (PortableServer_Servant servant,</div><div class='del'>-		   GNOME_Evolution_Calendar_CalMode mode,</div><div class='del'>-		   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_backend_set_mode (priv-&gt;backend, mode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_n_objects method */</div><div class='del'>-static CORBA_long</div><div class='del'>-impl_Cal_get_n_objects (PortableServer_Servant servant,</div><div class='del'>-			GNOME_Evolution_Calendar_CalObjType type,</div><div class='del'>-			CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	int t;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-	n = cal_backend_get_n_objects (priv-&gt;backend, t);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_object method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObj</div><div class='del'>-impl_Cal_get_object (PortableServer_Servant servant,</div><div class='del'>-		     const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-		     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	char *calobj;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	calobj = cal_backend_get_object (priv-&gt;backend, uid);</div><div class='del'>-</div><div class='del'>-	if (calobj) {</div><div class='del'>-		CORBA_char *calobj_copy;</div><div class='del'>-</div><div class='del'>-		calobj_copy = CORBA_string_dup (calobj);</div><div class='del'>-		g_free (calobj);</div><div class='del'>-		return calobj_copy;</div><div class='del'>-	} else {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-build_uid_seq (GList *uids)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (uids);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_CalObjUIDSeq__alloc ();</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-	seq-&gt;_length = n;</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObjUID_allocbuf (n);</div><div class='del'>-</div><div class='del'>-	/* Fill the sequence */</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = uids; l; i++, l = l-&gt;next) {</div><div class='del'>-		char *uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		seq-&gt;_buffer[i] = CORBA_string_dup (uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_uids method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-impl_Cal_get_uids (PortableServer_Servant servant,</div><div class='del'>-		   GNOME_Evolution_Calendar_CalObjType type,</div><div class='del'>-		   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	uids = cal_backend_get_uids (priv-&gt;backend, t);</div><div class='del'>-	seq = build_uid_seq (uids);</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_changes method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-impl_Cal_get_changes (PortableServer_Servant servant,</div><div class='del'>-		      GNOME_Evolution_Calendar_CalObjType type,</div><div class='del'>-		      const CORBA_char *change_id,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-	</div><div class='del'>-	return cal_backend_get_changes (priv-&gt;backend, t, change_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_objects_in_range method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-impl_Cal_get_objects_in_range (PortableServer_Servant servant,</div><div class='del'>-			       GNOME_Evolution_Calendar_CalObjType type,</div><div class='del'>-			       GNOME_Evolution_Calendar_Time_t start,</div><div class='del'>-			       GNOME_Evolution_Calendar_Time_t end,</div><div class='del'>-			       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	int t;</div><div class='del'>-	time_t t_start, t_end;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *uids;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-	t_start = (time_t) start;</div><div class='del'>-	t_end = (time_t) end;</div><div class='del'>-</div><div class='del'>-	if (t_start &gt; t_end || t_start == -1 || t_end == -1) {</div><div class='del'>-		bonobo_exception_set (ev,  ex_GNOME_Evolution_Calendar_Cal_InvalidRange);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	uids = cal_backend_get_objects_in_range (priv-&gt;backend, t, t_start, t_end);</div><div class='del'>-	seq = build_uid_seq (uids);</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjSeq *</div><div class='del'>-build_fb_seq (GList *obj_list)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjSeq *seq;</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (obj_list);</div><div class='del'>-</div><div class='del'>-	seq = GNOME_Evolution_Calendar_CalObjSeq__alloc ();</div><div class='del'>-	CORBA_sequence_set_release (seq, TRUE);</div><div class='del'>-	seq-&gt;_length = n;</div><div class='del'>-	seq-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Calendar_CalObj_allocbuf (n);</div><div class='del'>-</div><div class='del'>-	/* Fill the sequence */</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = obj_list; l; i++, l = l-&gt;next) {</div><div class='del'>-		char *calobj;</div><div class='del'>-</div><div class='del'>-		calobj = l-&gt;data;</div><div class='del'>-		seq-&gt;_buffer[i] = CORBA_string_dup (calobj);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_free_busy method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObjSeq *</div><div class='del'>-impl_Cal_get_free_busy (PortableServer_Servant servant,</div><div class='del'>-			const GNOME_Evolution_Calendar_UserList *user_list,</div><div class='del'>-			const GNOME_Evolution_Calendar_Time_t start,</div><div class='del'>-			const GNOME_Evolution_Calendar_Time_t end,</div><div class='del'>-			CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	time_t t_start, t_end;</div><div class='del'>-	GList *users = NULL;</div><div class='del'>-	GList *obj_list;</div><div class='del'>-	GNOME_Evolution_Calendar_CalObjSeq *seq;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t_start = (time_t) start;</div><div class='del'>-	t_end = (time_t) end;</div><div class='del'>-</div><div class='del'>-	if (t_start &gt; t_end || t_start == -1 || t_end == -1) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);</div><div class='del'>-		return build_fb_seq (NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* convert the CORBA user list to a GList */</div><div class='del'>-	if (user_list) {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; user_list-&gt;_length; i++)</div><div class='del'>-			users = g_list_append (users, user_list-&gt;_buffer[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* call the backend's get_free_busy method */</div><div class='del'>-	obj_list = cal_backend_get_free_busy (priv-&gt;backend, users, t_start, t_end);</div><div class='del'>-	seq = build_fb_seq (obj_list);	</div><div class='del'>-	g_list_free (users);</div><div class='del'>-</div><div class='del'>-        if (obj_list == NULL)</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-</div><div class='del'>-        return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_alarms_in_range method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarmsSeq *</div><div class='del'>-impl_Cal_get_alarms_in_range (PortableServer_Servant servant,</div><div class='del'>-			      GNOME_Evolution_Calendar_Time_t start,</div><div class='del'>-			      GNOME_Evolution_Calendar_Time_t end,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	time_t t_start, t_end;</div><div class='del'>-	gboolean valid_range;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarmsSeq *seq;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t_start = (time_t) start;</div><div class='del'>-	t_end = (time_t) end;</div><div class='del'>-</div><div class='del'>-	seq = cal_backend_get_alarms_in_range (priv-&gt;backend, t_start, t_end, &amp;valid_range);</div><div class='del'>-	if (!valid_range) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!seq) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_alarms_for_object method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalComponentAlarms *</div><div class='del'>-impl_Cal_get_alarms_for_object (PortableServer_Servant servant,</div><div class='del'>-				const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-				GNOME_Evolution_Calendar_Time_t start,</div><div class='del'>-				GNOME_Evolution_Calendar_Time_t end,</div><div class='del'>-				CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	time_t t_start, t_end;</div><div class='del'>-	GNOME_Evolution_Calendar_CalComponentAlarms *alarms;</div><div class='del'>-	CalBackendGetAlarmsForObjectResult result;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t_start = (time_t) start;</div><div class='del'>-	t_end = (time_t) end;</div><div class='del'>-</div><div class='del'>-	alarms = cal_backend_get_alarms_for_object (priv-&gt;backend, uid, t_start, t_end, &amp;result);</div><div class='del'>-</div><div class='del'>-	switch (result) {</div><div class='del'>-	case CAL_BACKEND_GET_ALARMS_SUCCESS:</div><div class='del'>-		return alarms;</div><div class='del'>-</div><div class='del'>-	case CAL_BACKEND_GET_ALARMS_NOT_FOUND:</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_BACKEND_GET_ALARMS_INVALID_RANGE:</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidRange);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::update_objects method */</div><div class='del'>-static void</div><div class='del'>-impl_Cal_update_objects (PortableServer_Servant servant,</div><div class='del'>-			 const GNOME_Evolution_Calendar_CalObj calobj,</div><div class='del'>-			 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_update_objects (priv-&gt;backend, calobj))</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_InvalidObject);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::remove_object method */</div><div class='del'>-static void</div><div class='del'>-impl_Cal_remove_object (PortableServer_Servant servant,</div><div class='del'>-			const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-			CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_remove_object (priv-&gt;backend, uid))</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::getQuery implementation */</div><div class='del'>-static GNOME_Evolution_Calendar_Query</div><div class='del'>-impl_Cal_get_query (PortableServer_Servant servant,</div><div class='del'>-		    const CORBA_char *sexp,</div><div class='del'>-		    GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-		    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	Query *query;</div><div class='del'>-	CORBA_Environment ev2;</div><div class='del'>-	GNOME_Evolution_Calendar_Query query_copy;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	query = cal_backend_get_query (priv-&gt;backend, ql, sexp);</div><div class='del'>-	if (!query) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev2);</div><div class='del'>-	query_copy = CORBA_Object_duplicate (BONOBO_OBJREF (query), &amp;ev2);</div><div class='del'>-	if (BONOBO_EX (&amp;ev2)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev2);</div><div class='del'>-		g_message ("Cal_get_query(): Could not duplicate the query reference");</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_CouldNotCreate);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev2);</div><div class='del'>-</div><div class='del'>-	return query_copy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::set_default_timezone method */</div><div class='del'>-static void</div><div class='del'>-impl_Cal_set_default_timezone (PortableServer_Servant servant,</div><div class='del'>-			       const GNOME_Evolution_Calendar_CalTimezoneObjUID tzid,</div><div class='del'>-			       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	gboolean zone_set;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	zone_set = cal_backend_set_default_timezone (priv-&gt;backend, tzid);</div><div class='del'>-</div><div class='del'>-	if (!zone_set) {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_timezone_object method */</div><div class='del'>-static GNOME_Evolution_Calendar_CalObj</div><div class='del'>-impl_Cal_get_timezone_object (PortableServer_Servant servant,</div><div class='del'>-			      const GNOME_Evolution_Calendar_CalTimezoneObjUID tzid,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	char *calobj;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	calobj = cal_backend_get_timezone_object (priv-&gt;backend, tzid);</div><div class='del'>-</div><div class='del'>-	if (calobj) {</div><div class='del'>-		CORBA_char *calobj_copy;</div><div class='del'>-</div><div class='del'>-		calobj_copy = CORBA_string_dup (calobj);</div><div class='del'>-		g_free (calobj);</div><div class='del'>-		return calobj_copy;</div><div class='del'>-	} else {</div><div class='del'>-		bonobo_exception_set (ev, ex_GNOME_Evolution_Calendar_Cal_NotFound);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_construct:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @corba_cal: CORBA object for the calendar.</div><div class='del'>- * @backend: Calendar backend that this @cal presents an interface to.</div><div class='del'>- * @listener: Calendar listener for notification.</div><div class='del'>- *</div><div class='del'>- * Constructs a calendar client interface object by binding the corresponding</div><div class='del'>- * CORBA object to it.  The calendar interface is bound to the specified</div><div class='del'>- * @backend, and will notify the @listener about changes to the calendar.</div><div class='del'>- *</div><div class='del'>- * Return value: The same object as the @cal argument.</div><div class='del'>- **/</div><div class='del'>-Cal *</div><div class='del'>-cal_construct (Cal *cal,</div><div class='del'>-	       CalBackend *backend,</div><div class='del'>-	       GNOME_Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL (cal), NULL);</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	priv-&gt;listener = CORBA_Object_duplicate (listener, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_construct: could not duplicate the listener");</div><div class='del'>-		priv-&gt;listener = CORBA_OBJECT_NIL;</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* obtain the WombatClient interface */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	priv-&gt;wombat_client = Bonobo_Unknown_queryInterface (</div><div class='del'>-		priv-&gt;listener,</div><div class='del'>-		"IDL:GNOME/Evolution/WombatClient:1.0",</div><div class='del'>-		&amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_construct: could not get the WombatClient interface");</div><div class='del'>-		priv-&gt;wombat_client = CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;backend = backend;</div><div class='del'>-</div><div class='del'>-	return cal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_new:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @listener: A calendar listener.</div><div class='del'>- *</div><div class='del'>- * Creates a new calendar client interface object and binds it to the specified</div><div class='del'>- * @backend and @listener objects.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created #Cal calendar client interface object, or NULL</div><div class='del'>- * if its corresponding CORBA object could not be created.</div><div class='del'>- **/</div><div class='del'>-Cal *</div><div class='del'>-cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener)</div><div class='del'>-{</div><div class='del'>-	Cal *cal, *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	cal = CAL (gtk_type_new (CAL_TYPE));</div><div class='del'>-</div><div class='del'>-	retval = cal_construct (cal, backend, listener);</div><div class='del'>-	if (!retval) {</div><div class='del'>-		g_message ("cal_new(): could not construct the calendar client interface");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (cal));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar */</div><div class='del'>-static void</div><div class='del'>-cal_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Cal *cal;</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (object));</div><div class='del'>-</div><div class='del'>-	cal = CAL (object);</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;backend = NULL;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	bonobo_object_release_unref (priv-&gt;listener, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("cal_destroy(): could not release the listener");</div><div class='del'>-</div><div class='del'>-	priv-&gt;listener = NULL;</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar */</div><div class='del'>-static void</div><div class='del'>-cal_class_init (CalClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	POA_GNOME_Evolution_Calendar_Cal__epv *epv = &amp;klass-&gt;epv;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	/* Class method overrides */</div><div class='del'>-	object_class-&gt;destroy = cal_destroy;</div><div class='del'>-</div><div class='del'>-	/* Epv methods */</div><div class='del'>-	epv-&gt;_get_uri = impl_Cal_get_uri;</div><div class='del'>-	epv-&gt;setMode = impl_Cal_set_mode;</div><div class='del'>-	epv-&gt;countObjects = impl_Cal_get_n_objects;</div><div class='del'>-	epv-&gt;getObject = impl_Cal_get_object;</div><div class='del'>-	epv-&gt;setDefaultTimezone = impl_Cal_set_default_timezone;</div><div class='del'>-	epv-&gt;getTimezoneObject = impl_Cal_get_timezone_object;</div><div class='del'>-	epv-&gt;getUIDs = impl_Cal_get_uids;</div><div class='del'>-	epv-&gt;getChanges = impl_Cal_get_changes;</div><div class='del'>-	epv-&gt;getObjectsInRange = impl_Cal_get_objects_in_range;</div><div class='del'>-	epv-&gt;getFreeBusy = impl_Cal_get_free_busy;</div><div class='del'>-	epv-&gt;getAlarmsInRange = impl_Cal_get_alarms_in_range;</div><div class='del'>-	epv-&gt;getAlarmsForObject = impl_Cal_get_alarms_for_object;</div><div class='del'>-	epv-&gt;updateObjects = impl_Cal_update_objects;</div><div class='del'>-	epv-&gt;removeObject = impl_Cal_remove_object;</div><div class='del'>-	epv-&gt;getQuery = impl_Cal_get_query;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar */</div><div class='del'>-static void</div><div class='del'>-cal_init (Cal *cal)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalPrivate, 1);</div><div class='del'>-	cal-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;listener = CORBA_OBJECT_NIL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (Cal, GNOME_Evolution_Calendar_Cal, PARENT_TYPE, cal);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_notify_mode:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @status: Status of the mode set.</div><div class='del'>- * @mode: The current mode.</div><div class='del'>- * </div><div class='del'>- * Notifys the listener of the results of a setMode call.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_notify_mode (Cal *cal,</div><div class='del'>-		 GNOME_Evolution_Calendar_Listener_SetModeStatus status,</div><div class='del'>-		 GNOME_Evolution_Calendar_CalMode mode)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;listener != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Listener_notifyCalSetMode (priv-&gt;listener, status, mode, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("cal_notify_mode(): could not notify the listener "</div><div class='del'>-			   "about a mode change");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_notify_update:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @uid: UID of object that was updated.</div><div class='del'>- * </div><div class='del'>- * Notifies a listener attached to a calendar client interface object about an</div><div class='del'>- * update to a calendar object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_notify_update (Cal *cal, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;listener != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Listener_notifyObjUpdated (priv-&gt;listener, (char *) uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("cal_notify_update(): could not notify the listener "</div><div class='del'>-			   "about an updated object");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_notify_remove:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @uid: UID of object that was removed.</div><div class='del'>- * </div><div class='del'>- * Notifies a listener attached to a calendar client interface object about a</div><div class='del'>- * calendar object that was removed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_notify_remove (Cal *cal, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;listener != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Listener_notifyObjRemoved (priv-&gt;listener, (char *) uid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("cal_notify_remove(): could not notify the listener "</div><div class='del'>-			   "about a removed object");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_notify_categories_changed:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @categories: List of categories.</div><div class='del'>- * </div><div class='del'>- * Notifies a listener attached to a calendar client interface object about the</div><div class='del'>- * current set of categories in a calendar backend.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-	g_return_if_fail (categories != NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;listener != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_Listener_notifyCategoriesChanged (priv-&gt;listener, categories, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("cal_notify_categories_changed(): Could not notify the listener "</div><div class='del'>-			   "about the current set of categories");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_get_password:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @prompt: The message to show to the user when asking for the password.</div><div class='del'>- * @key: A key associated with the password being asked.</div><div class='del'>- *</div><div class='del'>- * Gets a password from the calendar client this Cal knows about. It does</div><div class='del'>- * so by using the WombatClient interface being used by the corresponding</div><div class='del'>- * CalClient.</div><div class='del'>- *</div><div class='del'>- * Returns: a password entered by the user.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-cal_get_password (Cal *cal, const char *prompt, const char *key)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_char *pwd;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL (cal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;wombat_client != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	pwd = GNOME_Evolution_WombatClient_getPassword (</div><div class='del'>-		priv-&gt;wombat_client,</div><div class='del'>-		(const CORBA_char *) prompt,</div><div class='del'>-		(const CORBA_char *) key,</div><div class='del'>-		&amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_get_password: could not get password from associated WombatClient");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return pwd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_forget_password:</div><div class='del'>- * @cal: A calendar client interface.</div><div class='del'>- * @key: A key associated with the password to be forgotten.</div><div class='del'>- *</div><div class='del'>- * Notifies the associated calendar client that it should forget</div><div class='del'>- * about the password identified by @key, so that next time the backend</div><div class='del'>- * asks the client about it, the client would ask again the user for it.</div><div class='del'>- * This is done in cases where the password supplied the first time</div><div class='del'>- * was not a valid password and the backend needs the user to enter</div><div class='del'>- * a new one.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_forget_password (Cal *cal, const char *key)</div><div class='del'>-{</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cal != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL (cal));</div><div class='del'>-</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;wombat_client != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_WombatClient_forgetPassword (</div><div class='del'>-		priv-&gt;wombat_client,</div><div class='del'>-		(const CORBA_char *) key,</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("cal_forget_password: could not notify WombatClient about "</div><div class='del'>-			   "password to be forgotten");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h<br/>deleted file mode 100644<br/>index 81c3e55154..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* Evolution calendar client interface object</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *          Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAL_H</div><div class='del'>-#define CAL_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-#include "cal-common.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_TYPE            (cal_get_type ())</div><div class='del'>-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))</div><div class='del'>-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))</div><div class='del'>-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))</div><div class='del'>-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalPrivate CalPrivate;</div><div class='del'>-</div><div class='del'>-struct _Cal {</div><div class='del'>-	BonoboXObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalClass {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_Cal__epv epv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType cal_get_type (void);</div><div class='del'>-</div><div class='del'>-Cal *cal_construct (Cal *cal,</div><div class='del'>-		    CalBackend *backend,</div><div class='del'>-		    GNOME_Evolution_Calendar_Listener listener);</div><div class='del'>-</div><div class='del'>-Cal *cal_new (CalBackend *backend, GNOME_Evolution_Calendar_Listener listener);</div><div class='del'>-</div><div class='del'>-void cal_notify_mode (Cal *cal, </div><div class='del'>-		      GNOME_Evolution_Calendar_Listener_SetModeStatus status, </div><div class='del'>-		      GNOME_Evolution_Calendar_CalMode mode);</div><div class='del'>-void cal_notify_update (Cal *cal, const char *uid);</div><div class='del'>-void cal_notify_remove (Cal *cal, const char *uid);</div><div class='del'>-</div><div class='del'>-void cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories);</div><div class='del'>-</div><div class='del'>-char *cal_get_password (Cal *cal, const char *prompt, const char *key);</div><div class='del'>-void  cal_forget_password (Cal *cal, const char *key);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/job.c b/calendar/pcs/job.c<br/>deleted file mode 100644<br/>index 584f1a6f38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/job.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/job.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* GNOME personal calendar server - job manager</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "job.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The job list */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	JobFunc func;</div><div class='del'>-	gpointer data;</div><div class='del'>-} Job;</div><div class='del'>-</div><div class='del'>-static GSList *jobs_head;</div><div class='del'>-static GSList *jobs_tail;</div><div class='del'>-</div><div class='del'>-static guint jobs_idle_id;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Runs a job and dequeues it */</div><div class='del'>-static gboolean</div><div class='del'>-run_job (gpointer data)</div><div class='del'>-{</div><div class='del'>-	Job *job;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_assert (jobs_head != NULL);</div><div class='del'>-</div><div class='del'>-	job = jobs_head-&gt;data;</div><div class='del'>-	(* job-&gt;func) (job-&gt;data);</div><div class='del'>-	g_free (job);</div><div class='del'>-</div><div class='del'>-	l = jobs_head;</div><div class='del'>-	jobs_head = g_slist_remove_link (jobs_head, jobs_head);</div><div class='del'>-	g_slist_free_1 (l);</div><div class='del'>-</div><div class='del'>-	if (!jobs_head) {</div><div class='del'>-		jobs_tail = NULL;</div><div class='del'>-		jobs_idle_id = 0;</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else</div><div class='del'>-		return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * job_add:</div><div class='del'>- * @func: Function to run the job.</div><div class='del'>- * @data: Data to pass to @function.</div><div class='del'>- * </div><div class='del'>- * Adds a job to the queue.  The job will automatically be run asynchronously.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-job_add (JobFunc func, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Job *job;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	job = g_new (Job, 1);</div><div class='del'>-	job-&gt;func = func;</div><div class='del'>-	job-&gt;data = data;</div><div class='del'>-</div><div class='del'>-	if (!jobs_head) {</div><div class='del'>-		g_assert (jobs_tail == NULL);</div><div class='del'>-		g_assert (jobs_idle_id == 0);</div><div class='del'>-</div><div class='del'>-		jobs_head = g_slist_append (NULL, job);</div><div class='del'>-		jobs_tail = jobs_head;</div><div class='del'>-</div><div class='del'>-		jobs_idle_id = g_idle_add (run_job, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		g_assert (jobs_tail != NULL);</div><div class='del'>-		g_assert (jobs_idle_id != 0);</div><div class='del'>-</div><div class='del'>-		jobs_tail = g_slist_append (jobs_tail, job)-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/job.h b/calendar/pcs/job.h<br/>deleted file mode 100644<br/>index 07e3371f89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/job.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/job.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* GNOME personal calendar server - job manager</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef JOB_H</div><div class='del'>-#define JOB_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef void (* JobFunc) (gpointer data);</div><div class='del'>-</div><div class='del'>-void job_add (JobFunc func, gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c<br/>deleted file mode 100644<br/>index 2006157e58..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/query.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/query.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1449 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live search query implementation</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-#include "query.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* States of a query */</div><div class='del'>-typedef enum {</div><div class='del'>-	QUERY_WAIT_FOR_BACKEND, /* the query is not populated and the backend is not loaded */</div><div class='del'>-	QUERY_START_PENDING,	/* the query is not populated yet, but the backend is loaded */</div><div class='del'>-	QUERY_IN_PROGRESS,	/* the query is populated; components are still being processed */</div><div class='del'>-	QUERY_DONE,		/* the query is done, but still accepts object changes */</div><div class='del'>-	QUERY_PARSE_ERROR	/* a parse error occurred when initially creating the ESexp */</div><div class='del'>-} QueryState;</div><div class='del'>-</div><div class='del'>-/* Private part of the Query structure */</div><div class='del'>-struct _QueryPrivate {</div><div class='del'>-	/* The backend we are monitoring */</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	/* The default timezone for the calendar. */</div><div class='del'>-	icaltimezone *default_zone;</div><div class='del'>-</div><div class='del'>-	/* Listener to which we report changes in the live query */</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener ql;</div><div class='del'>-</div><div class='del'>-	/* Sexp that defines the query */</div><div class='del'>-	char *sexp;</div><div class='del'>-	ESExp *esexp;</div><div class='del'>-</div><div class='del'>-	/* Timeout handler ID for asynchronous queries and current state of the query */</div><div class='del'>-	guint timeout_id;</div><div class='del'>-	QueryState state;</div><div class='del'>-</div><div class='del'>-	/* List of UIDs that we still have to process */</div><div class='del'>-	GList *pending_uids;</div><div class='del'>-	int n_pending;</div><div class='del'>-	int pending_total;</div><div class='del'>-</div><div class='del'>-	/* Table of the UIDs we know do match the query */</div><div class='del'>-	GHashTable *uids;</div><div class='del'>-</div><div class='del'>-	/* The next component that will be handled in e_sexp_eval(); put here</div><div class='del'>-	 * just because the query object itself is the esexp context.</div><div class='del'>-	 */</div><div class='del'>-	CalComponent *next_comp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void query_class_init (QueryClass *class);</div><div class='del'>-static void query_init (Query *query);</div><div class='del'>-static void query_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static BonoboXObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BONOBO_X_TYPE_FUNC_FULL (Query,</div><div class='del'>-			 GNOME_Evolution_Calendar_Query,</div><div class='del'>-			 BONOBO_X_OBJECT_TYPE,</div><div class='del'>-			 query);</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the live search query */</div><div class='del'>-static void</div><div class='del'>-query_class_init (QueryClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (BONOBO_X_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = query_destroy;</div><div class='del'>-</div><div class='del'>-	/* The Query interface (ha ha! query interface!) has no methods, so we</div><div class='del'>-	 * don't need to fiddle with the epv.</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the live search query */</div><div class='del'>-static void</div><div class='del'>-query_init (Query *query)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (QueryPrivate, 1);</div><div class='del'>-	query-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;backend = NULL;</div><div class='del'>-	priv-&gt;default_zone = NULL;</div><div class='del'>-	priv-&gt;ql = CORBA_OBJECT_NIL;</div><div class='del'>-	priv-&gt;sexp = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;timeout_id = 0;</div><div class='del'>-	priv-&gt;state = QUERY_WAIT_FOR_BACKEND;</div><div class='del'>-</div><div class='del'>-	priv-&gt;pending_uids = NULL;</div><div class='del'>-	priv-&gt;uids = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	priv-&gt;next_comp = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(); frees a UID */</div><div class='del'>-static void</div><div class='del'>-free_uid_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-</div><div class='del'>-	uid = key;</div><div class='del'>-	g_free (uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the live search query */</div><div class='del'>-static void</div><div class='del'>-query_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_QUERY (object));</div><div class='del'>-</div><div class='del'>-	query = QUERY (object);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;backend) {</div><div class='del'>-		/* If we are waiting for the backend to be opened, we'll be</div><div class='del'>-		 * connected to its "opened" signal.  If we are in the middle of</div><div class='del'>-		 * a query or if we are just waiting for object update</div><div class='del'>-		 * notifications, we'll have the "obj_removed" and "obj_updated"</div><div class='del'>-		 * connections.  Otherwise, we are either in a parse error state</div><div class='del'>-		 * or waiting for the query to be populated, and in both cases</div><div class='del'>-		 * we have no signal connections.</div><div class='del'>-		 */</div><div class='del'>-		if (priv-&gt;state == QUERY_WAIT_FOR_BACKEND</div><div class='del'>-		    || priv-&gt;state == QUERY_IN_PROGRESS || priv-&gt;state == QUERY_DONE)</div><div class='del'>-			gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;backend), query);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;backend));</div><div class='del'>-		priv-&gt;backend = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ql != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (priv-&gt;ql, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("query_destroy(): Could not unref the listener\n");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		priv-&gt;ql = CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sexp) {</div><div class='del'>-		g_free (priv-&gt;sexp);</div><div class='del'>-		priv-&gt;sexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;esexp) {</div><div class='del'>-		e_sexp_unref (priv-&gt;esexp);</div><div class='del'>-		priv-&gt;esexp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;timeout_id) {</div><div class='del'>-		g_source_remove (priv-&gt;timeout_id);</div><div class='del'>-		priv-&gt;timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;pending_uids) {</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		for (l = priv-&gt;pending_uids; l; l = l-&gt;next) {</div><div class='del'>-			char *uid;</div><div class='del'>-</div><div class='del'>-			uid = l-&gt;data;</div><div class='del'>-			g_assert (uid != NULL);</div><div class='del'>-			g_free (uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_list_free (priv-&gt;pending_uids);</div><div class='del'>-		priv-&gt;pending_uids = NULL;</div><div class='del'>-		priv-&gt;n_pending = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;uids, free_uid_cb, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;uids);</div><div class='del'>-	priv-&gt;uids = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	query-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* E-Sexp functions */</div><div class='del'>-</div><div class='del'>-/* (time-now)</div><div class='del'>- *</div><div class='del'>- * Returns a time_t of time (NULL).</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_time_now (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	if (argc != 0) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-now expects 0 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);</div><div class='del'>-	result-&gt;value.time = time (NULL);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (make-time ISODATE)</div><div class='del'>- *</div><div class='del'>- * ISODATE - string, ISO 8601 date/time representation</div><div class='del'>- *</div><div class='del'>- * Constructs a time_t value for the specified date.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_make_time (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	const char *str;</div><div class='del'>-	time_t t;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	if (argc != 1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("make-time expects 1 argument"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_STRING) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("make-time expects argument 1 "</div><div class='del'>-					     "to be a string"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	str = argv[0]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-	t = time_from_isodate (str);</div><div class='del'>-	if (t == -1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("make-time argument 1 must be an "</div><div class='del'>-					     "ISO 8601 date/time string"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);</div><div class='del'>-	result-&gt;value.time = t;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (time-add-day TIME N)</div><div class='del'>- *</div><div class='del'>- * TIME - time_t, base time</div><div class='del'>- * N - int, number of days to add</div><div class='del'>- *</div><div class='del'>- * Adds the specified number of days to a time value.</div><div class='del'>- *</div><div class='del'>- * FIXME: TIMEZONES - need to use a timezone or daylight saving changes will</div><div class='del'>- * make the result incorrect.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_time_add_day (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-	time_t t;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if (argc != 2) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-add-day expects 2 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-add-day expects argument 1 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	t = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	if (argv[1]-&gt;type != ESEXP_RES_INT) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-add-day expects argument 2 "</div><div class='del'>-					     "to be an integer"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	n = argv[1]-&gt;value.number;</div><div class='del'>-	</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);</div><div class='del'>-	result-&gt;value.time = time_add_day (t, n);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (time-day-begin TIME)</div><div class='del'>- *</div><div class='del'>- * TIME - time_t, base time</div><div class='del'>- *</div><div class='del'>- * Returns the start of the day, according to the local time.</div><div class='del'>- *</div><div class='del'>- * FIXME: TIMEZONES - this uses the current Unix timezone.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_time_day_begin (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	if (argc != 1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-day-begin expects 1 argument"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-day-begin expects argument 1 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	t = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);</div><div class='del'>-	result-&gt;value.time = time_day_begin (t);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (time-day-end TIME)</div><div class='del'>- *</div><div class='del'>- * TIME - time_t, base time</div><div class='del'>- *</div><div class='del'>- * Returns the end of the day, according to the local time.</div><div class='del'>- *</div><div class='del'>- * FIXME: TIMEZONES - this uses the current Unix timezone.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_time_day_end (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	if (argc != 1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-day-end expects 1 argument"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("time-day-end expects argument 1 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	t = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_TIME);</div><div class='del'>-	result-&gt;value.time = time_day_end (t);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (get-vtype)</div><div class='del'>- *</div><div class='del'>- * Returns a string indicating the type of component (VEVENT, VTODO, VJOURNAL,</div><div class='del'>- * VFREEBUSY, VTIMEZONE, UNKNOWN).</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_get_vtype (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentVType vtype;</div><div class='del'>-	char *str;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc != 0) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("get-vtype expects 0 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the type */</div><div class='del'>-</div><div class='del'>-	vtype = cal_component_get_vtype (comp);</div><div class='del'>-</div><div class='del'>-	switch (vtype) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		str = g_strdup ("VEVENT");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		str = g_strdup ("VTODO");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		str = g_strdup ("VJOURNAL");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-		str = g_strdup ("VFREEBUSY");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TIMEZONE:</div><div class='del'>-		str = g_strdup ("VTIMEZONE");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		str = g_strdup ("UNKNOWN");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_STRING);</div><div class='del'>-	result-&gt;value.string = str;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a boolean value in the data to TRUE; called from</div><div class='del'>- * cal_recur_generate_instances() to indicate that at least one instance occurs</div><div class='del'>- * in the sought time range.  We always return FALSE because we want the</div><div class='del'>- * recurrence engine to finish as soon as possible.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-instance_occur_cb (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gboolean *occurs;</div><div class='del'>-</div><div class='del'>-	occurs = data;</div><div class='del'>-	*occurs = TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Call the backend function to get a timezone from a TZID. */</div><div class='del'>-static icaltimezone*</div><div class='del'>-resolve_tzid (const char *tzid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query = data;</div><div class='del'>-</div><div class='del'>-	if (!tzid || !tzid[0])</div><div class='del'>-		return NULL;</div><div class='del'>-	else</div><div class='del'>-		return cal_backend_get_timezone (query-&gt;priv-&gt;backend, tzid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* (occur-in-time-range? START END)</div><div class='del'>- *</div><div class='del'>- * START - time_t, start of the time range</div><div class='del'>- * END - time_t, end of the time range</div><div class='del'>- *</div><div class='del'>- * Returns a boolean indicating whether the component has any occurrences in the</div><div class='del'>- * specified time range.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_occur_in_time_range (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	gboolean occurs;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc != 2) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects 2 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects argument 1 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	start = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	if (argv[1]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("occur-in-time-range? expects argument 2 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	end = argv[1]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	/* See if there is at least one instance in that range */</div><div class='del'>-</div><div class='del'>-	occurs = FALSE;</div><div class='del'>-</div><div class='del'>-	cal_recur_generate_instances (comp, start, end,</div><div class='del'>-				      instance_occur_cb, &amp;occurs,</div><div class='del'>-				      resolve_tzid, query, priv-&gt;default_zone);</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-	result-&gt;value.bool = occurs;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether a list of CalComponentText items matches the specified string */</div><div class='del'>-static gboolean</div><div class='del'>-matches_text_list (GSList *text_list, const char *str)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-	gboolean matches;</div><div class='del'>-</div><div class='del'>-	matches = FALSE;</div><div class='del'>-</div><div class='del'>-	for (l = text_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *text;</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_assert (text-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-		if (e_utf8_strstrcasedecomp (text-&gt;value, str) != NULL) {</div><div class='del'>-			matches = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the comments in a component matches the specified string */</div><div class='del'>-static gboolean</div><div class='del'>-matches_comment (CalComponent *comp, const char *str)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	gboolean matches;</div><div class='del'>-</div><div class='del'>-	cal_component_get_comment_list (comp, &amp;list);</div><div class='del'>-	matches = matches_text_list (list, str);</div><div class='del'>-	cal_component_free_text_list (list);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the description in a component matches the specified string */</div><div class='del'>-static gboolean</div><div class='del'>-matches_description (CalComponent *comp, const char *str)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	gboolean matches;</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;list);</div><div class='del'>-	matches = matches_text_list (list, str);</div><div class='del'>-	cal_component_free_text_list (list);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the summary in a component matches the specified string */</div><div class='del'>-static gboolean</div><div class='del'>-matches_summary (CalComponent *comp, const char *str)</div><div class='del'>-{</div><div class='del'>-	CalComponentText text;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-</div><div class='del'>-	if (!text.value)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return e_utf8_strstrcasedecomp (text.value, str) != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether any text field in a component matches the specified string */</div><div class='del'>-static gboolean</div><div class='del'>-matches_any (CalComponent *comp, const char *str)</div><div class='del'>-{</div><div class='del'>-	/* As an optimization, and to make life easier for the individual</div><div class='del'>-	 * predicate functions, see if we are looking for the empty string right</div><div class='del'>-	 * away.</div><div class='del'>-	 */</div><div class='del'>-	if (strlen (str) == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return (matches_comment (comp, str)</div><div class='del'>-		|| matches_description (comp, str)</div><div class='del'>-		|| matches_summary (comp, str));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (contains? FIELD STR)</div><div class='del'>- *</div><div class='del'>- * FIELD - string, name of field to match (any, comment, description, summary)</div><div class='del'>- * STR - string, match string</div><div class='del'>- *</div><div class='del'>- * Returns a boolean indicating whether the specified field contains the</div><div class='del'>- * specified string.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_contains (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *field;</div><div class='del'>-	const char *str;</div><div class='del'>-	gboolean matches;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc != 2) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("contains? expects 2 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_STRING) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("contains? expects argument 1 "</div><div class='del'>-					     "to be a string"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	field = argv[0]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-	if (argv[1]-&gt;type != ESEXP_RES_STRING) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("contains? expects argument 2 "</div><div class='del'>-					     "to be a string"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	str = argv[1]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-	/* See if it matches */</div><div class='del'>-</div><div class='del'>-	if (strcmp (field, "any") == 0)</div><div class='del'>-		matches = matches_any (comp, str);</div><div class='del'>-	else if (strcmp (field, "comment") == 0)</div><div class='del'>-		matches = matches_comment (comp, str);</div><div class='del'>-	else if (strcmp (field, "description") == 0)</div><div class='del'>-		matches = matches_description (comp, str);</div><div class='del'>-	else if (strcmp (field, "summary") == 0)</div><div class='del'>-		matches = matches_summary (comp, str);</div><div class='del'>-	else {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("contains? expects argument 1 to "</div><div class='del'>-					     "be one of \"any\", \"summary\", \"description\""));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-	result-&gt;value.bool = matches;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (has-categories? STR+)</div><div class='del'>- * (has-categories? #f)</div><div class='del'>- *</div><div class='del'>- * STR - At least one string specifying a category</div><div class='del'>- * Or you can specify a single #f (boolean false) value for components</div><div class='del'>- * that have no categories assigned to them ("unfiled").</div><div class='del'>- *</div><div class='del'>- * Returns a boolean indicating whether the component has all the specified</div><div class='del'>- * categories.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_has_categories (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gboolean unfiled;</div><div class='del'>-	int i;</div><div class='del'>-	GSList *categories;</div><div class='del'>-	gboolean matches;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc &lt; 1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("has-categories? expects at least 1 argument"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argc == 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_BOOL)</div><div class='del'>-		unfiled = TRUE;</div><div class='del'>-	else</div><div class='del'>-		unfiled = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!unfiled)</div><div class='del'>-		for (i = 0; i &lt; argc; i++)</div><div class='del'>-			if (argv[i]-&gt;type != ESEXP_RES_STRING) {</div><div class='del'>-				e_sexp_fatal_error (esexp, _("has-categories? expects all arguments "</div><div class='del'>-							     "to be strings or one and only one "</div><div class='del'>-							     "argument to be a boolean false (#f)"));</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-	/* Search categories.  First, if there are no categories we return</div><div class='del'>-	 * whether unfiled components are supposed to match.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories);</div><div class='del'>-	if (!categories) {</div><div class='del'>-		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-		result-&gt;value.bool = unfiled;</div><div class='del'>-</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Otherwise, we *do* have categories but unfiled components were</div><div class='del'>-	 * requested, so this component does not match.</div><div class='del'>-	 */</div><div class='del'>-	if (unfiled) {</div><div class='del'>-		result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-		result-&gt;value.bool = FALSE;</div><div class='del'>-</div><div class='del'>-		return result;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matches = TRUE;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		const char *sought;</div><div class='del'>-		GSList *l;</div><div class='del'>-		gboolean has_category;</div><div class='del'>-</div><div class='del'>-		sought = argv[i]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-		has_category = FALSE;</div><div class='del'>-</div><div class='del'>-		for (l = categories; l; l = l-&gt;next) {</div><div class='del'>-			const char *category;</div><div class='del'>-</div><div class='del'>-			category = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (strcmp (category, sought) == 0) {</div><div class='del'>-				has_category = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!has_category) {</div><div class='del'>-			matches = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_categories_list (categories);</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-	result-&gt;value.bool = matches;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (is-completed?)</div><div class='del'>- *</div><div class='del'>- * Returns a boolean indicating whether the component is completed (i.e. has</div><div class='del'>- * a COMPLETED property. This is really only useful for TODO components.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_is_completed (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-	struct icaltimetype *t;</div><div class='del'>-	gboolean complete = FALSE;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc != 0) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("is-completed? expects 0 arguments"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;t);</div><div class='del'>-	if (t) {</div><div class='del'>-		complete = TRUE;</div><div class='del'>-		cal_component_free_icaltimetype (t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-	result-&gt;value.bool = complete;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* (completed-before? TIME)</div><div class='del'>- *</div><div class='del'>- * TIME - time_t</div><div class='del'>- *</div><div class='del'>- * Returns a boolean indicating whether the component was completed on or</div><div class='del'>- * before the given time (i.e. it checks the COMPLETED property).</div><div class='del'>- * This is really only useful for TODO components.</div><div class='del'>- */</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_completed_before (ESExp *esexp, int argc, ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-	struct icaltimetype *tt;</div><div class='del'>-	icaltimezone *zone;</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-	time_t before_time, completed_time;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp != NULL);</div><div class='del'>-	comp = priv-&gt;next_comp;</div><div class='del'>-</div><div class='del'>-	/* Check argument types */</div><div class='del'>-</div><div class='del'>-	if (argc != 1) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("completed-before? expects 1 argument"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (argv[0]-&gt;type != ESEXP_RES_TIME) {</div><div class='del'>-		e_sexp_fatal_error (esexp, _("completed-before? expects argument 1 "</div><div class='del'>-					     "to be a time_t"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	before_time = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;tt);</div><div class='del'>-	if (tt) {</div><div class='del'>-		/* COMPLETED must be in UTC. */</div><div class='del'>-		zone = icaltimezone_get_utc_timezone ();</div><div class='del'>-		completed_time = icaltime_as_timet_with_zone (*tt, zone);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("Query Time    : %s", ctime (&amp;before_time));</div><div class='del'>-		g_print ("Completed Time: %s", ctime (&amp;completed_time));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* We want to return TRUE if before_time is after</div><div class='del'>-		   completed_time. */</div><div class='del'>-		if (difftime (before_time, completed_time) &gt; 0) {</div><div class='del'>-#if 0</div><div class='del'>-			g_print ("  Returning TRUE\n");</div><div class='del'>-#endif</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cal_component_free_icaltimetype (tt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = e_sexp_result_new (esexp, ESEXP_RES_BOOL);</div><div class='del'>-	result-&gt;value.bool = retval;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a component to our the UIDs hash table and notifies the client */</div><div class='del'>-static void</div><div class='del'>-add_component (Query *query, const char *uid, gboolean query_in_progress, int n_scanned, int total)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	char *old_uid;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	if (query_in_progress)</div><div class='del'>-		g_assert (n_scanned &gt; 0 || n_scanned &lt;= total);</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended (priv-&gt;uids, uid, (gpointer *) &amp;old_uid, NULL)) {</div><div class='del'>-		g_hash_table_remove (priv-&gt;uids, old_uid);</div><div class='del'>-		g_free (old_uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;uids, g_strdup (uid), NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener_notifyObjUpdated (</div><div class='del'>-		priv-&gt;ql,</div><div class='del'>-		(char *) uid,</div><div class='del'>-		query_in_progress,</div><div class='del'>-		n_scanned,</div><div class='del'>-		total,</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("add_component(): Could not notify the listener of an "</div><div class='del'>-			   "updated component");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a component from our the UIDs hash table and notifies the client */</div><div class='del'>-static void</div><div class='del'>-remove_component (Query *query, const char *uid)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	char *old_uid;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!g_hash_table_lookup_extended (priv-&gt;uids, uid, (gpointer *) &amp;old_uid, NULL))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* The component did match the query before but it no longer does, so we</div><div class='del'>-	 * have to notify the client.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uids, old_uid);</div><div class='del'>-	g_free (old_uid);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener_notifyObjRemoved (</div><div class='del'>-		priv-&gt;ql,</div><div class='del'>-		(char *) uid,</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("remove_component(): Could not notify the listener of a "</div><div class='del'>-			   "removed component");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a component from the list of pending UIDs */</div><div class='del'>-static void</div><div class='del'>-remove_from_pending (Query *query, const char *remove_uid)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;pending_uids; l; l = l-&gt;next) {</div><div class='del'>-		char *uid;</div><div class='del'>-</div><div class='del'>-		g_assert (priv-&gt;n_pending &gt; 0);</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		if (strcmp (remove_uid, uid))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		g_free (uid);</div><div class='del'>-</div><div class='del'>-		priv-&gt;pending_uids = g_list_remove_link (priv-&gt;pending_uids, l);</div><div class='del'>-		g_list_free_1 (l);</div><div class='del'>-		priv-&gt;n_pending--;</div><div class='del'>-</div><div class='del'>-		g_assert ((priv-&gt;pending_uids &amp;&amp; priv-&gt;n_pending != 0)</div><div class='del'>-			  || (!priv-&gt;pending_uids &amp;&amp; priv-&gt;n_pending == 0));</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-} functions[] = {</div><div class='del'>-	/* Time-related functions */</div><div class='del'>-	{ "time-now", func_time_now },</div><div class='del'>-	{ "make-time", func_make_time },</div><div class='del'>-	{ "time-add-day", func_time_add_day },</div><div class='del'>-	{ "time-day-begin", func_time_day_begin },</div><div class='del'>-	{ "time-day-end", func_time_day_end },</div><div class='del'>-</div><div class='del'>-	/* Component-related functions */</div><div class='del'>-	{ "get-vtype", func_get_vtype },</div><div class='del'>-	{ "occur-in-time-range?", func_occur_in_time_range },</div><div class='del'>-	{ "contains?", func_contains },</div><div class='del'>-	{ "has-categories?", func_has_categories },</div><div class='del'>-	{ "is-completed?", func_is_completed },</div><div class='del'>-	{ "completed-before?", func_completed_before }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Initializes a sexp by interning our own symbols */</div><div class='del'>-static ESExp *</div><div class='del'>-create_sexp (Query *query)</div><div class='del'>-{</div><div class='del'>-	ESExp *esexp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	esexp = e_sexp_new ();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; (sizeof (functions) / sizeof (functions[0])); i++)</div><div class='del'>-		e_sexp_add_function (esexp, 0, functions[i].name, functions[i].func, query);</div><div class='del'>-</div><div class='del'>-	return esexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the ESexp and parses the esexp.  If a parse error occurs, it sets the</div><div class='del'>- * query state to QUERY_PARSE_ERROR and returns FALSE.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-parse_sexp (Query *query)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Compile the query string */</div><div class='del'>-</div><div class='del'>-	priv-&gt;esexp = create_sexp (query);</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;sexp != NULL);</div><div class='del'>-	e_sexp_input_text (priv-&gt;esexp, priv-&gt;sexp, strlen (priv-&gt;sexp));</div><div class='del'>-</div><div class='del'>-	if (e_sexp_parse (priv-&gt;esexp) == -1) {</div><div class='del'>-		const char *error_str;</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		priv-&gt;state = QUERY_PARSE_ERROR;</div><div class='del'>-</div><div class='del'>-		/* Report the error to the listener */</div><div class='del'>-</div><div class='del'>-		error_str = e_sexp_error (priv-&gt;esexp);</div><div class='del'>-		g_assert (error_str != NULL);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_QueryListener_notifyQueryDone (</div><div class='del'>-			priv-&gt;ql,</div><div class='del'>-			GNOME_Evolution_Calendar_QueryListener_PARSE_ERROR,</div><div class='del'>-			error_str,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("parse_sexp(): Could not notify the listener of "</div><div class='del'>-				   "a parse error");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		e_sexp_unref (priv-&gt;esexp);</div><div class='del'>-		priv-&gt;esexp = NULL;</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Evaluates the query sexp on the specified component and notifies the listener</div><div class='del'>- * as appropriate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-match_component (Query *query, const char *uid,</div><div class='del'>-		 gboolean query_in_progress, int n_scanned, int total)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;state == QUERY_IN_PROGRESS || priv-&gt;state == QUERY_DONE);</div><div class='del'>-	g_assert (priv-&gt;esexp != NULL);</div><div class='del'>-</div><div class='del'>-	comp = cal_backend_get_object_component (priv-&gt;backend, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Eval the sexp */</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;next_comp == NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;next_comp = comp;</div><div class='del'>-	result = e_sexp_eval (priv-&gt;esexp);</div><div class='del'>-	priv-&gt;next_comp = NULL;</div><div class='del'>-</div><div class='del'>-	if (!result) {</div><div class='del'>-		const char *error_str;</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		error_str = e_sexp_error (priv-&gt;esexp);</div><div class='del'>-		g_assert (error_str != NULL);</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_QueryListener_notifyEvalError (</div><div class='del'>-			priv-&gt;ql,</div><div class='del'>-			error_str,</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("match_component(): Could not notify the listener of "</div><div class='del'>-				   "an evaluation error");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	} else if (result-&gt;type != ESEXP_RES_BOOL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		GNOME_Evolution_Calendar_QueryListener_notifyEvalError (</div><div class='del'>-			priv-&gt;ql,</div><div class='del'>-			_("Evaluation of the search expression did not yield a boolean value"),</div><div class='del'>-			&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (BONOBO_EX (&amp;ev))</div><div class='del'>-			g_message ("match_component(): Could not notify the listener of "</div><div class='del'>-				   "an unexpected result value type when evaluating the "</div><div class='del'>-				   "search expression");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	} else {</div><div class='del'>-		/* Success; process the component accordingly */</div><div class='del'>-</div><div class='del'>-		if (result-&gt;value.bool)</div><div class='del'>-			add_component (query, uid, query_in_progress, n_scanned, total);</div><div class='del'>-		else</div><div class='del'>-			remove_component (query, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_sexp_result_free (priv-&gt;esexp, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Processes all components that are queued in the list */</div><div class='del'>-static gboolean</div><div class='del'>-process_components_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	char *uid;</div><div class='del'>-	GList *l;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_source_remove (priv-&gt;timeout_id);</div><div class='del'>-	priv-&gt;timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	while (priv-&gt;pending_uids) {</div><div class='del'>-		g_assert (priv-&gt;n_pending &gt; 0);</div><div class='del'>-</div><div class='del'>-		/* Fetch the component */</div><div class='del'>-</div><div class='del'>-		l = priv-&gt;pending_uids;</div><div class='del'>-		priv-&gt;pending_uids = g_list_remove_link (priv-&gt;pending_uids, l);</div><div class='del'>-		priv-&gt;n_pending--;</div><div class='del'>-</div><div class='del'>-		g_assert ((priv-&gt;pending_uids &amp;&amp; priv-&gt;n_pending != 0)</div><div class='del'>-			  || (!priv-&gt;pending_uids &amp;&amp; priv-&gt;n_pending == 0));</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		g_assert (uid != NULL);</div><div class='del'>-</div><div class='del'>-		g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (query));</div><div class='del'>-</div><div class='del'>-		match_component (query, uid,</div><div class='del'>-				 TRUE,</div><div class='del'>-				 priv-&gt;pending_total - priv-&gt;n_pending,</div><div class='del'>-				 priv-&gt;pending_total);</div><div class='del'>-</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (query));</div><div class='del'>-</div><div class='del'>-		g_free (uid);</div><div class='del'>-</div><div class='del'>-		/* run the main loop, for not blocking */</div><div class='del'>-		if (gtk_events_pending ())</div><div class='del'>-			gtk_main_iteration ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* notify listener that the query ended */</div><div class='del'>-	priv-&gt;state = QUERY_DONE;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener_notifyQueryDone (</div><div class='del'>-		priv-&gt;ql,</div><div class='del'>-		GNOME_Evolution_Calendar_QueryListener_SUCCESS,</div><div class='del'>-		"",</div><div class='del'>-		&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev))</div><div class='del'>-		g_message ("start_query(): Could not notify the listener of "</div><div class='del'>-			   "a finished query");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component changes in the backend */</div><div class='del'>-static void</div><div class='del'>-backend_obj_updated_cb (CalBackend *backend, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;state == QUERY_IN_PROGRESS || priv-&gt;state == QUERY_DONE);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref (BONOBO_OBJECT (query));</div><div class='del'>-</div><div class='del'>-	match_component (query, uid, FALSE, 0, 0);</div><div class='del'>-	remove_from_pending (query, uid);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (query));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a component is removed from the backend */</div><div class='del'>-static void</div><div class='del'>-backend_obj_removed_cb (CalBackend *backend, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;state == QUERY_IN_PROGRESS || priv-&gt;state == QUERY_DONE);</div><div class='del'>-</div><div class='del'>-	bonobo_object_ref (BONOBO_OBJECT (query));</div><div class='del'>-</div><div class='del'>-	remove_component (query, uid);</div><div class='del'>-	remove_from_pending (query, uid);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (query));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Actually starts the query */</div><div class='del'>-static void</div><div class='del'>-start_query (Query *query)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!parse_sexp (query))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Populate the query with UIDs so that we can process them asynchronously */</div><div class='del'>-</div><div class='del'>-	priv-&gt;state = QUERY_IN_PROGRESS;</div><div class='del'>-	priv-&gt;pending_uids = cal_backend_get_uids (priv-&gt;backend, CALOBJ_TYPE_ANY);</div><div class='del'>-	priv-&gt;pending_total = g_list_length (priv-&gt;pending_uids);</div><div class='del'>-	priv-&gt;n_pending = priv-&gt;pending_total;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;backend), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (backend_obj_updated_cb),</div><div class='del'>-			    query);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;backend), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (backend_obj_removed_cb),</div><div class='del'>-			    query);</div><div class='del'>-</div><div class='del'>-	priv-&gt;timeout_id = g_timeout_add (100, (GSourceFunc) process_components_cb, query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Idle handler for starting a query */</div><div class='del'>-static gboolean</div><div class='del'>-start_query_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_source_remove (priv-&gt;timeout_id);</div><div class='del'>-	priv-&gt;timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;state == QUERY_START_PENDING) {</div><div class='del'>-		priv-&gt;state = QUERY_IN_PROGRESS;</div><div class='del'>-		start_query (query);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the backend gets loaded; we just queue the query to be</div><div class='del'>- * started later.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-backend_opened_cb (CalBackend *backend, CalBackendOpenStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	query = QUERY (data);</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;state == QUERY_WAIT_FOR_BACKEND);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;backend), query);</div><div class='del'>-	priv-&gt;state = QUERY_START_PENDING;</div><div class='del'>-</div><div class='del'>-	if (status == CAL_BACKEND_OPEN_SUCCESS) {</div><div class='del'>-		g_assert (cal_backend_is_loaded (backend));</div><div class='del'>-</div><div class='del'>-		priv-&gt;timeout_id = g_timeout_add (100, (GSourceFunc) start_query_cb, query);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_construct:</div><div class='del'>- * @query: A live search query.</div><div class='del'>- * @backend: Calendar backend that the query object will monitor.</div><div class='del'>- * @ql: Listener for query results.</div><div class='del'>- * @sexp: Sexp that defines the query.</div><div class='del'>- * </div><div class='del'>- * Constructs a #Query object by binding it to a calendar backend and a query</div><div class='del'>- * listener.  The @query object will start to populate itself asynchronously and</div><div class='del'>- * call the listener as appropriate.</div><div class='del'>- * </div><div class='del'>- * Return value: The same value as @query, or NULL if the query could not</div><div class='del'>- * be constructed.</div><div class='del'>- **/</div><div class='del'>-Query *</div><div class='del'>-query_construct (Query *query,</div><div class='del'>-		 CalBackend *backend,</div><div class='del'>-		 GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-		 const char *sexp)</div><div class='del'>-{</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (query != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_QUERY (query), NULL);</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (ql != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-	g_return_val_if_fail (sexp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = query-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	priv-&gt;ql = CORBA_Object_duplicate (ql, &amp;ev);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		g_message ("query_construct(): Could not duplicate the listener");</div><div class='del'>-		priv-&gt;ql = CORBA_OBJECT_NIL;</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;backend = backend;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (priv-&gt;backend));</div><div class='del'>-</div><div class='del'>-	priv-&gt;default_zone = cal_backend_get_default_timezone (backend);</div><div class='del'>-</div><div class='del'>-	priv-&gt;sexp = g_strdup (sexp);</div><div class='del'>-</div><div class='del'>-	/* Queue the query to be started asynchronously */</div><div class='del'>-</div><div class='del'>-	if (cal_backend_is_loaded (priv-&gt;backend)) {</div><div class='del'>-		priv-&gt;state = QUERY_START_PENDING;</div><div class='del'>-</div><div class='del'>-		priv-&gt;timeout_id = g_timeout_add (100, (GSourceFunc) start_query_cb, query);</div><div class='del'>-	} else</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;backend), "opened",</div><div class='del'>-				    GTK_SIGNAL_FUNC (backend_opened_cb),</div><div class='del'>-				    query);</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * query_new:</div><div class='del'>- * @backend: Calendar backend that the query object will monitor.</div><div class='del'>- * @ql: Listener for query results.</div><div class='del'>- * @sexp: Sexp that defines the query.</div><div class='del'>- * </div><div class='del'>- * Creates a new query engine object that monitors a calendar backend.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created query object, or NULL on failure.</div><div class='del'>- **/</div><div class='del'>-Query *</div><div class='del'>-query_new (CalBackend *backend,</div><div class='del'>-	   GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-	   const char *sexp)</div><div class='del'>-{</div><div class='del'>-	Query *query;</div><div class='del'>-</div><div class='del'>-	query = QUERY (gtk_type_new (QUERY_TYPE));</div><div class='del'>-	if (!query_construct (query, backend, ql, sexp)) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (query));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return query;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h<br/>deleted file mode 100644<br/>index 80b17983a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/query.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/pcs/query.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* Evolution calendar - Live search query implementation</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef QUERY_H</div><div class='del'>-#define QUERY_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-xobject.h&gt;</div><div class='del'>-#include "cal-common.h"</div><div class='del'>-#include "evolution-calendar.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define QUERY_TYPE            (query_get_type ())</div><div class='del'>-#define QUERY(obj)            (GTK_CHECK_CAST ((obj), QUERY_TYPE, Query))</div><div class='del'>-#define QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), QUERY_TYPE, QueryClass))</div><div class='del'>-#define IS_QUERY(obj)         (GTK_CHECK_TYPE ((obj), QUERY_TYPE))</div><div class='del'>-#define IS_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), QUERY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _QueryPrivate QueryPrivate;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	QueryPrivate *priv;</div><div class='del'>-} Query;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Calendar_Query__epv epv;</div><div class='del'>-} QueryClass;</div><div class='del'>-</div><div class='del'>-GtkType query_get_type (void);</div><div class='del'>-</div><div class='del'>-Query *query_construct (Query *query,</div><div class='del'>-			CalBackend *backend,</div><div class='del'>-			GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-			const char *sexp);</div><div class='del'>-</div><div class='del'>-Query *query_new (CalBackend *backend,</div><div class='del'>-		  GNOME_Evolution_Calendar_QueryListener ql,</div><div class='del'>-		  const char *sexp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/zones.h b/calendar/zones.h<br/>deleted file mode 100644<br/>index 06f10b749a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/zones.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>calendar/zones.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,383 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * These are the timezone names from the Olson timezone data.</div><div class='del'>- * We only place them here so gettext picks them up for translation.</div><div class='del'>- * Don't include in any C files.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-N_("Africa/Abidjan");</div><div class='del'>-N_("Africa/Accra");</div><div class='del'>-N_("Africa/Addis_Ababa");</div><div class='del'>-N_("Africa/Algiers");</div><div class='del'>-N_("Africa/Asmera");</div><div class='del'>-N_("Africa/Bamako");</div><div class='del'>-N_("Africa/Bangui");</div><div class='del'>-N_("Africa/Banjul");</div><div class='del'>-N_("Africa/Bissau");</div><div class='del'>-N_("Africa/Blantyre");</div><div class='del'>-N_("Africa/Brazzaville");</div><div class='del'>-N_("Africa/Bujumbura");</div><div class='del'>-N_("Africa/Cairo");</div><div class='del'>-N_("Africa/Casablanca");</div><div class='del'>-N_("Africa/Ceuta");</div><div class='del'>-N_("Africa/Conakry");</div><div class='del'>-N_("Africa/Dakar");</div><div class='del'>-N_("Africa/Dar_es_Salaam");</div><div class='del'>-N_("Africa/Djibouti");</div><div class='del'>-N_("Africa/Douala");</div><div class='del'>-N_("Africa/El_Aaiun");</div><div class='del'>-N_("Africa/Freetown");</div><div class='del'>-N_("Africa/Gaborone");</div><div class='del'>-N_("Africa/Harare");</div><div class='del'>-N_("Africa/Johannesburg");</div><div class='del'>-N_("Africa/Kampala");</div><div class='del'>-N_("Africa/Khartoum");</div><div class='del'>-N_("Africa/Kigali");</div><div class='del'>-N_("Africa/Kinshasa");</div><div class='del'>-N_("Africa/Lagos");</div><div class='del'>-N_("Africa/Libreville");</div><div class='del'>-N_("Africa/Lome");</div><div class='del'>-N_("Africa/Luanda");</div><div class='del'>-N_("Africa/Lubumbashi");</div><div class='del'>-N_("Africa/Lusaka");</div><div class='del'>-N_("Africa/Malabo");</div><div class='del'>-N_("Africa/Maputo");</div><div class='del'>-N_("Africa/Maseru");</div><div class='del'>-N_("Africa/Mbabane");</div><div class='del'>-N_("Africa/Mogadishu");</div><div class='del'>-N_("Africa/Monrovia");</div><div class='del'>-N_("Africa/Nairobi");</div><div class='del'>-N_("Africa/Ndjamena");</div><div class='del'>-N_("Africa/Niamey");</div><div class='del'>-N_("Africa/Nouakchott");</div><div class='del'>-N_("Africa/Ouagadougou");</div><div class='del'>-N_("Africa/Porto-Novo");</div><div class='del'>-N_("Africa/Sao_Tome");</div><div class='del'>-N_("Africa/Timbuktu");</div><div class='del'>-N_("Africa/Tripoli");</div><div class='del'>-N_("Africa/Tunis");</div><div class='del'>-N_("Africa/Windhoek");</div><div class='del'>-N_("America/Adak");</div><div class='del'>-N_("America/Anchorage");</div><div class='del'>-N_("America/Anguilla");</div><div class='del'>-N_("America/Antigua");</div><div class='del'>-N_("America/Araguaina");</div><div class='del'>-N_("America/Aruba");</div><div class='del'>-N_("America/Asuncion");</div><div class='del'>-N_("America/Barbados");</div><div class='del'>-N_("America/Belem");</div><div class='del'>-N_("America/Belize");</div><div class='del'>-N_("America/Boa_Vista");</div><div class='del'>-N_("America/Bogota");</div><div class='del'>-N_("America/Boise");</div><div class='del'>-N_("America/Buenos_Aires");</div><div class='del'>-N_("America/Cambridge_Bay");</div><div class='del'>-N_("America/Cancun");</div><div class='del'>-N_("America/Caracas");</div><div class='del'>-N_("America/Catamarca");</div><div class='del'>-N_("America/Cayenne");</div><div class='del'>-N_("America/Cayman");</div><div class='del'>-N_("America/Chicago");</div><div class='del'>-N_("America/Chihuahua");</div><div class='del'>-N_("America/Cordoba");</div><div class='del'>-N_("America/Costa_Rica");</div><div class='del'>-N_("America/Cuiaba");</div><div class='del'>-N_("America/Curacao");</div><div class='del'>-N_("America/Danmarkshavn");</div><div class='del'>-N_("America/Dawson");</div><div class='del'>-N_("America/Dawson_Creek");</div><div class='del'>-N_("America/Denver");</div><div class='del'>-N_("America/Detroit");</div><div class='del'>-N_("America/Dominica");</div><div class='del'>-N_("America/Edmonton");</div><div class='del'>-N_("America/Eirunepe");</div><div class='del'>-N_("America/El_Salvador");</div><div class='del'>-N_("America/Fortaleza");</div><div class='del'>-N_("America/Glace_Bay");</div><div class='del'>-N_("America/Godthab");</div><div class='del'>-N_("America/Goose_Bay");</div><div class='del'>-N_("America/Grand_Turk");</div><div class='del'>-N_("America/Grenada");</div><div class='del'>-N_("America/Guadeloupe");</div><div class='del'>-N_("America/Guatemala");</div><div class='del'>-N_("America/Guayaquil");</div><div class='del'>-N_("America/Guyana");</div><div class='del'>-N_("America/Halifax");</div><div class='del'>-N_("America/Havana");</div><div class='del'>-N_("America/Hermosillo");</div><div class='del'>-N_("America/Indiana/Indianapolis");</div><div class='del'>-N_("America/Indiana/Knox");</div><div class='del'>-N_("America/Indiana/Marengo");</div><div class='del'>-N_("America/Indiana/Vevay");</div><div class='del'>-N_("America/Indianapolis");</div><div class='del'>-N_("America/Inuvik");</div><div class='del'>-N_("America/Iqaluit");</div><div class='del'>-N_("America/Jamaica");</div><div class='del'>-N_("America/Jujuy");</div><div class='del'>-N_("America/Juneau");</div><div class='del'>-N_("America/Kentucky/Louisville");</div><div class='del'>-N_("America/Kentucky/Monticello");</div><div class='del'>-N_("America/La_Paz");</div><div class='del'>-N_("America/Lima");</div><div class='del'>-N_("America/Los_Angeles");</div><div class='del'>-N_("America/Louisville");</div><div class='del'>-N_("America/Maceio");</div><div class='del'>-N_("America/Managua");</div><div class='del'>-N_("America/Manaus");</div><div class='del'>-N_("America/Martinique");</div><div class='del'>-N_("America/Mazatlan");</div><div class='del'>-N_("America/Mendoza");</div><div class='del'>-N_("America/Menominee");</div><div class='del'>-N_("America/Merida");</div><div class='del'>-N_("America/Mexico_City");</div><div class='del'>-N_("America/Miquelon");</div><div class='del'>-N_("America/Monterrey");</div><div class='del'>-N_("America/Montevideo");</div><div class='del'>-N_("America/Montreal");</div><div class='del'>-N_("America/Montserrat");</div><div class='del'>-N_("America/Nassau");</div><div class='del'>-N_("America/New_York");</div><div class='del'>-N_("America/Nipigon");</div><div class='del'>-N_("America/Nome");</div><div class='del'>-N_("America/Noronha");</div><div class='del'>-N_("America/North_Dakota/Center");</div><div class='del'>-N_("America/Panama");</div><div class='del'>-N_("America/Pangnirtung");</div><div class='del'>-N_("America/Paramaribo");</div><div class='del'>-N_("America/Phoenix");</div><div class='del'>-N_("America/Port-au-Prince");</div><div class='del'>-N_("America/Port_of_Spain");</div><div class='del'>-N_("America/Porto_Velho");</div><div class='del'>-N_("America/Puerto_Rico");</div><div class='del'>-N_("America/Rainy_River");</div><div class='del'>-N_("America/Rankin_Inlet");</div><div class='del'>-N_("America/Recife");</div><div class='del'>-N_("America/Regina");</div><div class='del'>-N_("America/Rio_Branco");</div><div class='del'>-N_("America/Rosario");</div><div class='del'>-N_("America/Santiago");</div><div class='del'>-N_("America/Santo_Domingo");</div><div class='del'>-N_("America/Sao_Paulo");</div><div class='del'>-N_("America/Scoresbysund");</div><div class='del'>-N_("America/Shiprock");</div><div class='del'>-N_("America/St_Johns");</div><div class='del'>-N_("America/St_Kitts");</div><div class='del'>-N_("America/St_Lucia");</div><div class='del'>-N_("America/St_Thomas");</div><div class='del'>-N_("America/St_Vincent");</div><div class='del'>-N_("America/Swift_Current");</div><div class='del'>-N_("America/Tegucigalpa");</div><div class='del'>-N_("America/Thule");</div><div class='del'>-N_("America/Thunder_Bay");</div><div class='del'>-N_("America/Tijuana");</div><div class='del'>-N_("America/Tortola");</div><div class='del'>-N_("America/Vancouver");</div><div class='del'>-N_("America/Whitehorse");</div><div class='del'>-N_("America/Winnipeg");</div><div class='del'>-N_("America/Yakutat");</div><div class='del'>-N_("America/Yellowknife");</div><div class='del'>-N_("Antarctica/Casey");</div><div class='del'>-N_("Antarctica/Davis");</div><div class='del'>-N_("Antarctica/DumontDUrville");</div><div class='del'>-N_("Antarctica/Mawson");</div><div class='del'>-N_("Antarctica/McMurdo");</div><div class='del'>-N_("Antarctica/Palmer");</div><div class='del'>-N_("Antarctica/South_Pole");</div><div class='del'>-N_("Antarctica/Syowa");</div><div class='del'>-N_("Antarctica/Vostok");</div><div class='del'>-N_("Arctic/Longyearbyen");</div><div class='del'>-N_("Asia/Aden");</div><div class='del'>-N_("Asia/Almaty");</div><div class='del'>-N_("Asia/Amman");</div><div class='del'>-N_("Asia/Anadyr");</div><div class='del'>-N_("Asia/Aqtau");</div><div class='del'>-N_("Asia/Aqtobe");</div><div class='del'>-N_("Asia/Ashgabat");</div><div class='del'>-N_("Asia/Baghdad");</div><div class='del'>-N_("Asia/Bahrain");</div><div class='del'>-N_("Asia/Baku");</div><div class='del'>-N_("Asia/Bangkok");</div><div class='del'>-N_("Asia/Beirut");</div><div class='del'>-N_("Asia/Bishkek");</div><div class='del'>-N_("Asia/Brunei");</div><div class='del'>-N_("Asia/Calcutta");</div><div class='del'>-N_("Asia/Choibalsan");</div><div class='del'>-N_("Asia/Chongqing");</div><div class='del'>-N_("Asia/Colombo");</div><div class='del'>-N_("Asia/Damascus");</div><div class='del'>-N_("Asia/Dhaka");</div><div class='del'>-N_("Asia/Dili");</div><div class='del'>-N_("Asia/Dubai");</div><div class='del'>-N_("Asia/Dushanbe");</div><div class='del'>-N_("Asia/Gaza");</div><div class='del'>-N_("Asia/Harbin");</div><div class='del'>-N_("Asia/Hong_Kong");</div><div class='del'>-N_("Asia/Hovd");</div><div class='del'>-N_("Asia/Irkutsk");</div><div class='del'>-N_("Asia/Istanbul");</div><div class='del'>-N_("Asia/Jakarta");</div><div class='del'>-N_("Asia/Jayapura");</div><div class='del'>-N_("Asia/Jerusalem");</div><div class='del'>-N_("Asia/Kabul");</div><div class='del'>-N_("Asia/Kamchatka");</div><div class='del'>-N_("Asia/Karachi");</div><div class='del'>-N_("Asia/Kashgar");</div><div class='del'>-N_("Asia/Katmandu");</div><div class='del'>-N_("Asia/Krasnoyarsk");</div><div class='del'>-N_("Asia/Kuala_Lumpur");</div><div class='del'>-N_("Asia/Kuching");</div><div class='del'>-N_("Asia/Kuwait");</div><div class='del'>-N_("Asia/Macao");</div><div class='del'>-N_("Asia/Magadan");</div><div class='del'>-N_("Asia/Manila");</div><div class='del'>-N_("Asia/Muscat");</div><div class='del'>-N_("Asia/Nicosia");</div><div class='del'>-N_("Asia/Novosibirsk");</div><div class='del'>-N_("Asia/Omsk");</div><div class='del'>-N_("Asia/Phnom_Penh");</div><div class='del'>-N_("Asia/Pontianak");</div><div class='del'>-N_("Asia/Pyongyang");</div><div class='del'>-N_("Asia/Qatar");</div><div class='del'>-N_("Asia/Rangoon");</div><div class='del'>-N_("Asia/Riyadh");</div><div class='del'>-N_("Asia/Saigon");</div><div class='del'>-N_("Asia/Sakhalin");</div><div class='del'>-N_("Asia/Samarkand");</div><div class='del'>-N_("Asia/Seoul");</div><div class='del'>-N_("Asia/Shanghai");</div><div class='del'>-N_("Asia/Singapore");</div><div class='del'>-N_("Asia/Taipei");</div><div class='del'>-N_("Asia/Tashkent");</div><div class='del'>-N_("Asia/Tbilisi");</div><div class='del'>-N_("Asia/Tehran");</div><div class='del'>-N_("Asia/Thimphu");</div><div class='del'>-N_("Asia/Tokyo");</div><div class='del'>-N_("Asia/Ujung_Pandang");</div><div class='del'>-N_("Asia/Ulaanbaatar");</div><div class='del'>-N_("Asia/Urumqi");</div><div class='del'>-N_("Asia/Vientiane");</div><div class='del'>-N_("Asia/Vladivostok");</div><div class='del'>-N_("Asia/Yakutsk");</div><div class='del'>-N_("Asia/Yekaterinburg");</div><div class='del'>-N_("Asia/Yerevan");</div><div class='del'>-N_("Atlantic/Azores");</div><div class='del'>-N_("Atlantic/Bermuda");</div><div class='del'>-N_("Atlantic/Canary");</div><div class='del'>-N_("Atlantic/Cape_Verde");</div><div class='del'>-N_("Atlantic/Faeroe");</div><div class='del'>-N_("Atlantic/Jan_Mayen");</div><div class='del'>-N_("Atlantic/Madeira");</div><div class='del'>-N_("Atlantic/Reykjavik");</div><div class='del'>-N_("Atlantic/South_Georgia");</div><div class='del'>-N_("Atlantic/St_Helena");</div><div class='del'>-N_("Atlantic/Stanley");</div><div class='del'>-N_("Australia/Adelaide");</div><div class='del'>-N_("Australia/Brisbane");</div><div class='del'>-N_("Australia/Broken_Hill");</div><div class='del'>-N_("Australia/Darwin");</div><div class='del'>-N_("Australia/Hobart");</div><div class='del'>-N_("Australia/Lindeman");</div><div class='del'>-N_("Australia/Lord_Howe");</div><div class='del'>-N_("Australia/Melbourne");</div><div class='del'>-N_("Australia/Perth");</div><div class='del'>-N_("Australia/Sydney");</div><div class='del'>-N_("Europe/Amsterdam");</div><div class='del'>-N_("Europe/Andorra");</div><div class='del'>-N_("Europe/Athens");</div><div class='del'>-N_("Europe/Belfast");</div><div class='del'>-N_("Europe/Belgrade");</div><div class='del'>-N_("Europe/Berlin");</div><div class='del'>-N_("Europe/Bratislava");</div><div class='del'>-N_("Europe/Brussels");</div><div class='del'>-N_("Europe/Bucharest");</div><div class='del'>-N_("Europe/Budapest");</div><div class='del'>-N_("Europe/Chisinau");</div><div class='del'>-N_("Europe/Copenhagen");</div><div class='del'>-N_("Europe/Dublin");</div><div class='del'>-N_("Europe/Gibraltar");</div><div class='del'>-N_("Europe/Helsinki");</div><div class='del'>-N_("Europe/Istanbul");</div><div class='del'>-N_("Europe/Kaliningrad");</div><div class='del'>-N_("Europe/Kiev");</div><div class='del'>-N_("Europe/Lisbon");</div><div class='del'>-N_("Europe/Ljubljana");</div><div class='del'>-N_("Europe/London");</div><div class='del'>-N_("Europe/Luxembourg");</div><div class='del'>-N_("Europe/Madrid");</div><div class='del'>-N_("Europe/Malta");</div><div class='del'>-N_("Europe/Minsk");</div><div class='del'>-N_("Europe/Monaco");</div><div class='del'>-N_("Europe/Moscow");</div><div class='del'>-N_("Europe/Nicosia");</div><div class='del'>-N_("Europe/Oslo");</div><div class='del'>-N_("Europe/Paris");</div><div class='del'>-N_("Europe/Prague");</div><div class='del'>-N_("Europe/Riga");</div><div class='del'>-N_("Europe/Rome");</div><div class='del'>-N_("Europe/Samara");</div><div class='del'>-N_("Europe/San_Marino");</div><div class='del'>-N_("Europe/Sarajevo");</div><div class='del'>-N_("Europe/Simferopol");</div><div class='del'>-N_("Europe/Skopje");</div><div class='del'>-N_("Europe/Sofia");</div><div class='del'>-N_("Europe/Stockholm");</div><div class='del'>-N_("Europe/Tallinn");</div><div class='del'>-N_("Europe/Tirane");</div><div class='del'>-N_("Europe/Uzhgorod");</div><div class='del'>-N_("Europe/Vaduz");</div><div class='del'>-N_("Europe/Vatican");</div><div class='del'>-N_("Europe/Vienna");</div><div class='del'>-N_("Europe/Vilnius");</div><div class='del'>-N_("Europe/Warsaw");</div><div class='del'>-N_("Europe/Zagreb");</div><div class='del'>-N_("Europe/Zaporozhye");</div><div class='del'>-N_("Europe/Zurich");</div><div class='del'>-N_("Indian/Antananarivo");</div><div class='del'>-N_("Indian/Chagos");</div><div class='del'>-N_("Indian/Christmas");</div><div class='del'>-N_("Indian/Cocos");</div><div class='del'>-N_("Indian/Comoro");</div><div class='del'>-N_("Indian/Kerguelen");</div><div class='del'>-N_("Indian/Mahe");</div><div class='del'>-N_("Indian/Maldives");</div><div class='del'>-N_("Indian/Mauritius");</div><div class='del'>-N_("Indian/Mayotte");</div><div class='del'>-N_("Indian/Reunion");</div><div class='del'>-N_("Pacific/Apia");</div><div class='del'>-N_("Pacific/Auckland");</div><div class='del'>-N_("Pacific/Chatham");</div><div class='del'>-N_("Pacific/Easter");</div><div class='del'>-N_("Pacific/Efate");</div><div class='del'>-N_("Pacific/Enderbury");</div><div class='del'>-N_("Pacific/Fakaofo");</div><div class='del'>-N_("Pacific/Fiji");</div><div class='del'>-N_("Pacific/Funafuti");</div><div class='del'>-N_("Pacific/Galapagos");</div><div class='del'>-N_("Pacific/Gambier");</div><div class='del'>-N_("Pacific/Guadalcanal");</div><div class='del'>-N_("Pacific/Guam");</div><div class='del'>-N_("Pacific/Honolulu");</div><div class='del'>-N_("Pacific/Johnston");</div><div class='del'>-N_("Pacific/Kiritimati");</div><div class='del'>-N_("Pacific/Kosrae");</div><div class='del'>-N_("Pacific/Kwajalein");</div><div class='del'>-N_("Pacific/Majuro");</div><div class='del'>-N_("Pacific/Marquesas");</div><div class='del'>-N_("Pacific/Midway");</div><div class='del'>-N_("Pacific/Nauru");</div><div class='del'>-N_("Pacific/Niue");</div><div class='del'>-N_("Pacific/Norfolk");</div><div class='del'>-N_("Pacific/Noumea");</div><div class='del'>-N_("Pacific/Pago_Pago");</div><div class='del'>-N_("Pacific/Palau");</div><div class='del'>-N_("Pacific/Pitcairn");</div><div class='del'>-N_("Pacific/Ponape");</div><div class='del'>-N_("Pacific/Port_Moresby");</div><div class='del'>-N_("Pacific/Rarotonga");</div><div class='del'>-N_("Pacific/Saipan");</div><div class='del'>-N_("Pacific/Tahiti");</div><div class='del'>-N_("Pacific/Tarawa");</div><div class='del'>-N_("Pacific/Tongatapu");</div><div class='del'>-N_("Pacific/Truk");</div><div class='del'>-N_("Pacific/Wake");</div><div class='del'>-N_("Pacific/Wallis");</div><div class='del'>-N_("Pacific/Yap");</div><div class='head'>diff --git a/camel/.cvsignore b/camel/.cvsignore<br/>deleted file mode 100644<br/>index 094641c7a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='del'>-camel-lock-helper</div><div class='del'>-camel-index-control
\ No newline at end of file</div><div class='head'>diff --git a/camel/CODING.STYLE b/camel/CODING.STYLE<br/>deleted file mode 100644<br/>index 58e9c68bbe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/CODING.STYLE?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/CODING.STYLE</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-Note to hackers</div><div class='del'>----------------</div><div class='del'>-</div><div class='del'>-When hacking on camel (and on the gnome mailer in general), </div><div class='del'>-be sure to follow the same coding style as the initial authors.</div><div class='del'>-Please read the file HACKING in gnumeric and follow the</div><div class='del'>-general guidelines explained in it.</div><div class='del'>-</div><div class='del'>-Please take a look at camel source files and try to exactly</div><div class='del'>-imitate the coding style. We are perfectly aware that this</div><div class='del'>-is not the best and unique style, but it is absolutely</div><div class='del'>-mandatory that Camel is homogeneous.  If you find the current</div><div class='del'>-coding style to have some weaknesses, please contact the</div><div class='del'>-authors to discuss this matter.</div><div class='del'>-</div><div class='del'>-Thanks.</div><div class='del'>-</div><div class='del'>-	Bertrand.</div><div class='del'>-</div><div class='head'>diff --git a/camel/ChangeLog b/camel/ChangeLog<br/>deleted file mode 100644<br/>index 897085bba2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18330 +0,0 @@</div><div class='del'>-2002-05-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (refresh_folder_info): removed.</div><div class='del'>-	(imap_store_refresh_folders): Copy the folders first, then refresh</div><div class='del'>-	them, outside of the cache_lock, which could cause deadlocks</div><div class='del'>-	because of a workaround for crappo exchange.</div><div class='del'>-	(imap_disconnect_online): Dont pass an exception to LOGOUT</div><div class='del'>-	command.  The required response 'BYE' always sets an exception</div><div class='del'>-	when we call LOGOUT.  This also interfered with a lot of other</div><div class='del'>-	processing causing partial failures and messed up offline/online</div><div class='del'>-	state.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c (disco_prepare_for_offline): Do progress</div><div class='del'>-	reporting.</div><div class='del'>-</div><div class='del'>-2002-05-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #24136.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (content_info_get_part_spec):</div><div class='del'>-	New function to take a CamelMessageContentInfo and generate a</div><div class='del'>-	part-specification string.</div><div class='del'>-	(get_content): Stop passing around part_spec strings and use</div><div class='del'>-	content_info_get_part_spec instead.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_content_info_dump): Made this into</div><div class='del'>-	a public debugging function.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_body): Make sure</div><div class='del'>-	to set the parent of any message/rfc822 subparts.</div><div class='del'>-</div><div class='del'>-2002-05-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Previous</div><div class='del'>-	fix reverted.</div><div class='del'>-</div><div class='del'>-2002-05-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):</div><div class='del'>-	Overload the setv/getv CamelObject virtual methods.</div><div class='del'>-	(imap_setv): Implemented.</div><div class='del'>-	(imap_getv): Implemented.</div><div class='del'>-</div><div class='del'>-2002-05-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_append_message): Add a "char</div><div class='del'>-	**appended_uid" argument, for the caller to optionally pass in a</div><div class='del'>-	variable to receive the UID of the appended message (if the</div><div class='del'>-	provider knows it).</div><div class='del'>-	(camel_folder_transfer_messages_to): Likewise, add "GPtrArray</div><div class='del'>-	**transferred_uids"</div><div class='del'>-	(transfer_messages_to): Update default implementation to handle</div><div class='del'>-	transferred_uids.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c (disco_append_message,</div><div class='del'>-	disco_transfer_messages_to): Update for API changes.</div><div class='del'>-</div><div class='del'>-	* camel-disco-diary.c (camel_disco_diary_replay): Update the</div><div class='del'>-	diary's temporary uid-&gt;real uid map when replaying appends and</div><div class='del'>-	transfers.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_offline,</div><div class='del'>-	imap_append_online, imap_transfer_offline): Pass back the new</div><div class='del'>-	UIDs, when requested and available.</div><div class='del'>-	(imap_append_resyncing): Pass back the new UIDs when requested and</div><div class='del'>-	available. Remove the diary uidmap managing code since</div><div class='del'>-	CamelDiscoDiary can handle that itself now.</div><div class='del'>-	(imap_transfer_online, imap_transfer_resyncing): Update for new</div><div class='del'>-	APIs, but don't actually pass back the new UIDs yet. (It's tricky</div><div class='del'>-	since the COPYUID response may not be in the same order as the</div><div class='del'>-	input uids.)</div><div class='del'>-	</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_append_message):</div><div class='del'>-	Pass back the new UID if requested.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_append_message): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c (spool_append_message):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c (digest_append_message,</div><div class='del'>-	digest_transfer_messages_to): Update for API changes.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c	(camel_filter_driver_filter_message,</div><div class='del'>-	do_copy, do_move): Update for API changes.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_append_message,</div><div class='del'>-	vee_transfer_messages_to): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_append_message,</div><div class='del'>-	vtrash_transfer_messages_to): Likewise. </div><div class='del'>-</div><div class='del'>-2002-05-13  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c</div><div class='del'>-	(camel_folder_thread_messages_new_summary):</div><div class='del'>-	(camel_folder_thread_messages_new): Since the fix for #3357 uses</div><div class='del'>-	'order=0' to indicate tree structure nodes, make sure we dont</div><div class='del'>-	actually set order=0 for valid messages, otherwise we silently</div><div class='del'>-	lose duplicates of the first message (i==0).  Fixes #19920.</div><div class='del'>-</div><div class='del'>-2002-05-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Fetch the</div><div class='del'>-	BODYSTRUCTURE rather than BODY since BODY seems to be lacking some</div><div class='del'>-	of the data we need. This fixes bug #24136.</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_get_type): Might help if we</div><div class='del'>-	called camel_transport_class_init.</div><div class='del'>-</div><div class='del'>-2002-05-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_transfer_messages_to): Replace</div><div class='del'>-	copy_messages_to and move_messages_to with a single function that</div><div class='del'>-	just takes a "delete_originals" flag. Also, use the vtrash</div><div class='del'>-	implementation if *either* folder is a vtrash.</div><div class='del'>-	(transfer_messages_to): Make this use camel_operation_progress</div><div class='del'>-	(previously move_messages_to did but copy_messages_to didn't), and</div><div class='del'>-	freeze/thaw the folder(s) if doing multiple messages.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_transfer_messages_to): Update for</div><div class='del'>-	move/copy merge. Move the "move messages into vtrash" code here</div><div class='del'>-	from mail-ops.c. Now all of the vtrash move/copy special casing is</div><div class='del'>-	in camel instead of half of it being here and half in mail/. (This</div><div class='del'>-	should also make it so that "Move to Trash" will work in filter</div><div class='del'>-	rules.)</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_transfer_messages_to): Make this just</div><div class='del'>-	return an exception, since it will only be called when trying to</div><div class='del'>-	move/copy messages from one vfolder to another.</div><div class='del'>-	(vee_append_message): Add this too so we get a nicer error message</div><div class='del'>-	than the default "unimplemented" one in camel-folder.c.</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c: Replace copy_messages_to and</div><div class='del'>-	move_messages_to with transfer_messages_to.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c: Likewise</div><div class='del'>-</div><div class='del'>-	* camel-disco-diary.c (camel_disco_diary_log,</div><div class='del'>-	camel_disco_diary_replay): replace MOVE/COPY with TRANSFER.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_transfer_offline,</div><div class='del'>-	imap_transfer_online, imap_transfer_resyncing): Update for</div><div class='del'>-	changes. (This ends up being a bit more complicated than it was</div><div class='del'>-	before for now, but later disconnected operation changes should</div><div class='del'>-	resimplify it.)</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message,</div><div class='del'>-	do_copy, do_move): Use transfer_messages_to instead of copy.</div><div class='del'>-</div><div class='del'>-2002-05-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (shell_exec): New filter function to pipe</div><div class='del'>-	a message to another program.</div><div class='del'>-	(run_command): Fixed some bugs to make this work.</div><div class='del'>-</div><div class='del'>-2002-05-09  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_disconnect): Instead of testing</div><div class='del'>-	for SERVICE_CONNECTED, we need to also handle SERVICE_CONNECTING</div><div class='del'>-	too, as it will often have setup some details before it failed.</div><div class='del'>-	Make it !DISCONNECTED (and !DISCONNECTING for recursive calls,</div><div class='del'>-	which happen).  Fixes #23782, and maybe also #21604 and many other</div><div class='del'>-	random crashes.</div><div class='del'>-</div><div class='del'>-2002-05-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-digest-store.c (digest_setv): Implemented.</div><div class='del'>-	(digest_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c (disco_setv): Implemented.</div><div class='del'>-	(disco_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_store_setv): Implemented.</div><div class='del'>-	(remote_store_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_class_init): Implemented.</div><div class='del'>-	(transport_setv): Implemented.</div><div class='del'>-	(transport_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (store_setv): Implemented.</div><div class='del'>-	(store_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (service_setv): Implemented.</div><div class='del'>-	(service_getv): Implemented.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate):</div><div class='del'>-	camel_pop3_engine_iterate doesn't return the state, it returns -1</div><div class='del'>-	on fail, 0 when finished processing request or &gt;0 if more ops are</div><div class='del'>-	in the queue, so don't check status against CAMEL_POP3_STATE_OK,</div><div class='del'>-	instead check pcp-&gt;state against that.</div><div class='del'>-</div><div class='del'>-2002-05-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.h: s/class/klass for arguments so that c++</div><div class='del'>-	developers don't complain later.</div><div class='del'>-</div><div class='del'>-2002-05-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_class_cast): Fix a crash in a</div><div class='del'>-	g_warning.</div><div class='del'>-</div><div class='del'>-2002-05-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_string): Check for LOGIN xxxx</div><div class='del'>-	as well if debug is on, so we dont print passwords to evolution</div><div class='del'>-	logs.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_is_atom_char): This was</div><div class='del'>-	really broken.  1. isprint() is locale dependent, and 2. it looked</div><div class='del'>-	up an 8 bit value in a 7 bit table without truncating it.  I've</div><div class='del'>-	removed the isprint() stuff and just put it directly into the</div><div class='del'>-	special table, which i've expanded to the right size too.</div><div class='del'>-</div><div class='del'>-	* providers/imap/*: Applied patch from Preston Elder</div><div class='del'>-	&lt;prez@magick.tm&gt; to make camel only use literals if it needs to</div><div class='del'>-	for simple strings.  Changed slightly to use imap_is_atom() and</div><div class='del'>-	more consistent formatting.</div><div class='del'>-	providers/imap/camel-imap-utils.c (imap_is_atom): Chagned from</div><div class='del'>-	imap_needs_quoting().</div><div class='del'>-</div><div class='del'>-	** Merged in camel-object2 branch.  Simpler camelobject</div><div class='del'>-	implementation + object args interface.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Call camel_object_get_type() to make sure</div><div class='del'>-	camel_object_type is initialised.</div><div class='del'>-</div><div class='del'>-	* camel-object.h (CAMEL_OBJECT_TYPE): Changed to return global</div><div class='del'>-	camel_object_type pointer, not call camel_object_get_type.</div><div class='del'>-	</div><div class='del'>-2002-05-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): If</div><div class='del'>-	the pop3 command status is -1, then we probably have a TCP error</div><div class='del'>-	(?) so set a SYSTEM exception so our caller can distinguish</div><div class='del'>-	between a "bad password" and a "tcp error".</div><div class='del'>-	(pop3_connect): Only uncache the password on "bad password"</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (pgp_mime_part_sign_prepare_part): Use</div><div class='del'>-	CamelMimeFilterBestenc to get a more appropriate encoding rather</div><div class='del'>-	than just blindling assigning QP.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (do_append): Call</div><div class='del'>-	camel_mime_message_encode_8bit_parts() which fixes bug #10885.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (socket_connect): Don't bother with</div><div class='del'>-	counting down the timeout.</div><div class='del'>-</div><div class='del'>-2002-05-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_read): Same fix as the tcp stream.</div><div class='del'>-	(stream_write): Again here. Just like tcp stream's stream_write(),</div><div class='del'>-	also make sure to save errno before calling fcntl to restore the</div><div class='del'>-	fd flags.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_read): Handle EINTR errors for</div><div class='del'>-	select().</div><div class='del'>-	(stream_write): Same and also preserve errno when setting the fd</div><div class='del'>-	flags back. If w == -1, return -1.</div><div class='del'>-</div><div class='del'>-2002-05-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Fixed the fix for</div><div class='del'>-	stupidly-broken-mailer bug #5 to work when multiple unescaped</div><div class='del'>-	characters were in a row. Fixes bug #24140.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (socket_connect): Check select() for</div><div class='del'>-	EINTR errors.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Change the order</div><div class='del'>-	of some code so that we check if the select() failed before we</div><div class='del'>-	check for user-cancellation.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_gethostbyname): Check for EINTR when</div><div class='del'>-	select()ing.</div><div class='del'>-	(camel_gethostbyaddr): Same.</div><div class='del'>-</div><div class='del'>-2002-04-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.c (camel_provider_auto_detect): Now takes a</div><div class='del'>-	CamelURL argument rather than a GHashTable *settings argument.</div><div class='del'>-</div><div class='del'>-2002-04-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder_info): We want</div><div class='del'>-	to set unread_count to get_unread_message_count, not</div><div class='del'>-	get_message_count().  Might fix #17174.  Also removed FIXME: as it</div><div class='del'>-	was fixed.</div><div class='del'>-</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/Makefile.am: Don't link to libibex.a anymore.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: And again here.</div><div class='del'>-</div><div class='del'>-	* camel-store-summary.h: No longer want to #include</div><div class='del'>-	&lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.c (camel_provider_auto_detect): New function to</div><div class='del'>-	auto-detect configuration settings.</div><div class='del'>-</div><div class='del'>-2002-04-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (block_file_validate_root): Remove the</div><div class='del'>-	excessive \n's, after printfs.</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_compress_nosync): @!#$@#$!@$#!.</div><div class='del'>-	Since the rename op was fixed, this broke compression's rename,</div><div class='del'>-	resulting in the index 'vanishing' after every compress</div><div class='del'>-	(i.e. after every reindex).  Fix this code to account for the</div><div class='del'>-	fixed rename operation.</div><div class='del'>-</div><div class='del'>-2002-04-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_rcpt): Don't put a</div><div class='del'>-	space between the "RCPT TO:" and the "&lt;recipient&gt;" strings -</div><div class='del'>-	rfc0821 was not clear on this but it seems rfc2821 defines a</div><div class='del'>-	grammar excluding that SP.</div><div class='del'>-	(smtp_mail): Same.</div><div class='del'>-</div><div class='del'>-2002-04-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c</div><div class='del'>-	(camel_provider_module_init): Configure the default paths for mh,</div><div class='del'>-	mbox, maildir, spools, etc.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add a CAMEL_PROVIDER_CONF_LABEL enum and</div><div class='del'>-	define some default CamelProviderConfEntry macros.</div><div class='del'>-</div><div class='del'>-2002-04-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Free the</div><div class='del'>-	LIST pop3 command.</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.c (data_cache_finalise): Free the cdc-&gt;path.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (write_to_stream): Don't g_return_val_if_fail</div><div class='del'>-	here if the boundary is an empty string. See bug #23676 for</div><div class='del'>-	details. The way I see it, we have 2 options: 1) leave this fix</div><div class='del'>-	the way it is, thus allowing multipart boundaries to be</div><div class='del'>-	empty-strings; or 2) make camel_multipart_get_boundary() change</div><div class='del'>-	the boundary to something legal if the boundary is an</div><div class='del'>-	empty-string. Since the parser should be able to handle an</div><div class='del'>-	empty-string boundary *and* more importantly because we want to</div><div class='del'>-	keep the same boundaries as the original raw message so as to be</div><div class='del'>-	able to verify multipart/signed parts, I vote for solution #1.</div><div class='del'>-</div><div class='del'>-2002-04-19  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel-index.txt: Start of a white-paperish document</div><div class='del'>-	describing camel-index and older libibex.</div><div class='del'>-</div><div class='del'>-2002-04-18  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (rename_folder): If we get a</div><div class='del'>-	failure, make sure we set an exception.</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (camel_text_index_rename): If the file</div><div class='del'>-	doesn't exist, just assume it never did, dont return failure.</div><div class='del'>-	(text_index_rename): Add '.index' to the path name we're using,</div><div class='del'>-	since we dont get it passed in.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (check_header): When doing a contains</div><div class='del'>-	match, split the words and perform an and on it.</div><div class='del'>-	(match_words_messages): If we have an index, but were forced to do</div><div class='del'>-	a full search, first lookup a subset of messages using</div><div class='del'>-	the index and a simplified word set.  Only do a manual search of</div><div class='del'>-	this subset.</div><div class='del'>-</div><div class='del'>-2002-04-17  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (match_message_index): Changed to take a</div><div class='del'>-	utf8 string not a regex pattern.</div><div class='del'>-	(match_words_index): Matches against a camel_search_words list.</div><div class='del'>-	(match_words_1message): Matches a single message against a</div><div class='del'>-	camel_search_words list.</div><div class='del'>-	(match_words_message): Same, but gets the message from the folder</div><div class='del'>-	for you.</div><div class='del'>-	(match_words_messages): Matches a list of messages against a words</div><div class='del'>-	list.</div><div class='del'>-	(search_body_contains): Rewritten to handle multiple word</div><div class='del'>-	searches.  For #23371.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (sync_match): Split words</div><div class='del'>-	when searching, to support multiple search words.  Also, try</div><div class='del'>-	searching specifying charset of utf8 if we can, if that fails,</div><div class='del'>-	fall back to not specifying charset.  TODO: It should translate</div><div class='del'>-	the strings into the locale default charset?</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (connect_to_server): Added new</div><div class='del'>-	cap - utf8_search, if set, we tell the server we're searching</div><div class='del'>-	using utf8, otherwise we dont (incorrectly, since we always use</div><div class='del'>-	utf8 to search).</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_ustrstrcase): Make this class public.</div><div class='del'>-	(camel_search_words_split): Split a word into multiple words based</div><div class='del'>-	on whitespace, and keep track of whether the word is simple</div><div class='del'>-	(indexable directly), or not.</div><div class='del'>-	(camel_search_words_free): Free 'em.</div><div class='del'>-</div><div class='del'>-2002-04-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_search_by_expression): If the vee-folder</div><div class='del'>-	is the unmatched, we don't have our own expression so we cannot</div><div class='del'>-	merge them. Instead, just use the expression passed in. This fixes</div><div class='del'>-	a Null-Pointer-Read crash on Solaris systems at least.</div><div class='del'>-</div><div class='del'>-2002-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Get</div><div class='del'>-	rid of an unused variable.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Use</div><div class='del'>-	camel_gethostbyaddr since gethostbyaddr is not reentrant.</div><div class='del'>-</div><div class='del'>-	* camel-http-stream.c (http_connect): Updated after the rename of</div><div class='del'>-	camel_get_host_byname.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_gethostbyname): Renamed.</div><div class='del'>-	(camel_gethostbyaddr): New cancellable/reentrant version of</div><div class='del'>-	gethostbyaddr.</div><div class='del'>-</div><div class='del'>-2002-04-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spoold-store.c: Added #include</div><div class='del'>-	&lt;sys/types.h&gt; for dirent.h which needs it on MacOS X.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c: Same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c: Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c: Same.</div><div class='del'>-</div><div class='del'>-	* camel-provider.c: Same.</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.c: Same.</div><div class='del'>-</div><div class='del'>-2002-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* broken-date-parser.c (datetok): Treat commas as token</div><div class='del'>-	delimeters.</div><div class='del'>-	(WEEKDAY_CHARS): Use full weekday names in case the broken mailer</div><div class='del'>-	used the full names.</div><div class='del'>-	(MONTH_CHARS): Same as above but for months.</div><div class='del'>-</div><div class='del'>-2002-04-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* *.c: Fix callers for api changes to camel-object, mainly</div><div class='del'>-	declare_event-&gt;add_event, and classfuncs-&gt;klass, and a couple</div><div class='del'>-        of missing #include &lt;config.h&gt;'s</div><div class='del'>-</div><div class='del'>-	* camel-arg.[ch], Makefile.am: New support code for</div><div class='del'>-	camel_object_get/set arg.</div><div class='del'>-</div><div class='del'>-	* *.h: Fixed all uses of get_type to return a CamelType rather</div><div class='del'>-	than a guint (now a pointer).</div><div class='del'>-</div><div class='del'>-	* camel-object.[ch]: Major cleanup of object implementation.  Also</div><div class='del'>-	added a get/set interface, and some debugging options.</div><div class='del'>-</div><div class='del'>-2002-04-11  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (spool_summary_sync_full):</div><div class='del'>-	If the last message(s) were deleted, and we had any messages</div><div class='del'>-	output, account for the lost \n of the following From line by</div><div class='del'>-	adding an extra \n. fix for #8214.</div><div class='del'>-</div><div class='del'>-2002-04-10  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): If we get a 0 length</div><div class='del'>-	input, return a 0 lenght output as valid - fixes bugs with some</div><div class='del'>-	iconv impl and its simpler anyway.</div><div class='del'>-</div><div class='del'>-2002-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Set the UID_SET_LIMIT value</div><div class='del'>-	to 4096. I ran into an issue tonight where apparently the IMAP</div><div class='del'>-	server changed the UIDVALIDITY and so Evo needed to re-fetch all</div><div class='del'>-	headers and it was trying to send a uid set of some 25k (yes, I</div><div class='del'>-	have a very large INBOX). Anyways, it was set to unlimited</div><div class='del'>-	before. Courier IMAPd can safely handle up to ~16k per token, but</div><div class='del'>-	UW IMAPd can only handle 8k per command-line, so I set it to 4k</div><div class='del'>-	just to be safe.</div><div class='del'>-</div><div class='del'>-2002-04-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): Fixed a bug that would</div><div class='del'>-	miscalculate how much data to copy into the GByteArray (negative</div><div class='del'>-	value) thus causing a segfault. Also optimized it while I was at</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-2002-04-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Make the folder_lock</div><div class='del'>-	recursive. See bug #22363 for details. Basically,</div><div class='del'>-	get_folder_info() is requesting a diary folder which in turn</div><div class='del'>-	connects which requests then calls get_folder() but deadlocks</div><div class='del'>-	because get_folder_info already holds the lock.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_date): Don't adjust</div><div class='del'>-	the timezone offset if we used tm.tm_gmtoff because it is already</div><div class='del'>-	adjusted.</div><div class='del'>-</div><div class='del'>-2002-04-09  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): If we get multiple</div><div class='del'>-	Content-Type header values, change subsequent headers to</div><div class='del'>-	X-Invalid-Content-Type so it doesn't wreck processing.  This fixes</div><div class='del'>-	the reported case in #18929, but i dont know if it fixes the</div><div class='del'>-	original posters problems.</div><div class='del'>-</div><div class='del'>-2002-04-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_move_messages_to): If we find</div><div class='del'>-	we're moving from the vtrash to another folder, we need to convert</div><div class='del'>-	the uid from a vfolder uid to the source uid (+8).  Fix for</div><div class='del'>-	#20886.  Also changed to batch multiple moves to different folders</div><div class='del'>-	so they are done as efficiently as possible rather than one at a</div><div class='del'>-	time.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_decode_step): If we only get passed</div><div class='del'>-	'=', we back track only if we actually output any data.  Fix for</div><div class='del'>-	#21716.</div><div class='del'>-	(quoted_decode): Pass out size_t instead of int, and use 0 instead</div><div class='del'>-	of -1 for error since its not signed.  This will fix similar bug</div><div class='del'>-	to above in different circumstances since the result is taken as</div><div class='del'>-	unsigned.  This is only an internal func.</div><div class='del'>-	(quoted_encode): Return size_t just for consistency.</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (block_file_validate_root): Comment out the</div><div class='del'>-	debug and move it into a warning when the validation fails.</div><div class='del'>-</div><div class='del'>-2002-04-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uuencode_close): Don't count our filler when</div><div class='del'>-	encoding our line-length octet.</div><div class='del'>-</div><div class='del'>-2002-04-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-http-stream.c (http_get_headers): Don't get the statuscode</div><div class='del'>-	here anymore.</div><div class='del'>-	(http_method_invoke): Use a User-Agent header and do basic proxy</div><div class='del'>-	authentication.</div><div class='del'>-	(stream_read): Handle redirects.</div><div class='del'>-	(camel_http_stream_set_user_agent): New function to allow client</div><div class='del'>-	to set the User-Agent string.</div><div class='del'>-	(camel_http_stream_set_proxy): New function for setting the proxy</div><div class='del'>-	server.</div><div class='del'>-	(camel_http_stream_set_proxy_authrealm): New function for setting</div><div class='del'>-	the proxy auth realm.</div><div class='del'>-	(camel_http_stream_set_proxy_authpass): New function for setting</div><div class='del'>-	the proxy auth password.</div><div class='del'>-</div><div class='del'>-2002-04-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Simplified since we</div><div class='del'>-	can now decode in-reply-to without getting extra cruft. Get rid of</div><div class='del'>-	the FIXME about having to check scan-&gt;id because of the</div><div class='del'>-	possibility of it being NULL, this can no longer happen.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_inreplyto_decode): New</div><div class='del'>-	function to decode in-reply-to headers. Only grabs the first thing</div><div class='del'>-	that looks like a message-id and then returns.</div><div class='del'>-	(header_references_decode): Loop calling</div><div class='del'>-	header_references_decode_single (a new internal function).</div><div class='del'>-</div><div class='del'>-2002-04-04  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains): If</div><div class='del'>-	(body-contains) is not passed any arguments, return empty/false.</div><div class='del'>-	Fixes a crash exposed by #15001.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Reset the keepalive</div><div class='del'>-	timeout to 10 minutes rather than the 30 seconds I was using for</div><div class='del'>-	testing.</div><div class='del'>-</div><div class='del'>-2002-04-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h (CamelProvider): make service_cache be an array</div><div class='del'>-	of CAMEL_NUM_PROVIDER_TYPES elements so you can have a single</div><div class='del'>-	provider offer both stores and transports. (Eg, Exchange, NNTP)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: Don't initialize</div><div class='del'>-	service_cache here. (The session code can do it itself since the</div><div class='del'>-	url_hash and url_equal functions are stored as part of the</div><div class='del'>-	provider.)</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (register_provider): Initialize the provider's</div><div class='del'>-	service cache(s) here.</div><div class='del'>-	(camel_session_class_init): Don't initialize.</div><div class='del'>-	vee_provider.service_cache here.</div><div class='del'>-	(camel_session_destroy_provider): Update to destroy multiple</div><div class='del'>-	service_caches.</div><div class='del'>-	(service_cache_remove, get_service): Tweak these a bit to deal</div><div class='del'>-	with multiple service_caches.</div><div class='del'>-</div><div class='del'>-2002-04-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (set_errno): Handle a ton more nspr i/o</div><div class='del'>-	errno's.</div><div class='del'>-	(stream_connect): Act as if we are doing a non-blocking</div><div class='del'>-	connect. This is to try and work around bug #15120 where users get</div><div class='del'>-	an EINPROGRESS error. Maybe importing a PRFileDesc into SSL mode</div><div class='del'>-	automagically makes it non-blocking? I dunno.</div><div class='del'>-</div><div class='del'>-2002-04-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Updated the</div><div class='del'>-	construction of the references to match JWZ's updated algorithm</div><div class='del'>-	initialization (ie, append any In-Reply-To reference onto any</div><div class='del'>-	References header and never take more than a single message-id</div><div class='del'>-	from the In-Reply-To header since anything after the first will</div><div class='del'>-	probably just be email addresses). Fixes bug #1336.</div><div class='del'>-</div><div class='del'>-2002-04-03  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Turn indexing back on, fingers</div><div class='del'>-	crossed ...</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (sync_nolock): #!@$@$#@~#$</div><div class='del'>-	DF@#$!Q@$#!@$#!#%.  Well it helps if we're iterating a list to</div><div class='del'>-	iterate the node pointer ...</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_sync): Sync the key tables</div><div class='del'>-	explcitly.</div><div class='del'>-	(text_index_sync): Debug out frag info.</div><div class='del'>-	(camel_text_index_dump): Added a (rather large, but optional) raw</div><div class='del'>-	dumping mode for debugging purposes.</div><div class='del'>-</div><div class='del'>-	* camel-partition-table.c (camel_key_table_finalise): Sync root</div><div class='del'>-	block when done.</div><div class='del'>-	(camel_key_table_sync): New function, sync key table (root) explicitly.</div><div class='del'>-	(camel_partition_table_sync): Method to explicitly sync the</div><div class='del'>-	partition table.</div><div class='del'>-</div><div class='del'>-2002-04-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (camel_block_file_free_block): Mark root</div><div class='del'>-	block dirty when we change it (this function isn't used yet</div><div class='del'>-	anyway).</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_add_name_to_word): Touch the root</div><div class='del'>-	block when we modify the counts.  Also, abort processing on any</div><div class='del'>-	errors.</div><div class='del'>-	(text_index_sync): Fix typo in comments.  Sync the block file</div><div class='del'>-	inside the lock.</div><div class='del'>-	(text_index_compress_nosync): Lock the old index while we're</div><div class='del'>-	compressing.</div><div class='del'>-	(text_index_compress_nosync): Remove the bogus while() at the end</div><div class='del'>-	of the while() loops!  Also plug a memleak - records weren't</div><div class='del'>-	freed.</div><div class='del'>-	(text_index_rename): Lock around rename op.</div><div class='del'>-	(text_index_add_name): More typos.</div><div class='del'>-	(text_index_sync): Touch root when changing it.</div><div class='del'>-	(text_index_add_name): "</div><div class='del'>-	(text_index_delete_name): "</div><div class='del'>-	(camel_text_index_new): Touch root if we change it.</div><div class='del'>-	(text_index_cursor_reset): Make sure we NULL pointers after we</div><div class='del'>-	free them (nothing uses this yet).</div><div class='del'>-</div><div class='del'>-	* camel-partition-table.c (hash_key): Remove some debug</div><div class='del'>-	accidentally left in.</div><div class='del'>-	(camel_partition_table_add): When linking in the next block list,</div><div class='del'>-	set the right previous pointer.</div><div class='del'>-	(camel_key_table_add): Simplify the 'left' calculation (it was</div><div class='del'>-	already ok though).</div><div class='del'>-	(camel_key_table_next): Initialise returns before processing.</div><div class='del'>-	Broaden the lock slightly, and simplify validity calculations.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_keepalive): Put back in</div><div class='del'>-	the exception setup stuff i disabled for debugging.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Temporarily disable indexing.</div><div class='del'>-</div><div class='del'>-2002-03-28  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-partition-table.c (camel_key_table_lookup): Change range</div><div class='del'>-	checking assert to a warning.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_finalize): Make sure we</div><div class='del'>-	flush out all outstanding commands before finalising, stops being</div><div class='del'>-	finalised while outsanding requests are processed by the store</div><div class='del'>-	finalise.</div><div class='del'>-	(pop3_get_message): Instead of pre-fetching all messages, just</div><div class='del'>-	pre-fetch a maxiumum number at any one time, stops us running out</div><div class='del'>-	of cache fd's.</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init/finalise):</div><div class='del'>-	Setup priv data + locks, &amp; free.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Batch all</div><div class='del'>-	message_chagned events into a single folder_changed event</div><div class='del'>-	(otherwise updates can be &gt;&gt;&gt; expensive, like &gt;5 hours for 80K</div><div class='del'>-	messages changing!).  Alternately it could use folder</div><div class='del'>-	freeze/unfreeze perhaps.</div><div class='del'>-</div><div class='del'>-2002-03-27  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_keepalive): Pass an</div><div class='del'>-	exception to called code so it behaves properly since it uses the</div><div class='del'>-	passed exception to check returns.</div><div class='del'>-</div><div class='del'>-2002-04-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimap_la_LDFLAGS): Use</div><div class='del'>-	-avoid-version instead of -version-info 0:0:0, and specify</div><div class='del'>-	-module. (From Max Horn &lt;max@quendi.de&gt;).</div><div class='del'>-</div><div class='del'>-	* providers/local/Makefile.am (libcamellocal_la_LDFLAGS): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntp_la_LDFLAGS): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/Makefile.am (libcamelsendmail_la_LDFLAGS):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am (libcamelsmtp_la_LDFLAGS): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am (libcamelpop3_la_LDFLAGS): Likewise.</div><div class='del'>-	Also remove $(KRB4_LDFLAGS) since KPOP is gone.</div><div class='del'>-	(INCLUDES): and $(KRB4_CFLAGS)</div><div class='del'>-</div><div class='del'>-2002-03-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_copy): We now have to check to make</div><div class='del'>-	sure that p-&gt;message is non-NULL because we only load the message</div><div class='del'>-	when we have to.</div><div class='del'>-	(do_move): Same here.</div><div class='del'>-</div><div class='del'>-2002-03-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_send_to): Change the message</div><div class='del'>-	arg to a CamelMimeMessage instead of a CamelMedium. Even the NNTP</div><div class='del'>-	provider returns CamelMimeMessages, and we're never going to</div><div class='del'>-	support anything more exotic than that. Also do a few more</div><div class='del'>-	g_return_if_fails here instead of in the providers.</div><div class='del'>-	(camel_transport_can_send): No longer needed.</div><div class='del'>-	(camel_transport_send): Remove this too. It wasn't being used any</div><div class='del'>-	more, and it doesn't behave exactly the same in sendmail and smtp.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_send,</div><div class='del'>-	smtp_can_send): Gone.</div><div class='del'>-	(smtp_send_to): Update for arg change.</div><div class='del'>-	(smtp_data): Make this take a CamelMimeMessage too.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send,</div><div class='del'>-	sendmail_can_send): Gone.</div><div class='del'>-	(sendmail_send_to): Update for arg change, and merge in the part</div><div class='del'>-	that used to be shared with sendmail_send.</div><div class='del'>-</div><div class='del'>-2002-03-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder):</div><div class='del'>-	Construct the source_url the right way. The previous way was</div><div class='del'>-	generating urls like pop://fejj@ximian.com;keep_on_server/inbox</div><div class='del'>-	which is wrong.</div><div class='del'>-</div><div class='del'>-2002-03-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_normalise): Changed to use just</div><div class='del'>-	g_utf8_strdown instead of utf8_normalise, to match the indexing</div><div class='del'>-	code.  utf8_normalise is just far too expensive (saves approx 25%</div><div class='del'>-	total processing).</div><div class='del'>-</div><div class='del'>-2002-03-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_add_name): When we add a new</div><div class='del'>-	name, up all of the cache limits, because we're probably going to</div><div class='del'>-	be adding more.</div><div class='del'>-	(text_index_sync): Drop the cache limits back down again, we dont</div><div class='del'>-	need them when looking words up.</div><div class='del'>-</div><div class='del'>-	** MERGE camel_index branch.</div><div class='del'>-</div><div class='del'>-	* camel-text-index.[ch]: Added files i forgot to add (eep nearly</div><div class='del'>-	lost all this work!)</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (sync_nolock): Fix an infinite loop in syncing.</div><div class='del'>-</div><div class='del'>-2002-03-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_new_from_header): Use</div><div class='del'>-	the date in the received header for the received_date.</div><div class='del'>-</div><div class='del'>-2002-03-22  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Use the right option to remove the</div><div class='del'>-	index file and reset the index file on creation.</div><div class='del'>-	(camel_local_folder_construct): Remove any existing '.ibex' files</div><div class='del'>-	- these are the old format index files.</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c (camel_block_file_rename): Lock io lock while</div><div class='del'>-	renaming.</div><div class='del'>-	(camel_key_file_rename): Lock around rename.</div><div class='del'>-	(block_file_validate_root): Implement sync flag checking.</div><div class='del'>-	(camel_block_file_touch_block): Turn off the sync flag if we're</div><div class='del'>-	touching any non-root block and write it to disk.  Shoudl this</div><div class='del'>-	fsync()?</div><div class='del'>-	(sync_nolock): sync the root block only if we need to.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (rename_folder): Re-enable</div><div class='del'>-	index rename code.  Not sure how race-free it is though.</div><div class='del'>-	(delete_folder): Delete the index file properly.</div><div class='del'>-</div><div class='del'>-	* camel-partition-table.c (camel_key_table_lookup): Initialise</div><div class='del'>-	output values to 0 before doing anything.</div><div class='del'>-	(camel_key_table_add): Do some range-checking on values.</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_compress): Changed to call sync here.</div><div class='del'>-	(text_index_compress_nolock): and not here - stops a recursive</div><div class='del'>-	sync call when sync performs a compress also.</div><div class='del'>-	(text_index_compress_nolock): Change to _nosync, since the locking</div><div class='del'>-	is irrelevent (recursive lock).  Fixed callers.</div><div class='del'>-	(text_index_add_name_to_word): If we get a failure with key table</div><div class='del'>-	ops, fail immediately.</div><div class='del'>-	(text_index_compress_nosync): Likewise.</div><div class='del'>-	(text_index_write_name): If the nameid is 0, do nothing.</div><div class='del'>-	(text_index_add_name): If we can't get a keyid, dont add it to the</div><div class='del'>-	partition table.</div><div class='del'>-	(camel_text_index_remove): Function to delete an index file.</div><div class='del'>-	(text_index_compress_nosync): Clean up temp files when done.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (match_messages_index): New function,</div><div class='del'>-	split from body_contains, matches a regex against all words in an</div><div class='del'>-	index.</div><div class='del'>-	(match_message_index): Similar to above but matches against an</div><div class='del'>-	individual message.</div><div class='del'>-	(search_body_contains): Changed to use above functions for</div><div class='del'>-	matching - substring matches should now work on indexed data.</div><div class='del'>-</div><div class='del'>-2002-03-21  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-index.c (camel_index_words/names): New virtual</div><div class='del'>-	methods/stubs to get a cursor of all words and names.</div><div class='del'>-</div><div class='del'>-	* camel-text-index.c (text_index_compress_nolock): Split from</div><div class='del'>-	text_index_compress, so we can call the compressor while locked</div><div class='del'>-	also, removed lock calls.</div><div class='del'>-	(text_index_compress): Changed to stub which calls</div><div class='del'>-	text_index_compress_nolock.</div><div class='del'>-	(camel_text_index_key_cursor_new): New object to iterate through</div><div class='del'>-	a key table.</div><div class='del'>-	(text_index_words, text_index_names): Implement virtual functions</div><div class='del'>-	for iterating through all words or names.</div><div class='del'>-</div><div class='del'>-	* camel-block-file.c: Turn off some debug.</div><div class='del'>-</div><div class='del'>-2002-03-20  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	** New body index implementation.</div><div class='del'>-</div><div class='del'>-	* camel-index*: Code for camel index, a new class to replace ibex.</div><div class='del'>-</div><div class='del'>-	* camel-block-file.[ch]: block-based and link based</div><div class='del'>-	filesystem-in-a-file classes.</div><div class='del'>-</div><div class='del'>-	* camel-partition-table.[ch]: An implementation of a partition</div><div class='del'>-	table (automatically extending on-disk hash-table using ideal</div><div class='del'>-	hash), and a key-table, a key&lt;&gt;name mapping table.  Used by</div><div class='del'>-	camelindex.</div><div class='del'>-</div><div class='del'>-	* providers/local/*, camel-folder-summary.[ch]: Changed to use</div><div class='del'>-	camel-index interface rather than ibex.</div><div class='del'>-</div><div class='del'>-2002-03-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_check):</div><div class='del'>-	Do progress reporting of operations.</div><div class='del'>-	(maildir_summary_sync): Same here.</div><div class='del'>-</div><div class='del'>-2002-03-04  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spoold-store.c (scan_dir): Kill a warning</div><div class='del'>-	with a cast.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-*.c: Changed for ibex-&gt;camelindex.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_set_summary): Init</div><div class='del'>-	summary_hash to point to 'static' uid strings.</div><div class='del'>-	(search_body_contains): Use the static uid memory to return</div><div class='del'>-	results rather than the values from the index library.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.[ch]: Changed to use camelindex object.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info_message):</div><div class='del'>-	Use a stream to index content, also filter html mail first.</div><div class='del'>-	(camel_folder_summary_info_new_from_message): Use a stream</div><div class='del'>-	filtered to index content.</div><div class='del'>-	(main): Removed the test main code.  Added headers for open call</div><div class='del'>-	(ibex must've had them before).</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: Changed from ibex to CamelIndex.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.c (camel_mime_filter_index_finalize):</div><div class='del'>-	Unref index.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.[ch]: Changed from ibex to CamelIndex.</div><div class='del'>-</div><div class='del'>-2002-03-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_encode_param): Fix this to work</div><div class='del'>-	right. We need to convert the input buffer to the charset we claim</div><div class='del'>-	in the encoded param (duh).</div><div class='del'>-</div><div class='del'>-2002-03-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(connect_to_server_wrapper): Updated to use the same logic as the</div><div class='del'>-	POP code.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): No longer</div><div class='del'>-	takes a stls_supported argument since we no longer need it with</div><div class='del'>-	the new logic.</div><div class='del'>-	(connect_to_server_wrapper): New logic: First try connecting to</div><div class='del'>-	the SSL port (995 by default), if that fails with</div><div class='del'>-	SERVICE_UNAVAILABLE, then we attempt to connect (to port 110 by</div><div class='del'>-	default) and try to use STARTTLS.</div><div class='del'>-</div><div class='del'>-2002-03-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: </div><div class='del'>-</div><div class='del'>-	* camel-private.h: Don't allow any empty structs. If</div><div class='del'>-	!ENABLE_THREADS, provide a gpointer dummy member. Fixes bug #6382.</div><div class='del'>-</div><div class='del'>-2002-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Added a</div><div class='del'>-	work-around for SMTP servers that can't read the RFCs and thus</div><div class='del'>-	implement SASL incorrectly. Oh well, that's life in the world of</div><div class='del'>-	mail clients I guess.</div><div class='del'>-</div><div class='del'>-2002-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-digest-store.c (camel_digest_store_new): Now takes a url</div><div class='del'>-	argument.</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c (digest_add_multipart): Fixed some memory</div><div class='del'>-	corruption and also modified to use CAMEL_IS_MIME_MESSAGE() rather</div><div class='del'>-	than comparing content-type strings.</div><div class='del'>-	(digest_get_message): Fixed a logic blooper.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_new_from_header): Set</div><div class='del'>-	the date fields of the CamelMessageInfo as well. This may even fix</div><div class='del'>-	some filter-related bugs where the user was trying to compare</div><div class='del'>-	dates.</div><div class='del'>-</div><div class='del'>-2002-03-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-digest-store.c: A pretty empty store implementation to be</div><div class='del'>-	the parent store of a CamelDigestFolder.</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c: Updated to reference it's parent store.</div><div class='del'>-</div><div class='del'>-2002-03-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c (camel_digest_folder_new): Allow any leaf</div><div class='del'>-	part to be a message/rfc822 part.</div><div class='del'>-	(digest_get_uids): Recurse the mime structure and add all</div><div class='del'>-	message/rfc822 parts and use a uid scheme similar to IMAP's mime</div><div class='del'>-	part naming convention.</div><div class='del'>-	(digest_get_message): Decode the uid to get the correct mime part.</div><div class='del'>-</div><div class='del'>-2002-03-11  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Change the order of the mailing list magic</div><div class='del'>-	patterns so that the more mailing-list specific ones are on the</div><div class='del'>-	top.</div><div class='del'>-</div><div class='del'>-2002-03-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	These fixes should fix bug #21737.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(connect_to_server_wrapper): Same as with the POP code.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server_wrapper):</div><div class='del'>-	Slight restructuring of the if-statements for the USE_SSL_ALWAYS</div><div class='del'>-	case so that we can't possibly return TRUE unless we really did</div><div class='del'>-	connect successfully.</div><div class='del'>-</div><div class='del'>-2002-03-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Rename the OpenSSL implementation of things to match the NSS</div><div class='del'>-	implementation so that callers don't need to care which one is</div><div class='del'>-	being used.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c: Implement CamelTcpStreamSSL, not</div><div class='del'>-	CamelTcpStreamOpenSSL. Rename methods as well. Replace the</div><div class='del'>-	camel-tcp-stream-openssl.h include with camel-tcp-stream-ssl.h.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.h: Gone.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: Add a note explaining that this</div><div class='del'>-	implementation is only used for NSS, and that OpenSSL's</div><div class='del'>-	implementation is in another file. (Should probably do some CVS</div><div class='del'>-	renaming magic at some point.)</div><div class='del'>-</div><div class='del'>-	* camel-http-stream.c (http_connect): Remove OpenSSL refs; the</div><div class='del'>-	previously-NSS-specific code works for both now.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Remove</div><div class='del'>-	camel-tcp-stream-openssl.h</div><div class='del'>-</div><div class='del'>-2002-03-10  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.c (camel_tcp_stream_get_socket): Remove this:</div><div class='del'>-	it couldn't be generically used, because different subclasses</div><div class='del'>-	returned entirely different types of data.</div><div class='del'>-	(camel_tcp_stream_get_local_address,</div><div class='del'>-	camel_tcp_stream_get_remote_address): Add these to replace what</div><div class='del'>-	get_socket was being used for.</div><div class='del'>-	(camel_tcp_address_new, camel_tcp_address_free): Utility functions</div><div class='del'>-	for get_{local,remote}_address.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Change localaddr to a</div><div class='del'>-	CamelTcpAddress *.</div><div class='del'>-	(connect_to_server): Call camel_tcp_stream_get_local_address to</div><div class='del'>-	get the local IP address.</div><div class='del'>-	(smtp_disconnect): free localaddr.</div><div class='del'>-	(smtp_helo): Update for localaddr change.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_get_socket): Remove</div><div class='del'>-	(stream_get_local_address, stream_get_remote_address): Implement.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_get_socket): Remove</div><div class='del'>-	(stream_get_local_address, stream_get_remote_address): Implement.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (stream_get_socket): Remove</div><div class='del'>-	(stream_get_local_address, stream_get_remote_address): Implement.</div><div class='del'>-</div><div class='del'>-2002-03-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c</div><div class='del'>-	(camel_provider_module_init): Don't call</div><div class='del'>-	camel_remote_store_get_authtypes since we no longer subclass</div><div class='del'>-	camel-remote-store.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-engine.c: Added STARTTLS to the</div><div class='del'>-	capabilities to look for.</div><div class='del'>-	(camel_pop3_engine_reget_capabilities): New function to re-get</div><div class='del'>-	capabilities.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Updated to not subclass</div><div class='del'>-	CamelRemoteStore.</div><div class='del'>-	(connect_to_server): Rewritten to not depend on CamelRemoteStore's</div><div class='del'>-	connect implementation. Also added support for STLS (aka</div><div class='del'>-	STARTTLS).</div><div class='del'>-</div><div class='del'>-2002-03-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_sign): Add support for</div><div class='del'>-	hash type RIPEMD160.</div><div class='del'>-</div><div class='del'>-	* camel-cipher-context.h: Add RIPEMD160 hash type.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): Updated to consider hash</div><div class='del'>-	function for pgp5 and pgp6.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (stream_read): Add a timeout on the</div><div class='del'>-	select.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-</div><div class='del'>-2002-03-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (connect_to_server): Fix</div><div class='del'>-	to work with OpenSSL.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c: compile fixes.</div><div class='del'>-	(camel_tcp_stream_openssl_enable_ssl): Check to make sure that the</div><div class='del'>-	sockfd != -1, it's not enough to check that it is non-zero. Also</div><div class='del'>-	set the sockfd to -1 on fail (open_ssl_connection will close the</div><div class='del'>-	sockfd on fail).</div><div class='del'>-</div><div class='del'>-2002-03-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_construct): Make</div><div class='del'>-	this compile.</div><div class='del'>-</div><div class='del'>-2002-03-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (save_ssl_cert): Removed. Glory glory</div><div class='del'>-	hallelujah!</div><div class='del'>-	(ssl_bad_cert): No longer calls ssl_save_cert or</div><div class='del'>-	ssl_cert_is_saved.</div><div class='del'>-</div><div class='del'>-2002-03-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_new_raw):</div><div class='del'>-	Start the ssl stream off in non-ssl mode (useful for STARTTLS).</div><div class='del'>-	(camel_tcp_stream_openssl_enable_ssl): New function to toggle an</div><div class='del'>-	ssl stream into ssl mode.</div><div class='del'>-	(open_ssl_connection): Close the sockfd on fail so our caller</div><div class='del'>-	doesn't have to - this also allows us to save the original errno.</div><div class='del'>-	(stream_connect): If we want ssl mode, do our ssl stuff.</div><div class='del'>-	(camel_tcp_stream_openssl_class_init): Init some SSL stuff here</div><div class='del'>-	instead of in open_ssl_connection since these only ever need to be</div><div class='del'>-	called once.</div><div class='del'>-	(stream_read): Only use SSL_read if we are in ssl mode.</div><div class='del'>-	(stream_write): Only use SSL_write if we are in ssl mode.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Check for the</div><div class='del'>-	STARTTLS extension.</div><div class='del'>-	(connect_to_server): Try to use STARTTLS whenever possible rather</div><div class='del'>-	than the old way of doing things.</div><div class='del'>-	(connect_to_server_wrapper): Wrapper around connect_to_server() to</div><div class='del'>-	first try STARTTLS and then attempt normal SSL mode if we can't</div><div class='del'>-	connect via STARTTLS.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_enable_ssl): New</div><div class='del'>-	function to toggle an ssl stream into ssl mode.</div><div class='del'>-	(camel_tcp_stream_ssl_new_raw): Start the ssl stream off in</div><div class='del'>-	non-ssl mode (useful for STARTTLS).</div><div class='del'>-	(stream_connect): Only connect in SSL mode if required.</div><div class='del'>-</div><div class='del'>-2002-03-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.h: </div><div class='del'>-	* camel-vee-store.h: </div><div class='del'>-	* camel-vee-folder.h: </div><div class='del'>-	* camel-stream-null.h: </div><div class='del'>-	* camel-stream-filter.h: </div><div class='del'>-	* camel-store-summary.h: </div><div class='del'>-	* camel-news-address.h: </div><div class='del'>-	* camel-mime-utils.h: </div><div class='del'>-	* camel-mime-parser.h: </div><div class='del'>-	* camel-mime-filter-save.h: </div><div class='del'>-	* camel-mime-filter-linewrap.h: </div><div class='del'>-	* camel-mime-filter-index.h: </div><div class='del'>-	* camel-mime-filter-html.h: </div><div class='del'>-	* camel-mime-filter.h: </div><div class='del'>-	* camel-mime-filter-from.h: </div><div class='del'>-	* camel-mime-filter-crlf.h: </div><div class='del'>-	* camel-mime-filter-chomp.h: </div><div class='del'>-	* camel-mime-filter-charset.h: </div><div class='del'>-	* camel-mime-filter-bestenc.h: </div><div class='del'>-	* camel-mime-filter-basic.h: </div><div class='del'>-	* camel-internet-address.h: </div><div class='del'>-	* camel-folder-thread.h: </div><div class='del'>-	* camel-folder-summary.h: </div><div class='del'>-	* camel-folder-search.h: </div><div class='del'>-	* camel-filter-driver.h: </div><div class='del'>-	* camel-charset-map.h: </div><div class='del'>-	* camel-address.h: Add c++ armoring.</div><div class='del'>-</div><div class='del'>-	* camel-object.h: s/class/klass</div><div class='del'>-</div><div class='del'>-2002-03-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Reverted my</div><div class='del'>-	pgp/mime fixes here too.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Removed my pgp/mime raw</div><div class='del'>-	stream hack, this is causing problems such as some messages to not</div><div class='del'>-	displaying, view-&gt;source not working at all, etc.</div><div class='del'>-</div><div class='del'>-2002-02-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Changed offset variables from int's to</div><div class='del'>-	off_t's since the system may support large files.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Rearrange the</div><div class='del'>-	save filter stuff so that we save raw streams for all mime</div><div class='del'>-	parts. If the mime part turns out to be a multupart, then don't</div><div class='del'>-	bother saving the raw stream, we only need to save the raw stream</div><div class='del'>-	for leaf parts.</div><div class='del'>-</div><div class='del'>-2002-02-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Don't #include camel-mime-filter-save.h,</div><div class='del'>-	we don't use it.</div><div class='del'>-</div><div class='del'>-	* camel-file-utils.c: Fixed a few 'might be used uninitialized'</div><div class='del'>-	warnings which were real problems.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Save the raw mime</div><div class='del'>-	stream for any/all signed parts.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_init): Initialize our raw</div><div class='del'>-	stream to NULL.</div><div class='del'>-	(camel_mime_part_finalize): Unref our raw stream, if we have one.</div><div class='del'>-	(write_to_stream): If we have a raw stream, write that out instead</div><div class='del'>-	of re-encoding.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-save.[c,h]: Rewritten to save to a stream</div><div class='del'>-	rather than a file.</div><div class='del'>-</div><div class='del'>-2002-02-28  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): Use the FOLD_SIZE as a</div><div class='del'>-	recommended folding size, but add a new FOLD_MAX_SIZE (=998, the</div><div class='del'>-	smtp max line size) as the hard limit for any output.</div><div class='del'>-</div><div class='del'>-2002-02-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-chomp.c (camel_mime_filter_chomp_new): New</div><div class='del'>-	stream filter that chomps excess trailing whitespace from the end</div><div class='del'>-	of the stream. This is needed to update the PGP/MIME code to</div><div class='del'>-	comply with rfc3156.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Don't attach a</div><div class='del'>-	from filter, if it ain't from-filtered already, then we'll just be</div><div class='del'>-	breaking stuff. To become rfc3156 compliant, add a chomp filter</div><div class='del'>-	here.</div><div class='del'>-	(camel_pgp_mime_part_sign): Add a chomp filter here too.</div><div class='del'>-</div><div class='del'>-2002-02-27  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (init_header_name_table): Changed header</div><div class='del'>-	formatted table to contain a pointer to an output function, and</div><div class='del'>-	added in-reply-to and references headers.</div><div class='del'>-	(write_references): New function to write out references header,</div><div class='del'>-	folded properly.  It only approximates based on the last &gt;, but it</div><div class='del'>-	should be adequate and will also handle invalid headers.</div><div class='del'>-	(write_fold): Function to write out headers folded.  Since this is</div><div class='del'>-	the default it isn't required.</div><div class='del'>-	(write_raw): Write out an already formatted header, e.g. most of</div><div class='del'>-	the rest.</div><div class='del'>-	(write_to_stream): Lookup header output function, if we have one,</div><div class='del'>-	use that, otherwise fold header using basic (dumb) function.</div><div class='del'>-</div><div class='del'>-	This is all for #14779.  A better fix is probably do have the</div><div class='del'>-	headers always stored formatted, but that can wait.</div><div class='del'>-</div><div class='del'>-2002-02-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.c (camel_digest_folder_new): Allow all</div><div class='del'>-	multiparts that contain message/rfc822 attachments.</div><div class='del'>-	(digest_get_uids): Only assign uids to message parts.</div><div class='del'>-</div><div class='del'>-2002-02-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_filename): Set the 'name'</div><div class='del'>-	parameter on the Content-Type too. Fixes bug #20779.</div><div class='del'>-</div><div class='del'>-2002-02-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): Pass --always-trust to gpg</div><div class='del'>-	(requested by users).</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_encrypt): Here too.</div><div class='del'>-</div><div class='del'>-2002-02-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Since the</div><div class='del'>-	AUTH token sometimes uses '=' instead of whitespace, don't use</div><div class='del'>-	smtp_token_next here.</div><div class='del'>-</div><div class='del'>-2002-02-09  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-engine.c (get_capabilities): Duh, when</div><div class='del'>-	we grab the apop stamp it needs to include the &lt;&gt; as well, I even</div><div class='del'>-	read the rfc, silly me.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Doh,</div><div class='del'>-	when iterating the authtype list, it helps to goto the next node.</div><div class='del'>-	Found with help from miles.</div><div class='del'>-</div><div class='del'>-2002-02-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c</div><div class='del'>-	(camel_spool_summary_build_from): The day number has to be 2 chars</div><div class='del'>-	wide, space filled to work properly with pine, etc.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spoold-store.[ch]: new type of provider</div><div class='del'>-	'spool directory', which lets you view external mbox dirs without</div><div class='del'>-	adding any extra cruft.  Perhaps it should use . files to store</div><div class='del'>-	summaries?  Still a bit experimental, there's a warning when you</div><div class='del'>-	select it in the account editor.  Finished off most of #1185.</div><div class='del'>-	Can't rename or move folders.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): If the date is</div><div class='del'>-	100-&gt;1900 then we actually want to use it as the year in the tm</div><div class='del'>-	struct, not year+100.  e.g. year 102 -&gt; 2002, not 2102.</div><div class='del'>-</div><div class='del'>-2002-02-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder): Pass path into</div><div class='del'>-	spool_folder_new.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c (camel_spool_folder_new): </div><div class='del'>-	(camel_spool_folder_construct): Take the full path to the folder</div><div class='del'>-	and use that as the file path, independent of the full_name we</div><div class='del'>-	use.</div><div class='del'>-</div><div class='del'>-2002-02-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: Added new type, spoold</div><div class='del'>-	provider, spoold: for local directories.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_one_folder_offline):</div><div class='del'>-	Create offline uri's in a compatible manner to online ones.</div><div class='del'>-</div><div class='del'>-2002-02-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-ntlm.c: Implementation of NTLM (aka "Secure Password</div><div class='del'>-	Authentication") auth, taken from soup.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES, libcamel_la_HEADERS): Add</div><div class='del'>-	camel-sasl-ntlm.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c: Add refs to camel-sasl-ntlm.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_auth): Use</div><div class='del'>-	imap_next_word() to skip over the "+ " of the continuation rather</div><div class='del'>-	than just "resp + 2" since Exchange (incorrectly) returns "+"</div><div class='del'>-	instead of "+ " for an empty continuation response.</div><div class='del'>-</div><div class='del'>-2002-02-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Remove the CAMEL_MESSAGE_NEEDS_REPLY</div><div class='del'>-	flag, we no longer will be using this.</div><div class='del'>-</div><div class='del'>-2002-02-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-http-stream.c (stream_read): Use camel_mime_parser_read to</div><div class='del'>-	read internal parser data.</div><div class='del'>-	(camel_http_stream_get_content_type): Implemented.</div><div class='del'>-	(http_method_invoke): Use HTTP/1.0 instead of 1.1</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_int): Made public.</div><div class='del'>-</div><div class='del'>-	* camel-http-stream.[c,h]: Added. New stream for HTTP requests</div><div class='del'>-	(currently supported are GET and HEAD).</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_connect): Call set_errno</div><div class='del'>-	appropriately.</div><div class='del'>-</div><div class='del'>-2002-01-31  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_domain): Oops, this was</div><div class='del'>-	converting foo@[blah] to foo@[ blah ], fixed.</div><div class='del'>-</div><div class='del'>-2002-01-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Use "pop" instead of</div><div class='del'>-	"pop3" so current configurations continue to work.</div><div class='del'>-</div><div class='del'>-2002-01-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-login.c: Changed name from "NT Login" to simply</div><div class='del'>-	"Login".</div><div class='del'>-</div><div class='del'>-	* providers/pop3/*: Entirely new pop implmentation, supporting</div><div class='del'>-	pipelining.</div><div class='del'>-</div><div class='del'>-2002-01-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.c (free_busy): We dont want to unref the</div><div class='del'>-	stream, instead, stop listening to the finalised events, and free</div><div class='del'>-	the path only.</div><div class='del'>-</div><div class='del'>-2002-01-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.c (stream_finalised): Remove the object from</div><div class='del'>-	the busy_stream hashtable, not the busy_path hashtable.</div><div class='del'>-</div><div class='del'>-2002-01-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Added</div><div class='del'>-	more kludge to an existing Exchange IMAP 5.5 kludge to work around</div><div class='del'>-	it returning multiple messages with the same UIDs.</div><div class='del'>-</div><div class='del'>-2002-01-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Handle Resent headers</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h: Added Resent-* #defines.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_remove_rule_by_name):</div><div class='del'>-	Use while (node-&gt;next) instead of while (node)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_decode_status_code):</div><div class='del'>-	New function to decode an enhanced status code.</div><div class='del'>-	(smtp_set_exception): Sets an exception based on the</div><div class='del'>-	Enhanced-Status-Code.</div><div class='del'>-	(esmtp_get_authtypes): Don't diplicate the key in the hash since</div><div class='del'>-	the key and value are the same.</div><div class='del'>-	(smtp_rcpt): Include the failed recipient in the error message to</div><div class='del'>-	be more helpful to the user.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (hex_decode): Make sure to allocate enough</div><div class='del'>-	for the NUL byte.</div><div class='del'>-</div><div class='del'>-2002-01-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_construct):</div><div class='del'>-	(connect_to_server): Use flags rather than a bunch of gboolean</div><div class='del'>-	variables.</div><div class='del'>-	(smtp_connect): Same.</div><div class='del'>-	(smtp_mail): Here too. Use the enhanced status codes if available.</div><div class='del'>-	(smtp_data): And again here.</div><div class='del'>-	(smtp_helo): Finally here. Also detect the ENHANCEDSTATUSCODES</div><div class='del'>-	extension.</div><div class='del'>-	(smtp_rcpt): Use the enhanced status codes if available.</div><div class='del'>-	(smtp_rset): Here too.</div><div class='del'>-	(smtp_quit): And finally here.</div><div class='del'>-</div><div class='del'>-	* camel-transport.h: Removed gboolean supports_8bit since this is</div><div class='del'>-	pretty local to only SMTP for now.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove some old cruft.</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/folder/Makefile.am: s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.</div><div class='del'>-	* tests/message/Makefile.am: Likewise.</div><div class='del'>-	* tests/mime-filter/Makefile.am: Likewise.</div><div class='del'>-	* tests/misc/Makefile.am: Likewise.</div><div class='del'>-	* tests/smime/Makefile.am: Likewise.</div><div class='del'>-	* tests/stream/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2002-01-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_beep): Call the beep callback</div><div class='del'>-	function.</div><div class='del'>-	(camel_filter_driver_set_system_beep_func): New function to set</div><div class='del'>-	the beep callback.</div><div class='del'>-</div><div class='del'>-2002-01-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_remove_rule_by_name):</div><div class='del'>-	New function to remove a filter rule by name.</div><div class='del'>-</div><div class='del'>-2002-01-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_beep): As a temporary solution, just</div><div class='del'>-	printf ("\a"); to make a beep :-)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(imap_command_strdup_vprintf): Encode the mailbox to UTF-7 here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Decode the mailbox name as we parse the list response.</div><div class='del'>-	(imap_mailbox_decode): It's only an illegal mailbox name if it</div><div class='del'>-	didn't switch back to US-ASCII mode.</div><div class='del'>-</div><div class='del'>-2002-01-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_mailbox_decode): New</div><div class='del'>-	function to decode an IMAP mailbox name from modified UTF-7</div><div class='del'>-	encoding to UTF-8.</div><div class='del'>-	(imap_mailbox_encode): New function to convert a mailbox name from</div><div class='del'>-	UTF-8 to IMAP's modified UTF-7 encoding.</div><div class='del'>-</div><div class='del'>-2002-01-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Stop uudecoding once the</div><div class='del'>-	CAMEL_UUDECODE_STATE_END state bit gets set. Set the</div><div class='del'>-	CAMEL_UUDECODE_STATE_BEGIN state bit once we find the begin line.</div><div class='del'>-	(reset): No longer have uu_begin or uulen state variables, these</div><div class='del'>-	are now stuffed into a single state variable.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uudecode_step): No longer needs a uulen</div><div class='del'>-	argument and also keeps track of whether or not the end of the</div><div class='del'>-	encoded data has been found in 'state'.</div><div class='del'>-	(uuencode_step): Now stuffs uulen into state so that the uulen</div><div class='del'>-	argument is no longer needed.</div><div class='del'>-	(uuencode_close): Same.</div><div class='del'>-</div><div class='del'>-2002-01-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): If we don't want to corrupt</div><div class='del'>-	the uuencoded data by overwriting it with base64 decoded data</div><div class='del'>-	afterward, we need to add a break statement!</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): Add code to</div><div class='del'>-	add a uu filter.</div><div class='del'>-	(camel_folder_summary_finalize): Unref the uuencode filter.</div><div class='del'>-</div><div class='del'>-2002-01-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Fixed slight logic error to</div><div class='del'>-	find the uuencode begin line. Fixes bug #18754.</div><div class='del'>-</div><div class='del'>-2002-01-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_send_to): Updated to</div><div class='del'>-	match the new send_to API.</div><div class='del'>-	(smtp_send): Get the from address and pass that along to</div><div class='del'>-	smtp_send_to().</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c</div><div class='del'>-	(sendmail_send_to): Updated to match the new send_to API.</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_send_to): Now takes a from</div><div class='del'>-	argument too.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Sort</div><div class='del'>-	the needheaders UID array and fixed to respect the</div><div class='del'>-	UID_SET_LIMIT. This should now finish the fixification of bug</div><div class='del'>-	#2529. There's still the possible issue that a command-line (The</div><div class='del'>-	only command-line I can think of that can still be too long is a</div><div class='del'>-	SEARCH command, but this can't possibly be fixed until we rewrite</div><div class='del'>-	the imap code to use Zucchi's ImapEngine idea).</div><div class='del'>-</div><div class='del'>-2002-01-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge_uids_online):</div><div class='del'>-	Move the command-lock outside the loop.</div><div class='del'>-</div><div class='del'>-2002-01-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge_uids_online):</div><div class='del'>-	Updated to use the new imap_uid_array_to_set() interface.</div><div class='del'>-	(imap_expunge_uids_resyncing): Same.</div><div class='del'>-	(do_copy): Here too.</div><div class='del'>-	(imap_update_summary): Added a FIXME comment to rewrite allowing</div><div class='del'>-	for a uid-set limitation.</div><div class='del'>-	(get_matching): Copy some of the logic over from</div><div class='del'>-	imap_uid_adday_to_set() to limit the length of the uid-set string.</div><div class='del'>-	(imap_sync_online): Added a comment to explain what is going on</div><div class='del'>-	with get_matching() since the behavior has changed slightly.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set):</div><div class='del'>-	Modify the interface so that we can limit the size of the uid set</div><div class='del'>-	string returned.</div><div class='del'>-</div><div class='del'>-2002-01-14  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains):</div><div class='del'>-	Rewritten to use a cache for body searches when online.  Will need</div><div class='del'>-	some heavy testing but so far seems to be beneficial.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression,</div><div class='del'>-	search_by_uids): dont initialise search object here.</div><div class='del'>-	(camel_imap_folder_new): Setup search object here with pointer to</div><div class='del'>-	cache dir.</div><div class='del'>-</div><div class='del'>-2001-12-01  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store-summary.[ch]: New class to store a store's folder</div><div class='del'>-	list in.  Not yet completed.</div><div class='del'>-</div><div class='del'>-2002-01-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Kludge</div><div class='del'>-	around a bug in Exchange 5.5 that reports 2 messages with the same</div><div class='del'>-	UID. Fixes bug #17694. Replaces the fix from yesterday.</div><div class='del'>-</div><div class='del'>-2002-01-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c: If PATH_MAX doesn't exist,</div><div class='del'>-	use _POSIX_PATH_MAX.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): If mi</div><div class='del'>-	is NULL, don't bother updating it. Should fix bug #17694.</div><div class='del'>-</div><div class='del'>-2002-01-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: #include camel-mime-filter-tohtml.h</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Kludge</div><div class='del'>-	around Microsoft Exchange 5.5 (bug #5348) by forgetting our</div><div class='del'>-	currently selected folder and re-SELECTing it so that the Exchange</div><div class='del'>-	server has a chance to realise it has new messages.</div><div class='del'>-</div><div class='del'>-2002-01-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): If the mbox file is a symlink,</div><div class='del'>-	follow the symlink and get the One True Path so that we can</div><div class='del'>-	rewrite the mbox later without worrying about clobbering the</div><div class='del'>-	symlink.</div><div class='del'>-</div><div class='del'>-2002-01-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (TODO): There are a few sexp callbacks</div><div class='del'>-	that could be modified to use fms-&gt;info rather than using a</div><div class='del'>-	message object (like date and possibly mlist stuff) but *only* if</div><div class='del'>-	the date exists on the CamelMessageInfo object (since it may be</div><div class='del'>-	blank except for message flags).</div><div class='del'>-	(camel_filter_search_get_message): New internal convenience</div><div class='del'>-	function to make sure that the FilterMessageSearch has loaded the</div><div class='del'>-	message (and to load the message if this isn't the case).</div><div class='del'>-	(check_header): Call camel_filter_search_get_message().</div><div class='del'>-	(header_exists): Same.</div><div class='del'>-	(header_regex): Here too.</div><div class='del'>-	(header_full_regex): And here.</div><div class='del'>-	(body_contains): Again here.</div><div class='del'>-	(body_regex): Here too.</div><div class='del'>-	(get_sent_date): Here also.</div><div class='del'>-	(get_received_date): Same.</div><div class='del'>-	(get_source): Here if we need to.</div><div class='del'>-	(camel_filter_search_match): Now takes a callback function/data</div><div class='del'>-	pair for on-demand message loading so that we don't necessarily</div><div class='del'>-	have to load the message if the defined filter rules don't require</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't</div><div class='del'>-	bother fetching the message here, let</div><div class='del'>-	camel_filter_driver_filter_message() worry about this.</div><div class='del'>-	(get_message_cb): New utility callback to fetch a message.</div><div class='del'>-	(camel_filter_driver_filter_message): Only fetch the message if we</div><div class='del'>-	absolutely need it to get a CamelMessageInfo. Instead of passing a</div><div class='del'>-	message object to camel_filter_search_match(), pass get_message_cb</div><div class='del'>-	and some user_data so that the matching code can fetch the message</div><div class='del'>-	on demand.</div><div class='del'>-</div><div class='del'>-2002-01-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (filter_filter): Flush the only-once actions.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Don't increment a filtered_count here any longer.</div><div class='del'>-	(camel_filter_driver_reset_filtered_count): Removed.</div><div class='del'>-	(camel_filter_driver_get_filtered_count): Removed.</div><div class='del'>-	(do_beep): New action.</div><div class='del'>-	(play_sound): New action to play a sound</div><div class='del'>-	(do_only_once): Another new action.</div><div class='del'>-	(camel_filter_driver_finalise): Free the only_once hash if the</div><div class='del'>-	driver has not been "flushed".</div><div class='del'>-	(camel_filter_driver_flush): Flush all of the only-once actions.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Moved windows-1251 to the end of the list</div><div class='del'>-	since it contains the euro and we'd prefer to use iso-8859-15 when</div><div class='del'>-	the euro is requested than a windows charset if possible.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map-private.h: Regenerated.</div><div class='del'>-</div><div class='del'>-2001-12-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (content_info_load): Don't try setting a</div><div class='del'>-	content-type parameter if either the name or value is NULL.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_set_param): NULL-protection.</div><div class='del'>-</div><div class='del'>-2002-01-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Do more like what mutt</div><div class='del'>-	does so hopefully this'll fix bug #16363 and #16300.</div><div class='del'>-</div><div class='del'>-2001-12-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* broken-date-parser.c (parse_broken_date): Completely</div><div class='del'>-	rewritten. It is now a load faster and a heck of a lot more</div><div class='del'>-	accurate, also now returns a time_t and sets the saveoffset</div><div class='del'>-	variable rather than returning a new char* buffer for the normal</div><div class='del'>-	camel date parser to re-parse. This saves a fair number of cpu</div><div class='del'>-	cycles :-)</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): Cleanup the broken date</div><div class='del'>-	parsing code.</div><div class='del'>-</div><div class='del'>-2001-12-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-address.h: Change the prototype for camel_address_get_type</div><div class='del'>-	to return a CamelType (since internally this is what it returns</div><div class='del'>-	and also in case we decide to write a replacement for the current</div><div class='del'>-	CamelObject it'd be easier to drop in).</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.h: Same but for</div><div class='del'>-	camel_internet_address_get_type()</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_send_to): Updated to</div><div class='del'>-	use a CamelAddress of recipients.</div><div class='del'>-	(smtp_send): Since smtp_send_to now takes a CamelAddress</div><div class='del'>-	recipients argument, our lives have been simplified and we can now</div><div class='del'>-	just concat To/Cc/Bcc into a recipients addr and send away.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c</div><div class='del'>-	(sendmail_send_to): Updated to use a CamelAddress of recipients.</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_send_to): Now takes a</div><div class='del'>-	CamelAddress argument for the recipient list rather than a GList.</div><div class='del'>-</div><div class='del'>-2001-12-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: Remove the providerdir variable.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/Makefile.am: Same.</div><div class='del'>-</div><div class='del'>-2001-12-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_iso_to_windows): New function</div><div class='del'>-	to map ISO charsets to the Windows charsets.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (broken_windows_charset): Detect Windows</div><div class='del'>-	charsets.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Simplify a tad and</div><div class='del'>-	also check for iso-8859-* charsets that are really Windows</div><div class='del'>-	charsets. Fixes bug #12631.</div><div class='del'>-</div><div class='del'>-2001-12-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): define CAMEL_PROVIDERDIR to be the</div><div class='del'>-	configure.in-defined camel_providerdir.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Remove some outdated comments</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (camel_provider_LTLIBRARIES,</div><div class='del'>-	camel_provider_DATA): renamed from provider_LTLIBRARIES,</div><div class='del'>-	provider_DATA.  </div><div class='del'>-</div><div class='del'>-	* providers/local/Makefile.am: Likewise </div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: Likewise </div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am: Likewise </div><div class='del'>-</div><div class='del'>-	* providers/sendmail/Makefile.am: Likewise </div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: Likewise</div><div class='del'>-</div><div class='del'>-2001-12-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (get_content): Reverted my</div><div class='del'>-	previous changes here since it doesn't actually work afterall.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-wrapper.c (imap_wrapper_hydrate):</div><div class='del'>-	Update to do uudecoding when appropriate.</div><div class='del'>-</div><div class='del'>-2001-12-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (get_content): Try to use the</div><div class='del'>-	original boundary so luis will stop bugging me about "data</div><div class='del'>-	corruption". Also preserve other params in the multipart</div><div class='del'>-	content-type by dumping it to a string and setting it on the mime</div><div class='del'>-	part.</div><div class='del'>-</div><div class='del'>-2001-12-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c</div><div class='del'>-	(camel_filter_driver_reset_filtered_count): Reset the</div><div class='del'>-	filtered_count to zero.</div><div class='del'>-	(camel_filter_driver_get_filtered_count): Return the private</div><div class='del'>-	filtered_count value.</div><div class='del'>-	(camel_filter_driver_filter_message): Increment the</div><div class='del'>-	filtered_count.</div><div class='del'>-	(camel_filter_driver_set_shell_exec_func): New function to set the</div><div class='del'>-	shell-exec func.</div><div class='del'>-	(shell_exec): New ESExp filter action callback.</div><div class='del'>-</div><div class='del'>-2001-12-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Removed</div><div class='del'>-	x-inline-pgp-hack kludge because it doesn't work.</div><div class='del'>-	(camel_pgp_mime_part_decrypt): Same.</div><div class='del'>-</div><div class='del'>-2001-12-13  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.c: include stdlib.h (for alloca on freebsd) and</div><div class='del'>-	only include alloca.h if HAVE_ALLOCA_H is defined.</div><div class='del'>-</div><div class='del'>-2001-12-11  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	Fixes #17085</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Added #include &lt;errno.h&gt;.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map-private.h:</div><div class='del'>-	Recreated (following instructions from camel-charset-map.c)</div><div class='del'>-</div><div class='del'>-2001-12-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_register): Keep a name-to-type hash</div><div class='del'>-	so that we can make sure that the type has not yet been registered</div><div class='del'>-	(prevents a race condition such as the one in bug #16559).</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_connect): Make sure that the</div><div class='del'>-	connect_op is non-NULL before unregistering/unreffing it.</div><div class='del'>-</div><div class='del'>-2001-12-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_simple): Protect against</div><div class='del'>-	either of the types being NULL.</div><div class='del'>-</div><div class='del'>-2001-12-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): If complete() allocates</div><div class='del'>-	len+2 bytes for the out buffer, so should this. See bug #16371 for</div><div class='del'>-	an example case.</div><div class='del'>-</div><div class='del'>-2001-12-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c: iconv() returns a size_t, not an int.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c: The return value of iconv() is a size_t,</div><div class='del'>-	not an int.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): Always use size_t args</div><div class='del'>-	for iconv().</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Always use size_t args</div><div class='del'>-	for iconv().</div><div class='del'>-	(filter): Same.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_fold): Make headerlen a</div><div class='del'>-	size_t instead of an int.</div><div class='del'>-	(header_fold): Same.</div><div class='del'>-	(base64_encode_close): We should be returning a size_t and inlen</div><div class='del'>-	should also be a size_t.</div><div class='del'>-	(base64_encode_step): Same here.</div><div class='del'>-	(base64_decode_step): Here too.</div><div class='del'>-	(base64_encode_simple): And here...</div><div class='del'>-	(base64_decode_simple): Same.</div><div class='del'>-	(uuencode_close): We should also use size_t's here...</div><div class='del'>-	(uuencode_step): And here too.</div><div class='del'>-	(uudecode_step): And also here.</div><div class='del'>-	(quoted_encode_close): Same idea here.</div><div class='del'>-	(quoted_encode_step): Again here.</div><div class='del'>-	(quoted_decode_step): Here too.</div><div class='del'>-	(quoted_encode): Input length should be a size_t.</div><div class='del'>-	(rfc2047_decode_word): Same.</div><div class='del'>-	(g_string_append_len): Here too.</div><div class='del'>-	(append_8bit): "</div><div class='del'>-	(rfc2047_encode_word): "</div><div class='del'>-	(quote_word): "</div><div class='del'>-	(hex_decode): "</div><div class='del'>-	(rfc2184_decode): Use size_t's with iconv().</div><div class='del'>-	(header_decode_param): Same.</div><div class='del'>-</div><div class='del'>-2001-12-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Add "NeedsReply" to the flag_names array</div><div class='del'>-	for CAMEL_MESSAGE_NEEDS_REPLY.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Added CAMEL_MESSAGE_NEEDS_REPLY flag.</div><div class='del'>-</div><div class='del'>-2001-12-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_date): Fix the</div><div class='del'>-	tm_gmtoff case (its sign is the opposite of "timezone"). Fixes</div><div class='del'>-	#14678</div><div class='del'>-</div><div class='del'>-2001-11-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_body_contains): Don't use regex</div><div class='del'>-	matching. Fixes bug #16227.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (best_encoding): Check the content-object's</div><div class='del'>-	mime type, not the mime part types. Should fix bug #15843.</div><div class='del'>-</div><div class='del'>-2001-11-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (get_content): Return NULL if</div><div class='del'>-	construct_from_stream fails.</div><div class='del'>-	(get_message): Same.</div><div class='del'>-	(get_message_simple): Here too.</div><div class='del'>-	(add_message_from_data): And here.</div><div class='del'>-</div><div class='del'>-2001-11-14    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (folder_changed_remove_uid): Use the uid</div><div class='del'>-	rather than vuid for unmatched.  Also add the uid to unmatched if</div><div class='del'>-	it wasn't in the unmatched_uids table at all.</div><div class='del'>-	(folder_changed_change): If checking for added, if the new ones</div><div class='del'>-	dont match, then try to add them to unmatched.  Fixes #6893.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_index): Change lock</div><div class='del'>-	order, always summary_lock before ref_lock.</div><div class='del'>-	(camel_folder_summary_array): "</div><div class='del'>-	(camel_folder_summary_uid): "</div><div class='del'>-	(camel_folder_summary_remove_uid): " Fixes a deadlock.</div><div class='del'>-</div><div class='del'>-2001-11-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-  </div><div class='del'>-	* providers/nntp/camel-nntp-*.c: Completely new implementation of</div><div class='del'>-	NNTP.</div><div class='del'>-	</div><div class='del'>-	Doesn't support subscriptions yet (lists all folders), but should</div><div class='del'>-	be more reliable (faster?), and has an integrated cache.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_new): Use e_memchunks for</div><div class='del'>-	exception blocks.</div><div class='del'>-	(camel_exception_free): Same.</div><div class='del'>-</div><div class='del'>-	* camel-data-cache.[ch]: New object for managing on-disk caches of</div><div class='del'>-	anything that can be stored in a camel-stream.</div><div class='del'>-</div><div class='del'>-	* camel-file-utils.c (camel_file_util_mkdir): New function, just a</div><div class='del'>-	nicer place to put this (than camel-store), should be removed from</div><div class='del'>-	camel-store.</div><div class='del'>-	(camel_file_util_safe_filename): New function to url-encode a</div><div class='del'>-	filename.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (drop_states): New func to drop the parser</div><div class='del'>-	state to initial state.</div><div class='del'>-	(folder_scan_init_with_fd): </div><div class='del'>-	(folder_scan_init_with_stream): Call above func to reset state if</div><div class='del'>-	the stream is changed on us so we can change streams to reuse a</div><div class='del'>-	parser object.</div><div class='del'>-</div><div class='del'>-2001-11-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message): If</div><div class='del'>-	the uid doesn't have a ',' in it, fail to crash.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_article_is_read): check group != NULL before</div><div class='del'>-	scanning.</div><div class='del'>-	(camel_nntp_newsrc_get_highest_article_read): "</div><div class='del'>-	(camel_nntp_newsrc_get_num_articles_read): "</div><div class='del'>-	(camel_nntp_newsrc_mark_range_read): "</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): IF we dont have</div><div class='del'>-	nntp_list_follows, dont try and get a list response.</div><div class='del'>-	(nntp_store_get_folder_info): Set path part of folderinfo.</div><div class='del'>-</div><div class='del'>-2001-11-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):</div><div class='del'>-	Check to see that errno is non-zero before returning</div><div class='del'>-	g_strerror. If it's 0, then we have an unknown error.</div><div class='del'>-</div><div class='del'>-2001-11-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c: For the uudecoding mode, garble up</div><div class='del'>-	the "begin &lt;mode&gt; &lt;filename&gt;" line before decoding.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Add a uudecoder if</div><div class='del'>-	the transfer encoding is x-uuencode.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Handle x-uuencoded content</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-2001-11-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_read): Added a check to see if</div><div class='del'>-	the operation has been cancelled.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-</div><div class='del'>-2001-11-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Updates for compliance with rfc2231</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_encode_param):</div><div class='del'>-	camel_mime_special_table[c] &amp; IS_ESAFE should have been</div><div class='del'>-	!(camel_mime_special_table[c] &amp; IS_ESAFE). Also added a few</div><div class='del'>-	comments for how to improve the code at some future date.</div><div class='del'>-	(header_decode_param): Now takes an argument rfc2184_part so our</div><div class='del'>-	caller can get this information as well.</div><div class='del'>-	(header_decode_param_list): Pass an rfc2184_part argument to</div><div class='del'>-	header_decode_param and also added a few comments on where to</div><div class='del'>-	improve on rfc2184/rfc2231 compliance.</div><div class='del'>-	(rfc2047_decode_word): Updated to respect the updated ABNF syntax</div><div class='del'>-	of rfc2047 encoded words, yay.</div><div class='del'>-</div><div class='del'>-2001-11-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_body): Abort if</div><div class='del'>-	body == NULL.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-tohtml.c (camel_mime_filter_tohtml_new): New</div><div class='del'>-	mime filter to convert plain text to html.</div><div class='del'>-</div><div class='del'>-2001-11-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Since some mail clients like Outlook are broken, we need to set a</div><div class='del'>-	name parameter on pgp signed and encrypted parts.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_encrypt): Set a name</div><div class='del'>-	parameter.</div><div class='del'>-	(camel_pgp_mime_part_sign): Same.</div><div class='del'>-</div><div class='del'>-2001-11-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(camel_imap_command_response): If we get a BYE response, call</div><div class='del'>-	camel_service_disconnect() and set an exception. Also do the check</div><div class='del'>-	for "* BYE" first instead of passing it off imap_read_untagged()</div><div class='del'>-	since we'll just waste time in there mallocing left and right only</div><div class='del'>-	to arrive at the single response line "* BYE" again :-)</div><div class='del'>-</div><div class='del'>-2001-11-13    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_source): If we have no source string,</div><div class='del'>-	then use undefined, which should always evaluate to FALSE.  Fix</div><div class='del'>-	for #15267.</div><div class='del'>-</div><div class='del'>-2001-11-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Added a</div><div class='del'>-	g_return_val_if_fail for folder_name != NULL.</div><div class='del'>-</div><div class='del'>-2001-11-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): If any of the</div><div class='del'>-	pipe()'s fail, clean up any pipes that may have succeeded. Also</div><div class='del'>-	close the password fds.</div><div class='del'>-</div><div class='del'>-2001-11-09    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_auth_loop): If we get a</div><div class='del'>-	user cancel and that causes us to fail to authenticate, abort</div><div class='del'>-	rather than loop forever.  Fix for #14951.</div><div class='del'>-</div><div class='del'>-2001-11-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(camel_imap_command_continuation): Now takes a command-length</div><div class='del'>-	argument so we can 1) avoid duping the command string yet again,</div><div class='del'>-	yay. 2) we now don't have to worry about embedded nul-chars</div><div class='del'>-	screwing us over (we still need to avoid allowing them into the</div><div class='del'>-	string but at least now it won't mess us up).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (do_append): Instead of</div><div class='del'>-	appending a nul char to the end of the byte array and then passing</div><div class='del'>-	that off as if it were a string to</div><div class='del'>-	camel_imap_command_continuation, instead pass the byte-array</div><div class='del'>-	length since that function now takes a length argument. Yay.  Also</div><div class='del'>-	encode any 8bit parts to avoid the possibility of sending embedded</div><div class='del'>-	nul chars to the imap server.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_auth): Updated to pass a</div><div class='del'>-	command-length argument to camel_imap_command_continuation().</div><div class='del'>-</div><div class='del'>-2001-11-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (save_ssl_cert): Oops, pass a mode</div><div class='del'>-	argument to the open() call.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (save_ssl_cert): Oops, pass a mode</div><div class='del'>-	argument to the open() call.</div><div class='del'>-</div><div class='del'>-2001-11-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_decrypt): Add code to</div><div class='del'>-	kludge around any x-inline-pgp-hacks by prepending some content</div><div class='del'>-	headers to the decrypted data.</div><div class='del'>-</div><div class='del'>-2001-11-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_init): Initialize our</div><div class='del'>-	private mutex.</div><div class='del'>-	(camel_data_wrapper_finalize): Destroy our private mutex.</div><div class='del'>-	(write_to_stream): Lock around camel_stream_write_to_stream() so</div><div class='del'>-	that we don't get 2 threads trying to read from our stream at the</div><div class='del'>-	same time.</div><div class='del'>-</div><div class='del'>-2001-11-01    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (folder_changed_change): Move all searching</div><div class='del'>-	operations outside of any locks except subfolder lock, same as</div><div class='del'>-	build_folder.  Fix for #14294.</div><div class='del'>-</div><div class='del'>-2001-10-31    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c (spool_get_message): Same</div><div class='del'>-	as below.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_get_message):</div><div class='del'>-	Same as below.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_get_message): Set</div><div class='del'>-	USER_CANCEL if failed due to EINTR.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): If</div><div class='del'>-	construct from parser fails due to user cancel, set USER_CANCEL on</div><div class='del'>-	exception.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): Return error if the</div><div class='del'>-	parser had an io error.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Check error on</div><div class='del'>-	parser/return error.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init): Init error number.</div><div class='del'>-	(camel_mime_parser_errno): New function, return errno of any io</div><div class='del'>-	failures.</div><div class='del'>-	(folder_read): Set errno if a failure occured.</div><div class='del'>-	(folder_seek): Same.</div><div class='del'>-	(folder_scan_init_with_fd): Setup errno depeding on ok/failure.</div><div class='del'>-	(folder_scan_init_with_stream): Same.</div><div class='del'>-</div><div class='del'>-2001-10-30    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_new): Dont setup cancel_fd.</div><div class='del'>-	(camel_operation_cancel_fd): If cancel_fd not created, set it up.</div><div class='del'>-	(camel_operation_cancel): Set cancel flag before sending message.</div><div class='del'>-	(cancel_thread): Same.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Make</div><div class='del'>-	sure we unref the mimeparse when we're done (successfully).  This</div><div class='del'>-	was leaking an fd every get-mail! :(</div><div class='del'>-</div><div class='del'>-	* camel-lock-client.c (camel_lock_helper_init): Close all fd's</div><div class='del'>-	above 2.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_get_message): Remove</div><div class='del'>-	the X-Evolution header before anyone else gets to see this private</div><div class='del'>-	thing.  Shoudl fix 11676 since we were inheriting flags from</div><div class='del'>-	X-Evolution headers we didn't want to.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (match_message): If we can't retrieve the</div><div class='del'>-	message, ignore it, it can't match.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c</div><div class='del'>-	(camel_imap_search_class_init): Setup parent class pointer.</div><div class='del'>-	(imap_body_contains): If offline, just use the parent</div><div class='del'>-	body_contains method which will get the messages and search them</div><div class='del'>-	manually.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression,</div><div class='del'>-	imap_search_by_uids): Remove offline check.</div><div class='del'>-</div><div class='del'>-2001-10-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (free_headers): Fix this to match get_headers.</div><div class='del'>-</div><div class='del'>-2001-10-30    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (rename_folder): Dont try to</div><div class='del'>-	move ibex if we have none.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (stream_write): Fixed compilation</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (camel_mime_utils_init): Removed unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-2001-10-30    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): w(x) out some warnings.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(camel_local_summary_load): Remove the warning about not loading</div><div class='del'>-	summary file - its a valid case for new folders.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (my_SSL_write): Removed.</div><div class='del'>-	(stream_write): Keep looping (non-blocking case) if errno is</div><div class='del'>-	EAGAIN, EINTR or EWOULDBLOCK. For NONBLOCKing I/O, sync up with</div><div class='del'>-	CamelTcpStreamRaw. As with CamelTcpStreamRaw/SSL - make sure to</div><div class='del'>-	write out everything before returning.</div><div class='del'>-	(my_SSL_read): Removed.</div><div class='del'>-	(stream_read): Just call ssl_error_to_errno() and check the errno</div><div class='del'>-	values that we care about so we can keep the general look of all</div><div class='del'>-	this stream code the same. Also when checking the return value of</div><div class='del'>-	SSL_read, check for &lt;0 instead of ==-1 since the man page for</div><div class='del'>-	SSL_read doesn't say it will return -1 on fail, it just says &lt;0.</div><div class='del'>-	(stream_flush): Don't fsync() since syncing on a socket is a Bad</div><div class='del'>-	Thing (tm).</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_write): Make sure we write out</div><div class='del'>-	everything just like in camel-tcp-stream-raw.c.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_gets): If</div><div class='del'>-	camel_stream_read() returns -1, don't necessarily return -1 to our</div><div class='del'>-	caller since it's possible that we did actually "read" some data</div><div class='del'>-	(ie, we copied some pre-buffered data into the out buffer).</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.h: Removed CAMEL_STREAM_BUFFER_NEWLINE since</div><div class='del'>-	it never got used anywhere and it isn't supported anyway.</div><div class='del'>-</div><div class='del'>-2001-10-30    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(parse_list_response_as_folder_info): If we get an empty name,</div><div class='del'>-	then mark that as NoSelect.  Workaround fix for #13239.</div><div class='del'>-</div><div class='del'>-2001-10-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (get_message_simple, </div><div class='del'>-	imap_get_message): Set an X-Evolution-Source header on the</div><div class='del'>-	returned message so replies come from the right identity.</div><div class='del'>-</div><div class='del'>-2001-10-29    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (folder_changed_change): If we're not going</div><div class='del'>-	to search on a changed uid, make sure we change out copy still.</div><div class='del'>-	Fixes #13916.</div><div class='del'>-</div><div class='del'>-2001-10-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (subscribe_folder): Don't emit</div><div class='del'>-	a folder_subscribed signal if we are in the process of renaming</div><div class='del'>-	folders.</div><div class='del'>-	(unsubscribe_folder): Same here but for the unsubscribe signal.</div><div class='del'>-	(rename_folder): Unsubscribe from the folder being renamed and any</div><div class='del'>-	subfolders it may have before actually renaming. Once the folder</div><div class='del'>-	has been renamed, re-subscribe to it and it's subfolders with the</div><div class='del'>-	new name.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Sort the folder info's</div><div class='del'>-	before constructing the tree.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param): Minor fix - should</div><div class='del'>-	have been using a strNcmp when checking if it was an rfc2047</div><div class='del'>-	encoded word.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): Notify the user that PGP 2.6.x</div><div class='del'>-	is no longer supported and use camel_exception_set() instead of</div><div class='del'>-	setv() where appropriate.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_verify): And again here.</div><div class='del'>-	(pgp_encrypt): Here too.</div><div class='del'>-	(pgp_decrypt): And finally here.</div><div class='del'>-</div><div class='del'>-2001-10-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Don't</div><div class='del'>-	free the hash table key if the folder wasn't found in the hash</div><div class='del'>-	table. I'm not sure where the bug is/was that made it possible to</div><div class='del'>-	add a folder to the tree after creating it failed, but now if that</div><div class='del'>-	happens, it won't crash if you try to delete it again. (#11492)</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c (camel_disco_store_status): if the service</div><div class='del'>-	is being connected and thinks it's online, but the session is</div><div class='del'>-	offline, then mark the service offline as well. Fixes 13683.</div><div class='del'>-</div><div class='del'>-2001-10-29    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Turn off w() -&gt; warnings.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (rename_folder): Also rename</div><div class='del'>-	the message cache.</div><div class='del'>-	(rename_folder): Fix subscribed folders table with rename(s).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rename): Implement,</div><div class='del'>-	rename the cache dir pointer.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_set_path): New method to set the path</div><div class='del'>-	used by a message cache.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (build_info): Fix the 'is this a matching</div><div class='del'>-	subfolder or subfolder' logic to match camel-store</div><div class='del'>-	get_subfolders'.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (get_subfolders): Fix the 'is this a matching</div><div class='del'>-	folder or subfolder' logic.</div><div class='del'>-</div><div class='del'>-2001-10-28    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (rename_folder): Changed to</div><div class='del'>-	call ibex_move to rename it internally.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_rename_folder): Use the right</div><div class='del'>-	variable, not info.</div><div class='del'>-</div><div class='del'>-2001-10-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Make sure</div><div class='del'>-	we've actually read data before checking if p[-] is '\r' or not.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_write): Same.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_write): If errno isn't EAGAIN, just</div><div class='del'>-	exit with -1 and instead of using continue (which doesn't go to</div><div class='del'>-	the top of the do-while thus making our logic suck), just set w to</div><div class='del'>-	0. Still seems to be a bug in select() if it's telling us the</div><div class='del'>-	socket is ready for data when it really isn't but oh well.</div><div class='del'>-</div><div class='del'>-2001-10-28    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Use path not protocol as the path</div><div class='del'>-	part of the uri of the folder_created event.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (scan_dir): If FAST is</div><div class='del'>-	set, dont try and scan for unread counts.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (create_folder): Implement,</div><div class='del'>-	just return the folderinfo of the folder matched, not all of it.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_rename_folder): Rename the</div><div class='del'>-	camelfolders before emitting the folderchanged event (otherwise</div><div class='del'>-	vstore fails to pick up change.</div><div class='del'>-</div><div class='del'>-2001-10-27    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Always use a default dir_sep</div><div class='del'>-	of '/'.</div><div class='del'>-</div><div class='del'>-	* camel-store.h (struct _CamelStore): Added a dir_sep to the base</div><div class='del'>-	store so rename and whatnot can work, temporary fix for mixed dir</div><div class='del'>-	separator in folder name api's.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (rename_folder): Finished</div><div class='del'>-	implementation.</div><div class='del'>-	(imap_connect_online): Also set the store's dir_sep here.</div><div class='del'>-	(imap_connect_offline): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_rename): Implement</div><div class='del'>-	local rename of folder objects.</div><div class='del'>-</div><div class='del'>-2001-10-26    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_class_init): Hook into</div><div class='del'>-	rename function.</div><div class='del'>-	(vee_rename): Implement the veefolder rename function.</div><div class='del'>-	(camel_vee_folder_class_init): </div><div class='del'>-	(folder_changed_change): Kill a warning with a cast.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_rename_folder): Emit a folder_renamed</div><div class='del'>-	event properly, also call parent to do some rename stuff.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Added a CamelRenameInfo for the rename event.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_rename): New function to rename a</div><div class='del'>-	folder object.</div><div class='del'>-	(camel_folder_class_init): Added a renamed event.</div><div class='del'>-	(folder_rename): Default impl, set full_name, and set name</div><div class='del'>-	assuming the dir separator is '/'.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_class_init): Added folder_renamed</div><div class='del'>-	event.</div><div class='del'>-	(camel_store_rename_folder): Rename an active folder object if we</div><div class='del'>-	have one, and update the folder table.</div><div class='del'>-	(rename_folder): Make a default implementation that handles</div><div class='del'>-	updating the folder tree.</div><div class='del'>-</div><div class='del'>-2001-10-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): Don't bother</div><div class='del'>-	checking ex since we can rely on the response being NULL on error.</div><div class='del'>-	(rename_folder): Implemented.</div><div class='del'>-</div><div class='del'>-2001-10-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Check to</div><div class='del'>-	make sure that the dataset is non-NULL before using and/or</div><div class='del'>-	freeing.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_write): Check for EWOULDBLOCK</div><div class='del'>-	too?</div><div class='del'>-	(stream_read): Same.</div><div class='del'>-	(stream_flush): Return 0 always, fsync() and tcp sockets don't</div><div class='del'>-	play nice :-)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_get): Lets try putting a</div><div class='del'>-	camel_stream_reset() here. Logic being that the stream may have</div><div class='del'>-	been read from since it was cached and thus our caller may try</div><div class='del'>-	reading from it and get no data from it since it is already at the</div><div class='del'>-	EOS. This may fix bug #12943.</div><div class='del'>-</div><div class='del'>-2001-10-25    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (utf8_get): Remove the stupid warning</div><div class='del'>-	that should never have been there in the first place.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_response): s/iconv/e_iconv/</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): "</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word, rfc2047_decode_word,</div><div class='del'>-	append_8bit, rfc2047_encode_word, rfc2184_decode,</div><div class='del'>-	header_decode_param): "</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer, convert_buffer): "</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (reset, complete, filter): "</div><div class='del'>-</div><div class='del'>-2001-10-24    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (complete): For qp decoding, if the</div><div class='del'>-	data isn't really qp encoded, we could possible grow the buffer by</div><div class='del'>-	upto 2 bytes above the input size, fix allocations/assertions</div><div class='del'>-	appropraitely.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (folder_changed_change): If we're not</div><div class='del'>-	autoupdate, only search for new matches against changed uid's that</div><div class='del'>-	we dont already have.</div><div class='del'>-</div><div class='del'>-2001-10-24  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Don't</div><div class='del'>-	let fi-&gt;name be NULL.</div><div class='del'>-</div><div class='del'>-2001-10-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_read): Same as in the TcpStreamRaw code.</div><div class='del'>-	(stream_write): And again here...</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_read): Handle the EAGAIN error</div><div class='del'>-	case as well.</div><div class='del'>-	(stream_write): Same here, this might fix the SMTP truncation</div><div class='del'>-	thing? I hope?</div><div class='del'>-</div><div class='del'>-2001-10-23  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (mail_list_magic): Remove an extra * in one</div><div class='del'>-	of the regexps that glibc apparently doesn't mind but bsd does.</div><div class='del'>-</div><div class='del'>-2001-10-23    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c: made d(x) x recompile again.</div><div class='del'>-</div><div class='del'>-2001-10-22    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (summary_rebuild): No, use</div><div class='del'>-	Storing, as the other code does :p</div><div class='del'>-	(spool_summary_check): Check for consistency.</div><div class='del'>-</div><div class='del'>-2001-10-22  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (summary_rebuild):</div><div class='del'>-	s/summarising/summarizing/.</div><div class='del'>-	(spool_summary_check): s/summarise/summarize/.</div><div class='del'>-</div><div class='del'>-2001-10-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): If we are</div><div class='del'>-	kludging around a inline-pgp signed part, do some charset</div><div class='del'>-	conversion to protect any 8bit text.</div><div class='del'>-</div><div class='del'>-2001-10-22    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c, camel-folder-search.c (check_header): Use</div><div class='del'>-	search_type_mlist for mailing list searches.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): call camel-mime-utils-init func.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Changed mail mail_list_magic to include a</div><div class='del'>-	domain part, also pre-compile all the patterns.  They are all</div><div class='del'>-	backward compatible except List-Id: which now uses the</div><div class='del'>-	mail-address-like &lt;list-name.host.name&gt; part rather than the</div><div class='del'>-	plain-text part (which might've been blank anyway).</div><div class='del'>-	(camel_mime_utils_init): Initialisation function to setup any</div><div class='del'>-	static data required by camel-mime-utils at run-time.  We now</div><div class='del'>-	setup the base64/charset class tables here, so it doesn't need to</div><div class='del'>-	be done statically.</div><div class='del'>-	(camel_mime_special_table, camel_mime_base64_rank): No longer</div><div class='del'>-	statically initialise these.</div><div class='del'>-	(main): Removed + the tests at the end of the file.</div><div class='del'>-	(header_raw_check_mailing_list): Dont compile regex's here,</div><div class='del'>-	already compiled in utils_init.  Use the regex patterns to remove</div><div class='del'>-	leading &lt;'s from addresses.  Also, if there is a domain part</div><div class='del'>-	matched, add that after a '@' is added.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_header_match): Match check</div><div class='del'>-	against all addresses in a multiple address match.  Should fix</div><div class='del'>-	#13051.</div><div class='del'>-	(camel_search_header_match): Oops, missing i=0.</div><div class='del'>-	(camel_search_header_match): Added SEARCH_TYPE_MLIST for mlist</div><div class='del'>-	search types.  It ignores the domain part if either (but not both)</div><div class='del'>-	of the values dont have it.</div><div class='del'>-</div><div class='del'>-2001-10-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Add a hack: if</div><div class='del'>-	the multipart/signed part has a "x-inline-pgp-hack" parameter in</div><div class='del'>-	its Content-Type, don't pass the MIME headers as part of the data</div><div class='del'>-	to be verified.</div><div class='del'>-</div><div class='del'>-2001-10-22  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added $GNOME_INCLUDEDIR to INCLUDES, needed for latest</div><div class='del'>-	libgnome, which install headers in $(prefix)/gnome-1.0</div><div class='del'>-</div><div class='del'>-2001-10-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Only do the rawtext</div><div class='del'>-	checks if the part is a text part, otherwise don't bother wasting</div><div class='del'>-	cpu cycles.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Updated comments to</div><div class='del'>-	make the code a bit more clear.</div><div class='del'>-</div><div class='del'>-2001-10-21    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (CS_CLASS): Dont do the macro stuff - basically so</div><div class='del'>-	you can actually debug calls.</div><div class='del'>-	(camel_store_uri_cmp): New function to compare store objects.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_add_info): oops, dont free the</div><div class='del'>-	vuid, since its alloca'd now.</div><div class='del'>-	(folder_changed_change): Kill a compile warning.</div><div class='del'>-</div><div class='del'>-2001-10-20    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (move_messages_to): If no exception supplied, use</div><div class='del'>-	a local one.</div><div class='del'>-	(move_message_to): Set the seen flag also when we delete it.</div><div class='del'>-</div><div class='del'>-2001-10-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_move_messages_to): If the</div><div class='del'>-	destination folder is the vfolder source folder, then</div><div class='del'>-	set_message_flags on it.</div><div class='del'>-</div><div class='del'>-2001-10-19    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (register_provider): When registering provider,</div><div class='del'>-	translate all strings.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_remove_folder): Lock the</div><div class='del'>-	right lock for unmatched subfolder list stuff.  If the sub folder</div><div class='del'>-	is deleted &amp; part of unmatched, or the last ref to the sub folder</div><div class='del'>-	is gone from unmatched, blow it away completely from unmatched,</div><div class='del'>-	but only do it once.</div><div class='del'>-	(vee_folder_remove_folder): Added arg to kill unmatched</div><div class='del'>-	unconditionally.  Also handle deleted folders, always remove</div><div class='del'>-	stuff.</div><div class='del'>-	(folder_changed_change): Lock subfolder lock for entirety of</div><div class='del'>-	operation, and also check to see if the subfolder is still there</div><div class='del'>-	before doing any fancy work (incase it got removed while we were</div><div class='del'>-	waiting to execute).</div><div class='del'>-	(folder_changed_change_uid): Use alloca for vuid, and not</div><div class='del'>-	sprintf(".lengths")</div><div class='del'>-	(vee_search_by_expression): Dont use sprintf for vuid.</div><div class='del'>-	(vee_search_by_uids): "</div><div class='del'>-	(vee_folder_add_info): "</div><div class='del'>-	(folder_changed_remove_uid): "</div><div class='del'>-	(folder_changed_change): "</div><div class='del'>-	(folder_changed_change_uid): Also check folder_unmatched for</div><div class='del'>-	changed uid's so we properly update/propagate unmatched changes.</div><div class='del'>-	(folder_changed_change): Ok, so dont hold the subfolder lock for</div><div class='del'>-	the whole duration of the changed event, although we probably</div><div class='del'>-	should, requires a recursive mutex.</div><div class='del'>-	(folder_changed_change): Change logic, we always add changed stuff</div><div class='del'>-	if it now matches, but dont remove it unless its auto-remove, only</div><div class='del'>-	propagate changes for it.</div><div class='del'>-	(vee_set_message_flags): Call parent method after doing our work.</div><div class='del'>-	(vee_set_message_user_flag): Same here.</div><div class='del'>-</div><div class='del'>-2001-10-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): If a charset isn't</div><div class='del'>-	specified or claims to be utf-8, check the validity of the text</div><div class='del'>-	and if it's invalid, set the rawtext bit to TRUE. If the charset</div><div class='del'>-	is x-unknown or some other x- charset, always set the rawtext bit</div><div class='del'>-	to TRUE.</div><div class='del'>-</div><div class='del'>-2001-10-18    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_unsubscribe_folder): If we are</div><div class='del'>-	unsubscribing from a folder we have loaded, set the folder</div><div class='del'>-	deleted, as with the delete_folder case.</div><div class='del'>-</div><div class='del'>-	* providers/(imap|local|pop3|sendmail|smtp)/Makefile.am: Added</div><div class='del'>-	CAMEL_CFLAGS so we get the right iconv stuff, patch from Yanko</div><div class='del'>-	Kaneti &lt;yaneti@declera.com&gt;</div><div class='del'>-</div><div class='del'>-2001-10-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Make sure the</div><div class='del'>-	cancel_fd isn't -1.</div><div class='del'>-</div><div class='del'>-2001-10-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c (insert_finish): Flush</div><div class='del'>-	the stream here, not sure it really matters but it might</div><div class='del'>-	(hopefully) fix bug #12943.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Make</div><div class='del'>-	user-cancellable.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: String cleanup for bug</div><div class='del'>-	#6640.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync_online): Fix my</div><div class='del'>-	Cyrus imapd workaround...instead of checking to see if info-&gt;flags</div><div class='del'>-	== FLAGGED, just check to see if it contains any IMAP flags.</div><div class='del'>-</div><div class='del'>-2001-10-17    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c</div><div class='del'>-	(camel_maildir_folder_new): Use '.' as the inbox name for filter</div><div class='del'>-	new messages test.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_clone): New function to clone a</div><div class='del'>-	folderinfo tree.</div><div class='del'>-</div><div class='del'>-2001-10-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_append_message): Same as</div><div class='del'>-	maildir and mbox append-message.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_append_message):</div><div class='del'>-	Same as mbox append.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_set): Make sure the new</div><div class='del'>-	description isn't the same as the old description pointer before</div><div class='del'>-	freeing the old one.</div><div class='del'>-	(camel_exception_setv): Don't free the old description until we</div><div class='del'>-	set the new one this way we can reuse the old description in the</div><div class='del'>-	new description.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message): If</div><div class='del'>-	errno == EINTR, then we got a user-cancel so set the exception</div><div class='del'>-	appropriately so that we don't make the user shit his pants.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_copy): Add an optimization for when</div><div class='del'>-	destination folder is the same as the source folder.</div><div class='del'>-</div><div class='del'>-2001-10-17    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info_online):</div><div class='del'>-	(parse_list_response_as_folder_info): Patch from Danw, Use unread</div><div class='del'>-	count of -1 to mark unflagged messages.  Make sure any folder we</div><div class='del'>-	dont lookup explicitly is marked as -1.  Should fix #9947 and</div><div class='del'>-	friends.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): Only</div><div class='del'>-	touch the summary if the timestamp or size changed.</div><div class='del'>-</div><div class='del'>-2001-10-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): Set</div><div class='del'>-	the DELETED flag on directly on the info if the source folder</div><div class='del'>-	doesn't have summary capability.</div><div class='del'>-</div><div class='del'>-2001-10-17  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_write): As below.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_write): If not checking cancellation,</div><div class='del'>-	make sure we write out everything asked of us.</div><div class='del'>-</div><div class='del'>-2001-10-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Rearange the order of the gpg</div><div class='del'>-	options slightly otherwise it might try to use "--no-tty" as the</div><div class='del'>-	filename to verify :-)</div><div class='del'>-</div><div class='del'>-	* camel-object.[c,h]: If CAMEL_DEBUG is defined, print some useful</div><div class='del'>-	ref/unref info.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): Fixed an</div><div class='del'>-	assignment warning.</div><div class='del'>-</div><div class='del'>-	* camel-uid-cache.c (camel_uid_cache_new): Make sure that the</div><div class='del'>-	parent directory exists before trying to open the filename, if it</div><div class='del'>-	doesn't, create it.</div><div class='del'>-</div><div class='del'>-2001-10-16    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_decode): If no content, dont</div><div class='del'>-	try and decode further and spit meaningless warnings.</div><div class='del'>-</div><div class='del'>-2001-10-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_flag): Only perform the operation on</div><div class='del'>-	the folder if the folder has summary capability, else just poke</div><div class='del'>-	the info directly. Fixes the "Filters don't work" bug.</div><div class='del'>-	(do_score): Same.</div><div class='del'>-	(do_colour): And here too.</div><div class='del'>-</div><div class='del'>-2001-10-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_read): Save the errno before calling</div><div class='del'>-	fcntl so fcntl doesn't overwrite errno in case of a previous</div><div class='del'>-	error.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-</div><div class='del'>-2001-10-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Replace the</div><div class='del'>-	Bcc headers in a single location and don't flush the data unless</div><div class='del'>-	the write was successful.</div><div class='del'>-</div><div class='del'>-2001-10-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove the stripheader filter from the build.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-stripheader.[c,h]: Removed.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Check the</div><div class='del'>-	return value of camel_stream_flush to make sure it flushed the</div><div class='del'>-	data successfully before continuing. Don't use the stripheader</div><div class='del'>-	filter, it was completely broken - instead remove the header and</div><div class='del'>-	set it again after we send.</div><div class='del'>-</div><div class='del'>-2001-10-12    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_remove_folder): Unhook from</div><div class='del'>-	all events before removing folder.</div><div class='del'>-	(camel_vee_folder_add_folder): Hook onto delete event.</div><div class='del'>-	(camel_vee_folder_finalise): Unhook from deleted event for suibfolder.</div><div class='del'>-	(subfolder_deleted): When the folder is deleted, remove it from</div><div class='del'>-	the vfolder automagically.</div><div class='del'>-</div><div class='del'>-2001-10-11    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_search_by_uids): convert the uids list</div><div class='del'>-	to a subset appropriate for each subfolder before trying to search</div><div class='del'>-	on it.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.[ch]: Removed charset/locale charset lookup</div><div class='del'>-	and iconv_open/close functions, moved to gal.  Fixed all callers.</div><div class='del'>-</div><div class='del'>-2001-10-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_cert_is_saved): Same.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_cert_is_saved): Instead of</div><div class='del'>-	opening the file, stat it and make sure that it belongs to us.</div><div class='del'>-</div><div class='del'>-2001-10-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_verify): Same hack as below.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hack around the fact that</div><div class='del'>-	adding a cert to nss's certdb seems to not work.</div><div class='del'>-</div><div class='del'>-2001-10-10    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_sync): Only re-build the folder if we're</div><div class='del'>-	expunging.  Also only clear out the changed folders list if we're</div><div class='del'>-	expungung and everything worked.</div><div class='del'>-</div><div class='del'>-2001-10-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_map_init): Added a hack for</div><div class='del'>-	Solaris systems.</div><div class='del'>-</div><div class='del'>-2001-10-10    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (scan_dir): oops, we want</div><div class='del'>-	get_unread_message_count, not get_message_count!</div><div class='del'>-</div><div class='del'>-2001-10-09    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_disconnect): Duplicate connect</div><div class='del'>-	code that unregisters a cancel op if we created one.</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_progress): Another go at</div><div class='del'>-	getting the logic right again.  Make transients only update after</div><div class='del'>-	5 seconds (CAMEL_OPERATION_TRANSIENT_DELAY)</div><div class='del'>-	(camel_operation_end): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c (spool_search_by_uids):</div><div class='del'>-	Implement.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains): If</div><div class='del'>-	searching a sub-set of the total message count, then use a UID</div><div class='del'>-	range to search only specific messages.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_change_match): Removed.</div><div class='del'>-	(folder_changed_add_uid): Helper func for changed code.</div><div class='del'>-	(folder_changed_remove_uid): "</div><div class='del'>-	(folder_changed_change_uid): "</div><div class='del'>-	(folder_changed): Rewritten.  Supports proper auto-updating of</div><div class='del'>-	changes, but not removals till a sync occurs.</div><div class='del'>-	(vee_search_by_uids): Implement.</div><div class='del'>-	(folder_changed): Changed to call an async threaded function to do</div><div class='del'>-	the actual folder updating.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_flag_list_copy): New func to copy</div><div class='del'>-	a whole list of flags.</div><div class='del'>-	(camel_tag_list_copy): New func to copy a whole list of flags.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_uids):</div><div class='del'>-	Implement.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_search_by_uids):</div><div class='del'>-	Implement.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_uids): New function,</div><div class='del'>-	search a subset of uid's.</div><div class='del'>-	(search_by_uids): Default impl, return error.</div><div class='del'>-</div><div class='del'>-2001-10-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): replace the ever-growing</div><div class='del'>-	list of gbooleans with a single guint32 for flags.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Update folder flag setting/checking.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_init):</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): </div><div class='del'>-	* providers/local/camel-spool-folder.c (spool_init,</div><div class='del'>-	camel_spool_folder_new): </div><div class='del'>-	* providers/local/camel-maildir-folder.c (camel_maildir_folder_new): </div><div class='del'>-	* providers/local/camel-local-folder.c (local_init): </div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init,</div><div class='del'>-	camel_imap_folder_new): </div><div class='del'>-	* camel-vtrash-folder.c (camel_vtrash_folder_init): </div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_init): </div><div class='del'>-	* camel-digest-folder.c (camel_digest_folder_init): update folder</div><div class='del'>-	flag setting.</div><div class='del'>-</div><div class='del'>-2001-10-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_online): Unlock</div><div class='del'>-	the store before returning error. (noted by NotZed)</div><div class='del'>-</div><div class='del'>-2001-10-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): Fix a slight error in</div><div class='del'>-	logic. Just because the last word was an encoded word doesn't mean</div><div class='del'>-	we ignore the lwsp padding, we only ignore it if the last word and</div><div class='del'>-	*this* word are encoded.</div><div class='del'>-</div><div class='del'>-2001-10-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Implemented uuencoding and</div><div class='del'>-	decoding.</div><div class='del'>-	(complete): Implemented uuencoding and decoding.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uuencode_close): New function to flush the</div><div class='del'>-	uu encoder.</div><div class='del'>-	(uuencode_step): New function to uuencode a block of data.</div><div class='del'>-</div><div class='del'>-2001-10-05    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (subscribe_folder): Use a</div><div class='del'>-	folder_subscribed event rather than a folder_created one.</div><div class='del'>-	(unsubscribe_folder): Similarly for unsubscribed/deleted.</div><div class='del'>-	(create_folder): Emit a folder_created event on the folders we</div><div class='del'>-	added.  Not sure hsould probably check which ones are new and</div><div class='del'>-	which ones are just existing ones?</div><div class='del'>-	(delete_folder): Emit a folder_deletd event when we've deleted the</div><div class='del'>-	folder.  Part of fix for #11831.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_class_init): Added</div><div class='del'>-	folder_subscribed/unsubscribed events.</div><div class='del'>-</div><div class='del'>-2001-10-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_finalize): Turn off warnings.</div><div class='del'>-	(get_name): Same.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (sasl_challenge): Turn off warnings.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.c (tcp_connect): Turn off warnings.</div><div class='del'>-	(tcp_getsockopt): Same.</div><div class='del'>-	(tcp_setsockopt): Here too.</div><div class='del'>-	(tcp_get_socket): And here.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (folder_sync): Turn off warnings.</div><div class='del'>-	(expunge): Same.</div><div class='del'>-	(append_message): Here too.</div><div class='del'>-	(get_message): And here.</div><div class='del'>-	(search_by_expression): And again here.</div><div class='del'>-	(folder_changed): Here too.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (get_folder): Set an exception and turn off</div><div class='del'>-	debugging g_warnings.</div><div class='del'>-	(create_folder): Same.</div><div class='del'>-	(delete_folder): Here too.</div><div class='del'>-	(rename_folder): And here.</div><div class='del'>-	(get_trash): And here.</div><div class='del'>-	(get_folder_info): Same.</div><div class='del'>-	(free_folder_info): And again here.</div><div class='del'>-	(camel_folder_info_build): Here too.</div><div class='del'>-	(folder_subscribed): Same.</div><div class='del'>-	(subscribe_folder): Here too.</div><div class='del'>-	(unsubscribe_folder): And here.</div><div class='del'>-</div><div class='del'>-2001-10-05    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Try harder to get</div><div class='del'>-	broken names out of addresses.  Unencoded ,'s in names will still</div><div class='del'>-	break it, but well what can you do eh?</div><div class='del'>-	(header_decode_mailbox): Always add .'s into address we've scanned</div><div class='del'>-	past a '.', even if we can't decode the next part.  Fix for some</div><div class='del'>-	annoying bug #.</div><div class='del'>-</div><div class='del'>-2001-10-04    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_delete_folder): Change the order of</div><div class='del'>-	execution slightly.  We delete the folder first, then call the</div><div class='del'>-	classes delete folder, then cleanup the hashtable afterwards.</div><div class='del'>-	This is so deletes of vfolders work, since vee-store uses the</div><div class='del'>-	folder hashtable to store all of is vfolders :-/</div><div class='del'>-</div><div class='del'>-2001-10-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_connect): Unregister the</div><div class='del'>-	operation before unreffing it.</div><div class='del'>-</div><div class='del'>-2001-10-03    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Remove now unused 'recents' array/freeing func.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_trigger_event): Oops, always run</div><div class='del'>-	the prep function, even if we have no hooks listening.  Causes</div><div class='del'>-	incoming imap recents to get ignored bythe camel-folder filter</div><div class='del'>-	inbox code.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_sync): Dont</div><div class='del'>-	explicitly save metadata, its saved in summary_sync.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c: Call superclass.</div><div class='del'>-	(mh_summary_check): Dont save ibex.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c: Call superclass method.</div><div class='del'>-	(maildir_summary_check): Dont save ibex explictly.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c: Call super-class sync when</div><div class='del'>-	done, saves summary/ibex, etc.</div><div class='del'>-	(mbox_summary_check): Dont save ibex.</div><div class='del'>-	(mbox_summary_sync): Call summary_check rather than trying to</div><div class='del'>-	update from our known position.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(camel_local_summary_check): Dont save the summary or index here.</div><div class='del'>-	(local_summary_sync): Save the summary/index here.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_build_match_regex): Added</div><div class='del'>-	MATCH_NEWLINE flag, -&gt; REG_NEWLINE.</div><div class='del'>-</div><div class='del'>-	* camel-lock-helper.c: Include &lt;string.h&gt; to kill some warnings.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_full_header): Put \n's between each</div><div class='del'>-	line we generate.</div><div class='del'>-	(header_full_regex): Dont drop the first argument to the command</div><div class='del'>-	-&gt; empty matches!</div><div class='del'>-	(header_full_regex): Set match_newline for building regex.</div><div class='del'>-	(body_regex): And here too.  These all fix #9877.</div><div class='del'>-</div><div class='del'>-2001-10-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_delete_folder): Call</div><div class='del'>-	camel_folder_delete() on the folder if it's "alive".</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_delete): Mark the folder as</div><div class='del'>-	deleted, perform any folder specific cleanup and emit the deleted</div><div class='del'>-	event.</div><div class='del'>-	(camel_folder_sync): Only sync the folder if it hasn't been</div><div class='del'>-	deleted.</div><div class='del'>-	(camel_folder_expunge): Same.</div><div class='del'>-</div><div class='del'>-2001-10-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c (local_url_equal):</div><div class='del'>-	Strange are the ways of alloca. Fixes 11543.</div><div class='del'>-</div><div class='del'>-2001-10-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Import the certificate if</div><div class='del'>-	the user accepts it.</div><div class='del'>-</div><div class='del'>-2001-10-02    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c (local_url_hash,</div><div class='del'>-	local_url_equal): for hashing/comparing local url's, we ignore</div><div class='del'>-	trailing /'s in paths (maybe shuld handle multiple /'s too).</div><div class='del'>-	(camel_provider_module_init): Use local_url_hash/equal for all</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_response): Change to</div><div class='del'>-	camel_charset_iconv_open/close.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Change to</div><div class='del'>-	camel_charset_iconv_open/close.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): Change to</div><div class='del'>-	camel_charset_iconv_open().</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c</div><div class='del'>-	(camel_mime_filter_charset_new_convert, finalise): Change to</div><div class='del'>-	camel_charset_iconv_open, etc.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Use the camel_charset_iconv_open/close()</div><div class='del'>-	functions to open/close it.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_iconv_open): New function,</div><div class='del'>-	wrap iconv_open, so we can cache ic's.</div><div class='del'>-	(camel_charset_iconv_close): Likewise for close.</div><div class='del'>-	(camel_charset_map_init,shutdown): Init/free iconv cache.</div><div class='del'>-</div><div class='del'>-2001-10-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): Revert my</div><div class='del'>-	x-unknown special-case hack - this may mask other problems.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv</div><div class='del'>-	conversion fails, for whatever reason, retry using the user's</div><div class='del'>-	locale charset.</div><div class='del'>-</div><div class='del'>-2001-10-02    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (get_folder_info): Go back</div><div class='del'>-	to using the store url's path, not the toplevel_dir thing.</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_progress): Fix the progress</div><div class='del'>-	logic, so we dont update too often.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_get_hooks): Change the lock to a</div><div class='del'>-	recursive e-mutex.</div><div class='del'>-	(camel_object_hook_event): Maintain list length of hook list.</div><div class='del'>-	(camel_object_unhook_event): "</div><div class='del'>-	(camel_object_unhook_event): If we are in an event, just mark the</div><div class='del'>-	pair as removed, without removing it.</div><div class='del'>-	(camel_object_trigger_event): Before running events, copy the</div><div class='del'>-	list, and also ignore 'removed' events.  After running events, if</div><div class='del'>-	we're all out of events, then free up any pending-removed events.</div><div class='del'>-	(camel_object_free_hooks): Add some new assertions on the state of</div><div class='del'>-	the hook structure.</div><div class='del'>-	Removed the #error if threads not defined.  It _should_ actually</div><div class='del'>-	work without threads.</div><div class='del'>-	(camel_object_free_hooks): Free mutex when done.</div><div class='del'>-</div><div class='del'>-2001-10-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): Remove any</div><div class='del'>-	cached messages that belonged to the deleted folder.</div><div class='del'>-	(subscribe_folder): Don't ever let the info-&gt;name be NULL and</div><div class='del'>-	don't use the stupid concat kludge to generate the URL, just use a</div><div class='del'>-	CamelURL to do it. This way we don't risk breaking stuff by having</div><div class='del'>-	a url like imap://fejj@imap//folder</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): If the charset is</div><div class='del'>-	x-unknown, return the locale_charset.</div><div class='del'>-</div><div class='del'>-2001-10-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Fix up the provider flags to specify things</div><div class='del'>-	more completely so we don't have to hardcode provider names in the</div><div class='del'>-	mailer.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: MH, mbox, and Maildir</div><div class='del'>-	are LOCAL. MH and mbox are no longer STORAGE by the new</div><div class='del'>-	definition.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (vee_provider): The vfolder store is a STORAGE.</div><div class='del'>-</div><div class='del'>-2001-10-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (construct): Don't munge the</div><div class='del'>-	URL; CamelSession's caching relies on it not changing. Instead,</div><div class='del'>-	add a toplevel_dir field to CamelLocalStore, and set that to the</div><div class='del'>-	path, but always ending with /.</div><div class='del'>-	(camel_local_store_finalize): Free toplevel_dir</div><div class='del'>-	(camel_local_store_get_toplevel_dir): Return toplevel_dir rather</div><div class='del'>-	than url-&gt;path.</div><div class='del'>-</div><div class='del'>-	* providers/local/*: Lots of s/url-&gt;path/toplevel_dir/</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (construct): Likewise, don't</div><div class='del'>-	try to strip a trailing / from url-&gt;path here, but I didn't make</div><div class='del'>-	the corresponding toplevel_dir change, because there's no good</div><div class='del'>-	reason someone should expect "/var/spool/mail/danw/" to work since</div><div class='del'>-	that's not a directory.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): if STAT</div><div class='del'>-	returns 0, don't bother sending UIDL. Speeds things up slightly</div><div class='del'>-	and also works around a bug in a particular random POP server.</div><div class='del'>-	(ximian bug 11369).</div><div class='del'>-</div><div class='del'>-2001-09-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): Add --no-secmem-warning and</div><div class='del'>-	--no-greeting to the gpg command-line options.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_verify): Here too.</div><div class='del'>-	(pgp_encrypt): And here.</div><div class='del'>-	(pgp_decrypt): And finally here.</div><div class='del'>-</div><div class='del'>-2001-09-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_source): Same here.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_source): Don't use</div><div class='del'>-	the e_url_shroud hack, use CamelURL functions instead.</div><div class='del'>-</div><div class='del'>-2001-09-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the nntp url hash and url_equal</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the sendmail url hash and</div><div class='del'>-	url_equal functions.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the smtp url hash and url_equal</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the pop3 url hash and url_equal</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the imap url hash and url_equal</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c</div><div class='del'>-	(camel_provider_module_init): Init the local url hash and</div><div class='del'>-	url_equal functions.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_class_init): Init the vfolder url</div><div class='del'>-	hash and url_equal functions.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Added url_hash and url_equal function pointers</div><div class='del'>-	to the structure.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_move_messages_to): Oops, a</div><div class='del'>-	CamelFolder is not a CamelFolderClass.</div><div class='del'>-</div><div class='del'>-2001-09-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_error_to_errno): Make this take</div><div class='del'>-	an SSL * instead of a CamelTcpStreamSSL *, since it can get called</div><div class='del'>-	from open_ssl_connection, when the CamelTcpStreamSSL isn't set up</div><div class='del'>-	right yet. Fixes a crash on connection failure.</div><div class='del'>-</div><div class='del'>-2001-09-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(camel_imap_folder_fetch_data): Grab the store's command_lock</div><div class='del'>-	before grabbing the folder's cache_lock to prevent deadlock if</div><div class='del'>-	another thread is processing an EXPUNGE response.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_expunge_uids_resyncing): Fix a compiler warning that might</div><div class='del'>-	point out a real bug...</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (get_content): and one that</div><div class='del'>-	doesn't</div><div class='del'>-</div><div class='del'>-2001-09-27    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_connect): Dont re-register the</div><div class='del'>-	connect_op if we got it by calling 'operation_registered', which</div><div class='del'>-	returns an already-registered one.</div><div class='del'>-	(camel_service_disconnect): Likewise here.  This removes all the</div><div class='del'>-	re-registered warnings.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_unref): Fill the finalised data</div><div class='del'>-	with nonsense, rather than 0's - more easily detect bad data.</div><div class='del'>-	(camel_object_new): Clear instance data when we retrieve it off</div><div class='del'>-	the list.</div><div class='del'>-</div><div class='del'>-	* camel-object.h (_CamelObject): Added an event lock pointer for</div><div class='del'>-	uh, locking event stuff.  Also change the hooklist hashtable into</div><div class='del'>-	a list.  Changed all the code to handle it.  Result: thread-safe</div><div class='del'>-	events, event-hooks, and save memory too, and SHOULD FINALLY FIX</div><div class='del'>-	THAT UNREAD COUNT PROBLEM.</div><div class='del'>-</div><div class='del'>-2001-09-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_decrypt): CRLF decode the</div><div class='del'>-	stream before parsing it into a MIME part. This fixes bug #10521.</div><div class='del'>-</div><div class='del'>-	* camel-store.c: Remove the old folder from the vTrash folder.</div><div class='del'>-</div><div class='del'>-2001-09-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c: Change "gboolean connected" to</div><div class='del'>-	"CamelServiceConnectionStatus status", which can be disconnected,</div><div class='del'>-	connecting, connected, or disconnecting.</div><div class='del'>-	(camel_service_init, camel_service_finalize): create/destroy the</div><div class='del'>-	connect_op_lock. Refer to service-&gt;status rather than</div><div class='del'>-	service-&gt;connected.</div><div class='del'>-	(camel_service_connect): When connecting, note the current</div><div class='del'>-	operation (and create a new one if there's none registered) and</div><div class='del'>-	mark the connection "connecting" until we succeed or fail.</div><div class='del'>-	(camel_service_disconnect): Likewise in reverse.</div><div class='del'>-	(camel_service_cancel_connect): New function to cancel a</div><div class='del'>-	connection attempt.</div><div class='del'>-	(cancel_connect): Default implementation: Call</div><div class='del'>-	camel_operation_cancel on the connect_op.</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c (disco_connect): Only call</div><div class='del'>-	CamelRemoteStore's connect func if we're online.</div><div class='del'>-	(disco_cancel_connect): Fall back to offline if a connection gets</div><div class='del'>-	cancelled.</div><div class='del'>-	(disco_get_folder_info): Kludge: call connect explicitly before</div><div class='del'>-	deciding whether to do the online or offline version, so if the</div><div class='del'>-	connect fails, we fall back correctly.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service_connected):</div><div class='del'>-	s/svc-&gt;connected/svc-&gt;status/</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_finalise):</div><div class='del'>-	Change service-&gt;connected check to service-&gt;status check.</div><div class='del'>-	(remote_connect): Don't set service-&gt;connected here:</div><div class='del'>-	camel_service_connect() itself does that.</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_registered): Deal with the</div><div class='del'>-	possibility that there's no registered op.</div><div class='del'>-</div><div class='del'>-2001-09-26    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): If</div><div class='del'>-	we get a search error, just abort, dont try and fall back and copy</div><div class='del'>-	to inbox.</div><div class='del'>-	(camel_filter_driver_filter_message): Make sure we ALWAYS use</div><div class='del'>-	exceptions for important things - like moving messages to inbox!</div><div class='del'>-	(camel_filter_driver_filter_message): If we have the source</div><div class='del'>-	folder, use camel_folder_set_message_flags rather then poking the</div><div class='del'>-	info directly, which skips changed events.  This means filtering</div><div class='del'>-	immediate doesn't lose changed events.</div><div class='del'>-	(do_flag): Same here.</div><div class='del'>-	(do_colour): Same thing but using set_tag.</div><div class='del'>-	(do_score): Same again.</div><div class='del'>-	(camel_filter_driver_filter_folder): Use ~0 as the 'set' arg to</div><div class='del'>-	set_flags, just saves typing.</div><div class='del'>-	(open_folder): We cache folders that we couldn't open as well as</div><div class='del'>-	those ones we could.  Use magic token FOLDER_INVALID =</div><div class='del'>-	(void *)~0 as the marker.</div><div class='del'>-	(close_folder): Handle FOLDER_INVALID case properly.</div><div class='del'>-</div><div class='del'>-2001-09-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c</div><div class='del'>-	(camel_mime_message_get_part_by_content_id): New function to</div><div class='del'>-	convenience Larry ;-)</div><div class='del'>-	(check_content_id): Oops, return !found instead of found. This</div><div class='del'>-	callback has to return whether or not to keep searching, not</div><div class='del'>-	whether or not it found what it's looking for. Do'h!</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_is_rfc2015_signed): block out</div><div class='del'>-	some code if ENABLE_PEDANTIC_PGPMIME is not defined.</div><div class='del'>-</div><div class='del'>-2001-09-26    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c: Emptied VeeStorePrivate, member wasn't used.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_set_expression): Lock</div><div class='del'>-	changed list separately.</div><div class='del'>-	(camel_vee_folder_remove_folder): "</div><div class='del'>-	(camel_vee_folder_set_folders): Use changed_lock for changed list.</div><div class='del'>-	(vee_refresh_info): Use changed_lock, also just grab the list,</div><div class='del'>-	reset it in the lock, and do the work unlocked.</div><div class='del'>-	(vee_sync): Use changed lock for changed list.</div><div class='del'>-	(folder_changed): ".  All this kills a deadlock with sync/expunge.</div><div class='del'>-	</div><div class='del'>-	* camel-private.h (CamelVeeFolderPrivate): Added a new lock for</div><div class='del'>-	the folders-changed list.</div><div class='del'>-	(CamelVeeStorePrivate): Removed, defined in camel-vee-store.c,</div><div class='del'>-	thanks to a pedantic.</div><div class='del'>-</div><div class='del'>-2001-09-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Fix Ettore's fix.</div><div class='del'>-</div><div class='del'>-2001-09-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (camel_pgp_context_new): No longer takes a</div><div class='del'>-	remember argument.</div><div class='del'>-	(pgp_sign): Only uncache the passphrase on failure.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_encrypt): Here too.</div><div class='del'>-	(pgp_decrypt): And here.</div><div class='del'>-	(pass_free): New function to zero the passphrase before freeing</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-2001-09-25  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Patch for Automake 1.5 compatibility pointed out by Richard</div><div class='del'>-	Boulton &lt;richard@tartarus.org&gt;, as per #9258.]</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: Remove some commented parts that</div><div class='del'>-	make Automake 1.5 choke.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (camel-lock-helper): Add $(EXEEXT) for Automake 1.5</div><div class='del'>-	compatibility.</div><div class='del'>-</div><div class='del'>-2001-09-25    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (get_unread_message_count): Only unref info if we</div><div class='del'>-	got it.</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_unref): Fix for !threads</div><div class='del'>-	enabled not ccompiling.</div><div class='del'>-	(camel_operation_ref): Assert refcount &gt; 0.</div><div class='del'>-	(struct _CamelOperation): Removed the lock.  On further</div><div class='del'>-	investigation, I dont think this will always work, the</div><div class='del'>-	registration operations assume that a lookup in the</div><div class='del'>-	operation_active table will return a ref, that will remain valid</div><div class='del'>-	until we ref it, which needn't be the case.  So now i'm using a</div><div class='del'>-	single global lock, since we'd need to do that for unref anyway,</div><div class='del'>-	and every operation is fast &amp; memory-bound.  Changed all the code</div><div class='del'>-	to handle this.</div><div class='del'>-	(camel_operation_progress_count): Since the code is identical,</div><div class='del'>-	just call progress() for now.</div><div class='del'>-	(camel_operation_register): No longer refcount, use unref to</div><div class='del'>-	check/clear the active table.</div><div class='del'>-	(camel_operation_unregister): Same here.</div><div class='del'>-	(camel_operation_unref): Check if operation is in active table, if</div><div class='del'>-	so, warn, remove.</div><div class='del'>-</div><div class='del'>-2001-09-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (my_SSL_read, my_SSL_write): call</div><div class='del'>-	SSL_read/write, looping on SSL_ERROR_WANT_READ/WRITE. I'm sure</div><div class='del'>-	there's a perfectly good reason that the API works this way. No,</div><div class='del'>-	really.</div><div class='del'>-	(stream_read, stream_write): use my_SSL_read and my_SSL_write.</div><div class='del'>-	Fixes at least ximian 8593, and probably 6024 and maybe 10366,</div><div class='del'>-	at least for OpenSSL. There may be a parallel NSS bug?</div><div class='del'>-</div><div class='del'>-2001-09-25    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (stream_write_all): A "safe write"</div><div class='del'>-	function that always writes out all data asked of it, till</div><div class='del'>-	finished.</div><div class='del'>-	(stream_write): Rewritten.  What was i on when i wrote that</div><div class='del'>-	originally, how did it ever work with tcp streams ...</div><div class='del'>-</div><div class='del'>-2001-09-24    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (append_message): Set the exception to</div><div class='del'>-	FOLDER_INVALID rather than making out it worked.  A fix for #7025.</div><div class='del'>-	(search_by_expression): Here too.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): In the</div><div class='del'>-	'lose' case, free messages, not fetch_data twice!</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (check_header): If the type is encoded,</div><div class='del'>-	get the fallback charset from the message content-type.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (check_html_charset): Dont check for</div><div class='del'>-	charset==null before calling charset_to_iconv.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): "</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Try use content-type</div><div class='del'>-	charset param as the fallback charset.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): Handle name ==</div><div class='del'>-	NULL, return NULL.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_format_address):</div><div class='del'>-	(camel_folder_summary_format_string): Made private again, removed</div><div class='del'>-	#warning about it.  Renamed to s/camel_folder//.</div><div class='del'>-	(summary_format_string): Take default charset param.</div><div class='del'>-	(camel_message_info_new_from_header, message_info_new): Decode</div><div class='del'>-	content-type field to get the charset parameter to use as the</div><div class='del'>-	default charset for decoding strings.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_header_match): Pass NULL as</div><div class='del'>-	the charset, the locale charset is always tried.</div><div class='del'>-	(camel_search_header_match): Supply a default_charset parameter to</div><div class='del'>-	be used with TYPE_ENCODED params.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c</div><div class='del'>-	(header_param): get rid of the g_strcasecmp crap.</div><div class='del'>-	(header_set_param): Same here.</div><div class='del'>-	(header_decode_param_list): And here.</div><div class='del'>-	(header_decode_text): Totally rewritten.  30% of its size.  If the</div><div class='del'>-	word is not rfc2047 encoded, always try default_charset if</div><div class='del'>-	supplied, if that fails, try locale charset if it exists, if that</div><div class='del'>-	fails then assume latin1/7 bit ascii.</div><div class='del'>-	(append_8bit): Changed to return FALSE if we can't convert for</div><div class='del'>-	whatever reason, and dont append anything.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h (struct _CamelMimePart): Move content_type and</div><div class='del'>-	headers out of the 'private' section.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (get_headers): Dont do any conversion on the</div><div class='del'>-	header.</div><div class='del'>-	(process_header): Get the content-type charset as the fallback</div><div class='del'>-	charset for decode_string.</div><div class='del'>-	(construct_from_parser): IF we have a content-type header, process</div><div class='del'>-	it before doing anything else, so we have access to a fallback</div><div class='del'>-	charset for invalid headers.</div><div class='del'>-</div><div class='del'>-2001-09-23  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_verify): Don't even try to alert</div><div class='del'>-	the user if the session isn't interactive.</div><div class='del'>-	(errlib_error_to_errno): Make the default errno EINTR so that we</div><div class='del'>-	act just like CamelTcpStreamSSL.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): When the password is not</div><div class='del'>-	provided, set the exception to USER_CANCEL.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_encrypt): And here.</div><div class='del'>-	(pgp_decrypt): Here too.</div><div class='del'>-</div><div class='del'>-2001-09-21    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (create_folder): Set the exception if</div><div class='del'>-	create_folder isn't implemented.</div><div class='del'>-</div><div class='del'>-2001-09-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Go back to</div><div class='del'>-	not using camel_folder_info_build() here because this seems to</div><div class='del'>-	break folder creation (returning nodes from the root path when it</div><div class='del'>-	shouldn't be?).</div><div class='del'>-</div><div class='del'>-2001-09-21    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder_info): Force a refresh of</div><div class='del'>-	vfolders before storing their count.  This essentially makes</div><div class='del'>-	'get_folderinfo' refresh all vfolders, so that get-mail works as</div><div class='del'>-	expected.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_finalise): Clear lists.</div><div class='del'>-	(folder_changed): If we're not autoupdating the folder, then</div><div class='del'>-	add this folder to the list of 'changed' folders for this vfolder.</div><div class='del'>-	(camel_vee_folder_set_expression): Reset the folders_changed list.</div><div class='del'>-	(camel_vee_folder_remove_folder): Remove the folder from the</div><div class='del'>-	folders_changed list.</div><div class='del'>-	(camel_vee_folder_set_folders): If we have a folder already, but</div><div class='del'>-	its changed, use this opportunity to update it.</div><div class='del'>-	(vee_sync): Remove any synced folders from the folders_changed</div><div class='del'>-	list.</div><div class='del'>-	(vee_refresh_info): Refresh folder, re-run queries on any changed</div><div class='del'>-	folders.</div><div class='del'>-</div><div class='del'>-2001-09-20    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_header_load): New</div><div class='del'>-	function to just load the summary.  Not much use yet, until unread</div><div class='del'>-	counts are stored in the summary (which now looks like too much</div><div class='del'>-	work!).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Crappy fix for</div><div class='del'>-	stupid mailers.  If we get 'name b. name &lt;foo&gt;' then treat it as</div><div class='del'>-	'"name b. name" &lt;foo&gt;'.  See 8147.</div><div class='del'>-	(header_decode_mailbox): Another fix for really broken mailers</div><div class='del'>-	that have things that look like addresses followed by &lt;address&gt;</div><div class='del'>-	bits.</div><div class='del'>-	(rfc2047_encode_word): Escape ??= to avoid some bizarre warning</div><div class='del'>-	about trigraphs.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Setup unread count properly, and</div><div class='del'>-	also setup the url properly.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (camel_folder_info_new):</div><div class='del'>-	Build the path on the folderinfo.</div><div class='del'>-	(scan_dir): Dont include empty host part in url for folder.</div><div class='del'>-	(scan_dir): Lookup folder counts for any folders we currenty have</div><div class='del'>-	open.</div><div class='del'>-	(scan_dir): If we dont have the folder open, then scan the 'new'</div><div class='del'>-	and 'cur' folders for new and unread messages to count instead.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder_info): If we</div><div class='del'>-	have this folder open, then set unread from the folder itself.</div><div class='del'>-	(get_folder_info): Change the INBOX path to not include the</div><div class='del'>-	leading /.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c</div><div class='del'>-	(camel_spool_folder_construct): Fix path.</div><div class='del'>-	(camel_spool_folder_construct): Properly setup the url field when</div><div class='del'>-	we say we've got a new folder created.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Build</div><div class='del'>-	path on folderinfo.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build_path): Prepend / to path.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_construct): Use macro for</div><div class='del'>-	unmatched folder name.</div><div class='del'>-	(camel_vee_folder_new): "</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder_info): Use macro for unmatched</div><div class='del'>-	folder name.</div><div class='del'>-	(vee_delete_folder): "</div><div class='del'>-	(vee_rename_folder): "</div><div class='del'>-	(vee_get_folder): Prepend / onto path.</div><div class='del'>-	(vee_delete_folder): Setup path in folderinfo.</div><div class='del'>-	(vee_get_folder_info): Fix path in folderinfo.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.h (CAMEL_UNMATCHED_NAME): New define for</div><div class='del'>-	unmatched (internal) name.</div><div class='del'>-</div><div class='del'>-2001-09-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c</div><div class='del'>-	(camel_spool_folder_construct): And finally here.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): And here.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder): ANd here too.</div><div class='del'>-	(vee_get_folder_info): And here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Use</div><div class='del'>-	camel_folder_info_build() and do better error checking.</div><div class='del'>-	(subscribe_folder): Set the path on the folder info.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Set the folder-info</div><div class='del'>-	path if it hasn't already been set by the caller.</div><div class='del'>-	(camel_folder_info_free): Free the path.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Added a path member to the FolderInfo type.</div><div class='del'>-</div><div class='del'>-2001-09-20  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): Nuke debug warning.</div><div class='del'>-</div><div class='del'>-2001-09-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c: Updated exception strings to be more clear.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (pgp_mime_part_sign_restore_part): Stupid</div><div class='del'>-	mistake, fixes bug #9975.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Oops, don't fail if</div><div class='del'>-	`data' isn't a CamelService...cuz it's not supposed to be! It's a</div><div class='del'>-	CamelTcpStreamSSL object...doh!</div><div class='del'>-</div><div class='del'>-2001-09-19    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* General cleanup of camel debug printfs.</div><div class='del'>-	</div><div class='del'>-	* camel-lock.c (camel_lock_fcntl): Changed to return 'success' if</div><div class='del'>-	the error indicates file locking isn't supported on this</div><div class='del'>-	filesystem.  Still return a warning just incase (if its the first</div><div class='del'>-	time).  Might fix a lot of reported bugs.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder_info): Dont</div><div class='del'>-	include the empty // host part in the uri.  This 'breaks' the</div><div class='del'>-	service lookup.</div><div class='del'>-</div><div class='del'>-2001-09-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Match mailing-list header List-Owner.</div><div class='del'>-</div><div class='del'>-2001-09-18    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder): Fix the uri genereated for</div><div class='del'>-	the folderinfo for the folder_created event.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Added 'total' to CamelFolderInfo.</div><div class='del'>-</div><div class='del'>-2000-09-18    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c</div><div class='del'>-	(camel_maildir_folder_new): If filter inbox is set on the store,</div><div class='del'>-	and we're opening inbox '', then enable filtering on new messages.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): After loading the summary, check</div><div class='del'>-	it, and only abort if that fails.  Also maintain the changes</div><div class='del'>-	count.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(camel_local_summary_load): Remove summary_check code from here.</div><div class='del'>-	(camel_local_summary_check): Sync index/summary here, if we were</div><div class='del'>-	successful.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c</div><div class='del'>-	(camel_spool_folder_new): If we have filter-new-messages-on-inbox</div><div class='del'>-	set and we just opened inbox, turn on filtering on this folder.</div><div class='del'>-	(camel_spool_folder_construct): Keep track of changes for the</div><div class='del'>-	folder, so that filter-new-messages works right (?)</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder): Pass 'INBOX'</div><div class='del'>-	as the folder name, not the path.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_not): Modified patch from</div><div class='del'>-	&lt;peterw@ximian.com&gt; since the summary is messageinfo's, not</div><div class='del'>-	strings.</div><div class='del'>-</div><div class='del'>-	** Ok so the problem with the stuff below is that maildir/spool</div><div class='del'>-	'summary_load' throws away all events, including recents, joy eh?</div><div class='del'>-	</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_check):</div><div class='del'>-	Add new messages to the recent changeinfo.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c: Mark 'new' message as</div><div class='del'>-	recent, for later processing if required (i.e. 'filter new</div><div class='del'>-	messages').</div><div class='del'>-</div><div class='del'>-	* camel-store.c (construct): new function, cascade up construct</div><div class='del'>-	method and check for 'filter' param, and set accordingly for any</div><div class='del'>-	one that might want it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (construct): map the</div><div class='del'>-	param_filter_inbox flag to the store-&gt;flags as</div><div class='del'>-	CAMEL_STORE_FILTER_INBOX.</div><div class='del'>-</div><div class='del'>-	* camel-store.h (CAMEL_STORE_FILTER_INBOX): new flag to tell it to</div><div class='del'>-	filter inbox.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.h: Removed do_filtering flag</div><div class='del'>-	from CamelImapFolder.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Remove</div><div class='del'>-	the 'recents' parameter, use the 'changes' parameter instead to</div><div class='del'>-	convey this info.</div><div class='del'>-	(camel_imap_folder_changed): Changed for update_summary api</div><div class='del'>-	change.  Now always just emit the changed event if we have any</div><div class='del'>-	changes to report, filtering code removed, handled upstream.</div><div class='del'>-	(filter_proc): </div><div class='del'>-	(filter_free): Removed old filtering code.</div><div class='del'>-	(camel_imap_folder_new): Set the filter_recent flag on the folder</div><div class='del'>-	if we're the inbox and filtering of inbox is enabled.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (folder_changed): If we have 'recent' messages,</div><div class='del'>-	and are set to filter recents, then freeze the folder and launch a</div><div class='del'>-	thread to do the processing (or similar if threading not enabled).</div><div class='del'>-	(thaw): Make sure we emit the changed signal outside of owning the</div><div class='del'>-	lock and if things have changed.  Also, no longer bother</div><div class='del'>-	downgrading folder_changed events to message_changed events.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Added filter_recent flag</div><div class='del'>-	-&gt; signifies all recent messages in folder should be filtered.</div><div class='del'>-</div><div class='del'>-	* camel-session.c: (camel_session_thread_msg_new,</div><div class='del'>-	camel_session_thread_msg_free, camel_session_thread_queue,</div><div class='del'>-	camel_session_thread_wait): code to handle async operations as</div><div class='del'>-	part of camel processing.</div><div class='del'>-	(camel_session_finalise): free thread_lock, destroy thread, active</div><div class='del'>-	hash, etc.</div><div class='del'>-	(camel_session_init): init thread, active hash, etc.</div><div class='del'>-	(camel_session_class_init): Init virtual functions.</div><div class='del'>-	(session_thread_msg_new, session_thread_msg_free,</div><div class='del'>-	session_thread_destroy, session_thread_received,</div><div class='del'>-	session_thread_queue, session_thread_wait): default implementation</div><div class='del'>-	of session threads stuff.</div><div class='del'>-</div><div class='del'>-2001-09-17    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_recent_uid): New</div><div class='del'>-	function to add a 'recent' uid to the change info.</div><div class='del'>-	(camel_folder_change_info_clear): Clear recent list.</div><div class='del'>-	(camel_folder_change_info_free): Free recent list.</div><div class='del'>-	(camel_folder_change_info_new): Setup recent list.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Added a uid_recent item to the folder_changed</div><div class='del'>-	event data.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (scan_dir): Free new in</div><div class='del'>-	the right block.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: Add local config entries</div><div class='del'>-	to filter on new messages in spool and maildir provider.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_construct): Remove the assertion</div><div class='del'>-	which stops ? in names from being allowed.</div><div class='del'>-</div><div class='del'>-2001-09-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_is_offline): Virtualize</div><div class='del'>-	this.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (is_offline): A medium is offline if its content</div><div class='del'>-	object is offline.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (is_offline): A multipart is offline if any of</div><div class='del'>-	its subparts are offline.</div><div class='del'>-</div><div class='del'>-2001-09-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Added korean charset conversion.</div><div class='del'>-</div><div class='del'>-2001-09-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): Don't process</div><div class='del'>-	the ImapResponse data, we don't want to block forever on data we</div><div class='del'>-	don't care about...</div><div class='del'>-	(create_folder): Use get_folders_online() instead of</div><div class='del'>-	get_folder_info_online().</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Reverted previous changes.</div><div class='del'>-</div><div class='del'>-2001-09-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Helpful install-exec-hook debugging output</div><div class='del'>-</div><div class='del'>-2001-09-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_uri): New function to get the</div><div class='del'>-	URI of a folder.</div><div class='del'>-	(get_uri): Default implementation.</div><div class='del'>-</div><div class='del'>-2001-09-14    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_set_folders): New function,</div><div class='del'>-	set the complete list of folders on a vfolder, all at once.</div><div class='del'>-	(camel_vee_folder_set_expression): If we set the query to be the</div><div class='del'>-	same thing, dont do anything.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (camel_vee_store_init): Turn off vtrash for</div><div class='del'>-	this store.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Enable vtrash by default via</div><div class='del'>-	flags.</div><div class='del'>-	(camel_store_get_trash): REturn NULL if the store doesn't support</div><div class='del'>-	vtrash.</div><div class='del'>-	(init_trash): Dont init if store doesn't support vtrash.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Add a new flags CAMEL_STORE_VTRASH -&gt; store</div><div class='del'>-	supports vtrash.</div><div class='del'>-</div><div class='del'>-2001-09-13    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder_info): Implement.</div><div class='del'>-	(build_info): Used to build a folder record from the folders</div><div class='del'>-	hashtable.</div><div class='del'>-	(vee_delete_folder): Implemented, remove folder from hashtable.</div><div class='del'>-	(vee_rename_folder): Implemented, remove old folder from</div><div class='del'>-	hashtable, add new one and rename its guts too.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_rename_folder): Do nothing if we're</div><div class='del'>-	not asked to actually change names.  Also dont do the renamed</div><div class='del'>-	cache check till after we've called the subclass.</div><div class='del'>-	(camel_store_delete_folder): Call the subclass delete firs,t then</div><div class='del'>-	make sure the cache is right.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_construct): Remove support for</div><div class='del'>-	name?query syntax to setup vfolder.  Abort if such syntax is used.</div><div class='del'>-	(camel_vee_folder_new): Removed code that handles ? syntax, etc.</div><div class='del'>-	(vee_folder_build_folder): Handle unset expression, treat it as an</div><div class='del'>-	empty search.</div><div class='del'>-	(camel_vee_folder_set_expression): Oops, actually set the</div><div class='del'>-	expression.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (camel_vtrash_folder_new): Dont use</div><div class='del'>-	name?query syntax to setup vfolder, but set the expression</div><div class='del'>-	directly.  Also fixes a small memleak.</div><div class='del'>-</div><div class='del'>-2001-09-12    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_delete_folder): Fixed warnings with a</div><div class='del'>-	cast.</div><div class='del'>-	(camel_store_rename_folder): "</div><div class='del'>-</div><div class='del'>-2001-09-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_set_param): Use g_datalist_set_data_full</div><div class='del'>-	so that the data will be free'd when we clear the list.</div><div class='del'>-</div><div class='del'>-2001-09-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-file-utils.c (camel_file_util_encode_string,</div><div class='del'>-	camel_file_util_decode_string): Don't claim failure when</div><div class='del'>-	reading/writing the empty string.</div><div class='del'>-</div><div class='del'>-2001-09-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: use install hook instead of install rule to</div><div class='del'>-	guarantee we run after installation</div><div class='del'>-</div><div class='del'>-2001-09-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Don't</div><div class='del'>-	reuse the exception if it has already been set.</div><div class='del'>-	(camel_filter_driver_filter_message): Same here. Also use the new</div><div class='del'>-	return value from camel_filter_search_match().</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (camel_filter_search_match): Return an</div><div class='del'>-	integer (matched, no-match, or error).</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message): Do</div><div class='del'>-	error-checking based on function return values rather than</div><div class='del'>-	exceptions as it's possible for them to be NULL.</div><div class='del'>-	(mbox_get_message): Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_offline): Pass</div><div class='del'>-	an exception to the cache.</div><div class='del'>-	(imap_append_online): Same.</div><div class='del'>-	(imap_append_resyncing): Here too.</div><div class='del'>-	(imap_copy_offline): And here.</div><div class='del'>-	(handle_copyuid): Pass NULL as the exception here...</div><div class='del'>-	(parse_fetch_response): And finally here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_insert):</div><div class='del'>-	(insert_setup):</div><div class='del'>-	(camel_imap_message_cache_insert_stream):</div><div class='del'>-	(camel_imap_message_cache_insert_wrapper):</div><div class='del'>-	(camel_imap_message_cache_copy): Take an exception argument and</div><div class='del'>-	set it on error.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Convert the charset</div><div class='del'>-	to the iconv-friendly name.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): Add code to</div><div class='del'>-	convert windows-[cp]#### charsets to their iconv-friendly format</div><div class='del'>-	of cp####.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Return -1 on</div><div class='del'>-	failure.</div><div class='del'>-</div><div class='del'>-2001-09-12  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): free</div><div class='del'>-	the source url in the nonfailure case.</div><div class='del'>-</div><div class='del'>-2001-09-12    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Change the 'not' virtual method from an</div><div class='del'>-	immediate e-sexp function to a non-immediate one, which is what it</div><div class='del'>-	should be.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_not): Implement a 'not' function</div><div class='del'>-	ourselves.  If 'not' on a vector value, then not over all items</div><div class='del'>-	in the summary.</div><div class='del'>-	(builtings[]): Change the 'not' builtin to be a non-immediate</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-2001-09-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Unref</div><div class='del'>-	the message info.</div><div class='del'>-</div><div class='del'>-2001-09-10    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (get_folder_info): Pass in</div><div class='del'>-	a hashtalbe used for finding visited nodes.</div><div class='del'>-	(inode_hash): </div><div class='del'>-	(inode_equal): </div><div class='del'>-	(inode_free): Helper functions for visited node checks, hashes on</div><div class='del'>-	inode + device number.</div><div class='del'>-	(scan_dir): Dont re-visited directories we've already visited, use</div><div class='del'>-	inodes + device number.</div><div class='del'>-	Also, if the folder doesn't contain cur/tmp/new, mark it as</div><div class='del'>-	noselect, but continue to recurse folders, if asked.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (move_messages_to): Progress reporting while</div><div class='del'>-	moving messages.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_delete_folder): Make sure we remove</div><div class='del'>-	the folder from our vtrash, if we have it in our opened set, and</div><div class='del'>-	also remove it from our hashtable.</div><div class='del'>-	(camel_store_rename_folder): Remove the old folder name from the</div><div class='del'>-	folder cahce, if it is there.</div><div class='del'>-</div><div class='del'>-2001-09-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_to_iconv): Get rid of the</div><div class='del'>-	g_warning, we no longer really need that.</div><div class='del'>-</div><div class='del'>-2001-09-10    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_msg_new): Forgot</div><div class='del'>-	to return the newly allocated msg.</div><div class='del'>-</div><div class='del'>-2001-09-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (spool_summary_sync_full):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	Fix the wording.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_read): Save errno around fcntl</div><div class='del'>-	call in cancellable read case.  Also, loop while we get EINTR.</div><div class='del'>-	This might fix some weird reconnect behaviour with pop.</div><div class='del'>-	(stream_write): "</div><div class='del'>-</div><div class='del'>-2001-09-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): #if 0 out the code that</div><div class='del'>-	was hopefully going to fix bug #5325 because the functions I used</div><div class='del'>-	seem to have been deprecated. *sigh*.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_finalise): Disconnect</div><div class='del'>-	from the service here otherwise the locks will be destroyed and by</div><div class='del'>-	the time CamelService finalizes we'll crash or hang.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Make sure to</div><div class='del'>-	unref the mime filters when we finish with them.</div><div class='del'>-</div><div class='del'>-2001-09-07  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	s/Synchronising/Synchronizing/.</div><div class='del'>-	(mbox_summary_sync_quick): Likewise.</div><div class='del'>-	(summary_rebuild): s/Summarising/Summarizing/.</div><div class='del'>-</div><div class='del'>-2001-09-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (camel_multipart_set_boundary): Take a const</div><div class='del'>-	char * instead of a char *.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Reuse the</div><div class='del'>-	original boundary instead of generating our own.</div><div class='del'>-</div><div class='del'>-2001-09-06    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (filter_proc): Thread</div><div class='del'>-	function to perform filtering.</div><div class='del'>-	(filter_free): Free the filter object.</div><div class='del'>-	(camel_imap_folder_changed): If we have threads enabled, then</div><div class='del'>-	queue up a request to perform filtering.  For bug #4422.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_msg_new): Create a</div><div class='del'>-	new 'imap msg'.</div><div class='del'>-	(camel_imap_msg_queue): Queue an 'imap msg'.</div><div class='del'>-	(async_received): Handle receiving of imap msg in async thread.</div><div class='del'>-	(async_destroy): Handle destroying of imap msg.</div><div class='del'>-	(camel_imap_store_finalize): Destroy thread when done.</div><div class='del'>-	(camel_imap_store_init): Setup thread.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Added an ethread to the</div><div class='del'>-	store, for async processing.</div><div class='del'>-</div><div class='del'>-2001-09-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Use</div><div class='del'>-	camel_stream_buffer_read_line() instead of duplicationing the</div><div class='del'>-	functionality. Also, the previous way was broken anyway. What if a</div><div class='del'>-	line was the same length as our buffer? Then we'd go and read a</div><div class='del'>-	second line and a third and so on until they weren't the same</div><div class='del'>-	length, leaving \r's in the middle of the buffer.</div><div class='del'>-</div><div class='del'>-2001-09-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_get_response): Fix this</div><div class='del'>-	to always set an exception if it returns POP3_FAIL, as documented.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):</div><div class='del'>-	Revert.</div><div class='del'>-</div><div class='del'>-2001-09-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):</div><div class='del'>-	Set an exception on POP3_FAIL as well.</div><div class='del'>-</div><div class='del'>-2001-09-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: #ifdef out the "delete</div><div class='del'>-	after N days" option in pop3_conf_entries, since it won't be done</div><div class='del'>-	for 1.0.</div><div class='del'>-</div><div class='del'>-2001-09-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_disconnect): Too late to sync the</div><div class='del'>-	folders here... if this is gonna happen at all it should be done</div><div class='del'>-	in the provider.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_finalize): Do a clean disconnect.</div><div class='del'>-</div><div class='del'>-2001-08-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_inbox): Return the</div><div class='del'>-	default folder (ie. INBOX) rather than saying we don't support an</div><div class='del'>-	inbox.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: #include pk11func.h.</div><div class='del'>-	(ssl_bad_cert): Use CERT_GetDefaultCertDB.</div><div class='del'>-</div><div class='del'>-2001-08-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c (smime_sign_prepare): Do the same here as</div><div class='del'>-	what we did in the pgp code a moment ago.</div><div class='del'>-	(smime_sign_restore): And again here.</div><div class='del'>-	(smime_sign): And update thise code to pass in the address of the</div><div class='del'>-	encodings list when restoring parts.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (pgp_mime_part_sign_prepare_part): Special-case</div><div class='del'>-	message/rfc822 mime parts - don't set an encoding on these,</div><div class='del'>-	instead traverse into their subparts and set the encodings for</div><div class='del'>-	those.</div><div class='del'>-	(pgp_mime_part_sign_restore_part): Reverse any operations done to</div><div class='del'>-	message/rfc822 parts in the above prepare_part() function and also</div><div class='del'>-	take a pointer to a GSList of encodings instead of just a GSList</div><div class='del'>-	so we can properly keep track of which encoding we are on.</div><div class='del'>-	(camel_pgp_mime_part_sign): Pass in the address to the encodings</div><div class='del'>-	list when restoring parts.</div><div class='del'>-</div><div class='del'>-2001-08-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_sync): Add progress</div><div class='del'>-	reporting to deleting messages.  Dont change the calculation to a</div><div class='del'>-	bloody float.  Bug #6189.</div><div class='del'>-</div><div class='del'>-2001-08-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Initialize buf</div><div class='del'>-	and diag_buf to NULL, hopefully this fixes the crash if the</div><div class='del'>-	select() times out.</div><div class='del'>-	(pgp_encrypt): Argh. What was I thinking? Don't use "-r recipient"</div><div class='del'>-	as an argument, instead use "-r" and "recipient" as 2 separate</div><div class='del'>-	arguments to pgp. This might fix the "gpg only encrypts to my</div><div class='del'>-	private key" bug?</div><div class='del'>-</div><div class='del'>-2001-08-28  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Whoops.</div><div class='del'>-	Double-free and FMR = bad.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_string): Don't reveal the</div><div class='del'>-	user's IMAP password if their server supports LITERALPLUS. Also</div><div class='del'>-	add some more dashes to make it line up nicely :-)</div><div class='del'>-</div><div class='del'>-2001-08-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): If the user accepts the</div><div class='del'>-	certificate, add it to the database as a trusted CA.</div><div class='del'>-</div><div class='del'>-2001-08-28  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_unref): Make the locking more</div><div class='del'>-	fine-grained on destruction; specifically, don't hold the</div><div class='del'>-	type lock while calling the finalize functions.</div><div class='del'>-</div><div class='del'>-2001-08-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: Changed the</div><div class='del'>-	description/names of some of the local providers to try and</div><div class='del'>-	clarify the meanings.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Simplify the POP</div><div class='del'>-	description - we want short but sweet.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: s/IMAPv4/IMAP</div><div class='del'>-</div><div class='del'>-2001-08-27  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): re-read the iconv man</div><div class='del'>-	page, and treat the return value properly.  It returns the number</div><div class='del'>-	of non-reversible conversions performed, not the number of output</div><div class='del'>-	characters, sigh.</div><div class='del'>-	(check_html_charset): Changed to just take a buffer of data, and</div><div class='del'>-	not the mime parser.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Since we dont need</div><div class='del'>-	the charset till we have all the data, search for the charset</div><div class='del'>-	after we've read the data, if we have html data with no charset in</div><div class='del'>-	the header.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Remove the</div><div class='del'>-	seekable_source stuff.</div><div class='del'>-</div><div class='del'>-	* Re-apply patches from before.</div><div class='del'>-</div><div class='del'>-2001-08-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	["Summarising" and "Synchronising" are spelt with a "s" in</div><div class='del'>-	ENGLISH]</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):</div><div class='del'>-	s/Synchronizing/Synchronising/.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_rebuild):</div><div class='del'>-	s/Summarizing/Summarising/</div><div class='del'>-</div><div class='del'>-2001-08-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-disco-diary.c (camel_disco_diary_replay): Use fseek</div><div class='del'>-	instead of fseeko since we want to be portable and use ftell</div><div class='del'>-	rather than ftello for the same reason.</div><div class='del'>-	(camel_disco_diary_empty): Same here.</div><div class='del'>-</div><div class='del'>-2001-08-24  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Revert Not Zed's previous commits as they apparently can cause</div><div class='del'>-	serious data loss for POP3 users.</div><div class='del'>-	</div><div class='del'>-2001-08-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	["Summarizing" and "Synchronizing" are spelt with a "z" in the</div><div class='del'>-	default locale, that happens to be "en_US".]</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):</div><div class='del'>-	s/Synchronising/Synchronizing/.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_rebuild):</div><div class='del'>-	s/Summarising/Summarizing/</div><div class='del'>-</div><div class='del'>-2001-08-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (convert_buffer): Limit the maximum</div><div class='del'>-	output buffer size.  iconv bugs?  returns E2BIG forever on some</div><div class='del'>-	(valid) data?</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (summary_rebuild):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_rebuild):</div><div class='del'>-	Summarising is spelt with an s.</div><div class='del'>-</div><div class='del'>-2001-08-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): If we have rawtext, then</div><div class='del'>-	dont do any charset conversion, only encoding/crlf conversion.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h (struct _CamelDataWrapper): Added 'rawtext'</div><div class='del'>-	member, says the character encoding is raw, not utf8.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c</div><div class='del'>-	(spool_summary_sync_quick): Synchronising is spelt with an s, not</div><div class='del'>-	a z.</div><div class='del'>-	(spool_summary_sync_full): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	No, synchronising is spelt with an s.</div><div class='del'>-	(mbox_summary_sync_quick): "</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Remove the</div><div class='del'>-	warnings which aren't going anywhere fast.</div><div class='del'>-	(convert_buffer): Function to convert a bytearray of textual</div><div class='del'>-	content from one charset to another.  If the charset doesn't exist</div><div class='del'>-	or fails, then do no conversion.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): First, read in data,</div><div class='del'>-	then try and convert it using the specified charset if supplied.</div><div class='del'>-	If that fails, then dont do any conversion, and leave as raw.</div><div class='del'>-	Also, if we have any x-* charsets, then dont do any processing.</div><div class='del'>-</div><div class='del'>-2001-08-23  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_rebuild): Add a</div><div class='del'>-	missing \n to the end of a printf.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (summary_rebuild): Same.</div><div class='del'>-</div><div class='del'>-2001-08-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_generate_uids):</div><div class='del'>-	Oops. Fixed a mis-use of GPtrArray. If we set_size, then using</div><div class='del'>-	g_ptr_array_add will assume `size' elements have already been</div><div class='del'>-	initialized and will start appending on to the end.</div><div class='del'>-</div><div class='del'>-2001-08-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Turn on --batch and reenable</div><div class='del'>-	gpg keyserver lookups.</div><div class='del'>-	(pgp_decrypt): Disable keyserver lookups if we are disconnected.</div><div class='del'>-</div><div class='del'>-2001-08-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c</div><div class='del'>-	(camel_folder_thread_messages_new_summary): Fix the duplicate</div><div class='del'>-	message check so it doesn't mess up threading when a reply appears</div><div class='del'>-	in the folder before the message it's a reply to. Fixes bug #3357.</div><div class='del'>-	(camel_folder_thread_messages_new): Likewise, although I don't</div><div class='del'>-	think this function is used any more.</div><div class='del'>-</div><div class='del'>-2001-08-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: build a static camel for the addressbook conduit</div><div class='del'>-</div><div class='del'>-2001-08-20  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	s/Synchronising/Synchronizing/.</div><div class='del'>-	(mbox_summary_sync_quick): Likewise.  *</div><div class='del'>-	providers/local/camel-spool-summary.c (spool_summary_sync_full):</div><div class='del'>-	Likewise.</div><div class='del'>-	(spool_summary_sync_quick): Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Get the</div><div class='del'>-	entire directory structure for the folder we just created, meaning</div><div class='del'>-	if we created a folder named "test.mailbox" where test didn't</div><div class='del'>-	previously exist, get the listing for "test" and "test.mailbox".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_folder_name): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-2001-08-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.h: #include &lt;sys/types.h&gt; for mode_t on freebsd.</div><div class='del'>-</div><div class='del'>-2001-08-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_generate_uids): Make</div><div class='del'>-	sure the generated UID is non-NULL before appending it to the</div><div class='del'>-	array of UIDs. How would this even happen? I have no clue...</div><div class='del'>-</div><div class='del'>-2001-08-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Start</div><div class='del'>-	scanning new messages at maxuid + 1 rather than uidval + 1? Maybe</div><div class='del'>-	I'm missing the logic, but anyways...this might fix bug #5348.</div><div class='del'>-</div><div class='del'>-2001-08-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_keepalive): If we are</div><div class='del'>-	online and message flags have changed in the current folder, sync</div><div class='del'>-	the flags else do a NOOP. This fixes bug #4666. Also lock around</div><div class='del'>-	the NOOP command.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync_online): Don't</div><div class='del'>-	ever send "STORE FLAGS.SILENT ()" since Cyrus imapd doesn't like</div><div class='del'>-	this (and maybe others too?) so what we'll do instead is to send</div><div class='del'>-	"STORE -FLAGS.SILENT (\Seen \Answered \Deleted \Marked)" to clear</div><div class='del'>-	all the flags (since this is in essence what we want to do</div><div class='del'>-	anyway).</div><div class='del'>-</div><div class='del'>-2001-08-16  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect_online): Fix</div><div class='del'>-	this again. Sigh. Problem of namespace = "" may not yet be</div><div class='del'>-	completely solved.</div><div class='del'>-</div><div class='del'>-2001-08-15  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_error_to_errno): New</div><div class='del'>-	function. Try to approximate the SSL error into errno.</div><div class='del'>-	(errlib_error_to_errno): New function, try to approximate</div><div class='del'>-	OpenSSl's error library's error (ERR_*) into errno.</div><div class='del'>-	(stream_read): Try to set errno using ssl_error_to_errno.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-	(open_ssl_connection): Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect_online): Oh</div><div class='del'>-	crap, huge killer typo.</div><div class='del'>-</div><div class='del'>-2001-08-14  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect_online):</div><div class='del'>-	Canonicalize store-&gt;namespace to end in store-&gt;dir_sep, once both</div><div class='del'>-	values are known. The %F-related code makes this</div><div class='del'>-	assumption. Probably fixes a bug reported on the mailing list.</div><div class='del'>-</div><div class='del'>-2001-08-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): After talking to NotZed,</div><div class='del'>-	it turns out I was wrong after all.</div><div class='del'>-	(store_sync): Create a copy of the folder-cache that owns a ref on</div><div class='del'>-	each of the folders so that if one of the folders get's finalized</div><div class='del'>-	inside store_sync(), we don't run into any locking issues. This is</div><div class='del'>-	mostly meant to solve a problem in IMAP (#6089).</div><div class='del'>-</div><div class='del'>-2001-08-13  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): Fix a leak.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_namespace_concat): Bleah,</div><div class='del'>-	handle when namespace = NULL (can happen upon initial open of mailbox.)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_command_strdup_vprintf): </div><div class='del'>-	Don't crash when %F'ing with an empty folder name and NULL namespace.</div><div class='del'>-</div><div class='del'>-2001-08-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): We need to be ref'ing</div><div class='del'>-	the folder if/when we add it to the hash. This may fix bug #6089?</div><div class='del'>-	(camel_store_get_folder): Nevermind, reverted the fix.</div><div class='del'>-	(camel_store_get_folder): No, I wasn't on crack before after</div><div class='del'>-	all...if we don't ref here, then we're open to a race condition</div><div class='del'>-	later.</div><div class='del'>-</div><div class='del'>-2001-08-11  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-summary.c (summary_rebuild):</div><div class='del'>-	s/summarising/summarizing/.</div><div class='del'>-	(summary_rebuild): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	s/summarise/summarize/.</div><div class='del'>-	(mbox_summary_sync_quick): Likewise.</div><div class='del'>-	(summary_rebuild): Likewise.</div><div class='del'>-	(mbox_summary_check): Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_quote_string): Added an</div><div class='del'>-	assert - at this point a backtrace would be more useful than a</div><div class='del'>-	transaction log for debugging.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_command_start): Return</div><div class='del'>-	FALSE here, not NULL.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Don't</div><div class='del'>-	g_strdup() the uid into the trigger_event call.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):</div><div class='del'>-	Set the total bytes expected to 0 if the response is empty too.</div><div class='del'>-	(pop3_refresh_info): Return of there was an error generating pop3</div><div class='del'>-	uids.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_check_mailing_list): regfree the</div><div class='del'>-	pattern before continue'ing. This was showing up quite a bit under</div><div class='del'>-	purify.</div><div class='del'>-</div><div class='del'>-2001-08-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic): A</div><div class='del'>-	quoted string cannot contain \n's so check for those as well.</div><div class='del'>-	(imap_atom_specials): Update this to fix bug #6553.</div><div class='del'>-</div><div class='del'>-2001-08-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_source): Remove trailing stuff from</div><div class='del'>-	URLs before returning.  (Done in an evil way, not in the good way</div><div class='del'>-	suggested by fejj. :)) (Bug #4876)</div><div class='del'>-</div><div class='del'>-2001-08-08  jacob berkman  &lt;jacob@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_header_match): check for</div><div class='del'>-	NULL name and addr (fixes a bug i was about to report)</div><div class='del'>-</div><div class='del'>-2001-08-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (check_header): Properly determine match</div><div class='del'>-	type to pass to header_match.</div><div class='del'>-	(address_matches_exactly): Removed, effectively added to</div><div class='del'>-	camel_search_header_match.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (check_header): Properly determine the</div><div class='del'>-	match type to pass to header_match.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_header_match): Add a new</div><div class='del'>-	parameter 'type' which is the type of header we're matching</div><div class='del'>-	against.  ASIS means utf8 format, ADDRESS means an internet</div><div class='del'>-	address ('formatted'), ADDRESS_ENCODED means a raw address header,</div><div class='del'>-	ENCODED means rfc 2047 encoded text.</div><div class='del'>-	(header_match): Move original logic here, have search_header_match</div><div class='del'>-	call it as appropriate for the 'type' of match.</div><div class='del'>-</div><div class='del'>-2001-08-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_class_init): Only init the vee</div><div class='del'>-	provider struct once (if we're subclassed this will get called</div><div class='del'>-	multiple times).</div><div class='del'>-</div><div class='del'>-	* camel-object.c (obj_finalize): Removed a bit of a debug that</div><div class='del'>-	crept in with jacob's poolv patch (?).</div><div class='del'>-</div><div class='del'>-2001-08-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (address_matches_exactly): New function to</div><div class='del'>-	do danw's address "is" comparison (as specified in bug #5886.</div><div class='del'>-	(check_header): Special-case address-type headers when we are</div><div class='del'>-	doing an exact match to use the address_matches_exactly function.</div><div class='del'>-</div><div class='del'>-2001-08-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):</div><div class='del'>-	Modify to take a headers_only argument which will then only fetch</div><div class='del'>-	message headers.</div><div class='del'>-	(pop3_generate_uids): Pass in TRUE for headers_only.</div><div class='del'>-	(pop3_get_message): Pass in FALSE for headers_only and move the</div><div class='del'>-	camel_operation() stuff out of get_message_stream and in to here</div><div class='del'>-	instead.</div><div class='del'>-	(pop3_generate_uids): We also need to be using i+ 1 as the id</div><div class='del'>-	since we are starting at 0.</div><div class='del'>-</div><div class='del'>-2001-08-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message_stream):</div><div class='del'>-	New internal function to get a message stream by message sequence</div><div class='del'>-	id (so that we can share code between pop3_get_message and</div><div class='del'>-	pop3_generate_uids).</div><div class='del'>-	(pop3_get_message): Use pop3_get_message_stream.</div><div class='del'>-	(pop3_generate_uids): New function to generate UIDs based on the</div><div class='del'>-	message - this fixes bug #1256.</div><div class='del'>-	(pop3_refresh_info): If the server doesn't support UIDL, call</div><div class='del'>-	pop3_generate_uids to get our list of UIDs.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info_online):</div><div class='del'>-	Don't strstr for noselect=yes, that's just plain broken.</div><div class='del'>-</div><div class='del'>-2001-08-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Fix off-by-one</div><div class='del'>-	error in cleaning up deleted messages at the end of the folder.</div><div class='del'>-	Fixes bug #5585 and maybe others.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info_online): Do a</div><div class='del'>-	refresh_info on the selected folder before looking at its unread</div><div class='del'>-	count. Should fix bug #4944.</div><div class='del'>-</div><div class='del'>-2001-08-06  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Completely hide the namespace from everything external to the IMAP</div><div class='del'>-	code, which Dan W says is the way it should be.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(imap_command_strdup_vprintf): Add a new %F argument, which is like</div><div class='del'>-	%S but will add the namespace (for folder names).</div><div class='del'>-	(camel_imap_command): Use %F here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Changed to strip out the namespec when returning *folder. In order</div><div class='del'>-	to do this we need to be passed the CamelImapStore.</div><div class='del'>-	(imap_concat): Move to here from camel-imap-store.c, un-static</div><div class='del'>-	(imap_namespace_concat): New function, adds the namespace to the </div><div class='del'>-	folder name, unless it's INBOX.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-utils.h: Prototypes.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect_online): Extra</div><div class='del'>-	arg to imap_parse_list_response.</div><div class='del'>-	(imap_connect_offline): Here too.</div><div class='del'>-	(get_folder_status): Use %F.</div><div class='del'>-	(get_folder_online): Here too.</div><div class='del'>-	(delete_folder): Here too.</div><div class='del'>-	(create_folder): Here too, and arg to imap_parse_list_response.</div><div class='del'>-	(parse_list_response_as_folder_info): Arg to i_p_l_r.</div><div class='del'>-	(get_subscribed_folders_by_hand): Use %F.</div><div class='del'>-	(get_folders_online): Here too.</div><div class='del'>-	(get_folder_info_online): Instead of checking for NULL @name, check</div><div class='del'>-	for name = NULL or "", and set to "" instead of namespace. Pass ""</div><div class='del'>-	instead of namespace to camel_folder_info_build.</div><div class='del'>-	(subscribe_folder): Use %F.</div><div class='del'>-	(unsubscribe_folder): Here too.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_full_name): This</div><div class='del'>-	now just returns folder-&gt;full_name.</div><div class='del'>-	(do_append): Use %F</div><div class='del'>-	(do_copy): Here too.</div><div class='del'>-</div><div class='del'>-2001-08-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Always do --no-auto-key-retrieve.</div><div class='del'>-</div><div class='del'>-2001-08-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Minor changes to the iconv</div><div class='del'>-	code so that it does the check in the return value of iconv() just</div><div class='del'>-	like the code in camel-mime-utils.c in case this fixes Bo Rosen's</div><div class='del'>-	gpg bugs (but I doubt this will change anything?).</div><div class='del'>-</div><div class='del'>-2001-08-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): First</div><div class='del'>-	check to make sure that service-&gt;url-&gt;authmech is non-NULL before</div><div class='del'>-	passing it into strcmp to avoid a segfault.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_decrypt): Sigh, if gpg returns '1' it</div><div class='del'>-	means that the key is bad but it did succeede in decrypting the</div><div class='del'>-	block so to make users happy (even though I find this a</div><div class='del'>-	questionable action) we are going to ignore the error and show it</div><div class='del'>-	to the user anyway. This fixes bug #6136.</div><div class='del'>-</div><div class='del'>-2001-08-03  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): special</div><div class='del'>-	case popb4smtp auth before we try and connect, and do the magic</div><div class='del'>-	here first.</div><div class='del'>-</div><div class='del'>-2001-08-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Check for</div><div class='del'>-	POPB4SMTP separate to the esmtp auth list.</div><div class='del'>-	(smtp_auth): If creating the sasl object means it is</div><div class='del'>-	already authenticated, then exit early.  Sort of 'clean hack' to</div><div class='del'>-	help popb4smtp work.</div><div class='del'>-	(smtp_auth): Unref the sasl object, clean up a memleak i think.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c</div><div class='del'>-	(camel_provider_module_init): Added POPB4SMTP auth type.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_authtype): Added POPB4SMTP type.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-popb4smtp.c: New file for pop before smtp</div><div class='del'>-	'authentication'.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES, HEADERS): Add</div><div class='del'>-	camel-sasl-popb4smtp.[ch].</div><div class='del'>-</div><div class='del'>-2001-08-01  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_lock): If we fail to</div><div class='del'>-	get the lock, make sure we close our locking fd, and reset it.</div><div class='del'>-	Fixes the crash part of 5095.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Slightly re-arranged filter/change notification logic.  If we;re</div><div class='del'>-	filtering, freeze the folder till we're finished to smooth the ui</div><div class='del'>-	for new mail.</div><div class='del'>-</div><div class='del'>-2001-07-31  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_init): Chagned mutexes to</div><div class='del'>-	e_mutexes, folder lock recursive.  This fixes the imap filtering</div><div class='del'>-	bug, or at least some cases of it.</div><div class='del'>-	(camel_folder_finalize): Free mutexes.</div><div class='del'>-</div><div class='del'>-	* camel-private.h (CamelFolderPrivate): Changed mutexes to</div><div class='del'>-	e_mutexes.</div><div class='del'>-</div><div class='del'>-2001-07-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_*): Change the</div><div class='del'>-	return if fail's into asserts.</div><div class='del'>-	(camel_folder_change_info_free): Don't let it accept a NULL</div><div class='del'>-	argument.  This isn't g_lib so we dont have to.</div><div class='del'>-</div><div class='del'>-2001-07-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param): Fix the fix that fixes</div><div class='del'>-	broken mailer behavior. We want to make sure that the user's</div><div class='del'>-	locale charset is non-NULL before we pass it off to</div><div class='del'>-	iconv_open(). If it *is* NULL, we want to use iso-8859-1.</div><div class='del'>-</div><div class='del'>-2001-07-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_free): Allow the url to be NULL just like</div><div class='del'>-	the libc free convention.</div><div class='del'>-</div><div class='del'>-2001-07-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command_start):</div><div class='del'>-	Send an IMAP command, but don't wait for responses.</div><div class='del'>-	(camel_imap_command_response): Read a single line of response from</div><div class='del'>-	the server.</div><div class='del'>-	(camel_imap_command, etc): Reimplement in terms of the new code.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Use</div><div class='del'>-	camel_imap_command_start and camel_imap_command_response, and</div><div class='del'>-	call camel_operation_progress after each line read from the</div><div class='del'>-	server.</div><div class='del'>-	(imap_update_summary): Likewise, although with more fudging on the</div><div class='del'>-	precentages... Also, fix this so that if none of the new messages</div><div class='del'>-	are cached, it only does a single FETCH, and if some of them are</div><div class='del'>-	cached, it does two FETCHes (one to get the UIDs, FLAGS, and</div><div class='del'>-	SIZEs, and another to get the bodies of all of the messages that</div><div class='del'>-	aren't cached now that it knows the relevant UIDs). This should</div><div class='del'>-	speed up startup a bunch (especially if you have high bandwidth</div><div class='del'>-	but also high latency to the IMAP server).</div><div class='del'>-</div><div class='del'>-2001-07-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (mail_mlist_magic): Add another Sender</div><div class='del'>-	pattern.</div><div class='del'>-</div><div class='del'>-2001-07-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Change the break into a continue, we should process as many as we</div><div class='del'>-	can find.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_move_messages_to): If we have no</div><div class='del'>-	uid's to copy, exit here before going any further.  Some code</div><div class='del'>-	internally [imap] assumes there are uids to copy otherwise it can</div><div class='del'>-	segfault.</div><div class='del'>-	(camel_folder_copy_messages_to): Same.</div><div class='del'>-</div><div class='del'>-2001-07-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param): Handle broken mailers</div><div class='del'>-	that send unencoded 8bit header params. And there was much</div><div class='del'>-	rejoicing. Rah.</div><div class='del'>-</div><div class='del'>-	* camel-url.h (CAMEL_URL_HIDE_ALL): New #define, and there was</div><div class='del'>-	much rejoicing. Rah.</div><div class='del'>-</div><div class='del'>-2001-07-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_register, unregister): Added</div><div class='del'>-	some warnings for bad cases.</div><div class='del'>-</div><div class='del'>-2001-07-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_register): Only insert a hash</div><div class='del'>-	entry if we haven't already.</div><div class='del'>-	(camel_operation_unregister): Only remove the has entry if the id</div><div class='del'>-	is a real thread.</div><div class='del'>-</div><div class='del'>-2001-07-23  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_move): Slight fix for when source ==</div><div class='del'>-	destination (we don't want to do this action because on-demand</div><div class='del'>-	filtering would then delete the messages it supposedly "moved").</div><div class='del'>-</div><div class='del'>-2001-07-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth, smtp_helo,</div><div class='del'>-	send_to): Added some operation progress reporting.  Actual data</div><div class='del'>-	transfer is 'tricky' because of the layers used.</div><div class='del'>-	(smtp_auth): Instead of checking exception_is_set, use</div><div class='del'>-	challenge==NULL to test if sasl_challenge_base64 failed.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): Remove</div><div class='del'>-	peters changes below and put in a better fix.  These functions</div><div class='del'>-	already return -1 on error, just use that, and not worry about</div><div class='del'>-	building our own exception redundantly.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_get_host_byname): Turn the progress into</div><div class='del'>-	a transient event.</div><div class='del'>-</div><div class='del'>-2001-07-20  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): More</div><div class='del'>-	usage fixes for CamelException. Check our own exception for</div><div class='del'>-	summary_update and xfer it out if an error occurred.</div><div class='del'>-</div><div class='del'>-2001-07-20  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Pull up test fixes to get them building again</div><div class='del'>-</div><div class='del'>-2001-07-20  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_get_iconv_friendly_name):</div><div class='del'>-	renamed to camel_charset_to_iconv() to make it just a little more</div><div class='del'>-	consistent and not so long &amp; fixed callers.</div><div class='del'>-</div><div class='del'>-2001-07-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c</div><div class='del'>-	(camel_mime_filter_charset_new_convert): Convert to the</div><div class='del'>-	iconv-friendly charset names.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Fixed a</div><div class='del'>-	compiler warning about returning without a value in a non-void</div><div class='del'>-	function. Blah.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (process_header): Pass the locale charset as</div><div class='del'>-	the default_charset to header_decode_string().</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_format_string):</div><div class='del'>-	Pass the locale charset as the default_charset to</div><div class='del'>-	header_decode_string().</div><div class='del'>-	(content_info_new): Same.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Pass the locale charset</div><div class='del'>-	as the default_charset to header_decode_string().</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (append_8bit): New helper function who's</div><div class='del'>-	purpose is similar to append_latin1() but for 8bit text that we</div><div class='del'>-	are assuming is not latin1.</div><div class='del'>-	(header_decode_text): Now takes a default_charset parameter and</div><div class='del'>-	calls append_8bit when appropriate.</div><div class='del'>-	(header_decode_string): Also takes a default_charset parameter</div><div class='del'>-	now.</div><div class='del'>-	(header_decode_mailbox): Pass NULL as the default_charset to</div><div class='del'>-	header_decode_string().</div><div class='del'>-</div><div class='del'>-2001-07-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Modified to treat the return</div><div class='del'>-	value from camel_charset_locale_name() as a const char*.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_response): Modified to treat the</div><div class='del'>-	return value from camel_charset_locale_name() as a const char*.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_locale_name): Modify to</div><div class='del'>-	return const char* by returning the static locale_charset which is</div><div class='del'>-	created inside of camel_charset_map_init().</div><div class='del'>-	(camel_charset_map_init): Find the locale charset here and set the</div><div class='del'>-	static variable.</div><div class='del'>-</div><div class='del'>-2001-07-19  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Policy change: NULL url's are no longer allowed in</div><div class='del'>-	CamelFolderInfos. They used to signify that the folder was, in</div><div class='del'>-	IMAP jargon, NoSelect; now the same effect is achieved by adding a</div><div class='del'>-	"noselect=yes" parameter to the end of the URL. As far as I know,</div><div class='del'>-	IMAP is the only affected provider.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (delete_folder): New</div><div class='del'>-	function. Implement folder deletion.</div><div class='del'>-	(camel_imap_store_class_init): Set the delete_folder class</div><div class='del'>-	function here.</div><div class='del'>-	(get_folder_status): New function. Utility wrapper around the</div><div class='del'>-	STATUS command.</div><div class='del'>-	(create_folder): If the parent folder is NoSelect but is empty,</div><div class='del'>-	delete it and recreate it as a a subfolder-containing folder. If</div><div class='del'>-	it is NoSelect but contains messages, set an exception.</div><div class='del'>-	(parse_list_response_as_folder_info): Always set the FolderInfo's</div><div class='del'>-	URL, but add a NoSelect parameter if it isn't selectable.</div><div class='del'>-	(get_folder_info_online): Change logic of removing the namespace</div><div class='del'>-	to reflect URL change. Same for logic of checking unread counts.</div><div class='del'>-	(get_folder_info_online): Use get_folder_status to simplify this.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): When creating dummy</div><div class='del'>-	parents, copy the child's URL and set the NoSelect parameter.</div><div class='del'>-</div><div class='del'>-2001-07-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): No need for</div><div class='del'>-	`acharset' anymore.</div><div class='del'>-	(check_html_charset): Return a const char* and also use</div><div class='del'>-	camel_charset_get_iconv_friendly_name() internally.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): Remove my iso8859-1 -&gt;</div><div class='del'>-	iso-8859-1 hack and use camel_charset_get_iconv_friendly_name()</div><div class='del'>-	instead.</div><div class='del'>-	(rfc2184_decode): Use camel_charset_get_iconv_friendly_name()</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Call camel_charset_map_init().</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_map_init): New function to</div><div class='del'>-	initialize the charset-equivalent lookup table. To be called by</div><div class='del'>-	camel_init().</div><div class='del'>-	(camel_charset_get_iconv_friendly_name): New function to try and</div><div class='del'>-	convert a charset into something that iconv is more likely to</div><div class='del'>-	accept.</div><div class='del'>-</div><div class='del'>-2001-07-19  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Revert 7/11/2001 patch for IMAP INBOX filtering at NotZed's </div><div class='del'>-	request.</div><div class='del'>-</div><div class='del'>-2001-07-17  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Clean up some exception misusage.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Use</div><div class='del'>-	our own internal exception for sending the string and transfer it</div><div class='del'>-	to @ex if anything goes wrong.</div><div class='del'>-	(imap_read_response): Use our own internal exception for reading</div><div class='del'>-	the untagged responses and blah blah blah.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (get_service): Use our own internal exception</div><div class='del'>-	when constructing the service and transfer it to @ex if anything</div><div class='del'>-	goes wrong.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Instead of having</div><div class='del'>-	gboolean exception, use our own internal exception and copy</div><div class='del'>-	it to @ex if anything goes wrong.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (store_sync): Create an internal exception</div><div class='del'>-	because sync_folder() checks it for validity. Transfer it to</div><div class='del'>-	@ex when done.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_get_description): If @ex is</div><div class='del'>-	NULL, complain - passing NULL exceptions to Camel is okay, but</div><div class='del'>-	there should be no circumstances under which they're then</div><div class='del'>-	examined.</div><div class='del'>-	(camel_exception_get_id): Same here,</div><div class='del'>-	(camel_exception_xfer): NULL-protect and warn if transferring from</div><div class='del'>-	a NULL exception.</div><div class='del'>-	</div><div class='del'>-2001-07-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (init_trash): Use CAMEL_VTRASH_NAME.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.h: #define CAMEL_VTRASH_NAME</div><div class='del'>-</div><div class='del'>-2001-07-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_response_free):</div><div class='del'>-	Given:</div><div class='del'>-		* 4 EXISTS</div><div class='del'>-		* 1 EXPUNGE</div><div class='del'>-	We have to pass 3, not 4 to camel_imap_folder_changed for the</div><div class='del'>-	exists count. Fixes ximian bug #2112 (finally!).</div><div class='del'>-</div><div class='del'>-2001-07-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	If the message info for an expunged message is NULL, then just</div><div class='del'>-	break out - maybe a message was expunged that we were never</div><div class='del'>-	notified even existed?</div><div class='del'>-</div><div class='del'>-2001-07-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): Added a hack to</div><div class='del'>-	convert charsets in the format iso8859-1 to iso-8859-1 because it</div><div class='del'>-	seems to be more iconv friendly. It has been reported that on some</div><div class='del'>-	systems, iconv doesn't know about iso8859-1 while it *does* know</div><div class='del'>-	about iso-8859-1. See bug #4530.</div><div class='del'>-</div><div class='del'>-2001-07-13  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-exec-local): Let people install as</div><div class='del'>-	non-root, but give them a bigass warning so they're not allowed to</div><div class='del'>-	complain when it doesn't work right.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (sync_remote_folder): New function: hash</div><div class='del'>-	table callback.</div><div class='del'>-	(remote_disconnect): If cleanly disconnecting, sync our</div><div class='del'>-	folders. Fixes deadlocks on exit (folders syncing after store</div><div class='del'>-	disconnects) and also makes sense.</div><div class='del'>-</div><div class='del'>-2001-07-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-uid-cache.c (camel_uid_cache_new): We now use a structure</div><div class='del'>-	as the bucket data rather than just a cache level so set the save</div><div class='del'>-	state to TRUE.</div><div class='del'>-	(maybe_write_uid): We only save the uid if the cache levels are</div><div class='del'>-	the same *and* if the save state is TRUE.</div><div class='del'>-	(free_uid): Free the state value.</div><div class='del'>-	(camel_uid_cache_get_new_uids): New uids that get added to the</div><div class='del'>-	cache start with a save state of FALSE.</div><div class='del'>-	(camel_uid_cache_save_uid): Set the save state of the uid to</div><div class='del'>-	TRUE. What should we do if the uid isn't already in the cache?</div><div class='del'>-	Currently I make it add the uid, but maybe it shouldn't?</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_filter_timeout): Update</div><div class='del'>-	to reflect CamelFilterDriver API changes.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Take</div><div class='del'>-	a cache argument so we can tell the cache whether or not the uid</div><div class='del'>-	should be saved (meaning we have successfully filtered it).</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Okay, I've decided that that user is just on crack. We don't want</div><div class='del'>-	to allow filtering of deleted messages or we could get some</div><div class='del'>-	unexpected behavior.</div><div class='del'>-	(do_move): Oops. My last fix needs to be after the if-statement,</div><div class='del'>-	not inside it.</div><div class='del'>-	(do_copy): And here too.</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_move): Only set p-&gt;copied and</div><div class='del'>-	p-&gt;deleted if the messages are copied without an exception.</div><div class='del'>-	(do_copy): Same - but obviously we don't set the p-&gt;deleted here</div><div class='del'>-	at all.</div><div class='del'>-	(camel_filter_driver_filter_message): Since users complained that</div><div class='del'>-	they couldn't filter deleted messages for "safe keeping" (WTF?</div><div class='del'>-	safe keeping? why were they deleted in the first place then??), I</div><div class='del'>-	have taken out the code that optimized filtering by not allowing</div><div class='del'>-	deleted messages to be filtered. This fixes bug #4473.</div><div class='del'>-</div><div class='del'>-	Note: Users have a warped sense of logic.</div><div class='del'>-</div><div class='del'>-2001-07-12  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (extract_metatag_charset): Removed.</div><div class='del'>-	(check_html_charset): Replaced with this.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Call</div><div class='del'>-	check_html_charset if we dont have a charset on the content-type,</div><div class='del'>-	and we have text/html data.</div><div class='del'>-	(check_html_charset): We also need to do qp/base64 decoding</div><div class='del'>-	ourselves, sigh.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (html_meta_param_list_decode): Removed.  This</div><div class='del'>-	was very wrong, the rules for mail headers vastly different from</div><div class='del'>-	rules for decoding html elements.</div><div class='del'>-	(rfc2184_decode): Move the malloc inside the iconv_open worked,</div><div class='del'>-	otherwise we have a memleak.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-html.c (camel_mime_filter_html_finalize, init,</div><div class='del'>-	run, reset): Changed to use camelhtmlparser, and fixed a tiny</div><div class='del'>-	memleak.</div><div class='del'>-</div><div class='del'>-	* camel-html-parser.c: Made the html indexer tokeniser re-usable.</div><div class='del'>-	ONLY TO BE USED INTERNAL TO CAMEL HOWEVER.</div><div class='del'>-	(tokenise_step): Slight fix to non-quoted values.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_info_new_from_message): Removed some code i</div><div class='del'>-	wasn't supposed to commit.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c (local_summary_add): Only</div><div class='del'>-	set info-&gt;size if it is not zero.</div><div class='del'>-	(local_summary_add): If we dont get a size from the info passed</div><div class='del'>-	in, calculate it using a null stream write.  Should do #4392.</div><div class='del'>-</div><div class='del'>-2001-07-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (extract_metatag_charset): New function</div><div class='del'>-	to extract a meta-tag charset value if it exists.</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Along the same lines</div><div class='del'>-	as the code I previously ripped out, but this time use the</div><div class='del'>-	mime-parser's seek ability to help us along. Currently I read up</div><div class='del'>-	to a 2k buffer size - this is probably overkill, 1k is probably</div><div class='del'>-	plenty.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (html_meta_param_list_decode): When we get to</div><div class='del'>-	an `=', we must skip past it before trying to grab the param</div><div class='del'>-	value. duh.</div><div class='del'>-</div><div class='del'>-2001-07-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Ripped out my code</div><div class='del'>-	since it was never being used since the mime parser is not using a</div><div class='del'>-	seekable stream (ever?) which pretty much means my code needs to</div><div class='del'>-	be done someplace else.</div><div class='del'>-</div><div class='del'>-2001-07-11  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed): </div><div class='del'>-	Run the filter in its own thread to prevent locking issues.</div><div class='del'>-	(imap_filter_timeout): New function that does the filtering called</div><div class='del'>-	as a CamelSession timeout.</div><div class='del'>-</div><div class='del'>-2001-07-11  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Create</div><div class='del'>-	the messageinfo itself, so we can properly set the size.</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (camel_movemail_solaris): Write out the from</div><div class='del'>-	line between each message.</div><div class='del'>-</div><div class='del'>-2001-07-10  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c (local_summary_add): Copy</div><div class='del'>-	the size across from the source message info if supplied.</div><div class='del'>-</div><div class='del'>-	* camel-stream-null.c: Added a 'written' member which keeps track</div><div class='del'>-	of how much has been written to the stream.</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (camel_movemail): If we have BROKEN_SPOOL</div><div class='del'>-	defined, then use the solaris movemail to quote from lines that</div><div class='del'>-	sendmail didn't.</div><div class='del'>-	(camel_movemail_solaris): Compile this in if BROKEN_SPOOL defined.</div><div class='del'>-</div><div class='del'>-2001-07-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (html_meta_param_list_decode): New function</div><div class='del'>-	to parse an HTML meta-tag.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): If the Content-Type</div><div class='del'>-	did not contain a charset parameter and it's also a text/html</div><div class='del'>-	part, we have 1 last place to look - in the META html tags. *sigh*</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_get_source):</div><div class='del'>-	s/gint/unsigned since that's what it should be.</div><div class='del'>-</div><div class='del'>-2001-07-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_sign): Forget the passphrase if the</div><div class='del'>-	user has set that option.</div><div class='del'>-	(pgp_clearsign): Same.</div><div class='del'>-	(pgp_encrypt): And here...</div><div class='del'>-	(pgp_decrypt): And finally here.</div><div class='del'>-	(camel_pgp_context_new): Take a `remember' argument.</div><div class='del'>-</div><div class='del'>-2001-07-09  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_sync):</div><div class='del'>-	Oops, e_poolv_set free's it for us, so dont double-free here.</div><div class='del'>-</div><div class='del'>-2001-07-06  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_finalise): Changed so we</div><div class='del'>-	dont have the list changing under us, just going to the next node</div><div class='del'>-	before we call a function that might change the list is</div><div class='del'>-	potentially dangerous (slight mod of peters fix).  Hmm, i think it</div><div class='del'>-	would've double-unref'd it too(?)</div><div class='del'>-</div><div class='del'>-2001-07-08  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):</div><div class='del'>-	openssl_table is gone.  we now store/get the stream from the</div><div class='del'>-	SSL_CTX's app_data.</div><div class='del'>-	(stream_read): rework the non-blocking case to account for SSL</div><div class='del'>-	possibly buffering data (in which case select will block even</div><div class='del'>-	though data is ready to be read), and to account for FreeBSD's</div><div class='del'>-	strange behavior of returning -1/EAGAIN even though select said</div><div class='del'>-	the fd was ready to be read.</div><div class='del'>-	(ssl_verify): openssl_table is gone.</div><div class='del'>-	(open_ssl_connection): set the SSL_CTX's app_data to be the</div><div class='del'>-	stream, remove the openssl_table code.</div><div class='del'>-</div><div class='del'>-2001-07-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_encode_param): Don't allow in to be</div><div class='del'>-	NULL, so instead of doing if (in == NULL) return;, make it a</div><div class='del'>-	g_return_val_if_fail and later we can make it an assert or</div><div class='del'>-	something.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (get_inbox): Fixes bug</div><div class='del'>-	#1138.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): Make the `day-of-month' digit</div><div class='del'>-	take up 2 chars by using "%2d". Fixes bug #3989 for lame mailers</div><div class='del'>-	like Pine.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (crypto_exec_with_passwd): Set the pipe fd's</div><div class='del'>-	to nonblocking.</div><div class='del'>-</div><div class='del'>-2001-07-06  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_unref): Make sure that after the</div><div class='del'>-	finalization event has happened and the finalization functions</div><div class='del'>-	have been called that the object still has a zero refcount.</div><div class='del'>-</div><div class='del'>-2001-07-06  Joe Shaw  &lt;joe@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c: Add locking to</div><div class='del'>-	camel_nntp_get_grouplist_from_server().</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-resp-codes.h: Added</div><div class='del'>-	NNTP_EXTENSIONS_SUPPORTED (202).</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_get_extensions):</div><div class='del'>-	Check for both NNTP_LIST_FOLLOWS and NNTP_EXTENSIONS_SUPPORTED from</div><div class='del'>-	a LIST EXTENSIONS request. (Dunno if NNTP_LIST_FOLLOWS ever comes</div><div class='del'>-	out of this, but that's what was already there...) Also, put some</div><div class='del'>-	locking around it.</div><div class='del'>-	(finalize): e_mutex_destroy() the command lock</div><div class='del'>-	(camel_nntp_store_init): e_mutex_new() the command lock.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: Add locking macros.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_string): Added an</div><div class='del'>-	assert to make sure that `mi' isn't NULL.</div><div class='del'>-	(camel_message_info_set_string): Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_response_free):</div><div class='del'>-	Create and use a temporary CamelException for use with</div><div class='del'>-	camel_imap_folder_changed.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Send the</div><div class='del'>-	--no-auto-key-retrieve argument to gpg if we are in offline mode</div><div class='del'>-	so that we don't have to worry about gpg hanging if it can't</div><div class='del'>-	connect to the key servers, because now it shouldn't even attempt</div><div class='del'>-	to.</div><div class='del'>-</div><div class='del'>-2001-07-05  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (ssl_verify): use</div><div class='del'>-	X509_STORE_CTX_get_ex_data to get at the SSL* - don't use the</div><div class='del'>-	X509_STORE_CTX to look up our stream, since it's not what we used</div><div class='del'>-	to insert our stream into the hashtable.</div><div class='del'>-	(open_ssl_connection): insert the stream into the hashtable before</div><div class='del'>-	calling SSL_connect, as this can cause ssl_verify to be called,</div><div class='del'>-	and we need to look up the stream there.  remove the stream from</div><div class='del'>-	the hashtable if there's an error connecting.</div><div class='del'>-	(stream_connect): pass the CamelTcpStreamOpenSSL* to</div><div class='del'>-	open_ssl_connection since it handles the hashtable stuff.  remove</div><div class='del'>-	hashtable stuff from here.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_messages_to): if source ==</div><div class='del'>-	dest, just no-op.</div><div class='del'>-</div><div class='del'>-2001-07-05  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_finalise): Move this before the</div><div class='del'>-	camel_vee_folder_remove_folder because that function modifies p-&gt;folders</div><div class='del'>-	messing up our iteration.</div><div class='del'>-	(camel_vee_folder_finalise): Don't unref our summary; camel-folder now</div><div class='del'>-	does this.</div><div class='del'>-</div><div class='del'>-	* camel-object.h (CamelObject): Add a 'destroying' flag to CamelObject.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (obj_init): Clear 'destroying'.</div><div class='del'>-	(camel_object_unref): If 'destroying' then do not send the finalize</div><div class='del'>-	event and do not call finalize functions. Otherwise, set destroying</div><div class='del'>-	so just in case we get refed (eg event code) we don't get doubly</div><div class='del'>-	finalized.</div><div class='del'>-</div><div class='del'>-2001-07-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Fix the assertion slightly,</div><div class='del'>-	if we have a little bit of input the output size could be larger,</div><div class='del'>-	since we store upto 3 chars in the state.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_info_new_from_message): When indexing a new</div><div class='del'>-	record, create a pseudo word 'ibexindexed' so we can always tell</div><div class='del'>-	that a message has already been idnexed, even if it contains no</div><div class='del'>-	words of its own.  Things like maildir use this check to see if</div><div class='del'>-	its already been processed, and it matters if it is incorrect in</div><div class='del'>-	this case (not just wasted cycles).</div><div class='del'>-	(camel_message_info_dup_to): Assign the to-&gt;strings from the</div><div class='del'>-	e_poolv_cpy() call, since it may allocaote a new poolv if the</div><div class='del'>-	lengths do not match.</div><div class='del'>-</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): And same here.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_sync):</div><div class='del'>-	Changed the logicfor epoolv code to be different, we dont need to</div><div class='del'>-	update hash references or any tricky stuff.</div><div class='del'>-	(maildir_summary_check): Samehere.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Removed include of e-memory.h.</div><div class='del'>-</div><div class='del'>-2001-07-03  Joe Shaw  &lt;joe@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-resp-codes.h: Added NNTP_NO_PERMISSION</div><div class='del'>-	(502) to the list of response codes.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_connect): If we</div><div class='del'>-	receive a NNTP_NO_PERMISSION, don't get into an infinite loop trying</div><div class='del'>-	to reconnect, get extensions, etc. Just give up and return FALSE.</div><div class='del'>-</div><div class='del'>-2001-07-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_clear): Doh. Don't remove things from</div><div class='del'>-	the hash table while foreach'ing it. (And can't use foreach_remove</div><div class='del'>-	either because we have to remove them in a weird order). Fixes</div><div class='del'>-	#3618.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): If the</div><div class='del'>-	server returns OK from the FETCH BODY, but there's no parseable</div><div class='del'>-	BODY response, it's probably because there's an UN-parseable BODY</div><div class='del'>-	response, implying the message is badly formatted, MIMEwise. In</div><div class='del'>-	that case, fall back to fetching the message as a single part.</div><div class='del'>-</div><div class='del'>-2001-07-02  Sam Creasey &lt;sammy@oh.verio.com&gt;</div><div class='del'>-</div><div class='del'>-        * providers/nntp/camel-nntp-folder.c: Implemented</div><div class='del'>-        nntp_folder_search_by_expression and</div><div class='del'>-        nntp_folder_search_free.  Basic search functionality e.g. unread</div><div class='del'>-        marking now works for NNTP folders.</div><div class='del'>-</div><div class='del'>-        * camel_filter_search.c (get_size): Added get-size sexp directive</div><div class='del'>-        to get the size of a message for filters.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new):</div><div class='del'>-	Always check with the NNTP server after summary load -- this</div><div class='del'>-	function now always expires old summary entries and syncs with</div><div class='del'>-	the news server.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):</div><div class='del'>-	Only fetch headers for articles not already logged in </div><div class='del'>-	the summary file.</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c </div><div class='del'>-	(camel_nntp_get_grouplist_from_*): change from g_list_append()</div><div class='del'>-	to g_list_prepend() + g_list_reverse.  Traversing 40,000 </div><div class='del'>-	element linked lists sucks.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_command):</div><div class='del'>-	Should the NNTP connection die with </div><div class='del'>-	CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED, make a single retry </div><div class='del'>-	attempt.  Timing out the NNTP link is less painful this way.</div><div class='del'>-</div><div class='del'>-2001-07-02  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* README (Introduction): Add comment noting that Camel actually</div><div class='del'>-	exists now :-)</div><div class='del'>-</div><div class='del'>-2001-07-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_filter_driver): new method to</div><div class='del'>-	get an application-initialized filter driver.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_new): Remove the</div><div class='del'>-	get_folder function and data args from here...</div><div class='del'>-	(camel_filter_driver_set_folder_func): ...and add this function to</div><div class='del'>-	set/change them.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): If</div><div class='del'>-	this folder is INBOX and we're filtering INBOX, set a flag on the</div><div class='del'>-	folder for later.</div><div class='del'>-	(imap_update_summary): Add another argument (GPtrArray *recents),</div><div class='del'>-	and if it's non-NULL, add the uids of any \Recent new messages to</div><div class='del'>-	it.</div><div class='del'>-	(camel_imap_folder_changed): If doing filtering in this folder,</div><div class='del'>-	create a recents array and pass it to imap_update_summary. Then</div><div class='del'>-	get a filter driver and use it to filter the recent messages.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.h: </div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_flag_list): Add</div><div class='del'>-	support for the \Recent flag.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c (imap_conf_entries): enable</div><div class='del'>-	the "filter" option.</div><div class='del'>-</div><div class='del'>-	* camel-types.h: add CamelFilterDriver typedef here</div><div class='del'>-</div><div class='del'>-2001-07-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-lock-client.c (camel_lock_helper_init): properly return</div><div class='del'>-	error if we can't create pipes.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): re-enable</div><div class='del'>-	html indexing.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-html.c: Completely re-implemented using a</div><div class='del'>-	custom parser.</div><div class='del'>-</div><div class='del'>-2001-07-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/misc/url.c (main): Change a camel_exception_clear to</div><div class='del'>-	camel_exception_init to fix a sometimes-crash</div><div class='del'>-</div><div class='del'>-2001-06-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added Originator: header as a header to look</div><div class='del'>-	for when looking for the mailing list.</div><div class='del'>-</div><div class='del'>-	* tests/mime-filter/Makefile.am: Build the test-crlf test program.</div><div class='del'>-</div><div class='del'>-	* tests/mime-filter/test-crlf.c: New test suite for the crlf</div><div class='del'>-	filter.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Fixed to correctly encode and</div><div class='del'>-	decode dots.</div><div class='del'>-</div><div class='del'>-2001-06-28  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-stripheader.c: New file. Filter that strips a</div><div class='del'>-	header from mime output.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-stripheader.h: New file. Header for the above.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the</div><div class='del'>-	stripheader filter to remove the "Bcc" header.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add the stripheader files.</div><div class='del'>-</div><div class='del'>-	* tests/lib/Makefile.am (INCLUDES): Get this to compile again.</div><div class='del'>-</div><div class='del'>-	* tests/mime-filter/test-stripheader.c: New file. Test suite for</div><div class='del'>-	the CamelMimeFilterStripHeader.</div><div class='del'>-</div><div class='del'>-	* tests/mime-filter/Makefile.am: New test section: mime filters.</div><div class='del'>-</div><div class='del'>-2001-06-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param_list): Fix a memory</div><div class='del'>-	leak. Also if the decoded value is NULL, that means it wasn't</div><div class='del'>-	encoded so we don't want to toss the old value.</div><div class='del'>-	(header_param_list_format_append): Correctly wrap long parameter</div><div class='del'>-	values according to rfc2184.</div><div class='del'>-</div><div class='del'>-2001-06-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): If the</div><div class='del'>-	folder is frozen, don't refresh, just record that we need to do it</div><div class='del'>-	later.</div><div class='del'>-	(imap_append_online): If the APPEND doesn't trigger an immediate</div><div class='del'>-	EXISTS response (because the folder isn't the selected folder, or</div><div class='del'>-	because the server doesn't do that until the next command), call</div><div class='del'>-	imap_refresh_info on the folder.</div><div class='del'>-	(imap_copy_online): Likewise. (Replacing the unconditional NOOP</div><div class='del'>-	that was there before, which absolutely killed filter performance</div><div class='del'>-	by forcing the IMAP provider to switch back and forth between</div><div class='del'>-	folders after every copy or move.)</div><div class='del'>-	(imap_thaw): If the folder needs a refresh, do it.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_is_frozen): New method</div><div class='del'>-</div><div class='del'>-2001-06-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-transport.c (camel_transport_init): Initialize the private</div><div class='del'>-	send_lock.</div><div class='del'>-	(camel_transport_finalize): Free the private send_lock.</div><div class='del'>-	(camel_transport_get_type): Set the init and finalize functions.</div><div class='del'>-	(camel_transport_send): Lock the transport.</div><div class='del'>-	(camel_transport_send_to): Same.</div><div class='del'>-</div><div class='del'>-	* camel-private.h: Add CAMEL_TRANSPORT_(UN)LOCK macros.</div><div class='del'>-</div><div class='del'>-2001-06-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/folder/test9.c (main): Updated to match the current API.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test3.c: #include &lt;gtk/gtk.h&gt; since we use</div><div class='del'>-	gtk_init().</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c</div><div class='del'>-	(camel_internet_address_encode_address): Use the new</div><div class='del'>-	header_address_fold.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Removed some old #if 0'd code of mine.</div><div class='del'>-	(rfc2047_encode_word): If enclen is 0, don't write an encoded word</div><div class='del'>-	token (=?iso-8859-7?Q??= would be an invalid token).</div><div class='del'>-	(header_address_fold): New function to wrap address headers -</div><div class='del'>-	header_fold() was force-wrapping rfc2047 encoded words which was</div><div class='del'>-	making the test suite fail. The *real* solution, however, is to</div><div class='del'>-	not create rfc2047 encoded words longer than 72 chars.</div><div class='del'>-</div><div class='del'>-2001-06-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (open_folder): Since we want an error</div><div class='del'>-	opening a folder to result in the message being copied to Inbox</div><div class='del'>-	(assuming no other filters get a chance to `move` it), don't</div><div class='del'>-	record any exceptions that may occur in this function.</div><div class='del'>-</div><div class='del'>-2001-06-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected,</div><div class='del'>-	imap_append_offline, imap_append_online,</div><div class='del'>-	camel_imap_folder_changed): lock the cache around accesses</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_online): ref the</div><div class='del'>-	newly-created folder (as current_folder) before calling</div><div class='del'>-	camel_imap_folder_selected, in case that needs to do something</div><div class='del'>-	that causes another folder to become current...</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_get_url): D'oh.</div><div class='del'>-	s/FALSE/CAMEL_URL_HIDE_PASSWORD/</div><div class='del'>-</div><div class='del'>-2001-06-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_source): g_strdup() the message</div><div class='del'>-	source here or we will have problems later when we go to free the</div><div class='del'>-	result ;-)</div><div class='del'>-</div><div class='del'>-2001-06-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_auth): Fix this: IMAP</div><div class='del'>-	doesn't allow an extra argument to AUTHENTICATE to avoid a useless</div><div class='del'>-	round trip like some other SASL bindings do.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_response): Deal</div><div class='del'>-	with IMAP servers that (incorrectly) return "+\r\n" rather than</div><div class='del'>-	"+ \r\n" for an empty continuation response.</div><div class='del'>-	(camel_imap_response_extract_continuation): Likewise.</div><div class='del'>-</div><div class='del'>-2001-06-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (word_types_compatable): New function that</div><div class='del'>-	decides if 2 word types are mergeable. An atom and a qstring are</div><div class='del'>-	mergeable; 2 qstrings are mergeable; and 2 encoded words are</div><div class='del'>-	mergeable.</div><div class='del'>-	(header_encode_phrase_merge_words): If 2 words are merged, the new</div><div class='del'>-	word type is the MAX of the combined types. This means that if we</div><div class='del'>-	merge a qstring and an atom, the resulting word type is a</div><div class='del'>-	qstring.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_format):</div><div class='del'>-	s/g_string_sprintfa/g_string_append since this makes more sense in</div><div class='del'>-	this particular case.</div><div class='del'>-	(internet_encode): Same here.</div><div class='del'>-</div><div class='del'>-2001-06-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_send): Use</div><div class='del'>-	camel_address_length() rather than casting and accessing data</div><div class='del'>-	members.</div><div class='del'>-</div><div class='del'>-2001-06-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_check_mailing_list): If the first</div><div class='del'>-	char of the mailing-list name is '&lt;', chop it off to make Ettore</div><div class='del'>-	happy. Fixes bug #2153.</div><div class='del'>-</div><div class='del'>-2001-06-19  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-lock-helper.c (unlock_id): Fixed a bug when not running</div><div class='del'>-	setuid it wouldn't unlock.</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (camel_movemail): use new</div><div class='del'>-	locking daemon, also return an error code.</div><div class='del'>-</div><div class='del'>-2001-06-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Note: Except for the info_free(), the NULL checks are</div><div class='del'>-	g_return's. I felt that since g_free() handles NULL that our</div><div class='del'>-	_free() functions should also.</div><div class='del'>-	</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_free): Check to make</div><div class='del'>-	sure that the info pointer isn't NULL.</div><div class='del'>-	(camel_folder_change_info_change_uid): Same.</div><div class='del'>-	(camel_folder_change_info_changed): Same.</div><div class='del'>-	(camel_folder_change_info_remove_uid): Same.</div><div class='del'>-	(camel_folder_change_info_add_uid): Same.</div><div class='del'>-	(camel_folder_change_info_build_diff): Same.</div><div class='del'>-	(camel_folder_change_info_cat): Same.</div><div class='del'>-	(camel_folder_change_info_add_source): Same.</div><div class='del'>-	(camel_folder_change_info_add_source_list): Same.</div><div class='del'>-	(camel_folder_change_info_add_update): Same.</div><div class='del'>-	(camel_folder_change_info_add_update_list): Same.</div><div class='del'>-</div><div class='del'>-2001-06-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/stream/Makefile.am (LDADD): </div><div class='del'>-	* tests/smime/Makefile.am (LDADD): </div><div class='del'>-	* tests/misc/Makefile.am (LDADD): </div><div class='del'>-	* tests/message/Makefile.am (LDADD): </div><div class='del'>-	* tests/folder/Makefile.am (LDADD): Remove DB3_LDADD</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-exec-local): Set camel-lock-help setgid or</div><div class='del'>-	setuid as needed</div><div class='del'>-</div><div class='del'>-2001-06-18  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): Only create a missing</div><div class='del'>-	uid if we have indexing turned on.</div><div class='del'>-</div><div class='del'>-	* camel-lock-helper.c (setup_process): Function to setup</div><div class='del'>-	process/sanity/security checks.  Change to the real uid as soon as</div><div class='del'>-	we can.</div><div class='del'>-	(lock_path): First try to lock as the real uid, if that fails, try</div><div class='del'>-	the root uid.</div><div class='del'>-	(unlock_id): Unlock as the uid we created the lock as.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added -DCAMEL_SBINDIR for lock helper</div><div class='del'>-	location.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c (spool_lock): Implemented,</div><div class='del'>-	using lock helper locking.  Need to work out if the locking</div><div class='del'>-	requires a root created lock?</div><div class='del'>-	(spool_unlock): Likewise.</div><div class='del'>-</div><div class='del'>-2001-06-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-lock-helper.c: Setuid Lock helper process.  Creates and manages</div><div class='del'>-	.locks, keeping them active, removing them, etc.  What real perms it</div><div class='del'>-	needs is a little system dependent.</div><div class='del'>-</div><div class='del'>-2001-06-14  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (get_folder_info): Implement.</div><div class='del'>-	(scan_dir): Does the work of scanning for maildir directories.</div><div class='del'>-</div><div class='del'>-2001-06-13  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-store.c (get_folder_info):</div><div class='del'>-	Implemented, just returns a hardcoded INBOX folder.</div><div class='del'>-	(free_folder_info): implemented, free's the 1 possible level of</div><div class='del'>-	folder info.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-folder.c</div><div class='del'>-	(camel_spool_folder_construct): Set the real unread message</div><div class='del'>-	count on the folder_created thing.</div><div class='del'>-</div><div class='del'>-2001-06-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_max_uid): Return the largest real UID in</div><div class='del'>-	the cache (as an integer). Eventually to be used for an</div><div class='del'>-	optimization in the new-message fetch code.</div><div class='del'>-	(cache_put): Keep track of max_uid.</div><div class='del'>-</div><div class='del'>-2001-06-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added Mailing-List header regex so that we</div><div class='del'>-	can do mlist magic on that header.</div><div class='del'>-</div><div class='del'>-2001-05-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param): Properly handle</div><div class='del'>-	correct and incorrect (for the common case, ie Outlook and</div><div class='del'>-	Netscape/Mozilla) rfc2184 values.</div><div class='del'>-	(header_decode_rfc2184_param): Get the param name and see if we</div><div class='del'>-	should expect a rfc2184 parameter value.</div><div class='del'>-	(rfc2184_decode): Decode a rfc2184 value.</div><div class='del'>-	(hex_decode): hex decode a string.</div><div class='del'>-	(header_decode_param_list): Handle rfc2184 encoded parameters (ie</div><div class='del'>-	parameters that have been split and perhaps encoded).</div><div class='del'>-	(header_param_list_format_append): Encode the value before seeing</div><div class='del'>-	if it will fit on the line. If the value does get encoded, be sure</div><div class='del'>-	to put a '*' before the equal-sign.</div><div class='del'>-	(header_encode_param): New function to rfc2184 encode a parameter</div><div class='del'>-	value (maybe it should be renamed?)</div><div class='del'>-</div><div class='del'>-2001-06-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (init_header_name_table): Don't try to format</div><div class='del'>-	the Reply-To header - we don't want to wrap the reply-to address.</div><div class='del'>-</div><div class='del'>-2001-06-12  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-spool-*.[ch]: A new provider, for spool</div><div class='del'>-	mailboxes.  Mostly a cut and paste of the mbox code, but not a</div><div class='del'>-	subclass CamelLocal*.  Not tested a lot, doesn't lock yet, use</div><div class='del'>-	with extreme caution.</div><div class='del'>-</div><div class='del'>-	* tests/lib/folders.c (test_folder_message_ops): Added spool arg,</div><div class='del'>-	spool folders can't be deleted, renamed, etc.</div><div class='del'>-	(test_folder_basic): Same.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test2.c (main): Added checks for spool type.</div><div class='del'>-</div><div class='del'>-	* tests/[message|stream|folder|misc|smime]/Makefile.am (LDADD):</div><div class='del'>-	Added db3 flags, so make check compiles, doesn't run though.</div><div class='del'>-</div><div class='del'>-2001-05-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c</div><div class='del'>-	(camel_provider_module_init): Added spool provider.</div><div class='del'>-</div><div class='del'>-2001-06-07  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Add a</div><div class='del'>-	separator between the service url and the folder name, if needed.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Added</div><div class='del'>-	an argument, so that the original source URI of the mbox can be</div><div class='del'>-	passed in.  This is needed because this function is called</div><div class='del'>-	post-movemail, so we are never reading from the original mbox</div><div class='del'>-	anymore.  Without the original mbox URI, the X-Evolution-Source</div><div class='del'>-	tag gets set incorrectly and filter-on-source will fail to work.</div><div class='del'>-	(camel_filter_driver_filter_message): Also take an extra arg</div><div class='del'>-	for the original source URI.  It is the original URI, not the</div><div class='del'>-	source URI, that is used for filtering and for setting the</div><div class='del'>-	X-Evolution-Source tag.</div><div class='del'>-</div><div class='del'>-2001-06-05  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Don't fetch</div><div class='del'>-	the UID and FLAGS of messages we don't know about yet, since</div><div class='del'>-	they'll just get discarded.</div><div class='del'>-</div><div class='del'>-2001-06-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp.c: Fix to not get into a recursive loop in</div><div class='del'>-	get_type().</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp-mime.c: Same.</div><div class='del'>-</div><div class='del'>-2001-05-31  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c: Numerous fixes to get it to compile.</div><div class='del'>-</div><div class='del'>-	* camel.h: Added camel-cipher-context.h, camel-cms-context.h,</div><div class='del'>-	camel-smime-context.h, and camel-smime-utils.h</div><div class='del'>-</div><div class='del'>-	* camel-cms-context.[c,h]: New virtual class for manipulating</div><div class='del'>-	cryptographic message syntax messages (like S/MIME).</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.[c,h]: Modified to inherit from the</div><div class='del'>-	CamelCMSContext class rather than the CamelCipherContext class.</div><div class='del'>-</div><div class='del'>-	* camel-smime.[c,h]: Removed - just use camel-smime-context</div><div class='del'>-	directly.</div><div class='del'>-</div><div class='del'>-	* camel-smime-utils.[c,h]: New source files. Moved the 2 useful</div><div class='del'>-	functions from camel-smime.[c,h] into here.</div><div class='del'>-</div><div class='del'>-2001-05-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Redo the BUILD_MAP code to not depend on</div><div class='del'>-	libunicode. Now it only generates a map of "popular" 8bit</div><div class='del'>-	encodings. (It's not worthwhile to support obscure encodings,</div><div class='del'>-	because any mailer that supports them will support UTF8 too. And</div><div class='del'>-	Chinese and Japanese use mostly the same UTF8 characters so you</div><div class='del'>-	need to decide between those encodings based on the locale or</div><div class='del'>-	the charset of the message you're replying to or the input</div><div class='del'>-	method you used. So this is sufficient for camel_charset_best's</div><div class='del'>-	use.)</div><div class='del'>-</div><div class='del'>-	* camel-charset-map-private.h: Regenerated.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_shutdown): Move #ifdefs around to prevent a</div><div class='del'>-	warning.</div><div class='del'>-</div><div class='del'>-2001-05-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-disco-diary.c: Code for logging and replaying offline</div><div class='del'>-	operations.</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c (disco_construct): Set disco-&gt;status here</div><div class='del'>-	(where we can base it on the session's offline status) rather than</div><div class='del'>-	at init time.</div><div class='del'>-	(disco_connect): If we connect online and have a non-empty diary,</div><div class='del'>-	switch to RESYNCING mode and replay the diary to the server.</div><div class='del'>-	(disco_get_folder, disco_get_folder_info): Add _resyncing</div><div class='del'>-	variants.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c (disco_sync, disco_expunge_uids,</div><div class='del'>-	disco_append_message, disco_copy_messages_to,</div><div class='del'>-	disco_move_messages_to): Add _resyncing variants to switches.</div><div class='del'>-	(disco_expunge_uids, disco_append_message, disco_copy_messages_to,</div><div class='del'>-	disco_move_messages_to): Remove #ifdef'ed out diary code: let the</div><div class='del'>-	provider do it.</div><div class='del'>-	(disco_append_message): Redo the append methods to no longer</div><div class='del'>-	return the UID, since we're no longer doing the logging from here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect_online,</div><div class='del'>-	imap_connect_offline): Create a CamelDiscoDiary.</div><div class='del'>-	(imap_disconnect_offline): And free it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	If RESYNCING, don't do any sort of checking that the remote folder</div><div class='del'>-	matches the summary, beyond making sure that the UIDVALIDITY is</div><div class='del'>-	correct.</div><div class='del'>-	(imap_rescan): Add a missing camel_folder_summary_info_free when</div><div class='del'>-	removing a UID from the summary.</div><div class='del'>-	(imap_expunge_uids_offline): Implement. Fairly simple.</div><div class='del'>-	(imap_expunge_uids_resyncing): Implement. If the store supports</div><div class='del'>-	UIDPLUS, we can just use imap_expunge_uids_online. If not, we need</div><div class='del'>-	to temporarily undelete any messages marked deleted on the server</div><div class='del'>-	that aren't supposed to get expunged.</div><div class='del'>-	(imap_append_offline): Implement, using cache and summary</div><div class='del'>-	operations, and triggering the folder_changed event by hand.</div><div class='del'>-	(imap_append_resyncing): Implement. Redo imap_append_online a bit</div><div class='del'>-	in the process to make them able to share more code.</div><div class='del'>-	(imap_copy_offline): Implement.</div><div class='del'>-	(imap_copy_online): Move parts of this out into a helper.</div><div class='del'>-	(imap_copy_resyncing): Implement. In most cases this is just like</div><div class='del'>-	imap_copy_online, but if you are copying a message that was itself</div><div class='del'>-	copied or appended into the folder, and the server doesn't do</div><div class='del'>-	UIDPLUS, it will be necessary to replace at least part of the copy</div><div class='del'>-	operation with one or more appends.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_response): Don't</div><div class='del'>-	record the current folder in the response when in RESYNCING mode.</div><div class='del'>-	(This means that EXISTS and EXPUNGE responses won't be processed,</div><div class='del'>-	which is needed because the summary may not match the folder at</div><div class='del'>-	this point.)</div><div class='del'>-	(imap_read_response): On error, call</div><div class='del'>-	camel_imap_response_free_without_processing, not</div><div class='del'>-	camel_imap_response_free.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set): Make</div><div class='del'>-	this work better when operating on UIDs that aren't in the summary.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c</div><div class='del'>-	(camel_imap_summary_add_offline): New routine used by</div><div class='del'>-	imap_append_offline and imap_copy_offline to create new summary</div><div class='del'>-	entries.</div><div class='del'>-</div><div class='del'>-2001-05-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_set_param): Use g_strcasecmp()</div><div class='del'>-	because some systems don't have strcasecmp(). Also, when removing</div><div class='del'>-	a param, make sure to free the param-&gt;name too.</div><div class='del'>-</div><div class='del'>-2001-05-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/messages.c (test_message_read_file): Fix an fd leak</div><div class='del'>-</div><div class='del'>-	* tests/lib/session.c, tests/lib/session.h: a CamelSession</div><div class='del'>-	subclass for the test programs.</div><div class='del'>-</div><div class='del'>-	* tests/lib/Makefile.am: include session.[ch]</div><div class='del'>-</div><div class='del'>-	* tests/folder/test*.c: Use a CamelTestSession from libcameltest</div><div class='del'>-	instead of cut+pasting everywhere.</div><div class='del'>-</div><div class='del'>-	* tests/misc/url.c (main): Update for a camel_url_new change at</div><div class='del'>-	some point.</div><div class='del'>-</div><div class='del'>-	* tests/*/.cvsignore: Add stuff.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_encode_word): Fix a silly ==/!=</div><div class='del'>-	mixup.</div><div class='del'>-</div><div class='del'>-2001-05-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Add a "need_rescan" flag</div><div class='del'>-	saying if we want to rescan the entire folder for flag changes</div><div class='del'>-	next time it's selected.</div><div class='del'>-	(camel_imap_folder_init): Set need_rescan TRUE.</div><div class='del'>-	(camel_imap_folder_selected): If need_rescan is TRUE, call</div><div class='del'>-	imap_rescan.</div><div class='del'>-	(imap_refresh_info): Only do a full rescan if need_rescan is TRUE.</div><div class='del'>-	Otherwise just do a NOOP, making this a MUCH more lightweight</div><div class='del'>-	operation. Also, don't call imap_rescan directly if the folder</div><div class='del'>-	isn't selected, since that could end up causing the folder to be</div><div class='del'>-	scanned *twice* (imap_rescan -&gt; camel_imap_command -&gt;</div><div class='del'>-	camel_imap_folder_selected -&gt; imap_rescan).</div><div class='del'>-	(imap_rescan): Set need_rescan FALSE.</div><div class='del'>-	(imap_sync_online): Don't NOOP if no changes were pushed: the</div><div class='del'>-	caller will call refresh_info if it wants to poll for changes.</div><div class='del'>-	Fixes evolution-mail doing lots of unnecessary extra work at</div><div class='del'>-	quit time.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (refresh_folder_info): Set</div><div class='del'>-	need_rescan on each folder before calling refresh_info.</div><div class='del'>-</div><div class='del'>-2001-05-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Oops. Use a</div><div class='del'>-	strNcmp to make sure the response begins with a 334 code, not a</div><div class='del'>-	strcmp. Duh.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_append_message):</div><div class='del'>-	remove the summary info so we are not out-of-sync with the maildir</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_append_message): remove</div><div class='del'>-	the summary info so we are not out-of-sync with the mh folder.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message):</div><div class='del'>-	remove the summary info so we are not out-of-sync with the mbox.</div><div class='del'>-</div><div class='del'>-2001-05-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c (camel_smime_context_new): Oops, I spelled</div><div class='del'>-	the get-default-db function name wrong.</div><div class='del'>-</div><div class='del'>-2001-05-23  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): s/folder_deleted/folder_created -</div><div class='del'>-	result of a bad copy/paste.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains):</div><div class='del'>-	Optimize the match "" case.</div><div class='del'>-</div><div class='del'>-2001-05-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info_online):</div><div class='del'>-	Store the CamelFolderInfo tree that was returned from</div><div class='del'>-	camel_folder_info_build() in a new variable, 'tree', rather than</div><div class='del'>-	'fi' since we later use 'fi' when syncing folders. Not only does</div><div class='del'>-	this fix a memory leak, but it also fixes the bug where the user</div><div class='del'>-	would only see the last folder in the folder list and/or it's</div><div class='del'>-	subfolders.</div><div class='del'>-</div><div class='del'>-2001-05-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_forget_password): The service can</div><div class='del'>-	be NULL here too, thanks to Wayne Davis for pointing this out.</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c (camel_smime_context_new): We don't need</div><div class='del'>-	to be passed the certdb path anymore.</div><div class='del'>-</div><div class='del'>-2001-05-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (camel_medium_get_headers): New function to</div><div class='del'>-	return an array of all headers.</div><div class='del'>-	(camel_medium_free_headers): And free them.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (get_headers, free_headers): Implement this</div><div class='del'>-	for CamelMimePart. (Works for CamelMimeMessage too.)</div><div class='del'>-</div><div class='del'>-2001-05-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c (camel_smime_context_finalise): Don't</div><div class='del'>-	close or free (it wasn't allocated) the certdb.</div><div class='del'>-	(camel_smime_context_new): If we get a NULL certdb handle, then</div><div class='del'>-	don't bother trying to create a new certdb handle since NSS_Init*</div><div class='del'>-	should have done that.</div><div class='del'>-</div><div class='del'>-2001-05-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Don't use EXTRA_GNOME_*, use the new CAMEL_*</div><div class='del'>-	variables so we don't link in tons of extra cruft that we don't</div><div class='del'>-	need.</div><div class='del'>-</div><div class='del'>-	* tests/smime/pkcs7.c: Added to the test suite - tests the S/MIME</div><div class='del'>-	pkcs7 functions.</div><div class='del'>-</div><div class='del'>-2001-05-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c: Lots of fixes to get this to compile.</div><div class='del'>-</div><div class='del'>-	* camel-smime.c (camel_smime_part_verify): Updated to pass in a</div><div class='del'>-	hash argument to camel_smime_verify().</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_verify): Update according</div><div class='del'>-	to the changes in the context API.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Updated to take a</div><div class='del'>-	CamelCipherHash argument.</div><div class='del'>-</div><div class='del'>-	* camel-cipher-context.c (camel_cipher_verify): Now takes a hash</div><div class='del'>-	argument since the S/MIME code needs this.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add camel-smime-context.[c,h] and camel-smime.[c,h]</div><div class='del'>-	to the build.</div><div class='del'>-	</div><div class='del'>-	* camel-smime.[c,h]: New source files for manipulating S/MIME</div><div class='del'>-	message parts.</div><div class='del'>-</div><div class='del'>-2001-05-14  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (utf8_get): Replicate the semantics of</div><div class='del'>-	the libunicode utf8 functions by returning NULL in the arg</div><div class='del'>-	on invalid utf8.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Check for valid utf8,</div><div class='del'>-	terminate loop if something looks wrong.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_encode_phrase_get_words): Properly</div><div class='del'>-	check for invalid utf8.</div><div class='del'>-	(header_encode_string): Properly check for invalid utf8.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_step): Properly check for</div><div class='del'>-	invalid utf8.</div><div class='del'>-</div><div class='del'>-2001-05-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/folder/test9.c: </div><div class='del'>-	* tests/folder/test8.c:</div><div class='del'>-	* tests/folder/test7.c: </div><div class='del'>-	* tests/folder/test6.c: </div><div class='del'>-	* tests/folder/test5.c: </div><div class='del'>-	* tests/folder/test4.c:</div><div class='del'>-	* tests/folder/test3.c: </div><div class='del'>-	* tests/folder/test2.c: </div><div class='del'>-	* tests/folder/test1.c: </div><div class='del'>-	* tests/smime/pgp-mime.c: </div><div class='del'>-	* tests/smime/pgp.c: Subclass CamelSession since we can no longer</div><div class='del'>-	specify the passwd callback any other way and update code</div><div class='del'>-	accordingly.</div><div class='del'>-</div><div class='del'>-2001-05-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_location_decode): Decode</div><div class='del'>-	Content-Location, either correctly or Netscape-generated-brokenly.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content_location,</div><div class='del'>-	camel_mime_part_get_content_location, etc): Deal with</div><div class='del'>-	Content-Location header.</div><div class='del'>-</div><div class='del'>-2001-05-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Don't check</div><div class='del'>-	the initial auth response until we get into the while-loop</div><div class='del'>-	otherwise we have problems if the SASL mechanism supported a</div><div class='del'>-	client initiated challenge (like PLAIN and LOGIN do).</div><div class='del'>-</div><div class='del'>-2001-05-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-null.c (camel_stream_null_new): Make this return</div><div class='del'>-	CamelStream * (like the other stream new functions) instead of</div><div class='del'>-	CamelStreamNull *</div><div class='del'>-</div><div class='del'>-2001-05-10  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_connect): call SSL_Enable after</div><div class='del'>-	the SSL_ImportFD and before PR_Connect.  Otherwise, NSS aborts</div><div class='del'>-	during the connect.</div><div class='del'>-</div><div class='del'>-2001-05-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_password): Don't abort if the</div><div class='del'>-	Service is NULL, this is perfectly valid for cipher contexts.</div><div class='del'>-</div><div class='del'>-2001-05-09  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_move_messages_to): Pass</div><div class='del'>-	appropriate parameters to CF_CLASS and add comment explaining why</div><div class='del'>-	my initial attempt at a solution didn't work.</div><div class='del'>-</div><div class='del'>-2001-05-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c (camel_disco_set_status): Set the</div><div class='del'>-	disconnected status.</div><div class='del'>-	(camel_disco_store_can_work_offline): Return whether or not a</div><div class='del'>-	given CamelDiscoStore can work offline or not.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c (camel_disco_folder_cache_message):</div><div class='del'>-	Explicitly tell a folder to cache a message. (Better than using</div><div class='del'>-	get_message, because for IMAP that doesn't guarantee you'll get</div><div class='del'>-	all the message parts.)</div><div class='del'>-	(camel_disco_folder_prepare_for_offline): Prepare a folder for</div><div class='del'>-	offline use by caching all messages meeting given search criteria</div><div class='del'>-	(and doing anything else the particular folder implementation</div><div class='del'>-	needs).</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_set_online,</div><div class='del'>-	camel_session_is_online): A session-wide online/offline toggle.</div><div class='del'>-	(camel_session_init): Set online to TRUE.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (can_work_offline):</div><div class='del'>-	Implementation of CamelDiscoStore::can_work_offline. (Checks that</div><div class='del'>-	the store has been used online at least once.)</div><div class='del'>-	(imap_get_folder_online, imap_get_folder_offline): Deal with</div><div class='del'>-	request for "inbox" properly. ("Don't you mean... 'INBOX'?").</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_cache_message):</div><div class='del'>-	Implementation of CamelDiscoFolder::cache_message.</div><div class='del'>-</div><div class='del'>-	* camel.h: Add camel-disco-store.h and camel-disco-folder.h</div><div class='del'>-</div><div class='del'>-2001-05-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content_id): Wrap the</div><div class='del'>-	content-id with &lt;&gt;'s.</div><div class='del'>-</div><div class='del'>-2001-05-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (connect_to_server): Add</div><div class='del'>-	support for using OpenSSL.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Add support for using the</div><div class='del'>-	OpenSSL implementation.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Hmmmm, don't pass in a</div><div class='del'>-	NULL as the last argument to alert_user - prototype doesn't take</div><div class='del'>-	that argument anymore?</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):</div><div class='del'>-	(ssl_verify): Use a global hash table to try and lookup the</div><div class='del'>-	CamelTcpStreamOpenSSL object given the ssl context since OpenSSL</div><div class='del'>-	doesn't think one needs to pass data around, we should all be</div><div class='del'>-	living in a world of global variables, duh!</div><div class='del'>-</div><div class='del'>-2001-05-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Fix another build</div><div class='del'>-	problem. (Um, anyone else could have done this...)</div><div class='del'>-</div><div class='del'>-2001-05-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_online): Fix up</div><div class='del'>-	refcounting on current_folder.</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c, camel-disco-store.h: Remove</div><div class='del'>-	CamelDiscoDiary refs that weren't supposed to escape yet.</div><div class='del'>-</div><div class='del'>-2001-05-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-disco-store.c: new abstract class for disconnectable</div><div class='del'>-	remote stores</div><div class='del'>-</div><div class='del'>-	* camel-disco-folder.c: new abstract class for folders on</div><div class='del'>-	disconnectable stores.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add camel-disco-folder.[ch] and</div><div class='del'>-	camel-disco-store.[ch].</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Make this a subclass of</div><div class='del'>-	CamelDiscoStore, and fix up the offline interfaces for the changes</div><div class='del'>-	since they were first written (particularly the fact that some</div><div class='del'>-	IMAP stores don't just use subscribed folders).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Make this a subclass of</div><div class='del'>-	CamelDiscoFolder, although most ops still fail in disconnected</div><div class='del'>-	mode.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder_info): Change gboolean,</div><div class='del'>-	gboolean, gboolean to guint32 in the prototype for this function.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (get_folder_info): Update</div><div class='del'>-	for prototype change.</div><div class='del'>-</div><div class='del'>-2001-05-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Clean this up a bit. Add a</div><div class='del'>-	"tag_prefix" member. Move "useful_lsub" into capabilities.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init):</div><div class='del'>-	Initialize the tag_prefix, based on a static variable.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Use</div><div class='del'>-	the store's tag_prefix character rather than "A" at the start of</div><div class='del'>-	the tag. Makes the verbose debug output easier to parse when</div><div class='del'>-	connected to multiple IMAP servers. (Well, unless you're connected</div><div class='del'>-	to more than 26 servers...)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set): Fix</div><div class='del'>-	this up... it was losing count in some cases and giving a more</div><div class='del'>-	verbose answer than it needed to.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Rescue the KPOP code from bit</div><div class='del'>-	rot.</div><div class='del'>-</div><div class='del'>-2001-05-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Redo</div><div class='del'>-	command locking. Since command_lock is recursive, we can just get</div><div class='del'>-	a lock here, and release it either on error, or when the caller</div><div class='del'>-	frees the response data. (This simplifies a lot of stuff, and</div><div class='del'>-	fixes some problems with camel_imap_folder_changed being called</div><div class='del'>-	without the command_lock locked because of the 2001-03-22 change.)</div><div class='del'>-</div><div class='del'>-	(camel_imap_response_free): </div><div class='del'>-	(camel_imap_response_free_without_processing): </div><div class='del'>-	(camel_imap_response_extract): </div><div class='del'>-	(camel_imap_response_extract_continuation): These all take a</div><div class='del'>-	CamelImapStore now as well, to deal with locking.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Add</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED, which defaults to a noop, but can</div><div class='del'>-	be made to call e_mutex_assert_locked.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c, camel-imap-search.c,</div><div class='del'>-	camel-imap-store.c: Simplify using new locking stuff. Add a few</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED checks.</div><div class='del'>-</div><div class='del'>-2001-05-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Support the IMAP UIDPLUS extension (RFC 2359), which lets you</div><div class='del'>-	resync after disconnected operation more efficiently, but also</div><div class='del'>-	makes it possible to do appends and moves/copies more efficiently</div><div class='del'>-	now.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): If the</div><div class='del'>-	server supports UIDPLUS, grab the APPENDUID response and cache the</div><div class='del'>-	message into the folder's message cache.</div><div class='del'>-	(imap_copy_messages_to): Likewise, for COPYUID, copy any message</div><div class='del'>-	parts we have cached between the source and destination folder</div><div class='del'>-	caches.</div><div class='del'>-	(imap_get_message): If the entire message is already in the cache,</div><div class='del'>-	just return that rather than building it from parts.</div><div class='del'>-	(imap_update_summary): Fetch just the "UID FLAGS RFC822.SIZE" of</div><div class='del'>-	the new messages first, then only fetch the headers for messages</div><div class='del'>-	where we don't already have the headers cached.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c: Add gtk-doc comments.</div><div class='del'>-	(cache_put): Fix refcounting stuff here.</div><div class='del'>-	(camel_imap_message_cache_insert_stream,</div><div class='del'>-	camel_imap_message_cache_insert_wrapper): New.</div><div class='del'>-	(camel_imap_message_cache_get): Fix a bug here so the memory</div><div class='del'>-	caching actually works.</div><div class='del'>-	(camel_imap_message_cache_copy): New routine, used by</div><div class='del'>-	imap_copy_messages_to.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_uid_set_to_array):</div><div class='del'>-	Inverse operation of imap_uid_array_to_set. Used to parse COPYUID</div><div class='del'>-	response.</div><div class='del'>-</div><div class='del'>-2001-04-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_uid_array_to_set):</div><div class='del'>-	New-and-improved version of get_uid_set() from</div><div class='del'>-	camel-imap-folder.c. Looks at the summary as it goes so that if</div><div class='del'>-	you ask for messages 5, 6, 8, and 9, and there is no message 7,</div><div class='del'>-	then you get "5:9" instead of "5:6,8:9"</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_copy_messages_to): Use</div><div class='del'>-	imap_uid_array_to_set() rather than get_uid_set().</div><div class='del'>-	(get_uid_set): Gone</div><div class='del'>-</div><div class='del'>-2001-04-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Redo this a lot so that instead of having a</div><div class='del'>-	class full of callbacks, we have a subclassable class. Also,</div><div class='del'>-	replace the increasingly horrifying</div><div class='del'>-	camel_session_query_authenticator with three new routines,</div><div class='del'>-	camel_session_get_password, camel_session_forget_password, and</div><div class='del'>-	camel_session_alert_user.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c:</div><div class='del'>-	* camel-pkcs7-context.c:</div><div class='del'>-	* camel-smime-context.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: </div><div class='del'>-	* providers/pop3/camel-pop3-store.c: </div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: </div><div class='del'>-	Use camel_session_get_password / camel_session_forget_password.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Use</div><div class='del'>-	camel_session_alert_user.</div><div class='del'>-</div><div class='del'>-2001-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Automagically call camel_shutdown()</div><div class='del'>-	atexit() ;-)</div><div class='del'>-	(camel_init): Also initialize NSS databases as read/write for</div><div class='del'>-	S/MIME and if NSS fails to init, try initializing with volatile</div><div class='del'>-	databases.</div><div class='del'>-</div><div class='del'>-	* camel-file-utils.h: #include &lt;sys/types.h&gt; for off_t.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-file-utils.c: New file, with the int, string, time_t, and</div><div class='del'>-	off_t encode/decode routines from camel-folder-summary.c moved</div><div class='del'>-	here and renamed, for the enjoyment of non-CamelFolderSummary</div><div class='del'>-	subclasses.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Add camel-file-utils.c</div><div class='del'>-	(libcamelinclude_HEADERS): and camel-file-utils.h</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Remove functions that were moved to</div><div class='del'>-	camel-file-utils.c, update uses of them for the new names.</div><div class='del'>-	(camel_folder_summary_{en,de}code_token are still here.)</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c: Use camel_file_util_*</div><div class='del'>-	names</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Use camel_file_util_* names</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_store_setup_online,</div><div class='del'>-	imap_store_setup_offline): Use camel_file_util_* names, which</div><div class='del'>-	makes much more sense since this isn't folder summary stuff.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS (and some other</div><div class='del'>-	stuff that's redundant with EXTRA_GNOME_CFLAGS)</div><div class='del'>-	(libcamel_la_LIBADD): Replace UNICODE_LIBS with GAL_LIBS.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c: </div><div class='del'>-	* camel-pgp-context.c: </div><div class='del'>-	* camel-mime-utils.c: Use gunicode interfaces rather than</div><div class='del'>-	libunicode.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Use gunicode rather than libunicode. (The</div><div class='del'>-	charmap-regen code still depends on libunicode though.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.h: </div><div class='del'>-	* tests/message/test2.c (convert): Use iconv rather than</div><div class='del'>-	unicode_iconv.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am (libcamelsmtp_la_LIBADD): </div><div class='del'>-	* providers/pop3/Makefile.am (libcamelpop3_la_LIBADD): </div><div class='del'>-	* providers/local/Makefile.am (libcamellocal_la_LIBADD): Remove</div><div class='del'>-	UNICODE_LIBS.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Remove call to unicode_init.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Remove unused unicode.h include.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (get_host): Use e_gethostbyname_r.</div><div class='del'>-	(camel_service_gethost): Remove unused var.</div><div class='del'>-</div><div class='del'>-2001-04-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-        * Applied jacob's patches for e-poolv stuff.</div><div class='del'>-</div><div class='del'>-2001-04-23  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Add camel-vee-folder.h and camel-digest-folder.h</div><div class='del'>-</div><div class='del'>-	* camel-digest-folder.[c,h]: New class that can be used to browse</div><div class='del'>-	a multipart/digest message as if it were a CamelFolder.</div><div class='del'>-</div><div class='del'>-2001-04-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Oops, don't use the return</div><div class='del'>-	value of iconv() as a string length, it only tells us the number</div><div class='del'>-	of non-reversable character conversions. This fixes it so we</div><div class='del'>-	actually see the gpg output in the message viewer.</div><div class='del'>-</div><div class='del'>-2001-04-23  Mikael Hallendal  &lt;micke@codefactory.se&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (INCLUDES): </div><div class='del'>-	Changed GTK_INCLUDEDIR to EXTRA_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-2001-04-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-smime-context.c (smime_sign): Implemented using the</div><div class='del'>-	secmime.h convenience functions.</div><div class='del'>-	(smime_clearsign): We just error our here, there is no clearsign</div><div class='del'>-	for smime.</div><div class='del'>-	(smime_verify): Copied code over from the pkcs7 verify - same</div><div class='del'>-	state, ugly and unknown :-)</div><div class='del'>-	(smime_encrypt): Implemented using the secmime.h convenience</div><div class='del'>-	functions.</div><div class='del'>-	(smime_decrypt): Same as the code in pkcs7-context.</div><div class='del'>-</div><div class='del'>-2001-04-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pkcs7-context.c (pkcs7_sign): Implemented.</div><div class='del'>-	(pkcs7_clearsign): Implemented.</div><div class='del'>-	(get_zero_len_passwd): Convenience function to try a 0-length key</div><div class='del'>-	on the certificate db - if this works then there is no need to</div><div class='del'>-	prompt the user.</div><div class='del'>-	(get_password): Callback to get the password.</div><div class='del'>-	(camel_cipher_hash_to_nss): Convenience function to convert a</div><div class='del'>-	CamelCipherHash to an NSS HASH_HashType.</div><div class='del'>-	(nss_hash_to_sec_oid): Converts a HASH_HashType to a SecOidTag.</div><div class='del'>-	(pkcs7_digest): Digest function for use with pkcs7_sign().</div><div class='del'>-	(sign_encode_cb): Callback to write the signed data to the output</div><div class='del'>-	stream.</div><div class='del'>-	(pkcs7_verify): Hacked on a bit more but am still a bit on the</div><div class='del'>-	confused side. This might work but I wouldn't hold my breath. The</div><div class='del'>-	sign/clearsign should be close if not correct, but this one...god</div><div class='del'>-	only knows.</div><div class='del'>-	(pkcs7_decrypt): Implemented.</div><div class='del'>-	(pkcs7_encrypt): Implemented (mostly, still need to handle when</div><div class='del'>-	'sign' is TRUE).</div><div class='del'>-</div><div class='del'>-2001-04-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize):</div><div class='del'>-	Free base_url and storage_path.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (finalize): Free the</div><div class='del'>-	implementation string.</div><div class='del'>-	(camel_pop3_command): Clarify documentation to mention that</div><div class='del'>-	@ex isn't set (and *@ret is) on CAMEL_POP3_ERR.</div><div class='del'>-	(connect_to_server): Set @ex properly on CAMEL_POP3_ERR.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info,</div><div class='del'>-	pop3_get_message): Set @ex properly on CAMEL_POP3_ERR.</div><div class='del'>-</div><div class='del'>-2001-04-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pkcs7-context.[c,h]: New source files to handle Pkcs7</div><div class='del'>-	encryption, decryption, signing, and verifying. Not yet</div><div class='del'>-	complete. I'm sensing this is going to take a while seeing as how</div><div class='del'>-	NSS is just so well documented.</div><div class='del'>-</div><div class='del'>-2001-04-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): Fix</div><div class='del'>-	a memory leak in the error case.</div><div class='del'>-</div><div class='del'>-2001-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_rebuild): Don't we</div><div class='del'>-	want to tell where we are by using the start of the message? I</div><div class='del'>-	think this should be using camel_mime_parser_tell_start_from()</div><div class='del'>-	instead. Also divide by the size *before* multiplying by 100 so</div><div class='del'>-	that we don't overflow the int which was giving us negative values</div><div class='del'>-	for our progress status (oops).</div><div class='del'>-</div><div class='del'>-2001-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c: Added a prototype for stamp().</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_locale_name): #include</div><div class='del'>-	string.h so we don't get a warning about strchr being undefined</div><div class='del'>-	and also init charset to NULL.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (pgp_verify): Go back to doing the utf8</div><div class='del'>-	conversion by hand so that we don't depend on gal.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove the EXTRA_GNOME_CFLAGS include.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_mkdir_hier): Convenience function that it</div><div class='del'>-	seems a number of camel-store implementations used gal for.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (ensure_news_dir_exists): Lets</div><div class='del'>-	not depend on gal for just e_mkdir_hier() - use camel_mkdir_hier()</div><div class='del'>-	instead.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-imap-store.c: Lets not depend on gal for</div><div class='del'>-	just e_mkdir_hier() - use camel_mkdir_hier() instead.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_storage_path): Don't depend</div><div class='del'>-	on e_mkdir_heir() anymore, use the CamelStore version.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Removed gal dependency, why was this even</div><div class='del'>-	there in the first place?</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Don't need gal/util/e-util.h</div><div class='del'>-	here, so remove it.</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strstrcase): New function, well more like old</div><div class='del'>-	function brought back to life so we don't have to depend on gal.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_store_setup_online): Use</div><div class='del'>-	strstrcase rather than e_strstrcase so we don't depend on gal.</div><div class='del'>-	(get_unread_online): Same here.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): Use</div><div class='del'>-	strstrcase.</div><div class='del'>-</div><div class='del'>-2001-04-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_check_mailing_list): regex</div><div class='del'>-	doesn't set errno and regcomp returns 0 on success and any other</div><div class='del'>-	value for an error (so don't *just* check for -1).</div><div class='del'>-</div><div class='del'>-2001-04-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-cipher-context.c: Check to make sure the context is a</div><div class='del'>-	valid context in all the user functions.</div><div class='del'>-</div><div class='del'>-2001-04-13  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect):</div><div class='del'>-	s/imap_store/store/, fixing a typo that was causing the build to</div><div class='del'>-	fail.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (get_source): Make the (previously unused)</div><div class='del'>-	get-source command actually do the right thing, properly shrouding</div><div class='del'>-	any passed-in source and falling back to use the source attached</div><div class='del'>-	to the mime message.</div><div class='del'>-</div><div class='del'>-2001-04-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_hook_event):</div><div class='del'>-	* camel-uid-cache.c (camel_uid_cache_get_new_uids):</div><div class='del'>-	* camel-url.c (camel_url_new_with_base): Plug leaks.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_init): Don't</div><div class='del'>-	re-initialize the folders hash table.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Free</div><div class='del'>-	authtypes since they'll be re-read on re-connect.</div><div class='del'>-	(get_folder_info): Free folderinfos that we're discarding from the</div><div class='del'>-	list.</div><div class='del'>-</div><div class='del'>-2001-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (camel_pgp_context_get_type): Oops, lets not</div><div class='del'>-	get into a recursive call here ;-)</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp.c: Updated to reflect changes to the PGP code.</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp-mime.c: Same.</div><div class='del'>-</div><div class='del'>-2001-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c: Updated to reflect the few changes made to the</div><div class='del'>-	CamelPgpContext class.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c: Updated to subclass of CamelCipherContext.</div><div class='del'>-</div><div class='del'>-	* camel-cipher-context.[c,h]: New base class for</div><div class='del'>-	CamelPgpContext. Also contains the replacement for</div><div class='del'>-	CamelPgpValidity, CamelCipherValidity.</div><div class='del'>-</div><div class='del'>-2001-04-12  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Fix a pair of array bounds</div><div class='del'>-	reads noted by purify</div><div class='del'>-</div><div class='del'>-2001-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: #include the pgp stuff.</div><div class='del'>-</div><div class='del'>-2001-04-12  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_remove): </div><div class='del'>-	* camel-url.c (camel_url_to_string): Plug memory leaks.</div><div class='del'>-</div><div class='del'>-2001-04-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic):</div><div class='del'>-	Simplify peterw's imap_is_atom_char fix.</div><div class='del'>-</div><div class='del'>-2001-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/smime/Makefile.am: Added pgp-mime.c to the tests.</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp-mime.c: Test suite for camel-pgp-mime.c functions.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add camel-pgp-mime.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c: Made a number of fixes to get it to compile</div><div class='del'>-	and also fixed a few logic errors (mostly forgetting to reset</div><div class='del'>-	streams) so that it worked (thanks to the pgp-mime test program).</div><div class='del'>-</div><div class='del'>-2001-04-11  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: user GNOME_INCLUDEDIR since gnome</div><div class='del'>-	files are included in the top level camel headers and the gtk</div><div class='del'>-	include dir is now versioned and such</div><div class='del'>-</div><div class='del'>-	* providers/local/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/Makefile.am: ditto</div><div class='del'>-</div><div class='del'>-	* camel-service.c: use five arg version of gethostbyname_r if</div><div class='del'>-	appropriate</div><div class='del'>-	(camel_get_host_byname): check if msg-&gt;herr is non-zero instead of</div><div class='del'>-	checking if msg-&gt;hp is null since we may not always have msg-&gt;hp</div><div class='del'>-</div><div class='del'>-2001-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_response): Use</div><div class='del'>-	camel_charset_locale_name() to get the locale charset rather than</div><div class='del'>-	checking the CHARSET environment variable. This is a much less</div><div class='del'>-	ugly hack. Also: If we fail to be able to convert to UTF8, then</div><div class='del'>-	disavow all knowledge of the charset parameter.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_locale_name): New function to</div><div class='del'>-	return the locale charset (or NULL if US-ASCII).</div><div class='del'>-</div><div class='del'>-2001-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (camel_pgp_verify): Use</div><div class='del'>-	e_utf8_from_locale_string() rather than trying to do it manually</div><div class='del'>-	since Lauris's version works much better.</div><div class='del'>-</div><div class='del'>-2001-04-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-pgp-context.[c,h] to the build. Also</div><div class='del'>-	added tests/smime/pgp.c and Makefile.am</div><div class='del'>-</div><div class='del'>-	* tests/smime/pgp.c: New test suite for PGP functions.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c: Various fixes to get it to build.</div><div class='del'>-</div><div class='del'>-2001-04-07  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_string_generic): It</div><div class='del'>-	would be a good idea to recognize '\0'. Before, this code was running</div><div class='del'>-	off the ends of strings and intermittently coredumping (if it didn't</div><div class='del'>-	hit an imap_atom_char first) -- whoops!</div><div class='del'>-</div><div class='del'>-2001-04-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* merge from evolution-0-10-branch to evolution-0-10-merge-0</div><div class='del'>-</div><div class='del'>-2001-04-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added tests/ back in</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): Ignore whitespace</div><div class='del'>-	between encoded words (there were a few cases where it didn't</div><div class='del'>-	before).</div><div class='del'>-	(header_encode_string): Preserve whitespace between words that are</div><div class='del'>-	to be encoded by encoding them too.</div><div class='del'>-	(header_encode_phrase): Same here but with phrases.</div><div class='del'>-</div><div class='del'>-2001-04-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): If we don't</div><div class='del'>-	change any flags or expunge, send a NOOP to give the server a</div><div class='del'>-	chance to send EXISTS, etc, messages.</div><div class='del'>-	(imap_get_message): If the server_level &lt; IMAP4rev1, always fetch</div><div class='del'>-	messages all-at-once, since they don't support the [#.MIME]</div><div class='del'>-	syntax.</div><div class='del'>-	(imap_update_summary): When reading message flags, set the</div><div class='del'>-	server_flags field as well, and don't overwrite any flags set by</div><div class='del'>-	camel_folder_summary_info_new_from_message. Might help with some</div><div class='del'>-	of the flag problems...</div><div class='del'>-</div><div class='del'>-2001-04-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.h: Remove the "quick_login" member, which is</div><div class='del'>-	unnecessary.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Remove the</div><div class='del'>-	references to quick_login and fix this to use the CamelSasl</div><div class='del'>-	interfaces correctly to do the same thing.</div><div class='del'>-	(connect_to_server): Split this out of smtp_connect</div><div class='del'>-	(smtp_connect): Use connect_to_server. When re-EHLO'ing after</div><div class='del'>-	auth, ignore errors.</div><div class='del'>-	(query_auth_types): Use connect_to_server rather than</div><div class='del'>-	smtp_connect, so it doesn't try to authenticate. Add LOGIN</div><div class='del'>-	authtype to the list of authtypes to check for.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c</div><div class='del'>-	(camel_provider_module_init): Add LOGIN authtype to the authtypes</div><div class='del'>-	list explicitly.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_authtype_list): Don't list LOGIN here:</div><div class='del'>-	it's not a real SASL authtype and is only used for SMTP.</div><div class='del'>-	</div><div class='del'>-	* camel-sasl-plain.c: </div><div class='del'>-	* camel-sasl-login.c: </div><div class='del'>-	* camel-sasl-kerberos4.c: </div><div class='del'>-	* camel-sasl-cram-md5.c: </div><div class='del'>-	* camel-sasl-anonymous.c: </div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Remove "quick_login"</div><div class='del'>-	argument from authtypes.</div><div class='del'>-</div><div class='del'>-2001-04-02  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c: marked missing report status' for translation.</div><div class='del'>-</div><div class='del'>-2001-04-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c (camel_pgp_sign): mutex lock &amp; unlock the</div><div class='del'>-	context.</div><div class='del'>-	(camel_pgp_clearsign): Same.</div><div class='del'>-	(camel_pgp_verify): Same.</div><div class='del'>-	(camel_pgp_encrypt): Same.</div><div class='del'>-	(camel_pgp_decrypt): And finally here...</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.h: Update the function prototypes to match</div><div class='del'>-	those found in camel-pgp-context.c.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.c: Updated.</div><div class='del'>-</div><div class='del'>-	* camel-pgp-mime.c (camel_pgp_mime_part_sign): Implemented.</div><div class='del'>-	(camel_pgp_mime_part_verify): Implemented.</div><div class='del'>-	(camel_pgp_mime_part_encrypt): Implemented.</div><div class='del'>-	(camel_pgp_mime_part_decrypt): Implemented.</div><div class='del'>-</div><div class='del'>-2001-04-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-login.[c,h]: New files to handle the LOGIN SASL</div><div class='del'>-	mechanism.</div><div class='del'>-	</div><div class='del'>-	* camel-sasl-plain.c: Removed the definition of</div><div class='del'>-	camel_sasl_login_authtype.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_new): Oops. I thought LOGIN was an</div><div class='del'>-	alias to PLAIN. I was wrong. These two SASL objects have to be</div><div class='del'>-	separate.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Updated to</div><div class='del'>-	check for and use authmech-&gt;quick_login when available.</div><div class='del'>-</div><div class='del'>-2001-04-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Updated the authtypes here</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.c: </div><div class='del'>-	* camel-sasl-anonymous.c: </div><div class='del'>-	* camel-sasl-digest-md5.c: </div><div class='del'>-	* camel-sasl-cram-md5.c: </div><div class='del'>-	* camel-sasl-kerberos4.c: Updated the authtype values.</div><div class='del'>-</div><div class='del'>-	* camel-service.h: Added another field to CamelServiceAuthType</div><div class='del'>-	that specifies whether or not the mechanism supports "quick auth"</div><div class='del'>-	which means that the client can send the initial challenge in the</div><div class='del'>-	AUTH request.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_new): Add support for LOGIN.</div><div class='del'>-	(camel_sasl_authtype_list): Here too.</div><div class='del'>-	(camel_sasl_authtype): And finally here.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.c: Define camel_sasl_login_authtype.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_auth): Only unref</div><div class='del'>-	the SASL object if it exists.</div><div class='del'>-</div><div class='del'>-2001-03-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server,</div><div class='del'>-	query_auth_types, pop3_connect): Move things around here to make</div><div class='del'>-	this all work right again (so you don't get prompted for a</div><div class='del'>-	password when checking the supported authtypes.)</div><div class='del'>-</div><div class='del'>-2001-03-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_source): Shrould</div><div class='del'>-	our source URL before putting it into X-Evolution-Source.</div><div class='del'>-</div><div class='del'>-2001-03-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Don't</div><div class='del'>-	blindly append "/INBOX", construct a CamelURL and set the path</div><div class='del'>-	that way.</div><div class='del'>-	(parse_list_response_as_folder_info): Don't blindly append</div><div class='del'>-	"/&lt;foldername&gt;", construct a CamelURL and set the path that way</div><div class='del'>-	instead.</div><div class='del'>-	(get_folders_offline): And again here.</div><div class='del'>-</div><div class='del'>-2001-03-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_get_host_byname): Dont overwrite an</div><div class='del'>-	exception if we got one already.  Added camel_operation status to</div><div class='del'>-	it, and comment out some debug.</div><div class='del'>-</div><div class='del'>-2001-03-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Free host</div><div class='del'>-	name info when done ... blah blah.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-kerberos4.c (krb4_challenge): Free host name info</div><div class='del'>-	after we're done with it.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_md5_challenge): Free host name</div><div class='del'>-	info after we're done with it.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Free the host name info</div><div class='del'>-	from get_host after we're finished with it.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_get_host_byname): New function to</div><div class='del'>-	lookup a name, and still be cancellable.</div><div class='del'>-	(camel_free_host): And a function to free the structure</div><div class='del'>-	returned.</div><div class='del'>-	(camel_service_gethost): Call get_host_byname for this.</div><div class='del'>-</div><div class='del'>-2001-03-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): Save</div><div class='del'>-	the source URL using camel_mime_message_set_source.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_source): Renamed</div><div class='del'>-	camel_mime_message_set_identity to this.  Sets the X-Evolution-Source</div><div class='del'>-	header.</div><div class='del'>-	(camel_mime_message_get_source): Returns the X-Evolution-Source</div><div class='del'>-	header.</div><div class='del'>-</div><div class='del'>-2001-03-29  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* broken-date-parser.c: #include &lt;stdio.h&gt;, &lt;stdlib.h&gt; and &lt;string.h&gt;</div><div class='del'>-	* broken-date-parser.h: Remove all includes but &lt;glib.h&gt;</div><div class='del'>-	* camel-address.h: Added #include &lt;glib.h&gt;</div><div class='del'>-	* camel-data-wrapper.c: Move system includes to the top.</div><div class='del'>-	* camel-data-wrapper.h: #include &lt;glib.h&gt;</div><div class='del'>-	* camel-exception.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-exception.h: Remove #include &lt;glib.h&gt;</div><div class='del'>-	* camel-filter-driver.c: #ifdef HAVE_CONFIG_H and move system</div><div class='del'>-	headers to top. Mark strings in camel_exception_set*() for i18n.</div><div class='del'>-	* camel-filter-driver.h: #include &lt;glib.h&gt;</div><div class='del'>-	* camel-filter-search.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-folder-search.c: #include &lt;config.h&gt;</div><div class='del'>-	* camel-folder-search.h: Header shuffling</div><div class='del'>-	* camel-folder-summary.h: Same here</div><div class='del'>-	* camel-folder-thread.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-folder.c: Here too.</div><div class='del'>-	* camel-folder.h: #include &lt;glib.h&gt;</div><div class='del'>-	* camel-internet-address.c: Move system headers up</div><div class='del'>-	* camel-lock.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-medium.c: Same here</div><div class='del'>-	* camel-mime-filter-bestenc.c: Move system headers up</div><div class='del'>-	* camel-mime-filter-from.c: Same here</div><div class='del'>-	* camel-mime-filter-linewrap.c: And here</div><div class='del'>-	* camel-mime-filter.c: #include &lt;string.h&gt; to fix warnings from new gcc</div><div class='del'>-	* camel-mime-filter.h: System headers moved up</div><div class='del'>-	* camel-mime-message.c: Here too. #ifdef HAVE_CONFIG_H added</div><div class='del'>-	* camel-mime-part-utils.c: #ifdef HAVE_CONFIG_H added</div><div class='del'>-	* camel-mime-part.c: Here too, and shuffle headers</div><div class='del'>-	* camel-mime-utils.c: #ifdef HAVE_CONFIG_H. Remove const from two</div><div class='del'>-	variables to remove warning.</div><div class='del'>-	* camel-mime-utils.h: Shuffle headers</div><div class='del'>-	* camel-movemail.c: #ifdef HAVE_CONFIG_H. Mark string in camel_exception_set</div><div class='del'>-	* camel-multipart.c: #ifdef HAVE_CONFIG_H. Added includes to remove</div><div class='del'>-	warnings from new gcc</div><div class='del'>-	* camel-object.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-object.h: Shuffle headers</div><div class='del'>-	* camel-operation.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-provider.c: #ifdef HAVE_CONFIG_H. Shuffle headers. Mark a string</div><div class='del'>-	* camel-remote-store.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-sasl-anonymous.c: #ifdef HAVE_CONFIG_H. #include &lt;string.h&gt;</div><div class='del'>-	* camel-sasl-cram-md5.c: #ifdef HAVE_CONFIG_H. #include &lt;string.h&gt; and</div><div class='del'>-	&lt;stdio.h&gt; to remove warnings.</div><div class='del'>-	* camel-sasl-digest-md5.c: #ifdef HAVE_CONFIG_H. shuffle headers</div><div class='del'>-	* camel-sasl-digest-md5.h: Shuffle headers.</div><div class='del'>-	* camel-sasl-kerberos4.c: #ifdef HAVE_CONFIG_H. Shuffle headers.</div><div class='del'>-	* camel-sasl-kerberos4.h: Shuffle headers.</div><div class='del'>-	* camel-sasl-plain.c: #ifdef HAVE_CONFIG_H. Shuffle</div><div class='del'>-	* camel-sasl.c: #ifdef HAVE_CONFIG_H. #include &lt;string.h&gt;</div><div class='del'>-	* camel-search-private.c: #include &lt;config.h&gt;</div><div class='del'>-	* camel-seekable-stream.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-seekable-stream.h: Shuffle</div><div class='del'>-	* camel-seekable-substream.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-service.c: Same</div><div class='del'>-	* camel-service.h: Shuffle</div><div class='del'>-	* camel-session.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-store.c: Same</div><div class='del'>-	* camel-stream-buffer.c: Here too</div><div class='del'>-	* camel-stream-buffer.h: Shuffle</div><div class='del'>-	* camel-stream-filter.c: #include &lt;string.h&gt;</div><div class='del'>-	* camel-stream-fs.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-stream-fs.h: Shuffle headers</div><div class='del'>-	* camel-stream-mem.c: Same as above</div><div class='del'>-	* camel-stream-mem.h: Here too</div><div class='del'>-	* camel-stream-null.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-stream.c: Here too</div><div class='del'>-	* camel-stream.h: Shuffle</div><div class='del'>-	* camel-tcp-stream-openssl.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-tcp-stream-raw.c: Same here. and move local includes down</div><div class='del'>-	* camel-tcp-stream-ssl.c: Same as above</div><div class='del'>-	* camel-tcp-stream.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-tcp-stream.h: move local include down</div><div class='del'>-	* camel-transport.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-transport.h: #include &lt;glib.h&gt;</div><div class='del'>-	* camel-uid-cache.c: #ifdef HAVE_CONFIG_H. Shuffle headers</div><div class='del'>-	* camel-uid-cache.h: Shuffle</div><div class='del'>-	* camel-url.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* camel-vee-folder.c: #ifdef HAVE_CONFIG_H. Shuffle headers</div><div class='del'>-	* camel-vee-folder.h: #include &lt;glib.h&gt;</div><div class='del'>-	* camel-vee-store.h: Same here</div><div class='del'>-	* camel.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* gstring-util.c: Here too</div><div class='del'>-	* hash-table-utils.c: Remove #include &lt;glib.h&gt;</div><div class='del'>-	* hash-table-utils.h: #include it here instead.</div><div class='del'>-	* string-utils.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/cache/camel-cache-map.c: #ifdef HAVE_CONFIG_H, shuffle</div><div class='del'>-	headers and mark strings in camel_exception_set*()</div><div class='del'>-	* providers/cache/camel-cache-provider.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/cache/camel-cache-store.c: Same here, and mark a string.</div><div class='del'>-	* providers/imap/camel-imap-command.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/imap/camel-imap-command.h: Shuffle header</div><div class='del'>-	* providers/imap/camel-imap-folder.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/imap/camel-imap-provider.c: #ifdef HAVE_CONFIG_H and</div><div class='del'>-	#include &lt;string.h&gt;</div><div class='del'>-	* providers/imap/camel-imap-search.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/imap/camel-imap-store.c: #ifdef HAVE_CONFIG_H and mark</div><div class='del'>-	a string.</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Shuffle headers</div><div class='del'>-	* providers/imap/camel-imap-wrapper.c: #ifdef HAVE_CONFIG_H. Shuffle</div><div class='del'>-	* providers/local/camel-local-folder.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/local/camel-local-provider.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/local/camel-local-store.c: Same here</div><div class='del'>-	* providers/local/camel-local-summary.c: Here too, shuffle, mark a string</div><div class='del'>-	* providers/local/camel-maildir-folder.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/local/camel-maildir-store.c: Same</div><div class='del'>-	* providers/local/camel-maildir-summary.c: Here too</div><div class='del'>-	* providers/local/camel-mbox-summary.c: And here</div><div class='del'>-	* providers/local/camel-mbox-store.c: And here</div><div class='del'>-	* providers/local/camel-mbox-summary.c: #include &lt;config.h&gt;</div><div class='del'>-	* providers/local/camel-mh-folder.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/local/camel-mh-store.c: same</div><div class='del'>-	* providers/local/camel-mh-summary.c: #ifdef HAVE_CONFIG_H, shuffle headers</div><div class='del'>-	and mark a string for translation.</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c: #include &lt;config.h&gt;</div><div class='del'>-	* providers/nntp/camel-nntp-store.c: Remove superfluous arg to </div><div class='del'>-	CAMEL_SERVICE_CLASS to make it compile</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: #ifdef HAVE_CONFIG_H</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Same here</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: Here too</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c: Here too</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Same</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: #ifdef HAVE_CONFIG_H, mark</div><div class='del'>-	strings for translations.</div><div class='del'>-	</div><div class='del'>-2001-03-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): change "gboolean show_passwd"</div><div class='del'>-	to "guint32 flags".</div><div class='del'>-</div><div class='del'>-	* tests/misc/url.c (main): Update calls to camel_url_to_string</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (construct): Call</div><div class='del'>-	camel_url_to_string with flags to hide password, authtype, and</div><div class='del'>-	params to create the base_url.</div><div class='del'>-	(etc): Update for the fact that the base_url no longer has the "/"</div><div class='del'>-	at the end.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (construct): Update calls to camel_url_to_string</div><div class='del'>-	(pass CAMEL_URL_HIDE_PASSWORD)</div><div class='del'>-</div><div class='del'>-2001-04-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): Ignore whitespace</div><div class='del'>-	between encoded words (there were a few cases where it didn't</div><div class='del'>-	before).</div><div class='del'>-	(header_encode_string): Preserve whitespace between words that are</div><div class='del'>-	to be encoded by encoding them too.</div><div class='del'>-	(header_encode_phrase): Same here but with phrases.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c: Added #include &lt;config.h&gt;. Marked</div><div class='del'>-	a bunch of strings for translation.</div><div class='del'>-	* camel-folder-search.c: Added #include &lt;config.h&gt;.</div><div class='del'>-	* camel-folder-summary.c: Same here.</div><div class='del'>-	* camel-movemail.c: Marked strings for translation.</div><div class='del'>-	* camel-provider.c: Same here.</div><div class='del'>-	* camel-search-private.c: #include &lt;config.h&gt;</div><div class='del'>-	* camel-vee-folder.c: Mark string for translation.</div><div class='del'>-	* providers/local/camel-mbox-summary.c: #include &lt;config.h&gt;</div><div class='del'>-	</div><div class='del'>-2001-04-03  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): If we don't</div><div class='del'>-	change any flags or expunge, send a NOOP to give the server a</div><div class='del'>-	chance to send EXISTS, etc, messages.</div><div class='del'>-	(imap_get_message): If the server_level &lt; IMAP4rev1, always fetch</div><div class='del'>-	messages all-at-once, since they don't support the [#.MIME]</div><div class='del'>-	syntax.</div><div class='del'>-</div><div class='del'>-2001-04-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Don't</div><div class='del'>-	blindly append "/INBOX", construct a CamelURL and set the path</div><div class='del'>-	that way.</div><div class='del'>-	(parse_list_response_as_folder_info): Don't blindly append</div><div class='del'>-	"/&lt;foldername&gt;", construct a CamelURL and set the path that way</div><div class='del'>-	instead.</div><div class='del'>-	(get_folders_offline): And again here.</div><div class='del'>-</div><div class='del'>-2001-03-31  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (struct _status_stack): change stamp to</div><div class='del'>-	unsigned to avoid overflow.</div><div class='del'>-	(camel_operation_end):</div><div class='del'>-	(camel_operation_progress_count):</div><div class='del'>-	(camel_operation_progress): Double the delay before transient</div><div class='del'>-	events start showing their own progress.</div><div class='del'>-</div><div class='del'>-2001-03-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message): Change</div><div class='del'>-	the pop download into a transient event.</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (stamp): Get a timestamp that changes 4x a</div><div class='del'>-	second (or rather, arbitrarily more often than 1/second).</div><div class='del'>-	(camel_operation_progress): Use stamp() for time updates.</div><div class='del'>-	(camel_operation_progress_count): "</div><div class='del'>-	(camel_operation_start): Store the status as a struct status_stack</div><div class='del'>-	item.</div><div class='del'>-	(camel_operation_start_transient): New function to start a</div><div class='del'>-	transient event, which is only reported if it runs for too</div><div class='del'>-	long/and is reset afterwards.</div><div class='del'>-	(camel_operation_progress):</div><div class='del'>-	(camel_operation_progress_count): Fix for status_stack changes,</div><div class='del'>-	and account for transient updates. </div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): When</div><div class='del'>-	we remove things (set deleted), always set seen too, to mirror</div><div class='del'>-	interface behaviour when you delete.</div><div class='del'>-	(camel_filter_driver_filter_message): And same here too.</div><div class='del'>-</div><div class='del'>-2001-03-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server,</div><div class='del'>-	query_auth_types, pop3_connect): Move things around here to make</div><div class='del'>-	this all work right again (so you don't get prompted for a</div><div class='del'>-	password when checking the supported authtypes.)</div><div class='del'>-</div><div class='del'>-2001-03-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): change "gboolean show_passwd"</div><div class='del'>-	to "guint32 flags".</div><div class='del'>-</div><div class='del'>-	* tests/misc/url.c (main): Update calls to camel_url_to_string</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (construct): Call</div><div class='del'>-	camel_url_to_string with flags to hide password, authtype, and</div><div class='del'>-	params to create the base_url.</div><div class='del'>-	(etc): Update for the fact that the base_url no longer has the "/"</div><div class='del'>-	at the end.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (construct): Update calls to camel_url_to_string</div><div class='del'>-	(pass CAMEL_URL_HIDE_PASSWORD)</div><div class='del'>-</div><div class='del'>-2001-03-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-pgp-context.[c,h]: New class for PGP encrypting,</div><div class='del'>-	decrypting, signing and verifying. Next I'll be moving the</div><div class='del'>-	contents of mail/mail-crypto into Camel. These files will</div><div class='del'>-	basically replace mail/openpgp-utils.[c,h].</div><div class='del'>-</div><div class='del'>-2001-03-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_body_contains): Optimise the match</div><div class='del'>-	"" case, just match everything in the folder (if we have it).</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.c (vtrash_move_messages_to): Access the</div><div class='del'>-	folder directly from the message info.</div><div class='del'>-	(vtrash_move_messages_to): I think we also need to call the real</div><div class='del'>-	move_messages_to, and not try and bypass the lock, since we dont</div><div class='del'>-	have the lock for that folder.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.h: Move CamelVeeMessageInfo to public, so</div><div class='del'>-	subclasses can get to it.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_add_folder): Dont let you</div><div class='del'>-	add a vfolder to itself.</div><div class='del'>-	(folder_changed): </div><div class='del'>-	(vee_folder_remove_folder): </div><div class='del'>-	(vee_folder_build_folder): Copy changes before triggering changed</div><div class='del'>-	events, so we can do them outside of locks.</div><div class='del'>-	(camel_vee_folder_get_message_folder): Removed function.</div><div class='del'>-	(camel_vee_folder_hash_folder): Made public (renamed from</div><div class='del'>-	hash_folder), simply for subclasses (probably not needed).</div><div class='del'>-	(vee_expunge): Oops, call the class sync, not superclass sync.</div><div class='del'>-	(vee_sync): Remove some accidental debug.</div><div class='del'>-</div><div class='del'>-2001-03-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (get_path): Add the port (if user defined) to</div><div class='del'>-	the path to fix bug #1996.</div><div class='del'>-</div><div class='del'>-	Danw: I'm iffy on the "fix" so I'd like you to comment.</div><div class='del'>-</div><div class='del'>-2001-03-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_sync): If we aren't</div><div class='del'>-	going to even check the resp/free buffer that gets returned from</div><div class='del'>-	camel_pop3_command, don't even bother using it. Send in NULL</div><div class='del'>-	instead.</div><div class='del'>-	(pop3_get_message): Check to make sure that the `result' string is</div><div class='del'>-	non-NULL. It's possible that some POP servers may return with</div><div class='del'>-	"+OK\r\n&lt;message&gt;..." rather than the expected </div><div class='del'>-	"+OK ### octets\r\n&lt;message&gt;..."</div><div class='del'>-</div><div class='del'>-2001-03-27  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalize): Unref</div><div class='del'>-	the html filter when done.</div><div class='del'>-	(summary_build_content_info): Disable using the html parser to</div><div class='del'>-	help index html mails until it gets sorted out.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (folder_changed): Fix a cut n paste bug, we</div><div class='del'>-	want uid_removed not uid_changed deref, fixes bug #1999.</div><div class='del'>-</div><div class='del'>-2001-03-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_authtype_list): add an argument to say</div><div class='del'>-	whether or not you want "PLAIN" in the list (so you don't end up</div><div class='del'>-	with "Password" twice in the config dialog).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c (camel_provider_module_init): </div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): We don't</div><div class='del'>-	want PLAIN.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c (camel_provider_module_init): </div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types): But we</div><div class='del'>-	do.</div><div class='del'>-</div><div class='del'>-2001-03-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add an "extra_conf" field to CamelProvider</div><div class='del'>-	with structures and defines and stuff, for providers to specify</div><div class='del'>-	additional configuration options that they want. Also add a</div><div class='del'>-	"supports ssl" flag to the provider flags.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_new_with_base): Fix parsing of params.</div><div class='del'>-	(output_param): And unparsing...</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c: add a "default_ssl_port" field.</div><div class='del'>-	(remote_construct): If the URL has the "use_ssl" parameter, set</div><div class='del'>-	the store's use_ssl flag.</div><div class='del'>-	(remote_connect): If using SSL and no port specified, use the</div><div class='del'>-	default_ssl_port rather than the default_port.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c (smtp_provider): add</div><div class='del'>-	CAMEL_PROVIDER_SUPPORTS_SSL and CAMEL_URL_ALLOW_USER. (The config</div><div class='del'>-	gui code knows that the ALLOW_USER and ALLOW_AUTH go together.)</div><div class='del'>-	(ssmtp_provider): gone</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_construct): Set a</div><div class='del'>-	flag if "use_ssl" param is set.</div><div class='del'>-	(smtp_connect): Check the CamelSmtpTransport use_ssl flag rather</div><div class='del'>-	than checking if this is smtp or ssmtp.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c (imap_conf_entries): Add a</div><div class='del'>-	bunch of IMAP-specific configuration options, like "check for new</div><div class='del'>-	mail in all folders" (default TRUE), "show only subscribed</div><div class='del'>-	folders" (default TRUE), "ignore server-supplied namespace", and</div><div class='del'>-	"apply filters to INBOX" (not yet implemented).</div><div class='del'>-	(imap_provider): We support SSL and we no longer allow a path in</div><div class='del'>-	the URL. (namespace is handled via extra_conf)</div><div class='del'>-	(simap_provider): Gone</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Set</div><div class='del'>-	default_ssl_port, don't set CAMEL_STORE_SUBSCRIPTIONS here</div><div class='del'>-	(construct): remove simap stuff, deal with "use_lsub",</div><div class='del'>-	"namespace", "check_all", and "filter" parameters. Set base_url</div><div class='del'>-	to not include params.</div><div class='del'>-	(imap_store_setup_online): Don't ask for the namespace if it was</div><div class='del'>-	set explicitly. Don't get subscribed folders if !use_lsub.</div><div class='del'>-	(imap_concat): Fix a bug.</div><div class='del'>-	(get_folder_info): Support for not checking all folders.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Rewrite</div><div class='del'>-	to use imap_store-&gt;namespace, not service-&gt;url-&gt;path</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c (pop3_conf_entries): "keep</div><div class='del'>-	on server" (currently still implemented by the mailer code, not</div><div class='del'>-	here), "delete after N days" (not yet implemented).</div><div class='del'>-	(pop3_provider): we support SSL</div><div class='del'>-	(spop_provider): gone</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Set</div><div class='del'>-	default_ssl_port</div><div class='del'>-	(pop3_connect): Remove spop code</div><div class='del'>-</div><div class='del'>-2001-03-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_construct): Move all of the</div><div class='del'>-	camel_vee_folder_construct() internals here.</div><div class='del'>-	(camel_vee_folder_construct): This function basically becomes a</div><div class='del'>-	wrapper for vee_folder_construct and also checks to make sure that</div><div class='del'>-	the UNMATCHED vfodler is constructed otherwise constructs it.</div><div class='del'>-	(camel_vee_folder_new): Call vee_folder_construct() instead so</div><div class='del'>-	that we don't get into a dead-lock.</div><div class='del'>-</div><div class='del'>-2001-03-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (init_trash): Use camel_vtrash_folder_new() to</div><div class='del'>-	create the vtrash folder now.</div><div class='del'>-</div><div class='del'>-	* camel-vtrash-folder.[c,h]: New subclass of CamelVeeFolder for</div><div class='del'>-	our vTrash folders.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_messages_to): Don't watch for</div><div class='del'>-	vtrash folders anymore.</div><div class='del'>-	(camel_folder_move_messages_to): Same.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_class_init): Update.</div><div class='del'>-	(vee_move_messages_to): Rewrite to use the new move API.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_copy): Updated to reflect</div><div class='del'>-	copy_message_to changes. Create a temporary uid array and use</div><div class='del'>-	that.</div><div class='del'>-	(do_move): Same.</div><div class='del'>-	(camel_filter_driver_filter_message): And again, here...</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_copy_messages_to):</div><div class='del'>-	Update to the new API.</div><div class='del'>-	(imap_move_messages_to): Same.</div><div class='del'>-	(get_uid_set): New function to create a `set' string based on an</div><div class='del'>-	array of UIDs for use with imap_copy_messages_to.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_messages_to): Replaces</div><div class='del'>-	camel_folder_copy_message_to</div><div class='del'>-	(camel_folder_move_message_to): Replaces</div><div class='del'>-	camel_folder_move_message_to.</div><div class='del'>-</div><div class='del'>-2001-03-27  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_get_folder): Added folder_created event</div><div class='del'>-	here.</div><div class='del'>-	</div><div class='del'>-	* camel-vee-folder.c (unmatched_finalise): Removed, moved into</div><div class='del'>-	main finalise code.</div><div class='del'>-	(message_changed): Just create a new change entry and promote it</div><div class='del'>-	to a folder_changed thing.</div><div class='del'>-	(vee_sync): Always rebuild folder on sync, even when not expunge.</div><div class='del'>-	(folder_changed): If not autoupdating, make sure we remove any</div><div class='del'>-	removed entries.</div><div class='del'>-	(vee_folder_build_folder):</div><div class='del'>-	(vee_folder_remove_folder): NOP if we're called on</div><div class='del'>-	folder_unmatched.</div><div class='del'>-	(vee_search_by_expression): Only search each folder once.  Should</div><div class='del'>-	we also order the result in summary order?</div><div class='del'>-</div><div class='del'>-2001-03-20  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (init_trash): Fix calling for vee_folder_new().</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_remove_index):</div><div class='del'>-	Optimise slightly, use ptr_array_remove_index rather than have to</div><div class='del'>-	search for the index by using summary_remove.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.h: Removed local member from VeeFolder, since</div><div class='del'>-	it was never used.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (camel_vee_store_finalise): Setup finalise</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_set_expression): New</div><div class='del'>-	function to set the query of an existing vfolder.</div><div class='del'>-	(camel_vee_folder_construct): New function for</div><div class='del'>-	convenience/subclasses.</div><div class='del'>-	(camel_vee_folder_new): Removed exception parameter, no longer</div><div class='del'>-	needed (since we dont search yet).</div><div class='del'>-	(camel_vee_folder_new): Changed to use folder_construct, and no</div><div class='del'>-	longer raise the folder created signal.</div><div class='del'>-	(vee_folder_build_folder): Make it return error on exception, so</div><div class='del'>-	we can work without exceptions.</div><div class='del'>-	(vee_folder_remove_folder): Use remove index rather than</div><div class='del'>-	remove_uid, this is ok since we have the summary locked for our</div><div class='del'>-	own access.</div><div class='del'>-	(camel_vee_folder_add_folder): Only add the folder to the</div><div class='del'>-	unmatched private if it is not a private folder.</div><div class='del'>-	(camel_vee_folder_remove_folder): Only remove the folder from</div><div class='del'>-	unmatched if it is not private.</div><div class='del'>-	(vee_expunge): Just call sync with expunge set.</div><div class='del'>-	(vee_sync): If expunging, also refresh the search.</div><div class='del'>-	(vee_folder_build_folder): We do our own locking now, removed from</div><div class='del'>-	callers, also trigger changed events here too (within locks),</div><div class='del'>-	fixed callers appropriately.</div><div class='del'>-	(vee_folder_remove_folder): Do our own locking, and trigger</div><div class='del'>-	changed events.</div><div class='del'>-	(vee_folder_add_info): Renamed of vee_folder_add, we now take a</div><div class='del'>-	hash of the folder name, rather than use the folders address.</div><div class='del'>-	(hash_folder): Convert a folder name into an 8 character hash.</div><div class='del'>-	(vee_get_message, vee_search_by_expression, vee_set_message_flags,</div><div class='del'>-	vee_set_message_user_flag, vee_move_message_to): Changed the uid</div><div class='del'>-	to be an 8 byte hash + original uid, with no ':' anymore.</div><div class='del'>-</div><div class='del'>-2001-03-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): When writing the last</div><div class='del'>-	token (if not rfc2047 encoded), don't use g_string_append_len, use</div><div class='del'>-	append_latin1.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (write_to_stream): Don't spew a warning if</div><div class='del'>-	the message-id wasn't set by the application, not a big deal since</div><div class='del'>-	we create one right here.</div><div class='del'>-</div><div class='del'>-2001-03-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): keep a</div><div class='del'>-	reference on the store's current_folder.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize): </div><div class='del'>-	(imap_disconnect): unref the current_folder before clearing it.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_get_param): Add missing accessor.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_provider): New. Return</div><div class='del'>-	the provider for a URL.</div><div class='del'>-</div><div class='del'>-2001-03-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_new_with_base): New URL parser with full</div><div class='del'>-	RFC1808 relative URL support. Yum.</div><div class='del'>-	(camel_url_new): Wrapper around camel_url_new_with_base now.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: add misc subdir</div><div class='del'>-</div><div class='del'>-	* tests/misc/url.c: relative URL test cases from RFC 1808</div><div class='del'>-</div><div class='del'>-2001-03-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (do_copy): Don't use copy_to if the source</div><div class='del'>-	folder doesn't support summary info's.</div><div class='del'>-	(do_move): Same.</div><div class='del'>-	(camel_filter_driver_filter_message): And again here.  I think</div><div class='del'>-	this will fix the problem of "colour" tags not staying with the</div><div class='del'>-	message when it's copied to a folder during the filter process.</div><div class='del'>-</div><div class='del'>-2001-03-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (digest_response): Do charset conversion</div><div class='del'>-	on the username param here if needed.</div><div class='del'>-	(parse_server_challenge): Protect against possibly empty-string</div><div class='del'>-	charset values.</div><div class='del'>-</div><div class='del'>-2001-03-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Don't call camel_mime_message_set_identity.  (The call is</div><div class='del'>-	commented out, left over from some earlier experimentation that I</div><div class='del'>-	want to be able to remember later...)</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_identity): Added.</div><div class='del'>-	A function to set the X-Evolution-Identity header.</div><div class='del'>-	</div><div class='del'>-2001-03-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_response): Don't</div><div class='del'>-	look at untagged responses other than "* BYE"...</div><div class='del'>-	(camel_imap_response_free): ...do it here instead...</div><div class='del'>-	(camel_imap_response_free_without_processing): ...but not here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	Remove the "EXISTS" line from the response so</div><div class='del'>-	camel_imap_response_free won't try to process it.</div><div class='del'>-	(camel_imap_folder_selected): If we get an EXISTS response mixed</div><div class='del'>-	in with the FETCH responses, record the new EXISTS value.</div><div class='del'>-	Use camel_imap_response_free_without_processing so that an EXISTS</div><div class='del'>-	response won't cause a loop.</div><div class='del'>-	(imap_rescan): Use camel_imap_response_free_without_processing.</div><div class='del'>-	(imap_update_summary): Use</div><div class='del'>-	camel_imap_response_free_without_processing. If an EXISTS response</div><div class='del'>-	shows up, call imap_update_summary again to get the new messages.</div><div class='del'>-	(imap_protocol_get_summary_specifier): Use BODY.PEEK[0], not</div><div class='del'>-	RFC822.HEADER for prev IMAP4rev1, since the FETCH parser won't</div><div class='del'>-	deal with RFC822.HEADER responses.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Fix an</div><div class='del'>-	uninitialized variable</div><div class='del'>-</div><div class='del'>-2001-03-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: (CamelProvider) add a "GList *authtypes", so</div><div class='del'>-	you can get the list of authtypes used by a provider without</div><div class='del'>-	needing to have an actual CamelService object handy. (Will be</div><div class='del'>-	needed by the new config druid.)</div><div class='del'>-	(CAMEL_PROVIDER_ALLOWS, CAMEL_PROVIDER_NEEDS): New macros to test</div><div class='del'>-	the URL part stuff, since the way it works is too complicated and</div><div class='del'>-	everyone always does it wrong.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): Remove the</div><div class='del'>-	@connected arg again: if you don't want to connect, you can just</div><div class='del'>-	get the list of authtypes off the provider.</div><div class='del'>-	(camel_service_free_auth_types): Remove this. All existing</div><div class='del'>-	implementations do authtypes the same way, so just say the caller</div><div class='del'>-	should "g_list_free" the list. (Oh, look, removing this function</div><div class='del'>-	doesn't actually cause the mailer to not build. How 'bout that.)</div><div class='del'>-	(construct, get_path): Use the new URL part macros.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_query_auth_types): Update</div><div class='del'>-	(remote_free_auth_types): Nuke</div><div class='del'>-	(camel_remote_store_authtype_list): New function for use by</div><div class='del'>-	subclasses.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c:</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c:</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Update CamelProvider</div><div class='del'>-	structures.</div><div class='del'>-	(camel_provider_module_init): Put all the SSL parts together so</div><div class='del'>-	there's only 1 #ifdef. Set up the provider authtypes field using</div><div class='del'>-	the SASL, CamelRemoteStore, and standard authtypes, as</div><div class='del'>-	appropriate. Copy that from the normal provider to the SSL</div><div class='del'>-	provider.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c:</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c:</div><div class='del'>-	* camel-session.c: Update CamelProvider structures.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types):</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): Update</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-store.c (query_auth_types): Update.</div><div class='del'>-	Remove the no_authtype, because that's what "ALLOW_AUTH" rather</div><div class='del'>-	than "NEED_AUTH" means.</div><div class='del'>-	(free_auth_types): Nuke.</div><div class='del'>-</div><div class='del'>-2001-03-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Return -1 on fail.</div><div class='del'>-	(camel_filter_driver_filter_folder): Same.</div><div class='del'>-	(camel_filter_driver_filter_mbox): Same.</div><div class='del'>-	(camel_filter_driver_filter_folder): Return -1 if an exception was</div><div class='del'>-	set as well.</div><div class='del'>-</div><div class='del'>-2001-03-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (camel_tcp_stream_openssl_finalize):</div><div class='del'>-	Free the expected host.</div><div class='del'>-	(camel_tcp_stream_openssl_new): Now takes a Service and an</div><div class='del'>-	expected_host. Set them.</div><div class='del'>-</div><div class='del'>-2001-03-20  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_store_check_online): Function to check if the store is</div><div class='del'>-	online and set an exception if not. Currently controlled by an</div><div class='del'>-	environment variable, but eventually there will be both a global</div><div class='del'>-	(session-level) setting and a per-store setting.</div><div class='del'>-	(construct): Set up storage_path and base_url here rather than at</div><div class='del'>-	connect-time.</div><div class='del'>-	(imap_auth_loop): Split out from imap_connect.</div><div class='del'>-	(imap_setup_online): Split out from imap_connect. Do the</div><div class='del'>-	post-authentication connection setup, and cache the results to</div><div class='del'>-	disk.</div><div class='del'>-	(imap_setup_offline): Set up a CamelImapStore with information</div><div class='del'>-	saved from a previous imap_setup_online.</div><div class='del'>-	(imap_connect): If online, do connect_to_server(),</div><div class='del'>-	imap_auth_loop(), and imap_setup_online(). Otherwise, do</div><div class='del'>-	imap_setup_offline().</div><div class='del'>-	(get_folder, get_folder_info): Add offline support.</div><div class='del'>-	(create_folder, subscribe_folder, unsubscribe_folder): Disable</div><div class='del'>-	these when offline (for now).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new):</div><div class='del'>-	Remove the sync'ing-with-server stuff... it's done by</div><div class='del'>-	camel_imap_folder_selected now, which only gets called if the</div><div class='del'>-	store is online.</div><div class='del'>-	(camel_imap_folder_selected): add the code removed from</div><div class='del'>-	camel_imap_folder_new. Besides simplifying the folder_new and</div><div class='del'>-	summary_new code, this also means now that we'll DTRT if a</div><div class='del'>-	folder's UIDVALIDITY changes while we're connected. Also, when</div><div class='del'>-	that happens, clear the message cache explicitly.</div><div class='del'>-	(imap_refresh_info, imap_sync): These are no-ops when offline.</div><div class='del'>-	(imap_expunge, imap_append_message, imap_copy_message_to,</div><div class='del'>-	imap_search_by_expression): These don't yet work offline.</div><div class='del'>-	(imap_get_message, camel_imap_folder_fetch_data): Return an error</div><div class='del'>-	when trying to fetch a non-cached body part when we're offline.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c (camel_imap_summary_new):</div><div class='del'>-	Rewrite to not check the validity here. (We'll do it from</div><div class='del'>-	camel_imap_folder_selected instead.)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Call</div><div class='del'>-	camel_imap_folder_selected even when the selection is all we're</div><div class='del'>-	doing, to match the changes in camel-imap-folder.c.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c</div><div class='del'>-	(camel_imap_message_cache_clear): New function to clear out a</div><div class='del'>-	message cache.</div><div class='del'>-</div><div class='del'>-2001-03-19  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added $(EXTRA_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-2001-03-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the errbuf</div><div class='del'>-	to NULL after freeing it? I don't think this should fix bug #1801</div><div class='del'>-	but I guess it can't hurt.</div><div class='del'>-</div><div class='del'>-2001-03-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Protect against a</div><div class='del'>-	possibly NULL exception.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Document and modify to return a boolean value denoting whether or</div><div class='del'>-	not errors occured during processing.</div><div class='del'>-	(camel_filter_driver_filter_mbox): Same as above and also modified</div><div class='del'>-	to check return codes of filter_message rather than relying only</div><div class='del'>-	on whether or not the exception was set (as it's possible to pass</div><div class='del'>-	in NULL for the exception).</div><div class='del'>-	(camel_filter_driver_filter_folder): Same as above.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_param_list_format_append): Quote the</div><div class='del'>-	param value if it contains whitespace as well.</div><div class='del'>-</div><div class='del'>-2001-03-17  Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Don't include system include dir.</div><div class='del'>-</div><div class='del'>-	* camel.c: Use quotes around the nss.h include so it doesn't try</div><div class='del'>-	to use the systen nss.h file.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: Same here.</div><div class='del'>-</div><div class='del'>-2001-03-17  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_sync): </div><div class='del'>-	Modified patch from Dan Berger &lt;dberger@ix.netcom.com&gt; to re-check</div><div class='del'>-	the maildir directory for new/updated messages at sync time.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_ref_message_info): Implemented.</div><div class='del'>-	(ref_message_info): And default implementation.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Added ref_message_info virtual method.</div><div class='del'>-</div><div class='del'>-2001-03-16  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c</div><div class='del'>-	(camel_folder_thread_messages_new_summary): New function to create</div><div class='del'>-	a thread tree from a supplied summary array.</div><div class='del'>-	(camel_folder_thread_messages_destroy): Handle thread trees</div><div class='del'>-	generated by the above function properly.</div><div class='del'>-</div><div class='del'>-2001-03-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-private.h: Same.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.h: Fixed #include to use &lt;&gt;'s instead of ""'s</div><div class='del'>-</div><div class='del'>-2001-03-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_bad_cert): Print info about the</div><div class='del'>-	issuer of the certificate.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Use</div><div class='del'>-	camel_tcp_stream_get_socket().</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.c (stream_get_socket): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_get_socket): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_get_socket): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.c (camel_tcp_stream_get_socket): New function.</div><div class='del'>-</div><div class='del'>-2001-03-16  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Added #include &lt;config.h&gt;</div><div class='del'>-	</div><div class='del'>-2001-03-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_generate): Don't use</div><div class='del'>-	getdomainname: it's NIS crap, not DNS.</div><div class='del'>-</div><div class='del'>-2001-03-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Don't use the hardcoded cert db directory,</div><div class='del'>-	use the one passed in.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_get_client_auth): Wrote the default</div><div class='del'>-	implementation. Not that we'll use this though, since this is the</div><div class='del'>-	default implementation provided by NSS anyway. This more or less</div><div class='del'>-	serves as a reference in case we want to change anything.</div><div class='del'>-	(ssl_auth_cert): Same.</div><div class='del'>-	(ssl_bad_cert): Changed the prompt string and free it when we're</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-2001-03-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	First batch of disconnected IMAP-related stuff. This adds local</div><div class='del'>-	caching of message parts, but NOT any actual disconnected support.</div><div class='del'>-	(But it should speed up IMAP use.)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-message-cache.c: New class for caching</div><div class='del'>-	message data to disk, and removing it when it's no longer</div><div class='del'>-	relevant. Will eventually also support merging message parts</div><div class='del'>-	together to save on files. Or maybe using a db instead of files?</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Add a cache_lock to</div><div class='del'>-	CamelImapFolderPrivate. This lock must be recursive, so make both</div><div class='del'>-	locks EMutexes rather than GMutex.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (parse_fetch_response): "The</div><div class='del'>-	only FETCH response parser you need!" Replaces the various</div><div class='del'>-	almost-correct bits of code formerly scattered throughout this</div><div class='del'>-	file with a single fully-correct function that can handle any</div><div class='del'>-	FETCH response at any time, so we don't get confused by seeing a</div><div class='del'>-	flags update when we were only expecting a message body, etc.</div><div class='del'>-	(camel_imap_folder_fetch_data): FETCH a message body part either</div><div class='del'>-	from the cache or the server</div><div class='del'>-	(camel_imap_folder_changed): Remove expunged messages from the</div><div class='del'>-	message cache.</div><div class='del'>-	(camel_imap_folder_new): Change to take a directory instead of a</div><div class='del'>-	summary file name. Create a CamelImapMessageCache for the folder.</div><div class='del'>-	(imap_finalize): Unref the message cache.</div><div class='del'>-	(camel_imap_folder_selected, imap_rescan, get_content,</div><div class='del'>-	get_message, imap_get_message, imap_update_summary): Redone a</div><div class='del'>-	bunch to use parse_fetch_data, CamelImapMessageCache, etc.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Pass directory</div><div class='del'>-	name to camel_imap_folder_new, not summary filename. Use</div><div class='del'>-	e_path_to_physical to generate a path with /subfolders/ inserted</div><div class='del'>-	between directory components.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-wrapper.c (camel_imap_wrapper_new):</div><div class='del'>-	Call camel_imap_folder_fetch_data (with cache_only TRUE) and if</div><div class='del'>-	the data is cached, return an online datawrapper rather than an</div><div class='del'>-	offline one.</div><div class='del'>-	(write_to_stream): Use camel_imap_folder_fetch_data (with</div><div class='del'>-	cache_only FALSE) here too</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_skip_list): Renamed from</div><div class='del'>-	skip_list and made non-static.</div><div class='del'>-</div><div class='del'>-2001-03-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.h: Uninclude prnetdb.h since it's not</div><div class='del'>-	needed here.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: #include prnetdb.h here</div><div class='del'>-	instead of making camel-tcp-stream-ssl.h include it. Prevents some</div><div class='del'>-	header bloat.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: Include the NSPR_CFLAGS and</div><div class='del'>-	NSS_CFLAGS.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Update for</div><div class='del'>-	using CamelTcpStreams and also for using SSL.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/libcamelsmtp.urls: defined "ssmtp"</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Defined the Secure SMTP</div><div class='del'>-	provider.</div><div class='del'>-	(camel_provider_module_init): Register the Secure SMTP provider.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Check for</div><div class='del'>-	"simap" instead of "imaps".</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Change the</div><div class='del'>-	port to be 995 for spop.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/libcamelpop3.urls: Change to "spop".</div><div class='del'>-</div><div class='del'>-	* providers/imap/libcamelimap.urls: Change "imaps" to "simap" to</div><div class='del'>-	correspond to /etc/services.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Check to see</div><div class='del'>-	if we are using "pops" and then set the appropriate SSL settings.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/libcamelpop3.urls: Add "pops"</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: Defined the pops provider.</div><div class='del'>-	(camel_provider_module_init): Register the pops provider.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_new): Ya know what?</div><div class='del'>-	Lets not ref the service because otherwise we'll start having the</div><div class='del'>-	same problems we had back with vtrash. Besides, since the store</div><div class='del'>-	owns the stream, it's not like the store is going anywhere without</div><div class='del'>-	the stream anyway.</div><div class='del'>-	(camel_tcp_stream_ssl_finalize): No need to unref the service.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Pass the service into the</div><div class='del'>-	SSL stream, not the session.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_init): Set the</div><div class='del'>-	service to NULL.</div><div class='del'>-	(camel_tcp_stream_ssl_finalize): Unref the service.</div><div class='del'>-	(camel_tcp_stream_ssl_new): Takes a CamelService arg now rather</div><div class='del'>-	than a CamelSession arg.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): So it turns out that NSS_Init *isn't*</div><div class='del'>-	idempotent, so we have to protect against initializing it more</div><div class='del'>-	than once(contrary to what their design specs suggest).</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service): Use</div><div class='del'>-	camel_exception_is_set() - Makes no difference but it's more</div><div class='del'>-	consistant with how we normally do it.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h (CAMEL_URL_ALLOW_SSL): We don't need this.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: Define the imaps provider.</div><div class='del'>-	(camel_provider_module_init): Register the imaps provider.</div><div class='del'>-</div><div class='del'>-	* camel-provider.c (camel_provider_init): Only add the protocol to</div><div class='del'>-	the hash table if it's non empty. Also, g_strdup() the filename</div><div class='del'>-	into the hash table.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Eek!</div><div class='del'>-	So the service's URL isn't set until after this is</div><div class='del'>-	initialized. This means we can't check for SSL here.</div><div class='del'>-	(imap_connect): Set the SSL options here instead.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: Numerous fixes to get it to build</div><div class='del'>-	correctly with NSS enabled.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Pass in the session and</div><div class='del'>-	expected host args, oops.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h (CAMEL_URL_ALLOW_SSL): Defined.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Check</div><div class='del'>-	to see if we are supposed to use SSL and set the options</div><div class='del'>-	accordingly.</div><div class='del'>-	(imap_connect): Return FALSE here instead of NULL.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: Add CAMEL_URL_ALLOW_SSL.</div><div class='del'>-</div><div class='del'>-	* providers/imap/libcamelimap.urls: Add "imaps" which is the</div><div class='del'>-	protocol for Secure IMAP.</div><div class='del'>-</div><div class='del'>-2001-03-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-openssl.[c,h]: Added</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-tcp-stream-openssl.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* camel-types.h: Added CamelTcpStreamSSL and CamelTcpStreamOpenSSL</div><div class='del'>-</div><div class='del'>-2001-03-14  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (filter, complete): re-constify</div><div class='del'>-	inbuf, to remove a warning.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): When we're out of data,</div><div class='del'>-	run the filter_complete.  For some reason the logic that was there</div><div class='del'>-	was never being run, always try it now, i think it was to work</div><div class='del'>-	around a buggy filter, rather than fix it the right way.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): If indexing</div><div class='del'>-	html parts, use the html filter to convert it to some indexable</div><div class='del'>-	format.</div><div class='del'>-	(summary_build_content_info): Reset the filters before adding them</div><div class='del'>-	back to the stream, if they get re-used in a given instance</div><div class='del'>-	(likely).</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Added</div><div class='del'>-	camel-mime-filter-html.[ch].</div><div class='del'>-	(INCLUDES): Added xml clags</div><div class='del'>-</div><div class='del'>-2001-03-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_class_init): Setup a</div><div class='del'>-	new function, "uid" which matches uids.</div><div class='del'>-	(search_uid): Implement the "match uid" command.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Check for a new type of mailing list header.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_read): Made cancellable.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-	(stream_connect): Removed checks for DIVINE_INTERVENTION as the</div><div class='del'>-	code worked fine.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_write): get rid of 'w' as it</div><div class='del'>-	wasn't really needed.</div><div class='del'>-	(set_errno): New function to set errno based on the NSPR error</div><div class='del'>-	code.</div><div class='del'>-	(stream_read): If an error occured, call set_errno().</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-tcp-stream-ssl to the build.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.h: Add a use_ssl member to the</div><div class='del'>-	CamelRemoteStore object.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (camel_tcp_stream_ssl_get_type):</div><div class='del'>-	Oops. Make this a subclass of CamelTcpStream, not CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-types.h: Add the defs for CamelTcpStream and</div><div class='del'>-	CamelTcpStreamRaw</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add camel-tcp-stream and camel-tcp-stream-raw to</div><div class='del'>-	the build.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Update to use</div><div class='del'>-	CamelTcpStreams.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_connect): Made cancellable by</div><div class='del'>-	copying the currently used code in camel-remote-store.c.</div><div class='del'>-	(stream_setsockopt): Oops, flags = fcntl (..., GET_FL);</div><div class='del'>-	(camel_tcp_stream_raw_get_type): Oops. Make this a subclass of</div><div class='del'>-	CamelTcpStream, not CamelStream.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Since all of the Mozilla libs (including</div><div class='del'>-	NSPR and NSS) correctly handle reinitializations, we might as well</div><div class='del'>-	init both NSPR and NSS in camel_init so we can be sure of that</div><div class='del'>-	these libs have been initialized.</div><div class='del'>-	(camel_shutdown): New function to call the NSS cleanup stuff.</div><div class='del'>-</div><div class='del'>-2001-03-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_message_to): Don't allow the</div><div class='del'>-	user to copy a message to or from the vtrash folder. Set an</div><div class='del'>-	exception if they try.</div><div class='del'>-	(camel_folder_move_message_to): This one is a bit more</div><div class='del'>-	complicated: 1) If the user tried to move a message from the</div><div class='del'>-	vtrash into the original folder, just undelete the message. 2) If</div><div class='del'>-	the user tries to move the message to the vtrash folder, then just</div><div class='del'>-	mark the message as deleted. 3) If the user tries to move the</div><div class='del'>-	message from the vTrash to a folder other than the original, use</div><div class='del'>-	the original folder as the source. As another optimization, I've</div><div class='del'>-	made it so that if the user tries to move a message to the same</div><div class='del'>-	folder, just no-op.</div><div class='del'>-	(move_message_to): Unset the deleted flag before moving (assuming</div><div class='del'>-	it's there).</div><div class='del'>-	(copy_message_to): Same.</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (camel_vee_folder_get_message_folder): New</div><div class='del'>-	convenience function to get the folder from which the message uid</div><div class='del'>-	is derived from.</div><div class='del'>-</div><div class='del'>-2001-03-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): When trying</div><div class='del'>-	again after a failed password attempt, check if the connection got</div><div class='del'>-	dropped (which Courier will do) and deal accordingly.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send_to,</div><div class='del'>-	sendmail_send): More fixing for exim: It can't deal with "-tif",</div><div class='del'>-	you need to say "-t -i -f".</div><div class='del'>-</div><div class='del'>-2001-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (init_trash): Rename the folder to "Trash" and</div><div class='del'>-	i18nify it.</div><div class='del'>-</div><div class='del'>-2001-03-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.h: Comment out everything unless HAVE_NSS</div><div class='del'>-	is defined.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_read): Don't use errno, use</div><div class='del'>-	nspr's error code stuff.</div><div class='del'>-	(stream_write): Same.</div><div class='del'>-</div><div class='del'>-2001-03-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_query_authenticator): Created a</div><div class='del'>-	new mode (CAMEL_AUTHENTICATOR_ACCEPT) which is a Yes/No prompt to</div><div class='del'>-	the user. This will be needed by the SSL/TLS code to come. Also</div><div class='del'>-	changed the return value to a gpointer rather than a char* to</div><div class='del'>-	allow the returning of TRUE/FALSE values.</div><div class='del'>-</div><div class='del'>-	* camel.c: Wrap stuff with HAVE_NSS</div><div class='del'>-</div><div class='del'>-2001-03-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send,</div><div class='del'>-	sendmail_send_to): Remove the "-U" for now, because it breaks</div><div class='del'>-	exim's "sendmail" wrapper. (And it doesn't actually do all that</div><div class='del'>-	much to sendmail's behavior, and it was working fine before</div><div class='del'>-	anyway.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): Fix a bug that could make this</div><div class='del'>-	walk off the end of a string. (The bug has been there since</div><div class='del'>-	December... maybe this will fix some unreproduceable crashes?)</div><div class='del'>-</div><div class='del'>-2001-03-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Changes so that the</div><div class='del'>-	folder gets added to the vtrash reguardless of whether or not the</div><div class='del'>-	store is holding it's own folder lookup hash.</div><div class='del'>-	(init_trash): Oops, lets try locking the cache before we go and</div><div class='del'>-	add all the cached folders to the vtrash.</div><div class='del'>-</div><div class='del'>-2001-03-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-	These fixes make it so that the CamelStore does not actually hold</div><div class='del'>-	a ref on it's vTrash folder. The vTrash folder is now created ONLY</div><div class='del'>-	when it is requested. This solves the problem of not being able to</div><div class='del'>-	unref a Store and have it disconnect/finalize like we expect it to.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (init_trash): When we create the vtrash, add all</div><div class='del'>-	previously opened folders to it and hook on to the finalize event</div><div class='del'>-	so that we can then set the store-&gt;vtrash to NULL.</div><div class='del'>-	(get_trash): If a vtrash folder for the store doesn't exist,</div><div class='del'>-	init_trash() and then try.</div><div class='del'>-	(construct): No longer need this.</div><div class='del'>-	(camel_store_class_init): Don't override the construct method.</div><div class='del'>-	(camel_store_finalize): We no longer hold a ref on the vtrash so</div><div class='del'>-	don't unref it.</div><div class='del'>-</div><div class='del'>-2001-03-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (init_trash): Implement.</div><div class='del'>-	(get_trash): Implement.</div><div class='del'>-	(camel_pop3_store_class_init): Override the default init_trash and</div><div class='del'>-	get_trash virtual functions. Hopefully this should fix the problem</div><div class='del'>-	of pop3 sotre's not disconnecting after the send&amp;recv code</div><div class='del'>-	finishes downloading mail.</div><div class='del'>-</div><div class='del'>-	Wonder if I should override the default implementation for the</div><div class='del'>-	mbox, mh, and maildir too?</div><div class='del'>-</div><div class='del'>-2001-03-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_connected): Return the</div><div class='del'>-	return value of camel_service_connect rather than returning</div><div class='del'>-	!camel_exception_is_set(), since that will be wrong if ex==NULL...</div><div class='del'>-	Fixes a crash in the IMAP keepalive code, but this same problem</div><div class='del'>-	probably exists in other places too...</div><div class='del'>-	(remote_recv_line): Fix another problem...</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-provider.c:</div><div class='del'>-	* providers/vee/.cvsignore:</div><div class='del'>-	* providers/vee/libcamelvee.urls: Remove some unused stuff</div><div class='del'>-	</div><div class='del'>-2001-03-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.c (compute_response): Redone so as to save</div><div class='del'>-	on memory allocations and speed.</div><div class='del'>-</div><div class='del'>-2001-03-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.c (plain_challenge): Don't return NULL if the</div><div class='del'>-	token is non-NULL. This is why:</div><div class='del'>-</div><div class='del'>-	sending : AUTH PLAIN</div><div class='del'>-        received: 334 ok. go on.                 &lt;-- this is why</div><div class='del'>-        sending : ZGZPaQpAZ214Lm5ldBBnb29jYXI=</div><div class='del'>-        received: 235 {mp005-rz3} go ahead</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_authtype): Add the PLAIN type here.</div><div class='del'>-	(camel_sasl_authtype_list): And here too.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.c: Initialize the camel_sasl_plain_authtype.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.h: extern the camel_sasl_plain_authtype.</div><div class='del'>-</div><div class='del'>-2001-03-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): i18n'd some</div><div class='del'>-	strings in here.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Keep</div><div class='del'>-	trying to authenticate until either we succeed or until the user</div><div class='del'>-	cancels.</div><div class='del'>-</div><div class='del'>-2001-03-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Wrote a new version of header_fold() that</div><div class='del'>-	takes a 'force' option and uses another new function called</div><div class='del'>-	header_fold_next_space() in place of strchr(inptr, ' ') to get the</div><div class='del'>-	next whitespace char. The idea of header_fold_next_space() is to</div><div class='del'>-	not treat spaces between a set of quotes as a space - this way it</div><div class='del'>-	will be possible to fold (for example) the Content-Type MIME</div><div class='del'>-	header without worrying about breaking up a boundary string.</div><div class='del'>-	Note: This code is #if 0'd out until Zucchi approves of the patch.</div><div class='del'>-	Another Note: We will probably still want to use the "don't fold</div><div class='del'>-	this header" hash lookup for headers like the Message-Id and</div><div class='del'>-	possibly a few others.</div><div class='del'>-</div><div class='del'>-2001-03-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c</div><div class='del'>-	(camel_internet_address_encode_address): Make sure there is a</div><div class='del'>-	space between the name and the address tokens.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): encoded string</div><div class='del'>-	segments need to be at least 8 chars (7 doesn't leave room for an</div><div class='del'>-	ecoding value. To be more realistic, even 8 chars isn't enough as</div><div class='del'>-	this assumes there is no charset nor any encoded text. If the</div><div class='del'>-	encoding value is not 'Q' or 'B', then return NULL. This fixes bug</div><div class='del'>-	#1689.</div><div class='del'>-</div><div class='del'>-2001-03-03  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-vee-folder.c (vee_folder_remove_folder): New function to</div><div class='del'>-	remove a folder from a vfolder.</div><div class='del'>-	(camel_vee_folder_remove_folder): New public function to remove a</div><div class='del'>-	folder from a vfolder.</div><div class='del'>-</div><div class='del'>-2001-03-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Doh! Set the</div><div class='del'>-	CAMEL_URL_ALLOW_AUTH flag.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):</div><div class='del'>-	Updated with the extended AUTH return codes.</div><div class='del'>-</div><div class='del'>-2001-03-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_auth): Don't forget to</div><div class='del'>-	unref the SASL object.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types):</div><div class='del'>-	Implemented.</div><div class='del'>-	(smtp_auth): Implemented.</div><div class='del'>-	(smtp_helo): Don't bother parsing the authtypes if we already have</div><div class='del'>-	them.</div><div class='del'>-	(smtp_connect): call smtp_auth() here if we found any authtypes.</div><div class='del'>-	(smtp_disconnect): Updated as I now use a hash table for the</div><div class='del'>-	supported authtypes rather than a linked list.</div><div class='del'>-	(esmtp_get_authtypes): modify to use a hash table instead of a</div><div class='del'>-	linked list and also use isspace() rather than == ' '.</div><div class='del'>-</div><div class='del'>-2001-03-02  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (sendmail_send_to,</div><div class='del'>-	sendmail_send): Use "-f" to set the envelope from address so</div><div class='del'>-	bounces go to the right place. Also, pass "-U" since the man page</div><div class='del'>-	says we're supposed to...</div><div class='del'>-</div><div class='del'>-2001-03-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-sasl.c: #include "camel-sasl-digest-md5.h"</div><div class='del'>-	(camel_sasl_authtype_list): add DIGEST-MD5 stuff here.</div><div class='del'>-	(camel_sasl_authtype): And here too.</div><div class='del'>-	(camel_sasl_new): And here...</div><div class='del'>-</div><div class='del'>-	* camel-sasl-digest-md5.[c,h]: new SASL class for DIGEST-MD5 (has</div><div class='del'>-	been tested and proven to work).</div><div class='del'>-</div><div class='del'>-2001-03-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl.c (camel_sasl_challenge): Take a GByteArray as input</div><div class='del'>-	as well. Comment that you can pass %NULL for @token to get the</div><div class='del'>-	initial auth data for mechanisms that are client-initiated.</div><div class='del'>-	(camel_sasl_challenge_base64): Convenience function for protocols</div><div class='del'>-	that use base64-encoded SASL.</div><div class='del'>-	(camel_sasl_authenticated): Implement this... (it was prototyped</div><div class='del'>-	already)</div><div class='del'>-	(camel_sasl_new): Function to take a service name, a mechanism</div><div class='del'>-	name, and a CamelService, and return a CamelSasl for it.</div><div class='del'>-	(camel_sasl_authtype, camel_sasl_authtype_list): Functions to</div><div class='del'>-	return CamelServiceAuthType information about SASL mechanisms, to</div><div class='del'>-	allow providers to deal with them generically.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-anonymous.c, camel-sasl-plain.c: Update/simplify for</div><div class='del'>-	CamelSasl changes. Both of these are single-round</div><div class='del'>-	(client-initiated) mechanisms, so they don't need to keep state.</div><div class='del'>-	(camel_sasl_plain_new): Removed; use camel_sasl_new instead.</div><div class='del'>-	(Can't get rid of camel_sasl_anonymous_new though...)</div><div class='del'>-</div><div class='del'>-	* camel-sasl-cram-md5.c: Update/simplify for CamelSasl changes.</div><div class='del'>-	(camel_sasl_cram_md5_new): Removed; use camel_sasl_new instead.</div><div class='del'>-	(cram_md5_challenge): Use md5_get_digest where possible, and</div><div class='del'>-	various other minor simplifications. CRAM-MD5 only has a single</div><div class='del'>-	round, so there's no need to keep track of state. This code is now</div><div class='del'>-	tested (against Cyrus IMAPd) and known to work.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-kerberos4.h: Update/simplify for CamelSasl changes.</div><div class='del'>-	Make only a single #ifdef HAVE_KRB4. Remove stuff from priv that</div><div class='del'>-	isn't needed between rounds.</div><div class='del'>-	(camel_sasl_kerberos4_new): Removed; use camel_sasl_new instead</div><div class='del'>-	(krb4_challenge): Fix up the logic I broke in my previous "at</div><div class='del'>-	least make it compile" fixes, update to match other changes, and</div><div class='del'>-	remove IMAP-isms that shouldn't be in the generic code. This still</div><div class='del'>-	isn't tested, because we're stuck behind a NAT right now...</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Add an "authtypes" hash table</div><div class='del'>-	to CamelImapStore recording the supported authtypes.</div><div class='del'>-	(connect_to_server): Record supported authtypes in the authtypes</div><div class='del'>-	hash rather than the capabilities bitmask, since now the IMAP code</div><div class='del'>-	is no longer responsible for keeping track of which authtypes we</div><div class='del'>-	support.</div><div class='del'>-	(query_auth_types): Use camel_sasl_authtype_list to get the</div><div class='del'>-	SASL-supported authtypes.</div><div class='del'>-	(try_auth): New function to try a SASL auth mechanism. Sort of</div><div class='del'>-	formerly imap_try_kerberos_v4_auth.</div><div class='del'>-	(imap_connect): Get rid of the krb4-specific bits and genericize</div><div class='del'>-	them for any SASL authtype.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Remove camel-imap-auth.[ch] (moved</div><div class='del'>-	into camel-imap-store.c since it's now constant size) and the</div><div class='del'>-	KRB4_CFLAGS and KRB4_LDFLAGS references.</div><div class='del'>-</div><div class='del'>-2001-03-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-anonymous.c (anon_challenge): Don't base64 encode the</div><div class='del'>-	data, leave that up to the provider to do if it needs to. Also</div><div class='del'>-	save on some memory allocations and stuff.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here. Also get</div><div class='del'>-	rid of the need for the temp buf as we can just write it to the</div><div class='del'>-	GByteArray.</div><div class='del'>-</div><div class='del'>-2001-03-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_encode_word, rfc2047_decode_word):</div><div class='del'>-	Reconstify variables to match iconv.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_ustrstrcase): Change some</div><div class='del'>-	assertions back into valid returns.</div><div class='del'>-</div><div class='del'>-2001-03-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_LIBADD, INCLUDES): camel depends on</div><div class='del'>-	krb4 now (where available), for camel-sasl-kerberos4.c</div><div class='del'>-</div><div class='del'>-	* camel-sasl-kerberos4.[ch]: Make this at least compile. Dunno if</div><div class='del'>-	it works yet.</div><div class='del'>-</div><div class='del'>-2001-03-01  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_new): Assert url_string != NULL.</div><div class='del'>-</div><div class='del'>-2001-02-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-sasl-anonymous.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* camel-sasl-anonymous.[c,h]: new SASL class for ANONYMOUS</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.c (plain_challenge): Oops, have a state for</div><div class='del'>-	setting sasl-&gt;authenticated = TRUE;</div><div class='del'>-</div><div class='del'>-	* camel-sasl-cram-md5.c (cram_md5_challenge): Same here.</div><div class='del'>-</div><div class='del'>-2001-02-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): A fix for broken</div><div class='del'>-	mailers that send 2-digit years (ie "Wed, 28 Feb 01</div><div class='del'>-	04:59:41"). Fixes bug #1633.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Check</div><div class='del'>-	to make sure message isn't NULL.</div><div class='del'>-</div><div class='del'>-2001-02-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): If we get back 0 bytes</div><div class='del'>-	from camel_stream_buffer_gets, that means the socket got</div><div class='del'>-	disconnected, so set an exception. (Noticed because of a message</div><div class='del'>-	that crashes our IMAP server when you try to look at it. :)</div><div class='del'>-</div><div class='del'>-2001-02-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-sasl*.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* camel-sasl.[c,h]: new "abstract" SASL class</div><div class='del'>-</div><div class='del'>-	* camel-sasl-kerberos4.[c,h]: new SASL class for KERBEROS_V4</div><div class='del'>-</div><div class='del'>-	* camel-sasl-cram-md5.[c,h]: new SASL class for CRAM-MD5</div><div class='del'>-</div><div class='del'>-	* camel-sasl-plain.[c,h]: new SASL class for PLAIN</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: Removed the base64 functions.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_simple): Moved here from</div><div class='del'>-	camel-imap-auth.c</div><div class='del'>-	(base64_decode_simple): Same.</div><div class='del'>-</div><div class='del'>-2001-02-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): Group messages</div><div class='del'>-	into sets with the same flags and use the IMAP message set</div><div class='del'>-	notation rather than doing a separate STORE FLAGS for each one.</div><div class='del'>-	This cuts the network traffic down to just a handful of commands</div><div class='del'>-	per sync rather than one per changed message. Removed the progress</div><div class='del'>-	notification stuff since it's no longer meaningful and should</div><div class='del'>-	hopefully be unnecessary.</div><div class='del'>-	(imap_copy_message_to): move the former sync_message function</div><div class='del'>-	into here, since it's no longer shared with imap_sync.</div><div class='del'>-</div><div class='del'>-2001-02-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Made thread-safe and moved to above the test</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_init): Set the</div><div class='del'>-	message_id to NULL.</div><div class='del'>-	(camel_mime_message_finalize): Free the message_id.</div><div class='del'>-	(camel_mime_message_set_message_id): New function to set the</div><div class='del'>-	Message-Id.</div><div class='del'>-	(camel_mime_message_get_message_id): New function to get the</div><div class='del'>-	Message-Id.</div><div class='del'>-	(process_header): Decode the message-id.</div><div class='del'>-</div><div class='del'>-2001-02-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (construct): init the vTrash folder here instead</div><div class='del'>-	of in store_init.</div><div class='del'>-	(camel_store_class_init): init service_class-&gt;construct.</div><div class='del'>-	(camel_store_finalize): We only need to unref the vtrash folder.</div><div class='del'>-	(init_trash): don't create a vstore since we don't need it.</div><div class='del'>-</div><div class='del'>-2001-02-23  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_class_init): init get_trash and</div><div class='del'>-	init_trash.</div><div class='del'>-	(camel_store_init): call the virtual init_trash function.</div><div class='del'>-	(camel_store_finalize): unref the vtrash folder/store if present.</div><div class='del'>-	(camel_store_get_folder): Add the new folder to the vtrash</div><div class='del'>-	vfolder.</div><div class='del'>-	(init_trash): default implementation of init_trash.</div><div class='del'>-	(get_trash): default implementation of get_trash.</div><div class='del'>-</div><div class='del'>-	* camel-vee-store.c (vee_init_trash): No-op.</div><div class='del'>-	(vee_get_trash): return NULL</div><div class='del'>-</div><div class='del'>-2001-02-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_new_from_header):</div><div class='del'>-	Doh, cut and paste problem, use mlist not cc.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (move_message_to): </div><div class='del'>-	(copy_message_to): If the source folder doesn't support a</div><div class='del'>-	summary, dont try and get the message info from it.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (check_header): Implement a pseudo-header</div><div class='del'>-	"x-camel-mlist" which just looks up in the message info for a</div><div class='del'>-	match.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (check_header): Add pseudo-header</div><div class='del'>-	"x-camel-mlist" which can be used to match on mailing list.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): Add some</div><div class='del'>-	internal progress reporting.</div><div class='del'>-	(imap_rescan): Do some progress reporting.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (init_header_name_table): Add the message-id</div><div class='del'>-	to the formatted table, so we dont try and wrap it, and break it.</div><div class='del'>-</div><div class='del'>-2001-02-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Remove the 'FIXME: remove because this isn't</div><div class='del'>-	required...' comment for copy_message_to since we now need and</div><div class='del'>-	cherish its existance in the filter-driver code ;-)</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): Now</div><div class='del'>-	takes a UID and CamelFolder arguments (which can be NULL) to allow</div><div class='del'>-	for possible optimizations when copying messages between folders</div><div class='del'>-	on the same store.</div><div class='del'>-	(camel_filter_driver_filter_mbox): Updated (passes NULL for both</div><div class='del'>-	since this case can't be optimized anyway).</div><div class='del'>-	(camel_filter_driver_filter_folder): Updated to pass in the uid</div><div class='del'>-	and folder of the message.</div><div class='del'>-</div><div class='del'>-2001-02-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.h (CAMEL_IMAP_SERVER_FLAGS):</div><div class='del'>-	#define this as the set of all IMAP system flags</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (sync_message): after syncing</div><div class='del'>-	flags, set server_flags to (flags &amp; CAMEL_IMAP_SERVER_FLAGS)</div><div class='del'>-	rather than just "flags", since any other flags won't have been</div><div class='del'>-	synced. Prevents the CAMEL_MESSAGE_ATTACHMENTS flag from getting</div><div class='del'>-	lost.</div><div class='del'>-</div><div class='del'>-2001-02-22  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/*: Removed all files.</div><div class='del'>-	</div><div class='del'>-	* camel-private.h: Move camel-vee-private.h stuff into here.</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Move the vee_provider here, and initialise it</div><div class='del'>-	always as part of a session.  The vfolder provider is always</div><div class='del'>-	available.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Remove "vee" from the build list, now</div><div class='del'>-	built as part of the main library.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): </div><div class='del'>-	(libcamel_la_SOURCES): Added camel-vee-store.[ch],</div><div class='del'>-	camel-vee-folder.[ch].</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build): Removed,</div><div class='del'>-	not used.</div><div class='del'>-	(camel_vee_folder_new): Removed call to build_folder.</div><div class='del'>-	(vee_get_message): Dont try and free the mi if we didn't get it.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_new): Added a hash</div><div class='del'>-	table of what we have in the lists, plus moved private things into</div><div class='del'>-	private pointer.</div><div class='del'>-	(camel_folder_change_info_add_source): Fixed up private accesses.</div><div class='del'>-	(camel_folder_change_info_add_uid): Changed to use a hashtable to</div><div class='del'>-	see if we already have the uid, etc.</div><div class='del'>-	(camel_folder_change_info_remove_uid): Similar.</div><div class='del'>-	(change_info_remove): Likewise.</div><div class='del'>-	(camel_folder_change_info_clear): Fixes for privatisations.</div><div class='del'>-	(camel_folder_change_info_free): "</div><div class='del'>-</div><div class='del'>-2001-02-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (fetch_medium): Fixes for</div><div class='del'>-	IMAP4-pre-rev1 from Torsten Schulz.</div><div class='del'>-</div><div class='del'>-2001-02-20  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (mail_list_magic): Take the ^Header: part out</div><div class='del'>-	of the expression, since we look that up ourselves.</div><div class='del'>-	(header_raw_check_mailing_list): When getting the match, get match</div><div class='del'>-	1, not match 0, we dont want the full string match.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (CAMEL_FOLDER_SUMMARY_VERSION): Bumped</div><div class='del'>-	for summary change.</div><div class='del'>-	(message_info_new): Extract the mlist info from the headers.</div><div class='del'>-	(message_info_load): Load mlist from summary.</div><div class='del'>-	(message_info_save): Save mlist to summary.</div><div class='del'>-	(message_info_free): Save the mlist entry.</div><div class='del'>-	(camel_message_info_new_from_header): Extract mailing list header.</div><div class='del'>-	(camel_message_info_dup_to): Copy the mlist entry.</div><div class='del'>-	(camel_message_info_free): Free mlist.</div><div class='del'>-	(message_info_dump): Dump the mlist.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Add an mlist (mailing list) string to</div><div class='del'>-	the summary.</div><div class='del'>-</div><div class='del'>-2001-02-19  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Added</div><div class='del'>-	flags argument.</div><div class='del'>-	(message_changed): Add support for the auto-update flag, in which</div><div class='del'>-	case we auto-match the content as it changes.</div><div class='del'>-	(camel_vee_folder_init): Remoive "DYNAMIC" optionality</div><div class='del'>-	(camel_vee_folder_finalise): "</div><div class='del'>-	(vee_expunge): As we expunge folders, re-sync their content by</div><div class='del'>-	rerunning the query.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-store.c (vee_get_folder): Pass flags to</div><div class='del'>-	folder new.</div><div class='del'>-</div><div class='del'>-2001-02-18  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/Makefile.am (noinst_HEADERS): Added</div><div class='del'>-	camel-vee-private.h.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-private.h: New file to add locking stuff</div><div class='del'>-	for vee folders.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Add</div><div class='del'>-	locking around unmatched setup.</div><div class='del'>-	(camel_vee_folder_init): Setup lock.</div><div class='del'>-	(camel_vee_folder_finalise): Free locks.</div><div class='del'>-	(folder_changed): Add locking.</div><div class='del'>-	(unmatched_finalise): "</div><div class='del'>-	(message_changed): "</div><div class='del'>-	(vee_folder_build): "</div><div class='del'>-</div><div class='del'>-2001-02-17  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_add): Check uid</div><div class='del'>-	doesn't exist before adding it.</div><div class='del'>-</div><div class='del'>-2001-02-16  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Create</div><div class='del'>-	a new virtual virtual folder UNMATCHED, to store all messages that</div><div class='del'>-	dont match other vfolders.</div><div class='del'>-	(unmatched_folder_changed): When a vfolder issues a changed event,</div><div class='del'>-	use its info to update the unmatched folder info.</div><div class='del'>-	(unmatched_finalise): When a vfolder is finalised, remove any uids</div><div class='del'>-	it has as if we had a removed event for it.</div><div class='del'>-</div><div class='del'>-2001-02-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_finalise): Thaw the</div><div class='del'>-	defaultfolder.</div><div class='del'>-	(camel_filter_driver_set_default_folder): Thaw the defaultfolder</div><div class='del'>-	we're about to replace, and freeze the new defaultfolder.</div><div class='del'>-</div><div class='del'>-2001-02-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Emit</div><div class='del'>-	the folder_created signal here.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(camel_local_folder_construct): Emit the folder_created signal.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (delete_folder): On error,</div><div class='del'>-	free the 'name' string so we don't leak. Also emit the</div><div class='del'>-	folder_deleted signal.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (subscribe_folder): Emit the</div><div class='del'>-	folder_created signal.</div><div class='del'>-	(unsubscribe_folder): Emit the folder_deleted signal.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_class_init): Added folder_created and</div><div class='del'>-	folder_deleted signal defs.</div><div class='del'>-</div><div class='del'>-2001-02-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (container_parent_child): Deal with</div><div class='del'>-	out-of-order References headers so they don't cause messages to</div><div class='del'>-	disappear in threaded view.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (fetch_medium): IMAP4</div><div class='del'>-	(pre-rev1) doesn't allow BODY.PEEK[], so use RFC822.PEEK instead</div><div class='del'>-	in that case.</div><div class='del'>-</div><div class='del'>-2001-02-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete, filter),</div><div class='del'>-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):</div><div class='del'>-	Changed this code to match the glibc iconv signature.</div><div class='del'>-</div><div class='del'>-2001-02-14  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_create_folder): New method to create</div><div class='del'>-	a folder when you don't know its full name.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (create_folder): Implement.</div><div class='del'>-	(create_folder): Oops, and fix bug involving namespaces</div><div class='del'>-	</div><div class='del'>-2001-02-12  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (init_header_name_table): Add address headers</div><div class='del'>-	to list that we dont fold when writing.  The are properly</div><div class='del'>-	formatted as we build them.</div><div class='del'>-	(write_to_stream): DOH, lookup the header name in the formatted</div><div class='del'>-	hash table, not the value, that would never have worked.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c</div><div class='del'>-	(camel_internet_address_encode_address): Changed to take a</div><div class='del'>-	parameter saying how much we've printed so far.  We now fold the</div><div class='del'>-	header as we format it.  We dont fold addresses, even if they are</div><div class='del'>-	too long, we simply put them on another line by themselves: this</div><div class='del'>-	should make the result more parsable by mailers that can't handle</div><div class='del'>-	split up addresses (which are legal).</div><div class='del'>-	(internet_encode): Fix for changes to above.</div><div class='del'>-</div><div class='del'>-2001-02-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: mbox, mh, and maildir</div><div class='del'>-	camel-url's need absolute paths.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h (CAMEL_URL_PATH_IS_ABSOLUTE): New flaggy flag.</div><div class='del'>-</div><div class='del'>-2001-02-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c: Rewrite a bunch. Replace the existing folder</div><div class='del'>-	cache stuff with much simpler code that still handles all the</div><div class='del'>-	existing cases. Now the folder hash table is always created by the</div><div class='del'>-	base class, using hash and compare functions provided by the class</div><div class='del'>-	implementation. (If they are set to NULL, CamelStore won't cache</div><div class='del'>-	folders.) lookup_folder, cache_folder, and uncache_folder are no</div><div class='del'>-	longer class methods, and get_name is gone completely.</div><div class='del'>-</div><div class='del'>-	(camel_store_get_inbox): Renamed from</div><div class='del'>-	camel_store_get_default_folder, since that wasn't being used, and</div><div class='del'>-	this is what we actually need.</div><div class='del'>-	(camel_store_get_root_folder): Removed, since it's not needed for</div><div class='del'>-	anything given get_folder_info.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c:</div><div class='del'>-	* providers/local/camel-local-store.c:</div><div class='del'>-	* providers/local/camel-mbox-store.c:</div><div class='del'>-	* providers/local/camel-mh-store.c:</div><div class='del'>-	* providers/local/camel-maildir-store.c:</div><div class='del'>-	* providers/nntp/camel-nntp-store.c:</div><div class='del'>-	* providers/pop3/camel-pop3-store.c:</div><div class='del'>-	* providers/vee/camel-vee-store.c: Minor updates for CamelStore</div><div class='del'>-	changes</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):</div><div class='del'>-	Update for CamelStore changes.</div><div class='del'>-	(hash_folder_name, compare_folder_name): treat INBOX</div><div class='del'>-	case-insensitively, otherwise use g_str_hash and g_str_equal.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_construct): Remove</div><div class='del'>-	camel_service_new and create camel_service_construct (as a class</div><div class='del'>-	method) in its place.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service): Use</div><div class='del'>-	camel_object_new and camel_service_construct to replace</div><div class='del'>-	camel_service_new.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (construct): Append a '/' to</div><div class='del'>-	the URL path if it doesn't end with one</div><div class='del'>-</div><div class='del'>-2001-01-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: Oops, include the camel-tcp-stream-ssl</div><div class='del'>-	header instead of the raw one.</div><div class='del'>-</div><div class='del'>-2001-02-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-operation.c (camel_operation_start): Changed to push the</div><div class='del'>-	operation into a status stack.</div><div class='del'>-	(camel_operation_progress): Changed to only accept % complete.</div><div class='del'>-	(camel_operation_reset): Free status stack as well.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_get_message): Get the</div><div class='del'>-	octect count from the return line, and pass it to</div><div class='del'>-	get_additional_data().</div><div class='del'>-	(pop3_refresh_info): Added status stuff.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c</div><div class='del'>-	(camel_pop3_command_get_additional_data): Added a total bytes</div><div class='del'>-	expected argument for progress reporting &amp; fixed callers.</div><div class='del'>-	(camel_pop3_command_get_additional_data): Added progress</div><div class='del'>-	reporting.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_full):</div><div class='del'>-	(mbox_summary_sync_quick):</div><div class='del'>-	(summary_rebuild): Added progress reporting stuff.</div><div class='del'>-</div><div class='del'>-2001-02-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (CAMEL_SEARCH_COMPARE): Macro for making</div><div class='del'>-	comparisons easy.</div><div class='del'>-	(camel_ustrcasecmp): Use CAMEL_SEARCH_COMPARE and check for</div><div class='del'>-	end-of-string before the utf-8 error check.</div><div class='del'>-	(camel_ustrncasecmp): Same.</div><div class='del'>-	(camel_search_header_match): Strip leading spaces before doing</div><div class='del'>-	anything else. Also use vlen and mlen so as to not need to do 500</div><div class='del'>-	strlen()'s.</div><div class='del'>-	(camel_ustrcasecmp): Don't get_utf8() for the 2 strings in the</div><div class='del'>-	comparison part of the loop because of short-circuit expression</div><div class='del'>-	evaluation. (blame JPR if this is the wrong term!)</div><div class='del'>-	(camel_ustrncasecmp): Same.</div><div class='del'>-</div><div class='del'>-2001-02-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (utf8_get): Rewrote using unicode_get_utf8().</div><div class='del'>-	(camel_ustrcasecmp): Use unicode_char_t</div><div class='del'>-	(camel_ustrncasecmp): Same.</div><div class='del'>-</div><div class='del'>-2001-02-06  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete, filter),</div><div class='del'>-	camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):</div><div class='del'>-	Made these pass char ** as the second parameter to iconv.</div><div class='del'>-</div><div class='del'>-2001-02-06  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Removed all the camel_cancel stuff.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_read): Change to use camel_operation.	</div><div class='del'>-	(stream_write): "</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (socket_connect): Change to use</div><div class='del'>-	camel_operation rather than camel_cancel stuff.</div><div class='del'>-	Removed gal include, WTF is that doing there anyway?</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): </div><div class='del'>-	(libcamelinclude_HEADERS): Added camel-operation.[ch], stuff to</div><div class='del'>-	handle notification and cancellation.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c: Removed unwanted header.  It was never</div><div class='del'>-	put in for a reason.  Stop fixing irrelevant warnings.</div><div class='del'>-	</div><div class='del'>-	(camel_ustrstrcase): Our own strstrcase impl for utf8 strings.</div><div class='del'>-	(camel_ustrcasecmp): Ditto for strcasecmp.</div><div class='del'>-	(camel_ustrncasecmp): And strncasecmp.</div><div class='del'>-	(utf8_get): Simpler interface to utf8 string processing.</div><div class='del'>-	(camel_search_header_match): Use the new things.</div><div class='del'>-</div><div class='del'>-2001-02-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (get_summary): Removed some old variables/a small</div><div class='del'>-	memleak.</div><div class='del'>-	(free_summary): Removed old variables.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_check_mailing_list): New utility</div><div class='del'>-	function to get the mailing list (if any) that a set of headers</div><div class='del'>-	came from.</div><div class='del'>-</div><div class='del'>-2001-02-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Added a missing #include.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c: Added a missing #include.</div><div class='del'>-</div><div class='del'>-2001-02-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_query_auth_types): Oops. Change</div><div class='del'>-	this too.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types):</div><div class='del'>-	Updated.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): Updated.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): Now takes a</div><div class='del'>-	boolean value to specify whether or not to connect when</div><div class='del'>-	constructing a supported authtype list.</div><div class='del'>-</div><div class='del'>-2001-02-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_write): Revert jeff's earlier change,</div><div class='del'>-	the change below is the more-correct fix.  All his was doing was</div><div class='del'>-	ignoring the return code &amp; looping actually :)</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_write): Since we are non-blocking on</div><div class='del'>-	the outgoing fd, keep looping if writing out large blocks, so we</div><div class='del'>-	can keep checking for cancel, etc.</div><div class='del'>-</div><div class='del'>-2001-02-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (camel_folder_thread_messages_new): When</div><div class='del'>-	we drop a fake node, dont skip checking the next in the list.</div><div class='del'>-	(camel_folder_thread_messages_new): Add an assertion check just to</div><div class='del'>-	make sure we dont get any pseudo nodes, and spit a warning if we</div><div class='del'>-	do.</div><div class='del'>-</div><div class='del'>-2001-02-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_write): Make do_write loop until the</div><div class='del'>-	entire buffer is written.</div><div class='del'>-</div><div class='del'>-2001-02-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Add missing header for cancel check stuff.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_cancel_cancel): Fix a wrong cast.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (init_header_name_table): Setup a new table</div><div class='del'>-	header_formatted_table, that lists headers that we dont want to</div><div class='del'>-	fold (they've already been folded).</div><div class='del'>-	(write_to_stream): Check for already formatted headers, and dont</div><div class='del'>-	try and fold them.  This is a fix for bug #1097.</div><div class='del'>-</div><div class='del'>-2001-02-01  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): If we are folding, drop the</div><div class='del'>-	space at the end of the line.</div><div class='del'>-</div><div class='del'>-2001-01-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (timeout_cb): Remvoe the stream locking</div><div class='del'>-	here.  I think this was leading to a deadlock when a keepalive is</div><div class='del'>-	being sent, in imap.</div><div class='del'>-</div><div class='del'>-2001-01-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(imap_command_strdup_vprintf): Include the terminating NUL in the</div><div class='del'>-	calculated string length.  This hit memcheck.</div><div class='del'>-</div><div class='del'>-2001-01-25  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/folder/test3.c: Changed the subject search to handle case</div><div class='del'>-	sensitive when it is mixed case.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Added camel-ssearch-private.c</div><div class='del'>-	(noinst_HEADERS): Added camel-search-private.h</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (check_header): New function to do the</div><div class='del'>-	work of the various header checks.</div><div class='del'>-	(search_header_matches): </div><div class='del'>-	(search_header_starts_with): </div><div class='del'>-	(search_header_ends_with): </div><div class='del'>-	(search_header_contains): Use check_header to do the work.</div><div class='del'>-	(build_match_regex): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (header_soundex):  New</div><div class='del'>-	function to match words to phrases using soundex algorithm.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (soundexcmp): Removed.</div><div class='del'>-	(check_match): Moved to search-private.h</div><div class='del'>-</div><div class='del'>-2001-01-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-search-private.c (camel_search_build_match_regex): Added</div><div class='del'>-	extra flags, so the same function can be used for</div><div class='del'>-	start/end/whole/partial matches.</div><div class='del'>-	(camel_search_header_match): Convenience function to check a</div><div class='del'>-	single header against all sorts of different matches.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains): Fix for</div><div class='del'>-	e_sexp api changes.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: Fix for e_sexp api changes.</div><div class='del'>-	(search_header_contains): Free args/quit on unknown header.</div><div class='del'>-	(search_header_matches): "</div><div class='del'>-	(search_header_starts_with): "</div><div class='del'>-	(search_header_ends_with): "</div><div class='del'>-	(match_message): Add an exception argument.</div><div class='del'>-	(search_body_contains): Free args/quit on fatal error.</div><div class='del'>-	(message_body_contains): Removed (moved to</div><div class='del'>-	camel-search-private.c), fixed callers.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c: Fix for e_sexp api changes.</div><div class='del'>-	(build_match_regex, message_body_contains): Moved into</div><div class='del'>-	camel-filter-private.c  Fixed callers.</div><div class='del'>-	(check_header): moved guts to camel-search-private, and</div><div class='del'>-	changed to use regex's for everything.  Just calls that with the</div><div class='del'>-	right args.</div><div class='del'>-	(check_header): GEts the header, decodes it, and checks for</div><div class='del'>-	failure, and whatnot.</div><div class='del'>-	(check_match): Removed.</div><div class='del'>-	(header_soundex): Changed significantly.  Now it soundexes each</div><div class='del'>-	word in the header separately, and compares it to the first</div><div class='del'>-	argument.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test9.c (main): Fix for api changes.</div><div class='del'>-	(main): Added tests to see that invalid match and action</div><div class='del'>-	rules are properly detected.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_mbox): Remove</div><div class='del'>-	the 'finished message' bit.</div><div class='del'>-	(camel_filter_driver_filter_message): Remove an accidentally</div><div class='del'>-	checked in debug.</div><div class='del'>-	(camel_filter_driver_filter_message): Fix for e-sexp api changes.</div><div class='del'>-</div><div class='del'>-2001-01-23  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-wrapper.c: Add a lock around the</div><div class='del'>-	delayed loading, so two threads won't try to do it at the same</div><div class='del'>-	time.</div><div class='del'>-</div><div class='del'>-2001-01-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Set the</div><div class='del'>-	CamelFolder::name to just the base part of the vfolder name (the</div><div class='del'>-	non-query part)</div><div class='del'>-</div><div class='del'>-2001-01-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (camel_filter_search_match): Perform error</div><div class='del'>-	checking on parsing/execution.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	Perform error handling on search expression.</div><div class='del'>-	(CamelFolderSearchPrivate): Add a camelexception for error</div><div class='del'>-	returns.</div><div class='del'>-	(camel_folder_search_execute_expression): Setup exception pointer.</div><div class='del'>-	(search_match_all): Quit on error.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c (message_info_load): Removed</div><div class='del'>-	some debug 'warnings', as they should now be displayed at the</div><div class='del'>-	toplevel loader, and just made the code match similar code</div><div class='del'>-	elsewhere.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (message_info_load): Error</div><div class='del'>-	handling.</div><div class='del'>-	(message_info_save): more error handling.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_load): Add error handling</div><div class='del'>-	and sanity checking.</div><div class='del'>-	(camel_folder_summary_load): Add error checks.</div><div class='del'>-	(perform_content_info_load): Error + sanity checks.</div><div class='del'>-	(content_info_load): error + sanity checks.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (close_folder): avoid /0 by updating after</div><div class='del'>-	we've done the sync.</div><div class='del'>-	(close_folders): Setup the first progress report to start it off.</div><div class='del'>-	(camel_filter_driver_filter_message): Fix a fixme, check errors in</div><div class='del'>-	e_sexp parsing, etc.</div><div class='del'>-</div><div class='del'>-2001-01-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	Initialize the value of the variable exists here.</div><div class='del'>-</div><div class='del'>-2001-01-22  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore */*/.cvsignore: Added profiling temp</div><div class='del'>-	files.</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (camel_folder_thread_messages_new): When</div><div class='del'>-	removing phantom nodes, check for the end node too.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.[ch]: Changed status vars to be</div><div class='del'>-	CAMEL_FILTER_STATUS_ etc.</div><div class='del'>-</div><div class='del'>-2001-01-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_param_list_format_append): Make the</div><div class='del'>-	output a little prettier. Okay, so I'm anal...</div><div class='del'>-</div><div class='del'>-2001-01-21  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.h: Added an exception to</div><div class='del'>-	CamelFilterGetFolderFunc.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message):</div><div class='del'>-	Remove source parameter, as it is determined elsewhere now.</div><div class='del'>-	(camel_filter_driver_filter_folder): Same here.</div><div class='del'>-	(camel_filter_driver_filter_mbox): And here.</div><div class='del'>-	(do_move): If we cannot open a folder, quit, rather than ignoring</div><div class='del'>-	it.</div><div class='del'>-	(do_copy): Here too.</div><div class='del'>-	(open_folder): Pass an exception into get_folder callback.</div><div class='del'>-	(camel_filter_driver_filter_folder): Report that we're syncing,</div><div class='del'>-	when we are.</div><div class='del'>-	(camel_filter_driver_filter_mbox): And here too.</div><div class='del'>-	(close_folder): And here.</div><div class='del'>-</div><div class='del'>-2001-01-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_message): Set</div><div class='del'>-	the deleted bit *before* copying to the default folder, this way</div><div class='del'>-	if they are importing mail and have a rule to delete it, it</div><div class='del'>-	doesn't get copied to the default folder un-deleted.</div><div class='del'>-</div><div class='del'>-2001-01-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(get_subscribed_folders_by_hand): If LISTing a subscribed folder</div><div class='del'>-	doesn't return a LIST response, just ignore that folder. Yay</div><div class='del'>-	RFC2060.</div><div class='del'>-	(subscribe_folder): add a missing UNLOCK</div><div class='del'>-</div><div class='del'>-2001-01-19  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Mark strings for translation.</div><div class='del'>-	</div><div class='del'>-2001-01-19  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (report_status): Add a percentage complete</div><div class='del'>-	indicator to the status thing.</div><div class='del'>-	(camel_filter_driver_filter_mbox): Add percentage complete to</div><div class='del'>-	reporting.	</div><div class='del'>-	(camel_filter_driver_filter_folder): Same.</div><div class='del'>-</div><div class='del'>-2001-01-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): More tweaking... skip</div><div class='del'>-	separator characters after the namespace character. (Gets rid of</div><div class='del'>-	the shell folder registration warning some people have had with</div><div class='del'>-	IMAP)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): I'm sure there</div><div class='del'>-	was some clever reason I was storing the flags of the folder in</div><div class='del'>-	the hash table rather than just "1", but I don't remember what it</div><div class='del'>-	was now. Anyway, since we only ever test NULL/non-NULL, store 1,</div><div class='del'>-	since flags is sometimes 0.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Oops.</div><div class='del'>-	Somewhere in one of the reorgs, the code to add new messages to</div><div class='del'>-	the CamelFolderChangeInfo structure got removed. Fix that.</div><div class='del'>-</div><div class='del'>-2001-01-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c (message_info_load): Add</div><div class='del'>-	some g_warnings() to help debug later if I ever get the segfaults</div><div class='del'>-	I was getting earlier. Can't seem to reproduce them after my</div><div class='del'>-	previous "fix".</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_load): Undid my</div><div class='del'>-	change here, NotZed said it was wrong and that if it gets a NULL</div><div class='del'>-	mi then it should abort and not continue.</div><div class='del'>-</div><div class='del'>-2001-01-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_load): Make sure</div><div class='del'>-	that the message-info is non-null before we go accessing inner</div><div class='del'>-	parts of it and/or adding it to the summary array. I may not have</div><div class='del'>-	handled the error correctly, but it does seem to work</div><div class='del'>-	correctly. If NotZed could double-check this it'd be great.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (get_smtp_error_string):</div><div class='del'>-	New smtp error-code to string mapping function.</div><div class='del'>-	(smtp_connect): Use the new error-&gt;string function for reporting</div><div class='del'>-	useful errors.</div><div class='del'>-	(smtp_helo): Same. Also use a case-insensitive strstr for 8BITMIEM</div><div class='del'>-	as it seems Exchange sends back lowercase for that one single SMTP</div><div class='del'>-	extension. Everything else is uppercase. I'm seeing a lack of love</div><div class='del'>-	for that extension by Microsoft dudes...</div><div class='del'>-	(smtp_mail): Use get_smtp_error_string.</div><div class='del'>-	(smtp_rcpt): Same.</div><div class='del'>-	(smtp_data): Same.</div><div class='del'>-	(smtp_quit): Same.</div><div class='del'>-	(smtp_rset): Same.</div><div class='del'>-</div><div class='del'>-2001-01-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_array): Add an int</div><div class='del'>-	i so this code will compile. Should I be worried about how well</div><div class='del'>-	this code will work? ;-)</div><div class='del'>-</div><div class='del'>-2001-01-17  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (free_summary): Call</div><div class='del'>-	camel_folder_summary_array_free() to do the work.</div><div class='del'>-	(get_summary): Use camel_folder_summary_array() to get the array</div><div class='del'>-	atomically.  These fixes allow folder/test8 to work again, and fix</div><div class='del'>-	a sort of race where the summary size can change while we were</div><div class='del'>-	making a copy of it.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_array): Get the</div><div class='del'>-	summary array atomically, so it can't contain empty records.</div><div class='del'>-	(camel_folder_summary_array_free): And free it.</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.c (die): If we are verbose &amp; in threads,</div><div class='del'>-	then goto sleep so we can debug.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test8.c (worker): Add a missing pull() for</div><div class='del'>-	comnparing content.</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c: Fix the symbol table, so match-all is an</div><div class='del'>-	immediate function, as it should be.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test9.c (main): New test, tests some filtering</div><div class='del'>-	things.</div><div class='del'>-</div><div class='del'>-	* tests/message/test3.c (main): Dont use a boundary string with</div><div class='del'>-	spaces in it.  Folding can corrupt it.  Maybe the folding isn't</div><div class='del'>-	working entirely right, but anyway.</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Debug out the debug.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_filter_folder): Plug</div><div class='del'>-	a messageinfo leak.</div><div class='del'>-</div><div class='del'>-2001-01-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Delayed loading of IMAP message parts.</div><div class='del'>-</div><div class='del'>-	* camel-types.h: typedef CamelMessageInfo and</div><div class='del'>-	CamelMessageContentInfo here</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Add a "size" field to</div><div class='del'>-	CamelMessageContentInfo.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_content_info_new,</div><div class='del'>-	camel_folder_summary_content_info_free): Renamed and made</div><div class='del'>-	non-static for providers that construct their own content info.</div><div class='del'>-	(content_info_load, content_info_save): load/save size</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_is_offline): New</div><div class='del'>-	function to return if a data wrapper's contents are "offline". (So</div><div class='del'>-	that, for example, we don't make thumbnails of images that haven't</div><div class='del'>-	been loaded off the IMAP server yet.) Defaults to FALSE.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	Fix a bug in re-selecting a folder when messages have been</div><div class='del'>-	expunged from it by another client in the meantime.</div><div class='del'>-	(imap_get_message): Rewrite. If the message is larger than a</div><div class='del'>-	certain size, just create a skeleton message containing</div><div class='del'>-	CamelImapWrappers that will read parts as needed. This way, large</div><div class='del'>-	attachments only need to be downloaded if the user looks at them,</div><div class='del'>-	and multipart/alternative alternatives that aren't used will never</div><div class='del'>-	be downloaded at all.</div><div class='del'>-	(imap_update_summary): Rewrite this a bunch too to make the</div><div class='del'>-	parsing more robust.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c</div><div class='del'>-	(CAMEL_IMAP_SUMMARY_VERSION): bump.</div><div class='del'>-	(camel_imap_summary_new): Set build_content to TRUE.</div><div class='del'>-	(content_info_load, content_info_save): Only save/load the content</div><div class='del'>-	for messages that have it. (The content info gets created as a</div><div class='del'>-	side effect of imap_get_message.)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_body): New routine</div><div class='del'>-	(and helpers) to parse an IMAP 'body' FETCH response and fill in a</div><div class='del'>-	CamelMessageContentInfo from it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimap_la_SOURCES,</div><div class='del'>-	libcamelimap_la_HEADERS): add camel-imap-wrapper.</div><div class='del'>-</div><div class='del'>-2001-01-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_getsockopt, stream_setsockopt):</div><div class='del'>-	* camel-stream-fs.c (stream_read, stream_write): </div><div class='del'>-	* camel-remote-store.c (socket_connect): fcntl(fd, F_GETFL)</div><div class='del'>-	returns the flags as the return value, not via a passed in</div><div class='del'>-	pointer. And F_SETFL looks for an int, not a long, and you have to</div><div class='del'>-	pass it what it's expecting because it's a va_arg parameter. (Yes,</div><div class='del'>-	the man page lies on Linux. But check the UNIX98 spec or the glibc</div><div class='del'>-	source.) Also, fix another bug in socket_connect: if we manage to</div><div class='del'>-	connect right away, unset O_NONBLOCK so it doesn't mess us up</div><div class='del'>-	later.</div><div class='del'>-</div><div class='del'>-	Fixes a bunch of problems with non-blocking I/O being done in the</div><div class='del'>-	allegedly-blocking case and then returning EWOULDBLOCK.</div><div class='del'>-</div><div class='del'>-2001-01-16  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (NNTP_DIR): set to nntp if ENABLE_NNTP</div><div class='del'>-	(SUBDIRS): use $(NNTP_DIR)</div><div class='del'>-</div><div class='del'>-2001-01-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_rcpt): Don't check</div><div class='del'>-	errno as it's not being set. Fixes bug #1150.</div><div class='del'>-</div><div class='del'>-2001-01-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Ugh, this design is ugly like my butt.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_query_cert_authenticator): New</div><div class='del'>-	function which will be useful when we integrate SSL.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (ssl_auth_cert): Callback to authenticate</div><div class='del'>-	a certificate.</div><div class='del'>-	(ssl_bad_cert): Callback that gets the reason the certificate is</div><div class='del'>-	bad and then calls camel's cert-authenticator callback to notify</div><div class='del'>-	the user and to allow the user to override the check.</div><div class='del'>-	(stream_connect): Set the URL we expect to connect with and setup</div><div class='del'>-	the auth_cert and bad_cert callbacks.</div><div class='del'>-	(camel_tcp_stream_ssl_new): Now takes a CamelSession and a</div><div class='del'>-	expected_host argument that it will use for certificate</div><div class='del'>-	authentication.</div><div class='del'>-	(camel_tcp_stream_ssl_finalize): Unref the session and free the</div><div class='del'>-	expected_host.</div><div class='del'>-</div><div class='del'>-2001-01-16  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-filter-search.c (header_exists): Changed to support</div><div class='del'>-	multiple args (or'd together).</div><div class='del'>-	(header_contains): Cleaned up to match the search code.  Why did</div><div class='del'>-	fejj change it? I'll never know.</div><div class='del'>-	(header_matches): </div><div class='del'>-	(header_starts_with): </div><div class='del'>-	(header_ends_with): Big cleanup of fejj's "i'm the cut &amp; paste</div><div class='del'>-	king" code.  Also properly handle or'ing of additional args to</div><div class='del'>-	match what the folder-search code should do.</div><div class='del'>-	(check_match): New function which does the annoying matching</div><div class='del'>-	stuff (for header matches).</div><div class='del'>-	(check_header): Similarly, handles or'ing of the matches together.</div><div class='del'>-	(header_contains):</div><div class='del'>-	(header_matches): </div><div class='del'>-	(header_starts_with): </div><div class='del'>-	(header_ends_with): Call check_header to do the actual work.</div><div class='del'>-	(header_soundex): And here too.</div><div class='del'>-	(match_all): Yeah like match-all isn't passed expression results,</div><div class='del'>-	its passed expression terms.  Fix this so match-all works like it</div><div class='del'>-	should, by executing the contained expression.</div><div class='del'>-	(message_body_contains): Copied directly from</div><div class='del'>-	camel-folder-search.c, a more robust/faster/simpler body search</div><div class='del'>-	code.</div><div class='del'>-	(mime_part_matches): Removed entirely.</div><div class='del'>-	(handle_multipart): Removed entirely.</div><div class='del'>-	(build_match_regex): Copied from camel-folder-search.  Builds a</div><div class='del'>-	set of simple strings into a regex pattern that matches any of</div><div class='del'>-	them (for faster &amp; simpler matching).  Expanded to accept regex</div><div class='del'>-	patterns itself, so it can merge them together.</div><div class='del'>-	(body_contains): Use build match/match message to match using a</div><div class='del'>-	built regex.</div><div class='del'>-	(body_regex): Likewise, this time we tell it we're building a</div><div class='del'>-	regex though.</div><div class='del'>-	(header_full_regex): Use build_match_regex to take the drudgery</div><div class='del'>-	out of it, and expand it to handle multiple regex's at once.</div><div class='del'>-	(get_full_header): slightly cleaner (well i dunno, the sprintf</div><div class='del'>-	stuff just got to me).</div><div class='del'>-	(header_regex): Cleaned up to use build_match_Regex too, and to</div><div class='del'>-	properly check types.</div><div class='del'>-	(filter_message_search): Just allocate 'fms' on the stack.</div><div class='del'>-</div><div class='del'>-	* camel-filter-driver.c (camel_filter_driver_finalise): </div><div class='del'>-	(camel_filter_driver_init): </div><div class='del'>-	(camel_filter_driver_class_init): </div><div class='del'>-	(camel_filter_driver_get_type): Changed from gtk object to camel</div><div class='del'>-	object.</div><div class='del'>-	(camel_filter_driver_add_rule): New function to add a rule to be</div><div class='del'>-	processed in sexp form.</div><div class='del'>-	(camel_filter_driver_init): Init the rules list.</div><div class='del'>-	(camel_filter_driver_finalise): Clear the rules/rules list.</div><div class='del'>-	(camel_filter_driver_filter_message): Scan rules list directly</div><div class='del'>-	rather than creating on the fly.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Added camel-filter-driver.h</div><div class='del'>-	(libcamel_la_SOURCES): Added camel-filter-driver.c, code taken</div><div class='del'>-	from filter-driver, which can drive, uh, filters based on sexp's.</div><div class='del'>-	(libcamelinclude_HEADERS): </div><div class='del'>-	(libcamel_la_SOURCES): Added camel-filter-search.[ch]</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_decode_string):</div><div class='del'>-	Chganged len back to be unsigned.  And do a simple range check on</div><div class='del'>-	the string value to try and detect corrupted summary files.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Handle</div><div class='del'>-	cancelled stream reads with an appropriate exception.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Fix the include-once</div><div class='del'>-	macro.  Doh, confliced with camel-private.h.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_store_refresh_folders):</div><div class='del'>-	A copy of camel_remote_store_refresh_folders.  We avoid locking</div><div class='del'>-	each folder when we call it though.  This should be removed when i</div><div class='del'>-	can work out how to remove the folder lock from this function</div><div class='del'>-	easily.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_write): Fix n' argument of select.</div><div class='del'>-	(stream_read): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (socket_connect): Bump the connect timeout</div><div class='del'>-	upto 4 minutes.</div><div class='del'>-	(socket_connect): Oops, fix the 'n' argument of select.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_cancel_cancel): If we are given no</div><div class='del'>-	cancellation node, then do it for all active ones.</div><div class='del'>-</div><div class='del'>-2001-01-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_close): If the close() is successful,</div><div class='del'>-	set the fd to -1.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c: Removed the disconnect() method.</div><div class='del'>-	(stream_close): If the close() is successful, set the sockfd to</div><div class='del'>-	-1.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c: Removed the disconnect() method.</div><div class='del'>-	(stream_close): If the close() is successful, set the sockfd to</div><div class='del'>-	NULL.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.c (camel_tcp_stream_disconnect): Removed,</div><div class='del'>-	easier to just use the close() method as it did the same thing</div><div class='del'>-	anyway.</div><div class='del'>-</div><div class='del'>-2001-01-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_getsockopt): Updated to be able</div><div class='del'>-	to get the CAMEL_SOCKOPT_NONBLOCKING socket opt.</div><div class='del'>-	(stream_setsockopt): Updated to be able to set the</div><div class='del'>-	CAMEL_SOCKOPT_NONBLOCKING socket opt.</div><div class='del'>-</div><div class='del'>-2001-01-15  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock</div><div class='del'>-	around the imap_rescan, which needs it.</div><div class='del'>-</div><div class='del'>-2001-01-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (socket_connect): A cancellable connection</div><div class='del'>-	routine.</div><div class='del'>-	(remote_send_string): Return cancelled exception if we were.</div><div class='del'>-	(remote_send_stream): "</div><div class='del'>-	(remote_recv_line): "</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (stream_read): First cut at cancellation</div><div class='del'>-	stuff.  Its looking a bit ugly.</div><div class='del'>-</div><div class='del'>-2001-01-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_connect): Uses an SSL socket now</div><div class='del'>-	although there's still a few things missing (like certificate</div><div class='del'>-	handling and such).</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_ssl_init): A replacement function for</div><div class='del'>-	camel_init() that also initializes SSL.</div><div class='del'>-</div><div class='del'>-2001-01-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.c (stream_getsockopt): Implemented.</div><div class='del'>-	(stream_setsockopt): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.c (stream_getsockopt): Implemented.</div><div class='del'>-	(stream_setsockopt): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.c (camel_tcp_stream_getsockopt): New method.</div><div class='del'>-	(camel_tcp_stream_setsockopt): Another new method. I think you get</div><div class='del'>-	the idea of what these are for so I won't explain them.</div><div class='del'>-</div><div class='del'>-2001-01-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-ssl.[c,h]: New CamelTcpStream class that</div><div class='del'>-	implements nspr sockets and eventually will use nss for</div><div class='del'>-	SSL/TLS. Currently doesn't do any SSL/TLS but it should still</div><div class='del'>-	work. It's functionally equivalent to CamelTcpStreamRaw at the</div><div class='del'>-	moment only it uses nspr i/o.</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream-raw.[c,h]: New CamelTcpStream class that</div><div class='del'>-	implements native sockets. Should be usable but may have some bugs</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-2001-01-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-tcp-stream.[c,h]: New abstract class for TCP streams. The</div><div class='del'>-	next step is to write child classes (CamelTcpStreamBSD and</div><div class='del'>-	CamelTcpStreamSSL). The BSD stream will use normal BSD sockets</div><div class='del'>-	while SSL will use Mozilla's NSPR and NSS libraries to do Secure</div><div class='del'>-	Socket Layers which wille ventually replace CamelStreamSSL which I</div><div class='del'>-	just commit'd. Oh well.</div><div class='del'>-</div><div class='del'>-2001-01-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-ssl.[c,h]: New stream for handling SSL/TLS</div><div class='del'>-	connections.</div><div class='del'>-</div><div class='del'>-2001-01-12  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (camel_folder_thread_messages_new):</div><div class='del'>-	Perform a final pass, removing any pseudo nodes we added earlier.</div><div class='del'>-	Quick patch to test the idea.</div><div class='del'>-	(camel_folder_thread_messages_new): Added casts to rmeove some</div><div class='del'>-	warnings for the analites out there.</div><div class='del'>-</div><div class='del'>-2001-01-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	Fix a bug in previous commit: don't check for deleted messages if</div><div class='del'>-	there are no known messages in the folder (because it would end up</div><div class='del'>-	sending "FETCH 0 ...").</div><div class='del'>-	(imap_copy_message_to): Fix this up: sync flags to the server</div><div class='del'>-	before copying so that they end up correct in the remote folder.</div><div class='del'>-	And poke the destination folder after doing the copy so it notices</div><div class='del'>-	the new message right away.</div><div class='del'>-	(imap_move_message_to): Call imap_copy_message_to for most of the</div><div class='del'>-	work rather than duplicating the code (since it's much more</div><div class='del'>-	complicated now).</div><div class='del'>-</div><div class='del'>-2001-01-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_selected):</div><div class='del'>-	New function to check for added/deleted messages when re-selecting</div><div class='del'>-	a folder.</div><div class='del'>-	(imap_refresh_info, imap_rescan, imap_update_summary): Various</div><div class='del'>-	locking tweaks that turn out to be irrelevant since command_lock</div><div class='del'>-	is recursive, but whatever.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): When</div><div class='del'>-	selecting a new folder, call camel_imap_folder_selected on it.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_message_to): Fix a locking</div><div class='del'>-	problem. (One branch of an if statement was returning with the</div><div class='del'>-	lock still locked.) Also remove the deprecation comments, to match</div><div class='del'>-	move_message_to.</div><div class='del'>-</div><div class='del'>-2001-01-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c: Changed the descriptions</div><div class='del'>-	for mh, mbox, and maildir to be more "user-friendly".</div><div class='del'>-</div><div class='del'>-2001-01-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-types.h: New header to prevent</div><div class='del'>-	recursive #include problems</div><div class='del'>-</div><div class='del'>-	* providers/imap/*.h: Replace some #includes with #include</div><div class='del'>-	"camel-imap-types.h", remove typedefs that were moved to</div><div class='del'>-	camel-imap-types.h</div><div class='del'>-</div><div class='del'>-	* providers/imap/*.c: Add #includes to make up for #includes</div><div class='del'>-	removed from .h files</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add</div><div class='del'>-	camel-imap-types.h</div><div class='del'>-</div><div class='del'>-2001-01-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_sync): New class function, parallel</div><div class='del'>-	to camel_folder_sync. (The default implementation just calls</div><div class='del'>-	camel_folder_sync on each cached folder.)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Call</div><div class='del'>-	camel_store_sync before doing anything else so that the IMAP</div><div class='del'>-	server and Camel are working from the same data. Don't ask the</div><div class='del'>-	server for the unread message count of the current folder, since</div><div class='del'>-	UW will return often-incorrect cached data, and we can calculate</div><div class='del'>-	it without talking to the server anyway.</div><div class='del'>-</div><div class='del'>-2001-01-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Mostly IMAP changes. Use the NAMESPACE extension (where</div><div class='del'>-	available). Deal with servers that don't return LIST flags in</div><div class='del'>-	response to LSUB (like UW) to get rid of the "not a selectable</div><div class='del'>-	folder" error messages in the UI. Take advantage of the \Marked</div><div class='del'>-	and \Unmarked flags to try to speed up the folder scan by not</div><div class='del'>-	doing STATUS on unmarked folders. Some further tweaks on the shape</div><div class='del'>-	of the resulting folder tree in various situations...</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Remove the (read) message_count, since nothing</div><div class='del'>-	uses it, and we can speed up IMAP a bit this way.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Redo this a bit to make</div><div class='del'>-	it more useful for IMAP since that's the only thing that uses it.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_connected): Public</div><div class='del'>-	function to check if the store is connected, and try to connect it</div><div class='del'>-	if it's not.</div><div class='del'>-	(remote_send_string, remote_send_stream, remote_recv_line): Use</div><div class='del'>-	that.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_finalize):</div><div class='del'>-	fix up for changes.</div><div class='del'>-	(camel_imap_store_init): Initialize subscribed_folders to NULL</div><div class='del'>-	rather than an empty hash table.</div><div class='del'>-	(imap_connect): Get the list of subscribed folders here. If the</div><div class='del'>-	server doesn't claim that any of them are either Marked or</div><div class='del'>-	Unmarked, then assume that it doesn't do that for LSUB and</div><div class='del'>-	remember that for later. If the server supports the NAMESPACE</div><div class='del'>-	extension and the user didn't specify a namespace, use the</div><div class='del'>-	server-provided one.</div><div class='del'>-	(imap_disconnect): Free the list of subscribed folders, and the</div><div class='del'>-	namespace.</div><div class='del'>-	(get_folder): check camel_remote_store_connected</div><div class='del'>-	(get_folder_info): check camel_remote_store_connected. Add a bunch</div><div class='del'>-	of new cleverness. If we learned that the server doesn't do LSUB</div><div class='del'>-	usefully, do a bunch of LISTs by hand. Then, if we're getting</div><div class='del'>-	unread counts, only do it for folders that weren't listed as</div><div class='del'>-	Unmarked. Also, deal with namespaces that end with the separator</div><div class='del'>-	character, and update for changes to camel_folder_info_build.</div><div class='del'>-	(folder_subscribed): Add a g_return_val_if_fail.</div><div class='del'>-	(subscribe_folder, unsubscribe_folder): check</div><div class='del'>-	camel_remote_store_connected.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (build_folder_info,</div><div class='del'>-	build_folder_info_from_grouplist, nntp_store_get_folder_info):</div><div class='del'>-	Don't fill in message_count since it doesn't exist any more.</div><div class='del'>-</div><div class='del'>-2001-01-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Kill off a long-hated Camel kludge: "empty" URLs and</div><div class='del'>-	query_auth_types_generic.</div><div class='del'>-</div><div class='del'>-	* camel-url.c: Remove "empty" from CamelURL.</div><div class='del'>-	(camel_url_new): No longer set it.</div><div class='del'>-	(camel_url_to_string): Treat "" as equivalent to NULL for</div><div class='del'>-	authmech. (Unrelated change, but it simplifies some stuff with the</div><div class='del'>-	new config dialog.)</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Remove url-&gt;empty check: if</div><div class='del'>-	the URL isn't valid, we don't create the service.</div><div class='del'>-	(camel_service_query_auth_types): No longer need to switch between</div><div class='del'>-	generic and connected variants.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types): </div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): </div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_query_auth_types): </div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): </div><div class='del'>-	* camel-remote-store.c (remote_query_auth_types): Remove generic</div><div class='del'>-	version, rename connected version.</div><div class='del'>-</div><div class='del'>-2001-01-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Dont</div><div class='del'>-	try and unref a messageinfo that wasn't there, and use the right</div><div class='del'>-	free function too.  Modified patch from Iain.</div><div class='del'>-	(vee_move_message_to): New method, call the real folders'</div><div class='del'>-	move_message_to method.</div><div class='del'>-</div><div class='del'>-2001-01-04  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/Makefile.am: fix includes for compilation</div><div class='del'>-</div><div class='del'>-	* tests/message/Makefile.am: Build test3 again</div><div class='del'>-</div><div class='del'>-	* tests/message/test2.c: Kill warnings with header includes</div><div class='del'>-</div><div class='del'>-	* tests/message/test3.c: ditto</div><div class='del'>-</div><div class='del'>-	* tests/lib/streams.c: ditto</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.c: ditto</div><div class='del'>-</div><div class='del'>-	* tests/lib/messages.c: ditto</div><div class='del'>-</div><div class='del'>-	* tests/lib/folders.c: ditto</div><div class='del'>-</div><div class='del'>-2001-01-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_rescan): Fix two</div><div class='del'>-	problems in figuring out server-expunged messages.</div><div class='del'>-</div><div class='del'>-2001-01-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (thaw): If we have a lot of messages changed,</div><div class='del'>-	promote it to a folder changed event.</div><div class='del'>-</div><div class='del'>-2000-01-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_matches): Implemented.</div><div class='del'>-	(search_header_exists): Implemented.</div><div class='del'>-	(search_header_starts_with): Implemented.</div><div class='del'>-	(search_header_ends_with): Implemented.</div><div class='del'>-</div><div class='del'>-2001-01-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new):</div><div class='del'>-	Initialize the exists variable so that we don't do random things</div><div class='del'>-	if the imap server misbehaves.</div><div class='del'>-</div><div class='del'>-2000-12-29  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_move_message_to): REmove warning,</div><div class='del'>-	this isn't really deprecated, sigh.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): Comment out some debug.</div><div class='del'>-</div><div class='del'>-2001-01-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/maildir/, providers/mbox/, providers/mh/: Removed</div><div class='del'>-	these directories since they're unused.</div><div class='del'>-</div><div class='del'>-2001-01-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	IMAP randomness.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.[ch]: Remove. To be replaced.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Remove</div><div class='del'>-	camel-imap-stream.h</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_flag_list): Take a</div><div class='del'>-	char ** instead of char *, to return the position at the end of</div><div class='del'>-	parsing like the string parsing functions.</div><div class='del'>-	(imap_parse_string_generic): New function to parse a string,</div><div class='del'>-	nstring, or astring.</div><div class='del'>-	(imap_parse_nstring, imap_parse_astring): Now macros</div><div class='del'>-	(imap_parse_string): Added</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.h: Remove the "exists" field</div><div class='del'>-	from CamelImapFolder.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Remove unused include of</div><div class='del'>-	camel-imap-stream.h.</div><div class='del'>-	(camel_imap_folder_init): Remove no-longer-relevant summary</div><div class='del'>-	initialization.</div><div class='del'>-	(camel_imap_folder_new): Update for imap_parse_flag_list change,</div><div class='del'>-	exists removal, and imap_rescan.</div><div class='del'>-	(imap_rescan): New function that does most of the work of the old</div><div class='del'>-	imap_refresh_info, but taking "exists" as an argument instead of</div><div class='del'>-	getting it from the folder. Also calls camel_imap_folder_changed</div><div class='del'>-	to do the summary updating and signalling, rather than duplicating</div><div class='del'>-	that code.</div><div class='del'>-	(imap_refresh_info): Just call imap_rescan (using the size of the</div><div class='del'>-	folder summary as "exists").</div><div class='del'>-	(imap_update_summary): Update for imap_parse_flag_list change</div><div class='del'>-	(camel_imap_folder_changed): Update for "exists" change.</div><div class='del'>-</div><div class='del'>-2001-01-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_simple): New function to</div><div class='del'>-	return just foo/bar with no parameters.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (get_mime_type): Use</div><div class='del'>-	header_content_type_simple rather than header_content_type_format.</div><div class='del'>-</div><div class='del'>-2000-12-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.[ch]: Remove this. It was only a thin</div><div class='del'>-	wrapper around struct _header_content_type anyway, and didn't</div><div class='del'>-	match the naming scheme of anything else.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove gmime-content-field.[ch]</div><div class='del'>-</div><div class='del'>-	* camel.h: Remove gmime-content-field.h</div><div class='del'>-</div><div class='del'>-	* camel-types.h: Add CamelContentType as a typedef for struct</div><div class='del'>-	_header_content_type (especially for use outside of camel).</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c: </div><div class='del'>-	* camel-mime-part.c: </div><div class='del'>-	* camel-mime-message.c: </div><div class='del'>-	* camel-folder-summary.c:</div><div class='del'>-	* camel-folder-search.c: </div><div class='del'>-	* camel-data-wrapper.[ch]: Use CamelContentType and</div><div class='del'>-	header_content_type_* functions rather than the GMime stuff. </div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c: </div><div class='del'>-	* camel-medium.c: Remove unused gmime-content-field.h include.</div><div class='del'>-</div><div class='del'>-2000-12-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): Fix the</div><div class='del'>-	APOP check to not crash on servers that don't return any</div><div class='del'>-	information on the +OK greeting line.</div><div class='del'>-</div><div class='del'>-2000-12-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c (imap_body_contains): Lock</div><div class='del'>-	the command channel while searching.</div><div class='del'>-	(imap_body_contains): If performing a whole uid search, then add</div><div class='del'>-	references to our own summary items, dont look it up in the</div><div class='del'>-	folder.  This way they can't vanish unexpectedly.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.h (CamelImapFolder): Added a</div><div class='del'>-	private field.</div><div class='del'>-	(CamelImapFolder): Removed summary again from here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Added lock for imap</div><div class='del'>-	searches.</div><div class='del'>-</div><div class='del'>-	* Merge from camel-mt-branch.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_update_summary): Merge</div><div class='del'>-	fix, use the folder-&gt;summary.</div><div class='del'>-	(imap_get_message_flags, imap_set_message_flags,</div><div class='del'>-	imap_get_message_user_flag, imap_set_message_user_flag): Removed</div><div class='del'>-	again.</div><div class='del'>-	(camel_imap_folder_init): Setup private data/lock.</div><div class='del'>-	(imap_finalize): Free private data/search lock.</div><div class='del'>-	(imap_search_free): Lock the search_lock.</div><div class='del'>-	(imap_search_by_expression): Lock the search lock when using the</div><div class='del'>-	search object.  Also copy/ref hte summary, rather than getting it</div><div class='del'>-	directly.</div><div class='del'>-	(imap_refresh_info): Free any info lookups.  Use folder-&gt;summary</div><div class='del'>-	not imap_folder-&gt;summary.  And lock around commands.</div><div class='del'>-	(camel_imap_folder_changed): Use folder-&gt;summary again.</div><div class='del'>-	(camel_imap_folder_changed): Make sure we unref the summary lookup.</div><div class='del'>-</div><div class='del'>-2000-12-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): When</div><div class='del'>-	getting the top-level folder list, include INBOX even if it's not</div><div class='del'>-	subscribed. Don't show subscribed folders outside of the given</div><div class='del'>-	namespace. Do a better job of pruning the namespace from the</div><div class='del'>-	returned folder tree.</div><div class='del'>-</div><div class='del'>-2000-12-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-search.c: New CamelFolderSearch</div><div class='del'>-	subclass that just reimplements body_contains (using the IMAP</div><div class='del'>-	SEARCH command). All other kinds of searching are done against the</div><div class='del'>-	local summary.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	Use a CamelImapSearch to do searching.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp, etc): No</div><div class='del'>-	longer needed.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Add missing CAMEL_FOLDER_SEARCH_TYPE</div><div class='del'>-	#define</div><div class='del'>-</div><div class='del'>-2000-12-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_gets): Update the</div><div class='del'>-	doc comment: since it always NUL-terminates the buffer, it reads</div><div class='del'>-	at most @max-1 bytes, not @max.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Fix the "did</div><div class='del'>-	camel_stream_buffer_gets fill the whole buffer" check. Fixes a bug</div><div class='del'>-	when reading lines longer than 1024 characters (eg, IMAP SEARCH</div><div class='del'>-	responses in very large folders).</div><div class='del'>-</div><div class='del'>-2000-12-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Oops.</div><div class='del'>-	Don't do "FETCH 1:0" when the folder is empty.</div><div class='del'>-	(imap_protocol_get_summary_specifier): Request RFC822.SIZE too.</div><div class='del'>-	(imap_update_summary): Parse RFC822.SIZE and add it to the</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-2000-12-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Add "guint32 server_flags"</div><div class='del'>-	to CamelImapMessageInfo to keep track of the last known message</div><div class='del'>-	flag state on the server.</div><div class='del'>-	(message_info_save, message_info_load): Save/load the</div><div class='del'>-	server_flags.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Make this use</div><div class='del'>-	CamelFolderChangeInfo and emit folder_changed notifications as it</div><div class='del'>-	gets them rather than only on refresh_info.</div><div class='del'>-	(imap_refresh_info): Notice flags that get cleared on the server</div><div class='del'>-	as well as flags that get set.</div><div class='del'>-	(imap_update_summary): Remove a comment that never actually</div><div class='del'>-	applied to the committed code.</div><div class='del'>-</div><div class='del'>-2000-12-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Change</div><div class='del'>-	the semantics of fmt: Now %S (capital S) means an IMAP "string",</div><div class='del'>-	(which can be sent as either a quoted string or a literal). If</div><div class='del'>-	the server supports LITERAL+, these will be sent as extended</div><div class='del'>-	literals (which don't require any special escaping). Otherwise</div><div class='del'>-	they'll be sent as quoted strings (and it now properly deals with</div><div class='del'>-	" or \ in the string).</div><div class='del'>-	(imap_command_strdup_vprintf): Utility routine that does the real</div><div class='del'>-	work for the functionality mentioned above.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_quote_string): Turns a</div><div class='del'>-	string into a proper IMAP "quoted string".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: </div><div class='del'>-	* providers/imap/camel-imap-folder.c: Use %S instead of "%s" where</div><div class='del'>-	appropriate.</div><div class='del'>-</div><div class='del'>-2000-12-22  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (GLOBAL_INFO_UNLOCK): Doh, cut and paste</div><div class='del'>-	victim again, call unlock instead of lock!</div><div class='del'>-	(summary_assign_uid): Unlock around trying to get a new uid, if we</div><div class='del'>-	have a clash.</div><div class='del'>-</div><div class='del'>-2000-12-21  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/folder/Makefile.am (TESTS): reenabled the tests here.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c (CamelNNTPNewsrc): Add a</div><div class='del'>-	lock.  Made completely mt-safe.  Sigh, this is all so i can</div><div class='del'>-	support snooping of the set_flags stuff inside camel-nntp-folder,</div><div class='del'>-	since i've removed the global folder lock from all of the other</div><div class='del'>-	folder summary operations.</div><div class='del'>-	(camel_nntp_newsrc_read_for_server): Setup lock.</div><div class='del'>-	(camel_nntp_newsrc_get_highest_article_read): Lock internal access.</div><div class='del'>-	(camel_nntp_newsrc_get_num_articles_read): </div><div class='del'>-	(camel_nntp_newsrc_mark_article_read): </div><div class='del'>-	(camel_nntp_newsrc_mark_range_read): </div><div class='del'>-	(camel_nntp_newsrc_article_is_read): </div><div class='del'>-	(camel_nntp_newsrc_group_is_subscribed): </div><div class='del'>-	(camel_nntp_newsrc_unsubscribe_group): </div><div class='del'>-	(camel_nntp_newsrc_subscribe_group): </div><div class='del'>-	(camel_nntp_newsrc_get_subscribed_group_names): </div><div class='del'>-	(camel_nntp_newsrc_get_all_group_names): "</div><div class='del'>-	(camel_nntp_newsrc_write_to_file): Lock internal accesses.</div><div class='del'>-	(camel_nntp_newsrc_write): Lock around diry stuff.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_check):</div><div class='del'>-	Lock around our internal poking of the summary hashtable/array.</div><div class='del'>-	(maildir_summary_sync): And the same here too.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Moved the summaryprivate data into</div><div class='del'>-	camel-private.h.  Only needed for the locks really.</div><div class='del'>-	(camel_folder_summary_init): Setup locks.</div><div class='del'>-	(camel_folder_summary_set_filename): Lock.</div><div class='del'>-	(camel_folder_summary_index): lock</div><div class='del'>-	(camel_folder_summary_uid): Lock</div><div class='del'>-	(camel_folder_summary_next_uid): "</div><div class='del'>-	(camel_folder_summary_set_uid): "</div><div class='del'>-	(camel_folder_summary_load): Lock around whole load.  Hrm,</div><div class='del'>-	probably not required.</div><div class='del'>-	(camel_folder_summary_save): Lock around whole save, this is</div><div class='del'>-	reqwuired, unless we ref/copy the whole list first, and i couldn't</div><div class='del'>-	be bothreed.</div><div class='del'>-	(camel_folder_summary_add): lock</div><div class='del'>-	(summary_assign_uid): Lock around internal accesses.</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): Lock around filtr stuff.</div><div class='del'>-	(camel_folder_summary_info_ref): Add locking.  Could probably use</div><div class='del'>-	its own lock?</div><div class='del'>-	(camel_folder_summary_touch): Add locking, likewise.</div><div class='del'>-	(camel_folder_summary_clear): Lock.  If the preiovus two are</div><div class='del'>-	changed, then so this will need mroe locking.</div><div class='del'>-	(camel_folder_summary_info_free): Lock around refcounting.</div><div class='del'>-	(camel_folder_summary_remove): Locking.</div><div class='del'>-	(camel_folder_summary_remove_uid): Lock ref, unlock, unref.  Also</div><div class='del'>-	fixed a bug that would have made this never work, freeing the key,</div><div class='del'>-	which isn't allocated.</div><div class='del'>-	(camel_folder_summary_remove_index): lock, ref, unlock unref also.</div><div class='del'>-	(camel_message_info_ref): Lock using a separate global lock, since</div><div class='del'>-	we have no context here.</div><div class='del'>-	(camel_message_info_free): Here too.</div><div class='del'>-	(content_info_alloc): Use an alocation lock here.  avoids races</div><div class='del'>-	with setting up content_info_chunks, etc.</div><div class='del'>-	(camel_folder_summary_info_new): And here too.</div><div class='del'>-	(camel_folder_summary_load): Changed to use a differnet lock for</div><div class='del'>-	loading/saving.</div><div class='del'>-	(camel_folder_summary_init): Doh, i do need a reflock afterall,</div><div class='del'>-	set one up.</div><div class='del'>-	(camel_folder_summary_finalize): Free it.</div><div class='del'>-	(camel_folder_summary_index): Add a reflock.</div><div class='del'>-	(camel_folder_summary_uid): And here too.</div><div class='del'>-	(camel_folder_summary_info_free): Use reflock instead of</div><div class='del'>-	summary_lock.</div><div class='del'>-	(camel_folder_summary_info_ref): Likewise.</div><div class='del'>-	(camel_folder_summary_remove_uid): Add reflocking.</div><div class='del'>-	(camel_folder_summary_remove_index): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_new): Setup a</div><div class='del'>-	summary object.</div><div class='del'>-	(vee_folder_build): Build each item into the real summary object.</div><div class='del'>-	(vee_folder_add, vee_folder_add_uid, vee_folder_add_change): New</div><div class='del'>-	functions to add a single record to the vfolder summary.</div><div class='del'>-	(vee_folder_build_folder): Use a real summary.</div><div class='del'>-	(vee_get_uids): Removed, use default impl.</div><div class='del'>-	(vee_free_message_info): "</div><div class='del'>-	(vee_get_message_info): "</div><div class='del'>-	(vee_get_summary): "</div><div class='del'>-	(vee_get_unread_message_count): "</div><div class='del'>-	(vee_get_message_count): "</div><div class='del'>-	(vee_sync): Make vee-folder-sync sync all subordinate folders.</div><div class='del'>-	Well i dont think this is right, but enough peopl ehave aksed for</div><div class='del'>-	it.</div><div class='del'>-	(vee_expunge): Same for expunge.</div><div class='del'>-	(vee_set_message_flags): Call parent class, then mirror flags to</div><div class='del'>-	subfolder.</div><div class='del'>-	(vee_get_message_user_flag): Removed, we just use the default</div><div class='del'>-	impl, and our flags should always match.</div><div class='del'>-	(vee_set_message_user_flag): Snoop the set and set on subfolder.</div><div class='del'>-	(vee_get_message_flags): Removed, jsut use parent impl, assume our</div><div class='del'>-	copy matches the real ones.</div><div class='del'>-	(get_real_message): Removed.  We sort ofneed to keep the</div><div class='del'>-	summaryitem refed while we use it, so this doesn't make as much</div><div class='del'>-	sense as it did once.</div><div class='del'>-	(camel_vee_folder_finalise): Unhook listening events as we unref</div><div class='del'>-	folders.</div><div class='del'>-	(camel_vee_folder_new): Set the summary messageinfo data size</div><div class='del'>-	properly.</div><div class='del'>-	(vfolder_remove_match): Fixed for summary change.</div><div class='del'>-	(folder_changed): ditto.  Also stopped changed items from being</div><div class='del'>-	re-searched and possibly removed.  Might have to resort to the old</div><div class='del'>-	whole-search idea again.</div><div class='del'>-	(message_changed): Similarly.  Might be easier just not to bother</div><div class='del'>-	with a whole search.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.h: Removes summary</div><div class='del'>-	hashtable/array, and use a real summary object.  Sigh, more work.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_sync): Move</div><div class='del'>-	summary to folder object.</div><div class='del'>-	(nntp_folder_get_message_count): Removed, use default impl.</div><div class='del'>-	(nntp_folder_set_message_flags): Call parent impl to do the work,</div><div class='del'>-	but snoop for newsrc.</div><div class='del'>-	(nntp_folder_get_uids): Removed, use default impl.</div><div class='del'>-	(nntp_folder_get_summary): "</div><div class='del'>-	(nntp_folder_get_message_info): "</div><div class='del'>-	(nntp_folder_free_message_info): "</div><div class='del'>-	(camel_nntp_folder_new): moved summary to folder class</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init):</div><div class='del'>-	Move summary to folder object.</div><div class='del'>-	(camel_imap_folder_new): "</div><div class='del'>-	(imap_finalize): No longer unref the summary (or infact, do</div><div class='del'>-	anything else either).</div><div class='del'>-	(imap_refresh_info): move summary to folder object.</div><div class='del'>-	(imap_sync): "</div><div class='del'>-	(imap_get_message_count): Removed, use default impl.</div><div class='del'>-	(imap_get_unread_message_count): "</div><div class='del'>-	(imap_get_uids): "</div><div class='del'>-	(imap_get_summary): "</div><div class='del'>-	(imap_free_summary): "</div><div class='del'>-	(imap_get_message_info): "</div><div class='del'>-	(imap_free_message_info): "</div><div class='del'>-	(imap_get_message_flags): "</div><div class='del'>-	(imap_set_message_flags): "</div><div class='del'>-	(imap_get_message_user_flag): ", this changes functionality, but</div><div class='del'>-	only by providing non-permanent flags.</div><div class='del'>-	(imap_set_message_user_flag): "</div><div class='del'>-	(imap_update_summary): move summary to folder object, and use</div><div class='del'>-	camel_folder_summary_info_new_from_header, instead of calling the</div><div class='del'>-	virtual function directly.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_append_message):</div><div class='del'>-	move summary to folder object, again.</div><div class='del'>-	(maildir_get_message): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_append_message): move</div><div class='del'>-	summary to folder object.</div><div class='del'>-	(mh_get_message): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message): Move</div><div class='del'>-	summary to folder object</div><div class='del'>-	(mbox_get_message): "</div><div class='del'>-	(mbox_set_message_user_flag): We need our own copy of this, sigh,</div><div class='del'>-	so we can track if the xev needs a rewrite (probably, its only a</div><div class='del'>-	guide anyway).</div><div class='del'>-	(mbox_set_message_user_tag): Same same with this one.</div><div class='del'>-	(camel_mbox_folder_class_init): Link in these new virtual functions.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.h (CamelLocalFolder): removed</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_get_message_count): </div><div class='del'>-	(local_get_unread_message_count): </div><div class='del'>-	(local_get_uids): </div><div class='del'>-	(local_get_summary): </div><div class='del'>-	(local_free_summary): </div><div class='del'>-	(local_get_message_info): </div><div class='del'>-	(local_free_message_info): </div><div class='del'>-	(local_get_message_flags): </div><div class='del'>-	(local_set_message_flags): </div><div class='del'>-	(local_get_message_user_flag): </div><div class='del'>-	(local_set_message_user_flag): </div><div class='del'>-	(local_get_message_user_tag): </div><div class='del'>-	(local_set_message_user_tag): Removed, all now use default</div><div class='del'>-	implementation.</div><div class='del'>-	(camel_local_folder_class_init): Removed overrides.</div><div class='del'>-	(local_init): Clear folder-&gt;summary.</div><div class='del'>-	(local_finalize): move summary to folder.</div><div class='del'>-	(camel_local_folder_construct): "</div><div class='del'>-	(local_sync): "</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (free_summary): Provide a real impl.</div><div class='del'>-	(get_summary): "</div><div class='del'>-	(free_uids): "</div><div class='del'>-	(get_uids): "</div><div class='del'>-	(free_message_info): "</div><div class='del'>-	(get_message_info): "</div><div class='del'>-	(set_message_user_tag): "</div><div class='del'>-	(get_message_user_tag): "</div><div class='del'>-	(set_message_user_flag): "</div><div class='del'>-	(get_message_user_flag): "  Sigh, the last so far.</div><div class='del'>-	(get_message_flags): Sigh, 1 more afterall.</div><div class='del'>-	(get_unread_message_count): And and this.</div><div class='del'>-	(get_message_count): and this!</div><div class='del'>-	(set_message_flags): Sigh, and this.</div><div class='del'>-	(camel_folder_finalize): Unref the summary if we have it.</div><div class='del'>-	(camel_folder_free_uids): Remove locking.</div><div class='del'>-	(camel_folder_get_message_flags): Remove locks, since the summary</div><div class='del'>-	is now mt-safe.</div><div class='del'>-	(camel_folder_set_message_flags): "</div><div class='del'>-	(camel_folder_get_message_user_flag): "</div><div class='del'>-	(camel_folder_set_message_user_flag): "</div><div class='del'>-	(camel_folder_get_message_user_tag): "</div><div class='del'>-	(camel_folder_set_message_user_tag): "</div><div class='del'>-	(camel_folder_get_message_info): "</div><div class='del'>-	(camel_folder_free_message_info): "</div><div class='del'>-	(camel_folder_get_uids): "</div><div class='del'>-	(camel_folder_free_summary): "</div><div class='del'>-	(camel_folder_get_unread_message_count): "</div><div class='del'>-	(get_unread_message_count): Check we got info, no big deal, but</div><div class='del'>-	the summary might change while we're counting, and upset the count</div><div class='del'>-	slightly.</div><div class='del'>-	(camel_folder_get_message_count): Remove locks.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Added CamelFolderSummary</div><div class='del'>-	to the base folder object.  Sigh, this is going to be a lot of</div><div class='del'>-	work ...</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_init, finalise): changed</div><div class='del'>-	connect_lock to be recursive e_mutex.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_init, finalise): Changed</div><div class='del'>-	stream_lock to recursive e_mutex.</div><div class='del'>-</div><div class='del'>-	* camel-private.h (RemoteStorePrivate, ServicePrivate): Use</div><div class='del'>-	recursive mutexes for connect_lock &amp; stream_lock.  Ick.  Because</div><div class='del'>-	of the imap code.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Change the command_lock to</div><div class='del'>-	be an EMutex.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (connect_to_server): Removed</div><div class='del'>-	the command_lock stuff.  If we are just connected again, it should</div><div class='del'>-	be safe to assume we have exclusive access at this point without</div><div class='del'>-	it (and yes, removes a deadlock).</div><div class='del'>-	(imap_create): Remove a lock that wasn't even supposed to be</div><div class='del'>-	there.</div><div class='del'>-	(camel_imap_store_finalize, init): g_mutex-&gt;e_mutex(E_MUTEX_REC).</div><div class='del'>-	Use a recursive mutex since the imap code is multiply recursivly</div><div class='del'>-	calling some functions (sigh, it would be nice to fix this).</div><div class='del'>-</div><div class='del'>-2000-12-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (folder_changed): Change the locks to inside the</div><div class='del'>-	if.  Stops a deadloc,k and we dont need a lock to read a value.</div><div class='del'>-	(message_changed): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Blah, comment out g_thread_init, leave it</div><div class='del'>-	to the caller, since it can only ever be done once.</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (camel_folder_thread_messages_new): Ref</div><div class='del'>-	and save the folder in the thread return.  Also get the summary</div><div class='del'>-	once, and access that for the messageinfo's.  Added bonus that now</div><div class='del'>-	threads should come out in a similar order.  We need to do this so</div><div class='del'>-	that the messageinfo's dont get unref'd under us, and using the</div><div class='del'>-	summary directly simplifies memory management.</div><div class='del'>-	(camel_folder_thread_messages_destroy): Free the summary/unref the</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.h: Add a folder to CamelFolderThread struct.</div><div class='del'>-</div><div class='del'>-2000-12-19  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Unref</div><div class='del'>-	using e_sexp_unref, since it is no longer an object.</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.c: Added a global lock, and made it</div><div class='del'>-	thread-aware.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c: Add a global lock.  Not sure its really</div><div class='del'>-	needed here, but it doesn't really hurt.</div><div class='del'>-	(camel_exception_clear): Lock around access.</div><div class='del'>-	(camel_exception_set): Same.</div><div class='del'>-	(camel_exception_setv): "</div><div class='del'>-	(camel_exception_xfer): "</div><div class='del'>-</div><div class='del'>-	* providers/local/Makefile.am (noinst_HEADERS): Added, for</div><div class='del'>-	camel-local-private.h</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_expression): Removed</div><div class='del'>-	locking here, now upto the implementing class to lock.</div><div class='del'>-	(camel_folder_search_free): Removed the folder lock here too, for</div><div class='del'>-	consistency really, and the locking probably wasn't needed.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_get_summary):</div><div class='del'>-	Changed to copy/ref the summary items.</div><div class='del'>-	(local_free_summary): Unref the summary items/free the array.</div><div class='del'>-	(local_get_unread_message_count): Free info lookups.</div><div class='del'>-	(local_search_by_expression): Perform more fine-grained locking,</div><div class='del'>-	and dont lock the whole folder while searching, just the search</div><div class='del'>-	object.  Dum de dum, it *would* be possible to not even have to</div><div class='del'>-	lock the search, by using our own copy of the search object each</div><div class='del'>-	time.  Could be investigated.</div><div class='del'>-	(local_init): Init priaate data/lock.</div><div class='del'>-	(local_finalize): Free private data/lock.</div><div class='del'>-	(local_search_free): Also lock around the search object, because</div><div class='del'>-	it accesses global data inside.</div><div class='del'>-</div><div class='del'>-	* README.mt: Some info about the mt code development.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (match_message): Put in a warning, this</div><div class='del'>-	plain deadlocks so far, but i'm going to bed now.</div><div class='del'>-	(camel_folder_search_finalize): Use e_sexp_unref() since its no</div><div class='del'>-	longer an object.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_init): Init private data/lock.</div><div class='del'>-	(camel_session_finalise): Free private data/lock.</div><div class='del'>-	(camel_session_register_provider): Lock hash insert.</div><div class='del'>-	(service_cache_remove): Lock.</div><div class='del'>-	(camel_session_list_providers): "</div><div class='del'>-	(camel_session_get_service): Lock the whole function.</div><div class='del'>-</div><div class='del'>-	* camel-session.h (struct _CamelSession): Added private data.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Setup</div><div class='del'>-	private data.</div><div class='del'>-	(camel_imap_store_finalize): Free private data.</div><div class='del'>-	(connect_to_server): Lock around command calls.  I dont think its</div><div class='del'>-	needed, but it shouldn't hurt either.</div><div class='del'>-	(imap_connect): Lock around command calls.  Again, I don think it</div><div class='del'>-	is needed, but wont hurt.</div><div class='del'>-	(imap_disconnect): ditto for this one.</div><div class='del'>-	(imap_create): Lock around command.</div><div class='del'>-	(get_folder): "</div><div class='del'>-	(get_folder_info): "</div><div class='del'>-	(subscribe_folder): "</div><div class='del'>-	(unsubscribe_folder): "</div><div class='del'>-	(imap_keepalive): "</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Lock</div><div class='del'>-	around calling a command.</div><div class='del'>-	(imap_refresh_info): Likewise.</div><div class='del'>-	(imap_sync): "</div><div class='del'>-	(imap_append_message): "</div><div class='del'>-	(imap_copy_message_to): "</div><div class='del'>-	(imap_move_message_to): "</div><div class='del'>-	(imap_get_message): "</div><div class='del'>-	(imap_update_summary): "</div><div class='del'>-	(imap_search_by_expression): ", also minor logic cleanup.</div><div class='del'>-	(imap_get_summary): Copy/ref the summary items.</div><div class='del'>-	(imap_free_summary): And free it now too.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):</div><div class='del'>-	Lock the command stream for the command session.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-private.h: Private (locking info)</div><div class='del'>-	stuff for imap provider.</div><div class='del'>-	(CAMEL_IMAP_STORE_UNLOCK): Fix to call unlock, rather than lock!</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): Lock also for</div><div class='del'>-	the connection here, incase the service needs to connect.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (camel_remote_store_init): Init private</div><div class='del'>-	data/lock.</div><div class='del'>-	(camel_remote_store_finalise): Readded, free private data/lock.</div><div class='del'>-	(remote_send_stream): Changed to return the number of bytes</div><div class='del'>-	written, like a good little stream function should.</div><div class='del'>-	(camel_remote_store_send_string): Lock for stream access.</div><div class='del'>-	(camel_remote_store_send_stream): Same here.</div><div class='del'>-	(camel_remote_store_recv_line): And here.</div><div class='del'>-	(camel_remote_store_refresh_folders): Lock the store for cache</div><div class='del'>-	access.</div><div class='del'>-	(timeout_cb): Lock for stream access.</div><div class='del'>-</div><div class='del'>-2000-12-18  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_init): Init private data.</div><div class='del'>-	(camel_service_finalise): Free private data.</div><div class='del'>-	(camel_service_connect): Lock around connection access.</div><div class='del'>-	(camel_service_disconnect): "</div><div class='del'>-</div><div class='del'>-	* camel-service.h (struct _CamelService): Added private field.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Init private data/lock.</div><div class='del'>-	(camel_store_finalize): Free private data/lock.</div><div class='del'>-	(camel_store_get_folder): Lock internal calls.</div><div class='del'>-	(camel_store_delete_folder): "</div><div class='del'>-	(camel_store_rename_folder): "</div><div class='del'>-	(camel_store_get_root_folder): "</div><div class='del'>-	(camel_store_get_default_folder): "</div><div class='del'>-	(camel_store_get_folder_info): "</div><div class='del'>-	(camel_store_folder_subscribed): "</div><div class='del'>-	(camel_store_subscribe_folder): "</div><div class='del'>-	(camel_store_unsubscribe_folder): "</div><div class='del'>-	(lookup_folder): Lock accesses to the folder cache.</div><div class='del'>-	(cache_folder): "</div><div class='del'>-	(uncache_folder): And here too.</div><div class='del'>-</div><div class='del'>-	* camel-store.h (struct _CamelStore): Added a private field.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (noinst_HEADERS): Add camel-private.h.  There is a</div><div class='del'>-	comment in that header as to why it ins't installed.</div><div class='del'>-</div><div class='del'>-	* camel-private.h: New header for private data, that subclasses</div><div class='del'>-	can get to.</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.c (camel_test_init): If we do have threads</div><div class='del'>-	enabled already, dont call g_thread_init().</div><div class='del'>-	</div><div class='del'>-	* tests/lib/folders.c (test_folder_counts): Add free of info.</div><div class='del'>-	(test_folder_message): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (remove_summary): Free</div><div class='del'>-	info.</div><div class='del'>-	(maildir_summary_check): Free info lookups.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c (message_info_new): Removed,</div><div class='del'>-	didn't add value.</div><div class='del'>-	(remove_summary): free info after being used.</div><div class='del'>-	(mh_summary_check): Free info lookups.</div><div class='del'>-	(mh_summary_sync): and here too.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_update): Free info</div><div class='del'>-	lookups.</div><div class='del'>-	(mbox_summary_sync_full): Likewise.</div><div class='del'>-	(mbox_summary_sync_quick): And here.</div><div class='del'>-	(mbox_summary_sync):  ... and here.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_get_message):</div><div class='del'>-	Free messageinfo lookups.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_get_message): Free</div><div class='del'>-	messageinfo lookups.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_get_message): Free</div><div class='del'>-	messageinfo lookups.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(message_info_new_from_message): Removed, since it wasn't doing</div><div class='del'>-	anything useful.</div><div class='del'>-	(message_info_new_from_parser): Same.  And some other dead code.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_get_message_info):</div><div class='del'>-	deconstify.</div><div class='del'>-	(local_free_message_info):new func to free info.</div><div class='del'>-	(local_get_uids): </div><div class='del'>-	(local_get_message_flags): </div><div class='del'>-	(local_set_message_flags): </div><div class='del'>-	(local_get_message_user_flag): </div><div class='del'>-	(local_set_message_user_flag): </div><div class='del'>-	(local_get_message_user_tag): </div><div class='del'>-	(local_set_message_user_tag): Free all info lookups.</div><div class='del'>-	(local_expunge): Dont call camel_folder_* functions, to avoid a deadlock.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_get_message_info): deconstify.</div><div class='del'>-	(nntp_folder_free_message_info): Free summary item.</div><div class='del'>-	(nntp_folder_get_message_flags): Free summary lookup.</div><div class='del'>-	(nntp_folder_set_message_flags): and here.</div><div class='del'>-	(nntp_folder_get_uids): And here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: Make base64_*_simple optional</div><div class='del'>-	with the HAVE_KRB4 flag.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_free_message_info):</div><div class='del'>-	Added a free of the message info.</div><div class='del'>-	(imap_refresh_info): </div><div class='del'>-	(imap_sync): </div><div class='del'>-	(imap_refresh_info): </div><div class='del'>-	(imap_get_unread_message_count): </div><div class='del'>-	(imap_get_uids): </div><div class='del'>-	(imap_get_message_flags): </div><div class='del'>-	(imap_set_message_flags): Free any summary lookups.</div><div class='del'>-	(imap_get_message_flags): Get the message info directly from the</div><div class='del'>-	summary, not via the folder interface.</div><div class='del'>-	(imap_move_message_to): Dont call folder functions directly</div><div class='del'>-	(delete_message), as it will deadlock since we already have the</div><div class='del'>-	lock.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_free_message_info): Free/unref</div><div class='del'>-	the messageinfo.</div><div class='del'>-	(vee_get_message_info): First ref the internal copy, then return it.</div><div class='del'>-	(folder_changed): Free all got message info's.</div><div class='del'>-	(message_changed): And here.</div><div class='del'>-	(get_real_message): And here.</div><div class='del'>-	(vee_folder_build): and here.</div><div class='del'>-	(vee_folder_build_folder): ... and here.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_info_new):</div><div class='del'>-	Initialise the messageinfo refcount to 1.</div><div class='del'>-	(camel_folder_summary_info_free): Down the refcount till we need</div><div class='del'>-	to free.</div><div class='del'>-	(camel_folder_summary_info_ref): New function to up the refcount.</div><div class='del'>-	(camel_message_info_dup_to): Sewt the refcount of the dest to 1.</div><div class='del'>-	(camel_message_info_new): Set refcount to 1.</div><div class='del'>-	(camel_message_info_new_from_header): Dont allocate the mi</div><div class='del'>-	ourselves.</div><div class='del'>-	(camel_message_info_free): Handle refcounting.</div><div class='del'>-	(camel_message_info_ref): New function.</div><div class='del'>-	(camel_folder_summary_index): Ref the messageinfo before returning</div><div class='del'>-	it.</div><div class='del'>-	(camel_folder_summary_uid): Likewise.</div><div class='del'>-	(camel_folder_summary_save): Access the messageinfo array</div><div class='del'>-	directly, rather than through accessors (saves ref/unref).</div><div class='del'>-	(camel_folder_summary_clear): Likewise.</div><div class='del'>-	(camel_folder_summary_remove_index): Likewise.</div><div class='del'>-	(main): Free lookups.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h (CamelMessageInfo): Added a refcount</div><div class='del'>-	value.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_free_message_info): New function to</div><div class='del'>-	'free' a message info.</div><div class='del'>-	(camel_folder_get_message_info): Deconstify return.</div><div class='del'>-	(camel_folder_lock): New (internal) function to thread-lock the</div><div class='del'>-	folder.</div><div class='del'>-	(camel_folder_unlock): Likewise for unlocking.</div><div class='del'>-	(freeze): </div><div class='del'>-	(thaw): Lock around access to folder-&gt;frozen/changed_frozen.</div><div class='del'>-	(folder_changed): Likewise.</div><div class='del'>-	(message_changed): Likewise.</div><div class='del'>-	(camel_folder_init): Init private data, locks and moved frozen</div><div class='del'>-	info.</div><div class='del'>-	(camel_folder_finalize): Free new private data, locks and moved</div><div class='del'>-	frozen info.</div><div class='del'>-	(copy_message_to): Free the messageinfo after we've used it.</div><div class='del'>-	(move_message_to): And here too.</div><div class='del'>-	(camel_folder_sync): Lock around virtual method invocation.  Just</div><div class='del'>-	locking around any virtual method that is known to need it.  This</div><div class='del'>-	is the first cut at locking.</div><div class='del'>-	(camel_folder_refresh_info): "</div><div class='del'>-	(camel_folder_expunge): "</div><div class='del'>-	(camel_folder_get_message_count): "</div><div class='del'>-	(camel_folder_get_unread_message_count): "</div><div class='del'>-	(camel_folder_append_message): "</div><div class='del'>-	(camel_folder_set_message_flags): "</div><div class='del'>-	(camel_folder_get_message_flags): "</div><div class='del'>-	(camel_folder_get_message_user_flag): "</div><div class='del'>-	(camel_folder_set_message_user_flag): "</div><div class='del'>-	(camel_folder_get_message_user_tag): "</div><div class='del'>-	(camel_folder_set_message_user_tag): "</div><div class='del'>-	(camel_folder_get_message): "</div><div class='del'>-	(camel_folder_get_uids): "</div><div class='del'>-	(camel_folder_free_uids): "</div><div class='del'>-	(camel_folder_get_summary): "</div><div class='del'>-	(camel_folder_search_by_expression): "</div><div class='del'>-	(camel_folder_free_summary): "</div><div class='del'>-	(camel_folder_search_free): "</div><div class='del'>-	(camel_folder_move_message_to): "</div><div class='del'>-	(camel_folder_copy_message_to): "</div><div class='del'>-	(copy_message_to): Dont call any of our own folder functions</div><div class='del'>-	directly, otherwise we will deadlock.</div><div class='del'>-	(move_message_to): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (CamelFolder): Added free_message_info() function</div><div class='del'>-	&amp; deconstify get_message_info()'s return.</div><div class='del'>-	(CamelFolder): Add a private field (for	locks).</div><div class='del'>-	(struct _CamelFolder): Moved changed_changed/frozen into private</div><div class='del'>-	data, since it really is private and now needs locked access.</div><div class='del'>-</div><div class='del'>-2000-12-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): When checking to see if we</div><div class='del'>-	need to fold the header, when we come accross a \n, make sure to</div><div class='del'>-	start at p + 1 the next time through the loop or else we get into</div><div class='del'>-	an infinite loop.</div><div class='del'>-</div><div class='del'>-2000-12-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Namespace cleanup: change a bunch of IS_CAMEL_* macros to</div><div class='del'>-	CAMEL_IS_*</div><div class='del'>-</div><div class='del'>-2000-12-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: add #include &lt;sys/types.h&gt; for</div><div class='del'>-	freebsd.</div><div class='del'>-</div><div class='del'>-2000-12-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c, camel-folder-summary.h: Added #ifndef</div><div class='del'>-	NO_WARNINGS around a #warning.  Added (void) to the prototype and</div><div class='del'>-	declaration of camel_message_info_new.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h: Added an include for</div><div class='del'>-	camel-mime-filter-bestenc.h.  Added a prototype for</div><div class='del'>-	camel_mime_message_set_best_encoding.  Reformatted prototypes to</div><div class='del'>-	line up.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Added #if d(!)0 around the states string</div><div class='del'>-	lookup table since it's only used in debugging output.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (stream_flush): Added a cast.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: Added #include &lt;netinet/in.h&gt;.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Made uid</div><div class='del'>-	and flags const to fix warnings here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Made p</div><div class='del'>-	const to fix warnings here.</div><div class='del'>-</div><div class='del'>-2000-12-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/Makefile.am: Add missing .h file. (From campd.)</div><div class='del'>-</div><div class='del'>-2000-12-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Remove use of</div><div class='del'>-	linewrap filter.  Headers are now wrapped.  encode_8bit already</div><div class='del'>-	enforces a 998 octet line limit.</div><div class='del'>-	(smtp_data): Also fixed a memleak, we always have to unref our own</div><div class='del'>-	copy of the filters.  We also dont need to remove them manually,</div><div class='del'>-	so dont bother.  The type's an int too ...</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_unformat): When scanning past</div><div class='del'>-	quotes, remove them also.</div><div class='del'>-	(camel_internet_address_format_address): If the name contains "'s,</div><div class='del'>-	or ','s then strip and quotes and wrap the whole lot in one set of</div><div class='del'>-	quotes.</div><div class='del'>-	</div><div class='del'>-	* Makefile.am (noinst_HEADERS): We dont want to install</div><div class='del'>-	camel-charset-map-private.h, ever.  There are probably other</div><div class='del'>-	similar files ..?</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Fold header lines</div><div class='del'>-	appropriately as we're writing them out.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): Add a new argument, headerlen,</div><div class='del'>-	tells it how long the associated header token is.</div><div class='del'>-	(header_fold): Also,k check to see if we need to fold first, using</div><div class='del'>-	a better algorithm, and also accept already-folded lines, and</div><div class='del'>-	re-process accordingly.</div><div class='del'>-	(rfc2047_decode_word): Add a little buffer space to iconv output</div><div class='del'>-	for shifting overheads?</div><div class='del'>-	(rfc2047_decode_word): finish the iconv with a null call, to flush</div><div class='del'>-	shift state, etc.</div><div class='del'>-	(rfc2047_encode_word): Attempt to break up long words into</div><div class='del'>-	appropriately sized, independent, chunks.  See rfc2047, section 2.</div><div class='del'>-	(header_decode_mailbox): Dont add in extra spaces into the output</div><div class='del'>-	if we are decoding adjacent encoded words.  We can only guess this</div><div class='del'>-	case, as some broken mailers put encoded words inside quoted</div><div class='del'>-	words.</div><div class='del'>-	(header_encode_phrase): Dont merge words if they are going to end</div><div class='del'>-	up too long.  Also change back ot only merge consecutive words of</div><div class='del'>-	the same type.  e.g. 'foo. blah fum.' -&gt; "foo." blah "fum."  or</div><div class='del'>-	'iam an. idiot' -&gt; iam "an." idiot</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (camel_medium_set_header): Hrm, we actually want</div><div class='del'>-	to call set_header, not add_header here, probably explains some</div><div class='del'>-	duplicate X-Evolution headers i was trying to track down.  Also</div><div class='del'>-	changed the api to handle a NULL value == remove the header.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c</div><div class='del'>-	(maildir_summary_decode_x_evolution): Always return error, we dont</div><div class='del'>-	use x-evolution for maildir.</div><div class='del'>-	(maildir_summary_encode_x_evolution): Always return a NULL string,</div><div class='del'>-	likewise.</div><div class='del'>-	(maildir_summary_add): Hook in here, since the _new function</div><div class='del'>-	doesn't have access to any flags from the caller.  If we have</div><div class='del'>-	flags, then update the filename again.  Not ideal, but should</div><div class='del'>-	work.</div><div class='del'>-</div><div class='del'>-2000-12-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/message/Makefile.am: Remove test3 from build until the files</div><div class='del'>-	show up</div><div class='del'>-	</div><div class='del'>-2000-12-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_date): Change the</div><div class='del'>-	sign of the default date offset when none is supplied.</div><div class='del'>-	(camel_mime_message_set_date): Also do dst if its dst (forward 1</div><div class='del'>-	hour).  Fixes #928 + some.</div><div class='del'>-</div><div class='del'>-2000-12-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.h (check): Change line no format so that</div><div class='del'>-	emacs can detect it.</div><div class='del'>-</div><div class='del'>-2000-12-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): We want</div><div class='del'>-	to bitwise-or the server and cached flags here so that we keep the</div><div class='del'>-	flags that we have set locally and set any additional flags that a</div><div class='del'>-	parallel connection may have set.</div><div class='del'>-</div><div class='del'>-2000-12-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the data</div><div class='del'>-	wrapper fails to be written to the stream, unref it and the</div><div class='del'>-	filters before returning.</div><div class='del'>-</div><div class='del'>-2000-12-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): use</div><div class='del'>-	BODY.PEEK[] rather than RFC822, so the message doesn't get marked</div><div class='del'>-	as \Seen.</div><div class='del'>-	(imap_refresh_info): Fix a really really really dumb bug.</div><div class='del'>-</div><div class='del'>-2000-12-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): Fix</div><div class='del'>-	the check for "flags aren't actually changing".</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_set_message_flags,</div><div class='del'>-	local_set_message_user_flag, local_set_message_user_tag): Don't</div><div class='del'>-	emit message_changed unless the flags actually changed.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_set_message_flags): Don't emit message_changed unless</div><div class='del'>-	the flags actually changed. Fix the check for marked as seen.</div><div class='del'>-</div><div class='del'>-2000-12-05  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (stream_flush): stream_flush does</div><div class='del'>-	make sense for a substream afterall (if you have a stream_write).</div><div class='del'>-	(stream_write): Implement this.</div><div class='del'>-	(stream_seek): Change the STREAM_END behaviour to be more sane.</div><div class='del'>-	if bounded go from the end of the bound, if unbounded, go from the</div><div class='del'>-	end of the parent stream.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (stream_read): Dont return error if reading</div><div class='del'>-	past the end of data, just return 0.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (camel_stream_fs_init): Initialise the stream</div><div class='del'>-	to be unbound.</div><div class='del'>-	(stream_seek): Fix the logic when seeking from the end of an</div><div class='del'>-	unbounded stream.</div><div class='del'>-	(camel_stream_fs_new_with_fd): If the fd is invalid (-1), then</div><div class='del'>-	return NULL immediately.</div><div class='del'>-	(stream_seek): Range check a SEEK_END so it fits within</div><div class='del'>-	bound_start.</div><div class='del'>-</div><div class='del'>-2000-12-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/folders.c (test_folder_basic): New test to perform</div><div class='del'>-	basic store operations on folders (taken from folders/test1).</div><div class='del'>-	(test_folder_message_ops): Tkane the guts out of folders/test2.</div><div class='del'>-</div><div class='del'>-2000-12-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): i18n-ize</div><div class='del'>-	exception strings.</div><div class='del'>-	(get_name): And here.</div><div class='del'>-	(_send_to): Here too.</div><div class='del'>-	(smtp_helo): And here and there...</div><div class='del'>-	(smtp_mail): And around the square...</div><div class='del'>-	(smtp_rcpt): Saying catch me if you can...</div><div class='del'>-	(smtp_data): And here three.</div><div class='del'>-	(smtp_rset): And here.</div><div class='del'>-	(smtp_quit): And finally here.</div><div class='del'>-</div><div class='del'>-2000-12-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Added system_flag to CamelFolderSearchClass</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_system_flag_get): Convenience</div><div class='del'>-	function to return whether or not a flag is set using a string as</div><div class='del'>-	the flag name.</div><div class='del'>-	(camel_system_flag): Return the integer value of the flag string.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_system_flag): New ESExp callback</div><div class='del'>-	for allowing vfoldering on CamelMessageInfo flags.</div><div class='del'>-</div><div class='del'>-2000-12-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_disconnect): Don't</div><div class='del'>-	g_return_if_fail if the service is already disconnected. Just</div><div class='del'>-	return.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate):</div><div class='del'>-	Return FALSE (don't try again) if we get CAMEL_POP3_FAIL.</div><div class='del'>-	(pop3_connect): If we don't succeed, disconnect.</div><div class='del'>-</div><div class='del'>-2000-11-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(parse_list_response_as_folder_info): Fix a possible bug where</div><div class='del'>-	'name' could be uninitialized.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_new): New convenience</div><div class='del'>-	function, doesn't do much but it sure makes code cleaner to read.</div><div class='del'>-	(camel_message_info_new_from_header): This one makes my life heaven.</div><div class='del'>-</div><div class='del'>-2000-11-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c (camel_imap_summary_new):</div><div class='del'>-	Handle the case where the summary failed to load - clear the</div><div class='del'>-	summary and then set the dirty bit so that it is sure to save</div><div class='del'>-	later. Is this the right fix?</div><div class='del'>-</div><div class='del'>-2000-11-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_setv): Remove unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-2000-11-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_get_message): Remove</div><div class='del'>-	assertion that content is there, when it no longer can be.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Removed pos/bodypos/endpos from</div><div class='del'>-	camelmeessagecontentinfo.</div><div class='del'>-	(CamelMessageFlags): Added an attachments flag.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.h: Added load virtual</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* tests/lib/folders.c (test_message_info): Accessors.</div><div class='del'>-	(test_folder_message): "</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c (get_root_subject): Fix accessors.</div><div class='del'>-	(dump_tree_rec): "</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	Accessors for messageinfo.</div><div class='del'>-	(search_match_all): "</div><div class='del'>-	(search_header_contains): "</div><div class='del'>-	(search_header_contains): "</div><div class='del'>-	(search_body_contains): "</div><div class='del'>-	(camel_folder_search_execute_expression): Use mepool_strdup.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (summary_update): Accessors</div><div class='del'>-	for messageinfo.</div><div class='del'>-	(mbox_summary_sync_full): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c (remove_summary): Accessors</div><div class='del'>-	for messageinfo.</div><div class='del'>-	(mh_summary_check): "</div><div class='del'>-	(mh_summary_sync_message): "</div><div class='del'>-	(mh_summary_sync): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (mh_append_message): Use</div><div class='del'>-	accessor for uid.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(local_summary_decode_x_evolution): Use accessor to uid.</div><div class='del'>-	(local_summary_encode_x_evolution): Likewise.</div><div class='del'>-	(message_info_new): And here.</div><div class='del'>-	(camel_local_summary_load): Call virtual load function.</div><div class='del'>-	(local_summary_load): Default load function, load summary.</div><div class='del'>-	(camel_local_summary_load): Check file exists before trying to</div><div class='del'>-	load.</div><div class='del'>-	(camel_local_summary_construct): Turn off building content info!</div><div class='del'>-	(CAMEL_LOCAL_SUMMARY_VERSION): Bump, since we dont build content</div><div class='del'>-	info anymore.</div><div class='del'>-	(camel_local_summary_load): After a successful load/check, do a</div><div class='del'>-	save too so we dont have to go through it again randomly.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Use</div><div class='del'>-	accessors for messageinfo.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_uids): Use</div><div class='del'>-	accessors for uid.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Use</div><div class='del'>-	accessor for uid.</div><div class='del'>-	(imap_sync): Likewise.</div><div class='del'>-	(imap_get_uids): Likewise.</div><div class='del'>-	(imap_update_summary): And here.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vfolder_remove_match): Use</div><div class='del'>-	accessor for uid.</div><div class='del'>-	(vfolder_add_match): Handle estrv stuff.</div><div class='del'>-	(vfolder_change_match): Accessor for uid.</div><div class='del'>-	(get_real_message): "</div><div class='del'>-	(vee_get_uids): "</div><div class='del'>-	(vee_folder_build): " + estrv.</div><div class='del'>-	(vee_folder_build_folder): "</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c (maildir_append_message):</div><div class='del'>-	Use acccessors for uid's.</div><div class='del'>-	(maildir_get_message): Here too.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c</div><div class='del'>-	(camel_maildir_summary_init): Setup the string count for us.</div><div class='del'>-	(message_info_new): Access the string array directly.</div><div class='del'>-	(message_info_free): No need to free string if using array.</div><div class='del'>-	(camel_maildir_summary_info_to_name): Use accessor to get to uid.</div><div class='del'>-	(remove_summary): And here.</div><div class='del'>-	(maildir_summary_check): Likewise.</div><div class='del'>-	(maildir_summary_sync): And here.</div><div class='del'>-	(maildir_summary_load): Load up a cache of uid-&gt;filename mappings</div><div class='del'>-	before loading the actual summary file.  This saves us having to</div><div class='del'>-	waste the diskspace storing the filenames in the summary itself,</div><div class='del'>-	and also helps us sync the summary better on load.</div><div class='del'>-	(message_info_load): If we have the load_map setup, and the uid</div><div class='del'>-	exists, then set the filename cache from it, and update the flags</div><div class='del'>-	from the name, incase our summary mismatches it.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_init): Setup string</div><div class='del'>-	count for compressed info record.  An optional compile mode which</div><div class='del'>-	stores all strings for a given messageinfo into a packed array,</div><div class='del'>-	which should save 36-50 bytes/record.</div><div class='del'>-	(camel_folder_summary_info_new): Init the string array.</div><div class='del'>-	(message_info_new): Set the string array items, as required.</div><div class='del'>-	(message_info_load): And here too.</div><div class='del'>-	(message_info_save): Use accessors to get to strings.</div><div class='del'>-	(message_info_free): Free strings as one.</div><div class='del'>-	(camel_message_info_dup_to): Handle packed array case.</div><div class='del'>-	(camel_folder_summary_add): Use accessors.  And pack the strv</div><div class='del'>-	before storing it.</div><div class='del'>-	(summary_assign_uid): New function to assign a unique uid to a</div><div class='del'>-	message, if it doesn't have one.</div><div class='del'>-	(camel_folder_summary_add): Call assign_uid instead of doing it</div><div class='del'>-	ourselves.</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): "</div><div class='del'>-	(camel_folder_summary_info_new_from_message): "</div><div class='del'>-	(camel_folder_summary_encode_string): constify.</div><div class='del'>-	(camel_folder_summary_encode_token): "</div><div class='del'>-	(summary_build_content_info_message): Fix accessors to messageinfo.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped, for removal of</div><div class='del'>-	contentinfo-&gt;pos data.</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): Calculate the size</div><div class='del'>-	based on the parser position, not the removed contentinfo stuff.</div><div class='del'>-	(camel_folder_summary_info_new_from_message): Remove size stuff.</div><div class='del'>-	(camel_folder_summary_offset_content): Removed, no longer means anything.</div><div class='del'>-	(content_info_new): </div><div class='del'>-	(content_info_load): </div><div class='del'>-	(content_info_save): </div><div class='del'>-	(summary_build_content_info): Remove stuff for contentinfo-&gt;pos*.</div><div class='del'>-	(summary_build_content_info): Take a msginfo argument, set</div><div class='del'>-	attachments flag if we find any attachments.</div><div class='del'>-	(summary_build_content_info_message): set attachments flag if we</div><div class='del'>-	find any attachments.</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): Always scan the</div><div class='del'>-	content info, even if we dont save it.</div><div class='del'>-	(camel_folder_summary_info_new_from_message): And here too.</div><div class='del'>-	(summary_build_content_info): Only create the contentinfo stuff if</div><div class='del'>-	we have it turned on, otherwise just parse and discard.</div><div class='del'>-	(summary_build_content_info_message): Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Updated the gtk-doc</div><div class='del'>-	comment.</div><div class='del'>-</div><div class='del'>-2000-11-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: </div><div class='del'>-	* camel-mime-filter-charset.c: Use iconv instead of unicode_iconv.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix</div><div class='del'>-	some off-by-one-ness.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (stream_read): Fix another bug found in</div><div class='del'>-	previously-unused code here.</div><div class='del'>-</div><div class='del'>-2000-11-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/lib/Makefile.am (INCLUDES): `$(top_srcdir)' for builddir</div><div class='del'>-	!= srcdir compilation.</div><div class='del'>-</div><div class='del'>-2000-11-29  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/message/test2.c (main): Add a missed unref.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_set_buffer): We must set</div><div class='del'>-	ourselves as the owner of the byte-array.</div><div class='del'>-	Weird, someone has modified this file (its been reindented), but i</div><div class='del'>-	can't see any changelogs ...</div><div class='del'>-</div><div class='del'>-	* tests/lib/messages.c (content_finalise): Fix memleak in tester,</div><div class='del'>-	free byte array when our content object is deleted.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_finalize): Yeah</div><div class='del'>-	great, so the sexp is a gtk object, not a camel object.  Isn't</div><div class='del'>-	that going to be fun to fix?</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_finalise): Free the storage path.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (camel_local_store_init): If</div><div class='del'>-	store-&gt;folders is setup, free it first, then overwrite.  Hmm,</div><div class='del'>-	this seems a bit crappy to me.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Dont setup store-&gt;folders if</div><div class='del'>-	its already setup.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_setv): Removed a memleak.  no</div><div class='del'>-	need to strdup after a strdup_printf!!!</div><div class='del'>-</div><div class='del'>-	* camel-address.c (camel_address_finalize): Free the address</div><div class='del'>-	ptrarray, once finished.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (local_finalize): Make sure</div><div class='del'>-	we dont leave the folder locked on close.</div><div class='del'>-	(local_finalize): Free summary/search.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c (mh_summary_next_uid_string):</div><div class='del'>-	Small memleak, always free name after using it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (set_content_object): Free txt after setting</div><div class='del'>-	the header.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c (maildir_summary_check):</div><div class='del'>-	Fix a memleak, close the dir after scanning new.</div><div class='del'>-	(message_info_free): Added so we can free the filename cached in</div><div class='del'>-	the messageinfo.</div><div class='del'>-	(camel_maildir_summary_finalise): Free the hostname.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test[12].c (main): Clear out camel-test before</div><div class='del'>-	starting.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):</div><div class='del'>-	Because encode_x_evolution folds the line (sigh, because</div><div class='del'>-	encode_param does, unlike every other function in</div><div class='del'>-	camel-mime-utils), unfold the encoded result before comparing.</div><div class='del'>-	(mbox_summary_sync_quick): Another small memleak, free xevnew once</div><div class='del'>-	finished with it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_quoted_string): Removed a</div><div class='del'>-	redundant check for c=0.</div><div class='del'>-	(header_unfold): New function to un-fold headers.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(local_summary_encode_x_evolution): some problems with encoding</div><div class='del'>-	tags, using the wrong output strings.</div><div class='del'>-	(local_summary_encode_x_evolution): We dont need to append a ;</div><div class='del'>-	either, param_list_format_append() will do it for us.</div><div class='del'>-</div><div class='del'>-2000-11-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-lock.c: No longer hard code the enabled lock types</div><div class='del'>-</div><div class='del'>-2000-11-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Don't set exception to</div><div class='del'>-	g_strerror (errno) when nread == 0, because it won't have been</div><div class='del'>-	set.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_finalize): Don't try to</div><div class='del'>-	free things if they haven't been set yet.</div><div class='del'>-</div><div class='del'>-2000-11-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Clear the</div><div class='del'>-	exception if EHLO fails before trying HELO in the cases where the</div><div class='del'>-	SMTP provider doesn't announce its ESMTPness.</div><div class='del'>-</div><div class='del'>-2000-11-28  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c</div><div class='del'>-	(camel_maildir_summary_init): Set the info size's properly, oops!</div><div class='del'>-</div><div class='del'>-	* tests/lib/folders.[ch]: Folder testing helpers.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test2.c: Test basic message ops on folders.</div><div class='del'>-</div><div class='del'>-	* tests/folder/test1.c (main): Test basic folder ops on (local)</div><div class='del'>-	stores.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-provider.c</div><div class='del'>-	(camel_provider_module_init): Removed some debug.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-folder.c</div><div class='del'>-	(camel_maildir_folder_class_init): fix parent class.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-folder.c (camel_mh_folder_class_init):</div><div class='del'>-	Fix parent class (damn cut &amp; paste).</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-store.c (get_folder): Call parent</div><div class='del'>-	impl.</div><div class='del'>-	(camel_maildir_store_class_init): Fix parent class setup.</div><div class='del'>-	(delete_folder): Check the folder exists before trying to delete</div><div class='del'>-	it.</div><div class='del'>-	(delete_folder): Try and make the delete operation atomic/rollback</div><div class='del'>-	failures.  e.g. if one directory isn't empty, then create the</div><div class='del'>-	other empty ones back.  Also clear the tmp directory fully first.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-store.c (get_folder): Call parent</div><div class='del'>-	impl.</div><div class='del'>-	(camel_mbox_store_class_init): parent class is camel_local_store,</div><div class='del'>-	not camel_folder, oops.</div><div class='del'>-	(delete_folder): Return an error if it doesn't exist, rather than</div><div class='del'>-	covering it up.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-store.c (get_folder): Call parent impl.</div><div class='del'>-	(camel_mh_store_class_init): fix parent class setup.</div><div class='del'>-	(delete_folder): Error if it doesn't exist now.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_move_message_to):</div><div class='del'>-	(camel_folder_copy_message_to): Added warnings as these functions</div><div class='del'>-	are going to be removed later.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_root_folder): Fix for an early</div><div class='del'>-	api change.  We want CAMEL_STORE_FOLDER_CREATE, not TRUE, since</div><div class='del'>-	its a flag.</div><div class='del'>-	(camel_store_get_default_folder): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (xrename): Handle renaming</div><div class='del'>-	folders differently to renaming files.</div><div class='del'>-	(get_default_folder_name): local stores dont have a default</div><div class='del'>-	folder, so make it so.  Or at least, it doesn't seem to make sense</div><div class='del'>-	to have one.</div><div class='del'>-	(get_root_folder_name): Same for root.</div><div class='del'>-	(get_folder): Added parent implementation, that makes sure the</div><div class='del'>-	service path exists, if we are creating a new folder (but doesn't</div><div class='del'>-	create the folder).</div><div class='del'>-</div><div class='del'>-2000-11-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-store.c (xrename): Fixed races.  Use</div><div class='del'>-	link/unlink, rather than rename, to properly detect overwriting</div><div class='del'>-	another file.  And allow some files to be missing.</div><div class='del'>-</div><div class='del'>-2000-11-28  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(local_summary_decode_x_evolution): add scan = scan-&gt;next; to</div><div class='del'>-	avoid infinite loop</div><div class='del'>-</div><div class='del'>-2000-11-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Make</div><div class='del'>-	this gratuitously more complicated. No wait, I mean, fix bugs. Now</div><div class='del'>-	fully handles NULs in the data stream (which "can't happen" but</div><div class='del'>-	do) and also handles responses containing multiple literals. Also</div><div class='del'>-	does less copying than the original code.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (stream_read): Fix a bug that could make</div><div class='del'>-	it lose sync and/or overrun buffers.</div><div class='del'>-</div><div class='del'>-2000-11-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/.cvsignore: shush</div><div class='del'>-</div><div class='del'>-2000-11-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Removed mh, mbox, added local, to the default.</div><div class='del'>-</div><div class='del'>-2000-11-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/data/getaddr.pl: little util to scan mailboxes for any and</div><div class='del'>-	every address they contain.</div><div class='del'>-</div><div class='del'>-	* tests/message/test2.c (main): Added a bunch of stuff to test</div><div class='del'>-	decoding/reencoding/etc of internationalised addresses.</div><div class='del'>-</div><div class='del'>-	* tests/message/lib/address-data.h: Copy of some unicode/other</div><div class='del'>-	testing data.  **Beware** of editing this file in emacs, it'll</div><div class='del'>-	probably try and convert all the characters to something</div><div class='del'>-	unusable.</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.c (camel_test_break): Add a debugger hook</div><div class='del'>-	point.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode): Check for space and convert</div><div class='del'>-	to _ separately.</div><div class='del'>-	(header_decode_mailbox): Fixed the 'check comments for realname'</div><div class='del'>-	code, problem was the domain getting code was skipping all</div><div class='del'>-	whitespace/comments before we could get a look-in.  This is</div><div class='del'>-	approximate but fairly robust.</div><div class='del'>-	(header_decode_text): Dont use the c-type isspace func here, we</div><div class='del'>-	want a specific whitespace only.</div><div class='del'>-	(header_decode_text): If we have decoded words next to each other,</div><div class='del'>-	do not insert whitespaces between them, which is what rfc2047 requires.</div><div class='del'>-	(header_decode_text): Make c unsigned too.</div><div class='del'>-</div><div class='del'>-	* tests/README: Added at least some explanation of all this stuff.</div><div class='del'>-</div><div class='del'>-	* tests/lib/camel-test.h (check_msg): Added a non-gcc version of</div><div class='del'>-	the fail command, we dont get the expression that failed, but no</div><div class='del'>-	matter.  Should be (more) portable now.</div><div class='del'>-	(check, check_msg): Put the file/lineno in the default message.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Add tests.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Well, I'll add the extra</div><div class='del'>-	bytes here too, lathough not strictly needed, might save a</div><div class='del'>-	re-malloc when we get to complete().</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (filter): Make sure we have room if</div><div class='del'>-	we only convert very short data.</div><div class='del'>-	(complete): and here too.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Initial test harness &amp; tests.  Requires gcc</div><div class='del'>-	for this.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (d): Turn off debug.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_step): Oops, &amp; masks for set</div><div class='del'>-	intersection, not | them.  Dunno how this got even close to</div><div class='del'>-	working.</div><div class='del'>-</div><div class='del'>-2000-11-23  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): For base64 encoding, the</div><div class='del'>-	output size for 0, 1, or 2 bytes of input can exceed input*2, so</div><div class='del'>-	make sure we account for that as well.</div><div class='del'>-	(complete): And here.</div><div class='del'>-	(complete): Similarly for qp encoding, if we have a trailing</div><div class='del'>-	space, we need some extra bytes (not needed for 'filter()', as any</div><div class='del'>-	such bytes are stored in state/save).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_decode_step): Removed fixme not required.</div><div class='del'>-	(quoted_encode_close): Dont append a trailing afterall.  Otherwise</div><div class='del'>-	a pass through the encode/decode will grow the message each time.</div><div class='del'>-</div><div class='del'>-2000-11-22  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_generate): check for return</div><div class='del'>-	values</div><div class='del'>-</div><div class='del'>-2000-11-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-lock.c: </div><div class='del'>-	* camel-movemail.c: add #ifdef HAVE_ALLOCA_H</div><div class='del'>-</div><div class='del'>-2000-11-21  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):</div><div class='del'>-	Shite, -1 on error, &gt;=0 on success.  So i've just been truncating</div><div class='del'>-	all the messages I touched, good one zed.</div><div class='del'>-	(mh_summary_sync_message): Sigh, and write to the right damn fd as</div><div class='del'>-	well.</div><div class='del'>-	(mh_summary_sync_message): Argh, and we need to compare the length</div><div class='del'>-	of the old xev -1 to the new xev, to check if we can optimise it.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_new): Init the pool.</div><div class='del'>-	(camel_folder_change_info_add_source): Allocate string in the</div><div class='del'>-	pool.</div><div class='del'>-	(camel_folder_change_info_add_source_list): </div><div class='del'>-	(camel_folder_change_info_add_update): No longer free the key, as</div><div class='del'>-	it cannot be yet.</div><div class='del'>-	(change_info_add_uid): Add a new arg, copy, telling it whether to</div><div class='del'>-	copy the uid argument or not, and copy using mempool_strdup.</div><div class='del'>-	(change_info_cat): Tell add_uid to copy the string.</div><div class='del'>-	(camel_folder_change_info_add_update): Call add_uid directly.</div><div class='del'>-	(change_info_remove): Call add_uid directly, with no copy, and</div><div class='del'>-	dont free the key.</div><div class='del'>-	(change_info_free_update): No longer required since we dont malloc</div><div class='del'>-	the keys.</div><div class='del'>-	(camel_folder_change_info_add_uid): Fix for add_uid change.</div><div class='del'>-	(camel_folder_change_info_remove_uid): </div><div class='del'>-	(camel_folder_change_info_change_uid): </div><div class='del'>-	(change_info_clear): No longer needed, just set the size to 0 on</div><div class='del'>-	the array directly.</div><div class='del'>-	(camel_folder_change_info_clear): Empty the arrays directly, and</div><div class='del'>-	flush the mempool too, and also clear uid_source, incase anyone</div><div class='del'>-	was silly enough to call us in the wrong order.</div><div class='del'>-	(camel_folder_change_info_free): Dont bother clearing the array's</div><div class='del'>-	contents, just free the pool and throw away all the indexes.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Added a mempool to CamelFolderChangeInfo to</div><div class='del'>-	store the uid's we get.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_match_all): If we are only</div><div class='del'>-	matching a single info, just use that/do the search.</div><div class='del'>-	(camel_folder_search_match_expression): New function.  Matches a</div><div class='del'>-	single message info against an expression.</div><div class='del'>-	(camel_folder_search_init): Init a hash table used to map the</div><div class='del'>-	returned gptrarrays' to mempools.</div><div class='del'>-	(camel_folder_search_execute_expression): Store all of the string</div><div class='del'>-	data in a mempool, slightly faster, less wasted space (usually),.</div><div class='del'>-	(camel_folder_search_free_result): Check for the mempool that</div><div class='del'>-	stores the data for the list, and free that if we have it,</div><div class='del'>-	otherwise assume we need to use g_free() (which should only happen</div><div class='del'>-	if the list is empty at the moment).</div><div class='del'>-	: commented out the debugging prints.  Got sick of 'executing</div><div class='del'>-	header search' crap.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (camel_vee_folder_init): Init</div><div class='del'>-	changes.</div><div class='del'>-	(camel_vee_folder_finalise): Free changes.</div><div class='del'>-	(vfolder_add_match): Simple helper to add a new matching info</div><div class='del'>-	record.</div><div class='del'>-	(camel_vee_folder_add_folder): Only trigger a changed event if we</div><div class='del'>-	have changes.</div><div class='del'>-	(vfolder_change_match): New function, changes our local vfolder</div><div class='del'>-	info to match the source.</div><div class='del'>-	(vfolder_add_match): Add a new info to the vfolder list.</div><div class='del'>-	(vfolder_remove_match): Remove a no-longer matching info from the</div><div class='del'>-	vfolder summary.</div><div class='del'>-	(message_changed): check if the message still matches, and</div><div class='del'>-	remove/etc as required.</div><div class='del'>-	(camel_vee_folder_finalise, init): init/free search object.</div><div class='del'>-	(vee_folder_build_folder): Build the changes to the folder into</div><div class='del'>-	the changes data, as we go.</div><div class='del'>-	(folder_changed): If the folder gave us an explicit list of</div><div class='del'>-	changes, then process each one separately (unless there's a lot</div><div class='del'>-	added/changed).</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.h: Added a changes field to the</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Added</div><div class='del'>-	camel-folder-thread.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-folder-thread.c: message-threading algorithm, taken from</div><div class='del'>-	evolutions' mail component, as it is generally more useful than</div><div class='del'>-	just for evolution itself.  Changed to use e-memchunks as well to</div><div class='del'>-	speed it up a little and use less mem.</div><div class='del'>-</div><div class='del'>-2000-11-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): Fixed to return the</div><div class='del'>-	correct bytecount in all cases which is the real fix to</div><div class='del'>-	imap_parse_nstring.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Again,</div><div class='del'>-	don't use strlen for the post-data, use 'n'.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): Undo my</div><div class='del'>-	previous temp-fix.</div><div class='del'>-</div><div class='del'>-2000-11-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): Fixes for</div><div class='del'>-	the summary messageid changes.  Hash the messageid and store it.</div><div class='del'>-	(get_XOVER_headers): Use camel_folder_summary_info_new() to create</div><div class='del'>-	the summary item before adding it.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h (CamelMessageInfo): Changed the</div><div class='del'>-	messgae-id to be an 8 byte md5 hash, and the references list to be</div><div class='del'>-	an array of these.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mh-summary.c (mh_summary_sync_message):</div><div class='del'>-	New function, sync out the message info stuff.  Only updates the</div><div class='del'>-	X-Ev header if it can get away with it, otherwise writes out a</div><div class='del'>-	whole new message.</div><div class='del'>-	(mh_summary_sync): Added more functionality.  All summary info is</div><div class='del'>-	now written to the X-Ev header, etc, and new messages re-written</div><div class='del'>-	if required during the sync process.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c</div><div class='del'>-	(local_set_message_user_flag): Set the XEVCHANGE flag.</div><div class='del'>-	(local_set_message_user_tag): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.h: New flag</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_XEVCHANGE to indicate the XEV header has</div><div class='del'>-	probably changed size and needs to be rewritten in whole.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (next_uid_string): Want this static, not</div><div class='del'>-	const.</div><div class='del'>-	(message_info_new): Store the references and message-id values as</div><div class='del'>-	64 bit, binary hashes.</div><div class='del'>-	(message_info_load): fix for message-id/references changes.</div><div class='del'>-	(message_info_save): Likewise.</div><div class='del'>-	(camel_message_info_dup_to): And here.</div><div class='del'>-	(camel_message_info_free): And here too.  No longer free</div><div class='del'>-	message_id, and simple free for references array.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.</div><div class='del'>-	(camel_folder_summary_init): Init memchunk allocators to empty.</div><div class='del'>-	(camel_folder_summary_finalize): Free memchunk allocators if</div><div class='del'>-	there.</div><div class='del'>-	(message_info_new): Use the chunk allocator to allocate message</div><div class='del'>-	info's.	</div><div class='del'>-	(camel_folder_summary_info_new): New helper to allocate the</div><div class='del'>-	message info, and setup the memchunk if required.</div><div class='del'>-	(content_info_alloc): Likewise for content info's.</div><div class='del'>-	(message_info_load): Use summary_info_new_empty.</div><div class='del'>-	(content_info_new): Use content_info_alloc.</div><div class='del'>-	(content_info_load): "</div><div class='del'>-	(content_info_free): Free the content info as a memchunk.</div><div class='del'>-	(message_info_free): Free everything directly and the base as a</div><div class='del'>-	memchunk, rather than calling camel_message_info_free(), which</div><div class='del'>-	assumes a malloc'd array.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c: Include ctype.h, kill a</div><div class='del'>-	warning.</div><div class='del'>-	(local_summary_decode_x_evolution): If we get a NULL message info,</div><div class='del'>-	then dont try and set anything, just check for validity.</div><div class='del'>-	(camel_local_summary_write_headers): New function to write a set</div><div class='del'>-	of headers to an fd.</div><div class='del'>-	(camel_local_summary_check): Added some statistic generation</div><div class='del'>-	stuff for memory profiling.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (header_write): Changed to</div><div class='del'>-	use stdoi functions to write out the header to a buffered stream,</div><div class='del'>-	instead of using writev, which is apparently slow (and writing</div><div class='del'>-	each line separately is slow anyway).</div><div class='del'>-	(mbox_summary_sync_full): New implementation.  Does things</div><div class='del'>-	differently, doesn't use or require the content info stuff.</div><div class='del'>-	(summary_rebuild): Dont return an error if we start scanning at</div><div class='del'>-	the end of file.</div><div class='del'>-	(mbox_summary_sync_full): If we are not writing out new headers,</div><div class='del'>-	make sure we copy the From line as we go, and update frompos</div><div class='del'>-	appropriately.</div><div class='del'>-	(mbox_summary_sync_full): Always copy the From line from the</div><div class='del'>-	existing one, rather than trying to make one up ourselves.</div><div class='del'>-	(mbox_summary_sync): If we can get by with a quick-sync, then try</div><div class='del'>-	it, if that fails, then try a full sync anyway.</div><div class='del'>-	(mbox_summary_sync_quick): Quick sync.  Only update system flags,</div><div class='del'>-	etc.</div><div class='del'>-	(mbox_summary_sync_full): Use the proper local summary encode_xev</div><div class='del'>-	function.</div><div class='del'>-	(header_evolution_decode): Removed, no longer needed.</div><div class='del'>-	(header_evolution_encode): Same.</div><div class='del'>-	(copy_block): No longer needed, removed.</div><div class='del'>-	(header_write): Removed, replaced with</div><div class='del'>-	camel_local_summary_write_headers.</div><div class='del'>-	(mbox_summary_sync_full): Fixed for header_write change.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Implement the new</div><div class='del'>-	optional parser state HSCAN_PRE_FROM, that returns the (currently</div><div class='del'>-	unfiltered) input data.</div><div class='del'>-	(folder_scan_drop_step): Do the right thing for the PRE_FROM</div><div class='del'>-	state.</div><div class='del'>-	(camel_mime_parser_scan_from): Update the doco.</div><div class='del'>-	(camel_mime_parser_scan_pre_from): Ok, make this behaviour</div><div class='del'>-	optional, it simplifies a lot of loops that dont otherwise need to</div><div class='del'>-	know about it.</div><div class='del'>-	(folder_scan_step): Made the PRE_FROM state optional.</div><div class='del'>-	(struct _header_scan_state): Made the bool vars 1 bit.</div><div class='del'>-	(folder_pull_part): Free the from_line buffer if it is there.</div><div class='del'>-	(folder_scan_skip_line): Added a new arg, can save the skpped data</div><div class='del'>-	to a byte_array, as we go.</div><div class='del'>-	(folder_scan_step): Fixed calls to skip_line approrpiately.  Now</div><div class='del'>-	we save the from line as we parse it.</div><div class='del'>-	(camel_mime_parser_read): New function to read from the mime</div><div class='del'>-	parser buffer directly.  Useful if you use the parser to read the</div><div class='del'>-	first/some headers, then need to scan the rest of the data,</div><div class='del'>-	without needing to use a seek(), or allocate your own buffers.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.h (struct _header_state): Added a new parser state,</div><div class='del'>-	pre-from which returns any data found before a from line during</div><div class='del'>-	parsing (all other data can be retrieved by the caller except</div><div class='del'>-	this).</div><div class='del'>-</div><div class='del'>-2000-11-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): When</div><div class='del'>-	extracting a literal string, capture up until the end of the last</div><div class='del'>-	line - this we we don't lose any data if the byte count is off.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Use</div><div class='del'>-	the byte-read count to decrement the number of bytes left to read</div><div class='del'>-	rather than using strlen. Not only does this protect against a DoS</div><div class='del'>-	(embedded NUL chars in the literal string would make strlen</div><div class='del'>-	inaccurate) but it also improves performace a little.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_recv_line): *Sigh* Return the</div><div class='del'>-	number of bytes read on success rather than 0. Also don't use</div><div class='del'>-	camel_stream_buffer_read_line since we can't get an accurate octet</div><div class='del'>-	count.</div><div class='del'>-</div><div class='del'>-2000-11-17  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c (local_summary_add): Clear</div><div class='del'>-	the NOXEV/FLAGGED bits, since we do have an xev header.  um m,</div><div class='del'>-	maybe this is right, this assumes a write is following.  Maybe</div><div class='del'>-	this should be done in folder::append() instead ...</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_gets): We should</div><div class='del'>-	always terminate the string.  No need to check outptr is in range,</div><div class='del'>-	its already been checked.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-summary.c (mbox_summary_sync): When</div><div class='del'>-	we update the summary, do it from mbox_summary-&gt;folder_size, not</div><div class='del'>-	the content info endpos (which isn't any good anymore anyway).</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_append_message): Set</div><div class='del'>-	the frompos from the current folder size, since summary_add wont</div><div class='del'>-	have initialised it to anything useful.</div><div class='del'>-</div><div class='del'>-2000-11-16  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-summary.c</div><div class='del'>-	(local_summary_encode_x_evolution): Check the uid string is all</div><div class='del'>-	digits before trying to write a 'standard' x-ev header.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-maildir-summary.c</div><div class='del'>-	(camel_maildir_summary_info_to_name): Convert an info into a</div><div class='del'>-	maildir name:info filename.</div><div class='del'>-	(camel_maildir_summary_name_to_info): Convert a name:info filename</div><div class='del'>-	into an info, and tell us if it didn't match it.</div><div class='del'>-	(message_info_new): When creating a new filename, gets its info</div><div class='del'>-	from the flags field.  Likewise if creating from an existing file,</div><div class='del'>-	extract the flags.</div><div class='del'>-	(maildir_summary_sync): Remove a small memleak.  Also, if our</div><div class='del'>-	flags and that requires a filename change, perform that here.</div><div class='del'>-	(message_info_new): Get the received date from the filename.</div><div class='del'>-	Also, dont overwirte the uid if we have one.</div><div class='del'>-	(maildir_summary_check): Sort the summary in received order before</div><div class='del'>-	completion.</div><div class='del'>-	(maildir_summary_next_uid_string): Test the name for collusions</div><div class='del'>-	before we give it out.  Retry, and if that fails, well, I guess we</div><div class='del'>-	collide :(</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-mbox-folder.c (mbox_lock): Implement mbox</div><div class='del'>-	locking.</div><div class='del'>-	(mbox_unlock): And unlocking.</div><div class='del'>-	(mbox_append_message): Lock the folder for write before doing</div><div class='del'>-	anything.</div><div class='del'>-	(mbox_get_message): Lock the folder for read before doing</div><div class='del'>-	anything.</div><div class='del'>-</div><div class='del'>-	* providers/local/camel-local-folder.c (camel_local_folder_lock):</div><div class='del'>-	Implement something here.  We handle the recursive ability but</div><div class='del'>-	pass the locking to the folder itself.</div><div class='del'>-	(camel_local_folder_unlock): Likewise for unlocking.</div><div class='del'>-	(local_lock): Default - do nothing, return success.</div><div class='del'>-	(local_unlock): Same.</div><div class='del'>-	(local_sync): Changed slightly for locking api changes, and also,</div><div class='del'>-	only lock around the sync process itself.</div><div class='del'>-</div><div class='del'>-	* camel-lock.c: New file - utility functions for locking using</div><div class='del'>-	different strategies and/or for locking folders safely.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Adde camel-lock.[ch]</div><div class='del'>-</div><div class='del'>-2000-11-15  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: mime_guess_type_from_file_name moved back to</div><div class='del'>-	composer as it introduced unwanted VFS dependency</div><div class='del'>-	removed  #include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-</div><div class='del'>-2000-11-15  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Removed local again, not quite ready.</div><div class='del'>-</div><div class='del'>-2000-11-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new_from_message): Use</div><div class='del'>-	message_info_new to create the summary from headers, instead of</div><div class='del'>-	getting directly from the message.</div><div class='del'>-	(format_recipients): No longer required.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Added local.</div><div class='del'>-</div><div class='del'>-2000-11-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_push_part): Make sure 'atleast' is</div><div class='del'>-	at least 1, always.  This is possibly a temporary fix for a</div><div class='del'>-	bad failure mode on bad multipart messages.</div><div class='del'>-	(folder_scan_content): Go until inend, not inend+1.  Changed the</div><div class='del'>-	continuation and retry logic to be simpler and more robust.  If we</div><div class='del'>-	can't find a marker within</div><div class='del'>-	the atleast we need, just set it to 1, and try again, rather than</div><div class='del'>-	just going to the next smaller limit (boundary check checks the</div><div class='del'>-	length anyway).</div><div class='del'>-	(header_append): streamline the empty line case.  And strip</div><div class='del'>-	trailing \r's if there are any (\n's already stripped).</div><div class='del'>-	(folder_scan_header): Reordered and cleaned up a lot.  Check for</div><div class='del'>-	continuation only once, and compress lwsp then.	Assume the header</div><div class='del'>-	buffer already has end of line's stripped, and simplify some things:</div><div class='del'>-		Only check for end of headers once and easier.</div><div class='del'>-		Dont check to remove end of line character</div><div class='del'>-	Dont bother testing inptr-start if we get a boundary match - it is</div><div class='del'>-	always zero.</div><div class='del'>-	(folder_scan_header): Removed the unused part variable, and a few</div><div class='del'>-	pointless assignments.</div><div class='del'>-	(folder_scan_header): Change the end limit to be 1 higher, to make</div><div class='del'>-	sure we get all content.</div><div class='del'>-	(folder_scan_content): And here too.</div><div class='del'>-	(folder_scan_header): Killed a warning.</div><div class='del'>-	(folder_push_part): Removed a bad comment.  Actually</div><div class='del'>-	boundarylenfinal can be zero for a new message not in a</div><div class='del'>-	multipart.  So we fix that here.</div><div class='del'>-</div><div class='del'>-2000-11-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_param_list): Renamed from</div><div class='del'>-	header_param_list_decode.</div><div class='del'>-	(header_param_list_decode): New external function to decode a</div><div class='del'>-	parameter list.</div><div class='del'>-	(header_param_list_format_append): Made public.</div><div class='del'>-	(header_param_list_format): Another new public helper function for</div><div class='del'>-	formatting just a param list.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (next_uid_string): Default implementation</div><div class='del'>-	is the same as before.</div><div class='del'>-	(camel_folder_summary_class_init): And set it up.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Make next_uid_string a virtual function.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_changed): New function</div><div class='del'>-	to return true if the changeset contains any changes.</div><div class='del'>-</div><div class='del'>-2000-11-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (camel_stream_printf): Don't cast an int to a</div><div class='del'>-	ssize_t.</div><div class='del'>-</div><div class='del'>-2000-11-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): put a space before a single-digit</div><div class='del'>-	day of the month since it seems some mailers are fantastically</div><div class='del'>-	picky about this. (bugs.gnome.org #27232)</div><div class='del'>-</div><div class='del'>-2000-11-10  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_generate): fix ids ending with '.'</div><div class='del'>-</div><div class='del'>-2000-11-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c (imap_try_kerberos_v4_auth):</div><div class='del'>-	Fix error handling. (Only send a "*" to bail out of authentication</div><div class='del'>-	if the server hasn't already bailed on us.)</div><div class='del'>-</div><div class='del'>-2000-11-08  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (mime_guess_type_from_file_name): new</div><div class='del'>-	function, moved from composer</div><div class='del'>-</div><div class='del'>-2000-11-08  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (find_best_encoding): Keep track of the</div><div class='del'>-	caller bestenc flags that make sense.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-filter-bestenc.c (filter): Added code to detect when</div><div class='del'>-	we have "^From " lines in the sequence of text.</div><div class='del'>-	(camel_mime_filter_bestenc_get_best_encoding): Added a new flag</div><div class='del'>-	CAMEL_BESTENC_NO_FROM: if set, it will not allow any lines</div><div class='del'>-	matching "^From " to appear in the output - currently forcing</div><div class='del'>-	base64 encoding to achieve this.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Call</div><div class='del'>-	camel_mime-filter_complete() once we're done, rather than</div><div class='del'>-	filter_filter().</div><div class='del'>-	(folder_scan_content): Some fixes for state changing; so that when</div><div class='del'>-	we do find another boundary it is properly flagged.  Since we</div><div class='del'>-	strip the last \n off all data, we must take that into account</div><div class='del'>-	too.  Sigh.  Fixes a rather nasty set of bugs where multipart</div><div class='del'>-	messages could start including following messages as parts, etc.</div><div class='del'>-	(struct _header_scan_stack): Added new parameter,</div><div class='del'>-	boundarylenfinal, which holds the length of the final boundary, if</div><div class='del'>-	it is different (e.g. for From lines, whihc aren't)</div><div class='del'>-	(folder_scan_step): Setup teh boundarylenfinal value when creating</div><div class='del'>-	a new boundary.</div><div class='del'>-	(folder_scan_content): Hmm, if we hit the end-of-buffer sentinal,</div><div class='del'>-	reset the scanner back to leave 'atleast' chars in the buffer</div><div class='del'>-	still, dump that content, and retry again.  Stops us losing a</div><div class='del'>-	check for a boundary on some data we haven't really looked at yet!</div><div class='del'>-	(folder_scan_content): Use boundarylenfinal to calculate</div><div class='del'>-	'atleast'.</div><div class='del'>-	(folder_scan_header): And here too.</div><div class='del'>-	(folder_boundary_check): Use the atleast value directly, dont</div><div class='del'>-	truncate it.  Use the boundarylen/boundarylenfinal values directly</div><div class='del'>-	too.</div><div class='del'>-	(struct _header_scan_stack): Add an atleast parameter to cache the</div><div class='del'>-	atleast info.</div><div class='del'>-	(folder_push_part): Determine/set 'atleast', every time we add a</div><div class='del'>-	new part.</div><div class='del'>-	(folder_scan_header): Get the cached atleast info from the current</div><div class='del'>-	part.</div><div class='del'>-	(folder_scan_content): And here too.</div><div class='del'>-	(folder_scan_header): Fix a problem where a part starting with</div><div class='del'>-	" text" would be interpreted as a followon header wrongly.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Add some assertions to</div><div class='del'>-	find a bug.</div><div class='del'>-</div><div class='del'>-2000-11-07  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (get_name): Strdup the "???" string you return,</div><div class='del'>-	so that the expected semantics for `::get_name()' is respected.</div><div class='del'>-</div><div class='del'>-2000-11-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (d): Kill debugging, as it causes lots of</div><div class='del'>-	evolution-mail spewage.</div><div class='del'>-</div><div class='del'>-2000-11-07  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-bestenc.c (complete): Implement a complete()</div><div class='del'>-	function, now we need one.</div><div class='del'>-	(filter): Upgraded to match rfrc2045 properly.  Checks also for</div><div class='del'>-	length of line and valid CRLF sequences.</div><div class='del'>-	(camel_mime_filter_bestenc_get_best_encoding): Do the work of</div><div class='del'>-	working out what is the best encoding given what we found about</div><div class='del'>-	the stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_encoding_to_string): Use a</div><div class='del'>-	lookup table to get the encoding naem, and add the binary type.</div><div class='del'>-	(camel_mime_part_encoding_from_string): Likewise for the reverse.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h: Added the binary encoding type, see rfc2045.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_param_list_format_append): Dont put a</div><div class='del'>-	space before ;'s in parameter lists, makes them more</div><div class='del'>-	readable/consistent.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (multipart_has_8bit_parts): Cleaned up the</div><div class='del'>-	old stuff, well removed it.</div><div class='del'>-	(camel_mime_message_set_best_encoding): Added another argument</div><div class='del'>-	that lets you select what you want to set the best of.  i.e. for</div><div class='del'>-	smtp transport we only need 7 bit, and dont need to optimise the</div><div class='del'>-	charset (although of course, we should always).</div><div class='del'>-	(find_best_encoding): Implement this feature, if we are not</div><div class='del'>-	getting the best charset, use the one we have.</div><div class='del'>-	(best_encoding): Set the charset on the part appropriately.  Sigh,</div><div class='del'>-	the interfaces for this are nonexistant.</div><div class='del'>-	(find_best_encoding): Tell the bestenc filter that lf should be</div><div class='del'>-	treated as crlf for the purposes of determining encodings.</div><div class='del'>-</div><div class='del'>-2000-11-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c (camel_charset_init): Init function for an</div><div class='del'>-	iterative charset determinator.</div><div class='del'>-	(camel_charset_step): Iterate another buffer.</div><div class='del'>-	(camel_charset_mask): Removed, since it couldn't have worked.</div><div class='del'>-	(camel_charset_best): Use the iterative interface to do the work.</div><div class='del'>-	(camel_charset_best_name): Get the best name for a charset so far.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-bestenc.c: New class, a stream</div><div class='del'>-	filter that can be used to memory-efficiently determine the best</div><div class='del'>-	encoding and/or charset to use for a given stream of bytes.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Added stream-null*.</div><div class='del'>-	(libcamel_la_SOURCES): Added bestenc*</div><div class='del'>-</div><div class='del'>-	* camel-stream-null.c: New class, a null-stream, that always</div><div class='del'>-	succeeds, and never has any contents.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c: Minor pointless changes.  Was going to do</div><div class='del'>-	something else but changed my mind.  Added trivial default</div><div class='del'>-	implementations for all callbacks.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h: Cleaned up some old cruft.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_format_address):</div><div class='del'>-	address_list_format() no longer encodes, so we dont need to decode</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-	* camel-address.c (camel_address_unformat): New function, attempts</div><div class='del'>-	to reverse the formatting process on display addresses.</div><div class='del'>-	(camel_address_length): New function to get the number of</div><div class='del'>-	addresses, without having to peek the structure.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_from): Fix a typo.</div><div class='del'>-	(camel_mime_message_finalize): Only unref from/reply_to if we have</div><div class='del'>-	it.</div><div class='del'>-	(camel_mime_message_set_recipients): New function - set the</div><div class='del'>-	recipients as a CamelInternetAddress.  This function effectively</div><div class='del'>-	deprecates the older recipient setting functions.</div><div class='del'>-	(camel_mime_message_add_recipient): What the hell, i'll bite the</div><div class='del'>-	bullet.  Terminate this function.  The old api was ambiguious and</div><div class='del'>-	inefficient and didn't work right anyway.</div><div class='del'>-	(camel_mime_message_remove_recipient_address): And this one.</div><div class='del'>-	(camel_mime_message_remove_recipient_name): And this one too.</div><div class='del'>-	(camel_mime_message_set_recipients): If we set an empty header,</div><div class='del'>-	then remove it from the header list.  Allow a null receipient</div><div class='del'>-	object to clear a header.</div><div class='del'>-	(camel_mime_message_set_from): Likewise, if setting an empty from</div><div class='del'>-	address.</div><div class='del'>-	(camel_mime_message_encode_8bit_parts): Eeek!!</div><div class='del'>-	camel_stream_mem_new_with_byte_array owns the byte_array we give</div><div class='del'>-	it, so make sure we dont free any of it!</div><div class='del'>-	(camel_mime_message_encode_8bit_parts):  Infact, i'll just rewrite</div><div class='del'>-	the whole lot, its a bit of a mess.  Should really rename it and</div><div class='del'>-	make it a little more useful too, lets see ...</div><div class='del'>-	(best_encoding): This has a string interface?  Oh boy.</div><div class='del'>-	(camel_mime_message_foreach_part): New experimental function to</div><div class='del'>-	iterate over all message parts.  Might not remain.</div><div class='del'>-	(camel_mime_message_has_8bit_parts): New implementation using</div><div class='del'>-	foreach_part.  Fixed a couple of problems.</div><div class='del'>-	(find_best_encoding): New function, that finds the best encoding</div><div class='del'>-	for a given part (will probably be moved to camel-mime-part), and</div><div class='del'>-	also the best charset to use if it is a text part.  Since one</div><div class='del'>-	affects the other it is a two pass process, but uses streams and</div><div class='del'>-	not memory to achieve this.</div><div class='del'>-	(camel_mime_message_set_best_encoding): Uses the function above to</div><div class='del'>-	configure an entire message for the best encoding possible given</div><div class='del'>-	transport constraints.</div><div class='del'>-	(camel_mime_message_encode_8bit_parts): Reimplemented to use the</div><div class='del'>-	function above to perform the work.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c</div><div class='del'>-	(camel_internet_address_format_address): Dont put &lt;&gt; around a lone</div><div class='del'>-	address with no real name.</div><div class='del'>-	(camel_internet_address_encode_address): Similarly.</div><div class='del'>-	(internet_decode): Actually return the count of decoded addresses.</div><div class='del'>-	(internet_unformat): Implement the unformatting routine.</div><div class='del'>-</div><div class='del'>-2000-11-05  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Changed to get</div><div class='del'>-	the internetaddress directly, rather than having to parse it</div><div class='del'>-	itself.</div><div class='del'>-</div><div class='del'>-	* camel-address.c (camel_address_format): Added a new function</div><div class='del'>-	which will format address, suitable for display.</div><div class='del'>-	(camel_address_cat): Concatentate 1 camel address onto another.</div><div class='del'>-	It is upto the caller to ensure the addresses are of compatible</div><div class='del'>-	types.</div><div class='del'>-	(camel_address_new_clone): New function to create a new address by</div><div class='del'>-	copying an existing one of the same type.</div><div class='del'>-	(camel_address_copy): New helper function to copy an address.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h (struct _CamelMimeMessage): Removed cached</div><div class='del'>-	copy of date string.</div><div class='del'>-	(struct _CamelMimeMessage): Added date_received info.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_get_date_string):</div><div class='del'>-	Removed.  Nothing uses it anyway, and it is redundant.</div><div class='del'>-	(camel_mime_message_finalize): No more date_str.</div><div class='del'>-	(camel_mime_message_init): No more date_str, initialise</div><div class='del'>-	date_received*</div><div class='del'>-	(write_to_stream): Change the check for a date header.</div><div class='del'>-	(process_header): No longer track the date_str.</div><div class='del'>-	(camel_mime_message_get_received_date): Removed.  totally invalid</div><div class='del'>-	anyway.</div><div class='del'>-	(camel_mime_message_get_sent_date): Removed.  Redundant.  The only</div><div class='del'>-	'date' is the sent date, the received date is just made up.</div><div class='del'>-	(camel_mime_message_get_date): Args changed to be more consistent</div><div class='del'>-	with utility functions.</div><div class='del'>-	(camel_mime_message_get_date): Dont set the date when we're asked</div><div class='del'>-	for it (if its not set by the time its written, it'll be set</div><div class='del'>-	then).</div><div class='del'>-	(camel_mime_message_get_date_received): Actually do 'the right</div><div class='del'>-	thing' here, if we have a received header, use that to determine</div><div class='del'>-	the received date.  And return the data in the same format as</div><div class='del'>-	get_date.</div><div class='del'>-	(camel_mime_message_set_from): Changed the api to better match</div><div class='del'>-	what we should be doing.  Pass a camelinternetaddress, etc.</div><div class='del'>-	(camel_mime_message_set_reply_to): Cahnged similarly to take an</div><div class='del'>-	internetaddress.</div><div class='del'>-	(camel_mime_message_get_reply_to): Likewise.</div><div class='del'>-	(camel_mime_message_finalize): Unref the from/reply_to objects.</div><div class='del'>-	(format_address): Removed, no longer needed.</div><div class='del'>-	(process_header): Changed to store the from/reply_to as</div><div class='del'>-	internetaddress's.</div><div class='del'>-	(write_to_stream): Set the from header directly to empty, if we</div><div class='del'>-	dont have one.  Maybe we should just abort, and/or create one</div><div class='del'>-	based on the current user.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format): Renamed to</div><div class='del'>-	header_address_list_encode, which is what it is actually doing.</div><div class='del'>-	(header_address_list_format_append): Similarly.</div><div class='del'>-	(encoding_map[]): Removed, no longer used.</div><div class='del'>-	(header_address_list_encode_append): Take another arg, do we</div><div class='del'>-	encode the address (for internet), or not (for display - utf8</div><div class='del'>-	only).</div><div class='del'>-	(header_address_list_format): Re-added this function, but now it</div><div class='del'>-	generates a display version only.  Surprise surprise, that is all</div><div class='del'>-	anythign needs to generate anyway.  Sigh.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (camel_internet_address_get): Return</div><div class='del'>-	false if we get an invalid index only.</div><div class='del'>-	(camel_internet_address_encode_address): Helper function to encode</div><div class='del'>-	a single address for mailing.</div><div class='del'>-	(internet_encode): Use the above function to format it.</div><div class='del'>-	(camel_internet_address_format_address): Format a single address</div><div class='del'>-	for display.</div><div class='del'>-	(internet_format): Implement the display version.</div><div class='del'>-	(camel_internet_address_class_init): Init the internet_format</div><div class='del'>-	virtual function.</div><div class='del'>-	(internet_cat): Implement virtual function to concatenate</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_info_new_from_header): new function, only</div><div class='del'>-	build the summary info, dont add it.</div><div class='del'>-	(camel_folder_summary_info_new_from_parser): Likewise, for new</div><div class='del'>-	info from parser.</div><div class='del'>-	(camel_folder_summary_add_from_parser): Cahnged to call function</div><div class='del'>-	above to build info.</div><div class='del'>-	(camel_folder_summary_add_from_header): Changed to call function</div><div class='del'>-	above, to build info.</div><div class='del'>-	(camel_folder_summary_info_free): New function to free the summary</div><div class='del'>-	message info.</div><div class='del'>-	(camel_folder_summary_clear): Changed to clal above to free info.</div><div class='del'>-	(camel_folder_summary_remove): Likewise.</div><div class='del'>-	(camel_folder_summary_add): Cleaned up the clashing uid</div><div class='del'>-	re-assignment logic a little bit.</div><div class='del'>-	(camel_folder_summary_decode_uint32): Fixed a typo, 01 != -1.</div><div class='del'>-	(camel_folder_summary_decode_time_t): Return -1 on error.</div><div class='del'>-	(camel_folder_summary_encode_off_t): New function to encode an</div><div class='del'>-	off_t type.</div><div class='del'>-	(camel_folder_summary_decode_off_t): And likewise for the reverse.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped the summary version, since</div><div class='del'>-	we're now encoding time/off_t's right.</div><div class='del'>-	(summary_header_save): Use time_t encoder to save the timestamp.</div><div class='del'>-	(summary_header_load): Likewise for decoding the timestamp.</div><div class='del'>-	(content_info_load): Decode off_t types directly, now we can.</div><div class='del'>-	(content_info_save): And likewise for encoding.</div><div class='del'>-	(camel_folder_summary_add_from_message): New function, create a</div><div class='del'>-	summary item from an existing message and add it.</div><div class='del'>-	(camel_folder_summary_info_new_from_message): New function, create</div><div class='del'>-	a summary item from an existing message.</div><div class='del'>-	(summary_build_content_info_message): New function to do the dirty</div><div class='del'>-	work of building the conent info/indexing, from a message source.</div><div class='del'>-	(format_recipients): Format an internetaddress suitable for the</div><div class='del'>-	summary.</div><div class='del'>-	(message_info_new_from_message): Build a new summary item from a</div><div class='del'>-	mime message.</div><div class='del'>-	(content_info_new_from_message): Build a new conent info from a</div><div class='del'>-	mime part.</div><div class='del'>-	(camel_folder_summary_class_init): Init the new class functions.</div><div class='del'>-	(message_info_new_from_message): Fixed for message api change.</div><div class='del'>-</div><div class='del'>-	Added documentation to the functions.</div><div class='del'>-	</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_generate): new function,</div><div class='del'>-	generates simple message/content id</div><div class='del'>-</div><div class='del'>-2000-11-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Set the</div><div class='del'>-	preface/postface from the parser into the multipart object.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (camel_multipart_set_postface): Function to</div><div class='del'>-	set the postface text on a multipart.</div><div class='del'>-	(camel_multipart_set_preface): Similarly for preface text.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): If we scan until a</div><div class='del'>-	boundary, then we do not include the \n that starts the boundary</div><div class='del'>-	line in the content.</div><div class='del'>-	(struct _header_scan_stack): Added a ByteArray to store the</div><div class='del'>-	multipart pre/post-text as we're scanning.</div><div class='del'>-	(folder_pull_part): Free pre/posttext if they are allocated.</div><div class='del'>-	(folder_scan_step): Build into the pre/posttext arrays as we</div><div class='del'>-	encounter data.</div><div class='del'>-	(camel_mime_parser_preface): REturn the multipart preface text, if</div><div class='del'>-	there is any scanned.</div><div class='del'>-	(camel_mime_parser_postface): Likewise for postface text.</div><div class='del'>-	(byte_array_to_string): helper function for above.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Change</div><div class='del'>-	the from line to be "\nFrom ..." always, so no need to</div><div class='del'>-	check/append a \n to messages.</div><div class='del'>-	(mbox_append_message): Open the output stream with append mode</div><div class='del'>-	[assuming this is more efficient than seeking to the end]</div><div class='del'>-	And dont prepend \n  on the From line if its the first in the</div><div class='del'>-	mbox.</div><div class='del'>-	(mbox_append_message): Pass the offset of the real start of the</div><div class='del'>-	"From " line when we perform the update (which may != 'seek')</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Removed the terminating</div><div class='del'>-	NUL 'fix'.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_read): Added some debug.</div><div class='del'>-	(do_flush): And here.</div><div class='del'>-	(do_write): And here too.</div><div class='del'>-	(do_write): ARGH!!! ARGH!  Ok, so the filter stream was writing a</div><div class='del'>-	different number of bytes than the requester was asking it to</div><div class='del'>-	write (because of filtering, of course!).  So instead of returning</div><div class='del'>-	the true number of written bytes, we'll return what they asked us</div><div class='del'>-	to write - unless there is an error in which case we return -1.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_close): Sigh, forgot to make</div><div class='del'>-	it unsigned.  I think this is actually a gcc bug as (48 &gt;&gt; 2)</div><div class='del'>-	somehow ended up negative, when it obviously should not, even if</div><div class='del'>-	the data load was signed.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c: Undo my incorrect fix - I misunderstood danw -</div><div class='del'>-	sorry!</div><div class='del'>-</div><div class='del'>-2000-11-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_expunge):</div><div class='del'>-	Unbreak this.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): If show_pass, then base64 the</div><div class='del'>-	password before writing it to the output string.</div><div class='del'>-	(camel_url_new): Assume password has been base64 encoded and</div><div class='del'>-	decode accordingly.</div><div class='del'>-</div><div class='del'>-2000-11-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add an "url_flags" field to CamelProvider.</div><div class='del'>-	Move the CAMEL_SERVICE_URL_* defines here and remove the SERVICE_</div><div class='del'>-	part of the name.</div><div class='del'>-</div><div class='del'>-	* camel-service.h: Remove CAMEL_SERVICE_URL_* flags and</div><div class='del'>-	service-&gt;url_flags field.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (check_url, get_path): Get URL flags from</div><div class='del'>-	service-&gt;provider, update for changed flag names.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Add URL flags to provider</div><div class='del'>-	structures.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-{store,transport}.c, camel-remote-store.c:</div><div class='del'>-	Remove service-&gt;url_flags initialization.</div><div class='del'>-</div><div class='del'>-2000-11-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Quote</div><div class='del'>-	foldernames when sending to the IMAP server because the folder</div><div class='del'>-	name might contain spaces.</div><div class='del'>-</div><div class='del'>-2000-11-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Merged in camel-incremental-branch.</div><div class='del'>-</div><div class='del'>-2000-11-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Remove old</div><div class='del'>-	subbed folders from hash table after freeing them.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Deal</div><div class='del'>-	correctly with namespace == ""</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c, camel-charset-map-private.h: synced all charsets</div><div class='del'>-	with ones found in libunicode. Just include more "iso/*.h" and rebuild</div><div class='del'>-	...private.h with this.</div><div class='del'>-	</div><div class='del'>-2000-10-31  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (service_disconnect): Add a new argument, clean,</div><div class='del'>-	that says whether or not to try to disconnect cleanly.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_string, remote_send_stream,</div><div class='del'>-	remote_recv_line): disconnect uncleanly on failure to prevent</div><div class='del'>-	infinite loops when providers would normally send commands from</div><div class='del'>-	disconnect(). Remove some unneeded CamelException goo.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_disconnect): </div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_disconnect): </div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_disconnect):</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Don't send</div><div class='del'>-	QUIT/LOGOUT if !clean.</div><div class='del'>-</div><div class='del'>-2000-10-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: New file with code for IMAP</div><div class='del'>-	authentication mechanisms. (Currently just krb4, and without</div><div class='del'>-	integrity/privacy protection).</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Add camel-imap-auth.[ch] and krb4</div><div class='del'>-	CFLAGS/LDFLAGS</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (connect_to_server): Split out</div><div class='del'>-	from imap_connect. Just does the basic connect and CAPABILITY</div><div class='del'>-	check. Redo the CAPABILITY code more robustly.</div><div class='del'>-	(query_auth_types_connected): Do this right rather than punting to</div><div class='del'>-	query_auth_types_generic. Check for KERBEROS_V4 if compiled with</div><div class='del'>-	krb4 support.</div><div class='del'>-	(query_auth_types_generic): Mention KERBEROS_V4 if compiled with</div><div class='del'>-	krb4 support.</div><div class='del'>-	(imap_connect): Use connect_to_server().</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step, base64_encode_close):</div><div class='del'>-	Take an additional argument, "break_lines", saying whether or not</div><div class='del'>-	to add '\n's to the output.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (set_boundary): </div><div class='del'>-	* camel-mime-filter-basic.c (filter, complete): Update for base64</div><div class='del'>-	api change.</div><div class='del'>-</div><div class='del'>-2000-10-30  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (unsubscribe_folder): Correct</div><div class='del'>-	parameters to g_hash_table_lookup_extended.</div><div class='del'>-</div><div class='del'>-2000-10-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Improved IMAP namespace handling: leave the namespace in the</div><div class='del'>-	folder names rather than constantly prepending it and stripping it</div><div class='del'>-	off. Also some subscription fixes.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Fix for the case where</div><div class='del'>-	@top isn't in @folders.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Add</div><div class='del'>-	a "short_name" argument rather than figuring it out ourselves.</div><div class='del'>-	(imap_get_full_name): Implementation of CamelFolder::get_full_name</div><div class='del'>-	that strips off namespace so the user doesn't have to see it.</div><div class='del'>-	(imap_append_message, imap_copy_message_to, imap_move_message_to):</div><div class='del'>-	Use folder-&gt;full_name rather than calling</div><div class='del'>-	camel_imap_store_get_folder_path.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Update this: make @flags a bitmask and @sep a char rather than a</div><div class='del'>-	string. Make all of the out arguments optional. Handle literals in</div><div class='del'>-	the server response.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Do a better</div><div class='del'>-	job of getting the correct dir_sep for the namespace we're using.</div><div class='del'>-	Construct a base_url here that will be used by get_folder_info.</div><div class='del'>-	(camel_imap_store_folder_path): Removed</div><div class='del'>-	(imap_folder_exists): Add an argument to return the short name of</div><div class='del'>-	the folder (parsed out of the LIST response). Update for</div><div class='del'>-	imap_parse_list_response change.</div><div class='del'>-	(get_folder): Update for the various other changes.</div><div class='del'>-	(get_folder_info): Update for the various other changes. Be more</div><div class='del'>-	consistent about the returned layout: put everything underneath</div><div class='del'>-	the "namespace" directory, including INBOX, even if it doesn't</div><div class='del'>-	belong there. Don't destroy the list of subscribed folders until</div><div class='del'>-	we've actually gotten the new list.</div><div class='del'>-	(folder_subscribed, subscribe_folder, unsubscribe_folder): Use</div><div class='del'>-	folder_name directly rather than camel_imap_store_folder_Path.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Update</div><div class='del'>-	for folder name changes.</div><div class='del'>-</div><div class='del'>-2000-10-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Remove md5-utils.h include since it's not part of Camel</div><div class='del'>-	any more.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Kill some warnings.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c</div><div class='del'>-	(camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save):</div><div class='del'>-	Clean up warnings about time_t casts.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h</div><div class='del'>-	include.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Undefine the "_" macro</div><div class='del'>-	defined by krb4's des.h when compiling with krb support.</div><div class='del'>-	Fix md5-utils.h include.</div><div class='del'>-</div><div class='del'>-2000-10-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_param_list_format_append): Only quote</div><div class='del'>-	Content-type parameters when the quoting is mandatory, and deal</div><div class='del'>-	with embedded quotes/backslashes when quoting.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am: Tidy up build</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: ditto	</div><div class='del'>-	</div><div class='del'>-	* Makefile.am:  Move md5-utils.[hc] to e-util because the </div><div class='del'>-	addressbook is going to use md5 hashes for pilot syncing.</div><div class='del'>-	Maybe the calendar conduits as well because this is a good idea</div><div class='del'>-	Chris had.</div><div class='del'>-</div><div class='del'>-2000-10-26  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-exceptions-list.def: Add newline to kill warnings.</div><div class='del'>-	</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Fix folder</div><div class='del'>-	listing code infinite loop.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Add a "parent" field to CamelFolderInfo.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Deal with "parent"</div><div class='del'>-	(camel_store_folder_subscribed, camel_store_subscribe_folder,</div><div class='del'>-	camel_store_unsubscribe_folder): Add g_return_if_fails checking</div><div class='del'>-	that the folder supports subscriptions.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (folder_subscribed,</div><div class='del'>-	subscribe_folder, unsubscribe_folder): Remove "+ 1"s since the</div><div class='del'>-	mail subscribe UI won't prepend / to the folder names now.</div><div class='del'>-	(get_folder_info): Clear the "parent" field of the folderinfos</div><div class='del'>-	when removing an empty top level.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_folder_subscribed,</div><div class='del'>-	nntp_store_subscribe_folder, nntp_store_unsubscribe_folder):</div><div class='del'>-	Remove "+ 1"s since the mail subscribe UI won't prepend / to the</div><div class='del'>-	folder names now.</div><div class='del'>-</div><div class='del'>-2000-10-24  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: add subscribed_folders.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):</div><div class='del'>-	fill in vtable entries for subscription functions.</div><div class='del'>-	(camel_imap_store_finalize): new function, so we can free up our</div><div class='del'>-	subscribed_folders hashtable.</div><div class='del'>-	(camel_imap_store_init): set CAMEL_STORE_SUBSCRIPTIONS in the</div><div class='del'>-	CamelStore flags, and create our subscribed_folders hashtable.</div><div class='del'>-	(camel_imap_store_get_type): camel_imap_store_finalize is our</div><div class='del'>-	finalize function.</div><div class='del'>-	(get_folder_info): if we're looking at subscribed_only, clear out</div><div class='del'>-	the subscribed_folders hashtable, use LSUB instead of LIST, and</div><div class='del'>-	insert folder paths (prepended by their namespace if there is one)</div><div class='del'>-	into subscribed_folders.  INBOX subscription support needs work,</div><div class='del'>-	since we always show it, regardless of it's subscribed state.</div><div class='del'>-	(folder_subscribed): new function.  just look up the folder_path</div><div class='del'>-	in the hashtable.</div><div class='del'>-	(subscribe_folder): new function.  use the imap SUBSCRIBE command,</div><div class='del'>-	and if successful add it to the hashtable.</div><div class='del'>-	(unsubscribe_folder): new function.  use the imap UNSUBSCRIBE</div><div class='del'>-	command, and if successful remove it from the hashtable.</div><div class='del'>-</div><div class='del'>-2000-10-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Fill in the</div><div class='del'>-	message_count and unread_message_count flags (if !fast).</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.h: #include gnome-i18n.h (and gnome-defs.h since</div><div class='del'>-	the former depends on it.)</div><div class='del'>-</div><div class='del'>-	* *: Add lots of _() and N_().</div><div class='del'>-</div><div class='del'>-2000-10-23  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add</div><div class='del'>-	camel-nntp-types.h.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix a</div><div class='del'>-	"how could this have been working before" memory overrun bug</div><div class='del'>-	found by Vlad.</div><div class='del'>-</div><div class='del'>-	* camel-op-queue.[ch], camel-thread-proxy.[ch]: These should have</div><div class='del'>-	gone away a long time ago.</div><div class='del'>-</div><div class='del'>-2000-10-20  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): re-enable the nntp provider.</div><div class='del'>-</div><div class='del'>-2000-10-20  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (build_folder_info): add</div><div class='del'>-	function to build a tree from the nntp group names (using '.' as a</div><div class='del'>-	heirarchy separator.)  #ifdefed INFO_AS_TREE only.</div><div class='del'>-	(build_folder_info_from_grouplist): if INFO_AS_TREE is selected,</div><div class='del'>-	call build_folder_info instead of appending a new CamelFolderInfo</div><div class='del'>-	to our list.</div><div class='del'>-	(ensure_news_dir_exists): use e_mkdir_hier instead of failing if a</div><div class='del'>-	parent directory (~/evolution/news generally) isn't there.</div><div class='del'>-</div><div class='del'>-2000-10-19  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: #include &lt;sys/types.h&gt; before &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-2000-10-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Fix a bug with "INBOX" (or anything else with NIL hierarchy</div><div class='del'>-	separator) as the namespace.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Emit</div><div class='del'>-	message_changed and folder_changed as appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_refresh_info): Update comment here</div><div class='del'>-	so refresh_info isn't just for reconnects any more. Make the</div><div class='del'>-	default implementation a no-op rather than an error.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: Move refresh_info impl into</div><div class='del'>-	camel_nntp_folder_new, since it would have leaked memory and not</div><div class='del'>-	done anything useful if it was called later.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Remove no-longer-necessary</div><div class='del'>-	refresh_info impl.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Update imap_folder-&gt;exists, but don't actually load the new</div><div class='del'>-	messages. This is a temporary workaround to deal with the IMAP</div><div class='del'>-	provider stealing the message list focus at annoying times.</div><div class='del'>-	(imap_copy_message_to, imap_move_message_to): Emit a</div><div class='del'>-	folder_changed by hand, for now.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add</div><div class='del'>-	`camel-imap-stream.h'.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Add `camel-charset-map.h'</div><div class='del'>-	and `camel-charset-map-private.h'.</div><div class='del'>-</div><div class='del'>-2000-10-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_description): The correct</div><div class='del'>-	fix this time - the description should be encoded here and not in</div><div class='del'>-	the camel-medium layer.</div><div class='del'>-</div><div class='del'>-2000-10-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_add_update): Fixed the</div><div class='del'>-	changeset logic, which was completely wrong.</div><div class='del'>-</div><div class='del'>-2000-10-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Removed is_blank() stuff.</div><div class='del'>-	(header_decode_init): When we set the 'space' bit, dont clear all</div><div class='del'>-	the others.</div><div class='del'>-	(quoted_encode): Put back the safemask.  Yes we totally need it,</div><div class='del'>-	see rfc 2047 section 5, parts (1) and (3).</div><div class='del'>-	(CHARS_PSPECIAL): Remove '=' and '_' from the list of allowed</div><div class='del'>-	characters (this is an allowed list, not a not-allowed list, like</div><div class='del'>-	the ESPECIAL).</div><div class='del'>-	(camel_mime_special_table): Updated for fixes to definitions.</div><div class='del'>-	(CHARS_ESPECIAL): Added '_' to list of characters that should be</div><div class='del'>-	encoded.</div><div class='del'>-</div><div class='del'>-2000-10-26  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):</div><div class='del'>-	Use the new camel_folder_change_info_* stuff to build the update</div><div class='del'>-	diff, rather than doing it ourselves.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_add_source): Add a</div><div class='del'>-	'source' list, used to create change lists.</div><div class='del'>-	(camel_folder_change_info_add_source_list): Add a list of uid's,</div><div class='del'>-	convenience function.</div><div class='del'>-	(camel_folder_change_info_add_update): Add a uid to the list of</div><div class='del'>-	uid's in the new updated list.</div><div class='del'>-	(camel_folder_change_info_add_update_list): Add a bunch of uid's</div><div class='del'>-	at once for the same purpose.</div><div class='del'>-	(camel_folder_change_info_build_diff): Take the source list, the</div><div class='del'>-	update list, and find the differences, building on the added or</div><div class='del'>-	removed list as appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (removed_uids): REnamed from</div><div class='del'>-	add_uid.</div><div class='del'>-	(camel_mbox_summary_update): Oops, fix the reversed logic for</div><div class='del'>-	determining the uid changesets.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (message_changed): Oops, we want to change the</div><div class='del'>-	uid, not add it.</div><div class='del'>-</div><div class='del'>-2000-10-19  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Added a</div><div class='del'>-	change list argument, and add expunged uid's to it.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_init): Setup the change list.</div><div class='del'>-	(mh_finalize): And free it.</div><div class='del'>-	(mh_sync): Track changes, and send a folder_changed signal as</div><div class='del'>-	appropriate.</div><div class='del'>-	(mh_expunge): Likewise.</div><div class='del'>-	(mh_append_message): Add the new uid to the change list and</div><div class='del'>-	trigger a folder_changed event.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):</div><div class='del'>-	Setup a mbox list of changes structure.</div><div class='del'>-	(mbox_finalize): And free it.</div><div class='del'>-	(mbox_expunge): Include the change list with the folder_changed</div><div class='del'>-	event, and clear it off.</div><div class='del'>-	(mbox_sync): And the same for when we are just syncing the folder.</div><div class='del'>-	(mbox_append_message): And do the same here, after we've updated</div><div class='del'>-	the folder.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): Use gmtime_r to get the time</div><div class='del'>-	thread-safely.</div><div class='del'>-	(camel_mbox_summary_sync): Added a changeinfo argument.  Add any</div><div class='del'>-	removed or changed messages to the changelists as appropriate.</div><div class='del'>-	(camel_mbox_summary_update): Added a changeinfo argument.</div><div class='del'>-	Genereate a list of added/removed uid's based on the difference</div><div class='del'>-	before and after rebuilding the summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_new):</div><div class='del'>-	(camel_folder_change_info_add_uid): </div><div class='del'>-	(change_info_add_uid): </div><div class='del'>-	(camel_folder_change_info_remove_uid): </div><div class='del'>-	(camel_folder_change_info_change_uid): </div><div class='del'>-	(change_info_clear): </div><div class='del'>-	(camel_folder_change_info_clear): </div><div class='del'>-	(camel_folder_change_info_free):</div><div class='del'>-	(change_info_cat): </div><div class='del'>-	(camel_folder_change_info_cat):  Bunch of utility functions for</div><div class='del'>-	working with change info lists.</div><div class='del'>-	(camel_folder_init): Init the change info list.</div><div class='del'>-	(camel_folder_finalize): And free it.</div><div class='del'>-	(thaw): Changed to pass through a list of changes, or to get the</div><div class='del'>-	changed message uids from the camelfolderchangeinfo struct, and</div><div class='del'>-	reset it.</div><div class='del'>-	(folder_changed): Add the changed lists to the frozen change list</div><div class='del'>-	if we are frozen.</div><div class='del'>-	(message_changed): Add the message to the changed list if we are</div><div class='del'>-	in the frozen state.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (CamelFolderChangeInfo): New structure to hold</div><div class='del'>-	information for the folder_changed event.</div><div class='del'>-</div><div class='del'>-2000-10-18  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Put a zero at the start</div><div class='del'>-	of the outbuf.</div><div class='del'>-</div><div class='del'>-2000-10-18  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (add_header): No, we must not encode the</div><div class='del'>-	headers here.  These interfaces ARE raw interfaces as they are</div><div class='del'>-	defined in camel_medium.  Also removed a bogus/meaningless FIXME.</div><div class='del'>-	(set_header): Likewise here, we must not.</div><div class='del'>-	(process_header): Removed another bogus comment.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (shared_is_of_type): Comment out the spitting of</div><div class='del'>-	a big warning when we're trying to determine types from code.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(message_info_new_from_parser): Only call ibex funcitons if we</div><div class='del'>-	have an index.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_add): Only</div><div class='del'>-	call ibex functions if we have an index.</div><div class='del'>-	(remove_summary): Likewise.</div><div class='del'>-	(camel_mh_summary_check): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder):</div><div class='del'>-	get_folder -&gt; flags argument.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-store.c (vee_get_folder): create-&gt;flags.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (get_folder): Changed create</div><div class='del'>-	-&gt; flags.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Added flags</div><div class='del'>-	argument.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (camel_mh_folder_new): Added</div><div class='del'>-	flags argument, and fixed code appropriately.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder): Added flags argument.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (message_body_contains): Perform a regex</div><div class='del'>-	match on the contents of messages.  This wont quite work yet as</div><div class='del'>-	message contents are encoded when written to a stream.</div><div class='del'>-	(build_match_regex): Converts a number of strings into a regex</div><div class='del'>-	matching pattern, escaping special chars.</div><div class='del'>-	(match_message): match a single message from a folder, by uid.</div><div class='del'>-	Slow.</div><div class='del'>-	(search_body_contains): Changed to support matching where no index</div><div class='del'>-	is supplied.  Matches are performed by retrieving message</div><div class='del'>-	contents, etc.</div><div class='del'>-	() WTF?  camel should not be including any widget headers.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):</div><div class='del'>-	Added flags argument.</div><div class='del'>-	(mbox_refresh_info): Changed into a NOP, the refresh info code</div><div class='del'>-	moved into the new function.</div><div class='del'>-	(camel_mbox_folder_new): If we have an index requested, build one,</div><div class='del'>-	otherwise, remove an old one, or just dont do anything.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Changed create</div><div class='del'>-	to flags, changed code to suit.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Changed create to flags.</div><div class='del'>-	(get_folder_internal): And here.</div><div class='del'>-	(get_folder): And here too.</div><div class='del'>-</div><div class='del'>-	* camel-store.h (camel_store_get_folder): Change the create</div><div class='del'>-	argument to be a flags argument.</div><div class='del'>-</div><div class='del'>-2000-10-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Remove</div><div class='del'>-	cached info at the end of the summary when the folder shrinks</div><div class='del'>-	between sessions. Also remove an untrue comment.</div><div class='del'>-	(camel_imap_folder_new): Move the summary creation to after the</div><div class='del'>-	folder selection again, since it depends on the uidvalidity</div><div class='del'>-	having been set.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Fix up</div><div class='del'>-	summary_file to not include the namespace twice.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (set_header): Encode the header value.</div><div class='del'>-	(add_header): Same.</div><div class='del'>-</div><div class='del'>-2000-10-17  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c: Added some malloc check debugging stuff.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c</div><div class='del'>-	(struct _header_scan_state): Removed top_part, top_start, and</div><div class='del'>-	pending.  I can't even remember why they were there, and they're</div><div class='del'>-	not used anymore.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Forgot to up the space here</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-2000-10-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (complete): Ok, so we hit a fixme, 3x</div><div class='del'>-	just wasn't enough for some sequences.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(imap_read_response): Don't imap_next_word(respbuf + 2), instead</div><div class='del'>-	use imap_next_word(respbuf) or else we'll skip over the second</div><div class='del'>-	token.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(camel_imap_response_extract): Don't free 'resp' as it doesn't</div><div class='del'>-	point to the beginning of the allocated data, instead free</div><div class='del'>-	response-&gt;untagged-&gt;pdata[i]. Also, if '*resp' is equal to a space</div><div class='del'>-	character, then set resp = imap_next_word (resp) rather than</div><div class='del'>-	expecting resp++ to work (there's a list broken IMAP daemons that</div><div class='del'>-	like to put extra spaces between tokens).</div><div class='del'>-	(imap_read_response): Don't expect 'respbuf+2' to be where the</div><div class='del'>-	untagged number response to start (see above fix for an</div><div class='del'>-	explanation).</div><div class='del'>-</div><div class='del'>-2000-10-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (get_path): when using the construct (flags &amp;</div><div class='del'>-	CAMEL_SERVICE_URL_NEED_*) make sure to do ((flags &amp;</div><div class='del'>-	CAMEL_SERVICE_URL_NEED_*) == CAMEL_SERVICE_URL_NEED_*)</div><div class='del'>-	(check_url): same.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Only send</div><div class='del'>-	the LOGOUT command if the store is connected.</div><div class='del'>-	(imap_connect): Set the 'connected' state to TRUE when we</div><div class='del'>-	successfully connect.</div><div class='del'>-	(get_folder_info): if (!topfi), 'topfi' was allocated but then</div><div class='del'>-	'fi' was set. I think Dan meant to set topfi since fi is an</div><div class='del'>-	uninitialized value at this point.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_response): Check</div><div class='del'>-	for the untagged BYE response and set the 'connected' state to</div><div class='del'>-	FALSE if we receive the BYE response. Return NULL if we get a BYE</div><div class='del'>-	response.</div><div class='del'>-</div><div class='del'>-2000-10-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Deal with</div><div class='del'>-	the possibility of not getting a LIST response back for the top</div><div class='del'>-	level.</div><div class='del'>-</div><div class='del'>-2000-10-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Simple subclass of</div><div class='del'>-	CamelFolderSummary that also keeps a UIDVALIDITY value (and</div><div class='del'>-	doesn't, for the moment, build content info).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	(various): Use a CamelImapSummary to store/fetch summary info.</div><div class='del'>-	(camel_imap_folder_new): Take a path to a file to use for the</div><div class='del'>-	summary. Set the folder's permanent_flags correctly according to</div><div class='del'>-	the server response. Read in the summary (checking the</div><div class='del'>-	UIDVALIDITY) and update it if it's out of date.</div><div class='del'>-	(imap_refresh_info): Just fetch UIDs and flags. If the UIDs all</div><div class='del'>-	match, update the flags as needed and be done with it. Otherwise,</div><div class='del'>-	delete messages that have been expunged from the server and fetch</div><div class='del'>-	full summary info for any new messages.</div><div class='del'>-	(imap_sync): Save the summary to disk.</div><div class='del'>-	(imap_update_summary): Renamed from imap_get_summary_internal. Can</div><div class='del'>-	now be told to get summary for only a subset of messages. Use</div><div class='del'>-	camel-mime-utils functions rather than rolling our own header</div><div class='del'>-	parsing.</div><div class='del'>-	(imap_get_message_info_internal): Merged into imap_update_summary.</div><div class='del'>-	(imap_set_message_flags): Don't marked the message FOLDER_FLAGGED</div><div class='del'>-	if we're not actually changing the value of any of the flags.</div><div class='del'>-	(camel_imap_folder_changed): Deal with EXISTS rather than RECENT.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Call</div><div class='del'>-	camel_session_get_storage_path and save the value.</div><div class='del'>-	(get_folder): Create a local directory to store summary</div><div class='del'>-	information and pass a summary file name to camel_imap_folder_new.</div><div class='del'>-	Don't call camel_folder_refresh_info from here any more since</div><div class='del'>-	camel_imap_folder_new does it again.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Add a</div><div class='del'>-	special case to this to make it possible to get the repsonses from</div><div class='del'>-	a SELECT and still have store-&gt;current_folder be updated</div><div class='del'>-	correctly.</div><div class='del'>-	(imap_read_response): parse EXISTS rather than RECENT</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_storage_path): Use</div><div class='del'>-	e_mkdir_hier.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_remove_index): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): fix this.</div><div class='del'>-	(camel-mime-parser.c doesn't use this code because of the MEMPOOL</div><div class='del'>-	optimization, so nothing was ever actually calling it before.)</div><div class='del'>-</div><div class='del'>-2000-10-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h (struct _CamelMimePart): Removed</div><div class='del'>-	temp_message_buffer, and content_input_stream fields which seem to</div><div class='del'>-	have come from nowhere, and are unused.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added a note about touching this file.</div><div class='del'>-	Nobody is to touch it without asking me first.  That goes for you</div><div class='del'>-	too Jeff.</div><div class='del'>-	(header_decode_text): In what way is this broken?</div><div class='del'>-</div><div class='del'>-2000-10-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Fix camel_summary_* function rename</div><div class='del'>-	(imap_get_message_info_internal): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_summary_format_address): Uh, why</div><div class='del'>-	do we encode and then decode here ... sigh.  This is not the way</div><div class='del'>-	to fix this.</div><div class='del'>-	(camel_folder_summary_format_address): Renamed to a proper name,</div><div class='del'>-	this was only supposed to be a private function.</div><div class='del'>-	(camel_folder_summary_format_string): Likewise.  Oh i see why it</div><div class='del'>-	was made public, code reuse by cut &amp; paste.  Joy.</div><div class='del'>-</div><div class='del'>-2000-10-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.</div><div class='del'>-	(nntp_store_subscribe_folder): same.</div><div class='del'>-	(nntp_store_folder_subscribed): same.</div><div class='del'>-</div><div class='del'>-2000-10-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_move_message_to): Quote</div><div class='del'>-	the mailbox name as it may contain spaces.</div><div class='del'>-	(imap_copy_message_to): Same.</div><div class='del'>-</div><div class='del'>-2000-10-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(build_folder_info_from_grouplist): fill in message_count and</div><div class='del'>-	unread_message_count properly.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.h: reformat.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c</div><div class='del'>-	(camel_nntp_get_grouplist_from_file): remove spew.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_group_get_num_articles_read): new function.</div><div class='del'>-	(camel_nntp_newsrc_group_get_highest_article_read): robustification.</div><div class='del'>-</div><div class='del'>-2000-10-10  Joe Shaw  &lt;joe@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c </div><div class='del'>-	(parse_list_response_as_folder_info): Check before dereferencing the</div><div class='del'>-	sep pointer.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jacob "Ulysses" Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-*.c: teach camel about "its" vs. "it's"</div><div class='del'>-</div><div class='del'>-2000-10-09  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (finalize): write out the</div><div class='del'>-	newsrc.</div><div class='del'>-	(nntp_store_get_name): if @brief, just return host.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c: robustification and bug</div><div class='del'>-	fixes.</div><div class='del'>-</div><div class='del'>-2000-10-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_summary_format_address): Decode</div><div class='del'>-	the resulting string.</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-types.h: new file.</div><div class='del'>-</div><div class='del'>-2000-10-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode): Fix so that we don't encode</div><div class='del'>-	every single char in the word. Also, do we need a safemask? I</div><div class='del'>-	don't see why we would.</div><div class='del'>-	(header_encode_string): Don't strip off the last char!!</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add</div><div class='del'>-	camel-nntp-grouplist.h</div><div class='del'>-	(libcamelnntp_la_SOURCES): add camel-nntp-grouplist.c</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: add our own hash functions</div><div class='del'>-	for nntp urls.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_group_is_subscribed): new function.</div><div class='del'>-	(camel_nntp_newsrc_subscribe_group): new function.</div><div class='del'>-	(camel_nntp_newsrc_unsubscribe_group): new function.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.h: add prototypes for</div><div class='del'>-	_group_is_subscribed, _subscribe_group, and _unsubscribe_group.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(build_folder_info_from_grouplist): new function.</div><div class='del'>-	(nntp_store_get_folder_info): add subscribed_only_parameter.  if</div><div class='del'>-	it's FALSE, load the grouplist and call</div><div class='del'>-	build_folder_info_from_grouplist.</div><div class='del'>-	(nntp_store_folder_subscribed): implement.</div><div class='del'>-	(nntp_store_subscribe_folder): implement.</div><div class='del'>-	(nntp_store_unsubscribe_folder): implement.</div><div class='del'>-	(camel_nntp_store_init): add CAMEL_STORE_SUBSCRIPTIONS to the</div><div class='del'>-	store's flags.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_supports_subscriptions): new function.</div><div class='del'>-	(camel_store_folder_subscribed): new function.</div><div class='del'>-	(camel_store_subscribe_folder): new function.</div><div class='del'>-	(camel_store_unsubscribe_folder): new function.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: add prototypes and virtual functions for the</div><div class='del'>-	subscribe implementation.  also, add a subscribed_only argument to</div><div class='del'>-	camel_store_get_folder_info.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): Encode</div><div class='del'>-	the name part of the address and don't quote the name.</div><div class='del'>-	(header_decode_text): Rewrote from scratch, the old code was badly</div><div class='del'>-	broken.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use the</div><div class='del'>-	camel_address_encode function again.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Modified to not encode</div><div class='del'>-	space chars in the middle of a line.</div><div class='del'>-	(isblank): New macro if we're not on a system with the GNU isblank</div><div class='del'>-	extension.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_from): Reversed my</div><div class='del'>-	changes, don't header_encode_phrase - it generates broken headers.</div><div class='del'>-	(camel_mime_message_set_reply_to): Same.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):</div><div class='del'>-	revert to old method (only use XOVER if OVER is supported.)</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): handle the case where the</div><div class='del'>-	OVER extension isn't listed but LIST OVERVIEW.FMT works (again,</div><div class='del'>-	INN 2.2).  enable the OVER extension in this case.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): return a</div><div class='del'>-	gboolean so we can tell if this command worked.  we can't key off</div><div class='del'>-	the OVER extension being present because at least one server (INN</div><div class='del'>-	2.2) doesn't report the OVER extension but implements the XOVER</div><div class='del'>-	command.  This could of course just be because I'm a loser for</div><div class='del'>-	thinking they were related in the first place.</div><div class='del'>-	(camel_nntp_get_headers): always try XOVER first, and if it fails</div><div class='del'>-	revert to the slow method.</div><div class='del'>-</div><div class='del'>-2000-10-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a case where</div><div class='del'>-	a variable was free'd and then possibly used in an error message.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c</div><div class='del'>-	(camel_provider_module_init): news: -&gt; nntp:.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):</div><div class='del'>-	use "nntp:" instead of "news:" since "news:" urls aren't supposed</div><div class='del'>-	to have host/user/port info in them.  also, if there's a user</div><div class='del'>-	defined in the url, put it in the urls for our folders.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate):</div><div class='del'>-	borrow some code from the imap provider to query the user for</div><div class='del'>-	their password, and pass the user/passwd to nntp.  be extra</div><div class='del'>-	paranoid and zero out the password before freeing it.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_init): add</div><div class='del'>-	ALLOW_USER/ALLOW_PASSWORD/ALLOW_AUTH to the url flags.</div><div class='del'>-	(nntp_store_query_auth_types_generic): return our list of</div><div class='del'>-	auth_types.</div><div class='del'>-	(nntp_store_query_auth_types_connected): broken, return same as in</div><div class='del'>-	query_auth_types_generic.</div><div class='del'>-</div><div class='del'>-2000-10-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): IMAP4</div><div class='del'>-	(pre-rev1) doesn't support the 'LIST "" ""' idiom, so don't use</div><div class='del'>-	it. Just assume the dir_sep is '/'. Shrug.</div><div class='del'>-</div><div class='del'>-2000-10-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use</div><div class='del'>-	header_encode_phrase instead.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Handle the case</div><div class='del'>-	where ct != NULL, but type and subtype are, and also match that</div><div class='del'>-	against text/plain.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Bump summary file version.</div><div class='del'>-	(message_info_save): Save the size from the messageinfo.</div><div class='del'>-	(message_info_load): Load the size from the summary file.</div><div class='del'>-	(message_info_load): Fixed up the time_t saving/loading.  There</div><div class='del'>-	was a reason the warning was left there ... obviously nobody could</div><div class='del'>-	read the comment "/* warnings, leave them here */", why do i even</div><div class='del'>-	bother.</div><div class='del'>-	(camel_folder_summary_decode_time_t): Decode a time_t value from</div><div class='del'>-	the summary file.</div><div class='del'>-	(camel_folder_summary_encode_time_t): Encode a time_t value to the</div><div class='del'>-	summary file.</div><div class='del'>-</div><div class='del'>-2000-10-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Quote</div><div class='del'>-	the mailbox name when sending a SELECT request otherwise mailboxes</div><div class='del'>-	with spaces in their names will cause problems.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): encode</div><div class='del'>-	before setting.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c: New file containing</div><div class='del'>-	camel_imap_command and friends. Major camel_imap_command rewrite</div><div class='del'>-	to remove duplicated code, make the parsing of literals be</div><div class='del'>-	more safe/correct, deal with RECENT/EXPUNGE responses more</div><div class='del'>-	consistently, and make it possible to implement the AUTHENTICATE</div><div class='del'>-	command.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): New</div><div class='del'>-	function, to parse an IMAP "nstring".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Move command stuff to</div><div class='del'>-	camel-imap-command.c. Update for camel_imap_command changes.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Update for</div><div class='del'>-	camel_imap_command changes.</div><div class='del'>-	(imap_append_message): CRLF filter the message before sending it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Add camel-imap-command.[ch], remove</div><div class='del'>-	camel-imap-stream.[ch] for now.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_has_8bit_parts): New</div><div class='del'>-	convenience function to determine if there are any 8bit mime parts</div><div class='del'>-	in a mime message.</div><div class='del'>-	(camel_mime_message_encode_8bit_parts): New convenience function</div><div class='del'>-	to recursively reencode all 8bit mime parts to either</div><div class='del'>-	quoted-printable or base64 depending on which would be the best</div><div class='del'>-	encoding for that part.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the mime</div><div class='del'>-	message contains 8bit parts and the server doesn't support 8bit</div><div class='del'>-	transfers, reencode those parts before proceding with the send.</div><div class='del'>-	(smtp_mail): If the mime message contains 8bit parts and the</div><div class='del'>-	server supports the 8BITMIME extension to SMTP, notify the server</div><div class='del'>-	that we'll be sending it 8bit mime parts.</div><div class='del'>-	(_send_to): Find out if the message contains 8bit parts.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Use the</div><div class='del'>-	CamelInternetAddress parser.</div><div class='del'>-	(smtp_get_email_addr_from_text): deprecated.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Remove default_ports.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Get default_port from</div><div class='del'>-	CamelRemoteStore rather than CamelProvider.</div><div class='del'>-</div><div class='del'>-	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize</div><div class='del'>-	CamelRemoteStore::default_port</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Remove default_ports.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove</div><div class='del'>-	camel_folder_{get,free}_subfolder_info, as we want to be able to</div><div class='del'>-	scan the whole subfolder tree without having to open any folders,</div><div class='del'>-	so this needs to be in CamelStore. Remove can_hold_folders and</div><div class='del'>-	can_hold_messages flags; things that don't hold messages are no</div><div class='del'>-	longer considered CamelFolders.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: Remove CamelFolderInfo stuff.</div><div class='del'>-</div><div class='del'>-	* camel-store.[ch]: Add camel_store_{get,free}_folder_info, as</div><div class='del'>-	well as camel_store_free_folder_info_full and ..._nop for default</div><div class='del'>-	implementations, and camel_folder_info_free and</div><div class='del'>-	camel_folder_info_build as convenience functions. Turn</div><div class='del'>-	CamelFolderInfo into a tree structure and also add an "url"</div><div class='del'>-	member.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Remove subfolder_info and can_hold</div><div class='del'>-	stuff.</div><div class='del'>-	* providers/*/camel-*-store.c: Add folder_info stuff.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_free): Free the</div><div class='del'>-	summary elements with camel_message_info_free, not</div><div class='del'>-	camel_folder_info_free. Oops.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: const poison</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Fixed some memory leaks.</div><div class='del'>-	(camel_smtp_transport_init): Initialize supports_8bit to FALSE.</div><div class='del'>-	(smtp_helo): If server supports 8bit, set supports_8bit to TRUE.</div><div class='del'>-</div><div class='del'>-	* camel-transport.h (struct _CamelTransport): Added variable</div><div class='del'>-	gboolean supports_8bit (we'll need this eventually? - see bugzilla</div><div class='del'>-	bug #53)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(smtp_get_email_addr_from_text): Ugh, no wonder people were</div><div class='del'>-	getting illegal seek warnings *sigh*. I guess I can only blame</div><div class='del'>-	myself for this one though :-(</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Don't send the</div><div class='del'>-	recipient data through smtp_get_email_addr_from_text - this is a</div><div class='del'>-	complete waste. In fact, we don't want to have to use that</div><div class='del'>-	function ever.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c, camel-address.c: Added some gtk-doc</div><div class='del'>-	comments.</div><div class='del'>-	</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-mime-utils.c (header_encode_string): Make sure to add the</div><div class='del'>-	space char after an encoded word when the encoding is iso-8859-1.</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): When</div><div class='del'>-	getting a literal string response, don't include the \r\n after</div><div class='del'>-	the closing } (as in: "... {798}\r\n...")</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Same.</div><div class='del'>-</div><div class='del'>-2000-09-28  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): New function to fold headers.</div><div class='del'>-</div><div class='del'>-2000-09-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): If we had an empty</div><div class='del'>-	header, then it must be end of the headers too.</div><div class='del'>-	(folder_scan_init): No we dont need to init the outbuf with a nul</div><div class='del'>-	terminator.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_uid): New</div><div class='del'>-	function to reset the uid to a higher value.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	"something failed (yo!)" what sort of crap is this?  Fixed all the</div><div class='del'>-	indenting again, what wanker keeps running stuff through indent?</div><div class='del'>-	(message_info_new): Check the uid we loaded off the disk, if it</div><div class='del'>-	existed already, assign a new one.  If it didn't then make sure</div><div class='del'>-	the nextuid is higher.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: New file, used to build a large unicode</div><div class='del'>-	decoding mapping table, and use it to determine what is the</div><div class='del'>-	lowest charset a given word can be encoded with.  Uses tables from</div><div class='del'>-	libunicode's source.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Use</div><div class='del'>-	header_phrase_encode to properly encode the fullname, as required.</div><div class='del'>-	refixed indenting.  Who keeps doing that?</div><div class='del'>-	(camel_internet_address_find_address): Changed fatal return/warnings</div><div class='del'>-	into assertions.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): Check : explicitly</div><div class='del'>-	(removed from is_fieldname() macro).</div><div class='del'>-	(camel_mime_special_table): Changed to short, so we can represent</div><div class='del'>-	more bit types.</div><div class='del'>-	(quoted_encode): Take a mask of the safe chars for this encoding.</div><div class='del'>-	(header_address_decode): Removed a #warning that makes no sense</div><div class='del'>-	anymore.</div><div class='del'>-	(header_decode_date): Fixed the 'broken date' parser code, if it</div><div class='del'>-	ever decoded it it just threw away the result.</div><div class='del'>-	(header_encode_string): Use better charset matching for encoding</div><div class='del'>-	strings as well.</div><div class='del'>-</div><div class='del'>-2000-08-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Save</div><div class='del'>-	the index if we do a sync.</div><div class='del'>-	(camel_mh_summary_check): Save the index here too.  Probably.</div><div class='del'>-</div><div class='del'>-2000-09-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Return untagged data in a GPtrArray rather than a string, since it</div><div class='del'>-	saves processing time and is much easier to deal with for several</div><div class='del'>-	commands. Update for camel_imap_folder_changed change.</div><div class='del'>-	(camel_imap_fetch_command): Update for camel_imap_folder_changed</div><div class='del'>-	change.</div><div class='del'>-	(imap_connect, imap_folder_exists): Update for</div><div class='del'>-	camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal,</div><div class='del'>-	imap_get_subfolder_info_internal, imap_search_by_expression):</div><div class='del'>-	Update for camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	(imap_get_summary_internal, imap_get_message_info_internal): Use</div><div class='del'>-	camel_imap_fetch_command here now to get around the</div><div class='del'>-	camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	(camel_imap_folder_changed): turn expunged into a GArray of ints</div><div class='del'>-	rather than a GPtrArray of strings representing ints.</div><div class='del'>-</div><div class='del'>-2000-09-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Quote the folder name as it may</div><div class='del'>-	contain spaces.</div><div class='del'>-	(imap_get_subfolder_info_internal): Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): Do</div><div class='del'>-	proper unquoting for folder names.</div><div class='del'>-	(func_get_current_date): Implemented.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(imap_folder_exists): Quote the folder name as it may have spaces.</div><div class='del'>-	(imap_create): Same.</div><div class='del'>-	(check_current_folder): Same.</div><div class='del'>-</div><div class='del'>-2000-09-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_info_internal): The root folder's name is "",</div><div class='del'>-	not the namespace.</div><div class='del'>-	(camel_imap_folder_new): constify folder_name.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Create the</div><div class='del'>-	folder with folder_name, not folder_path.</div><div class='del'>-	(camel_imap_command_preliminary): Don't free cmdid here.</div><div class='del'>-</div><div class='del'>-2000-09-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_create_flag_list): New</div><div class='del'>-	function to convert Camel flags to an IMAP flag_list.</div><div class='del'>-	(imap_parse_flag_list): Contrariwise.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_*): Make</div><div class='del'>-	the @ret arg actually optional, as (mostly) documented.</div><div class='del'>-	(various): Don't pass "&amp;result" to camel_imap_command_* if we're</div><div class='del'>-	just going to immediately free it. Don't record status if we're</div><div class='del'>-	not going to look at it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Likewise.</div><div class='del'>-	(imap_summary_free): Use camel_folder_info_free.</div><div class='del'>-	(imap_sync): Use imap_create_flag_list. Clear</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_FLAGGED after syncing so we don't keep</div><div class='del'>-	re-syncing.</div><div class='del'>-	(imap_append_message): Use imap_create_flag_list. Don't leak the</div><div class='del'>-	memstream if the append fails.</div><div class='del'>-	(imap_move_message_to): Use camel_folder_delete_message rather</div><div class='del'>-	than doing it by hand.</div><div class='del'>-	(imap_get_summary_internal, imap_get_message_info_internal): Use</div><div class='del'>-	imap_parse_flag_list and header_raw_clear.</div><div class='del'>-	(camel_imap_folder_changed): Use camel_message_info_free.</div><div class='del'>-</div><div class='del'>-2000-09-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_name): INBOX is</div><div class='del'>-	case-insensitive.</div><div class='del'>-	(get_root_folder_name): Make the root folder "" rather than "/".</div><div class='del'>-	(get_folder): Update for root folder name change.</div><div class='del'>-	(camel_imap_store_get_toplevel_dir): Removed. (Unused, unneeded.)</div><div class='del'>-	(camel_imap_store_folder_path): New function to turn a Camel</div><div class='del'>-	folder name into the corresponding namespaced IMAP path.</div><div class='del'>-	(imap_folder_exists): Make this take a store and a path rather</div><div class='del'>-	than a folder.</div><div class='del'>-	(imap_create): Likewise</div><div class='del'>-	(get_folder): Update for camel_imap_store_folder_path and other</div><div class='del'>-	changes.</div><div class='del'>-	(check_current_folder): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Change a bunch of CamelStore</div><div class='del'>-	variables to CamelImapStore (and add a few more) to prevent excess</div><div class='del'>-	gratuitous casting. Use camel_imap_store_folder_path where</div><div class='del'>-	appropriate.</div><div class='del'>-	(camel_imap_folder_new): Update for root folder name change.</div><div class='del'>-</div><div class='del'>-2000-09-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the</div><div class='del'>-	linewrap filter to achieve full RFC0821 compliance.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-linewrap.[c,h]: New mime-filter to word-wrap.</div><div class='del'>-</div><div class='del'>-2000-09-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): When encoding the</div><div class='del'>-	internet address, quote the name as the name may have commas or</div><div class='del'>-	any other token which may later confuse our address parser.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_info_internal): Fix the case where INBOX</div><div class='del'>-	isn't returned in the folder listing.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: (init): Removed</div><div class='del'>-	(camel_folder_init, camel_folder_construct): New object init</div><div class='del'>-	function and public object constructor to replace the old init</div><div class='del'>-	method in a more Gtk-like fashion.</div><div class='del'>-</div><div class='del'>-	(get_parent_folder, camel_folder_get_parent_folder): Removed. No</div><div class='del'>-	CamelFolder subclass was ever setting the parent_folder member, no</div><div class='del'>-	code has ever needed to look at it, and fixing it would actually</div><div class='del'>-	be pretty hard.</div><div class='del'>-</div><div class='del'>-	(get_subfolder_info, camel_folder_get_subfolder_info): Renamed</div><div class='del'>-	from ..._names. Deals in CamelFolderInfo now.</div><div class='del'>-	(free_subfolder_info, camel_folder_free_subfolder_info): Likewise.</div><div class='del'>-</div><div class='del'>-	(get_subfolder, camel_folder_get_subfolder): Removed.</div><div class='del'>-	CamelFolderInfo contains the subfolder's full name, so this is</div><div class='del'>-	unnecessary now, and removing it lets us get rid of the</div><div class='del'>-	CamelFolder separator member, which is needed for the default</div><div class='del'>-	implementation of this function, but not otherwise needed for most</div><div class='del'>-	providers.</div><div class='del'>-</div><div class='del'>-	Also, lots of code style fixes.</div><div class='del'>-</div><div class='del'>-	* providers/*: Update CamelFolder subclasses for changes, although</div><div class='del'>-	none of them fill in the message counts in the CamelFolderInfo</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, camel-folder-search.h,</div><div class='del'>-	camel-remote-store.c, providers/imap/camel-imap-folder.c,</div><div class='del'>-	providers/imap/camel-imap-store.c: Fixed the #include lines to</div><div class='del'>-	deal properly with gal.</div><div class='del'>-</div><div class='del'>-2000-09-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: update CamelFolderInfo</div><div class='del'>-	* camel-folder-summary.c (camel_folder_info_free): New function to</div><div class='del'>-	free the contents of a CamelFolderInfo</div><div class='del'>-</div><div class='del'>-2000-09-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Set camel_verbose_debug to TRUE if</div><div class='del'>-	CAMEL_VERBOSE_DEBUG is set in the environment.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_line, remote_recv_line): only</div><div class='del'>-	log if camel_verbose_debug is TRUE.</div><div class='del'>-</div><div class='del'>-2000-09-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Don't use</div><div class='del'>-	dir_sep as top-level directory, use "/".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of</div><div class='del'>-	unused variable.</div><div class='del'>-</div><div class='del'>-2000-09-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Don't look at</div><div class='del'>-	the response of the command. camel_imap_command_extended()</div><div class='del'>-	processes EXPUNGE responses itself, so if we do it here too we</div><div class='del'>-	remove twice as many summary items as we should.</div><div class='del'>-</div><div class='del'>-2000-09-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): Rewrote</div><div class='del'>-	to take a third argument (gboolean *selectable) so that we can</div><div class='del'>-	find out if the folder is selectable or not as we look to see if</div><div class='del'>-	it exists. Also, don't use EXAMINE because that will not work on</div><div class='del'>-	non-selectable folders, so use LIST instead.</div><div class='del'>-	(get_folder): Check to see if the folder exists even vefore</div><div class='del'>-	calling imap_create as this will save time. If the folder does</div><div class='del'>-	exist, find out if it's selectable. Moved the call to refresh_info</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Check for a</div><div class='del'>-	NULL summary.</div><div class='del'>-	(camel_imap_folder_new): Don't call refresh_info here - call it in</div><div class='del'>-	get_folder() because we don't know if this folder even exists on</div><div class='del'>-	the server yet! And even if it does, we don't know if it can hold</div><div class='del'>-	messages or not yet.</div><div class='del'>-</div><div class='del'>-2000-09-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is</div><div class='del'>-	&gt; 0 before calling camel_mime_filter_filter otherwise we will get</div><div class='del'>-	a segfault if the filter calls iconv().</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c,</div><div class='del'>-	providers/nntp/camel-nntp-auth.h: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_storage_path): Make this not</div><div class='del'>-	leak.</div><div class='del'>-	</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_new): Make this take a path to a</div><div class='del'>-	directory that Camel can use for its own nefarious purposes.</div><div class='del'>-	(camel_session_get_storage_path): New function to return a path</div><div class='del'>-	that a service can use for its own nefarious sub-purposes.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_get_path): New method (and</div><div class='del'>-	useful default implementation) to get a (relative) pathname</div><div class='del'>-	corresponding to the service.</div><div class='del'>-</div><div class='del'>-2000-09-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): Make KPOP</div><div class='del'>-	work again.</div><div class='del'>-</div><div class='del'>-2000-09-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_get_received_date):</div><div class='del'>-	Implemented (someone added these to camel-mime-message.h but never</div><div class='del'>-	implemented them!!) - though it may not be right.</div><div class='del'>-	(camel_mime_message_get_sent_date): Same.</div><div class='del'>-</div><div class='del'>-2000-09-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_get_filename): If a MIME part</div><div class='del'>-	has no Content-Disposition, but does have a "name" on the</div><div class='del'>-	Content-Type, return that as the filename.</div><div class='del'>-	(process_header): strstrip the Content-Description</div><div class='del'>-</div><div class='del'>-2000-09-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): care about</div><div class='del'>-	response code.</div><div class='del'>-	(get_HEAD_headers): same.</div><div class='del'>-	(camel_nntp_get_headers): same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: get rid of</div><div class='del'>-	CAMEL_NNTP_OK/ERR/FAIL.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_extensions): take CamelException arg and</div><div class='del'>-	pass along to camel_nntp_command.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): same.</div><div class='del'>-	(nntp_store_connect): convert to using constants in</div><div class='del'>-	camel-nntp-resp-codes.h</div><div class='del'>-	(nntp_store_get_folder): make use of camel_nntp_folder_new.</div><div class='del'>-	(camel_nntp_command_send_recv): new function to deal with auth</div><div class='del'>-	challenge.</div><div class='del'>-	(camel_nntp_command): split out most of this function into</div><div class='del'>-	camel_nntp_command_send_recv.  also, return the actual response</div><div class='del'>-	code instead of CAMEL_NNTP_OK/ERR/FAIL.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-resp-codes.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.h: prototype for</div><div class='del'>-	camel_nntp_folder_new.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): new</div><div class='del'>-	convenience function.</div><div class='del'>-	(nntp_folder_get_message): care more about the actual response</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add</div><div class='del'>-	camel-nntp-auth.c.</div><div class='del'>-	(libcamelnntpinclude_HEADERS): add camel-nntp-auth.h.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c: new file.</div><div class='del'>-</div><div class='del'>-2000-09-05  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): Don't free the</div><div class='del'>-	result on error; the exception will have the relevant info.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Check for</div><div class='del'>-	exceptions here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Check the exception</div><div class='del'>-	on the refresh_folders call.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Clean up some now-unused fields.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Call unicode_init again, now that libunicode</div><div class='del'>-	will not initialize itself twice.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search (search_header_contains): Use e_utf8_strstrcase</div><div class='del'>-</div><div class='del'>-2000-09-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: Removed some unused</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-2000-09-01  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): Initialize</div><div class='del'>-	the statically-allocated CamelException so that it doesn't contain</div><div class='del'>-	junk data that camel_exception_set() may try to free.</div><div class='del'>-	(camel_nntp_store_get_extensions): Same.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): Same.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Typo</div><div class='del'>-	fix (if (*ret) -&gt; if (ret)).</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the</div><div class='del'>-	port # back to what was specified ASAP, so that the hash of</div><div class='del'>-	the URL doesn't change (which causes a failure in</div><div class='del'>-	service_cache_remove that leads to a segfault).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Clear the </div><div class='del'>-	exception after a failed LOGIN so that it doesn't pass through</div><div class='del'>-	to the upper level and make mail think that the login failed.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): As above.</div><div class='del'>-</div><div class='del'>-2000-08-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_get_type):</div><div class='del'>-	Implement POP3 with the CamelRemoteStore now.</div><div class='del'>-	(connect_to_server): Hack this a bit to get KPOP to work. Obey</div><div class='del'>-	the new connection semantics of the remote store (implicitly).</div><div class='del'>-	(query_auth_types_connected): Clear exceptions after attempts</div><div class='del'>-	to connect; the code at the bottom will catch hard errors.</div><div class='del'>-	Use camel_service_connect.</div><div class='del'>-	(camel_pop3_command): Take a CamelException; now, when an error</div><div class='del'>-	occurs, ret is set to NULL and the exception passes back the</div><div class='del'>-	appropriate information.</div><div class='del'>-	(pop3_get_response): Same as above.</div><div class='del'>-	(pop3_try_authenticate): Give camel_pop3_command its exception</div><div class='del'>-	and handle it properly.</div><div class='del'>-	(pop3_connect): Call the parent classfuncs. Don't disconnect</div><div class='del'>-	on error (done for us).</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Obey the camel_pop3_command</div><div class='del'>-	semantics.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_query_auth_types_connected): Don't</div><div class='del'>-	warn; just return NULL.</div><div class='del'>-	(remote_query_auth_types_generic): Same.</div><div class='del'>-	(remote_send_string): Filter out passwords in debugging output.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Also</div><div class='del'>-	set the ALLOW_AUTH flag.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Same.</div><div class='del'>-</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_class_init):</div><div class='del'>-	remove get_folder_name.</div><div class='del'>-	(nntp_store_get_folder_name): remove.</div><div class='del'>-</div><div class='del'>-2000-08-31  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to-stream): Use filter only if we have one</div><div class='del'>-	</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):</div><div class='del'>-	use camel_remote_store_recv_line to build message.  also, free our</div><div class='del'>-	buffer so we don't leak like mad.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c:</div><div class='del'>-	(camel_nntp_store_get_additional_data) remove.</div><div class='del'>-	(camel_nntp_store_get_extensions): use</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on</div><div class='del'>-	_get_additional_data anymore since it's easier to parse without.</div><div class='del'>-	(camel_nntp_command): use camel_remote_store_send_string and</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the</div><div class='del'>-	parent class now.  remove istream/ostream since CamelRemoteStore</div><div class='del'>-	takes care of that for us.  also remove the prototype for</div><div class='del'>-	camel_nntp_store_get_additional_data.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):</div><div class='del'>-	make sure to clear dirty bit.</div><div class='del'>-	(camel_nntp_newsrc_read_for_server): don't worry about continually</div><div class='del'>-	trying to open the file - if it fails we just return an</div><div class='del'>-	unpopulated .newsrc file.</div><div class='del'>-</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_read_for_server): make this a bit more robust.</div><div class='del'>-	try to create an empty .newsrc file for the server if we can't</div><div class='del'>-	open it for reading.  also, don't allocate everything until we've</div><div class='del'>-	opened the file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): make use</div><div class='del'>-	of our overview field indices.</div><div class='del'>-	(camel_nntp_get_headers): only call get_OVER_headers if the</div><div class='del'>-	extension is present.  warn if it's not - since get_HEAD_headers</div><div class='del'>-	needs work before it works.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_extensions): new function - query the server</div><div class='del'>-	for it's extensions.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): new function - query the</div><div class='del'>-	server for the overview format and build our table of the indices</div><div class='del'>-	we care about.  support the "full" suffix on fields.</div><div class='del'>-	(nntp_store_connect): call camel_nntp_store_get_extensions and</div><div class='del'>-	camel_nntp_store_get_overview_fmt.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: add codes for extensions</div><div class='del'>-	found on news.mozilla.org.  only one that we care about is OVER.</div><div class='del'>-	also, add CamelNNTPOverField and an enum of the overview fields</div><div class='del'>-	that we care about.</div><div class='del'>-</div><div class='del'>-2000-08-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp):</div><div class='del'>-	Reimplemented. It should now work correctly for most possible</div><div class='del'>-	VFolder rules.</div><div class='del'>-</div><div class='del'>-2000-08-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Don't save any exceptions caused by camel_imap_folder_changed</div><div class='del'>-	(camel_imap_fetch_command): Same.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Using a new way of calculating the first recent message that seems</div><div class='del'>-	more accurate. Also added code to make sure we don't accidently</div><div class='del'>-	add a duplicate summary.</div><div class='del'>-</div><div class='del'>-2000-08-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Use the proper type</div><div class='del'>-	checking function to check for text types.</div><div class='del'>-	(write_to_stream): If we have a charset on a text type that</div><div class='del'>-	isn't us-ascii or utf-8, then we need to reencode it, so add a</div><div class='del'>-	filter to do that too.</div><div class='del'>-	(write_to_stream): Fix some warnings/use the right constructor,</div><div class='del'>-	oops.</div><div class='del'>-	(write_to_stream): Rearrange the logic so it always does charset</div><div class='del'>-	conversion, and not just if we have a qp/base64 block.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (append_latin1): New function - even though</div><div class='del'>-	its broken, we'll assume mailers send latin1 headers instead of</div><div class='del'>-	us-ascii.  We just have to encode high chars into utf-8.</div><div class='del'>-	(header_decode_text): Call append_latin1 for appending unencoded</div><div class='del'>-	text segments.</div><div class='del'>-	(append_latin1): Do an additional mask for account for c's</div><div class='del'>-	undefined behaviour for sign extension whilst shifting right.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_fetch_command):</div><div class='del'>-	Rewrote to ignore strings that look like server responses until it</div><div class='del'>-	is sure that it has finished reading the literal string response.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-remote-store.c (remote_send_string): Don't wrap printed</div><div class='del'>-	strings in quotes, makes things messy</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Updated</div><div class='del'>-	to use the camel_imap_fetch_command</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to use</div><div class='del'>-	camel_imap_fetch_command</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	No longer handles FETCH requests so no longer needs to be</div><div class='del'>-	concerned with checking to make sure that server responses are</div><div class='del'>-	valid (they have to be).</div><div class='del'>-	(camel_imap_fetch_command): New convenience function that handles</div><div class='del'>-	all FETCH requests</div><div class='del'>-</div><div class='del'>-2000-08-30  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Unify with remote_post_connect.</div><div class='del'>-	(remote_disconnect): Unify with remote_pre_disconnect.</div><div class='del'>-	(camel_remote_store_class_init): Don't use the post_connect and</div><div class='del'>-	pre_disconnect classfuncs anymore ; they weren't especially useful.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Use this again</div><div class='del'>-	instead of implementing post_connect.</div><div class='del'>-	(imap_disconnect): Analogous to above.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service_connected): New function.</div><div class='del'>-	Like camel_session_get_service() but also connects to the service</div><div class='del'>-	if needed. camel_session_get_{store,transport} (defined in the header)</div><div class='del'>-	used this now, preventing annoying when-to-connect problems.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Revert to the old behavior</div><div class='del'>-	of not connecting until told to do so. Otherwise doing auth</div><div class='del'>-	testing correctly is really hard.</div><div class='del'>-	(camel_service_connect): Fix behavior here (set the connected</div><div class='del'>-	flag).</div><div class='del'>-	(camel_service_disconnect): Unset the connected flag.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: General cleanup / moving</div><div class='del'>-	stuff around to make things easier to follow.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-remote-store.c: Prevent exceptions from being overwritten</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Beautified</div><div class='del'>-	(imap_get_subfolder_names_internal): Removed old code as the</div><div class='del'>-	replacement code has now been tested and proven to work</div><div class='del'>-</div><div class='del'>-2000-08-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: Removed old code that will</div><div class='del'>-	never be needed again</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Removed old code for</div><div class='del'>-	try_connect - will never need this code</div><div class='del'>-	(slurp_response): Update to make sure we aren't falsely detecting</div><div class='del'>-	EXPUNGE flags</div><div class='del'>-</div><div class='del'>-2000-08-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_connect): Uncomment this.</div><div class='del'>-	(camel_service_disconnect): Same.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.[ch]: New files. Abstract remote storages</div><div class='del'>-	(IMAP, POP3, NNTP) and hides the lower-level networky stuff.</div><div class='del'>-	</div><div class='del'>-	* camel-service.c (camel_service_new): Take an extra argument, the</div><div class='del'>-	provider that created us, cause it's useful.</div><div class='del'>-	(camel_service_finalize): Unref our new provider member.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service): Pass the proper number of</div><div class='del'>-	arguments to camel_service_new().</div><div class='del'>-</div><div class='del'>-	* camel-imap-store.c: Massive update: 1) use the CamelRemoteService to</div><div class='del'>-	make our life Very Easy (TM). 2) Change the semantics of all </div><div class='del'>-	camel_imap_command* functions to take exceptions, centralize tons of</div><div class='del'>-	duplicate code, and use the handy RemoteStore utility functions</div><div class='del'>-</div><div class='del'>-	* camel-imap-folder.c: Use the new semantics of camel_imap_command*</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.c: Same.</div><div class='del'>-	</div><div class='del'>-2000-08-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Updated to check for EXPUNGE notifications</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Updated to account for messages which have been expunged (now</div><div class='del'>-	takes a new arg, a GPtrArray of message id's that have been</div><div class='del'>-	expunged)</div><div class='del'>-	(imap_expunge): Updated (we may want to just use the code in</div><div class='del'>-	folder_changed now instead of doing our own summary</div><div class='del'>-	expunging...but that can be fixed later)</div><div class='del'>-	(imap_append_message): Updated.</div><div class='del'>-	(imap_copy_message_to): Updated.</div><div class='del'>-	(imap_move_message_to): Updated.</div><div class='del'>-</div><div class='del'>-2000-08-28  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_refresh_info): New member function,</div><div class='del'>-	refresh_info, used for rereading folder state after its state has</div><div class='del'>-	somehow become unknown. Tries to preserve last-known status of</div><div class='del'>-	messages.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_refresh_info): Implement</div><div class='del'>-	::refresh_info (split up ::init)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Call ::refresh_info.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Call</div><div class='del'>-	::refresh_info once initialized.</div><div class='del'>-	(imap_refresh_info): New member function; reads the summary from</div><div class='del'>-	the server (used to be in camel_imap_folder_new; split out).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Set</div><div class='del'>-	CamelService::connected a little early so that </div><div class='del'>-	camel_imap_command won't try to connect while already</div><div class='del'>-	connnecting.</div><div class='del'>-	(camel_imap_command*): Try to connect if not connected already.</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Same as above.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Same</div><div class='del'>-	as above.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set </div><div class='del'>-	CamelService::connected a little early so that</div><div class='del'>-	camel_pop3_command won't try to connect while already</div><div class='del'>-	connecting</div><div class='del'>-	(connect_to_server): Same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_refresh_info): Same</div><div class='del'>-	as above.</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed the</div><div class='del'>-	hack around quoted string responses - should now handle them</div><div class='del'>-	according to the specifications in the RFC</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to</div><div class='del'>-	match the code currently used in camel-imap-folder.c</div><div class='del'>-</div><div class='del'>-2000-08-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Never ever free `tmpname' as it comes from `alloca()'!</div><div class='del'>-</div><div class='del'>-2000-08-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): Use `g_free()', not</div><div class='del'>-	`free()', to free `decword'.</div><div class='del'>-</div><div class='del'>-2000-08-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Don't call unicode_init; code in e-util</div><div class='del'>-	will do it, and if unicode_init is called twice, you get an</div><div class='del'>-	infinite loop when looking up nonexistant encodings (patch</div><div class='del'>-	has been submitted to libunicode's maintainer).</div><div class='del'>-	</div><div class='del'>-	* camel-provider.h: Add a new field, default_ports, which</div><div class='del'>-	helps the configuration code guess about how to make CamelURL's</div><div class='del'>-	from providers.</div><div class='del'>-	</div><div class='del'>-	* providers/*/camel-*-provider.c: Specify default ports.</div><div class='del'>-</div><div class='del'>-2000-08-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): If the url path is "/" and</div><div class='del'>-	the folder path is "/", just LIST "" "*" (this should fix some</div><div class='del'>-	cyrus imapd problems). Also, INBOX is case insensitive so use</div><div class='del'>-	g_strcasecmp</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info):</div><div class='del'>-	Use UTF-8 as default</div><div class='del'>-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):</div><div class='del'>-	Use UTF-8 as default</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8</div><div class='del'>-	</div><div class='del'>-2000-08-17  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): Close index</div><div class='del'>-	on exit.</div><div class='del'>-</div><div class='del'>-2000-08-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): put</div><div class='del'>-	commas between addresses.</div><div class='del'>-</div><div class='del'>-2000-08-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_protocol_get_summary_specifier): use BODY.PEEK, not BODY, so</div><div class='del'>-	we don't set the message \Seen.</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Fixed a small warning.</div><div class='del'>-</div><div class='del'>-2000-08-22  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Connect automatically if the</div><div class='del'>-	URL is not empty.</div><div class='del'>-	(finalize): Disconnect automatically if connected.</div><div class='del'>-	(camel_service_query_auth_types): Split	into two functions; one to</div><div class='del'>-	be called if we're connected to an actual server (_connected), one</div><div class='del'>-	to be called if we're just gauging the general authtypes supported</div><div class='del'>-	(_generic).</div><div class='del'>-	(is_connected): Remove.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Don't connect explicitly to</div><div class='del'>-	the service.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (query_auth_types_generic): Split</div><div class='del'>-	the query_auth_types function. Hook it up in _new.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types_generic): Same.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types_generic): Same.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types_generic): Split</div><div class='del'>-	the query_auth_types (dummy, in this case) function. Hook it up in _new.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_subfolder_names):</div><div class='del'>-	Make sure newsrc is not null</div><div class='del'>-	(nntp_folder_get_subfolder_names): ditto</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c </div><div class='del'>-	(camel_nntp_newsrc_get_subscribed_group_names): Programming check</div><div class='del'>-	for newsrc == NULL</div><div class='del'>-	(camel_nntp_newsrc_get_all_group_names): ditto</div><div class='del'>-	(camel_nntp_newsrc_write_to_file): ditto</div><div class='del'>-	(camel_nntp_newsrc_write): ditto</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): </div><div class='del'>-	Make sure respbuffer is not null before manipulating it.</div><div class='del'>-	If it is null, return CAMEL_NNTP_FAIL and a decent error</div><div class='del'>-	message.</div><div class='del'>-	</div><div class='del'>-2000-08-18  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): If the name is "" we</div><div class='del'>-	weren't outputting anything; output the address at least.</div><div class='del'>-</div><div class='del'>-2000-08-16  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Fix a leak when</div><div class='del'>-	name = "". It's a single-byte leak, but it's the little things</div><div class='del'>-	that count.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): Don't leave the type</div><div class='del'>-	system locked when a bad unlock happens.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a leak.</div><div class='del'>-</div><div class='del'>-2000-08-15  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_copy_message_to): Typo fix.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_get_sent_date): New search function;</div><div class='del'>-	returns the time_t when the message was sent.</div><div class='del'>-	(search_get_receive_date): Same for when it was received.</div><div class='del'>-	(search_get_current_date): Gets the current time for use with the</div><div class='del'>-	above two. Is this in the right place?</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Add the new functions above to the class.</div><div class='del'>-</div><div class='del'>-2000-08-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): Add</div><div class='del'>-	camel-nntp-utils.h</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): do a strcasecmp rather than</div><div class='del'>-	just a strcmp when checking if a folder is "INBOX", since it is</div><div class='del'>-	a case-insensitive name.</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Don't assume the FETCH results will come back in the order they</div><div class='del'>-	were requested.</div><div class='del'>-	(imap_get_subfolder_names_internal): Add "INBOX" to the list as</div><div class='del'>-	g_malloc'ed memory, not a static string.</div><div class='del'>-</div><div class='del'>-2000-08-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_continuation): Now takes a char * parameter</div><div class='del'>-	rather than a stream</div><div class='del'>-	(camel_imap_command_continuation_with_stream): Same function as</div><div class='del'>-	above but takes a stream parameter instead</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Use</div><div class='del'>-	camel_imap_command_continuation_with_stream</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): New</div><div class='del'>-	function to do one round of attempted authentication.</div><div class='del'>-	(pop3_connect): Move a bunch of code out into</div><div class='del'>-	pop3_try_authenticate and fix some bugs in the edge cases.</div><div class='del'>-</div><div class='del'>-2000-08-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): No longer</div><div class='del'>-	calls try_connect() to get authtypes</div><div class='del'>-</div><div class='del'>-2000-08-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_continuation): Changed param order a bit and</div><div class='del'>-	fixed some logic</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Use</div><div class='del'>-	the new multi-transactional convenience functions</div><div class='del'>-</div><div class='del'>-2000-08-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_preliminary): New convenience function for</div><div class='del'>-	multi-transactional commands (opening request)</div><div class='del'>-	(camel_imap_command_continuation): New convenience function for</div><div class='del'>-	multi-transactional commands (followup data)</div><div class='del'>-</div><div class='del'>-2000-08-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(camel_nntp_folder_class_init): remove get_name and get_full_name</div><div class='del'>-	assignments, since the camel-folder.c implementation does what we</div><div class='del'>-	need.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_toplevel_dir): use g_get_home_dir, since</div><div class='del'>-	evolution_dir isn't available in the providers.</div><div class='del'>-</div><div class='del'>-2000-08-11  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (thaw): Fix a bug where the message_changed</div><div class='del'>-	signal wasn't being emitted.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):</div><div class='del'>-	Implement.</div><div class='del'>-	(mh_get_message_user_tag): Implement.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_user_tag):</div><div class='del'>-	(mbox_set_message_user_tag): Implement.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (move_message_to): Yay so lets fix an already</div><div class='del'>-	fixed fix, again.</div><div class='del'>-	(copy_message_to): and here too ... update for api change to append().</div><div class='del'>-	And removed another warning.</div><div class='del'>-	(camel_folder_set_message_user_tag): Routine to set message tags.</div><div class='del'>-	(camel_folder_get_message_user_tag): And accessor.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, camel-folder-summary.c, camel-medium.c,</div><div class='del'>-	camel-mime-filter-charset.c, camel-mime-filter.c,</div><div class='del'>-	camel-mime-filter.h, camel-mime-message.c, camel-mime-parser.c,</div><div class='del'>-	camel-mime-part-utils.c, camel-mime-part.c, camel-mime-utils.c,</div><div class='del'>-	camel-movemail.c, camel-multipart.c, camel-object.c,</div><div class='del'>-	camel-stream-mem.c, providers/mbox/camel-mbox-folder.c,</div><div class='del'>-	providers/mbox/camel-mbox-summary.c,</div><div class='del'>-	providers/mh/camel-mh-folder.c,</div><div class='del'>-	providers/smtp/camel-smtp-transport.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Free</div><div class='del'>-	the search properly.</div><div class='del'>-	(vee_folder_build): And here too.</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	If we go over the max number of messages, don't keep requesting</div><div class='del'>-	new message summaries, just break.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): A better way to</div><div class='del'>-	compress leading whitespace.  The code is probably invalid anyway,</div><div class='del'>-	I dont think it will work across buffer boundaries.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): And</div><div class='del'>-	write out proper format From lines here too.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): New function to build a more</div><div class='del'>-	compatible mbox "From " line.</div><div class='del'>-	(camel_mbox_summary_sync): Write From lines in the proper format.</div><div class='del'>-</div><div class='del'>-2000-08-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder): Remove warnin g.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (xrename): Kill some warnings</div><div class='del'>-	with constification.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Fixed</div><div class='del'>-	for append api change.  Eek this routine seriously wastes memory.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_search_free): Impelemnt.</div><div class='del'>-	(mh_append_message): Fix for api change, and include user flags</div><div class='del'>-	and tags in new message.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Fix</div><div class='del'>-	for search api change.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_free): New function for</div><div class='del'>-	freeing search results.</div><div class='del'>-	(search_free): Changed my mind, implement a default that actually</div><div class='del'>-	does something.  Free as to the old interface.</div><div class='del'>-	(camel_folder_append_message): Changed to accept a</div><div class='del'>-	camelmessageinfo rather than flags, which just doesn't have enough</div><div class='del'>-	info in it.</div><div class='del'>-	(copy_message_to): Change for append_message api change.</div><div class='del'>-	(move_message_to): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_free):</div><div class='del'>-	Implement.</div><div class='del'>-	(mbox_append_message): Fix for api change, and also copy user</div><div class='del'>-	flags/tags across to new summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_user_tag): A search expression</div><div class='del'>-	that returns the current use flag by name.</div><div class='del'>-	(camel_folder_search_free_result): New function to free the result</div><div class='del'>-	of a search.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Bump summary version.</div><div class='del'>-	(message_info_new): </div><div class='del'>-	(message_info_load): </div><div class='del'>-	(message_info_save): </div><div class='del'>-	(camel_message_info_dup_to): </div><div class='del'>-	(camel_message_info_free): Added support for arbitrary tag/value</div><div class='del'>-	pairs (CamelTag's).</div><div class='del'>-	(camel_tag_get): </div><div class='del'>-	(camel_tag_set):</div><div class='del'>-	(camel_tag_list_size):</div><div class='del'>-	(camel_tag_list_free): Operations for working with CamelTags.</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Connect beforehand, if</div><div class='del'>-	necessary.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Default</div><div class='del'>-	the dir_sep to "/" so that certain functions can safely assume that</div><div class='del'>-	dir_sep is valid (at least, nonnull).</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_set_message_flags): Get rid of an unused variable.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (INCLUDES): Fix includes so that we</div><div class='del'>-	don't use installed headers anymore.  [I copied this over from the</div><div class='del'>-	IMAP provider, that does not seem to have this problem.]</div><div class='del'>-</div><div class='del'>-2000-08-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	Reorder search result in summary order if we searched with a</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-2000-08-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-uid-cache.c: New code to keep an on-disk cache of what</div><div class='del'>-	UIDs have been seen in a folder.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add new flags CAMEL_PROVIDER_IS_SOURCE (mail</div><div class='del'>-	can arrive in it by non-Camel means) and CAMEL_PROVIDER_IS_STORAGE</div><div class='del'>-	(you can work with mail directly without needing to copy it local).</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Add flags as needed: imap and</div><div class='del'>-	mbox are SOURCE and STORAGE. mh and nntp are just STORAGE, pop3 is</div><div class='del'>-	just SOURCE.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Add another subject</div><div class='del'>-	g_strstrip that fejj's earlier commit missed.</div><div class='del'>-</div><div class='del'>-2000-08-08  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Remove some GTK stuff that I missed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_noop): Turn this</div><div class='del'>-	back on with the new timeout interface in CamelSession.</div><div class='del'>-</div><div class='del'>-	* camel-session.[ch] (camel_session_register_timeout): New</div><div class='del'>-	interface for Camel to register timeouts. Basically the</div><div class='del'>-	GTK timeout interface is copied. We do this because Camel isn't</div><div class='del'>-	allowed to use GTK anymore.</div><div class='del'>-	</div><div class='del'>-2000-08-07  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_append_message): Only retry</div><div class='del'>-	another uid if we had a name clash, otherwise fail.</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): If we are trying to get a</div><div class='del'>-	subfolder listing of the root folder, always make sure INBOX is</div><div class='del'>-	there...</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): </div><div class='del'>-	Check for NIL as a directory separator.</div><div class='del'>-</div><div class='del'>-2000-08-07  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: Reorder the INCLUDES to pull</div><div class='del'>-	in the camel headers from the local source tree before</div><div class='del'>-	the ones in $(includedir). This was causing compile problems</div><div class='del'>-	because the installed, Gtk-based camel-object.h was included</div><div class='del'>-	before the uninstall Camel-based one.</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Strip</div><div class='del'>-	all \n's from the expression</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strip): New convenience function to strip</div><div class='del'>-	occurences of a single char from a string</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_subject): Do a</div><div class='del'>-	g_strstrip on the subject so we can stop getting those annoying</div><div class='del'>-	leading spaces</div><div class='del'>-</div><div class='del'>-2000-08-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_free_deep): Fix this to not require</div><div class='del'>-	NULL-termination of the array.</div><div class='del'>-</div><div class='del'>-2000-08-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): If we fail to</div><div class='del'>-	get a dir_sep, then supply the default of "/".</div><div class='del'>-	(get_folder): Undo changes by Peter</div><div class='del'>-</div><div class='del'>-2000-08-04  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Prevent a coredump</div><div class='del'>-	when get_folder()ing from a store with dir_sep = NULL.</div><div class='del'>-</div><div class='del'>-2000-08-04  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Include camel-object.h. Ettore said this wasn't</div><div class='del'>-	compiling.</div><div class='del'>-</div><div class='del'>-2000-08-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_set_protocol): </div><div class='del'>-	(camel_url_set_host): </div><div class='del'>-	(camel_url_set_path): </div><div class='del'>-	(camel_url_set_port): Url editing functions.</div><div class='del'>-</div><div class='del'>-2000-08-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_set_message_flags): </div><div class='del'>-	(pop3_sync): Indexes into the flags array are message_number minus</div><div class='del'>-	1, not just message_number.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: add a debugging macro for</div><div class='del'>-	doing protocol tracing.</div><div class='del'>-</div><div class='del'>-2000-08-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only</div><div class='del'>-	call imap_get_summary_internal if the folder can hold messages</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): </div><div class='del'>-	Initialize the service_cache for the news/nntp providers</div><div class='del'>-</div><div class='del'>-2000-08-03  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (INCLUDES): Add -I$(top_srcdir) to</div><div class='del'>-	pull in libibex/ibex.h</div><div class='del'>-</div><div class='del'>-2000-08-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Expunge</div><div class='del'>-	from the end, so the index isn't messed up when you remove a</div><div class='del'>-	message.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_append_message): Fix a bug</div><div class='del'>-	where it would never open an output file/uid.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (rename_folder):</div><div class='del'>-	Implementation for mbox as well.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_rename_folder): New method to rename folders.</div><div class='del'>-	(rename_folder): Default implementation.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (delete_folder): Implement this.</div><div class='del'>-	(rename_folder): Implement a rename operation.</div><div class='del'>-</div><div class='del'>-2000-08-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/MH: Kill this. It doesn't have any code to do anything</div><div class='del'>-	the new mh provider doesn't do better.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Remove reference to MH subdir, and</div><div class='del'>-	promote nntp to fully-supported status, since it does compile and</div><div class='del'>-	all.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_subject): Trim</div><div class='del'>-	trailing space from the subject. I've now seen replies from two</div><div class='del'>-	different people that tricked the threading code by (a) not having</div><div class='del'>-	References/In-Reply-To, and (b) adding an extra space to the end</div><div class='del'>-	of the subject line so the subject-based threading fails too. Who</div><div class='del'>-	writes these broken mailers anyway?</div><div class='del'>-</div><div class='del'>-2000-08-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): When forced</div><div class='del'>-	to use the IP, place it in square brackets.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New and</div><div class='del'>-	improved sexp parser. An honest try at using e-sexp is wrapped in</div><div class='del'>-	a #ifdef at the bottom of the file but is currently not used</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	We want to do a UID SEARCH so we get UIDs back instead of sequence</div><div class='del'>-	numbers</div><div class='del'>-</div><div class='del'>-2000-08-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh: New mh provider implementation.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Added mh provider.</div><div class='del'>-</div><div class='del'>-2000-07-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info_internal): </div><div class='del'>-	Some IMAP servers don't wrap the UID in ()'s so don't depend on that</div><div class='del'>-	(imap_get_summary_internal): Same</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (free_sexp_node): Oops, forgot to</div><div class='del'>-	free node-&gt;function - not good.</div><div class='del'>-</div><div class='del'>-2000-07-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Add</div><div class='del'>-	a NULL to the matches pointer array so that g_strfreev knows where</div><div class='del'>-	the end is.</div><div class='del'>-</div><div class='del'>-2000-07-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New</div><div class='del'>-	convenience function to translate a Camel sexp into the equivalent</div><div class='del'>-	IMAP sexp.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: More places now use</div><div class='del'>-	imap_next_word</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	Implemented initial version (this may or may not work quite right)</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Make sure</div><div class='del'>-	the third word/token (whatever) is "EXPUNGE" and not something</div><div class='del'>-	else like "EXISTS" or "RECENT". When removing the message from</div><div class='del'>-	the summary also make sure to free that data to avoid leakage.</div><div class='del'>-	Also make sure to subtract 1 from the 'id' since IMAP starts</div><div class='del'>-	at 1 and our summary starts at 0 :-)</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_status): Cleaned</div><div class='del'>-	up a bit, now uses imap_next_word()</div><div class='del'>-	(camel_imap_command_extended): Now uses imap_next_word(). When</div><div class='del'>-	checking for RECENT, allow the first digit of the recent-count</div><div class='del'>-	be between 0 and 9 inclusive instead of exclusive.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Optimized.</div><div class='del'>-	No longer will it need to reload the summary as it now instead</div><div class='del'>-	removes the appropriate message summaries from the cache.</div><div class='del'>-	(camel_imap_folder_changed): If recent == 0 then return. If </div><div class='del'>-	recent &lt; 0 then just emit the folder_changed signal, don't reload</div><div class='del'>-	summaries.</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Get message count when STATUS</div><div class='del'>-	is not available.</div><div class='del'>-	(imap_init): folder-&gt;has_search_capability is required for IMAP so</div><div class='del'>-	should always be set to TRUE (is currently being set to FALSE as</div><div class='del'>-	I've not yet implemented SEARCH support).</div><div class='del'>-	(camel_imap_folder_changed): Seem to have fixed my optimization</div><div class='del'>-	hack</div><div class='del'>-</div><div class='del'>-2000-07-28  Jon K Hellan  &lt;hellan@acm.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h (CamelImapServerLevel): New</div><div class='del'>-	enum.</div><div class='del'>-	(CamelImapStore): Added server_level and has_status_capability</div><div class='del'>-	members.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Detect</div><div class='del'>-	IMAP4REV1, IMAP4 and STATUS in capability response.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Use STATUS only if server</div><div class='del'>-	supports it. TODO: Get message count when STATUS not supported.</div><div class='del'>-	(imap_get_message, imap_get_summary_internal,</div><div class='del'>-	imap_get_message_info_internal): Handle IMAP4 as well.</div><div class='del'>-	(imap_protocol_get_summary_specifier): New function: Make a data</div><div class='del'>-	item specifier for the header lines we need, appropriate to the</div><div class='del'>-	server level.</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_lwsp): More</div><div class='del'>-	checks for end of string.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c:</div><div class='del'>-	(imap_command_extended): Free the elements of our</div><div class='del'>-	array (huge mem leak)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	(summary_get_internal): Same as above.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Fixed my routine to only fetch new headers, my IDs were off by 1</div><div class='del'>-	on the high end, so when it would fetch the last newly arrived</div><div class='del'>-	message it would fail and end up fetching all of the summaries</div><div class='del'>-	because of the corruption.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): If the path doesn't begin</div><div class='del'>-	with a / and there is a host, prepend a / to the path.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/Makefile.am: Added camel-imap-utils.[c,h]</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-utils.[c,h]: Utilities for parsing</div><div class='del'>-	server responses for use in both camel-imap-store.c and</div><div class='del'>-	camel-imap-folder.c</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Free all the pointers in the headers array.</div><div class='del'>-	(imap_get_subfolder_names_internal): Updated to use</div><div class='del'>-	imap_parse_list_response</div><div class='del'>-	(imap_parse_subfolder_list): Removed in favor of</div><div class='del'>-	imap_parse_list_response</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Free all the pointers in the data array.</div><div class='del'>-	(imap_connect): Updated to use imap_parse_list_response and fixed</div><div class='del'>-	a leak</div><div class='del'>-	(folder_is_selectable): Updated.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Now</div><div class='del'>-	uses a hash table for looking up message info rather than a linear</div><div class='del'>-	search :)</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/*/Makefile.am: Don't specify SUBDIRS =</div><div class='del'>-	[nothing]. Messes up distcheck.</div><div class='del'>-	</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init): Initialize</div><div class='del'>-	outbuf to be "" -- it's not guaranteed to be zeroed.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Return</div><div class='del'>-	if the header is NULL -&gt; or "" &lt;-. Don't do our stupid</div><div class='del'>-	mailer trick if we point to \0.</div><div class='del'>-	(header_decode_quoted_string): Don't rip past end of </div><div class='del'>-	string!</div><div class='del'>-	</div><div class='del'>-2000-07-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (movemail_external): routine to call an</div><div class='del'>-	external movemail program.</div><div class='del'>-	(camel_movemail): Nuke return value, use movemail_external when</div><div class='del'>-	available and useful, and don't delete "dest" on errors, since</div><div class='del'>-	it might have started non-empty.</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): Should now always prepend a '/'</div><div class='del'>-	before the path if it doesn't already exist.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Fixed a few compiler warnings</div><div class='del'>-</div><div class='del'>-2000-07-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_free): Fixed the</div><div class='del'>-	real problem that Peter was running into.</div><div class='del'>-</div><div class='del'>-2000-07-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (write_to_stream): Don't add a Mime-Version</div><div class='del'>-	header to a message that already has one.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Don't put &lt;&gt;s around</div><div class='del'>-	addresses with no name part.</div><div class='del'>-</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Set </div><div class='del'>-	imap_folder-&gt;summary to NULL after calling imap_summary_free,</div><div class='del'>-	so we don't get stuck with a junk summary pointer. Should</div><div class='del'>-	we free it at all?</div><div class='del'>-</div><div class='del'>-2000-07-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Optimized to try and get the new message headers without reloading</div><div class='del'>-	the entire summary from scratch.</div><div class='del'>-	(imap_get_summary_internal): Will now sync() before attempting to</div><div class='del'>-	reload the summary so that flags are set in the reloaded summary</div><div class='del'>-	as well.</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Updated to give</div><div class='del'>-	special attention to the root folder.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): Updated to handle the root</div><div class='del'>-	folder</div><div class='del'>-	(imap_get_message_count_internal): return 0 if folder can't hold</div><div class='del'>-	messages</div><div class='del'>-	(camel_imap_folder_new): Change so that root folder gets special</div><div class='del'>-	attention and always gets can_hold_messages set to FALSE</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exceptions from a number of methods that</div><div class='del'>-	work on what ought to be static data: get_parent_folder,</div><div class='del'>-	get_parent_store, get_message_count, get_unread_message_count,</div><div class='del'>-	get_permanent_flags, get_message_flags, set_message_flags,</div><div class='del'>-	get_message_user_flag, set_message_user_flag, get_uids,</div><div class='del'>-	get_summary, get_subfolder_names. Turn camel_folder_delete_message</div><div class='del'>-	into a macro. (Mostly a pull-up from the camel-async branch.)</div><div class='del'>-</div><div class='del'>-	* providers/{imap,mbox,nntp,pop3,vee}: Update for CamelFolder</div><div class='del'>-	changes</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Updated</div><div class='del'>-	to port easily to the new Camel API</div><div class='del'>-	(imap_init): Don't SELECT INBOX, we don't need to do that</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): </div><div class='del'>-	Initialize the summary and subfolder listing.</div><div class='del'>-	(imap_summary_free): Now takes a GPtrArray arg rather than a </div><div class='del'>-	CamelImapFolder as it increases it's usefullness for free()'ing</div><div class='del'>-	temporary summaries.</div><div class='del'>-	(imap_get_message_count_internal): A new convenience function for</div><div class='del'>-	getting the actual message count on a server to be used by </div><div class='del'>-	imap_get_summary_internal)</div><div class='del'>-	(imap_get_message_count): Since the Camel API is on the move again, </div><div class='del'>-	the future version of this function will not be able to make a</div><div class='del'>-	call to the store, it must only access previously fetched data (thus </div><div class='del'>-	the creation of the _internal function)</div><div class='del'>-	(imap_get_subfolder_names_internal): Again, because the future version</div><div class='del'>-	of imap_get_subfolder_names will not take an exception, we must rename</div><div class='del'>-	this function which will be called by camel_imap_folder_new()</div><div class='del'>-	(imap_get_subfolder_names): We now return the previously collected</div><div class='del'>-	subfolder listing that the _internal function fetched previously</div><div class='del'>-	(imap_get_summary_internal): Again, same idea as the previous _internal</div><div class='del'>-	functions...</div><div class='del'>-	(imap_get_summary): Again... now returns a previously aquired summary</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_noop): This will hopefully</div><div class='del'>-	prevent the imap store from disconnecting.</div><div class='del'>-	(imap_connect): Modified to add a gtk timeout event that will call</div><div class='del'>-	imap_noop() every 10 minutes (we may want to change this time value)</div><div class='del'>-	(imap_disconnect): Modified to remove the NOOP timeout event from the</div><div class='del'>-	store.</div><div class='del'>-	(camel_imap_command_extended): Commented out the code that would try</div><div class='del'>-	and detect if the store was disconnected and then reconnect if it was</div><div class='del'>-	needed.</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which</div><div class='del'>-	was not used, and not implemented by any provider.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid</div><div class='del'>-	non-implementation.</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,</div><div class='del'>-	camel-marshal-utils.[ch]: Bye bye bye.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove reference to camel-arg-collector.c</div><div class='del'>-</div><div class='del'>-2000-07-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Made it a</div><div class='del'>-	little more forgiving. Also set current_folder to NULL as there is</div><div class='del'>-	no selected folder after a disconnect.</div><div class='del'>-	(stream_is_alive): Detects whether or not a socket is "alive"</div><div class='del'>-	(camel_imap_command_extended): Use stream_is_alive() to aid in the</div><div class='del'>-	detection of a disconnected state.</div><div class='del'>-</div><div class='del'>-2000-07-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Clear</div><div class='del'>-	CamelExceptions when appropriate (eg when folder is marked as</div><div class='del'>-	\NoSelect). Still needs some cleanup and perhaps Dan will have a</div><div class='del'>-	better way of doing this as this seems like a messy way of</div><div class='del'>-	handling this.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Took out</div><div class='del'>-	some debug statements as they are no longer needed.</div><div class='del'>-</div><div class='del'>-2000-07-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_subfolder_names):</div><div class='del'>-	Updated to not strip out subfolders that are marked as \NoSelect</div><div class='del'>-	because this will be correctly handled in store-&gt;get_folder from</div><div class='del'>-	now on.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (folder_is_selectable): New</div><div class='del'>-	convenience function for use in get_folder().</div><div class='del'>-	(parse_list_response): Now takes a char **flags argument which is</div><div class='del'>-	needed by folder_is_selectable().</div><div class='del'>-	(imap_connect): Updated to reflect changes to</div><div class='del'>-	parse_list_response().</div><div class='del'>-</div><div class='del'>-2000-07-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated with</div><div class='del'>-	some of the same fixes I've made to camel-imap-folder.c like</div><div class='del'>-	recalculating message part lengths.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Rewrote the code to check for "* %d RECENT". Still needs to be</div><div class='del'>-	modified, but should no longer cause an infinite loop by detecting</div><div class='del'>-	mis-detecting RECENT messages.</div><div class='del'>-</div><div class='del'>-2000-07-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary):</div><div class='del'>-	(imap_get_message_info): Oops. Fix UID parser to allow 0 and 9 to</div><div class='del'>-	be in the range of valid UID chars.</div><div class='del'>-</div><div class='del'>-2000-07-20  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_unref): Add a new global mutex</div><div class='del'>-	'refcount' held when refcounting operations occur.</div><div class='del'>-</div><div class='del'>-2000-07-19  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): Correct the recursiveness;</div><div class='del'>-	the locklevel is stored as a private, so each thread has its own</div><div class='del'>-	idea of the locklevel. Thus one thread can relock, but a different</div><div class='del'>-	one will think that it's a level 0 and try to lock the type_system</div><div class='del'>-	mutex.</div><div class='del'>-</div><div class='del'>-2000-07-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: General cleanup working</div><div class='del'>-	towards getting Actions-&gt;Expunge working correctly.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(cammel_imap_command_extended): Added code to look for "* %d</div><div class='del'>-	RECENT" and to emit the folder_changed signal if there are any</div><div class='del'>-	recent messages. Note: this is a hack and needs to be rewritten</div><div class='del'>-	badly.</div><div class='del'>-</div><div class='del'>-2000-07-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): If the</div><div class='del'>-	folder's message count is not the same as the number of summaries,</div><div class='del'>-	free the old summary and create a new summary.</div><div class='del'>-</div><div class='del'>-2000-07-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(camel_imap_folder_class_init): Added in</div><div class='del'>-	imap_[g,s]et_message_user_flag() methods</div><div class='del'>-	(imap_get_message_info): Rewrote to use the more efficient way of</div><div class='del'>-	downloading summary information and also added a UID comparison so</div><div class='del'>-	that if the UID requested doesn't match the UID received, it</div><div class='del'>-	returns NULL.  FIXME: When the mailer gets NULL when it requested</div><div class='del'>-	message info, it seems that it displays a row for that message and</div><div class='del'>-	when you try and select the blank row, it segfaults.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Oops, this</div><div class='del'>-	should not be checking against "/", it should be checking against</div><div class='del'>-	dir_sep.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_parse_subfolder_line):</div><div class='del'>-	Updated to trim out the leading namespace.</div><div class='del'>-	(imap_get_subfolder_names): Let the subfolder parser trim the</div><div class='del'>-	namespace off the folder name.</div><div class='del'>-</div><div class='del'>-2000-07-17  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): New function; the</div><div class='del'>-	Camel type_system lock is now fakey-recursive, being controlled</div><div class='del'>-	by a semaphore that goes up and down and is protected by another</div><div class='del'>-	lock. Theoretically all we need is the lock on the semaphore,</div><div class='del'>-	but this we catch exceptions "better" (by deadlocking).</div><div class='del'>-	(camel_type_lock_down): Corresponding to above.</div><div class='del'>-	(all functions): s,G_LOCK,camel_type_lock_up, etc.</div><div class='del'>-</div><div class='del'>-2000-07-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Send a</div><div class='del'>-	"LOGOUT" command.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Hacks to</div><div class='del'>-	get IMAP code to work with CommunigatePro and MS Exchange (and any</div><div class='del'>-	other servers that send back a UID at the end of each FETCH inside</div><div class='del'>-	of the main body of the message part).</div><div class='del'>-	(imap_sync): Un-#if 0 the code that sets the flags on the IMAP</div><div class='del'>-	server for messages that have changed. Oops, don't mask with</div><div class='del'>-	DELETED to find out if the message has been answered ;-)</div><div class='del'>-	(imap_expunge): sync before expunging.</div><div class='del'>-</div><div class='del'>-2000-07-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: All SELECT calls now pass</div><div class='del'>-	a NULL folder argument to camel_imap_command_extended() since it's</div><div class='del'>-	not needed.</div><div class='del'>-	(imap_connect): Moved service_class-&gt;connect() to the point right</div><div class='del'>-	after a connection is established with the server rather than</div><div class='del'>-	waiting until the end of the function.</div><div class='del'>-	(camel_imap_command): Updated the documentation comment</div><div class='del'>-	(camel_imap_command_extended): Before sending a command, first</div><div class='del'>-	check to make sure we are connected; if we aren't, then reconnect.</div><div class='del'>-	Don't strncmp() command with "SELECT" as it's redundant.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: All SELECT calls now pass</div><div class='del'>-	a NULL folder argument to camel_imap_command_extended() since it's</div><div class='del'>-	not needed. Also s/camel_imap_command/camel_imap_command_extended as</div><div class='del'>-	I will probably be doing away with camel_imap_command() or at least</div><div class='del'>-	only using it for LOGIN and similar commands where the server won't</div><div class='del'>-	notify us of any recent messages.</div><div class='del'>-</div><div class='del'>-2000-07-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): </div><div class='del'>-	One last fix to get rid of hard-coded "/" directory separators</div><div class='del'>-</div><div class='del'>-2000-07-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c : Implement 'events', which are suspiciously</div><div class='del'>-	like signals except without all the marshalling baggage, and</div><div class='del'>-	with quasi-thread-safety.</div><div class='del'>-	(camel_object_class_declare_event): New func.</div><div class='del'>-	(camel_object_hook_event): Ditto.</div><div class='del'>-	(camel_object_trigger_event): Ditto.</div><div class='del'>-	(obj_class_init): Declare the "finalize" event.</div><div class='del'>-	(obj_class_finalize): Free the hashtable of events-&gt;preps</div><div class='del'>-	(obj_finalize): Free the hashtable of events-&gt;hooklists</div><div class='del'>-	(camel_object_unref): Trigger the finalize event (ourselves,</div><div class='del'>-	to prevent massively unpleasant looping things.)</div><div class='del'>-	</div><div class='del'>-2000-07-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-object.c (make_global_classfuncs): Change to return</div><div class='del'>-	a CamelObjectClass. Change parents to a GSList and free it</div><div class='del'>-	when done.</div><div class='del'>-	(camel_object_new): Don't allocate a classfuncs for every object;</div><div class='del'>-	merely give it a reference to the global_classfuncs. Convert</div><div class='del'>-	parents to a GSList and free it when done.</div><div class='del'>-	(camel_object_unref): Don't free the classfuncs. Free the parents</div><div class='del'>-	list, which is changed to a GSList.</div><div class='del'>-</div><div class='del'>-2000-07-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_unquote): New convenience function</div><div class='del'>-	to unquote a string if it's encapsulated by "'s</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	* providers/imap/camel-imap-store.c: Made the necessary changes</div><div class='del'>-	to stop using hard coded directory separators.</div><div class='del'>-</div><div class='del'>-2000-07-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	If the summary is for a smaller mbox, and rebuilding from the</div><div class='del'>-	last-known end position fails, try rebuilding from the beginning.</div><div class='del'>-	Deals with the case where the user edits the mbox and makes it</div><div class='del'>-	bigger, without adding new messages.</div><div class='del'>-</div><div class='del'>-2000-07-13  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c: Rewritten to not be based on GtkObject,</div><div class='del'>-	but a tiny threadsafe ripoff thereof. Objects still cannot</div><div class='del'>-	be shared across threads, but ref/unref/destroy/new/etc</div><div class='del'>-	will work. Signals are not implemented because doing it</div><div class='del'>-	robustly would be a major pain in the butt, but class</div><div class='del'>-	functions are. There's a small demonstration that it doesn't</div><div class='del'>-	crash in ./temp-test.c: build it with ./make-test.sh.</div><div class='del'>-	* camel-stream.c, camel-seekable-stream.c, camel-stream-mem.c:</div><div class='del'>-	moved over to CamelObject. Proof of concept: two levels of</div><div class='del'>-	subclass and class functions, all working without coredumps.</div><div class='del'>-	To port to CamelObject:</div><div class='del'>-	- s,GTK_,CAMEL_,g in the cast checks</div><div class='del'>-	- s,gtk_type_new,camel_object_new,g</div><div class='del'>-	- s,GtkType,CamelType,g</div><div class='del'>-	- Change get_type function over to camel_type_declare</div><div class='del'>-	- instead of hooking to finalize function, it goes into the</div><div class='del'>-	  type declaration.</div><div class='del'>-	- remove signals.</div><div class='del'>-	- instead of GTK_OBJECT(so)-&gt;klass, CAMEL_OBJECT_GET_CLASS(so)</div><div class='del'>-	- s,gtk_type_class,camel_type_get_global_classfuncs,g</div><div class='del'>-	- don't chain finalize handlers; it will be done for you</div><div class='del'>-	</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: If a SELECT fails, set</div><div class='del'>-	imap_store-&gt;current_folder to NULL so a SELECT is forced before</div><div class='del'>-	any message/folder operations are requested. Also, because some</div><div class='del'>-	users don't use a namespace, make sure that if the url-&gt;path is </div><div class='del'>-	"/" we don't use it when creating the folder_path.</div><div class='del'>-	(camel_imap_command[_extended]): Since we allow the passing of</div><div class='del'>-	a NULL folder which we can use to bypass a forced SELECT, no need</div><div class='del'>-	to check for the individual commands that don't require a folder</div><div class='del'>-	to be selected.</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: Updated to use CAMEL_IMAP_OK, </div><div class='del'>-	CAMEL_IMAP_NO, CAMEL_IMAP_BAD, and CAMEL_IMAP_FAIL rather than the </div><div class='del'>-	ones copied from the POP3 provider. </div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Oops.</div><div class='del'>-	If the number of messages in the folder is 0, don't fetch</div><div class='del'>-	summaries 1 thru 0, just return an empty summary.</div><div class='del'>-	(imap_copy_message_to): Fixed to use message UID and also send</div><div class='del'>-	the source folder as an arg to camel_imap_command rather than NULL.</div><div class='del'>-	(imap_move_message_to): Same.</div><div class='del'>-	(imap_init): If SELECT is successful, we need to set the current</div><div class='del'>-	folder to the one selected, this was causing problems with move/copy</div><div class='del'>-</div><div class='del'>-2000-07-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags</div><div class='del'>-	parallel to the _NEED_* flags, and make the _NEED_* flags imply</div><div class='del'>-	the _ALLOW_* ones.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): imap</div><div class='del'>-	urls ALLOW_PATH</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): New</div><div class='del'>-	and improved approach to fetching an entire folder summary</div><div class='del'>-	that should be much much faster than the old way as it gets</div><div class='del'>-	the entire folder summary in 1 shot rather than requesting</div><div class='del'>-	message by message. As with the last update, this version</div><div class='del'>-	also only fetches the minimum number of header fields.</div><div class='del'>-	(imap_get_summary): Oops, forgot to free the temp </div><div class='del'>-	GPtrArray *headers</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Don't</div><div class='del'>-	fetch the entire RFC822 header, just fetch the fields we want.</div><div class='del'>-	(imap_get_message_info): Same.</div><div class='del'>-</div><div class='del'>-2000-07-13  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (camel_mime_filter_basic_new_type):</div><div class='del'>-	Reset filter on setup.</div><div class='del'>-	(reset): When resetting qp encoding, set the state to -1, instead</div><div class='del'>-	of 0.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Actually count the</div><div class='del'>-	characters output sofar (it never counted any).  Bunch of other</div><div class='del'>-	fixes.</div><div class='del'>-	(quoted_encode_close): Also flush out final character, if there's</div><div class='del'>-	one.</div><div class='del'>-</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Chris forgot to add #include &lt;e-util/e-util.h&gt; to the source files</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Fixed Peter's </div><div class='del'>-	fix, we don't want to send a string to a %d.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, providers/imap/camel-imap-store.c:</div><div class='del'>-	Changed from strstrcase to e_strstrcase.</div><div class='del'>-</div><div class='del'>-	* string-utils.c, string-utils.h: Removed strstrcase (in favor of</div><div class='del'>-	e_strstrcase in e-util/e-util.c.)</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_set_message_flags): get the article num out of our</div><div class='del'>-	uid and mark it read in the newsrc.</div><div class='del'>-	(nntp_folder_get_message): get the message id out of the uid to</div><div class='del'>-	fetch the article.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): the uid</div><div class='del'>-	is now &lt;article-num&gt;,&lt;messageid&gt;</div><div class='del'>-	(get_HEAD_headers): same.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): go to HSCAN_MESSAGE</div><div class='del'>-	state when ct-&gt;subtype is "news" as well as "rfc822".  this makes</div><div class='del'>-	attachments of type "message/news" display properly.</div><div class='del'>-</div><div class='del'>-2000-07-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_free_deep,</div><div class='del'>-	camel_folder_free_shallow, camel_folder_free_nop): Useful default</div><div class='del'>-	implementations for free_{uids,subfolder_names,summary}.</div><div class='del'>-	(free_subfolder_names, free_uids): Make these g_warning-ing</div><div class='del'>-	default implementations.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Use the new functions where</div><div class='del'>-	appropriate, remove duplicated code.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): Check for</div><div class='del'>-	NULL parameters when setting the exception so as to not crash on</div><div class='del'>-	Solaris (can't handle a %s passed NULL).</div><div class='del'>-	(imap_connect): Same.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message): Use</div><div class='del'>-	mbox_set_message_flags () instead of setting the flags by hand. This</div><div class='del'>-	fixes the problem of the "message_changed" signal not being emitted</div><div class='del'>-	at the correct time.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: "folder_changed" signals should</div><div class='del'>-	pass a third argument (which is ignored).</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Undo gtk signal emits done in set_flags and </div><div class='del'>-	expunge.</div><div class='del'>-	(move_message_to): </div><div class='del'>-	(copy_message_to): Create info as a const CamelMessageInfo</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: don't add test-newsrc to the build</div><div class='del'>-	since it needs libcamel (which isn't built at the time test-newsrc</div><div class='del'>-	needs linking.)</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_HEAD_headers): fill in</div><div class='del'>-	MessageInfo-&gt;message_id.</div><div class='del'>-	(get_XOVER_headers): same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init): move</div><div class='del'>-	summary loading here.</div><div class='del'>-	(nntp_folder_sync): summary/newsrc changes should be stored here.</div><div class='del'>-	put a comment to that effect.</div><div class='del'>-	(nntp_folder_set_message_flags): don't save the newsrc here.</div><div class='del'>-	(nntp_folder_get_uids): use g_ptr_array_index instead of the</div><div class='del'>-	cast/addition.</div><div class='del'>-	(nntp_folder_get_summary): no need to check if we should generate</div><div class='del'>-	the summary here.  already done.</div><div class='del'>-	(nntp_folder_get_message_info): implement.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_toplevel_dir): use evolution_dir instead of</div><div class='del'>-	computing it ourselves.</div><div class='del'>-	(nntp_store_disconnect): call camel_nntp_newsrc_write.</div><div class='del'>-	(ensure_news_dir_exists): new function to create the news/&lt;news</div><div class='del'>-	server&gt; subdir.</div><div class='del'>-	(camel_nntp_store_class_init): hook up connect/disconnect and</div><div class='del'>-	finalize.</div><div class='del'>-	(nntp_store_connect): if ensure_news_dir_exists fails throw an</div><div class='del'>-	exception.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_set_message_flags): Emit a message_changed</div><div class='del'>-	signal once the flags are set on the message.</div><div class='del'>-	(camel_folder_set_user_flag): Ditto.</div><div class='del'>-	(camel_folder_expunge): Emit a folder_changed if no exception.</div><div class='del'>-</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream.c: Use size_t and ssize_t for read/write methods</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): </div><div class='del'>-	Updated to emit the message_changed signal.</div><div class='del'>-	(imap_delete_message): Updated to use imap_set_message_flags ().</div><div class='del'>-	(imap_move_message_to): Updated to use imap_set_message_flags ()</div><div class='del'>-	and to emit the folder_changed signal on the destination folder.</div><div class='del'>-	(imap_copy_message_to): Updated to emit the folder_changed signal </div><div class='del'>-	on the destination folder.</div><div class='del'>-	(imap_append_message): Updated to emit the folder_changed signal </div><div class='del'>-	on the destination folder.</div><div class='del'>-</div><div class='del'>-2000-07-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_append_message): Now takes a</div><div class='del'>-	flags argument to specify the flags to be set on the message</div><div class='del'>-	since we might not necessarily want the flags to be wiped clean.</div><div class='del'>-	(move_message_to):</div><div class='del'>-	(copy_message_to): Updated to send a flags argument to </div><div class='del'>-	append_message (); currently sends the original message's flags.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): </div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): </div><div class='del'>-	Updated.</div><div class='del'>-</div><div class='del'>-2000-07-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exceptions from a number of methods</div><div class='del'>-	that work on what ought to be static data: get_parent_folder,</div><div class='del'>-	get_parent_store, get_message_count, get_unread_message_count,</div><div class='del'>-	get_permanent_flags, get_message_flags, set_message_flags,</div><div class='del'>-	get_message_user_flag, set_message_user_flag, get_message_uid,</div><div class='del'>-	get_uids, get_summary, get_subfolder_names. Turn</div><div class='del'>-	camel_folder_delete_message into a macro.</div><div class='del'>-</div><div class='del'>-	* providers/{mbox,pop3,vee}: Update for CamelFolder changes</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Disable imap and nntp for now</div><div class='del'>-</div><div class='del'>-2000-07-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression): </div><div class='del'>-	This shouldn't return NULL, it should return g_ptr_array_new ()</div><div class='del'>-	so the mailer gets what it expects.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_decode_string): </div><div class='del'>-	Oops, an unsigned integer can never be &lt; 0</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):</div><div class='del'>-	Initialize a variable to make this not crash again. And fix a bug</div><div class='del'>-	so it actually does something.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Cleaned up a bunch of compile warnings</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee: kill more debugging messages</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_unread_message_count): </div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_get_unread_message_count): </div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_unread_message_count):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_unread_message_count): New</div><div class='del'>-	convenience function to allow the mailer to query the number</div><div class='del'>-	of unread messages in a folder (for displaying message stats</div><div class='del'>-	in a folder tree?).</div><div class='del'>-</div><div class='del'>-2000-07-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_dup): New function to copy</div><div class='del'>-	a header_references structure.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_dup_to): New function</div><div class='del'>-	to (deep) copy the data from one CamelMessageInfo into another.</div><div class='del'>-	(camel_message_info_free): And free the data.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_sync): Implement. (empty).</div><div class='del'>-	(vee_search_by_expression): belatedly update for</div><div class='del'>-	camel_folder_search change.</div><div class='del'>-	(vee_folder_build): belatedly update for camel_folder_search</div><div class='del'>-	change. Use camel_message_info_dup_to and camel_message_info_free</div><div class='del'>-	(in particular, so that we get message_id and references info so</div><div class='del'>-	vfolders can be threaded).</div><div class='del'>-	(vee_folder_build_folder): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.c: </div><div class='del'>-	* providers/nntp/camel-nntp-store.c: Update to reflect past changes</div><div class='del'>-	in the Camel API. Use gtk macro casts wherever possible and use glib's</div><div class='del'>-	memory functions instead of standard c's (since they are not </div><div class='del'>-	compatable)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: Wrap debug print statements</div><div class='del'>-	in a macro</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Make sure</div><div class='del'>-	that we get up to and including the last \n of the mime part.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Make sure</div><div class='del'>-	that we get up to and including the last \n of the mime part.</div><div class='del'>-	Wrap debug print statements in a macro.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Only cache</div><div class='del'>-	the important data (aka the mime part requested and no extra</div><div class='del'>-	server response stuff)</div><div class='del'>-</div><div class='del'>-2000-07-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Work around</div><div class='del'>-	In-Reply-To's with unquoted punctuation. So many broken mailers.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_expression): Make this</div><div class='del'>-	return a GPtrArray rather than a GList.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_search_by_expression):</div><div class='del'>-	Update to return a GPtrArray rather than a GList.</div><div class='del'>-</div><div class='del'>-2000-07-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (esmtp_get_authtypes): </div><div class='del'>-	Fixed the parser to actually work</div><div class='del'>-</div><div class='del'>-2000-07-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Make this deal</div><div class='del'>-	with the full RFC822 References/In-Reply-To format rather than</div><div class='del'>-	just the more-nicely-behaved RFC1036 version. (Needed to parse</div><div class='del'>-	In-Reply-To headers with extra junk in them.)</div><div class='del'>-</div><div class='del'>-2000-07-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Parse for</div><div class='del'>-	more header information to allow message threading in IMAP.</div><div class='del'>-	(imap_get_message_info): Same.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Renamed summary_format_* to</div><div class='del'>-	camel_summary_format_* and moved them into public scope.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Oops. Don't</div><div class='del'>-	pass port # as a string in the error code (if it fails to connect).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Changed</div><div class='del'>-	over to camel_imap_command_extended as that was the source of the</div><div class='del'>-	problems - apparently appending replies with more than just 1 line.</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): make header</div><div class='del'>-	matching case-insensitive</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c:</div><div class='del'>-	* camel-session.c:</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Remove some non-error case</div><div class='del'>-	debugging-type messages.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that</div><div class='del'>-	we get rid of a ton of debugging messages.</div><div class='del'>-</div><div class='del'>-2000-07-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Added prototype for uudecode_step</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uudecode_step): Cleaned up some junk that</div><div class='del'>-	should have been cleaned up when debugging printf's were taken out.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Update the X-Evolution: header even if the in-memory UID and the</div><div class='del'>-	saved UID are not the same.  Otherwise mboxes with clashing UIDs</div><div class='del'>-	can never be fixed.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_add_from_parser): Add the message to the</div><div class='del'>-	summary before doing any ibex stuff.  In fact, this might also</div><div class='del'>-	have the side effect of reassigning the UID so it needs to be done</div><div class='del'>-	before we start using the UID.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Add</div><div class='del'>-	debugging message to keep track of the UIDs we add.</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Add "Cc" to summary and bump summary</div><div class='del'>-	version number.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): make "Cc" a</div><div class='del'>-	searchable header.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_next_uid_string):</div><div class='del'>-	New.</div><div class='del'>-	(camel_folder_summary_add): Use</div><div class='del'>-	`camel_folder_summary_next_uid_string()' instead of recomputing</div><div class='del'>-	the UID manually here.</div><div class='del'>-	(camel_folder_summary_add_from_parser): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_uid): Removed.</div><div class='del'>-</div><div class='del'>-2000-07-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Parse In-Reply-To</div><div class='del'>-	with header_references_decode, not header_msgid_decode.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_class_init): message</div><div class='del'>-	headers are case-insensitive.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fix a</div><div class='del'>-	bug in error-setting code.</div><div class='del'>-	(pop3_connect): Don't re-prompt for password in the KPOP case.</div><div class='del'>-	(pop3_get_response): New function, split out from</div><div class='del'>-	camel_pop3_command.</div><div class='del'>-	(connect_to_server): Use pop3_get_response to parse the greeting</div><div class='del'>-	message, and error out appropriately if it's -ERR.</div><div class='del'>-</div><div class='del'>-2000-07-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_freeze, camel_folder_thaw): New</div><div class='del'>-	functions to freeze and thaw a folder (to prevent message/folder</div><div class='del'>-	changed signals in the middle of a long series of operations).</div><div class='del'>-	(camel_folder_class_init): Change signals to GTK_RUN_FIRST.</div><div class='del'>-	(message_changed, folder_changed): Add default implementations</div><div class='del'>-	that stop the emission and record info for later if the folder is</div><div class='del'>-	frozen.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_sync): leftover fixes</div><div class='del'>-	from the close-&gt;sync change: don't destroy the ibex, summary, and</div><div class='del'>-	search when syncing.</div><div class='del'>-	(append_message): emit "folder_changed" on a successful append.</div><div class='del'>-</div><div class='del'>-2000-07-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uudecode_step): A rather complex uudecoder</div><div class='del'>-	written in the spirit of Zucchi-ness, is it up to par? Only the </div><div class='del'>-	Z-man can tell us :-)</div><div class='del'>-</div><div class='del'>-2000-07-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_get_name): New method, to return</div><div class='del'>-	an end-user-friendly name corresponding to a service. (eg, "POP</div><div class='del'>-	service for danw on trna.helixcode.com").</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c,</div><div class='del'>-	providers/mbox/camel-mbox-store.c,</div><div class='del'>-	providers/nntp/camel-nntp-store.c,</div><div class='del'>-	providers/pop3/camel-pop3-store.c,</div><div class='del'>-	providers/sendmail/camel-sendmail-transport.c,</div><div class='del'>-	providers/smtp/camel-smtp-transport.c: Implement.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: remove unneeded</div><div class='del'>-	libcamelimap_la_LDADD.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): fix the</div><div class='del'>-	CAPA-parsing code to not get into an infinite loop.</div><div class='del'>-</div><div class='del'>-2000-07-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed</div><div class='del'>-	the bug that would sometimes leave part of the server response</div><div class='del'>-	tacked on to the end of the message.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Renamed _by_uid methods. Since we no longer</div><div class='del'>-	have get-by-number methods, no need to have the _by_uid </div><div class='del'>-	extensions. </div><div class='del'>-	(get_message_by_uid): Renamed to get_message</div><div class='del'>-	(delete_message_by_uid): Renamed to delete_message</div><div class='del'>-	(summary_get_by_uid): Renamed to get_message_info</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	* providers/pop3/camel-pop3-folder.c:</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Updated to reflect</div><div class='del'>-	camel-folder changes.</div><div class='del'>-</div><div class='del'>-2000-06-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_message_to): New function, to</div><div class='del'>-	copy a message from one folder to another. The default</div><div class='del'>-	implementation just uses append_message, but providers can </div><div class='del'>-	implement more efficient versions for use when both folders are on </div><div class='del'>-	the same store.</div><div class='del'>-</div><div class='del'>-	* broken-date-parser.[c,h]: Utilities for parsing broken</div><div class='del'>-	date strings.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_move_message_to): </div><div class='del'>-	(imap_copy_message_to): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): Wrote some code to try</div><div class='del'>-	and un-mangle broken date formats and then parse that new string </div><div class='del'>-	instead.</div><div class='del'>-</div><div class='del'>-2000-06-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_move_message_to): New function, to</div><div class='del'>-	move a message from one folder to another. The default</div><div class='del'>-	implementation just uses append_message and delete_message, but</div><div class='del'>-	providers can implement more efficient versions for use when both</div><div class='del'>-	folders are on the same store.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Should now</div><div class='del'>-	print a meaningful error message when it doesn't succeed</div><div class='del'>-</div><div class='del'>-2000-06-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Changed to</div><div class='del'>-	keep prompting user for a valid password until it either</div><div class='del'>-	authenticates or until Canceled by the user.</div><div class='del'>-	(camel_imap_command_extended): Improved speed (replaced the</div><div class='del'>-	g_strjoinv call with a faster implementation)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c </div><div class='del'>-	(camel_pop3_command_get_additional_data): Fixed.</div><div class='del'>-	(pop3_connect): Changed to keep prompting the user for a</div><div class='del'>-	password until it either works or until Canceled by the user.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: General cleanup</div><div class='del'>-	(camel_mbox_summary_sync): Fixed a memory leak and added</div><div class='del'>-	CamelException handling.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (delete_folder): Fixed a </div><div class='del'>-	memory leak</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): </div><div class='del'>-	Default 'off_t seek' to -1 so as to make sure it's initialized</div><div class='del'>-	before it's used in the case of a bad stat() call.</div><div class='del'>-	(mbox_sync): Updated</div><div class='del'>-	(mbox_expunge): Updated</div><div class='del'>-</div><div class='del'>-2000-06-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Move the </div><div class='del'>-	CAPABILITY command here so we don't have to keep checking</div><div class='del'>-	each time we open a folder.</div><div class='del'>-	(camel_imap_command_extended): If we are doing an EXAMINE,</div><div class='del'>-	don't bother doing a SELECT first.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Update so</div><div class='del'>-	folder-&gt;has_search_capability depends on the parent IMAP store</div><div class='del'>-	(since this is really dependant on the IMAP implementation and</div><div class='del'>-	not the folder)</div><div class='del'>-</div><div class='del'>-2000-06-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Don't close the filter</div><div class='del'>-	stream when done with it (this causes the source stream to close);</div><div class='del'>-	Instead, just flush it when done.</div><div class='del'>-</div><div class='del'>-2000-06-27  Michael Zucchi  &lt;zucchi@zedzone.mmc.com.au&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): Make header</div><div class='del'>-	search 'to' match 'to', and not 'from', small typo, fixes #317.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Added debugging</div><div class='del'>-	information.</div><div class='del'>-</div><div class='del'>-2000-06-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: </div><div class='del'>-	* providers/imap/camel-imap-folder.c: Improved folder parsing.</div><div class='del'>-	Not specifying a namespace should no longer list the entire</div><div class='del'>-	filesystem.</div><div class='del'>-</div><div class='del'>-2000-06-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/.cvsignore: ignore test-newsrc</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c,</div><div class='del'>-	providers/nntp/camel-nntp-store.h,</div><div class='del'>-	providers/nntp/camel-nntp-folder.c,</div><div class='del'>-	providers/nntp/camel-nntp-folder.h,</div><div class='del'>-	providers/nntp/camel-nntp-utils.c: Bring the nntp provider up to a</div><div class='del'>-	state where it builds and is usable with the current camel.  there</div><div class='del'>-	are still warts (semi-broken .newsrc file handling, and a lack of</div><div class='del'>-	a subscribe ui -- in fact no way to add a new server, really), but</div><div class='del'>-	it'll display news messages.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add</div><div class='del'>-	camel-nntp-newsrc.c</div><div class='del'>-	(libcamelnntpinclude_HEADERS): add camel-nntp-newsrc.h</div><div class='del'>-	also, add test-newsrc stuff.</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/test-newsrc.c: new file that tests the newsrc</div><div class='del'>-	stuff by parsing and regurgitating a .newsrc file for a particular</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c,</div><div class='del'>-	providers/nntp/camel-nntp-newsrc.h: new files, initial support for .newsrc files.</div><div class='del'>-</div><div class='del'>-2000-06-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_count): </div><div class='del'>-	Oops. Now appends the namespace to the folder before querying</div><div class='del'>-	for the number of messages.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): New</div><div class='del'>-	convenience function for use by imap_create().</div><div class='del'>-	(get_folder): If folder is specified as "/", we really want</div><div class='del'>-	"INBOX".</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c:</div><div class='del'>-	* providers/vee/camel-vee-provider.c:</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c:</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c:</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c:</div><div class='del'>-	* providers/imap/camel-imap-provider.c: Updated</div><div class='del'>-	</div><div class='del'>-	* camel-session.c: Moved service_cache hash table into the</div><div class='del'>-	providers.</div><div class='del'>-	(service_cache_remove): Updated.</div><div class='del'>-	(camel_session_get_service): Updated.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_hash): Took out the hashing of</div><div class='del'>-	url-&gt;passwd. We don't want this anymore.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Took out</div><div class='del'>-	references to 'namespace'</div><div class='del'>-	(camel_imap_folder_init): Same</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.h: No more namespace. We are</div><div class='del'>-	instead going to use url-&gt;path as the namespace.</div><div class='del'>-</div><div class='del'>-2000-06-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): Modified to</div><div class='del'>-	use the "namespace" (url-&gt;path) if it exists.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_delete_message_by_uid):</div><div class='del'>-	Now just sets the deleted flag on the summary rather than speaking </div><div class='del'>-	directly to the IMAP server. This is both faster and cleaner.</div><div class='del'>-</div><div class='del'>-2000-06-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): Fix dumb</div><div class='del'>-	bug.</div><div class='del'>-</div><div class='del'>-2000-06-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): </div><div class='del'>-	We are getting mail in IMAP now!! whoo-hoo!. Stripped out the </div><div class='del'>-	filtering so messages may have some dot-stuffing, but the </div><div class='del'>-	filtering can always be added back in later when we know it </div><div class='del'>-	works and isn't the problem.</div><div class='del'>-</div><div class='del'>-2000-06-21  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Use the basename</div><div class='del'>-	of the mailbox so we don't get pathnames like ~/evolution/inbox///movemail.ibex</div><div class='del'>-</div><div class='del'>-2000-06-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Set date_received</div><div class='del'>-	based on the first (most recent) "Received" header.</div><div class='del'>-</div><div class='del'>-2000-06-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): flush the filter stream</div><div class='del'>-	before unreffing it, so it will camel_mime_filter_complete.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (camel_stream_filter_class_init): Fix a</div><div class='del'>-	braino so camel_stream_flush works here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (stream_seek): Fix a bug that resulted in</div><div class='del'>-	large attachments being silently dropped.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c</div><div class='del'>-	(camel_pop3_command_get_additional_data): Don't use g_strjoinv</div><div class='del'>-	here, since it is O(n^2) on the length of the output string, and</div><div class='del'>-	we can do O(n).</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): add a CRLF decoder</div><div class='del'>-	after the QP/B64 decoder if it's text.</div><div class='del'>-</div><div class='del'>-2000-06-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Only</div><div class='del'>-	fetch the summary if the folder summary doesn't already exist.</div><div class='del'>-	When the summary *does* exist, start fetching from 1, not 0.</div><div class='del'>-	(imap_free_summary): Don't do anything here.</div><div class='del'>-	(imap_finalize): Free the summary here instead of in</div><div class='del'>-	imap_free_summary().</div><div class='del'>-	(imap_set_message_flags): Implemented</div><div class='del'>-	(imap_sync): Added code to set flags on messages that have had</div><div class='del'>-	their flags changed (however I #if'd it out until we are more</div><div class='del'>-	confidant in the IMAP code :)</div><div class='del'>-	(imap_summary_get_by_uid): Now parese flags correctly.</div><div class='del'>-	(imap_get_summary): Now parese flags correctly. Also correctly</div><div class='del'>-	parses the UID correctly.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (check_equal): No need to check s1 if s2 is NULL</div><div class='del'>-	(camel_url_equal): Don't check the passwd component of the url.</div><div class='del'>-</div><div class='del'>-2000-06-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_add): mark the</div><div class='del'>-	message info with CAMEL_MESSAGE_FOLDER_FLAGGED if we change the</div><div class='del'>-	uid, so the folder will know that it's dirty.</div><div class='del'>-</div><div class='del'>-2000-06-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended): </div><div class='del'>-	Now returns the last line of data that the server sends back as</div><div class='del'>-	well. This is needed for commands like SELECT (like Peter pointed</div><div class='del'>-	out).</div><div class='del'>-	(camel_imap_command): No longer checks for SELECT (no need)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Added namespace stuff</div><div class='del'>-	which we will need later on...</div><div class='del'>-	(imap_parse_subfolder_line): Convenience function for use in</div><div class='del'>-	get_subfolder_names()</div><div class='del'>-	(imap_get_subfolder_names): Updated. Also changed it to use LIST</div><div class='del'>-	instead of LSUB (temporary change).</div><div class='del'>-</div><div class='del'>-2000-06-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init): Set</div><div class='del'>-	summary equal to NULL.</div><div class='del'>-	(imap_get_summary): Store the summary in the ImapFolder</div><div class='del'>-	(imap_summary_get_by_uid): If we have a summary cache in the</div><div class='del'>-	ImapFolder, first check to see if that message info is in the</div><div class='del'>-	cached summary first, if not fetch it directly from the IMAP</div><div class='del'>-	server and append it to the summary cache.</div><div class='del'>-	(imap_get_message_flags): Don't free the message info that we get</div><div class='del'>-	back from summary_get_by_uid as we don't want to be corrupting our</div><div class='del'>-	cached summary.</div><div class='del'>-</div><div class='del'>-2000-06-19  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command{,_extended}): When</div><div class='del'>-	SELECT'ing a folder for an IMAP command, use _extended to grab the entire</div><div class='del'>-	response (before we just used camel_imap_command and missed the OK codes)</div><div class='del'>-</div><div class='del'>-2000-06-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_get_by_uid): </div><div class='del'>-	Now gets the message flags as it should.</div><div class='del'>-	(imap_get_summary): Same as imap_summary_get_by_uid</div><div class='del'>-	(imap_get_permanent_flags): Return the permanent flags stored</div><div class='del'>-	on the folder.</div><div class='del'>-	(imap_get_message_flags): Return message flags associated with</div><div class='del'>-	given uid. Note: we may want to somehow cache summary info so</div><div class='del'>-	that we don't have to keep querying the IMAP provider in</div><div class='del'>-	imap_summary_get_by_uid().</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_free_summary): We were</div><div class='del'>-	leaking memory - but not anymore!</div><div class='del'>-	(imap_get_summary): We now get the UIDs and the beginnings of the</div><div class='del'>-	code to get the message flags as well.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Don't copy newlines</div><div class='del'>-	into the parsed header text, and turn any number of tabs and</div><div class='del'>-	spaces after a newline into a single space.</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Should now</div><div class='del'>-	correctly do CAPABILITY.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Add some debugging printfs</div><div class='del'>-	when rebulding summary to help figure out why people's summaries</div><div class='del'>-	are always being rebuilt.</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	Began to implement, need to get information on how to</div><div class='del'>-	deconstruct @expression into an IMAP search expression and</div><div class='del'>-	parse the results.</div><div class='del'>-	(imap_init): Now queries the IMAP provider for CAPABILITY to</div><div class='del'>-	determine if SEARCH is implemented or not.</div><div class='del'>-</div><div class='del'>-	* providers/imap/imap.c: Removed - no longer a need to have</div><div class='del'>-	this as an example for anyone interesting to help mecode IMAP</div><div class='del'>-	support.</div><div class='del'>-	</div><div class='del'>-2000-06-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): Added code</div><div class='del'>-	to expunge if called for (still need to finish coding this).</div><div class='del'>-	(imap_get_uids): Implemented.</div><div class='del'>-	(imap_get_summary): Found a way to get the date</div><div class='del'>-	(imap_summary_get_by_uid): Same.</div><div class='del'>-	(imap_free_summary): Implemented.</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strstrcase): Fixed a compile warning</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Removed - we don't</div><div class='del'>-	need a CamelImapSummary structure.</div><div class='del'>-</div><div class='del'>-2000-06-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Move flag handling from CamelMimeMessage to CamelFolder. This</div><div class='del'>-	simplifies several flag-handling pieces of code in the mailer, and</div><div class='del'>-	lets you change a message's flags without having to fetch the</div><div class='del'>-	message body. It also means that fully-constructed</div><div class='del'>-	CamelMimeMessages are now essentially constant, which will help</div><div class='del'>-	simplify locking issues later since it means two threads</div><div class='del'>-	interested in the same message can just work with separate copies</div><div class='del'>-	of it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h (struct _CamelMimeMessage): Removed flags</div><div class='del'>-	and user_flags (moved to summary). Removed expunged and</div><div class='del'>-	message_number which were unused. Removed message_uid and folder</div><div class='del'>-	which are no longer needed in the new scheme.</div><div class='del'>-	(struct CamelMimeMessageClass): Removed message_changed signal and</div><div class='del'>-	get/set_message_number methods.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Updates for CamelMimeMessage changes.</div><div class='del'>-	(camel_mime_message_get/set_flags,</div><div class='del'>-	camel_mime_message_get/set_user_flag): Replaced with methods in</div><div class='del'>-	CamelFolder.</div><div class='del'>-	(camel_flag_get, camel_flag_set, camel_flag_list_size,</div><div class='del'>-	camel_flag_list_free): Moved verbatim to camel-folder-summary.c</div><div class='del'>-	</div><div class='del'>-	* camel-folder.c (camel_folder_get/set_message_flags,</div><div class='del'>-	camel_folder_get/set_message_user_flag): New methods (and</div><div class='del'>-	corresponding useless default implementations)</div><div class='del'>-	(camel_folder_class_init): add a message_changed signal</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_flag_get, camel_flag_set,</div><div class='del'>-	camel_flag_list_size, camel_flag_list_free): Moved here from</div><div class='del'>-	camel-mime-message.c</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Removed.</div><div class='del'>-	(mbox_get_message_flags, mbox_set_message_flags,</div><div class='del'>-	mbox_get_message_user_flag, mbox_set_message_user_flag): Tweak</div><div class='del'>-	summary bits as appropriate. (Functionality moved here from</div><div class='del'>-	message_changed.)</div><div class='del'>-	(mbox_get_message_by_uid): Update for CamelMimeMessage changes</div><div class='del'>-	(less stuff to initialize).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (message_changed): Remove</div><div class='del'>-	this. It was just copied from the mbox provider and doesn't deal</div><div class='del'>-	with the real IMAP flag stuff anyway. (So there's currently no</div><div class='del'>-	flag support in the IMAP provider.)</div><div class='del'>-	(imap_get_message_by_uid): Update for CamelMimeMessage changes.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c: (message_changed): Remove old</div><div class='del'>-	one. Add a new one to listen for message_changed on each folder</div><div class='del'>-	and re-emit message_changed signals that correspond to messages in</div><div class='del'>-	the vfolder.</div><div class='del'>-	(vee_get/set_message_flags, vee_get/set_message_user_flag): Proxy</div><div class='del'>-	flag setting to the underlying real messages.</div><div class='del'>-	(vee_append_message): Removed for now; there's no way to translate</div><div class='del'>-	this into the new CamelMimeMessage/CamelFolder scheme, but (a)</div><div class='del'>-	there's also no code which would ever call it and (b) we're</div><div class='del'>-	probably going want a better interface than append_message for</div><div class='del'>-	message drag and drop to work anyway. To be revisited.</div><div class='del'>-</div><div class='del'>-2000-06-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): </div><div class='del'>-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): </div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): </div><div class='del'>-	KLUDGE! Since neither ETable nor GtkHTML supports UTF-8 yet,</div><div class='del'>-	output ISO-8859-1 instead, so Ettore can read his Italian mail. :)</div><div class='del'>-	This will be reverted later.</div><div class='del'>-</div><div class='del'>-2000-06-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Started to </div><div class='del'>-	implement - may want to use ENVELOPE instead of BODY.PEEK[HEADER]</div><div class='del'>-	(imap_summary_get_by_uid): Started to code, I've got to find a way to </div><div class='del'>-	get the date in time_t format and also get the flags</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strstrcase): Added this convenience function - I</div><div class='del'>-	know about strcasestr() but it's not portable.</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c: Remove camel_service_connect_with_url. (URLs</div><div class='del'>-	must be specified when the service is requested from the session,</div><div class='del'>-	so that there can only ever be one service for any URL.)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: (camel_folder_open, camel_folder_is_open,</div><div class='del'>-	camel_folder_get_mode): Kill. Folders are now always open, and</div><div class='del'>-	handle "closing" sorts of operations at sync or finalize time.</div><div class='del'>-	(camel_folder_sync): renamed from camel_folder_close. Syncs state</div><div class='del'>-	to the store but doesn't necessarily close/disconnect.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Merge "open" methods into "init"</div><div class='del'>-	methods. Rename close to sync and update appropriately.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open</div><div class='del'>-	and camel_imap_store_close, which should not have been copied from</div><div class='del'>-	the POP provider (where the exist to work around limitations of</div><div class='del'>-	the POP protocol).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: fix a bug. (don't expunge</div><div class='del'>-	deleted messages if called with expunge == FALSE)</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): Check</div><div class='del'>-	server for various interesting extensions.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_uids): If the server</div><div class='del'>-	supports UIDL, use real UIDs rather than fake ones.</div><div class='del'>-	(etc): Map uids back to numbers appropriately</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to</div><div class='del'>-	previous change: make sure the "seek" variable ends up with the</div><div class='del'>-	value it should.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update</div><div class='del'>-	summary mtime as well as size.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): if the</div><div class='del'>-	mbox doesn't end with a '\n', write one before appending the new</div><div class='del'>-	message.</div><div class='del'>-</div><div class='del'>-2000-06-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Updated the encoder to allocate </div><div class='del'>-	more memory (since we are also now adding dots). Also updated the</div><div class='del'>-	decoder as we have found that it sometimes passes the end of the </div><div class='del'>-	buffer.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the</div><div class='del'>-	filter code (we already filter in </div><div class='del'>-	camel_pop3_command_get_additional_data)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (init): Updated: a separator is now a char* rather </div><div class='del'>-	than a single char because IMAP can have a string for a directory </div><div class='del'>-	separator. Also, since IMAP does not begin with a directory separator,</div><div class='del'>-	there is a new argument (path_begins_with_sep) which decides if a </div><div class='del'>-	directory should begin with a directory separator.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): Since, on connect,</div><div class='del'>-	Camel tries to create INBOX (which already exists on every IMAP </div><div class='del'>-	provider) we can return TRUE when the folder name is "INBOX".</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_init): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Renamed from camel_mbox_summary_expunge. Takes a gboolean saying</div><div class='del'>-	whether to expunge or just sync the mbox file. Change some</div><div class='del'>-	g_errors to g_warning so we don't abort. Make the quick</div><div class='del'>-	X-Evolution updating code lseek around correctly. Update the</div><div class='del'>-	mbox mtime in the summary file even in the quick case.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.h: make</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_NOXEV not conflict with</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_FLAGGED defined in camel-mime-message.h</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_close): call</div><div class='del'>-	camel_mbox_summary_sync to save flag state if not expunging.</div><div class='del'>-	(mbox_expunge): Update for camel_mbox_summary_expunge rename.</div><div class='del'>-</div><div class='del'>-2000-06-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_open): </div><div class='del'>-	(camel_imap_store_close): Added.</div><div class='del'>-	(camel_imap_command_extended): Fixed a segfault and updated</div><div class='del'>-	to use camel_imap_status()</div><div class='del'>-	(camel_imap_command): Updated to use camel_imap_status()</div><div class='del'>-	(camel_imap_status): New convenience function for parsing</div><div class='del'>-	the return status of an IMAP command</div><div class='del'>-</div><div class='del'>-2000-06-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): </div><div class='del'>-	Works like the POP fetch code, should work temporarily until</div><div class='del'>-	we get around to coding it the way it "Should Be".</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Now uses</div><div class='del'>-	the camel-mime-filter-crlf decoder when retrieving messages.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c: Deprecated.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Updated to use</div><div class='del'>-	camel-mime-filter-crlf with my 'dot' extension in place of</div><div class='del'>-	camel-mime-filter-smtp</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Updated to reflect changes</div><div class='del'>-	made to camel-mime-filter-crlf.c</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Modified to be able to</div><div class='del'>-	encode/decode dots ("\n.\n"&lt;-&gt;"\n..\n"). Also fixed the decoder</div><div class='del'>-	so that it should no longer get caught in an infinite loop.</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/*/Makefile.am: don't pass a second (incorrect) -rpath</div><div class='del'>-	in addition to the (correct) one automatically provided by</div><div class='del'>-	automake.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c: New filter to do CRLF&lt;-&gt;LF conversion.</div><div class='del'>-	(Currently only tested in the LF-&gt;CRLF direction.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): if content-type is text,</div><div class='del'>-	and it's QP or B64 encoded, pass through the CRLF filter before</div><div class='del'>-	the other filter to satisfy the "canonical encoding" rules in the</div><div class='del'>-	MIME spec.</div><div class='del'>-</div><div class='del'>-2000-06-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_query_authenticator): Add another</div><div class='del'>-	argument, "mode", which can be CAMEL_AUTHENTICATOR_ASK or</div><div class='del'>-	CAMEL_AUTHENTICATOR_TELL, so callers can get the app to un-cache</div><div class='del'>-	bad info.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): uncache the</div><div class='del'>-	password if it doesn't work.</div><div class='del'>-</div><div class='del'>-2000-06-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to reflect</div><div class='del'>-	changes made in camel-imap-store.c</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): No longer checks to</div><div class='del'>-	make sure a folder doesn't already exists (as this is no longer needed)</div><div class='del'>-	(camel_imap_command): Now takes a CamelFolder argument so it can detect</div><div class='del'>-	whether or not it needs to SELECT a folder or not</div><div class='del'>-	(camel_imap_command_extended): Same.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Will now always</div><div class='del'>-	send EHLO first, if that fails it will fall back on HELO.</div><div class='del'>-	(esmtp_get_authtypes): Should now correctly parse authtypes.</div><div class='del'>-</div><div class='del'>-2000-06-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Now builds (not that it's worth</div><div class='del'>-	much yet).</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Now uses the </div><div class='del'>-	correct cast to a CamelImapMessageInfo structure (should get rid of </div><div class='del'>-	compile warnings).</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Added rules to build </div><div class='del'>-	camel-imap-stream</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Update.</div><div class='del'>-	Moved imap_create here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (delete_messages): Remove.</div><div class='del'>-	(imap_create): Removed.</div><div class='del'>-	(imap_delete): Removed.</div><div class='del'>-	(imap_exists): Removed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.h: Added typedef's for the stream</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c: Modified to build cleanly</div><div class='del'>-</div><div class='del'>-2000-06-07  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_decode_internal): Properly</div><div class='del'>-	dereference warning/debug messages.</div><div class='del'>-	(header_references_decode): Check we actually have msgid stuff</div><div class='del'>-	before trying to decode it ...</div><div class='del'>-</div><div class='del'>-2000-06-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.[c,h]: Removed</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.[c,h]: Relocated to this</div><div class='del'>-	location</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Added</div><div class='del'>-</div><div class='del'>-2000-06-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exists, create, delete. A CamelFolder</div><div class='del'>-	now always references an existing folder. Remove delete_messages</div><div class='del'>-	too since it wasn't being used. Add a "create" flag to</div><div class='del'>-	get_subfolder saying whether or not to create the subfolder if it</div><div class='del'>-	doesn't yet exist.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Add a "create" flag to</div><div class='del'>-	say whether or not to create the folder if it doesn't yet exist.</div><div class='del'>-	(camel_store_delete_folder): New method, moved from CamelFolder.</div><div class='del'>-	(cache_folder, uncache_folder): Fix up a bit.</div><div class='del'>-	(get_folder_name): Explain what this is for.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	* providers/mbox/camel-mbox-store.c: Update. Remove support for</div><div class='del'>-	hierarchical folders to simplify this for now, since we're not</div><div class='del'>-	using it, and it's not completely clear how they should work in an</div><div class='del'>-	ELocalStorage world. Needs to be revisited.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (delete_messages): Remove.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (get_folder): Update.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (exists): Remove.</div><div class='del'>-	* providers/vee/camel-vee-store.c (vee_get_folder): Update.</div><div class='del'>-</div><div class='del'>-2000-06-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-*.[c,h]: Started on getting </div><div class='del'>-	imap to build cleanly (tho some work has not been completed</div><div class='del'>-	so it still won't build until camel-imap-summary is finished</div><div class='del'>-	along with a few methods in camel-imap-folder)</div><div class='del'>-</div><div class='del'>-	* camel-stream.[c,h]: Changed the read and write method prototypes</div><div class='del'>-	to return an ssize_t type rather than an int and also changed</div><div class='del'>-	the 'number of bytes' to read or write to a size_t type</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: same as above</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: again, same as above</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c: same</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.[c,h]: Added this new stream, cache's previously </div><div class='del'>-	read data so each successive call will instead read from the cache</div><div class='del'>-	</div><div class='del'>-2000-06-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_disposition): fix</div><div class='del'>-	typo/braino (set "Content-Disposition", not "Content-Description")</div><div class='del'>-	(camel_mime_part_set_filename): const poison</div><div class='del'>-</div><div class='del'>-2000-06-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step): Ick, damn signs!  Fix a</div><div class='del'>-	bug with sign extended bytes.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Changed layout/logic slightly</div><div class='del'>-	(to match From filter)</div><div class='del'>-</div><div class='del'>-2000-06-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Fixed the filter so that it </div><div class='del'>-	wouldn't insert garbage under certain conditions.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Don't ref the services in the cache.</div><div class='del'>-</div><div class='del'>-2000-06-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Rearanged where debug</div><div class='del'>-	fprintf statements we placed so that any data the server sends </div><div class='del'>-	back is printed out before an exception is set and the function</div><div class='del'>-	returns.</div><div class='del'>-</div><div class='del'>-2000-06-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): If we get a funny</div><div class='del'>-	result, just throw it out.  Basically a fix for the one true</div><div class='del'>-	broken TradeClient.</div><div class='del'>-</div><div class='del'>-2000-06-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_free): Free</div><div class='del'>-	references/messsage id.</div><div class='del'>-	(message_info_save): Save them.</div><div class='del'>-	(message_info_load): Load them.</div><div class='del'>-	(message_info_new): And get them from the new message.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped for new changes.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Added references and messageid to</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Ref and unref objects in the service cache</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* camel-store.c: Ref the folder when returning it using</div><div class='del'>-	lookup_folder.  Used the folder's full name for the key for the</div><div class='del'>-	folder cache since that's used to uncache it.</div><div class='del'>-</div><div class='del'>-2000-06-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fun with purify.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): free msg on</div><div class='del'>-	success as well as failure.</div><div class='del'>-	(camel_pop3_command_get_additional_data): free buf after reading</div><div class='del'>-	the last line (".").</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): free</div><div class='del'>-	body data after creating the memstream from it (which will copy</div><div class='del'>-	the data).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): free summary</div><div class='del'>-	and index paths.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (finalize): unref the stream, if it exists.</div><div class='del'>-</div><div class='del'>-2000-06-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): For a message part,</div><div class='del'>-	set the default content-type to message/rfc822.  Maybe needs to be</div><div class='del'>-	done for multiparts too?</div><div class='del'>-</div><div class='del'>-2000-05-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Typo in assersion.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Use a default type of</div><div class='del'>-	message/rfc822 for multipart/digest.  Bug Z192.</div><div class='del'>-	(folder_scan_drop_step): Remove warning.</div><div class='del'>-</div><div class='del'>-2000-05-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Init</div><div class='del'>-	filter_from to NULL, for exception case.</div><div class='del'>-	(mbox_get_message_by_uid): Cast off_t to long int for diagnostics.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_hash): Hash funciton for using camel</div><div class='del'>-	url's as hash keys.</div><div class='del'>-	(camel_url_equal): equal function for same.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_finalise): Free cached services.</div><div class='del'>-	(camel_session_init): Init service cache.</div><div class='del'>-	(service_cache_remove): destroy callback to remove a service from</div><div class='del'>-	the cache.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (get_folder_internal): Remove the extra ref of the</div><div class='del'>-	folder.  That seems the right behaviour ...?</div><div class='del'>-	(camel_store_get_type): Doh, actually call store init, so the</div><div class='del'>-	cache works.</div><div class='del'>-	(cache_folder): strdup the folder name!  no wonder it never found</div><div class='del'>-	it again.</div><div class='del'>-</div><div class='del'>-2000-05-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Implemented a few more</div><div class='del'>-	methods like imap_append and 1 or 2 others</div><div class='del'>-</div><div class='del'>-2000-05-29  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Move it to here.  If this</div><div class='del'>-	level is going to maintain it, it should set it up.  Lets see what</div><div class='del'>-	caching folders breaks :(</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont</div><div class='del'>-	init folder cache here.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_expunge): Make sure we copy messages which are</div><div class='del'>-	still intact to the new folder.</div><div class='del'>-	(camel_mbox_summary_expunge): Update the frompos as well when</div><div class='del'>-	moving the content.</div><div class='del'>-	(camel_mbox_summary_expunge): Remove some debug, and dont offset</div><div class='del'>-	frompos?</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the</div><div class='del'>-	searched folder is open before trying to search it.</div><div class='del'>-	(message_changed): Track changes to the source message in the</div><div class='del'>-	summary.</div><div class='del'>-	(folder_changed): Track folder changes, re-query the folder that</div><div class='del'>-	changed, and cascade the changed event as well.</div><div class='del'>-	(camel_vee_folder_finalise): Free subfolder and subfolder summary.</div><div class='del'>-</div><div class='del'>-2000-05-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Fix up some glib</div><div class='del'>-	precondition stuff. Try to set the URL in camel_service_new before</div><div class='del'>-	checking whether or not it's "empty" so that you can successfully</div><div class='del'>-	set "sendmail:" as a URL.</div><div class='del'>-</div><div class='del'>-2000-05-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add a domain field to CamelProvider, to say</div><div class='del'>-	what kind of data it provides.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: </div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: </div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: </div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Set domain to "mail".</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: Set domain to "news".</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-provider.c: Set domain to "vfolder". (So</div><div class='del'>-	it doesn't end up being listed as a potential mail source in the</div><div class='del'>-	mail config wizard.)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Split apart password and APOP</div><div class='del'>-	auth, since some servers seem to do both, but don't really.</div><div class='del'>-	(connect_to_server): Renamed from try_connect. Now actually does</div><div class='del'>-	the connection up to the point of checking the greeting for APOP</div><div class='del'>-	support.</div><div class='del'>-	(query_auth_types): Return APOP, if appropriate. Call</div><div class='del'>-	pop3_disconnect after connect_to_server since we don't really want</div><div class='del'>-	to be connected.</div><div class='del'>-	(pop3_connect): Use connect_to_server rather than duplicating</div><div class='del'>-	code. Fix a one-byte buffer overrun in the APOP code.</div><div class='del'>-	(pop3_disconnect): Make this able to clean up after a partial</div><div class='del'>-	connect.</div><div class='del'>-	(connect_to_server): Remove port number from error message since</div><div class='del'>-	it's not terribly useful and we were getting it from the wrong</div><div class='del'>-	place anyway.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): Use</div><div class='del'>-	`foo@bar' rather than `"" &lt;foo@bar&gt;' for email addresses with no</div><div class='del'>-	name component.</div><div class='del'>-</div><div class='del'>-2000-05-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Removed </div><div class='del'>-	camel_imap_command_get_additional_data() as it was</div><div class='del'>-	completely useless, replaced with </div><div class='del'>-	camel_imap_command_extended() which may eventually replace</div><div class='del'>-	camel_imap_command() as well.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Modified to reflect</div><div class='del'>-	changes made to camel-imap-store.c</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Wrote the first of many</div><div class='del'>-	methods: camel_imap_init(), imap_open(), imap_expunge(), </div><div class='del'>-	imap_get_message_count(), and imap_get_subfolder_names()</div><div class='del'>-</div><div class='del'>-2000-05-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (camel_multipart_init): Don't set a default</div><div class='del'>-	boundary. Require the caller to do that.</div><div class='del'>-	(set_boundary): if boundary is NULL, generate a "random" boundary.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Add a call to</div><div class='del'>-	camel_multipart_set_boundary after creating a new multipart.</div><div class='del'>-</div><div class='del'>-2000-05-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_connect): Removed</div><div class='del'>-	Exception code - Pop doesn't seem to set exceptions</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Initial code, mostly</div><div class='del'>-	just a template for future code</div><div class='del'>-</div><div class='del'>-	* providers/imap/imap.[c,h]: Source code from my personal</div><div class='del'>-	mailer - for reference only!</div><div class='del'>-</div><div class='del'>-2000-05-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Replace simple</div><div class='del'>-	data wrapper here too, oops.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Removed</div><div class='del'>-	camel-simple-data-wrapper again.  Less code to maintain == better</div><div class='del'>-	code.</div><div class='del'>-	</div><div class='del'>-	* camel-data-wrapper.c (construct_from_stream): Fixes for bug</div><div class='del'>-	where text attachments dont work.  Made data-wrapper concrete for</div><div class='del'>-	the second time.</div><div class='del'>-</div><div class='del'>-2000-05-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder):</div><div class='del'>-	Update the vfolder details for a single folder.</div><div class='del'>-</div><div class='del'>-2000-05-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Took out code</div><div class='del'>-	that had been there to reconnect to the server if it was not</div><div class='del'>-	already connected - Mailer code was fixed so that this should not</div><div class='del'>-	be needed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.[c,h]: Initial code.</div><div class='del'>-</div><div class='del'>-2000-05-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Re-add camel-simple-data-wrapper.h, which was removed</div><div class='del'>-	for some reason.</div><div class='del'>-</div><div class='del'>-2000-05-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.[c,h]: Moved global</div><div class='del'>-	variables into struct CamelSmtpTransport to make SMTP</div><div class='del'>-	thread-safe</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-*.h: Stolen from Mbox. Rough structure</div><div class='del'>-	for Imap.</div><div class='del'>-	</div><div class='del'>-2000-05-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap: Added some initial code to the camel tree</div><div class='del'>-	for IMAPv4</div><div class='del'>-</div><div class='del'>-	* providers/imap/.cvsignore: Added to repository</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Added debug fprintf's</div><div class='del'>-	so that testers can provide more information. Tested with simple</div><div class='del'>-	messages and a reply to the hello@helixcode.com default message</div><div class='del'>-	but should really be tested more.</div><div class='del'>-	(smtp_data): Fixed to use data_wrapper_write_to_stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Modified to escape all lines</div><div class='del'>-	beginning with a '.' and to place a \r before each \n if one did</div><div class='del'>-	not previously exist. Removed code to escape "From " as it was</div><div class='del'>-	found to not be needed for SMTP.</div><div class='del'>-</div><div class='del'>-2000-05-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Fixed the </div><div class='del'>-	filtered stream. Fixes for stream changes, updated to use </div><div class='del'>-	camel-mime-filter-smtp.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-filter-smtp.c</div><div class='del'>-	</div><div class='del'>-	* camel-mime-filter-smtp.[c,h]: Added to camel tree</div><div class='del'>-	Smtp filter used to change \n into \r\n, escape lone dots,</div><div class='del'>-	and escape "From "'s.</div><div class='del'>-</div><div class='del'>-2000-05-19  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_stream): If we</div><div class='del'>-	already have been constructed, unref our content.</div><div class='del'>-	(write_to_stream): Check we've been constructued, and change for</div><div class='del'>-	stream api changes.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Removed exception stuff.</div><div class='del'>-</div><div class='del'>-	* md5-utils.c (md5_get_digest_from_stream): repaired.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Remove exception from write_to_stream, and</div><div class='del'>-	fix, and fix formatting.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	Fix for stream changes.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes</div><div class='del'>-	for stream changes.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c, and elsewhere, fix all</div><div class='del'>-	stream api changes.</div><div class='del'>-	(mbox_append_message): Use stream_close() now its back.</div><div class='del'>-	(mbox_append_message): unref the from filter.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: And here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.[ch]: Here too.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c: Likewise.  This is getting tedious.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (stream_write): Fix a few little problems.</div><div class='del'>-	(stream_close): Reimplement.</div><div class='del'>-	(camel_stream_buffer_read_line): Slightly more efficient version,</div><div class='del'>-	that also only allocates the right amount of memory for strings.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.[ch]: Remove exceptions, fix formatting,</div><div class='del'>-	changes for stream (re)fixes.  set_bounds returns an error.</div><div class='del'>-</div><div class='del'>-	* camel-stream.[ch]: Remove exceptions.  Make flush and reset return</div><div class='del'>-	an error code, repair all the screwed up formatting, and put back</div><div class='del'>-	close.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): And here.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): And this too.</div><div class='del'>-	(write_to_stream): Fixed for stream changes.</div><div class='del'>-</div><div class='del'>-	* camel.h: Fixed.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):</div><div class='del'>-	Implement.  Performs an intersection of the two searches.</div><div class='del'>-	(camel_vee_folder_finalise): Unref search folders.</div><div class='del'>-	(vee_append_message): Implement append.</div><div class='del'>-</div><div class='del'>-2000-05-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: remove message_number_capability and require uid</div><div class='del'>-	capatibility.</div><div class='del'>-	(camel_folder_list_subfolders, camel_folder_get_uid_list,</div><div class='del'>-	camel_folder_get_subfolder_info, camel_folder_get_message_info):</div><div class='del'>-	removed</div><div class='del'>-	(camel_folder_get_subfolder_names,</div><div class='del'>-	camel_folder_free_subfolder_names): new subfolder interfaces.</div><div class='del'>-	(camel_folder_get_uids, camel_folder_free_uids): new uid</div><div class='del'>-	interfaces</div><div class='del'>-	(camel_folder_get_summary, camel_folder_free_summary): new summary</div><div class='del'>-	interfaces</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c,</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Update for changes</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Implement get_uids, update</div><div class='del'>-	for other changes.</div><div class='del'>-</div><div class='del'>-2000-05-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Guess!</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_user_flag): Implement user_flag</div><div class='del'>-	search term.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Added user_flag search capability</div><div class='del'>-	(user-flag "blah")</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Set USER flag in</div><div class='del'>-	permanent flags for the folder.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove unused async open/close and</div><div class='del'>-	copy_message_to functions.</div><div class='del'>-	Rename functions without initial _. Fix glib preconditions and</div><div class='del'>-	gtk-doc comments.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c: remove get/set_output_stream operations.</div><div class='del'>-	They're redundant with write_to_stream, and CamelMimePart and</div><div class='del'>-	CamelMimeMessage only implement the latter, meaning that trying to</div><div class='del'>-	get_output_stream on a CamelMimeMessage that was built from pieces</div><div class='del'>-	rather than being parsed from a stream doesn't work. Anything that</div><div class='del'>-	uses get_output_stream can be rewritten to use write_to_stream, so</div><div class='del'>-	we'll standardize on that.</div><div class='del'>-	(camel_data_wrapper_new): remove this: CamelDataWrapper is</div><div class='del'>-	supposed to be an abstract class.</div><div class='del'>-	(write_to_stream): remove default implementation. (Moved to</div><div class='del'>-	CamelSimpleDataWrapper)</div><div class='del'>-	</div><div class='del'>-	* camel-simple-data-wrapper.c: resurrect, although it's not really</div><div class='del'>-	the same thing it was before. A simple data wrapper, which is</div><div class='del'>-	backed by a CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Use</div><div class='del'>-	construct_from_stream rather than set_output_stream.</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Change</div><div class='del'>-	camel_data_wrapper_new to camel_simple_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): Change</div><div class='del'>-	camel_data_wrapper_new to camel_simple_data_wrapper_new.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-05-17  Darin Adler  &lt;darin@eazel.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: (message_info_load):</div><div class='del'>-	Quick fix to get it to compile. I hope I don't get into trouble.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Don't include the no-longer-distributed</div><div class='del'>-	possibly-to-be-removed headers.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(smtp_get_email_addr_from_text): fix an off-by-one error in</div><div class='del'>-	address parsing</div><div class='del'>-	(smtp_data): use camel_data_wrapper_get_output_stream rather than</div><div class='del'>-	data_wrapper-&gt;output_stream</div><div class='del'>-</div><div class='del'>-2000-05-17  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Snoop</div><div class='del'>-	changes to user flags on the message into the summary as well.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_init):</div><div class='del'>-	Changed version init to include the parent class version info</div><div class='del'>-	(i.e. add it not overwrite it).</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Initialise user_flags</div><div class='del'>-	to empty.</div><div class='del'>-	(message_info_load): And load user flags.</div><div class='del'>-	(message_info_save): And save user flags.</div><div class='del'>-	(message_info_free): And free them.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Added user-flags to summary.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_user_flag): Dont</div><div class='del'>-	use a hashtable for user flags.</div><div class='del'>-	(camel_mime_message_get_user_flag): And changed here too.</div><div class='del'>-	(camel_flag_get): New interface to get a flag from a flag</div><div class='del'>-	list.  Flag lists are easier to work with than hash tables, and</div><div class='del'>-	save memory too.</div><div class='del'>-	(camel_flag_set): And set.</div><div class='del'>-	(camel_flag_list_free): And free.</div><div class='del'>-	(free_key_only): Discard.</div><div class='del'>-	(finalize): Remove the flag list.</div><div class='del'>-</div><div class='del'>-2000-05-17  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): Error</div><div class='del'>-	checking on gethostbyaddr() eliminating a possible segfault.</div><div class='del'>-</div><div class='del'>-2000-05-16  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message_by_uid):</div><div class='del'>-	Implement.</div><div class='del'>-</div><div class='del'>-2000-05-12  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (camel_movemail): Open the destination with</div><div class='del'>-	O_APPEND, so we dont blow away a partially transferred mbox.</div><div class='del'>-	(camel_movemail): Loop if we get errno=INTR, and not fail.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update</div><div class='del'>-	the summarised file size, if everything went ok.</div><div class='del'>-	(camel_mbox_summary_expunge): Clear header flags after updating.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.h:</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: </div><div class='del'>-	* providers/nntp/camel-nntp-store.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.h: </div><div class='del'>-	get things working with new camel summary stuff.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-summary.c: </div><div class='del'>-	* providers/nntp/camel-nntp-summary.h: </div><div class='del'>-	removed files since camel-folder-summary does all we need.</div><div class='del'>-</div><div class='del'>-2000-05-15  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Added some preliminary</div><div class='del'>-	AUTH support.</div><div class='del'>-</div><div class='del'>-2000-05-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Remove camel_folder_get_summary, which no longer</div><div class='del'>-	exists.</div><div class='del'>-</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove some cruft that we're not currently using.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): Change</div><div class='del'>-	to match prototype (size_t vs unsigned int) so it works on 64-bit</div><div class='del'>-	machines. Noted by msw.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Indicate</div><div class='del'>-	the summary changed also.</div><div class='del'>-</div><div class='del'>-2000-05-11  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): </div><div class='del'>-	Updated to more closely comply with RFC 821 standards</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Unref the filter after</div><div class='del'>-	adding it to the filtering stream.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_finalise): Free the folder path.</div><div class='del'>-	(camel_mbox_summary_update): Also save summary when done.</div><div class='del'>-	(camel_mbox_summary_expunge): Unindex items when deleting them.</div><div class='del'>-	(camel_mbox_summary_expunge): Save the index as well as the</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Free the</div><div class='del'>-	summary path.</div><div class='del'>-	(camel_folder_summary_touch): New function, indicate the summary</div><div class='del'>-	info changed.</div><div class='del'>-	(camel_folder_summary_remove): Dirty here.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_decode): Free multiple entry</div><div class='del'>-	addresses properly.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Plugged another</div><div class='del'>-	memleak, free text after converting it.</div><div class='del'>-	(header_decode_addrspec): More leaks plugged.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (finalize): Free message_uid.</div><div class='del'>-	(finalize): Free the recipients hashtable.</div><div class='del'>-</div><div class='del'>-2000-05-11    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Free</div><div class='del'>-	summary items and charset filters.</div><div class='del'>-</div><div class='del'>-2000-05-10    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Don't</div><div class='del'>-	free stuff in p, after we've free'd p.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref</div><div class='del'>-	the stream we created for appending.</div><div class='del'>-</div><div class='del'>-2000-05-10  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (camel_smtp_transport_class_init):</div><div class='del'>-	Added initialization for service_class</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (write_to_stream): fix a stupid typo. Thank</div><div class='del'>-	you, C.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): don't ref the stream before</div><div class='del'>-	wrapper a filter around it, since nothing will ever unref it.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and</div><div class='del'>-	camel-thread-proxy.h.</div><div class='del'>-</div><div class='del'>-2000-05-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	Bleah. Can't fsync a pipe. As a quick kludge, just don't</div><div class='del'>-	stream_flush it. The right fix will require bringing back</div><div class='del'>-	stream_close though.</div><div class='del'>-</div><div class='del'>-2000-05-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-	* camel-internet-address.[c,h]: Undid my changes (moved</div><div class='del'>-	struct _address back into came-internet-address.c)</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (_send): changed</div><div class='del'>-	from using it's own address manipulation (using struct _address)</div><div class='del'>-	to using camel_internet_address_get(). Also some format changes</div><div class='del'>-	to keep consistant with the rest of Camel</div><div class='del'>-</div><div class='del'>-2000-05-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.[c,h]: Moved struct _address from</div><div class='del'>-	camel-internet-address.c to camel-internet-address.h</div><div class='del'>-	(hopefully this doesn't break anything...)</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (_send): now</div><div class='del'>-	populates the recipient list with To, Cc, and Bcc addresses.</div><div class='del'>-	Should now be able to use this module.</div><div class='del'>-</div><div class='del'>-2000-05-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):</div><div class='del'>-	one more refcounting fix I missed before.</div><div class='del'>-</div><div class='del'>-2000-05-08  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: no longer frees memory it</div><div class='del'>-	shouldn't, updated to reflect camel-stream changes involving</div><div class='del'>-	CamelException (perhaps it should use a different CamelException</div><div class='del'>-	variable than is passed to the camel smtp module?)</div><div class='del'>-</div><div class='del'>-2000-05-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (camel_stream_read, camel_stream_write,</div><div class='del'>-	camel_stream_flush, camel_stream_reset, camel_stream_printf,</div><div class='del'>-	camel_stream_write_to_stream): Use CamelException to signal</div><div class='del'>-	failure.</div><div class='del'>-	(camel_stream_write_strings): Remove. camel_stream_printf is more</div><div class='del'>-	useful in most of the places that used this.</div><div class='del'>-	(camel_stream_write_string): Change from macro to function to</div><div class='del'>-	prevent problems with double-evaluation.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (camel_seekable_stream_seek,</div><div class='del'>-	camel_seekable_stream_set_bounds): Use CamelException.</div><div class='del'>-	(reset): Update.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c, camel-stream-buffer.c,</div><div class='del'>-	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:</div><div class='del'>-	Update.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Remove the virtual init functions and move</div><div class='del'>-	the code into the creator functions. Add CamelExceptions to</div><div class='del'>-	creation functions that could fail.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use</div><div class='del'>-	CamelException.</div><div class='del'>-	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c</div><div class='del'>-	(write_to_stream): Update.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: add an exception to the mime parser private</div><div class='del'>-	data and pass that to stream functions as needed.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c, md5-utils.c: Update (badly) for stream</div><div class='del'>-	changes.</div><div class='del'>-	</div><div class='del'>-	* camel-exception.h (camel_exception_is_set): convenience macro.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: disable SMTP for now</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass</div><div class='del'>-	CamelException to the functions that now need it. Check the</div><div class='del'>-	exception after calling camel_stream_flush, and fail if it fails.</div><div class='del'>-	(mbox_get_message_by_uid): More updates.</div><div class='del'>-</div><div class='del'>-	* providers/pop/camel-pop3-folder.c,</div><div class='del'>-	providers/pop/camel-pop3-store.c,</div><div class='del'>-	providers/sendmail/camel-sendmail/transport.c: Update.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-05-08  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Format From and Reply-To</div><div class='del'>-	to at least a decoded string.  Should probably store them as an</div><div class='del'>-	camelinternetaddress.</div><div class='del'>-</div><div class='del'>-	* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):</div><div class='del'>-	Return status.</div><div class='del'>-	(camel_mbox_summary_expunge): Force an update of the summary</div><div class='del'>-	before we do anything.</div><div class='del'>-	(camel_mbox_summary_expunge): Build new xev line in xevnew, and</div><div class='del'>-	free that, and consify xev.</div><div class='del'>-	(camel_mbox_summary_load): If we are rebuilding from scratch, make</div><div class='del'>-	sure we clear the summary content.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_close): We NEED a stream close.</div><div class='del'>-</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Make camel not leak like a sieve.</div><div class='del'>-</div><div class='del'>-	* camel-object.c: New subclass of GtkObject which is now the base</div><div class='del'>-	of the Camel object hierarchy. Currently the only difference</div><div class='del'>-	between CamelObject and GtkObject is that CamelObjects don't start</div><div class='del'>-	out floating.</div><div class='del'>-</div><div class='del'>-	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on</div><div class='del'>-	using &lt;camel/foo.h&gt; in header files rather than &lt;foo.h&gt;, "foo.h",</div><div class='del'>-	or "camel/foo.h". Remove some unneeded includes.</div><div class='del'>-</div><div class='del'>-	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,</div><div class='del'>-	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,</div><div class='del'>-	camel-mime-parser.c, camel-service.c, camel-session.c,</div><div class='del'>-	camel-stream.c: These are now subclasses of CamelObject.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (set_output_stream):</div><div class='del'>-	* camel-medium.c (set_content_object):</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(init_with_seekable_stream_and_bounds):</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid): </div><div class='del'>-	remove gtk_object_sink calls.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (init_vbuf): </div><div class='del'>-	* camel-stream-filter.c (camel_stream_filter_new_with_stream):</div><div class='del'>-	ref the original stream.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): unref</div><div class='del'>-	the filters when finalizing.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser,</div><div class='del'>-	camel_mime_part_construct_content_from_parser):</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): Unref objects</div><div class='del'>-	that are created only to be handed off to other objects. If</div><div class='del'>-	they're going to be needed later, they will have been additionally</div><div class='del'>-	ref'ed by the object that needs them.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	unref the message stream after creating the data from it.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,</div><div class='del'>-	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,</div><div class='del'>-	since its semantics are dubious (what happens when you close a</div><div class='del'>-	stream other people still have references on?).</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c:</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c:</div><div class='del'>-	* providers/pop3/camel-pop3-store.c:</div><div class='del'>-	replace camel_stream_close calls with gtk_object_unref.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c:</div><div class='del'>-	replace camel_stream_close with camel_stream_flush +</div><div class='del'>-	gtk_object_unref</div><div class='del'>-</div><div class='del'>-2000-05-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): A machine</div><div class='del'>-	which serves neither POP nor KPOP is not a POP server.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Note in the description</div><div class='del'>-	that this provider is not yet tested.</div><div class='del'>-</div><div class='del'>-2000-05-08    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Free the filter stream when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_seek): Make sure we add the \n</div><div class='del'>-	terminal when we seek as well (frob!).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_addrspec): Plug minor memleak.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (finalize): Free header tables once finished.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_remove): Dont try</div><div class='del'>-	to access info after its free'd.</div><div class='del'>-</div><div class='del'>-2000-05-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Apply encoding to content</div><div class='del'>-	part, when writing to a stream *sigh*.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_write): implement write for the</div><div class='del'>-	filtering stream.  Writes shouldn't be mixed with reads.</div><div class='del'>-	(do_flush): Implemented flush.  Again write/flush shouldn't be</div><div class='del'>-	mixed with reads.  Only flushes if the last op was write.</div><div class='del'>-	(do_close): Force flush on close.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c (filter_run): Oops, make sure we include the</div><div class='del'>-	backlen in the total length before passing onto the filter.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-from.c: New filter, munges 'From ' lines into</div><div class='del'>-	'&gt;From ', for mbox.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_header_remove): New</div><div class='del'>-	function to remove the parser's raw header, rather than</div><div class='del'>-	manipulating the header directly (wich doesn't work with</div><div class='del'>-	mempools).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_clear): Fixed some</div><div class='del'>-	broken(tm) logic, which would leak entries on multivalued lists.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	Use ibex_save() to save the ibex.  Makes a big difference to</div><div class='del'>-	startup times for very large mailboxes.</div><div class='del'>-	(camel_mbox_summary_expunge): Dum de dum, reimplemented.  Designed</div><div class='del'>-	to be much more robust, and to stop immediately if anything awry</div><div class='del'>-	happens.</div><div class='del'>-	(copy_block): Utility function to copy n bytes from one fd to</div><div class='del'>-	another.</div><div class='del'>-	(header_write): Utility function to write out raw headers to an</div><div class='del'>-	fd.</div><div class='del'>-	(camel_mbox_summary_update): Incremental summary updater.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):</div><div class='del'>-	Dont unref the stream, because of the broken(tm) ref model of gtk</div><div class='del'>-	widget that for some odd reason is being perpetuated in camel.	</div><div class='del'>-	(mbox_expunge): Reenable expunge again.</div><div class='del'>-	(mbox_append_message): Removed the optimised mbox append.  If its</div><div class='del'>-	an issue, it can go back later.  Cleaned up a lot, checks error</div><div class='del'>-	returns, and automagically translates 'From ' into '&gt;From' as</div><div class='del'>-	necessary.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c (filter_run): Oops, forgot to add the</div><div class='del'>-	backlen to the pre-buffer (*poof*).</div><div class='del'>-</div><div class='del'>-2000-05-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Allow</div><div class='del'>-	HSCAN_FROM_END to terminate the processing of a message.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (perform_content_info_load): Ick, dont</div><div class='del'>-	try and append a node onto its own list.</div><div class='del'>-	(camel_folder_summary_clear): Actually clear the indexes after</div><div class='del'>-	we've removed the messages.</div><div class='del'>-	(camel_folder_summary_clear): Set dirty if it changes.</div><div class='del'>-	(camel_folder_summary_load): Clear dirty.</div><div class='del'>-	(camel_folder_summary_save): Only save if dirty.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_header_load): Oops,</div><div class='del'>-	remember to call that parent class first ...</div><div class='del'>-	(summary_header_save): Here too.</div><div class='del'>-	(camel_mbox_summary_load): Do more checking to verify the index</div><div class='del'>-	contents as well as teh summary contents, against the mbox</div><div class='del'>-	contents.</div><div class='del'>-	(camel_mbox_summary_load): Removed some fo that checking, it needs</div><div class='del'>-	more code to work reliably.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	Set the size and mtime of the mbox we indexed once done.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_index): Dont</div><div class='del'>-	write the index if it changes - let the claler fix it (uh, kind of</div><div class='del'>-	impacts performance).</div><div class='del'>-	(camel_folder_summary_load): close in.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_format_string): Check header</div><div class='del'>-	exists before trying to strip its leading spaces.</div><div class='del'>-</div><div class='del'>-2000-05-06  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Removed summary info from here, and include</div><div class='del'>-	camel-folder-summary.h as well.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_step): Allow it to accept</div><div class='del'>-	a NULL databuffer.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Totally new file, now</div><div class='del'>-	subclasses camel-folder-summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_load): Load the uid as a</div><div class='del'>-	string.</div><div class='del'>-	(message_info_save): And save too.</div><div class='del'>-	(camel_folder_summary_clear): New function, clears the contents of</div><div class='del'>-	the summary.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Fixes for	summary changes.</div><div class='del'>-	(mbox_get_message_by_uid): Completely redone.  Now cross-checks</div><div class='del'>-	the summary information to make sure we get a real message.</div><div class='del'>-	(mbox_append_message): Disabled the copy version of append for</div><div class='del'>-	now.</div><div class='del'>-	(mbox_expunge): Temporarily disabled the expunge function, until</div><div class='del'>-	it is put back in camel-mbox-summary.c</div><div class='del'>-</div><div class='del'>-2000-05-05  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: And same here ...</div><div class='del'>-	(camel_folder_summary_encode_fixed_int32): Ugh, fwrite doesn't</div><div class='del'>-	return -1 on error ..</div><div class='del'>-	(camel_folder_summary_decode_fixed_int32): Neither deos fread.</div><div class='del'>-	(camel_folder_summary_encode_token): Fix here too.</div><div class='del'>-	(summary_build_content_info): Use start-headers to get the pos of</div><div class='del'>-	the message, not parser_tell(), which might not be what we</div><div class='del'>-	expected because of parser_unstep().</div><div class='del'>-	(camel_folder_summary_encode_token): Use bserch() to tokenise the</div><div class='del'>-	values, rather than a linear search.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Defined out some memory profiling stuff I</div><div class='del'>-	left there by mistake.</div><div class='del'>-	(header_decode_mailbox): Dont try to append the word part of a</div><div class='del'>-	local address if we ran out of words.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): Apply the fix from</div><div class='del'>-	the header scanner to here too.</div><div class='del'>-	(folder_scan_header): Only check for end of header if we have</div><div class='del'>-	space for it (didn't end the read with a newline)</div><div class='del'>-	(folder_scan_header): inptr is the only real thing we need</div><div class='del'>-	registerised for performance.  Try to help the compiler be smart</div><div class='del'>-	about it ..</div><div class='del'>-	(folder_scan_header): Simplified the save header case a tad.</div><div class='del'>-</div><div class='del'>-	Commented out some memory profiling stuff.</div><div class='del'>-</div><div class='del'>-2000-05-05    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.</div><div class='del'>-	(header_decode_text): Fixed memory leaks with g_string_append().</div><div class='del'>-	(header_encode_string): And here too, and a few other places.  The</div><div class='del'>-	glib api is so awful ...</div><div class='del'>-	(header_content_type_decode): More memory leaks.</div><div class='del'>-</div><div class='del'>-2000-05-05    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we</div><div class='del'>-	init the end of buffer sentinal!</div><div class='del'>-	(folder_scan_init_with_stream): And here too ...</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):</div><div class='del'>-	Maxcount is minimum of the max and the requested count, not the</div><div class='del'>-	maximum :)</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): Properly set midline,</div><div class='del'>-	so we dont falsely catch offset boundary markers (i.e. From inside</div><div class='del'>-	content).</div><div class='del'>-	(folder_read): Set a sentinal on the end of the read data (\n) so</div><div class='del'>-	we dont have to check the buffer boundary in the inner loop.</div><div class='del'>-	(mempool_*): New experimental memory management routines, speed</div><div class='del'>-	up simple structure parsing by about 25% ... not compiled in by</div><div class='del'>-	default.  Something similar may be needed for camel-mime-utils to</div><div class='del'>-	address performance issues with g_malloc and friends.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added a macro w(x) used to wrap all warnings</div><div class='del'>-	about mime/rfc violations, so they can be turned off.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): Step after</div><div class='del'>-	the end of a message ...</div><div class='del'>-	Turn into a stand-alone program for testing and profiling.</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Don't fall</div><div class='del'>-	back to plaintext passwords if APOP fails, since it should also</div><div class='del'>-	fail.</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_list_providers): New function to</div><div class='del'>-	replace camel_provider_scan. Returns a list of either (a) all</div><div class='del'>-	currently-loaded providers, or (b) all available providers.</div><div class='del'>-</div><div class='del'>-	* camel-url.[ch]: Add an "empty" flag to CamelURL (indicating that</div><div class='del'>-	it contains only a protocol).</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): Make this take</div><div class='del'>-	a CamelException (since it may have to try to connect to the</div><div class='del'>-	server, and it might not able to.)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: add KPOP (Kerberized POP)</div><div class='del'>-	support. This is mostly so I have two kinds of authmech to play</div><div class='del'>-	with instead of just one. (But it does actually work.)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types): update</div><div class='del'>-	for prototype change, but disable the functionality, since it</div><div class='del'>-	doesn't really support any auth types yet.</div><div class='del'>-	(camel_smtp_transport_get_type): add an object init function to</div><div class='del'>-	set the service url_flags.</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Yes, and anotherone.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Reverted a change wihtout a ChangeLog entry.</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[hc]: Yes, CamelFolderSummary is back ...</div><div class='del'>-	... re-usable class to summarise and index any stream or message</div><div class='del'>-	and to manage/load/save the created summaries.</div><div class='del'>-	</div><div class='del'>-	* camel-folder.c: Include string.h to kill a warning.</div><div class='del'>-</div><div class='del'>-2000-05-03  Jason Leach  &lt;leach@wam.umd.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,</div><div class='del'>-	people who installed libunicde in non-standard include paths need</div><div class='del'>-	this.</div><div class='del'>-</div><div class='del'>-2000-05-03  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Added pos/bodypos/endpos to the basic message</div><div class='del'>-	content info object.  Size to be removed?  Moved the</div><div class='del'>-	messageconentinfo and messageinfo back to camel-folder-summary.h.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.c (camel_mime_filter_index_set_ibex):</div><div class='del'>-	New function to (re)set the index to use on a filter.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_scan_from): Whole bunch</div><div class='del'>-	of inline docs.</div><div class='del'>-	(camel_mime_parser_drop_step): New function to drop a state from</div><div class='del'>-	the parser.  Needs more testing.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is</div><div class='del'>-	-1, then dont try and convert (crashes unicode_iconv?).</div><div class='del'>-	(rfc2047_decode_word): Use alloca for variables instead of</div><div class='del'>-	g_malloc - by the rfc they should always be short.</div><div class='del'>-	(rfc2047_decode_word): If we can't do the charset conversion, undo</div><div class='del'>-	the quoted-printable/base64 at least?  Should probably convert</div><div class='del'>-	unknown characters to the utf-8 unknown character.</div><div class='del'>-</div><div class='del'>-2000-05-02  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): fix typo when</div><div class='del'>-	dereferencing saveoffset.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: Added some header doco.</div><div class='del'>-</div><div class='del'>-	* camel.h: REmove gmime-utils.h from here.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.[ch]: Removed.  Functionally</div><div class='del'>-	redundant.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):</div><div class='del'>-	Use the new CamelFolderSearch class to do the actual searching,</div><div class='del'>-	just setup the search here.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.[ch]: A helper class that providers may</div><div class='del'>-	subclass to provide their own search functionality, or they can</div><div class='del'>-	simply use as is, it supports body searches if an ibex is</div><div class='del'>-	supplied, and header searches if a summary is supplied.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* providers/MH/Makefile.am: same.</div><div class='del'>-	* providers/maildir/Makefile.am: same.</div><div class='del'>-	* providers/mbox/Makefile.am: same.</div><div class='del'>-	* providers/nntp/Makefile.am: same.</div><div class='del'>-	* providers/pop3/Makefile.am: same.</div><div class='del'>-	* providers/sendmail/Makefile.am: same.	</div><div class='del'>-	* providers/smtp/Makefile.am: same.		</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Dont store/remove</div><div class='del'>-	current search from the search list.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h: Removed searches list,</div><div class='del'>-	searches are all sync now.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.[ch]: What the hell, remove it.  This will break the</div><div class='del'>-	nntp provider.  The mime parser can be used instead though.</div><div class='del'>-	Removed from all code including it (but none were using it).</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): Removed bizarre</div><div class='del'>-	string_dichotomy version of this.  This code is somewhat redundant</div><div class='del'>-	now, and is headed for death anyway.</div><div class='del'>-</div><div class='del'>-	* gstring-util.c (g_string_dichotomy): Same with this one.</div><div class='del'>-	(g_string_clone): Removed a memory leak, g_string_new() allocates</div><div class='del'>-	its own memory.</div><div class='del'>-	(g_string_append_g_string): Allow to append an empty gstring onto</div><div class='del'>-	another gstring, dont abort()!</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_dichotomy): Removed this incredibly weird</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_create): Replaced the rather obtuse use of</div><div class='del'>-	"string_dichotomy" function with a simple strrchr().  Still not</div><div class='del'>-	sure it'll work.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: cvs removed a long-removed file.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Fix the previous</div><div class='del'>-	overflow problem properly (can happen in 2 places).</div><div class='del'>-	(header_append): A new macro to include the code changed above, so</div><div class='del'>-	it only appears in one place.</div><div class='del'>-	(folder_scan_step): Change the content type to text/plain if the</div><div class='del'>-	multipart is broken.  Doesn't actually change the header though.</div><div class='del'>-	(header_append): Also move the header-start tracking stuff here.</div><div class='del'>-	Could be a static function to save code.</div><div class='del'>-</div><div class='del'>-2000-05-02    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Dont use autofill on</div><div class='del'>-	these fucking long function anmes!!!!!!</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_expunge): Fix the offset for the summary when</div><div class='del'>-	an item is expunged to take account of the From line.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h (CamelMboxFolder): Removed</div><div class='del'>-	search_id.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_cancel): Remove.d</div><div class='del'>-	(camel_mbox_folder_search_complete): Removed.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Changed back to sync</div><div class='del'>-	api.</div><div class='del'>-	(struct _searchcontext): Removed cancelled flag.</div><div class='del'>-	(find_context): Removed.</div><div class='del'>-	(func_header_contains): Debug out some search stuff.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.h</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Moved back to sync api.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_set_flags_by_uid): New function to update the</div><div class='del'>-	flags in the summary.</div><div class='del'>-	(camel_mbox_summary_expunge): Expunge messages from a folder.</div><div class='del'>-	(offset_content): Re-align offsets of summary when messages</div><div class='del'>-	added/removed to an existing summary.</div><div class='del'>-	(camel_mbox_summary_remove_uid): Remove a message summary entry by</div><div class='del'>-	uid.</div><div class='del'>-	(index_folder): Restore flags from X-Evolution header, if they are set.</div><div class='del'>-	(index_folder): Make sure we index using a decimal uid, since</div><div class='del'>-	thats what everything else indexes off (oops).</div><div class='del'>-	Upped SUMMARY_VERSION as a result.</div><div class='del'>-	(camel_mbox_summary_expunge): Oops, my wrong, use the string uid</div><div class='del'>-	to unindex on.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):</div><div class='del'>-	Connect to the message_changed signal.</div><div class='del'>-	(_init): Set permanent flags to something reasonable.  No user</div><div class='del'>-	flags yet ...</div><div class='del'>-	(message_changed): If the flags of the message change, update the</div><div class='del'>-	flags in the summary.</div><div class='del'>-	(mbox_expunge): Implement the expunge.</div><div class='del'>-	(camel_mbox_folder_class_init): Renamed all leading _'s to mbox_'s</div><div class='del'>-	(mbox_expunge): Emit a folder_changed signal on expunge (uh, even</div><div class='del'>-	if it didn't ...)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_finalize): Uh, dont free permanent_flags</div><div class='del'>-	anymore (this wouldn't failed anyway, it was a GList !!!)</div><div class='del'>-	(camel_folder_search_complete): Removed.</div><div class='del'>-	(camel_folder_search_cancel): Removed.</div><div class='del'>-	(camel_folder_expunge): Changed to only allow expunge on an open</div><div class='del'>-	folder.  It doesn't make sense for mbox, otherwise (?)</div><div class='del'>-	(camel_folder_class_init): Added a folder_changed signal.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Change permanent_flags to</div><div class='del'>-	a bitfield.</div><div class='del'>-	(list_permanent_flags): Renamed to get_permanent_flags, and</div><div class='del'>-	returns a bitfield.</div><div class='del'>-	(camel_folder_expunge): Changed expunge to a void type.  The</div><div class='del'>-	messages would no longer be useful after they have been removed</div><div class='del'>-	...</div><div class='del'>-	(CamelFolderClass): New function summary_get_by_uid() to get a single</div><div class='del'>-	summary.</div><div class='del'>-	(*search*): Moved back to synchronous search api ... *sigh*</div><div class='del'>-	</div><div class='del'>-	* camel-folder.h: Removed CamelSearchFunc.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (set_flag): Removed.</div><div class='del'>-	(camel_mime_message_set_flag): Removed.</div><div class='del'>-	(get_flag): Removed.</div><div class='del'>-	(camel_mime_message_get_flag): Removed.</div><div class='del'>-	(add_flag_to_list): Removed.</div><div class='del'>-	(get_flag_list): Removed.</div><div class='del'>-	(camel_mime_message_get_flag_list): Removed.</div><div class='del'>-	(camel_mime_message_get_flags): New interface to get system flags.</div><div class='del'>-	(camel_mime_message_set_flags):  " to set ".</div><div class='del'>-	(camel_mime_message_get_user_flag): To get a user flag.</div><div class='del'>-	(camel_mime_message_set_user_flag): To set a user flag.</div><div class='del'>-	(finalize): Hmm, the old one free'd the key and data, not good</div><div class='del'>-	when the data is a boolean ...</div><div class='del'>-</div><div class='del'>-2000-04-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Tweak the definition of CamelProvider. Among</div><div class='del'>-	other things, a provider may now be both a store and a transport.</div><div class='del'>-</div><div class='del'>-	* camel-provider.c: Remove a lot of code we had no intention of</div><div class='del'>-	using. This now only contains two functions: camel_provider_init</div><div class='del'>-	to read the installed .urls files, and camel_provider_load to</div><div class='del'>-	load and register a new provider.</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Remove more unused code and simplify some of</div><div class='del'>-	the remaining code. The list of available provider modules is now</div><div class='del'>-	stored in the session, and it handles calling camel_provider_load</div><div class='del'>-	to load them as needed. Provider registration is now done by</div><div class='del'>-	calling back from the module init routine, which allows a single</div><div class='del'>-	module to register providers for multiple URL types.</div><div class='del'>-</div><div class='del'>-	* providers/*: Update provider structures and init routines for</div><div class='del'>-	the new stuff. Add a .urls file to each provider specifying what</div><div class='del'>-	urls it handles, and install that with the library.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: Add hints towards</div><div class='del'>-	supporting both news: and nntp: URLs, and using nntp as both a</div><div class='del'>-	store and a transport.</div><div class='del'>-</div><div class='del'>-2000-04-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (camel_internet_address_get): const</div><div class='del'>-	poison</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser):</div><div class='del'>-	camel_mime_parser_tell() returns an offset from where it started</div><div class='del'>-	parsing, not necessarily from the start of data. Since we're</div><div class='del'>-	parsing a bounded seekable_stream, we need to add the stream's</div><div class='del'>-	starting bound to camel_mime_parser_tell's return value to</div><div class='del'>-	create the substream in the right place.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):</div><div class='del'>-	say CAMEL_STREAM_UNBOUND rather than -1 in doc.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (camel_seekable_stream_seek): Add more</div><div class='del'>-	info to docs.</div><div class='del'>-</div><div class='del'>-2000-04-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): fix a bug that would</div><div class='del'>-	cause corruption with very long headers.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'</div><div class='del'>-	to pick the Camel includes.</div><div class='del'>-	* providers/sendmail/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel.h: Don't #include &lt;camel/data-wrapper-repository.h&gt; anymore.</div><div class='del'>-</div><div class='del'>-2000-04-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (check_header): Dont try and check a NULL</div><div class='del'>-	header.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.[ch]: Dead.  Its not pining.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h: Dont include recipients.h anymore.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_add_recipient): Accept</div><div class='del'>-	name/address separately, and store in an CamelInternetAddress.</div><div class='del'>-	(add_recipient): Removed.</div><div class='del'>-	(remove_recipient): Removed.</div><div class='del'>-	(remove_recipient_address): Renamed from remove_receipient, works</div><div class='del'>-	via address.</div><div class='del'>-	(camel_mime_message_remove_recipient_name): New function to remove</div><div class='del'>-	by name.</div><div class='del'>-	(get_recipients): Removed.</div><div class='del'>-	(camel_mime_message_get_recipients): Return a camel-internet-address.</div><div class='del'>-	(write_to_stream): No longer write receipients directly.</div><div class='del'>-	(write_recipients_to_stream): Removed.</div><div class='del'>-	(write_one_recipient_to_stream): Removed.</div><div class='del'>-	(camel_mime_message_init): Setup recipients hashtable, rather than</div><div class='del'>-	usign the recipients stuff.</div><div class='del'>-	(set_recipient_list_from_string): Killed, a violent and lengthy</div><div class='del'>-	death.</div><div class='del'>-	(process_header): Simplified recipient handling code a lot.</div><div class='del'>-	(received_date_str, sent_date_str, reply_to_str, subject_str,</div><div class='del'>-	from_str): Removed some oddly-defined global statics.</div><div class='del'>-	(camel_mime_message_class_init): Dont initialise above variables</div><div class='del'>-	anymore.</div><div class='del'>-	(init_header_name_table): Removed, use a table to init this, and</div><div class='del'>-	do it in class init (2 lines of code ...).</div><div class='del'>-</div><div class='del'>-	* camel-news-address.c: Class to represent news addresses -</div><div class='del'>-	currently empty, and not built.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.h: Class to represent internet (email)</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-	* camel-address.h: Abstract class to represent (lists of)</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Revert previous change. I</div><div class='del'>-	was confused.</div><div class='del'>-</div><div class='del'>-	* camel-url.[ch] (camel_url_encode, camel_url_decode): expose</div><div class='del'>-	these routines.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Only write a newline</div><div class='del'>-	between the headers and the content object if the content object</div><div class='del'>-	is not a CamelMedium. (If the content is a medium, it may have its</div><div class='del'>-	own headers, which then need to go before the blank line.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-body-part.[ch]: Remove. We weren't using the fields</div><div class='del'>-	that made this different from camel-mime-part, so it basically</div><div class='del'>-	just forced us to do lots of gratuitous typecasting.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.[ch]: Use CamelMimePart. Remove the multipart</div><div class='del'>-	parent stuff, since we weren't using that either.</div><div class='del'>-</div><div class='del'>-	* etc: update for CamelMimeBodyPart -&gt; CamelMimePart</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (set_content_object): sink the content object</div><div class='del'>-	after referencing it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: fix various little things in the handling</div><div class='del'>-	of CamelMedium methods. Change camel_mime_part_set_text to the</div><div class='del'>-	more generic camel_mime_part_set_content.</div><div class='del'>-</div><div class='del'>-	* camel.h: sync to current reality</div><div class='del'>-</div><div class='del'>-	* camel-folder-utils.[ch]: removed</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_format_date): fix format specifier</div><div class='del'>-	for time zone. Fix typo in month names array.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (stream_seek): Changed to have</div><div class='del'>-	absolute seek semantics, not relative to the bounds.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (reset): When we reset, seek to the</div><div class='del'>-	start of the bound, if there is one.</div><div class='del'>-	(stream_tell): Make tell virtual.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_available): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c: Remove leading _'s from static functions.</div><div class='del'>-	(stream_read): Renamed from read().  Fancy that conflicting!  (my</div><div class='del'>-	boo!)  Others too.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	Changed to stream_mem interface.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed</div><div class='del'>-	for streamfs interface changes, and implement a failure case.</div><div class='del'>-	(_append_message): Changed for fs stream interface change.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (print_part): Iterate rahter than callback.  I</div><div class='del'>-	hate glists's interface (hence, move this to write_to_stream).</div><div class='del'>-	(write_to_stream): Return an error (yuck, this is a royal PITA to</div><div class='del'>-	do with the stream write interface).</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Removed leading _ from static names.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h: construct_from_parser() now returns an error</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Changed to use a</div><div class='del'>-	camel-data-wrapper instead of a camel-simple-data-wrapper (no</div><div class='del'>-	change needed elsewhere?).</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Fixes for stream-mem</div><div class='del'>-	interface changes.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.[ch],</div><div class='del'>-	camel-simple-data-wrapper-stream.[ch],</div><div class='del'>-	camel-stream-data-wrapper.[ch], removed.  Fixed including of these</div><div class='del'>-	files.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_text): Remove the use of</div><div class='del'>-	the camel-simple-data-wrapper-stream, just use a mem stream.</div><div class='del'>-	(write_to_stream): Renamed from my_*</div><div class='del'>-	(construct_from_stream): Return an error on error.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new*): Remove mode</div><div class='del'>-	parameter.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.h (enum CamelStreamMemMode): Removed.  It</div><div class='del'>-	wasn't used at all.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h: Add camel_data_wrapper_new() to create</div><div class='del'>-	these.</div><div class='del'>-	(write_to_stream, construct_from_stream): Return an error</div><div class='del'>-	indicator for success.  Fixed all methods to match (ICK).</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Remove</div><div class='del'>-	camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c,</div><div class='del'>-	camel-stream-data-wrapper.c.  Obsoleted by code re-use!</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (construct_from_stream): Change the default</div><div class='del'>-	implementation to just set the output stream == construction</div><div class='del'>-	stream.  Well, this lets me get rid of both simple-data-wrapper</div><div class='del'>-	and stream-data-wrapper (unused anyway), and</div><div class='del'>-	simple-data-wrapper-stream in one hit.  CamelDataWrapper is now</div><div class='del'>-	also a concrete class.</div><div class='del'>-	(write_to_stream): Use camel_stream_write_to_stream() to</div><div class='del'>-	calculate/return values (and save code).</div><div class='del'>-	Include &lt;errno.h&gt; for obvious reasons.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (eos): Provide a default implementation of .eos().</div><div class='del'>-	(camel_stream_write_to_stream): Make it return an error code on</div><div class='del'>-	error.</div><div class='del'>-	(camel_stream_printf): Changed to return the number of bytes</div><div class='del'>-	written/error.</div><div class='del'>-	(camel_stream_available): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.h (enum CamelStreamFsMode): Removed.  Changed to</div><div class='del'>-	use unix modes and so forth (wasn't used for anything but new file</div><div class='del'>-	creation and didn't work well either).</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Removed leading _'s for names.  And removed</div><div class='del'>-	some virtual method 'documentation'.</div><div class='del'>-	(destroy): Dont try and close a closed/error fd.  Only report</div><div class='del'>-	error if close returns -1.  Moved all the code to finalise(), and</div><div class='del'>-	killed this function.</div><div class='del'>-	(init_with_fd): Properly setup the seek offset, if it is a</div><div class='del'>-	valid and seekable file descriptor.</div><div class='del'>-	(init_with_fd_and_bounds): Use off_t for bounds, set bounds on the</div><div class='del'>-	seekable stream.</div><div class='del'>-	(init_with_name): Return error codes.</div><div class='del'>-	(init_with_name_and_bounds): Ditto.</div><div class='del'>-	(camel_stream_fs_new_with_name): REturn NULL object if it failed.</div><div class='del'>-	(camel_stream_fs_new_with_name_and_bounds): Return NULL object on</div><div class='del'>-	failure.  Changed with_name* api's to take unix open style args</div><div class='del'>-	and flags.</div><div class='del'>-	(read): The bounded stream bounds checking seemed off, simplified</div><div class='del'>-	code a bit.</div><div class='del'>-	(write): Implement bounds checking for writing, the comment was</div><div class='del'>-	wrong, it could make sense to bound writing.  Cleaned up a little.</div><div class='del'>-	(available): Gone.</div><div class='del'>-	(eos): Removed.  Use CamelStream's implementation now.</div><div class='del'>-	(close): Reset the fd to -1, provide a warning for bad usage.</div><div class='del'>-	(seek): Cleaned up.  Changed the behaviour a little, the returned</div><div class='del'>-	offset is the absolute position in the file, even in bounded</div><div class='del'>-	streams.	</div><div class='del'>-	(seek): Seek from end mirrors lseek() behaviour (reverse seeking).</div><div class='del'>-</div><div class='del'>-2000-04-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof</div><div class='del'>-	indicator to other parent classes.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (camel_stream_printf): New utility</div><div class='del'>-	function.  Obvious use.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: Removed leading _'s from static func's.</div><div class='del'>-	(camel_stream_mem_new_with_byte_array): Fixed for api changes, set</div><div class='del'>-	the owner for the byte array to us.</div><div class='del'>-	: Removed A bunch of gtk doc stuff for static (implementation) functions.</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(write): Fixed the write implementation so that seek() works on a</div><div class='del'>-	seekable memory stream, as expected.  Seeking past the end of the</div><div class='del'>-	buffer has unix semantics (filling with 0).</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(write): Implement seekable stream bounded stream.</div><div class='del'>-	(read): Implement seekable stream bounded stream.</div><div class='del'>-	(close): Dont free the stream_mem if we're not the owner.</div><div class='del'>-	(seek): Allow to seek beyond the end of memory area,</div><div class='del'>-	implement bounds checking.</div><div class='del'>-	(seek): Set errno on bad policy.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t.</div><div class='del'>-	(new_with_buffer): Changed len to be a size_t.</div><div class='del'>-	(set_buffer, set_byte_array): New interface functions.</div><div class='del'>-	(struct _CamelStreamMem): Removed position, it is stored in the</div><div class='del'>-	superclass.</div><div class='del'>-</div><div class='del'>-	* camel-stream.h: Removed some of the seemingly random</div><div class='del'>-	whitespace.  Removed the available method (its not</div><div class='del'>-	impelemented/useful enough).</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(init_with_seekable_stream_and_bounds): Remove the data_available</div><div class='del'>-	stuff, it hasn't been properly implemented/finished, and may never</div><div class='del'>-	work (unfortunately *sigh).</div><div class='del'>-	(reemit_parent_signal): Removed part of the above change.</div><div class='del'>-	(set_bounds): Removed (moved to seekable-stream).</div><div class='del'>-	: Fixed up some of the generally unreadable indenting (sorry,</div><div class='del'>-	wrapping at 80 characters with</div><div class='del'>-	camels_really_long_function_names()</div><div class='del'>-	just_doesnt_work_very_well_does_it().</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(stream_seek): Fixup for object changes.  Make sure we return -1</div><div class='del'>-	if the parent stream can't seek.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New</div><div class='del'>-	function to bound any seekable stream.</div><div class='del'>-	: Removed _'s.</div><div class='del'>-	(camel_seekable_stream_class_init): Implement an init function, to</div><div class='del'>-	setup the stream bounds to unbound.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.h (CamelSeekableStreamClass): New virtual</div><div class='del'>-	method set_bounds for seekable streams.</div><div class='del'>-	(CAMEL_STREAM_UNBOUND): New define for no bound.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.h (struct _CamelSeekableSubstream):</div><div class='del'>-	Removed sup_bound and inf_bound, moved to CamelSeekableStream (and</div><div class='del'>-	renamed, and changed to off_t's).</div><div class='del'>-	(new_with_seekable_stream_and_bounds): Use off_t as the bounds.</div><div class='del'>-	(CamelSeekableSubstreamClass): Uh, why was the intialiser virtual?</div><div class='del'>-	Removed.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek</div><div class='del'>-	to accept an off_t as the offset.</div><div class='del'>-	(struct _CamelSeekableStream): Renamed cur_pos to position and</div><div class='del'>-	changed it to an off_t type.</div><div class='del'>-	(enum CamelStreamSeekPolicy): Set to match the SEEK_* constants</div><div class='del'>-	from lseek().</div><div class='del'>-	(get_current_position): Renamed to tell().</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.h: Commented out set_vbuf - never implemented.</div><div class='del'>-</div><div class='del'>-2000-04-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (_eos): only return TRUE if the parent is</div><div class='del'>-	at eos AND the buffer has been exhausted</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: fix some incorrect macro usage that</div><div class='del'>-	resulted in bogus casts</div><div class='del'>-</div><div class='del'>-2000-04-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): fix a cut-and-pasto.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): ref</div><div class='del'>-	(and sink) the message stream if we're going to unref it later.</div><div class='del'>-	Otherwise it could get destroyed while there are still substreams</div><div class='del'>-	attached to it. This needs a cleaner solution.</div><div class='del'>-</div><div class='del'>-	* camel.h: remove data-wrapper-repository.h include(s)</div><div class='del'>-</div><div class='del'>-2000-04-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Allow MESSAGE_END</div><div class='del'>-	_or_ EOF as valid termination conditions.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Decode</div><div class='del'>-	and then re-encode the addresses, so they are consistently</div><div class='del'>-	formatted.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Store the address in</div><div class='del'>-	a _header_address.  And try to get a comment-stored name if there</div><div class='del'>-	is one.</div><div class='del'>-	(header_decode_address): Actually return an address.</div><div class='del'>-	(header_to_decode): Renamed to header_address_decode()</div><div class='del'>-	(header_mailbox_decode): New function to get a single mailbox.</div><div class='del'>-	(header_mime_decode): Return the major/minor value, as</div><div class='del'>-	appropriate.</div><div class='del'>-	(header_address_new, and friends): Whole bunch of utility</div><div class='del'>-	functions for working with the address thingies.</div><div class='del'>-	(header_decode_domain): Free the string header, and dont expand</div><div class='del'>-	'.' into ' . '.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): No longer call</div><div class='del'>-	data_wrapper_repository_init.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (write_to_stream): Moved (back) to</div><div class='del'>-	camel-mime-part.</div><div class='del'>-	(add_header):</div><div class='del'>-	(set_header):</div><div class='del'>-	(remove_header): </div><div class='del'>-	(get_header): Make all these abstract, and spit warnings if</div><div class='del'>-	called.  I guess it could manage the list, but well, it doesn't.</div><div class='del'>-</div><div class='del'>-	* camel-medium.h (struct _CamelMedium): Dont store headers here,</div><div class='del'>-	the implementor is the only one who knows their format.</div><div class='del'>-	(CamelMediumClass): Changed header values to be void *'s.  They</div><div class='del'>-	need not be strings?</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_stream): And we're</div><div class='del'>-	back.  Set the output stream.</div><div class='del'>-	(construct_from_parser): Moved to camel-mime-part-utils.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Create the</div><div class='del'>-	contents of multipart and simple messages.</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Oops, this was</div><div class='del'>-	totally screwed up, try creating the right cotnent on the right</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (construct_from_parser): Moved to</div><div class='del'>-	camel-mime-part-utils.</div><div class='del'>-	(separate_part): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_stream): Back again!  This now</div><div class='del'>-	switches over to using a mime parser for any mime parts, only.</div><div class='del'>-	(my_write_to_stream): Write our headers and so forth here.</div><div class='del'>-	(add_header): Add header directly, parent class is abstract.</div><div class='del'>-	(remove_header): Ditto.</div><div class='del'>-	(set_header): Ditto.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):</div><div class='del'>-	Remade abstract.</div><div class='del'>-	(camel_data_wrapper_construct_from_parser): Moved to</div><div class='del'>-	camel_mime_part.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h: Put back construct_from_stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h: Put construct_from_parser in here, the</div><div class='del'>-	data-wrapper shouldn't know about mime.  Ok, so now to undo half</div><div class='del'>-	of the last hours changes ... duh.</div><div class='del'>-	</div><div class='del'>-2000-04-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_to_decode, header_mime_decode): fix</div><div class='del'>-	some obvious minor bugs noted by -Wall.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use</div><div class='del'>-	construct_from_stream instead of set_input_stream().</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): REmoved the destroy</div><div class='del'>-	callback code.</div><div class='del'>-	(wrapper_destroy_cb): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.h: Add prototype for _construct()</div><div class='del'>-	method.</div><div class='del'>-</div><div class='del'>-	* camel.c: Include unicode.h to kill a warning.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h (CameldataWrapperClass): Removed</div><div class='del'>-	construct_from_stream virtual method.</div><div class='del'>-	Removed get/set input stream.</div><div class='del'>-</div><div class='del'>-	* data-wrapper-repository.[ch]: Removed&amp;from build.  Obsoleted?</div><div class='del'>-	The justification as is follows: It is mixing storage</div><div class='del'>-	protocol/format with message architecture.  It really just doesn't</div><div class='del'>-	serve any purpose, as each medium implementor will have to have its</div><div class='del'>-	own type-&gt;handler mapping, and the only current implementor,</div><div class='del'>-	mimepart has a very simple structure and no need for this.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (write_to_stream): Moved here from most of the</div><div class='del'>-	stuff in camel-mime-part.  Well, the MEDIUM is the one that knows</div><div class='del'>-	what the headers are, and the content is, let it write it out.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (camel_mime_part_construct_content):</div><div class='del'>-	Copied from camel-mime-part.c, removed handling of message</div><div class='del'>-	followon state (moved to camel-mime-message).</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Renamed from</div><div class='del'>-	construct_content.</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream):</div><div class='del'>-	(camel_mime_part_construct_content_from_stream):</div><div class='del'>-	(camel_mime_part_store_stream_in_buffer): Removed.  Replaced by</div><div class='del'>-	the new construct from parser stuff.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Do</div><div class='del'>-	construct_from_parser for mime-message.</div><div class='del'>-	(_write_to_stream): Set the mime-version header for medium to</div><div class='del'>-	write out, rather than writing it out ourselves.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (set_mime_type_field): Ref the</div><div class='del'>-	content_field when we get it?</div><div class='del'>-	(construct_from_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_construct_from_stream): Changed to a helper</div><div class='del'>-	function, creates a mime_parser, and constructs from that.</div><div class='del'>-	(set_input_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_set_input_stream): Removed.</div><div class='del'>-	(get_input_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_get_input_stream): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_unstep): New function.</div><div class='del'>-	Cause a subsequent call to mime_parser_step() to return the same</div><div class='del'>-	state over again.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):</div><div class='del'>-	Initial test code using the mime parser to construct the message.</div><div class='del'>-	(_get_message_by_uid): Use construct_from_stream() instead of</div><div class='del'>-	creating our own parser.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): part constructor.</div><div class='del'>-	(camel_mime_part_construct_content): Basically a simpler</div><div class='del'>-	replacement for the datawrapper repository.</div><div class='del'>-	(camel_mime_part_init): Set the default type to text/plain.</div><div class='del'>-	(camel_mime_part_construct_content): Removed to</div><div class='del'>-	camel-mime-part-utils.c</div><div class='del'>-	(my_get_output_stream): Removed.  The streeam is in the</div><div class='del'>-	data-wrapper.</div><div class='del'>-	(my_get_content_object): Removed.  The content object is stored in</div><div class='del'>-	the medium.  If none is there, the object wasn't created properly.</div><div class='del'>-	(my_write_content_to_stream): Removed.  The content object is the</div><div class='del'>-	one that knows how to write itself out!!!!!!!!</div><div class='del'>-	(my_write_to_stream): Remove the base header writing stuff - has</div><div class='del'>-	been moved to camel-medium, where it belongs.  This can just be</div><div class='del'>-	used to check for mandatory headers.</div><div class='del'>-	(my_construct_from_stream): Removed.</div><div class='del'>-	(my_set_input_stream): What the hell, i'll remove this too.</div><div class='del'>-	Nobody seems to understand how it differs from create from stream,</div><div class='del'>-	and they both seem to serve the same purpose ...</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_parser): Initial</div><div class='del'>-	implementation of a content constructor.</div><div class='del'>-	(construct_from_stream): Removed!  Job taken over by</div><div class='del'>-	construct_from_parser.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (construct_from_parser): Multipart</div><div class='del'>-	construction routine.</div><div class='del'>-	(camel_multipart_init): Set the default multipart type to</div><div class='del'>-	multipart/mixed.  Duh, no subtype is not allowed anyway.</div><div class='del'>-	(set_input_stream): REmoved.  Replaced by construct_from_parser.</div><div class='del'>-</div><div class='del'>-2000-04-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.[ch]: clean, document, etc.</div><div class='del'>-	(camel_multipart_init): pick a prettier default boundary. Still</div><div class='del'>-	need to deal with the larger problem</div><div class='del'>-</div><div class='del'>-2000-04-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h (struct _CamelMimeMessage): Removed</div><div class='del'>-	send_date, and received_date, and replaced it with a time_t</div><div class='del'>-	'date' (this is what the header is called), and date_offset to</div><div class='del'>-	store the GMT offset of the date.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_from): Update raw</div><div class='del'>-	header as we go.</div><div class='del'>-	(_set_from): Removed.</div><div class='del'>-	(_get_from): Removed.</div><div class='del'>-	(camel_mime_message_get_from): Moved implementation here.</div><div class='del'>-	(camel_mime_message_get_subject): Move implementation here.</div><div class='del'>-	(_get_subject): Nuked.</div><div class='del'>-	(camel_mime_message_set_subject): Handle utf-8 input, and also</div><div class='del'>-	update raw header when changed.</div><div class='del'>-	(_set_subject): Removed.</div><div class='del'>-	(_set_received_date): Removed.</div><div class='del'>-	(camel_mime_message_set_received_date): Removed.</div><div class='del'>-	(_get_received_date): Removed.</div><div class='del'>-	(camel_mime_message_get_received_date): Removed.</div><div class='del'>-	(_get_sent_date): Removed.</div><div class='del'>-	(camel_mime_message_get_sent_date): Removed.</div><div class='del'>-	(camel_mime_message_get_date): New function to get the date as a</div><div class='del'>-	time_t/offset.</div><div class='del'>-	(camel_mime_message_set_date): Set the date as a time_t/offset.</div><div class='del'>-	(camel_mime_message_get_date_string): Get the date as a string.</div><div class='del'>-	(camel_mime_message_init): Initialise the current date as</div><div class='del'>-	'CMAEL_MESSAGE_DATE_CURRENT'.</div><div class='del'>-	(_set_reply_to): Removed.</div><div class='del'>-	(camel_mime_message_set_reply_to): Moved implementation here.</div><div class='del'>-	This is still broken, reply-to can have multiple addresses.</div><div class='del'>-	(_get_reply_to): Removed.</div><div class='del'>-	(_set_field): Removed, no longer used anywhere.</div><div class='del'>-	(_get_field): Also removed.</div><div class='del'>-	(_init_header_name_table): Add the Date header.</div><div class='del'>-	(process_header): Also handle snooping of Date header here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (finalise): Unref the source stream on</div><div class='del'>-	finalise, and also call the parent class (oops).</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_state): New function to</div><div class='del'>-	get the current parser state.</div><div class='del'>-	(camel_mime_parser_stream): Allow you to get the stream back from</div><div class='del'>-	the mime_parser.</div><div class='del'>-	(camel_mime_parser_fd): Alternative to allow you to get the fd</div><div class='del'>-	back from the mime_parser.</div><div class='del'>-	(folder_scan_init_with_stream): Properly ref/unref the stream.</div><div class='del'>-	(folder_scan_close): Properly unref the stream/close the fd on</div><div class='del'>-	exit.</div><div class='del'>-	(folder_scan_init_with_fd): Close the old fd if there is one.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):</div><div class='del'>-	New method, construct a data wrapper from an initialised parser.</div><div class='del'>-	(construct_from_parser): Empty implementation.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new):</div><div class='del'>-	Convert subject line to unicode, before storing in the summary.</div><div class='del'>-	(strdup_trim): Removed, no longer needed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref</div><div class='del'>-	the folder after setting it in the new message.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_content_object): Have the headers</div><div class='del'>-	follow the content-type change here too.</div><div class='del'>-	(my_write_to_stream): Dont write content-type here, automatically</div><div class='del'>-	stored in the headers ...</div><div class='del'>-	(my_write_to_stream): Use header_disposition_format() to format</div><div class='del'>-	the content-disposition header.</div><div class='del'>-	(my_write_to_stream): Removed old code, all headers are now stored</div><div class='del'>-	in the camel-medium level, always.  Need to do the same with</div><div class='del'>-	camel-mime-message i suppose ...</div><div class='del'>-	(my_write_to_stream): Write the content using the parent class,</div><div class='del'>-	not some weird function.</div><div class='del'>-	(camel_mime_part_class_init): Dont override get_output_stream.</div><div class='del'>-	(camel_mime_part_encoding_from_string): Bleh, make it</div><div class='del'>-	case-insensitive.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Handle empty types.</div><div class='del'>-	(header_encode_string): Start of an implementation of the rfc2047</div><div class='del'>-	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get</div><div class='del'>-	tricky *sigh*)</div><div class='del'>-	(rfc2047_encode_word): Convert a single word/string into rfc2047</div><div class='del'>-	encoding.</div><div class='del'>-	(quoted_encode): Different quoted-printable encoding for rfc2047</div><div class='del'>-	encoding of headers.</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_write_to_stream): Use</div><div class='del'>-	header_content_type_format() to format it.</div><div class='del'>-</div><div class='del'>-2000-04-21  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add prototype for header_param_list_free.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.c: New function to remove all the types of a</div><div class='del'>-	recipient list.  I think this whole object needs a major review.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_class_init): Removed</div><div class='del'>-	parse_header_pair override, override add_header instead.</div><div class='del'>-	(_parse_header_pair): Renamed to add_header.</div><div class='del'>-	(remove_header): Add this method, to make sure we keep upto date</div><div class='del'>-	with removed headers too.</div><div class='del'>-	(_set_field): If given a NULL value, clear it out.</div><div class='del'>-	(_set_recipient_list_from_string): Constify.</div><div class='del'>-	(set_header): Override set_header from camel_medium.</div><div class='del'>-	(process_header): Local function to handle set/add/remove of each</div><div class='del'>-	header we know about.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_class_init): Removed</div><div class='del'>-	parse_header_pair setup.</div><div class='del'>-	(my_parse_header_pair): Moved into add_header(), removed.</div><div class='del'>-	(my_set_disposition): Allow a NULL disposition to clear it.</div><div class='del'>-	(my_set_content_id): Allow NULL content id to clear it.</div><div class='del'>-	(remove_header): Track removed headers.</div><div class='del'>-	(my_set_description): Allow NULL description to clear it.</div><div class='del'>-	(my_set_content_MD5): Make sure we copy the md5 value, and allow a</div><div class='del'>-	NULL value to reset it.</div><div class='del'>-	(my_set_filename): Copy the filename.</div><div class='del'>-	(my_set_header_lines): Removed.  Nothing uses it, it doesn't</div><div class='del'>-	actually serve any purpose.</div><div class='del'>-	(camel_mime_part_set_header_lines): Ditto.</div><div class='del'>-	(my_get_header_lines): Ditto.</div><div class='del'>-	(camel_mime_part_get_header_lines): Ditto.</div><div class='del'>-	(camel_mime_part_class_init): Remove *_header_lines setup.</div><div class='del'>-	(camel_mime_part_init): Remove header_lines init.</div><div class='del'>-	(my_finalize): Remove header_lines finalise.</div><div class='del'>-	(my_write_to_stream): Write the headers here.  This is just WRONG,</div><div class='del'>-	camel_medium should be doing this.</div><div class='del'>-	(my_get_output_stream): Kill a warning.</div><div class='del'>-	(camel_mime_part_encoding_to_string): Ditto.</div><div class='del'>-	(camel_mime_part_set_description): Unvirtualiase, use add_header()</div><div class='del'>-	to do the processing.</div><div class='del'>-	(my_set_description): Removed.</div><div class='del'>-	(set_disposition): Renamed from my_set_disposition.</div><div class='del'>-	(camel_mime_part_get_description): Get the descriptionf rom the</div><div class='del'>-	get_header method.</div><div class='del'>-	(my_get_description): Removed.</div><div class='del'>-	(my_set_filename): Removed.</div><div class='del'>-	(camel_mime_part_get_filename): Get the parameter from the</div><div class='del'>-	disposition.</div><div class='del'>-	(camel_mime_part_encoding_from_string): Handle NULL string.</div><div class='del'>-	(camel_mime_part_init): Remove reference to filename.</div><div class='del'>-	(my_finalize): Dont free filename.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h (CamelMimePartClass): Removed</div><div class='del'>-	parse_header_pair() method, it doesn't add anything that</div><div class='del'>-	add_header() can't be used for.</div><div class='del'>-	(CamelMimePartClass): Remove *_header_lines methods.</div><div class='del'>-	(struct _CamelMimePart): Remove header_lines list.</div><div class='del'>-	(struct _CamelMimePart): Removed filename attribute.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (camel_medium_init): Init headers to null, not a</div><div class='del'>-	hashtable.</div><div class='del'>-	(add_header): Append the headers as a list.</div><div class='del'>-	(remove_header): Remove headers as a list.</div><div class='del'>-	(get_header): Likewise for lookup.</div><div class='del'>-	(free_header): Removed, no longer needed.</div><div class='del'>-	(finalize): Free headers using header_raw_clear().</div><div class='del'>-	(camel_medium_set_header): New function, to reset and override all</div><div class='del'>-	values of a header with a new value.</div><div class='del'>-</div><div class='del'>-	* camel-medium.h (struct _CamelMedium): Changed to use a</div><div class='del'>-	header_raw struct rather than a hash table, to store headers</div><div class='del'>-	(many headers can occur multiple times).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_find_next): New function, allows</div><div class='del'>-	you to find multi-valued header fields.</div><div class='del'>-	(header_disposition_format): New function to format/create</div><div class='del'>-	content-disposition header string.</div><div class='del'>-	(header_param_list_format_append): Function to format parameter</div><div class='del'>-	lists into a GString.</div><div class='del'>-	(header_content_type_format): Function to format content-type into</div><div class='del'>-	a usable format.</div><div class='del'>-	(header_set_param): allow NULL value to remove the parameter.</div><div class='del'>-	(decode_token): Renamed from header_decode_token.</div><div class='del'>-	(header_decode_token): New interface for external use.</div><div class='del'>-	(quoted_decode): Made static to kill annoying warnings.</div><div class='del'>-	(g_strdup_len): Killed, replaced with calls to g_strndup().</div><div class='del'>-	(rfc2047_decode_word): Made static to kill warnings.</div><div class='del'>-	(decode_coded_string): Terminated.</div><div class='del'>-	(g_string_append_len): Made static to kill warnings.</div><div class='del'>-	(header_decode_text): Made static to kill warnings.</div><div class='del'>-	(header_decode_text): Constify.</div><div class='del'>-	(rfc2047_decode_word): Constify.</div><div class='del'>-	(header_param): Constify.</div><div class='del'>-	(header_content_type_new): Copy the type/subtype strings.</div><div class='del'>-	(header_param_list_decode): Made static.</div><div class='del'>-	(header_param_list_format_append): Made static.</div><div class='del'>-	(quoted_decode): Constify.</div><div class='del'>-	(g_string_append_len): Constify.</div><div class='del'>-	(header_token_decode): New function to decode a single token.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (header_write): Append a</div><div class='del'>-	trailing \n when writing headers.</div><div class='del'>-	(strdup_trim): Killed a warning.</div><div class='del'>-	(camel_mbox_summary_set_uid): Make sure the next uid is at least 1</div><div class='del'>-	higher than any existing one.</div><div class='del'>-	(header_evolution_decode): Use header_token_decode to get the</div><div class='del'>-	token.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Strip the trailing \n</div><div class='del'>-	of the end of all header lines.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.[ch]: Removed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-parser.[ch]: Removed.  Removed</div><div class='del'>-	references to it.</div><div class='del'>-</div><div class='del'>-2000-04-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): use libunicode iconv</div><div class='del'>-	functions rather than libc ones (since libc might not have them).</div><div class='del'>-	(header_decode_date): add autoconfiscation on timezone code</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): call unicode_init ()</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Trim</div><div class='del'>-	leading/trailing spaces off the raw headers.</div><div class='del'>-</div><div class='del'>-	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c (_print_parameter): Duh, removed again</div><div class='del'>-	(@@#$@ cvs merge).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Constify.</div><div class='del'>-	(header_content_type_unref): Killed a couple warnings.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_init): Removed more log crap.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for</div><div class='del'>-	summary changes.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):</div><div class='del'>-	Fixed for new summary interface.  Added a warning for using this</div><div class='del'>-	broken api.</div><div class='del'>-	(_get_message_by_uid): Fixed for message new with session</div><div class='del'>-	vanishing.</div><div class='del'>-</div><div class='del'>-2000-04-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_get_type): This is a subtype of</div><div class='del'>-	CamelSeekableStream, not CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c: clean up a lot.</div><div class='del'>-	(eos): When testing for end-of-stream, reset the parent position</div><div class='del'>-	before testing if it is at end-of-stream, since either (a) it may</div><div class='del'>-	have been seek'ed to eos by someone else, or (b) we may have been</div><div class='del'>-	seek'ed away from eos and it hasn't been synced yet.</div><div class='del'>-</div><div class='del'>-	* camel-medium.[ch] (camel_medium_add_header): const poison.</div><div class='del'>-	(Belatedly goes with my change of 2000-02-23.)</div><div class='del'>-	(camel_medium_init): Use g_strcase_{hash,equal} on the header</div><div class='del'>-	array.</div><div class='del'>-	</div><div class='del'>-2000-04-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_input_stream): </div><div class='del'>-	* camel-data-wrapper.c (set_input_stream, set_output_stream): do</div><div class='del'>-	better reference counting of streams so they actually go away</div><div class='del'>-	when they should.</div><div class='del'>-</div><div class='del'>-	* camel-log.[ch], *: Nuke camel log stuff. Replace calls to</div><div class='del'>-	CAMEL_LOG_WARNING with calls to g_warning.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.[ch]:</div><div class='del'>-	* camel-simple-data-wrapper.[ch]:</div><div class='del'>-	* camel-medium.[ch]: Clean, polish, document. Most of the gtk-doc</div><div class='del'>-	comments added to camel-data-wrapper.c note serious problems that</div><div class='del'>-	need to be fixed.</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.[ch]: Remove the "session" field from</div><div class='del'>-	CamelMimeMessage. Nothing uses it, about half of the existing</div><div class='del'>-	calls to camel_mime_message_new_with_session pass NULL, and</div><div class='del'>-	there's no obvious reason for it to be there.</div><div class='del'>-</div><div class='del'>-	* providers/MH/camel-mh-folder.c:</div><div class='del'>-	* providers/maildir/camel-maildir-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Use camel_mime_message_new</div><div class='del'>-	instead of camel_mime_message_new_with_session.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (get_store_for_protocol_with_url): Set the</div><div class='del'>-	exception if no provider is found.</div><div class='del'>-</div><div class='del'>-	* camel-url.c: Add code to encode and decode %-escapes in URLs,</div><div class='del'>-	and do some additional correctness-checking on URL syntax. From</div><div class='del'>-	Tiago Antào with modifications by me.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): add nntp</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Fix switch statement.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (_exists): always return TRUE</div><div class='del'>-	for now.  we need to check the server response to make sure the</div><div class='del'>-	group exists.</div><div class='del'>-	(_get_message_by_uid): make sure to account for the \n we add to</div><div class='del'>-	the string after every line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): function</div><div class='del'>-	to get the headers using the XOVER command.</div><div class='del'>-	(get_HEAD_headers): function to get the headers using the HEAD</div><div class='del'>-	command on each message. slooooooow.</div><div class='del'>-	(camel_nntp_get_headers): make this function use either XOVER or HEAD</div><div class='del'>-	versions depending on whether or not the server extension is present.</div><div class='del'>-</div><div class='del'>-2000-04-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.[ch]: This didn't belong in Camel. Move to mail/</div><div class='del'>-</div><div class='del'>-	* Makefile.am, camel-types.h: remove references to</div><div class='del'>-	camel-formatter.</div><div class='del'>-</div><div class='del'>-2000-04-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message</div><div class='del'>-	for broken function.</div><div class='del'>-	(_folder_close_cb): Same.</div><div class='del'>-</div><div class='del'>-2000-04-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (pthread_SRC): Use correct names for the pthread</div><div class='del'>-	source variables.</div><div class='del'>-</div><div class='del'>-2000-04-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): fix various</div><div class='del'>-	bugs in APOP code (still untested) and some of the error cases.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Clarify what provider.protocol, provider.name,</div><div class='del'>-	and provider.description should be.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: </div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: </div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: update protocols, names,</div><div class='del'>-	and descriptions</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):</div><div class='del'>-	implement get_message_by_number for the mail fetch code.</div><div class='del'>-</div><div class='del'>-2000-04-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: reformatted to fit</div><div class='del'>-	the standard indent format used by helix code</div><div class='del'>-</div><div class='del'>-2000-04-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c: New file with new function to dot-lock an mbox</div><div class='del'>-	file and copy it to a safe private directory.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/.cvsignore: Added a .cvsignore file.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	actually record the pid returned by fork(). Noticed by clahey.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: #include &lt;sys/param.h&gt;</div><div class='del'>-	for MAXHOSTNAMELEN. (This is a stopgap: some of the uses of</div><div class='del'>-	MAXHOSTNAMELEN are wrong anyway...)</div><div class='del'>-</div><div class='del'>-2000-04-07  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: fixes to numerous bugs;</div><div class='del'>-	should now build fine.</div><div class='del'>-	* providers/Makefile.am: Readded smtp now that smtp builds without</div><div class='del'>-	error.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_next_uid): Public function to get the next</div><div class='del'>-	uid, makes sure its saved to disk too.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_finalize): Fix disposition crap with a</div><div class='del'>-	real disposition.</div><div class='del'>-	(my_set_disposition): Likewise.</div><div class='del'>-	(my_get_disposition): And here.</div><div class='del'>-	(my_write_to_stream): And here, needs more cleanup.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): Assign a</div><div class='del'>-	new uid at this point.</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_write_to_stream):</div><div class='del'>-	Make something up if we have an invalid/missing content type</div><div class='del'>-	(i.e. text/plain).</div><div class='del'>-</div><div class='del'>-2000-04-19  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_delete): Fixed completely</div><div class='del'>-	broken switch() syntax, only compiled because errno is a macro on</div><div class='del'>-	some systems.</div><div class='del'>-	(_list_subfolders): Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init): init stream to null.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(CAMEL_MBOX_SUMMARY_VERSION): Moved to .c file, incremented.</div><div class='del'>-	(index_folder): Changed to have index passed via the summary.</div><div class='del'>-	(decode_string): Do a sanity check on the string size, so we dont</div><div class='del'>-	visit g_malloc()'s friendly abort().</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (camel_folder_pt_proxy_class_init):</div><div class='del'>-	Removed reference to set_name.</div><div class='del'>-	(_set_name): Removed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c</div><div class='del'>-	(parsed_information_to_mbox_summary): Removed.  Most of this file</div><div class='del'>-	is about to be binned.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c (func_header_contains): Fixes</div><div class='del'>-	for changes to summary interface.</div><div class='del'>-	(struct _searchcontext): Remove pointer to message info, get it</div><div class='del'>-	straight from the mboxsummary.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): New summary interface.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Uh, the summary is not</div><div class='del'>-	an object anymore (well not yet).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(camel_mbox_folder_class_init): Removed set_name init.</div><div class='del'>-	(_set_name): Removed.</div><div class='del'>-	(_open): Call new summary interface.</div><div class='del'>-	(_close): Use new summary interface.</div><div class='del'>-	(_create): Removed a summary object leak.</div><div class='del'>-	(_get_message_count): New summary interface.</div><div class='del'>-	(_get_uid_list): Use new summary interface. FIXME: this is leaky.</div><div class='del'>-	(_get_message_by_uid): Use the new summary interface, some</div><div class='del'>-	cleanup.</div><div class='del'>-	(_append_message): Totally changed, basically just appends the</div><div class='del'>-	message directly, ignores the summary (for now), the summary will</div><div class='del'>-	fix itself up if it needs to.</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Bye bye old code.</div><div class='del'>-	(summary_get_message_info): Implement get_message_info again, for</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_class_init): Removed set_name</div><div class='del'>-	setup.</div><div class='del'>-	(_set_name): Moved contents into _init.</div><div class='del'>-	(_init): Perform the old functions of set_name here.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Removed the set_name internal interface.</div><div class='del'>-</div><div class='del'>-2000-04-14  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.[ch]: Completely replaced with</div><div class='del'>-	new code.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Removed</div><div class='del'>-	camel-folder-summary.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Removed summary.</div><div class='del'>-	(struct _CamelFolder): Changed flags to be 1 bit bitfields.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: Class removed entirely.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_summary): Removed.</div><div class='del'>-	(camel_folder_summary_get_message_info): Moved from</div><div class='del'>-	camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_get_subfolder_info): Moved from</div><div class='del'>-	camel-folder-summary.c</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Store the start of</div><div class='del'>-	headers and start of from in the scan state.</div><div class='del'>-	(camel_mime_parser_tell_start_headers): Query the start of the</div><div class='del'>-	headers.</div><div class='del'>-	(camel_mime_parser_tell_start_from): Query the cached start of</div><div class='del'>-	from marker.</div><div class='del'>-</div><div class='del'>-2000-04-13  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_free): Removed this</div><div class='del'>-	function.  If its too dangerous to use, it shouldn't be here.</div><div class='del'>-	(gmime_content_field_ref): Also ref the embedded content-type.</div><div class='del'>-	(gmime_content_field_unref): Ditto to unref it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add a refcount for content-type header.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_unref): Implement unref</div><div class='del'>-	for content-type.</div><div class='del'>-	(header_content_type_ref): Implement ref for header content type.</div><div class='del'>-</div><div class='del'>-2000-04-12  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.h: Changed to use a _header_content_type.</div><div class='del'>-	Added type/subtype back for compatability with clients.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c: Basically a total rewrite, and now just a</div><div class='del'>-	thin wrapper ontop of header_content_type.</div><div class='del'>-	(_free_parameter): Got rid of it.</div><div class='del'>-	(gmime_content_field_new): Use header_content_type_* functions.</div><div class='del'>-	(gmime_content_field_set_parameter): Likewise.</div><div class='del'>-	(_print_parameter): Blow away.</div><div class='del'>-	(gmime_content_field_write_to_stream): Get details from the</div><div class='del'>-	content_type field.  Should check if it needs to escape chars in</div><div class='del'>-	the paramter value.</div><div class='del'>-	(gmime_content_field_get_mime_type): Likewise.</div><div class='del'>-	(___debug_print_parameter): Get rid of this rather annoyingly</div><div class='del'>-	named function.</div><div class='del'>-	(gmime_content_field_get_parameter): Simplified function.</div><div class='del'>-	(gmime_content_field_construct_from_string): Fixed this to use a</div><div class='del'>-	real parser.</div><div class='del'>-	(gmime_content_field_is_type): New function to test if a type matches.</div><div class='del'>-	(gmime_content_field_construct_from_string): Track type/subtype</div><div class='del'>-	from subordinate content_type header struct.</div><div class='del'>-</div><div class='del'>-	* gmime-rfc2047.[ch]: Removed.  Unused.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.[ch]: Blown away more duplicated code.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed camel-stream-b64.[ch], and</div><div class='del'>-	gmime-base64.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_get_content_object): Replaced</div><div class='del'>-	camel-stream-b64 with camel-stream-filter/camel-mime-filter-basic.</div><div class='del'>-	(my_write_content_to_stream): Replaced camel-stream-b64 with the</div><div class='del'>-	camel-stream-filter with an encoder.</div><div class='del'>-	(my_get_content_object): Also implement quoted-printable decoding.</div><div class='del'>-	(my_write_content_to_stream): Also implement quoted-printable</div><div class='del'>-	encoding.</div><div class='del'>-	(my_get_output_stream): Took out stream-b64 code (nothing's being</div><div class='del'>-	executed yet anyway).</div><div class='del'>-</div><div class='del'>-	* gmime-base64.[ch]: Blown away.  Not used, dont need it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Added offset for this header.  Records where</div><div class='del'>-	it is in the source.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): Add offset</div><div class='del'>-	parameter, to store where the header is stored in the stream.</div><div class='del'>-	(header_raw_append): Added offset param.</div><div class='del'>-	(header_raw_find): Return offset, if a pointer supplied for it.</div><div class='del'>-	(header_raw_replace): Add offset param.</div><div class='del'>-	(header_content_type_new): New function, to create an empty</div><div class='del'>-	content type.</div><div class='del'>-	(header_content_type_set_param): Set a parameter in the</div><div class='del'>-	content-type.</div><div class='del'>-	(header_set_param): Generic header parameter setting function.</div><div class='del'>-	(header_decode_string): Handle NULL input.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_headers_raw): New</div><div class='del'>-	function to get access to all the raw headers.</div><div class='del'>-	(folder_scan_header): Keep track of the header start position, and</div><div class='del'>-	store it when saving the header.</div><div class='del'>-</div><div class='del'>-2000-04-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Moved a bunch of printf's to debug.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Moved a bunch of printf's to debug.</div><div class='del'>-	(folder_scan_header): Detect end of each header line using the</div><div class='del'>-	last scanned char, and not the last scanned position.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.[ch]: Indexing filter.  Indexes unicode</div><div class='del'>-	sequences into ibex files.</div><div class='del'>-</div><div class='del'>-2000-04-09  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: Dont include gmime-base64.h</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Implement the completion</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): If we get to the end of</div><div class='del'>-	the body data, check any filters for outstanding completion data.</div><div class='del'>-	(camel_mime_parser_scan_from): Set whether we scan for "From "</div><div class='del'>-	headers or not.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_read): If we get to end of stream on</div><div class='del'>-	the source, then call the filtering completion function to see if</div><div class='del'>-	we have any more data to return.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Implement quoted printable</div><div class='del'>-	encoding and decoding filters.</div><div class='del'>-	(complete): And the complete function as well.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_close): Also take an input</div><div class='del'>-	buffer, allow closing of filters.</div><div class='del'>-	(quoted_encode_step): First cut, simple quoted-printable encoder.</div><div class='del'>-	Doesn't handle trailing spaces/tabs on end of line properly yet.</div><div class='del'>-	(quoted_encode_close): Complete a quoted-encoding.</div><div class='del'>-	(is_qpsafe): New type check, for quoted-printable safe characters</div><div class='del'>-	(that do not need encoding).  Thats all bits used in the type</div><div class='del'>-	table!  Rebuilt the types table.</div><div class='del'>-	(header_content_type_is): Checks a content type against at</div><div class='del'>-	type/subtype match.</div><div class='del'>-	(header_content_type_param): Handle NULL content type pointer.</div><div class='del'>-</div><div class='del'>-2000-04-08  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Implement the base64</div><div class='del'>-	encoder.  Problem is, there is no way to know when to close it.</div><div class='del'>-	Close/Reset will have to provide the same args as filter, so it can</div><div class='del'>-	flush remaining data *sigh*</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step): A rather complex base64</div><div class='del'>-	encoder, fast?</div><div class='del'>-	(base64_step_close): Companion function to finish off the base64</div><div class='del'>-	sequence.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): Changed to use</div><div class='del'>-	camel_stream_write_to_stream().</div><div class='del'>-</div><div class='del'>-	* camel-stream.[ch] (camel_stream_write_to_stream): From</div><div class='del'>-	camel_stream_b64_write_to_stream().  Fixed some infinite loop</div><div class='del'>-	bugs with error conditions.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.[ch] (camel_stream_b64_write_to_stream): Removed.</div><div class='del'>-	This has nothing to do with stream-b64, so i've moved it to</div><div class='del'>-	CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add a comment about refcounting</div><div class='del'>-	header_content_type struct.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-stream-filter*.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.[ch]: Class to implement a generic</div><div class='del'>-	(multipass) filter ontop of a stream.  Only implements a read-only</div><div class='del'>-	stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_filter_add): Ref the</div><div class='del'>-	filter we just added.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-filter*.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.[ch]: A filter to preform character set</div><div class='del'>-	conversion (uses unicode_iconv).</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-save.[ch]: A simple filter which will save all</div><div class='del'>-	data directly to a file or file descriptor.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.[ch]: Implements the basic mime filters,</div><div class='del'>-	base64 and quoted-printable decoding (encoding not implemented yet).</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.[ch]: A filtering class, which can filter streams</div><div class='del'>-	of data without having to copy them.  Simpler than stream classes,</div><div class='del'>-	and can be plugged into a single stream class (when i write it).</div><div class='del'>-</div><div class='del'>-2000-04-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Clarify error</div><div class='del'>-	messages.</div><div class='del'>-	(finalize): fix a bug in camel_exception usage</div><div class='del'>-	(pop3_connect): Remember the password after asking for it the</div><div class='del'>-	first time.</div><div class='del'>-</div><div class='del'>-2000-04-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-parser/camel-mime-utils.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Fast mime parser.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Mime utility functions, and email header</div><div class='del'>-	parsers.</div><div class='del'>-</div><div class='del'>-2000-04-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Removed smtp for now, its a long way from</div><div class='del'>-	building.</div><div class='del'>-	* providers/smtp/Makefile.in: Removed file that shouldn't have been</div><div class='del'>-	checked in.</div><div class='del'>-</div><div class='del'>-2000-04-06  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (_get_full_name): Remove exception param</div><div class='del'>-	from get_full_name() called, since get_full_name() was changed to</div><div class='del'>-	not have an exception in the last param (see dan's notes below).</div><div class='del'>-	(_get_name): same.</div><div class='del'>-</div><div class='del'>-2000-04-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.[ch]: Reorganize the folder-fetching methods and</div><div class='del'>-	implement a folder cache so that multiple requests for the same</div><div class='del'>-	folder will yield the same CamelFolder object (as long as it</div><div class='del'>-	remains active). Includes some code to remove no-longer-active</div><div class='del'>-	folders from the cache, but it doesn't get used since nothing is</div><div class='del'>-	ever unref'ed in Camel right now...</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-store.c:</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: update for CamelStore</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove the (unused) CamelException argument</div><div class='del'>-	from camel_folder_get_name and camel_folder_get_full_name.</div><div class='del'>-	(camel_folder_set_name): make this go away since changing a</div><div class='del'>-	folder's name after it has been created could result in it</div><div class='del'>-	conflicting with a separately-issued folder.</div><div class='del'>-	</div><div class='del'>-2000-04-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* g_url_new really wanted to take a CamelException. So, rename</div><div class='del'>-	Gurl to CamelURL, g_url_* to camel_url_* (with camel_url_new</div><div class='del'>-	taking an exception), and url-util.[ch] to camel-url.[ch]. Also</div><div class='del'>-	force url-&gt;port to be numeric and remove camel_service_getport. (I</div><div class='del'>-	was confused before: the URL RFC says the port must be numeric, so</div><div class='del'>-	we don't want to do getportbyname.)</div><div class='del'>-</div><div class='del'>-2000-04-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Compare</div><div class='del'>-	mbox_file_size and mbox_modtime to the results of stat()ing the</div><div class='del'>-	mbox file, not the summary file. Duh.</div><div class='del'>-	(_close): Update the summary's mbox_file_size and mbox_modtime</div><div class='del'>-	before writing it to disk.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_save,</div><div class='del'>-	camel_mbox_summary_load): Wow. I must have been tired when I wrote</div><div class='del'>-	this code. First, the comparison bug above. Second, it was using</div><div class='del'>-	ntohs and htons instead of ntohl and htonl. Third, I was reading</div><div class='del'>-	the status flag byte in two different places and thus getting out</div><div class='del'>-	of sync. Fourth, it was writing out field_length bytes of each</div><div class='del'>-	header field after having converted field_length to network byte</div><div class='del'>-	order, resulting in lots of random crap being appended, and the</div><div class='del'>-	summary files being huge. (Fortunately, since the size/modtime</div><div class='del'>-	comparison was biffed, the garbage summary read from disk was</div><div class='del'>-	always immediately discarded.)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): fix</div><div class='del'>-	an off-by-one error that caused the last-used UID to be reused if</div><div class='del'>-	the summary file was regenerated. (That one wasn't my fault. :-)</div><div class='del'>-</div><div class='del'>-2000-03-31  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: implement unimplemented methods</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c</div><div class='del'>-	(gmime_content_field_construct_from_string):</div><div class='del'>-	* data-wrapper-repository.c</div><div class='del'>-	(data_wrapper_repository_get_data_wrapper_type):</div><div class='del'>-	* camel-simple-data-wrapper.c (my_write_to_stream):</div><div class='del'>-	* camel-mime-part.c (my_set_input_stream):</div><div class='del'>-	remove debugging printf()s that no longer seem useful.</div><div class='del'>-</div><div class='del'>-2000-03-31  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (text_to_html): Added "convert_newlines_to_br"</div><div class='del'>-	boolean param, to give the option of not converting '\n's to &lt;br&gt;</div><div class='del'>-	tags. This way, when we stick stuff in a &lt;pre&gt; tag, newlines stay</div><div class='del'>-	newlines.</div><div class='del'>-</div><div class='del'>-2000-03-30  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_text_plain): Use &lt;pre&gt; tag to force</div><div class='del'>-	the use of monospaced fonts.</div><div class='del'>-</div><div class='del'>-2000-03-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_getport): Add a htons in the</div><div class='del'>-	default_number case, and document the fact that the function</div><div class='del'>-	returns the port in network byte order.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert</div><div class='del'>-	Miguel's change. The port number bug was actually somewhere</div><div class='del'>-	else, and the IP address copying code was fine already.</div><div class='del'>-	</div><div class='del'>-2000-03-29  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Add htons</div><div class='del'>-	(port), and only copy 4 bytes for the IP address to prevent a DNS</div><div class='del'>-	attack. </div><div class='del'>-</div><div class='del'>-2000-03-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):</div><div class='del'>-	make this return a CamelStream rather than a</div><div class='del'>-	CamelSeekableSubstream, because that's the way Gtk objects tend to</div><div class='del'>-	work.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_gethost,</div><div class='del'>-	camel_service_getport): convenience functions to canonicalize</div><div class='del'>-	the host and port values of a service's URL.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: use them</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Make this work when</div><div class='del'>-	the inbox file doesn't yet exist.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): uncomment</div><div class='del'>-	the call to unlink the temp file: there's no way to tell</div><div class='del'>-	camel_stream_fs to truncate a file, so reusing the same file was</div><div class='del'>-	resulting in junk at the ends of messages.</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: add delete_message_by_{number,uid}.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.[ch]: implement</div><div class='del'>-	delete_message_by_uid. Add a close method to do expunging</div><div class='del'>-	of deleted messages if requested.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.[ch]: support for</div><div class='del'>-	CamelPop3Folder::close. (You have to close the connection</div><div class='del'>-	in order to expunge the folder, thus the store may be</div><div class='del'>-	connected in the CamelService::is_connected sense when it</div><div class='del'>-	is not actually connected to the server.) Also some bugfixes.</div><div class='del'>-</div><div class='del'>-2000-03-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): Unref the</div><div class='del'>-	output_stream when done, close doesn't do it.</div><div class='del'>-	(_append_message): Clear all uid's from the appending messages, so</div><div class='del'>-	they are reassigned proper unique id's.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (get_header_array_from_stream): Actually free the</div><div class='del'>-	header, it is copied elsewhere.</div><div class='del'>-</div><div class='del'>-2000-03-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Added</div><div class='del'>-	folder parameter to function.  Fixed callers.</div><div class='del'>-	(index_message): Index a message as it is assigned a unique id.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_content_id): Make sure we malloc and</div><div class='del'>-	copy the content_id, otherwise *poof*</div><div class='del'>-</div><div class='del'>-2000-03-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_finalize): Another leak, unref the content if</div><div class='del'>-	finished with it.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.c (camel_recipient_table_free): Plug another</div><div class='del'>-	memory leak - actually free the recipient table.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (_finalize): Plugged a memory leak with the</div><div class='del'>-	flags table.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): A simpler, more</div><div class='del'>-	debuggable and functionally identical header extraction function.</div><div class='del'>-</div><div class='del'>-2000-03-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_set_parameter):</div><div class='del'>-	Remove the hash table entry before freeing its key and data.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Add pop3.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: keep separate input and</div><div class='del'>-	output streams so the output doesn't end up being buffered.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	finish implementing this.</div><div class='del'>-</div><div class='del'>-2000-03-27  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_disposition): fix so less broken.</div><div class='del'>-	(my_finalize): remove dodgy disposition free.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_set_mime_type_field): unref instead of</div><div class='del'>-	free on mime_type.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_free_auth_types): new routine to</div><div class='del'>-	free the data allocated by camel_service_query_auth_types.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (free_auth_types): implement</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): rename</div><div class='del'>-	camel_stream_mem_new_with_buffer to ..._with_byte_array and add a</div><div class='del'>-	new ..._with_buffer that takes a char * rather than a GByteArray.</div><div class='del'>-</div><div class='del'>-	* Remove CamelStreamBufferedFs, since CamelStreamBuffer makes it</div><div class='del'>-	redundant.</div><div class='del'>-</div><div class='del'>-2000-03-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: change the CamelFolderSummary</div><div class='del'>-	interfaces to allow partial summary queries (for dealing</div><div class='del'>-	with very large folders). Remove the "extended_fields" from</div><div class='del'>-	CamelFolderInfo and CamelMessageInfo: this is better dealt</div><div class='del'>-	with by subtyping.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.[ch]: Make CamelMboxSummary a</div><div class='del'>-	subclass of CamelFolderSummary. Update interfaces for that. Remove</div><div class='del'>-	the internal/external summary distinction. Remove the (unused) md5</div><div class='del'>-	checksum in the folder summary. Change the summary file format</div><div class='del'>-	(primarily to make it no longer byte-order dependent) and add a</div><div class='del'>-	version number to it so it will be easier to change in the future.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.[ch]</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c: update for summary changes</div><div class='del'>-</div><div class='del'>-	* camel-exception-list.def: add</div><div class='del'>-	CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID</div><div class='del'>-	</div><div class='del'>-2000-03-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: Added flag to provider</div><div class='del'>-	initialisation, to match changed structure.</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Added async search api.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Changed to use an</div><div class='del'>-	asynchronous interface.</div><div class='del'>-	(camel_mbox_folder_search_cancel): Cancel function for async</div><div class='del'>-	interface.</div><div class='del'>-</div><div class='del'>-2000-03-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Function</div><div class='del'>-	to read one line of any size from a stream and return it in</div><div class='del'>-	allocated memory.</div><div class='del'>-</div><div class='del'>-2000-03-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): New function</div><div class='del'>-	to query a service for the authentication protocols it supports.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): implement</div><div class='del'>-</div><div class='del'>-	* camel-provider.c (camel_provider_scan): New function to</div><div class='del'>-	scan the provider dir and return a list of all providers.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: fill this in partially</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: make camel_pop3_command</div><div class='del'>-	return the text after "+OK"/"-ERR" and add a separate</div><div class='del'>-	camel_pop3_get_additional_data to get the message body or</div><div class='del'>-	whatever. Also make them take a CamelPop3Store rather than</div><div class='del'>-	a CamelStreamBuffer.</div><div class='del'>-</div><div class='del'>-2000-03-22  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (debug): Disabled some useless debug</div><div class='del'>-	messaging.</div><div class='del'>-</div><div class='del'>-2000-03-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3: some initial bits of the POP3 provider, to</div><div class='del'>-	make Matt happy. Incomplete, untested, etc.</div><div class='del'>-</div><div class='del'>-2000-03-21  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c </div><div class='del'>-	(camel_mbox_summary_append_internal_to_external): copy the size field</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): initialize </div><div class='del'>-	message_info to NULL</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: added the size field.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.h: </div><div class='del'>-	added the received_date field.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c:</div><div class='del'>-	documented all functions.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: name change and </div><div class='del'>-	new fields.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: update to </div><div class='del'>-	conform to name change in the summary fields.</div><div class='del'>-</div><div class='del'>-2000-03-10  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-2000-03-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* s/HelixCode/Helix Code, Inc./ in the copyrights</div><div class='del'>-</div><div class='del'>-2000-03-07  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_mime_part): </div><div class='del'>-	plug mem leaks due to bad documentation</div><div class='del'>-	of camel_content_field_get_mime_type</div><div class='del'>-	(print_camel_body_part): idem</div><div class='del'>-	(handle_multipart_alternative): idem</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_get_mime_type): </div><div class='del'>-	documentation fix.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_finalize): unref the </div><div class='del'>-	content_input_stream if any. </div><div class='del'>-</div><div class='del'>-2000-03-06  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_seek): fix a bogus calculation</div><div class='del'>-	in the return position.</div><div class='del'>-</div><div class='del'>-2000-03-05  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.h: cosmetic fixes.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_read): </div><div class='del'>-	(_seek): fixed the current position so that it refers</div><div class='del'>-	to the current position in the stream, not in its parent.</div><div class='del'>-</div><div class='del'>-2000-03-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Ref the summary</div><div class='del'>-	after we have got it.</div><div class='del'>-</div><div class='del'>-2000-03-04  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): </div><div class='del'>-	stream the raw content instead of nothing if the encoding</div><div class='del'>-	is not supported.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_seek): handle eos more</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (get_bonobo_tag_for_object): </div><div class='del'>-	bonobo-goad-id is the good key to look for. </div><div class='del'>-	(get_bonobo_tag_for_object): close the &lt;object&gt; tag.</div><div class='del'>-	(get_bonobo_tag_for_object): the correct syntax for the</div><div class='del'>-	to set a parameter inside an &lt;object&gt; tag is :</div><div class='del'>-	&lt;object classid="..."&gt; &lt;param name="uid" value="..."&gt; &lt;param ...&gt;</div><div class='del'>-	&lt;/object&gt;</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): </div><div class='del'>-	use set_input_stream instead of construct_from_stream</div><div class='del'>-	to feed the message object. </div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_write_to_stream): reset output stream.</div><div class='del'>-	(my_set_input_stream): unref the previous input stream.</div><div class='del'>-	use the set_output_stream for default behaviour.</div><div class='del'>-	(my_set_output_stream): unref previous output stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): reset content</div><div class='del'>-	object output stream.</div><div class='del'>-</div><div class='del'>-2000-03-03  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make</div><div class='del'>-	sure we open with create with a creation mask.</div><div class='del'>-</div><div class='del'>-2000-03-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_stream): DO NOT assert on</div><div class='del'>-	content type, we have fallback code 4 lines below it ... *sigh*</div><div class='del'>-</div><div class='del'>-2000-02-29  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer</div><div class='del'>-	to build.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.[ch]: Generic buffer which can be applied to</div><div class='del'>-	any stream.</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_image): in the case</div><div class='del'>-	of images, put the content object output stream</div><div class='del'>-	in the url. This allows the message browser</div><div class='del'>-	to show inline images.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): fixed state</div><div class='del'>-	0 keep value. </div><div class='del'>-</div><div class='del'>-2000-03-02  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): don't forget to </div><div class='del'>-	set the state to 0 after 3.</div><div class='del'>-	(my_read_encode): don't forget to encode, even in state 3.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c: static functions are prefixed </div><div class='del'>-	with my_ instead of _</div><div class='del'>-	* camel-multipart.c: static functions are prefixed </div><div class='del'>-	with my_ instead of _</div><div class='del'>-	(my_write_to_stream): commented.</div><div class='del'>-	(my_write_to_stream): warning in case the boudary is set</div><div class='del'>-	but is a zero length string.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_encoding_from_string): </div><div class='del'>-	remove debug trace. </div><div class='del'>-	</div><div class='del'>-	* camel-mime-part.c: Replaced all static functions</div><div class='del'>-	with name begining with _ by the same name begining</div><div class='del'>-	with "my_" to prevent the possible conflicts </div><div class='del'>-	with system symbols Dan warned us about. </div><div class='del'>-	</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): </div><div class='del'>-	use CamelStreamB64 type for the input stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (_get_content_object): remove </div><div class='del'>-	debugging trace</div><div class='del'>-	(_write_content_to_stream): implement the b64 </div><div class='del'>-	encoding the new way (that is using camel_stream_b64)</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_write_to_stream): </div><div class='del'>-	fix implementation so that it writes properly</div><div class='del'>-	to the output stream even.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): </div><div class='del'>-	fix implementation. </div><div class='del'>-</div><div class='del'>-2000-02-29  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): new</div><div class='del'>-	utility function. </div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (_write_to_stream): default</div><div class='del'>-	implementation. </div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): </div><div class='del'>-	revert strange changes. </div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_decode): set eos to true when we</div><div class='del'>-	have read the whole input stream. </div><div class='del'>-	(my_reset): set eos to FALSE.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (_parse_header_pair): Dont free this either.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_remove_header): Ugh, dont free the header</div><div class='del'>-	before we actually remove it.</div><div class='del'>-	(_add_header): Ugh, dont free hashtable entries which may be</div><div class='del'>-	duplicated (hash_insert _will_ reference that memory).</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_trim): Trimming a 0-length string is not</div><div class='del'>-	an error.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (_parse_header_pair): Fixed very broken</div><div class='del'>-	memory handling of header_name/value.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev):</div><div class='del'>-	Initialise end_of_last_message always.</div><div class='del'>-	(camel_mbox_copy_file_chunk): Stop trying to read if we run out of</div><div class='del'>-	data, rather than looping forever.</div><div class='del'>-	(camel_mbox_write_xev): Use an open flag when opening with create.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_expression): No, its not</div><div class='del'>-	a fatal error to search on a non-searchable folder, you just dont</div><div class='del'>-	get any matches.</div><div class='del'>-	(_open): Dont open an opened folder (i dont see why this is really</div><div class='del'>-	a bug, but what the hell ...)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_init): Set search cap on.</div><div class='del'>-	(_open): Call parent class to perform open.  Remove folder-open</div><div class='del'>-	check to parent instead.</div><div class='del'>-	(_create): open takes a creation mask, dont use umask to try and</div><div class='del'>-	set the open mode.</div><div class='del'>-	(_delete): Dont bother checking folder==NULL, its already been</div><div class='del'>-	checked on the external interface (changed to an assertion, this</div><div class='del'>-	would have to be a camel bug).</div><div class='del'>-	(_delete_messages): Likewise.</div><div class='del'>-	(_create): Ditto.</div><div class='del'>-	(_init): Dont go and clear all the paths and shit that the parent</div><div class='del'>-	open just setup for us.</div><div class='del'>-	(_delete_messages): Get rid of more umask stuff.</div><div class='del'>-	(_append_message): Make sure we pass file mode to open with create.</div><div class='del'>-	(_append_message): Cleaned up some indenting to make it readable.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): Fixed a typo.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: Changed to use e-sexp,</div><div class='del'>-	rather than filter-sexp.</div><div class='del'>-</div><div class='del'>-2000-02-28  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): encoding</div><div class='del'>-	filter.</div><div class='del'>-</div><div class='del'>-2000-02-23  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c: changed the __static </div><div class='del'>-	suffix into a my_ prefix. </div><div class='del'>-	(camel_stream_b64_set_mode): reset the persistent</div><div class='del'>-	status. </div><div class='del'>-	(my_read_decode): remove superfluous %</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_copy_file_chunk): </div><div class='del'>-	fix exception description message.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Add camel_session_get_transport_for_protocol.</div><div class='del'>-</div><div class='del'>-	* camel-transport.h:</div><div class='del'>-	* camel-transport.c: Add an abstract CamelTransport class.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/*: A CamelTransport that uses sendmail</div><div class='del'>-	to deliver mail.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: use CamelExceptions for run-time errors, not</div><div class='del'>-	incorrect code. Don't bother validating that an object exists from</div><div class='del'>-	inside one of its methods, since you couldn't have gotten there if</div><div class='del'>-	it didn't. Fix some code style bugs.</div><div class='del'>-</div><div class='del'>-	(_init): Rename init_with_store to init and add parent_folder,</div><div class='del'>-	separator, and name arguments.</div><div class='del'>-	(_set_name): Get separator from self, not parent_store now.</div><div class='del'>-</div><div class='del'>-	* camel-store.h:</div><div class='del'>-	* camel-store.c: Remove get/set_separator.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/: Update for above.</div><div class='del'>-</div><div class='del'>-2000-02-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_finalize): Free the data in the headers hash</div><div class='del'>-	table.</div><div class='del'>-	(_add_header): g_strdup the header name and value when adding it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream): Free the header</div><div class='del'>-	data after calling camel_medium_add_header, since it will have</div><div class='del'>-	g_strdup()ed it itself.</div><div class='del'>-</div><div class='del'>-2000-02-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: Dont compile by default.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Fuck off the filter code.</div><div class='del'>-</div><div class='del'>-2000-02-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (read_decode__static): </div><div class='del'>-	don't read the char if we reached the length</div><div class='del'>-	of the output buffer. Hours lost on this</div><div class='del'>-	%$!@# bug : 3.5</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_subfolder): </div><div class='del'>-	(camel_folder_create): </div><div class='del'>-	(camel_folder_delete): </div><div class='del'>-	(camel_folder_delete_messages): </div><div class='del'>-	(camel_folder_list_subfolders): </div><div class='del'>-	(camel_folder_expunge): </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	(camel_folder_get_message_count): </div><div class='del'>-	(camel_folder_append_message): </div><div class='del'>-	(camel_folder_copy_message_to): </div><div class='del'>-	(camel_folder_get_summary): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Check folder state (open/close) and raise an</div><div class='del'>-	exception if it is not ok. </div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_create): </div><div class='del'>-	create the file and the path with two different</div><div class='del'>-	names.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_create): handle the case </div><div class='del'>-	when the folder name starts with '/'</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_new): use </div><div class='del'>-	(void) instead of () in decl.</div><div class='del'>-</div><div class='del'>-	* camel-exception.h: cosmetic fixes.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_init): new routine.</div><div class='del'>-	Fix a bug in mail/message-list.c</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (reset__static): added a</div><div class='del'>-	reset method. Thanks message-browser to find</div><div class='del'>-	so much bugs :)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd</div><div class='del'>-	Unicode libs.</div><div class='del'>-</div><div class='del'>-2000-02-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (lookup_unique_id): </div><div class='del'>-	awful hack to test get_output_stream.</div><div class='del'>-	* camel-stream-b64.[ch] :</div><div class='del'>-	b64 encoding/decoding is now implemented as</div><div class='del'>-	a stream. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-02-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (_reemit_parent_signal): </div><div class='del'>-	emit "data_available" when parent stream emits it. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-21  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Uh, fixed LIBADD again.  What was</div><div class='del'>-	there was never ever going to work, wasn't it tested?</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.h: (struct _CamelSession): Add authenticator.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_new): Add authenticator.</div><div class='del'>-	(camel_session_query_authenticator): New function to query the</div><div class='del'>-	session authenticator for password, etc, information.</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: add CamelExceptions to several functions. Use</div><div class='del'>-	camel_session_new to initialize the session and URL fields of</div><div class='del'>-	created CamelStores as appropriate.</div><div class='del'>-</div><div class='del'>-	* camel-store.h:</div><div class='del'>-	* camel-store.c</div><div class='del'>-	* camel-service.h:</div><div class='del'>-	* camel-service.c: Move the session and url (and associated</div><div class='del'>-	functions) from CamelStore to CamelService. Add url_flags to</div><div class='del'>-	CamelService so subclasses can specify which URL components</div><div class='del'>-	are mandatory for them.	Add camel_session_new for</div><div class='del'>-	camel_session_get_store* to use.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-store.c:</div><div class='del'>-	* providers/mbox/camel-mbox-store.h: Update for above changes.</div><div class='del'>-</div><div class='del'>-	* camel-exception-list.def: Once camel is being used for real,</div><div class='del'>-	exceptions won't be renumberable. So renumber them now to make</div><div class='del'>-	more room to add exceptions to the various categories later, and</div><div class='del'>-	add a big warning message.</div><div class='del'>-</div><div class='del'>-2000-02-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: add libibex back to</div><div class='del'>-	libcamelmbox_la_LIBADD</div><div class='del'>-</div><div class='del'>-2000-02-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.h</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Added exception to call,</div><div class='del'>-	and fixed caller.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Major changes, to use</div><div class='del'>-	the sexp evaluator from filter/filter-sexp.c to implement the</div><div class='del'>-	searching.</div><div class='del'>-	(func_body_contains): Changed to support multiple strings in 1</div><div class='del'>-	command (results or'd together)</div><div class='del'>-</div><div class='del'>-	* url-util.c (g_url_new): Fixed a typo (colon == 0 isn't right),</div><div class='del'>-	and made it so full url's are absolute pathed (Dan, this is how it</div><div class='del'>-	has to work!).  Also, always include a path part, even if it is an</div><div class='del'>-	empty string.</div><div class='del'>-</div><div class='del'>-2000-02-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-types.h: New header with the typedefs for all camel</div><div class='del'>-	classes. Now the class headers can just include this and the</div><div class='del'>-	header for the parent type. This makes it possible for</div><div class='del'>-	CamelService to include a CamelSession without creating an</div><div class='del'>-	#include loop.</div><div class='del'>-</div><div class='del'>-	* camel/*:	</div><div class='del'>-	* composer/e-msg-composer-attachment-bar.h:</div><div class='del'>-	* mail/folder-browser.c:</div><div class='del'>-	* mail/message-list.c: frob #includes to match the new reality</div><div class='del'>-</div><div class='del'>-2000-02-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.h:</div><div class='del'>-	* camel/camel-service.c: Make camel-service us a Gurl internally.</div><div class='del'>-	Remove the login/password interfaces and instead provide</div><div class='del'>-	camel_service_connect_with_url. Add CamelExceptions</div><div class='del'>-</div><div class='del'>-2000-02-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (handle_text_plain): </div><div class='del'>-	(handle_text_html): use camel_stream_reset instead</div><div class='del'>-	of seek. The formatter should be able to work </div><div class='del'>-	with all streams, not only seekable streams. </div><div class='del'>-	In the case where some provider implementation</div><div class='del'>-	would not be able to provide a reset method </div><div class='del'>-	to their stream, implementors would have</div><div class='del'>-	to find a workaround.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_new): use</div><div class='del'>-	(void) instean of () in function decl.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: ifdef async operation </div><div class='del'>-	related code. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (_seek): added a warning.</div><div class='del'>-	(_reset): default implementation of reset for seekable</div><div class='del'>-	stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: set_received_date declaration fix.</div><div class='del'>-	cosmetic changes.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c (camel_provider_module_init): </div><div class='del'>-	use (void) instead of ().</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_reset): </div><div class='del'>-	new method for CamelStream.</div><div class='del'>-</div><div class='del'>-2000-02-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_to_string): New function to convert</div><div class='del'>-	a Gurl back into a char *.</div><div class='del'>-</div><div class='del'>-2000-02-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (handle_text_plain): </div><div class='del'>-	revamped so that it uses the output stream</div><div class='del'>-	of the data wrapper</div><div class='del'>-	(handle_text_html): ditto.</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	* camel/camel-simple-data-wrapper.h: </div><div class='del'>-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new): </div><div class='del'>-	use (void) instead of ().</div><div class='del'>-	(_get_output_stream): simple implementation. </div><div class='del'>-</div><div class='del'>-2000-02-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_set_input_stream): ref input stream</div><div class='del'>-	(_set_output_stream): ref output stream</div><div class='del'>-	(_finalize): unref input and output streams</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_set_bounds): don't</div><div class='del'>-	seek the begining of the substream.</div><div class='del'>-	(_eos): fix eos condition testing. </div><div class='del'>-	(_finalize): unref parent stream</div><div class='del'>-	(_init_with_seekable_stream_and_bounds): ref parent stream</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_equal_for_hash): </div><div class='del'>-	(g_string_equal_for_glist): return type is int.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: </div><div class='del'>-	* camel/camel.c (camel_init): use (void) </div><div class='del'>-	instead of ().</div><div class='del'>-	</div><div class='del'>-2000-02-16  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Added</div><div class='del'>-	libfilter to link line (temporarily?).  Required for</div><div class='del'>-	filter-sexp.</div><div class='del'>-</div><div class='del'>-2000-02-15  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_localize_part): </div><div class='del'>-	this routine replaces the _read_part routine</div><div class='del'>-	and does not store the part in a buffer. </div><div class='del'>-	(_set_input_stream): use the set_input_stream</div><div class='del'>-	instead of the construct_from_stream.</div><div class='del'>-	each bodypart is given an input stream. </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c: </div><div class='del'>-	include the data-wrapper-repository header. </div><div class='del'>-	(camel_mime_part_construct_content_from_stream): </div><div class='del'>-	use the set_input_stream instead of the </div><div class='del'>-	construct_from_stream method. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_set_bounds): </div><div class='del'>-	cur position is set to 0 not to inf_bound.</div><div class='del'>-</div><div class='del'>-2000-02-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c: include gmime-base64.h</div><div class='del'>-	various compilation and runtime fixes.</div><div class='del'>-	(_set_input_stream): store the input substream </div><div class='del'>-	for the content object.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: declare the </div><div class='del'>-	set/get function on input/output stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_object): </div><div class='del'>-	don't use a temporary mem stream. 	</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_seek): </div><div class='del'>-	(_eos): </div><div class='del'>-	(_read): the substream can be unlimited in length</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_class_init): </div><div class='del'>-	set the get/set_input/output_stream methods. 	</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): </div><div class='del'>-	camel_stream_seek -&gt; camel_seekable_stream_seek</div><div class='del'>-</div><div class='del'>-2000-02-14  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add</div><div class='del'>-	the unicode libraries as well.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): Add</div><div class='del'>-	error reporting here.  Desire to use Solaris increases.  Hair loss</div><div class='del'>-	in the last two hours: 5,400.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c</div><div class='del'>-	(camel_mbox_get_provider): Renamed function.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: All include files use camel/ now here.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am: Drop all the dynamism from</div><div class='del'>-	Camel, and make this a standard library.</div><div class='del'>-</div><div class='del'>-2000-02-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_array_from_stream): use the </div><div class='del'>-	eos stream method. </div><div class='del'>-	(gmime_read_line_from_stream): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h (struct ): add the eof field</div><div class='del'>-	cosmetics changes. </div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_init): set eof.</div><div class='del'>-	(_read): set eof on end of file.</div><div class='del'>-	(_eos): implemented.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_array_from_stream): </div><div class='del'>-	make a blocking version of the header parser. </div><div class='del'>-	When the fs stream uses gnome-vfs, this should</div><div class='del'>-	be changed. </div><div class='del'>-	(gmime_read_line_from_stream): ditto. </div><div class='del'>-</div><div class='del'>-2000-02-11  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c: </div><div class='del'>-	everywhere, when using the cur_pos field, do it</div><div class='del'>-	on the CamelSeekableStream object.</div><div class='del'>-	(_seek): small fix. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (camel_seekable_stream_seek): </div><div class='del'>-	s/camel_stream_seek/camel_seekable_stream_seek/g</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.h: </div><div class='del'>-	(struct ): added a field to store the</div><div class='del'>-	current position.</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (camel_seekable_stream_get_current_position): </div><div class='del'>-	New function. Allows to get the current position </div><div class='del'>-	of a seekable stream.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-02-13  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: New file, implements the</div><div class='del'>-	search api for mbox folders.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Link with ibex.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_has_search_capability): Api</div><div class='del'>-	additions.</div><div class='del'>-	(camel_folder_search_by_expression): Ditto.</div><div class='del'>-</div><div class='del'>-2000-02-12  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_set_name): Setup index</div><div class='del'>-	filename as well.</div><div class='del'>-	(_init_with_store): Init index filename.  Hmm, none of these</div><div class='del'>-	names ever seem to get free'd (FIXME?)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h: Add index file name.</div><div class='del'>-</div><div class='del'>-2000-02-12  NotZed  &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Add folder search functions.</div><div class='del'>-</div><div class='del'>-	** Created ChangeLog just for camel **</div><div class='del'>-	 - refer to ../ChangeLog for changes prior to this date.</div><div class='head'>diff --git a/camel/Makefile.am b/camel/Makefile.am<br/>deleted file mode 100644<br/>index 7937c7aa1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,274 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = providers tests</div><div class='del'>-</div><div class='del'>-libcamelincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-sbin_PROGRAMS =	camel-lock-helper camel-index-control</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcamel.la</div><div class='del'>-noinst_LTLIBRARIES = libcamel-static.la</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. -I$(srcdir)/.. 			 	\</div><div class='del'>-	-I$(top_srcdir)/intl			 	\</div><div class='del'>-	-I$(top_srcdir)/e-util			 	\</div><div class='del'>-	-DCAMEL_SBINDIR=\""$(sbindir)"\"	 	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" 	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel\"			\</div><div class='del'>-	$(CAMEL_CFLAGS)</div><div class='del'>-</div><div class='del'>-libcamel_la_SOURCES = 				\</div><div class='del'>-	broken-date-parser.c			\</div><div class='del'>-	camel-address.c				\</div><div class='del'>-	camel-arg.c				\</div><div class='del'>-	camel-block-file.c			\</div><div class='del'>-	camel-cipher-context.c			\</div><div class='del'>-	camel-cms-context.c			\</div><div class='del'>-	camel-data-cache.c			\</div><div class='del'>-	camel-data-wrapper.c			\</div><div class='del'>-	camel-digest-folder.c			\</div><div class='del'>-	camel-digest-store.c			\</div><div class='del'>-	camel-disco-diary.c			\</div><div class='del'>-	camel-disco-folder.c			\</div><div class='del'>-	camel-disco-store.c			\</div><div class='del'>-	camel-exception.c			\</div><div class='del'>-	camel-file-utils.c			\</div><div class='del'>-	camel-filter-driver.c			\</div><div class='del'>-	camel-filter-search.c			\</div><div class='del'>-	camel-folder-search.c			\</div><div class='del'>-	camel-folder-summary.c			\</div><div class='del'>-	camel-folder-thread.c			\</div><div class='del'>-	camel-folder.c				\</div><div class='del'>-	camel-html-parser.c			\</div><div class='del'>-	camel-http-stream.c			\</div><div class='del'>-	camel-index.c				\</div><div class='del'>-	camel-internet-address.c		\</div><div class='del'>-	camel-lock.c				\</div><div class='del'>-	camel-lock-client.c			\</div><div class='del'>-	camel-medium.c				\</div><div class='del'>-	camel-mime-filter-bestenc.c		\</div><div class='del'>-	camel-mime-filter-basic.c		\</div><div class='del'>-	camel-mime-filter-charset.c		\</div><div class='del'>-	camel-mime-filter-chomp.c		\</div><div class='del'>-	camel-mime-filter-crlf.c		\</div><div class='del'>-	camel-mime-filter-from.c		\</div><div class='del'>-	camel-mime-filter-html.c		\</div><div class='del'>-	camel-mime-filter-tohtml.c		\</div><div class='del'>-	camel-mime-filter-index.c		\</div><div class='del'>-	camel-mime-filter-linewrap.c		\</div><div class='del'>-	camel-mime-filter-save.c		\</div><div class='del'>-	camel-mime-filter.c			\</div><div class='del'>-	camel-mime-message.c			\</div><div class='del'>-	camel-mime-parser.c			\</div><div class='del'>-	camel-mime-part-utils.c			\</div><div class='del'>-	camel-mime-part.c			\</div><div class='del'>-	camel-mime-utils.c			\</div><div class='del'>-	camel-movemail.c			\</div><div class='del'>-	camel-multipart.c			\</div><div class='del'>-	camel-object.c				\</div><div class='del'>-	camel-operation.c			\</div><div class='del'>-	camel-partition-table.c			\</div><div class='del'>-	camel-pgp-context.c			\</div><div class='del'>-	camel-pgp-mime.c			\</div><div class='del'>-	camel-smime-context.c			\</div><div class='del'>-	camel-smime-utils.c			\</div><div class='del'>-	camel-provider.c			\</div><div class='del'>-	camel-remote-store.c			\</div><div class='del'>-	camel-sasl.c				\</div><div class='del'>-	camel-sasl-anonymous.c			\</div><div class='del'>-	camel-sasl-cram-md5.c			\</div><div class='del'>-	camel-sasl-digest-md5.c			\</div><div class='del'>-	camel-sasl-kerberos4.c			\</div><div class='del'>-	camel-sasl-login.c			\</div><div class='del'>-	camel-sasl-ntlm.c			\</div><div class='del'>-	camel-sasl-plain.c			\</div><div class='del'>-	camel-sasl-popb4smtp.c			\</div><div class='del'>-	camel-search-private.c			\</div><div class='del'>-	camel-seekable-stream.c			\</div><div class='del'>-	camel-seekable-substream.c		\</div><div class='del'>-	camel-service.c				\</div><div class='del'>-	camel-session.c				\</div><div class='del'>-	camel-store.c				\</div><div class='del'>-	camel-store-summary.c			\</div><div class='del'>-	camel-stream-buffer.c			\</div><div class='del'>-	camel-stream-filter.c			\</div><div class='del'>-	camel-stream-fs.c			\</div><div class='del'>-	camel-stream-mem.c			\</div><div class='del'>-	camel-stream-null.c			\</div><div class='del'>-	camel-stream.c				\</div><div class='del'>-	camel-text-index.c			\</div><div class='del'>-	camel-tcp-stream-raw.c			\</div><div class='del'>-	camel-tcp-stream-ssl.c			\</div><div class='del'>-	camel-tcp-stream-openssl.c		\</div><div class='del'>-	camel-tcp-stream.c			\</div><div class='del'>-	camel-transport.c			\</div><div class='del'>-	camel-uid-cache.c			\</div><div class='del'>-	camel-url.c				\</div><div class='del'>-	camel-vee-folder.c			\</div><div class='del'>-	camel-vee-store.c			\</div><div class='del'>-	camel-vtrash-folder.c			\</div><div class='del'>-	camel-charset-map.c			\</div><div class='del'>-	camel.c					\</div><div class='del'>-	gstring-util.c				\</div><div class='del'>-	hash-table-utils.c			\</div><div class='del'>-	string-utils.c</div><div class='del'>-</div><div class='del'>-libcamelinclude_HEADERS =			\</div><div class='del'>-	broken-date-parser.h			\</div><div class='del'>-	camel-address.h				\</div><div class='del'>-	camel-arg.h				\</div><div class='del'>-	camel-block-file.h			\</div><div class='del'>-	camel-charset-map.h			\</div><div class='del'>-	camel-cipher-context.h			\</div><div class='del'>-	camel-cms-context.h			\</div><div class='del'>-	camel-data-cache.h			\</div><div class='del'>-	camel-data-wrapper.h			\</div><div class='del'>-	camel-digest-folder.h			\</div><div class='del'>-	camel-digest-store.h			\</div><div class='del'>-	camel-disco-diary.h			\</div><div class='del'>-	camel-disco-folder.h			\</div><div class='del'>-	camel-disco-store.h			\</div><div class='del'>-	camel-exception-list.def		\</div><div class='del'>-	camel-exception.h			\</div><div class='del'>-	camel-file-utils.h			\</div><div class='del'>-	camel-filter-driver.h			\</div><div class='del'>-	camel-filter-search.h			\</div><div class='del'>-	camel-folder-search.h			\</div><div class='del'>-	camel-folder-summary.h			\</div><div class='del'>-	camel-folder-thread.h			\</div><div class='del'>-	camel-folder.h				\</div><div class='del'>-	camel-http-stream.h			\</div><div class='del'>-	camel-index.h				\</div><div class='del'>-	camel-internet-address.h		\</div><div class='del'>-	camel-lock.h				\</div><div class='del'>-	camel-lock-client.h			\</div><div class='del'>-	camel-medium.h				\</div><div class='del'>-	camel-mime-filter-bestenc.h		\</div><div class='del'>-	camel-mime-filter-basic.h		\</div><div class='del'>-	camel-mime-filter-charset.h		\</div><div class='del'>-	camel-mime-filter-chomp.h		\</div><div class='del'>-	camel-mime-filter-crlf.h		\</div><div class='del'>-	camel-mime-filter-from.h		\</div><div class='del'>-	camel-mime-filter-html.h		\</div><div class='del'>-	camel-mime-filter-tohtml.h		\</div><div class='del'>-	camel-mime-filter-index.h		\</div><div class='del'>-	camel-mime-filter-linewrap.h		\</div><div class='del'>-	camel-mime-filter-save.h		\</div><div class='del'>-	camel-mime-filter.h			\</div><div class='del'>-	camel-mime-message.h			\</div><div class='del'>-	camel-mime-parser.h			\</div><div class='del'>-	camel-mime-part-utils.h			\</div><div class='del'>-	camel-mime-part.h			\</div><div class='del'>-	camel-mime-utils.h			\</div><div class='del'>-	camel-movemail.h			\</div><div class='del'>-	camel-multipart.h			\</div><div class='del'>-	camel-object.h				\</div><div class='del'>-	camel-operation.h			\</div><div class='del'>-	camel-partition-table.h			\</div><div class='del'>-	camel-pgp-context.h			\</div><div class='del'>-	camel-pgp-mime.h			\</div><div class='del'>-	camel-smime-context.h			\</div><div class='del'>-	camel-smime-utils.h			\</div><div class='del'>-	camel-provider.h			\</div><div class='del'>-	camel-remote-store.h			\</div><div class='del'>-	camel-sasl.h				\</div><div class='del'>-	camel-sasl-anonymous.h			\</div><div class='del'>-	camel-sasl-cram-md5.h			\</div><div class='del'>-	camel-sasl-digest-md5.h			\</div><div class='del'>-	camel-sasl-kerberos4.h			\</div><div class='del'>-	camel-sasl-login.h			\</div><div class='del'>-	camel-sasl-ntlm.h			\</div><div class='del'>-	camel-sasl-plain.h			\</div><div class='del'>-	camel-sasl-popb4smtp.h			\</div><div class='del'>-	camel-seekable-stream.h			\</div><div class='del'>-	camel-seekable-substream.h		\</div><div class='del'>-	camel-service.h				\</div><div class='del'>-	camel-session.h				\</div><div class='del'>-	camel-store.h				\</div><div class='del'>-	camel-store-summary.h			\</div><div class='del'>-	camel-stream-buffer.h			\</div><div class='del'>-	camel-stream-filter.h			\</div><div class='del'>-	camel-stream-fs.h			\</div><div class='del'>-	camel-stream-mem.h			\</div><div class='del'>-	camel-stream-null.h			\</div><div class='del'>-	camel-stream.h				\</div><div class='del'>-	camel-text-index.h			\</div><div class='del'>-	camel-tcp-stream-raw.h			\</div><div class='del'>-	camel-tcp-stream-ssl.h			\</div><div class='del'>-	camel-tcp-stream.h			\</div><div class='del'>-	camel-transport.h			\</div><div class='del'>-	camel-types.h				\</div><div class='del'>-	camel-uid-cache.h			\</div><div class='del'>-	camel-url.h				\</div><div class='del'>-	camel-vee-folder.h			\</div><div class='del'>-	camel-vee-store.h			\</div><div class='del'>-	camel-vtrash-folder.h			\</div><div class='del'>-	camel.h					\</div><div class='del'>-	gstring-util.h				\</div><div class='del'>-	hash-table-utils.h			\</div><div class='del'>-	string-utils.h</div><div class='del'>-</div><div class='del'>-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)</div><div class='del'>-</div><div class='del'>-libcamel_la_LIBADD =				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la 	\</div><div class='del'>-	$(CAMEL_LIBS)</div><div class='del'>-</div><div class='del'>-libcamel_static_la_SOURCES = $(libcamel_la_SOURCES)</div><div class='del'>-libcamel_static_la_LIBADD  = $(libcamel_la_LIBADD)</div><div class='del'>-libcamel_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-camel_lock_helper_SOURCES = 			\</div><div class='del'>-	camel-lock-helper.c 			\</div><div class='del'>-	camel-lock-helper.h			\</div><div class='del'>-	camel-lock.c				\</div><div class='del'>-	camel-lock.h</div><div class='del'>-</div><div class='del'>-camel_index_control_SOURCES =			\</div><div class='del'>-	camel-index-control.c</div><div class='del'>-</div><div class='del'>-camel_index_control_LDADD =			\</div><div class='del'>-	$(libcamel_la_LIBADD)			\</div><div class='del'>-	libcamel.la				\</div><div class='del'>-	$(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-install-exec-hook:</div><div class='del'>-	@if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \</div><div class='del'>-	    if test `whoami` = root ; then \</div><div class='del'>-	 	chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper ; \</div><div class='del'>-		chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \</div><div class='del'>-	    else \</div><div class='del'>-	    	echo '*** WARNING ***' ; \</div><div class='del'>-		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \</div><div class='del'>-		    echo "    1. Become root" ; \</div><div class='del'>-		    echo "    2. chown $(CAMEL_LOCK_HELPER_USER) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \</div><div class='del'>-		    echo "    3. chmod u+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \</div><div class='del'>-		    echo '*** WARNING ***' ; \</div><div class='del'>-	    fi \</div><div class='del'>-	else \</div><div class='del'>-	    echo "No user to chown to"; \</div><div class='del'>-	fi</div><div class='del'>-	@if test -n "$(CAMEL_LOCK_HELPER_GROUP)"; then \</div><div class='del'>-	    if test `whoami` = root ; then \</div><div class='del'>-	    	chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper ; \</div><div class='del'>-		    chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper ; \</div><div class='del'>-	    else \</div><div class='del'>-	    	echo '*** WARNING ***' ; \</div><div class='del'>-		    echo "Camel will not be able to open mbox files until you perform the following steps:" ; \</div><div class='del'>-		    echo "    1. Become root" ; \</div><div class='del'>-		    echo "    2. chgrp $(CAMEL_LOCK_HELPER_GROUP) $(DESTDIR)$(sbindir)/camel-lock-helper" ; \</div><div class='del'>-		    echo "    3. chmod g+s $(DESTDIR)$(sbindir)/camel-lock-helper" ; \</div><div class='del'>-		    echo '*** WARNING ***' ; \</div><div class='del'>-	    fi \</div><div class='del'>-	else \</div><div class='del'>-	    echo "No user to chown to"; \</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-noinst_HEADERS =				\</div><div class='del'>-	camel-charset-map-private.h		\</div><div class='del'>-	camel-private.h				\</div><div class='del'>-	camel-search-private.h			\</div><div class='del'>-	camel-html-parser.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =					\</div><div class='del'>-	README</div><div class='head'>diff --git a/camel/README b/camel/README<br/>deleted file mode 100644<br/>index 89b57ad3c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-</div><div class='del'>-                                   CAMEL</div><div class='del'>-     </div><div class='del'>-</div><div class='del'>-			A generic Messaging Library</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-                                   ----</div><div class='del'>-				</div><div class='del'>-</div><div class='del'>-Introduction:</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-Camel is a generic messaging library. It supports the standard </div><div class='del'>-messaging system for receiving and sending messages. It is the </div><div class='del'>-messaging backend for Evolution.</div><div class='del'>-</div><div class='del'>-The name "camel" stands for ... nothing. Open area of development there.</div><div class='del'>-You know, that "bazaar" thing. Maybe could we organize a big contest on</div><div class='del'>-gnome-list to find the best explanation :)</div><div class='del'>-</div><div class='del'>-Camel draws heavily from JavaMail and the IMAP4rev1 RFC. People</div><div class='del'>-wanting to hack on a provider should read the JavaMail API</div><div class='del'>-specification, but CMC and MAPI are of interest too.</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-Organization:</div><div class='del'>--------------</div><div class='del'>-</div><div class='del'>-The library is roughly a set of abstract classes, some kind of generic</div><div class='del'>-"interfaces" (IDL interfaces, not Java interfaces).</div><div class='del'>-</div><div class='del'>-Particular implementations are called providers.</div><div class='del'>-</div><div class='del'>-Here are the basic objects:</div><div class='del'>-</div><div class='del'>-* CamelService : An abstract class representing an access to a server.</div><div class='del'>-Handles the connection and authentication to any server.</div><div class='del'>-</div><div class='del'>-* CamelStore (CamelService): A hierarchy of folders on a server.</div><div class='del'>-</div><div class='del'>-* CamelFolder : An object containing messages. A folder is always</div><div class='del'>-associated with a store.</div><div class='del'>-</div><div class='del'>-* CamelMessage : An object contained in folders. Is defined by a set</div><div class='del'>-of attributes and a content. (Attributes include: the date it was</div><div class='del'>-received, the sender address, .....)</div><div class='del'>-</div><div class='del'>-* CamelTransport (CamelService): A way to send messages.</div><div class='del'>-</div><div class='del'>-....</div><div class='del'>-...</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/README.COPYRIGHT b/camel/README.COPYRIGHT<br/>deleted file mode 100644<br/>index bad1b76eb8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README.COPYRIGHT?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/README.COPYRIGHT</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-Important note for Camel hackers:</div><div class='del'>----------------------------------</div><div class='del'>-</div><div class='del'>-Camel has been a lot of work, and has been conceived to be general</div><div class='del'>-enough to be used outside the gnome-mailer. It is possible in the</div><div class='del'>-future that it is used in software with licenses incompatible with the</div><div class='del'>-GPL. For this reason, the copyright has to be owned by a unique</div><div class='del'>-entity.  Be sure, however, that Camel will always be available under</div><div class='del'>-the GPL.  Significant authors will always be consulted before any</div><div class='del'>-special use of Camel. Moreover, in special situations, they may be</div><div class='del'>-given the authorization to use Camel with a license different than the</div><div class='del'>-GPL.</div><div class='del'>-</div><div class='del'>-Thus, when adding code in Camel, always add the following lines at the</div><div class='del'>-begining of the file:</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Copyright 1999, 200x Ximian, Inc. (http://www.ximian.com)</div><div class='del'>- * </div><div class='del'>- * Author: Your name &lt;your.email@address&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of the GNU General Public License as </div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-You may also want to add your name to the author list inside this</div><div class='del'>-header.</div><div class='del'>-</div><div class='del'>-Please contact Ximian, Inc. (http://www.ximian.com) if you want to discuss </div><div class='del'>-this copyright issue.</div><div class='del'>-</div><div class='del'>-Happy hacking,</div><div class='del'>-</div><div class='del'>-Ximian, Inc.</div><div class='head'>diff --git a/camel/README.HACKING b/camel/README.HACKING<br/>deleted file mode 100644<br/>index a4742ee7b8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README.HACKING?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/README.HACKING</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-You want to hack on Camel ?</div><div class='del'>-</div><div class='del'>-Thanks. Camel aims at being the best messaging</div><div class='del'>-library for Linux and your help is welcome. </div><div class='del'>-Please be sure to read the following files before</div><div class='del'>-commiting any change or sending any patch:</div><div class='del'>-</div><div class='del'>-CODING.STYLE</div><div class='del'>-README.COPYRIGHT</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Thanks.</div><div class='del'>-</div><div class='del'>-	Bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;
\ No newline at end of file</div><div class='head'>diff --git a/camel/README.mt b/camel/README.mt<br/>deleted file mode 100644<br/>index aeece1b0bb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/README.mt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/README.mt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-</div><div class='del'>-This version of camel is working towards being multi-thread safe</div><div class='del'>-(MT-SAFE).  At least, for the important api's.</div><div class='del'>-</div><div class='del'>-This code has now been merged into the main head, but this file</div><div class='del'>-will remain here as a log of how it was done, incase any issues</div><div class='del'>-arise.  The ChangeLog of course has a much more detailed list</div><div class='del'>-of changes.</div><div class='del'>-</div><div class='del'>-Intended method</div><div class='del'>-===============</div><div class='del'>-</div><div class='del'>-I intend working on it in several stages:</div><div class='del'>-</div><div class='del'>-1. Making the api multi-threadable.  Basically removing some const-returns,</div><div class='del'>-and copying some data where it wasn't before.  The api should</div><div class='del'>-still continue to work if not being used in a multithreaded</div><div class='del'>-application.  There is not a significant amount of work here since</div><div class='del'>-this was more or less the intention all along.</div><div class='del'>-</div><div class='del'>-Some functions where references to objects are returned may have to be</div><div class='del'>-changed slightly, so that refcounts are incremented before return.</div><div class='del'>-This doesn't affect much though.</div><div class='del'>-</div><div class='del'>-camel_folder::get_message_info				done</div><div class='del'>-camel_folder_summary::uid				done</div><div class='del'>-camel_folder_summary::index				done</div><div class='del'>-camel_folder::get_summary</div><div class='del'>-	Needs to ref each summary item it points to.	done</div><div class='del'>-camel_folder::free_summary</div><div class='del'>-	Needs to unref each summary item it points to.	done</div><div class='del'>-camel_folder_get_message_tag</div><div class='del'>-	needs to copy the tag return</div><div class='del'>-camel_maildir_summary filename string</div><div class='del'>-	should not be able to modify the string</div><div class='del'>-	array contents after it has been added to</div><div class='del'>-	the summary.</div><div class='del'>-camel_folder						done</div><div class='del'>-	Make every camel-folder use a camel-folder-summary.</div><div class='del'>-	This just reduces some of the code duplication,</div><div class='del'>-	since everything but vee-folder does this already.</div><div class='del'>-</div><div class='del'>-2. Adding high level locks for proof of concept.  The locks will</div><div class='del'>-be stored in private or global data, so the api should remain the same for</div><div class='del'>-non-threaded applications.</div><div class='del'>-</div><div class='del'>-A per-folder lock which governs access to the folder</div><div class='del'>-	summary, the folder file or</div><div class='del'>-	communications socket, etc.			done</div><div class='del'>-Locking for exceptions.					done</div><div class='del'>-Per store locks for internal stuff.			done</div><div class='del'>-Per-service locks for various internal lists and</div><div class='del'>-	caches						done</div><div class='del'>-</div><div class='del'>-3. Further fine-grained locking where it can be done/is worthwhile.</div><div class='del'>-</div><div class='del'>-A per-index lock for libibex				done</div><div class='del'>-Locking for the search object				half done</div><div class='del'>-Internal lock for the folder_summary itself</div><div class='del'>-	So that searching can be detatched from other</div><div class='del'>-	folder operations, etc.				done</div><div class='del'>-Possibly a lock for access to parts of a mime-part</div><div class='del'>-	or message</div><div class='del'>-</div><div class='del'>-4. A method to cancel operations.</div><div class='del'>-</div><div class='del'>-Individual outstanding operations must be cancellable, and not just</div><div class='del'>-'all current operations'.  This will probably not use pthread_cancel</div><div class='del'>-type of cancelling.</div><div class='del'>-</div><div class='del'>-This will however, probably use a method for starting a new thread,</div><div class='del'>-through camel, that can then be cancelled, and/or some method of</div><div class='del'>-registering that a thread can be cancelled.  Blocking states within</div><div class='del'>-camel, within that thread, will then act as checkpoints for if the</div><div class='del'>-operation, and if it is cancelled, the operation will abort</div><div class='del'>-(i.e. fail, with an appropriate exception code).</div><div class='del'>-</div><div class='del'>-Operation cancelling should also function when the application is not</div><div class='del'>-multi-threaded.  Not sure of the api for this yet, probably a callback</div><div class='del'>-system.  Hopefully the api for both scenarios can be made the same.</div><div class='del'>-</div><div class='del'>-Other thoughts</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Basically much of the code in camel that does the actual work does NOT</div><div class='del'>-need to be thread safe to make it safely usable in an mt context.</div><div class='del'>-</div><div class='del'>-camel-folder, camel-summary, camel-imap-search, and the camel-service</div><div class='del'>-classes (at least) are the important ones to be made multithreaded.</div><div class='del'>-</div><div class='del'>-For other things, they are either resources that are created</div><div class='del'>-one-off (for example, camel-mime-message, and its associated</div><div class='del'>-parts, like camel-internet-address), or multithreadedness</div><div class='del'>-doesn't make a lot of sense - e.g. camel-stream, or camel-mime-parser.</div><div class='del'>-</div><div class='del'>-So basically the approach is a low-risk one.  Adding the minimum</div><div class='del'>-number of locks to start with, and providing further fine-grained</div><div class='del'>-locks as required.  The locks should not need to be particularly</div><div class='del'>-fine-grained in order to get reasonable results.</div><div class='del'>-</div><div class='del'>-Log of changes</div><div class='del'>-==============</div><div class='del'>-</div><div class='del'>-Changed CamelFolder:get_message_info() to return a ref'd copy, requiring</div><div class='del'>-all get_message_info()'s to have a matching free_message_info().</div><div class='del'>-</div><div class='del'>-Moved the CamelFolder frozen changelog data to a private structure.</div><div class='del'>-</div><div class='del'>-Added a mutex for CamelFolder frozen changelog stuff (it was just easy</div><div class='del'>-to do, although it isn't needed yet).</div><div class='del'>-</div><div class='del'>-Added a single mutex around all other CamelFolder functions that need</div><div class='del'>-it, this is just the first cut at mt'edness.</div><div class='del'>-</div><div class='del'>-Fixed all camel-folder implementations that call any other</div><div class='del'>-camel-folder functions to call via virtual methods, to bypass the locks.</div><div class='del'>-</div><div class='del'>-Added camel-store private data.</div><div class='del'>-</div><div class='del'>-Added a single mutex lock for camel-store's folder functions.</div><div class='del'>-</div><div class='del'>-Added camel-service private data.</div><div class='del'>-</div><div class='del'>-Added a single mutex lock for camel-service's connect stuff.</div><div class='del'>-</div><div class='del'>-Added a mutex for remote-store stream io stuff.</div><div class='del'>-</div><div class='del'>-Added a mutex for imap, so it can bracket a compound command</div><div class='del'>-exclusively.  Pop doesn't need this since you can only have a single</div><div class='del'>-folder per store, and the folder interface is already forced</div><div class='del'>-single-threaded.</div><div class='del'>-</div><div class='del'>-Added mutex for camel-session, most operations.</div><div class='del'>-</div><div class='del'>-Running the tests finds at least 1 deadlock so far.  Need to</div><div class='del'>-work on that.</div><div class='del'>-</div><div class='del'>-Fixed get_summary to ref/unref its items.</div><div class='del'>-</div><div class='del'>-Removed the global folder lock from the toplevel</div><div class='del'>-camel_folder_search(), each implementation must now handle locking.</div><div class='del'>-</div><div class='del'>-Fixed the local-folder implementation of searching.  imap-folder</div><div class='del'>-searching should already be mt-safe through the command lock.</div><div class='del'>-</div><div class='del'>-Fixed imap summary to ref/unref too.</div><div class='del'>-</div><div class='del'>-Built some test cases, and expanded the test framework library to</div><div class='del'>-handle multiple threads.  It works!</div><div class='del'>-</div><div class='del'>-Next, added a recursive mutex class, so that locking inside imap had</div><div class='del'>-any chance of working.  Got imap working.</div><div class='del'>-</div><div class='del'>-Moved the camel folder summary into the base folder class, and fixed</div><div class='del'>-everything to use it that way.</div><div class='del'>-</div><div class='del'>-Made the vfolder use a real camel-folder-summary rather than a</div><div class='del'>-hashtable + array that it was using, and probably fixed some problems</div><div class='del'>-which caused evolution-mail not to always catch flag updates.  Oh, and</div><div class='del'>-made it sync/expunge all its subfolders when sync/expungeing.</div><div class='del'>-</div><div class='del'>-Made the camel-folder summary completely mt-safe.</div><div class='del'>-</div><div class='del'>-Removed all of the locks on the folder functions dealing directly with</div><div class='del'>-the summary, so now for example all summary lookups will not be</div><div class='del'>-interupted by long operations.</div><div class='del'>-</div><div class='del'>-Made the nntp newsrc thing mt-safe, because of some unfortunate</div><div class='del'>-sideeffect of it being called from the summary interaction code in</div><div class='del'>-nntp-folder.</div><div class='del'>-</div><div class='head'>diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c<br/>deleted file mode 100644<br/>index 7bcff0ffd4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/broken-date-parser.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/broken-date-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,521 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include "broken-date-parser.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-#define NUMERIC_CHARS          "1234567890"</div><div class='del'>-#define WEEKDAY_CHARS          "SundayMondayTuesdayWednesdayThursdayFridaySaturday"</div><div class='del'>-#define MONTH_CHARS            "JanuaryFebruaryMarchAprilMayJuneJulyAugustSeptemberOctoberNovemberDecember"</div><div class='del'>-#define TIMEZONE_ALPHA_CHARS   "UTCGMTESTEDTCSTCDTMSTPSTPDTZAMNY()"</div><div class='del'>-#define TIMEZONE_NUMERIC_CHARS "-+1234567890"</div><div class='del'>-#define TIME_CHARS             "1234567890:"</div><div class='del'>-</div><div class='del'>-#define DATE_TOKEN_NON_NUMERIC          (1 &lt;&lt; 0)</div><div class='del'>-#define DATE_TOKEN_NON_WEEKDAY          (1 &lt;&lt; 1)</div><div class='del'>-#define DATE_TOKEN_NON_MONTH            (1 &lt;&lt; 2)</div><div class='del'>-#define DATE_TOKEN_NON_TIME             (1 &lt;&lt; 3)</div><div class='del'>-#define DATE_TOKEN_HAS_COLON            (1 &lt;&lt; 4)</div><div class='del'>-#define DATE_TOKEN_NON_TIMEZONE_ALPHA   (1 &lt;&lt; 5)</div><div class='del'>-#define DATE_TOKEN_NON_TIMEZONE_NUMERIC (1 &lt;&lt; 6)</div><div class='del'>-#define DATE_TOKEN_HAS_SIGN             (1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-static unsigned char datetok_table[256] = {</div><div class='del'>-        128,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111, 79, 79,111,175,111,175,111,111,</div><div class='del'>-         38, 38, 38, 38, 38, 38, 38, 38, 38, 38,119,111,111,111,111,111,</div><div class='del'>-        111, 75,111, 79, 75, 79,105, 79,111,111,107,111,111, 73, 75,107,</div><div class='del'>-         79,111,111, 73, 77, 79,111,109,111, 79, 79,111,111,111,111,111,</div><div class='del'>-        111,105,107,107,109,105,111,107,105,105,111,111,107,107,105,105,</div><div class='del'>-        107,111,105,105,105,105,107,111,111,105,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-        111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* hrm, is there a library for this shit? */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	int offset;</div><div class='del'>-} tz_offsets [] = {</div><div class='del'>-	{ "UT", 0 },</div><div class='del'>-	{ "GMT", 0 },</div><div class='del'>-	{ "EST", -500 },	/* these are all US timezones.  bloody yanks */</div><div class='del'>-	{ "EDT", -400 },</div><div class='del'>-	{ "CST", -600 },</div><div class='del'>-	{ "CDT", -500 },</div><div class='del'>-	{ "MST", -700 },</div><div class='del'>-	{ "MDT", -600 },</div><div class='del'>-	{ "PST", -800 },</div><div class='del'>-	{ "PDT", -700 },</div><div class='del'>-	{ "Z", 0 },</div><div class='del'>-	{ "A", -100 },</div><div class='del'>-	{ "M", -1200 },</div><div class='del'>-	{ "N", 100 },</div><div class='del'>-	{ "Y", 1200 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tm_months[] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tm_days[] = {</div><div class='del'>-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _date_token {</div><div class='del'>-	struct _date_token *next;</div><div class='del'>-	const unsigned char *start;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned int mask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is where it gets ugly... */</div><div class='del'>-static struct _date_token *</div><div class='del'>-datetok (const char *date)</div><div class='del'>-{</div><div class='del'>-	struct _date_token *tokens = NULL, *token, *tail = (struct _date_token *) &amp;tokens;</div><div class='del'>-	const unsigned char *start, *end;</div><div class='del'>-	unsigned int mask;</div><div class='del'>-	</div><div class='del'>-	start = date;</div><div class='del'>-	while (*start) {</div><div class='del'>-		/* kill leading whitespace */</div><div class='del'>-		for ( ; *start &amp;&amp; isspace ((int) *start); start++);</div><div class='del'>-		</div><div class='del'>-		mask = 0;</div><div class='del'>-		</div><div class='del'>-		/* find the end of this token */</div><div class='del'>-		for (end = start; *end &amp;&amp; !strchr ("-/,\t\r\n ", *end); end++) {</div><div class='del'>-			mask |= datetok_table[*end];</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (end != start) {</div><div class='del'>-			token = g_malloc (sizeof (struct _date_token));</div><div class='del'>-			token-&gt;next = NULL;</div><div class='del'>-			token-&gt;start = start;</div><div class='del'>-			token-&gt;len = end - start;</div><div class='del'>-			token-&gt;mask = mask;</div><div class='del'>-			</div><div class='del'>-			tail-&gt;next = token;</div><div class='del'>-			tail = token;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*end)</div><div class='del'>-			start = end + 1;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return tokens;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-decode_int (const unsigned char *in, unsigned int inlen)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr;</div><div class='del'>-	const unsigned char *inend;</div><div class='del'>-	int sign = 1, val = 0;</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + inlen;</div><div class='del'>-	</div><div class='del'>-	if (*inptr == '-') {</div><div class='del'>-		sign = -1;</div><div class='del'>-		inptr++;</div><div class='del'>-	} else if (*inptr == '+')</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	for ( ; inptr &lt; inend; inptr++) {</div><div class='del'>-		if (!isdigit ((int) *inptr))</div><div class='del'>-			return  -1;</div><div class='del'>-		else</div><div class='del'>-			val = (val * 10) + (*inptr - '0');</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	val *= sign;</div><div class='del'>-	</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_wday (const unsigned char *in, unsigned int inlen)</div><div class='del'>-{</div><div class='del'>-	int wday;</div><div class='del'>-	</div><div class='del'>-	if (inlen &lt; 3)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	for (wday = 0; wday &lt; 7; wday++)</div><div class='del'>-		if (!strncasecmp (in, tm_days[wday], 3))</div><div class='del'>-			return wday;</div><div class='del'>-	</div><div class='del'>-	return -1;  /* unknown week day */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_mday (const unsigned char *in, unsigned int inlen)</div><div class='del'>-{</div><div class='del'>-	int mday;</div><div class='del'>-	</div><div class='del'>-	mday = decode_int (in, inlen);</div><div class='del'>-	</div><div class='del'>-	if (mday &lt; 0 || mday &gt; 31)</div><div class='del'>-		mday = -1;</div><div class='del'>-	</div><div class='del'>-	return mday;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_month (const unsigned char *in, unsigned int inlen)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (inlen &lt; 3)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; 12; i++)</div><div class='del'>-		if (!strncasecmp (in, tm_months[i], 3))</div><div class='del'>-			return i;</div><div class='del'>-	</div><div class='del'>-	return -1;  /* unknown month */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_year (const unsigned char *in, unsigned int inlen)</div><div class='del'>-{</div><div class='del'>-	int year;</div><div class='del'>-	</div><div class='del'>-	year = decode_int (in, inlen);</div><div class='del'>-	if (year == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (year &lt; 100)</div><div class='del'>-		year += (year &lt; 70) ? 2000 : 1900;</div><div class='del'>-	</div><div class='del'>-	if (year &lt; 1969)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return year;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_time (const unsigned char *in, unsigned int inlen, int *hour, int *min, int *sec)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr;</div><div class='del'>-	const unsigned char *inend;</div><div class='del'>-	int *val, colons = 0;</div><div class='del'>-	</div><div class='del'>-	*hour = *min = *sec = 0;</div><div class='del'>-	</div><div class='del'>-	inend = in + inlen;</div><div class='del'>-	val = hour;</div><div class='del'>-	for (inptr = in; inptr &lt; inend; inptr++) {</div><div class='del'>-		if (*inptr == ':') {</div><div class='del'>-			colons++;</div><div class='del'>-			switch (colons) {</div><div class='del'>-			case 1:</div><div class='del'>-				val = min;</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				val = sec;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		} else if (!isdigit ((int) *inptr))</div><div class='del'>-			return FALSE;</div><div class='del'>-		else</div><div class='del'>-			*val = (*val * 10) + (*inptr - '0');</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_tzone (struct _date_token **token)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; *token &amp;&amp; i &lt; 2; *token = (*token)-&gt;next, i++) {</div><div class='del'>-		const unsigned char *inptr = (*token)-&gt;start;</div><div class='del'>-		unsigned int inlen = (*token)-&gt;len;</div><div class='del'>-		</div><div class='del'>-		if (*inptr == '+' || *inptr == '-') {</div><div class='del'>-			return decode_int (inptr, inlen);</div><div class='del'>-		} else {</div><div class='del'>-			int t;</div><div class='del'>-			</div><div class='del'>-			if (*inptr == '(')</div><div class='del'>-				inptr++;</div><div class='del'>-			</div><div class='del'>-			for (t = 0; t &lt; 15; t++) {</div><div class='del'>-				unsigned int len = MIN (strlen (tz_offsets[t].name), inlen - 1);</div><div class='del'>-				</div><div class='del'>-				if (!strncmp (inptr, tz_offsets[t].name, len))</div><div class='del'>-					return tz_offsets[t].offset;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is where things get interesting... ;-) */</div><div class='del'>-</div><div class='del'>-#define date_token_mask(t)  (((struct _date_token *) t)-&gt;mask)</div><div class='del'>-#define is_numeric(t)       ((date_token_mask (t) &amp; DATE_TOKEN_NON_NUMERIC) == 0)</div><div class='del'>-#define is_weekday(t)       ((date_token_mask (t) &amp; DATE_TOKEN_NON_WEEKDAY) == 0)</div><div class='del'>-#define is_month(t)         ((date_token_mask (t) &amp; DATE_TOKEN_NON_MONTH) == 0)</div><div class='del'>-#define is_time(t)          (((date_token_mask (t) &amp; DATE_TOKEN_NON_TIME) == 0) &amp;&amp; (date_token_mask (t) &amp; DATE_TOKEN_HAS_COLON))</div><div class='del'>-#define is_tzone_alpha(t)   ((date_token_mask (t) &amp; DATE_TOKEN_NON_TIMEZONE_ALPHA) == 0)</div><div class='del'>-#define is_tzone_numeric(t) (((date_token_mask (t) &amp; DATE_TOKEN_NON_TIMEZONE_NUMERIC) == 0) &amp;&amp; (date_token_mask (t) &amp; DATE_TOKEN_HAS_SIGN))</div><div class='del'>-#define is_tzone(t)         (is_tzone_alpha (t) || is_tzone_numeric (t))</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-decode_broken_date (struct _date_token *tokens, int *tzone)</div><div class='del'>-{</div><div class='del'>-	gboolean got_wday, got_month, got_tzone;</div><div class='del'>-	int hour, min, sec, offset, n;</div><div class='del'>-	struct _date_token *token;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t time;</div><div class='del'>-	</div><div class='del'>-	memset ((void *) &amp;tm, 0, sizeof (struct tm));</div><div class='del'>-	got_wday = got_month = got_tzone = FALSE;</div><div class='del'>-	offset = 0;</div><div class='del'>-	</div><div class='del'>-	token = tokens;</div><div class='del'>-	while (token) {</div><div class='del'>-		if (is_weekday (token) &amp;&amp; !got_wday) {</div><div class='del'>-			if ((n = get_wday (token-&gt;start, token-&gt;len)) != -1) {</div><div class='del'>-				d(printf ("weekday; "));</div><div class='del'>-				got_wday = TRUE;</div><div class='del'>-				tm.tm_wday = n;</div><div class='del'>-				goto next_token;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (is_month (token) &amp;&amp; !got_month) {</div><div class='del'>-			if ((n = get_month (token-&gt;start, token-&gt;len)) != -1) {</div><div class='del'>-				d(printf ("month; "));</div><div class='del'>-				got_month = TRUE;</div><div class='del'>-				tm.tm_mon = n;</div><div class='del'>-				goto next_token;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (is_time (token) &amp;&amp; !tm.tm_hour &amp;&amp; !tm.tm_min &amp;&amp; !tm.tm_sec) {</div><div class='del'>-			if (get_time (token-&gt;start, token-&gt;len, &amp;hour, &amp;min, &amp;sec)) {</div><div class='del'>-				d(printf ("time; "));</div><div class='del'>-				tm.tm_hour = hour;</div><div class='del'>-				tm.tm_min = min;</div><div class='del'>-				tm.tm_sec = sec;</div><div class='del'>-				goto next_token;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (is_tzone (token) &amp;&amp; !got_tzone) {</div><div class='del'>-			struct _date_token *t = token;</div><div class='del'>-			</div><div class='del'>-			if ((n = get_tzone (&amp;t)) != -1) {</div><div class='del'>-				d(printf ("tzone; "));</div><div class='del'>-				got_tzone = TRUE;</div><div class='del'>-				offset = n;</div><div class='del'>-				goto next_token;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (is_numeric (token)) {</div><div class='del'>-			if (token-&gt;len == 4 &amp;&amp; !tm.tm_year) {</div><div class='del'>-				if ((n = get_year (token-&gt;start, token-&gt;len)) != -1) {</div><div class='del'>-					d(printf ("year; "));</div><div class='del'>-					tm.tm_year = n - 1900;</div><div class='del'>-					goto next_token;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (!got_month &amp;&amp; !got_wday &amp;&amp; token-&gt;next &amp;&amp; is_numeric (token-&gt;next)) {</div><div class='del'>-					d(printf ("mon; "));</div><div class='del'>-					n = decode_int (token-&gt;start, token-&gt;len);</div><div class='del'>-					got_month = TRUE;</div><div class='del'>-					tm.tm_mon = n - 1;</div><div class='del'>-					goto next_token;</div><div class='del'>-				} else if (!tm.tm_mday &amp;&amp; (n = get_mday (token-&gt;start, token-&gt;len)) != -1) {</div><div class='del'>-					d(printf ("mday; "));</div><div class='del'>-					tm.tm_mday = n;</div><div class='del'>-					goto next_token;</div><div class='del'>-				} else if (!tm.tm_year) {</div><div class='del'>-					d(printf ("2-digit year; "));</div><div class='del'>-					n = get_year (token-&gt;start, token-&gt;len);</div><div class='del'>-					tm.tm_year = n - 1900;</div><div class='del'>-					goto next_token;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		d(printf ("???; "));</div><div class='del'>-		</div><div class='del'>-	next_token:</div><div class='del'>-		</div><div class='del'>-		token = token-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf ("\n"));</div><div class='del'>-	</div><div class='del'>-	time = mktime (&amp;tm);</div><div class='del'>-#if defined (HAVE_TIMEZONE)</div><div class='del'>-	time -= timezone;</div><div class='del'>-#elif defined (HAVE_TM_GMTOFF)</div><div class='del'>-	time += tm.tm_gmtoff;</div><div class='del'>-#else</div><div class='del'>-#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	/* t is now GMT of the time we want, but not offset by the timezone ... */</div><div class='del'>-	</div><div class='del'>-	/* this should convert the time to the GMT equiv time */</div><div class='del'>-	time -= ((offset / 100) * 60 * 60) + (offset % 100) * 60;</div><div class='del'>-	</div><div class='del'>-	if (tzone)</div><div class='del'>-		*tzone = offset;</div><div class='del'>-	</div><div class='del'>-	return time;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * parse_broken_date:</div><div class='del'>- * @datestr: input date string</div><div class='del'>- * @saveoffset:</div><div class='del'>- *</div><div class='del'>- * Decodes the rfc822/broken date string and saves the GMT offset into</div><div class='del'>- * @saveoffset if non-NULL.</div><div class='del'>- *</div><div class='del'>- * Returns the time_t representation of the date string specified by</div><div class='del'>- * @in. If 'saveoffset' is non-NULL, the value of the timezone offset</div><div class='del'>- * will be stored.</div><div class='del'>- **/</div><div class='del'>-time_t</div><div class='del'>-parse_broken_date (const char *datestr, int *saveoffset)</div><div class='del'>-{</div><div class='del'>-	struct _date_token *token, *tokens;</div><div class='del'>-	time_t date;</div><div class='del'>-	</div><div class='del'>-	tokens = datetok (datestr);</div><div class='del'>-	</div><div class='del'>-	date = decode_broken_date (tokens, saveoffset);</div><div class='del'>-	</div><div class='del'>-	/* cleanup */</div><div class='del'>-	while (tokens) {</div><div class='del'>-		token = tokens;</div><div class='del'>-		tokens = tokens-&gt;next;</div><div class='del'>-		g_free (token);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return date;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef DATETOK_STANDALONE</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-table_init ()</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	memset (datetok_table, 0, sizeof (datetok_table));</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		if (!strchr (NUMERIC_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_NUMERIC;</div><div class='del'>-		</div><div class='del'>-		if (!strchr (WEEKDAY_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_WEEKDAY;</div><div class='del'>-		</div><div class='del'>-		if (!strchr (MONTH_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_MONTH;</div><div class='del'>-		</div><div class='del'>-		if (!strchr (TIME_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_TIME;</div><div class='del'>-		</div><div class='del'>-		if (!strchr (TIMEZONE_ALPHA_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_TIMEZONE_ALPHA;</div><div class='del'>-		</div><div class='del'>-		if (!strchr (TIMEZONE_NUMERIC_CHARS, i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_NON_TIMEZONE_NUMERIC;</div><div class='del'>-		</div><div class='del'>-		if (((char) i) == ':')</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_HAS_COLON;</div><div class='del'>-		</div><div class='del'>-		if (strchr ("+-", i))</div><div class='del'>-			datetok_table[i] |= DATE_TOKEN_HAS_SIGN;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	printf ("static unsigned int datetok_table[256] = {");</div><div class='del'>-	for (i = 0; i &lt; 256; i++) {</div><div class='del'>-		if (i % 16 == 0)</div><div class='del'>-			printf ("\n\t");</div><div class='del'>-		printf ("%3d,", datetok_table[i]);</div><div class='del'>-	}</div><div class='del'>-	printf ("\n};\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	time_t date;</div><div class='del'>-	int offset;</div><div class='del'>-	</div><div class='del'>-	/*table_init ();*/</div><div class='del'>-	</div><div class='del'>-	date = parse_broken_date (argv[1], &amp;offset);</div><div class='del'>-	printf ("%d; %d\n", date, offset);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* DATETOK_STANDALONE */</div><div class='head'>diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h<br/>deleted file mode 100644<br/>index b69d7636d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/broken-date-parser.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/broken-date-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-/* prototypes for functions dealing with broken date formats */</div><div class='del'>-</div><div class='del'>-time_t parse_broken_date (const char *datestr, int *saveoffset);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-address.c b/camel/camel-address.c<br/>deleted file mode 100644<br/>index a25e9ba791..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,240 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-address.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void camel_address_class_init (CamelAddressClass *klass);</div><div class='del'>-static void camel_address_init       (CamelAddress *obj);</div><div class='del'>-static void camel_address_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_address_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_class_init (CamelAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_address_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_init (CamelAddress *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;addresses = g_ptr_array_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_finalize (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	camel_address_remove((CamelAddress *)obj, -1);</div><div class='del'>-	g_ptr_array_free(((CamelAddress *)obj)-&gt;addresses, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelAddress",</div><div class='del'>-					    sizeof (CamelAddress),</div><div class='del'>-					    sizeof (CamelAddressClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_address_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_address_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_address_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelAddress widget.</div><div class='del'>- **/</div><div class='del'>-CamelAddress *</div><div class='del'>-camel_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelAddress *new = CAMEL_ADDRESS(camel_object_new(camel_address_get_type()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_new_clone:</div><div class='del'>- * @in: </div><div class='del'>- * </div><div class='del'>- * Clone an existing address type.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelAddress *</div><div class='del'>-camel_address_new_clone(const CamelAddress *in)</div><div class='del'>-{</div><div class='del'>-	CamelAddress *new = CAMEL_ADDRESS(camel_object_new(CAMEL_OBJECT_GET_TYPE(in)));</div><div class='del'>-</div><div class='del'>-	camel_address_cat(new, in);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_length:</div><div class='del'>- * @a: </div><div class='del'>- * </div><div class='del'>- * Return the number of addresses stored in the address @a.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_address_length(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	return a-&gt;addresses-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_decode:</div><div class='del'>- * @a: An address.</div><div class='del'>- * @raw: Raw address description.</div><div class='del'>- * </div><div class='del'>- * Construct a new address from a raw address field.</div><div class='del'>- * </div><div class='del'>- * Return value: Returns the number of addresses found,</div><div class='del'>- * or -1 if the addresses could not be parsed fully.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_address_decode	(CamelAddress *a, const char *raw)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), -1);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;decode(a, raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_encode:</div><div class='del'>- * @a: </div><div class='del'>- * </div><div class='del'>- * Encode an address in a format suitable for a raw header.</div><div class='del'>- * </div><div class='del'>- * Return value: The encoded address.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_address_encode	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), NULL);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;encode(a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_unformat:</div><div class='del'>- * @a: </div><div class='del'>- * @raw: </div><div class='del'>- * </div><div class='del'>- * Attempt to convert a previously formatted and/or edited</div><div class='del'>- * address back into internal form.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 if it could not be parsed, or the number</div><div class='del'>- * of valid addresses found.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_address_unformat(CamelAddress *a, const char *raw)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), -1);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;unformat(a, raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_format:</div><div class='del'>- * @a: </div><div class='del'>- * </div><div class='del'>- * Format an address in a format suitable for display.</div><div class='del'>- * </div><div class='del'>- * Return value: The formatted address.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_address_format	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	if (a == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(a), NULL);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;format(a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_cat:</div><div class='del'>- * @dest: </div><div class='del'>- * @source: </div><div class='del'>- * </div><div class='del'>- * Concatenate one address onto another.  The addresses must</div><div class='del'>- * be of the same type.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_address_cat	(CamelAddress *dest, const CamelAddress *source)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS(CAMEL_OBJECT_GET_CLASS(dest))-&gt;cat(dest, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_copy:</div><div class='del'>- * @dest: </div><div class='del'>- * @source: </div><div class='del'>- * </div><div class='del'>- * Copy an address contents.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_address_copy	(CamelAddress *dest, const CamelAddress *source)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(dest), -1);</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_ADDRESS(source), -1);</div><div class='del'>-</div><div class='del'>-	camel_address_remove(dest, -1);</div><div class='del'>-	return camel_address_cat(dest, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_remove:</div><div class='del'>- * @a: </div><div class='del'>- * @index: The address to remove, use -1 to remove all address.</div><div class='del'>- * </div><div class='del'>- * Remove an address by index, or all addresses.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_address_remove	(CamelAddress *a, int index)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(CAMEL_IS_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	if (index == -1) {</div><div class='del'>-		for (index=a-&gt;addresses-&gt;len; index&gt;-1; index--)</div><div class='del'>-			CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;remove(a, index);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;remove(a, index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-address.h b/camel/camel-address.h<br/>deleted file mode 100644<br/>index caf7e97755..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_ADDRESS_H</div><div class='del'>-#define _CAMEL_ADDRESS_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)</div><div class='del'>-#define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)</div><div class='del'>-#define CAMEL_IS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelAddressClass CamelAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelAddress {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	GPtrArray *addresses;</div><div class='del'>-</div><div class='del'>-	struct _CamelAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelAddressClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	int   (*decode)		(CamelAddress *, const char *raw);</div><div class='del'>-	char *(*encode)		(CamelAddress *);</div><div class='del'>-</div><div class='del'>-	int   (*unformat)	(CamelAddress *, const char *raw);</div><div class='del'>-	char *(*format)		(CamelAddress *);</div><div class='del'>-</div><div class='del'>-	int   (*cat)		(CamelAddress *, const CamelAddress *);</div><div class='del'>-</div><div class='del'>-	void  (*remove)		(CamelAddress *, int index);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	camel_address_get_type	(void);</div><div class='del'>-CamelAddress   *camel_address_new	(void);</div><div class='del'>-CamelAddress   *camel_address_new_clone	(const CamelAddress *);</div><div class='del'>-int		camel_address_length	(CamelAddress *);</div><div class='del'>-</div><div class='del'>-int	        camel_address_decode	(CamelAddress *, const char *);</div><div class='del'>-char	       *camel_address_encode	(CamelAddress *);</div><div class='del'>-int	        camel_address_unformat	(CamelAddress *, const char *);</div><div class='del'>-char	       *camel_address_format	(CamelAddress *);</div><div class='del'>-</div><div class='del'>-int		camel_address_cat	(CamelAddress *, const CamelAddress *);</div><div class='del'>-int		camel_address_copy	(CamelAddress *, const CamelAddress *);</div><div class='del'>-</div><div class='del'>-void		camel_address_remove	(CamelAddress *, int index);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_ADDRESS_H */</div><div class='head'>diff --git a/camel/camel-arg.c b/camel/camel-arg.c<br/>deleted file mode 100644<br/>index bc6ececd2e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-arg.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-arg.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-arg.h"</div><div class='del'>-</div><div class='del'>-int camel_argv_build(CamelArgV *tv)</div><div class='del'>-{</div><div class='del'>-	register guint32 tag;</div><div class='del'>-	register int i;</div><div class='del'>-	register CamelArg *a;</div><div class='del'>-	int more = TRUE;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;CAMEL_ARGV_MAX;i++) {</div><div class='del'>-		a = &amp;tv-&gt;argv[i];</div><div class='del'>-</div><div class='del'>-		if ( (tag = va_arg(tv-&gt;ap, guint32)) == 0) {</div><div class='del'>-			more = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		a-&gt;tag = tag;</div><div class='del'>-</div><div class='del'>-		switch((tag &amp; CAMEL_ARG_TYPE)) {</div><div class='del'>-		case CAMEL_ARG_OBJ:</div><div class='del'>-			a-&gt;ca_object = va_arg(tv-&gt;ap, void *);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_INT:</div><div class='del'>-			a-&gt;ca_int = va_arg(tv-&gt;ap, int);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_DBL:</div><div class='del'>-			a-&gt;ca_double = va_arg(tv-&gt;ap, double);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_STR:</div><div class='del'>-			a-&gt;ca_str = va_arg(tv-&gt;ap, char *);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_PTR:</div><div class='del'>-			a-&gt;ca_ptr = va_arg(tv-&gt;ap, void *);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printf("Error, unknown type, truncating result\n");</div><div class='del'>-			more = FALSE;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-fail:</div><div class='del'>-	tv-&gt;argc = i;</div><div class='del'>-</div><div class='del'>-	return more;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_arggetv_build(CamelArgGetV *tv)</div><div class='del'>-{</div><div class='del'>-	register guint32 tag;</div><div class='del'>-	register int i;</div><div class='del'>-	register CamelArgGet *a;</div><div class='del'>-	int more = TRUE;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;CAMEL_ARGV_MAX;i++) {</div><div class='del'>-		a = &amp;tv-&gt;argv[i];</div><div class='del'>-</div><div class='del'>-		if ( (tag = va_arg(tv-&gt;ap, guint32)) == 0) {</div><div class='del'>-			more = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		a-&gt;tag = tag;</div><div class='del'>-</div><div class='del'>-		switch((tag &amp; CAMEL_ARG_TYPE)) {</div><div class='del'>-		case CAMEL_ARG_OBJ:</div><div class='del'>-			a-&gt;ca_object = va_arg(tv-&gt;ap, void **);</div><div class='del'>-			*a-&gt;ca_object = NULL;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_INT:</div><div class='del'>-			a-&gt;ca_int = va_arg(tv-&gt;ap, int *);</div><div class='del'>-			*a-&gt;ca_int = 0;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_DBL:</div><div class='del'>-			a-&gt;ca_double = va_arg(tv-&gt;ap, double *);</div><div class='del'>-			*a-&gt;ca_double = 0.0;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_STR:</div><div class='del'>-			a-&gt;ca_str = va_arg(tv-&gt;ap, char **);</div><div class='del'>-			*a-&gt;ca_str = NULL;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_ARG_PTR:</div><div class='del'>-			a-&gt;ca_ptr = va_arg(tv-&gt;ap, void **);</div><div class='del'>-			*a-&gt;ca_ptr = NULL;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printf("Error, unknown type, truncating result\n");</div><div class='del'>-			more = FALSE;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-fail:</div><div class='del'>-	tv-&gt;argc = i;</div><div class='del'>-</div><div class='del'>-	return more;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-arg.h b/camel/camel-arg.h<br/>deleted file mode 100644<br/>index 7846018149..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-arg.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-arg.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_ARG_H</div><div class='del'>-#define CAMEL_ARG_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-enum camel_arg_t {</div><div class='del'>-	CAMEL_ARG_END = 0,</div><div class='del'>-	CAMEL_ARG_IGNORE = 1,	/* override/ignore an arg in-place */</div><div class='del'>-</div><div class='del'>-	CAMEL_ARG_FIRST = 1024,	/* 1024 args reserved for arg system */</div><div class='del'>-</div><div class='del'>-	CAMEL_ARG_TYPE = 0xf0000000, /* type field for tags */</div><div class='del'>-	CAMEL_ARG_TAG = 0x0fffffff, /* tag field for args */</div><div class='del'>-</div><div class='del'>-	CAMEL_ARG_OBJ = 0x00000000, /* object */</div><div class='del'>-	CAMEL_ARG_INT = 0x10000000, /* int */</div><div class='del'>-	CAMEL_ARG_DBL = 0x20000000, /* double */</div><div class='del'>-	CAMEL_ARG_STR = 0x30000000, /* c string */</div><div class='del'>-	CAMEL_ARG_PTR = 0x40000000, /* ptr */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelArg CamelArg;</div><div class='del'>-typedef struct _CamelArgV CamelArgV;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelArgGet CamelArgGet;</div><div class='del'>-typedef struct _CamelArgGetV CamelArgGetV;</div><div class='del'>-</div><div class='del'>-struct _CamelArg {</div><div class='del'>-	guint32 tag;</div><div class='del'>-	union {</div><div class='del'>-		void *ca_object;</div><div class='del'>-		int ca_int;</div><div class='del'>-		double ca_double;</div><div class='del'>-		char *ca_str;</div><div class='del'>-		void *ca_ptr;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-struct _CamelArgGet {</div><div class='del'>-	guint32 tag;</div><div class='del'>-	union {</div><div class='del'>-		void **ca_object;</div><div class='del'>-		int *ca_int;</div><div class='del'>-		double *ca_double;</div><div class='del'>-		char **ca_str;</div><div class='del'>-		void **ca_ptr;</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-#define ca_object u.ca_object</div><div class='del'>-#define ca_int u.ca_int</div><div class='del'>-#define ca_double u.ca_double</div><div class='del'>-#define ca_str u.ca_str</div><div class='del'>-#define ca_ptr u.ca_ptr</div><div class='del'>-</div><div class='del'>-/* maximum no of args processed at any one time, not the max of all args */</div><div class='del'>-#define CAMEL_ARGV_MAX (20)</div><div class='del'>-</div><div class='del'>-struct _CamelArgV {</div><div class='del'>-	va_list ap;</div><div class='del'>-	int argc;</div><div class='del'>-	CamelArg argv[CAMEL_ARGV_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelArgGetV {</div><div class='del'>-	va_list ap;</div><div class='del'>-	int argc;</div><div class='del'>-	CamelArgGet argv[CAMEL_ARGV_MAX];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define camel_argv_start(tv, last) (va_start((tv)-&gt;ap, last))</div><div class='del'>-#define camel_argv_end(tv) (va_end((tv)-&gt;ap))</div><div class='del'>-int camel_argv_build(CamelArgV *tv);</div><div class='del'>-int camel_arggetv_build(CamelArgGetV *tv);</div><div class='del'>-</div><div class='del'>-/* set an arg ignored */</div><div class='del'>-#define camel_argv_ignore(tv, i) ((tv)-&gt;argv[i].tag = ((tv)-&gt;argv[i].tag &amp; CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE)</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif				/* CAMEL_ARG_H */</div><div class='head'>diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c<br/>deleted file mode 100644<br/>index 1ec1f74061..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-block-file.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-block-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1138 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-</div><div class='del'>-#include "camel-block-file.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-</div><div class='del'>-/* Locks must be obtained in the order defined */</div><div class='del'>-</div><div class='del'>-struct _CamelBlockFilePrivate {</div><div class='del'>-	/* We use the private structure to form our lru list from */</div><div class='del'>-	struct _CamelBlockFilePrivate *next;</div><div class='del'>-	struct _CamelBlockFilePrivate *prev;</div><div class='del'>-</div><div class='del'>-	struct _CamelBlockFile *base;</div><div class='del'>-</div><div class='del'>-	pthread_mutex_t root_lock; /* for modifying the root block */</div><div class='del'>-	pthread_mutex_t cache_lock; /* for refcounting, flag manip, cache manip */</div><div class='del'>-	pthread_mutex_t io_lock; /* for all io ops */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_BLOCK_FILE_LOCK(kf, lock) (pthread_mutex_lock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_BLOCK_FILE_TRYLOCK(kf, lock) (pthread_mutex_trylock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_BLOCK_FILE_UNLOCK(kf, lock) (pthread_mutex_unlock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-</div><div class='del'>-#define LOCK(x) pthread_mutex_lock(&amp;x)</div><div class='del'>-#define UNLOCK(x) pthread_mutex_unlock(&amp;x)</div><div class='del'>-</div><div class='del'>-static pthread_mutex_t block_file_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_BLOCK_FILE_LOCK(kf, lock)</div><div class='del'>-#define CAMEL_BLOCK_FILE_TRYLOCK(kf, lock)</div><div class='del'>-#define CAMEL_BLOCK_FILE_UNLOCK(kf, lock)</div><div class='del'>-#define LOCK(x)</div><div class='del'>-#define UNLOCK(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* lru cache of block files */</div><div class='del'>-static EDList block_file_list = E_DLIST_INITIALISER(block_file_list);</div><div class='del'>-/* list to store block files that are actually intialised */</div><div class='del'>-static EDList block_file_active_list = E_DLIST_INITIALISER(block_file_active_list);</div><div class='del'>-static int block_file_count = 0;</div><div class='del'>-static int block_file_threshhold = 10;</div><div class='del'>-</div><div class='del'>-#define CBF_CLASS(o) ((CamelBlockFileClass *)(((CamelObject *)o)-&gt;klass))</div><div class='del'>-</div><div class='del'>-static int sync_nolock(CamelBlockFile *bs);</div><div class='del'>-static int sync_block_nolock(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-block_file_validate_root(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelBlockRoot *br;</div><div class='del'>-</div><div class='del'>-	br = bs-&gt;root;</div><div class='del'>-</div><div class='del'>-	fstat(bs-&gt;fd, &amp;st);</div><div class='del'>-</div><div class='del'>-	d(printf("Validate root: '%s'\n", bs-&gt;path));</div><div class='del'>-	d(printf("version: %.8s (%.8s)\n", bs-&gt;root-&gt;version, bs-&gt;version));</div><div class='del'>-	d(printf("block size: %d (%d)%s\n", br-&gt;block_size, bs-&gt;block_size,</div><div class='del'>-		br-&gt;block_size != bs-&gt;block_size ? " BAD":" OK"));</div><div class='del'>-	d(printf("free: %ld (%d add size &lt; %ld)%s\n", (long)br-&gt;free, br-&gt;free / bs-&gt;block_size * bs-&gt;block_size, (long)st.st_size,</div><div class='del'>-		(br-&gt;free &gt; st.st_size) || (br-&gt;free % bs-&gt;block_size) != 0 ? " BAD":" OK"));</div><div class='del'>-	d(printf("last: %ld (%d and size: %ld)%s\n", (long)br-&gt;last, br-&gt;last / bs-&gt;block_size * bs-&gt;block_size, (long)st.st_size,</div><div class='del'>-		(br-&gt;last != st.st_size) || ((br-&gt;last % bs-&gt;block_size) != 0) ? " BAD": " OK"));</div><div class='del'>-	d(printf("flags: %s\n", (br-&gt;flags &amp; CAMEL_BLOCK_FILE_SYNC)?"SYNC":"unSYNC"));</div><div class='del'>-</div><div class='del'>-	if (br-&gt;last == 0</div><div class='del'>-	    || memcmp(bs-&gt;root-&gt;version, bs-&gt;version, 8) != 0</div><div class='del'>-	    || br-&gt;block_size != bs-&gt;block_size</div><div class='del'>-	    || (br-&gt;free % bs-&gt;block_size) != 0</div><div class='del'>-	    || (br-&gt;last % bs-&gt;block_size) != 0</div><div class='del'>-	    || fstat(bs-&gt;fd, &amp;st) == -1</div><div class='del'>-	    || st.st_size != br-&gt;last</div><div class='del'>-	    || br-&gt;free &gt; st.st_size</div><div class='del'>-	    || (br-&gt;flags &amp; CAMEL_BLOCK_FILE_SYNC) == 0) {</div><div class='del'>-		g_warning("Invalid root: '%s'", bs-&gt;path);</div><div class='del'>-		g_warning("version: %.8s (%.8s)", bs-&gt;root-&gt;version, bs-&gt;version);</div><div class='del'>-		g_warning("block size: %d (%d)%s", br-&gt;block_size, bs-&gt;block_size,</div><div class='del'>-			  br-&gt;block_size != bs-&gt;block_size ? " BAD":" OK");</div><div class='del'>-		g_warning("free: %ld (%d add size &lt; %ld)%s", (long)br-&gt;free, br-&gt;free / bs-&gt;block_size * bs-&gt;block_size, (long)st.st_size,</div><div class='del'>-			  (br-&gt;free &gt; st.st_size) || (br-&gt;free % bs-&gt;block_size) != 0 ? " BAD":" OK");</div><div class='del'>-		g_warning("last: %ld (%d and size: %ld)%s", (long)br-&gt;last, br-&gt;last / bs-&gt;block_size * bs-&gt;block_size, (long)st.st_size,</div><div class='del'>-			  (br-&gt;last != st.st_size) || ((br-&gt;last % bs-&gt;block_size) != 0) ? " BAD": " OK");</div><div class='del'>-		g_warning("flags: %s", (br-&gt;flags &amp; CAMEL_BLOCK_FILE_SYNC)?"SYNC":"unSYNC");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-block_file_init_root(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	CamelBlockRoot *br = bs-&gt;root;</div><div class='del'>-</div><div class='del'>-	memset(br, 0, bs-&gt;block_size);</div><div class='del'>-	memcpy(br-&gt;version, bs-&gt;version, 8);</div><div class='del'>-	br-&gt;last = bs-&gt;block_size;</div><div class='del'>-	br-&gt;flags = CAMEL_BLOCK_FILE_SYNC;</div><div class='del'>-	br-&gt;free = 0;</div><div class='del'>-	br-&gt;block_size = bs-&gt;block_size;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_block_file_class_init(CamelBlockFileClass *klass)</div><div class='del'>-{</div><div class='del'>-	klass-&gt;validate_root = block_file_validate_root;</div><div class='del'>-	klass-&gt;init_root = block_file_init_root;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-block_hash_func(const void *v)</div><div class='del'>-{</div><div class='del'>-	return ((camel_block_t)v) &gt;&gt; CAMEL_BLOCK_SIZE_BITS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_block_file_init(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct _CamelBlockFilePrivate *p;</div><div class='del'>-</div><div class='del'>-	bs-&gt;fd = -1;</div><div class='del'>-	bs-&gt;block_size = CAMEL_BLOCK_SIZE;</div><div class='del'>-	e_dlist_init(&amp;bs-&gt;block_cache);</div><div class='del'>-	bs-&gt;blocks = g_hash_table_new((GHashFunc)block_hash_func, NULL);</div><div class='del'>-	/* this cache size and the text index size have been tuned for about the best</div><div class='del'>-	   with moderate memory usage.  Doubling the memory usage barely affects performance. */</div><div class='del'>-	bs-&gt;block_cache_limit = 256;</div><div class='del'>-</div><div class='del'>-	p = bs-&gt;priv = g_malloc0(sizeof(*bs-&gt;priv));</div><div class='del'>-	p-&gt;base = bs;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;root_lock, NULL);</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;cache_lock, NULL);</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;io_lock, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* link into lru list */</div><div class='del'>-	LOCK(block_file_lock);</div><div class='del'>-	e_dlist_addhead(&amp;block_file_list, (EDListNode *)p);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-		printf("dumping block list\n");</div><div class='del'>-		printf(" head = %p p = %p\n", block_file_list.head, p);</div><div class='del'>-		p = block_file_list.head;</div><div class='del'>-		while (p-&gt;next) {</div><div class='del'>-			printf(" '%s'\n", p-&gt;base-&gt;path);</div><div class='del'>-			p = p-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	UNLOCK(block_file_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_block_file_finalise(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl, *bn;</div><div class='del'>-	struct _CamelBlockFilePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = bs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;root_block)</div><div class='del'>-		camel_block_file_sync(bs);</div><div class='del'>-</div><div class='del'>-	/* remove from lru list */</div><div class='del'>-	LOCK(block_file_lock);</div><div class='del'>-	if (bs-&gt;fd != -1)</div><div class='del'>-		block_file_count--;</div><div class='del'>-	e_dlist_remove((EDListNode *)p);</div><div class='del'>-	UNLOCK(block_file_lock);</div><div class='del'>-</div><div class='del'>-	bl = (CamelBlock *)bs-&gt;block_cache.head;</div><div class='del'>-	bn = bl-&gt;next;</div><div class='del'>-	while (bn) {</div><div class='del'>-		if (bl-&gt;refcount != 0)</div><div class='del'>-			g_warning("Block '%d' still referenced", bl-&gt;id);</div><div class='del'>-		g_free(bl);</div><div class='del'>-		bl = bn;</div><div class='del'>-		bn = bn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;root_block)</div><div class='del'>-		camel_block_file_unref_block(bs, bs-&gt;root_block);</div><div class='del'>-	g_free(bs-&gt;path);</div><div class='del'>-	close(bs-&gt;fd);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;io_lock);</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;cache_lock);</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;root_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_block_file_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelBlockFile",</div><div class='del'>-					   sizeof (CamelBlockFile),</div><div class='del'>-					   sizeof (CamelBlockFileClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_block_file_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_block_file_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_block_file_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'use' a block file for io */</div><div class='del'>-static int</div><div class='del'>-block_file_use(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct _CamelBlockFilePrivate *nw, *nn, *p = bs-&gt;priv;</div><div class='del'>-	CamelBlockFile *bf;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* We want to:</div><div class='del'>-	    remove file from active list</div><div class='del'>-	    lock it</div><div class='del'>-</div><div class='del'>-	   Then when done:</div><div class='del'>-	    unlock it</div><div class='del'>-	    add it back to end of active list</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, io_lock);</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;fd != -1)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		d(printf("Turning block file online: %s\n", bs-&gt;path));</div><div class='del'>-</div><div class='del'>-	if ((bs-&gt;fd = open(bs-&gt;path, bs-&gt;flags, 0600)) == -1) {</div><div class='del'>-		err = errno;</div><div class='del'>-		CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);</div><div class='del'>-		errno = err;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	LOCK(block_file_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)p);</div><div class='del'>-	e_dlist_addtail(&amp;block_file_active_list, (EDListNode *)p);</div><div class='del'>-</div><div class='del'>-	block_file_count++;</div><div class='del'>-</div><div class='del'>-	nw = (struct _CamelBlockFilePrivate *)block_file_list.head;</div><div class='del'>-	nn = nw-&gt;next;</div><div class='del'>-	while (block_file_count &gt; block_file_threshhold &amp;&amp; nn) {</div><div class='del'>-		/* We never hit the current blockfile here, as its removed from the list first */</div><div class='del'>-		bf = nw-&gt;base;</div><div class='del'>-		if (bf-&gt;fd != -1) {</div><div class='del'>-			/* Need to trylock, as any of these lock levels might be trying</div><div class='del'>-			   to lock the block_file_lock, so we need to check and abort if so */</div><div class='del'>-			if (CAMEL_BLOCK_FILE_TRYLOCK(bf, root_lock) == 0) {</div><div class='del'>-				if (CAMEL_BLOCK_FILE_TRYLOCK(bf, cache_lock) == 0) {</div><div class='del'>-					if (CAMEL_BLOCK_FILE_TRYLOCK(bf, io_lock) == 0) {</div><div class='del'>-						d(printf("[%d] Turning block file offline: %s\n", block_file_count-1, bf-&gt;path));</div><div class='del'>-						sync_nolock(bf);</div><div class='del'>-						close(bf-&gt;fd);</div><div class='del'>-						bf-&gt;fd = -1;</div><div class='del'>-						block_file_count--;</div><div class='del'>-						CAMEL_BLOCK_FILE_UNLOCK(bf, io_lock);</div><div class='del'>-					}</div><div class='del'>-					CAMEL_BLOCK_FILE_UNLOCK(bf, cache_lock);</div><div class='del'>-				}</div><div class='del'>-				CAMEL_BLOCK_FILE_UNLOCK(bf, root_lock);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		nw = nn;</div><div class='del'>-		nn = nw-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	UNLOCK(block_file_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-block_file_unuse(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	LOCK(block_file_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)bs-&gt;priv);</div><div class='del'>-	e_dlist_addtail(&amp;block_file_list, (EDListNode *)bs-&gt;priv);</div><div class='del'>-	UNLOCK(block_file_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-o = camel_cache_get(c, key);</div><div class='del'>-camel_cache_unref(c, key);</div><div class='del'>-camel_cache_add(c, key, o);</div><div class='del'>-camel_cache_remove(c, key);</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_new:</div><div class='del'>- * @path: </div><div class='del'>- * @: </div><div class='del'>- * @block_size: </div><div class='del'>- * </div><div class='del'>- * Allocate a new block file, stored at @path.  @version contains an 8 character</div><div class='del'>- * version string which must match the head of the file, or the file will be</div><div class='del'>- * intitialised.</div><div class='del'>- * </div><div class='del'>- * @block_size is currently ignored and is set to CAMEL_BLOCK_SIZE.</div><div class='del'>- *</div><div class='del'>- * Return value: The new block file, or NULL if it could not be created.</div><div class='del'>- **/</div><div class='del'>-CamelBlockFile *camel_block_file_new(const char *path, int flags, const char version[8], size_t block_size)</div><div class='del'>-{</div><div class='del'>-	CamelBlockFile *bs;</div><div class='del'>-</div><div class='del'>-	bs = (CamelBlockFile *)camel_object_new(camel_block_file_get_type());</div><div class='del'>-	memcpy(bs-&gt;version, version, 8);</div><div class='del'>-	bs-&gt;path = g_strdup(path);</div><div class='del'>-	bs-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	bs-&gt;root_block = camel_block_file_get_block(bs, 0);</div><div class='del'>-	if (bs-&gt;root_block == NULL) {</div><div class='del'>-		camel_object_unref((CamelObject *)bs);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	camel_block_file_detach_block(bs, bs-&gt;root_block);</div><div class='del'>-	bs-&gt;root = (CamelBlockRoot *)&amp;bs-&gt;root_block-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* we only need these flags on first open */</div><div class='del'>-	bs-&gt;flags &amp;= ~(O_CREAT|O_EXCL|O_TRUNC);</div><div class='del'>-</div><div class='del'>-	/* Do we need to init the root block? */</div><div class='del'>-	if (CBF_CLASS(bs)-&gt;validate_root(bs) == -1) {</div><div class='del'>-		d(printf("Initialise root block: %.8s\n", version));</div><div class='del'>-</div><div class='del'>-		CBF_CLASS(bs)-&gt;init_root(bs);</div><div class='del'>-		camel_block_file_touch_block(bs, bs-&gt;root_block);</div><div class='del'>-		if (block_file_use(bs) == -1) {</div><div class='del'>-			camel_object_unref((CamelObject *)bs);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if (sync_block_nolock(bs, bs-&gt;root_block) == -1</div><div class='del'>-		    || ftruncate(bs-&gt;fd, bs-&gt;root-&gt;last) == -1) {</div><div class='del'>-			block_file_unuse(bs);</div><div class='del'>-			camel_object_unref((CamelObject *)bs);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		block_file_unuse(bs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_block_file_rename(CamelBlockFile *bs, const char *path)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, io_lock);</div><div class='del'>-</div><div class='del'>-	ret = rename(bs-&gt;path, path);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		/* Maybe the rename actually worked */</div><div class='del'>-		err = errno;</div><div class='del'>-		if (stat(path, &amp;st) == 0</div><div class='del'>-		    &amp;&amp; stat(bs-&gt;path, &amp;st) == -1</div><div class='del'>-		    &amp;&amp; errno == ENOENT)</div><div class='del'>-			ret = 0;</div><div class='del'>-		errno = err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		g_free(bs-&gt;path);</div><div class='del'>-		bs-&gt;path = g_strdup(path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, io_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_new_block:</div><div class='del'>- * @bs: </div><div class='del'>- * </div><div class='del'>- * Allocate a new block, return a pointer to it.  Old blocks</div><div class='del'>- * may be flushed to disk during this call.</div><div class='del'>- * </div><div class='del'>- * Return value: The block, or NULL if an error occured.</div><div class='del'>- **/</div><div class='del'>-CamelBlock *camel_block_file_new_block(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;root-&gt;free) {</div><div class='del'>-		bl = camel_block_file_get_block(bs, bs-&gt;root-&gt;free);</div><div class='del'>-		if (bl == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-		bs-&gt;root-&gt;free = ((camel_block_t *)bl-&gt;data)[0];</div><div class='del'>-	} else {</div><div class='del'>-		bl = camel_block_file_get_block(bs, bs-&gt;root-&gt;last);</div><div class='del'>-		if (bl == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-		bs-&gt;root-&gt;last += CAMEL_BLOCK_SIZE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bs-&gt;root_block-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-</div><div class='del'>-	bl-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-	memset(bl-&gt;data, 0, CAMEL_BLOCK_SIZE);</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);</div><div class='del'>-</div><div class='del'>-	return bl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_free_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @id: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-int camel_block_file_free_block(CamelBlockFile *bs, camel_block_t id)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-</div><div class='del'>-	bl = camel_block_file_get_block(bs, id);</div><div class='del'>-	if (bl == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);</div><div class='del'>-</div><div class='del'>-	((camel_block_t *)bl-&gt;data)[0] = bs-&gt;root-&gt;free;</div><div class='del'>-	bs-&gt;root-&gt;free = bl-&gt;id;</div><div class='del'>-	bs-&gt;root_block-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-	bl-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-	camel_block_file_unref_block(bs, bl);</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_get_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @id: </div><div class='del'>- * </div><div class='del'>- * Retreive a block @id.</div><div class='del'>- * </div><div class='del'>- * Return value: The block, or NULL if blockid is invalid or a file error</div><div class='del'>- * occured.</div><div class='del'>- **/</div><div class='del'>-CamelBlock *camel_block_file_get_block(CamelBlockFile *bs, camel_block_t id)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl, *flush, *prev;</div><div class='del'>-</div><div class='del'>-	/* Sanity check: Dont allow reading of root block (except before its been read)</div><div class='del'>-	   or blocks with invalid block id's */</div><div class='del'>-	if ((bs-&gt;root == NULL &amp;&amp; id != 0)</div><div class='del'>-	    || (bs-&gt;root != NULL &amp;&amp; (id &gt; bs-&gt;root-&gt;last || id == 0))</div><div class='del'>-	    || (id % bs-&gt;block_size) != 0) {</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	bl = g_hash_table_lookup(bs-&gt;blocks, (void *)id);</div><div class='del'>-</div><div class='del'>-	d(printf("Get  block %08x: %s\n", id, bl?"cached":"must read"));</div><div class='del'>-</div><div class='del'>-	if (bl == NULL) {</div><div class='del'>-		/* LOCK io_lock */</div><div class='del'>-		if (block_file_use(bs) == -1) {</div><div class='del'>-			CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bl = g_malloc0(sizeof(*bl));</div><div class='del'>-		bl-&gt;id = id;</div><div class='del'>-		if (lseek(bs-&gt;fd, id, SEEK_SET) == -1</div><div class='del'>-		    || read(bs-&gt;fd, bl-&gt;data, CAMEL_BLOCK_SIZE) == -1) {</div><div class='del'>-			block_file_unuse(bs);</div><div class='del'>-			CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-			g_free(bl);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bs-&gt;block_cache_count++;</div><div class='del'>-		g_hash_table_insert(bs-&gt;blocks, (void *)bl-&gt;id, bl);</div><div class='del'>-</div><div class='del'>-		/* flush old blocks */</div><div class='del'>-		flush = (CamelBlock *)bs-&gt;block_cache.tailpred;</div><div class='del'>-		prev = flush-&gt;prev;</div><div class='del'>-		while (bs-&gt;block_cache_count &gt; bs-&gt;block_cache_limit &amp;&amp; prev) {</div><div class='del'>-			if (flush-&gt;refcount == 0) {</div><div class='del'>-				if (sync_block_nolock(bs, flush) != -1) {</div><div class='del'>-					g_hash_table_remove(bs-&gt;blocks, (void *)flush-&gt;id);</div><div class='del'>-					e_dlist_remove((EDListNode *)flush);</div><div class='del'>-					g_free(flush);</div><div class='del'>-					bs-&gt;block_cache_count--;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			flush = prev;</div><div class='del'>-			prev = prev-&gt;prev;</div><div class='del'>-		}</div><div class='del'>-		/* UNLOCK io_lock */</div><div class='del'>-		block_file_unuse(bs);</div><div class='del'>-	} else {</div><div class='del'>-		e_dlist_remove((EDListNode *)bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dlist_addhead(&amp;bs-&gt;block_cache, (EDListNode *)bl);</div><div class='del'>-	bl-&gt;refcount++;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	d(printf("Got  block %08x\n", id));</div><div class='del'>-</div><div class='del'>-	return bl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_detach_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @bl: </div><div class='del'>- * </div><div class='del'>- * Detatch a block from the block file's cache.  The block should</div><div class='del'>- * be unref'd or attached when finished with.  The block file will</div><div class='del'>- * perform no writes of this block or flushing of it if the cache</div><div class='del'>- * fills.</div><div class='del'>- **/</div><div class='del'>-void camel_block_file_detach_block(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove(bs-&gt;blocks, (void *)bl-&gt;id);</div><div class='del'>-	e_dlist_remove((EDListNode *)bl);</div><div class='del'>-	bl-&gt;flags |= CAMEL_BLOCK_DETACHED;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_attach_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @bl: </div><div class='del'>- * </div><div class='del'>- * Reattach a block that has been detached.</div><div class='del'>- **/</div><div class='del'>-void camel_block_file_attach_block(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert(bs-&gt;blocks, (void *)bl-&gt;id, bl);</div><div class='del'>-	e_dlist_addtail(&amp;bs-&gt;block_cache, (EDListNode *)bl);</div><div class='del'>-	bl-&gt;flags &amp;= ~CAMEL_BLOCK_DETACHED;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_touch_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @bl: </div><div class='del'>- * </div><div class='del'>- * Mark a block as dirty.  The block will be written to disk if</div><div class='del'>- * it ever expires from the cache.</div><div class='del'>- **/</div><div class='del'>-void camel_block_file_touch_block(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	bl-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-</div><div class='del'>-	if ((bs-&gt;root-&gt;flags &amp; CAMEL_BLOCK_FILE_SYNC) &amp;&amp; bl != bs-&gt;root_block) {</div><div class='del'>-		d(printf("turning off sync flag\n"));</div><div class='del'>-		bs-&gt;root-&gt;flags &amp;= ~CAMEL_BLOCK_FILE_SYNC;</div><div class='del'>-		bs-&gt;root_block-&gt;flags |= CAMEL_BLOCK_DIRTY;</div><div class='del'>-		camel_block_file_sync_block(bs, bs-&gt;root_block);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_unref_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @bl: </div><div class='del'>- * </div><div class='del'>- * Mark a block as unused.  If a block is used it will not be</div><div class='del'>- * written to disk, or flushed from memory.</div><div class='del'>- *</div><div class='del'>- * If a block is detatched and this is the last reference, the</div><div class='del'>- * block will be freed.</div><div class='del'>- **/</div><div class='del'>-void camel_block_file_unref_block(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;refcount == 1 &amp;&amp; (bl-&gt;flags &amp; CAMEL_BLOCK_DETACHED))</div><div class='del'>-		g_free(bl);</div><div class='del'>-	else</div><div class='del'>-		bl-&gt;refcount--;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sync_block_nolock(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	d(printf("Sync block %08x: %s\n", bl-&gt;id, (bl-&gt;flags &amp; CAMEL_BLOCK_DIRTY)?"dirty":"clean"));</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;flags &amp; CAMEL_BLOCK_DIRTY) {</div><div class='del'>-		if (lseek(bs-&gt;fd, bl-&gt;id, SEEK_SET) == -1</div><div class='del'>-		    || write(bs-&gt;fd, bl-&gt;data, CAMEL_BLOCK_SIZE) != CAMEL_BLOCK_SIZE) {</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		bl-&gt;flags &amp;= ~CAMEL_BLOCK_DIRTY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sync_nolock(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl, *bn;</div><div class='del'>-	int work = FALSE;</div><div class='del'>-</div><div class='del'>-	bl = (CamelBlock *)bs-&gt;block_cache.head;</div><div class='del'>-	bn = bl-&gt;next;</div><div class='del'>-	while (bn) {</div><div class='del'>-		if (bl-&gt;flags &amp; CAMEL_BLOCK_DIRTY) {</div><div class='del'>-			work = TRUE;</div><div class='del'>-			if (sync_block_nolock(bs, bl) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-		bl = bn;</div><div class='del'>-		bn = bn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!work</div><div class='del'>-	    &amp;&amp; (bs-&gt;root_block-&gt;flags &amp; CAMEL_BLOCK_DIRTY) == 0</div><div class='del'>-	    &amp;&amp; (bs-&gt;root-&gt;flags &amp; CAMEL_BLOCK_FILE_SYNC) != 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	d(printf("turning on sync flag\n"));</div><div class='del'>-</div><div class='del'>-	bs-&gt;root-&gt;flags |= CAMEL_BLOCK_FILE_SYNC;</div><div class='del'>-</div><div class='del'>-	return sync_block_nolock(bs, bs-&gt;root_block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_sync_block:</div><div class='del'>- * @bs: </div><div class='del'>- * @bl: </div><div class='del'>- * </div><div class='del'>- * Flush a block to disk immediately.  The block will only</div><div class='del'>- * be flushed to disk if it is marked as dirty (touched).</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on io error.</div><div class='del'>- **/</div><div class='del'>-int camel_block_file_sync_block(CamelBlockFile *bs, CamelBlock *bl)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* LOCK io_lock */</div><div class='del'>-	if (block_file_use(bs) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	ret = sync_block_nolock(bs, bl);</div><div class='del'>-</div><div class='del'>-	block_file_unuse(bs);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_block_file_sync:</div><div class='del'>- * @bs: </div><div class='del'>- * </div><div class='del'>- * Sync all dirty blocks to disk, including the root block.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on io error.</div><div class='del'>- **/</div><div class='del'>-int camel_block_file_sync(CamelBlockFile *bs)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, root_lock);</div><div class='del'>-	CAMEL_BLOCK_FILE_LOCK(bs, cache_lock);</div><div class='del'>-</div><div class='del'>-	/* LOCK io_lock */</div><div class='del'>-	if (block_file_use(bs) == -1)</div><div class='del'>-		ret = -1;</div><div class='del'>-	else {</div><div class='del'>-		ret = sync_nolock(bs);</div><div class='del'>-		block_file_unuse(bs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);</div><div class='del'>-	CAMEL_BLOCK_FILE_UNLOCK(bs, root_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelKeyFilePrivate {</div><div class='del'>-	struct _CamelKeyFilePrivate *next;</div><div class='del'>-	struct _CamelKeyFilePrivate *prev;</div><div class='del'>-</div><div class='del'>-	struct _CamelKeyFile *base;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_t lock;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_KEY_FILE_LOCK(kf, lock) (pthread_mutex_lock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_KEY_FILE_TRYLOCK(kf, lock) (pthread_mutex_trylock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_KEY_FILE_UNLOCK(kf, lock) (pthread_mutex_unlock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-</div><div class='del'>-static pthread_mutex_t key_file_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_KEY_FILE_LOCK(kf, lock)</div><div class='del'>-#define CAMEL_KEY_FILE_TRYLOCK(kf, lock)</div><div class='del'>-#define CAMEL_KEY_FILE_UNLOCK(kf, lock)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* lru cache of block files */</div><div class='del'>-static EDList key_file_list = E_DLIST_INITIALISER(key_file_list);</div><div class='del'>-static EDList key_file_active_list = E_DLIST_INITIALISER(key_file_active_list);</div><div class='del'>-static int key_file_count = 0;</div><div class='del'>-static int key_file_threshhold = 10;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_file_class_init(CamelKeyFileClass *klass)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_file_init(CamelKeyFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct _CamelKeyFilePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = bs-&gt;priv = g_malloc0(sizeof(*bs-&gt;priv));</div><div class='del'>-	p-&gt;base = bs;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;lock, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	LOCK(key_file_lock);</div><div class='del'>-	e_dlist_addhead(&amp;key_file_list, (EDListNode *)p);</div><div class='del'>-	UNLOCK(key_file_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_file_finalise(CamelKeyFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct _CamelKeyFilePrivate *p = bs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	LOCK(key_file_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)p);</div><div class='del'>-	UNLOCK(key_file_lock);</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;fp)</div><div class='del'>-		fclose(bs-&gt;fp);</div><div class='del'>-	g_free(bs-&gt;path);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_key_file_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelKeyFile",</div><div class='del'>-					   sizeof (CamelKeyFile),</div><div class='del'>-					   sizeof (CamelKeyFileClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_key_file_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_key_file_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_key_file_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'use' a key file for io */</div><div class='del'>-static int</div><div class='del'>-key_file_use(CamelKeyFile *bs)</div><div class='del'>-{</div><div class='del'>-	struct _CamelKeyFilePrivate *nw, *nn, *p = bs-&gt;priv;</div><div class='del'>-	CamelKeyFile *bf;</div><div class='del'>-	int err, fd;</div><div class='del'>-	char *flag;</div><div class='del'>-</div><div class='del'>-	/* We want to:</div><div class='del'>-	    remove file from active list</div><div class='del'>-	    lock it</div><div class='del'>-</div><div class='del'>-	   Then when done:</div><div class='del'>-	    unlock it</div><div class='del'>-	    add it back to end of active list</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/* TODO: Check header on reset? */</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_FILE_LOCK(bs, lock);</div><div class='del'>-</div><div class='del'>-	if (bs-&gt;fp != NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		d(printf("Turning key file online: '%s'\n", bs-&gt;path));</div><div class='del'>-</div><div class='del'>-	if ((bs-&gt;flags &amp; O_ACCMODE) == O_RDONLY)</div><div class='del'>-		flag = "r";</div><div class='del'>-	else</div><div class='del'>-		flag = "a+";</div><div class='del'>-</div><div class='del'>-	if ((fd = open(bs-&gt;path, bs-&gt;flags, 0600)) == -1</div><div class='del'>-	    || (bs-&gt;fp = fdopen(fd, flag)) == NULL) {</div><div class='del'>-		err = errno;</div><div class='del'>-		close(fd);</div><div class='del'>-		CAMEL_KEY_FILE_UNLOCK(bs, lock);</div><div class='del'>-		errno = err;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	LOCK(key_file_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)p);</div><div class='del'>-	e_dlist_addtail(&amp;key_file_active_list, (EDListNode *)p);</div><div class='del'>-</div><div class='del'>-	key_file_count++;</div><div class='del'>-</div><div class='del'>-	nw = (struct _CamelKeyFilePrivate *)key_file_list.head;</div><div class='del'>-	nn = nw-&gt;next;</div><div class='del'>-	while (key_file_count &gt; key_file_threshhold &amp;&amp; nn) {</div><div class='del'>-		/* We never hit the current keyfile here, as its removed from the list first */</div><div class='del'>-		bf = nw-&gt;base;</div><div class='del'>-		if (bf-&gt;fp != NULL) {</div><div class='del'>-			/* Need to trylock, as any of these lock levels might be trying</div><div class='del'>-			   to lock the key_file_lock, so we need to check and abort if so */</div><div class='del'>-			if (CAMEL_BLOCK_FILE_TRYLOCK(bf, lock) == 0) {</div><div class='del'>-				d(printf("Turning key file offline: %s\n", bf-&gt;path));</div><div class='del'>-				fclose(bf-&gt;fp);</div><div class='del'>-				bf-&gt;fp = NULL;</div><div class='del'>-				key_file_count--;</div><div class='del'>-				CAMEL_BLOCK_FILE_UNLOCK(bf, lock);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		nw = nn;</div><div class='del'>-		nn = nw-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	UNLOCK(key_file_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-key_file_unuse(CamelKeyFile *bs)</div><div class='del'>-{</div><div class='del'>-	LOCK(key_file_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)bs-&gt;priv);</div><div class='del'>-	e_dlist_addtail(&amp;key_file_list, (EDListNode *)bs-&gt;priv);</div><div class='del'>-	UNLOCK(key_file_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_FILE_UNLOCK(bs, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_key_file_new:</div><div class='del'>- * @path: </div><div class='del'>- * @flags: open flags</div><div class='del'>- * @version[]: Version string (header) of file.  Currently</div><div class='del'>- * written but not checked.</div><div class='del'>- * </div><div class='del'>- * Create a new key file.  A linked list of record blocks.</div><div class='del'>- * </div><div class='del'>- * Return value: A new key file, or NULL if the file could not</div><div class='del'>- * be opened/created/initialised.</div><div class='del'>- **/</div><div class='del'>-CamelKeyFile *</div><div class='del'>-camel_key_file_new(const char *path, int flags, const char version[8])</div><div class='del'>-{</div><div class='del'>-	CamelKeyFile *kf;</div><div class='del'>-	off_t last;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	d(printf("New key file '%s'\n", path));</div><div class='del'>-</div><div class='del'>-	kf = (CamelKeyFile *)camel_object_new(camel_key_file_get_type());</div><div class='del'>-	kf-&gt;path = g_strdup(path);</div><div class='del'>-	kf-&gt;fp = NULL;</div><div class='del'>-	kf-&gt;flags = flags;</div><div class='del'>-	kf-&gt;last = 8;</div><div class='del'>-</div><div class='del'>-	if (key_file_use(kf) == -1) {</div><div class='del'>-		camel_object_unref((CamelObject *)kf);</div><div class='del'>-		kf = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		fseek(kf-&gt;fp, 0, SEEK_END);</div><div class='del'>-		last = ftell(kf-&gt;fp);</div><div class='del'>-		if (last == 0) {</div><div class='del'>-			fwrite(version, 8, 1, kf-&gt;fp);</div><div class='del'>-			last += 8;</div><div class='del'>-		}</div><div class='del'>-		kf-&gt;last = last;</div><div class='del'>-</div><div class='del'>-		err = ferror(kf-&gt;fp);</div><div class='del'>-		key_file_unuse(kf);</div><div class='del'>-</div><div class='del'>-		/* we only need these flags on first open */</div><div class='del'>-		kf-&gt;flags &amp;= ~(O_CREAT|O_EXCL|O_TRUNC);</div><div class='del'>-</div><div class='del'>-		if (err) {</div><div class='del'>-			camel_object_unref((CamelObject *)kf);</div><div class='del'>-			kf = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return kf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_key_file_rename(CamelKeyFile *kf, const char *path)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_FILE_LOCK(kf, lock);</div><div class='del'>-</div><div class='del'>-	ret = rename(kf-&gt;path, path);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		/* Maybe the rename actually worked */</div><div class='del'>-		err = errno;</div><div class='del'>-		if (stat(path, &amp;st) == 0</div><div class='del'>-		    &amp;&amp; stat(kf-&gt;path, &amp;st) == -1</div><div class='del'>-		    &amp;&amp; errno == ENOENT)</div><div class='del'>-			ret = 0;</div><div class='del'>-		errno = err;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		g_free(kf-&gt;path);</div><div class='del'>-		kf-&gt;path = g_strdup(path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_FILE_UNLOCK(kf, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_key_file_write:</div><div class='del'>- * @kf: </div><div class='del'>- * @parent: </div><div class='del'>- * @len: </div><div class='del'>- * @records: </div><div class='del'>- * </div><div class='del'>- * Write a new list of records to the key file.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on io error.  The key file will remain unchanged.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_key_file_write(CamelKeyFile *kf, camel_block_t *parent, size_t len, camel_key_t *records)</div><div class='del'>-{</div><div class='del'>-	camel_block_t next;</div><div class='del'>-	guint32 size;</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	d(printf("write key %08x len = %d\n", *parent, len));</div><div class='del'>-</div><div class='del'>-	if (len == 0) {</div><div class='del'>-		d(printf(" new parent = %08x\n", *parent));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* LOCK */</div><div class='del'>-	if (key_file_use(kf) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	size = len;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Use io util functions? */</div><div class='del'>-	next = kf-&gt;last;</div><div class='del'>-	fseek(kf-&gt;fp, kf-&gt;last, SEEK_SET);</div><div class='del'>-	fwrite(parent, sizeof(*parent), 1, kf-&gt;fp);</div><div class='del'>-	fwrite(&amp;size, sizeof(size), 1, kf-&gt;fp);</div><div class='del'>-	fwrite(records, sizeof(records[0]), len, kf-&gt;fp);</div><div class='del'>-</div><div class='del'>-	if (ferror(kf-&gt;fp)) {</div><div class='del'>-		clearerr(kf-&gt;fp);</div><div class='del'>-	} else {</div><div class='del'>-		kf-&gt;last = ftell(kf-&gt;fp);</div><div class='del'>-		*parent = next;</div><div class='del'>-		ret = len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* UNLOCK */</div><div class='del'>-	key_file_unuse(kf);</div><div class='del'>-</div><div class='del'>-	d(printf(" new parent = %08x\n", *parent));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_key_file_read:</div><div class='del'>- * @kf: </div><div class='del'>- * @start: The record pointer.  This will be set to the next record pointer on success.</div><div class='del'>- * @len: Number of records read, if != NULL.</div><div class='del'>- * @records: Records, allocated, must be freed with g_free, if != NULL.</div><div class='del'>- * </div><div class='del'>- * Read the next block of data from the key file.  Returns the number of</div><div class='del'>- * records.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on io error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_t *len, camel_key_t **records)</div><div class='del'>-{</div><div class='del'>-	guint32 size;</div><div class='del'>-	long pos = *start;</div><div class='del'>-	camel_block_t next;</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	if (pos == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* LOCK */</div><div class='del'>-	if (key_file_use(kf) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (fseek(kf-&gt;fp, pos, SEEK_SET) == -1</div><div class='del'>-	    || fread(&amp;next, sizeof(next), 1, kf-&gt;fp) != 1</div><div class='del'>-	    || fread(&amp;size, sizeof(size), 1, kf-&gt;fp) != 1</div><div class='del'>-	    || size &gt; 1024) {</div><div class='del'>-		clearerr(kf-&gt;fp);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len)</div><div class='del'>-		*len = size;</div><div class='del'>-</div><div class='del'>-	if (records) {</div><div class='del'>-		camel_key_t *keys = g_malloc(size * sizeof(camel_key_t));</div><div class='del'>-</div><div class='del'>-		if (fread(keys, sizeof(camel_key_t), size, kf-&gt;fp) != size) {</div><div class='del'>-			g_free(keys);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		*records = keys;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*start = next;</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-fail:</div><div class='del'>-	/* UNLOCK */</div><div class='del'>-	key_file_unuse(kf);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h<br/>deleted file mode 100644<br/>index e78254e1ed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-block-file.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-block-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,142 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_BLOCK_FILE_H</div><div class='del'>-#define _CAMEL_BLOCK_FILE_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-typedef guint32 camel_block_t;	/* block offset, absolute, bottom BLOCK_SIZE_BITS always 0 */</div><div class='del'>-typedef guint32 camel_key_t;	/* this is a bitfield of (block offset:BLOCK_SIZE_BITS) */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelBlockRoot CamelBlockRoot;</div><div class='del'>-typedef struct _CamelBlock CamelBlock;</div><div class='del'>-typedef struct _CamelBlockFile CamelBlockFile;</div><div class='del'>-typedef struct _CamelBlockFileClass CamelBlockFileClass;</div><div class='del'>-</div><div class='del'>-#define CAMEL_BLOCK_FILE_SYNC (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-#define CAMEL_BLOCK_SIZE (1024)</div><div class='del'>-#define CAMEL_BLOCK_SIZE_BITS (10) /* # bits to contain block_size bytes */</div><div class='del'>-</div><div class='del'>-#define CAMEL_BLOCK_DIRTY (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_BLOCK_DETACHED (1&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-struct _CamelBlockRoot {</div><div class='del'>-	char version[8];	/* version number */</div><div class='del'>-</div><div class='del'>-	guint32 flags;		/* flags for file */</div><div class='del'>-	guint32 block_size;	/* block size of this file */</div><div class='del'>-	camel_block_t free;	/* free block list */</div><div class='del'>-	camel_block_t last;	/* pointer to end of blocks */</div><div class='del'>-</div><div class='del'>-	/* subclasses tack on, but no more than CAMEL_BLOCK_SIZE! */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* LRU cache of blocks */</div><div class='del'>-struct _CamelBlock {</div><div class='del'>-	struct _CamelBlock *next;</div><div class='del'>-	struct _CamelBlock *prev;</div><div class='del'>-</div><div class='del'>-	camel_block_t id;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	guint32 refcount;</div><div class='del'>-	guint32 align00;</div><div class='del'>-</div><div class='del'>-	unsigned char data[CAMEL_BLOCK_SIZE];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelBlockFile {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelBlockFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	char version[8];</div><div class='del'>-	char *path;</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	int fd;</div><div class='del'>-	size_t block_size;</div><div class='del'>-</div><div class='del'>-	CamelBlockRoot *root;</div><div class='del'>-	CamelBlock *root_block;</div><div class='del'>-</div><div class='del'>-	/* make private? */</div><div class='del'>-	int block_cache_limit;</div><div class='del'>-	int block_cache_count;</div><div class='del'>-	EDList block_cache;</div><div class='del'>-	GHashTable *blocks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelBlockFileClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-</div><div class='del'>-	int (*validate_root)(CamelBlockFile *);</div><div class='del'>-	int (*init_root)(CamelBlockFile *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_block_file_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelBlockFile *camel_block_file_new(const char *path, int flags, const char version[8], size_t block_size);</div><div class='del'>-int camel_block_file_rename(CamelBlockFile *bs, const char *path);</div><div class='del'>-</div><div class='del'>-CamelBlock *camel_block_file_new_block(CamelBlockFile *bs);</div><div class='del'>-int camel_block_file_free_block(CamelBlockFile *bs, camel_block_t id);</div><div class='del'>-CamelBlock *camel_block_file_get_block(CamelBlockFile *bs, camel_block_t id);</div><div class='del'>-void camel_block_file_detach_block(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-void camel_block_file_attach_block(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-void camel_block_file_touch_block(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-void camel_block_file_unref_block(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-int camel_block_file_sync_block(CamelBlockFile *bs, CamelBlock *bl);</div><div class='del'>-int camel_block_file_sync(CamelBlockFile *bs);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelKeyFile CamelKeyFile;</div><div class='del'>-typedef struct _CamelKeyFileClass CamelKeyFileClass;</div><div class='del'>-</div><div class='del'>-struct _CamelKeyFile {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelKeyFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	FILE *fp;</div><div class='del'>-	char *path;</div><div class='del'>-	int flags;</div><div class='del'>-	off_t last;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelKeyFileClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType      camel_key_file_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelKeyFile * camel_key_file_new(const char *path, int flags, const char version[8]);</div><div class='del'>-int	       camel_key_file_rename(CamelKeyFile *kf, const char *path);</div><div class='del'>-</div><div class='del'>-int            camel_key_file_write(CamelKeyFile *kf, camel_block_t *parent, size_t len, camel_key_t *records);</div><div class='del'>-int            camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_t *len, camel_key_t **records);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_BLOCK_FILE_H */</div><div class='head'>diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h<br/>deleted file mode 100644<br/>index 35556db87e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-charset-map-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,621 +0,0 @@</div><div class='del'>-/* This file is automatically generated: DO NOT EDIT */</div><div class='del'>-</div><div class='del'>-static unsigned char m000[256] = {</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xbf, 0xbf, </div><div class='del'>-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, </div><div class='del'>-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, </div><div class='del'>-	0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, </div><div class='del'>-	0xbf, 0xbf, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, 0x9f, </div><div class='del'>-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, </div><div class='del'>-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, </div><div class='del'>-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, </div><div class='del'>-	0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, </div><div class='del'>-	0xff, 0x80, 0xc0, 0xe0, 0xc3, 0xc0, 0xe0, 0xf3, </div><div class='del'>-	0xe3, 0xec, 0x80, 0xe0, 0xe0, 0xf3, 0xc0, 0xc2, </div><div class='del'>-	0xef, 0xe0, 0xec, 0xe0, 0xc3, 0xc0, 0xc0, 0xec, </div><div class='del'>-	0xc3, 0xc0, 0x80, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, </div><div class='del'>-	0x80, 0x83, 0x83, 0x82, 0x83, 0x82, 0x82, 0x81, </div><div class='del'>-	0x80, 0x83, 0x80, 0x83, 0x80, 0x83, 0x83, 0x80, </div><div class='del'>-	0x00, 0x80, 0x80, 0x81, 0x83, 0x82, 0x83, 0xc3, </div><div class='del'>-	0x82, 0x80, 0x83, 0x82, 0x83, 0x01, 0x00, 0x83, </div><div class='del'>-	0x80, 0x83, 0x83, 0x82, 0x83, 0x82, 0x82, 0x81, </div><div class='del'>-	0x80, 0x83, 0x80, 0x83, 0x80, 0x83, 0x83, 0x80, </div><div class='del'>-	0x00, 0x80, 0x80, 0x81, 0x83, 0x82, 0x83, 0xcf, </div><div class='del'>-	0x82, 0x80, 0x83, 0x82, 0x83, 0x01, 0x00, 0x80, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m001[256] = {</div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, </div><div class='del'>-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, </div><div class='del'>-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, </div><div class='del'>-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, </div><div class='del'>-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, </div><div class='del'>-	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, </div><div class='del'>-	0x07, 0x02, 0x03, 0x03, 0x05, 0x02, 0x05, 0x07, </div><div class='del'>-	0x00, 0x07, 0x02, 0x07, 0x07, 0x07, 0x07, 0x02, </div><div class='del'>-	0x07, 0x07, 0x03, 0x03, 0x00, 0x07, 0x07, 0x07, </div><div class='del'>-	0x00, 0x03, 0x02, 0x07, 0x01, 0x01, 0x01, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, </div><div class='del'>-	0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x03, </div><div class='del'>-	0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x03, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, </div><div class='del'>-	0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x03, 0x02, 0x03, 0x03, 0x03, </div><div class='del'>-	0x03, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m010[256] = {</div><div class='del'>-	0x02, 0x02, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x01, </div><div class='del'>-	0x03, 0x03, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, </div><div class='del'>-	0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x80, 0x80, </div><div class='del'>-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, </div><div class='del'>-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, </div><div class='del'>-	0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x00, </div><div class='del'>-	0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x01, </div><div class='del'>-	0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, 0x81, </div><div class='del'>-	0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m011[256] = {</div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x02, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m020[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x03, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m030[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m040[256] = {</div><div class='del'>-	0x00, 0x1c, 0x10, 0x10, 0x18, 0x10, 0x18, 0x18, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, </div><div class='del'>-	0x00, 0x1c, 0x10, 0x10, 0x18, 0x10, 0x18, 0x18, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m041[256] = {</div><div class='del'>-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x04, 0x04, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m050[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m200[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, </div><div class='del'>-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m201[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x05, 0x04, 0x00, 0x05, 0x05, 0x05, 0x00, </div><div class='del'>-	0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m210[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m211[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m220[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m230[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m250[256] = {</div><div class='del'>-	0x0c, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x04, 0x04, 0x0c, </div><div class='del'>-	0x0c, 0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x0c, 0x0c, </div><div class='del'>-	0x0c, 0x0c, 0x04, 0x0c, 0x04, 0x04, 0x0c, 0x0c, </div><div class='del'>-	0x0c, 0x0c, 0x0c, 0x04, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	unsigned char *bits0;</div><div class='del'>-	unsigned char *bits1;</div><div class='del'>-} camel_charmap[256] = {</div><div class='del'>-	{ m000, m001, }, { m010, m011, }, { m020, 0, }, { m030, 0, }, { m040, m041, }, { m050, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ m200, m201, }, { m210, m211, }, { m220, 0, }, { m230, 0, }, { 0, 0, }, { m250, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-	{ 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, { 0, 0, }, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int bit;</div><div class='del'>-} camel_charinfo[] = {</div><div class='del'>-	{ "iso-8859-2", 0x0001 },</div><div class='del'>-	{ "iso-8859-4", 0x0002 },</div><div class='del'>-	{ "koi8-r", 0x0004 },</div><div class='del'>-	{ "koi8-u", 0x0008 },</div><div class='del'>-	{ "iso-8859-5", 0x0010 },</div><div class='del'>-	{ "iso-8859-7", 0x0020 },</div><div class='del'>-	{ "iso-8859-8", 0x0040 },</div><div class='del'>-	{ "iso-8859-9", 0x0080 },</div><div class='del'>-	{ "iso-8859-13", 0x0100 },</div><div class='del'>-	{ "iso-8859-15", 0x0200 },</div><div class='del'>-	{ "windows-1251", 0x0400 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define charset_mask(x) \</div><div class='del'>-	(camel_charmap[(x)&gt;&gt;8].bits0?camel_charmap[(x)&gt;&gt;8].bits0[(x)&amp;0xff]&lt;&lt;0:0)	\</div><div class='del'>-	| (camel_charmap[(x)&gt;&gt;8].bits1?camel_charmap[(x)&gt;&gt;8].bits1[(x)&amp;0xff]&lt;&lt;8:0)</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c<br/>deleted file mode 100644<br/>index 4368e52018..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-charset-map.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,353 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  if you want to build the charset map, compile this with something like:</div><div class='del'>-    gcc -DBUILD_MAP camel-charset-map.c `glib-config --cflags`</div><div class='del'>-  (plus any -I/-L/-l flags you need for iconv), then run it as </div><div class='del'>-    ./a.out &gt; camel-charset-map-private.h</div><div class='del'>-</div><div class='del'>-  Note that the big-endian variant isn't tested...</div><div class='del'>-</div><div class='del'>-  The tables genereated work like this:</div><div class='del'>-</div><div class='del'>-   An indirect array for each page of unicode character</div><div class='del'>-   Each array element has an indirect pointer to one of the bytes of</div><div class='del'>-   the generated bitmask.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifdef BUILD_MAP</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	unsigned int bit;	/* assigned bit */</div><div class='del'>-} tables[] = {</div><div class='del'>-	/* These are the 8bit character sets (other than iso-8859-1,</div><div class='del'>-	 * which is special-cased) which are supported by both other</div><div class='del'>-	 * mailers and the GNOME environment. Note that the order</div><div class='del'>-	 * they're listed in is the order they'll be tried in, so put</div><div class='del'>-	 * the more-popular ones first.</div><div class='del'>-	 */</div><div class='del'>-	{ "iso-8859-2", 0 },	/* Central/Eastern European */</div><div class='del'>-	{ "iso-8859-4", 0 },	/* Baltic */</div><div class='del'>-	{ "koi8-r", 0 },	/* Russian */</div><div class='del'>-	{ "koi8-u", 0 },	/* Ukranian */</div><div class='del'>-	{ "iso-8859-5", 0 },	/* Least-popular Russian encoding */</div><div class='del'>-	{ "iso-8859-7", 0 },	/* Greek */</div><div class='del'>-	{ "iso-8859-8", 0 },    /* Hebrew; Visual */</div><div class='del'>-	{ "iso-8859-9", 0 },	/* Turkish */</div><div class='del'>-	{ "iso-8859-13", 0 },	/* Baltic again */</div><div class='del'>-	{ "iso-8859-15", 0 },	/* New-and-improved iso-8859-1, but most</div><div class='del'>-				 * programs that support this support UTF8</div><div class='del'>-				 */</div><div class='del'>-	{ "windows-1251", 0 },	/* Russian */</div><div class='del'>-	{ 0, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-unsigned int encoding_map[256 * 256];</div><div class='del'>-</div><div class='del'>-#if G_BYTE_ORDER == G_BIG_ENDIAN</div><div class='del'>-#define UCS "UCS-4BE"</div><div class='del'>-#else</div><div class='del'>-#define UCS "UCS-4LE"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main (void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	int max, min;</div><div class='del'>-	int bit = 0x01;</div><div class='del'>-	int k;</div><div class='del'>-	int bytes;</div><div class='del'>-	iconv_t cd;</div><div class='del'>-	char in[128];</div><div class='del'>-	guint32 out[128];</div><div class='del'>-	char *inptr, *outptr;</div><div class='del'>-	size_t inlen, outlen;</div><div class='del'>-</div><div class='del'>-	/* dont count the terminator */</div><div class='del'>-	bytes = ((sizeof(tables)/sizeof(tables[0]))+7-1)/8;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 128; i++)</div><div class='del'>-		in[i] = i + 128;</div><div class='del'>-</div><div class='del'>-	for (j = 0; tables[j].name; j++) {</div><div class='del'>-		cd = iconv_open (UCS, tables[j].name);</div><div class='del'>-		inptr = in;</div><div class='del'>-		outptr = (char *)(out);</div><div class='del'>-		inlen = sizeof (in);</div><div class='del'>-		outlen = sizeof (out);</div><div class='del'>-		while (iconv (cd, &amp;inptr, &amp;inlen, &amp;outptr, &amp;outlen) == -1) {</div><div class='del'>-			if (errno == EILSEQ) {</div><div class='del'>-				inptr++;</div><div class='del'>-				inlen--;</div><div class='del'>-			} else {</div><div class='del'>-				printf ("%s\n", strerror (errno));</div><div class='del'>-				exit (1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		iconv_close (cd);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 128 - outlen / 4; i++) {</div><div class='del'>-			encoding_map[i] |= bit;</div><div class='del'>-			encoding_map[out[i]] |= bit;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tables[j].bit = bit;</div><div class='del'>-		bit &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("/* This file is automatically generated: DO NOT EDIT */\n\n");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		/* first, do we need this block? */</div><div class='del'>-		for (k=0;k&lt;bytes;k++) {</div><div class='del'>-			for (j=0;j&lt;256;j++) {</div><div class='del'>-				if ((encoding_map[i*256 + j] &amp; (0xff &lt;&lt; (k*8))) != 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (j &lt; 256) {</div><div class='del'>-				/* yes, dump it */</div><div class='del'>-				printf("static unsigned char m%02x%x[256] = {\n\t", i, k);</div><div class='del'>-				for (j=0;j&lt;256;j++) {</div><div class='del'>-					printf("0x%02x, ", (encoding_map[i*256+j] &gt;&gt; (k*8)) &amp; 0xff );</div><div class='del'>-					if (((j+1)&amp;7) == 0 &amp;&amp; j&lt;255)</div><div class='del'>-						printf("\n\t");</div><div class='del'>-				}</div><div class='del'>-				printf("\n};\n\n");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("struct {\n");</div><div class='del'>-	for (k=0;k&lt;bytes;k++) {</div><div class='del'>-		printf("\tunsigned char *bits%d;\n", k);</div><div class='del'>-	}</div><div class='del'>-	printf("} camel_charmap[256] = {\n\t");</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		/* first, do we need this block? */</div><div class='del'>-		printf("{ ");</div><div class='del'>-		for (k=0;k&lt;bytes;k++) {</div><div class='del'>-			for (j=0;j&lt;256;j++) {</div><div class='del'>-				if ((encoding_map[i*256 + j] &amp; (0xff &lt;&lt; (k*8))) != 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (j &lt; 256) {</div><div class='del'>-				printf("m%02x%x, ", i, k);</div><div class='del'>-			} else {</div><div class='del'>-				printf("0, ");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		printf("}, ");</div><div class='del'>-		if (((i+1)&amp;7) == 0 &amp;&amp; i&lt;255)</div><div class='del'>-			printf("\n\t");</div><div class='del'>-	}</div><div class='del'>-	printf("\n};\n\n");</div><div class='del'>-</div><div class='del'>-	printf("struct {\n\tconst char *name;\n\tunsigned int bit;\n} camel_charinfo[] = {\n");</div><div class='del'>-	for (j=0;tables[j].name;j++) {</div><div class='del'>-		printf("\t{ \"%s\", 0x%04x },\n", tables[j].name, tables[j].bit);</div><div class='del'>-	}</div><div class='del'>-	printf("};\n\n");</div><div class='del'>-</div><div class='del'>-	printf("#define charset_mask(x) \\\n");</div><div class='del'>-	for (k=0;k&lt;bytes;k++) {</div><div class='del'>-		if (k!=0)</div><div class='del'>-			printf("\t| ");</div><div class='del'>-		else</div><div class='del'>-			printf("\t");</div><div class='del'>-		printf("(camel_charmap[(x)&gt;&gt;8].bits%d?camel_charmap[(x)&gt;&gt;8].bits%d[(x)&amp;0xff]&lt;&lt;%d:0)", k, k, k*8);</div><div class='del'>-		if (k&lt;bytes-1)</div><div class='del'>-			printf("\t\\\n");</div><div class='del'>-	}</div><div class='del'>-	printf("\n\n");</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-#include "camel-charset-map-private.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_charset_init (CamelCharset *c)</div><div class='del'>-{</div><div class='del'>-	c-&gt;mask = ~0;</div><div class='del'>-	c-&gt;level = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_charset_step (CamelCharset *c, const char *in, int len)</div><div class='del'>-{</div><div class='del'>-	register unsigned int mask;</div><div class='del'>-	register int level;</div><div class='del'>-	const char *inptr = in, *inend = in+len;</div><div class='del'>-</div><div class='del'>-	mask = c-&gt;mask;</div><div class='del'>-	level = c-&gt;level;</div><div class='del'>-</div><div class='del'>-	/* check what charset a given string will fit in */</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		gunichar c;</div><div class='del'>-		const char *newinptr;</div><div class='del'>-		newinptr = g_utf8_next_char(inptr);</div><div class='del'>-		c = g_utf8_get_char(inptr);</div><div class='del'>-		if (newinptr == NULL || !g_unichar_validate (c)) {</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-		if (c&lt;=0xffff) {</div><div class='del'>-			mask &amp;= charset_mask(c);</div><div class='del'>-		</div><div class='del'>-			if (c&gt;=128 &amp;&amp; c&lt;256)</div><div class='del'>-				level = MAX(level, 1);</div><div class='del'>-			else if (c&gt;=256)</div><div class='del'>-				level = MAX(level, 2);</div><div class='del'>-		} else {</div><div class='del'>-			mask = 0;</div><div class='del'>-			level = MAX(level, 2);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	c-&gt;mask = mask;</div><div class='del'>-	c-&gt;level = level;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* gets the best charset from the mask of chars in it */</div><div class='del'>-static const char *</div><div class='del'>-camel_charset_best_mask(unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;sizeof(camel_charinfo)/sizeof(camel_charinfo[0]);i++) {</div><div class='del'>-		if (camel_charinfo[i].bit &amp; mask)</div><div class='del'>-			return camel_charinfo[i].name;</div><div class='del'>-	}</div><div class='del'>-	return "UTF-8";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_charset_best_name (CamelCharset *charset)</div><div class='del'>-{</div><div class='del'>-	if (charset-&gt;level == 1)</div><div class='del'>-		return "ISO-8859-1";</div><div class='del'>-	else if (charset-&gt;level == 2)</div><div class='del'>-		return camel_charset_best_mask (charset-&gt;mask);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* finds the minimum charset for this string NULL means US-ASCII */</div><div class='del'>-const char *</div><div class='del'>-camel_charset_best (const char *in, int len)</div><div class='del'>-{</div><div class='del'>-	CamelCharset charset;</div><div class='del'>-</div><div class='del'>-	camel_charset_init (&amp;charset);</div><div class='del'>-	camel_charset_step (&amp;charset, in, len);</div><div class='del'>-	return camel_charset_best_name (&amp;charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_charset_iso_to_windows:</div><div class='del'>- * @isocharset: an ISO charset</div><div class='del'>- *</div><div class='del'>- * Returns the equivalent Windows charset.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_charset_iso_to_windows (const char *isocharset)</div><div class='del'>-{</div><div class='del'>-	/* According to http://czyborra.com/charsets/codepages.html,</div><div class='del'>-	 * the charset mapping is as follows:</div><div class='del'>-	 *</div><div class='del'>-	 * iso-8859-1  maps to windows-cp1252</div><div class='del'>-	 * iso-8859-2  maps to windows-cp1250</div><div class='del'>-	 * iso-8859-3  maps to windows-cp????</div><div class='del'>-	 * iso-8859-4  maps to windows-cp????</div><div class='del'>-	 * iso-8859-5  maps to windows-cp1251</div><div class='del'>-	 * iso-8859-6  maps to windows-cp1256</div><div class='del'>-	 * iso-8859-7  maps to windows-cp1253</div><div class='del'>-	 * iso-8859-8  maps to windows-cp1255</div><div class='del'>-	 * iso-8859-9  maps to windows-cp1254</div><div class='del'>-	 * iso-8859-10 maps to windows-cp????</div><div class='del'>-	 * iso-8859-11 maps to windows-cp????</div><div class='del'>-	 * iso-8859-12 maps to windows-cp????</div><div class='del'>-	 * iso-8859-13 maps to windows-cp1257</div><div class='del'>-	 *</div><div class='del'>-	 * Assumptions:</div><div class='del'>-	 *  - I'm going to assume that since iso-8859-4 and</div><div class='del'>-	 *    iso-8859-13 are Baltic that it also maps to</div><div class='del'>-	 *    windows-cp1257.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	if (!strcasecmp (isocharset, "iso-8859-1"))</div><div class='del'>-		return "windows-cp1252";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-2"))</div><div class='del'>-		return "windows-cp1250";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-4"))</div><div class='del'>-		return "windows-cp1257";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-5"))</div><div class='del'>-		return "windows-cp1251";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-6"))</div><div class='del'>-		return "windows-cp1256";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-7"))</div><div class='del'>-		return "windows-cp1253";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-8"))</div><div class='del'>-		return "windows-cp1255";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-9"))</div><div class='del'>-		return "windows-cp1254";</div><div class='del'>-	else if (!strcasecmp (isocharset, "iso-8859-13"))</div><div class='del'>-		return "windows-cp1257";</div><div class='del'>-	</div><div class='del'>-	return isocharset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* !BUILD_MAP */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h<br/>deleted file mode 100644<br/>index ab60ef5bf5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-charset-map.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_CHARSET_MAP_H</div><div class='del'>-#define _CAMEL_CHARSET_MAP_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCharset CamelCharset;</div><div class='del'>-</div><div class='del'>-struct _CamelCharset {</div><div class='del'>-	unsigned int mask;</div><div class='del'>-	int level;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void camel_charset_init(CamelCharset *);</div><div class='del'>-void camel_charset_step(CamelCharset *, const char *in, int len);</div><div class='del'>-const char *camel_charset_best_name(CamelCharset *);</div><div class='del'>-</div><div class='del'>-/* helper function */</div><div class='del'>-const char *camel_charset_best(const char *in, int len);</div><div class='del'>-</div><div class='del'>-const char *camel_charset_iso_to_windows (const char *isocharset);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_CHARSET_MAP_H */</div><div class='head'>diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c<br/>deleted file mode 100644<br/>index feefff5565..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-cipher-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-cipher-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,448 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-cipher-context.h"</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#define CIPHER_LOCK(ctx)   g_mutex_lock (((CamelCipherContext *) ctx)-&gt;priv-&gt;lock)</div><div class='del'>-#define CIPHER_UNLOCK(ctx) g_mutex_unlock (((CamelCipherContext *) ctx)-&gt;priv-&gt;lock);</div><div class='del'>-#else</div><div class='del'>-#define CIPHER_LOCK(ctx)</div><div class='del'>-#define CIPHER_UNLOCK(ctx)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define CCC_CLASS(o) CAMEL_CIPHER_CONTEXT_CLASS(CAMEL_OBJECT_GET_CLASS(o))</div><div class='del'>-</div><div class='del'>-struct _CamelCipherContextPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int                  cipher_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-					 CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-static int                  cipher_clearsign (CamelCipherContext *context, const char *userid,</div><div class='del'>-					      CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-					      CamelStream *ostream, CamelException *ex);</div><div class='del'>-static CamelCipherValidity *cipher_verify (CamelCipherContext *context, CamelCipherHash hash,</div><div class='del'>-					   CamelStream *istream, CamelStream *sigstream,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-static int                  cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,</div><div class='del'>-					    GPtrArray *recipients, CamelStream *istream,</div><div class='del'>-					    CamelStream *ostream, CamelException *ex);</div><div class='del'>-static int                  cipher_decrypt (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-					    CamelStream *ostream, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cipher_context_init (CamelCipherContext *context)</div><div class='del'>-{</div><div class='del'>-	context-&gt;priv = g_new0 (struct _CamelCipherContextPrivate, 1);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	context-&gt;priv-&gt;lock = g_mutex_new ();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cipher_context_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelCipherContext *context = (CamelCipherContext *)o;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (context-&gt;session));</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free (context-&gt;priv-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cipher_context_class_init (CamelCipherContextClass *camel_cipher_context_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-	</div><div class='del'>-	camel_cipher_context_class-&gt;sign = cipher_sign;</div><div class='del'>-	camel_cipher_context_class-&gt;clearsign = cipher_clearsign;</div><div class='del'>-	camel_cipher_context_class-&gt;verify = cipher_verify;</div><div class='del'>-	camel_cipher_context_class-&gt;encrypt = cipher_encrypt;</div><div class='del'>-	camel_cipher_context_class-&gt;decrypt = cipher_decrypt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_cipher_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (),</div><div class='del'>-					    "CamelCipherContext",</div><div class='del'>-					    sizeof (CamelCipherContext),</div><div class='del'>-					    sizeof (CamelCipherContextClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_cipher_context_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_cipher_context_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_cipher_context_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_context_new:</div><div class='del'>- * @session: CamelSession</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelCipherContext object which is used to sign,</div><div class='del'>- * verify, encrypt and decrypt streams.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelCipherContext</div><div class='del'>- **/</div><div class='del'>-CamelCipherContext *</div><div class='del'>-camel_cipher_context_new (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	CamelCipherContext *context;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (session != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	context = CAMEL_CIPHER_CONTEXT (camel_object_new (CAMEL_CIPHER_CONTEXT_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-	context-&gt;session = session;</div><div class='del'>-	</div><div class='del'>-	return context;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_context_construct:</div><div class='del'>- * @context: CamelCipherContext</div><div class='del'>- * @session: CamelSession</div><div class='del'>- *</div><div class='del'>- * Constucts the CamelCipherContext</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cipher_context_construct (CamelCipherContext *context, CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_CIPHER_CONTEXT (context));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-	context-&gt;session = session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cipher_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-	     CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Signing is not supported by this cipher"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_sign:</div><div class='del'>- * @context: Cipher Context</div><div class='del'>- * @userid: private key to use to sign the stream</div><div class='del'>- * @hash: preferred Message-Integrity-Check hash algorithm</div><div class='del'>- * @istream: input stream</div><div class='del'>- * @ostream: output stream</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Signs the input stream and writes the resulting signature to the output stream.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 for success or -1 for failure.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_cipher_sign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-		   CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);</div><div class='del'>-	</div><div class='del'>-	CIPHER_LOCK(context);</div><div class='del'>-	</div><div class='del'>-	retval = CCC_CLASS (context)-&gt;sign (context, userid, hash, istream, ostream, ex);</div><div class='del'>-	</div><div class='del'>-	CIPHER_UNLOCK(context);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-		  CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Clearsigning is not supported by this cipher"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_clearsign:</div><div class='del'>- * @context: Cipher Context</div><div class='del'>- * @userid: key id or email address of the private key to sign with</div><div class='del'>- * @hash: preferred Message-Integrity-Check hash algorithm</div><div class='del'>- * @istream: input stream</div><div class='del'>- * @ostream: output stream</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Clearsigns the input stream and writes the resulting clearsign to the output stream.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 for success or -1 for failure.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-			CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);</div><div class='del'>-	</div><div class='del'>-	CIPHER_LOCK(context);</div><div class='del'>-	</div><div class='del'>-	retval = CCC_CLASS (context)-&gt;clearsign (context, userid, hash, istream, ostream, ex);</div><div class='del'>-	</div><div class='del'>-	CIPHER_UNLOCK(context);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelCipherValidity *</div><div class='del'>-cipher_verify (CamelCipherContext *context, CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-	       CamelStream *sigstream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Verifying is not supported by this cipher"));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_verify:</div><div class='del'>- * @context: Cipher Context</div><div class='del'>- * @istream: input stream</div><div class='del'>- * @sigstream: optional detached-signature stream</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Verifies the signature. If @istream is a clearsigned stream,</div><div class='del'>- * you should pass %NULL as the sigstream parameter. Otherwise</div><div class='del'>- * @sigstream is assumed to be the signature stream and is used to</div><div class='del'>- * verify the integirity of the @istream.</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelCipherValidity structure containing information</div><div class='del'>- * about the integrity of the input stream or %NULL on failure to</div><div class='del'>- * execute at all.</div><div class='del'>- **/</div><div class='del'>-CamelCipherValidity *</div><div class='del'>-camel_cipher_verify (CamelCipherContext *context, CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-		     CamelStream *sigstream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCipherValidity *valid;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), NULL);</div><div class='del'>-	</div><div class='del'>-	CIPHER_LOCK(context);</div><div class='del'>-	</div><div class='del'>-	valid = CCC_CLASS (context)-&gt;verify (context, hash, istream, sigstream, ex);</div><div class='del'>-	</div><div class='del'>-	CIPHER_UNLOCK(context);</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid, GPtrArray *recipients,</div><div class='del'>-		CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Encryption is not supported by this cipher"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_encrypt:</div><div class='del'>- * @context: Cipher Context</div><div class='del'>- * @sign: sign as well as encrypt</div><div class='del'>- * @userid: key id (or email address) to use when signing (assuming @sign is %TRUE)</div><div class='del'>- * @recipients: an array of recipient key ids and/or email addresses</div><div class='del'>- * @istream: cleartext input stream</div><div class='del'>- * @ostream: ciphertext output stream</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Encrypts (and optionally signs) the cleartext input stream and</div><div class='del'>- * writes the resulting ciphertext to the output stream.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 for success or -1 for failure.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid, GPtrArray *recipients,</div><div class='del'>-		      CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);</div><div class='del'>-	</div><div class='del'>-	CIPHER_LOCK(context);</div><div class='del'>-	</div><div class='del'>-	retval = CCC_CLASS (context)-&gt;encrypt (context, sign, userid, recipients, istream, ostream, ex);</div><div class='del'>-	</div><div class='del'>-	CIPHER_UNLOCK(context);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cipher_decrypt (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-		CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Decryption is not supported by this cipher"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cipher_decrypt:</div><div class='del'>- * @context: Cipher Context</div><div class='del'>- * @ciphertext: ciphertext stream (ie input stream)</div><div class='del'>- * @cleartext: cleartext stream (ie output stream)</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Decrypts the ciphertext input stream and writes the resulting</div><div class='del'>- * cleartext to the output stream.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 for success or -1 for failure.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_cipher_decrypt (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-		      CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CIPHER_CONTEXT (context), -1);</div><div class='del'>-	</div><div class='del'>-	CIPHER_LOCK(context);</div><div class='del'>-	</div><div class='del'>-	retval = CCC_CLASS (context)-&gt;decrypt (context, istream, ostream, ex);</div><div class='del'>-	</div><div class='del'>-	CIPHER_UNLOCK(context);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Cipher Validity stuff */</div><div class='del'>-struct _CamelCipherValidity {</div><div class='del'>-	gboolean valid;</div><div class='del'>-	gchar *description;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelCipherValidity *</div><div class='del'>-camel_cipher_validity_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelCipherValidity *validity;</div><div class='del'>-	</div><div class='del'>-	validity = g_new (CamelCipherValidity, 1);</div><div class='del'>-	validity-&gt;valid = FALSE;</div><div class='del'>-	validity-&gt;description = NULL;</div><div class='del'>-	</div><div class='del'>-	return validity;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cipher_validity_init (CamelCipherValidity *validity)</div><div class='del'>-{</div><div class='del'>-	g_assert (validity != NULL);</div><div class='del'>-	</div><div class='del'>-	validity-&gt;valid = FALSE;</div><div class='del'>-	validity-&gt;description = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_cipher_validity_get_valid (CamelCipherValidity *validity)</div><div class='del'>-{</div><div class='del'>-	if (validity == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return validity-&gt;valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cipher_validity_set_valid (CamelCipherValidity *validity, gboolean valid)</div><div class='del'>-{</div><div class='del'>-	g_assert (validity != NULL);</div><div class='del'>-	</div><div class='del'>-	validity-&gt;valid = valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-camel_cipher_validity_get_description (CamelCipherValidity *validity)</div><div class='del'>-{</div><div class='del'>-	if (validity == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return validity-&gt;description;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cipher_validity_set_description (CamelCipherValidity *validity, const gchar *description)</div><div class='del'>-{</div><div class='del'>-	g_assert (validity != NULL);</div><div class='del'>-	</div><div class='del'>-	g_free (validity-&gt;description);</div><div class='del'>-	validity-&gt;description = g_strdup (description);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cipher_validity_clear (CamelCipherValidity *validity)</div><div class='del'>-{</div><div class='del'>-	g_assert (validity != NULL);</div><div class='del'>-	</div><div class='del'>-	validity-&gt;valid = FALSE;</div><div class='del'>-	g_free (validity-&gt;description);</div><div class='del'>-	validity-&gt;description = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cipher_validity_free (CamelCipherValidity *validity)</div><div class='del'>-{</div><div class='del'>-	if (validity == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (validity-&gt;description);</div><div class='del'>-	g_free (validity);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h<br/>deleted file mode 100644<br/>index 5147cc5ebc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-cipher-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-cipher-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_CIPHER_CONTEXT_H</div><div class='del'>-#define CAMEL_CIPHER_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CAMEL_CIPHER_CONTEXT_TYPE     (camel_cipher_context_get_type ())</div><div class='del'>-#define CAMEL_CIPHER_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContext))</div><div class='del'>-#define CAMEL_CIPHER_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContextClass))</div><div class='del'>-#define CAMEL_IS_CIPHER_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CIPHER_CONTEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCipherValidity CamelCipherValidity;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_CIPHER_HASH_DEFAULT,</div><div class='del'>-	CAMEL_CIPHER_HASH_MD2,</div><div class='del'>-	CAMEL_CIPHER_HASH_MD5,</div><div class='del'>-	CAMEL_CIPHER_HASH_SHA1,</div><div class='del'>-	CAMEL_CIPHER_HASH_RIPEMD160</div><div class='del'>-} CamelCipherHash;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCipherContext {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelCipherContextPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	</div><div class='del'>-} CamelCipherContext;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCipherContextClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	int                   (*sign)      (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-					    CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	int                   (*clearsign) (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-					    CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelCipherValidity * (*verify)    (CamelCipherContext *context, CamelCipherHash hash,</div><div class='del'>-					    CamelStream *istream, CamelStream *sigstream,</div><div class='del'>-					    CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	int                   (*encrypt)   (CamelCipherContext *context, gboolean sign, const char *userid,</div><div class='del'>-					    GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					    CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	int                   (*decrypt)   (CamelCipherContext *context, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					    CamelException *ex);</div><div class='del'>-	</div><div class='del'>-} CamelCipherContextClass;</div><div class='del'>-</div><div class='del'>-CamelType            camel_cipher_context_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelCipherContext  *camel_cipher_context_new (CamelSession *session);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_context_construct (CamelCipherContext *context, CamelSession *session);</div><div class='del'>-</div><div class='del'>-/* cipher routines */</div><div class='del'>-int                  camel_cipher_sign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-					CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int                  camel_cipher_clearsign (CamelCipherContext *context, const char *userid, CamelCipherHash hash,</div><div class='del'>-					     CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelCipherValidity *camel_cipher_verify (CamelCipherContext *context, CamelCipherHash hash,</div><div class='del'>-					  CamelStream *istream, CamelStream *sigstream,</div><div class='del'>-					  CamelException *ex);</div><div class='del'>-</div><div class='del'>-int                  camel_cipher_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,</div><div class='del'>-					   GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-int                  camel_cipher_decrypt (CamelCipherContext *context, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* CamelCipherValidity utility functions */</div><div class='del'>-CamelCipherValidity *camel_cipher_validity_new (void);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_validity_init (CamelCipherValidity *validity);</div><div class='del'>-</div><div class='del'>-gboolean             camel_cipher_validity_get_valid (CamelCipherValidity *validity);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_validity_set_valid (CamelCipherValidity *validity, gboolean valid);</div><div class='del'>-</div><div class='del'>-char                *camel_cipher_validity_get_description (CamelCipherValidity *validity);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_validity_set_description (CamelCipherValidity *validity, const char *description);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_validity_clear (CamelCipherValidity *validity);</div><div class='del'>-</div><div class='del'>-void                 camel_cipher_validity_free (CamelCipherValidity *validity);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_CIPHER_CONTEXT_H */</div><div class='head'>diff --git a/camel/camel-cms-context.c b/camel/camel-cms-context.c<br/>deleted file mode 100644<br/>index 252bb81300..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-cms-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-cms-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,324 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-cms-context.h"</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#define CMS_LOCK(ctx)   g_mutex_lock (((CamelCMSContext *) ctx)-&gt;priv-&gt;lock)</div><div class='del'>-#define CMS_UNLOCK(ctx) g_mutex_unlock (((CamelCMSContext *) ctx)-&gt;priv-&gt;lock);</div><div class='del'>-#else</div><div class='del'>-#define CMS_LOCK(ctx)</div><div class='del'>-#define CMS_UNLOCK(ctx)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define CCC_CLASS(o) CAMEL_CMS_CONTEXT_CLASS(CAMEL_OBJECT_GET_CLASS(o))</div><div class='del'>-</div><div class='del'>-struct _CamelCMSContextPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *cms_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					const char *userid, gboolean signing_time,</div><div class='del'>-					gboolean detached, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					const char *userid, GPtrArray *recipients,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *cms_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					const char *userid, GPtrArray *recipients, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *cms_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					const char *userid, GPtrArray *recipients, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *cms_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					CamelCMSValidityInfo **info, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cms_context_init (CamelCMSContext *context)</div><div class='del'>-{</div><div class='del'>-	context-&gt;priv = g_new0 (struct _CamelCMSContextPrivate, 1);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	context-&gt;priv-&gt;lock = g_mutex_new ();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cms_context_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelCMSContext *context = (CamelCMSContext *)o;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (context-&gt;session));</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free (context-&gt;priv-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cms_context_class_init (CamelCMSContextClass *camel_cms_context_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-	</div><div class='del'>-	camel_cms_context_class-&gt;sign = cms_sign;</div><div class='del'>-	camel_cms_context_class-&gt;certsonly = cms_certsonly;</div><div class='del'>-	camel_cms_context_class-&gt;encrypt = cms_encrypt;</div><div class='del'>-	camel_cms_context_class-&gt;envelope = cms_envelope;</div><div class='del'>-	camel_cms_context_class-&gt;decode = cms_decode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_cms_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (),</div><div class='del'>-					    "CamelCMSContext",</div><div class='del'>-					    sizeof (CamelCMSContext),</div><div class='del'>-					    sizeof (CamelCMSContextClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_cms_context_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_cms_context_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_cms_context_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cms_context_new:</div><div class='del'>- * @session: CamelSession</div><div class='del'>- * @encryption_key: preferred encryption key nickname</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelCMSContext object which is used to sign,</div><div class='del'>- * encrypt, envelope and decode CMS messages.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelCMSContext</div><div class='del'>- **/</div><div class='del'>-CamelCMSContext *</div><div class='del'>-camel_cms_context_new (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	CamelCMSContext *context;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (session != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-	</div><div class='del'>-	context = CAMEL_CMS_CONTEXT (camel_object_new (CAMEL_CMS_CONTEXT_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-	context-&gt;session = session;</div><div class='del'>-	</div><div class='del'>-	return context;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cms_context_construct:</div><div class='del'>- * @context: CMS Context</div><div class='del'>- * @session: CamelSession</div><div class='del'>- *</div><div class='del'>- * Construct the CMS Context.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cms_context_construct (CamelCMSContext *context, CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_CMS_CONTEXT (context));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-	context-&gt;session = session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-cms_sign (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	  const char *userid, gboolean signing_time,</div><div class='del'>-	  gboolean detached, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Using default CamelCMSContext::sign() method.");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_cms_sign (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		const char *userid, gboolean signing_time,</div><div class='del'>-		gboolean detached, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	g_return_val_if_fail (userid != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	return CCC_CLASS (ctx)-&gt;sign (ctx, message, userid, signing_time, detached, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	       const char *userid, GPtrArray *recipients,</div><div class='del'>-	       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Using default CamelCMSContext::certsonly() method.");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		     const char *userid, GPtrArray *recipients,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	g_return_val_if_fail (userid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (recipients != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	return CCC_CLASS (ctx)-&gt;certsonly (ctx, message, userid, recipients, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-cms_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	      const char *userid, GPtrArray *recipients, </div><div class='del'>-	      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Using default CamelCMSContext::envelope() method.");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_cms_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		    const char *userid, GPtrArray *recipients, </div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	g_return_val_if_fail (userid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (recipients != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	return CCC_CLASS (ctx)-&gt;envelope (ctx, message, userid, recipients, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-cms_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	     const char *userid, GPtrArray *recipients, </div><div class='del'>-	     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Using default CamelCMSContext::encrypt() method.");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_cms_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		   const char *userid, GPtrArray *recipients, </div><div class='del'>-		   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	g_return_val_if_fail (userid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (recipients != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	return CCC_CLASS (ctx)-&gt;encrypt (ctx, message, userid, recipients, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-cms_decode (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	    CamelCMSValidityInfo **info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Using default CamelCMSContext::decode() method.");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_cms_decode (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		  CamelCMSValidityInfo **info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_CMS_CONTEXT (ctx), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	</div><div class='del'>-	return CCC_CLASS (ctx)-&gt;decode (ctx, message, info, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cms_signer_free (CamelCMSSigner *signer)</div><div class='del'>-{</div><div class='del'>-	CamelCMSSigner *next;</div><div class='del'>-	</div><div class='del'>-	if (!signer)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	while (signer) {</div><div class='del'>-		next = signer-&gt;next;</div><div class='del'>-		g_free (signer-&gt;signercn);</div><div class='del'>-		g_free (signer-&gt;status);</div><div class='del'>-		g_free (signer);</div><div class='del'>-		signer = next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cms_validity_info_free (CamelCMSValidityInfo *info)</div><div class='del'>-{</div><div class='del'>-	CamelCMSValidityInfo *next;</div><div class='del'>-	</div><div class='del'>-	if (!info)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	while (info) {</div><div class='del'>-		next = info-&gt;next;</div><div class='del'>-		if (info-&gt;type == CAMEL_CMS_TYPE_SIGNED)</div><div class='del'>-			camel_cms_signer_free (info-&gt;signers);</div><div class='del'>-		g_free (info);</div><div class='del'>-		info = next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-cms-context.h b/camel/camel-cms-context.h<br/>deleted file mode 100644<br/>index 946f7a747f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-cms-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-cms-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,128 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_CMS_CONTEXT_H</div><div class='del'>-#define CAMEL_CMS_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CAMEL_CMS_CONTEXT_TYPE     (camel_cms_context_get_type ())</div><div class='del'>-#define CAMEL_CMS_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CMS_CONTEXT_TYPE, CamelCMSContext))</div><div class='del'>-#define CAMEL_CMS_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CMS_CONTEXT_TYPE, CamelCMSContextClass))</div><div class='del'>-#define CAMEL_IS_CMS_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CMS_CONTEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_CMS_TYPE_DATA,</div><div class='del'>-	CAMEL_CMS_TYPE_SIGNED,</div><div class='del'>-	CAMEL_CMS_TYPE_ENVELOPED,</div><div class='del'>-	CAMEL_CMS_TYPE_ENCRYPTED</div><div class='del'>-} CamelCMSType;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCMSSigner {</div><div class='del'>-	struct _CamelCMSSigner *next;</div><div class='del'>-	char *signercn;</div><div class='del'>-	char *status;</div><div class='del'>-} CamelCMSSigner;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCMSValidityInfo {</div><div class='del'>-	struct _CamelCMSValidityInfo *next;</div><div class='del'>-	CamelCMSType type;</div><div class='del'>-	CamelCMSSigner *signers;</div><div class='del'>-} CamelCMSValidityInfo;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCMSContext {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelCMSContextPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	CamelSession *session;</div><div class='del'>-} CamelCMSContext;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelCMSContextClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *(*sign)       (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					 const char *userid, gboolean signing_time,</div><div class='del'>-					 gboolean detached, CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *(*certsonly)  (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					 const char *userid, GPtrArray *recipients,</div><div class='del'>-					 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *(*encrypt)    (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					 const char *userid, GPtrArray *recipients, </div><div class='del'>-					 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *(*envelope)   (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					 const char *userid, GPtrArray *recipients, </div><div class='del'>-					 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *(*decode)     (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					 CamelCMSValidityInfo **info, CamelException *ex);</div><div class='del'>-	</div><div class='del'>-} CamelCMSContextClass;</div><div class='del'>-</div><div class='del'>-CamelType         camel_cms_context_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelCMSContext  *camel_cms_context_new (CamelSession *session);</div><div class='del'>-</div><div class='del'>-void              camel_cms_context_construct (CamelCMSContext *context, CamelSession *session);</div><div class='del'>-</div><div class='del'>-/* cms routines */</div><div class='del'>-CamelMimeMessage *camel_cms_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-				       const char *userid, gboolean signing_time,</div><div class='del'>-				       gboolean detached, CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_cms_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-				       const char *userid, GPtrArray *recipients,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_cms_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-				       const char *userid, GPtrArray *recipients, </div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_cms_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-				       const char *userid, GPtrArray *recipients, </div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_cms_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-				       CamelCMSValidityInfo **info, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void              camel_cms_signer_free        (CamelCMSSigner *signer);</div><div class='del'>-</div><div class='del'>-void              camel_cms_validity_info_free (CamelCMSValidityInfo *info);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_CMS_CONTEXT_H */</div><div class='head'>diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c<br/>deleted file mode 100644<br/>index 9f44a89f5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-cache.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-data-cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,494 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-message-cache.c: Class for a Camel cache.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-data-cache.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void stream_finalised(CamelObject *o, void *event_data, void *data);</div><div class='del'>-</div><div class='del'>-/* how many 'bits' of hash are used to key the toplevel directory */</div><div class='del'>-#define CAMEL_DATA_CACHE_BITS (6)</div><div class='del'>-#define CAMEL_DATA_CACHE_MASK ((1&lt;&lt;CAMEL_DATA_CACHE_BITS)-1)</div><div class='del'>-</div><div class='del'>-/* timeout before a cache dir is checked again for expired entries,</div><div class='del'>-   once an hour should be enough */</div><div class='del'>-#define CAMEL_DATA_CACHE_CYCLE_TIME (60*60)</div><div class='del'>-</div><div class='del'>-struct _CamelDataCachePrivate {</div><div class='del'>-	GHashTable *busy_stream;</div><div class='del'>-	GHashTable *busy_path;</div><div class='del'>-</div><div class='del'>-	int expire_inc;</div><div class='del'>-	time_t expire_last[1&lt;&lt;CAMEL_DATA_CACHE_BITS];</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;</div><div class='del'>-#define CDC_LOCK(c, l) g_mutex_lock(((CamelDataCache *)(c))-&gt;priv-&gt;l)</div><div class='del'>-#define CDC_UNLOCK(c, l) g_mutex_unlock(((CamelDataCache *)(c))-&gt;priv-&gt;l)</div><div class='del'>-#else</div><div class='del'>-#define CDC_LOCK(c, l)</div><div class='del'>-#define CDC_UNLOCK(c, l)</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelObject *camel_data_cache_parent;</div><div class='del'>-</div><div class='del'>-static void data_cache_class_init(CamelDataCacheClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_data_cache_parent = (CamelObject *)camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	klass-&gt;add = data_cache_add;</div><div class='del'>-	klass-&gt;get = data_cache_get;</div><div class='del'>-	klass-&gt;close = data_cache_close;</div><div class='del'>-	klass-&gt;remove = data_cache_remove;</div><div class='del'>-	klass-&gt;clear = data_cache_clear;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void data_cache_init(CamelDataCache *cdc, CamelDataCacheClass *klass)</div><div class='del'>-{</div><div class='del'>-	struct _CamelDataCachePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = cdc-&gt;priv = g_malloc0(sizeof(*cdc-&gt;priv));</div><div class='del'>-</div><div class='del'>-	p-&gt;busy_stream = g_hash_table_new(NULL, NULL);</div><div class='del'>-	p-&gt;busy_path = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_busy(CamelStream *stream, char *path, CamelDataCache *cdc)</div><div class='del'>-{</div><div class='del'>-	d(printf(" Freeing busy stream %p path %s\n", stream, path));</div><div class='del'>-	camel_object_unhook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);</div><div class='del'>-	camel_object_unref((CamelObject *)stream);</div><div class='del'>-	g_free(path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void data_cache_finalise(CamelDataCache *cdc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelDataCachePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = cdc-&gt;priv;</div><div class='del'>-</div><div class='del'>-	d(printf("cache finalised, %d (= %d?) streams reamining\n", g_hash_table_size(p-&gt;busy_stream), g_hash_table_size(p-&gt;busy_path)));</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(p-&gt;busy_stream, (GHFunc)free_busy, cdc);</div><div class='del'>-	g_hash_table_destroy(p-&gt;busy_path);</div><div class='del'>-	g_hash_table_destroy(p-&gt;busy_stream);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(p-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-	</div><div class='del'>-	g_free (cdc-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_data_cache_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_data_cache_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_data_cache_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_data_cache_type = camel_type_register(</div><div class='del'>-			CAMEL_OBJECT_TYPE, "CamelDataCache",</div><div class='del'>-			sizeof (CamelDataCache),</div><div class='del'>-			sizeof (CamelDataCacheClass),</div><div class='del'>-			(CamelObjectClassInitFunc) data_cache_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) data_cache_init,</div><div class='del'>-			(CamelObjectFinalizeFunc) data_cache_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_data_cache_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_new:</div><div class='del'>- * @path: Base path of cache, subdirectories will be created here.</div><div class='del'>- * @flags: Open flags, none defined.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Create a new data cache.</div><div class='del'>- * </div><div class='del'>- * Return value: A new cache object, or NULL if the base path cannot</div><div class='del'>- * be written to.</div><div class='del'>- **/</div><div class='del'>-CamelDataCache *</div><div class='del'>-camel_data_cache_new(const char *path, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDataCache *cdc;</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_mkdir(path, 0700) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Unable to create cache path"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cdc = (CamelDataCache *)camel_object_new(CAMEL_DATA_CACHE_TYPE);</div><div class='del'>-</div><div class='del'>-	cdc-&gt;path = g_strdup(path);</div><div class='del'>-	cdc-&gt;flags = flags;</div><div class='del'>-	cdc-&gt;expire_age = -1;</div><div class='del'>-	cdc-&gt;expire_access = -1;</div><div class='del'>-</div><div class='del'>-	return cdc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_set_expire_age:</div><div class='del'>- * @cdc: </div><div class='del'>- * @when: Timeout for age expiry, or -1 to disable.</div><div class='del'>- * </div><div class='del'>- * Set the cache expiration policy for aged entries.</div><div class='del'>- * </div><div class='del'>- * Items in the cache older than @when seconds may be</div><div class='del'>- * flushed at any time.  Items are expired in a lazy</div><div class='del'>- * manner, so it is indeterminate when the items will</div><div class='del'>- * physically be removed.</div><div class='del'>- *</div><div class='del'>- * Note you can set both an age and an access limit.  The</div><div class='del'>- * age acts as a hard limit on cache entries.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_data_cache_set_expire_age(CamelDataCache *cdc, time_t when)</div><div class='del'>-{</div><div class='del'>-	cdc-&gt;expire_age = when;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_set_expire_access:</div><div class='del'>- * @cdc: </div><div class='del'>- * @when: Timeout for access, or -1 to disable access expiry.</div><div class='del'>- * </div><div class='del'>- * Set the cache expiration policy for access times.</div><div class='del'>- *</div><div class='del'>- * Items in the cache which haven't been accessed for @when</div><div class='del'>- * seconds may be expired at any time.  Items are expired in a lazy</div><div class='del'>- * manner, so it is indeterminate when the items will</div><div class='del'>- * physically be removed.</div><div class='del'>- *</div><div class='del'>- * Note you can set both an age and an access limit.  The</div><div class='del'>- * age acts as a hard limit on cache entries.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_data_cache_set_expire_access(CamelDataCache *cdc, time_t when)</div><div class='del'>-{</div><div class='del'>-	cdc-&gt;expire_access = when;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-data_cache_expire(CamelDataCache *cdc, const char *path, const char *keep, time_t now)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	GString *s;</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *oldpath;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	dir = opendir(path);</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	s = g_string_new("");</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		if (strcmp(d-&gt;d_name, keep) == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		g_string_sprintf(s, "%s/%s", path, d-&gt;d_name);</div><div class='del'>-		dd(printf("Checking '%s' for expiry\n", s-&gt;str));</div><div class='del'>-		if (stat(s-&gt;str, &amp;st) == 0</div><div class='del'>-		    &amp;&amp; S_ISREG(st.st_mode)</div><div class='del'>-		    &amp;&amp; ((cdc-&gt;expire_age != -1 &amp;&amp; st.st_mtime + cdc-&gt;expire_age &lt; now)</div><div class='del'>-			|| (cdc-&gt;expire_access != -1 &amp;&amp; st.st_atime + cdc-&gt;expire_access &lt; now))) {</div><div class='del'>-			dd(printf("Has expired!  Removing!\n"));</div><div class='del'>-			unlink(s-&gt;str);</div><div class='del'>-			if (g_hash_table_lookup_extended(cdc-&gt;priv-&gt;busy_path, s-&gt;str, (void **)&amp;oldpath, (void **)&amp;stream)) {</div><div class='del'>-				g_hash_table_remove(cdc-&gt;priv-&gt;busy_path, path);</div><div class='del'>-				g_hash_table_remove(cdc-&gt;priv-&gt;busy_stream, stream);</div><div class='del'>-				g_free(oldpath);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_string_free(s, TRUE);</div><div class='del'>-	closedir(dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Since we have to stat the directory anyway, we use this opportunity to</div><div class='del'>-   lazily expire old data.</div><div class='del'>-   If it is this directories 'turn', and we haven't done it for CYCLE_TIME seconds,</div><div class='del'>-   then we perform an expiry run */</div><div class='del'>-static char *</div><div class='del'>-data_cache_path(CamelDataCache *cdc, int create, const char *path, const char *key)</div><div class='del'>-{</div><div class='del'>-	char *dir, *real, *tmp;</div><div class='del'>-	guint32 hash;</div><div class='del'>-</div><div class='del'>-	hash = g_str_hash(key);</div><div class='del'>-	hash = (hash&gt;&gt;5)&amp;CAMEL_DATA_CACHE_MASK;</div><div class='del'>-	dir = alloca(strlen(cdc-&gt;path) + strlen(path) + 8);</div><div class='del'>-	sprintf(dir, "%s/%s/%02x", cdc-&gt;path, path, hash);</div><div class='del'>-	if (access(dir, F_OK) == -1) {</div><div class='del'>-		if (create)</div><div class='del'>-			camel_file_util_mkdir(dir, 0700);</div><div class='del'>-	} else if (cdc-&gt;priv-&gt;expire_inc == hash</div><div class='del'>-		   &amp;&amp; (cdc-&gt;expire_age != -1 || cdc-&gt;expire_access != -1)) {</div><div class='del'>-		time_t now;</div><div class='del'>-</div><div class='del'>-		dd(printf("Checking expire cycle time on dir '%s'\n", dir));</div><div class='del'>-</div><div class='del'>-		now = time(0);</div><div class='del'>-		if (cdc-&gt;priv-&gt;expire_last[hash] + CAMEL_DATA_CACHE_CYCLE_TIME &lt; now) {</div><div class='del'>-			data_cache_expire(cdc, dir, key, now);</div><div class='del'>-			cdc-&gt;priv-&gt;expire_last[hash] = now;</div><div class='del'>-		}</div><div class='del'>-		cdc-&gt;priv-&gt;expire_inc = (cdc-&gt;priv-&gt;expire_inc + 1) &amp; CAMEL_DATA_CACHE_MASK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tmp = camel_file_util_safe_filename(key);</div><div class='del'>-	real = g_strdup_printf("%s/%s", dir, tmp);</div><div class='del'>-	g_free(tmp);</div><div class='del'>-</div><div class='del'>-	return real;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stream_finalised(CamelObject *o, void *event_data, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelDataCache *cdc = data;</div><div class='del'>-	char *key;</div><div class='del'>-</div><div class='del'>-	d(printf("Stream finalised '%p'\n", data));</div><div class='del'>-</div><div class='del'>-	CDC_LOCK(cdc, lock);</div><div class='del'>-	key = g_hash_table_lookup(cdc-&gt;priv-&gt;busy_stream, o);</div><div class='del'>-	if (key) {</div><div class='del'>-		d(printf("  For path '%s'\n", key));</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_path, key);</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_stream, o);</div><div class='del'>-		g_free(key);</div><div class='del'>-	} else {</div><div class='del'>-		d(printf("  Unknown stream?!\n"));</div><div class='del'>-	}</div><div class='del'>-	CDC_UNLOCK(cdc, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_add:</div><div class='del'>- * @cdc: </div><div class='del'>- * @path: Relative path of item to add.</div><div class='del'>- * @key: Key of item to add.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Add a new item to the cache.</div><div class='del'>- *</div><div class='del'>- * The key and the path combine to form a unique key used to store</div><div class='del'>- * the item.</div><div class='del'>- * </div><div class='del'>- * Potentially, expiry processing will be performed while this call</div><div class='del'>- * is executing.</div><div class='del'>- *</div><div class='del'>- * Return value: A CamelStream (file) opened in read-write mode.</div><div class='del'>- * The caller must unref this when finished.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_data_cache_add(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *real, *oldpath;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	CDC_LOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	real = data_cache_path(cdc, TRUE, path, key);</div><div class='del'>-	if (g_hash_table_lookup_extended(cdc-&gt;priv-&gt;busy_path, real, (void **)&amp;oldpath, (void **)&amp;stream)) {</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_path, oldpath);</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_stream, stream);</div><div class='del'>-		unlink(oldpath);</div><div class='del'>-		g_free(oldpath);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_name(real, O_RDWR|O_CREAT|O_TRUNC, 0600);</div><div class='del'>-	if (stream) {</div><div class='del'>-		camel_object_hook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);</div><div class='del'>-		g_hash_table_insert(cdc-&gt;priv-&gt;busy_stream, stream, real);</div><div class='del'>-		g_hash_table_insert(cdc-&gt;priv-&gt;busy_path, real, stream);</div><div class='del'>-	} else {</div><div class='del'>-		g_free(real);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CDC_UNLOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_get:</div><div class='del'>- * @cdc: </div><div class='del'>- * @path: Path to the (sub) cache the item exists in.</div><div class='del'>- * @key: Key for the cache item.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Lookup an item in the cache.  If the item exists, a stream</div><div class='del'>- * is returned for the item.  The stream may be shared by</div><div class='del'>- * multiple callers, so ensure the stream is in a valid state</div><div class='del'>- * through external locking.</div><div class='del'>- * </div><div class='del'>- * Return value: A cache item, or NULL if the cache item does not exist.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_data_cache_get(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *real;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	CDC_LOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	real = data_cache_path(cdc, FALSE, path, key);</div><div class='del'>-	stream = g_hash_table_lookup(cdc-&gt;priv-&gt;busy_path, real);</div><div class='del'>-	if (stream) {</div><div class='del'>-		camel_object_ref((CamelObject *)stream);</div><div class='del'>-		g_free(real);</div><div class='del'>-	} else {</div><div class='del'>-		stream = camel_stream_fs_new_with_name(real, O_RDWR, 0600);</div><div class='del'>-		if (stream) {</div><div class='del'>-			camel_object_hook_event((CamelObject *)stream, "finalize", stream_finalised, cdc);</div><div class='del'>-			g_hash_table_insert(cdc-&gt;priv-&gt;busy_stream, stream, real);</div><div class='del'>-			g_hash_table_insert(cdc-&gt;priv-&gt;busy_path, real, stream);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CDC_UNLOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_remove:</div><div class='del'>- * @cdc: </div><div class='del'>- * @path: </div><div class='del'>- * @key: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Remove/expire a cache item.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_cache_remove(CamelDataCache *cdc, const char *path, const char *key, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *real, *oldpath;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	CDC_LOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	real = data_cache_path(cdc, FALSE, path, key);</div><div class='del'>-	if (g_hash_table_lookup_extended(cdc-&gt;priv-&gt;busy_path, real, (void **)&amp;oldpath, (void **)&amp;stream)) {</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_path, path);</div><div class='del'>-		g_hash_table_remove(cdc-&gt;priv-&gt;busy_stream, stream);</div><div class='del'>-		g_free(oldpath);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* maybe we were a mem stream */</div><div class='del'>-	if (unlink(real) == -1 &amp;&amp; errno != ENOENT) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not remove cache entry: %s: %s"),</div><div class='del'>-				     real, strerror(errno));</div><div class='del'>-		ret = -1;</div><div class='del'>-	} else {</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(real);</div><div class='del'>-</div><div class='del'>-	CDC_UNLOCK(cdc, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_rename:</div><div class='del'>- * @cache: </div><div class='del'>- * @old: </div><div class='del'>- * @new: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Rename a cache path.  All cache items accessed from the old path</div><div class='del'>- * are accessible using the new path.</div><div class='del'>- *</div><div class='del'>- * CURRENTLY UNIMPLEMENTED</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int camel_data_cache_rename(CamelDataCache *cache,</div><div class='del'>-			    const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* blah dont care yet */</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_cache_clear:</div><div class='del'>- * @cache: </div><div class='del'>- * @path: Path to clear, or NULL to clear all items in</div><div class='del'>- * all paths.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Clear all items in a given cache path or all items in the cache.</div><div class='del'>- * </div><div class='del'>- * CURRENTLY_UNIMPLEMENTED</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_cache_clear(CamelDataCache *cache, const char *path, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* nor for this? */</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h<br/>deleted file mode 100644<br/>index ab6c29a622..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-cache.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-data-cache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-data-cache.h: Class for a Camel filesystem cache</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_DATA_CACHE_H</div><div class='del'>-#define CAMEL_DATA_CACHE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_DATA_CACHE_TYPE     (camel_data_cache_get_type ())</div><div class='del'>-#define CAMEL_DATA_CACHE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_CACHE_TYPE, CamelFolder))</div><div class='del'>-#define CAMEL_DATA_CACHE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_CACHE_TYPE, CamelFolderClass))</div><div class='del'>-#define CAMEL_IS_DATA_CACHE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_CACHE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelDataCache CamelDataCache;</div><div class='del'>-typedef struct _CamelDataCacheClass CamelDataCacheClass;</div><div class='del'>-</div><div class='del'>-struct _CamelDataCache {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	struct _CamelDataCachePrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *path;</div><div class='del'>-	guint32 flags;</div><div class='del'>-</div><div class='del'>-	time_t expire_age;</div><div class='del'>-	time_t expire_access;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelDataCacheClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* None are virtual yet */</div><div class='del'>-#if 0</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	CamelStream *(*add)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);</div><div class='del'>-	CamelStream *(*get)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);</div><div class='del'>-	int (*close)(CamelDataCache *cmc, CamelStream *stream, CamelException *ex);</div><div class='del'>-	int (*remove)(CamelDataCache *cmc, const char *path, const char *key, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	int (*clear)(CamelDataCache *cmc, const char *path, CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelDataCache *camel_data_cache_new(const char *path, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_data_cache_set_expire_age(CamelDataCache *cache, time_t when);</div><div class='del'>-void camel_data_cache_set_expire_access(CamelDataCache *cdc, time_t when);</div><div class='del'>-</div><div class='del'>-int             camel_data_cache_rename(CamelDataCache *cache,</div><div class='del'>-					const char *old, const char *new, CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelStream    *camel_data_cache_add(CamelDataCache *cache,</div><div class='del'>-				     const char *path, const char *key, CamelException *ex);</div><div class='del'>-CamelStream    *camel_data_cache_get(CamelDataCache *cache,</div><div class='del'>-				     const char *path, const char *key, CamelException *ex);</div><div class='del'>-int             camel_data_cache_remove(CamelDataCache *cache,</div><div class='del'>-					const char *path, const char *key, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int             camel_data_cache_clear(CamelDataCache *cache,</div><div class='del'>-				       const char *path, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_data_cache_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DATA_CACHE_H */</div><div class='head'>diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c<br/>deleted file mode 100644<br/>index de0e2e2cf0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-data-wrapper.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,319 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */</div><div class='del'>-/* camel-data-wrapper.c : Abstract class for a data_wrapper */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelDataWrapper */</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int construct_from_stream(CamelDataWrapper *, CamelStream *);</div><div class='del'>-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);</div><div class='del'>-static void set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type);</div><div class='del'>-static gchar *get_mime_type (CamelDataWrapper *data_wrapper);</div><div class='del'>-static CamelContentType *get_mime_type_field (CamelDataWrapper *data_wrapper);</div><div class='del'>-static void set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type);</div><div class='del'>-static gboolean is_offline (CamelDataWrapper *data_wrapper);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;set_mime_type = set_mime_type;</div><div class='del'>-	camel_data_wrapper_class-&gt;get_mime_type = get_mime_type;</div><div class='del'>-	camel_data_wrapper_class-&gt;get_mime_type_field = get_mime_type_field;</div><div class='del'>-	camel_data_wrapper_class-&gt;set_mime_type_field = set_mime_type_field;</div><div class='del'>-	camel_data_wrapper_class-&gt;construct_from_stream = construct_from_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;is_offline = is_offline;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_data_wrapper_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper-&gt;priv = g_malloc (sizeof (struct _CamelDataWrapperPrivate));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_init (&amp;camel_data_wrapper-&gt;priv-&gt;stream_lock, NULL);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper-&gt;mime_type = header_content_type_new ("application", "octet-stream");</div><div class='del'>-	camel_data_wrapper-&gt;offline = FALSE;</div><div class='del'>-	camel_data_wrapper-&gt;rawtext = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_data_wrapper_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_destroy (&amp;camel_data_wrapper-&gt;priv-&gt;stream_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (camel_data_wrapper-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	if (camel_data_wrapper-&gt;mime_type)</div><div class='del'>-		header_content_type_unref (camel_data_wrapper-&gt;mime_type);</div><div class='del'>-	</div><div class='del'>-	if (camel_data_wrapper-&gt;stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (camel_data_wrapper-&gt;stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_data_wrapper_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_data_wrapper_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_data_wrapper_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_data_wrapper_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelDataWrapper",</div><div class='del'>-							       sizeof (CamelDataWrapper),</div><div class='del'>-							       sizeof (CamelDataWrapperClass),</div><div class='del'>-							       (CamelObjectClassInitFunc) camel_data_wrapper_class_init,</div><div class='del'>-							       NULL,</div><div class='del'>-							       (CamelObjectInitFunc) camel_data_wrapper_init,</div><div class='del'>-							       (CamelObjectFinalizeFunc) camel_data_wrapper_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_data_wrapper_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	if (data_wrapper-&gt;stream == NULL) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_DATA_WRAPPER_LOCK (data_wrapper, stream_lock);</div><div class='del'>-	if (camel_stream_reset (data_wrapper-&gt;stream) == -1) {</div><div class='del'>-		CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = camel_stream_write_to_stream (data_wrapper-&gt;stream, stream);</div><div class='del'>-	CAMEL_DATA_WRAPPER_UNLOCK (data_wrapper, stream_lock);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelDataWrapper *</div><div class='del'>-camel_data_wrapper_new(void)</div><div class='del'>-{</div><div class='del'>-	return (CamelDataWrapper *)camel_object_new(camel_data_wrapper_get_type());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_write_to_stream:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @stream: stream for data to be written to</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Writes the data content to @stream in a machine-independent format</div><div class='del'>- * appropriate for the data. It should be possible to construct an</div><div class='del'>- * equivalent data wrapper object later by passing this stream to</div><div class='del'>- * camel_data_construct_from_stream().</div><div class='del'>- *</div><div class='del'>- * Return value: the number of bytes written, or -1 if an error occurs.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,</div><div class='del'>-				    CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;write_to_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	if (data_wrapper-&gt;stream)</div><div class='del'>-		camel_object_unref((CamelObject *)data_wrapper-&gt;stream);</div><div class='del'>-</div><div class='del'>-	data_wrapper-&gt;stream = stream;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (stream));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_construct_from_stream:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @stream: A stream that can be read from.</div><div class='del'>- *</div><div class='del'>- * Constructs the content of the data wrapper from the</div><div class='del'>- * supplied @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,</div><div class='del'>-					  CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;construct_from_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)</div><div class='del'>-{</div><div class='del'>-	if (data_wrapper-&gt;mime_type)</div><div class='del'>-		header_content_type_unref (data_wrapper-&gt;mime_type);</div><div class='del'>-	data_wrapper-&gt;mime_type = header_content_type_decode (mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_set_mime_type:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @mime_type: the text representation of a MIME type</div><div class='del'>- *</div><div class='del'>- * This sets the data wrapper's MIME type.</div><div class='del'>- * It might fail, but you won't know. It will allow you to set</div><div class='del'>- * Content-Type parameters on the data wrapper, which are meaningless.</div><div class='del'>- * You should not be allowed to change the MIME type of a data wrapper</div><div class='del'>- * that contains data, or at least, if you do, it should invalidate the</div><div class='del'>- * data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_data_wrapper_set_mime_type (CamelDataWrapper *data_wrapper,</div><div class='del'>-				  const gchar *mime_type)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));</div><div class='del'>-	g_return_if_fail (mime_type != NULL);</div><div class='del'>-</div><div class='del'>-	CDW_CLASS (data_wrapper)-&gt;set_mime_type (data_wrapper, mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-get_mime_type (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	return header_content_type_simple (data_wrapper-&gt;mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_get_mime_type:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- *</div><div class='del'>- * Return value: the text form of the data wrapper's MIME type,</div><div class='del'>- * which the caller must free.</div><div class='del'>- **/</div><div class='del'>-gchar *</div><div class='del'>-camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);</div><div class='del'>-</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;get_mime_type (data_wrapper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelContentType *</div><div class='del'>-get_mime_type_field (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	return data_wrapper-&gt;mime_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_get_mime_type_field:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- *</div><div class='del'>- * Return value: the parsed form of the data wrapper's MIME type</div><div class='del'>- **/</div><div class='del'>-CamelContentType *</div><div class='del'>-camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), NULL);</div><div class='del'>-</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;get_mime_type_field (data_wrapper);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_set_mime_type_field:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @mime_type: the parsed representation of a MIME type</div><div class='del'>- *</div><div class='del'>- * This sets the data wrapper's MIME type. It suffers from the same</div><div class='del'>- * flaws as camel_data_wrapper_set_mime_type.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-set_mime_type_field (CamelDataWrapper *data_wrapper,</div><div class='del'>-		     CamelContentType *mime_type)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper));</div><div class='del'>-	g_return_if_fail (mime_type != NULL);</div><div class='del'>-</div><div class='del'>-	if (data_wrapper-&gt;mime_type)</div><div class='del'>-		header_content_type_unref (data_wrapper-&gt;mime_type);</div><div class='del'>-	data_wrapper-&gt;mime_type = mime_type;</div><div class='del'>-	if (mime_type)</div><div class='del'>-		header_content_type_ref (data_wrapper-&gt;mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_data_wrapper_set_mime_type_field (CamelDataWrapper *data_wrapper,</div><div class='del'>-					CamelContentType *mime_type)</div><div class='del'>-{</div><div class='del'>-	CDW_CLASS (data_wrapper)-&gt;set_mime_type_field (data_wrapper, mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_offline (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	return data_wrapper-&gt;offline;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_is_offline:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- *</div><div class='del'>- * Return value: whether @data_wrapper is "offline" (data stored</div><div class='del'>- * remotely) or not. Some optional code paths may choose to not</div><div class='del'>- * operate on offline data.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;is_offline (data_wrapper);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h<br/>deleted file mode 100644<br/>index d8c7fbe50b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-data-wrapper.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-data-wrapper.h : Abstract class for a data wrapper */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_DATA_WRAPPER_H</div><div class='del'>-#define CAMEL_DATA_WRAPPER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_DATA_WRAPPER_TYPE     (camel_data_wrapper_get_type ())</div><div class='del'>-#define CAMEL_DATA_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))</div><div class='del'>-#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))</div><div class='del'>-#define CAMEL_IS_DATA_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelDataWrapper</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	struct _CamelDataWrapperPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	CamelContentType *mime_type;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	unsigned int offline:1;</div><div class='del'>-	unsigned int rawtext:1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	void                (*set_mime_type)          (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       const gchar * mime_type);</div><div class='del'>-	gchar *             (*get_mime_type)          (CamelDataWrapper *data_wrapper);</div><div class='del'>-	CamelContentType *  (*get_mime_type_field)    (CamelDataWrapper *data_wrapper);</div><div class='del'>-	void                (*set_mime_type_field)    (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       CamelContentType *mime_type_field);</div><div class='del'>-</div><div class='del'>-	int                 (*write_to_stream)        (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       CamelStream *stream);</div><div class='del'>-</div><div class='del'>-	int                 (*construct_from_stream)  (CamelDataWrapper *data_wrapper,</div><div class='del'>-						       CamelStream *);</div><div class='del'>-</div><div class='del'>-	gboolean            (*is_offline)             (CamelDataWrapper *data_wrapper);</div><div class='del'>-</div><div class='del'>-} CamelDataWrapperClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_data_wrapper_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelDataWrapper *  camel_data_wrapper_new(void);</div><div class='del'>-int                 camel_data_wrapper_write_to_stream          (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 CamelStream *stream);</div><div class='del'>-void                camel_data_wrapper_set_mime_type            (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 const gchar *mime_type);</div><div class='del'>-gchar *             camel_data_wrapper_get_mime_type            (CamelDataWrapper *data_wrapper);</div><div class='del'>-CamelContentType *  camel_data_wrapper_get_mime_type_field      (CamelDataWrapper *data_wrapper);</div><div class='del'>-void                camel_data_wrapper_set_mime_type_field      (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 CamelContentType *mime_type);</div><div class='del'>-</div><div class='del'>-int                 camel_data_wrapper_construct_from_stream    (CamelDataWrapper *data_wrapper, CamelStream *stream);</div><div class='del'>-</div><div class='del'>-gboolean            camel_data_wrapper_is_offline               (CamelDataWrapper *data_wrapper);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DATA_WRAPPER_H */</div><div class='head'>diff --git a/camel/camel-digest-folder.c b/camel/camel-digest-folder.c<br/>deleted file mode 100644<br/>index 2454b0f637..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-digest-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-digest-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,348 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-digest-folder.h"</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelDigestFolder *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _CamelDigestFolderPrivate {</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	GHashTable *info_hash;</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void digest_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void digest_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static const char *digest_get_full_name (CamelFolder *folder);</div><div class='del'>-static void digest_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *digest_get_uids (CamelFolder *folder);</div><div class='del'>-static void digest_free_uids (CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-static CamelMessageInfo *digest_get_message_info (CamelFolder *folder, const char *uid);</div><div class='del'>-</div><div class='del'>-/* message manipulation */</div><div class='del'>-static CamelMimeMessage *digest_get_message (CamelFolder *folder, const gchar *uid,</div><div class='del'>-					     CamelException *ex);</div><div class='del'>-static void digest_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				   const CamelMessageInfo *info, char **appended_uid, CamelException *ex);</div><div class='del'>-static void digest_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-					 CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-					 gboolean delete_originals, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_digest_folder_class_init (CamelDigestFolderClass *camel_digest_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_digest_folder_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;refresh_info = digest_refresh_info;</div><div class='del'>-	camel_folder_class-&gt;sync = digest_sync;</div><div class='del'>-	camel_folder_class-&gt;expunge = digest_expunge;</div><div class='del'>-	camel_folder_class-&gt;get_full_name = digest_get_full_name;</div><div class='del'>-	</div><div class='del'>-	camel_folder_class-&gt;get_uids = digest_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = digest_free_uids;</div><div class='del'>-	camel_folder_class-&gt;get_message_info = digest_get_message_info;</div><div class='del'>-	</div><div class='del'>-	camel_folder_class-&gt;get_message = digest_get_message;</div><div class='del'>-	camel_folder_class-&gt;append_message = digest_append_message;</div><div class='del'>-	camel_folder_class-&gt;transfer_messages_to = digest_transfer_messages_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_digest_folder_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (object);</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (object);</div><div class='del'>-	</div><div class='del'>-	folder-&gt;folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;</div><div class='del'>-	</div><div class='del'>-	digest_folder-&gt;priv = g_new0 (struct _CamelDigestFolderPrivate, 1);</div><div class='del'>-	digest_folder-&gt;priv-&gt;info_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-digest_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (object);</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (digest_folder-&gt;priv-&gt;message));</div><div class='del'>-	</div><div class='del'>-	g_hash_table_destroy (digest_folder-&gt;priv-&gt;info_hash);</div><div class='del'>-	</div><div class='del'>-	summary = digest_folder-&gt;priv-&gt;summary;</div><div class='del'>-	if (summary) {</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; summary-&gt;len; i++)</div><div class='del'>-			camel_message_info_free (summary-&gt;pdata[i]);</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (summary, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (digest_folder-&gt;priv-&gt;uids)</div><div class='del'>-		g_ptr_array_free (digest_folder-&gt;priv-&gt;uids, TRUE);</div><div class='del'>-	</div><div class='del'>-	g_free (digest_folder-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_digest_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_FOLDER_TYPE,</div><div class='del'>-					    "CamelDigestFolder",</div><div class='del'>-					    sizeof (CamelDigestFolder),</div><div class='del'>-					    sizeof (CamelDigestFolderClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_digest_folder_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_digest_folder_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) digest_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-multipart_contains_message_parts (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	gboolean has_message_parts = FALSE;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	int i, parts;</div><div class='del'>-	</div><div class='del'>-	parts = camel_multipart_get_number (multipart);</div><div class='del'>-	for (i = 0; i &lt; parts &amp;&amp; !has_message_parts; i++) {</div><div class='del'>-		part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-		if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-			has_message_parts = multipart_contains_message_parts (CAMEL_MULTIPART (wrapper));</div><div class='del'>-		} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			has_message_parts = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return has_message_parts;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_digest_folder_new (CamelStore *parent_store, CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest_folder;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (message));</div><div class='del'>-	if (!wrapper || !CAMEL_IS_MULTIPART (wrapper))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Make sure we have a multipart/digest subpart or at least some message/rfc822 attachments... */</div><div class='del'>-	if (!header_content_type_is (CAMEL_MIME_PART (message)-&gt;content_type, "multipart", "digest")) {</div><div class='del'>-		if (!multipart_contains_message_parts (CAMEL_MULTIPART (wrapper)))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new (camel_digest_folder_get_type ()));</div><div class='del'>-	digest_folder = CAMEL_DIGEST_FOLDER (folder);</div><div class='del'>-	</div><div class='del'>-	camel_folder_construct (folder, parent_store, "folder_name", "short_name");</div><div class='del'>-	</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-	digest_folder-&gt;priv-&gt;message = message;</div><div class='del'>-	</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_add_multipart (CamelMultipart *multipart, GPtrArray *summary,</div><div class='del'>-		      GPtrArray *uids, GHashTable *info_hash,</div><div class='del'>-		      const char *preuid)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	int parts, i;</div><div class='del'>-	char *uid;</div><div class='del'>-	</div><div class='del'>-	parts = camel_multipart_get_number (multipart);</div><div class='del'>-	for (i = 0; i &lt; parts; i++) {</div><div class='del'>-		part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-		</div><div class='del'>-		if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-			uid = g_strdup_printf ("%s%d.", preuid, i);</div><div class='del'>-			digest_add_multipart (CAMEL_MULTIPART (wrapper),</div><div class='del'>-					      summary, uids, info_hash, uid);</div><div class='del'>-			g_free (uid);</div><div class='del'>-			continue;</div><div class='del'>-		} else if (!CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		info = camel_message_info_new_from_header (CAMEL_MIME_PART (wrapper)-&gt;headers);</div><div class='del'>-		</div><div class='del'>-		uid = g_strdup_printf ("%s%d", preuid, i);</div><div class='del'>-		camel_message_info_set_uid (info, g_strdup (uid));</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (uids, uid);</div><div class='del'>-		g_ptr_array_add (summary, info);</div><div class='del'>-		g_hash_table_insert (info_hash, uid, info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-digest_get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest_folder = CAMEL_DIGEST_FOLDER (folder);</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	GHashTable *info_hash;</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	</div><div class='del'>-	if (digest_folder-&gt;priv-&gt;uids)</div><div class='del'>-		return digest_folder-&gt;priv-&gt;uids;</div><div class='del'>-	</div><div class='del'>-	uids = g_ptr_array_new ();</div><div class='del'>-	summary = g_ptr_array_new ();</div><div class='del'>-	info_hash = digest_folder-&gt;priv-&gt;info_hash;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (digest_folder-&gt;priv-&gt;message));</div><div class='del'>-	digest_add_multipart (CAMEL_MULTIPART (wrapper), summary, uids, info_hash, "");</div><div class='del'>-	</div><div class='del'>-	digest_folder-&gt;priv-&gt;uids = uids;</div><div class='del'>-	digest_folder-&gt;priv-&gt;summary = summary;</div><div class='del'>-	</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_free_uids (CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-digest_get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest = CAMEL_DIGEST_FOLDER (folder);</div><div class='del'>-	</div><div class='del'>-	return g_hash_table_lookup (digest-&gt;priv-&gt;info_hash, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-digest_get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;full_name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		       const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-			     CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-			     gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	if (transferred_uids)</div><div class='del'>-		*transferred_uids = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-digest_get_message (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDigestFolder *digest = CAMEL_DIGEST_FOLDER (folder);</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	char *subuid;</div><div class='del'>-	int id;</div><div class='del'>-	</div><div class='del'>-	part = CAMEL_MIME_PART (digest-&gt;priv-&gt;message);</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		id = strtoul (uid, &amp;subuid, 10);</div><div class='del'>-		if (!CAMEL_IS_MULTIPART (wrapper))</div><div class='del'>-			return NULL;</div><div class='del'>-		</div><div class='del'>-		part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), id);</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-		uid = subuid + 1;</div><div class='del'>-	} while (*subuid == '.');</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_IS_MIME_MESSAGE (wrapper))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	message = CAMEL_MIME_MESSAGE (wrapper);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-	</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h<br/>deleted file mode 100644<br/>index 1035930f56..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-digest-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-digest-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_DIGEST_FOLDER_H</div><div class='del'>-#define _CAMEL_DIGEST_FOLDER_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_DIGEST_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_digest_folder_get_type (), CamelDigestFolder)</div><div class='del'>-#define CAMEL_DIGEST_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_folder_get_type (), CamelDigestFolderClass)</div><div class='del'>-#define CAMEL_IS_DIGEST_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_digest_folder_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelDigestFolderClass CamelDigestFolderClass;</div><div class='del'>-</div><div class='del'>-struct _CamelDigestFolder {</div><div class='del'>-	CamelFolder parent;</div><div class='del'>-	</div><div class='del'>-	struct _CamelDigestFolderPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelDigestFolderClass {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType    camel_digest_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelFolder *camel_digest_folder_new      (CamelStore *parent_store, CamelMimeMessage *message);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_DIGEST_FOLDER_H */</div><div class='head'>diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c<br/>deleted file mode 100644<br/>index e3870e3672..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-digest-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-digest-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-digest-store.h"</div><div class='del'>-#include "camel-digest-folder.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelFolder *digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static void digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex);</div><div class='del'>-static void digest_init_trash (CamelStore *store);</div><div class='del'>-static CamelFolder *digest_get_trash  (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_digest_store_class_init (CamelDigestStoreClass *klass);</div><div class='del'>-static void camel_digest_store_init       (CamelDigestStore *obj);</div><div class='del'>-static void camel_digest_store_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static int digest_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_digest_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_store_get_type (),</div><div class='del'>-					    "CamelDigestStore",</div><div class='del'>-					    sizeof (CamelDigestStore),</div><div class='del'>-					    sizeof (CamelDigestStoreClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_digest_store_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_digest_store_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_digest_store_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_digest_store_class_init (CamelDigestStoreClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *object_class = (CamelObjectClass *) klass;</div><div class='del'>-	CamelStoreClass *store_class = (CamelStoreClass *) klass;</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	object_class-&gt;setv = digest_setv;</div><div class='del'>-	object_class-&gt;getv = digest_getv;</div><div class='del'>-	</div><div class='del'>-	store_class-&gt;get_folder = digest_get_folder;</div><div class='del'>-	store_class-&gt;rename_folder = digest_rename_folder;</div><div class='del'>-	store_class-&gt;delete_folder = digest_delete_folder;</div><div class='del'>-	store_class-&gt;get_folder_info = digest_get_folder_info;</div><div class='del'>-	store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-	</div><div class='del'>-	store_class-&gt;init_trash = digest_init_trash;</div><div class='del'>-	store_class-&gt;get_trash = digest_get_trash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_digest_store_init (CamelDigestStore *obj)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = (CamelStore *) obj;</div><div class='del'>-	</div><div class='del'>-	/* we dont want a vtrash on this one */</div><div class='del'>-	store-&gt;flags &amp;= ~(CAMEL_STORE_VTRASH);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_digest_store_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-digest_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelDigestStore doesn't currently have anything to set */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-digest_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelDigestStore doesn't currently have anything to get */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_digest_store_new:</div><div class='del'>- * @url:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelDigestStore object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelDigestStore widget.</div><div class='del'>- **/</div><div class='del'>-CamelStore *</div><div class='del'>-camel_digest_store_new (const char *url)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	CamelURL *uri;</div><div class='del'>-	</div><div class='del'>-	uri = camel_url_new (url, NULL);</div><div class='del'>-	if (!uri)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	store = CAMEL_STORE (camel_object_new (camel_digest_store_get_type ()));</div><div class='del'>-	CAMEL_SERVICE (store)-&gt;url = uri;</div><div class='del'>-	</div><div class='del'>-	return store;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-digest_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_init_trash (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-digest_get_trash (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-digest_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_rename_folder (CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-digest-store.h b/camel/camel-digest-store.h<br/>deleted file mode 100644<br/>index 90e802f09f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-digest-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-digest-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __CAMEL_DIGEST_STORE_H__</div><div class='del'>-#define __CAMEL_DIGEST_STORE_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_DIGEST_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_digest_store_get_type (), CamelDigestStore)</div><div class='del'>-#define CAMEL_DIGEST_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_store_get_type (), CamelDigestStoreClass)</div><div class='del'>-#define CAMEL_IS_DIGEST_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_digest_store_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelDigestStoreClass CamelDigestStoreClass;</div><div class='del'>-</div><div class='del'>-struct _CamelDigestStore {</div><div class='del'>-	CamelStore parent;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelDigestStoreClass {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_digest_store_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelStore *camel_digest_store_new (const char *url);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __CAMEL_DIGEST_STORE_H__ */</div><div class='head'>diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c<br/>deleted file mode 100644<br/>index 8c41f2a098..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-diary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-diary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,434 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-disco-diary.c: class for a disconnected operation log */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-disco-diary.h"</div><div class='del'>-#include "camel-disco-folder.h"</div><div class='del'>-#include "camel-disco-store.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_disco_diary_class_init (CamelDiscoDiaryClass *camel_disco_diary_class)</div><div class='del'>-{</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_disco_diary_init (CamelDiscoDiary *diary)</div><div class='del'>-{</div><div class='del'>-	diary-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	diary-&gt;uidmap = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unref_folder (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	camel_object_unref (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uid (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_disco_diary_finalize (CamelDiscoDiary *diary)</div><div class='del'>-{</div><div class='del'>-	if (diary-&gt;file)</div><div class='del'>-		fclose (diary-&gt;file);</div><div class='del'>-	if (diary-&gt;folders) {</div><div class='del'>-		g_hash_table_foreach (diary-&gt;folders, unref_folder, NULL);</div><div class='del'>-		g_hash_table_destroy (diary-&gt;folders);</div><div class='del'>-	}</div><div class='del'>-	if (diary-&gt;uidmap) {</div><div class='del'>-		g_hash_table_foreach (diary-&gt;uidmap, free_uid, NULL);</div><div class='del'>-		g_hash_table_destroy (diary-&gt;uidmap);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_disco_diary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_disco_diary_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_disco_diary_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_disco_diary_type = camel_type_register (</div><div class='del'>-			CAMEL_OBJECT_TYPE, "CamelDiscoDiary",</div><div class='del'>-			sizeof (CamelDiscoDiary),</div><div class='del'>-			sizeof (CamelDiscoDiaryClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_disco_diary_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_disco_diary_init,</div><div class='del'>-			(CamelObjectFinalizeFunc) camel_disco_diary_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_disco_diary_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-diary_encode_uids (CamelDiscoDiary *diary, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	int i, status;</div><div class='del'>-</div><div class='del'>-	status = camel_file_util_encode_uint32 (diary-&gt;file, uids-&gt;len);</div><div class='del'>-	for (i = 0; status != -1 &amp;&amp; i &lt; uids-&gt;len; i++)</div><div class='del'>-		status = camel_file_util_encode_string (diary-&gt;file, uids-&gt;pdata[i]);</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_disco_diary_log (CamelDiscoDiary *diary, CamelDiscoDiaryAction action,</div><div class='del'>-		       ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	/* You may already be a loser. */</div><div class='del'>-	if (!diary-&gt;file)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	status = camel_file_util_encode_uint32 (diary-&gt;file, action);</div><div class='del'>-	if (status == -1)</div><div class='del'>-		goto lose;</div><div class='del'>-</div><div class='del'>-	va_start (ap, action);</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAMEL_DISCO_DIARY_FOLDER_EXPUNGE:</div><div class='del'>-	{</div><div class='del'>-		CamelFolder *folder = va_arg (ap, CamelFolder *);</div><div class='del'>-		GPtrArray *uids = va_arg (ap, GPtrArray *);</div><div class='del'>-</div><div class='del'>-		status = camel_file_util_encode_string (diary-&gt;file, folder-&gt;full_name);</div><div class='del'>-		if (status != -1)</div><div class='del'>-			status = diary_encode_uids (diary, uids);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_DIARY_FOLDER_APPEND:</div><div class='del'>-	{</div><div class='del'>-		CamelFolder *folder = va_arg (ap, CamelFolder *);</div><div class='del'>-		char *uid = va_arg (ap, char *);</div><div class='del'>-</div><div class='del'>-		status = camel_file_util_encode_string (diary-&gt;file, folder-&gt;full_name);</div><div class='del'>-		if (status != -1)</div><div class='del'>-			status = camel_file_util_encode_string (diary-&gt;file, uid);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_DIARY_FOLDER_TRANSFER:</div><div class='del'>-	{</div><div class='del'>-		CamelFolder *source = va_arg (ap, CamelFolder *);</div><div class='del'>-		CamelFolder *destination = va_arg (ap, CamelFolder *);</div><div class='del'>-		GPtrArray *uids = va_arg (ap, GPtrArray *);</div><div class='del'>-		gboolean delete_originals = va_arg (ap, gboolean);</div><div class='del'>-</div><div class='del'>-		status = camel_file_util_encode_string (diary-&gt;file, source-&gt;full_name);</div><div class='del'>-		if (status == -1)</div><div class='del'>-			break;</div><div class='del'>-		status = camel_file_util_encode_string (diary-&gt;file, destination-&gt;full_name);</div><div class='del'>-		if (status == -1)</div><div class='del'>-			break;</div><div class='del'>-		status = diary_encode_uids (diary, uids);</div><div class='del'>-		if (status == -1)</div><div class='del'>-			break;</div><div class='del'>-		status = camel_file_util_encode_uint32 (diary-&gt;file, delete_originals);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_end (ap);</div><div class='del'>-</div><div class='del'>- lose:</div><div class='del'>-	if (status == -1) {</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		msg = g_strdup_printf (_("Could not write log entry: %s\n"</div><div class='del'>-					 "Further operations on this server "</div><div class='del'>-					 "will not be replayed when you\n"</div><div class='del'>-					 "reconnect to the network."),</div><div class='del'>-				       g_strerror (errno));</div><div class='del'>-		camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary-&gt;store)),</div><div class='del'>-					  CAMEL_SESSION_ALERT_ERROR,</div><div class='del'>-					  msg, FALSE);</div><div class='del'>-		g_free (msg);</div><div class='del'>-</div><div class='del'>-		fclose (diary-&gt;file);</div><div class='del'>-		diary-&gt;file = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uids (GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	while (array-&gt;len--)</div><div class='del'>-		g_free (array-&gt;pdata[array-&gt;len]);</div><div class='del'>-	g_ptr_array_free (array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-diary_decode_uids (CamelDiscoDiary *diary)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	char *uid;</div><div class='del'>-	guint32 i;</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32 (diary-&gt;file, &amp;i) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	uids = g_ptr_array_new ();</div><div class='del'>-	while (i--) {</div><div class='del'>-		if (camel_file_util_decode_string (diary-&gt;file, &amp;uid) == -1) {</div><div class='del'>-			free_uids (uids);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_add (uids, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-diary_decode_folder (CamelDiscoDiary *diary)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_string (diary-&gt;file, &amp;name) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	folder = g_hash_table_lookup (diary-&gt;folders, name);</div><div class='del'>-	if (!folder) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-		char *msg;</div><div class='del'>-</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		folder = camel_store_get_folder (CAMEL_STORE (diary-&gt;store),</div><div class='del'>-						 name, 0, &amp;ex);</div><div class='del'>-		if (folder)</div><div class='del'>-			g_hash_table_insert (diary-&gt;folders, name, folder);</div><div class='del'>-		else {</div><div class='del'>-			msg = g_strdup_printf (_("Could not open `%s':\n%s\nChanges made to this folder will not be resynchronized."),</div><div class='del'>-					       name, camel_exception_get_description (&amp;ex));</div><div class='del'>-			camel_exception_clear (&amp;ex);</div><div class='del'>-			camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary-&gt;store)),</div><div class='del'>-						  CAMEL_SESSION_ALERT_WARNING,</div><div class='del'>-						  msg, FALSE);</div><div class='del'>-			g_free (msg);</div><div class='del'>-			g_free (name);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		g_free (name);</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_folder (gpointer name, gpointer folder, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (name);</div><div class='del'>-	camel_folder_sync (folder, FALSE, NULL);</div><div class='del'>-	camel_object_unref (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_disco_diary_replay (CamelDiscoDiary *diary, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	guint32 action;</div><div class='del'>-	off_t size;</div><div class='del'>-	double pc;</div><div class='del'>-</div><div class='del'>-	fseek (diary-&gt;file, 0, SEEK_END);</div><div class='del'>-	size = ftell (diary-&gt;file);</div><div class='del'>-	g_return_if_fail (size != 0);</div><div class='del'>-	rewind (diary-&gt;file);</div><div class='del'>-</div><div class='del'>-	camel_operation_start (NULL, _("Resynchronizing with server"));</div><div class='del'>-	while (!camel_exception_is_set (ex)) {</div><div class='del'>-		pc = ftell (diary-&gt;file) / size;</div><div class='del'>-		camel_operation_progress (NULL, pc * 100);</div><div class='del'>-</div><div class='del'>-		if (camel_file_util_decode_uint32 (diary-&gt;file, &amp;action) == -1)</div><div class='del'>-			break;</div><div class='del'>-		if (action == CAMEL_DISCO_DIARY_END)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		switch (action) {</div><div class='del'>-		case CAMEL_DISCO_DIARY_FOLDER_EXPUNGE:</div><div class='del'>-		{</div><div class='del'>-			CamelFolder *folder;</div><div class='del'>-			GPtrArray *uids;</div><div class='del'>-</div><div class='del'>-			folder = diary_decode_folder (diary);</div><div class='del'>-			uids = diary_decode_uids (diary);</div><div class='del'>-			if (!uids)</div><div class='del'>-				goto lose;</div><div class='del'>-</div><div class='del'>-			if (folder)</div><div class='del'>-				camel_disco_folder_expunge_uids (folder, uids, ex);</div><div class='del'>-			free_uids (uids);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case CAMEL_DISCO_DIARY_FOLDER_APPEND:</div><div class='del'>-		{</div><div class='del'>-			CamelFolder *folder;</div><div class='del'>-			char *uid, *ret_uid;</div><div class='del'>-			CamelMimeMessage *message;</div><div class='del'>-			CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-			folder = diary_decode_folder (diary);</div><div class='del'>-			if (camel_file_util_decode_string (diary-&gt;file, &amp;uid) == -1)</div><div class='del'>-				goto lose;</div><div class='del'>-</div><div class='del'>-			if (!folder) {</div><div class='del'>-				g_free (uid);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			message = camel_folder_get_message (folder, uid, NULL);</div><div class='del'>-			if (!message) {</div><div class='del'>-				/* The message was appended and then deleted. */</div><div class='del'>-				g_free (uid);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			info = camel_folder_get_message_info (folder, uid);</div><div class='del'>-</div><div class='del'>-			camel_folder_append_message (folder, message, info, &amp;ret_uid, ex);</div><div class='del'>-			camel_folder_free_message_info (folder, info);</div><div class='del'>-</div><div class='del'>-			if (ret_uid) {</div><div class='del'>-				camel_disco_diary_uidmap_add (diary, uid, ret_uid);</div><div class='del'>-				g_free (ret_uid);</div><div class='del'>-			}</div><div class='del'>-			g_free (uid);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		case CAMEL_DISCO_DIARY_FOLDER_TRANSFER:</div><div class='del'>-		{</div><div class='del'>-			CamelFolder *source, *destination;</div><div class='del'>-			GPtrArray *uids, *ret_uids;</div><div class='del'>-			guint32 delete_originals;</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			source = diary_decode_folder (diary);</div><div class='del'>-			destination = diary_decode_folder (diary);</div><div class='del'>-			uids = diary_decode_uids (diary);</div><div class='del'>-			if (!uids)</div><div class='del'>-				goto lose;</div><div class='del'>-			if (camel_file_util_decode_uint32 (diary-&gt;file, &amp;delete_originals) == -1)</div><div class='del'>-				goto lose;</div><div class='del'>-</div><div class='del'>-			if (!source || !destination) {</div><div class='del'>-				free_uids (uids);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_folder_transfer_messages_to (source, uids, destination, &amp;ret_uids, delete_originals, ex);</div><div class='del'>-</div><div class='del'>-			if (ret_uids) {</div><div class='del'>-				for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-					if (!ret_uids-&gt;pdata[i])</div><div class='del'>-						continue;</div><div class='del'>-					camel_disco_diary_uidmap_add (diary, uids-&gt;pdata[i], ret_uids-&gt;pdata[i]);</div><div class='del'>-					g_free (ret_uids-&gt;pdata[i]);</div><div class='del'>-				}</div><div class='del'>-				g_ptr_array_free (ret_uids, TRUE);</div><div class='del'>-			}</div><div class='del'>-			free_uids (uids);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- lose:</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-</div><div class='del'>-	/* Close folders */</div><div class='del'>-	g_hash_table_foreach (diary-&gt;folders, close_folder, diary);</div><div class='del'>-	g_hash_table_destroy (diary-&gt;folders);</div><div class='del'>-	diary-&gt;folders = NULL;</div><div class='del'>-</div><div class='del'>-	/* Truncate the log */</div><div class='del'>-	ftruncate (fileno (diary-&gt;file), 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelDiscoDiary *</div><div class='del'>-camel_disco_diary_new (CamelDiscoStore *store, const char *filename, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoDiary *diary;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DISCO_STORE (store), NULL);</div><div class='del'>-	g_return_val_if_fail (filename != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	diary = CAMEL_DISCO_DIARY (camel_object_new (CAMEL_DISCO_DIARY_TYPE));</div><div class='del'>-	diary-&gt;store = store;</div><div class='del'>-</div><div class='del'>-	diary-&gt;file = fopen (filename, "a+");</div><div class='del'>-	if (!diary-&gt;file) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (diary));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not open journal file: %s",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return diary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_disco_diary_empty  (CamelDiscoDiary *diary)</div><div class='del'>-{</div><div class='del'>-	return ftell (diary-&gt;file) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_disco_diary_uidmap_add (CamelDiscoDiary *diary, const char *old_uid,</div><div class='del'>-			      const char *new_uid)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_insert (diary-&gt;uidmap, g_strdup (old_uid),</div><div class='del'>-			     g_strdup (new_uid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary, const char *uid)</div><div class='del'>-{</div><div class='del'>-	return g_hash_table_lookup (diary-&gt;uidmap, uid);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h<br/>deleted file mode 100644<br/>index b177d8ef6f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-diary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-diary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * camel-disco-diary.h: class for logging disconnected operation</div><div class='del'>- *</div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_DISCO_DIARY_H</div><div class='del'>-#define CAMEL_DISCO_DIARY_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-object.h"</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_DISCO_DIARY_TYPE     (camel_disco_diary_get_type ())</div><div class='del'>-#define CAMEL_DISCO_DIARY(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiary))</div><div class='del'>-#define CAMEL_DISCO_DIARY_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiaryClass))</div><div class='del'>-#define CAMEL_IS_DISCO_DIARY(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_DIARY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_DISCO_DIARY_END = 0,</div><div class='del'>-</div><div class='del'>-	CAMEL_DISCO_DIARY_FOLDER_EXPUNGE,</div><div class='del'>-	CAMEL_DISCO_DIARY_FOLDER_APPEND,</div><div class='del'>-	CAMEL_DISCO_DIARY_FOLDER_TRANSFER,</div><div class='del'>-} CamelDiscoDiaryAction;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_DISCO_DIARY_ARG_NONE = 0,</div><div class='del'>-</div><div class='del'>-	CAMEL_DISCO_DIARY_ARG_FOLDER,</div><div class='del'>-	CAMEL_DISCO_DIARY_ARG_UID,</div><div class='del'>-	CAMEL_DISCO_DIARY_ARG_UID_LIST</div><div class='del'>-} CamelDiscoDiaryArgType;</div><div class='del'>-</div><div class='del'>-struct _CamelDiscoDiary {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	CamelDiscoStore *store;</div><div class='del'>-	FILE *file;</div><div class='del'>-	GHashTable *folders, *uidmap;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelDiscoDiaryClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelDiscoDiary *camel_disco_diary_new    (CamelDiscoStore *store,</div><div class='del'>-					   const char *filename,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-gboolean         camel_disco_diary_empty  (CamelDiscoDiary *diary);</div><div class='del'>-</div><div class='del'>-void             camel_disco_diary_log    (CamelDiscoDiary *diary,</div><div class='del'>-					   CamelDiscoDiaryAction action,</div><div class='del'>-					   ...);</div><div class='del'>-void             camel_disco_diary_replay (CamelDiscoDiary *diary,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Temporary-&gt;Permanent UID map stuff */</div><div class='del'>-void        camel_disco_diary_uidmap_add    (CamelDiscoDiary *diary,</div><div class='del'>-					     const char *old_uid,</div><div class='del'>-					     const char *new_uid);</div><div class='del'>-const char *camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary,</div><div class='del'>-					     const char *uid);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_disco_diary_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DISCO_DIARY_H */</div><div class='head'>diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c<br/>deleted file mode 100644<br/>index 3d3d9212bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,326 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-disco-folder.c: abstract class for a disconnectable folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-disco-folder.h"</div><div class='del'>-#include "camel-disco-store.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o)))</div><div class='del'>-#define CDF_CLASS(o) (CAMEL_DISCO_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o)))</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void disco_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void disco_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static void disco_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void disco_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				  const CamelMessageInfo *info, char **appended_uid, CamelException *ex);</div><div class='del'>-static void disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-					CamelFolder *destination,</div><div class='del'>-					GPtrArray **transferred_uids,</div><div class='del'>-					gboolean delete_originals,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void disco_cache_message       (CamelDiscoFolder *disco_folder,</div><div class='del'>-				       const char *uid, CamelException *ex);</div><div class='del'>-static void disco_prepare_for_offline (CamelDiscoFolder *disco_folder,</div><div class='del'>-				       const char *expression,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_disco_folder_class_init (CamelDiscoFolderClass *camel_disco_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_disco_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_disco_folder_class-&gt;cache_message = disco_cache_message;</div><div class='del'>-	camel_disco_folder_class-&gt;prepare_for_offline = disco_prepare_for_offline;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;refresh_info = disco_refresh_info;</div><div class='del'>-	camel_folder_class-&gt;sync = disco_sync;</div><div class='del'>-	camel_folder_class-&gt;expunge = disco_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;append_message = disco_append_message;</div><div class='del'>-	camel_folder_class-&gt;transfer_messages_to = disco_transfer_messages_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_disco_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_disco_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_disco_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_disco_folder_type = camel_type_register (</div><div class='del'>-			CAMEL_FOLDER_TYPE, "CamelDiscoFolder",</div><div class='del'>-			sizeof (CamelDiscoFolder),</div><div class='del'>-			sizeof (CamelDiscoFolderClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_disco_folder_class_init,</div><div class='del'>-			NULL, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_disco_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (camel_disco_store_status (CAMEL_DISCO_STORE (folder-&gt;parent_store)) != CAMEL_DISCO_STORE_ONLINE)</div><div class='del'>-		return;</div><div class='del'>-	CDF_CLASS (folder)-&gt;refresh_info_online (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (expunge) {</div><div class='del'>-		disco_expunge (folder, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (CAMEL_DISCO_STORE (folder-&gt;parent_store))) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;sync_online (folder, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;sync_offline (folder, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		CDF_CLASS (folder)-&gt;sync_resyncing (folder, ex);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_expunge_uids (CamelFolder *folder, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	if (uids-&gt;len == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (disco)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;expunge_uids_online (folder, uids, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;expunge_uids_offline (folder, uids, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		CDF_CLASS (folder)-&gt;expunge_uids_resyncing (folder, uids, ex);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	uids = g_ptr_array_new ();</div><div class='del'>-	count = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, i);</div><div class='del'>-		if (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)</div><div class='del'>-			g_ptr_array_add (uids, g_strdup (camel_message_info_uid (info)));</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	disco_expunge_uids (folder, uids, ex);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-		g_free (uids-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (uids, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		      const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (disco)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;append_online (folder, message, info,</div><div class='del'>-						   appended_uid, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		CDF_CLASS (folder)-&gt;append_offline (folder, message, info,</div><div class='del'>-						    appended_uid, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		CDF_CLASS (folder)-&gt;append_resyncing (folder, message, info,</div><div class='del'>-						      appended_uid, ex);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-			    CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-			    gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (source-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (disco)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		CDF_CLASS (source)-&gt;transfer_online (source, uids,</div><div class='del'>-						     dest, transferred_uids,</div><div class='del'>-						     delete_originals, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		CDF_CLASS (source)-&gt;transfer_offline (source, uids,</div><div class='del'>-						      dest, transferred_uids,</div><div class='del'>-						      delete_originals, ex);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		CDF_CLASS (source)-&gt;transfer_resyncing (source, uids,</div><div class='del'>-							dest, transferred_uids,</div><div class='del'>-							delete_originals, ex);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_folder_expunge_uids:</div><div class='del'>- * @folder: a (disconnectable) folder</div><div class='del'>- * @uids: array of UIDs to expunge</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This expunges the messages in @uids from @folder. It should take</div><div class='del'>- * whatever steps are needed to avoid expunging any other messages,</div><div class='del'>- * although in some cases it may not be possible to avoid expunging</div><div class='del'>- * messages that are marked deleted by another client at the same time</div><div class='del'>- * as the expunge_uids call is running.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-				 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	disco_expunge_uids (folder, uids, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_cache_message (CamelDiscoFolder *disco_folder, const char *uid,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelDiscoFolder::cache_message not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_folder_cache_message:</div><div class='del'>- * @disco_folder: the folder</div><div class='del'>- * @uid: the UID of the message to cache</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Requests that @disco_folder cache message @uid to disk.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_disco_folder_cache_message (CamelDiscoFolder *disco_folder,</div><div class='del'>-				  const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CDF_CLASS (disco_folder)-&gt;cache_message (disco_folder, uid, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_prepare_for_offline (CamelDiscoFolder *disco_folder,</div><div class='del'>-			   const char *expression,</div><div class='del'>-			   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (disco_folder);</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Preparing folder '%s' for offline"), folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	if (expression)</div><div class='del'>-		uids = camel_folder_search_by_expression (folder, expression, ex);</div><div class='del'>-	else</div><div class='del'>-		uids = camel_folder_get_uids (folder);</div><div class='del'>-</div><div class='del'>-	if (!uids) {</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		int pc = i * 100 / uids-&gt;len;</div><div class='del'>-</div><div class='del'>-		camel_disco_folder_cache_message (disco_folder, uids-&gt;pdata[i], ex);</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (expression)</div><div class='del'>-		camel_folder_search_free (folder, uids);</div><div class='del'>-	else</div><div class='del'>-		camel_folder_free_uids (folder, uids);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_folder_prepare_for_offline:</div><div class='del'>- * @disco_folder: the folder</div><div class='del'>- * @expression: an expression describing messages to synchronize, or %NULL</div><div class='del'>- * if all messages should be sync'ed.</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This prepares @disco_folder for offline operation, by downloading</div><div class='del'>- * the bodies of all messages described by @expression (using the</div><div class='del'>- * same syntax as camel_folder_search_by_expression() ).</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_disco_folder_prepare_for_offline (CamelDiscoFolder *disco_folder,</div><div class='del'>-					const char *expression,</div><div class='del'>-					CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_DISCO_FOLDER (disco_folder));</div><div class='del'>-</div><div class='del'>-	CDF_CLASS (disco_folder)-&gt;prepare_for_offline (disco_folder, expression, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h<br/>deleted file mode 100644<br/>index 0d857c0b9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,121 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * camel-disco-folder.h: Abstract class for a disconnectable folder</div><div class='del'>- *</div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_DISCO_FOLDER_H</div><div class='del'>-#define CAMEL_DISCO_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_DISCO_FOLDER_TYPE     (camel_disco_folder_get_type ())</div><div class='del'>-#define CAMEL_DISCO_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolder))</div><div class='del'>-#define CAMEL_DISCO_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolderClass))</div><div class='del'>-#define CAMEL_IS_DISCO_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelDiscoFolder {</div><div class='del'>-	CamelFolder parent_object;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*refresh_info_online) (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*sync_online)    (CamelFolder *folder, CamelException *ex);</div><div class='del'>-	void (*sync_offline)   (CamelFolder *folder, CamelException *ex);</div><div class='del'>-	void (*sync_resyncing) (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*expunge_uids_online)    (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-	void (*expunge_uids_offline)   (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-	void (*expunge_uids_resyncing) (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*append_online)    (CamelFolder *folder,</div><div class='del'>-				  CamelMimeMessage *message,</div><div class='del'>-				  const CamelMessageInfo *info,</div><div class='del'>-				  char **appended_uid,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-	void (*append_offline)   (CamelFolder *folder,</div><div class='del'>-				  CamelMimeMessage *message,</div><div class='del'>-				  const CamelMessageInfo *info,</div><div class='del'>-				  char **appended_uid,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-	void (*append_resyncing) (CamelFolder *folder,</div><div class='del'>-				  CamelMimeMessage *message,</div><div class='del'>-				  const CamelMessageInfo *info,</div><div class='del'>-				  char **appended_uid,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*transfer_online)    (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				    CamelFolder *destination,</div><div class='del'>-				    GPtrArray **transferred_uids,</div><div class='del'>-				    gboolean delete_originals,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-	void (*transfer_offline)   (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				    CamelFolder *destination,</div><div class='del'>-				    GPtrArray **transferred_uids,</div><div class='del'>-				    gboolean delete_originals,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-	void (*transfer_resyncing) (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				    CamelFolder *destination,</div><div class='del'>-				    GPtrArray **transferred_uids,</div><div class='del'>-				    gboolean delete_originals,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*cache_message)       (CamelDiscoFolder *disco_folder,</div><div class='del'>-				     const char *uid, CamelException *ex);</div><div class='del'>-	void (*prepare_for_offline) (CamelDiscoFolder *disco_folder,</div><div class='del'>-				     const char *expression,</div><div class='del'>-				     CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*update_uid) (CamelFolder *folder, const char *old_uid,</div><div class='del'>-			    const char *new_uid);</div><div class='del'>-} CamelDiscoFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void camel_disco_folder_expunge_uids (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-				      CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_disco_folder_cache_message       (CamelDiscoFolder *disco_folder,</div><div class='del'>-					     const char *uid,</div><div class='del'>-					     CamelException *ex);</div><div class='del'>-void camel_disco_folder_prepare_for_offline (CamelDiscoFolder *disco_folder,</div><div class='del'>-					     const char *expression,</div><div class='del'>-					     CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_disco_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DISCO_FOLDER_H */</div><div class='head'>diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c<br/>deleted file mode 100644<br/>index 45207e4538..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,371 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-disco-store.c: abstract class for a disconnectable remote store */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-disco-store.h"</div><div class='del'>-#include "camel-disco-diary.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-#define CDS_CLASS(o) (CAMEL_DISCO_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (o)))</div><div class='del'>-</div><div class='del'>-static CamelRemoteStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void disco_construct (CamelService *service, CamelSession *session,</div><div class='del'>-			     CamelProvider *provider, CamelURL *url,</div><div class='del'>-			     CamelException *ex);</div><div class='del'>-static gboolean disco_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static void disco_cancel_connect (CamelService *service);</div><div class='del'>-static gboolean disco_disconnect (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static CamelFolder *disco_get_folder (CamelStore *store, const char *name,</div><div class='del'>-				      guint32 flags, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *disco_get_folder_info (CamelStore *store,</div><div class='del'>-					       const char *top, guint32 flags,</div><div class='del'>-					       CamelException *ex);</div><div class='del'>-static void set_status (CamelDiscoStore *disco_store,</div><div class='del'>-			CamelDiscoStoreStatus status,</div><div class='del'>-			CamelException *ex);</div><div class='del'>-static gboolean can_work_offline (CamelDiscoStore *disco_store);</div><div class='del'>-</div><div class='del'>-static int disco_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int disco_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_disco_store_class_init (CamelDiscoStoreClass *camel_disco_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class =</div><div class='del'>-		CAMEL_OBJECT_CLASS (camel_disco_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_disco_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_disco_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_REMOTE_STORE_CLASS (camel_type_get_global_classfuncs (camel_remote_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_disco_store_class-&gt;set_status = set_status;</div><div class='del'>-	camel_disco_store_class-&gt;can_work_offline = can_work_offline;</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class-&gt;setv = disco_setv;</div><div class='del'>-	camel_object_class-&gt;getv = disco_getv;</div><div class='del'>-	</div><div class='del'>-	camel_service_class-&gt;construct = disco_construct;</div><div class='del'>-	camel_service_class-&gt;connect = disco_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = disco_disconnect;</div><div class='del'>-	camel_service_class-&gt;cancel_connect = disco_cancel_connect;</div><div class='del'>-	</div><div class='del'>-	camel_store_class-&gt;get_folder = disco_get_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = disco_get_folder_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_disco_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_disco_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_disco_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_disco_store_type = camel_type_register (</div><div class='del'>-			CAMEL_REMOTE_STORE_TYPE, "CamelDiscoStore",</div><div class='del'>-			sizeof (CamelDiscoStore),</div><div class='del'>-			sizeof (CamelDiscoStoreClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_disco_store_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_disco_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-disco_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelDiscoStore doesn't currently have anything to set */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-disco_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelDiscoStore doesn't currently have anything to get */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_construct (CamelService *service, CamelSession *session,</div><div class='del'>-		 CamelProvider *provider, CamelURL *url,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (service);</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	disco-&gt;status = camel_session_is_online (session) ?</div><div class='del'>-		CAMEL_DISCO_STORE_ONLINE : CAMEL_DISCO_STORE_OFFLINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-disco_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);</div><div class='del'>-	CamelDiscoStoreStatus status;</div><div class='del'>-</div><div class='del'>-	status = camel_disco_store_status (store);</div><div class='del'>-	if (status != CAMEL_DISCO_STORE_OFFLINE) {</div><div class='del'>-		if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;connect (service, ex)) {</div><div class='del'>-			status = camel_disco_store_status (store);</div><div class='del'>-			if (status != CAMEL_DISCO_STORE_OFFLINE)</div><div class='del'>-				return FALSE;</div><div class='del'>-			camel_exception_clear (ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		if (!CDS_CLASS (service)-&gt;connect_online (service, ex))</div><div class='del'>-			return FALSE;</div><div class='del'>-		if (camel_disco_diary_empty (store-&gt;diary))</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		/* Need to resync */</div><div class='del'>-		store-&gt;status = CAMEL_DISCO_STORE_RESYNCING;</div><div class='del'>-		camel_disco_diary_replay (store-&gt;diary, ex);</div><div class='del'>-		store-&gt;status = CAMEL_DISCO_STORE_ONLINE;</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		if (!camel_service_disconnect (service, TRUE, ex))</div><div class='del'>-			return FALSE;</div><div class='del'>-		return camel_service_connect (service, ex);</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		return CDS_CLASS (service)-&gt;connect_offline (service, ex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disco_cancel_connect (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);</div><div class='del'>-</div><div class='del'>-	/* Fall back */</div><div class='del'>-	store-&gt;status = CAMEL_DISCO_STORE_OFFLINE;</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;cancel_connect (service);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-disco_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *store = CAMEL_DISCO_STORE (service);</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (store)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		if (!CDS_CLASS (service)-&gt;disconnect_online (service, clean, ex))</div><div class='del'>-			return FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		if (!CDS_CLASS (service)-&gt;disconnect_offline (service, clean, ex))</div><div class='del'>-			return FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CAMEL_SERVICE_CLASS (parent_class)-&gt;disconnect (service, clean, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-disco_get_folder (CamelStore *store, const char *name,</div><div class='del'>-		  guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (store);</div><div class='del'>-	</div><div class='del'>-	switch (camel_disco_store_status (disco_store)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_online (store, name, flags, ex);</div><div class='del'>-		</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_offline (store, name, flags, ex);</div><div class='del'>-		</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_resyncing (store, name, flags, ex);	</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-disco_get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		       guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (store);</div><div class='del'>-</div><div class='del'>-	/* Do this first so if we get forced offline, we'll switch to</div><div class='del'>-	 * the correct branch below. (FIXME: This only works because</div><div class='del'>-	 * we know that get_folder_info is the first call that the</div><div class='del'>-	 * mailer makes on a store.)</div><div class='del'>-	 */</div><div class='del'>-	if (CAMEL_SERVICE (store)-&gt;status == CAMEL_SERVICE_DISCONNECTED) {</div><div class='del'>-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (camel_disco_store_status (disco_store)) {</div><div class='del'>-	case CAMEL_DISCO_STORE_ONLINE:</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_info_online (store, top, flags, ex);</div><div class='del'>-		</div><div class='del'>-	case CAMEL_DISCO_STORE_OFFLINE:</div><div class='del'>-		/* Can't edit subscriptions while offline */</div><div class='del'>-		if ((store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS) &amp;&amp;</div><div class='del'>-		    !(flags &amp; CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)) {</div><div class='del'>-			camel_disco_store_check_online (disco_store, ex);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_info_offline (store, top, flags, ex);</div><div class='del'>-		</div><div class='del'>-	case CAMEL_DISCO_STORE_RESYNCING:</div><div class='del'>-		return CDS_CLASS (store)-&gt;get_folder_info_resyncing (store, top, flags, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_store_status:</div><div class='del'>- * @store: a disconnectable store</div><div class='del'>- *</div><div class='del'>- * Return value: the current online/offline status of @store.</div><div class='del'>- **/</div><div class='del'>-CamelDiscoStoreStatus</div><div class='del'>-camel_disco_store_status (CamelDiscoStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DISCO_STORE (store), CAMEL_DISCO_STORE_ONLINE);</div><div class='del'>-</div><div class='del'>-	if (service-&gt;status == CAMEL_SERVICE_CONNECTING &amp;&amp;</div><div class='del'>-	    store-&gt;status == CAMEL_DISCO_STORE_ONLINE &amp;&amp;</div><div class='del'>-	    !camel_session_is_online (service-&gt;session))</div><div class='del'>-		store-&gt;status = CAMEL_DISCO_STORE_OFFLINE;</div><div class='del'>-</div><div class='del'>-	return store-&gt;status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_status (CamelDiscoStore *disco_store, CamelDiscoStoreStatus status,</div><div class='del'>-	    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (disco_store-&gt;status == status)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	camel_store_sync (CAMEL_STORE (disco_store), ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	if (!camel_service_disconnect (CAMEL_SERVICE (disco_store), TRUE, ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	disco_store-&gt;status = status;</div><div class='del'>-	camel_service_connect (CAMEL_SERVICE (disco_store), ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_store_set_status:</div><div class='del'>- * @store: a disconnectable store</div><div class='del'>- * @status: the new status</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Sets @store to @status. If an error occurrs and the status cannot</div><div class='del'>- * be set to @status, @ex will be set.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_disco_store_set_status (CamelDiscoStore *store,</div><div class='del'>-			      CamelDiscoStoreStatus status,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CDS_CLASS (store)-&gt;set_status (store, status, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-can_work_offline (CamelDiscoStore *disco_store)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelDiscoStore::can_work_offline not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_store)));</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_store_can_work_offline:</div><div class='del'>- * @store: a disconnectable store</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not @store can be used offline. (Will be</div><div class='del'>- * %FALSE if the store is not caching data to local disk, for example.)</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_disco_store_can_work_offline (CamelDiscoStore *store)</div><div class='del'>-{</div><div class='del'>-	return CDS_CLASS (store)-&gt;can_work_offline (store);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_disco_store_check_online:</div><div class='del'>- * @store: a disconnectable store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This checks that @store is online, and sets @ex if it is not. This</div><div class='del'>- * can be used as a simple way to set a generic error message in @ex</div><div class='del'>- * for operations that won't work offline.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not @store is online.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (camel_disco_store_status (store) != CAMEL_DISCO_STORE_ONLINE) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     _("You must be working online to "</div><div class='del'>-				       "complete this operation"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h<br/>deleted file mode 100644<br/>index 01d11645e2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-disco-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-disco-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,125 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-disco-store.h: abstruct class for a disconnectable store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_DISCO_STORE_H</div><div class='del'>-#define CAMEL_DISCO_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-remote-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_DISCO_STORE_TYPE     (camel_disco_store_get_type ())</div><div class='del'>-#define CAMEL_DISCO_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_DISCO_STORE_TYPE, CamelDiscoStore))</div><div class='del'>-#define CAMEL_DISCO_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_STORE_TYPE, CamelDiscoStoreClass))</div><div class='del'>-#define CAMEL_IS_DISCO_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_DISCO_STORE_ARG_FIRST  = CAMEL_REMOTE_STORE_ARG_FIRST + 100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_DISCO_STORE_ONLINE,</div><div class='del'>-	CAMEL_DISCO_STORE_OFFLINE,</div><div class='del'>-	CAMEL_DISCO_STORE_RESYNCING</div><div class='del'>-} CamelDiscoStoreStatus;</div><div class='del'>-</div><div class='del'>-struct _CamelDiscoStore {</div><div class='del'>-	CamelRemoteStore parent_object;	</div><div class='del'>-</div><div class='del'>-	CamelDiscoStoreStatus status;</div><div class='del'>-	CamelDiscoDiary *diary;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelRemoteStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-	void              (*set_status)              (CamelDiscoStore *,</div><div class='del'>-						      CamelDiscoStoreStatus,</div><div class='del'>-						      CamelException *);</div><div class='del'>-	gboolean          (*can_work_offline)        (CamelDiscoStore *);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gboolean          (*connect_online)          (CamelService *,</div><div class='del'>-						      CamelException *);</div><div class='del'>-	gboolean          (*connect_offline)         (CamelService *,</div><div class='del'>-						      CamelException *);</div><div class='del'>-</div><div class='del'>-	gboolean          (*disconnect_online)       (CamelService *, gboolean,</div><div class='del'>-						      CamelException *);</div><div class='del'>-	gboolean          (*disconnect_offline)      (CamelService *, gboolean,</div><div class='del'>-						      CamelException *);</div><div class='del'>-</div><div class='del'>-	CamelFolder *     (*get_folder_online)       (CamelStore *store,</div><div class='del'>-						      const char *name,</div><div class='del'>-						      guint32 flags,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-	CamelFolder *     (*get_folder_offline)      (CamelStore *store,</div><div class='del'>-						      const char *name,</div><div class='del'>-						      guint32 flags,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-	CamelFolder *     (*get_folder_resyncing)    (CamelStore *store,</div><div class='del'>-						      const char *name,</div><div class='del'>-						      guint32 flags,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-</div><div class='del'>-	CamelFolderInfo * (*get_folder_info_online)    (CamelStore *store,</div><div class='del'>-							const char *top,</div><div class='del'>-							guint32 flags,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-	CamelFolderInfo * (*get_folder_info_offline)   (CamelStore *store,</div><div class='del'>-							const char *top,</div><div class='del'>-							guint32 flags,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-	CamelFolderInfo * (*get_folder_info_resyncing) (CamelStore *store,</div><div class='del'>-							const char *top,</div><div class='del'>-							guint32 flags,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-} CamelDiscoStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_disco_store_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Public methods */</div><div class='del'>-CamelDiscoStoreStatus camel_disco_store_status           (CamelDiscoStore *);</div><div class='del'>-void                  camel_disco_store_set_status       (CamelDiscoStore *,</div><div class='del'>-							  CamelDiscoStoreStatus,</div><div class='del'>-							  CamelException *);</div><div class='del'>-gboolean              camel_disco_store_can_work_offline (CamelDiscoStore *);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Convenience functions */</div><div class='del'>-gboolean camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DISCO_STORE_H */</div><div class='head'>diff --git a/camel/camel-exception-list.def b/camel/camel-exception-list.def<br/>deleted file mode 100644<br/>index 8fe1e268cf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception-list.def?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-exception-list.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* WARNING: Exceptions MUST NOT be renumbered: they need to be</div><div class='del'>- * consistent across libraries compiled at different times.</div><div class='del'>- * Categories should be widely separated, old unused exceptions can</div><div class='del'>- * never be deleted, and new exceptions can be added only to the</div><div class='del'>- * ends of categories.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-CAMEL_EXCEPTION_NONE = 0,</div><div class='del'>-</div><div class='del'>-/* Generic exceptions */</div><div class='del'>-CAMEL_EXCEPTION_INVALID_PARAM,</div><div class='del'>-CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-</div><div class='del'>-/* CamelFolderException */</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NULL = 100,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_STATE,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NON_EMPTY,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NON_UID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_PATH,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,</div><div class='del'>-</div><div class='del'>-/* CamelStoreException */</div><div class='del'>-CAMEL_EXCEPTION_STORE_NULL = 200,</div><div class='del'>-CAMEL_EXCEPTION_STORE_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-</div><div class='del'>-/* CamelServiceException */</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_NULL = 300,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED</div><div class='head'>diff --git a/camel/camel-exception.c b/camel/camel-exception.c<br/>deleted file mode 100644<br/>index 1bb6c22550..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-exception.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,313 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-execpetion.c : exception utils */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-/* i dont know why gthread_mutex stuff even exists, this is easier */</div><div class='del'>-</div><div class='del'>-/* also, i'm not convinced mutexes are needed here.  But it</div><div class='del'>-   doesn't really hurt either */</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-</div><div class='del'>-static pthread_mutex_t exception_mutex = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-#define CAMEL_EXCEPTION_LOCK(e) (pthread_mutex_lock(&amp;exception_mutex))</div><div class='del'>-#define CAMEL_EXCEPTION_UNLOCK(e) (pthread_mutex_unlock(&amp;exception_mutex))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_EXCEPTION_LOCK(e) </div><div class='del'>-#define CAMEL_EXCEPTION_UNLOCK(e) </div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static EMemChunk *exception_chunks = NULL;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_new: allocate a new exception object. </div><div class='del'>- * </div><div class='del'>- * Create and returns a new exception object.</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: The newly allocated exception object.</div><div class='del'>- **/</div><div class='del'>-CamelException *</div><div class='del'>-camel_exception_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-</div><div class='del'>-	if (exception_chunks == NULL)</div><div class='del'>-		exception_chunks = e_memchunk_new(16, sizeof(CamelException));</div><div class='del'>-</div><div class='del'>-	ex = e_memchunk_alloc(exception_chunks);</div><div class='del'>-	ex-&gt;desc = NULL;</div><div class='del'>-</div><div class='del'>-	/* set the Exception Id to NULL */</div><div class='del'>-	ex-&gt;id = CAMEL_EXCEPTION_NONE;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-</div><div class='del'>-	return ex;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_init: init a (statically allocated) exception. </div><div class='del'>- * </div><div class='del'>- * Init an exception. This routine is mainly</div><div class='del'>- * useful when using a statically allocated</div><div class='del'>- * exception. </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_exception_init (CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	ex-&gt;desc = NULL;</div><div class='del'>-</div><div class='del'>-	/* set the Exception Id to NULL */</div><div class='del'>-	ex-&gt;id = CAMEL_EXCEPTION_NONE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_clear: Clear an exception</div><div class='del'>- * @exception: the exception object</div><div class='del'>- * </div><div class='del'>- * Clear an exception, that is, set the </div><div class='del'>- * exception ID to CAMEL_EXCEPTION_NONE and</div><div class='del'>- * free the description text.</div><div class='del'>- * If the exception is NULL, this funtion just</div><div class='del'>- * returns.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_exception_clear (CamelException *exception)</div><div class='del'>-{</div><div class='del'>-	if (!exception)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-</div><div class='del'>-	if (exception-&gt;desc)</div><div class='del'>-		g_free (exception-&gt;desc);</div><div class='del'>-	exception-&gt;desc = NULL;</div><div class='del'>-	exception-&gt;id = CAMEL_EXCEPTION_NONE;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_free: Free an exception </div><div class='del'>- * @exception: The exception object to free</div><div class='del'>- * </div><div class='del'>- * Free an exception object. If the exception</div><div class='del'>- * is NULL, nothing is done, the routine simply</div><div class='del'>- * returns.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_exception_free (CamelException *exception)</div><div class='del'>-{</div><div class='del'>-	if (!exception)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (exception-&gt;desc)</div><div class='del'>-		g_free (exception-&gt;desc);</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-</div><div class='del'>-	e_memchunk_free(exception_chunks, exception);</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_set: set an exception </div><div class='del'>- * @ex: exception object </div><div class='del'>- * @id: exception id </div><div class='del'>- * @desc: textual description of the exception</div><div class='del'>- * </div><div class='del'>- * Set the value of an exception. The exception id is </div><div class='del'>- * a unique number representing the exception. The </div><div class='del'>- * textual description is a small text explaining </div><div class='del'>- * what happened and provoked the exception.</div><div class='del'>- *</div><div class='del'>- * When @ex is NULL, nothing is done, this routine</div><div class='del'>- * simply returns.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_exception_set (CamelException *ex,</div><div class='del'>-		     ExceptionId id,</div><div class='del'>-		     const char *desc)</div><div class='del'>-{</div><div class='del'>-	if (!ex)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-</div><div class='del'>-	ex-&gt;id = id;</div><div class='del'>-</div><div class='del'>-	if (desc != ex-&gt;desc) {</div><div class='del'>-		g_free (ex-&gt;desc);</div><div class='del'>-		ex-&gt;desc = g_strdup (desc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_setv: set an exception </div><div class='del'>- * @ex: exception object </div><div class='del'>- * @id: exception id </div><div class='del'>- * @format: format of the description string. The format string is</div><div class='del'>- * used as in printf().</div><div class='del'>- * </div><div class='del'>- * Set the value of an exception. The exception id is </div><div class='del'>- * a unique number representing the exception. The </div><div class='del'>- * textual description is a small text explaining </div><div class='del'>- * what happened and provoked the exception. </div><div class='del'>- * In this version, the string is created from the format </div><div class='del'>- * string and the variable argument list.</div><div class='del'>- *</div><div class='del'>- * It is safe to say:</div><div class='del'>- *   camel_exception_setv (ex, ..., camel_exception_get_description (ex), ...);</div><div class='del'>- *</div><div class='del'>- * When @ex is NULL, nothing is done, this routine</div><div class='del'>- * simply returns.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_exception_setv (CamelException *ex,</div><div class='del'>-		      ExceptionId id,</div><div class='del'>-		      const char *format, </div><div class='del'>-		      ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	char *old;</div><div class='del'>-	</div><div class='del'>-	if (!ex)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-	</div><div class='del'>-	old = ex-&gt;desc;</div><div class='del'>-	</div><div class='del'>-	va_start(args, format);</div><div class='del'>-	ex-&gt;desc = g_strdup_vprintf (format, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-</div><div class='del'>-	g_free (old);</div><div class='del'>-	</div><div class='del'>-	ex-&gt;id = id;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_xfer: transfer an exception</div><div class='del'>- * @ex_dst: Destination exception object </div><div class='del'>- * @ex_src: Source exception object</div><div class='del'>- * </div><div class='del'>- * Transfer the content of an exception from</div><div class='del'>- * an exception object to another. </div><div class='del'>- * The destination exception receives the id and</div><div class='del'>- * the description text of the source exception. </div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_exception_xfer (CamelException *ex_dst,</div><div class='del'>-		      CamelException *ex_src)</div><div class='del'>-{</div><div class='del'>-	if (ex_src == NULL) {</div><div class='del'>-		g_warning ("camel_exception_xfer: trying to transfer NULL exception to %p\n", ex_dst);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ex_dst == NULL) {</div><div class='del'>-		/* must have same side-effects */</div><div class='del'>-		camel_exception_clear (ex_src);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_LOCK(exception);</div><div class='del'>-</div><div class='del'>-	if (ex_dst-&gt;desc)</div><div class='del'>-		g_free (ex_dst-&gt;desc);</div><div class='del'>-</div><div class='del'>-	ex_dst-&gt;id = ex_src-&gt;id;</div><div class='del'>-	ex_dst-&gt;desc = ex_src-&gt;desc;</div><div class='del'>-</div><div class='del'>-	ex_src-&gt;desc = NULL;</div><div class='del'>-	ex_src-&gt;id = CAMEL_EXCEPTION_NONE;</div><div class='del'>-</div><div class='del'>-	CAMEL_EXCEPTION_UNLOCK(exception);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_get_id: get the exception id</div><div class='del'>- * @ex: The exception object</div><div class='del'>- * </div><div class='del'>- * Return the id of an exception. </div><div class='del'>- * If @ex is NULL, return CAMEL_EXCEPTION_NONE;</div><div class='del'>- * </div><div class='del'>- * Return value: Exception ID.</div><div class='del'>- **/</div><div class='del'>-ExceptionId</div><div class='del'>-camel_exception_get_id (CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (ex)</div><div class='del'>-		return ex-&gt;id;</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("camel_exception_get_id called with NULL parameter.");</div><div class='del'>-		return CAMEL_EXCEPTION_NONE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_exception_get_description: get the description of an exception.</div><div class='del'>- * @ex: The exception object</div><div class='del'>- * </div><div class='del'>- * Return the exception description text. </div><div class='del'>- * If @ex is NULL, return NULL;</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: Exception description text.</div><div class='del'>- **/</div><div class='del'>-const gchar *</div><div class='del'>-camel_exception_get_description (CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *ret = NULL;</div><div class='del'>-</div><div class='del'>-	if (ex)</div><div class='del'>-		ret = ex-&gt;desc;</div><div class='del'>-	else</div><div class='del'>-		g_warning ("camel_exception_get_description called with NULL parameter.");</div><div class='del'>-		</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-exception.h b/camel/camel-exception.h<br/>deleted file mode 100644<br/>index 77c2c16066..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-exception.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-execpetion.h : exception utils */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_EXCEPTION_H</div><div class='del'>-#define CAMEL_EXCEPTION_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-#include "camel-exception-list.def"</div><div class='del'>-</div><div class='del'>-} ExceptionId;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelException {</div><div class='del'>-	/* do not access the fields directly */</div><div class='del'>-	ExceptionId id;</div><div class='del'>-	char *desc;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* creation and destruction functions */</div><div class='del'>-CamelException *          camel_exception_new           (void);</div><div class='del'>-void                      camel_exception_free          (CamelException *exception);</div><div class='del'>-void                      camel_exception_init          (CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* exception content manipulation */</div><div class='del'>-void                      camel_exception_clear         (CamelException *exception);</div><div class='del'>-void                      camel_exception_set           (CamelException *ex,</div><div class='del'>-							 ExceptionId id,</div><div class='del'>-							 const char *desc);</div><div class='del'>-void                      camel_exception_setv          (CamelException *ex,</div><div class='del'>-							 ExceptionId id,</div><div class='del'>-							 const char *format,  </div><div class='del'>-							 ...);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* exception content transfer */</div><div class='del'>-void                      camel_exception_xfer          (CamelException *ex_dst,</div><div class='del'>-							 CamelException *ex_src);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* exception content retrieval */</div><div class='del'>-ExceptionId               camel_exception_get_id        (CamelException *ex);</div><div class='del'>-const char *             camel_exception_get_description (CamelException *ex);</div><div class='del'>-</div><div class='del'>-#define camel_exception_is_set(ex) (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE)</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_EXCEPTION_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c<br/>deleted file mode 100644<br/>index 0b909f3e82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-file-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-file-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_encode_uint32:</div><div class='del'>- * @out: file to output to</div><div class='del'>- * @value: value to output</div><div class='del'>- * </div><div class='del'>- * Utility function to save an uint32 to a file.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_encode_uint32 (FILE *out, guint32 value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 28; i &gt; 0; i -= 7) {</div><div class='del'>-		if (value &gt;= (1 &lt;&lt; i)) {</div><div class='del'>-			unsigned int c = (value &gt;&gt; i) &amp; 0x7f;</div><div class='del'>-			if (fputc (c, out) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return fputc (value | 0x80, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_decode_uint32:</div><div class='del'>- * @in: file to read from</div><div class='del'>- * @dest: pointer to a variable to store the value in</div><div class='del'>- * </div><div class='del'>- * Retrieve an encoded uint32 from a file.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.  @*dest will contain the</div><div class='del'>- * decoded value.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_decode_uint32 (FILE *in, guint32 *dest)</div><div class='del'>-{</div><div class='del'>-        guint32 value = 0;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-        /* until we get the last byte, keep decoding 7 bits at a time */</div><div class='del'>-        while ( ((v = fgetc (in)) &amp; 0x80) == 0 &amp;&amp; v!=EOF) {</div><div class='del'>-                value |= v;</div><div class='del'>-                value &lt;&lt;= 7;</div><div class='del'>-        }</div><div class='del'>-	if (v == EOF) {</div><div class='del'>-		*dest = value &gt;&gt; 7;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	*dest = value | (v &amp; 0x7f);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_encode_fixed_int32:</div><div class='del'>- * @out: file to output to</div><div class='del'>- * @value: value to output</div><div class='del'>- * </div><div class='del'>- * Encode a gint32, performing no compression, but converting</div><div class='del'>- * to network order.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_encode_fixed_int32 (FILE *out, gint32 value)</div><div class='del'>-{</div><div class='del'>-	guint32 save;</div><div class='del'>-</div><div class='del'>-	save = htonl (value);</div><div class='del'>-	if (fwrite (&amp;save, sizeof (save), 1, out) != 1)</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_decode_fixed_int32:</div><div class='del'>- * @in: file to read from</div><div class='del'>- * @dest: pointer to a variable to store the value in</div><div class='del'>- * </div><div class='del'>- * Retrieve a gint32.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_decode_fixed_int32 (FILE *in, gint32 *dest)</div><div class='del'>-{</div><div class='del'>-	guint32 save;</div><div class='del'>-</div><div class='del'>-	if (fread (&amp;save, sizeof (save), 1, in) == 1) {</div><div class='del'>-		*dest = ntohl (save);</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_encode_time_t:</div><div class='del'>- * @out: file to output to</div><div class='del'>- * @value: value to output</div><div class='del'>- * </div><div class='del'>- * Encode a time_t value to the file.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_encode_time_t(FILE *out, time_t value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = sizeof (time_t) - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (fputc((value &gt;&gt; (i * 8)) &amp; 0xff, out) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_decode_time_t:</div><div class='del'>- * @in: file to read from</div><div class='del'>- * @dest: pointer to a variable to store the value in</div><div class='del'>- * </div><div class='del'>- * Decode a time_t value.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_decode_time_t (FILE *in, time_t *dest)</div><div class='del'>-{</div><div class='del'>-	time_t save = 0;</div><div class='del'>-	int i = sizeof (time_t) - 1;</div><div class='del'>-	int v = EOF;</div><div class='del'>-</div><div class='del'>-        while (i &gt;= 0 &amp;&amp; (v = fgetc (in)) != EOF) {</div><div class='del'>-		save |= ((time_t)v) &lt;&lt; (i * 8);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-	*dest = save;</div><div class='del'>-	if (v == EOF)</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_encode_off_t:</div><div class='del'>- * @out: file to output to</div><div class='del'>- * @value: value to output</div><div class='del'>- * </div><div class='del'>- * Encode an off_t type.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_encode_off_t (FILE *out, off_t value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = sizeof (off_t) - 1; i &gt;= 0; i--) {</div><div class='del'>-		if (fputc ((value &gt;&gt; (i * 8)) &amp; 0xff, out) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_decode_off_t:</div><div class='del'>- * @in: file to read from</div><div class='del'>- * @dest: pointer to a variable to put the value in</div><div class='del'>- * </div><div class='del'>- * Decode an off_t type.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on failure.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_decode_off_t (FILE *in, off_t *dest)</div><div class='del'>-{</div><div class='del'>-	off_t save = 0;</div><div class='del'>-	int i = sizeof(off_t) - 1;</div><div class='del'>-	int v = EOF;</div><div class='del'>-</div><div class='del'>-        while (i &gt;= 0 &amp;&amp; (v = fgetc (in)) != EOF) {</div><div class='del'>-		save |= ((off_t)v) &lt;&lt; (i * 8);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-	*dest = save;</div><div class='del'>-	if (v == EOF)</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_encode_string:</div><div class='del'>- * @out: file to output to</div><div class='del'>- * @str: value to output</div><div class='del'>- * </div><div class='del'>- * Encode a normal string and save it in the output file.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_encode_string (FILE *out, const char *str)</div><div class='del'>-{</div><div class='del'>-	register int len;</div><div class='del'>-</div><div class='del'>-	if (str == NULL)</div><div class='del'>-		return camel_file_util_encode_uint32 (out, 0);</div><div class='del'>-</div><div class='del'>-	len = strlen (str);</div><div class='del'>-	if (camel_file_util_encode_uint32 (out, len+1) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	if (len == 0 || fwrite (str, len, 1, out) == 1)</div><div class='del'>-		return 0;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_file_util_decode_string:</div><div class='del'>- * @in: file to read from</div><div class='del'>- * @str: pointer to a variable to store the value in</div><div class='del'>- * </div><div class='del'>- * Decode a normal string from the input file.</div><div class='del'>- * </div><div class='del'>- * Return value: 0 on success, -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_file_util_decode_string (FILE *in, char **str)</div><div class='del'>-{</div><div class='del'>-	guint32 len;</div><div class='del'>-	register char *ret;</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32 (in, &amp;len) == -1) {</div><div class='del'>-		*str = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	len--;</div><div class='del'>-	if (len &gt; 65536) {</div><div class='del'>-		*str = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = g_malloc (len+1);</div><div class='del'>-	if (len &gt; 0 &amp;&amp; fread (ret, len, 1, in) != 1) {</div><div class='del'>-		g_free (ret);</div><div class='del'>-		*str = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret[len] = 0;</div><div class='del'>-	*str = ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Make a directory heirarchy.</div><div class='del'>-   Always use full paths */</div><div class='del'>-int</div><div class='del'>-camel_file_util_mkdir(const char *path, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	char *copy, *p;</div><div class='del'>-</div><div class='del'>-	g_assert(path &amp;&amp; path[0] == '/');</div><div class='del'>-</div><div class='del'>-	p = copy = alloca(strlen(path)+1);</div><div class='del'>-	strcpy(copy, path);</div><div class='del'>-	do {</div><div class='del'>-		p = strchr(p + 1, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '\0';</div><div class='del'>-		if (access(copy, F_OK) == -1) {</div><div class='del'>-			if (mkdir(copy, mode) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '/';</div><div class='del'>-	} while (p);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_file_util_safe_filename(const char *name)</div><div class='del'>-{</div><div class='del'>-	if (name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return camel_url_encode(name, TRUE, "/?()'*");</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h<br/>deleted file mode 100644<br/>index e261ead16b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-file-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-file-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_FILE_UTILS_H</div><div class='del'>-#define CAMEL_FILE_UTILS_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-int camel_file_util_encode_fixed_int32 (FILE *out, gint32);</div><div class='del'>-int camel_file_util_decode_fixed_int32 (FILE *in, gint32 *);</div><div class='del'>-int camel_file_util_encode_uint32 (FILE *out, guint32);</div><div class='del'>-int camel_file_util_decode_uint32 (FILE *in, guint32 *);</div><div class='del'>-int camel_file_util_encode_time_t (FILE *out, time_t);</div><div class='del'>-int camel_file_util_decode_time_t (FILE *in, time_t *);</div><div class='del'>-int camel_file_util_encode_off_t (FILE *out, off_t);</div><div class='del'>-int camel_file_util_decode_off_t (FILE *in, off_t *);</div><div class='del'>-int camel_file_util_encode_string (FILE *out, const char *);</div><div class='del'>-int camel_file_util_decode_string (FILE *in, char **);</div><div class='del'>-</div><div class='del'>-int camel_file_util_mkdir(const char *path, mode_t mode);</div><div class='del'>-char *camel_file_util_safe_filename(const char *name);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_FILE_UTILS_H */</div><div class='head'>diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c<br/>deleted file mode 100644<br/>index 8df6a0d1b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-filter-driver.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-filter-driver.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1265 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-filter-driver.h"</div><div class='del'>-#include "camel-filter-search.h"</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-#include "e-util/e-msgport.h"	/* for edlist */</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* an invalid pointer */</div><div class='del'>-#define FOLDER_INVALID ((void *)~0)</div><div class='del'>-</div><div class='del'>-/* type of status for a log report */</div><div class='del'>-enum filter_log_t {</div><div class='del'>-	FILTER_LOG_NONE,</div><div class='del'>-	FILTER_LOG_START,       /* start of new log entry */</div><div class='del'>-	FILTER_LOG_ACTION,      /* an action performed */</div><div class='del'>-	FILTER_LOG_END,	        /* end of log */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* list of rule nodes */</div><div class='del'>-struct _filter_rule {</div><div class='del'>-	struct _filter_rule *next;</div><div class='del'>-	struct _filter_rule *prev;</div><div class='del'>-</div><div class='del'>-	char *match;</div><div class='del'>-	char *action;</div><div class='del'>-	char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFilterDriverPrivate {</div><div class='del'>-	GHashTable *globals;       /* global variables */</div><div class='del'>-	</div><div class='del'>-	CamelFolder *defaultfolder;        /* defualt folder */</div><div class='del'>-	</div><div class='del'>-	CamelFilterStatusFunc *statusfunc; /* status callback */</div><div class='del'>-	void *statusdata;                  /* status callback data */</div><div class='del'>-	</div><div class='del'>-	CamelFilterShellExecFunc *execfunc; /* execute shell command callback */</div><div class='del'>-	void *execdata;                     /* execute shell command callback data */</div><div class='del'>-	</div><div class='del'>-	CamelFilterPlaySoundFunc *playfunc; /* play-sound command callback */</div><div class='del'>-	void *playdata;                     /* play-sound command callback data */</div><div class='del'>-	</div><div class='del'>-	CamelFilterSystemBeepFunc *beep;    /* system beep callback */</div><div class='del'>-	void *beepdata;                     /* system beep callback data */</div><div class='del'>-	</div><div class='del'>-	/* for callback */</div><div class='del'>-	CamelFilterGetFolderFunc get_folder;</div><div class='del'>-	void *data;</div><div class='del'>-	</div><div class='del'>-	/* run-time data */</div><div class='del'>-	GHashTable *folders;       /* folders that message has been copied to */</div><div class='del'>-	int closed;		   /* close count */</div><div class='del'>-	GHashTable *forwards;      /* addresses that have been forwarded the message */</div><div class='del'>-	GHashTable *only_once;     /* actions to run only-once */</div><div class='del'>-	</div><div class='del'>-	gboolean terminated;       /* message processing was terminated */</div><div class='del'>-	gboolean deleted;          /* message was marked for deletion */</div><div class='del'>-	gboolean copied;           /* message was copied to some folder or another */</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *message; /* input message */</div><div class='del'>-	CamelMessageInfo *info;    /* message summary info */</div><div class='del'>-	const char *uid;           /* message uid */</div><div class='del'>-	CamelFolder *source;       /* message source folder */</div><div class='del'>-	</div><div class='del'>-	FILE *logfile;             /* log file */</div><div class='del'>-	</div><div class='del'>-	EDList rules;		   /* list of _filter_rule structs */</div><div class='del'>-	</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	</div><div class='del'>-	/* evaluator */</div><div class='del'>-	ESExp *eval;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelFilterDriver *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void camel_filter_driver_class_init (CamelFilterDriverClass *klass);</div><div class='del'>-static void camel_filter_driver_init       (CamelFilterDriver *obj);</div><div class='del'>-static void camel_filter_driver_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static void camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...);</div><div class='del'>-</div><div class='del'>-static CamelFolder *open_folder (CamelFilterDriver *d, const char *folder_url);</div><div class='del'>-static int close_folders (CamelFilterDriver *d);</div><div class='del'>-</div><div class='del'>-static ESExpResult *do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_beep (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *play_sound (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-static ESExpResult *do_only_once (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *);</div><div class='del'>-</div><div class='del'>-/* these are our filter actions - each must have a callback */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "delete",          (ESExpFunc *) do_delete,    0 },</div><div class='del'>-	{ "forward-to",      (ESExpFunc *) mark_forward, 0 },</div><div class='del'>-	{ "copy-to",         (ESExpFunc *) do_copy,      0 },</div><div class='del'>-	{ "move-to",         (ESExpFunc *) do_move,      0 },</div><div class='del'>-	{ "stop",            (ESExpFunc *) do_stop,      0 },</div><div class='del'>-	{ "set-colour",      (ESExpFunc *) do_colour,    0 },</div><div class='del'>-	{ "set-score",       (ESExpFunc *) do_score,     0 },</div><div class='del'>-	{ "set-system-flag", (ESExpFunc *) do_flag,      0 },</div><div class='del'>-	{ "shell-exec",      (ESExpFunc *) shell_exec,   0 },</div><div class='del'>-	{ "beep",            (ESExpFunc *) do_beep,      0 },</div><div class='del'>-	{ "play-sound",      (ESExpFunc *) play_sound,   0 },</div><div class='del'>-	{ "only-once",       (ESExpFunc *) do_only_once, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_filter_driver_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_filter_driver_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		type = camel_type_register (CAMEL_OBJECT_TYPE,</div><div class='del'>-					    "CamelFilterDriver",</div><div class='del'>-					    sizeof (CamelFilterDriver),</div><div class='del'>-					    sizeof (CamelFilterDriverClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_filter_driver_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_filter_driver_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_filter_driver_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_filter_driver_class_init (CamelFilterDriverClass *klass)</div><div class='del'>-{</div><div class='del'>-	/*CamelObjectClass *object_class = (CamelObjectClass *) klass;*/</div><div class='del'>-</div><div class='del'>-	camel_filter_driver_parent = camel_type_get_global_classfuncs(camel_object_get_type());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_filter_driver_init (CamelFilterDriver *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	p = _PRIVATE (obj) = g_malloc0 (sizeof (*p));</div><div class='del'>-</div><div class='del'>-	e_dlist_init(&amp;p-&gt;rules);</div><div class='del'>-</div><div class='del'>-	p-&gt;eval = e_sexp_new ();</div><div class='del'>-	/* Load in builtin symbols */</div><div class='del'>-	for (i = 0; i &lt; sizeof (symbols) / sizeof (symbols[0]); i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction (p-&gt;eval, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, obj);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function (p-&gt;eval, 0, symbols[i].name, symbols[i].func, obj);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p-&gt;globals = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	p-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	p-&gt;only_once = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_hash_strings (void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_filter_driver_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelFilterDriver *driver = (CamelFilterDriver *) obj;</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);	</div><div class='del'>-	struct _filter_rule *node;</div><div class='del'>-</div><div class='del'>-	/* close all folders that were opened for appending */</div><div class='del'>-	close_folders (driver);</div><div class='del'>-	g_hash_table_destroy (p-&gt;folders);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_foreach (p-&gt;globals, free_hash_strings, driver);</div><div class='del'>-	g_hash_table_destroy (p-&gt;globals);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_foreach (p-&gt;only_once, free_hash_strings, driver);</div><div class='del'>-	g_hash_table_destroy (p-&gt;only_once);</div><div class='del'>-	</div><div class='del'>-	e_sexp_unref(p-&gt;eval);</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;defaultfolder) {</div><div class='del'>-		camel_folder_thaw (p-&gt;defaultfolder);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (p-&gt;defaultfolder));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((node = (struct _filter_rule *)e_dlist_remhead(&amp;p-&gt;rules))) {</div><div class='del'>-		g_free(node-&gt;match);</div><div class='del'>-		g_free(node-&gt;action);</div><div class='del'>-		g_free(node-&gt;name);</div><div class='del'>-		g_free(node);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_driver_new:</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelFilterDriver object</div><div class='del'>- **/</div><div class='del'>-CamelFilterDriver *</div><div class='del'>-camel_filter_driver_new (void)</div><div class='del'>-{</div><div class='del'>-	return CAMEL_FILTER_DRIVER (camel_object_new(camel_filter_driver_get_type ()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_folder_func (CamelFilterDriver *d, CamelFilterGetFolderFunc get_folder, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-</div><div class='del'>-	p-&gt;get_folder = get_folder;</div><div class='del'>-	p-&gt;data = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_logfile (CamelFilterDriver *d, FILE *logfile)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	p-&gt;logfile = logfile;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_status_func (CamelFilterDriver *d, CamelFilterStatusFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	p-&gt;statusfunc = func;</div><div class='del'>-	p-&gt;statusdata = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_shell_exec_func (CamelFilterDriver *d, CamelFilterShellExecFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	p-&gt;execfunc = func;</div><div class='del'>-	p-&gt;execdata = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_play_sound_func (CamelFilterDriver *d, CamelFilterPlaySoundFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	p-&gt;playfunc = func;</div><div class='del'>-	p-&gt;playdata = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	p-&gt;beep = func;</div><div class='del'>-	p-&gt;beepdata = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_default_folder (CamelFilterDriver *d, CamelFolder *def)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;defaultfolder) {</div><div class='del'>-		camel_folder_thaw (p-&gt;defaultfolder);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (p-&gt;defaultfolder));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p-&gt;defaultfolder = def;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;defaultfolder) {</div><div class='del'>-		camel_folder_freeze (p-&gt;defaultfolder);</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (p-&gt;defaultfolder));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_add_rule(CamelFilterDriver *d, const char *name, const char *match, const char *action)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	struct _filter_rule *node;</div><div class='del'>-</div><div class='del'>-	node = g_malloc(sizeof(*node));</div><div class='del'>-	node-&gt;match = g_strdup(match);</div><div class='del'>-	node-&gt;action = g_strdup(action);</div><div class='del'>-	node-&gt;name = g_strdup(name);</div><div class='del'>-	e_dlist_addtail(&amp;p-&gt;rules, (EDListNode *)node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_filter_driver_remove_rule_by_name (CamelFilterDriver *d, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	struct _filter_rule *node;</div><div class='del'>-	</div><div class='del'>-	node = (struct _filter_rule *) p-&gt;rules.head;</div><div class='del'>-	while (node-&gt;next) {</div><div class='del'>-		if (!strcmp (node-&gt;name, name)) {</div><div class='del'>-			e_dlist_remove ((EDListNode *) node);</div><div class='del'>-			g_free (node-&gt;match);</div><div class='del'>-			g_free (node-&gt;action);</div><div class='del'>-			g_free (node-&gt;name);</div><div class='del'>-			g_free (node);</div><div class='del'>-			</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-report_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, ...)</div><div class='del'>-{</div><div class='del'>-	/* call user-defined status report function */</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;statusfunc) {</div><div class='del'>-		va_start (ap, desc);</div><div class='del'>-		str = g_strdup_vprintf (desc, ap);</div><div class='del'>-		p-&gt;statusfunc (driver, status, pc, str, p-&gt;statusdata);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_set_global (CamelFilterDriver *d, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (d);</div><div class='del'>-	char *oldkey, *oldvalue;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended (p-&gt;globals, name, (void *)&amp;oldkey, (void *)&amp;oldvalue)) {</div><div class='del'>-		g_free (oldvalue);</div><div class='del'>-		g_hash_table_insert (p-&gt;globals, oldkey, g_strdup (value));</div><div class='del'>-	} else {</div><div class='del'>-		g_hash_table_insert (p-&gt;globals, g_strdup (name), g_strdup (value));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_delete (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "doing delete\n"));</div><div class='del'>-	p-&gt;deleted = TRUE;</div><div class='del'>-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Delete");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-mark_forward (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	/*struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);*/</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "marking message for forwarding\n"));</div><div class='del'>-	/* FIXME: do stuff here */</div><div class='del'>-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Forward");</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_copy (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "copying message...\n"));</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			/* open folders we intent to copy to */</div><div class='del'>-			char *folder = argv[i]-&gt;value.string;</div><div class='del'>-			CamelFolder *outbox;</div><div class='del'>-			</div><div class='del'>-			outbox = open_folder (driver, folder);</div><div class='del'>-			if (!outbox)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (outbox == p-&gt;source)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (p-&gt;uid &amp;&amp; p-&gt;source &amp;&amp; camel_folder_has_summary_capability (p-&gt;source)) {</div><div class='del'>-				GPtrArray *uids;</div><div class='del'>-				</div><div class='del'>-				uids = g_ptr_array_new ();</div><div class='del'>-				g_ptr_array_add (uids, (char *) p-&gt;uid);</div><div class='del'>-				camel_folder_transfer_messages_to (p-&gt;source, uids, outbox, NULL, FALSE, p-&gt;ex);</div><div class='del'>-				g_ptr_array_free (uids, TRUE);</div><div class='del'>-			} else {</div><div class='del'>-				if (p-&gt;message == NULL)</div><div class='del'>-					p-&gt;message = camel_folder_get_message (p-&gt;source, p-&gt;uid, p-&gt;ex);</div><div class='del'>-				</div><div class='del'>-				if (!p-&gt;message) {</div><div class='del'>-					/* FIXME: exception? */</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				camel_folder_append_message (outbox, p-&gt;message, p-&gt;info, NULL, p-&gt;ex);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (!camel_exception_is_set (p-&gt;ex))</div><div class='del'>-					p-&gt;copied = TRUE;</div><div class='del'>-			</div><div class='del'>-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to folder %s",</div><div class='del'>-						 folder);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_move (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "moving message...\n"));</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			/* open folders we intent to move to */</div><div class='del'>-			char *folder = argv[i]-&gt;value.string;</div><div class='del'>-			CamelFolder *outbox;</div><div class='del'>-			</div><div class='del'>-			outbox = open_folder (driver, folder);</div><div class='del'>-			if (!outbox)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (outbox == p-&gt;source)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (p-&gt;uid &amp;&amp; p-&gt;source &amp;&amp; camel_folder_has_summary_capability (p-&gt;source)) {</div><div class='del'>-				GPtrArray *uids;</div><div class='del'>-				</div><div class='del'>-				uids = g_ptr_array_new ();</div><div class='del'>-				g_ptr_array_add (uids, (char *) p-&gt;uid);</div><div class='del'>-				camel_folder_transfer_messages_to (p-&gt;source, uids, outbox, NULL, FALSE, p-&gt;ex);</div><div class='del'>-				g_ptr_array_free (uids, TRUE);</div><div class='del'>-			} else {</div><div class='del'>-				if (p-&gt;message == NULL)</div><div class='del'>-					p-&gt;message = camel_folder_get_message (p-&gt;source, p-&gt;uid, p-&gt;ex);</div><div class='del'>-				</div><div class='del'>-				if (!p-&gt;message) {</div><div class='del'>-					/* FIXME: exception? */</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				camel_folder_append_message (outbox, p-&gt;message, p-&gt;info, NULL, p-&gt;ex);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (!camel_exception_is_set (p-&gt;ex)) {</div><div class='del'>-				/* a 'move' is a copy &amp; delete */</div><div class='del'>-				p-&gt;copied = TRUE;</div><div class='del'>-				p-&gt;deleted = TRUE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Move to folder %s",</div><div class='del'>-						 folder);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_stop (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Stopped processing");</div><div class='del'>-	d(fprintf (stderr, "terminating message processing\n"));</div><div class='del'>-	p-&gt;terminated = TRUE;</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_colour (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "setting colour tag\n"));</div><div class='del'>-	if (argc &gt; 0 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		if (p-&gt;source &amp;&amp; p-&gt;uid &amp;&amp; camel_folder_has_summary_capability (p-&gt;source))</div><div class='del'>-			camel_folder_set_message_user_tag(p-&gt;source, p-&gt;uid, "colour", argv[0]-&gt;value.string);</div><div class='del'>-		else</div><div class='del'>-			camel_tag_set (&amp;p-&gt;info-&gt;user_tags, "colour", argv[0]-&gt;value.string);</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set colour to %s", argv[0]-&gt;value.string);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "setting score tag\n"));</div><div class='del'>-	if (argc &gt; 0 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-		char *value;</div><div class='del'>-		</div><div class='del'>-		value = g_strdup_printf ("%d", argv[0]-&gt;value.number);</div><div class='del'>-		if (p-&gt;source &amp;&amp; p-&gt;uid &amp;&amp; camel_folder_has_summary_capability (p-&gt;source))</div><div class='del'>-			camel_folder_set_message_user_tag(p-&gt;source, p-&gt;uid, "score", value);</div><div class='del'>-		else</div><div class='del'>-			camel_tag_set (&amp;p-&gt;info-&gt;user_tags, "score", value);</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set score to %d", argv[0]-&gt;value.number);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "setting flag\n"));</div><div class='del'>-	if (argc == 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		if (p-&gt;source &amp;&amp; p-&gt;uid &amp;&amp; camel_folder_has_summary_capability (p-&gt;source))</div><div class='del'>-			camel_folder_set_message_flags(p-&gt;source, p-&gt;uid, camel_system_flag(argv[0]-&gt;value.string), ~0);</div><div class='del'>-		else</div><div class='del'>-			p-&gt;info-&gt;flags |= camel_system_flag (argv[0]-&gt;value.string)|CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Set %s flag", argv[0]-&gt;value.string);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "executing shell command\n"));</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;execfunc &amp;&amp; argc == 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		p-&gt;execfunc (driver, argv[0]-&gt;value.string, p-&gt;execdata);</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Executing shell command: [%s]",</div><div class='del'>-					 argv[0]-&gt;value.string);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_beep (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "beep\n"));</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;beep) {</div><div class='del'>-		p-&gt;beep (driver, p-&gt;beepdata);</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Beep");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-play_sound (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "play sound\n"));</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;playfunc &amp;&amp; argc == 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		p-&gt;playfunc (driver, argv[0]-&gt;value.string, p-&gt;playdata);</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Play sound");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-do_only_once (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "only once\n"));</div><div class='del'>-	</div><div class='del'>-	if (argc == 2 &amp;&amp; !g_hash_table_lookup (p-&gt;only_once, argv[0]-&gt;value.string))</div><div class='del'>-		g_hash_table_insert (p-&gt;only_once, g_strdup (argv[0]-&gt;value.string),</div><div class='del'>-				     g_strdup (argv[1]-&gt;value.string));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-open_folder (CamelFilterDriver *driver, const char *folder_url)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	CamelFolder *camelfolder;</div><div class='del'>-	CamelException ex;</div><div class='del'>-	</div><div class='del'>-	/* we have a lookup table of currently open folders */</div><div class='del'>-	camelfolder = g_hash_table_lookup (p-&gt;folders, folder_url);</div><div class='del'>-	if (camelfolder)</div><div class='del'>-		return camelfolder == FOLDER_INVALID?NULL:camelfolder;</div><div class='del'>-	</div><div class='del'>-	camel_exception_init (&amp;ex);</div><div class='del'>-	camelfolder = p-&gt;get_folder (driver, folder_url, p-&gt;data, &amp;ex);</div><div class='del'>-	camel_exception_clear (&amp;ex);</div><div class='del'>-	</div><div class='del'>-	if (camelfolder) {</div><div class='del'>-		g_hash_table_insert (p-&gt;folders, g_strdup (folder_url), camelfolder);</div><div class='del'>-		camel_folder_freeze (camelfolder);</div><div class='del'>-	} else {</div><div class='del'>-		g_hash_table_insert (p-&gt;folders, g_strdup (folder_url), FOLDER_INVALID);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camelfolder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_folder (void *key, void *value, void *data)</div><div class='del'>-{	</div><div class='del'>-	CamelFolder *folder = value;</div><div class='del'>-	CamelFilterDriver *driver = data;</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-</div><div class='del'>-	p-&gt;closed++;</div><div class='del'>-	g_free (key);</div><div class='del'>-</div><div class='del'>-	if (folder != FOLDER_INVALID) {</div><div class='del'>-		camel_folder_sync (folder, FALSE, p-&gt;ex);</div><div class='del'>-		camel_folder_thaw (folder);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, g_hash_table_size(p-&gt;folders)* 100 / p-&gt;closed, _("Syncing folders"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* flush/close all folders */</div><div class='del'>-static int</div><div class='del'>-close_folders (CamelFilterDriver *driver)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-</div><div class='del'>-	report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 0, _("Syncing folders"));</div><div class='del'>-</div><div class='del'>-	p-&gt;closed = 0;</div><div class='del'>-	g_hash_table_foreach (p-&gt;folders, close_folder, driver);</div><div class='del'>-	g_hash_table_destroy (p-&gt;folders);</div><div class='del'>-	p-&gt;folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: status from driver */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-free_key (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_filter_driver_log (CamelFilterDriver *driver, enum filter_log_t status, const char *desc, ...)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;logfile) {</div><div class='del'>-		char *str = NULL;</div><div class='del'>-		</div><div class='del'>-		if (desc) {</div><div class='del'>-			va_list ap;</div><div class='del'>-			</div><div class='del'>-			va_start (ap, desc);</div><div class='del'>-			str = g_strdup_vprintf (desc, ap);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		switch (status) {</div><div class='del'>-		case FILTER_LOG_START: {</div><div class='del'>-			/* write log header */</div><div class='del'>-			const char *subject = NULL;</div><div class='del'>-			char *fromstr;</div><div class='del'>-			const CamelInternetAddress *from;</div><div class='del'>-			char date[50];</div><div class='del'>-			time_t t;</div><div class='del'>-			</div><div class='del'>-			/* FIXME: does this need locking?  Probably */</div><div class='del'>-			</div><div class='del'>-			/* FIXME: use info for these, not message since message may not be loaded */</div><div class='del'>-			from = camel_mime_message_get_from (p-&gt;message);</div><div class='del'>-			fromstr = camel_address_format((CamelAddress *)from);</div><div class='del'>-			subject = camel_mime_message_get_subject (p-&gt;message);</div><div class='del'>-			</div><div class='del'>-			time (&amp;t);</div><div class='del'>-			strftime (date, 49, "%a, %d %b %Y %H:%M:%S", localtime (&amp;t));</div><div class='del'>-			fprintf (p-&gt;logfile, "Applied filter \"%s\" to message from %s - \"%s\" at %s\n",</div><div class='del'>-				 str, fromstr ? fromstr : "unknown", subject ? subject : "", date);</div><div class='del'>-			g_free(fromstr);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		case FILTER_LOG_ACTION:</div><div class='del'>-			fprintf (p-&gt;logfile, "Action: %s\n", str);</div><div class='del'>-			break;</div><div class='del'>-		case FILTER_LOG_END:</div><div class='del'>-			fprintf (p-&gt;logfile, "\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* nothing else is loggable */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _run_only_once {</div><div class='del'>-	CamelFilterDriver *driver;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-run_only_once (gpointer key, char *action, struct _run_only_once *data)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (data-&gt;driver);</div><div class='del'>-	CamelException *ex = data-&gt;ex;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	printf ("evaluating: %s\n\n", action);</div><div class='del'>-	</div><div class='del'>-	e_sexp_input_text (p-&gt;eval, action, strlen (action));</div><div class='del'>-	if (e_sexp_parse (p-&gt;eval) == -1) {</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Error parsing filter: %s: %s"),</div><div class='del'>-					      e_sexp_error (p-&gt;eval), action);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_eval (p-&gt;eval);</div><div class='del'>-	if (r == NULL) {</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Error executing filter: %s: %s"),</div><div class='del'>-					      e_sexp_error (p-&gt;eval), action);</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_sexp_result_free (p-&gt;eval, r);</div><div class='del'>-	</div><div class='del'>- done:</div><div class='del'>-	</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (action);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_driver_flush:</div><div class='del'>- * @driver:</div><div class='del'>- * @ex:</div><div class='del'>- *</div><div class='del'>- * Flush all of the only-once filter actions.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_filter_driver_flush (CamelFilterDriver *driver, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	struct _run_only_once data;</div><div class='del'>-	</div><div class='del'>-	if (!p-&gt;only_once)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	data.driver = driver;</div><div class='del'>-	data.ex = ex;</div><div class='del'>-	</div><div class='del'>-	g_hash_table_foreach_remove (p-&gt;only_once, (GHRFunc) run_only_once, &amp;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_driver_filter_mbox:</div><div class='del'>- * @driver: CamelFilterDriver</div><div class='del'>- * @mbox: mbox filename to be filtered</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Filters an mbox file based on rules defined in the FilterDriver</div><div class='del'>- * object. Is more efficient as it doesn't need to open the folder</div><div class='del'>- * through Camel directly.</div><div class='del'>- *</div><div class='del'>- * Returns -1 if errors were encountered during filtering,</div><div class='del'>- * otherwise returns 0.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_filter_driver_filter_mbox (CamelFilterDriver *driver, const char *mbox, const char *original_source_url, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	CamelMimeParser *mp = NULL;</div><div class='del'>-	char *source_url = NULL;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	int i = 0;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int status;</div><div class='del'>-	off_t last = 0;</div><div class='del'>-	int ret = -1;</div><div class='del'>-	</div><div class='del'>-	fd = open (mbox, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Unable to open spool folder"));</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	/* to get the filesize */</div><div class='del'>-	fstat (fd, &amp;st);</div><div class='del'>-	</div><div class='del'>-	mp = camel_mime_parser_new ();</div><div class='del'>-	camel_mime_parser_scan_from (mp, TRUE);</div><div class='del'>-	if (camel_mime_parser_init_with_fd (mp, fd) == -1) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Unable to process spool folder"));</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	fd = -1;</div><div class='del'>-	</div><div class='del'>-	source_url = g_strdup_printf ("file://%s", mbox);</div><div class='del'>-	</div><div class='del'>-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-		CamelMimeMessage *msg;</div><div class='del'>-		int pc = 0;</div><div class='del'>-		</div><div class='del'>-		if (st.st_size &gt; 0)</div><div class='del'>-			pc = (int)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size));</div><div class='del'>-		</div><div class='del'>-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d (%d%%)"), i, pc);</div><div class='del'>-		</div><div class='del'>-		msg = camel_mime_message_new ();</div><div class='del'>-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (msg), mp) == -1) {</div><div class='del'>-			camel_exception_set (ex, (errno==EINTR)?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_SYSTEM, _("Cannot open message"));</div><div class='del'>-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		info = camel_message_info_new_from_header(((CamelMimePart *)msg)-&gt;headers);</div><div class='del'>-		info-&gt;size = camel_mime_parser_tell(mp) - last;</div><div class='del'>-		last = camel_mime_parser_tell(mp);</div><div class='del'>-		status = camel_filter_driver_filter_message (driver, msg, info, NULL, NULL, source_url, </div><div class='del'>-							     original_source_url ? original_source_url : source_url, ex);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-		if (camel_exception_is_set (ex) || status == -1) {</div><div class='del'>-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d"), i);</div><div class='del'>-			camel_message_info_free (info);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		i++;</div><div class='del'>-		</div><div class='del'>-		/* skip over the FROM_END state */</div><div class='del'>-		camel_mime_parser_step (mp, 0, 0);</div><div class='del'>-</div><div class='del'>-		camel_message_info_free (info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;defaultfolder) {</div><div class='del'>-		report_status(driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));</div><div class='del'>-		camel_folder_sync(p-&gt;defaultfolder, FALSE, camel_exception_is_set (ex) ? NULL : ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-fail:</div><div class='del'>-	g_free (source_url);</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close (fd);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (mp));</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_driver_filter_folder:</div><div class='del'>- * @driver: CamelFilterDriver</div><div class='del'>- * @folder: CamelFolder to be filtered</div><div class='del'>- * @cache: UID cache (needed for POP folders)</div><div class='del'>- * @uids: message uids to be filtered or NULL (as a shortcut to filter all messages)</div><div class='del'>- * @remove: TRUE to mark filtered messages as deleted</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Filters a folder based on rules defined in the FilterDriver</div><div class='del'>- * object.</div><div class='del'>- *</div><div class='del'>- * Returns -1 if errors were encountered during filtering,</div><div class='del'>- * otherwise returns 0.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_filter_driver_filter_folder (CamelFilterDriver *driver, CamelFolder *folder, CamelUIDCache *cache,</div><div class='del'>-				   GPtrArray *uids, gboolean remove, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	gboolean freeuids = FALSE;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *source_url, *service_url;</div><div class='del'>-	const char *folder_name;</div><div class='del'>-	int status = 0;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	service_url = camel_service_get_url (CAMEL_SERVICE (camel_folder_get_parent_store (folder)));</div><div class='del'>-	url = camel_url_new (service_url, NULL);</div><div class='del'>-	g_free (service_url);</div><div class='del'>-	</div><div class='del'>-	folder_name = camel_folder_get_full_name (folder);</div><div class='del'>-	</div><div class='del'>-	if (folder_name &amp;&amp; *folder_name != '/') {</div><div class='del'>-		char *path;</div><div class='del'>-		</div><div class='del'>-		path = g_strdup_printf ("/%s", folder_name);</div><div class='del'>-		camel_url_set_path (url, path);</div><div class='del'>-		g_free (path);</div><div class='del'>-	} else {</div><div class='del'>-		camel_url_set_path (url, folder_name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	source_url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-	camel_url_free (url);</div><div class='del'>-	</div><div class='del'>-	if (uids == NULL) {</div><div class='del'>-		uids = camel_folder_get_uids (folder);</div><div class='del'>-		freeuids = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		int pc = (100 * i)/uids-&gt;len;</div><div class='del'>-		</div><div class='del'>-		report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d of %d"), i+1,</div><div class='del'>-			       uids-&gt;len);</div><div class='del'>-		</div><div class='del'>-		if (camel_folder_has_summary_capability (folder))</div><div class='del'>-			info = camel_folder_get_message_info (folder, uids-&gt;pdata[i]);</div><div class='del'>-		else</div><div class='del'>-			info = NULL;</div><div class='del'>-		</div><div class='del'>-		status = camel_filter_driver_filter_message (driver, NULL, info, uids-&gt;pdata[i],</div><div class='del'>-							     folder, source_url, source_url, ex);</div><div class='del'>-		</div><div class='del'>-		if (camel_folder_has_summary_capability (folder))</div><div class='del'>-			camel_folder_free_message_info (folder, info);</div><div class='del'>-		</div><div class='del'>-		if (camel_exception_is_set (ex) || status == -1) {</div><div class='del'>-			report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Failed at message %d of %d"),</div><div class='del'>-				       i+1, uids-&gt;len);</div><div class='del'>-			status = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (remove)</div><div class='del'>-			camel_folder_set_message_flags (folder, uids-&gt;pdata[i],</div><div class='del'>-							CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_SEEN, ~0);</div><div class='del'>-		</div><div class='del'>-		if (cache)</div><div class='del'>-			camel_uid_cache_save_uid (cache, uids-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (freeuids)</div><div class='del'>-		camel_folder_free_uids (folder, uids);</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;defaultfolder) {</div><div class='del'>-		report_status (driver, CAMEL_FILTER_STATUS_PROGRESS, 100, _("Syncing folder"));</div><div class='del'>-		camel_folder_sync (p-&gt;defaultfolder, FALSE, camel_exception_is_set (ex) ? NULL : ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (i == uids-&gt;len)</div><div class='del'>-		report_status (driver, CAMEL_FILTER_STATUS_END, 100, _("Complete"));</div><div class='del'>-	</div><div class='del'>-	g_free (source_url);</div><div class='del'>-	</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _get_message {</div><div class='del'>-	struct _CamelFilterDriverPrivate *p;</div><div class='del'>-	const char *source_url;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message_cb (void *data, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _get_message *msgdata = data;</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = msgdata-&gt;p;</div><div class='del'>-	const char *source_url = msgdata-&gt;source_url;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;message) {</div><div class='del'>-		message = p-&gt;message;</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-	} else {</div><div class='del'>-		const char *uid;</div><div class='del'>-		</div><div class='del'>-		if (p-&gt;uid)</div><div class='del'>-			uid = p-&gt;uid;</div><div class='del'>-		else</div><div class='del'>-			uid = camel_message_info_uid (p-&gt;info);</div><div class='del'>-		</div><div class='del'>-		message = camel_folder_get_message (p-&gt;source, uid, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (source_url &amp;&amp; camel_mime_message_get_source (message) == NULL)</div><div class='del'>-		camel_mime_message_set_source (message, source_url);</div><div class='del'>-	</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_driver_filter_message:</div><div class='del'>- * @driver: CamelFilterDriver</div><div class='del'>- * @message: message to filter or NULL</div><div class='del'>- * @info: message info or NULL</div><div class='del'>- * @uid: message uid or NULL</div><div class='del'>- * @source: source folder or NULL</div><div class='del'>- * @source_url: url of source folder or NULL</div><div class='del'>- * @original_source_url: url of original source folder (pre-movemail) or NULL</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Filters a message based on rules defined in the FilterDriver</div><div class='del'>- * object. If the source folder (@source) and the uid (@uid) are</div><div class='del'>- * provided, the filter will operate on the CamelFolder (which in</div><div class='del'>- * certain cases is more efficient than using the default</div><div class='del'>- * camel_folder_append_message() function).</div><div class='del'>- *</div><div class='del'>- * Returns -1 if errors were encountered during filtering,</div><div class='del'>- * otherwise returns 0.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_filter_driver_filter_message (CamelFilterDriver *driver, CamelMimeMessage *message,</div><div class='del'>-				    CamelMessageInfo *info, const char *uid,</div><div class='del'>-				    CamelFolder *source, const char *source_url,</div><div class='del'>-				    const char *original_source_url,</div><div class='del'>-				    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFilterDriverPrivate *p = _PRIVATE (driver);</div><div class='del'>-	struct _filter_rule *node;</div><div class='del'>-	gboolean freeinfo = FALSE;</div><div class='del'>-	gboolean filtered = FALSE;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int result;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: make me into a g_return_if_fail/g_assert or whatever... */</div><div class='del'>-	if (message == NULL &amp;&amp; (source == NULL || uid == NULL)) {</div><div class='del'>-		g_warning ("there is no way to fetch the message using the information provided...");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		struct _header_raw *h;</div><div class='del'>-		</div><div class='del'>-		if (message) {</div><div class='del'>-			camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-		} else {</div><div class='del'>-			message = camel_folder_get_message (source, uid, ex);</div><div class='del'>-			if (!message)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		h = CAMEL_MIME_PART (message)-&gt;headers;</div><div class='del'>-		info = camel_message_info_new_from_header (h);</div><div class='del'>-		freeinfo = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		if (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)</div><div class='del'>-			return 0;</div><div class='del'>-		</div><div class='del'>-		uid = camel_message_info_uid (info);</div><div class='del'>-		</div><div class='del'>-		if (message)</div><div class='del'>-			camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p-&gt;ex = ex;</div><div class='del'>-	p-&gt;terminated = FALSE;</div><div class='del'>-	p-&gt;deleted = FALSE;</div><div class='del'>-	p-&gt;copied = FALSE;</div><div class='del'>-	p-&gt;message = message;</div><div class='del'>-	p-&gt;info = info;</div><div class='del'>-	p-&gt;uid = uid;</div><div class='del'>-	p-&gt;source = source;</div><div class='del'>-	</div><div class='del'>-	if (message &amp;&amp; original_source_url &amp;&amp; camel_mime_message_get_source (message) == NULL)</div><div class='del'>-		camel_mime_message_set_source (message, original_source_url);</div><div class='del'>-	</div><div class='del'>-	node = (struct _filter_rule *) p-&gt;rules.head;</div><div class='del'>-	result = CAMEL_SEARCH_NOMATCH;</div><div class='del'>-	while (node-&gt;next &amp;&amp; !p-&gt;terminated) {</div><div class='del'>-		struct _get_message data;</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "applying rule %s\naction %s\n", node-&gt;match, node-&gt;action));</div><div class='del'>-		</div><div class='del'>-		data.p = p;</div><div class='del'>-		data.source_url = original_source_url;</div><div class='del'>-		</div><div class='del'>-		result = camel_filter_search_match (get_message_cb, &amp;data, p-&gt;info, </div><div class='del'>-						    original_source_url ? original_source_url : source_url,</div><div class='del'>-						    node-&gt;match, p-&gt;ex);</div><div class='del'>-		</div><div class='del'>-		switch (result) {</div><div class='del'>-		case CAMEL_SEARCH_ERROR:</div><div class='del'>-			goto error;</div><div class='del'>-		case CAMEL_SEARCH_MATCHED:</div><div class='del'>-			filtered = TRUE;</div><div class='del'>-			camel_filter_driver_log (driver, FILTER_LOG_START, node-&gt;name);</div><div class='del'>-			</div><div class='del'>-			/* perform necessary filtering actions */</div><div class='del'>-			e_sexp_input_text (p-&gt;eval, node-&gt;action, strlen (node-&gt;action));</div><div class='del'>-			if (e_sexp_parse (p-&gt;eval) == -1) {</div><div class='del'>-				camel_exception_setv (ex, 1, _("Error parsing filter: %s: %s"),</div><div class='del'>-						      e_sexp_error (p-&gt;eval), node-&gt;action);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_eval (p-&gt;eval);</div><div class='del'>-			if (r == NULL) {</div><div class='del'>-				camel_exception_setv (ex, 1, _("Error executing filter: %s: %s"),</div><div class='del'>-						      e_sexp_error (p-&gt;eval), node-&gt;action);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			e_sexp_result_free (p-&gt;eval, r);</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* *Now* we can set the DELETED flag... */</div><div class='del'>-	if (p-&gt;deleted) {</div><div class='del'>-		if (p-&gt;source &amp;&amp; p-&gt;uid &amp;&amp; camel_folder_has_summary_capability (p-&gt;source))</div><div class='del'>-			camel_folder_set_message_flags(p-&gt;source, p-&gt;uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);</div><div class='del'>-		else</div><div class='del'>-			info-&gt;flags |= CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN|CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Logic: if !Moved and there exists a default folder... */</div><div class='del'>-	if (!(p-&gt;copied &amp;&amp; p-&gt;deleted) &amp;&amp; p-&gt;defaultfolder) {</div><div class='del'>-		/* copy it to the default inbox */</div><div class='del'>-		filtered = TRUE;</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder");</div><div class='del'>-		if (p-&gt;uid &amp;&amp; p-&gt;source &amp;&amp; camel_folder_has_summary_capability (p-&gt;source)) {</div><div class='del'>-			GPtrArray *uids;</div><div class='del'>-			</div><div class='del'>-			uids = g_ptr_array_new ();</div><div class='del'>-			g_ptr_array_add (uids, (char *) p-&gt;uid);</div><div class='del'>-			camel_folder_transfer_messages_to (p-&gt;source, uids, p-&gt;defaultfolder, NULL, FALSE, p-&gt;ex);</div><div class='del'>-			g_ptr_array_free (uids, TRUE);</div><div class='del'>-		} else {</div><div class='del'>-			if (p-&gt;message == NULL) {</div><div class='del'>-				p-&gt;message = camel_folder_get_message (source, uid, ex);</div><div class='del'>-				if (!p-&gt;message)</div><div class='del'>-					goto error;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_folder_append_message (p-&gt;defaultfolder, p-&gt;message, p-&gt;info, NULL, p-&gt;ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;message)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (p-&gt;message));</div><div class='del'>-	</div><div class='del'>-	if (freeinfo)</div><div class='del'>-		camel_message_info_free (info);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- error:</div><div class='del'>-	if (filtered)</div><div class='del'>-		camel_filter_driver_log (driver, FILTER_LOG_END, NULL);</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;message)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (p-&gt;message));</div><div class='del'>-	</div><div class='del'>-	if (freeinfo)</div><div class='del'>-		camel_message_info_free (info);</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h<br/>deleted file mode 100644<br/>index 3f86a47a33..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-filter-driver.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-filter-driver.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_FILTER_DRIVER_H</div><div class='del'>-#define _CAMEL_FILTER_DRIVER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-uid-cache.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FILTER_DRIVER_TYPE   (camel_filter_driver_get_type())</div><div class='del'>-#define CAMEL_FILTER_DRIVER(obj)         CAMEL_CHECK_CAST (obj, camel_filter_driver_get_type (), CamelFilterDriver)</div><div class='del'>-#define CAMEL_FILTER_DRIVER_CLASS(klass) CAMEL__CHECK_CLASS_CAST (klass, camel_filter_driver_get_type (), CamelFilterDriverClass)</div><div class='del'>-#define CAMEL_IS_FILTER_DRIVER(obj)      CAMEL_CHECK_TYPE (obj, camel_filter_driver_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFilterDriverClass CamelFilterDriverClass;</div><div class='del'>-</div><div class='del'>-struct _CamelFilterDriver {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelFilterDriverPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFilterDriverClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* FIXME: this maybe should change... */</div><div class='del'>-/* type of status for a status report */</div><div class='del'>-enum camel_filter_status_t {</div><div class='del'>-	CAMEL_FILTER_STATUS_NONE,</div><div class='del'>-	CAMEL_FILTER_STATUS_START,	/* start of new message processed */</div><div class='del'>-	CAMEL_FILTER_STATUS_ACTION,	/* an action performed */</div><div class='del'>-	CAMEL_FILTER_STATUS_PROGRESS,	/* (an) extra update(s), if its taking longer to process */</div><div class='del'>-	CAMEL_FILTER_STATUS_END,	/* end of message */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef CamelFolder * (*CamelFilterGetFolderFunc) (CamelFilterDriver *driver, const char *uri,</div><div class='del'>-						   void *data, CamelException *ex);</div><div class='del'>-/* report status */</div><div class='del'>-typedef void (CamelFilterStatusFunc) (CamelFilterDriver *driver, enum camel_filter_status_t status,</div><div class='del'>-				      int pc, const char *desc, void *data);</div><div class='del'>-</div><div class='del'>-typedef void (CamelFilterShellExecFunc)  (CamelFilterDriver *driver, const char *command, void *data);</div><div class='del'>-typedef void (CamelFilterPlaySoundFunc)  (CamelFilterDriver *driver, const char *filename, void *data);</div><div class='del'>-typedef void (CamelFilterSystemBeepFunc) (CamelFilterDriver *driver, void *data);</div><div class='del'>-</div><div class='del'>-CamelType          camel_filter_driver_get_type (void);</div><div class='del'>-CamelFilterDriver  *camel_filter_driver_new     (void);</div><div class='del'>-</div><div class='del'>-/* modifiers */</div><div class='del'>-void camel_filter_driver_set_logfile          (CamelFilterDriver *d, FILE *logfile);</div><div class='del'>-</div><div class='del'>-void camel_filter_driver_set_status_func      (CamelFilterDriver *d, CamelFilterStatusFunc *func, void *data);</div><div class='del'>-void camel_filter_driver_set_shell_exec_func  (CamelFilterDriver *d, CamelFilterShellExecFunc *func, void *data);</div><div class='del'>-void camel_filter_driver_set_play_sound_func  (CamelFilterDriver *d, CamelFilterPlaySoundFunc *func, void *data);</div><div class='del'>-void camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc *func, void *data);</div><div class='del'>-void camel_filter_driver_set_folder_func      (CamelFilterDriver *d, CamelFilterGetFolderFunc fetcher, void *data);</div><div class='del'>-</div><div class='del'>-void camel_filter_driver_set_default_folder   (CamelFilterDriver *d, CamelFolder *def);</div><div class='del'>-</div><div class='del'>-void camel_filter_driver_add_rule             (CamelFilterDriver *d, const char *name, const char *match,</div><div class='del'>-					       const char *action);</div><div class='del'>-int  camel_filter_driver_remove_rule_by_name  (CamelFilterDriver *d, const char *name);</div><div class='del'>-</div><div class='del'>-/*void camel_filter_driver_set_global(CamelFilterDriver *, const char *name, const char *value);*/</div><div class='del'>-</div><div class='del'>-void camel_filter_driver_flush                (CamelFilterDriver *driver, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int  camel_filter_driver_filter_message       (CamelFilterDriver *driver, CamelMimeMessage *message,</div><div class='del'>-					       CamelMessageInfo *info, const char *uri,</div><div class='del'>-					       CamelFolder *source, const char *source_url,</div><div class='del'>-					       const char *original_source_url, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int  camel_filter_driver_filter_mbox          (CamelFilterDriver *driver, const char *mbox,</div><div class='del'>-					       const char *original_source_url, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int  camel_filter_driver_filter_folder        (CamelFilterDriver *driver, CamelFolder *folder, CamelUIDCache *cache,</div><div class='del'>-					       GPtrArray *uids, gboolean remove, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* generate the search query/action string for a filter option */</div><div class='del'>-void camel_filter_driver_expand_option (CamelFilterDriver *d, GString *s, GString *action, struct filter_option *op);</div><div class='del'>-</div><div class='del'>-/* get info about rules (options) */</div><div class='del'>-int camel_filter_driver_rule_count (CamelFilterDriver *d);</div><div class='del'>-struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_FILTER_DRIVER_H */</div><div class='head'>diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c<br/>deleted file mode 100644<br/>index 02362b7e2b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-filter-search.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-filter-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,699 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *	     Michael Zucchi &lt;NotZed@Ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *  Copyright 2001 Ximian Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* (from glibc headers:</div><div class='del'>-   POSIX says that &lt;sys/types.h&gt; must be included (by the caller) before &lt;regex.h&gt;.  */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-filter-search.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-search-private.h"</div><div class='del'>-</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFilterSearchGetMessageFunc get_message;</div><div class='del'>-	void *get_message_data;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	const char *source;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-} FilterMessageSearch;</div><div class='del'>-</div><div class='del'>-/* ESExp callbacks */</div><div class='del'>-static ESExpResult *header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-static ESExpResult *shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms);</div><div class='del'>-</div><div class='del'>-/* builtin functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "match-all",          (ESExpFunc *) match_all,          1 },</div><div class='del'>-	{ "body-contains",      (ESExpFunc *) body_contains,      0 },</div><div class='del'>-	{ "body-regex",         (ESExpFunc *) body_regex,         0 },</div><div class='del'>-	{ "header-contains",    (ESExpFunc *) header_contains,    0 },</div><div class='del'>-	{ "header-matches",     (ESExpFunc *) header_matches,     0 },</div><div class='del'>-	{ "header-starts-with", (ESExpFunc *) header_starts_with, 0 },</div><div class='del'>-	{ "header-ends-with",   (ESExpFunc *) header_ends_with,   0 },</div><div class='del'>-	{ "header-exists",      (ESExpFunc *) header_exists,      0 },</div><div class='del'>-	{ "header-soundex",     (ESExpFunc *) header_soundex,     0 },</div><div class='del'>-	{ "header-regex",       (ESExpFunc *) header_regex,       0 },</div><div class='del'>-	{ "header-full-regex",  (ESExpFunc *) header_full_regex,  0 },</div><div class='del'>-	{ "user-tag",           (ESExpFunc *) user_tag,           0 },</div><div class='del'>-	{ "user-flag",          (ESExpFunc *) user_flag,          0 },</div><div class='del'>-	{ "system-flag",        (ESExpFunc *) system_flag,        0 },</div><div class='del'>-	{ "get-sent-date",      (ESExpFunc *) get_sent_date,      0 },</div><div class='del'>-	{ "get-received-date",  (ESExpFunc *) get_received_date,  0 },</div><div class='del'>-	{ "get-current-date",   (ESExpFunc *) get_current_date,   0 },</div><div class='del'>-	{ "get-score",          (ESExpFunc *) get_score,          0 },</div><div class='del'>-	{ "get-source",         (ESExpFunc *) get_source,         0 },</div><div class='del'>-	{ "get-size",           (ESExpFunc *) get_size,           0 },</div><div class='del'>-	{ "shell-exec",         (ESExpFunc *) shell_exec,         0 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-camel_filter_search_get_message (FilterMessageSearch *fms, struct _ESExp *sexp)</div><div class='del'>-{</div><div class='del'>-	if (fms-&gt;message)</div><div class='del'>-		return fms-&gt;message;</div><div class='del'>-	</div><div class='del'>-	fms-&gt;message = fms-&gt;get_message (fms-&gt;get_message_data, fms-&gt;ex);</div><div class='del'>-	</div><div class='del'>-	if (fms-&gt;message == NULL)</div><div class='del'>-		e_sexp_fatal_error (sexp, _("Failed to retrieve message"));</div><div class='del'>-	</div><div class='del'>-	return fms-&gt;message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-check_header (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms, camel_search_match_t how)</div><div class='del'>-{</div><div class='del'>-	gboolean matched = FALSE;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (argc &gt; 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *name = argv[0]-&gt;value.string;</div><div class='del'>-		const char *header;</div><div class='del'>-		camel_search_t type = CAMEL_SEARCH_TYPE_ENCODED;</div><div class='del'>-		CamelContentType *ct;</div><div class='del'>-		const char *charset = NULL;</div><div class='del'>-		</div><div class='del'>-		if (strcasecmp(name, "x-camel-mlist") == 0) {</div><div class='del'>-			header = camel_message_info_mlist(fms-&gt;info);</div><div class='del'>-			type = CAMEL_SEARCH_TYPE_MLIST;</div><div class='del'>-		} else {</div><div class='del'>-			CamelMimeMessage *message = camel_filter_search_get_message (fms, f);</div><div class='del'>-			</div><div class='del'>-			header = camel_medium_get_header (CAMEL_MEDIUM (message), argv[0]-&gt;value.string);</div><div class='del'>-			/* FIXME: what about Resent-To, Resent-Cc and Resent-From? */</div><div class='del'>-			if (strcasecmp("to", name) == 0 || strcasecmp("cc", name) == 0 || strcasecmp("from", name) == 0)</div><div class='del'>-				type = CAMEL_SEARCH_TYPE_ADDRESS_ENCODED;</div><div class='del'>-			else {</div><div class='del'>-				ct = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));</div><div class='del'>-				if (ct)</div><div class='del'>-					charset = e_iconv_charset_name(header_content_type_param(ct, "charset"));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (header) {</div><div class='del'>-			for (i=1; i&lt;argc &amp;&amp; !matched; i++) {</div><div class='del'>-				if (argv[i]-&gt;type == ESEXP_RES_STRING)</div><div class='del'>-					matched = camel_search_header_match(header, argv[i]-&gt;value.string, how, type, charset);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = matched;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_CONTAINS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_matches (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_EXACT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_STARTS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_ENDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_soundex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	return check_header (f, argc, argv, fms, CAMEL_SEARCH_MATCH_SOUNDEX);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	gboolean matched = FALSE;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	message = camel_filter_search_get_message (fms, f);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; argc &amp;&amp; !matched; i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING)</div><div class='del'>-			matched = camel_medium_get_header (CAMEL_MEDIUM (message), argv[i]-&gt;value.string) != NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = matched;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	regex_t pattern;</div><div class='del'>-	const char *contents;</div><div class='del'>-	</div><div class='del'>-	message = camel_filter_search_get_message (fms, f);</div><div class='del'>-	</div><div class='del'>-	if (argc &gt; 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-	    &amp;&amp; (contents = camel_medium_get_header (CAMEL_MEDIUM (message), argv[0]-&gt;value.string))</div><div class='del'>-	    &amp;&amp; camel_search_build_match_regex(&amp;pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE, argc-1, argv+1, fms-&gt;ex) == 0) {</div><div class='del'>-		r-&gt;value.bool = regexec (&amp;pattern, contents, 0, NULL, 0) == 0;</div><div class='del'>-		regfree (&amp;pattern);</div><div class='del'>-	} else</div><div class='del'>-		r-&gt;value.bool = FALSE;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-get_full_header (CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mp = CAMEL_MIME_PART (message);</div><div class='del'>-	GString *str = g_string_new ("");</div><div class='del'>-	char   *ret;</div><div class='del'>-	struct _header_raw *h;</div><div class='del'>-	</div><div class='del'>-	for (h = mp-&gt;headers; h; h = h-&gt;next) {</div><div class='del'>-		if (h-&gt;value != NULL) {</div><div class='del'>-			g_string_append (str, h-&gt;name);</div><div class='del'>-			if (isspace (h-&gt;value[0]))</div><div class='del'>-				g_string_append (str, ":");</div><div class='del'>-			else</div><div class='del'>-				g_string_append (str, ": ");</div><div class='del'>-			g_string_append (str, h-&gt;value);</div><div class='del'>-			g_string_append_c(str, '\n');</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = str-&gt;str;</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-header_full_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	regex_t pattern;</div><div class='del'>-	char *contents;</div><div class='del'>-	</div><div class='del'>-	if (camel_search_build_match_regex(&amp;pattern, CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_NEWLINE,</div><div class='del'>-					   argc, argv, fms-&gt;ex) == 0) {</div><div class='del'>-		message = camel_filter_search_get_message (fms, f);</div><div class='del'>-		contents = get_full_header (message);</div><div class='del'>-		r-&gt;value.bool = regexec (&amp;pattern, contents, 0, NULL, 0) == 0;</div><div class='del'>-		g_free (contents);</div><div class='del'>-		regfree (&amp;pattern);</div><div class='del'>-	} else</div><div class='del'>-		r-&gt;value.bool = FALSE;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-match_all (struct _ESExp *f, int argc, struct _ESExpTerm **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	/* match-all: when dealing with single messages is a no-op */</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	if (argc &gt; 0)</div><div class='del'>-		return e_sexp_term_eval (f, argv[0]);</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = FALSE;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	regex_t pattern;</div><div class='del'>-	</div><div class='del'>-	if (camel_search_build_match_regex (&amp;pattern, CAMEL_SEARCH_MATCH_ICASE, argc, argv, fms-&gt;ex) == 0) {</div><div class='del'>-		message = camel_filter_search_get_message (fms, f);</div><div class='del'>-		r-&gt;value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &amp;pattern);</div><div class='del'>-		regfree (&amp;pattern);</div><div class='del'>-	} else</div><div class='del'>-		r-&gt;value.bool = FALSE;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-body_regex (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	regex_t pattern;</div><div class='del'>-	</div><div class='del'>-	if (camel_search_build_match_regex(&amp;pattern, CAMEL_SEARCH_MATCH_ICASE|CAMEL_SEARCH_MATCH_REGEX|CAMEL_SEARCH_MATCH_NEWLINE,</div><div class='del'>-					   argc, argv, fms-&gt;ex) == 0) {</div><div class='del'>-		message = camel_filter_search_get_message (fms, f);</div><div class='del'>-		r-&gt;value.bool = camel_search_message_body_contains ((CamelDataWrapper *) message, &amp;pattern);</div><div class='del'>-		regfree (&amp;pattern);</div><div class='del'>-	} else</div><div class='del'>-		r-&gt;value.bool = FALSE;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	gboolean truth = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* performs an OR of all words */</div><div class='del'>-	for (i = 0; i &lt; argc &amp;&amp; !truth; i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-		    &amp;&amp; camel_flag_get (&amp;fms-&gt;info-&gt;user_flags, argv[i]-&gt;value.string)) {</div><div class='del'>-			truth = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = truth;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	gboolean truth = FALSE;</div><div class='del'>-	</div><div class='del'>-	if (argc == 1)</div><div class='del'>-		truth = camel_system_flag_get (fms-&gt;info-&gt;flags, argv[0]-&gt;value.string);</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = truth;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	const char *tag;</div><div class='del'>-	</div><div class='del'>-	tag = camel_tag_get (&amp;fms-&gt;info-&gt;user_tags, argv[0]-&gt;value.string);</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_STRING);</div><div class='del'>-	r-&gt;value.string = g_strdup (tag ? tag : "");</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_sent_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	message = camel_filter_search_get_message (fms, f);</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = camel_mime_message_get_date (message, NULL);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_received_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	message = camel_filter_search_get_message (fms, f);</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = camel_mime_message_get_date_received (message, NULL);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = time (NULL);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_score (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	const char *tag;</div><div class='del'>-	</div><div class='del'>-	tag = camel_tag_get (&amp;fms-&gt;info-&gt;user_tags, "score");</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_INT);</div><div class='del'>-	if (tag)</div><div class='del'>-		r-&gt;value.number = atoi (tag);</div><div class='del'>-	else</div><div class='del'>-		r-&gt;value.number = 0;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_source (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	char *src = NULL;</div><div class='del'>-	char *tmp;</div><div class='del'>-	</div><div class='del'>-	if (fms-&gt;source) {</div><div class='del'>-		CamelURL *url;</div><div class='del'>-		</div><div class='del'>-		url = camel_url_new (fms-&gt;source, NULL);</div><div class='del'>-		if (url) {</div><div class='del'>-			src = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-			camel_url_free (url);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		message = camel_filter_search_get_message (fms, f);</div><div class='del'>-		src = g_strdup (camel_mime_message_get_source (message));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* This is an abusive hack */</div><div class='del'>-	if (src &amp;&amp; (tmp = strstr (src, "://"))) {</div><div class='del'>-		tmp += 3;</div><div class='del'>-		tmp = strchr (tmp, '/');</div><div class='del'>-		if (tmp)</div><div class='del'>-			*tmp = '\0';</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (src) {</div><div class='del'>-		r = e_sexp_result_new (f, ESEXP_RES_STRING);</div><div class='del'>-		r-&gt;value.string = src;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new (f, ESEXP_RES_UNDEFINED);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* remember, the size comparisons are done at Kbytes */</div><div class='del'>-static ESExpResult *</div><div class='del'>-get_size (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = fms-&gt;info-&gt;size / 1024;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-run_command (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	int result, status;</div><div class='del'>-	int in_fds[2];</div><div class='del'>-	pid_t pid;</div><div class='del'>-	</div><div class='del'>-	if (pipe (in_fds) == -1) {</div><div class='del'>-		camel_exception_setv (fms-&gt;ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to create pipe to '%s': %s"),</div><div class='del'>-				      argv[0]-&gt;value.string, g_strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!(pid = fork ())) {</div><div class='del'>-		/* child process */</div><div class='del'>-		GPtrArray *args;</div><div class='del'>-		int maxfd, i;</div><div class='del'>-		</div><div class='del'>-		if (dup2 (in_fds[0], STDIN_FILENO) &lt; 0)</div><div class='del'>-			_exit (255);</div><div class='del'>-		</div><div class='del'>-		setsid ();</div><div class='del'>-		</div><div class='del'>-		maxfd = sysconf (_SC_OPEN_MAX);</div><div class='del'>-		if (maxfd &gt; 0) {</div><div class='del'>-			for (i = 0; i &lt; maxfd; i++) {</div><div class='del'>-				if (i != STDIN_FILENO &amp;&amp; i != STDOUT_FILENO &amp;&amp; i != STDERR_FILENO)</div><div class='del'>-					close (i);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		args = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_add (args, g_basename (argv[0]-&gt;value.string));</div><div class='del'>-		for (i = 1; i &lt; argc; i++) {</div><div class='del'>-			g_ptr_array_add (args, argv[i]-&gt;value.string);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_add (args, NULL);</div><div class='del'>-		</div><div class='del'>-		execvp (argv[0]-&gt;value.string, (char **) args-&gt;pdata);</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (args, TRUE);</div><div class='del'>-		</div><div class='del'>-		fprintf (stderr, "Could not execute %s: %s\n", argv[0]-&gt;value.string,</div><div class='del'>-			 g_strerror (errno));</div><div class='del'>-		_exit (255);</div><div class='del'>-	} else if (pid &lt; 0) {</div><div class='del'>-		camel_exception_setv (fms-&gt;ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to create create child process '%s': %s"),</div><div class='del'>-				      argv[0]-&gt;value.string, g_strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* parent process */</div><div class='del'>-	close (in_fds[0]);</div><div class='del'>-	fcntl (in_fds[1], F_SETFL, O_NONBLOCK);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (in_fds[1]);</div><div class='del'>-	</div><div class='del'>-	message = camel_filter_search_get_message (fms, f);</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	camel_stream_flush (stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	result = waitpid (pid, &amp;status, 0);</div><div class='del'>-	</div><div class='del'>-	if (result == -1 &amp;&amp; errno == EINTR) {</div><div class='del'>-		/* child process is hanging... */</div><div class='del'>-		kill (pid, SIGTERM);</div><div class='del'>-		sleep (1);</div><div class='del'>-		result = waitpid (pid, &amp;status, WNOHANG);</div><div class='del'>-		if (result == 0) {</div><div class='del'>-			/* ...still hanging, set phasers to KILL */</div><div class='del'>-			kill (pid, SIGKILL);</div><div class='del'>-			sleep (1);</div><div class='del'>-			result = waitpid (pid, &amp;status, WNOHANG);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (result != -1 &amp;&amp; WIFEXITED (status))</div><div class='del'>-		return WEXITSTATUS (status);</div><div class='del'>-	else</div><div class='del'>-		return -1;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-shell_exec (struct _ESExp *f, int argc, struct _ESExpResult **argv, FilterMessageSearch *fms)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int retval, i;</div><div class='del'>-	</div><div class='del'>-	/* make sure all args are strings */</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		if (argv[i]-&gt;type != ESEXP_RES_STRING) {</div><div class='del'>-			retval = -1;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	retval = run_command (f, argc, argv, fms);</div><div class='del'>-	</div><div class='del'>- done:</div><div class='del'>-	r = e_sexp_result_new (f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = retval;</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_filter_search_match:</div><div class='del'>- * @message:</div><div class='del'>- * @info:</div><div class='del'>- * @source:</div><div class='del'>- * @expression:</div><div class='del'>- * @ex:</div><div class='del'>- *</div><div class='del'>- * Returns one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or CAMEL_SEARCH_ERROR.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_filter_search_match (CamelFilterSearchGetMessageFunc get_message, void *data,</div><div class='del'>-			   CamelMessageInfo *info, const char *source,</div><div class='del'>-			   const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	FilterMessageSearch fms;</div><div class='del'>-	ESExp *sexp;</div><div class='del'>-	ESExpResult *result;</div><div class='del'>-	gboolean retval;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	fms.get_message = get_message;</div><div class='del'>-	fms.get_message_data = data;</div><div class='del'>-	fms.message = NULL;</div><div class='del'>-	fms.info = info;</div><div class='del'>-	fms.source = source;</div><div class='del'>-	fms.ex = ex;</div><div class='del'>-	</div><div class='del'>-	sexp = e_sexp_new ();</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; sizeof (symbols) / sizeof (symbols[0]); i++) {</div><div class='del'>-		if (symbols[i].type == 1)</div><div class='del'>-			e_sexp_add_ifunction (sexp, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &amp;fms);</div><div class='del'>-		else</div><div class='del'>-			e_sexp_add_function (sexp, 0, symbols[i].name, symbols[i].func, &amp;fms);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_sexp_input_text (sexp, expression, strlen (expression));</div><div class='del'>-	if (e_sexp_parse (sexp) == -1) {</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_exception_setv (ex, 1, _("Error executing filter search: %s: %s"),</div><div class='del'>-					      e_sexp_error (sexp), expression);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	result = e_sexp_eval (sexp);</div><div class='del'>-	if (result == NULL) {</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_exception_setv (ex, 1, _("Error executing filter search: %s: %s"),</div><div class='del'>-					      e_sexp_error (sexp), expression);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (result-&gt;type == ESEXP_RES_BOOL)</div><div class='del'>-		retval = result-&gt;value.bool ? CAMEL_SEARCH_MATCHED : CAMEL_SEARCH_NOMATCH;</div><div class='del'>-	else</div><div class='del'>-		retval = CAMEL_SEARCH_NOMATCH;</div><div class='del'>-	</div><div class='del'>-	e_sexp_result_free (sexp, result);</div><div class='del'>-	e_sexp_unref (sexp);</div><div class='del'>-	</div><div class='del'>-	if (fms.message)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (fms.message));</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-	</div><div class='del'>- error:</div><div class='del'>-	if (fms.message)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (fms.message));</div><div class='del'>-	</div><div class='del'>-	e_sexp_unref (sexp);</div><div class='del'>-	</div><div class='del'>-	return CAMEL_SEARCH_ERROR;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h<br/>deleted file mode 100644<br/>index d54c3c03b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-filter-search.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-filter-search.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *	     Michael Zucchi &lt;NotZed@Ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *  Copyright 2001 Ximian Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_FILTER_SEARCH_H</div><div class='del'>-#define CAMEL_FILTER_SEARCH_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_SEARCH_ERROR    = -1,</div><div class='del'>-	CAMEL_SEARCH_NOMATCH  =  0,</div><div class='del'>-	CAMEL_SEARCH_MATCHED  =  1,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef CamelMimeMessage * (*CamelFilterSearchGetMessageFunc) (void *data, CamelException *ex);</div><div class='del'>-</div><div class='del'>-int camel_filter_search_match (CamelFilterSearchGetMessageFunc get_message, void *data,</div><div class='del'>-			       CamelMessageInfo *info, const char *source,</div><div class='del'>-			       const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! CAMEL_FILTER_SEARCH_H */</div><div class='head'>diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c<br/>deleted file mode 100644<br/>index 92b73e6f59..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1159 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000,2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is a helper class for folders to implement the search function.</div><div class='del'>-   It implements enough to do basic searches on folders that can provide</div><div class='del'>-   an in-memory summary and a body index. */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-folder-search.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-medium.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-#include "camel-search-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-#define r(x) </div><div class='del'>-</div><div class='del'>-struct _CamelFolderSearchPrivate {</div><div class='del'>-	GHashTable *mempool_hash;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelFolderSearch *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static ESExpResult *search_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-</div><div class='del'>-static ESExpResult *search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_header_starts_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_header_ends_with(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_header_exists(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-static ESExpResult *search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_system_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_uid(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-static ESExpResult *search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-</div><div class='del'>-static void camel_folder_search_class_init (CamelFolderSearchClass *klass);</div><div class='del'>-static void camel_folder_search_init       (CamelFolderSearch *obj);</div><div class='del'>-static void camel_folder_search_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_search_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_search_class_init (CamelFolderSearchClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_folder_search_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;not = search_not;</div><div class='del'>-</div><div class='del'>-	klass-&gt;match_all = search_match_all;</div><div class='del'>-	klass-&gt;body_contains = search_body_contains;</div><div class='del'>-	klass-&gt;header_contains = search_header_contains;</div><div class='del'>-	klass-&gt;header_matches = search_header_matches;</div><div class='del'>-	klass-&gt;header_starts_with = search_header_starts_with;</div><div class='del'>-	klass-&gt;header_ends_with = search_header_ends_with;</div><div class='del'>-	klass-&gt;header_exists = search_header_exists;</div><div class='del'>-	klass-&gt;user_tag = search_user_tag;</div><div class='del'>-	klass-&gt;user_flag = search_user_flag;</div><div class='del'>-	klass-&gt;system_flag = search_system_flag;</div><div class='del'>-	klass-&gt;get_sent_date = search_get_sent_date;</div><div class='del'>-	klass-&gt;get_received_date = search_get_received_date;</div><div class='del'>-	klass-&gt;get_current_date = search_get_current_date;</div><div class='del'>-	klass-&gt;uid = search_uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_search_init (CamelFolderSearch *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSearchPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	obj-&gt;sexp = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	/* use a hash of mempools to associate the returned uid lists with</div><div class='del'>-	   the backing mempool.  yes pretty weird, but i didn't want to change</div><div class='del'>-	   the api just yet */</div><div class='del'>-</div><div class='del'>-	p-&gt;mempool_hash = g_hash_table_new(0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_mempool(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids = key;</div><div class='del'>-	EMemPool *pool = value;</div><div class='del'>-</div><div class='del'>-	g_warning("Search closed with outstanding result unfreed: %p", uids);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(uids, TRUE);</div><div class='del'>-	e_mempool_destroy(pool);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_search_finalize (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSearch *search = (CamelFolderSearch *)obj;</div><div class='del'>-	struct _CamelFolderSearchPrivate *p = _PRIVATE(obj);</div><div class='del'>-</div><div class='del'>-	if (search-&gt;sexp)</div><div class='del'>-		e_sexp_unref(search-&gt;sexp);</div><div class='del'>-</div><div class='del'>-	g_free(search-&gt;last_search);</div><div class='del'>-	g_hash_table_foreach(p-&gt;mempool_hash, free_mempool, obj);</div><div class='del'>-	g_hash_table_destroy(p-&gt;mempool_hash);</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_search_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelFolderSearch",</div><div class='del'>-					    sizeof (CamelFolderSearch),</div><div class='del'>-					    sizeof (CamelFolderSearchClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_folder_search_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_folder_search_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_folder_search_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef offsetof</div><div class='del'>-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &amp;((type *) 0)-&gt;field))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *name;</div><div class='del'>-	int offset;</div><div class='del'>-	int flags;		/* 0x02 = immediate, 0x01 = always enter */</div><div class='del'>-} builtins[] = {</div><div class='del'>-	/* these have default implementations in e-sexp */</div><div class='del'>-	{ "and", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },</div><div class='del'>-	{ "or", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },</div><div class='del'>-	/* we need to override this one though to implement an 'array not' */</div><div class='del'>-	{ "not", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, not), 0 },</div><div class='del'>-	{ "&lt;", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },</div><div class='del'>-	{ "&gt;", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },</div><div class='del'>-	{ "=", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, eq), 2 },</div><div class='del'>-</div><div class='del'>-	/* these we have to use our own default if there is none */</div><div class='del'>-	/* they should all be defined in the language? so it parses, or should they not?? */</div><div class='del'>-	{ "match-all", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, match_all), 3 },</div><div class='del'>-	{ "body-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, body_contains), 1 },</div><div class='del'>-	{ "header-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_contains), 1 },</div><div class='del'>-	{ "header-matches", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_matches), 1 },</div><div class='del'>-	{ "header-starts-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_starts_with), 1 },</div><div class='del'>-	{ "header-ends-with", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_ends_with), 1 },</div><div class='del'>-	{ "header-exists", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_exists), 1 },</div><div class='del'>-	{ "user-tag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_tag), 1 },</div><div class='del'>-	{ "user-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 1 },</div><div class='del'>-	{ "system-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, system_flag), 1 },</div><div class='del'>-	{ "get-sent-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_sent_date), 1 },</div><div class='del'>-	{ "get-received-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_received_date), 1 },</div><div class='del'>-	{ "get-current-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_current_date), 1 },</div><div class='del'>-	{ "uid", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, uid), 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_folder_search_construct (CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderSearchClass *klass = (CamelFolderSearchClass *)CAMEL_OBJECT_GET_CLASS(search);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;sizeof(builtins)/sizeof(builtins[0]);i++) {</div><div class='del'>-		void *func;</div><div class='del'>-		/* c is sure messy sometimes */</div><div class='del'>-		func = *((void **)(((char *)klass)+builtins[i].offset));</div><div class='del'>-		if (func == NULL &amp;&amp; builtins[i].flags&amp;1) {</div><div class='del'>-			g_warning("Search class doesn't implement '%s' method: %s", builtins[i].name, camel_type_to_name(CAMEL_OBJECT_GET_CLASS(search)));</div><div class='del'>-			func = (void *)search_dummy;</div><div class='del'>-		}</div><div class='del'>-		if (func != NULL) {</div><div class='del'>-			if (builtins[i].flags&amp;2) {</div><div class='del'>-				e_sexp_add_ifunction(search-&gt;sexp, 0, builtins[i].name, (ESExpIFunc *)func, search);</div><div class='del'>-			} else {</div><div class='del'>-				e_sexp_add_function(search-&gt;sexp, 0, builtins[i].name, (ESExpFunc *)func, search);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelFolderSearch object.</div><div class='del'>- * </div><div class='del'>- * A CamelFolderSearch is a subclassable, extensible s-exp</div><div class='del'>- * evaluator which enforces a particular set of s-expressions.</div><div class='del'>- * Particular methods may be overriden by an implementation to</div><div class='del'>- * implement a search for any sort of backend.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelFolderSearch widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSearch *</div><div class='del'>-camel_folder_search_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSearch *new = CAMEL_FOLDER_SEARCH ( camel_object_new (camel_folder_search_get_type ()));</div><div class='del'>-</div><div class='del'>-	camel_folder_search_construct(new);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_set_folder:</div><div class='del'>- * @search:</div><div class='del'>- * @folder: A folder.</div><div class='del'>- * </div><div class='del'>- * Set the folder attribute of the search.  This is currently unused, but</div><div class='del'>- * could be used to perform a slow-search when indexes and so forth are not</div><div class='del'>- * available.  Or for use by subclasses.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	search-&gt;folder = folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_set_summary:</div><div class='del'>- * @search: </div><div class='del'>- * @summary: An array of CamelMessageInfo pointers.</div><div class='del'>- * </div><div class='del'>- * Set the array of summary objects representing the span of the search.</div><div class='del'>- *</div><div class='del'>- * If this is not set, then a subclass must provide the functions</div><div class='del'>- * for searching headers and for the match-all operator.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	search-&gt;summary = summary;</div><div class='del'>-	if (search-&gt;summary_hash)</div><div class='del'>-		g_hash_table_destroy(search-&gt;summary_hash);</div><div class='del'>-	search-&gt;summary_hash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++)</div><div class='del'>-		g_hash_table_insert(search-&gt;summary_hash, (char *)camel_message_info_uid(summary-&gt;pdata[i]), summary-&gt;pdata[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_set_body_index:</div><div class='del'>- * @search: </div><div class='del'>- * @index: </div><div class='del'>- * </div><div class='del'>- * Set the index representing the contents of all messages</div><div class='del'>- * in this folder.  If this is not set, then the folder implementation</div><div class='del'>- * should sub-class the CamelFolderSearch and provide its own</div><div class='del'>- * body-contains function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_search_set_body_index(CamelFolderSearch *search, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	if (search-&gt;body_index)</div><div class='del'>-		camel_object_unref((CamelObject *)search-&gt;body_index);</div><div class='del'>-	search-&gt;body_index = index;</div><div class='del'>-	if (index)</div><div class='del'>-		camel_object_ref((CamelObject *)index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_execute_expression:</div><div class='del'>- * @search: </div><div class='del'>- * @expr: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Execute the search expression @expr, returning an array of</div><div class='del'>- * all matches as a GPtrArray of uid's of matching messages.</div><div class='del'>- *</div><div class='del'>- * Note that any settings such as set_body_index(), set_folder(),</div><div class='del'>- * and so on are reset to #NULL once the search has completed.</div><div class='del'>- *</div><div class='del'>- * TODO: The interface should probably return summary items instead</div><div class='del'>- * (since they are much more useful to any client).</div><div class='del'>- * </div><div class='del'>- * Return value: A GPtrArray of strings of all matching messages.</div><div class='del'>- * This must only be freed by camel_folder_search_free_result.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	GPtrArray *matches;</div><div class='del'>-	int i;</div><div class='del'>-	GHashTable *results;</div><div class='del'>-	EMemPool *pool;</div><div class='del'>-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);</div><div class='del'>-</div><div class='del'>-	p-&gt;ex = ex;</div><div class='del'>-</div><div class='del'>-	/* only re-parse if the search has changed */</div><div class='del'>-	if (search-&gt;last_search == NULL</div><div class='del'>-	    || strcmp(search-&gt;last_search, expr)) {</div><div class='del'>-		e_sexp_input_text(search-&gt;sexp, expr, strlen(expr));</div><div class='del'>-		if (e_sexp_parse(search-&gt;sexp) == -1) {</div><div class='del'>-			camel_exception_setv(ex, 1, _("Cannot parse search expression: %s:\n%s"), e_sexp_error(search-&gt;sexp), expr);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free(search-&gt;last_search);</div><div class='del'>-		search-&gt;last_search = g_strdup(expr);</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_eval(search-&gt;sexp);</div><div class='del'>-	if (r == NULL) {</div><div class='del'>-		if (!camel_exception_is_set(ex))</div><div class='del'>-			camel_exception_setv(ex, 1, _("Error executing search expression: %s:\n%s"), e_sexp_error(search-&gt;sexp), expr);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matches = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-	/* now create a folder summary to return?? */</div><div class='del'>-	if (r</div><div class='del'>-	    &amp;&amp; r-&gt;type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-		d(printf("got result ...\n"));</div><div class='del'>-		/* we use a mempool to store the strings, packed in tight as possible, and freed together */</div><div class='del'>-		/* because the strings are often short (like &lt;8 bytes long), we would be wasting appx 50%</div><div class='del'>-		   of memory just storing the size tag that malloc assigns us and alignment padding, so this</div><div class='del'>-		   gets around that (and is faster to allocate and free as a bonus) */</div><div class='del'>-		pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-		if (search-&gt;summary) {</div><div class='del'>-			/* reorder result in summary order */</div><div class='del'>-			results = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-			for (i=0;i&lt;r-&gt;value.ptrarray-&gt;len;i++) {</div><div class='del'>-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-				g_hash_table_insert(results, g_ptr_array_index(r-&gt;value.ptrarray, i), (void *)1);</div><div class='del'>-			}</div><div class='del'>-			for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-				CamelMessageInfo *info = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-				char *uid = (char *)camel_message_info_uid(info);</div><div class='del'>-				if (g_hash_table_lookup(results, uid)) {</div><div class='del'>-					g_ptr_array_add(matches, e_mempool_strdup(pool, uid));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_hash_table_destroy(results);</div><div class='del'>-		} else {</div><div class='del'>-			for (i=0;i&lt;r-&gt;value.ptrarray-&gt;len;i++) {</div><div class='del'>-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-				g_ptr_array_add(matches, e_mempool_strdup(pool, g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(search-&gt;sexp, r);</div><div class='del'>-		/* instead of putting the mempool_hash in the structure, we keep the api clean by</div><div class='del'>-		   putting a reference to it in a hashtable.  Lets us do some debugging and catch</div><div class='del'>-		   unfree'd results as well. */</div><div class='del'>-		g_hash_table_insert(p-&gt;mempool_hash, matches, pool);</div><div class='del'>-	} else {</div><div class='del'>-		d(printf("no result!\n"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	search-&gt;folder = NULL;</div><div class='del'>-	search-&gt;summary = NULL;</div><div class='del'>-	search-&gt;current = NULL;</div><div class='del'>-	search-&gt;body_index = NULL;</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_match_expression:</div><div class='del'>- * @search: </div><div class='del'>- * @expr: </div><div class='del'>- * @info: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Returns #TRUE if the expression matches the specific message info @info.</div><div class='del'>- * Note that the folder and index may need to be set for body searches to</div><div class='del'>- * operate as well.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr, const CamelMessageInfo *info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	int ret = FALSE;</div><div class='del'>-</div><div class='del'>-	search-&gt;match1 = (CamelMessageInfo *)info;</div><div class='del'>-</div><div class='del'>-	uids = camel_folder_search_execute_expression(search, expr, ex);</div><div class='del'>-	if (uids) {</div><div class='del'>-		if (uids-&gt;len == 1)</div><div class='del'>-			ret = TRUE;</div><div class='del'>-		camel_folder_search_free_result(search, uids);</div><div class='del'>-	}</div><div class='del'>-	search-&gt;match1 = NULL;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	struct _CamelFolderSearchPrivate *p = _PRIVATE(search);</div><div class='del'>-	EMemPool *pool;</div><div class='del'>-</div><div class='del'>-	pool = g_hash_table_lookup(p-&gt;mempool_hash, result);</div><div class='del'>-	if (pool) {</div><div class='del'>-		e_mempool_destroy(pool);</div><div class='del'>-		g_hash_table_remove(p-&gt;mempool_hash, result);</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0;i&lt;result-&gt;len;i++)</div><div class='del'>-			g_free(g_ptr_array_index(result, i));</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free(result, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* dummy function, returns false always, or an empty match array */</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (search-&gt;current == NULL) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* impelemnt an 'array not', i.e. everything in the summary, not in the supplied array */</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		if (argv[0]-&gt;type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-			GPtrArray *v = argv[0]-&gt;value.ptrarray;</div><div class='del'>-			const char *uid;</div><div class='del'>-</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-			r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-			/* not against a single message?*/</div><div class='del'>-			if (search-&gt;match1 || search-&gt;current) {</div><div class='del'>-				int found = FALSE;</div><div class='del'>-</div><div class='del'>-				if (search-&gt;match1)</div><div class='del'>-					uid = camel_message_info_uid(search-&gt;match1);</div><div class='del'>-				else</div><div class='del'>-					uid = camel_message_info_uid(search-&gt;current);</div><div class='del'>-</div><div class='del'>-				for (i=0;!found &amp;&amp; i&lt;v-&gt;len;i++) {</div><div class='del'>-					if (strcmp(uid, v-&gt;pdata[i]) == 0)</div><div class='del'>-						found = TRUE;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (!found)</div><div class='del'>-					g_ptr_array_add(r-&gt;value.ptrarray, (char *)uid);</div><div class='del'>-			} else if (search-&gt;summary == NULL) {</div><div class='del'>-				g_warning("No summary set, 'not' against an array requires a summary");</div><div class='del'>-			} else {</div><div class='del'>-				/* 'not' against the whole summary */</div><div class='del'>-				GHashTable *have = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-				char **s;</div><div class='del'>-				CamelMessageInfo **m;</div><div class='del'>-</div><div class='del'>-				s = (char **)v-&gt;pdata;</div><div class='del'>-				for (i=0;i&lt;v-&gt;len;i++)</div><div class='del'>-					g_hash_table_insert(have, s[i], s[i]);</div><div class='del'>-</div><div class='del'>-				v = search-&gt;summary;</div><div class='del'>-				m = (CamelMessageInfo **)v-&gt;pdata;</div><div class='del'>-				for (i=0;i&lt;v-&gt;len;i++) {</div><div class='del'>-					char *uid = (char *)camel_message_info_uid(m[i]);</div><div class='del'>-</div><div class='del'>-					if (g_hash_table_lookup(have, uid) == NULL)</div><div class='del'>-						g_ptr_array_add(r-&gt;value.ptrarray, uid);</div><div class='del'>-				}</div><div class='del'>-				g_hash_table_destroy(have);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			int res = TRUE;</div><div class='del'>-</div><div class='del'>-			if (argv[0]-&gt;type == ESEXP_RES_BOOL)</div><div class='del'>-				res = ! argv[0]-&gt;value.bool;</div><div class='del'>-</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-			r-&gt;value.bool = res;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_match_all(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	ESExpResult *r, *r1;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;1) {</div><div class='del'>-		g_warning("match-all only takes a single argument, other arguments ignored");</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-	r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-	/* we are only matching a single message? */</div><div class='del'>-	if (search-&gt;match1) {</div><div class='del'>-		search-&gt;current = search-&gt;match1;</div><div class='del'>-</div><div class='del'>-		d(printf("matching against 1 message: %s\n", camel_message_info_subject(search-&gt;current)));</div><div class='del'>-</div><div class='del'>-		if (argc&gt;0) {</div><div class='del'>-			r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-			if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-				if (r1-&gt;value.bool)</div><div class='del'>-					g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(search-&gt;current));</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("invalid syntax, matches require a single bool result");</div><div class='del'>-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));</div><div class='del'>-			}</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-		} else {</div><div class='del'>-			g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(search-&gt;current));</div><div class='del'>-		}</div><div class='del'>-		search-&gt;current = NULL;</div><div class='del'>-</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (search-&gt;summary == NULL) {</div><div class='del'>-		/* TODO: make it work - e.g. use the folder and so forth for a slower search */</div><div class='del'>-		g_warning("No summary supplied, match-all doesn't work with no summary");</div><div class='del'>-		g_assert(0);</div><div class='del'>-		return r;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: Could make this a bit faster in the uncommon case (of match-everything) */</div><div class='del'>-	for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-		search-&gt;current = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-		if (argc&gt;0) {</div><div class='del'>-			r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-			if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-				if (r1-&gt;value.bool)</div><div class='del'>-					g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(search-&gt;current));</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("invalid syntax, matches require a single bool result");</div><div class='del'>-				e_sexp_fatal_error(f, _("(match-all) requires a single bool result"));</div><div class='del'>-			}</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-		} else {</div><div class='del'>-			g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(search-&gt;current));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	search-&gt;current = NULL;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-check_header(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search, camel_search_match_t how)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-</div><div class='del'>-	r(printf("executing check-header %d\n", how));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (search-&gt;current &amp;&amp; argc&gt;1</div><div class='del'>-	    &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-		char *headername;</div><div class='del'>-		const char *header = NULL;</div><div class='del'>-		char strbuf[32];</div><div class='del'>-		int i, j;</div><div class='del'>-		camel_search_t type = CAMEL_SEARCH_TYPE_ASIS;</div><div class='del'>-		struct _camel_search_words *words;</div><div class='del'>-</div><div class='del'>-		/* only a subset of headers are supported .. */</div><div class='del'>-		headername = argv[0]-&gt;value.string;</div><div class='del'>-		if (!strcasecmp(headername, "subject")) {</div><div class='del'>-			header = camel_message_info_subject(search-&gt;current);</div><div class='del'>-		} else if (!strcasecmp(headername, "date")) {</div><div class='del'>-			/* FIXME: not a very useful form of the date */</div><div class='del'>-			sprintf(strbuf, "%d", (int)search-&gt;current-&gt;date_sent);</div><div class='del'>-			header = strbuf;</div><div class='del'>-		} else if (!strcasecmp(headername, "from")) {</div><div class='del'>-			header = camel_message_info_from(search-&gt;current);</div><div class='del'>-			type = CAMEL_SEARCH_TYPE_ADDRESS;</div><div class='del'>-		} else if (!strcasecmp(headername, "to")) {</div><div class='del'>-			header = camel_message_info_to(search-&gt;current);</div><div class='del'>-			type = CAMEL_SEARCH_TYPE_ADDRESS;</div><div class='del'>-		} else if (!strcasecmp(headername, "cc")) {</div><div class='del'>-			header = camel_message_info_cc(search-&gt;current);</div><div class='del'>-			type = CAMEL_SEARCH_TYPE_ADDRESS;</div><div class='del'>-		} else if (!strcasecmp(headername, "x-camel-mlist")) {</div><div class='del'>-			header = camel_message_info_mlist(search-&gt;current);</div><div class='del'>-			type = CAMEL_SEARCH_TYPE_MLIST;</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_resultv_free(f, argc, argv);</div><div class='del'>-			e_sexp_fatal_error(f, _("Performing query on unknown header: %s"), headername);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (header) {</div><div class='del'>-			/* performs an OR of all words */</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; !truth;i++) {</div><div class='del'>-				if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-					if (argv[i]-&gt;value.string[0] == 0) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					} else if (how == CAMEL_SEARCH_MATCH_CONTAINS) {</div><div class='del'>-						/* doesn't make sense to split words on anything but contains i.e. we can't have an ending match different words */</div><div class='del'>-						words = camel_search_words_split(argv[i]-&gt;value.string);</div><div class='del'>-						truth = TRUE;</div><div class='del'>-						for (j=0;j&lt;words-&gt;len &amp;&amp; truth;j++) {</div><div class='del'>-							truth = camel_search_header_match(header, words-&gt;words[j]-&gt;word, how, type, NULL);</div><div class='del'>-						}</div><div class='del'>-						camel_search_words_free(words);</div><div class='del'>-					} else {</div><div class='del'>-						truth = camel_search_header_match(header, argv[i]-&gt;value.string, how, type, NULL);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* TODO: else, find all matches */</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = truth;</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_header_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_CONTAINS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_header_matches(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_EXACT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_header_starts_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_STARTS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_header_ends_with (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	return check_header(f, argc, argv, search, CAMEL_SEARCH_MATCH_ENDS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_header_exists (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	r(printf ("executing header-exists\n"));</div><div class='del'>-	</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		if (argc == 1 &amp;&amp; argv[0]-&gt;type == ESEXP_RES_STRING)</div><div class='del'>-			r-&gt;value.bool = camel_medium_get_header(CAMEL_MEDIUM(search-&gt;current), argv[0]-&gt;value.string) != NULL;</div><div class='del'>-		</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this is just to OR results together */</div><div class='del'>-struct _glib_sux_donkeys {</div><div class='del'>-	int count;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* or, store all unique values */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* and, only store duplicates */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	if (value == fuckup-&gt;count)</div><div class='del'>-		g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-match_message_index(CamelIndex *idx, const char *uid, const char *match, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelIndexCursor *wc, *nc;</div><div class='del'>-	const char *word, *name;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-</div><div class='del'>-	wc = camel_index_words(idx);</div><div class='del'>-	if (wc) {</div><div class='del'>-		while (!truth &amp;&amp; (word = camel_index_cursor_next(wc))) {</div><div class='del'>-			if (camel_ustrstrcase(word,match) != NULL) {</div><div class='del'>-				/* perf: could have the wc cursor return the name cursor */</div><div class='del'>-				nc = camel_index_find(idx, word);</div><div class='del'>-				if (nc) {</div><div class='del'>-					while (!truth &amp;&amp; (name = camel_index_cursor_next(nc)))</div><div class='del'>-						truth = strcmp(name, uid) == 0;</div><div class='del'>-					camel_object_unref((CamelObject *)nc);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref((CamelObject *)wc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- "one two" "three" "four five"</div><div class='del'>-</div><div class='del'>-  one and two</div><div class='del'>-or</div><div class='del'>-  three</div><div class='del'>-or</div><div class='del'>-  four and five</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* returns messages which contain all words listed in words */</div><div class='del'>-static GPtrArray *</div><div class='del'>-match_words_index(CamelFolderSearch *search, struct _camel_search_words *words, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *result = g_ptr_array_new();</div><div class='del'>-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-	CamelIndexCursor *wc, *nc;</div><div class='del'>-	const char *word, *name;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* we can have a maximum of 32 words, as we use it as the AND mask */</div><div class='del'>-			</div><div class='del'>-	wc = camel_index_words(search-&gt;body_index);</div><div class='del'>-	if (wc) {</div><div class='del'>-		while ((word = camel_index_cursor_next(wc))) {</div><div class='del'>-			for (i=0;i&lt;words-&gt;len;i++) {</div><div class='del'>-				if (camel_ustrstrcase(word, words-&gt;words[i]-&gt;word) != NULL) {</div><div class='del'>-					/* perf: could have the wc cursor return the name cursor */</div><div class='del'>-					nc = camel_index_find(search-&gt;body_index, word);</div><div class='del'>-					if (nc) {</div><div class='del'>-						while ((name = camel_index_cursor_next(nc))) {</div><div class='del'>-							mi = g_hash_table_lookup(search-&gt;summary_hash, name);</div><div class='del'>-							if (mi) {</div><div class='del'>-								int mask;</div><div class='del'>-								const char *uid = camel_message_info_uid(mi);</div><div class='del'>-</div><div class='del'>-								mask = ((int)g_hash_table_lookup(ht, uid)) | (1&lt;&lt;i);</div><div class='del'>-								g_hash_table_insert(ht, (char *)uid, (void *)mask);</div><div class='del'>-							}</div><div class='del'>-						}</div><div class='del'>-						camel_object_unref((CamelObject *)nc);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref((CamelObject *)wc);</div><div class='del'>-</div><div class='del'>-		lambdafoo.uids = result;</div><div class='del'>-		lambdafoo.count = (1&lt;&lt;words-&gt;len) - 1;</div><div class='del'>-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &amp;lambdafoo);</div><div class='del'>-		g_hash_table_destroy(ht);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-match_words_1message (CamelDataWrapper *object, struct _camel_search_words *words, guint32 *mask)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *containee;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-	int parts, i;</div><div class='del'>-	</div><div class='del'>-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (object));</div><div class='del'>-	</div><div class='del'>-	if (containee == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* using the object types is more accurate than using the mime/types */</div><div class='del'>-	if (CAMEL_IS_MULTIPART (containee)) {</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));</div><div class='del'>-		for (i = 0; i &lt; parts &amp;&amp; truth == FALSE; i++) {</div><div class='del'>-			CamelDataWrapper *part = (CamelDataWrapper *)camel_multipart_get_part (CAMEL_MULTIPART (containee), i);</div><div class='del'>-			if (part)</div><div class='del'>-				truth = match_words_1message(part, words, mask);</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {</div><div class='del'>-		/* for messages we only look at its contents */</div><div class='del'>-		truth = match_words_1message((CamelDataWrapper *)containee, words, mask);</div><div class='del'>-	} else if (header_content_type_is(CAMEL_DATA_WRAPPER (containee)-&gt;mime_type, "text", "*")) {</div><div class='del'>-		/* for all other text parts, we look inside, otherwise we dont care */</div><div class='del'>-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new ();</div><div class='del'>-</div><div class='del'>-		/* FIXME: The match should be part of a stream op */</div><div class='del'>-		camel_data_wrapper_write_to_stream (containee, CAMEL_STREAM (mem));</div><div class='del'>-		camel_stream_write (CAMEL_STREAM (mem), "", 1);</div><div class='del'>-		for (i=0;i&lt;words-&gt;len;i++) {</div><div class='del'>-			/* FIXME: This is horridly slow, and should use a real search algorithm */</div><div class='del'>-			if (camel_ustrstrcase(mem-&gt;buffer-&gt;data, words-&gt;words[i]-&gt;word) != NULL) {</div><div class='del'>-				*mask |= (1&lt;&lt;i);</div><div class='del'>-				/* shortcut a match */</div><div class='del'>-				if (*mask == (1&lt;&lt;(words-&gt;len))-1)</div><div class='del'>-					return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (mem));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-match_words_message(CamelFolder *folder, const char *uid, struct _camel_search_words *words, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	guint32 mask;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	int truth;</div><div class='del'>-</div><div class='del'>-	msg = camel_folder_get_message(folder, uid, ex);</div><div class='del'>-	if (msg) {</div><div class='del'>-		mask = 0;</div><div class='del'>-		truth = match_words_1message((CamelDataWrapper *)msg, words, &amp;mask);</div><div class='del'>-		camel_object_unref((CamelObject *)msg);</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		truth = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-match_words_messages(CamelFolderSearch *search, struct _camel_search_words *words, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GPtrArray *matches = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-	if (search-&gt;body_index) {</div><div class='del'>-		GPtrArray *indexed;</div><div class='del'>-		struct _camel_search_words *simple;</div><div class='del'>-</div><div class='del'>-		simple = camel_search_words_simple(words);</div><div class='del'>-		indexed = match_words_index(search, simple, ex);</div><div class='del'>-		camel_search_words_free(simple);</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;indexed-&gt;len;i++) {</div><div class='del'>-			const char *uid = g_ptr_array_index(indexed, i);</div><div class='del'>-			</div><div class='del'>-			if (match_words_message(search-&gt;folder, uid, words, ex))</div><div class='del'>-				g_ptr_array_add(matches, (char *)uid);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free(indexed, TRUE);</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-			CamelMessageInfo *info = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-			const char *uid = camel_message_info_uid(info);</div><div class='del'>-			</div><div class='del'>-			if (match_words_message(search-&gt;folder, uid, words, ex))</div><div class='del'>-				g_ptr_array_add(matches, (char *)uid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_body_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	CamelException *ex = search-&gt;priv-&gt;ex;</div><div class='del'>-	struct _camel_search_words *words;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-</div><div class='del'>-	if (search-&gt;current) {	</div><div class='del'>-		int truth = FALSE;</div><div class='del'>-</div><div class='del'>-		if (argc == 1 &amp;&amp; argv[0]-&gt;value.string[0] == 0) {</div><div class='del'>-			truth = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			for (i=0;i&lt;argc &amp;&amp; !truth;i++) {</div><div class='del'>-				if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-					words = camel_search_words_split(argv[i]-&gt;value.string);</div><div class='del'>-					truth = TRUE;</div><div class='del'>-					if ((words-&gt;type &amp; CAMEL_SEARCH_WORD_COMPLEX) == 0 &amp;&amp; search-&gt;body_index) {</div><div class='del'>-						for (j=0;j&lt;words-&gt;len &amp;&amp; truth;j++)</div><div class='del'>-							truth = match_message_index(search-&gt;body_index, camel_message_info_uid(search-&gt;current), words-&gt;words[j]-&gt;word, ex);</div><div class='del'>-					} else {</div><div class='del'>-						/* TODO: cache current message incase of multiple body search terms */</div><div class='del'>-						truth = match_words_message(search-&gt;folder, camel_message_info_uid(search-&gt;current), words, ex);</div><div class='del'>-					}</div><div class='del'>-					camel_search_words_free(words);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = truth;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-		if (argc == 1 &amp;&amp; argv[0]-&gt;value.string[0] == 0) {</div><div class='del'>-			for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-				CamelMessageInfo *info = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-				g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(info));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-			GPtrArray *matches;</div><div class='del'>-</div><div class='del'>-			for (i=0;i&lt;argc;i++) {</div><div class='del'>-				if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-					words = camel_search_words_split(argv[i]-&gt;value.string);</div><div class='del'>-					if ((words-&gt;type &amp; CAMEL_SEARCH_WORD_COMPLEX) == 0 &amp;&amp; search-&gt;body_index) {</div><div class='del'>-						matches = match_words_index(search, words, ex);</div><div class='del'>-					} else {</div><div class='del'>-						matches = match_words_messages(search, words, ex);</div><div class='del'>-					}</div><div class='del'>-					for (j=0;j&lt;matches-&gt;len;j++)</div><div class='del'>-						g_hash_table_insert(ht, matches-&gt;pdata[j], matches-&gt;pdata[j]);</div><div class='del'>-					g_ptr_array_free(matches, TRUE);</div><div class='del'>-					camel_search_words_free(words);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			lambdafoo.uids = r-&gt;value.ptrarray;</div><div class='del'>-			g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &amp;lambdafoo);</div><div class='del'>-			g_hash_table_destroy(ht);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_user_flag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	r(printf("executing user-flag\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		int truth = FALSE;</div><div class='del'>-		/* performs an OR of all words */</div><div class='del'>-		for (i=0;i&lt;argc &amp;&amp; !truth;i++) {</div><div class='del'>-			if (argv[i]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-			    &amp;&amp; camel_flag_get(&amp;search-&gt;current-&gt;user_flags, argv[i]-&gt;value.string)) {</div><div class='del'>-				truth = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = truth;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_system_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	r(printf ("executing system-flag\n"));</div><div class='del'>-	</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		gboolean truth = FALSE;</div><div class='del'>-		</div><div class='del'>-		if (argc == 1)</div><div class='del'>-			truth = camel_system_flag_get (search-&gt;current-&gt;flags, argv[0]-&gt;value.string);</div><div class='del'>-		</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = truth;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing user-tag\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		const char *value = NULL;</div><div class='del'>-		if (argc == 1) {</div><div class='del'>-			value = camel_tag_get(&amp;search-&gt;current-&gt;user_tags, argv[0]-&gt;value.string);</div><div class='del'>-		}</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_STRING);</div><div class='del'>-		r-&gt;value.string = g_strdup(value?value:"");</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-sent-date\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (s-&gt;current) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-</div><div class='del'>-		r-&gt;value.number = s-&gt;current-&gt;date_sent;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-received-date\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (s-&gt;current) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-</div><div class='del'>-		r-&gt;value.number = s-&gt;current-&gt;date_received;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-current-date\n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = time (NULL);</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_uid(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	r(printf("executing uid\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		int truth = FALSE;</div><div class='del'>-		const char *uid = camel_message_info_uid(search-&gt;current);</div><div class='del'>-</div><div class='del'>-		/* performs an OR of all words */</div><div class='del'>-		for (i=0;i&lt;argc &amp;&amp; !truth;i++) {</div><div class='del'>-			if (argv[i]-&gt;type == ESEXP_RES_STRING</div><div class='del'>-			    &amp;&amp; !strcmp(uid, argv[i]-&gt;value.string)) {</div><div class='del'>-				truth = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = truth;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-		for (i=0;i&lt;argc;i++) {</div><div class='del'>-			if (argv[i]-&gt;type == ESEXP_RES_STRING)</div><div class='del'>-				g_ptr_array_add(r-&gt;value.ptrarray, argv[i]-&gt;value.string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h<br/>deleted file mode 100644<br/>index 701178b0b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-search.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_FOLDER_SEARCH_H</div><div class='del'>-#define _CAMEL_FOLDER_SEARCH_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_SEARCH_TYPE         (camel_folder_search_get_type ())</div><div class='del'>-#define CAMEL_FOLDER_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)</div><div class='del'>-#define CAMEL_FOLDER_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass)</div><div class='del'>-#define CAMEL_IS_FOLDER_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_search_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderSearchClass CamelFolderSearchClass;</div><div class='del'>-</div><div class='del'>-struct _CamelFolderSearch {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderSearchPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ESExp *sexp;		/* s-exp evaluator */</div><div class='del'>-	char *last_search;	/* last searched expression */</div><div class='del'>-</div><div class='del'>-	/* these are only valid during the search, and are reset afterwards */</div><div class='del'>-	CamelFolder *folder;	/* folder for current search */</div><div class='del'>-	GPtrArray *summary;	/* summary array for current search */</div><div class='del'>-	GHashTable *summary_hash; /* hashtable of summary items */</div><div class='del'>-	CamelMessageInfo *current; /* current message info, when searching one by one */</div><div class='del'>-	CamelMessageInfo *match1; /* message info, when searching a single message only */</div><div class='del'>-	CamelMimeMessage *current_message; /* cache of current message, if required */</div><div class='del'>-	CamelIndex *body_index;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolderSearchClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* general bool/comparison options, usually these wont need to be set, unless it is compiling into another language */</div><div class='del'>-	ESExpResult * (*and)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-	ESExpResult * (*or)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-	ESExpResult * (*not)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	ESExpResult * (*lt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-	ESExpResult * (*gt)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-	ESExpResult * (*eq)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* search options */</div><div class='del'>-	/* (match-all [boolean expression]) Apply match to all messages */</div><div class='del'>-	ESExpResult * (*match_all)(struct _ESExp *f, int argc, struct _ESExpTerm **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (body-contains "string1" "string2" ...) Returns a list of matches, or true if in single-message mode */</div><div class='del'>-	ESExpResult * (*body_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (header-contains "headername" "string1" ...) List of matches, or true if in single-message mode */</div><div class='del'>-	ESExpResult * (*header_contains)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (header-matches "headername" "string") */</div><div class='del'>-	ESExpResult * (*header_matches)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (header-starts-with "headername" "string") */</div><div class='del'>-	ESExpResult * (*header_starts_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (header-ends-with "headername" "string") */</div><div class='del'>-	ESExpResult * (*header_ends_with)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (header-exists "headername") */</div><div class='del'>-	ESExpResult * (*header_exists)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (user-flag "flagname" "flagname" ...) If one of user-flag set */</div><div class='del'>-	ESExpResult * (*user_flag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (user-tag "flagname") Returns the value of a user tag.  Can only be used in match-all */</div><div class='del'>-	ESExpResult * (*user_tag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (system-flag "flagname") Returns the value of a system flag.  Can only be used in match-all */</div><div class='del'>-	ESExpResult * (*system_flag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-	</div><div class='del'>-	/* (get-sent-date) Retrieve the date that the message was sent on as a time_t */</div><div class='del'>-	ESExpResult * (*get_sent_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (get-received-date) Retrieve the date that the message was received on as a time_t */</div><div class='del'>-	ESExpResult * (*get_received_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (get-current-date) Retrieve 'now' as a time_t */</div><div class='del'>-	ESExpResult * (*get_current_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (uid "uid" ...) True if the uid is in the list */</div><div class='del'>-	ESExpResult * (*uid)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_folder_search_get_type	(void);</div><div class='del'>-CamelFolderSearch      *camel_folder_search_new	(void);</div><div class='del'>-void camel_folder_search_construct (CamelFolderSearch *search);</div><div class='del'>-</div><div class='del'>-void camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder);</div><div class='del'>-void camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary);</div><div class='del'>-void camel_folder_search_set_body_index(CamelFolderSearch *search, CamelIndex *index);</div><div class='del'>-GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);</div><div class='del'>-gboolean camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr,</div><div class='del'>-					      const CamelMessageInfo *info, CamelException *ex);</div><div class='del'>-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_FOLDER_SEARCH_H */</div><div class='head'>diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c<br/>deleted file mode 100644<br/>index aa5156b9be..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2748 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-file-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-index.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-charset.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-basic.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-html.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-multipart.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream-null.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "e-util/md5-utils.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-</div><div class='del'>-static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-/* this lock is ONLY for the standalone messageinfo stuff */</div><div class='del'>-#define GLOBAL_INFO_LOCK(i) pthread_mutex_lock(&amp;info_lock)</div><div class='del'>-#define GLOBAL_INFO_UNLOCK(i) pthread_mutex_unlock(&amp;info_lock)</div><div class='del'>-#else</div><div class='del'>-#define GLOBAL_INFO_LOCK(i) </div><div class='del'>-#define GLOBAL_INFO_UNLOCK(i) </div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* this should probably be conditional on it existing */</div><div class='del'>-#define USE_BSEARCH</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-#define io(x)			/* io debug */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-extern int strdup_count, malloc_count, free_count;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY_VERSION (12)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelFolderSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-/* trivial lists, just because ... */</div><div class='del'>-struct _node {</div><div class='del'>-	struct _node *next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct _node *my_list_append(struct _node **list, struct _node *n);</div><div class='del'>-static int my_list_size(struct _node **list);</div><div class='del'>-</div><div class='del'>-static int summary_header_load(CamelFolderSummary *, FILE *);</div><div class='del'>-static int summary_header_save(CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg);</div><div class='del'>-static CamelMessageInfo * message_info_load(CamelFolderSummary *, FILE *);</div><div class='del'>-static int		  message_info_save(CamelFolderSummary *, FILE *, CamelMessageInfo *);</div><div class='del'>-static void		  message_info_free(CamelFolderSummary *, CamelMessageInfo *);</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo * content_info_new(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummary *s, CamelMimePart *mp);</div><div class='del'>-static CamelMessageContentInfo * content_info_load(CamelFolderSummary *, FILE *);</div><div class='del'>-static int		         content_info_save(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);</div><div class='del'>-static void		         content_info_free(CamelFolderSummary *, CamelMessageContentInfo *);</div><div class='del'>-</div><div class='del'>-static char *next_uid_string(CamelFolderSummary *s);</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo * summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp);</div><div class='del'>-static CamelMessageContentInfo * summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object);</div><div class='del'>-</div><div class='del'>-static void camel_folder_summary_class_init (CamelFolderSummaryClass *klass);</div><div class='del'>-static void camel_folder_summary_init       (CamelFolderSummary *obj);</div><div class='del'>-static void camel_folder_summary_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_summary_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_summary_class_init (CamelFolderSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_folder_summary_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	klass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	klass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	klass-&gt;message_info_new_from_parser = message_info_new_from_parser;</div><div class='del'>-	klass-&gt;message_info_new_from_message = message_info_new_from_message;</div><div class='del'>-	klass-&gt;message_info_load = message_info_load;</div><div class='del'>-	klass-&gt;message_info_save = message_info_save;</div><div class='del'>-	klass-&gt;message_info_free = message_info_free;</div><div class='del'>-</div><div class='del'>-	klass-&gt;content_info_new  = content_info_new;</div><div class='del'>-	klass-&gt;content_info_new_from_parser = content_info_new_from_parser;</div><div class='del'>-	klass-&gt;content_info_new_from_message = content_info_new_from_message;</div><div class='del'>-	klass-&gt;content_info_load = content_info_load;</div><div class='del'>-	klass-&gt;content_info_save = content_info_save;</div><div class='del'>-	klass-&gt;content_info_free = content_info_free;</div><div class='del'>-</div><div class='del'>-	klass-&gt;next_uid_string = next_uid_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_summary_init (CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(s) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	p-&gt;filter_charset = g_hash_table_new(g_strcase_hash, g_strcase_equal);</div><div class='del'>-</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	s-&gt;message_info_chunks = NULL;</div><div class='del'>-	s-&gt;content_info_chunks = NULL;</div><div class='del'>-</div><div class='del'>-#if defined (DOESTRV) || defined (DOEPOOLV)</div><div class='del'>-	s-&gt;message_info_strings = CAMEL_MESSAGE_INFO_LAST;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	s-&gt;version = CAMEL_FOLDER_SUMMARY_VERSION;</div><div class='del'>-	s-&gt;flags = 0;</div><div class='del'>-	s-&gt;time = 0;</div><div class='del'>-	s-&gt;nextuid = 1;</div><div class='del'>-</div><div class='del'>-	s-&gt;messages = g_ptr_array_new();</div><div class='del'>-	s-&gt;messages_uid = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;summary_lock = g_mutex_new();</div><div class='del'>-	p-&gt;io_lock = g_mutex_new();</div><div class='del'>-	p-&gt;filter_lock = g_mutex_new();</div><div class='del'>-	p-&gt;alloc_lock = g_mutex_new();</div><div class='del'>-	p-&gt;ref_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_o_name(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	camel_object_unref((CamelObject *)value);</div><div class='del'>-	g_free(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_summary_finalize (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_clear(s);</div><div class='del'>-	g_ptr_array_free(s-&gt;messages, TRUE);</div><div class='del'>-	g_hash_table_destroy(s-&gt;messages_uid);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(p-&gt;filter_charset, free_o_name, 0);</div><div class='del'>-	g_hash_table_destroy(p-&gt;filter_charset);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;message_info_chunks)</div><div class='del'>-		e_memchunk_destroy(s-&gt;message_info_chunks);</div><div class='del'>-	if (s-&gt;content_info_chunks)</div><div class='del'>-		e_memchunk_destroy(s-&gt;content_info_chunks);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filter_index)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_index);</div><div class='del'>-	if (p-&gt;filter_64)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_64);</div><div class='del'>-	if (p-&gt;filter_qp)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_qp);</div><div class='del'>-	if (p-&gt;filter_uu)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_uu);</div><div class='del'>-	if (p-&gt;filter_save)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_save);</div><div class='del'>-	if (p-&gt;filter_html)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_html);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filter_stream)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;filter_stream);</div><div class='del'>-	if (p-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;index);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(p-&gt;summary_lock);</div><div class='del'>-	g_mutex_free(p-&gt;io_lock);</div><div class='del'>-	g_mutex_free(p-&gt;filter_lock);</div><div class='del'>-	g_mutex_free(p-&gt;alloc_lock);</div><div class='del'>-	g_mutex_free(p-&gt;ref_lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelFolderSummary",</div><div class='del'>-					    sizeof (CamelFolderSummary),</div><div class='del'>-					    sizeof (CamelFolderSummaryClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_folder_summary_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_folder_summary_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_folder_summary_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelFolderSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelFolderSummary widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSummary *</div><div class='del'>-camel_folder_summary_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *new = CAMEL_FOLDER_SUMMARY ( camel_object_new (camel_folder_summary_get_type ()));	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_set_filename:</div><div class='del'>- * @s: </div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Set the filename where the summary will be loaded to/saved from.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_set_filename(CamelFolderSummary *s, const char *name)</div><div class='del'>-{</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;summary_path);</div><div class='del'>-	s-&gt;summary_path = g_strdup(name);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_set_index:</div><div class='del'>- * @s: </div><div class='del'>- * @index: </div><div class='del'>- * </div><div class='del'>- * Set the index used to index body content.  If the index is NULL, or</div><div class='del'>- * not set (the default), no indexing of body content will take place.</div><div class='del'>- *</div><div class='del'>- * Unlike earlier behaviour, build_content need not be set to perform indexing.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_set_index(CamelFolderSummary *s, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;index);</div><div class='del'>-</div><div class='del'>-	p-&gt;index = index;</div><div class='del'>-	if (index)</div><div class='del'>-		camel_object_ref((CamelObject *)index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_set_build_content:</div><div class='del'>- * @s: </div><div class='del'>- * @state: </div><div class='del'>- * </div><div class='del'>- * Set a flag to tell the summary to build the content info summary</div><div class='del'>- * (CamelMessageInfo.content).  The default is not to build content info</div><div class='del'>- * summaries.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_set_build_content(CamelFolderSummary *s, gboolean state)</div><div class='del'>-{</div><div class='del'>-	s-&gt;build_content = state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_count:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Get the number of summary items stored in this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: The number of items int he summary.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_count(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	return s-&gt;messages-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_index:</div><div class='del'>- * @s: </div><div class='del'>- * @i: </div><div class='del'>- * </div><div class='del'>- * Retrieve a summary item by index number.</div><div class='del'>- *</div><div class='del'>- * A referenced to the summary item is returned, which may be</div><div class='del'>- * ref'd or free'd as appropriate.</div><div class='del'>- * </div><div class='del'>- * Return value: The summary item, or NULL if the index @i is out</div><div class='del'>- * of range.</div><div class='del'>- * It must be freed using camel_folder_summary_info_free().</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_folder_summary_index(CamelFolderSummary *s, int i)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	if (i&lt;s-&gt;messages-&gt;len)</div><div class='del'>-		info = g_ptr_array_index(s-&gt;messages, i);</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_index:</div><div class='del'>- * @s: </div><div class='del'>- * @i: </div><div class='del'>- * </div><div class='del'>- * Obtain a copy of the summary array.  This is done atomically,</div><div class='del'>- * so cannot contain empty entries.</div><div class='del'>- *</div><div class='del'>- * It must be freed using camel_folder_summary_array_free().</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_summary_array(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *res = g_ptr_array_new();</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_set_size(res, s-&gt;messages-&gt;len);</div><div class='del'>-	for (i=0;i&lt;s-&gt;messages-&gt;len;i++) {</div><div class='del'>-		info = res-&gt;pdata[i] = g_ptr_array_index(s-&gt;messages, i);</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_array_free:</div><div class='del'>- * @s: </div><div class='del'>- * @array: </div><div class='del'>- * </div><div class='del'>- * Free the folder summary array.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;array-&gt;len;i++)</div><div class='del'>-		camel_folder_summary_info_free(s, array-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_uid:</div><div class='del'>- * @s: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Retrieve a summary item by uid.</div><div class='del'>- *</div><div class='del'>- * A referenced to the summary item is returned, which may be</div><div class='del'>- * ref'd or free'd as appropriate.</div><div class='del'>- * </div><div class='del'>- * Return value: The summary item, or NULL if the uid @uid</div><div class='del'>- * is not available.</div><div class='del'>- * It must be freed using camel_folder_summary_info_free().</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_folder_summary_uid(CamelFolderSummary *s, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	info = g_hash_table_lookup(s-&gt;messages_uid, uid);</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_next_uid:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Generate a new unique uid value as an integer.  This</div><div class='del'>- * may be used to create a unique sequence of numbers.</div><div class='del'>- * </div><div class='del'>- * Return value: The next unique uid value.</div><div class='del'>- **/</div><div class='del'>-guint32 camel_folder_summary_next_uid(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	guint32 uid;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	uid = s-&gt;nextuid++;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	/* FIXME: sync this to disk */</div><div class='del'>-/*	summary_header_save(s);*/</div><div class='del'>-	return uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_set_uid:</div><div class='del'>- * @s: </div><div class='del'>- * @uid: The next minimum uid to assign.  To avoid clashing</div><div class='del'>- * uid's, set this to the uid of a given messages + 1.</div><div class='del'>- * </div><div class='del'>- * Set the next minimum uid available.  This can be used to</div><div class='del'>- * ensure new uid's do not clash with existing uid's.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)</div><div class='del'>-{</div><div class='del'>-	/* TODO: sync to disk? */</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	s-&gt;nextuid = MAX(s-&gt;nextuid, uid);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_next_uid_string:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Retrieve the next uid, but as a formatted string.</div><div class='del'>- * </div><div class='del'>- * Return value: The next uid as an unsigned integer string.</div><div class='del'>- * This string must be freed by the caller.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_folder_summary_next_uid_string(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;next_uid_string(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* loads the content descriptions, recursively */</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-perform_content_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	guint32 count;</div><div class='del'>-	CamelMessageContentInfo *ci, *part;</div><div class='del'>-</div><div class='del'>-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_load(s, in);</div><div class='del'>-	if (ci == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;count) == -1 || count &gt; 500) {</div><div class='del'>-		camel_folder_summary_content_info_free(s, ci);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		part = perform_content_info_load(s, in);</div><div class='del'>-		if (part) {</div><div class='del'>-			my_list_append((struct _node **)&amp;ci-&gt;childs, (struct _node *)part);</div><div class='del'>-			part-&gt;parent = ci;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Summary file format messed up?");</div><div class='del'>-			camel_folder_summary_content_info_free(s, ci);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_load(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *in;</div><div class='del'>-	int i;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	in = fopen(s-&gt;summary_path, "r");</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_load(s, in) == -1)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* now read in each message ... */</div><div class='del'>-	for (i=0;i&lt;s-&gt;saved_count;i++) {</div><div class='del'>-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_load(s, in);</div><div class='del'>-</div><div class='del'>-		if (mi == NULL)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		if (s-&gt;build_content) {</div><div class='del'>-			mi-&gt;content = perform_content_info_load(s, in);</div><div class='del'>-			if (mi-&gt;content == NULL) {</div><div class='del'>-				camel_folder_summary_info_free(s, mi);</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_folder_summary_add(s, mi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	</div><div class='del'>-	if (fclose(in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	g_warning("Cannot load summary file: %s", strerror(ferror(in)));</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	fclose(in);</div><div class='del'>-	s-&gt;flags |= ~CAMEL_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* saves the content descriptions, recursively */</div><div class='del'>-static int</div><div class='del'>-perform_content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *part;</div><div class='del'>-</div><div class='del'>-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_save(s, out, ci);</div><div class='del'>-	camel_file_util_encode_uint32(out, my_list_size((struct _node **)&amp;ci-&gt;childs));</div><div class='del'>-	part = ci-&gt;childs;</div><div class='del'>-	while (part) {</div><div class='del'>-		perform_content_info_save(s, out, part);</div><div class='del'>-		part = part-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_save:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Writes the summary to disk.  The summary is only written if changes</div><div class='del'>- * have occured.</div><div class='del'>- * </div><div class='del'>- * Return value: Returns -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_save(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *out;</div><div class='del'>-	int fd;</div><div class='del'>-	int i;</div><div class='del'>-	guint32 count;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;flags &amp; CAMEL_SUMMARY_DIRTY) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	fd = open(s-&gt;summary_path, O_RDWR|O_CREAT, 0600);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	out = fdopen(fd, "w");</div><div class='del'>-	if ( out == NULL ) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	io(printf("saving header\n"));</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-</div><div class='del'>-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_save(s, out) == -1) {</div><div class='del'>-		fclose(out);</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now write out each message ... */</div><div class='del'>-	/* FIXME: check returns */</div><div class='del'>-</div><div class='del'>-	count = s-&gt;messages-&gt;len;</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		mi = s-&gt;messages-&gt;pdata[i];</div><div class='del'>-		((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_save(s, out, mi);</div><div class='del'>-</div><div class='del'>-		if (s-&gt;build_content) {</div><div class='del'>-			perform_content_info_save(s, out, mi-&gt;content);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-</div><div class='del'>-	if (fclose(out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_SUMMARY_DIRTY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_header_load:</div><div class='del'>- * @s: Summary object.</div><div class='del'>- * </div><div class='del'>- * Only load the header information from the summary,</div><div class='del'>- * keep the rest on disk.  This should only be done on</div><div class='del'>- * a fresh summary object.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int camel_folder_summary_header_load(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *in;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	in = fopen(s-&gt;summary_path, "r");</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-	ret = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_load(s, in);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	</div><div class='del'>-	fclose(in);</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_SUMMARY_DIRTY;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-summary_assign_uid(CamelFolderSummary *s, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	uid = camel_message_info_uid(info);</div><div class='del'>-	if (uid == NULL || uid[0] == 0) {</div><div class='del'>-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));</div><div class='del'>-		uid = camel_message_info_uid(info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	while (g_hash_table_lookup(s-&gt;messages_uid, uid)) {</div><div class='del'>-		g_warning("Trying to insert message with clashing uid (%s).  new uid re-assigned", camel_message_info_uid(info));</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		camel_message_info_set_uid(info, camel_folder_summary_next_uid_string(s));</div><div class='del'>-		uid = camel_message_info_uid(info);</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_add:</div><div class='del'>- * @s: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Adds a new @info record to the summary.  If @info-&gt;uid is NULL, then a new</div><div class='del'>- * uid is automatically re-assigned by calling :next_uid_string().</div><div class='del'>- *</div><div class='del'>- * The @info record should have been generated by calling one of the</div><div class='del'>- * info_new_*() functions, as it will be free'd based on the summary</div><div class='del'>- * class.  And MUST NOT be allocated directly using malloc.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_add(CamelFolderSummary *s, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	summary_assign_uid(s, info);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-/* unnecessary for pooled vectors */</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-	/* this is vitally important, and also if this is ever modified, then</div><div class='del'>-	   the hash table needs to be resynced */</div><div class='del'>-	info-&gt;strings = e_strv_pack(info-&gt;strings);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_ptr_array_add(s-&gt;messages, info);</div><div class='del'>-	g_hash_table_insert(s-&gt;messages_uid, (char *)camel_message_info_uid(info), info);</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_add_from_header:</div><div class='del'>- * @s: </div><div class='del'>- * @h: </div><div class='del'>- * </div><div class='del'>- * Build a new info record based on a set of headers, and add it to the</div><div class='del'>- * summary.</div><div class='del'>- *</div><div class='del'>- * Note that this function should not be used if build_content_info has</div><div class='del'>- * been specified for this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: The newly added record.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info = camel_folder_summary_info_new_from_header(s, h);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_add(s, info);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_add_from_parser:</div><div class='del'>- * @s: </div><div class='del'>- * @mp: </div><div class='del'>- * </div><div class='del'>- * Build a new info record based on the current position of a CamelMimeParser.</div><div class='del'>- *</div><div class='del'>- * The parser should be positioned before the start of the message to summarise.</div><div class='del'>- * This function may be used if build_contnet_info or an index has been</div><div class='del'>- * specified for the summary.</div><div class='del'>- * </div><div class='del'>- * Return value: The newly added record.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info = camel_folder_summary_info_new_from_parser(s, mp);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_add(s, info);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_add_from_message:</div><div class='del'>- * @s: </div><div class='del'>- * @msg: </div><div class='del'>- * </div><div class='del'>- * Add a summary item from an existing message.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info = camel_folder_summary_info_new_from_message(s, msg);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_add(s, info);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_new_from_header:</div><div class='del'>- * @s: </div><div class='del'>- * @h: </div><div class='del'>- * </div><div class='del'>- * Create a new info record from a header.</div><div class='del'>- * </div><div class='del'>- * Return value: Guess?  This info record MUST be freed using</div><div class='del'>- * camel_folder_summary_info_free(), camel_message_info_free() will not work.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	return ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -&gt; message_info_new(s, h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_new_from_parser:</div><div class='del'>- * @s: </div><div class='del'>- * @mp: </div><div class='del'>- * </div><div class='del'>- * Create a new info record from a parser.  If the parser cannot</div><div class='del'>- * determine a uid, then none will be assigned.</div><div class='del'>-</div><div class='del'>- * If indexing is enabled, and the parser cannot determine a new uid, then</div><div class='del'>- * one is automatically assigned.</div><div class='del'>- *</div><div class='del'>- * If indexing is enabled, then the content will be indexed based</div><div class='del'>- * on this new uid.  In this case, the message info MUST be</div><div class='del'>- * added using :add().</div><div class='del'>- *</div><div class='del'>- * Once complete, the parser will be positioned at the end of</div><div class='del'>- * the message.</div><div class='del'>- *</div><div class='del'>- * Return value: Guess?  This info record MUST be freed using</div><div class='del'>- * camel_folder_summary_info_free(), camel_message_info_free() will not work.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info = NULL;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len;</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-	off_t start;</div><div class='del'>-	CamelIndexName *name = NULL;</div><div class='del'>-</div><div class='del'>-	/* should this check the parser is in the right state, or assume it is?? */</div><div class='del'>-</div><div class='del'>-	start = camel_mime_parser_tell(mp);</div><div class='del'>-	if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_EOF) {</div><div class='del'>-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new_from_parser(s, mp);</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_unstep(mp);</div><div class='del'>-</div><div class='del'>-		/* assign a unique uid, this is slightly 'wrong' as we do not really</div><div class='del'>-		 * know if we are going to store this in the summary, but no matter */</div><div class='del'>-		if (p-&gt;index)</div><div class='del'>-			summary_assign_uid(s, info);</div><div class='del'>-</div><div class='del'>-		CAMEL_SUMMARY_LOCK(s, filter_lock);</div><div class='del'>-</div><div class='del'>-		if (p-&gt;index) {</div><div class='del'>-			if (p-&gt;filter_index == NULL)</div><div class='del'>-				p-&gt;filter_index = camel_mime_filter_index_new_index(p-&gt;index);</div><div class='del'>-			camel_index_delete_name(p-&gt;index, camel_message_info_uid(info));</div><div class='del'>-			name = camel_index_add_name(p-&gt;index, camel_message_info_uid(info));</div><div class='del'>-			camel_mime_filter_index_set_name(p-&gt;filter_index, name);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* always scan the content info, even if we dont save it */</div><div class='del'>-		info-&gt;content = summary_build_content_info(s, info, mp);</div><div class='del'>-</div><div class='del'>-		if (name) {</div><div class='del'>-			camel_index_write_name(p-&gt;index, name);</div><div class='del'>-			camel_object_unref((CamelObject *)name);</div><div class='del'>-			camel_mime_filter_index_set_name(p-&gt;filter_index, NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, filter_lock);</div><div class='del'>-</div><div class='del'>-		info-&gt;size = camel_mime_parser_tell(mp) - start;</div><div class='del'>-	}</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_new_from_message:</div><div class='del'>- * @: </div><div class='del'>- * @: </div><div class='del'>- * </div><div class='del'>- * Create a summary item from a message.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-	CamelIndexName *name = NULL;</div><div class='del'>-</div><div class='del'>-	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new_from_message(s, msg);</div><div class='del'>-</div><div class='del'>-	/* assign a unique uid, this is slightly 'wrong' as we do not really</div><div class='del'>-	 * know if we are going to store this in the summary, but no matter */</div><div class='del'>-	summary_assign_uid(s, info);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, filter_lock);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;index) {</div><div class='del'>-		if (p-&gt;filter_index == NULL)</div><div class='del'>-			p-&gt;filter_index = camel_mime_filter_index_new_index(p-&gt;index);</div><div class='del'>-		camel_index_delete_name(p-&gt;index, camel_message_info_uid(info));</div><div class='del'>-		name = camel_index_add_name(p-&gt;index, camel_message_info_uid(info));</div><div class='del'>-		camel_mime_filter_index_set_name(p-&gt;filter_index, name);</div><div class='del'>-</div><div class='del'>-		if (p-&gt;filter_stream == NULL) {</div><div class='del'>-			CamelStream *null = camel_stream_null_new();</div><div class='del'>-</div><div class='del'>-			p-&gt;filter_stream = camel_stream_filter_new_with_stream(null);</div><div class='del'>-			camel_object_unref((CamelObject *)null);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;content = summary_build_content_info_message(s, info, (CamelMimePart *)msg);</div><div class='del'>-</div><div class='del'>-	if (name) {</div><div class='del'>-		camel_index_write_name(p-&gt;index, name);</div><div class='del'>-		camel_object_unref((CamelObject *)name);</div><div class='del'>-		camel_mime_filter_index_set_name(p-&gt;filter_index, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, filter_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_content_info_free:</div><div class='del'>- * @s: </div><div class='del'>- * @ci: </div><div class='del'>- * </div><div class='del'>- * Free the content info @ci, and all associated memory.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *pw, *pn;</div><div class='del'>-</div><div class='del'>-	pw = ci-&gt;childs;</div><div class='del'>-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_free(s, ci);</div><div class='del'>-	while (pw) {</div><div class='del'>-		pn = pw-&gt;next;</div><div class='del'>-		camel_folder_summary_content_info_free(s, pw);</div><div class='del'>-		pw = pn;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_free:</div><div class='del'>- * @s: </div><div class='del'>- * @mi: </div><div class='del'>- * </div><div class='del'>- * Unref and potentially free the message info @mi, and all associated memory.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci;</div><div class='del'>-</div><div class='del'>-	g_assert(mi);</div><div class='del'>-	g_assert(s);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	g_assert(mi-&gt;refcount &gt;= 1);</div><div class='del'>-</div><div class='del'>-	mi-&gt;refcount--;</div><div class='del'>-	if (mi-&gt;refcount &gt; 0) {</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	ci = mi-&gt;content;</div><div class='del'>-</div><div class='del'>-	((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_free(s, mi);		</div><div class='del'>-	if (s-&gt;build_content &amp;&amp; ci) {</div><div class='del'>-		camel_folder_summary_content_info_free(s, ci);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_ref:</div><div class='del'>- * @s: </div><div class='del'>- * @mi: </div><div class='del'>- * </div><div class='del'>- * Add an extra reference to @mi.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_info_ref(CamelFolderSummary *s, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_assert(mi);</div><div class='del'>-	g_assert(s);</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	g_assert(mi-&gt;refcount &gt;= 1);</div><div class='del'>-	mi-&gt;refcount++;</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_touch:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Mark the summary as changed, so that a save will save it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_summary_touch(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_clear:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Empty the summary contents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_summary_clear(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	if (camel_folder_summary_count(s) == 0) {</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;s-&gt;messages-&gt;len;i++)</div><div class='del'>-		camel_folder_summary_info_free(s, s-&gt;messages-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_set_size(s-&gt;messages, 0);</div><div class='del'>-	g_hash_table_destroy(s-&gt;messages_uid);</div><div class='del'>-	s-&gt;messages_uid = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_remove:</div><div class='del'>- * @s: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Remove a specific @info record from the summary.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	g_hash_table_remove(s-&gt;messages_uid, camel_message_info_uid(info));</div><div class='del'>-	g_ptr_array_remove(s-&gt;messages, info);</div><div class='del'>-	s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_free(s, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_remove_uid:</div><div class='del'>- * @s: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Remove a specific info record from the summary, by @uid.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid)</div><div class='del'>-{</div><div class='del'>-        CamelMessageInfo *oldinfo;</div><div class='del'>-        char *olduid;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-        if (g_hash_table_lookup_extended(s-&gt;messages_uid, uid, (void *)&amp;olduid, (void *)&amp;oldinfo)) {</div><div class='del'>-		/* make sure it doesn't vanish while we're removing it */</div><div class='del'>-		oldinfo-&gt;refcount++;</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		camel_folder_summary_remove(s, oldinfo);</div><div class='del'>-		camel_folder_summary_info_free(s, oldinfo);</div><div class='del'>-        } else {</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_remove_index:</div><div class='del'>- * @s: </div><div class='del'>- * @index: </div><div class='del'>- * </div><div class='del'>- * Remove a specific info record from the summary, by index.</div><div class='del'>- **/</div><div class='del'>-void camel_folder_summary_remove_index(CamelFolderSummary *s, int index)</div><div class='del'>-{</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	if (index &lt; s-&gt;messages-&gt;len) {</div><div class='del'>-		CamelMessageInfo *info = s-&gt;messages-&gt;pdata[index];</div><div class='del'>-</div><div class='del'>-		g_hash_table_remove(s-&gt;messages_uid, camel_message_info_uid(info));</div><div class='del'>-		g_ptr_array_remove_index(s-&gt;messages, index);</div><div class='del'>-		s-&gt;flags |= CAMEL_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		camel_folder_summary_info_free(s, info);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* should be sorted, for binary search */</div><div class='del'>-/* This is a tokenisation mechanism for strings written to the</div><div class='del'>-   summary - to save space.</div><div class='del'>-   This list can have at most 31 words. */</div><div class='del'>-static char * tokens[] = {</div><div class='del'>-	"7bit",</div><div class='del'>-	"8bit",</div><div class='del'>-	"alternative",</div><div class='del'>-	"application",</div><div class='del'>-	"base64",</div><div class='del'>-	"boundary",</div><div class='del'>-	"charset",</div><div class='del'>-	"filename",</div><div class='del'>-	"html",</div><div class='del'>-	"image",</div><div class='del'>-	"iso-8859-1",</div><div class='del'>-	"iso-8859-8",</div><div class='del'>-	"message",</div><div class='del'>-	"mixed",</div><div class='del'>-	"multipart",</div><div class='del'>-	"name",</div><div class='del'>-	"octet-stream",</div><div class='del'>-	"parallel",</div><div class='del'>-	"plain",</div><div class='del'>-	"postscript",</div><div class='del'>-	"quoted-printable",</div><div class='del'>-	"related",</div><div class='del'>-	"rfc822",</div><div class='del'>-	"text",</div><div class='del'>-	"us-ascii",		/* 25 words */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define tokens_len (sizeof(tokens)/sizeof(tokens[0]))</div><div class='del'>-</div><div class='del'>-/* baiscally ...</div><div class='del'>-    0 = null</div><div class='del'>-    1-tokens_len == tokens[id-1]</div><div class='del'>-    &gt;=32 string, length = n-32</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifdef USE_BSEARCH</div><div class='del'>-static int</div><div class='del'>-token_search_cmp(char *key, char **index)</div><div class='del'>-{</div><div class='del'>-	d(printf("comparing '%s' to '%s'\n", key, *index));</div><div class='del'>-	return strcmp(key, *index);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_encode_token:</div><div class='del'>- * @out: </div><div class='del'>- * @str: </div><div class='del'>- * </div><div class='del'>- * Encode a string value, but use tokenisation and compression</div><div class='del'>- * to reduce the size taken for common mailer words.  This</div><div class='del'>- * can still be used to encode normal strings as well.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_encode_token(FILE *out, const char *str)</div><div class='del'>-{</div><div class='del'>-	io(printf("Encoding token: '%s'\n", str));</div><div class='del'>-</div><div class='del'>-	if (str == NULL) {</div><div class='del'>-		return camel_file_util_encode_uint32(out, 0);</div><div class='del'>-	} else {</div><div class='del'>-		int len = strlen(str);</div><div class='del'>-		int i, token=-1;</div><div class='del'>-</div><div class='del'>-		if (len &lt;= 16) {</div><div class='del'>-			char lower[32];</div><div class='del'>-			char **match;</div><div class='del'>-</div><div class='del'>-			for (i=0;i&lt;len;i++)</div><div class='del'>-				lower[i] = tolower(str[i]);</div><div class='del'>-			lower[i] = 0;</div><div class='del'>-#ifdef USE_BSEARCH</div><div class='del'>-			match = bsearch(lower, tokens, tokens_len, sizeof(char *), (int (*)(const void *, const void *))token_search_cmp);</div><div class='del'>-			if (match)</div><div class='del'>-				token = match-tokens;</div><div class='del'>-#else</div><div class='del'>-			for (i=0;i&lt;tokens_len;i++) {</div><div class='del'>-				if (!strcmp(tokens[i], lower)) {</div><div class='del'>-					token = i;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		if (token != -1) {</div><div class='del'>-			return camel_file_util_encode_uint32(out, token+1);</div><div class='del'>-		} else {</div><div class='del'>-			if (camel_file_util_encode_uint32(out, len+32) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			if (fwrite(str, len, 1, out) != 1)</div><div class='del'>-				return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_decode_token:</div><div class='del'>- * @in: </div><div class='del'>- * @str: </div><div class='del'>- * </div><div class='del'>- * Decode a token value.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_decode_token(FILE *in, char **str)</div><div class='del'>-{</div><div class='del'>-	char *ret;</div><div class='del'>-	guint32 len;</div><div class='del'>-</div><div class='del'>-	io(printf("Decode token ...\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;len) == -1) {</div><div class='del'>-		g_warning("Could not decode token from file");</div><div class='del'>-		*str = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len&lt;32) {</div><div class='del'>-		if (len &lt;= 0) {</div><div class='del'>-			ret = NULL;</div><div class='del'>-		} else if (len&lt;= tokens_len) {</div><div class='del'>-			ret = g_strdup(tokens[len-1]);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Invalid token encountered: %d", len);</div><div class='del'>-			*str = NULL;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	} else if (len &gt; 10240) {</div><div class='del'>-		g_warning("Got broken string header length: %d bytes", len);</div><div class='del'>-		*str = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	} else {</div><div class='del'>-		len -= 32;</div><div class='del'>-		ret = g_malloc(len+1);</div><div class='del'>-		if (fread(ret, len, 1, in) != 1) {</div><div class='del'>-			g_free(ret);</div><div class='del'>-			*str = NULL;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		ret[len]=0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	io(printf("Token = '%s'\n", ret));</div><div class='del'>-</div><div class='del'>-	*str = ret;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _node *</div><div class='del'>-my_list_append(struct _node **list, struct _node *n)</div><div class='del'>-{</div><div class='del'>-	struct _node *ln = (struct _node *)list;</div><div class='del'>-	while (ln-&gt;next)</div><div class='del'>-		ln = ln-&gt;next;</div><div class='del'>-	n-&gt;next = 0;</div><div class='del'>-	ln-&gt;next = n;</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-my_list_size(struct _node **list)</div><div class='del'>-{</div><div class='del'>-	int len = 0;</div><div class='del'>-	struct _node *ln = (struct _node *)list;</div><div class='del'>-	while (ln-&gt;next) {</div><div class='del'>-		ln = ln-&gt;next;</div><div class='del'>-		len++;</div><div class='del'>-	}</div><div class='del'>-	return len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	gint32 version, flags, nextuid, count;</div><div class='del'>-	time_t time;</div><div class='del'>-</div><div class='del'>-	fseek(in, 0, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	io(printf("Loading header\n"));</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_fixed_int32(in, &amp;version) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;flags) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;nextuid) == -1</div><div class='del'>-	    || camel_file_util_decode_time_t(in, &amp;time) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;count) == -1) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;nextuid = nextuid;</div><div class='del'>-	s-&gt;flags = flags;</div><div class='del'>-	s-&gt;time = time;</div><div class='del'>-	s-&gt;saved_count = count;</div><div class='del'>-	if (s-&gt;version != version) {</div><div class='del'>-		g_warning("Summary header version mismatch");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save(CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	fseek(out, 0, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	io(printf("Savining header\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, s-&gt;version);</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, s-&gt;flags);</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, s-&gt;nextuid);</div><div class='del'>-	camel_file_util_encode_time_t(out, s-&gt;time);</div><div class='del'>-	return camel_file_util_encode_fixed_int32(out, camel_folder_summary_count(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* are these even useful for anything??? */</div><div class='del'>-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi = NULL;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	state = camel_mime_parser_state(mp);</div><div class='del'>-	switch (state) {</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new(s, camel_mime_parser_headers_raw(mp));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error("Invalid parser state");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci = NULL;</div><div class='del'>-</div><div class='del'>-	switch (camel_mime_parser_state(mp)) {</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_new(s, camel_mime_parser_headers_raw(mp));</div><div class='del'>-		if (ci) {</div><div class='del'>-			ci-&gt;type = camel_mime_parser_content_type(mp);</div><div class='del'>-			header_content_type_ref(ci-&gt;type);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error("Invalid parser state");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new_from_message(CamelFolderSummary *s, CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new(s, ((CamelMimePart *)msg)-&gt;headers);</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummary *s, CamelMimePart *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci;</div><div class='del'>-</div><div class='del'>-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_new(s, mp-&gt;headers);</div><div class='del'>-</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-summary_format_address(struct _header_raw *h, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *addr;</div><div class='del'>-	const char *text;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	text = header_raw_find (&amp;h, name, NULL);</div><div class='del'>-	addr = header_address_decode (text);</div><div class='del'>-	if (addr) {</div><div class='del'>-		ret = header_address_list_format (addr);</div><div class='del'>-		header_address_list_clear (&amp;addr);</div><div class='del'>-	} else {</div><div class='del'>-		ret = g_strdup (text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-summary_format_string (struct _header_raw *h, const char *name, const char *charset)</div><div class='del'>-{</div><div class='del'>-	const char *text;</div><div class='del'>-	</div><div class='del'>-	text = header_raw_find (&amp;h, name, NULL);</div><div class='del'>-	if (text) {</div><div class='del'>-		while (isspace ((unsigned) *text))</div><div class='del'>-			text++;</div><div class='del'>-		return header_decode_string (text, charset);</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_info_new:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Allocate a new camel message info, suitable for adding</div><div class='del'>- * to this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_folder_summary_info_new(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, alloc_lock);</div><div class='del'>-	if (s-&gt;message_info_chunks == NULL)</div><div class='del'>-		s-&gt;message_info_chunks = e_memchunk_new(32, s-&gt;message_info_size);</div><div class='del'>-	mi = e_memchunk_alloc(s-&gt;message_info_chunks);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);</div><div class='del'>-</div><div class='del'>-	memset(mi, 0, s-&gt;message_info_size);</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	mi-&gt;strings = e_poolv_new (s-&gt;message_info_strings);</div><div class='del'>-#endif</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-	mi-&gt;strings = e_strv_new(s-&gt;message_info_strings);</div><div class='del'>-#endif</div><div class='del'>-	mi-&gt;refcount = 1;</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_content_info_new:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Allocate a new camel message content info, suitable for adding</div><div class='del'>- * to this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelMessageContentInfo *</div><div class='del'>-camel_folder_summary_content_info_new(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci;</div><div class='del'>-</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, alloc_lock);</div><div class='del'>-	if (s-&gt;content_info_chunks == NULL)</div><div class='del'>-		s-&gt;content_info_chunks = e_memchunk_new(32, s-&gt;content_info_size);</div><div class='del'>-	ci = e_memchunk_alloc(s-&gt;content_info_chunks);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, alloc_lock);</div><div class='del'>-</div><div class='del'>-	memset(ci, 0, s-&gt;content_info_size);</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	const char *received;</div><div class='del'>-	guchar digest[16];</div><div class='del'>-	struct _header_references *refs, *irt, *scan;</div><div class='del'>-	char *msgid;</div><div class='del'>-	int count;</div><div class='del'>-	char *subject, *from, *to, *cc, *mlist;</div><div class='del'>-	struct _header_content_type *ct = NULL;</div><div class='del'>-	const char *content, *charset = NULL;</div><div class='del'>-</div><div class='del'>-	mi = camel_folder_summary_info_new(s);</div><div class='del'>-</div><div class='del'>-	if ((content = header_raw_find(&amp;h, "Content-Type", NULL))</div><div class='del'>-	     &amp;&amp; (ct = header_content_type_decode(content))</div><div class='del'>-	     &amp;&amp; (charset = header_content_type_param(ct, "charset"))</div><div class='del'>-	     &amp;&amp; (strcasecmp(charset, "us-ascii") == 0))</div><div class='del'>-		charset = NULL;</div><div class='del'>-</div><div class='del'>-	charset = e_iconv_charset_name(charset);</div><div class='del'>-</div><div class='del'>-	subject = summary_format_string(h, "subject", charset);</div><div class='del'>-	from = summary_format_address(h, "from");</div><div class='del'>-	to = summary_format_address(h, "to");</div><div class='del'>-	cc = summary_format_address(h, "cc");</div><div class='del'>-	mlist = header_raw_check_mailing_list(&amp;h);</div><div class='del'>-</div><div class='del'>-	if (ct)</div><div class='del'>-		header_content_type_unref(ct);</div><div class='del'>-</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_SUBJECT, subject, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_FROM, from, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_TO, to, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_CC, cc, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_MLIST, mlist, TRUE);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_SUBJECT, subject);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_FROM, from);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_TO, to);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_CC, cc);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_MLIST, mlist);</div><div class='del'>-#else</div><div class='del'>-	mi-&gt;subject = subject;</div><div class='del'>-	mi-&gt;from = from;</div><div class='del'>-	mi-&gt;to = to;</div><div class='del'>-	mi-&gt;cc = cc;</div><div class='del'>-	mi-&gt;mlist = mlist;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mi-&gt;user_flags = NULL;</div><div class='del'>-	mi-&gt;user_tags = NULL;</div><div class='del'>-	mi-&gt;date_sent = header_decode_date(header_raw_find(&amp;h, "date", NULL), NULL);</div><div class='del'>-	received = header_raw_find(&amp;h, "received", NULL);</div><div class='del'>-	if (received)</div><div class='del'>-		received = strrchr(received, ';');</div><div class='del'>-	if (received)</div><div class='del'>-		mi-&gt;date_received = header_decode_date(received + 1, NULL);</div><div class='del'>-	else</div><div class='del'>-		mi-&gt;date_received = 0;</div><div class='del'>-</div><div class='del'>-	msgid = header_msgid_decode(header_raw_find(&amp;h, "message-id", NULL));</div><div class='del'>-	if (msgid) {</div><div class='del'>-		md5_get_digest(msgid, strlen(msgid), digest);</div><div class='del'>-		memcpy(mi-&gt;message_id.id.hash, digest, sizeof(mi-&gt;message_id.id.hash));</div><div class='del'>-		g_free(msgid);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* decode our references and in-reply-to headers */</div><div class='del'>-	refs = header_references_decode (header_raw_find (&amp;h, "references", NULL));</div><div class='del'>-	irt = header_references_inreplyto_decode (header_raw_find (&amp;h, "in-reply-to", NULL));</div><div class='del'>-	if (refs || irt) {</div><div class='del'>-		if (irt) {</div><div class='del'>-			/* The References field is populated from the ``References'' and/or ``In-Reply-To''</div><div class='del'>-			   headers. If both headers exist, take the first thing in the In-Reply-To header</div><div class='del'>-			   that looks like a Message-ID, and append it to the References header. */</div><div class='del'>-			</div><div class='del'>-			if (refs)</div><div class='del'>-				irt-&gt;next = refs;</div><div class='del'>-			</div><div class='del'>-			refs = irt;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		count = header_references_list_size(&amp;refs);</div><div class='del'>-		mi-&gt;references = g_malloc(sizeof(*mi-&gt;references) + ((count-1) * sizeof(mi-&gt;references-&gt;references[0])));</div><div class='del'>-		count = 0;</div><div class='del'>-		scan = refs;</div><div class='del'>-		while (scan) {</div><div class='del'>-			md5_get_digest(scan-&gt;id, strlen(scan-&gt;id), digest);</div><div class='del'>-			memcpy(mi-&gt;references-&gt;references[count].id.hash, digest, sizeof(mi-&gt;message_id.id.hash));</div><div class='del'>-			count++;</div><div class='del'>-			scan = scan-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		mi-&gt;references-&gt;size = count;</div><div class='del'>-		header_references_list_clear(&amp;refs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	guint count;</div><div class='del'>-	int i;</div><div class='del'>-	char *subject, *from, *to, *cc, *mlist, *uid;;</div><div class='del'>-</div><div class='del'>-	mi = camel_folder_summary_info_new(s);</div><div class='del'>-</div><div class='del'>-	io(printf("Loading message info\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_decode_string(in, &amp;uid);</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;mi-&gt;flags);</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;mi-&gt;size);</div><div class='del'>-	camel_file_util_decode_time_t(in, &amp;mi-&gt;date_sent);</div><div class='del'>-	camel_file_util_decode_time_t(in, &amp;mi-&gt;date_received);</div><div class='del'>-	camel_file_util_decode_string(in, &amp;subject);</div><div class='del'>-	camel_file_util_decode_string(in, &amp;from);</div><div class='del'>-	camel_file_util_decode_string(in, &amp;to);</div><div class='del'>-	camel_file_util_decode_string(in, &amp;cc);</div><div class='del'>-	camel_file_util_decode_string(in, &amp;mlist);</div><div class='del'>-</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_UID, uid, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_SUBJECT, subject, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_FROM, from, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_TO, to, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_CC, cc, TRUE);</div><div class='del'>-	e_poolv_set(mi-&gt;strings, CAMEL_MESSAGE_INFO_MLIST, mlist, TRUE);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_UID, uid);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_SUBJECT, subject);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_FROM, from);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_TO, to);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_CC, cc);</div><div class='del'>-	e_strv_set_ref_free(mi-&gt;strings, CAMEL_MESSAGE_INFO_MLIST, mlist);</div><div class='del'>-#else</div><div class='del'>-	mi-&gt;uid = uid;</div><div class='del'>-	mi-&gt;subject = subject;</div><div class='del'>-	mi-&gt;from = from;</div><div class='del'>-	mi-&gt;to = to;</div><div class='del'>-	mi-&gt;cc = cc;</div><div class='del'>-	mi-&gt;mlist = mlist;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	mi-&gt;content = NULL;</div><div class='del'>-</div><div class='del'>-	camel_file_util_decode_fixed_int32(in, &amp;mi-&gt;message_id.id.part.hi);</div><div class='del'>-	camel_file_util_decode_fixed_int32(in, &amp;mi-&gt;message_id.id.part.lo);</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;count) == -1 || count &gt; 500)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	if (count &gt; 0) {</div><div class='del'>-		mi-&gt;references = g_malloc(sizeof(*mi-&gt;references) + ((count-1) * sizeof(mi-&gt;references-&gt;references[0])));</div><div class='del'>-		mi-&gt;references-&gt;size = count;</div><div class='del'>-		for (i=0;i&lt;count;i++) {</div><div class='del'>-			camel_file_util_decode_fixed_int32(in, &amp;mi-&gt;references-&gt;references[i].id.part.hi);</div><div class='del'>-			camel_file_util_decode_fixed_int32(in, &amp;mi-&gt;references-&gt;references[i].id.part.lo);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;count) == -1 || count &gt; 500)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		char *name;</div><div class='del'>-		camel_file_util_decode_string(in, &amp;name);</div><div class='del'>-		camel_flag_set(&amp;mi-&gt;user_flags, name, TRUE);</div><div class='del'>-		g_free(name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;count) == -1 || count &gt; 500)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		char *name, *value;</div><div class='del'>-		camel_file_util_decode_string(in, &amp;name);</div><div class='del'>-		camel_file_util_decode_string(in, &amp;value);</div><div class='del'>-		camel_tag_set(&amp;mi-&gt;user_tags, name, value);</div><div class='del'>-		g_free(name);</div><div class='del'>-		g_free(value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!ferror(in))</div><div class='del'>-		return mi;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	camel_folder_summary_info_free(s, mi);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	guint32 count;</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	io(printf("Saving message info\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_uid(mi));</div><div class='del'>-	camel_file_util_encode_uint32(out, mi-&gt;flags);</div><div class='del'>-	camel_file_util_encode_uint32(out, mi-&gt;size);</div><div class='del'>-	camel_file_util_encode_time_t(out, mi-&gt;date_sent);</div><div class='del'>-	camel_file_util_encode_time_t(out, mi-&gt;date_received);</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_subject(mi));</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_from(mi));</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_to(mi));</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_cc(mi));</div><div class='del'>-	camel_file_util_encode_string(out, camel_message_info_mlist(mi));</div><div class='del'>-</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, mi-&gt;message_id.id.part.hi);</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, mi-&gt;message_id.id.part.lo);</div><div class='del'>-</div><div class='del'>-	if (mi-&gt;references) {</div><div class='del'>-		camel_file_util_encode_uint32(out, mi-&gt;references-&gt;size);</div><div class='del'>-		for (i=0;i&lt;mi-&gt;references-&gt;size;i++) {</div><div class='del'>-			camel_file_util_encode_fixed_int32(out, mi-&gt;references-&gt;references[i].id.part.hi);</div><div class='del'>-			camel_file_util_encode_fixed_int32(out, mi-&gt;references-&gt;references[i].id.part.lo);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		camel_file_util_encode_uint32(out, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_flag_list_size(&amp;mi-&gt;user_flags);</div><div class='del'>-	camel_file_util_encode_uint32(out, count);</div><div class='del'>-	flag = mi-&gt;user_flags;</div><div class='del'>-	while (flag) {</div><div class='del'>-		camel_file_util_encode_string(out, flag-&gt;name);</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_tag_list_size(&amp;mi-&gt;user_tags);</div><div class='del'>-	camel_file_util_encode_uint32(out, count);</div><div class='del'>-	tag = mi-&gt;user_tags;</div><div class='del'>-	while (tag) {</div><div class='del'>-		camel_file_util_encode_string(out, tag-&gt;name);</div><div class='del'>-		camel_file_util_encode_string(out, tag-&gt;value);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ferror(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	e_poolv_destroy(mi-&gt;strings);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	e_strv_destroy(mi-&gt;strings);</div><div class='del'>-#else</div><div class='del'>-	g_free(mi-&gt;uid);</div><div class='del'>-	g_free(mi-&gt;subject);</div><div class='del'>-	g_free(mi-&gt;from);</div><div class='del'>-	g_free(mi-&gt;to);</div><div class='del'>-	g_free(mi-&gt;cc);</div><div class='del'>-	g_free(mi-&gt;mlist);</div><div class='del'>-#endif</div><div class='del'>-	g_free(mi-&gt;references);</div><div class='del'>-	camel_flag_list_free(&amp;mi-&gt;user_flags);</div><div class='del'>-	camel_tag_list_free(&amp;mi-&gt;user_tags);</div><div class='del'>-	e_memchunk_free(s-&gt;message_info_chunks, mi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-content_info_new (CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci;</div><div class='del'>-	const char *charset;</div><div class='del'>-	</div><div class='del'>-	ci = camel_folder_summary_content_info_new (s);</div><div class='del'>-	</div><div class='del'>-	charset = e_iconv_locale_charset();</div><div class='del'>-	ci-&gt;id = header_msgid_decode (header_raw_find (&amp;h, "content-id", NULL));</div><div class='del'>-	ci-&gt;description = header_decode_string (header_raw_find (&amp;h, "content-description", NULL), NULL);</div><div class='del'>-	ci-&gt;encoding = header_content_encoding_decode (header_raw_find (&amp;h, "content-transfer-encoding", NULL));</div><div class='del'>-	</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-content_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci;</div><div class='del'>-	char *type, *subtype;</div><div class='del'>-	guint32 count, i;</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-</div><div class='del'>-	io(printf("Loading content info\n"));</div><div class='del'>-</div><div class='del'>-	ci = camel_folder_summary_content_info_new(s);</div><div class='del'>-	</div><div class='del'>-	camel_folder_summary_decode_token(in, &amp;type);</div><div class='del'>-	camel_folder_summary_decode_token(in, &amp;subtype);</div><div class='del'>-	ct = header_content_type_new(type, subtype);</div><div class='del'>-	g_free(type);		/* can this be removed? */</div><div class='del'>-	g_free(subtype);</div><div class='del'>-	if (camel_file_util_decode_uint32(in, &amp;count) == -1 || count &gt; 500)</div><div class='del'>-		goto error;</div><div class='del'>-	</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		char *name, *value;</div><div class='del'>-		camel_folder_summary_decode_token(in, &amp;name);</div><div class='del'>-		camel_folder_summary_decode_token(in, &amp;value);</div><div class='del'>-		if (!(name &amp;&amp; value))</div><div class='del'>-			goto error;</div><div class='del'>-		</div><div class='del'>-		header_content_type_set_param(ct, name, value);</div><div class='del'>-		/* TODO: do this so we dont have to double alloc/free */</div><div class='del'>-		g_free(name);</div><div class='del'>-		g_free(value);</div><div class='del'>-	}</div><div class='del'>-	ci-&gt;type = ct;</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_decode_token(in, &amp;ci-&gt;id);</div><div class='del'>-	camel_folder_summary_decode_token(in, &amp;ci-&gt;description);</div><div class='del'>-	camel_folder_summary_decode_token(in, &amp;ci-&gt;encoding);</div><div class='del'>-</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;ci-&gt;size);</div><div class='del'>-</div><div class='del'>-	ci-&gt;childs = NULL;</div><div class='del'>-</div><div class='del'>-	if (!ferror(in))</div><div class='del'>-		return ci;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-	camel_folder_summary_content_info_free(s, ci);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-content_info_save(CamelFolderSummary *s, FILE *out, CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-	struct _header_param *hp;</div><div class='del'>-</div><div class='del'>-	io(printf("Saving content info\n"));</div><div class='del'>-</div><div class='del'>-	ct = ci-&gt;type;</div><div class='del'>-	if (ct) {</div><div class='del'>-		camel_folder_summary_encode_token(out, ct-&gt;type);</div><div class='del'>-		camel_folder_summary_encode_token(out, ct-&gt;subtype);</div><div class='del'>-		camel_file_util_encode_uint32(out, my_list_size((struct _node **)&amp;ct-&gt;params));</div><div class='del'>-		hp = ct-&gt;params;</div><div class='del'>-		while (hp) {</div><div class='del'>-			camel_folder_summary_encode_token(out, hp-&gt;name);</div><div class='del'>-			camel_folder_summary_encode_token(out, hp-&gt;value);</div><div class='del'>-			hp = hp-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_summary_encode_token(out, NULL);</div><div class='del'>-		camel_folder_summary_encode_token(out, NULL);</div><div class='del'>-		camel_file_util_encode_uint32(out, 0);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_encode_token(out, ci-&gt;id);</div><div class='del'>-	camel_folder_summary_encode_token(out, ci-&gt;description);</div><div class='del'>-	camel_folder_summary_encode_token(out, ci-&gt;encoding);</div><div class='del'>-	return camel_file_util_encode_uint32(out, ci-&gt;size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	header_content_type_unref(ci-&gt;type);</div><div class='del'>-	g_free(ci-&gt;id);</div><div class='del'>-	g_free(ci-&gt;description);</div><div class='del'>-	g_free(ci-&gt;encoding);</div><div class='del'>-	e_memchunk_free(s-&gt;content_info_chunks, ci);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-next_uid_string(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf("%u", camel_folder_summary_next_uid(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  OK</div><div class='del'>-  Now this is where all the "smarts" happen, where the content info is built,</div><div class='del'>-  and any indexing and what not is performed</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* must have filter_lock before calling this function */</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-summary_build_content_info(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	int state, len;</div><div class='del'>-	char *buffer;</div><div class='del'>-	CamelMessageContentInfo *info = NULL;</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-	int body;</div><div class='del'>-	int enc_id = -1, chr_id = -1, html_id = -1, idx_id = -1;</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-	CamelMimeFilterCharset *mfc;</div><div class='del'>-	CamelMessageContentInfo *part;</div><div class='del'>-</div><div class='del'>-	d(printf("building content info\n"));</div><div class='del'>-</div><div class='del'>-	/* start of this part */</div><div class='del'>-	state = camel_mime_parser_step(mp, &amp;buffer, &amp;len);</div><div class='del'>-	body = camel_mime_parser_tell(mp);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;build_content)</div><div class='del'>-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_new_from_parser(s, mp);</div><div class='del'>-</div><div class='del'>-	switch(state) {</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-		/* check content type for indexing, then read body */</div><div class='del'>-		ct = camel_mime_parser_content_type(mp);</div><div class='del'>-		/* update attachments flag as we go */</div><div class='del'>-		if (!header_content_type_is(ct, "text", "*"))</div><div class='del'>-			msginfo-&gt;flags |= CAMEL_MESSAGE_ATTACHMENTS;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;index &amp;&amp; header_content_type_is(ct, "text", "*")) {</div><div class='del'>-			char *encoding;</div><div class='del'>-			const char *charset;</div><div class='del'>-</div><div class='del'>-			d(printf("generating index:\n"));</div><div class='del'>-			</div><div class='del'>-			encoding = header_content_encoding_decode(camel_mime_parser_header(mp, "content-transfer-encoding", NULL));</div><div class='del'>-			if (encoding) {</div><div class='del'>-				if (!strcasecmp(encoding, "base64")) {</div><div class='del'>-					d(printf(" decoding base64\n"));</div><div class='del'>-					if (p-&gt;filter_64 == NULL)</div><div class='del'>-						p-&gt;filter_64 = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_DEC);</div><div class='del'>-					else</div><div class='del'>-						camel_mime_filter_reset((CamelMimeFilter *)p-&gt;filter_64);</div><div class='del'>-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_64);</div><div class='del'>-				} else if (!strcasecmp(encoding, "quoted-printable")) {</div><div class='del'>-					d(printf(" decoding quoted-printable\n"));</div><div class='del'>-					if (p-&gt;filter_qp == NULL)</div><div class='del'>-						p-&gt;filter_qp = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_DEC);</div><div class='del'>-					else</div><div class='del'>-						camel_mime_filter_reset((CamelMimeFilter *)p-&gt;filter_qp);</div><div class='del'>-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_qp);</div><div class='del'>-				} else if (!strcasecmp (encoding, "x-uuencode")) {</div><div class='del'>-					d(printf(" decoding x-uuencode\n"));</div><div class='del'>-					if (p-&gt;filter_uu == NULL)</div><div class='del'>-						p-&gt;filter_uu = camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_UU_DEC);</div><div class='del'>-					else</div><div class='del'>-						camel_mime_filter_reset((CamelMimeFilter *)p-&gt;filter_uu);</div><div class='del'>-					enc_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_uu);</div><div class='del'>-				} else {</div><div class='del'>-					d(printf(" ignoring encoding %s\n", encoding));</div><div class='del'>-				}</div><div class='del'>-				g_free(encoding);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			charset = header_content_type_param(ct, "charset");</div><div class='del'>-			if (charset!=NULL</div><div class='del'>-			    &amp;&amp; !(strcasecmp(charset, "us-ascii")==0</div><div class='del'>-				 || strcasecmp(charset, "utf-8")==0)) {</div><div class='del'>-				d(printf(" Adding conversion filter from %s to UTF-8\n", charset));</div><div class='del'>-				mfc = g_hash_table_lookup(p-&gt;filter_charset, charset);</div><div class='del'>-				if (mfc == NULL) {</div><div class='del'>-					mfc = camel_mime_filter_charset_new_convert(charset, "UTF-8");</div><div class='del'>-					if (mfc)</div><div class='del'>-						g_hash_table_insert(p-&gt;filter_charset, g_strdup(charset), mfc);</div><div class='del'>-				} else {</div><div class='del'>-					camel_mime_filter_reset((CamelMimeFilter *)mfc);</div><div class='del'>-				}</div><div class='del'>-				if (mfc) {</div><div class='del'>-					chr_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)mfc);</div><div class='del'>-				} else {</div><div class='del'>-					g_warning("Cannot convert '%s' to 'UTF-8', message index may be corrupt", charset);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* we do charset conversions before this filter, which isn't strictly correct,</div><div class='del'>-			   but works in most cases */</div><div class='del'>-			if (header_content_type_is(ct, "text", "html")) {</div><div class='del'>-				if (p-&gt;filter_html == NULL)</div><div class='del'>-					p-&gt;filter_html = camel_mime_filter_html_new();</div><div class='del'>-				else</div><div class='del'>-					camel_mime_filter_reset((CamelMimeFilter *)p-&gt;filter_html);</div><div class='del'>-				html_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_html);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* and this filter actually does the indexing */</div><div class='del'>-			idx_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)p-&gt;filter_index);</div><div class='del'>-		}</div><div class='del'>-		/* and scan/index everything */</div><div class='del'>-		while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_BODY_END)</div><div class='del'>-			;</div><div class='del'>-		/* and remove the filters */</div><div class='del'>-		camel_mime_parser_filter_remove(mp, enc_id);</div><div class='del'>-		camel_mime_parser_filter_remove(mp, chr_id);</div><div class='del'>-		camel_mime_parser_filter_remove(mp, html_id);</div><div class='del'>-		camel_mime_parser_filter_remove(mp, idx_id);</div><div class='del'>-		break;</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		d(printf("Summarising multipart\n"));</div><div class='del'>-		/* update attachments flag as we go */</div><div class='del'>-		ct = camel_mime_parser_content_type(mp);</div><div class='del'>-		if (header_content_type_is(ct, "multipart", "mixed"))</div><div class='del'>-			msginfo-&gt;flags |= CAMEL_MESSAGE_ATTACHMENTS;</div><div class='del'>-</div><div class='del'>-		while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_MULTIPART_END) {</div><div class='del'>-			camel_mime_parser_unstep(mp);</div><div class='del'>-			part = summary_build_content_info(s, msginfo, mp);</div><div class='del'>-			if (part) {</div><div class='del'>-				part-&gt;parent = info;</div><div class='del'>-				my_list_append((struct _node **)&amp;info-&gt;childs, (struct _node *)part);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-		d(printf("Summarising message\n"));</div><div class='del'>-		/* update attachments flag as we go */</div><div class='del'>-		msginfo-&gt;flags |= CAMEL_MESSAGE_ATTACHMENTS;</div><div class='del'>-</div><div class='del'>-		part = summary_build_content_info(s, msginfo, mp);</div><div class='del'>-		if (part) {</div><div class='del'>-			part-&gt;parent = info;</div><div class='del'>-			my_list_append((struct _node **)&amp;info-&gt;childs, (struct _node *)part);</div><div class='del'>-		}</div><div class='del'>-		state = camel_mime_parser_step(mp, &amp;buffer, &amp;len);</div><div class='del'>-		if (state != HSCAN_MESSAGE_END) {</div><div class='del'>-			g_error("Bad parser state: Expecing MESSAGE_END or MESSAGE_EOF, got: %d", state);</div><div class='del'>-			camel_mime_parser_unstep(mp);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("finished building content info\n"));</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* build the content-info, from a message */</div><div class='del'>-/* this needs the filter lock since it uses filters to perform indexing */</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-summary_build_content_info_message(CamelFolderSummary *s, CamelMessageInfo *msginfo, CamelMimePart *object)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *containee;</div><div class='del'>-	int parts, i;</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p = _PRIVATE(s);</div><div class='del'>-	CamelMessageContentInfo *info = NULL, *child;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;build_content)</div><div class='del'>-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_new_from_message(s, object);</div><div class='del'>-	</div><div class='del'>-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));</div><div class='del'>-</div><div class='del'>-	if (containee == NULL)</div><div class='del'>-		return info;</div><div class='del'>-</div><div class='del'>-	/* TODO: I find it odd that get_part and get_content_object do not</div><div class='del'>-	   add a reference, probably need fixing for multithreading */</div><div class='del'>-</div><div class='del'>-	/* check for attachments */</div><div class='del'>-	if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "multipart", "*")) {</div><div class='del'>-		if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "multipart", "mixed"))</div><div class='del'>-			msginfo-&gt;flags |= CAMEL_MESSAGE_ATTACHMENTS;</div><div class='del'>-	} else if (!header_content_type_is(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "text", "*"))</div><div class='del'>-		msginfo-&gt;flags |= CAMEL_MESSAGE_ATTACHMENTS;</div><div class='del'>-</div><div class='del'>-	/* using the object types is more accurate than using the mime/types */</div><div class='del'>-	if (CAMEL_IS_MULTIPART(containee)) {</div><div class='del'>-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));</div><div class='del'>-		for (i=0;i&lt;parts;i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part(CAMEL_MULTIPART(containee), i);</div><div class='del'>-			g_assert(part);</div><div class='del'>-			child = summary_build_content_info_message(s, msginfo, part);</div><div class='del'>-			if (child) {</div><div class='del'>-				child-&gt;parent = info;</div><div class='del'>-				my_list_append((struct _node **)&amp;info-&gt;childs, (struct _node *)child);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {</div><div class='del'>-		/* for messages we only look at its contents */</div><div class='del'>-		child = summary_build_content_info_message(s, msginfo, (CamelMimePart *)containee);</div><div class='del'>-		if (child) {</div><div class='del'>-			child-&gt;parent = info;</div><div class='del'>-			my_list_append((struct _node **)&amp;info-&gt;childs, (struct _node *)child);</div><div class='del'>-		}</div><div class='del'>-	} else if (p-&gt;filter_stream</div><div class='del'>-		   &amp;&amp; header_content_type_is(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "text", "*")) {</div><div class='del'>-		int html_id = -1, idx_id = -1;</div><div class='del'>-</div><div class='del'>-		/* pre-attach html filter if required, otherwise just index filter */</div><div class='del'>-		if (header_content_type_is(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "text", "html")) {</div><div class='del'>-			if (p-&gt;filter_html == NULL)</div><div class='del'>-				p-&gt;filter_html = camel_mime_filter_html_new();</div><div class='del'>-			else</div><div class='del'>-				camel_mime_filter_reset((CamelMimeFilter *)p-&gt;filter_html);</div><div class='del'>-			html_id = camel_stream_filter_add(p-&gt;filter_stream, (CamelMimeFilter *)p-&gt;filter_html);</div><div class='del'>-		}</div><div class='del'>-		idx_id = camel_stream_filter_add(p-&gt;filter_stream, (CamelMimeFilter *)p-&gt;filter_index);</div><div class='del'>-</div><div class='del'>-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)p-&gt;filter_stream);</div><div class='del'>-		camel_stream_flush((CamelStream *)p-&gt;filter_stream);</div><div class='del'>-</div><div class='del'>-		camel_stream_filter_remove(p-&gt;filter_stream, idx_id);</div><div class='del'>-		camel_stream_filter_remove(p-&gt;filter_stream, html_id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_flag_get:</div><div class='del'>- * @list: </div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Find the state of the flag @name in @list.</div><div class='del'>- * </div><div class='del'>- * Return value: The state of the flag (TRUE or FALSE).</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_flag_get(CamelFlag **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	flag = *list;</div><div class='del'>-	while (flag) {</div><div class='del'>-		if (!strcmp(flag-&gt;name, name))</div><div class='del'>-			return TRUE;</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_flag_set:</div><div class='del'>- * @list: </div><div class='del'>- * @name: </div><div class='del'>- * @value: </div><div class='del'>- * </div><div class='del'>- * Set the state of a flag @name in the list @list to @value.</div><div class='del'>- *</div><div class='del'>- * Return value: Whether or not it changed.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_flag_set(CamelFlag **list, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag, *tmp;</div><div class='del'>-</div><div class='del'>-	/* this 'trick' works because flag-&gt;next is the first element */</div><div class='del'>-	flag = (CamelFlag *)list;</div><div class='del'>-	while (flag-&gt;next) {</div><div class='del'>-		tmp = flag-&gt;next;</div><div class='del'>-		if (!strcmp(flag-&gt;next-&gt;name, name)) {</div><div class='del'>-			if (!value) {</div><div class='del'>-				flag-&gt;next = tmp-&gt;next;</div><div class='del'>-				g_free(tmp);</div><div class='del'>-			}</div><div class='del'>-			return !value;</div><div class='del'>-		}</div><div class='del'>-		flag = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		tmp = g_malloc(sizeof(*tmp) + strlen(name));</div><div class='del'>-		strcpy(tmp-&gt;name, name);</div><div class='del'>-		tmp-&gt;next = 0;</div><div class='del'>-		flag-&gt;next = tmp;</div><div class='del'>-	}</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_flag_list_size:</div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Get the length of the flag list.</div><div class='del'>- * </div><div class='del'>- * Return value: The number of TRUE flags in the list.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_flag_list_size(CamelFlag **list)</div><div class='del'>-{</div><div class='del'>-	int count=0;</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-</div><div class='del'>-	flag = *list;</div><div class='del'>-	while (flag) {</div><div class='del'>-		count++;</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_flag_list_free:</div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Free the memory associated with the flag list @list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_flag_list_free(CamelFlag **list)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag, *tmp;</div><div class='del'>-	flag = *list;</div><div class='del'>-	while (flag) {</div><div class='del'>-		tmp = flag-&gt;next;</div><div class='del'>-		g_free(flag);</div><div class='del'>-		flag = tmp;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_flag_list_copy:</div><div class='del'>- * @to: </div><div class='del'>- * @from: </div><div class='del'>- * </div><div class='del'>- * Copy a flag list, return true if the destination list @to changed.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_flag_list_copy(CamelFlag **to, CamelFlag **from)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag, *tmp;</div><div class='del'>-	int changed = FALSE;</div><div class='del'>-</div><div class='del'>-	if (*to == NULL &amp;&amp; from == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Remove any now-missing flags */</div><div class='del'>-	flag = (CamelFlag *)to;</div><div class='del'>-	while (flag-&gt;next) {</div><div class='del'>-		tmp = flag-&gt;next;</div><div class='del'>-		if (!camel_flag_get(from, tmp-&gt;name)) {</div><div class='del'>-			flag-&gt;next = tmp-&gt;next;</div><div class='del'>-			g_free(tmp);</div><div class='del'>-			changed = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			flag = tmp;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add any new flags */</div><div class='del'>-	flag = *from;</div><div class='del'>-	while (flag) {</div><div class='del'>-		changed |= camel_flag_set(to, flag-&gt;name, TRUE);</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_tag_get(CamelTag **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		if (!strcmp(tag-&gt;name, name))</div><div class='del'>-			return (const char *)tag-&gt;value;</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tag_set:</div><div class='del'>- * @list: </div><div class='del'>- * @name: </div><div class='del'>- * @value: </div><div class='del'>- * </div><div class='del'>- * Set the tag @name in the tag list @list to @value.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not it changed</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_tag_set(CamelTag **list, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag, *tmp;</div><div class='del'>-</div><div class='del'>-	/* this 'trick' works because tag-&gt;next is the first element */</div><div class='del'>-	tag = (CamelTag *)list;</div><div class='del'>-	while (tag-&gt;next) {</div><div class='del'>-		tmp = tag-&gt;next;</div><div class='del'>-		if (!strcmp(tmp-&gt;name, name)) {</div><div class='del'>-			if (value == NULL) { /* clear it? */</div><div class='del'>-				tag-&gt;next = tmp-&gt;next;</div><div class='del'>-				g_free(tmp-&gt;value);</div><div class='del'>-				g_free(tmp);</div><div class='del'>-				return TRUE;</div><div class='del'>-			} else if (strcmp(tmp-&gt;value, value)) { /* has it changed? */</div><div class='del'>-				g_free(tmp-&gt;value);</div><div class='del'>-				tmp-&gt;value = g_strdup(value);</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		tag = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		tmp = g_malloc(sizeof(*tmp)+strlen(name));</div><div class='del'>-		strcpy(tmp-&gt;name, name);</div><div class='del'>-		tmp-&gt;value = g_strdup(value);</div><div class='del'>-		tmp-&gt;next = 0;</div><div class='del'>-		tag-&gt;next = tmp;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tag_list_size:</div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Get the number of tags present in the tag list @list.</div><div class='del'>- * </div><div class='del'>- * Return value: The number of tags.</div><div class='del'>- **/</div><div class='del'>-int		camel_tag_list_size(CamelTag **list)</div><div class='del'>-{</div><div class='del'>-	int count=0;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		count++;</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rem_tag(char *key, char *value, CamelTag **to)</div><div class='del'>-{</div><div class='del'>-	camel_tag_set(to, key, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tag_list_copy:</div><div class='del'>- * @to: </div><div class='del'>- * @from: </div><div class='del'>- * </div><div class='del'>- * Copy a list of tags.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_tag_list_copy(CamelTag **to, CamelTag **from)</div><div class='del'>-{</div><div class='del'>-	int changed = FALSE;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-	GHashTable *left;</div><div class='del'>-</div><div class='del'>-	if (*to == NULL &amp;&amp; from == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	left = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	tag = *to;</div><div class='del'>-	while (tag) {</div><div class='del'>-		g_hash_table_insert(left, tag-&gt;name, tag);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag = *from;</div><div class='del'>-	while (tag) {</div><div class='del'>-		changed |= camel_tag_set(to, tag-&gt;name, tag-&gt;value);</div><div class='del'>-		g_hash_table_remove(left, tag-&gt;name);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_size(left)&gt;0) {</div><div class='del'>-		g_hash_table_foreach(left, (GHFunc)rem_tag, to);</div><div class='del'>-		changed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(left);</div><div class='del'>-</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tag_list_free:</div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Free the tag list @list.</div><div class='del'>- **/</div><div class='del'>-void		camel_tag_list_free(CamelTag **list)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag, *tmp;</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		tmp = tag-&gt;next;</div><div class='del'>-		g_free(tag-&gt;value);</div><div class='del'>-		g_free(tag);</div><div class='del'>-		tag = tmp;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct flag_names_t {</div><div class='del'>-	char *name;</div><div class='del'>-	guint32 value;</div><div class='del'>-} flag_names[] = {</div><div class='del'>-	{ "answered", CAMEL_MESSAGE_ANSWERED },</div><div class='del'>-	{ "deleted", CAMEL_MESSAGE_DELETED },</div><div class='del'>-	{ "draft", CAMEL_MESSAGE_DELETED },</div><div class='del'>-	{ "flagged", CAMEL_MESSAGE_FLAGGED },</div><div class='del'>-	{ "seen", CAMEL_MESSAGE_SEEN },</div><div class='del'>-	{ "attachments", CAMEL_MESSAGE_ATTACHMENTS },</div><div class='del'>-	{ NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_system_flag:</div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Returns the integer value of the flag string.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_system_flag (const char *name)</div><div class='del'>-{</div><div class='del'>-	struct flag_names_t *flag;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (name != NULL, 0);</div><div class='del'>-	</div><div class='del'>-	for (flag = flag_names; *flag-&gt;name; flag++)</div><div class='del'>-		if (!g_strcasecmp (name, flag-&gt;name))</div><div class='del'>-			return flag-&gt;value;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_system_flag_get:</div><div class='del'>- * @flags: </div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Find the state of the flag @name in @flags.</div><div class='del'>- * </div><div class='del'>- * Return value: The state of the flag (TRUE or FALSE).</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_system_flag_get (guint32 flags, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (name != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	return flags &amp; camel_system_flag (name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_new:</div><div class='del'>- *</div><div class='del'>- * Returns a new CamelMessageInfo structure.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_message_info_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = g_malloc0(sizeof(*info));</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	info-&gt;strings = e_poolv_new(CAMEL_MESSAGE_INFO_LAST);</div><div class='del'>-#endif</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-	info-&gt;strings = e_strv_new (CAMEL_MESSAGE_INFO_LAST);</div><div class='del'>-#endif</div><div class='del'>-	info-&gt;refcount = 1;</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_ref:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Reference an info.</div><div class='del'>- *</div><div class='del'>- * NOTE: This interface is not MT-SAFE, like the others.</div><div class='del'>- **/</div><div class='del'>-void camel_message_info_ref(CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	GLOBAL_INFO_LOCK(info);</div><div class='del'>-	info-&gt;refcount++;</div><div class='del'>-	GLOBAL_INFO_UNLOCK(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_new_from_header:</div><div class='del'>- * @header: raw header</div><div class='del'>- *</div><div class='del'>- * Returns a new CamelMessageInfo structure populated by the header.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_message_info_new_from_header (struct _header_raw *header)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *subject, *from, *to, *cc, *mlist;</div><div class='del'>-	struct _header_content_type *ct = NULL;</div><div class='del'>-	const char *content, *date, *charset = NULL;</div><div class='del'>-	</div><div class='del'>-	if ((content = header_raw_find(&amp;header, "Content-Type", NULL))</div><div class='del'>-	    &amp;&amp; (ct = header_content_type_decode(content))</div><div class='del'>-	    &amp;&amp; (charset = header_content_type_param(ct, "charset"))</div><div class='del'>-	    &amp;&amp; (strcasecmp(charset, "us-ascii") == 0))</div><div class='del'>-		charset = NULL;</div><div class='del'>-</div><div class='del'>-	charset = e_iconv_charset_name(charset);</div><div class='del'>-	</div><div class='del'>-	subject = summary_format_string(header, "subject", charset);</div><div class='del'>-	from = summary_format_address(header, "from");</div><div class='del'>-	to = summary_format_address(header, "to");</div><div class='del'>-	cc = summary_format_address(header, "cc");</div><div class='del'>-	date = header_raw_find(&amp;header, "date", NULL);</div><div class='del'>-	mlist = header_raw_check_mailing_list(&amp;header);</div><div class='del'>-</div><div class='del'>-	if (ct)</div><div class='del'>-		header_content_type_unref(ct);</div><div class='del'>-</div><div class='del'>-	info = camel_message_info_new();</div><div class='del'>-</div><div class='del'>-	camel_message_info_set_subject(info, subject);</div><div class='del'>-	camel_message_info_set_from(info, from);</div><div class='del'>-	camel_message_info_set_to(info, to);</div><div class='del'>-	camel_message_info_set_cc(info, cc);</div><div class='del'>-	camel_message_info_set_mlist(info, mlist);</div><div class='del'>-	</div><div class='del'>-	if (date)</div><div class='del'>-		info-&gt;date_sent = header_decode_date (date, NULL);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;date_sent = time (NULL);</div><div class='del'>-	</div><div class='del'>-	date = header_raw_find (&amp;header, "received", NULL);</div><div class='del'>-	if (date &amp;&amp; (date = strrchr (date, ';')))</div><div class='del'>-		date++;</div><div class='del'>-	</div><div class='del'>-	if (date)</div><div class='del'>-		info-&gt;date_received = header_decode_date (date, NULL);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;date_received = time (NULL);</div><div class='del'>-	</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_dup_to:</div><div class='del'>- * @from: source message info</div><div class='del'>- * @to: destination message info</div><div class='del'>- *</div><div class='del'>- * Duplicates the contents of one CamelMessageInfo structure into another.</div><div class='del'>- * (The destination is assumed to be empty: its contents are not freed.)</div><div class='del'>- * The slightly odd interface is to allow this to be used to initialize</div><div class='del'>- * "subclasses" of CamelMessageInfo.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	/* Copy numbers */</div><div class='del'>-	to-&gt;flags = from-&gt;flags;</div><div class='del'>-	to-&gt;size = from-&gt;size;</div><div class='del'>-	to-&gt;date_sent = from-&gt;date_sent;</div><div class='del'>-	to-&gt;date_received = from-&gt;date_received;</div><div class='del'>-	to-&gt;refcount = 1;</div><div class='del'>-</div><div class='del'>-	/* Copy strings */</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	to-&gt;strings = e_poolv_cpy (to-&gt;strings, from-&gt;strings);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	/* to-&gt;strings = e_strv_new(CAMEL_MESSAGE_INFO_LAST); */</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_SUBJECT, camel_message_info_subject(from));</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_FROM, camel_message_info_from(from));</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_TO, camel_message_info_to(from));</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_CC, camel_message_info_cc(from));</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_uid(from));</div><div class='del'>-	e_strv_set(to-&gt;strings, CAMEL_MESSAGE_INFO_UID, camel_message_info_mlist(from));</div><div class='del'>-#else</div><div class='del'>-	to-&gt;subject = g_strdup(from-&gt;subject);</div><div class='del'>-	to-&gt;from = g_strdup(from-&gt;from);</div><div class='del'>-	to-&gt;to = g_strdup(from-&gt;to);</div><div class='del'>-	to-&gt;cc = g_strdup(from-&gt;cc);</div><div class='del'>-	to-&gt;uid = g_strdup(from-&gt;uid);</div><div class='del'>-	to-&gt;mlist = g_strdup(from-&gt;mlist);</div><div class='del'>-#endif</div><div class='del'>-	memcpy(&amp;to-&gt;message_id, &amp;from-&gt;message_id, sizeof(from-&gt;message_id));</div><div class='del'>-</div><div class='del'>-	/* Copy structures */</div><div class='del'>-	if (from-&gt;references) {</div><div class='del'>-		int len = sizeof(*from-&gt;references) + ((from-&gt;references-&gt;size-1) * sizeof(from-&gt;references-&gt;references[0]));</div><div class='del'>-</div><div class='del'>-		to-&gt;references = g_malloc(len);</div><div class='del'>-		memcpy(to-&gt;references, from-&gt;references, len);</div><div class='del'>-	} else {</div><div class='del'>-		to-&gt;references = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	flag = from-&gt;user_flags;</div><div class='del'>-	while (flag) {</div><div class='del'>-		camel_flag_set(&amp;to-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag = from-&gt;user_tags;</div><div class='del'>-	while (tag) {</div><div class='del'>-		camel_tag_set(&amp;to-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* No, this is impossible without knowing the class of summary we came from */</div><div class='del'>-	/* FIXME some day */</div><div class='del'>-	to-&gt;content = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_free:</div><div class='del'>- * @mi: the message info</div><div class='del'>- *</div><div class='del'>- * Unref's and potentially frees a CamelMessageInfo and its contents.</div><div class='del'>- *</div><div class='del'>- * Can only be used to free CamelMessageInfo's created with</div><div class='del'>- * camel_message_info_dup_to.</div><div class='del'>- *</div><div class='del'>- * NOTE: This interface is not MT-SAFE, like the others.</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_message_info_free(CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(mi != NULL);</div><div class='del'>-</div><div class='del'>-	GLOBAL_INFO_LOCK(info);</div><div class='del'>-	mi-&gt;refcount--;</div><div class='del'>-	if (mi-&gt;refcount &gt; 0) {</div><div class='del'>-		GLOBAL_INFO_UNLOCK(info);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	GLOBAL_INFO_UNLOCK(info);</div><div class='del'>-</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	e_poolv_destroy(mi-&gt;strings);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	e_strv_destroy(mi-&gt;strings);</div><div class='del'>-#else</div><div class='del'>-	g_free(mi-&gt;uid);</div><div class='del'>-	g_free(mi-&gt;subject);</div><div class='del'>-	g_free(mi-&gt;from);</div><div class='del'>-	g_free(mi-&gt;to);</div><div class='del'>-	g_free(mi-&gt;cc);</div><div class='del'>-	g_free(mi-&gt;mlist);</div><div class='del'>-#endif</div><div class='del'>-	g_free(mi-&gt;references);</div><div class='del'>-	camel_flag_list_free(&amp;mi-&gt;user_flags);</div><div class='del'>-	camel_tag_list_free(&amp;mi-&gt;user_tags);</div><div class='del'>-	/* FIXME: content info? */</div><div class='del'>-	g_free(mi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-const char *</div><div class='del'>-camel_message_info_string (const CamelMessageInfo *mi, int type)</div><div class='del'>-{</div><div class='del'>-	g_assert (mi != NULL);</div><div class='del'>-	</div><div class='del'>-	if (mi-&gt;strings == NULL)</div><div class='del'>-		return "";</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	return e_poolv_get (mi-&gt;strings, type);</div><div class='del'>-#else</div><div class='del'>-	return e_strv_get (mi-&gt;strings, type);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_message_info_set_string (CamelMessageInfo *mi, int type, char *str)</div><div class='del'>-{</div><div class='del'>-	g_assert (mi != NULL);</div><div class='del'>-	g_assert (mi-&gt;strings != NULL);</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	e_poolv_set (mi-&gt;strings, type, str, TRUE);</div><div class='del'>-#else</div><div class='del'>-	mi-&gt;strings = e_strv_set_ref_free (mi-&gt;strings, type, str);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_content_info_dump (CamelMessageContentInfo *ci, int depth)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	</div><div class='del'>-	p = alloca (depth * 4 + 1);</div><div class='del'>-	memset (p, ' ', depth * 4);</div><div class='del'>-	p[depth * 4] = 0;</div><div class='del'>-	</div><div class='del'>-	if (ci == NULL) {</div><div class='del'>-		printf ("%s&lt;empty&gt;\n", p);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	printf ("%scontent-type: %s/%s\n", p, ci-&gt;type-&gt;type ? ci-&gt;type-&gt;type : "(null)",</div><div class='del'>-	       ci-&gt;type-&gt;subtype ? ci-&gt;type-&gt;subtype : "(null)");</div><div class='del'>-	printf ("%scontent-transfer-encoding: %s\n", p, ci-&gt;encoding ? ci-&gt;encoding : "(null)");</div><div class='del'>-	printf ("%scontent-description: %s\n", p, ci-&gt;description ? ci-&gt;description : "(null)");</div><div class='del'>-	printf ("%ssize: %lu\n", p, (unsigned long) ci-&gt;size);</div><div class='del'>-	ci = ci-&gt;childs;</div><div class='del'>-	while (ci) {</div><div class='del'>-		camel_content_info_dump (ci, depth + 1);</div><div class='del'>-		ci = ci-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_message_info_dump (CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	if (mi == NULL) {</div><div class='del'>-		printf("No message?\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Subject: %s\n", camel_message_info_subject(mi));</div><div class='del'>-	printf("To: %s\n", camel_message_info_to(mi));</div><div class='del'>-	printf("Cc: %s\n", camel_message_info_cc(mi));</div><div class='del'>-	printf("mailing list: %s\n", camel_message_info_mlist(mi));</div><div class='del'>-	printf("From: %s\n", camel_message_info_from(mi));</div><div class='del'>-	printf("UID: %s\n", camel_message_info_uid(mi));</div><div class='del'>-	printf("Flags: %04x\n", mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	camel_content_info_dump(mi-&gt;content, 0);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h<br/>deleted file mode 100644<br/>index 7545f2af22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,347 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_FOLDER_SUMMARY_H</div><div class='del'>-#define _CAMEL_FOLDER_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-parser.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass)</div><div class='del'>-#define CAMEL_IS_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_summary_get_type ())</div><div class='del'>-</div><div class='del'>-/*typedef struct _CamelFolderSummary      CamelFolderSummary;*/</div><div class='del'>-typedef struct _CamelFolderSummaryClass CamelFolderSummaryClass;</div><div class='del'>-</div><div class='del'>-/* A tree of message content info structures</div><div class='del'>-   describe the content structure of the message (if it has any) */</div><div class='del'>-struct _CamelMessageContentInfo {</div><div class='del'>-	struct _CamelMessageContentInfo *next;</div><div class='del'>-	</div><div class='del'>-	struct _CamelMessageContentInfo *childs;</div><div class='del'>-	struct _CamelMessageContentInfo *parent;</div><div class='del'>-	</div><div class='del'>-	struct _header_content_type *type;</div><div class='del'>-	char *id;</div><div class='del'>-	char *description;</div><div class='del'>-	char *encoding;</div><div class='del'>-	guint32 size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* system flag bits */</div><div class='del'>-enum _CamelMessageFlags {</div><div class='del'>-	CAMEL_MESSAGE_ANSWERED = 1&lt;&lt;0,</div><div class='del'>-	CAMEL_MESSAGE_DELETED = 1&lt;&lt;1,</div><div class='del'>-	CAMEL_MESSAGE_DRAFT = 1&lt;&lt;2,</div><div class='del'>-	CAMEL_MESSAGE_FLAGGED = 1&lt;&lt;3,</div><div class='del'>-	CAMEL_MESSAGE_SEEN = 1&lt;&lt;4,</div><div class='del'>-	CAMEL_MESSAGE_ATTACHMENTS = 1&lt;&lt;5,</div><div class='del'>-</div><div class='del'>-	/* following flags are for the folder, and are not really permanent flags */</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_FLAGGED = 1&lt;&lt;16, /* for use by the folder implementation */</div><div class='del'>-	CAMEL_MESSAGE_USER = 1&lt;&lt;31 /* supports user flags */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFlag {</div><div class='del'>-	struct _CamelFlag *next;</div><div class='del'>-	char name[1];		/* name allocated as part of the structure */</div><div class='del'>-} CamelFlag;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTag {</div><div class='del'>-	struct _CamelTag *next;</div><div class='del'>-	char *value;</div><div class='del'>-	char name[1];		/* name allocated as part of the structure */</div><div class='del'>-} CamelTag;</div><div class='del'>-</div><div class='del'>-/* a summary messageid is a 64 bit identifier (partial md5 hash) */</div><div class='del'>-typedef struct _CamelSummaryMessageID {</div><div class='del'>-	union {</div><div class='del'>-		guint64 id;</div><div class='del'>-		unsigned char hash[8];</div><div class='del'>-		struct {</div><div class='del'>-			guint32 hi;</div><div class='del'>-			guint32 lo;</div><div class='del'>-		} part;</div><div class='del'>-	} id;</div><div class='del'>-} CamelSummaryMessageID;</div><div class='del'>-</div><div class='del'>-/* summary references is a fixed size array of references */</div><div class='del'>-typedef struct _CamelSummaryReferences {</div><div class='del'>-	int size;</div><div class='del'>-	CamelSummaryMessageID references[1];</div><div class='del'>-} CamelSummaryReferences;</div><div class='del'>-</div><div class='del'>-/* #define DOESTRV */</div><div class='del'>-#define DOEPOOLV</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-</div><div class='del'>-/* string array indices */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_MESSAGE_INFO_UID,</div><div class='del'>-	CAMEL_MESSAGE_INFO_SUBJECT,</div><div class='del'>-	CAMEL_MESSAGE_INFO_FROM,</div><div class='del'>-	CAMEL_MESSAGE_INFO_TO,</div><div class='del'>-	CAMEL_MESSAGE_INFO_CC,</div><div class='del'>-	CAMEL_MESSAGE_INFO_MLIST,</div><div class='del'>-	CAMEL_MESSAGE_INFO_LAST,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* information about a given object */</div><div class='del'>-struct _CamelMessageInfo {</div><div class='del'>-	/* public fields */</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	struct _EPoolv *strings;</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	struct _EStrv *strings;		/* all strings packed into a single compact array */</div><div class='del'>-#else</div><div class='del'>-	char *subject;</div><div class='del'>-	char *from;</div><div class='del'>-	char *to;</div><div class='del'>-	char *cc;</div><div class='del'>-	char *mlist;</div><div class='del'>-</div><div class='del'>-	char *uid;</div><div class='del'>-#endif /* DOEPOOLV */</div><div class='del'>-	guint32 flags;</div><div class='del'>-	guint32 size;</div><div class='del'>-	guint32 refcount;</div><div class='del'>-</div><div class='del'>-	time_t date_sent;</div><div class='del'>-	time_t date_received;</div><div class='del'>-</div><div class='del'>-	CamelSummaryMessageID message_id;/* for this message */</div><div class='del'>-	CamelSummaryReferences *references;/* from parent to root */</div><div class='del'>-</div><div class='del'>-	struct _CamelFlag *user_flags;</div><div class='del'>-	struct _CamelTag *user_tags;</div><div class='del'>-</div><div class='del'>-	/* tree of content description - NULL if it is not available */</div><div class='del'>-	CamelMessageContentInfo *content;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _CamelFolderSummaryFlags {</div><div class='del'>-	CAMEL_SUMMARY_DIRTY = 1&lt;&lt;0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolderSummary {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	/* header info */</div><div class='del'>-	guint32 version;	/* version of file required, should be set by implementors */</div><div class='del'>-	guint32 flags;		/* flags */</div><div class='del'>-	guint32 nextuid;	/* next uid? */</div><div class='del'>-	guint32 saved_count;	/* how many were saved/loaded */</div><div class='del'>-	time_t time;		/* timestamp for this summary (for implementors to use) */</div><div class='del'>-</div><div class='del'>-	/* sizes of memory objects */</div><div class='del'>-	guint32 message_info_size;</div><div class='del'>-	guint32 content_info_size;</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-	guint32 message_info_strings;</div><div class='del'>-#endif	</div><div class='del'>-	/* memory allocators (setup automatically) */</div><div class='del'>-	struct _EMemChunk *message_info_chunks;</div><div class='del'>-	struct _EMemChunk *content_info_chunks;</div><div class='del'>-</div><div class='del'>-	char *summary_path;</div><div class='del'>-	gboolean build_content;	/* do we try and parse/index the content, or not? */</div><div class='del'>-</div><div class='del'>-	GPtrArray *messages;	/* CamelMessageInfo's */</div><div class='del'>-	GHashTable *messages_uid; /* CamelMessageInfo's by uid */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolderSummaryClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* load/save the global info */</div><div class='del'>-	int (*summary_header_load)(CamelFolderSummary *, FILE *);</div><div class='del'>-	int (*summary_header_save)(CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-	/* create/save/load an individual message info */</div><div class='del'>-	CamelMessageInfo * (*message_info_new)(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-	CamelMessageInfo * (*message_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-	CamelMessageInfo * (*message_info_new_from_message)(CamelFolderSummary *, CamelMimeMessage *);</div><div class='del'>-	CamelMessageInfo * (*message_info_load)(CamelFolderSummary *, FILE *);</div><div class='del'>-	int		   (*message_info_save)(CamelFolderSummary *, FILE *, CamelMessageInfo *);</div><div class='del'>-	void		   (*message_info_free)(CamelFolderSummary *, CamelMessageInfo *);</div><div class='del'>-</div><div class='del'>-	/* save/load individual content info's */</div><div class='del'>-	CamelMessageContentInfo * (*content_info_new)(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-	CamelMessageContentInfo * (*content_info_new_from_parser)(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-	CamelMessageContentInfo * (*content_info_new_from_message)(CamelFolderSummary *, CamelMimePart *);</div><div class='del'>-	CamelMessageContentInfo * (*content_info_load)(CamelFolderSummary *, FILE *);</div><div class='del'>-	int		          (*content_info_save)(CamelFolderSummary *, FILE *, CamelMessageContentInfo *);</div><div class='del'>-	void		          (*content_info_free)(CamelFolderSummary *, CamelMessageContentInfo *);</div><div class='del'>-</div><div class='del'>-	/* get the next uid */</div><div class='del'>-	char *(*next_uid_string)(CamelFolderSummary *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType			 camel_folder_summary_get_type	(void);</div><div class='del'>-CamelFolderSummary      *camel_folder_summary_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_folder_summary_set_filename(CamelFolderSummary *, const char *);</div><div class='del'>-void camel_folder_summary_set_index(CamelFolderSummary *, CamelIndex *);</div><div class='del'>-void camel_folder_summary_set_build_content(CamelFolderSummary *, gboolean state);</div><div class='del'>-</div><div class='del'>-guint32  camel_folder_summary_next_uid        (CamelFolderSummary *s);</div><div class='del'>-char    *camel_folder_summary_next_uid_string (CamelFolderSummary *s);</div><div class='del'>-void 	 camel_folder_summary_set_uid	      (CamelFolderSummary *s, guint32 uid);</div><div class='del'>-</div><div class='del'>-/* load/save the summary in its entirety */</div><div class='del'>-int camel_folder_summary_load(CamelFolderSummary *);</div><div class='del'>-int camel_folder_summary_save(CamelFolderSummary *);</div><div class='del'>-</div><div class='del'>-/* only load the header */</div><div class='del'>-int camel_folder_summary_header_load(CamelFolderSummary *);</div><div class='del'>-</div><div class='del'>-/* set the dirty bit on the summary */</div><div class='del'>-void camel_folder_summary_touch(CamelFolderSummary *s);</div><div class='del'>-</div><div class='del'>-/* add a new raw summary item */</div><div class='del'>-void camel_folder_summary_add(CamelFolderSummary *, CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-/* build/add raw summary items */</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_header(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_parser(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_add_from_message(CamelFolderSummary *, CamelMimeMessage *);</div><div class='del'>-</div><div class='del'>-/* Just build raw summary items */</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new(CamelFolderSummary *s);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_header(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_parser(CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary *, CamelMimeMessage *);</div><div class='del'>-</div><div class='del'>-void camel_folder_summary_info_ref(CamelFolderSummary *, CamelMessageInfo *);</div><div class='del'>-void camel_folder_summary_info_free(CamelFolderSummary *, CamelMessageInfo *);</div><div class='del'>-</div><div class='del'>-CamelMessageContentInfo *camel_folder_summary_content_info_new(CamelFolderSummary *s);</div><div class='del'>-void camel_folder_summary_content_info_free(CamelFolderSummary *s, CamelMessageContentInfo *ci);</div><div class='del'>-</div><div class='del'>-/* removes a summary item, doesn't fix content offsets */</div><div class='del'>-void camel_folder_summary_remove(CamelFolderSummary *s, CamelMessageInfo *info);</div><div class='del'>-void camel_folder_summary_remove_uid(CamelFolderSummary *s, const char *uid);</div><div class='del'>-void camel_folder_summary_remove_index(CamelFolderSummary *s, int);</div><div class='del'>-/* remove all items */</div><div class='del'>-void camel_folder_summary_clear(CamelFolderSummary *s);</div><div class='del'>-</div><div class='del'>-/* lookup functions */</div><div class='del'>-int camel_folder_summary_count(CamelFolderSummary *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_index(CamelFolderSummary *, int);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_uid(CamelFolderSummary *, const char *uid);</div><div class='del'>-GPtrArray *camel_folder_summary_array(CamelFolderSummary *s);</div><div class='del'>-void camel_folder_summary_array_free(CamelFolderSummary *s, GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* summary formatting utils */</div><div class='del'>-char *camel_folder_summary_format_address(struct _header_raw *h, const char *name);</div><div class='del'>-char *camel_folder_summary_format_string(struct _header_raw *h, const char *name);</div><div class='del'>-</div><div class='del'>-/* basically like strings, but certain keywords can be compressed and de-cased */</div><div class='del'>-int camel_folder_summary_encode_token(FILE *, const char *);</div><div class='del'>-int camel_folder_summary_decode_token(FILE *, char **);</div><div class='del'>-</div><div class='del'>-/* message flag operations */</div><div class='del'>-gboolean	camel_flag_get(CamelFlag **list, const char *name);</div><div class='del'>-gboolean	camel_flag_set(CamelFlag **list, const char *name, gboolean state);</div><div class='del'>-gboolean	camel_flag_list_copy(CamelFlag **to, CamelFlag **from);</div><div class='del'>-int		camel_flag_list_size(CamelFlag **list);</div><div class='del'>-void		camel_flag_list_free(CamelFlag **list);</div><div class='del'>-</div><div class='del'>-guint32         camel_system_flag (const char *name);</div><div class='del'>-gboolean        camel_system_flag_get (guint32 flags, const char *name);</div><div class='del'>-</div><div class='del'>-/* message tag operations */</div><div class='del'>-const char	*camel_tag_get(CamelTag **list, const char *name);</div><div class='del'>-gboolean	camel_tag_set(CamelTag **list, const char *name, const char *value);</div><div class='del'>-gboolean	camel_tag_list_copy(CamelTag **to, CamelTag **from);</div><div class='del'>-int		camel_tag_list_size(CamelTag **list);</div><div class='del'>-void		camel_tag_list_free(CamelTag **list);</div><div class='del'>-</div><div class='del'>-/* message info utils for working with pseudo-messageinfo structures</div><div class='del'>-   NOTE: These cannot be added to a real summary object, but suffice for all</div><div class='del'>-   other external interfaces that use message info's */</div><div class='del'>-CamelMessageInfo *camel_message_info_new(void);</div><div class='del'>-void camel_message_info_ref(CamelMessageInfo *info);</div><div class='del'>-CamelMessageInfo *camel_message_info_new_from_header(struct _header_raw *header);</div><div class='del'>-void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);</div><div class='del'>-void camel_message_info_free(CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-/* accessors */</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-const char *camel_message_info_string(const CamelMessageInfo *mi, int type);</div><div class='del'>-#define camel_message_info_subject(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_SUBJECT)</div><div class='del'>-#define camel_message_info_from(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_FROM)</div><div class='del'>-#define camel_message_info_to(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_TO)</div><div class='del'>-#define camel_message_info_cc(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_CC)</div><div class='del'>-#define camel_message_info_uid(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_UID)</div><div class='del'>-#define camel_message_info_mlist(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MESSAGE_INFO_MLIST)</div><div class='del'>-</div><div class='del'>-void camel_message_info_set_string(CamelMessageInfo *mi, int type, char *str);</div><div class='del'>-#define camel_message_info_set_subject(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_SUBJECT, s)</div><div class='del'>-#define camel_message_info_set_from(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_FROM, s)</div><div class='del'>-#define camel_message_info_set_to(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_TO, s)</div><div class='del'>-#define camel_message_info_set_cc(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_CC, s)</div><div class='del'>-#define camel_message_info_set_uid(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_UID, s)</div><div class='del'>-#define camel_message_info_set_mlist(x, s) camel_message_info_set_string(x, CAMEL_MESSAGE_INFO_MLIST, s)</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#define camel_message_info_subject(x) (((CamelMessageInfo *)(x))-&gt;subject?((CamelMessageInfo *)(x))-&gt;subject:"")</div><div class='del'>-#define camel_message_info_from(x) (((CamelMessageInfo *)(x))-&gt;from?((CamelMessageInfo *)(x))-&gt;from:"")</div><div class='del'>-#define camel_message_info_to(x) (((CamelMessageInfo *)(x))-&gt;to?((CamelMessageInfo *)(x))-&gt;to:"")</div><div class='del'>-#define camel_message_info_cc(x) (((CamelMessageInfo *)(x))-&gt;cc?((CamelMessageInfo *)(x))-&gt;cc:"")</div><div class='del'>-#define camel_message_info_uid(x) (((CamelMessageInfo *)(x))-&gt;uid?((CamelMessageInfo *)(x))-&gt;uid:"")</div><div class='del'>-#define camel_message_info_mlist(x) (((CamelMessageInfo *)(x))-&gt;mlist?((CamelMessageInfo *)(x))-&gt;mlist:"")</div><div class='del'>-</div><div class='del'>-#define camel_message_info_set_subject(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;subject),((CamelMessageInfo *)(x))-&gt;subject = (s))</div><div class='del'>-#define camel_message_info_set_from(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;from),((CamelMessageInfo *)(x))-&gt;from = (s))</div><div class='del'>-#define camel_message_info_set_to(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;to),((CamelMessageInfo *)(x))-&gt;to = (s))</div><div class='del'>-#define camel_message_info_set_cc(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;cc),((CamelMessageInfo *)(x))-&gt;cc = (s))</div><div class='del'>-#define camel_message_info_set_uid(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;uid),((CamelMessageInfo *)(x))-&gt;uid = (s))</div><div class='del'>-#define camel_message_info_set_mlist(x, s) (g_free(((CamelMessageInfo *)(x))-&gt;mlist),((CamelMessageInfo *)(x))-&gt;mlist = (s))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* debugging functions */</div><div class='del'>-</div><div class='del'>-void camel_content_info_dump (CamelMessageContentInfo *ci, int depth);</div><div class='del'>-</div><div class='del'>-void camel_message_info_dump (CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_FOLDER_SUMMARY_H */</div><div class='head'>diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c<br/>deleted file mode 100644<br/>index 2427047ed9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-thread.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-thread.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,783 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* TODO: This could probably be made a camel object, but it isn't really required */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-folder-thread.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/*#define TIMEIT*/</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-container_add_child(CamelFolderThreadNode *node, CamelFolderThreadNode *child)</div><div class='del'>-{</div><div class='del'>-	d(printf("\nAdding child %p to parent %p \n", child, node));</div><div class='del'>-	child-&gt;next = node-&gt;child;</div><div class='del'>-	node-&gt;child = child;</div><div class='del'>-	child-&gt;parent = node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-container_parent_child(CamelFolderThreadNode *parent, CamelFolderThreadNode *child)</div><div class='del'>-{</div><div class='del'>-	CamelFolderThreadNode *c, *node;</div><div class='del'>-</div><div class='del'>-	/* are we already the right parent? */</div><div class='del'>-	if (child-&gt;parent == parent)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* would this create a loop? */</div><div class='del'>-	node = parent-&gt;parent;</div><div class='del'>-	while (node) {</div><div class='del'>-		if (node == child)</div><div class='del'>-			return;</div><div class='del'>-		node = node-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* are we unparented? */</div><div class='del'>-	if (child-&gt;parent == NULL) {</div><div class='del'>-		container_add_child(parent, child);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* else remove child from its existing parent, and reparent */</div><div class='del'>-	node = child-&gt;parent;</div><div class='del'>-	c = (CamelFolderThreadNode *)&amp;node-&gt;child;</div><div class='del'>-	d(printf("scanning children:\n"));</div><div class='del'>-	while (c-&gt;next) {</div><div class='del'>-		d(printf(" %p\n", c));</div><div class='del'>-	        if (c-&gt;next==child) {</div><div class='del'>-			d(printf("found node %p\n", child));</div><div class='del'>-			c-&gt;next = c-&gt;next-&gt;next;</div><div class='del'>-			child-&gt;parent = NULL;</div><div class='del'>-			container_add_child(parent, child);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("DAMN, we shouldn't  be here!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-prune_empty(CamelFolderThread *thread, CamelFolderThreadNode **cp)</div><div class='del'>-{</div><div class='del'>-	CamelFolderThreadNode *child, *next, *c, *lastc;</div><div class='del'>-</div><div class='del'>-	/* yes, this is intentional */</div><div class='del'>-	lastc = (CamelFolderThreadNode *)cp;</div><div class='del'>-	while (lastc-&gt;next) {</div><div class='del'>-		c = lastc-&gt;next;</div><div class='del'>-</div><div class='del'>-		d(printf("checking message %p %p (%08x%08x)\n", c,</div><div class='del'>-			 c-&gt;message, c-&gt;message?c-&gt;message-&gt;message_id.id.part.hi:0,</div><div class='del'>-			 c-&gt;message?c-&gt;message-&gt;message_id.id.part.lo:0));</div><div class='del'>-		if (c-&gt;message == NULL) {</div><div class='del'>-			if (c-&gt;child == NULL) {</div><div class='del'>-				d(printf("removing empty node\n"));</div><div class='del'>-				lastc-&gt;next = c-&gt;next;</div><div class='del'>-				e_memchunk_free(thread-&gt;node_chunks, c);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (c-&gt;parent || c-&gt;child-&gt;next==0) {</div><div class='del'>-				d(printf("promoting child\n"));</div><div class='del'>-				lastc-&gt;next = c-&gt;next; /* remove us */</div><div class='del'>-				child = c-&gt;child;</div><div class='del'>-				while (child) {</div><div class='del'>-					next = child-&gt;next;</div><div class='del'>-</div><div class='del'>-					child-&gt;parent = c-&gt;parent;</div><div class='del'>-					child-&gt;next = lastc-&gt;next;</div><div class='del'>-					lastc-&gt;next = child;</div><div class='del'>-</div><div class='del'>-					child = next;</div><div class='del'>-				}</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		prune_empty(thread, &amp;c-&gt;child);</div><div class='del'>-		lastc = c;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-hashloop(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelFolderThreadNode *c = value;</div><div class='del'>-	CamelFolderThreadNode *tail = data;</div><div class='del'>-</div><div class='del'>-	if (c-&gt;parent == NULL) {</div><div class='del'>-		c-&gt;next = tail-&gt;next;</div><div class='del'>-		tail-&gt;next = c;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_root_subject(CamelFolderThreadNode *c, int *re)</div><div class='del'>-{</div><div class='del'>-	char *s, *p;</div><div class='del'>-	CamelFolderThreadNode *scan;</div><div class='del'>-	</div><div class='del'>-	s = NULL;</div><div class='del'>-	*re = FALSE;</div><div class='del'>-	if (c-&gt;message)</div><div class='del'>-		s = (char *)camel_message_info_subject(c-&gt;message);</div><div class='del'>-	else {</div><div class='del'>-		/* one of the children will always have a message */</div><div class='del'>-		scan = c-&gt;child;</div><div class='del'>-		while (scan) {</div><div class='del'>-			if (scan-&gt;message) {</div><div class='del'>-				s = (char *)camel_message_info_subject(scan-&gt;message);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			scan = scan-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (s != NULL) {</div><div class='del'>-		while (*s) {</div><div class='del'>-			while (isspace(*s))</div><div class='del'>-				s++;</div><div class='del'>-			if (s[0] == 0)</div><div class='del'>-				break;</div><div class='del'>-			if ((s[0] == 'r' || s[0]=='R')</div><div class='del'>-			    &amp;&amp; (s[1] == 'e' || s[1]=='E')) {</div><div class='del'>-				p = s+2;</div><div class='del'>-				while (isdigit(*p) || (ispunct(*p) &amp;&amp; (*p != ':')))</div><div class='del'>-					p++;</div><div class='del'>-				if (*p==':') {</div><div class='del'>-					*re = TRUE;</div><div class='del'>-					s = p+1;</div><div class='del'>-				} else</div><div class='del'>-					break;</div><div class='del'>-			} else</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (*s)</div><div class='del'>-			return s;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this can be pretty slow, but not used often */</div><div class='del'>-/* clast cannot be null */</div><div class='del'>-static void</div><div class='del'>-remove_node(CamelFolderThreadNode **list, CamelFolderThreadNode *node, CamelFolderThreadNode **clast)</div><div class='del'>-{</div><div class='del'>-	CamelFolderThreadNode *c;</div><div class='del'>-</div><div class='del'>-	/* this is intentional, even if it looks funny */</div><div class='del'>-	/* if we have a parent, then we should remove it from the parent list,</div><div class='del'>-	   otherwise we remove it from the root list */</div><div class='del'>-	if (node-&gt;parent) {</div><div class='del'>-		c = (CamelFolderThreadNode *)&amp;node-&gt;parent-&gt;child;</div><div class='del'>-	} else {</div><div class='del'>-		c = (CamelFolderThreadNode *)list;</div><div class='del'>-	}</div><div class='del'>-	while (c-&gt;next) {</div><div class='del'>-		if (c-&gt;next == node) {</div><div class='del'>-			if (*clast == c-&gt;next)</div><div class='del'>-				*clast = c;</div><div class='del'>-			c-&gt;next = c-&gt;next-&gt;next;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("ERROR: removing node %p failed\n", node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-group_root_set(CamelFolderThread *thread, CamelFolderThreadNode **cp)</div><div class='del'>-{</div><div class='del'>-	GHashTable *subject_table = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	CamelFolderThreadNode *c, *clast, *scan, *container;</div><div class='del'>-</div><div class='del'>-	/* gather subject lines */ </div><div class='del'>-	d(printf("gathering subject lines\n"));</div><div class='del'>-	clast = (CamelFolderThreadNode *)cp;</div><div class='del'>-	c = clast-&gt;next;</div><div class='del'>-	while (c) {</div><div class='del'>-		c-&gt;root_subject = get_root_subject(c, &amp;c-&gt;re);</div><div class='del'>-		if (c-&gt;root_subject) {</div><div class='del'>-			container = g_hash_table_lookup(subject_table, c-&gt;root_subject);</div><div class='del'>-			if (container == NULL</div><div class='del'>-			    || (container-&gt;message == NULL &amp;&amp; c-&gt;message)</div><div class='del'>-			    || (container-&gt;re == TRUE &amp;&amp; !c-&gt;re)) {</div><div class='del'>-				g_hash_table_insert(subject_table, c-&gt;root_subject, c);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* merge common subjects? */</div><div class='del'>-	clast = (CamelFolderThreadNode *)cp;</div><div class='del'>-	while (clast-&gt;next) {</div><div class='del'>-		c = clast-&gt;next;</div><div class='del'>-		d(printf("checking %p %s\n", c, c-&gt;root_subject));</div><div class='del'>-		if (c-&gt;root_subject</div><div class='del'>-		    &amp;&amp; (container = g_hash_table_lookup(subject_table, c-&gt;root_subject))</div><div class='del'>-		    &amp;&amp; (container != c)) {</div><div class='del'>-			d(printf(" matching %p %s\n", container, container-&gt;root_subject));</div><div class='del'>-			if (c-&gt;message == NULL &amp;&amp; container-&gt;message == NULL) {</div><div class='del'>-				d(printf("merge containers children\n"));</div><div class='del'>-				/* steal the children from c onto container, and unlink c */</div><div class='del'>-				scan = (CamelFolderThreadNode *)&amp;container-&gt;child;</div><div class='del'>-				while (scan-&gt;next)</div><div class='del'>-					scan = scan-&gt;next;</div><div class='del'>-				scan-&gt;next = c-&gt;child;</div><div class='del'>-				clast-&gt;next = c-&gt;next;</div><div class='del'>-				e_memchunk_free(thread-&gt;node_chunks, c);</div><div class='del'>-				continue;</div><div class='del'>-			} if (c-&gt;message == NULL &amp;&amp; container-&gt;message != NULL) {</div><div class='del'>-				d(printf("container is non-empty parent\n"));</div><div class='del'>-				remove_node(cp, container, &amp;clast);</div><div class='del'>-				container_add_child(c, container);</div><div class='del'>-			} else if (c-&gt;message != NULL &amp;&amp; container-&gt;message == NULL) {</div><div class='del'>-				d(printf("container is empty child\n"));</div><div class='del'>-				clast-&gt;next = c-&gt;next;</div><div class='del'>-				container_add_child(container, c);</div><div class='del'>-				continue;</div><div class='del'>-			} else if (c-&gt;re &amp;&amp; !container-&gt;re) {</div><div class='del'>-				d(printf("container is re\n"));</div><div class='del'>-				clast-&gt;next = c-&gt;next;</div><div class='del'>-				container_add_child(container, c);</div><div class='del'>-				continue;</div><div class='del'>-			} else if (!c-&gt;re &amp;&amp; container-&gt;re) {</div><div class='del'>-				d(printf("container is not re\n"));</div><div class='del'>-				remove_node(cp, container, &amp;clast);</div><div class='del'>-				container_add_child(c, container);</div><div class='del'>-			} else if (c-&gt;re &amp;&amp; container-&gt;re) {</div><div class='del'>-				d(printf("subjects are common %p and %p\n", c, container));</div><div class='del'>-</div><div class='del'>-				/* build a phantom node */</div><div class='del'>-				remove_node(cp, container, &amp;clast);</div><div class='del'>-				remove_node(cp, c, &amp;clast);</div><div class='del'>-</div><div class='del'>-				scan = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-</div><div class='del'>-				scan-&gt;root_subject = c-&gt;root_subject;</div><div class='del'>-				scan-&gt;re = c-&gt;re &amp;&amp; container-&gt;re;</div><div class='del'>-				scan-&gt;next = c-&gt;next;</div><div class='del'>-				clast-&gt;next = scan;</div><div class='del'>-				container_add_child(scan, c);</div><div class='del'>-				container_add_child(scan, container);</div><div class='del'>-				clast = scan;</div><div class='del'>-				g_hash_table_insert(subject_table, scan-&gt;root_subject, scan);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		clast = c;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(subject_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _tree_info {</div><div class='del'>-	GHashTable *visited;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-dump_tree_rec(struct _tree_info *info, CamelFolderThreadNode *c, int depth)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-	int count=0;</div><div class='del'>-</div><div class='del'>-	p = alloca(depth*2+1);</div><div class='del'>-	memset(p, ' ', depth*2);</div><div class='del'>-	p[depth*2] = 0;</div><div class='del'>-</div><div class='del'>-	while (c) {</div><div class='del'>-		if (g_hash_table_lookup(info-&gt;visited, c)) {</div><div class='del'>-			printf("WARNING: NODE REVISITED: %p\n", c);</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(info-&gt;visited, c, c);</div><div class='del'>-		}</div><div class='del'>-		if (c-&gt;message) {</div><div class='del'>-			printf("%s %p Subject: %s &lt;%.8s&gt;\n", p, c, camel_message_info_subject(c-&gt;message), c-&gt;message-&gt;message_id.id.hash);</div><div class='del'>-			count += 1;</div><div class='del'>-		} else {</div><div class='del'>-			printf("%s %p &lt;empty&gt;\n", p, c);</div><div class='del'>-		}</div><div class='del'>-		if (c-&gt;child)</div><div class='del'>-			count += dump_tree_rec(info, c-&gt;child, depth+1);</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_folder_threaded_messages_dump(CamelFolderThreadNode *c)</div><div class='del'>-{</div><div class='del'>-	int count;</div><div class='del'>-	struct _tree_info info;</div><div class='del'>-</div><div class='del'>-	info.visited = g_hash_table_new(g_direct_hash, g_direct_equal);</div><div class='del'>-	count = dump_tree_rec(&amp;info, c, 0);</div><div class='del'>-	g_hash_table_destroy(info.visited);</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sort_node(const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	const CamelFolderThreadNode *a1 = ((CamelFolderThreadNode **)a)[0];</div><div class='del'>-	const CamelFolderThreadNode *b1 = ((CamelFolderThreadNode **)b)[0];</div><div class='del'>-</div><div class='del'>-	/* if we have no message, it must be a dummy node, which </div><div class='del'>-	   also means it must have a child, just use that as the</div><div class='del'>-	   sort data (close enough?) */</div><div class='del'>-	if (a1-&gt;message == NULL)</div><div class='del'>-		a1 = a1-&gt;child;</div><div class='del'>-	if (b1-&gt;message == NULL)</div><div class='del'>-		b1 = b1-&gt;child;</div><div class='del'>-	if (a1-&gt;order == b1-&gt;order)</div><div class='del'>-		return 0;</div><div class='del'>-	if (a1-&gt;order &lt; b1-&gt;order)</div><div class='del'>-		return -1;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sort_thread(CamelFolderThreadNode **cp)</div><div class='del'>-{</div><div class='del'>-	CamelFolderThreadNode *c, *head, **carray;</div><div class='del'>-	int size=0;</div><div class='del'>-</div><div class='del'>-	c = *cp;</div><div class='del'>-	while (c) {</div><div class='del'>-		/* sort the children while we're at it */</div><div class='del'>-		if (c-&gt;child)</div><div class='del'>-			sort_thread(&amp;c-&gt;child);</div><div class='del'>-		size++;</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (size&lt;2)</div><div class='del'>-		return;</div><div class='del'>-	carray = alloca(size*sizeof(CamelFolderThreadNode *));</div><div class='del'>-	c = *cp;</div><div class='del'>-	size=0;</div><div class='del'>-	while (c) {</div><div class='del'>-		carray[size] = c;</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-		size++;</div><div class='del'>-	}</div><div class='del'>-	qsort(carray, size, sizeof(CamelFolderThreadNode *), sort_node);</div><div class='del'>-	size--;</div><div class='del'>-	head = carray[size];</div><div class='del'>-	head-&gt;next = NULL;</div><div class='del'>-	size--;</div><div class='del'>-	do {</div><div class='del'>-		c = carray[size];</div><div class='del'>-		c-&gt;next = head;</div><div class='del'>-		head = c;</div><div class='del'>-		size--;</div><div class='del'>-	} while (size&gt;=0);</div><div class='del'>-	*cp = head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint id_hash(void *key)</div><div class='del'>-{</div><div class='del'>-	CamelSummaryMessageID *id = (CamelSummaryMessageID *)key;</div><div class='del'>-</div><div class='del'>-	return id-&gt;id.part.lo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint id_equal(void *a, void *b)</div><div class='del'>-{</div><div class='del'>-	return ((CamelSummaryMessageID *)a)-&gt;id.id == ((CamelSummaryMessageID *)b)-&gt;id.id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_thread_messages_new:</div><div class='del'>- * @folder: </div><div class='del'>- * @uids: The subset of uid's to thread.  If NULL. then thread all</div><div class='del'>- * uid's in @folder.</div><div class='del'>- * </div><div class='del'>- * Thread a (subset) of the messages in a folder.  And sort the result</div><div class='del'>- * in summary order.</div><div class='del'>- * </div><div class='del'>- * This function is probably to be removed soon.</div><div class='del'>- *</div><div class='del'>- * Return value: A CamelFolderThread contianing a tree of CamelFolderThreadNode's</div><div class='del'>- * which represent the threaded structure of the messages.</div><div class='del'>- **/</div><div class='del'>-CamelFolderThread *</div><div class='del'>-camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	GHashTable *id_table, *no_id_table;</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderThreadNode *c, *child, *head;</div><div class='del'>-	CamelFolderThread *thread;</div><div class='del'>-	GHashTable *wanted = NULL;</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-	struct timeval start, end;</div><div class='del'>-	unsigned long diff;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;start, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	thread = g_malloc(sizeof(*thread));</div><div class='del'>-	thread-&gt;tree = NULL;</div><div class='del'>-	thread-&gt;node_chunks = e_memchunk_new(32, sizeof(CamelFolderThreadNode));</div><div class='del'>-	thread-&gt;folder = folder;</div><div class='del'>-	camel_object_ref((CamelObject *)folder);</div><div class='del'>-</div><div class='del'>-	/* wanted is the list of what we want, we put it in a hash for quick lookup */</div><div class='del'>-	if (uids) {</div><div class='del'>-		wanted = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-		for (i=0;i&lt;uids-&gt;len;i++)</div><div class='del'>-			g_hash_table_insert(wanted, uids-&gt;pdata[i], uids-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thread-&gt;summary = summary = camel_folder_get_summary(folder);</div><div class='del'>-	</div><div class='del'>-	id_table = g_hash_table_new((GHashFunc)id_hash, (GCompareFunc)id_equal);</div><div class='del'>-	no_id_table = g_hash_table_new(NULL, NULL);</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *mi = summary-&gt;pdata[i];</div><div class='del'>-		const char *uid = camel_message_info_uid(mi);</div><div class='del'>-</div><div class='del'>-		if (wanted &amp;&amp; g_hash_table_lookup(wanted, uid) == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (mi-&gt;message_id.id.id) {</div><div class='del'>-			c = g_hash_table_lookup(id_table, &amp;mi-&gt;message_id);</div><div class='del'>-			/* check for duplicate messages */</div><div class='del'>-			if (c &amp;&amp; c-&gt;order) {</div><div class='del'>-				/* if duplicate, just make out it is a no-id message,  but try and insert it</div><div class='del'>-				   into the right spot in the tree */</div><div class='del'>-				d(printf("doing: (duplicate message id)\n"));</div><div class='del'>-				c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-				g_hash_table_insert(no_id_table, (void *)mi, c);</div><div class='del'>-			} else if (!c) {</div><div class='del'>-				d(printf("doing : %08x%08x (%s)\n", mi-&gt;message_id.id.part.hi, mi-&gt;message_id.id.part.lo, camel_message_info_subject(mi)));</div><div class='del'>-				c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-				g_hash_table_insert(id_table, (void *)&amp;mi-&gt;message_id, c);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("doing : (no message id)\n"));</div><div class='del'>-			c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-			g_hash_table_insert(no_id_table, (void *)mi, c);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		c-&gt;message = mi;</div><div class='del'>-		c-&gt;order = i+1;</div><div class='del'>-		child = c;</div><div class='del'>-		if (mi-&gt;references) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			d(printf("references:\n"));</div><div class='del'>-			for (j=0;j&lt;mi-&gt;references-&gt;size;j++) {</div><div class='del'>-				/* should never be empty, but just incase */</div><div class='del'>-				if (mi-&gt;references-&gt;references[j].id.id == 0)</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				c = g_hash_table_lookup(id_table, &amp;mi-&gt;references-&gt;references[j]);</div><div class='del'>-				if (c == NULL) {</div><div class='del'>-					d(printf("not found\n"));</div><div class='del'>-					c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-					g_hash_table_insert(id_table, &amp;mi-&gt;references-&gt;references[j], c);</div><div class='del'>-				}</div><div class='del'>-				if (c!=child)</div><div class='del'>-					container_parent_child(c, child);</div><div class='del'>-				child = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("\n\n"));</div><div class='del'>-	/* build a list of root messages (no parent) */</div><div class='del'>-	head = NULL;</div><div class='del'>-	g_hash_table_foreach(id_table, hashloop, &amp;head);</div><div class='del'>-	g_hash_table_foreach(no_id_table, hashloop, &amp;head);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(id_table);</div><div class='del'>-	g_hash_table_destroy(no_id_table);</div><div class='del'>-</div><div class='del'>-	/* remove empty parent nodes */</div><div class='del'>-	prune_empty(thread, &amp;head);</div><div class='del'>-</div><div class='del'>-	/* find any siblings which missed out */</div><div class='del'>-	group_root_set(thread, &amp;head);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printf("finished\n");</div><div class='del'>-	i = camel_folder_thread_messages_dump(head);</div><div class='del'>-	printf("%d count, %d items in tree\n", uids-&gt;len, i);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sort_thread(&amp;head);</div><div class='del'>-</div><div class='del'>-	/* remove any phantom nodes, this could possibly be put in group_root_set()? */</div><div class='del'>-	c = (CamelFolderThreadNode *)&amp;head;</div><div class='del'>-	while (c &amp;&amp; c-&gt;next) {</div><div class='del'>-		CamelFolderThreadNode *scan, *newtop;</div><div class='del'>-</div><div class='del'>-		child = c-&gt;next;</div><div class='del'>-		if (child-&gt;message == NULL) {</div><div class='del'>-			newtop = child-&gt;child;</div><div class='del'>-			/* unlink pseudo node */</div><div class='del'>-			c-&gt;next = newtop;</div><div class='del'>-</div><div class='del'>-			/* link its siblings onto the end of its children */</div><div class='del'>-			scan = (CamelFolderThreadNode *)&amp;newtop-&gt;child;</div><div class='del'>-			while (scan-&gt;next)</div><div class='del'>-				scan = scan-&gt;next;</div><div class='del'>-			scan-&gt;next = newtop-&gt;next;</div><div class='del'>-			/* and link the now 'real' node into the list */</div><div class='del'>-			newtop-&gt;next = child-&gt;next;</div><div class='del'>-			c = newtop;</div><div class='del'>-			e_memchunk_free(thread-&gt;node_chunks, child);</div><div class='del'>-		} else {</div><div class='del'>-			c = child;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this is only debug assertion stuff */</div><div class='del'>-	c = (CamelFolderThreadNode *)&amp;head;</div><div class='del'>-	while (c-&gt;next) {</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-		if (c-&gt;message == NULL)</div><div class='del'>-			g_warning("threading missed removing a pseudo node: %s\n", c-&gt;root_subject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thread-&gt;tree = head;</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-	gettimeofday(&amp;end, NULL);</div><div class='del'>-	diff = end.tv_sec * 1000 + end.tv_usec/1000;</div><div class='del'>-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;</div><div class='del'>-	printf("Message threading %d messages took %ld.%03ld seconds\n",</div><div class='del'>-	       uids-&gt;len, diff / 1000, diff % 1000);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return thread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_thread_messages_new_summary:</div><div class='del'>- * @summary: Array of CamelMessageInfo's to thread.</div><div class='del'>- * </div><div class='del'>- * Thread a list of MessageInfo's.  The summary must remain valid for the</div><div class='del'>- * life of the CamelFolderThread created by this function, and it is upto the</div><div class='del'>- * caller to ensure this.</div><div class='del'>- * </div><div class='del'>- * Return value: A CamelFolderThread contianing a tree of CamelFolderThreadNode's</div><div class='del'>- * which represent the threaded structure of the messages.</div><div class='del'>- **/</div><div class='del'>-CamelFolderThread *</div><div class='del'>-camel_folder_thread_messages_new_summary(GPtrArray *summary)</div><div class='del'>-{</div><div class='del'>-	GHashTable *id_table, *no_id_table;</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderThreadNode *c, *child, *head;</div><div class='del'>-	CamelFolderThread *thread;</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-	struct timeval start, end;</div><div class='del'>-	unsigned long diff;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;start, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	thread = g_malloc(sizeof(*thread));</div><div class='del'>-	thread-&gt;tree = NULL;</div><div class='del'>-	thread-&gt;node_chunks = e_memchunk_new(32, sizeof(CamelFolderThreadNode));</div><div class='del'>-	thread-&gt;folder = NULL;</div><div class='del'>-	thread-&gt;summary = NULL;</div><div class='del'>-	</div><div class='del'>-	id_table = g_hash_table_new((GHashFunc)id_hash, (GCompareFunc)id_equal);</div><div class='del'>-	no_id_table = g_hash_table_new(NULL, NULL);</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *mi = summary-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		if (mi-&gt;message_id.id.id) {</div><div class='del'>-			c = g_hash_table_lookup(id_table, &amp;mi-&gt;message_id);</div><div class='del'>-			/* check for duplicate messages */</div><div class='del'>-			if (c &amp;&amp; c-&gt;order) {</div><div class='del'>-				/* if duplicate, just make out it is a no-id message,  but try and insert it</div><div class='del'>-				   into the right spot in the tree */</div><div class='del'>-				d(printf("doing: (duplicate message id)\n"));</div><div class='del'>-				c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-				g_hash_table_insert(no_id_table, (void *)mi, c);</div><div class='del'>-			} else if (!c) {</div><div class='del'>-				d(printf("doing : %08x%08x (%s)\n", mi-&gt;message_id.id.part.hi, mi-&gt;message_id.id.part.lo, camel_message_info_subject(mi)));</div><div class='del'>-				c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-				g_hash_table_insert(id_table, (void *)&amp;mi-&gt;message_id, c);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("doing : (no message id)\n"));</div><div class='del'>-			c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-			g_hash_table_insert(no_id_table, (void *)mi, c);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		c-&gt;message = mi;</div><div class='del'>-		c-&gt;order = i+1;</div><div class='del'>-		child = c;</div><div class='del'>-		if (mi-&gt;references) {</div><div class='del'>-			int j;</div><div class='del'>-</div><div class='del'>-			d(printf("references:\n"));</div><div class='del'>-			for (j=0;j&lt;mi-&gt;references-&gt;size;j++) {</div><div class='del'>-				/* should never be empty, but just incase */</div><div class='del'>-				if (mi-&gt;references-&gt;references[j].id.id == 0)</div><div class='del'>-					continue;</div><div class='del'>-</div><div class='del'>-				c = g_hash_table_lookup(id_table, &amp;mi-&gt;references-&gt;references[j]);</div><div class='del'>-				if (c == NULL) {</div><div class='del'>-					d(printf("not found\n"));</div><div class='del'>-					c = e_memchunk_alloc0(thread-&gt;node_chunks);</div><div class='del'>-					g_hash_table_insert(id_table, &amp;mi-&gt;references-&gt;references[j], c);</div><div class='del'>-				}</div><div class='del'>-				if (c!=child)</div><div class='del'>-					container_parent_child(c, child);</div><div class='del'>-				child = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("\n\n"));</div><div class='del'>-	/* build a list of root messages (no parent) */</div><div class='del'>-	head = NULL;</div><div class='del'>-	g_hash_table_foreach(id_table, hashloop, &amp;head);</div><div class='del'>-	g_hash_table_foreach(no_id_table, hashloop, &amp;head);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(id_table);</div><div class='del'>-	g_hash_table_destroy(no_id_table);</div><div class='del'>-</div><div class='del'>-	/* remove empty parent nodes */</div><div class='del'>-	prune_empty(thread, &amp;head);</div><div class='del'>-</div><div class='del'>-	/* find any siblings which missed out */</div><div class='del'>-	group_root_set(thread, &amp;head);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printf("finished\n");</div><div class='del'>-	i = camel_folder_thread_messages_dump(head);</div><div class='del'>-	printf("%d count, %d items in tree\n", uids-&gt;len, i);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	sort_thread(&amp;head);</div><div class='del'>-</div><div class='del'>-	/* remove any phantom nodes, this could possibly be put in group_root_set()? */</div><div class='del'>-	c = (CamelFolderThreadNode *)&amp;head;</div><div class='del'>-	while (c &amp;&amp; c-&gt;next) {</div><div class='del'>-		CamelFolderThreadNode *scan, *newtop;</div><div class='del'>-</div><div class='del'>-		child = c-&gt;next;</div><div class='del'>-		if (child-&gt;message == NULL) {</div><div class='del'>-			newtop = child-&gt;child;</div><div class='del'>-			/* unlink pseudo node */</div><div class='del'>-			c-&gt;next = newtop;</div><div class='del'>-</div><div class='del'>-			/* link its siblings onto the end of its children */</div><div class='del'>-			scan = (CamelFolderThreadNode *)&amp;newtop-&gt;child;</div><div class='del'>-			while (scan-&gt;next)</div><div class='del'>-				scan = scan-&gt;next;</div><div class='del'>-			scan-&gt;next = newtop-&gt;next;</div><div class='del'>-			/* and link the now 'real' node into the list */</div><div class='del'>-			newtop-&gt;next = child-&gt;next;</div><div class='del'>-			c = newtop;</div><div class='del'>-			e_memchunk_free(thread-&gt;node_chunks, child);</div><div class='del'>-		} else {</div><div class='del'>-			c = child;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this is only debug assertion stuff */</div><div class='del'>-	c = (CamelFolderThreadNode *)&amp;head;</div><div class='del'>-	while (c-&gt;next) {</div><div class='del'>-		c = c-&gt;next;</div><div class='del'>-		if (c-&gt;message == NULL)</div><div class='del'>-			g_warning("threading missed removing a pseudo node: %s\n", c-&gt;root_subject);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	thread-&gt;tree = head;</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-	gettimeofday(&amp;end, NULL);</div><div class='del'>-	diff = end.tv_sec * 1000 + end.tv_usec/1000;</div><div class='del'>-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;</div><div class='del'>-	printf("Message threading %d messages took %ld.%03ld seconds\n",</div><div class='del'>-	       summary-&gt;len, diff / 1000, diff % 1000);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return thread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_thread_messages_destroy:</div><div class='del'>- * @thread: </div><div class='del'>- * </div><div class='del'>- * Free all memory associated with the thread descriptor @thread.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_thread_messages_destroy(CamelFolderThread *thread)</div><div class='del'>-{</div><div class='del'>-	if (thread-&gt;folder) {</div><div class='del'>-		camel_folder_free_summary(thread-&gt;folder, thread-&gt;summary);</div><div class='del'>-		camel_object_unref((CamelObject *)thread-&gt;folder);</div><div class='del'>-	}</div><div class='del'>-	e_memchunk_destroy(thread-&gt;node_chunks);</div><div class='del'>-	g_free(thread);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* intended for incremental update.  Not implemented yet as, well, its probbaly</div><div class='del'>-   not worth it (memory overhead vs speed, may as well just rethread the whole</div><div class='del'>-   lot?)</div><div class='del'>-</div><div class='del'>-   But it might be implemented at a later date.</div><div class='del'>-*/</div><div class='del'>-void</div><div class='del'>-camel_folder_thread_messages_add(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-thread_messages_remove(CamelFolderThread *thread, CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h<br/>deleted file mode 100644<br/>index 5999b7bab8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-thread.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder-thread.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_FOLDER_THREAD_H</div><div class='del'>-#define _CAMEL_FOLDER_THREAD_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderThreadNode {</div><div class='del'>-	struct _CamelFolderThreadNode *next,</div><div class='del'>-		*parent,</div><div class='del'>-		*child;</div><div class='del'>-	const CamelMessageInfo *message;</div><div class='del'>-	char *root_subject;	/* cached root equivalent subject */</div><div class='del'>-	int re;			/* re version of subject? */</div><div class='del'>-	int order;</div><div class='del'>-} CamelFolderThreadNode;</div><div class='del'>-</div><div class='del'>-typedef struct CamelFolderThread {</div><div class='del'>-	struct _CamelFolderThreadNode *tree;</div><div class='del'>-	struct _EMemChunk *node_chunks;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	GPtrArray *summary;</div><div class='del'>-} CamelFolderThread;</div><div class='del'>-</div><div class='del'>-CamelFolderThread *camel_folder_thread_messages_new(CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-</div><div class='del'>-/* new improved interface (believe it or not!) */</div><div class='del'>-CamelFolderThread *camel_folder_thread_messages_new_summary(GPtrArray *summary);</div><div class='del'>-/*</div><div class='del'>-void camel_folder_thread_messages_add(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-void camel_folder_thread_messages_remove(CamelFolderThread *threads, CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-*/</div><div class='del'>-void camel_folder_thread_messages_destroy(CamelFolderThread *threads);</div><div class='del'>-</div><div class='del'>-/* debugging function only */</div><div class='del'>-int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* !_CAMEL_FOLDER_THREAD_H */</div><div class='head'>diff --git a/camel/camel-folder.c b/camel/camel-folder.c<br/>deleted file mode 100644<br/>index 05d765ce7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1993 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-folder.c: Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-filter-driver.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-#include "camel-vtrash-folder.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelFolder */</div><div class='del'>-#define CF_CLASS(so) ((CamelFolderClass *)((CamelObject *)(so))-&gt;klass)</div><div class='del'>-</div><div class='del'>-static void camel_folder_finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void folder_sync (CamelFolder *folder, gboolean expunge,</div><div class='del'>-			 CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const gchar *get_name (CamelFolder *folder);</div><div class='del'>-static const gchar *get_full_name (CamelFolder *folder);</div><div class='del'>-static CamelStore *get_parent_store   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static guint32 get_permanent_flags (CamelFolder *folder);</div><div class='del'>-static guint32 get_message_flags (CamelFolder *folder, const char *uid);</div><div class='del'>-static void set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			       guint32 flags, guint32 set);</div><div class='del'>-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				   const char *name, gboolean value);</div><div class='del'>-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static gint get_message_count (CamelFolder *folder);</div><div class='del'>-static gint get_unread_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static void expunge             (CamelFolder *folder,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-			    const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-			    CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray        *get_uids            (CamelFolder *folder);</div><div class='del'>-static void              free_uids           (CamelFolder *folder,</div><div class='del'>-					      GPtrArray *array);</div><div class='del'>-static GPtrArray        *get_summary         (CamelFolder *folder);</div><div class='del'>-static void              free_summary        (CamelFolder *folder,</div><div class='del'>-					      GPtrArray *array);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *get_message         (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *get_message_info    (CamelFolder *folder, const char *uid);</div><div class='del'>-static void		 free_message_info   (CamelFolder *folder, CamelMessageInfo *info);</div><div class='del'>-static void		 ref_message_info    (CamelFolder *folder, CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-static GPtrArray      *search_by_expression  (CamelFolder *folder, const char *exp, CamelException *ex);</div><div class='del'>-static GPtrArray      *search_by_uids	     (CamelFolder *folder, const char *exp, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void            search_free           (CamelFolder * folder, GPtrArray *result);</div><div class='del'>-</div><div class='del'>-static void            transfer_messages_to  (CamelFolder *source, GPtrArray *uids, CamelFolder *dest,</div><div class='del'>-					      GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void            delete                (CamelFolder *folder);</div><div class='del'>-static void            folder_rename         (CamelFolder *folder, const char *new);</div><div class='del'>-</div><div class='del'>-static void            freeze                (CamelFolder *folder);</div><div class='del'>-static void            thaw                  (CamelFolder *folder);</div><div class='del'>-static gboolean        is_frozen             (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static gboolean        folder_changed        (CamelObject *object,</div><div class='del'>-					      gpointer event_data);</div><div class='del'>-static gboolean        message_changed       (CamelObject *object,</div><div class='del'>-					      /*const char *uid*/gpointer event_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_class_init (CamelFolderClass *camel_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class =</div><div class='del'>-		CAMEL_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_folder_class-&gt;sync = folder_sync;</div><div class='del'>-	camel_folder_class-&gt;refresh_info = refresh_info;</div><div class='del'>-	camel_folder_class-&gt;get_name = get_name;</div><div class='del'>-	camel_folder_class-&gt;get_full_name = get_full_name;</div><div class='del'>-	camel_folder_class-&gt;get_parent_store = get_parent_store;</div><div class='del'>-	camel_folder_class-&gt;expunge = expunge;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_unread_message_count = get_unread_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = append_message;</div><div class='del'>-	camel_folder_class-&gt;get_permanent_flags = get_permanent_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_flags = get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_flag = get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_tag = get_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = set_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;get_message = get_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = free_uids;</div><div class='del'>-	camel_folder_class-&gt;get_summary = get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = free_summary;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_by_uids = search_by_uids;</div><div class='del'>-	camel_folder_class-&gt;search_free = search_free;</div><div class='del'>-	camel_folder_class-&gt;get_message_info = get_message_info;</div><div class='del'>-	camel_folder_class-&gt;ref_message_info = ref_message_info;</div><div class='del'>-	camel_folder_class-&gt;free_message_info = free_message_info;</div><div class='del'>-	camel_folder_class-&gt;transfer_messages_to = transfer_messages_to;</div><div class='del'>-	camel_folder_class-&gt;delete = delete;</div><div class='del'>-	camel_folder_class-&gt;rename = folder_rename;</div><div class='del'>-	camel_folder_class-&gt;freeze = freeze;</div><div class='del'>-	camel_folder_class-&gt;thaw = thaw;</div><div class='del'>-	camel_folder_class-&gt;is_frozen = is_frozen;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_changed", folder_changed);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "message_changed", message_changed);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "deleted", NULL);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "renamed", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-</div><div class='del'>-	folder-&gt;priv = g_malloc0(sizeof(*folder-&gt;priv));</div><div class='del'>-	folder-&gt;priv-&gt;frozen = 0;</div><div class='del'>-	folder-&gt;priv-&gt;changed_frozen = camel_folder_change_info_new();</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	folder-&gt;priv-&gt;lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-	folder-&gt;priv-&gt;change_lock = e_mutex_new(E_MUTEX_SIMPLE);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *camel_folder = CAMEL_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	g_free (camel_folder-&gt;name);</div><div class='del'>-	g_free (camel_folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	if (camel_folder-&gt;parent_store)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (camel_folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	if (camel_folder-&gt;summary)</div><div class='del'>-		camel_object_unref((CamelObject *)camel_folder-&gt;summary);</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(camel_folder-&gt;priv-&gt;changed_frozen);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy(camel_folder-&gt;priv-&gt;lock);</div><div class='del'>-	e_mutex_destroy(camel_folder-&gt;priv-&gt;change_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(camel_folder-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_folder_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_folder_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelFolder",</div><div class='del'>-							 sizeof (CamelFolder),</div><div class='del'>-							 sizeof (CamelFolderClass),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_folder_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 (CamelObjectInitFunc) camel_folder_init,</div><div class='del'>-							 (CamelObjectFinalizeFunc) camel_folder_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_construct:</div><div class='del'>- * @folder: folder object to construct</div><div class='del'>- * @parent_store: parent store object of the folder</div><div class='del'>- * @full_name: full name of the folder</div><div class='del'>- * @name: short name of the folder</div><div class='del'>- *</div><div class='del'>- * Initalizes the folder by setting the parent store and name.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-			const char *full_name, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (parent_store));</div><div class='del'>-	g_return_if_fail (folder-&gt;parent_store == NULL);</div><div class='del'>-	g_return_if_fail (folder-&gt;name == NULL);</div><div class='del'>-</div><div class='del'>-	folder-&gt;parent_store = parent_store;</div><div class='del'>-	if (parent_store)</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (parent_store));</div><div class='del'>-</div><div class='del'>-	folder-&gt;name = g_strdup (name);</div><div class='del'>-	folder-&gt;full_name = g_strdup (full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelFolder::sync not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_sync:</div><div class='del'>- * @folder: The folder object</div><div class='del'>- * @expunge: whether or not to expunge deleted messages</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Sync changes made to a folder to its backing store, possibly expunging</div><div class='del'>- * deleted messages as well.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-	</div><div class='del'>-	if (!(folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_BEEN_DELETED))</div><div class='del'>-		CF_CLASS (folder)-&gt;sync (folder, expunge, ex);</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* No op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_refresh_info:</div><div class='del'>- * @folder: The folder object</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Updates a folder's summary to be in sync with its backing store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;refresh_info (folder, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-get_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_name:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Get the (short) name of the folder. The fully qualified name</div><div class='del'>- * can be obtained with the get_full_name method.</div><div class='del'>- *</div><div class='del'>- * Return value: name of the folder</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_name (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_name (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;full_name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_full_name:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Get the (full) name of the folder.</div><div class='del'>- *</div><div class='del'>- * Return value: full name of the folder</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_full_name (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelStore *</div><div class='del'>-get_parent_store (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;parent_store;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_parent_store:</div><div class='del'>- * @folder: folder to get the parent of</div><div class='del'>- *</div><div class='del'>- * Return value: the parent store of the folder.</div><div class='del'>- **/</div><div class='del'>-CamelStore *</div><div class='del'>-camel_folder_get_parent_store (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_parent_store (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelFolder::expunge not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_expunge:</div><div class='del'>- * @folder: the folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Delete messages which have been marked as "DELETED"</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-	</div><div class='del'>-	if (!(folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_BEEN_DELETED))</div><div class='del'>-		CF_CLASS (folder)-&gt;expunge (folder, ex);</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message_count:</div><div class='del'>- * @folder: A CamelFolder object</div><div class='del'>- *</div><div class='del'>- * Return value: the number of messages in the folder, or -1 if unknown.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message_count (folder);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_unread_message_count(CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	int i, count, unread=0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-	for (i=0; i&lt;count; i++) {</div><div class='del'>-		CamelMessageInfo *info = camel_folder_summary_index(folder-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-		if (info) {</div><div class='del'>-			if (!(info-&gt;flags &amp; CAMEL_MESSAGE_SEEN))</div><div class='del'>-				unread++;</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return unread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_unread_get_message_count:</div><div class='del'>- * @folder: A CamelFolder object</div><div class='del'>- *</div><div class='del'>- * Return value: the number of unread messages in the folder, or -1 if unknown.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_get_unread_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);</div><div class='del'>-	</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_unread_message_count (folder);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-			      _("Unsupported operation: append message: for %s"),</div><div class='del'>-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	</div><div class='del'>-	w(g_warning ("CamelFolder::append_message not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-	</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_append_message: add a message to a folder</div><div class='del'>- * @folder: folder object to add the message to</div><div class='del'>- * @message: message object</div><div class='del'>- * @info: message info with additional flags/etc to set on</div><div class='del'>- * new message, or %NULL</div><div class='del'>- * @appended_uid: if non-%NULL, the UID of the appended message will</div><div class='del'>- * be returned here, if it is known.</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Add a message to a folder. Only the flag and tag data from @info</div><div class='del'>- * is used. If @info is %NULL, no flags or tags will be set.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-			     const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;append_message (folder, message, info, appended_uid, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-get_permanent_flags (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;permanent_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_permanent_flags:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- *</div><div class='del'>- * Return value: the set of CamelMessageFlags that can be permanently</div><div class='del'>- * stored on a message between sessions. If it includes %CAMEL_FLAG_USER,</div><div class='del'>- * then user-defined flags will be remembered.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_folder_get_permanent_flags (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_permanent_flags (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-get_message_flags(CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	guint32 flags;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, 0);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, 0);</div><div class='del'>-</div><div class='del'>-	flags = info-&gt;flags;</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message_flags:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- *</div><div class='del'>- * Return value: the CamelMessageFlags that are set on the indicated</div><div class='del'>- * message.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_folder_get_message_flags (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	guint32 ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message_flags (folder, uid);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	guint32 new;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	new = (info-&gt;flags &amp; ~flags) | (set &amp; flags);</div><div class='del'>-	if (new == info-&gt;flags) {</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info-&gt;flags = new | CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-	camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_flags:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @flags: a set of CamelMessageFlag values to set</div><div class='del'>- * @set: the mask of values in @flags to use.</div><div class='del'>- *</div><div class='del'>- * Sets those flags specified by @set to the values specified by @flags</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-				guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_flags (folder, uid, flags, set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_message_user_flag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	gboolean ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	ret = camel_flag_get(&amp;info-&gt;user_flags, name);</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message_user_flag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of a user flag</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the given user flag is set on the message.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				    const char *name)</div><div class='del'>-{</div><div class='del'>-	gboolean ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message_user_flag (folder, uid, name);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_flag_set(&amp;info-&gt;user_flags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_user_flag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of the user flag to set</div><div class='del'>- * @value: the value to set it to</div><div class='del'>- *</div><div class='del'>- * Sets the user flag specified by @name to the value specified by @value</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				    const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_user_flag (folder, uid, name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	const char *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-#warning "Need to duplicate tag string"</div><div class='del'>-</div><div class='del'>-	ret = camel_tag_get(&amp;info-&gt;user_tags, name);</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message_user_tag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of a user tag</div><div class='del'>- *</div><div class='del'>- * Return value: Returns the value of the user tag.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid,  const char *name)</div><div class='del'>-{</div><div class='del'>-	const char *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);</div><div class='del'>-</div><div class='del'>-#warning "get_message_user_tag() needs to copy the tag contents"</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message_user_tag (folder, uid, name);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_tag_set(&amp;info-&gt;user_tags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_user_tag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of the user tag to set</div><div class='del'>- * @value: the value to set it to</div><div class='del'>- *</div><div class='del'>- * Sets the user tag specified by @name to the value specified by @value</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_user_tag (CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_user_tag (folder, uid, name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message_info:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the uid of a message</div><div class='del'>- *</div><div class='del'>- * Retrieve the CamelMessageInfo for the specified @uid.  This return</div><div class='del'>- * must be freed using free_message_info().</div><div class='del'>- *</div><div class='del'>- * Return value: the summary information for the indicated message, or NULL</div><div class='del'>- * if the uid does not exist.</div><div class='del'>- **/</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_folder_get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message_info (folder, uid);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_message_info (CamelFolder *folder, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_message_info:</div><div class='del'>- * @folder: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Free (unref) a CamelMessageInfo, previously obtained with get_message_info().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_message_info(CamelFolder *folder, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;free_message_info(folder, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ref_message_info (CamelFolder *folder, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_ref(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_ref_message_info:</div><div class='del'>- * @folder: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Ref a CamelMessageInfo, previously obtained with get_message_info().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_ref_message_info(CamelFolder *folder, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;ref_message_info(folder, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: is this function required anyway? */</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_has_summary_capability (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);</div><div class='del'>-</div><div class='del'>-	return folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* UIDs stuff */</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelFolder::get_message not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message:</div><div class='del'>- * @folder: the folder object</div><div class='del'>- * @uid: the UID</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Get a message from its UID in the folder. Messages are cached</div><div class='del'>- * within a folder, that is, asking twice for the same UID returns the</div><div class='del'>- * same message object. (FIXME: is this true?)</div><div class='del'>- *</div><div class='del'>- * Return value: Message corresponding to the UID</div><div class='del'>- **/</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_message (folder, uid, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_uids(CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	array = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(folder-&gt;summary != NULL, array);</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-	g_ptr_array_set_size(array, count);</div><div class='del'>-	for (i=0; i&lt;count; i++) {</div><div class='del'>-		CamelMessageInfo *info = camel_folder_summary_index(folder-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-		if (info) {</div><div class='del'>-			array-&gt;pdata[i] = g_strdup(camel_message_info_uid(info));</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-		} else {</div><div class='del'>-			array-&gt;pdata[i] = g_strdup("xx unknown uid xx");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_uids:</div><div class='del'>- * @folder: folder object</div><div class='del'>- *</div><div class='del'>- * Get the list of UIDs available in a folder. This routine is useful</div><div class='del'>- * for finding what messages are available when the folder does not</div><div class='del'>- * support summaries. The returned array shoudl not be modified, and</div><div class='del'>- * must be freed by passing it to camel_folder_free_uids().</div><div class='del'>- *</div><div class='del'>- * Return value: GPtrArray of UIDs corresponding to the messages</div><div class='del'>- * available in the folder.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_uids (folder);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uids (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0; i&lt;array-&gt;len; i++)</div><div class='del'>-		g_free(array-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_uids:</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @array: the array of uids to free</div><div class='del'>- *</div><div class='del'>- * Frees the array of UIDs returned by camel_folder_get_uids().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_uids (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;free_uids (folder, array);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_summary(CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_assert(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_array(folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_summary:</div><div class='del'>- * @folder: a folder object</div><div class='del'>- *</div><div class='del'>- * This returns the summary information for the folder. This array</div><div class='del'>- * should not be modified, and must be freed with</div><div class='del'>- * camel_folder_free_summary().</div><div class='del'>- *</div><div class='del'>- * Return value: an array of CamelMessageInfo</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_get_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;get_summary (folder);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_summary(CamelFolder *folder, GPtrArray *summary)</div><div class='del'>-{</div><div class='del'>-	g_assert(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_array_free(folder-&gt;summary, summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_summary:</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @array: the summary array to free</div><div class='del'>- *</div><div class='del'>- * Frees the summary array returned by camel_folder_get_summary().</div><div class='del'>- **/</div><div class='del'>-void camel_folder_free_summary(CamelFolder * folder, GPtrArray * array)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(CAMEL_IS_FOLDER(folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS(folder)-&gt;free_summary(folder, array);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_has_search_capability:</div><div class='del'>- * @folder: Folder object</div><div class='del'>- *</div><div class='del'>- * Checks if a folder supports searching.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE if the folder supports searching</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_has_search_capability (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);</div><div class='del'>-</div><div class='del'>-	return folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SEARCH_CAPABILITY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-search_by_expression (CamelFolder *folder, const char *expression,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-			      _("Unsupported operation: search by expression: for %s"),</div><div class='del'>-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	</div><div class='del'>-	w(g_warning ("CamelFolder::search_by_expression not implemented for "</div><div class='del'>-		     "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_by_expression:</div><div class='del'>- * @folder: Folder object</div><div class='del'>- * @expression: a search expression</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Searches the folder for messages matching the given search expression.</div><div class='del'>- *</div><div class='del'>- * Return value: a list of uids of matching messages. The caller must</div><div class='del'>- * free the list and each of the elements when it is done.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_search_by_expression (CamelFolder *folder, const char *expression,</div><div class='del'>-				   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-	g_return_val_if_fail (folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SEARCH_CAPABILITY, NULL);</div><div class='del'>-</div><div class='del'>-	/* NOTE: that it is upto the callee to lock */</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS (folder)-&gt;search_by_expression (folder, expression, ex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-search_by_uids(CamelFolder *folder, const char *exp, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-			      _("Unsupported operation: search by uids: for %s"),</div><div class='del'>-			      camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	</div><div class='del'>-	w(g_warning ("CamelFolder::search_by_expression not implemented for "</div><div class='del'>-		     "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_by_uids:</div><div class='del'>- * @folder: </div><div class='del'>- * @expr: </div><div class='del'>- * @uids: array of uid's to match against.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Search a subset of uid's for an expression match.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_search_by_uids(CamelFolder *folder, const char *expr, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-	g_return_val_if_fail(folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SEARCH_CAPABILITY, NULL);</div><div class='del'>-</div><div class='del'>-	/* NOTE: that it is upto the callee to lock */</div><div class='del'>-</div><div class='del'>-	ret = CF_CLASS(folder)-&gt;search_by_uids(folder, expr, uids, ex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-search_free (CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; result-&gt;len; i++)</div><div class='del'>-		g_free (g_ptr_array_index (result, i));</div><div class='del'>-	g_ptr_array_free (result, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_free:</div><div class='del'>- * @folder: </div><div class='del'>- * @result: </div><div class='del'>- * </div><div class='del'>- * Free the result of a search.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_folder_search_free (CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	/* NOTE: upto the callee to lock */</div><div class='del'>-	CF_CLASS (folder)-&gt;search_free (folder, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transfer_message_to (CamelFolder *source, const char *uid, CamelFolder *dest,</div><div class='del'>-		     char **transferred_uid, gboolean delete_original,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelMessageInfo *info = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Default implementation. */</div><div class='del'>-	</div><div class='del'>-	/* we alredy have the lock, dont deadlock */</div><div class='del'>-	msg = CF_CLASS (source)-&gt;get_message (source, uid, ex);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (source-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY)</div><div class='del'>-		info = CF_CLASS (source)-&gt;get_message_info (source, uid);</div><div class='del'>-	else</div><div class='del'>-		info = camel_message_info_new_from_header (((CamelMimePart *)msg)-&gt;headers);</div><div class='del'>-	</div><div class='del'>-	/* we don't want to retain the deleted flag */</div><div class='del'>-	if (info &amp;&amp; info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)</div><div class='del'>-		info-&gt;flags = info-&gt;flags &amp; ~CAMEL_MESSAGE_DELETED;</div><div class='del'>-	</div><div class='del'>-	camel_folder_append_message (dest, msg, info, transferred_uid, ex);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-</div><div class='del'>-	if (delete_original &amp;&amp; !camel_exception_is_set (ex))</div><div class='del'>-		camel_folder_set_message_flags (source, uid, CAMEL_MESSAGE_DELETED|CAMEL_MESSAGE_SEEN, ~0);</div><div class='del'>-</div><div class='del'>-	if (info) {</div><div class='del'>-		if (source-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY)</div><div class='del'>-			CF_CLASS (source)-&gt;free_message_info (source, info);</div><div class='del'>-		else</div><div class='del'>-			camel_message_info_free (info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transfer_messages_to (CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelException local;</div><div class='del'>-	char **ret_uid = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (transferred_uids) {</div><div class='del'>-		*transferred_uids = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_set_size (*transferred_uids, uids-&gt;len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_init(&amp;local);</div><div class='del'>-	if (ex == NULL)</div><div class='del'>-		ex = &amp;local;</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, delete_originals ? _("Moving messages") : _("Copying messages"));</div><div class='del'>-</div><div class='del'>-	if (uids-&gt;len &gt; 1) {</div><div class='del'>-		camel_folder_freeze(dest);</div><div class='del'>-		if (delete_originals)</div><div class='del'>-			camel_folder_freeze(source);</div><div class='del'>-	}</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len &amp;&amp; !camel_exception_is_set (ex); i++) {</div><div class='del'>-		if (transferred_uids)</div><div class='del'>-			ret_uid = (char **)&amp;((*transferred_uids)-&gt;pdata[i]);</div><div class='del'>-		transfer_message_to (source, uids-&gt;pdata[i], dest, ret_uid, delete_originals, ex);</div><div class='del'>-		camel_operation_progress(NULL, i * 100 / uids-&gt;len);</div><div class='del'>-	}</div><div class='del'>-	if (uids-&gt;len &gt; 1) {</div><div class='del'>-		camel_folder_thaw(dest);</div><div class='del'>-		if (delete_originals)</div><div class='del'>-			camel_folder_thaw(source);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-	camel_exception_clear(&amp;local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_transfer_messages_to:</div><div class='del'>- * @source: source folder</div><div class='del'>- * @uids: message UIDs in @source</div><div class='del'>- * @dest: destination folder</div><div class='del'>- * @transferred_uids: if non-%NULL, the UIDs of the resulting messages</div><div class='del'>- * in @dest will be stored here, if known.</div><div class='del'>- * @delete_originals: whether or not to delete the original messages</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This copies or moves messages from one folder to another. If the</div><div class='del'>- * @source and @dest folders have the same parent_store, this may be</div><div class='del'>- * more efficient than using camel_folder_append_message().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				   CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-				   gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (source));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (dest));</div><div class='del'>-	g_return_if_fail (uids != NULL);</div><div class='del'>-	</div><div class='del'>-	if (source == dest || uids-&gt;len == 0) {</div><div class='del'>-		/* source and destination folders are the same, or no work to do, do nothing. */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_LOCK(source, lock);</div><div class='del'>-	</div><div class='del'>-	if (source-&gt;parent_store == dest-&gt;parent_store) {</div><div class='del'>-		/* If either folder is a vtrash, we need to use the</div><div class='del'>-		 * vtrash transfer method.</div><div class='del'>-		 */</div><div class='del'>-		if (CAMEL_IS_VTRASH_FOLDER (dest))</div><div class='del'>-			CF_CLASS (dest)-&gt;transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);</div><div class='del'>-		else</div><div class='del'>-			CF_CLASS (source)-&gt;transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);</div><div class='del'>-	} else</div><div class='del'>-		transfer_messages_to (source, uids, dest, transferred_uids, delete_originals, ex);</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(source, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	if (folder-&gt;summary)</div><div class='del'>-		camel_folder_summary_clear (folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_delete:</div><div class='del'>- * @folder: folder</div><div class='del'>- *</div><div class='del'>- * Marks a folder object as deleted and performs any required cleanup.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_delete (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_LOCK (folder, lock);</div><div class='del'>-	if (folder-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_BEEN_DELETED) {</div><div class='del'>-		CAMEL_FOLDER_UNLOCK (folder, lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	folder-&gt;folder_flags |= CAMEL_FOLDER_HAS_BEEN_DELETED;</div><div class='del'>-	</div><div class='del'>-	CF_CLASS (folder)-&gt;delete (folder);</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_UNLOCK (folder, lock);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "deleted", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_rename (CamelFolder *folder, const char *new)</div><div class='del'>-{</div><div class='del'>-	char *tmp;</div><div class='del'>-</div><div class='del'>-	printf("CamelFolder:rename('%s')\n", new);</div><div class='del'>-</div><div class='del'>-	g_free(folder-&gt;full_name);</div><div class='del'>-	folder-&gt;full_name = g_strdup(new);</div><div class='del'>-	g_free(folder-&gt;name);</div><div class='del'>-	tmp = strrchr(new, folder-&gt;parent_store-&gt;dir_sep);</div><div class='del'>-	folder-&gt;name = g_strdup(tmp?tmp+1:new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_rename:</div><div class='del'>- * @folder: </div><div class='del'>- * @new: </div><div class='del'>- * </div><div class='del'>- * Mark an active folder object as renamed.</div><div class='del'>- *</div><div class='del'>- * NOTE: This is an internal function used by camel stores, no locking</div><div class='del'>- * is performed on the folder.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_rename(CamelFolder *folder, const char *new)</div><div class='del'>-{</div><div class='del'>-	char *old;</div><div class='del'>-</div><div class='del'>-	old = g_strdup(folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;rename(folder, new);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "renamed", old);</div><div class='del'>-	g_free(old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-freeze (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, change_lock);</div><div class='del'>-</div><div class='del'>-	folder-&gt;priv-&gt;frozen++;</div><div class='del'>-</div><div class='del'>-	d(printf ("freeze(%p '%s') = %d\n", folder, folder-&gt;full_name, folder-&gt;priv-&gt;frozen));</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, change_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_freeze:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Freezes the folder so that a series of operation can be performed</div><div class='del'>- * without "message_changed" and "folder_changed" signals being emitted.</div><div class='del'>- * When the folder is later thawed with camel_folder_thaw(), the</div><div class='del'>- * suppressed signals will be emitted.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_freeze (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;freeze (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-thaw (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	CamelFolderChangeInfo *info = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_LOCK(folder, change_lock);</div><div class='del'>-</div><div class='del'>-	folder-&gt;priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	d(printf ("thaw(%p '%s') = %d\n", folder, folder-&gt;full_name, folder-&gt;priv-&gt;frozen));</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;priv-&gt;frozen == 0</div><div class='del'>-	    &amp;&amp; camel_folder_change_info_changed(folder-&gt;priv-&gt;changed_frozen)) {</div><div class='del'>-		info = folder-&gt;priv-&gt;changed_frozen;</div><div class='del'>-		folder-&gt;priv-&gt;changed_frozen = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_FOLDER_UNLOCK(folder, change_lock);</div><div class='del'>-</div><div class='del'>-	if (info) {</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", info);</div><div class='del'>-		camel_folder_change_info_free(info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_thaw:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Thaws the folder and emits any pending folder_changed or</div><div class='del'>- * message_changed signals.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_thaw (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail (folder-&gt;priv-&gt;frozen != 0);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;thaw (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_frozen (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;priv-&gt;frozen != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_is_frozen:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the folder is frozen.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_is_frozen (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;is_frozen (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-struct _folder_filter_msg {</div><div class='del'>-	CamelSessionThreadMsg msg;</div><div class='del'>-</div><div class='del'>-	GPtrArray *recents;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFilterDriver *driver;</div><div class='del'>-	CamelException ex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_filter(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_filter_msg *m = (struct _folder_filter_msg *)msg;</div><div class='del'>-	</div><div class='del'>-	camel_filter_driver_filter_folder(m-&gt;driver, m-&gt;folder, NULL, m-&gt;recents, FALSE, &amp;m-&gt;ex);</div><div class='del'>-	camel_filter_driver_flush (m-&gt;driver, &amp;m-&gt;ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_free(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_filter_msg *m = (struct _folder_filter_msg *)msg;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_folder_thaw(m-&gt;folder);</div><div class='del'>-	camel_object_unref((CamelObject *)m-&gt;folder);</div><div class='del'>-	camel_object_unref((CamelObject *)m-&gt;driver);</div><div class='del'>-	for (i=0;i&lt;m-&gt;recents-&gt;len;i++)</div><div class='del'>-		g_free(m-&gt;recents-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(m-&gt;recents, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelSessionThreadOps filter_ops = {</div><div class='del'>-	filter_filter,</div><div class='del'>-	filter_free,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Event hooks that block emission when frozen */</div><div class='del'>-static gboolean</div><div class='del'>-folder_changed (CamelObject *obj, gpointer event_data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (obj);</div><div class='del'>-	CamelFolderChangeInfo *changed = event_data;</div><div class='del'>-	gboolean ret = TRUE;</div><div class='del'>-</div><div class='del'>-	d(printf ("folder_changed(%p, %p), frozen=%d\n", obj, event_data, folder-&gt;priv-&gt;frozen));</div><div class='del'>-	d(printf(" added %d remoded %d changed %d recent %d\n",</div><div class='del'>-		 changed-&gt;uid_added-&gt;len, changed-&gt;uid_removed-&gt;len,</div><div class='del'>-		 changed-&gt;uid_changed-&gt;len, changed-&gt;uid_recent-&gt;len));</div><div class='del'>-</div><div class='del'>-	if (changed != NULL) {</div><div class='del'>-		CamelSession *session = ((CamelService *)folder-&gt;parent_store)-&gt;session;</div><div class='del'>-		CamelFilterDriver *driver;</div><div class='del'>-</div><div class='del'>-		CAMEL_FOLDER_LOCK(folder, change_lock);</div><div class='del'>-		if ((folder-&gt;folder_flags &amp; CAMEL_FOLDER_FILTER_RECENT)</div><div class='del'>-		    &amp;&amp; changed-&gt;uid_recent-&gt;len&gt;0</div><div class='del'>-		    &amp;&amp; (driver = camel_session_get_filter_driver(session, "incoming", NULL))) {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-			GPtrArray *recents = g_ptr_array_new();</div><div class='del'>-			int i;</div><div class='del'>-			struct _folder_filter_msg *msg;</div><div class='del'>-			</div><div class='del'>-			d(printf("** Have '%d' recent messages, launching thread to process them\n", changed-&gt;uid_recent-&gt;len));</div><div class='del'>-			</div><div class='del'>-			folder-&gt;priv-&gt;frozen++;</div><div class='del'>-			msg = camel_session_thread_msg_new(session, &amp;filter_ops, sizeof(*msg));</div><div class='del'>-			for (i=0;i&lt;changed-&gt;uid_recent-&gt;len;i++)</div><div class='del'>-				g_ptr_array_add(recents, g_strdup(changed-&gt;uid_recent-&gt;pdata[i]));</div><div class='del'>-			msg-&gt;recents = recents;</div><div class='del'>-			msg-&gt;folder = folder;</div><div class='del'>-			camel_object_ref((CamelObject *)folder);</div><div class='del'>-			msg-&gt;driver = driver;</div><div class='del'>-			camel_exception_init(&amp;msg-&gt;ex);</div><div class='del'>-			camel_session_thread_queue(session, &amp;msg-&gt;msg, 0);</div><div class='del'>-#else</div><div class='del'>-			d(printf("Have '%d' recent messages, filtering\n", changed-&gt;recent-&gt;len));</div><div class='del'>-			folder-&gt;priv-&gt;frozen++;</div><div class='del'>-			camel_filter_driver_filter_folder(driver, folder, NULL, changed-&gt;recent, FALSE, NULL);</div><div class='del'>-			camel_object_unref((CamelObject *)driver);</div><div class='del'>-			folder-&gt;priv-&gt;frozen--;</div><div class='del'>-#endif</div><div class='del'>-			/* zero out the recent list so we dont reprocess */</div><div class='del'>-			/* this pokes past abstraction, but changeinfo is our structure anyway */</div><div class='del'>-			/* the only other alternative is to recognise when trigger is called from	</div><div class='del'>-			   thaw(), but thats a pita */</div><div class='del'>-			g_ptr_array_set_size(changed-&gt;uid_recent, 0);</div><div class='del'>-		}</div><div class='del'>-		if (folder-&gt;priv-&gt;frozen) {</div><div class='del'>-			camel_folder_change_info_cat(folder-&gt;priv-&gt;changed_frozen, changed);</div><div class='del'>-			ret = FALSE;</div><div class='del'>-		}</div><div class='del'>-		CAMEL_FOLDER_UNLOCK(folder, change_lock);</div><div class='del'>-	} else {</div><div class='del'>-			w(g_warning ("Class %s is passing NULL to folder_changed event",</div><div class='del'>-				     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-message_changed (CamelObject *obj, /*const char *uid*/gpointer event_data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (obj);</div><div class='del'>-	gboolean ret = TRUE;</div><div class='del'>-</div><div class='del'>-	d(printf ("message_changed(%p, %p), frozen=%d\n", folder, event_data, folder-&gt;priv-&gt;frozen));</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;priv-&gt;frozen) {</div><div class='del'>-		CAMEL_FOLDER_LOCK(folder, change_lock);</div><div class='del'>-	</div><div class='del'>-		camel_folder_change_info_change_uid(folder-&gt;priv-&gt;changed_frozen, (char *)event_data);</div><div class='del'>-		ret = FALSE;</div><div class='del'>-</div><div class='del'>-		CAMEL_FOLDER_UNLOCK(folder, change_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_nop:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids or CamelMessageInfo</div><div class='del'>- *</div><div class='del'>- * "Frees" the provided array by doing nothing. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids, or free_summary when</div><div class='del'>- * the returned array is "static" information and should not be freed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_nop (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_shallow:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids or CamelMessageInfo</div><div class='del'>- *</div><div class='del'>- * Frees the provided array but not its contents. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids or free_summary when</div><div class='del'>- * the returned array needs to be freed but its contents come from</div><div class='del'>- * "static" information.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_free (array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_deep:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids</div><div class='del'>- *</div><div class='del'>- * Frees the provided array and its contents. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids when the provided</div><div class='del'>- * information was created explicitly by the corresponding get_ call.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; array-&gt;len; i++)</div><div class='del'>-		g_free (array-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _CamelFolderChangeInfoPrivate {</div><div class='del'>-	GHashTable *uid_stored;	/* what we have stored, which array they're in */</div><div class='del'>-	GHashTable *uid_source;	/* used to create unique lists */</div><div class='del'>-	struct _EMemPool *uid_pool;	/* pool used to store copies of uid strings */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_new:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Create a new folder change info structure.</div><div class='del'>- *</div><div class='del'>- * Change info structures are not MT-SAFE and must be</div><div class='del'>- * locked for exclusive access externally.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelFolderChangeInfo *</div><div class='del'>-camel_folder_change_info_new(void)</div><div class='del'>-{</div><div class='del'>-	CamelFolderChangeInfo *info;</div><div class='del'>-</div><div class='del'>-	info = g_malloc(sizeof(*info));</div><div class='del'>-	info-&gt;uid_added = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_removed = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_changed = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_recent = g_ptr_array_new();</div><div class='del'>-	info-&gt;priv = g_malloc0(sizeof(*info-&gt;priv));</div><div class='del'>-	info-&gt;priv-&gt;uid_stored = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	info-&gt;priv-&gt;uid_source = NULL;</div><div class='del'>-	info-&gt;priv-&gt;uid_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_source:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a source uid for generating a changeset.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_source(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;uid_source == NULL)</div><div class='del'>-		p-&gt;uid_source = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup(p-&gt;uid_source, uid) == NULL)</div><div class='del'>-		g_hash_table_insert(p-&gt;uid_source, e_mempool_strdup(p-&gt;uid_pool, uid), (void *)1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_source_list:</div><div class='del'>- * @info: </div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Add a list of source uid's for generating a changeset.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	g_assert(list != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;uid_source == NULL)</div><div class='del'>-		p-&gt;uid_source = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;list-&gt;len;i++) {</div><div class='del'>-		char *uid = list-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		if (g_hash_table_lookup(p-&gt;uid_source, uid) == NULL)</div><div class='del'>-			g_hash_table_insert(p-&gt;uid_source, e_mempool_strdup(p-&gt;uid_pool, uid), (void *)1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_update:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid from the updated list, used to generate a changeset diff.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_update(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	char *key;</div><div class='del'>-	int value;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;uid_source == NULL) {</div><div class='del'>-		camel_folder_change_info_add_uid(info, uid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended(p-&gt;uid_source, uid, (void **)&amp;key, (void **)&amp;value)) {</div><div class='del'>-		g_hash_table_remove(p-&gt;uid_source, key);</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_change_info_add_uid(info, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_update_list:</div><div class='del'>- * @info: </div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Add a list of uid's from the updated list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	g_assert(list != NULL);</div><div class='del'>-	</div><div class='del'>-	for (i=0;i&lt;list-&gt;len;i++)</div><div class='del'>-		camel_folder_change_info_add_update(info, list-&gt;pdata[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_remove(char *key, void *value, CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p = info-&gt;priv;</div><div class='del'>-	GPtrArray *olduids;</div><div class='del'>-	char *olduid;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended(p-&gt;uid_stored, key, (void **)&amp;olduid, (void **)&amp;olduids)) {</div><div class='del'>-		/* if it was added/changed them removed, then remove it */</div><div class='del'>-		if (olduids != info-&gt;uid_removed) {</div><div class='del'>-			g_ptr_array_remove_fast(olduids, olduid);</div><div class='del'>-			g_ptr_array_add(info-&gt;uid_removed, olduid);</div><div class='del'>-			g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_removed);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we dont need to copy this, as they've already been copied into our pool */</div><div class='del'>-	g_ptr_array_add(info-&gt;uid_removed, key);</div><div class='del'>-	g_hash_table_insert(p-&gt;uid_stored, key, info-&gt;uid_removed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_build_diff:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Compare the source uid set to the updated uid set and generate the differences</div><div class='del'>- * into the added and removed lists.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_build_diff(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;uid_source) {</div><div class='del'>-		g_hash_table_foreach(p-&gt;uid_source, (GHFunc)change_info_remove, info);</div><div class='del'>-		g_hash_table_destroy(p-&gt;uid_source);</div><div class='del'>-		p-&gt;uid_source = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_cat(CamelFolderChangeInfo *info, GPtrArray *source, void (*add)(CamelFolderChangeInfo *info, const char *uid))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;source-&gt;len;i++)</div><div class='del'>-		add(info, source-&gt;pdata[i]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_cat:</div><div class='del'>- * @info: </div><div class='del'>- * @source: </div><div class='del'>- * </div><div class='del'>- * Concatenate one change info onto antoher.  Can be used to copy</div><div class='del'>- * them too.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_cat(CamelFolderChangeInfo *info, CamelFolderChangeInfo *source)</div><div class='del'>-{</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	g_assert(source != NULL);</div><div class='del'>-	</div><div class='del'>-	change_info_cat(info, source-&gt;uid_added, camel_folder_change_info_add_uid);</div><div class='del'>-	change_info_cat(info, source-&gt;uid_removed, camel_folder_change_info_remove_uid);</div><div class='del'>-	change_info_cat(info, source-&gt;uid_changed, camel_folder_change_info_change_uid);</div><div class='del'>-	change_info_cat(info, source-&gt;uid_recent, camel_folder_change_info_recent_uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a new uid to the changeinfo.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	GPtrArray *olduids;</div><div class='del'>-	char *olduid;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended(p-&gt;uid_stored, uid, (void **)&amp;olduid, (void **)&amp;olduids)) {</div><div class='del'>-		/* if it was removed then added, promote it to a changed */</div><div class='del'>-		/* if it was changed then added, leave as changed */</div><div class='del'>-		if (olduids == info-&gt;uid_removed) {</div><div class='del'>-			g_ptr_array_remove_fast(olduids, olduid);</div><div class='del'>-			g_ptr_array_add(info-&gt;uid_changed, olduid);</div><div class='del'>-			g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_changed);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	olduid = e_mempool_strdup(p-&gt;uid_pool, uid);</div><div class='del'>-	g_ptr_array_add(info-&gt;uid_added, olduid);</div><div class='del'>-	g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_added);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_remove_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid to the removed uid list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_remove_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	GPtrArray *olduids;</div><div class='del'>-	char *olduid;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended(p-&gt;uid_stored, uid, (void **)&amp;olduid, (void **)&amp;olduids)) {</div><div class='del'>-		/* if it was added/changed them removed, then remove it */</div><div class='del'>-		if (olduids != info-&gt;uid_removed) {</div><div class='del'>-			g_ptr_array_remove_fast(olduids, olduid);</div><div class='del'>-			g_ptr_array_add(info-&gt;uid_removed, olduid);</div><div class='del'>-			g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_removed);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	olduid = e_mempool_strdup(p-&gt;uid_pool, uid);</div><div class='del'>-	g_ptr_array_add(info-&gt;uid_removed, olduid);</div><div class='del'>-	g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_removed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_change_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid to the changed uid list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_change_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	GPtrArray *olduids;</div><div class='del'>-	char *olduid;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended(p-&gt;uid_stored, uid, (void **)&amp;olduid, (void **)&amp;olduids)) {</div><div class='del'>-		/* if we have it already, leave it as that */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	olduid = e_mempool_strdup(p-&gt;uid_pool, uid);</div><div class='del'>-	g_ptr_array_add(info-&gt;uid_changed, olduid);</div><div class='del'>-	g_hash_table_insert(p-&gt;uid_stored, olduid, info-&gt;uid_changed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_recent_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	GPtrArray *olduids;</div><div class='del'>-	char *olduid;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* always add to recent, but dont let anyone else know */	</div><div class='del'>-	if (!g_hash_table_lookup_extended(p-&gt;uid_stored, uid, (void **)&amp;olduid, (void **)&amp;olduids)) {</div><div class='del'>-		olduid = e_mempool_strdup(p-&gt;uid_pool, uid);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_add(info-&gt;uid_recent, olduid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_changed:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Return true if the changeset contains any changes.</div><div class='del'>- *</div><div class='del'>- * Return Value:</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_change_info_changed(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	return (info-&gt;uid_added-&gt;len || info-&gt;uid_removed-&gt;len || info-&gt;uid_changed-&gt;len || info-&gt;uid_recent-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_clear:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Empty out the change info; called after changes have been processed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_clear(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-	</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_set_size(info-&gt;uid_added, 0);</div><div class='del'>-	g_ptr_array_set_size(info-&gt;uid_removed, 0);</div><div class='del'>-	g_ptr_array_set_size(info-&gt;uid_changed, 0);</div><div class='del'>-	g_ptr_array_set_size(info-&gt;uid_recent, 0);</div><div class='del'>-	if (p-&gt;uid_source) {</div><div class='del'>-		g_hash_table_destroy(p-&gt;uid_source);</div><div class='del'>-		p-&gt;uid_source = NULL;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(p-&gt;uid_stored);</div><div class='del'>-	p-&gt;uid_stored = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	e_mempool_flush(p-&gt;uid_pool, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_free:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Free memory associated with the folder change info lists.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_free(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *p;</div><div class='del'>-</div><div class='del'>-	g_assert(info != NULL);</div><div class='del'>-	</div><div class='del'>-	p = info-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;uid_source)</div><div class='del'>-		g_hash_table_destroy(p-&gt;uid_source);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(p-&gt;uid_stored);</div><div class='del'>-	e_mempool_destroy(p-&gt;uid_pool);</div><div class='del'>-	g_free(p);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_added, TRUE);</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_removed, TRUE);</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_changed, TRUE);</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_recent, TRUE);</div><div class='del'>-	g_free(info);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-folder.h b/camel/camel-folder.h<br/>deleted file mode 100644<br/>index e437b1d87a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,315 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * camel-folder.h: Abstract class for an email folder</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_FOLDER_H</div><div class='del'>-#define CAMEL_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())</div><div class='del'>-#define CAMEL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))</div><div class='del'>-#define CAMEL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))</div><div class='del'>-#define CAMEL_IS_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderChangeInfo CamelFolderChangeInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelFolderChangeInfo {</div><div class='del'>-	GPtrArray *uid_added;</div><div class='del'>-	GPtrArray *uid_removed;</div><div class='del'>-	GPtrArray *uid_changed;</div><div class='del'>-	GPtrArray *uid_recent;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderChangeInfoPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolder</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *name;</div><div class='del'>-	char *full_name;</div><div class='del'>-	CamelStore *parent_store;</div><div class='del'>-	CamelFolderSummary *summary;</div><div class='del'>-</div><div class='del'>-	guint32 folder_flags;</div><div class='del'>-	guint32 permanent_flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_FOLDER_HAS_SEARCH_CAPABILITY  (1&lt;&lt;1)</div><div class='del'>-#define CAMEL_FOLDER_FILTER_RECENT          (1&lt;&lt;2)</div><div class='del'>-#define CAMEL_FOLDER_HAS_BEEN_DELETED       (1&lt;&lt;3)</div><div class='del'>-#define CAMEL_FOLDER_IS_TRASH               (1&lt;&lt;4)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	void   (*refresh_info) (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void   (*sync) (CamelFolder *folder, gboolean expunge, </div><div class='del'>-			CamelException *ex);</div><div class='del'>-</div><div class='del'>-	const char *  (*get_name)  (CamelFolder *folder);</div><div class='del'>-	const char *  (*get_full_name)   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	CamelStore *  (*get_parent_store) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	void (*expunge)  (CamelFolder *folder, </div><div class='del'>-			  CamelException *ex);</div><div class='del'>-</div><div class='del'>-	int   (*get_message_count)   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	int   (*get_unread_message_count) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	void (*append_message)  (CamelFolder *folder, </div><div class='del'>-				 CamelMimeMessage *message,</div><div class='del'>-				 const CamelMessageInfo *info,</div><div class='del'>-				 char **appended_uid,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	guint32 (*get_permanent_flags) (CamelFolder *folder);</div><div class='del'>-	guint32 (*get_message_flags)   (CamelFolder *folder,</div><div class='del'>-					const char *uid);</div><div class='del'>-	void    (*set_message_flags)   (CamelFolder *folder,</div><div class='del'>-					const char *uid,</div><div class='del'>-					guint32 flags, guint32 set);</div><div class='del'>-</div><div class='del'>-	gboolean (*get_message_user_flag) (CamelFolder *folder,</div><div class='del'>-					   const char *uid,</div><div class='del'>-					   const char *name);</div><div class='del'>-	void     (*set_message_user_flag) (CamelFolder *folder,</div><div class='del'>-					   const char *uid,</div><div class='del'>-					   const char *name,</div><div class='del'>-					   gboolean value);</div><div class='del'>-</div><div class='del'>-	const char * (*get_message_user_tag) (CamelFolder *folder,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *name);</div><div class='del'>-	void     (*set_message_user_tag) (CamelFolder *folder,</div><div class='del'>-					  const char *uid,</div><div class='del'>-					  const char *name,</div><div class='del'>-					  const char *value);</div><div class='del'>-</div><div class='del'>-	CamelMimeMessage * (*get_message)  (CamelFolder *folder, </div><div class='del'>-					    const char *uid, </div><div class='del'>-					    CamelException *ex);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_uids)       (CamelFolder *folder);</div><div class='del'>-	void (*free_uids)             (CamelFolder *folder,</div><div class='del'>-				       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_summary)    (CamelFolder *folder);</div><div class='del'>-	void (*free_summary)          (CamelFolder *folder,</div><div class='del'>-				       GPtrArray *summary);</div><div class='del'>-</div><div class='del'>-	gboolean (*has_search_capability) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*search_by_expression) (CamelFolder *, const char *, CamelException *);</div><div class='del'>-	GPtrArray * (*search_by_uids) (CamelFolder *, const char *, GPtrArray *uids, CamelException *);</div><div class='del'>-</div><div class='del'>-	void (*search_free) (CamelFolder *folder, GPtrArray *result);</div><div class='del'>-</div><div class='del'>-	CamelMessageInfo * (*get_message_info) (CamelFolder *, const char *uid);</div><div class='del'>-	void (*ref_message_info) (CamelFolder *, CamelMessageInfo *);</div><div class='del'>-	void (*free_message_info) (CamelFolder *, CamelMessageInfo *);</div><div class='del'>-</div><div class='del'>-	void (*transfer_messages_to) (CamelFolder *source,</div><div class='del'>-				      GPtrArray *uids,</div><div class='del'>-				      CamelFolder *destination,</div><div class='del'>-				      GPtrArray **transferred_uids,</div><div class='del'>-				      gboolean delete_originals,</div><div class='del'>-				      CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	void (*delete)           (CamelFolder *folder);</div><div class='del'>-	void (*rename)           (CamelFolder *folder, const char *newname);</div><div class='del'>-	</div><div class='del'>-	void     (*freeze)    (CamelFolder *folder);</div><div class='del'>-	void     (*thaw)      (CamelFolder *folder);</div><div class='del'>-	gboolean (*is_frozen) (CamelFolder *folder);</div><div class='del'>-} CamelFolderClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void               camel_folder_construct              (CamelFolder *folder,</div><div class='del'>-							CamelStore *parent_store,</div><div class='del'>-							const char *full_name,</div><div class='del'>-							const char *name);</div><div class='del'>-</div><div class='del'>-void               camel_folder_refresh_info           (CamelFolder * folder, </div><div class='del'>-							CamelException * ex);</div><div class='del'>-void               camel_folder_sync                   (CamelFolder *folder, </div><div class='del'>-							gboolean expunge, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* delete operations */</div><div class='del'>-void		   camel_folder_expunge                (CamelFolder *folder, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* folder name operations */</div><div class='del'>-const char *      camel_folder_get_name                (CamelFolder *folder);</div><div class='del'>-const char *      camel_folder_get_full_name           (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* various properties accessors */</div><div class='del'>-guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-guint32		   camel_folder_get_message_flags      (CamelFolder *folder,</div><div class='del'>-							const char *uid);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_flags      (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							guint32 flags,</div><div class='del'>-							guint32 set);</div><div class='del'>-</div><div class='del'>-gboolean	   camel_folder_get_message_user_flag  (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							const char *name);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_user_flag  (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							const char *name,</div><div class='del'>-							gboolean value);</div><div class='del'>-const char *	   camel_folder_get_message_user_tag  (CamelFolder *folder,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       const char *name);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_user_tag  (CamelFolder *folder,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       const char *name,</div><div class='del'>-						       const char *value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* message manipulation */</div><div class='del'>-void               camel_folder_append_message         (CamelFolder *folder, </div><div class='del'>-							CamelMimeMessage *message,</div><div class='del'>-							const CamelMessageInfo *info,</div><div class='del'>-							char **appended_uid,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* summary related operations */</div><div class='del'>-gboolean           camel_folder_has_summary_capability (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int                camel_folder_get_message_count     (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-int                camel_folder_get_unread_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-GPtrArray *        camel_folder_get_summary           (CamelFolder *folder);</div><div class='del'>-void               camel_folder_free_summary          (CamelFolder *folder,</div><div class='del'>-						       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* uid based access operations */</div><div class='del'>-CamelMimeMessage * camel_folder_get_message           (CamelFolder *folder, </div><div class='del'>-						       const char *uid, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-#define camel_folder_delete_message(folder, uid) \</div><div class='del'>-	camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED)</div><div class='del'>-</div><div class='del'>-GPtrArray *        camel_folder_get_uids              (CamelFolder *folder);</div><div class='del'>-void               camel_folder_free_uids             (CamelFolder *folder,</div><div class='del'>-						       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* search api */</div><div class='del'>-gboolean           camel_folder_has_search_capability (CamelFolder *folder);</div><div class='del'>-GPtrArray *	   camel_folder_search_by_expression  (CamelFolder *folder, const char *expr, CamelException *ex);</div><div class='del'>-GPtrArray *	   camel_folder_search_by_uids	      (CamelFolder *folder, const char *expr, GPtrArray *uids, CamelException *ex);</div><div class='del'>-void		   camel_folder_search_free	      (CamelFolder *folder, GPtrArray *);</div><div class='del'>-</div><div class='del'>-/* summary info */</div><div class='del'>-CamelMessageInfo *camel_folder_get_message_info		(CamelFolder *folder, const char *uid);</div><div class='del'>-void		  camel_folder_free_message_info	(CamelFolder *folder, CamelMessageInfo *info);</div><div class='del'>-void		  camel_folder_ref_message_info		(CamelFolder *folder, CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-void               camel_folder_transfer_messages_to   (CamelFolder *source,</div><div class='del'>-							GPtrArray *uids,</div><div class='del'>-							CamelFolder *dest,</div><div class='del'>-							GPtrArray **transferred_uids,</div><div class='del'>-							gboolean delete_originals,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-void               camel_folder_delete                 (CamelFolder *folder);</div><div class='del'>-void               camel_folder_rename                 (CamelFolder *folder, const char *new);</div><div class='del'>-</div><div class='del'>-/* stop/restart getting events */</div><div class='del'>-void               camel_folder_freeze                (CamelFolder *folder);</div><div class='del'>-void               camel_folder_thaw                  (CamelFolder *folder);</div><div class='del'>-gboolean           camel_folder_is_frozen             (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* lock/unlock at the thread level, NOTE: only used internally */</div><div class='del'>-void		   camel_folder_lock		      (CamelFolder *folder);</div><div class='del'>-void		   camel_folder_unlock		      (CamelFolder *folder);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* For use by subclasses (for free_{uids,summary,subfolder_names}) */</div><div class='del'>-void camel_folder_free_nop     (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-void camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-void camel_folder_free_deep    (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* update functions for change info */</div><div class='del'>-CamelFolderChangeInfo *	camel_folder_change_info_new		(void);</div><div class='del'>-void			camel_folder_change_info_clear		(CamelFolderChangeInfo *info);</div><div class='del'>-void			camel_folder_change_info_free		(CamelFolderChangeInfo *info);</div><div class='del'>-gboolean		camel_folder_change_info_changed	(CamelFolderChangeInfo *info);</div><div class='del'>-</div><div class='del'>-/* for building diff's automatically */</div><div class='del'>-void			camel_folder_change_info_add_source	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list);</div><div class='del'>-void			camel_folder_change_info_add_update	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list);</div><div class='del'>-void			camel_folder_change_info_build_diff	(CamelFolderChangeInfo *info);</div><div class='del'>-</div><div class='del'>-/* for manipulating diff's directly */</div><div class='del'>-void			camel_folder_change_info_cat		(CamelFolderChangeInfo *info, CamelFolderChangeInfo *s);</div><div class='del'>-void			camel_folder_change_info_add_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_remove_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_change_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_recent_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_FOLDER_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c<br/>deleted file mode 100644<br/>index 2a59a136d4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-html-parser.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-html-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,807 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/** WARNING</div><div class='del'>- **</div><div class='del'>- ** DO NOT USE THIS CODE OUTSIDE OF CAMEL</div><div class='del'>- **</div><div class='del'>- ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-#include "camel-html-parser.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-/* if defined, must also compile in dump_tag() below somewhere */</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void camel_html_parser_class_init (CamelHTMLParserClass *klass);</div><div class='del'>-static void camel_html_parser_init       (CamelObject *o);</div><div class='del'>-static void camel_html_parser_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_html_parser_parent;</div><div class='del'>-</div><div class='del'>-/* Parser definitions, see below object code for details */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelHTMLParserPrivate CamelHTMLParserPrivate;</div><div class='del'>-</div><div class='del'>-struct _CamelHTMLParserPrivate {</div><div class='del'>-	char *inbuf,</div><div class='del'>-		*inptr,</div><div class='del'>-		*inend,</div><div class='del'>-		*start;</div><div class='del'>-	enum _camel_html_parser_t state;</div><div class='del'>-	char *charset;</div><div class='del'>-	int eof;</div><div class='del'>-	GString *tag;</div><div class='del'>-	GString *ent;</div><div class='del'>-	char ent_utf8[8];</div><div class='del'>-	int attr;</div><div class='del'>-	GPtrArray *attrs;</div><div class='del'>-	GPtrArray *values;</div><div class='del'>-	int quote;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void tokenise_setup(void);</div><div class='del'>-static CamelHTMLParserPrivate *tokenise_init(void);</div><div class='del'>-static void tokenise_free(CamelHTMLParserPrivate *p);</div><div class='del'>-static int tokenise_step(CamelHTMLParserPrivate *p, char **datap, int *lenp);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_html_parser_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelHTMLParser",</div><div class='del'>-					    sizeof (CamelHTMLParser),</div><div class='del'>-					    sizeof (CamelHTMLParserClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_html_parser_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_html_parser_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_html_parser_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_html_parser_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParser *f = (CamelHTMLParser *)o;</div><div class='del'>-</div><div class='del'>-	tokenise_free(f-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_html_parser_init       (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParser *f = (CamelHTMLParser *)o;</div><div class='del'>-</div><div class='del'>-	f-&gt;priv = tokenise_init();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_html_parser_class_init (CamelHTMLParserClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_html_parser_parent = CAMEL_OBJECT_CLASS (camel_type_get_global_classfuncs (camel_object_get_type ()));</div><div class='del'>-</div><div class='del'>-	tokenise_setup();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_html_parser_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelHTMLParser object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelHTMLParser widget.</div><div class='del'>- **/</div><div class='del'>-CamelHTMLParser *</div><div class='del'>-camel_html_parser_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParser *new = CAMEL_HTML_PARSER ( camel_object_new (camel_html_parser_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void camel_html_parser_set_data(CamelHTMLParser *hp, const char *start, int len, int last)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParserPrivate *p = hp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	p-&gt;inptr = p-&gt;inbuf = (char *)start;</div><div class='del'>-	p-&gt;inend = (char *)start+len;</div><div class='del'>-	p-&gt;eof = last;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-camel_html_parser_t camel_html_parser_step(CamelHTMLParser *hp, const char **datap, int *lenp)</div><div class='del'>-{</div><div class='del'>-	return tokenise_step(hp-&gt;priv, (char **)datap, lenp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *camel_html_parser_left(CamelHTMLParser *hp, int *lenp)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParserPrivate *p = hp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (lenp)</div><div class='del'>-		*lenp = p-&gt;inend - p-&gt;inptr;</div><div class='del'>-</div><div class='del'>-	return p-&gt;inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *camel_html_parser_tag(CamelHTMLParser *hp)</div><div class='del'>-{</div><div class='del'>-	return hp-&gt;priv-&gt;tag-&gt;str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelHTMLParserPrivate *p = hp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;p-&gt;attrs-&gt;len;i++) {</div><div class='del'>-		if (!strcasecmp(((GString *)p-&gt;attrs-&gt;pdata[i])-&gt;str, name)) {</div><div class='del'>-			return ((GString *)p-&gt;values-&gt;pdata[i])-&gt;str;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values)</div><div class='del'>-{</div><div class='del'>-	if (values)</div><div class='del'>-		*values = hp-&gt;priv-&gt;values;</div><div class='del'>-</div><div class='del'>-	return hp-&gt;priv-&gt;attrs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this map taken out of libxml */</div><div class='del'>-static struct {</div><div class='del'>-	unsigned int val;</div><div class='del'>-	const char *name;</div><div class='del'>-} entity_map[] = {</div><div class='del'>-/*</div><div class='del'>- * the 4 absolute ones,</div><div class='del'>- */</div><div class='del'>-	{ 34,	"quot",	/* quotation mark = APL quote, U+0022 ISOnum */ },</div><div class='del'>-	{ 38,	"amp",	/* ampersand, U+0026 ISOnum */ },</div><div class='del'>-	{ 60,	"lt",	/* less-than sign, U+003C ISOnum */ },</div><div class='del'>-	{ 62,	"gt",	/* greater-than sign, U+003E ISOnum */ },</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * A bunch still in the 128-255 range</div><div class='del'>- * Replacing them depend really on the charset used.</div><div class='del'>- */</div><div class='del'>-	{ 39,	"apos",	/* single quote */ },</div><div class='del'>-	{ 160,	"nbsp",	/* no-break space = non-breaking space, U+00A0 ISOnum */ },</div><div class='del'>-	{ 161,	"iexcl",/* inverted exclamation mark, U+00A1 ISOnum */ },</div><div class='del'>-	{ 162,	"cent",	/* cent sign, U+00A2 ISOnum */ },</div><div class='del'>-	{ 163,	"pound",/* pound sign, U+00A3 ISOnum */ },</div><div class='del'>-	{ 164,	"curren",/* currency sign, U+00A4 ISOnum */ },</div><div class='del'>-	{ 165,	"yen",	/* yen sign = yuan sign, U+00A5 ISOnum */ },</div><div class='del'>-	{ 166,	"brvbar",/* broken bar = broken vertical bar, U+00A6 ISOnum */ },</div><div class='del'>-	{ 167,	"sect",	/* section sign, U+00A7 ISOnum */ },</div><div class='del'>-	{ 168,	"uml",	/* diaeresis = spacing diaeresis, U+00A8 ISOdia */ },</div><div class='del'>-	{ 169,	"copy",	/* copyright sign, U+00A9 ISOnum */ },</div><div class='del'>-	{ 170,	"ordf",	/* feminine ordinal indicator, U+00AA ISOnum */ },</div><div class='del'>-	{ 171,	"laquo",/* left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum */ },</div><div class='del'>-	{ 172,	"not",	/* not sign, U+00AC ISOnum */ },</div><div class='del'>-	{ 173,	"shy",	/* soft hyphen = discretionary hyphen, U+00AD ISOnum */ },</div><div class='del'>-	{ 174,	"reg",	/* registered sign = registered trade mark sign, U+00AE ISOnum */ },</div><div class='del'>-	{ 175,	"macr",	/* macron = spacing macron = overline = APL overbar, U+00AF ISOdia */ },</div><div class='del'>-	{ 176,	"deg",	/* degree sign, U+00B0 ISOnum */ },</div><div class='del'>-	{ 177,	"plusmn",/* plus-minus sign = plus-or-minus sign, U+00B1 ISOnum */ },</div><div class='del'>-	{ 178,	"sup2",	/* superscript two = superscript digit two = squared, U+00B2 ISOnum */ },</div><div class='del'>-	{ 179,	"sup3",	/* superscript three = superscript digit three = cubed, U+00B3 ISOnum */ },</div><div class='del'>-	{ 180,	"acute",/* acute accent = spacing acute, U+00B4 ISOdia */ },</div><div class='del'>-	{ 181,	"micro",/* micro sign, U+00B5 ISOnum */ },</div><div class='del'>-	{ 182,	"para",	/* pilcrow sign = paragraph sign, U+00B6 ISOnum */ },</div><div class='del'>-	{ 183,	"middot",/* middle dot = Georgian comma Greek middle dot, U+00B7 ISOnum */ },</div><div class='del'>-	{ 184,	"cedil",/* cedilla = spacing cedilla, U+00B8 ISOdia */ },</div><div class='del'>-	{ 185,	"sup1",	/* superscript one = superscript digit one, U+00B9 ISOnum */ },</div><div class='del'>-	{ 186,	"ordm",	/* masculine ordinal indicator, U+00BA ISOnum */ },</div><div class='del'>-	{ 187,	"raquo",/* right-pointing double angle quotation mark right pointing guillemet, U+00BB ISOnum */ },</div><div class='del'>-	{ 188,	"frac14",/* vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum */ },</div><div class='del'>-	{ 189,	"frac12",/* vulgar fraction one half = fraction one half, U+00BD ISOnum */ },</div><div class='del'>-	{ 190,	"frac34",/* vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum */ },</div><div class='del'>-	{ 191,	"iquest",/* inverted question mark = turned question mark, U+00BF ISOnum */ },</div><div class='del'>-	{ 192,	"Agrave",/* latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1 */ },</div><div class='del'>-	{ 193,	"Aacute",/* latin capital letter A with acute, U+00C1 ISOlat1 */ },</div><div class='del'>-	{ 194,	"Acirc",/* latin capital letter A with circumflex, U+00C2 ISOlat1 */ },</div><div class='del'>-	{ 195,	"Atilde",/* latin capital letter A with tilde, U+00C3 ISOlat1 */ },</div><div class='del'>-	{ 196,	"Auml",	/* latin capital letter A with diaeresis, U+00C4 ISOlat1 */ },</div><div class='del'>-	{ 197,	"Aring",/* latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1 */ },</div><div class='del'>-	{ 198,	"AElig",/* latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1 */ },</div><div class='del'>-	{ 199,	"Ccedil",/* latin capital letter C with cedilla, U+00C7 ISOlat1 */ },</div><div class='del'>-	{ 200,	"Egrave",/* latin capital letter E with grave, U+00C8 ISOlat1 */ },</div><div class='del'>-	{ 201,	"Eacute",/* latin capital letter E with acute, U+00C9 ISOlat1 */ },</div><div class='del'>-	{ 202,	"Ecirc",/* latin capital letter E with circumflex, U+00CA ISOlat1 */ },</div><div class='del'>-	{ 203,	"Euml",	/* latin capital letter E with diaeresis, U+00CB ISOlat1 */ },</div><div class='del'>-	{ 204,	"Igrave",/* latin capital letter I with grave, U+00CC ISOlat1 */ },</div><div class='del'>-	{ 205,	"Iacute",/* latin capital letter I with acute, U+00CD ISOlat1 */ },</div><div class='del'>-	{ 206,	"Icirc",/* latin capital letter I with circumflex, U+00CE ISOlat1 */ },</div><div class='del'>-	{ 207,	"Iuml",	/* latin capital letter I with diaeresis, U+00CF ISOlat1 */ },</div><div class='del'>-	{ 208,	"ETH",	/* latin capital letter ETH, U+00D0 ISOlat1 */ },</div><div class='del'>-	{ 209,	"Ntilde",/* latin capital letter N with tilde, U+00D1 ISOlat1 */ },</div><div class='del'>-	{ 210,	"Ograve",/* latin capital letter O with grave, U+00D2 ISOlat1 */ },</div><div class='del'>-	{ 211,	"Oacute",/* latin capital letter O with acute, U+00D3 ISOlat1 */ },</div><div class='del'>-	{ 212,	"Ocirc",/* latin capital letter O with circumflex, U+00D4 ISOlat1 */ },</div><div class='del'>-	{ 213,	"Otilde",/* latin capital letter O with tilde, U+00D5 ISOlat1 */ },</div><div class='del'>-	{ 214,	"Ouml",	/* latin capital letter O with diaeresis, U+00D6 ISOlat1 */ },</div><div class='del'>-	{ 215,	"times",/* multiplication sign, U+00D7 ISOnum */ },</div><div class='del'>-	{ 216,	"Oslash",/* latin capital letter O with stroke latin capital letter O slash, U+00D8 ISOlat1 */ },</div><div class='del'>-	{ 217,	"Ugrave",/* latin capital letter U with grave, U+00D9 ISOlat1 */ },</div><div class='del'>-	{ 218,	"Uacute",/* latin capital letter U with acute, U+00DA ISOlat1 */ },</div><div class='del'>-	{ 219,	"Ucirc",/* latin capital letter U with circumflex, U+00DB ISOlat1 */ },</div><div class='del'>-	{ 220,	"Uuml",	/* latin capital letter U with diaeresis, U+00DC ISOlat1 */ },</div><div class='del'>-	{ 221,	"Yacute",/* latin capital letter Y with acute, U+00DD ISOlat1 */ },</div><div class='del'>-	{ 222,	"THORN",/* latin capital letter THORN, U+00DE ISOlat1 */ },</div><div class='del'>-	{ 223,	"szlig",/* latin small letter sharp s = ess-zed, U+00DF ISOlat1 */ },</div><div class='del'>-	{ 224,	"agrave",/* latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1 */ },</div><div class='del'>-	{ 225,	"aacute",/* latin small letter a with acute, U+00E1 ISOlat1 */ },</div><div class='del'>-	{ 226,	"acirc",/* latin small letter a with circumflex, U+00E2 ISOlat1 */ },</div><div class='del'>-	{ 227,	"atilde",/* latin small letter a with tilde, U+00E3 ISOlat1 */ },</div><div class='del'>-	{ 228,	"auml",	/* latin small letter a with diaeresis, U+00E4 ISOlat1 */ },</div><div class='del'>-	{ 229,	"aring",/* latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1 */ },</div><div class='del'>-	{ 230,	"aelig",/* latin small letter ae = latin small ligature ae, U+00E6 ISOlat1 */ },</div><div class='del'>-	{ 231,	"ccedil",/* latin small letter c with cedilla, U+00E7 ISOlat1 */ },</div><div class='del'>-	{ 232,	"egrave",/* latin small letter e with grave, U+00E8 ISOlat1 */ },</div><div class='del'>-	{ 233,	"eacute",/* latin small letter e with acute, U+00E9 ISOlat1 */ },</div><div class='del'>-	{ 234,	"ecirc",/* latin small letter e with circumflex, U+00EA ISOlat1 */ },</div><div class='del'>-	{ 235,	"euml",	/* latin small letter e with diaeresis, U+00EB ISOlat1 */ },</div><div class='del'>-	{ 236,	"igrave",/* latin small letter i with grave, U+00EC ISOlat1 */ },</div><div class='del'>-	{ 237,	"iacute",/* latin small letter i with acute, U+00ED ISOlat1 */ },</div><div class='del'>-	{ 238,	"icirc",/* latin small letter i with circumflex, U+00EE ISOlat1 */ },</div><div class='del'>-	{ 239,	"iuml",	/* latin small letter i with diaeresis, U+00EF ISOlat1 */ },</div><div class='del'>-	{ 240,	"eth",	/* latin small letter eth, U+00F0 ISOlat1 */ },</div><div class='del'>-	{ 241,	"ntilde",/* latin small letter n with tilde, U+00F1 ISOlat1 */ },</div><div class='del'>-	{ 242,	"ograve",/* latin small letter o with grave, U+00F2 ISOlat1 */ },</div><div class='del'>-	{ 243,	"oacute",/* latin small letter o with acute, U+00F3 ISOlat1 */ },</div><div class='del'>-	{ 244,	"ocirc",/* latin small letter o with circumflex, U+00F4 ISOlat1 */ },</div><div class='del'>-	{ 245,	"otilde",/* latin small letter o with tilde, U+00F5 ISOlat1 */ },</div><div class='del'>-	{ 246,	"ouml",	/* latin small letter o with diaeresis, U+00F6 ISOlat1 */ },</div><div class='del'>-	{ 247,	"divide",/* division sign, U+00F7 ISOnum */ },</div><div class='del'>-	{ 248,	"oslash",/* latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1 */ },</div><div class='del'>-	{ 249,	"ugrave",/* latin small letter u with grave, U+00F9 ISOlat1 */ },</div><div class='del'>-	{ 250,	"uacute",/* latin small letter u with acute, U+00FA ISOlat1 */ },</div><div class='del'>-	{ 251,	"ucirc",/* latin small letter u with circumflex, U+00FB ISOlat1 */ },</div><div class='del'>-	{ 252,	"uuml",	/* latin small letter u with diaeresis, U+00FC ISOlat1 */ },</div><div class='del'>-	{ 253,	"yacute",/* latin small letter y with acute, U+00FD ISOlat1 */ },</div><div class='del'>-	{ 254,	"thorn",/* latin small letter thorn with, U+00FE ISOlat1 */ },</div><div class='del'>-	{ 255,	"yuml",	/* latin small letter y with diaeresis, U+00FF ISOlat1 */ },</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Anything below should really be kept as entities references</div><div class='del'>- */</div><div class='del'>-	{ 402,	"fnof",	/* latin small f with hook = function = florin, U+0192 ISOtech */ },</div><div class='del'>-</div><div class='del'>-	{ 913,	"Alpha",/* greek capital letter alpha, U+0391 */ },</div><div class='del'>-	{ 914,	"Beta",	/* greek capital letter beta, U+0392 */ },</div><div class='del'>-	{ 915,	"Gamma",/* greek capital letter gamma, U+0393 ISOgrk3 */ },</div><div class='del'>-	{ 916,	"Delta",/* greek capital letter delta, U+0394 ISOgrk3 */ },</div><div class='del'>-	{ 917,	"Epsilon",/* greek capital letter epsilon, U+0395 */ },</div><div class='del'>-	{ 918,	"Zeta",	/* greek capital letter zeta, U+0396 */ },</div><div class='del'>-	{ 919,	"Eta",	/* greek capital letter eta, U+0397 */ },</div><div class='del'>-	{ 920,	"Theta",/* greek capital letter theta, U+0398 ISOgrk3 */ },</div><div class='del'>-	{ 921,	"Iota",	/* greek capital letter iota, U+0399 */ },</div><div class='del'>-	{ 922,	"Kappa",/* greek capital letter kappa, U+039A */ },</div><div class='del'>-	{ 923,	"Lambda"/* greek capital letter lambda, U+039B ISOgrk3 */ },</div><div class='del'>-	{ 924,	"Mu",	/* greek capital letter mu, U+039C */ },</div><div class='del'>-	{ 925,	"Nu",	/* greek capital letter nu, U+039D */ },</div><div class='del'>-	{ 926,	"Xi",	/* greek capital letter xi, U+039E ISOgrk3 */ },</div><div class='del'>-	{ 927,	"Omicron",/* greek capital letter omicron, U+039F */ },</div><div class='del'>-	{ 928,	"Pi",	/* greek capital letter pi, U+03A0 ISOgrk3 */ },</div><div class='del'>-	{ 929,	"Rho",	/* greek capital letter rho, U+03A1 */ },</div><div class='del'>-	{ 931,	"Sigma",/* greek capital letter sigma, U+03A3 ISOgrk3 */ },</div><div class='del'>-	{ 932,	"Tau",	/* greek capital letter tau, U+03A4 */ },</div><div class='del'>-	{ 933,	"Upsilon",/* greek capital letter upsilon, U+03A5 ISOgrk3 */ },</div><div class='del'>-	{ 934,	"Phi",	/* greek capital letter phi, U+03A6 ISOgrk3 */ },</div><div class='del'>-	{ 935,	"Chi",	/* greek capital letter chi, U+03A7 */ },</div><div class='del'>-	{ 936,	"Psi",	/* greek capital letter psi, U+03A8 ISOgrk3 */ },</div><div class='del'>-	{ 937,	"Omega",/* greek capital letter omega, U+03A9 ISOgrk3 */ },</div><div class='del'>-</div><div class='del'>-	{ 945,	"alpha",/* greek small letter alpha, U+03B1 ISOgrk3 */ },</div><div class='del'>-	{ 946,	"beta",	/* greek small letter beta, U+03B2 ISOgrk3 */ },</div><div class='del'>-	{ 947,	"gamma",/* greek small letter gamma, U+03B3 ISOgrk3 */ },</div><div class='del'>-	{ 948,	"delta",/* greek small letter delta, U+03B4 ISOgrk3 */ },</div><div class='del'>-	{ 949,	"epsilon",/* greek small letter epsilon, U+03B5 ISOgrk3 */ },</div><div class='del'>-	{ 950,	"zeta",	/* greek small letter zeta, U+03B6 ISOgrk3 */ },</div><div class='del'>-	{ 951,	"eta",	/* greek small letter eta, U+03B7 ISOgrk3 */ },</div><div class='del'>-	{ 952,	"theta",/* greek small letter theta, U+03B8 ISOgrk3 */ },</div><div class='del'>-	{ 953,	"iota",	/* greek small letter iota, U+03B9 ISOgrk3 */ },</div><div class='del'>-	{ 954,	"kappa",/* greek small letter kappa, U+03BA ISOgrk3 */ },</div><div class='del'>-	{ 955,	"lambda",/* greek small letter lambda, U+03BB ISOgrk3 */ },</div><div class='del'>-	{ 956,	"mu",	/* greek small letter mu, U+03BC ISOgrk3 */ },</div><div class='del'>-	{ 957,	"nu",	/* greek small letter nu, U+03BD ISOgrk3 */ },</div><div class='del'>-	{ 958,	"xi",	/* greek small letter xi, U+03BE ISOgrk3 */ },</div><div class='del'>-	{ 959,	"omicron",/* greek small letter omicron, U+03BF NEW */ },</div><div class='del'>-	{ 960,	"pi",	/* greek small letter pi, U+03C0 ISOgrk3 */ },</div><div class='del'>-	{ 961,	"rho",	/* greek small letter rho, U+03C1 ISOgrk3 */ },</div><div class='del'>-	{ 962,	"sigmaf",/* greek small letter final sigma, U+03C2 ISOgrk3 */ },</div><div class='del'>-	{ 963,	"sigma",/* greek small letter sigma, U+03C3 ISOgrk3 */ },</div><div class='del'>-	{ 964,	"tau",	/* greek small letter tau, U+03C4 ISOgrk3 */ },</div><div class='del'>-	{ 965,	"upsilon",/* greek small letter upsilon, U+03C5 ISOgrk3 */ },</div><div class='del'>-	{ 966,	"phi",	/* greek small letter phi, U+03C6 ISOgrk3 */ },</div><div class='del'>-	{ 967,	"chi",	/* greek small letter chi, U+03C7 ISOgrk3 */ },</div><div class='del'>-	{ 968,	"psi",	/* greek small letter psi, U+03C8 ISOgrk3 */ },</div><div class='del'>-	{ 969,	"omega",/* greek small letter omega, U+03C9 ISOgrk3 */ },</div><div class='del'>-	{ 977,	"thetasym",/* greek small letter theta symbol, U+03D1 NEW */ },</div><div class='del'>-	{ 978,	"upsih",/* greek upsilon with hook symbol, U+03D2 NEW */ },</div><div class='del'>-	{ 982,	"piv",	/* greek pi symbol, U+03D6 ISOgrk3 */ },</div><div class='del'>-</div><div class='del'>-	{ 8226,	"bull",	/* bullet = black small circle, U+2022 ISOpub */ },</div><div class='del'>-	{ 8230,	"hellip",/* horizontal ellipsis = three dot leader, U+2026 ISOpub */ },</div><div class='del'>-	{ 8242,	"prime",/* prime = minutes = feet, U+2032 ISOtech */ },</div><div class='del'>-	{ 8243,	"Prime",/* double prime = seconds = inches, U+2033 ISOtech */ },</div><div class='del'>-	{ 8254,	"oline",/* overline = spacing overscore, U+203E NEW */ },</div><div class='del'>-	{ 8260,	"frasl",/* fraction slash, U+2044 NEW */ },</div><div class='del'>-</div><div class='del'>-	{ 8472,	"weierp",/* script capital P = power set = Weierstrass p, U+2118 ISOamso */ },</div><div class='del'>-	{ 8465,	"image",/* blackletter capital I = imaginary part, U+2111 ISOamso */ },</div><div class='del'>-	{ 8476,	"real",	/* blackletter capital R = real part symbol, U+211C ISOamso */ },</div><div class='del'>-	{ 8482,	"trade",/* trade mark sign, U+2122 ISOnum */ },</div><div class='del'>-	{ 8501,	"alefsym",/* alef symbol = first transfinite cardinal, U+2135 NEW */ },</div><div class='del'>-	{ 8592,	"larr",	/* leftwards arrow, U+2190 ISOnum */ },</div><div class='del'>-	{ 8593,	"uarr",	/* upwards arrow, U+2191 ISOnum */ },</div><div class='del'>-	{ 8594,	"rarr",	/* rightwards arrow, U+2192 ISOnum */ },</div><div class='del'>-	{ 8595,	"darr",	/* downwards arrow, U+2193 ISOnum */ },</div><div class='del'>-	{ 8596,	"harr",	/* left right arrow, U+2194 ISOamsa */ },</div><div class='del'>-	{ 8629,	"crarr",/* downwards arrow with corner leftwards = carriage return, U+21B5 NEW */ },</div><div class='del'>-	{ 8656,	"lArr",	/* leftwards double arrow, U+21D0 ISOtech */ },</div><div class='del'>-	{ 8657,	"uArr",	/* upwards double arrow, U+21D1 ISOamsa */ },</div><div class='del'>-	{ 8658,	"rArr",	/* rightwards double arrow, U+21D2 ISOtech */ },</div><div class='del'>-	{ 8659,	"dArr",	/* downwards double arrow, U+21D3 ISOamsa */ },</div><div class='del'>-	{ 8660,	"hArr",	/* left right double arrow, U+21D4 ISOamsa */ },</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	{ 8704,	"forall",/* for all, U+2200 ISOtech */ },</div><div class='del'>-	{ 8706,	"part",	/* partial differential, U+2202 ISOtech */ },</div><div class='del'>-	{ 8707,	"exist",/* there exists, U+2203 ISOtech */ },</div><div class='del'>-	{ 8709,	"empty",/* empty set = null set = diameter, U+2205 ISOamso */ },</div><div class='del'>-	{ 8711,	"nabla",/* nabla = backward difference, U+2207 ISOtech */ },</div><div class='del'>-	{ 8712,	"isin",	/* element of, U+2208 ISOtech */ },</div><div class='del'>-	{ 8713,	"notin",/* not an element of, U+2209 ISOtech */ },</div><div class='del'>-	{ 8715,	"ni",	/* contains as member, U+220B ISOtech */ },</div><div class='del'>-	{ 8719,	"prod",	/* n-ary product = product sign, U+220F ISOamsb */ },</div><div class='del'>-	{ 8721,	"sum",	/* n-ary sumation, U+2211 ISOamsb */ },</div><div class='del'>-	{ 8722,	"minus",/* minus sign, U+2212 ISOtech */ },</div><div class='del'>-	{ 8727,	"lowast",/* asterisk operator, U+2217 ISOtech */ },</div><div class='del'>-	{ 8730,	"radic",/* square root = radical sign, U+221A ISOtech */ },</div><div class='del'>-	{ 8733,	"prop",	/* proportional to, U+221D ISOtech */ },</div><div class='del'>-	{ 8734,	"infin",/* infinity, U+221E ISOtech */ },</div><div class='del'>-	{ 8736,	"ang",	/* angle, U+2220 ISOamso */ },</div><div class='del'>-	{ 8743,	"and",	/* logical and = wedge, U+2227 ISOtech */ },</div><div class='del'>-	{ 8744,	"or",	/* logical or = vee, U+2228 ISOtech */ },</div><div class='del'>-	{ 8745,	"cap",	/* intersection = cap, U+2229 ISOtech */ },</div><div class='del'>-	{ 8746,	"cup",	/* union = cup, U+222A ISOtech */ },</div><div class='del'>-	{ 8747,	"int",	/* integral, U+222B ISOtech */ },</div><div class='del'>-	{ 8756,	"there4",/* therefore, U+2234 ISOtech */ },</div><div class='del'>-	{ 8764,	"sim",	/* tilde operator = varies with = similar to, U+223C ISOtech */ },</div><div class='del'>-	{ 8773,	"cong",	/* approximately equal to, U+2245 ISOtech */ },</div><div class='del'>-	{ 8776,	"asymp",/* almost equal to = asymptotic to, U+2248 ISOamsr */ },</div><div class='del'>-	{ 8800,	"ne",	/* not equal to, U+2260 ISOtech */ },</div><div class='del'>-	{ 8801,	"equiv",/* identical to, U+2261 ISOtech */ },</div><div class='del'>-	{ 8804,	"le",	/* less-than or equal to, U+2264 ISOtech */ },</div><div class='del'>-	{ 8805,	"ge",	/* greater-than or equal to, U+2265 ISOtech */ },</div><div class='del'>-	{ 8834,	"sub",	/* subset of, U+2282 ISOtech */ },</div><div class='del'>-	{ 8835,	"sup",	/* superset of, U+2283 ISOtech */ },</div><div class='del'>-	{ 8836,	"nsub",	/* not a subset of, U+2284 ISOamsn */ },</div><div class='del'>-	{ 8838,	"sube",	/* subset of or equal to, U+2286 ISOtech */ },</div><div class='del'>-	{ 8839,	"supe",	/* superset of or equal to, U+2287 ISOtech */ },</div><div class='del'>-	{ 8853,	"oplus",/* circled plus = direct sum, U+2295 ISOamsb */ },</div><div class='del'>-	{ 8855,	"otimes",/* circled times = vector product, U+2297 ISOamsb */ },</div><div class='del'>-	{ 8869,	"perp",	/* up tack = orthogonal to = perpendicular, U+22A5 ISOtech */ },</div><div class='del'>-	{ 8901,	"sdot",	/* dot operator, U+22C5 ISOamsb */ },</div><div class='del'>-	{ 8968,	"lceil",/* left ceiling = apl upstile, U+2308 ISOamsc */ },</div><div class='del'>-	{ 8969,	"rceil",/* right ceiling, U+2309 ISOamsc */ },</div><div class='del'>-	{ 8970,	"lfloor",/* left floor = apl downstile, U+230A ISOamsc */ },</div><div class='del'>-	{ 8971,	"rfloor",/* right floor, U+230B ISOamsc */ },</div><div class='del'>-	{ 9001,	"lang",	/* left-pointing angle bracket = bra, U+2329 ISOtech */ },</div><div class='del'>-	{ 9002,	"rang",	/* right-pointing angle bracket = ket, U+232A ISOtech */ },</div><div class='del'>-	{ 9674,	"loz",	/* lozenge, U+25CA ISOpub */ },</div><div class='del'>-</div><div class='del'>-	{ 9824,	"spades",/* black spade suit, U+2660 ISOpub */ },</div><div class='del'>-	{ 9827,	"clubs",/* black club suit = shamrock, U+2663 ISOpub */ },</div><div class='del'>-	{ 9829,	"hearts",/* black heart suit = valentine, U+2665 ISOpub */ },</div><div class='del'>-	{ 9830,	"diams",/* black diamond suit, U+2666 ISOpub */ },</div><div class='del'>-</div><div class='del'>-	{ 338,	"OElig",/* latin capital ligature OE, U+0152 ISOlat2 */ },</div><div class='del'>-	{ 339,	"oelig",/* latin small ligature oe, U+0153 ISOlat2 */ },</div><div class='del'>-	{ 352,	"Scaron",/* latin capital letter S with caron, U+0160 ISOlat2 */ },</div><div class='del'>-	{ 353,	"scaron",/* latin small letter s with caron, U+0161 ISOlat2 */ },</div><div class='del'>-	{ 376,	"Yuml",	/* latin capital letter Y with diaeresis, U+0178 ISOlat2 */ },</div><div class='del'>-	{ 710,	"circ",	/* modifier letter circumflex accent, U+02C6 ISOpub */ },</div><div class='del'>-	{ 732,	"tilde",/* small tilde, U+02DC ISOdia */ },</div><div class='del'>-</div><div class='del'>-	{ 8194,	"ensp",	/* en space, U+2002 ISOpub */ },</div><div class='del'>-	{ 8195,	"emsp",	/* em space, U+2003 ISOpub */ },</div><div class='del'>-	{ 8201,	"thinsp",/* thin space, U+2009 ISOpub */ },</div><div class='del'>-	{ 8204,	"zwnj",	/* zero width non-joiner, U+200C NEW RFC 2070 */ },</div><div class='del'>-	{ 8205,	"zwj",	/* zero width joiner, U+200D NEW RFC 2070 */ },</div><div class='del'>-	{ 8206,	"lrm",	/* left-to-right mark, U+200E NEW RFC 2070 */ },</div><div class='del'>-	{ 8207,	"rlm",	/* right-to-left mark, U+200F NEW RFC 2070 */ },</div><div class='del'>-	{ 8211,	"ndash",/* en dash, U+2013 ISOpub */ },</div><div class='del'>-	{ 8212,	"mdash",/* em dash, U+2014 ISOpub */ },</div><div class='del'>-	{ 8216,	"lsquo",/* left single quotation mark, U+2018 ISOnum */ },</div><div class='del'>-	{ 8217,	"rsquo",/* right single quotation mark, U+2019 ISOnum */ },</div><div class='del'>-	{ 8218,	"sbquo",/* single low-9 quotation mark, U+201A NEW */ },</div><div class='del'>-	{ 8220,	"ldquo",/* left double quotation mark, U+201C ISOnum */ },</div><div class='del'>-	{ 8221,	"rdquo",/* right double quotation mark, U+201D ISOnum */ },</div><div class='del'>-	{ 8222,	"bdquo",/* double low-9 quotation mark, U+201E NEW */ },</div><div class='del'>-	{ 8224,	"dagger",/* dagger, U+2020 ISOpub */ },</div><div class='del'>-	{ 8225,	"Dagger",/* double dagger, U+2021 ISOpub */ },</div><div class='del'>-	{ 8240,	"permil",/* per mille sign, U+2030 ISOtech */ },</div><div class='del'>-	{ 8249,	"lsaquo",/* single left-pointing angle quotation mark, U+2039 ISO proposed */ },</div><div class='del'>-	{ 8250,	"rsaquo",/* single right-pointing angle quotation mark, U+203A ISO proposed */ },</div><div class='del'>-	{ 8364,	"euro",	/* euro sign, U+20AC NEW */ }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GHashTable *entities;</div><div class='del'>-</div><div class='del'>-/* this cannot be called in a thread context */</div><div class='del'>-static void tokenise_setup(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (entities == NULL) {</div><div class='del'>-		entities = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-		for (i=0;i&lt;sizeof(entity_map)/sizeof(entity_map[0]);i++) {</div><div class='del'>-			g_hash_table_insert(entities, (char *)entity_map[i].name, (void *)entity_map[i].val);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelHTMLParserPrivate *tokenise_init(void)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParserPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = g_malloc(sizeof(*p));</div><div class='del'>-	p-&gt;state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-</div><div class='del'>-	p-&gt;attr = 0;</div><div class='del'>-	p-&gt;attrs = g_ptr_array_new();</div><div class='del'>-	p-&gt;values = g_ptr_array_new();</div><div class='del'>-	p-&gt;tag = g_string_new("");</div><div class='del'>-	p-&gt;ent = g_string_new("");</div><div class='del'>-	p-&gt;charset = NULL;</div><div class='del'>-	</div><div class='del'>-	if (entities == NULL)</div><div class='del'>-		tokenise_setup();</div><div class='del'>-</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tokenise_free(CamelHTMLParserPrivate *p)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_string_free(p-&gt;tag, TRUE);</div><div class='del'>-	g_string_free(p-&gt;ent, TRUE);</div><div class='del'>-	g_free(p-&gt;charset);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;p-&gt;attrs-&gt;len;i++)</div><div class='del'>-		g_string_free(p-&gt;attrs-&gt;pdata[i], TRUE);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;p-&gt;values-&gt;len;i++)</div><div class='del'>-		g_string_free(p-&gt;values-&gt;pdata[i], TRUE);</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int convert_entity(const char *e, char *ent)</div><div class='del'>-{</div><div class='del'>-	unsigned int val;</div><div class='del'>-</div><div class='del'>-	if (e[0] == '#')</div><div class='del'>-		return g_unichar_to_utf8(atoi(e+1), ent);</div><div class='del'>-</div><div class='del'>-	val = (unsigned int)g_hash_table_lookup(entities, e);</div><div class='del'>-	if (ent)</div><div class='del'>-		return g_unichar_to_utf8(val, ent);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void dump_tag(CamelHTMLParserPrivate *p)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printf("got tag: %s\n", p-&gt;tag-&gt;str);</div><div class='del'>-	printf("%d attributes:\n", p-&gt;attr);</div><div class='del'>-	for (i=0;i&lt;p-&gt;attr;i++) {</div><div class='del'>-		printf(" %s = '%s'\n", ((GString *)p-&gt;attrs-&gt;pdata[i])-&gt;str, ((GString *)p-&gt;values-&gt;pdata[i])-&gt;str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int tokenise_step(CamelHTMLParserPrivate *p, char **datap, int *lenp)</div><div class='del'>-{</div><div class='del'>-	char *in = p-&gt;inptr;</div><div class='del'>-	char *inend = p-&gt;inend;</div><div class='del'>-	char c;</div><div class='del'>-	int state = p-&gt;state, ret, len;</div><div class='del'>-	char *start = p-&gt;inptr;</div><div class='del'>-</div><div class='del'>-	d(printf("Tokenise step\n"));</div><div class='del'>-</div><div class='del'>-	while (in &lt; inend) {</div><div class='del'>-		c = *in++;</div><div class='del'>-		switch (state) {</div><div class='del'>-		case CAMEL_HTML_PARSER_DATA:</div><div class='del'>-			if (c == '&lt;') {</div><div class='del'>-				ret = state;</div><div class='del'>-				state = CAMEL_HTML_PARSER_TAG;</div><div class='del'>-				p-&gt;attr = 0;</div><div class='del'>-				g_string_truncate(p-&gt;tag, 0);</div><div class='del'>-				d(printf("got data '%.*s'\n", in-start-1, start));</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c=='&amp;') {</div><div class='del'>-				ret = state;</div><div class='del'>-				state = CAMEL_HTML_PARSER_ENT;</div><div class='del'>-				g_string_truncate(p-&gt;ent, 0);</div><div class='del'>-				g_string_append_c(p-&gt;ent, c);</div><div class='del'>-				d(printf("got data '%.*s'\n", in-start-1, start));</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_ENT:</div><div class='del'>-			if (c==';') {</div><div class='del'>-				len = convert_entity(p-&gt;ent-&gt;str+1, p-&gt;ent_utf8);</div><div class='del'>-				if (len == 0) {</div><div class='del'>-					/* handle broken entity */</div><div class='del'>-					g_string_append_c(p-&gt;ent, c);</div><div class='del'>-					ret = state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-					*datap = p-&gt;ent-&gt;str;</div><div class='del'>-					*lenp = p-&gt;ent-&gt;len;</div><div class='del'>-					goto done;</div><div class='del'>-				} else {</div><div class='del'>-					d(printf("got entity: %s = %s\n", p-&gt;ent-&gt;str, p-&gt;ent_utf8));</div><div class='del'>-					ret = state;</div><div class='del'>-					state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-					*datap = p-&gt;ent_utf8;</div><div class='del'>-					*lenp = len;</div><div class='del'>-					goto done;</div><div class='del'>-				}</div><div class='del'>-			} else if (isalnum(c) || c=='#') { /* FIXME: right type */</div><div class='del'>-				g_string_append_c(p-&gt;ent, c);</div><div class='del'>-			} else {</div><div class='del'>-				/* handle broken entity */</div><div class='del'>-				g_string_append_c(p-&gt;ent, c);</div><div class='del'>-				ret = state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				*datap = p-&gt;ent-&gt;str;</div><div class='del'>-				*lenp = p-&gt;ent-&gt;len;</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_TAG:</div><div class='del'>-			if (c == '!') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_COMMENT0;</div><div class='del'>-				g_string_append_c(p-&gt;tag, c);</div><div class='del'>-			} else if (c == '&gt;') {</div><div class='del'>-				d(dump_tag(p));</div><div class='del'>-				ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c == ' ' || c=='\n' || c=='\t') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_ATTR0;</div><div class='del'>-			} else {</div><div class='del'>-				g_string_append_c(p-&gt;tag, c);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-			/* check for &lt;!-- */</div><div class='del'>-		case CAMEL_HTML_PARSER_COMMENT0:</div><div class='del'>-			if (c == '-') {</div><div class='del'>-				g_string_append_c(p-&gt;tag, c);</div><div class='del'>-				if (p-&gt;tag-&gt;len == 3) {</div><div class='del'>-					g_string_truncate(p-&gt;tag, 0);</div><div class='del'>-					state = CAMEL_HTML_PARSER_COMMENT;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* got something else, probbly dtd entity */</div><div class='del'>-				state = CAMEL_HTML_PARSER_DTDENT;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_DTDENT:</div><div class='del'>-			if (c == '&gt;') {</div><div class='del'>-				ret = CAMEL_HTML_PARSER_DTDENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-				goto done;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_COMMENT:</div><div class='del'>-			if (c == '&gt;' &amp;&amp; p-&gt;tag-&gt;len == 2) {</div><div class='del'>-				ret = CAMEL_HTML_PARSER_COMMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c=='-') {</div><div class='del'>-				/* we dont care if we get 'n' --'s before the &gt; */</div><div class='del'>-				if (p-&gt;tag-&gt;len &lt; 2)</div><div class='del'>-					g_string_append_c(p-&gt;tag, c);</div><div class='del'>-			} else {</div><div class='del'>-				g_string_truncate(p-&gt;tag, 0);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_ATTR0:	/* pre-attribute whitespace */</div><div class='del'>-			if (c == '&gt;') {</div><div class='del'>-				d(dump_tag(p));</div><div class='del'>-				ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c == ' ' || c=='\n' || c=='\t') {</div><div class='del'>-			} else {</div><div class='del'>-				if (p-&gt;attrs-&gt;len &lt;= p-&gt;attr) {</div><div class='del'>-					g_ptr_array_add(p-&gt;attrs, g_string_new(""));</div><div class='del'>-					g_ptr_array_add(p-&gt;values, g_string_new(""));</div><div class='del'>-				} else {</div><div class='del'>-					g_string_truncate(p-&gt;attrs-&gt;pdata[p-&gt;attr], 0);</div><div class='del'>-					g_string_truncate(p-&gt;values-&gt;pdata[p-&gt;attr], 0);</div><div class='del'>-				}</div><div class='del'>-				g_string_append_c(p-&gt;attrs-&gt;pdata[p-&gt;attr], c);</div><div class='del'>-				state = CAMEL_HTML_PARSER_ATTR;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_ATTR:</div><div class='del'>-			if (c == '&gt;') {</div><div class='del'>-				d(dump_tag(p));</div><div class='del'>-				ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c == '=') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_VAL0;</div><div class='del'>-			} else if (c == ' ' || c=='\n' || c=='\t') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_ATTR0;</div><div class='del'>-				p-&gt;attr++;</div><div class='del'>-			} else {</div><div class='del'>-				g_string_append_c(p-&gt;attrs-&gt;pdata[p-&gt;attr], c);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_VAL0:</div><div class='del'>-			if (c == '&gt;') {</div><div class='del'>-				d(printf("value truncated\n"));</div><div class='del'>-				d(dump_tag(p));</div><div class='del'>-				ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c == '\'' || c == '\"') {</div><div class='del'>-				p-&gt;quote = c;</div><div class='del'>-				state = CAMEL_HTML_PARSER_VAL;</div><div class='del'>-			} else if (c == ' ' || c=='\n' || c=='\t') {</div><div class='del'>-			} else {</div><div class='del'>-				g_string_append_c(p-&gt;values-&gt;pdata[p-&gt;attr], c);</div><div class='del'>-				p-&gt;quote = 0;</div><div class='del'>-				state = CAMEL_HTML_PARSER_VAL;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_VAL:</div><div class='del'>-		do_val:</div><div class='del'>-			if (p-&gt;quote) {</div><div class='del'>-				if (c == '&gt;') {</div><div class='del'>-					d(printf("value truncated\n"));</div><div class='del'>-					d(dump_tag(p));</div><div class='del'>-					ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-					state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-					p-&gt;attr++;</div><div class='del'>-					goto done;</div><div class='del'>-				} else if (c == p-&gt;quote) {</div><div class='del'>-					state = CAMEL_HTML_PARSER_ATTR0;</div><div class='del'>-					p-&gt;attr++;</div><div class='del'>-				} else if (c=='&amp;') {</div><div class='del'>-					state = CAMEL_HTML_PARSER_VAL_ENT;</div><div class='del'>-					g_string_truncate(p-&gt;ent, 0);</div><div class='del'>-				} else {</div><div class='del'>-					g_string_append_c(p-&gt;values-&gt;pdata[p-&gt;attr], c);</div><div class='del'>-				}</div><div class='del'>-			} else if (c == '&gt;') {</div><div class='del'>-				d(dump_tag(p));</div><div class='del'>-				ret = CAMEL_HTML_PARSER_ELEMENT;</div><div class='del'>-				state = CAMEL_HTML_PARSER_DATA;</div><div class='del'>-				p-&gt;attr++;</div><div class='del'>-				goto done;</div><div class='del'>-			} else if (c == ' ' || c=='\n' || c=='\t') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_ATTR0;</div><div class='del'>-				p-&gt;attr++;</div><div class='del'>-			} else if (c=='&amp;') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_VAL_ENT;</div><div class='del'>-				g_string_truncate(p-&gt;ent, 0);</div><div class='del'>-			} else {</div><div class='del'>-				g_string_append_c(p-&gt;values-&gt;pdata[p-&gt;attr], c);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_VAL_ENT:</div><div class='del'>-			if (c==';') {</div><div class='del'>-				state = CAMEL_HTML_PARSER_VAL;</div><div class='del'>-				len = convert_entity(p-&gt;ent-&gt;str+1, p-&gt;ent_utf8);</div><div class='del'>-				if (len == 0) {</div><div class='del'>-					/* fallback; broken entity, just output it and see why we ended */</div><div class='del'>-					g_string_append(p-&gt;values-&gt;pdata[p-&gt;attr], p-&gt;ent-&gt;str);</div><div class='del'>-					g_string_append_c(p-&gt;values-&gt;pdata[p-&gt;attr], ';');</div><div class='del'>-				} else {</div><div class='del'>-					d(printf("got entity: %s = %s\n", p-&gt;ent-&gt;str, p-&gt;ent_utf8));</div><div class='del'>-					g_string_append(p-&gt;values-&gt;pdata[p-&gt;attr], p-&gt;ent_utf8);</div><div class='del'>-				}</div><div class='del'>-			} else if (isalnum(c) || c=='#') { /* FIXME: right type */</div><div class='del'>-				g_string_append_c(p-&gt;ent, c);</div><div class='del'>-			} else {</div><div class='del'>-				/* fallback; broken entity, just output it and see why we ended */</div><div class='del'>-				g_string_append(p-&gt;values-&gt;pdata[p-&gt;attr], p-&gt;ent-&gt;str);</div><div class='del'>-				goto do_val;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p-&gt;eof) {</div><div class='del'>-		/* FIXME: what about other truncated states? */</div><div class='del'>-		switch (state) {</div><div class='del'>-		case CAMEL_HTML_PARSER_DATA:</div><div class='del'>-		case CAMEL_HTML_PARSER_COMMENT:</div><div class='del'>-			if (in &gt; start) {</div><div class='del'>-				ret = state;</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-			} else {</div><div class='del'>-				ret = CAMEL_HTML_PARSER_EOF;</div><div class='del'>-				state = CAMEL_HTML_PARSER_EOF;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = CAMEL_HTML_PARSER_EOF;</div><div class='del'>-			state = CAMEL_HTML_PARSER_EOF;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* we only care about remaining data for this buffer, everything else has its own copy */</div><div class='del'>-		switch (state) {</div><div class='del'>-		case CAMEL_HTML_PARSER_DATA:</div><div class='del'>-		case CAMEL_HTML_PARSER_COMMENT:</div><div class='del'>-			if (in &gt; start) {</div><div class='del'>-				ret = state;</div><div class='del'>-				*datap = start;</div><div class='del'>-				*lenp = in-start-1;</div><div class='del'>-			} else {</div><div class='del'>-				ret = CAMEL_HTML_PARSER_EOD;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			ret = CAMEL_HTML_PARSER_EOD;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-done:</div><div class='del'>-	p-&gt;start = start;</div><div class='del'>-	p-&gt;state = state;</div><div class='del'>-	p-&gt;inptr = in;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h<br/>deleted file mode 100644<br/>index 2e68e3bdff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-html-parser.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-html-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/** WARNING</div><div class='del'>- **</div><div class='del'>- ** DO NOT USE THIS CODE OUTSIDE OF CAMEL</div><div class='del'>- **</div><div class='del'>- ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_HTML_PARSER_H</div><div class='del'>-#define _CAMEL_HTML_PARSER_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_HTML_PARSER(obj)         CAMEL_CHECK_CAST (obj, camel_html_parser_get_type (), CamelHTMLParser)</div><div class='del'>-#define CAMEL_HTML_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_html_parser_get_type (), CamelHTMLParserClass)</div><div class='del'>-#define CAMEL_IS_HTML_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_html_parser_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelHTMLParserClass CamelHTMLParserClass;</div><div class='del'>-typedef struct _CamelHTMLParser CamelHTMLParser;</div><div class='del'>-</div><div class='del'>-/* Parser/tokeniser states */</div><div class='del'>-typedef enum _camel_html_parser_t {</div><div class='del'>-	CAMEL_HTML_PARSER_DATA,			/* raw data */</div><div class='del'>-	CAMEL_HTML_PARSER_ENT,			/* entity in data */</div><div class='del'>-	CAMEL_HTML_PARSER_ELEMENT,		/* element (tag + attributes scanned) */</div><div class='del'>-	CAMEL_HTML_PARSER_TAG,			/* tag */</div><div class='del'>-	CAMEL_HTML_PARSER_DTDENT,		/* dtd entity? &lt;! blah blah &gt; */</div><div class='del'>-	CAMEL_HTML_PARSER_COMMENT0,		/* start of comment */</div><div class='del'>-	CAMEL_HTML_PARSER_COMMENT,		/* body of comment */</div><div class='del'>-	CAMEL_HTML_PARSER_ATTR0,		/* start of attribute */</div><div class='del'>-	CAMEL_HTML_PARSER_ATTR,			/* attribute */</div><div class='del'>-	CAMEL_HTML_PARSER_VAL0,			/* start of value */</div><div class='del'>-	CAMEL_HTML_PARSER_VAL,			/* value */</div><div class='del'>-	CAMEL_HTML_PARSER_VAL_ENT,		/* entity in value */</div><div class='del'>-	CAMEL_HTML_PARSER_EOD,			/* end of current data */</div><div class='del'>-	CAMEL_HTML_PARSER_EOF,			/* end of file */</div><div class='del'>-} camel_html_parser_t;</div><div class='del'>-</div><div class='del'>-struct _CamelHTMLParser {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelHTMLParserPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelHTMLParserClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_html_parser_get_type	(void);</div><div class='del'>-CamelHTMLParser      *camel_html_parser_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_html_parser_set_data(CamelHTMLParser *hp, const char *start, int len, int last);</div><div class='del'>-camel_html_parser_t camel_html_parser_step(CamelHTMLParser *hp, const char **datap, int *lenp);</div><div class='del'>-const char *camel_html_parser_left(CamelHTMLParser *hp, int *lenp);</div><div class='del'>-const char *camel_html_parser_tag(CamelHTMLParser *hp);</div><div class='del'>-const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name);</div><div class='del'>-const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_HTML_PARSER_H */</div><div class='head'>diff --git a/camel/camel-http-stream.c b/camel/camel-http-stream.c<br/>deleted file mode 100644<br/>index 44c7601e82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-http-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-http-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,548 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-http-stream.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-tcp-stream-raw.h"</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-#endif</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-static int stream_reset  (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_http_stream_class_init (CamelHttpStreamClass *camel_http_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_http_stream_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_http_stream_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = CAMEL_HTTP_STREAM (object);</div><div class='del'>-	</div><div class='del'>-	http-&gt;parser = NULL;</div><div class='del'>-	http-&gt;content_type = NULL;</div><div class='del'>-	http-&gt;headers = NULL;</div><div class='del'>-	http-&gt;service = NULL;</div><div class='del'>-	http-&gt;url = NULL;</div><div class='del'>-	http-&gt;proxy = NULL;</div><div class='del'>-	http-&gt;authrealm = NULL;</div><div class='del'>-	http-&gt;authpass = NULL;</div><div class='del'>-	http-&gt;statuscode = 0;</div><div class='del'>-	http-&gt;raw = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_http_stream_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = CAMEL_HTTP_STREAM (object);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;parser)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;parser));</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;content_type)</div><div class='del'>-		header_content_type_unref (http-&gt;content_type);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;headers)</div><div class='del'>-		header_raw_clear (&amp;http-&gt;headers);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;service)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;service));</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;url)</div><div class='del'>-		camel_url_free (http-&gt;url);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;proxy)</div><div class='del'>-		camel_url_free (http-&gt;proxy);</div><div class='del'>-	</div><div class='del'>-	g_free (http-&gt;authrealm);</div><div class='del'>-	g_free (http-&gt;authpass);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;raw)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_http_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_stream_get_type (),</div><div class='del'>-					    "CamelHttpStream",</div><div class='del'>-					    sizeof (CamelHttpStream),</div><div class='del'>-					    sizeof (CamelHttpStreamClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_http_stream_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_http_stream_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_http_stream_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_http_stream_new:</div><div class='del'>- * @method: HTTP method</div><div class='del'>- * @service: parent service (for SSL/TLS)</div><div class='del'>- * @url: URL to act upon</div><div class='del'>- *</div><div class='del'>- * Return value: a http stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_http_stream_new (CamelHttpMethod method, CamelService *service, CamelURL *url)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *stream;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	g_return_val_if_fail (url != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_HTTP_STREAM (camel_object_new (camel_http_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	stream-&gt;method = method;</div><div class='del'>-	stream-&gt;service = service;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (service));</div><div class='del'>-	</div><div class='del'>-	str = camel_url_to_string (url, 0);</div><div class='del'>-	stream-&gt;url = camel_url_new (str, NULL);</div><div class='del'>-	g_free (str);</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelStream *</div><div class='del'>-http_connect (CamelService *service, CamelURL *url)</div><div class='del'>-{</div><div class='del'>-	CamelStream *buffered, *stream = NULL;</div><div class='del'>-	struct hostent *host;</div><div class='del'>-	int errsave;</div><div class='del'>-	</div><div class='del'>-	if (!strcasecmp (url-&gt;protocol, "https")) {</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-		stream = camel_tcp_stream_ssl_new (service, url-&gt;host);</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		stream = camel_tcp_stream_raw_new ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	host = camel_gethostbyname (url-&gt;host, NULL);</div><div class='del'>-	if (!host) {</div><div class='del'>-		errno = EHOSTUNREACH;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (camel_tcp_stream_connect (CAMEL_TCP_STREAM (stream), host, url-&gt;port ? url-&gt;port : 80) == -1) {</div><div class='del'>-		errsave = errno;</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_free_host (host);</div><div class='del'>-		errno = errsave;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_free_host (host);</div><div class='del'>-	</div><div class='del'>-	buffered = camel_stream_buffer_new (stream, CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return buffered;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-http_next_token (const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *inptr = in;</div><div class='del'>-	</div><div class='del'>-	while (*inptr &amp;&amp; !isspace ((int) *inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	while (*inptr &amp;&amp; isspace ((int) *inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	return (const char *) inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-http_get_statuscode (CamelHttpStream *http)</div><div class='del'>-{</div><div class='del'>-	const char *token;</div><div class='del'>-	char buffer[4096];</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_buffer_gets (CAMEL_STREAM_BUFFER (http-&gt;raw), buffer, sizeof (buffer)) &lt;= 0)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	/* parse the HTTP status code */</div><div class='del'>-	if (!strncasecmp (buffer, "HTTP/", 5)) {</div><div class='del'>-		token = http_next_token (buffer);</div><div class='del'>-		http-&gt;statuscode = header_decode_int (&amp;token);</div><div class='del'>-		return http-&gt;statuscode;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-	http-&gt;raw = NULL;</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-http_get_headers (CamelHttpStream *http)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *headers, *node, *tail;</div><div class='del'>-	const char *type;</div><div class='del'>-	char *buf;</div><div class='del'>-	int len, err;</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;parser)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;parser));</div><div class='del'>-	</div><div class='del'>-	http-&gt;parser = camel_mime_parser_new ();</div><div class='del'>-	camel_mime_parser_init_with_stream (http-&gt;parser, http-&gt;raw);</div><div class='del'>-	</div><div class='del'>-	switch (camel_mime_parser_step (http-&gt;parser, &amp;buf, &amp;len)) {</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-		/* we have the headers, build them into 'us' */</div><div class='del'>-		headers = camel_mime_parser_headers_raw (http-&gt;parser);</div><div class='del'>-		</div><div class='del'>-		/* if content-type exists, process it first, set for fallback charset in headers */</div><div class='del'>-		if (http-&gt;content_type)</div><div class='del'>-			header_content_type_unref (http-&gt;content_type);</div><div class='del'>-		type = header_raw_find (&amp;headers, "Content-Type", NULL);</div><div class='del'>-		if (type)</div><div class='del'>-			http-&gt;content_type = header_content_type_decode (type);</div><div class='del'>-		else</div><div class='del'>-			http-&gt;content_type = NULL;</div><div class='del'>-		</div><div class='del'>-		if (http-&gt;headers)</div><div class='del'>-			header_raw_clear (&amp;http-&gt;headers);</div><div class='del'>-		</div><div class='del'>-		http-&gt;headers = NULL;</div><div class='del'>-		tail = (struct _header_raw *) &amp;http-&gt;headers;</div><div class='del'>-		</div><div class='del'>-		while (headers) {</div><div class='del'>-			node = g_new (struct _header_raw, 1);</div><div class='del'>-			node-&gt;next = NULL;</div><div class='del'>-			node-&gt;name = g_strdup (headers-&gt;name);</div><div class='del'>-			node-&gt;value = g_strdup (headers-&gt;value);</div><div class='del'>-			node-&gt;offset = headers-&gt;offset;</div><div class='del'>-			tail-&gt;next = node;</div><div class='del'>-			tail = node;</div><div class='del'>-			headers = headers-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Invalid state encountered???: %d", camel_mime_parser_state (http-&gt;parser));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	err = camel_mime_parser_errno (http-&gt;parser);</div><div class='del'>-	</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;parser));</div><div class='del'>-		http-&gt;parser = NULL;</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_mime_parser_drop_step (http-&gt;parser);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-	http-&gt;raw = NULL;</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-http_method_invoke (CamelHttpStream *http)</div><div class='del'>-{</div><div class='del'>-	const char *method = NULL;</div><div class='del'>-	char *url;</div><div class='del'>-	</div><div class='del'>-	switch (http-&gt;method) {</div><div class='del'>-	case CAMEL_HTTP_METHOD_GET:</div><div class='del'>-		method = "GET";</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_HTTP_METHOD_HEAD:</div><div class='del'>-		method = "HEAD";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	url = camel_url_to_string (http-&gt;url, 0);</div><div class='del'>-	if (camel_stream_printf (http-&gt;raw, "%s %s HTTP/1.0\r\nUser-Agent: %s\r\nHost: %s\r\n",</div><div class='del'>-				 method, http-&gt;user_agent ? http-&gt;user_agent : "CamelHttpStream/1.0",</div><div class='del'>-				 http-&gt;proxy ? url : http-&gt;url-&gt;path,</div><div class='del'>-				 http-&gt;url-&gt;host) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-		g_free (url);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free (url);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;authrealm &amp;&amp; camel_stream_printf (http-&gt;raw, "WWW-Authenticate: %s\r\n", http-&gt;authrealm) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;authpass &amp;&amp; http-&gt;proxy &amp;&amp; camel_stream_printf (http-&gt;raw, "Proxy-Authorization: Basic %s\r\n",</div><div class='del'>-								  http-&gt;authpass) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* end the headers */</div><div class='del'>-	if (camel_stream_write (http-&gt;raw, "\r\n", 2) == -1 || camel_stream_flush (http-&gt;raw) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = CAMEL_HTTP_STREAM (stream);</div><div class='del'>-	const char *parser_buf;</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;method != CAMEL_HTTP_METHOD_GET &amp;&amp; http-&gt;method != CAMEL_HTTP_METHOD_HEAD) {</div><div class='del'>-		errno = EIO;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>- redirect:</div><div class='del'>-	</div><div class='del'>-	if (!http-&gt;raw) {</div><div class='del'>-		http-&gt;raw = http_connect (http-&gt;service, http-&gt;proxy ? http-&gt;proxy : http-&gt;url);</div><div class='del'>-		if (!http-&gt;raw)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		if (http_method_invoke (http) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		if (http_get_statuscode (http) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		if (http_get_headers (http) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		switch (http-&gt;statuscode) {</div><div class='del'>-		case 200:</div><div class='del'>-		case 206:</div><div class='del'>-			/* we are OK to go... */</div><div class='del'>-			break;</div><div class='del'>-		case 301:</div><div class='del'>-		case 302:</div><div class='del'>-			/* redirect... */</div><div class='del'>-			camel_url_free (http-&gt;url);</div><div class='del'>-			http-&gt;url = camel_url_new (header_raw_find (&amp;http-&gt;headers, "Location", NULL), NULL);</div><div class='del'>-			</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (http-&gt;parser));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-			header_content_type_unref (http-&gt;content_type);</div><div class='del'>-			header_raw_clear (&amp;http-&gt;headers);</div><div class='del'>-			http-&gt;parser = NULL;</div><div class='del'>-			http-&gt;raw = NULL;</div><div class='del'>-			</div><div class='del'>-			goto redirect;</div><div class='del'>-			break;</div><div class='del'>-		case 407:</div><div class='del'>-			/* failed proxy authentication? */</div><div class='del'>-		default:</div><div class='del'>-			/* unknown error */</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (http-&gt;parser));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-			http-&gt;parser = NULL;</div><div class='del'>-			http-&gt;raw = NULL;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	nread = camel_mime_parser_read (http-&gt;parser, &amp;parser_buf, n);</div><div class='del'>-	</div><div class='del'>-	if (nread &gt; 0)</div><div class='del'>-		memcpy (buffer, parser_buf, nread);</div><div class='del'>-	</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = (CamelHttpStream *) stream;</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;raw)</div><div class='del'>-		return camel_stream_flush (http-&gt;raw);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = (CamelHttpStream *) stream;</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;raw) {</div><div class='del'>-		if (camel_stream_close (http-&gt;raw) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelHttpStream *http = CAMEL_HTTP_STREAM (stream);</div><div class='del'>-	</div><div class='del'>-	if (http-&gt;raw) {</div><div class='del'>-		camel_stream_close (http-&gt;raw);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (http-&gt;raw));</div><div class='del'>-		http-&gt;raw = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelContentType *</div><div class='del'>-camel_http_stream_get_content_type (CamelHttpStream *http_stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_HTTP_STREAM (http_stream), NULL);</div><div class='del'>-	</div><div class='del'>-	if (!http_stream-&gt;content_type &amp;&amp; !http_stream-&gt;raw) {</div><div class='del'>-		http_stream-&gt;raw = http_connect (http_stream-&gt;service, http_stream-&gt;url);</div><div class='del'>-		if (!http_stream-&gt;raw)</div><div class='del'>-			return NULL;</div><div class='del'>-		</div><div class='del'>-		if (http_method_invoke (http_stream) == -1)</div><div class='del'>-			return NULL;</div><div class='del'>-		</div><div class='del'>-		if (http_get_headers (http_stream) == -1)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (http_stream-&gt;content_type)</div><div class='del'>-		header_content_type_ref (http_stream-&gt;content_type);</div><div class='del'>-	</div><div class='del'>-	return http_stream-&gt;content_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_http_stream_set_user_agent (CamelHttpStream *http_stream, const char *user_agent)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));</div><div class='del'>-	</div><div class='del'>-	g_free (http_stream-&gt;user_agent);</div><div class='del'>-	http_stream-&gt;user_agent = g_strdup (user_agent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_http_stream_set_proxy (CamelHttpStream *http_stream, const char *proxy_url)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));</div><div class='del'>-	</div><div class='del'>-	if (http_stream-&gt;proxy)</div><div class='del'>-		camel_url_free (http_stream-&gt;proxy);</div><div class='del'>-	</div><div class='del'>-	http_stream-&gt;proxy = camel_url_new (proxy_url, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_http_stream_set_proxy_authrealm (CamelHttpStream *http_stream, const char *proxy_authrealm)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));</div><div class='del'>-	</div><div class='del'>-	g_free (http_stream-&gt;authrealm);</div><div class='del'>-	http_stream-&gt;authrealm = g_strdup (proxy_authrealm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_http_stream_set_proxy_authpass (CamelHttpStream *http_stream, const char *proxy_authpass)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_HTTP_STREAM (http_stream));</div><div class='del'>-	</div><div class='del'>-	g_free (http_stream-&gt;authpass);</div><div class='del'>-	http_stream-&gt;authpass = g_strdup (proxy_authpass);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h<br/>deleted file mode 100644<br/>index 40733662ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-http-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-http-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __CAMEL_HTTP_STREAM_H__</div><div class='del'>-#define __CAMEL_HTTP_STREAM_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-parser.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_HTTP_STREAM_TYPE     (camel_http_stream_get_type ())</div><div class='del'>-#define CAMEL_HTTP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_HTTP_STREAM_TYPE, CamelHttpStream))</div><div class='del'>-#define CAMEL_HTTP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_HTTP_STREAM_TYPE, CamelHttpStreamClass))</div><div class='del'>-#define CAMEL_IS_HTTP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_HTTP_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	/*CAMEL_HTTP_METHOD_OPTIONS,*/</div><div class='del'>-	CAMEL_HTTP_METHOD_GET,</div><div class='del'>-	CAMEL_HTTP_METHOD_HEAD,</div><div class='del'>-	/*CAMEL_HTTP_METHOD_POST,*/</div><div class='del'>-	/*CAMEL_HTTP_METHOD_PUT,*/</div><div class='del'>-	/*CAMEL_HTTP_METHOD_DELETE,*/</div><div class='del'>-	/*CAMEL_HTTP_METHOD_TRACE,*/</div><div class='del'>-	/*CAMEL_HTTP_METHOD_CONNECT*/</div><div class='del'>-} CamelHttpMethod;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelHttpStreamClass CamelHttpStreamClass;</div><div class='del'>-</div><div class='del'>-struct _CamelHttpStream {</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-	</div><div class='del'>-	CamelMimeParser *parser;</div><div class='del'>-	</div><div class='del'>-	CamelContentType *content_type;</div><div class='del'>-	struct _header_raw *headers;</div><div class='del'>-	</div><div class='del'>-	CamelHttpMethod method;</div><div class='del'>-	CamelService *service;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	</div><div class='del'>-	char *user_agent;</div><div class='del'>-	</div><div class='del'>-	/* proxy info */</div><div class='del'>-	CamelURL *proxy;</div><div class='del'>-	char *authrealm;</div><div class='del'>-	char *authpass;</div><div class='del'>-	</div><div class='del'>-	int statuscode;</div><div class='del'>-	</div><div class='del'>-	CamelStream *raw;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelHttpStreamClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_http_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_http_stream_new (CamelHttpMethod method, CamelService *service, CamelURL *url);</div><div class='del'>-</div><div class='del'>-void camel_http_stream_set_user_agent (CamelHttpStream *http_stream, const char *user_agent);</div><div class='del'>-</div><div class='del'>-void camel_http_stream_set_proxy (CamelHttpStream *http_stream, const char *proxy_url);</div><div class='del'>-void camel_http_stream_set_proxy_authrealm (CamelHttpStream *http_stream, const char *proxy_authrealm);</div><div class='del'>-void camel_http_stream_set_proxy_authpass (CamelHttpStream *http_stream, const char *proxy_authpass);</div><div class='del'>-</div><div class='del'>-CamelContentType *camel_http_stream_get_content_type (CamelHttpStream *http_stream);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __CAMEL_HTTP_STREAM_H__ */</div><div class='head'>diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c<br/>deleted file mode 100644<br/>index f1f4dd234d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-index-control.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-index-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,211 +0,0 @@</div><div class='del'>-</div><div class='del'>-/* Command to manually force a compression/dump of an index file */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-object.h"</div><div class='del'>-</div><div class='del'>-#include "camel-text-index.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_usage(char *argv0)</div><div class='del'>-{</div><div class='del'>-	fprintf(stderr, "Usage: %s [ compress | dump | info ] file(s) ...\n", argv0);</div><div class='del'>-	fprintf(stderr, " compress - compress (an) index file(s)\n");</div><div class='del'>-	fprintf(stderr, " dump - dump (an) index file's content to stdout\n");</div><div class='del'>-	fprintf(stderr, " info - dump summary info to stdout\n");</div><div class='del'>-	exit(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_compress(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-</div><div class='del'>-	for (i=2;i&lt;argc;i++) {</div><div class='del'>-		printf("Opening index file: %s\n", argv[i]);</div><div class='del'>-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDWR);</div><div class='del'>-		if (idx) {</div><div class='del'>-			printf(" Compressing ...\n");</div><div class='del'>-			if (camel_index_compress(idx) == -1) {</div><div class='del'>-				camel_object_unref((CamelObject *)idx);</div><div class='del'>-				return 1;</div><div class='del'>-			}</div><div class='del'>-			camel_object_unref((CamelObject *)idx);</div><div class='del'>-		} else {</div><div class='del'>-			printf(" Failed: %s\n", strerror(errno));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_dump(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-</div><div class='del'>-	for (i=2;i&lt;argc;i++) {</div><div class='del'>-		printf("Opening index file: %s\n", argv[i]);</div><div class='del'>-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);</div><div class='del'>-		if (idx) {</div><div class='del'>-			printf(" Dumping ...\n");</div><div class='del'>-			camel_text_index_dump(idx);</div><div class='del'>-			camel_object_unref((CamelObject *)idx);</div><div class='del'>-		} else {</div><div class='del'>-			printf(" Failed: %s\n", strerror(errno));</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_info(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-</div><div class='del'>-	for (i=2;i&lt;argc;i++) {</div><div class='del'>-		printf("Opening index file: %s\n", argv[i]);</div><div class='del'>-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);</div><div class='del'>-		if (idx) {</div><div class='del'>-			camel_text_index_info(idx);</div><div class='del'>-			camel_object_unref((CamelObject *)idx);</div><div class='del'>-		} else {</div><div class='del'>-			printf(" Failed: %s\n", strerror(errno));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_check(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-</div><div class='del'>-	for (i=2;i&lt;argc;i++) {</div><div class='del'>-		printf("Opening index file: %s\n", argv[i]);</div><div class='del'>-		idx = (CamelIndex *)camel_text_index_new(argv[i], O_RDONLY);</div><div class='del'>-		if (idx) {</div><div class='del'>-			camel_text_index_validate(idx);</div><div class='del'>-			camel_object_unref((CamelObject *)idx);</div><div class='del'>-		} else {</div><div class='del'>-			printf(" Failed: %s\n", strerror(errno));</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int do_perf(int argc, char **argv);</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (argc&lt;2)</div><div class='del'>-		do_usage(argv[0]);</div><div class='del'>-</div><div class='del'>-	g_thread_init(NULL);</div><div class='del'>-	camel_init(NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (!strcmp(argv[1], "compress"))</div><div class='del'>-		return do_compress(argc, argv);</div><div class='del'>-	else if (!strcmp(argv[1], "dump"))</div><div class='del'>-		return do_dump(argc, argv);</div><div class='del'>-	else if (!strcmp(argv[1], "info"))</div><div class='del'>-		return do_info(argc, argv);</div><div class='del'>-	else if (!strcmp(argv[1], "check"))</div><div class='del'>-		return do_check(argc, argv);</div><div class='del'>-	else if (!strcmp(argv[1], "perf"))</div><div class='del'>-		return do_perf(argc, argv);</div><div class='del'>-</div><div class='del'>-	do_usage(argv[0]);</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include "camel-stream-null.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-index.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_perf(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-	DIR *dir;</div><div class='del'>-	char *path = "/home/notzed/evolution/local/Inbox/mbox/cur";</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	CamelStream *null, *filter, *stream;</div><div class='del'>-	CamelMimeFilterIndex *filter_index;</div><div class='del'>-	char *name;</div><div class='del'>-	CamelIndexName *idn;</div><div class='del'>-</div><div class='del'>-	dir = opendir(path);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		perror("open dir");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	idx = (CamelIndex *)camel_text_index_new("/tmp/index", O_TRUNC|O_CREAT|O_RDWR);</div><div class='del'>-	if (idx == NULL) {</div><div class='del'>-		perror("open index");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	null = camel_stream_null_new();</div><div class='del'>-	filter = (CamelStream *)camel_stream_filter_new_with_stream(null);</div><div class='del'>-	camel_object_unref((CamelObject *)null);</div><div class='del'>-	filter_index = camel_mime_filter_index_new_index(idx);</div><div class='del'>-	camel_stream_filter_add((CamelStreamFilter *)filter, (CamelMimeFilter *)filter_index);</div><div class='del'>-</div><div class='del'>-	while ((d = readdir(dir))) {</div><div class='del'>-		printf("indexing '%s'\n", d-&gt;d_name);</div><div class='del'>-</div><div class='del'>-		idn = camel_index_add_name(idx, d-&gt;d_name);</div><div class='del'>-		camel_mime_filter_index_set_name(filter_index, idn);</div><div class='del'>-		name = g_strdup_printf("%s/%s", path, d-&gt;d_name);</div><div class='del'>-		stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0);</div><div class='del'>-		camel_stream_write_to_stream(stream, filter);</div><div class='del'>-		camel_object_unref((CamelObject *)stream);</div><div class='del'>-		g_free(name);</div><div class='del'>-</div><div class='del'>-		camel_index_write_name(idx, idn);</div><div class='del'>-		camel_object_unref((CamelObject *)idn);</div><div class='del'>-		camel_mime_filter_index_set_name(filter_index, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir(dir);</div><div class='del'>-</div><div class='del'>-	camel_index_sync(idx);</div><div class='del'>-	camel_object_unref((CamelObject *)idx);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)filter);</div><div class='del'>-	camel_object_unref((CamelObject *)filter_index);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-index.c b/camel/camel-index.c<br/>deleted file mode 100644<br/>index eb476b41fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-index.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,341 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-index.h"</div><div class='del'>-#include "camel/camel-object.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-#define io(x)</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_INDEX_VERSION (0x01)</div><div class='del'>-</div><div class='del'>-struct _CamelIndexPrivate {</div><div class='del'>-	void *dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelIndex *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-#define CI_CLASS(o) ((CamelIndexClass *)(((CamelObject *)o)-&gt;klass))</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelIndex */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_index_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_class_init(CamelIndexClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_index_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_init(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelIndexPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(idx) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	idx-&gt;version = CAMEL_INDEX_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_finalise(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	g_free(idx-&gt;path);</div><div class='del'>-	g_free(idx-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_index_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelIndex",</div><div class='del'>-					   sizeof (CamelIndex),</div><div class='del'>-					   sizeof (CamelIndexClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_index_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_index_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_index_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndex *</div><div class='del'>-camel_index_new(const char *path, int flags)</div><div class='del'>-{</div><div class='del'>-	CamelIndex *idx = (CamelIndex *)camel_object_new(camel_index_get_type());</div><div class='del'>-</div><div class='del'>-	camel_index_construct(idx, path, flags);</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_index_construct(CamelIndex *idx, const char *path, int flags)</div><div class='del'>-{</div><div class='del'>-	g_free(idx-&gt;path);</div><div class='del'>-	idx-&gt;path = g_strdup_printf("%s.index", path);</div><div class='del'>-	idx-&gt;flags = flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_index_rename(CamelIndex *idx, const char *path)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;rename(idx, path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_index_set_normalise(CamelIndex *idx, CamelIndexNorm func, void *data)</div><div class='del'>-{</div><div class='del'>-	idx-&gt;normalise = func;</div><div class='del'>-	idx-&gt;normalise_data = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_index_sync(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;sync(idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_index_compress(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;compress(idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_index_has_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;has_name(idx, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexName *</div><div class='del'>-camel_index_add_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;add_name(idx, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_index_write_name(CamelIndex *idx, CamelIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;write_name(idx, idn);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexCursor *</div><div class='del'>-camel_index_find_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;find_name(idx, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_index_delete_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;delete_name(idx, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexCursor *</div><div class='del'>-camel_index_find(CamelIndex *idx, const char *word)</div><div class='del'>-{</div><div class='del'>-	char *b = (char *)word;</div><div class='del'>-	CamelIndexCursor *ret;</div><div class='del'>-</div><div class='del'>-	if (idx-&gt;normalise)</div><div class='del'>-		b = idx-&gt;normalise(idx, word, idx-&gt;normalise_data);</div><div class='del'>-</div><div class='del'>-	ret = CI_CLASS(idx)-&gt;find(idx, b);</div><div class='del'>-</div><div class='del'>-	if (b != word)</div><div class='del'>-		g_free(b);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexCursor *</div><div class='del'>-camel_index_words(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;words(idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexCursor *</div><div class='del'>-camel_index_names(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	return CI_CLASS(idx)-&gt;names(idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelIndexName */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_index_name_parent;</div><div class='del'>-</div><div class='del'>-#define CIN_CLASS(o) ((CamelIndexNameClass *)(((CamelObject *)o)-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_name_class_init(CamelIndexNameClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_index_name_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_name_init(CamelIndexName *idn)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_name_finalise(CamelIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	if (idn-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)idn-&gt;index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_index_name_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelIndexName",</div><div class='del'>-					   sizeof (CamelIndexName),</div><div class='del'>-					   sizeof (CamelIndexNameClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_index_name_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_index_name_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_index_name_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexName *</div><div class='del'>-camel_index_name_new(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelIndexName *idn = (CamelIndexName *)camel_object_new(camel_index_name_get_type());</div><div class='del'>-</div><div class='del'>-	idn-&gt;index = idx;</div><div class='del'>-	camel_object_ref((CamelObject *)idx);</div><div class='del'>-</div><div class='del'>-	return idn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_index_name_add_word(CamelIndexName *idn, const char *word)</div><div class='del'>-{</div><div class='del'>-	char *b = (char *)word;</div><div class='del'>-</div><div class='del'>-	if (idn-&gt;index-&gt;normalise)</div><div class='del'>-		b = idn-&gt;index-&gt;normalise(idn-&gt;index, word, idn-&gt;index-&gt;normalise_data);</div><div class='del'>-</div><div class='del'>-	CIN_CLASS(idn)-&gt;add_word(idn, b);</div><div class='del'>-</div><div class='del'>-	if (b != word)</div><div class='del'>-		g_free(b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t</div><div class='del'>-camel_index_name_add_buffer(CamelIndexName *idn, const char *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	return CIN_CLASS(idn)-&gt;add_buffer(idn, buffer, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelIndexCursor */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_index_cursor_parent;</div><div class='del'>-</div><div class='del'>-#define CIC_CLASS(o) ((CamelIndexCursorClass *)(((CamelObject *)o)-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_cursor_class_init(CamelIndexCursorClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_index_cursor_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_cursor_init(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_index_cursor_finalise(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	if (idc-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)idc-&gt;index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_index_cursor_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelIndexCursor",</div><div class='del'>-					   sizeof (CamelIndexCursor),</div><div class='del'>-					   sizeof (CamelIndexCursorClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_index_cursor_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_index_cursor_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_index_cursor_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelIndexCursor *</div><div class='del'>-camel_index_cursor_new(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelIndexCursor *idc = (CamelIndexCursor *)camel_object_new(camel_index_cursor_get_type());</div><div class='del'>-</div><div class='del'>-	idc-&gt;index = idx;</div><div class='del'>-	camel_object_ref((CamelObject *)idx);</div><div class='del'>-</div><div class='del'>-	return idc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_index_cursor_next(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	return CIC_CLASS(idc)-&gt;next(idc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_index_cursor_reset(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	return CIC_CLASS(idc)-&gt;reset(idc);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-index.h b/camel/camel-index.h<br/>deleted file mode 100644<br/>index 81b84c3d38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-index.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-index.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,159 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_INDEX_H</div><div class='del'>-#define _CAMEL_INDEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_index_get_type (), CamelIndex)</div><div class='del'>-#define CAMEL_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_get_type (), CamelIndexClass)</div><div class='del'>-#define CAMEL_IS_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_index_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelIndex      CamelIndex;</div><div class='del'>-typedef struct _CamelIndexClass CamelIndexClass;</div><div class='del'>-</div><div class='del'>-#define CAMEL_INDEX_NAME(obj)         CAMEL_CHECK_CAST (obj, camel_index_name_get_type (), CamelIndexName)</div><div class='del'>-#define CAMEL_INDEX_NAME_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_name_get_type (), CamelIndexNameClass)</div><div class='del'>-#define CAMEL_IS_INDEX_NAME(obj)      CAMEL_CHECK_TYPE (obj, camel_index_name_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelIndexName      CamelIndexName;</div><div class='del'>-typedef struct _CamelIndexNameClass CamelIndexNameClass;</div><div class='del'>-</div><div class='del'>-#define CAMEL_INDEX_CURSOR(obj)         CAMEL_CHECK_CAST (obj, camel_index_cursor_get_type (), CamelIndexCursor)</div><div class='del'>-#define CAMEL_INDEX_CURSOR_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_cursor_get_type (), CamelIndexCursorClass)</div><div class='del'>-#define CAMEL_IS_INDEX_CURSOR(obj)      CAMEL_CHECK_TYPE (obj, camel_index_cursor_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelIndexCursor      CamelIndexCursor;</div><div class='del'>-typedef struct _CamelIndexCursorClass CamelIndexCursorClass;</div><div class='del'>-</div><div class='del'>-typedef char * (*CamelIndexNorm)(CamelIndex *idx, const char *word, void *data);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelIndexCursor {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelIndexCursorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelIndex *index;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelIndexCursorClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-</div><div class='del'>-	const char * (*next) (CamelIndexCursor *idc);</div><div class='del'>-	void         (*reset) (CamelIndexCursor *idc);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	           camel_index_cursor_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelIndexCursor  *camel_index_cursor_new(CamelIndex *idx, const char *name);</div><div class='del'>-</div><div class='del'>-const char        *camel_index_cursor_next(CamelIndexCursor *idc);</div><div class='del'>-void               camel_index_cursor_reset(CamelIndexCursor *idc);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelIndexName {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelIndexNamePrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelIndex *index;</div><div class='del'>-</div><div class='del'>-	char *name;		/* name being indexed */</div><div class='del'>-</div><div class='del'>-	GByteArray *buffer;	/* used for normalisation */</div><div class='del'>-	GHashTable *words;	/* unique list of words */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelIndexNameClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-</div><div class='del'>-	int (*sync)(CamelIndexName *name);</div><div class='del'>-	void (*add_word)(CamelIndexName *name, const char *word);</div><div class='del'>-	size_t (*add_buffer)(CamelIndexName *name, const char *buffer, size_t len);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	           camel_index_name_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelIndexName    *camel_index_name_new(CamelIndex *idx, const char *name);</div><div class='del'>-</div><div class='del'>-void               camel_index_name_add_word(CamelIndexName *name, const char *word);</div><div class='del'>-size_t             camel_index_name_add_buffer(CamelIndexName *name, const char *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelIndex {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelIndexPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *path;</div><div class='del'>-	guint32 version;</div><div class='del'>-	guint32 flags;</div><div class='del'>-</div><div class='del'>-	CamelIndexNorm normalise;</div><div class='del'>-	void *normalise_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelIndexClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	int			(*sync)(CamelIndex *idx);</div><div class='del'>-	int			(*compress)(CamelIndex *idx);</div><div class='del'>-</div><div class='del'>-	int			(*rename)(CamelIndex *idx, const char *path);</div><div class='del'>-</div><div class='del'>-	int 			(*has_name)(CamelIndex *idx, const char *name);</div><div class='del'>-	CamelIndexName *	(*add_name)(CamelIndex *idx, const char *name);</div><div class='del'>-	int			(*write_name)(CamelIndex *idx, CamelIndexName *idn);</div><div class='del'>-	CamelIndexCursor *	(*find_name)(CamelIndex *idx, const char *name);</div><div class='del'>-	void 			(*delete_name)(CamelIndex *idx, const char *name);</div><div class='del'>-	CamelIndexCursor * 	(*find)(CamelIndex *idx, const char *word);</div><div class='del'>-</div><div class='del'>-	CamelIndexCursor *      (*words)(CamelIndex *idx);</div><div class='del'>-	CamelIndexCursor *      (*names)(CamelIndex *idx);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	           camel_index_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelIndex        *camel_index_new(const char *path, int flags);</div><div class='del'>-void               camel_index_construct(CamelIndex *, const char *path, int flags);</div><div class='del'>-int		   camel_index_rename(CamelIndex *, const char *path);</div><div class='del'>-</div><div class='del'>-void               camel_index_set_normalise(CamelIndex *idx, CamelIndexNorm func, void *data);</div><div class='del'>-</div><div class='del'>-int                camel_index_sync(CamelIndex *idx);</div><div class='del'>-int                camel_index_compress(CamelIndex *idx);</div><div class='del'>-</div><div class='del'>-int                camel_index_has_name(CamelIndex *idx, const char *name);</div><div class='del'>-CamelIndexName    *camel_index_add_name(CamelIndex *idx, const char *name);</div><div class='del'>-int                camel_index_write_name(CamelIndex *idx, CamelIndexName *idn);</div><div class='del'>-CamelIndexCursor  *camel_index_find_name(CamelIndex *idx, const char *name);</div><div class='del'>-void               camel_index_delete_name(CamelIndex *idx, const char *name);</div><div class='del'>-CamelIndexCursor  *camel_index_find(CamelIndex *idx, const char *word);</div><div class='del'>-</div><div class='del'>-CamelIndexCursor  *camel_index_words(CamelIndex *idx);</div><div class='del'>-CamelIndexCursor  *camel_index_names(CamelIndex *idx);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_INDEX_H */</div><div class='head'>diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c<br/>deleted file mode 100644<br/>index 5b741c61ca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-internet-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,510 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-internet-address.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static int    internet_decode		(CamelAddress *, const char *raw);</div><div class='del'>-static char * internet_encode		(CamelAddress *);</div><div class='del'>-static int    internet_unformat		(CamelAddress *, const char *raw);</div><div class='del'>-static char * internet_format		(CamelAddress *);</div><div class='del'>-static int    internet_cat		(CamelAddress *dest, const CamelAddress *source);</div><div class='del'>-static void   internet_remove		(CamelAddress *, int index);</div><div class='del'>-</div><div class='del'>-static void camel_internet_address_class_init (CamelInternetAddressClass *klass);</div><div class='del'>-static void camel_internet_address_init       (CamelInternetAddress *obj);</div><div class='del'>-</div><div class='del'>-static CamelAddressClass *camel_internet_address_parent;</div><div class='del'>-</div><div class='del'>-struct _address {</div><div class='del'>-	char *name;</div><div class='del'>-	char *address;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_internet_address_class_init(CamelInternetAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelAddressClass *address = (CamelAddressClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_internet_address_parent = CAMEL_ADDRESS_CLASS(camel_type_get_global_classfuncs(camel_address_get_type()));</div><div class='del'>-</div><div class='del'>-	address-&gt;decode = internet_decode;</div><div class='del'>-	address-&gt;encode = internet_encode;</div><div class='del'>-	address-&gt;unformat = internet_unformat;</div><div class='del'>-	address-&gt;format = internet_format;</div><div class='del'>-	address-&gt;remove = internet_remove;</div><div class='del'>-	address-&gt;cat = internet_cat;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_internet_address_init(CamelInternetAddress *obj)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_internet_address_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_address_get_type(), "CamelInternetAddress",</div><div class='del'>-					   sizeof (CamelInternetAddress),</div><div class='del'>-					   sizeof (CamelInternetAddressClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_internet_address_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_internet_address_init,</div><div class='del'>-					   NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-internet_decode	(CamelAddress *a, const char *raw)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *ha, *n;</div><div class='del'>-	int count = a-&gt;addresses-&gt;len;</div><div class='del'>-</div><div class='del'>-	/* Should probably use its own decoder or something */</div><div class='del'>-	ha = header_address_decode(raw);</div><div class='del'>-	if (ha) {</div><div class='del'>-		n = ha;</div><div class='del'>-		while (n) {</div><div class='del'>-			if (n-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				camel_internet_address_add((CamelInternetAddress *)a, n-&gt;name, n-&gt;v.addr);</div><div class='del'>-			} else if (n-&gt;type == HEADER_ADDRESS_GROUP) {</div><div class='del'>-				struct _header_address *g = n-&gt;v.members;</div><div class='del'>-				while (g) {</div><div class='del'>-					if (g-&gt;type == HEADER_ADDRESS_NAME)</div><div class='del'>-						camel_internet_address_add((CamelInternetAddress *)a, g-&gt;name, g-&gt;v.addr);</div><div class='del'>-					/* otherwise, it's an error, infact */</div><div class='del'>-					g = g-&gt;next;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			n = n-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		header_address_list_clear(&amp;ha);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return a-&gt;addresses-&gt;len - count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-internet_encode	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-	int len = 6;		/* "From: ", assume longer of the address headers */</div><div class='del'>-</div><div class='del'>-	if (a-&gt;addresses-&gt;len == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	</div><div class='del'>-	for (i = 0;i &lt; a-&gt;addresses-&gt;len; i++) {</div><div class='del'>-		struct _address *addr = g_ptr_array_index(a-&gt;addresses, i);</div><div class='del'>-		char *enc;</div><div class='del'>-</div><div class='del'>-		if (i != 0)</div><div class='del'>-			g_string_append(out, ", ");</div><div class='del'>-</div><div class='del'>-		enc = camel_internet_address_encode_address(&amp;len, addr-&gt;name, addr-&gt;address);</div><div class='del'>-		g_string_append(out, enc);</div><div class='del'>-		g_free(enc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-internet_unformat(CamelAddress *a, const char *raw)</div><div class='del'>-{</div><div class='del'>-	char *buffer, *p, *name, *addr;</div><div class='del'>-	int c;</div><div class='del'>-	int count = a-&gt;addresses-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (raw == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	d(printf("unformatting address: %s\n", raw));</div><div class='del'>-</div><div class='del'>-	/* we copy, so we can modify as we go */</div><div class='del'>-	buffer = g_strdup(raw);</div><div class='del'>-</div><div class='del'>-	/* this can be simpler than decode, since there are much fewer rules */</div><div class='del'>-	p = buffer;</div><div class='del'>-	name = NULL;</div><div class='del'>-	addr = p;</div><div class='del'>-	do {</div><div class='del'>-		c = (unsigned char)*p++;</div><div class='del'>-		switch (c) {</div><div class='del'>-			/* removes quotes, they should only be around the total name anyway */</div><div class='del'>-		case '"':</div><div class='del'>-			p[-1] = ' ';</div><div class='del'>-			while (*p)</div><div class='del'>-				if (*p == '"') {</div><div class='del'>-					*p++ = ' ';</div><div class='del'>-					break;</div><div class='del'>-				} else {</div><div class='del'>-					p++;</div><div class='del'>-				}</div><div class='del'>-			break;</div><div class='del'>-		case '&lt;':</div><div class='del'>-			if (name == NULL)</div><div class='del'>-				name = addr;</div><div class='del'>-			addr = p;</div><div class='del'>-			addr[-1] = 0;</div><div class='del'>-			while (*p &amp;&amp; *p != '&gt;')</div><div class='del'>-				p++;</div><div class='del'>-			if (*p == 0)</div><div class='del'>-				break;</div><div class='del'>-			p++;</div><div class='del'>-			/* falls through */</div><div class='del'>-		case ',':</div><div class='del'>-			p[-1] = 0;</div><div class='del'>-			/* falls through */</div><div class='del'>-		case 0:</div><div class='del'>-			if (name)</div><div class='del'>-				name = g_strstrip(name);</div><div class='del'>-			addr = g_strstrip(addr);</div><div class='del'>-			if (addr[0]) {</div><div class='del'>-				d(printf("found address: '%s' &lt;%s&gt;\n", name, addr));</div><div class='del'>-				camel_internet_address_add((CamelInternetAddress *)a, name, addr);</div><div class='del'>-			}</div><div class='del'>-			name = NULL;</div><div class='del'>-			addr = p;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (c);</div><div class='del'>-</div><div class='del'>-	g_free(buffer);</div><div class='del'>-</div><div class='del'>-	return a-&gt;addresses-&gt;len - count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-internet_format	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-	</div><div class='del'>-	if (a-&gt;addresses-&gt;len == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	</div><div class='del'>-	for (i = 0;i &lt; a-&gt;addresses-&gt;len; i++) {</div><div class='del'>-		struct _address *addr = g_ptr_array_index(a-&gt;addresses, i);</div><div class='del'>-		char *enc;</div><div class='del'>-</div><div class='del'>-		if (i != 0)</div><div class='del'>-			g_string_append(out, ", ");</div><div class='del'>-</div><div class='del'>-		enc = camel_internet_address_format_address(addr-&gt;name, addr-&gt;address);</div><div class='del'>-		g_string_append(out, enc);</div><div class='del'>-		g_free(enc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-internet_cat (CamelAddress *dest, const CamelAddress *source)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_assert(CAMEL_IS_INTERNET_ADDRESS(source));</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;source-&gt;addresses-&gt;len;i++) {</div><div class='del'>-		struct _address *addr = g_ptr_array_index(source-&gt;addresses, i);</div><div class='del'>-		camel_internet_address_add((CamelInternetAddress *)dest, addr-&gt;name, addr-&gt;address);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-internet_remove	(CamelAddress *a, int index)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-	</div><div class='del'>-	if (index &lt; 0 || index &gt;= a-&gt;addresses-&gt;len)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	addr = g_ptr_array_index(a-&gt;addresses, index);</div><div class='del'>-	g_free(addr-&gt;name);</div><div class='del'>-	g_free(addr-&gt;address);</div><div class='del'>-	g_free(addr);</div><div class='del'>-	g_ptr_array_remove_index(a-&gt;addresses, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelInternetAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelInternetAddress object.</div><div class='del'>- **/</div><div class='del'>-CamelInternetAddress *</div><div class='del'>-camel_internet_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *new = CAMEL_INTERNET_ADDRESS(camel_object_new(camel_internet_address_get_type()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_add:</div><div class='del'>- * @a: internet address object</div><div class='del'>- * @name: </div><div class='del'>- * @address: </div><div class='del'>- * </div><div class='del'>- * Add a new internet address to the address object.</div><div class='del'>- * </div><div class='del'>- * Return value: Index of added entry.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_internet_address_add (CamelInternetAddress *a, const char *name, const char *address)</div><div class='del'>-{</div><div class='del'>-	struct _address *new;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	new = g_malloc(sizeof(*new));</div><div class='del'>-	new-&gt;name = g_strdup(name);</div><div class='del'>-	new-&gt;address = g_strdup(address);</div><div class='del'>-	index = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	g_ptr_array_add(((CamelAddress *)a)-&gt;addresses, new);</div><div class='del'>-</div><div class='del'>-	return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_get:</div><div class='del'>- * @a: internet address object</div><div class='del'>- * @index: address's array index</div><div class='del'>- * @namep: Holder for the returned name, or NULL, if not required.</div><div class='del'>- * @addressp: Holder for the returned address, or NULL, if not required.</div><div class='del'>- * </div><div class='del'>- * Get the address at @index.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if such an address exists, or FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_internet_address_get (const CamelInternetAddress *a, int index, const char **namep, const char **addressp)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-</div><div class='del'>-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	if (index &lt; 0 || index &gt;= ((CamelAddress *)a)-&gt;addresses-&gt;len)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	addr = g_ptr_array_index( ((CamelAddress *)a)-&gt;addresses, index);</div><div class='del'>-	if (namep)</div><div class='del'>-		*namep = addr-&gt;name;</div><div class='del'>-	if (addressp)</div><div class='del'>-		*addressp = addr-&gt;address;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_find_name:</div><div class='del'>- * @a: </div><div class='del'>- * @name: </div><div class='del'>- * @addressp: Holder for address part, or NULL, if not required.</div><div class='del'>- * </div><div class='del'>- * Find address by real name.</div><div class='del'>- * </div><div class='del'>- * Return value: The index of the address matching the name, or -1</div><div class='del'>- * if no match was found.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_internet_address_find_name(CamelInternetAddress *a, const char *name, const char **addressp)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	len = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		addr = g_ptr_array_index( ((CamelAddress *)a)-&gt;addresses, i );</div><div class='del'>-		if (!strcmp(addr-&gt;name, name)) {</div><div class='del'>-			if (addressp)</div><div class='del'>-				*addressp = addr-&gt;address;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_find_address:</div><div class='del'>- * @a: </div><div class='del'>- * @address: </div><div class='del'>- * @namep: Return for the matching name, or NULL, if not required.</div><div class='del'>- * </div><div class='del'>- * Find an address by address.</div><div class='del'>- * </div><div class='del'>- * Return value: The index of the address, or -1 if not found.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_internet_address_find_address(CamelInternetAddress *a, const char *address, const char **namep)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	g_assert(CAMEL_IS_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	len = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		addr = g_ptr_array_index( ((CamelAddress *)a)-&gt;addresses, i );</div><div class='del'>-		if (!strcmp(addr-&gt;address, address)) {</div><div class='del'>-			if (namep)</div><div class='del'>-				*namep = addr-&gt;name;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_encode_address:</div><div class='del'>- * @len: The encoded length so far, of this line</div><div class='del'>- * @name: </div><div class='del'>- * @addr: </div><div class='del'>- * </div><div class='del'>- * Encode a single address ready for internet usage.  Header folding</div><div class='del'>- * as per rfc 822 is also performed, based on the length in len.</div><div class='del'>- * </div><div class='del'>- * Return value: The encoded address.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_internet_address_encode_address(int *inlen, const char *real, const char *addr)</div><div class='del'>-{</div><div class='del'>-	char *name = header_encode_phrase(real);</div><div class='del'>-	char *ret = NULL, *addra = NULL;</div><div class='del'>-	int len = *inlen;</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-</div><div class='del'>-	g_assert(addr);</div><div class='del'>-</div><div class='del'>-	if (name &amp;&amp; name[0]) {</div><div class='del'>-		if (strlen(name) + len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-			char *folded = header_address_fold(name, len);</div><div class='del'>-			char *last;</div><div class='del'>-			g_string_append(out, folded);</div><div class='del'>-			g_free(folded);</div><div class='del'>-			last = strrchr(out-&gt;str, '\n');</div><div class='del'>-			if (last)</div><div class='del'>-				len = last-(out-&gt;str+out-&gt;len);</div><div class='del'>-			else</div><div class='del'>-				len = out-&gt;len;</div><div class='del'>-		} else {</div><div class='del'>-			g_string_append(out, name);</div><div class='del'>-			len += strlen(name);</div><div class='del'>-		}</div><div class='del'>-		addr = addra = g_strdup_printf(" &lt;%s&gt;", addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* NOTE: Strictly speaking, we could and should split the</div><div class='del'>-	 * internal address up if we need to, on atom or specials</div><div class='del'>-	 * boundaries - however, to aid interoperability with mailers</div><div class='del'>-	 * that will probably not handle this case, we will just move</div><div class='del'>-	 * the whole address to its own line */</div><div class='del'>-	if (strlen(addr) + len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-		g_string_append(out, "\n\t");</div><div class='del'>-		g_string_append(out, addr);</div><div class='del'>-		len = strlen(addr)+1;</div><div class='del'>-	} else {</div><div class='del'>-		g_string_append(out, addr);</div><div class='del'>-		len += strlen(addr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*inlen = len;</div><div class='del'>-#if 0</div><div class='del'>-	if (name &amp;&amp; name[0])</div><div class='del'>-		ret = g_strdup_printf("%s &lt;%s&gt;", name, addr);</div><div class='del'>-	else</div><div class='del'>-		ret = g_strdup_printf("%s", addr);</div><div class='del'>-#endif</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_free(addra);</div><div class='del'>-	</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_format_address:</div><div class='del'>- * @name: A name, quotes may be stripped from it.</div><div class='del'>- * @addr: Assumes a valid rfc822 email address.</div><div class='del'>- * </div><div class='del'>- * Function to format a single address, suitable for display.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_internet_address_format_address(const char *name, const char *addr)</div><div class='del'>-{</div><div class='del'>-	char *ret = NULL;</div><div class='del'>-</div><div class='del'>-	g_assert(addr);</div><div class='del'>-</div><div class='del'>-	if (name &amp;&amp; name[0]) {</div><div class='del'>-		const char *p = name;</div><div class='del'>-		char *o, c;</div><div class='del'>-</div><div class='del'>-		while ((c = *p++)) {</div><div class='del'>-			if (c == '\"' || c == ',') {</div><div class='del'>-				o = ret = g_malloc(strlen(name)+3+strlen(addr)+3 + 1);</div><div class='del'>-				p = name;</div><div class='del'>-				*o++ = '\"';</div><div class='del'>-				while ((c = *p++))</div><div class='del'>-					if (c != '\"')</div><div class='del'>-						*o++ = c;</div><div class='del'>-				*o++ = '\"';</div><div class='del'>-				sprintf(o, " &lt;%s&gt;", addr);</div><div class='del'>-				d(printf("encoded '%s' =&gt; '%s'\n", name, ret));</div><div class='del'>-				return ret;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		ret = g_strdup_printf("%s &lt;%s&gt;", name, addr);</div><div class='del'>-	} else</div><div class='del'>-		ret = g_strdup(addr);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h<br/>deleted file mode 100644<br/>index 9bfa0f44c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-internet-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_INTERNET_ADDRESS_H</div><div class='del'>-#define _CAMEL_INTERNET_ADDRESS_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-address.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_INTERNET_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)</div><div class='del'>-#define CAMEL_INTERNET_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass)</div><div class='del'>-#define CAMEL_IS_INTERNET_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_internet_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelInternetAddressClass CamelInternetAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelInternetAddress {</div><div class='del'>-	CamelAddress parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelInternetAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelInternetAddressClass {</div><div class='del'>-	CamelAddressClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_internet_address_get_type	(void);</div><div class='del'>-CamelInternetAddress   *camel_internet_address_new	(void);</div><div class='del'>-</div><div class='del'>-int			camel_internet_address_add	(CamelInternetAddress *, const char *, const char *);</div><div class='del'>-gboolean		camel_internet_address_get	(const CamelInternetAddress *, int, const char **, const char **);</div><div class='del'>-</div><div class='del'>-int			camel_internet_address_find_name(CamelInternetAddress *, const char *, const char **);</div><div class='del'>-int			camel_internet_address_find_address(CamelInternetAddress *, const char *, const char **);</div><div class='del'>-</div><div class='del'>-/* utility functions, for network/display formatting */</div><div class='del'>-char *			camel_internet_address_encode_address(int *len, const char *name, const char *addr);</div><div class='del'>-char *			camel_internet_address_format_address(const char *real, const char *addr);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_INTERNET_ADDRESS_H */</div><div class='head'>diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c<br/>deleted file mode 100644<br/>index fbbed82192..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-lock-helper.h"</div><div class='del'>-#include "camel-lock-client.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* dunno where this fucking thing is got from */</div><div class='del'>-/* see also camel-lock.c */</div><div class='del'>-#define _(x) (x)</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-static pthread_mutex_t lock_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#define LOCK() pthread_mutex_lock(&amp;lock_lock)</div><div class='del'>-#define UNLOCK() pthread_mutex_unlock(&amp;lock_lock)</div><div class='del'>-#else</div><div class='del'>-#define LOCK()</div><div class='del'>-#define UNLOCK()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int lock_sequence;</div><div class='del'>-static int lock_helper_pid = -1;</div><div class='del'>-static int lock_stdin_pipe[2], lock_stdout_pipe[2];</div><div class='del'>-</div><div class='del'>-static int read_n(int fd, void *buffer, int inlen)</div><div class='del'>-{</div><div class='del'>-	char *p = buffer;</div><div class='del'>-	int len, left = inlen;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = read(fd, p, left);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			if (errno != EINTR)</div><div class='del'>-				return -1;</div><div class='del'>-		} else {</div><div class='del'>-			left -= len;</div><div class='del'>-			p += len;</div><div class='del'>-		}</div><div class='del'>-	} while (left &gt; 0 &amp;&amp; len != 0);</div><div class='del'>-</div><div class='del'>-	return inlen - left;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_n(int fd, void *buffer, int inlen)</div><div class='del'>-{</div><div class='del'>-	char *p = buffer;</div><div class='del'>-	int len, left = inlen;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = write(fd, p, left);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			if (errno != EINTR)</div><div class='del'>-				return -1;</div><div class='del'>-		} else {</div><div class='del'>-			left -= len;</div><div class='del'>-			p += len;</div><div class='del'>-		}</div><div class='del'>-	} while (left &gt; 0);</div><div class='del'>-</div><div class='del'>-	return inlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int camel_lock_helper_init(CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (pipe(lock_stdin_pipe) == -1</div><div class='del'>-	    || pipe(lock_stdout_pipe) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot build locking helper pipe: %s"),</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lock_helper_pid = fork();</div><div class='del'>-	switch(lock_helper_pid) {</div><div class='del'>-	case -1:</div><div class='del'>-		close(lock_stdin_pipe[0]);</div><div class='del'>-		close(lock_stdin_pipe[1]);</div><div class='del'>-		close(lock_stdout_pipe[0]);</div><div class='del'>-		close(lock_stdout_pipe[1]);</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot fork locking helper: %s"),</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	case 0:</div><div class='del'>-		close(STDIN_FILENO);</div><div class='del'>-		dup(lock_stdin_pipe[0]);</div><div class='del'>-		close(STDOUT_FILENO);</div><div class='del'>-		dup(lock_stdout_pipe[1]);</div><div class='del'>-		close(lock_stdin_pipe[0]);</div><div class='del'>-		close(lock_stdin_pipe[1]);</div><div class='del'>-		close(lock_stdout_pipe[0]);</div><div class='del'>-		close(lock_stdout_pipe[1]);</div><div class='del'>-		for (i=3;i&lt;255;i++)</div><div class='del'>-			     close(i);</div><div class='del'>-		execl(CAMEL_SBINDIR "/camel-lock-helper", "camel-lock-helper", NULL);</div><div class='del'>-		d(fprintf(stderr, "shit, couldn't exec lock helper!\n"));</div><div class='del'>-		/* it'll pick this up when it tries to use us */</div><div class='del'>-		exit(255);</div><div class='del'>-	default:</div><div class='del'>-		close(lock_stdin_pipe[0]);</div><div class='del'>-		close(lock_stdout_pipe[1]);</div><div class='del'>-</div><div class='del'>-		/* so the child knows when we vanish */</div><div class='del'>-		fcntl(lock_stdin_pipe[1], F_SETFD, FD_CLOEXEC);</div><div class='del'>-		fcntl(lock_stdout_pipe[0], F_SETFD, FD_CLOEXEC);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_lock_helper_lock(const char *path, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelLockHelperMsg *msg;</div><div class='del'>-	int len = strlen(path);</div><div class='del'>-	int res = -1;</div><div class='del'>-	int retry = 3;</div><div class='del'>-</div><div class='del'>-	LOCK();</div><div class='del'>-</div><div class='del'>-	if (lock_helper_pid == -1) {</div><div class='del'>-		if (camel_lock_helper_init(ex) == -1) {</div><div class='del'>-			UNLOCK();</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg = alloca(len + sizeof(*msg));</div><div class='del'>-again:</div><div class='del'>-	msg-&gt;magic = CAMEL_LOCK_HELPER_MAGIC;</div><div class='del'>-	msg-&gt;seq = lock_sequence;</div><div class='del'>-	msg-&gt;id = CAMEL_LOCK_HELPER_LOCK;</div><div class='del'>-	msg-&gt;data = len;</div><div class='del'>-	memcpy(msg+1, path, len);</div><div class='del'>-</div><div class='del'>-	write_n(lock_stdin_pipe[1], msg, len+sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* should also have a timeout here?  cancellation? */</div><div class='del'>-		len = read_n(lock_stdout_pipe[0], msg, sizeof(*msg));</div><div class='del'>-		if (len == 0) {</div><div class='del'>-			/* child quit, do we try ressurect it? */</div><div class='del'>-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-			/* if the child exited, this should get it, waidpid returns 0 if the child hasn't */</div><div class='del'>-			if (waitpid(lock_helper_pid, NULL, WNOHANG) &gt; 0) {</div><div class='del'>-				lock_helper_pid = -1;</div><div class='del'>-				close(lock_stdout_pipe[0]);</div><div class='del'>-				close(lock_stdin_pipe[1]);</div><div class='del'>-				lock_stdout_pipe[0] = -1;</div><div class='del'>-				lock_stdin_pipe[1] = -1;</div><div class='del'>-			}</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (msg-&gt;magic != CAMEL_LOCK_HELPER_RETURN_MAGIC</div><div class='del'>-		    || msg-&gt;seq &gt; lock_sequence) {</div><div class='del'>-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-			d(printf("lock child protocol error\n"));</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not lock '%s': protocol error with lock-helper"), path);</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	} while (msg-&gt;seq &lt; lock_sequence);</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;seq == lock_sequence) {</div><div class='del'>-		switch(msg-&gt;id) {</div><div class='del'>-		case CAMEL_LOCK_HELPER_STATUS_OK:</div><div class='del'>-			d(printf("lock child locked ok, id is %d\n", msg-&gt;data));</div><div class='del'>-			res = msg-&gt;data;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not lock '%s'"), path);</div><div class='del'>-			d(printf("locking failed ! status = %d\n", msg-&gt;id));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (retry &gt; 0) {</div><div class='del'>-		d(printf("sequence failure, lost message? retry?\n"));</div><div class='del'>-		retry--;</div><div class='del'>-		goto again;</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not lock '%s': protocol error with lock-helper"), path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	lock_sequence++;</div><div class='del'>-</div><div class='del'>-	UNLOCK();</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_lock_helper_unlock(int lockid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelLockHelperMsg *msg;</div><div class='del'>-	int res = -1;</div><div class='del'>-	int retry = 3;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	d(printf("unlocking lock id %d\n", lockid));</div><div class='del'>-</div><div class='del'>-	LOCK();</div><div class='del'>-</div><div class='del'>-	/* impossible to unlock if we haven't locked yet */</div><div class='del'>-	if (lock_helper_pid == -1) {</div><div class='del'>-		UNLOCK();</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg = alloca(sizeof(*msg));</div><div class='del'>-again:</div><div class='del'>-	msg-&gt;magic = CAMEL_LOCK_HELPER_MAGIC;</div><div class='del'>-	msg-&gt;seq = lock_sequence;</div><div class='del'>-	msg-&gt;id = CAMEL_LOCK_HELPER_UNLOCK;</div><div class='del'>-	msg-&gt;data = lockid;</div><div class='del'>-</div><div class='del'>-	write_n(lock_stdin_pipe[1], msg, sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* should also have a timeout here?  cancellation? */</div><div class='del'>-		len = read_n(lock_stdout_pipe[0], msg, sizeof(*msg));</div><div class='del'>-		if (len == 0) {</div><div class='del'>-			/* child quit, do we try ressurect it? */</div><div class='del'>-			res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-			if (waitpid(lock_helper_pid, NULL, WNOHANG) &gt; 0) {</div><div class='del'>-				lock_helper_pid = -1;</div><div class='del'>-				close(lock_stdout_pipe[0]);</div><div class='del'>-				close(lock_stdin_pipe[1]);</div><div class='del'>-				lock_stdout_pipe[0] = -1;</div><div class='del'>-				lock_stdin_pipe[1] = -1;</div><div class='del'>-			}</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (msg-&gt;magic != CAMEL_LOCK_HELPER_RETURN_MAGIC</div><div class='del'>-		    || msg-&gt;seq &gt; lock_sequence) {</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	} while (msg-&gt;seq &lt; lock_sequence);</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;seq == lock_sequence) {</div><div class='del'>-		switch(msg-&gt;id) {</div><div class='del'>-		case CAMEL_LOCK_HELPER_STATUS_OK:</div><div class='del'>-			d(printf("lock child unlocked ok\n"));</div><div class='del'>-			res = 0;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			d(printf("locking failed ! \n"));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else if (retry &gt; 0) {</div><div class='del'>-		d(printf("sequence failure, lost message? retry?\n"));</div><div class='del'>-		lock_sequence++;</div><div class='del'>-		retry--;</div><div class='del'>-		goto again;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	lock_sequence++;</div><div class='del'>-</div><div class='del'>-	UNLOCK();</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int id1, id2;</div><div class='del'>-</div><div class='del'>-	d(printf("locking started\n"));</div><div class='del'>-	camel_lock_helper_init();</div><div class='del'>-</div><div class='del'>-	id1 = camel_lock_helper_lock("1 path 1");</div><div class='del'>-	if (id1 != -1) {</div><div class='del'>-		d(printf("lock ok, unlock\n"));</div><div class='del'>-		camel_lock_helper_unlock(id1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id1 = camel_lock_helper_lock("2 path 1");</div><div class='del'>-	id2 = camel_lock_helper_lock("2 path 2");</div><div class='del'>-	camel_lock_helper_unlock(id2);</div><div class='del'>-	camel_lock_helper_unlock(id1);</div><div class='del'>-</div><div class='del'>-	id1 = camel_lock_helper_lock("3 path 1");</div><div class='del'>-	id2 = camel_lock_helper_lock("3 path 2");</div><div class='del'>-	camel_lock_helper_unlock(id1);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h<br/>deleted file mode 100644<br/>index fc45e1d127..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock-client.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* defines protocol for lock helper process ipc */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_LOCK_CLIENT_H</div><div class='del'>-#define _CAMEL_LOCK_CLIENT_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-int camel_lock_helper_lock(const char *path , CamelException *ex);</div><div class='del'>-int camel_lock_helper_unlock(int lockid);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* !_CAMEL_LOCK_HELPER_H */</div><div class='head'>diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c<br/>deleted file mode 100644<br/>index 9e5dc012a3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock-helper.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock-helper.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,390 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* lock helper process */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;utime.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#define SETEUID_SAVES (1)</div><div class='del'>-</div><div class='del'>-/* we try and include as little as possible */</div><div class='del'>-</div><div class='del'>-#include "camel-lock-helper.h"</div><div class='del'>-#include "camel-lock.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* keeps track of open locks */</div><div class='del'>-struct _lock_info {</div><div class='del'>-	struct _lock_info *next;</div><div class='del'>-	uid_t uid;</div><div class='del'>-	int id;</div><div class='del'>-	int depth;</div><div class='del'>-	time_t stamp;		/* when last updated */</div><div class='del'>-	char path[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int lock_id = 0;</div><div class='del'>-static struct _lock_info *lock_info_list;</div><div class='del'>-static uid_t lock_root_uid = -1;</div><div class='del'>-static uid_t lock_real_uid = -1;</div><div class='del'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-</div><div class='del'>-static int read_n(int fd, void *buffer, int inlen)</div><div class='del'>-{</div><div class='del'>-	char *p = buffer;</div><div class='del'>-	int len, left = inlen;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = read(fd, p, left);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			if (errno != EINTR)</div><div class='del'>-				return -1;</div><div class='del'>-		} else {</div><div class='del'>-			left -= len;</div><div class='del'>-			p += len;</div><div class='del'>-		}</div><div class='del'>-	} while (left &gt; 0 &amp;&amp; len != 0);</div><div class='del'>-</div><div class='del'>-	return inlen - left;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int write_n(int fd, void *buffer, int inlen)</div><div class='del'>-{</div><div class='del'>-	char *p = buffer;</div><div class='del'>-	int len, left = inlen;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = write(fd, p, left);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			if (errno != EINTR)</div><div class='del'>-				return -1;</div><div class='del'>-		} else {</div><div class='del'>-			left -= len;</div><div class='del'>-			p += len;</div><div class='del'>-		}</div><div class='del'>-	} while (left &gt; 0);</div><div class='del'>-</div><div class='del'>-	return inlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_exception_setv (CamelException *ex, ExceptionId id, const char *format, ...)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_exception_clear (CamelException *exception)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *gettext (const char *msgid);</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-gettext (const char *msgid)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int lock_path(const char *path, guint32 *lockid)</div><div class='del'>-{</div><div class='del'>-	struct _lock_info *info = NULL;</div><div class='del'>-	int res = CAMEL_LOCK_HELPER_STATUS_OK;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "locking path '%s' id = %d\n", path, lock_id));</div><div class='del'>-</div><div class='del'>-	/* check to see if we have it locked already, make the lock 'recursive' */</div><div class='del'>-	/* we could also error i suppose, but why bother */</div><div class='del'>-	info = lock_info_list;</div><div class='del'>-	while (info) {</div><div class='del'>-		if (!strcmp(info-&gt;path, path)) {</div><div class='del'>-			info-&gt;depth++;</div><div class='del'>-			return CAMEL_LOCK_HELPER_STATUS_OK;</div><div class='del'>-		}</div><div class='del'>-		info = info-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check we are allowed to lock it, we must own it, be able to write to it, and it has to exist */</div><div class='del'>-	if (stat(path, &amp;st) == -1</div><div class='del'>-	    || st.st_uid != getuid()</div><div class='del'>-	    || !S_ISREG(st.st_mode)</div><div class='del'>-	    || (st.st_mode &amp; 0400) == 0) {</div><div class='del'>-		return CAMEL_LOCK_HELPER_STATUS_INVALID;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info = malloc(sizeof(*info) + strlen(path));</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		res = CAMEL_LOCK_HELPER_STATUS_NOMEM;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we try the real uid first, and if that fails, try the 'root id' */</div><div class='del'>-	if (camel_lock_dot(path, NULL) == -1) {</div><div class='del'>-#ifdef SETEUID_SAVES</div><div class='del'>-		if (lock_real_uid != lock_root_uid) {</div><div class='del'>-			if (seteuid(lock_root_uid) != -1) {</div><div class='del'>-				if (camel_lock_dot(path, NULL) == -1) {</div><div class='del'>-					seteuid(lock_real_uid);</div><div class='del'>-					res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;</div><div class='del'>-					goto fail;</div><div class='del'>-				}</div><div class='del'>-				seteuid(lock_real_uid);</div><div class='del'>-			} else {</div><div class='del'>-				res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-#else</div><div class='del'>-		res = CAMEL_LOCK_HELPER_STATUS_SYSTEM;</div><div class='del'>-		goto fail;</div><div class='del'>-#endif</div><div class='del'>-	} else {</div><div class='del'>-		info-&gt;uid = lock_real_uid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strcpy(info-&gt;path, path);</div><div class='del'>-	info-&gt;id = lock_id;</div><div class='del'>-	info-&gt;depth = 1;</div><div class='del'>-	info-&gt;next = lock_info_list;</div><div class='del'>-	info-&gt;stamp = time(0);</div><div class='del'>-	lock_info_list = info;</div><div class='del'>-</div><div class='del'>-	if (lockid)</div><div class='del'>-		*lockid = lock_id;</div><div class='del'>-</div><div class='del'>-	lock_id++;</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "lock ok\n"));</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-fail:</div><div class='del'>-	d(fprintf(stderr, "lock failed\n"));</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		free(info);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int unlock_id(guint32 lockid)</div><div class='del'>-{</div><div class='del'>-	struct _lock_info *info, *p;</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "unlocking id '%d'\n", lockid));</div><div class='del'>-</div><div class='del'>-	p = (struct _lock_info *)&amp;lock_info_list;</div><div class='del'>-	info = p-&gt;next;</div><div class='del'>-	while (info) {</div><div class='del'>-		if (info-&gt;id == lockid) {</div><div class='del'>-			d(fprintf(stderr, "found id %d path '%s'\n", lockid, info-&gt;path));</div><div class='del'>-			info-&gt;depth--;</div><div class='del'>-			if (info-&gt;depth &lt;= 0) {</div><div class='del'>-#ifdef SETEUID_SAVES</div><div class='del'>-				if (info-&gt;uid != lock_real_uid) {</div><div class='del'>-					seteuid(lock_root_uid);</div><div class='del'>-					camel_unlock_dot(info-&gt;path);</div><div class='del'>-					seteuid(lock_real_uid);</div><div class='del'>-				} else</div><div class='del'>-#endif</div><div class='del'>-					camel_unlock_dot(info-&gt;path);</div><div class='del'>-</div><div class='del'>-				p-&gt;next = info-&gt;next;</div><div class='del'>-				free(info);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			return CAMEL_LOCK_HELPER_STATUS_OK;</div><div class='del'>-		}</div><div class='del'>-		p = info;</div><div class='del'>-		info = info-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "unknown id asked to be unlocked %d\n", lockid));</div><div class='del'>-	return CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lock_touch(const char *path)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	/* we could also check that we haven't had our lock stolen from us here */</div><div class='del'>-</div><div class='del'>-	name = alloca(strlen(path) + 10);</div><div class='del'>-	sprintf(name, "%s.lock", path);</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "Updating lock %s\n", name));</div><div class='del'>-	utime(name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setup_process(void)</div><div class='del'>-{</div><div class='del'>-	struct sigaction sa;</div><div class='del'>-	sigset_t sigset;</div><div class='del'>-	</div><div class='del'>-	/* ignore sigint/sigio */</div><div class='del'>-	sa.sa_handler = SIG_IGN;</div><div class='del'>-	sigemptyset (&amp;sa.sa_mask);</div><div class='del'>-	sa.sa_flags = 0;</div><div class='del'>-	</div><div class='del'>-	sigemptyset(&amp;sigset);</div><div class='del'>-	sigaddset(&amp;sigset, SIGIO);</div><div class='del'>-	sigaddset(&amp;sigset, SIGINT);</div><div class='del'>-	sigprocmask(SIG_UNBLOCK, &amp;sigset, NULL);</div><div class='del'>-	</div><div class='del'>-	sigaction (SIGIO, &amp;sa, NULL);</div><div class='del'>-	sigaction (SIGINT, &amp;sa, NULL);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: add more sanity checks/setup here */</div><div class='del'>-</div><div class='del'>-#ifdef SETEUID_SAVES</div><div class='del'>-	/* here we change to the real user id, this is probably not particularly</div><div class='del'>-	   portable so may need configure checks */</div><div class='del'>-	lock_real_uid = getuid();</div><div class='del'>-	lock_root_uid = geteuid();</div><div class='del'>-	if (lock_real_uid != lock_root_uid)</div><div class='del'>-		seteuid(lock_real_uid);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	struct _CamelLockHelperMsg msg;</div><div class='del'>-	int len;</div><div class='del'>-	int res;</div><div class='del'>-	char *path;</div><div class='del'>-	fd_set rset;</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	struct _lock_info *info;</div><div class='del'>-</div><div class='del'>-	setup_process();</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* do a poll/etc, so we can refresh the .locks as required ... */</div><div class='del'>-		FD_ZERO(&amp;rset);</div><div class='del'>-		FD_SET(STDIN_FILENO, &amp;rset);</div><div class='del'>-</div><div class='del'>-		/* check the minimum timeout we need to refresh the next oldest lock */</div><div class='del'>-		if (lock_info_list) {</div><div class='del'>-			time_t now = time(0);</div><div class='del'>-			time_t left;</div><div class='del'>-			time_t delay = CAMEL_DOT_LOCK_REFRESH;</div><div class='del'>-</div><div class='del'>-			info = lock_info_list;</div><div class='del'>-			while (info) {</div><div class='del'>-				left = CAMEL_DOT_LOCK_REFRESH - (now - info-&gt;stamp);</div><div class='del'>-				left = MAX(left, 0);</div><div class='del'>-				delay = MIN(left, delay);</div><div class='del'>-				info = info-&gt;next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			tv.tv_sec = delay;</div><div class='del'>-			tv.tv_usec = 0;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		d(fprintf(stderr, "lock helper waiting for input\n"));</div><div class='del'>-		if (select(STDIN_FILENO+1, &amp;rset, NULL, NULL, lock_info_list?&amp;tv:NULL) == -1) {</div><div class='del'>-			if (errno == EINTR)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* did we get a timeout?  scan for any locks that need updating */</div><div class='del'>-		if (!FD_ISSET(STDIN_FILENO, &amp;rset)) {</div><div class='del'>-			time_t now = time(0);</div><div class='del'>-			time_t left;</div><div class='del'>-</div><div class='del'>-			d(fprintf(stderr, "Got a timeout, checking locks\n"));</div><div class='del'>-</div><div class='del'>-			info = lock_info_list;</div><div class='del'>-			while (info) {</div><div class='del'>-				left = (now - info-&gt;stamp);</div><div class='del'>-				if (left &gt;= CAMEL_DOT_LOCK_REFRESH) {</div><div class='del'>-					lock_touch(info-&gt;path);</div><div class='del'>-					info-&gt;stamp = now;</div><div class='del'>-				}</div><div class='del'>-				info = info-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		len = read_n(STDIN_FILENO, &amp;msg, sizeof(msg));</div><div class='del'>-		if (len == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-		if (len == sizeof(msg) &amp;&amp; msg.magic == CAMEL_LOCK_HELPER_MAGIC) {</div><div class='del'>-			switch(msg.id) {</div><div class='del'>-			case CAMEL_LOCK_HELPER_LOCK:</div><div class='del'>-				res = CAMEL_LOCK_HELPER_STATUS_NOMEM;</div><div class='del'>-				path = malloc(msg.data+1);</div><div class='del'>-				if (path != NULL) {</div><div class='del'>-					res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;</div><div class='del'>-					len = read_n(STDIN_FILENO, path, msg.data);</div><div class='del'>-					if (len == msg.data) {</div><div class='del'>-						path[len] = 0;</div><div class='del'>-						res = lock_path(path, &amp;msg.data);</div><div class='del'>-					}</div><div class='del'>-					free(path);</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case CAMEL_LOCK_HELPER_UNLOCK:</div><div class='del'>-				res = unlock_id(msg.data);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		d(fprintf(stderr, "returning result %d\n", res));</div><div class='del'>-		msg.id = res;</div><div class='del'>-		msg.magic = CAMEL_LOCK_HELPER_RETURN_MAGIC;</div><div class='del'>-		write_n(STDOUT_FILENO, &amp;msg, sizeof(msg));</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	d(fprintf(stderr, "parent exited, clsoing down remaining id's\n"));</div><div class='del'>-	while (lock_info_list)</div><div class='del'>-		unlock_id(lock_info_list-&gt;id);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h<br/>deleted file mode 100644<br/>index c61a097642..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock-helper.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock-helper.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian (www.ximian.com/).</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* defines protocol for lock helper process ipc */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_LOCK_HELPER_H</div><div class='del'>-#define _CAMEL_LOCK_HELPER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-struct _CamelLockHelperMsg {</div><div class='del'>-	guint32 magic;</div><div class='del'>-	guint32 seq;</div><div class='del'>-	guint32 id;</div><div class='del'>-	guint32 data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* magic values */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_LOCK_HELPER_MAGIC = 0xABADF00D,</div><div class='del'>-	CAMEL_LOCK_HELPER_RETURN_MAGIC = 0xDEADBEEF</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* return status */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_LOCK_HELPER_STATUS_OK = 0,</div><div class='del'>-	CAMEL_LOCK_HELPER_STATUS_PROTOCOL,</div><div class='del'>-	CAMEL_LOCK_HELPER_STATUS_NOMEM,</div><div class='del'>-	CAMEL_LOCK_HELPER_STATUS_SYSTEM,</div><div class='del'>-	CAMEL_LOCK_HELPER_STATUS_INVALID, /* not allowed to lock/doesn't exist etc */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* commands */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_LOCK_HELPER_LOCK = 0xf0f,</div><div class='del'>-	CAMEL_LOCK_HELPER_UNLOCK = 0xf0f0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* seconds between lock refreshes */</div><div class='del'>-#define CAMEL_DOT_LOCK_REFRESH (30)</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* !_CAMEL_LOCK_HELPER_H */</div><div class='head'>diff --git a/camel/camel-lock.c b/camel/camel-lock.c<br/>deleted file mode 100644<br/>index 8faae9f2aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,418 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian (www.ximian.com/).</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef USE_DOT</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef USE_FCNTL</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef USE_FLOCK</div><div class='del'>-#include &lt;sys/file.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-lock.h"</div><div class='del'>-</div><div class='del'>-/* dunno where this fucking thing is got from */</div><div class='del'>-#define _(x) (x)</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_lock_dot:</div><div class='del'>- * @path: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Create an exclusive lock using .lock semantics.</div><div class='del'>- * All locks are equivalent to write locks (exclusive).</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error, sets @ex appropriately.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_lock_dot(const char *path, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_DOT</div><div class='del'>-	char *locktmp, *lock;</div><div class='del'>-	int retry = 0;</div><div class='del'>-	int fdtmp;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	/* TODO: Is there a reliable way to refresh the lock, if we're still busy with it?</div><div class='del'>-	   Does it matter?  We will normally also use fcntl too ... */</div><div class='del'>-</div><div class='del'>-	/* use alloca, save cleaning up afterwards */</div><div class='del'>-	lock = alloca(strlen(path) + strlen(".lock") + 1);</div><div class='del'>-	sprintf(lock, "%s.lock", path);</div><div class='del'>-	locktmp = alloca(strlen(path) + strlen("XXXXXX") + 1);</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_MKSTEMP</div><div class='del'>-	sprintf(locktmp, "%sXXXXXX", path);</div><div class='del'>-	if (mktemp(locktmp) == NULL) {</div><div class='del'>-		/* well, this is really only a programatic error */</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	while (retry &lt; CAMEL_LOCK_DOT_RETRY) {</div><div class='del'>-</div><div class='del'>-		d(printf("trying to lock '%s', attempt %d\n", lock, retry));</div><div class='del'>-</div><div class='del'>-		if (retry &gt; 0)</div><div class='del'>-			sleep(CAMEL_LOCK_DOT_DELAY);</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_MKSTEMP</div><div class='del'>-		sprintf(locktmp, "%sXXXXXX", path);</div><div class='del'>-		fdtmp = mkstemp(locktmp);</div><div class='del'>-#else</div><div class='del'>-		fdtmp = open(locktmp, O_RDWR|O_CREAT|O_EXCL, 0600);</div><div class='del'>-#endif</div><div class='del'>-		if (fdtmp == -1) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create lock file for %s: %s"), path, strerror(errno));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		close(fdtmp);</div><div class='del'>-</div><div class='del'>-		/* apparently return code from link can be unreliable for nfs (see link(2)), so we ignore it */</div><div class='del'>-		link(locktmp, lock);</div><div class='del'>-</div><div class='del'>-		/* but we check stat instead (again, see link(2)) */</div><div class='del'>-		if (stat(locktmp, &amp;st) == -1) {</div><div class='del'>-			d(printf("Out lock file %s vanished!?\n", locktmp));</div><div class='del'>-</div><div class='del'>-			/* well that was unexpected, try cleanup/retry */</div><div class='del'>-			unlink(locktmp);</div><div class='del'>-			unlink(lock);</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("tmp lock created, link count is %d\n", st.st_nlink));</div><div class='del'>-</div><div class='del'>-			unlink(locktmp);</div><div class='del'>-</div><div class='del'>-			/* if we had 2 links, we have created the .lock, return ok, otherwise we need to keep trying */</div><div class='del'>-			if (st.st_nlink == 2)</div><div class='del'>-				return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* check for stale lock, kill it */</div><div class='del'>-		if (stat(lock, &amp;st) == 0) {</div><div class='del'>-			time_t now = time(0);</div><div class='del'>-			(printf("There is an existing lock %ld seconds old\n", now-st.st_ctime));</div><div class='del'>-			if (st.st_ctime &lt; now - CAMEL_LOCK_DOT_STALE) {</div><div class='del'>-				d(printf("Removing it now\n"));</div><div class='del'>-				unlink(lock);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retry++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("failed to get lock after %d retries\n", retry));</div><div class='del'>-</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Timed out trying to get lock file on %s. Try again later."), path);</div><div class='del'>-	return -1;</div><div class='del'>-#else /* ! USE_DOT */</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_unlock_dot:</div><div class='del'>- * @path: </div><div class='del'>- * </div><div class='del'>- * Attempt to unlock a .lock lock.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_unlock_dot(const char *path)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_DOT</div><div class='del'>-	char *lock;</div><div class='del'>-</div><div class='del'>-	lock = alloca(strlen(path) + strlen(".lock") + 1);</div><div class='del'>-	sprintf(lock, "%s.lock", path);</div><div class='del'>-	d(printf("unlocking %s\n", lock));</div><div class='del'>-	(void)unlink(lock);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_lock_fcntl:</div><div class='del'>- * @fd: </div><div class='del'>- * @type: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Create a lock using fcntl(2).</div><div class='del'>- *</div><div class='del'>- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,</div><div class='del'>- * to create exclusive or shared read locks</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_FCNTL</div><div class='del'>-	struct flock lock;</div><div class='del'>-</div><div class='del'>-	d(printf("fcntl locking %d\n", fd));</div><div class='del'>-</div><div class='del'>-	memset(&amp;lock, 0, sizeof(lock));</div><div class='del'>-	lock.l_type = type==CAMEL_LOCK_READ?F_RDLCK:F_WRLCK;</div><div class='del'>-	if (fcntl(fd, F_SETLK, &amp;lock) == -1) {</div><div class='del'>-		/* If we get a 'locking not vailable' type error,</div><div class='del'>-		   we assume the filesystem doesn't support fcntl() locking */</div><div class='del'>-		/* this is somewhat system-dependent */</div><div class='del'>-		if (errno != EINVAL &amp;&amp; errno != ENOLCK) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using fcntl(2): %s"),</div><div class='del'>-					     strerror(errno));</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			static int failed = 0;</div><div class='del'>-</div><div class='del'>-			if (failed == 0)</div><div class='del'>-				fprintf(stderr, "fcntl(2) locking appears not to work on this filesystem");</div><div class='del'>-			failed++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_unlock_fcntl:</div><div class='del'>- * @fd: </div><div class='del'>- * </div><div class='del'>- * Unlock an fcntl lock.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_unlock_fcntl(int fd)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_FCNTL</div><div class='del'>-	struct flock lock;</div><div class='del'>-</div><div class='del'>-	d(printf("fcntl unlocking %d\n", fd));</div><div class='del'>-</div><div class='del'>-	memset(&amp;lock, 0, sizeof(lock));</div><div class='del'>-	lock.l_type = F_UNLCK;</div><div class='del'>-	fcntl(fd, F_SETLK, &amp;lock);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_lock_flock:</div><div class='del'>- * @fd: </div><div class='del'>- * @type: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Create a lock using flock(2).</div><div class='del'>- * </div><div class='del'>- * @type is CAMEL_LOCK_WRITE or CAMEL_LOCK_READ,</div><div class='del'>- * to create exclusive or shared read locks</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_lock_flock(int fd, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_FLOCK</div><div class='del'>-	int op;</div><div class='del'>-</div><div class='del'>-	d(printf("flock locking %d\n", fd));</div><div class='del'>-</div><div class='del'>-	if (type == CAMEL_LOCK_READ)</div><div class='del'>-		op = LOCK_SH|LOCK_NB;</div><div class='del'>-	else</div><div class='del'>-		op = LOCK_EX|LOCK_NB;</div><div class='del'>-</div><div class='del'>-	if (flock(fd, op) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to get lock using flock(2): %s"), strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_unlock_flock:</div><div class='del'>- * @fd: </div><div class='del'>- * </div><div class='del'>- * Unlock an flock lock.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_unlock_flock(int fd)</div><div class='del'>-{</div><div class='del'>-#ifdef USE_FLOCK</div><div class='del'>-	d(printf("flock unlocking %d\n", fd));</div><div class='del'>-</div><div class='del'>-	(void)flock(fd, LOCK_UN);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_lock_folder:</div><div class='del'>- * @path: Path to the file to lock (used for .locking only).</div><div class='del'>- * @fd: Open file descriptor of the right type to lock.</div><div class='del'>- * @type: Type of lock, CAMEL_LOCK_READ or CAMEL_LOCK_WRITE.</div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Attempt to lock a folder, multiple attempts will be made using all</div><div class='del'>- * locking strategies available.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error, @ex will describe the locking system that failed.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retry = 0;</div><div class='del'>-</div><div class='del'>-	while (retry &lt; CAMEL_LOCK_RETRY) {</div><div class='del'>-		if (retry &gt; 0)</div><div class='del'>-			sleep(CAMEL_LOCK_DELAY);</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-		if (camel_lock_fcntl(fd, type, ex) == 0) {</div><div class='del'>-			if (camel_lock_flock(fd, type, ex) == 0) {</div><div class='del'>-				if (camel_lock_dot(path, ex) == 0)</div><div class='del'>-					return 0;</div><div class='del'>-				camel_unlock_flock(fd);</div><div class='del'>-			}</div><div class='del'>-			camel_unlock_fcntl(fd);</div><div class='del'>-		}</div><div class='del'>-		retry++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_unlock_folder:</div><div class='del'>- * @path: Filename of folder.</div><div class='del'>- * @fd: Open descrptor on which locks were placed.</div><div class='del'>- * </div><div class='del'>- * Free a lock on a folder.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_unlock_folder(const char *path, int fd)</div><div class='del'>-{</div><div class='del'>-	camel_unlock_dot(path);</div><div class='del'>-	camel_unlock_flock(fd);</div><div class='del'>-	camel_unlock_fcntl(fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int fd1, fd2;</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (camel_lock_dot("mylock", ex) == 0) {</div><div class='del'>-		if (camel_lock_dot("mylock", ex) == 0) {</div><div class='del'>-			printf("Got lock twice?\n");</div><div class='del'>-		} else {</div><div class='del'>-			printf("failed to get lock 2: %s\n", camel_exception_get_description(ex));</div><div class='del'>-		}</div><div class='del'>-		camel_unlock_dot("mylock");</div><div class='del'>-	} else {</div><div class='del'>-		printf("failed to get lock 1: %s\n", camel_exception_get_description(ex));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	fd1 = open("mylock", O_RDWR);</div><div class='del'>-	fd2 = open("mylock", O_RDWR);</div><div class='del'>-</div><div class='del'>-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_WRITE, ex) == 0) {</div><div class='del'>-		printf("got fcntl write lock once\n");</div><div class='del'>-		sleep(5);</div><div class='del'>-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {</div><div class='del'>-			printf("got fcntl write lock twice!\n");</div><div class='del'>-		} else {</div><div class='del'>-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {</div><div class='del'>-			printf("got fcntl read lock as well?\n");</div><div class='del'>-			camel_unlock_fcntl(fd2);</div><div class='del'>-		} else {</div><div class='del'>-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		camel_unlock_fcntl(fd1);</div><div class='del'>-	} else {</div><div class='del'>-		printf("failed to get write lock at all: %s\n", camel_exception_get_description(ex));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_lock_fcntl(fd1, CAMEL_LOCK_READ, ex) == 0) {</div><div class='del'>-		printf("got fcntl read lock once\n");</div><div class='del'>-		sleep(5);</div><div class='del'>-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_WRITE, ex) == 0) {</div><div class='del'>-			printf("got fcntl write lock too?!\n");</div><div class='del'>-		} else {</div><div class='del'>-			printf("failed to get write lock: %s\n", camel_exception_get_description(ex));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-		if (camel_lock_fcntl(fd2, CAMEL_LOCK_READ, ex) == 0) {</div><div class='del'>-			printf("got fcntl read lock twice\n");</div><div class='del'>-			camel_unlock_fcntl(fd2);</div><div class='del'>-		} else {</div><div class='del'>-			printf("failed to get read lock: %s\n", camel_exception_get_description(ex));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		camel_unlock_fcntl(fd1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close(fd1);</div><div class='del'>-	close(fd2);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-lock.h b/camel/camel-lock.h<br/>deleted file mode 100644<br/>index d54f7ed071..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-lock.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-lock.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian (www.ximian.com/).</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_LOCK_H</div><div class='del'>-#define _CAMEL_LOCK_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-/* for .lock locking, retry, delay and stale counts */</div><div class='del'>-#define CAMEL_LOCK_DOT_RETRY (5) /* number of times to retry lock */</div><div class='del'>-#define CAMEL_LOCK_DOT_DELAY (2) /* delay between locking retries */</div><div class='del'>-#define CAMEL_LOCK_DOT_STALE (60) /* seconds before a lock becomes stale */</div><div class='del'>-</div><div class='del'>-/* for locking folders, retry/interretry delay */</div><div class='del'>-#define CAMEL_LOCK_RETRY (5) /* number of times to retry lock */</div><div class='del'>-#define CAMEL_LOCK_DELAY (2) /* delay between locking retries */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_LOCK_READ,</div><div class='del'>-	CAMEL_LOCK_WRITE,</div><div class='del'>-} CamelLockType;</div><div class='del'>-</div><div class='del'>-/* specific locking strategies */</div><div class='del'>-int camel_lock_dot(const char *path, CamelException *ex);</div><div class='del'>-int camel_lock_fcntl(int fd, CamelLockType type, CamelException *ex);</div><div class='del'>-int camel_lock_flock(int fd, CamelLockType type, CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_unlock_dot(const char *path);</div><div class='del'>-void camel_unlock_fcntl(int fd);</div><div class='del'>-void camel_unlock_flock(int fd);</div><div class='del'>-</div><div class='del'>-/* lock a folder in a standard way */</div><div class='del'>-int camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex);</div><div class='del'>-void camel_unlock_folder(const char *path, int fd);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* !_CAMEL_LOCK_H */</div><div class='head'>diff --git a/camel/camel-medium.c b/camel/camel-medium.c<br/>deleted file mode 100644<br/>index 2537989639..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-medium.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,335 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* camelMedium.c : Abstract class for a medium</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- * 	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include "camel-medium.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelDataWrapperClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMedium */</div><div class='del'>-#define CM_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static gboolean is_offline (CamelDataWrapper *data_wrapper);</div><div class='del'>-static void add_header (CamelMedium *medium, const gchar *header_name,</div><div class='del'>-			const void *header_value);</div><div class='del'>-static void set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-static void remove_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-static const void *get_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-</div><div class='del'>-static GArray *get_headers (CamelMedium *medium);</div><div class='del'>-static void free_headers (CamelMedium *medium, GArray *headers);</div><div class='del'>-</div><div class='del'>-static CamelDataWrapper *get_content_object (CamelMedium *medium);</div><div class='del'>-static void set_content_object (CamelMedium *medium,</div><div class='del'>-				CamelDataWrapper *content);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_medium_class_init (CamelMediumClass *camel_medium_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class =</div><div class='del'>-		CAMEL_DATA_WRAPPER_CLASS (camel_medium_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_data_wrapper_class-&gt;is_offline = is_offline;</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_medium_class-&gt;add_header = add_header;</div><div class='del'>-	camel_medium_class-&gt;set_header = set_header;</div><div class='del'>-	camel_medium_class-&gt;remove_header = remove_header;</div><div class='del'>-	camel_medium_class-&gt;get_header = get_header;</div><div class='del'>-</div><div class='del'>-	camel_medium_class-&gt;get_headers = get_headers;</div><div class='del'>-	camel_medium_class-&gt;free_headers = free_headers;</div><div class='del'>-</div><div class='del'>-	camel_medium_class-&gt;set_content_object = set_content_object;</div><div class='del'>-	camel_medium_class-&gt;get_content_object = get_content_object;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_medium_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMedium *camel_medium = CAMEL_MEDIUM (object);</div><div class='del'>-</div><div class='del'>-	camel_medium-&gt;content = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_medium_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMedium *medium = CAMEL_MEDIUM (object);</div><div class='del'>-</div><div class='del'>-	if (medium-&gt;content)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_medium_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_medium_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_medium_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_medium_type = camel_type_register (CAMEL_DATA_WRAPPER_TYPE, "medium",</div><div class='del'>-							 sizeof (CamelMedium),</div><div class='del'>-							 sizeof (CamelMediumClass),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_medium_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 (CamelObjectInitFunc) camel_medium_init,</div><div class='del'>-							 (CamelObjectFinalizeFunc) camel_medium_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_medium_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_offline (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	return parent_class-&gt;is_offline (data_wrapper) ||</div><div class='del'>-		camel_data_wrapper_is_offline (CAMEL_MEDIUM (data_wrapper)-&gt;content);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_header (CamelMedium *medium, const gchar *header_name,</div><div class='del'>-	    const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::add_header implemented, adding %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_add_header:</div><div class='del'>- * @medium: a CamelMedium</div><div class='del'>- * @header_name: name of the header</div><div class='del'>- * @header_value: value of the header</div><div class='del'>- *</div><div class='del'>- * Adds a header to a medium.</div><div class='del'>- *</div><div class='del'>- * FIXME: Where does it add it? We need to be able to prepend and</div><div class='del'>- * append headers, and also be able to insert them relative to other</div><div class='del'>- * headers.   No we dont, order isn't important! Z</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (header_name != NULL);</div><div class='del'>-	g_return_if_fail (header_value != NULL);</div><div class='del'>-</div><div class='del'>-	CM_CLASS (medium)-&gt;add_header(medium, header_name, header_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::set_header implemented, setting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_set_header:</div><div class='del'>- * @medium: a CamelMedium</div><div class='del'>- * @header_name: name of the header</div><div class='del'>- * @header_value: value of the header</div><div class='del'>- *</div><div class='del'>- * Sets the value of a header.  Any other occurances of the header</div><div class='del'>- * will be removed.  Setting a %NULL header can be used to remove</div><div class='del'>- * the header also.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_set_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (header_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (header_value == NULL)</div><div class='del'>-		CM_CLASS(medium)-&gt;remove_header(medium, header_name);</div><div class='del'>-	else</div><div class='del'>-		CM_CLASS(medium)-&gt;set_header(medium, header_name, header_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_header(CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::remove_header implemented, removing %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_remove_header:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @header_name: the name of the header</div><div class='del'>- *</div><div class='del'>- * Removes the named header from the medium.  All occurances of the</div><div class='del'>- * header are removed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_remove_header(CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (header_name != NULL);</div><div class='del'>-</div><div class='del'>-	CM_CLASS(medium)-&gt;remove_header(medium, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-get_header(CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::get_header implemented, getting %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_get_header:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @header_name: the name of the header</div><div class='del'>- *</div><div class='del'>- * Returns the value of the named header in the medium, or %NULL if</div><div class='del'>- * it is unset. The caller should not modify or free the data.</div><div class='del'>- *</div><div class='del'>- * FIXME: What if the header occurs more than once?</div><div class='del'>- *</div><div class='del'>- * Return value: the value of the named header, or %NULL</div><div class='del'>- **/</div><div class='del'>-const void *</div><div class='del'>-camel_medium_get_header(CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);</div><div class='del'>-	g_return_val_if_fail (header_name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning No way to get multi-valued headers?</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return CM_CLASS (medium)-&gt;get_header (medium, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray *</div><div class='del'>-get_headers(CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::get_headers implemented", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_get_headers:</div><div class='del'>- * @medium: a medium</div><div class='del'>- *</div><div class='del'>- * Returns an array of all header name/value pairs (as</div><div class='del'>- * CamelMediumHeader structures). The values will be decoded</div><div class='del'>- * to UTF-8 for any headers that are recognized by Camel. The</div><div class='del'>- * caller should not modify the returned data.</div><div class='del'>- *</div><div class='del'>- * Return value: the array of headers, which must be freed with</div><div class='del'>- * camel_medium_free_headers().</div><div class='del'>- **/</div><div class='del'>-GArray *</div><div class='del'>-camel_medium_get_headers(CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);</div><div class='del'>-</div><div class='del'>-	return CM_CLASS (medium)-&gt;get_headers (medium);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_headers (CamelMedium *medium, GArray *headers)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::free_headers implemented", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_free_headers:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @headers: an array of headers returned from camel_medium_get_headers()</div><div class='del'>- *</div><div class='del'>- * Frees @headers</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_free_headers (CamelMedium *medium, GArray *headers)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (headers != NULL);</div><div class='del'>-</div><div class='del'>-	CM_CLASS (medium)-&gt;free_headers (medium, headers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelDataWrapper *</div><div class='del'>-get_content_object(CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	return medium-&gt;content;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_get_content_object:</div><div class='del'>- * @medium: a medium</div><div class='del'>- *</div><div class='del'>- * Returns a data wrapper that represents the content of the medium,</div><div class='del'>- * without its headers.</div><div class='del'>- *</div><div class='del'>- * Return value: the medium's content object.</div><div class='del'>- **/</div><div class='del'>-CamelDataWrapper *</div><div class='del'>-camel_medium_get_content_object (CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);</div><div class='del'>-</div><div class='del'>-	return CM_CLASS (medium)-&gt;get_content_object (medium);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_content_object (CamelMedium *medium, CamelDataWrapper *content)</div><div class='del'>-{</div><div class='del'>-	if (medium-&gt;content)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (content));</div><div class='del'>-	medium-&gt;content = content;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_set_content_object:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @content: a data wrapper representing the medium's content</div><div class='del'>- *</div><div class='del'>- * Sets the content of @medium to be @content.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_set_content_object (CamelMedium *medium,</div><div class='del'>-				 CamelDataWrapper *content)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (content));</div><div class='del'>-</div><div class='del'>-	CM_CLASS (medium)-&gt;set_content_object (medium, content);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-medium.h b/camel/camel-medium.h<br/>deleted file mode 100644<br/>index 26040b2a94..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-medium.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-medium.h : class for a medium object */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Authors:  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	     Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MEDIUM_H</div><div class='del'>-#define CAMEL_MEDIUM_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-data-wrapper.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MEDIUM_TYPE     (camel_medium_get_type ())</div><div class='del'>-#define CAMEL_MEDIUM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))</div><div class='del'>-#define CAMEL_MEDIUM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))</div><div class='del'>-#define CAMEL_IS_MEDIUM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	const char *value;</div><div class='del'>-} CamelMediumHeader;</div><div class='del'>-</div><div class='del'>-struct _CamelMedium</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper parent_object;</div><div class='del'>-</div><div class='del'>-	/* The content of the medium, as opposed to our parent</div><div class='del'>-	 * CamelDataWrapper, which wraps both the headers and the</div><div class='del'>-	 * content.</div><div class='del'>-	 */</div><div class='del'>-	CamelDataWrapper *content;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDataWrapperClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	void  (*add_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-	void  (*set_header) (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-	void  (*remove_header) (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-	const void * (*get_header) (CamelMedium *medium,  const gchar *header_name);</div><div class='del'>-</div><div class='del'>-	GArray * (*get_headers) (CamelMedium *medium);</div><div class='del'>-	void (*free_headers) (CamelMedium *medium, GArray *headers);</div><div class='del'>-</div><div class='del'>-	CamelDataWrapper * (*get_content_object) (CamelMedium *medium);</div><div class='del'>-	void (*set_content_object) (CamelMedium *medium, CamelDataWrapper *content);</div><div class='del'>-</div><div class='del'>-} CamelMediumClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_medium_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Header get/set interface */</div><div class='del'>-void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-void camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-void camel_medium_remove_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-const void *camel_medium_get_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-</div><div class='del'>-GArray *camel_medium_get_headers (CamelMedium *medium);</div><div class='del'>-void camel_medium_free_headers (CamelMedium *medium, GArray *headers);</div><div class='del'>-</div><div class='del'>-/* accessor methods */</div><div class='del'>-CamelDataWrapper *camel_medium_get_content_object (CamelMedium *medium);</div><div class='del'>-void camel_medium_set_content_object (CamelMedium *medium,</div><div class='del'>-				      CamelDataWrapper *content);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MEDIUM_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter-basic.c b/camel/camel-mime-filter-basic.c<br/>deleted file mode 100644<br/>index efb9b9818e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-basic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,291 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-basic.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-static void reset(CamelMimeFilter *mf);</div><div class='del'>-static void complete(CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		     size_t prespace, char **out, </div><div class='del'>-		     size_t *outlen, size_t *outprespace);</div><div class='del'>-static void filter(CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		   size_t prespace, char **out, </div><div class='del'>-		   size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass);</div><div class='del'>-static void camel_mime_filter_basic_init       (CamelMimeFilterBasic *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_basic_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_basic_parent = CAMEL_MIME_FILTER_CLASS(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_basic_init (CamelMimeFilterBasic *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;state = 0;</div><div class='del'>-	obj-&gt;save = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_basic_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBasic",</div><div class='del'>-					    sizeof (CamelMimeFilterBasic),</div><div class='del'>-					    sizeof (CamelMimeFilterBasicClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_basic_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_basic_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* should this 'flush' outstanding state/data bytes? */</div><div class='del'>-static void</div><div class='del'>-reset(CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;</div><div class='del'>-	</div><div class='del'>-	switch(f-&gt;type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		f-&gt;state = -1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		f-&gt;state = 0;</div><div class='del'>-	}</div><div class='del'>-	f-&gt;save = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;</div><div class='del'>-	size_t newlen;</div><div class='del'>-	</div><div class='del'>-	switch(f-&gt;type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:</div><div class='del'>-		/* wont go to more than 2x size (overly conservative) */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*2+6, FALSE);</div><div class='del'>-		newlen = base64_encode_close(in, len, TRUE, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len*2+6);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		/* *4 is definetly more than needed ... */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*4+4, FALSE);</div><div class='del'>-		newlen = quoted_encode_close(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len*4+4);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:</div><div class='del'>-		/* won't go to more than 2 * (x + 2) + 62 */</div><div class='del'>-		camel_mime_filter_set_size (mf, (len + 2) * 2 + 62, FALSE);</div><div class='del'>-		newlen = uuencode_close (in, len, mf-&gt;outbuf, f-&gt;uubuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert (newlen &lt;= (len + 2) * 2 + 62);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:</div><div class='del'>-		/* output can't possibly exceed the input size */</div><div class='del'>- 		camel_mime_filter_set_size(mf, len, FALSE);</div><div class='del'>-		newlen = base64_decode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:</div><div class='del'>-		/* output can't possibly exceed the input size, well unless its not really qp, then +2 max */</div><div class='del'>-		camel_mime_filter_set_size(mf, len+2, FALSE);</div><div class='del'>-		newlen = quoted_decode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len+2);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_DEC:</div><div class='del'>-		if ((f-&gt;state &amp; CAMEL_UUDECODE_STATE_BEGIN) &amp;&amp; !(f-&gt;state &amp; CAMEL_UUDECODE_STATE_END)) {</div><div class='del'>-			/* "begin &lt;mode&gt; &lt;filename&gt;\n" has been found, so we can now start decoding */</div><div class='del'>-			camel_mime_filter_set_size (mf, len + 3, FALSE);</div><div class='del'>-			newlen = uudecode_step (in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		} else {</div><div class='del'>-			newlen = 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("unknown type %d in CamelMimeFilterBasic", f-&gt;type);</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = mf-&gt;outbuf;</div><div class='del'>-	*outlen = newlen;</div><div class='del'>-	*outprespace = mf-&gt;outpre;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* here we do all of the basic mime filtering */</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;</div><div class='del'>-	size_t newlen;</div><div class='del'>-	</div><div class='del'>-	switch(f-&gt;type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:</div><div class='del'>-		/* wont go to more than 2x size (overly conservative) */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*2+6, FALSE);</div><div class='del'>-		newlen = base64_encode_step(in, len, TRUE, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len*2+6);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		/* *4 is overly conservative, but will do */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*4+4, FALSE);</div><div class='del'>-		newlen = quoted_encode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len*4+4);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:</div><div class='del'>-		/* won't go to more than 2 * (x + 2) + 62 */</div><div class='del'>-		camel_mime_filter_set_size (mf, (len + 2) * 2 + 62, FALSE);</div><div class='del'>-		newlen = uuencode_step (in, len, mf-&gt;outbuf, f-&gt;uubuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert (newlen &lt;= (len + 2) * 2 + 62);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:</div><div class='del'>-		/* output can't possibly exceed the input size */</div><div class='del'>-		camel_mime_filter_set_size(mf, len+3, FALSE);</div><div class='del'>-		newlen = base64_decode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len+3);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:</div><div class='del'>-		/* output can't possibly exceed the input size */</div><div class='del'>-		camel_mime_filter_set_size(mf, len + 2, FALSE);</div><div class='del'>-		newlen = quoted_decode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		g_assert(newlen &lt;= len + 2);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_DEC:</div><div class='del'>-		if (!(f-&gt;state &amp; CAMEL_UUDECODE_STATE_BEGIN)) {</div><div class='del'>-			register char *inptr, *inend;</div><div class='del'>-			size_t left;</div><div class='del'>-			</div><div class='del'>-			inptr = in;</div><div class='del'>-			inend = inptr + len;</div><div class='del'>-			</div><div class='del'>-			while (inptr &lt; inend) {</div><div class='del'>-				left = inend - inptr;</div><div class='del'>-				if (left &lt; 6) {</div><div class='del'>-					if (!strncmp (inptr, "begin ", left))</div><div class='del'>-						camel_mime_filter_backup (mf, inptr, left);</div><div class='del'>-					break;</div><div class='del'>-				} else if (!strncmp (inptr, "begin ", 6)) {</div><div class='del'>-					for (in = inptr; inptr &lt; inend &amp;&amp; *inptr != '\n'; inptr++);</div><div class='del'>-					if (inptr &lt; inend) {</div><div class='del'>-						inptr++;</div><div class='del'>-						f-&gt;state |= CAMEL_UUDECODE_STATE_BEGIN;</div><div class='del'>-						/* we can start uudecoding... */</div><div class='del'>-						in = inptr;</div><div class='del'>-						len = inend - in;</div><div class='del'>-					} else {</div><div class='del'>-						camel_mime_filter_backup (mf, in, left);</div><div class='del'>-					}</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* go to the next line */</div><div class='del'>-				for ( ; inptr &lt; inend &amp;&amp; *inptr != '\n'; inptr++);</div><div class='del'>-				</div><div class='del'>-				if (inptr &lt; inend)</div><div class='del'>-					inptr++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if ((f-&gt;state &amp; CAMEL_UUDECODE_STATE_BEGIN) &amp;&amp; !(f-&gt;state &amp; CAMEL_UUDECODE_STATE_END)) {</div><div class='del'>-			/* "begin &lt;mode&gt; &lt;filename&gt;\n" has been found, so we can now start decoding */</div><div class='del'>-			camel_mime_filter_set_size (mf, len + 3, FALSE);</div><div class='del'>-			newlen = uudecode_step (in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		} else {</div><div class='del'>-			newlen = 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("unknown type %d in CamelMimeFilterBasic", f-&gt;type);</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = mf-&gt;outbuf;</div><div class='del'>-	*outlen = newlen;</div><div class='del'>-	*outprespace = mf-&gt;outpre;</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_basic_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterBasic object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterBasic widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterBasic *</div><div class='del'>-camel_mime_filter_basic_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *new = CAMEL_MIME_FILTER_BASIC ( camel_object_new (camel_mime_filter_basic_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterBasic *</div><div class='del'>-camel_mime_filter_basic_new_type(CamelMimeFilterBasicType type)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *new;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_ENC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_UU_DEC:</div><div class='del'>-		new = camel_mime_filter_basic_new();</div><div class='del'>-		new-&gt;type = type;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid type of CamelMimeFilterBasic requested: %d", type);</div><div class='del'>-		new = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	camel_mime_filter_reset((CamelMimeFilter *)new);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h<br/>deleted file mode 100644<br/>index d07edee107..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-basic.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_BASIC_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_BASIC_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_BASIC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)</div><div class='del'>-#define CAMEL_MIME_FILTER_BASIC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_BASIC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_basic_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterBasicClass CamelMimeFilterBasicClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_BASE64_ENC = 1,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_BASE64_DEC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_QP_ENC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_QP_DEC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_UU_ENC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_UU_DEC,</div><div class='del'>-} CamelMimeFilterBasicType;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterBasic {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterBasicPrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelMimeFilterBasicType type;</div><div class='del'>-	</div><div class='del'>-	unsigned char uubuf[60];</div><div class='del'>-	int state;</div><div class='del'>-	int save;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterBasicClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_basic_get_type	(void);</div><div class='del'>-CamelMimeFilterBasic      *camel_mime_filter_basic_new	(void);</div><div class='del'>-CamelMimeFilterBasic      *camel_mime_filter_basic_new_type	(CamelMimeFilterBasicType type);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_BASIC_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c<br/>deleted file mode 100644<br/>index e53923344b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-bestenc.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-bestenc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,289 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-bestenc.h"</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass);</div><div class='del'>-static void camel_mime_filter_bestenc_init       (CamelMimeFilter *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_bestenc_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_bestenc_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBestenc",</div><div class='del'>-					    sizeof (CamelMimeFilterBestenc),</div><div class='del'>-					    sizeof (CamelMimeFilterBestencClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_bestenc_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_bestenc_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset(CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;</div><div class='del'>-</div><div class='del'>-	f-&gt;count0 = 0;</div><div class='del'>-	f-&gt;count8 = 0;</div><div class='del'>-	f-&gt;countline = 0;</div><div class='del'>-	f-&gt;total = 0;</div><div class='del'>-	f-&gt;lastc = ~0;</div><div class='del'>-	f-&gt;crlfnoorder = FALSE;</div><div class='del'>-	f-&gt;fromcount = 0;</div><div class='del'>-	f-&gt;hadfrom = FALSE;</div><div class='del'>-	f-&gt;startofline = TRUE;</div><div class='del'>-</div><div class='del'>-	camel_charset_init(&amp;f-&gt;charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;</div><div class='del'>-	register unsigned char *p, *pend;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		goto donothing;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;flags &amp; CAMEL_BESTENC_GET_ENCODING) {</div><div class='del'>-		register unsigned int /* hopefully reg's are assinged in the order they appear? */</div><div class='del'>-			c,</div><div class='del'>-			lastc=f-&gt;lastc, </div><div class='del'>-			countline=f-&gt;countline,</div><div class='del'>-			count0=f-&gt;count0,</div><div class='del'>-			count8 = f-&gt;count8;</div><div class='del'>-</div><div class='del'>-		/* Check ^From  lines first call, or have the start of a new line waiting? */</div><div class='del'>-		if ((f-&gt;flags &amp; CAMEL_BESTENC_NO_FROM) &amp;&amp; !f-&gt;hadfrom</div><div class='del'>-		    &amp;&amp; (f-&gt;fromcount &gt; 0 || f-&gt;startofline)) {</div><div class='del'>-			if (f-&gt;fromcount + len &gt;=5) {</div><div class='del'>-				memcpy(&amp;f-&gt;fromsave[f-&gt;fromcount], in, 5-f-&gt;fromcount);</div><div class='del'>-				f-&gt;hadfrom = strncmp(f-&gt;fromsave, "From ", 5) == 0;</div><div class='del'>-				f-&gt;fromcount = 0;</div><div class='del'>-			} else {</div><div class='del'>-				memcpy(&amp;f-&gt;fromsave[f-&gt;fromcount], in, len);</div><div class='del'>-				f-&gt;fromcount += len;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		f-&gt;startofline = FALSE;</div><div class='del'>-</div><div class='del'>-		/* See rfc2045 section 2 for definitions of 7bit/8bit/binary */</div><div class='del'>-		p = in;</div><div class='del'>-		pend = p + len;</div><div class='del'>-		while (p&lt;pend) {</div><div class='del'>-			c = *p++;</div><div class='del'>-			/* check for 8 bit characters */</div><div class='del'>-			if (c &amp; 0x80)</div><div class='del'>-				count8++;</div><div class='del'>-</div><div class='del'>-			/* check for nul's */</div><div class='del'>-			if (c == 0)</div><div class='del'>-				count0++;</div><div class='del'>-</div><div class='del'>-			/* check for wild '\r's in a unix format stream */</div><div class='del'>-			if (c == '\r' &amp;&amp; (f-&gt;flags &amp; CAMEL_BESTENC_LF_IS_CRLF)) {</div><div class='del'>-				f-&gt;crlfnoorder = TRUE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* check for end of line */</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				/* check for wild '\n's in canonical format stream */</div><div class='del'>-				if (lastc == '\r' || (f-&gt;flags &amp; CAMEL_BESTENC_LF_IS_CRLF)) {</div><div class='del'>-					if (countline &gt; f-&gt;maxline)</div><div class='del'>-						f-&gt;maxline = countline;</div><div class='del'>-					countline = 0;</div><div class='del'>-</div><div class='del'>-					/* Check for "^From " lines */</div><div class='del'>-					if ((f-&gt;flags &amp; CAMEL_BESTENC_NO_FROM) &amp;&amp; !f-&gt;hadfrom) {</div><div class='del'>-						if (pend-p &gt;= 5) {</div><div class='del'>-							f-&gt;hadfrom = strncmp(p, "From ", 5) == 0;</div><div class='del'>-						} else if (pend-p == 0) {</div><div class='del'>-							f-&gt;startofline = TRUE;</div><div class='del'>-						} else {</div><div class='del'>-							f-&gt;fromcount = pend-p;</div><div class='del'>-							memcpy(f-&gt;fromsave, p, pend-p);</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					f-&gt;crlfnoorder = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				countline++;</div><div class='del'>-			}</div><div class='del'>-			lastc = c;</div><div class='del'>-		}</div><div class='del'>-		f-&gt;count8 = count8;</div><div class='del'>-		f-&gt;count0 = count0;</div><div class='del'>-		f-&gt;countline = countline;</div><div class='del'>-		f-&gt;lastc = lastc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f-&gt;total += len;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;flags &amp; CAMEL_BESTENC_GET_CHARSET)</div><div class='del'>-		camel_charset_step(&amp;f-&gt;charset, in, len);</div><div class='del'>-</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBestenc *f = (CamelMimeFilterBestenc *)mf;</div><div class='del'>-</div><div class='del'>-	filter(mf, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;countline &gt; f-&gt;maxline)</div><div class='del'>-		f-&gt;maxline = f-&gt;countline;</div><div class='del'>-	f-&gt;countline = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_bestenc_class_init (CamelMimeFilterBestencClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_mime_filter_bestenc_parent = (CamelMimeFilterClass *)(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_bestenc_init (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	reset(f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_bestenc_new:</div><div class='del'>- * @flags: A bitmask of data required.</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterBestenc object. </div><div class='del'>- * </div><div class='del'>- * Return value:</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterBestenc *</div><div class='del'>-camel_mime_filter_bestenc_new (unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBestenc *new = (CamelMimeFilterBestenc *)camel_object_new(camel_mime_filter_bestenc_get_type());</div><div class='del'>-	new-&gt;flags = flags;</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_bestenc_get_best_encoding:</div><div class='del'>- * @f: </div><div class='del'>- * @required: maximum level of output encoding allowed.</div><div class='del'>- * </div><div class='del'>- * Return the best encoding, given specific constraints, that can be used to</div><div class='del'>- * encode a stream of bytes.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelMimePartEncodingType</div><div class='del'>-camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required)</div><div class='del'>-{</div><div class='del'>-	CamelMimePartEncodingType bestenc;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	printf("count0 = %d, count8 = %d, total = %d\n", f-&gt;count0, f-&gt;count8, f-&gt;total);</div><div class='del'>-	printf("maxline = %d, crlfnoorder = %s\n", f-&gt;maxline, f-&gt;crlfnoorder?"TRUE":"FALSE");</div><div class='del'>-	printf(" %d%% require encoding?\n", (f-&gt;count0+f-&gt;count8)*100 / f-&gt;total);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* if we're not allowed to have From lines and we had one, use an encoding</div><div class='del'>-	   that will never let it show.  Unfortunately only base64 can at present,</div><div class='del'>-	   although qp could be modified to allow it too */</div><div class='del'>-	if ((f-&gt;flags &amp; CAMEL_BESTENC_NO_FROM) &amp;&amp; f-&gt;hadfrom)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-</div><div class='del'>-	/* if we need to encode, see how we do it */</div><div class='del'>-	if (required == CAMEL_BESTENC_BINARY)</div><div class='del'>-		bestenc = CAMEL_MIME_PART_ENCODING_BINARY;</div><div class='del'>-	else if (f-&gt;count8 + f-&gt;count0 &gt;= (f-&gt;total*17/100))</div><div class='del'>-		bestenc = CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-	else</div><div class='del'>-		bestenc = CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	</div><div class='del'>-	/* if we have nocrlf order, or long lines, we need to encode always */</div><div class='del'>-	if (f-&gt;crlfnoorder || f-&gt;maxline &gt;= 998)</div><div class='del'>-		return bestenc;</div><div class='del'>-</div><div class='del'>-	/* if we have no 8 bit chars or nul's, we can just use 7 bit */</div><div class='del'>-	if (f-&gt;count8 + f-&gt;count0 == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_7BIT;</div><div class='del'>-</div><div class='del'>-	/* otherwise, we see if we can use 8 bit, or not */</div><div class='del'>-	switch(required) {</div><div class='del'>-	case CAMEL_BESTENC_7BIT:</div><div class='del'>-		return bestenc;</div><div class='del'>-	case CAMEL_BESTENC_8BIT:</div><div class='del'>-	case CAMEL_BESTENC_BINARY:</div><div class='del'>-		if (f-&gt;count0 == 0)</div><div class='del'>-			return CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-		else</div><div class='del'>-			return bestenc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_bestenc_get_best_charset:</div><div class='del'>- * @f: </div><div class='del'>- * </div><div class='del'>- * Gets the best charset that can be used to contain this content.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f)</div><div class='del'>-{</div><div class='del'>-	return camel_charset_best_name(&amp;f-&gt;charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_bestenc_set_flags:</div><div class='del'>- * @f: </div><div class='del'>- * @flags: </div><div class='del'>- * </div><div class='del'>- * Set the flags for subsequent operations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	f-&gt;flags = flags;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h<br/>deleted file mode 100644<br/>index 3d2e79fa55..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-bestenc.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-bestenc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_BESTENC_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_BESTENC_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-#include &lt;camel/camel-charset-map.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_BESTENC(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestenc)</div><div class='del'>-#define CAMEL_MIME_FILTER_BESTENC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestencClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_BESTENC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_bestenc_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterBestencClass CamelMimeFilterBestencClass;</div><div class='del'>-</div><div class='del'>-enum _CamelBestencRequired {</div><div class='del'>-	CAMEL_BESTENC_GET_ENCODING = 1&lt;&lt;0,</div><div class='del'>-	CAMEL_BESTENC_GET_CHARSET = 1&lt;&lt;1,</div><div class='del'>-</div><div class='del'>-	/* do we treat 'lf' as if it were crlf? */</div><div class='del'>-	CAMEL_BESTENC_LF_IS_CRLF = 1&lt;&lt;8,</div><div class='del'>-	/* do we not allow "From " to appear at the start of a line in any part? */</div><div class='del'>-	CAMEL_BESTENC_NO_FROM = 1&lt;&lt;9,</div><div class='del'>-};</div><div class='del'>-typedef enum _CamelBestencRequired CamelBestencRequired;</div><div class='del'>-</div><div class='del'>-enum _CamelBestencEncoding {</div><div class='del'>-	CAMEL_BESTENC_7BIT,</div><div class='del'>-	CAMEL_BESTENC_8BIT,</div><div class='del'>-	CAMEL_BESTENC_BINARY,</div><div class='del'>-};</div><div class='del'>-typedef enum _CamelBestencEncoding CamelBestencEncoding;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterBestenc {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	unsigned int flags;	/* our creation flags, see above */</div><div class='del'>-</div><div class='del'>-	unsigned int count0;	/* count of NUL characters */</div><div class='del'>-	unsigned int count8;	/* count of 8 bit characters */</div><div class='del'>-	unsigned int total;	/* total characters read */</div><div class='del'>-</div><div class='del'>-	unsigned int lastc;	/* the last character read */</div><div class='del'>-	int crlfnoorder;	/* if crlf's occured where they shouldn't have */</div><div class='del'>-</div><div class='del'>-	int startofline;	/* are we at the start of a new line? */</div><div class='del'>-</div><div class='del'>-	int fromcount;</div><div class='del'>-	char fromsave[6];	/* save a few characters if we found an \nF near the end of the buffer */</div><div class='del'>-	int hadfrom;		/* did we encounter a "\nFrom " in the data? */</div><div class='del'>-</div><div class='del'>-	unsigned int countline;	/* current count of characters on a given line */</div><div class='del'>-	unsigned int maxline;	/* max length of any line */</div><div class='del'>-</div><div class='del'>-	CamelCharset charset;	/* used to determine the best charset to use */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterBestencClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_bestenc_get_type	(void);</div><div class='del'>-CamelMimeFilterBestenc      *camel_mime_filter_bestenc_new	(unsigned int flags);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimePartEncodingType	camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *f, CamelBestencEncoding required);</div><div class='del'>-const char *		camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *f);</div><div class='del'>-void 			camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *f, unsigned int flags);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c<br/>deleted file mode 100644<br/>index f30047c96a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-charset.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,251 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass);</div><div class='del'>-static void camel_mime_filter_charset_init       (CamelMimeFilterCharset *obj);</div><div class='del'>-static void camel_mime_filter_charset_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_charset_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_charset_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterCharset",</div><div class='del'>-					    sizeof (CamelMimeFilterCharset),</div><div class='del'>-					    sizeof (CamelMimeFilterCharsetClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_charset_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_charset_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_charset_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_charset_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)o;</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;from);</div><div class='del'>-	g_free(f-&gt;to);</div><div class='del'>-	if (f-&gt;ic != (iconv_t)-1) {</div><div class='del'>-		e_iconv_close(f-&gt;ic);</div><div class='del'>-		f-&gt;ic = (iconv_t) -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset(CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;</div><div class='del'>-	char buf[16];</div><div class='del'>-	char *buffer;</div><div class='del'>-	size_t outlen = 16;</div><div class='del'>-</div><div class='del'>-	/* what happens with the output bytes if this resets the state? */</div><div class='del'>-	if (f-&gt;ic != (iconv_t) -1) {</div><div class='del'>-		buffer = buf;</div><div class='del'>-		e_iconv(f-&gt;ic, NULL, 0, &amp;buffer, &amp;outlen);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;</div><div class='del'>-	size_t converted, inlen, outlen;</div><div class='del'>-	const char *inbuf;</div><div class='del'>-	char *outbuf;</div><div class='del'>-	</div><div class='del'>-	if (f-&gt;ic == (iconv_t) -1) {</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: there's probably a safer way to size this ...? */</div><div class='del'>-	/* We could always resize if we run out of room in outbuf (but it'd be nice not</div><div class='del'>-	   to have to) */</div><div class='del'>-	camel_mime_filter_set_size(mf, len*5+16, FALSE);</div><div class='del'>-	inbuf = in;</div><div class='del'>-	inlen = len;</div><div class='del'>-	outbuf = mf-&gt;outbuf;</div><div class='del'>-	outlen = mf-&gt;outsize;</div><div class='del'>-</div><div class='del'>-	/* temporary fix to find another bug somewhere */</div><div class='del'>-	d(memset(outbuf, 0, outlen));</div><div class='del'>-</div><div class='del'>-	if (inlen&gt;0) {</div><div class='del'>-		converted = e_iconv(f-&gt;ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-		if (converted == (size_t) -1) {</div><div class='del'>-			if (errno != EINVAL) {</div><div class='del'>-				g_warning("error occured converting: %s", strerror(errno));</div><div class='del'>-				goto donothing;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (inlen&gt;0) {</div><div class='del'>-			g_warning("Output lost in character conversion, invalid sequence encountered?");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this 'resets' the output stream, returning back to the initial</div><div class='del'>-	   shift state for multishift charactersets */</div><div class='del'>-	converted = e_iconv(f-&gt;ic, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-	if (converted == (size_t) -1) {</div><div class='del'>-		g_warning("Conversion failed to complete: %s", strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* debugging assertion - check for NUL's in output */</div><div class='del'>-	d({</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		for (i=0;i&lt;(mf-&gt;outsize - outlen);i++) {</div><div class='del'>-			g_assert(mf-&gt;outbuf[i]);</div><div class='del'>-		}</div><div class='del'>-	});</div><div class='del'>-</div><div class='del'>-	*out = mf-&gt;outbuf;</div><div class='del'>-	*outlenptr = mf-&gt;outsize - outlen;</div><div class='del'>-	*outprespace = mf-&gt;outpre;</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlenptr = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;</div><div class='del'>-	size_t converted, inlen, outlen;</div><div class='del'>-	const char *inbuf;</div><div class='del'>-	char *outbuf;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;ic == (iconv_t) -1) {</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: there's probably a safer way to size this ...? */</div><div class='del'>-	camel_mime_filter_set_size(mf, len*5+16, FALSE);</div><div class='del'>-	inbuf = in;</div><div class='del'>-	inlen = len;</div><div class='del'>-	outbuf = mf-&gt;outbuf;</div><div class='del'>-	outlen = mf-&gt;outsize;</div><div class='del'>-	converted = e_iconv(f-&gt;ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-	if (converted == (size_t) -1) {</div><div class='del'>-		if (errno != EINVAL) {</div><div class='del'>-			g_warning("error occured converting: %s", strerror(errno));</div><div class='del'>-			goto donothing;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	  NOTE: This assumes EINVAL only occurs because we ran out of</div><div class='del'>-	  bytes for a multibyte sequence, if not, we're in trouble.</div><div class='del'>-	*/</div><div class='del'>-</div><div class='del'>-	/* This is to fix a bug in at least 1 version of glibc iconv: we get EINVAL and</div><div class='del'>-	   it reads past the input and returns a converted length of -1 ... so discard</div><div class='del'>-	   any overruns as failed */</div><div class='del'>-	if (((int)inlen) &lt; 0)</div><div class='del'>-		inlen = 0;</div><div class='del'>-</div><div class='del'>-	if (inlen&gt;0) {</div><div class='del'>-		camel_mime_filter_backup(mf, inbuf, inlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*out = mf-&gt;outbuf;</div><div class='del'>-	*outlenptr = mf-&gt;outsize - outlen;</div><div class='del'>-	*outprespace = mf-&gt;outpre;</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlenptr = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_charset_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;ic = (iconv_t)-1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_charset_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterCharset object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterCharset widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterCharset *</div><div class='del'>-camel_mime_filter_charset_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterCharset *</div><div class='del'>-camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_charset)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ()));</div><div class='del'>-	</div><div class='del'>-	new-&gt;ic = e_iconv_open (to_charset, from_charset);</div><div class='del'>-	if (new-&gt;ic == (iconv_t) -1) {</div><div class='del'>-		g_warning("Cannot create charset conversion from %s to %s: %s", from_charset, to_charset, strerror(errno));</div><div class='del'>-		camel_object_unref ((CamelObject *)new);</div><div class='del'>-		new = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		new-&gt;from = g_strdup (from_charset);</div><div class='del'>-		new-&gt;to = g_strdup (to_charset);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h<br/>deleted file mode 100644<br/>index ddc3025eb0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-charset.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_CHARSET_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_CHARSET_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_CHARSET(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)</div><div class='del'>-#define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_CHARSET(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_charset_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterCharsetClass CamelMimeFilterCharsetClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCharset {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterCharsetPrivate *priv;</div><div class='del'>-</div><div class='del'>-	iconv_t ic;</div><div class='del'>-	char *from;</div><div class='del'>-	char *to;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCharsetClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_charset_get_type	(void);</div><div class='del'>-CamelMimeFilterCharset      *camel_mime_filter_charset_new	(void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilterCharset      *camel_mime_filter_charset_new_convert	(const char *from_charset, const char *to_charset);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-chomp.c b/camel/camel-mime-filter-chomp.c<br/>deleted file mode 100644<br/>index 6083b6dfe7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-chomp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-chomp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-chomp.h"</div><div class='del'>-</div><div class='del'>-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-		    char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-static void complete (CamelMimeFilter *f, char *in, size_t len,</div><div class='del'>-		      size_t prespace, char **out, size_t *outlen,</div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-static void reset (CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_chomp_class_init (CamelMimeFilterChompClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *mime_filter_class =</div><div class='del'>-		(CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	mime_filter_class-&gt;filter = filter;</div><div class='del'>-	mime_filter_class-&gt;complete = complete;</div><div class='del'>-	mime_filter_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_chomp_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterChomp",</div><div class='del'>-					    sizeof (CamelMimeFilterChomp),</div><div class='del'>-					    sizeof (CamelMimeFilterChompClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_chomp_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *s;</div><div class='del'>-	const unsigned char *inend;</div><div class='del'>-	register char *outptr;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_set_size (f, len + prespace, FALSE);</div><div class='del'>-	</div><div class='del'>-	inend = in + len;</div><div class='del'>-	inptr = in;</div><div class='del'>-	</div><div class='del'>-	outptr = f-&gt;outbuf;</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		s = inptr;</div><div class='del'>-		while (inptr &lt; inend &amp;&amp; isspace ((int) *inptr))</div><div class='del'>-			inptr++;</div><div class='del'>-		</div><div class='del'>-		if (inptr &lt; inend) {</div><div class='del'>-			while (s &lt; inptr)</div><div class='del'>-				*outptr++ = (char) *s++;</div><div class='del'>-			</div><div class='del'>-			while (inptr &lt; inend &amp;&amp; !isspace ((int) *inptr))</div><div class='del'>-				*outptr++ = (char) *inptr++;</div><div class='del'>-		} else {</div><div class='del'>-#if 0</div><div class='del'>-			if ((inend - s) &gt;= 2 &amp;&amp; *s == '\r' &amp;&amp; *(s + 1) == '\n')</div><div class='del'>-				*outptr++ = *s++;</div><div class='del'>-			if (*s == '\n')</div><div class='del'>-				*outptr++ = *s++;</div><div class='del'>-#endif		</div><div class='del'>-			if (s &lt; inend)</div><div class='del'>-				camel_mime_filter_backup (f, s, inend - s);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*out = f-&gt;outbuf;</div><div class='del'>-	*outlen = outptr - f-&gt;outbuf;</div><div class='del'>-	*outprespace = f-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	  char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	unsigned char *inptr;</div><div class='del'>-	char *outptr;</div><div class='del'>-	</div><div class='del'>-	if (len)</div><div class='del'>-		filter (f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-	</div><div class='del'>-	if (f-&gt;backlen) {</div><div class='del'>-		inptr = (unsigned char *) f-&gt;backbuf;</div><div class='del'>-		outptr = f-&gt;outbuf + *outlen;</div><div class='del'>-		</div><div class='del'>-		/* in the case of a canonical eoln */</div><div class='del'>-		if (*inptr == '\r' &amp;&amp; *(inptr + 1) == '\n') {</div><div class='del'>-			*outptr++ = (char) *inptr++;</div><div class='del'>-			(*outlen)++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*inptr == '\n') {</div><div class='del'>-			*outptr++ = (char) *inptr++;</div><div class='del'>-			(*outlen)++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* to protect against further complete calls */</div><div class='del'>-		camel_mime_filter_backup (f, "", 0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_chomp_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterChomp *chomp = CAMEL_MIME_FILTER_CHOMP (camel_object_new (CAMEL_MIME_FILTER_CHOMP_TYPE));</div><div class='del'>-	</div><div class='del'>-	return (CamelMimeFilter *) chomp;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-chomp.h b/camel/camel-mime-filter-chomp.h<br/>deleted file mode 100644<br/>index 6e0081a475..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-chomp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-chomp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2002 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_CHOMP_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_CHOMP_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_CHOMP_TYPE         (camel_mime_filter_chomp_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER_CHOMP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CHOMP_TYPE, CamelMimeFilterChomp)</div><div class='del'>-#define CAMEL_MIME_FILTER_CHOMP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CHOMP_TYPE, CamelMimeFilterChompClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_CHOMP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CHOMP_TYPE)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterChompClass CamelMimeFilterChompClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterChomp {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterChompClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_chomp_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_chomp_new (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_CHOMP_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-crlf.c b/camel/camel-mime-filter-crlf.c<br/>deleted file mode 100644<br/>index 57378bbc24..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-crlf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-</div><div class='del'>-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-		    char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-static void complete (CamelMimeFilter *f, char *in, size_t len,</div><div class='del'>-		      size_t prespace, char **out, size_t *outlen,</div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-static void reset (CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_crlf_class_init (CamelMimeFilterCRLFClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *mime_filter_class =</div><div class='del'>-		(CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	mime_filter_class-&gt;filter = filter;</div><div class='del'>-	mime_filter_class-&gt;complete = complete;</div><div class='del'>-	mime_filter_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_crlf_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterCRLF",</div><div class='del'>-					    sizeof (CamelMimeFilterCRLF),</div><div class='del'>-					    sizeof (CamelMimeFilterCRLFClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_crlf_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;</div><div class='del'>-	gboolean do_dots;</div><div class='del'>-	char *p, *q;</div><div class='del'>-	</div><div class='del'>-	do_dots = crlf-&gt;mode == CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS;</div><div class='del'>-	</div><div class='del'>-	if (crlf-&gt;direction == CAMEL_MIME_FILTER_CRLF_ENCODE) {</div><div class='del'>-		camel_mime_filter_set_size (f, 3 * len, FALSE);</div><div class='del'>-		</div><div class='del'>-		p = in;</div><div class='del'>-		q = f-&gt;outbuf;</div><div class='del'>-		while (p &lt; in + len) {</div><div class='del'>-			if (*p == '\n') {</div><div class='del'>-				crlf-&gt;saw_lf = TRUE;</div><div class='del'>-				*q++ = '\r';</div><div class='del'>-			} else {</div><div class='del'>-				if (do_dots &amp;&amp; *p == '.' &amp;&amp; crlf-&gt;saw_lf)</div><div class='del'>-					*q++ = '.';</div><div class='del'>-				</div><div class='del'>-				crlf-&gt;saw_lf = FALSE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			*q++ = *p++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		camel_mime_filter_set_size (f, len, FALSE);</div><div class='del'>-		</div><div class='del'>-		p = in;</div><div class='del'>-		q = f-&gt;outbuf;</div><div class='del'>-		while (p &lt; in + len) {</div><div class='del'>-			if (*p == '\r') {</div><div class='del'>-				crlf-&gt;saw_cr = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				if (crlf-&gt;saw_cr) {</div><div class='del'>-					crlf-&gt;saw_cr = FALSE;</div><div class='del'>-					</div><div class='del'>-					if (*p == '\n') {</div><div class='del'>-						crlf-&gt;saw_lf = TRUE;</div><div class='del'>-						*q++ = *p++;</div><div class='del'>-						continue;</div><div class='del'>-					} else</div><div class='del'>-						*q++ = '\r';</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				*q++ = *p;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (do_dots &amp;&amp; *p == '.') {</div><div class='del'>-				if (crlf-&gt;saw_lf) {</div><div class='del'>-					crlf-&gt;saw_dot = TRUE;</div><div class='del'>-					crlf-&gt;saw_lf = FALSE;</div><div class='del'>-					p++;</div><div class='del'>-				} else if (crlf-&gt;saw_dot) {</div><div class='del'>-					crlf-&gt;saw_dot = FALSE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			crlf-&gt;saw_lf = FALSE;</div><div class='del'>-			</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*out = f-&gt;outbuf;</div><div class='del'>-	*outlen = q - f-&gt;outbuf;</div><div class='del'>-	*outprespace = f-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	  char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (len)</div><div class='del'>-		filter (f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;</div><div class='del'>-</div><div class='del'>-	crlf-&gt;saw_cr = FALSE;</div><div class='del'>-	crlf-&gt;saw_lf = TRUE;</div><div class='del'>-	crlf-&gt;saw_dot = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCRLF *crlf = CAMEL_MIME_FILTER_CRLF(camel_object_new (CAMEL_MIME_FILTER_CRLF_TYPE));</div><div class='del'>-</div><div class='del'>-	crlf-&gt;direction = direction;</div><div class='del'>-	crlf-&gt;mode = mode;</div><div class='del'>-	crlf-&gt;saw_cr = FALSE;</div><div class='del'>-	crlf-&gt;saw_lf = TRUE;</div><div class='del'>-	crlf-&gt;saw_dot = FALSE;</div><div class='del'>-</div><div class='del'>-	return (CamelMimeFilter *)crlf;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h<br/>deleted file mode 100644<br/>index 1e3526d600..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-crlf.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_CRLF_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_CRLF_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_CRLF_TYPE         (camel_mime_filter_crlf_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER_CRLF(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLF)</div><div class='del'>-#define CAMEL_MIME_FILTER_CRLF_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_CRLF(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CRLF_TYPE)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterCRLFClass CamelMimeFilterCRLFClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_DECODE</div><div class='del'>-} CamelMimeFilterCRLFDirection;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS,</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY,</div><div class='del'>-} CamelMimeFilterCRLFMode;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCRLF {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	CamelMimeFilterCRLFDirection direction;</div><div class='del'>-	CamelMimeFilterCRLFMode mode;</div><div class='del'>-	gboolean saw_cr;</div><div class='del'>-	gboolean saw_lf;</div><div class='del'>-	gboolean saw_dot;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCRLFClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_crlf_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_CRLF_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c<br/>deleted file mode 100644<br/>index fb2029f909..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-from.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterFromPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelMimeFilterFrom *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass);</div><div class='del'>-static void camel_mime_filter_from_init       (CamelMimeFilterFrom *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_from_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_from_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterFrom",</div><div class='del'>-					    sizeof (CamelMimeFilterFrom),</div><div class='del'>-					    sizeof (CamelMimeFilterFromClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_from_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_from_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct fromnode {</div><div class='del'>-	struct fromnode *next;</div><div class='del'>-	char *pointer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Yes, it is complicated ... */</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *f = (CamelMimeFilterFrom *)mf;</div><div class='del'>-	register char *inptr, *inend;</div><div class='del'>-	int left;</div><div class='del'>-	int midline = f-&gt;midline;</div><div class='del'>-	int fromcount = 0;</div><div class='del'>-	struct fromnode *head = NULL, *tail = (struct fromnode *)&amp;head, *node;</div><div class='del'>-	char *outptr;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = inptr+len;</div><div class='del'>-</div><div class='del'>-	d(printf("Filtering '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	/* first, see if we need to escape any from's */</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		register int c = -1;</div><div class='del'>-</div><div class='del'>-		if (midline)</div><div class='del'>-			while (inptr &lt; inend &amp;&amp; (c = *inptr++) != '\n')</div><div class='del'>-				;</div><div class='del'>-</div><div class='del'>-		if (c == '\n' || !midline) {</div><div class='del'>-			left = inend-inptr;</div><div class='del'>-			if (left &gt; 0) {</div><div class='del'>-				midline = TRUE;</div><div class='del'>-				if (left &lt; 5) {</div><div class='del'>-					if (inptr[0] == 'F') {</div><div class='del'>-						camel_mime_filter_backup(mf, inptr, left);</div><div class='del'>-						midline = FALSE;</div><div class='del'>-						inend = inptr;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (!strncmp(inptr, "From ", 5)) {</div><div class='del'>-						fromcount++;</div><div class='del'>-						/* yes, we do alloc them on the stack ... at most we're going to get</div><div class='del'>-						   len / 7 of them anyway */</div><div class='del'>-						node = alloca(sizeof(*node));</div><div class='del'>-						node-&gt;pointer = inptr;</div><div class='del'>-						node-&gt;next = NULL;</div><div class='del'>-						tail-&gt;next = node;</div><div class='del'>-						tail = node;</div><div class='del'>-						inptr += 5;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* \n is at end of line, check next buffer */</div><div class='del'>-				midline = FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f-&gt;midline = midline;</div><div class='del'>-</div><div class='del'>-	if (fromcount &gt; 0) {</div><div class='del'>-		camel_mime_filter_set_size(mf, len + fromcount, FALSE);</div><div class='del'>-		node = head;</div><div class='del'>-		inptr = in;</div><div class='del'>-		outptr = mf-&gt;outbuf;</div><div class='del'>-		while (node) {</div><div class='del'>-			memcpy(outptr, inptr, node-&gt;pointer - inptr);</div><div class='del'>-			outptr += node-&gt;pointer - inptr;</div><div class='del'>-			*outptr++ = '&gt;';</div><div class='del'>-			inptr = node-&gt;pointer;</div><div class='del'>-			node = node-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		memcpy(outptr, inptr, inend - inptr);</div><div class='del'>-		outptr += inend - inptr;</div><div class='del'>-		*out = mf-&gt;outbuf;</div><div class='del'>-		*outlen = outptr - mf-&gt;outbuf;</div><div class='del'>-		*outprespace = mf-&gt;outbuf - mf-&gt;outreal;</div><div class='del'>-</div><div class='del'>-		d(printf("Filtered '%.*s'\n", *outlen, *out));</div><div class='del'>-	} else {</div><div class='del'>-		*out = in;</div><div class='del'>-		*outlen = inend - in;</div><div class='del'>-		*outprespace = prespace;</div><div class='del'>-		</div><div class='del'>-		d(printf("Filtered '%.*s'\n", *outlen, *out));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_from_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_from_init (CamelMimeFilterFrom *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelMimeFilterFromPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-	obj-&gt;midline = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_from_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterFrom object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterFrom widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterFrom *</div><div class='del'>-camel_mime_filter_from_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *new = CAMEL_MIME_FILTER_FROM ( camel_object_new (camel_mime_filter_from_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *f;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len, prespace;</div><div class='del'>-</div><div class='del'>-	g_tk_init(&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	f = camel_mime_filter_from_new();</div><div class='del'>-</div><div class='del'>-	buffer = "This is a test\nFrom Someone\nTo someone. From Someone else, From\n From blah\nFromblah\nBye! \nFrom ";</div><div class='del'>-	len = strlen(buffer);</div><div class='del'>-	prespace = 0;</div><div class='del'>-</div><div class='del'>-	printf("input = '%.*s'\n", len, buffer);</div><div class='del'>-	camel_mime_filter_filter(f, buffer, len, prespace, &amp;buffer, &amp;len, &amp;prespace);</div><div class='del'>-	printf("output = '%.*s'\n", len, buffer);</div><div class='del'>-	buffer = "";</div><div class='del'>-	len = 0;</div><div class='del'>-	prespace = 0;</div><div class='del'>-	camel_mime_filter_complete(f, buffer, len, prespace, &amp;buffer, &amp;len, &amp;prespace);</div><div class='del'>-	printf("complete = '%.*s'\n", len, buffer);</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h<br/>deleted file mode 100644<br/>index cbc2e70a94..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-from.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_FROM_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_FROM_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_FROM(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)</div><div class='del'>-#define CAMEL_MIME_FILTER_FROM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_FROM(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_from_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterFrom      CamelMimeFilterFrom;</div><div class='del'>-typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterFrom {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterFromPrivate *priv;</div><div class='del'>-</div><div class='del'>-	int midline;		/* are we between lines? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterFromClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_from_get_type	(void);</div><div class='del'>-CamelMimeFilterFrom      *camel_mime_filter_from_new	(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_FROM_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c<br/>deleted file mode 100644<br/>index 3a9bdaba75..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-html.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-html.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,200 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-html.h"</div><div class='del'>-#include "camel-html-parser.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *klass);</div><div class='del'>-static void camel_mime_filter_html_init       (CamelObject *o);</div><div class='del'>-static void camel_mime_filter_html_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_html_parent;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterHTMLPrivate {</div><div class='del'>-	CamelHTMLParser *ctxt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-/* well we odnt use this stuff yet */</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof((x)[0]))</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *element;</div><div class='del'>-	char *remap;</div><div class='del'>-} map_start[] = {</div><div class='del'>-	{ "p", "\n\n" },</div><div class='del'>-	{ "br", "\n" },</div><div class='del'>-	{ "h1", "\n" }, { "h2", "\n" }, { "h3", "\n" }, { "h4", "\n" }, { "h5", "\n" }, { "h6", "\n" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *element;</div><div class='del'>-	char *remap;</div><div class='del'>-} map_end[] = {</div><div class='del'>-	{ "h1", "\n" }, { "h2", "\n" }, { "h3", "\n" }, { "h4", "\n" }, { "h5", "\n" }, { "h6", "\n" },</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_html_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterHTML",</div><div class='del'>-					    sizeof (CamelMimeFilterHTML),</div><div class='del'>-					    sizeof (CamelMimeFilterHTMLClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_html_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_html_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_html_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_html_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)o;</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)f-&gt;priv-&gt;ctxt);</div><div class='del'>-	g_free(f-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_html_init       (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)o;</div><div class='del'>-</div><div class='del'>-	f-&gt;priv = g_malloc0(sizeof(*f-&gt;priv));</div><div class='del'>-	f-&gt;priv-&gt;ctxt = camel_html_parser_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-run(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace, int last)</div><div class='del'>-{</div><div class='del'>-	camel_html_parser_t state;</div><div class='del'>-	char *outp;</div><div class='del'>-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)mf;</div><div class='del'>-</div><div class='del'>-	d(printf("converting html:\n%.*s\n", (int)len, in));</div><div class='del'>-	</div><div class='del'>-	/* We should generally shrink the data, but this'll do */</div><div class='del'>-	camel_mime_filter_set_size(mf, len*2+256, FALSE);</div><div class='del'>-	outp = mf-&gt;outbuf;</div><div class='del'>-</div><div class='del'>-	camel_html_parser_set_data(f-&gt;priv-&gt;ctxt, in, len, last);</div><div class='del'>-	do {</div><div class='del'>-		const char *data;</div><div class='del'>-		int len;</div><div class='del'>-		</div><div class='del'>-		state = camel_html_parser_step(f-&gt;priv-&gt;ctxt, &amp;data, &amp;len);</div><div class='del'>-		</div><div class='del'>-		switch(state) {</div><div class='del'>-		case CAMEL_HTML_PARSER_DATA:</div><div class='del'>-		case CAMEL_HTML_PARSER_ENT:</div><div class='del'>-			memcpy(outp, data, len);</div><div class='del'>-			outp += len;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_HTML_PARSER_ELEMENT:</div><div class='del'>-			/* FIXME: do some whitespace processing here */</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* ignore everything else */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (state != CAMEL_HTML_PARSER_EOF &amp;&amp; state != CAMEL_HTML_PARSER_EOD);</div><div class='del'>-</div><div class='del'>-	*out = mf-&gt;outbuf;</div><div class='del'>-	*outlenptr = outp - mf-&gt;outbuf;</div><div class='del'>-	*outprespace = mf-&gt;outbuf - mf-&gt;outreal;</div><div class='del'>-</div><div class='del'>-	d(printf("converted html end:\n%.*s\n", (int)*outlenptr, *out));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	run(mf, in, len, prespace, out, outlenptr, outprespace, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	run(mf, in, len, prespace, out, outlenptr, outprespace, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset(CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterHTML *f = (CamelMimeFilterHTML *)mf;</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)f-&gt;priv-&gt;ctxt);</div><div class='del'>-	f-&gt;priv-&gt;ctxt = camel_html_parser_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_html_class_init (CamelMimeFilterHTMLClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_html_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_html_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterHTML object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterHTML widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterHTML *</div><div class='del'>-camel_mime_filter_html_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterHTML *new = CAMEL_MIME_FILTER_HTML ( camel_object_new (camel_mime_filter_html_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h<br/>deleted file mode 100644<br/>index bb9b6aaa4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-html.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-html.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_HTML_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_HTML_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_HTML(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_html_get_type (), CamelMimeFilterHTML)</div><div class='del'>-#define CAMEL_MIME_FILTER_HTML_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_html_get_type (), CamelMimeFilterHTMLClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_HTML(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_html_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterHTMLClass CamelMimeFilterHTMLClass;</div><div class='del'>-typedef struct _CamelMimeFilterHTML CamelMimeFilterHTML;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterHTML {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterHTMLPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterHTMLClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_html_get_type	(void);</div><div class='del'>-CamelMimeFilterHTML      *camel_mime_filter_html_new	(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_HTML_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c<br/>deleted file mode 100644<br/>index e9df08072b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-index.h"</div><div class='del'>-</div><div class='del'>-#include "camel-text-index.h"</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);</div><div class='del'>-static void camel_mime_filter_index_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_index_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_index_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterIndex",</div><div class='del'>-					    sizeof (CamelMimeFilterIndex),</div><div class='del'>-					    sizeof (CamelMimeFilterIndexClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_index_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_index_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_index_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;name)</div><div class='del'>-		camel_object_unref((CamelObject *)f-&gt;name);</div><div class='del'>-	camel_object_unref((CamelObject *)f-&gt;index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;index == NULL || f-&gt;name==NULL) {</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_index_name_add_buffer(f-&gt;name, in, len);</div><div class='del'>-	camel_index_name_add_buffer(f-&gt;name, NULL, 0);</div><div class='del'>-</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlenptr = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;index == NULL || f-&gt;name==NULL) {</div><div class='del'>-		goto donothing;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_index_name_add_buffer(f-&gt;name, in, len);</div><div class='del'>-</div><div class='del'>-donothing:</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlenptr = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_index_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	/*filter_class-&gt;reset = reset;*/</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_index_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterIndex object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterIndex widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterIndex *</div><div class='del'>-camel_mime_filter_index_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *new = CAMEL_MIME_FILTER_INDEX ( camel_object_new (camel_mime_filter_index_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterIndex      *camel_mime_filter_index_new_index (struct _CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *new = camel_mime_filter_index_new();</div><div class='del'>-</div><div class='del'>-	if (new) {</div><div class='del'>-		new-&gt;index = index;</div><div class='del'>-		if (index)</div><div class='del'>-			camel_object_ref((CamelObject *)index);</div><div class='del'>-	}</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set the match name for any indexed words */</div><div class='del'>-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *mf, struct _CamelIndexName *name)</div><div class='del'>-{</div><div class='del'>-	if (mf-&gt;name)</div><div class='del'>-		camel_object_unref((CamelObject *)mf-&gt;name);</div><div class='del'>-	mf-&gt;name = name;</div><div class='del'>-	if (name)</div><div class='del'>-		camel_object_ref((CamelObject *)name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_index_set_index (CamelMimeFilterIndex *mf, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	if (mf-&gt;index) {</div><div class='del'>-		char *out;</div><div class='del'>-		size_t outlen, outspace;</div><div class='del'>-</div><div class='del'>-		camel_mime_filter_complete((CamelMimeFilter *)mf, "", 0, 0, &amp;out, &amp;outlen, &amp;outspace);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mf-&gt;index = index;</div><div class='del'>-	if (index)</div><div class='del'>-		camel_object_ref((CamelObject *)index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h<br/>deleted file mode 100644<br/>index 3bb1bd532c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-index.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_INDEX_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_INDEX_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)</div><div class='del'>-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_index_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterIndex {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterIndexPrivate *priv;</div><div class='del'>-</div><div class='del'>-	struct _CamelIndex *index;</div><div class='del'>-	struct _CamelIndexName *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterIndexClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_filter_index_get_type	(void);</div><div class='del'>-CamelMimeFilterIndex      *camel_mime_filter_index_new	(void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilterIndex      *camel_mime_filter_index_new_index(struct _CamelIndex *);</div><div class='del'>-</div><div class='del'>-/* Set the match name for any indexed words */</div><div class='del'>-void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, struct _CamelIndexName *name);</div><div class='del'>-void camel_mime_filter_index_set_index (CamelMimeFilterIndex *mf, struct _CamelIndex *index);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c<br/>deleted file mode 100644<br/>index 44d4755efb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-linewrap.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-linewrap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include "camel-mime-filter-linewrap.h"</div><div class='del'>-</div><div class='del'>-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-		    char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-static void complete (CamelMimeFilter *f, char *in, size_t len,</div><div class='del'>-		      size_t prespace, char **out, size_t *outlen,</div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-static void reset (CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *mime_filter_class =</div><div class='del'>-		(CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	mime_filter_class-&gt;filter = filter;</div><div class='del'>-	mime_filter_class-&gt;complete = complete;</div><div class='del'>-	mime_filter_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_linewrap_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterLinewrap",</div><div class='del'>-					    sizeof (CamelMimeFilterLinewrap),</div><div class='del'>-					    sizeof (CamelMimeFilterLinewrapClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_linewrap_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;</div><div class='del'>-	char *inend, *last, *p, *q;</div><div class='del'>-	int nchars = linewrap-&gt;nchars;</div><div class='del'>-	</div><div class='del'>-	/* we'll be adding chars here so we need a bigger buffer */</div><div class='del'>-	camel_mime_filter_set_size (f, 3 * len, FALSE);</div><div class='del'>-	</div><div class='del'>-	p = in;</div><div class='del'>-	q = f-&gt;outbuf;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	</div><div class='del'>-	while (p &lt; inend) {</div><div class='del'>-		if (*p == '\n') {</div><div class='del'>-			last = q;</div><div class='del'>-			*q++ = *p++;</div><div class='del'>-			nchars = 0;</div><div class='del'>-		} else if (isspace (*p)) {</div><div class='del'>-			last = q;</div><div class='del'>-			</div><div class='del'>-			if (nchars &gt;= linewrap-&gt;wrap_len) {</div><div class='del'>-				*q++ = '\n';</div><div class='del'>-				p++;</div><div class='del'>-				nchars = 0;</div><div class='del'>-			} else {</div><div class='del'>-				*q++ = *p++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*q++ = *p++;</div><div class='del'>-			nchars++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* line is getting way too long, we must force a wrap here */</div><div class='del'>-		if (nchars &gt;= (linewrap-&gt;max_len - 1) &amp;&amp; *p != '\n') {</div><div class='del'>-			*q++ = '\n';</div><div class='del'>-			*q++ = linewrap-&gt;indent;</div><div class='del'>-			nchars = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;nchars = nchars;</div><div class='del'>-	</div><div class='del'>-	*out = f-&gt;outbuf;</div><div class='del'>-	*outlen = q - f-&gt;outbuf;</div><div class='del'>-	*outprespace = f-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	  char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (len)</div><div class='del'>-		filter (f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;nchars = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap =</div><div class='del'>-		CAMEL_MIME_FILTER_LINEWRAP (camel_object_new (CAMEL_MIME_FILTER_LINEWRAP_TYPE));</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;indent = indent_char;</div><div class='del'>-	linewrap-&gt;wrap_len = preferred_len;</div><div class='del'>-	linewrap-&gt;max_len = max_len;</div><div class='del'>-	linewrap-&gt;nchars = 0;</div><div class='del'>-	</div><div class='del'>-	return (CamelMimeFilter *) linewrap;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h<br/>deleted file mode 100644<br/>index 1d6f444da4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-linewrap.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-linewrap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_LINEWRAP_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_LINEWRAP_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_LINEWRAP_TYPE         (camel_mime_filter_linewrap_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER_LINEWRAP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrap)</div><div class='del'>-#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterLinewrapClass CamelMimeFilterLinewrapClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterLinewrap {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-	</div><div class='del'>-	guint wrap_len;</div><div class='del'>-	guint max_len;</div><div class='del'>-	char indent;</div><div class='del'>-	int nchars;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterLinewrapClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_linewrap_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c<br/>deleted file mode 100644<br/>index 1516527ded..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-save.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,115 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-save.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-		    char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-static void complete (CamelMimeFilter *f, char *in, size_t len,</div><div class='del'>-		      size_t prespace, char **out, size_t *outlen,</div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-static void reset (CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_save_class_init (CamelMimeFilterSaveClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *mime_filter_class =</div><div class='del'>-		(CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	mime_filter_class-&gt;filter = filter;</div><div class='del'>-	mime_filter_class-&gt;complete = complete;</div><div class='del'>-	mime_filter_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_save_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterSave",</div><div class='del'>-					    sizeof (CamelMimeFilterSave),</div><div class='del'>-					    sizeof (CamelMimeFilterSaveClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_save_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *save = (CamelMimeFilterSave *) f;</div><div class='del'>-	</div><div class='del'>-	if (save-&gt;stream)</div><div class='del'>-		camel_stream_write (save-&gt;stream, in, len);</div><div class='del'>-	</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = f-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	  char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (len)</div><div class='del'>-		filter (f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_save_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *save = CAMEL_MIME_FILTER_SAVE (camel_object_new (CAMEL_MIME_FILTER_SAVE_TYPE));</div><div class='del'>-	</div><div class='del'>-	save-&gt;stream = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	return (CamelMimeFilter *) save;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_save_new_with_stream (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterSave *save = CAMEL_MIME_FILTER_SAVE (camel_object_new (CAMEL_MIME_FILTER_SAVE_TYPE));</div><div class='del'>-	</div><div class='del'>-	save-&gt;stream = stream;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return (CamelMimeFilter *) save;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h<br/>deleted file mode 100644<br/>index 20ebbea6f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-save.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __CAMEL_MIME_FILTER_SAVE_H__</div><div class='del'>-#define __CAMEL_MIME_FILTER_SAVE_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE_TYPE         (camel_mime_filter_save_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_SAVE(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterSave {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-	</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterSaveClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_save_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_save_new (void);</div><div class='del'>-CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __CAMEL_MIME_FILTER_SAVE_H__ */</div><div class='head'>diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c<br/>deleted file mode 100644<br/>index 22dc3ff737..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-tohtml.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-tohtml.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,520 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-tohtml.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *klass);</div><div class='del'>-static void camel_mime_filter_tohtml_init       (CamelObject *o);</div><div class='del'>-static void camel_mime_filter_tohtml_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_tohtml_parent;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_tohtml_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (),</div><div class='del'>-					    "CamelMimeFilterToHTML",</div><div class='del'>-					    sizeof (CamelMimeFilterToHTML),</div><div class='del'>-					    sizeof (CamelMimeFilterToHTMLClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_tohtml_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_tohtml_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_tohtml_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_tohtml_finalize (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_tohtml_init (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-check_size (CamelMimeFilter *filter, char *outptr, char **outend, size_t len)</div><div class='del'>-{</div><div class='del'>-	size_t offset;</div><div class='del'>-	</div><div class='del'>-	if (*outend - outptr &gt;= len)</div><div class='del'>-		return outptr;</div><div class='del'>-	</div><div class='del'>-	offset = outptr - filter-&gt;outbuf;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_set_size (filter, filter-&gt;outsize + len, TRUE);</div><div class='del'>-	</div><div class='del'>-	*outend = filter-&gt;outbuf + filter-&gt;outsize;</div><div class='del'>-	</div><div class='del'>-	return filter-&gt;outbuf + offset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 1 = non-email-address chars: "()&lt;&gt;@,;:\\\"/[]`'|\n\t "  */</div><div class='del'>-/* 2 = non-url chars:           "()&lt;&gt;,;\\\"[]`'|\n\t "   */</div><div class='del'>-/* 3 = trailing url garbage:    ",.!?;:&gt;)]}\\`'-_|\n\t "  */</div><div class='del'>-static unsigned short special_chars[256] = {</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 7, 4, 3, 0, 0, 0, 0, 7, 3, 7, 0, 0, 7, 4, 4, 1,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 7, 3, 0, 7, 4,</div><div class='del'>-	 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 7, 3, 0, 4,</div><div class='del'>-	 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 4, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-	 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define IS_NON_ADDR   (1 &lt;&lt; 0)</div><div class='del'>-#define IS_NON_URL    (1 &lt;&lt; 1)</div><div class='del'>-#define IS_GARBAGE    (1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define NON_EMAIL_CHARS         "()&lt;&gt;@,;:\\\"/[]`'|\n\t "</div><div class='del'>-#define NON_URL_CHARS           "()&lt;&gt;,;\\\"[]`'|\n\t "</div><div class='del'>-#define TRAILING_URL_GARBAGE    ",.!?;:&gt;)}\\`'-_|\n\t "</div><div class='del'>-</div><div class='del'>-#define is_addr_char(c) (isprint (c) &amp;&amp; !(special_chars[(unsigned char) c] &amp; IS_NON_ADDR))</div><div class='del'>-#define is_url_char(c)  (isprint (c) &amp;&amp; !(special_chars[(unsigned char) c] &amp; IS_NON_URL))</div><div class='del'>-#define is_trailing_garbage(c) (!isprint (c) || (special_chars[(unsigned char) c] &amp; IS_GARBAGE))</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-table_init (void)</div><div class='del'>-{</div><div class='del'>-	char *c;</div><div class='del'>-	</div><div class='del'>-	memset (special_chars, 0, sizeof (special_chars));</div><div class='del'>-	for (c = NON_EMAIL_CHARS; *c; c++)</div><div class='del'>-		special_chars[(int) *c] |= IS_NON_ADDR;</div><div class='del'>-	for (c = NON_URL_CHARS; *c; c++)</div><div class='del'>-		special_chars[(int) *c] |= IS_NON_URL;</div><div class='del'>-	for (c = TRAILING_URL_GARBAGE; *c; c++)</div><div class='del'>-		special_chars[(int) *c] |= IS_GARBAGE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-url_extract (char **in, int inlen, gboolean check, gboolean *backup)</div><div class='del'>-{</div><div class='del'>-	unsigned char *inptr, *inend, *p;</div><div class='del'>-	char *url;</div><div class='del'>-	</div><div class='del'>-	inptr = (unsigned char *) *in;</div><div class='del'>-	inend = inptr + inlen;</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend &amp;&amp; is_url_char (*inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	if ((char *) inptr == *in)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* back up if we probably went too far. */</div><div class='del'>-	while (inptr &gt; (unsigned char *) *in &amp;&amp; is_trailing_garbage (*(inptr - 1)))</div><div class='del'>-		inptr--;</div><div class='del'>-	</div><div class='del'>-	if (check) {</div><div class='del'>-		/* make sure we weren't fooled. */</div><div class='del'>-		p = memchr (*in, ':', (char *) inptr - *in);</div><div class='del'>-		if (!p)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (inptr == inend &amp;&amp; backup) {</div><div class='del'>-		*backup = TRUE;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	url = g_strndup (*in, (char *) inptr - *in);</div><div class='del'>-	*in = inptr;</div><div class='del'>-	</div><div class='del'>-	return url;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-email_address_extract (char **in, char *inend, char *start, char **outptr, gboolean *backup)</div><div class='del'>-{</div><div class='del'>-	char *addr, *pre, *end, *dot;</div><div class='del'>-	</div><div class='del'>-	/* *in points to the '@'. Look backward for a valid local-part */</div><div class='del'>-	for (pre = *in; pre - 1 &gt;= start &amp;&amp; is_addr_char (*(pre - 1)); pre--);</div><div class='del'>-	</div><div class='del'>-	if (pre == *in)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Now look forward for a valid domain part */</div><div class='del'>-	for (end = *in + 1, dot = NULL; end &lt; inend &amp;&amp; is_addr_char (*end); end++) {</div><div class='del'>-		if (*end == '.' &amp;&amp; !dot)</div><div class='del'>-			dot = end;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (end &gt;= inend &amp;&amp; backup) {</div><div class='del'>-		*backup = TRUE;</div><div class='del'>-		*outptr -= (*in - pre);</div><div class='del'>-		*in = pre;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!dot)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Remove trailing garbage */</div><div class='del'>-	while (end &gt; *in &amp;&amp; is_trailing_garbage (*(end - 1)))</div><div class='del'>-		end--;</div><div class='del'>-	if (dot &gt; end)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	addr = g_strndup (pre, end - pre);</div><div class='del'>-	*outptr -= (*in - pre);</div><div class='del'>-	*in = end;</div><div class='del'>-	</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_citation (char *inptr, char *inend, gboolean saw_citation, gboolean *backup)</div><div class='del'>-{</div><div class='del'>-	if (*inptr != '&gt;')</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (inend - inptr &gt;= 6) {</div><div class='del'>-		/* make sure this isn't just mbox From-magling... */</div><div class='del'>-		if (strncmp (inptr, "&gt;From ", 6) != 0)</div><div class='del'>-			return TRUE;</div><div class='del'>-	} else if (backup) {</div><div class='del'>-		/* we don't have enough data to tell, so return */</div><div class='del'>-		*backup = TRUE;</div><div class='del'>-		return saw_citation;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* if the previous line was a citation, then say this one is too */</div><div class='del'>-	if (saw_citation)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	/* otherwise it was just an isolated "&gt;From " line */</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_protocol (char *inptr, char *inend, gboolean *backup)</div><div class='del'>-{</div><div class='del'>-	if (inend - inptr &gt;= 8) {</div><div class='del'>-		if (!strncasecmp (inptr, "http://", 7) ||</div><div class='del'>-		    !strncasecmp (inptr, "https://", 8) ||</div><div class='del'>-		    !strncasecmp (inptr, "ftp://", 6) ||</div><div class='del'>-		    !strncasecmp (inptr, "nntp://", 7) ||</div><div class='del'>-		    !strncasecmp (inptr, "mailto:", 7) ||</div><div class='del'>-		    !strncasecmp (inptr, "news:", 5))</div><div class='del'>-			return TRUE;</div><div class='del'>-	} else if (backup) {</div><div class='del'>-		*backup = TRUE;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-html_convert (CamelMimeFilter *filter, char *in, size_t inlen, size_t prespace,</div><div class='del'>-	      char **out, size_t *outlen, size_t *outprespace, gboolean flush)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterToHTML *html = (CamelMimeFilterToHTML *) filter;</div><div class='del'>-	char *inptr, *inend, *outptr, *outend, *start;</div><div class='del'>-	gboolean backup = FALSE;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_set_size (filter, inlen * 2 + 6, FALSE);</div><div class='del'>-	</div><div class='del'>-	inptr = start = in;</div><div class='del'>-	inend = in + inlen;</div><div class='del'>-	outptr = filter-&gt;outbuf;</div><div class='del'>-	outend = filter-&gt;outbuf + filter-&gt;outsize;</div><div class='del'>-	</div><div class='del'>-	if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_PRE &amp;&amp; !html-&gt;pre_open) {</div><div class='del'>-		outptr += sprintf (outptr, "%s", "&lt;pre&gt;");</div><div class='del'>-		html-&gt;pre_open = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		unsigned char u;</div><div class='del'>-		</div><div class='del'>-		if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_MARK_CITATION &amp;&amp; html-&gt;column == 0) {</div><div class='del'>-			html-&gt;saw_citation = is_citation (inptr, inend, html-&gt;saw_citation,</div><div class='del'>-							  flush ? &amp;backup : NULL);</div><div class='del'>-			if (backup)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (html-&gt;saw_citation) {</div><div class='del'>-				if (!html-&gt;coloured) {</div><div class='del'>-					char font[25];</div><div class='del'>-					</div><div class='del'>-					g_snprintf (font, 25, "&lt;font color=\"#%06x\"&gt;", html-&gt;colour);</div><div class='del'>-					</div><div class='del'>-					outptr = check_size (filter, outptr, &amp;outend, 25);</div><div class='del'>-					outptr += sprintf (outptr, "%s", font);</div><div class='del'>-					html-&gt;coloured = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} else if (html-&gt;coloured) {</div><div class='del'>-				outptr = check_size (filter, outptr, &amp;outend, 10);</div><div class='del'>-				outptr += sprintf (outptr, "%s", "&lt;/font&gt;");</div><div class='del'>-				html-&gt;coloured = FALSE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* display mbox-mangled "&gt;From " as "From " */</div><div class='del'>-			if (*inptr == '&gt;' &amp;&amp; !html-&gt;saw_citation)</div><div class='del'>-				inptr++;</div><div class='del'>-		} else if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_CITE &amp;&amp; html-&gt;column == 0) {</div><div class='del'>-			outptr = check_size (filter, outptr, &amp;outend, 6);</div><div class='del'>-			outptr += sprintf (outptr, "%s", "&amp;gt; ");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS &amp;&amp; isalpha ((int) *inptr)) {</div><div class='del'>-			char *refurl = NULL, *dispurl = NULL;</div><div class='del'>-			</div><div class='del'>-			if (is_protocol (inptr, inend, flush ? &amp;backup : NULL)) {</div><div class='del'>-				dispurl = url_extract (&amp;inptr, inend - inptr, TRUE,</div><div class='del'>-						       flush ? &amp;backup : NULL);</div><div class='del'>-				if (backup)</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				if (dispurl)</div><div class='del'>-					refurl = g_strdup (dispurl);</div><div class='del'>-			} else {</div><div class='del'>-				if (backup)</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				if (!strncasecmp (inptr, "www.", 4) &amp;&amp; ((unsigned char) inptr[4]) &lt; 0x80</div><div class='del'>-				    &amp;&amp; isalnum ((int) inptr[4])) {</div><div class='del'>-					dispurl = url_extract (&amp;inptr, inend - inptr, FALSE,</div><div class='del'>-							      flush ? &amp;backup : NULL);</div><div class='del'>-					if (backup)</div><div class='del'>-						break;</div><div class='del'>-					</div><div class='del'>-					if (dispurl)</div><div class='del'>-						refurl = g_strdup_printf ("http://%s", dispurl);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (dispurl) {</div><div class='del'>-				outptr = check_size (filter, outptr, &amp;outend,</div><div class='del'>-						     strlen (refurl) +</div><div class='del'>-						     strlen (dispurl) + 15);</div><div class='del'>-				outptr += sprintf (outptr, "&lt;a href=\"%s\"&gt;%s&lt;/a&gt;",</div><div class='del'>-						   refurl, dispurl);</div><div class='del'>-				html-&gt;column += strlen (dispurl);</div><div class='del'>-				g_free (refurl);</div><div class='del'>-				g_free (dispurl);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (inptr &gt;= inend)</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*inptr == '@' &amp;&amp; (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES)) {</div><div class='del'>-			char *addr, *outaddr;</div><div class='del'>-			</div><div class='del'>-			addr = email_address_extract (&amp;inptr, inend, start, &amp;outptr,</div><div class='del'>-						      flush ? &amp;backup : NULL);</div><div class='del'>-			if (backup)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			if (addr) {</div><div class='del'>-				outaddr = g_strdup_printf ("&lt;a href=\"mailto:%s\"&gt;%s&lt;/a&gt;",</div><div class='del'>-							   addr, addr);</div><div class='del'>-				outptr = check_size (filter, outptr, &amp;outend, strlen (outaddr));</div><div class='del'>-				outptr += sprintf (outptr, "%s", outaddr);</div><div class='del'>-				html-&gt;column += strlen (addr);</div><div class='del'>-				g_free (addr);</div><div class='del'>-				g_free (outaddr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		outptr = check_size (filter, outptr, &amp;outend, 32);</div><div class='del'>-		</div><div class='del'>-		switch ((u = (unsigned char) *inptr++)) {</div><div class='del'>-		case '&lt;':</div><div class='del'>-			outptr += sprintf (outptr, "%s", "&amp;lt;");</div><div class='del'>-			html-&gt;column++;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case '&gt;':</div><div class='del'>-			outptr += sprintf (outptr, "%s", "&amp;gt;");</div><div class='del'>-			html-&gt;column++;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case '&amp;':</div><div class='del'>-			outptr += sprintf (outptr, "%s", "&amp;amp;");</div><div class='del'>-			html-&gt;column++;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case '"':</div><div class='del'>-			outptr += sprintf (outptr, "%s", "&amp;quot;");</div><div class='del'>-			html-&gt;column++;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case '\n':</div><div class='del'>-			if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_CONVERT_NL)</div><div class='del'>-				outptr += sprintf (outptr, "%s", "&lt;br&gt;");</div><div class='del'>-			</div><div class='del'>-			*outptr++ = '\n';</div><div class='del'>-			start = inptr;</div><div class='del'>-			html-&gt;column = 0;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case '\t':</div><div class='del'>-			if (html-&gt;flags &amp; (CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES)) {</div><div class='del'>-				do {</div><div class='del'>-					outptr = check_size (filter, outptr, &amp;outend, 7);</div><div class='del'>-					outptr += sprintf (outptr, "%s", "&amp;nbsp;");</div><div class='del'>-					html-&gt;column++;</div><div class='del'>-				} while (html-&gt;column % 8);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-			</div><div class='del'>-		case ' ':</div><div class='del'>-			if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES) {</div><div class='del'>-				if (inptr == in || (inptr &lt; inend &amp;&amp; (*(inptr + 1) == ' ' ||</div><div class='del'>-								      *(inptr + 1) == '\t' ||</div><div class='del'>-								      *(inptr - 1) == '\n'))) {</div><div class='del'>-					outptr += sprintf (outptr, "%s", "&amp;nbsp;");</div><div class='del'>-					html-&gt;column++;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-			</div><div class='del'>-		default:</div><div class='del'>-			if ((u &gt;= 0x20 &amp;&amp; u &lt; 0x80) ||</div><div class='del'>-			    (u == '\r' || u == '\t')) {</div><div class='del'>-				/* Default case, just copy. */</div><div class='del'>-				*outptr++ = (char) u;</div><div class='del'>-			} else {</div><div class='del'>-				if (html-&gt;flags &amp; CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT)</div><div class='del'>-					*outptr++ = '?';</div><div class='del'>-				else</div><div class='del'>-					outptr += g_snprintf (outptr, 9, "&amp;#%d;", (int) u);</div><div class='del'>-			}</div><div class='del'>-			html-&gt;column++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (inptr &lt; inend)</div><div class='del'>-		camel_mime_filter_backup (filter, inptr, inend - inptr);</div><div class='del'>-	</div><div class='del'>-	if (flush &amp;&amp; html-&gt;pre_open) {</div><div class='del'>-		outptr = check_size (filter, outptr, &amp;outend, 10);</div><div class='del'>-		outptr += sprintf (outptr, "%s", "&lt;/pre&gt;");</div><div class='del'>-		html-&gt;pre_open = FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*out = filter-&gt;outbuf;</div><div class='del'>-	*outlen = outptr - filter-&gt;outbuf;</div><div class='del'>-	*outprespace = filter-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_filter (CamelMimeFilter *filter, char *in, size_t len, size_t prespace,</div><div class='del'>-	       char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	html_convert (filter, in, len, prespace, out, outlen, outprespace, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-filter_complete (CamelMimeFilter *filter, char *in, size_t len, size_t prespace,</div><div class='del'>-		 char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	html_convert (filter, in, len, prespace, out, outlen, outprespace, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_reset (CamelMimeFilter *filter)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterToHTML *html = (CamelMimeFilterToHTML *) filter;</div><div class='del'>-	</div><div class='del'>-	html-&gt;column = 0;</div><div class='del'>-	html-&gt;pre_open = FALSE;</div><div class='del'>-	html-&gt;saw_citation = FALSE;</div><div class='del'>-	html-&gt;coloured = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_tohtml_class_init (CamelMimeFilterToHTMLClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_tohtml_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-	</div><div class='del'>-	filter_class-&gt;reset = filter_reset;</div><div class='del'>-	filter_class-&gt;filter = filter_filter;</div><div class='del'>-	filter_class-&gt;complete = filter_complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_tohtml_new:</div><div class='del'>- * @flags:</div><div class='del'>- * @colour:</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelMimeFilterToHTML object.</div><div class='del'>- *</div><div class='del'>- * Returns a new CamelMimeFilter object.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_tohtml_new (guint32 flags, guint32 colour)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterToHTML *new;</div><div class='del'>-	</div><div class='del'>-	new = CAMEL_MIME_FILTER_TOHTML (camel_object_new (camel_mime_filter_tohtml_get_type ()));</div><div class='del'>-	</div><div class='del'>-	new-&gt;flags = flags;</div><div class='del'>-	new-&gt;colour = colour;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_MIME_FILTER (new);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h<br/>deleted file mode 100644<br/>index 46c4051b87..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-tohtml.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter-tohtml.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __CAMEL_MIME_FILTER_TOHTML_H__</div><div class='del'>-#define __CAMEL_MIME_FILTER_TOHTML_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTML)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTMLClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_TOHTML(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_tohtml_get_type ())</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_PRE               (1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_NL        (1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES    (1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS      (1 &lt;&lt; 3)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_MARK_CITATION     (1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES (1 &lt;&lt; 5)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT       (1 &lt;&lt; 6)</div><div class='del'>-#define CAMEL_MIME_FILTER_TOHTML_CITE              (1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterToHTMLClass CamelMimeFilterToHTMLClass;</div><div class='del'>-typedef struct _CamelMimeFilterToHTML CamelMimeFilterToHTML;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterToHTML {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-	</div><div class='del'>-	guint32 flags;</div><div class='del'>-	guint32 colour;</div><div class='del'>-	</div><div class='del'>-	guint32 column       : 29;</div><div class='del'>-	guint32 pre_open     : 1;</div><div class='del'>-	guint32 saw_citation : 1;</div><div class='del'>-	guint32 coloured     : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterToHTMLClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType        camel_mime_filter_tohtml_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_tohtml_new (guint32 flags, guint32 colour);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __CAMEL_MIME_FILTER_TOHTML_H__ */</div><div class='head'>diff --git a/camel/camel-mime-filter.c b/camel/camel-mime-filter.c<br/>deleted file mode 100644<br/>index 6e94b3cde4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,256 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-mime-filter.h"</div><div class='del'>-</div><div class='del'>-/*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */</div><div class='del'>-</div><div class='del'>-/* only suitable for glibc */</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-#include &lt;mcheck.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterPrivate {</div><div class='del'>-	char *inbuf;</div><div class='del'>-	size_t inlen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PRE_HEAD (64)</div><div class='del'>-#define BACK_HEAD (64)</div><div class='del'>-#define _PRIVATE(o) (((CamelMimeFilter *)(o))-&gt;priv)</div><div class='del'>-#define FCLASS(o) ((CamelMimeFilterClass *)(CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_mime_filter_parent;</div><div class='del'>-</div><div class='del'>-static void complete (CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		      size_t prespace, char **out, size_t *outlen, </div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_class_init (CamelMimeFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_mime_filter_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_init (CamelMimeFilter *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;outreal = NULL;</div><div class='del'>-	obj-&gt;outbuf = NULL;</div><div class='del'>-	obj-&gt;outsize = 0;</div><div class='del'>-</div><div class='del'>-	obj-&gt;backbuf = NULL;</div><div class='del'>-	obj-&gt;backsize = 0;</div><div class='del'>-	obj-&gt;backlen = 0;</div><div class='del'>-</div><div class='del'>-	_PRIVATE(obj) = g_malloc0(sizeof(*obj-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilter *f = (CamelMimeFilter *)o;</div><div class='del'>-	struct _CamelMimeFilterPrivate *p = _PRIVATE(f);</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;outreal);</div><div class='del'>-	g_free(f-&gt;backbuf);</div><div class='del'>-	g_free(p-&gt;inbuf);</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_filter_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_filter_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mime_filter_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelMimeFilter",</div><div class='del'>-							      sizeof (CamelMimeFilter),</div><div class='del'>-							      sizeof (CamelMimeFilterClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_mime_filter_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectInitFunc) camel_mime_filter_init,</div><div class='del'>-							      (CamelObjectFinalizeFunc) camel_mime_filter_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_filter_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	/* default - do nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilter object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilter widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilter *new = CAMEL_MIME_FILTER ( camel_object_new (camel_mime_filter_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-static void</div><div class='del'>-checkmem(void *p)</div><div class='del'>-{</div><div class='del'>-	if (p) {</div><div class='del'>-		int status = mprobe(p);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case MCHECK_HEAD:</div><div class='del'>-			printf("Memory underrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_TAIL:</div><div class='del'>-			printf("Memory overrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_FREE:</div><div class='del'>-			printf("Double free %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void filter_run(CamelMimeFilter *f,</div><div class='del'>-		       char *in, size_t len, size_t prespace,</div><div class='del'>-		       char **out, size_t *outlen, size_t *outprespace,</div><div class='del'>-		       void (*filterfunc)(CamelMimeFilter *f,</div><div class='del'>-					  char *in, size_t len, size_t prespace,</div><div class='del'>-					  char **out, size_t *outlen, size_t *outprespace))</div><div class='del'>-{</div><div class='del'>-	struct _CamelMimeFilterPrivate *p;</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	  here we take a performance hit, if the input buffer doesn't</div><div class='del'>-	  have the pre-space required.  We make a buffer that does ...</div><div class='del'>-	*/</div><div class='del'>-	if (prespace &lt; f-&gt;backlen) {</div><div class='del'>-		int newlen = len+prespace+f-&gt;backlen;</div><div class='del'>-		p = _PRIVATE(f);</div><div class='del'>-		if (p-&gt;inlen &lt; newlen) {</div><div class='del'>-			/* NOTE: g_realloc copies data, we dont need that (slower) */</div><div class='del'>-			g_free(p-&gt;inbuf);</div><div class='del'>-			p-&gt;inbuf = g_malloc(newlen+PRE_HEAD);</div><div class='del'>-			p-&gt;inlen = newlen+PRE_HEAD;</div><div class='del'>-		}</div><div class='del'>-		/* copy to end of structure */</div><div class='del'>-		memcpy(p-&gt;inbuf+p-&gt;inlen - len, in, len);</div><div class='del'>-		in = p-&gt;inbuf+p-&gt;inlen - len;</div><div class='del'>-		prespace = p-&gt;inlen - len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* preload any backed up data */</div><div class='del'>-	if (f-&gt;backlen &gt; 0) {</div><div class='del'>-		memcpy(in-f-&gt;backlen, f-&gt;backbuf, f-&gt;backlen);</div><div class='del'>-		in -= f-&gt;backlen;</div><div class='del'>-		len += f-&gt;backlen;</div><div class='del'>-		prespace -= f-&gt;backlen;</div><div class='del'>-		f-&gt;backlen = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	filterfunc(f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_filter(CamelMimeFilter *f,</div><div class='del'>-			      char *in, size_t len, size_t prespace,</div><div class='del'>-			      char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;filter)</div><div class='del'>-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)-&gt;filter);</div><div class='del'>-	else</div><div class='del'>-		g_error("Filter function unplmenented in class");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_complete(CamelMimeFilter *f,</div><div class='del'>-				char *in, size_t len, size_t prespace,</div><div class='del'>-				char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;complete)</div><div class='del'>-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)-&gt;complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_reset(CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;reset) {</div><div class='del'>-		FCLASS(f)-&gt;reset(f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* could free some buffers, if they are really big? */</div><div class='del'>-	f-&gt;backlen = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sets number of bytes backed up on the input, new calls replace previous ones */</div><div class='del'>-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length)</div><div class='del'>-{</div><div class='del'>-	if (f-&gt;backsize &lt; length) {</div><div class='del'>-		/* g_realloc copies data, unnecessary overhead */</div><div class='del'>-		g_free(f-&gt;backbuf);</div><div class='del'>-		f-&gt;backbuf = g_malloc(length+BACK_HEAD);</div><div class='del'>-		f-&gt;backsize = length+BACK_HEAD;</div><div class='del'>-	}</div><div class='del'>-	f-&gt;backlen = length;</div><div class='del'>-	memcpy(f-&gt;backbuf, data, length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ensure this much size available for filter output (if required) */</div><div class='del'>-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep)</div><div class='del'>-{</div><div class='del'>-	if (f-&gt;outsize &lt; size) {</div><div class='del'>-		int offset = f-&gt;outptr - f-&gt;outreal;</div><div class='del'>-		if (keep) {</div><div class='del'>-			f-&gt;outreal = g_realloc(f-&gt;outreal, size + PRE_HEAD*4);</div><div class='del'>-		} else {</div><div class='del'>-			g_free(f-&gt;outreal);</div><div class='del'>-			f-&gt;outreal = g_malloc(size + PRE_HEAD*4);</div><div class='del'>-		}</div><div class='del'>-		f-&gt;outptr = f-&gt;outreal + offset;</div><div class='del'>-		f-&gt;outbuf = f-&gt;outreal + PRE_HEAD*4;</div><div class='del'>-		f-&gt;outsize = size;</div><div class='del'>-		/* this could be offset from the end of the structure, but </div><div class='del'>-		   this should be good enough */</div><div class='del'>-		f-&gt;outpre = PRE_HEAD*4;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h<br/>deleted file mode 100644<br/>index 3cd65fe8d1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-filter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Abstract class for non-copying filters */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_FILTER_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_TYPE         (camel_mime_filter_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)</div><div class='del'>-#define CAMEL_MIME_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterClass CamelMimeFilterClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilter {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *outreal;		/* real malloc'd buffer */</div><div class='del'>-	char *outbuf;		/* first 'writable' position allowed (outreal + outpre) */</div><div class='del'>-	char *outptr;</div><div class='del'>-	size_t outsize;</div><div class='del'>-	size_t outpre;		/* prespace of this buffer */</div><div class='del'>-</div><div class='del'>-	char *backbuf;</div><div class='del'>-	size_t backsize;</div><div class='del'>-	size_t backlen;		/* significant data there */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual functions */</div><div class='del'>-	void (*filter)(CamelMimeFilter *f,</div><div class='del'>-		       char *in, size_t len, size_t prespace,</div><div class='del'>-		       char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-	void (*complete)(CamelMimeFilter *f,</div><div class='del'>-			 char *in, size_t len, size_t prespace,</div><div class='del'>-			 char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-	void (*reset)(CamelMimeFilter *f);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	      camel_mime_filter_get_type	(void);</div><div class='del'>-CamelMimeFilter      *camel_mime_filter_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_filter(CamelMimeFilter *f,</div><div class='del'>-			      char *in, size_t len, size_t prespace,</div><div class='del'>-			      char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_complete(CamelMimeFilter *f,</div><div class='del'>-				char *in, size_t len, size_t prespace,</div><div class='del'>-				char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_reset(CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-/* sets/returns number of bytes backed up on the input */</div><div class='del'>-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length);</div><div class='del'>-</div><div class='del'>-/* ensure this much size available for filter output */</div><div class='del'>-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_H */</div><div class='head'>diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c<br/>deleted file mode 100644<br/>index fe62c84ed5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-message.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,908 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-mime-message.c : class for a mime_message */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-stream-null.h"</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-mime-filter-bestenc.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* these 2 below should be kept in sync */</div><div class='del'>-typedef enum {</div><div class='del'>-	HEADER_UNKNOWN,</div><div class='del'>-	HEADER_FROM,</div><div class='del'>-	HEADER_REPLY_TO,</div><div class='del'>-	HEADER_SUBJECT,</div><div class='del'>-	HEADER_TO,</div><div class='del'>-	HEADER_RESENT_TO,</div><div class='del'>-	HEADER_CC,</div><div class='del'>-	HEADER_RESENT_CC,</div><div class='del'>-	HEADER_BCC,</div><div class='del'>-	HEADER_RESENT_BCC,</div><div class='del'>-	HEADER_DATE,</div><div class='del'>-	HEADER_MESSAGE_ID</div><div class='del'>-} CamelHeaderType;</div><div class='del'>-</div><div class='del'>-static char *header_names[] = {</div><div class='del'>-	/* dont include HEADER_UNKNOWN string */</div><div class='del'>-	"From", "Reply-To", "Subject", "To", "Resent-To", "Cc", "Resent-Cc",</div><div class='del'>-	"Bcc", "Resent-Bcc", "Date", "Message-Id", NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GHashTable *header_name_table;</div><div class='del'>-</div><div class='del'>-static CamelMimePartClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static char *recipient_names[] = {</div><div class='del'>-	"To", "Cc", "Bcc", "Resent-To", "Resent-Cc", "Resent-Bcc", NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream);</div><div class='del'>-static void add_header (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void set_header (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void remove_header (CamelMedium *medium, const char *header_name);</div><div class='del'>-static int construct_from_parser (CamelMimePart *, CamelMimeParser *);</div><div class='del'>-static void unref_recipient (gpointer key, gpointer value, gpointer user_data);</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMimeMessage */</div><div class='del'>-#define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_message_class_init (CamelMimeMessageClass *camel_mime_message_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_message_class);</div><div class='del'>-	CamelMimePartClass *camel_mime_part_class = CAMEL_MIME_PART_CLASS (camel_mime_message_class);</div><div class='del'>-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_message_class);</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_MIME_PART_CLASS(camel_type_get_global_classfuncs (camel_mime_part_get_type ()));</div><div class='del'>-</div><div class='del'>-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);</div><div class='del'>-	for (i=0;header_names[i];i++)</div><div class='del'>-		g_hash_table_insert (header_name_table, header_names[i], (gpointer)i+1);</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-</div><div class='del'>-	camel_medium_class-&gt;add_header = add_header;</div><div class='del'>-	camel_medium_class-&gt;set_header = set_header;</div><div class='del'>-	camel_medium_class-&gt;remove_header = remove_header;</div><div class='del'>-	</div><div class='del'>-	camel_mime_part_class-&gt;construct_from_parser = construct_from_parser;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_message_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mime_message = (CamelMimeMessage *)object;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (object), "message/rfc822");</div><div class='del'>-</div><div class='del'>-	mime_message-&gt;recipients =  g_hash_table_new(g_strcase_hash, g_strcase_equal);</div><div class='del'>-	for (i=0;recipient_names[i];i++) {</div><div class='del'>-		g_hash_table_insert(mime_message-&gt;recipients, recipient_names[i], camel_internet_address_new());</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mime_message-&gt;subject = NULL;</div><div class='del'>-	mime_message-&gt;reply_to = NULL;</div><div class='del'>-	mime_message-&gt;from = NULL;</div><div class='del'>-	mime_message-&gt;date = CAMEL_MESSAGE_DATE_CURRENT;</div><div class='del'>-	mime_message-&gt;date_offset = 0;</div><div class='del'>-	mime_message-&gt;date_received = CAMEL_MESSAGE_DATE_CURRENT;</div><div class='del'>-	mime_message-&gt;date_received_offset = 0;</div><div class='del'>-	mime_message-&gt;message_id = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-camel_mime_message_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (object);</div><div class='del'>-	</div><div class='del'>-	g_free (message-&gt;subject);</div><div class='del'>-	</div><div class='del'>-	g_free (message-&gt;message_id);</div><div class='del'>-	</div><div class='del'>-	if (message-&gt;reply_to)</div><div class='del'>-		camel_object_unref ((CamelObject *)message-&gt;reply_to);</div><div class='del'>-	</div><div class='del'>-	if (message-&gt;from)</div><div class='del'>-		camel_object_unref ((CamelObject *)message-&gt;from);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_foreach (message-&gt;recipients, unref_recipient, NULL);</div><div class='del'>-	g_hash_table_destroy (message-&gt;recipients);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_message_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_message_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_message_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mime_message_type = camel_type_register (camel_mime_part_get_type(), "CamelMimeMessage",</div><div class='del'>-							       sizeof (CamelMimeMessage),</div><div class='del'>-							       sizeof (CamelMimeMessageClass),</div><div class='del'>-							       (CamelObjectClassInitFunc) camel_mime_message_class_init,</div><div class='del'>-							       NULL,</div><div class='del'>-							       (CamelObjectInitFunc) camel_mime_message_init,</div><div class='del'>-							       (CamelObjectFinalizeFunc) camel_mime_message_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_message_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unref_recipient (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_mime_message_new (void) </div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mime_message;</div><div class='del'>-	mime_message = CAMEL_MIME_MESSAGE (camel_object_new (CAMEL_MIME_MESSAGE_TYPE));</div><div class='del'>-	</div><div class='del'>-	return mime_message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Date: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_date (CamelMimeMessage *message,  time_t date, int offset)</div><div class='del'>-{</div><div class='del'>-	char *datestr;</div><div class='del'>-	</div><div class='del'>-	g_assert(message);</div><div class='del'>-	</div><div class='del'>-	if (date == CAMEL_MESSAGE_DATE_CURRENT) {</div><div class='del'>-		struct tm *local;</div><div class='del'>-		int tz;</div><div class='del'>-		</div><div class='del'>-		date = time(0);</div><div class='del'>-		local = localtime(&amp;date);</div><div class='del'>-#if defined(HAVE_TIMEZONE)</div><div class='del'>-		tz = timezone;</div><div class='del'>-#elif defined(HAVE_TM_GMTOFF)</div><div class='del'>-		tz = -local-&gt;tm_gmtoff;</div><div class='del'>-#endif</div><div class='del'>-		offset = -(((tz/60/60) * 100) + (tz/60 % 60));</div><div class='del'>-#ifdef HAVE_TIMEZONE</div><div class='del'>-		/* tm.tm_gmtoff is already adjusted for DST */</div><div class='del'>-		if (local-&gt;tm_isdst&gt;0)</div><div class='del'>-			offset += 100;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	message-&gt;date = date;</div><div class='del'>-	message-&gt;date_offset = offset;</div><div class='del'>-	</div><div class='del'>-	datestr = header_format_date (date, offset);</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header ((CamelMedium *)message, "Date", datestr);</div><div class='del'>-	g_free (datestr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-camel_mime_message_get_date (CamelMimeMessage *msg, int *offset)</div><div class='del'>-{</div><div class='del'>-	if (offset)</div><div class='del'>-		*offset = msg-&gt;date_offset;</div><div class='del'>-	</div><div class='del'>-	return msg-&gt;date;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-time_t</div><div class='del'>-camel_mime_message_get_date_received (CamelMimeMessage *msg, int *offset)</div><div class='del'>-{</div><div class='del'>-	if (msg-&gt;date_received == CAMEL_MESSAGE_DATE_CURRENT) {</div><div class='del'>-		const char *received;</div><div class='del'>-		</div><div class='del'>-		received = camel_medium_get_header ((CamelMedium *)msg, "received");</div><div class='del'>-		if (received)</div><div class='del'>-			received = strrchr (received, ';');</div><div class='del'>-		if (received)</div><div class='del'>-			msg-&gt;date_received = header_decode_date (received + 1, &amp;msg-&gt;date_received_offset);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (offset)</div><div class='del'>-		*offset = msg-&gt;date_received_offset;</div><div class='del'>-	</div><div class='del'>-	return msg-&gt;date_received;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Message-Id: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_message_id (CamelMimeMessage *mime_message, const char *message_id)</div><div class='del'>-{</div><div class='del'>-	char *id;</div><div class='del'>-	</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	g_free (mime_message-&gt;message_id);</div><div class='del'>-	</div><div class='del'>-	if (message_id) {</div><div class='del'>-		id = g_strstrip (g_strdup (message_id));</div><div class='del'>-	} else {</div><div class='del'>-		id = header_msgid_generate ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	mime_message-&gt;message_id = id;</div><div class='del'>-	id = g_strdup_printf ("&lt;%s&gt;", mime_message-&gt;message_id);</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), "Message-Id", id);</div><div class='del'>-	g_free (id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_mime_message_get_message_id (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	return mime_message-&gt;message_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Reply-To: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_reply_to (CamelMimeMessage *msg, const CamelInternetAddress *reply_to)</div><div class='del'>-{</div><div class='del'>-	char *addr;</div><div class='del'>-	</div><div class='del'>-	g_assert(msg);</div><div class='del'>-	</div><div class='del'>-	if (msg-&gt;reply_to) {</div><div class='del'>-		camel_object_unref ((CamelObject *)msg-&gt;reply_to);</div><div class='del'>-		msg-&gt;reply_to = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (reply_to == NULL) {</div><div class='del'>-		CAMEL_MEDIUM_CLASS (parent_class)-&gt;remove_header (CAMEL_MEDIUM (msg), "Reply-To");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	msg-&gt;reply_to = (CamelInternetAddress *)camel_address_new_clone ((CamelAddress *)reply_to);</div><div class='del'>-	addr = camel_address_encode ((CamelAddress *)msg-&gt;reply_to);</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (msg), "Reply-To", addr);</div><div class='del'>-	g_free (addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const CamelInternetAddress *</div><div class='del'>-camel_mime_message_get_reply_to (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	/* TODO: ref for threading? */</div><div class='del'>-	</div><div class='del'>-	return mime_message-&gt;reply_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Subject: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_subject (CamelMimeMessage *mime_message, const char *subject)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	</div><div class='del'>-	g_assert(mime_message);</div><div class='del'>-	</div><div class='del'>-	g_free (mime_message-&gt;subject);</div><div class='del'>-	mime_message-&gt;subject = g_strstrip (g_strdup (subject));</div><div class='del'>-	text = header_encode_string((unsigned char *)mime_message-&gt;subject);</div><div class='del'>-	CAMEL_MEDIUM_CLASS(parent_class)-&gt;set_header(CAMEL_MEDIUM (mime_message), "Subject", text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_mime_message_get_subject (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	g_assert(mime_message);</div><div class='del'>-	</div><div class='del'>-	return mime_message-&gt;subject;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* *** From: */</div><div class='del'>-</div><div class='del'>-/* Thought: Since get_from/set_from are so rarely called, it is probably not useful</div><div class='del'>-   to cache the from (and reply_to) addresses as InternetAddresses internally, we</div><div class='del'>-   could just get it from the headers and reprocess every time. */</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_from (CamelMimeMessage *msg, const CamelInternetAddress *from)</div><div class='del'>-{</div><div class='del'>-	char *addr;</div><div class='del'>-	</div><div class='del'>-	g_assert(msg);</div><div class='del'>-	</div><div class='del'>-	if (msg-&gt;from) {</div><div class='del'>-		camel_object_unref((CamelObject *)msg-&gt;from);</div><div class='del'>-		msg-&gt;from = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (from == NULL || camel_address_length((CamelAddress *)from) == 0) {</div><div class='del'>-		CAMEL_MEDIUM_CLASS(parent_class)-&gt;remove_header(CAMEL_MEDIUM(msg), "From");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	msg-&gt;from = (CamelInternetAddress *)camel_address_new_clone((CamelAddress *)from);</div><div class='del'>-	addr = camel_address_encode((CamelAddress *)msg-&gt;from);</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header(CAMEL_MEDIUM(msg), "From", addr);</div><div class='del'>-	g_free(addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const CamelInternetAddress *</div><div class='del'>-camel_mime_message_get_from (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	/* TODO: we should really ref this for multi-threading to work */</div><div class='del'>-	</div><div class='del'>-	return mime_message-&gt;from;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*  **** To: Cc: Bcc: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_recipients(CamelMimeMessage *mime_message, const char *type, const CamelInternetAddress *r)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	</div><div class='del'>-	g_assert(mime_message);</div><div class='del'>-	</div><div class='del'>-	addr = g_hash_table_lookup (mime_message-&gt;recipients, type);</div><div class='del'>-	if (addr == NULL) {</div><div class='del'>-		g_warning ("trying to set a non-valid receipient type: %s", type);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (r == NULL || camel_address_length ((CamelAddress *)r) == 0) {</div><div class='del'>-		camel_address_remove ((CamelAddress *)addr, -1);</div><div class='del'>-		CAMEL_MEDIUM_CLASS (parent_class)-&gt;remove_header (CAMEL_MEDIUM (mime_message), type);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* note this does copy, and not append (cat) */</div><div class='del'>-	camel_address_copy ((CamelAddress *)addr, (const CamelAddress *)r);</div><div class='del'>-	</div><div class='del'>-	/* and sync our headers */</div><div class='del'>-	text = camel_address_encode (CAMEL_ADDRESS (addr));</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), type, text);</div><div class='del'>-	g_free(text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_source (CamelMimeMessage *mime_message, const char *src)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	char *uri;</div><div class='del'>-	</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	url = camel_url_new (src, NULL);</div><div class='del'>-	if (url) {</div><div class='del'>-		uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-		camel_medium_add_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source", uri);</div><div class='del'>-		g_free (uri);</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_mime_message_get_source (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	const char *src;</div><div class='del'>-	</div><div class='del'>-	g_assert(mime_message);</div><div class='del'>-	</div><div class='del'>-	src = camel_medium_get_header (CAMEL_MEDIUM (mime_message), "X-Evolution-Source");</div><div class='del'>-	if (src) {</div><div class='del'>-		while (*src &amp;&amp; isspace ((unsigned) *src))</div><div class='del'>-			++src;</div><div class='del'>-	}</div><div class='del'>-	return src;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const CamelInternetAddress *</div><div class='del'>-camel_mime_message_get_recipients (CamelMimeMessage *mime_message, const char *type)</div><div class='del'>-{</div><div class='del'>-	g_assert(mime_message);</div><div class='del'>-	</div><div class='del'>-	return g_hash_table_lookup (mime_message-&gt;recipients, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mime_message */</div><div class='del'>-static int</div><div class='del'>-construct_from_parser (CamelMimePart *dw, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	int len;</div><div class='del'>-	int state;</div><div class='del'>-	int ret;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	d(printf("constructing mime-message\n"));</div><div class='del'>-</div><div class='del'>-	d(printf("mime_message::construct_from_parser()\n"));</div><div class='del'>-</div><div class='del'>-	/* let the mime-part construct the guts ... */</div><div class='del'>-	ret = ((CamelMimePartClass *)parent_class)-&gt;construct_from_parser(dw, mp);</div><div class='del'>-</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* ... then clean up the follow-on state */</div><div class='del'>-	state = camel_mime_parser_step (mp, &amp;buf, &amp;len);</div><div class='del'>-	switch (state) {</div><div class='del'>-	case HSCAN_EOF: case HSCAN_FROM_END: /* these doesn't belong to us */</div><div class='del'>-		camel_mime_parser_unstep (mp);</div><div class='del'>-	case HSCAN_MESSAGE_END:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error ("Bad parser state: Expecing MESSAGE_END or EOF or EOM, got: %d", camel_mime_parser_state (mp));</div><div class='del'>-		camel_mime_parser_unstep (mp);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("mime_message::construct_from_parser() leaving\n"));</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "return a real error code"</div><div class='del'>-#endif</div><div class='del'>-	err = camel_mime_parser_errno(mp);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		errno = err;</div><div class='del'>-		ret = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mm = CAMEL_MIME_MESSAGE (data_wrapper);</div><div class='del'>-	</div><div class='del'>-	/* force mandatory headers ... */</div><div class='del'>-	if (mm-&gt;from == NULL) {</div><div class='del'>-		/* FIXME: should we just abort?  Should we make one up? */</div><div class='del'>-		g_warning ("No from set for message");</div><div class='del'>-		camel_medium_set_header ((CamelMedium *)mm, "From", "");</div><div class='del'>-	}</div><div class='del'>-	if (!camel_medium_get_header ((CamelMedium *)mm, "Date"))</div><div class='del'>-		camel_mime_message_set_date (mm, CAMEL_MESSAGE_DATE_CURRENT, 0);</div><div class='del'>-	</div><div class='del'>-	if (mm-&gt;subject == NULL)</div><div class='del'>-		camel_mime_message_set_subject (mm, "No Subject");</div><div class='del'>-	</div><div class='del'>-	if (mm-&gt;message_id == NULL)</div><div class='del'>-		camel_mime_message_set_message_id (mm, NULL);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: "To" header needs to be set explicitly as well ... */</div><div class='del'>-	</div><div class='del'>-	if (!camel_medium_get_header ((CamelMedium *)mm, "Mime-Version"))</div><div class='del'>-		camel_medium_set_header ((CamelMedium *)mm, "Mime-Version", "1.0");</div><div class='del'>-	</div><div class='del'>-	return CAMEL_DATA_WRAPPER_CLASS (parent_class)-&gt;write_to_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: check format of fields. */</div><div class='del'>-static gboolean</div><div class='del'>-process_header (CamelMedium *medium, const char *header_name, const char *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelHeaderType header_type;</div><div class='del'>-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (medium);</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	const char *charset;</div><div class='del'>-	</div><div class='del'>-	header_type = (CamelHeaderType)g_hash_table_lookup (header_name_table, header_name);</div><div class='del'>-	switch (header_type) {</div><div class='del'>-	case HEADER_FROM:</div><div class='del'>-		if (message-&gt;from)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (message-&gt;from));</div><div class='del'>-		message-&gt;from = camel_internet_address_new ();</div><div class='del'>-		camel_address_decode (CAMEL_ADDRESS (message-&gt;from), header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_REPLY_TO:</div><div class='del'>-		if (message-&gt;reply_to)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (message-&gt;reply_to));</div><div class='del'>-		message-&gt;reply_to = camel_internet_address_new ();</div><div class='del'>-		camel_address_decode (CAMEL_ADDRESS (message-&gt;reply_to), header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_SUBJECT:</div><div class='del'>-		g_free (message-&gt;subject);</div><div class='del'>-		if (((CamelMimePart *)message)-&gt;content_type)</div><div class='del'>-			charset = e_iconv_charset_name(header_content_type_param(((CamelMimePart *)message)-&gt;content_type, "charset"));</div><div class='del'>-		else</div><div class='del'>-			charset = NULL;</div><div class='del'>-		message-&gt;subject = g_strstrip (header_decode_string (header_value, charset));</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_TO:</div><div class='del'>-	case HEADER_CC:</div><div class='del'>-	case HEADER_BCC:</div><div class='del'>-	case HEADER_RESENT_TO:</div><div class='del'>-	case HEADER_RESENT_CC:</div><div class='del'>-	case HEADER_RESENT_BCC:</div><div class='del'>-		addr = g_hash_table_lookup (message-&gt;recipients, header_name);</div><div class='del'>-		if (header_value)</div><div class='del'>-			camel_address_decode (CAMEL_ADDRESS (addr), header_value);</div><div class='del'>-		else</div><div class='del'>-			camel_address_remove (CAMEL_ADDRESS (addr), -1);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_DATE:</div><div class='del'>-		if (header_value) {</div><div class='del'>-			message-&gt;date = header_decode_date (header_value, &amp;message-&gt;date_offset);</div><div class='del'>-		} else {</div><div class='del'>-			message-&gt;date = CAMEL_MESSAGE_DATE_CURRENT;</div><div class='del'>-			message-&gt;date_offset = 0;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_MESSAGE_ID:</div><div class='del'>-		g_free (message-&gt;message_id);</div><div class='del'>-		if (header_value)</div><div class='del'>-			message-&gt;message_id = header_msgid_decode (header_value);</div><div class='del'>-		else</div><div class='del'>-			message-&gt;message_id = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	process_header (medium, header_name, header_value);</div><div class='del'>-	parent_class-&gt;parent_class.set_header (medium, header_name, header_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	/* if we process it, then it must be forced unique as well ... */</div><div class='del'>-	if (process_header (medium, header_name, header_value))</div><div class='del'>-		parent_class-&gt;parent_class.set_header (medium, header_name, header_value);</div><div class='del'>-	else</div><div class='del'>-		parent_class-&gt;parent_class.add_header (medium, header_name, header_value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_header (CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	process_header (medium, header_name, NULL);</div><div class='del'>-	parent_class-&gt;parent_class.remove_header (medium, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*CamelPartFunc)(CamelMimeMessage *, CamelMimePart *, void *data);</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-message_foreach_part_rec (CamelMimeMessage *msg, CamelMimePart *part, CamelPartFunc callback, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *containee;</div><div class='del'>-	int parts, i;</div><div class='del'>-	int go = TRUE;</div><div class='del'>-	</div><div class='del'>-	if (callback (msg, part, data) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-	</div><div class='del'>-	if (containee == NULL)</div><div class='del'>-		return go;</div><div class='del'>-	</div><div class='del'>-	/* using the object types is more accurate than using the mime/types */</div><div class='del'>-	if (CAMEL_IS_MULTIPART (containee)) {</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));</div><div class='del'>-		for (i = 0; go &amp;&amp; i &lt; parts; i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);</div><div class='del'>-			</div><div class='del'>-			go = message_foreach_part_rec (msg, part, callback, data);</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {</div><div class='del'>-		go = message_foreach_part_rec (msg, (CamelMimePart *)containee, callback, data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return go;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* dont make this public yet, it might need some more thinking ... */</div><div class='del'>-/* MPZ */</div><div class='del'>-static void</div><div class='del'>-camel_mime_message_foreach_part (CamelMimeMessage *msg, CamelPartFunc callback, void *data)</div><div class='del'>-{</div><div class='del'>-	message_foreach_part_rec (msg, (CamelMimePart *)msg, callback, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-check_8bit (CamelMimeMessage *msg, CamelMimePart *part, void *data)</div><div class='del'>-{</div><div class='del'>-	int *has8bit = data;</div><div class='del'>-	</div><div class='del'>-	/* check this part, and stop as soon as we are done */</div><div class='del'>-	*has8bit = camel_mime_part_get_encoding (part) == CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-	return !(*has8bit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_mime_message_has_8bit_parts (CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	int has8bit = FALSE;</div><div class='del'>-	</div><div class='del'>-	camel_mime_message_foreach_part (msg, check_8bit, &amp;has8bit);</div><div class='del'>-	</div><div class='del'>-	return has8bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* finds the best charset and transfer encoding for a given part */</div><div class='del'>-static CamelMimePartEncodingType</div><div class='del'>-find_best_encoding (CamelMimePart *part, CamelBestencRequired required, CamelBestencEncoding enctype, char **charsetp)</div><div class='del'>-{</div><div class='del'>-	const char *charsetin = NULL;</div><div class='del'>-	char *charset = NULL;</div><div class='del'>-	CamelStream *null;</div><div class='del'>-	CamelStreamFilter *filter;</div><div class='del'>-	CamelMimeFilterCharset *charenc = NULL;</div><div class='del'>-	CamelMimeFilterBestenc *bestenc;</div><div class='del'>-	int idb, idc = -1;</div><div class='del'>-	gboolean istext;</div><div class='del'>-	unsigned int flags, callerflags;</div><div class='del'>-	CamelMimePartEncodingType encoding;</div><div class='del'>-	CamelDataWrapper *content;</div><div class='del'>-	</div><div class='del'>-	/* we use all these weird stream things so we can do it with streams, and</div><div class='del'>-	   not have to read the whole lot into memory - although i have a feeling</div><div class='del'>-	   it would make things a fair bit simpler to do so ... */</div><div class='del'>-	</div><div class='del'>-	d(printf("starting to check part\n"));</div><div class='del'>-	</div><div class='del'>-	content = camel_medium_get_content_object ((CamelMedium *)part);</div><div class='del'>-	if (content == NULL) {</div><div class='del'>-		/* charset might not be right here, but it'll get the right stuff</div><div class='del'>-		   if it is ever set */</div><div class='del'>-		*charsetp = NULL;</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	istext = header_content_type_is (part-&gt;content_type, "text", "*");</div><div class='del'>-	if (istext) {</div><div class='del'>-		flags = CAMEL_BESTENC_GET_CHARSET | CAMEL_BESTENC_GET_ENCODING;</div><div class='del'>-	} else {</div><div class='del'>-		flags = CAMEL_BESTENC_GET_ENCODING;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* when building the message, any encoded parts are translated already */</div><div class='del'>-	flags |= CAMEL_BESTENC_LF_IS_CRLF;</div><div class='del'>-	/* and get any flags the caller passed in */</div><div class='del'>-	callerflags = (required &amp; CAMEL_BESTENC_NO_FROM);</div><div class='del'>-	flags |= callerflags;</div><div class='del'>-	</div><div class='del'>-	/* first a null stream, so any filtering is thrown away; we only want the sideeffects */</div><div class='del'>-	null = (CamelStream *)camel_stream_null_new ();</div><div class='del'>-	filter = camel_stream_filter_new_with_stream (null);</div><div class='del'>-	</div><div class='del'>-	/* if we're not looking for the best charset, then use the one we have */</div><div class='del'>-	if (istext &amp;&amp; (required &amp; CAMEL_BESTENC_GET_CHARSET) == 0</div><div class='del'>-	    &amp;&amp; (charsetin = header_content_type_param (part-&gt;content_type, "charset"))) {</div><div class='del'>-		/* if libunicode doesn't support it, we dont really have utf8 anyway, so</div><div class='del'>-		   we dont need a converter */</div><div class='del'>-		charenc = camel_mime_filter_charset_new_convert ("UTF-8", charsetin);</div><div class='del'>-		if (charenc != NULL)</div><div class='del'>-			idc = camel_stream_filter_add (filter, (CamelMimeFilter *)charenc);</div><div class='del'>-		charsetin = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	bestenc = camel_mime_filter_bestenc_new (flags);</div><div class='del'>-	idb = camel_stream_filter_add (filter, (CamelMimeFilter *)bestenc);</div><div class='del'>-	d(printf("writing to checking stream\n"));</div><div class='del'>-	camel_data_wrapper_write_to_stream (content, (CamelStream *)filter);</div><div class='del'>-	camel_stream_filter_remove (filter, idb);</div><div class='del'>-	if (idc != -1) {</div><div class='del'>-		camel_stream_filter_remove (filter, idc);</div><div class='del'>-		camel_object_unref ((CamelObject *)charenc);</div><div class='del'>-		charenc = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (istext)</div><div class='del'>-		charsetin = camel_mime_filter_bestenc_get_best_charset (bestenc);</div><div class='del'>-	</div><div class='del'>-	d(printf("charsetin = %s\n", charsetin ? charsetin : "(null)"));</div><div class='del'>-	</div><div class='del'>-	/* if we have US-ASCII, or we're not doing text, we dont need to bother with the rest */</div><div class='del'>-	if (charsetin != NULL &amp;&amp; (required &amp; CAMEL_BESTENC_GET_CHARSET) != 0) {</div><div class='del'>-		charset = g_strdup (charsetin);</div><div class='del'>-		</div><div class='del'>-		d(printf("have charset, trying conversion/etc\n"));</div><div class='del'>-		</div><div class='del'>-		/* now the 'bestenc' can has told us what the best encoding is, we can use that to create</div><div class='del'>-		   a charset conversion filter as well, and then re-add the bestenc to filter the</div><div class='del'>-		   result to find the best encoding to use as well */</div><div class='del'>-		</div><div class='del'>-		charenc = camel_mime_filter_charset_new_convert ("UTF-8", charset);</div><div class='del'>-		</div><div class='del'>-		/* eek, libunicode doesn't undertand this charset anyway, then the 'utf8' we</div><div class='del'>-		   thought we had is really the native format, in which case, we just treat</div><div class='del'>-		   it as binary data (and take the result we have so far) */</div><div class='del'>-		</div><div class='del'>-		if (charenc != NULL) {</div><div class='del'>-			/* otherwise, try another pass, converting to the real charset */</div><div class='del'>-			</div><div class='del'>-			camel_mime_filter_reset ((CamelMimeFilter *)bestenc);</div><div class='del'>-			camel_mime_filter_bestenc_set_flags (bestenc, CAMEL_BESTENC_GET_ENCODING |</div><div class='del'>-							     CAMEL_BESTENC_LF_IS_CRLF | callerflags);</div><div class='del'>-			</div><div class='del'>-			camel_stream_filter_add (filter, (CamelMimeFilter *)charenc);</div><div class='del'>-			camel_stream_filter_add (filter, (CamelMimeFilter *)bestenc);</div><div class='del'>-			</div><div class='del'>-			/* and write it to the new stream */</div><div class='del'>-			camel_data_wrapper_write_to_stream (content, (CamelStream *)filter);</div><div class='del'>-			</div><div class='del'>-			camel_object_unref ((CamelObject *)charenc);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, enctype);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref ((CamelObject *)filter);</div><div class='del'>-	camel_object_unref ((CamelObject *)bestenc);</div><div class='del'>-	camel_object_unref ((CamelObject *)null);</div><div class='del'>-	</div><div class='del'>-	d(printf("done, best encoding = %d\n", encoding));</div><div class='del'>-	</div><div class='del'>-	if (charsetp)</div><div class='del'>-		*charsetp = charset;</div><div class='del'>-	else</div><div class='del'>-		g_free (charset);</div><div class='del'>-	</div><div class='del'>-	return encoding;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _enc_data {</div><div class='del'>-	CamelBestencRequired required;</div><div class='del'>-	CamelBestencEncoding enctype;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-best_encoding (CamelMimeMessage *msg, CamelMimePart *part, void *datap)</div><div class='del'>-{</div><div class='del'>-	struct _enc_data *data = datap;</div><div class='del'>-	CamelMimePartEncodingType encoding;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	char *charset;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-	if (!wrapper)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* we only care about actual content objects */</div><div class='del'>-	if (!CAMEL_IS_MULTIPART (wrapper) &amp;&amp; !CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-		encoding = find_best_encoding (part, data-&gt;required, data-&gt;enctype, &amp;charset);</div><div class='del'>-		/* we always set the encoding, if we got this far.  GET_CHARSET implies</div><div class='del'>-		   also GET_ENCODING */</div><div class='del'>-		camel_mime_part_set_encoding (part, encoding);</div><div class='del'>-		</div><div class='del'>-		if ((data-&gt;required &amp; CAMEL_BESTENC_GET_CHARSET) != 0) {</div><div class='del'>-			if (header_content_type_is (part-&gt;content_type, "text", "*")) {</div><div class='del'>-				char *newct;</div><div class='del'>-				</div><div class='del'>-				/* FIXME: ick, the part content_type interface needs fixing bigtime */</div><div class='del'>-				header_content_type_set_param (part-&gt;content_type, "charset",</div><div class='del'>-							       charset ? charset : "us-ascii");</div><div class='del'>-				newct = header_content_type_format (part-&gt;content_type);</div><div class='del'>-				if (newct) {</div><div class='del'>-					d(printf("Setting content-type to %s\n", newct));</div><div class='del'>-					</div><div class='del'>-					camel_mime_part_set_content_type (part, newct);</div><div class='del'>-					g_free (newct);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_set_best_encoding (CamelMimeMessage *msg, CamelBestencRequired required, CamelBestencEncoding enctype)</div><div class='del'>-{</div><div class='del'>-	struct _enc_data data;</div><div class='del'>-	</div><div class='del'>-	if ((required &amp; (CAMEL_BESTENC_GET_ENCODING|CAMEL_BESTENC_GET_CHARSET)) == 0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	data.required = required;</div><div class='del'>-	data.enctype = enctype;</div><div class='del'>-	</div><div class='del'>-	camel_mime_message_foreach_part (msg, best_encoding, &amp;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	camel_mime_message_set_best_encoding (mime_message, CAMEL_BESTENC_GET_ENCODING, CAMEL_BESTENC_7BIT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _check_content_id {</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	const char *content_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-check_content_id (CamelMimeMessage *message, CamelMimePart *part, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _check_content_id *check = (struct _check_content_id *) data;</div><div class='del'>-	const char *content_id;</div><div class='del'>-	gboolean found;</div><div class='del'>-	</div><div class='del'>-	content_id = camel_mime_part_get_content_id (part);</div><div class='del'>-	</div><div class='del'>-	found = content_id &amp;&amp; !strcmp (content_id, check-&gt;content_id) ? TRUE : FALSE;</div><div class='del'>-	if (found) {</div><div class='del'>-		check-&gt;part = part;</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return !found;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *id)</div><div class='del'>-{</div><div class='del'>-	struct _check_content_id check;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);</div><div class='del'>-	</div><div class='del'>-	if (id == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	check.content_id = id;</div><div class='del'>-	check.part = NULL;</div><div class='del'>-	</div><div class='del'>-	camel_mime_message_foreach_part (message, check_content_id, &amp;check);</div><div class='del'>-	</div><div class='del'>-	return check.part;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h<br/>deleted file mode 100644<br/>index 7735cc1775..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-message.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camelMimeMessage.h : class for a mime message</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MIME_MESSAGE_H</div><div class='del'>-#define CAMEL_MIME_MESSAGE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-internet-address.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-bestenc.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_TO "To"</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_CC "Cc"</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_BCC "Bcc"</div><div class='del'>-</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_RESENT_TO "Resent-To"</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_RESENT_CC "Resent-Cc"</div><div class='del'>-#define CAMEL_RECIPIENT_TYPE_RESENT_BCC "Resent-Bcc"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_MESSAGE_TYPE     (camel_mime_message_get_type ())</div><div class='del'>-#define CAMEL_MIME_MESSAGE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))</div><div class='del'>-#define CAMEL_MIME_MESSAGE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))</div><div class='del'>-#define CAMEL_IS_MIME_MESSAGE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* specify local time */</div><div class='del'>-#define CAMEL_MESSAGE_DATE_CURRENT (~0)</div><div class='del'>-</div><div class='del'>-struct _CamelMimeMessage</div><div class='del'>-{</div><div class='del'>-	CamelMimePart parent_object;</div><div class='del'>-</div><div class='del'>-	/* header fields */</div><div class='del'>-	time_t date;</div><div class='del'>-	int date_offset;	/* GMT offset */</div><div class='del'>-</div><div class='del'>-	/* cached internal copy */</div><div class='del'>-	time_t date_received;</div><div class='del'>-	int date_received_offset;	/* GMT offset */</div><div class='del'>-</div><div class='del'>-	char *subject;</div><div class='del'>-</div><div class='del'>-	char *message_id;</div><div class='del'>-</div><div class='del'>-	CamelInternetAddress *reply_to;</div><div class='del'>-	CamelInternetAddress *from;</div><div class='del'>-</div><div class='del'>-	GHashTable *recipients;	/* hash table of CamelInternetAddress's */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelMimePartClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-</div><div class='del'>-} CamelMimeMessageClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType                   camel_mime_message_get_type           (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMimeMessage           *camel_mime_message_new                (void);</div><div class='del'>-void                        camel_mime_message_set_date           (CamelMimeMessage           *mime_message,</div><div class='del'>-								   time_t                      date,</div><div class='del'>-								   int                         offset);</div><div class='del'>-time_t                      camel_mime_message_get_date           (CamelMimeMessage           *mime_message,</div><div class='del'>-								   int                        *offset);</div><div class='del'>-time_t                      camel_mime_message_get_date_received  (CamelMimeMessage           *mime_message,</div><div class='del'>-								   int                        *offset);</div><div class='del'>-void                        camel_mime_message_set_message_id     (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const char                 *message_id);</div><div class='del'>-const char                 *camel_mime_message_get_message_id     (CamelMimeMessage           *mime_message);</div><div class='del'>-void                        camel_mime_message_set_reply_to       (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const CamelInternetAddress *reply_to);</div><div class='del'>-const CamelInternetAddress *camel_mime_message_get_reply_to       (CamelMimeMessage           *mime_message);</div><div class='del'>-</div><div class='del'>-void                        camel_mime_message_set_subject        (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const char                 *subject);</div><div class='del'>-const char                 *camel_mime_message_get_subject        (CamelMimeMessage           *mime_message);</div><div class='del'>-void                        camel_mime_message_set_from           (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const CamelInternetAddress *from);</div><div class='del'>-const CamelInternetAddress *camel_mime_message_get_from           (CamelMimeMessage           *mime_message);</div><div class='del'>-</div><div class='del'>-const CamelInternetAddress *camel_mime_message_get_recipients     (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const char                 *type);</div><div class='del'>-void                        camel_mime_message_set_recipients     (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const char                 *type,</div><div class='del'>-								   const CamelInternetAddress *r);</div><div class='del'>-</div><div class='del'>-void                        camel_mime_message_set_source         (CamelMimeMessage           *mime_message,</div><div class='del'>-								   const char                 *identity);</div><div class='del'>-const char                 *camel_mime_message_get_source         (CamelMimeMessage           *mime_message);</div><div class='del'>-								   </div><div class='del'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-gboolean                    camel_mime_message_has_8bit_parts     (CamelMimeMessage           *mime_message);</div><div class='del'>-void                        camel_mime_message_set_best_encoding  (CamelMimeMessage           *msg,</div><div class='del'>-								   CamelBestencRequired        required,</div><div class='del'>-								   CamelBestencEncoding        enctype);</div><div class='del'>-void                        camel_mime_message_encode_8bit_parts  (CamelMimeMessage           *mime_message);</div><div class='del'>-</div><div class='del'>-CamelMimePart              *camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *content_id);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MIME_MESSAGE_H */</div><div class='head'>diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c<br/>deleted file mode 100644<br/>index f57583135d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1986 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* What should hopefully be a fast mail parser */</div><div class='del'>-</div><div class='del'>-/* Do not change this code without asking me (Michael Zucchi) first</div><div class='del'>-</div><div class='del'>-   There is almost always a reason something was done a certain way.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-mime-parser.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-mime-filter.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-seekable-stream.h"</div><div class='del'>-</div><div class='del'>-#define r(x) </div><div class='del'>-#define h(x) </div><div class='del'>-#define c(x)  </div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-/*#define PURIFY*/</div><div class='del'>-</div><div class='del'>-#define MEMPOOL</div><div class='del'>-</div><div class='del'>-#define STRUCT_ALIGN 4</div><div class='del'>-</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-int inend_id = -1,</div><div class='del'>-  inbuffer_id = -1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-extern int strdup_count;</div><div class='del'>-extern int malloc_count;</div><div class='del'>-extern int free_count;</div><div class='del'>-</div><div class='del'>-#define g_strdup(x) (strdup_count++, g_strdup(x))</div><div class='del'>-#define g_malloc(x) (malloc_count++, g_malloc(x))</div><div class='del'>-#define g_free(x) (free_count++, g_free(x))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-typedef struct _MemPoolNode {</div><div class='del'>-	struct _MemPoolNode *next;</div><div class='del'>-</div><div class='del'>-	int free;</div><div class='del'>-	char data[1];</div><div class='del'>-} MemPoolNode;</div><div class='del'>-</div><div class='del'>-typedef struct _MemPoolThresholdNode {</div><div class='del'>-	struct _MemPoolThresholdNode *next;</div><div class='del'>-	char data[1];</div><div class='del'>-} MemPoolThresholdNode;</div><div class='del'>-</div><div class='del'>-typedef struct _MemPool {</div><div class='del'>-	int blocksize;</div><div class='del'>-	int threshold;</div><div class='del'>-	struct _MemPoolNode *blocks;</div><div class='del'>-	struct _MemPoolThresholdNode *threshold_blocks;</div><div class='del'>-} MemPool;</div><div class='del'>-</div><div class='del'>-MemPool *mempool_new(int blocksize, int threshold);</div><div class='del'>-void *mempool_alloc(MemPool *pool, int size);</div><div class='del'>-void mempool_flush(MemPool *pool, int freeall);</div><div class='del'>-void mempool_free(MemPool *pool);</div><div class='del'>-</div><div class='del'>-MemPool *mempool_new(int blocksize, int threshold)</div><div class='del'>-{</div><div class='del'>-	MemPool *pool;</div><div class='del'>-</div><div class='del'>-	pool = g_malloc(sizeof(*pool));</div><div class='del'>-	if (threshold &gt;= blocksize)</div><div class='del'>-		threshold = blocksize * 2 / 3;</div><div class='del'>-	pool-&gt;blocksize = blocksize;</div><div class='del'>-	pool-&gt;threshold = threshold;</div><div class='del'>-	pool-&gt;blocks = NULL;</div><div class='del'>-	pool-&gt;threshold_blocks = NULL;</div><div class='del'>-	return pool;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *mempool_alloc(MemPool *pool, int size)</div><div class='del'>-{</div><div class='del'>-	size = (size + STRUCT_ALIGN) &amp; (~(STRUCT_ALIGN-1));</div><div class='del'>-	if (size&gt;=pool-&gt;threshold) {</div><div class='del'>-		MemPoolThresholdNode *n;</div><div class='del'>-</div><div class='del'>-		n = g_malloc(sizeof(*n) - sizeof(char) + size);</div><div class='del'>-		n-&gt;next = pool-&gt;threshold_blocks;</div><div class='del'>-		pool-&gt;threshold_blocks = n;</div><div class='del'>-		return &amp;n-&gt;data[0];</div><div class='del'>-	} else {</div><div class='del'>-		MemPoolNode *n;</div><div class='del'>-</div><div class='del'>-		n = pool-&gt;blocks;</div><div class='del'>-		while (n) {</div><div class='del'>-			if (n-&gt;free &gt;= size) {</div><div class='del'>-				n-&gt;free -= size;</div><div class='del'>-				return &amp;n-&gt;data[n-&gt;free];</div><div class='del'>-			}</div><div class='del'>-			n = n-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		n = g_malloc(sizeof(*n) - sizeof(char) + pool-&gt;blocksize);</div><div class='del'>-		n-&gt;next = pool-&gt;blocks;</div><div class='del'>-		pool-&gt;blocks = n;</div><div class='del'>-		n-&gt;free = pool-&gt;blocksize - size;</div><div class='del'>-		return &amp;n-&gt;data[n-&gt;free];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mempool_flush(MemPool *pool, int freeall)</div><div class='del'>-{</div><div class='del'>-	MemPoolThresholdNode *tn, *tw;</div><div class='del'>-	MemPoolNode *pw, *pn;</div><div class='del'>-</div><div class='del'>-	tw = pool-&gt;threshold_blocks;</div><div class='del'>-	while (tw) {</div><div class='del'>-		tn = tw-&gt;next;</div><div class='del'>-		g_free(tw);</div><div class='del'>-		tw = tn;</div><div class='del'>-	}</div><div class='del'>-	pool-&gt;threshold_blocks = NULL;</div><div class='del'>-</div><div class='del'>-	if (freeall) {</div><div class='del'>-		pw = pool-&gt;blocks;</div><div class='del'>-		while (pw) {</div><div class='del'>-			pn = pw-&gt;next;</div><div class='del'>-			g_free(pw);</div><div class='del'>-			pw = pn;</div><div class='del'>-		}</div><div class='del'>-		pool-&gt;blocks = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		pw = pool-&gt;blocks;</div><div class='del'>-		while (pw) {</div><div class='del'>-			pw-&gt;free = pool-&gt;blocksize;</div><div class='del'>-			pw = pw-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void mempool_free(MemPool *pool)</div><div class='del'>-{</div><div class='del'>-	if (pool) {</div><div class='del'>-		mempool_flush(pool, 1);</div><div class='del'>-		g_free(pool);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SCAN_BUF 4096		/* size of read buffer */</div><div class='del'>-#define SCAN_HEAD 128		/* headroom guaranteed to be before each read buffer */</div><div class='del'>-</div><div class='del'>-/* a little hacky, but i couldn't be bothered renaming everything */</div><div class='del'>-#define _header_scan_state _CamelMimeParserPrivate</div><div class='del'>-#define _PRIVATE(o) (((CamelMimeParser *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _header_scan_state {</div><div class='del'>-</div><div class='del'>-    /* global state */</div><div class='del'>-</div><div class='del'>-	enum _header_state state;</div><div class='del'>-</div><div class='del'>-	/* for building headers during scanning */</div><div class='del'>-	char *outbuf;</div><div class='del'>-	char *outptr;</div><div class='del'>-	char *outend;</div><div class='del'>-</div><div class='del'>-	int fd;			/* input for a fd input */</div><div class='del'>-	CamelStream *stream;	/* or for a stream */</div><div class='del'>-</div><div class='del'>-	int ioerrno;		/* io error state */</div><div class='del'>-</div><div class='del'>-	/* for scanning input buffers */</div><div class='del'>-	char *realbuf;		/* the real buffer, SCAN_HEAD*2 + SCAN_BUF bytes */</div><div class='del'>-	char *inbuf;		/* points to a subset of the allocated memory, the underflow */</div><div class='del'>-	char *inptr;		/* (upto SCAN_HEAD) is for use by filters so they dont copy all data */</div><div class='del'>-	char *inend;</div><div class='del'>-</div><div class='del'>-	int atleast;</div><div class='del'>-</div><div class='del'>-	off_t seek;		/* current offset to start of buffer */</div><div class='del'>-	int unstep;		/* how many states to 'unstep' (repeat the current state) */</div><div class='del'>-</div><div class='del'>-	unsigned int midline:1;		/* are we mid-line interrupted? */</div><div class='del'>-	unsigned int scan_from:1;	/* do we care about From lines? */</div><div class='del'>-	unsigned int scan_pre_from:1;	/* do we return pre-from data? */</div><div class='del'>-</div><div class='del'>-	off_t start_of_from;	/* where from started */</div><div class='del'>-	off_t start_of_headers;	/* where headers started from the last scan */</div><div class='del'>-</div><div class='del'>-	off_t header_start;	/* start of last header, or -1 */</div><div class='del'>-</div><div class='del'>-	/* filters to apply to all content before output */</div><div class='del'>-	int filterid;		/* id of next filter */</div><div class='del'>-	struct _header_scan_filter *filters;</div><div class='del'>-</div><div class='del'>-    /* per message/part info */</div><div class='del'>-	struct _header_scan_stack *parts;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _header_scan_stack {</div><div class='del'>-	struct _header_scan_stack *parent;</div><div class='del'>-</div><div class='del'>-	enum _header_state savestate; /* state at invocation of this part */</div><div class='del'>-</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-	MemPool *pool;		/* memory pool to keep track of headers/etc at this level */</div><div class='del'>-#endif</div><div class='del'>-	struct _header_raw *headers;	/* headers for this part */</div><div class='del'>-</div><div class='del'>-	struct _header_content_type *content_type;</div><div class='del'>-</div><div class='del'>-	/* I dont use GString's casue you can't efficiently append a buffer to them */</div><div class='del'>-	GByteArray *pretext;	/* for multipart types, save the pre-boundary data here */</div><div class='del'>-	GByteArray *posttext;	/* for multipart types, save the post-boundary data here */</div><div class='del'>-	int prestage;		/* used to determine if it is a pre-boundary or post-boundary data segment */</div><div class='del'>-</div><div class='del'>-	GByteArray *from_line;	/* the from line */</div><div class='del'>-</div><div class='del'>-	char *boundary;		/* for multipart/ * boundaries, including leading -- and trailing -- for the final part */</div><div class='del'>-	int boundarylen;	/* actual length of boundary, including leading -- if there is one */</div><div class='del'>-	int boundarylenfinal;	/* length of boundary, including trailing -- if there is one */</div><div class='del'>-	int atleast;		/* the biggest boundary from here to the parent */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _header_scan_filter {</div><div class='del'>-	struct _header_scan_filter *next;</div><div class='del'>-	int id;</div><div class='del'>-	CamelMimeFilter *filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength);</div><div class='del'>-static void folder_scan_drop_step(struct _header_scan_state *s);</div><div class='del'>-static int folder_scan_init_with_fd(struct _header_scan_state *s, int fd);</div><div class='del'>-static int folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream);</div><div class='del'>-static struct _header_scan_state *folder_scan_init(void);</div><div class='del'>-static void folder_scan_close(struct _header_scan_state *s);</div><div class='del'>-static struct _header_scan_stack *folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length);</div><div class='del'>-static struct _header_scan_stack *folder_scan_header(struct _header_scan_state *s, int *lastone);</div><div class='del'>-static int folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save);</div><div class='del'>-static off_t folder_seek(struct _header_scan_state *s, off_t offset, int whence);</div><div class='del'>-static off_t folder_tell(struct _header_scan_state *s);</div><div class='del'>-static int folder_read(struct _header_scan_state *s);</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-static void header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void camel_mime_parser_class_init (CamelMimeParserClass *klass);</div><div class='del'>-static void camel_mime_parser_init       (CamelMimeParser *obj);</div><div class='del'>-</div><div class='del'>-#if d(!)0</div><div class='del'>-static char *states[] = {</div><div class='del'>-	"HSCAN_INITIAL",</div><div class='del'>-	"HSCAN_PRE_FROM",	/* pre-from data */</div><div class='del'>-	"HSCAN_FROM",		/* got 'From' line */</div><div class='del'>-	"HSCAN_HEADER",		/* toplevel header */</div><div class='del'>-	"HSCAN_BODY",		/* scanning body of message */</div><div class='del'>-	"HSCAN_MULTIPART",	/* got multipart header */</div><div class='del'>-	"HSCAN_MESSAGE",	/* rfc822/news message */</div><div class='del'>-</div><div class='del'>-	"HSCAN_PART",		/* part of a multipart */</div><div class='del'>-</div><div class='del'>-	"HSCAN_EOF",		/* end of file */</div><div class='del'>-	"HSCAN_PRE_FROM_END",</div><div class='del'>-	"HSCAN_FROM_END",</div><div class='del'>-	"HSCAN_HEAER_END",</div><div class='del'>-	"HSCAN_BODY_END",</div><div class='del'>-	"HSCAN_MULTIPART_END",</div><div class='del'>-	"HSCAN_MESSAGE_END",</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_mime_parser_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_parser_class_init (CamelMimeParserClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_mime_parser_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_parser_init (CamelMimeParser *obj)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s;</div><div class='del'>-</div><div class='del'>-	s = folder_scan_init();</div><div class='del'>-	_PRIVATE(obj) = s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_parser_finalise(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(o);</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	purify_watch_remove_all();</div><div class='del'>-#endif</div><div class='del'>-	folder_scan_close(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_parser_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelMimeParser",</div><div class='del'>-					    sizeof (CamelMimeParser),</div><div class='del'>-					    sizeof (CamelMimeParserClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_parser_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_parser_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_parser_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeParser object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeParser widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeParser *</div><div class='del'>-camel_mime_parser_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *new = CAMEL_MIME_PARSER ( camel_object_new (camel_mime_parser_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_filter_add:</div><div class='del'>- * @m: </div><div class='del'>- * @mf: </div><div class='del'>- * </div><div class='del'>- * Add a filter that will be applied to any body content before it is passed</div><div class='del'>- * to the caller.  Filters may be pipelined to perform multi-pass operations</div><div class='del'>- * on the content, and are applied in the order they were added.</div><div class='del'>- *</div><div class='del'>- * Note that filters are only applied to the body content of messages, and once</div><div class='del'>- * a filter has been set, all content returned by a filter_step() with a state</div><div class='del'>- * of HSCAN_BODY will have passed through the filter.</div><div class='del'>- * </div><div class='del'>- * Return value: An id that may be passed to filter_remove() to remove</div><div class='del'>- * the filter, or -1 if the operation failed.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_parser_filter_add(CamelMimeParser *m, CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	struct _header_scan_filter *f, *new;</div><div class='del'>-</div><div class='del'>-	new = g_malloc(sizeof(*new));</div><div class='del'>-	new-&gt;filter = mf;</div><div class='del'>-	new-&gt;id = s-&gt;filterid++;</div><div class='del'>-	if (s-&gt;filterid == -1)</div><div class='del'>-		s-&gt;filterid++;</div><div class='del'>-	new-&gt;next = 0;</div><div class='del'>-	camel_object_ref((CamelObject *)mf);</div><div class='del'>-</div><div class='del'>-	/* yes, this is correct, since 'next' is the first element of the struct */</div><div class='del'>-	f = (struct _header_scan_filter *)&amp;s-&gt;filters;</div><div class='del'>-	while (f-&gt;next)</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	f-&gt;next = new;</div><div class='del'>-	return new-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_filter_remove:</div><div class='del'>- * @m: </div><div class='del'>- * @id: </div><div class='del'>- * </div><div class='del'>- * Remove a processing filter from the pipeline.  There is no</div><div class='del'>- * restriction on the order the filters can be removed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_mime_parser_filter_remove(CamelMimeParser *m, int id)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	struct _header_scan_filter *f, *old;</div><div class='del'>-	</div><div class='del'>-	f = (struct _header_scan_filter *)&amp;s-&gt;filters;</div><div class='del'>-	while (f &amp;&amp; f-&gt;next) {</div><div class='del'>-		old = f-&gt;next;</div><div class='del'>-		if (old-&gt;id == id) {</div><div class='del'>-			camel_object_unref((CamelObject *)old-&gt;filter);</div><div class='del'>-			f-&gt;next = old-&gt;next;</div><div class='del'>-			g_free(old);</div><div class='del'>-			/* there should only be a single matching id, but</div><div class='del'>-			   scan the whole lot anyway */</div><div class='del'>-		}</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_header:</div><div class='del'>- * @m: </div><div class='del'>- * @name: Name of header.</div><div class='del'>- * @offset: Pointer that can receive the offset of the header in</div><div class='del'>- * the stream from the start of parsing.</div><div class='del'>- * </div><div class='del'>- * Lookup a header by name.</div><div class='del'>- * </div><div class='del'>- * Return value: The header value, or NULL if the header is not</div><div class='del'>- * defined.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_header(CamelMimeParser *m, const char *name, int *offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts &amp;&amp;</div><div class='del'>-	    s-&gt;parts-&gt;headers) {</div><div class='del'>-		return header_raw_find(&amp;s-&gt;parts-&gt;headers, name, offset);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_headers_raw:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the list of the raw headers which are defined for the</div><div class='del'>- * current state of the parser.  These headers are valid</div><div class='del'>- * until the next call to parser_step(), or parser_drop_step().</div><div class='del'>- * </div><div class='del'>- * Return value: The raw headers, or NULL if there are no headers</div><div class='del'>- * defined for the current part or state.  These are READ ONLY.</div><div class='del'>- **/</div><div class='del'>-struct _header_raw *</div><div class='del'>-camel_mime_parser_headers_raw(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return s-&gt;parts-&gt;headers;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-byte_array_to_string(GByteArray *array)</div><div class='del'>-{</div><div class='del'>-	if (array == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (array-&gt;len == 0 || array-&gt;data[array-&gt;len-1] != '\0')</div><div class='del'>-		g_byte_array_append(array, "", 1);</div><div class='del'>-</div><div class='del'>-	return array-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_preface:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Retrieve the preface text for the current multipart.</div><div class='del'>- * Can only be used when the state is HSCAN_MULTIPART_END.</div><div class='del'>- * </div><div class='del'>- * Return value: The preface text, or NULL if there wasn't any.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_preface(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return byte_array_to_string(s-&gt;parts-&gt;pretext);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_postface:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Retrieve the postface text for the current multipart.</div><div class='del'>- * Only returns valid data when the current state if</div><div class='del'>- * HSCAN_MULTIPART_END.</div><div class='del'>- * </div><div class='del'>- * Return value: The postface text, or NULL if there wasn't any.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_postface(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return byte_array_to_string(s-&gt;parts-&gt;posttext);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_from_line:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the last scanned "From " line, from a recently scanned from.</div><div class='del'>- * This should only be called in the HSCAN_FROM state.  The</div><div class='del'>- * from line will include the closing \n found (if there was one).</div><div class='del'>- *</div><div class='del'>- * The return value will remain valid while in the HSCAN_FROM</div><div class='del'>- * state, or any deeper state.</div><div class='del'>- * </div><div class='del'>- * Return value: The From line, or NULL if called out of context.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_from_line(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return byte_array_to_string(s-&gt;parts-&gt;from_line);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_init_with_fd:</div><div class='del'>- * @m: </div><div class='del'>- * @fd: A valid file descriptor.</div><div class='del'>- * </div><div class='del'>- * Initialise the scanner with an fd.  The scanner's offsets</div><div class='del'>- * will be relative to the current file position of the file</div><div class='del'>- * descriptor.  As a result, seekable descritors should</div><div class='del'>- * be seeked using the parser seek functions.</div><div class='del'>- * </div><div class='del'>- * An initial buffer will be read from the file descriptor</div><div class='del'>- * immediately, although no parsing will occur.</div><div class='del'>- *</div><div class='del'>- * Return value: Returns -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_parser_init_with_fd(CamelMimeParser *m, int fd)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return folder_scan_init_with_fd(s, fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_init_with_stream:</div><div class='del'>- * @m: </div><div class='del'>- * @stream: </div><div class='del'>- * </div><div class='del'>- * Initialise the scanner with a source stream.  The scanner's</div><div class='del'>- * offsets will be relative to the current file position of</div><div class='del'>- * the stream.  As a result, seekable streams should only</div><div class='del'>- * be seeked using the parser seek function.</div><div class='del'>- *</div><div class='del'>- * An initial buffer will be read from the stream</div><div class='del'>- * immediately, although no parsing will occur.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return folder_scan_init_with_stream(s, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_scan_from:</div><div class='del'>- * @m: </div><div class='del'>- * @scan_from: #TRUE if the scanner should scan From lines.</div><div class='del'>- * </div><div class='del'>- * Tell the scanner if it should scan "^From " lines or not.</div><div class='del'>- *</div><div class='del'>- * If the scanner is scanning from lines, two additional</div><div class='del'>- * states HSCAN_FROM and HSCAN_FROM_END will be returned</div><div class='del'>- * to the caller during parsing.</div><div class='del'>- *</div><div class='del'>- * This may also be preceeded by an optional</div><div class='del'>- * HSCAN_PRE_FROM state which contains the scanned data</div><div class='del'>- * found before the From line is encountered.  See also</div><div class='del'>- * scan_pre_from().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_mime_parser_scan_from(CamelMimeParser *m, int scan_from)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	s-&gt;scan_from = scan_from;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_scan_pre_from:</div><div class='del'>- * @: </div><div class='del'>- * @scan_pre_from: #TRUE if we want to get pre-from data.</div><div class='del'>- * </div><div class='del'>- * Tell the scanner whether we want to know abou the pre-from</div><div class='del'>- * data during a scan.  If we do, then we may get an additional</div><div class='del'>- * state HSCAN_PRE_FROM which returns the specified data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_mime_parser_scan_pre_from(CamelMimeParser *m, int scan_pre_from)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	s-&gt;scan_pre_from = scan_pre_from;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_content_type:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the content type defined in the current part.</div><div class='del'>- * </div><div class='del'>- * Return value: A content_type structure, or NULL if there</div><div class='del'>- * is no content-type defined for this part of state of the</div><div class='del'>- * parser.</div><div class='del'>- **/</div><div class='del'>-struct _header_content_type *</div><div class='del'>-camel_mime_parser_content_type(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	/* FIXME: should this search up until it's found the 'right'</div><div class='del'>-	   content-type?  can it? */</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return s-&gt;parts-&gt;content_type;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_unstep:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Cause the last step operation to repeat itself.  If this is </div><div class='del'>- * called repeated times, then the same step will be repeated</div><div class='del'>- * that many times.</div><div class='del'>- *</div><div class='del'>- * Note that it is not possible to scan back using this function,</div><div class='del'>- * only to have a way of peeking the next state.</div><div class='del'>- **/</div><div class='del'>-void camel_mime_parser_unstep(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	s-&gt;unstep++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_drop_step:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Drop the last step call.  This should only be used</div><div class='del'>- * in conjunction with seeking of the stream as the</div><div class='del'>- * stream may be in an undefined state relative to the</div><div class='del'>- * state of the parser.</div><div class='del'>- *</div><div class='del'>- * Use this call with care.</div><div class='del'>- **/</div><div class='del'>-void camel_mime_parser_drop_step(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	s-&gt;unstep = 0;</div><div class='del'>-	folder_scan_drop_step(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_step:</div><div class='del'>- * @m: </div><div class='del'>- * @databuffer: Pointer to accept a pointer to the data</div><div class='del'>- * associated with this step (if any).  May be #NULL,</div><div class='del'>- * in which case datalength is also ingored.</div><div class='del'>- * @datalength: Pointer to accept a pointer to the data</div><div class='del'>- * length associated with this step (if any).</div><div class='del'>- * </div><div class='del'>- * Parse the next part of the MIME message.  If _unstep()</div><div class='del'>- * has been called, then continue to return the same state</div><div class='del'>- * for that many calls.</div><div class='del'>- *</div><div class='del'>- * If the step is HSCAN_BODY then the databuffer and datalength</div><div class='del'>- * pointers will be setup to point to the internal data buffer</div><div class='del'>- * of the scanner and may be processed as required.  Any</div><div class='del'>- * filters will have already been applied to this data.</div><div class='del'>- *</div><div class='del'>- * Refer to the state diagram elsewhere for a full listing of</div><div class='del'>- * the states an application is gauranteed to get from the</div><div class='del'>- * scanner.</div><div class='del'>- *</div><div class='del'>- * Return value: The current new state of the parser</div><div class='del'>- * is returned.</div><div class='del'>- **/</div><div class='del'>-enum _header_state</div><div class='del'>-camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	d(printf("OLD STATE:  '%s' :\n", states[s-&gt;state]));</div><div class='del'>-</div><div class='del'>-	if (s-&gt;unstep &lt;= 0) {</div><div class='del'>-		char *dummy;</div><div class='del'>-		int dummylength;</div><div class='del'>-</div><div class='del'>-		if (databuffer == NULL) {</div><div class='del'>-			databuffer = &amp;dummy;</div><div class='del'>-			datalength = &amp;dummylength;</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		folder_scan_step(s, databuffer, datalength);</div><div class='del'>-	} else</div><div class='del'>-		s-&gt;unstep--;</div><div class='del'>-</div><div class='del'>-	d(printf("NEW STATE:  '%s' :\n", states[s-&gt;state]));</div><div class='del'>-</div><div class='del'>-	return s-&gt;state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_read:</div><div class='del'>- * @m: </div><div class='del'>- * @databuffer: </div><div class='del'>- * @len: </div><div class='del'>- * </div><div class='del'>- * Read at most @len bytes from the internal mime parser buffer.</div><div class='del'>- *</div><div class='del'>- * Returns the address of the internal buffer in @databuffer,</div><div class='del'>- * and the length of useful data.</div><div class='del'>- *</div><div class='del'>- * @len may be specified as INT_MAX, in which case you will</div><div class='del'>- * get the full remainder of the buffer at each call.</div><div class='del'>- *</div><div class='del'>- * Note that no parsing of the data read through this function</div><div class='del'>- * occurs, so no state changes occur, but the seek position</div><div class='del'>- * is updated appropriately.</div><div class='del'>- *</div><div class='del'>- * Return value: The number of bytes available, or -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	int there;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	d(printf("parser::read() reading %d bytes\n", len));</div><div class='del'>-</div><div class='del'>-	there = MIN(s-&gt;inend - s-&gt;inptr, len);</div><div class='del'>-	d(printf("parser::read() there = %d bytes\n", there));</div><div class='del'>-	if (there &gt; 0) {</div><div class='del'>-		*databuffer = s-&gt;inptr;</div><div class='del'>-		s-&gt;inptr += there;</div><div class='del'>-		return there;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (folder_read(s) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	there = MIN(s-&gt;inend - s-&gt;inptr, len);</div><div class='del'>-	d(printf("parser::read() had to re-read, now there = %d bytes\n", there));</div><div class='del'>-</div><div class='del'>-	*databuffer = s-&gt;inptr;</div><div class='del'>-	s-&gt;inptr += there;</div><div class='del'>-</div><div class='del'>-	return there;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_tell:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Return the current scanning offset.  The meaning of this</div><div class='del'>- * value will depend on the current state of the parser.</div><div class='del'>- *</div><div class='del'>- * An incomplete listing of the states:</div><div class='del'>- *</div><div class='del'>- * HSCAN_INITIAL, The start of the current message.</div><div class='del'>- * HSCAN_HEADER, HSCAN_MESSAGE, HSCAN_MULTIPART, the character</div><div class='del'>- * position immediately after the end of the header.</div><div class='del'>- * HSCAN_BODY, Position within the message of the start</div><div class='del'>- * of the current data block.</div><div class='del'>- * HSCAN_*_END, The position of the character starting</div><div class='del'>- * the next section of the scan (the last position + 1 of</div><div class='del'>- * the respective current state).</div><div class='del'>- * </div><div class='del'>- * Return value: See above.</div><div class='del'>- **/</div><div class='del'>-off_t camel_mime_parser_tell(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return folder_tell(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_tell_start_headers:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Find out the position within the file of where the</div><div class='del'>- * headers started, this is cached by the parser</div><div class='del'>- * at the time.</div><div class='del'>- * </div><div class='del'>- * Return value: The header start position, or -1 if</div><div class='del'>- * no headers were scanned in the current state.</div><div class='del'>- **/</div><div class='del'>-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return s-&gt;start_of_headers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_tell_start_from:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * If the parser is scanning From lines, then this returns</div><div class='del'>- * the position of the start of the From line.</div><div class='del'>- * </div><div class='del'>- * Return value: The start of the from line, or -1 if there</div><div class='del'>- * was no From line, or From lines are not being scanned.</div><div class='del'>- **/</div><div class='del'>-off_t camel_mime_parser_tell_start_from(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return s-&gt;start_of_from;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_seek:</div><div class='del'>- * @m: </div><div class='del'>- * @off: Number of bytes to offset the seek by.</div><div class='del'>- * @whence: SEEK_SET, SEEK_CUR, SEEK_END</div><div class='del'>- * </div><div class='del'>- * Reset the source position to a known value.</div><div class='del'>- *</div><div class='del'>- * Note that if the source stream/descriptor was not</div><div class='del'>- * positioned at 0 to begin with, and an absolute seek</div><div class='del'>- * is specified (whence != SEEK_CUR), then the seek</div><div class='del'>- * position may not match the desired seek position.</div><div class='del'>- * </div><div class='del'>- * Return value: The new seek offset, or -1 on</div><div class='del'>- * an error (for example, trying to seek on a non-seekable</div><div class='del'>- * stream or file descriptor).</div><div class='del'>- **/</div><div class='del'>-off_t camel_mime_parser_seek(CamelMimeParser *m, off_t off, int whence)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	return folder_seek(s, off, whence);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_state:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the current parser state.</div><div class='del'>- * </div><div class='del'>- * Return value: The current parser state.</div><div class='del'>- **/</div><div class='del'>-enum _header_state camel_mime_parser_state(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	return s-&gt;state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_stream:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the stream, if any, the parser has been initialised</div><div class='del'>- * with.  May be used to setup sub-streams, but should not</div><div class='del'>- * be read from directly (without saving and restoring</div><div class='del'>- * the seek position in between).</div><div class='del'>- * </div><div class='del'>- * Return value: The stream from _init_with_stream(), or NULL</div><div class='del'>- * if the parser is reading from a file descriptor or is</div><div class='del'>- * uninitialised.</div><div class='del'>- **/</div><div class='del'>-CamelStream *camel_mime_parser_stream(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	return s-&gt;stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_fd:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Return the file descriptor, if any, the parser has been</div><div class='del'>- * initialised with.</div><div class='del'>- *</div><div class='del'>- * Should not be read from unless the parser it to terminate,</div><div class='del'>- * or the seek offset can be reset before the next parse</div><div class='del'>- * step.</div><div class='del'>- * </div><div class='del'>- * Return value: The file descriptor or -1 if the parser</div><div class='del'>- * is reading from a stream or has not been initialised.</div><div class='del'>- **/</div><div class='del'>-int camel_mime_parser_fd(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	return s-&gt;fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Return errno of the parser, incase any error occured during processing */</div><div class='del'>-int camel_mime_parser_errno(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	return s-&gt;ioerrno;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/*    Implementation							  */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/* read the next bit of data, ensure there is enough room 'atleast' bytes */</div><div class='del'>-static int</div><div class='del'>-folder_read(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-	int inoffset;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;inptr&lt;s-&gt;inend-s-&gt;atleast)</div><div class='del'>-		return s-&gt;inend-s-&gt;inptr;</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	purify_watch_remove(inend_id);</div><div class='del'>-	purify_watch_remove(inbuffer_id);</div><div class='del'>-#endif</div><div class='del'>-	/* check for any remaning bytes (under the atleast limit( */</div><div class='del'>-	inoffset = s-&gt;inend - s-&gt;inptr;</div><div class='del'>-	if (inoffset&gt;0) {</div><div class='del'>-		memcpy(s-&gt;inbuf, s-&gt;inptr, inoffset);</div><div class='del'>-	}</div><div class='del'>-	if (s-&gt;stream) {</div><div class='del'>-		len = camel_stream_read(s-&gt;stream, s-&gt;inbuf+inoffset, SCAN_BUF-inoffset);</div><div class='del'>-	} else {</div><div class='del'>-		len = read(s-&gt;fd, s-&gt;inbuf+inoffset, SCAN_BUF-inoffset);</div><div class='del'>-	}</div><div class='del'>-	r(printf("read %d bytes, offset = %d\n", len, inoffset));</div><div class='del'>-	if (len&gt;=0) {</div><div class='del'>-		/* add on the last read block */</div><div class='del'>-		s-&gt;seek += s-&gt;inptr - s-&gt;inbuf;</div><div class='del'>-		s-&gt;inptr = s-&gt;inbuf;</div><div class='del'>-		s-&gt;inend = s-&gt;inbuf+len+inoffset;</div><div class='del'>-		r(printf("content = %d '%.*s'\n",s-&gt;inend - s-&gt;inptr,  s-&gt;inend - s-&gt;inptr, s-&gt;inptr));</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;ioerrno = errno?errno:EIO;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;inptr&lt;=s-&gt;inend);</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	inend_id = purify_watch(&amp;s-&gt;inend);</div><div class='del'>-	inbuffer_id = purify_watch_n(s-&gt;inend+1, SCAN_HEAD-1, "rw");</div><div class='del'>-#endif</div><div class='del'>-	r(printf("content = %d '%.*s'\n", s-&gt;inend - s-&gt;inptr,  s-&gt;inend - s-&gt;inptr, s-&gt;inptr));</div><div class='del'>-	/* set a sentinal, for the inner loops to check against */</div><div class='del'>-	s-&gt;inend[0] = '\n';</div><div class='del'>-	return s-&gt;inend-s-&gt;inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return the current absolute position of the data pointer */</div><div class='del'>-static off_t</div><div class='del'>-folder_tell(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	return s-&gt;seek + (s-&gt;inptr - s-&gt;inbuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  need some way to prime the parser state, so this actually works for </div><div class='del'>-  other than top-level messages</div><div class='del'>-*/</div><div class='del'>-static off_t</div><div class='del'>-folder_seek(struct _header_scan_state *s, off_t offset, int whence)</div><div class='del'>-{</div><div class='del'>-	off_t newoffset;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;stream) {</div><div class='del'>-		if (CAMEL_IS_SEEKABLE_STREAM(s-&gt;stream)) {</div><div class='del'>-			/* NOTE: assumes whence seekable stream == whence libc, which is probably</div><div class='del'>-			   the case (or bloody well should've been) */</div><div class='del'>-			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s-&gt;stream, offset, whence);</div><div class='del'>-		} else {</div><div class='del'>-			newoffset = -1;</div><div class='del'>-			errno = EINVAL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		newoffset = lseek(s-&gt;fd, offset, whence);</div><div class='del'>-	}</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	purify_watch_remove(inend_id);</div><div class='del'>-	purify_watch_remove(inbuffer_id);</div><div class='del'>-#endif</div><div class='del'>-	if (newoffset != -1) {</div><div class='del'>-		s-&gt;seek = newoffset;</div><div class='del'>-		s-&gt;inptr = s-&gt;inbuf;</div><div class='del'>-		s-&gt;inend = s-&gt;inbuf;</div><div class='del'>-		if (s-&gt;stream)</div><div class='del'>-			len = camel_stream_read(s-&gt;stream, s-&gt;inbuf, SCAN_BUF);</div><div class='del'>-		else</div><div class='del'>-			len = read(s-&gt;fd, s-&gt;inbuf, SCAN_BUF);</div><div class='del'>-		if (len&gt;=0) {</div><div class='del'>-			s-&gt;inend = s-&gt;inbuf+len;</div><div class='del'>-			s-&gt;inend[0] = '\n';</div><div class='del'>-		} else {</div><div class='del'>-			newoffset = -1;</div><div class='del'>-			s-&gt;ioerrno = errno?errno:EIO;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;ioerrno = errno?errno:EIO;</div><div class='del'>-	}</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	inend_id = purify_watch(&amp;s-&gt;inend);</div><div class='del'>-	inbuffer_id = purify_watch_n(s-&gt;inend+1, SCAN_HEAD-1, "rw");</div><div class='del'>-#endif</div><div class='del'>-	return newoffset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_push_part(struct _header_scan_state *s, struct _header_scan_stack *h)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;parts &amp;&amp; s-&gt;parts-&gt;atleast &gt; h-&gt;boundarylenfinal)</div><div class='del'>-		h-&gt;atleast = s-&gt;parts-&gt;atleast;</div><div class='del'>-	else</div><div class='del'>-		h-&gt;atleast = MAX(h-&gt;boundarylenfinal, 1);</div><div class='del'>-</div><div class='del'>-	h-&gt;parent = s-&gt;parts;</div><div class='del'>-	s-&gt;parts = h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_pull_part(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_stack *h;</div><div class='del'>-</div><div class='del'>-	h = s-&gt;parts;</div><div class='del'>-	if (h) {</div><div class='del'>-		s-&gt;parts = h-&gt;parent;</div><div class='del'>-		g_free(h-&gt;boundary);</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-		mempool_free(h-&gt;pool);</div><div class='del'>-#else</div><div class='del'>-		header_raw_clear(&amp;h-&gt;headers);</div><div class='del'>-#endif</div><div class='del'>-		header_content_type_unref(h-&gt;content_type);</div><div class='del'>-		if (h-&gt;pretext)</div><div class='del'>-			g_byte_array_free(h-&gt;pretext, TRUE);</div><div class='del'>-		if (h-&gt;posttext)</div><div class='del'>-			g_byte_array_free(h-&gt;posttext, TRUE);</div><div class='del'>-		if (h-&gt;from_line)</div><div class='del'>-			g_byte_array_free(h-&gt;from_line, TRUE);</div><div class='del'>-		g_free(h);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning("Header stack underflow!\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-folder_scan_skip_line(struct _header_scan_state *s, GByteArray *save)</div><div class='del'>-{</div><div class='del'>-	int atleast = s-&gt;atleast;</div><div class='del'>-	register char *inptr, *inend, c;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	s-&gt;atleast = 1;</div><div class='del'>-</div><div class='del'>-	while ( (len = folder_read(s)) &gt; 0 &amp;&amp; len &gt; s-&gt;atleast) { /* ensure we have at least enough room here */</div><div class='del'>-		inptr = s-&gt;inptr;</div><div class='del'>-		inend = s-&gt;inend-1;</div><div class='del'>-</div><div class='del'>-		c = -1;</div><div class='del'>-		while (inptr&lt;inend</div><div class='del'>-		       &amp;&amp; (c = *inptr++)!='\n')</div><div class='del'>-			;</div><div class='del'>-</div><div class='del'>-		if (save)</div><div class='del'>-			g_byte_array_append(save, s-&gt;inptr, inptr-s-&gt;inptr);</div><div class='del'>-</div><div class='del'>-		s-&gt;inptr = inptr;</div><div class='del'>-</div><div class='del'>-		if (c=='\n') {</div><div class='del'>-			s-&gt;atleast = atleast;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;atleast = atleast;</div><div class='del'>-</div><div class='del'>-	return -1;		/* not found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* TODO: Is there any way to make this run faster?  It gets called a lot ... */</div><div class='del'>-static struct _header_scan_stack *</div><div class='del'>-folder_boundary_check(struct _header_scan_state *s, const char *boundary, int *lastone)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_stack *part;</div><div class='del'>-	int len = s-&gt;atleast;	/* make sure we dont access past the buffer */</div><div class='del'>-	</div><div class='del'>-	h(printf("checking boundary marker upto %d bytes\n", len));</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-	while (part) {</div><div class='del'>-		h(printf("  boundary: %s\n", part-&gt;boundary));</div><div class='del'>-		h(printf("   against: '%.*s'\n", s-&gt;atleast, boundary));</div><div class='del'>-		if (part-&gt;boundary</div><div class='del'>-		    &amp;&amp; part-&gt;boundarylen &lt;= len</div><div class='del'>-		    &amp;&amp; memcmp(boundary, part-&gt;boundary, part-&gt;boundarylen)==0) {</div><div class='del'>-			h(printf("matched boundary: %s\n", part-&gt;boundary));</div><div class='del'>-			/* again, make sure we're in range */</div><div class='del'>-			if (part-&gt;boundarylenfinal &lt;= len) {</div><div class='del'>-				int extra = part-&gt;boundarylenfinal - part-&gt;boundarylen;</div><div class='del'>-				</div><div class='del'>-				/* check the extra stuff on an final boundary, normally -- for mime parts */</div><div class='del'>-				if (extra&gt;0) {</div><div class='del'>-					*lastone = memcmp(&amp;boundary[part-&gt;boundarylen],</div><div class='del'>-							  &amp;part-&gt;boundary[part-&gt;boundarylen],</div><div class='del'>-							  extra) == 0;</div><div class='del'>-				} else {</div><div class='del'>-					*lastone = TRUE;</div><div class='del'>-				}</div><div class='del'>-				h(printf("checking lastone = %s\n", *lastone?"TRUE":"FALSE"));</div><div class='del'>-			} else {</div><div class='del'>-				h(printf("not enough room to check last one?\n"));</div><div class='del'>-				*lastone = FALSE;</div><div class='del'>-			}</div><div class='del'>-			/*printf("ok, we found it! : %s \n", (*lastone)?"Last one":"More to come?");*/</div><div class='del'>-			return part;</div><div class='del'>-		}</div><div class='del'>-		part = part-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-static void</div><div class='del'>-header_append_mempool(struct _header_scan_state *s, struct _header_scan_stack *h, char *header, int offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *n;</div><div class='del'>-	char *content;</div><div class='del'>-	</div><div class='del'>-	content = strchr(header, ':');</div><div class='del'>-	if (content) {</div><div class='del'>-		register int len;</div><div class='del'>-		n = mempool_alloc(h-&gt;pool, sizeof(*n));</div><div class='del'>-		n-&gt;next = NULL;</div><div class='del'>-		</div><div class='del'>-		len = content-header;</div><div class='del'>-		n-&gt;name = mempool_alloc(h-&gt;pool, len+1);</div><div class='del'>-		memcpy(n-&gt;name, header, len);</div><div class='del'>-		n-&gt;name[len] = 0;</div><div class='del'>-		</div><div class='del'>-		content++;</div><div class='del'>-		</div><div class='del'>-		len = s-&gt;outptr - content;</div><div class='del'>-		n-&gt;value = mempool_alloc(h-&gt;pool, len+1);</div><div class='del'>-		memcpy(n-&gt;value, content, len);</div><div class='del'>-		n-&gt;value[len] = 0;</div><div class='del'>-		</div><div class='del'>-		n-&gt;offset = offset;</div><div class='del'>-		</div><div class='del'>-		l = (struct _header_raw *)&amp;h-&gt;headers;</div><div class='del'>-		while (l-&gt;next) {</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		l-&gt;next = n;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define header_raw_append_parse(a, b, c) (header_append_mempool(s, h, b, c))</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Copy the string start-&gt;inptr into the header buffer (s-&gt;outbuf),</div><div class='del'>-   grow if necessary</div><div class='del'>-   remove trailing \r chars (\n's assumed already removed)</div><div class='del'>-   and track the start offset of the header */</div><div class='del'>-/* Basically an optimised version of g_byte_array_append() */</div><div class='del'>-#define header_append(s, start, inptr)								\</div><div class='del'>-{												\</div><div class='del'>-	register int headerlen = inptr-start;							\</div><div class='del'>-												\</div><div class='del'>-	if (headerlen &gt; 0) {									\</div><div class='del'>-		if (headerlen &gt;= (s-&gt;outend - s-&gt;outptr)) {					\</div><div class='del'>-			register char *outnew;							\</div><div class='del'>-			register int len = ((s-&gt;outend - s-&gt;outbuf)+headerlen)*2+1;		\</div><div class='del'>-			outnew = g_realloc(s-&gt;outbuf, len);					\</div><div class='del'>-			s-&gt;outptr = s-&gt;outptr - s-&gt;outbuf + outnew;				\</div><div class='del'>-			s-&gt;outbuf = outnew;							\</div><div class='del'>-			s-&gt;outend = outnew + len;						\</div><div class='del'>-		}										\</div><div class='del'>-		if (start[headerlen-1] == '\r')							\</div><div class='del'>-			headerlen--;								\</div><div class='del'>-		memcpy(s-&gt;outptr, start, headerlen);						\</div><div class='del'>-		s-&gt;outptr += headerlen;								\</div><div class='del'>-	}											\</div><div class='del'>-	if (s-&gt;header_start == -1)								\</div><div class='del'>-		s-&gt;header_start = (start-s-&gt;inbuf) + s-&gt;seek;					\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_scan_stack *</div><div class='del'>-folder_scan_header(struct _header_scan_state *s, int *lastone)</div><div class='del'>-{</div><div class='del'>-	int atleast = s-&gt;atleast, newatleast;</div><div class='del'>-	char *start = NULL;</div><div class='del'>-	int len;</div><div class='del'>-	struct _header_scan_stack *h;</div><div class='del'>-	char *inend;</div><div class='del'>-	register char *inptr;</div><div class='del'>-</div><div class='del'>-	h(printf("scanning first bit\n"));</div><div class='del'>-</div><div class='del'>-	h = g_malloc0(sizeof(*h));</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-	h-&gt;pool = mempool_new(8192, 4096);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		newatleast = s-&gt;parts-&gt;atleast;</div><div class='del'>-	else</div><div class='del'>-		newatleast = 1;</div><div class='del'>-	*lastone = FALSE;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		s-&gt;atleast = newatleast;</div><div class='del'>-</div><div class='del'>-		h(printf("atleast = %d\n", s-&gt;atleast));</div><div class='del'>-</div><div class='del'>-		while ((len = folder_read(s))&gt;0 &amp;&amp; len &gt;= s-&gt;atleast) { /* ensure we have at least enough room here */</div><div class='del'>-			inptr = s-&gt;inptr;</div><div class='del'>-			inend = s-&gt;inend-s-&gt;atleast+1;</div><div class='del'>-			</div><div class='del'>-			while (inptr&lt;inend) {</div><div class='del'>-				if (!s-&gt;midline) {</div><div class='del'>-					if (folder_boundary_check(s, inptr, lastone)) {</div><div class='del'>-						if ((s-&gt;outptr&gt;s-&gt;outbuf))</div><div class='del'>-							goto header_truncated; /* may not actually be truncated */</div><div class='del'>-						</div><div class='del'>-						goto header_done;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				start = inptr;</div><div class='del'>-</div><div class='del'>-				/* goto next line/sentinal */</div><div class='del'>-				while ((*inptr++)!='\n')</div><div class='del'>-					;</div><div class='del'>-			</div><div class='del'>-				g_assert(inptr&lt;=s-&gt;inend+1);</div><div class='del'>-				</div><div class='del'>-				/* check for sentinal or real end of line */</div><div class='del'>-				if (inptr &gt; inend) {</div><div class='del'>-					h(printf("not at end of line yet, going further\n"));</div><div class='del'>-					/* didn't find end of line within our allowed area */</div><div class='del'>-					inptr = inend;</div><div class='del'>-					s-&gt;midline = TRUE;</div><div class='del'>-					header_append(s, start, inptr);</div><div class='del'>-				} else {</div><div class='del'>-					h(printf("got line part: '%.*s'\n", inptr-1-start, start));</div><div class='del'>-					/* got a line, strip and add it, process it */</div><div class='del'>-					s-&gt;midline = FALSE;</div><div class='del'>-					header_append(s, start, inptr-1);</div><div class='del'>-</div><div class='del'>-					/* check for end of headers */</div><div class='del'>-					if (s-&gt;outbuf == s-&gt;outptr)</div><div class='del'>-						goto header_done;</div><div class='del'>-</div><div class='del'>-					/* check for continuation/compress headers, we have atleast 1 char here to work with */</div><div class='del'>-					if (inptr[0] ==  ' ' || inptr[0] == '\t') {</div><div class='del'>-						h(printf("continuation\n"));</div><div class='del'>-						/* TODO: this wont catch multiple space continuation across a read boundary, but</div><div class='del'>-						   that is assumed rare, and not fatal anyway */</div><div class='del'>-						do</div><div class='del'>-							inptr++;</div><div class='del'>-						while (*inptr == ' ' || *inptr == '\t');</div><div class='del'>-						inptr--;</div><div class='del'>-						*inptr = ' ';</div><div class='del'>-					} else {</div><div class='del'>-						/* otherwise, complete header, add it */</div><div class='del'>-						s-&gt;outptr[0] = 0;</div><div class='del'>-				</div><div class='del'>-						h(printf("header '%.20s' at %d\n", s-&gt;outbuf, s-&gt;header_start));</div><div class='del'>-						</div><div class='del'>-						header_raw_append_parse(&amp;h-&gt;headers, s-&gt;outbuf, s-&gt;header_start);</div><div class='del'>-						s-&gt;outptr = s-&gt;outbuf;</div><div class='del'>-						s-&gt;header_start = -1;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			s-&gt;inptr = inptr;</div><div class='del'>-		}</div><div class='del'>-		h(printf("end of file?  read %d bytes\n", len));</div><div class='del'>-		newatleast = 1;</div><div class='del'>-	} while (s-&gt;atleast &gt; 1);</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;outptr &gt; s-&gt;outbuf) || s-&gt;inend &gt; s-&gt;inptr) {</div><div class='del'>-		start = s-&gt;inptr;</div><div class='del'>-		inptr = s-&gt;inend;</div><div class='del'>-		if (inptr &gt; start) {</div><div class='del'>-			if (inptr[-1] == '\n')</div><div class='del'>-				inptr--;</div><div class='del'>-		}</div><div class='del'>-		goto header_truncated;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	s-&gt;atleast = atleast;</div><div class='del'>-	</div><div class='del'>-	return h;</div><div class='del'>-	</div><div class='del'>-header_truncated:</div><div class='del'>-	header_append(s, start, inptr);</div><div class='del'>-	</div><div class='del'>-	s-&gt;outptr[0] = 0;</div><div class='del'>-	if (s-&gt;outbuf == s-&gt;outptr)</div><div class='del'>-		goto header_done;</div><div class='del'>-	</div><div class='del'>-	header_raw_append_parse(&amp;h-&gt;headers, s-&gt;outbuf, s-&gt;header_start);</div><div class='del'>-	</div><div class='del'>-	s-&gt;outptr = s-&gt;outbuf;</div><div class='del'>-header_done:</div><div class='del'>-	s-&gt;inptr = inptr;</div><div class='del'>-	s-&gt;atleast = atleast;</div><div class='del'>-	s-&gt;header_start = -1;</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_scan_stack *</div><div class='del'>-folder_scan_content(struct _header_scan_state *s, int *lastone, char **data, int *length)</div><div class='del'>-{</div><div class='del'>-	int atleast = s-&gt;atleast, newatleast;</div><div class='del'>-	register char *inptr;</div><div class='del'>-	char *inend;</div><div class='del'>-	char *start;</div><div class='del'>-	int len;</div><div class='del'>-	struct _header_scan_stack *part;</div><div class='del'>-	int onboundary = FALSE;</div><div class='del'>-</div><div class='del'>-	c(printf("scanning content\n"));</div><div class='del'>-</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-	if (part)</div><div class='del'>-		newatleast = part-&gt;atleast;</div><div class='del'>-	else</div><div class='del'>-		newatleast = 1;</div><div class='del'>-	*lastone = FALSE;</div><div class='del'>-</div><div class='del'>-	c(printf("atleast = %d\n", s-&gt;atleast));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		s-&gt;atleast = newatleast;</div><div class='del'>-</div><div class='del'>-		while ((len = folder_read(s))&gt;0 &amp;&amp; len &gt;= s-&gt;atleast) { /* ensure we have at least enough room here */</div><div class='del'>-			inptr = s-&gt;inptr;</div><div class='del'>-			inend = s-&gt;inend-s-&gt;atleast+1;</div><div class='del'>-			start = inptr;</div><div class='del'>-</div><div class='del'>-			c(printf("inptr = %p, inend = %p\n", inptr, inend));</div><div class='del'>-</div><div class='del'>-			while (inptr&lt;inend) {</div><div class='del'>-				if (!s-&gt;midline</div><div class='del'>-				    &amp;&amp; (part = folder_boundary_check(s, inptr, lastone))) {</div><div class='del'>-					onboundary = TRUE;</div><div class='del'>-</div><div class='del'>-					/* since we truncate the boundary data, we need at least 1 char here spare,</div><div class='del'>-					   to remain in the same state */</div><div class='del'>-					if ( (inptr-start) &gt; 1)</div><div class='del'>-						goto content;</div><div class='del'>-</div><div class='del'>-					/* otherwise, jump to the state of the boundary we actually found */</div><div class='del'>-					goto normal_exit;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* goto the next line */</div><div class='del'>-				while ((*inptr++)!='\n')</div><div class='del'>-					;</div><div class='del'>-</div><div class='del'>-				/* check the sentinal, if we went past the atleast limit, and reset it to there */</div><div class='del'>-				if (inptr &gt; inend) {</div><div class='del'>-					s-&gt;midline = TRUE;</div><div class='del'>-					inptr = inend;</div><div class='del'>-				} else {</div><div class='del'>-					s-&gt;midline = FALSE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			c(printf("ran out of input, dumping what i have (%d) bytes midline = %s\n",</div><div class='del'>-				 inptr-start, s-&gt;midline?"TRUE":"FALSE"));</div><div class='del'>-			goto content;</div><div class='del'>-		}</div><div class='del'>-		newatleast = 1;</div><div class='del'>-	} while (s-&gt;atleast &gt; 1);</div><div class='del'>-</div><div class='del'>-	c(printf("length read = %d\n", len));</div><div class='del'>-</div><div class='del'>-	if (s-&gt;inend &gt; s-&gt;inptr) {</div><div class='del'>-		start = s-&gt;inptr;</div><div class='del'>-		inptr = s-&gt;inend;</div><div class='del'>-		goto content;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*length = 0;</div><div class='del'>-	s-&gt;atleast = atleast;</div><div class='del'>-	return NULL;</div><div class='del'>-</div><div class='del'>-content:</div><div class='del'>-	part = s-&gt;parts;</div><div class='del'>-normal_exit:</div><div class='del'>-	s-&gt;atleast = atleast;</div><div class='del'>-	s-&gt;inptr = inptr;</div><div class='del'>-</div><div class='del'>-	*data = start;</div><div class='del'>-	/* if we hit a boundary, we should not include the closing \n */</div><div class='del'>-	if (onboundary &amp;&amp; (inptr-start)&gt;0)</div><div class='del'>-		*length = inptr-start-1;</div><div class='del'>-	else</div><div class='del'>-		*length = inptr-start;</div><div class='del'>-</div><div class='del'>-	/*printf("got %scontent: '%.*s'\n", s-&gt;midline?"partial ":"", inptr-start, start);*/</div><div class='del'>-</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_scan_close(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	g_free(s-&gt;realbuf);</div><div class='del'>-	g_free(s-&gt;outbuf);</div><div class='del'>-	while (s-&gt;parts)</div><div class='del'>-		folder_pull_part(s);</div><div class='del'>-	if (s-&gt;fd != -1)</div><div class='del'>-		close(s-&gt;fd);</div><div class='del'>-	if (s-&gt;stream) {</div><div class='del'>-		camel_object_unref((CamelObject *)s-&gt;stream);</div><div class='del'>-	}</div><div class='del'>-	g_free(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct _header_scan_state *</div><div class='del'>-folder_scan_init(void)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s;</div><div class='del'>-</div><div class='del'>-	s = g_malloc(sizeof(*s));</div><div class='del'>-</div><div class='del'>-	s-&gt;fd = -1;</div><div class='del'>-	s-&gt;stream = NULL;</div><div class='del'>-	s-&gt;ioerrno = 0;</div><div class='del'>-</div><div class='del'>-	s-&gt;outbuf = g_malloc(1024);</div><div class='del'>-	s-&gt;outptr = s-&gt;outbuf;</div><div class='del'>-	s-&gt;outend = s-&gt;outbuf+1024;</div><div class='del'>-</div><div class='del'>-	s-&gt;realbuf = g_malloc(SCAN_BUF + SCAN_HEAD*2);</div><div class='del'>-	s-&gt;inbuf = s-&gt;realbuf + SCAN_HEAD;</div><div class='del'>-	s-&gt;inptr = s-&gt;inbuf;</div><div class='del'>-	s-&gt;inend = s-&gt;inbuf;</div><div class='del'>-	s-&gt;atleast = 0;</div><div class='del'>-</div><div class='del'>-	s-&gt;seek = 0;		/* current character position in file of the last read block */</div><div class='del'>-	s-&gt;unstep = 0;</div><div class='del'>-</div><div class='del'>-	s-&gt;header_start = -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;start_of_from = -1;</div><div class='del'>-	s-&gt;start_of_headers = -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;midline = FALSE;</div><div class='del'>-	s-&gt;scan_from = FALSE;</div><div class='del'>-	s-&gt;scan_pre_from = FALSE;</div><div class='del'>-</div><div class='del'>-	s-&gt;filters = NULL;</div><div class='del'>-	s-&gt;filterid = 1;</div><div class='del'>-</div><div class='del'>-	s-&gt;parts = NULL;</div><div class='del'>-</div><div class='del'>-	s-&gt;state = HSCAN_INITIAL;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-drop_states(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	while (s-&gt;parts) {</div><div class='del'>-		folder_scan_drop_step(s);</div><div class='del'>-	}</div><div class='del'>-	s-&gt;unstep = 0;</div><div class='del'>-	s-&gt;state = HSCAN_INITIAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-folder_scan_init_with_fd(struct _header_scan_state *s, int fd)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = read(fd, s-&gt;inbuf, SCAN_BUF);</div><div class='del'>-	if (len&gt;=0) {</div><div class='del'>-		drop_states(s);</div><div class='del'>-		s-&gt;inend = s-&gt;inbuf+len;</div><div class='del'>-		s-&gt;inptr = s-&gt;inbuf;</div><div class='del'>-		s-&gt;inend[0] = '\n';</div><div class='del'>-		if (s-&gt;fd != -1)</div><div class='del'>-			close(s-&gt;fd);</div><div class='del'>-		s-&gt;fd = fd;</div><div class='del'>-		if (s-&gt;stream) {</div><div class='del'>-			camel_object_unref((CamelObject *)s-&gt;stream);</div><div class='del'>-			s-&gt;stream = NULL;</div><div class='del'>-		}</div><div class='del'>-		s-&gt;ioerrno = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;ioerrno = errno?errno:EIO;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	len = camel_stream_read(stream, s-&gt;inbuf, SCAN_BUF);</div><div class='del'>-	if (len &gt;= 0) {</div><div class='del'>-		drop_states(s);</div><div class='del'>-		s-&gt;inend = s-&gt;inbuf+len;</div><div class='del'>-		s-&gt;inptr = s-&gt;inbuf;</div><div class='del'>-		s-&gt;inend[0] = '\n';</div><div class='del'>-		if (s-&gt;stream)</div><div class='del'>-			camel_object_unref((CamelObject *)s-&gt;stream);</div><div class='del'>-		s-&gt;stream = stream;</div><div class='del'>-		camel_object_ref((CamelObject *)stream);</div><div class='del'>-		if (s-&gt;fd != -1) {</div><div class='del'>-			close(s-&gt;fd);</div><div class='del'>-			s-&gt;fd = -1;</div><div class='del'>-		}</div><div class='del'>-		s-&gt;ioerrno = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;ioerrno = errno?errno:EIO;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define USE_FROM</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_scan_step(struct _header_scan_state *s, char **databuffer, int *datalength)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_stack *h, *hb;</div><div class='del'>-	const char *content;</div><div class='del'>-	const char *bound;</div><div class='del'>-	int type;</div><div class='del'>-	int state;</div><div class='del'>-	struct _header_content_type *ct = NULL;</div><div class='del'>-	struct _header_scan_filter *f;</div><div class='del'>-	size_t presize;</div><div class='del'>-</div><div class='del'>-/*	printf("\nSCAN PASS: state = %d '%s'\n", s-&gt;state, states[s-&gt;state]);*/</div><div class='del'>-</div><div class='del'>-tail_recurse:</div><div class='del'>-	d({</div><div class='del'>-		printf("\nSCAN STACK:\n");</div><div class='del'>-		printf(" '%s' :\n", states[s-&gt;state]);</div><div class='del'>-		hb = s-&gt;parts;</div><div class='del'>-		while (hb) {</div><div class='del'>-			printf("  '%s' : %s ", states[hb-&gt;savestate], hb-&gt;boundary);</div><div class='del'>-			if (hb-&gt;content_type) {</div><div class='del'>-				printf("(%s/%s)", hb-&gt;content_type-&gt;type, hb-&gt;content_type-&gt;subtype);</div><div class='del'>-			} else {</div><div class='del'>-				printf("(default)");</div><div class='del'>-			}</div><div class='del'>-			printf("\n");</div><div class='del'>-			hb = hb-&gt;parent;</div><div class='del'>-		}</div><div class='del'>-		printf("\n");</div><div class='del'>-	});</div><div class='del'>-</div><div class='del'>-	switch (s-&gt;state) {</div><div class='del'>-</div><div class='del'>-#ifdef USE_FROM</div><div class='del'>-	case HSCAN_INITIAL:</div><div class='del'>-		if (s-&gt;scan_from) {</div><div class='del'>-			h = g_malloc0(sizeof(*h));</div><div class='del'>-			h-&gt;boundary = g_strdup("From ");</div><div class='del'>-			h-&gt;boundarylen = strlen(h-&gt;boundary);</div><div class='del'>-			h-&gt;boundarylenfinal = h-&gt;boundarylen;</div><div class='del'>-			h-&gt;from_line = g_byte_array_new();</div><div class='del'>-			folder_push_part(s, h);</div><div class='del'>-			s-&gt;state = HSCAN_PRE_FROM;</div><div class='del'>-		} else {</div><div class='del'>-			s-&gt;start_of_from = -1;</div><div class='del'>-			goto scan_header;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case HSCAN_PRE_FROM:</div><div class='del'>-</div><div class='del'>-		h = s-&gt;parts;</div><div class='del'>-		do {</div><div class='del'>-			hb = folder_scan_content(s, &amp;state, databuffer, datalength);</div><div class='del'>-			if (s-&gt;scan_pre_from &amp;&amp; *datalength &gt; 0) {</div><div class='del'>-				d(printf("got pre-from content %d bytes\n", *datalength));</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while (hb==h &amp;&amp; *datalength&gt;0);</div><div class='del'>-</div><div class='del'>-		if (*datalength==0 &amp;&amp; hb==h) {</div><div class='del'>-			d(printf("found 'From '\n"));</div><div class='del'>-			s-&gt;start_of_from = folder_tell(s);</div><div class='del'>-			folder_scan_skip_line(s, h-&gt;from_line);</div><div class='del'>-			h-&gt;savestate = HSCAN_INITIAL;</div><div class='del'>-			s-&gt;state = HSCAN_FROM;</div><div class='del'>-		} else {</div><div class='del'>-			folder_pull_part(s);</div><div class='del'>-			s-&gt;state = HSCAN_EOF;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-#else</div><div class='del'>-	case HSCAN_INITIAL:</div><div class='del'>-	case HSCAN_PRE_FROM:</div><div class='del'>-#endif /* !USE_FROM */</div><div class='del'>-</div><div class='del'>-	scan_header:</div><div class='del'>-	case HSCAN_FROM:</div><div class='del'>-		s-&gt;start_of_headers = folder_tell(s);</div><div class='del'>-		h = folder_scan_header(s, &amp;state);</div><div class='del'>-#ifdef USE_FROM</div><div class='del'>-		if (s-&gt;scan_from)</div><div class='del'>-			h-&gt;savestate = HSCAN_FROM_END;</div><div class='del'>-		else</div><div class='del'>-#endif</div><div class='del'>-			h-&gt;savestate = HSCAN_EOF;</div><div class='del'>-</div><div class='del'>-		/* FIXME: should this check for MIME-Version: 1.0 as well? */</div><div class='del'>-</div><div class='del'>-		type = HSCAN_HEADER;</div><div class='del'>-		if ( (content = header_raw_find(&amp;h-&gt;headers, "Content-Type", NULL))</div><div class='del'>-		     &amp;&amp; (ct = header_content_type_decode(content))) {</div><div class='del'>-			if (!strcasecmp(ct-&gt;type, "multipart")) {</div><div class='del'>-				bound = header_content_type_param(ct, "boundary");</div><div class='del'>-				if (bound) {</div><div class='del'>-					d(printf("multipart, boundary = %s\n", bound));</div><div class='del'>-					h-&gt;boundarylen = strlen(bound)+2;</div><div class='del'>-					h-&gt;boundarylenfinal = h-&gt;boundarylen+2;</div><div class='del'>-					h-&gt;boundary = g_malloc(h-&gt;boundarylen+3);</div><div class='del'>-					sprintf(h-&gt;boundary, "--%s--", bound);</div><div class='del'>-					type = HSCAN_MULTIPART;</div><div class='del'>-				} else {</div><div class='del'>-					header_content_type_unref(ct);</div><div class='del'>-					ct = header_content_type_decode("text/plain");</div><div class='del'>-/* We can't quite do this, as it will mess up all the offsets ... */</div><div class='del'>-/*					header_raw_replace(&amp;h-&gt;headers, "Content-Type", "text/plain", offset);*/</div><div class='del'>-					g_warning("Multipart with no boundary, treating as text/plain");</div><div class='del'>-				}</div><div class='del'>-			} else if (!strcasecmp(ct-&gt;type, "message")) {</div><div class='del'>-				if (!strcasecmp(ct-&gt;subtype, "rfc822")</div><div class='del'>-				    || !strcasecmp(ct-&gt;subtype, "news")</div><div class='del'>-				    /*|| !strcasecmp(ct-&gt;subtype, "partial")*/) {</div><div class='del'>-					type = HSCAN_MESSAGE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* make the default type for multipart/digest be message/rfc822 */</div><div class='del'>-			if ((s-&gt;parts</div><div class='del'>-			     &amp;&amp; header_content_type_is(s-&gt;parts-&gt;content_type, "multipart", "digest"))) {</div><div class='del'>-				ct = header_content_type_decode("message/rfc822");</div><div class='del'>-				type = HSCAN_MESSAGE;</div><div class='del'>-				d(printf("parent was multipart/digest, autoupgrading to message/rfc822?\n"));</div><div class='del'>-				/* maybe we should do this too?</div><div class='del'>-				   header_raw_append_parse(&amp;h-&gt;headers, "Content-Type: message/rfc822", -1);*/</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		h-&gt;content_type = ct;</div><div class='del'>-		folder_push_part(s, h);</div><div class='del'>-		s-&gt;state = type;</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-		s-&gt;state = HSCAN_BODY;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_BODY:</div><div class='del'>-		h = s-&gt;parts;</div><div class='del'>-		*datalength = 0;</div><div class='del'>-		presize = SCAN_HEAD;</div><div class='del'>-		f = s-&gt;filters;</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			hb = folder_scan_content (s, &amp;state, databuffer, datalength);</div><div class='del'>-</div><div class='del'>-			d(printf ("\n\nOriginal content: '"));</div><div class='del'>-			d(fwrite(*databuffer, sizeof(char), *datalength, stdout));</div><div class='del'>-			d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-			if (*datalength &gt; 0) {</div><div class='del'>-				while (f) {</div><div class='del'>-					camel_mime_filter_filter(f-&gt;filter, *databuffer, *datalength, presize,</div><div class='del'>-								 databuffer, datalength, &amp;presize);</div><div class='del'>-					d(printf ("Filtered content (%s): '",</div><div class='del'>-						  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-					d(fwrite(*databuffer, sizeof(char), *datalength, stdout));</div><div class='del'>-					d(printf("'\n"));</div><div class='del'>-					f = f-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while (hb == h &amp;&amp; *datalength &gt; 0);</div><div class='del'>-		</div><div class='del'>-		/* check for any filter completion data */</div><div class='del'>-		while (f) {</div><div class='del'>-			camel_mime_filter_complete(f-&gt;filter, *databuffer, *datalength, presize,</div><div class='del'>-						   databuffer, datalength, &amp;presize);</div><div class='del'>-			f = f-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (*datalength &gt; 0)</div><div class='del'>-			return;</div><div class='del'>-		</div><div class='del'>-		s-&gt;state = HSCAN_BODY_END;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		h = s-&gt;parts;</div><div class='del'>-		do {</div><div class='del'>-			do {</div><div class='del'>-				hb = folder_scan_content(s, &amp;state, databuffer, datalength);</div><div class='del'>-				if (*datalength&gt;0) {</div><div class='del'>-					/* instead of a new state, we'll just store it locally and provide</div><div class='del'>-					   an accessor function */</div><div class='del'>-					d(printf("Multipart %s Content %p: '%.*s'\n",</div><div class='del'>-						 h-&gt;prestage&gt;0?"post":"pre", h, *datalength, *databuffer));</div><div class='del'>-					if (h-&gt;prestage &gt; 0) {</div><div class='del'>-						if (h-&gt;posttext == NULL)</div><div class='del'>-							h-&gt;posttext = g_byte_array_new();</div><div class='del'>-						g_byte_array_append(h-&gt;posttext, *databuffer, *datalength);</div><div class='del'>-					} else {</div><div class='del'>-						if (h-&gt;pretext == NULL)</div><div class='del'>-							h-&gt;pretext = g_byte_array_new();</div><div class='del'>-						g_byte_array_append(h-&gt;pretext, *databuffer, *datalength);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} while (hb==h &amp;&amp; *datalength&gt;0);</div><div class='del'>-			h-&gt;prestage++;</div><div class='del'>-			if (*datalength==0 &amp;&amp; hb==h) {</div><div class='del'>-				d(printf("got boundary: %s\n", hb-&gt;boundary));</div><div class='del'>-				folder_scan_skip_line(s, NULL);</div><div class='del'>-				if (!state) {</div><div class='del'>-					s-&gt;state = HSCAN_FROM;</div><div class='del'>-					folder_scan_step(s, databuffer, datalength);</div><div class='del'>-					s-&gt;parts-&gt;savestate = HSCAN_MULTIPART; /* set return state for the new head part */</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} while (1);</div><div class='del'>-</div><div class='del'>-		s-&gt;state = HSCAN_MULTIPART_END;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-		s-&gt;state = HSCAN_FROM;</div><div class='del'>-		folder_scan_step(s, databuffer, datalength);</div><div class='del'>-		s-&gt;parts-&gt;savestate = HSCAN_MESSAGE_END;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case HSCAN_FROM_END:</div><div class='del'>-	case HSCAN_BODY_END:</div><div class='del'>-	case HSCAN_MULTIPART_END:</div><div class='del'>-	case HSCAN_MESSAGE_END:</div><div class='del'>-		s-&gt;state = s-&gt;parts-&gt;savestate;</div><div class='del'>-		folder_pull_part(s);</div><div class='del'>-		if (s-&gt;state &amp; HSCAN_END)</div><div class='del'>-			return;</div><div class='del'>-		goto tail_recurse;</div><div class='del'>-</div><div class='del'>-	case HSCAN_EOF:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid state in camel-mime-parser: %d", s-&gt;state);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* drops the current state back one */</div><div class='del'>-static void</div><div class='del'>-folder_scan_drop_step(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	switch (s-&gt;state) {</div><div class='del'>-	case HSCAN_INITIAL:</div><div class='del'>-	case HSCAN_EOF:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case HSCAN_FROM:</div><div class='del'>-	case HSCAN_PRE_FROM:</div><div class='del'>-		s-&gt;state = HSCAN_INITIAL;</div><div class='del'>-		folder_pull_part(s);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-</div><div class='del'>-	case HSCAN_FROM_END:</div><div class='del'>-	case HSCAN_BODY_END:</div><div class='del'>-	case HSCAN_MULTIPART_END:</div><div class='del'>-	case HSCAN_MESSAGE_END:</div><div class='del'>-</div><div class='del'>-		s-&gt;state = s-&gt;parts-&gt;savestate;</div><div class='del'>-		folder_pull_part(s);</div><div class='del'>-		if (s-&gt;state &amp; HSCAN_END) {</div><div class='del'>-			s-&gt;state &amp;= ~HSCAN_END;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	default:</div><div class='del'>-		/* FIXME: not sure if this is entirely right */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef STANDALONE</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	struct _header_scan_state *s;</div><div class='del'>-	char *data;</div><div class='del'>-	int len;</div><div class='del'>-	int state;</div><div class='del'>-	char *name = "/tmp/evmail/Inbox";</div><div class='del'>-	struct _header_scan_stack *h;</div><div class='del'>-	int i;</div><div class='del'>-	int attach = 0;</div><div class='del'>-</div><div class='del'>-	if (argc==2)</div><div class='del'>-		name = argv[1];</div><div class='del'>-</div><div class='del'>-	printf("opening: %s", name);</div><div class='del'>-</div><div class='del'>-	for (i=1;i&lt;argc;i++) {</div><div class='del'>-		const char *encoding = NULL, *charset = NULL;</div><div class='del'>-		char *attachname;</div><div class='del'>-</div><div class='del'>-		name = argv[i];</div><div class='del'>-		printf("opening: %s", name);</div><div class='del'>-		</div><div class='del'>-		fd = open(name, O_RDONLY);</div><div class='del'>-		if (fd==-1) {</div><div class='del'>-			perror("Cannot open mailbox");</div><div class='del'>-			exit(1);</div><div class='del'>-		}</div><div class='del'>-		s = folder_scan_init();</div><div class='del'>-		folder_scan_init_with_fd(s, fd);</div><div class='del'>-		s-&gt;scan_from = FALSE;</div><div class='del'>-#if 0</div><div class='del'>-		h = g_malloc0(sizeof(*h));</div><div class='del'>-		h-&gt;savestate = HSCAN_EOF;</div><div class='del'>-		folder_push_part(s, h);</div><div class='del'>-#endif	</div><div class='del'>-		while (s-&gt;state != HSCAN_EOF) {</div><div class='del'>-			folder_scan_step(s, &amp;data, &amp;len);</div><div class='del'>-			printf("\n -- PARSER STEP RETURN -- %d '%s'\n\n", s-&gt;state, states[s-&gt;state]);</div><div class='del'>-			switch (s-&gt;state) {</div><div class='del'>-			case HSCAN_HEADER:</div><div class='del'>-				if (s-&gt;parts-&gt;content_type</div><div class='del'>-				    &amp;&amp; (charset = header_content_type_param(s-&gt;parts-&gt;content_type, "charset"))) {</div><div class='del'>-					if (strcasecmp(charset, "us-ascii")) {</div><div class='del'>-#if 0</div><div class='del'>-						folder_push_filter_charset(s, "UTF-8", charset);</div><div class='del'>-#endif</div><div class='del'>-					} else {</div><div class='del'>-						charset = NULL;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					charset = NULL;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				encoding = header_raw_find(&amp;s-&gt;parts-&gt;headers, "Content-transfer-encoding", 0);</div><div class='del'>-				printf("encoding = '%s'\n", encoding);</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " base64", 7)) {</div><div class='del'>-					printf("adding base64 filter\n");</div><div class='del'>-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-#endif</div><div class='del'>-					g_free(attachname);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_mime(s, 0);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " quoted-printable", 17)) {</div><div class='del'>-					printf("adding quoted-printable filter\n");</div><div class='del'>-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-#endif</div><div class='del'>-					g_free(attachname);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_mime(s, 1);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY:</div><div class='del'>-				printf("got body %d '%.*s'\n",  len, len, data);</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY_END:</div><div class='del'>-				printf("end body %d '%.*s'\n",  len, len, data);</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " base64", 7)) {</div><div class='del'>-					printf("removing filters\n");</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " quoted-printable", 17)) {</div><div class='del'>-					printf("removing filters\n");</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (charset) {</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-					charset = NULL;</div><div class='del'>-				}</div><div class='del'>-				encoding = NULL;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		folder_scan_close(s);</div><div class='del'>-		close(fd);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* STANDALONE */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h<br/>deleted file mode 100644<br/>index 7f784a1065..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,147 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_PARSER_H</div><div class='del'>-#define _CAMEL_MIME_PARSER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_PARSER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)</div><div class='del'>-#define CAMEL_MIME_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)</div><div class='del'>-#define CAMEL_IS_MIME_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_parser_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeParserClass CamelMimeParserClass;</div><div class='del'>-</div><div class='del'>-/* NOTE: if you add more states, you may need to bump the</div><div class='del'>-   start of the END tags to 16 or 32, etc - so they are</div><div class='del'>-   the same as the matching start tag, with a bit difference */</div><div class='del'>-enum _header_state {</div><div class='del'>-	HSCAN_INITIAL,</div><div class='del'>-	HSCAN_PRE_FROM,		/* data before a 'From' line */</div><div class='del'>-	HSCAN_FROM,		/* got 'From' line */</div><div class='del'>-	HSCAN_HEADER,		/* toplevel header */</div><div class='del'>-	HSCAN_BODY,		/* scanning body of message */</div><div class='del'>-	HSCAN_MULTIPART,	/* got multipart header */</div><div class='del'>-	HSCAN_MESSAGE,		/* rfc822 message */</div><div class='del'>-</div><div class='del'>-	HSCAN_PART,		/* part of a multipart */</div><div class='del'>-</div><div class='del'>-	HSCAN_END = 8,		/* bit mask for 'end' flags */</div><div class='del'>-</div><div class='del'>-	HSCAN_EOF = 8,		/* end of file */</div><div class='del'>-	HSCAN_PRE_FROM_END,	/* pre from end */</div><div class='del'>-	HSCAN_FROM_END,		/* end of whole from bracket */</div><div class='del'>-	HSCAN_HEADER_END,	/* dummy value */</div><div class='del'>-	HSCAN_BODY_END,		/* end of message */</div><div class='del'>-	HSCAN_MULTIPART_END,	/* end of multipart  */</div><div class='del'>-	HSCAN_MESSAGE_END,	/* end of message */</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeParser {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeParserPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeParserClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*message)(CamelMimeParser *, void *headers);</div><div class='del'>-	void (*part)(CamelMimeParser *);</div><div class='del'>-	void (*content)(CamelMimeParser *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mime_parser_get_type	(void);</div><div class='del'>-CamelMimeParser      *camel_mime_parser_new	(void);</div><div class='del'>-</div><div class='del'>-/* quick-fix for parser not erroring, we can find out if it had an error afterwards */</div><div class='del'>-int		camel_mime_parser_errno		(CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* using an fd will be a little faster, but not much (over a simple stream) */</div><div class='del'>-int		camel_mime_parser_init_with_fd(CamelMimeParser *, int fd);</div><div class='del'>-int		camel_mime_parser_init_with_stream(CamelMimeParser *m, CamelStream *stream);</div><div class='del'>-</div><div class='del'>-/* get the stream or fd back of the parser */</div><div class='del'>-CamelStream    *camel_mime_parser_stream(CamelMimeParser *m);</div><div class='del'>-int		camel_mime_parser_fd(CamelMimeParser *m);</div><div class='del'>-</div><div class='del'>-/* scan 'From' separators? */</div><div class='del'>-void camel_mime_parser_scan_from(CamelMimeParser *, int);</div><div class='del'>-/* Do we want to know about the pre-from data? */</div><div class='del'>-void camel_mime_parser_scan_pre_from(CamelMimeParser *, int);</div><div class='del'>-</div><div class='del'>-/* what headers to save, MUST include ^Content-Type: */</div><div class='del'>-int camel_mime_parser_set_header_regex(CamelMimeParser *m, char *matchstr);</div><div class='del'>-</div><div class='del'>-/* normal interface */</div><div class='del'>-enum _header_state camel_mime_parser_step(CamelMimeParser *, char **, int *);</div><div class='del'>-void camel_mime_parser_unstep(CamelMimeParser *);</div><div class='del'>-void camel_mime_parser_drop_step(CamelMimeParser *m);</div><div class='del'>-enum _header_state camel_mime_parser_state(CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* read through the parser */</div><div class='del'>-int camel_mime_parser_read(CamelMimeParser *m, const char **databuffer, int len);</div><div class='del'>-</div><div class='del'>-/* get content type for the current part/header */</div><div class='del'>-struct _header_content_type *camel_mime_parser_content_type(CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* get/change raw header by name */</div><div class='del'>-const char *camel_mime_parser_header(CamelMimeParser *, const char *, int *offset);</div><div class='del'>-</div><div class='del'>-/* get all raw headers. READ ONLY! */</div><div class='del'>-struct _header_raw *camel_mime_parser_headers_raw(CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* get multipart pre/postface */</div><div class='del'>-const char *camel_mime_parser_preface(CamelMimeParser *m);</div><div class='del'>-const char *camel_mime_parser_postface(CamelMimeParser *m);</div><div class='del'>-</div><div class='del'>-/* return the from line content */</div><div class='del'>-const char *camel_mime_parser_from_line(CamelMimeParser *m);</div><div class='del'>-</div><div class='del'>-/* add a processing filter for body contents */</div><div class='del'>-int camel_mime_parser_filter_add(CamelMimeParser *, CamelMimeFilter *);</div><div class='del'>-void camel_mime_parser_filter_remove(CamelMimeParser *, int);</div><div class='del'>-</div><div class='del'>-/* these should be used with caution, because the state will not</div><div class='del'>-   track the seeked position */</div><div class='del'>-/* FIXME: something to bootstrap the state? */</div><div class='del'>-off_t camel_mime_parser_tell(CamelMimeParser *);</div><div class='del'>-off_t camel_mime_parser_seek(CamelMimeParser *, off_t, int);</div><div class='del'>-</div><div class='del'>-off_t camel_mime_parser_tell_start_headers(CamelMimeParser *);</div><div class='del'>-off_t camel_mime_parser_tell_start_from(CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_PARSER_H */</div><div class='head'>diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c<br/>deleted file mode 100644<br/>index 987e5e77d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-part-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,390 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-mime-part-utils : Utility for mime parsing and so on</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *          Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-mime-part-utils.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-seekable-substream.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-mime-filter-basic.h"</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-save.h"</div><div class='del'>-#include "camel-html-parser.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-/* example: &lt;META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt; */</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-check_html_charset(char *buffer, int length)</div><div class='del'>-{</div><div class='del'>-	CamelHTMLParser *hp;</div><div class='del'>-	const char *charset = NULL;</div><div class='del'>-	camel_html_parser_t state;</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-</div><div class='del'>-	/* if we need to first base64/qp decode, do this here, sigh */</div><div class='del'>-	hp = camel_html_parser_new();</div><div class='del'>-	camel_html_parser_set_data(hp, buffer, length, TRUE);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		const char *data;</div><div class='del'>-		int len;</div><div class='del'>-		const char *val;</div><div class='del'>-		</div><div class='del'>-		state = camel_html_parser_step(hp, &amp;data, &amp;len);</div><div class='del'>-		</div><div class='del'>-		/* example: &lt;META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"&gt; */</div><div class='del'>-		</div><div class='del'>-		switch(state) {</div><div class='del'>-		case CAMEL_HTML_PARSER_ELEMENT:</div><div class='del'>-			val = camel_html_parser_tag(hp);</div><div class='del'>-			d(printf("Got tag: %s\n", val));</div><div class='del'>-			if (g_strcasecmp(val, "meta") == 0</div><div class='del'>-			    &amp;&amp; (val = camel_html_parser_attr(hp, "http-equiv"))</div><div class='del'>-			    &amp;&amp; g_strcasecmp(val, "content-type") == 0</div><div class='del'>-			    &amp;&amp; (val = camel_html_parser_attr(hp, "content"))</div><div class='del'>-			    &amp;&amp; (ct = header_content_type_decode(val))) {</div><div class='del'>-				charset = header_content_type_param(ct, "charset");</div><div class='del'>-				charset = e_iconv_charset_name (charset);</div><div class='del'>-				header_content_type_unref(ct);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* ignore everything else */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (charset == NULL &amp;&amp; state != CAMEL_HTML_PARSER_EOF);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)hp);</div><div class='del'>-</div><div class='del'>-	return charset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-convert_buffer (GByteArray *in, const char *to, const char *from)</div><div class='del'>-{</div><div class='del'>-	size_t inleft, outleft, outlen, converted = 0;</div><div class='del'>-	GByteArray *out = NULL;</div><div class='del'>-	const char *inbuf;</div><div class='del'>-	char *outbuf;</div><div class='del'>-	iconv_t cd;</div><div class='del'>-	</div><div class='del'>-	if (in-&gt;len == 0)</div><div class='del'>-		return g_byte_array_new();</div><div class='del'>-</div><div class='del'>-	d(printf("converting buffer from %s to %s: '%.*s'\n", from, to, (int)in-&gt;len, in-&gt;data));</div><div class='del'>-	</div><div class='del'>-	cd = e_iconv_open(to, from);</div><div class='del'>-	if (cd == (iconv_t) -1) {</div><div class='del'>-		g_warning ("Cannot convert from '%s' to '%s': %s", from, to, g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	outlen = in-&gt;len * 2 + 16;</div><div class='del'>-	out = g_byte_array_new ();</div><div class='del'>-	g_byte_array_set_size (out, outlen);</div><div class='del'>-	</div><div class='del'>-	inbuf = in-&gt;data;</div><div class='del'>-	inleft = in-&gt;len;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		outbuf = out-&gt;data + converted;</div><div class='del'>-		outleft = outlen - converted;</div><div class='del'>-		</div><div class='del'>-		converted = e_iconv (cd, &amp;inbuf, &amp;inleft, &amp;outbuf, &amp;outleft);</div><div class='del'>-		if (converted == (size_t) -1) {</div><div class='del'>-			if (errno != E2BIG &amp;&amp; errno != EINVAL)</div><div class='del'>-				goto fail;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/*</div><div class='del'>-		 * E2BIG   There is not sufficient room at *outbuf.</div><div class='del'>-		 *</div><div class='del'>-		 * We just need to grow our outbuffer and try again.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		converted = outlen - outleft;</div><div class='del'>-		if (errno == E2BIG) {</div><div class='del'>-			outlen += inleft * 2 + 16;</div><div class='del'>-			out = g_byte_array_set_size (out, outlen);</div><div class='del'>-			outbuf = out-&gt;data + converted;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	} while (errno == E2BIG &amp;&amp; inleft &gt; 0);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * EINVAL  An  incomplete  multibyte sequence has been encoun­</div><div class='del'>-	 *         tered in the input.</div><div class='del'>-	 *</div><div class='del'>-	 * We'll just have to ignore it...</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	/* flush the iconv conversion */</div><div class='del'>-	e_iconv (cd, NULL, NULL, &amp;outbuf, &amp;outleft);</div><div class='del'>-	</div><div class='del'>-	/* now set the true length on the GByteArray */</div><div class='del'>-	converted = outlen - outleft;</div><div class='del'>-	g_byte_array_set_size (out, converted);</div><div class='del'>-	</div><div class='del'>-	e_iconv_close (cd);</div><div class='del'>-	</div><div class='del'>-	return out;</div><div class='del'>-	</div><div class='del'>- fail:</div><div class='del'>-	g_warning ("Cannot convert from '%s' to '%s': %s", from, to, g_strerror (errno));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (out, TRUE);</div><div class='del'>-	</div><div class='del'>-	e_iconv_close (cd);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We don't really use the charset argument except for debugging... */</div><div class='del'>-static gboolean</div><div class='del'>-broken_windows_charset (GByteArray *buffer, const char *charset)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr;</div><div class='del'>-	unsigned char *inend;</div><div class='del'>-	</div><div class='del'>-	inptr = buffer-&gt;data;</div><div class='del'>-	inend = inptr + buffer-&gt;len;</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		register unsigned char c = *inptr++;</div><div class='del'>-		</div><div class='del'>-		if (c &gt;= 128 &amp;&amp; c &lt;= 159) {</div><div class='del'>-			g_warning ("Encountered Windows charset parading as %s", charset);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_7bit (GByteArray *buffer)</div><div class='del'>-{</div><div class='del'>-	register unsigned int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; buffer-&gt;len; i++)</div><div class='del'>-		if (buffer-&gt;data[i] &gt; 127)</div><div class='del'>-			return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* simple data wrapper */</div><div class='del'>-static void</div><div class='del'>-simple_data_wrapper_construct_from_parser (CamelDataWrapper *dw, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilter *fdec = NULL, *fcrlf = NULL;</div><div class='del'>-	CamelMimeFilterBasicType enctype = 0;</div><div class='del'>-	int len, decid = -1, crlfid = -1;</div><div class='del'>-	struct _header_content_type *ct;</div><div class='del'>-	const char *charset = NULL;</div><div class='del'>-	GByteArray *buffer;</div><div class='del'>-	char *encoding, *buf;</div><div class='del'>-	CamelStream *mem;</div><div class='del'>-	</div><div class='del'>-	d(printf ("simple_data_wrapper_construct_from_parser()\n"));</div><div class='del'>-	</div><div class='del'>-	/* first, work out conversion, if any, required, we dont care about what we dont know about */</div><div class='del'>-	encoding = header_content_encoding_decode (camel_mime_parser_header (mp, "Content-Transfer-Encoding", NULL));</div><div class='del'>-	if (encoding) {</div><div class='del'>-		if (!strcasecmp (encoding, "base64")) {</div><div class='del'>-			d(printf("Adding base64 decoder ...\n"));</div><div class='del'>-			enctype = CAMEL_MIME_FILTER_BASIC_BASE64_DEC;</div><div class='del'>-		} else if (!strcasecmp (encoding, "quoted-printable")) {</div><div class='del'>-			d(printf("Adding quoted-printable decoder ...\n"));</div><div class='del'>-			enctype = CAMEL_MIME_FILTER_BASIC_QP_DEC;</div><div class='del'>-		} else if (!strcasecmp (encoding, "x-uuencode")) {</div><div class='del'>-			d(printf("Adding uudecoder ...\n"));</div><div class='del'>-			enctype = CAMEL_MIME_FILTER_BASIC_UU_DEC;</div><div class='del'>-		}</div><div class='del'>-		g_free (encoding);</div><div class='del'>-		</div><div class='del'>-		if (enctype != 0) {</div><div class='del'>-			fdec = (CamelMimeFilter *)camel_mime_filter_basic_new_type(enctype);</div><div class='del'>-			decid = camel_mime_parser_filter_add (mp, fdec);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we're doing text, we also need to do CRLF-&gt;LF and may have to convert it to UTF8 as well. */</div><div class='del'>-	ct = camel_mime_parser_content_type(mp);</div><div class='del'>-	if (header_content_type_is(ct, "text", "*")) {</div><div class='del'>-		charset = header_content_type_param(ct, "charset");</div><div class='del'>-		charset = e_iconv_charset_name(charset);</div><div class='del'>-		</div><div class='del'>-		if (fdec) {</div><div class='del'>-			d(printf("Adding CRLF conversion filter\n"));</div><div class='del'>-			fcrlf = (CamelMimeFilter *)camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_DECODE,</div><div class='del'>-									      CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-			crlfid = camel_mime_parser_filter_add(mp, fcrlf);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* read in the entire content */</div><div class='del'>-	buffer = g_byte_array_new();</div><div class='del'>-	while (camel_mime_parser_step(mp, &amp;buf, &amp;len) != HSCAN_BODY_END) {</div><div class='del'>-		d(printf("appending o/p data: %d: %.*s\n", len, len, buf));</div><div class='del'>-		g_byte_array_append(buffer, buf, len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Possible Lame Mailer Alert... check the META tags for a charset */</div><div class='del'>-	if (!charset &amp;&amp; header_content_type_is (ct, "text", "html"))</div><div class='del'>-		charset = check_html_charset(buffer-&gt;data, buffer-&gt;len);</div><div class='del'>-	</div><div class='del'>-	/* if we need to do charset conversion, see if we can/it works/etc */</div><div class='del'>-	if (charset &amp;&amp; !(strcasecmp (charset, "us-ascii") == 0</div><div class='del'>-			 || strcasecmp (charset, "utf-8") == 0</div><div class='del'>-			 || strncasecmp (charset, "x-", 2) == 0)) {</div><div class='del'>-		GByteArray *out;</div><div class='del'>-		</div><div class='del'>-		/* You often see Microsoft Windows users announcing their texts</div><div class='del'>-		 * as being in ISO-8859-1 even when in fact they contain funny</div><div class='del'>-		 * characters from the Windows-CP1252 superset.</div><div class='del'>-		 */</div><div class='del'>-		if (!strncasecmp (charset, "iso-8859", 8)) {</div><div class='del'>-			/* check for Windows-specific chars... */</div><div class='del'>-			if (broken_windows_charset (buffer, charset)) {</div><div class='del'>-				charset = camel_charset_iso_to_windows (charset);</div><div class='del'>-				charset = e_iconv_charset_name (charset);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		out = convert_buffer (buffer, "UTF-8", charset);</div><div class='del'>-		if (out) {</div><div class='del'>-			/* converted ok, use this data instead */</div><div class='del'>-			g_byte_array_free(buffer, TRUE);</div><div class='del'>-			buffer = out;</div><div class='del'>-		} else {</div><div class='del'>-			/* else failed to convert, leave as raw? */</div><div class='del'>-			g_warning("Storing text as raw, unknown charset '%s' or invalid format", charset);</div><div class='del'>-			dw-&gt;rawtext = TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (header_content_type_is (ct, "text", "*")) {</div><div class='del'>-		if (charset == NULL) {</div><div class='del'>-			/* check that it's 7bit */</div><div class='del'>-			dw-&gt;rawtext = !is_7bit (buffer);</div><div class='del'>-		} else if (!strncasecmp (charset, "x-", 2)) {</div><div class='del'>-			/* we're not even going to bother trying to convert, so set the</div><div class='del'>-			   rawtext bit to TRUE and let the mailer deal with it. */</div><div class='del'>-			dw-&gt;rawtext = TRUE;</div><div class='del'>-		} else if (!strcasecmp (charset, "utf-8")) {</div><div class='del'>-			/* check that it is valid utf8 */</div><div class='del'>-			dw-&gt;rawtext = !g_utf8_validate (buffer-&gt;data, buffer-&gt;len, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf("message part kept in memory!\n"));</div><div class='del'>-	</div><div class='del'>-	mem = camel_stream_mem_new_with_byte_array(buffer);</div><div class='del'>-	camel_data_wrapper_construct_from_stream(dw, mem);</div><div class='del'>-	camel_object_unref((CamelObject *)mem);</div><div class='del'>-</div><div class='del'>-	camel_mime_parser_filter_remove(mp, decid);</div><div class='del'>-	camel_mime_parser_filter_remove(mp, crlfid);</div><div class='del'>-	</div><div class='del'>-	if (fdec)</div><div class='del'>-		camel_object_unref((CamelObject *)fdec);</div><div class='del'>-	if (fcrlf)</div><div class='del'>-		camel_object_unref((CamelObject *)fcrlf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This replaces the data wrapper repository ... and/or could be replaced by it? */</div><div class='del'>-void</div><div class='del'>-camel_mime_part_construct_content_from_parser (CamelMimePart *dw, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *content = NULL;</div><div class='del'>-	char *buf;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	switch (camel_mime_parser_state (mp)) {</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-		d(printf("Creating body part\n"));</div><div class='del'>-		content = camel_data_wrapper_new ();</div><div class='del'>-		simple_data_wrapper_construct_from_parser (content, mp);</div><div class='del'>-		break;</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-		d(printf("Creating message part\n"));</div><div class='del'>-		content = (CamelDataWrapper *) camel_mime_message_new ();</div><div class='del'>-		camel_mime_part_construct_from_parser ((CamelMimePart *)content, mp);</div><div class='del'>-		break;</div><div class='del'>-	case HSCAN_MULTIPART: {</div><div class='del'>-		struct _header_content_type *content_type;</div><div class='del'>-		CamelDataWrapper *bodypart;</div><div class='del'>-		</div><div class='del'>-		/* FIXME: we should use a came-mime-mutlipart, not jsut a camel-multipart, but who cares */</div><div class='del'>-		d(printf("Creating multi-part\n"));</div><div class='del'>-		</div><div class='del'>-		content = (CamelDataWrapper *)camel_multipart_new ();</div><div class='del'>-		</div><div class='del'>-		content_type = camel_mime_parser_content_type (mp);</div><div class='del'>-		camel_multipart_set_boundary ((CamelMultipart *)content,</div><div class='del'>-					      header_content_type_param (content_type, "boundary"));</div><div class='del'>-		</div><div class='del'>-		while (camel_mime_parser_step (mp, &amp;buf, &amp;len) != HSCAN_MULTIPART_END) {</div><div class='del'>-			camel_mime_parser_unstep (mp);</div><div class='del'>-			bodypart = (CamelDataWrapper *)camel_mime_part_new ();</div><div class='del'>-			camel_mime_part_construct_from_parser ((CamelMimePart *)bodypart, mp);</div><div class='del'>-			camel_multipart_add_part ((CamelMultipart *)content, (CamelMimePart *)bodypart);</div><div class='del'>-			camel_object_unref ((CamelObject *)bodypart);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* these are only return valid data in the MULTIPART_END state */</div><div class='del'>-		camel_multipart_set_preface ((CamelMultipart *)content, camel_mime_parser_preface (mp));</div><div class='del'>-		camel_multipart_set_postface ((CamelMultipart *)content, camel_mime_parser_postface (mp));</div><div class='del'>-		</div><div class='del'>-		d(printf("Created multi-part\n"));</div><div class='del'>-		break; }</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state (mp));</div><div class='del'>-	}</div><div class='del'>-	if (content) {</div><div class='del'>-		/* would you believe you have to set this BEFORE you set the content object???  oh my god !!!! */</div><div class='del'>-		camel_data_wrapper_set_mime_type_field (content, </div><div class='del'>-							camel_mime_part_get_content_type ((CamelMimePart *)dw));</div><div class='del'>-		camel_medium_set_content_object ((CamelMedium *)dw, content);</div><div class='del'>-		camel_object_unref ((CamelObject *)content);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h<br/>deleted file mode 100644<br/>index 576f7bd3e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-part-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mime-part-utils : Utility for mime parsing and so on */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MIME_PART_UTILS_H</div><div class='del'>-#define CAMEL_MIME_PART_UTILS_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-</div><div class='del'>-void camel_mime_part_construct_content_from_parser(CamelMimePart *, CamelMimeParser *mp);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /*  CAMEL_MIME_PART_UTILS_H  */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c<br/>deleted file mode 100644<br/>index e64fc94927..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-part.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,935 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camelMimePart.c : Abstract class for a mime_part */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "camel-mime-parser.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-basic.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include "camel-mime-part-utils.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	HEADER_UNKNOWN,</div><div class='del'>-	HEADER_DESCRIPTION,</div><div class='del'>-	HEADER_DISPOSITION,</div><div class='del'>-	HEADER_CONTENT_ID,</div><div class='del'>-	HEADER_ENCODING,</div><div class='del'>-	HEADER_CONTENT_MD5,</div><div class='del'>-	HEADER_CONTENT_LOCATION,</div><div class='del'>-	HEADER_CONTENT_LANGUAGES,</div><div class='del'>-	HEADER_CONTENT_TYPE</div><div class='del'>-} CamelHeaderType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GHashTable *header_name_table;</div><div class='del'>-static GHashTable *header_formatted_table;</div><div class='del'>-</div><div class='del'>-static CamelMediumClass *parent_class=NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMimePart */</div><div class='del'>-#define CMP_CLASS(so) CAMEL_MIME_PART_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* from CamelDataWrapper */</div><div class='del'>-static int             write_to_stream                 (CamelDataWrapper *data_wrapper, CamelStream *stream);</div><div class='del'>-static int	       construct_from_stream	       (CamelDataWrapper *dw, CamelStream *s);</div><div class='del'>-</div><div class='del'>-/* from CamelMedia */ </div><div class='del'>-static void            add_header                      (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void            set_header                      (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void            remove_header                   (CamelMedium *medium, const char *header_name);</div><div class='del'>-static const void     *get_header                      (CamelMedium *medium, const char *header_name);</div><div class='del'>-static GArray         *get_headers                     (CamelMedium *medium);</div><div class='del'>-static void            free_headers                    (CamelMedium *medium, GArray *headers);</div><div class='del'>-</div><div class='del'>-static void            set_content_object              (CamelMedium *medium, CamelDataWrapper *content);</div><div class='del'>-</div><div class='del'>-/* from camel mime parser */</div><div class='del'>-static int             construct_from_parser           (CamelMimePart *, CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* forward references */</div><div class='del'>-static void set_disposition (CamelMimePart *mime_part, const gchar *disposition);</div><div class='del'>-</div><div class='del'>-/* format output of headers */</div><div class='del'>-static int write_references(CamelStream *stream, struct _header_raw *h);</div><div class='del'>-static int write_fold(CamelStream *stream, struct _header_raw *h);</div><div class='del'>-static int write_raw(CamelStream *stream, struct _header_raw *h);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* loads in a hash table the set of header names we */</div><div class='del'>-/* recognize and associate them with a unique enum  */</div><div class='del'>-/* identifier (see CamelHeaderType above)           */</div><div class='del'>-static void</div><div class='del'>-init_header_name_table()</div><div class='del'>-{</div><div class='del'>-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-Description", (gpointer)HEADER_DESCRIPTION);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-Disposition", (gpointer)HEADER_DISPOSITION);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-id", (gpointer)HEADER_CONTENT_ID);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-Transfer-Encoding", (gpointer)HEADER_ENCODING);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-MD5", (gpointer)HEADER_CONTENT_MD5);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-Location", (gpointer)HEADER_CONTENT_LOCATION);</div><div class='del'>-	g_hash_table_insert (header_name_table, "Content-Type", (gpointer)HEADER_CONTENT_TYPE);</div><div class='del'>-</div><div class='del'>-	header_formatted_table = g_hash_table_new(g_strcase_hash, g_strcase_equal);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Content-Type", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Content-Disposition", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "To", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "From", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Reply-To", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Cc", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Bcc", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "Message-ID", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "In-Reply-To", write_raw);</div><div class='del'>-	g_hash_table_insert(header_formatted_table, "References", write_references);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_part_class_init (CamelMimePartClass *camel_mime_part_class)</div><div class='del'>-{</div><div class='del'>-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_part_class);</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_part_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_MEDIUM_CLASS (camel_type_get_global_classfuncs (camel_medium_get_type ()));</div><div class='del'>-	init_header_name_table();</div><div class='del'>-</div><div class='del'>-	camel_mime_part_class-&gt;construct_from_parser = construct_from_parser;</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */	</div><div class='del'>-	camel_medium_class-&gt;add_header                = add_header;</div><div class='del'>-	camel_medium_class-&gt;set_header                = set_header;</div><div class='del'>-	camel_medium_class-&gt;get_header                = get_header;</div><div class='del'>-	camel_medium_class-&gt;remove_header             = remove_header;</div><div class='del'>-	camel_medium_class-&gt;get_headers               = get_headers;</div><div class='del'>-	camel_medium_class-&gt;free_headers              = free_headers;</div><div class='del'>-	camel_medium_class-&gt;set_content_object        = set_content_object;</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream     = write_to_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;construct_from_stream= construct_from_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_part_init (gpointer   object,  gpointer   klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *camel_mime_part = CAMEL_MIME_PART (object);</div><div class='del'>-	</div><div class='del'>-	camel_mime_part-&gt;content_type         = header_content_type_new ("text", "plain");</div><div class='del'>-	camel_mime_part-&gt;description          = NULL;</div><div class='del'>-	camel_mime_part-&gt;disposition          = NULL;</div><div class='del'>-	camel_mime_part-&gt;content_id           = NULL;</div><div class='del'>-	camel_mime_part-&gt;content_MD5          = NULL;</div><div class='del'>-	camel_mime_part-&gt;content_location     = NULL;</div><div class='del'>-	camel_mime_part-&gt;content_languages    = NULL;</div><div class='del'>-	camel_mime_part-&gt;encoding             = CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-camel_mime_part_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mime_part = CAMEL_MIME_PART (object);</div><div class='del'>-	</div><div class='del'>-	g_free (mime_part-&gt;description);</div><div class='del'>-	g_free (mime_part-&gt;content_id);</div><div class='del'>-	g_free (mime_part-&gt;content_MD5);</div><div class='del'>-	g_free (mime_part-&gt;content_location);</div><div class='del'>-	string_list_free (mime_part-&gt;content_languages);</div><div class='del'>-	header_disposition_unref(mime_part-&gt;disposition);</div><div class='del'>-	</div><div class='del'>-	if (mime_part-&gt;content_type)</div><div class='del'>-		header_content_type_unref (mime_part-&gt;content_type);</div><div class='del'>-</div><div class='del'>-	header_raw_clear(&amp;mime_part-&gt;headers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_part_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_part_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_part_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mime_part_type = camel_type_register (CAMEL_MEDIUM_TYPE, "CamelMimePart",</div><div class='del'>-							    sizeof (CamelMimePart),</div><div class='del'>-							    sizeof (CamelMimePartClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_mime_part_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_mime_part_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_mime_part_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_part_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-process_header(CamelMedium *medium, const char *header_name, const char *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);</div><div class='del'>-	CamelHeaderType header_type;</div><div class='del'>-	const char *charset;</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	/* Try to parse the header pair. If it corresponds to something   */</div><div class='del'>-	/* known, the job is done in the parsing routine. If not,         */</div><div class='del'>-	/* we simply add the header in a raw fashion                      */</div><div class='del'>-</div><div class='del'>-	header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name);</div><div class='del'>-	switch (header_type) {</div><div class='del'>-	case HEADER_DESCRIPTION: /* raw header-&gt;utf8 conversion */</div><div class='del'>-		g_free (mime_part-&gt;description);</div><div class='del'>-		if (mime_part-&gt;content_type)</div><div class='del'>-			charset = e_iconv_charset_name(header_content_type_param(mime_part-&gt;content_type, "charset"));</div><div class='del'>-		else</div><div class='del'>-			charset = NULL;</div><div class='del'>-		mime_part-&gt;description = g_strstrip (header_decode_string (header_value, charset));</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_DISPOSITION:</div><div class='del'>-		set_disposition (mime_part, header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_CONTENT_ID:</div><div class='del'>-		g_free (mime_part-&gt;content_id);</div><div class='del'>-		mime_part-&gt;content_id = header_msgid_decode (header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_ENCODING:</div><div class='del'>-		text = header_token_decode (header_value);</div><div class='del'>-		mime_part-&gt;encoding = camel_mime_part_encoding_from_string (text);</div><div class='del'>-		g_free (text);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_CONTENT_MD5:</div><div class='del'>-		g_free (mime_part-&gt;content_MD5);</div><div class='del'>-		mime_part-&gt;content_MD5 = g_strdup (header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_CONTENT_LOCATION:</div><div class='del'>-		g_free (mime_part-&gt;content_location);</div><div class='del'>-		mime_part-&gt;content_location = header_location_decode (header_value);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_CONTENT_TYPE:</div><div class='del'>-		if (mime_part-&gt;content_type)</div><div class='del'>-			header_content_type_unref (mime_part-&gt;content_type);</div><div class='del'>-		mime_part-&gt;content_type = header_content_type_decode (header_value);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = CAMEL_MIME_PART (medium);</div><div class='del'>-	</div><div class='del'>-	process_header(medium, header_name, header_value);</div><div class='del'>-	header_raw_replace(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = CAMEL_MIME_PART (medium);</div><div class='del'>-	</div><div class='del'>-	/* Try to parse the header pair. If it corresponds to something   */</div><div class='del'>-	/* known, the job is done in the parsing routine. If not,         */</div><div class='del'>-	/* we simply add the header in a raw fashion                      */</div><div class='del'>-</div><div class='del'>-	/* If it was one of the headers we handled, it must be unique, set it instead of add */</div><div class='del'>-	if (process_header(medium, header_name, header_value))</div><div class='del'>-		header_raw_replace(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-	else</div><div class='del'>-		header_raw_append(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_header (CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = (CamelMimePart *)medium;</div><div class='del'>-	</div><div class='del'>-	process_header(medium, header_name, NULL);</div><div class='del'>-	header_raw_remove(&amp;part-&gt;headers, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-get_header (CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = (CamelMimePart *)medium;</div><div class='del'>-</div><div class='del'>-	return header_raw_find(&amp;part-&gt;headers, header_name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GArray *</div><div class='del'>-get_headers (CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = (CamelMimePart *)medium;</div><div class='del'>-	GArray *headers;</div><div class='del'>-	CamelMediumHeader header;</div><div class='del'>-	struct _header_raw *h;</div><div class='del'>-</div><div class='del'>-	headers = g_array_new (FALSE, FALSE, sizeof (CamelMediumHeader));</div><div class='del'>-	for (h = part-&gt;headers; h; h = h-&gt;next) {</div><div class='del'>-		header.name = h-&gt;name;</div><div class='del'>-		header.value = h-&gt;value;</div><div class='del'>-		g_array_append_val (headers, header);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return headers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_headers (CamelMedium *medium, GArray *gheaders)</div><div class='del'>-{</div><div class='del'>-	g_array_free (gheaders, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-Description */</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_description (CamelMimePart *mime_part, const gchar *description)</div><div class='del'>-{</div><div class='del'>-	char *text = header_encode_string (description);</div><div class='del'>-	</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Description", text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_description (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;description;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-Disposition */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_disposition (CamelMimePart *mime_part, const gchar *disposition)</div><div class='del'>-{</div><div class='del'>-	header_disposition_unref(mime_part-&gt;disposition);</div><div class='del'>-	if (disposition)</div><div class='del'>-		mime_part-&gt;disposition = header_disposition_decode(disposition);</div><div class='del'>-	else</div><div class='del'>-		mime_part-&gt;disposition = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_disposition (CamelMimePart *mime_part, const gchar *disposition)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	/* we poke in a new disposition (so we dont lose 'filename', etc) */</div><div class='del'>-	if (mime_part-&gt;disposition == NULL) {</div><div class='del'>-		set_disposition(mime_part, disposition);</div><div class='del'>-	}</div><div class='del'>-	if (mime_part-&gt;disposition != NULL) {</div><div class='del'>-		g_free(mime_part-&gt;disposition-&gt;disposition);</div><div class='del'>-		mime_part-&gt;disposition-&gt;disposition = g_strdup(disposition);</div><div class='del'>-	}</div><div class='del'>-	text = header_disposition_format(mime_part-&gt;disposition);</div><div class='del'>-</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Disposition", text);</div><div class='del'>-</div><div class='del'>-	g_free(text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_disposition (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	if (mime_part-&gt;disposition)</div><div class='del'>-		return (mime_part-&gt;disposition)-&gt;disposition;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** Content-Disposition: filename="xxx" */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_filename (CamelMimePart *mime_part, const gchar *filename)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (mime_part-&gt;disposition == NULL)</div><div class='del'>-		mime_part-&gt;disposition = header_disposition_decode("attachment");</div><div class='del'>-</div><div class='del'>-	header_set_param(&amp;mime_part-&gt;disposition-&gt;params, "filename", filename);</div><div class='del'>-	str = header_disposition_format(mime_part-&gt;disposition);</div><div class='del'>-</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Disposition", str);</div><div class='del'>-	g_free(str);</div><div class='del'>-	</div><div class='del'>-	header_content_type_set_param (mime_part-&gt;content_type, "name", filename);</div><div class='del'>-	str = header_content_type_format (mime_part-&gt;content_type);</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Type", str);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_filename (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	if (mime_part-&gt;disposition) {</div><div class='del'>-		const gchar *name = header_param (mime_part-&gt;disposition-&gt;params, "filename");</div><div class='del'>-		if (name)</div><div class='del'>-			return name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return header_content_type_param (mime_part-&gt;content_type, "name");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** Content-ID: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)</div><div class='del'>-{</div><div class='del'>-	char *cid, *id;</div><div class='del'>-	</div><div class='del'>-	if (contentid)</div><div class='del'>-		id = g_strstrip (g_strdup (contentid));</div><div class='del'>-	else</div><div class='del'>-		id = header_msgid_generate ();</div><div class='del'>-	</div><div class='del'>-	cid = g_strdup_printf ("&lt;%s&gt;", id);</div><div class='del'>-	g_free (id);</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-ID", cid);</div><div class='del'>-	g_free (cid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_content_id (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;content_id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-MD5: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_content_MD5 (CamelMimePart *mime_part, const char *md5)</div><div class='del'>-{</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-MD5", md5);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;content_MD5;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-MD5: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_content_location (CamelMimePart *mime_part, const char *location)</div><div class='del'>-{</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Location", location);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_content_location (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;content_location;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-Transfer-Encoding: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_encoding (CamelMimePart *mime_part,</div><div class='del'>-			      CamelMimePartEncodingType encoding)</div><div class='del'>-{</div><div class='del'>-	const char *text;</div><div class='del'>-</div><div class='del'>-	text = camel_mime_part_encoding_to_string (encoding);</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Transfer-Encoding", text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const CamelMimePartEncodingType</div><div class='del'>-camel_mime_part_get_encoding (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;encoding;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: do something with this stuff ... */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_content_languages (CamelMimePart *mime_part, GList *content_languages)</div><div class='del'>-{</div><div class='del'>-	if (mime_part-&gt;content_languages) string_list_free (mime_part-&gt;content_languages);</div><div class='del'>-	mime_part-&gt;content_languages = content_languages;</div><div class='del'>-</div><div class='del'>-	/* FIXME: translate to a header and set it */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const GList *</div><div class='del'>-camel_mime_part_get_content_languages (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;content_languages;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** */</div><div class='del'>-</div><div class='del'>-/* **** Content-Type: */</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-camel_mime_part_set_content_type (CamelMimePart *mime_part, gchar *content_type)</div><div class='del'>-{</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Type", content_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelContentType *</div><div class='del'>-camel_mime_part_get_content_type (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;content_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*********/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_content_object (CamelMedium *medium, CamelDataWrapper *content)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);</div><div class='del'>-	CamelContentType *object_content_type;</div><div class='del'>-</div><div class='del'>-	parent_class-&gt;set_content_object (medium, content);</div><div class='del'>-</div><div class='del'>-	object_content_type = camel_data_wrapper_get_mime_type_field (content);</div><div class='del'>-	if (mime_part-&gt;content_type != object_content_type) {</div><div class='del'>-		char *txt;</div><div class='del'>-</div><div class='del'>-		txt = header_content_type_format (object_content_type);</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (mime_part), "Content-Type", txt);</div><div class='del'>-		g_free(txt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**********************************************************************/</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_references(CamelStream *stream, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	int len, out, total;</div><div class='del'>-	char *v, *ids, *ide;</div><div class='del'>-</div><div class='del'>-	/* this is only approximate, based on the next &gt;, this way it retains any content</div><div class='del'>-	   from the original which may not be properly formatted, etc.  It also doesn't handle</div><div class='del'>-	   the case where an individual messageid is too long, however thats a bad mail to</div><div class='del'>-	   start with ... */</div><div class='del'>-</div><div class='del'>-	v = h-&gt;value;</div><div class='del'>-	len = strlen(h-&gt;name)+1;</div><div class='del'>-	total = camel_stream_printf(stream, "%s%s", h-&gt;name, isspace(v[0])?":":": ");</div><div class='del'>-	if (total == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	while (*v) {</div><div class='del'>-		ids = v;</div><div class='del'>-		ide = strchr(ids+1, '&gt;');</div><div class='del'>-		if (ide)</div><div class='del'>-			v = ++ide;</div><div class='del'>-		else</div><div class='del'>-			ide = v = strlen(ids)+ids;</div><div class='del'>-</div><div class='del'>-		if (len&gt;0 &amp;&amp; len + (ide - ids) &gt;= CAMEL_FOLD_SIZE) {</div><div class='del'>-			out = camel_stream_printf(stream, "\n\t");</div><div class='del'>-			if (out == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			total += out;</div><div class='del'>-			len = 0;</div><div class='del'>-		}</div><div class='del'>-		out = camel_stream_write(stream, ids, ide-ids);</div><div class='del'>-		if (out == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		len += out;</div><div class='del'>-		total += out;</div><div class='del'>-	}</div><div class='del'>-	camel_stream_write(stream, "\n", 1);</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* not needed - yet - handled by default case */</div><div class='del'>-static int</div><div class='del'>-write_fold(CamelStream *stream, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	char *val;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	val = header_fold(h-&gt;value, strlen(h-&gt;name));</div><div class='del'>-	count = camel_stream_printf(stream, "%s%s%s\n", h-&gt;name, isspace(val[0]) ? ":" : ": ", val);</div><div class='del'>-	g_free(val);</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_raw(CamelStream *stream, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	char *val = h-&gt;value;</div><div class='del'>-</div><div class='del'>-	return camel_stream_printf(stream, "%s%s%s\n", h-&gt;name, isspace(val[0]) ? ":" : ": ", val);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_to_stream(CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mp = CAMEL_MIME_PART(data_wrapper);</div><div class='del'>-	CamelMedium *medium = CAMEL_MEDIUM(data_wrapper);</div><div class='del'>-	CamelStream *ostream = stream;</div><div class='del'>-	CamelDataWrapper *content;</div><div class='del'>-	int total = 0;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	d(printf("mime_part::write_to_stream\n"));</div><div class='del'>-</div><div class='del'>-	/* FIXME: something needs to be done about this ... */</div><div class='del'>-	/* FIXME: need to count these bytes too */</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning content-languages should be stored as a header</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	if (mp-&gt;headers) {</div><div class='del'>-		struct _header_raw *h = mp-&gt;headers;</div><div class='del'>-		char *val;</div><div class='del'>-		int (*writefn)(CamelStream *stream, struct _header_raw *);</div><div class='del'>-		</div><div class='del'>-		/* fold/write the headers.   But dont fold headers that are already formatted</div><div class='del'>-		   (e.g. ones with parameter-lists, that we know about, and have created) */</div><div class='del'>-		while (h) {</div><div class='del'>-			val = h-&gt;value;</div><div class='del'>-			if (val == NULL) {</div><div class='del'>-				g_warning("h-&gt;value is NULL here for %s", h-&gt;name);</div><div class='del'>-				count = 0;</div><div class='del'>-			} else if ((writefn = g_hash_table_lookup(header_formatted_table, h-&gt;name)) == NULL) {</div><div class='del'>-				val = header_fold(val, strlen(h-&gt;name));</div><div class='del'>-				count = camel_stream_printf(stream, "%s%s%s\n", h-&gt;name, isspace(val[0]) ? ":" : ": ", val);</div><div class='del'>-				g_free(val);</div><div class='del'>-			} else {</div><div class='del'>-				count = writefn(stream, h);</div><div class='del'>-			}</div><div class='del'>-			if (count == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			total += count;</div><div class='del'>-			h = h-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	count = camel_stream_write(stream, "\n", 1);</div><div class='del'>-	if (count == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	total += count;</div><div class='del'>-	</div><div class='del'>-	content = camel_medium_get_content_object(medium);</div><div class='del'>-	if (content) {</div><div class='del'>-		/* I dont really like this here, but i dont know where else it might go ... */</div><div class='del'>-#define CAN_THIS_GO_ELSEWHERE</div><div class='del'>-#ifdef CAN_THIS_GO_ELSEWHERE</div><div class='del'>-		CamelMimeFilter *filter = NULL;</div><div class='del'>-		CamelStreamFilter *filter_stream = NULL;</div><div class='del'>-		CamelMimeFilter *charenc = NULL;</div><div class='del'>-		const char *filename;</div><div class='del'>-		const char *charset;</div><div class='del'>-		</div><div class='del'>-		switch (mp-&gt;encoding) {</div><div class='del'>-		case CAMEL_MIME_PART_ENCODING_BASE64:</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_ENC);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_ENC);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_MIME_PART_ENCODING_UUENCODE:</div><div class='del'>-			filename = camel_mime_part_get_filename (mp);</div><div class='del'>-			count = camel_stream_printf (ostream, "begin 644 %s\n", filename ? filename : "untitled");</div><div class='del'>-			if (count == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			total += count;</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_UU_ENC);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (!data_wrapper-&gt;rawtext &amp;&amp; header_content_type_is(mp-&gt;content_type, "text", "*")) {</div><div class='del'>-			charset = header_content_type_param(mp-&gt;content_type, "charset");</div><div class='del'>-			if (charset &amp;&amp; !(!strcasecmp(charset, "us-ascii") || !strcasecmp(charset, "utf-8"))) {</div><div class='del'>-				charenc = (CamelMimeFilter *)camel_mime_filter_charset_new_convert("UTF-8", charset);</div><div class='del'>-			} </div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (filter || charenc) {</div><div class='del'>-			filter_stream = camel_stream_filter_new_with_stream(stream);</div><div class='del'>-			</div><div class='del'>-			/* if we have a character encoder, add that always */</div><div class='del'>-			if (charenc) {</div><div class='del'>-				camel_stream_filter_add(filter_stream, charenc);</div><div class='del'>-				camel_object_unref((CamelObject *)charenc);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* we only re-do crlf on encoded blocks */</div><div class='del'>-			if (filter &amp;&amp; header_content_type_is(mp-&gt;content_type, "text", "*")) {</div><div class='del'>-				CamelMimeFilter *crlf = camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-										   CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-				</div><div class='del'>-				camel_stream_filter_add(filter_stream, crlf);</div><div class='del'>-				camel_object_unref((CamelObject *)crlf);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (filter) {</div><div class='del'>-				camel_stream_filter_add(filter_stream, filter);</div><div class='del'>-				camel_object_unref((CamelObject *)filter);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			stream = (CamelStream *)filter_stream;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-		</div><div class='del'>-		count = camel_data_wrapper_write_to_stream(content, stream);</div><div class='del'>-		</div><div class='del'>-		if (filter_stream) {</div><div class='del'>-			camel_stream_flush((CamelStream *)filter_stream);</div><div class='del'>-			camel_object_unref((CamelObject *)filter_stream);</div><div class='del'>-		}</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-		</div><div class='del'>-		if (mp-&gt;encoding == CAMEL_MIME_PART_ENCODING_UUENCODE) {</div><div class='del'>-			count = camel_stream_write (ostream, "end\n", 4);</div><div class='del'>-			if (count == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			total += count;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_warning("No content for medium, nothing to write");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* mime_part */</div><div class='del'>-static int</div><div class='del'>-construct_from_parser(CamelMimePart *dw, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *headers;</div><div class='del'>-	const char *content;</div><div class='del'>-	char *buf;</div><div class='del'>-	int len;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	d(printf("mime_part::construct_from_parser()\n"));</div><div class='del'>-</div><div class='del'>-	switch (camel_mime_parser_step(mp, &amp;buf, &amp;len)) {</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-		/* set the default type of a message always */</div><div class='del'>-		if (dw-&gt;content_type)</div><div class='del'>-			header_content_type_unref (dw-&gt;content_type);</div><div class='del'>-		dw-&gt;content_type = header_content_type_decode ("message/rfc822");</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		/* we have the headers, build them into 'us' */</div><div class='del'>-		headers = camel_mime_parser_headers_raw(mp);</div><div class='del'>-</div><div class='del'>-		/* if content-type exists, process it first, set for fallback charset in headers */</div><div class='del'>-		content = header_raw_find(&amp;headers, "content-type", NULL);</div><div class='del'>-		if (content)</div><div class='del'>-			process_header((CamelMedium *)dw, "content-type", content);</div><div class='del'>-</div><div class='del'>-		while (headers) {</div><div class='del'>-			if (strcasecmp(headers-&gt;name, "content-type") == 0</div><div class='del'>-			    &amp;&amp; headers-&gt;value != content)</div><div class='del'>-				camel_medium_add_header((CamelMedium *)dw, "X-Invalid-Content-Type", headers-&gt;value);</div><div class='del'>-			else</div><div class='del'>-				camel_medium_add_header((CamelMedium *)dw, headers-&gt;name, headers-&gt;value);</div><div class='del'>-			headers = headers-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_mime_part_construct_content_from_parser(dw, mp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("mime_part::construct_from_parser() leaving\n"));</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "Need to work out how to detect a (fatally) bad parse in the parser"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	err = camel_mime_parser_errno(mp);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		errno = err;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_part_construct_from_parser:</div><div class='del'>- * @mime_part: </div><div class='del'>- * @mp: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_part_construct_from_parser(CamelMimePart *mime_part, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	return CMP_CLASS (mime_part)-&gt;construct_from_parser (mime_part, mp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-construct_from_stream(CamelDataWrapper *dw, CamelStream *s)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	d(printf("mime_part::construct_from_stream()\n"));</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	if (camel_mime_parser_init_with_stream(mp, s) == -1) {</div><div class='del'>-		g_warning("Cannot create parser for stream");</div><div class='del'>-		ret = -1;</div><div class='del'>-	} else {</div><div class='del'>-		ret = camel_mime_part_construct_from_parser((CamelMimePart *)dw, mp);</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this must be kept in sync with the header */</div><div class='del'>-static const char *encodings[] = {</div><div class='del'>-	"",</div><div class='del'>-	"7bit",</div><div class='del'>-	"8bit",</div><div class='del'>-	"base64",</div><div class='del'>-	"quoted-printable",</div><div class='del'>-	"binary",</div><div class='del'>-	"x-uuencode",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_mime_part_encoding_to_string (CamelMimePartEncodingType encoding)</div><div class='del'>-{</div><div class='del'>-	if (encoding &gt;= sizeof(encodings)/sizeof(encodings[0]))</div><div class='del'>-		encoding = 0;</div><div class='del'>-</div><div class='del'>-	return encodings[encoding];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME I am not sure this is the correct way to do this.  */</div><div class='del'>-CamelMimePartEncodingType</div><div class='del'>-camel_mime_part_encoding_from_string (const gchar *string)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (string != NULL) {</div><div class='del'>-		for (i=0;i&lt;sizeof(encodings)/sizeof(encodings[0]);i++)</div><div class='del'>-			if (!strcasecmp(string, encodings[i]))</div><div class='del'>-				return i;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return CAMEL_MIME_PART_ENCODING_DEFAULT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/******************************/</div><div class='del'>-/**  Misc utility functions  **/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_part_new:</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelMimePart</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_mime_part_new (void)</div><div class='del'>-{</div><div class='del'>-	return (CamelMimePart *)camel_object_new (CAMEL_MIME_PART_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_part_set_content:</div><div class='del'>- * @camel_mime_part: Mime part</div><div class='del'>- * @data: data to put into the part</div><div class='del'>- * @length: length of @data</div><div class='del'>- * @type: Content-Type of the data</div><div class='del'>- * </div><div class='del'>- * Utility function used to set the content of a mime part object to </div><div class='del'>- * be the provided data. If @length is 0, this routine can be used as</div><div class='del'>- * a way to remove old content (in which case @data and @type are</div><div class='del'>- * ignored and may be %NULL).</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_mime_part_set_content (CamelMimePart *camel_mime_part,</div><div class='del'>-			     const char *data, int length,</div><div class='del'>-			     const char *type) /* why on earth is the type last? */</div><div class='del'>-{</div><div class='del'>-	CamelMedium *medium = CAMEL_MEDIUM (camel_mime_part);</div><div class='del'>-</div><div class='del'>-	if (length) {</div><div class='del'>-		CamelDataWrapper *dw;</div><div class='del'>-		CamelStream *stream;</div><div class='del'>-</div><div class='del'>-		dw = camel_data_wrapper_new ();</div><div class='del'>-		camel_data_wrapper_set_mime_type (dw, type);</div><div class='del'>-		stream = camel_stream_mem_new_with_buffer (data, length);</div><div class='del'>-		camel_data_wrapper_construct_from_stream (dw, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_medium_set_content_object (medium, dw);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (dw));</div><div class='del'>-	} else {</div><div class='del'>-		if (medium-&gt;content)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-		medium-&gt;content = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h<br/>deleted file mode 100644<br/>index 4f05ecb71b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-part.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-mime-part.h : class for a mime part */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MIME_PART_H</div><div class='del'>-#define CAMEL_MIME_PART_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-medium.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-parser.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_PART_TYPE     (camel_mime_part_get_type ())</div><div class='del'>-#define CAMEL_MIME_PART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))</div><div class='del'>-#define CAMEL_MIME_PART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))</div><div class='del'>-#define CAMEL_IS_MIME_PART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))</div><div class='del'>-</div><div class='del'>-/* note, if you change this, make sure you change the 'encodings' array in camel-mime-part.c */</div><div class='del'>-enum _CamelMimePartEncodingType {</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_DEFAULT,</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_7BIT,</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_8BIT,</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_BASE64,</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE,</div><div class='del'>-        CAMEL_MIME_PART_ENCODING_BINARY,</div><div class='del'>-	CAMEL_MIME_PART_ENCODING_UUENCODE,</div><div class='del'>-        CAMEL_MIME_PART_NUM_ENCODINGS</div><div class='del'>-};</div><div class='del'>-typedef enum _CamelMimePartEncodingType CamelMimePartEncodingType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Do not change these values directly, you would regret it one day */</div><div class='del'>-struct _CamelMimePart</div><div class='del'>-{</div><div class='del'>-	CamelMedium parent_object;</div><div class='del'>-</div><div class='del'>-	CamelContentType *content_type;</div><div class='del'>-	struct _header_raw *headers; /* mime headers */</div><div class='del'>-	</div><div class='del'>-	/* All fields here are -** PRIVATE **- */</div><div class='del'>-	char *description;</div><div class='del'>-	CamelMimeDisposition *disposition;</div><div class='del'>-	char *content_id;</div><div class='del'>-	char *content_MD5;</div><div class='del'>-	char *content_location;</div><div class='del'>-	GList *content_languages;</div><div class='del'>-	CamelMimePartEncodingType encoding;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimePartClass {</div><div class='del'>-	CamelMediumClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	int (*construct_from_parser) (CamelMimePart *, CamelMimeParser *);</div><div class='del'>-} CamelMimePartClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mime_part_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMimePart *  camel_mime_part_new                    (void);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_description	(CamelMimePart *mime_part, const gchar *description);</div><div class='del'>-const     gchar *camel_mime_part_get_description	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_disposition	(CamelMimePart *mime_part, const gchar *disposition);</div><div class='del'>-const     gchar *camel_mime_part_get_disposition	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_filename		(CamelMimePart *mime_part, const gchar *filename);</div><div class='del'>-const	  gchar *camel_mime_part_get_filename		(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void             camel_mime_part_set_content_id		(CamelMimePart *mime_part, const char *contentid);</div><div class='del'>-const	  gchar *camel_mime_part_get_content_id		(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void		 camel_mime_part_set_content_MD5	(CamelMimePart *mime_part, const char *);</div><div class='del'>-const	  gchar *camel_mime_part_get_content_MD5	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void		 camel_mime_part_set_content_location	(CamelMimePart *mime_part, const char *);</div><div class='del'>-const	  gchar *camel_mime_part_get_content_location	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_encoding		(CamelMimePart *mime_part, CamelMimePartEncodingType type);</div><div class='del'>-CamelMimePartEncodingType camel_mime_part_get_encoding	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	 	 camel_mime_part_set_content_languages	(CamelMimePart *mime_part, GList *content_languages);</div><div class='del'>-const	  GList *camel_mime_part_get_content_languages	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-/* FIXME: what about content-type parameters?   what about major/minor parts? */</div><div class='del'>-void               camel_mime_part_set_content_type 	(CamelMimePart *mime_part, gchar *content_type);</div><div class='del'>-CamelContentType  *camel_mime_part_get_content_type	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-const     gchar *         camel_mime_part_encoding_to_string   (CamelMimePartEncodingType encoding);</div><div class='del'>-CamelMimePartEncodingType camel_mime_part_encoding_from_string (const gchar *string);</div><div class='del'>-</div><div class='del'>-/* construction */</div><div class='del'>-int		camel_mime_part_construct_from_parser  (CamelMimePart *, CamelMimeParser *);</div><div class='del'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-void      	camel_mime_part_set_content 	       (CamelMimePart *camel_mime_part,</div><div class='del'>-							const char *content, int length, const char *type);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MIME_PART_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c<br/>deleted file mode 100644<br/>index d32558096e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4224 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* dont touch this file without my permission - Michael */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/param.h&gt;  /* for MAXHOSTNAMELEN */</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef MAXHOSTNAMELEN</div><div class='del'>-#define MAXHOSTNAMELEN 1024</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef CLEAN_DATE</div><div class='del'>-#include "broken-date-parser.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int strdup_count = 0;</div><div class='del'>-int malloc_count = 0;</div><div class='del'>-int free_count = 0;</div><div class='del'>-</div><div class='del'>-#define g_strdup(x) (strdup_count++, g_strdup(x))</div><div class='del'>-#define g_malloc(x) (malloc_count++, g_malloc(x))</div><div class='del'>-#define g_free(x) (free_count++, g_free(x))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* for all non-essential warnings ... */</div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-#define d2(x)</div><div class='del'>-</div><div class='del'>-#define CAMEL_UUENCODE_CHAR(c)  ((c) ? (c) + ' ' : '`')</div><div class='del'>-#define	CAMEL_UUDECODE_CHAR(c)	(((c) - ' ') &amp; 077)</div><div class='del'>-</div><div class='del'>-static char *base64_alphabet =</div><div class='del'>-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";</div><div class='del'>-</div><div class='del'>-static unsigned char tohex[16] = {</div><div class='del'>-	'0', '1', '2', '3', '4', '5', '6', '7',</div><div class='del'>-	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short camel_mime_special_table[256];</div><div class='del'>-static unsigned char camel_mime_base64_rank[256];</div><div class='del'>-</div><div class='del'>-/* Flags bits set in the mime_special table, use the is_*() mactos to access them normally */</div><div class='del'>-enum {</div><div class='del'>-	IS_CTRL		= 1&lt;&lt;0,</div><div class='del'>-	IS_LWSP		= 1&lt;&lt;1,</div><div class='del'>-	IS_TSPECIAL	= 1&lt;&lt;2,</div><div class='del'>-	IS_SPECIAL	= 1&lt;&lt;3,</div><div class='del'>-	IS_SPACE	= 1&lt;&lt;4,</div><div class='del'>-	IS_DSPECIAL	= 1&lt;&lt;5,</div><div class='del'>-	IS_QPSAFE	= 1&lt;&lt;6,</div><div class='del'>-	IS_ESAFE	= 1&lt;&lt;7,	/* encoded word safe */</div><div class='del'>-	IS_PSAFE	= 1&lt;&lt;8,	/* encoded word in phrase safe */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define is_ctrl(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_CTRL) != 0)</div><div class='del'>-#define is_lwsp(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_LWSP) != 0)</div><div class='del'>-#define is_tspecial(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_TSPECIAL) != 0)</div><div class='del'>-#define is_type(x, t) ((camel_mime_special_table[(unsigned char)(x)] &amp; (t)) != 0)</div><div class='del'>-#define is_ttoken(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_TSPECIAL|IS_LWSP|IS_CTRL)) == 0)</div><div class='del'>-#define is_atom(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_SPECIAL|IS_SPACE|IS_CTRL)) == 0)</div><div class='del'>-#define is_dtext(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_DSPECIAL) == 0)</div><div class='del'>-#define is_fieldname(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_CTRL|IS_SPACE)) == 0)</div><div class='del'>-#define is_qpsafe(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_QPSAFE) != 0)</div><div class='del'>-#define is_especial(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_ESPECIAL) != 0)</div><div class='del'>-#define is_psafe(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_PSAFE) != 0)</div><div class='del'>-</div><div class='del'>-/* Used by table initialisation code for special characters */</div><div class='del'>-#define CHARS_LWSP " \t\n\r"</div><div class='del'>-#define CHARS_TSPECIAL "()&lt;&gt;@,;:\\\"/[]?="</div><div class='del'>-#define CHARS_SPECIAL "()&lt;&gt;@,;:\\\".[]"</div><div class='del'>-#define CHARS_CSPECIAL "()\\\r"	/* not in comments */</div><div class='del'>-#define CHARS_DSPECIAL "[]\\\r \t"	/* not in domains */</div><div class='del'>-#define CHARS_ESPECIAL "()&lt;&gt;@,;:\"/[]?.=_" /* list of characters that must be encoded.</div><div class='del'>-					      encoded word in text specials: rfc 2047 5(1)*/</div><div class='del'>-#define CHARS_PSPECIAL "!*+-/" /* list of additional characters that can be left unencoded.</div><div class='del'>-				  encoded word in phrase specials: rfc 2047 5(3) */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_remove_bits(unsigned short bit, unsigned char *vals)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;vals[i];i++)</div><div class='del'>-		camel_mime_special_table[vals[i]] &amp;= ~ bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_init_bits(unsigned short bit, unsigned short bitcopy, int remove, unsigned char *vals)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int len = strlen(vals);</div><div class='del'>-</div><div class='del'>-	if (!remove) {</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			camel_mime_special_table[vals[i]] |= bit;</div><div class='del'>-		}</div><div class='del'>-		if (bitcopy) {</div><div class='del'>-			for (i=0;i&lt;256;i++) {</div><div class='del'>-				if (camel_mime_special_table[i] &amp; bitcopy)</div><div class='del'>-					camel_mime_special_table[i] |= bit;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0;i&lt;256;i++)</div><div class='del'>-			camel_mime_special_table[i] |= bit;</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			camel_mime_special_table[vals[i]] &amp;= ~bit;</div><div class='del'>-		}</div><div class='del'>-		if (bitcopy) {</div><div class='del'>-			for (i=0;i&lt;256;i++) {</div><div class='del'>-				if (camel_mime_special_table[i] &amp; bitcopy)</div><div class='del'>-					camel_mime_special_table[i] &amp;= ~bit;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_decode_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		camel_mime_special_table[i] = 0;</div><div class='del'>-		if (i&lt;32)</div><div class='del'>-			camel_mime_special_table[i] |= IS_CTRL;</div><div class='del'>-		if ((i&gt;=33 &amp;&amp; i&lt;=60) || (i&gt;=62 &amp;&amp; i&lt;=126) || i==32 || i==9)</div><div class='del'>-			camel_mime_special_table[i] |= (IS_QPSAFE|IS_ESAFE);</div><div class='del'>-		if ((i&gt;='0' &amp;&amp; i&lt;='9') || (i&gt;='a' &amp;&amp; i&lt;='z') || (i&gt;='A' &amp;&amp; i&lt;= 'Z'))</div><div class='del'>-			camel_mime_special_table[i] |= IS_PSAFE;</div><div class='del'>-	}</div><div class='del'>-	camel_mime_special_table[127] |= IS_CTRL;</div><div class='del'>-	camel_mime_special_table[' '] |= IS_SPACE;</div><div class='del'>-	header_init_bits(IS_LWSP, 0, 0, CHARS_LWSP);</div><div class='del'>-	header_init_bits(IS_TSPECIAL, IS_CTRL, 0, CHARS_TSPECIAL);</div><div class='del'>-	header_init_bits(IS_SPECIAL, 0, 0, CHARS_SPECIAL);</div><div class='del'>-	header_init_bits(IS_DSPECIAL, 0, FALSE, CHARS_DSPECIAL);</div><div class='del'>-	header_remove_bits(IS_ESAFE, CHARS_ESPECIAL);</div><div class='del'>-	header_init_bits(IS_PSAFE, 0, 0, CHARS_PSPECIAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-base64_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	memset(camel_mime_base64_rank, 0xff, sizeof(camel_mime_base64_rank));</div><div class='del'>-	for (i=0;i&lt;64;i++) {</div><div class='del'>-		camel_mime_base64_rank[(unsigned int)base64_alphabet[i]] = i;</div><div class='del'>-	}</div><div class='del'>-	camel_mime_base64_rank['='] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* call this when finished encoding everything, to</div><div class='del'>-   flush off the last little bit */</div><div class='del'>-size_t</div><div class='del'>-base64_encode_close(unsigned char *in, size_t inlen, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	int c1, c2;</div><div class='del'>-	unsigned char *outptr = out;</div><div class='del'>-</div><div class='del'>-	if (inlen&gt;0)</div><div class='del'>-		outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	c1 = ((unsigned char *)save)[1];</div><div class='del'>-	c2 = ((unsigned char *)save)[2];</div><div class='del'>-	</div><div class='del'>-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",</div><div class='del'>-		 (int)((char *)save)[0],</div><div class='del'>-		 (int)((char *)save)[1],</div><div class='del'>-		 (int)((char *)save)[2]));</div><div class='del'>-</div><div class='del'>-	switch (((char *)save)[0]) {</div><div class='del'>-	case 2:</div><div class='del'>-		outptr[2] = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) ];</div><div class='del'>-		g_assert(outptr[2] != 0);</div><div class='del'>-		goto skip;</div><div class='del'>-	case 1:</div><div class='del'>-		outptr[2] = '=';</div><div class='del'>-	skip:</div><div class='del'>-		outptr[0] = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-		outptr[1] = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 )];</div><div class='del'>-		outptr[3] = '=';</div><div class='del'>-		outptr += 4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (break_lines)</div><div class='del'>-		*outptr++ = '\n';</div><div class='del'>-</div><div class='del'>-	*save = 0;</div><div class='del'>-	*state = 0;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  performs an 'encode step', only encodes blocks of 3 characters to the</div><div class='del'>-  output at a time, saves left-over state in state and save (initialise to</div><div class='del'>-  0 on first invocation).</div><div class='del'>-*/</div><div class='del'>-size_t</div><div class='del'>-base64_encode_step(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-</div><div class='del'>-	if (len&lt;=0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	d(printf("we have %d chars, and %d saved chars\n", len, ((char *)save)[0]));</div><div class='del'>-</div><div class='del'>-	if (len + ((char *)save)[0] &gt; 2) {</div><div class='del'>-		unsigned char *inend = in+len-2;</div><div class='del'>-		register int c1, c2, c3;</div><div class='del'>-		register int already;</div><div class='del'>-</div><div class='del'>-		already = *state;</div><div class='del'>-</div><div class='del'>-		switch (((char *)save)[0]) {</div><div class='del'>-		case 1:	c1 = ((unsigned char *)save)[1]; goto skip1;</div><div class='del'>-		case 2:	c1 = ((unsigned char *)save)[1];</div><div class='del'>-			c2 = ((unsigned char *)save)[2]; goto skip2;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */</div><div class='del'>-		while (inptr &lt; inend) {</div><div class='del'>-			c1 = *inptr++;</div><div class='del'>-		skip1:</div><div class='del'>-			c2 = *inptr++;</div><div class='del'>-		skip2:</div><div class='del'>-			c3 = *inptr++;</div><div class='del'>-			*outptr++ = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 ) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) | (c3 &gt;&gt; 6) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c3 &amp; 0x3f ];</div><div class='del'>-			/* this is a bit ugly ... */</div><div class='del'>-			if (break_lines &amp;&amp; (++already)&gt;=19) {</div><div class='del'>-				*outptr++='\n';</div><div class='del'>-				already = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		((char *)save)[0] = 0;</div><div class='del'>-		len = 2-(inptr-inend);</div><div class='del'>-		*state = already;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("state = %d, len = %d\n",</div><div class='del'>-		 (int)((char *)save)[0],</div><div class='del'>-		 len));</div><div class='del'>-</div><div class='del'>-	if (len&gt;0) {</div><div class='del'>-		register char *saveout;</div><div class='del'>-</div><div class='del'>-		/* points to the slot for the next char to save */</div><div class='del'>-		saveout = &amp; (((char *)save)[1]) + ((char *)save)[0];</div><div class='del'>-</div><div class='del'>-		/* len can only be 0 1 or 2 */</div><div class='del'>-		switch(len) {</div><div class='del'>-		case 2:	*saveout++ = *inptr++;</div><div class='del'>-		case 1:	*saveout++ = *inptr++;</div><div class='del'>-		}</div><div class='del'>-		((char *)save)[0]+=len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",</div><div class='del'>-		 (int)((char *)save)[0],</div><div class='del'>-		 (int)((char *)save)[1],</div><div class='del'>-		 (int)((char *)save)[2]));</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * base64_decode_step: decode a chunk of base64 encoded data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: max length of data to decode</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- *</div><div class='del'>- * Decodes a chunk of base64 encoded data</div><div class='del'>- **/</div><div class='del'>-size_t</div><div class='del'>-base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, c;</div><div class='del'>-	register unsigned int v;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	inend = in+len;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	/* convert 4 base64 bytes to 3 normal bytes */</div><div class='del'>-	v=*save;</div><div class='del'>-	i=*state;</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		c = camel_mime_base64_rank[*inptr++];</div><div class='del'>-		if (c != 0xff) {</div><div class='del'>-			v = (v&lt;&lt;6) | c;</div><div class='del'>-			i++;</div><div class='del'>-			if (i==4) {</div><div class='del'>-				*outptr++ = v&gt;&gt;16;</div><div class='del'>-				*outptr++ = v&gt;&gt;8;</div><div class='del'>-				*outptr++ = v;</div><div class='del'>-				i=0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*save = v;</div><div class='del'>-	*state = i;</div><div class='del'>-</div><div class='del'>-	/* quick scan back for '=' on the end somewhere */</div><div class='del'>-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */</div><div class='del'>-	i=2;</div><div class='del'>-	while (inptr&gt;in &amp;&amp; i) {</div><div class='del'>-		inptr--;</div><div class='del'>-		if (camel_mime_base64_rank[*inptr] != 0xff) {</div><div class='del'>-			if (*inptr == '=' &amp;&amp; outptr&gt;out)</div><div class='del'>-				outptr--;</div><div class='del'>-			i--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if i!= 0 then there is a truncation error! */</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-base64_encode_simple (const char *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *out;</div><div class='del'>-	int state = 0, outlen;</div><div class='del'>-	unsigned int save = 0;</div><div class='del'>-	</div><div class='del'>-	out = g_malloc (len * 4 / 3 + 5);</div><div class='del'>-	outlen = base64_encode_close ((unsigned char *)data, len, FALSE,</div><div class='del'>-				      out, &amp;state, &amp;save);</div><div class='del'>-	out[outlen] = '\0';</div><div class='del'>-	return (char *)out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t</div><div class='del'>-base64_decode_simple (char *data, size_t len)</div><div class='del'>-{</div><div class='del'>-	int state = 0;</div><div class='del'>-	unsigned int save = 0;</div><div class='del'>-</div><div class='del'>-	return base64_decode_step ((unsigned char *)data, len,</div><div class='del'>-				   (unsigned char *)data, &amp;state, &amp;save);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * uuencode_close: uuencode a chunk of data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: input stream length</div><div class='del'>- * @out: output stream</div><div class='del'>- * @uubuf: temporary buffer of 60 bytes</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been encoded</div><div class='del'>- *</div><div class='del'>- * Returns the number of bytes encoded. Call this when finished</div><div class='del'>- * encoding data with uuencode_step to flush off the last little</div><div class='del'>- * bit.</div><div class='del'>- **/</div><div class='del'>-size_t</div><div class='del'>-uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *outptr, *bufptr;</div><div class='del'>-	register guint32 saved;</div><div class='del'>-	int uulen, uufill, i;</div><div class='del'>-	</div><div class='del'>-	outptr = out;</div><div class='del'>-	</div><div class='del'>-	if (len &gt; 0)</div><div class='del'>-		outptr += uuencode_step (in, len, out, uubuf, state, save);</div><div class='del'>-	</div><div class='del'>-	uufill = 0;</div><div class='del'>-	</div><div class='del'>-	saved = *save;</div><div class='del'>-	i = *state &amp; 0xff;</div><div class='del'>-	uulen = (*state &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	</div><div class='del'>-	bufptr = uubuf + ((uulen / 3) * 4);</div><div class='del'>-	</div><div class='del'>-	if (i &gt; 0) {</div><div class='del'>-		while (i &lt; 3) {</div><div class='del'>-			saved &lt;&lt;= 8 | 0;</div><div class='del'>-			uufill++;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (i == 3) {</div><div class='del'>-			/* convert 3 normal bytes into 4 uuencoded bytes */</div><div class='del'>-			unsigned char b0, b1, b2;</div><div class='del'>-			</div><div class='del'>-			b0 = saved &gt;&gt; 16;</div><div class='del'>-			b1 = saved &gt;&gt; 8 &amp; 0xff;</div><div class='del'>-			b2 = saved &amp; 0xff;</div><div class='del'>-			</div><div class='del'>-			*bufptr++ = CAMEL_UUENCODE_CHAR ((b0 &gt;&gt; 2) &amp; 0x3f);</div><div class='del'>-			*bufptr++ = CAMEL_UUENCODE_CHAR (((b0 &lt;&lt; 4) | ((b1 &gt;&gt; 4) &amp; 0xf)) &amp; 0x3f);</div><div class='del'>-			*bufptr++ = CAMEL_UUENCODE_CHAR (((b1 &lt;&lt; 2) | ((b2 &gt;&gt; 6) &amp; 0x3)) &amp; 0x3f);</div><div class='del'>-			*bufptr++ = CAMEL_UUENCODE_CHAR (b2 &amp; 0x3f);</div><div class='del'>-			</div><div class='del'>-			i = 0;</div><div class='del'>-			saved = 0;</div><div class='del'>-			uulen += 3;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (uulen &gt; 0) {</div><div class='del'>-		int cplen = ((uulen / 3) * 4);</div><div class='del'>-		</div><div class='del'>-		*outptr++ = CAMEL_UUENCODE_CHAR ((uulen - uufill) &amp; 0xff);</div><div class='del'>-		memcpy (outptr, uubuf, cplen);</div><div class='del'>-		outptr += cplen;</div><div class='del'>-		*outptr++ = '\n';</div><div class='del'>-		uulen = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*outptr++ = CAMEL_UUENCODE_CHAR (uulen &amp; 0xff);</div><div class='del'>-	*outptr++ = '\n';</div><div class='del'>-	</div><div class='del'>-	*save = 0;</div><div class='del'>-	*state = 0;</div><div class='del'>-	</div><div class='del'>-	return outptr - out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * uuencode_step: uuencode a chunk of data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: input stream length</div><div class='del'>- * @out: output stream</div><div class='del'>- * @uubuf: temporary buffer of 60 bytes</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been encoded</div><div class='del'>- *</div><div class='del'>- * Returns the number of bytes encoded. Performs an 'encode step',</div><div class='del'>- * only encodes blocks of 45 characters to the output at a time, saves</div><div class='del'>- * left-over state in @uubuf, @state and @save (initialize to 0 on first</div><div class='del'>- * invocation).</div><div class='del'>- **/</div><div class='del'>-size_t</div><div class='del'>-uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr, *bufptr;</div><div class='del'>-	unsigned char *inend;</div><div class='del'>-	register guint32 saved;</div><div class='del'>-	int uulen, i;</div><div class='del'>-	</div><div class='del'>-	saved = *save;</div><div class='del'>-	i = *state &amp; 0xff;</div><div class='del'>-	uulen = (*state &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	</div><div class='del'>-	outptr = out;</div><div class='del'>-	</div><div class='del'>-	bufptr = uubuf + ((uulen / 3) * 4);</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		while (uulen &lt; 45 &amp;&amp; inptr &lt; inend) {</div><div class='del'>-			while (i &lt; 3 &amp;&amp; inptr &lt; inend) {</div><div class='del'>-				saved = (saved &lt;&lt; 8) | *inptr++;</div><div class='del'>-				i++;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (i == 3) {</div><div class='del'>-				/* convert 3 normal bytes into 4 uuencoded bytes */</div><div class='del'>-				unsigned char b0, b1, b2;</div><div class='del'>-				</div><div class='del'>-				b0 = saved &gt;&gt; 16;</div><div class='del'>-				b1 = saved &gt;&gt; 8 &amp; 0xff;</div><div class='del'>-				b2 = saved &amp; 0xff;</div><div class='del'>-				</div><div class='del'>-				*bufptr++ = CAMEL_UUENCODE_CHAR ((b0 &gt;&gt; 2) &amp; 0x3f);</div><div class='del'>-				*bufptr++ = CAMEL_UUENCODE_CHAR (((b0 &lt;&lt; 4) | ((b1 &gt;&gt; 4) &amp; 0xf)) &amp; 0x3f);</div><div class='del'>-				*bufptr++ = CAMEL_UUENCODE_CHAR (((b1 &lt;&lt; 2) | ((b2 &gt;&gt; 6) &amp; 0x3)) &amp; 0x3f);</div><div class='del'>-				*bufptr++ = CAMEL_UUENCODE_CHAR (b2 &amp; 0x3f);</div><div class='del'>-				</div><div class='del'>-				i = 0;</div><div class='del'>-				saved = 0;</div><div class='del'>-				uulen += 3;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (uulen &gt;= 45) {</div><div class='del'>-			*outptr++ = CAMEL_UUENCODE_CHAR (uulen &amp; 0xff);</div><div class='del'>-			memcpy (outptr, uubuf, ((uulen / 3) * 4));</div><div class='del'>-			outptr += ((uulen / 3) * 4);</div><div class='del'>-			*outptr++ = '\n';</div><div class='del'>-			uulen = 0;</div><div class='del'>-			bufptr = uubuf;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*save = saved;</div><div class='del'>-	*state = ((uulen &amp; 0xff) &lt;&lt; 8) | (i &amp; 0xff);</div><div class='del'>-	</div><div class='del'>-	return outptr - out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * uudecode_step: uudecode a chunk of data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @inlen: max length of data to decode ( normally strlen(in) ??)</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- *</div><div class='del'>- * Returns the number of bytes decoded. Performs a 'decode step' on</div><div class='del'>- * a chunk of uuencoded data. Assumes the "begin &lt;mode&gt; &lt;file name&gt;"</div><div class='del'>- * line has been stripped off.</div><div class='del'>- **/</div><div class='del'>-size_t</div><div class='del'>-uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, ch;</div><div class='del'>-	register guint32 saved;</div><div class='del'>-	gboolean last_was_eoln;</div><div class='del'>-	int uulen, i;</div><div class='del'>-	</div><div class='del'>-	if (*state &amp; CAMEL_UUDECODE_STATE_END)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	saved = *save;</div><div class='del'>-	i = *state &amp; 0xff;</div><div class='del'>-	uulen = (*state &gt;&gt; 8) &amp; 0xff;</div><div class='del'>-	if (uulen == 0)</div><div class='del'>-		last_was_eoln = TRUE;</div><div class='del'>-	else</div><div class='del'>-		last_was_eoln = FALSE;</div><div class='del'>-	</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		if (*inptr == '\n' || last_was_eoln) {</div><div class='del'>-			if (last_was_eoln &amp;&amp; *inptr != '\n') {</div><div class='del'>-				uulen = CAMEL_UUDECODE_CHAR (*inptr);</div><div class='del'>-				last_was_eoln = FALSE;</div><div class='del'>-				if (uulen == 0) {</div><div class='del'>-					*state |= CAMEL_UUDECODE_STATE_END;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				last_was_eoln = TRUE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		ch = *inptr++;</div><div class='del'>-		</div><div class='del'>-		if (uulen &gt; 0) {</div><div class='del'>-			/* save the byte */</div><div class='del'>-			saved = (saved &lt;&lt; 8) | ch;</div><div class='del'>-			i++;</div><div class='del'>-			if (i == 4) {</div><div class='del'>-				/* convert 4 uuencoded bytes to 3 normal bytes */</div><div class='del'>-				unsigned char b0, b1, b2, b3;</div><div class='del'>-				</div><div class='del'>-				b0 = saved &gt;&gt; 24;</div><div class='del'>-				b1 = saved &gt;&gt; 16 &amp; 0xff;</div><div class='del'>-				b2 = saved &gt;&gt; 8 &amp; 0xff;</div><div class='del'>-				b3 = saved &amp; 0xff;</div><div class='del'>-				</div><div class='del'>-				if (uulen &gt;= 3) {</div><div class='del'>-					*outptr++ = CAMEL_UUDECODE_CHAR (b0) &lt;&lt; 2 | CAMEL_UUDECODE_CHAR (b1) &gt;&gt; 4;</div><div class='del'>-					*outptr++ = CAMEL_UUDECODE_CHAR (b1) &lt;&lt; 4 | CAMEL_UUDECODE_CHAR (b2) &gt;&gt; 2;</div><div class='del'>-				        *outptr++ = CAMEL_UUDECODE_CHAR (b2) &lt;&lt; 6 | CAMEL_UUDECODE_CHAR (b3);</div><div class='del'>-				} else {</div><div class='del'>-					if (uulen &gt;= 1) {</div><div class='del'>-						*outptr++ = CAMEL_UUDECODE_CHAR (b0) &lt;&lt; 2 | CAMEL_UUDECODE_CHAR (b1) &gt;&gt; 4;</div><div class='del'>-					}</div><div class='del'>-					if (uulen &gt;= 2) {</div><div class='del'>-						*outptr++ = CAMEL_UUDECODE_CHAR (b1) &lt;&lt; 4 | CAMEL_UUDECODE_CHAR (b2) &gt;&gt; 2;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				i = 0;</div><div class='del'>-				saved = 0;</div><div class='del'>-				uulen -= 3;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*save = saved;</div><div class='del'>-	*state = (*state &amp; CAMEL_UUDECODE_STATE_MASK) | ((uulen &amp; 0xff) &lt;&lt; 8) | (i &amp; 0xff);</div><div class='del'>-	</div><div class='del'>-	return outptr - out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* complete qp encoding */</div><div class='del'>-size_t</div><div class='del'>-quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *outptr = out;</div><div class='del'>-	int last;</div><div class='del'>-</div><div class='del'>-	if (len&gt;0)</div><div class='del'>-		outptr += quoted_encode_step(in, len, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	last = *state;</div><div class='del'>-	if (last != -1) {</div><div class='del'>-		/* space/tab must be encoded if it's the last character on</div><div class='del'>-		   the line */</div><div class='del'>-		if (is_qpsafe(last) &amp;&amp; last!=' ' &amp;&amp; last!=9) {</div><div class='del'>-			*outptr++ = last;</div><div class='del'>-		} else {</div><div class='del'>-			*outptr++ = '=';</div><div class='del'>-			*outptr++ = tohex[(last&gt;&gt;4) &amp; 0xf];</div><div class='del'>-			*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*save = 0;</div><div class='del'>-	*state = -1;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform qp encoding, initialise state to -1 and save to 0 on first invocation */</div><div class='del'>-size_t</div><div class='del'>-quoted_encode_step (unsigned char *in, size_t len, unsigned char *out, int *statep, int *save)</div><div class='del'>-{</div><div class='del'>-	register guchar *inptr, *outptr, *inend;</div><div class='del'>-	unsigned char c;</div><div class='del'>-	register int sofar = *save;  /* keeps track of how many chars on a line */</div><div class='del'>-	register int last = *statep; /* keeps track if last char to end was a space cr etc */</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		c = *inptr++;</div><div class='del'>-		if (c == '\r') {</div><div class='del'>-			if (last != -1) {</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-				sofar += 3;</div><div class='del'>-			}</div><div class='del'>-			last = c;</div><div class='del'>-		} else if (c == '\n') {</div><div class='del'>-			if (last != -1 &amp;&amp; last != '\r') {</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-			}</div><div class='del'>-			*outptr++ = '\n';</div><div class='del'>-			sofar = 0;</div><div class='del'>-			last = -1;</div><div class='del'>-		} else {</div><div class='del'>-			if (last != -1) {</div><div class='del'>-				if (is_qpsafe(last)) {</div><div class='del'>-					*outptr++ = last;</div><div class='del'>-					sofar++;</div><div class='del'>-				} else {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-					*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-					sofar += 3;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (is_qpsafe(c)) {</div><div class='del'>-				if (sofar &gt; 74) {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = '\n';</div><div class='del'>-					sofar = 0;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* delay output of space char */</div><div class='del'>-				if (c==' ' || c=='\t') {</div><div class='del'>-					last = c;</div><div class='del'>-				} else {</div><div class='del'>-					*outptr++ = c;</div><div class='del'>-					sofar++;</div><div class='del'>-					last = -1;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (sofar &gt; 72) {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = '\n';</div><div class='del'>-					sofar = 3;</div><div class='del'>-				} else</div><div class='del'>-					sofar += 3;</div><div class='del'>-				</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(c &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[c &amp; 0xf];</div><div class='del'>-				last = -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*save = sofar;</div><div class='del'>-	*statep = last;</div><div class='del'>-	</div><div class='del'>-	return (outptr - out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  FIXME: this does not strip trailing spaces from lines (as it should, rfc 2045, section 6.7)</div><div class='del'>-  Should it also canonicalise the end of line to CR LF??</div><div class='del'>-</div><div class='del'>-  Note: Trailing rubbish (at the end of input), like = or =x or =\r will be lost.</div><div class='del'>-*/ </div><div class='del'>-</div><div class='del'>-size_t</div><div class='del'>-quoted_decode_step(unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, c;</div><div class='del'>-	int state, save;</div><div class='del'>-</div><div class='del'>-	inend = in+len;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	d(printf("quoted-printable, decoding text '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	state = *savestate;</div><div class='del'>-	save = *saveme;</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		switch (state) {</div><div class='del'>-		case 0:</div><div class='del'>-			while (inptr&lt;inend) {</div><div class='del'>-				c = *inptr++;</div><div class='del'>-				if (c=='=') { </div><div class='del'>-					state = 1;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-#ifdef CANONICALISE_EOL</div><div class='del'>-				/*else if (c=='\r') {</div><div class='del'>-					state = 3;</div><div class='del'>-				} else if (c=='\n') {</div><div class='del'>-					*outptr++ = '\r';</div><div class='del'>-					*outptr++ = c;</div><div class='del'>-					} */</div><div class='del'>-#endif</div><div class='del'>-				else {</div><div class='del'>-					*outptr++ = c;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			c = *inptr++;</div><div class='del'>-			if (c=='\n') {</div><div class='del'>-				/* soft break ... unix end of line */</div><div class='del'>-				state = 0;</div><div class='del'>-			} else {</div><div class='del'>-				save = c;</div><div class='del'>-				state = 2;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			c = *inptr++;</div><div class='del'>-			if (isxdigit(c) &amp;&amp; isxdigit(save)) {</div><div class='del'>-				c = toupper(c);</div><div class='del'>-				save = toupper(save);</div><div class='del'>-				*outptr++ = (((save&gt;='A'?save-'A'+10:save-'0')&amp;0x0f) &lt;&lt; 4)</div><div class='del'>-					| ((c&gt;='A'?c-'A'+10:c-'0')&amp;0x0f);</div><div class='del'>-			} else if (c=='\n' &amp;&amp; save == '\r') {</div><div class='del'>-				/* soft break ... canonical end of line */</div><div class='del'>-			} else {</div><div class='del'>-				/* just output the data */</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = save;</div><div class='del'>-				*outptr++ = c;</div><div class='del'>-			}</div><div class='del'>-			state = 0;</div><div class='del'>-			break;</div><div class='del'>-#ifdef CANONICALISE_EOL</div><div class='del'>-		case 3:</div><div class='del'>-			/* convert \r -&gt; to \r\n, leaves \r\n alone */</div><div class='del'>-			c = *inptr++;</div><div class='del'>-			if (c=='\n') {</div><div class='del'>-				*outptr++ = '\r';</div><div class='del'>-				*outptr++ = c;</div><div class='del'>-			} else {</div><div class='del'>-				*outptr++ = '\r';</div><div class='del'>-				*outptr++ = '\n';</div><div class='del'>-				*outptr++ = c;</div><div class='del'>-			}</div><div class='del'>-			state = 0;</div><div class='del'>-			break;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*savestate = state;</div><div class='del'>-	*saveme = save;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  this is for the "Q" encoding of international words,</div><div class='del'>-  which is slightly different than plain quoted-printable (mainly by allowing 0x20 &lt;&gt; _)</div><div class='del'>-*/</div><div class='del'>-static size_t</div><div class='del'>-quoted_decode(const unsigned char *in, size_t len, unsigned char *out)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr;</div><div class='del'>-	register unsigned char *outptr;</div><div class='del'>-	unsigned const char *inend;</div><div class='del'>-	unsigned char c, c1;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	inend = in+len;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding text '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		c = *inptr++;</div><div class='del'>-		if (c=='=') {</div><div class='del'>-			/* silently ignore truncated data? */</div><div class='del'>-			if (inend-in&gt;=2) {</div><div class='del'>-				c = toupper(*inptr++);</div><div class='del'>-				c1 = toupper(*inptr++);</div><div class='del'>-				*outptr++ = (((c&gt;='A'?c-'A'+10:c-'0')&amp;0x0f) &lt;&lt; 4)</div><div class='del'>-					| ((c1&gt;='A'?c1-'A'+10:c1-'0')&amp;0x0f);</div><div class='del'>-			} else {</div><div class='del'>-				ret = -1;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else if (c=='_') {</div><div class='del'>-			*outptr++ = 0x20;</div><div class='del'>-		} else if (c==' ' || c==0x09) {</div><div class='del'>-			/* FIXME: this is an error! ignore for now ... */</div><div class='del'>-			ret = -1;</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			*outptr++ = c;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (ret==0) {</div><div class='del'>-		return outptr-out;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* rfc2047 version of quoted-printable */</div><div class='del'>-/* safemask is the mask to apply to the camel_mime_special_table to determine what</div><div class='del'>-   characters can safely be included without encoding */</div><div class='del'>-static size_t</div><div class='del'>-quoted_encode (const unsigned char *in, size_t len, unsigned char *out, unsigned short safemask)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr, *inend;</div><div class='del'>-	unsigned char *outptr;</div><div class='del'>-	unsigned char c;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		c = *inptr++;</div><div class='del'>-		if (c==' ') {</div><div class='del'>-			*outptr++ = '_';</div><div class='del'>-		} else if (camel_mime_special_table[c] &amp; safemask) {</div><div class='del'>-			*outptr++ = c;</div><div class='del'>-		} else {</div><div class='del'>-			*outptr++ = '=';</div><div class='del'>-			*outptr++ = tohex[(c &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-			*outptr++ = tohex[c &amp; 0xf];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("encoding '%.*s' = '%.*s'\n", len, in, outptr-out, out));</div><div class='del'>-</div><div class='del'>-	return (outptr - out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_decode_lwsp(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	d2(printf("is ws: '%s'\n", *in));</div><div class='del'>-</div><div class='del'>-	while (is_lwsp(*inptr) || (*inptr =='(' &amp;&amp; *inptr != '\0')) {</div><div class='del'>-		while (is_lwsp(*inptr) &amp;&amp; inptr != '\0') {</div><div class='del'>-			d2(printf("(%c)", *inptr));</div><div class='del'>-			inptr++;</div><div class='del'>-		}</div><div class='del'>-		d2(printf("\n"));</div><div class='del'>-</div><div class='del'>-		/* check for comments */</div><div class='del'>-		if (*inptr == '(') {</div><div class='del'>-			int depth = 1;</div><div class='del'>-			inptr++;</div><div class='del'>-			while (depth &amp;&amp; (c=*inptr) &amp;&amp; *inptr != '\0') {</div><div class='del'>-				if (c=='\\' &amp;&amp; inptr[1]) {</div><div class='del'>-					inptr++;</div><div class='del'>-				} else if (c=='(') {</div><div class='del'>-					depth++;</div><div class='del'>-				} else if (c==')') {</div><div class='del'>-					depth--;</div><div class='del'>-				}</div><div class='del'>-				inptr++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*in = inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decode rfc 2047 encoded string segment */</div><div class='del'>-static char *</div><div class='del'>-rfc2047_decode_word(const char *in, size_t len)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in+2;</div><div class='del'>-	const char *inend = in+len-2;</div><div class='del'>-	const char *inbuf;</div><div class='del'>-	const char *charset;</div><div class='del'>-	char *encname, *p;</div><div class='del'>-	int tmplen;</div><div class='del'>-	size_t ret;</div><div class='del'>-	char *decword = NULL;</div><div class='del'>-	char *decoded = NULL;</div><div class='del'>-	char *outbase = NULL;</div><div class='del'>-	char *outbuf;</div><div class='del'>-	size_t inlen, outlen;</div><div class='del'>-	gboolean retried = FALSE;</div><div class='del'>-	iconv_t ic;</div><div class='del'>-	</div><div class='del'>-	d(printf("rfc2047: decoding '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	/* quick check to see if this could possibly be a real encoded word */</div><div class='del'>-	if (len &lt; 8 || !(in[0] == '=' &amp;&amp; in[1] == '?' &amp;&amp; in[len-1] == '=' &amp;&amp; in[len-2] == '?')) {</div><div class='del'>-		d(printf("invalid\n"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* skip past the charset to the encoding type */</div><div class='del'>-	inptr = memchr (inptr, '?', inend-inptr);</div><div class='del'>-	if (inptr != NULL &amp;&amp; inptr &lt; inend + 2 &amp;&amp; inptr[2] == '?') {</div><div class='del'>-		d(printf("found ?, encoding is '%c'\n", inptr[0]));</div><div class='del'>-		inptr++;</div><div class='del'>-		tmplen = inend-inptr-2;</div><div class='del'>-		decword = alloca(tmplen); /* this will always be more-than-enough room */</div><div class='del'>-		switch(toupper(inptr[0])) {</div><div class='del'>-		case 'Q':</div><div class='del'>-			inlen = quoted_decode(inptr+2, tmplen, decword);</div><div class='del'>-			break;</div><div class='del'>-		case 'B': {</div><div class='del'>-			int state = 0;</div><div class='del'>-			unsigned int save = 0;</div><div class='del'>-			</div><div class='del'>-			inlen = base64_decode_step((char *)inptr+2, tmplen, decword, &amp;state, &amp;save);</div><div class='del'>-			/* if state != 0 then error? */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		default:</div><div class='del'>-			/* uhhh, unknown encoding type - probably an invalid encoded word string */</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		d(printf("The encoded length = %d\n", inlen));</div><div class='del'>-		if (inlen &gt; 0) {</div><div class='del'>-			/* yuck, all this snot is to setup iconv! */</div><div class='del'>-			tmplen = inptr - in - 3;</div><div class='del'>-			encname = alloca (tmplen + 1);</div><div class='del'>-			memcpy (encname, in + 2, tmplen);</div><div class='del'>-			encname[tmplen] = '\0';</div><div class='del'>-			</div><div class='del'>-			/* rfc2231 updates rfc2047 encoded words...</div><div class='del'>-			 * The ABNF given in RFC 2047 for encoded-words is:</div><div class='del'>-			 *   encoded-word := "=?" charset "?" encoding "?" encoded-text "?="</div><div class='del'>-			 * This specification changes this ABNF to:</div><div class='del'>-			 *   encoded-word := "=?" charset ["*" language] "?" encoding "?" encoded-text "?="</div><div class='del'>-			 */</div><div class='del'>-			</div><div class='del'>-			/* trim off the 'language' part if it's there... */</div><div class='del'>-			p = strchr (encname, '*');</div><div class='del'>-			if (p)</div><div class='del'>-				*p = '\0';</div><div class='del'>-			</div><div class='del'>-			charset = e_iconv_charset_name (encname);</div><div class='del'>-			</div><div class='del'>-			inbuf = decword;</div><div class='del'>-			</div><div class='del'>-			outlen = inlen * 6 + 16;</div><div class='del'>-			outbase = alloca (outlen);</div><div class='del'>-			outbuf = outbase;</div><div class='del'>-			</div><div class='del'>-		retry:</div><div class='del'>-			ic = e_iconv_open ("UTF-8", charset);</div><div class='del'>-			if (ic != (iconv_t) -1) {</div><div class='del'>-				ret = e_iconv (ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-				if (ret != (size_t) -1) {</div><div class='del'>-					e_iconv (ic, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-					*outbuf = 0;</div><div class='del'>-					decoded = g_strdup (outbase);</div><div class='del'>-				}</div><div class='del'>-				e_iconv_close (ic);</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning ("Cannot decode charset, header display may be corrupt: %s: %s",</div><div class='del'>-					     charset, g_strerror (errno)));</div><div class='del'>-				</div><div class='del'>-				if (!retried) {</div><div class='del'>-					charset = e_iconv_locale_charset ();</div><div class='del'>-					if (!charset)</div><div class='del'>-						charset = "iso-8859-1";</div><div class='del'>-					</div><div class='del'>-					retried = TRUE;</div><div class='del'>-					goto retry;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* we return the encoded word here because we've got to return valid utf8 */</div><div class='del'>-				decoded = g_strndup (in, inlen);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf("decoded '%s'\n", decoded));</div><div class='del'>-	</div><div class='del'>-	return decoded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* grrr, glib should have this ! */</div><div class='del'>-static GString *</div><div class='del'>-g_string_append_len(GString *st, const char *s, size_t l)</div><div class='del'>-{</div><div class='del'>-	char *tmp;</div><div class='del'>-</div><div class='del'>-	tmp = alloca(l+1);</div><div class='del'>-	tmp[l]=0;</div><div class='del'>-	memcpy(tmp, s, l);</div><div class='del'>-	return g_string_append(st, tmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ok, a lot of mailers are BROKEN, and send iso-latin1 encoded</div><div class='del'>-   headers, when they should just be sticking to US-ASCII</div><div class='del'>-   according to the rfc's.  Anyway, since the conversion to utf-8</div><div class='del'>-   is trivial, just do it here without iconv */</div><div class='del'>-static GString *</div><div class='del'>-append_latin1 (GString *out, const char *in, size_t len)</div><div class='del'>-{</div><div class='del'>-	unsigned int c;</div><div class='del'>-	</div><div class='del'>-	while (len) {</div><div class='del'>-		c = (unsigned int)*in++;</div><div class='del'>-		len--;</div><div class='del'>-		if (c &amp; 0x80) {</div><div class='del'>-			out = g_string_append_c (out, 0xc0 | ((c &gt;&gt; 6) &amp; 0x3));  /* 110000xx */</div><div class='del'>-			out = g_string_append_c (out, 0x80 | (c &amp; 0x3f));        /* 10xxxxxx */</div><div class='del'>-		} else {</div><div class='del'>-			out = g_string_append_c (out, c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-append_8bit (GString *out, const char *inbuf, size_t inlen, const char *charset)</div><div class='del'>-{</div><div class='del'>-	char *outbase, *outbuf;</div><div class='del'>-	size_t outlen;</div><div class='del'>-	iconv_t ic;</div><div class='del'>-	</div><div class='del'>-	ic = e_iconv_open ("UTF-8", charset);</div><div class='del'>-	if (ic == (iconv_t) -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	outlen = inlen * 6 + 16;</div><div class='del'>-	outbuf = outbase = g_malloc(outlen);</div><div class='del'>-	</div><div class='del'>-	if (e_iconv(ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen) == (size_t) -1) {</div><div class='del'>-		w(g_warning("Conversion to '%s' failed: %s", charset, strerror(errno)));</div><div class='del'>-		g_free(outbase);</div><div class='del'>-		e_iconv_close(ic);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*outbuf = 0;</div><div class='del'>-	g_string_append(out, outbase);</div><div class='del'>-	g_free(outbase);</div><div class='del'>-	e_iconv_close(ic);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decodes a simple text, rfc822 + rfc2047 */</div><div class='del'>-static char *</div><div class='del'>-header_decode_text (const char *in, size_t inlen, const char *default_charset)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	const char *inptr, *inend, *start, *chunk, *locale_charset;</div><div class='del'>-	char *dword = NULL;</div><div class='del'>-</div><div class='del'>-	locale_charset = e_iconv_locale_charset();</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = inptr + inlen;</div><div class='del'>-	chunk = NULL;</div><div class='del'>-</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		start = inptr;</div><div class='del'>-		while (inptr &lt; inend &amp;&amp; is_lwsp(*inptr))</div><div class='del'>-			inptr++;</div><div class='del'>-</div><div class='del'>-		if (inptr == inend) {</div><div class='del'>-			g_string_append_len(out, start, inptr-start);</div><div class='del'>-			break;</div><div class='del'>-		} else if (dword == NULL) {</div><div class='del'>-			g_string_append_len(out, start, inptr-start);</div><div class='del'>-		} else {</div><div class='del'>-			chunk = start;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		start = inptr;</div><div class='del'>-		while (inptr &lt; inend &amp;&amp; !is_lwsp(*inptr))</div><div class='del'>-			inptr++;</div><div class='del'>-</div><div class='del'>-		dword = rfc2047_decode_word(start, inptr-start);</div><div class='del'>-		if (dword) {</div><div class='del'>-			g_string_append(out, dword);</div><div class='del'>-			g_free(dword);</div><div class='del'>-		} else {</div><div class='del'>-			if (!chunk)</div><div class='del'>-				chunk = start;</div><div class='del'>-			</div><div class='del'>-			if ((default_charset == NULL || !append_8bit (out, chunk, inptr-chunk, default_charset))</div><div class='del'>-			    &amp;&amp; (locale_charset == NULL || !append_8bit(out, chunk, inptr-chunk, locale_charset)))</div><div class='del'>-				append_latin1(out, chunk, inptr-chunk);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		chunk = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dword = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return dword;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_decode_string (const char *in, const char *default_charset)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	return header_decode_text (in, strlen (in), default_charset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* how long a sequence of pre-encoded words should be less than, to attempt to </div><div class='del'>-   fit into a properly folded word.  Only a guide. */</div><div class='del'>-#define CAMEL_FOLD_PREENCODED (24)</div><div class='del'>-</div><div class='del'>-/* FIXME: needs a way to cache iconv opens for different charsets? */</div><div class='del'>-static void</div><div class='del'>-rfc2047_encode_word(GString *outstring, const char *in, size_t len, const char *type, unsigned short safemask)</div><div class='del'>-{</div><div class='del'>-	iconv_t ic = (iconv_t) -1;</div><div class='del'>-	char *buffer, *out, *ascii;</div><div class='del'>-	size_t inlen, outlen, enclen, bufflen;</div><div class='del'>-	const char *inptr, *p;</div><div class='del'>-	int first = 1;</div><div class='del'>-</div><div class='del'>-	d(printf("Converting [%d] '%.*s' to %s\n", len, len, in, type));</div><div class='del'>-</div><div class='del'>-	/* convert utf8-&gt;encoding */</div><div class='del'>-	bufflen = len * 6 + 16;</div><div class='del'>-	buffer = alloca (bufflen);</div><div class='del'>-	inlen = len;</div><div class='del'>-	inptr = in;</div><div class='del'>-	</div><div class='del'>-	ascii = alloca (bufflen);</div><div class='del'>-	</div><div class='del'>-	if (strcasecmp (type, "UTF-8") != 0)</div><div class='del'>-		ic = e_iconv_open (type, "UTF-8");</div><div class='del'>-	</div><div class='del'>-	while (inlen) {</div><div class='del'>-		size_t convlen, proclen;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		/* break up words into smaller bits, what we really want is encoded + overhead &lt; 75,</div><div class='del'>-		   but we'll just guess what that means in terms of input chars, and assume its good enough */</div><div class='del'>-</div><div class='del'>-		out = buffer;</div><div class='del'>-		outlen = bufflen;</div><div class='del'>-</div><div class='del'>-		if (ic == (iconv_t) -1) {</div><div class='del'>-			/* native encoding case, the easy one (?) */</div><div class='del'>-			/* we work out how much we can convert, and still be in length */</div><div class='del'>-			/* proclen will be the result of input characters that we can convert, to the nearest</div><div class='del'>-			   (approximated) valid utf8 char */</div><div class='del'>-			convlen = 0;</div><div class='del'>-			proclen = 0;</div><div class='del'>-			p = inptr;</div><div class='del'>-			i = 0;</div><div class='del'>-			while (p &lt; (in+len) &amp;&amp; convlen &lt; (75 - strlen("=?utf-8?q\?\?="))) {</div><div class='del'>-				unsigned char c = *p++;</div><div class='del'>-</div><div class='del'>-				if (c &gt;= 0xc0)</div><div class='del'>-					proclen = i;</div><div class='del'>-				i++;</div><div class='del'>-				if (c &lt; 0x80)</div><div class='del'>-					proclen = i;</div><div class='del'>-				if (camel_mime_special_table[c] &amp; safemask)</div><div class='del'>-					convlen += 1;</div><div class='del'>-				else</div><div class='del'>-					convlen += 3;</div><div class='del'>-			}</div><div class='del'>-			/* well, we probably have broken utf8, just copy it anyway what the heck */</div><div class='del'>-			if (proclen == 0) {</div><div class='del'>-				w(g_warning("Appear to have truncated utf8 sequence"));</div><div class='del'>-				proclen = inlen;</div><div class='del'>-			}</div><div class='del'>-			memcpy(out, inptr, proclen);</div><div class='del'>-			inptr += proclen;</div><div class='del'>-			inlen -= proclen;</div><div class='del'>-			out += proclen;</div><div class='del'>-		} else {</div><div class='del'>-			/* well we could do similar, but we can't (without undue effort), we'll just break it up into</div><div class='del'>-			   hopefully-small-enough chunks, and leave it at that */</div><div class='del'>-			convlen = MIN(inlen, CAMEL_FOLD_PREENCODED);</div><div class='del'>-			p = inptr;</div><div class='del'>-			if (e_iconv (ic, &amp;inptr, &amp;convlen, &amp;out, &amp;outlen) == (size_t) -1) {</div><div class='del'>-				w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno)));</div><div class='del'>-				/* blah, we include it anyway, better than infinite loop ... */</div><div class='del'>-				inptr = p + convlen;</div><div class='del'>-			} else {</div><div class='del'>-				/* make sure we flush out any shift state */</div><div class='del'>-				e_iconv(ic, NULL, 0, &amp;out, &amp;outlen);</div><div class='del'>-			}</div><div class='del'>-			inlen -= (inptr - p);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		enclen = out-buffer;</div><div class='del'>-		</div><div class='del'>-		if (enclen) {</div><div class='del'>-			/* create token */</div><div class='del'>-			out = ascii;</div><div class='del'>-			if (first)</div><div class='del'>-				first = 0;</div><div class='del'>-			else</div><div class='del'>-				*out++ = ' ';</div><div class='del'>-			out += sprintf (out, "=?%s?Q?", type);</div><div class='del'>-			out += quoted_encode (buffer, enclen, out, safemask);</div><div class='del'>-			sprintf (out, "?=");</div><div class='del'>-			</div><div class='del'>-			d(printf("converted part = %s\n", ascii));</div><div class='del'>-			</div><div class='del'>-			g_string_append (outstring, ascii);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ic != (iconv_t) -1)</div><div class='del'>-		e_iconv_close(ic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* TODO: Should this worry about quotes?? */</div><div class='del'>-char *</div><div class='del'>-header_encode_string (const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *inptr = in, *start, *word;</div><div class='del'>-	gboolean last_was_encoded = FALSE;</div><div class='del'>-	gboolean last_was_space = FALSE;</div><div class='del'>-	int encoding;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *outstr;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (g_utf8_validate (in, -1, NULL), NULL);</div><div class='del'>-	</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* do a quick us-ascii check (the common case?) */</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		if (*inptr &gt; 127)</div><div class='del'>-			break;</div><div class='del'>-		inptr++;</div><div class='del'>-	}</div><div class='del'>-	if (*inptr == '\0')</div><div class='del'>-		return g_strdup (in);</div><div class='del'>-	</div><div class='del'>-	/* This gets each word out of the input, and checks to see what charset</div><div class='del'>-	   can be used to encode it. */</div><div class='del'>-	/* TODO: Work out when to merge subsequent words, or across word-parts */</div><div class='del'>-	out = g_string_new ("");</div><div class='del'>-	inptr = in;</div><div class='del'>-	encoding = 0;</div><div class='del'>-	word = NULL;</div><div class='del'>-	start = inptr;</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		gunichar c;</div><div class='del'>-		const char *newinptr;</div><div class='del'>-		</div><div class='del'>-		newinptr = g_utf8_next_char (inptr);</div><div class='del'>-		c = g_utf8_get_char (inptr);</div><div class='del'>-		if (newinptr == NULL || !g_unichar_validate (c)) {</div><div class='del'>-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",</div><div class='del'>-				     (inptr-in), inptr[0], in));</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (g_unichar_isspace (c) &amp;&amp; !last_was_space) {</div><div class='del'>-			/* we've reached the end of a 'word' */</div><div class='del'>-			if (word &amp;&amp; !(last_was_encoded &amp;&amp; encoding)) {</div><div class='del'>-				g_string_append_len (out, start, word - start);</div><div class='del'>-				start = word;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			switch (encoding) {</div><div class='del'>-			case 0:</div><div class='del'>-				out = g_string_append_len (out, word, inptr - start);</div><div class='del'>-				last_was_encoded = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				if (last_was_encoded)</div><div class='del'>-					g_string_append_c (out, ' ');</div><div class='del'>-				</div><div class='del'>-				rfc2047_encode_word (out, start, inptr - start, "ISO-8859-1", IS_ESAFE);</div><div class='del'>-				last_was_encoded = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				if (last_was_encoded)</div><div class='del'>-					g_string_append_c (out, ' ');</div><div class='del'>-				</div><div class='del'>-				rfc2047_encode_word (out, start, inptr - start,</div><div class='del'>-						     camel_charset_best (start, inptr - start), IS_ESAFE);</div><div class='del'>-				last_was_encoded = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			last_was_space = TRUE;</div><div class='del'>-			start = inptr;</div><div class='del'>-			word = NULL;</div><div class='del'>-			encoding = 0;</div><div class='del'>-		} else if (c &gt; 127 &amp;&amp; c &lt; 256) {</div><div class='del'>-			encoding = MAX (encoding, 1);</div><div class='del'>-			last_was_space = FALSE;</div><div class='del'>-		} else if (c &gt;= 256) {</div><div class='del'>-			encoding = MAX (encoding, 2);</div><div class='del'>-			last_was_space = FALSE;</div><div class='del'>-		} else if (!g_unichar_isspace (c)) {</div><div class='del'>-			last_was_space = FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (!g_unichar_isspace (c) &amp;&amp; !word)</div><div class='del'>-			word = inptr;</div><div class='del'>-		</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (inptr - start) {</div><div class='del'>-		if (word &amp;&amp; !(last_was_encoded &amp;&amp; encoding)) {</div><div class='del'>-			g_string_append_len (out, start, word - start);</div><div class='del'>-			start = word;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		switch (encoding) {</div><div class='del'>-		case 0:</div><div class='del'>-			out = g_string_append_len (out, start, inptr - start);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			if (last_was_encoded)</div><div class='del'>-				g_string_append_c (out, ' ');</div><div class='del'>-			</div><div class='del'>-			rfc2047_encode_word (out, start, inptr - start, "ISO-8859-1", IS_ESAFE);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			if (last_was_encoded)</div><div class='del'>-				g_string_append_c (out, ' ');</div><div class='del'>-			</div><div class='del'>-			rfc2047_encode_word (out, start, inptr - start,</div><div class='del'>-					     camel_charset_best (start, inptr - start - 1), IS_ESAFE);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	outstr = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return outstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* apply quoted-string rules to a string */</div><div class='del'>-static void</div><div class='del'>-quote_word(GString *out, gboolean do_quotes, const char *start, size_t len)</div><div class='del'>-{</div><div class='del'>-	int i, c;</div><div class='del'>-</div><div class='del'>-	/* TODO: What about folding on long lines? */</div><div class='del'>-	if (do_quotes)</div><div class='del'>-		g_string_append_c(out, '"');</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		c = *start++;</div><div class='del'>-		if (c == '\"' || c=='\\' || c=='\r')</div><div class='del'>-			g_string_append_c(out, '\\');</div><div class='del'>-		g_string_append_c(out, c);</div><div class='del'>-	}</div><div class='del'>-	if (do_quotes)</div><div class='del'>-		g_string_append_c(out, '"');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* incrementing possibility for the word type */</div><div class='del'>-enum _phrase_word_t {</div><div class='del'>-	WORD_ATOM,</div><div class='del'>-	WORD_QSTRING,</div><div class='del'>-	WORD_2047</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _phrase_word {</div><div class='del'>-	const unsigned char *start, *end;</div><div class='del'>-	enum _phrase_word_t type;</div><div class='del'>-	int encoding;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-word_types_compatable (enum _phrase_word_t type1, enum _phrase_word_t type2)</div><div class='del'>-{</div><div class='del'>-	switch (type1) {</div><div class='del'>-	case WORD_ATOM:</div><div class='del'>-		return type2 == WORD_QSTRING;</div><div class='del'>-	case WORD_QSTRING:</div><div class='del'>-		return type2 != WORD_2047;</div><div class='del'>-	case WORD_2047:</div><div class='del'>-		return type2 == WORD_2047;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* split the input into words with info about each word</div><div class='del'>- * merge common word types clean up */</div><div class='del'>-static GList *</div><div class='del'>-header_encode_phrase_get_words (const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *inptr = in, *start, *last;</div><div class='del'>-	struct _phrase_word *word;</div><div class='del'>-	enum _phrase_word_t type;</div><div class='del'>-	int encoding, count = 0;</div><div class='del'>-	GList *words = NULL;</div><div class='del'>-	</div><div class='del'>-	/* break the input into words */</div><div class='del'>-	type = WORD_ATOM;</div><div class='del'>-	last = inptr;</div><div class='del'>-	start = inptr;</div><div class='del'>-	encoding = 0;</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		gunichar c;</div><div class='del'>-		const char *newinptr;</div><div class='del'>-		</div><div class='del'>-		newinptr = g_utf8_next_char (inptr);</div><div class='del'>-		c = g_utf8_get_char (inptr);</div><div class='del'>-		</div><div class='del'>-		if (!g_unichar_validate (c)) {</div><div class='del'>-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",</div><div class='del'>-				     (inptr - in), inptr[0], in));</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-		if (g_unichar_isspace (c)) {</div><div class='del'>-			if (count &gt; 0) {</div><div class='del'>-				word = g_new0 (struct _phrase_word, 1);</div><div class='del'>-				word-&gt;start = start;</div><div class='del'>-				word-&gt;end = last;</div><div class='del'>-				word-&gt;type = type;</div><div class='del'>-				word-&gt;encoding = encoding;</div><div class='del'>-				words = g_list_append (words, word);</div><div class='del'>-				count = 0;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			start = inptr;</div><div class='del'>-			type = WORD_ATOM;</div><div class='del'>-			encoding = 0;</div><div class='del'>-		} else {</div><div class='del'>-			count++;</div><div class='del'>-			if (c &lt; 128) {</div><div class='del'>-				if (!is_atom (c))</div><div class='del'>-					type = MAX (type, WORD_QSTRING);</div><div class='del'>-			} else if (c &gt; 127 &amp;&amp; c &lt; 256) {</div><div class='del'>-				type = WORD_2047;</div><div class='del'>-				encoding = MAX (encoding, 1);</div><div class='del'>-			} else if (c &gt;= 256) {</div><div class='del'>-				type = WORD_2047;</div><div class='del'>-				encoding = MAX (encoding, 2);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		last = inptr;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (count &gt; 0) {</div><div class='del'>-		word = g_new0 (struct _phrase_word, 1);</div><div class='del'>-		word-&gt;start = start;</div><div class='del'>-		word-&gt;end = last;</div><div class='del'>-		word-&gt;type = type;</div><div class='del'>-		word-&gt;encoding = encoding;</div><div class='del'>-		words = g_list_append (words, word);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return words;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-header_encode_phrase_merge_words (GList **wordsp)</div><div class='del'>-{</div><div class='del'>-	GList *wordl, *nextl, *words = *wordsp;</div><div class='del'>-	struct _phrase_word *word, *next;</div><div class='del'>-	gboolean merged = FALSE;</div><div class='del'>-	</div><div class='del'>-	/* scan the list, checking for words of similar types that can be merged */</div><div class='del'>-	wordl = words;</div><div class='del'>-	while (wordl) {</div><div class='del'>-		word = wordl-&gt;data;</div><div class='del'>-		nextl = g_list_next (wordl);</div><div class='del'>-		</div><div class='del'>-		while (nextl) {</div><div class='del'>-			next = nextl-&gt;data;</div><div class='del'>-			/* merge nodes of the same type AND we are not creating too long a string */</div><div class='del'>-			if (word_types_compatable (word-&gt;type, next-&gt;type)) {</div><div class='del'>-				if (next-&gt;end - word-&gt;start &lt; CAMEL_FOLD_PREENCODED) {</div><div class='del'>-					/* the resulting word type is the MAX of the 2 types */</div><div class='del'>-					word-&gt;type = MAX(word-&gt;type, next-&gt;type);</div><div class='del'>-					</div><div class='del'>-					word-&gt;end = next-&gt;end;</div><div class='del'>-					words = g_list_remove_link (words, nextl);</div><div class='del'>-					g_free (next);</div><div class='del'>-					nextl = g_list_next (wordl);</div><div class='del'>-					</div><div class='del'>-					merged = TRUE;</div><div class='del'>-				} else {</div><div class='del'>-					/* if it is going to be too long, make sure we include the</div><div class='del'>-					   separating whitespace */</div><div class='del'>-					word-&gt;end = next-&gt;start;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		wordl = g_list_next (wordl);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*wordsp = words;</div><div class='del'>-	</div><div class='del'>-	return merged;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* encodes a phrase sequence (different quoting/encoding rules to strings) */</div><div class='del'>-char *</div><div class='del'>-header_encode_phrase (const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	struct _phrase_word *word = NULL, *last_word = NULL;</div><div class='del'>-	GList *words, *wordl;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *outstr;</div><div class='del'>-	</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	words = header_encode_phrase_get_words (in);</div><div class='del'>-	if (!words)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	while (header_encode_phrase_merge_words (&amp;words));</div><div class='del'>-	</div><div class='del'>-	out = g_string_new ("");</div><div class='del'>-	</div><div class='del'>-	/* output words now with spaces between them */</div><div class='del'>-	wordl = words;</div><div class='del'>-	while (wordl) {</div><div class='del'>-		const char *start;</div><div class='del'>-		size_t len;</div><div class='del'>-		</div><div class='del'>-		word = wordl-&gt;data;</div><div class='del'>-		</div><div class='del'>-		/* append correct number of spaces between words */</div><div class='del'>-		if (last_word &amp;&amp; !(last_word-&gt;type == WORD_2047 &amp;&amp; word-&gt;type == WORD_2047)) {</div><div class='del'>-			/* one or both of the words are not encoded so we write the spaces out untouched */</div><div class='del'>-			len = word-&gt;start - last_word-&gt;end;</div><div class='del'>-			out = g_string_append_len (out, last_word-&gt;end, len);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		switch (word-&gt;type) {</div><div class='del'>-		case WORD_ATOM:</div><div class='del'>-			out = g_string_append_len (out, word-&gt;start, word-&gt;end - word-&gt;start);</div><div class='del'>-			break;</div><div class='del'>-		case WORD_QSTRING:</div><div class='del'>-			quote_word (out, TRUE, word-&gt;start, word-&gt;end - word-&gt;start);</div><div class='del'>-			break;</div><div class='del'>-		case WORD_2047:</div><div class='del'>-			if (last_word &amp;&amp; last_word-&gt;type == WORD_2047) {</div><div class='del'>-				/* include the whitespace chars between these 2 words in the</div><div class='del'>-                                   resulting rfc2047 encoded word. */</div><div class='del'>-				len = word-&gt;end - last_word-&gt;end;</div><div class='del'>-				start = last_word-&gt;end;</div><div class='del'>-				</div><div class='del'>-				/* encoded words need to be separated by linear whitespace */</div><div class='del'>-				g_string_append_c (out, ' ');</div><div class='del'>-			} else {</div><div class='del'>-				len = word-&gt;end - word-&gt;start;</div><div class='del'>-				start = word-&gt;start;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (word-&gt;encoding == 1)</div><div class='del'>-				rfc2047_encode_word (out, start, len, "ISO-8859-1", IS_PSAFE);</div><div class='del'>-			else</div><div class='del'>-				rfc2047_encode_word (out, start, len,</div><div class='del'>-						     camel_charset_best (start, len), IS_PSAFE);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (last_word);</div><div class='del'>-		wordl = g_list_next (wordl);</div><div class='del'>-		</div><div class='del'>-		last_word = word;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* and we no longer need the list */</div><div class='del'>-	g_free (word);</div><div class='del'>-	g_list_free (words);</div><div class='del'>-	</div><div class='del'>-	outstr = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return outstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* these are all internal parser functions */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-decode_token (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	const char *start;</div><div class='del'>-	</div><div class='del'>-	header_decode_lwsp (&amp;inptr);</div><div class='del'>-	start = inptr;</div><div class='del'>-	while (is_ttoken (*inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	if (inptr &gt; start) {</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return g_strndup (start, inptr - start);</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_token_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return decode_token(&amp;in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   &lt;"&gt; * ( &lt;any char except &lt;"&gt; \, cr  /  \ &lt;any char&gt; ) &lt;"&gt;</div><div class='del'>-*/</div><div class='del'>-static char *</div><div class='del'>-header_decode_quoted_string(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *out = NULL, *outptr;</div><div class='del'>-	size_t outlen;</div><div class='del'>-	int c;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == '"') {</div><div class='del'>-		const char *intmp;</div><div class='del'>-		int skip = 0;</div><div class='del'>-</div><div class='del'>-		/* first, calc length */</div><div class='del'>-		inptr++;</div><div class='del'>-		intmp = inptr;</div><div class='del'>-		while ( (c = *intmp++) &amp;&amp; c!= '"') {</div><div class='del'>-			if (c=='\\' &amp;&amp; *intmp) {</div><div class='del'>-				intmp++;</div><div class='del'>-				skip++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		outlen = intmp-inptr-skip;</div><div class='del'>-		out = outptr = g_malloc(outlen+1);</div><div class='del'>-		while ( (c = *inptr++) &amp;&amp; c!= '"') {</div><div class='del'>-			if (c=='\\' &amp;&amp; *inptr) {</div><div class='del'>-				c = *inptr++;</div><div class='del'>-			}</div><div class='del'>-			*outptr++ = c;</div><div class='del'>-		}</div><div class='del'>-		*outptr = '\0';</div><div class='del'>-	}</div><div class='del'>-	*in = inptr;</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_decode_atom(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in, *start;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	start = inptr;</div><div class='del'>-	while (is_atom(*inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	*in = inptr;</div><div class='del'>-	if (inptr &gt; start)</div><div class='del'>-		return g_strndup(start, inptr-start);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_decode_word(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == '"') {</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return header_decode_quoted_string(in);</div><div class='del'>-	} else {</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return header_decode_atom(in);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_decode_value(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == '"') {</div><div class='del'>-		d(printf("decoding quoted string\n"));</div><div class='del'>-		return header_decode_quoted_string(in);</div><div class='del'>-	} else if (is_ttoken(*inptr)) {</div><div class='del'>-		d(printf("decoding token\n"));</div><div class='del'>-		/* this may not have the right specials for all params? */</div><div class='del'>-		return decode_token(in);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* should this return -1 for no int? */</div><div class='del'>-int</div><div class='del'>-header_decode_int(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	int c, v=0;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	while ( (c=*inptr++ &amp; 0xff)</div><div class='del'>-		&amp;&amp; isdigit(c) ) {</div><div class='del'>-		v = v*10+(c-'0');</div><div class='del'>-	}</div><div class='del'>-	*in = inptr-1;</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-hex_decode (const char *in, size_t len)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *inend = in + len;</div><div class='del'>-	unsigned char *inptr, *outptr;</div><div class='del'>-	char *outbuf;</div><div class='del'>-	</div><div class='del'>-	outptr = outbuf = g_malloc (len + 1);</div><div class='del'>-	</div><div class='del'>-	inptr = (unsigned char *) in;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		if (*inptr == '%') {</div><div class='del'>-			if (isxdigit (inptr[1]) &amp;&amp; isxdigit (inptr[2])) {</div><div class='del'>-				*outptr++ = HEXVAL (inptr[1]) * 16 + HEXVAL (inptr[2]);</div><div class='del'>-				inptr += 3;</div><div class='del'>-			} else</div><div class='del'>-				*outptr++ = *inptr++;</div><div class='del'>-		} else</div><div class='del'>-			*outptr++ = *inptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*outptr = '\0';</div><div class='del'>-	</div><div class='del'>-	return outbuf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* an rfc2184 encoded string looks something like:</div><div class='del'>- * us-ascii'en'This%20is%20even%20more%20</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-rfc2184_decode (const char *in, size_t len)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	const char *inend = in + len;</div><div class='del'>-	const char *charset;</div><div class='del'>-	char *decoded = NULL;</div><div class='del'>-	char *encoding;</div><div class='del'>-	</div><div class='del'>-	inptr = memchr (inptr, '\'', len);</div><div class='del'>-	if (!inptr)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	encoding = g_strndup (in, inptr - in);</div><div class='del'>-	charset = e_iconv_charset_name (encoding);</div><div class='del'>-	g_free (encoding);</div><div class='del'>-	</div><div class='del'>-	inptr = memchr (inptr + 1, '\'', inend - inptr - 1);</div><div class='del'>-	if (!inptr)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	inptr++;</div><div class='del'>-	if (inptr &lt; inend) {</div><div class='del'>-		char *decword, *outbase, *outbuf;</div><div class='del'>-		const char *inbuf;</div><div class='del'>-		size_t inlen, outlen;</div><div class='del'>-		iconv_t ic;</div><div class='del'>-		</div><div class='del'>-		inbuf = decword = hex_decode (inptr, inend - inptr);</div><div class='del'>-		inlen = strlen (inbuf);</div><div class='del'>-		</div><div class='del'>-		ic = e_iconv_open ("UTF-8", charset);</div><div class='del'>-		if (ic != (iconv_t) -1) {</div><div class='del'>-			size_t ret;</div><div class='del'>-			</div><div class='del'>-			outlen = inlen * 6 + 16;</div><div class='del'>-			outbuf = outbase = g_malloc (outlen);</div><div class='del'>-			</div><div class='del'>-			ret = e_iconv (ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-			if (ret != (size_t) -1) {</div><div class='del'>-				e_iconv (ic, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-				*outbuf = '\0';</div><div class='del'>-				g_free (decoded);</div><div class='del'>-				decoded = outbase;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			e_iconv_close (ic);</div><div class='del'>-		} else {</div><div class='del'>-			decoded = decword;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return decoded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function is basically the same as decode_token()</div><div class='del'>- * except that it will not accept *'s which have a special</div><div class='del'>- * meaning for rfc2184 params */</div><div class='del'>-static char *</div><div class='del'>-decode_param_token (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	const char *start;</div><div class='del'>-	</div><div class='del'>-	header_decode_lwsp (&amp;inptr);</div><div class='del'>-	start = inptr;</div><div class='del'>-	while (is_ttoken (*inptr) &amp;&amp; *inptr != '*')</div><div class='del'>-		inptr++;</div><div class='del'>-	if (inptr &gt; start) {</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return g_strndup (start, inptr - start);</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-header_decode_rfc2184_param (const char **in, char **paramp, gboolean *value_is_encoded, int *part)</div><div class='del'>-{</div><div class='del'>-	gboolean is_rfc2184 = FALSE;</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *param;</div><div class='del'>-	</div><div class='del'>-	*value_is_encoded = FALSE;</div><div class='del'>-	*part = -1;</div><div class='del'>-	</div><div class='del'>-	param = decode_param_token (&amp;inptr);</div><div class='del'>-	header_decode_lwsp (&amp;inptr);</div><div class='del'>-	</div><div class='del'>-	if (*inptr == '*') {</div><div class='del'>-		is_rfc2184 = TRUE;</div><div class='del'>-		inptr++;</div><div class='del'>-		header_decode_lwsp (&amp;inptr);</div><div class='del'>-		if (*inptr == '=') {</div><div class='del'>-			/* form := param*=value */</div><div class='del'>-			if (value_is_encoded)</div><div class='del'>-				*value_is_encoded = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			/* form := param*#=value or param*#*=value */</div><div class='del'>-			*part = header_decode_int (&amp;inptr);</div><div class='del'>-			header_decode_lwsp (&amp;inptr);</div><div class='del'>-			if (*inptr == '*') {</div><div class='del'>-				/* form := param*#*=value */</div><div class='del'>-				if (value_is_encoded)</div><div class='del'>-					*value_is_encoded = TRUE;</div><div class='del'>-				inptr++;</div><div class='del'>-				header_decode_lwsp (&amp;inptr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (paramp)</div><div class='del'>-		*paramp = param;</div><div class='del'>-	</div><div class='del'>-	if (param)</div><div class='del'>-		*in = inptr;</div><div class='del'>-	</div><div class='del'>-	return is_rfc2184;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-header_decode_param (const char **in, char **paramp, char **valuep, int *is_rfc2184_param, int *rfc2184_part)</div><div class='del'>-{</div><div class='del'>-	gboolean is_rfc2184_encoded = FALSE;</div><div class='del'>-	gboolean is_rfc2184 = FALSE;</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *param, *value = NULL;</div><div class='del'>-	</div><div class='del'>-	*is_rfc2184_param = FALSE;</div><div class='del'>-	*rfc2184_part = -1;</div><div class='del'>-	</div><div class='del'>-	is_rfc2184 = header_decode_rfc2184_param (&amp;inptr, &amp;param, &amp;is_rfc2184_encoded, rfc2184_part);</div><div class='del'>-	</div><div class='del'>-	if (*inptr == '=') {</div><div class='del'>-		inptr++;</div><div class='del'>-		value = header_decode_value (&amp;inptr);</div><div class='del'>-		</div><div class='del'>-		if (is_rfc2184) {</div><div class='del'>-			/* We have ourselves an rfc2184 parameter */</div><div class='del'>-			</div><div class='del'>-			if (*rfc2184_part == -1) {</div><div class='del'>-				/* rfc2184 allows the value to be broken into</div><div class='del'>-				 * multiple parts - this isn't one of them so</div><div class='del'>-				 * it is safe to decode it.</div><div class='del'>-				 */</div><div class='del'>-				char *val;</div><div class='del'>-				</div><div class='del'>-				val = rfc2184_decode (value, strlen (value));</div><div class='del'>-				if (val) {</div><div class='del'>-					g_free (value);</div><div class='del'>-					value = val;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* Since we are expecting to find the rest of</div><div class='del'>-				 * this paramter value later, let our caller know.</div><div class='del'>-				 */</div><div class='del'>-				*is_rfc2184_param = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else if (value &amp;&amp; !strncmp (value, "=?", 2)) {</div><div class='del'>-			/* We have a broken param value that is rfc2047 encoded.</div><div class='del'>-			 * Since both Outlook and Netscape/Mozilla do this, we</div><div class='del'>-			 * should handle this case.</div><div class='del'>-			 */</div><div class='del'>-			char *val;</div><div class='del'>-			</div><div class='del'>-			val = rfc2047_decode_word (value, strlen (value));</div><div class='del'>-			if (val) {</div><div class='del'>-				g_free (value);</div><div class='del'>-				value = val;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (value &amp;&amp; !g_utf8_validate (value, -1, NULL)) {</div><div class='del'>-		/* The (broken) mailer sent us an unencoded 8bit value</div><div class='del'>-		 * attempt to save it by assuming it's in the user's</div><div class='del'>-		 * locale and converting to utf8 */</div><div class='del'>-		char *outbase, *outbuf, *p;</div><div class='del'>-		const char *charset, *inbuf;</div><div class='del'>-		size_t inlen, outlen;</div><div class='del'>-		iconv_t ic;</div><div class='del'>-		</div><div class='del'>-		inbuf = value;</div><div class='del'>-		inlen = strlen (inbuf);</div><div class='del'>-		</div><div class='del'>-		charset = e_iconv_locale_charset ();</div><div class='del'>-		ic = e_iconv_open ("UTF-8", charset ? charset : "ISO-8859-1");</div><div class='del'>-		if (ic != (iconv_t) -1) {</div><div class='del'>-			size_t ret;</div><div class='del'>-			</div><div class='del'>-			outlen = inlen * 6 + 16;</div><div class='del'>-			outbuf = outbase = g_malloc (outlen);</div><div class='del'>-			</div><div class='del'>-			ret = e_iconv (ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-			if (ret != (size_t) -1) {</div><div class='del'>-				e_iconv (ic, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-				*outbuf = '\0';</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			e_iconv_close (ic);</div><div class='del'>-			</div><div class='del'>-			g_free (value);</div><div class='del'>-			value = outbase;</div><div class='del'>-		} else {</div><div class='del'>-			/* Okay, so now what? I guess we convert invalid chars to _'s? */</div><div class='del'>-			for (p = value; *p; p++)</div><div class='del'>-				if (!isascii ((unsigned) *p))</div><div class='del'>-					*p = '_';</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (param &amp;&amp; value) {</div><div class='del'>-		*paramp = param;</div><div class='del'>-		*valuep = value;</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return 0;</div><div class='del'>-	} else {</div><div class='del'>-		g_free (param);</div><div class='del'>-		g_free (value);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_param (struct _header_param *p, const char *name)</div><div class='del'>-{</div><div class='del'>-	while (p &amp;&amp; strcasecmp (p-&gt;name, name) != 0)</div><div class='del'>-		p = p-&gt;next;</div><div class='del'>-	if (p)</div><div class='del'>-		return p-&gt;value;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_param *</div><div class='del'>-header_set_param (struct _header_param **l, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *p = (struct _header_param *)l, *pn;</div><div class='del'>-	</div><div class='del'>-	if (name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	while (p-&gt;next) {</div><div class='del'>-		pn = p-&gt;next;</div><div class='del'>-		if (!strcasecmp (pn-&gt;name, name)) {</div><div class='del'>-			g_free (pn-&gt;value);</div><div class='del'>-			if (value) {</div><div class='del'>-				pn-&gt;value = g_strdup (value);</div><div class='del'>-				return pn;</div><div class='del'>-			} else {</div><div class='del'>-				p-&gt;next = pn-&gt;next;</div><div class='del'>-				g_free (pn-&gt;name);</div><div class='del'>-				g_free (pn);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		p = pn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (value == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	pn = g_malloc (sizeof (*pn));</div><div class='del'>-	pn-&gt;next = 0;</div><div class='del'>-	pn-&gt;name = g_strdup (name);</div><div class='del'>-	pn-&gt;value = g_strdup (value);</div><div class='del'>-	p-&gt;next = pn;</div><div class='del'>-</div><div class='del'>-	return pn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-header_content_type_param (struct _header_content_type *t, const char *name)</div><div class='del'>-{</div><div class='del'>-	if (t==NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	return header_param (t-&gt;params, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_set_param (struct _header_content_type *t, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	header_set_param (&amp;t-&gt;params, name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * header_content_type_is:</div><div class='del'>- * @ct: A content type specifier, or #NULL.</div><div class='del'>- * @type: A type to check against.</div><div class='del'>- * @subtype: A subtype to check against, or "*" to match any subtype.</div><div class='del'>- * </div><div class='del'>- * Returns #TRUE if the content type @ct is of type @type/@subtype.</div><div class='del'>- * The subtype of "*" will match any subtype.  If @ct is #NULL, then</div><div class='del'>- * it will match the type "text/plain".</div><div class='del'>- * </div><div class='del'>- * Return value: #TRUE or #FALSE depending on the matching of the type.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype)</div><div class='del'>-{</div><div class='del'>-	/* no type == text/plain or text/"*" */</div><div class='del'>-	if (ct==NULL || (ct-&gt;type == NULL &amp;&amp; ct-&gt;subtype == NULL)) {</div><div class='del'>-		return (!strcasecmp(type, "text")</div><div class='del'>-			&amp;&amp; (!strcasecmp(subtype, "plain")</div><div class='del'>-			    || !strcasecmp(subtype, "*")));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (ct-&gt;type != NULL</div><div class='del'>-		&amp;&amp; (!strcasecmp(ct-&gt;type, type)</div><div class='del'>-		    &amp;&amp; ((ct-&gt;subtype != NULL</div><div class='del'>-			 &amp;&amp; !strcasecmp(ct-&gt;subtype, subtype))</div><div class='del'>-			|| !strcasecmp("*", subtype))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_param_list_free(struct _header_param *p)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *n;</div><div class='del'>-</div><div class='del'>-	while (p) {</div><div class='del'>-		n = p-&gt;next;</div><div class='del'>-		g_free(p-&gt;name);</div><div class='del'>-		g_free(p-&gt;value);</div><div class='del'>-		g_free(p);</div><div class='del'>-		p = n;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_content_type *</div><div class='del'>-header_content_type_new(const char *type, const char *subtype)</div><div class='del'>-{</div><div class='del'>-	struct _header_content_type *t = g_malloc(sizeof(*t));</div><div class='del'>-</div><div class='del'>-	t-&gt;type = g_strdup(type);</div><div class='del'>-	t-&gt;subtype = g_strdup(subtype);</div><div class='del'>-	t-&gt;params = NULL;</div><div class='del'>-	t-&gt;refcount = 1;</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_ref(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	if (ct)</div><div class='del'>-		ct-&gt;refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_unref(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	if (ct) {</div><div class='del'>-		if (ct-&gt;refcount &lt;= 1) {</div><div class='del'>-			header_param_list_free(ct-&gt;params);</div><div class='del'>-			g_free(ct-&gt;type);</div><div class='del'>-			g_free(ct-&gt;subtype);</div><div class='del'>-			g_free(ct);</div><div class='del'>-		} else {</div><div class='del'>-			ct-&gt;refcount--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for decoding email addresses, canonically */</div><div class='del'>-static char *</div><div class='del'>-header_decode_domain(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in, *start;</div><div class='del'>-	int go = TRUE;</div><div class='del'>-	char *ret;</div><div class='del'>-	GString *domain = g_string_new("");</div><div class='del'>-</div><div class='del'>-				/* domain ref | domain literal */</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	while (go) {</div><div class='del'>-		if (*inptr == '[') { /* domain literal */</div><div class='del'>-			domain = g_string_append_c(domain, '[');</div><div class='del'>-			inptr++;</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-			start = inptr;</div><div class='del'>-			while (is_dtext(*inptr)) {</div><div class='del'>-				domain = g_string_append_c(domain, *inptr);</div><div class='del'>-				inptr++;</div><div class='del'>-			}</div><div class='del'>-			if (*inptr == ']') {</div><div class='del'>-				domain = g_string_append_c(domain, ']');</div><div class='del'>-				inptr++;</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("closing ']' not found in domain: %s", *in));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			char *a = header_decode_atom(&amp;inptr);</div><div class='del'>-			if (a) {</div><div class='del'>-				domain = g_string_append(domain, a);</div><div class='del'>-				g_free(a);</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("missing atom from domain-ref"));</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == '.') { /* next sub-domain? */</div><div class='del'>-			domain = g_string_append_c(domain, '.');</div><div class='del'>-			inptr++;</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-		} else</div><div class='del'>-			go = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*in = inptr;</div><div class='del'>-</div><div class='del'>-	ret = domain-&gt;str;</div><div class='del'>-	g_string_free(domain, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_decode_addrspec(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *word;</div><div class='del'>-	GString *addr = g_string_new("");</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-</div><div class='del'>-	/* addr-spec */</div><div class='del'>-	word = header_decode_word(&amp;inptr);</div><div class='del'>-	if (word) {</div><div class='del'>-		addr = g_string_append(addr, word);</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		g_free(word);</div><div class='del'>-		while (*inptr == '.' &amp;&amp; word) {</div><div class='del'>-			inptr++;</div><div class='del'>-			addr = g_string_append_c(addr, '.');</div><div class='del'>-			word = header_decode_word(&amp;inptr);</div><div class='del'>-			if (word) {</div><div class='del'>-				addr = g_string_append(addr, word);</div><div class='del'>-				header_decode_lwsp(&amp;inptr);</div><div class='del'>-				g_free(word);</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("Invalid address spec: %s", *in));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (*inptr == '@') {</div><div class='del'>-			inptr++;</div><div class='del'>-			addr = g_string_append_c(addr, '@');</div><div class='del'>-			word = header_decode_domain(&amp;inptr);</div><div class='del'>-			if (word) {</div><div class='del'>-				addr = g_string_append(addr, word);</div><div class='del'>-				g_free(word);</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("Invalid address, missing domain: %s", *in));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			w(g_warning("Invalid addr-spec, missing @: %s", *in));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		w(g_warning("invalid addr-spec, no local part"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: return null on error? */</div><div class='del'>-</div><div class='del'>-	*in = inptr;</div><div class='del'>-	word = addr-&gt;str;</div><div class='del'>-	g_string_free(addr, FALSE);</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  address:</div><div class='del'>-   word *('.' word) @ domain |</div><div class='del'>-   *(word) '&lt;' [ *('@' domain ) ':' ] word *( '.' word) @ domain |</div><div class='del'>-</div><div class='del'>-   1*word ':' [ word ... etc (mailbox, as above) ] ';'</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* mailbox:</div><div class='del'>-   word *( '.' word ) '@' domain</div><div class='del'>-   *(word) '&lt;' [ *('@' domain ) ':' ] word *( '.' word) @ domain</div><div class='del'>-   */</div><div class='del'>-</div><div class='del'>-static struct _header_address *</div><div class='del'>-header_decode_mailbox(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *pre;</div><div class='del'>-	int closeme = FALSE;</div><div class='del'>-	GString *addr;</div><div class='del'>-	GString *name = NULL;</div><div class='del'>-	struct _header_address *address = NULL;</div><div class='del'>-	const char *comment = NULL;</div><div class='del'>-</div><div class='del'>-	addr = g_string_new("");</div><div class='del'>-</div><div class='del'>-	/* for each address */</div><div class='del'>-	pre = header_decode_word(&amp;inptr);</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (!(*inptr == '.' || *inptr == '@' || *inptr==',' || *inptr=='\0')) {</div><div class='del'>-		/* ',' and '\0' required incase it is a simple address, no @ domain part (buggy writer) */</div><div class='del'>-		name = g_string_new ("");</div><div class='del'>-		while (pre) {</div><div class='del'>-			char *text, *last;</div><div class='del'>-</div><div class='del'>-			/* perform internationalised decoding, and append */</div><div class='del'>-			text = header_decode_string (pre, NULL);</div><div class='del'>-			g_string_append (name, text);</div><div class='del'>-			last = pre;</div><div class='del'>-			g_free(text);</div><div class='del'>-</div><div class='del'>-			pre = header_decode_word(&amp;inptr);</div><div class='del'>-			if (pre) {</div><div class='del'>-				size_t l = strlen (last);</div><div class='del'>-				size_t p = strlen (pre);</div><div class='del'>-				</div><div class='del'>-				/* dont append ' ' between sucsessive encoded words */</div><div class='del'>-				if ((l&gt;6 &amp;&amp; last[l-2] == '?' &amp;&amp; last[l-1] == '=')</div><div class='del'>-				    &amp;&amp; (p&gt;6 &amp;&amp; pre[0] == '=' &amp;&amp; pre[1] == '?')) {</div><div class='del'>-					/* dont append ' ' */</div><div class='del'>-				} else {</div><div class='del'>-					name = g_string_append_c(name, ' ');</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* Fix for stupidly-broken-mailers that like to put '.''s in names unquoted */</div><div class='del'>-				/* see bug #8147 */</div><div class='del'>-				while (!pre &amp;&amp; *inptr &amp;&amp; *inptr != '&lt;') {</div><div class='del'>-					w(g_warning("Working around stupid mailer bug #5: unescaped characters in names"));</div><div class='del'>-					name = g_string_append_c(name, *inptr++);</div><div class='del'>-					pre = header_decode_word(&amp;inptr);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free(last);</div><div class='del'>-		}</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == '&lt;') {</div><div class='del'>-			closeme = TRUE;</div><div class='del'>-		try_address_again:</div><div class='del'>-			inptr++;</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-			if (*inptr == '@') {</div><div class='del'>-				while (*inptr == '@') {</div><div class='del'>-					inptr++;</div><div class='del'>-					header_decode_domain(&amp;inptr);</div><div class='del'>-					header_decode_lwsp(&amp;inptr);</div><div class='del'>-					if (*inptr == ',') {</div><div class='del'>-						inptr++;</div><div class='del'>-						header_decode_lwsp(&amp;inptr);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				if (*inptr == ':') {</div><div class='del'>-					inptr++;</div><div class='del'>-				} else {</div><div class='del'>-					w(g_warning("broken route-address, missing ':': %s", *in));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			pre = header_decode_word(&amp;inptr);</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-		} else {</div><div class='del'>-			w(g_warning("broken address? %s", *in));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (pre) {</div><div class='del'>-		addr = g_string_append(addr, pre);</div><div class='del'>-	} else {</div><div class='del'>-		w(g_warning("No local-part for email address: %s", *in));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* should be at word '.' localpart */</div><div class='del'>-	while (*inptr == '.' &amp;&amp; pre) {</div><div class='del'>-		inptr++;</div><div class='del'>-		g_free(pre);</div><div class='del'>-		pre = header_decode_word(&amp;inptr);</div><div class='del'>-		addr = g_string_append_c(addr, '.');</div><div class='del'>-		if (pre)</div><div class='del'>-			addr = g_string_append(addr, pre);</div><div class='del'>-		comment = inptr;</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-	}</div><div class='del'>-	g_free(pre);</div><div class='del'>-</div><div class='del'>-	/* now at '@' domain part */</div><div class='del'>-	if (*inptr == '@') {</div><div class='del'>-		char *dom;</div><div class='del'>-</div><div class='del'>-		inptr++;</div><div class='del'>-		addr = g_string_append_c(addr, '@');</div><div class='del'>-		comment = inptr;</div><div class='del'>-		dom = header_decode_domain(&amp;inptr);</div><div class='del'>-		addr = g_string_append(addr, dom);</div><div class='del'>-		g_free(dom);</div><div class='del'>-	} else {</div><div class='del'>-		/* If we get a &lt;, the address was probably a name part, lets try again shall we? */</div><div class='del'>-		/* Another fix for seriously-broken-mailers */</div><div class='del'>-		if (*inptr &amp;&amp; *inptr != ',') {</div><div class='del'>-			char *text;</div><div class='del'>-</div><div class='del'>-			w(g_warning("We didn't get an '@' where we expected in '%s', trying again", *in));</div><div class='del'>-			w(g_warning("Name is '%s', Addr is '%s' we're at '%s'\n", name?name-&gt;str:"&lt;UNSET&gt;", addr-&gt;str, inptr));</div><div class='del'>-</div><div class='del'>-			/* need to keep *inptr, as try_address_again will drop the current character */</div><div class='del'>-			if (*inptr == '&lt;')</div><div class='del'>-				closeme = TRUE;</div><div class='del'>-			else</div><div class='del'>-				g_string_append_c(addr, *inptr);</div><div class='del'>-</div><div class='del'>-			/* check for address is encoded word ... */</div><div class='del'>-			text = header_decode_string(addr-&gt;str, NULL);</div><div class='del'>-			if (name == NULL) {</div><div class='del'>-				name = addr;</div><div class='del'>-				addr = g_string_new("");</div><div class='del'>-				if (text) {</div><div class='del'>-					g_string_truncate(name, 0);</div><div class='del'>-					g_string_append(name, text);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				g_string_append(name, text?text:addr-&gt;str);</div><div class='del'>-				g_string_truncate(addr, 0);</div><div class='del'>-			}</div><div class='del'>-			g_free(text);</div><div class='del'>-</div><div class='del'>-			/* or maybe that we've added up a bunch of broken bits to make an encoded word */</div><div class='del'>-			text = header_decode_string(name-&gt;str, NULL);</div><div class='del'>-			if (text) {</div><div class='del'>-				g_string_truncate(name, 0);</div><div class='del'>-				g_string_append(name, text);</div><div class='del'>-				g_free(text);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			goto try_address_again;</div><div class='del'>-		}</div><div class='del'>-		w(g_warning("invalid address, no '@' domain part at %c: %s", *inptr, *in));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (closeme) {</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == '&gt;') {</div><div class='del'>-			inptr++;</div><div class='del'>-		} else {</div><div class='del'>-			w(g_warning("invalid route address, no closing '&gt;': %s", *in));</div><div class='del'>-		} </div><div class='del'>-	} else if (name == NULL &amp;&amp; comment != NULL &amp;&amp; inptr&gt;comment) { /* check for comment after address */</div><div class='del'>-		char *text, *tmp;</div><div class='del'>-		const char *comstart, *comend;</div><div class='del'>-</div><div class='del'>-		/* this is a bit messy, we go from the last known position, because</div><div class='del'>-		   decode_domain/etc skip over any comments on the way */</div><div class='del'>-		/* FIXME: This wont detect comments inside the domain itself,</div><div class='del'>-		   but nobody seems to use that feature anyway ... */</div><div class='del'>-</div><div class='del'>-		d(printf("checking for comment from '%s'\n", comment));</div><div class='del'>-</div><div class='del'>-		comstart = strchr(comment, '(');</div><div class='del'>-		if (comstart) {</div><div class='del'>-			comstart++;</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-			comend = inptr-1;</div><div class='del'>-			while (comend &gt; comstart &amp;&amp; comend[0] != ')')</div><div class='del'>-				comend--;</div><div class='del'>-			</div><div class='del'>-			if (comend &gt; comstart) {</div><div class='del'>-				d(printf("  looking at subset '%.*s'\n", comend-comstart, comstart));</div><div class='del'>-				tmp = g_strndup (comstart, comend-comstart);</div><div class='del'>-				text = header_decode_string (tmp, NULL);</div><div class='del'>-				name = g_string_new (text);</div><div class='del'>-				g_free (tmp);</div><div class='del'>-				g_free (text);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*in = inptr;</div><div class='del'>-	</div><div class='del'>-	if (addr-&gt;len &gt; 0) {</div><div class='del'>-		address = header_address_new_name(name ? name-&gt;str : "", addr-&gt;str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_string_free(addr, TRUE);</div><div class='del'>-	if (name)</div><div class='del'>-		g_string_free(name, TRUE);</div><div class='del'>-</div><div class='del'>-	d(printf("got mailbox: %s\n", addr-&gt;str));</div><div class='del'>-	return address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_address *</div><div class='del'>-header_decode_address(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *pre;</div><div class='del'>-	GString *group = g_string_new("");</div><div class='del'>-	struct _header_address *addr = NULL, *member;</div><div class='del'>-</div><div class='del'>-	/* pre-scan, trying to work out format, discard results */</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	while ( (pre = header_decode_word(&amp;inptr)) ) {</div><div class='del'>-		group = g_string_append(group, pre);</div><div class='del'>-		group = g_string_append(group, " ");</div><div class='del'>-		g_free(pre);</div><div class='del'>-	}</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == ':') {</div><div class='del'>-		d(printf("group detected: %s\n", group-&gt;str));</div><div class='del'>-		addr = header_address_new_group(group-&gt;str);</div><div class='del'>-		/* that was a group spec, scan mailbox's */</div><div class='del'>-		inptr++;</div><div class='del'>-		/* FIXME: check rfc 2047 encodings of words, here or above in the loop */</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr != ';') {</div><div class='del'>-			int go = TRUE;</div><div class='del'>-			do {</div><div class='del'>-				member = header_decode_mailbox(&amp;inptr);</div><div class='del'>-				if (member)</div><div class='del'>-					header_address_add_member(addr, member);</div><div class='del'>-				header_decode_lwsp(&amp;inptr);</div><div class='del'>-				if (*inptr == ',')</div><div class='del'>-					inptr++;</div><div class='del'>-				else</div><div class='del'>-					go = FALSE;</div><div class='del'>-			} while (go);</div><div class='del'>-			if (*inptr == ';') {</div><div class='del'>-				inptr++;</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("Invalid group spec, missing closing ';': %s", *in));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			inptr++;</div><div class='del'>-		}</div><div class='del'>-		*in = inptr;</div><div class='del'>-	} else {</div><div class='del'>-		addr = header_decode_mailbox(in);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_string_free(group, TRUE);</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_msgid_decode_internal(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *msgid = NULL;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding Message-ID: '%s'\n", *in));</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == '&lt;') {</div><div class='del'>-		inptr++;</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		msgid = header_decode_addrspec(&amp;inptr);</div><div class='del'>-		if (msgid) {</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-			if (*inptr == '&gt;') {</div><div class='del'>-				inptr++;</div><div class='del'>-			} else {</div><div class='del'>-				w(g_warning("Missing closing '&gt;' on message id: %s", *in));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			w(g_warning("Cannot find message id in: %s", *in));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		w(g_warning("missing opening '&lt;' on message id: %s", *in));</div><div class='del'>-	}</div><div class='del'>-	*in = inptr;</div><div class='del'>-</div><div class='del'>-	return msgid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_msgid_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return header_msgid_decode_internal(&amp;in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_references_list_append_asis(struct _header_references **list, char *ref)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *w = (struct _header_references *)list, *n;</div><div class='del'>-	while (w-&gt;next)</div><div class='del'>-		w = w-&gt;next;</div><div class='del'>-	n = g_malloc(sizeof(*n));</div><div class='del'>-	n-&gt;id = ref;</div><div class='del'>-	n-&gt;next = 0;</div><div class='del'>-	w-&gt;next = n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-header_references_list_size(struct _header_references **list)</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-	struct _header_references *w = *list;</div><div class='del'>-	while (w) {</div><div class='del'>-		count++;</div><div class='del'>-		w = w-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_references_list_clear(struct _header_references **list)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *w = *list, *n;</div><div class='del'>-	while (w) {</div><div class='del'>-		n = w-&gt;next;</div><div class='del'>-		g_free(w-&gt;id);</div><div class='del'>-		g_free(w);</div><div class='del'>-		w = n;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_references_decode_single (const char **in, struct _header_references **head)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *ref;</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *id, *word;</div><div class='del'>-	</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		header_decode_lwsp (&amp;inptr);</div><div class='del'>-		if (*inptr == '&lt;') {</div><div class='del'>-			id = header_msgid_decode_internal (&amp;inptr);</div><div class='del'>-			if (id) {</div><div class='del'>-				ref = g_malloc (sizeof (struct _header_references));</div><div class='del'>-				ref-&gt;next = *head;</div><div class='del'>-				ref-&gt;id = id;</div><div class='del'>-				*head = ref;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			word = header_decode_word (&amp;inptr);</div><div class='del'>-			if (word)</div><div class='del'>-				g_free (word);</div><div class='del'>-			else if (*inptr != '\0')</div><div class='del'>-				inptr++; /* Stupid mailer tricks */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*in = inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_references *</div><div class='del'>-header_references_inreplyto_decode (const char *in)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *ref = NULL;</div><div class='del'>-	</div><div class='del'>-	if (in == NULL || in[0] == '\0')</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	header_references_decode_single (&amp;in, &amp;ref);</div><div class='del'>-	</div><div class='del'>-	return ref;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* generate a list of references, from most recent up */</div><div class='del'>-struct _header_references *</div><div class='del'>-header_references_decode (const char *in)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *refs = NULL;</div><div class='del'>-	</div><div class='del'>-	if (in == NULL || in[0] == '\0')</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	while (*in)</div><div class='del'>-		header_references_decode_single (&amp;in, &amp;refs);</div><div class='del'>-	</div><div class='del'>-	return refs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_references *</div><div class='del'>-header_references_dup(const struct _header_references *list)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *new = NULL, *tmp;</div><div class='del'>-</div><div class='del'>-	while (list) {</div><div class='del'>-		tmp = g_new(struct _header_references, 1);</div><div class='del'>-		tmp-&gt;next = new;</div><div class='del'>-		tmp-&gt;id = g_strdup(list-&gt;id);</div><div class='del'>-		new = tmp;</div><div class='del'>-		list = list-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *</div><div class='del'>-header_mailbox_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return header_decode_mailbox(&amp;in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *</div><div class='del'>-header_address_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in, *last;</div><div class='del'>-	struct _header_address *list = NULL, *addr;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding To: '%s'\n", in));</div><div class='del'>-</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		last = inptr;</div><div class='del'>-		addr = header_decode_address(&amp;inptr);</div><div class='del'>-		if (addr)</div><div class='del'>-			header_address_list_append(&amp;list, addr);</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == ',')</div><div class='del'>-			inptr++;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	} while (inptr != last);</div><div class='del'>-</div><div class='del'>-	if (*inptr) {</div><div class='del'>-		w(g_warning("Invalid input detected at %c (%d): %s\n or at: %s", *inptr, inptr-in, in, inptr));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (inptr == last) {</div><div class='del'>-		w(g_warning("detected invalid input loop at : %s", last));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_mime_decode(const char *in, int *maj, int *min)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	int major=-1, minor=-1;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding MIME-Version: '%s'\n", in));</div><div class='del'>-</div><div class='del'>-	if (in != NULL) {</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (isdigit(*inptr)) {</div><div class='del'>-			major = header_decode_int(&amp;inptr);</div><div class='del'>-			header_decode_lwsp(&amp;inptr);</div><div class='del'>-			if (*inptr == '.') {</div><div class='del'>-				inptr++;</div><div class='del'>-				header_decode_lwsp(&amp;inptr);</div><div class='del'>-				if (isdigit(*inptr))</div><div class='del'>-					minor = header_decode_int(&amp;inptr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (maj)</div><div class='del'>-		*maj = major;</div><div class='del'>-	if (min)</div><div class='del'>-		*min = minor;</div><div class='del'>-</div><div class='del'>-	d(printf("major = %d, minor = %d\n", major, minor));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_param *</div><div class='del'>-header_decode_param_list (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	struct _header_param *head = NULL, *tail = NULL;</div><div class='del'>-	gboolean last_was_rfc2184 = FALSE;</div><div class='del'>-	gboolean is_rfc2184 = FALSE;</div><div class='del'>-	</div><div class='del'>-	header_decode_lwsp (&amp;inptr);</div><div class='del'>-	</div><div class='del'>-	while (*inptr == ';') {</div><div class='del'>-		struct _header_param *param;</div><div class='del'>-		char *name, *value;</div><div class='del'>-		int rfc2184_part;</div><div class='del'>-		</div><div class='del'>-		inptr++;</div><div class='del'>-		/* invalid format? */</div><div class='del'>-		if (header_decode_param (&amp;inptr, &amp;name, &amp;value, &amp;is_rfc2184, &amp;rfc2184_part) != 0)</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		if (is_rfc2184 &amp;&amp; tail &amp;&amp; !strcasecmp (name, tail-&gt;name)) {</div><div class='del'>-			/* rfc2184 allows a parameter to be broken into multiple parts</div><div class='del'>-			 * and it looks like we've found one. Append this value to the</div><div class='del'>-			 * last value.</div><div class='del'>-			 */</div><div class='del'>-			/* FIXME: we should be ordering these based on rfc2184_part id */</div><div class='del'>-			GString *gvalue;</div><div class='del'>-			</div><div class='del'>-			gvalue = g_string_new (tail-&gt;value);</div><div class='del'>-			g_string_append (gvalue, value);</div><div class='del'>-			g_free (tail-&gt;value);</div><div class='del'>-			g_free (value);</div><div class='del'>-			g_free (name);</div><div class='del'>-			</div><div class='del'>-			tail-&gt;value = gvalue-&gt;str;</div><div class='del'>-			g_string_free (gvalue, FALSE);</div><div class='del'>-		} else {</div><div class='del'>-			if (last_was_rfc2184) {</div><div class='del'>-				/* We've finished gathering the values for the last param</div><div class='del'>-				 * so it is now safe to decode it.</div><div class='del'>-				 */</div><div class='del'>-				char *val;</div><div class='del'>-				</div><div class='del'>-				val = rfc2184_decode (tail-&gt;value, strlen (tail-&gt;value));</div><div class='del'>-				if (val) {</div><div class='del'>-					g_free (tail-&gt;value);</div><div class='del'>-					tail-&gt;value = val;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			param = g_malloc (sizeof (struct _header_param));</div><div class='del'>-			param-&gt;name = name;</div><div class='del'>-			param-&gt;value = value;</div><div class='del'>-			param-&gt;next = NULL;</div><div class='del'>-			if (head == NULL)</div><div class='del'>-				head = param;</div><div class='del'>-			if (tail)</div><div class='del'>-				tail-&gt;next = param;</div><div class='del'>-			tail = param;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		last_was_rfc2184 = is_rfc2184;</div><div class='del'>-		</div><div class='del'>-		header_decode_lwsp (&amp;inptr);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (last_was_rfc2184) {</div><div class='del'>-		/* We've finished gathering the values for the last param</div><div class='del'>-		 * so it is now safe to decode it.</div><div class='del'>-		 */</div><div class='del'>-		char *val;</div><div class='del'>-		</div><div class='del'>-		val = rfc2184_decode (tail-&gt;value, strlen (tail-&gt;value));</div><div class='del'>-		if (val) {</div><div class='del'>-			g_free (tail-&gt;value);</div><div class='del'>-			tail-&gt;value = val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*in = inptr;</div><div class='del'>-	</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_param *</div><div class='del'>-header_param_list_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return header_decode_param_list(&amp;in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-header_encode_param (const unsigned char *in, gboolean *encoded)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr = in;</div><div class='del'>-	unsigned char *outbuf = NULL;</div><div class='del'>-	iconv_t cd = (iconv_t) -1;</div><div class='del'>-	const char *charset;</div><div class='del'>-	char *outstr;</div><div class='del'>-	int encoding;</div><div class='del'>-	GString *out;</div><div class='del'>-	</div><div class='del'>-	*encoded = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (in != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (g_utf8_validate (in, -1, NULL), NULL);</div><div class='del'>-	</div><div class='del'>-	/* do a quick us-ascii check (the common case?) */</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		if (*inptr &gt; 127)</div><div class='del'>-			break;</div><div class='del'>-		inptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*inptr == '\0')</div><div class='del'>-		return g_strdup (in);</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	encoding = 0;</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		const char *newinptr;</div><div class='del'>-		gunichar c;</div><div class='del'>-		</div><div class='del'>-		newinptr = g_utf8_next_char (inptr);</div><div class='del'>-		c = g_utf8_get_char (inptr);</div><div class='del'>-		if (newinptr == NULL || !g_unichar_validate (c)) {</div><div class='del'>-			w(g_warning ("Invalid UTF-8 sequence encountered (pos %d, char '%c'): %s",</div><div class='del'>-				     (inptr-in), inptr[0], in));</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (c &gt; 127 &amp;&amp; c &lt; 256) {</div><div class='del'>-			encoding = MAX (encoding, 1);</div><div class='del'>-		} else if (c &gt;= 256) {</div><div class='del'>-			encoding = MAX (encoding, 2);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (encoding == 2)</div><div class='del'>-		charset = camel_charset_best (in, inptr - in);</div><div class='del'>-	else</div><div class='del'>-		charset = "iso-8859-1";</div><div class='del'>-	</div><div class='del'>-	if (strcasecmp (charset, "UTF-8") != 0)</div><div class='del'>-		cd = e_iconv_open (charset, "UTF-8");</div><div class='del'>-	</div><div class='del'>-	if (cd == (iconv_t) -1) {</div><div class='del'>-		charset = "UTF-8";</div><div class='del'>-		inptr = in;</div><div class='del'>-	} else {</div><div class='del'>-		size_t inleft, outleft;</div><div class='del'>-		const char *inbuf;</div><div class='del'>-		char *outptr;</div><div class='del'>-		</div><div class='del'>-		inleft = (inptr - in);</div><div class='del'>-		outleft = inleft * 6 + 16 + 1;</div><div class='del'>-		outptr = outbuf = alloca (outleft);</div><div class='del'>-		inbuf = in;</div><div class='del'>-		</div><div class='del'>-		if (e_iconv (cd, &amp;inbuf, &amp;inleft, &amp;outptr, &amp;outleft) == (size_t) -1) {</div><div class='del'>-			w(g_warning ("Conversion problem: conversion truncated: %s", g_strerror (errno)));</div><div class='del'>-		} else {</div><div class='del'>-			e_iconv (cd, NULL, 0, &amp;outptr, &amp;outleft);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_iconv_close (cd);</div><div class='del'>-		</div><div class='del'>-		*outptr = '\0';</div><div class='del'>-		</div><div class='del'>-		inptr = outbuf;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* FIXME: set the 'language' as well, assuming we can get that info...? */</div><div class='del'>-	out = g_string_new ("");</div><div class='del'>-	g_string_sprintfa (out, "%s''", charset);</div><div class='del'>-	</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		unsigned char c = *inptr++;</div><div class='del'>-		</div><div class='del'>-		/* FIXME: make sure that '\'', '*', and ';' are also encoded */</div><div class='del'>-		</div><div class='del'>-		if (c &gt; 127) {</div><div class='del'>-			g_string_sprintfa (out, "%%%c%c", tohex[(c &gt;&gt; 4) &amp; 0xf], tohex[c &amp; 0xf]);</div><div class='del'>-		} else if (is_lwsp (c) || !(camel_mime_special_table[c] &amp; IS_ESAFE)) {</div><div class='del'>-			g_string_sprintfa (out, "%%%c%c", tohex[(c &gt;&gt; 4) &amp; 0xf], tohex[c &amp; 0xf]);</div><div class='del'>-		} else {</div><div class='del'>-			g_string_append_c (out, c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (outbuf);</div><div class='del'>-	</div><div class='del'>-	outstr = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	*encoded = TRUE;</div><div class='del'>-	</div><div class='del'>-	return outstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_param_list_format_append (GString *out, struct _header_param *p)</div><div class='del'>-{</div><div class='del'>-	int used = out-&gt;len;</div><div class='del'>-	</div><div class='del'>-	while (p) {</div><div class='del'>-		gboolean encoded = FALSE;</div><div class='del'>-		gboolean quote = FALSE;</div><div class='del'>-		int here = out-&gt;len;</div><div class='del'>-		size_t nlen, vlen;</div><div class='del'>-		char *value;</div><div class='del'>-		</div><div class='del'>-		if (!p-&gt;value) {</div><div class='del'>-			p = p-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		value = header_encode_param (p-&gt;value, &amp;encoded);</div><div class='del'>-		if (!value) {</div><div class='del'>-			w(g_warning ("appending parameter %s=%s violates rfc2184", p-&gt;name, p-&gt;value));</div><div class='del'>-			value = g_strdup (p-&gt;value);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (!encoded) {</div><div class='del'>-			char *ch;</div><div class='del'>-			</div><div class='del'>-			for (ch = value; *ch; ch++) {</div><div class='del'>-				if (is_tspecial (*ch) || is_lwsp (*ch))</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			quote = ch &amp;&amp; *ch;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		nlen = strlen (p-&gt;name);</div><div class='del'>-		vlen = strlen (value);</div><div class='del'>-		</div><div class='del'>-		if (used + nlen + vlen &gt; CAMEL_FOLD_SIZE - 8) {</div><div class='del'>-			out = g_string_append (out, ";\n\t");</div><div class='del'>-			here = out-&gt;len;</div><div class='del'>-			used = 0;</div><div class='del'>-		} else</div><div class='del'>-			out = g_string_append (out, "; ");</div><div class='del'>-		</div><div class='del'>-		if (nlen + vlen &gt; CAMEL_FOLD_SIZE - 8) {</div><div class='del'>-			/* we need to do special rfc2184 parameter wrapping */</div><div class='del'>-			int maxlen = CAMEL_FOLD_SIZE - (nlen + 8);</div><div class='del'>-			char *inptr, *inend;</div><div class='del'>-			int i = 0;</div><div class='del'>-			</div><div class='del'>-			inptr = value;</div><div class='del'>-			inend = value + vlen;</div><div class='del'>-			</div><div class='del'>-			while (inptr &lt; inend) {</div><div class='del'>-				char *ptr = inptr + MIN (inend - inptr, maxlen);</div><div class='del'>-				</div><div class='del'>-				if (encoded &amp;&amp; ptr &lt; inend) {</div><div class='del'>-					/* be careful not to break an encoded char (ie %20) */</div><div class='del'>-					char *q = ptr;</div><div class='del'>-					int j = 2;</div><div class='del'>-					</div><div class='del'>-					for ( ; j &gt; 0 &amp;&amp; q &gt; inptr &amp;&amp; *q != '%'; j--, q--);</div><div class='del'>-					if (*q == '%')</div><div class='del'>-						ptr = q;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				if (i != 0) {</div><div class='del'>-					g_string_append (out, ";\n\t");</div><div class='del'>-					here = out-&gt;len;</div><div class='del'>-					used = 0;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				g_string_sprintfa (out, "%s*%d%s=", p-&gt;name, i++, encoded ? "*" : "");</div><div class='del'>-				if (encoded || !quote)</div><div class='del'>-					g_string_append_len (out, inptr, ptr - inptr);</div><div class='del'>-				else</div><div class='del'>-					quote_word (out, TRUE, inptr, ptr - inptr);</div><div class='del'>-				</div><div class='del'>-				d(printf ("wrote: %s\n", out-&gt;str + here));</div><div class='del'>-				</div><div class='del'>-				used += (out-&gt;len - here);</div><div class='del'>-				</div><div class='del'>-				inptr = ptr;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			g_string_sprintfa (out, "%s%s=", p-&gt;name, encoded ? "*" : "");</div><div class='del'>-			</div><div class='del'>-			if (encoded || !quote)</div><div class='del'>-				g_string_append (out, value);</div><div class='del'>-			else</div><div class='del'>-				quote_word (out, TRUE, value, vlen);</div><div class='del'>-			</div><div class='del'>-			used += (out-&gt;len - here);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (value);</div><div class='del'>-		</div><div class='del'>-		p = p-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_param_list_format(struct _header_param *p)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	header_param_list_format_append(out, p);</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_content_type *</div><div class='del'>-header_content_type_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	char *type, *subtype = NULL;</div><div class='del'>-	struct _header_content_type *t = NULL;</div><div class='del'>-</div><div class='del'>-	if (in==NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	type = decode_token(&amp;inptr);</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (type) {</div><div class='del'>-		if  (*inptr == '/') {</div><div class='del'>-			inptr++;</div><div class='del'>-			subtype = decode_token(&amp;inptr);</div><div class='del'>-		}</div><div class='del'>-		if (subtype == NULL &amp;&amp; (!strcasecmp(type, "text"))) {</div><div class='del'>-			w(g_warning("text type with no subtype, resorting to text/plain: %s", in));</div><div class='del'>-			subtype = g_strdup("plain");</div><div class='del'>-		}</div><div class='del'>-		if (subtype == NULL) {</div><div class='del'>-			w(g_warning("MIME type with no subtype: %s", in));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		t = header_content_type_new(type, subtype);</div><div class='del'>-		t-&gt;params = header_decode_param_list(&amp;inptr);</div><div class='del'>-		g_free(type);</div><div class='del'>-		g_free(subtype);</div><div class='del'>-	} else {</div><div class='del'>-		g_free(type);</div><div class='del'>-		d(printf("cannot find MIME type in header (2) '%s'", in));</div><div class='del'>-	}</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_dump(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *p;</div><div class='del'>-</div><div class='del'>-	printf("Content-Type: ");</div><div class='del'>-	if (ct==NULL) {</div><div class='del'>-		printf("&lt;NULL&gt;\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	printf("%s / %s", ct-&gt;type, ct-&gt;subtype);</div><div class='del'>-	p = ct-&gt;params;</div><div class='del'>-	if (p) {</div><div class='del'>-		while (p) {</div><div class='del'>-			printf(";\n\t%s=\"%s\"", p-&gt;name, p-&gt;value);</div><div class='del'>-			p = p-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printf("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_content_type_format(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	if (ct==NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	if (ct-&gt;type == NULL) {</div><div class='del'>-		g_string_sprintfa(out, "text/plain");</div><div class='del'>-		w(g_warning("Content-Type with no main type"));</div><div class='del'>-	} else if (ct-&gt;subtype == NULL) {</div><div class='del'>-		w(g_warning("Content-Type with no sub type: %s", ct-&gt;type));</div><div class='del'>-		if (!strcasecmp(ct-&gt;type, "multipart"))</div><div class='del'>-			g_string_sprintfa(out, "%s/mixed", ct-&gt;type);</div><div class='del'>-		else</div><div class='del'>-			g_string_sprintfa(out, "%s", ct-&gt;type);</div><div class='del'>-	} else {</div><div class='del'>-		g_string_sprintfa(out, "%s/%s", ct-&gt;type, ct-&gt;subtype);</div><div class='del'>-	}</div><div class='del'>-	header_param_list_format_append(out, ct-&gt;params);</div><div class='del'>-</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_content_type_simple (struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	if (ct-&gt;type == NULL) {</div><div class='del'>-		w(g_warning ("Content-Type with no main type"));</div><div class='del'>-		return g_strdup ("text/plain");</div><div class='del'>-	} else if (ct-&gt;subtype == NULL) {</div><div class='del'>-		w(g_warning ("Content-Type with no sub type: %s", ct-&gt;type));</div><div class='del'>-		if (!strcasecmp (ct-&gt;type, "multipart"))</div><div class='del'>-			return g_strdup_printf ("%s/mixed", ct-&gt;type);</div><div class='del'>-		else</div><div class='del'>-			return g_strdup (ct-&gt;type);</div><div class='del'>-	} else</div><div class='del'>-		return g_strdup_printf ("%s/%s", ct-&gt;type, ct-&gt;subtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_content_encoding_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in)</div><div class='del'>-		return decode_token(&amp;in);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeDisposition *</div><div class='del'>-header_disposition_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	CamelMimeDisposition *d = NULL;</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	d = g_malloc(sizeof(*d));</div><div class='del'>-	d-&gt;refcount = 1;</div><div class='del'>-	d-&gt;disposition = decode_token(&amp;inptr);</div><div class='del'>-	if (d-&gt;disposition == NULL)</div><div class='del'>-		w(g_warning("Empty disposition type"));</div><div class='del'>-	d-&gt;params = header_decode_param_list(&amp;inptr);</div><div class='del'>-	return d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_disposition_ref(CamelMimeDisposition *d)</div><div class='del'>-{</div><div class='del'>-	if (d)</div><div class='del'>-		d-&gt;refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_disposition_unref(CamelMimeDisposition *d)</div><div class='del'>-{</div><div class='del'>-	if (d) {</div><div class='del'>-		if (d-&gt;refcount&lt;=1) {</div><div class='del'>-			header_param_list_free(d-&gt;params);</div><div class='del'>-			g_free(d-&gt;disposition);</div><div class='del'>-			g_free(d);</div><div class='del'>-		} else {</div><div class='del'>-			d-&gt;refcount--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_disposition_format(CamelMimeDisposition *d)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	if (d==NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	if (d-&gt;disposition)</div><div class='del'>-		out = g_string_append(out, d-&gt;disposition);</div><div class='del'>-	else</div><div class='del'>-		out = g_string_append(out, "attachment");</div><div class='del'>-	header_param_list_format_append(out, d-&gt;params);</div><div class='del'>-</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* hrm, is there a library for this shit? */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	int offset;</div><div class='del'>-} tz_offsets [] = {</div><div class='del'>-	{ "UT", 0 },</div><div class='del'>-	{ "GMT", 0 },</div><div class='del'>-	{ "EST", -500 },	/* these are all US timezones.  bloody yanks */</div><div class='del'>-	{ "EDT", -400 },</div><div class='del'>-	{ "CST", -600 },</div><div class='del'>-	{ "CDT", -500 },</div><div class='del'>-	{ "MST", -700 },</div><div class='del'>-	{ "MDT", -600 },</div><div class='del'>-	{ "PST", -800 },</div><div class='del'>-	{ "PDT", -700 },</div><div class='del'>-	{ "Z", 0 },</div><div class='del'>-	{ "A", -100 },</div><div class='del'>-	{ "M", -1200 },</div><div class='del'>-	{ "N", 100 },</div><div class='del'>-	{ "Y", 1200 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tz_months [] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_format_date(time_t time, int offset)</div><div class='del'>-{</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	d(printf("offset = %d\n", offset));</div><div class='del'>-</div><div class='del'>-	d(printf("converting date %s", ctime(&amp;time)));</div><div class='del'>-</div><div class='del'>-	time += ((offset / 100) * (60*60)) + (offset % 100)*60;</div><div class='del'>-</div><div class='del'>-	d(printf("converting date %s", ctime(&amp;time)));</div><div class='del'>-</div><div class='del'>-	memcpy(&amp;tm, gmtime(&amp;time), sizeof(tm));</div><div class='del'>-</div><div class='del'>-	return g_strdup_printf("%02d %s %04d %02d:%02d:%02d %+05d",</div><div class='del'>-			       tm.tm_mday, tz_months[tm.tm_mon],</div><div class='del'>-			       tm.tm_year + 1900,</div><div class='del'>-			       tm.tm_hour, tm.tm_min, tm.tm_sec,</div><div class='del'>-			       offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* convert a date to time_t representation */</div><div class='del'>-/* this is an awful mess oh well */</div><div class='del'>-time_t</div><div class='del'>-header_decode_date(const char *in, int *saveoffset)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	char *monthname;</div><div class='del'>-	int year, offset = 0;</div><div class='del'>-	struct tm tm;</div><div class='del'>-	int i;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	if (in == NULL) {</div><div class='del'>-		if (saveoffset)</div><div class='del'>-			*saveoffset = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf ("\ndecoding date '%s'\n", inptr));</div><div class='del'>-</div><div class='del'>-	memset (&amp;tm, 0, sizeof(tm));</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp (&amp;inptr);</div><div class='del'>-	if (!isdigit (*inptr)) {</div><div class='del'>-		char *day = decode_token (&amp;inptr);</div><div class='del'>-		/* we dont really care about the day, it's only for display */</div><div class='del'>-		if (day) {</div><div class='del'>-			d(printf ("got day: %s\n", day));</div><div class='del'>-			g_free (day);</div><div class='del'>-			header_decode_lwsp (&amp;inptr);</div><div class='del'>-			if (*inptr == ',') {</div><div class='del'>-				inptr++;</div><div class='del'>-			} else {</div><div class='del'>-#ifndef CLEAN_DATE</div><div class='del'>-				return parse_broken_date (in, saveoffset);</div><div class='del'>-#else</div><div class='del'>-				if (saveoffset)</div><div class='del'>-					*saveoffset = 0;</div><div class='del'>-				return 0;</div><div class='del'>-#endif /* ! CLEAN_DATE */</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	tm.tm_mday = header_decode_int(&amp;inptr);</div><div class='del'>-	monthname = decode_token(&amp;inptr);</div><div class='del'>-	if (monthname) {</div><div class='del'>-		for (i=0;i&lt;sizeof(tz_months)/sizeof(tz_months[0]);i++) {</div><div class='del'>-			if (!strcasecmp(tz_months[i], monthname)) {</div><div class='del'>-				tm.tm_mon = i;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free(monthname);</div><div class='del'>-	}</div><div class='del'>-	year = header_decode_int(&amp;inptr);</div><div class='del'>-	if (year &lt; 69) {</div><div class='del'>-		tm.tm_year = 100 + year;</div><div class='del'>-	} else if (year &lt; 100) {</div><div class='del'>-		tm.tm_year = year;</div><div class='del'>-	} else if (year &gt;= 100 &amp;&amp; year &lt; 1900) {</div><div class='del'>-		tm.tm_year = year;</div><div class='del'>-	} else {</div><div class='del'>-		tm.tm_year = year - 1900;</div><div class='del'>-	}</div><div class='del'>-	/* get the time ... yurck */</div><div class='del'>-	tm.tm_hour = header_decode_int(&amp;inptr);</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == ':')</div><div class='del'>-		inptr++;</div><div class='del'>-	tm.tm_min = header_decode_int(&amp;inptr);</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == ':')</div><div class='del'>-		inptr++;</div><div class='del'>-	tm.tm_sec = header_decode_int(&amp;inptr);</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	if (*inptr == '+'</div><div class='del'>-	    || *inptr == '-') {</div><div class='del'>-		offset = (*inptr++)=='-'?-1:1;</div><div class='del'>-		offset = offset * header_decode_int(&amp;inptr);</div><div class='del'>-		d(printf("abs signed offset = %d\n", offset));</div><div class='del'>-	} else if (isdigit(*inptr)) {</div><div class='del'>-		offset = header_decode_int(&amp;inptr);</div><div class='del'>-		d(printf("abs offset = %d\n", offset));</div><div class='del'>-	} else {</div><div class='del'>-		char *tz = decode_token(&amp;inptr);</div><div class='del'>-</div><div class='del'>-		if (tz) {</div><div class='del'>-			for (i=0;i&lt;sizeof(tz_offsets)/sizeof(tz_offsets[0]);i++) {</div><div class='del'>-				if (!strcasecmp(tz_offsets[i].name, tz)) {</div><div class='del'>-					offset = tz_offsets[i].offset;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free(tz);</div><div class='del'>-		}</div><div class='del'>-		/* some broken mailers seem to put in things like GMT+1030 instead of just +1030 */</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == '+' || *inptr == '-') {</div><div class='del'>-			int sign = (*inptr++)=='-'?-1:1;</div><div class='del'>-			offset = offset + (header_decode_int(&amp;inptr)*sign);</div><div class='del'>-		}</div><div class='del'>-		d(printf("named offset = %d\n", offset));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t = mktime(&amp;tm);</div><div class='del'>-#if defined(HAVE_TIMEZONE)</div><div class='del'>-	t -= timezone;</div><div class='del'>-#elif defined(HAVE_TM_GMTOFF)</div><div class='del'>-	t += tm.tm_gmtoff;</div><div class='del'>-#else</div><div class='del'>-#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* t is now GMT of the time we want, but not offset by the timezone ... */</div><div class='del'>-</div><div class='del'>-	d(printf(" gmt normalized? = %s\n", ctime(&amp;t)));</div><div class='del'>-</div><div class='del'>-	/* this should convert the time to the GMT equiv time */</div><div class='del'>-	t -= ( (offset/100) * 60*60) + (offset % 100)*60;</div><div class='del'>-</div><div class='del'>-	d(printf(" gmt normalized for timezone? = %s\n", ctime(&amp;t)));</div><div class='del'>-</div><div class='del'>-	d({</div><div class='del'>-		char *tmp;</div><div class='del'>-		tmp = header_format_date(t, offset);</div><div class='del'>-		printf(" encoded again: %s\n", tmp);</div><div class='del'>-		g_free(tmp);</div><div class='del'>-	});</div><div class='del'>-</div><div class='del'>-	if (saveoffset)</div><div class='del'>-		*saveoffset = offset;</div><div class='del'>-</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_location_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	/* Sigh. RFC2557 says:</div><div class='del'>-	 *   content-location =   "Content-Location:" [CFWS] URI [CFWS]</div><div class='del'>-	 *      where URI is restricted to the syntax for URLs as</div><div class='del'>-	 *      defined in Uniform Resource Locators [URL] until</div><div class='del'>-	 *      IETF specifies other kinds of URIs.</div><div class='del'>-	 *</div><div class='del'>-	 * But Netscape puts quotes around the URI when sending web</div><div class='del'>-	 * pages.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	header_decode_lwsp(&amp;in);</div><div class='del'>-	if (*in == '"')</div><div class='del'>-		return header_decode_quoted_string(&amp;in);</div><div class='del'>-	else {</div><div class='del'>-		for (p = in; *p &amp;&amp; !is_lwsp(*p); p++)</div><div class='del'>-			;</div><div class='del'>-		return g_strndup(in, p - in);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* extra rfc checks */</div><div class='del'>-#define CHECKS</div><div class='del'>-</div><div class='del'>-#ifdef CHECKS</div><div class='del'>-static void</div><div class='del'>-check_header(struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	unsigned char *p;</div><div class='del'>-</div><div class='del'>-	p = h-&gt;value;</div><div class='del'>-	while (p &amp;&amp; *p) {</div><div class='del'>-		if (!isascii(*p)) {</div><div class='del'>-			w(g_warning("Appending header violates rfc: %s: %s", h-&gt;name, h-&gt;value));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_append_parse(struct _header_raw **list, const char *header, int offset)</div><div class='del'>-{</div><div class='del'>-	register const char *in;</div><div class='del'>-	size_t fieldlen;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	in = header;</div><div class='del'>-	while (is_fieldname(*in) || *in==':')</div><div class='del'>-		in++;</div><div class='del'>-	fieldlen = in-header-1;</div><div class='del'>-	while (is_lwsp(*in))</div><div class='del'>-		in++;</div><div class='del'>-	if (fieldlen == 0 || header[fieldlen] != ':') {</div><div class='del'>-		printf("Invalid header line: '%s'\n", header);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	name = alloca(fieldlen+1);</div><div class='del'>-	memcpy(name, header, fieldlen);</div><div class='del'>-	name[fieldlen] = 0;</div><div class='del'>-</div><div class='del'>-	header_raw_append(list, name, in, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *n;</div><div class='del'>-</div><div class='del'>-	d(printf("Header: %s: %s\n", name, value));</div><div class='del'>-</div><div class='del'>-	n = g_malloc(sizeof(*n));</div><div class='del'>-	n-&gt;next = NULL;</div><div class='del'>-	n-&gt;name = g_strdup(name);</div><div class='del'>-	n-&gt;value = g_strdup(value);</div><div class='del'>-	n-&gt;offset = offset;</div><div class='del'>-#ifdef CHECKS</div><div class='del'>-	check_header(n);</div><div class='del'>-#endif</div><div class='del'>-	l = (struct _header_raw *)list;</div><div class='del'>-	while (l-&gt;next) {</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	l-&gt;next = n;</div><div class='del'>-</div><div class='del'>-	/* debug */</div><div class='del'>-#if 0</div><div class='del'>-	if (!strcasecmp(name, "To")) {</div><div class='del'>-		printf("- Decoding To\n");</div><div class='del'>-		header_to_decode(value);</div><div class='del'>-	} else if (!strcasecmp(name, "Content-type")) {</div><div class='del'>-		printf("- Decoding content-type\n");</div><div class='del'>-		header_content_type_dump(header_content_type_decode(value));		</div><div class='del'>-	} else if (!strcasecmp(name, "MIME-Version")) {</div><div class='del'>-		printf("- Decoding mime version\n");</div><div class='del'>-		header_mime_decode(value);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_raw *</div><div class='del'>-header_raw_find_node(struct _header_raw **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		if (!strcasecmp(l-&gt;name, name))</div><div class='del'>-			break;</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-header_raw_find(struct _header_raw **list, const char *name, int *offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	l = header_raw_find_node(list, name);</div><div class='del'>-	if (l) {</div><div class='del'>-		if (offset)</div><div class='del'>-			*offset = l-&gt;offset;</div><div class='del'>-		return l-&gt;value;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	if (last == NULL || name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l &amp;&amp; l-&gt;value != last)</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	return header_raw_find(&amp;l, name, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_raw_free(struct _header_raw *l)</div><div class='del'>-{</div><div class='del'>-	g_free(l-&gt;name);</div><div class='del'>-	g_free(l-&gt;value);</div><div class='del'>-	g_free(l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_remove(struct _header_raw **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *p;</div><div class='del'>-</div><div class='del'>-	/* the next pointer is at the head of the structure, so this is safe */</div><div class='del'>-	p = (struct _header_raw *)list;</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		if (!strcasecmp(l-&gt;name, name)) {</div><div class='del'>-			p-&gt;next = l-&gt;next;</div><div class='del'>-			header_raw_free(l);</div><div class='del'>-			l = p-&gt;next;</div><div class='del'>-		} else {</div><div class='del'>-			p = l;</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset)</div><div class='del'>-{</div><div class='del'>-	header_raw_remove(list, name);</div><div class='del'>-	header_raw_append(list, name, value, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_clear(struct _header_raw **list)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *n;</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		n = l-&gt;next;</div><div class='del'>-		header_raw_free(l);</div><div class='del'>-		l = n;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_msgid_generate (void)</div><div class='del'>-{</div><div class='del'>-	char host[MAXHOSTNAMELEN];</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	static pthread_mutex_t count_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#define COUNT_LOCK() pthread_mutex_lock (&amp;count_lock)</div><div class='del'>-#define COUNT_UNLOCK() pthread_mutex_unlock (&amp;count_lock)</div><div class='del'>-#else</div><div class='del'>-#define COUNT_LOCK()</div><div class='del'>-#define COUNT_UNLOCK()</div><div class='del'>-#endif /* ENABLE_THREADS */</div><div class='del'>-	static int count = 0;</div><div class='del'>-	int hrv;</div><div class='del'>-	char *ret;</div><div class='del'>-	</div><div class='del'>-	hrv = gethostname (host, sizeof (host));</div><div class='del'>-	</div><div class='del'>-	COUNT_LOCK ();</div><div class='del'>-	ret = g_strdup_printf ("%d.%d.%d.camel@%s", (gint) time (NULL), getpid (), count++,</div><div class='del'>-			       (hrv == 0 &amp;&amp; host &amp;&amp; *host) ? host : "unknown.host");</div><div class='del'>-	COUNT_UNLOCK ();</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	char *pattern;</div><div class='del'>-	regex_t regex;</div><div class='del'>-} mail_list_magic[] = {</div><div class='del'>-	/* X-Mailing-List: &lt;gnome-hackers@gnome.org&gt; arcive/latest/100 */</div><div class='del'>-	/* X-Mailing-List: gnome-hackers@gnome.org */</div><div class='del'>-	/* X-Mailing-List: gnome-hackers */</div><div class='del'>-	/* X-Mailing-List: &lt;gnome-hackers&gt; */</div><div class='del'>-	{ "X-Mailing-List", " &lt;?([^@&gt;]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* X-Loop: gnome-hackers@gnome.org */</div><div class='del'>-	{ "X-Loop", " *([^@]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* List-Id: GNOME stuff &lt;gnome-hackers.gnome.org&gt; */</div><div class='del'>-	/* List-Id: &lt;gnome-hackers.gnome.org&gt; */</div><div class='del'>-	/* List-Id: &lt;gnome-hackers&gt; */</div><div class='del'>-	/* This old one wasn't very useful: { "List-Id", " *([^&lt;]+)" },*/</div><div class='del'>-	{ "List-Id", "[^&lt;]*&lt;([^\\.&gt;]+)\\.?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* List-Post: &lt;mailto:gnome-hackers@gnome.org&gt; */</div><div class='del'>-	/* List-Post: &lt;mailto:gnome-hackers&gt; */</div><div class='del'>-	{ "List-Post", " *&lt;mailto:([^@&gt;]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* Mailing-List: list gnome-hackers@gnome.org; contact gnome-hackers-owner@gnome.org */</div><div class='del'>-	{ "Mailing-List", " *list ([^@]+)@?([^ \n\t\r&gt;;])*" },</div><div class='del'>-	/* Originator: gnome-hackers@gnome.org */</div><div class='del'>-	{ "Originator", " *([^@]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* X-List: gnome-hackers */</div><div class='del'>-	/* X-List: gnome-hackers@gnome.org */</div><div class='del'>-	{ "X-List", " *([^@]+)@?([^ \n\t\r&gt;]*)" },	</div><div class='del'>-	/* Sender: owner-gnome-hackers@gnome.org */</div><div class='del'>-	/* Sender: owner-gnome-hacekrs */</div><div class='del'>-	{ "Sender", " *owner-([^@]+)@?([^ @\n\t\r&gt;]*)" },</div><div class='del'>-	/* Sender: gnome-hackers-owner@gnome.org */</div><div class='del'>-	/* Sender: gnome-hackers-owner */</div><div class='del'>-	{ "Sender", " *([^@]+)-owner@?([^ @\n\t\r&gt;]*)" },</div><div class='del'>-	/* Delivered-To: mailing list gnome-hackers@gnome.org */</div><div class='del'>-	/* Delivered-To: mailing list gnome-hackers */</div><div class='del'>-	{ "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* Sender: owner-gnome-hackers@gnome.org */</div><div class='del'>-	/* Sender: &lt;owner-gnome-hackers@gnome.org&gt; */</div><div class='del'>-	/* Sender: owner-gnome-hackers */</div><div class='del'>-	/* Sender: &lt;owner-gnome-hackers&gt; */</div><div class='del'>-	{ "Return-Path", " &lt;?owner-([^@&gt;]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-	/* X-BeenThere: gnome-hackers@gnome.org */</div><div class='del'>-	/* X-BeenThere: gnome-hackers */</div><div class='del'>-	{ "X-BeenThere", " *([^@]+)@?([^ \n\t\r&gt;]*)" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_raw_check_mailing_list(struct _header_raw **list)</div><div class='del'>-{</div><div class='del'>-	const char *v;</div><div class='del'>-	regmatch_t match[3];</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; sizeof (mail_list_magic) / sizeof (mail_list_magic[0]); i++) {</div><div class='del'>-		v = header_raw_find (list, mail_list_magic[i].name, NULL);</div><div class='del'>-		if (v != NULL &amp;&amp; regexec (&amp;mail_list_magic[i].regex, v, 3, match, 0) == 0 &amp;&amp; match[1].rm_so != -1) {</div><div class='del'>-			char *list;</div><div class='del'>-			int len1, len2;</div><div class='del'>-</div><div class='del'>-			len1 = match[1].rm_eo - match[1].rm_so;</div><div class='del'>-			len2 = match[2].rm_eo - match[2].rm_so;</div><div class='del'>-</div><div class='del'>-			list = g_malloc(len1+len2+2);</div><div class='del'>-			memcpy(list, v + match[1].rm_so, len1);</div><div class='del'>-			if (len2) {</div><div class='del'>-				list[len1] = '@';</div><div class='del'>-				memcpy(list+len1+1, v+match[2].rm_so, len2);</div><div class='del'>-				list[len1+len2+1]=0;</div><div class='del'>-			} else {</div><div class='del'>-				list[len1] = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			return list;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ok, here's the address stuff, what a mess ... */</div><div class='del'>-struct _header_address *header_address_new(void)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *h;</div><div class='del'>-	h = g_malloc0(sizeof(*h));</div><div class='del'>-	h-&gt;type = HEADER_ADDRESS_NONE;</div><div class='del'>-	h-&gt;refcount = 1;</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *header_address_new_name(const char *name, const char *addr)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *h;</div><div class='del'>-</div><div class='del'>-	h = header_address_new();</div><div class='del'>-	h-&gt;type = HEADER_ADDRESS_NAME;</div><div class='del'>-	h-&gt;name = g_strdup(name);</div><div class='del'>-	h-&gt;v.addr = g_strdup(addr);</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *header_address_new_group(const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *h;</div><div class='del'>-</div><div class='del'>-	h = header_address_new();</div><div class='del'>-	h-&gt;type = HEADER_ADDRESS_GROUP;</div><div class='del'>-	h-&gt;name = g_strdup(name);</div><div class='del'>-	return h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_ref(struct _header_address *h)</div><div class='del'>-{</div><div class='del'>-	if (h)</div><div class='del'>-		h-&gt;refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_unref(struct _header_address *h)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		if (h-&gt;refcount &lt;= 1) {</div><div class='del'>-			if (h-&gt;type == HEADER_ADDRESS_GROUP) {</div><div class='del'>-				header_address_list_clear(&amp;h-&gt;v.members);</div><div class='del'>-			} else if (h-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				g_free(h-&gt;v.addr);</div><div class='del'>-			}</div><div class='del'>-			g_free(h-&gt;name);</div><div class='del'>-			g_free(h);</div><div class='del'>-		} else {</div><div class='del'>-			h-&gt;refcount--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_set_name(struct _header_address *h, const char *name)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		g_free(h-&gt;name);</div><div class='del'>-		h-&gt;name = g_strdup(name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_set_addr(struct _header_address *h, const char *addr)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		if (h-&gt;type == HEADER_ADDRESS_NAME</div><div class='del'>-		    || h-&gt;type == HEADER_ADDRESS_NONE) {</div><div class='del'>-			h-&gt;type = HEADER_ADDRESS_NAME;</div><div class='del'>-			g_free(h-&gt;v.addr);</div><div class='del'>-			h-&gt;v.addr = g_strdup(addr);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Trying to set the address on a group");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_set_members(struct _header_address *h, struct _header_address *group)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		if (h-&gt;type == HEADER_ADDRESS_GROUP</div><div class='del'>-		    || h-&gt;type == HEADER_ADDRESS_NONE) {</div><div class='del'>-			h-&gt;type = HEADER_ADDRESS_GROUP;</div><div class='del'>-			header_address_list_clear(&amp;h-&gt;v.members);</div><div class='del'>-			/* should this ref them? */</div><div class='del'>-			h-&gt;v.members = group;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Trying to set the members on a name, not group");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_add_member(struct _header_address *h, struct _header_address *member)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		if (h-&gt;type == HEADER_ADDRESS_GROUP</div><div class='del'>-		    || h-&gt;type == HEADER_ADDRESS_NONE) {</div><div class='del'>-			h-&gt;type = HEADER_ADDRESS_GROUP;</div><div class='del'>-			header_address_list_append(&amp;h-&gt;v.members, member);</div><div class='del'>-		}		    </div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_list_append_list(struct _header_address **l, struct _header_address **h)</div><div class='del'>-{</div><div class='del'>-	if (l) {</div><div class='del'>-		struct _header_address *n = (struct _header_address *)l;</div><div class='del'>-</div><div class='del'>-		while (n-&gt;next)</div><div class='del'>-			n = n-&gt;next;</div><div class='del'>-		n-&gt;next = *h;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void header_address_list_append(struct _header_address **l, struct _header_address *h)</div><div class='del'>-{</div><div class='del'>-	if (h) {</div><div class='del'>-		header_address_list_append_list(l, &amp;h);</div><div class='del'>-		h-&gt;next = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void header_address_list_clear(struct _header_address **l)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *a, *n;</div><div class='del'>-	a = *l;</div><div class='del'>-	while (a) {</div><div class='del'>-		n = a-&gt;next;</div><div class='del'>-		header_address_unref(a);</div><div class='del'>-		a = n;</div><div class='del'>-	}</div><div class='del'>-	*l = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* if encode is true, then the result is suitable for mailing, otherwise</div><div class='del'>-   the result is suitable for display only (and may not even be re-parsable) */</div><div class='del'>-static void</div><div class='del'>-header_address_list_encode_append(GString *out, int encode, struct _header_address *a)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	while (a) {</div><div class='del'>-		switch (a-&gt;type) {</div><div class='del'>-		case HEADER_ADDRESS_NAME:</div><div class='del'>-			if (encode)</div><div class='del'>-				text = header_encode_phrase (a-&gt;name);</div><div class='del'>-			else</div><div class='del'>-				text = a-&gt;name;</div><div class='del'>-			if (text &amp;&amp; *text)</div><div class='del'>-				g_string_sprintfa(out, "%s &lt;%s&gt;", text, a-&gt;v.addr);</div><div class='del'>-			else</div><div class='del'>-				g_string_append(out, a-&gt;v.addr);</div><div class='del'>-			if (encode)</div><div class='del'>-				g_free(text);</div><div class='del'>-			break;</div><div class='del'>-		case HEADER_ADDRESS_GROUP:</div><div class='del'>-			if (encode)</div><div class='del'>-				text = header_encode_phrase(a-&gt;name);</div><div class='del'>-			else</div><div class='del'>-				text = a-&gt;name;</div><div class='del'>-			g_string_sprintfa(out, "%s: ", text);</div><div class='del'>-			header_address_list_encode_append(out, encode, a-&gt;v.members);</div><div class='del'>-			g_string_sprintfa(out, ";");</div><div class='del'>-			if (encode)</div><div class='del'>-				g_free(text);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			g_warning("Invalid address type");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		a = a-&gt;next;</div><div class='del'>-		if (a)</div><div class='del'>-			g_string_append(out, ", ");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_address_list_encode(struct _header_address *a)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	if (a == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-</div><div class='del'>-	header_address_list_encode_append(out, TRUE, a);</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_address_list_format(struct _header_address *a)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	if (a == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-</div><div class='del'>-	header_address_list_encode_append(out, FALSE, a);</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_address_fold (const char *in, size_t headerlen)</div><div class='del'>-{</div><div class='del'>-	size_t len, outlen;</div><div class='del'>-	const char *inptr = in, *space, *p, *n;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-	int i, needunfold = FALSE;</div><div class='del'>-	</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* first, check to see if we even need to fold */</div><div class='del'>-	len = headerlen + 2;</div><div class='del'>-	p = in;</div><div class='del'>-	while (*p) {</div><div class='del'>-		n = strchr (p, '\n');</div><div class='del'>-		if (n == NULL) {</div><div class='del'>-			len += strlen (p);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		needunfold = TRUE;</div><div class='del'>-		len += n-p;</div><div class='del'>-		</div><div class='del'>-		if (len &gt;= CAMEL_FOLD_SIZE)</div><div class='del'>-			break;</div><div class='del'>-		len = 0;</div><div class='del'>-		p = n + 1;</div><div class='del'>-	}</div><div class='del'>-	if (len &lt; CAMEL_FOLD_SIZE)</div><div class='del'>-		return g_strdup (in);</div><div class='del'>-	</div><div class='del'>-	/* we need to fold, so first unfold (if we need to), then process */</div><div class='del'>-	if (needunfold)</div><div class='del'>-		inptr = in = header_unfold (in);</div><div class='del'>-	</div><div class='del'>-	out = g_string_new ("");</div><div class='del'>-	outlen = headerlen + 2;</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		space = strchr (inptr, ' ');</div><div class='del'>-		if (space) {</div><div class='del'>-			len = space - inptr + 1;</div><div class='del'>-		} else {</div><div class='del'>-			len = strlen (inptr);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		d(printf("next word '%.*s'\n", len, inptr));</div><div class='del'>-		</div><div class='del'>-		if (outlen + len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-			d(printf("outlen = %d wordlen = %d\n", outlen, len));</div><div class='del'>-			/* strip trailing space */</div><div class='del'>-			if (out-&gt;len &gt; 0 &amp;&amp; out-&gt;str[out-&gt;len-1] == ' ')</div><div class='del'>-				g_string_truncate (out, out-&gt;len-1);</div><div class='del'>-			g_string_append (out, "\n\t");</div><div class='del'>-			outlen = 1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		outlen += len;</div><div class='del'>-		for (i = 0; i &lt; len; i++) {</div><div class='del'>-			g_string_append_c (out, inptr[i]);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		inptr += len;</div><div class='del'>-	}</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	</div><div class='del'>-	if (needunfold)</div><div class='del'>-		g_free ((char *)in);</div><div class='del'>-	</div><div class='del'>-	return ret;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* simple header folding */</div><div class='del'>-/* will work even if the header is already folded */</div><div class='del'>-char *</div><div class='del'>-header_fold(const char *in, size_t headerlen)</div><div class='del'>-{</div><div class='del'>-	size_t len, outlen, i;</div><div class='del'>-	const char *inptr = in, *space, *p, *n;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-	int needunfold = FALSE;</div><div class='del'>-</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* first, check to see if we even need to fold */</div><div class='del'>-	len = headerlen + 2;</div><div class='del'>-	p = in;</div><div class='del'>-	while (*p) {</div><div class='del'>-		n = strchr(p, '\n');</div><div class='del'>-		if (n == NULL) {</div><div class='del'>-			len += strlen (p);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		needunfold = TRUE;</div><div class='del'>-		len += n-p;</div><div class='del'>-		</div><div class='del'>-		if (len &gt;= CAMEL_FOLD_SIZE)</div><div class='del'>-			break;</div><div class='del'>-		len = 0;</div><div class='del'>-		p = n + 1;</div><div class='del'>-	}</div><div class='del'>-	if (len &lt; CAMEL_FOLD_SIZE)</div><div class='del'>-		return g_strdup(in);</div><div class='del'>-</div><div class='del'>-	/* we need to fold, so first unfold (if we need to), then process */</div><div class='del'>-	if (needunfold)</div><div class='del'>-		inptr = in = header_unfold(in);</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	outlen = headerlen+2;</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		space = strchr(inptr, ' ');</div><div class='del'>-		if (space) {</div><div class='del'>-			len = space-inptr+1;</div><div class='del'>-		} else {</div><div class='del'>-			len = strlen(inptr);</div><div class='del'>-		}</div><div class='del'>-		d(printf("next word '%.*s'\n", len, inptr));</div><div class='del'>-		if (outlen + len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-			d(printf("outlen = %d wordlen = %d\n", outlen, len));</div><div class='del'>-			/* strip trailing space */</div><div class='del'>-			if (out-&gt;len &gt; 0 &amp;&amp; out-&gt;str[out-&gt;len-1] == ' ')</div><div class='del'>-				g_string_truncate(out, out-&gt;len-1);</div><div class='del'>-			g_string_append(out, "\n\t");</div><div class='del'>-			outlen = 1;</div><div class='del'>-			/* check for very long words, just cut them up */</div><div class='del'>-			while (outlen+len &gt; CAMEL_FOLD_MAX_SIZE) {</div><div class='del'>-				for (i=0;i&lt;CAMEL_FOLD_MAX_SIZE-outlen;i++)</div><div class='del'>-					g_string_append_c(out, inptr[i]);</div><div class='del'>-				inptr += CAMEL_FOLD_MAX_SIZE-outlen;</div><div class='del'>-				len -= CAMEL_FOLD_MAX_SIZE-outlen;</div><div class='del'>-				g_string_append(out, "\n\t");</div><div class='del'>-				outlen = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		outlen += len;</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			g_string_append_c(out, inptr[i]);</div><div class='del'>-		}</div><div class='del'>-		inptr += len;</div><div class='del'>-	}</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-</div><div class='del'>-	if (needunfold)</div><div class='del'>-		g_free((char *)in);</div><div class='del'>-</div><div class='del'>-	return ret;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_unfold(const char *in)</div><div class='del'>-{</div><div class='del'>-	char *out = g_malloc(strlen(in)+1);</div><div class='del'>-	const char *inptr = in;</div><div class='del'>-	char c, *o = out;</div><div class='del'>-</div><div class='del'>-	o = out;</div><div class='del'>-	while ((c = *inptr++)) {</div><div class='del'>-		if (c == '\n') {</div><div class='del'>-			if (is_lwsp(*inptr)) {</div><div class='del'>-				do {</div><div class='del'>-					inptr++;</div><div class='del'>-				} while (is_lwsp(*inptr));</div><div class='del'>-				*o++ = ' ';</div><div class='del'>-			} else {</div><div class='del'>-				*o++ = c;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*o++ = c;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*o = 0;</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_utils_init(void)</div><div class='del'>-{</div><div class='del'>-	int i, errcode, regex_compilation_failed=0;</div><div class='del'>-</div><div class='del'>-	/* Init tables */</div><div class='del'>-	header_decode_init();</div><div class='del'>-	base64_init();</div><div class='del'>-</div><div class='del'>-	/* precompile regex's for speed at runtime */</div><div class='del'>-	for (i = 0; i &lt; sizeof(mail_list_magic) / sizeof(mail_list_magic[0]); i++) {</div><div class='del'>-		errcode = regcomp(&amp;mail_list_magic[i].regex, mail_list_magic[i].pattern, REG_EXTENDED|REG_ICASE);</div><div class='del'>-		if (errcode != 0) {</div><div class='del'>-			char *errstr;</div><div class='del'>-			size_t len;</div><div class='del'>-		</div><div class='del'>-			len = regerror(errcode, &amp;mail_list_magic[i].regex, NULL, 0);</div><div class='del'>-			errstr = g_malloc0(len + 1);</div><div class='del'>-			regerror(errcode, &amp;mail_list_magic[i].regex, errstr, len);</div><div class='del'>-		</div><div class='del'>-			g_warning("Internal error, compiling regex failed: %s: %s", mail_list_magic[i].pattern, errstr);</div><div class='del'>-			g_free(errstr);</div><div class='del'>-			regex_compilation_failed++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_assert(regex_compilation_failed == 0);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h<br/>deleted file mode 100644<br/>index 91d1d71553..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-mime-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MIME_UTILS_H</div><div class='del'>-#define _CAMEL_MIME_UTILS_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-/* maximum recommended size of a line from header_fold() */</div><div class='del'>-#define CAMEL_FOLD_SIZE (77)</div><div class='del'>-/* maximum hard size of a line from header_fold() */</div><div class='del'>-#define CAMEL_FOLD_MAX_SIZE (998)</div><div class='del'>-</div><div class='del'>-#define CAMEL_UUDECODE_STATE_INIT   (0)</div><div class='del'>-#define CAMEL_UUDECODE_STATE_BEGIN  (1 &lt;&lt; 16)</div><div class='del'>-#define CAMEL_UUDECODE_STATE_END    (1 &lt;&lt; 17)</div><div class='del'>-#define CAMEL_UUDECODE_STATE_MASK   (CAMEL_UUDECODE_STATE_BEGIN | CAMEL_UUDECODE_STATE_END)</div><div class='del'>-</div><div class='del'>-/* a list of references for this message */</div><div class='del'>-struct _header_references {</div><div class='del'>-	struct _header_references *next;</div><div class='del'>-	char *id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _header_param {</div><div class='del'>-	struct _header_param *next;</div><div class='del'>-	char *name;</div><div class='del'>-	char *value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* describes a content-type */</div><div class='del'>-struct _header_content_type {</div><div class='del'>-	char *type;</div><div class='del'>-	char *subtype;</div><div class='del'>-	struct _header_param *params;</div><div class='del'>-	unsigned int refcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* a raw rfc822 header */</div><div class='del'>-/* the value MUST be US-ASCII */</div><div class='del'>-struct _header_raw {</div><div class='del'>-	struct _header_raw *next;</div><div class='del'>-	char *name;</div><div class='del'>-	char *value;</div><div class='del'>-	int offset;		/* in file, if known */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeDisposition {</div><div class='del'>-	char *disposition;</div><div class='del'>-	struct _header_param *params;</div><div class='del'>-	unsigned int refcount;</div><div class='del'>-} CamelMimeDisposition;</div><div class='del'>-</div><div class='del'>-enum _header_address_type {</div><div class='del'>-	HEADER_ADDRESS_NONE,	/* uninitialised */</div><div class='del'>-	HEADER_ADDRESS_NAME,</div><div class='del'>-	HEADER_ADDRESS_GROUP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _header_address {</div><div class='del'>-	struct _header_address *next;</div><div class='del'>-	enum _header_address_type type;</div><div class='del'>-	char *name;</div><div class='del'>-	union {</div><div class='del'>-		char *addr;</div><div class='del'>-		struct _header_address *members;</div><div class='del'>-	} v;</div><div class='del'>-	unsigned int refcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* MUST be called before everything else */</div><div class='del'>-void camel_mime_utils_init(void);</div><div class='del'>-</div><div class='del'>-/* Address lists */</div><div class='del'>-struct _header_address *header_address_new(void);</div><div class='del'>-struct _header_address *header_address_new_name(const char *name, const char *addr);</div><div class='del'>-struct _header_address *header_address_new_group(const char *name);</div><div class='del'>-void header_address_ref(struct _header_address *);</div><div class='del'>-void header_address_unref(struct _header_address *);</div><div class='del'>-void header_address_set_name(struct _header_address *, const char *name);</div><div class='del'>-void header_address_set_addr(struct _header_address *, const char *addr);</div><div class='del'>-void header_address_set_members(struct _header_address *, struct _header_address *group);</div><div class='del'>-void header_address_add_member(struct _header_address *, struct _header_address *member);</div><div class='del'>-void header_address_list_append_list(struct _header_address **l, struct _header_address **h);</div><div class='del'>-void header_address_list_append(struct _header_address **, struct _header_address *);</div><div class='del'>-void header_address_list_clear(struct _header_address **);</div><div class='del'>-</div><div class='del'>-struct _header_address *header_address_decode(const char *in);</div><div class='del'>-struct _header_address *header_mailbox_decode(const char *in);</div><div class='del'>-/* for mailing */</div><div class='del'>-char *header_address_list_encode(struct _header_address *a);</div><div class='del'>-/* for display */</div><div class='del'>-char *header_address_list_format(struct _header_address *a);</div><div class='del'>-</div><div class='del'>-/* structured header prameters */</div><div class='del'>-struct _header_param *header_param_list_decode(const char *in);</div><div class='del'>-char *header_param(struct _header_param *p, const char *name);</div><div class='del'>-struct _header_param *header_set_param(struct _header_param **l, const char *name, const char *value);</div><div class='del'>-void header_param_list_format_append(GString *out, struct _header_param *p);</div><div class='del'>-char *header_param_list_format(struct _header_param *p);</div><div class='del'>-void header_param_list_free(struct _header_param *p);</div><div class='del'>-</div><div class='del'>-/* Content-Type header */</div><div class='del'>-struct _header_content_type *header_content_type_new(const char *type, const char *subtype);</div><div class='del'>-struct _header_content_type *header_content_type_decode(const char *in);</div><div class='del'>-void header_content_type_unref(struct _header_content_type *ct);</div><div class='del'>-void header_content_type_ref(struct _header_content_type *ct);</div><div class='del'>-const char *header_content_type_param(struct _header_content_type *t, const char *name);</div><div class='del'>-void header_content_type_set_param(struct _header_content_type *t, const char *name, const char *value);</div><div class='del'>-int header_content_type_is(struct _header_content_type *ct, const char *type, const char *subtype);</div><div class='del'>-char *header_content_type_format(struct _header_content_type *ct);</div><div class='del'>-char *header_content_type_simple(struct _header_content_type *ct);</div><div class='del'>-</div><div class='del'>-/* DEBUGGING function */</div><div class='del'>-void header_content_type_dump(struct _header_content_type *ct);</div><div class='del'>-</div><div class='del'>-/* Content-Disposition header */</div><div class='del'>-CamelMimeDisposition *header_disposition_decode(const char *in);</div><div class='del'>-void header_disposition_ref(CamelMimeDisposition *);</div><div class='del'>-void header_disposition_unref(CamelMimeDisposition *);</div><div class='del'>-char *header_disposition_format(CamelMimeDisposition *d);</div><div class='del'>-</div><div class='del'>-/* decode the contents of a content-encoding header */</div><div class='del'>-char *header_content_encoding_decode(const char *in);</div><div class='del'>-</div><div class='del'>-/* raw headers */</div><div class='del'>-void header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset);</div><div class='del'>-void header_raw_append_parse(struct _header_raw **list, const char *header, int offset);</div><div class='del'>-const char *header_raw_find(struct _header_raw **list, const char *name, int *offset);</div><div class='del'>-const char *header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last);</div><div class='del'>-void header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset);</div><div class='del'>-void header_raw_remove(struct _header_raw **list, const char *name);</div><div class='del'>-void header_raw_fold(struct _header_raw **list);</div><div class='del'>-void header_raw_clear(struct _header_raw **list);</div><div class='del'>-</div><div class='del'>-char *header_raw_check_mailing_list(struct _header_raw **list);</div><div class='del'>-</div><div class='del'>-/* fold a header */</div><div class='del'>-char *header_address_fold (const char *in, size_t headerlen);</div><div class='del'>-char *header_fold (const char *in, size_t headerlen);</div><div class='del'>-char *header_unfold (const char *in);</div><div class='del'>-</div><div class='del'>-/* decode a header which is a simple token */</div><div class='del'>-char *header_token_decode (const char *in);</div><div class='del'>-</div><div class='del'>-int header_decode_int (const char **in);</div><div class='del'>-</div><div class='del'>-/* decode/encode a string type, like a subject line */</div><div class='del'>-char *header_decode_string (const char *in, const char *default_charset);</div><div class='del'>-char *header_encode_string (const unsigned char *in);</div><div class='del'>-</div><div class='del'>-/* encode a phrase, like the real name of an address */</div><div class='del'>-char *header_encode_phrase (const unsigned char *in);</div><div class='del'>-</div><div class='del'>-/* decode an email date field into a GMT time, + optional offset */</div><div class='del'>-time_t header_decode_date (const char *in, int *saveoffset);</div><div class='del'>-char *header_format_date (time_t time, int offset);</div><div class='del'>-</div><div class='del'>-/* decode a message id */</div><div class='del'>-char *header_msgid_decode (const char *in);</div><div class='del'>-</div><div class='del'>-/* generate msg id */</div><div class='del'>-char *header_msgid_generate (void);</div><div class='del'>-</div><div class='del'>-/* decode a References or In-Reply-To header */</div><div class='del'>-struct _header_references *header_references_inreplyto_decode (const char *in);</div><div class='del'>-struct _header_references *header_references_decode(const char *in);</div><div class='del'>-void header_references_list_clear(struct _header_references **list);</div><div class='del'>-void header_references_list_append_asis(struct _header_references **list, char *ref);</div><div class='del'>-int header_references_list_size(struct _header_references **list);</div><div class='del'>-struct _header_references *header_references_dup(const struct _header_references *list);</div><div class='del'>-</div><div class='del'>-/* decode content-location */</div><div class='del'>-char *header_location_decode(const char *in);</div><div class='del'>-</div><div class='del'>-/* decode the mime-type header */</div><div class='del'>-void header_mime_decode(const char *in, int *maj, int *min);</div><div class='del'>-</div><div class='del'>-/* do incremental base64/quoted-printable (de/en)coding */</div><div class='del'>-size_t base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save);</div><div class='del'>-</div><div class='del'>-size_t base64_encode_step(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-size_t base64_encode_close(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-</div><div class='del'>-size_t uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save);</div><div class='del'>-</div><div class='del'>-size_t uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,</div><div class='del'>-		      guint32 *save);</div><div class='del'>-size_t uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,</div><div class='del'>-		       guint32 *save);</div><div class='del'>-</div><div class='del'>-size_t quoted_decode_step(unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme);</div><div class='del'>-</div><div class='del'>-size_t quoted_encode_step(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);</div><div class='del'>-size_t quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, int *state, int *save);</div><div class='del'>-</div><div class='del'>-char *base64_encode_simple (const char *data, size_t len);</div><div class='del'>-size_t base64_decode_simple (char *data, size_t len);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_UTILS_H */</div><div class='head'>diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c<br/>deleted file mode 100644<br/>index c4f22b6332..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-movemail.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,543 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-movemail.c: mbox copying function */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-movemail.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mime-parser.h"</div><div class='del'>-#include "camel-mime-filter.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-</div><div class='del'>-#include "camel-lock-client.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#ifdef MOVEMAIL_PATH</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-</div><div class='del'>-static void movemail_external (const char *source, const char *dest,</div><div class='del'>-			       CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_BROKEN_SPOOL</div><div class='del'>-static int camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter);</div><div class='del'>-static int camel_movemail_solaris (int oldsfd, int dfd, CamelException *ex);</div><div class='del'>-#else</div><div class='del'>-/* these could probably be exposed as a utility? (but only mbox needs it) */</div><div class='del'>-static int camel_movemail_copy_file(int sfd, int dfd, CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_movemail: Copy an mbox file from a shared spool directory to a</div><div class='del'>- * new folder in a Camel store</div><div class='del'>- * @source: source file</div><div class='del'>- * @dest: destination file</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This copies an mbox file from a shared directory with multiple</div><div class='del'>- * readers and writers into a private (presumably Camel-controlled)</div><div class='del'>- * directory. Dot locking is used on the source file (but not the</div><div class='del'>- * destination).</div><div class='del'>- *</div><div class='del'>- * Return Value: Returns -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_movemail(const char *source, const char *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int lockid = -1;</div><div class='del'>-	int res = -1;</div><div class='del'>-	int sfd, dfd;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-	/* Stat and then open the spool file. If it doesn't exist or</div><div class='del'>-	 * is empty, the user has no mail. (There's technically a race</div><div class='del'>-	 * condition here in that an MDA might have just now locked it</div><div class='del'>-	 * to deliver a message, but we don't care. In that case,</div><div class='del'>-	 * assuming it's unlocked is equivalent to pretending we were</div><div class='del'>-	 * called a fraction earlier.)</div><div class='del'>-	 */</div><div class='del'>-	if (stat (source, &amp;st) == -1) {</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Could not check mail file "</div><div class='del'>-						"%s: %s"), source,</div><div class='del'>-					      strerror (errno));</div><div class='del'>-		}</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (st.st_size == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* open files */</div><div class='del'>-	sfd = open (source, O_RDWR);</div><div class='del'>-	if (sfd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not open mail file %s: %s"),</div><div class='del'>-				      source, strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dfd = open (dest, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);</div><div class='del'>-	if (dfd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not open temporary mail "</div><div class='del'>-					"file %s: %s"), dest,</div><div class='del'>-				      strerror (errno));</div><div class='del'>-		close (sfd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* lock our source mailbox */</div><div class='del'>-	lockid = camel_lock_helper_lock(source, ex);</div><div class='del'>-	if (lockid == -1) {</div><div class='del'>-		close(sfd);</div><div class='del'>-		close(dfd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_BROKEN_SPOOL</div><div class='del'>-	res = camel_movemail_solaris(sfd, dfd, ex);</div><div class='del'>-#else</div><div class='del'>-	res = camel_movemail_copy_file(sfd, dfd, ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If no errors occurred copying the data, and we successfully</div><div class='del'>-	 * close the destination file, then truncate the source file.</div><div class='del'>-	 */</div><div class='del'>-	if (res != -1) {</div><div class='del'>-		if (close (dfd) == 0) {</div><div class='del'>-			ftruncate (sfd, 0);</div><div class='del'>-		} else {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Failed to store mail in temp file %s: %s"), dest,</div><div class='del'>-					      strerror(errno));</div><div class='del'>-			res = -1;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		close (dfd);</div><div class='del'>-	close (sfd);</div><div class='del'>-</div><div class='del'>-	camel_lock_helper_unlock(lockid);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MOVEMAIL_PATH</div><div class='del'>-static void</div><div class='del'>-movemail_external (const char *source, const char *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	sigset_t mask, omask;</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int fd[2], len = 0, nread, status;</div><div class='del'>-	char buf[BUFSIZ], *output = NULL;</div><div class='del'>-</div><div class='del'>-	/* Block SIGCHLD so the app can't mess us up. */</div><div class='del'>-	sigemptyset (&amp;mask);</div><div class='del'>-	sigaddset (&amp;mask, SIGCHLD);</div><div class='del'>-	sigprocmask (SIG_BLOCK, &amp;mask, &amp;omask);</div><div class='del'>-</div><div class='del'>-	if (pipe (fd) == -1) {</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create pipe: %s"),</div><div class='del'>-				      strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pid = fork ();</div><div class='del'>-	switch (pid) {</div><div class='del'>-	case -1:</div><div class='del'>-		close (fd[0]);</div><div class='del'>-		close (fd[1]);</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not fork: %s"),</div><div class='del'>-				      strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-		/* Child */</div><div class='del'>-		close (fd[0]);</div><div class='del'>-		close (STDIN_FILENO);</div><div class='del'>-		dup2 (fd[1], STDOUT_FILENO);</div><div class='del'>-		dup2 (fd[1], STDERR_FILENO);</div><div class='del'>-</div><div class='del'>-		execl (MOVEMAIL_PATH, MOVEMAIL_PATH, source, dest, NULL);</div><div class='del'>-		_exit (255);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent */</div><div class='del'>-	close (fd[1]);</div><div class='del'>-</div><div class='del'>-	/* Read movemail's output. */</div><div class='del'>-	while ((nread = read (fd[0], buf, sizeof (buf))) &gt; 0) {</div><div class='del'>-		output = g_realloc (output, len + nread + 1);</div><div class='del'>-		memcpy (output + len, buf, nread);</div><div class='del'>-		len += nread;</div><div class='del'>-		output[len] = '\0';</div><div class='del'>-	}</div><div class='del'>-	close (fd[0]);</div><div class='del'>-</div><div class='del'>-	/* Now get the exit status. */</div><div class='del'>-	while (waitpid (pid, &amp;status, 0) == -1 &amp;&amp; errno == EINTR)</div><div class='del'>-		;</div><div class='del'>-	sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-</div><div class='del'>-	if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Movemail program failed: %s"),</div><div class='del'>-				      output ? output : _("(Unknown error)"));</div><div class='del'>-	}</div><div class='del'>-	g_free (output);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifndef HAVE_BROKEN_SPOOL</div><div class='del'>-static int</div><div class='del'>-camel_movemail_copy_file(int sfd, int dfd, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int nread, nwrote;</div><div class='del'>-	char buf[4096];</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		int written = 0;</div><div class='del'>-</div><div class='del'>-		nread = read (sfd, buf, sizeof (buf));</div><div class='del'>-		if (nread == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (nread == -1) {</div><div class='del'>-			if (errno == EINTR)</div><div class='del'>-				continue;</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Error reading mail file: %s"),</div><div class='del'>-					      strerror (errno));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while (nread) {</div><div class='del'>-			nwrote = write (dfd, buf + written, nread);</div><div class='del'>-			if (nwrote == -1) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue; /* continues inner loop */</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						      _("Error writing mail temp file: %s"),</div><div class='del'>-						      strerror (errno));</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			written += nwrote;</div><div class='del'>-			nread -= nwrote;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int</div><div class='del'>-camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes)</div><div class='del'>-{</div><div class='del'>-        char buffer[4096];</div><div class='del'>-        int written = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("writing %d bytes ... ", bytes));</div><div class='del'>-</div><div class='del'>-	if (lseek(fromfd, start, SEEK_SET) != start)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-        while (bytes&gt;0) {</div><div class='del'>-                int toread, towrite;</div><div class='del'>-</div><div class='del'>-                toread = bytes;</div><div class='del'>-                if (bytes&gt;4096)</div><div class='del'>-                        toread = 4096;</div><div class='del'>-                else</div><div class='del'>-                        toread = bytes;</div><div class='del'>-		do {</div><div class='del'>-			towrite = read(fromfd, buffer, toread);</div><div class='del'>-		} while (towrite == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (towrite == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-                /* check for 'end of file' */</div><div class='del'>-                if (towrite == 0) {</div><div class='del'>-			d(printf("end of file?\n"));</div><div class='del'>-                        break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			toread = write(tofd, buffer, towrite);</div><div class='del'>-		} while (toread == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (toread == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-                written += toread;</div><div class='del'>-                bytes -= toread;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        d(printf("written %d bytes\n", written));</div><div class='del'>-</div><div class='del'>-        return written;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PRE_SIZE (32)</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_BROKEN_SPOOL</div><div class='del'>-static int</div><div class='del'>-camel_movemail_copy_filter(int fromfd, int tofd, off_t start, size_t bytes, CamelMimeFilter *filter)</div><div class='del'>-{</div><div class='del'>-        char buffer[4096+PRE_SIZE];</div><div class='del'>-        int written = 0;</div><div class='del'>-	char *filterbuffer;</div><div class='del'>-	int filterlen, filterpre;</div><div class='del'>-</div><div class='del'>-	d(printf("writing %d bytes ... ", bytes));</div><div class='del'>-</div><div class='del'>-	camel_mime_filter_reset(filter);</div><div class='del'>-</div><div class='del'>-	if (lseek(fromfd, start, SEEK_SET) != start)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-        while (bytes&gt;0) {</div><div class='del'>-                int toread, towrite;</div><div class='del'>-</div><div class='del'>-                toread = bytes;</div><div class='del'>-                if (bytes&gt;4096)</div><div class='del'>-                        toread = 4096;</div><div class='del'>-                else</div><div class='del'>-                        toread = bytes;</div><div class='del'>-		do {</div><div class='del'>-			towrite = read(fromfd, buffer+PRE_SIZE, toread);</div><div class='del'>-		} while (towrite == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (towrite == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		d(printf("read %d unfiltered bytes\n", towrite));</div><div class='del'>-</div><div class='del'>-                /* check for 'end of file' */</div><div class='del'>-                if (towrite == 0) {</div><div class='del'>-			d(printf("end of file?\n"));</div><div class='del'>-			camel_mime_filter_complete(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,</div><div class='del'>-						   &amp;filterbuffer, &amp;filterlen, &amp;filterpre);</div><div class='del'>-			towrite = filterlen;</div><div class='del'>-			if (towrite == 0)</div><div class='del'>-				break;</div><div class='del'>-		} else {</div><div class='del'>-			camel_mime_filter_filter(filter, buffer+PRE_SIZE, towrite, PRE_SIZE,</div><div class='del'>-						 &amp;filterbuffer, &amp;filterlen, &amp;filterpre);</div><div class='del'>-			towrite = filterlen;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d(printf("writing %d filtered bytes\n", towrite));</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			toread = write(tofd, filterbuffer, towrite);</div><div class='del'>-		} while (toread == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (toread == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-                written += toread;</div><div class='del'>-                bytes -= toread;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        d(printf("written %d bytes\n", written));</div><div class='del'>-</div><div class='del'>-        return written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* write the headers back out again, but not he Content-Length header, because we dont</div><div class='del'>-   want	to maintain it! */</div><div class='del'>-static int</div><div class='del'>-solaris_header_write(int fd, struct _header_raw *header)</div><div class='del'>-{</div><div class='del'>-        struct iovec iv[4];</div><div class='del'>-        int outlen = 0, len;</div><div class='del'>-</div><div class='del'>-        iv[1].iov_base = ":";</div><div class='del'>-        iv[1].iov_len = 1;</div><div class='del'>-        iv[3].iov_base = "\n";</div><div class='del'>-        iv[3].iov_len = 1;</div><div class='del'>-</div><div class='del'>-        while (header) {</div><div class='del'>-		if (strcasecmp(header-&gt;name, "Content-Length")) {</div><div class='del'>-			iv[0].iov_base = header-&gt;name;</div><div class='del'>-			iv[0].iov_len = strlen(header-&gt;name);</div><div class='del'>-			iv[2].iov_base = header-&gt;value;</div><div class='del'>-			iv[2].iov_len = strlen(header-&gt;value);</div><div class='del'>-		</div><div class='del'>-			do {</div><div class='del'>-				len = writev(fd, iv, 4);</div><div class='del'>-			} while (len == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-			</div><div class='del'>-			if (len == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			outlen += len;</div><div class='del'>-		}</div><div class='del'>-                header = header-&gt;next;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		len = write(fd, "\n", 1);</div><div class='del'>-	} while (len == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-	if (len == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	outlen += 1;</div><div class='del'>-</div><div class='del'>-	d(printf("Wrote %d bytes of headers\n", outlen));</div><div class='del'>-</div><div class='del'>-        return outlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Well, since Solaris is a tad broken wrt its 'mbox' folder format,</div><div class='del'>-   we must convert it to a real mbox format.  Thankfully this is</div><div class='del'>-   mostly pretty easy */</div><div class='del'>-static int</div><div class='del'>-camel_movemail_solaris (int oldsfd, int dfd, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len;</div><div class='del'>-	int sfd;</div><div class='del'>-	CamelMimeFilterFrom *ffrom;</div><div class='del'>-	int ret = 1;</div><div class='del'>-	char *from = NULL;</div><div class='del'>-</div><div class='del'>-	/* need to dup as the mime parser will close on finish */</div><div class='del'>-	sfd = dup(oldsfd);</div><div class='del'>-	if (sfd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Error copying mail temp file: %s"),</div><div class='del'>-				      strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, sfd);</div><div class='del'>-</div><div class='del'>-	ffrom = camel_mime_filter_from_new();</div><div class='del'>-</div><div class='del'>-	while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_FROM) {</div><div class='del'>-		g_assert(camel_mime_parser_from_line(mp));</div><div class='del'>-		from = g_strdup(camel_mime_parser_from_line(mp));</div><div class='del'>-		if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_FROM_END) {</div><div class='del'>-			const char *cl;</div><div class='del'>-			int length;</div><div class='del'>-			int start, body;</div><div class='del'>-			off_t newpos;</div><div class='del'>-</div><div class='del'>-			ret = 0;</div><div class='del'>-</div><div class='del'>-			start = camel_mime_parser_tell_start_from(mp);</div><div class='del'>-			body = camel_mime_parser_tell(mp);</div><div class='del'>-</div><div class='del'>-			if (write(dfd, from, strlen(from)) != strlen(from))</div><div class='del'>-				goto fail;</div><div class='del'>-</div><div class='del'>-			/* write out headers, but NOT content-length header */</div><div class='del'>-			if (solaris_header_write(dfd, camel_mime_parser_headers_raw(mp)) == -1)</div><div class='del'>-				goto fail;</div><div class='del'>-</div><div class='del'>-			cl = camel_mime_parser_header(mp, "content-length", NULL);</div><div class='del'>-			if (cl == NULL) {</div><div class='del'>-				g_warning("Required Content-Length header is missing from solaris mail box @ %d", (int)camel_mime_parser_tell(mp));</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				camel_mime_parser_step(mp, &amp;buffer, &amp;len);</div><div class='del'>-				camel_mime_parser_unstep(mp);</div><div class='del'>-				length = camel_mime_parser_tell_start_from(mp) - body;</div><div class='del'>-				newpos = -1;</div><div class='del'>-			} else {</div><div class='del'>-				length = atoi(cl);</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				newpos = length+body;</div><div class='del'>-			}</div><div class='del'>-			/* copy body-&gt;length converting From lines */</div><div class='del'>-			if (camel_movemail_copy_filter(sfd, dfd, body, length, (CamelMimeFilter *)ffrom) == -1)</div><div class='del'>-				goto fail;</div><div class='del'>-			if (newpos != -1)</div><div class='del'>-				camel_mime_parser_seek(mp, newpos, SEEK_SET);</div><div class='del'>-		} else {</div><div class='del'>-			g_error("Inalid parser state: %d", camel_mime_parser_state(mp));</div><div class='del'>-		}</div><div class='del'>-		g_free(from);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_object_unref((CamelObject *)ffrom);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	g_free(from);</div><div class='del'>-</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			      _("Error copying mail temp file: %s"),</div><div class='del'>-			      strerror (errno));</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_object_unref((CamelObject *)ffrom);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif /* HAVE_BROKEN_SPOOL */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h<br/>deleted file mode 100644<br/>index 3e5206f672..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-movemail.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-movemail.h: mbox copy function */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author: </div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MOVEMAIL_H</div><div class='del'>-#define CAMEL_MOVEMAIL_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-int camel_movemail (const char *source, const char *dest, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MOVEMAIL_H */</div><div class='head'>diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c<br/>deleted file mode 100644<br/>index f82b66312a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-multipart.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,541 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-multipart.c : Abstract class for a multipart */</div><div class='del'>-</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning This should be a mostly abstract class, but it is not!</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt; /* strlen() */</div><div class='del'>-#include &lt;unistd.h&gt; /* for getpid */</div><div class='del'>-#include &lt;time.h&gt;   /* for time */</div><div class='del'>-</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "md5-utils.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static gboolean              is_offline        (CamelDataWrapper *data_wrapper);</div><div class='del'>-static void                  add_part          (CamelMultipart *multipart,</div><div class='del'>-						CamelMimePart *part);</div><div class='del'>-static void                  add_part_at       (CamelMultipart *multipart,</div><div class='del'>-						CamelMimePart *part,</div><div class='del'>-						guint index);</div><div class='del'>-static void                  remove_part       (CamelMultipart *multipart,</div><div class='del'>-						CamelMimePart *part);</div><div class='del'>-static CamelMimePart *       remove_part_at    (CamelMultipart *multipart,</div><div class='del'>-						guint index);</div><div class='del'>-static CamelMimePart *       get_part          (CamelMultipart *multipart,</div><div class='del'>-						guint index);</div><div class='del'>-static guint                 get_number        (CamelMultipart *multipart);</div><div class='del'>-static void                  set_boundary      (CamelMultipart *multipart,</div><div class='del'>-						const char *boundary);</div><div class='del'>-static const gchar *         get_boundary      (CamelMultipart *multipart);</div><div class='del'>-static int                   write_to_stream   (CamelDataWrapper *data_wrapper,</div><div class='del'>-						CamelStream *stream);</div><div class='del'>-static void                  unref_part        (gpointer data, gpointer user_data);</div><div class='del'>-</div><div class='del'>-static CamelDataWrapperClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMultipart */</div><div class='del'>-#define CMP_CLASS(so) CAMEL_MULTIPART_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelDataWrapper */</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class =</div><div class='del'>-		CAMEL_DATA_WRAPPER_CLASS (camel_multipart_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_multipart_class-&gt;add_part = add_part;</div><div class='del'>-	camel_multipart_class-&gt;add_part_at = add_part_at;</div><div class='del'>-	camel_multipart_class-&gt;remove_part = remove_part;</div><div class='del'>-	camel_multipart_class-&gt;remove_part_at = remove_part_at;</div><div class='del'>-	camel_multipart_class-&gt;get_part = get_part;</div><div class='del'>-	camel_multipart_class-&gt;get_number = get_number;</div><div class='del'>-	camel_multipart_class-&gt;set_boundary = set_boundary;</div><div class='del'>-	camel_multipart_class-&gt;get_boundary = get_boundary;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;is_offline = is_offline;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (object);</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),</div><div class='del'>-					  "multipart/mixed");</div><div class='del'>-	multipart-&gt;preface = NULL;</div><div class='del'>-	multipart-&gt;postface = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (object);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (multipart-&gt;parts, unref_part, NULL);</div><div class='del'>-</div><div class='del'>-	if (multipart-&gt;boundary)</div><div class='del'>-		g_free (multipart-&gt;boundary);</div><div class='del'>-	if (multipart-&gt;preface)</div><div class='del'>-		g_free (multipart-&gt;preface);</div><div class='del'>-	if (multipart-&gt;postface)</div><div class='del'>-		g_free (multipart-&gt;postface);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_multipart_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_multipart_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_multipart_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_multipart_type = camel_type_register (camel_data_wrapper_get_type (), "CamelMultipart",</div><div class='del'>-							    sizeof (CamelMultipart),</div><div class='del'>-							    sizeof (CamelMultipartClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_multipart_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_multipart_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_multipart_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_multipart_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unref_part (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelObject *part = CAMEL_OBJECT (data);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMultipart object.</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelMultipart</div><div class='del'>- **/</div><div class='del'>-CamelMultipart *</div><div class='del'>-camel_multipart_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-</div><div class='del'>-	multipart = (CamelMultipart *)camel_object_new (CAMEL_MULTIPART_TYPE);</div><div class='del'>-	multipart-&gt;preface = NULL;</div><div class='del'>-	multipart-&gt;postface = NULL;</div><div class='del'>-</div><div class='del'>-	return multipart;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	multipart-&gt;parts = g_list_append (multipart-&gt;parts, part);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_add_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to add</div><div class='del'>- *</div><div class='del'>- * Appends the part to the multipart object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_add_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;add_part (multipart, part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index)</div><div class='del'>-{</div><div class='del'>-	multipart-&gt;parts = g_list_insert (multipart-&gt;parts, part, index);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_add_part_at:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to add</div><div class='del'>- * @index: index to add the multipart at</div><div class='del'>- *</div><div class='del'>- * Adds the part to the multipart object after the @index'th</div><div class='del'>- * element. If @index is greater than the number of parts, it is</div><div class='del'>- * equivalent to camel_multipart_add_part().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_add_part_at (CamelMultipart *multipart,</div><div class='del'>-			     CamelMimePart *part, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;add_part_at (multipart, part, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	if (!multipart-&gt;parts)</div><div class='del'>-		return;</div><div class='del'>-	multipart-&gt;parts = g_list_remove (multipart-&gt;parts, part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_remove_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to remove</div><div class='del'>- *</div><div class='del'>- * Removes @part from @multipart.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_remove_part (CamelMultipart *multipart,</div><div class='del'>-			     CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;remove_part (multipart, part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimePart *</div><div class='del'>-remove_part_at (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	GList *parts_list;</div><div class='del'>-	GList *part_to_remove;</div><div class='del'>-	CamelMimePart *removed_part;</div><div class='del'>-</div><div class='del'>-	if (!(multipart-&gt;parts))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	parts_list = multipart-&gt;parts;</div><div class='del'>-	part_to_remove = g_list_nth (parts_list, index);</div><div class='del'>-	if (!part_to_remove) {</div><div class='del'>-		g_warning ("CamelMultipart::remove_part_at: "</div><div class='del'>-			   "part to remove is NULL\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	removed_part = CAMEL_MIME_PART (part_to_remove-&gt;data);</div><div class='del'>-</div><div class='del'>-	multipart-&gt;parts = g_list_remove_link (parts_list, part_to_remove);</div><div class='del'>-	if (part_to_remove-&gt;data)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part_to_remove-&gt;data));</div><div class='del'>-	g_list_free_1 (part_to_remove);</div><div class='del'>-</div><div class='del'>-	return removed_part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_remove_part_at:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @index: a zero-based index indicating the part to remove</div><div class='del'>- *</div><div class='del'>- * Remove the indicated part from the multipart object.</div><div class='del'>- *</div><div class='del'>- * Return value: the removed part. Note that it is camel_object_unref()ed</div><div class='del'>- * before being returned, which may cause it to be destroyed.</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_multipart_remove_part_at (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;remove_part_at (multipart, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimePart *</div><div class='del'>-get_part (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	GList *part;</div><div class='del'>-</div><div class='del'>-	if (!(multipart-&gt;parts))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	part = g_list_nth (multipart-&gt;parts, index);</div><div class='del'>-	if (part)</div><div class='del'>-		return CAMEL_MIME_PART (part-&gt;data);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_get_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @index: a zero-based index indicating the part to get</div><div class='del'>- *</div><div class='del'>- * Return value: the indicated subpart, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_multipart_get_part (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;get_part (multipart, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-get_number (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	return g_list_length (multipart-&gt;parts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_get_number:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- *</div><div class='del'>- * Return value: the number of subparts in @multipart</div><div class='del'>- **/</div><div class='del'>-guint</div><div class='del'>-camel_multipart_get_number (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), 0);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;get_number (multipart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_boundary (CamelMultipart *multipart, const char *boundary)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);</div><div class='del'>-	char *bgen, digest[16], bbuf[27], *p;</div><div class='del'>-	int state, save;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (cdw-&gt;mime_type != NULL);</div><div class='del'>-</div><div class='del'>-	if (!boundary) {</div><div class='del'>-		/* Generate a fairly random boundary string. */</div><div class='del'>-		bgen = g_strdup_printf ("%p:%lu:%lu", multipart,</div><div class='del'>-					(unsigned long) getpid(),</div><div class='del'>-					(unsigned long) time(0));</div><div class='del'>-		md5_get_digest (bgen, strlen (bgen), digest);</div><div class='del'>-		g_free (bgen);</div><div class='del'>-		strcpy (bbuf, "=-");</div><div class='del'>-		p = bbuf + 2;</div><div class='del'>-		state = save = 0;</div><div class='del'>-		p += base64_encode_step (digest, 16, FALSE, p, &amp;state, &amp;save);</div><div class='del'>-		*p = '\0';</div><div class='del'>-</div><div class='del'>-		boundary = bbuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	header_content_type_set_param (cdw-&gt;mime_type, "boundary", boundary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_set_boundary:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @boundary: the message boundary, or %NULL</div><div class='del'>- *</div><div class='del'>- * Sets the message boundary for @multipart to @boundary. This should</div><div class='del'>- * be a string which does not occur anywhere in any of @multipart's</div><div class='del'>- * subparts. If @boundary is %NULL, a randomly-generated boundary will</div><div class='del'>- * be used.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_set_boundary (CamelMultipart *multipart, const char *boundary)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;set_boundary (multipart, boundary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-get_boundary (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *cdw = CAMEL_DATA_WRAPPER (multipart);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (cdw-&gt;mime_type != NULL, NULL);</div><div class='del'>-	return header_content_type_param (cdw-&gt;mime_type, "boundary");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_get_boundary:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- *</div><div class='del'>- * Return value: @multipart's message boundary</div><div class='del'>- **/</div><div class='del'>-const gchar *</div><div class='del'>-camel_multipart_get_boundary (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;get_boundary (multipart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_offline (CamelDataWrapper *data_wrapper)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);</div><div class='del'>-	GList *node;</div><div class='del'>-	CamelDataWrapper *part;</div><div class='del'>-</div><div class='del'>-	if (parent_class-&gt;is_offline (data_wrapper))</div><div class='del'>-		return TRUE;</div><div class='del'>-	for (node = multipart-&gt;parts; node; node = node-&gt;next) {</div><div class='del'>-		part = node-&gt;data;</div><div class='del'>-		if (camel_data_wrapper_is_offline (part))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this is MIME specific, doesn't belong here really */</div><div class='del'>-static int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (data_wrapper);</div><div class='del'>-	const gchar *boundary;</div><div class='del'>-	int total = 0;</div><div class='del'>-	int count;</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	/* get the bundary text */</div><div class='del'>-	boundary = camel_multipart_get_boundary (multipart);</div><div class='del'>-	</div><div class='del'>-	/* we cannot write a multipart without a boundary string */</div><div class='del'>-	g_return_val_if_fail (boundary, -1);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * write the preface text (usually something like</div><div class='del'>-	 *   "This is a mime message, if you see this, then</div><div class='del'>-	 *    your mail client probably doesn't support ...."</div><div class='del'>-	 */</div><div class='del'>-	if (multipart-&gt;preface) {</div><div class='del'>-		count = camel_stream_write_string (stream, multipart-&gt;preface);</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now, write all the parts, separated by the boundary</div><div class='del'>-	 * delimiter</div><div class='del'>-	 */</div><div class='del'>-	node = multipart-&gt;parts;</div><div class='del'>-	while (node) {</div><div class='del'>-		count = camel_stream_printf (stream, "\n--%s\n", boundary);</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-</div><div class='del'>-		count = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (node-&gt;data), stream);</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* write the terminating boudary delimiter */</div><div class='del'>-	count = camel_stream_printf (stream, "\n--%s--\n", boundary);</div><div class='del'>-	if (count == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	total += count;</div><div class='del'>-</div><div class='del'>-	/* and finally the postface */</div><div class='del'>-	if (multipart-&gt;postface) {</div><div class='del'>-		count = camel_stream_write_string (stream, multipart-&gt;postface);</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_set_preface:</div><div class='del'>- * @multipart: </div><div class='del'>- * @preface: </div><div class='del'>- * </div><div class='del'>- * Set the preface text for this multipart.  Will be written out infront</div><div class='del'>- * of the multipart.  This text should only include US-ASCII strings, and</div><div class='del'>- * be relatively short, and will be ignored by any MIME mail client.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_set_preface(CamelMultipart *multipart, const char *preface)</div><div class='del'>-{</div><div class='del'>-	if (multipart-&gt;preface != preface) {</div><div class='del'>-		g_free(multipart-&gt;preface);</div><div class='del'>-		if (preface)</div><div class='del'>-			multipart-&gt;preface = g_strdup(preface);</div><div class='del'>-		else</div><div class='del'>-			multipart-&gt;preface = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_set_postface:</div><div class='del'>- * @multipart: </div><div class='del'>- * @postface: </div><div class='del'>- * </div><div class='del'>- * Set the postfix text for this multipart.  Will be written out after</div><div class='del'>- * the last boundary of the multipart, and ignored by any MIME mail</div><div class='del'>- * client.</div><div class='del'>- *</div><div class='del'>- * Generally postface texts should not be sent with multipart messages.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_set_postface(CamelMultipart *multipart, const char *postface)</div><div class='del'>-{</div><div class='del'>-	if (multipart-&gt;postface != postface) {</div><div class='del'>-		g_free(multipart-&gt;postface);</div><div class='del'>-		if (postface)</div><div class='del'>-			multipart-&gt;postface = g_strdup(postface);</div><div class='del'>-		else</div><div class='del'>-			multipart-&gt;postface = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h<br/>deleted file mode 100644<br/>index dfa8908bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-multipart.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-multipart.h : class for a multipart */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MULTIPART_H</div><div class='del'>-#define CAMEL_MULTIPART_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-data-wrapper.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MULTIPART_TYPE     (camel_multipart_get_type ())</div><div class='del'>-#define CAMEL_MULTIPART(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))</div><div class='del'>-#define CAMEL_MULTIPART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))</div><div class='del'>-#define CAMEL_IS_MULTIPART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelMultipart</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper parent_object;</div><div class='del'>-</div><div class='del'>-	CamelMimePart *parent;</div><div class='del'>-	GList *parts;</div><div class='del'>-	gchar *boundary;</div><div class='del'>-	gchar *preface;</div><div class='del'>-	gchar *postface;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDataWrapperClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	void (*add_part) (CamelMultipart *multipart, CamelMimePart *part);</div><div class='del'>-	void (*add_part_at) (CamelMultipart *multipart, CamelMimePart *part, guint index);</div><div class='del'>-	void (*remove_part) (CamelMultipart *multipart, CamelMimePart *part);</div><div class='del'>-	CamelMimePart * (*remove_part_at) (CamelMultipart *multipart, guint index);</div><div class='del'>-	CamelMimePart * (*get_part) (CamelMultipart *multipart, guint index);</div><div class='del'>-	guint (*get_number) (CamelMultipart *multipart);</div><div class='del'>-	void (*set_boundary) (CamelMultipart *multipart, const char *boundary);</div><div class='del'>-	const gchar * (*get_boundary) (CamelMultipart *multipart);</div><div class='del'>-</div><div class='del'>-} CamelMultipartClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_multipart_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMultipart *    camel_multipart_new            (void);</div><div class='del'>-void                camel_multipart_add_part       (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part);</div><div class='del'>-void                camel_multipart_add_part_at    (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part,</div><div class='del'>-						    guint index);</div><div class='del'>-void                camel_multipart_remove_part    (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part);</div><div class='del'>-CamelMimePart *     camel_multipart_remove_part_at (CamelMultipart *multipart,</div><div class='del'>-						    guint index);</div><div class='del'>-CamelMimePart *     camel_multipart_get_part       (CamelMultipart *multipart,</div><div class='del'>-						    guint index);</div><div class='del'>-guint               camel_multipart_get_number     (CamelMultipart *multipart);</div><div class='del'>-void                camel_multipart_set_boundary   (CamelMultipart *multipart,</div><div class='del'>-						    const char *boundary);</div><div class='del'>-const gchar *       camel_multipart_get_boundary   (CamelMultipart *multipart);</div><div class='del'>-</div><div class='del'>-void		    camel_multipart_set_preface	   (CamelMultipart *multipart, const char *preface);</div><div class='del'>-void		    camel_multipart_set_postface   (CamelMultipart *multipart, const char *postface);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MULTIPART_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c<br/>deleted file mode 100644<br/>index c8a170781a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-news-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors:</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-news-address.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void camel_news_address_class_init (CamelNewsAddressClass *klass);</div><div class='del'>-</div><div class='del'>-static CamelAddressClass *camel_news_address_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_news_address_class_init (CamelNewsAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_news_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_address_get_type (), "CamelNewsAddress",</div><div class='del'>-					    sizeof (CamelNewsAddress),</div><div class='del'>-					    sizeof (CamelNewsAddressClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_news_address_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_news_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelNewsAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelNewsAddress widget.</div><div class='del'>- **/</div><div class='del'>-CamelNewsAddress *</div><div class='del'>-camel_news_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( camel_object_new (camel_news_address_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h<br/>deleted file mode 100644<br/>index ca1505e9a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-news-address.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;NotZed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_NEWS_ADDRESS_H</div><div class='del'>-#define _CAMEL_NEWS_ADDRESS_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-address.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_NEWS_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)</div><div class='del'>-#define CAMEL_NEWS_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass)</div><div class='del'>-#define CAMEL_IS_NEWS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_news_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNewsAddressClass CamelNewsAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelNewsAddress {</div><div class='del'>-	CamelAddress parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelNewsAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNewsAddressClass {</div><div class='del'>-	CamelAddressClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_news_address_get_type	(void);</div><div class='del'>-CamelNewsAddress      *camel_news_address_new	(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_NEWS_ADDRESS_H */</div><div class='head'>diff --git a/camel/camel-object.c b/camel/camel-object.c<br/>deleted file mode 100644<br/>index 48a77971f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-object.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,983 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- *</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000-2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-object.h"</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-memory.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* I just mashed the keyboard for these... */</div><div class='del'>-#define CAMEL_OBJECT_MAGIC           	 0x77A344ED</div><div class='del'>-#define CAMEL_OBJECT_CLASS_MAGIC     	 0xEE26A997</div><div class='del'>-#define CAMEL_OBJECT_FINALISED_MAGIC       0x84AC365F</div><div class='del'>-#define CAMEL_OBJECT_CLASS_FINALISED_MAGIC 0x7621ABCD</div><div class='del'>-</div><div class='del'>-/* ** Quickie type system ************************************************* */</div><div class='del'>-</div><div class='del'>-/* A 'locked' hooklist, that is only allocated on demand */</div><div class='del'>-typedef struct _CamelHookList {</div><div class='del'>-	EMutex *lock;</div><div class='del'>-</div><div class='del'>-	unsigned int depth:30;	/* recursive event depth */</div><div class='del'>-	unsigned int flags:2;	/* flags, see below */</div><div class='del'>-</div><div class='del'>-	unsigned int list_length;</div><div class='del'>-	struct _CamelHookPair *list;</div><div class='del'>-} CamelHookList;</div><div class='del'>-</div><div class='del'>-#define CAMEL_HOOK_PAIR_REMOVED (1&lt;&lt;0)</div><div class='del'>-</div><div class='del'>-/* a 'hook pair', actually a hook tuple, we just store all hooked events in the same list,</div><div class='del'>-   and just comapre as we go, rather than storing separate lists for each hook type</div><div class='del'>-</div><div class='del'>-   the name field just points directly to the key field in the class's preplist hashtable.</div><div class='del'>-   This way we can just use a direct pointer compare when scanning it, and also saves</div><div class='del'>-   copying the string */</div><div class='del'>-typedef struct _CamelHookPair</div><div class='del'>-{</div><div class='del'>-	struct _CamelHookPair *next; /* next MUST be the first member */</div><div class='del'>-</div><div class='del'>-	unsigned int id:30;</div><div class='del'>-	unsigned int flags:2;	/* removed, etc */</div><div class='del'>-</div><div class='del'>-	const char *name;	/* points to the key field in the classes preplist, static memory */</div><div class='del'>-	union {</div><div class='del'>-		CamelObjectEventHookFunc event;</div><div class='del'>-		CamelObjectEventPrepFunc prep;</div><div class='del'>-	} func;</div><div class='del'>-	void *data;</div><div class='del'>-} CamelHookPair;</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static void camel_object_free_hooks(CamelObject *o);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static pthread_mutex_t chunks_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-static EMemChunk *pair_chunks;</div><div class='del'>-static EMemChunk *hook_chunks;</div><div class='del'>-static unsigned int pair_id = 1;</div><div class='del'>-</div><div class='del'>-static EMutex *type_lock;</div><div class='del'>-</div><div class='del'>-static GHashTable *type_table;</div><div class='del'>-static EMemChunk *type_chunks;</div><div class='del'>-</div><div class='del'>-CamelType camel_object_type;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define P_LOCK(l) (pthread_mutex_lock(&amp;l))</div><div class='del'>-#define P_UNLOCK(l) (pthread_mutex_unlock(&amp;l))</div><div class='del'>-#define E_LOCK(l) (e_mutex_lock(l))</div><div class='del'>-#define E_UNLOCK(l) (e_mutex_unlock(l))</div><div class='del'>-#define CLASS_LOCK(k) (g_mutex_lock((((CamelObjectClass *)k)-&gt;lock)))</div><div class='del'>-#define CLASS_UNLOCK(k) (g_mutex_unlock((((CamelObjectClass *)k)-&gt;lock)))</div><div class='del'>-#else</div><div class='del'>-#define P_LOCK(l)</div><div class='del'>-#define P_UNLOCK(l)</div><div class='del'>-#define E_LOCK(l)</div><div class='del'>-#define E_UNLOCK(l)</div><div class='del'>-#define CLASS_LOCK(k)</div><div class='del'>-#define CLASS_UNLOCK(k)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static struct _CamelHookPair *</div><div class='del'>-pair_alloc(void)</div><div class='del'>-{</div><div class='del'>-	CamelHookPair *pair;</div><div class='del'>-</div><div class='del'>-	P_LOCK(chunks_lock);</div><div class='del'>-	pair = e_memchunk_alloc(pair_chunks);</div><div class='del'>-	pair-&gt;id = pair_id++;</div><div class='del'>-	if (pair_id == 0)</div><div class='del'>-		pair_id = 1;</div><div class='del'>-	P_UNLOCK(chunks_lock);</div><div class='del'>-</div><div class='del'>-	return pair;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pair_free(CamelHookPair *pair)</div><div class='del'>-{</div><div class='del'>-	g_assert(pair_chunks != NULL);</div><div class='del'>-</div><div class='del'>-	P_LOCK(chunks_lock);</div><div class='del'>-	e_memchunk_free(pair_chunks, pair);</div><div class='del'>-	P_UNLOCK(chunks_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _CamelHookList *</div><div class='del'>-hooks_alloc(void)</div><div class='del'>-{</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-</div><div class='del'>-	P_LOCK(chunks_lock);</div><div class='del'>-	hooks = e_memchunk_alloc(hook_chunks);</div><div class='del'>-	P_UNLOCK(chunks_lock);</div><div class='del'>-</div><div class='del'>-	return hooks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-hooks_free(CamelHookList *hooks)</div><div class='del'>-{</div><div class='del'>-	g_assert(hook_chunks != NULL);</div><div class='del'>-</div><div class='del'>-	P_LOCK(chunks_lock);</div><div class='del'>-	e_memchunk_free(hook_chunks, hooks);</div><div class='del'>-	P_UNLOCK(chunks_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* not checked locked, who cares, only required for people that want to redefine root objects */</div><div class='del'>-void</div><div class='del'>-camel_type_init(void)</div><div class='del'>-{</div><div class='del'>-	static int init = FALSE;</div><div class='del'>-</div><div class='del'>-	if (init)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	init = TRUE;</div><div class='del'>-	pair_chunks = e_memchunk_new(16, sizeof(CamelHookPair));</div><div class='del'>-	hook_chunks = e_memchunk_new(16, sizeof(CamelHookList));</div><div class='del'>-	type_lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-	type_chunks = e_memchunk_new(32, sizeof(CamelType));</div><div class='del'>-	type_table = g_hash_table_new(NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ************************************************************************ */</div><div class='del'>-</div><div class='del'>-/* Should this return the object to the caller? */</div><div class='del'>-static void</div><div class='del'>-cobject_init (CamelObject *o, CamelObjectClass *klass)</div><div class='del'>-{</div><div class='del'>-	o-&gt;klass = klass;</div><div class='del'>-	o-&gt;magic = CAMEL_OBJECT_MAGIC;</div><div class='del'>-	o-&gt;ref_count = 1;</div><div class='del'>-	o-&gt;flags = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cobject_finalise(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	g_assert(o-&gt;ref_count == 0);</div><div class='del'>-</div><div class='del'>-	camel_object_free_hooks(o);</div><div class='del'>-</div><div class='del'>-	o-&gt;magic = CAMEL_OBJECT_FINALISED_MAGIC;</div><div class='del'>-	o-&gt;klass = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cobject_getv(CamelObject *o, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	/* could have flags or stuff here? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cobject_setv(CamelObject *o, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	/* could have flags or stuff here? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cobject_class_init(CamelObjectClass *klass)</div><div class='del'>-{</div><div class='del'>-	klass-&gt;magic = CAMEL_OBJECT_CLASS_MAGIC;</div><div class='del'>-</div><div class='del'>-	klass-&gt;getv = cobject_getv;</div><div class='del'>-	klass-&gt;setv = cobject_setv;</div><div class='del'>-</div><div class='del'>-	camel_object_class_add_event(klass, "finalize", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cobject_class_finalise(CamelObjectClass * klass)</div><div class='del'>-{</div><div class='del'>-	klass-&gt;magic = CAMEL_OBJECT_CLASS_FINALISED_MAGIC;</div><div class='del'>-</div><div class='del'>-	g_free(klass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_object_get_type (void)</div><div class='del'>-{</div><div class='del'>-	if (camel_object_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_type_init();</div><div class='del'>-</div><div class='del'>-		camel_object_type = camel_type_register(NULL, "CamelObject", /*, 0, 0*/</div><div class='del'>-							sizeof(CamelObject), sizeof(CamelObjectClass),</div><div class='del'>-							cobject_class_init, cobject_class_finalise,</div><div class='del'>-							cobject_init, cobject_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_object_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_type_class_init(CamelObjectClass *klass, CamelObjectClass *type)</div><div class='del'>-{</div><div class='del'>-	if (type-&gt;parent)</div><div class='del'>-		camel_type_class_init(klass, type-&gt;parent);</div><div class='del'>-</div><div class='del'>-	if (type-&gt;klass_init)</div><div class='del'>-		type-&gt;klass_init(klass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_type_register (CamelType parent, const char * name,</div><div class='del'>-		     /*unsigned int ver, unsigned int rev,*/</div><div class='del'>-		     size_t object_size, size_t klass_size,</div><div class='del'>-		     CamelObjectClassInitFunc class_init,</div><div class='del'>-		     CamelObjectClassFinalizeFunc class_finalise,</div><div class='del'>-		     CamelObjectInitFunc object_init,</div><div class='del'>-		     CamelObjectFinalizeFunc object_finalise)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *klass;</div><div class='del'>-	/*int offset;</div><div class='del'>-	  size_t size;*/</div><div class='del'>-</div><div class='del'>-	if (parent != NULL &amp;&amp; parent-&gt;magic != CAMEL_OBJECT_CLASS_MAGIC) {</div><div class='del'>-		g_warning("camel_type_register: invalid junk parent class for '%s'", name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	E_LOCK(type_lock);</div><div class='del'>-</div><div class='del'>-	/* Have to check creation, it might've happened in another thread before we got here */</div><div class='del'>-	klass = g_hash_table_lookup(type_table, name);</div><div class='del'>-	if (klass != NULL) {</div><div class='del'>-		if (klass-&gt;klass_size != klass_size || klass-&gt;object_size != object_size</div><div class='del'>-		    || klass-&gt;klass_init != class_init || klass-&gt;klass_finalise != class_finalise</div><div class='del'>-		    || klass-&gt;init != object_init || klass-&gt;finalise != object_finalise) {</div><div class='del'>-			g_warning("camel_type_register: Trying to re-register class '%s'", name);</div><div class='del'>-			klass = NULL;</div><div class='del'>-		}</div><div class='del'>-		E_UNLOCK(type_lock);</div><div class='del'>-		return klass;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this is for objects with no parent as part of their struct ('interfaces'?) */</div><div class='del'>-	/*offset = parent?parent-&gt;klass_size:0;</div><div class='del'>-	offset = (offset + 3) &amp; (~3);</div><div class='del'>-</div><div class='del'>-	size = offset + klass_size;</div><div class='del'>-</div><div class='del'>-	klass = g_malloc0(size);</div><div class='del'>-</div><div class='del'>-	klass-&gt;klass_size = size;</div><div class='del'>-	klass-&gt;klass_data = offset;</div><div class='del'>-</div><div class='del'>-	offset = parent?parent-&gt;object_size:0;</div><div class='del'>-	offset = (offset + 3) &amp; (~3);</div><div class='del'>-</div><div class='del'>-	klass-&gt;object_size = offset + object_size;</div><div class='del'>-	klass-&gt;object_data = offset;*/</div><div class='del'>-</div><div class='del'>-	if (parent</div><div class='del'>-	    &amp;&amp; klass_size &lt; parent-&gt;klass_size) {</div><div class='del'>-		g_warning("camel_type_register: '%s' has smaller class size than parent '%s'", name, parent-&gt;name);</div><div class='del'>-		E_UNLOCK(type_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	klass = g_malloc0(klass_size);</div><div class='del'>-	klass-&gt;klass_size = klass_size;</div><div class='del'>-	klass-&gt;object_size = object_size;	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	klass-&gt;lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-	klass-&gt;instance_chunks = e_memchunk_new(8, object_size);</div><div class='del'>-</div><div class='del'>-	klass-&gt;parent = parent;</div><div class='del'>-	if (parent) {</div><div class='del'>-		klass-&gt;next = parent-&gt;child;</div><div class='del'>-		parent-&gt;child = klass;</div><div class='del'>-	}</div><div class='del'>-	klass-&gt;name = name;</div><div class='del'>-</div><div class='del'>-	/*klass-&gt;version = ver;</div><div class='del'>-	  klass-&gt;revision = rev;*/</div><div class='del'>-</div><div class='del'>-	klass-&gt;klass_init = class_init;</div><div class='del'>-	klass-&gt;klass_finalise = class_finalise;</div><div class='del'>-</div><div class='del'>-	klass-&gt;init = object_init;</div><div class='del'>-	klass-&gt;finalise = object_finalise;</div><div class='del'>-</div><div class='del'>-	/* setup before class init, incase class init func uses the type or looks it up ? */</div><div class='del'>-	g_hash_table_insert(type_table, (void *)name, klass);</div><div class='del'>-</div><div class='del'>-	camel_type_class_init(klass, klass);</div><div class='del'>-</div><div class='del'>-	E_UNLOCK(type_lock);</div><div class='del'>-</div><div class='del'>-	return klass;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_object_init(CamelObject *o, CamelObjectClass *klass, CamelType type)</div><div class='del'>-{</div><div class='del'>-	if (type-&gt;parent)</div><div class='del'>-		camel_object_init(o, klass, type-&gt;parent);</div><div class='del'>-</div><div class='del'>-	if (type-&gt;init)</div><div class='del'>-		type-&gt;init(o, klass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObject *</div><div class='del'>-camel_object_new(CamelType type)</div><div class='del'>-{</div><div class='del'>-	CamelObject *o;</div><div class='del'>-</div><div class='del'>-	if (type == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (type-&gt;magic != CAMEL_OBJECT_CLASS_MAGIC)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	CLASS_LOCK(type);</div><div class='del'>-	o = e_memchunk_alloc0(type-&gt;instance_chunks);</div><div class='del'>-</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-	if (type-&gt;instances)</div><div class='del'>-		type-&gt;instances-&gt;prev = o;</div><div class='del'>-	o-&gt;next = type-&gt;instances;</div><div class='del'>-	o-&gt;prev = NULL;</div><div class='del'>-	type-&gt;instances = o;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	CLASS_UNLOCK(type);</div><div class='del'>-	camel_object_init(o, type, type);</div><div class='del'>-</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_ref(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CLASS_LOCK(o-&gt;klass);</div><div class='del'>-	o-&gt;ref_count++;</div><div class='del'>-	CLASS_UNLOCK(o-&gt;klass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_unref(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	register CamelObjectClass *klass = o-&gt;klass, *k;</div><div class='del'>-	</div><div class='del'>-	CLASS_LOCK(klass);</div><div class='del'>-	o-&gt;ref_count--;</div><div class='del'>-	if (o-&gt;ref_count &gt; 0</div><div class='del'>-	    || (o-&gt;flags &amp; CAMEL_OBJECT_DESTROY)) {</div><div class='del'>-		CLASS_UNLOCK(klass);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	o-&gt;flags |= CAMEL_OBJECT_DESTROY;</div><div class='del'>-</div><div class='del'>-	CLASS_UNLOCK(klass);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event(o, "finalize", NULL);</div><div class='del'>-</div><div class='del'>-	k = klass;</div><div class='del'>-	while (k) {</div><div class='del'>-		if (k-&gt;finalise)</div><div class='del'>-			k-&gt;finalise(o);</div><div class='del'>-		k = k-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	o-&gt;magic = CAMEL_OBJECT_FINALISED_MAGIC;</div><div class='del'>-</div><div class='del'>-	CLASS_LOCK(klass);</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-	if (o-&gt;prev)</div><div class='del'>-		o-&gt;prev-&gt;next = o-&gt;next;</div><div class='del'>-	else</div><div class='del'>-		klass-&gt;instances = o-&gt;next;</div><div class='del'>-	if (o-&gt;next)</div><div class='del'>-		o-&gt;next-&gt;prev = o-&gt;prev;</div><div class='del'>-#endif</div><div class='del'>-	e_memchunk_free(klass-&gt;instance_chunks, o);</div><div class='del'>-	CLASS_UNLOCK(klass);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_type_to_name (CamelType type)</div><div class='del'>-{</div><div class='del'>-	if (type == NULL)</div><div class='del'>-		return "(NULL class)";</div><div class='del'>-</div><div class='del'>-	if (type-&gt;magic == CAMEL_OBJECT_CLASS_MAGIC)</div><div class='del'>-		return type-&gt;name;</div><div class='del'>-</div><div class='del'>-	return "(Junk class)";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_name_to_type(const char *name)</div><div class='del'>-{</div><div class='del'>-	/* TODO: Load a class off disk (!) */</div><div class='del'>-</div><div class='del'>-	return g_hash_table_lookup(type_table, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-desc_data(CamelObject *o, int ok)</div><div class='del'>-{</div><div class='del'>-	char *what;</div><div class='del'>-</div><div class='del'>-	if (o == NULL)</div><div class='del'>-		what = g_strdup("NULL OBJECT");</div><div class='del'>-	else if (o-&gt;magic == ok)</div><div class='del'>-		what = NULL;</div><div class='del'>-	else if (o-&gt;magic == CAMEL_OBJECT_MAGIC)</div><div class='del'>-		what = g_strdup_printf("CLASS '%s'", ((CamelObjectClass *)o)-&gt;name);</div><div class='del'>-	else if (o-&gt;magic == CAMEL_OBJECT_CLASS_MAGIC)</div><div class='del'>-		what = g_strdup_printf("CLASS '%s'", ((CamelObjectClass *)o)-&gt;name);</div><div class='del'>-	else if (o-&gt;magic == CAMEL_OBJECT_FINALISED_MAGIC)</div><div class='del'>-		what = g_strdup_printf("finalised OBJECT");</div><div class='del'>-	else if (o-&gt;magic == CAMEL_OBJECT_CLASS_FINALISED_MAGIC)</div><div class='del'>-		what = g_strdup_printf("finalised CLASS");</div><div class='del'>-	else </div><div class='del'>-		what = g_strdup_printf("junk data");</div><div class='del'>-</div><div class='del'>-	return what;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-check_magic(void *o, CamelType ctype, int isob)</div><div class='del'>-{</div><div class='del'>-	char *what, *to;</div><div class='del'>-</div><div class='del'>-	what = desc_data(o, isob?CAMEL_OBJECT_MAGIC:CAMEL_OBJECT_CLASS_MAGIC);</div><div class='del'>-	to = desc_data((CamelObject *)ctype, CAMEL_OBJECT_CLASS_MAGIC);</div><div class='del'>-</div><div class='del'>-	if (what || to) {</div><div class='del'>-		if (what == NULL) {</div><div class='del'>-			if (isob)</div><div class='del'>-				what = g_strdup_printf("OBJECT '%s'", ((CamelObject *)o)-&gt;klass-&gt;name);</div><div class='del'>-			else</div><div class='del'>-				what = g_strdup_printf("OBJECT '%s'", ((CamelObjectClass *)o)-&gt;name);</div><div class='del'>-		}		</div><div class='del'>-		if (to == NULL)</div><div class='del'>-			to = g_strdup_printf("OBJECT '%s'", ctype-&gt;name);</div><div class='del'>-		g_warning("Trying to check %s is %s", what, to);</div><div class='del'>-		g_free(what);</div><div class='del'>-		g_free(to);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_object_is (CamelObject *o, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *k;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(check_magic(o, ctype, TRUE), FALSE);</div><div class='del'>-</div><div class='del'>-	k = o-&gt;klass;</div><div class='del'>-	while (k) {</div><div class='del'>-		if (k == ctype)</div><div class='del'>-			return TRUE;</div><div class='del'>-		k = k-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_object_class_is (CamelObjectClass *k, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(check_magic(k, ctype, FALSE), FALSE);</div><div class='del'>-</div><div class='del'>-	while (k) {</div><div class='del'>-		if (k == ctype)</div><div class='del'>-			return TRUE;</div><div class='del'>-		k = k-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObject *</div><div class='del'>-camel_object_cast(CamelObject *o, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *k;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(check_magic(o, ctype, TRUE), NULL);</div><div class='del'>-</div><div class='del'>-	k = o-&gt;klass;</div><div class='del'>-	while (k) {</div><div class='del'>-		if (k == ctype)</div><div class='del'>-			return o;</div><div class='del'>-		k = k-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning("Object %p (class '%s') doesn't have '%s' in its hierarchy", o, o-&gt;klass-&gt;name, ctype-&gt;name);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObjectClass *</div><div class='del'>-camel_object_class_cast(CamelObjectClass *k, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *r = k;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(check_magic(k, ctype, FALSE), NULL);</div><div class='del'>-</div><div class='del'>-	while (k) {</div><div class='del'>-		if (k == ctype)</div><div class='del'>-			return r;</div><div class='del'>-		k = k-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning("Class '%s' doesn't have '%s' in its hierarchy", r-&gt;name, ctype-&gt;name);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_class_add_event(CamelObjectClass *klass, const char *name, CamelObjectEventPrepFunc prep)</div><div class='del'>-{</div><div class='del'>-	CamelHookPair *pair;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-</div><div class='del'>-	pair = klass-&gt;hooks;</div><div class='del'>-	while (pair) {</div><div class='del'>-		if (strcmp(pair-&gt;name, name) == 0) {</div><div class='del'>-			g_warning("camel_object_class_add_event: `%s' is already declared for '%s'\n",</div><div class='del'>-				  name, klass-&gt;name);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		pair = pair-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pair = pair_alloc();</div><div class='del'>-	pair-&gt;name = name;</div><div class='del'>-	pair-&gt;func.prep = prep;</div><div class='del'>-	pair-&gt;flags = 0;</div><div class='del'>-</div><div class='del'>-	pair-&gt;next = klass-&gt;hooks;</div><div class='del'>-	klass-&gt;hooks = pair;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free hook data */</div><div class='del'>-static void camel_object_free_hooks(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelHookPair *pair, *next;</div><div class='del'>-</div><div class='del'>-	if (o-&gt;hooks) {</div><div class='del'>-		g_assert(o-&gt;hooks-&gt;depth == 0);</div><div class='del'>-		g_assert((o-&gt;hooks-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED) == 0);</div><div class='del'>-</div><div class='del'>-		pair = o-&gt;hooks-&gt;list;</div><div class='del'>-		while (pair) {</div><div class='del'>-			next = pair-&gt;next;</div><div class='del'>-			pair_free(pair);</div><div class='del'>-			pair = next;</div><div class='del'>-		}</div><div class='del'>-		e_mutex_destroy(o-&gt;hooks-&gt;lock);</div><div class='del'>-		hooks_free(o-&gt;hooks);</div><div class='del'>-		o-&gt;hooks = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return (allocate if required) the object's hook list, locking at the same time */</div><div class='del'>-static CamelHookList *camel_object_get_hooks(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#endif</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-</div><div class='del'>-	/* if we have it, we dont have to do any other locking,</div><div class='del'>-	   otherwise use a global lock to setup the object's hook data */</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	if (o-&gt;hooks == NULL) {</div><div class='del'>-		pthread_mutex_lock(&amp;lock);</div><div class='del'>-#endif</div><div class='del'>-		if (o-&gt;hooks == NULL) {</div><div class='del'>-			hooks = hooks_alloc();</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-			hooks-&gt;lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-#endif</div><div class='del'>-			hooks-&gt;flags = 0;</div><div class='del'>-			hooks-&gt;depth = 0;</div><div class='del'>-			hooks-&gt;list_length = 0;</div><div class='del'>-			hooks-&gt;list = NULL;</div><div class='del'>-			o-&gt;hooks = hooks;</div><div class='del'>-		}</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-		pthread_mutex_unlock(&amp;lock);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_lock(o-&gt;hooks-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	return o-&gt;hooks;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock object hooks' list */</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define camel_object_unget_hooks(o) (e_mutex_unlock((CAMEL_OBJECT(o)-&gt;hooks-&gt;lock)))</div><div class='del'>-#else</div><div class='del'>-#define camel_object_unget_hooks(o)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-unsigned int</div><div class='del'>-camel_object_hook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelHookPair *pair, *hook;</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_OBJECT (obj), 0);</div><div class='del'>-	g_return_val_if_fail (name != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (func != NULL, 0);</div><div class='del'>-</div><div class='del'>-	hook = obj-&gt;klass-&gt;hooks;</div><div class='del'>-	while (hook) {</div><div class='del'>-		if (strcmp(hook-&gt;name, name) == 0)</div><div class='del'>-			goto setup;</div><div class='del'>-		hook = hook-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning("camel_object_hook_event: trying to hook event `%s' in class `%s' with no defined events.",</div><div class='del'>-		  name, obj-&gt;klass-&gt;name);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-setup:</div><div class='del'>-	/* setup hook pair */</div><div class='del'>-	pair = pair_alloc();</div><div class='del'>-	pair-&gt;name = hook-&gt;name;	/* effectively static! */</div><div class='del'>-	pair-&gt;func.event = func;</div><div class='del'>-	pair-&gt;data = data;</div><div class='del'>-	pair-&gt;flags = 0;</div><div class='del'>-	id = pair-&gt;id;</div><div class='del'>-</div><div class='del'>-	/* get the hook list object, locked, link in new event hook, unlock */</div><div class='del'>-	hooks = camel_object_get_hooks(obj);</div><div class='del'>-	pair-&gt;next = hooks-&gt;list;</div><div class='del'>-	hooks-&gt;list = pair;</div><div class='del'>-	hooks-&gt;list_length++;</div><div class='del'>-	camel_object_unget_hooks(obj);</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_remove_event(CamelObject * obj, unsigned int id)</div><div class='del'>-{</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-	CamelHookPair *pair, *parent;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (id != 0);</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;hooks == NULL) {</div><div class='del'>-		g_warning("camel_object_unhook_event: trying to unhook `%d` from an instance of `%s' with no hooks",</div><div class='del'>-			  id, obj-&gt;klass-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* scan hooks for this event, remove it, or flag it if we're busy */</div><div class='del'>-	hooks = camel_object_get_hooks(obj);</div><div class='del'>-	parent = (CamelHookPair *)&amp;hooks-&gt;list;</div><div class='del'>-	pair = parent-&gt;next;</div><div class='del'>-	while (pair) {</div><div class='del'>-		if (pair-&gt;id == id</div><div class='del'>-		    &amp;&amp; (pair-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED) == 0) {</div><div class='del'>-			if (hooks-&gt;depth &gt; 0) {</div><div class='del'>-				pair-&gt;flags |= CAMEL_HOOK_PAIR_REMOVED;</div><div class='del'>-				hooks-&gt;flags |= CAMEL_HOOK_PAIR_REMOVED;</div><div class='del'>-			} else {</div><div class='del'>-				parent-&gt;next = pair-&gt;next;</div><div class='del'>-				pair_free(pair);</div><div class='del'>-				hooks-&gt;list_length--;</div><div class='del'>-			}</div><div class='del'>-			camel_object_unget_hooks(obj);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		parent = pair;</div><div class='del'>-		pair = pair-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unget_hooks(obj);</div><div class='del'>-</div><div class='del'>-	g_warning("camel_object_unhook_event: cannot find hook id %d in instance of `%s'",</div><div class='del'>-		  id, obj-&gt;klass-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_unhook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-	CamelHookPair *pair, *parent;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (name != NULL);</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;hooks == NULL) {</div><div class='del'>-		g_warning("camel_object_unhook_event: trying to unhook `%s` from an instance of `%s' with no hooks",</div><div class='del'>-			  name, obj-&gt;klass-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* scan hooks for this event, remove it, or flag it if we're busy */</div><div class='del'>-	hooks = camel_object_get_hooks(obj);</div><div class='del'>-	parent = (CamelHookPair *)&amp;hooks-&gt;list;</div><div class='del'>-	pair = parent-&gt;next;</div><div class='del'>-	while (pair) {</div><div class='del'>-		if (pair-&gt;func.event == func</div><div class='del'>-		    &amp;&amp; pair-&gt;data == data</div><div class='del'>-		    &amp;&amp; strcmp(pair-&gt;name, name) == 0</div><div class='del'>-		    &amp;&amp; (pair-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED) == 0) {</div><div class='del'>-			if (hooks-&gt;depth &gt; 0) {</div><div class='del'>-				pair-&gt;flags |= CAMEL_HOOK_PAIR_REMOVED;</div><div class='del'>-				hooks-&gt;flags |= CAMEL_HOOK_PAIR_REMOVED;</div><div class='del'>-			} else {</div><div class='del'>-				parent-&gt;next = pair-&gt;next;</div><div class='del'>-				pair_free(pair);</div><div class='del'>-				hooks-&gt;list_length--;</div><div class='del'>-			}</div><div class='del'>-			camel_object_unget_hooks(obj);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		parent = pair;</div><div class='del'>-		pair = pair-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unget_hooks(obj);</div><div class='del'>-</div><div class='del'>-	g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of `%s' attached to `%s'",</div><div class='del'>-		  func, data, obj-&gt;klass-&gt;name, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_trigger_event (CamelObject * obj, const char * name, void *event_data)</div><div class='del'>-{</div><div class='del'>-	CamelHookList *hooks;</div><div class='del'>-	CamelHookPair *pair, **pairs, *parent, *hook;</div><div class='del'>-	int i, size;</div><div class='del'>-	const char *prepname;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-</div><div class='del'>-	hook = obj-&gt;klass-&gt;hooks;</div><div class='del'>-	while (hook) {</div><div class='del'>-		if (strcmp(hook-&gt;name, name) == 0)</div><div class='del'>-			goto trigger;</div><div class='del'>-		hook = hook-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning("camel_object_trigger_event: trying to trigger unknown event `%s' in class `%s'",</div><div class='del'>-		  name, obj-&gt;klass-&gt;name);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-trigger:</div><div class='del'>-	/* try prep function, if false, then quit */</div><div class='del'>-	if (hook-&gt;func.prep != NULL &amp;&amp; !hook-&gt;func.prep(obj, event_data))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* also, no hooks, dont bother going further */</div><div class='del'>-	if (obj-&gt;hooks == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* lock the object for hook emission */</div><div class='del'>-	camel_object_ref(obj);</div><div class='del'>-	hooks = camel_object_get_hooks(obj);</div><div class='del'>-	</div><div class='del'>-	if (hooks-&gt;list) {</div><div class='del'>-		/* first, copy the items in the list, and say we're in an event */</div><div class='del'>-		hooks-&gt;depth++;</div><div class='del'>-		pair = hooks-&gt;list;</div><div class='del'>-		size = 0;</div><div class='del'>-		pairs = alloca(sizeof(pairs[0]) * hooks-&gt;list_length);</div><div class='del'>-		prepname = hook-&gt;name;</div><div class='del'>-		while (pair) {</div><div class='del'>-			if (pair-&gt;name == prepname)</div><div class='del'>-				pairs[size++] = pair;</div><div class='del'>-			pair = pair-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* now execute the events we have, if they haven't been removed during our calls */</div><div class='del'>-		for (i=0;i&lt;size;i++) {</div><div class='del'>-			pair = pairs[i];</div><div class='del'>-			if ((pair-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED) == 0)</div><div class='del'>-				(pair-&gt;func.event) (obj, event_data, pair-&gt;data);</div><div class='del'>-		}</div><div class='del'>-		hooks-&gt;depth--;</div><div class='del'>-</div><div class='del'>-		/* and if we're out of any events, then clean up any pending removes */</div><div class='del'>-		if (hooks-&gt;depth == 0 &amp;&amp; (hooks-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED)) {</div><div class='del'>-			parent = (CamelHookPair *)&amp;hooks-&gt;list;</div><div class='del'>-			pair = parent-&gt;next;</div><div class='del'>-			while (pair) {</div><div class='del'>-				if (pair-&gt;flags &amp; CAMEL_HOOK_PAIR_REMOVED) {</div><div class='del'>-					parent-&gt;next = pair-&gt;next;</div><div class='del'>-					pair_free(pair);</div><div class='del'>-					hooks-&gt;list_length--;</div><div class='del'>-				} else {</div><div class='del'>-					parent = pair;</div><div class='del'>-				}</div><div class='del'>-				pair = parent-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			hooks-&gt;flags &amp;= ~CAMEL_HOOK_PAIR_REMOVED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unget_hooks(obj);</div><div class='del'>-	camel_object_unref(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get/set arg methods */</div><div class='del'>-int camel_object_set(CamelObject *o, CamelException *ex, ...)</div><div class='del'>-{</div><div class='del'>-	CamelArgV args;</div><div class='del'>-	CamelObjectClass *klass = o-&gt;klass;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);</div><div class='del'>-</div><div class='del'>-	camel_argv_start(&amp;args, ex);</div><div class='del'>-</div><div class='del'>-	while (camel_argv_build(&amp;args) &amp;&amp; ret == 0)</div><div class='del'>-		ret = klass-&gt;setv(o, ex, &amp;args);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = klass-&gt;setv(o, ex, &amp;args);</div><div class='del'>-</div><div class='del'>-	camel_argv_end(&amp;args);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_object_setv(CamelObject *o, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);</div><div class='del'>-</div><div class='del'>-	return o-&gt;klass-&gt;setv(o, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_object_get(CamelObject *o, CamelException *ex, ...)</div><div class='del'>-{</div><div class='del'>-	CamelArgGetV args;</div><div class='del'>-	CamelObjectClass *klass = o-&gt;klass;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);</div><div class='del'>-</div><div class='del'>-	camel_argv_start(&amp;args, ex);</div><div class='del'>-</div><div class='del'>-	while (camel_arggetv_build(&amp;args) &amp;&amp; ret == 0)</div><div class='del'>-		ret = klass-&gt;getv(o, ex, &amp;args);</div><div class='del'>-	if (ret == 0)</div><div class='del'>-		ret = klass-&gt;getv(o, ex, &amp;args);</div><div class='del'>-</div><div class='del'>-	camel_argv_end(&amp;args);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int camel_object_getv(CamelObject *o, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *klass = o-&gt;klass;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(CAMEL_IS_OBJECT(o), -1);</div><div class='del'>-</div><div class='del'>-	return klass-&gt;getv(o, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-object_class_dump_tree_rec(CamelType root, int depth)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-	struct _CamelObject *o;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	p = alloca(depth*2+1);</div><div class='del'>-	memset(p, ' ', depth*2);</div><div class='del'>-	p[depth*2] = 0;</div><div class='del'>-</div><div class='del'>-	while (root) {</div><div class='del'>-		CLASS_LOCK(root);</div><div class='del'>-		printf("%sClass: %s\n", p, root-&gt;name);</div><div class='del'>-		/*printf("%sVersion: %u.%u\n", p, root-&gt;version, root-&gt;revision);*/</div><div class='del'>-		if (root-&gt;hooks) {</div><div class='del'>-			CamelHookPair *pair = root-&gt;hooks;</div><div class='del'>-</div><div class='del'>-			while (pair) {</div><div class='del'>-				printf("%s  event '%s' prep %p\n", p, pair-&gt;name, pair-&gt;func.prep);</div><div class='del'>-				pair = pair-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-		o = root-&gt;instances;</div><div class='del'>-		while (o) {</div><div class='del'>-			printf("%s instance %p [%d]\n", p, o, o-&gt;ref_count);</div><div class='del'>-			/* todo: should lock hooks while it scans them */</div><div class='del'>-			if (o-&gt;hooks) {</div><div class='del'>-				CamelHookPair *pair = o-&gt;hooks-&gt;list;</div><div class='del'>-</div><div class='del'>-				while (pair) {</div><div class='del'>-					printf("%s  hook '%s' func %p data %p\n", p, pair-&gt;name, pair-&gt;func.event, pair-&gt;data);</div><div class='del'>-					pair = pair-&gt;next;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			o = o-&gt;next;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		CLASS_UNLOCK(root);</div><div class='del'>-</div><div class='del'>-		if (root-&gt;child)</div><div class='del'>-			object_class_dump_tree_rec(root-&gt;child, depth+1);</div><div class='del'>-</div><div class='del'>-		root = root-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_class_dump_tree(CamelType root)</div><div class='del'>-{</div><div class='del'>-	object_class_dump_tree_rec(root, 0);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-object.h b/camel/camel-object.h<br/>deleted file mode 100644<br/>index cf574fe9f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-object.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,208 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-object.h: Base class for Camel */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_OBJECT_H</div><div class='del'>-#define CAMEL_OBJECT_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;		/* size_t */</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;camel/camel-arg.h&gt;</div><div class='del'>-#include &lt;camel/camel-types.h&gt;	/* this is a @##$@#SF stupid header */</div><div class='del'>-</div><div class='del'>-/* this crap shouldn't be here */</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* turn on so that camel_object_class_dump_tree() dumps object instances as well */</div><div class='del'>-/*#define CAMEL_OBJECT_TRACK_INSTANCES*/</div><div class='del'>-</div><div class='del'>-typedef struct _CamelObjectClass *CamelType;</div><div class='del'>-</div><div class='del'>-#ifdef G_DISABLE_CHECKS</div><div class='del'>-#define CAMEL_CHECK_CAST(obj, ctype, ptype)         ((ptype *) obj)</div><div class='del'>-#define CAMEL_CHECK_CLASS_CAST(klass, ctype, ptype) ((ptype *) klass)</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_CHECK_CAST(obj, ctype, ptype)         ((ptype *) camel_object_cast ((CamelObject *)(obj), (CamelType)(ctype)))</div><div class='del'>-#define CAMEL_CHECK_CLASS_CAST(klass, ctype, ptype) ((ptype *) camel_object_class_cast ((CamelObjectClass *)(klass), (CamelType)(ctype) ))</div><div class='del'>-#endif</div><div class='del'>-#define CAMEL_CHECK_TYPE(obj, ctype)                (camel_object_is ((CamelObject *)(obj), (CamelType)(ctype) ))</div><div class='del'>-#define CAMEL_CHECK_CLASS_TYPE(klass, ctype)        (camel_object_class_is ((CamelObjectClass *)(klass), (CamelType)(ctype)))</div><div class='del'>-</div><div class='del'>-extern CamelType camel_object_type;</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT_TYPE        (camel_object_type)</div><div class='del'>-</div><div class='del'>-/* we can't check casts till we've got the type, use the global type variable because its cheaper */</div><div class='del'>-#define CAMEL_OBJECT(obj)        (CAMEL_CHECK_CAST((obj), camel_object_type, CamelObject))</div><div class='del'>-#define CAMEL_OBJECT_CLASS(k)    (CAMEL_CHECK_CLASS_CAST ((k), camel_object_type, CamelObjectClass))</div><div class='del'>-#define CAMEL_IS_OBJECT(o)       (CAMEL_CHECK_TYPE((o), camel_object_type))</div><div class='del'>-#define CAMEL_IS_OBJECT_CLASS(k) (CAMEL_CHECK_CLASS_TYPE((k), camel_object_type))</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT_GET_CLASS(o) ((CamelObjectClass *)(CAMEL_OBJECT(o))-&gt;klass)</div><div class='del'>-#define CAMEL_OBJECT_GET_TYPE(o)  ((CamelType)(CAMEL_OBJECT(o))-&gt;klass)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelObjectClass CamelObjectClass;</div><div class='del'>-typedef struct _CamelObject CamelObject;</div><div class='del'>-typedef unsigned int CamelObjectHookID;</div><div class='del'>-</div><div class='del'>-typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);</div><div class='del'>-typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);</div><div class='del'>-typedef void (*CamelObjectInitFunc) (CamelObject *, CamelObjectClass *);</div><div class='del'>-typedef void (*CamelObjectFinalizeFunc) (CamelObject *);</div><div class='del'>-</div><div class='del'>-typedef gboolean (*CamelObjectEventPrepFunc) (CamelObject *, gpointer);</div><div class='del'>-typedef void (*CamelObjectEventHookFunc) (CamelObject *, gpointer, gpointer);</div><div class='del'>-</div><div class='del'>-#define CAMEL_INVALID_TYPE (NULL)</div><div class='del'>-</div><div class='del'>-enum _CamelObjectFlags {</div><div class='del'>-	CAMEL_OBJECT_DESTROY = (1&lt;&lt;0),</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* TODO: create a simpleobject which has no events on it, or an interface for events */</div><div class='del'>-struct _CamelObject {</div><div class='del'>-	struct _CamelObjectClass *klass;</div><div class='del'>-</div><div class='del'>-	guint32 magic;		/* only really needed for debugging ... */</div><div class='del'>-</div><div class='del'>-	/* current hooks on this object */</div><div class='del'>-	struct _CamelHookList *hooks;</div><div class='del'>-</div><div class='del'>-	guint32 ref_count:24;</div><div class='del'>-	guint32 flags:8;</div><div class='del'>-</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-	struct _CamelObject *next, *prev;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelObjectClass</div><div class='del'>-{</div><div class='del'>-	struct _CamelObjectClass *parent;</div><div class='del'>-</div><div class='del'>-	guint32 magic;		/* in same spot for validation */</div><div class='del'>-</div><div class='del'>-	struct _CamelObjectClass *next, *child; /* maintain heirarchy, just for kicks */</div><div class='del'>-</div><div class='del'>-	const char *name;</div><div class='del'>-</div><div class='del'>-	void *lock;		/* lock when used in threading, else just pads struct */</div><div class='del'>-</div><div class='del'>-	/*unsigned short version, revision;*/</div><div class='del'>-</div><div class='del'>-	/* if the object's bigger than 64K, it could use redesigning */</div><div class='del'>-	unsigned short object_size/*, object_data*/;</div><div class='del'>-	unsigned short klass_size/*, klass_data*/;</div><div class='del'>-</div><div class='del'>-	/* available hooks for this class */</div><div class='del'>-	struct _CamelHookPair *hooks;</div><div class='del'>-</div><div class='del'>-	/* memchunks for this type */</div><div class='del'>-	struct _EMemChunk *instance_chunks;</div><div class='del'>-#ifdef CAMEL_OBJECT_TRACK_INSTANCES</div><div class='del'>-	struct _CamelObject *instances;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* init class */</div><div class='del'>-	void (*klass_init)(struct _CamelObjectClass *);</div><div class='del'>-	void (*klass_finalise)(struct _CamelObjectClass *);</div><div class='del'>-</div><div class='del'>-	/* init/finalise object */</div><div class='del'>-	void (*init)(struct _CamelObject *, struct _CamelObjectClass *);</div><div class='del'>-	void (*finalise)(struct _CamelObject *);</div><div class='del'>-</div><div class='del'>-	/* get/set interface */</div><div class='del'>-	int (*setv)(struct _CamelObject *, struct _CamelException *ex, CamelArgV *args);</div><div class='del'>-	int (*getv)(struct _CamelObject *, struct _CamelException *ex, CamelArgGetV *args);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The type system .... it's pretty simple..... */</div><div class='del'>-void camel_type_init (void);</div><div class='del'>-CamelType camel_type_register(CamelType parent, const char * name, /*unsigned int ver, unsigned int rev,*/</div><div class='del'>-			      size_t instance_size,</div><div class='del'>-			      size_t classfuncs_size,</div><div class='del'>-			      CamelObjectClassInitFunc class_init,</div><div class='del'>-			      CamelObjectClassFinalizeFunc  class_finalize,</div><div class='del'>-			      CamelObjectInitFunc instance_init,</div><div class='del'>-			      CamelObjectFinalizeFunc instance_finalize);</div><div class='del'>-</div><div class='del'>-/* deprecated interface */</div><div class='del'>-#define camel_type_get_global_classfuncs(x) ((CamelObjectClass *)(x))</div><div class='del'>-</div><div class='del'>-/* object class methods (types == classes now) */</div><div class='del'>-const char *camel_type_to_name (CamelType type);</div><div class='del'>-CamelType camel_name_to_type (const char *name);</div><div class='del'>-void camel_object_class_add_event (CamelObjectClass *class, const char *name, CamelObjectEventPrepFunc prep);</div><div class='del'>-</div><div class='del'>-void camel_object_class_dump_tree (CamelType root);</div><div class='del'>-</div><div class='del'>-/* casting */</div><div class='del'>-CamelObject *camel_object_cast(CamelObject *obj, CamelType ctype);</div><div class='del'>-gboolean camel_object_is(CamelObject *obj, CamelType ctype);</div><div class='del'>-</div><div class='del'>-CamelObjectClass *camel_object_class_cast (CamelObjectClass *klass, CamelType ctype);</div><div class='del'>-gboolean camel_object_class_is (CamelObjectClass *klass, CamelType ctype);</div><div class='del'>-</div><div class='del'>-CamelType camel_object_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelObject *camel_object_new (CamelType type);</div><div class='del'>-CamelObject *camel_object_new_name (const char *name);</div><div class='del'>-</div><div class='del'>-void camel_object_ref (CamelObject *obj);</div><div class='del'>-void camel_object_unref (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-#ifdef CAMEL_DEBUG</div><div class='del'>-#define camel_object_ref(o) (printf("%s (%s:%d):ref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_ref(o))</div><div class='del'>-#define camel_object_unref(o) (printf("%s (%s:%d):unref (%p)\n", __FUNCTION__, __FILE__, __LINE__, o), camel_object_unref (o))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* hooks */</div><div class='del'>-CamelObjectHookID camel_object_hook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);</div><div class='del'>-void camel_object_remove_event(CamelObject *obj, CamelObjectHookID id);</div><div class='del'>-void camel_object_unhook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);</div><div class='del'>-void camel_object_trigger_event(CamelObject *obj, const char *name, void *event_data);</div><div class='del'>-</div><div class='del'>-/* get/set methods */</div><div class='del'>-int camel_object_set(CamelObject *obj, struct _CamelException *ex, ...);</div><div class='del'>-int camel_object_setv(CamelObject *obj, struct _CamelException *ex, CamelArgV *);</div><div class='del'>-int camel_object_get(CamelObject *obj, struct _CamelException *ex, ...);</div><div class='del'>-int camel_object_getv(CamelObject *obj, struct _CamelException *ex, CamelArgGetV *);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_OBJECT_H */</div><div class='head'>diff --git a/camel/camel-operation.c b/camel/camel-operation.c<br/>deleted file mode 100644<br/>index 6c490df73f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-operation.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-operation.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,676 +0,0 @@</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _status_stack {</div><div class='del'>-	guint32 flags;</div><div class='del'>-	char *msg;</div><div class='del'>-	int pc;				/* last pc reported */</div><div class='del'>-	unsigned int stamp;		/* last stamp reported */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelOperation {</div><div class='del'>-	pthread_t id;		/* id of running thread */</div><div class='del'>-	guint32 flags;		/* cancelled ? */</div><div class='del'>-	int blocked;		/* cancellation blocked depth */</div><div class='del'>-	int refcount;</div><div class='del'>-</div><div class='del'>-	CamelOperationStatusFunc status;</div><div class='del'>-	void *status_data;</div><div class='del'>-	unsigned int status_update;</div><div class='del'>-</div><div class='del'>-	/* stack of status messages (struct _status_stack *) */</div><div class='del'>-	GSList *status_stack;</div><div class='del'>-	struct _status_stack *lastreport;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMsgPort *cancel_port;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_OPERATION_CANCELLED (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_OPERATION_TRANSIENT (1&lt;&lt;1)</div><div class='del'>-</div><div class='del'>-/* Delay before a transient operation has any effect on the status */</div><div class='del'>-#define CAMEL_OPERATION_TRANSIENT_DELAY (5)</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_ACTIVE_LOCK() pthread_mutex_lock(&amp;operation_active_lock)</div><div class='del'>-#define CAMEL_ACTIVE_UNLOCK() pthread_mutex_unlock(&amp;operation_active_lock)</div><div class='del'>-static pthread_mutex_t operation_active_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_ACTIVE_LOCK()</div><div class='del'>-#define CAMEL_ACTIVE_UNLOCK()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static unsigned int stamp (void);</div><div class='del'>-</div><div class='del'>-static GHashTable *operation_active;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelOperationMsg {</div><div class='del'>-	EMsg msg;</div><div class='del'>-} CamelOperationMsg ;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_new:</div><div class='del'>- * @status: Callback for receiving status messages.</div><div class='del'>- * @status_data: User data.</div><div class='del'>- * </div><div class='del'>- * Create a new camel operation handle.  Camel operation handles can</div><div class='del'>- * be used in a multithreaded application (or a single operation</div><div class='del'>- * handle can be used in a non threaded appliation) to cancel running</div><div class='del'>- * operations and to obtain notification messages of the internal</div><div class='del'>- * status of messages.</div><div class='del'>- * </div><div class='del'>- * Return value: A new operation handle.</div><div class='del'>- **/</div><div class='del'>-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data)</div><div class='del'>-{</div><div class='del'>-	CamelOperation *cc;</div><div class='del'>-</div><div class='del'>-	cc = g_malloc0(sizeof(*cc));</div><div class='del'>-</div><div class='del'>-	cc-&gt;flags = 0;</div><div class='del'>-	cc-&gt;blocked = 0;</div><div class='del'>-	cc-&gt;refcount = 1;</div><div class='del'>-	cc-&gt;status = status;</div><div class='del'>-	cc-&gt;status_data = status_data;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	cc-&gt;id = ~0;</div><div class='del'>-	cc-&gt;cancel_port = e_msgport_new();</div><div class='del'>-	cc-&gt;cancel_fd = -1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* return the registered operation, or NULL if none registered */</div><div class='del'>-/* need to unref when done with it */</div><div class='del'>-CamelOperation *camel_operation_registered(void)</div><div class='del'>-{</div><div class='del'>-	CamelOperation *cc = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-	if (operation_active != NULL</div><div class='del'>-	    &amp;&amp; (cc = g_hash_table_lookup(operation_active, (void *)pthread_self()))) {</div><div class='del'>-		g_assert(cc-&gt;refcount &gt; 0);</div><div class='del'>-		cc-&gt;refcount++;</div><div class='del'>-	}</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	return cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_reset:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Resets an operation cancel state and message.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_reset(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	GSList *n;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	CamelOperationMsg *msg;</div><div class='del'>-</div><div class='del'>-	while ((msg = (CamelOperationMsg *)e_msgport_get(cc-&gt;cancel_port)))</div><div class='del'>-		g_free(msg);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	n = cc-&gt;status_stack;</div><div class='del'>-	while (n) {</div><div class='del'>-		g_free(n-&gt;data);</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	g_slist_free(cc-&gt;status_stack);</div><div class='del'>-	cc-&gt;status_stack = NULL;</div><div class='del'>-</div><div class='del'>-	cc-&gt;flags = 0;</div><div class='del'>-	cc-&gt;blocked = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_ref:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Add a reference to the CamelOperation @cc.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_ref(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	g_assert(cc-&gt;refcount &gt; 0);</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-	cc-&gt;refcount++;</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_unref:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Unref and potentially free @cc.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_unref(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	GSList *n;</div><div class='del'>-</div><div class='del'>-	g_assert(cc-&gt;refcount &gt; 0);</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-	if (cc-&gt;refcount == 1) {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-		CamelOperationMsg *msg;</div><div class='del'>-</div><div class='del'>-		while ((msg = (CamelOperationMsg *)e_msgport_get(cc-&gt;cancel_port)))</div><div class='del'>-			g_free(msg);</div><div class='del'>-</div><div class='del'>-		e_msgport_destroy(cc-&gt;cancel_port);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		if (cc-&gt;id != (~0)) {</div><div class='del'>-			g_warning("Unreffing operation status which was still registered: %p\n", cc);</div><div class='del'>-			g_hash_table_remove(operation_active, (void *)cc-&gt;id);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		n = cc-&gt;status_stack;</div><div class='del'>-		while (n) {</div><div class='del'>-			g_warning("Camel operation status stack non empty: %s", (char *)n-&gt;data);</div><div class='del'>-			g_free(n-&gt;data);</div><div class='del'>-			n = n-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_slist_free(cc-&gt;status_stack);</div><div class='del'>-</div><div class='del'>-		g_free(cc);</div><div class='del'>-	} else {</div><div class='del'>-		cc-&gt;refcount--;</div><div class='del'>-	}</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_cancel_block:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Block cancellation for this operation.  If @cc is NULL, then the</div><div class='del'>- * current thread is blocked.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_cancel_block(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		operation_active = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc)</div><div class='del'>-		cc-&gt;blocked++;</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_cancel_unblock:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Unblock cancellation, when the unblock count reaches the block</div><div class='del'>- * count, then this operation can be cancelled.  If @cc is NULL, then</div><div class='del'>- * the current thread is unblocked.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_cancel_unblock(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		operation_active = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc)</div><div class='del'>-		cc-&gt;blocked--;</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_thread(void *key, CamelOperation *cc, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelOperationMsg *msg;</div><div class='del'>-</div><div class='del'>-	if (cc) {</div><div class='del'>-		d(printf("cancelling thread %d\n", cc-&gt;id));</div><div class='del'>-</div><div class='del'>-		cc-&gt;flags |= CAMEL_OPERATION_CANCELLED;</div><div class='del'>-		msg = g_malloc0(sizeof(*msg));</div><div class='del'>-		e_msgport_put(cc-&gt;cancel_port, (EMsg *)msg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_cancel:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Cancel a given operation.  If @cc is NULL then all outstanding</div><div class='del'>- * operations are cancelled.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_cancel(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CamelOperationMsg *msg;</div><div class='del'>-	</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL) {</div><div class='del'>-		if (operation_active) {</div><div class='del'>-			g_hash_table_foreach(operation_active, (GHFunc)cancel_thread, NULL);</div><div class='del'>-		}</div><div class='del'>-	} else if ((cc-&gt;flags &amp; CAMEL_OPERATION_CANCELLED) == 0) {</div><div class='del'>-		d(printf("cancelling thread %d\n", cc-&gt;id));</div><div class='del'>-</div><div class='del'>-		cc-&gt;flags |= CAMEL_OPERATION_CANCELLED;</div><div class='del'>-		msg = g_malloc0(sizeof(*msg));</div><div class='del'>-		e_msgport_put(cc-&gt;cancel_port, (EMsg *)msg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_register:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Register a thread or the main thread for cancellation through @cc.</div><div class='del'>- * If @cc is NULL, then a new cancellation is created for this thread,</div><div class='del'>- * but may only be cancelled from the same thread.</div><div class='del'>- *</div><div class='del'>- * All calls to operation_register() should be matched with calls to</div><div class='del'>- * operation_unregister(), or resources will be lost.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_register(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	pthread_t id = pthread_self();</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		operation_active = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (cc == NULL) {</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)id);</div><div class='del'>-		if (cc == NULL) {</div><div class='del'>-			cc = camel_operation_new(NULL, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cc-&gt;id == (~0)) {</div><div class='del'>-		cc-&gt;id = id;</div><div class='del'>-		g_hash_table_insert(operation_active, (void *)id, cc);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning("Re-registering thread %lu for cancellation as thread %lu", cc-&gt;id, id);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("registering thread %ld for cancellation\n", id));</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_unregister:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Unregister a given operation from being cancelled.  If @cc is NULL,</div><div class='del'>- * then the current thread is used.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_unregister(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		operation_active = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (cc == NULL) {</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-		if (cc == NULL) {</div><div class='del'>-			g_warning("Trying to unregister a thread that was never registered for cancellation");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cc) {</div><div class='del'>-		if (cc-&gt;id != (~0)) {</div><div class='del'>-			g_hash_table_remove(operation_active, (void *)cc-&gt;id);</div><div class='del'>-			cc-&gt;id = ~0;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Unregistering an operation that was already unregistered");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	d({if (cc) printf("unregistering thread %d for cancellation\n", cc-&gt;id);});</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_cancel_check:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Check if cancellation has been applied to @cc.  If @cc is NULL,</div><div class='del'>- * then the CamelOperation registered for the current thread is used.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the operation has been cancelled.</div><div class='del'>- **/</div><div class='del'>-gboolean camel_operation_cancel_check(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CamelOperationMsg *msg;</div><div class='del'>-	int cancelled;</div><div class='del'>-</div><div class='del'>-	d(printf("checking for cancel in thread %d\n", pthread_self()));</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL &amp;&amp; operation_active)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc == NULL || cc-&gt;blocked &gt; 0) {</div><div class='del'>-		d(printf("ahah!  cancellation is blocked\n"));</div><div class='del'>-		cancelled = FALSE;</div><div class='del'>-	} else if (cc-&gt;flags &amp; CAMEL_OPERATION_CANCELLED) {</div><div class='del'>-		d(printf("previously cancelled\n"));</div><div class='del'>-		cancelled = TRUE;</div><div class='del'>-	} else if ((msg = (CamelOperationMsg *)e_msgport_get(cc-&gt;cancel_port))) {</div><div class='del'>-		d(printf("Got cancellation message\n"));</div><div class='del'>-		g_free(msg);</div><div class='del'>-		cc-&gt;flags |= CAMEL_OPERATION_CANCELLED;</div><div class='del'>-		cancelled = TRUE;</div><div class='del'>-	} else</div><div class='del'>-		cancelled = FALSE;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	return cancelled;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_cancel_fd:</div><div class='del'>- * @cc: </div><div class='del'>- * </div><div class='del'>- * Retrieve a file descriptor that can be waited on (select, or poll)</div><div class='del'>- * for read, to asynchronously detect cancellation.</div><div class='del'>- * </div><div class='del'>- * Return value: The fd, or -1 if cancellation is not available</div><div class='del'>- * (blocked, or has not been registered for this thread).</div><div class='del'>- **/</div><div class='del'>-int camel_operation_cancel_fd(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL &amp;&amp; operation_active) {</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cc == NULL</div><div class='del'>-	    || cc-&gt;blocked) {</div><div class='del'>-		CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cc-&gt;cancel_fd == -1)</div><div class='del'>-		cc-&gt;cancel_fd = e_msgport_fd(cc-&gt;cancel_port);</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	return cc-&gt;cancel_fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_start:</div><div class='del'>- * @cc: </div><div class='del'>- * @what: </div><div class='del'>- * @: </div><div class='del'>- * </div><div class='del'>- * Report the start of an operation.  All start operations should have</div><div class='del'>- * similar end operations.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_start(CamelOperation *cc, char *what, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *msg;</div><div class='del'>-	struct _status_stack *s;</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc == NULL || cc-&gt;status == NULL) {</div><div class='del'>-		CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start(ap, what);</div><div class='del'>-	msg = g_strdup_vprintf(what, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-	cc-&gt;status_update = 0;</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;msg = msg;</div><div class='del'>-	s-&gt;flags = 0;</div><div class='del'>-	cc-&gt;lastreport = s;</div><div class='del'>-	cc-&gt;status_stack = g_slist_prepend(cc-&gt;status_stack, s);</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	cc-&gt;status(cc, msg, CAMEL_OPERATION_START, cc-&gt;status_data);</div><div class='del'>-</div><div class='del'>-	d(printf("start '%s'\n", msg, pc));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_start_transient:</div><div class='del'>- * @cc: </div><div class='del'>- * @what: </div><div class='del'>- * @: </div><div class='del'>- * </div><div class='del'>- * Start a transient event.  We only update this to the display if it</div><div class='del'>- * takes very long to process, and if we do, we then go back to the</div><div class='del'>- * previous state when finished.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_start_transient(CamelOperation *cc, char *what, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *msg;</div><div class='del'>-	struct _status_stack *s;</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc == NULL || cc-&gt;status == NULL) {</div><div class='del'>-		CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	va_start(ap, what);</div><div class='del'>-	msg = g_strdup_vprintf(what, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-	cc-&gt;status_update = 0;</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;msg = msg;</div><div class='del'>-	s-&gt;flags = CAMEL_OPERATION_TRANSIENT;</div><div class='del'>-	s-&gt;stamp = stamp();</div><div class='del'>-	cc-&gt;status_stack = g_slist_prepend(cc-&gt;status_stack, s);</div><div class='del'>-	d(printf("start '%s'\n", msg, pc));</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	/* we dont report it yet */</div><div class='del'>-	/*cc-&gt;status(cc, msg, CAMEL_OPERATION_START, cc-&gt;status_data);*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned int stamp(void)</div><div class='del'>-{</div><div class='del'>-	struct timeval tv;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;tv, NULL);</div><div class='del'>-	/* update 4 times/second */</div><div class='del'>-	return (tv.tv_sec * 4) + tv.tv_usec / (1000000/4);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_progress:</div><div class='del'>- * @cc: Operation to report to.</div><div class='del'>- * @pc: Percent complete, 0 to 100.</div><div class='del'>- * </div><div class='del'>- * Report progress on the current operation.  If @cc is NULL, then the</div><div class='del'>- * currently registered operation is used.  @pc reports the current</div><div class='del'>- * percentage of completion, which should be in the range of 0 to 100.</div><div class='del'>- *</div><div class='del'>- * If the total percentage is not know, then use</div><div class='del'>- * camel_operation_progress_count().</div><div class='del'>- **/</div><div class='del'>-void camel_operation_progress(CamelOperation *cc, int pc)</div><div class='del'>-{</div><div class='del'>-	unsigned int now;</div><div class='del'>-	struct _status_stack *s;</div><div class='del'>-	char *msg = NULL;</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc == NULL || cc-&gt;status == NULL || cc-&gt;status_stack == NULL) {</div><div class='del'>-		CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = cc-&gt;status_stack-&gt;data;</div><div class='del'>-	s-&gt;pc = pc;</div><div class='del'>-</div><div class='del'>-	/* Transient messages dont start updating till 4 seconds after</div><div class='del'>-	   they started, then they update every second */</div><div class='del'>-	now = stamp();</div><div class='del'>-	if (cc-&gt;status_update == now) {</div><div class='del'>-		cc = NULL;</div><div class='del'>-	} else if (s-&gt;flags &amp; CAMEL_OPERATION_TRANSIENT) {</div><div class='del'>-		if (s-&gt;stamp + CAMEL_OPERATION_TRANSIENT_DELAY &gt; now) {</div><div class='del'>-			cc = NULL;</div><div class='del'>-		} else {</div><div class='del'>-			cc-&gt;status_update = now;</div><div class='del'>-			cc-&gt;lastreport = s;</div><div class='del'>-			msg = g_strdup(s-&gt;msg);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		s-&gt;stamp = cc-&gt;status_update = now;</div><div class='del'>-		cc-&gt;lastreport = s;</div><div class='del'>-		msg = g_strdup(s-&gt;msg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	if (cc) {</div><div class='del'>-		cc-&gt;status(cc, msg, pc, cc-&gt;status_data);</div><div class='del'>-		g_free(msg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_operation_progress_count(CamelOperation *cc, int sofar)</div><div class='del'>-{</div><div class='del'>-	camel_operation_progress(cc, sofar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_operation_end:</div><div class='del'>- * @cc: </div><div class='del'>- * @what: Format string.</div><div class='del'>- * @: </div><div class='del'>- * </div><div class='del'>- * Report the end of an operation.  If @cc is NULL, then the currently</div><div class='del'>- * registered operation is notified.</div><div class='del'>- **/</div><div class='del'>-void camel_operation_end(CamelOperation *cc)</div><div class='del'>-{</div><div class='del'>-	struct _status_stack *s, *p;</div><div class='del'>-	unsigned int now;</div><div class='del'>-	char *msg = NULL;</div><div class='del'>-	int pc = 0;</div><div class='del'>-</div><div class='del'>-	if (operation_active == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_LOCK();</div><div class='del'>-</div><div class='del'>-	if (cc == NULL)</div><div class='del'>-		cc = g_hash_table_lookup(operation_active, (void *)pthread_self());</div><div class='del'>-</div><div class='del'>-	if (cc == NULL || cc-&gt;status == NULL || cc-&gt;status_stack == NULL) {</div><div class='del'>-		CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* so what we do here is this.  If the operation that just</div><div class='del'>-	 * ended was transient, see if we have any other transient</div><div class='del'>-	 * messages that haven't been updated yet above us, otherwise,</div><div class='del'>-	 * re-update as a non-transient at the last reported pc */</div><div class='del'>-	now = stamp();</div><div class='del'>-	s = cc-&gt;status_stack-&gt;data;</div><div class='del'>-	if (s-&gt;flags &amp; CAMEL_OPERATION_TRANSIENT) {</div><div class='del'>-		if (cc-&gt;lastreport == s) {</div><div class='del'>-			GSList *l = cc-&gt;status_stack-&gt;next;</div><div class='del'>-			while (l) {</div><div class='del'>-				p = l-&gt;data;</div><div class='del'>-				if (p-&gt;flags &amp; CAMEL_OPERATION_TRANSIENT) {</div><div class='del'>-					if (p-&gt;stamp + CAMEL_OPERATION_TRANSIENT_DELAY &lt; now) {</div><div class='del'>-						msg = g_strdup(p-&gt;msg);</div><div class='del'>-						pc = p-&gt;pc;</div><div class='del'>-						cc-&gt;lastreport = p;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					msg = g_strdup(p-&gt;msg);</div><div class='del'>-					pc = p-&gt;pc;</div><div class='del'>-					cc-&gt;lastreport = p;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				l = l-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free(s-&gt;msg);</div><div class='del'>-	} else {</div><div class='del'>-		msg = s-&gt;msg;</div><div class='del'>-		pc = CAMEL_OPERATION_END;</div><div class='del'>-		cc-&gt;lastreport = s;</div><div class='del'>-	}</div><div class='del'>-	g_free(s);</div><div class='del'>-	cc-&gt;status_stack = g_slist_remove_link(cc-&gt;status_stack, cc-&gt;status_stack);</div><div class='del'>-</div><div class='del'>-	CAMEL_ACTIVE_UNLOCK();</div><div class='del'>-</div><div class='del'>-	if (msg) {</div><div class='del'>-		cc-&gt;status(cc, msg, pc, cc-&gt;status_data);</div><div class='del'>-		g_free(msg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-operation.h b/camel/camel-operation.h<br/>deleted file mode 100644<br/>index 08da410b68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-operation.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-operation.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;NotZed@Ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001 Ximian, Inc. (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_OPERATION_H</div><div class='del'>-#define CAMEL_OPERATION_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* cancellation helper stuff, not yet finalised */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelOperation CamelOperation;</div><div class='del'>-</div><div class='del'>-typedef void (*CamelOperationStatusFunc)(struct _CamelOperation *op, const char *what, int pc, void *data);</div><div class='del'>-</div><div class='del'>-enum _camel_operation_status_t {</div><div class='del'>-	CAMEL_OPERATION_START = -1,</div><div class='del'>-	CAMEL_OPERATION_END = -2,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* main thread functions */</div><div class='del'>-CamelOperation *camel_operation_new(CamelOperationStatusFunc status, void *status_data);</div><div class='del'>-void camel_operation_ref(CamelOperation *cc);</div><div class='del'>-void camel_operation_unref(CamelOperation *cc);</div><div class='del'>-void camel_operation_reset(CamelOperation *cc);</div><div class='del'>-void camel_operation_cancel(CamelOperation *cc);</div><div class='del'>-/* subthread functions */</div><div class='del'>-void camel_operation_register(CamelOperation *cc);</div><div class='del'>-void camel_operation_unregister(CamelOperation *cc);</div><div class='del'>-/* called internally by camel, for the current thread */</div><div class='del'>-void camel_operation_cancel_block(CamelOperation *cc);</div><div class='del'>-void camel_operation_cancel_unblock(CamelOperation *cc);</div><div class='del'>-int camel_operation_cancel_check(CamelOperation *cc);</div><div class='del'>-int camel_operation_cancel_fd(CamelOperation *cc);</div><div class='del'>-/* return the registered operation for this thread, if there is one */</div><div class='del'>-CamelOperation *camel_operation_registered(void);</div><div class='del'>-</div><div class='del'>-void camel_operation_start(CamelOperation *cc, char *what, ...);</div><div class='del'>-void camel_operation_start_transient(CamelOperation *cc, char *what, ...);</div><div class='del'>-void camel_operation_progress(CamelOperation *cc, int pc);</div><div class='del'>-void camel_operation_progress_count(CamelOperation *cc, int sofar);</div><div class='del'>-void camel_operation_end(CamelOperation *cc);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_OPERATION_H */</div><div class='head'>diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c<br/>deleted file mode 100644<br/>index 68e0e257b5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-partition-table.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-partition-table.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1015 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-</div><div class='del'>-#include "camel-block-file.h"</div><div class='del'>-#include "camel-partition-table.h"</div><div class='del'>-</div><div class='del'>-/* Do we synchronously write table updates - makes the</div><div class='del'>-   tables consistent after program crash without sync */</div><div class='del'>-/*#define SYNC_UPDATES*/</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/</div><div class='del'>-/* key index debug */</div><div class='del'>-#define k(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionTablePrivate {</div><div class='del'>-	pthread_mutex_t lock;	/* for locking partition */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_PARTITION_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_PARTITION_TABLE_LOCK(kf, lock)</div><div class='del'>-#define CAMEL_PARTITION_TABLE_UNLOCK(kf, lock)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_partition_table_class_init(CamelPartitionTableClass *klass)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_partition_table_init(CamelPartitionTable *cpi)</div><div class='del'>-{</div><div class='del'>-	struct _CamelPartitionTablePrivate *p;</div><div class='del'>-</div><div class='del'>-	e_dlist_init(&amp;cpi-&gt;partition);</div><div class='del'>-</div><div class='del'>-	p = cpi-&gt;priv = g_malloc0(sizeof(*cpi-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;lock, NULL);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_partition_table_finalise(CamelPartitionTable *cpi)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	struct _CamelPartitionTablePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = cpi-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (cpi-&gt;blocks) {</div><div class='del'>-		while ((bl = (CamelBlock *)e_dlist_remhead(&amp;cpi-&gt;partition))) {</div><div class='del'>-			camel_block_file_sync_block(cpi-&gt;blocks, bl);</div><div class='del'>-			camel_block_file_unref_block(cpi-&gt;blocks, bl);</div><div class='del'>-		}</div><div class='del'>-		camel_block_file_sync(cpi-&gt;blocks);</div><div class='del'>-</div><div class='del'>-		camel_object_unref((CamelObject *)cpi-&gt;blocks);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_partition_table_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelPartitionTable",</div><div class='del'>-					   sizeof (CamelPartitionTable),</div><div class='del'>-					   sizeof (CamelPartitionTableClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_partition_table_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_partition_table_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_partition_table_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  Have 2 hashes:</div><div class='del'>-  Name -&gt; nameid</div><div class='del'>-  Word -&gt; wordid</div><div class='del'>-</div><div class='del'>-nameid is pointer to name file, includes a bit to say if name is deleted</div><div class='del'>-wordid is a pointer to word file, includes pointer to start of word entries</div><div class='del'>-</div><div class='del'>-delete a name -&gt; set it as deleted, do nothing else though</div><div class='del'>-</div><div class='del'>-lookup word, if nameid is deleted, mark it in wordlist as unused and mark for write (?)</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/* This simple hash seems to work quite well */</div><div class='del'>-static camel_hash_t hash_key(const char *key)</div><div class='del'>-{</div><div class='del'>-	camel_hash_t hash = 0xABADF00D;</div><div class='del'>-</div><div class='del'>-	while (*key) {</div><div class='del'>-		hash = hash * (*key) ^ (*key);</div><div class='del'>-		key++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Call with lock held */</div><div class='del'>-static CamelBlock *find_partition(CamelPartitionTable *cpi, camel_hash_t id, int *indexp)</div><div class='del'>-{</div><div class='del'>-	int index, jump;</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	CamelPartitionMapBlock *ptb;</div><div class='del'>-	CamelPartitionMap *part;</div><div class='del'>-</div><div class='del'>-	/* first, find the block this key might be in, then binary search the block */</div><div class='del'>-	bl = (CamelBlock *)cpi-&gt;partition.head;</div><div class='del'>-	while (bl-&gt;next) {</div><div class='del'>-		ptb = (CamelPartitionMapBlock *)&amp;bl-&gt;data;</div><div class='del'>-		part = ptb-&gt;partition;</div><div class='del'>-		if (ptb-&gt;used &gt; 0 &amp;&amp; id &lt;= part[ptb-&gt;used-1].hashid) {</div><div class='del'>-			index = ptb-&gt;used/2;</div><div class='del'>-			jump = ptb-&gt;used/4;</div><div class='del'>-</div><div class='del'>-			if (jump == 0)</div><div class='del'>-				jump = 1;</div><div class='del'>-</div><div class='del'>-			while (1) {</div><div class='del'>-				if (id &lt;= part[index].hashid) {</div><div class='del'>-					if (index == 0 || id &gt; part[index-1].hashid)</div><div class='del'>-						break;</div><div class='del'>-					index -= jump;</div><div class='del'>-				} else {</div><div class='del'>-					if (index &gt;= ptb-&gt;used-1)</div><div class='del'>-						break;</div><div class='del'>-					index += jump;</div><div class='del'>-				}</div><div class='del'>-				jump = jump/2;</div><div class='del'>-				if (jump == 0)</div><div class='del'>-					jump = 1;</div><div class='del'>-			}</div><div class='del'>-			*indexp = index;</div><div class='del'>-</div><div class='del'>-			return bl;</div><div class='del'>-		}</div><div class='del'>-		bl = bl-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning("could not find a partition that could fit !  partition table corrupt!");</div><div class='del'>-</div><div class='del'>-	/* This should never be reached */</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelPartitionTable *camel_partition_table_new(struct _CamelBlockFile *bs, camel_block_t root)</div><div class='del'>-{</div><div class='del'>-	CamelPartitionTable *cpi;</div><div class='del'>-	CamelPartitionMapBlock *ptb;</div><div class='del'>-	CamelPartitionKeyBlock *kb;</div><div class='del'>-	CamelBlock *block, *pblock;</div><div class='del'>-</div><div class='del'>-	cpi = (CamelPartitionTable *)camel_object_new(camel_partition_table_get_type());</div><div class='del'>-	cpi-&gt;rootid = root;</div><div class='del'>-	cpi-&gt;blocks = bs;</div><div class='del'>-	camel_object_ref((CamelObject *)bs);</div><div class='del'>-</div><div class='del'>-	/* read the partition table into memory */</div><div class='del'>-	do {</div><div class='del'>-		block = camel_block_file_get_block(bs, root);</div><div class='del'>-		if (block == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		ptb = (CamelPartitionMapBlock *)&amp;block-&gt;data;</div><div class='del'>-</div><div class='del'>-		d(printf("Adding partition block, used = %d, hashid = %08x\n", ptb-&gt;used, ptb-&gt;partition[0].hashid));</div><div class='del'>-</div><div class='del'>-		/* if we have no data, prime initial block */</div><div class='del'>-		if (ptb-&gt;used == 0 &amp;&amp; e_dlist_empty(&amp;cpi-&gt;partition) &amp;&amp; ptb-&gt;next == 0) {</div><div class='del'>-			pblock = camel_block_file_new_block(bs);</div><div class='del'>-			if (pblock == NULL) {</div><div class='del'>-				camel_block_file_unref_block(bs, block);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			kb = (CamelPartitionKeyBlock *)&amp;pblock-&gt;data;</div><div class='del'>-			kb-&gt;used = 0;</div><div class='del'>-			ptb-&gt;used = 1;</div><div class='del'>-			ptb-&gt;partition[0].hashid = 0xffffffff;</div><div class='del'>-			ptb-&gt;partition[0].blockid = pblock-&gt;id;</div><div class='del'>-			camel_block_file_touch_block(bs, pblock);</div><div class='del'>-			camel_block_file_unref_block(bs, pblock);</div><div class='del'>-			camel_block_file_touch_block(bs, block);</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-			camel_block_file_sync_block(bs, block);</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		root = ptb-&gt;next;</div><div class='del'>-		camel_block_file_detach_block(bs, block);</div><div class='del'>-		e_dlist_addtail(&amp;cpi-&gt;partition, (EDListNode *)block);</div><div class='del'>-	} while (root);</div><div class='del'>-</div><div class='del'>-	return cpi;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	camel_object_unref((CamelObject *)cpi);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sync our blocks, the caller must still sync the blockfile itself */</div><div class='del'>-int</div><div class='del'>-camel_partition_table_sync(CamelPartitionTable *cpi)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl, *bn;</div><div class='del'>-	struct _CamelPartitionTablePrivate *p;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);</div><div class='del'>-</div><div class='del'>-	p = cpi-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (cpi-&gt;blocks) {</div><div class='del'>-		bl = (CamelBlock *)cpi-&gt;partition.head;</div><div class='del'>-		bn = bl-&gt;next;</div><div class='del'>-		while (bn) {</div><div class='del'>-			ret = camel_block_file_sync_block(cpi-&gt;blocks, bl);</div><div class='del'>-			if (ret == -1)</div><div class='del'>-				goto fail;</div><div class='del'>-			bl = bn;</div><div class='del'>-			bn = bn-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-camel_key_t camel_partition_table_lookup(CamelPartitionTable *cpi, const char *key)</div><div class='del'>-{</div><div class='del'>-	CamelPartitionKeyBlock *pkb;</div><div class='del'>-	CamelPartitionMapBlock *ptb;</div><div class='del'>-	CamelBlock *block, *ptblock;</div><div class='del'>-	camel_hash_t hashid;</div><div class='del'>-	camel_key_t keyid = 0;</div><div class='del'>-	int index, i;</div><div class='del'>-</div><div class='del'>-	hashid = hash_key(key);</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);</div><div class='del'>-</div><div class='del'>-	ptblock = find_partition(cpi, hashid, &amp;index);</div><div class='del'>-	if (ptblock == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	ptb = (CamelPartitionMapBlock *)&amp;ptblock-&gt;data;</div><div class='del'>-	block = camel_block_file_get_block(cpi-&gt;blocks, ptb-&gt;partition[index].blockid);</div><div class='del'>-	if (block == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pkb = (CamelPartitionKeyBlock *)&amp;block-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* What to do about duplicate hash's? */</div><div class='del'>-	for (i=0;i&lt;pkb-&gt;used;i++) {</div><div class='del'>-		if (pkb-&gt;keys[i].hashid == hashid) {</div><div class='del'>-			/* !! need to: lookup and compare string value */</div><div class='del'>-			/* get_key() if key == key ... */</div><div class='del'>-			keyid = pkb-&gt;keys[i].keyid;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-	</div><div class='del'>-	camel_block_file_unref_block(cpi-&gt;blocks, block);</div><div class='del'>-</div><div class='del'>-	return keyid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_partition_table_remove(CamelPartitionTable *cpi, const char *key)</div><div class='del'>-{</div><div class='del'>-	CamelPartitionKeyBlock *pkb;</div><div class='del'>-	CamelPartitionMapBlock *ptb;</div><div class='del'>-	CamelBlock *block, *ptblock;</div><div class='del'>-	camel_hash_t hashid;</div><div class='del'>-	camel_key_t keyid = 0;</div><div class='del'>-	int index, i;</div><div class='del'>-</div><div class='del'>-	hashid = hash_key(key);</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);</div><div class='del'>-	</div><div class='del'>-	ptblock = find_partition(cpi, hashid, &amp;index);</div><div class='del'>-	if (ptblock == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	ptb = (CamelPartitionMapBlock *)&amp;ptblock-&gt;data;</div><div class='del'>-	block = camel_block_file_get_block(cpi-&gt;blocks, ptb-&gt;partition[index].blockid);</div><div class='del'>-	if (block == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	pkb = (CamelPartitionKeyBlock *)&amp;block-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* What to do about duplicate hash's? */</div><div class='del'>-	for (i=0;i&lt;pkb-&gt;used;i++) {</div><div class='del'>-		if (pkb-&gt;keys[i].hashid == hashid) {</div><div class='del'>-			/* !! need to: lookup and compare string value */</div><div class='del'>-			/* get_key() if key == key ... */</div><div class='del'>-			keyid = pkb-&gt;keys[i].keyid;</div><div class='del'>-</div><div class='del'>-			/* remove this key */</div><div class='del'>-			pkb-&gt;used--;</div><div class='del'>-			for (;i&lt;pkb-&gt;used;i++) {</div><div class='del'>-				pkb-&gt;keys[i].keyid = pkb-&gt;keys[i+1].keyid;</div><div class='del'>-				pkb-&gt;keys[i].hashid = pkb-&gt;keys[i+1].hashid;</div><div class='del'>-			}</div><div class='del'>-			camel_block_file_touch_block(cpi-&gt;blocks, block);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-	</div><div class='del'>-	camel_block_file_unref_block(cpi-&gt;blocks, block);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-keys_cmp(const void *ap, const void *bp)</div><div class='del'>-{</div><div class='del'>-	const CamelPartitionKey *a = ap;</div><div class='del'>-	const CamelPartitionKey *b = bp;</div><div class='del'>-</div><div class='del'>-	if (a-&gt;hashid &lt; b-&gt;hashid)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (a-&gt;hashid &gt; b-&gt;hashid)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_partition_table_add(CamelPartitionTable *cpi, const char *key, camel_key_t keyid)</div><div class='del'>-{</div><div class='del'>-	camel_hash_t hashid, partid;</div><div class='del'>-	int index, newindex = 0; /* initialisation of this and pkb/nkb is just to silence compiler */</div><div class='del'>-	CamelPartitionMapBlock *ptb, *ptn;</div><div class='del'>-	CamelPartitionKeyBlock *kb, *newkb, *nkb = NULL, *pkb = NULL;</div><div class='del'>-	CamelBlock *block, *ptblock, *ptnblock;</div><div class='del'>-	int i, half, len;</div><div class='del'>-	struct _CamelPartitionKey keys[CAMEL_BLOCK_SIZE/4];</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-#define KEY_SIZE (sizeof(kb-&gt;keys)/sizeof(kb-&gt;keys[0]))</div><div class='del'>-</div><div class='del'>-	hashid = hash_key(key);</div><div class='del'>-</div><div class='del'>-	CAMEL_PARTITION_TABLE_LOCK(cpi, lock);</div><div class='del'>-	ptblock = find_partition(cpi, hashid, &amp;index);</div><div class='del'>-	if (ptblock == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	ptb = (CamelPartitionMapBlock *)&amp;ptblock-&gt;data;</div><div class='del'>-	block = camel_block_file_get_block(cpi-&gt;blocks, ptb-&gt;partition[index].blockid);</div><div class='del'>-	if (block == NULL) {</div><div class='del'>-		CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	kb = (CamelPartitionKeyBlock *)&amp;block-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* TODO: Keep the key array in sorted order, cheaper lookups and split operation */</div><div class='del'>-</div><div class='del'>-	if (kb-&gt;used &lt; sizeof(kb-&gt;keys)/sizeof(kb-&gt;keys[0])) {</div><div class='del'>-		/* Have room, just put it in */</div><div class='del'>-		kb-&gt;keys[kb-&gt;used].hashid = hashid;</div><div class='del'>-		kb-&gt;keys[kb-&gt;used].keyid = keyid;</div><div class='del'>-		kb-&gt;used++;</div><div class='del'>-	} else {</div><div class='del'>-		CamelBlock *newblock = NULL, *nblock = NULL, *pblock = NULL;</div><div class='del'>-</div><div class='del'>-		/* Need to split?  See if previous or next has room, then split across that instead */</div><div class='del'>-</div><div class='del'>-		/* TODO: Should look at next/previous partition table block as well ... */</div><div class='del'>-</div><div class='del'>-		if (index &gt; 0) {</div><div class='del'>-			pblock = camel_block_file_get_block(cpi-&gt;blocks, ptb-&gt;partition[index-1].blockid);</div><div class='del'>-			if (pblock == NULL)</div><div class='del'>-				goto fail;</div><div class='del'>-			pkb = (CamelPartitionKeyBlock *)&amp;pblock-&gt;data;</div><div class='del'>-		}</div><div class='del'>-		if (index &lt; (ptb-&gt;used-1)) {</div><div class='del'>-			nblock = camel_block_file_get_block(cpi-&gt;blocks, ptb-&gt;partition[index+1].blockid);</div><div class='del'>-			if (nblock == NULL) {</div><div class='del'>-				if (pblock)</div><div class='del'>-					camel_block_file_unref_block(cpi-&gt;blocks, pblock);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			nkb = (CamelPartitionKeyBlock *)&amp;nblock-&gt;data;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (pblock &amp;&amp; pkb-&gt;used &lt; KEY_SIZE) {</div><div class='del'>-			if (nblock &amp;&amp; nkb-&gt;used &lt; KEY_SIZE) {</div><div class='del'>-				if (pkb-&gt;used &lt; nkb-&gt;used) {</div><div class='del'>-					newindex = index+1;</div><div class='del'>-					newblock = nblock;</div><div class='del'>-				} else {</div><div class='del'>-					newindex = index-1;</div><div class='del'>-					newblock = pblock;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				newindex = index-1;</div><div class='del'>-				newblock = pblock;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (nblock &amp;&amp; nkb-&gt;used &lt; KEY_SIZE) {</div><div class='del'>-				newindex = index+1;</div><div class='del'>-				newblock = nblock;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* We had no room, need to split across another block */</div><div class='del'>-		if (newblock == NULL) {</div><div class='del'>-			/* See if we have room in the partition table for this block or need to split that too */</div><div class='del'>-			if (ptb-&gt;used &gt;= sizeof(ptb-&gt;partition)/sizeof(ptb-&gt;partition[0])) {</div><div class='del'>-				/* TODO: Could check next block to see if it'll fit there first */</div><div class='del'>-				ptnblock = camel_block_file_new_block(cpi-&gt;blocks);</div><div class='del'>-				if (ptnblock == NULL) {</div><div class='del'>-					if (nblock)</div><div class='del'>-						camel_block_file_unref_block(cpi-&gt;blocks, nblock);</div><div class='del'>-					if (pblock)</div><div class='del'>-						camel_block_file_unref_block(cpi-&gt;blocks, pblock);</div><div class='del'>-					goto fail;</div><div class='del'>-				}</div><div class='del'>-				camel_block_file_detach_block(cpi-&gt;blocks, ptnblock);</div><div class='del'>-</div><div class='del'>-				/* split block and link on-disk, always sorted */</div><div class='del'>-				ptn = (CamelPartitionMapBlock *)&amp;ptnblock-&gt;data;</div><div class='del'>-				ptn-&gt;next = ptb-&gt;next;</div><div class='del'>-				ptb-&gt;next = ptnblock-&gt;id;</div><div class='del'>-				len = ptb-&gt;used / 2;</div><div class='del'>-				ptn-&gt;used = ptb-&gt;used - len;</div><div class='del'>-				ptb-&gt;used = len;</div><div class='del'>-				memcpy(ptn-&gt;partition, &amp;ptb-&gt;partition[len], ptn-&gt;used * sizeof(ptb-&gt;partition[0]));</div><div class='del'>-</div><div class='del'>-				/* link in-memory */</div><div class='del'>-				ptnblock-&gt;next = ptblock-&gt;next;</div><div class='del'>-				ptblock-&gt;next-&gt;prev = ptnblock;</div><div class='del'>-				ptblock-&gt;next = ptnblock;</div><div class='del'>-				ptnblock-&gt;prev = ptblock;</div><div class='del'>-</div><div class='del'>-				/* write in right order to ensure structure */</div><div class='del'>-				camel_block_file_touch_block(cpi-&gt;blocks, ptnblock);</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-				camel_block_file_sync_block(cpi-&gt;blocks, ptnblock);</div><div class='del'>-#endif</div><div class='del'>-				if (index &gt; len) {</div><div class='del'>-					camel_block_file_touch_block(cpi-&gt;blocks, ptblock);</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-					camel_block_file_sync_block(cpi-&gt;blocks, ptblock);</div><div class='del'>-#endif</div><div class='del'>-					index -= len;</div><div class='del'>-					ptb = ptn;</div><div class='del'>-					ptblock = ptnblock;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* try get newblock before modifying existing */</div><div class='del'>-			newblock = camel_block_file_new_block(cpi-&gt;blocks);</div><div class='del'>-			if (newblock == NULL) {</div><div class='del'>-				if (nblock)</div><div class='del'>-					camel_block_file_unref_block(cpi-&gt;blocks, nblock);</div><div class='del'>-				if (pblock)</div><div class='del'>-					camel_block_file_unref_block(cpi-&gt;blocks, pblock);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			for (i=ptb-&gt;used-1;i&gt;index;i--) {</div><div class='del'>-				ptb-&gt;partition[i+1].hashid = ptb-&gt;partition[i].hashid;</div><div class='del'>-				ptb-&gt;partition[i+1].blockid = ptb-&gt;partition[i].blockid;</div><div class='del'>-			}</div><div class='del'>-			ptb-&gt;used++;</div><div class='del'>-</div><div class='del'>-			newkb = (CamelPartitionKeyBlock *)&amp;newblock-&gt;data;</div><div class='del'>-			newkb-&gt;used = 0;</div><div class='del'>-			newindex = index+1;</div><div class='del'>-</div><div class='del'>-			ptb-&gt;partition[newindex].hashid = ptb-&gt;partition[index].hashid;</div><div class='del'>-			ptb-&gt;partition[newindex].blockid = newblock-&gt;id;</div><div class='del'>-</div><div class='del'>-			if (nblock)</div><div class='del'>-				camel_block_file_unref_block(cpi-&gt;blocks, nblock);</div><div class='del'>-			if (pblock)</div><div class='del'>-				camel_block_file_unref_block(cpi-&gt;blocks, pblock);</div><div class='del'>-		} else {</div><div class='del'>-			newkb = (CamelPartitionKeyBlock *)&amp;newblock-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (newblock == pblock) {</div><div class='del'>-				if (nblock)</div><div class='del'>-					camel_block_file_unref_block(cpi-&gt;blocks, nblock);</div><div class='del'>-			} else {</div><div class='del'>-				if (pblock)</div><div class='del'>-					camel_block_file_unref_block(cpi-&gt;blocks, pblock);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* sort keys to find midpoint */</div><div class='del'>-		len = kb-&gt;used;</div><div class='del'>-		memcpy(keys, kb-&gt;keys, sizeof(kb-&gt;keys[0])*len);</div><div class='del'>-		memcpy(keys+len, newkb-&gt;keys, sizeof(newkb-&gt;keys[0])*newkb-&gt;used);</div><div class='del'>-		len += newkb-&gt;used;</div><div class='del'>-		keys[len].hashid = hashid;</div><div class='del'>-		keys[len].keyid = keyid;</div><div class='del'>-		len++;</div><div class='del'>-		qsort(keys, len, sizeof(keys[0]), keys_cmp);</div><div class='del'>-</div><div class='del'>-		/* Split keys, fix partition table */</div><div class='del'>-		half = len/2;</div><div class='del'>-		partid = keys[half-1].hashid;</div><div class='del'>-</div><div class='del'>-		if (index &lt; newindex) {</div><div class='del'>-			memcpy(kb-&gt;keys, keys, sizeof(keys[0])*half);</div><div class='del'>-			kb-&gt;used = half;</div><div class='del'>-			memcpy(newkb-&gt;keys, keys+half, sizeof(keys[0])*(len-half));</div><div class='del'>-			newkb-&gt;used = len-half;</div><div class='del'>-			ptb-&gt;partition[index].hashid = partid;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(newkb-&gt;keys, keys, sizeof(keys[0])*half);</div><div class='del'>-			newkb-&gt;used = half;</div><div class='del'>-			memcpy(kb-&gt;keys, keys+half, sizeof(keys[0])*(len-half));</div><div class='del'>-			kb-&gt;used = len-half;</div><div class='del'>-			ptb-&gt;partition[newindex].hashid = partid;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_block_file_touch_block(cpi-&gt;blocks, ptblock);</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-		camel_block_file_sync_block(cpi-&gt;blocks, ptblock);</div><div class='del'>-#endif</div><div class='del'>-		camel_block_file_touch_block(cpi-&gt;blocks, newblock);</div><div class='del'>-		camel_block_file_unref_block(cpi-&gt;blocks, newblock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_block_file_touch_block(cpi-&gt;blocks, block);</div><div class='del'>-	camel_block_file_unref_block(cpi-&gt;blocks, block);</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_PARTITION_TABLE_UNLOCK(cpi, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-</div><div class='del'>-struct _CamelKeyTablePrivate {</div><div class='del'>-	pthread_mutex_t lock;	/* for locking key */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_KEY_TABLE_LOCK(kf, lock) (pthread_mutex_lock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_KEY_TABLE_UNLOCK(kf, lock) (pthread_mutex_unlock(&amp;(kf)-&gt;priv-&gt;lock))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_KEY_TABLE_LOCK(kf, lock)</div><div class='del'>-#define CAMEL_KEY_TABLE_UNLOCK(kf, lock)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_table_class_init(CamelKeyTableClass *klass)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_table_init(CamelKeyTable *ki)</div><div class='del'>-{</div><div class='del'>-	struct _CamelKeyTablePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = ki-&gt;priv = g_malloc0(sizeof(*ki-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_init(&amp;p-&gt;lock, NULL);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_key_table_finalise(CamelKeyTable *ki)</div><div class='del'>-{</div><div class='del'>-	struct _CamelKeyTablePrivate *p;</div><div class='del'>-</div><div class='del'>-	p = ki-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (ki-&gt;blocks) {</div><div class='del'>-		if (ki-&gt;root_block) {</div><div class='del'>-			camel_block_file_sync_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-			camel_block_file_unref_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-		}</div><div class='del'>-		camel_block_file_sync(ki-&gt;blocks);</div><div class='del'>-		camel_object_unref((CamelObject *)ki-&gt;blocks);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_destroy(&amp;p-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_key_table_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelKeyTable",</div><div class='del'>-					   sizeof (CamelKeyTable),</div><div class='del'>-					   sizeof (CamelKeyTableClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_key_table_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_key_table_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_key_table_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelKeyTable *</div><div class='del'>-camel_key_table_new(CamelBlockFile *bs, camel_block_t root)</div><div class='del'>-{</div><div class='del'>-	CamelKeyTable *ki;</div><div class='del'>-</div><div class='del'>-	ki = (CamelKeyTable *)camel_object_new(camel_key_table_get_type());</div><div class='del'>-</div><div class='del'>-	ki-&gt;blocks = bs;</div><div class='del'>-	camel_object_ref((CamelObject *)bs);</div><div class='del'>-	ki-&gt;rootid = root;</div><div class='del'>-</div><div class='del'>-	ki-&gt;root_block = camel_block_file_get_block(bs, ki-&gt;rootid);</div><div class='del'>-	if (ki-&gt;root_block == NULL) {</div><div class='del'>-		camel_object_unref((CamelObject *)ki);</div><div class='del'>-		ki = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		camel_block_file_detach_block(bs, ki-&gt;root_block);</div><div class='del'>-		ki-&gt;root = (CamelKeyRootBlock *)&amp;ki-&gt;root_block-&gt;data;</div><div class='del'>-</div><div class='del'>-		k(printf("Opening key index\n"));</div><div class='del'>-		k(printf(" first %u\n last %u\n free %u\n", ki-&gt;root-&gt;first, ki-&gt;root-&gt;last, ki-&gt;root-&gt;free));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ki;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_key_table_sync(CamelKeyTable *ki)</div><div class='del'>-{</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-	return 0;</div><div class='del'>-#else</div><div class='del'>-	return camel_block_file_sync_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-camel_key_t</div><div class='del'>-camel_key_table_add(CamelKeyTable *ki, const char *key, camel_block_t data, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *last, *next;</div><div class='del'>-	CamelKeyBlock *kblast, *kbnext;</div><div class='del'>-	int len, left;</div><div class='del'>-	unsigned int offset;</div><div class='del'>-	camel_key_t keyid = 0;</div><div class='del'>-</div><div class='del'>-	/* Maximum key size = 128 chars */</div><div class='del'>-	len = strlen(key);</div><div class='del'>-	if (len &gt; CAMEL_KEY_TABLE_MAX_KEY)</div><div class='del'>-		len = 128;</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_LOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	if (ki-&gt;root-&gt;last == 0) {</div><div class='del'>-		last = camel_block_file_new_block(ki-&gt;blocks);</div><div class='del'>-		if (last == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-		ki-&gt;root-&gt;last = ki-&gt;root-&gt;first = last-&gt;id;</div><div class='del'>-		camel_block_file_touch_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-		k(printf("adding first block, first = %u\n", ki-&gt;root-&gt;first));</div><div class='del'>-	} else {</div><div class='del'>-		last = camel_block_file_get_block(ki-&gt;blocks, ki-&gt;root-&gt;last);</div><div class='del'>-		if (last == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kblast = (CamelKeyBlock *)&amp;last-&gt;data;</div><div class='del'>-</div><div class='del'>-	if (kblast-&gt;used &gt;= 127)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (kblast-&gt;used &gt; 0) {</div><div class='del'>-		/*left = &amp;kblast-&gt;u.keydata[kblast-&gt;u.keys[kblast-&gt;used-1].offset] - (char *)(&amp;kblast-&gt;u.keys[kblast-&gt;used+1]);*/</div><div class='del'>-		left = kblast-&gt;u.keys[kblast-&gt;used-1].offset - sizeof(kblast-&gt;u.keys[0])*(kblast-&gt;used+1);</div><div class='del'>-		d(printf("key '%s' used = %d (%d), filled = %d, left = %d  len = %d?\n",</div><div class='del'>-			 key, kblast-&gt;used, kblast-&gt;used * sizeof(kblast-&gt;u.keys[0]),</div><div class='del'>-			 sizeof(kblast-&gt;u.keydata) - kblast-&gt;u.keys[kblast-&gt;used-1].offset,</div><div class='del'>-			 left, len));</div><div class='del'>-		if (left &lt; len) {</div><div class='del'>-			next = camel_block_file_new_block(ki-&gt;blocks);</div><div class='del'>-			if (next == NULL) {</div><div class='del'>-				camel_block_file_unref_block(ki-&gt;blocks, last);</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			kbnext = (CamelKeyBlock *)&amp;next-&gt;data;</div><div class='del'>-			kblast-&gt;next = next-&gt;id;</div><div class='del'>-			ki-&gt;root-&gt;last = next-&gt;id;</div><div class='del'>-			d(printf("adding new block, first = %u, last = %u\n", ki-&gt;root-&gt;first, ki-&gt;root-&gt;last));</div><div class='del'>-			camel_block_file_touch_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-			camel_block_file_touch_block(ki-&gt;blocks, last);</div><div class='del'>-			camel_block_file_unref_block(ki-&gt;blocks, last);</div><div class='del'>-			kblast = kbnext;</div><div class='del'>-			last = next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (kblast-&gt;used &gt; 0)</div><div class='del'>-		offset = kblast-&gt;u.keys[kblast-&gt;used-1].offset - len;</div><div class='del'>-	else</div><div class='del'>-		offset = sizeof(kblast-&gt;u.keydata)-len;</div><div class='del'>-</div><div class='del'>-	kblast-&gt;u.keys[kblast-&gt;used].flags = flags;</div><div class='del'>-	kblast-&gt;u.keys[kblast-&gt;used].data = data;</div><div class='del'>-	kblast-&gt;u.keys[kblast-&gt;used].offset = offset;</div><div class='del'>-	memcpy(kblast-&gt;u.keydata + offset, key, len);</div><div class='del'>-</div><div class='del'>-	keyid = (last-&gt;id &amp; (~(CAMEL_BLOCK_SIZE-1))) | kblast-&gt;used;</div><div class='del'>-</div><div class='del'>-	kblast-&gt;used++;</div><div class='del'>-</div><div class='del'>-	g_assert(kblast-&gt;used &lt; 127);</div><div class='del'>-</div><div class='del'>-	camel_block_file_touch_block(ki-&gt;blocks, last);</div><div class='del'>-	camel_block_file_unref_block(ki-&gt;blocks, last);</div><div class='del'>-</div><div class='del'>-#ifdef SYNC_UPDATES</div><div class='del'>-	camel_block_file_sync_block(ki-&gt;blocks, ki-&gt;root_block);</div><div class='del'>-#endif</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	return keyid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_key_table_set_data(CamelKeyTable *ki, camel_key_t keyid, camel_block_t data)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	camel_block_t blockid;</div><div class='del'>-	int index;</div><div class='del'>-	CamelKeyBlock *kb;</div><div class='del'>-</div><div class='del'>-	if (keyid == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blockid =  keyid &amp; (~(CAMEL_BLOCK_SIZE-1));</div><div class='del'>-	index = keyid &amp; (CAMEL_BLOCK_SIZE-1);</div><div class='del'>-</div><div class='del'>-	bl = camel_block_file_get_block(ki-&gt;blocks, blockid);</div><div class='del'>-	if (bl == NULL)</div><div class='del'>-		return;</div><div class='del'>-	kb = (CamelKeyBlock *)&amp;bl-&gt;data;</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_LOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	if (kb-&gt;u.keys[index].data != data) {</div><div class='del'>-		kb-&gt;u.keys[index].data = data;</div><div class='del'>-		camel_block_file_touch_block(ki-&gt;blocks, bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, unsigned int flags, unsigned int set)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	camel_block_t blockid;</div><div class='del'>-	int index;</div><div class='del'>-	CamelKeyBlock *kb;</div><div class='del'>-	unsigned int old;</div><div class='del'>-</div><div class='del'>-	if (keyid == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	blockid =  keyid &amp; (~(CAMEL_BLOCK_SIZE-1));</div><div class='del'>-	index = keyid &amp; (CAMEL_BLOCK_SIZE-1);</div><div class='del'>-</div><div class='del'>-	bl = camel_block_file_get_block(ki-&gt;blocks, blockid);</div><div class='del'>-	if (bl == NULL)</div><div class='del'>-		return;</div><div class='del'>-	kb = (CamelKeyBlock *)&amp;bl-&gt;data;</div><div class='del'>-</div><div class='del'>-	g_assert(kb-&gt;used &lt; 127);</div><div class='del'>-	g_assert(index &lt; kb-&gt;used);</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_LOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	old = kb-&gt;u.keys[index].flags;</div><div class='del'>-	if ((old &amp; set) != (flags &amp; set)) {</div><div class='del'>-		kb-&gt;u.keys[index].flags = (old &amp; (~set)) | (flags &amp; set);</div><div class='del'>-		camel_block_file_touch_block(ki-&gt;blocks, bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-camel_block_t</div><div class='del'>-camel_key_table_lookup(CamelKeyTable *ki, camel_key_t keyid, char **keyp, unsigned int *flags)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	camel_block_t blockid;</div><div class='del'>-	int index, len, off;</div><div class='del'>-	char *key;</div><div class='del'>-	CamelKeyBlock *kb;</div><div class='del'>-</div><div class='del'>-	if (keyp)</div><div class='del'>-		*keyp = 0;</div><div class='del'>-	if (flags)</div><div class='del'>-		*flags = 0;</div><div class='del'>-	if (keyid == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	blockid =  keyid &amp; (~(CAMEL_BLOCK_SIZE-1));</div><div class='del'>-	index = keyid &amp; (CAMEL_BLOCK_SIZE-1);</div><div class='del'>-</div><div class='del'>-	bl = camel_block_file_get_block(ki-&gt;blocks, blockid);</div><div class='del'>-	if (bl == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	kb = (CamelKeyBlock *)&amp;bl-&gt;data;</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	g_assert(kb-&gt;used &lt; 127); /* this should be more accurate */</div><div class='del'>-	g_assert(index &lt; kb-&gt;used);</div><div class='del'>-#else</div><div class='del'>-	if (kb-&gt;used &gt;=127 || index &gt;= kb-&gt;used) {</div><div class='del'>-		g_warning("Block %x: Invalid index or content: index %d used %d\n", blockid, index, kb-&gt;used);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_LOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	blockid = kb-&gt;u.keys[index].data;</div><div class='del'>-	if (flags)</div><div class='del'>-		*flags = kb-&gt;u.keys[index].flags;</div><div class='del'>-</div><div class='del'>-	if (keyp) {</div><div class='del'>-		off = kb-&gt;u.keys[index].offset;</div><div class='del'>-		if (index == 0)</div><div class='del'>-			len = sizeof(kb-&gt;u.keydata) - off;</div><div class='del'>-		else</div><div class='del'>-			len = kb-&gt;u.keys[index-1].offset - off;</div><div class='del'>-		*keyp = key = g_malloc(len+1);</div><div class='del'>-		memcpy(key, kb-&gt;u.keydata + off, len);</div><div class='del'>-		key[len] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-</div><div class='del'>-	return blockid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* iterate through all keys */</div><div class='del'>-camel_key_t</div><div class='del'>-camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **keyp, unsigned int *flagsp, camel_block_t *datap)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	CamelKeyBlock *kb;</div><div class='del'>-	camel_block_t blockid;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	if (keyp)</div><div class='del'>-		*keyp = 0;</div><div class='del'>-	if (flagsp)</div><div class='del'>-		*flagsp = 0;</div><div class='del'>-	if (datap)</div><div class='del'>-		*datap = 0;</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_LOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	if (next == 0) {</div><div class='del'>-		next = ki-&gt;root-&gt;first;</div><div class='del'>-		if (next == 0)</div><div class='del'>-			return 0;</div><div class='del'>-	} else</div><div class='del'>-		next++;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		blockid =  next &amp; (~(CAMEL_BLOCK_SIZE-1));</div><div class='del'>-		index = next &amp; (CAMEL_BLOCK_SIZE-1);</div><div class='del'>-		</div><div class='del'>-		bl = camel_block_file_get_block(ki-&gt;blocks, blockid);</div><div class='del'>-		if (bl == NULL) {</div><div class='del'>-			CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kb = (CamelKeyBlock *)&amp;bl-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* see if we need to goto the next block */</div><div class='del'>-		if (index &gt;= kb-&gt;used) {</div><div class='del'>-			/* FIXME: check for loops */</div><div class='del'>-			next = kb-&gt;next;</div><div class='del'>-			camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-			bl = NULL;</div><div class='del'>-		}</div><div class='del'>-	} while (bl == NULL);</div><div class='del'>-</div><div class='del'>-	/* invalid block data */</div><div class='del'>-	if ((kb-&gt;u.keys[index].offset &gt;= sizeof(kb-&gt;u.keydata)</div><div class='del'>-	     /*|| kb-&gt;u.keys[index].offset &lt; kb-&gt;u.keydata - (char *)&amp;kb-&gt;u.keys[kb-&gt;used])*/</div><div class='del'>-	     || kb-&gt;u.keys[index].offset &lt; sizeof(kb-&gt;u.keys[0]) * kb-&gt;used</div><div class='del'>-	    || (index &gt; 0 &amp;&amp;</div><div class='del'>-		(kb-&gt;u.keys[index-1].offset &gt;= sizeof(kb-&gt;u.keydata)</div><div class='del'>-		 /*|| kb-&gt;u.keys[index-1].offset &lt; kb-&gt;u.keydata - (char *)&amp;kb-&gt;u.keys[kb-&gt;used]))) {*/</div><div class='del'>-		 || kb-&gt;u.keys[index-1].offset &lt; sizeof(kb-&gt;u.keys[0]) * kb-&gt;used)))) {</div><div class='del'>-		g_warning("Block %u invalid scanning keys", bl-&gt;id);</div><div class='del'>-		camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-		CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (datap)</div><div class='del'>-		*datap = kb-&gt;u.keys[index].data;</div><div class='del'>-</div><div class='del'>-	if (flagsp)</div><div class='del'>-		*flagsp = kb-&gt;u.keys[index].flags;</div><div class='del'>-</div><div class='del'>-	if (keyp) {</div><div class='del'>-		int len, off = kb-&gt;u.keys[index].offset;</div><div class='del'>-		char *key;</div><div class='del'>-</div><div class='del'>-		if (index == 0)</div><div class='del'>-			len = sizeof(kb-&gt;u.keydata) - off;</div><div class='del'>-		else</div><div class='del'>-			len = kb-&gt;u.keys[index-1].offset - off;</div><div class='del'>-		*keyp = key = g_malloc(len+1);</div><div class='del'>-		memcpy(key, kb-&gt;u.keydata + off, len);</div><div class='del'>-		key[len] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_KEY_TABLE_UNLOCK(ki, lock);</div><div class='del'>-</div><div class='del'>-	camel_block_file_unref_block(ki-&gt;blocks, bl);</div><div class='del'>-</div><div class='del'>-	return next;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='head'>diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h<br/>deleted file mode 100644<br/>index 3433da3cf1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-partition-table.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-partition-table.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,152 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_PARTITION_TABLE_H</div><div class='del'>-#define _CAMEL_PARTITION_TABLE_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-block-file.h"</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/* CamelPartitionTable - index of key to keyid */</div><div class='del'>-</div><div class='del'>-typedef guint32 camel_hash_t;	/* a hashed key */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPartitionKey CamelPartitionKey;</div><div class='del'>-typedef struct _CamelPartitionKeyBlock CamelPartitionKeyBlock;</div><div class='del'>-typedef struct _CamelPartitionMap CamelPartitionMap;</div><div class='del'>-typedef struct _CamelPartitionMapBlock CamelPartitionMapBlock;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPartitionTable CamelPartitionTable;</div><div class='del'>-typedef struct _CamelPartitionTableClass CamelPartitionTableClass;</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionKey {</div><div class='del'>-	camel_hash_t hashid;</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionKeyBlock {</div><div class='del'>-	guint32 used;</div><div class='del'>-	struct _CamelPartitionKey keys[(CAMEL_BLOCK_SIZE-4)/sizeof(struct _CamelPartitionKey)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionMap {</div><div class='del'>-	camel_hash_t hashid;</div><div class='del'>-	camel_block_t blockid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionMapBlock {</div><div class='del'>-	camel_block_t next;</div><div class='del'>-	guint32 used;</div><div class='del'>-	struct _CamelPartitionMap partition[(CAMEL_BLOCK_SIZE-8)/sizeof(struct _CamelPartitionMap)];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionTable {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelPartitionTablePrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelBlockFile *blocks;</div><div class='del'>-	camel_block_t rootid;</div><div class='del'>-</div><div class='del'>-	int (*is_key)(CamelPartitionTable *cpi, const char *key, camel_key_t keyid, void *data);</div><div class='del'>-	void *is_key_data;</div><div class='del'>-</div><div class='del'>-	/* we keep a list of partition blocks active at all times */</div><div class='del'>-	EDList partition;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPartitionTableClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_partition_table_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelPartitionTable *camel_partition_table_new(struct _CamelBlockFile *bs, camel_block_t root);</div><div class='del'>-int camel_partition_table_sync(CamelPartitionTable *cpi);</div><div class='del'>-int camel_partition_table_add(CamelPartitionTable *cpi, const char *key, camel_key_t keyid);</div><div class='del'>-camel_key_t camel_partition_table_lookup(CamelPartitionTable *cpi, const char *key);</div><div class='del'>-void camel_partition_table_remove(CamelPartitionTable *cpi, const char *key);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/* CamelKeyTable - index of keyid to key and flag and data mapping */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelKeyBlock CamelKeyBlock;</div><div class='del'>-typedef struct _CamelKeyRootBlock CamelKeyRootBlock;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelKeyTable CamelKeyTable;</div><div class='del'>-typedef struct _CamelKeyTableClass CamelKeyTableClass;</div><div class='del'>-</div><div class='del'>-struct _CamelKeyRootBlock {</div><div class='del'>-	camel_block_t first;</div><div class='del'>-	camel_block_t last;</div><div class='del'>-	camel_key_t free;	/* free list */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelKeyKey {</div><div class='del'>-	camel_block_t data;</div><div class='del'>-	unsigned int offset:10;</div><div class='del'>-	unsigned int flags:22;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelKeyBlock {</div><div class='del'>-	camel_block_t next;</div><div class='del'>-	guint32 used;</div><div class='del'>-	union {</div><div class='del'>-		struct _CamelKeyKey keys[(CAMEL_BLOCK_SIZE-8)/sizeof(struct _CamelKeyKey)];</div><div class='del'>-		char keydata[CAMEL_BLOCK_SIZE-8];</div><div class='del'>-	} u;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_KEY_TABLE_MAX_KEY (128) /* max size of any key */</div><div class='del'>-</div><div class='del'>-struct _CamelKeyTable {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelKeyTablePrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelBlockFile *blocks;</div><div class='del'>-</div><div class='del'>-	camel_block_t rootid;</div><div class='del'>-</div><div class='del'>-	CamelKeyRootBlock *root;</div><div class='del'>-	CamelBlock *root_block;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelKeyTableClass {</div><div class='del'>-	CamelObjectClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_key_table_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelKeyTable * camel_key_table_new(CamelBlockFile *bs, camel_block_t root);</div><div class='del'>-int camel_key_table_sync(CamelKeyTable *ki);</div><div class='del'>-camel_key_t camel_key_table_add(CamelKeyTable *ki, const char *key, camel_block_t data, unsigned int flags);</div><div class='del'>-void camel_key_table_set_data(CamelKeyTable *ki, camel_key_t keyid, camel_block_t data);</div><div class='del'>-void camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, unsigned int flags, unsigned int set);</div><div class='del'>-camel_block_t camel_key_table_lookup(CamelKeyTable *ki, camel_key_t keyid, char **key, unsigned int *flags);</div><div class='del'>-camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **keyp, unsigned int *flagsp, camel_block_t *datap);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_PARTITION_TABLE_H */</div><div class='head'>diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c<br/>deleted file mode 100644<br/>index e6ef1a7820..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pgp-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pgp-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1478 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-pgp-context.h"</div><div class='del'>-</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;sys/ioctl.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;termios.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-struct _CamelPgpContextPrivate {</div><div class='del'>-	CamelPgpType type;</div><div class='del'>-	char *path;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int                  pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-				      CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-static int                  pgp_clearsign (CamelCipherContext *context, const char *userid,</div><div class='del'>-					   CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-					   CamelStream *ostream, CamelException *ex);</div><div class='del'>-static CamelCipherValidity *pgp_verify (CamelCipherContext *context, CamelCipherHash hash,</div><div class='del'>-					CamelStream *istream, CamelStream *sigstream,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-static int                  pgp_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,</div><div class='del'>-					 GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					 CamelException *ex);</div><div class='del'>-static int                  pgp_decrypt (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-					 CamelStream *ostream, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelCipherContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pgp_context_init (CamelPgpContext *context)</div><div class='del'>-{</div><div class='del'>-	context-&gt;priv = g_new0 (struct _CamelPgpContextPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pgp_context_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = (CamelPgpContext *)o;</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;priv-&gt;path);</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pgp_context_class_init (CamelPgpContextClass *camel_pgp_context_class)</div><div class='del'>-{</div><div class='del'>-	CamelCipherContextClass *camel_cipher_context_class =</div><div class='del'>-		CAMEL_CIPHER_CONTEXT_CLASS (camel_pgp_context_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_CIPHER_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cipher_context_get_type ()));</div><div class='del'>-	</div><div class='del'>-	camel_cipher_context_class-&gt;sign = pgp_sign;</div><div class='del'>-	camel_cipher_context_class-&gt;clearsign = pgp_clearsign;</div><div class='del'>-	camel_cipher_context_class-&gt;verify = pgp_verify;</div><div class='del'>-	camel_cipher_context_class-&gt;encrypt = pgp_encrypt;</div><div class='del'>-	camel_cipher_context_class-&gt;decrypt = pgp_decrypt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pgp_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_cipher_context_get_type (),</div><div class='del'>-					    "CamelPgpContext",</div><div class='del'>-					    sizeof (CamelPgpContext),</div><div class='del'>-					    sizeof (CamelPgpContextClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_pgp_context_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_pgp_context_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_pgp_context_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pgp_context_new:</div><div class='del'>- * @session: CamelSession</div><div class='del'>- * @type: One of CAMEL_PGP_TYPE_PGP2, PGP5, GPG, or PGP6</div><div class='del'>- * @path: path to PGP binary</div><div class='del'>- * @remember: Remember the pgp passphrase</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelPgpContext object which is used to sign,</div><div class='del'>- * verify, encrypt and decrypt streams.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelPgpContext</div><div class='del'>- **/</div><div class='del'>-CamelPgpContext *</div><div class='del'>-camel_pgp_context_new (CamelSession *session, CamelPgpType type, const char *path)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (session != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_PGP_TYPE_NONE || !path || !*path)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	context = CAMEL_PGP_CONTEXT (camel_object_new (CAMEL_PGP_CONTEXT_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_cipher_context_construct (CAMEL_CIPHER_CONTEXT (context), session);</div><div class='del'>-	</div><div class='del'>-	context-&gt;priv-&gt;type = type;</div><div class='del'>-	context-&gt;priv-&gt;path = g_strdup (path);</div><div class='del'>-	</div><div class='del'>-	return context;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const gchar *</div><div class='del'>-pgp_get_type_as_string (CamelPgpType type)</div><div class='del'>-{</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-		return "PGP 2.6.x";</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		return "PGP 5.0";</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		return "PGP 6.5.8";</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		return "GnuPG";</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-pgp_get_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)</div><div class='del'>-{</div><div class='del'>-	gchar *passphrase, *prompt;</div><div class='del'>-	const char *type;</div><div class='del'>-	</div><div class='del'>-	type = pgp_get_type_as_string (pgp_type);</div><div class='del'>-	</div><div class='del'>-	if (userid)</div><div class='del'>-		prompt = g_strdup_printf (_("Please enter your %s passphrase for %s"),</div><div class='del'>-					  type, userid);</div><div class='del'>-	else</div><div class='del'>-		prompt = g_strdup_printf (_("Please enter your %s passphrase"),</div><div class='del'>-					  type);</div><div class='del'>-	</div><div class='del'>-	/* Use the userid as a key if possible, else be generic and use the type */</div><div class='del'>-	passphrase = camel_session_get_password (session, prompt, TRUE,</div><div class='del'>-						 NULL, userid ? userid : type,</div><div class='del'>-						 NULL);</div><div class='del'>-	g_free (prompt);</div><div class='del'>-	</div><div class='del'>-	return passphrase;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pgp_forget_passphrase (CamelSession *session, CamelPgpType pgp_type, char *userid)</div><div class='del'>-{</div><div class='del'>-	const char *type = NULL;</div><div class='del'>-	</div><div class='del'>-	if (!userid)</div><div class='del'>-		type = pgp_get_type_as_string (pgp_type);</div><div class='del'>-	</div><div class='del'>-	camel_session_forget_password (session, NULL, userid ? userid : type, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pass_free (char *passphrase)</div><div class='del'>-{</div><div class='del'>-	if (passphrase) {</div><div class='del'>-		memset (passphrase, 0, strlen (passphrase));</div><div class='del'>-		g_free (passphrase);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cleanup_child (pid_t child)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	pid_t wait_result;</div><div class='del'>-	sigset_t mask, omask;</div><div class='del'>-	</div><div class='del'>-	/* PGP5 closes fds before exiting, meaning this might be called</div><div class='del'>-	 * too early. So wait a bit for the result.</div><div class='del'>-	 */</div><div class='del'>-	sigemptyset (&amp;mask);</div><div class='del'>-	sigaddset (&amp;mask, SIGALRM);</div><div class='del'>-	sigprocmask (SIG_BLOCK, &amp;mask, &amp;omask);</div><div class='del'>-	alarm (1);</div><div class='del'>-	wait_result = waitpid (child, &amp;status, 0);</div><div class='del'>-	alarm (0);</div><div class='del'>-	sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-	</div><div class='del'>-	if (wait_result == -1 &amp;&amp; errno == EINTR) {</div><div class='del'>-		/* The child is hanging: send a friendly reminder. */</div><div class='del'>-		kill (child, SIGTERM);</div><div class='del'>-		sleep (1);</div><div class='del'>-		wait_result = waitpid (child, &amp;status, WNOHANG);</div><div class='del'>-		if (wait_result == 0) {</div><div class='del'>-			/* Still hanging; use brute force. */</div><div class='del'>-			kill (child, SIGKILL);</div><div class='del'>-			sleep (1);</div><div class='del'>-			wait_result = waitpid (child, &amp;status, WNOHANG);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (wait_result != -1 &amp;&amp; WIFEXITED (status))</div><div class='del'>-		return WEXITSTATUS (status);</div><div class='del'>-	else</div><div class='del'>-		return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cleanup_before_exec (int fd)</div><div class='del'>-{</div><div class='del'>-	int maxfd, i;</div><div class='del'>-	</div><div class='del'>-	maxfd = sysconf (_SC_OPEN_MAX);</div><div class='del'>-	if (maxfd &lt; 0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* Loop over all fds. */</div><div class='del'>-	for (i = 0; i &lt; maxfd; i++) {</div><div class='del'>-		if ((STDIN_FILENO != i) &amp;&amp;</div><div class='del'>-		    (STDOUT_FILENO != i) &amp;&amp;</div><div class='del'>-		    (STDERR_FILENO != i) &amp;&amp;</div><div class='del'>-		    (fd != i))</div><div class='del'>-			close (i);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-crypto_exec_with_passwd (const char *path, char *argv[], const char *input, int inlen,</div><div class='del'>-			 int passwd_fds[], const char *passphrase,</div><div class='del'>-			 char **output, int *outlen, char **diagnostics)</div><div class='del'>-{</div><div class='del'>-	gboolean eof_seen, diag_eof_seen, passwd_eof_seen, input_eof_seen;</div><div class='del'>-	size_t passwd_remaining, passwd_incr, input_remaining, input_incr;</div><div class='del'>-	size_t size, alloc_size, diag_size, diag_alloc_size;</div><div class='del'>-	int select_result, read_len, write_len, cancel_fd;</div><div class='del'>-	int fds[6], *ip_fds, *op_fds, *diag_fds;</div><div class='del'>-	const char *passwd_next, *input_next;</div><div class='del'>-	char *buf = NULL, *diag_buf = NULL;</div><div class='del'>-	fd_set fdset, write_fdset;</div><div class='del'>-	struct timeval timeout;</div><div class='del'>-	size_t tmp_len;</div><div class='del'>-	pid_t child;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; 6; i++)</div><div class='del'>-		fds[i] = -1;</div><div class='del'>-	</div><div class='del'>-	ip_fds = fds;</div><div class='del'>-	op_fds = fds + 2;</div><div class='del'>-	diag_fds = fds + 4;</div><div class='del'>-	</div><div class='del'>-	if ((pipe (ip_fds) == -1) || (pipe (op_fds) == -1) || (pipe (diag_fds) == -1)) {</div><div class='del'>-		*diagnostics = g_strdup_printf ("Couldn't create pipe to %s: %s",</div><div class='del'>-						path, g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; 6; i++)</div><div class='del'>-			close (fds[i]);</div><div class='del'>-		</div><div class='del'>-		close (passwd_fds[0]);</div><div class='del'>-		close (passwd_fds[1]);</div><div class='del'>-		</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!(child = fork ())) {</div><div class='del'>-		/* In child */</div><div class='del'>-		</div><div class='del'>-		if ((dup2 (ip_fds[0], STDIN_FILENO) &lt; 0 ) ||</div><div class='del'>-		    (dup2 (op_fds[1], STDOUT_FILENO) &lt; 0 ) ||</div><div class='del'>-		    (dup2 (diag_fds[1], STDERR_FILENO) &lt; 0 )) {</div><div class='del'>-			_exit (255);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Dissociate from evolution-mail's controlling</div><div class='del'>-		 * terminal so that pgp/gpg won't be able to read from</div><div class='del'>-		 * it: PGP 2 will fall back to asking for the password</div><div class='del'>-		 * on /dev/tty if the passed-in password is incorrect.</div><div class='del'>-		 * This will make that fail rather than hanging.</div><div class='del'>-		 */</div><div class='del'>-		setsid ();</div><div class='del'>-		</div><div class='del'>-		/* Close excess fds */</div><div class='del'>-		cleanup_before_exec (passwd_fds[0]);</div><div class='del'>-		</div><div class='del'>-		execvp (path, argv);</div><div class='del'>-		fprintf (stderr, "Could not execute %s: %s\n", argv[0],</div><div class='del'>-			 g_strerror (errno));</div><div class='del'>-		_exit (255);</div><div class='del'>-	} else if (child &lt; 0) {</div><div class='del'>-		*diagnostics = g_strdup_printf ("Cannot fork %s: %s",</div><div class='del'>-						argv[0], g_strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Parent */</div><div class='del'>-	close (ip_fds[0]);</div><div class='del'>-	close (op_fds[1]);</div><div class='del'>-	close (diag_fds[1]);</div><div class='del'>-	close (passwd_fds[0]);</div><div class='del'>-	</div><div class='del'>-	fcntl (ip_fds[1], F_SETFL, O_NONBLOCK);</div><div class='del'>-	fcntl (op_fds[0], F_SETFL, O_NONBLOCK);</div><div class='del'>-	fcntl (diag_fds[0], F_SETFL, O_NONBLOCK);</div><div class='del'>-	</div><div class='del'>-	timeout.tv_sec = 10; /* timeout in seconds */</div><div class='del'>-	timeout.tv_usec = 0;</div><div class='del'>-	</div><div class='del'>-	size = diag_size = 0;</div><div class='del'>-	alloc_size = 4096;</div><div class='del'>-	diag_alloc_size = 1024;</div><div class='del'>-	eof_seen = diag_eof_seen = FALSE;</div><div class='del'>-	</div><div class='del'>-	buf = g_malloc (alloc_size);</div><div class='del'>-	diag_buf = g_malloc (diag_alloc_size);</div><div class='del'>-	</div><div class='del'>-	passwd_next = passphrase;</div><div class='del'>-	passwd_remaining = passphrase ? strlen (passphrase) : 0;</div><div class='del'>-	passwd_incr = fpathconf (passwd_fds[1], _PC_PIPE_BUF);</div><div class='del'>-	/* Use a reasonable default value on error. */</div><div class='del'>-	if (passwd_incr &lt;= 0)</div><div class='del'>-		passwd_incr = 1024;</div><div class='del'>-	passwd_eof_seen = FALSE;</div><div class='del'>-	</div><div class='del'>-	input_next = input;</div><div class='del'>-	input_remaining = inlen;</div><div class='del'>-	input_incr = fpathconf (ip_fds[1], _PC_PIPE_BUF);</div><div class='del'>-	if (input_incr &lt;= 0)</div><div class='del'>-		input_incr = 1024;</div><div class='del'>-	input_eof_seen = FALSE;</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	</div><div class='del'>-	while (!(eof_seen &amp;&amp; diag_eof_seen)) {</div><div class='del'>-		int max = 0;</div><div class='del'>-		</div><div class='del'>-		FD_ZERO (&amp;fdset);</div><div class='del'>-		if (!eof_seen) {</div><div class='del'>-			FD_SET (op_fds[0], &amp;fdset);</div><div class='del'>-			max = op_fds[0];</div><div class='del'>-		}</div><div class='del'>-		if (!diag_eof_seen) {</div><div class='del'>-			FD_SET (diag_fds[0], &amp;fdset);</div><div class='del'>-			max = MAX (max, diag_fds[0]);</div><div class='del'>-		}</div><div class='del'>-		if (cancel_fd != -1) {</div><div class='del'>-			FD_SET (cancel_fd, &amp;fdset);</div><div class='del'>-			max = MAX (max, cancel_fd);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		FD_ZERO (&amp;write_fdset);</div><div class='del'>-		if (!passwd_eof_seen) {</div><div class='del'>-			FD_SET (passwd_fds[1], &amp;write_fdset);</div><div class='del'>-			max = MAX (max, passwd_fds[1]);</div><div class='del'>-		}</div><div class='del'>-		if (!input_eof_seen) {</div><div class='del'>-			FD_SET (ip_fds[1], &amp;write_fdset);</div><div class='del'>-			max = MAX (max, ip_fds[1]);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		select_result = select (max + 1, &amp;fdset, &amp;write_fdset,</div><div class='del'>-					NULL, &amp;timeout);</div><div class='del'>-		</div><div class='del'>-		if (select_result &lt; 0) {</div><div class='del'>-			if (errno == EINTR)</div><div class='del'>-				continue;</div><div class='del'>-			break;</div><div class='del'>-		} else if (select_result == 0) {</div><div class='del'>-			/* timeout */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (cancel_fd != -1 &amp;&amp; FD_ISSET (cancel_fd, &amp;fdset)) {</div><div class='del'>-			/* user-cancelled */</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (FD_ISSET (op_fds[0], &amp;fdset)) {</div><div class='del'>-			/* More output is available. */</div><div class='del'>-			</div><div class='del'>-			if (size + 4096 &gt; alloc_size) {</div><div class='del'>-				alloc_size += 4096;</div><div class='del'>-				buf = g_realloc (buf, alloc_size);</div><div class='del'>-			}</div><div class='del'>-			read_len = read (op_fds[0], &amp;buf[size],</div><div class='del'>-					 alloc_size - size - 1);</div><div class='del'>-			if (read_len &lt; 0) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (read_len == 0)</div><div class='del'>-				eof_seen = TRUE;</div><div class='del'>-			size += read_len;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (FD_ISSET (diag_fds[0], &amp;fdset) ) {</div><div class='del'>-			/* More stderr is available. */</div><div class='del'>-			</div><div class='del'>-			if (diag_size + 1024 &gt; diag_alloc_size) {</div><div class='del'>-				diag_alloc_size += 1024;</div><div class='del'>-				diag_buf = g_realloc (diag_buf,</div><div class='del'>-						      diag_alloc_size);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			read_len = read (diag_fds[0], &amp;diag_buf[diag_size],</div><div class='del'>-					 diag_alloc_size - diag_size - 1);</div><div class='del'>-			if (read_len &lt; 0) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			if (read_len == 0)</div><div class='del'>-				diag_eof_seen = TRUE;</div><div class='del'>-			diag_size += read_len;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (FD_ISSET (passwd_fds[1], &amp;write_fdset)) {</div><div class='del'>-			/* Ready for more password input. */</div><div class='del'>-			</div><div class='del'>-			tmp_len = passwd_incr;</div><div class='del'>-			if (tmp_len &gt; passwd_remaining)</div><div class='del'>-				tmp_len = passwd_remaining;</div><div class='del'>-			write_len = write (passwd_fds[1], passwd_next,</div><div class='del'>-					   tmp_len);</div><div class='del'>-			if (write_len &lt; 0) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			passwd_next += write_len;</div><div class='del'>-			passwd_remaining -= write_len;</div><div class='del'>-			if (passwd_remaining == 0) {</div><div class='del'>-				close (passwd_fds[1]);</div><div class='del'>-				passwd_eof_seen = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (FD_ISSET (ip_fds[1], &amp;write_fdset)) {</div><div class='del'>-			/* Ready for more ciphertext input. */</div><div class='del'>-			</div><div class='del'>-			tmp_len = input_incr;</div><div class='del'>-			if (tmp_len &gt; input_remaining)</div><div class='del'>-				tmp_len = input_remaining;</div><div class='del'>-			write_len = write (ip_fds[1], input_next, tmp_len);</div><div class='del'>-			if (write_len &lt; 0) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			input_next += write_len;</div><div class='del'>-			input_remaining -= write_len;</div><div class='del'>-			if (input_remaining == 0 ) {</div><div class='del'>-				close (ip_fds[1]);</div><div class='del'>-				input_eof_seen = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	buf[size] = 0;</div><div class='del'>-	diag_buf[diag_size] = 0;</div><div class='del'>-	close (op_fds[0]);</div><div class='del'>-	close (diag_fds[0]);</div><div class='del'>-	</div><div class='del'>-	if (!passwd_eof_seen)</div><div class='del'>-		close (passwd_fds[1]);</div><div class='del'>-	</div><div class='del'>-	*output = buf;</div><div class='del'>-	if (outlen)</div><div class='del'>-		*outlen = size;</div><div class='del'>-	*diagnostics = diag_buf;</div><div class='del'>-	</div><div class='del'>-	return cleanup_child (child);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*----------------------------------------------------------------------*</div><div class='del'>- *                     Public crypto functions</div><div class='del'>- *----------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-hash_string (CamelPgpContext *ctx, CamelCipherHash hash)</div><div class='del'>-{</div><div class='del'>-	if (hash == CAMEL_CIPHER_HASH_DEFAULT)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	switch (ctx-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		switch (hash) {</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD2:</div><div class='del'>-			return "MD2";</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD5:</div><div class='del'>-			return "MD5";</div><div class='del'>-		case CAMEL_CIPHER_HASH_SHA1:</div><div class='del'>-			return "SHA1";</div><div class='del'>-		case CAMEL_CIPHER_HASH_RIPEMD160:</div><div class='del'>-			return "RIPEMD160";</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-		/* FIXME: find a way to specify a hash algorithm for pgp2 */</div><div class='del'>-		return NULL;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		switch (hash) {</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD2:</div><div class='del'>-			return "+hashnum=5";</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD5:</div><div class='del'>-			return "+hashnum=1";</div><div class='del'>-		case CAMEL_CIPHER_HASH_SHA1:</div><div class='del'>-			return "+hashnum=2";</div><div class='del'>-		case CAMEL_CIPHER_HASH_RIPEMD160:</div><div class='del'>-			return "+hashnum=3";</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-	  CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);</div><div class='del'>-	GByteArray *plaintext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *argv[20];</div><div class='del'>-	char *ciphertext = NULL;</div><div class='del'>-	char *diagnostics = NULL;</div><div class='del'>-	char *passphrase = NULL;</div><div class='del'>-	char *hash_str = NULL;</div><div class='del'>-	int passwd_fds[2];</div><div class='del'>-	char passwd_fd[32];</div><div class='del'>-	int retval, i;</div><div class='del'>-	</div><div class='del'>-	/* check for the now unsupported pgp 2.6.x type */</div><div class='del'>-	if (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_PGP2) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     "PGP 2.6.x is no longer supported.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the plaintext in a form we can use */</div><div class='del'>-	plaintext = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (!plaintext-&gt;len) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot sign this message: no plaintext to sign"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	passphrase = pgp_get_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-	if (!passphrase) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("Cannot sign this message: no password provided"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pipe (passwd_fds) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	hash_str = hash_string (context, hash);</div><div class='del'>-	</div><div class='del'>-	i = 0;</div><div class='del'>-	switch (context-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		argv[i++] = "gpg";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--sign";</div><div class='del'>-		argv[i++] = "-b";</div><div class='del'>-		if (hash_str) {</div><div class='del'>-			argv[i++] = "--digest-algo";</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--verbose";</div><div class='del'>-		argv[i++] = "--no-secmem-warning";</div><div class='del'>-		argv[i++] = "--no-greeting";</div><div class='del'>-		argv[i++] = "--yes";</div><div class='del'>-		argv[i++] = "--always-trust";</div><div class='del'>-		argv[i++] = "--batch";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--armor";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--output";</div><div class='del'>-		argv[i++] = "-";            /* output to stdout */</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--passphrase-fd";</div><div class='del'>-		sprintf (passwd_fd, "%d", passwd_fds[0]);</div><div class='del'>-		argv[i++] = passwd_fd;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		argv[i++] = "pgps";</div><div class='del'>-		</div><div class='del'>-		if (hash_str)</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-b";  /* -b means break off (detach) the signature */</div><div class='del'>-		argv[i++] = "-f";  /* -f means act as a unix-style filter */</div><div class='del'>-		argv[i++] = "-v";  /* -v means verbose diagnostic messages */</div><div class='del'>-		argv[i++] = "-z";  /* FIXME: do we want this option!? */</div><div class='del'>-		argv[i++] = "-a";  /* -a means ascii armor */</div><div class='del'>-		argv[i++] = "-o";  /* -o specifies an output stream */</div><div class='del'>-		argv[i++] = "-";   /* ...in this case, stdout */</div><div class='del'>-		</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		argv[i++] = "pgp";</div><div class='del'>-		</div><div class='del'>-		if (hash_str)</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";  /* -f means act as a unix-style filter */</div><div class='del'>-		argv[i++] = "-l";  /* -l means show longer more descriptive diagnostic messages */</div><div class='del'>-		argv[i++] = "-a";  /* -a means ascii armor */</div><div class='del'>-		argv[i++] = "-o";  /* -o specifies an output stream */</div><div class='del'>-		argv[i++] = "-";   /* ...in this case, stdout */</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-sb"; /* create a detached signature */</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv[i++] = NULL;</div><div class='del'>-	</div><div class='del'>-	retval = crypto_exec_with_passwd (context-&gt;priv-&gt;path, argv,</div><div class='del'>-					  plaintext-&gt;data, plaintext-&gt;len,</div><div class='del'>-					  passwd_fds, passphrase,</div><div class='del'>-					  &amp;ciphertext, NULL,</div><div class='del'>-					  &amp;diagnostics);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	pass_free (passphrase);</div><div class='del'>-	</div><div class='del'>-	if (retval != 0 || !*ciphertext) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);</div><div class='del'>-		g_free (diagnostics);</div><div class='del'>-		g_free (ciphertext);</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-		</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (diagnostics);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));</div><div class='del'>-	g_free (ciphertext);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (passphrase) {</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-		pass_free (passphrase);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-	       CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);</div><div class='del'>-	GByteArray *plaintext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *argv[20];</div><div class='del'>-	char *ciphertext = NULL;</div><div class='del'>-	char *diagnostics = NULL;</div><div class='del'>-	char *passphrase = NULL;</div><div class='del'>-	char *hash_str = NULL;</div><div class='del'>-	int passwd_fds[2];</div><div class='del'>-	char passwd_fd[32];</div><div class='del'>-	int retval, i;</div><div class='del'>-	</div><div class='del'>-	/* check for the now unsupported pgp 2.6.x type */</div><div class='del'>-	if (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_PGP2) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     "PGP 2.6.x is no longer supported.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the plaintext in a form we can use */</div><div class='del'>-	plaintext = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (!plaintext-&gt;len) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot sign this message: no plaintext to clearsign"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	passphrase = pgp_get_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-	if (!passphrase) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("Cannot sign this message: no password provided"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pipe (passwd_fds) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	hash_str = hash_string (context, hash);</div><div class='del'>-	</div><div class='del'>-	i = 0;</div><div class='del'>-	switch (context-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		argv[i++] = "gpg";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--clearsign";</div><div class='del'>-		</div><div class='del'>-		if (hash_str) {</div><div class='del'>-			argv[i++] = "--digest-algo";</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--verbose";</div><div class='del'>-		argv[i++] = "--no-secmem-warning";</div><div class='del'>-		argv[i++] = "--no-greeting";</div><div class='del'>-		argv[i++] = "--yes";</div><div class='del'>-		argv[i++] = "--always-trust";</div><div class='del'>-		argv[i++] = "--batch";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--armor";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--output";</div><div class='del'>-		argv[i++] = "-";            /* output to stdout */</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--passphrase-fd";</div><div class='del'>-		sprintf (passwd_fd, "%d", passwd_fds[0]);</div><div class='del'>-		argv[i++] = passwd_fd;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		argv[i++] = "pgps";</div><div class='del'>-		</div><div class='del'>-		if (hash_str)</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";  /* -f means act as a unix-style filter */</div><div class='del'>-		argv[i++] = "-v";  /* -v means verbose diagnostic messages */</div><div class='del'>-		argv[i++] = "-z";  /* FIXME: do we want this option!? */</div><div class='del'>-		argv[i++] = "-a";  /* -a means ascii armor */</div><div class='del'>-		argv[i++] = "-o";  /* -o specifies an output stream */</div><div class='del'>-		argv[i++] = "-";   /* ...in this case, stdout */</div><div class='del'>-		</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		argv[i++] = "pgp";</div><div class='del'>-		</div><div class='del'>-		if (hash_str)</div><div class='del'>-			argv[i++] = hash_str;</div><div class='del'>-		</div><div class='del'>-		if (userid) {</div><div class='del'>-			argv[i++] = "-u";</div><div class='del'>-			argv[i++] = (char *) userid;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";  /* -f means act as a unix-style filter */</div><div class='del'>-		argv[i++] = "-l";  /* -l means show longer more descriptive diagnostic messages */</div><div class='del'>-		argv[i++] = "-a";  /* -a means ascii armor */</div><div class='del'>-		argv[i++] = "-o";  /* -o specifies an output stream */</div><div class='del'>-		argv[i++] = "-";   /* ...in this case, stdout */</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-st";</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv[i++] = NULL;</div><div class='del'>-	</div><div class='del'>-	retval = crypto_exec_with_passwd (context-&gt;priv-&gt;path, argv,</div><div class='del'>-					  plaintext-&gt;data, plaintext-&gt;len,</div><div class='del'>-					  passwd_fds, passphrase,</div><div class='del'>-					  &amp;ciphertext, NULL,</div><div class='del'>-					  &amp;diagnostics);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	pass_free (passphrase);</div><div class='del'>-	</div><div class='del'>-	if (retval != 0 || !*ciphertext) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);</div><div class='del'>-		g_free (diagnostics);</div><div class='del'>-		g_free (ciphertext);</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (diagnostics);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));</div><div class='del'>-	g_free (ciphertext);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (passphrase) {</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-		pass_free (passphrase);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-swrite (CamelStream *istream)</div><div class='del'>-{</div><div class='del'>-	CamelStream *ostream;</div><div class='del'>-	char *template;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	template = g_strdup ("/tmp/evolution-pgp.XXXXXX");</div><div class='del'>-	fd = mkstemp (template);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		g_free (template);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ostream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	camel_stream_write_to_stream (istream, ostream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ostream));</div><div class='del'>-	</div><div class='del'>-	return template;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelCipherValidity *</div><div class='del'>-pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-	    CamelStream *sigstream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);</div><div class='del'>-	CamelCipherValidity *valid = NULL;</div><div class='del'>-	GByteArray *plaintext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *argv[20];</div><div class='del'>-	char *cleartext = NULL;</div><div class='del'>-	char *diagnostics = NULL;</div><div class='del'>-	int passwd_fds[2];</div><div class='del'>-	char *sigfile = NULL;</div><div class='del'>-	int retval, i, clearlen;</div><div class='del'>-	</div><div class='del'>-	/* check for the now unsupported pgp 2.6.x type */</div><div class='del'>-	if (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_PGP2) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     "PGP 2.6.x is no longer supported.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the plaintext in a form we can use */</div><div class='del'>-	plaintext = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (!plaintext-&gt;len) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot verify this message: no plaintext to verify"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pipe (passwd_fds) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot verify this message: couldn't create pipe to GPG/PGP: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (sigstream != NULL) {</div><div class='del'>-		/* We are going to verify a detached signature so save</div><div class='del'>-		   the signature to a temp file. */</div><div class='del'>-		sigfile = swrite (sigstream);</div><div class='del'>-		if (!sigfile) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Cannot verify this message: couldn't create temp file: %s"),</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	i = 0;</div><div class='del'>-	switch (context-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		argv[i++] = "gpg";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--verbose";</div><div class='del'>-		argv[i++] = "--no-secmem-warning";</div><div class='del'>-		argv[i++] = "--no-greeting";</div><div class='del'>-		argv[i++] = "--no-tty";</div><div class='del'>-		if (!camel_session_is_online (ctx-&gt;session))</div><div class='del'>-			argv[i++] = "--no-auto-key-retrieve";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--yes";</div><div class='del'>-		argv[i++] = "--batch";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--verify";</div><div class='del'>-		</div><div class='del'>-		if (sigstream != NULL)</div><div class='del'>-			argv[i++] = sigfile;</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-";</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		argv[i++] = "pgpv";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-z";</div><div class='del'>-		</div><div class='del'>-		if (sigstream != NULL)</div><div class='del'>-			argv[i++] = sigfile;</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		argv[i++] = "pgp";</div><div class='del'>-		</div><div class='del'>-		if (sigstream != NULL)</div><div class='del'>-			argv[i++] = sigfile;</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv[i++] = NULL;</div><div class='del'>-	</div><div class='del'>-	clearlen = 0;</div><div class='del'>-	retval = crypto_exec_with_passwd (context-&gt;priv-&gt;path, argv,</div><div class='del'>-					  plaintext-&gt;data, plaintext-&gt;len,</div><div class='del'>-					  passwd_fds, NULL,</div><div class='del'>-					  &amp;cleartext, &amp;clearlen,</div><div class='del'>-					  &amp;diagnostics);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	/* cleanup */</div><div class='del'>-	if (sigfile) {</div><div class='del'>-		unlink (sigfile);</div><div class='del'>-		g_free (sigfile);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	valid = camel_cipher_validity_new ();</div><div class='del'>-	</div><div class='del'>-	if (retval != 0) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);</div><div class='del'>-		</div><div class='del'>-		camel_cipher_validity_set_valid (valid, FALSE);</div><div class='del'>-	} else {</div><div class='del'>-		camel_cipher_validity_set_valid (valid, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (diagnostics) {</div><div class='del'>-		const char *locale;</div><div class='del'>-		char *desc, *outbuf;</div><div class='del'>-		size_t inlen, outlen;</div><div class='del'>-		iconv_t cd;</div><div class='del'>-		</div><div class='del'>-		inlen = strlen (diagnostics);</div><div class='del'>-		outlen = inlen * 4;</div><div class='del'>-		</div><div class='del'>-		desc = outbuf = g_new (unsigned char, outlen + 1);</div><div class='del'>-		</div><div class='del'>-		locale = e_iconv_locale_charset ();</div><div class='del'>-		if (!locale)</div><div class='del'>-			locale = "iso-8859-1";</div><div class='del'>-		</div><div class='del'>-		cd = e_iconv_open ("UTF-8", locale);</div><div class='del'>-		if (cd != (iconv_t) -1) {</div><div class='del'>-			const char *inbuf;</div><div class='del'>-			size_t ret;</div><div class='del'>-			</div><div class='del'>-			inbuf = diagnostics;</div><div class='del'>-			ret = e_iconv (cd, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-			if (ret != (size_t) -1) {</div><div class='del'>-				e_iconv (cd, NULL, 0, &amp;outbuf, &amp;outlen);</div><div class='del'>-			}</div><div class='del'>-			e_iconv_close (cd);</div><div class='del'>-			</div><div class='del'>-			*outbuf = '\0';</div><div class='del'>-		} else {</div><div class='del'>-			const char *inptr, *inend;</div><div class='del'>-			</div><div class='del'>-			g_warning ("CamelPgpContext::pgp_verify: cannot convert from %s to UTF-8", locale);</div><div class='del'>-			</div><div class='del'>-			inptr = diagnostics;</div><div class='del'>-			inend = inptr + inlen;</div><div class='del'>-			</div><div class='del'>-			while (inptr &amp;&amp; inptr &lt; inend &amp;&amp; g_unichar_validate (g_utf8_get_char (inptr))) {</div><div class='del'>-				*outbuf++ = g_utf8_get_char (inptr) &amp; 0xff;</div><div class='del'>-				inptr = g_utf8_next_char (inptr);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			*outbuf = '\0';</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_cipher_validity_set_description (valid, desc);</div><div class='del'>-		g_free (desc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (diagnostics);</div><div class='del'>-	g_free (cleartext);</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArray *recipients,</div><div class='del'>-	     CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);</div><div class='del'>-	GByteArray *plaintext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GPtrArray *argv;</div><div class='del'>-	int retval, r;</div><div class='del'>-	char *ciphertext = NULL;</div><div class='del'>-	char *diagnostics = NULL;</div><div class='del'>-	int passwd_fds[2];</div><div class='del'>-	char passwd_fd[32];</div><div class='del'>-	char *passphrase = NULL;</div><div class='del'>-	</div><div class='del'>-	/* check for the now unsupported pgp 2.6.x type */</div><div class='del'>-	if (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_PGP2) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     "PGP 2.6.x is no longer supported.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the plaintext in a form we can use */</div><div class='del'>-	plaintext = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), plaintext);</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (!plaintext-&gt;len) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot encrypt this message: no plaintext to encrypt"));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (sign) {</div><div class='del'>-		/* we only need a passphrase if we intend on signing */</div><div class='del'>-		passphrase = pgp_get_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type,</div><div class='del'>-						 (char *) userid);</div><div class='del'>-		if (!passphrase) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-					     _("Cannot encrypt this message: no password provided"));</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pipe (passwd_fds) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* check to make sure we have recipients */</div><div class='del'>-	if (recipients-&gt;len == 0) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot encrypt this message: no recipients specified"));</div><div class='del'>-		</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	switch (context-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		g_ptr_array_add (argv, "gpg");</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (argv, "--verbose");</div><div class='del'>-		g_ptr_array_add (argv, "--no-secmem-warning");</div><div class='del'>-		g_ptr_array_add (argv, "--no-greeting");</div><div class='del'>-		g_ptr_array_add (argv, "--yes");</div><div class='del'>-		g_ptr_array_add (argv, "--always-trust");</div><div class='del'>-		g_ptr_array_add (argv, "--batch");</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (argv, "--armor");</div><div class='del'>-		</div><div class='del'>-		for (r = 0; r &lt; recipients-&gt;len; r++) {</div><div class='del'>-			g_ptr_array_add (argv, "-r");</div><div class='del'>-			g_ptr_array_add (argv, recipients-&gt;pdata[r]);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (argv, "--output");</div><div class='del'>-		g_ptr_array_add (argv, "-");            /* output to stdout */</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (argv, "--encrypt");</div><div class='del'>-		</div><div class='del'>-		if (sign) {</div><div class='del'>-			g_ptr_array_add (argv, "--sign");</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (argv, "-u");</div><div class='del'>-			g_ptr_array_add (argv, (char *) userid);</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (argv, "--passphrase-fd");</div><div class='del'>-			sprintf (passwd_fd, "%d", passwd_fds[0]);</div><div class='del'>-			g_ptr_array_add (argv, passwd_fd);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		g_ptr_array_add (argv, "pgpe");</div><div class='del'>-		</div><div class='del'>-		for (r = 0; r &lt; recipients-&gt;len; r++) {</div><div class='del'>-			g_ptr_array_add (argv, "-r");</div><div class='del'>-			g_ptr_array_add (argv, recipients-&gt;pdata[r]);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (argv, "-f");</div><div class='del'>-		g_ptr_array_add (argv, "-z");</div><div class='del'>-		g_ptr_array_add (argv, "-a");</div><div class='del'>-		g_ptr_array_add (argv, "-o");</div><div class='del'>-		g_ptr_array_add (argv, "-");        /* output to stdout */</div><div class='del'>-		</div><div class='del'>-		if (sign) {</div><div class='del'>-			g_ptr_array_add (argv, "-s");</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (argv, "-u");</div><div class='del'>-			g_ptr_array_add (argv, (gchar *) userid);</div><div class='del'>-			</div><div class='del'>-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-			putenv (passwd_fd);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		g_ptr_array_add (argv, "pgp");</div><div class='del'>-		g_ptr_array_add (argv, "-f");</div><div class='del'>-		g_ptr_array_add (argv, "-e");</div><div class='del'>-		g_ptr_array_add (argv, "-a");</div><div class='del'>-		g_ptr_array_add (argv, "-o");</div><div class='del'>-		g_ptr_array_add (argv, "-");</div><div class='del'>-		</div><div class='del'>-		for (r = 0; r &lt; recipients-&gt;len; r++)</div><div class='del'>-			g_ptr_array_add (argv, recipients-&gt;pdata[r]);</div><div class='del'>-		</div><div class='del'>-		if (sign) {</div><div class='del'>-			g_ptr_array_add (argv, "-s");</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (argv, "-u");</div><div class='del'>-			g_ptr_array_add (argv, (gchar *) userid);</div><div class='del'>-			</div><div class='del'>-			sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-			putenv (passwd_fd);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_add (argv, NULL);</div><div class='del'>-	</div><div class='del'>-	retval = crypto_exec_with_passwd (context-&gt;priv-&gt;path,</div><div class='del'>-					  (char **) argv-&gt;pdata,</div><div class='del'>-					  plaintext-&gt;data, plaintext-&gt;len,</div><div class='del'>-					  passwd_fds, passphrase,</div><div class='del'>-					  &amp;ciphertext, NULL,</div><div class='del'>-					  &amp;diagnostics);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	pass_free (passphrase);</div><div class='del'>-	g_ptr_array_free (argv, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (retval != 0 || !*ciphertext) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);</div><div class='del'>-		g_free (diagnostics);</div><div class='del'>-		g_free (ciphertext);</div><div class='del'>-		if (sign)</div><div class='del'>-			pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type,</div><div class='del'>-					       (char *) userid);</div><div class='del'>-		</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (diagnostics);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (ostream, ciphertext, strlen (ciphertext));</div><div class='del'>-	g_free (ciphertext);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (plaintext, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (sign) {</div><div class='del'>-		pass_free (passphrase);</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, (char *) userid);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,</div><div class='del'>-	     CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPgpContext *context = CAMEL_PGP_CONTEXT (ctx);</div><div class='del'>-	GByteArray *ciphertext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *argv[15];</div><div class='del'>-	char *plaintext = NULL;</div><div class='del'>-	int plainlen;</div><div class='del'>-	char *diagnostics = NULL;</div><div class='del'>-	char *passphrase = NULL;</div><div class='del'>-	int passwd_fds[2];</div><div class='del'>-	char passwd_fd[32];</div><div class='del'>-	int retval, i;</div><div class='del'>-	</div><div class='del'>-	/* check for the now unsupported pgp 2.6.x type */</div><div class='del'>-	if (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_PGP2) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     "PGP 2.6.x is no longer supported.");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the ciphertext in a form we can use */</div><div class='del'>-	ciphertext = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), ciphertext);</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (!ciphertext-&gt;len) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot decrypt this message: no ciphertext to decrypt"));</div><div class='del'>-		</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	passphrase = pgp_get_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, NULL);</div><div class='del'>-	if (!passphrase) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("Cannot decrypt this message: no password provided"));</div><div class='del'>-		</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pipe (passwd_fds) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	i = 0;</div><div class='del'>-	switch (context-&gt;priv-&gt;type) {</div><div class='del'>-	case CAMEL_PGP_TYPE_GPG:</div><div class='del'>-		argv[i++] = "gpg";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--verbose";</div><div class='del'>-		argv[i++] = "--no-secmem-warning";</div><div class='del'>-		argv[i++] = "--no-greeting";</div><div class='del'>-		argv[i++] = "--yes";</div><div class='del'>-		argv[i++] = "--batch";</div><div class='del'>-		</div><div class='del'>-		if (!camel_session_is_online (ctx-&gt;session))</div><div class='del'>-			argv[i++] = "--no-auto-key-retrieve";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--output";</div><div class='del'>-		argv[i++] = "-";            /* output to stdout */</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--decrypt";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "--passphrase-fd";</div><div class='del'>-		sprintf (passwd_fd, "%d", passwd_fds[0]);</div><div class='del'>-		argv[i++] = passwd_fd;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP5:</div><div class='del'>-		argv[i++] = "pgpv";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";</div><div class='del'>-		argv[i++] = "+batchmode=1";</div><div class='del'>-		</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP2:</div><div class='del'>-	case CAMEL_PGP_TYPE_PGP6:</div><div class='del'>-		argv[i++] = "pgp";</div><div class='del'>-		</div><div class='del'>-		argv[i++] = "-f";</div><div class='del'>-		</div><div class='del'>-		sprintf (passwd_fd, "PGPPASSFD=%d", passwd_fds[0]);</div><div class='del'>-		putenv (passwd_fd);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv[i++] = NULL;</div><div class='del'>-	</div><div class='del'>-	retval = crypto_exec_with_passwd (context-&gt;priv-&gt;path, argv,</div><div class='del'>-					  ciphertext-&gt;data, ciphertext-&gt;len,</div><div class='del'>-					  passwd_fds, passphrase,</div><div class='del'>-					  &amp;plaintext, &amp;plainlen,</div><div class='del'>-					  &amp;diagnostics);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (ciphertext, TRUE);</div><div class='del'>-	pass_free (passphrase);</div><div class='del'>-	</div><div class='del'>-	/* gpg returns '1' if it succeedes in decrypting but can't verify the signature */</div><div class='del'>-	if (retval != 0 || (context-&gt;priv-&gt;type == CAMEL_PGP_TYPE_GPG &amp;&amp; retval == 1) || !*plaintext) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);</div><div class='del'>-		g_free (plaintext);</div><div class='del'>-		g_free (diagnostics);</div><div class='del'>-		</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, NULL);</div><div class='del'>-		</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (diagnostics);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (ostream, plaintext, plainlen);</div><div class='del'>-	g_free (plaintext);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	g_byte_array_free (ciphertext, TRUE);</div><div class='del'>-	</div><div class='del'>-	if (passphrase) {</div><div class='del'>-		pgp_forget_passphrase (ctx-&gt;session, context-&gt;priv-&gt;type, NULL);</div><div class='del'>-		pass_free (passphrase);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-pgp-context.h b/camel/camel-pgp-context.h<br/>deleted file mode 100644<br/>index 0eaa3ec4e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pgp-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pgp-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PGP_CONTEXT_H</div><div class='del'>-#define CAMEL_PGP_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-cipher-context.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CAMEL_PGP_CONTEXT_TYPE     (camel_pgp_context_get_type ())</div><div class='del'>-#define CAMEL_PGP_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PGP_CONTEXT_TYPE, CamelPgpContext))</div><div class='del'>-#define CAMEL_PGP_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_CONTEXT_TYPE, CamelPgpContextClass))</div><div class='del'>-#define CAMEL_IS_PGP_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_CONTEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_PGP_TYPE_NONE,</div><div class='del'>-	CAMEL_PGP_TYPE_PGP2,   /* no longer supported */</div><div class='del'>-	CAMEL_PGP_TYPE_PGP5,</div><div class='del'>-	CAMEL_PGP_TYPE_PGP6,</div><div class='del'>-	CAMEL_PGP_TYPE_GPG</div><div class='del'>-} CamelPgpType;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpContext {</div><div class='del'>-	CamelCipherContext parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelPgpContextPrivate *priv;</div><div class='del'>-	</div><div class='del'>-} CamelPgpContext;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpContextClass {</div><div class='del'>-	CamelCipherContextClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelPgpContextClass;</div><div class='del'>-</div><div class='del'>-CamelType         camel_pgp_context_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelPgpContext  *camel_pgp_context_new (CamelSession *session, CamelPgpType type,</div><div class='del'>-					 const char *path);</div><div class='del'>-</div><div class='del'>-/* PGP routines */</div><div class='del'>-#define camel_pgp_sign(c, u, h, i, o, e) camel_cipher_sign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pgp_clearsign(c, u, h, i, o, e) camel_cipher_clearsign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pgp_verify(c, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), CAMEL_CIPHER_HASH_DEFAULT, i, s, e)</div><div class='del'>-</div><div class='del'>-#define camel_pgp_encrypt(c, s, u, r, i, o, e) camel_cipher_encrypt (CAMEL_CIPHER_CONTEXT (c), s, u, r, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pgp_decrypt(c, i, o, e) camel_cipher_decrypt (CAMEL_CIPHER_CONTEXT (c), i, o, e)</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_PGP_CONTEXT_H */</div><div class='head'>diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c<br/>deleted file mode 100644<br/>index b16232c085..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pgp-mime.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pgp-mime.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,607 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-pgp-mime.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-mime-filter-bestenc.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-mime-filter-chomp.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-stream-null.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#define PGPMIME_DEBUG</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/** rfc2015/rfc3156 stuff (aka PGP/MIME) *******************************/</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_pgp_mime_is_rfc2015_signed (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMultipart *mp;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-#ifdef ENABLE_PEDANTIC_PGPMIME</div><div class='del'>-	const char *param, *micalg;</div><div class='del'>-#endif</div><div class='del'>-	int nparts;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a multipart/signed */</div><div class='del'>-	type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-	if (!header_content_type_is (type, "multipart", "signed"))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_PEDANTIC_PGPMIME</div><div class='del'>-	/* check that we have a protocol param with the value: "application/pgp-signature" */</div><div class='del'>-	param = header_content_type_param (type, "protocol");</div><div class='del'>-	if (!param || g_strcasecmp (param, "application/pgp-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a micalg parameter */</div><div class='del'>-	micalg = header_content_type_param (type, "micalg");</div><div class='del'>-	if (!micalg)</div><div class='del'>-		return FALSE;</div><div class='del'>-#endif /* ENABLE_PEDANTIC_PGPMIME */</div><div class='del'>-	</div><div class='del'>-	/* check that we have exactly 2 subparts */</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	mp = CAMEL_MULTIPART (wrapper);</div><div class='del'>-	nparts = camel_multipart_get_number (mp);</div><div class='del'>-	if (nparts != 2)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The first part may be of any type except for </div><div class='del'>-	 * application/pgp-signature - check it. */</div><div class='del'>-	part = camel_multipart_get_part (mp, 0);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (header_content_type_is (type, "application", "pgp-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The second part should be application/pgp-signature. */</div><div class='del'>-	part = camel_multipart_get_part (mp, 1);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (!header_content_type_is (type, "application", "pgp-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMultipart *mp;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-#ifdef ENABLE_PEDANTIC_PGPMIME</div><div class='del'>-	const char *param;</div><div class='del'>-#endif</div><div class='del'>-	int nparts;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a multipart/encrypted */</div><div class='del'>-	type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-	if (!header_content_type_is (type, "multipart", "encrypted"))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_PEDANTIC_PGPMIME</div><div class='del'>-	/* check that we have a protocol param with the value: "application/pgp-encrypted" */</div><div class='del'>-	param = header_content_type_param (type, "protocol");</div><div class='del'>-	if (!param || g_strcasecmp (param, "application/pgp-encrypted"))</div><div class='del'>-		return FALSE;</div><div class='del'>-#endif /* ENABLE_PEDANTIC_PGPMIME */</div><div class='del'>-	</div><div class='del'>-	/* check that we have at least 2 subparts */</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	mp = CAMEL_MULTIPART (wrapper);</div><div class='del'>-	nparts = camel_multipart_get_number (mp);</div><div class='del'>-	if (nparts &lt; 2)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The first part should be application/pgp-encrypted */</div><div class='del'>-	part = camel_multipart_get_part (mp, 0);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (!header_content_type_is (type, "application", "pgp-encrypted"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The second part should be application/octet-stream - this</div><div class='del'>-           is the one we care most about */</div><div class='del'>-	part = camel_multipart_get_part (mp, 1);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (!header_content_type_is (type, "application", "octet-stream"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pgp_mime_part_sign_restore_part (CamelMimePart *mime_part, GSList **encodings)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	if (!wrapper)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-		int parts, i;</div><div class='del'>-		</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));</div><div class='del'>-		for (i = 0; i &lt; parts; i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);</div><div class='del'>-			</div><div class='del'>-			pgp_mime_part_sign_restore_part (part, encodings);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		CamelMimePartEncodingType encoding;</div><div class='del'>-		</div><div class='del'>-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			/* restore the message parts' subparts */</div><div class='del'>-			pgp_mime_part_sign_restore_part (CAMEL_MIME_PART (wrapper), encodings);</div><div class='del'>-		} else {</div><div class='del'>-			encoding = GPOINTER_TO_INT ((*encodings)-&gt;data);</div><div class='del'>-			</div><div class='del'>-			camel_mime_part_set_encoding (mime_part, encoding);</div><div class='del'>-			</div><div class='del'>-			*encodings = (*encodings)-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pgp_mime_part_sign_prepare_part (CamelMimePart *mime_part, GSList **encodings)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	int parts, i;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	if (!wrapper)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));</div><div class='del'>-		for (i = 0; i &lt; parts; i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);</div><div class='del'>-			</div><div class='del'>-			pgp_mime_part_sign_prepare_part (part, encodings);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		CamelMimePartEncodingType encoding, best;</div><div class='del'>-		CamelStream *stream, *filtered_stream;</div><div class='del'>-		CamelMimeFilterBestenc *bestenc;</div><div class='del'>-		guint32 flags;</div><div class='del'>-		</div><div class='del'>-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			/* prepare the message parts' subparts */</div><div class='del'>-			pgp_mime_part_sign_prepare_part (CAMEL_MIME_PART (wrapper), encodings);</div><div class='del'>-		} else {</div><div class='del'>-			encoding = camel_mime_part_get_encoding (mime_part);</div><div class='del'>-			</div><div class='del'>-			if (encoding != CAMEL_MIME_PART_ENCODING_BASE64) {</div><div class='del'>-				flags = CAMEL_BESTENC_GET_ENCODING;</div><div class='del'>-				</div><div class='del'>-				stream = camel_stream_null_new ();</div><div class='del'>-				filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream (stream);</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-				bestenc = camel_mime_filter_bestenc_new (flags);</div><div class='del'>-				camel_stream_filter_add (CAMEL_STREAM_FILTER (filtered_stream),</div><div class='del'>-							 CAMEL_MIME_FILTER (bestenc));</div><div class='del'>-				</div><div class='del'>-				camel_data_wrapper_write_to_stream (wrapper, filtered_stream);</div><div class='del'>-				</div><div class='del'>-				best = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_7BIT);</div><div class='del'>-				</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (bestenc));</div><div class='del'>-				</div><div class='del'>-				if (encoding != best) {</div><div class='del'>-					camel_mime_part_set_encoding (mime_part, best);</div><div class='del'>-					</div><div class='del'>-					*encodings = g_slist_append (*encodings, GINT_TO_POINTER (encoding));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pgp_mime_part_sign:</div><div class='del'>- * @context: PGP Context</div><div class='del'>- * @mime_part: a MIME part that will be replaced by a pgp signed part</div><div class='del'>- * @userid: userid to sign with</div><div class='del'>- * @hash: one of CAMEL_PGP_HASH_TYPE_MD5 or CAMEL_PGP_HASH_TYPE_SHA1</div><div class='del'>- * @ex: exception which will be set if there are any errors.</div><div class='del'>- *</div><div class='del'>- * Constructs a PGP/MIME multipart in compliance with rfc2015 and</div><div class='del'>- * replaces @part with the generated multipart/signed. On failure,</div><div class='del'>- * @ex will be set and #part will remain untouched.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, const char *userid,</div><div class='del'>-			  CamelCipherHash hash, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part, *signed_part;</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-	CamelContentType *mime_type;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlf_filter, *from_filter, *chomp_filter;</div><div class='del'>-	CamelStream *stream, *sigstream;</div><div class='del'>-	GSList *encodings = NULL;</div><div class='del'>-	char *hash_type = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (*mime_part != NULL);</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));</div><div class='del'>-	g_return_if_fail (userid != NULL);</div><div class='del'>-	</div><div class='del'>-	part = *mime_part;</div><div class='del'>-	</div><div class='del'>-	/* Prepare all the parts for signing... */</div><div class='del'>-	pgp_mime_part_sign_prepare_part (part, &amp;encodings);</div><div class='del'>-	</div><div class='del'>-	/* get the cleartext */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	</div><div class='del'>-	/* Note: see rfc3156, section 3 - second note */</div><div class='del'>-	from_filter = CAMEL_MIME_FILTER (camel_mime_filter_from_new ());</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (from_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (from_filter));</div><div class='del'>-	</div><div class='del'>-	/* Note: see rfc3156, section 5.4 (this is the big thing that changed between rfc2015 and rfc3156) */</div><div class='del'>-	chomp_filter = camel_mime_filter_chomp_new ();</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (chomp_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (chomp_filter));</div><div class='del'>-	</div><div class='del'>-	/* Note: see rfc2015 or rfc3156, section 5.1 */</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_stream_flush (CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	/* reset the stream */</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	</div><div class='del'>-	printf ("attempting to sign data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",</div><div class='del'>-		CAMEL_STREAM_MEM (stream)-&gt;buffer-&gt;len, CAMEL_STREAM_MEM (stream)-&gt;buffer-&gt;data);</div><div class='del'>-	</div><div class='del'>-	/* construct the signature stream */</div><div class='del'>-	sigstream = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	switch (hash) {</div><div class='del'>-	case CAMEL_CIPHER_HASH_MD2:</div><div class='del'>-		/* this is a new addition with rfc3156 */</div><div class='del'>-		hash_type = "pgp-md2";</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_CIPHER_HASH_MD5:</div><div class='del'>-		hash_type = "pgp-md5";</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_CIPHER_HASH_SHA1:</div><div class='del'>-		hash_type = "pgp-sha1";</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_CIPHER_HASH_RIPEMD160:</div><div class='del'>-		hash_type = "pgp-ripemd160";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* set a reasonable default */</div><div class='del'>-		hash = CAMEL_CIPHER_HASH_SHA1;</div><div class='del'>-		hash_type = "pgp-sha1";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the signature */</div><div class='del'>-	if (camel_pgp_sign (context, userid, hash, stream, sigstream, ex) == -1) {</div><div class='del'>-		GSList *list;</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (sigstream));</div><div class='del'>-		</div><div class='del'>-		/* restore the original encoding */</div><div class='del'>-		list = encodings;</div><div class='del'>-		pgp_mime_part_sign_restore_part (part, &amp;list);</div><div class='del'>-		g_slist_free (encodings);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	camel_stream_reset (sigstream);</div><div class='del'>-	</div><div class='del'>-	/* we don't need these anymore... */</div><div class='del'>-	g_slist_free (encodings);</div><div class='del'>-	</div><div class='del'>-	/* construct the pgp-signature mime part */</div><div class='del'>-	signed_part = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (signed_part, CAMEL_STREAM_MEM (sigstream)-&gt;buffer-&gt;data,</div><div class='del'>-				     CAMEL_STREAM_MEM (sigstream)-&gt;buffer-&gt;len,</div><div class='del'>-				     "application/pgp-signature; name=signature.asc");</div><div class='del'>-	camel_mime_part_set_description (signed_part, _("This is a digitally signed message part"));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sigstream));</div><div class='del'>-	</div><div class='del'>-	/* construct the container multipart/signed */</div><div class='del'>-	multipart = camel_multipart_new ();</div><div class='del'>-	</div><div class='del'>-	mime_type = header_content_type_new ("multipart", "signed");</div><div class='del'>-	header_content_type_set_param (mime_type, "micalg", hash_type);</div><div class='del'>-	header_content_type_set_param (mime_type, "protocol", "application/pgp-signature");</div><div class='del'>-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (multipart), mime_type);</div><div class='del'>-	header_content_type_unref (mime_type);</div><div class='del'>-	</div><div class='del'>-	camel_multipart_set_boundary (multipart, NULL);</div><div class='del'>-	</div><div class='del'>-	/* add the parts to the multipart */</div><div class='del'>-	camel_multipart_add_part (multipart, part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-	camel_multipart_add_part (multipart, signed_part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (signed_part));</div><div class='del'>-	</div><div class='del'>-	/* replace the input part with the output part */</div><div class='del'>-	*mime_part = camel_mime_part_new ();</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),</div><div class='del'>-					 CAMEL_DATA_WRAPPER (multipart));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (multipart));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pgp_mime_part_verify:</div><div class='del'>- * @context: PGP Context</div><div class='del'>- * @mime_part: a multipart/signed MIME Part</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Returns a CamelCipherValidity on success or NULL on fail.</div><div class='del'>- **/</div><div class='del'>-CamelCipherValidity *</div><div class='del'>-camel_pgp_mime_part_verify (CamelPgpContext *context, CamelMimePart *mime_part, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-	CamelMimePart *part, *sigpart;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlf_filter, *chomp_filter;</div><div class='del'>-	CamelStream *stream, *sigstream;</div><div class='del'>-	CamelCipherValidity *valid;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (mime_part != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);</div><div class='del'>-	</div><div class='del'>-	if (!camel_pgp_mime_is_rfc2015_signed (mime_part))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-	</div><div class='del'>-	/* get the plain part */</div><div class='del'>-	part = camel_multipart_get_part (multipart, 0);</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	</div><div class='del'>-	/* Note: see rfc3156, section 5.4 (this is the big thing that changed between rfc2015 and rfc3156) */</div><div class='del'>-	chomp_filter = camel_mime_filter_chomp_new ();</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (chomp_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (chomp_filter));</div><div class='del'>-	</div><div class='del'>-	/* Note: see rfc2015 or rfc3156, section 5.1 */</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	</div><div class='del'>-	wrapper = CAMEL_DATA_WRAPPER (part);</div><div class='del'>-	camel_data_wrapper_write_to_stream (wrapper, CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_stream_flush (CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	</div><div class='del'>-	/* get the signed part */</div><div class='del'>-	sigpart = camel_multipart_get_part (multipart, 1);</div><div class='del'>-	sigstream = camel_stream_mem_new ();</div><div class='del'>-	camel_data_wrapper_write_to_stream (camel_medium_get_content_object (CAMEL_MEDIUM (sigpart)),</div><div class='del'>-					    sigstream);</div><div class='del'>-	camel_stream_reset (sigstream);</div><div class='del'>-	</div><div class='del'>-	/* verify */</div><div class='del'>-	valid = camel_pgp_verify (context, stream, sigstream, ex);</div><div class='del'>-	</div><div class='del'>-	printf ("attempted to verify data:\n----- BEGIN SIGNED PART -----\n%.*s----- END SIGNED PART -----\n",</div><div class='del'>-		CAMEL_STREAM_MEM (stream)-&gt;buffer-&gt;len, CAMEL_STREAM_MEM (stream)-&gt;buffer-&gt;data);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sigstream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pgp_mime_part_encrypt:</div><div class='del'>- * @context: PGP Context</div><div class='del'>- * @mime_part: a MIME part that will be replaced by a pgp encrypted part</div><div class='del'>- * @recipients: list of recipient PGP Key IDs</div><div class='del'>- * @ex: exception which will be set if there are any errors.</div><div class='del'>- *</div><div class='del'>- * Constructs a PGP/MIME multipart in compliance with rfc2015 and</div><div class='del'>- * replaces #mime_part with the generated multipart/signed. On failure,</div><div class='del'>- * #ex will be set and #part will remain untouched.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_pgp_mime_part_encrypt (CamelPgpContext *context, CamelMimePart **mime_part,</div><div class='del'>-			     GPtrArray *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-	CamelMimePart *part, *version_part, *encrypted_part;</div><div class='del'>-	CamelContentType *mime_type;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlf_filter;</div><div class='del'>-	CamelStream *stream, *ciphertext;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (*mime_part != NULL);</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (*mime_part));</div><div class='del'>-	g_return_if_fail (recipients != NULL);</div><div class='del'>-	</div><div class='del'>-	part = *mime_part;</div><div class='del'>-	</div><div class='del'>-	/* get the contents */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	</div><div class='del'>-	/* pgp encrypt */</div><div class='del'>-	ciphertext = camel_stream_mem_new ();</div><div class='del'>-	if (camel_pgp_encrypt (context, FALSE, NULL, recipients, stream, ciphertext, ex) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (ciphertext));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	camel_stream_reset (ciphertext);</div><div class='del'>-	</div><div class='del'>-	/* construct the version part */</div><div class='del'>-	version_part = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_encoding (version_part, CAMEL_MIME_PART_ENCODING_7BIT);</div><div class='del'>-	camel_mime_part_set_content (version_part, "Version: 1", strlen ("Version: 1"),</div><div class='del'>-				     "application/pgp-encrypted");</div><div class='del'>-	</div><div class='del'>-	/* construct the pgp-encrypted mime part */</div><div class='del'>-	encrypted_part = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (encrypted_part, CAMEL_STREAM_MEM (ciphertext)-&gt;buffer-&gt;data,</div><div class='del'>-				     CAMEL_STREAM_MEM (ciphertext)-&gt;buffer-&gt;len,</div><div class='del'>-				     "application/octet-stream; name=encrypted.asc");</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ciphertext));</div><div class='del'>-	camel_mime_part_set_encoding (encrypted_part, CAMEL_MIME_PART_ENCODING_7BIT);</div><div class='del'>-	</div><div class='del'>-	/* construct the container multipart/encrypted */</div><div class='del'>-	multipart = camel_multipart_new ();</div><div class='del'>-	</div><div class='del'>-	mime_type = header_content_type_new ("multipart", "encrypted");</div><div class='del'>-	header_content_type_set_param (mime_type, "protocol", "application/pgp-encrypted");</div><div class='del'>-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (multipart), mime_type);</div><div class='del'>-	header_content_type_unref (mime_type);</div><div class='del'>-	</div><div class='del'>-	camel_multipart_set_boundary (multipart, NULL);</div><div class='del'>-	</div><div class='del'>-	/* add the parts to the multipart */</div><div class='del'>-	camel_multipart_add_part (multipart, version_part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (version_part));</div><div class='del'>-	camel_multipart_add_part (multipart, encrypted_part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (encrypted_part));</div><div class='del'>-	</div><div class='del'>-	/* replace the input part with the output part */</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (*mime_part));</div><div class='del'>-	*mime_part = camel_mime_part_new ();</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (*mime_part),</div><div class='del'>-					 CAMEL_DATA_WRAPPER (multipart));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (multipart));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pgp_mime_part_decrypt:</div><div class='del'>- * @context: PGP Context</div><div class='del'>- * @mime_part: a multipart/encrypted MIME Part</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Returns the decrypted MIME Part on success or NULL on fail.</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_pgp_mime_part_decrypt (CamelPgpContext *context, CamelMimePart *mime_part, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-	CamelMimePart *encrypted_part, *part;</div><div class='del'>-	CamelContentType *mime_type;</div><div class='del'>-	CamelStream *stream, *ciphertext;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlf_filter;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (mime_part != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_PART (mime_part), NULL);</div><div class='del'>-	</div><div class='del'>-	/* make sure the mime part is a multipart/encrypted */</div><div class='del'>-	if (!camel_pgp_mime_is_rfc2015_encrypted (mime_part))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-	</div><div class='del'>-	/* get the encrypted part (second part) */</div><div class='del'>-	encrypted_part = camel_multipart_get_part (multipart, 1 /* second part starting at 0 */);</div><div class='del'>-	mime_type = camel_mime_part_get_content_type (encrypted_part);</div><div class='del'>-	if (!header_content_type_is (mime_type, "application", "octet-stream"))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* get the ciphertext */</div><div class='del'>-	ciphertext = camel_stream_mem_new ();</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (encrypted_part), ciphertext);</div><div class='del'>-	camel_stream_reset (ciphertext);</div><div class='del'>-	</div><div class='del'>-	/* get the cleartext */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	if (camel_pgp_decrypt (context, ciphertext, stream, ex) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (ciphertext));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ciphertext));</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	</div><div class='del'>-	/* construct the new decrypted mime part from the stream */</div><div class='del'>-	part = camel_mime_part_new ();</div><div class='del'>-	</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE,</div><div class='del'>-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (part), CAMEL_STREAM (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-pgp-mime.h b/camel/camel-pgp-mime.h<br/>deleted file mode 100644<br/>index 7f7928967d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pgp-mime.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pgp-mime.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PGP_MIME_H</div><div class='del'>-#define CAMEL_PGP_MIME_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-multipart.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-#include &lt;camel/camel-pgp-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-gboolean camel_pgp_mime_is_rfc2015_signed (CamelMimePart *part);</div><div class='del'>-gboolean camel_pgp_mime_is_rfc2015_encrypted (CamelMimePart *part);</div><div class='del'>-</div><div class='del'>-void camel_pgp_mime_part_sign (CamelPgpContext *context,</div><div class='del'>-			       CamelMimePart **mime_part,</div><div class='del'>-			       const char *userid,</div><div class='del'>-			       CamelCipherHash hash,</div><div class='del'>-			       CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelCipherValidity *camel_pgp_mime_part_verify (CamelPgpContext *context,</div><div class='del'>-						 CamelMimePart *mime_part,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_pgp_mime_part_encrypt (CamelPgpContext *context,</div><div class='del'>-				  CamelMimePart **mime_part,</div><div class='del'>-				  GPtrArray *recipients,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelMimePart *camel_pgp_mime_part_decrypt (CamelPgpContext *context,</div><div class='del'>-					    CamelMimePart *mime_part,</div><div class='del'>-					    CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! CAMEL_PGP_MIME_H */</div><div class='head'>diff --git a/camel/camel-pkcs7-context.c b/camel/camel-pkcs7-context.c<br/>deleted file mode 100644<br/>index c70a8fa96b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pkcs7-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pkcs7-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,691 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-pkcs7-context.h"</div><div class='del'>-</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-#include &lt;nss.h&gt;</div><div class='del'>-#include &lt;cert.h&gt;</div><div class='del'>-#include &lt;secpkcs7.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt; /* for _() macro */</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-struct _CamelPkcs7ContextPrivate {</div><div class='del'>-	CERTCertDBHandle *certdb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int                  pkcs7_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-					CamelStream *istream, CamelStream *ostream, CamelException *ex);</div><div class='del'>-static int                  pkcs7_clearsign (CamelCipherContext *context, const char *userid,</div><div class='del'>-					     CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-					     CamelStream *ostream, CamelException *ex);</div><div class='del'>-static CamelCipherValidity *pkcs7_verify (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-					  CamelStream *sigstream, CamelException *ex);</div><div class='del'>-static int                  pkcs7_encrypt (CamelCipherContext *context, gboolean sign, const char *userid,</div><div class='del'>-					   GPtrArray *recipients, CamelStream *istream, CamelStream *ostream,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-static int                  pkcs7_decrypt (CamelCipherContext *context, CamelStream *istream,</div><div class='del'>-					   CamelStream *ostream, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelCipherContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pkcs7_context_init (CamelPkcs7Context *context)</div><div class='del'>-{</div><div class='del'>-	context-&gt;priv = g_new0 (struct _CamelPkcs7ContextPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pkcs7_context_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = (CamelPkcs7Context *)o;</div><div class='del'>-	</div><div class='del'>-	CERT_ClosePermCertDB (context-&gt;priv-&gt;certdb);</div><div class='del'>-	g_free (context-&gt;priv-&gt;certdb);</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pkcs7_context_class_init (CamelPkcs7ContextClass *camel_pkcs7_context_class)</div><div class='del'>-{</div><div class='del'>-	CamelCipherContextClass *camel_cipher_context_class =</div><div class='del'>-		CAMEL_CIPHER_CONTEXT_CLASS (camel_pkcs7_context_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_CIPHER_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cipher_context_get_type ()));</div><div class='del'>-	</div><div class='del'>-	camel_cipher_context_class-&gt;sign = pkcs7_sign;</div><div class='del'>-	camel_cipher_context_class-&gt;clearsign = pkcs7_clearsign;</div><div class='del'>-	camel_cipher_context_class-&gt;verify = pkcs7_verify;</div><div class='del'>-	camel_cipher_context_class-&gt;encrypt = pkcs7_encrypt;</div><div class='del'>-	camel_cipher_context_class-&gt;decrypt = pkcs7_decrypt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pkcs7_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_cipher_context_get_type (),</div><div class='del'>-					    "CamelPkcs7Context",</div><div class='del'>-					    sizeof (CamelPkcs7Context),</div><div class='del'>-					    sizeof (CamelPkcs7ContextClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_pkcs7_context_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_pkcs7_context_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_pkcs7_context_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pkcs7_context_new:</div><div class='del'>- * @session: CamelSession</div><div class='del'>- * @certdb: certificate db</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelPkcs7Context object which is used to sign,</div><div class='del'>- * verify, encrypt and decrypt streams.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelPkcs7Context</div><div class='del'>- **/</div><div class='del'>-CamelPkcs7Context *</div><div class='del'>-camel_pkcs7_context_new (CamelSession *session, const char *certdb)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context;</div><div class='del'>-	CERTCertDBHandle *handle;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (session != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	context = CAMEL_PKCS7_CONTEXT (camel_object_new (CAMEL_PKCS7_CONTEXT_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_cipher_construct (CAMEL_CIPHER_CONTEXT (context), session);</div><div class='del'>-	</div><div class='del'>-	handle = g_new0 (CERTCertDBHandle, 1);</div><div class='del'>-	if (certdb) {</div><div class='del'>-		if (!CERT_OpenCertDBFilename (handle, certdb, FALSE)) {</div><div class='del'>-			g_free (handle);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (!CERT_OpenVolatileCertDB (handle)) {</div><div class='del'>-			g_free (handle);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	context-&gt;priv-&gt;certdb = handle;</div><div class='del'>-	</div><div class='del'>-	return context;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*----------------------------------------------------------------------*</div><div class='del'>- *                     Public crypto functions</div><div class='del'>- *----------------------------------------------------------------------*/</div><div class='del'>-</div><div class='del'>-struct _GetPasswdData {</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	const char *userid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static SECItem *</div><div class='del'>-get_zero_len_passwd (SECKEYKeyDBHandle *handle)</div><div class='del'>-{</div><div class='del'>-	SECItem *pwitem;</div><div class='del'>-	SECStatus rv;</div><div class='del'>-	</div><div class='del'>-	/* hash the empty string as a password */</div><div class='del'>-	pwitem = SECKEY_DeriveKeyDBPassword (handle, "");</div><div class='del'>-	if (pwitem == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* check to see if this is the right password */</div><div class='del'>-	rv = SECKEY_CheckKeyDBPassword (handle, pwitem);</div><div class='del'>-	if (rv == SECFailure)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return pwitem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SECItem *</div><div class='del'>-get_password (void *arg, SECKEYKeyDBHandle *handle)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = ((struct _GetPasswdData *) arg)-&gt;session;</div><div class='del'>-	CamelException *ex = ((struct _GetPasswdData *) arg)-&gt;ex;</div><div class='del'>-	const char *userid = ((struct _GetPasswdData *) arg)-&gt;userid;</div><div class='del'>-	char *prompt, *passwd = NULL;</div><div class='del'>-	SECItem *pwitem;</div><div class='del'>-	SECStatus rv;</div><div class='del'>-	</div><div class='del'>-	/* Check to see if zero length password or not */</div><div class='del'>-	pwitem = get_zero_len_passwd (handle);</div><div class='del'>-	if (pwitem)</div><div class='del'>-		return pwitem;</div><div class='del'>-	</div><div class='del'>-	prompt = g_strdup_printf (_("Please enter your password for %s"), userid);</div><div class='del'>-	passwd = camel_session_get_password (session, prompt, TRUE,</div><div class='del'>-					     NULL, userid, NULL);</div><div class='del'>-	g_free (prompt);</div><div class='del'>-	</div><div class='del'>-	/* hash the password */</div><div class='del'>-	pwitem = SECKEY_DeriveKeyDBPassword (handle, passwd ? passwd : "");</div><div class='del'>-	</div><div class='del'>-	/* clear out the password strings */</div><div class='del'>-	if (passwd) {</div><div class='del'>-		memset (passwd, 0, strlen (passwd));</div><div class='del'>-		g_free (passwd);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (pwitem == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Error hashing password."));</div><div class='del'>-		</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* confirm the password */</div><div class='del'>-	rv = SECKEY_CheckKeyDBPassword (handle, pwitem);</div><div class='del'>-	if (rv) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Invalid password."));</div><div class='del'>-		</div><div class='del'>-		SECITEM_ZfreeItem (pwitem, PR_TRUE);</div><div class='del'>-		</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return pwitem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static HASH_HashType</div><div class='del'>-camel_cipher_hash_to_nss (CamelCipherHash hash)</div><div class='del'>-{</div><div class='del'>-	switch (hash) {</div><div class='del'>-	case CAMEL_CIPHER_HASH_DEFAULT:</div><div class='del'>-		return HASH_AlgSHA1;</div><div class='del'>-	case CAMEL_CIPHER_HASH_MD2:</div><div class='del'>-		return HASH_AlgMD2;</div><div class='del'>-	case CAMEL_CIPHER_HASH_MD5:</div><div class='del'>-		return HASH_AlgMD5;</div><div class='del'>-	case CAMEL_CIPHER_HASH_SHA1:</div><div class='del'>-		return HASH_AlgSHA1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return HASH_AlgNULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SECOidTag</div><div class='del'>-nss_hash_to_sec_oid (HASH_HashType hash)</div><div class='del'>-{</div><div class='del'>-	switch (hash) {</div><div class='del'>-	case HASH_AlgMD2:</div><div class='del'>-		return SEC_OID_MD2;</div><div class='del'>-	case HASH_AlgMD5:</div><div class='del'>-		return SEC_OID_MD5;</div><div class='del'>-	case Hash_AlgSHA1:</div><div class='del'>-		return SEC_OID_SHA1;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pkcs7_digest (SECItem *data, char *digestdata, unsigned int *len, unsigned int maxlen, HASH_HashType hash)</div><div class='del'>-{</div><div class='del'>-	SECHashObject *hashObj;</div><div class='del'>-	void *hashcx;</div><div class='del'>-	</div><div class='del'>-	hashObj = &amp;SECHashObjects[hash];</div><div class='del'>-	</div><div class='del'>-	hashcx = (* hashObj-&gt;create)();</div><div class='del'>-	if (hashcx == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	(* hashObj-&gt;begin)(hashcx);</div><div class='del'>-	(* hashObj-&gt;update)(hashcx, data-&gt;data, data-&gt;len);</div><div class='del'>-	(* hashObj-&gt;end)(hashcx, (unsigned char *)digestdata, len, maxlen);</div><div class='del'>-	(* hashObj-&gt;destroy)(hashcx, PR_TRUE);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sec_output_cb (void *arg, const char *buf, unsigned long len)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_STREAM (arg);</div><div class='del'>-	camel_stream_write (stream, buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pkcs7_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-	    CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	SEC_PKCS7ContentInfo *cinfo;</div><div class='del'>-	SECItem data2sign, digest;</div><div class='del'>-	HASH_HashType hash_type;</div><div class='del'>-	CERTCertificate *cert;</div><div class='del'>-	guchar digestdata[32];</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	guint len;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (userid != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (istream != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (ostream != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	data2sign.data = buf-&gt;data;</div><div class='del'>-	data2sign.len = buf-&gt;len;</div><div class='del'>-	</div><div class='del'>-	hash_type = camel_cipher_hash_to_nss (hash);</div><div class='del'>-	pkcs7_digest (&amp;data2sign, digestdata, &amp;len, 32, hash_type);</div><div class='del'>-	digest.data = (unsigned char *)digestdata;</div><div class='del'>-	digest.len = len;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	cert = CERT_FindCertByNickname (context-&gt;priv-&gt;certdb, userid);</div><div class='del'>-	if (!cert) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not sign: certificate not found for \"%s\"."),</div><div class='del'>-				      userid);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cinfo = SEC_PKCS7CreateSignedData (cert, certUsageEmailSigner, NULL,</div><div class='del'>-					   nss_hash_to_sec_oid (hash_type),</div><div class='del'>-					   &amp;digest, NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7IncludeCertChain (cinfo, NULL);</div><div class='del'>-	</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7Encode (cinfo, sec_output_cb, ostream, NULL, get_password, data);</div><div class='del'>-	</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pkcs7_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,</div><div class='del'>-		 CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	SEC_PKCS7ContentInfo *cinfo;</div><div class='del'>-	HASH_HashType hash_type;</div><div class='del'>-	CERTCertificate *cert;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	SECItem data2sign;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (userid != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (istream != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (ostream != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	hash_type = camel_cipher_hash_to_nss (hash);</div><div class='del'>-	</div><div class='del'>-	cert = CERT_FindCertByNickname (context-&gt;priv-&gt;certdb, userid);</div><div class='del'>-	if (!cert) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not clearsign: certificate not found for \"%s\"."),</div><div class='del'>-				      userid);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cinfo = SEC_PKCS7CreateSignedData (cert, certUsageEmailSigner, NULL,</div><div class='del'>-					   nss_hash_to_sec_oid (hash_type),</div><div class='del'>-					   NULL, NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	data2sign.data = buf-&gt;data;</div><div class='del'>-	data2sign.len = buf-&gt;len;</div><div class='del'>-	SEC_PKCS7SetContent (cinfo, (char *)data2sign.data, data2sign.len);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7IncludeCertChain (cinfo, NULL);</div><div class='del'>-	</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7Encode (cinfo, sec_output_cb, ostream, NULL, get_password, data);</div><div class='del'>-	</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* this is just meant as a reference so I can see what the valid enums are */</div><div class='del'>-typedef enum {</div><div class='del'>-	certUsageSSLClient,</div><div class='del'>-	certUsageSSLServer,</div><div class='del'>-	certUsageSSLServerWithStepUp,</div><div class='del'>-	certUsageSSLCA,</div><div class='del'>-	certUsageEmailSigner,</div><div class='del'>-	certUsageEmailRecipient,</div><div class='del'>-	certUsageObjectSigner,</div><div class='del'>-	certUsageUserCertImport,</div><div class='del'>-	certUsageVerifyCA,</div><div class='del'>-	certUsageProtectedObjectSigner,</div><div class='del'>-	certUsageStatusResponder,</div><div class='del'>-	certUsageAnyCA</div><div class='del'>-} SECCertUsage;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static HASH_HashType</div><div class='del'>-AlgorithmToHashType (SECAlgorithmID *digestAlgorithms)</div><div class='del'>-{</div><div class='del'>-	SECOidTag tag;</div><div class='del'>-	</div><div class='del'>-	tag = SECOID_GetAlgorithmTag (digestAlgorithms);</div><div class='del'>-	</div><div class='del'>-	switch (tag) {</div><div class='del'>-	case SEC_OID_MD2:</div><div class='del'>-		return HASH_AlgMD2;</div><div class='del'>-	case SEC_OID_MD5:</div><div class='del'>-		return HASH_AlgMD5;</div><div class='del'>-	case SEC_OID_SHA1:</div><div class='del'>-		return HASH_AlgSHA1;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return HASH_AlgNULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* FIXME: god knows if this code works, NSS "docs" are so not helpful at all */</div><div class='del'>-static CamelCipherValidity *</div><div class='del'>-pkcs7_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,</div><div class='del'>-	      CamelStream *sigstream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);</div><div class='del'>-	CamelCipherValidity *valid = NULL;</div><div class='del'>-	SEC_PKCS7ContentInfo *cinfo;</div><div class='del'>-	SECCertUsage usage;</div><div class='del'>-	GByteArray *plaintext;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	/* create our ContentInfo object */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	plaintext = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	cinfo = SEC_PKCS7CreateData ();</div><div class='del'>-	SEC_PKCS7SetContent (cinfo, plaintext-&gt;data, plaintext-&gt;len);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	usage = certUsageEmailSigner;  /* just a guess. or maybe certUsageVerifyCA?? */</div><div class='del'>-	</div><div class='del'>-	valid = camel_cipher_validity_new ();</div><div class='del'>-	</div><div class='del'>-	if (sigstream) {</div><div class='del'>-		HASH_HashType digest_type;</div><div class='del'>-		GByteArray *signature;</div><div class='del'>-		SECItem digest;</div><div class='del'>-		</div><div class='del'>-		/* create our digest object */</div><div class='del'>-		stream = camel_stream_mem_new ();</div><div class='del'>-		camel_stream_write_to_stream (sigstream, stream);</div><div class='del'>-		signature = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-		digest.data = signature-&gt;data;</div><div class='del'>-		digest.len = signature-&gt;len;</div><div class='del'>-		</div><div class='del'>-		switch (hash) {</div><div class='del'>-		default:</div><div class='del'>-		case CAMEL_CIPHER_HASH_DEFAULT:</div><div class='del'>-			digest_type = HASH_AlgNULL;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD2:</div><div class='del'>-			digest_type = HASH_AlgMD2;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_CIPHER_HASH_MD5:</div><div class='del'>-			digest_type = HASH_AlgMD5;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_CIPHER_HASH_SHA1:</div><div class='del'>-			digest_type = HASH_AlgSHA1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		valid-&gt;valid = SEC_PKCS7VerifyDetachedSignature (cinfo, usage, &amp;digest, digest_type, PR_FALSE);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	} else {</div><div class='del'>-		valid-&gt;valid = SEC_PKCS7VerifySignature (cinfo, usage, PR_FALSE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: set a meaningful description...in UTF8 */</div><div class='del'>-	camel_cipher_validity_set_description (valid, "");</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: we need to respect the 'sign' argument... */</div><div class='del'>-static int</div><div class='del'>-pkcs7_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArray *recipients,</div><div class='del'>-	       CamelStream *istream, CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);</div><div class='del'>-	const char *invalid_userkey = NULL;</div><div class='del'>-	SEC_PKCS7ContentInfo *cinfo = NULL;</div><div class='del'>-	CERTCertificate *cert, *usercert;</div><div class='del'>-	SEC_PKCS7EncoderContext *ecx;</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-	SECItem secdata;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	int i = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (userid != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (recipients != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (recipients-&gt;len != 0, -1);</div><div class='del'>-	g_return_val_if_fail (istream != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (ostream != NULL, -1);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* this isn't needed until we respect the 'sign' argument... */</div><div class='del'>-	usercert = CERT_FindCertByNickname (context-&gt;priv-&gt;certdb, userid);</div><div class='del'>-	if (!usercert) {</div><div class='del'>-		invalid_userkey = userid;</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	cert = CERT_FindCertByNickname (context-&gt;priv-&gt;certdb, recipients-&gt;pdata[i]);</div><div class='del'>-	if (!cert) {</div><div class='del'>-		invalid_userkey = recipients-&gt;pdata[i];</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: extend CamelCipherContext to allow selecting an encryption algorithm?? */</div><div class='del'>-	cinfo = SEC_PKCS7CreateEncryptedData (SEC_OID_DES_EDE3_CBC, 0, </div><div class='del'>-					      get_password, data);</div><div class='del'>-	</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	if (!cinfo) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not encrypt: failed to create enveloped data."));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i++; i &lt; recipients-&gt;len; i++) {</div><div class='del'>-		SECStatus retval;</div><div class='del'>-		</div><div class='del'>-		cert = CERT_FindCertByNickname (context-&gt;priv-&gt;certdb, recipients-&gt;pdata[i]);</div><div class='del'>-		if (!cert) {</div><div class='del'>-			invalid_userkey = recipients-&gt;pdata[i];</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		retval = SEC_PKCS7AddRecipient (cinfo, cert, certUsageEmailRecipient, NULL);</div><div class='del'>-		if (retval != SECSuccess) {</div><div class='del'>-			invalid_userkey = recipients-&gt;pdata[i];</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ecx = SEC_PKCS7EncoderStart (cinfo, sec_output_cb, ostream, NULL);</div><div class='del'>-	if (ecx == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not encrypt: failed to create encryption context."));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	if (SEC_PKCS7EncoderUpdate (ecx, buf-&gt;data, buf-&gt;len) != SECSuccess)</div><div class='del'>-		goto exception;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	stream = NULL;</div><div class='del'>-	</div><div class='del'>-	if (SEC_PKCS7EncoderFinish (ecx, NULL, NULL) != SECSuccess)</div><div class='del'>-		goto exception;</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	if (stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	if (cinfo)</div><div class='del'>-		SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	if (invalid_userkey) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not encrypt data: invalid user key: \"%s\"."),</div><div class='del'>-				      invalid_userkey);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not encrypt: encoding failed."));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static PRBool</div><div class='del'>-decryption_allowed (SECAlgorithmID *algid, PK11SymKey *key)</div><div class='del'>-{</div><div class='del'>-	return PR_TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pkcs7_decrypt (CamelCipherContext *ctx, CamelStream *istream,</div><div class='del'>-	       CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPkcs7Context *context = CAMEL_PKCS7_CONTEXT (ctx);</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	SEC_PKCS7DecoderContext *dcx;</div><div class='del'>-	SEC_PKCS7ContentInfo *cinfo;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-	SECItem secdata;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (istream != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (ostream != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write_to_stream (istream, stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	secdata.data = buf-&gt;data;</div><div class='del'>-	secdata.len = buf-&gt;len;</div><div class='del'>-	</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = NULL;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	</div><div class='del'>-	dcx = SEC_PKCS7DecoderStart (sec_output_cb, ostream, get_password, data,</div><div class='del'>-				     NULL, NULL, decryption_allowed);</div><div class='del'>-	if (dcx == NULL)</div><div class='del'>-		goto exception;</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DecoderUpdate (dcx, secdata.data, secdata.len);</div><div class='del'>-	cinfo = SEC_PKCS7DecoderFinish (dcx);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	if (cinfo == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to decrypt: Unknown"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	SEC_PKCS7DestroyContentInfo (cinfo);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	if (stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-pkcs7-context.h b/camel/camel-pkcs7-context.h<br/>deleted file mode 100644<br/>index 98c0bd1a86..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-pkcs7-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-pkcs7-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PKCS7_CONTEXT_H</div><div class='del'>-#define CAMEL_PKCS7_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-cipher-context.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CAMEL_PKCS7_CONTEXT_TYPE     (camel_pkcs7_context_get_type ())</div><div class='del'>-#define CAMEL_PKCS7_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PKCS7_CONTEXT_TYPE, CamelPkcs7Context))</div><div class='del'>-#define CAMEL_PKCS7_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PKCS7_CONTEXT_TYPE, CamelPkcs7ContextClass))</div><div class='del'>-#define CAMEL_IS_PKCS7_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PKCS7_CONTEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPkcs7Context {</div><div class='del'>-	CamelCipherContext parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelPkcs7ContextPrivate *priv;</div><div class='del'>-	</div><div class='del'>-} CamelPkcs7Context;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPkcs7ContextClass {</div><div class='del'>-	CamelCipherContextClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelPkcs7ContextClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType            camel_pkcs7_context_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelPkcs7Context   *camel_pkcs7_context_new (CamelSession *session, const char *certdb_path);</div><div class='del'>-</div><div class='del'>-/* PKCS7 routines */</div><div class='del'>-#define camel_pkcs7_sign(c, u, h, i, o, e) camel_cipher_sign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pkcs7_clearsign(c, u, h, i, o, e) camel_cipher_clearsign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pkcs7_verify(c, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), i, s, e)</div><div class='del'>-</div><div class='del'>-#define camel_pkcs7_encrypt(c, s, u, r, i, o, e) camel_cipher_encrypt (CAMEL_CIPHER_CONTEXT (c), s, u, r, i, o, e)</div><div class='del'>-</div><div class='del'>-#define camel_pkcs7_decrypt(c, i, o, e) camel_cipher_decrypt (CAMEL_CIPHER_CONTEXT (c), i, o, e)</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_PKCS7_CONTEXT_H */</div><div class='head'>diff --git a/camel/camel-private.h b/camel/camel-private.h<br/>deleted file mode 100644<br/>index 81cf2a4dad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,238 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *  camel-private.h: Private info for class implementers.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PRIVATE_H</div><div class='del'>-#define CAMEL_PRIVATE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* need a way to configure and save this data, if this header is to</div><div class='del'>-   be installed.  For now, dont install it */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelFolderPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *lock;</div><div class='del'>-	EMutex *change_lock;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* must require the 'change_lock' to access this */</div><div class='del'>-	int frozen;</div><div class='del'>-	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelStorePrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *folder_lock;	/* for locking folder operations */</div><div class='del'>-	EMutex *cache_lock;	/* for locking access to the cache */</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_STORE_LOCK(f, l)</div><div class='del'>-#define CAMEL_STORE_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelTransportPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *send_lock;   /* for locking send operations */</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_TRANSPORT_LOCK(f, l) (g_mutex_lock(((CamelTransport *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_TRANSPORT_UNLOCK(f, l) (g_mutex_unlock(((CamelTransport *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_TRANSPORT_LOCK(f, l)</div><div class='del'>-#define CAMEL_TRANSPORT_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelServicePrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *connect_lock;	/* for locking connection operations */</div><div class='del'>-	EMutex *connect_op_lock;/* for locking the connection_op */</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_SERVICE_LOCK(f, l)</div><div class='del'>-#define CAMEL_SERVICE_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelSessionPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;		/* for locking everything basically */</div><div class='del'>-	GMutex *thread_lock;	/* locking threads */</div><div class='del'>-</div><div class='del'>-	int thread_id;</div><div class='del'>-	GHashTable *thread_active;</div><div class='del'>-	EThread *thread_queue;</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_SESSION_LOCK(f, l) (g_mutex_lock(((CamelSession *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_SESSION_UNLOCK(f, l) (g_mutex_unlock(((CamelSession *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_SESSION_LOCK(f, l)</div><div class='del'>-#define CAMEL_SESSION_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelRemoteStorePrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *stream_lock;	/* for locking stream operations */</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_REMOTE_STORE_LOCK(f, l) (e_mutex_lock(((CamelRemoteStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_REMOTE_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelRemoteStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_REMOTE_STORE_LOCK(f, l)</div><div class='del'>-#define CAMEL_REMOTE_STORE_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* most of this stuff really is private, but the lock can be used by subordinate classes */</div><div class='del'>-struct _CamelFolderSummaryPrivate {</div><div class='del'>-	GHashTable *filter_charset;	/* CamelMimeFilterCharset's indexed by source charset */</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterIndex *filter_index;</div><div class='del'>-	struct _CamelMimeFilterBasic *filter_64;</div><div class='del'>-	struct _CamelMimeFilterBasic *filter_qp;</div><div class='del'>-	struct _CamelMimeFilterBasic *filter_uu;</div><div class='del'>-	struct _CamelMimeFilterSave *filter_save;</div><div class='del'>-	struct _CamelMimeFilterHTML *filter_html;</div><div class='del'>-</div><div class='del'>-	struct _CamelStreamFilter *filter_stream;</div><div class='del'>-</div><div class='del'>-	struct _CamelIndex *index;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *summary_lock;	/* for the summary hashtable/array */</div><div class='del'>-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */</div><div class='del'>-	GMutex *filter_lock;	/* for accessing any of the filtering/indexing stuff, since we share them */</div><div class='del'>-	GMutex *alloc_lock;	/* for setting up and using allocators */</div><div class='del'>-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelFolderSummary *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelFolderSummary *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_SUMMARY_LOCK(f, l)</div><div class='del'>-#define CAMEL_SUMMARY_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelStoreSummaryPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *summary_lock;	/* for the summary hashtable/array */</div><div class='del'>-	GMutex *io_lock;	/* load/save lock, for access to saved_count, etc */</div><div class='del'>-	GMutex *alloc_lock;	/* for setting up and using allocators */</div><div class='del'>-	GMutex *ref_lock;	/* for reffing/unreffing messageinfo's ALWAYS obtain before summary_lock */</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_STORE_SUMMARY_LOCK(f, l) (g_mutex_lock(((CamelStoreSummary *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_STORE_SUMMARY_UNLOCK(f, l) (g_mutex_unlock(((CamelStoreSummary *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_STORE_SUMMARY_LOCK(f, l)</div><div class='del'>-#define CAMEL_STORE_SUMMARY_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelVeeFolderPrivate {</div><div class='del'>-	GList *folders;			/* lock using subfolder_lock before changing/accessing */</div><div class='del'>-	GList *folders_changed;		/* for list of folders that have changed between updates */</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *summary_lock;		/* for locking vfolder summary */</div><div class='del'>-	GMutex *subfolder_lock;		/* for locking the subfolder list */</div><div class='del'>-	GMutex *changed_lock;		/* for locking the folders-changed list */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_VEE_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelVeeFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_VEE_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelVeeFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_VEE_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_VEE_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelDataWrapperPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	pthread_mutex_t stream_lock;</div><div class='del'>-#else</div><div class='del'>-	gpointer dummy;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_DATA_WRAPPER_LOCK(dw, l)   (pthread_mutex_lock(&amp;((CamelDataWrapper *)dw)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_DATA_WRAPPER_UNLOCK(dw, l) (pthread_mutex_unlock(&amp;((CamelDataWrapper *)dw)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_DATA_WRAPPER_LOCK(dw, l)</div><div class='del'>-#define CAMEL_DATA_WRAPPER_UNLOCK(dw, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_PRIVATE_H */</div><div class='head'>diff --git a/camel/camel-provider.c b/camel/camel-provider.c<br/>deleted file mode 100644<br/>index f8484278d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,191 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-provider.c: provider framework */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: Shouldn't we add a version number to providers ? */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gmodule.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_provider_init:</div><div class='del'>- *</div><div class='del'>- * Initialize the Camel provider system by reading in the .urls</div><div class='del'>- * files in the provider directory and creating a hash table mapping</div><div class='del'>- * URLs to module names.</div><div class='del'>- *</div><div class='del'>- * A .urls file has the same initial prefix as the shared library it</div><div class='del'>- * correspond to, and consists of a series of lines containing the URL</div><div class='del'>- * protocols that that library handles.</div><div class='del'>- *</div><div class='del'>- * Return value: a hash table mapping URLs to module names</div><div class='del'>- **/</div><div class='del'>-GHashTable *</div><div class='del'>-camel_provider_init (void)</div><div class='del'>-{</div><div class='del'>-	GHashTable *providers;</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *p, *name, buf[80];</div><div class='del'>-	</div><div class='del'>-	providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);</div><div class='del'>-</div><div class='del'>-	dir = opendir (CAMEL_PROVIDERDIR);</div><div class='del'>-	if (!dir) {</div><div class='del'>-		g_error ("Could not open camel provider directory: %s",</div><div class='del'>-			 g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ((d = readdir (dir))) {</div><div class='del'>-		FILE *fp;</div><div class='del'>-		</div><div class='del'>-		p = strchr (d-&gt;d_name, '.');</div><div class='del'>-		if (!p || strcmp (p, ".urls") != 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		name = g_strdup_printf ("%s/%s", CAMEL_PROVIDERDIR, d-&gt;d_name);</div><div class='del'>-		fp = fopen (name, "r");</div><div class='del'>-		if (!fp) {</div><div class='del'>-			g_warning ("Could not read provider info file %s: %s",</div><div class='del'>-				   name, g_strerror (errno));</div><div class='del'>-			g_free (name);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		p = strrchr (name, '.');</div><div class='del'>-		strcpy (p, ".so");</div><div class='del'>-		while ((fgets (buf, sizeof (buf), fp))) {</div><div class='del'>-			buf[sizeof (buf) - 1] = '\0';</div><div class='del'>-			p = strchr (buf, '\n');</div><div class='del'>-			if (p)</div><div class='del'>-				*p = '\0';</div><div class='del'>-			</div><div class='del'>-			if (*buf)</div><div class='del'>-				g_hash_table_insert (providers, g_strdup (buf), g_strdup (name));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (name);</div><div class='del'>-		fclose (fp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir);</div><div class='del'>-	return providers;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_provider_load:</div><div class='del'>- * @session: the current session</div><div class='del'>- * @path: the path to a shared library</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Loads the provider at @path, and calls its initialization function,</div><div class='del'>- * passing @session as an argument. The provider should then register</div><div class='del'>- * itself with @session.</div><div class='del'>- **/ </div><div class='del'>-void</div><div class='del'>-camel_provider_load (CamelSession *session, const char *path, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GModule *module;</div><div class='del'>-	CamelProvider *(*camel_provider_module_init) ();</div><div class='del'>-</div><div class='del'>-	if (!g_module_supported ()) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not load %s: Module loading "</div><div class='del'>-				      "not supported on this system."),</div><div class='del'>-				      path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	module = g_module_open (path, 0);</div><div class='del'>-	if (!module) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not load %s: %s"),</div><div class='del'>-				      path, g_module_error ());</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!g_module_symbol (module, "camel_provider_module_init",</div><div class='del'>-			      (gpointer *)&amp;camel_provider_module_init)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not load %s: No initialization "</div><div class='del'>-					"code in module."), path);</div><div class='del'>-		g_module_close (module);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_provider_module_init (session);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_provider_auto_detect:</div><div class='del'>- * @provider: camel provider</div><div class='del'>- * @settings: currently set settings</div><div class='del'>- * @auto_detected: output hash table of auto-detected values</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * After filling in the standard Username/Hostname/Port/Path settings</div><div class='del'>- * (which must be set in @settings), if the provider supports it, you</div><div class='del'>- * may wish to have the provider auto-detect further settings based on</div><div class='del'>- * the aformentioned settings.</div><div class='del'>- *</div><div class='del'>- * If the provider does not support auto-detection, @auto_detected</div><div class='del'>- * will be set to %NULL. Otherwise the provider will attempt to</div><div class='del'>- * auto-detect whatever it can and file them into @auto_detected. If</div><div class='del'>- * for some reason it cannot auto-detect anything (not enough</div><div class='del'>- * information provided in @settings?) then @auto_deetected will be</div><div class='del'>- * set to %NULL and an exception may be set to explain why it failed.</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,</div><div class='del'>-			    GHashTable **auto_detected, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (provider != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	if (provider-&gt;auto_detect) {</div><div class='del'>-		return provider-&gt;auto_detect (url, auto_detected, ex);</div><div class='del'>-	} else {</div><div class='del'>-		*auto_detected = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-provider.h b/camel/camel-provider.h<br/>deleted file mode 100644<br/>index 5579a8c3d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-provider.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,195 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-provider.h :  provider definition  */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PROVIDER_H</div><div class='del'>-#define CAMEL_PROVIDER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_PROVIDER(obj) ((CamelProvider *)(obj))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_PROVIDER_STORE,</div><div class='del'>-	CAMEL_PROVIDER_TRANSPORT,</div><div class='del'>-	CAMEL_NUM_PROVIDER_TYPES</div><div class='del'>-} CamelProviderType;</div><div class='del'>-</div><div class='del'>-extern char *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];</div><div class='del'>-</div><div class='del'>-/* Provider flags:</div><div class='del'>- *</div><div class='del'>- * _IS_REMOTE   the provider works with remote data</div><div class='del'>- * _IS_LOCAL    it can be used as a backend for local folder</div><div class='del'>- *                tree folders. (*Not* just the opposite of _IS_REMOTE)</div><div class='del'>- * _IS_SOURCE   mail arrives there, so it should be offered as an</div><div class='del'>- *                option in the mail config dialog.</div><div class='del'>- * _IS_STORAGE  mail is stored there. it will appear in the folder tree.</div><div class='del'>- * _IS_EXTERNAL it appears in the folder tree but is not created by</div><div class='del'>- *                the mail component.</div><div class='del'>- */</div><div class='del'>-#define CAMEL_PROVIDER_IS_REMOTE	(1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_PROVIDER_IS_LOCAL		(1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_PROVIDER_IS_EXTERNAL	(1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_PROVIDER_IS_SOURCE	(1 &lt;&lt; 3)</div><div class='del'>-#define CAMEL_PROVIDER_IS_STORAGE	(1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_PROVIDER_SUPPORTS_SSL	(1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Flags for url_flags. "ALLOW" means the config dialog will let</div><div class='del'>- * the user configure it. "NEED" implies "ALLOW" but means the user</div><div class='del'>- * must configure it. Service code can assume that any url part</div><div class='del'>- * for which it has set the NEED flag will be set when the service</div><div class='del'>- * is created.</div><div class='del'>- */</div><div class='del'>-#define CAMEL_URL_PART_USER	 (1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_URL_PART_AUTH	 (1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_URL_PART_PASSWORD	 (1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_URL_PART_HOST	 (1 &lt;&lt; 3)</div><div class='del'>-#define CAMEL_URL_PART_PORT	 (1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_URL_PART_PATH	 (1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_PART_NEED	       6</div><div class='del'>-</div><div class='del'>-/* Use these macros to test a provider's url_flags */</div><div class='del'>-#define CAMEL_PROVIDER_ALLOWS(prov, flags) (prov-&gt;url_flags &amp; (flags | (flags &lt;&lt; CAMEL_URL_PART_NEED)))</div><div class='del'>-#define CAMEL_PROVIDER_NEEDS(prov, flags) (prov-&gt;url_flags &amp; (flags &lt;&lt; CAMEL_URL_PART_NEED))</div><div class='del'>-</div><div class='del'>-/* Providers use these macros to actually define their url_flags */</div><div class='del'>-#define CAMEL_URL_ALLOW_USER	 (CAMEL_URL_PART_USER)</div><div class='del'>-#define CAMEL_URL_ALLOW_AUTH	 (CAMEL_URL_PART_AUTH)</div><div class='del'>-#define CAMEL_URL_ALLOW_PASSWORD (CAMEL_URL_PART_PASSWORD)</div><div class='del'>-#define CAMEL_URL_ALLOW_HOST	 (CAMEL_URL_PART_HOST)</div><div class='del'>-#define CAMEL_URL_ALLOW_PORT	 (CAMEL_URL_PART_PORT)</div><div class='del'>-#define CAMEL_URL_ALLOW_PATH	 (CAMEL_URL_PART_PATH)</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_NEED_USER	 (CAMEL_URL_PART_USER &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-#define CAMEL_URL_NEED_AUTH	 (CAMEL_URL_PART_AUTH &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-#define CAMEL_URL_NEED_PASSWORD	 (CAMEL_URL_PART_PASSWORD &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-#define CAMEL_URL_NEED_HOST	 (CAMEL_URL_PART_HOST &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-#define CAMEL_URL_NEED_PORT	 (CAMEL_URL_PART_PORT &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-#define CAMEL_URL_NEED_PATH	 (CAMEL_URL_PART_PATH &lt;&lt; CAMEL_URL_PART_NEED)</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_PATH_IS_ABSOLUTE (1 &lt;&lt; 12)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT(prov) (prov-&gt;object_types[CAMEL_PROVIDER_STORE] &amp;&amp; prov-&gt;object_types[CAMEL_PROVIDER_TRANSPORT])</div><div class='del'>-</div><div class='del'>-/* Generic extra config stuff */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_PROVIDER_CONF_END,</div><div class='del'>-	CAMEL_PROVIDER_CONF_SECTION_START,</div><div class='del'>-	CAMEL_PROVIDER_CONF_SECTION_END,</div><div class='del'>-	CAMEL_PROVIDER_CONF_CHECKBOX,</div><div class='del'>-	CAMEL_PROVIDER_CONF_CHECKSPIN,</div><div class='del'>-	CAMEL_PROVIDER_CONF_ENTRY,</div><div class='del'>-	CAMEL_PROVIDER_CONF_LABEL,</div><div class='del'>-} CamelProviderConfType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelProviderConfType type;</div><div class='del'>-	char *name, *depname;</div><div class='del'>-	char *text, *value;</div><div class='del'>-} CamelProviderConfEntry;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Some defaults */</div><div class='del'>-#define CAMEL_PROVIDER_CONF_DEFAULT_USERNAME  { CAMEL_PROVIDER_CONF_LABEL, "username", NULL, N_("User_name:"), NULL }</div><div class='del'>-#define CAMEL_PROVIDER_CONF_DEFAULT_HOSTNAME  { CAMEL_PROVIDER_CONF_LABEL, "hostname", NULL, N_("_Host:"), NULL }</div><div class='del'>-#define CAMEL_PROVIDER_CONF_DEFAULT_PATH      { CAMEL_PROVIDER_CONF_ENTRY, "path", NULL, N_("_Path:"), "" }</div><div class='del'>-</div><div class='del'>-typedef int (*CamelProviderAutoDetectFunc) (CamelURL *url, GHashTable **auto_detected, CamelException *ex);</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Provider name used in CamelURLs. */</div><div class='del'>-	char *protocol;</div><div class='del'>-	</div><div class='del'>-	/* Provider name as used by people. (May be the same as protocol) */</div><div class='del'>-	char *name;</div><div class='del'>-	</div><div class='del'>-	/* Description of the provider. A novice user should be able</div><div class='del'>-	 * to read this description, and the information provided by</div><div class='del'>-	 * an ISP, IS department, etc, and determine whether or not</div><div class='del'>-	 * this provider is relevant to him, and if so, which</div><div class='del'>-	 * information goes with it.</div><div class='del'>-	 */</div><div class='del'>-	char *description;</div><div class='del'>-	</div><div class='del'>-	/* The category of message that this provider works with.</div><div class='del'>-	 * (evolution-mail will only list a provider in the store/transport</div><div class='del'>-	 * config dialogs if its domain is "mail".)</div><div class='del'>-	 */</div><div class='del'>-	char *domain;</div><div class='del'>-	</div><div class='del'>-	/* Flags describing the provider, flags describing its URLs */</div><div class='del'>-	int flags, url_flags;</div><div class='del'>-	</div><div class='del'>-	/* Extra configuration information */</div><div class='del'>-	CamelProviderConfEntry *extra_conf;</div><div class='del'>-	</div><div class='del'>-	/* auto-detection function */</div><div class='del'>-	CamelProviderAutoDetectFunc auto_detect;</div><div class='del'>-	</div><div class='del'>-	/* CamelType(s) of its store and/or transport. If both are</div><div class='del'>-	 * set, then they are assumed to be linked together and the</div><div class='del'>-	 * transport type can only be used in an account that also</div><div class='del'>-	 * uses the store type (eg, Exchange or NNTP).</div><div class='del'>-	 */</div><div class='del'>-	CamelType object_types[CAMEL_NUM_PROVIDER_TYPES];</div><div class='del'>-	</div><div class='del'>-	/* GList of CamelServiceAuthTypes the provider supports */</div><div class='del'>-	GList *authtypes;</div><div class='del'>-	</div><div class='del'>-	GHashTable *service_cache[CAMEL_NUM_PROVIDER_TYPES];</div><div class='del'>-	</div><div class='del'>-	GHashFunc url_hash;</div><div class='del'>-	GCompareFunc url_equal;</div><div class='del'>-} CamelProvider;</div><div class='del'>-</div><div class='del'>-GHashTable *camel_provider_init (void);</div><div class='del'>-void camel_provider_load (CamelSession *session, const char *path, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* This is defined by each module, not by camel-provider.c. */</div><div class='del'>-void camel_provider_module_init (CamelSession *session);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,</div><div class='del'>-				GHashTable **auto_detected, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_PROVIDER_H */</div><div class='head'>diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c<br/>deleted file mode 100644<br/>index e9eb4325dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-remote-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-remote-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,634 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-remote-store.c : class for an remote store */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Peter Williams &lt;peterw@ximian.com&gt;</div><div class='del'>- *           based on camel-imap-provider.c</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-remote-store.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-tcp-stream.h"</div><div class='del'>-#include "camel-tcp-stream-raw.h"</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-#if d(!)0</div><div class='del'>-extern gboolean camel_verbose_debug;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CSRVC(obj) (CAMEL_SERVICE_CLASS      (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-#define CSTRC(obj) (CAMEL_STORE_CLASS        (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-#define CRSC(obj)  (CAMEL_REMOTE_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void     remote_construct       (CamelService *service, CamelSession *session,</div><div class='del'>-					CamelProvider *provider, CamelURL *url,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-static gboolean remote_connect         (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean remote_disconnect      (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList   *remote_query_auth_types(CamelService *service, CamelException *ex);</div><div class='del'>-static char    *remote_get_name        (CamelService *service, gboolean brief);</div><div class='del'>-static gint     remote_send_string     (CamelRemoteStore *store, CamelException *ex, </div><div class='del'>-					char *fmt, va_list ap);</div><div class='del'>-static gint     remote_send_stream     (CamelRemoteStore *store, CamelStream *stream,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-static gint     remote_recv_line       (CamelRemoteStore *store, char **dest, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static int remote_store_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int remote_store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)</div><div class='del'>-{</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	CamelObjectClass *camel_object_class =</div><div class='del'>-		CAMEL_OBJECT_CLASS (camel_remote_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_remote_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class-&gt;setv = remote_store_setv;</div><div class='del'>-	camel_object_class-&gt;getv = remote_store_getv;</div><div class='del'>-	</div><div class='del'>-	camel_service_class-&gt;construct = remote_construct;</div><div class='del'>-	camel_service_class-&gt;connect = remote_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = remote_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = remote_query_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = remote_get_name;</div><div class='del'>-	</div><div class='del'>-	camel_remote_store_class-&gt;send_string = remote_send_string;</div><div class='del'>-	camel_remote_store_class-&gt;send_stream = remote_send_stream;</div><div class='del'>-	camel_remote_store_class-&gt;recv_line = remote_recv_line;</div><div class='del'>-	camel_remote_store_class-&gt;keepalive = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_remote_store_init (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	</div><div class='del'>-	remote_store-&gt;istream = NULL;</div><div class='del'>-	remote_store-&gt;ostream = NULL;</div><div class='del'>-	remote_store-&gt;timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	remote_store-&gt;priv = g_malloc0(sizeof(*remote_store-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	remote_store-&gt;priv-&gt;stream_lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_remote_store_finalise (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;status == CAMEL_SERVICE_CONNECTED) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		camel_service_disconnect (service, TRUE, &amp;ex);</div><div class='del'>-		if (camel_exception_is_set (&amp;ex)) {</div><div class='del'>-			g_warning ("camel_remote_store_finalize: silent disconnect failure: %s",</div><div class='del'>-				   camel_exception_get_description (&amp;ex));   </div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy (remote_store-&gt;priv-&gt;stream_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (remote_store-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_remote_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_remote_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_remote_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_remote_store_type =</div><div class='del'>-			camel_type_register (CAMEL_STORE_TYPE, "CamelRemoteStore",</div><div class='del'>-					     sizeof (CamelRemoteStore),</div><div class='del'>-					     sizeof (CamelRemoteStoreClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_remote_store_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_remote_store_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) camel_remote_store_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_remote_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-remote_store_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = (CamelService *) object;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	guint32 tag;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this arg wasn't already handled */</div><div class='del'>-		if (tag &amp; CAMEL_ARG_IGNORE)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_REMOTE_STORE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_REMOTE_STORE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (tag == CAMEL_REMOTE_STORE_SSL) {</div><div class='del'>-			/* set the ssl mode */</div><div class='del'>-			camel_url_set_param (url, "use_ssl", args-&gt;argv[i].ca_str);</div><div class='del'>-		} else {</div><div class='del'>-			/* error? */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* let our parent know that we've handled this arg */</div><div class='del'>-		camel_argv_ignore (args, i);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-remote_store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = (CamelService *) object;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	guint32 tag;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_REMOTE_STORE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_REMOTE_STORE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (tag == CAMEL_REMOTE_STORE_SSL) {</div><div class='del'>-			/* get the ssl mode */</div><div class='del'>-			*args-&gt;argv[i].ca_str = (char *) camel_url_get_param (url, "use_ssl");</div><div class='del'>-		} else {</div><div class='del'>-			/* error? */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remote_construct (CamelService *service, CamelSession *session,</div><div class='del'>-		  CamelProvider *provider, CamelURL *url,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (service);</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-</div><div class='del'>-	if (camel_url_get_param (url, "use_ssl"))</div><div class='del'>-		remote_store-&gt;use_ssl = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Auth stuff... for now, nothing, but might eventually add SSH tunneling</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-remote_query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-camel_remote_store_authtype_list (void)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-remote_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf (_("%s server %s"),</div><div class='del'>-					service-&gt;provider-&gt;name,</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	else {</div><div class='del'>-		return g_strdup_printf (_("%s service for %s on %s"),</div><div class='del'>-					service-&gt;provider-&gt;name,</div><div class='del'>-					service-&gt;url-&gt;user,</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-timeout_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *store = CAMEL_REMOTE_STORE(data);</div><div class='del'>-</div><div class='del'>-	CRSC (data)-&gt;keepalive(store);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-remote_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);</div><div class='del'>-	CamelStream *tcp_stream;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	gint ret, port;</div><div class='del'>-	</div><div class='del'>-	h = camel_service_gethost (service, ex);</div><div class='del'>-	if (!h)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;url-&gt;port)</div><div class='del'>-		port = service-&gt;url-&gt;port;</div><div class='del'>-	else if (store-&gt;use_ssl)</div><div class='del'>-		port = store-&gt;default_ssl_port;</div><div class='del'>-	else</div><div class='del'>-		port = store-&gt;default_port;	</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	if (store-&gt;use_ssl) {</div><div class='del'>-		tcp_stream = camel_tcp_stream_ssl_new (service, service-&gt;url-&gt;host);</div><div class='del'>-	} else {</div><div class='del'>-		tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-	</div><div class='del'>-	ret = camel_tcp_stream_connect (CAMEL_TCP_STREAM (tcp_stream), h, port);</div><div class='del'>-	camel_free_host(h);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-					     _("Connection cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      _("Could not connect to %s (port %d): %s"),</div><div class='del'>-					      service-&gt;url-&gt;host ? service-&gt;url-&gt;host : _("(unknown host)"),</div><div class='del'>-					      port, g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* parent class connect initialization */</div><div class='del'>-	if (CAMEL_SERVICE_CLASS (parent_class)-&gt;connect (service, ex) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	store-&gt;ostream = tcp_stream;</div><div class='del'>-	store-&gt;istream = camel_stream_buffer_new (tcp_stream, CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-	</div><div class='del'>-	/* Add a timeout so that we can hopefully prevent getting disconnected */</div><div class='del'>-	/* (Only if the implementation supports it) */</div><div class='del'>-	if (CRSC (store)-&gt;keepalive) {</div><div class='del'>-		CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));</div><div class='del'>-		</div><div class='del'>-		store-&gt;timeout_id = camel_session_register_timeout (session, 10 * 60 * 1000,</div><div class='del'>-								    timeout_cb, </div><div class='del'>-								    store);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_remote_folder (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (value);</div><div class='del'>-	</div><div class='del'>-	if (!camel_exception_is_set ((CamelException *) data))</div><div class='del'>-		camel_folder_sync (folder, FALSE, (CamelException *) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-remote_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;timeout_id) {</div><div class='del'>-		camel_session_remove_timeout (camel_service_get_session (CAMEL_SERVICE (store)),</div><div class='del'>-					      store-&gt;timeout_id);</div><div class='del'>-		store-&gt;timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;istream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (store-&gt;istream));</div><div class='del'>-		store-&gt;istream = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;ostream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (store-&gt;ostream));</div><div class='del'>-		store-&gt;ostream = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-remote_send_string (CamelRemoteStore *store, CamelException *ex, char *fmt, va_list ap)</div><div class='del'>-{</div><div class='del'>-	gchar *cmdbuf;</div><div class='del'>-	</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. */</div><div class='del'>-	if (!camel_remote_store_connected (store, ex))</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	/* create the command */</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, ap);</div><div class='del'>-</div><div class='del'>-#if d(!)0</div><div class='del'>-	if (camel_verbose_debug) {</div><div class='del'>-		if (strncmp (cmdbuf, "PASS ", 5) == 0)</div><div class='del'>-			fprintf (stderr, "sending : PASS xxxx\n");</div><div class='del'>-		else if (strstr (cmdbuf, "LOGIN \""))</div><div class='del'>-			fprintf (stderr, "sending : ------ LOGIN \"xxxx\" \"xxxx\"\n");</div><div class='del'>-		else if (strstr (cmdbuf, "LOGIN {"))</div><div class='del'>-			fprintf (stderr, "sending : ------ LOGIN {N+} ....\n");</div><div class='del'>-		else if (strstr (cmdbuf, "LOGIN "))</div><div class='del'>-			fprintf (stderr, "sending : ------ LOGIN xxxx xxxx\n");</div><div class='del'>-		else</div><div class='del'>-			fprintf (stderr, "sending : %s", cmdbuf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_printf (store-&gt;ostream, "%s", cmdbuf) == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: All of these functions need an api overhaul, they're not like</div><div class='del'>-   any other functions, anywhere in the world ... */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_send_string: Writes a string to the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @fmt: the printf-style format to use for creating the string to send</div><div class='del'>- * @...: the arguments to the printf string @fmt</div><div class='del'>- * Return value: 0 on success, nonzero on error</div><div class='del'>- *</div><div class='del'>- * Formats the string and sends it to the server.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,</div><div class='del'>-				char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	gint ret;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (fmt, -1);</div><div class='del'>-	</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);</div><div class='del'>-	ret = CRSC (store)-&gt;send_string (store, ex, fmt, ap);</div><div class='del'>-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);</div><div class='del'>-	va_end (ap);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. */</div><div class='del'>-</div><div class='del'>-	if (!camel_remote_store_connected (store, ex))</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "(sending stream)\n"));</div><div class='del'>-	</div><div class='del'>-	ret = camel_stream_write_to_stream (stream, store-&gt;ostream);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_set(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, strerror(errno));</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_send_stream: Writes a CamelStream to the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @stream: the stream to write</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * Return value: 0 on success, nonzero on error</div><div class='del'>- *</div><div class='del'>- * Sends the stream to the server.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);</div><div class='del'>-	</div><div class='del'>-	ret = CRSC (store)-&gt;send_stream (store, stream, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *stream;</div><div class='del'>-	char *buf;</div><div class='del'>-	</div><div class='del'>-	*dest = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. We can't expect a read to have any</div><div class='del'>-	 * meaning if we reconnect, so always set an exception.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	if (!camel_remote_store_connected (store, ex)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,</div><div class='del'>-				     g_strerror (errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	stream = CAMEL_STREAM_BUFFER (store-&gt;istream);</div><div class='del'>-	</div><div class='del'>-	buf = camel_stream_buffer_read_line (stream);</div><div class='del'>-	</div><div class='del'>-	if (buf == NULL) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      _("Server unexpectedly disconnected: %s"),</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*dest = buf;</div><div class='del'>-	</div><div class='del'>-#if d(!)0</div><div class='del'>-	if (camel_verbose_debug)</div><div class='del'>-		fprintf (stderr, "received: %s\n", *dest);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	return strlen (*dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_recv_line: Reads a line from the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @dest: a pointer that will be set to the location of a buffer</div><div class='del'>- *        holding the server's response</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * Return value: -1 on error, otherwise the length read.</div><div class='del'>- *</div><div class='del'>- * Reads a line from the server (terminated by \n or \r\n).</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (dest, -1);</div><div class='del'>-</div><div class='del'>-	CAMEL_REMOTE_STORE_LOCK(store, stream_lock);</div><div class='del'>-	</div><div class='del'>-	ret = CRSC (store)-&gt;recv_line (store, dest, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_REMOTE_STORE_UNLOCK(store, stream_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_folder_info (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (value);</div><div class='del'>-	</div><div class='del'>-	camel_folder_refresh_info (folder, (CamelException *) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_refresh_folders: Refresh the folders that I</div><div class='del'>- * contain</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Refreshes the folders listed in the folders hashtable.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (CAMEL_STORE (store)-&gt;folders, refresh_folder_info, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_connected:</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Ensure that the remote store is connected.</div><div class='del'>- *</div><div class='del'>- * Return value: Whether or not it is connected</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (store-&gt;istream == NULL)</div><div class='del'>-		return camel_service_connect (CAMEL_SERVICE (store), ex);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h<br/>deleted file mode 100644<br/>index 936388fab0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-remote-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-remote-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-remote-store.h : class for a remote store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Peter Williams &lt;peterw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_REMOTE_STORE_H</div><div class='del'>-#define CAMEL_REMOTE_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_REMOTE_STORE_TYPE     (camel_remote_store_get_type ())</div><div class='del'>-#define CAMEL_REMOTE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStore))</div><div class='del'>-#define CAMEL_REMOTE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStoreClass))</div><div class='del'>-#define CAMEL_IS_REMOTE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_REMOTE_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_REMOTE_STORE_ARG_FIRST  = CAMEL_STORE_ARG_FIRST + 100,</div><div class='del'>-	CAMEL_REMOTE_STORE_ARG_SSL,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_REMOTE_STORE_SSL (CAMEL_REMOTE_STORE_ARG_SSL | CAMEL_ARG_STR)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;	</div><div class='del'>-	struct _CamelRemoteStorePrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelStream *istream, *ostream;</div><div class='del'>-	guint timeout_id, default_port, default_ssl_port;</div><div class='del'>-	gboolean use_ssl;</div><div class='del'>-} CamelRemoteStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-	gint (*send_string)   (CamelRemoteStore *store, CamelException *ex, </div><div class='del'>-			       char *fmt, va_list ap);</div><div class='del'>-	gint (*send_stream)   (CamelRemoteStore *store, CamelStream *stream, </div><div class='del'>-			       CamelException *ex);</div><div class='del'>-	gint (*recv_line)     (CamelRemoteStore *store, char **dest, </div><div class='del'>-			       CamelException *ex);</div><div class='del'>-	void (*keepalive)     (CamelRemoteStore *store);</div><div class='del'>-} CamelRemoteStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_remote_store_get_type (void);</div><div class='del'>-</div><div class='del'>-/* FIXME: All of these i/o functions need an api overhaul, they're not like</div><div class='del'>-   any other functions, anywhere in the world ... */</div><div class='del'>-</div><div class='del'>-/* Extra public functions */</div><div class='del'>-GList *camel_remote_store_authtype_list (void);</div><div class='del'>-</div><div class='del'>-gint camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,</div><div class='del'>-				     char *fmt, ...);</div><div class='del'>-gint camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, </div><div class='del'>-				     CamelException *ex);</div><div class='del'>-gint camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-void camel_remote_store_refresh_folders (CamelRemoteStore *store, </div><div class='del'>-					 CamelException *ex);</div><div class='del'>-gboolean camel_remote_store_connected (CamelRemoteStore *store, CamelException *ex);</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_REMOTE_STORE_H */</div><div class='head'>diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c<br/>deleted file mode 100644<br/>index 903212492d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-anonymous.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-anonymous.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,150 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl-anonymous.h"</div><div class='del'>-#include "camel-internet-address.h"</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_anonymous_authtype = {</div><div class='del'>-	N_("Anonymous"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will connect to the server using an anonymous login."),</div><div class='del'>-	</div><div class='del'>-	"ANONYMOUS",</div><div class='del'>-	FALSE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslAnonymous */</div><div class='del'>-#define CSA_CLASS(so) CAMEL_SASL_ANONYMOUS_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_anonymous_class_init (CamelSaslAnonymousClass *camel_sasl_anonymous_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_anonymous_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = anon_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_anonymous_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSaslAnonymous *sasl = CAMEL_SASL_ANONYMOUS (object);</div><div class='del'>-	</div><div class='del'>-	g_free (sasl-&gt;trace_info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_anonymous_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslAnonymous",</div><div class='del'>-					    sizeof (CamelSaslAnonymous),</div><div class='del'>-					    sizeof (CamelSaslAnonymousClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_anonymous_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_sasl_anonymous_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelSasl *</div><div class='del'>-camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info)</div><div class='del'>-{</div><div class='del'>-	CamelSaslAnonymous *sasl_anon;</div><div class='del'>-	</div><div class='del'>-	if (!trace_info &amp;&amp; type != CAMEL_SASL_ANON_TRACE_EMPTY) return NULL;</div><div class='del'>-	</div><div class='del'>-	sasl_anon = CAMEL_SASL_ANONYMOUS (camel_object_new (camel_sasl_anonymous_get_type ()));</div><div class='del'>-	sasl_anon-&gt;trace_info = g_strdup (trace_info);</div><div class='del'>-	sasl_anon-&gt;type = type;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_SASL (sasl_anon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-anon_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSaslAnonymous *sasl_anon = CAMEL_SASL_ANONYMOUS (sasl);</div><div class='del'>-	CamelInternetAddress *cia;</div><div class='del'>-	GByteArray *ret = NULL;</div><div class='del'>-</div><div class='del'>-	if (token) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Authentication failed."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (sasl_anon-&gt;type) {</div><div class='del'>-	case CAMEL_SASL_ANON_TRACE_EMAIL:</div><div class='del'>-		cia = camel_internet_address_new ();</div><div class='del'>-		if (camel_internet_address_add (cia, NULL, sasl_anon-&gt;trace_info) != 1) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Invalid email address trace information:\n%s"),</div><div class='del'>-					      sasl_anon-&gt;trace_info);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (ret, sasl_anon-&gt;trace_info, strlen (sasl_anon-&gt;trace_info));</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_SASL_ANON_TRACE_OPAQUE:</div><div class='del'>-		if (strchr (sasl_anon-&gt;trace_info, '@')) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Invalid opaque trace information:\n%s"),</div><div class='del'>-					      sasl_anon-&gt;trace_info);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (ret, sasl_anon-&gt;trace_info, strlen (sasl_anon-&gt;trace_info));</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_SASL_ANON_TRACE_EMPTY:</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Invalid trace information:\n%s"),</div><div class='del'>-				      sasl_anon-&gt;trace_info);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sasl-&gt;authenticated = TRUE;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h<br/>deleted file mode 100644<br/>index 5c8bed4a4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-anonymous.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-anonymous.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_ANONYMOUS_H</div><div class='del'>-#define CAMEL_SASL_ANONYMOUS_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_ANONYMOUS_TYPE     (camel_sasl_anonymous_get_type ())</div><div class='del'>-#define CAMEL_SASL_ANONYMOUS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymous))</div><div class='del'>-#define CAMEL_SASL_ANONYMOUS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymousClass))</div><div class='del'>-#define CAMEL_IS_SASL_ANONYMOUS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_ANONYMOUS_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SASL_ANON_TRACE_EMAIL,</div><div class='del'>-	CAMEL_SASL_ANON_TRACE_OPAQUE,</div><div class='del'>-	CAMEL_SASL_ANON_TRACE_EMPTY</div><div class='del'>-} CamelSaslAnonTraceType;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslAnonymous {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-	</div><div class='del'>-	char *trace_info;</div><div class='del'>-	CamelSaslAnonTraceType type;</div><div class='del'>-} CamelSaslAnonymous;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslAnonymousClass {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslAnonymousClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_anonymous_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelSasl *camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_anonymous_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_ANONYMOUS_H */</div><div class='head'>diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c<br/>deleted file mode 100644<br/>index f544d48a22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-cram-md5.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-cram-md5.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,142 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl-cram-md5.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-#include &lt;e-util/md5-utils.h&gt;</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_cram_md5_authtype = {</div><div class='del'>-	N_("CRAM-MD5"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the server using a "</div><div class='del'>-	   "secure CRAM-MD5 password, if the server supports it."),</div><div class='del'>-</div><div class='del'>-	"CRAM-MD5",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslCramMd5 */</div><div class='del'>-#define CSCM_CLASS(so) CAMEL_SASL_CRAM_MD5_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_cram_md5_class_init (CamelSaslCramMd5Class *camel_sasl_cram_md5_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_cram_md5_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = cram_md5_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_cram_md5_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslCramMd5",</div><div class='del'>-					    sizeof (CamelSaslCramMd5),</div><div class='del'>-					    sizeof (CamelSaslCramMd5Class),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_cram_md5_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* CRAM-MD5 algorithm:</div><div class='del'>- * MD5 ((passwd XOR opad), MD5 ((passwd XOR ipad), timestamp))</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-cram_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *passwd;</div><div class='del'>-	guchar digest[16], md5asc[33], *s, *p;</div><div class='del'>-	GByteArray *ret = NULL;</div><div class='del'>-	guchar ipad[64];</div><div class='del'>-	guchar opad[64];</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	int i, pw_len;</div><div class='del'>-	</div><div class='del'>-	/* Need to wait for the server */</div><div class='del'>-	if (!token)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (sasl-&gt;service-&gt;url-&gt;passwd != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	memset (ipad, 0, sizeof (ipad));</div><div class='del'>-	memset (opad, 0, sizeof (opad));</div><div class='del'>-	</div><div class='del'>-	passwd = sasl-&gt;service-&gt;url-&gt;passwd;</div><div class='del'>-	pw_len = strlen (passwd);</div><div class='del'>-	if (pw_len &lt;= 64) {</div><div class='del'>-		memcpy (ipad, passwd, pw_len);</div><div class='del'>-		memcpy (opad, passwd, pw_len);</div><div class='del'>-	} else {</div><div class='del'>-		md5_get_digest (passwd, pw_len, ipad);</div><div class='del'>-		memcpy (opad, ipad, 16);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; 64; i++) {</div><div class='del'>-		ipad[i] ^= 0x36;</div><div class='del'>-		opad[i] ^= 0x5c;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, ipad, 64);</div><div class='del'>-	md5_update (&amp;ctx, token-&gt;data, token-&gt;len);</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, opad, 64);</div><div class='del'>-	md5_update (&amp;ctx, digest, 16);</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	/* lowercase hexify that bad-boy... */</div><div class='del'>-	for (s = digest, p = md5asc; p &lt; md5asc + 32; s++, p += 2)</div><div class='del'>-		sprintf (p, "%.2x", *s);</div><div class='del'>-	</div><div class='del'>-	ret = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (ret, sasl-&gt;service-&gt;url-&gt;user, strlen (sasl-&gt;service-&gt;url-&gt;user));</div><div class='del'>-	g_byte_array_append (ret, " ", 1);</div><div class='del'>-	g_byte_array_append (ret, md5asc, 32);</div><div class='del'>-	</div><div class='del'>-	sasl-&gt;authenticated = TRUE;</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h<br/>deleted file mode 100644<br/>index 2404b453f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-cram-md5.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-cram-md5.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_CRAM_MD5_H</div><div class='del'>-#define CAMEL_SASL_CRAM_MD5_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_CRAM_MD5_TYPE     (camel_sasl_cram_md5_get_type ())</div><div class='del'>-#define CAMEL_SASL_CRAM_MD5(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5))</div><div class='del'>-#define CAMEL_SASL_CRAM_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5Class))</div><div class='del'>-#define CAMEL_IS_SASL_CRAM_MD5(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_CRAM_MD5_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslCramMd5 {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSaslCramMd5;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslCramMd5Class {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslCramMd5Class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_cram_md5_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_cram_md5_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_CRAM_MD5_H */</div><div class='head'>diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c<br/>deleted file mode 100644<br/>index a88612de7b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-digest-md5.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-digest-md5.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,895 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-#include "camel-sasl-digest-md5.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-#include &lt;e-util/md5-utils.h&gt;</div><div class='del'>-#include &lt;gal/util/e-iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define PARANOID(x) x</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_digest_md5_authtype = {</div><div class='del'>-	N_("DIGEST-MD5"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the server using a "</div><div class='del'>-	   "secure DIGEST-MD5 password, if the server supports it."),</div><div class='del'>-</div><div class='del'>-	"DIGEST-MD5",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslDigestMd5 */</div><div class='del'>-#define CSCM_CLASS(so) CAMEL_SASL_DIGEST_MD5_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *digest_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	STATE_AUTH,</div><div class='del'>-	STATE_FINAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	guint type;</div><div class='del'>-} DataType;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DIGEST_REALM,</div><div class='del'>-	DIGEST_NONCE,</div><div class='del'>-	DIGEST_QOP,</div><div class='del'>-	DIGEST_STALE,</div><div class='del'>-	DIGEST_MAXBUF,</div><div class='del'>-	DIGEST_CHARSET,</div><div class='del'>-	DIGEST_ALGORITHM,</div><div class='del'>-	DIGEST_CIPHER,</div><div class='del'>-	DIGEST_UNKNOWN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static DataType digest_args[] = {</div><div class='del'>-	{ "realm",     DIGEST_REALM     },</div><div class='del'>-	{ "nonce",     DIGEST_NONCE     },</div><div class='del'>-	{ "qop",       DIGEST_QOP       },</div><div class='del'>-	{ "stale",     DIGEST_STALE     },</div><div class='del'>-	{ "maxbuf",    DIGEST_MAXBUF    },</div><div class='del'>-	{ "charset",   DIGEST_CHARSET   },</div><div class='del'>-	{ "algorithm", DIGEST_ALGORITHM },</div><div class='del'>-	{ "cipher",    DIGEST_CIPHER    },</div><div class='del'>-	{ NULL,        DIGEST_UNKNOWN   }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define QOP_AUTH           (1&lt;&lt;0)</div><div class='del'>-#define QOP_AUTH_INT       (1&lt;&lt;1)</div><div class='del'>-#define QOP_AUTH_CONF      (1&lt;&lt;2)</div><div class='del'>-#define QOP_INVALID        (1&lt;&lt;3)</div><div class='del'>-</div><div class='del'>-static DataType qop_types[] = {</div><div class='del'>-	{ "auth",      QOP_AUTH      },</div><div class='del'>-	{ "auth-int",  QOP_AUTH_INT  },</div><div class='del'>-	{ "auth-conf", QOP_AUTH_CONF },</div><div class='del'>-	{ NULL,        QOP_INVALID   }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CIPHER_DES         (1&lt;&lt;0)</div><div class='del'>-#define CIPHER_3DES        (1&lt;&lt;1)</div><div class='del'>-#define CIPHER_RC4         (1&lt;&lt;2)</div><div class='del'>-#define CIPHER_RC4_40      (1&lt;&lt;3)</div><div class='del'>-#define CIPHER_RC4_56      (1&lt;&lt;4)</div><div class='del'>-#define CIPHER_INVALID     (1&lt;&lt;5)</div><div class='del'>-</div><div class='del'>-static DataType cipher_types[] = {</div><div class='del'>-	{ "des",    CIPHER_DES     },</div><div class='del'>-	{ "3des",   CIPHER_3DES    },</div><div class='del'>-	{ "rc4",    CIPHER_RC4     },</div><div class='del'>-	{ "rc4-40", CIPHER_RC4_40  },</div><div class='del'>-	{ "rc4-56", CIPHER_RC4_56  },</div><div class='del'>-	{ NULL,     CIPHER_INVALID }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _param {</div><div class='del'>-	char *name;</div><div class='del'>-	char *value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _DigestChallenge {</div><div class='del'>-	GPtrArray *realms;</div><div class='del'>-	char *nonce;</div><div class='del'>-	guint qop;</div><div class='del'>-	gboolean stale;</div><div class='del'>-	gint32 maxbuf;</div><div class='del'>-	char *charset;</div><div class='del'>-	char *algorithm;</div><div class='del'>-	guint cipher;</div><div class='del'>-	GList *params;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _DigestURI {</div><div class='del'>-	char *type;</div><div class='del'>-	char *host;</div><div class='del'>-	char *name;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _DigestResponse {</div><div class='del'>-	char *username;</div><div class='del'>-	char *realm;</div><div class='del'>-	char *nonce;</div><div class='del'>-	char *cnonce;</div><div class='del'>-	char nc[9];</div><div class='del'>-	guint qop;</div><div class='del'>-	struct _DigestURI *uri;</div><div class='del'>-	char resp[33];</div><div class='del'>-	guint32 maxbuf;</div><div class='del'>-	char *charset;</div><div class='del'>-	guint cipher;</div><div class='del'>-	char *authzid;</div><div class='del'>-	char *param;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelSaslDigestMd5Private {</div><div class='del'>-	struct _DigestChallenge *challenge;</div><div class='del'>-	struct _DigestResponse *response;</div><div class='del'>-	int state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_digest_md5_class_init (CamelSaslDigestMd5Class *camel_sasl_digest_md5_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_digest_md5_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = digest_md5_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_digest_md5_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelSaslDigestMd5 *sasl_digest = CAMEL_SASL_DIGEST_MD5 (object);</div><div class='del'>-	</div><div class='del'>-	sasl_digest-&gt;priv = g_new0 (struct _CamelSaslDigestMd5Private, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_digest_md5_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSaslDigestMd5 *sasl = CAMEL_SASL_DIGEST_MD5 (object);</div><div class='del'>-	struct _DigestChallenge *c = sasl-&gt;priv-&gt;challenge;</div><div class='del'>-	struct _DigestResponse *r = sasl-&gt;priv-&gt;response;</div><div class='del'>-	GList *p;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; c-&gt;realms-&gt;len; i++)</div><div class='del'>-		g_free (c-&gt;realms-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (c-&gt;realms, TRUE);</div><div class='del'>-	g_free (c-&gt;nonce);</div><div class='del'>-	g_free (c-&gt;charset);</div><div class='del'>-	g_free (c-&gt;algorithm);</div><div class='del'>-	for (p = c-&gt;params; p; p = p-&gt;next) {</div><div class='del'>-		struct _param *param = p-&gt;data;</div><div class='del'>-		</div><div class='del'>-		g_free (param-&gt;name);</div><div class='del'>-		g_free (param-&gt;value);</div><div class='del'>-		g_free (param);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (c-&gt;params);</div><div class='del'>-	g_free (c);</div><div class='del'>-	</div><div class='del'>-	g_free (r-&gt;username);</div><div class='del'>-	g_free (r-&gt;realm);</div><div class='del'>-	g_free (r-&gt;nonce);</div><div class='del'>-	g_free (r-&gt;cnonce);</div><div class='del'>-	if (r-&gt;uri) {</div><div class='del'>-		g_free (r-&gt;uri-&gt;type);</div><div class='del'>-		g_free (r-&gt;uri-&gt;host);</div><div class='del'>-		g_free (r-&gt;uri-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	g_free (r-&gt;charset);</div><div class='del'>-	g_free (r-&gt;authzid);</div><div class='del'>-	g_free (r-&gt;param);</div><div class='del'>-	g_free (r);</div><div class='del'>-	</div><div class='del'>-	g_free (sasl-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_digest_md5_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslDigestMd5",</div><div class='del'>-					    sizeof (CamelSaslDigestMd5),</div><div class='del'>-					    sizeof (CamelSaslDigestMd5Class),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_digest_md5_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_sasl_digest_md5_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_sasl_digest_md5_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-decode_lwsp (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	</div><div class='del'>-	while (isspace (*inptr))</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	*in = inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-decode_quoted_string (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char *out = NULL, *outptr;</div><div class='del'>-	int outlen;</div><div class='del'>-	int c;</div><div class='del'>-	</div><div class='del'>-	decode_lwsp (&amp;inptr);</div><div class='del'>-	if (*inptr == '"') {</div><div class='del'>-		const char *intmp;</div><div class='del'>-		int skip = 0;</div><div class='del'>-		</div><div class='del'>-		/* first, calc length */</div><div class='del'>-		inptr++;</div><div class='del'>-		intmp = inptr;</div><div class='del'>-		while ((c = *intmp++) &amp;&amp; c != '"') {</div><div class='del'>-			if (c == '\\' &amp;&amp; *intmp) {</div><div class='del'>-				intmp++;</div><div class='del'>-				skip++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		outlen = intmp - inptr - skip;</div><div class='del'>-		out = outptr = g_malloc (outlen + 1);</div><div class='del'>-		</div><div class='del'>-		while ((c = *inptr++) &amp;&amp; c != '"') {</div><div class='del'>-			if (c == '\\' &amp;&amp; *inptr) {</div><div class='del'>-				c = *inptr++;</div><div class='del'>-			}</div><div class='del'>-			*outptr++ = c;</div><div class='del'>-		}</div><div class='del'>-		*outptr = '\0';</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*in = inptr;</div><div class='del'>-	</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-decode_token (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	const char *start;</div><div class='del'>-	</div><div class='del'>-	decode_lwsp (&amp;inptr);</div><div class='del'>-	start = inptr;</div><div class='del'>-	</div><div class='del'>-	while (*inptr &amp;&amp; *inptr != '=' &amp;&amp; *inptr != ',')</div><div class='del'>-		inptr++;</div><div class='del'>-	</div><div class='del'>-	if (inptr &gt; start) {</div><div class='del'>-		*in = inptr;</div><div class='del'>-		return g_strndup (start, inptr - start);</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-decode_value (const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	</div><div class='del'>-	decode_lwsp (&amp;inptr);</div><div class='del'>-	if (*inptr == '"') {</div><div class='del'>-		d(printf ("decoding quoted string token\n"));</div><div class='del'>-		return decode_quoted_string (in);</div><div class='del'>-	} else {</div><div class='del'>-		d(printf ("decoding string token\n"));</div><div class='del'>-		return decode_token (in);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-parse_param_list (const char *tokens)</div><div class='del'>-{</div><div class='del'>-	GList *params = NULL;</div><div class='del'>-	struct _param *param;</div><div class='del'>-	const char *ptr;</div><div class='del'>-	</div><div class='del'>-	for (ptr = tokens; ptr &amp;&amp; *ptr; ) {</div><div class='del'>-		param = g_new0 (struct _param, 1);</div><div class='del'>-		param-&gt;name = decode_token (&amp;ptr);</div><div class='del'>-		if (*ptr == '=') {</div><div class='del'>-			ptr++;</div><div class='del'>-			param-&gt;value = decode_value (&amp;ptr);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		params = g_list_prepend (params, param);</div><div class='del'>-		</div><div class='del'>-		if (*ptr == ',')</div><div class='del'>-			ptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return params;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-decode_data_type (DataType *dtype, const char *name)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; dtype[i].name; i++) {</div><div class='del'>-		if (!g_strcasecmp (dtype[i].name, name))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return dtype[i].type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define get_digest_arg(name) decode_data_type (digest_args, name)</div><div class='del'>-#define decode_qop(name)     decode_data_type (qop_types, name)</div><div class='del'>-#define decode_cipher(name)  decode_data_type (cipher_types, name)</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-type_to_string (DataType *dtype, guint type)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; dtype[i].name; i++) {</div><div class='del'>-		if (dtype[i].type == type)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return dtype[i].name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define qop_to_string(type)    type_to_string (qop_types, type)</div><div class='del'>-#define cipher_to_string(type) type_to_string (cipher_types, type)</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_abort (gboolean *have_type, gboolean *abort)</div><div class='del'>-{</div><div class='del'>-	if (*have_type)</div><div class='del'>-		*abort = TRUE;</div><div class='del'>-	*have_type = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _DigestChallenge *</div><div class='del'>-parse_server_challenge (const char *tokens, gboolean *abort)</div><div class='del'>-{</div><div class='del'>-	struct _DigestChallenge *challenge = NULL;</div><div class='del'>-	GList *params, *p;</div><div class='del'>-	const char *ptr;</div><div class='del'>-#ifdef PARANOID</div><div class='del'>-	gboolean got_algorithm = FALSE;</div><div class='del'>-	gboolean got_stale = FALSE;</div><div class='del'>-	gboolean got_maxbuf = FALSE;</div><div class='del'>-	gboolean got_charset = FALSE;</div><div class='del'>-#endif /* PARANOID */</div><div class='del'>-	</div><div class='del'>-	params = parse_param_list (tokens);</div><div class='del'>-	if (!params) {</div><div class='del'>-		*abort = TRUE;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*abort = FALSE;</div><div class='del'>-	</div><div class='del'>-	challenge = g_new0 (struct _DigestChallenge, 1);</div><div class='del'>-	challenge-&gt;realms = g_ptr_array_new ();</div><div class='del'>-	challenge-&gt;maxbuf = 65536;</div><div class='del'>-	</div><div class='del'>-	for (p = params; p; p = p-&gt;next) {</div><div class='del'>-		struct _param *param = p-&gt;data;</div><div class='del'>-		int type;</div><div class='del'>-		</div><div class='del'>-		type = get_digest_arg (param-&gt;name);</div><div class='del'>-		switch (type) {</div><div class='del'>-		case DIGEST_REALM:</div><div class='del'>-			for (ptr = param-&gt;value; ptr &amp;&amp; *ptr; ) {</div><div class='del'>-				char *token;</div><div class='del'>-				</div><div class='del'>-				token = decode_token (&amp;ptr);</div><div class='del'>-				if (token)</div><div class='del'>-					g_ptr_array_add (challenge-&gt;realms, token);</div><div class='del'>-				</div><div class='del'>-				if (*ptr == ',')</div><div class='del'>-					ptr++;</div><div class='del'>-			}</div><div class='del'>-			g_free (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_NONCE:</div><div class='del'>-			g_free (challenge-&gt;nonce);</div><div class='del'>-			challenge-&gt;nonce = param-&gt;value;</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_QOP:</div><div class='del'>-			for (ptr = param-&gt;value; ptr &amp;&amp; *ptr; ) {</div><div class='del'>-				char *token;</div><div class='del'>-				</div><div class='del'>-				token = decode_token (&amp;ptr);</div><div class='del'>-				if (token)</div><div class='del'>-					challenge-&gt;qop |= decode_qop (token);</div><div class='del'>-				</div><div class='del'>-				if (*ptr == ',')</div><div class='del'>-					ptr++;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (challenge-&gt;qop &amp; QOP_INVALID)</div><div class='del'>-				challenge-&gt;qop = QOP_INVALID;</div><div class='del'>-			g_free (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_STALE:</div><div class='del'>-			PARANOID (digest_abort (&amp;got_stale, abort));</div><div class='del'>-			if (!g_strcasecmp (param-&gt;value, "true"))</div><div class='del'>-				challenge-&gt;stale = TRUE;</div><div class='del'>-			else</div><div class='del'>-				challenge-&gt;stale = FALSE;</div><div class='del'>-			g_free (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_MAXBUF:</div><div class='del'>-			PARANOID (digest_abort (&amp;got_maxbuf, abort));</div><div class='del'>-			challenge-&gt;maxbuf = atoi (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_CHARSET:</div><div class='del'>-			PARANOID (digest_abort (&amp;got_charset, abort));</div><div class='del'>-			g_free (challenge-&gt;charset);</div><div class='del'>-			if (param-&gt;value &amp;&amp; *param-&gt;value)</div><div class='del'>-				challenge-&gt;charset = param-&gt;value;</div><div class='del'>-			else</div><div class='del'>-				challenge-&gt;charset = NULL;</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_ALGORITHM:</div><div class='del'>-			PARANOID (digest_abort (&amp;got_algorithm, abort));</div><div class='del'>-			g_free (challenge-&gt;algorithm);</div><div class='del'>-			challenge-&gt;algorithm = param-&gt;value;</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		case DIGEST_CIPHER:</div><div class='del'>-			for (ptr = param-&gt;value; ptr &amp;&amp; *ptr; ) {</div><div class='del'>-				char *token;</div><div class='del'>-				</div><div class='del'>-				token = decode_token (&amp;ptr);</div><div class='del'>-				if (token)</div><div class='del'>-					challenge-&gt;cipher |= decode_cipher (token);</div><div class='del'>-				</div><div class='del'>-				if (*ptr == ',')</div><div class='del'>-					ptr++;</div><div class='del'>-			}</div><div class='del'>-			if (challenge-&gt;cipher &amp; CIPHER_INVALID)</div><div class='del'>-				challenge-&gt;cipher = CIPHER_INVALID;</div><div class='del'>-			g_free (param-&gt;value);</div><div class='del'>-			g_free (param-&gt;name);</div><div class='del'>-			g_free (param);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			challenge-&gt;params = g_list_prepend (challenge-&gt;params, param);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_list_free (params);</div><div class='del'>-	</div><div class='del'>-	return challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-digest_hex (guchar *digest, guchar hex[33])</div><div class='del'>-{</div><div class='del'>-	guchar *s, *p;</div><div class='del'>-	</div><div class='del'>-	/* lowercase hexify that bad-boy... */</div><div class='del'>-	for (s = digest, p = hex; p &lt; hex + 32; s++, p += 2)</div><div class='del'>-		sprintf (p, "%.2x", *s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-digest_uri_to_string (struct _DigestURI *uri)</div><div class='del'>-{</div><div class='del'>-	if (uri-&gt;name)</div><div class='del'>-		return g_strdup_printf ("%s/%s/%s", uri-&gt;type, uri-&gt;host, uri-&gt;name);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf ("%s/%s", uri-&gt;type, uri-&gt;host);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_response (struct _DigestResponse *resp, const char *passwd, gboolean client, guchar out[33])</div><div class='del'>-{</div><div class='del'>-	guchar hex_a1[33], hex_a2[33];</div><div class='del'>-	guchar digest[16];</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	char *buf;</div><div class='del'>-	</div><div class='del'>-	/* compute A1 */</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;username, strlen (resp-&gt;username));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;realm, strlen (resp-&gt;realm));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, passwd, strlen (passwd));</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, digest, 16);</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;nonce, strlen (resp-&gt;nonce));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;cnonce, strlen (resp-&gt;cnonce));</div><div class='del'>-	if (resp-&gt;authzid) {</div><div class='del'>-		md5_update (&amp;ctx, ":", 1);</div><div class='del'>-		md5_update (&amp;ctx, resp-&gt;authzid, strlen (resp-&gt;authzid));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* hexify A1 */</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	digest_hex (digest, hex_a1);</div><div class='del'>-	</div><div class='del'>-	/* compute A2 */</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	if (client) {</div><div class='del'>-		/* we are calculating the client response */</div><div class='del'>-		md5_update (&amp;ctx, "AUTHENTICATE:", strlen ("AUTHENTICATE:"));</div><div class='del'>-	} else {</div><div class='del'>-		/* we are calculating the server rspauth */</div><div class='del'>-		md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	buf = digest_uri_to_string (resp-&gt;uri);</div><div class='del'>-	md5_update (&amp;ctx, buf, strlen (buf));</div><div class='del'>-	g_free (buf);</div><div class='del'>-	</div><div class='del'>-	if (resp-&gt;qop == QOP_AUTH_INT || resp-&gt;qop == QOP_AUTH_CONF)</div><div class='del'>-		md5_update (&amp;ctx, ":00000000000000000000000000000000", 33);</div><div class='del'>-	</div><div class='del'>-	/* now hexify A2 */</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	digest_hex (digest, hex_a2);</div><div class='del'>-	</div><div class='del'>-	/* compute KD */</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, hex_a1, 32);</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;nonce, strlen (resp-&gt;nonce));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;nc, 8);</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, resp-&gt;cnonce, strlen (resp-&gt;cnonce));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, qop_to_string (resp-&gt;qop), strlen (qop_to_string (resp-&gt;qop)));</div><div class='del'>-	md5_update (&amp;ctx, ":", 1);</div><div class='del'>-	md5_update (&amp;ctx, hex_a2, 32);</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	digest_hex (digest, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _DigestResponse *</div><div class='del'>-generate_response (struct _DigestChallenge *challenge, struct hostent *host,</div><div class='del'>-		   const char *protocol, const char *user, const char *passwd)</div><div class='del'>-{</div><div class='del'>-	struct _DigestResponse *resp;</div><div class='del'>-	struct _DigestURI *uri;</div><div class='del'>-	char *bgen, digest[16];</div><div class='del'>-	</div><div class='del'>-	resp = g_new0 (struct _DigestResponse, 1);</div><div class='del'>-	resp-&gt;username = g_strdup (user);</div><div class='del'>-	/* FIXME: we should use the preferred realm */</div><div class='del'>-	if (challenge-&gt;realms &amp;&amp; challenge-&gt;realms-&gt;len &gt; 0)</div><div class='del'>-		resp-&gt;realm = g_strdup (challenge-&gt;realms-&gt;pdata[0]);</div><div class='del'>-	else</div><div class='del'>-		resp-&gt;realm = g_strdup ("");</div><div class='del'>-	</div><div class='del'>-	resp-&gt;nonce = g_strdup (challenge-&gt;nonce);</div><div class='del'>-	</div><div class='del'>-	/* generate the cnonce */</div><div class='del'>-	bgen = g_strdup_printf ("%p:%lu:%lu", resp,</div><div class='del'>-				(unsigned long) getpid (),</div><div class='del'>-				(unsigned long) time (0));</div><div class='del'>-	md5_get_digest (bgen, strlen (bgen), digest);</div><div class='del'>-	g_free (bgen);</div><div class='del'>-	/* take our recommended 64 bits of entropy */</div><div class='del'>-	resp-&gt;cnonce = base64_encode_simple (digest, 8);</div><div class='del'>-	</div><div class='del'>-	/* we don't support re-auth so the nonce count is always 1 */</div><div class='del'>-	strcpy (resp-&gt;nc, "00000001");</div><div class='del'>-	</div><div class='del'>-	/* choose the QOP */</div><div class='del'>-	/* FIXME: choose - probably choose "auth" ??? */</div><div class='del'>-	resp-&gt;qop = QOP_AUTH;</div><div class='del'>-	</div><div class='del'>-	/* create the URI */</div><div class='del'>-	uri = g_new0 (struct _DigestURI, 1);</div><div class='del'>-	uri-&gt;type = g_strdup (protocol);</div><div class='del'>-	uri-&gt;host = g_strdup (host-&gt;h_name);</div><div class='del'>-	uri-&gt;name = NULL;</div><div class='del'>-	resp-&gt;uri = uri;</div><div class='del'>-	</div><div class='del'>-	/* charsets... yay */</div><div class='del'>-	if (challenge-&gt;charset) {</div><div class='del'>-		/* I believe that this is only ever allowed to be</div><div class='del'>-		 * UTF-8. We strdup the charset specified by the</div><div class='del'>-		 * challenge anyway, just in case it's not UTF-8.</div><div class='del'>-		 */</div><div class='del'>-		resp-&gt;charset = g_strdup (challenge-&gt;charset);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	resp-&gt;cipher = CIPHER_INVALID;</div><div class='del'>-	if (resp-&gt;qop == QOP_AUTH_CONF) {</div><div class='del'>-		/* FIXME: choose a cipher? */</div><div class='del'>-		resp-&gt;cipher = CIPHER_INVALID;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* we don't really care about this... */</div><div class='del'>-	resp-&gt;authzid = NULL;</div><div class='del'>-	</div><div class='del'>-	compute_response (resp, passwd, TRUE, resp-&gt;resp);</div><div class='del'>-	</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-digest_response (struct _DigestResponse *resp)</div><div class='del'>-{</div><div class='del'>-	GByteArray *buffer;</div><div class='del'>-	const char *str;</div><div class='del'>-	char *buf;</div><div class='del'>-	</div><div class='del'>-	buffer = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (buffer, "username=\"", 10);</div><div class='del'>-	if (resp-&gt;charset) {</div><div class='del'>-		/* Encode the username using the requested charset */</div><div class='del'>-		char *username, *outbuf;</div><div class='del'>-		const char *charset;</div><div class='del'>-		size_t len, outlen;</div><div class='del'>-		const char *buf;</div><div class='del'>-		iconv_t cd;</div><div class='del'>-		</div><div class='del'>-		charset = e_iconv_locale_charset();</div><div class='del'>-		if (!charset)</div><div class='del'>-			charset = "iso-8859-1";</div><div class='del'>-		</div><div class='del'>-		cd = e_iconv_open (resp-&gt;charset, charset);</div><div class='del'>-		</div><div class='del'>-		len = strlen (resp-&gt;username);</div><div class='del'>-		outlen = 2 * len; /* plenty of space */</div><div class='del'>-		</div><div class='del'>-		outbuf = username = g_malloc0 (outlen + 1);</div><div class='del'>-		buf = resp-&gt;username;</div><div class='del'>-		if (cd == (iconv_t) -1 || e_iconv (cd, &amp;buf, &amp;len, &amp;outbuf, &amp;outlen) == (size_t) -1) {</div><div class='del'>-			/* We can't convert to UTF-8 - pretend we never got a charset param? */</div><div class='del'>-			g_free (resp-&gt;charset);</div><div class='del'>-			resp-&gt;charset = NULL;</div><div class='del'>-			</div><div class='del'>-			/* Set the username to the non-UTF-8 version */</div><div class='del'>-			g_free (username);</div><div class='del'>-			username = g_strdup (resp-&gt;username);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (cd != (iconv_t) -1)</div><div class='del'>-			e_iconv_close (cd);</div><div class='del'>-		</div><div class='del'>-		g_byte_array_append (buffer, username, strlen (username));</div><div class='del'>-		g_free (username);</div><div class='del'>-	} else {</div><div class='del'>-		g_byte_array_append (buffer, resp-&gt;username, strlen (resp-&gt;username));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",realm=\"", 9);</div><div class='del'>-	g_byte_array_append (buffer, resp-&gt;realm, strlen (resp-&gt;realm));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",nonce=\"", 9);</div><div class='del'>-	g_byte_array_append (buffer, resp-&gt;nonce, strlen (resp-&gt;nonce));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",cnonce=\"", 10);</div><div class='del'>-	g_byte_array_append (buffer, resp-&gt;cnonce, strlen (resp-&gt;cnonce));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",nc=", 5);</div><div class='del'>-	g_byte_array_append (buffer, resp-&gt;nc, 8);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, ",qop=\"", 6);</div><div class='del'>-	str = qop_to_string (resp-&gt;qop);</div><div class='del'>-	g_byte_array_append (buffer, str, strlen (str));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",digest-uri=\"", 14);</div><div class='del'>-	buf = digest_uri_to_string (resp-&gt;uri);</div><div class='del'>-	g_byte_array_append (buffer, buf, strlen (buf));</div><div class='del'>-	g_free (buf);</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "\",response=\"", 12);</div><div class='del'>-	g_byte_array_append (buffer, resp-&gt;resp, 32);</div><div class='del'>-	g_byte_array_append (buffer, "\"", 1);</div><div class='del'>-	</div><div class='del'>-	if (resp-&gt;maxbuf &gt; 0) {</div><div class='del'>-		g_byte_array_append (buffer, ",maxbuf=", 8);</div><div class='del'>-		buf = g_strdup_printf ("%d", resp-&gt;maxbuf);</div><div class='del'>-		g_byte_array_append (buffer, buf, strlen (buf));</div><div class='del'>-		g_free (buf);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (resp-&gt;charset) {</div><div class='del'>-		g_byte_array_append (buffer, ",charset=\"", 10);</div><div class='del'>-		g_byte_array_append (buffer, resp-&gt;charset, strlen (resp-&gt;charset));</div><div class='del'>-		g_byte_array_append (buffer, "\"", 1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (resp-&gt;cipher != CIPHER_INVALID) {</div><div class='del'>-		str = cipher_to_string (resp-&gt;cipher);</div><div class='del'>-		if (str) {</div><div class='del'>-			g_byte_array_append (buffer, ",cipher=\"", 9);</div><div class='del'>-			g_byte_array_append (buffer, str, strlen (str));</div><div class='del'>-			g_byte_array_append (buffer, "\"", 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (resp-&gt;authzid) {</div><div class='del'>-		g_byte_array_append (buffer, ",authzid=\"", 10);</div><div class='del'>-		g_byte_array_append (buffer, resp-&gt;authzid, strlen (resp-&gt;authzid));</div><div class='del'>-		g_byte_array_append (buffer, "\"", 1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-digest_md5_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSaslDigestMd5 *sasl_digest = CAMEL_SASL_DIGEST_MD5 (sasl);</div><div class='del'>-	struct _CamelSaslDigestMd5Private *priv = sasl_digest-&gt;priv;</div><div class='del'>-	struct _param *rspauth;</div><div class='del'>-	GByteArray *ret = NULL;</div><div class='del'>-	gboolean abort = FALSE;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	const char *ptr;</div><div class='del'>-	guchar out[33];</div><div class='del'>-	char *tokens;</div><div class='del'>-	</div><div class='del'>-	/* Need to wait for the server */</div><div class='del'>-	if (!token)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (sasl-&gt;service-&gt;url-&gt;passwd != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	switch (priv-&gt;state) {</div><div class='del'>-	case STATE_AUTH:</div><div class='del'>-		if (token-&gt;len &gt; 2048) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server challenge too long (&gt;2048 octets)\n"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		tokens = g_strndup (token-&gt;data, token-&gt;len);</div><div class='del'>-		priv-&gt;challenge = parse_server_challenge (tokens, &amp;abort);</div><div class='del'>-		g_free (tokens);</div><div class='del'>-		if (!priv-&gt;challenge || abort) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server challenge invalid\n"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (priv-&gt;challenge-&gt;qop == QOP_INVALID) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server challenge contained invalid "</div><div class='del'>-						"\"Quality of Protection\" token\n"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		h = camel_service_gethost (sasl-&gt;service, ex);</div><div class='del'>-		priv-&gt;response = generate_response (priv-&gt;challenge, h, sasl-&gt;service_name,</div><div class='del'>-						    sasl-&gt;service-&gt;url-&gt;user,</div><div class='del'>-						    sasl-&gt;service-&gt;url-&gt;passwd);</div><div class='del'>-		camel_free_host(h);</div><div class='del'>-		ret = digest_response (priv-&gt;response);</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	case STATE_FINAL:</div><div class='del'>-		if (token-&gt;len)</div><div class='del'>-			tokens = g_strndup (token-&gt;data, token-&gt;len);</div><div class='del'>-		else</div><div class='del'>-			tokens = NULL;</div><div class='del'>-		</div><div class='del'>-		if (!tokens || !*tokens) {</div><div class='del'>-			g_free (tokens);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server response did not contain authorization data\n"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		rspauth = g_new0 (struct _param, 1);</div><div class='del'>-		</div><div class='del'>-		ptr = tokens;</div><div class='del'>-		rspauth-&gt;name = decode_token (&amp;ptr);</div><div class='del'>-		if (*ptr == '=') {</div><div class='del'>-			ptr++;</div><div class='del'>-			rspauth-&gt;value = decode_value (&amp;ptr);</div><div class='del'>-		}</div><div class='del'>-		g_free (tokens);</div><div class='del'>-		</div><div class='del'>-		if (!rspauth-&gt;value) {</div><div class='del'>-			g_free (rspauth-&gt;name);</div><div class='del'>-			g_free (rspauth);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server response contained incomplete authorization data\n"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		compute_response (priv-&gt;response, sasl-&gt;service-&gt;url-&gt;passwd, FALSE, out);</div><div class='del'>-		if (memcmp (out, rspauth-&gt;value, 32) != 0) {</div><div class='del'>-			g_free (rspauth-&gt;name);</div><div class='del'>-			g_free (rspauth-&gt;value);</div><div class='del'>-			g_free (rspauth);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Server response does not match\n"));</div><div class='del'>-			sasl-&gt;authenticated = TRUE;</div><div class='del'>-			</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (rspauth-&gt;name);</div><div class='del'>-		g_free (rspauth-&gt;value);</div><div class='del'>-		g_free (rspauth);</div><div class='del'>-		</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		</div><div class='del'>-		sasl-&gt;authenticated = TRUE;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	priv-&gt;state++;</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h<br/>deleted file mode 100644<br/>index b71abaa1df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-digest-md5.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-digest-md5.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_DIGEST_MD5_H</div><div class='del'>-#define CAMEL_SASL_DIGEST_MD5_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;netdb.h&gt;</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_DIGEST_MD5_TYPE     (camel_sasl_digest_md5_get_type ())</div><div class='del'>-#define CAMEL_SASL_DIGEST_MD5(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5))</div><div class='del'>-#define CAMEL_SASL_DIGEST_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5Class))</div><div class='del'>-#define CAMEL_IS_SASL_DIGEST_MD5(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_DIGEST_MD5_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslDigestMd5 {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-	struct _CamelSaslDigestMd5Private *priv;</div><div class='del'>-	</div><div class='del'>-} CamelSaslDigestMd5;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslDigestMd5Class {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslDigestMd5Class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_digest_md5_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_digest_md5_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_DIGEST_MD5_H */</div><div class='head'>diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c<br/>deleted file mode 100644<br/>index 50b4581d3f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-kerberos4.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-kerberos4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-</div><div class='del'>-#include &lt;krb.h&gt;</div><div class='del'>-/* MIT krb4 des.h #defines _. Sigh. We don't need it. #undef it here</div><div class='del'>- * so we get the gettexty _ definition later.</div><div class='del'>- */</div><div class='del'>-#undef _</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl-kerberos4.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_kerberos4_authtype = {</div><div class='del'>-	N_("Kerberos 4"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the server using "</div><div class='del'>-	   "Kerberos 4 authentication."),</div><div class='del'>-</div><div class='del'>-	"KERBEROS_V4",</div><div class='del'>-	FALSE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define KERBEROS_V4_PROTECTION_NONE      1</div><div class='del'>-#define KERBEROS_V4_PROTECTION_INTEGRITY 2</div><div class='del'>-#define KERBEROS_V4_PROTECTION_PRIVACY   4</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslKerberos4 */</div><div class='del'>-#define CSK4_CLASS(so) CAMEL_SASL_KERBEROS4_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-struct _CamelSaslKerberos4Private {</div><div class='del'>-	int state;</div><div class='del'>-	</div><div class='del'>-	guint32 nonce_n;</div><div class='del'>-	guint32 nonce_h;</div><div class='del'>-	</div><div class='del'>-	des_cblock session;</div><div class='del'>-	des_key_schedule schedule;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_kerberos4_class_init (CamelSaslKerberos4Class *camel_sasl_kerberos4_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_kerberos4_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = krb4_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_kerberos4_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelSaslKerberos4 *sasl_krb4 = CAMEL_SASL_KERBEROS4 (object);</div><div class='del'>-	</div><div class='del'>-	sasl_krb4-&gt;priv = g_new0 (struct _CamelSaslKerberos4Private, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_kerberos4_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSaslKerberos4 *sasl = CAMEL_SASL_KERBEROS4 (object);</div><div class='del'>-</div><div class='del'>-	if (sasl-&gt;priv) {</div><div class='del'>-		memset (sasl-&gt;priv, 0, sizeof (sasl-&gt;priv));</div><div class='del'>-		g_free (sasl-&gt;priv);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_kerberos4_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslKerberos4",</div><div class='del'>-					    sizeof (CamelSaslKerberos4),</div><div class='del'>-					    sizeof (CamelSaslKerberos4Class),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_kerberos4_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_sasl_kerberos4_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_sasl_kerberos4_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-krb4_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelSaslKerberos4Private *priv = CAMEL_SASL_KERBEROS4 (sasl)-&gt;priv;</div><div class='del'>-	GByteArray *ret = NULL;</div><div class='del'>-	char *inst, *realm, *username;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	int status, len;</div><div class='del'>-	KTEXT_ST authenticator;</div><div class='del'>-	CREDENTIALS credentials;</div><div class='del'>-	guint32 plus1;</div><div class='del'>-</div><div class='del'>-	/* Need to wait for the server */</div><div class='del'>-	if (!token)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;state) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (token-&gt;len != 4)</div><div class='del'>-			goto lose;</div><div class='del'>-</div><div class='del'>-		memcpy (&amp;priv-&gt;nonce_n, token-&gt;data, 4);</div><div class='del'>-		priv-&gt;nonce_h = ntohl (priv-&gt;nonce_n);</div><div class='del'>-</div><div class='del'>-		/* Our response is an authenticator including that number. */</div><div class='del'>-		h = camel_service_gethost (sasl-&gt;service, ex);</div><div class='del'>-		inst = g_strndup (h-&gt;h_name, strcspn (h-&gt;h_name, "."));</div><div class='del'>-		g_strdown (inst);</div><div class='del'>-		realm = g_strdup (krb_realmofhost (h-&gt;h_name));</div><div class='del'>-		camel_free_host(h);</div><div class='del'>-		status = krb_mk_req (&amp;authenticator, sasl-&gt;service_name, inst, realm, priv-&gt;nonce_h);</div><div class='del'>-		if (status == KSUCCESS) {</div><div class='del'>-			status = krb_get_cred (sasl-&gt;service_name, inst, realm, &amp;credentials);</div><div class='del'>-			memcpy (priv-&gt;session, credentials.session, sizeof (priv-&gt;session));</div><div class='del'>-			memset (&amp;credentials, 0, sizeof (credentials));</div><div class='del'>-		}</div><div class='del'>-		g_free (inst);</div><div class='del'>-		g_free (realm);</div><div class='del'>-</div><div class='del'>-		if (status != KSUCCESS) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Could not get Kerberos ticket:\n%s"),</div><div class='del'>-					      krb_err_txt[status]);</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		des_key_sched (&amp;priv-&gt;session, priv-&gt;schedule);</div><div class='del'>-</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (ret, (const guint8 *)authenticator.dat, authenticator.length);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 1:</div><div class='del'>-		if (token-&gt;len != 8)</div><div class='del'>-			goto lose;</div><div class='del'>-</div><div class='del'>-		/* This one is encrypted. */</div><div class='del'>-		des_ecb_encrypt ((des_cblock *)token-&gt;data, (des_cblock *)token-&gt;data, priv-&gt;schedule, 0);</div><div class='del'>-</div><div class='del'>-		/* Check that the returned value is the original nonce plus one. */</div><div class='del'>-		memcpy (&amp;plus1, token-&gt;data, 4);</div><div class='del'>-		if (ntohl (plus1) != priv-&gt;nonce_h + 1)</div><div class='del'>-			goto lose;</div><div class='del'>-</div><div class='del'>-		/* "the fifth octet contain[s] a bit-mask specifying the</div><div class='del'>-		 * protection mechanisms supported by the server"</div><div class='del'>-		 */</div><div class='del'>-		if (!(token-&gt;data[4] &amp; KERBEROS_V4_PROTECTION_NONE)) {</div><div class='del'>-			g_warning ("Server does not support `no protection' :-(");</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		username = sasl-&gt;service-&gt;url-&gt;user;</div><div class='del'>-		len = strlen (username) + 9;</div><div class='del'>-		len += 8 - len % 8;</div><div class='del'>-		ret = g_byte_array_new ();</div><div class='del'>-		g_byte_array_set_size (ret, len);</div><div class='del'>-		memset (ret-&gt;data, 0, len);</div><div class='del'>-		memcpy (ret-&gt;data, &amp;priv-&gt;nonce_n, 4);</div><div class='del'>-		ret-&gt;data[4] = KERBEROS_V4_PROTECTION_NONE;</div><div class='del'>-		ret-&gt;data[5] = ret-&gt;data[6] = ret-&gt;data[7] = 0;</div><div class='del'>-		strcpy (ret-&gt;data + 8, username);</div><div class='del'>-</div><div class='del'>-		des_pcbc_encrypt ((void *)ret-&gt;data, (void *)ret-&gt;data, len,</div><div class='del'>-				  priv-&gt;schedule, &amp;priv-&gt;session, 1);</div><div class='del'>-		memset (&amp;priv-&gt;session, 0, sizeof (priv-&gt;session));</div><div class='del'>-</div><div class='del'>-		sasl-&gt;authenticated = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;state++;</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>- lose:</div><div class='del'>-	memset (&amp;priv-&gt;session, 0, sizeof (priv-&gt;session));</div><div class='del'>-</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Bad authentication response from server."));</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* HAVE_KRB4 */</div><div class='head'>diff --git a/camel/camel-sasl-kerberos4.h b/camel/camel-sasl-kerberos4.h<br/>deleted file mode 100644<br/>index cf84345513..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-kerberos4.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-kerberos4.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_KERBEROS4_H</div><div class='del'>-#define CAMEL_SASL_KERBEROS4_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;netdb.h&gt;</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_KERBEROS4_TYPE     (camel_sasl_kerberos4_get_type ())</div><div class='del'>-#define CAMEL_SASL_KERBEROS4(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4))</div><div class='del'>-#define CAMEL_SASL_KERBEROS4_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4Class))</div><div class='del'>-#define CAMEL_IS_SASL_KERBEROS4(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_KERBEROS4_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslKerberos4 {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-	struct _CamelSaslKerberos4Private *priv;</div><div class='del'>-</div><div class='del'>-} CamelSaslKerberos4;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslKerberos4Class {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslKerberos4Class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_kerberos4_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_kerberos4_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_KERBEROS4_H */</div><div class='head'>diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c<br/>deleted file mode 100644<br/>index f6c3c9e5f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-login.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-login.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl-login.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_login_authtype = {</div><div class='del'>-	N_("Login"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will connect to the server using a "</div><div class='del'>-	   "simple password."),</div><div class='del'>-	</div><div class='del'>-	"LOGIN",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LOGIN_USER,</div><div class='del'>-	LOGIN_PASSWD</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslLogin */</div><div class='del'>-#define CSP_CLASS(so) CAMEL_SASL_LOGIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *login_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-struct _CamelSaslLoginPrivate {</div><div class='del'>-	int state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_login_class_init (CamelSaslLoginClass *camel_sasl_login_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_login_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = login_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_login_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelSaslLogin *sasl_login = CAMEL_SASL_LOGIN (object);</div><div class='del'>-	</div><div class='del'>-	sasl_login-&gt;priv = g_new0 (struct _CamelSaslLoginPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_login_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSaslLogin *sasl = CAMEL_SASL_LOGIN (object);</div><div class='del'>-	</div><div class='del'>-	g_free (sasl-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_login_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslLogin",</div><div class='del'>-					    sizeof (CamelSaslLogin),</div><div class='del'>-					    sizeof (CamelSaslLoginClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_login_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_sasl_login_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_sasl_login_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-login_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _CamelSaslLoginPrivate *priv = CAMEL_SASL_LOGIN (sasl)-&gt;priv;</div><div class='del'>-	GByteArray *buf = NULL;</div><div class='del'>-	CamelURL *url = sasl-&gt;service-&gt;url;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (url-&gt;passwd != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	switch (priv-&gt;state) {</div><div class='del'>-	case LOGIN_USER:</div><div class='del'>-		buf = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (buf, url-&gt;user, strlen (url-&gt;user));</div><div class='del'>-		break;</div><div class='del'>-	case LOGIN_PASSWD:</div><div class='del'>-		buf = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (buf, url-&gt;passwd, strlen (url-&gt;passwd));</div><div class='del'>-		</div><div class='del'>-		sasl-&gt;authenticated = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		if (!camel_exception_is_set (ex)) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					     _("Unknown authentication state."));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	priv-&gt;state++;</div><div class='del'>-	</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h<br/>deleted file mode 100644<br/>index dffa657202..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-login.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-login.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_LOGIN_H</div><div class='del'>-#define CAMEL_SASL_LOGIN_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_LOGIN_TYPE     (camel_sasl_login_get_type ())</div><div class='del'>-#define CAMEL_SASL_LOGIN(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_LOGIN_TYPE, CamelSaslLogin))</div><div class='del'>-#define CAMEL_SASL_LOGIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_LOGIN_TYPE, CamelSaslLoginClass))</div><div class='del'>-#define CAMEL_IS_SASL_LOGIN(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_LOGIN_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslLogin {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelSaslLoginPrivate *priv;</div><div class='del'>-	</div><div class='del'>-} CamelSaslLogin;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslLoginClass {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslLoginClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_login_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_login_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_LOGIN_H */</div><div class='head'>diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c<br/>deleted file mode 100644<br/>index ad341353c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-ntlm.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-ntlm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,706 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-sasl-ntlm.h"</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_ntlm_authtype = {</div><div class='del'>-	N_("NTLM / SPA"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to a Windows-based server using "</div><div class='del'>-	   "NTLM / Secure Password Authentication."),</div><div class='del'>-</div><div class='del'>-	"NTLM",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static GByteArray *ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_ntlm_class_init (CamelSaslNTLMClass *camel_sasl_ntlm_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_ntlm_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = ntlm_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_ntlm_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (</div><div class='del'>-			camel_sasl_get_type (), "CamelSaslNTLM",</div><div class='del'>-			sizeof (CamelSaslNTLM),</div><div class='del'>-			sizeof (CamelSaslNTLMClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_sasl_ntlm_class_init,</div><div class='del'>-			NULL, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define NTLM_REQUEST "NTLMSSP\x00\x01\x00\x00\x00\x06\x82\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00"</div><div class='del'>-</div><div class='del'>-#define NTLM_CHALLENGE_NONCE_OFFSET      24</div><div class='del'>-#define NTLM_CHALLENGE_DOMAIN_OFFSET     48</div><div class='del'>-#define NTLM_CHALLENGE_DOMAIN_LEN_OFFSET 44</div><div class='del'>-</div><div class='del'>-#define NTLM_RESPONSE_HEADER         "NTLMSSP\x00\x03\x00\x00\x00"</div><div class='del'>-#define NTLM_RESPONSE_FLAGS          "\x82\x01"</div><div class='del'>-#define NTLM_RESPONSE_BASE_SIZE      64</div><div class='del'>-#define NTLM_RESPONSE_LM_RESP_OFFSET 12</div><div class='del'>-#define NTLM_RESPONSE_NT_RESP_OFFSET 20</div><div class='del'>-#define NTLM_RESPONSE_DOMAIN_OFFSET  28</div><div class='del'>-#define NTLM_RESPONSE_USER_OFFSET    36</div><div class='del'>-#define NTLM_RESPONSE_HOST_OFFSET    44</div><div class='del'>-#define NTLM_RESPONSE_FLAGS_OFFSET   60</div><div class='del'>-</div><div class='del'>-static void ntlm_calc_response   (const guchar key[21],</div><div class='del'>-				  const guchar plaintext[8],</div><div class='del'>-				  guchar results[24]);</div><div class='del'>-static void ntlm_lanmanager_hash (const char *password, char hash[21]);</div><div class='del'>-static void ntlm_nt_hash         (const char *password, char hash[21]);</div><div class='del'>-static void ntlm_set_string      (GByteArray *ba, int offset,</div><div class='del'>-				  const char *data, int len);</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GByteArray *ret;</div><div class='del'>-	guchar nonce[8], hash[21], lm_resp[24], nt_resp[24];</div><div class='del'>-</div><div class='del'>-	ret = g_byte_array_new ();</div><div class='del'>-</div><div class='del'>-	if (!token || !token-&gt;len) {</div><div class='del'>-		g_byte_array_append (ret, NTLM_REQUEST,</div><div class='del'>-				     sizeof (NTLM_REQUEST) - 1);</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memcpy (nonce, token-&gt;data + NTLM_CHALLENGE_NONCE_OFFSET, 8);</div><div class='del'>-	ntlm_lanmanager_hash (sasl-&gt;service-&gt;url-&gt;passwd, hash);</div><div class='del'>-	ntlm_calc_response (hash, nonce, lm_resp);</div><div class='del'>-	ntlm_nt_hash (sasl-&gt;service-&gt;url-&gt;passwd, hash);</div><div class='del'>-	ntlm_calc_response (hash, nonce, nt_resp);</div><div class='del'>-</div><div class='del'>-	ret = g_byte_array_new ();</div><div class='del'>-	g_byte_array_set_size (ret, NTLM_RESPONSE_BASE_SIZE);</div><div class='del'>-	memset (ret-&gt;data, 0, NTLM_RESPONSE_BASE_SIZE);</div><div class='del'>-	memcpy (ret-&gt;data, NTLM_RESPONSE_HEADER,</div><div class='del'>-		sizeof (NTLM_RESPONSE_HEADER) - 1);</div><div class='del'>-	memcpy (ret-&gt;data + NTLM_RESPONSE_FLAGS_OFFSET,</div><div class='del'>-		NTLM_RESPONSE_FLAGS, sizeof (NTLM_RESPONSE_FLAGS) - 1);</div><div class='del'>-</div><div class='del'>-	ntlm_set_string (ret, NTLM_RESPONSE_DOMAIN_OFFSET,</div><div class='del'>-			 token-&gt;data + NTLM_CHALLENGE_DOMAIN_OFFSET,</div><div class='del'>-			 atoi (token-&gt;data + NTLM_CHALLENGE_DOMAIN_LEN_OFFSET));</div><div class='del'>-	ntlm_set_string (ret, NTLM_RESPONSE_USER_OFFSET,</div><div class='del'>-			 sasl-&gt;service-&gt;url-&gt;user,</div><div class='del'>-			 strlen (sasl-&gt;service-&gt;url-&gt;user));</div><div class='del'>-	ntlm_set_string (ret, NTLM_RESPONSE_HOST_OFFSET,</div><div class='del'>-			 "UNKNOWN", sizeof ("UNKNOWN") - 1);</div><div class='del'>-	ntlm_set_string (ret, NTLM_RESPONSE_LM_RESP_OFFSET,</div><div class='del'>-			 lm_resp, sizeof (lm_resp));</div><div class='del'>-	ntlm_set_string (ret, NTLM_RESPONSE_NT_RESP_OFFSET,</div><div class='del'>-			 nt_resp, sizeof (nt_resp));</div><div class='del'>-</div><div class='del'>-	sasl-&gt;authenticated = TRUE;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* MD4 */</div><div class='del'>-static void md4sum                (const unsigned char *in, </div><div class='del'>-				   int                  nbytes, </div><div class='del'>-				   unsigned char        digest[16]);</div><div class='del'>-</div><div class='del'>-/* DES */</div><div class='del'>-typedef unsigned long DES_KS[16][2]; /* Single-key DES key schedule */</div><div class='del'>-</div><div class='del'>-static void deskey                (DES_KS, unsigned char *, int);</div><div class='del'>-</div><div class='del'>-static void des                   (DES_KS, unsigned char *);</div><div class='del'>-</div><div class='del'>-static void setup_schedule        (const guchar *key_56, DES_KS ks);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define LM_PASSWORD_MAGIC "\x4B\x47\x53\x21\x40\x23\x24\x25" \</div><div class='del'>-                          "\x4B\x47\x53\x21\x40\x23\x24\x25" \</div><div class='del'>-			  "\x00\x00\x00\x00\x00"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ntlm_lanmanager_hash (const char *password, char hash[21])</div><div class='del'>-{</div><div class='del'>-	guchar lm_password [15];</div><div class='del'>-	DES_KS ks;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 14 &amp;&amp; password [i]; i++)</div><div class='del'>-		lm_password [i] = toupper ((unsigned char) password [i]);</div><div class='del'>-</div><div class='del'>-	for (; i &lt; 15; i++)</div><div class='del'>-		lm_password [i] = '\0';</div><div class='del'>-</div><div class='del'>-	memcpy (hash, LM_PASSWORD_MAGIC, 21);</div><div class='del'>-</div><div class='del'>-	setup_schedule (lm_password, ks);</div><div class='del'>-	des (ks, hash);</div><div class='del'>-</div><div class='del'>-	setup_schedule (lm_password + 7, ks);</div><div class='del'>-	des (ks, hash + 8);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ntlm_nt_hash (const char *password, char hash[21])</div><div class='del'>-{</div><div class='del'>-	unsigned char *buf, *p;</div><div class='del'>-</div><div class='del'>-	p = buf = g_malloc (strlen (password) * 2);</div><div class='del'>-</div><div class='del'>-	while (*password) {</div><div class='del'>-		*p++ = *password++;</div><div class='del'>-		*p++ = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	md4sum (buf, p - buf, hash);</div><div class='del'>-	memset (hash + 16, 0, 5);</div><div class='del'>-</div><div class='del'>-	g_free (buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ntlm_set_string (GByteArray *ba, int offset, const char *data, int len)</div><div class='del'>-{</div><div class='del'>-	ba-&gt;data[offset    ] = ba-&gt;data[offset + 2] =  len       &amp; 0xFF;</div><div class='del'>-	ba-&gt;data[offset + 1] = ba-&gt;data[offset + 3] = (len &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	ba-&gt;data[offset + 4] =  ba-&gt;len       &amp; 0xFF;</div><div class='del'>-	ba-&gt;data[offset + 5] = (ba-&gt;len &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	g_byte_array_append (ba, data, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define KEYBITS(k,s) \</div><div class='del'>-        (((k[(s)/8] &lt;&lt; ((s)%8)) &amp; 0xFF) | (k[(s)/8+1] &gt;&gt; (8-(s)%8)))</div><div class='del'>-</div><div class='del'>-/* DES utils */</div><div class='del'>-/* Set up a key schedule based on a 56bit key */</div><div class='del'>-static void</div><div class='del'>-setup_schedule (const guchar *key_56, DES_KS ks)</div><div class='del'>-{</div><div class='del'>-	guchar key[8];</div><div class='del'>-	int i, c, bit;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 8; i++) {</div><div class='del'>-		key [i] = KEYBITS (key_56, i * 7);</div><div class='del'>-</div><div class='del'>-		/* Fix parity */</div><div class='del'>-		for (c = bit = 0; bit &lt; 8; bit++)</div><div class='del'>-			if (key [i] &amp; (1 &lt;&lt; bit))</div><div class='del'>-				c++;</div><div class='del'>-		if (!(c &amp; 1))</div><div class='del'>-			key [i] ^= 0x01;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-        deskey (ks, key, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ntlm_calc_response (const guchar key[21], const guchar plaintext[8],</div><div class='del'>-		    guchar results[24])</div><div class='del'>-{</div><div class='del'>-        DES_KS ks;</div><div class='del'>-</div><div class='del'>-	memcpy (results, plaintext, 8);</div><div class='del'>-	memcpy (results + 8, plaintext, 8);</div><div class='del'>-	memcpy (results + 16, plaintext, 8);</div><div class='del'>-</div><div class='del'>-        setup_schedule (key, ks);</div><div class='del'>-	des (ks, results);</div><div class='del'>-</div><div class='del'>-        setup_schedule (key + 7, ks);</div><div class='del'>-	des (ks, results + 8);</div><div class='del'>-</div><div class='del'>-        setup_schedule (key + 14, ks);</div><div class='del'>-        des (ks, results + 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * MD4 encoder. (The one everyone else uses is not GPL-compatible;</div><div class='del'>- * this is a reimplementation from spec.) This doesn't need to be</div><div class='del'>- * efficient for our purposes, although it would be nice to fix</div><div class='del'>- * it to not malloc()...</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define F(X,Y,Z) ( ((X)&amp;(Y)) | ((~(X))&amp;(Z)) )</div><div class='del'>-#define G(X,Y,Z) ( ((X)&amp;(Y)) | ((X)&amp;(Z)) | ((Y)&amp;(Z)) )</div><div class='del'>-#define H(X,Y,Z) ( (X)^(Y)^(Z) )</div><div class='del'>-#define ROT(val, n) ( ((val) &lt;&lt; (n)) | ((val) &gt;&gt; (32 - (n))) )</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-md4sum (const unsigned char *in, int nbytes, unsigned char digest[16])</div><div class='del'>-{</div><div class='del'>-	unsigned char *M;</div><div class='del'>-	guint32 A, B, C, D, AA, BB, CC, DD, X[16];</div><div class='del'>-	int pbytes, nbits = nbytes * 8, i, j;</div><div class='del'>-</div><div class='del'>-	pbytes = (120 - (nbytes % 64)) % 64;</div><div class='del'>-	M = alloca (nbytes + pbytes + 8);</div><div class='del'>-	memcpy (M, in, nbytes);</div><div class='del'>-	memset (M + nbytes, 0, pbytes + 8);</div><div class='del'>-	M[nbytes] = 0x80;</div><div class='del'>-	M[nbytes + pbytes] = nbits &amp; 0xFF;</div><div class='del'>-	M[nbytes + pbytes + 1] = (nbits &gt;&gt; 8) &amp; 0xFF;</div><div class='del'>-	M[nbytes + pbytes + 2] = (nbits &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	M[nbytes + pbytes + 3] = (nbits &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-</div><div class='del'>-	A = 0x67452301;</div><div class='del'>-	B = 0xEFCDAB89;</div><div class='del'>-	C = 0x98BADCFE;</div><div class='del'>-	D = 0x10325476;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nbytes + pbytes + 8; i += 64) {</div><div class='del'>-		for (j = 0; j &lt; 16; j++) {</div><div class='del'>-			X[j] =  (M[i + j*4]) |</div><div class='del'>-				(M[i + j*4 + 1] &lt;&lt; 8) |</div><div class='del'>-				(M[i + j*4 + 2] &lt;&lt; 16) |</div><div class='del'>-				(M[i + j*4 + 3] &lt;&lt; 24);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		AA = A;</div><div class='del'>-		BB = B;</div><div class='del'>-		CC = C;</div><div class='del'>-		DD = D;</div><div class='del'>-</div><div class='del'>-		A = ROT (A + F(B, C, D) + X[0], 3);</div><div class='del'>-		D = ROT (D + F(A, B, C) + X[1], 7);</div><div class='del'>-		C = ROT (C + F(D, A, B) + X[2], 11);</div><div class='del'>-		B = ROT (B + F(C, D, A) + X[3], 19);</div><div class='del'>-		A = ROT (A + F(B, C, D) + X[4], 3);</div><div class='del'>-		D = ROT (D + F(A, B, C) + X[5], 7);</div><div class='del'>-		C = ROT (C + F(D, A, B) + X[6], 11);</div><div class='del'>-		B = ROT (B + F(C, D, A) + X[7], 19);</div><div class='del'>-		A = ROT (A + F(B, C, D) + X[8], 3);</div><div class='del'>-		D = ROT (D + F(A, B, C) + X[9], 7);</div><div class='del'>-		C = ROT (C + F(D, A, B) + X[10], 11);</div><div class='del'>-		B = ROT (B + F(C, D, A) + X[11], 19);</div><div class='del'>-		A = ROT (A + F(B, C, D) + X[12], 3);</div><div class='del'>-		D = ROT (D + F(A, B, C) + X[13], 7);</div><div class='del'>-		C = ROT (C + F(D, A, B) + X[14], 11);</div><div class='del'>-		B = ROT (B + F(C, D, A) + X[15], 19);</div><div class='del'>-</div><div class='del'>-		A = ROT (A + G(B, C, D) + X[0] + 0x5A827999, 3);</div><div class='del'>-		D = ROT (D + G(A, B, C) + X[4] + 0x5A827999, 5);</div><div class='del'>-		C = ROT (C + G(D, A, B) + X[8] + 0x5A827999, 9);</div><div class='del'>-		B = ROT (B + G(C, D, A) + X[12] + 0x5A827999, 13);</div><div class='del'>-		A = ROT (A + G(B, C, D) + X[1] + 0x5A827999, 3);</div><div class='del'>-		D = ROT (D + G(A, B, C) + X[5] + 0x5A827999, 5);</div><div class='del'>-		C = ROT (C + G(D, A, B) + X[9] + 0x5A827999, 9);</div><div class='del'>-		B = ROT (B + G(C, D, A) + X[13] + 0x5A827999, 13);</div><div class='del'>-		A = ROT (A + G(B, C, D) + X[2] + 0x5A827999, 3);</div><div class='del'>-		D = ROT (D + G(A, B, C) + X[6] + 0x5A827999, 5);</div><div class='del'>-		C = ROT (C + G(D, A, B) + X[10] + 0x5A827999, 9);</div><div class='del'>-		B = ROT (B + G(C, D, A) + X[14] + 0x5A827999, 13);</div><div class='del'>-		A = ROT (A + G(B, C, D) + X[3] + 0x5A827999, 3);</div><div class='del'>-		D = ROT (D + G(A, B, C) + X[7] + 0x5A827999, 5);</div><div class='del'>-		C = ROT (C + G(D, A, B) + X[11] + 0x5A827999, 9);</div><div class='del'>-		B = ROT (B + G(C, D, A) + X[15] + 0x5A827999, 13);</div><div class='del'>-</div><div class='del'>-		A = ROT (A + H(B, C, D) + X[0] + 0x6ED9EBA1, 3);</div><div class='del'>-		D = ROT (D + H(A, B, C) + X[8] + 0x6ED9EBA1, 9);</div><div class='del'>-		C = ROT (C + H(D, A, B) + X[4] + 0x6ED9EBA1, 11);</div><div class='del'>-		B = ROT (B + H(C, D, A) + X[12] + 0x6ED9EBA1, 15);</div><div class='del'>-		A = ROT (A + H(B, C, D) + X[2] + 0x6ED9EBA1, 3);</div><div class='del'>-		D = ROT (D + H(A, B, C) + X[10] + 0x6ED9EBA1, 9);</div><div class='del'>-		C = ROT (C + H(D, A, B) + X[6] + 0x6ED9EBA1, 11);</div><div class='del'>-		B = ROT (B + H(C, D, A) + X[14] + 0x6ED9EBA1, 15);</div><div class='del'>-		A = ROT (A + H(B, C, D) + X[1] + 0x6ED9EBA1, 3);</div><div class='del'>-		D = ROT (D + H(A, B, C) + X[9] + 0x6ED9EBA1, 9);</div><div class='del'>-		C = ROT (C + H(D, A, B) + X[5] + 0x6ED9EBA1, 11);</div><div class='del'>-		B = ROT (B + H(C, D, A) + X[13] + 0x6ED9EBA1, 15);</div><div class='del'>-		A = ROT (A + H(B, C, D) + X[3] + 0x6ED9EBA1, 3);</div><div class='del'>-		D = ROT (D + H(A, B, C) + X[11] + 0x6ED9EBA1, 9);</div><div class='del'>-		C = ROT (C + H(D, A, B) + X[7] + 0x6ED9EBA1, 11);</div><div class='del'>-		B = ROT (B + H(C, D, A) + X[15] + 0x6ED9EBA1, 15);</div><div class='del'>-</div><div class='del'>-		A += AA;</div><div class='del'>-		B += BB;</div><div class='del'>-		C += CC;</div><div class='del'>-		D += DD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	digest[0]  =  A        &amp; 0xFF;</div><div class='del'>-	digest[1]  = (A &gt;&gt;  8) &amp; 0xFF;</div><div class='del'>-	digest[2]  = (A &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	digest[3]  = (A &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-	digest[4]  =  B        &amp; 0xFF;</div><div class='del'>-	digest[5]  = (B &gt;&gt;  8) &amp; 0xFF;</div><div class='del'>-	digest[6]  = (B &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	digest[7]  = (B &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-	digest[8]  =  C        &amp; 0xFF;</div><div class='del'>-	digest[9]  = (C &gt;&gt;  8) &amp; 0xFF;</div><div class='del'>-	digest[10] = (C &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	digest[11] = (C &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-	digest[12] =  D        &amp; 0xFF;</div><div class='del'>-	digest[13] = (D &gt;&gt;  8) &amp; 0xFF;</div><div class='del'>-	digest[14] = (D &gt;&gt; 16) &amp; 0xFF;</div><div class='del'>-	digest[15] = (D &gt;&gt; 24) &amp; 0xFF;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Public domain DES implementation from Phil Karn */</div><div class='del'>-static unsigned long Spbox[8][64] = {</div><div class='del'>-	{ 0x01010400, 0x00000000, 0x00010000, 0x01010404,</div><div class='del'>-	  0x01010004, 0x00010404, 0x00000004, 0x00010000,</div><div class='del'>-	  0x00000400, 0x01010400, 0x01010404, 0x00000400,</div><div class='del'>-	  0x01000404, 0x01010004, 0x01000000, 0x00000004,</div><div class='del'>-	  0x00000404, 0x01000400, 0x01000400, 0x00010400,</div><div class='del'>-	  0x00010400, 0x01010000, 0x01010000, 0x01000404,</div><div class='del'>-	  0x00010004, 0x01000004, 0x01000004, 0x00010004,</div><div class='del'>-	  0x00000000, 0x00000404, 0x00010404, 0x01000000,</div><div class='del'>-	  0x00010000, 0x01010404, 0x00000004, 0x01010000,</div><div class='del'>-	  0x01010400, 0x01000000, 0x01000000, 0x00000400,</div><div class='del'>-	  0x01010004, 0x00010000, 0x00010400, 0x01000004,</div><div class='del'>-	  0x00000400, 0x00000004, 0x01000404, 0x00010404,</div><div class='del'>-	  0x01010404, 0x00010004, 0x01010000, 0x01000404,</div><div class='del'>-	  0x01000004, 0x00000404, 0x00010404, 0x01010400,</div><div class='del'>-	  0x00000404, 0x01000400, 0x01000400, 0x00000000,</div><div class='del'>-	  0x00010004, 0x00010400, 0x00000000, 0x01010004 },</div><div class='del'>-	{ 0x80108020, 0x80008000, 0x00008000, 0x00108020,</div><div class='del'>-	  0x00100000, 0x00000020, 0x80100020, 0x80008020,</div><div class='del'>-	  0x80000020, 0x80108020, 0x80108000, 0x80000000,</div><div class='del'>-	  0x80008000, 0x00100000, 0x00000020, 0x80100020,</div><div class='del'>-	  0x00108000, 0x00100020, 0x80008020, 0x00000000,</div><div class='del'>-	  0x80000000, 0x00008000, 0x00108020, 0x80100000,</div><div class='del'>-	  0x00100020, 0x80000020, 0x00000000, 0x00108000,</div><div class='del'>-	  0x00008020, 0x80108000, 0x80100000, 0x00008020,</div><div class='del'>-	  0x00000000, 0x00108020, 0x80100020, 0x00100000,</div><div class='del'>-	  0x80008020, 0x80100000, 0x80108000, 0x00008000,</div><div class='del'>-	  0x80100000, 0x80008000, 0x00000020, 0x80108020,</div><div class='del'>-	  0x00108020, 0x00000020, 0x00008000, 0x80000000,</div><div class='del'>-	  0x00008020, 0x80108000, 0x00100000, 0x80000020,</div><div class='del'>-	  0x00100020, 0x80008020, 0x80000020, 0x00100020,</div><div class='del'>-	  0x00108000, 0x00000000, 0x80008000, 0x00008020,</div><div class='del'>-	  0x80000000, 0x80100020, 0x80108020, 0x00108000 },</div><div class='del'>-	{ 0x00000208, 0x08020200, 0x00000000, 0x08020008,</div><div class='del'>-	  0x08000200, 0x00000000, 0x00020208, 0x08000200,</div><div class='del'>-	  0x00020008, 0x08000008, 0x08000008, 0x00020000,</div><div class='del'>-	  0x08020208, 0x00020008, 0x08020000, 0x00000208,</div><div class='del'>-	  0x08000000, 0x00000008, 0x08020200, 0x00000200,</div><div class='del'>-	  0x00020200, 0x08020000, 0x08020008, 0x00020208,</div><div class='del'>-	  0x08000208, 0x00020200, 0x00020000, 0x08000208,</div><div class='del'>-	  0x00000008, 0x08020208, 0x00000200, 0x08000000,</div><div class='del'>-	  0x08020200, 0x08000000, 0x00020008, 0x00000208,</div><div class='del'>-	  0x00020000, 0x08020200, 0x08000200, 0x00000000,</div><div class='del'>-	  0x00000200, 0x00020008, 0x08020208, 0x08000200,</div><div class='del'>-	  0x08000008, 0x00000200, 0x00000000, 0x08020008,</div><div class='del'>-	  0x08000208, 0x00020000, 0x08000000, 0x08020208,</div><div class='del'>-	  0x00000008, 0x00020208, 0x00020200, 0x08000008,</div><div class='del'>-	  0x08020000, 0x08000208, 0x00000208, 0x08020000,</div><div class='del'>-	  0x00020208, 0x00000008, 0x08020008, 0x00020200 },</div><div class='del'>-	{ 0x00802001, 0x00002081, 0x00002081, 0x00000080,</div><div class='del'>-	  0x00802080, 0x00800081, 0x00800001, 0x00002001,</div><div class='del'>-	  0x00000000, 0x00802000, 0x00802000, 0x00802081,</div><div class='del'>-	  0x00000081, 0x00000000, 0x00800080, 0x00800001,</div><div class='del'>-	  0x00000001, 0x00002000, 0x00800000, 0x00802001,</div><div class='del'>-	  0x00000080, 0x00800000, 0x00002001, 0x00002080,</div><div class='del'>-	  0x00800081, 0x00000001, 0x00002080, 0x00800080,</div><div class='del'>-	  0x00002000, 0x00802080, 0x00802081, 0x00000081,</div><div class='del'>-	  0x00800080, 0x00800001, 0x00802000, 0x00802081,</div><div class='del'>-	  0x00000081, 0x00000000, 0x00000000, 0x00802000,</div><div class='del'>-	  0x00002080, 0x00800080, 0x00800081, 0x00000001,</div><div class='del'>-	  0x00802001, 0x00002081, 0x00002081, 0x00000080,</div><div class='del'>-	  0x00802081, 0x00000081, 0x00000001, 0x00002000,</div><div class='del'>-	  0x00800001, 0x00002001, 0x00802080, 0x00800081,</div><div class='del'>-	  0x00002001, 0x00002080, 0x00800000, 0x00802001,</div><div class='del'>-	  0x00000080, 0x00800000, 0x00002000, 0x00802080 },</div><div class='del'>-	{ 0x00000100, 0x02080100, 0x02080000, 0x42000100,</div><div class='del'>-	  0x00080000, 0x00000100, 0x40000000, 0x02080000,</div><div class='del'>-	  0x40080100, 0x00080000, 0x02000100, 0x40080100,</div><div class='del'>-	  0x42000100, 0x42080000, 0x00080100, 0x40000000,</div><div class='del'>-	  0x02000000, 0x40080000, 0x40080000, 0x00000000,</div><div class='del'>-	  0x40000100, 0x42080100, 0x42080100, 0x02000100,</div><div class='del'>-	  0x42080000, 0x40000100, 0x00000000, 0x42000000,</div><div class='del'>-	  0x02080100, 0x02000000, 0x42000000, 0x00080100,</div><div class='del'>-	  0x00080000, 0x42000100, 0x00000100, 0x02000000,</div><div class='del'>-	  0x40000000, 0x02080000, 0x42000100, 0x40080100,</div><div class='del'>-	  0x02000100, 0x40000000, 0x42080000, 0x02080100,</div><div class='del'>-	  0x40080100, 0x00000100, 0x02000000, 0x42080000,</div><div class='del'>-	  0x42080100, 0x00080100, 0x42000000, 0x42080100,</div><div class='del'>-	  0x02080000, 0x00000000, 0x40080000, 0x42000000,</div><div class='del'>-	  0x00080100, 0x02000100, 0x40000100, 0x00080000,</div><div class='del'>-	  0x00000000, 0x40080000, 0x02080100, 0x40000100 },</div><div class='del'>-	{ 0x20000010, 0x20400000, 0x00004000, 0x20404010,</div><div class='del'>-	  0x20400000, 0x00000010, 0x20404010, 0x00400000,</div><div class='del'>-	  0x20004000, 0x00404010, 0x00400000, 0x20000010,</div><div class='del'>-	  0x00400010, 0x20004000, 0x20000000, 0x00004010,</div><div class='del'>-	  0x00000000, 0x00400010, 0x20004010, 0x00004000,</div><div class='del'>-	  0x00404000, 0x20004010, 0x00000010, 0x20400010,</div><div class='del'>-	  0x20400010, 0x00000000, 0x00404010, 0x20404000,</div><div class='del'>-	  0x00004010, 0x00404000, 0x20404000, 0x20000000,</div><div class='del'>-	  0x20004000, 0x00000010, 0x20400010, 0x00404000,</div><div class='del'>-	  0x20404010, 0x00400000, 0x00004010, 0x20000010,</div><div class='del'>-	  0x00400000, 0x20004000, 0x20000000, 0x00004010,</div><div class='del'>-	  0x20000010, 0x20404010, 0x00404000, 0x20400000,</div><div class='del'>-	  0x00404010, 0x20404000, 0x00000000, 0x20400010,</div><div class='del'>-	  0x00000010, 0x00004000, 0x20400000, 0x00404010,</div><div class='del'>-	  0x00004000, 0x00400010, 0x20004010, 0x00000000,</div><div class='del'>-	  0x20404000, 0x20000000, 0x00400010, 0x20004010 },</div><div class='del'>-	{ 0x00200000, 0x04200002, 0x04000802, 0x00000000,</div><div class='del'>-	  0x00000800, 0x04000802, 0x00200802, 0x04200800,</div><div class='del'>-	  0x04200802, 0x00200000, 0x00000000, 0x04000002,</div><div class='del'>-	  0x00000002, 0x04000000, 0x04200002, 0x00000802,</div><div class='del'>-	  0x04000800, 0x00200802, 0x00200002, 0x04000800,</div><div class='del'>-	  0x04000002, 0x04200000, 0x04200800, 0x00200002,</div><div class='del'>-	  0x04200000, 0x00000800, 0x00000802, 0x04200802,</div><div class='del'>-	  0x00200800, 0x00000002, 0x04000000, 0x00200800,</div><div class='del'>-	  0x04000000, 0x00200800, 0x00200000, 0x04000802,</div><div class='del'>-	  0x04000802, 0x04200002, 0x04200002, 0x00000002,</div><div class='del'>-	  0x00200002, 0x04000000, 0x04000800, 0x00200000,</div><div class='del'>-	  0x04200800, 0x00000802, 0x00200802, 0x04200800,</div><div class='del'>-	  0x00000802, 0x04000002, 0x04200802, 0x04200000,</div><div class='del'>-	  0x00200800, 0x00000000, 0x00000002, 0x04200802,</div><div class='del'>-	  0x00000000, 0x00200802, 0x04200000, 0x00000800,</div><div class='del'>-	  0x04000002, 0x04000800, 0x00000800, 0x00200002 },</div><div class='del'>-	{ 0x10001040, 0x00001000, 0x00040000, 0x10041040,</div><div class='del'>-	  0x10000000, 0x10001040, 0x00000040, 0x10000000,</div><div class='del'>-	  0x00040040, 0x10040000, 0x10041040, 0x00041000,</div><div class='del'>-	  0x10041000, 0x00041040, 0x00001000, 0x00000040,</div><div class='del'>-	  0x10040000, 0x10000040, 0x10001000, 0x00001040,</div><div class='del'>-	  0x00041000, 0x00040040, 0x10040040, 0x10041000,</div><div class='del'>-	  0x00001040, 0x00000000, 0x00000000, 0x10040040,</div><div class='del'>-	  0x10000040, 0x10001000, 0x00041040, 0x00040000,</div><div class='del'>-	  0x00041040, 0x00040000, 0x10041000, 0x00001000,</div><div class='del'>-	  0x00000040, 0x10040040, 0x00001000, 0x00041040,</div><div class='del'>-	  0x10001000, 0x00000040, 0x10000040, 0x10040000,</div><div class='del'>-	  0x10040040, 0x10000000, 0x00040000, 0x10001040,</div><div class='del'>-	  0x00000000, 0x10041040, 0x00040040, 0x10000040,</div><div class='del'>-	  0x10040000, 0x10001000, 0x10001040, 0x00000000,</div><div class='del'>-	  0x10041040, 0x00041000, 0x00041000, 0x00001040,</div><div class='del'>-	  0x00001040, 0x00040040, 0x10000000, 0x10041000 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#undef F</div><div class='del'>-#define	F(l,r,key){\</div><div class='del'>-	work = ((r &gt;&gt; 4) | (r &lt;&lt; 28)) ^ key[0];\</div><div class='del'>-	l ^= Spbox[6][work &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[4][(work &gt;&gt; 8) &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[2][(work &gt;&gt; 16) &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[0][(work &gt;&gt; 24) &amp; 0x3f];\</div><div class='del'>-	work = r ^ key[1];\</div><div class='del'>-	l ^= Spbox[7][work &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[5][(work &gt;&gt; 8) &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[3][(work &gt;&gt; 16) &amp; 0x3f];\</div><div class='del'>-	l ^= Spbox[1][(work &gt;&gt; 24) &amp; 0x3f];\</div><div class='del'>-}</div><div class='del'>-/* Encrypt or decrypt a block of data in ECB mode */</div><div class='del'>-static void</div><div class='del'>-des(ks,block)</div><div class='del'>-unsigned long ks[16][2];	/* Key schedule */</div><div class='del'>-unsigned char block[8];		/* Data block */</div><div class='del'>-{</div><div class='del'>-	unsigned long left,right,work;</div><div class='del'>-	</div><div class='del'>-	/* Read input block and place in left/right in big-endian order */</div><div class='del'>-	left = ((unsigned long)block[0] &lt;&lt; 24)</div><div class='del'>-	 | ((unsigned long)block[1] &lt;&lt; 16)</div><div class='del'>-	 | ((unsigned long)block[2] &lt;&lt; 8)</div><div class='del'>-	 | (unsigned long)block[3];</div><div class='del'>-	right = ((unsigned long)block[4] &lt;&lt; 24)</div><div class='del'>-	 | ((unsigned long)block[5] &lt;&lt; 16)</div><div class='del'>-	 | ((unsigned long)block[6] &lt;&lt; 8)</div><div class='del'>-	 | (unsigned long)block[7];</div><div class='del'>-</div><div class='del'>-	/* Hoey's clever initial permutation algorithm, from Outerbridge</div><div class='del'>-	 * (see Schneier p 478)	</div><div class='del'>-	 *</div><div class='del'>-	 * The convention here is the same as Outerbridge: rotate each</div><div class='del'>-	 * register left by 1 bit, i.e., so that "left" contains permuted</div><div class='del'>-	 * input bits 2, 3, 4, ... 1 and "right" contains 33, 34, 35, ... 32	</div><div class='del'>-	 * (using origin-1 numbering as in the FIPS). This allows us to avoid</div><div class='del'>-	 * one of the two rotates that would otherwise be required in each of</div><div class='del'>-	 * the 16 rounds.</div><div class='del'>-	 */</div><div class='del'>-	work = ((left &gt;&gt; 4) ^ right) &amp; 0x0f0f0f0f;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left ^= work &lt;&lt; 4;</div><div class='del'>-	work = ((left &gt;&gt; 16) ^ right) &amp; 0xffff;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left ^= work &lt;&lt; 16;</div><div class='del'>-	work = ((right &gt;&gt; 2) ^ left) &amp; 0x33333333;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= (work &lt;&lt; 2);</div><div class='del'>-	work = ((right &gt;&gt; 8) ^ left) &amp; 0xff00ff;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= (work &lt;&lt; 8);</div><div class='del'>-	right = (right &lt;&lt; 1) | (right &gt;&gt; 31);</div><div class='del'>-	work = (left ^ right) &amp; 0xaaaaaaaa;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left = (left &lt;&lt; 1) | (left &gt;&gt; 31);</div><div class='del'>-</div><div class='del'>-	/* Now do the 16 rounds */</div><div class='del'>-	F(left,right,ks[0]);</div><div class='del'>-	F(right,left,ks[1]);</div><div class='del'>-	F(left,right,ks[2]);</div><div class='del'>-	F(right,left,ks[3]);</div><div class='del'>-	F(left,right,ks[4]);</div><div class='del'>-	F(right,left,ks[5]);</div><div class='del'>-	F(left,right,ks[6]);</div><div class='del'>-	F(right,left,ks[7]);</div><div class='del'>-	F(left,right,ks[8]);</div><div class='del'>-	F(right,left,ks[9]);</div><div class='del'>-	F(left,right,ks[10]);</div><div class='del'>-	F(right,left,ks[11]);</div><div class='del'>-	F(left,right,ks[12]);</div><div class='del'>-	F(right,left,ks[13]);</div><div class='del'>-	F(left,right,ks[14]);</div><div class='del'>-	F(right,left,ks[15]);</div><div class='del'>-</div><div class='del'>-	/* Inverse permutation, also from Hoey via Outerbridge and Schneier */</div><div class='del'>-	right = (right &lt;&lt; 31) | (right &gt;&gt; 1);</div><div class='del'>-	work = (left ^ right) &amp; 0xaaaaaaaa;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left = (left &gt;&gt; 1) | (left  &lt;&lt; 31);</div><div class='del'>-	work = ((left &gt;&gt; 8) ^ right) &amp; 0xff00ff;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left ^= work &lt;&lt; 8;</div><div class='del'>-	work = ((left &gt;&gt; 2) ^ right) &amp; 0x33333333;</div><div class='del'>-	right ^= work;</div><div class='del'>-	left ^= work &lt;&lt; 2;</div><div class='del'>-	work = ((right &gt;&gt; 16) ^ left) &amp; 0xffff;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= work &lt;&lt; 16;</div><div class='del'>-	work = ((right &gt;&gt; 4) ^ left) &amp; 0x0f0f0f0f;</div><div class='del'>-	left ^= work;</div><div class='del'>-	right ^= work &lt;&lt; 4;</div><div class='del'>-</div><div class='del'>-	/* Put the block back into the user's buffer with final swap */</div><div class='del'>-	block[0] = right &gt;&gt; 24;</div><div class='del'>-	block[1] = right &gt;&gt; 16;</div><div class='del'>-	block[2] = right &gt;&gt; 8;</div><div class='del'>-	block[3] = right;</div><div class='del'>-	block[4] = left &gt;&gt; 24;</div><div class='del'>-	block[5] = left &gt;&gt; 16;</div><div class='del'>-	block[6] = left &gt;&gt; 8;</div><div class='del'>-	block[7] = left;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Key schedule-related tables from FIPS-46 */</div><div class='del'>-</div><div class='del'>-/* permuted choice table (key) */</div><div class='del'>-static unsigned char pc1[] = {</div><div class='del'>-	57, 49, 41, 33, 25, 17,  9,</div><div class='del'>-	 1, 58, 50, 42, 34, 26, 18,</div><div class='del'>-	10,  2, 59, 51, 43, 35, 27,</div><div class='del'>-	19, 11,  3, 60, 52, 44, 36,</div><div class='del'>-</div><div class='del'>-	63, 55, 47, 39, 31, 23, 15,</div><div class='del'>-	 7, 62, 54, 46, 38, 30, 22,</div><div class='del'>-	14,  6, 61, 53, 45, 37, 29,</div><div class='del'>-	21, 13,  5, 28, 20, 12,  4</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* number left rotations of pc1 */</div><div class='del'>-static unsigned char totrot[] = {</div><div class='del'>-	1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* permuted choice key (table) */</div><div class='del'>-static unsigned char pc2[] = {</div><div class='del'>-	14, 17, 11, 24,  1,  5,</div><div class='del'>-	 3, 28, 15,  6, 21, 10,</div><div class='del'>-	23, 19, 12,  4, 26,  8,</div><div class='del'>-	16,  7, 27, 20, 13,  2,</div><div class='del'>-	41, 52, 31, 37, 47, 55,</div><div class='del'>-	30, 40, 51, 45, 33, 48,</div><div class='del'>-	44, 49, 39, 56, 34, 53,</div><div class='del'>-	46, 42, 50, 36, 29, 32</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* End of DES-defined tables */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* bit 0 is left-most in byte */</div><div class='del'>-static int bytebit[] = {</div><div class='del'>-	0200,0100,040,020,010,04,02,01</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Generate key schedule for encryption or decryption</div><div class='del'>- * depending on the value of "decrypt"</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-deskey(k,key,decrypt)</div><div class='del'>-DES_KS k;			/* Key schedule array */</div><div class='del'>-unsigned char *key;		/* 64 bits (will use only 56) */</div><div class='del'>-int decrypt;			/* 0 = encrypt, 1 = decrypt */</div><div class='del'>-{</div><div class='del'>-	unsigned char pc1m[56];		/* place to modify pc1 into */</div><div class='del'>-	unsigned char pcr[56];		/* place to rotate pc1 into */</div><div class='del'>-	register int i,j,l;</div><div class='del'>-	int m;</div><div class='del'>-	unsigned char ks[8];</div><div class='del'>-</div><div class='del'>-	for (j=0; j&lt;56; j++) {		/* convert pc1 to bits of key */</div><div class='del'>-		l=pc1[j]-1;		/* integer bit location	 */</div><div class='del'>-		m = l &amp; 07;		/* find bit		 */</div><div class='del'>-		pc1m[j]=(key[l&gt;&gt;3] &amp;	/* find which key byte l is in */</div><div class='del'>-			bytebit[m])	/* and which bit of that byte */</div><div class='del'>-			? 1 : 0;	/* and store 1-bit result */</div><div class='del'>-	}</div><div class='del'>-	for (i=0; i&lt;16; i++) {		/* key chunk for each iteration */</div><div class='del'>-		memset(ks,0,sizeof(ks));	/* Clear key schedule */</div><div class='del'>-		for (j=0; j&lt;56; j++)	/* rotate pc1 the right amount */</div><div class='del'>-			pcr[j] = pc1m[(l=j+totrot[decrypt? 15-i : i])&lt;(j&lt;28? 28 : 56) ? l: l-28];</div><div class='del'>-			/* rotate left and right halves independently */</div><div class='del'>-		for (j=0; j&lt;48; j++){	/* select bits individually */</div><div class='del'>-			/* check bit that goes to ks[j] */</div><div class='del'>-			if (pcr[pc2[j]-1]){</div><div class='del'>-				/* mask it in if it's there */</div><div class='del'>-				l= j % 6;</div><div class='del'>-				ks[j/6] |= bytebit[l] &gt;&gt; 2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		/* Now convert to packed odd/even interleaved form */</div><div class='del'>-		k[i][0] = ((long)ks[0] &lt;&lt; 24)</div><div class='del'>-		 | ((long)ks[2] &lt;&lt; 16)</div><div class='del'>-		 | ((long)ks[4] &lt;&lt; 8)</div><div class='del'>-		 | ((long)ks[6]);</div><div class='del'>-		k[i][1] = ((long)ks[1] &lt;&lt; 24)</div><div class='del'>-		 | ((long)ks[3] &lt;&lt; 16)</div><div class='del'>-		 | ((long)ks[5] &lt;&lt; 8)</div><div class='del'>-		 | ((long)ks[7]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h<br/>deleted file mode 100644<br/>index 3818081c74..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-ntlm.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-ntlm.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_NTLM_H</div><div class='del'>-#define CAMEL_SASL_NTLM_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_NTLM_TYPE     (camel_sasl_ntlm_get_type ())</div><div class='del'>-#define CAMEL_SASL_NTLM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLM))</div><div class='del'>-#define CAMEL_SASL_NTLM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLMClass))</div><div class='del'>-#define CAMEL_IS_SASL_NTLM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_NTLM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslNTLM {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSaslNTLM;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslNTLMClass {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslNTLMClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_ntlm_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_ntlm_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_NTLM_H */</div><div class='head'>diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c<br/>deleted file mode 100644<br/>index 6965f32c4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-plain.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-plain.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl-plain.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_plain_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the server using a "</div><div class='del'>-	   "simple password."),</div><div class='del'>-</div><div class='del'>-	"PLAIN",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslPlain */</div><div class='del'>-#define CSP_CLASS(so) CAMEL_SASL_PLAIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_plain_class_init (CamelSaslPlainClass *camel_sasl_plain_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_plain_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = plain_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_plain_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslPlain",</div><div class='del'>-					    sizeof (CamelSaslPlain),</div><div class='del'>-					    sizeof (CamelSaslPlainClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_plain_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GByteArray *buf = NULL;</div><div class='del'>-	CamelURL *url = sasl-&gt;service-&gt;url;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	if (token) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Authentication failed."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (url-&gt;passwd != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: make sure these are "UTF8-SAFE" */</div><div class='del'>-	buf = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (buf, "", 1);</div><div class='del'>-	g_byte_array_append (buf, url-&gt;user, strlen (url-&gt;user));</div><div class='del'>-	g_byte_array_append (buf, "", 1);</div><div class='del'>-	g_byte_array_append (buf, url-&gt;passwd, strlen (url-&gt;passwd));</div><div class='del'>-	</div><div class='del'>-	sasl-&gt;authenticated = TRUE;</div><div class='del'>-	</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h<br/>deleted file mode 100644<br/>index a23568047e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-plain.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-plain.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_PLAIN_H</div><div class='del'>-#define CAMEL_SASL_PLAIN_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_PLAIN_TYPE     (camel_sasl_plain_get_type ())</div><div class='del'>-#define CAMEL_SASL_PLAIN(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlain))</div><div class='del'>-#define CAMEL_SASL_PLAIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlainClass))</div><div class='del'>-#define CAMEL_IS_SASL_PLAIN(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_PLAIN_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslPlain {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSaslPlain;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslPlainClass {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslPlainClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_plain_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_plain_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_PLAIN_H */</div><div class='head'>diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c<br/>deleted file mode 100644<br/>index 7e1b6baaf0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-popb4smtp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-popb4smtp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include "camel-sasl-popb4smtp.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_sasl_popb4smtp_authtype = {</div><div class='del'>-	N_("POP before SMTP"),</div><div class='del'>-</div><div class='del'>-	N_("This option will authorise a POP connection before attempting SMTP"),</div><div class='del'>-</div><div class='del'>-	"POPB4SMTP",</div><div class='del'>-	FALSE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* last time the pop was accessed (through the auth method anyway), *time_t */</div><div class='del'>-static GHashTable *poplast;</div><div class='del'>-</div><div class='del'>-/* use 1 hour as our pop timeout */</div><div class='del'>-#define POPB4SMTP_TIMEOUT (60*60)</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#define POPB4SMTP_LOCK(l) pthread_mutex_lock(&amp;l)</div><div class='del'>-#define POPB4SMTP_UNLOCK(l) pthread_mutex_unlock(&amp;l)</div><div class='del'>-#else</div><div class='del'>-#define POPB4SMTP_LOCK(l)</div><div class='del'>-#define POPB4SMTP_UNLOCK(l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelSaslClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSaslPOPB4SMTP */</div><div class='del'>-#define CSP_CLASS(so) CAMEL_SASL_POPB4SMTP_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *popb4smtp_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_popb4smtp_class_init (CamelSaslPOPB4SMTPClass *camel_sasl_popb4smtp_class)</div><div class='del'>-{</div><div class='del'>-	CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_popb4smtp_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_sasl_class-&gt;challenge = popb4smtp_challenge;</div><div class='del'>-</div><div class='del'>-	poplast = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_popb4smtp_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_sasl_get_type (),</div><div class='del'>-					    "CamelSaslPOPB4SMTP",</div><div class='del'>-					    sizeof (CamelSaslPOPB4SMTP),</div><div class='del'>-					    sizeof (CamelSaslPOPB4SMTPClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_popb4smtp_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-popb4smtp_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *popuri;</div><div class='del'>-	CamelSession *session = sasl-&gt;service-&gt;session;</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	time_t now, *timep;</div><div class='del'>-</div><div class='del'>-	sasl-&gt;authenticated = FALSE;</div><div class='del'>-</div><div class='del'>-	popuri = camel_session_get_password(session, _("POP Source URI"), FALSE,</div><div class='del'>-					    sasl-&gt;service, "popb4smtp_uri", ex);</div><div class='del'>-</div><div class='del'>-	if (popuri == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("POP Before SMTP auth using an unknown transport"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (strncasecmp(popuri, "pop:", 4) != 0) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("POP Before SMTP auth using a non-pop source"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if we've done it before recently in this session */</div><div class='del'>-	now = time(0);</div><div class='del'>-</div><div class='del'>-	/* need to lock around the whole thing until finished with timep */</div><div class='del'>-</div><div class='del'>-	POPB4SMTP_LOCK(lock);</div><div class='del'>-	timep = g_hash_table_lookup(poplast, popuri);</div><div class='del'>-	if (timep) {</div><div class='del'>-		if ((*timep + POPB4SMTP_TIMEOUT) &gt; now) {</div><div class='del'>-			sasl-&gt;authenticated = TRUE;</div><div class='del'>-			POPB4SMTP_UNLOCK(lock);</div><div class='del'>-			g_free(popuri);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		timep = g_malloc0(sizeof(*timep));</div><div class='del'>-		g_hash_table_insert(poplast, g_strdup(popuri), timep);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* connect to pop session */</div><div class='del'>-	store = camel_session_get_store(session, popuri, ex);</div><div class='del'>-	if (store) {</div><div class='del'>-		sasl-&gt;authenticated = TRUE;</div><div class='del'>-		camel_object_unref((CamelObject *)store);</div><div class='del'>-		*timep = now;</div><div class='del'>-	} else {</div><div class='del'>-		sasl-&gt;authenticated = FALSE;</div><div class='del'>-		*timep = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	POPB4SMTP_UNLOCK(lock);</div><div class='del'>-</div><div class='del'>-	g_free(popuri);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h<br/>deleted file mode 100644<br/>index b94bed0d49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl-popb4smtp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl-popb4smtp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_POPB4SMTP_H</div><div class='del'>-#define CAMEL_SASL_POPB4SMTP_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_POPB4SMTP_TYPE     (camel_sasl_popb4smtp_get_type ())</div><div class='del'>-#define CAMEL_SASL_POPB4SMTP(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTP))</div><div class='del'>-#define CAMEL_SASL_POPB4SMTP_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTPClass))</div><div class='del'>-#define CAMEL_IS_SASL_POPB4SMTP(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_POPB4SMTP_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslPOPB4SMTP {</div><div class='del'>-	CamelSasl parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSaslPOPB4SMTP;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslPOPB4SMTPClass {</div><div class='del'>-	CamelSaslClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSaslPOPB4SMTPClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sasl_popb4smtp_get_type (void);</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_sasl_popb4smtp_authtype;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_POPB4SMTP_H */</div><div class='head'>diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c<br/>deleted file mode 100644<br/>index 1ce1286be1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,269 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-</div><div class='del'>-#include "camel-sasl-cram-md5.h"</div><div class='del'>-#include "camel-sasl-digest-md5.h"</div><div class='del'>-#include "camel-sasl-kerberos4.h"</div><div class='del'>-#include "camel-sasl-login.h"</div><div class='del'>-#include "camel-sasl-plain.h"</div><div class='del'>-#include "camel-sasl-popb4smtp.h"</div><div class='del'>-#include "camel-sasl-ntlm.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSasl */</div><div class='del'>-#define CS_CLASS(so) CAMEL_SASL_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static GByteArray *sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_class_init (CamelSaslClass *camel_sasl_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_sasl_class-&gt;challenge = sasl_challenge;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sasl_finalize (CamelSasl *sasl)</div><div class='del'>-{</div><div class='del'>-	g_free (sasl-&gt;service_name);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sasl-&gt;service));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sasl_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_OBJECT_TYPE,</div><div class='del'>-					    "CamelSasl",</div><div class='del'>-					    sizeof (CamelSasl),</div><div class='del'>-					    sizeof (CamelSaslClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_sasl_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_sasl_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("sasl_challenge: Using default implementation!"));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_challenge:</div><div class='del'>- * @sasl: a SASL object</div><div class='del'>- * @token: a token, or %NULL</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * If @token is %NULL, generate the initial SASL message to send to</div><div class='del'>- * the server. (This will be %NULL if the client doesn't initiate the</div><div class='del'>- * exchange.) Otherwise, @token is a challenge from the server, and</div><div class='del'>- * the return value is the response.</div><div class='del'>- *</div><div class='del'>- * Return value: The SASL response or %NULL. If an error occurred, @ex</div><div class='del'>- * will also be set.</div><div class='del'>- **/</div><div class='del'>-GByteArray *</div><div class='del'>-camel_sasl_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);</div><div class='del'>-	</div><div class='del'>-	return CS_CLASS (sasl)-&gt;challenge (sasl, token, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_challenge_base64:</div><div class='del'>- * @sasl: a SASL object</div><div class='del'>- * @token: a base64-encoded token</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * As with camel_sasl_challenge(), but the challenge @token and the</div><div class='del'>- * response are both base64-encoded.</div><div class='del'>- *</div><div class='del'>- * Return value: As with camel_sasl_challenge(), but base64-encoded.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GByteArray *token_binary, *ret_binary;</div><div class='del'>-	char *ret;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SASL (sasl), NULL);</div><div class='del'>-	</div><div class='del'>-	if (token) {</div><div class='del'>-		token_binary = g_byte_array_new ();</div><div class='del'>-		len = strlen (token);</div><div class='del'>-		g_byte_array_append (token_binary, token, len);</div><div class='del'>-		token_binary-&gt;len = base64_decode_simple (token_binary-&gt;data, len);</div><div class='del'>-	} else</div><div class='del'>-		token_binary = NULL;</div><div class='del'>-	</div><div class='del'>-	ret_binary = camel_sasl_challenge (sasl, token_binary, ex);</div><div class='del'>-	if (token_binary)</div><div class='del'>-		g_byte_array_free (token_binary, TRUE);</div><div class='del'>-	if (!ret_binary)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	ret = base64_encode_simple (ret_binary-&gt;data, ret_binary-&gt;len);</div><div class='del'>-	g_byte_array_free (ret_binary, TRUE);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_authenticated:</div><div class='del'>- * @sasl: a SASL object</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not @sasl has successfully authenticated</div><div class='del'>- * the user. This will be %TRUE after it returns the last needed response.</div><div class='del'>- * The caller must still pass that information on to the server and verify</div><div class='del'>- * that it has accepted it.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_sasl_authenticated (CamelSasl *sasl)</div><div class='del'>-{</div><div class='del'>-	return sasl-&gt;authenticated;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_new:</div><div class='del'>- * @service_name: the SASL service name</div><div class='del'>- * @mechanism: the SASL mechanism</div><div class='del'>- * @service: the CamelService that will be using this SASL</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelSasl for the given @service_name,</div><div class='del'>- * @mechanism, and @service, or %NULL if the mechanism is not</div><div class='del'>- * supported.</div><div class='del'>- **/</div><div class='del'>-CamelSasl *</div><div class='del'>-camel_sasl_new (const char *service_name, const char *mechanism, CamelService *service)</div><div class='del'>-{</div><div class='del'>-	CamelSasl *sasl;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (service_name != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (mechanism != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	</div><div class='del'>-	/* We don't do ANONYMOUS here, because it's a little bit weird. */</div><div class='del'>-	</div><div class='del'>-	if (!strcmp (mechanism, "CRAM-MD5"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_CRAM_MD5_TYPE);</div><div class='del'>-	else if (!strcmp (mechanism, "DIGEST-MD5"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_DIGEST_MD5_TYPE);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	else if (!strcmp (mechanism, "KERBEROS_V4"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_KERBEROS4_TYPE);</div><div class='del'>-#endif</div><div class='del'>-	else if (!strcmp (mechanism, "PLAIN"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_PLAIN_TYPE);</div><div class='del'>-	else if (!strcmp (mechanism, "LOGIN"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_LOGIN_TYPE);</div><div class='del'>-	else if (!strcmp (mechanism, "POPB4SMTP"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_POPB4SMTP_TYPE);</div><div class='del'>-	else if (!strcmp (mechanism, "NTLM"))</div><div class='del'>-		sasl = (CamelSasl *)camel_object_new (CAMEL_SASL_NTLM_TYPE);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	sasl-&gt;service_name = g_strdup (service_name);</div><div class='del'>-	sasl-&gt;service = service;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (service));</div><div class='del'>-	</div><div class='del'>-	return sasl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_authtype_list:</div><div class='del'>- * @include_plain: whether or not to include the PLAIN mechanism</div><div class='del'>- *</div><div class='del'>- * Return value: a GList of SASL-supported authtypes. The caller must</div><div class='del'>- * free the list, but not the contents.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-camel_sasl_authtype_list (gboolean include_plain)</div><div class='del'>-{</div><div class='del'>-	GList *types = NULL;</div><div class='del'>-	</div><div class='del'>-	types = g_list_prepend (types, &amp;camel_sasl_cram_md5_authtype);</div><div class='del'>-	types = g_list_prepend (types, &amp;camel_sasl_digest_md5_authtype);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	types = g_list_prepend (types, &amp;camel_sasl_kerberos4_authtype);</div><div class='del'>-#endif</div><div class='del'>-	types = g_list_prepend (types, &amp;camel_sasl_ntlm_authtype);</div><div class='del'>-	if (include_plain)</div><div class='del'>-		types = g_list_prepend (types, &amp;camel_sasl_plain_authtype);</div><div class='del'>-	</div><div class='del'>-	return types;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_sasl_authtype:</div><div class='del'>- * @mechanism: the SASL mechanism to get an authtype for</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelServiceAuthType for the given mechanism, if</div><div class='del'>- * it is supported.</div><div class='del'>- **/</div><div class='del'>-CamelServiceAuthType *</div><div class='del'>-camel_sasl_authtype (const char *mechanism)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp (mechanism, "CRAM-MD5"))</div><div class='del'>-		return &amp;camel_sasl_cram_md5_authtype;</div><div class='del'>-	else if (!strcmp (mechanism, "DIGEST-MD5"))</div><div class='del'>-		return &amp;camel_sasl_digest_md5_authtype;</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	else if (!strcmp (mechanism, "KERBEROS_V4"))</div><div class='del'>-		return &amp;camel_sasl_kerberos4_authtype;</div><div class='del'>-#endif</div><div class='del'>-	else if (!strcmp (mechanism, "PLAIN"))</div><div class='del'>-		return &amp;camel_sasl_plain_authtype;</div><div class='del'>-	else if (!strcmp (mechanism, "LOGIN"))</div><div class='del'>-		return &amp;camel_sasl_login_authtype;</div><div class='del'>-	else if (!strcmp(mechanism, "POPB4SMTP"))</div><div class='del'>-		return &amp;camel_sasl_popb4smtp_authtype;</div><div class='del'>-	else if (!strcmp (mechanism, "NTLM"))</div><div class='del'>-		return &amp;camel_sasl_ntlm_authtype;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h<br/>deleted file mode 100644<br/>index 38b9a8f02b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-sasl.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-sasl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SASL_H</div><div class='del'>-#define CAMEL_SASL_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SASL_TYPE     (camel_sasl_get_type ())</div><div class='del'>-#define CAMEL_SASL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SASL_TYPE, CamelSasl))</div><div class='del'>-#define CAMEL_SASL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_TYPE, CamelSaslClass))</div><div class='del'>-#define CAMEL_IS_SASL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SASL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSasl {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	</div><div class='del'>-	char *service_name;</div><div class='del'>-	CamelService *service;</div><div class='del'>-	gboolean authenticated;</div><div class='del'>-} CamelSasl;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSaslClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	GByteArray *    (*challenge)   (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-} CamelSaslClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType  camel_sasl_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-GByteArray *camel_sasl_challenge        (CamelSasl *sasl, GByteArray *token, CamelException *ex);</div><div class='del'>-char       *camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex);</div><div class='del'>-</div><div class='del'>-gboolean    camel_sasl_authenticated    (CamelSasl *sasl);</div><div class='del'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-CamelSasl  *camel_sasl_new              (const char *service_name, const char *mechanism, CamelService *service);</div><div class='del'>-</div><div class='del'>-GList                *camel_sasl_authtype_list (gboolean include_plain);</div><div class='del'>-CamelServiceAuthType *camel_sasl_authtype      (const char *mechanism);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SASL_H */</div><div class='head'>diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c<br/>deleted file mode 100644<br/>index 7e8553cd35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-search-private.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-search-private.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,648 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *	     Michael Zucchi &lt;NotZed@Ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *  Copyright 2001 Ximian Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* (from glibc headers:</div><div class='del'>-   POSIX says that &lt;sys/types.h&gt; must be included (by the caller) before &lt;regex.h&gt;.  */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#include "camel-search-private.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* builds the regex into pattern */</div><div class='del'>-/* taken from camel-folder-search, with added isregex &amp; exception parameter */</div><div class='del'>-/* Basically, we build a new regex, either based on subset regex's, or substrings,</div><div class='del'>-   that can be executed once over the whoel body, to match anything suitable.</div><div class='del'>-   This is more efficient than multiple searches, and probably most (naive) strstr</div><div class='del'>-   implementations, over long content.</div><div class='del'>-</div><div class='del'>-   A small issue is that case-insenstivity wont work entirely correct for utf8 strings. */</div><div class='del'>-int</div><div class='del'>-camel_search_build_match_regex (regex_t *pattern, camel_search_flags_t type, int argc,</div><div class='del'>-				struct _ESExpResult **argv, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GString *match = g_string_new("");</div><div class='del'>-	int c, i, count=0, err;</div><div class='del'>-	char *word;</div><div class='del'>-	int flags;</div><div class='del'>-	</div><div class='del'>-	/* build a regex pattern we can use to match the words, we OR them together */</div><div class='del'>-	if (argc&gt;1)</div><div class='del'>-		g_string_append_c (match, '(');</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			if (count &gt; 0)</div><div class='del'>-				g_string_append_c (match, '|');</div><div class='del'>-			</div><div class='del'>-			word = argv[i]-&gt;value.string;</div><div class='del'>-			if (type &amp; CAMEL_SEARCH_MATCH_REGEX) {</div><div class='del'>-				/* no need to escape because this should already be a valid regex */</div><div class='del'>-				g_string_append (match, word);</div><div class='del'>-			} else {</div><div class='del'>-				/* escape any special chars (not sure if this list is complete) */</div><div class='del'>-				if (type &amp; CAMEL_SEARCH_MATCH_START)</div><div class='del'>-					g_string_append_c (match, '^');</div><div class='del'>-				while ((c = *word++)) {</div><div class='del'>-					if (strchr ("*\\.()[]^$+", c) != NULL) {</div><div class='del'>-						g_string_append_c (match, '\\');</div><div class='del'>-					}</div><div class='del'>-					g_string_append_c (match, c);</div><div class='del'>-				}</div><div class='del'>-				if (type &amp; CAMEL_SEARCH_MATCH_END)</div><div class='del'>-					g_string_append_c (match, '^');</div><div class='del'>-			}</div><div class='del'>-			count++;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Invalid type passed to body-contains match function");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (argc &gt; 1)</div><div class='del'>-		g_string_append_c (match, ')');</div><div class='del'>-	flags = REG_EXTENDED|REG_NOSUB;</div><div class='del'>-	if (type &amp; CAMEL_SEARCH_MATCH_ICASE)</div><div class='del'>-		flags |= REG_ICASE;</div><div class='del'>-	if (type &amp; CAMEL_SEARCH_MATCH_NEWLINE)</div><div class='del'>-		flags |= REG_NEWLINE;</div><div class='del'>-	err = regcomp (pattern, match-&gt;str, flags);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		/* regerror gets called twice to get the full error string </div><div class='del'>-		   length to do proper posix error reporting */</div><div class='del'>-		int len = regerror (err, pattern, 0, 0);</div><div class='del'>-		char *buffer = g_malloc0 (len + 1);</div><div class='del'>-		</div><div class='del'>-		regerror (err, pattern, buffer, len);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Regular expression compilation failed: %s: %s"),</div><div class='del'>-				      match-&gt;str, buffer);</div><div class='del'>-		</div><div class='del'>-		regfree (pattern);</div><div class='del'>-	}</div><div class='del'>-	d(printf("Built regex: '%s'\n", match-&gt;str));</div><div class='del'>-	g_string_free (match, TRUE);</div><div class='del'>-	</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static unsigned char soundex_table[256] = {</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,</div><div class='del'>-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0, 49, 50, 51,  0, 49, 50,  0,  0, 50, 50, 52, 53, 53,  0,</div><div class='del'>-	 49, 50, 54, 50, 51,  0, 49,  0, 50,  0, 50,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-soundexify (const gchar *sound, gchar code[5])</div><div class='del'>-{</div><div class='del'>-	guchar *c, last = '\0';</div><div class='del'>-	gint n;</div><div class='del'>-	</div><div class='del'>-	for (c = (guchar *) sound; *c &amp;&amp; !isalpha (*c); c++);</div><div class='del'>-	code[0] = toupper (*c);</div><div class='del'>-	memset (code + 1, '0', 3);</div><div class='del'>-	for (n = 1; *c &amp;&amp; n &lt; 5; c++) {</div><div class='del'>-		guchar ch = soundex_table[*c];</div><div class='del'>-		</div><div class='del'>-		if (ch &amp;&amp; ch != last) {</div><div class='del'>-			code[n++] = ch;</div><div class='del'>-			last = ch;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	code[4] = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-header_soundex (const char *header, const char *match)</div><div class='del'>-{</div><div class='del'>-	char mcode[5], hcode[5];</div><div class='del'>-	const char *p;</div><div class='del'>-	char c;</div><div class='del'>-	GString *word;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-	</div><div class='del'>-	soundexify (match, mcode);</div><div class='del'>-	</div><div class='del'>-	/* split the header into words, and soundexify and compare each one */</div><div class='del'>-	/* FIXME: Should this convert to utf8, and split based on that, and what not?</div><div class='del'>-	   soundex only makes sense for us-ascii though ... */</div><div class='del'>-	</div><div class='del'>-	word = g_string_new("");</div><div class='del'>-	p = header;</div><div class='del'>-	do {</div><div class='del'>-		c = *p++;</div><div class='del'>-		if (c == 0 || isspace (c)) {</div><div class='del'>-			if (word-&gt;len &gt; 0) {</div><div class='del'>-				soundexify (word-&gt;str, hcode);</div><div class='del'>-				if (strcmp (hcode, mcode) == 0)</div><div class='del'>-					truth = TRUE;</div><div class='del'>-			}</div><div class='del'>-			g_string_truncate (word, 0);</div><div class='del'>-		} else if (isalpha (c))</div><div class='del'>-			g_string_append_c (word, c);</div><div class='del'>-	} while (c &amp;&amp; !truth);</div><div class='del'>-	g_string_free (word, TRUE);</div><div class='del'>-	</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: This is stupidly slow and needs to be removed */</div><div class='del'>-static gunichar</div><div class='del'>-utf8_get (const char **inp)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *p = *inp;</div><div class='del'>-	gunichar c;</div><div class='del'>-</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	c = g_utf8_get_char (p);</div><div class='del'>-	*inp = g_unichar_validate (c) ? g_utf8_next_char (p) : NULL;</div><div class='del'>-	</div><div class='del'>-	return c;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_ustrstrcase (const char *haystack, const char *needle)</div><div class='del'>-{</div><div class='del'>-	gunichar *nuni, *puni;</div><div class='del'>-	gunichar u;</div><div class='del'>-	const char *p;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (haystack != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (needle != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	if (strlen (needle) == 0)</div><div class='del'>-		return haystack;</div><div class='del'>-	if (strlen (haystack) == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	puni = nuni = alloca (sizeof (gunichar) * strlen (needle));</div><div class='del'>-	</div><div class='del'>-	p = needle;</div><div class='del'>-	while ((u = utf8_get (&amp;p)))</div><div class='del'>-		*puni++ = g_unichar_tolower (u);</div><div class='del'>-	</div><div class='del'>-	/* NULL means there was illegal utf-8 sequence */</div><div class='del'>-	if (!p)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	p = haystack;</div><div class='del'>-	while ((u = utf8_get (&amp;p))) {</div><div class='del'>-		gunichar c;</div><div class='del'>-		</div><div class='del'>-		c = g_unichar_tolower (u);</div><div class='del'>-		/* We have valid stripped char */</div><div class='del'>-		if (c == nuni[0]) {</div><div class='del'>-			const gchar *q = p;</div><div class='del'>-			gint npos = 1;</div><div class='del'>-			</div><div class='del'>-			while (nuni + npos &lt; puni) {</div><div class='del'>-				u = utf8_get (&amp;q);</div><div class='del'>-				if (!q || !u)</div><div class='del'>-					return NULL;</div><div class='del'>-				</div><div class='del'>-				c = g_unichar_tolower (u);				</div><div class='del'>-				if (c != nuni[npos])</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				npos++;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (nuni + npos == puni)</div><div class='del'>-				return p;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START {   \</div><div class='del'>-	if ((x) == (z)) {                              \</div><div class='del'>-		if ((y) == (z))                        \</div><div class='del'>-			return 0;                      \</div><div class='del'>-		else                                   \</div><div class='del'>-			return -1;                     \</div><div class='del'>-	} else if ((y) == (z))                         \</div><div class='del'>-		return 1;                              \</div><div class='del'>-} G_STMT_END</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_ustrcasecmp (const char *s1, const char *s2)</div><div class='del'>-{</div><div class='del'>-	gunichar u1, u2 = 0;</div><div class='del'>-	</div><div class='del'>-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);</div><div class='del'>-	</div><div class='del'>-	u1 = utf8_get (&amp;s1);</div><div class='del'>-	u2 = utf8_get (&amp;s2);</div><div class='del'>-	while (u1 &amp;&amp; u2) {</div><div class='del'>-		u1 = g_unichar_tolower (u1);</div><div class='del'>-		u2 = g_unichar_tolower (u2);</div><div class='del'>-		if (u1 &lt; u2)</div><div class='del'>-			return -1;</div><div class='del'>-		else if (u1 &gt; u2)</div><div class='del'>-			return 1;</div><div class='del'>-		</div><div class='del'>-		u1 = utf8_get (&amp;s1);</div><div class='del'>-		u2 = utf8_get (&amp;s2);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* end of one of the strings ? */</div><div class='del'>-	CAMEL_SEARCH_COMPARE (u1, u2, 0);</div><div class='del'>-	</div><div class='del'>-	/* if we have invalid utf8 sequence ?  */</div><div class='del'>-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_ustrncasecmp (const char *s1, const char *s2, size_t len)</div><div class='del'>-{</div><div class='del'>-	gunichar u1, u2 = 0;</div><div class='del'>-	</div><div class='del'>-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);</div><div class='del'>-	</div><div class='del'>-	u1 = utf8_get (&amp;s1);</div><div class='del'>-	u2 = utf8_get (&amp;s2);</div><div class='del'>-	while (len &gt; 0 &amp;&amp; u1 &amp;&amp; u2) {</div><div class='del'>-		u1 = g_unichar_tolower (u1);</div><div class='del'>-		u2 = g_unichar_tolower (u2);</div><div class='del'>-		if (u1 &lt; u2)</div><div class='del'>-			return -1;</div><div class='del'>-		else if (u1 &gt; u2)</div><div class='del'>-			return 1;</div><div class='del'>-		</div><div class='del'>-		len--;</div><div class='del'>-		u1 = utf8_get (&amp;s1);</div><div class='del'>-		u2 = utf8_get (&amp;s2);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	/* end of one of the strings ? */</div><div class='del'>-	CAMEL_SEARCH_COMPARE (u1, u2, 0);</div><div class='del'>-	</div><div class='del'>-	/* if we have invalid utf8 sequence ?  */</div><div class='del'>-	CAMEL_SEARCH_COMPARE (s1, s2, NULL);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* value is the match value suitable for exact match if required */</div><div class='del'>-static int</div><div class='del'>-header_match(const char *value, const char *match, camel_search_match_t how)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	int vlen, mlen;</div><div class='del'>-	</div><div class='del'>-	if (how == CAMEL_SEARCH_MATCH_SOUNDEX)</div><div class='del'>-		return header_soundex (value, match);</div><div class='del'>-</div><div class='del'>-	vlen = strlen(value);</div><div class='del'>-	mlen = strlen(match);</div><div class='del'>-	if (vlen &lt; mlen)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* from dan the man, if we have mixed case, perform a case-sensitive match,</div><div class='del'>-	   otherwise not */</div><div class='del'>-	p = match;</div><div class='del'>-	while (*p) {</div><div class='del'>-		if (isupper(*p)) {</div><div class='del'>-			switch (how) {</div><div class='del'>-			case CAMEL_SEARCH_MATCH_EXACT:</div><div class='del'>-				return strcmp(value, match) == 0;</div><div class='del'>-			case CAMEL_SEARCH_MATCH_CONTAINS:</div><div class='del'>-				return strstr(value, match) != NULL;</div><div class='del'>-			case CAMEL_SEARCH_MATCH_STARTS:</div><div class='del'>-				return strncmp(value, match, mlen) == 0;</div><div class='del'>-			case CAMEL_SEARCH_MATCH_ENDS:</div><div class='del'>-				return strcmp(value + vlen - mlen, match) == 0;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (how) {</div><div class='del'>-	case CAMEL_SEARCH_MATCH_EXACT:</div><div class='del'>-		return camel_ustrcasecmp(value, match) == 0;</div><div class='del'>-	case CAMEL_SEARCH_MATCH_CONTAINS:</div><div class='del'>-		return camel_ustrstrcase(value, match) != NULL;</div><div class='del'>-	case CAMEL_SEARCH_MATCH_STARTS:</div><div class='del'>-		return camel_ustrncasecmp(value, match, mlen) == 0;</div><div class='del'>-	case CAMEL_SEARCH_MATCH_ENDS:</div><div class='del'>-		return camel_ustrcasecmp(value + vlen - mlen, match) == 0;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* searhces for match inside value, if match is mixed case, hten use case-sensitive,</div><div class='del'>-   else insensitive */</div><div class='del'>-gboolean</div><div class='del'>-camel_search_header_match (const char *value, const char *match, camel_search_match_t how, camel_search_t type, const char *default_charset)</div><div class='del'>-{</div><div class='del'>-	const char *name, *addr;</div><div class='del'>-	int truth = FALSE, i;</div><div class='del'>-	CamelInternetAddress *cia;</div><div class='del'>-	char *v, *vdom, *mdom;</div><div class='del'>-</div><div class='del'>-	while (*value &amp;&amp; isspace (*value))</div><div class='del'>-		value++;</div><div class='del'>-	</div><div class='del'>-	switch(type) {</div><div class='del'>-	case CAMEL_SEARCH_TYPE_ENCODED:</div><div class='del'>-		v = header_decode_string(value, default_charset); /* FIXME: Find header charset */</div><div class='del'>-		truth = header_match(v, match, how);</div><div class='del'>-		g_free(v);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_SEARCH_TYPE_MLIST:</div><div class='del'>-		/* Special mailing list old-version domain hack</div><div class='del'>-		   If one of the mailing list names doesn't have an @ in it, its old-style, so</div><div class='del'>-		   only match against the pre-domain part, which should be common */</div><div class='del'>-</div><div class='del'>-		vdom = strchr(value, '@');</div><div class='del'>-		mdom = strchr(match, '@');</div><div class='del'>-		if (mdom == NULL &amp;&amp; vdom != NULL) {</div><div class='del'>-			v = alloca(vdom-value+1);</div><div class='del'>-			memcpy(v, value, vdom-value);</div><div class='del'>-			v[vdom-value] = 0;</div><div class='del'>-			value = (char *)v;</div><div class='del'>-		} else if (mdom != NULL &amp;&amp; vdom == NULL) {</div><div class='del'>-			v = alloca(mdom-match+1);</div><div class='del'>-			memcpy(v, match, mdom-match);</div><div class='del'>-			v[mdom-match] = 0;</div><div class='del'>-			match = (char *)v;</div><div class='del'>-		}</div><div class='del'>-		/* Falls through */</div><div class='del'>-	case CAMEL_SEARCH_TYPE_ASIS:</div><div class='del'>-		truth = header_match(value, match, how);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_SEARCH_TYPE_ADDRESS_ENCODED:</div><div class='del'>-	case CAMEL_SEARCH_TYPE_ADDRESS:</div><div class='del'>-		/* possible simple case to save some work if we can */</div><div class='del'>-		if (header_match(value, match, how))</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		/* Now we decode any addresses, and try asis matches on name and address parts */</div><div class='del'>-		cia = camel_internet_address_new();</div><div class='del'>-		if (type == CAMEL_SEARCH_TYPE_ADDRESS_ENCODED)</div><div class='del'>-			camel_address_decode((CamelAddress *)cia, value);</div><div class='del'>-		else</div><div class='del'>-			camel_address_unformat((CamelAddress *)cia, value);</div><div class='del'>-</div><div class='del'>-		for (i=0; !truth &amp;&amp; camel_internet_address_get(cia, i, &amp;name, &amp;addr);i++)</div><div class='del'>-			truth = (name &amp;&amp; header_match(name, match, how)) || (addr &amp;&amp; header_match(addr, match, how));</div><div class='del'>-</div><div class='del'>-		camel_object_unref((CamelObject *)cia);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* performs a 'slow' content-based match */</div><div class='del'>-/* there is also an identical copy of this in camel-filter-search.c */</div><div class='del'>-gboolean</div><div class='del'>-camel_search_message_body_contains (CamelDataWrapper *object, regex_t *pattern)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *containee;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-	int parts, i;</div><div class='del'>-	</div><div class='del'>-	containee = camel_medium_get_content_object (CAMEL_MEDIUM (object));</div><div class='del'>-	</div><div class='del'>-	if (containee == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* using the object types is more accurate than using the mime/types */</div><div class='del'>-	if (CAMEL_IS_MULTIPART (containee)) {</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));</div><div class='del'>-		for (i = 0; i &lt; parts &amp;&amp; truth == FALSE; i++) {</div><div class='del'>-			CamelDataWrapper *part = (CamelDataWrapper *)camel_multipart_get_part (CAMEL_MULTIPART (containee), i);</div><div class='del'>-			if (part)</div><div class='del'>-				truth = camel_search_message_body_contains (part, pattern);</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {</div><div class='del'>-		/* for messages we only look at its contents */</div><div class='del'>-		truth = camel_search_message_body_contains ((CamelDataWrapper *)containee, pattern);</div><div class='del'>-	} else if (header_content_type_is(CAMEL_DATA_WRAPPER (containee)-&gt;mime_type, "text", "*")) {</div><div class='del'>-		/* for all other text parts, we look inside, otherwise we dont care */</div><div class='del'>-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new ();</div><div class='del'>-		</div><div class='del'>-		camel_data_wrapper_write_to_stream (containee, CAMEL_STREAM (mem));</div><div class='del'>-		camel_stream_write (CAMEL_STREAM (mem), "", 1);</div><div class='del'>-		truth = regexec (pattern, mem-&gt;buffer-&gt;data, 0, NULL, 0) == 0;</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (mem));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static __inline__ guint32</div><div class='del'>-camel_utf8_getc(const unsigned char **ptr)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *p = (unsigned char *)*ptr;</div><div class='del'>-	register unsigned char c, r;</div><div class='del'>-	register guint32 v=0, /* this is only required because the stupid @@@%#%# compiler thinks it can be used uninitialised */</div><div class='del'>-		m;</div><div class='del'>-</div><div class='del'>-	r = *p++;</div><div class='del'>-loop:</div><div class='del'>-	if (r &lt; 0x80) {</div><div class='del'>-		*ptr = p;</div><div class='del'>-		v = r;</div><div class='del'>-	} else if (r &lt; 0xfe) { /* valid start char? */</div><div class='del'>-		v = r;</div><div class='del'>-		m = 0x7f80;	/* used to mask out the length bits */</div><div class='del'>-		do {</div><div class='del'>-			c = *p++;</div><div class='del'>-			if ((c &amp; 0xc0) != 0x80) {</div><div class='del'>-				r = c;</div><div class='del'>-				goto loop;</div><div class='del'>-			}</div><div class='del'>-			v = (v&lt;&lt;6) | (c &amp; 0x3f);</div><div class='del'>-			r&lt;&lt;=1;</div><div class='del'>-			m&lt;&lt;=5;</div><div class='del'>-		} while (r &amp; 0x40);</div><div class='del'>-		</div><div class='del'>-		*ptr = p;</div><div class='del'>-</div><div class='del'>-		v &amp;= ~m;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _camel_search_words *</div><div class='del'>-camel_search_words_split(const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	int type = CAMEL_SEARCH_WORD_SIMPLE, all = 0;</div><div class='del'>-	GString *w;</div><div class='del'>-	struct _camel_search_word *word;</div><div class='del'>-	struct _camel_search_words *words;</div><div class='del'>-	GPtrArray *list = g_ptr_array_new();</div><div class='del'>-	guint32 c;</div><div class='del'>-	int utf8len;</div><div class='del'>-	char utf8[8];</div><div class='del'>-</div><div class='del'>-	words = g_malloc0(sizeof(*words));	</div><div class='del'>-	w = g_string_new("");</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		c = camel_utf8_getc(&amp;in);</div><div class='del'>-		if (c == 0 || g_unichar_isspace(c)) {</div><div class='del'>-			if (w-&gt;len) {</div><div class='del'>-				word = g_malloc0(sizeof(*word));</div><div class='del'>-				word-&gt;word = g_strdup(w-&gt;str);</div><div class='del'>-				word-&gt;type = type;</div><div class='del'>-				g_ptr_array_add(list, word);</div><div class='del'>-				all |= type;</div><div class='del'>-				type = CAMEL_SEARCH_WORD_SIMPLE;</div><div class='del'>-				g_string_truncate(w, 0);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (!g_unichar_isalnum(c))</div><div class='del'>-				type = CAMEL_SEARCH_WORD_COMPLEX;</div><div class='del'>-			else</div><div class='del'>-				c = g_unichar_tolower(c);</div><div class='del'>-			if (c &gt; 0x80)</div><div class='del'>-				type |= CAMEL_SEARCH_WORD_8BIT;</div><div class='del'>-</div><div class='del'>-			utf8len = g_unichar_to_utf8(c, utf8);</div><div class='del'>-			utf8[utf8len] = 0;</div><div class='del'>-			g_string_append(w, utf8);</div><div class='del'>-		}</div><div class='del'>-	} while (c);</div><div class='del'>-</div><div class='del'>-	g_string_free(w, TRUE);</div><div class='del'>-	words-&gt;len = list-&gt;len;</div><div class='del'>-	words-&gt;words = (struct _camel_search_word **)list-&gt;pdata;</div><div class='del'>-	words-&gt;type = all;</div><div class='del'>-	g_ptr_array_free(list, FALSE);</div><div class='del'>-</div><div class='del'>-	return words;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* takes an existing 'words' list, and converts it to another consisting of</div><div class='del'>-   only simple words, with any punctuation etc stripped */</div><div class='del'>-struct _camel_search_words *</div><div class='del'>-camel_search_words_simple(struct _camel_search_words *wordin)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	const unsigned char *ptr, *start, *last;</div><div class='del'>-	int type = CAMEL_SEARCH_WORD_SIMPLE, all = 0;</div><div class='del'>-	GPtrArray *list = g_ptr_array_new();</div><div class='del'>-	struct _camel_search_word *word;</div><div class='del'>-	struct _camel_search_words *words;</div><div class='del'>-	guint32 c;</div><div class='del'>-</div><div class='del'>-	words = g_malloc0(sizeof(*words));	</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;wordin-&gt;len;i++) {</div><div class='del'>-		if ((wordin-&gt;words[i]-&gt;type &amp; CAMEL_SEARCH_WORD_COMPLEX) == 0) {</div><div class='del'>-			word = g_malloc0(sizeof(*word));</div><div class='del'>-			word-&gt;type = wordin-&gt;words[i]-&gt;type;</div><div class='del'>-			word-&gt;word = g_strdup(wordin-&gt;words[i]-&gt;word);</div><div class='del'>-			g_ptr_array_add(list, word);</div><div class='del'>-		} else {</div><div class='del'>-			ptr = wordin-&gt;words[i]-&gt;word;</div><div class='del'>-			start = last = ptr;</div><div class='del'>-			do {</div><div class='del'>-				c = camel_utf8_getc(&amp;ptr);</div><div class='del'>-				if (c == 0 || !g_unichar_isalnum(c)) {</div><div class='del'>-					if (last &gt; start) {</div><div class='del'>-						word = g_malloc0(sizeof(*word));</div><div class='del'>-						word-&gt;word = g_strndup(start, last-start);</div><div class='del'>-						word-&gt;type = type;</div><div class='del'>-						g_ptr_array_add(list, word);</div><div class='del'>-						all |= type;</div><div class='del'>-						type = CAMEL_SEARCH_WORD_SIMPLE;</div><div class='del'>-					}</div><div class='del'>-					start = ptr;</div><div class='del'>-				}</div><div class='del'>-				if (c &gt; 0x80)</div><div class='del'>-					type = CAMEL_SEARCH_WORD_8BIT;</div><div class='del'>-				last = ptr;</div><div class='del'>-			} while (c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	words-&gt;len = list-&gt;len;</div><div class='del'>-	words-&gt;words = (struct _camel_search_word **)list-&gt;pdata;</div><div class='del'>-	words-&gt;type = all;</div><div class='del'>-	g_ptr_array_free(list, FALSE);</div><div class='del'>-</div><div class='del'>-	return words;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_search_words_free(struct _camel_search_words *words)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;words-&gt;len;i++) {</div><div class='del'>-		struct _camel_search_word *word = words-&gt;words[i];</div><div class='del'>-</div><div class='del'>-		g_free(word-&gt;word);</div><div class='del'>-		g_free(word);</div><div class='del'>-	}</div><div class='del'>-	g_free(words-&gt;words);</div><div class='del'>-	g_free(words);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h<br/>deleted file mode 100644<br/>index 7cc30b687f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-search-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-search-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_SEARCH_PRIVATE_H</div><div class='del'>-#define _CAMEL_SEARCH_PRIVATE_H</div><div class='del'>-</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SEARCH_MATCH_START = 1&lt;&lt;0,</div><div class='del'>-	CAMEL_SEARCH_MATCH_END = 1&lt;&lt;1,</div><div class='del'>-	CAMEL_SEARCH_MATCH_REGEX = 1&lt;&lt;2, /* disables the first 2 */</div><div class='del'>-	CAMEL_SEARCH_MATCH_ICASE = 1&lt;&lt;3,</div><div class='del'>-	CAMEL_SEARCH_MATCH_NEWLINE = 1&lt;&lt;4,</div><div class='del'>-} camel_search_flags_t;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SEARCH_MATCH_EXACT,</div><div class='del'>-	CAMEL_SEARCH_MATCH_CONTAINS,</div><div class='del'>-	CAMEL_SEARCH_MATCH_STARTS,</div><div class='del'>-	CAMEL_SEARCH_MATCH_ENDS,</div><div class='del'>-	CAMEL_SEARCH_MATCH_SOUNDEX,</div><div class='del'>-} camel_search_match_t;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SEARCH_TYPE_ASIS,</div><div class='del'>-	CAMEL_SEARCH_TYPE_ENCODED,</div><div class='del'>-	CAMEL_SEARCH_TYPE_ADDRESS,</div><div class='del'>-	CAMEL_SEARCH_TYPE_ADDRESS_ENCODED,</div><div class='del'>-	CAMEL_SEARCH_TYPE_MLIST, /* its a mailing list pseudo-header */</div><div class='del'>-} camel_search_t;</div><div class='del'>-</div><div class='del'>-/* builds a regex that represents a string search */</div><div class='del'>-int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, struct _ESExpResult **argv, CamelException *ex);</div><div class='del'>-gboolean camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern);</div><div class='del'>-</div><div class='del'>-gboolean camel_search_header_match(const char *value, const char *match, camel_search_match_t how, camel_search_t type, const char *default_charset);</div><div class='del'>-gboolean camel_search_header_soundex(const char *header, const char *match);</div><div class='del'>-</div><div class='del'>-/* TODO: replace with a real search function */</div><div class='del'>-const char *camel_ustrstrcase(const char *haystack, const char *needle);</div><div class='del'>-</div><div class='del'>-/* Some crappy utility functions for handling multiple search words */</div><div class='del'>-enum _camel_search_word_t {</div><div class='del'>-	CAMEL_SEARCH_WORD_SIMPLE = 1,</div><div class='del'>-	CAMEL_SEARCH_WORD_COMPLEX = 2,</div><div class='del'>-	CAMEL_SEARCH_WORD_8BIT = 4,</div><div class='del'>-};</div><div class='del'>-struct _camel_search_word {</div><div class='del'>-	enum _camel_search_word_t type;</div><div class='del'>-	char *word;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _camel_search_words {</div><div class='del'>-	int len;</div><div class='del'>-	enum _camel_search_word_t type;	/* OR of all word types in list */</div><div class='del'>-	struct _camel_search_word **words;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _camel_search_words *camel_search_words_split(const unsigned char *in);</div><div class='del'>-struct _camel_search_words *camel_search_words_simple(struct _camel_search_words *wordin);</div><div class='del'>-void camel_search_words_free(struct _camel_search_words *);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_SEARCH_PRIVATE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c<br/>deleted file mode 100644<br/>index 874d68e40c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-seekable-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,202 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-seekable-stream.h"</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSeekableStream */</div><div class='del'>-#define CSS_CLASS(so) CAMEL_SEEKABLE_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static off_t seek        (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-static off_t stream_tell (CamelSeekableStream *stream);</div><div class='del'>-static int   reset       (CamelStream *stream);</div><div class='del'>-static int   set_bounds  (CamelSeekableStream *stream, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_seekable_stream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_STREAM_TYPE ) );</div><div class='del'>-</div><div class='del'>-	/* seekable stream methods */</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = seek;</div><div class='del'>-	camel_seekable_stream_class-&gt;tell = stream_tell;</div><div class='del'>-	camel_seekable_stream_class-&gt;set_bounds = set_bounds;</div><div class='del'>-</div><div class='del'>-	/* camel stream methods overload */</div><div class='del'>-	camel_stream_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_stream_init (void *o)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *stream = (CamelSeekableStream *)o;</div><div class='del'>-</div><div class='del'>-	stream-&gt;bound_start = 0;</div><div class='del'>-	stream-&gt;bound_end = CAMEL_STREAM_UNBOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_seekable_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_seekable_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_seekable_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_seekable_stream_type = camel_type_register( CAMEL_STREAM_TYPE,</div><div class='del'>-								  "CamelSeekableStream",</div><div class='del'>-								  sizeof( CamelSeekableStream ),</div><div class='del'>-								  sizeof( CamelSeekableStreamClass ),</div><div class='del'>-								  (CamelObjectClassInitFunc) camel_seekable_stream_class_init,</div><div class='del'>-								  NULL,</div><div class='del'>-								  (CamelObjectInitFunc) camel_seekable_stream_init,</div><div class='del'>-								  NULL );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_seekable_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-      CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelSeekableStream::seek called on default "</div><div class='del'>-		   "implementation\n");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_seek:</div><div class='del'>- * @stream: a CamelStream object.</div><div class='del'>- * @offset: offset value</div><div class='del'>- * @policy: what to do with the offset</div><div class='del'>- *</div><div class='del'>- * Seek to the specified position in @stream.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_SET, seeks to @offset.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_CUR, seeks to the current position plus</div><div class='del'>- * @offset.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_END, seeks to the end of the stream plus</div><div class='del'>- * @offset.</div><div class='del'>- *</div><div class='del'>- * Regardless of @policy, the stream's final position will be clamped</div><div class='del'>- * to the range specified by its lower and upper bounds, and the</div><div class='del'>- * stream's eos state will be updated.</div><div class='del'>- *</div><div class='del'>- * Return value: new position, -1 if operation failed.</div><div class='del'>- **/</div><div class='del'>-off_t</div><div class='del'>-camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			    CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;seek (stream, offset, policy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-stream_tell (CamelSeekableStream *stream)</div><div class='del'>-{</div><div class='del'>-	return stream-&gt;position;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_stream_tell:</div><div class='del'>- * @stream: seekable stream object</div><div class='del'>- *</div><div class='del'>- * Get the current position of a seekable stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the position.</div><div class='del'>- **/</div><div class='del'>-off_t</div><div class='del'>-camel_seekable_stream_tell (CamelSeekableStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;tell (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-set_bounds (CamelSeekableStream *stream, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	/* store the bounds */</div><div class='del'>-	stream-&gt;bound_start = start;</div><div class='del'>-	stream-&gt;bound_end = end;</div><div class='del'>-</div><div class='del'>-	if (start &gt; stream-&gt;position)</div><div class='del'>-		return camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_stream_set_bounds:</div><div class='del'>- * @stream: a seekable stream</div><div class='del'>- * @start: the first valid position</div><div class='del'>- * @end: the first invalid position, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Set the range of valid data this stream is allowed to cover.  If</div><div class='del'>- * there is to be no @end value, then @end should be set to</div><div class='del'>- * #CAMEL_STREAM_UNBOUND.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_seekable_stream_set_bounds (CamelSeekableStream *stream,</div><div class='del'>-				  off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (end == CAMEL_STREAM_UNBOUND || end &gt;= start, -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;set_bounds (stream, start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* a default implementation of reset for seekable streams */</div><div class='del'>-static int</div><div class='del'>-reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *seekable_stream;</div><div class='del'>-</div><div class='del'>-	seekable_stream = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-</div><div class='del'>-	return camel_seekable_stream_seek (seekable_stream,</div><div class='del'>-					   seekable_stream-&gt;bound_start,</div><div class='del'>-					   CAMEL_STREAM_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h<br/>deleted file mode 100644<br/>index 9ac73c7ee8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-seekable-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-fs.h :stream based on unix filesystem */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SEEKABLE_STREAM_H</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_TYPE     (camel_seekable_stream_get_type ())</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStream))</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAMEL_STREAM_SET = SEEK_SET,</div><div class='del'>-	CAMEL_STREAM_CUR = SEEK_CUR,</div><div class='del'>-	CAMEL_STREAM_END = SEEK_END</div><div class='del'>-} CamelStreamSeekPolicy;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_UNBOUND (~0)</div><div class='del'>-</div><div class='del'>-struct _CamelSeekableStream</div><div class='del'>-{</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-</div><div class='del'>-	off_t position;		/* current postion in the stream */</div><div class='del'>-	off_t bound_start;	/* first valid position */</div><div class='del'>-	off_t bound_end;	/* first invalid position */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	off_t (*seek)       (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			     CamelStreamSeekPolicy policy);</div><div class='del'>-	off_t (*tell)	    (CamelSeekableStream *stream);</div><div class='del'>-	int  (*set_bounds)  (CamelSeekableStream *stream,</div><div class='del'>-			     off_t start, off_t end);</div><div class='del'>-} CamelSeekableStreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_seekable_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-off_t    camel_seekable_stream_seek            (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-						CamelStreamSeekPolicy policy);</div><div class='del'>-off_t	 camel_seekable_stream_tell    	       (CamelSeekableStream *stream);</div><div class='del'>-int	 camel_seekable_stream_set_bounds      (CamelSeekableStream *, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SEEKABLE_STREAM_H */</div><div class='head'>diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c<br/>deleted file mode 100644<br/>index c51b52b99f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-seekable-substream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,303 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-fs.c : file system based stream</div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-seekable-substream.h"</div><div class='del'>-</div><div class='del'>-static CamelSeekableStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSeekableSubStream */</div><div class='del'>-#define CSS_CLASS(so) CAMEL_SEEKABLE_SUBSTREAM_CLASS (CAMEL_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static	int	 stream_read  (CamelStream *stream, char *buffer, unsigned int n);</div><div class='del'>-static	int	 stream_write (CamelStream *stream, const char *buffer, unsigned int n);</div><div class='del'>-static	int	 stream_flush (CamelStream *stream);</div><div class='del'>-static	int	 stream_close (CamelStream *stream);</div><div class='del'>-static	gboolean eos	      (CamelStream *stream);</div><div class='del'>-static	off_t	 stream_seek  (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			       CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_substream_class_init (CamelSeekableSubstreamClass *camel_seekable_substream_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_seekable_substream_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_seekable_substream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;eos = eos;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_substream_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream =</div><div class='del'>-		CAMEL_SEEKABLE_SUBSTREAM (object);</div><div class='del'>-</div><div class='del'>-	if (seekable_substream-&gt;parent_stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (seekable_substream-&gt;parent_stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_seekable_substream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_seekable_substream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_seekable_substream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_seekable_substream_type = camel_type_register (camel_seekable_stream_get_type (), "CamelSeekableSubstream",</div><div class='del'>-								     sizeof (CamelSeekableSubstream),</div><div class='del'>-								     sizeof (CamelSeekableSubstreamClass),</div><div class='del'>-								     (CamelObjectClassInitFunc) camel_seekable_substream_class_init,</div><div class='del'>-								     NULL,</div><div class='del'>-								     NULL,</div><div class='del'>-								     (CamelObjectFinalizeFunc) camel_seekable_substream_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_seekable_substream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_substream_new_with_seekable_stream_and_bounds:</div><div class='del'>- * @parent_stream: a seekable parent stream</div><div class='del'>- * @inf_bound: a lower bound</div><div class='del'>- * @sup_bound: an upper bound</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelSeekableSubstream that references the portion</div><div class='del'>- * of @parent_stream from @inf_bound to @sup_bound. (If @sup_bound is</div><div class='del'>- * #CAMEL_STREAM_UNBOUND, it references to the end of stream, even if</div><div class='del'>- * the stream grows.)</div><div class='del'>- *</div><div class='del'>- * While the substream is open, the caller cannot assume anything about</div><div class='del'>- * the current position of @parent_stream. After the substream has been</div><div class='del'>- * closed, @parent_stream will stabilize again.</div><div class='del'>- *</div><div class='del'>- * Return value: the substream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream,</div><div class='del'>-							      off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (parent_stream), NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the seekable substream. */</div><div class='del'>-	seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (camel_object_new (camel_seekable_substream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* Initialize it. */</div><div class='del'>-	seekable_substream-&gt;parent_stream = parent_stream;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (parent_stream));</div><div class='del'>-</div><div class='del'>-	/* Set the bound of the substream. We can ignore any possible error</div><div class='del'>-	 * here, because if we fail to seek now, it will try again later.</div><div class='del'>-	 */</div><div class='del'>-	camel_seekable_stream_set_bounds ((CamelSeekableStream *)seekable_substream, start, end);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (seekable_substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-parent_reset (CamelSeekableSubstream *seekable_substream, CamelSeekableStream *parent)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (seekable_substream);</div><div class='del'>-</div><div class='del'>-	if (camel_seekable_stream_tell (parent) == seekable_stream-&gt;position)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return camel_seekable_stream_seek (parent, seekable_stream-&gt;position, CAMEL_STREAM_SET)	== seekable_stream-&gt;position;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *parent;</div><div class='del'>-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (stream);</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	parent = seekable_substream-&gt;parent_stream;</div><div class='del'>-</div><div class='del'>-	/* Go to our position in the parent stream. */</div><div class='del'>-	if (!parent_reset (seekable_substream, parent)) {</div><div class='del'>-		stream-&gt;eos = TRUE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Compute how many bytes should be read. */</div><div class='del'>-	if (seekable_stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN (seekable_stream-&gt;bound_end -  seekable_stream-&gt;position, n);</div><div class='del'>-</div><div class='del'>-	if (n == 0) {</div><div class='del'>-		stream-&gt;eos = TRUE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	v = camel_stream_read (CAMEL_STREAM (parent), buffer, n);</div><div class='del'>-</div><div class='del'>-	/* ignore &lt;0 - it's an error, let the caller deal */</div><div class='del'>-	if (v &gt; 0)</div><div class='del'>-		seekable_stream-&gt;position += v;</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *parent;</div><div class='del'>-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM(stream);</div><div class='del'>-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(stream);</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	parent = seekable_substream-&gt;parent_stream;</div><div class='del'>-</div><div class='del'>-	/* Go to our position in the parent stream. */</div><div class='del'>-	if (!parent_reset (seekable_substream, parent)) {</div><div class='del'>-		stream-&gt;eos = TRUE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Compute how many bytes should be written. */</div><div class='del'>-	if (seekable_stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN (seekable_stream-&gt;bound_end -  seekable_stream-&gt;position, n);</div><div class='del'>-</div><div class='del'>-	if (n == 0) {</div><div class='del'>-		stream-&gt;eos = TRUE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	v = camel_stream_write((CamelStream *)parent, buffer, n);</div><div class='del'>-</div><div class='del'>-	/* ignore &lt;0 - it's an error, let the caller deal */</div><div class='del'>-	if (v &gt; 0)</div><div class='del'>-		seekable_stream-&gt;position += v;</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)stream;</div><div class='del'>-</div><div class='del'>-	return camel_stream_flush(CAMEL_STREAM(sus-&gt;parent_stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* we dont really want to close the substream ... */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(stream);</div><div class='del'>-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM(stream);</div><div class='del'>-	CamelSeekableStream *parent;</div><div class='del'>-	gboolean eos;</div><div class='del'>-</div><div class='del'>-	if (stream-&gt;eos)</div><div class='del'>-		eos = TRUE;</div><div class='del'>-	else {</div><div class='del'>-		parent = seekable_substream-&gt;parent_stream;</div><div class='del'>-		if (!parent_reset (seekable_substream, parent))</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		eos = camel_stream_eos (CAMEL_STREAM (parent));</div><div class='del'>-		if (!eos &amp;&amp; (seekable_stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)) {</div><div class='del'>-			eos = seekable_stream-&gt;position &gt;= seekable_stream-&gt;bound_end;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return eos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-stream_seek (CamelSeekableStream *seekable_stream, off_t offset,</div><div class='del'>-	     CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream = CAMEL_SEEKABLE_SUBSTREAM(seekable_stream);</div><div class='del'>-	CamelStream *stream = CAMEL_STREAM(seekable_stream);</div><div class='del'>-	off_t real_offset = 0;</div><div class='del'>-</div><div class='del'>-	stream-&gt;eos = FALSE;</div><div class='del'>-</div><div class='del'>-	switch (policy) {</div><div class='del'>-	case CAMEL_STREAM_SET:</div><div class='del'>-		real_offset = offset;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_STREAM_CUR:</div><div class='del'>-		real_offset = seekable_stream-&gt;position + offset;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAMEL_STREAM_END:</div><div class='del'>-		if (seekable_stream-&gt;bound_end == CAMEL_STREAM_UNBOUND) {</div><div class='del'>-			real_offset = camel_seekable_stream_seek(seekable_substream-&gt;parent_stream,</div><div class='del'>-								 offset,</div><div class='del'>-								 CAMEL_STREAM_END);</div><div class='del'>-			if (real_offset != -1) {</div><div class='del'>-				if (real_offset&lt;seekable_stream-&gt;bound_start)</div><div class='del'>-					real_offset = seekable_stream-&gt;bound_start;</div><div class='del'>-				seekable_stream-&gt;position = real_offset;</div><div class='del'>-			}</div><div class='del'>-			return real_offset;</div><div class='del'>-		}</div><div class='del'>-		real_offset = seekable_stream-&gt;bound_end + offset;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (seekable_stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		real_offset = MIN (real_offset, seekable_stream-&gt;bound_end);</div><div class='del'>-</div><div class='del'>-	if (real_offset&lt;seekable_stream-&gt;bound_start)</div><div class='del'>-		real_offset = seekable_stream-&gt;bound_start;</div><div class='del'>-</div><div class='del'>-	seekable_stream-&gt;position = real_offset;</div><div class='del'>-	return real_offset;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h<br/>deleted file mode 100644<br/>index 897342c737..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-seekable-substream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-seekable-substream.h: stream that piggybacks on another stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SEEKABLE_SUBSTREAM_H</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM_TYPE       (camel_seekable_substream_get_type ())</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM(obj)       (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k)   (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o)      (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelSeekableSubstream</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	/*  --**-- Private fields --**--  */</div><div class='del'>-	CamelSeekableStream *parent_stream;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSeekableSubstreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_seekable_substream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* obtain a new seekable substream */</div><div class='del'>-CamelStream *</div><div class='del'>-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream    *parent_stream,</div><div class='del'>-							      off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SEEKABLE_SUBSTREAM_H */</div><div class='head'>diff --git a/camel/camel-service.c b/camel/camel-service.c<br/>deleted file mode 100644<br/>index c704852a7c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-service.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,937 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-service.c : Abstract class for an email service */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-util/e-host-utils.h"</div><div class='del'>-</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelService */</div><div class='del'>-#define CSERV_CLASS(so) CAMEL_SERVICE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session,</div><div class='del'>-		       CamelProvider *provider, CamelURL *url,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-static gboolean service_connect(CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean service_disconnect(CamelService *service, gboolean clean,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-static void cancel_connect (CamelService *service);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static char *get_name (CamelService *service, gboolean brief);</div><div class='del'>-static char *get_path (CamelService *service);</div><div class='del'>-</div><div class='del'>-static int service_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int service_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_service_class_init (CamelServiceClass *camel_service_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *object_class = CAMEL_OBJECT_CLASS (camel_service_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);</div><div class='del'>-	</div><div class='del'>-	/* virtual method overloading */</div><div class='del'>-	object_class-&gt;setv = service_setv;</div><div class='del'>-	object_class-&gt;getv = service_getv;</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	camel_service_class-&gt;connect = service_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = service_disconnect;</div><div class='del'>-	camel_service_class-&gt;cancel_connect = cancel_connect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_service_class-&gt;get_path = get_path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_service_init (void *o, void *k)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = o;</div><div class='del'>-</div><div class='del'>-	service-&gt;priv = g_malloc0(sizeof(*service-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	service-&gt;priv-&gt;connect_lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-	service-&gt;priv-&gt;connect_op_lock = e_mutex_new(E_MUTEX_SIMPLE);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_service_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (object);</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;status == CAMEL_SERVICE_CONNECTED) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		CSERV_CLASS (service)-&gt;disconnect (service, TRUE, &amp;ex);</div><div class='del'>-		if (camel_exception_is_set (&amp;ex)) {</div><div class='del'>-			w(g_warning ("camel_service_finalize: silent disconnect failure: %s",</div><div class='del'>-				     camel_exception_get_description (&amp;ex)));</div><div class='del'>-		}</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;url)</div><div class='del'>-		camel_url_free (service-&gt;url);</div><div class='del'>-	if (service-&gt;session)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (service-&gt;session));</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy (service-&gt;priv-&gt;connect_lock);</div><div class='del'>-	e_mutex_destroy (service-&gt;priv-&gt;connect_op_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (service-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_service_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type =</div><div class='del'>-			camel_type_register (CAMEL_OBJECT_TYPE,</div><div class='del'>-					     "CamelService",</div><div class='del'>-					     sizeof (CamelService),</div><div class='del'>-					     sizeof (CamelServiceClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_service_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_service_init,</div><div class='del'>-					     camel_service_finalize );</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-service_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = (CamelService *) object;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	gboolean reconnect = FALSE;</div><div class='del'>-	guint32 tag;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this arg wasn't already handled */</div><div class='del'>-		if (tag &amp; CAMEL_ARG_IGNORE)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_SERVICE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_SERVICE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (tag == CAMEL_SERVICE_USERNAME) {</div><div class='del'>-			/* set the username */</div><div class='del'>-			if (strcmp (url-&gt;user, args-&gt;argv[i].ca_str) != 0) {</div><div class='del'>-				camel_url_set_user (url, args-&gt;argv[i].ca_str);</div><div class='del'>-				reconnect = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_SERVICE_AUTH) {</div><div class='del'>-			/* set the auth mechanism */</div><div class='del'>-			if (strcmp (url-&gt;authmech, args-&gt;argv[i].ca_str) != 0) {</div><div class='del'>-				camel_url_set_authmech (url, args-&gt;argv[i].ca_str);</div><div class='del'>-				reconnect = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_SERVICE_HOSTNAME) {</div><div class='del'>-			/* set the hostname */</div><div class='del'>-			if (strcmp (url-&gt;host, args-&gt;argv[i].ca_str) != 0) {</div><div class='del'>-				camel_url_set_host (url, args-&gt;argv[i].ca_str);</div><div class='del'>-				reconnect = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_SERVICE_PORT) {</div><div class='del'>-			/* set the port */</div><div class='del'>-			if (url-&gt;port != args-&gt;argv[i].ca_int) {</div><div class='del'>-				camel_url_set_port (url, args-&gt;argv[i].ca_int);</div><div class='del'>-				reconnect = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_SERVICE_PATH) {</div><div class='del'>-			/* set the path */</div><div class='del'>-			if (strcmp (url-&gt;path, args-&gt;argv[i].ca_str) != 0) {</div><div class='del'>-				camel_url_set_host (url, args-&gt;argv[i].ca_str);</div><div class='del'>-				reconnect = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* error? */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* let our parent know that we've handled this arg */</div><div class='del'>-		camel_argv_ignore (args, i);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (reconnect) {</div><div class='del'>-		/* reconnect the service using the new URL */</div><div class='del'>-		if (camel_service_disconnect (service, TRUE, ex))</div><div class='del'>-			camel_service_connect (service, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-service_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = (CamelService *) object;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	guint32 tag;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_SERVICE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_SERVICE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case CAMEL_SERVICE_USERNAME:</div><div class='del'>-			/* get the username */</div><div class='del'>-			*args-&gt;argv[i].ca_str = url-&gt;user;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_SERVICE_AUTH:</div><div class='del'>-			/* get the auth mechanism */</div><div class='del'>-			*args-&gt;argv[i].ca_str = url-&gt;authmech;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_SERVICE_HOSTNAME:</div><div class='del'>-			/* get the hostname */</div><div class='del'>-			*args-&gt;argv[i].ca_str = url-&gt;host;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_SERVICE_PORT:</div><div class='del'>-			/* get the port */</div><div class='del'>-			*args-&gt;argv[i].ca_int = url-&gt;port;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_SERVICE_PATH:</div><div class='del'>-			/* get the path */</div><div class='del'>-			*args-&gt;argv[i].ca_str = url-&gt;path;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* error? */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session,</div><div class='del'>-	   CamelProvider *provider, CamelURL *url, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *url_string;</div><div class='del'>-	</div><div class='del'>-	if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_USER) &amp;&amp;</div><div class='del'>-	    (url-&gt;user == NULL || url-&gt;user[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("URL '%s' needs a username component"),</div><div class='del'>-				      url_string);</div><div class='del'>-		g_free (url_string);</div><div class='del'>-		return;</div><div class='del'>-	} else if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_HOST) &amp;&amp;</div><div class='del'>-		   (url-&gt;host == NULL || url-&gt;host[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("URL '%s' needs a host component"),</div><div class='del'>-				      url_string);</div><div class='del'>-		g_free (url_string);</div><div class='del'>-		return;</div><div class='del'>-	} else if (CAMEL_PROVIDER_NEEDS (provider, CAMEL_URL_PART_PATH) &amp;&amp;</div><div class='del'>-		   (url-&gt;path == NULL || url-&gt;path[0] == '\0')) {</div><div class='del'>-		url_string = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("URL '%s' needs a path component"),</div><div class='del'>-				      url_string);</div><div class='del'>-		g_free (url_string);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	service-&gt;provider = provider;</div><div class='del'>-	service-&gt;url = url;</div><div class='del'>-	service-&gt;session = session;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-	</div><div class='del'>-	service-&gt;status = CAMEL_SERVICE_DISCONNECTED;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_construct:</div><div class='del'>- * @service: the CamelService</div><div class='del'>- * @session: the session for the service</div><div class='del'>- * @provider: the service's provider</div><div class='del'>- * @url: the default URL for the service (may be NULL)</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Constructs a CamelService initialized with the given parameters.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_service_construct (CamelService *service, CamelSession *session,</div><div class='del'>-			 CamelProvider *provider, CamelURL *url,</div><div class='del'>-			 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SERVICE (service));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	</div><div class='del'>-	CSERV_CLASS (service)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-service_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* Things like the CamelMboxStore can validly</div><div class='del'>-	 * not define a connect function.</div><div class='del'>-	 */</div><div class='del'>-	 return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_connect:</div><div class='del'>- * @service: CamelService object</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Connect to the service using the parameters it was initialized</div><div class='del'>- * with.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the connection succeeded</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_service_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gboolean ret = FALSE;</div><div class='del'>-	gboolean unreg = FALSE;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), FALSE);</div><div class='del'>-	g_return_val_if_fail (service-&gt;session != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (service-&gt;url != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_lock);</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;status == CAMEL_SERVICE_CONNECTED) {</div><div class='del'>-		CAMEL_SERVICE_UNLOCK (service, connect_lock);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Register a separate operation for connecting, so that</div><div class='del'>-	 * the offline code can cancel it.</div><div class='del'>-	 */</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_op_lock);</div><div class='del'>-	service-&gt;connect_op = camel_operation_registered ();</div><div class='del'>-	if (!service-&gt;connect_op) {</div><div class='del'>-		service-&gt;connect_op = camel_operation_new (NULL, NULL);</div><div class='del'>-		camel_operation_register (service-&gt;connect_op);</div><div class='del'>-		unreg = TRUE;</div><div class='del'>-	}</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);</div><div class='del'>-</div><div class='del'>-	service-&gt;status = CAMEL_SERVICE_CONNECTING;</div><div class='del'>-	ret = CSERV_CLASS (service)-&gt;connect (service, ex);</div><div class='del'>-	service-&gt;status = ret ? CAMEL_SERVICE_CONNECTED : CAMEL_SERVICE_DISCONNECTED;</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_op_lock);</div><div class='del'>-	if (service-&gt;connect_op) {</div><div class='del'>-		if (unreg)</div><div class='del'>-			camel_operation_unregister (service-&gt;connect_op);</div><div class='del'>-		</div><div class='del'>-		camel_operation_unref (service-&gt;connect_op);</div><div class='del'>-		service-&gt;connect_op = NULL;</div><div class='del'>-	}</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_lock);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-service_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/*service-&gt;connect_level--;*/</div><div class='del'>-</div><div class='del'>-	/* We let people get away with not having a disconnect</div><div class='del'>-	 * function -- CamelMboxStore, for example. </div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_disconnect:</div><div class='del'>- * @service: CamelService object</div><div class='del'>- * @clean: whether or not to try to disconnect cleanly.</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Disconnect from the service. If @clean is %FALSE, it should not</div><div class='del'>- * try to do any synchronizing or other cleanup of the connection.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the disconnection succeeded without</div><div class='del'>- * errors. (Consult @ex if %FALSE.)</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_service_disconnect (CamelService *service, gboolean clean,</div><div class='del'>-			  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gboolean res = TRUE;</div><div class='del'>-	int unreg = FALSE;</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_lock);</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;status != CAMEL_SERVICE_DISCONNECTED</div><div class='del'>-	    &amp;&amp; service-&gt;status != CAMEL_SERVICE_DISCONNECTING) {</div><div class='del'>-		CAMEL_SERVICE_LOCK (service, connect_op_lock);</div><div class='del'>-		service-&gt;connect_op = camel_operation_registered ();</div><div class='del'>-		if (!service-&gt;connect_op) {</div><div class='del'>-			service-&gt;connect_op = camel_operation_new (NULL, NULL);</div><div class='del'>-			camel_operation_register (service-&gt;connect_op);</div><div class='del'>-			unreg = TRUE;</div><div class='del'>-		}</div><div class='del'>-		CAMEL_SERVICE_UNLOCK (service, connect_op_lock);</div><div class='del'>-</div><div class='del'>-		service-&gt;status = CAMEL_SERVICE_DISCONNECTING;</div><div class='del'>-		res = CSERV_CLASS (service)-&gt;disconnect (service, clean, ex);</div><div class='del'>-		service-&gt;status = CAMEL_SERVICE_DISCONNECTED;</div><div class='del'>-</div><div class='del'>-		CAMEL_SERVICE_LOCK (service, connect_op_lock);</div><div class='del'>-		if (unreg)</div><div class='del'>-			camel_operation_unregister (service-&gt;connect_op);</div><div class='del'>-</div><div class='del'>-		camel_operation_unref (service-&gt;connect_op);</div><div class='del'>-		service-&gt;connect_op = NULL;</div><div class='del'>-		CAMEL_SERVICE_UNLOCK (service, connect_op_lock);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_lock);</div><div class='del'>-	</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_connect (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	camel_operation_cancel (service-&gt;connect_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_cancel_connect:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * If @service is currently attempting to connect to or disconnect</div><div class='del'>- * from a server, this causes it to stop and fail. Otherwise it is a</div><div class='del'>- * no-op.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_service_cancel_connect (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_op_lock);</div><div class='del'>-	if (service-&gt;connect_op)</div><div class='del'>-		CSERV_CLASS (service)-&gt;cancel_connect (service);</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_url:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * Returns the URL representing a service. The returned URL must be</div><div class='del'>- * freed when it is no longer needed. For security reasons, this</div><div class='del'>- * routine does not return the password.</div><div class='del'>- *</div><div class='del'>- * Return value: the url name</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_service_get_url (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return camel_url_to_string (service-&gt;url, CAMEL_URL_HIDE_PASSWORD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelService::get_name not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service))));</div><div class='del'>-	return g_strdup ("???");</div><div class='del'>-}		</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_name:</div><div class='del'>- * @service: the service</div><div class='del'>- * @brief: whether or not to use a briefer form</div><div class='del'>- *</div><div class='del'>- * This gets the name of the service in a "friendly" (suitable for</div><div class='del'>- * humans) form. If @brief is %TRUE, this should be a brief description</div><div class='del'>- * such as for use in the folder tree. If @brief is %FALSE, it should</div><div class='del'>- * be a more complete and mostly unambiguous description.</div><div class='del'>- *</div><div class='del'>- * Return value: the description, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_service_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	g_return_val_if_fail (service-&gt;url, NULL);</div><div class='del'>-	</div><div class='del'>-	return CSERV_CLASS (service)-&gt;get_name (service, brief);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_path (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	GString *gpath;</div><div class='del'>-	char *path;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	CamelProvider *prov = service-&gt;provider;</div><div class='del'>-	</div><div class='del'>-	/* A sort of ad-hoc default implementation that works for our</div><div class='del'>-	 * current set of services.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	gpath = g_string_new (service-&gt;provider-&gt;protocol);</div><div class='del'>-	if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_USER)) {</div><div class='del'>-		if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_HOST)) {</div><div class='del'>-			g_string_sprintfa (gpath, "/%s@%s",</div><div class='del'>-					   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-					   url-&gt;host ? url-&gt;host : "");</div><div class='del'>-			</div><div class='del'>-			if (url-&gt;port)</div><div class='del'>-				g_string_sprintfa (gpath, ":%d", url-&gt;port);</div><div class='del'>-		} else {</div><div class='del'>-			g_string_sprintfa (gpath, "/%s%s",</div><div class='del'>-					   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-					   CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_USER) ? "" : "@");</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_PROVIDER_ALLOWS (prov, CAMEL_URL_PART_HOST)) {</div><div class='del'>-		g_string_sprintfa (gpath, "/%s%s",</div><div class='del'>-				   CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_HOST) ? "" : "@",</div><div class='del'>-				   url-&gt;host ? url-&gt;host : "");</div><div class='del'>-		</div><div class='del'>-		if (url-&gt;port)</div><div class='del'>-			g_string_sprintfa (gpath, ":%d", url-&gt;port);</div><div class='del'>-	}</div><div class='del'>-	if (CAMEL_PROVIDER_NEEDS (prov, CAMEL_URL_PART_PATH)) {</div><div class='del'>-		g_string_sprintfa (gpath, "%s%s",</div><div class='del'>-				   *url-&gt;path == '/' ? "" : "/",</div><div class='del'>-				   url-&gt;path);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	path = gpath-&gt;str;</div><div class='del'>-	g_string_free (gpath, FALSE);</div><div class='del'>-	return path;</div><div class='del'>-}		</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_path:</div><div class='del'>- * @service: the service</div><div class='del'>- *</div><div class='del'>- * This gets a valid UNIX relative path describing the service, which</div><div class='del'>- * is guaranteed to be different from the path returned for any</div><div class='del'>- * different service. This path MUST start with the name of the</div><div class='del'>- * provider, followed by a "/", but after that, it is up to the</div><div class='del'>- * provider.</div><div class='del'>- *</div><div class='del'>- * Return value: the path, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_service_get_path (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	g_return_val_if_fail (service-&gt;url, NULL);</div><div class='del'>-	</div><div class='del'>-	return CSERV_CLASS (service)-&gt;get_path (service);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_session:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * Returns the CamelSession associated with the service.</div><div class='del'>- *</div><div class='del'>- * Return value: the session</div><div class='del'>- **/</div><div class='del'>-CamelSession *</div><div class='del'>-camel_service_get_session (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return service-&gt;session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_provider:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * Returns the CamelProvider associated with the service.</div><div class='del'>- *</div><div class='del'>- * Return value: the provider</div><div class='del'>- **/</div><div class='del'>-CamelProvider *</div><div class='del'>-camel_service_get_provider (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return service-&gt;provider;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_query_auth_types:</div><div class='del'>- * @service: a CamelService</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This is used by the mail source wizard to get the list of</div><div class='del'>- * authentication types supported by the protocol, and information</div><div class='del'>- * about them.</div><div class='del'>- *</div><div class='del'>- * Return value: a list of CamelServiceAuthType records. The caller</div><div class='del'>- * must free the list with g_list_free() when it is done with it.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-camel_service_query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *ret;</div><div class='del'>-	</div><div class='del'>-	/* note that we get the connect lock here, which means the callee</div><div class='del'>-	   must not call the connect functions itself */</div><div class='del'>-	CAMEL_SERVICE_LOCK (service, connect_lock);</div><div class='del'>-	ret = CSERV_CLASS (service)-&gt;query_auth_types (service, ex);</div><div class='del'>-	CAMEL_SERVICE_UNLOCK (service, connect_lock);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* URL utility routines */</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_gethost:</div><div class='del'>- * @service: a CamelService</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This is a convenience function to do a gethostbyname on the host</div><div class='del'>- * for the service's URL.</div><div class='del'>- *</div><div class='del'>- * Return value: a (statically-allocated) hostent.</div><div class='del'>- **/</div><div class='del'>-struct hostent *</div><div class='del'>-camel_service_gethost (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *hostname;</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;url-&gt;host)</div><div class='del'>-		hostname = service-&gt;url-&gt;host;</div><div class='del'>-	else</div><div class='del'>-		hostname = "localhost";</div><div class='del'>-	</div><div class='del'>-	return camel_gethostbyname (hostname, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef offsetof</div><div class='del'>-#define STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))</div><div class='del'>-#else</div><div class='del'>-#define STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &amp;((type *) 0)-&gt;field))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _lookup_msg {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMsg msg;</div><div class='del'>-#endif</div><div class='del'>-	const char *name;</div><div class='del'>-	int len;</div><div class='del'>-	int type;</div><div class='del'>-	int result;</div><div class='del'>-	int herr;</div><div class='del'>-	struct hostent hostbuf;</div><div class='del'>-	int hostbuflen;</div><div class='del'>-	char *hostbufmem;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-get_hostbyname(void *data)</div><div class='del'>-{</div><div class='del'>-	struct _lookup_msg *info = data;</div><div class='del'>-</div><div class='del'>-	while ((info-&gt;result = e_gethostbyname_r(info-&gt;name, &amp;info-&gt;hostbuf, info-&gt;hostbufmem, info-&gt;hostbuflen, &amp;info-&gt;herr)) == ERANGE) {</div><div class='del'>-		d(printf("gethostbyname fialed?\n"));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-		pthread_testcancel();</div><div class='del'>-#endif</div><div class='del'>-                info-&gt;hostbuflen *= 2;</div><div class='del'>-                info-&gt;hostbufmem = g_realloc(info-&gt;hostbufmem, info-&gt;hostbuflen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("gethostbyname ok?\n"));</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_msgport_reply((EMsg *)info);</div><div class='del'>-#endif</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct hostent *</div><div class='del'>-camel_gethostbyname (const char *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	int fdmax, status, fd, cancel_fd;</div><div class='del'>-#endif</div><div class='del'>-	struct _lookup_msg *msg;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_operation_cancel_check(NULL)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_start_transient(NULL, _("Resolving: %s"), name);</div><div class='del'>-</div><div class='del'>-	msg = g_malloc0(sizeof(*msg));</div><div class='del'>-	msg-&gt;hostbuflen = 1024;</div><div class='del'>-	msg-&gt;hostbufmem = g_malloc(msg-&gt;hostbuflen);</div><div class='del'>-	msg-&gt;name = name;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd(NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-#endif</div><div class='del'>-		get_hostbyname(msg);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	} else {</div><div class='del'>-		EMsgPort *reply_port;</div><div class='del'>-		pthread_t id;</div><div class='del'>-		fd_set rdset;</div><div class='del'>-</div><div class='del'>-		reply_port = msg-&gt;msg.reply_port = e_msgport_new();</div><div class='del'>-		fd = e_msgport_fd(msg-&gt;msg.reply_port);</div><div class='del'>-		if (pthread_create(&amp;id, NULL, get_hostbyname, msg) == 0) {</div><div class='del'>-			d(printf("waiting for name return/cancellation in main process\n"));</div><div class='del'>-			do {</div><div class='del'>-				FD_ZERO(&amp;rdset);</div><div class='del'>-				FD_SET(cancel_fd, &amp;rdset);</div><div class='del'>-				FD_SET(fd, &amp;rdset);</div><div class='del'>-				fdmax = MAX(fd, cancel_fd) + 1;</div><div class='del'>-				status = select (fdmax, &amp;rdset, NULL, 0, NULL);</div><div class='del'>-			} while (status == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-			</div><div class='del'>-			if (status == -1) {</div><div class='del'>-				camel_exception_setv(ex, 1, _("Failure in name lookup: %s"), strerror(errno));</div><div class='del'>-				d(printf("Cancelling lookup thread\n"));</div><div class='del'>-				pthread_cancel(id);</div><div class='del'>-			} else if (FD_ISSET(cancel_fd, &amp;rdset)) {</div><div class='del'>-				d(printf("Cancelling lookup thread\n"));</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));</div><div class='del'>-				pthread_cancel(id);</div><div class='del'>-			} else {</div><div class='del'>-				struct _lookup_msg *reply = (struct _lookup_msg *)e_msgport_get(reply_port);</div><div class='del'>-</div><div class='del'>-				g_assert(reply == msg);</div><div class='del'>-			}</div><div class='del'>-			d(printf("waiting for child to exit\n"));</div><div class='del'>-			pthread_join(id, NULL);</div><div class='del'>-			d(printf("child done\n"));</div><div class='del'>-		}</div><div class='del'>-		e_msgport_destroy(reply_port);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;herr) {</div><div class='del'>- 		if (!camel_exception_is_set(ex)) {</div><div class='del'>-			if (msg-&gt;herr == HOST_NOT_FOUND || msg-&gt;herr == NO_DATA)</div><div class='del'>-				camel_exception_setv(ex, 1, _("Host lookup failed: %s: host not found"), name);</div><div class='del'>-			else</div><div class='del'>-				camel_exception_setv(ex, 1, _("Host lookup failed: %s: unknown reason"), name);</div><div class='del'>-		}</div><div class='del'>-		g_free(msg-&gt;hostbufmem);</div><div class='del'>-		g_free(msg);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		return &amp;msg-&gt;hostbuf;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-get_hostbyaddr (void *data)</div><div class='del'>-{</div><div class='del'>-	struct _lookup_msg *info = data;</div><div class='del'>-</div><div class='del'>-	while ((info-&gt;result = e_gethostbyaddr_r (info-&gt;name, info-&gt;len, info-&gt;type, &amp;info-&gt;hostbuf,</div><div class='del'>-						  info-&gt;hostbufmem, info-&gt;hostbuflen, &amp;info-&gt;herr)) == ERANGE) {</div><div class='del'>-		d(printf ("gethostbyaddr fialed?\n"));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-		pthread_testcancel ();</div><div class='del'>-#endif</div><div class='del'>-                info-&gt;hostbuflen *= 2;</div><div class='del'>-                info-&gt;hostbufmem = g_realloc (info-&gt;hostbufmem, info-&gt;hostbuflen);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf ("gethostbyaddr ok?\n"));</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_msgport_reply ((EMsg *) info);</div><div class='del'>-#endif</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct hostent *</div><div class='del'>-camel_gethostbyaddr (const char *addr, int len, int type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	int fdmax, status, fd, cancel_fd;</div><div class='del'>-#endif</div><div class='del'>-	struct _lookup_msg *msg;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (addr != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_operation_start_transient (NULL, _("Resolving address"));</div><div class='del'>-	</div><div class='del'>-	msg = g_malloc0 (sizeof (struct _lookup_msg));</div><div class='del'>-	msg-&gt;hostbuflen = 1024;</div><div class='del'>-	msg-&gt;hostbufmem = g_malloc (msg-&gt;hostbuflen);</div><div class='del'>-	msg-&gt;name = addr;</div><div class='del'>-	msg-&gt;len = len;</div><div class='del'>-	msg-&gt;type = type;</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-#endif</div><div class='del'>-		get_hostbyaddr (msg);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	} else {</div><div class='del'>-		EMsgPort *reply_port;</div><div class='del'>-		pthread_t id;</div><div class='del'>-		fd_set rdset;</div><div class='del'>-		</div><div class='del'>-		reply_port = msg-&gt;msg.reply_port = e_msgport_new ();</div><div class='del'>-		fd = e_msgport_fd (msg-&gt;msg.reply_port);</div><div class='del'>-		if (pthread_create (&amp;id, NULL, get_hostbyaddr, msg) == 0) {</div><div class='del'>-			d(printf("waiting for name return/cancellation in main process\n"));</div><div class='del'>-			do {</div><div class='del'>-				FD_ZERO(&amp;rdset);</div><div class='del'>-				FD_SET(cancel_fd, &amp;rdset);</div><div class='del'>-				FD_SET(fd, &amp;rdset);</div><div class='del'>-				fdmax = MAX(fd, cancel_fd) + 1;</div><div class='del'>-				status = select (fdmax, &amp;rdset, NULL, 0, NULL);</div><div class='del'>-			} while (status == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-			</div><div class='del'>-			if (status == -1) {</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						      _("Failure in name lookup: %s"), g_strerror (errno));</div><div class='del'>-				d(printf ("Cancelling lookup thread\n"));</div><div class='del'>-				pthread_cancel (id);</div><div class='del'>-			} else if (FD_ISSET(cancel_fd, &amp;rdset)) {</div><div class='del'>-				d(printf ("Cancelling lookup thread\n"));</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));</div><div class='del'>-				pthread_cancel (id);</div><div class='del'>-			} else {</div><div class='del'>-				struct _lookup_msg *reply = (struct _lookup_msg *) e_msgport_get (reply_port);</div><div class='del'>-				</div><div class='del'>-				g_assert (reply == msg);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			d(printf ("waiting for child to exit\n"));</div><div class='del'>-			pthread_join (id, NULL);</div><div class='del'>-			d(printf ("child done\n"));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_msgport_destroy (reply_port);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	if (msg-&gt;herr) {</div><div class='del'>- 		if (!camel_exception_is_set (ex)) {</div><div class='del'>-			if (msg-&gt;herr == HOST_NOT_FOUND || msg-&gt;herr == NO_DATA)</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Host lookup failed: host not found"));</div><div class='del'>-			else</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Host lookup failed: unknown reason"));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (msg-&gt;hostbufmem);</div><div class='del'>-		g_free (msg);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		return &amp;msg-&gt;hostbuf;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_free_host(struct hostent *h)</div><div class='del'>-{</div><div class='del'>-	struct _lookup_msg *msg;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(h != NULL);</div><div class='del'>-</div><div class='del'>-	/* yeah this looks ugly but it is safe.  we passed out a reference to inside our structure, this maps it</div><div class='del'>-	   to the base structure, so we can free everything right without having to keep track of it separately */</div><div class='del'>-	msg = (struct _lookup_msg *)(((char *)h) - STRUCT_OFFSET(struct _lookup_msg, hostbuf));</div><div class='del'>-</div><div class='del'>-	g_free(msg-&gt;hostbufmem);</div><div class='del'>-	g_free(msg);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-service.h b/camel/camel-service.h<br/>deleted file mode 100644<br/>index 587749e242..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-service.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-service.h : Abstract class for an email service */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SERVICE_H</div><div class='del'>-#define CAMEL_SERVICE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;netdb.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-#include &lt;camel/camel-provider.h&gt;</div><div class='del'>-#include &lt;camel/camel-operation.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SERVICE_TYPE     (camel_service_get_type ())</div><div class='del'>-#define CAMEL_SERVICE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))</div><div class='del'>-#define CAMEL_SERVICE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))</div><div class='del'>-#define CAMEL_IS_SERVICE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_SERVICE_ARG_FIRST  = CAMEL_ARG_FIRST + 100,</div><div class='del'>-	CAMEL_SERVICE_ARG_USERNAME,</div><div class='del'>-	CAMEL_SERVICE_ARG_AUTH,</div><div class='del'>-	CAMEL_SERVICE_ARG_HOSTNAME,</div><div class='del'>-	CAMEL_SERVICE_ARG_PORT,</div><div class='del'>-	CAMEL_SERVICE_ARG_PATH,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_SERVICE_USERNAME     (CAMEL_SERVICE_ARG_USERNAME | CAMEL_ARG_STR)</div><div class='del'>-#define CAMEL_SERVICE_AUTH         (CAMEL_SERVICE_ARG_AUTH | CAMEL_ARG_STR)</div><div class='del'>-#define CAMEL_SERVICE_HOSTNAME     (CAMEL_SERVICE_ARG_HOSTNAME | CAMEL_ARG_STR)</div><div class='del'>-#define CAMEL_SERVICE_PORT         (CAMEL_SERVICE_ARG_PORT | CAMEL_ARG_INT)</div><div class='del'>-#define CAMEL_SERVICE_PATH         (CAMEL_SERVICE_ARG_PATH | CAMEL_ARG_STR)</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SERVICE_DISCONNECTED,</div><div class='del'>-	CAMEL_SERVICE_CONNECTING,</div><div class='del'>-	CAMEL_SERVICE_CONNECTED,</div><div class='del'>-	CAMEL_SERVICE_DISCONNECTING</div><div class='del'>-} CamelServiceConnectionStatus;</div><div class='del'>-</div><div class='del'>-struct _CamelService {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	struct _CamelServicePrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelProvider *provider;</div><div class='del'>-	CamelServiceConnectionStatus status;</div><div class='del'>-	CamelOperation *connect_op;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void      (*construct)         (CamelService *service,</div><div class='del'>-					CamelSession *session,</div><div class='del'>-					CamelProvider *provider,</div><div class='del'>-					CamelURL *url,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	gboolean  (*connect)           (CamelService *service, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-	gboolean  (*disconnect)        (CamelService *service,</div><div class='del'>-					gboolean clean,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-	void      (*cancel_connect)    (CamelService *service);</div><div class='del'>-</div><div class='del'>-	GList *   (*query_auth_types)  (CamelService *service,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	char *    (*get_name)          (CamelService *service,</div><div class='del'>-					gboolean brief);</div><div class='del'>-	char *    (*get_path)          (CamelService *service);</div><div class='del'>-</div><div class='del'>-} CamelServiceClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* query_auth_types returns a GList of these */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;               /* user-friendly name */</div><div class='del'>-	char *description;</div><div class='del'>-	char *authproto;</div><div class='del'>-	</div><div class='del'>-	gboolean need_password;   /* needs a password to authenticate */</div><div class='del'>-} CamelServiceAuthType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void                camel_service_construct          (CamelService *service,</div><div class='del'>-						      CamelSession *session,</div><div class='del'>-						      CamelProvider *provider,</div><div class='del'>-						      CamelURL *url, </div><div class='del'>-						      CamelException *ex);</div><div class='del'>-gboolean            camel_service_connect            (CamelService *service, </div><div class='del'>-						      CamelException *ex);</div><div class='del'>-gboolean            camel_service_disconnect         (CamelService *service,</div><div class='del'>-						      gboolean clean,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-void                camel_service_cancel_connect     (CamelService *service);</div><div class='del'>-char *              camel_service_get_url            (CamelService *service);</div><div class='del'>-char *              camel_service_get_name           (CamelService *service,</div><div class='del'>-						      gboolean brief);</div><div class='del'>-char *              camel_service_get_path           (CamelService *service);</div><div class='del'>-CamelSession *      camel_service_get_session        (CamelService *service);</div><div class='del'>-CamelProvider *     camel_service_get_provider       (CamelService *service);</div><div class='del'>-GList *             camel_service_query_auth_types   (CamelService *service,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* convenience functions */</div><div class='del'>-struct hostent *    camel_service_gethost            (CamelService *service,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* cancellable dns lookup */</div><div class='del'>-struct hostent *    camel_gethostbyname              (const char *name, CamelException *ex);</div><div class='del'>-struct hostent *    camel_gethostbyaddr              (const char *addr, int len, int type, CamelException *ex);</div><div class='del'>-void		    camel_free_host	    	     (struct hostent *h);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_service_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SERVICE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-session.c b/camel/camel-session.c<br/>deleted file mode 100644<br/>index 4e74c1bd9e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-session.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,900 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-session.c : Abstract class for an email session */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999 - 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-transport.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "camel-vee-store.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define CS_CLASS(so) CAMEL_SESSION_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static void register_provider (CamelSession *session, CamelProvider *provider);</div><div class='del'>-static GList *list_providers (CamelSession *session, gboolean load);</div><div class='del'>-static CamelProvider *get_provider (CamelSession *session,</div><div class='del'>-				    const char *url_string,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelService *get_service (CamelSession *session,</div><div class='del'>-				  const char *url_string,</div><div class='del'>-				  CamelProviderType type,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-static char *get_storage_path (CamelSession *session,</div><div class='del'>-			       CamelService *service,</div><div class='del'>-			       CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-static void *session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);</div><div class='del'>-static void session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg);</div><div class='del'>-static int session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags);</div><div class='del'>-static void session_thread_wait(CamelSession *session, int id);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* The vfolder provider is always available */</div><div class='del'>-static CamelProvider vee_provider = {</div><div class='del'>-	"vfolder",</div><div class='del'>-	N_("Virtual folder email provider"),</div><div class='del'>-</div><div class='del'>-	N_("For reading mail as a query of another set of folders"),</div><div class='del'>-</div><div class='del'>-	"vfolder",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	0, /* url_flags */</div><div class='del'>-</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_session_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	session-&gt;online = TRUE;</div><div class='del'>-	session-&gt;modules = camel_provider_init ();</div><div class='del'>-	session-&gt;providers = g_hash_table_new (g_strcase_hash, g_strcase_equal);</div><div class='del'>-	session-&gt;priv = g_malloc0(sizeof(*session-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	session-&gt;priv-&gt;lock = g_mutex_new();</div><div class='del'>-	session-&gt;priv-&gt;thread_lock = g_mutex_new();</div><div class='del'>-	session-&gt;priv-&gt;thread_id = 1;</div><div class='del'>-	session-&gt;priv-&gt;thread_active = g_hash_table_new(NULL, NULL);</div><div class='del'>-	session-&gt;priv-&gt;thread_queue = NULL;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-camel_session_destroy_provider (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelProvider *prov = (CamelProvider *)value;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CAMEL_NUM_PROVIDER_TYPES; i++) {</div><div class='del'>-		if (prov-&gt;service_cache[i])</div><div class='del'>-			g_hash_table_destroy (prov-&gt;service_cache[i]);</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_session_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = (CamelSession *)o;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_hash_table_destroy(session-&gt;priv-&gt;thread_active);</div><div class='del'>-	if (session-&gt;priv-&gt;thread_queue)</div><div class='del'>-		e_thread_destroy(session-&gt;priv-&gt;thread_queue);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(session-&gt;storage_path);</div><div class='del'>-	g_hash_table_foreach_remove (session-&gt;providers,</div><div class='del'>-				     camel_session_destroy_provider, NULL);</div><div class='del'>-	g_hash_table_destroy (session-&gt;providers);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(session-&gt;priv-&gt;lock);</div><div class='del'>-	g_mutex_free(session-&gt;priv-&gt;thread_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(session-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_session_class_init (CamelSessionClass *camel_session_class)</div><div class='del'>-{</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_session_class-&gt;register_provider = register_provider;</div><div class='del'>-	camel_session_class-&gt;list_providers = list_providers;</div><div class='del'>-	camel_session_class-&gt;get_provider = get_provider;</div><div class='del'>-	camel_session_class-&gt;get_service = get_service;</div><div class='del'>-	camel_session_class-&gt;get_storage_path = get_storage_path;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	camel_session_class-&gt;thread_msg_new = session_thread_msg_new;</div><div class='del'>-	camel_session_class-&gt;thread_msg_free = session_thread_msg_free;</div><div class='del'>-	camel_session_class-&gt;thread_queue = session_thread_queue;</div><div class='del'>-	camel_session_class-&gt;thread_wait = session_thread_wait;</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	vee_provider.object_types[CAMEL_PROVIDER_STORE] = camel_vee_store_get_type ();</div><div class='del'>-	vee_provider.url_hash = camel_url_hash;</div><div class='del'>-	vee_provider.url_equal = camel_url_equal;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_session_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_session_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_session_type = camel_type_register (</div><div class='del'>-			camel_object_get_type (), "CamelSession",</div><div class='del'>-			sizeof (CamelSession),</div><div class='del'>-			sizeof (CamelSessionClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_session_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_session_init,</div><div class='del'>-			(CamelObjectFinalizeFunc) camel_session_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_session_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_construct:</div><div class='del'>- * @session: a session object to construct</div><div class='del'>- * @storage_path: path to a directory the session can use for</div><div class='del'>- * persistent storage. (This directory must already exist.)</div><div class='del'>- *</div><div class='del'>- * Constructs @session.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_session_construct (CamelSession *session, const char *storage_path)</div><div class='del'>-{</div><div class='del'>-	session-&gt;storage_path = g_strdup (storage_path);</div><div class='del'>-	camel_session_register_provider(session, &amp;vee_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-register_provider (CamelSession *session, CamelProvider *provider)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelProviderConfEntry *conf;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CAMEL_NUM_PROVIDER_TYPES; i++) {</div><div class='del'>-		if (provider-&gt;object_types[i])</div><div class='del'>-			provider-&gt;service_cache[i] = g_hash_table_new (provider-&gt;url_hash, provider-&gt;url_equal);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Translate all strings here */</div><div class='del'>-	provider-&gt;name = _(provider-&gt;name);</div><div class='del'>-	provider-&gt;description = _(provider-&gt;description);</div><div class='del'>-	conf = provider-&gt;extra_conf;</div><div class='del'>-	if (conf) {</div><div class='del'>-		for (i=0;conf[i].type != CAMEL_PROVIDER_CONF_END;i++) {</div><div class='del'>-			if (conf[i].text)</div><div class='del'>-				conf[i].text = _(conf[i].text);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	l = provider-&gt;authtypes;</div><div class='del'>-	while (l) {</div><div class='del'>-		CamelServiceAuthType *auth = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		auth-&gt;name = _(auth-&gt;name);</div><div class='del'>-		auth-&gt;description = _(auth-&gt;description);</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (session-&gt;providers, provider-&gt;protocol, provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_register_provider:</div><div class='del'>- * @session: a session object</div><div class='del'>- * @protocol: the protocol the provider provides for</div><div class='del'>- * @provider: provider object</div><div class='del'>- *</div><div class='del'>- * Registers a protocol to provider mapping for the session.</div><div class='del'>- *</div><div class='del'>- * Assumes the session lock has already been obtained,</div><div class='del'>- * which is the case for automatically loaded provider modules.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_session_register_provider (CamelSession *session,</div><div class='del'>-				 CamelProvider *provider)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	g_return_if_fail (provider != NULL);</div><div class='del'>-</div><div class='del'>-	CS_CLASS (session)-&gt;register_provider (session, provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ensure_loaded (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = user_data;</div><div class='del'>-	char *name = key;</div><div class='del'>-	char *path = value;</div><div class='del'>-</div><div class='del'>-	if (!g_hash_table_lookup (session-&gt;providers, name)) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		camel_provider_load (session, path, &amp;ex);</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-provider_compare (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CamelProvider *cpa = (const CamelProvider *)a;</div><div class='del'>-	const CamelProvider *cpb = (const CamelProvider *)b;</div><div class='del'>-</div><div class='del'>-	return strcmp (cpa-&gt;name, cpb-&gt;name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_to_list (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GList **list = user_data;</div><div class='del'>-	CamelProvider *prov = value;</div><div class='del'>-</div><div class='del'>-	*list = g_list_insert_sorted (*list, prov, provider_compare);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-list_providers (CamelSession *session, gboolean load)</div><div class='del'>-{</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-</div><div class='del'>-	if (load)</div><div class='del'>-		g_hash_table_foreach (session-&gt;modules, ensure_loaded, session);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (session-&gt;providers, add_to_list, &amp;list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_list_providers:</div><div class='del'>- * @session: the session</div><div class='del'>- * @load: whether or not to load in providers that are not already loaded</div><div class='del'>- *</div><div class='del'>- * This returns a list of available providers in this session. If @load</div><div class='del'>- * is %TRUE, it will first load in all available providers that haven't</div><div class='del'>- * yet been loaded.</div><div class='del'>- *</div><div class='del'>- * Return value: a GList of providers, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-camel_session_list_providers (CamelSession *session, gboolean load)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK (session, lock);</div><div class='del'>-	list = CS_CLASS (session)-&gt;list_providers (session, load);</div><div class='del'>-	CAMEL_SESSION_UNLOCK (session, lock);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelProvider *</div><div class='del'>-get_provider (CamelSession *session, const char *url_string, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelProvider *provider;</div><div class='del'>-	char *protocol;</div><div class='del'>-</div><div class='del'>-	protocol = g_strndup (url_string, strcspn (url_string, ":"));</div><div class='del'>-</div><div class='del'>-	provider = g_hash_table_lookup (session-&gt;providers, protocol);</div><div class='del'>-	if (!provider) {</div><div class='del'>-		/* See if there's one we can load. */</div><div class='del'>-		char *path;</div><div class='del'>-</div><div class='del'>-		path = g_hash_table_lookup (session-&gt;modules, protocol);</div><div class='del'>-		if (path) {</div><div class='del'>-			camel_provider_load (session, path, ex);</div><div class='del'>-			if (camel_exception_is_set (ex)) {</div><div class='del'>-				g_free (protocol);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		provider = g_hash_table_lookup (session-&gt;providers, protocol);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!provider) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("No provider available for protocol `%s'"),</div><div class='del'>-				      protocol);</div><div class='del'>-	}</div><div class='del'>-	g_free (protocol);</div><div class='del'>-</div><div class='del'>-	return provider;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_provider:</div><div class='del'>- * @session: the session</div><div class='del'>- * @url_string: the URL for the service whose provider you want</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This returns the CamelProvider that would be used to handle</div><div class='del'>- * @url_string, loading it in from disk if necessary.</div><div class='del'>- *</div><div class='del'>- * Return value: the provider, or %NULL, in which case @ex will be set.</div><div class='del'>- **/</div><div class='del'>-CamelProvider *</div><div class='del'>-camel_session_get_provider (CamelSession *session, const char *url_string,</div><div class='del'>-			    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelProvider *provider;</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK (session, lock);</div><div class='del'>-	provider = CS_CLASS (session)-&gt;get_provider (session, url_string, ex);</div><div class='del'>-	CAMEL_SESSION_UNLOCK (session, lock);</div><div class='del'>-</div><div class='del'>-	return provider;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-service_cache_remove (CamelService *service, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = service-&gt;session;</div><div class='del'>-	CamelProviderType type = GPOINTER_TO_INT (user_data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	g_return_if_fail (service != NULL);</div><div class='del'>-	g_return_if_fail (service-&gt;url != NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK(session, lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (service-&gt;provider-&gt;service_cache[type], service-&gt;url);</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_UNLOCK(session, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelService *</div><div class='del'>-get_service (CamelSession *session, const char *url_string,</div><div class='del'>-	     CamelProviderType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	CamelProvider *provider;</div><div class='del'>-	CamelService *service;</div><div class='del'>-	CamelException internal_ex;</div><div class='del'>-	url = camel_url_new (url_string, ex);</div><div class='del'>-	if (!url)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* We need to look up the provider so we can then lookup</div><div class='del'>-	   the service in the provider's cache */</div><div class='del'>-	provider = CS_CLASS (session)-&gt;get_provider (session, url-&gt;protocol, ex);</div><div class='del'>-	if (provider &amp;&amp; !provider-&gt;object_types[type]) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("No provider available for protocol `%s'"),</div><div class='del'>-				      url-&gt;protocol);</div><div class='del'>-		provider = NULL;</div><div class='del'>-	}</div><div class='del'>-	if (!provider) {</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now look up the service in the provider's cache */</div><div class='del'>-	service = g_hash_table_lookup (provider-&gt;service_cache[type], url);</div><div class='del'>-	if (service != NULL) {</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (service));</div><div class='del'>-		return service;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	service = (CamelService *)camel_object_new (provider-&gt;object_types[type]);</div><div class='del'>-	camel_exception_init (&amp;internal_ex);</div><div class='del'>-	camel_service_construct (service, session, provider, url, &amp;internal_ex);</div><div class='del'>-	if (camel_exception_is_set (&amp;internal_ex)) {</div><div class='del'>-		camel_exception_xfer (ex, &amp;internal_ex);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (service));</div><div class='del'>-		service = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		g_hash_table_insert (provider-&gt;service_cache[type], url, service);</div><div class='del'>-		camel_object_hook_event (CAMEL_OBJECT (service), "finalize", (CamelObjectEventHookFunc) service_cache_remove, GINT_TO_POINTER (type));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return service;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_service:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @url_string: a Camel URL describing the service to get</div><div class='del'>- * @type: the provider type (%CAMEL_PROVIDER_STORE or</div><div class='del'>- * %CAMEL_PROVIDER_TRANSPORT) to get, since some URLs may be able</div><div class='del'>- * to specify either type.</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This resolves a CamelURL into a CamelService, including loading the</div><div class='del'>- * provider library for that service if it has not already been loaded.</div><div class='del'>- *</div><div class='del'>- * Services are cached, and asking for "the same" @url_string multiple</div><div class='del'>- * times will return the same CamelService (with its reference count</div><div class='del'>- * incremented by one each time). What constitutes "the same" URL</div><div class='del'>- * depends in part on the provider.</div><div class='del'>- *</div><div class='del'>- * Return value: the requested CamelService, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelService *</div><div class='del'>-camel_session_get_service (CamelSession *session, const char *url_string,</div><div class='del'>-			   CamelProviderType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *service;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-	g_return_val_if_fail (url_string != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK (session, lock);</div><div class='del'>-	service = CS_CLASS (session)-&gt;get_service (session, url_string, type, ex);</div><div class='del'>-	CAMEL_SESSION_UNLOCK (session, lock);</div><div class='del'>-</div><div class='del'>-	return service;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_service_connected:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @url_string: a Camel URL describing the service to get</div><div class='del'>- * @type: the provider type</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This works like camel_session_get_service(), but also ensures that</div><div class='del'>- * the returned service will have been successfully connected (via</div><div class='del'>- * camel_service_connect().)</div><div class='del'>- *</div><div class='del'>- * Return value: the requested CamelService, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelService *</div><div class='del'>-camel_session_get_service_connected (CamelSession *session,</div><div class='del'>-				     const char *url_string,</div><div class='del'>-				     CamelProviderType type,</div><div class='del'>-				     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *svc;</div><div class='del'>-</div><div class='del'>-	svc = camel_session_get_service (session, url_string, type, ex);</div><div class='del'>-	if (svc == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (svc-&gt;status != CAMEL_SERVICE_CONNECTED) {</div><div class='del'>-		if (camel_service_connect (svc, ex) == FALSE) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (svc));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return svc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_storage_path (CamelSession *session, CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path, *p;</div><div class='del'>-</div><div class='del'>-	p = camel_service_get_path (service);</div><div class='del'>-	path = g_strdup_printf ("%s/%s", session-&gt;storage_path, p);</div><div class='del'>-	g_free (p);</div><div class='del'>-</div><div class='del'>-	if (access (path, F_OK) == 0)</div><div class='del'>-		return path;</div><div class='del'>-</div><div class='del'>-	if (camel_mkdir_hier (path, S_IRWXU) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create directory %s:\n%s"),</div><div class='del'>-				      path, g_strerror (errno));</div><div class='del'>-		g_free (path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_storage_path:</div><div class='del'>- * @session: session object</div><div class='del'>- * @service: a CamelService</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This returns the path to a directory which the service can use for</div><div class='del'>- * its own purposes. Data stored there will remain between Evolution</div><div class='del'>- * sessions. No code outside of that service should ever touch the</div><div class='del'>- * files in this directory. If the directory does not exist, it will</div><div class='del'>- * be created.</div><div class='del'>- *</div><div class='del'>- * Return value: the path (which the caller must free), or %NULL if</div><div class='del'>- * an error occurs.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_session_get_storage_path (CamelSession *session, CamelService *service,</div><div class='del'>-				CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;get_storage_path (session, service, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_password:</div><div class='del'>- * @session: session object</div><div class='del'>- * @prompt: prompt to provide to user</div><div class='del'>- * @secret: whether or not the data is secret (eg, a password, as opposed</div><div class='del'>- * to a smartcard response)</div><div class='del'>- * @service: the service this query is being made by</div><div class='del'>- * @item: an identifier, unique within this service, for the information</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This function is used by a CamelService to ask the application and</div><div class='del'>- * the user for a password or other authentication data.</div><div class='del'>- *</div><div class='del'>- * @service and @item together uniquely identify the piece of data the</div><div class='del'>- * caller is concerned with.</div><div class='del'>- *</div><div class='del'>- * @prompt is a question to ask the user (if the application doesn't</div><div class='del'>- * already have the answer cached). If @secret is set, the user's</div><div class='del'>- * input will not be echoed back. The authenticator should set @ex</div><div class='del'>- * to %CAMEL_EXCEPTION_USER_CANCEL if the user did not provide the</div><div class='del'>- * information. The caller must g_free() the information returned when</div><div class='del'>- * it is done with it.</div><div class='del'>- *</div><div class='del'>- * Return value: the authentication information or %NULL.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_session_get_password (CamelSession *session, const char *prompt,</div><div class='del'>-			    gboolean secret, CamelService *service,</div><div class='del'>-			    const char *item, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-	g_return_val_if_fail (prompt != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (item != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;get_password (session, prompt, secret, service, item, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_forget_password:</div><div class='del'>- * @session: session object</div><div class='del'>- * @service: the service rejecting the password</div><div class='del'>- * @item: an identifier, unique within this service, for the information</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This function is used by a CamelService to tell the application</div><div class='del'>- * that the authentication information it provided via</div><div class='del'>- * camel_session_get_password was rejected by the service. If the</div><div class='del'>- * application was caching this information, it should stop,</div><div class='del'>- * and if the service asks for it again, it should ask the user.</div><div class='del'>- *</div><div class='del'>- * @service and @item identify the rejected authentication information,</div><div class='del'>- * as with camel_session_get_password.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_session_forget_password (CamelSession *session, CamelService *service,</div><div class='del'>-			       const char *item, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	g_return_if_fail (item != NULL);</div><div class='del'>-</div><div class='del'>-	CS_CLASS (session)-&gt;forget_password (session, service, item, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_alert_user:</div><div class='del'>- * @session: session object</div><div class='del'>- * @type: the type of alert (info, warning, or error)</div><div class='del'>- * @prompt: the message for the user</div><div class='del'>- * @cancel: whether or not to provide a "Cancel" option in addition to</div><div class='del'>- * an "OK" option.</div><div class='del'>- *</div><div class='del'>- * Presents the given @prompt to the user, in the style indicated by</div><div class='del'>- * @type. If @cancel is %TRUE, the user will be able to accept or</div><div class='del'>- * cancel. Otherwise, the message is purely informational.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE if the user accepts, %FALSE if they cancel.</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-camel_session_alert_user (CamelSession *session, CamelSessionAlertType type,</div><div class='del'>-			  const char *prompt, gboolean cancel)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);</div><div class='del'>-	g_return_val_if_fail (prompt != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;alert_user (session, type, prompt, cancel);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_register_timeout:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @interval: the number of milliseconds interval between calls</div><div class='del'>- * @callback: the function to call</div><div class='del'>- * @user_data: extra data to be passed to the callback</div><div class='del'>- *</div><div class='del'>- * Registers the given timeout. @callback will be called every</div><div class='del'>- * @interval milliseconds with one argument, @user_data, until it</div><div class='del'>- * returns %FALSE.</div><div class='del'>- *</div><div class='del'>- * Return value: On success, a non-zero handle that can be used with</div><div class='del'>- * camel_session_remove_timeout(). On failure, 0.</div><div class='del'>- **/</div><div class='del'>-guint</div><div class='del'>-camel_session_register_timeout (CamelSession *session,</div><div class='del'>-				guint32 interval,</div><div class='del'>-				CamelTimeoutCallback callback,</div><div class='del'>-				gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), 0);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;register_timeout (session, interval, callback, user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_remove_timeout:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @handle: a value returned from camel_session_register_timeout()</div><div class='del'>- *</div><div class='del'>- * Removes the indicated timeout.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE on success, %FALSE on failure.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_session_remove_timeout (CamelSession *session, guint handle)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;remove_timeout (session, handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_is_online:</div><div class='del'>- * @session: the session.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not @session is online.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_session_is_online (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	return session-&gt;online;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_set_online:</div><div class='del'>- * @session: the session</div><div class='del'>- * @online: whether or not the session should be online</div><div class='del'>- *</div><div class='del'>- * Sets the online status of @session to @online.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_session_set_online (CamelSession *session, gboolean online)</div><div class='del'>-{</div><div class='del'>-	session-&gt;online = online;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_filter_driver:</div><div class='del'>- * @session: the session</div><div class='del'>- * @type: the type of filter (eg, "incoming")</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: a filter driver, loaded with applicable rules</div><div class='del'>- **/</div><div class='del'>-CamelFilterDriver *</div><div class='del'>-camel_session_get_filter_driver (CamelSession *session,</div><div class='del'>-				 const char *type,</div><div class='del'>-				 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return CS_CLASS (session)-&gt;get_filter_driver (session, type, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-</div><div class='del'>-static void *session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size)</div><div class='del'>-{</div><div class='del'>-	CamelSessionThreadMsg *m;</div><div class='del'>-</div><div class='del'>-	g_assert(size &gt;= sizeof(*m));</div><div class='del'>-</div><div class='del'>-	m = g_malloc0(size);</div><div class='del'>-	m-&gt;ops = ops;</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK(session, thread_lock);</div><div class='del'>-	m-&gt;id = session-&gt;priv-&gt;thread_id++;</div><div class='del'>-	g_hash_table_insert(session-&gt;priv-&gt;thread_active, (void *)m-&gt;id, m);</div><div class='del'>-	CAMEL_SESSION_UNLOCK(session, thread_lock);</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	g_assert(msg-&gt;ops != NULL);</div><div class='del'>-</div><div class='del'>-	d(printf("free message %p session %p\n", msg, session));</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK(session, thread_lock);</div><div class='del'>-	g_hash_table_remove(session-&gt;priv-&gt;thread_active, (void *)msg-&gt;id);</div><div class='del'>-	CAMEL_SESSION_UNLOCK(session, thread_lock);</div><div class='del'>-</div><div class='del'>-	d(printf("free msg, ops-&gt;free = %p\n", msg-&gt;ops-&gt;free));</div><div class='del'>-	</div><div class='del'>-	if (msg-&gt;ops-&gt;free)</div><div class='del'>-		msg-&gt;ops-&gt;free(session, msg);</div><div class='del'>-	g_free(msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void session_thread_destroy(EThread *thread, CamelSessionThreadMsg *msg, CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	d(printf("destroy message %p session %p\n", msg, session));</div><div class='del'>-	session_thread_msg_free(session, msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void session_thread_received(EThread *thread, CamelSessionThreadMsg *msg, CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	d(printf("receive message %p session %p\n", msg, session));</div><div class='del'>-	if (msg-&gt;ops-&gt;receive)</div><div class='del'>-		msg-&gt;ops-&gt;receive(session, msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags)</div><div class='del'>-{</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	CAMEL_SESSION_LOCK(session, thread_lock);</div><div class='del'>-	if (session-&gt;priv-&gt;thread_queue == NULL) {</div><div class='del'>-		session-&gt;priv-&gt;thread_queue = e_thread_new(E_THREAD_QUEUE);</div><div class='del'>-		e_thread_set_msg_destroy(session-&gt;priv-&gt;thread_queue, (EThreadFunc)session_thread_destroy, session);</div><div class='del'>-		e_thread_set_msg_received(session-&gt;priv-&gt;thread_queue, (EThreadFunc)session_thread_received, session);</div><div class='del'>-	}</div><div class='del'>-	CAMEL_SESSION_UNLOCK(session, thread_lock);</div><div class='del'>-</div><div class='del'>-	id = msg-&gt;id;</div><div class='del'>-	e_thread_put(session-&gt;priv-&gt;thread_queue, &amp;msg-&gt;msg);</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void session_thread_wait(CamelSession *session, int id)</div><div class='del'>-{</div><div class='del'>-	int wait;</div><div class='del'>-</div><div class='del'>-	/* we just busy wait, only other alternative is to setup a reply port? */</div><div class='del'>-	do {</div><div class='del'>-		CAMEL_SESSION_LOCK(session, thread_lock);</div><div class='del'>-		wait = g_hash_table_lookup(session-&gt;priv-&gt;thread_active, (void *)id) != NULL;</div><div class='del'>-		CAMEL_SESSION_UNLOCK(session, thread_lock);</div><div class='del'>-		if (wait) {</div><div class='del'>-			usleep(20000);</div><div class='del'>-		}</div><div class='del'>-	} while (wait);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_thread_msg_new:</div><div class='del'>- * @session: </div><div class='del'>- * @ops: </div><div class='del'>- * @size: </div><div class='del'>- * </div><div class='del'>- * Create a new thread message, using ops as the receive/reply/free</div><div class='del'>- * ops, of @size bytes.</div><div class='del'>- *</div><div class='del'>- * @ops points to the operations used to recieve/process and finally</div><div class='del'>- * free the message.</div><div class='del'>- **/</div><div class='del'>-void *camel_session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size)</div><div class='del'>-{</div><div class='del'>-	g_assert(CAMEL_IS_SESSION(session));</div><div class='del'>-	g_assert(ops != NULL);</div><div class='del'>-	g_assert(size &gt;= sizeof(CamelSessionThreadMsg));</div><div class='del'>-		 </div><div class='del'>-	return CS_CLASS (session)-&gt;thread_msg_new(session, ops, size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_thread_msg_free:</div><div class='del'>- * @session: </div><div class='del'>- * @msg: </div><div class='del'>- * </div><div class='del'>- * Free a @msg.  Note that the message must have been allocated using</div><div class='del'>- * msg_new, and must nto have been submitted to any queue function.</div><div class='del'>- **/</div><div class='del'>-void camel_session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	g_assert(CAMEL_IS_SESSION(session));</div><div class='del'>-	g_assert(msg != NULL);</div><div class='del'>-	g_assert(msg-&gt;ops != NULL);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;thread_msg_free(session, msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_thread_queue:</div><div class='del'>- * @session: </div><div class='del'>- * @msg: </div><div class='del'>- * @flags: queue type flags, currently 0.</div><div class='del'>- * </div><div class='del'>- * Queue a thread message in another thread for processing.</div><div class='del'>- * The operation should be (but needn't) run in a queued manner</div><div class='del'>- * with other operations queued in this manner.</div><div class='del'>- * </div><div class='del'>- * Return value: The id of the operation queued.</div><div class='del'>- **/</div><div class='del'>-int camel_session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags)</div><div class='del'>-{</div><div class='del'>-	g_assert(CAMEL_IS_SESSION(session));</div><div class='del'>-	g_assert(msg != NULL);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;thread_queue(session, msg, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_thread_wait:</div><div class='del'>- * @session: </div><div class='del'>- * @id: </div><div class='del'>- * </div><div class='del'>- * Wait on an operation to complete (by id).</div><div class='del'>- **/</div><div class='del'>-void camel_session_thread_wait(CamelSession *session, int id)</div><div class='del'>-{</div><div class='del'>-	g_assert(CAMEL_IS_SESSION(session));</div><div class='del'>-	</div><div class='del'>-	if (id == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (session)-&gt;thread_wait(session, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-session.h b/camel/camel-session.h<br/>deleted file mode 100644<br/>index 00083fcdf8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-session.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,216 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-session.h : Abstract class for an email session */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SESSION_H</div><div class='del'>-#define CAMEL_SESSION_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-provider.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SESSION_TYPE     (camel_session_get_type ())</div><div class='del'>-#define CAMEL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))</div><div class='del'>-#define CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))</div><div class='del'>-#define CAMEL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef gboolean (*CamelTimeoutCallback) (gpointer data);</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SESSION_ALERT_INFO,</div><div class='del'>-	CAMEL_SESSION_ALERT_WARNING,</div><div class='del'>-	CAMEL_SESSION_ALERT_ERROR</div><div class='del'>-} CamelSessionAlertType;</div><div class='del'>-</div><div class='del'>-struct _CamelSession</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-	struct _CamelSessionPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *storage_path;</div><div class='del'>-	GHashTable *providers, *modules;</div><div class='del'>-	gboolean online;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-typedef struct _CamelSessionThreadOps CamelSessionThreadOps;</div><div class='del'>-typedef struct _CamelSessionThreadMsg CamelSessionThreadMsg;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void            (*register_provider) (CamelSession *session,</div><div class='del'>-					      CamelProvider *provider);</div><div class='del'>-	GList *         (*list_providers)    (CamelSession *session,</div><div class='del'>-					      gboolean load);</div><div class='del'>-	CamelProvider * (*get_provider)      (CamelSession *session,</div><div class='del'>-					      const char *url_string,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-	CamelService *  (*get_service)       (CamelSession *session,</div><div class='del'>-					      const char *url_string,</div><div class='del'>-					      CamelProviderType type,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-	char *          (*get_storage_path)  (CamelSession *session,</div><div class='del'>-					      CamelService *service,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-	char *          (*get_password)      (CamelSession *session,</div><div class='del'>-					      const char *prompt,</div><div class='del'>-					      gboolean secret,</div><div class='del'>-					      CamelService *service,</div><div class='del'>-					      const char *item,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-	void            (*forget_password)   (CamelSession *session,</div><div class='del'>-					      CamelService *service,</div><div class='del'>-					      const char *item,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-	gboolean        (*alert_user)        (CamelSession *session,</div><div class='del'>-					      CamelSessionAlertType type,</div><div class='del'>-					      const char *prompt,</div><div class='del'>-					      gboolean cancel);</div><div class='del'>-</div><div class='del'>-	guint           (*register_timeout)  (CamelSession *session,</div><div class='del'>-					      guint32 interval,</div><div class='del'>-					      CamelTimeoutCallback callback,</div><div class='del'>-					      gpointer user_data);</div><div class='del'>-	gboolean        (*remove_timeout)    (CamelSession *session,</div><div class='del'>-					      guint handle);</div><div class='del'>-</div><div class='del'>-	CamelFilterDriver * (*get_filter_driver) (CamelSession *session,</div><div class='del'>-						  const char *type,</div><div class='del'>-						  CamelException *ex);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	/* mechanism for creating and maintaining multiple threads of control */</div><div class='del'>-	void *(*thread_msg_new)(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);</div><div class='del'>-	void (*thread_msg_free)(CamelSession *session, CamelSessionThreadMsg *msg);</div><div class='del'>-	int (*thread_queue)(CamelSession *session, CamelSessionThreadMsg *msg, int flags);</div><div class='del'>-	void (*thread_wait)(CamelSession *session, int id);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-} CamelSessionClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_session_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void            camel_session_construct             (CamelSession *session,</div><div class='del'>-						     const char *storage_path);</div><div class='del'>-</div><div class='del'>-void            camel_session_register_provider     (CamelSession *session,</div><div class='del'>-						     CamelProvider *provider);</div><div class='del'>-GList *         camel_session_list_providers        (CamelSession *session,</div><div class='del'>-						     gboolean load);</div><div class='del'>-</div><div class='del'>-CamelProvider * camel_session_get_provider          (CamelSession *session,</div><div class='del'>-						     const char *url_string,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelService *  camel_session_get_service           (CamelSession *session,</div><div class='del'>-						     const char *url_string,</div><div class='del'>-						     CamelProviderType type,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-CamelService *  camel_session_get_service_connected (CamelSession *session, </div><div class='del'>-						     const char *url_string,</div><div class='del'>-						     CamelProviderType type, </div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-#define camel_session_get_store(session, url_string, ex) \</div><div class='del'>-	((CamelStore *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_STORE, ex))</div><div class='del'>-#define camel_session_get_transport(session, url_string, ex) \</div><div class='del'>-	((CamelTransport *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))</div><div class='del'>-</div><div class='del'>-char *             camel_session_get_storage_path   (CamelSession *session,</div><div class='del'>-						     CamelService *service,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-char *             camel_session_get_password       (CamelSession *session,</div><div class='del'>-						     const char *prompt,</div><div class='del'>-						     gboolean secret,</div><div class='del'>-						     CamelService *service,</div><div class='del'>-						     const char *item,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-void               camel_session_forget_password    (CamelSession *session,</div><div class='del'>-						     CamelService *service,</div><div class='del'>-						     const char *item,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-gboolean           camel_session_alert_user         (CamelSession *session,</div><div class='del'>-						     CamelSessionAlertType type,</div><div class='del'>-						     const char *prompt,</div><div class='del'>-						     gboolean cancel);</div><div class='del'>-</div><div class='del'>-guint              camel_session_register_timeout   (CamelSession *session,</div><div class='del'>-						     guint32 interval,</div><div class='del'>-						     CamelTimeoutCallback callback,</div><div class='del'>-						     gpointer user_data);</div><div class='del'>-</div><div class='del'>-gboolean           camel_session_remove_timeout     (CamelSession *session,</div><div class='del'>-						     guint handle);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean           camel_session_is_online          (CamelSession *session);</div><div class='del'>-void               camel_session_set_online         (CamelSession *session,</div><div class='del'>-						     gboolean online);</div><div class='del'>-</div><div class='del'>-CamelFilterDriver *camel_session_get_filter_driver  (CamelSession *session,</div><div class='del'>-						     const char *type,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-struct _CamelSessionThreadOps {</div><div class='del'>-	void (*receive)(CamelSession *session, struct _CamelSessionThreadMsg *m);</div><div class='del'>-	void (*free)(CamelSession *session, struct _CamelSessionThreadMsg *m);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelSessionThreadMsg {</div><div class='del'>-	EMsg msg;</div><div class='del'>-</div><div class='del'>-	CamelSessionThreadOps *ops;</div><div class='del'>-	int id;</div><div class='del'>-	/* user fields follow */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void *camel_session_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size);</div><div class='del'>-void camel_session_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *msg);</div><div class='del'>-int camel_session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg, int flags);</div><div class='del'>-void camel_session_thread_wait(CamelSession *session, int id);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SESSION_H */</div><div class='head'>diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c<br/>deleted file mode 100644<br/>index 9234b18988..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-smime-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-smime-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,953 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_NSS</div><div class='del'>-#include "camel-smime-context.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-</div><div class='del'>-#include "nss.h"</div><div class='del'>-#include &lt;cms.h&gt;</div><div class='del'>-#include &lt;cert.h&gt;</div><div class='del'>-#include &lt;certdb.h&gt;</div><div class='del'>-#include &lt;pkcs11.h&gt;</div><div class='del'>-#include &lt;smime.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt; /* for _() macro */</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-struct _CamelSMimeContextPrivate {</div><div class='del'>-	CERTCertDBHandle *certdb;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *smime_sign      (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					  const char *userid, gboolean signing_time,</div><div class='del'>-					  gboolean detached, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *smime_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					  const char *userid, GPtrArray *recipients,</div><div class='del'>-					  CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *smime_encrypt   (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					  const char *userid, GPtrArray *recipients, </div><div class='del'>-					  CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *smime_envelope  (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					  const char *userid, GPtrArray *recipients, </div><div class='del'>-					  CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *smime_decode    (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-					  CamelCMSValidityInfo **info, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelCMSContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_smime_context_init (CamelSMimeContext *context)</div><div class='del'>-{</div><div class='del'>-	context-&gt;priv = g_new0 (struct _CamelSMimeContextPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_smime_context_finalise (CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelSMimeContext *context = (CamelSMimeContext *)o;</div><div class='del'>-	</div><div class='del'>-	g_free (context-&gt;encryption_key);</div><div class='del'>-	g_free (context-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_smime_context_class_init (CamelSMimeContextClass *camel_smime_context_class)</div><div class='del'>-{</div><div class='del'>-	CamelCMSContextClass *camel_cms_context_class =</div><div class='del'>-		CAMEL_CMS_CONTEXT_CLASS (camel_smime_context_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_CMS_CONTEXT_CLASS (camel_type_get_global_classfuncs (camel_cms_context_get_type ()));</div><div class='del'>-	</div><div class='del'>-	camel_cms_context_class-&gt;sign = smime_sign;</div><div class='del'>-	camel_cms_context_class-&gt;certsonly = smime_certsonly;</div><div class='del'>-	camel_cms_context_class-&gt;encrypt = smime_encrypt;</div><div class='del'>-	camel_cms_context_class-&gt;envelope = smime_envelope;</div><div class='del'>-	camel_cms_context_class-&gt;decode = smime_decode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_smime_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_cms_context_get_type (),</div><div class='del'>-					    "CamelSMimeContext",</div><div class='del'>-					    sizeof (CamelSMimeContext),</div><div class='del'>-					    sizeof (CamelSMimeContextClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_smime_context_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_smime_context_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_smime_context_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_smime_context_new:</div><div class='del'>- * @session: CamelSession</div><div class='del'>- * @encryption_key: preferred encryption key (used when attaching cert chains to messages)</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelSMimeContext object which is used to sign,</div><div class='del'>- * verify, encrypt and decrypt streams.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelSMimeContext</div><div class='del'>- **/</div><div class='del'>-CamelSMimeContext *</div><div class='del'>-camel_smime_context_new (CamelSession *session, const char *encryption_key)</div><div class='del'>-{</div><div class='del'>-	CamelSMimeContext *context;</div><div class='del'>-	CERTCertDBHandle *certdb;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (session != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL);</div><div class='del'>-	</div><div class='del'>-	certdb = CERT_GetDefaultCertDB ();</div><div class='del'>-	if (!certdb)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	context = CAMEL_SMIME_CONTEXT (camel_object_new (CAMEL_SMIME_CONTEXT_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_cms_context_construct (CAMEL_CMS_CONTEXT (context), session);</div><div class='del'>-	</div><div class='del'>-	context-&gt;encryption_key = g_strdup (encryption_key);</div><div class='del'>-	context-&gt;priv-&gt;certdb = certdb;</div><div class='del'>-	</div><div class='del'>-	return context;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _GetPasswdData {</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	const char *userid;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-smime_get_password (PK11SlotInfo *info, PRBool retry, void *arg)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = ((struct _GetPasswdData *)arg)-&gt;session;</div><div class='del'>-	const char *userid = ((struct _GetPasswdData *)arg)-&gt;userid;</div><div class='del'>-	CamelException *ex = ((struct _GetPasswdData *)arg)-&gt;ex;</div><div class='del'>-	char *prompt, *passwd, *ret;</div><div class='del'>-	</div><div class='del'>-	prompt = g_strdup_printf (_("Please enter your password for %s"), userid);</div><div class='del'>-	passwd = camel_session_get_password (session, prompt, TRUE,</div><div class='del'>-					     NULL, userid, ex);</div><div class='del'>-	g_free (prompt);</div><div class='del'>-	</div><div class='del'>-	ret = PL_strdup (passwd);</div><div class='del'>-	g_free (passwd);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static PK11SymKey *</div><div class='del'>-decode_key_cb (void *arg, SECAlgorithmID *algid)</div><div class='del'>-{</div><div class='del'>-	return (PK11SymKey *)arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static NSSCMSMessage *</div><div class='del'>-signed_data (CamelSMimeContext *ctx, const char *userid, gboolean signing_time,</div><div class='del'>-	     gboolean detached, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	NSSCMSSignedData *sigd;</div><div class='del'>-	NSSCMSSignerInfo *signerinfo;</div><div class='del'>-	CERTCertificate *cert, *ekpcert;</div><div class='del'>-	</div><div class='del'>-	if (!userid) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Please indicate the nickname of a certificate to sign with."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ((cert = CERT_FindCertByNickname (ctx-&gt;priv-&gt;certdb, (char *) userid)) == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("The signature certificate for \"%s\" does not exist."),</div><div class='del'>-				      userid);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* create the cms message object */</div><div class='del'>-	cmsg = NSS_CMSMessage_Create (NULL);</div><div class='del'>-	</div><div class='del'>-	/* build chain of objects: message-&gt;signedData-&gt;data */</div><div class='del'>-	sigd = NSS_CMSSignedData_Create (cmsg);</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_SignedData (cmsg, cinfo, sigd); </div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSSignedData_GetContentInfo (sigd);</div><div class='del'>-	</div><div class='del'>-	/* speciffy whether we want detached signatures or not */</div><div class='del'>-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, detached);</div><div class='del'>-	</div><div class='del'>-	/* create &amp; attach signer information */</div><div class='del'>-	signerinfo = NSS_CMSSignerInfo_Create (cmsg, cert, SEC_OID_SHA1);</div><div class='del'>-	</div><div class='del'>-	/* include the cert chain */</div><div class='del'>-	NSS_CMSSignerInfo_IncludeCerts (signerinfo, NSSCMSCM_CertChain, </div><div class='del'>-					certUsageEmailSigner);</div><div class='del'>-	</div><div class='del'>-	if (signing_time) {</div><div class='del'>-		NSS_CMSSignerInfo_AddSigningTime (signerinfo, PR_Now ());</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (TRUE) {</div><div class='del'>-		/* Add S/MIME Capabilities */</div><div class='del'>-		NSS_CMSSignerInfo_AddSMIMECaps (signerinfo);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ctx-&gt;encryption_key) {</div><div class='del'>-		/* get the cert, add it to the message */</div><div class='del'>-		ekpcert = CERT_FindCertByNickname (ctx-&gt;priv-&gt;certdb, ctx-&gt;encryption_key);</div><div class='del'>-		if (!ekpcert) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("The encryption certificate for \"%s\" does not exist."),</div><div class='del'>-					      ctx-&gt;encryption_key);</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs (signerinfo, ekpcert, ctx-&gt;priv-&gt;certdb);</div><div class='del'>-		</div><div class='del'>-		NSS_CMSSignedData_AddCertificate (sigd, ekpcert);</div><div class='del'>-	} else {</div><div class='del'>-		/* check signing cert for fitness as encryption cert */</div><div class='del'>-		/* if yes, add signing cert as EncryptionKeyPreference */</div><div class='del'>-		NSS_CMSSignerInfo_AddSMIMEEncKeyPrefs (signerinfo, cert, ctx-&gt;priv-&gt;certdb);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	NSS_CMSSignedData_AddSignerInfo (sigd, signerinfo);</div><div class='del'>-	</div><div class='del'>-	return cmsg;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-smime_sign_restore (CamelMimePart *mime_part, GSList **encodings)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	if (!wrapper)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-		int parts, i;</div><div class='del'>-		</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));</div><div class='del'>-		for (i = 0; i &lt; parts; i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);</div><div class='del'>-			</div><div class='del'>-			smime_sign_restore (part, encodings);</div><div class='del'>-			*encodings = (*encodings)-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		CamelMimePartEncodingType encoding;</div><div class='del'>-		</div><div class='del'>-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			/* restore the message parts' subparts */</div><div class='del'>-			smime_sign_restore (CAMEL_MIME_PART (wrapper), encodings);</div><div class='del'>-		} else {</div><div class='del'>-			encoding = GPOINTER_TO_INT ((*encodings)-&gt;data);</div><div class='del'>-			</div><div class='del'>-			camel_mime_part_set_encoding (mime_part, encoding);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-smime_sign_prepare (CamelMimePart *mime_part, GSList **encodings)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	int parts, i;</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	if (!wrapper)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (CAMEL_IS_MULTIPART (wrapper)) {</div><div class='del'>-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));</div><div class='del'>-		for (i = 0; i &lt; parts; i++) {</div><div class='del'>-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);</div><div class='del'>-			</div><div class='del'>-			smime_sign_prepare (part, encodings);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		CamelMimePartEncodingType encoding;</div><div class='del'>-		</div><div class='del'>-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {</div><div class='del'>-			/* prepare the message parts' subparts */</div><div class='del'>-			smime_sign_prepare (CAMEL_MIME_PART (wrapper), encodings);</div><div class='del'>-		} else {</div><div class='del'>-			encoding = camel_mime_part_get_encoding (mime_part);</div><div class='del'>-			</div><div class='del'>-			/* FIXME: find the best encoding for this part and use that instead?? */</div><div class='del'>-			/* the encoding should really be QP or Base64 */</div><div class='del'>-			if (encoding != CAMEL_MIME_PART_ENCODING_BASE64)</div><div class='del'>-				camel_mime_part_set_encoding (mime_part, CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE);</div><div class='del'>-			</div><div class='del'>-			*encodings = g_slist_append (*encodings, GINT_TO_POINTER (encoding));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-smime_sign (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	    const char *userid, gboolean signing_time,</div><div class='del'>-	    gboolean detached, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mesg = NULL;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	PLArenaPool *arena;</div><div class='del'>-	NSSCMSEncoderContext *ecx;</div><div class='del'>-	SECItem output = { 0, 0, 0 };</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GSList *list, *encodings = NULL;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	cmsg = signed_data (CAMEL_SMIME_CONTEXT (ctx), userid, signing_time, detached, ex);</div><div class='del'>-	if (!cmsg)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	arena = PORT_NewArena (1024);</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &amp;output, arena,</div><div class='del'>-				    smime_get_password, data, NULL, NULL,</div><div class='del'>-				    NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	smime_sign_prepare (CAMEL_MIME_PART (message), &amp;encodings);</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	list = encodings;</div><div class='del'>-	smime_sign_restore (CAMEL_MIME_PART (message), &amp;list);</div><div class='del'>-	g_slist_free (encodings);</div><div class='del'>-	</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	</div><div class='del'>-	NSS_CMSEncoder_Update (ecx, buf-&gt;data, buf-&gt;len);</div><div class='del'>-	NSS_CMSEncoder_Finish (ecx);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	/* write the result to a camel stream */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write (stream, output.data, output.len);</div><div class='del'>-	PORT_FreeArena (arena, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	/* parse the stream into a new CamelMimeMessage */</div><div class='del'>-	mesg = camel_mime_message_new ();</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return mesg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static NSSCMSMessage *</div><div class='del'>-certsonly_data (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	NSSCMSSignedData *sigd;</div><div class='del'>-	CERTCertificate **rcerts;</div><div class='del'>-	int i = 0;</div><div class='del'>-	</div><div class='del'>-	/* find the signer's and the recipients' certs */</div><div class='del'>-	rcerts = g_new (CERTCertificate *, recipients-&gt;len + 2);</div><div class='del'>-	rcerts[0] = CERT_FindCertByNicknameOrEmailAddr (ctx-&gt;priv-&gt;certdb, (char *) userid);</div><div class='del'>-	if (!rcerts[0]) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to find certificate for \"%s\"."),</div><div class='del'>-				      recipients-&gt;pdata[i]);</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; recipients-&gt;len; i++) {</div><div class='del'>-		rcerts[i + 1] = CERT_FindCertByNicknameOrEmailAddr (ctx-&gt;priv-&gt;certdb,</div><div class='del'>-								    recipients-&gt;pdata[i]);</div><div class='del'>-		</div><div class='del'>-		if (!rcerts[i + 1]) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Failed to find certificate for \"%s\"."),</div><div class='del'>-					      recipients-&gt;pdata[i]);</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcerts[i + 1] = NULL;</div><div class='del'>-	</div><div class='del'>-	/* create the cms message object */</div><div class='del'>-	cmsg = NSS_CMSMessage_Create (NULL);</div><div class='del'>-	</div><div class='del'>-	sigd = NSS_CMSSignedData_CreateCertsOnly (cmsg, rcerts[0], PR_TRUE);</div><div class='del'>-	</div><div class='del'>-	/* add the recipient cert chain */</div><div class='del'>-	for (i = 0; i &lt; recipients-&gt;len; i++) {</div><div class='del'>-		NSS_CMSSignedData_AddCertChain (sigd, rcerts[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_SignedData (cmsg, cinfo, sigd);</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSSignedData_GetContentInfo (sigd);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	g_free (rcerts);</div><div class='del'>-	</div><div class='del'>-	return cmsg;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	g_free (rcerts);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-smime_certsonly (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		 const char *userid, GPtrArray *recipients,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mesg = NULL;</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	PLArenaPool *arena;</div><div class='del'>-	NSSCMSEncoderContext *ecx;</div><div class='del'>-	SECItem output = { 0, 0, 0 };</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	cmsg = certsonly_data (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);</div><div class='del'>-	if (!cmsg)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	arena = PORT_NewArena (1024);</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &amp;output, arena,</div><div class='del'>-				    smime_get_password, data, NULL, NULL,</div><div class='del'>-				    NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	</div><div class='del'>-	NSS_CMSEncoder_Update (ecx, buf-&gt;data, buf-&gt;len);</div><div class='del'>-	NSS_CMSEncoder_Finish (ecx);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	/* write the result to a camel stream */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write (stream, output.data, output.len);</div><div class='del'>-	PORT_FreeArena (arena, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	/* parse the stream into a new CamelMimeMessage */</div><div class='del'>-	mesg = camel_mime_message_new ();</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return mesg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static NSSCMSMessage *</div><div class='del'>-enveloped_data (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	NSSCMSEnvelopedData *envd;</div><div class='del'>-	NSSCMSRecipientInfo *rinfo;</div><div class='del'>-	CERTCertificate **rcerts;</div><div class='del'>-	SECOidTag bulkalgtag;</div><div class='del'>-	int keysize, i;</div><div class='del'>-	</div><div class='del'>-	/* find the recipient certs by email address or nickname */</div><div class='del'>-	rcerts = g_new (CERTCertificate *, recipients-&gt;len + 2);</div><div class='del'>-	rcerts[0] = CERT_FindCertByNicknameOrEmailAddr (ctx-&gt;priv-&gt;certdb, (char *) userid);</div><div class='del'>-	if (!rcerts[0]) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to find certificate for \"%s\"."),</div><div class='del'>-				      userid);</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; recipients-&gt;len; i++) {</div><div class='del'>-		rcerts[i + 1] = CERT_FindCertByNicknameOrEmailAddr (ctx-&gt;priv-&gt;certdb,  </div><div class='del'>-								    recipients-&gt;pdata[i]);</div><div class='del'>-		if (!rcerts[i + 1]) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Failed to find certificate for \"%s\"."),</div><div class='del'>-					      recipients-&gt;pdata[i]);</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	rcerts[i + 1] = NULL;</div><div class='del'>-	</div><div class='del'>-	/* find a nice bulk algorithm */</div><div class='del'>-	if (!NSS_SMIMEUtil_FindBulkAlgForRecipients (rcerts, &amp;bulkalgtag, &amp;keysize)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Failed to find a common bulk algorithm."));</div><div class='del'>-		goto exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* create a cms message object */</div><div class='del'>-	cmsg = NSS_CMSMessage_Create (NULL);</div><div class='del'>-	</div><div class='del'>-	envd = NSS_CMSEnvelopedData_Create (cmsg, bulkalgtag, keysize);</div><div class='del'>-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_EnvelopedData (cmsg, cinfo, envd);</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSEnvelopedData_GetContentInfo (envd);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	/* create &amp; attach recipient information */</div><div class='del'>-	for (i = 0; rcerts[i] != NULL; i++) {</div><div class='del'>-		rinfo = NSS_CMSRecipientInfo_Create (cmsg, rcerts[i]);</div><div class='del'>-		NSS_CMSEnvelopedData_AddRecipient (envd, rinfo);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (rcerts);</div><div class='del'>-	</div><div class='del'>-	return cmsg;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	g_free (rcerts);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-smime_envelope (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-		const char *userid, GPtrArray *recipients, </div><div class='del'>-		CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mesg = NULL;</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	PLArenaPool *arena;</div><div class='del'>-	NSSCMSEncoderContext *ecx;</div><div class='del'>-	SECItem output = { 0, 0, 0 };</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	cmsg = enveloped_data (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);</div><div class='del'>-	if (!cmsg)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	arena = PORT_NewArena (1024);</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = ctx-&gt;session;</div><div class='del'>-	data-&gt;userid = userid;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &amp;output, arena,</div><div class='del'>-				    smime_get_password, data, NULL, NULL,</div><div class='del'>-				    NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	</div><div class='del'>-	NSS_CMSEncoder_Update (ecx, buf-&gt;data, buf-&gt;len);</div><div class='del'>-	NSS_CMSEncoder_Finish (ecx);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	g_free (data);</div><div class='del'>-	</div><div class='del'>-	/* write the result to a camel stream */</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write (stream, output.data, output.len);</div><div class='del'>-	PORT_FreeArena (arena, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	/* parse the stream into a new CamelMimeMessage */</div><div class='del'>-	mesg = camel_mime_message_new ();</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return mesg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _BulkKey {</div><div class='del'>-	PK11SymKey *bulkkey;</div><div class='del'>-	SECOidTag bulkalgtag;</div><div class='del'>-	int keysize;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static NSSCMSMessage *</div><div class='del'>-encrypted_data (CamelSMimeContext *ctx, GByteArray *input, struct _BulkKey *key,</div><div class='del'>-		CamelStream *ostream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	NSSCMSEncryptedData *encd;</div><div class='del'>-	NSSCMSEncoderContext *ecx = NULL;</div><div class='del'>-	PLArenaPool *arena = NULL;</div><div class='del'>-	SECItem output = { 0, 0, 0 };</div><div class='del'>-	</div><div class='del'>-	/* arena for output */</div><div class='del'>-	arena = PORT_NewArena (1024);</div><div class='del'>-	</div><div class='del'>-	/* create cms message object */</div><div class='del'>-	cmsg = NSS_CMSMessage_Create (NULL);</div><div class='del'>-	</div><div class='del'>-	encd = NSS_CMSEncryptedData_Create (cmsg, key-&gt;bulkalgtag, key-&gt;keysize);</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSMessage_GetContentInfo (cmsg);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_EncryptedData (cmsg, cinfo, encd);</div><div class='del'>-	</div><div class='del'>-	cinfo = NSS_CMSEncryptedData_GetContentInfo (encd);</div><div class='del'>-	NSS_CMSContentInfo_SetContent_Data (cmsg, cinfo, NULL, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	ecx = NSS_CMSEncoder_Start (cmsg, NULL, NULL, &amp;output, arena, NULL, NULL,</div><div class='del'>-				    decode_key_cb, key-&gt;bulkkey, NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSEncoder_Update (ecx, input-&gt;data, input-&gt;len);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSEncoder_Finish (ecx);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (ostream, output.data, output.len);</div><div class='del'>-	</div><div class='del'>-	if (arena)</div><div class='del'>-		PORT_FreeArena (arena, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	return cmsg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _BulkKey *</div><div class='del'>-get_bulkkey (CamelSMimeContext *ctx, const char *userid, GPtrArray *recipients, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _BulkKey *bulkkey = NULL;</div><div class='del'>-	NSSCMSMessage *env_cmsg;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	SECItem dummyOut = { 0, 0, 0 };</div><div class='del'>-	SECItem dummyIn  = { 0, 0, 0 };</div><div class='del'>-	char str[] = "You are not a beautiful and unique snowflake.";</div><div class='del'>-	PLArenaPool *arena;</div><div class='del'>-	int i, nlevels;</div><div class='del'>-	</div><div class='del'>-	/* construct an enveloped data message to obtain bulk keys */</div><div class='del'>-	arena = PORT_NewArena (1024);</div><div class='del'>-	dummyIn.data = (unsigned char *)str;</div><div class='del'>-	dummyIn.len = strlen (str);</div><div class='del'>-	</div><div class='del'>-	env_cmsg = enveloped_data (ctx, userid, recipients, ex);</div><div class='del'>-	NSS_CMSDEREncode (env_cmsg, &amp;dummyIn, &amp;dummyOut, arena);</div><div class='del'>-	/*camel_stream_write (envstream, dummyOut.data, dummyOut.len);*/</div><div class='del'>-	PORT_FreeArena (arena, PR_FALSE);</div><div class='del'>-	</div><div class='del'>-	/* get the content info for the enveloped data */</div><div class='del'>-	nlevels = NSS_CMSMessage_ContentLevelCount (env_cmsg);</div><div class='del'>-	for (i = 0; i &lt; nlevels; i++) {</div><div class='del'>-		SECOidTag typetag;</div><div class='del'>-		</div><div class='del'>-		cinfo = NSS_CMSMessage_ContentLevel (env_cmsg, i);</div><div class='del'>-		typetag = NSS_CMSContentInfo_GetContentTypeTag (cinfo);</div><div class='del'>-		if (typetag == SEC_OID_PKCS7_DATA) {</div><div class='del'>-			bulkkey = g_new (struct _BulkKey, 1);</div><div class='del'>-			</div><div class='del'>-			/* get the symmertic key */</div><div class='del'>-			bulkkey-&gt;bulkalgtag = NSS_CMSContentInfo_GetContentEncAlgTag (cinfo);</div><div class='del'>-			bulkkey-&gt;keysize = NSS_CMSContentInfo_GetBulkKeySize (cinfo);</div><div class='del'>-			bulkkey-&gt;bulkkey = NSS_CMSContentInfo_GetBulkKey (cinfo);</div><div class='del'>-			</div><div class='del'>-			return bulkkey;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-smime_encrypt (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	       const char *userid, GPtrArray *recipients, </div><div class='del'>-	       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _BulkKey *bulkkey = NULL;</div><div class='del'>-	CamelMimeMessage *mesg = NULL;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	bulkkey = get_bulkkey (CAMEL_SMIME_CONTEXT (ctx), userid, recipients, ex);</div><div class='del'>-	if (!bulkkey)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	buf = g_byte_array_new ();</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buf);</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	cmsg = encrypted_data (CAMEL_SMIME_CONTEXT (ctx), buf, bulkkey, stream, ex);</div><div class='del'>-	g_byte_array_free (buf, TRUE);</div><div class='del'>-	g_free (bulkkey);</div><div class='del'>-	if (!cmsg) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	/* parse the stream into a new CamelMimeMessage */</div><div class='del'>-	mesg = camel_mime_message_new ();</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	return mesg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static NSSCMSMessage *</div><div class='del'>-decode_data (CamelSMimeContext *ctx, GByteArray *input, CamelStream *ostream,</div><div class='del'>-	     CamelCMSValidityInfo **info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	NSSCMSDecoderContext *dcx;</div><div class='del'>-	struct _GetPasswdData *data;</div><div class='del'>-	CamelCMSValidityInfo *vinfo = NULL;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	NSSCMSContentInfo *cinfo;</div><div class='del'>-	NSSCMSSignedData *sigd = NULL;</div><div class='del'>-	NSSCMSEnvelopedData *envd;</div><div class='del'>-	NSSCMSEncryptedData *encd;</div><div class='del'>-	int nlevels, i, nsigners, j;</div><div class='del'>-	char *signercn;</div><div class='del'>-	NSSCMSSignerInfo *si;</div><div class='del'>-	SECOidTag typetag;</div><div class='del'>-	SECItem *item;</div><div class='del'>-	</div><div class='del'>-	data = g_new (struct _GetPasswdData, 1);</div><div class='del'>-	data-&gt;session = CAMEL_CMS_CONTEXT (ctx)-&gt;session;</div><div class='del'>-	data-&gt;userid = NULL;</div><div class='del'>-	data-&gt;ex = ex;</div><div class='del'>-	</div><div class='del'>-	dcx = NSS_CMSDecoder_Start (NULL,</div><div class='del'>-				    NULL, NULL,</div><div class='del'>-				    smime_get_password, data,</div><div class='del'>-				    decode_key_cb,</div><div class='del'>-				    NULL);</div><div class='del'>-	</div><div class='del'>-	NSS_CMSDecoder_Update (dcx, input-&gt;data, input-&gt;len);</div><div class='del'>-	</div><div class='del'>-	cmsg = NSS_CMSDecoder_Finish (dcx);</div><div class='del'>-	g_free (data);</div><div class='del'>-	if (cmsg == NULL) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Failed to decode message."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	nlevels = NSS_CMSMessage_ContentLevelCount (cmsg);</div><div class='del'>-	for (i = 0; i &lt; nlevels; i++) {</div><div class='del'>-		CamelCMSSigner *signers = NULL;</div><div class='del'>-		</div><div class='del'>-		cinfo = NSS_CMSMessage_ContentLevel (cmsg, i);</div><div class='del'>-		typetag = NSS_CMSContentInfo_GetContentTypeTag (cinfo);</div><div class='del'>-		</div><div class='del'>-		if (info &amp;&amp; !vinfo) {</div><div class='del'>-			vinfo = g_new0 (CamelCMSValidityInfo, 1);</div><div class='del'>-			*info = vinfo;</div><div class='del'>-		} else if (vinfo) {</div><div class='del'>-			vinfo-&gt;next = g_new0 (CamelCMSValidityInfo, 1);</div><div class='del'>-			vinfo = vinfo-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		switch (typetag) {</div><div class='del'>-		case SEC_OID_PKCS7_SIGNED_DATA:</div><div class='del'>-			if (vinfo)</div><div class='del'>-				vinfo-&gt;type = CAMEL_CMS_TYPE_SIGNED;</div><div class='del'>-			</div><div class='del'>-			sigd = (NSSCMSSignedData *)NSS_CMSContentInfo_GetContent (cinfo);</div><div class='del'>-			</div><div class='del'>-			/* import the certificates */</div><div class='del'>-			NSS_CMSSignedData_ImportCerts (sigd, ctx-&gt;priv-&gt;certdb,</div><div class='del'>-						       certUsageEmailSigner, PR_FALSE);</div><div class='del'>-			</div><div class='del'>-			/* find out about signers */</div><div class='del'>-			nsigners = NSS_CMSSignedData_SignerInfoCount (sigd);</div><div class='del'>-			</div><div class='del'>-			if (nsigners == 0) {</div><div class='del'>-				/* must be a cert transport message */</div><div class='del'>-				SECStatus retval;</div><div class='del'>-				</div><div class='del'>-				/* XXX workaround for bug #54014 */</div><div class='del'>-				NSS_CMSSignedData_ImportCerts (sigd, ctx-&gt;priv-&gt;certdb, </div><div class='del'>-							       certUsageEmailSigner, PR_TRUE);</div><div class='del'>-				</div><div class='del'>-				retval = NSS_CMSSignedData_VerifyCertsOnly (sigd, ctx-&gt;priv-&gt;certdb, </div><div class='del'>-									    certUsageEmailSigner);</div><div class='del'>-				if (retval != SECSuccess) {</div><div class='del'>-					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Failed to verify certificates."));</div><div class='del'>-					goto exception;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				return cmsg;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			for (j = 0; vinfo &amp;&amp; j &lt; nsigners; j++) {</div><div class='del'>-				if (!signers) {</div><div class='del'>-					signers = g_new0 (CamelCMSSigner, 1);</div><div class='del'>-					vinfo-&gt;signers = signers;</div><div class='del'>-				} else {</div><div class='del'>-					signers-&gt;next = g_new0 (CamelCMSSigner, 1);</div><div class='del'>-					signers = signers-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				si = NSS_CMSSignedData_GetSignerInfo (sigd, j);</div><div class='del'>-				signercn = NSS_CMSSignerInfo_GetSignerCommonName (si);</div><div class='del'>-				if (signercn == NULL)</div><div class='del'>-					signercn = "";</div><div class='del'>-				</div><div class='del'>-				NSS_CMSSignedData_VerifySignerInfo (sigd, j, ctx-&gt;priv-&gt;certdb, </div><div class='del'>-								    certUsageEmailSigner);</div><div class='del'>-				</div><div class='del'>-				if (signers) {</div><div class='del'>-					signers-&gt;signercn = g_strdup (signercn);</div><div class='del'>-					signers-&gt;status = g_strdup (</div><div class='del'>-						NSS_CMSUtil_VerificationStatusToString (</div><div class='del'>-							NSS_CMSSignerInfo_GetVerificationStatus (si)));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case SEC_OID_PKCS7_ENVELOPED_DATA:</div><div class='del'>-			if (vinfo)</div><div class='del'>-				vinfo-&gt;type = CAMEL_CMS_TYPE_ENVELOPED;</div><div class='del'>-			</div><div class='del'>-			envd = (NSSCMSEnvelopedData *)NSS_CMSContentInfo_GetContent (cinfo);</div><div class='del'>-			break;</div><div class='del'>-		case SEC_OID_PKCS7_ENCRYPTED_DATA:</div><div class='del'>-			if (vinfo)</div><div class='del'>-				vinfo-&gt;type = CAMEL_CMS_TYPE_ENCRYPTED;</div><div class='del'>-			</div><div class='del'>-			encd = (NSSCMSEncryptedData *)NSS_CMSContentInfo_GetContent (cinfo);</div><div class='del'>-			break;</div><div class='del'>-		case SEC_OID_PKCS7_DATA:</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	item = NSS_CMSMessage_GetContent (cmsg);</div><div class='del'>-	camel_stream_write (ostream, item-&gt;data, item-&gt;len);</div><div class='del'>-	</div><div class='del'>-	return cmsg;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	if (info)</div><div class='del'>-		camel_cms_validity_info_free (*info);</div><div class='del'>-	</div><div class='del'>-	if (cmsg)</div><div class='del'>-		NSS_CMSMessage_Destroy (cmsg);</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-smime_decode (CamelCMSContext *ctx, CamelMimeMessage *message,</div><div class='del'>-	      CamelCMSValidityInfo **info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mesg = NULL;</div><div class='del'>-	NSSCMSMessage *cmsg = NULL;</div><div class='del'>-	CamelStream *stream, *ostream;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_mem_new ();</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream)-&gt;buffer;</div><div class='del'>-	</div><div class='del'>-	ostream = camel_stream_mem_new ();</div><div class='del'>-	cmsg = decode_data (CAMEL_SMIME_CONTEXT (ctx), buf, ostream, info, ex);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	if (!cmsg) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (ostream));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* construct a new mime message from the stream */</div><div class='del'>-	mesg = camel_mime_message_new ();</div><div class='del'>-	camel_stream_reset (ostream);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (mesg), ostream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ostream));</div><div class='del'>-	</div><div class='del'>-	return mesg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='head'>diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h<br/>deleted file mode 100644<br/>index 940d715d22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-smime-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-smime-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SMIME_CONTEXT_H</div><div class='del'>-#define CAMEL_SMIME_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-cms-context.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define CAMEL_SMIME_CONTEXT_TYPE     (camel_smime_context_get_type ())</div><div class='del'>-#define CAMEL_SMIME_CONTEXT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContext))</div><div class='del'>-#define CAMEL_SMIME_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMimeContextClass))</div><div class='del'>-#define CAMEL_IS_SMIME_CONTEXT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSMimeContext {</div><div class='del'>-	CamelCMSContext parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelSMimeContextPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	char *encryption_key;</div><div class='del'>-} CamelSMimeContext;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSMimeContextClass {</div><div class='del'>-	CamelCMSContextClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelSMimeContextClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType            camel_smime_context_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelSMimeContext   *camel_smime_context_new (CamelSession *session, const char *encryption_key);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SMIME_CONTEXT_H */</div><div class='head'>diff --git a/camel/camel-smime-utils.c b/camel/camel-smime-utils.c<br/>deleted file mode 100644<br/>index 188ed8a17f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-smime-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-smime-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-smime-utils.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/** rfc2633 stuff (aka S/MIME v3) ********************************/</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_smime_is_smime_v3_signed (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMultipart *mp;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-	const gchar *param, *micalg;</div><div class='del'>-	int nparts;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a multipart/signed */</div><div class='del'>-	type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-	if (!header_content_type_is (type, "multipart", "signed"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a protocol param with the value: "application/pkcs7-signature" */</div><div class='del'>-	param = header_content_type_param (type, "protocol");</div><div class='del'>-	if (!param || g_strcasecmp (param, "application/pkcs7-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a micalg parameter */</div><div class='del'>-	micalg = header_content_type_param (type, "micalg");</div><div class='del'>-	if (!micalg)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* check that we have exactly 2 subparts */</div><div class='del'>-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-	mp = CAMEL_MULTIPART (wrapper);</div><div class='del'>-	nparts = camel_multipart_get_number (mp);</div><div class='del'>-	if (nparts != 2)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The first part may be of any type except for </div><div class='del'>-	 * application/pkcs7-signature - check it. */</div><div class='del'>-	part = camel_multipart_get_part (mp, 0);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (header_content_type_is (type, "application", "pkcs7-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The second part should be application/pkcs7-signature. */</div><div class='del'>-	part = camel_multipart_get_part (mp, 1);</div><div class='del'>-	type = camel_mime_part_get_content_type (part);</div><div class='del'>-	if (!header_content_type_is (type, "application", "pkcs7-signature"))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_smime_is_smime_v3_encrypted (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	char *types[] = { "p7m", "p7c", "p7s", NULL };</div><div class='del'>-	const gchar *param, *filename;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* check that we have a application/pkcs7-mime part */</div><div class='del'>-	type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-	if (header_content_type_is (type, "application", "pkcs7-mime")) {</div><div class='del'>-		/* check to make sure it's an encrypted pkcs7-mime part? */</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (header_content_type_is (type, "application", "octet-stream")) {</div><div class='del'>-		/* check to see if we have a paremeter called "smime-type" */</div><div class='del'>-		param = header_content_type_param (type, "smime-type");</div><div class='del'>-		if (param)</div><div class='del'>-			return TRUE;</div><div class='del'>-		</div><div class='del'>-		/* check to see if there is a name param and if it has a smime extension */</div><div class='del'>-		param = header_content_type_param (type, "name");</div><div class='del'>-		if (param &amp;&amp; *param &amp;&amp; strlen (param) &gt; 4) {</div><div class='del'>-			for (i = 0; types[i]; i++)</div><div class='del'>-				if (!g_strcasecmp (param + strlen (param)-4, types[i]))</div><div class='del'>-					return TRUE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* check to see if there is a filename param and if it has a smime extension */</div><div class='del'>-		filename = camel_mime_part_get_filename (mime_part);</div><div class='del'>-		if (filename &amp;&amp; *filename &amp;&amp; strlen (filename) &gt; 4) {</div><div class='del'>-			for (i = 0; types[i]; i++)</div><div class='del'>-				if (!g_strcasecmp (filename + strlen (filename)-4, types[i]))</div><div class='del'>-					return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-smime-utils.h b/camel/camel-smime-utils.h<br/>deleted file mode 100644<br/>index 9259681d44..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-smime-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-smime-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SMIME_UTILS_H</div><div class='del'>-#define CAMEL_SMIME_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-gboolean camel_smime_is_smime_v3_signed (CamelMimePart *part);</div><div class='del'>-</div><div class='del'>-gboolean camel_smime_is_smime_v3_encrypted (CamelMimePart *part);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! CAMEL_SMIME_UTILS_H */</div><div class='head'>diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c<br/>deleted file mode 100644<br/>index 8cd2bf37dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-store-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,899 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-store-summary.h"</div><div class='del'>-</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include "e-util/md5-utils.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-#define io(x)			/* io debug */</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_SUMMARY_VERSION (13)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelStoreSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static int summary_header_load(CamelStoreSummary *, FILE *);</div><div class='del'>-static int summary_header_save(CamelStoreSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo * folder_info_new(CamelStoreSummary *, const char *);</div><div class='del'>-static CamelFolderInfo * folder_info_load(CamelStoreSummary *, FILE *);</div><div class='del'>-static int		 folder_info_save(CamelStoreSummary *, FILE *, CamelFolderInfo *);</div><div class='del'>-static void		 folder_info_free(CamelStoreSummary *, CamelFolderInfo *);</div><div class='del'>-</div><div class='del'>-static const char *folder_info_string(CamelStoreSummary *, const CamelFolderInfo *, int);</div><div class='del'>-static void folder_info_set_string(CamelStoreSummary *, CamelFolderInfo *, int, const char *);</div><div class='del'>-</div><div class='del'>-static void camel_store_summary_class_init (CamelStoreSummaryClass *klass);</div><div class='del'>-static void camel_store_summary_init       (CamelStoreSummary *obj);</div><div class='del'>-static void camel_store_summary_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_store_summary_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_summary_class_init (CamelStoreSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_store_summary_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	klass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	klass-&gt;folder_info_new  = folder_info_new;</div><div class='del'>-	klass-&gt;folder_info_load = folder_info_load;</div><div class='del'>-	klass-&gt;folder_info_save = folder_info_save;</div><div class='del'>-	klass-&gt;folder_info_free = folder_info_free;</div><div class='del'>-</div><div class='del'>-	klass-&gt;folder_info_string = folder_info_string;</div><div class='del'>-	klass-&gt;folder_info_set_string = folder_info_set_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_summary_init (CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStoreSummaryPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(s) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	s-&gt;folder_info_size = sizeof(CamelFolderInfo);</div><div class='del'>-</div><div class='del'>-	s-&gt;folder_info_chunks = NULL;</div><div class='del'>-</div><div class='del'>-	s-&gt;version = CAMEL_STORE_SUMMARY_VERSION;</div><div class='del'>-	s-&gt;flags = 0;</div><div class='del'>-	s-&gt;count = 0;</div><div class='del'>-	s-&gt;time = 0;</div><div class='del'>-</div><div class='del'>-	s-&gt;folders = g_ptr_array_new();</div><div class='del'>-	s-&gt;folders_full = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;summary_lock = g_mutex_new();</div><div class='del'>-	p-&gt;io_lock = g_mutex_new();</div><div class='del'>-	p-&gt;alloc_lock = g_mutex_new();</div><div class='del'>-	p-&gt;ref_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_summary_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStoreSummaryPrivate *p;</div><div class='del'>-	CamelStoreSummary *s = (CamelStoreSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj);</div><div class='del'>-</div><div class='del'>-	camel_store_summary_clear(s);</div><div class='del'>-	g_ptr_array_free(s-&gt;folders, TRUE);</div><div class='del'>-	g_hash_table_destroy(s-&gt;folders_full);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;folder_info_chunks)</div><div class='del'>-		e_memchunk_destroy(s-&gt;folder_info_chunks);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(p-&gt;summary_lock);</div><div class='del'>-	g_mutex_free(p-&gt;io_lock);</div><div class='del'>-	g_mutex_free(p-&gt;alloc_lock);</div><div class='del'>-	g_mutex_free(p-&gt;ref_lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_store_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelStoreSummary",</div><div class='del'>-					    sizeof (CamelStoreSummary),</div><div class='del'>-					    sizeof (CamelStoreSummaryClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_store_summary_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_store_summary_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_store_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelStoreSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelStoreSummary widget.</div><div class='del'>- **/</div><div class='del'>-CamelStoreSummary *</div><div class='del'>-camel_store_summary_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelStoreSummary *new = CAMEL_STORE_SUMMARY ( camel_object_new (camel_store_summary_get_type ()));	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_set_filename:</div><div class='del'>- * @s: </div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Set the filename where the summary will be loaded to/saved from.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_set_filename(CamelStoreSummary *s, const char *name)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;summary_path);</div><div class='del'>-	s-&gt;summary_path = g_strdup(name);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_store_summary_set_uri_prefix(CamelStoreSummary *s, const char *prefix)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;uri_prefix);</div><div class='del'>-	s-&gt;uri_prefix = g_strdup(prefix);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_count:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Get the number of summary items stored in this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: The number of items int he summary.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_store_summary_count(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	return s-&gt;folders-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_index:</div><div class='del'>- * @s: </div><div class='del'>- * @i: </div><div class='del'>- * </div><div class='del'>- * Retrieve a summary item by index number.</div><div class='del'>- *</div><div class='del'>- * A referenced to the summary item is returned, which may be</div><div class='del'>- * ref'd or free'd as appropriate.</div><div class='del'>- * </div><div class='del'>- * Return value: The summary item, or NULL if the index @i is out</div><div class='del'>- * of range.</div><div class='del'>- * It must be freed using camel_store_summary_info_free().</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_summary_index(CamelStoreSummary *s, int i)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	if (i&lt;s-&gt;folders-&gt;len)</div><div class='del'>-		info = g_ptr_array_index(s-&gt;folders, i);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_index:</div><div class='del'>- * @s: </div><div class='del'>- * @i: </div><div class='del'>- * </div><div class='del'>- * Obtain a copy of the summary array.  This is done atomically,</div><div class='del'>- * so cannot contain empty entries.</div><div class='del'>- *</div><div class='del'>- * It must be freed using camel_store_summary_array_free().</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_store_summary_array(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-	GPtrArray *res = g_ptr_array_new();</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_set_size(res, s-&gt;folders-&gt;len);</div><div class='del'>-	for (i=0;i&lt;s-&gt;folders-&gt;len;i++) {</div><div class='del'>-		info = res-&gt;pdata[i] = g_ptr_array_index(s-&gt;folders, i);</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_array_free:</div><div class='del'>- * @s: </div><div class='del'>- * @array: </div><div class='del'>- * </div><div class='del'>- * Free the folder summary array.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_summary_array_free(CamelStoreSummary *s, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;array-&gt;len;i++)</div><div class='del'>-		camel_store_summary_info_free(s, array-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_full:</div><div class='del'>- * @s: </div><div class='del'>- * @full: </div><div class='del'>- * </div><div class='del'>- * Retrieve a summary item by full name.</div><div class='del'>- *</div><div class='del'>- * A referenced to the summary item is returned, which may be</div><div class='del'>- * ref'd or free'd as appropriate.</div><div class='del'>- * </div><div class='del'>- * Return value: The summary item, or NULL if the @full name</div><div class='del'>- * is not available.</div><div class='del'>- * It must be freed using camel_store_summary_info_free().</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_summary_full(CamelStoreSummary *s, const char *full)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	info = g_hash_table_lookup(s-&gt;folders_full, full);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	if (info)</div><div class='del'>-		info-&gt;refcount++;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_store_summary_load(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *in;</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderInfo *mi;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	in = fopen(s-&gt;summary_path, "r");</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-	if ( ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_load(s, in) == -1)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	/* now read in each message ... */</div><div class='del'>-	for (i=0;i&lt;s-&gt;count;i++) {</div><div class='del'>-		mi = ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;folder_info_load(s, in);</div><div class='del'>-</div><div class='del'>-		if (mi == NULL)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		camel_store_summary_add(s, mi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	</div><div class='del'>-	if (fclose(in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	g_warning("Cannot load summary file: %s", strerror(ferror(in)));</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	fclose(in);</div><div class='del'>-	s-&gt;flags |= ~CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_save:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Writes the summary to disk.  The summary is only written if changes</div><div class='del'>- * have occured.</div><div class='del'>- * </div><div class='del'>- * Return value: Returns -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_store_summary_save(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *out;</div><div class='del'>-	int fd;</div><div class='del'>-	int i;</div><div class='del'>-	guint32 count;</div><div class='del'>-	CamelFolderInfo *mi;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;flags &amp; CAMEL_STORE_SUMMARY_DIRTY) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	fd = open(s-&gt;summary_path, O_RDWR|O_CREAT, 0600);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	out = fdopen(fd, "w");</div><div class='del'>-	if ( out == NULL ) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	io(printf("saving header\n"));</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-</div><div class='del'>-	if ( ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_save(s, out) == -1) {</div><div class='del'>-		fclose(out);</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now write out each message ... */</div><div class='del'>-</div><div class='del'>-	/* FIXME: Locking? */</div><div class='del'>-</div><div class='del'>-	count = s-&gt;folders-&gt;len;</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		mi = s-&gt;folders-&gt;pdata[i];</div><div class='del'>-		((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;folder_info_save(s, out, mi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-</div><div class='del'>-	if (fclose(out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_header_load:</div><div class='del'>- * @s: Summary object.</div><div class='del'>- * </div><div class='del'>- * Only load the header information from the summary,</div><div class='del'>- * keep the rest on disk.  This should only be done on</div><div class='del'>- * a fresh summary object.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int camel_store_summary_header_load(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	FILE *in;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	in = fopen(s-&gt;summary_path, "r");</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, io_lock);</div><div class='del'>-	ret = ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;summary_header_load(s, in);</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, io_lock);</div><div class='del'>-	</div><div class='del'>-	fclose(in);</div><div class='del'>-	s-&gt;flags &amp;= ~CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_add:</div><div class='del'>- * @s: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Adds a new @info record to the summary.  If @info-&gt;uid is NULL, then a new</div><div class='del'>- * uid is automatically re-assigned by calling :next_uid_string().</div><div class='del'>- *</div><div class='del'>- * The @info record should have been generated by calling one of the</div><div class='del'>- * info_new_*() functions, as it will be free'd based on the summary</div><div class='del'>- * class.  And MUST NOT be allocated directly using malloc.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_add(CamelStoreSummary *s, CamelFolderInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (camel_folder_info_full(s, info) == NULL) {</div><div class='del'>-		g_warning("Trying to add a folder info with missing required full name\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_add(s-&gt;folders, info);</div><div class='del'>-	g_hash_table_insert(s-&gt;folders_full, (char *)camel_folder_info_full(s, info), info);</div><div class='del'>-	s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_add_from_full:</div><div class='del'>- * @s: </div><div class='del'>- * @h: </div><div class='del'>- * </div><div class='del'>- * Build a new info record based on the name, and add it to the summary.</div><div class='del'>- *</div><div class='del'>- * Return value: The newly added record.</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *camel_store_summary_add_from_full(CamelStoreSummary *s, const char *full)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	info = g_hash_table_lookup(s-&gt;folders_full, full);</div><div class='del'>-	if (info != NULL) {</div><div class='del'>-		g_warning("Trying to add folder '%s' to summary that already has it", full);</div><div class='del'>-		info = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		info = camel_store_summary_info_new_from_full(s, full);</div><div class='del'>-		g_ptr_array_add(s-&gt;folders, info);</div><div class='del'>-		g_hash_table_insert(s-&gt;folders_full, (char *)camel_folder_info_full(s, info), info);</div><div class='del'>-		s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_info_new_from_full:</div><div class='del'>- * @s: </div><div class='del'>- * @h: </div><div class='del'>- * </div><div class='del'>- * Create a new info record from a name.</div><div class='del'>- * </div><div class='del'>- * Return value: Guess?  This info record MUST be freed using</div><div class='del'>- * camel_store_summary_info_free(), camel_folder_info_free() will not work.</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *camel_store_summary_info_new_from_full(CamelStoreSummary *s, const char *f)</div><div class='del'>-{</div><div class='del'>-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s))) -&gt; folder_info_new(s, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_info_free:</div><div class='del'>- * @s: </div><div class='del'>- * @mi: </div><div class='del'>- * </div><div class='del'>- * Unref and potentially free the message info @mi, and all associated memory.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_info_free(CamelStoreSummary *s, CamelFolderInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_assert(mi);</div><div class='del'>-	g_assert(s);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	g_assert(mi-&gt;refcount &gt;= 1);</div><div class='del'>-</div><div class='del'>-	mi-&gt;refcount--;</div><div class='del'>-	if (mi-&gt;refcount &gt; 0) {</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-</div><div class='del'>-	((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;folder_info_free(s, mi);		</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_info_ref:</div><div class='del'>- * @s: </div><div class='del'>- * @mi: </div><div class='del'>- * </div><div class='del'>- * Add an extra reference to @mi.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_info_ref(CamelStoreSummary *s, CamelFolderInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_assert(mi);</div><div class='del'>-	g_assert(s);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	g_assert(mi-&gt;refcount &gt;= 1);</div><div class='del'>-	mi-&gt;refcount++;</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_touch:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Mark the summary as changed, so that a save will save it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_summary_touch(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_clear:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Empty the summary contents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_summary_clear(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	if (camel_store_summary_count(s) == 0) {</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;s-&gt;folders-&gt;len;i++)</div><div class='del'>-		camel_store_summary_info_free(s, s-&gt;folders-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_set_size(s-&gt;folders, 0);</div><div class='del'>-	g_hash_table_destroy(s-&gt;folders_full);</div><div class='del'>-	s-&gt;folders_full = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_remove:</div><div class='del'>- * @s: </div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Remove a specific @info record from the summary.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_remove(CamelStoreSummary *s, CamelFolderInfo *info)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	g_hash_table_remove(s-&gt;folders_full, camel_folder_info_full(s, info));</div><div class='del'>-	g_ptr_array_remove(s-&gt;folders, info);</div><div class='del'>-	s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	camel_store_summary_info_free(s, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_remove_uid:</div><div class='del'>- * @s: </div><div class='del'>- * @full: </div><div class='del'>- * </div><div class='del'>- * Remove a specific info record from the summary, by @full.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_remove_full(CamelStoreSummary *s, const char *full)</div><div class='del'>-{</div><div class='del'>-        CamelFolderInfo *oldinfo;</div><div class='del'>-        char *oldfull;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, ref_lock);</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-        if (g_hash_table_lookup_extended(s-&gt;folders_full, full, (void *)&amp;oldfull, (void *)&amp;oldinfo)) {</div><div class='del'>-		/* make sure it doesn't vanish while we're removing it */</div><div class='del'>-		oldinfo-&gt;refcount++;</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-		camel_store_summary_remove(s, oldinfo);</div><div class='del'>-		camel_store_summary_info_free(s, oldinfo);</div><div class='del'>-        } else {</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, ref_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_remove_index:</div><div class='del'>- * @s: </div><div class='del'>- * @index: </div><div class='del'>- * </div><div class='del'>- * Remove a specific info record from the summary, by index.</div><div class='del'>- **/</div><div class='del'>-void camel_store_summary_remove_index(CamelStoreSummary *s, int index)</div><div class='del'>-{</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	if (index &lt; s-&gt;folders-&gt;len) {</div><div class='del'>-		CamelFolderInfo *info = s-&gt;folders-&gt;pdata[index];</div><div class='del'>-</div><div class='del'>-		g_hash_table_remove(s-&gt;folders_full, camel_folder_info_full(s, info));</div><div class='del'>-		g_ptr_array_remove_index(s-&gt;folders, index);</div><div class='del'>-		s-&gt;flags |= CAMEL_STORE_SUMMARY_DIRTY;</div><div class='del'>-</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-		camel_store_summary_info_free(s, info);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load(CamelStoreSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	gint32 version, flags, count;</div><div class='del'>-	time_t time;</div><div class='del'>-</div><div class='del'>-	fseek(in, 0, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	io(printf("Loading header\n"));</div><div class='del'>-</div><div class='del'>-	if (camel_file_util_decode_fixed_int32(in, &amp;version) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;flags) == -1</div><div class='del'>-	    || camel_file_util_decode_time_t(in, &amp;time) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;count) == -1) {</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s-&gt;flags = flags;</div><div class='del'>-	s-&gt;time = time;</div><div class='del'>-	s-&gt;count = count;</div><div class='del'>-	if (s-&gt;version != version) {</div><div class='del'>-		g_warning("Summary header version mismatch");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save(CamelStoreSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	fseek(out, 0, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	io(printf("Savining header\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, s-&gt;version);</div><div class='del'>-	camel_file_util_encode_fixed_int32(out, s-&gt;flags);</div><div class='del'>-	camel_file_util_encode_time_t(out, s-&gt;time);</div><div class='del'>-	return camel_file_util_encode_fixed_int32(out, camel_store_summary_count(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_summary_info_new:</div><div class='del'>- * @s: </div><div class='del'>- * </div><div class='del'>- * Allocate a new camel message info, suitable for adding</div><div class='del'>- * to this summary.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_summary_info_new(CamelStoreSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *mi;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_SUMMARY_LOCK(s, alloc_lock);</div><div class='del'>-	if (s-&gt;folder_info_chunks == NULL)</div><div class='del'>-		s-&gt;folder_info_chunks = e_memchunk_new(32, s-&gt;folder_info_size);</div><div class='del'>-	mi = e_memchunk_alloc0(s-&gt;folder_info_chunks);</div><div class='del'>-	CAMEL_STORE_SUMMARY_UNLOCK(s, alloc_lock);</div><div class='del'>-	mi-&gt;refcount = 1;</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *camel_folder_info_string(CamelStoreSummary *s, const CamelFolderInfo *mi, int type)</div><div class='del'>-{</div><div class='del'>-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;folder_info_string(s, mi, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_folder_info_set_string(CamelStoreSummary *s, CamelFolderInfo *mi, int type, const char *value)</div><div class='del'>-{</div><div class='del'>-	return ((CamelStoreSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;folder_info_set_string(s, mi, type, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-folder_info_new(CamelStoreSummary *s, const char *f)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = camel_store_summary_info_new(s);</div><div class='del'>-</div><div class='del'>-	mi-&gt;full = g_strdup(f);</div><div class='del'>-	mi-&gt;unread = CAMEL_STORE_SUMMARY_UNKNOWN;</div><div class='del'>-	mi-&gt;total = CAMEL_STORE_SUMMARY_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-folder_info_load(CamelStoreSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = camel_store_summary_info_new(s);</div><div class='del'>-</div><div class='del'>-	io(printf("Loading folder info\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_decode_string(in, &amp;mi-&gt;full);</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;mi-&gt;flags);</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;mi-&gt;unread);</div><div class='del'>-	camel_file_util_decode_uint32(in, &amp;mi-&gt;total);</div><div class='del'>-</div><div class='del'>-	if (!ferror(in))</div><div class='del'>-		return mi;</div><div class='del'>-</div><div class='del'>-	camel_store_summary_info_free(s, mi);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-folder_info_save(CamelStoreSummary *s, FILE *out, CamelFolderInfo *mi)</div><div class='del'>-{</div><div class='del'>-	io(printf("Saving folder info\n"));</div><div class='del'>-</div><div class='del'>-	camel_file_util_encode_string(out, camel_folder_info_full(s, mi));</div><div class='del'>-	camel_file_util_encode_uint32(out, mi-&gt;flags);</div><div class='del'>-	camel_file_util_encode_uint32(out, mi-&gt;unread);</div><div class='del'>-	camel_file_util_encode_uint32(out, mi-&gt;total);</div><div class='del'>-</div><div class='del'>-	return ferror(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_info_free(CamelStoreSummary *s, CamelFolderInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_free(mi-&gt;full);</div><div class='del'>-	g_free(mi-&gt;uri);</div><div class='del'>-	e_memchunk_free(s-&gt;folder_info_chunks, mi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-folder_info_string(CamelStoreSummary *s, const CamelFolderInfo *mi, int type)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Locks? */</div><div class='del'>-</div><div class='del'>-	g_assert (mi != NULL);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAMEL_STORE_SUMMARY_FULL:</div><div class='del'>-		return mi-&gt;full;</div><div class='del'>-	case CAMEL_STORE_SUMMARY_NAME:</div><div class='del'>-		p = strrchr(mi-&gt;full, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			return p;</div><div class='del'>-		else</div><div class='del'>-			return mi-&gt;full;</div><div class='del'>-	case CAMEL_STORE_SUMMARY_URI:</div><div class='del'>-		if (mi-&gt;uri)</div><div class='del'>-			return mi-&gt;uri;</div><div class='del'>-		if (s-&gt;uri_prefix)</div><div class='del'>-			return (((CamelFolderInfo *)mi)-&gt;uri = g_strdup_printf("%s%s", s-&gt;uri_prefix, mi-&gt;full));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_info_set_string (CamelStoreSummary *s, CamelFolderInfo *mi, int type, const char *str)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	char *v;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	g_assert (mi != NULL);</div><div class='del'>-</div><div class='del'>-	switch(type) {</div><div class='del'>-	case CAMEL_STORE_SUMMARY_FULL:</div><div class='del'>-		g_free(mi-&gt;full);</div><div class='del'>-		g_free(mi-&gt;uri);</div><div class='del'>-		mi-&gt;full = g_strdup(str);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STORE_SUMMARY_NAME:</div><div class='del'>-		p = strrchr(mi-&gt;full, '/');</div><div class='del'>-		if (p) {</div><div class='del'>-			len = p-mi-&gt;full+1;</div><div class='del'>-			v = g_malloc(len+strlen(str)+1);</div><div class='del'>-			memcpy(v, mi-&gt;full, len);</div><div class='del'>-			strcpy(v+len, str);</div><div class='del'>-		} else {</div><div class='del'>-			v = g_strdup(str);</div><div class='del'>-		}</div><div class='del'>-		g_free(mi-&gt;full);</div><div class='del'>-		mi-&gt;full = v;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STORE_SUMMARY_URI:</div><div class='del'>-		if (s-&gt;uri_prefix) {</div><div class='del'>-			len = strlen(s-&gt;uri_prefix);</div><div class='del'>-			if (len &gt; strlen(str)</div><div class='del'>-			    || strncmp(s-&gt;uri_prefix, str, len) != 0) {</div><div class='del'>-				g_warning("Trying to set folderinfo uri '%s' for summary with prefix '%s'",</div><div class='del'>-					  str, s-&gt;uri_prefix);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			g_free(mi-&gt;full);</div><div class='del'>-			g_free(mi-&gt;uri);</div><div class='del'>-			mi-&gt;full = g_strdup(str + len);</div><div class='del'>-			mi-&gt;uri = g_strdup(str);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Trying to set folderinfo uri '%s' for summary with no uri prefix", str);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h<br/>deleted file mode 100644<br/>index a26d2fa84c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-store-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_STORE_SUMMARY_H</div><div class='del'>-#define _CAMEL_STORE_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-parser.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_store_summary_get_type (), CamelStoreSummary)</div><div class='del'>-#define CAMEL_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_store_summary_get_type (), CamelStoreSummaryClass)</div><div class='del'>-#define CAMEL_IS_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_store_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStoreSummary      CamelStoreSummary;</div><div class='del'>-typedef struct _CamelStoreSummaryClass CamelStoreSummaryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderInfo CamelFolderInfo;</div><div class='del'>-</div><div class='del'>-enum _CamelFolderFlags {</div><div class='del'>-	CAMEL_STORE_SUMMARY_FOLDER_NOSELECT,</div><div class='del'>-	CAMEL_STORE_SUMMARY_FOLDER_READONLY,</div><div class='del'>-	CAMEL_STORE_SUMMARY_FOLDER_SUBSCRIBED,</div><div class='del'>-	CAMEL_STORE_SUMMARY_FOLDER_FLAGGED,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_SUMMARY_UNKNOWN (~0)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_STORE_SUMMARY_FULL = 0,</div><div class='del'>-	CAMEL_STORE_SUMMARY_NAME,</div><div class='del'>-	CAMEL_STORE_SUMMARY_URI,</div><div class='del'>-	CAMEL_STORE_SUMMARY_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolderInfo {</div><div class='del'>-	guint32 refcount;</div><div class='del'>-	char *uri;</div><div class='del'>-	char *full;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	guint32 unread;</div><div class='del'>-	guint32 total;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _CamelStoreSummaryFlags {</div><div class='del'>-	CAMEL_STORE_SUMMARY_DIRTY = 1&lt;&lt;0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStoreSummary {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelStoreSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	/* header info */</div><div class='del'>-	guint32 version;	/* version of file required, should be set by implementors */</div><div class='del'>-	guint32 flags;		/* flags */</div><div class='del'>-	guint32 count;		/* how many were saved/loaded */</div><div class='del'>-	time_t time;		/* timestamp for this summary (for implementors to use) */</div><div class='del'>-</div><div class='del'>-	/* sizes of memory objects */</div><div class='del'>-	guint32 folder_info_size;</div><div class='del'>-</div><div class='del'>-	/* memory allocators (setup automatically) */</div><div class='del'>-	struct _EMemChunk *folder_info_chunks;</div><div class='del'>-</div><div class='del'>-	char *summary_path;</div><div class='del'>-	char *uri_prefix;</div><div class='del'>-</div><div class='del'>-	GPtrArray *folders;	/* CamelFolderInfo's */</div><div class='del'>-	GHashTable *folders_full; /* CamelFolderInfo's by full name */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStoreSummaryClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* load/save the global info */</div><div class='del'>-	int (*summary_header_load)(CamelStoreSummary *, FILE *);</div><div class='del'>-	int (*summary_header_save)(CamelStoreSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-	/* create/save/load an individual message info */</div><div class='del'>-	CamelFolderInfo * (*folder_info_new)(CamelStoreSummary *, const char *full);</div><div class='del'>-	CamelFolderInfo * (*folder_info_load)(CamelStoreSummary *, FILE *);</div><div class='del'>-	int		  (*folder_info_save)(CamelStoreSummary *, FILE *, CamelFolderInfo *);</div><div class='del'>-	void		  (*folder_info_free)(CamelStoreSummary *, CamelFolderInfo *);</div><div class='del'>-</div><div class='del'>-	/* virtualise access methods */</div><div class='del'>-	const char *(*folder_info_string)(CamelStoreSummary *, const CamelFolderInfo *, int);</div><div class='del'>-	void (*folder_info_set_string)(CamelStoreSummary *, CamelFolderInfo *, int, const char *);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType			 camel_store_summary_get_type	(void);</div><div class='del'>-CamelStoreSummary      *camel_store_summary_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_store_summary_set_filename(CamelStoreSummary *, const char *);</div><div class='del'>-void camel_store_summary_set_uri_prefix(CamelStoreSummary *, const char *);</div><div class='del'>-</div><div class='del'>-/* load/save the summary in its entirety */</div><div class='del'>-int camel_store_summary_load(CamelStoreSummary *);</div><div class='del'>-int camel_store_summary_save(CamelStoreSummary *);</div><div class='del'>-</div><div class='del'>-/* only load the header */</div><div class='del'>-int camel_store_summary_header_load(CamelStoreSummary *);</div><div class='del'>-</div><div class='del'>-/* set the dirty bit on the summary */</div><div class='del'>-void camel_store_summary_touch(CamelStoreSummary *s);</div><div class='del'>-</div><div class='del'>-/* add a new raw summary item */</div><div class='del'>-void camel_store_summary_add(CamelStoreSummary *, CamelFolderInfo *info);</div><div class='del'>-</div><div class='del'>-/* build/add raw summary items */</div><div class='del'>-CamelFolderInfo *camel_store_summary_add_from_full(CamelStoreSummary *, const char *);</div><div class='del'>-</div><div class='del'>-/* Just build raw summary items */</div><div class='del'>-CamelFolderInfo *camel_store_summary_info_new(CamelStoreSummary *s);</div><div class='del'>-CamelFolderInfo *camel_store_summary_info_new_from_full(CamelStoreSummary *s, const char *);</div><div class='del'>-</div><div class='del'>-void camel_store_summary_info_ref(CamelStoreSummary *, CamelFolderInfo *);</div><div class='del'>-void camel_store_summary_info_free(CamelStoreSummary *, CamelFolderInfo *);</div><div class='del'>-</div><div class='del'>-/* removes a summary item */</div><div class='del'>-void camel_store_summary_remove(CamelStoreSummary *s, CamelFolderInfo *info);</div><div class='del'>-void camel_store_summary_remove_full(CamelStoreSummary *s, const char *full);</div><div class='del'>-void camel_store_summary_remove_index(CamelStoreSummary *s, int);</div><div class='del'>-</div><div class='del'>-/* remove all items */</div><div class='del'>-void camel_store_summary_clear(CamelStoreSummary *s);</div><div class='del'>-</div><div class='del'>-/* lookup functions */</div><div class='del'>-int camel_store_summary_count(CamelStoreSummary *);</div><div class='del'>-CamelFolderInfo *camel_store_summary_index(CamelStoreSummary *, int);</div><div class='del'>-CamelFolderInfo *camel_store_summary_full(CamelStoreSummary *, const char *uid);</div><div class='del'>-GPtrArray *camel_store_summary_array(CamelStoreSummary *s);</div><div class='del'>-void camel_store_summary_array_free(CamelStoreSummary *s, GPtrArray *array);</div><div class='del'>-</div><div class='del'>-const char *camel_folder_info_string(CamelStoreSummary *, const CamelFolderInfo *, int type);</div><div class='del'>-void camel_folder_info_set_string(CamelStoreSummary *, CamelFolderInfo *, int type, const char *value);</div><div class='del'>-</div><div class='del'>-/* helper macro's */</div><div class='del'>-#define camel_folder_info_full(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_FULL))</div><div class='del'>-#define camel_folder_info_uri(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_URI))</div><div class='del'>-#define camel_folder_info_name(s, i) (camel_folder_info_string((CamelStoreSummary *)s, (const CamelFolderInfo *)i, CAMEL_STORE_SUMMARY_NAME))</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_STORE_SUMMARY_H */</div><div class='head'>diff --git a/camel/camel-store.c b/camel/camel-store.c<br/>deleted file mode 100644<br/>index ab3d667fde..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1150 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-store.c : Abstract class for an email store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-vtrash-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-static CamelServiceClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStore */</div><div class='del'>-#define CS_CLASS(so) ((CamelStoreClass *)((CamelObject *)(so))-&gt;klass)</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-				guint32 flags, CamelException *ex);</div><div class='del'>-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void        init_trash (CamelStore *store);</div><div class='del'>-static CamelFolder *get_trash (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *create_folder (CamelStore *store,</div><div class='del'>-				       const char *parent_name,</div><div class='del'>-				       const char *folder_name,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-static void delete_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			   CamelException *ex);</div><div class='del'>-static void rename_folder (CamelStore *store, const char *old_name,</div><div class='del'>-			   const char *new_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void store_sync (CamelStore *store, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-					 guint32 flags, CamelException *ex);</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *tree);</div><div class='del'>-</div><div class='del'>-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);</div><div class='del'>-static void subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session,</div><div class='del'>-		       CamelProvider *provider, CamelURL *url,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static int store_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_class_init (CamelStoreClass *camel_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class = CAMEL_OBJECT_CLASS (camel_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_store_class-&gt;hash_folder_name = g_str_hash;</div><div class='del'>-	camel_store_class-&gt;compare_folder_name = g_str_equal;</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_inbox = get_inbox;</div><div class='del'>-	camel_store_class-&gt;init_trash = init_trash;</div><div class='del'>-	camel_store_class-&gt;get_trash = get_trash;</div><div class='del'>-	camel_store_class-&gt;create_folder = create_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-	camel_store_class-&gt;sync = store_sync;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = free_folder_info;</div><div class='del'>-	camel_store_class-&gt;folder_subscribed = folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = unsubscribe_folder;</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	</div><div class='del'>-	camel_object_class-&gt;setv = store_setv;</div><div class='del'>-	camel_object_class-&gt;getv = store_getv;</div><div class='del'>-	</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_created", NULL);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_deleted", NULL);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_renamed", NULL);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_subscribed", NULL);</div><div class='del'>-	camel_object_class_add_event(camel_object_class, "folder_unsubscribed", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_init (void *o)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = o;</div><div class='del'>-	CamelStoreClass *store_class = (CamelStoreClass *)CAMEL_OBJECT_GET_CLASS (o);</div><div class='del'>-</div><div class='del'>-	if (store_class-&gt;hash_folder_name) {</div><div class='del'>-		store-&gt;folders = g_hash_table_new (store_class-&gt;hash_folder_name,</div><div class='del'>-						   store_class-&gt;compare_folder_name);</div><div class='del'>-	} else</div><div class='del'>-		store-&gt;folders = NULL;</div><div class='del'>-	</div><div class='del'>-	/* set vtrash on by default */</div><div class='del'>-	store-&gt;flags = CAMEL_STORE_VTRASH;</div><div class='del'>-</div><div class='del'>-	store-&gt;dir_sep = '/';</div><div class='del'>-	</div><div class='del'>-	store-&gt;priv = g_malloc0 (sizeof (*store-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	store-&gt;priv-&gt;folder_lock = e_mutex_new (E_MUTEX_REC);</div><div class='del'>-	store-&gt;priv-&gt;cache_lock = e_mutex_new (E_MUTEX_SIMPLE);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		if (g_hash_table_size (store-&gt;folders) != 0) {</div><div class='del'>-			d(g_warning ("Folder cache for store %p contains "</div><div class='del'>-				     "%d folders at destruction.", store,</div><div class='del'>-				     g_hash_table_size (store-&gt;folders)));</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_destroy (store-&gt;folders);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy (store-&gt;priv-&gt;folder_lock);</div><div class='del'>-	e_mutex_destroy (store-&gt;priv-&gt;cache_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (store-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_store_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelStore",</div><div class='del'>-							sizeof (CamelStore),</div><div class='del'>-							sizeof (CamelStoreClass),</div><div class='del'>-							(CamelObjectClassInitFunc) camel_store_class_init,</div><div class='del'>-							NULL,</div><div class='del'>-							(CamelObjectInitFunc) camel_store_init,</div><div class='del'>-							(CamelObjectFinalizeFunc) camel_store_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-store_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelStore doesn't currently have anything to set */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-store_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelStore doesn't currently have anything to get */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_matches (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	if (value == user_data) {</div><div class='del'>-		g_free (key);</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_finalize (CamelObject *folder, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (user_data);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		g_hash_table_foreach_remove (store-&gt;folders, folder_matches, folder);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session,</div><div class='del'>-	   CamelProvider *provider, CamelURL *url,</div><div class='del'>-	   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE(service);</div><div class='del'>-</div><div class='del'>-	parent_class-&gt;construct(service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (camel_url_get_param(url, "filter"))</div><div class='del'>-		store-&gt;flags |= CAMEL_STORE_FILTER_INBOX;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::get_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-	</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,</div><div class='del'>-			      _("Cannot get folder: Invalid operation on this store"));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * camel_store_get_folder: Return the folder corresponding to a path.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: name of the folder to get</div><div class='del'>- * @flags: folder flags (create, save body index, etc)</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * </div><div class='del'>- * Return value: the folder corresponding to the path @folder_name.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (folder_name != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		/* Try cache first. */</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		folder = g_hash_table_lookup (store-&gt;folders, folder_name);</div><div class='del'>-		if (folder)</div><div class='del'>-			camel_object_ref (CAMEL_OBJECT (folder));</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!folder) {</div><div class='del'>-		folder = CS_CLASS (store)-&gt;get_folder (store, folder_name, flags, ex);</div><div class='del'>-		if (folder) {</div><div class='del'>-			/* Add the folder to the vTrash folder if this store implements it */</div><div class='del'>-			if (store-&gt;vtrash)</div><div class='del'>-				camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store-&gt;vtrash), folder);</div><div class='del'>-			</div><div class='del'>-			if (store-&gt;folders) {</div><div class='del'>-				CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-				</div><div class='del'>-				g_hash_table_insert (store-&gt;folders, g_strdup (folder_name), folder);</div><div class='del'>-				</div><div class='del'>-				camel_object_hook_event (CAMEL_OBJECT (folder), "finalize", folder_finalize, store);</div><div class='del'>-				CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-create_folder (CamelStore *store, const char *parent_name,</div><div class='del'>-	       const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::create_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-	</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,</div><div class='del'>-			      _("Cannot create folder: Invalid operation on this store"));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * camel_store_create_folder:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @parent_name: name of the new folder's parent, or %NULL</div><div class='del'>- * @folder_name: name of the folder to create</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * </div><div class='del'>- * Creates a new folder as a child of an existing folder.</div><div class='del'>- * @parent_name can be %NULL to create a new top-level folder.</div><div class='del'>- *</div><div class='del'>- * Return value: info about the created folder, which the caller must</div><div class='del'>- * free with camel_store_free_folder_info().</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_create_folder (CamelStore *store, const char *parent_name,</div><div class='del'>-			   const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-	fi = CS_CLASS (store)-&gt;create_folder (store, parent_name, folder_name, ex);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::delete_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * camel_store_delete_folder: Delete the folder corresponding to a path.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: name of the folder to delete</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * </div><div class='del'>- * Deletes the named folder. The folder must be empty.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-	char *key;</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	/* NB: Note similarity of this code to unsubscribe_folder */</div><div class='del'>-	</div><div class='del'>-	/* if we deleted a folder, force it out of the cache, and also out of the vtrash if setup */</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		folder = g_hash_table_lookup(store-&gt;folders, folder_name);</div><div class='del'>-		if (folder)</div><div class='del'>-			camel_object_ref((CamelObject *)folder);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-		if (folder) {</div><div class='del'>-			if (store-&gt;vtrash)</div><div class='del'>-				camel_vee_folder_remove_folder((CamelVeeFolder *)store-&gt;vtrash, folder);</div><div class='del'>-			camel_folder_delete (folder);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;delete_folder (store, folder_name, ex);</div><div class='del'>-</div><div class='del'>-	if (folder)</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		if (g_hash_table_lookup_extended(store-&gt;folders, folder_name, (void **)&amp;key, (void **)&amp;folder)) {</div><div class='del'>-			g_hash_table_remove (store-&gt;folders, key);</div><div class='del'>-			g_free (key);</div><div class='del'>-		}</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::rename_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _get_info {</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-	const char *old;</div><div class='del'>-	const char *new;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_subfolders(char *key, CamelFolder *folder, struct _get_info *info)</div><div class='del'>-{</div><div class='del'>-	int oldlen, namelen;</div><div class='del'>-</div><div class='del'>-	namelen = strlen(folder-&gt;full_name);</div><div class='del'>-	oldlen = strlen(info-&gt;old);</div><div class='del'>-</div><div class='del'>-	if ((namelen == oldlen &amp;&amp;</div><div class='del'>-	     strcmp(folder-&gt;full_name, info-&gt;old) == 0)</div><div class='del'>-	    || ((namelen &gt; oldlen)</div><div class='del'>-		&amp;&amp; strncmp(folder-&gt;full_name, info-&gt;old, oldlen) == 0</div><div class='del'>-		&amp;&amp; folder-&gt;full_name[oldlen] == info-&gt;store-&gt;dir_sep)) {</div><div class='del'>-</div><div class='del'>-		d(printf("Found subfolder of '%s' == '%s'\n", info-&gt;old, folder-&gt;full_name));</div><div class='del'>-		camel_object_ref((CamelObject *)folder);</div><div class='del'>-		g_ptr_array_add(info-&gt;folders, folder);</div><div class='del'>-		CAMEL_FOLDER_LOCK(folder, lock);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_rename_folder:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @old_name: the current name of the folder</div><div class='del'>- * @new_name: the new name of the folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * </div><div class='del'>- * Rename a named folder to a new name.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *key;</div><div class='del'>-	CamelFolder *folder, *oldfolder;</div><div class='del'>-	struct _get_info info = { store, NULL, old_name, new_name };</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	d(printf("store rename folder %s '%s' '%s'\n", ((CamelService *)store)-&gt;url-&gt;protocol, old_name, new_name));</div><div class='del'>-</div><div class='del'>-	if (strcmp(old_name, new_name) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	info.folders = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	/* If the folder is open (or any subfolders of the open folder)</div><div class='del'>-	   We need to rename them atomically with renaming the actual folder path */</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		/* Get all subfolders that are about to have their name changed */</div><div class='del'>-		g_hash_table_foreach(store-&gt;folders, (GHFunc)get_subfolders, &amp;info);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now try the real rename (will emit renamed event) */</div><div class='del'>-	CS_CLASS (store)-&gt;rename_folder (store, old_name, new_name, ex);</div><div class='del'>-</div><div class='del'>-	/* If it worked, update all open folders/unlock them */</div><div class='del'>-	if (!camel_exception_is_set(ex)) {</div><div class='del'>-		guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;</div><div class='del'>-		CamelRenameInfo reninfo;</div><div class='del'>-</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		for (i=0;i&lt;info.folders-&gt;len;i++) {</div><div class='del'>-			char *new;</div><div class='del'>-</div><div class='del'>-			folder = info.folders-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-			new = g_strdup_printf("%s%s", new_name, folder-&gt;full_name+strlen(old_name));</div><div class='del'>-</div><div class='del'>-			if (g_hash_table_lookup_extended(store-&gt;folders, folder-&gt;full_name, (void **)&amp;key, (void **)&amp;oldfolder)) {</div><div class='del'>-				g_hash_table_remove(store-&gt;folders, key);</div><div class='del'>-				g_free(key);</div><div class='del'>-				g_hash_table_insert(store-&gt;folders, new, oldfolder);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_folder_rename(folder, new);</div><div class='del'>-</div><div class='del'>-			CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-			camel_object_unref((CamelObject *)folder);</div><div class='del'>-		}</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-		/* Emit changed signal */</div><div class='del'>-		if (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS)</div><div class='del'>-			flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;</div><div class='del'>-		</div><div class='del'>-		reninfo.old_base = (char *)old_name;</div><div class='del'>-		reninfo.new = ((CamelStoreClass *)((CamelObject *)store)-&gt;klass)-&gt;get_folder_info(store, new_name, flags, ex);</div><div class='del'>-		if (reninfo.new != NULL) {</div><div class='del'>-			camel_object_trigger_event(CAMEL_OBJECT(store), "folder_renamed", &amp;reninfo);</div><div class='del'>-			((CamelStoreClass *)((CamelObject *)store)-&gt;klass)-&gt;free_folder_info(store, reninfo.new);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Failed, just unlock our folders for re-use */</div><div class='del'>-		for (i=0;i&lt;info.folders-&gt;len;i++) {</div><div class='del'>-			folder = info.folders-&gt;pdata[i];</div><div class='del'>-			CAMEL_FOLDER_UNLOCK(folder, lock);</div><div class='del'>-			camel_object_unref((CamelObject *)folder);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(info.folders, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_inbox (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* Default: assume the inbox's name is "inbox"</div><div class='del'>-	 * and open with default flags.</div><div class='del'>-	 */</div><div class='del'>-	return CS_CLASS (store)-&gt;get_folder (store, "inbox", 0, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * camel_store_get_inbox:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: the folder in the store into which new mail is</div><div class='del'>- * delivered, or %NULL if no such folder exists.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_inbox (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-	folder = CS_CLASS (store)-&gt;get_inbox (store, ex);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-trash_add_folder (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (value);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (data);</div><div class='del'>-	</div><div class='del'>-	camel_vee_folder_add_folder (CAMEL_VEE_FOLDER (store-&gt;vtrash), folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-trash_finalize (CamelObject *trash, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (user_data);</div><div class='del'>-	</div><div class='del'>-	store-&gt;vtrash = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_trash (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	if ((store-&gt;flags &amp; CAMEL_STORE_VTRASH) == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	store-&gt;vtrash = camel_vtrash_folder_new (store, CAMEL_VTRASH_NAME);</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;vtrash) {</div><div class='del'>-		/* attach to the finalise event of the vtrash */</div><div class='del'>-		camel_object_hook_event (CAMEL_OBJECT (store-&gt;vtrash), "finalize",</div><div class='del'>-					 trash_finalize, store);</div><div class='del'>-		</div><div class='del'>-		/* add all the pre-opened folders to the vtrash */</div><div class='del'>-		if (store-&gt;folders) {</div><div class='del'>-			CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-			g_hash_table_foreach (store-&gt;folders, trash_add_folder, store);</div><div class='del'>-			CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_trash (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (store-&gt;vtrash) {</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (store-&gt;vtrash));</div><div class='del'>-		return store-&gt;vtrash;</div><div class='del'>-	} else {</div><div class='del'>-		CS_CLASS (store)-&gt;init_trash (store);</div><div class='del'>-		if (store-&gt;vtrash) {</div><div class='del'>-			/* We don't ref here because we don't want the</div><div class='del'>-                           store to own a ref on the trash folder */</div><div class='del'>-			/*camel_object_ref (CAMEL_OBJECT (store-&gt;vtrash));*/</div><div class='del'>-			return store-&gt;vtrash;</div><div class='del'>-		} else {</div><div class='del'>-			w(g_warning ("This store does not support vTrash."));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * camel_store_get_trash:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: the folder in the store into which trash is</div><div class='del'>- * delivered, or %NULL if no such folder exists.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_store_get_trash (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	if ((store-&gt;flags &amp; CAMEL_STORE_VTRASH) == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-	folder = CS_CLASS (store)-&gt;get_trash (store, ex);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-	</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_folder (gpointer key, gpointer folder, gpointer ex)</div><div class='del'>-{</div><div class='del'>-	if (!camel_exception_is_set (ex))</div><div class='del'>-		camel_folder_sync (folder, FALSE, ex);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_folder_cache (gpointer key, gpointer folder, gpointer hash)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_insert ((GHashTable *) hash, g_strdup (key), folder);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (folder));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-store_sync (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CamelException internal_ex;</div><div class='del'>-		GHashTable *hash;</div><div class='del'>-		</div><div class='del'>-		hash = g_hash_table_new (CS_CLASS (store)-&gt;hash_folder_name,</div><div class='del'>-					 CS_CLASS (store)-&gt;compare_folder_name);</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;internal_ex);</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		g_hash_table_foreach (store-&gt;folders, copy_folder_cache, hash);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-		camel_exception_xfer (ex, &amp;internal_ex);</div><div class='del'>-		</div><div class='del'>-		g_hash_table_foreach (hash, sync_folder, &amp;internal_ex);</div><div class='del'>-		g_hash_table_destroy (hash);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_sync:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Syncs any changes that have been made to the store object and its</div><div class='del'>- * folders with the real store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_sync (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;sync (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::get_folder_info not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_get_folder_info:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @top: the name of the folder to start from</div><div class='del'>- * @flags: various CAMEL_STORE_FOLDER_INFO_* flags to control behavior</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This fetches information about the folder structure of @store,</div><div class='del'>- * starting with @top, and returns a tree of CamelFolderInfo</div><div class='del'>- * structures. If @flags includes %CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,</div><div class='del'>- * only subscribed folders will be listed. (This flag can only be used</div><div class='del'>- * for stores that support subscriptions.) If @flags includes</div><div class='del'>- * %CAMEL_STORE_FOLDER_INFO_RECURSIVE, the returned tree will include</div><div class='del'>- * all levels of hierarchy below @top. If not, it will only include</div><div class='del'>- * the immediate subfolders of @top. If @flags includes</div><div class='del'>- * %CAMEL_STORE_FOLDER_INFO_FAST, the unread_message_count fields of</div><div class='del'>- * some or all of the structures may be set to -1, if the store cannot</div><div class='del'>- * determine that information quickly.</div><div class='del'>- * </div><div class='del'>- * Return value: a CamelFolderInfo tree, which must be freed with</div><div class='del'>- * camel_store_free_folder_info.</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-			     guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);</div><div class='del'>-	g_return_val_if_fail ((store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS) ||</div><div class='del'>-			      !(flags &amp; CAMEL_STORE_FOLDER_INFO_SUBSCRIBED),</div><div class='del'>-			      NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-	ret = CS_CLASS (store)-&gt;get_folder_info (store, top, flags, ex);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::free_folder_info not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * Frees the data returned by camel_store_get_folder_info().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;free_folder_info (store, fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info_full:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * An implementation for CamelStore::free_folder_info. Frees all</div><div class='del'>- * of the data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info_full (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info_nop:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * An implementation for CamelStore::free_folder_info. Does nothing.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info_nop (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_info_free:</div><div class='del'>- * @fi: the CamelFolderInfo</div><div class='del'>- *</div><div class='del'>- * Frees @fi.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_info_free (CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi) {</div><div class='del'>-		camel_folder_info_free (fi-&gt;sibling);</div><div class='del'>-		camel_folder_info_free (fi-&gt;child);</div><div class='del'>-		g_free (fi-&gt;name);</div><div class='del'>-		g_free (fi-&gt;full_name);</div><div class='del'>-		g_free (fi-&gt;path);</div><div class='del'>-		g_free (fi-&gt;url);</div><div class='del'>-		g_free (fi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_info_build_path:</div><div class='del'>- * @fi: folder info</div><div class='del'>- * @separator: directory separator</div><div class='del'>- *</div><div class='del'>- * Sets the folder info path based on the folder's full name and</div><div class='del'>- * directory separator.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_info_build_path (CamelFolderInfo *fi, char separator)</div><div class='del'>-{</div><div class='del'>-	fi-&gt;path = g_strdup_printf("/%s", fi-&gt;full_name);</div><div class='del'>-	if (separator != '/') {</div><div class='del'>-		char *p;</div><div class='del'>-		</div><div class='del'>-		p = fi-&gt;path;</div><div class='del'>-		while ((p = strchr (p, separator)))</div><div class='del'>-			*p = '/';</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-folder_info_cmp (const void *ap, const void *bp)</div><div class='del'>-{</div><div class='del'>-	const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0];</div><div class='del'>-	const CamelFolderInfo *b = ((CamelFolderInfo **)bp)[0];</div><div class='del'>-	</div><div class='del'>-	return strcmp (a-&gt;full_name, b-&gt;full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_info_build:</div><div class='del'>- * @folders: an array of CamelFolderInfo</div><div class='del'>- * @namespace: an ignorable prefix on the folder names</div><div class='del'>- * @separator: the hieararchy separator character</div><div class='del'>- * @short_names: %TRUE if the (short) name of a folder is the part after</div><div class='del'>- * the last @separator in the full name. %FALSE if it is the full name.</div><div class='del'>- *</div><div class='del'>- * This takes an array of folders and attaches them together according</div><div class='del'>- * to the hierarchy described by their full_names and @separator. If</div><div class='del'>- * @namespace is non-%NULL, then it will be ignored as a full_name</div><div class='del'>- * prefix, for purposes of comparison. If necessary,</div><div class='del'>- * camel_folder_info_build will create additional CamelFolderInfo with</div><div class='del'>- * %NULL urls to fill in gaps in the tree. The value of @short_names</div><div class='del'>- * is used in constructing the names of these intermediate folders.</div><div class='del'>- *</div><div class='del'>- * Return value: the top level of the tree of linked folder info.</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_folder_info_build (GPtrArray *folders, const char *namespace,</div><div class='del'>-			 char separator, gboolean short_names)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi, *pfi, *top = NULL;</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-	char *name, *p, *pname;</div><div class='del'>-	int i, nlen;</div><div class='del'>-	</div><div class='del'>-	if (!namespace)</div><div class='del'>-		namespace = "";</div><div class='del'>-	nlen = strlen (namespace);</div><div class='del'>-	</div><div class='del'>-	qsort (folders-&gt;pdata, folders-&gt;len, sizeof (folders-&gt;pdata[0]), folder_info_cmp);</div><div class='del'>-	</div><div class='del'>-	/* Hash the folders. */</div><div class='del'>-	hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		if (!strncmp (namespace, fi-&gt;full_name, nlen))</div><div class='del'>-			name = fi-&gt;full_name + nlen;</div><div class='del'>-		else</div><div class='del'>-			name = fi-&gt;full_name;</div><div class='del'>-		if (*name == separator)</div><div class='del'>-			name++;</div><div class='del'>-		g_hash_table_insert (hash, name, fi);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now find parents. */</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		if (!strncmp (namespace, fi-&gt;full_name, nlen))</div><div class='del'>-			name = fi-&gt;full_name + nlen;</div><div class='del'>-		else</div><div class='del'>-			name = fi-&gt;full_name;</div><div class='del'>-		if (*name == separator)</div><div class='del'>-			name++;</div><div class='del'>-		</div><div class='del'>-		/* set the path if it isn't already set */</div><div class='del'>-		if (!fi-&gt;path)</div><div class='del'>-			camel_folder_info_build_path (fi, separator);</div><div class='del'>-		</div><div class='del'>-		p = strrchr (name, separator);</div><div class='del'>-		if (p) {</div><div class='del'>-			pname = g_strndup (name, p - name);</div><div class='del'>-			pfi = g_hash_table_lookup (hash, pname);</div><div class='del'>-			if (pfi) {</div><div class='del'>-				g_free (pname);</div><div class='del'>-			} else {</div><div class='del'>-				/* we are missing a folder in the heirarchy so</div><div class='del'>-				   create a fake folder node */</div><div class='del'>-				CamelURL *url;</div><div class='del'>-				char *sep;</div><div class='del'>-				</div><div class='del'>-				pfi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-				pfi-&gt;full_name = pname;</div><div class='del'>-				if (short_names) {</div><div class='del'>-					pfi-&gt;name = strrchr (pname, separator);</div><div class='del'>-					if (pfi-&gt;name)</div><div class='del'>-						pfi-&gt;name = g_strdup (pfi-&gt;name + 1);</div><div class='del'>-					else</div><div class='del'>-						pfi-&gt;name = g_strdup (pname);</div><div class='del'>-				} else</div><div class='del'>-					pfi-&gt;name = g_strdup (pname);</div><div class='del'>-				</div><div class='del'>-				url = camel_url_new (fi-&gt;url, NULL);</div><div class='del'>-				sep = strrchr (url-&gt;path, separator);</div><div class='del'>-				if (sep)</div><div class='del'>-					*sep = '\0';</div><div class='del'>-				else</div><div class='del'>-					d(g_warning ("huh, no \"%c\" in \"%s\"?", separator, fi-&gt;url));</div><div class='del'>-				</div><div class='del'>-				/* since this is a "fake" folder node, it is not selectable */</div><div class='del'>-				camel_url_set_param (url, "noselect", "yes");</div><div class='del'>-				pfi-&gt;url = camel_url_to_string (url, 0);</div><div class='del'>-				camel_url_free (url);</div><div class='del'>-				</div><div class='del'>-				g_hash_table_insert (hash, pname, pfi);</div><div class='del'>-				g_ptr_array_add (folders, pfi);</div><div class='del'>-			}</div><div class='del'>-			fi-&gt;sibling = pfi-&gt;child;</div><div class='del'>-			fi-&gt;parent = pfi;</div><div class='del'>-			pfi-&gt;child = fi;</div><div class='del'>-		} else if (!top)</div><div class='del'>-			top = fi;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy (hash);</div><div class='del'>-</div><div class='del'>-	/* Link together the top-level folders */</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		if (fi-&gt;parent || fi == top)</div><div class='del'>-			continue;</div><div class='del'>-		if (top)</div><div class='del'>-			fi-&gt;sibling = top;</div><div class='del'>-		top = fi;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return top;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *folder_info_clone_rec(CamelFolderInfo *fi, CamelFolderInfo *parent)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-</div><div class='del'>-	info = g_malloc(sizeof(*info));</div><div class='del'>-	info-&gt;parent = parent;</div><div class='del'>-	info-&gt;url = g_strdup(fi-&gt;url);</div><div class='del'>-	info-&gt;name = g_strdup(fi-&gt;name);</div><div class='del'>-	info-&gt;full_name = g_strdup(fi-&gt;full_name);</div><div class='del'>-	info-&gt;path = g_strdup(fi-&gt;path);</div><div class='del'>-	info-&gt;unread_message_count = fi-&gt;unread_message_count;</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;sibling)</div><div class='del'>-		info-&gt;sibling = folder_info_clone_rec(fi-&gt;sibling, parent);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;sibling = NULL;</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;child)</div><div class='del'>-		info-&gt;child = folder_info_clone_rec(fi-&gt;child, info);</div><div class='del'>-	else</div><div class='del'>-		info-&gt;child = NULL;</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_folder_info_clone(CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return folder_info_clone_rec(fi, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_store_supports_subscriptions (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	return (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::folder_subscribed not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_folder_subscribed: Tell whether or not a folder has been subscribed to.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder on which we're querying subscribed status.</div><div class='del'>- * Return value: TRUE if folder is subscribed, FALSE if not.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_store_folder_subscribed (CamelStore *store,</div><div class='del'>-			       const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	gboolean ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);</div><div class='del'>-	g_return_val_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS, FALSE);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	ret = CS_CLASS (store)-&gt;folder_subscribed (store, folder_name);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::subscribe_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_subscribe_folder: marks a folder as subscribed.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder to subscribe to.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_subscribe_folder (CamelStore *store,</div><div class='del'>-			      const char *folder_name,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-	g_return_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;subscribe_folder (store, folder_name, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",</div><div class='del'>-		     camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_unsubscribe_folder: marks a folder as unsubscribed.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder to unsubscribe from.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_unsubscribe_folder (CamelStore *store,</div><div class='del'>-				const char *folder_name,</div><div class='del'>-				CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-	char *key;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-	g_return_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, folder_lock);</div><div class='del'>-</div><div class='del'>-	/* NB: Note similarity of this code to delete_folder */</div><div class='del'>-</div><div class='del'>-	/* if we deleted a folder, force it out of the cache, and also out of the vtrash if setup */</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		folder = g_hash_table_lookup(store-&gt;folders, folder_name);</div><div class='del'>-		if (folder)</div><div class='del'>-			camel_object_ref((CamelObject *)folder);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-		if (folder) {</div><div class='del'>-			if (store-&gt;vtrash)</div><div class='del'>-				camel_vee_folder_remove_folder((CamelVeeFolder *)store-&gt;vtrash, folder);</div><div class='del'>-			camel_folder_delete (folder);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;unsubscribe_folder (store, folder_name, ex);</div><div class='del'>-</div><div class='del'>-	if (folder)</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		if (g_hash_table_lookup_extended(store-&gt;folders, folder_name, (void **)&amp;key, (void **)&amp;folder)) {</div><div class='del'>-			g_hash_table_remove (store-&gt;folders, key);</div><div class='del'>-			g_free (key);</div><div class='del'>-		}</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, folder_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_mkdir_hier (const char *path, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	char *copy, *p;</div><div class='del'>-	</div><div class='del'>-	p = copy = g_strdup (path);</div><div class='del'>-	do {</div><div class='del'>-		p = strchr (p + 1, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '\0';</div><div class='del'>-		if (access (copy, F_OK) == -1) {</div><div class='del'>-			if (mkdir (copy, mode) == -1) {</div><div class='del'>-				g_free (copy);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '/';</div><div class='del'>-	} while (p);</div><div class='del'>-	</div><div class='del'>-	g_free (copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Return true if these uri's refer to the same object */</div><div class='del'>-gboolean</div><div class='del'>-camel_store_uri_cmp(CamelStore *store, const char *uria, const char *urib)</div><div class='del'>-{</div><div class='del'>-	g_assert(CAMEL_IS_STORE(store));</div><div class='del'>-</div><div class='del'>-	return CS_CLASS(store)-&gt;compare_folder_name(uria, urib);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-store.h b/camel/camel-store.h<br/>deleted file mode 100644<br/>index 3d8e10af8c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,220 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-store.h : Abstract class for an email store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_STORE_H</div><div class='del'>-#define CAMEL_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* for mode_t */</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_STORE_ARG_FIRST  = CAMEL_SERVICE_ARG_FIRST + 100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderInfo {</div><div class='del'>-	struct _CamelFolderInfo *parent,</div><div class='del'>-		*sibling,</div><div class='del'>-		*child;</div><div class='del'>-	char *url;</div><div class='del'>-	char *name;</div><div class='del'>-	char *full_name;</div><div class='del'>-	char *path;</div><div class='del'>-	int unread_message_count;</div><div class='del'>-} CamelFolderInfo;</div><div class='del'>-</div><div class='del'>-/* Structure of rename event's event_data */</div><div class='del'>-typedef struct _CamelRenameInfo {</div><div class='del'>-	char *old_base;</div><div class='del'>-	struct _CamelFolderInfo *new;</div><div class='del'>-} CamelRenameInfo;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_TYPE     (camel_store_get_type ())</div><div class='del'>-#define CAMEL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))</div><div class='del'>-#define CAMEL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))</div><div class='del'>-#define CAMEL_IS_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Flags for store flags */</div><div class='del'>-#define CAMEL_STORE_SUBSCRIPTIONS	(1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_STORE_VTRASH		(1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_STORE_FILTER_INBOX	(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-struct _CamelStore</div><div class='del'>-{</div><div class='del'>-	CamelService parent_object;</div><div class='del'>-	struct _CamelStorePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	CamelFolder *vtrash;</div><div class='del'>-	</div><div class='del'>-	/* should have cache_lock when accessing this (priv-&gt;cache_lock) */</div><div class='del'>-	GHashTable *folders;</div><div class='del'>-</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	/* FIXME: This is a temporary measure until IMAP namespaces are properly implemented,</div><div class='del'>-	   after that, all external folder api's will assume a dir separator of '/' */</div><div class='del'>-	/* This is always a copy of IMAP_STORE()-&gt;dir_sep, or '/' */</div><div class='del'>-	char dir_sep;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* open mode for folder */</div><div class='del'>-#define CAMEL_STORE_FOLDER_CREATE (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_STORE_FOLDER_BODY_INDEX (1&lt;&lt;1)</div><div class='del'>-#define CAMEL_STORE_FOLDER_PRIVATE (1&lt;&lt;2) /* a private folder, that shouldn't show up in unmatched/folder info's, etc */</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_FOLDER_INFO_FAST       (1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_STORE_FOLDER_INFO_RECURSIVE  (1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_STORE_FOLDER_INFO_SUBSCRIBED (1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelServiceClass parent_class;</div><div class='del'>-</div><div class='del'>-	GHashFunc       hash_folder_name;</div><div class='del'>-	GCompareFunc    compare_folder_name;</div><div class='del'>-</div><div class='del'>-	CamelFolder *   (*get_folder)               (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     guint32 flags,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	CamelFolder *   (*get_inbox)                (CamelStore *store,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	void            (*init_trash)               (CamelStore *store);</div><div class='del'>-	CamelFolder *   (*get_trash)                (CamelStore *store,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelFolderInfo *(*create_folder)           (CamelStore *store,</div><div class='del'>-						     const char *parent_name,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void            (*delete_folder)            (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void		(*rename_folder)	    (CamelStore *store,</div><div class='del'>-						     const char *old_name,</div><div class='del'>-						     const char *new_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	void            (*sync)                     (CamelStore *store,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	CamelFolderInfo *(*get_folder_info)         (CamelStore *store,</div><div class='del'>-						     const char *top,</div><div class='del'>-						     guint32 flags,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void            (*free_folder_info)         (CamelStore *store,</div><div class='del'>-						     CamelFolderInfo *fi);</div><div class='del'>-	</div><div class='del'>-	gboolean        (*folder_subscribed)        (CamelStore *store,</div><div class='del'>-						     const char *folder_name);</div><div class='del'>-	void            (*subscribe_folder)         (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void            (*unsubscribe_folder)       (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-} CamelStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_store_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *    camel_store_get_folder         (CamelStore *store,</div><div class='del'>-					         const char *folder_name,</div><div class='del'>-						 guint32 flags,</div><div class='del'>-					         CamelException *ex);</div><div class='del'>-CamelFolder *    camel_store_get_inbox          (CamelStore *store,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-CamelFolder *    camel_store_get_trash          (CamelStore *store,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelFolderInfo *camel_store_create_folder      (CamelStore *store,</div><div class='del'>-						 const char *parent_name,</div><div class='del'>-						 const char *folder_name,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-void             camel_store_delete_folder      (CamelStore *store,</div><div class='del'>-						 const char *folder_name,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-void             camel_store_rename_folder      (CamelStore *store,</div><div class='del'>-						 const char *old_name,</div><div class='del'>-						 const char *new_name,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</div><div class='del'>-void             camel_store_sync               (CamelStore *store,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelFolderInfo *camel_store_get_folder_info    (CamelStore *store,</div><div class='del'>-						 const char *top,</div><div class='del'>-						 guint32 flags,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-void             camel_store_free_folder_info   (CamelStore *store,</div><div class='del'>-						 CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-void             camel_store_free_folder_info_full (CamelStore *store,</div><div class='del'>-						    CamelFolderInfo *fi);</div><div class='del'>-void             camel_store_free_folder_info_nop  (CamelStore *store,</div><div class='del'>-						    CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-void             camel_folder_info_free            (CamelFolderInfo *fi);</div><div class='del'>-void             camel_folder_info_build_path      (CamelFolderInfo *fi,</div><div class='del'>-						    char separator);</div><div class='del'>-CamelFolderInfo *camel_folder_info_build           (GPtrArray *folders,</div><div class='del'>-						    const char *namespace,</div><div class='del'>-						    char separator,</div><div class='del'>-						    gboolean short_names);</div><div class='del'>-CamelFolderInfo *camel_folder_info_clone	   (CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-gboolean         camel_store_supports_subscriptions   (CamelStore *store);</div><div class='del'>-</div><div class='del'>-gboolean         camel_store_folder_subscribed        (CamelStore *store,</div><div class='del'>-						       const char *folder_name);</div><div class='del'>-void             camel_store_subscribe_folder         (CamelStore *store,</div><div class='del'>-						       const char *folder_name,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-void             camel_store_unsubscribe_folder       (CamelStore *store,</div><div class='del'>-						       const char *folder_name,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-gboolean	 camel_store_uri_cmp		      (CamelStore *store, const char *uria, const char *urib);</div><div class='del'>-</div><div class='del'>-/* utility needed by some stores */</div><div class='del'>-int camel_mkdir_hier (const char *path, mode_t mode);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STORE_H */</div><div class='head'>diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c<br/>deleted file mode 100644<br/>index fe3458a93f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-buffer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,470 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-</div><div class='del'>-/* camel-stream-buffer.c : Buffer any other other stream</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	BUF_USER = 1&lt;&lt;0,	/* user-supplied buffer, do not free */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BUF_SIZE 1024</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush (CamelStream *stream);</div><div class='del'>-static int stream_close (CamelStream *stream);</div><div class='del'>-static gboolean stream_eos (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static void init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size);</div><div class='del'>-static void init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_stream_buffer_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_buffer_class-&gt;init = init;</div><div class='del'>-	camel_stream_buffer_class-&gt;init_vbuf = init_vbuf;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);</div><div class='del'>-</div><div class='del'>-	sbf-&gt;flags = 0;</div><div class='del'>-	sbf-&gt;size = BUF_SIZE;</div><div class='del'>-	sbf-&gt;buf = g_malloc(BUF_SIZE);</div><div class='del'>-	sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-	sbf-&gt;end = sbf-&gt;buf;</div><div class='del'>-	sbf-&gt;mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;</div><div class='del'>-	sbf-&gt;stream = 0;</div><div class='del'>-	sbf-&gt;linesize = 80;</div><div class='del'>-	sbf-&gt;linebuf = g_malloc(sbf-&gt;linesize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);</div><div class='del'>-</div><div class='del'>-	if (!(sbf-&gt;flags &amp; BUF_USER)) {</div><div class='del'>-		g_free(sbf-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-	if (sbf-&gt;stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-</div><div class='del'>-	g_free(sbf-&gt;linebuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_buffer_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_buffer_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_buffer_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_stream_buffer_type = camel_type_register (camel_stream_get_type (), "CamelStreamBuffer",</div><div class='del'>-								sizeof (CamelStreamBuffer),</div><div class='del'>-								sizeof (CamelStreamBufferClass),</div><div class='del'>-								(CamelObjectClassInitFunc) camel_stream_buffer_class_init,</div><div class='del'>-								NULL,</div><div class='del'>-								(CamelObjectInitFunc) camel_stream_buffer_init,</div><div class='del'>-								(CamelObjectFinalizeFunc) camel_stream_buffer_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_buffer_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_vbuf(CamelStreamBuffer *sbf, char *buf, CamelStreamBufferMode mode, int size)</div><div class='del'>-{</div><div class='del'>-	if (sbf-&gt;buf &amp;&amp; !(sbf-&gt;flags &amp; BUF_USER)) {</div><div class='del'>-		g_free(sbf-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-	if (buf) {</div><div class='del'>-		sbf-&gt;buf = buf;</div><div class='del'>-		sbf-&gt;flags |= BUF_USER;</div><div class='del'>-	} else {</div><div class='del'>-		sbf-&gt;buf = g_malloc(size);</div><div class='del'>-		sbf-&gt;flags &amp;= ~BUF_USER;</div><div class='del'>-	}</div><div class='del'>-	sbf-&gt;size = size;</div><div class='del'>-	sbf-&gt;mode = mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size)</div><div class='del'>-{</div><div class='del'>-	set_vbuf(sbf, buf, mode, size);</div><div class='del'>-	if (sbf-&gt;stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-	sbf-&gt;stream = s;</div><div class='del'>-	camel_object_ref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)</div><div class='del'>-{</div><div class='del'>-	init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_new:</div><div class='del'>- * @stream: Existing stream to buffer.</div><div class='del'>- * @mode: Operational mode of buffered stream.</div><div class='del'>- *</div><div class='del'>- * Create a new buffered stream of another stream.  A default</div><div class='del'>- * buffer size (1024 bytes), automatically managed will be used</div><div class='del'>- * for buffering.</div><div class='del'>- *</div><div class='del'>- * See camel_stream_buffer_new_with_vbuf() for details on the</div><div class='del'>- * @mode parameter.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly created buffered stream.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf;</div><div class='del'>-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))-&gt;init (sbf, stream, mode);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (sbf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_new_with_vbuf:</div><div class='del'>- * @stream: An existing stream to buffer.</div><div class='del'>- * @mode: Mode to buffer in.</div><div class='del'>- * @buf: Memory to use for buffering.</div><div class='del'>- * @size: Size of buffer to use.</div><div class='del'>- *</div><div class='del'>- * Create a new stream which buffers another stream, @stream.</div><div class='del'>- *</div><div class='del'>- * The following values are available for @mode:</div><div class='del'>- *</div><div class='del'>- * CAMEL_STREAM_BUFFER_BUFFER, Buffer the input/output in blocks.</div><div class='del'>- * CAMEL_STREAM_BUFFER_NEWLINE, Buffer on newlines (for output).</div><div class='del'>- * CAMEL_STREAM_BUFFER_NONE, Perform no buffering.</div><div class='del'>- *</div><div class='del'>- * Note that currently this is ignored and CAMEL_STREAM_BUFFER_BUFFER</div><div class='del'>- * is always used.</div><div class='del'>- *</div><div class='del'>- * In addition, one of the following mode options should be or'd</div><div class='del'>- * together with the buffering mode:</div><div class='del'>- *</div><div class='del'>- * CAMEL_STREAM_BUFFER_WRITE, Buffer in write mode.</div><div class='del'>- * CAMEL_STREAM_BUFFER_READ, Buffer in read mode.</div><div class='del'>- *</div><div class='del'>- * Buffering can only be done in one direction for any</div><div class='del'>- * buffer instance.</div><div class='del'>- *</div><div class='del'>- * If @buf is non-NULL, then use the memory pointed to</div><div class='del'>- * (for upto @size bytes) as the buffer for all buffering</div><div class='del'>- * operations.  It is upto the application to free this buffer.</div><div class='del'>- * If @buf is NULL, then allocate and manage @size bytes</div><div class='del'>- * for all buffering.</div><div class='del'>- *</div><div class='del'>- * Return value: A new stream with buffering applied.</div><div class='del'>- **/</div><div class='del'>-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf;</div><div class='del'>-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))-&gt;init_vbuf (sbf, stream, mode, buf, size);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (sbf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-	ssize_t bytes_read = 1;</div><div class='del'>-	ssize_t bytes_left;</div><div class='del'>-	char *bptr = buffer;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail( (sbf-&gt;mode &amp; CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_READ, 0);</div><div class='del'>-</div><div class='del'>-	while (n &amp;&amp; bytes_read &gt; 0) {</div><div class='del'>-		bytes_left = sbf-&gt;end - sbf-&gt;ptr;</div><div class='del'>-		if (bytes_left &lt; n) {</div><div class='del'>-			if (bytes_left &gt; 0) {</div><div class='del'>-				memcpy(bptr, sbf-&gt;ptr, bytes_left);</div><div class='del'>-				n -= bytes_left;</div><div class='del'>-				bptr += bytes_left;</div><div class='del'>-				sbf-&gt;ptr += bytes_left;</div><div class='del'>-			}</div><div class='del'>-			/* if we are reading a lot, then read directly to the destination buffer */</div><div class='del'>-			if (n &gt;= sbf-&gt;size/3) {</div><div class='del'>-				bytes_read = camel_stream_read(sbf-&gt;stream, bptr, n);</div><div class='del'>-				if (bytes_read&gt;0) {</div><div class='del'>-					n -= bytes_read;</div><div class='del'>-					bptr += bytes_read;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				bytes_read = camel_stream_read(sbf-&gt;stream, sbf-&gt;buf, sbf-&gt;size);</div><div class='del'>-				if (bytes_read&gt;0) {</div><div class='del'>-					size_t bytes_used = bytes_read &gt; n ? n : bytes_read;</div><div class='del'>-					sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-					sbf-&gt;end = sbf-&gt;buf+bytes_read;</div><div class='del'>-					memcpy(bptr, sbf-&gt;ptr, bytes_used);</div><div class='del'>-					sbf-&gt;ptr += bytes_used;</div><div class='del'>-					bptr += bytes_used;</div><div class='del'>-					n -= bytes_used;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(bptr, sbf-&gt;ptr, n);</div><div class='del'>-			sbf-&gt;ptr += n;</div><div class='del'>-			bptr += n;</div><div class='del'>-			n = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (ssize_t)(bptr - buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* only returns the number passed in, or -1 on an error */</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write_all(CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	size_t left = n, w;</div><div class='del'>-</div><div class='del'>-	while (left &gt; 0) {</div><div class='del'>-		w = camel_stream_write(stream, buffer, left);</div><div class='del'>-		if (w == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		left -= w;</div><div class='del'>-		buffer += w;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-	ssize_t total = n;</div><div class='del'>-	ssize_t left, todo;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail( (sbf-&gt;mode &amp; CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE, 0);</div><div class='del'>-</div><div class='del'>-	/* first, copy as much as we can */</div><div class='del'>-	left = sbf-&gt;size - (sbf-&gt;ptr-sbf-&gt;buf);</div><div class='del'>-	todo = MIN(left, n);</div><div class='del'>-</div><div class='del'>-	memcpy(sbf-&gt;ptr, buffer, todo);</div><div class='del'>-	n -= todo;</div><div class='del'>-	buffer += todo;</div><div class='del'>-	sbf-&gt;ptr += todo;</div><div class='del'>-</div><div class='del'>-	/* if we've filled the buffer, write it out, reset buffer */</div><div class='del'>-	if (left == todo) {</div><div class='del'>-		if (stream_write_all(sbf-&gt;stream, sbf-&gt;buf, sbf-&gt;size) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if we still have more, write directly, or copy to buffer */</div><div class='del'>-	if (n &gt; 0) {</div><div class='del'>-		if (n &gt;= sbf-&gt;size/3) {</div><div class='del'>-			if (stream_write_all(sbf-&gt;stream, buffer, n) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-		} else {</div><div class='del'>-			memcpy(sbf-&gt;ptr, buffer, n);</div><div class='del'>-			sbf-&gt;ptr += n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-</div><div class='del'>-	if ((sbf-&gt;mode &amp; CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_WRITE) {</div><div class='del'>-		int len = sbf-&gt;ptr-sbf-&gt;buf;</div><div class='del'>-		int written = camel_stream_write(sbf-&gt;stream, sbf-&gt;buf, len);</div><div class='del'>-		if (written &gt; 0)</div><div class='del'>-			sbf-&gt;ptr += written;</div><div class='del'>-		if (written != len)</div><div class='del'>-			return -1;</div><div class='del'>-	} else {</div><div class='del'>-		/* nothing to do for read mode 'flush' */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_flush(sbf-&gt;stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-</div><div class='del'>-	if (stream_flush(stream) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	return camel_stream_close(sbf-&gt;stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-stream_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-</div><div class='del'>-	return camel_stream_eos(sbf-&gt;stream) &amp;&amp; sbf-&gt;ptr == sbf-&gt;end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_gets:</div><div class='del'>- * @sbf: A CamelStreamBuffer.</div><div class='del'>- * @buf: Memory to write the string to.</div><div class='del'>- * @max: Maxmimum number of characters to store.</div><div class='del'>- *</div><div class='del'>- * Read a line of characters up to the next newline character or</div><div class='del'>- * @max-1 characters.</div><div class='del'>- *</div><div class='del'>- * If the newline character is encountered, then it will be</div><div class='del'>- * included in the buffer @buf.  The buffer will be #NUL terminated.</div><div class='del'>- *</div><div class='del'>- * Return value: The number of characters read, or 0 for end of file,</div><div class='del'>- * and -1 on error.</div><div class='del'>- **/</div><div class='del'>-int camel_stream_buffer_gets(CamelStreamBuffer *sbf, char *buf, unsigned int max)</div><div class='del'>-{</div><div class='del'>-	register char *outptr, *inptr, *inend, c, *outend;</div><div class='del'>-	int bytes_read;</div><div class='del'>-</div><div class='del'>-	outptr = buf;</div><div class='del'>-	inptr = sbf-&gt;ptr;</div><div class='del'>-	inend = sbf-&gt;end;</div><div class='del'>-	outend = buf+max-1;	/* room for NUL */</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		while (inptr&lt;inend &amp;&amp; outptr&lt;outend) {</div><div class='del'>-			c = *inptr++;</div><div class='del'>-			*outptr++ = c;</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				*outptr = 0;</div><div class='del'>-				sbf-&gt;ptr = inptr;</div><div class='del'>-				return outptr-buf;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (outptr == outend)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		bytes_read = camel_stream_read (sbf-&gt;stream, sbf-&gt;buf, sbf-&gt;size);</div><div class='del'>-		if (bytes_read == -1) {</div><div class='del'>-			if (buf == outptr)</div><div class='del'>-				return -1;</div><div class='del'>-			else</div><div class='del'>-				bytes_read = 0;</div><div class='del'>-		}</div><div class='del'>-		inptr = sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-		inend = sbf-&gt;end = sbf-&gt;buf + bytes_read;</div><div class='del'>-	} while (bytes_read&gt;0);</div><div class='del'>-</div><div class='del'>-	sbf-&gt;ptr = inptr;</div><div class='del'>-	*outptr = 0;</div><div class='del'>-</div><div class='del'>-	return (int)(outptr - buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_read_line: read a complete line from the stream</div><div class='del'>- * @sbf: A CamelStreamBuffer</div><div class='del'>- *</div><div class='del'>- * This function reads a complete newline-terminated line from the stream</div><div class='del'>- * and returns it in allocated memory. The trailing newline (and carriage</div><div class='del'>- * return if any) are not included in the returned string.</div><div class='del'>- *</div><div class='del'>- * Return value: the line read, which the caller must free when done with,</div><div class='del'>- * or NULL on eof. If an error occurs, @ex will be set.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_stream_buffer_read_line (CamelStreamBuffer *sbf)</div><div class='del'>-{</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	int nread;</div><div class='del'>-</div><div class='del'>-	p = sbf-&gt;linebuf;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		nread = camel_stream_buffer_gets (sbf, p, sbf-&gt;linesize - (p - sbf-&gt;linebuf));</div><div class='del'>-		if (nread &lt;=0) {</div><div class='del'>-			if (p &gt; sbf-&gt;linebuf)</div><div class='del'>-				break;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		p += nread;</div><div class='del'>-		if (p[-1] == '\n')</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		nread = p - sbf-&gt;linebuf;</div><div class='del'>-		sbf-&gt;linesize *= 2;</div><div class='del'>-		sbf-&gt;linebuf = g_realloc (sbf-&gt;linebuf, sbf-&gt;linesize);</div><div class='del'>-		p = sbf-&gt;linebuf + nread;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p--;</div><div class='del'>-	if (p &gt; sbf-&gt;linebuf &amp;&amp; p[-1] == '\r')</div><div class='del'>-		p--;</div><div class='del'>-	p[0] = 0;</div><div class='del'>-</div><div class='del'>-	return g_strdup(sbf-&gt;linebuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h<br/>deleted file mode 100644<br/>index 03a8517066..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-buffer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-buffer.h :stream which buffers another stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian Inc. (www.ximian.com) .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_STREAM_BUFFER_H</div><div class='del'>-#define CAMEL_STREAM_BUFFER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_BUFFER_TYPE     (camel_stream_buffer_get_type ())</div><div class='del'>-#define CAMEL_STREAM_BUFFER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))</div><div class='del'>-#define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))</div><div class='del'>-#define CAMEL_IS_STREAM_BUFFER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_STREAM_BUFFER_BUFFER = 0,</div><div class='del'>-	CAMEL_STREAM_BUFFER_NONE,</div><div class='del'>-	CAMEL_STREAM_BUFFER_READ = 0x00,</div><div class='del'>-	CAMEL_STREAM_BUFFER_WRITE = 0x80,</div><div class='del'>-	CAMEL_STREAM_BUFFER_MODE = 0x80</div><div class='del'>-} CamelStreamBufferMode;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamBuffer</div><div class='del'>-{</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-</div><div class='del'>-	/* these are all of course, private */</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	unsigned char *buf, *ptr, *end;</div><div class='del'>-	int size;</div><div class='del'>-</div><div class='del'>-	unsigned char *linebuf;	/* for reading lines at a time */</div><div class='del'>-	int linesize;</div><div class='del'>-</div><div class='del'>-	CamelStreamBufferMode mode;</div><div class='del'>-	unsigned int flags;	/* internal flags */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	void (*init) (CamelStreamBuffer *stream_buffer, CamelStream *stream,</div><div class='del'>-		      CamelStreamBufferMode mode);</div><div class='del'>-	void (*init_vbuf) (CamelStreamBuffer *stream_buffer,</div><div class='del'>-			   CamelStream *stream, CamelStreamBufferMode mode,</div><div class='del'>-			   char *buf, guint32 size);</div><div class='del'>-</div><div class='del'>-} CamelStreamBufferClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_buffer_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_stream_buffer_new (CamelStream *s,</div><div class='del'>-				      CamelStreamBufferMode mode);</div><div class='del'>-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s,</div><div class='del'>-						CamelStreamBufferMode mode,</div><div class='del'>-						char *buf, guint32 size);</div><div class='del'>-</div><div class='del'>-/* unimplemented</div><div class='del'>-   CamelStream *camel_stream_buffer_set_vbuf (CamelStreamBuffer *b, CamelStreamBufferMode mode, char *buf, guint32 size); */</div><div class='del'>-</div><div class='del'>-/* read a line of characters */</div><div class='del'>-int camel_stream_buffer_gets (CamelStreamBuffer *b, char *buf, unsigned int max);</div><div class='del'>-</div><div class='del'>-char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_BUFFER_H */</div><div class='head'>diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c<br/>deleted file mode 100644<br/>index b325aea1f1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,383 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-/*#include &lt;stdio.h&gt;*/</div><div class='del'>-</div><div class='del'>-struct _filter {</div><div class='del'>-	struct _filter *next;</div><div class='del'>-	int id;</div><div class='del'>-	CamelMimeFilter *filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilterPrivate {</div><div class='del'>-	struct _filter *filters;</div><div class='del'>-	int filterid;		/* next filter id */</div><div class='del'>-	</div><div class='del'>-	char *realbuffer;	/* buffer - READ_PAD */</div><div class='del'>-	char *buffer;		/* READ_SIZE bytes */</div><div class='del'>-</div><div class='del'>-	char *filtered;		/* the filtered data */</div><div class='del'>-	size_t filteredlen;</div><div class='del'>-</div><div class='del'>-	int last_was_read;	/* was the last op read or write? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define READ_PAD (64)		/* bytes padded before buffer */</div><div class='del'>-#define READ_SIZE (4096)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelStreamFilter *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void camel_stream_filter_class_init (CamelStreamFilterClass *klass);</div><div class='del'>-static void camel_stream_filter_init       (CamelStreamFilter *obj);</div><div class='del'>-</div><div class='del'>-static	ssize_t   do_read       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static	ssize_t   do_write      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static	int       do_flush      (CamelStream *stream);</div><div class='del'>-static	int       do_close      (CamelStream *stream);</div><div class='del'>-static	gboolean  do_eos        (CamelStream *stream);</div><div class='del'>-static	int       do_reset      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *camel_stream_filter_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_class_init (CamelStreamFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_stream_filter_parent = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	camel_stream_class-&gt;read = do_read;</div><div class='del'>-	camel_stream_class-&gt;write = do_write;</div><div class='del'>-	camel_stream_class-&gt;flush = do_flush;</div><div class='del'>-	camel_stream_class-&gt;close = do_close;</div><div class='del'>-	camel_stream_class-&gt;eos = do_eos; </div><div class='del'>-	camel_stream_class-&gt;reset = do_reset;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_init (CamelStreamFilter *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p;</div><div class='del'>-	</div><div class='del'>-	_PRIVATE(obj) = p = g_malloc0(sizeof(*p));</div><div class='del'>-	p-&gt;realbuffer = g_malloc(READ_SIZE + READ_PAD);</div><div class='del'>-	p-&gt;buffer = p-&gt;realbuffer + READ_PAD;</div><div class='del'>-	p-&gt;last_was_read = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)o;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	while (f) {</div><div class='del'>-		fn = f-&gt;next;</div><div class='del'>-		camel_object_unref((CamelObject *)f-&gt;filter);</div><div class='del'>-		g_free(f);</div><div class='del'>-		f = fn;</div><div class='del'>-	}</div><div class='del'>-	g_free(p-&gt;realbuffer);</div><div class='del'>-	g_free(p);</div><div class='del'>-	camel_object_unref((CamelObject *)filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_filter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_STREAM_TYPE, "CamelStreamFilter",</div><div class='del'>-					    sizeof (CamelStreamFilter),</div><div class='del'>-					    sizeof (CamelStreamFilterClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_stream_filter_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_stream_filter_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_stream_filter_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelStreamFilter object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelStreamFilter object.</div><div class='del'>- **/</div><div class='del'>-CamelStreamFilter *</div><div class='del'>-camel_stream_filter_new_with_stream(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *new = CAMEL_STREAM_FILTER ( camel_object_new (camel_stream_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	new-&gt;source = stream;</div><div class='del'>-	camel_object_ref ((CamelObject *)stream);</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_add:</div><div class='del'>- * @filter: Initialised CamelStreamFilter.</div><div class='del'>- * @mf:  Filter to perform processing on stream.</div><div class='del'>- * </div><div class='del'>- * Add a new CamelMimeFilter to execute during the processing of this</div><div class='del'>- * stream.  Each filter added is processed after the previous one.</div><div class='del'>- *</div><div class='del'>- * Note that a filter should only be added to a single stream</div><div class='del'>- * at a time, otherwise unpredictable results may occur.</div><div class='del'>- * </div><div class='del'>- * Return value: A filter id for this CamelStreamFilter.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_stream_filter_add(CamelStreamFilter *filter, CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	fn = g_malloc(sizeof(*fn));</div><div class='del'>-	fn-&gt;id = p-&gt;filterid++;</div><div class='del'>-	fn-&gt;filter = mf;</div><div class='del'>-	camel_object_ref((CamelObject *)mf);</div><div class='del'>-</div><div class='del'>-	/* sure, we could use a GList, but we wouldn't save much */</div><div class='del'>-	f = (struct _filter *)&amp;p-&gt;filters;</div><div class='del'>-	while (f-&gt;next)</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	f-&gt;next = fn;</div><div class='del'>-	fn-&gt;next = NULL;</div><div class='del'>-	return fn-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_remove:</div><div class='del'>- * @filter: Initialised CamelStreamFilter.</div><div class='del'>- * @id: Filter id, as returned from camel_stream_filter_add().</div><div class='del'>- * </div><div class='del'>- * Remove a processing filter from the stream, by id.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_stream_filter_remove(CamelStreamFilter *filter, int id)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	f = (struct _filter *)&amp;p-&gt;filters;</div><div class='del'>-	while (f &amp;&amp; f-&gt;next) {</div><div class='del'>-		fn = f-&gt;next;</div><div class='del'>-		if (fn-&gt;id == id) {</div><div class='del'>-			f-&gt;next = fn-&gt;next;</div><div class='del'>-			camel_object_unref((CamelObject *)fn-&gt;filter);</div><div class='del'>-			g_free(fn);</div><div class='del'>-		}</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-do_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	ssize_t size;</div><div class='del'>-	struct _filter *f;</div><div class='del'>-</div><div class='del'>-	p-&gt;last_was_read = TRUE;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filteredlen&lt;=0) {</div><div class='del'>-		int presize = READ_SIZE;</div><div class='del'>-</div><div class='del'>-		size = camel_stream_read(filter-&gt;source, p-&gt;buffer, READ_SIZE);</div><div class='del'>-		if (size &lt;= 0) {</div><div class='del'>-			/* this is somewhat untested */</div><div class='del'>-			if (camel_stream_eos(filter-&gt;source)) {</div><div class='del'>-				f = p-&gt;filters;</div><div class='del'>-				p-&gt;filtered = p-&gt;buffer;</div><div class='del'>-				p-&gt;filteredlen = 0;</div><div class='del'>-				while (f) {</div><div class='del'>-					camel_mime_filter_complete(f-&gt;filter, p-&gt;filtered, p-&gt;filteredlen,</div><div class='del'>-								   presize, &amp;p-&gt;filtered, &amp;p-&gt;filteredlen, &amp;presize);</div><div class='del'>-					f = f-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				size = p-&gt;filteredlen;</div><div class='del'>-			}</div><div class='del'>-			if (size &lt;= 0)</div><div class='del'>-				return size;</div><div class='del'>-		} else {</div><div class='del'>-			f = p-&gt;filters;</div><div class='del'>-			p-&gt;filtered = p-&gt;buffer;</div><div class='del'>-			p-&gt;filteredlen = size;</div><div class='del'>-</div><div class='del'>-			d(printf ("\n\nOriginal content: '"));</div><div class='del'>-			d(fwrite(p-&gt;filtered, sizeof(char), p-&gt;filteredlen, stdout));</div><div class='del'>-			d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-			while (f) {</div><div class='del'>-				camel_mime_filter_filter(f-&gt;filter, p-&gt;filtered, p-&gt;filteredlen, presize,</div><div class='del'>-							 &amp;p-&gt;filtered, &amp;p-&gt;filteredlen, &amp;presize);</div><div class='del'>-</div><div class='del'>-				d(printf ("Filtered content (%s): '",</div><div class='del'>-					  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-				d(fwrite(p-&gt;filtered, sizeof(char), p-&gt;filteredlen, stdout));</div><div class='del'>-				d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-				f = f-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	size = MIN(n, p-&gt;filteredlen);</div><div class='del'>-	memcpy(buffer, p-&gt;filtered, size);</div><div class='del'>-	p-&gt;filteredlen -= size;</div><div class='del'>-	p-&gt;filtered += size;</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Note: Since the caller expects to write out as much as they asked us to</div><div class='del'>-   write (for 'success'), we return what they asked us to write (for 'success')</div><div class='del'>-   rather than the true number of written bytes */</div><div class='del'>-static ssize_t</div><div class='del'>-do_write (CamelStream *stream, const char *buf, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-	int presize;</div><div class='del'>-	char *buffer = (char *)buf;</div><div class='del'>-	size_t len = n;</div><div class='del'>-</div><div class='del'>-	p-&gt;last_was_read = FALSE;</div><div class='del'>-</div><div class='del'>-	d(printf ("\n\nWriting: Original content: '"));</div><div class='del'>-	d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-	d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	presize = 0;</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_filter(f-&gt;filter, buffer, len, presize, &amp;buffer, &amp;len, &amp;presize);</div><div class='del'>-</div><div class='del'>-		d(printf ("Filtered content (%s): '",</div><div class='del'>-			  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-		d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-		d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_stream_write(filter-&gt;source, buffer, len) != len)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int presize;</div><div class='del'>-	size_t len;</div><div class='del'>-	</div><div class='del'>-	if (p-&gt;last_was_read) {</div><div class='del'>-		g_warning("Flushing a filter stream without writing to it");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buffer = "";</div><div class='del'>-	len = 0;</div><div class='del'>-	presize = 0;</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	</div><div class='del'>-	d(printf ("\n\nFlushing: Original content: '"));</div><div class='del'>-	d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-	d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_complete(f-&gt;filter, buffer, len, presize, &amp;buffer, &amp;len, &amp;presize);</div><div class='del'>-</div><div class='del'>-		d(printf ("Filtered content (%s): '",</div><div class='del'>-			  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-		d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-		d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (len &gt; 0 &amp;&amp; camel_stream_write(filter-&gt;source, buffer, len) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	return camel_stream_flush(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-</div><div class='del'>-	if (!p-&gt;last_was_read) {</div><div class='del'>-		do_flush(stream);</div><div class='del'>-	}</div><div class='del'>-	return camel_stream_close(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-do_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filteredlen &gt; 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return camel_stream_eos(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-</div><div class='del'>-	p-&gt;filteredlen = 0;</div><div class='del'>-</div><div class='del'>-	/* and reset filters */</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_reset(f-&gt;filter);</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_reset(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h<br/>deleted file mode 100644<br/>index 3d265e8b4c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-filter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_STREAM_FILTER_H</div><div class='del'>-#define _CAMEL_STREAM_FILTER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)</div><div class='del'>-#define CAMEL_STREAM_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)</div><div class='del'>-#define CAMEL_IS_STREAM_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_filter_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStreamFilterClass CamelStreamFilterClass;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilter {</div><div class='del'>-	CamelStream parent;</div><div class='del'>-</div><div class='del'>-	CamelStream *source;</div><div class='del'>-</div><div class='del'>-	struct _CamelStreamFilterPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilterClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType			camel_stream_filter_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelStreamFilter      *camel_stream_filter_new_with_stream	(CamelStream *stream);</div><div class='del'>-</div><div class='del'>-int camel_stream_filter_add	(CamelStreamFilter *filter, CamelMimeFilter *);</div><div class='del'>-void camel_stream_filter_remove	(CamelStreamFilter *filter, int id);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_STREAM_FILTER_H */</div><div class='head'>diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c<br/>deleted file mode 100644<br/>index a1d7cbaca3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-fs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,412 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-stream-fs.c : file system based stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-static CamelSeekableStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStreamFS */</div><div class='del'>-#define CSFS_CLASS(so) CAMEL_STREAM_FS_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read   (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write  (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_class_init (CamelStreamFsClass *camel_stream_fs_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_fs_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_stream_fs_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream = CAMEL_STREAM_FS (object);</div><div class='del'>-</div><div class='del'>-	stream-&gt;fd = -1;</div><div class='del'>-	((CamelSeekableStream *)stream)-&gt;bound_end = CAMEL_STREAM_UNBOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (object);</div><div class='del'>-</div><div class='del'>-	if (stream_fs-&gt;fd != -1)</div><div class='del'>-		close (stream_fs-&gt;fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_fs_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_fs_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_fs_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_fs_type = camel_type_register (camel_seekable_stream_get_type (), "CamelStreamFs",</div><div class='del'>-							    sizeof (CamelStreamFs),</div><div class='del'>-							    sizeof (CamelStreamFsClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_stream_fs_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_stream_fs_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_stream_fs_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_fs_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_fd:</div><div class='del'>- * @fd: a file descriptor</div><div class='del'>- *</div><div class='del'>- * Returns a stream associated with the given file descriptor.</div><div class='del'>- * When the stream is destroyed, the file descriptor will be closed.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_fd (int fd)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs;</div><div class='del'>-	off_t offset;</div><div class='del'>-</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	stream_fs = CAMEL_STREAM_FS (camel_object_new (camel_stream_fs_get_type ()));</div><div class='del'>-	stream_fs-&gt;fd = fd;</div><div class='del'>-	offset = lseek (fd, 0, SEEK_CUR);</div><div class='del'>-	if (offset == -1)</div><div class='del'>-		offset = 0;</div><div class='del'>-	CAMEL_SEEKABLE_STREAM (stream_fs)-&gt;position = offset;</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (stream_fs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_fd_and_bounds:</div><div class='del'>- * @fd: a file descriptor</div><div class='del'>- * @start: the first valid position in the file</div><div class='del'>- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Returns a stream associated with the given file descriptor and bounds.</div><div class='del'>- * When the stream is destroyed, the file descriptor will be closed.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream), start, end);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_name:</div><div class='del'>- * @name: a local filename</div><div class='del'>- * @flags: flags as in open(2)</div><div class='del'>- * @mode: a file mode</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelStream corresponding to the named file, flags,</div><div class='del'>- * and mode.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream, or #NULL on error.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_name (const char *name, int flags, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-</div><div class='del'>-	fd = open (name, flags, mode);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_fs_new_with_fd (fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_name_and_bounds:</div><div class='del'>- * @name: a local filename</div><div class='del'>- * @flags: flags as in open(2)</div><div class='del'>- * @mode: a file mode</div><div class='del'>- * @start: the first valid position in the file</div><div class='del'>- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelStream corresponding to the given arguments.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream, or NULL on error.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_name_and_bounds (const char *name, int flags,</div><div class='del'>-					  mode_t mode, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_name (name, flags, mode);</div><div class='del'>-	if (stream == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream),</div><div class='del'>-					  start, end);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check(NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return  -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (seekable-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN (seekable-&gt;bound_end - seekable-&gt;position, n);</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd(NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			nread = read (stream_fs-&gt;fd, buffer, n);</div><div class='del'>-		} while (nread == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN));</div><div class='del'>-	} else {</div><div class='del'>-		fd_set rdset;</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (stream_fs-&gt;fd, F_GETFL);</div><div class='del'>-		fcntl (stream_fs-&gt;fd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_SET (stream_fs-&gt;fd, &amp;rdset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			fdmax = MAX (stream_fs-&gt;fd, cancel_fd) + 1;</div><div class='del'>-			</div><div class='del'>-			nread = -1;</div><div class='del'>-			if (select (fdmax, &amp;rdset, 0, 0, NULL) != -1) {</div><div class='del'>-				if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-					fcntl (stream_fs-&gt;fd, F_SETFL, flags);</div><div class='del'>-					errno = EINTR;</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				do {</div><div class='del'>-					nread = read (stream_fs-&gt;fd, buffer, n);</div><div class='del'>-				} while (nread == -1 &amp;&amp; errno == EAGAIN);</div><div class='del'>-			} else if (errno == EINTR) {</div><div class='del'>-				errno = EAGAIN;</div><div class='del'>-			}</div><div class='del'>-		} while (nread == -1 &amp;&amp; errno == EAGAIN);</div><div class='del'>-		</div><div class='del'>-		error = errno;</div><div class='del'>-		fcntl (stream_fs-&gt;fd, F_SETFL, flags);</div><div class='del'>-		errno = error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (nread &gt; 0)</div><div class='del'>-		seekable-&gt;position += nread;</div><div class='del'>-	else if (nread == 0)</div><div class='del'>-		stream-&gt;eos = TRUE;</div><div class='del'>-	</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t w, written = 0;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check(NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return  -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (seekable-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN (seekable-&gt;bound_end - seekable-&gt;position, n);</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd(NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			do {</div><div class='del'>-				w = write (stream_fs-&gt;fd, buffer + written, n - written);</div><div class='del'>-			} while (w == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN));</div><div class='del'>-			</div><div class='del'>-			if (w &gt; 0)</div><div class='del'>-				written += w;</div><div class='del'>-		} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-	} else {</div><div class='del'>-		fd_set rdset, wrset;</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (stream_fs-&gt;fd, F_GETFL);</div><div class='del'>-		fcntl (stream_fs-&gt;fd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		fdmax = MAX (stream_fs-&gt;fd, cancel_fd)+1;</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_ZERO (&amp;wrset);</div><div class='del'>-			FD_SET (stream_fs-&gt;fd, &amp;wrset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			</div><div class='del'>-			w = -1;</div><div class='del'>-			if (select (fdmax, &amp;rdset, &amp;wrset, 0, NULL) != -1) {</div><div class='del'>-				if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-					fcntl (stream_fs-&gt;fd, F_SETFL, flags);</div><div class='del'>-					errno = EINTR;</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				do {</div><div class='del'>-					w = write (stream_fs-&gt;fd, buffer + written, n - written);</div><div class='del'>-				} while (w == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-				</div><div class='del'>-				if (w == -1) {</div><div class='del'>-					if (errno == EAGAIN) {</div><div class='del'>-						w = 0;</div><div class='del'>-					} else {</div><div class='del'>-						error = errno;</div><div class='del'>-						fcntl (stream_fs-&gt;fd, F_SETFL, flags);</div><div class='del'>-						errno = error;</div><div class='del'>-						return -1;</div><div class='del'>-					}</div><div class='del'>-				} else</div><div class='del'>-					written += w;</div><div class='del'>-			} else if (errno == EINTR) {</div><div class='del'>-				w = 0;</div><div class='del'>-			}</div><div class='del'>-		} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-		</div><div class='del'>-		error = errno;</div><div class='del'>-		fcntl (stream_fs-&gt;fd, F_SETFL, flags);</div><div class='del'>-		errno = error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (written &gt; 0)</div><div class='del'>-		seekable-&gt;position += written;</div><div class='del'>-	else if (w == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	return fsync(((CamelStreamFs *)stream)-&gt;fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	if (close (((CamelStreamFs *)stream)-&gt;fd) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	((CamelStreamFs *)stream)-&gt;fd = -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-stream_seek (CamelSeekableStream *stream, off_t offset, CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);</div><div class='del'>-	off_t real = 0;</div><div class='del'>-</div><div class='del'>-	switch (policy) {</div><div class='del'>-	case CAMEL_STREAM_SET:</div><div class='del'>-		real = offset;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STREAM_CUR:</div><div class='del'>-		real = stream-&gt;position + offset;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STREAM_END:</div><div class='del'>-		if (stream-&gt;bound_end == CAMEL_STREAM_UNBOUND) {</div><div class='del'>-			real = lseek(stream_fs-&gt;fd, offset, SEEK_END);</div><div class='del'>-			if (real != -1) {</div><div class='del'>-				if (real&lt;stream-&gt;bound_start)</div><div class='del'>-					real = stream-&gt;bound_start;</div><div class='del'>-				stream-&gt;position = real;</div><div class='del'>-			}</div><div class='del'>-			return real;</div><div class='del'>-		}</div><div class='del'>-		real = stream-&gt;bound_end + offset;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		real = MIN (real, stream-&gt;bound_end);</div><div class='del'>-	real = MAX (real, stream-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	real = lseek(stream_fs-&gt;fd, real, SEEK_SET);</div><div class='del'>-	if (real == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (real != stream-&gt;position &amp;&amp; ((CamelStream *)stream)-&gt;eos)</div><div class='del'>-		((CamelStream *)stream)-&gt;eos = FALSE;</div><div class='del'>-</div><div class='del'>-	stream-&gt;position = real;</div><div class='del'>-</div><div class='del'>-	return real;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h<br/>deleted file mode 100644<br/>index 7db13ac244..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-fs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-fs.h :stream based on unix filesystem */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_STREAM_FS_H</div><div class='del'>-#define CAMEL_STREAM_FS_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* for open flags */</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_FS_TYPE     (camel_stream_fs_get_type ())</div><div class='del'>-#define CAMEL_STREAM_FS(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))</div><div class='del'>-#define CAMEL_STREAM_FS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))</div><div class='del'>-#define CAMEL_IS_STREAM_FS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFs</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	int fd;             /* file descriptor on the underlying file */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelStreamFsClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_fs_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream * camel_stream_fs_new_with_name            (const char *name, int flags, mode_t mode);</div><div class='del'>-CamelStream * camel_stream_fs_new_with_name_and_bounds (const char *name, int flags, mode_t mode,</div><div class='del'>-							off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-CamelStream * camel_stream_fs_new_with_fd              (int fd);</div><div class='del'>-CamelStream * camel_stream_fs_new_with_fd_and_bounds   (int fd, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_FS_H */</div><div class='head'>diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c<br/>deleted file mode 100644<br/>index d81b304231..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-mem.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,250 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-mem.c: memory buffer based stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-static CamelSeekableStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStreamMem */</div><div class='del'>-#define CSM_CLASS(so) CAMEL_STREAM_MEM_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static gboolean stream_eos (CamelStream *stream);</div><div class='del'>-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void camel_stream_mem_finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_class_init (CamelStreamMemClass *camel_stream_mem_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_mem_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_stream_mem_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_SEEKABLE_STREAM_TYPE ) );</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_init (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);</div><div class='del'>-</div><div class='del'>-	stream_mem-&gt;owner = FALSE;</div><div class='del'>-	stream_mem-&gt;buffer = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_mem_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_mem_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_mem_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_mem_type = camel_type_register( CAMEL_SEEKABLE_STREAM_TYPE,</div><div class='del'>-							     "CamelStreamMem",</div><div class='del'>-							     sizeof( CamelStreamMem ),</div><div class='del'>-							     sizeof( CamelStreamMemClass ),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_stream_mem_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_stream_mem_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) camel_stream_mem_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_mem_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new (void)</div><div class='del'>-{</div><div class='del'>-	return camel_stream_mem_new_with_byte_array (g_byte_array_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new_with_buffer (const char *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-</div><div class='del'>-	ba = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (ba, (const guint8 *)buffer, len);</div><div class='del'>-	return camel_stream_mem_new_with_byte_array (ba);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new_with_byte_array (GByteArray *byte_array)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem;</div><div class='del'>-</div><div class='del'>-	stream_mem = CAMEL_STREAM_MEM( camel_object_new (CAMEL_STREAM_MEM_TYPE) );</div><div class='del'>-	stream_mem-&gt;buffer = byte_array;</div><div class='del'>-	stream_mem-&gt;owner = TRUE;</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (stream_mem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* note: with these functions the caller is the 'owner' of the buffer */</div><div class='del'>-void camel_stream_mem_set_byte_array (CamelStreamMem *s, GByteArray *buffer)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;buffer &amp;&amp; s-&gt;owner)</div><div class='del'>-		g_byte_array_free(s-&gt;buffer, TRUE);</div><div class='del'>-	s-&gt;owner = FALSE;</div><div class='del'>-	s-&gt;buffer = buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_stream_mem_set_buffer (CamelStreamMem *s, const char *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-</div><div class='del'>-	ba = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append(ba, (const guint8 *)buffer, len);</div><div class='del'>-	camel_stream_mem_set_byte_array(s, ba);</div><div class='del'>-	s-&gt;owner = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);</div><div class='del'>-</div><div class='del'>-	if (stream_mem-&gt;buffer &amp;&amp; stream_mem-&gt;owner)</div><div class='del'>-		g_byte_array_free (stream_mem-&gt;buffer, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Will be called automagically in the Camel Type System!</div><div class='del'>-	 * Wheeee!</div><div class='del'>-	 * G_TK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *camel_stream_mem = CAMEL_STREAM_MEM (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-</div><div class='del'>-	if (seekable-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN(seekable-&gt;bound_end - seekable-&gt;position, n);</div><div class='del'>-</div><div class='del'>-	nread = MIN (n, camel_stream_mem-&gt;buffer-&gt;len - seekable-&gt;position);</div><div class='del'>-	if (nread &gt; 0) {</div><div class='del'>-		memcpy (buffer, camel_stream_mem-&gt;buffer-&gt;data + seekable-&gt;position, nread);</div><div class='del'>-		seekable-&gt;position += nread;</div><div class='del'>-	} else</div><div class='del'>-		nread = 0;</div><div class='del'>-</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t nwrite = n;</div><div class='del'>-	</div><div class='del'>-	if (seekable-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		nwrite = MIN(seekable-&gt;bound_end - seekable-&gt;position, n);</div><div class='del'>-</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object"</div><div class='del'>-#endif</div><div class='del'>-	if (seekable-&gt;position == stream_mem-&gt;buffer-&gt;len) {</div><div class='del'>-		g_byte_array_append(stream_mem-&gt;buffer, (const guint8 *)buffer, nwrite);</div><div class='del'>-	} else {</div><div class='del'>-		g_byte_array_set_size(stream_mem-&gt;buffer, nwrite + stream_mem-&gt;buffer-&gt;len);</div><div class='del'>-		memcpy(stream_mem-&gt;buffer-&gt;data + seekable-&gt;position, buffer, nwrite);</div><div class='del'>-	}</div><div class='del'>-	seekable-&gt;position += nwrite;</div><div class='del'>-</div><div class='del'>-	return nwrite;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-stream_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);</div><div class='del'>-	CamelSeekableStream *seekable_stream = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-</div><div class='del'>-	return stream_mem-&gt;buffer-&gt;len &lt;= seekable_stream-&gt;position;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-	     CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	off_t position;</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (stream);</div><div class='del'>-</div><div class='del'>-	switch  (policy) {</div><div class='del'>-	case CAMEL_STREAM_SET:</div><div class='del'>-		position = offset;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STREAM_CUR:</div><div class='del'>-		position = stream-&gt;position + offset;</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_STREAM_END:</div><div class='del'>-		position = (stream_mem-&gt;buffer)-&gt;len + offset;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		position = offset;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stream-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		position = MIN (position, stream-&gt;bound_end);</div><div class='del'>-	if (stream-&gt;bound_start != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		position = MAX (position, 0);</div><div class='del'>-	else</div><div class='del'>-		position = MAX (position, stream-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	if (position &gt; stream_mem-&gt;buffer-&gt;len) {</div><div class='del'>-		int oldlen = stream_mem-&gt;buffer-&gt;len;</div><div class='del'>-		g_byte_array_set_size (stream_mem-&gt;buffer, position);</div><div class='del'>-		memset (stream_mem-&gt;buffer-&gt;data + oldlen, 0,</div><div class='del'>-			position - oldlen);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stream-&gt;position = position;</div><div class='del'>-</div><div class='del'>-	return position;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h<br/>deleted file mode 100644<br/>index af51c36ff7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-mem.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-stream-mem.h: stream based on memory buffer */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_STREAM_MEM_H</div><div class='del'>-#define CAMEL_STREAM_MEM_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_MEM_TYPE     (camel_stream_mem_get_type ())</div><div class='del'>-#define CAMEL_STREAM_MEM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))</div><div class='del'>-#define CAMEL_STREAM_MEM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))</div><div class='del'>-#define CAMEL_IS_STREAM_MEM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStreamMemClass CamelStreamMemClass;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamMem {</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	gboolean owner;		/* do we own the buffer? */</div><div class='del'>-	GByteArray *buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamMemClass {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_mem_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_stream_mem_new(void);</div><div class='del'>-CamelStream *camel_stream_mem_new_with_byte_array(GByteArray *buffer);</div><div class='del'>-CamelStream *camel_stream_mem_new_with_buffer(const char *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-/* these are really only here for implementing classes */</div><div class='del'>-void camel_stream_mem_set_byte_array(CamelStreamMem *, GByteArray *buffer);</div><div class='del'>-void camel_stream_mem_set_buffer(CamelStreamMem *, const char *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_MEM_H */</div><div class='head'>diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c<br/>deleted file mode 100644<br/>index 3c0fdee47b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-null.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-null.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-stream.c : abstract class for a stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-stream-null.h"</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStream */</div><div class='del'>-#define CS_CLASS(so) CAMEL_STREAM_NULL_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* dummy implementations, for a NULL stream */</div><div class='del'>-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }</div><div class='del'>-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { ((CamelStreamNull *)stream)-&gt;written += n; return n; }</div><div class='del'>-static int       stream_close      (CamelStream *stream) { return 0; }</div><div class='del'>-static int       stream_flush      (CamelStream *stream) { return 0; }</div><div class='del'>-static gboolean  stream_eos        (CamelStream *stream) { return TRUE; }</div><div class='del'>-static int       stream_reset      (CamelStream *stream) { ((CamelStreamNull *)stream)-&gt;written = 0; return 0; }</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_null_class_init (CamelStreamClass *camel_stream_null_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_stream_null_class;</div><div class='del'>-</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_null_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_null_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_null_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_null_type = camel_type_register( camel_stream_get_type(),</div><div class='del'>-							      "CamelStreamNull",</div><div class='del'>-							      sizeof( CamelStreamNull ),</div><div class='del'>-							      sizeof( CamelStreamNullClass ),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_stream_null_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      NULL,</div><div class='del'>-							      NULL );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_null_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_null_new:</div><div class='del'>- *</div><div class='del'>- * Returns a NULL stream.  A null stream is always at eof, and</div><div class='del'>- * always returns success for all reads and writes.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_null_new(void)</div><div class='del'>-{</div><div class='del'>-	return (CamelStream *)camel_object_new(camel_stream_null_get_type ());</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h<br/>deleted file mode 100644<br/>index be11da7741..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-null.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream-null.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_STREAM_NULL_H</div><div class='del'>-#define _CAMEL_STREAM_NULL_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_NULL(obj)         CAMEL_CHECK_CAST (obj, camel_stream_null_get_type (), CamelStreamNull)</div><div class='del'>-#define CAMEL_STREAM_NULL_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_null_get_type (), CamelStreamNullClass)</div><div class='del'>-#define CAMEL_IS_STREAM_NULL(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_null_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStreamNullClass CamelStreamNullClass;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamNull {</div><div class='del'>-	CamelStream parent;</div><div class='del'>-	</div><div class='del'>-	size_t written;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamNullClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType			camel_stream_null_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelStream            *camel_stream_null_new		(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_STREAM_NULL_H */</div><div class='head'>diff --git a/camel/camel-stream.c b/camel/camel-stream.c<br/>deleted file mode 100644<br/>index 709bfe107c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,274 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-stream.c : abstract class for a stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStream */</div><div class='del'>-#define CS_CLASS(so) CAMEL_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* default implementations, do very little */</div><div class='del'>-static ssize_t   stream_read       (CamelStream *stream, char *buffer, size_t n) { return 0; }</div><div class='del'>-static ssize_t   stream_write      (CamelStream *stream, const char *buffer, size_t n) { return n; }</div><div class='del'>-static int       stream_close      (CamelStream *stream) { return 0; }</div><div class='del'>-static int       stream_flush      (CamelStream *stream) { return 0; }</div><div class='del'>-static gboolean  stream_eos        (CamelStream *stream) { return stream-&gt;eos; }</div><div class='del'>-static int       stream_reset      (CamelStream *stream) { return 0; }</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_class_init (CamelStreamClass *camel_stream_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_type = camel_type_register( CAMEL_OBJECT_TYPE,</div><div class='del'>-							 "CamelStream",</div><div class='del'>-							 sizeof( CamelStream ),</div><div class='del'>-							 sizeof( CamelStreamClass ),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_stream_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 NULL,</div><div class='del'>-							 NULL );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_read:</div><div class='del'>- * @stream: a CamelStream.</div><div class='del'>- * @buffer: buffer where bytes pulled from the stream are stored.</div><div class='del'>- * @n: max number of bytes to read.</div><div class='del'>- *</div><div class='del'>- * Read at most @n bytes from the @stream object and stores them</div><div class='del'>- * in the buffer pointed at by @buffer.</div><div class='del'>- *</div><div class='del'>- * Return value: number of bytes actually read, or -1 on error and</div><div class='del'>- * set errno.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (n == 0 || buffer, -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;read (stream, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_write:</div><div class='del'>- * @stream: a CamelStream object.</div><div class='del'>- * @buffer: buffer to write.</div><div class='del'>- * @n: number of bytes to write</div><div class='del'>- *</div><div class='del'>- * Write @n bytes from the buffer pointed at by @buffer into @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the number of bytes actually written to the stream,</div><div class='del'>- * or -1 on error.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (n == 0 || buffer, -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;write (stream, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_flush:</div><div class='del'>- * @stream: a CamelStream object</div><div class='del'>- *</div><div class='del'>- * Flushes the contents of the stream to its backing store. Only meaningful</div><div class='del'>- * on writable streams.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;flush (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_close:</div><div class='del'>- * @stream: </div><div class='del'>- * </div><div class='del'>- * Close a stream.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;close (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_eos:</div><div class='del'>- * @stream: a CamelStream object</div><div class='del'>- *</div><div class='del'>- * Test if there are bytes left to read on the @stream object.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE if all the contents on the stream has been read, or</div><div class='del'>- * %FALSE if information is still available.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_stream_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), TRUE);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;eos (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_reset: reset a stream</div><div class='del'>- * @stream: the stream object</div><div class='del'>- *</div><div class='del'>- * Reset a stream. That is, put it in a state where it can be read</div><div class='del'>- * from the beginning again. Not all streams in Camel are seekable,</div><div class='del'>- * but they must all be resettable.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_stream_reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;reset (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/***************** Utility functions ********************/</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_write_string:</div><div class='del'>- * @stream: a stream object</div><div class='del'>- * @string: a string</div><div class='del'>- *</div><div class='del'>- * Writes the string to the stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the number of characters output, -1 on error.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_write_string (CamelStream *stream, const char *string)</div><div class='del'>-{</div><div class='del'>-	return camel_stream_write (stream, string, strlen (string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_printf:</div><div class='del'>- * @stream: a stream object</div><div class='del'>- * @fmt: a printf-style format string</div><div class='del'>- *</div><div class='del'>- * This printfs the given data to @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the number of characters output, -1 on error.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_printf (CamelStream *stream, const char *fmt, ... )</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	char *string;</div><div class='del'>-	ssize_t ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	va_start (args, fmt);</div><div class='del'>-	string = g_strdup_vprintf (fmt, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-</div><div class='del'>-	if (!string)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	ret = camel_stream_write (stream, string, strlen (string));</div><div class='del'>-	g_free (string);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_write_to_stream:</div><div class='del'>- * @stream: Source CamelStream.</div><div class='del'>- * @output_stream: Destination CamelStream.</div><div class='del'>- *</div><div class='del'>- * Write all of a stream (until eos) into another stream, in a blocking</div><div class='del'>- * fashion.</div><div class='del'>- *</div><div class='del'>- * Return value: Returns -1 on error, or the number of bytes succesfully</div><div class='del'>- * copied across streams.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream)</div><div class='del'>-{</div><div class='del'>-	char tmp_buf[4096];</div><div class='del'>-	ssize_t total = 0;</div><div class='del'>-	ssize_t nb_read;</div><div class='del'>-	ssize_t nb_written;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (output_stream), -1);</div><div class='del'>-</div><div class='del'>-	while (!camel_stream_eos (stream)) {</div><div class='del'>-		nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));</div><div class='del'>-		if (nb_read &lt; 0)</div><div class='del'>-			return -1;</div><div class='del'>-		else if (nb_read &gt; 0) {</div><div class='del'>-			nb_written = 0;</div><div class='del'>-</div><div class='del'>-			while (nb_written &lt; nb_read) {</div><div class='del'>-				ssize_t len = camel_stream_write (output_stream, tmp_buf + nb_written,</div><div class='del'>-								  nb_read - nb_written);</div><div class='del'>-				if (len &lt; 0)</div><div class='del'>-					return -1;</div><div class='del'>-				nb_written += len;</div><div class='del'>-			}</div><div class='del'>-			total += nb_written;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-stream.h b/camel/camel-stream.h<br/>deleted file mode 100644<br/>index f75e882a70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/* camel-stream.h : class for an abstract stream */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_STREAM_H</div><div class='del'>-#define CAMEL_STREAM_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_TYPE     (camel_stream_get_type ())</div><div class='del'>-#define CAMEL_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))</div><div class='del'>-#define CAMEL_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))</div><div class='del'>-#define CAMEL_IS_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelStream</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	gboolean eos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-</div><div class='del'>-	ssize_t   (*read)       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-	ssize_t   (*write)      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-	int       (*close)      (CamelStream *stream);</div><div class='del'>-	int       (*flush)      (CamelStream *stream);</div><div class='del'>-	gboolean  (*eos)        (CamelStream *stream);</div><div class='del'>-	int       (*reset)      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-} CamelStreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-ssize_t    camel_stream_read       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-ssize_t    camel_stream_write      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-int        camel_stream_flush      (CamelStream *stream);</div><div class='del'>-int        camel_stream_close      (CamelStream *stream);</div><div class='del'>-gboolean   camel_stream_eos        (CamelStream *stream);</div><div class='del'>-int        camel_stream_reset      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-/* utility macros and funcs */</div><div class='del'>-ssize_t camel_stream_write_string (CamelStream *stream, const char *string);</div><div class='del'>-ssize_t camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);</div><div class='del'>-ssize_t camel_stream_vprintf (CamelStream *stream, const char *fmt, va_list ap);</div><div class='del'>-</div><div class='del'>-/* Write a whole stream to another stream, until eof or error on</div><div class='del'>- * either stream.</div><div class='del'>- */</div><div class='del'>-ssize_t camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_H */</div><div class='head'>diff --git a/camel/camel-tcp-stream-openssl.c b/camel/camel-tcp-stream-openssl.c<br/>deleted file mode 100644<br/>index 785f5ad74b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream-openssl.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream-openssl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,821 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_OPENSSL</div><div class='del'>-</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-</div><div class='del'>-#include &lt;openssl/ssl.h&gt;</div><div class='del'>-#include &lt;openssl/x509.h&gt;</div><div class='del'>-#include &lt;openssl/err.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-service.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define TIMEOUT_USEC  (10000)</div><div class='del'>-</div><div class='del'>-static CamelTcpStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelTcpStreamSSL */</div><div class='del'>-#define CTSR_CLASS(so) CAMEL_TCP_STREAM_SSL_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static int stream_connect (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);</div><div class='del'>-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);</div><div class='del'>-</div><div class='del'>-static SSL *open_ssl_connection (CamelService *service, int sockfd, CamelTcpStreamSSL *openssl);</div><div class='del'>-</div><div class='del'>-struct _CamelTcpStreamSSLPrivate {</div><div class='del'>-	int sockfd;</div><div class='del'>-	SSL *ssl;</div><div class='del'>-	</div><div class='del'>-	CamelService *service;</div><div class='del'>-	char *expected_host;</div><div class='del'>-	gboolean ssl_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *camel_tcp_stream_ssl_class)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamClass *camel_tcp_stream_class =</div><div class='del'>-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_ssl_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_tcp_stream_ssl_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	</div><div class='del'>-	camel_tcp_stream_class-&gt;connect = stream_connect;</div><div class='del'>-	camel_tcp_stream_class-&gt;getsockopt = stream_getsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;setsockopt = stream_setsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_local_address  = stream_get_local_address;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_remote_address = stream_get_remote_address;</div><div class='del'>-	</div><div class='del'>-	/* init OpenSSL stuff */</div><div class='del'>-	SSLeay_add_ssl_algorithms ();</div><div class='del'>-	SSL_load_error_strings ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv = g_new0 (struct _CamelTcpStreamSSLPrivate, 1);</div><div class='del'>-	stream-&gt;priv-&gt;sockfd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);</div><div class='del'>-	</div><div class='del'>-	if (stream-&gt;priv-&gt;ssl) {</div><div class='del'>-		SSL_shutdown (stream-&gt;priv-&gt;ssl);</div><div class='del'>-		</div><div class='del'>-		if (stream-&gt;priv-&gt;ssl-&gt;ctx) {</div><div class='del'>-			SSL_CTX_free (stream-&gt;priv-&gt;ssl-&gt;ctx);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		SSL_free (stream-&gt;priv-&gt;ssl);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (stream-&gt;priv-&gt;sockfd != -1)</div><div class='del'>-		close (stream-&gt;priv-&gt;sockfd);</div><div class='del'>-	</div><div class='del'>-	g_free (stream-&gt;priv-&gt;expected_host);</div><div class='del'>-	</div><div class='del'>-	g_free (stream-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_tcp_stream_ssl_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_tcp_stream_get_type (),</div><div class='del'>-					    "CamelTcpStreamSSL",</div><div class='del'>-					    sizeof (CamelTcpStreamSSL),</div><div class='del'>-					    sizeof (CamelTcpStreamSSLClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_tcp_stream_ssl_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_tcp_stream_ssl_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_tcp_stream_ssl_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_new:</div><div class='del'>- * @service: camel service</div><div class='del'>- * @expected_host: host that the stream is expecting to connect with.</div><div class='del'>- *</div><div class='del'>- * Since the SSL certificate authenticator may need to prompt the</div><div class='del'>- * user, a CamelService is needed. @expected_host is needed as a</div><div class='del'>- * protection against an MITM attack.</div><div class='del'>- *</div><div class='del'>- * Return value: a ssl stream (in ssl mode)</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv-&gt;service = service;</div><div class='del'>-	stream-&gt;priv-&gt;expected_host = g_strdup (expected_host);</div><div class='del'>-	stream-&gt;priv-&gt;ssl_mode = TRUE;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_new_raw:</div><div class='del'>- * @service: camel service</div><div class='del'>- * @expected_host: host that the stream is expecting to connect with.</div><div class='del'>- *</div><div class='del'>- * Since the SSL certificate authenticator may need to prompt the</div><div class='del'>- * user, a CamelService is needed. @expected_host is needed as a</div><div class='del'>- * protection against an MITM attack.</div><div class='del'>- *</div><div class='del'>- * Return value: a ssl-capable stream (in non ssl mode)</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv-&gt;service = service;</div><div class='del'>-	stream-&gt;priv-&gt;expected_host = g_strdup (expected_host);</div><div class='del'>-	stream-&gt;priv-&gt;ssl_mode = FALSE;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ssl_errno (SSL *ssl, int ret)</div><div class='del'>-{</div><div class='del'>-	switch (SSL_get_error (ssl, ret)) {</div><div class='del'>-	case SSL_ERROR_NONE:</div><div class='del'>-		return 0;</div><div class='del'>-	case SSL_ERROR_ZERO_RETURN:</div><div class='del'>-		/* this one does not map well at all */</div><div class='del'>-		d(printf ("ssl_errno: SSL_ERROR_ZERO_RETURN\n"));</div><div class='del'>-		return EINVAL;</div><div class='del'>-	case SSL_ERROR_WANT_READ:   /* non-fatal; retry */</div><div class='del'>-	case SSL_ERROR_WANT_WRITE:  /* non-fatal; retry */</div><div class='del'>-		d(printf ("ssl_errno: SSL_ERROR_WANT_[READ,WRITE]\n"));</div><div class='del'>-		return EAGAIN;</div><div class='del'>-	case SSL_ERROR_SYSCALL:</div><div class='del'>-		d(printf ("ssl_errno: SSL_ERROR_SYSCALL\n"));</div><div class='del'>-		return EINTR;</div><div class='del'>-	case SSL_ERROR_SSL:</div><div class='del'>-		d(printf ("ssl_errno: SSL_ERROR_SSL  &lt;-- very useful error...riiiiight\n"));</div><div class='del'>-		return EINTR;</div><div class='del'>-	default:</div><div class='del'>-		d(printf ("ssl_errno: default error\n"));</div><div class='del'>-		return EINTR;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_enable_ssl:</div><div class='del'>- * @stream: ssl stream</div><div class='del'>- *</div><div class='del'>- * Toggles an ssl-capable stream into ssl mode (if it isn't already).</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *stream)</div><div class='del'>-{</div><div class='del'>-	SSL *ssl;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (stream), -1);</div><div class='del'>-	</div><div class='del'>-	if (stream-&gt;priv-&gt;sockfd != -1 &amp;&amp; !stream-&gt;priv-&gt;ssl_mode) {</div><div class='del'>-		ssl = open_ssl_connection (stream-&gt;priv-&gt;service, stream-&gt;priv-&gt;sockfd, stream);</div><div class='del'>-		if (ssl == NULL) {</div><div class='del'>-			stream-&gt;priv-&gt;sockfd = -1;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		stream-&gt;priv-&gt;ssl = ssl;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv-&gt;ssl_mode = TRUE;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	SSL *ssl = openssl-&gt;priv-&gt;ssl;</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			if (ssl) {</div><div class='del'>-				nread = SSL_read (ssl, buffer, n);</div><div class='del'>-				if (nread &lt; 0)</div><div class='del'>-					errno = ssl_errno (ssl, nread);</div><div class='del'>-			} else {</div><div class='del'>-				nread = read (openssl-&gt;priv-&gt;sockfd, buffer, n);</div><div class='del'>-			}</div><div class='del'>-		} while (nread &lt; 0 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-	} else {</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		struct timeval timeout;</div><div class='del'>-		fd_set rdset;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (openssl-&gt;priv-&gt;sockfd, F_GETFL);</div><div class='del'>-		fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		fdmax = MAX (openssl-&gt;priv-&gt;sockfd, cancel_fd) + 1;</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_SET (openssl-&gt;priv-&gt;sockfd, &amp;rdset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			</div><div class='del'>-			timeout.tv_sec = 0;</div><div class='del'>-			timeout.tv_usec = TIMEOUT_USEC;</div><div class='del'>-			select (fdmax, &amp;rdset, 0, 0, &amp;timeout);</div><div class='del'>-			if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-				fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-				errno = EINTR;</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			do {</div><div class='del'>-				if (ssl) {</div><div class='del'>-					nread = SSL_read (ssl, buffer, n);</div><div class='del'>-					if (nread &lt; 0)</div><div class='del'>-						errno = ssl_errno (ssl, nread);</div><div class='del'>-				} else {</div><div class='del'>-					nread = read (openssl-&gt;priv-&gt;sockfd, buffer, n);</div><div class='del'>-				}</div><div class='del'>-			} while (nread &lt; 0 &amp;&amp; errno == EINTR);</div><div class='del'>-		} while (nread &lt; 0 &amp;&amp; (errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-		</div><div class='del'>-		error = errno;</div><div class='del'>-		fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-		errno = error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	SSL *ssl = openssl-&gt;priv-&gt;ssl;</div><div class='del'>-	ssize_t w, written = 0;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			do {</div><div class='del'>-				if (ssl) {</div><div class='del'>-					w = SSL_write (ssl, buffer + written, n - written);</div><div class='del'>-					if (w &lt; 0)</div><div class='del'>-						errno = ssl_errno (ssl, w);</div><div class='del'>-				} else {</div><div class='del'>-					w = write (openssl-&gt;priv-&gt;sockfd, buffer + written, n - written);</div><div class='del'>-				}</div><div class='del'>-			} while (w &lt; 0 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-			</div><div class='del'>-			if (w &gt; 0)</div><div class='del'>-				written += w;</div><div class='del'>-		} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-	} else {</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		struct timeval timeout;</div><div class='del'>-		fd_set rdset, wrset;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (openssl-&gt;priv-&gt;sockfd, F_GETFL);</div><div class='del'>-		fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		fdmax = MAX (openssl-&gt;priv-&gt;sockfd, cancel_fd) + 1;</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_ZERO (&amp;wrset);</div><div class='del'>-			FD_SET (openssl-&gt;priv-&gt;sockfd, &amp;wrset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			</div><div class='del'>-			timeout.tv_sec = 0;</div><div class='del'>-			timeout.tv_usec = TIMEOUT_USEC;</div><div class='del'>-			select (fdmax, &amp;rdset, &amp;wrset, 0, &amp;timeout);</div><div class='del'>-			if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-				fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-				errno = EINTR;</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			do {</div><div class='del'>-				if (ssl) {</div><div class='del'>-					w = SSL_write (ssl, buffer + written, n - written);</div><div class='del'>-					if (w &lt; 0)</div><div class='del'>-						errno = ssl_errno (ssl, w);</div><div class='del'>-				} else {</div><div class='del'>-					w = write (openssl-&gt;priv-&gt;sockfd, buffer + written, n - written);</div><div class='del'>-				}</div><div class='del'>-			} while (w &lt; 0 &amp;&amp; errno == EINTR);</div><div class='del'>-			</div><div class='del'>-			if (w &lt; 0) {</div><div class='del'>-				if (errno == EAGAIN || errno == EWOULDBLOCK) {</div><div class='del'>-					w = 0;</div><div class='del'>-				} else {</div><div class='del'>-					error = errno;</div><div class='del'>-					fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-					errno = error;</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-			} else</div><div class='del'>-				written += w;</div><div class='del'>-		} while (w &gt;= 0 &amp;&amp; written &lt; n);</div><div class='del'>-		</div><div class='del'>-		fcntl (openssl-&gt;priv-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_ssl_connection (SSL *ssl)</div><div class='del'>-{</div><div class='del'>-	if (ssl) {</div><div class='del'>-		SSL_shutdown (ssl);</div><div class='del'>-		</div><div class='del'>-		if (ssl-&gt;ctx)</div><div class='del'>-			SSL_CTX_free (ssl-&gt;ctx);</div><div class='del'>-		</div><div class='del'>-		SSL_free (ssl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	close_ssl_connection (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;ssl);</div><div class='del'>-	((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;ssl = NULL;</div><div class='del'>-	</div><div class='del'>-	if (close (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd = -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */</div><div class='del'>-/* returns -1 &amp; errno == EINTR if the connection was cancelled */</div><div class='del'>-static int</div><div class='del'>-socket_connect (struct hostent *h, int port)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	int fd;</div><div class='del'>-	int ret;</div><div class='del'>-	socklen_t len;</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	/* see if we're cancelled yet */</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* setup connect, we do it using a nonblocking socket so we can poll it */</div><div class='del'>-	sin.sin_port = htons (port);</div><div class='del'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	memcpy (&amp;sin.sin_addr, h-&gt;h_addr, sizeof (sin.sin_addr));</div><div class='del'>-	</div><div class='del'>-	fd = socket (h-&gt;h_addrtype, SOCK_STREAM, 0);</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		ret = connect (fd, (struct sockaddr *)&amp;sin, sizeof (sin));</div><div class='del'>-		if (ret == -1) {</div><div class='del'>-			close (fd);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return fd;</div><div class='del'>-	} else {</div><div class='del'>-		fd_set rdset, wrset;</div><div class='del'>-		int flags, fdmax;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (fd, F_GETFL);</div><div class='del'>-		fcntl (fd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		ret = connect (fd, (struct sockaddr *)&amp;sin, sizeof (sin));</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			fcntl (fd, F_SETFL, flags);</div><div class='del'>-			return fd;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (errno != EINPROGRESS) {</div><div class='del'>-			close (fd);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		FD_ZERO (&amp;rdset);</div><div class='del'>-		FD_ZERO (&amp;wrset);</div><div class='del'>-		FD_SET (fd, &amp;wrset);</div><div class='del'>-		FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-		fdmax = MAX (fd, cancel_fd) + 1;</div><div class='del'>-		tv.tv_usec = 0;</div><div class='del'>-		tv.tv_sec = 60 * 4;</div><div class='del'>-		</div><div class='del'>-		if (select (fdmax, &amp;rdset, &amp;wrset, 0, &amp;tv) == 0) {</div><div class='del'>-			close (fd);</div><div class='del'>-			errno = ETIMEDOUT;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (cancel_fd != -1 &amp;&amp; FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-			close (fd);</div><div class='del'>-			errno = EINTR;</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			len = sizeof (int);</div><div class='del'>-			</div><div class='del'>-			if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &amp;ret, &amp;len) == -1) {</div><div class='del'>-				close (fd);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				close (fd);</div><div class='del'>-				errno = ret;</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		fcntl (fd, F_SETFL, flags);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_ssl_cert (const char *certid)</div><div class='del'>-{</div><div class='del'>-	char *path, *filename;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	path = g_strdup_printf ("%s/.camel_certs", getenv ("HOME"));</div><div class='del'>-	if (mkdir (path, 0700) == -1) {</div><div class='del'>-		if (errno != EEXIST)</div><div class='del'>-			return;</div><div class='del'>-		</div><div class='del'>-		if (stat (path, &amp;st) == -1)</div><div class='del'>-			return;</div><div class='del'>-		</div><div class='del'>-		if (!S_ISDIR (st.st_mode))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/%s", path, certid);</div><div class='del'>-	g_free (path);</div><div class='del'>-	</div><div class='del'>-	fd = open (filename, O_WRONLY | O_CREAT, 0600);</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close (fd);</div><div class='del'>-	</div><div class='del'>-	g_free (filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-ssl_cert_is_saved (const char *certid)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	struct stat st;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/.camel_certs/%s", getenv ("HOME"), certid);</div><div class='del'>-	</div><div class='del'>-	if (stat (filename, &amp;st) == -1) {</div><div class='del'>-		g_free (filename);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	return st.st_uid == getuid ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ssl_verify (int ok, X509_STORE_CTX *ctx)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream;</div><div class='del'>-	X509 *cert;</div><div class='del'>-	SSL *ssl;</div><div class='del'>-	int err;</div><div class='del'>-	</div><div class='del'>-	ssl = X509_STORE_CTX_get_ex_data (ctx, SSL_get_ex_data_X509_STORE_CTX_idx ());</div><div class='del'>-	</div><div class='del'>-	stream = SSL_CTX_get_app_data (ssl-&gt;ctx);</div><div class='del'>-	</div><div class='del'>-	cert = X509_STORE_CTX_get_current_cert (ctx);</div><div class='del'>-	err = X509_STORE_CTX_get_error (ctx);</div><div class='del'>-	</div><div class='del'>-	if (stream)</div><div class='del'>-		ok = ssl_cert_is_saved (stream-&gt;priv-&gt;expected_host);</div><div class='del'>-	</div><div class='del'>-	if (!ok &amp;&amp; stream) {</div><div class='del'>-		CamelService *service = stream-&gt;priv-&gt;service;</div><div class='del'>-		char *prompt, *cert_str;</div><div class='del'>-		char buf[257];</div><div class='del'>-		</div><div class='del'>-#define GET_STRING(name) X509_NAME_oneline (name, buf, 256)</div><div class='del'>-		</div><div class='del'>-		cert_str = g_strdup_printf (_("Issuer: %s\n"</div><div class='del'>-					      "Subject: %s"),</div><div class='del'>-					    GET_STRING (X509_get_issuer_name (cert)),</div><div class='del'>-					    GET_STRING (X509_get_subject_name (cert)));</div><div class='del'>-		</div><div class='del'>-		prompt = g_strdup_printf (_("Bad certificate from %s:\n\n%s\n\n"</div><div class='del'>-					    "Do you wish to accept anyway?"),</div><div class='del'>-					  service-&gt;url-&gt;host, cert_str);</div><div class='del'>-		</div><div class='del'>-		ok = camel_session_alert_user (service-&gt;session, CAMEL_SESSION_ALERT_WARNING, prompt, TRUE);</div><div class='del'>-		g_free (prompt);</div><div class='del'>-		</div><div class='del'>-		if (ok)</div><div class='del'>-			save_ssl_cert (stream-&gt;priv-&gt;expected_host);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static SSL *</div><div class='del'>-open_ssl_connection (CamelService *service, int sockfd, CamelTcpStreamSSL *openssl)</div><div class='del'>-{</div><div class='del'>-	SSL_CTX *ssl_ctx = NULL;</div><div class='del'>-	SSL *ssl = NULL;</div><div class='del'>-	int n;</div><div class='del'>-	</div><div class='del'>-	/* SSLv23_client_method will negotiate with SSL v2, v3, or TLS v1 */</div><div class='del'>-	ssl_ctx = SSL_CTX_new (SSLv23_client_method ());</div><div class='del'>-	g_return_val_if_fail (ssl_ctx != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_PEER, &amp;ssl_verify);</div><div class='del'>-	ssl = SSL_new (ssl_ctx);</div><div class='del'>-	SSL_set_fd (ssl, sockfd);</div><div class='del'>-	</div><div class='del'>-	SSL_CTX_set_app_data (ssl_ctx, openssl);</div><div class='del'>-	</div><div class='del'>-	n = SSL_connect (ssl);</div><div class='del'>-	if (n != 1) {</div><div class='del'>-		int errnosave = ssl_errno (ssl, n);</div><div class='del'>-		</div><div class='del'>-		SSL_shutdown (ssl);</div><div class='del'>-		</div><div class='del'>-		if (ssl-&gt;ctx)</div><div class='del'>-			SSL_CTX_free (ssl-&gt;ctx);</div><div class='del'>-		</div><div class='del'>-		SSL_free (ssl);</div><div class='del'>-		ssl = NULL;</div><div class='del'>-		</div><div class='del'>-		close (sockfd);</div><div class='del'>-		</div><div class='del'>-		errno = errnosave;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ssl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *openssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	SSL *ssl = NULL;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (host != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	fd = socket_connect (host, port);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (openssl-&gt;priv-&gt;ssl_mode) {</div><div class='del'>-		ssl = open_ssl_connection (openssl-&gt;priv-&gt;service, fd, openssl);</div><div class='del'>-		if (!ssl)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	openssl-&gt;priv-&gt;sockfd = fd;</div><div class='del'>-	openssl-&gt;priv-&gt;ssl = ssl;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_sockopt_level (const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	switch (data-&gt;option) {</div><div class='del'>-	case CAMEL_SOCKOPT_MAXSEGMENT:</div><div class='del'>-	case CAMEL_SOCKOPT_NODELAY:</div><div class='del'>-		return IPPROTO_TCP;</div><div class='del'>-	default:</div><div class='del'>-		return SOL_SOCKET;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_sockopt_optname (const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	switch (data-&gt;option) {</div><div class='del'>-	case CAMEL_SOCKOPT_MAXSEGMENT:</div><div class='del'>-		return TCP_MAXSEG;</div><div class='del'>-	case CAMEL_SOCKOPT_NODELAY:</div><div class='del'>-		return TCP_NODELAY;</div><div class='del'>-	case CAMEL_SOCKOPT_BROADCAST:</div><div class='del'>-		return SO_BROADCAST;</div><div class='del'>-	case CAMEL_SOCKOPT_KEEPALIVE:</div><div class='del'>-		return SO_KEEPALIVE;</div><div class='del'>-	case CAMEL_SOCKOPT_LINGER:</div><div class='del'>-		return SO_LINGER;</div><div class='del'>-	case CAMEL_SOCKOPT_RECVBUFFERSIZE:</div><div class='del'>-		return SO_RCVBUF;</div><div class='del'>-	case CAMEL_SOCKOPT_SENDBUFFERSIZE:</div><div class='del'>-		return SO_SNDBUF;</div><div class='del'>-	case CAMEL_SOCKOPT_REUSEADDR:</div><div class='del'>-		return SO_REUSEADDR;</div><div class='del'>-	case CAMEL_SOCKOPT_IPTYPEOFSERVICE:</div><div class='del'>-		return SO_TYPE;</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	int optname, optlen;</div><div class='del'>-	</div><div class='del'>-	if ((optname = get_sockopt_optname (data)) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (data-&gt;option == CAMEL_SOCKOPT_NONBLOCKING) {</div><div class='del'>-		int flags;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd, F_GETFL);</div><div class='del'>-		if (flags == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		data-&gt;value.non_blocking = flags &amp; O_NONBLOCK;</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return getsockopt (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd,</div><div class='del'>-			   get_sockopt_level (data),</div><div class='del'>-			   optname,</div><div class='del'>-			   (void *) &amp;data-&gt;value,</div><div class='del'>-			   &amp;optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	int optname;</div><div class='del'>-	</div><div class='del'>-	if ((optname = get_sockopt_optname (data)) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (data-&gt;option == CAMEL_SOCKOPT_NONBLOCKING) {</div><div class='del'>-		int flags, set;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd, F_GETFL);</div><div class='del'>-		if (flags == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		set = data-&gt;value.non_blocking ? 1 : 0;</div><div class='del'>-		flags = (flags &amp; ~O_NONBLOCK) | (set &amp; O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		if (fcntl (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd, F_SETFL, flags) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return setsockopt (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd,</div><div class='del'>-			   get_sockopt_level (data),</div><div class='del'>-			   optname,</div><div class='del'>-			   (void *) &amp;data-&gt;value,</div><div class='del'>-			   sizeof (data-&gt;value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_local_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	socklen_t len;</div><div class='del'>-</div><div class='del'>-	if (getsockname (CAMEL_TCP_STREAM_SSL (stream)-&gt;priv-&gt;sockfd,</div><div class='del'>-			 (struct sockaddr *)&amp;sin, &amp;len) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,</div><div class='del'>-				      4, &amp;sin.sin_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_remote_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	socklen_t len;</div><div class='del'>-</div><div class='del'>-	if (getpeername (CAMEL_TCP_STREAM_SSL (stream)-&gt;priv-&gt;sockfd,</div><div class='del'>-			 (struct sockaddr *)&amp;sin, &amp;len) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,</div><div class='del'>-				      4, &amp;sin.sin_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* HAVE_OPENSSL */</div><div class='head'>diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c<br/>deleted file mode 100644<br/>index 8b6a868b47..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream-raw.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream-raw.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,614 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-tcp-stream-raw.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-static CamelTcpStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelTcpStreamRaw */</div><div class='del'>-#define CTSR_CLASS(so) CAMEL_TCP_STREAM_RAW_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static int stream_connect (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);</div><div class='del'>-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_raw_class_init (CamelTcpStreamRawClass *camel_tcp_stream_raw_class)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamClass *camel_tcp_stream_class =</div><div class='del'>-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_raw_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_tcp_stream_raw_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	</div><div class='del'>-	camel_tcp_stream_class-&gt;connect = stream_connect;</div><div class='del'>-	camel_tcp_stream_class-&gt;getsockopt = stream_getsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;setsockopt  = stream_setsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_local_address  = stream_get_local_address;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_remote_address = stream_get_remote_address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_raw_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);</div><div class='del'>-	</div><div class='del'>-	stream-&gt;sockfd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_raw_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *stream = CAMEL_TCP_STREAM_RAW (object);</div><div class='del'>-	</div><div class='del'>-	if (stream-&gt;sockfd != -1)</div><div class='del'>-		close (stream-&gt;sockfd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_tcp_stream_raw_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_tcp_stream_get_type (),</div><div class='del'>-					    "CamelTcpStreamRaw",</div><div class='del'>-					    sizeof (CamelTcpStreamRaw),</div><div class='del'>-					    sizeof (CamelTcpStreamRawClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_tcp_stream_raw_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_tcp_stream_raw_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_tcp_stream_raw_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef SIMULATE_FLAKY_NETWORK</div><div class='del'>-static ssize_t</div><div class='del'>-flaky_tcp_write (int fd, const char *buffer, size_t buflen)</div><div class='del'>-{</div><div class='del'>-	size_t len = buflen;</div><div class='del'>-	ssize_t nwritten;</div><div class='del'>-	int val;</div><div class='del'>-	</div><div class='del'>-	if (buflen == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	val = 1 + (int) (10.0 * rand () / (RAND_MAX + 1.0));</div><div class='del'>-	</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 1:</div><div class='del'>-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EINTR\n", fd, buflen);</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	case 2:</div><div class='del'>-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EAGAIN\n", fd, buflen);</div><div class='del'>-		errno = EAGAIN;</div><div class='del'>-		return -1;</div><div class='del'>-	case 3:</div><div class='del'>-		printf ("flaky_tcp_write (%d, ..., %d): (-1) EWOULDBLOCK\n", fd, buflen);</div><div class='del'>-		errno = EWOULDBLOCK;</div><div class='del'>-		return -1;</div><div class='del'>-	case 4:</div><div class='del'>-	case 5:</div><div class='del'>-	case 6:</div><div class='del'>-		len = 1 + (size_t) (buflen * rand () / (RAND_MAX + 1.0));</div><div class='del'>-		len = MIN (len, buflen);</div><div class='del'>-		/* fall through... */</div><div class='del'>-	default:</div><div class='del'>-		printf ("flaky_tcp_write (%d, ..., %d): (%d) '%.*s'", fd, buflen, len, (int) len, buffer);</div><div class='del'>-		nwritten = write (fd, buffer, len);</div><div class='del'>-		if (nwritten &lt; 0)</div><div class='del'>-			printf (" errno =&gt; %s\n", g_strerror (errno));</div><div class='del'>-		else if (nwritten &lt; len)</div><div class='del'>-			printf (" only wrote %d bytes\n", nwritten);</div><div class='del'>-		else</div><div class='del'>-			printf ("\n");</div><div class='del'>-		</div><div class='del'>-		return nwritten;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define write(fd, buffer, buflen) flaky_tcp_write (fd, buffer, buflen)</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-flaky_tcp_read (int fd, char *buffer, size_t buflen)</div><div class='del'>-{</div><div class='del'>-	size_t len = buflen;</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	int val;</div><div class='del'>-	</div><div class='del'>-	if (buflen == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	val = 1 + (int) (10.0 * rand () / (RAND_MAX + 1.0));</div><div class='del'>-	</div><div class='del'>-	switch (val) {</div><div class='del'>-	case 1:</div><div class='del'>-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EINTR\n", fd, buflen);</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	case 2:</div><div class='del'>-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EAGAIN\n", fd, buflen);</div><div class='del'>-		errno = EAGAIN;</div><div class='del'>-		return -1;</div><div class='del'>-	case 3:</div><div class='del'>-		printf ("flaky_tcp_read (%d, ..., %d): (-1) EWOULDBLOCK\n", fd, buflen);</div><div class='del'>-		errno = EWOULDBLOCK;</div><div class='del'>-		return -1;</div><div class='del'>-	case 4:</div><div class='del'>-	case 5:</div><div class='del'>-	case 6:</div><div class='del'>-	case 7:</div><div class='del'>-	case 8:</div><div class='del'>-	case 9:</div><div class='del'>-	case 10:</div><div class='del'>-		len = 1 + (size_t) (10.0 * rand () / (RAND_MAX + 1.0));</div><div class='del'>-		len = MIN (len, buflen);</div><div class='del'>-		/* fall through... */</div><div class='del'>-	default:</div><div class='del'>-		printf ("flaky_tcp_read (%d, ..., %d): (%d)", fd, buflen, len);</div><div class='del'>-		nread = read (fd, buffer, len);</div><div class='del'>-		if (nread &lt; 0)</div><div class='del'>-			printf (" errno =&gt; %s\n", g_strerror (errno));</div><div class='del'>-		else if (nread &lt; len)</div><div class='del'>-			printf (" only read %d bytes\n", nread);</div><div class='del'>-		else</div><div class='del'>-			printf ("\n");</div><div class='del'>-		</div><div class='del'>-		return nread;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define read(fd, buffer, buflen) flaky_tcp_read (fd, buffer, buflen)</div><div class='del'>-</div><div class='del'>-#endif /* SIMULATE_FLAKY_NETWORK */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_raw_new:</div><div class='del'>- *</div><div class='del'>- * Return value: a tcp stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_tcp_stream_raw_new ()</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_TCP_STREAM_RAW (camel_object_new (camel_tcp_stream_raw_get_type ()));</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			nread = read (tcp_stream_raw-&gt;sockfd, buffer, n);</div><div class='del'>-		} while (nread == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-	} else {</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		fd_set rdset;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (tcp_stream_raw-&gt;sockfd, F_GETFL);</div><div class='del'>-		fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_SET (tcp_stream_raw-&gt;sockfd, &amp;rdset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			fdmax = MAX (tcp_stream_raw-&gt;sockfd, cancel_fd) + 1;</div><div class='del'>-			</div><div class='del'>-			nread = -1;</div><div class='del'>-			if (select (fdmax, &amp;rdset, 0, 0, NULL) != -1) {</div><div class='del'>-				if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-					fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-					errno = EINTR;</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				do {</div><div class='del'>-					nread = read (tcp_stream_raw-&gt;sockfd, buffer, n);</div><div class='del'>-				} while (nread == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-			} else if (errno == EINTR) {</div><div class='del'>-				errno = EAGAIN;</div><div class='del'>-			}</div><div class='del'>-		} while (nread == -1 &amp;&amp; (errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-		</div><div class='del'>-		error = errno;</div><div class='del'>-		fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-		errno = error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *tcp_stream_raw = CAMEL_TCP_STREAM_RAW (stream);</div><div class='del'>-	ssize_t w, written = 0;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		do {</div><div class='del'>-			do {</div><div class='del'>-				w = write (tcp_stream_raw-&gt;sockfd, buffer + written, n - written);</div><div class='del'>-			} while (w == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-			</div><div class='del'>-			if (w &gt; 0)</div><div class='del'>-				written += w;</div><div class='del'>-		} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-	} else {</div><div class='del'>-		int error, flags, fdmax;</div><div class='del'>-		fd_set rdset, wrset;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (tcp_stream_raw-&gt;sockfd, F_GETFL);</div><div class='del'>-		fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		fdmax = MAX (tcp_stream_raw-&gt;sockfd, cancel_fd) + 1;</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_ZERO (&amp;wrset);</div><div class='del'>-			FD_SET (tcp_stream_raw-&gt;sockfd, &amp;wrset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			</div><div class='del'>-			w = -1;</div><div class='del'>-			if (select (fdmax, &amp;rdset, &amp;wrset, 0, NULL) != -1) {</div><div class='del'>-				if (FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-					fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-					errno = EINTR;</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				do {</div><div class='del'>-					w = write (tcp_stream_raw-&gt;sockfd, buffer + written, n - written);</div><div class='del'>-				} while (w == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-				</div><div class='del'>-				if (w == -1) {</div><div class='del'>-					if (errno == EAGAIN || errno == EWOULDBLOCK) {</div><div class='del'>-						w = 0;</div><div class='del'>-					} else {</div><div class='del'>-						error = errno;</div><div class='del'>-						fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-						errno = error;</div><div class='del'>-						return -1;</div><div class='del'>-					}</div><div class='del'>-				} else</div><div class='del'>-					written += w;</div><div class='del'>-			} else if (errno == EINTR) {</div><div class='del'>-				w = 0;</div><div class='del'>-			}</div><div class='del'>-		} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-		</div><div class='del'>-		error = errno;</div><div class='del'>-		fcntl (tcp_stream_raw-&gt;sockfd, F_SETFL, flags);</div><div class='del'>-		errno = error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (w == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	if (close (((CamelTcpStreamRaw *)stream)-&gt;sockfd) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	((CamelTcpStreamRaw *)stream)-&gt;sockfd = -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */</div><div class='del'>-/* returns -1 &amp; errno == EINTR if the connection was cancelled */</div><div class='del'>-static int</div><div class='del'>-socket_connect (struct hostent *h, int port)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	int fd;</div><div class='del'>-	int ret;</div><div class='del'>-	socklen_t len;</div><div class='del'>-	struct timeval tv;</div><div class='del'>-	int cancel_fd;</div><div class='del'>-	</div><div class='del'>-	/* see if we're cancelled yet */</div><div class='del'>-	if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* setup connect, we do it using a nonblocking socket so we can poll it */</div><div class='del'>-	sin.sin_port = htons (port);</div><div class='del'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	memcpy (&amp;sin.sin_addr, h-&gt;h_addr, sizeof (sin.sin_addr));</div><div class='del'>-	</div><div class='del'>-	fd = socket (h-&gt;h_addrtype, SOCK_STREAM, 0);</div><div class='del'>-	</div><div class='del'>-	cancel_fd = camel_operation_cancel_fd (NULL);</div><div class='del'>-	if (cancel_fd == -1) {</div><div class='del'>-		ret = connect (fd, (struct sockaddr *)&amp;sin, sizeof (sin));</div><div class='del'>-		if (ret == -1) {</div><div class='del'>-			close (fd);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return fd;</div><div class='del'>-	} else {</div><div class='del'>-		int flags, fdmax, status;</div><div class='del'>-		fd_set rdset, wrset;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (fd, F_GETFL);</div><div class='del'>-		fcntl (fd, F_SETFL, flags | O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		ret = connect (fd, (struct sockaddr *) &amp;sin, sizeof (sin));</div><div class='del'>-		if (ret == 0) {</div><div class='del'>-			fcntl (fd, F_SETFL, flags);</div><div class='del'>-			return fd;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (errno != EINPROGRESS) {</div><div class='del'>-			close (fd);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			FD_ZERO (&amp;rdset);</div><div class='del'>-			FD_ZERO (&amp;wrset);</div><div class='del'>-			FD_SET (fd, &amp;wrset);</div><div class='del'>-			FD_SET (cancel_fd, &amp;rdset);</div><div class='del'>-			fdmax = MAX (fd, cancel_fd) + 1;</div><div class='del'>-			tv.tv_sec = 60 * 4;</div><div class='del'>-			tv.tv_usec = 0;</div><div class='del'>-			</div><div class='del'>-			status = select (fdmax, &amp;rdset, &amp;wrset, 0, &amp;tv);</div><div class='del'>-		} while (status == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-		</div><div class='del'>-		if (status &lt;= 0) {</div><div class='del'>-			close (fd);</div><div class='del'>-			errno = ETIMEDOUT;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (cancel_fd != -1 &amp;&amp; FD_ISSET (cancel_fd, &amp;rdset)) {</div><div class='del'>-			close (fd);</div><div class='del'>-			errno = EINTR;</div><div class='del'>-			return -1;</div><div class='del'>-		} else {</div><div class='del'>-			len = sizeof (int);</div><div class='del'>-			</div><div class='del'>-			if (getsockopt (fd, SOL_SOCKET, SO_ERROR, &amp;ret, &amp;len) == -1) {</div><div class='del'>-				close (fd);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (ret != 0) {</div><div class='del'>-				close (fd);</div><div class='del'>-				errno = ret;</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		fcntl (fd, F_SETFL, flags);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamRaw *raw = CAMEL_TCP_STREAM_RAW (stream);</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (host != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	fd = socket_connect (host, port);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	raw-&gt;sockfd = fd;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_sockopt_level (const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	switch (data-&gt;option) {</div><div class='del'>-	case CAMEL_SOCKOPT_MAXSEGMENT:</div><div class='del'>-	case CAMEL_SOCKOPT_NODELAY:</div><div class='del'>-		return IPPROTO_TCP;</div><div class='del'>-	default:</div><div class='del'>-		return SOL_SOCKET;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_sockopt_optname (const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	switch (data-&gt;option) {</div><div class='del'>-	case CAMEL_SOCKOPT_MAXSEGMENT:</div><div class='del'>-		return TCP_MAXSEG;</div><div class='del'>-	case CAMEL_SOCKOPT_NODELAY:</div><div class='del'>-		return TCP_NODELAY;</div><div class='del'>-	case CAMEL_SOCKOPT_BROADCAST:</div><div class='del'>-		return SO_BROADCAST;</div><div class='del'>-	case CAMEL_SOCKOPT_KEEPALIVE:</div><div class='del'>-		return SO_KEEPALIVE;</div><div class='del'>-	case CAMEL_SOCKOPT_LINGER:</div><div class='del'>-		return SO_LINGER;</div><div class='del'>-	case CAMEL_SOCKOPT_RECVBUFFERSIZE:</div><div class='del'>-		return SO_RCVBUF;</div><div class='del'>-	case CAMEL_SOCKOPT_SENDBUFFERSIZE:</div><div class='del'>-		return SO_SNDBUF;</div><div class='del'>-	case CAMEL_SOCKOPT_REUSEADDR:</div><div class='del'>-		return SO_REUSEADDR;</div><div class='del'>-	case CAMEL_SOCKOPT_IPTYPEOFSERVICE:</div><div class='del'>-		return SO_TYPE;</div><div class='del'>-	default:</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	int optname, optlen;</div><div class='del'>-	</div><div class='del'>-	if ((optname = get_sockopt_optname (data)) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (data-&gt;option == CAMEL_SOCKOPT_NONBLOCKING) {</div><div class='del'>-		int flags;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (((CamelTcpStreamRaw *)stream)-&gt;sockfd, F_GETFL);</div><div class='del'>-		if (flags == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		data-&gt;value.non_blocking = flags &amp; O_NONBLOCK;</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return getsockopt (((CamelTcpStreamRaw *)stream)-&gt;sockfd,</div><div class='del'>-			   get_sockopt_level (data),</div><div class='del'>-			   optname,</div><div class='del'>-			   (void *) &amp;data-&gt;value,</div><div class='del'>-			   &amp;optlen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	int optname;</div><div class='del'>-	</div><div class='del'>-	if ((optname = get_sockopt_optname (data)) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (data-&gt;option == CAMEL_SOCKOPT_NONBLOCKING) {</div><div class='del'>-		int flags, set;</div><div class='del'>-		</div><div class='del'>-		flags = fcntl (((CamelTcpStreamRaw *)stream)-&gt;sockfd, F_GETFL);</div><div class='del'>-		if (flags == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		set = data-&gt;value.non_blocking ? 1 : 0;</div><div class='del'>-		flags = (flags &amp; ~O_NONBLOCK) | (set &amp; O_NONBLOCK);</div><div class='del'>-		</div><div class='del'>-		if (fcntl (((CamelTcpStreamRaw *)stream)-&gt;sockfd, F_SETFL, flags) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return setsockopt (((CamelTcpStreamRaw *)stream)-&gt;sockfd,</div><div class='del'>-			   get_sockopt_level (data),</div><div class='del'>-			   optname,</div><div class='del'>-			   (void *) &amp;data-&gt;value,</div><div class='del'>-			   sizeof (data-&gt;value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_local_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	socklen_t len;</div><div class='del'>-	</div><div class='del'>-	if (getsockname (CAMEL_TCP_STREAM_RAW (stream)-&gt;sockfd,</div><div class='del'>-			 (struct sockaddr *) &amp;sin, &amp;len) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,</div><div class='del'>-				      4, &amp;sin.sin_addr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_remote_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	socklen_t len;</div><div class='del'>-	</div><div class='del'>-	if (getpeername (CAMEL_TCP_STREAM_RAW (stream)-&gt;sockfd,</div><div class='del'>-			 (struct sockaddr *) &amp;sin, &amp;len) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, sin.sin_port,</div><div class='del'>-				      4, &amp;sin.sin_addr);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h<br/>deleted file mode 100644<br/>index 0ffec5cd5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream-raw.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream-raw.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_TCP_STREAM_RAW_H</div><div class='del'>-#define CAMEL_TCP_STREAM_RAW_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-tcp-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_TCP_STREAM_RAW_TYPE     (camel_tcp_stream_raw_get_type ())</div><div class='del'>-#define CAMEL_TCP_STREAM_RAW(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRaw))</div><div class='del'>-#define CAMEL_TCP_STREAM_RAW_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRawClass))</div><div class='del'>-#define CAMEL_IS_TCP_STREAM_RAW(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_RAW_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelTcpStreamRaw</div><div class='del'>-{</div><div class='del'>-	CamelTcpStream parent_object;</div><div class='del'>-	</div><div class='del'>-	int sockfd;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTcpStreamClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual functions */</div><div class='del'>-	</div><div class='del'>-} CamelTcpStreamRawClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_tcp_stream_raw_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_tcp_stream_raw_new (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TCP_STREAM_RAW_H */</div><div class='head'>diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c<br/>deleted file mode 100644<br/>index a06fb93d1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream-ssl.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream-ssl.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,706 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* NOTE: This is the default implementation of CamelTcpStreamSSL,</div><div class='del'>- * used when the Mozilla NSS libraries are used. If you configured</div><div class='del'>- * OpenSSL support instead, then this file won't be compiled and</div><div class='del'>- * the CamelTcpStreamSSL implementation in camel-tcp-stream-openssl.c</div><div class='del'>- * will be used instead.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_NSS</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;nspr.h&gt;</div><div class='del'>-#include &lt;prio.h&gt;</div><div class='del'>-#include &lt;prerror.h&gt;</div><div class='del'>-#include &lt;prerr.h&gt;</div><div class='del'>-#include "nss.h"    /* Don't use &lt;&gt; here or it will include the system nss.h instead */</div><div class='del'>-#include &lt;ssl.h&gt;</div><div class='del'>-#include &lt;cert.h&gt;</div><div class='del'>-#include &lt;certdb.h&gt;</div><div class='del'>-#include &lt;pk11func.h&gt;</div><div class='del'>-</div><div class='del'>-/* this is commented because otherwise we get an error about the</div><div class='del'>-   redefinition of MD5Context...yay */</div><div class='del'>-/*#include &lt;e-util/md5-utils.h&gt;*/</div><div class='del'>-</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelTcpStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelTcpStreamSSL */</div><div class='del'>-#define CTSS_CLASS(so) CAMEL_TCP_STREAM_SSL_CLASS (CAMEL_OBJECT_GET_CLASS (so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static PRFileDesc *enable_ssl (CamelTcpStreamSSL *ssl, PRFileDesc *fd);</div><div class='del'>-</div><div class='del'>-static int stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-static int stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-static int stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-static CamelTcpAddress *stream_get_local_address (CamelTcpStream *stream);</div><div class='del'>-static CamelTcpAddress *stream_get_remote_address (CamelTcpStream *stream);</div><div class='del'>-</div><div class='del'>-struct _CamelTcpStreamSSLPrivate {</div><div class='del'>-	PRFileDesc *sockfd;</div><div class='del'>-	</div><div class='del'>-	CamelService *service;</div><div class='del'>-	char *expected_host;</div><div class='del'>-	gboolean ssl_mode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_class_init (CamelTcpStreamSSLClass *camel_tcp_stream_ssl_class)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamClass *camel_tcp_stream_class =</div><div class='del'>-		CAMEL_TCP_STREAM_CLASS (camel_tcp_stream_ssl_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_tcp_stream_ssl_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_TCP_STREAM_CLASS (camel_type_get_global_classfuncs (camel_tcp_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	</div><div class='del'>-	camel_tcp_stream_class-&gt;connect = stream_connect;</div><div class='del'>-	camel_tcp_stream_class-&gt;getsockopt = stream_getsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;setsockopt = stream_setsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_local_address  = stream_get_local_address;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_remote_address = stream_get_remote_address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv = g_new0 (struct _CamelTcpStreamSSLPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_ssl_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream = CAMEL_TCP_STREAM_SSL (object);</div><div class='del'>-	</div><div class='del'>-	if (stream-&gt;priv-&gt;sockfd != NULL)</div><div class='del'>-		PR_Close (stream-&gt;priv-&gt;sockfd);</div><div class='del'>-	</div><div class='del'>-	g_free (stream-&gt;priv-&gt;expected_host);</div><div class='del'>-	</div><div class='del'>-	g_free (stream-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_tcp_stream_ssl_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_tcp_stream_get_type (),</div><div class='del'>-					    "CamelTcpStreamSSL",</div><div class='del'>-					    sizeof (CamelTcpStreamSSL),</div><div class='del'>-					    sizeof (CamelTcpStreamSSLClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_tcp_stream_ssl_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_tcp_stream_ssl_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_tcp_stream_ssl_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_new:</div><div class='del'>- * @service: camel service</div><div class='del'>- * @expected_host: host that the stream is expected to connect with.</div><div class='del'>- *</div><div class='del'>- * Since the SSL certificate authenticator may need to prompt the</div><div class='del'>- * user, a CamelService is needed. @expected_host is needed as a</div><div class='del'>- * protection against an MITM attack.</div><div class='del'>- *</div><div class='del'>- * Return value: a ssl stream (in ssl mode)</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv-&gt;service = service;</div><div class='del'>-	stream-&gt;priv-&gt;expected_host = g_strdup (expected_host);</div><div class='del'>-	stream-&gt;priv-&gt;ssl_mode = TRUE;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_new_raw:</div><div class='del'>- * @service: camel service</div><div class='del'>- * @expected_host: host that the stream is expected to connect with.</div><div class='del'>- *</div><div class='del'>- * Since the SSL certificate authenticator may need to prompt the</div><div class='del'>- * user, a CamelService is needed. @expected_host is needed as a</div><div class='del'>- * protection against an MITM attack.</div><div class='del'>- *</div><div class='del'>- * Return value: a ssl-capable stream (in non ssl mode)</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *stream;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_TCP_STREAM_SSL (camel_object_new (camel_tcp_stream_ssl_get_type ()));</div><div class='del'>-	</div><div class='del'>-	stream-&gt;priv-&gt;service = service;</div><div class='del'>-	stream-&gt;priv-&gt;expected_host = g_strdup (expected_host);</div><div class='del'>-	stream-&gt;priv-&gt;ssl_mode = FALSE;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_STREAM (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_errno (int code)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: this should handle more. */</div><div class='del'>-	switch (code) {</div><div class='del'>-	case PR_INVALID_ARGUMENT_ERROR:</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		break;</div><div class='del'>-	case PR_PENDING_INTERRUPT_ERROR:</div><div class='del'>-		errno = EINTR;</div><div class='del'>-		break;</div><div class='del'>-	case PR_IO_PENDING_ERROR:</div><div class='del'>-	case PR_IO_TIMEOUT_ERROR:</div><div class='del'>-		errno = EAGAIN;</div><div class='del'>-		break;</div><div class='del'>-	case PR_WOULD_BLOCK_ERROR:</div><div class='del'>-		errno = EWOULDBLOCK;</div><div class='del'>-		break;</div><div class='del'>-	case PR_IN_PROGRESS_ERROR:</div><div class='del'>-		errno = EINPROGRESS;</div><div class='del'>-		break;</div><div class='del'>-	case PR_ALREADY_INITIATED_ERROR:</div><div class='del'>-		errno = EALREADY;</div><div class='del'>-		break;</div><div class='del'>-	case PR_NETWORK_UNREACHABLE_ERROR:</div><div class='del'>-		errno = EHOSTUNREACH;</div><div class='del'>-		break;</div><div class='del'>-	case PR_CONNECT_REFUSED_ERROR:</div><div class='del'>-		errno = ECONNREFUSED;</div><div class='del'>-		break;</div><div class='del'>-	case PR_CONNECT_TIMEOUT_ERROR:</div><div class='del'>-		errno = ETIMEDOUT;</div><div class='del'>-		break;</div><div class='del'>-	case PR_NOT_CONNECTED_ERROR:</div><div class='del'>-		errno = ENOTCONN;</div><div class='del'>-		break;</div><div class='del'>-	case PR_CONNECT_RESET_ERROR:</div><div class='del'>-		errno = ECONNRESET;</div><div class='del'>-		break;</div><div class='del'>-	case PR_IO_ERROR:</div><div class='del'>-	default:</div><div class='del'>-		errno = EIO;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_ssl_enable_ssl:</div><div class='del'>- * @ssl: ssl stream</div><div class='del'>- *</div><div class='del'>- * Toggles an ssl-capable stream into ssl mode (if it isn't already).</div><div class='del'>- *</div><div class='del'>- * Returns 0 on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl)</div><div class='del'>-{</div><div class='del'>-	PRFileDesc *fd;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (ssl), -1);</div><div class='del'>-	</div><div class='del'>-	if (ssl-&gt;priv-&gt;sockfd &amp;&amp; !ssl-&gt;priv-&gt;ssl_mode) {</div><div class='del'>-		fd = enable_ssl (ssl, NULL);</div><div class='del'>-		if (fd == NULL) {</div><div class='del'>-			int errnosave;</div><div class='del'>-			</div><div class='del'>-			set_errno (PR_GetError ());</div><div class='del'>-			errnosave = errno;</div><div class='del'>-			errno = errnosave;</div><div class='del'>-			</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		SSL_ResetHandshake (fd, FALSE);</div><div class='del'>-		</div><div class='del'>-		ssl-&gt;priv-&gt;sockfd = fd;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ssl-&gt;priv-&gt;ssl_mode = TRUE;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-			errno = EINTR;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		nread = PR_Read (tcp_stream_ssl-&gt;priv-&gt;sockfd, buffer, n);</div><div class='del'>-		if (nread == -1)</div><div class='del'>-			set_errno (PR_GetError ());</div><div class='del'>-	} while (nread == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-	</div><div class='del'>-	return nread;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *tcp_stream_ssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	ssize_t w, written = 0;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		if (camel_operation_cancel_check (NULL)) {</div><div class='del'>-			errno = EINTR;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			w = PR_Write (tcp_stream_ssl-&gt;priv-&gt;sockfd, buffer + written, n - written);</div><div class='del'>-			if (w == -1)</div><div class='del'>-				set_errno (PR_GetError ());</div><div class='del'>-		} while (w == -1 &amp;&amp; (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));</div><div class='del'>-		</div><div class='del'>-		if (w &gt; 0)</div><div class='del'>-			written += w;</div><div class='del'>-	} while (w != -1 &amp;&amp; written &lt; n);</div><div class='del'>-	</div><div class='del'>-	return written;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	return PR_Sync (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	if (PR_Close (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd) == PR_FAILURE)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd = NULL;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Since this is default implementation, let NSS handle it. */</div><div class='del'>-static SECStatus</div><div class='del'>-ssl_get_client_auth (void *data, PRFileDesc *sockfd,</div><div class='del'>-		     struct CERTDistNamesStr *caNames,</div><div class='del'>-		     struct CERTCertificateStr **pRetCert,</div><div class='del'>-		     struct SECKEYPrivateKeyStr **pRetKey) </div><div class='del'>-{</div><div class='del'>-	SECStatus status = SECFailure;</div><div class='del'>-	SECKEYPrivateKey *privkey;</div><div class='del'>-	CERTCertificate *cert;</div><div class='del'>-	void *proto_win;</div><div class='del'>-	</div><div class='del'>-	proto_win = SSL_RevealPinArg (sockfd);</div><div class='del'>-	</div><div class='del'>-	if ((char *) data) {</div><div class='del'>-		cert = PK11_FindCertFromNickname ((char *) data, proto_win);</div><div class='del'>-		if (cert) {</div><div class='del'>-			privKey = PK11_FindKeyByAnyCert (cert, proto_win);</div><div class='del'>-			if (privkey) {</div><div class='del'>-				status = SECSuccess;</div><div class='del'>-			} else {</div><div class='del'>-				CERT_DestroyCertificate (cert);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* no nickname given, automatically find the right cert */</div><div class='del'>-		CERTCertNicknames *names;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		names = CERT_GetCertNicknames (CERT_GetDefaultCertDB (), </div><div class='del'>-					       SEC_CERT_NICKNAMES_USER,</div><div class='del'>-					       proto_win);</div><div class='del'>-		</div><div class='del'>-		if (names != NULL) {</div><div class='del'>-			for (i = 0; i &lt; names-&gt;numnicknames; i++) {</div><div class='del'>-				cert = PK11_FindCertFromNickname (names-&gt;nicknames[i], </div><div class='del'>-								  proto_win);</div><div class='del'>-				if (!cert)</div><div class='del'>-					continue;</div><div class='del'>-				</div><div class='del'>-				/* Only check unexpired certs */</div><div class='del'>-				if (CERT_CheckCertValidTimes (cert, PR_Now (), PR_FALSE) != secCertTimeValid) {</div><div class='del'>-					CERT_DestroyCertificate (cert);</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				status = NSS_CmpCertChainWCANames (cert, caNames);</div><div class='del'>-				if (status == SECSuccess) {</div><div class='del'>-					privkey = PK11_FindKeyByAnyCert (cert, proto_win);</div><div class='del'>-					if (privkey)</div><div class='del'>-						break;</div><div class='del'>-					</div><div class='del'>-					status = SECFailure;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				CERT_FreeNicknames (names);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (status == SECSuccess) {</div><div class='del'>-		*pRetCert = cert;</div><div class='del'>-		*pRetKey  = privkey;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* Since this is the default NSS implementation, no need for us to use this. */</div><div class='del'>-static SECStatus</div><div class='del'>-ssl_auth_cert (void *data, PRFileDesc *sockfd, PRBool checksig, PRBool is_server)</div><div class='del'>-{</div><div class='del'>-	CERTCertificate *cert;</div><div class='del'>-	SECStatus status;</div><div class='del'>-	void *pinarg;</div><div class='del'>-	char *host;</div><div class='del'>-	</div><div class='del'>-	cert = SSL_PeerCertificate (sockfd);</div><div class='del'>-	pinarg = SSL_RevealPinArg (sockfd);</div><div class='del'>-	status = CERT_VerifyCertNow ((CERTCertDBHandle *)data, cert,</div><div class='del'>-				     checksig, certUsageSSLClient, pinarg);</div><div class='del'>-	</div><div class='del'>-	if (status != SECSuccess)</div><div class='del'>-		return SECFailure;</div><div class='del'>-	</div><div class='del'>-	/* Certificate is OK.  Since this is the client side of an SSL</div><div class='del'>-	 * connection, we need to verify that the name field in the cert</div><div class='del'>-	 * matches the desired hostname.  This is our defense against</div><div class='del'>-	 * man-in-the-middle attacks.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	/* SSL_RevealURL returns a hostname, not a URL. */</div><div class='del'>-	host = SSL_RevealURL (sockfd);</div><div class='del'>-	</div><div class='del'>-	if (host &amp;&amp; *host) {</div><div class='del'>-		status = CERT_VerifyCertName (cert, host);</div><div class='del'>-	} else {</div><div class='del'>-		PR_SetError (SSL_ERROR_BAD_CERT_DOMAIN, 0);</div><div class='del'>-		status = SECFailure;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (host)</div><div class='del'>-		PR_Free (host);</div><div class='del'>-	</div><div class='del'>-	return secStatus;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static SECStatus</div><div class='del'>-ssl_bad_cert (void *data, PRFileDesc *sockfd)</div><div class='del'>-{</div><div class='del'>-	unsigned char md5sum[16], fingerprint[40], *f;</div><div class='del'>-	gboolean accept, valid_cert;</div><div class='del'>-	char *prompt, *cert_str;</div><div class='del'>-	CamelTcpStreamSSL *ssl;</div><div class='del'>-	CERTCertificate *cert;</div><div class='del'>-	CamelService *service;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (data != NULL, SECFailure);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM_SSL (data), SECFailure);</div><div class='del'>-	</div><div class='del'>-	ssl = CAMEL_TCP_STREAM_SSL (data);</div><div class='del'>-	service = ssl-&gt;priv-&gt;service;</div><div class='del'>-	</div><div class='del'>-	cert = SSL_PeerCertificate (sockfd);</div><div class='del'>-	</div><div class='del'>-	/* calculate the MD5 hash of the raw certificate */</div><div class='del'>-	md5_get_digest (cert-&gt;derCert.data, cert-&gt;derCert.len, md5sum);</div><div class='del'>-	/*HASH_HashBuf (HASH_AlgMD5, md5sum, cert-&gt;derCert.data, cert-&gt;derCert.len);*/</div><div class='del'>-	for (i = 0, f = fingerprint; i &lt; 16; i++, f += 3)</div><div class='del'>-		sprintf (f, "%.2x%c", md5sum[i], i != 15 ? ':' : '\0');</div><div class='del'>-	</div><div class='del'>-	valid_cert = CERT_VerifyCertNow (CERT_GetDefaultCertDB (), cert, TRUE, certUsageSSLClient, NULL);</div><div class='del'>-	/*issuer = CERT_FindCertByName (CERT_GetDefaultCertDB (), &amp;cert-&gt;derIssuer);</div><div class='del'>-	  valid_cert = issuer &amp;&amp; CERT_VerifySignedData (&amp;cert-&gt;signatureWrap, issuer, PR_Now (), NULL);*/</div><div class='del'>-	</div><div class='del'>-	cert_str = g_strdup_printf (_("Issuer:            %s\n"</div><div class='del'>-				      "Subject:           %s\n"</div><div class='del'>-				      "Fingerprint:       %s\n"</div><div class='del'>-				      "Signature:         %s"),</div><div class='del'>-				    CERT_NameToAscii (&amp;cert-&gt;issuer),</div><div class='del'>-				    CERT_NameToAscii (&amp;cert-&gt;subject),</div><div class='del'>-				    fingerprint, valid_cert ? _("GOOD") : _("BAD"));</div><div class='del'>-	</div><div class='del'>-	/* construct our user prompt */</div><div class='del'>-	prompt = g_strdup_printf (_("SSL Certificate check for %s:\n\n%s\n\nDo you wish to accept?"),</div><div class='del'>-				  service-&gt;url-&gt;host, cert_str);</div><div class='del'>-	g_free (cert_str);</div><div class='del'>-	</div><div class='del'>-	/* query the user to find out if we want to accept this certificate */</div><div class='del'>-	accept = camel_session_alert_user (service-&gt;session, CAMEL_SESSION_ALERT_WARNING, prompt, TRUE);</div><div class='del'>-	g_free (prompt);</div><div class='del'>-	</div><div class='del'>-	if (accept) {</div><div class='del'>-#if 0</div><div class='del'>-		/* this is how mutt does it but last time I tried to</div><div class='del'>-                   use CERT_AddTempCertToPerm() I got link errors and</div><div class='del'>-                   I have also been told by the nss devs that that</div><div class='del'>-                   function has been deprecated... */</div><div class='del'>-		CERTCertTrust trust;</div><div class='del'>-		</div><div class='del'>-		CERT_DecodeTrustString (&amp;trust, "P,,");</div><div class='del'>-		</div><div class='del'>-		CERT_AddTempCertToPerm (cert, NULL, &amp;trust);</div><div class='del'>-#else</div><div class='del'>-		SECItem *certs[1];</div><div class='del'>-		</div><div class='del'>-		if (!cert-&gt;trust)</div><div class='del'>-			cert-&gt;trust = PORT_ZAlloc (sizeof (CERTCertTrust));</div><div class='del'>-		</div><div class='del'>-		cert-&gt;trust-&gt;sslFlags = CERTDB_VALID_PEER | CERTDB_TRUSTED;</div><div class='del'>-		</div><div class='del'>-		certs[0] = &amp;cert-&gt;derCert;</div><div class='del'>-		</div><div class='del'>-		CERT_ImportCerts (CERT_GetDefaultCertDB (), certUsageSSLServer, 1, certs,</div><div class='del'>-				  NULL, TRUE, FALSE, cert-&gt;nickname);</div><div class='del'>-#endif</div><div class='del'>-		return SECSuccess;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return SECFailure;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static PRFileDesc *</div><div class='del'>-enable_ssl (CamelTcpStreamSSL *ssl, PRFileDesc *fd)</div><div class='del'>-{</div><div class='del'>-	PRFileDesc *ssl_fd;</div><div class='del'>-	</div><div class='del'>-	ssl_fd = SSL_ImportFD (NULL, fd ? fd : ssl-&gt;priv-&gt;sockfd);</div><div class='del'>-	if (!ssl_fd)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	SSL_OptionSet (ssl_fd, SSL_SECURITY, PR_TRUE);</div><div class='del'>-	SSL_SetURL (ssl_fd, ssl-&gt;priv-&gt;expected_host);</div><div class='del'>-	</div><div class='del'>-	/*SSL_GetClientAuthDataHook (sslSocket, ssl_get_client_auth, (void *) certNickname);*/</div><div class='del'>-	/*SSL_AuthCertificateHook (ssl_fd, ssl_auth_cert, (void *) CERT_GetDefaultCertDB ());*/</div><div class='del'>-	SSL_BadCertHook (ssl_fd, ssl_bad_cert, ssl);</div><div class='del'>-	</div><div class='del'>-	ssl-&gt;priv-&gt;ssl_mode = TRUE;</div><div class='del'>-	</div><div class='del'>-	return ssl_fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_connect (CamelTcpStream *stream, struct hostent *host, int port)</div><div class='del'>-{</div><div class='del'>-	CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);</div><div class='del'>-	PRIntervalTime timeout = PR_INTERVAL_MIN;</div><div class='del'>-	PRNetAddr netaddr;</div><div class='del'>-	PRFileDesc *fd;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (host != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	memset ((void *) &amp;netaddr, 0, sizeof (PRNetAddr));</div><div class='del'>-	memcpy (&amp;netaddr.inet.ip, host-&gt;h_addr, sizeof (netaddr.inet.ip));</div><div class='del'>-	</div><div class='del'>-	if (PR_InitializeNetAddr (PR_IpAddrNull, port, &amp;netaddr) == PR_FAILURE) {</div><div class='del'>-		set_errno (PR_GetError ());</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fd = PR_OpenTCPSocket (host-&gt;h_addrtype);</div><div class='del'>-	if (fd == NULL) {</div><div class='del'>-		set_errno (PR_GetError ());</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ssl-&gt;priv-&gt;ssl_mode) {</div><div class='del'>-		PRFileDesc *ssl_fd;</div><div class='del'>-		</div><div class='del'>-		ssl_fd = enable_ssl (ssl, fd);</div><div class='del'>-		if (ssl_fd == NULL) {</div><div class='del'>-			int errnosave;</div><div class='del'>-			</div><div class='del'>-			set_errno (PR_GetError ());</div><div class='del'>-			errnosave = errno;</div><div class='del'>-			PR_Close (fd);</div><div class='del'>-			errno = errnosave;</div><div class='del'>-			</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		fd = ssl_fd;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (PR_Connect (fd, &amp;netaddr, timeout) == PR_FAILURE) {</div><div class='del'>-		int errnosave;</div><div class='del'>-		</div><div class='del'>-		set_errno (PR_GetError ());</div><div class='del'>-		if (errno == EINPROGRESS) {</div><div class='del'>-			gboolean connected = FALSE;</div><div class='del'>-			PRPollDesc poll;</div><div class='del'>-			</div><div class='del'>-			do {</div><div class='del'>-				poll.fd = fd;</div><div class='del'>-				poll.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;</div><div class='del'>-				poll.out_flags = 0;</div><div class='del'>-				</div><div class='del'>-				timeout = PR_INTERVAL_MIN;</div><div class='del'>-				</div><div class='del'>-				if (PR_Poll (&amp;poll, 1, timeout) == PR_FAILURE) {</div><div class='del'>-					set_errno (PR_GetError ());</div><div class='del'>-					goto exception;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				if (PR_GetConnectStatus (&amp;poll) == PR_FAILURE) {</div><div class='del'>-					set_errno (PR_GetError ());</div><div class='del'>-					if (errno != EINPROGRESS)</div><div class='del'>-						goto exception;</div><div class='del'>-				} else {</div><div class='del'>-					connected = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} while (!connected);</div><div class='del'>-		} else {</div><div class='del'>-		exception:</div><div class='del'>-			errnosave = errno;</div><div class='del'>-			PR_Close (fd);</div><div class='del'>-			ssl-&gt;priv-&gt;sockfd = NULL;</div><div class='del'>-			errno = errnosave;</div><div class='del'>-			</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		errno = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ssl-&gt;priv-&gt;sockfd = fd;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	PRSocketOptionData sodata;</div><div class='del'>-	</div><div class='del'>-	memset ((void *) &amp;sodata, 0, sizeof (sodata));</div><div class='del'>-	memcpy ((void *) &amp;sodata, (void *) data, sizeof (CamelSockOptData));</div><div class='del'>-	</div><div class='del'>-	if (PR_GetSocketOption (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd, &amp;sodata) == PR_FAILURE)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	memcpy ((void *) data, (void *) &amp;sodata, sizeof (CamelSockOptData));</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	PRSocketOptionData sodata;</div><div class='del'>-	</div><div class='del'>-	memset ((void *) &amp;sodata, 0, sizeof (sodata));</div><div class='del'>-	memcpy ((void *) &amp;sodata, (void *) data, sizeof (CamelSockOptData));</div><div class='del'>-	</div><div class='del'>-	if (PR_SetSocketOption (((CamelTcpStreamSSL *)stream)-&gt;priv-&gt;sockfd, &amp;sodata) == PR_FAILURE)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_local_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	PRFileDesc *sockfd = CAMEL_TCP_STREAM_SSL (stream)-&gt;priv-&gt;sockfd;</div><div class='del'>-	PRNetAddr addr;</div><div class='del'>-</div><div class='del'>-	PR_GetSockName (sockfd, &amp;addr);</div><div class='del'>-	if (addr.inet.family != PR_AF_INET)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, addr.inet.port,</div><div class='del'>-				      4, &amp;addr.inet.ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-stream_get_remote_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	PRFileDesc *sockfd = CAMEL_TCP_STREAM_SSL (stream)-&gt;priv-&gt;sockfd;</div><div class='del'>-	PRNetAddr addr;</div><div class='del'>-</div><div class='del'>-	PR_GetPeerName (sockfd, &amp;addr);</div><div class='del'>-	if (addr.inet.family != PR_AF_INET)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return camel_tcp_address_new (CAMEL_TCP_ADDRESS_IPV4, addr.inet.port,</div><div class='del'>-				      4, &amp;addr.inet.ip);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='head'>diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h<br/>deleted file mode 100644<br/>index 5db4a0eb70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream-ssl.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream-ssl.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_TCP_STREAM_SSL_H</div><div class='del'>-#define CAMEL_TCP_STREAM_SSL_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-tcp-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_TCP_STREAM_SSL_TYPE     (camel_tcp_stream_ssl_get_type ())</div><div class='del'>-#define CAMEL_TCP_STREAM_SSL(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSL))</div><div class='del'>-#define CAMEL_TCP_STREAM_SSL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSLClass))</div><div class='del'>-#define CAMEL_IS_TCP_STREAM_SSL(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_SSL_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelTcpStreamSSL {</div><div class='del'>-	CamelTcpStream parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelTcpStreamSSLPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTcpStreamClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual functions */</div><div class='del'>-	</div><div class='del'>-} CamelTcpStreamSSLClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_tcp_stream_ssl_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_tcp_stream_ssl_new (CamelService *service, const char *expected_host);</div><div class='del'>-</div><div class='del'>-CamelStream *camel_tcp_stream_ssl_new_raw (CamelService *service, const char *expected_host);</div><div class='del'>-</div><div class='del'>-int camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TCP_STREAM_SSL_H */</div><div class='head'>diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c<br/>deleted file mode 100644<br/>index 2155fba6ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,246 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-tcp-stream.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelTcpStream */</div><div class='del'>-#define CTS_CLASS(so) CAMEL_TCP_STREAM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int tcp_connect    (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-static int tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-static int tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-static CamelTcpAddress *tcp_get_local_address (CamelTcpStream *stream);</div><div class='del'>-static CamelTcpAddress *tcp_get_remote_address (CamelTcpStream *stream);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_class_init (CamelTcpStreamClass *camel_tcp_stream_class)</div><div class='del'>-{</div><div class='del'>-	/*CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_tcp_stream_class);*/</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (CAMEL_STREAM_TYPE));</div><div class='del'>-	</div><div class='del'>-	/* tcp stream methods */</div><div class='del'>-	camel_tcp_stream_class-&gt;connect            = tcp_connect;</div><div class='del'>-	camel_tcp_stream_class-&gt;getsockopt         = tcp_getsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;setsockopt         = tcp_setsockopt;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_local_address  = tcp_get_local_address;</div><div class='del'>-	camel_tcp_stream_class-&gt;get_remote_address = tcp_get_remote_address;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_tcp_stream_init (void *o)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_tcp_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_STREAM_TYPE,</div><div class='del'>-					    "CamelTcpStream",</div><div class='del'>-					    sizeof (CamelTcpStream),</div><div class='del'>-					    sizeof (CamelTcpStreamClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_tcp_stream_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_tcp_stream_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tcp_connect (CamelTcpStream *stream, struct hostent *host, int port)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelTcpStream::connect called on default implementation"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_connect:</div><div class='del'>- * @stream: a CamelTcpStream object.</div><div class='del'>- * @host: a hostent value</div><div class='del'>- * @port: port</div><div class='del'>- *</div><div class='del'>- * Create a socket and connect based upon the data provided.</div><div class='del'>- *</div><div class='del'>- * Return value: zero on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_tcp_stream_connect (CamelTcpStream *stream, struct hostent *host, int port)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);</div><div class='del'>-	</div><div class='del'>-	return CTS_CLASS (stream)-&gt;connect (stream, host, port);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tcp_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelTcpStream::getsockopt called on default implementation"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_getsockopt:</div><div class='del'>- * @stream: tcp stream object</div><div class='del'>- * @data: socket option data</div><div class='del'>- *</div><div class='del'>- * Get the socket options set on the stream and populate #data.</div><div class='del'>- *</div><div class='del'>- * Return value: zero on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);</div><div class='del'>-	</div><div class='del'>-	return CTS_CLASS (stream)-&gt;getsockopt (stream, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-tcp_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelTcpStream::setsockopt called on default implementation"));</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_setsockopt:</div><div class='del'>- * @stream: tcp stream object</div><div class='del'>- * @data: socket option data</div><div class='del'>- *</div><div class='del'>- * Set the socket options contained in #data on the stream.</div><div class='del'>- *</div><div class='del'>- * Return value: zero on success or -1 on fail.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), -1);</div><div class='del'>-	</div><div class='del'>-	return CTS_CLASS (stream)-&gt;setsockopt (stream, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-tcp_get_local_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelTcpStream::get_local_address called on default implementation"));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_get_local_address:</div><div class='del'>- * @stream: tcp stream object</div><div class='del'>- *</div><div class='del'>- * Get the local address of @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream's local address (which must be freed with</div><div class='del'>- * camel_tcp_address_free()) if the stream is connected, or %NULL if not.</div><div class='del'>- **/</div><div class='del'>-CamelTcpAddress *</div><div class='del'>-camel_tcp_stream_get_local_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), NULL);</div><div class='del'>-	</div><div class='del'>-	return CTS_CLASS (stream)-&gt;get_local_address (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelTcpAddress *</div><div class='del'>-tcp_get_remote_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	w(g_warning ("CamelTcpStream::get_remote_address called on default implementation"));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_stream_get_remote_address:</div><div class='del'>- * @stream: tcp stream object</div><div class='del'>- *</div><div class='del'>- * Get the remote address of @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream's remote address (which must be freed with</div><div class='del'>- * camel_tcp_address_free()) if the stream is connected, or %NULL if not.</div><div class='del'>- **/</div><div class='del'>-CamelTcpAddress *</div><div class='del'>-camel_tcp_stream_get_remote_address (CamelTcpStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TCP_STREAM (stream), NULL);</div><div class='del'>-	</div><div class='del'>-	return CTS_CLASS (stream)-&gt;get_remote_address (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_address_new:</div><div class='del'>- * @family: the address family (currently must be CAMEL_TCP_ADDRESS_IPV4)</div><div class='del'>- * @port: the port number (in network byte order)</div><div class='del'>- * @length: the length of @address</div><div class='del'>- * @address: the address data (family dependent, in network byte order)</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelTcpAddress.</div><div class='del'>- **/</div><div class='del'>-CamelTcpAddress *</div><div class='del'>-camel_tcp_address_new  (CamelTcpAddressFamily family, gushort port,</div><div class='del'>-			gushort length, gpointer address)</div><div class='del'>-{</div><div class='del'>-	CamelTcpAddress *addr;</div><div class='del'>-</div><div class='del'>-	addr = g_malloc (sizeof (CamelTcpAddress) + length - 1);</div><div class='del'>-	addr-&gt;family = family;</div><div class='del'>-	addr-&gt;port   = port;</div><div class='del'>-	addr-&gt;length = length;</div><div class='del'>-	memcpy (&amp;addr-&gt;address, address, length);</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_tcp_address_free:</div><div class='del'>- * @address: the address</div><div class='del'>- *</div><div class='del'>- * Frees @address.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_tcp_address_free (CamelTcpAddress *address)</div><div class='del'>-{</div><div class='del'>-	g_free (address);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h<br/>deleted file mode 100644<br/>index 2c4d022168..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-tcp-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-tcp-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_TCP_STREAM_H</div><div class='del'>-#define CAMEL_TCP_STREAM_H</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#include &lt;netinet/tcp.h&gt;</div><div class='del'>-#include &lt;netdb.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_TCP_STREAM_TYPE     (camel_tcp_stream_get_type ())</div><div class='del'>-#define CAMEL_TCP_STREAM(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_TYPE, CamelTcpStream))</div><div class='del'>-#define CAMEL_TCP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_TYPE, CamelTcpStreamClass))</div><div class='del'>-#define CAMEL_IS_TCP_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_SOCKOPT_NONBLOCKING,     /* nonblocking io */</div><div class='del'>-	CAMEL_SOCKOPT_LINGER,          /* linger on close if data present */</div><div class='del'>-	CAMEL_SOCKOPT_REUSEADDR,       /* allow local address reuse */</div><div class='del'>-	CAMEL_SOCKOPT_KEEPALIVE,       /* keep connections alive */</div><div class='del'>-	CAMEL_SOCKOPT_RECVBUFFERSIZE,  /* receive buffer size */</div><div class='del'>-	CAMEL_SOCKOPT_SENDBUFFERSIZE,  /* send buffer size */</div><div class='del'>-	</div><div class='del'>-	CAMEL_SOCKOPT_IPTIMETOLIVE,    /* time to live */</div><div class='del'>-	CAMEL_SOCKOPT_IPTYPEOFSERVICE, /* type of service and precedence */</div><div class='del'>-	</div><div class='del'>-	CAMEL_SOCKOPT_ADDMEMBER,       /* add an IP group membership */</div><div class='del'>-	CAMEL_SOCKOPT_DROPMEMBER,      /* drop an IP group membership */</div><div class='del'>-	CAMEL_SOCKOPT_MCASTINTERFACE,  /* multicast interface address */</div><div class='del'>-	CAMEL_SOCKOPT_MCASTTIMETOLIVE, /* multicast timetolive */</div><div class='del'>-	CAMEL_SOCKOPT_MCASTLOOPBACK,   /* multicast loopback */</div><div class='del'>-	</div><div class='del'>-	CAMEL_SOCKOPT_NODELAY,         /* don't delay send to coalesce packets */</div><div class='del'>-	CAMEL_SOCKOPT_MAXSEGMENT,      /* maximum segment size */</div><div class='del'>-	CAMEL_SOCKOPT_BROADCAST,       /* enable broadcast */</div><div class='del'>-	CAMEL_SOCKOPT_LAST</div><div class='del'>-} CamelSockOpt;</div><div class='del'>-</div><div class='del'>-typedef struct linger CamelLinger;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSockOptData {</div><div class='del'>-	CamelSockOpt option;</div><div class='del'>-	union {</div><div class='del'>-		guint       ip_ttl;              /* IP time to live */</div><div class='del'>-		guint       mcast_ttl;           /* IP multicast time to live */</div><div class='del'>-		guint       tos;                 /* IP type of service and precedence */</div><div class='del'>-		gboolean    non_blocking;        /* Non-blocking (network) I/O */</div><div class='del'>-		gboolean    reuse_addr;          /* Allow local address reuse */</div><div class='del'>-		gboolean    keep_alive;          /* Keep connections alive */</div><div class='del'>-		gboolean    mcast_loopback;      /* IP multicast loopback */</div><div class='del'>-		gboolean    no_delay;            /* Don't delay send to coalesce packets */</div><div class='del'>-		gboolean    broadcast;           /* Enable broadcast */</div><div class='del'>-		size_t      max_segment;         /* Maximum segment size */</div><div class='del'>-		size_t      recv_buffer_size;    /* Receive buffer size */</div><div class='del'>-		size_t      send_buffer_size;    /* Send buffer size */</div><div class='del'>-		CamelLinger linger;              /* Time to linger on close if data present */</div><div class='del'>-	} value;</div><div class='del'>-} CamelSockOptData;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_TCP_ADDRESS_IPV4,</div><div class='del'>-	CAMEL_TCP_ADDRESS_IPV6</div><div class='del'>-} CamelTcpAddressFamily;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTcpAddressFamily family;</div><div class='del'>-	gushort port, length;</div><div class='del'>-	guint8 address[1];</div><div class='del'>-} CamelTcpAddress;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelTcpStream {</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	int (*connect)    (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-	int (*getsockopt) (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-	int (*setsockopt) (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-	</div><div class='del'>-	CamelTcpAddress * (*get_local_address)  (CamelTcpStream *stream);</div><div class='del'>-	CamelTcpAddress * (*get_remote_address) (CamelTcpStream *stream);</div><div class='del'>-} CamelTcpStreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_tcp_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-int         camel_tcp_stream_connect    (CamelTcpStream *stream, struct hostent *host, int port);</div><div class='del'>-int         camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data);</div><div class='del'>-int         camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data);</div><div class='del'>-</div><div class='del'>-CamelTcpAddress *camel_tcp_stream_get_local_address  (CamelTcpStream *stream);</div><div class='del'>-CamelTcpAddress *camel_tcp_stream_get_remote_address (CamelTcpStream *stream);</div><div class='del'>-</div><div class='del'>-CamelTcpAddress *camel_tcp_address_new  (CamelTcpAddressFamily family,</div><div class='del'>-					 gushort port, gushort length,</div><div class='del'>-					 gpointer address);</div><div class='del'>-void             camel_tcp_address_free (CamelTcpAddress *address);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TCP_STREAM_H */</div><div class='head'>diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c<br/>deleted file mode 100644<br/>index ab2ec72661..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-text-index.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-text-index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1935 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-object.h"</div><div class='del'>-</div><div class='del'>-#include "camel-text-index.h"</div><div class='del'>-#include "camel-block-file.h"</div><div class='del'>-#include "camel-partition-table.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-#define io(x) </div><div class='del'>-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/</div><div class='del'>-</div><div class='del'>-/* cursor debug */</div><div class='del'>-#define c(x)</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_TEXT_INDEX_LOCK(kf, lock) (e_mutex_lock(((CamelTextIndex *)kf)-&gt;priv-&gt;lock))</div><div class='del'>-#define CAMEL_TEXT_INDEX_UNLOCK(kf, lock) (e_mutex_unlock(((CamelTextIndex *)kf)-&gt;priv-&gt;lock))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_TEXT_INDEX_LOCK(kf, lock)</div><div class='del'>-#define CAMEL_TEXT_INDEX_UNLOCK(kf, lock)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int text_index_compress_nosync(CamelIndex *idx);</div><div class='del'>-</div><div class='del'>-void camel_text_index_dump(CamelTextIndex *idx);</div><div class='del'>-void camel_text_index_info(CamelTextIndex *idx);</div><div class='del'>-void camel_text_index_validate(CamelTextIndex *idx);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-/* "private" data, shared between index/cursor/name classes */</div><div class='del'>-typedef struct _CamelTextIndexNamePrivate CamelTextIndexNamePrivate;</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexNamePrivate {</div><div class='del'>-	GString *buffer;</div><div class='del'>-	camel_key_t nameid;</div><div class='del'>-	EMemPool *pool;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelTextIndexName *camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid);</div><div class='del'>-</div><div class='del'>-/* ****************************** */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTextIndexCursorPrivate CamelTextIndexCursorPrivate;</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexCursorPrivate {</div><div class='del'>-	camel_block_t first;</div><div class='del'>-	camel_block_t next;</div><div class='del'>-</div><div class='del'>-	int record_index;</div><div class='del'>-</div><div class='del'>-	size_t record_count;</div><div class='del'>-	camel_key_t *records;</div><div class='del'>-</div><div class='del'>-	char *current;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelTextIndexCursor *camel_text_index_cursor_new(CamelTextIndex *idx, camel_block_t data);</div><div class='del'>-</div><div class='del'>-/* ****************************** */</div><div class='del'>-typedef struct _CamelTextIndexKeyCursorPrivate CamelTextIndexKeyCursorPrivate;</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexKeyCursorPrivate {</div><div class='del'>-	CamelKeyTable *table;</div><div class='del'>-</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	camel_block_t data;</div><div class='del'>-	char *current;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelTextIndexKeyCursor *camel_text_index_key_cursor_new(CamelTextIndex *idx, CamelKeyTable *table);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-#define CAMEL_TEXT_INDEX_VERSION "TEXT.000"</div><div class='del'>-#define CAMEL_TEXT_INDEX_KEY_VERSION "KEYS.000"</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexPrivate {</div><div class='del'>-	CamelBlockFile *blocks;</div><div class='del'>-	CamelKeyFile *links;</div><div class='del'>-</div><div class='del'>-	CamelKeyTable *word_index;</div><div class='del'>-	CamelPartitionTable *word_hash;</div><div class='del'>-</div><div class='del'>-	CamelKeyTable *name_index;</div><div class='del'>-	CamelPartitionTable *name_hash;</div><div class='del'>-</div><div class='del'>-	/* Cache of words to write */</div><div class='del'>-	int word_cache_limit;</div><div class='del'>-	int word_cache_count;</div><div class='del'>-	EDList word_cache;</div><div class='del'>-	GHashTable *words;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *lock;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Root block of text index */</div><div class='del'>-struct _CamelTextIndexRoot {</div><div class='del'>-	struct _CamelBlockRoot root;</div><div class='del'>-</div><div class='del'>-	/* FIXME: the index root could contain a pointer to the hash root */</div><div class='del'>-	camel_block_t word_index_root; /* a keyindex containing the keyid -&gt; word mapping */</div><div class='del'>-	camel_block_t word_hash_root; /* a partitionindex containing word -&gt; keyid mapping */</div><div class='del'>-</div><div class='del'>-	camel_block_t name_index_root; /* same, for names */</div><div class='del'>-	camel_block_t name_hash_root;</div><div class='del'>-</div><div class='del'>-	guint32 words;		/* total words */</div><div class='del'>-	guint32 names;		/* total names */</div><div class='del'>-	guint32 deleted;	/* deleted names */</div><div class='del'>-	guint32 keys;		/* total key 'chunks' written, used with deleted to determine fragmentation */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexWord {</div><div class='del'>-	struct _CamelTextIndexWord *next;</div><div class='del'>-	struct _CamelTextIndexWord *prev;</div><div class='del'>-</div><div class='del'>-	camel_block_t data;	/* where the data starts */</div><div class='del'>-	camel_key_t wordid;</div><div class='del'>-	char *word;</div><div class='del'>-	unsigned int used;</div><div class='del'>-	camel_key_t names[32];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CTI_PRIVATE(o) (((CamelTextIndex *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-#define CI_CLASS(o) ((CamelTextIndexClass *)(((CamelObject *)o)-&gt;classfuncs))</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelTextIndex */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_text_index_parent;</div><div class='del'>-</div><div class='del'>-/* call locked */</div><div class='del'>-static void</div><div class='del'>-text_index_add_name_to_word(CamelIndex *idx, const char *word, camel_key_t nameid)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexWord *w, *wp, *ww;</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	camel_key_t wordid;</div><div class='del'>-	camel_block_t data;</div><div class='del'>-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	w = g_hash_table_lookup(p-&gt;words, word);</div><div class='del'>-	if (w == NULL) {</div><div class='del'>-		wordid = camel_partition_table_lookup(p-&gt;word_hash, word);</div><div class='del'>-		if (wordid == 0) {</div><div class='del'>-			data = 0;</div><div class='del'>-			wordid = camel_key_table_add(p-&gt;word_index, word, 0, 0);</div><div class='del'>-			if (wordid == 0){</div><div class='del'>-				g_warning("Could not create key entry for word '%s': %s\n", word, strerror(errno));</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			if (camel_partition_table_add(p-&gt;word_hash, word, wordid) == -1) {</div><div class='del'>-				g_warning("Could not create hash entry for word '%s': %s\n", word, strerror(errno));</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			rb-&gt;words++;</div><div class='del'>-			camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-		} else {</div><div class='del'>-			data = camel_key_table_lookup(p-&gt;word_index, wordid, NULL, 0);</div><div class='del'>-			if (data == 0) {</div><div class='del'>-				g_warning("Could not find key entry for word '%s': %s\n", word, strerror(errno));</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		w = g_malloc0(sizeof(*w));</div><div class='del'>-		w-&gt;word = g_strdup(word);</div><div class='del'>-		w-&gt;wordid = wordid;</div><div class='del'>-		w-&gt;used = 1;</div><div class='del'>-		w-&gt;data = data;</div><div class='del'>-</div><div class='del'>-		w-&gt;names[0] = nameid;</div><div class='del'>-		g_hash_table_insert(p-&gt;words, w-&gt;word, w);</div><div class='del'>-		e_dlist_addhead(&amp;p-&gt;word_cache, (EDListNode *)w);</div><div class='del'>-		p-&gt;word_cache_count++;</div><div class='del'>-		ww = (struct _CamelTextIndexWord *)p-&gt;word_cache.tailpred;</div><div class='del'>-		wp = ww-&gt;prev;</div><div class='del'>-		while (wp &amp;&amp; p-&gt;word_cache_count &gt; p-&gt;word_cache_limit) {</div><div class='del'>-			io(printf("writing key file entry '%s' [%x]\n", ww-&gt;word, ww-&gt;data));</div><div class='del'>-			if (camel_key_file_write(p-&gt;links, &amp;ww-&gt;data, ww-&gt;used, ww-&gt;names) != -1) {</div><div class='del'>-				io(printf("  new data [%x]\n", ww-&gt;data));</div><div class='del'>-				rb-&gt;keys++;</div><div class='del'>-				camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-				/* if this call fails - we still point to the old data - not fatal */</div><div class='del'>-				camel_key_table_set_data(p-&gt;word_index, ww-&gt;wordid, ww-&gt;data);</div><div class='del'>-				e_dlist_remove((EDListNode *)ww);</div><div class='del'>-				g_hash_table_remove(p-&gt;words, ww-&gt;word);</div><div class='del'>-				g_free(ww-&gt;word);</div><div class='del'>-				g_free(ww);</div><div class='del'>-				p-&gt;word_cache_count--;</div><div class='del'>-			}</div><div class='del'>-			ww = wp;</div><div class='del'>-			wp = wp-&gt;prev;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_dlist_remove((EDListNode *)w);</div><div class='del'>-		e_dlist_addhead(&amp;p-&gt;word_cache, (EDListNode *)w);</div><div class='del'>-		w-&gt;names[w-&gt;used] = nameid;</div><div class='del'>-		w-&gt;used++;</div><div class='del'>-		if (w-&gt;used == sizeof(w-&gt;names)/sizeof(w-&gt;names[0])) {</div><div class='del'>-			io(printf("writing key file entry '%s' [%x]\n", w-&gt;word, w-&gt;data));</div><div class='del'>-			if (camel_key_file_write(p-&gt;links, &amp;w-&gt;data, w-&gt;used, w-&gt;names) != -1) {</div><div class='del'>-				rb-&gt;keys++;</div><div class='del'>-				camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-				/* if this call fails - we still point to the old data - not fatal */</div><div class='del'>-				camel_key_table_set_data(p-&gt;word_index, w-&gt;wordid, w-&gt;data);</div><div class='del'>-			}</div><div class='del'>-			/* FIXME: what to on error?  lost data? */</div><div class='del'>-			w-&gt;used = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_index_sync(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	struct _CamelTextIndexWord *ww;</div><div class='del'>-	struct _CamelTextIndexRoot *rb;</div><div class='del'>-	int ret = 0, wfrag, nfrag, work = FALSE;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;blocks == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	/* sync/flush word cache */</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	/* we sync, bump down the cache limits since we dont need them for reading */</div><div class='del'>-	p-&gt;blocks-&gt;block_cache_limit = 128;</div><div class='del'>-	/* this doesn't really need to be dropped, its only used in updates anyway */</div><div class='del'>-	p-&gt;word_cache_limit = 1024;</div><div class='del'>-</div><div class='del'>-	work = !e_dlist_empty(&amp;p-&gt;word_cache);</div><div class='del'>-</div><div class='del'>-	while ( (ww = (struct _CamelTextIndexWord *)e_dlist_remhead(&amp;p-&gt;word_cache)) ) {</div><div class='del'>-		if (ww-&gt;used &gt; 0) {</div><div class='del'>-			io(printf("writing key file entry '%s' [%x]\n", ww-&gt;word, ww-&gt;data));</div><div class='del'>-			if (camel_key_file_write(p-&gt;links, &amp;ww-&gt;data, ww-&gt;used, ww-&gt;names) != -1) {</div><div class='del'>-				io(printf("  new data [%x]\n", ww-&gt;data));</div><div class='del'>-				rb-&gt;keys++;</div><div class='del'>-				camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-				camel_key_table_set_data(p-&gt;word_index, ww-&gt;wordid, ww-&gt;data);</div><div class='del'>-			} else {</div><div class='del'>-				ret = -1;</div><div class='del'>-			}</div><div class='del'>-			ww-&gt;used = 0;</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_remove(p-&gt;words, ww-&gt;word);</div><div class='del'>-		g_free(ww-&gt;word);</div><div class='del'>-		g_free(ww);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	if (camel_key_table_sync(p-&gt;word_index) == -1</div><div class='del'>-	    || camel_key_table_sync(p-&gt;name_index) == -1</div><div class='del'>-	    || camel_partition_table_sync(p-&gt;word_hash) == -1</div><div class='del'>-	    || camel_partition_table_sync(p-&gt;name_hash) == -1)</div><div class='del'>-		ret = -1;</div><div class='del'>-</div><div class='del'>-	/* only do the frag/compress check if we did some new writes on this index */</div><div class='del'>-	if (ret == 0 &amp;&amp; work) {</div><div class='del'>-		wfrag = rb-&gt;words ? (((rb-&gt;keys - rb-&gt;words) * 100)/ rb-&gt;words) : 0;</div><div class='del'>-		nfrag = rb-&gt;names ? ((rb-&gt;deleted * 100) / rb-&gt;names) : 0;</div><div class='del'>-		d(printf("wfrag = %d, nfrag = %d\n", wfrag, nfrag));</div><div class='del'>-		d(printf("  words = %d, keys = %d\n", rb-&gt;words, rb-&gt;keys));</div><div class='del'>-		if (wfrag &gt; 30 || nfrag &gt; 20)</div><div class='del'>-			ret = text_index_compress_nosync(idx);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = camel_block_file_sync(p-&gt;blocks);</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void tmp_name(const char *in, char *o)</div><div class='del'>-{</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	s = strrchr(in, '/');</div><div class='del'>-	if (s) {</div><div class='del'>-		memcpy(o, in, s-in+1);</div><div class='del'>-		memcpy(o+(s-in+1), ".#", 2);</div><div class='del'>-		strcpy(o+(s-in+3), s+1);</div><div class='del'>-	} else {</div><div class='del'>-		sprintf(o, ".#%s", in);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_index_compress(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	ret = camel_index_sync(idx);</div><div class='del'>-	if (ret != -1)</div><div class='del'>-		ret = text_index_compress_nosync(idx);</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Attempt to recover index space by compressing the indices */</div><div class='del'>-static int</div><div class='del'>-text_index_compress_nosync(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndex *newidx;</div><div class='del'>-	struct _CamelTextIndexPrivate *newp, *oldp;</div><div class='del'>-	camel_key_t oldkeyid, newkeyid;</div><div class='del'>-	GHashTable *remap;</div><div class='del'>-	unsigned int deleted;</div><div class='del'>-	camel_block_t data, newdata;</div><div class='del'>-	int i, ret = -1;</div><div class='del'>-	char *name = NULL;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	char *newpath, *savepath, *oldpath;</div><div class='del'>-	size_t count, newcount;</div><div class='del'>-	camel_key_t *records, newrecords[256];</div><div class='del'>-	struct _CamelTextIndexRoot *rb;</div><div class='del'>-</div><div class='del'>-	i = strlen(idx-&gt;path)+16;</div><div class='del'>-	oldpath = alloca(i);</div><div class='del'>-	newpath = alloca(i);</div><div class='del'>-	savepath = alloca(i);</div><div class='del'>-</div><div class='del'>-	strcpy(oldpath, idx-&gt;path);</div><div class='del'>-	oldpath[strlen(oldpath)-strlen(".index")] = 0;</div><div class='del'>-</div><div class='del'>-	tmp_name(oldpath, newpath);</div><div class='del'>-	sprintf(savepath, "%s~", oldpath);</div><div class='del'>-</div><div class='del'>-	d(printf("Old index: %s\n", idx-&gt;path));</div><div class='del'>-	d(printf("Old path: %s\n", oldpath));</div><div class='del'>-	d(printf("New: %s\n", newpath));</div><div class='del'>-	d(printf("Save: %s\n", savepath));</div><div class='del'>-</div><div class='del'>-	newidx = camel_text_index_new(newpath, O_RDWR|O_CREAT);</div><div class='del'>-	if (newidx == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	newp = CTI_PRIVATE(newidx);</div><div class='del'>-	oldp = CTI_PRIVATE(idx);</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	rb = (struct _CamelTextIndexRoot *)newp-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	rb-&gt;words = 0;</div><div class='del'>-	rb-&gt;names = 0;</div><div class='del'>-	rb-&gt;deleted = 0;</div><div class='del'>-	rb-&gt;keys = 0;</div><div class='del'>-</div><div class='del'>-	/* Process:</div><div class='del'>-	   For each name we still have:</div><div class='del'>-	   Add it to the new index &amp; setup remap table</div><div class='del'>-</div><div class='del'>-	   For each word:</div><div class='del'>-	   Copy word's data to a new file</div><div class='del'>-	   Add new word to index(*) (can we just copy blocks?) */</div><div class='del'>-</div><div class='del'>-	/* Copy undeleted names to new index file, creating new indices */</div><div class='del'>-	io(printf("Copying undeleted names to new file\n"));</div><div class='del'>-	remap = g_hash_table_new(NULL, NULL);</div><div class='del'>-	oldkeyid = 0;</div><div class='del'>-	deleted = 0;</div><div class='del'>-	while ( (oldkeyid = camel_key_table_next(oldp-&gt;name_index, oldkeyid, &amp;name, &amp;flags, &amp;data)) ) {</div><div class='del'>-		if ((flags&amp;1) == 0) {</div><div class='del'>-			io(printf("copying name '%s'\n", name));</div><div class='del'>-			newkeyid = camel_key_table_add(newp-&gt;name_index, name, data, flags);</div><div class='del'>-			if (newkeyid == 0)</div><div class='del'>-				goto fail;</div><div class='del'>-			rb-&gt;names++;</div><div class='del'>-			camel_partition_table_add(newp-&gt;name_hash, name, newkeyid);</div><div class='del'>-			g_hash_table_insert(remap, (void *)oldkeyid, (void *)newkeyid);</div><div class='del'>-		} else</div><div class='del'>-			io(printf("deleted name '%s'\n", name));</div><div class='del'>-		g_free(name);</div><div class='del'>-		name = NULL;</div><div class='del'>-		deleted |= flags;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Copy word data across, remapping/deleting and create new index for it */</div><div class='del'>-	/* We re-block the data into 256 entry lots while we're at it, since we only</div><div class='del'>-	   have to do 1 at a time and its cheap */</div><div class='del'>-	oldkeyid = 0;</div><div class='del'>-	while ( (oldkeyid = camel_key_table_next(oldp-&gt;word_index, oldkeyid, &amp;name, &amp;flags, &amp;data)) ) {</div><div class='del'>-		io(printf("copying word '%s'\n", name));</div><div class='del'>-		newdata = 0;</div><div class='del'>-		newcount = 0;</div><div class='del'>-		if (data) {</div><div class='del'>-			rb-&gt;words++;</div><div class='del'>-			rb-&gt;keys++;</div><div class='del'>-		}</div><div class='del'>-		while (data) {</div><div class='del'>-			if (camel_key_file_read(oldp-&gt;links, &amp;data, &amp;count, &amp;records) == -1) {</div><div class='del'>-				io(printf("could not read from old keys at %d for word '%s'\n", (int)data, name));</div><div class='del'>-				goto fail;</div><div class='del'>-			}</div><div class='del'>-			for (i=0;i&lt;count;i++) {</div><div class='del'>-				newkeyid = (camel_key_t)g_hash_table_lookup(remap, (void *)records[i]);</div><div class='del'>-				if (newkeyid) {</div><div class='del'>-					newrecords[newcount++] = newkeyid;</div><div class='del'>-					if (newcount == sizeof(newrecords)/sizeof(newrecords[0])) {</div><div class='del'>-						if (camel_key_file_write(newp-&gt;links, &amp;newdata, newcount, newrecords) == -1) {</div><div class='del'>-							g_free(records);</div><div class='del'>-							goto fail;</div><div class='del'>-						}</div><div class='del'>-						newcount = 0;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free(records);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (newcount &gt; 0) {</div><div class='del'>-			if (camel_key_file_write(newp-&gt;links, &amp;newdata, newcount, newrecords) == -1)</div><div class='del'>-				goto fail;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		newkeyid = camel_key_table_add(newp-&gt;word_index, name, newdata, flags);</div><div class='del'>-		if (newkeyid == 0)</div><div class='del'>-			goto fail;</div><div class='del'>-		camel_partition_table_add(newp-&gt;word_hash, name, newkeyid);</div><div class='del'>-		g_free(name);</div><div class='del'>-		name = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_block_file_touch_block(newp-&gt;blocks, newp-&gt;blocks-&gt;root_block);</div><div class='del'>-	</div><div class='del'>-	if (camel_index_sync((CamelIndex *)newidx) == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* Rename underlying files to match */</div><div class='del'>-	ret = camel_index_rename(idx, savepath);</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* If this fails, we'll pick up something during restart? */</div><div class='del'>-	ret = camel_index_rename((CamelIndex *)newidx, oldpath);</div><div class='del'>-</div><div class='del'>-#define myswap(a, b) { void *tmp = a; a = b; b = tmp; }</div><div class='del'>-	/* Poke the private data across to the new object */</div><div class='del'>-	/* And change the fd's over, etc? */</div><div class='del'>-	myswap(newp-&gt;blocks, oldp-&gt;blocks);</div><div class='del'>-	myswap(newp-&gt;links, oldp-&gt;links);</div><div class='del'>-	myswap(newp-&gt;word_index, oldp-&gt;word_index);</div><div class='del'>-	myswap(newp-&gt;word_hash, oldp-&gt;word_hash);</div><div class='del'>-	myswap(newp-&gt;name_index, oldp-&gt;name_index);</div><div class='del'>-	myswap(newp-&gt;name_hash, oldp-&gt;name_hash);</div><div class='del'>-#undef myswap</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)newidx);</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_hash_table_destroy(remap);</div><div class='del'>-</div><div class='del'>-	/* clean up temp files always */</div><div class='del'>-	camel_text_index_remove(newpath);</div><div class='del'>-</div><div class='del'>-	sprintf(savepath, "%s~.index", oldpath);</div><div class='del'>-	unlink(savepath);</div><div class='del'>-	sprintf(newpath, "%s.data", savepath);</div><div class='del'>-	unlink(newpath);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_index_rename(CamelIndex *idx, const char *path)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	char *newlink, *newblock;</div><div class='del'>-	int err, ret;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	newblock = alloca(strlen(path)+8);</div><div class='del'>-	sprintf(newblock, "%s.index", path);</div><div class='del'>-	ret = camel_block_file_rename(p-&gt;blocks, newblock);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	newlink = alloca(strlen(path)+16);</div><div class='del'>-	sprintf(newlink, "%s.index.data", path);</div><div class='del'>-	ret = camel_key_file_rename(p-&gt;links, newlink);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		err = errno;</div><div class='del'>-		camel_block_file_rename(p-&gt;blocks, idx-&gt;path);</div><div class='del'>-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-		errno = err;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(idx-&gt;path);</div><div class='del'>-	idx-&gt;path = g_strdup(newblock);</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_index_has_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-</div><div class='del'>-	return camel_partition_table_lookup(p-&gt;name_hash, name) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelIndexName *</div><div class='del'>-text_index_add_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	CamelIndexName *idn;</div><div class='del'>-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	/* if we're adding words, up the cache limits a lot */</div><div class='del'>-	if (p-&gt;blocks) {</div><div class='del'>-		p-&gt;blocks-&gt;block_cache_limit = 1024;</div><div class='del'>-		p-&gt;word_cache_limit = 8192;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we have it already replace it */</div><div class='del'>-	keyid = camel_partition_table_lookup(p-&gt;name_hash, name);</div><div class='del'>-	if (keyid != 0) {</div><div class='del'>-		/* TODO: We could just update the partition table's</div><div class='del'>-		   key pointer rather than having to delete it */</div><div class='del'>-		rb-&gt;deleted++;</div><div class='del'>-		camel_key_table_set_flags(p-&gt;name_index, keyid, 1, 1);</div><div class='del'>-		camel_partition_table_remove(p-&gt;name_hash, name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	keyid = camel_key_table_add(p-&gt;name_index, name, 0, 0);</div><div class='del'>-	if (keyid != 0) {</div><div class='del'>-		camel_partition_table_add(p-&gt;name_hash, name, keyid);</div><div class='del'>-		rb-&gt;names++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-</div><div class='del'>-	/* TODO: if keyid == 0, we had a failure, we should somehow flag that, but for</div><div class='del'>-	   now just return a valid object but discard its results, see text_index_write_name */</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	idn = (CamelIndexName *)camel_text_index_name_new((CamelTextIndex *)idx, name, keyid);</div><div class='del'>-</div><div class='del'>-	return idn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* call locked */</div><div class='del'>-static void</div><div class='del'>-hash_write_word(char *word, void *data, CamelIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexName *tin = (CamelTextIndexName *)idn;</div><div class='del'>-</div><div class='del'>-	text_index_add_name_to_word(idn-&gt;index, word, tin-&gt;priv-&gt;nameid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-text_index_write_name(CamelIndex *idx, CamelIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	/* force 'flush' of any outstanding data */</div><div class='del'>-	camel_index_name_add_buffer(idn, NULL, 0);</div><div class='del'>-</div><div class='del'>-	/* see text_index_add_name for when this can be 0 */</div><div class='del'>-	if (((CamelTextIndexName *)idn)-&gt;priv-&gt;nameid != 0) {</div><div class='del'>-		CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-		</div><div class='del'>-		g_hash_table_foreach(idn-&gt;words, (GHFunc)hash_write_word, idn);</div><div class='del'>-		</div><div class='del'>-		CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelIndexCursor *</div><div class='del'>-text_index_find_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	/* what was this for, umm */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-text_index_delete_name(CamelIndex *idx, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	/* probably doesn't really need locking, but oh well */</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	/* We just mark the key deleted, and remove it from the hash table */</div><div class='del'>-	keyid = camel_partition_table_lookup(p-&gt;name_hash, name);</div><div class='del'>-	if (keyid != 0) {</div><div class='del'>-		rb-&gt;deleted++;</div><div class='del'>-		camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-		camel_key_table_set_flags(p-&gt;name_index, keyid, 1, 1);</div><div class='del'>-		camel_partition_table_remove(p-&gt;name_hash, name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelIndexCursor *</div><div class='del'>-text_index_find(CamelIndex *idx, const char *word)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	camel_block_t data = 0;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	CamelIndexCursor *idc;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_LOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	keyid = camel_partition_table_lookup(p-&gt;word_hash, word);</div><div class='del'>-	if (keyid != 0) {</div><div class='del'>-		data = camel_key_table_lookup(p-&gt;word_index, keyid, NULL, &amp;flags);</div><div class='del'>-		if (flags &amp; 1)</div><div class='del'>-			data = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_TEXT_INDEX_UNLOCK(idx, lock);</div><div class='del'>-</div><div class='del'>-	idc = (CamelIndexCursor *)camel_text_index_cursor_new((CamelTextIndex *)idx, data);</div><div class='del'>-</div><div class='del'>-	return idc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelIndexCursor *</div><div class='del'>-text_index_words(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-</div><div class='del'>-	return (CamelIndexCursor *)camel_text_index_key_cursor_new((CamelTextIndex *)idx, p-&gt;word_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelIndexCursor *</div><div class='del'>-text_index_names(CamelIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-</div><div class='del'>-	return (CamelIndexCursor *)camel_text_index_key_cursor_new((CamelTextIndex *)idx, p-&gt;name_index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_class_init(CamelTextIndexClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelIndexClass *iklass = (CamelIndexClass *)klass;</div><div class='del'>-</div><div class='del'>-	camel_text_index_parent = CAMEL_OBJECT_CLASS(camel_type_get_global_classfuncs(camel_object_get_type()));</div><div class='del'>-</div><div class='del'>-	iklass-&gt;sync = text_index_sync;</div><div class='del'>-	iklass-&gt;compress = text_index_compress;</div><div class='del'>-</div><div class='del'>-	iklass-&gt;rename = text_index_rename;</div><div class='del'>-</div><div class='del'>-	iklass-&gt;has_name = text_index_has_name;</div><div class='del'>-	iklass-&gt;add_name = text_index_add_name;</div><div class='del'>-	iklass-&gt;write_name = text_index_write_name;</div><div class='del'>-	iklass-&gt;find_name = text_index_find_name;</div><div class='del'>-	iklass-&gt;delete_name = text_index_delete_name;</div><div class='del'>-	iklass-&gt;find = text_index_find;</div><div class='del'>-</div><div class='del'>-	iklass-&gt;words = text_index_words;</div><div class='del'>-	iklass-&gt;names = text_index_names;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_init(CamelTextIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = CTI_PRIVATE(idx) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	e_dlist_init(&amp;p-&gt;word_cache);</div><div class='del'>-	p-&gt;words = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	p-&gt;word_cache_count = 0;</div><div class='del'>-	/* this cache size and the block cache size have been tuned for about the best</div><div class='del'>-	   with moderate memory usage.  Doubling the memory usage barely affects performance. */</div><div class='del'>-	p-&gt;word_cache_limit = 4096; /* 1024 = 128K */</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_finalise(CamelTextIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-</div><div class='del'>-	camel_index_sync((CamelIndex *)idx);</div><div class='del'>-</div><div class='del'>-	g_assert(e_dlist_empty(&amp;p-&gt;word_cache));</div><div class='del'>-	g_assert(g_hash_table_size(p-&gt;words) == 0);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(p-&gt;words);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;word_index)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;word_index);</div><div class='del'>-	if (p-&gt;word_hash)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;word_hash);</div><div class='del'>-	if (p-&gt;name_index)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;name_index);</div><div class='del'>-	if (p-&gt;name_hash)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;name_hash);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;blocks)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;blocks);</div><div class='del'>-	if (p-&gt;links)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;links);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy(p-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_text_index_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelTextIndex",</div><div class='del'>-					   sizeof (CamelTextIndex),</div><div class='del'>-					   sizeof (CamelTextIndexClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_text_index_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_text_index_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_text_index_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-text_index_normalise(CamelIndex *idx, const char *in, void *data)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-</div><div class='del'>-	/* Sigh, this is really expensive */</div><div class='del'>-	word = g_strdup(in); /*g_utf8_normalize(in, strlen(in), G_NORMALIZE_ALL);*/</div><div class='del'>-	g_utf8_strdown(word);</div><div class='del'>-</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelTextIndex *</div><div class='del'>-camel_text_index_new(const char *path, int flags)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndex *idx = (CamelTextIndex *)camel_object_new(camel_text_index_get_type());</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	struct _CamelTextIndexRoot *rb;</div><div class='del'>-	char *link;</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-</div><div class='del'>-	camel_index_construct((CamelIndex *)idx, path, flags);</div><div class='del'>-	camel_index_set_normalise((CamelIndex *)idx, text_index_normalise, NULL);</div><div class='del'>-</div><div class='del'>-	p-&gt;blocks = camel_block_file_new(idx-&gt;parent.path, flags, CAMEL_TEXT_INDEX_VERSION, CAMEL_BLOCK_SIZE);</div><div class='del'>-	link = alloca(strlen(idx-&gt;parent.path)+7);</div><div class='del'>-	sprintf(link, "%s.data", idx-&gt;parent.path);</div><div class='del'>-	p-&gt;links = camel_key_file_new(link, flags, CAMEL_TEXT_INDEX_KEY_VERSION);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;blocks == NULL || p-&gt;links == NULL) {</div><div class='del'>-		camel_object_unref((CamelObject *)idx);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;word_index_root == 0) {</div><div class='del'>-		bl = camel_block_file_new_block(p-&gt;blocks);</div><div class='del'>-		rb-&gt;word_index_root = bl-&gt;id;</div><div class='del'>-		camel_block_file_unref_block(p-&gt;blocks, bl);</div><div class='del'>-		camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;word_hash_root == 0) {</div><div class='del'>-		bl = camel_block_file_new_block(p-&gt;blocks);</div><div class='del'>-		rb-&gt;word_hash_root = bl-&gt;id;</div><div class='del'>-		camel_block_file_unref_block(p-&gt;blocks, bl);</div><div class='del'>-		camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;name_index_root == 0) {</div><div class='del'>-		bl = camel_block_file_new_block(p-&gt;blocks);</div><div class='del'>-		rb-&gt;name_index_root = bl-&gt;id;</div><div class='del'>-		camel_block_file_unref_block(p-&gt;blocks, bl);</div><div class='del'>-		camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;name_hash_root == 0) {</div><div class='del'>-		bl = camel_block_file_new_block(p-&gt;blocks);</div><div class='del'>-		rb-&gt;name_hash_root = bl-&gt;id;</div><div class='del'>-		camel_block_file_unref_block(p-&gt;blocks, bl);</div><div class='del'>-		camel_block_file_touch_block(p-&gt;blocks, p-&gt;blocks-&gt;root_block);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	p-&gt;word_index = camel_key_table_new(p-&gt;blocks, rb-&gt;word_index_root);</div><div class='del'>-	p-&gt;word_hash = camel_partition_table_new(p-&gt;blocks, rb-&gt;word_hash_root);</div><div class='del'>-	p-&gt;name_index = camel_key_table_new(p-&gt;blocks, rb-&gt;name_index_root);</div><div class='del'>-	p-&gt;name_hash = camel_partition_table_new(p-&gt;blocks, rb-&gt;name_hash_root);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;word_index == NULL || p-&gt;word_hash == NULL</div><div class='del'>-	    || p-&gt;name_index == NULL || p-&gt;name_hash == NULL) {</div><div class='del'>-		camel_object_unref((CamelObject *)idx);</div><div class='del'>-		idx = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns 0 if the index exists, is valid, and synced, -1 otherwise */</div><div class='del'>-int</div><div class='del'>-camel_text_index_check(const char *path)</div><div class='del'>-{</div><div class='del'>-	char *block, *key;</div><div class='del'>-	CamelBlockFile *blocks;</div><div class='del'>-	CamelKeyFile *keys;</div><div class='del'>-</div><div class='del'>-	block = alloca(strlen(path)+7);</div><div class='del'>-	sprintf(block, "%s.index", path);</div><div class='del'>-	blocks = camel_block_file_new(block, O_RDONLY, CAMEL_TEXT_INDEX_VERSION, CAMEL_BLOCK_SIZE);</div><div class='del'>-	if (blocks == NULL) {</div><div class='del'>-		io(printf("Check failed: No block file: %s\n", strerror(errno)));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	key = alloca(strlen(path)+12);</div><div class='del'>-	sprintf(key, "%s.index.data", path);</div><div class='del'>-	keys = camel_key_file_new(key, O_RDONLY, CAMEL_TEXT_INDEX_KEY_VERSION);</div><div class='del'>-	if (keys == NULL) {</div><div class='del'>-		io(printf("Check failed: No key file: %s\n", strerror(errno)));</div><div class='del'>-		camel_object_unref((CamelObject *)blocks);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)keys);</div><div class='del'>-	camel_object_unref((CamelObject *)blocks);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_text_index_rename(const char *old, const char *new)</div><div class='del'>-{</div><div class='del'>-	char *oldname, *newname;</div><div class='del'>-	int err;</div><div class='del'>-</div><div class='del'>-	/* TODO: camel_text_index_rename should find out if we have an active index and use that instead */</div><div class='del'>-</div><div class='del'>-	oldname = alloca(strlen(old)+12);</div><div class='del'>-	newname = alloca(strlen(new)+12);</div><div class='del'>-	sprintf(oldname, "%s.index", old);</div><div class='del'>-	sprintf(newname, "%s.index", new);</div><div class='del'>-</div><div class='del'>-	if (rename(oldname, newname) == -1 &amp;&amp; errno != ENOENT)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	sprintf(oldname, "%s.index.data", old);</div><div class='del'>-	sprintf(newname, "%s.index.data", new);</div><div class='del'>-</div><div class='del'>-	if (rename(oldname, newname) == -1 &amp;&amp; errno != ENOENT) {</div><div class='del'>-		err = errno;</div><div class='del'>-		sprintf(oldname, "%s.index", old);</div><div class='del'>-		sprintf(newname, "%s.index", new);</div><div class='del'>-		rename(newname, oldname);</div><div class='del'>-		errno = err;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_text_index_remove(const char *old)</div><div class='del'>-{</div><div class='del'>-	char *block, *key;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	/* TODO: needs to poke any active indices to remain unlinked */</div><div class='del'>-</div><div class='del'>-	block = alloca(strlen(old)+12);</div><div class='del'>-	key = alloca(strlen(old)+12);</div><div class='del'>-	sprintf(block, "%s.index", old);</div><div class='del'>-	sprintf(key, "%s.index.data", old);</div><div class='del'>-</div><div class='del'>-	if (unlink(block) == -1 &amp;&amp; errno != ENOENT)</div><div class='del'>-		ret = -1;</div><div class='del'>-	if (unlink(key) == -1 &amp;&amp; errno != ENOENT)</div><div class='del'>-		ret = -1;</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Debug */</div><div class='del'>-void</div><div class='del'>-camel_text_index_info(CamelTextIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	struct _CamelTextIndexRoot *rb = (struct _CamelTextIndexRoot *)p-&gt;blocks-&gt;root;</div><div class='del'>-	int frag;</div><div class='del'>-</div><div class='del'>-	printf("Path: '%s'\n", idx-&gt;parent.path);</div><div class='del'>-	printf("Version: %d\n", idx-&gt;parent.version);</div><div class='del'>-	printf("Flags: %08x\n", idx-&gt;parent.flags);</div><div class='del'>-	printf("Total words: %d\n", rb-&gt;words);</div><div class='del'>-	printf("Total names: %d\n", rb-&gt;names);</div><div class='del'>-	printf("Total deleted: %d\n", rb-&gt;deleted);</div><div class='del'>-	printf("Total key blocks: %d\n", rb-&gt;keys);</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;words &gt; 0) {</div><div class='del'>-		frag = ((rb-&gt;keys - rb-&gt;words) * 100)/ rb-&gt;words;</div><div class='del'>-		printf("Word fragmentation: %d%%\n", frag);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rb-&gt;names &gt; 0) {</div><div class='del'>-		frag = (rb-&gt;deleted * 100)/ rb-&gt;names;</div><div class='del'>-		printf("Name fragmentation: %d%%\n", frag);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* #define DUMP_RAW */</div><div class='del'>-</div><div class='del'>-#ifdef DUMP_RAW</div><div class='del'>-enum { KEY_ROOT = 1, KEY_DATA = 2, PARTITION_MAP = 4, PARTITION_DATA = 8 };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_type(GHashTable *map, camel_block_t id, int type)</div><div class='del'>-{</div><div class='del'>-	camel_block_t old;</div><div class='del'>-</div><div class='del'>-	old = g_hash_table_lookup(map, id);</div><div class='del'>-	if (old == type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (old != 0 &amp;&amp; old != type)</div><div class='del'>-		g_warning("block %x redefined as type %d, already type %d\n", id, type, old);</div><div class='del'>-	g_hash_table_insert(map, id, type|old);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_partition(GHashTable *map, CamelBlockFile *blocks, camel_block_t id)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *bl;</div><div class='del'>-	CamelPartitionMapBlock *pm;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	while (id) {</div><div class='del'>-		add_type(map, id, PARTITION_MAP);</div><div class='del'>-		bl = camel_block_file_get_block(blocks, id);</div><div class='del'>-		if (bl == NULL) {</div><div class='del'>-			g_warning("couldn't get parition: %x\n", id);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pm = (CamelPartitionMapBlock *)&amp;bl-&gt;data;</div><div class='del'>-		if (pm-&gt;used &gt; sizeof(pm-&gt;partition)/sizeof(pm-&gt;partition[0])) {</div><div class='del'>-			g_warning("Partition block %x invalid\n", id);</div><div class='del'>-			camel_block_file_unref_block(blocks, bl);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;pm-&gt;used;i++)</div><div class='del'>-			add_type(map, pm-&gt;partition[i].blockid, PARTITION_DATA);</div><div class='del'>-</div><div class='del'>-		id = pm-&gt;next;</div><div class='del'>-		camel_block_file_unref_block(blocks, bl);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_keys(GHashTable *map, CamelBlockFile *blocks, camel_block_t id)</div><div class='del'>-{</div><div class='del'>-	CamelBlock *rbl, *bl;</div><div class='del'>-	CamelKeyRootBlock *root;</div><div class='del'>-	CamelKeyBlock *kb;</div><div class='del'>-</div><div class='del'>-	add_type(map, id, KEY_ROOT);</div><div class='del'>-	rbl = camel_block_file_get_block(blocks, id);</div><div class='del'>-	if (rbl == NULL) {</div><div class='del'>-		g_warning("couldn't get key root: %x\n", id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	root = (CamelKeyRootBlock *)&amp;rbl-&gt;data;</div><div class='del'>-	id = root-&gt;first;</div><div class='del'>-</div><div class='del'>-	while (id) {</div><div class='del'>-		add_type(map, id, KEY_DATA);</div><div class='del'>-		bl = camel_block_file_get_block(blocks, id);</div><div class='del'>-		if (bl == NULL) {</div><div class='del'>-			g_warning("couldn't get key: %x\n", id);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		kb = (CamelKeyBlock *)&amp;bl-&gt;data;</div><div class='del'>-		id = kb-&gt;next;</div><div class='del'>-		camel_block_file_unref_block(blocks, bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_block_file_unref_block(blocks, rbl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_raw(GHashTable *map, char *path)</div><div class='del'>-{</div><div class='del'>-	char buf[1024];</div><div class='del'>-	char line[256];</div><div class='del'>-	char *p, c, *e, *a, *o;</div><div class='del'>-	int v, n, len, i, type;</div><div class='del'>-	char hex[16] = "0123456789ABCDEF";</div><div class='del'>-	int fd;</div><div class='del'>-	camel_block_t id, total;</div><div class='del'>-</div><div class='del'>-	fd = open(path, O_RDONLY);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	total = 0;</div><div class='del'>-	while ((len = read(fd, buf, 1024)) == 1024) {</div><div class='del'>-		id = total;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		type = g_hash_table_lookup(map, id);</div><div class='del'>-		switch(type) {</div><div class='del'>-		case 0:</div><div class='del'>-			printf(" - unknown -\n");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printf(" - invalid -\n");</div><div class='del'>-			break;</div><div class='del'>-		case KEY_ROOT: {</div><div class='del'>-			CamelKeyRootBlock *r = (CamelKeyRootBlock *)buf;</div><div class='del'>-			printf("Key root:\n");</div><div class='del'>-			printf("First: %08x     Last: %08x     Free: %08x\n", r-&gt;first, r-&gt;last, r-&gt;free);</div><div class='del'>-		} break;</div><div class='del'>-		case KEY_DATA: {</div><div class='del'>-			CamelKeyBlock *k = (CamelKeyBlock *)buf;</div><div class='del'>-			printf("Key data:\n");</div><div class='del'>-			printf("Next: %08x      Used: %u\n", k-&gt;next, k-&gt;used);</div><div class='del'>-			for (i=0;i&lt;k-&gt;used;i++) {</div><div class='del'>-				if (i == 0)</div><div class='del'>-					len = sizeof(k-&gt;u.keydata);</div><div class='del'>-				else</div><div class='del'>-					len = k-&gt;u.keys[i-1].offset;</div><div class='del'>-				len -= k-&gt;u.keys[i].offset;</div><div class='del'>-				printf("[%03d]: %08x %5d %06x %3d '%.*s'\n", i,</div><div class='del'>-				       k-&gt;u.keys[i].data, k-&gt;u.keys[i].offset, k-&gt;u.keys[i].flags,</div><div class='del'>-				       len, len, k-&gt;u.keydata+k-&gt;u.keys[i].offset);</div><div class='del'>-			}</div><div class='del'>-		} break;</div><div class='del'>-		case PARTITION_MAP: {</div><div class='del'>-			CamelPartitionMapBlock *m = (CamelPartitionMapBlock *)buf;</div><div class='del'>-			printf("Partition map\n");</div><div class='del'>-			printf("Next: %08x      Used: %u\n", m-&gt;next, m-&gt;used);</div><div class='del'>-			for (i=0;i&lt;m-&gt;used;i++) {</div><div class='del'>-				printf("[%03d]: %08x -&gt; %08x\n", i, m-&gt;partition[i].hashid, m-&gt;partition[i].blockid);</div><div class='del'>-			}</div><div class='del'>-		} break;</div><div class='del'>-		case PARTITION_DATA: {</div><div class='del'>-			CamelPartitionKeyBlock *k = (CamelPartitionKeyBlock *)buf;</div><div class='del'>-			printf("Partition data\n");</div><div class='del'>-			printf("Used: %u\n", k-&gt;used);</div><div class='del'>-		} break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		printf("--raw--\n");</div><div class='del'>-</div><div class='del'>-		len = 1024;</div><div class='del'>-		p = buf;</div><div class='del'>-		do {</div><div class='del'>-			sprintf(line, "%08x:                                                                      ", total);</div><div class='del'>-			total += 16;</div><div class='del'>-			o = line+10;</div><div class='del'>-			a = o+16*2+2;</div><div class='del'>-			i = 0;</div><div class='del'>-			while (len &amp;&amp; i&lt;16) {</div><div class='del'>-				c = *p++;</div><div class='del'>-				*a++ = isprint(c)?c:'.';</div><div class='del'>-				*o++ = hex[(c&gt;&gt;4)&amp;0x0f];</div><div class='del'>-				*o++ = hex[c&amp;0x0f];</div><div class='del'>-				i++;</div><div class='del'>-				if (i==8)</div><div class='del'>-					*o++ = ' ';</div><div class='del'>-				len--;</div><div class='del'>-			}</div><div class='del'>-			*a = 0;</div><div class='del'>-			printf("%s\n", line);</div><div class='del'>-		} while (len);</div><div class='del'>-		printf("\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Debug */</div><div class='del'>-void</div><div class='del'>-camel_text_index_dump(CamelTextIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-#ifndef DUMP_RAW</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	char *word;</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	camel_block_t data;</div><div class='del'>-</div><div class='del'>-	/* Iterate over all names in the file first */</div><div class='del'>-</div><div class='del'>-	printf("UID's in index\n");</div><div class='del'>-</div><div class='del'>-	keyid = 0;</div><div class='del'>-	while ( (keyid = camel_key_table_next(p-&gt;name_index, keyid, &amp;word, &amp;flags, &amp;data)) ) {</div><div class='del'>-		if ((flags &amp; 1) == 0)</div><div class='del'>-			printf(" %s\n", word);</div><div class='del'>-		else</div><div class='del'>-			printf(" %s (deleted)\n", word);</div><div class='del'>-		g_free(word);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Word's in index\n");</div><div class='del'>-</div><div class='del'>-	keyid = 0;</div><div class='del'>-	while ( (keyid = camel_key_table_next(p-&gt;word_index, keyid, &amp;word, &amp;flags, &amp;data)) ) {</div><div class='del'>-		CamelIndexCursor *idc;</div><div class='del'>-</div><div class='del'>-		printf("Word: '%s':\n", word);</div><div class='del'>-		</div><div class='del'>-		idc = camel_index_find((CamelIndex *)idx, word);</div><div class='del'>-		while ( (name = camel_index_cursor_next(idc)) ) {</div><div class='del'>-			printf(" %s", name);</div><div class='del'>-		}</div><div class='del'>-		printf("\n");</div><div class='del'>-		camel_object_unref((CamelObject *)idc);</div><div class='del'>-		g_free(word);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	/* a more low-level dump routine */</div><div class='del'>-	GHashTable *block_type = g_hash_table_new(NULL, NULL);</div><div class='del'>-	camel_block_t id;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int type;</div><div class='del'>-</div><div class='del'>-	add_keys(block_type, p-&gt;blocks, p-&gt;word_index-&gt;rootid);</div><div class='del'>-	add_keys(block_type, p-&gt;blocks, p-&gt;name_index-&gt;rootid);</div><div class='del'>-</div><div class='del'>-	add_partition(block_type, p-&gt;blocks, p-&gt;word_hash-&gt;rootid);</div><div class='del'>-	add_partition(block_type, p-&gt;blocks, p-&gt;name_hash-&gt;rootid);</div><div class='del'>-</div><div class='del'>-	dump_raw(block_type, p-&gt;blocks-&gt;path);</div><div class='del'>-	g_hash_table_destroy(block_type);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* more debug stuff */</div><div class='del'>-void</div><div class='del'>-camel_text_index_validate(CamelTextIndex *idx)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexPrivate *p = CTI_PRIVATE(idx);</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	char *word;</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int flags;</div><div class='del'>-	camel_block_t data;</div><div class='del'>-	char *oldword;</div><div class='del'>-	camel_key_t *records;</div><div class='del'>-	size_t count;</div><div class='del'>-</div><div class='del'>-	GHashTable *names, *deleted, *words, *keys, *name_word, *word_word;</div><div class='del'>-</div><div class='del'>-	names = g_hash_table_new(NULL, NULL);</div><div class='del'>-	deleted = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	name_word = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	words = g_hash_table_new(NULL, NULL);</div><div class='del'>-	keys = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	word_word = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* Iterate over all names in the file first */</div><div class='del'>-</div><div class='del'>-	printf("Checking UID consistency\n");</div><div class='del'>-</div><div class='del'>-	keyid = 0;</div><div class='del'>-	while ( (keyid = camel_key_table_next(p-&gt;name_index, keyid, &amp;word, &amp;flags, &amp;data)) ) {</div><div class='del'>-		if ((oldword = g_hash_table_lookup(names, (void *)keyid)) != NULL</div><div class='del'>-		    || (oldword = g_hash_table_lookup(deleted, (void *)keyid)) != NULL) {</div><div class='del'>-			printf("Warning, name '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);</div><div class='del'>-			g_free(word);</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(name_word, word, (void *)1);</div><div class='del'>-			if ((flags &amp; 1) == 0) {</div><div class='del'>-				g_hash_table_insert(names, (void *)keyid, word);</div><div class='del'>-			} else {</div><div class='del'>-				g_hash_table_insert(deleted, (void *)keyid, word);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Checking WORD member consistency\n");</div><div class='del'>-</div><div class='del'>-	keyid = 0;</div><div class='del'>-	while ( (keyid = camel_key_table_next(p-&gt;word_index, keyid, &amp;word, &amp;flags, &amp;data)) ) {</div><div class='del'>-		CamelIndexCursor *idc;</div><div class='del'>-		GHashTable *used;</div><div class='del'>-</div><div class='del'>-		/* first, check for duplicates of keyid, and data */</div><div class='del'>-		if ((oldword = g_hash_table_lookup(words, (void *)keyid)) != NULL) {</div><div class='del'>-			printf("Warning, word '%s' duplicates key (%x) with name '%s'\n", word, keyid, oldword);</div><div class='del'>-			g_free(word);</div><div class='del'>-			word = oldword;</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(words, (void *)keyid, word);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (data == 0) {</div><div class='del'>-			/* This may not be an issue if things have been removed over time,</div><div class='del'>-			   though it is a problem if its a fresh index */</div><div class='del'>-			printf("Word '%s' has no data associated with it\n", word);</div><div class='del'>-		} else {</div><div class='del'>-			if ((oldword = g_hash_table_lookup(keys, (void *)data)) != NULL) {</div><div class='del'>-				printf("Warning, word '%s' duplicates data (%x) with name '%s'\n", word, data, oldword);</div><div class='del'>-			} else {</div><div class='del'>-				g_hash_table_insert(keys, (void *)data, word);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if ((oldword = g_hash_table_lookup(word_word, word)) != NULL) {</div><div class='del'>-			printf("Warning, word '%s' occurs more than once\n", word);</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(word_word, word, word);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		used = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-		idc = camel_index_find((CamelIndex *)idx, word);</div><div class='del'>-		while ( (name = camel_index_cursor_next(idc)) ) {</div><div class='del'>-			if (g_hash_table_lookup(name_word, name) == NULL) {</div><div class='del'>-				printf("word '%s' references non-existant name '%s'\n", word, name);</div><div class='del'>-			}</div><div class='del'>-			if (g_hash_table_lookup(used, name) != NULL) {</div><div class='del'>-				printf("word '%s' uses word '%s' more than once\n", word, name);</div><div class='del'>-			} else {</div><div class='del'>-				g_hash_table_insert(used, g_strdup(name), (void *)1);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref((CamelObject *)idc);</div><div class='del'>-</div><div class='del'>-		g_hash_table_foreach(used, (GHFunc)g_free, NULL);</div><div class='del'>-		g_hash_table_destroy(used);</div><div class='del'>-</div><div class='del'>-		printf("word '%s'\n", word);</div><div class='del'>-</div><div class='del'>-		while (data) {</div><div class='del'>-			printf(" data %x ", data);</div><div class='del'>-			if (camel_key_file_read(p-&gt;links, &amp;data, &amp;count, &amp;records) == -1) {</div><div class='del'>-				printf("Warning, read failed for word '%s', at data '%d'\n", word, data);</div><div class='del'>-				data = 0;</div><div class='del'>-			} else {</div><div class='del'>-				printf("(%d)\n", count);</div><div class='del'>-				g_free(records);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(names);</div><div class='del'>-	g_hash_table_destroy(deleted);</div><div class='del'>-	g_hash_table_destroy(words);</div><div class='del'>-	g_hash_table_destroy(keys);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(name_word, (GHFunc)g_free, NULL);</div><div class='del'>-	g_hash_table_destroy(name_word);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(word_word, (GHFunc)g_free, NULL);</div><div class='del'>-	g_hash_table_destroy(word_word);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelTextIndexName */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelIndexNameClass *camel_text_index_name_parent;</div><div class='del'>-</div><div class='del'>-#define CIN_CLASS(o) ((CamelTextIndexNameClass *)(((CamelObject *)o)-&gt;classfuncs))</div><div class='del'>-#define CIN_PRIVATE(o) (((CamelTextIndexName *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-text_index_name_add_word(CamelIndexName *idn, const char *word)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexNamePrivate *p = ((CamelTextIndexName *)idn)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup(idn-&gt;words, word) == NULL) {</div><div class='del'>-		char *w = e_mempool_strdup(p-&gt;pool, word);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert(idn-&gt;words, w, w);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Why?</div><div class='del'>-   Because it doesn't hang/loop forever on bad data</div><div class='del'>-   Used to clean up utf8 before it gets further */</div><div class='del'>-</div><div class='del'>-static __inline__ guint32</div><div class='del'>-camel_utf8_next(const unsigned char **ptr, const unsigned char *ptrend)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *p = (unsigned char *)*ptr;</div><div class='del'>-	register unsigned int c;</div><div class='del'>-	register guint32 v;</div><div class='del'>-	int l;</div><div class='del'>-</div><div class='del'>-	if (p == ptrend)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	while ( (c = *p++) ) {</div><div class='del'>-		if (c &lt; 0x80) {</div><div class='del'>-			*ptr = p;</div><div class='del'>-			return c;</div><div class='del'>-		} else if ((c&amp;0xe0) == 0xc0) {</div><div class='del'>-			v = c &amp; 0x1f;</div><div class='del'>-			l = 1;</div><div class='del'>-		} else if ((c&amp;0xf0) == 0xe0) {</div><div class='del'>-			v = c &amp; 0x0f;</div><div class='del'>-			l = 2;</div><div class='del'>-		} else if ((c&amp;0xf8) == 0xf0) {</div><div class='del'>-			v = c &amp; 0x07;</div><div class='del'>-			l = 3;</div><div class='del'>-		} else if ((c&amp;0xfc) == 0xf8) {</div><div class='del'>-			v = c &amp; 0x03;</div><div class='del'>-			l = 4;</div><div class='del'>-		} else if ((c&amp;0xfe) == 0xfc) {</div><div class='del'>-			v = c &amp; 0x01;</div><div class='del'>-			l = 5;</div><div class='del'>-		} else</div><div class='del'>-			/* Invalid, ignore and look for next start char if room */</div><div class='del'>-			if (p == ptrend) {</div><div class='del'>-				return 0;</div><div class='del'>-			} else {</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-		/* bad data or truncated buffer */</div><div class='del'>-		if (p + l &gt; ptrend)</div><div class='del'>-			return 0;</div><div class='del'>-</div><div class='del'>-		while (l &amp;&amp; ((c = *p) &amp; 0xc0) == 0x80) {</div><div class='del'>-			p++;</div><div class='del'>-			l--;</div><div class='del'>-			v = (v &lt;&lt; 6) | (c &amp; 0x3f);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* valid char */</div><div class='del'>-		if (l == 0) {</div><div class='del'>-			*ptr = p;</div><div class='del'>-			return v;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* else look for a start char again */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static size_t</div><div class='del'>-text_index_name_add_buffer(CamelIndexName *idn, const char *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);</div><div class='del'>-	const unsigned char *ptr, *ptrend;</div><div class='del'>-	guint32 c;</div><div class='del'>-	unsigned char utf8[8];</div><div class='del'>-	size_t utf8len;</div><div class='del'>-</div><div class='del'>-	if (buffer == NULL) {</div><div class='del'>-		if (p-&gt;buffer-&gt;len) {</div><div class='del'>-			camel_index_name_add_word(idn, p-&gt;buffer-&gt;str);</div><div class='del'>-			g_string_truncate(p-&gt;buffer, 0);</div><div class='del'>-		}</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ptr = buffer;</div><div class='del'>-	ptrend = buffer+len;</div><div class='del'>-	while ((c = camel_utf8_next(&amp;ptr, ptrend))) {</div><div class='del'>-		if (g_unichar_isalnum(c)) {</div><div class='del'>-			c = g_unichar_tolower(c);</div><div class='del'>-			utf8len = g_unichar_to_utf8(c, utf8);</div><div class='del'>-			utf8[utf8len] = 0;</div><div class='del'>-			g_string_append(p-&gt;buffer, utf8);</div><div class='del'>-		} else {</div><div class='del'>-			if (p-&gt;buffer-&gt;len) {</div><div class='del'>-				text_index_name_add_word(idn, p-&gt;buffer-&gt;str);</div><div class='del'>-				/*camel_index_name_add_word(idn, p-&gt;buffer-&gt;str);*/</div><div class='del'>-				g_string_truncate(p-&gt;buffer, 0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_name_class_init(CamelTextIndexNameClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelIndexNameClass *nklass = (CamelIndexNameClass *)klass;</div><div class='del'>-</div><div class='del'>-	camel_text_index_name_parent = CAMEL_INDEX_NAME_CLASS(camel_type_get_global_classfuncs(camel_index_name_get_type()));</div><div class='del'>-</div><div class='del'>-	nklass-&gt;add_word = text_index_name_add_word;</div><div class='del'>-	nklass-&gt;add_buffer = text_index_name_add_buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_name_init(CamelTextIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexNamePrivate *p;</div><div class='del'>-</div><div class='del'>-	idn-&gt;parent.words = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	p = idn-&gt;priv = g_malloc0(sizeof(*idn-&gt;priv));</div><div class='del'>-	p-&gt;buffer = g_string_new("");</div><div class='del'>-	p-&gt;pool = e_mempool_new(256, 128, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_name_finalise(CamelTextIndexName *idn)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_destroy(idn-&gt;parent.words);</div><div class='del'>-</div><div class='del'>-	g_string_free(p-&gt;buffer, TRUE);</div><div class='del'>-	e_mempool_destroy(p-&gt;pool);</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_text_index_name_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexName",</div><div class='del'>-					   sizeof (CamelTextIndexName),</div><div class='del'>-					   sizeof (CamelTextIndexNameClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_text_index_name_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_text_index_name_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_text_index_name_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelTextIndexName *</div><div class='del'>-camel_text_index_name_new(CamelTextIndex *idx, const char *name, camel_key_t nameid)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexName *idn = (CamelTextIndexName *)camel_object_new(camel_text_index_name_get_type());</div><div class='del'>-	CamelIndexName *cin = &amp;idn-&gt;parent;</div><div class='del'>-	CamelTextIndexNamePrivate *p = CIN_PRIVATE(idn);</div><div class='del'>-</div><div class='del'>-	cin-&gt;index = (CamelIndex *)idx;</div><div class='del'>-	camel_object_ref((CamelObject *)idx);</div><div class='del'>-	cin-&gt;name = e_mempool_strdup(p-&gt;pool, name);</div><div class='del'>-	p-&gt;nameid = nameid;</div><div class='del'>-</div><div class='del'>-	return idn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelTextIndexCursor */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelIndexCursorClass *camel_text_index_cursor_parent;</div><div class='del'>-</div><div class='del'>-#define CIC_CLASS(o) ((CamelTextIndexCursorClass *)(((CamelObject *)o)-&gt;classfuncs))</div><div class='del'>-#define CIC_PRIVATE(o) (((CamelTextIndexCursor *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-text_index_cursor_next(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);</div><div class='del'>-	struct _CamelTextIndexPrivate *tip = CTI_PRIVATE(idc-&gt;index);</div><div class='del'>-	unsigned int flags;</div><div class='del'>-</div><div class='del'>-	c(printf("Going to next cursor for word with data '%08x' next %08x\n", p-&gt;first, p-&gt;next));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		while (p-&gt;record_index &gt;= p-&gt;record_count) {</div><div class='del'>-			g_free(p-&gt;records);</div><div class='del'>-			p-&gt;records = NULL;</div><div class='del'>-			p-&gt;record_index = 0;</div><div class='del'>-			p-&gt;record_count = 0;</div><div class='del'>-			if (p-&gt;next == 0)</div><div class='del'>-				return NULL;</div><div class='del'>-			if (camel_key_file_read(tip-&gt;links, &amp;p-&gt;next, &amp;p-&gt;record_count, &amp;p-&gt;records) == -1)</div><div class='del'>-				return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free(p-&gt;current);</div><div class='del'>-		camel_key_table_lookup(tip-&gt;name_index, p-&gt;records[p-&gt;record_index], &amp;p-&gt;current, &amp;flags);</div><div class='del'>-		if (flags &amp; 1) {</div><div class='del'>-			g_free(p-&gt;current);</div><div class='del'>-			p-&gt;current = NULL;</div><div class='del'>-		}		</div><div class='del'>-		p-&gt;record_index++;</div><div class='del'>-	} while (p-&gt;current == NULL);</div><div class='del'>-</div><div class='del'>-	return p-&gt;current;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-text_index_cursor_reset(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	g_free(p-&gt;records);</div><div class='del'>-	p-&gt;records = NULL;</div><div class='del'>-	g_free(p-&gt;current);</div><div class='del'>-	p-&gt;current = NULL;</div><div class='del'>-	p-&gt;record_count = 0;</div><div class='del'>-	p-&gt;record_index = 0;</div><div class='del'>-	p-&gt;next = p-&gt;first;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_cursor_class_init(CamelTextIndexCursorClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelIndexCursorClass *cklass = (CamelIndexCursorClass *)klass;</div><div class='del'>-</div><div class='del'>-	camel_text_index_cursor_parent = CAMEL_INDEX_CURSOR_CLASS(camel_type_get_global_classfuncs(camel_index_cursor_get_type()));</div><div class='del'>-</div><div class='del'>-	cklass-&gt;next = text_index_cursor_next;</div><div class='del'>-	cklass-&gt;reset = text_index_cursor_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_cursor_init(CamelTextIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	CIC_PRIVATE(idc) = g_malloc0(sizeof(struct _CamelTextIndexCursorPrivate));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_cursor_finalise(CamelTextIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	g_free(p-&gt;records);</div><div class='del'>-	g_free(p-&gt;current);</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_text_index_cursor_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexCursor",</div><div class='del'>-					   sizeof (CamelTextIndexCursor),</div><div class='del'>-					   sizeof (CamelTextIndexCursorClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_text_index_cursor_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_text_index_cursor_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_text_index_cursor_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelTextIndexCursor *</div><div class='del'>-camel_text_index_cursor_new(CamelTextIndex *idx, camel_block_t data)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexCursor *idc = (CamelTextIndexCursor *)camel_object_new(camel_text_index_cursor_get_type());</div><div class='del'>-	CamelIndexCursor *cic = &amp;idc-&gt;parent;</div><div class='del'>-	struct _CamelTextIndexCursorPrivate *p = CIC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	cic-&gt;index = (CamelIndex *)idx;</div><div class='del'>-	camel_object_ref((CamelObject *)idx);</div><div class='del'>-	p-&gt;first = data;</div><div class='del'>-	p-&gt;next = data;</div><div class='del'>-	p-&gt;record_count = 0;</div><div class='del'>-	p-&gt;record_index = 0;</div><div class='del'>-</div><div class='del'>-	return idc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-/* CamelTextIndexKeyCursor */</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-static CamelIndexCursorClass *camel_text_index_key_cursor_parent;</div><div class='del'>-</div><div class='del'>-#define CIKC_CLASS(o) ((CamelTextIndexKeyCursorClass *)(((CamelObject *)o)-&gt;classfuncs))</div><div class='del'>-#define CIKC_PRIVATE(o) (((CamelTextIndexKeyCursor *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-text_index_key_cursor_next(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	c(printf("Going to next cursor for keyid %08x\n", p-&gt;keyid));</div><div class='del'>-</div><div class='del'>-	g_free(p-&gt;current);</div><div class='del'>-	p-&gt;current = NULL;</div><div class='del'>-</div><div class='del'>-	while ( (p-&gt;keyid = camel_key_table_next(p-&gt;table, p-&gt;keyid, &amp;p-&gt;current, &amp;p-&gt;flags, &amp;p-&gt;data)) ) {</div><div class='del'>-		if ((p-&gt;flags &amp; 1) == 0) {</div><div class='del'>-			return p-&gt;current;</div><div class='del'>-		} else {</div><div class='del'>-			g_free(p-&gt;current);</div><div class='del'>-			p-&gt;current = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-text_index_key_cursor_reset(CamelIndexCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	p-&gt;keyid = 0;</div><div class='del'>-	p-&gt;flags = 0;</div><div class='del'>-	p-&gt;data = 0;</div><div class='del'>-	g_free(p-&gt;current);</div><div class='del'>-	p-&gt;current = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_key_cursor_class_init(CamelTextIndexKeyCursorClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelIndexCursorClass *cklass = (CamelIndexCursorClass *)klass;</div><div class='del'>-</div><div class='del'>-	camel_text_index_key_cursor_parent = CAMEL_INDEX_CURSOR_CLASS(camel_type_get_global_classfuncs(camel_index_cursor_get_type()));</div><div class='del'>-</div><div class='del'>-	cklass-&gt;next = text_index_key_cursor_next;</div><div class='del'>-	cklass-&gt;reset = text_index_key_cursor_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_key_cursor_init(CamelTextIndexKeyCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = idc-&gt;priv = g_malloc0(sizeof(struct _CamelTextIndexKeyCursorPrivate));</div><div class='del'>-	p-&gt;keyid = 0;</div><div class='del'>-	p-&gt;flags = 0;</div><div class='del'>-	p-&gt;data = 0;</div><div class='del'>-	p-&gt;current = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_text_index_key_cursor_finalise(CamelTextIndexKeyCursor *idc)</div><div class='del'>-{</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	g_free(p-&gt;current);</div><div class='del'>-	if (p-&gt;table)</div><div class='del'>-		camel_object_unref((CamelObject *)p-&gt;table);</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_text_index_key_cursor_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_object_get_type(), "CamelTextIndexKeyCursor",</div><div class='del'>-					   sizeof (CamelTextIndexKeyCursor),</div><div class='del'>-					   sizeof (CamelTextIndexKeyCursorClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_text_index_key_cursor_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_text_index_key_cursor_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_text_index_key_cursor_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelTextIndexKeyCursor *</div><div class='del'>-camel_text_index_key_cursor_new(CamelTextIndex *idx, CamelKeyTable *table)</div><div class='del'>-{</div><div class='del'>-	CamelTextIndexKeyCursor *idc = (CamelTextIndexKeyCursor *)camel_object_new(camel_text_index_key_cursor_get_type());</div><div class='del'>-	CamelIndexCursor *cic = &amp;idc-&gt;parent;</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *p = CIKC_PRIVATE(idc);</div><div class='del'>-</div><div class='del'>-	cic-&gt;index = (CamelIndex *)idx;</div><div class='del'>-	camel_object_ref((CamelObject *)idx);</div><div class='del'>-	p-&gt;table = table;</div><div class='del'>-	camel_object_ref((CamelObject *)table);</div><div class='del'>-</div><div class='del'>-	return idc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-#define m(x)</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-struct _CamelIndexRoot {</div><div class='del'>-	struct _CamelBlockRoot root;</div><div class='del'>-</div><div class='del'>-	camel_block_t word_root; /* a keyindex containing the keyid -&gt; word mapping */</div><div class='del'>-	camel_block_t word_hash_root; /* a partitionindex containing word -&gt; keyid mapping */</div><div class='del'>-</div><div class='del'>-	camel_block_t name_root; /* same, for names */</div><div class='del'>-	camel_block_t name_hash_root;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char wordbuffer[] = "This is a buffer of multiple words.  Some of the words are duplicates"</div><div class='del'>-" while other words are the same, some are in difFerenT Different different case cAsE casE,"</div><div class='del'>-" with,with:with;with-with'with\"'\"various punctuation as well.  So much for those Words. and 10"</div><div class='del'>-" numbers in a row too 1,2,3,4,5,6,7,8,9,10!  Yay!.";</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	CamelBlockFile *bs;</div><div class='del'>-	CamelKeyTable *ki;</div><div class='del'>-	CamelPartitionTable *cpi;</div><div class='del'>-	CamelBlock *keyroot, *partroot;</div><div class='del'>-	struct _CamelIndexRoot *root;</div><div class='del'>-	FILE *fp;</div><div class='del'>-	char line[256], *key;</div><div class='del'>-	camel_key_t keyid;</div><div class='del'>-	int index = 0, flags, data;</div><div class='del'>-#endif</div><div class='del'>-	CamelIndex *idx;</div><div class='del'>-	CamelIndexName *idn;</div><div class='del'>-	CamelIndexCursor *idc;</div><div class='del'>-	const char *word;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	printf("Camel text index tester!\n");</div><div class='del'>-</div><div class='del'>-	g_thread_init(NULL);</div><div class='del'>-	camel_init(NULL, 0);</div><div class='del'>-</div><div class='del'>-	idx = (CamelIndex *)camel_text_index_new("textindex", O_CREAT|O_RDWR|O_TRUNC);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-	camel_index_compress(idx);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;100;i++) {</div><div class='del'>-		char name[16];</div><div class='del'>-</div><div class='del'>-		sprintf(name, "%d", i);</div><div class='del'>-		printf("Adding words to name '%s'\n", name);</div><div class='del'>-		idn = camel_index_add_name(idx, name);</div><div class='del'>-		camel_index_name_add_buffer(idn, wordbuffer, sizeof(wordbuffer)-1);</div><div class='del'>-		camel_index_write_name(idx, idn);</div><div class='del'>-		camel_object_unref((CamelObject *)idn);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Looking up which names contain word 'word'\n");</div><div class='del'>-	idc = camel_index_find(idx, "words");</div><div class='del'>-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {</div><div class='del'>-		printf(" name is '%s'\n", word);</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)idc);</div><div class='del'>-	printf("done.\n");</div><div class='del'>-</div><div class='del'>-	printf("Looking up which names contain word 'truncate'\n");</div><div class='del'>-	idc = camel_index_find(idx, "truncate");</div><div class='del'>-	while ( (word = camel_index_cursor_next(idc)) != NULL ) {</div><div class='del'>-		printf(" name is '%s'\n", word);</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)idc);</div><div class='del'>-	printf("done.\n");</div><div class='del'>-</div><div class='del'>-	camel_index_sync(idx);</div><div class='del'>-	camel_object_unref((CamelObject *)idx);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	bs = camel_block_file_new("blocks", "TESTINDX", CAMEL_BLOCK_SIZE);</div><div class='del'>-</div><div class='del'>-	root = (struct _CamelIndexRoot *)bs-&gt;root;</div><div class='del'>-	if (root-&gt;word_root == 0) {</div><div class='del'>-		keyroot = camel_block_file_new_block(bs);</div><div class='del'>-		root-&gt;word_root = keyroot-&gt;id;</div><div class='del'>-		camel_block_file_touch_block(bs, bs-&gt;root_block);</div><div class='del'>-	}</div><div class='del'>-	if (root-&gt;word_hash_root == 0) {</div><div class='del'>-		partroot = camel_block_file_new_block(bs);</div><div class='del'>-		root-&gt;word_hash_root = partroot-&gt;id;</div><div class='del'>-		camel_block_file_touch_block(bs, bs-&gt;root_block);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ki = camel_key_table_new(bs, root-&gt;word_root);</div><div class='del'>-	cpi = camel_partition_table_new(bs, root-&gt;word_hash_root);</div><div class='del'>-</div><div class='del'>-	fp = fopen("/usr/dict/words", "r");</div><div class='del'>-	if (fp == NULL) {</div><div class='del'>-		perror("fopen");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (fgets(line, sizeof(line), fp) != NULL) {</div><div class='del'>-		line[strlen(line)-1] = 0;</div><div class='del'>-</div><div class='del'>-		/* see if its already there */</div><div class='del'>-		keyid = camel_partition_table_lookup(cpi, line);		</div><div class='del'>-		if (keyid == 0) {</div><div class='del'>-			m(printf("Adding word '%s' %d\n", line, index));</div><div class='del'>-</div><div class='del'>-			keyid = camel_key_table_add(ki, line, index, 0);</div><div class='del'>-			m(printf(" key = %08x\n", keyid));</div><div class='del'>-</div><div class='del'>-			camel_partition_table_add(cpi, line, keyid);</div><div class='del'>-</div><div class='del'>-			m(printf("Lookup word '%s'\n", line));</div><div class='del'>-			keyid = camel_partition_table_lookup(cpi, line);		</div><div class='del'>-			m(printf(" key = %08x\n", keyid));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		m(printf("Lookup key %08x\n", keyid));</div><div class='del'>-</div><div class='del'>-		camel_key_table_set_flags(ki, keyid, index, 1);</div><div class='del'>-</div><div class='del'>-		data = camel_key_table_lookup(ki, keyid, &amp;key, &amp;flags);</div><div class='del'>-		m(printf(" word = '%s' %d %04x\n", key, data, flags));</div><div class='del'>-</div><div class='del'>-		g_assert(data == index &amp;&amp; strcmp(key, line) == 0);</div><div class='del'>-</div><div class='del'>-		g_free(key);</div><div class='del'>-</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Scanning again\n");</div><div class='del'>-	fseek(fp, SEEK_SET, 0);</div><div class='del'>-	index = 0;</div><div class='del'>-	while (fgets(line, sizeof(line), fp) != NULL) {</div><div class='del'>-		line[strlen(line)-1] = 0;</div><div class='del'>-		m(printf("Lookup word '%s' %d\n", line, index));</div><div class='del'>-		keyid = camel_partition_table_lookup(cpi, line);		</div><div class='del'>-		m(printf(" key = %08d\n", keyid));</div><div class='del'>-</div><div class='del'>-		m(printf("Lookup key %08x\n", keyid));</div><div class='del'>-		data = camel_key_table_lookup(ki, keyid, &amp;key, &amp;flags);</div><div class='del'>-		m(printf(" word = '%s' %d\n", key, data));</div><div class='del'>-</div><div class='del'>-		g_assert(data == index &amp;&amp; strcmp(key, line) == 0);</div><div class='del'>-</div><div class='del'>-		g_free(key);</div><div class='del'>-</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("Freeing partition index\n");</div><div class='del'>-	camel_partition_table_free(cpi);</div><div class='del'>-</div><div class='del'>-	printf("Syncing block file\n");</div><div class='del'>-	camel_block_file_sync(bs);</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h<br/>deleted file mode 100644<br/>index de2a5252ec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-text-index.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-text-index.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_TEXT_INDEX_H</div><div class='del'>-#define _CAMEL_TEXT_INDEX_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include "camel-index.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_TEXT_INDEX(obj)         CAMEL_CHECK_CAST (obj, camel_text_index_get_type (), CamelTextIndex)</div><div class='del'>-#define CAMEL_TEXT_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_text_index_get_type (), CamelTextIndexClass)</div><div class='del'>-#define CAMEL_IS_TEXT_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_text_index_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTextIndex      CamelTextIndex;</div><div class='del'>-typedef struct _CamelTextIndexClass CamelTextIndexClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTextIndexName      CamelTextIndexName;</div><div class='del'>-typedef struct _CamelTextIndexNameClass CamelTextIndexNameClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTextIndexCursor      CamelTextIndexCursor;</div><div class='del'>-typedef struct _CamelTextIndexCursorClass CamelTextIndexCursorClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTextIndexKeyCursor      CamelTextIndexKeyCursor;</div><div class='del'>-typedef struct _CamelTextIndexKeyCursorClass CamelTextIndexKeyCursorClass;</div><div class='del'>-</div><div class='del'>-typedef void (*CamelTextIndexFunc)(CamelTextIndex *idx, const char *word, char *buffer);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexCursor {</div><div class='del'>-	CamelIndexCursor parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelTextIndexCursorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexCursorClass {</div><div class='del'>-	CamelIndexCursorClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_text_index_cursor_get_type(void);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexKeyCursor {</div><div class='del'>-	CamelIndexCursor parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelTextIndexKeyCursorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexKeyCursorClass {</div><div class='del'>-	CamelIndexCursorClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_text_index_key_cursor_get_type(void);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexName {</div><div class='del'>-	CamelIndexName parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelTextIndexNamePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexNameClass {</div><div class='del'>-	CamelIndexNameClass parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_text_index_name_get_type(void);</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** */</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndex {</div><div class='del'>-	CamelIndex parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelTextIndexPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTextIndexClass {</div><div class='del'>-	CamelIndexClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	           camel_text_index_get_type	(void);</div><div class='del'>-CamelTextIndex    *camel_text_index_new(const char *path, int flags);</div><div class='del'>-</div><div class='del'>-/* static utility functions */</div><div class='del'>-int camel_text_index_check(const char *path);</div><div class='del'>-int camel_text_index_rename(const char *old, const char *new);</div><div class='del'>-int camel_text_index_remove(const char *old);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_TEXT_INDEX_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-transport.c b/camel/camel-transport.c<br/>deleted file mode 100644<br/>index ca241d95a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,145 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-transport.c : Abstract class for an email transport */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-transport.h"</div><div class='del'>-#include "camel-address.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-static CamelServiceClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelTransport */</div><div class='del'>-#define CT_CLASS(so) CAMEL_TRANSPORT_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_transport_class_init (CamelTransportClass *camel_transport_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class = CAMEL_OBJECT_CLASS (camel_transport_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class-&gt;setv = transport_setv;</div><div class='del'>-	camel_object_class-&gt;getv = transport_getv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_transport_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelTransport *xport = object;</div><div class='del'>-	</div><div class='del'>-	xport-&gt;priv = g_malloc0 (sizeof (struct _CamelTransportPrivate));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	xport-&gt;priv-&gt;send_lock = g_mutex_new ();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_transport_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelTransport *xport = CAMEL_TRANSPORT (object);</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free (xport-&gt;priv-&gt;send_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (xport-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_SERVICE_TYPE,</div><div class='del'>-					    "CamelTransport",</div><div class='del'>-					    sizeof (CamelTransport),</div><div class='del'>-					    sizeof (CamelTransportClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_transport_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_transport_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_transport_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-transport_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelTransport doesn't currently have anything to set */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-transport_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	/* CamelTransport doesn't currently have anything to get */</div><div class='del'>-	return CAMEL_OBJECT_CLASS (parent_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_transport_send_to:</div><div class='del'>- * @transport: the transport</div><div class='del'>- * @message: the message</div><div class='del'>- * @from: from address</div><div class='del'>- * @recipients: the recipients</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Sends the message to the given recipients, regardless of the contents</div><div class='del'>- * of @message. If the message contains a "Bcc" header, the transport</div><div class='del'>- * is responsible for stripping it.</div><div class='del'>- *</div><div class='del'>- * Return value: success or failure.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_transport_send_to (CamelTransport *transport, CamelMimeMessage *message,</div><div class='del'>-			 CamelAddress *from, CamelAddress *recipients,</div><div class='del'>-			 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gboolean sent;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_TRANSPORT (transport), FALSE);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), FALSE);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_ADDRESS (from), FALSE);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_ADDRESS (recipients), FALSE);</div><div class='del'>-	</div><div class='del'>-	CAMEL_TRANSPORT_LOCK (transport, send_lock);</div><div class='del'>-	sent = CT_CLASS (transport)-&gt;send_to (transport, message,</div><div class='del'>-					      from, recipients, ex);</div><div class='del'>-	CAMEL_TRANSPORT_UNLOCK (transport, send_lock);</div><div class='del'>-	</div><div class='del'>-	return sent;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-transport.h b/camel/camel-transport.h<br/>deleted file mode 100644<br/>index d2c1e5b72c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-transport.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-transport.h : Abstract class for an email transport */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_TRANSPORT_H</div><div class='del'>-#define CAMEL_TRANSPORT_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_TRANSPORT_TYPE     (camel_transport_get_type ())</div><div class='del'>-#define CAMEL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TRANSPORT_TYPE, CamelTransport))</div><div class='del'>-#define CAMEL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass))</div><div class='del'>-#define CAMEL_IS_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_TRANSPORT_ARG_FIRST  = CAMEL_SERVICE_ARG_FIRST + 100,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelTransport</div><div class='del'>-{</div><div class='del'>-	CamelService parent_object;</div><div class='del'>-	</div><div class='del'>-	struct _CamelTransportPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelServiceClass parent_class;</div><div class='del'>-</div><div class='del'>-	gboolean (*send_to) (CamelTransport *transport,</div><div class='del'>-			     CamelMimeMessage *message,</div><div class='del'>-			     CamelAddress *from, CamelAddress *recipients,</div><div class='del'>-			     CamelException *ex);</div><div class='del'>-} CamelTransportClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-gboolean camel_transport_send_to (CamelTransport *transport,</div><div class='del'>-				  CamelMimeMessage *message,</div><div class='del'>-				  CamelAddress *from,</div><div class='del'>-				  CamelAddress *recipients,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TRANSPORT_H */</div><div class='head'>diff --git a/camel/camel-types.h b/camel/camel-types.h<br/>deleted file mode 100644<br/>index 20790cd6f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_TYPES_H</div><div class='del'>-#define CAMEL_TYPES_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-typedef struct _CamelAddress CamelAddress;</div><div class='del'>-typedef struct _header_content_type CamelContentType;</div><div class='del'>-typedef struct _CamelDigestFolder CamelDigestFolder;</div><div class='del'>-typedef struct _CamelDigestStore CamelDigestStore;</div><div class='del'>-typedef struct _CamelDiscoDiary CamelDiscoDiary;</div><div class='del'>-typedef struct _CamelDiscoFolder CamelDiscoFolder;</div><div class='del'>-typedef struct _CamelDiscoStore CamelDiscoStore;</div><div class='del'>-typedef struct _CamelDataWrapper CamelDataWrapper;</div><div class='del'>-typedef struct _CamelException CamelException;</div><div class='del'>-typedef struct _CamelFilterDriver CamelFilterDriver;</div><div class='del'>-typedef struct _CamelFolder CamelFolder;</div><div class='del'>-typedef struct _CamelFolderSearch CamelFolderSearch;</div><div class='del'>-typedef struct _CamelFolderSummary CamelFolderSummary;</div><div class='del'>-typedef struct _CamelInternetAddress CamelInternetAddress;</div><div class='del'>-typedef struct _CamelMedium CamelMedium;</div><div class='del'>-typedef struct _CamelMessageContentInfo CamelMessageContentInfo;</div><div class='del'>-typedef struct _CamelMessageInfo CamelMessageInfo;</div><div class='del'>-typedef struct _CamelMimeFilter CamelMimeFilter;</div><div class='del'>-typedef struct _CamelMimeFilterBasic CamelMimeFilterBasic;</div><div class='del'>-typedef struct _CamelMimeFilterBestenc CamelMimeFilterBestenc;</div><div class='del'>-typedef struct _CamelMimeFilterCharset CamelMimeFilterCharset;</div><div class='del'>-typedef struct _CamelMimeFilterChomp CamelMimeFilterChomp;</div><div class='del'>-typedef struct _CamelMimeFilterIndex CamelMimeFilterIndex;</div><div class='del'>-typedef struct _CamelMimeFilterLinewrap CamelMimeFilterLinewrap;</div><div class='del'>-typedef struct _CamelMimeFilterSave CamelMimeFilterSave;</div><div class='del'>-typedef struct _CamelMimeFilterCRLF CamelMimeFilterCRLF;</div><div class='del'>-typedef struct _CamelMimeMessage CamelMimeMessage;</div><div class='del'>-typedef struct _CamelMimeParser CamelMimeParser;</div><div class='del'>-typedef struct _CamelMimePart CamelMimePart;</div><div class='del'>-typedef struct _CamelMultipart CamelMultipart;</div><div class='del'>-typedef struct _CamelNewsAddress CamelNewsAddress;</div><div class='del'>-typedef struct _CamelSeekableStream CamelSeekableStream;</div><div class='del'>-typedef struct _CamelSeekableSubstream CamelSeekableSubstream;</div><div class='del'>-typedef struct _CamelService CamelService;</div><div class='del'>-typedef struct _CamelSession CamelSession;</div><div class='del'>-typedef struct _CamelSimpleDataWrapper CamelSimpleDataWrapper;</div><div class='del'>-typedef struct _CamelStore CamelStore;</div><div class='del'>-typedef struct _CamelStream CamelStream;</div><div class='del'>-typedef struct _CamelStreamNull CamelStreamNull;</div><div class='del'>-typedef struct _CamelStreamBuffer CamelStreamBuffer;</div><div class='del'>-typedef struct _CamelStreamDataWrapper CamelStreamDataWrapper;</div><div class='del'>-typedef struct _CamelStreamFilter CamelStreamFilter;</div><div class='del'>-typedef struct _CamelStreamFs CamelStreamFs;</div><div class='del'>-typedef struct _CamelStreamMem CamelStreamMem;</div><div class='del'>-typedef struct _CamelTcpStream CamelTcpStream;</div><div class='del'>-typedef struct _CamelTcpStreamRaw CamelTcpStreamRaw;</div><div class='del'>-typedef struct _CamelTcpStreamSSL CamelTcpStreamSSL;</div><div class='del'>-typedef struct _CamelTcpStreamOpenSSL CamelTcpStreamOpenSSL;</div><div class='del'>-typedef struct _CamelHttpStream CamelHttpStream;</div><div class='del'>-typedef struct _CamelTransport CamelTransport;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TYPES_H */</div><div class='head'>diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c<br/>deleted file mode 100644<br/>index 933f8b68e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-uid-cache.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-uid-cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,268 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-uid-cache.c: UID caching code. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-uid-cache.h"</div><div class='del'>-</div><div class='del'>-struct _uid_state {</div><div class='del'>-	int level;</div><div class='del'>-	gboolean save;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void free_uid (gpointer key, gpointer value, gpointer data);</div><div class='del'>-static void maybe_write_uid (gpointer key, gpointer value, gpointer data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mkdir_heir (const char *path, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	char *copy, *p;</div><div class='del'>-	</div><div class='del'>-	p = copy = g_strdup (path);</div><div class='del'>-	do {</div><div class='del'>-		p = strchr (p + 1, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '\0';</div><div class='del'>-		if (access (copy, F_OK) == -1) {</div><div class='del'>-			if (mkdir (copy, mode) == -1) {</div><div class='del'>-				g_free (copy);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '/';</div><div class='del'>-	} while (p);</div><div class='del'>-	</div><div class='del'>-	g_free (copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_new:</div><div class='del'>- * @filename: path to load the cache from</div><div class='del'>- *</div><div class='del'>- * Creates a new UID cache, initialized from @filename. If @filename</div><div class='del'>- * doesn't already exist, the UID cache will be empty. Otherwise, if</div><div class='del'>- * it does exist but can't be read, the function will return %NULL.</div><div class='del'>- *</div><div class='del'>- * Return value: a new UID cache, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelUIDCache *</div><div class='del'>-camel_uid_cache_new (const char *filename)</div><div class='del'>-{</div><div class='del'>-	CamelUIDCache *cache;</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *dirname, *buf, **uids;</div><div class='del'>-	int fd, i;</div><div class='del'>-	</div><div class='del'>-	dirname = g_dirname (filename);</div><div class='del'>-	mkdir_heir (dirname, 0700);</div><div class='del'>-	g_free (dirname);</div><div class='del'>-	</div><div class='del'>-	fd = open (filename, O_RDWR | O_CREAT, 0700);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (fstat (fd, &amp;st) != 0) {</div><div class='del'>-		close (fd);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	buf = g_malloc (st.st_size + 1);</div><div class='del'>-	</div><div class='del'>-	if (read (fd, buf, st.st_size) == -1) {</div><div class='del'>-		close (fd);</div><div class='del'>-		g_free (buf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	buf[st.st_size] = '\0';</div><div class='del'>-	</div><div class='del'>-	cache = g_new (CamelUIDCache, 1);</div><div class='del'>-	cache-&gt;fd = fd;</div><div class='del'>-	cache-&gt;level = 1;</div><div class='del'>-	cache-&gt;uids = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	uids = g_strsplit (buf, "\n", 0);</div><div class='del'>-	g_free (buf);</div><div class='del'>-	for (i = 0; uids[i]; i++) {</div><div class='del'>-		struct _uid_state *state;</div><div class='del'>-		</div><div class='del'>-		state = g_new (struct _uid_state, 1);</div><div class='del'>-		state-&gt;level = cache-&gt;level;</div><div class='del'>-		state-&gt;save = TRUE;</div><div class='del'>-		</div><div class='del'>-		g_hash_table_insert (cache-&gt;uids, uids[i], state);</div><div class='del'>-	}</div><div class='del'>-	g_free (uids);</div><div class='del'>-	</div><div class='del'>-	return cache;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_save:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- *</div><div class='del'>- * Attempts to save @cache back to disk.</div><div class='del'>- *</div><div class='del'>- * Return value: success or failure</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_uid_cache_save (CamelUIDCache *cache)</div><div class='del'>-{</div><div class='del'>-	if (lseek (cache-&gt;fd, 0, SEEK_SET) != 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-	g_hash_table_foreach (cache-&gt;uids, maybe_write_uid, cache);</div><div class='del'>-	return ftruncate (cache-&gt;fd, lseek (cache-&gt;fd, 0, SEEK_CUR)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-maybe_write_uid (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelUIDCache *cache = data;</div><div class='del'>-	struct _uid_state *state = value;</div><div class='del'>-	</div><div class='del'>-	if (state &amp;&amp; state-&gt;level == cache-&gt;level &amp;&amp; state-&gt;save) {</div><div class='del'>-		write (cache-&gt;fd, key, strlen (key));</div><div class='del'>-		write (cache-&gt;fd, "\n", 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_destroy:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- *</div><div class='del'>- * Destroys @cache and frees its data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_uid_cache_destroy (CamelUIDCache *cache)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach (cache-&gt;uids, free_uid, NULL);</div><div class='del'>-	g_hash_table_destroy (cache-&gt;uids);</div><div class='del'>-	close (cache-&gt;fd);</div><div class='del'>-	g_free (cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uid (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_get_new_uids:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- * @uids: an array of UIDs</div><div class='del'>- *</div><div class='del'>- * Returns an array of UIDs from @uids that are not in @cache, and</div><div class='del'>- * removes UIDs from @cache that aren't in @uids.</div><div class='del'>- *</div><div class='del'>- * Return value: an array of new UIDs, which must be freed with</div><div class='del'>- * camel_uid_cache_free_uids().</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *new_uids;</div><div class='del'>-	gpointer old_uid;</div><div class='del'>-	char *uid;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	new_uids = g_ptr_array_new ();</div><div class='del'>-	cache-&gt;level++;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		struct _uid_state *state;</div><div class='del'>-		</div><div class='del'>-		uid = uids-&gt;pdata[i];</div><div class='del'>-		if (g_hash_table_lookup_extended (cache-&gt;uids, uid, (void **)&amp;old_uid, (void **)&amp;state)) {</div><div class='del'>-			g_hash_table_remove (cache-&gt;uids, uid);</div><div class='del'>-			g_free (old_uid);</div><div class='del'>-		} else {</div><div class='del'>-			g_ptr_array_add (new_uids, g_strdup (uid));</div><div class='del'>-			state = g_new (struct _uid_state, 1);</div><div class='del'>-			state-&gt;save = FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		state-&gt;level = cache-&gt;level;</div><div class='del'>-		g_hash_table_insert (cache-&gt;uids, g_strdup (uid), state);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return new_uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_save_uid:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- * @uid: a uid to save</div><div class='del'>- *</div><div class='del'>- * Marks a uid for saving.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_uid_cache_save_uid (CamelUIDCache *cache, const char *uid)</div><div class='del'>-{</div><div class='del'>-	struct _uid_state *state;</div><div class='del'>-	gpointer old_uid;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended (cache-&gt;uids, uid, (void **)&amp;old_uid, (void **)&amp;state)) {</div><div class='del'>-		state-&gt;save = TRUE;</div><div class='del'>-		state-&gt;level = cache-&gt;level;</div><div class='del'>-	} else {</div><div class='del'>-		state = g_new (struct _uid_state, 1);</div><div class='del'>-		state-&gt;save = TRUE;</div><div class='del'>-		state-&gt;level = cache-&gt;level;</div><div class='del'>-		</div><div class='del'>-		g_hash_table_insert (cache-&gt;uids, g_strdup (uid), state);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_free_uids:</div><div class='del'>- * @uids: an array returned from camel_uid_cache_get_new_uids()</div><div class='del'>- *</div><div class='del'>- * Frees the array of UIDs.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_uid_cache_free_uids (GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-		g_free (uids-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (uids, TRUE);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h<br/>deleted file mode 100644<br/>index e4327c9b12..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-uid-cache.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-uid-cache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-uid-cache.h: UID caching code. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_UID_CACHE_H</div><div class='del'>-#define CAMEL_UID_CACHE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int fd, level;</div><div class='del'>-	GHashTable *uids;</div><div class='del'>-} CamelUIDCache;</div><div class='del'>-</div><div class='del'>-CamelUIDCache *camel_uid_cache_new (const char *filename);</div><div class='del'>-gboolean camel_uid_cache_save (CamelUIDCache *cache);</div><div class='del'>-void camel_uid_cache_destroy (CamelUIDCache *cache);</div><div class='del'>-</div><div class='del'>-GPtrArray *camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids);</div><div class='del'>-</div><div class='del'>-void camel_uid_cache_save_uid (CamelUIDCache *cache, const char *uid);</div><div class='del'>-void camel_uid_cache_free_uids (GPtrArray *uids);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_UID_CACHE_H */</div><div class='head'>diff --git a/camel/camel-url.c b/camel/camel-url.c<br/>deleted file mode 100644<br/>index a2d4e73dac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,553 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-url.c : utility functions to parse URLs */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *  Tiago Antào &lt;tiagoantao@bigfoot.com&gt;</div><div class='del'>- *  Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999-2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-object.h"</div><div class='del'>-</div><div class='del'>-static void copy_param (GQuark key_id, gpointer data, gpointer user_data);</div><div class='del'>-static void output_param (GQuark key_id, gpointer data, gpointer user_data);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_new_with_base:</div><div class='del'>- * @base: a base URL</div><div class='del'>- * @url_string: the URL</div><div class='del'>- *</div><div class='del'>- * Parses @url_string relative to @base.</div><div class='del'>- *</div><div class='del'>- * Return value: a parsed CamelURL.</div><div class='del'>- **/</div><div class='del'>-CamelURL *</div><div class='del'>-camel_url_new_with_base (CamelURL *base, const char *url_string)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	const char *end, *hash, *colon, *semi, *at, *slash, *question;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	url = g_new0 (CamelURL, 1);</div><div class='del'>-</div><div class='del'>-	/* See RFC1808 for details. IF YOU CHANGE ANYTHING IN THIS</div><div class='del'>-	 * FUNCTION, RUN tests/misc/url AFTERWARDS.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	/* Find fragment. */</div><div class='del'>-	end = hash = strchr (url_string, '#');</div><div class='del'>-	if (hash &amp;&amp; hash[1]) {</div><div class='del'>-		url-&gt;fragment = g_strdup (hash + 1);</div><div class='del'>-		camel_url_decode (url-&gt;fragment);</div><div class='del'>-	} else</div><div class='del'>-		end = url_string + strlen (url_string);</div><div class='del'>-</div><div class='del'>-	/* Find protocol: initial [a-z+.-]* substring until ":" */</div><div class='del'>-	p = url_string;</div><div class='del'>-	while (p &lt; end &amp;&amp; (isalnum ((unsigned char)*p) ||</div><div class='del'>-			   *p == '.' || *p == '+' || *p == '-'))</div><div class='del'>-		p++;</div><div class='del'>-</div><div class='del'>-	if (p &gt; url_string &amp;&amp; *p == ':') {</div><div class='del'>-		url-&gt;protocol = g_strndup (url_string, p - url_string);</div><div class='del'>-		g_strdown (url-&gt;protocol);</div><div class='del'>-		url_string = p + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!*url_string &amp;&amp; !base)</div><div class='del'>-		return url;</div><div class='del'>-</div><div class='del'>-	/* Check for authority */</div><div class='del'>-	if (strncmp (url_string, "//", 2) == 0) {</div><div class='del'>-		url_string += 2;</div><div class='del'>-</div><div class='del'>-		slash = url_string + strcspn (url_string, "/#");</div><div class='del'>-		at = strchr (url_string, '@');</div><div class='del'>-		if (at &amp;&amp; at &lt; slash) {</div><div class='del'>-			colon = strchr (url_string, ':');</div><div class='del'>-			if (colon &amp;&amp; colon &lt; at) {</div><div class='del'>-				url-&gt;passwd = g_strndup (colon + 1,</div><div class='del'>-							 at - colon - 1);</div><div class='del'>-				camel_url_decode (url-&gt;passwd);</div><div class='del'>-			} else {</div><div class='del'>-				url-&gt;passwd = NULL;</div><div class='del'>-				colon = at;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			semi = strchr(url_string, ';');</div><div class='del'>-			if (semi &amp;&amp; semi &lt; colon &amp;&amp;</div><div class='del'>-			    !strncasecmp (semi, ";auth=", 6)) {</div><div class='del'>-				url-&gt;authmech = g_strndup (semi + 6,</div><div class='del'>-							   colon - semi - 6);</div><div class='del'>-				camel_url_decode (url-&gt;authmech);</div><div class='del'>-			} else {</div><div class='del'>-				url-&gt;authmech = NULL;</div><div class='del'>-				semi = colon;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			url-&gt;user = g_strndup (url_string, semi - url_string);</div><div class='del'>-			camel_url_decode (url-&gt;user);</div><div class='del'>-			url_string = at + 1;</div><div class='del'>-		} else</div><div class='del'>-			url-&gt;user = url-&gt;passwd = url-&gt;authmech = NULL;</div><div class='del'>-</div><div class='del'>-		/* Find host and port. */</div><div class='del'>-		colon = strchr (url_string, ':');</div><div class='del'>-		if (colon &amp;&amp; colon &lt; slash) {</div><div class='del'>-			url-&gt;host = g_strndup (url_string, colon - url_string);</div><div class='del'>-			url-&gt;port = strtoul (colon + 1, NULL, 10);</div><div class='del'>-		} else {</div><div class='del'>-			url-&gt;host = g_strndup (url_string, slash - url_string);</div><div class='del'>-			camel_url_decode (url-&gt;host);</div><div class='del'>-			url-&gt;port = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		url_string = slash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find query */</div><div class='del'>-	question = memchr (url_string, '?', end - url_string);</div><div class='del'>-	if (question) {</div><div class='del'>-		if (question[1]) {</div><div class='del'>-			url-&gt;query = g_strndup (question + 1,</div><div class='del'>-						end - (question + 1));</div><div class='del'>-			camel_url_decode (url-&gt;query);</div><div class='del'>-		}</div><div class='del'>-		end = question;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find parameters */</div><div class='del'>-	semi = memchr (url_string, ';', end - url_string);</div><div class='del'>-	if (semi) {</div><div class='del'>-		if (semi[1]) {</div><div class='del'>-			const char *cur, *p, *eq;</div><div class='del'>-			char *name, *value;</div><div class='del'>-</div><div class='del'>-			for (cur = semi + 1; cur &lt; end; cur = p + 1) {</div><div class='del'>-				p = memchr (cur, ';', end - cur);</div><div class='del'>-				if (!p)</div><div class='del'>-					p = end;</div><div class='del'>-				eq = memchr (cur, '=', p - cur);</div><div class='del'>-				if (eq) {</div><div class='del'>-					name = g_strndup (cur, eq - cur);</div><div class='del'>-					value = g_strndup (eq + 1, p - (eq + 1));</div><div class='del'>-					camel_url_decode (value);</div><div class='del'>-				} else {</div><div class='del'>-					name = g_strndup (cur, p - cur);</div><div class='del'>-					value = g_strdup ("");</div><div class='del'>-				}</div><div class='del'>-				camel_url_decode (name);</div><div class='del'>-				g_datalist_set_data_full (&amp;url-&gt;params, name,</div><div class='del'>-							  value, g_free);</div><div class='del'>-				g_free (name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		end = semi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (end != url_string) {</div><div class='del'>-		url-&gt;path = g_strndup (url_string, end - url_string);</div><div class='del'>-		camel_url_decode (url-&gt;path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Apply base URL. Again, this is spelled out in RFC 1808. */</div><div class='del'>-	if (base &amp;&amp; !url-&gt;protocol &amp;&amp; url-&gt;host)</div><div class='del'>-		url-&gt;protocol = g_strdup (base-&gt;protocol);</div><div class='del'>-	else if (base &amp;&amp; !url-&gt;protocol) {</div><div class='del'>-		if (!url-&gt;user &amp;&amp; !url-&gt;authmech &amp;&amp; !url-&gt;passwd &amp;&amp;</div><div class='del'>-		    !url-&gt;host &amp;&amp; !url-&gt;port &amp;&amp; !url-&gt;path &amp;&amp;</div><div class='del'>-		    !url-&gt;params &amp;&amp; !url-&gt;query &amp;&amp; !url-&gt;fragment)</div><div class='del'>-			url-&gt;fragment = g_strdup (base-&gt;fragment);</div><div class='del'>-</div><div class='del'>-		url-&gt;protocol = g_strdup (base-&gt;protocol);</div><div class='del'>-		url-&gt;user = g_strdup (base-&gt;user);</div><div class='del'>-		url-&gt;authmech = g_strdup (base-&gt;authmech);</div><div class='del'>-		url-&gt;passwd = g_strdup (base-&gt;passwd);</div><div class='del'>-		url-&gt;host = g_strdup (base-&gt;host);</div><div class='del'>-		url-&gt;port = base-&gt;port;</div><div class='del'>-</div><div class='del'>-		if (!url-&gt;path) {</div><div class='del'>-			url-&gt;path = g_strdup (base-&gt;path);</div><div class='del'>-			if (!url-&gt;params) {</div><div class='del'>-				g_datalist_foreach (&amp;base-&gt;params, copy_param,</div><div class='del'>-						    &amp;url-&gt;params);</div><div class='del'>-				if (!url-&gt;query)</div><div class='del'>-					url-&gt;query = g_strdup (base-&gt;query);</div><div class='del'>-			}</div><div class='del'>-		} else if (*url-&gt;path != '/') {</div><div class='del'>-			char *newpath, *last, *p, *q;</div><div class='del'>-</div><div class='del'>-			last = strrchr (base-&gt;path, '/');</div><div class='del'>-			if (last) {</div><div class='del'>-				newpath = g_strdup_printf ("%.*s/%s",</div><div class='del'>-							   last - base-&gt;path,</div><div class='del'>-							   base-&gt;path,</div><div class='del'>-							   url-&gt;path);</div><div class='del'>-			} else</div><div class='del'>-				newpath = g_strdup_printf ("/%s", url-&gt;path);</div><div class='del'>-</div><div class='del'>-			/* Remove "./" where "." is a complete segment. */</div><div class='del'>-			for (p = newpath + 1; *p; ) {</div><div class='del'>-				if (*(p - 1) == '/' &amp;&amp;</div><div class='del'>-				    *p == '.' &amp;&amp; *(p + 1) == '/')</div><div class='del'>-					memmove (p, p + 2, strlen (p + 2) + 1);</div><div class='del'>-				else</div><div class='del'>-					p++;</div><div class='del'>-			}</div><div class='del'>-			/* Remove "." at end. */</div><div class='del'>-			if (p &gt; newpath + 2 &amp;&amp;</div><div class='del'>-			    *(p - 1) == '.' &amp;&amp; *(p - 2) == '/')</div><div class='del'>-				*(p - 1) = '\0';</div><div class='del'>-			/* Remove "&lt;segment&gt;/../" where &lt;segment&gt; != ".." */</div><div class='del'>-			for (p = newpath + 1; *p; ) {</div><div class='del'>-				if (!strncmp (p, "../", 3)) {</div><div class='del'>-					p += 3;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				q = strchr (p + 1, '/');</div><div class='del'>-				if (!q)</div><div class='del'>-					break;</div><div class='del'>-				if (strncmp (q, "/../", 4) != 0) {</div><div class='del'>-					p = q + 1;</div><div class='del'>-					continue;</div><div class='del'>-				}</div><div class='del'>-				memmove (p, q + 4, strlen (q + 4) + 1);</div><div class='del'>-				p = newpath + 1;</div><div class='del'>-			}</div><div class='del'>-			/* Remove "&lt;segment&gt;/.." at end */</div><div class='del'>-			q = strrchr (newpath, '/');</div><div class='del'>-			if (q &amp;&amp; !strcmp (q, "/..")) {</div><div class='del'>-				p = q - 1;</div><div class='del'>-				while (p &gt; newpath &amp;&amp; *p != '/')</div><div class='del'>-					p--;</div><div class='del'>-				if (strncmp (p, "/../", 4) != 0)</div><div class='del'>-					*(p + 1) = 0;</div><div class='del'>-			}</div><div class='del'>-			g_free (url-&gt;path);</div><div class='del'>-			url-&gt;path = newpath;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return url;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_param (GQuark key_id, gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GData **copy = user_data;</div><div class='del'>-</div><div class='del'>-	g_datalist_id_set_data_full (copy, key_id, g_strdup (data), g_free);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_new:</div><div class='del'>- * @url_string: a URL</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Parses an absolute URL.</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelURL, or %NULL.</div><div class='del'>- **/</div><div class='del'>-CamelURL *</div><div class='del'>-camel_url_new (const char *url_string, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = camel_url_new_with_base (NULL, url_string);</div><div class='del'>-</div><div class='del'>-	if (!url-&gt;protocol) {</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-				      _("Could not parse URL `%s'"),</div><div class='del'>-				      url_string);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return url;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_to_string:</div><div class='del'>- * @url: a CamelURL</div><div class='del'>- * @flags: additional translation options.</div><div class='del'>- *</div><div class='del'>- * Return value: a string representing @url, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_url_to_string (CamelURL *url, guint32 flags)</div><div class='del'>-{</div><div class='del'>-	GString *str;</div><div class='del'>-	char *enc, *return_result;</div><div class='del'>-</div><div class='del'>-	/* IF YOU CHANGE ANYTHING IN THIS FUNCTION, RUN</div><div class='del'>-	 * tests/misc/url AFTERWARD.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	str = g_string_sized_new (20);</div><div class='del'>-</div><div class='del'>-	if (url-&gt;protocol)</div><div class='del'>-		g_string_sprintfa (str, "%s:", url-&gt;protocol);</div><div class='del'>-	if (url-&gt;host) {</div><div class='del'>-		g_string_append (str, "//");</div><div class='del'>-		if (url-&gt;user) {</div><div class='del'>-			enc = camel_url_encode (url-&gt;user, TRUE, ":;@/");</div><div class='del'>-			g_string_append (str, enc);</div><div class='del'>-			g_free (enc);</div><div class='del'>-		}</div><div class='del'>-		if (url-&gt;authmech &amp;&amp; *url-&gt;authmech) {</div><div class='del'>-			enc = camel_url_encode (url-&gt;authmech, TRUE, ":@/");</div><div class='del'>-			g_string_sprintfa (str, ";auth=%s", enc);</div><div class='del'>-			g_free (enc);</div><div class='del'>-		}</div><div class='del'>-		if (url-&gt;passwd &amp;&amp; !(flags &amp; CAMEL_URL_HIDE_PASSWORD)) {</div><div class='del'>-			enc = camel_url_encode (url-&gt;passwd, TRUE, "@/");</div><div class='del'>-			g_string_sprintfa (str, ":%s", enc);</div><div class='del'>-			g_free (enc);</div><div class='del'>-		}</div><div class='del'>-		if (url-&gt;host) {</div><div class='del'>-			enc = camel_url_encode (url-&gt;host, TRUE, ":/");</div><div class='del'>-			g_string_sprintfa (str, "%s%s", url-&gt;user ? "@" : "", enc);</div><div class='del'>-			g_free (enc);</div><div class='del'>-		}</div><div class='del'>-		if (url-&gt;port)</div><div class='del'>-			g_string_sprintfa (str, ":%d", url-&gt;port);</div><div class='del'>-		if (!url-&gt;path &amp;&amp; (url-&gt;params || url-&gt;query || url-&gt;fragment))</div><div class='del'>-			g_string_append_c (str, '/');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (url-&gt;path) {</div><div class='del'>-		enc = camel_url_encode (url-&gt;path, FALSE, ";?#");</div><div class='del'>-		g_string_sprintfa (str, "%s", enc);</div><div class='del'>-		g_free (enc);</div><div class='del'>-	}</div><div class='del'>-	if (url-&gt;params &amp;&amp; !(flags &amp; CAMEL_URL_HIDE_PARAMS))</div><div class='del'>-		g_datalist_foreach (&amp;url-&gt;params, output_param, str);</div><div class='del'>-	if (url-&gt;query) {</div><div class='del'>-		enc = camel_url_encode (url-&gt;query, FALSE, "#");</div><div class='del'>-		g_string_sprintfa (str, "?%s", enc);</div><div class='del'>-		g_free (enc);</div><div class='del'>-	}</div><div class='del'>-	if (url-&gt;fragment) {</div><div class='del'>-		enc = camel_url_encode (url-&gt;fragment, FALSE, NULL);</div><div class='del'>-		g_string_sprintfa (str, "#%s", enc);</div><div class='del'>-		g_free (enc);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return_result = str-&gt;str;</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-	return return_result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-output_param (GQuark key_id, gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GString *str = user_data;</div><div class='del'>-	char *enc;</div><div class='del'>-</div><div class='del'>-	enc = camel_url_encode (g_quark_to_string (key_id), FALSE, "?#");</div><div class='del'>-	g_string_sprintfa (str, ";%s", enc);</div><div class='del'>-	g_free (enc);</div><div class='del'>-	if (*(char *)data) {</div><div class='del'>-		enc = camel_url_encode (data, FALSE, "?#");</div><div class='del'>-		g_string_sprintfa (str, "=%s", enc);</div><div class='del'>-		g_free (enc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_free:</div><div class='del'>- * @url: a CamelURL</div><div class='del'>- *</div><div class='del'>- * Frees @url</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_url_free (CamelURL *url)</div><div class='del'>-{</div><div class='del'>-	if (url) {</div><div class='del'>-		g_free (url-&gt;protocol);</div><div class='del'>-		g_free (url-&gt;user);</div><div class='del'>-		g_free (url-&gt;authmech);</div><div class='del'>-		g_free (url-&gt;passwd);</div><div class='del'>-		g_free (url-&gt;host);</div><div class='del'>-		g_free (url-&gt;path);</div><div class='del'>-		g_datalist_clear (&amp;url-&gt;params);</div><div class='del'>-		g_free (url-&gt;query);</div><div class='del'>-		g_free (url-&gt;fragment);</div><div class='del'>-		</div><div class='del'>-		g_free (url);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DEFINE_CAMEL_URL_SET(part)			\</div><div class='del'>-void							\</div><div class='del'>-camel_url_set_##part (CamelURL *url, const char *part)	\</div><div class='del'>-{							\</div><div class='del'>-	g_free (url-&gt;part);				\</div><div class='del'>-	url-&gt;part = g_strdup (part);			\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-DEFINE_CAMEL_URL_SET (protocol)</div><div class='del'>-DEFINE_CAMEL_URL_SET (user)</div><div class='del'>-DEFINE_CAMEL_URL_SET (authmech)</div><div class='del'>-DEFINE_CAMEL_URL_SET (passwd)</div><div class='del'>-DEFINE_CAMEL_URL_SET (host)</div><div class='del'>-DEFINE_CAMEL_URL_SET (path)</div><div class='del'>-DEFINE_CAMEL_URL_SET (query)</div><div class='del'>-DEFINE_CAMEL_URL_SET (fragment)</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_url_set_port (CamelURL *url, int port)</div><div class='del'>-{</div><div class='del'>-	url-&gt;port = port;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_url_set_param (CamelURL *url, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_datalist_set_data_full (&amp;url-&gt;params, name, value ? g_strdup (value) : NULL, g_free);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_url_get_param (CamelURL *url, const char *name)</div><div class='del'>-{</div><div class='del'>-	return g_datalist_get_data (&amp;url-&gt;params, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_encode:</div><div class='del'>- * @part: a URL part</div><div class='del'>- * @escape_unsafe: whether or not to %-escape "unsafe" characters.</div><div class='del'>- * ("%#&lt;&gt;{}|\^~[]`)</div><div class='del'>- * @escape_extra: additional characters to escape.</div><div class='del'>- *</div><div class='del'>- * This %-encodes the given URL part and returns the escaped version</div><div class='del'>- * in allocated memory, which the caller must free when it is done.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_url_encode (const char *part, gboolean escape_unsafe,</div><div class='del'>-		  const char *escape_extra)</div><div class='del'>-{</div><div class='del'>-	char *work, *p;</div><div class='del'>-</div><div class='del'>-	/* worst case scenario = 3 times the initial */</div><div class='del'>-	p = work = g_malloc (3 * strlen (part) + 1);</div><div class='del'>-</div><div class='del'>-	while (*part) {</div><div class='del'>-		if (((guchar) *part &gt;= 127) || ((guchar) *part &lt;= ' ') ||</div><div class='del'>-		    (escape_unsafe &amp;&amp; strchr ("\"%#&lt;&gt;{}|\\^~[]`", *part)) ||</div><div class='del'>-		    (escape_extra &amp;&amp; strchr (escape_extra, *part))) {</div><div class='del'>-			sprintf (p, "%%%.02hX", (guchar) *part++);</div><div class='del'>-			p += 3;</div><div class='del'>-		} else</div><div class='del'>-			*p++ = *part++;</div><div class='del'>-	}</div><div class='del'>-	*p = '\0';</div><div class='del'>-</div><div class='del'>-	return work;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_url_decode:</div><div class='del'>- * @part: a URL part</div><div class='del'>- *</div><div class='del'>- * %-decodes the passed-in URL *in place*. The decoded version is</div><div class='del'>- * never longer than the encoded version, so there does not need to</div><div class='del'>- * be any additional space at the end of the string.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-camel_url_decode (char *part)</div><div class='del'>-{</div><div class='del'>-	guchar *s, *d;</div><div class='del'>-</div><div class='del'>-	s = d = (guchar *)part;</div><div class='del'>-	while (*s) {</div><div class='del'>-		if (*s == '%') {</div><div class='del'>-			if (isxdigit (s[1]) &amp;&amp; isxdigit (s[2])) {</div><div class='del'>-				*d++ = HEXVAL (s[1]) * 16 + HEXVAL (s[2]);</div><div class='del'>-				s += 3;</div><div class='del'>-			} else</div><div class='del'>-				*d++ = *s++;</div><div class='del'>-		} else</div><div class='del'>-			*d++ = *s++;</div><div class='del'>-	}</div><div class='del'>-	*d = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-camel_url_hash (const void *v)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u = v;</div><div class='del'>-	guint hash = 0;</div><div class='del'>-</div><div class='del'>-#define ADD_HASH(s) if (s) hash ^= g_str_hash (s);</div><div class='del'>-</div><div class='del'>-	ADD_HASH (u-&gt;protocol);</div><div class='del'>-	ADD_HASH (u-&gt;user);</div><div class='del'>-	ADD_HASH (u-&gt;authmech);</div><div class='del'>-	ADD_HASH (u-&gt;host);</div><div class='del'>-	ADD_HASH (u-&gt;path);</div><div class='del'>-	ADD_HASH (u-&gt;query);</div><div class='del'>-	hash ^= u-&gt;port;</div><div class='del'>-	</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-check_equal (char *s1, char *s2)</div><div class='del'>-{</div><div class='del'>-	if (s1 == NULL) {</div><div class='del'>-		if (s2 == NULL)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (s2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return strcmp (s1, s2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_url_equal(const void *v, const void *v2)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u1 = v, *u2 = v2;</div><div class='del'>-</div><div class='del'>-	return check_equal(u1-&gt;protocol, u2-&gt;protocol)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;user, u2-&gt;user)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;authmech, u2-&gt;authmech)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;host, u2-&gt;host)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;path, u2-&gt;path)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;query, u2-&gt;query)</div><div class='del'>-		&amp;&amp; u1-&gt;port == u2-&gt;port;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-url.h b/camel/camel-url.h<br/>deleted file mode 100644<br/>index d60c9594c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-url.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-url.h : utility functions to parse URLs */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_URL_H</div><div class='del'>-#define CAMEL_URL_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char  *protocol;</div><div class='del'>-	char  *user;</div><div class='del'>-	char  *authmech;</div><div class='del'>-	char  *passwd;</div><div class='del'>-	char  *host;</div><div class='del'>-	int    port;</div><div class='del'>-	char  *path;</div><div class='del'>-	GData *params;</div><div class='del'>-	char  *query;</div><div class='del'>-	char  *fragment;</div><div class='del'>-} CamelURL;</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_HIDE_PASSWORD	(1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_URL_HIDE_PARAMS	(1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_URL_HIDE_AUTH	(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_HIDE_ALL (CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS | CAMEL_URL_HIDE_AUTH)</div><div class='del'>-</div><div class='del'>-CamelURL *camel_url_new_with_base (CamelURL *base, const char *url_string);</div><div class='del'>-CamelURL *camel_url_new (const char *url_string, CamelException *ex);</div><div class='del'>-char *camel_url_to_string (CamelURL *url, guint32 flags);</div><div class='del'>-void camel_url_free (CamelURL *url);</div><div class='del'>-</div><div class='del'>-char *camel_url_encode (const char *part, gboolean escape_unsafe,</div><div class='del'>-			const char *escape_extra);</div><div class='del'>-void camel_url_decode (char *part);</div><div class='del'>-</div><div class='del'>-/* for editing url's */</div><div class='del'>-void camel_url_set_protocol (CamelURL *url, const char *protocol);</div><div class='del'>-void camel_url_set_user (CamelURL *url, const char *user);</div><div class='del'>-void camel_url_set_authmech (CamelURL *url, const char *authmech);</div><div class='del'>-void camel_url_set_passwd (CamelURL *url, const char *passwd);</div><div class='del'>-void camel_url_set_host (CamelURL *url, const char *host);</div><div class='del'>-void camel_url_set_port (CamelURL *url, int port);</div><div class='del'>-void camel_url_set_path (CamelURL *url, const char *path);</div><div class='del'>-void camel_url_set_param (CamelURL *url, const char *name, const char *value);</div><div class='del'>-void camel_url_set_query (CamelURL *url, const char *query);</div><div class='del'>-void camel_url_set_fragment (CamelURL *url, const char *fragment);</div><div class='del'>-</div><div class='del'>-const char *camel_url_get_param (CamelURL *url, const char *name);</div><div class='del'>-</div><div class='del'>-/* for putting url's into hash tables */</div><div class='del'>-guint camel_url_hash (const void *v);</div><div class='del'>-int camel_url_equal(const void *v, const void *v2);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* URL_UTIL_H */</div><div class='head'>diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c<br/>deleted file mode 100644<br/>index 11912e3637..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vee-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vee-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1532 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-vee-folder.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-folder-search.h"</div><div class='del'>-</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-vee-store.h"	/* for open flags */</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/md5-utils.h"</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelVeeFolder *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void vee_refresh_info(CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static void vee_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *vee_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-static void vee_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex);</div><div class='del'>-static void vee_transfer_messages_to(CamelFolder *source, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-static GPtrArray *vee_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-static void vee_rename(CamelFolder *folder, const char *new);</div><div class='del'>-</div><div class='del'>-static void camel_vee_folder_class_init (CamelVeeFolderClass *klass);</div><div class='del'>-static void camel_vee_folder_init       (CamelVeeFolder *obj);</div><div class='del'>-static void camel_vee_folder_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static int vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex);</div><div class='del'>-static void vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *source, int killun);</div><div class='del'>-</div><div class='del'>-static void message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf);</div><div class='del'>-static void folder_changed(CamelFolder *sub, CamelFolderChangeInfo *changes, CamelVeeFolder *vf);</div><div class='del'>-static void subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf);</div><div class='del'>-</div><div class='del'>-static void folder_changed_remove_uid(CamelFolder *sub, const char *uid, const char hash[8], int keep, CamelVeeFolder *vf);</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *camel_vee_folder_parent;</div><div class='del'>-</div><div class='del'>-/* a vfolder for unmatched messages */</div><div class='del'>-/* use folder_unmatched-&gt;summary_lock for access to unmatched_uids or appropriate internals, for consistency */</div><div class='del'>-static CamelVeeFolder *folder_unmatched;</div><div class='del'>-static GHashTable *unmatched_uids; /* a refcount of uid's that are matched by any rules */</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-static pthread_mutex_t unmatched_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-/* only used to initialise folder_unmatched */</div><div class='del'>-#define UNMATCHED_LOCK() pthread_mutex_lock(&amp;unmatched_lock)</div><div class='del'>-#define UNMATCHED_UNLOCK() pthread_mutex_unlock(&amp;unmatched_lock)</div><div class='del'>-#else</div><div class='del'>-#define UNMATCHED_LOCK()</div><div class='del'>-#define UNMATCHED_UNLOCK()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_vee_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_folder_get_type (), "CamelVeeFolder",</div><div class='del'>-					    sizeof (CamelVeeFolder),</div><div class='del'>-					    sizeof (CamelVeeFolderClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_vee_folder_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_vee_folder_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_vee_folder_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_class_init (CamelVeeFolderClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_vee_folder_parent = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;refresh_info = vee_refresh_info;</div><div class='del'>-	folder_class-&gt;sync = vee_sync;</div><div class='del'>-	folder_class-&gt;expunge = vee_expunge;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_message = vee_get_message;</div><div class='del'>-	folder_class-&gt;append_message = vee_append_message;</div><div class='del'>-	folder_class-&gt;transfer_messages_to = vee_transfer_messages_to;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;search_by_expression = vee_search_by_expression;</div><div class='del'>-	folder_class-&gt;search_by_uids = vee_search_by_uids;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;set_message_flags = vee_set_message_flags;</div><div class='del'>-	folder_class-&gt;set_message_user_flag = vee_set_message_user_flag;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;rename = vee_rename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_init (CamelVeeFolder *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	folder-&gt;folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |</div><div class='del'>-				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);</div><div class='del'>-</div><div class='del'>-	/* FIXME: what to do about user flags if the subfolder doesn't support them? */</div><div class='del'>-	folder-&gt;permanent_flags = CAMEL_MESSAGE_ANSWERED |</div><div class='del'>-		CAMEL_MESSAGE_DELETED |</div><div class='del'>-		CAMEL_MESSAGE_DRAFT |</div><div class='del'>-		CAMEL_MESSAGE_FLAGGED |</div><div class='del'>-		CAMEL_MESSAGE_SEEN;</div><div class='del'>-</div><div class='del'>-	obj-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	obj-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;summary_lock = g_mutex_new();</div><div class='del'>-	p-&gt;subfolder_lock = g_mutex_new();</div><div class='del'>-	p-&gt;changed_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)obj;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	/* FIXME: check leaks */</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (vf != folder_unmatched) {</div><div class='del'>-			camel_object_unhook_event((CamelObject *)f, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);</div><div class='del'>-			camel_object_unhook_event((CamelObject *)f, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);</div><div class='del'>-			camel_object_unhook_event((CamelObject *)f, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);</div><div class='del'>-			/* this updates the vfolder */</div><div class='del'>-			if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0)</div><div class='del'>-				vee_folder_remove_folder(vf, f, FALSE);</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref((CamelObject *)f);</div><div class='del'>-</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(vf-&gt;expression);</div><div class='del'>-	g_free(vf-&gt;vname);</div><div class='del'>-	</div><div class='del'>-	g_list_free(p-&gt;folders);</div><div class='del'>-	g_list_free(p-&gt;folders_changed);</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(vf-&gt;changes);</div><div class='del'>-	camel_object_unref((CamelObject *)vf-&gt;search);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(p-&gt;summary_lock);</div><div class='del'>-	g_mutex_free(p-&gt;subfolder_lock);</div><div class='del'>-	g_mutex_free(p-&gt;changed_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_folder_construct (CamelVeeFolder *vf, CamelStore *parent_store, const char *name, guint32 flags)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-	char *tmp;</div><div class='del'>-	</div><div class='del'>-	vf-&gt;flags = flags;</div><div class='del'>-	vf-&gt;vname = g_strdup(name);</div><div class='del'>-	tmp = strrchr(vf-&gt;vname, '/');</div><div class='del'>-	if (tmp)</div><div class='del'>-		tmp++;</div><div class='del'>-	else</div><div class='del'>-		tmp = vf-&gt;vname;</div><div class='del'>-	camel_folder_construct(folder, parent_store, vf-&gt;vname, tmp);</div><div class='del'>-</div><div class='del'>-	/* should CamelVeeMessageInfo be subclassable ..? */</div><div class='del'>-	folder-&gt;summary = camel_folder_summary_new();</div><div class='del'>-	folder-&gt;summary-&gt;message_info_size = sizeof(CamelVeeMessageInfo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_construct(CamelVeeFolder *vf, CamelStore *parent_store, const char *name, guint32 flags)</div><div class='del'>-{</div><div class='del'>-	UNMATCHED_LOCK();</div><div class='del'>-	</div><div class='del'>-	/* setup unmatched folder if we haven't yet */</div><div class='del'>-	if (folder_unmatched == NULL) {</div><div class='del'>-		unmatched_uids = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-		folder_unmatched = (CamelVeeFolder *)camel_object_new (camel_vee_folder_get_type ());</div><div class='del'>-		d(printf("created foldeer unmatched %p\n", folder_unmatched));</div><div class='del'>-		</div><div class='del'>-		vee_folder_construct (folder_unmatched, parent_store, CAMEL_UNMATCHED_NAME, CAMEL_STORE_FOLDER_PRIVATE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	UNMATCHED_UNLOCK();</div><div class='del'>-	</div><div class='del'>-	vee_folder_construct (vf, parent_store, name, flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_new:</div><div class='del'>- * @parent_store: the parent CamelVeeStore</div><div class='del'>- * @name: the vfolder name</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Create a new CamelVeeFolder object.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelVeeFolder widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_vee_folder_new(CamelStore *parent_store, const char *name, guint32 flags)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf;</div><div class='del'>-</div><div class='del'>-	UNMATCHED_LOCK();</div><div class='del'>-</div><div class='del'>-	/* setup unmatched folder if we haven't yet */</div><div class='del'>-	if (folder_unmatched == NULL) {</div><div class='del'>-		unmatched_uids = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-		folder_unmatched = vf = (CamelVeeFolder *)camel_object_new(camel_vee_folder_get_type());</div><div class='del'>-		d(printf("created foldeer unmatched %p\n", folder_unmatched));</div><div class='del'>-		vee_folder_construct (vf, parent_store, CAMEL_UNMATCHED_NAME, CAMEL_STORE_FOLDER_PRIVATE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	UNMATCHED_UNLOCK();</div><div class='del'>-</div><div class='del'>-	if (strcmp(name, CAMEL_UNMATCHED_NAME) == 0) {</div><div class='del'>-		camel_object_ref((CamelObject *)folder_unmatched);</div><div class='del'>-		d(printf("returning unmatched %p, count = %d\n", folder_unmatched, camel_folder_get_message_count((CamelFolder *)folder_unmatched)));</div><div class='del'>-		return (CamelFolder *)folder_unmatched;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	vf = (CamelVeeFolder *)camel_object_new(camel_vee_folder_get_type());</div><div class='del'>-	vee_folder_construct(vf, parent_store, name, flags);</div><div class='del'>-</div><div class='del'>-	d(printf("returning folder %s %p, count = %d\n", name, vf, camel_folder_get_message_count((CamelFolder *)vf)));</div><div class='del'>-</div><div class='del'>-	return (CamelFolder *)vf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_set_expression(CamelVeeFolder *vf, const char *query)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	/* no change, do nothing */</div><div class='del'>-	if ((vf-&gt;expression &amp;&amp; query &amp;&amp; strcmp(vf-&gt;expression, query) == 0)</div><div class='del'>-	    || (vf-&gt;expression == NULL &amp;&amp; query == NULL)) {</div><div class='del'>-		CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(vf-&gt;expression);</div><div class='del'>-	if (query)</div><div class='del'>-		vf-&gt;expression = g_strdup(query);</div><div class='del'>-</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (vee_folder_build_folder(vf, f, NULL) == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-	g_list_free(p-&gt;folders_changed);</div><div class='del'>-	p-&gt;folders_changed = NULL;</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_add_folder:</div><div class='del'>- * @vf: Virtual Folder object</div><div class='del'>- * @sub: source CamelFolder to add to @vf</div><div class='del'>- *</div><div class='del'>- * Adds @sub as a source folder to @vf.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf), *up = _PRIVATE(folder_unmatched);</div><div class='del'>-</div><div class='del'>-	if (vf == (CamelVeeFolder *)sub) {</div><div class='del'>-		g_warning("Adding a virtual folder to itself as source, ignored");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	/* for normal vfolders we want only unique ones, for unmatched we want them all recorded */</div><div class='del'>-	if (g_list_find(p-&gt;folders, sub) == NULL) {</div><div class='del'>-		camel_object_ref((CamelObject *)sub);</div><div class='del'>-		p-&gt;folders = g_list_append(p-&gt;folders, sub);</div><div class='del'>-	}</div><div class='del'>-	if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-		camel_object_ref((CamelObject *)sub);</div><div class='del'>-		up-&gt;folders = g_list_append(up-&gt;folders, sub);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	d(printf("camel_vee_folder_add_folde(%p, %p)\n", vf, sub));</div><div class='del'>-</div><div class='del'>-	camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc)folder_changed, vf);</div><div class='del'>-	camel_object_hook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc)message_changed, vf);</div><div class='del'>-	camel_object_hook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc)subfolder_deleted, vf);</div><div class='del'>-</div><div class='del'>-	vee_folder_build_folder(vf, sub, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_remove_folder:</div><div class='del'>- * @vf: Virtual Folder object</div><div class='del'>- * @sub: source CamelFolder to remove from @vf</div><div class='del'>- *</div><div class='del'>- * Removed the source folder, @sub, from the virtual folder, @vf.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *sub)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf), *up = _PRIVATE(folder_unmatched);</div><div class='del'>-	int killun = FALSE;</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-	p-&gt;folders_changed = g_list_remove(p-&gt;folders_changed, sub);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-</div><div class='del'>-	if (g_list_find(p-&gt;folders, sub) == NULL) {</div><div class='del'>-		CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unhook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);</div><div class='del'>-	camel_object_unhook_event((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);</div><div class='del'>-	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);</div><div class='del'>-</div><div class='del'>-	p-&gt;folders = g_list_remove(p-&gt;folders, sub);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, subfolder_lock);</div><div class='del'>-	/* if folder deleted, then blow it away from unmatched always, and remove all refs to it */</div><div class='del'>-	if (sub-&gt;folder_flags &amp; CAMEL_FOLDER_HAS_BEEN_DELETED) {</div><div class='del'>-		while (g_list_find(up-&gt;folders, sub)) {</div><div class='del'>-			killun = TRUE;</div><div class='del'>-			up-&gt;folders = g_list_remove(up-&gt;folders, sub);</div><div class='del'>-			camel_object_unref((CamelObject *)sub);</div><div class='del'>-		}</div><div class='del'>-	} else if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-		if (g_list_find(up-&gt;folders, sub) != NULL) {</div><div class='del'>-			up-&gt;folders = g_list_remove(up-&gt;folders, sub);</div><div class='del'>-			camel_object_unref((CamelObject *)sub);</div><div class='del'>-		}</div><div class='del'>-		if (g_list_find(up-&gt;folders, sub) == NULL) {</div><div class='del'>-			killun = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	vee_folder_remove_folder(vf, sub, killun);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)sub);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_folders(CamelFolder *folder, CamelFolder *foldercopy, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	camel_vee_folder_remove_folder(vf, folder);</div><div class='del'>-	camel_object_unref((CamelObject *)folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_set_folders:</div><div class='del'>- * @vf: </div><div class='del'>- * @folders: </div><div class='del'>- * </div><div class='del'>- * Set the whole list of folder sources on a vee folder.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_set_folders(CamelVeeFolder *vf, GList *folders)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GHashTable *remove = g_hash_table_new(NULL, NULL);</div><div class='del'>-	GList *l;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	int changed;</div><div class='del'>-</div><div class='del'>-	/* setup a table of all folders we have currently */</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-	l = p-&gt;folders;</div><div class='del'>-	while (l) {</div><div class='del'>-		g_hash_table_insert(remove, l-&gt;data, l-&gt;data);</div><div class='del'>-		camel_object_ref((CamelObject *)l-&gt;data);</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	/* if we already have the folder, ignore it, otherwise add it */</div><div class='del'>-	l = folders;</div><div class='del'>-	while (l) {</div><div class='del'>-		if ((folder = g_hash_table_lookup(remove, l-&gt;data))) {</div><div class='del'>-			g_hash_table_remove(remove, folder);</div><div class='del'>-			camel_object_unref((CamelObject *)folder);</div><div class='del'>-</div><div class='del'>-			/* if this was a changed folder, re-update it while we're here */</div><div class='del'>-			CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-			changed = g_list_find(p-&gt;folders_changed, folder) != NULL;</div><div class='del'>-			if (changed)</div><div class='del'>-				p-&gt;folders_changed = g_list_remove(p-&gt;folders_changed, folder);</div><div class='del'>-			CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-			if (changed)</div><div class='del'>-				vee_folder_build_folder(vf, folder, NULL);</div><div class='del'>-		} else {</div><div class='del'>-			camel_vee_folder_add_folder(vf, l-&gt;data);</div><div class='del'>-		}</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* then remove any we still have */</div><div class='del'>-	g_hash_table_foreach(remove, (GHFunc)remove_folders, vf);</div><div class='del'>-	g_hash_table_destroy(remove);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_hash_folder:</div><div class='del'>- * @folder: </div><div class='del'>- * @: </div><div class='del'>- * </div><div class='del'>- * Create a hash string representing the folder name, which should be</div><div class='del'>- * unique, and remain static for a given folder.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_vee_folder_hash_folder(CamelFolder *folder, char buffer[8])</div><div class='del'>-{</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	unsigned char digest[16];</div><div class='del'>-	unsigned int state = 0, save = 0;</div><div class='del'>-	char *tmp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	md5_init(&amp;ctx);</div><div class='del'>-	tmp = camel_service_get_url((CamelService *)folder-&gt;parent_store);</div><div class='del'>-	md5_update(&amp;ctx, tmp, strlen(tmp));</div><div class='del'>-	g_free(tmp);</div><div class='del'>-	md5_update(&amp;ctx, folder-&gt;full_name, strlen(folder-&gt;full_name));</div><div class='del'>-	md5_final(&amp;ctx, digest);</div><div class='del'>-	base64_encode_close(digest, 6, FALSE, buffer, &amp;state, &amp;save);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;8;i++) {</div><div class='del'>-		if (buffer[i] == '+')</div><div class='del'>-			buffer[i] = '.';</div><div class='del'>-		if (buffer[i] == '/')</div><div class='del'>-			buffer[i] = '_';</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vee_refresh_info(CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GList *node, *list;</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-	list = p-&gt;folders_changed;</div><div class='del'>-	p-&gt;folders_changed = NULL;</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-</div><div class='del'>-	node = list;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (vee_folder_build_folder(vf, f, ex) == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		camel_folder_sync(f, expunge, ex);</div><div class='del'>-		if (camel_exception_is_set(ex))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (expunge &amp;&amp; vee_folder_build_folder(vf, f, ex) == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (expunge &amp;&amp; node == NULL) {</div><div class='del'>-		CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-		g_list_free(p-&gt;folders_changed);</div><div class='del'>-		p-&gt;folders_changed = NULL;</div><div class='del'>-		CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	((CamelFolderClass *)((CamelObject *)folder)-&gt;klass)-&gt;sync(folder, TRUE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-vee_get_message(CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	CamelMimeMessage *msg = NULL;</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	if (mi) {</div><div class='del'>-		msg =  camel_folder_get_message(mi-&gt;folder, camel_message_info_uid(mi)+8, ex);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("No such message %s in %s"), uid,</div><div class='del'>-				     folder-&gt;name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	GPtrArray *matches, *result = g_ptr_array_new ();</div><div class='del'>-	char *expr;</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GHashTable *searched = g_hash_table_new(NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-	</div><div class='del'>-	if (vf != folder_unmatched)</div><div class='del'>-		expr = g_strdup_printf ("(and %s %s)", vf-&gt;expression, expression);</div><div class='del'>-	else</div><div class='del'>-		expr = g_strdup (expression);</div><div class='del'>-	</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		int i;</div><div class='del'>-		char hash[8];</div><div class='del'>-		</div><div class='del'>-		/* make sure we only search each folder once - for unmatched folder to work right */</div><div class='del'>-		if (g_hash_table_lookup(searched, f) == NULL) {</div><div class='del'>-			camel_vee_folder_hash_folder(f, hash);</div><div class='del'>-			matches = camel_folder_search_by_expression(f, expression, ex);</div><div class='del'>-			for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-				char *uid = matches-&gt;pdata[i], *vuid;</div><div class='del'>-</div><div class='del'>-				vuid = g_malloc(strlen(uid)+9);</div><div class='del'>-				memcpy(vuid, hash, 8);</div><div class='del'>-				strcpy(vuid+8, uid);</div><div class='del'>-				g_ptr_array_add(result, vuid);</div><div class='del'>-			}</div><div class='del'>-			camel_folder_search_free(f, matches);</div><div class='del'>-			g_hash_table_insert(searched, f, f);</div><div class='del'>-		}</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(expr);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(searched);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-vee_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	GPtrArray *matches, *result = g_ptr_array_new ();</div><div class='del'>-	GPtrArray *folder_uids = g_ptr_array_new();</div><div class='del'>-	char *expr;</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GHashTable *searched = g_hash_table_new(NULL, NULL);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	expr = g_strdup_printf("(and %s %s)", vf-&gt;expression, expression);</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		int i;</div><div class='del'>-		char hash[8];</div><div class='del'>-		</div><div class='del'>-		/* make sure we only search each folder once - for unmatched folder to work right */</div><div class='del'>-		if (g_hash_table_lookup(searched, f) == NULL) {</div><div class='del'>-			camel_vee_folder_hash_folder(f, hash);</div><div class='del'>-</div><div class='del'>-			/* map the vfolder uid's to the source folder uid's first */</div><div class='del'>-			g_ptr_array_set_size(folder_uids, 0);</div><div class='del'>-			for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-				char *uid = uids-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-				if (strlen(uid) &gt;= 8 &amp;&amp; strncmp(uid, hash, 8) == 0)</div><div class='del'>-					g_ptr_array_add(folder_uids, uid+8);</div><div class='del'>-			}</div><div class='del'>-			if (folder_uids-&gt;len &gt; 0) {</div><div class='del'>-				matches = camel_folder_search_by_uids(f, expression, folder_uids, ex);</div><div class='del'>-				if (matches) {</div><div class='del'>-					for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-						char *uid = matches-&gt;pdata[i], *vuid;</div><div class='del'>-				</div><div class='del'>-						vuid = g_malloc(strlen(uid)+9);</div><div class='del'>-						memcpy(vuid, hash, 8);</div><div class='del'>-						strcpy(vuid+8, uid);</div><div class='del'>-						g_ptr_array_add(result, vuid);</div><div class='del'>-					}</div><div class='del'>-					camel_folder_search_free(f, matches);</div><div class='del'>-				} else {</div><div class='del'>-					g_warning("Search failed: %s", camel_exception_get_description(ex));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_hash_table_insert(searched, f, f);</div><div class='del'>-		}</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(expr);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(searched);</div><div class='del'>-	g_ptr_array_free(folder_uids, 0);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	if (mi) {</div><div class='del'>-		camel_folder_set_message_flags(mi-&gt;folder, camel_message_info_uid(mi) + 8, flags, set);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		((CamelFolderClass *)camel_vee_folder_parent)-&gt;set_message_flags(folder, uid, flags, set);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	if (mi) {</div><div class='del'>-		camel_folder_set_message_user_flag(mi-&gt;folder, camel_message_info_uid(mi) + 8, name, value);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		((CamelFolderClass *)camel_vee_folder_parent)-&gt;set_message_user_flag(folder, uid, name, value);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot copy or move messages into a Virtual Folder"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_transfer_messages_to (CamelFolder *folder, GPtrArray *uids, CamelFolder *dest, GPtrArray **transferred_uids, gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot copy or move messages into a Virtual Folder"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void vee_rename(CamelFolder *folder, const char *new)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-</div><div class='del'>-	g_free(vf-&gt;vname);</div><div class='del'>-	vf-&gt;vname = g_strdup(new);</div><div class='del'>-</div><div class='del'>-	((CamelFolderClass *)camel_vee_folder_parent)-&gt;rename(folder, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ********************************************************************** *</div><div class='del'>-   utility functions */</div><div class='del'>-</div><div class='del'>-/* must be called with summary_lock held */</div><div class='del'>-static CamelVeeMessageInfo *</div><div class='del'>-vee_folder_add_info(CamelVeeFolder *vf, CamelFolder *f, CamelMessageInfo *info, const char hash[8])</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	char *vuid;</div><div class='del'>-	const char *uid;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-	CamelMessageInfo *dinfo;</div><div class='del'>-</div><div class='del'>-	uid = camel_message_info_uid(info);</div><div class='del'>-	vuid = alloca(strlen(uid)+9);</div><div class='del'>-	memcpy(vuid, hash, 8);</div><div class='del'>-	strcpy(vuid+8, uid);</div><div class='del'>-	dinfo = camel_folder_summary_uid(folder-&gt;summary, vuid);</div><div class='del'>-	if (dinfo) {</div><div class='del'>-		d(printf("w:clash, we already have '%s' in summary\n", vuid));</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, dinfo);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("adding vuid %s to %s\n", vuid, vf-&gt;vname));</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)camel_folder_summary_info_new(folder-&gt;summary);</div><div class='del'>-	camel_message_info_dup_to(info, (CamelMessageInfo *)mi);</div><div class='del'>-#ifdef DOEPOOLV</div><div class='del'>-	mi-&gt;info.strings = e_poolv_set(mi-&gt;info.strings, CAMEL_MESSAGE_INFO_UID, vuid, FALSE);</div><div class='del'>-#elif defined (DOESTRV)</div><div class='del'>-	mi-&gt;info.strings = e_strv_set_ref(mi-&gt;info.strings, CAMEL_MESSAGE_INFO_UID, vuid);</div><div class='del'>-	mi-&gt;info.strings = e_strv_pack(mi-&gt;info.strings);</div><div class='del'>-#else	</div><div class='del'>-	g_free(mi-&gt;info.uid);</div><div class='del'>-	mi-&gt;info.uid = g_strdup(vuid);</div><div class='del'>-#endif</div><div class='del'>-	mi-&gt;folder = f;</div><div class='del'>-	camel_folder_summary_add(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* must be called with summary_lock held */</div><div class='del'>-static CamelVeeMessageInfo *</div><div class='del'>-vee_folder_add_uid(CamelVeeFolder *vf, CamelFolder *f, const char *inuid, const char hash[8])</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelVeeMessageInfo *mi = NULL;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_get_message_info(f, inuid);</div><div class='del'>-	if (info) {</div><div class='del'>-		mi = vee_folder_add_info(vf, f, info, hash);</div><div class='del'>-		camel_folder_free_message_info(f, info);</div><div class='del'>-	}</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_folder_remove_folder(CamelVeeFolder *vf, CamelFolder *source, int killun)</div><div class='del'>-{</div><div class='del'>-	int i, count, n, still;</div><div class='del'>-	char *oldkey;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-	char hash[8];</div><div class='del'>-	/*struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);*/</div><div class='del'>-	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;</div><div class='del'>-</div><div class='del'>-	if (vf == folder_unmatched)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* check if this folder is still to be part of unmatched */</div><div class='del'>-	if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0 &amp;&amp; !killun) {</div><div class='del'>-		CAMEL_VEE_FOLDER_LOCK(folder_unmatched, subfolder_lock);</div><div class='del'>-		still = g_list_find(_PRIVATE(folder_unmatched)-&gt;folders, source) != NULL;</div><div class='del'>-		CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, subfolder_lock);</div><div class='del'>-		camel_vee_folder_hash_folder(source, hash);</div><div class='del'>-	} else {</div><div class='del'>-		still = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);</div><div class='del'>-</div><div class='del'>-	/* See if we just blow all uid's from this folder away from unmatched, regardless */</div><div class='del'>-	if (killun) {</div><div class='del'>-		count = camel_folder_summary_count(((CamelFolder *)folder_unmatched)-&gt;summary);</div><div class='del'>-		for (i=0;i&lt;count;i++) {</div><div class='del'>-			CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(((CamelFolder *)folder_unmatched)-&gt;summary, i);</div><div class='del'>-			</div><div class='del'>-			if (mi) {</div><div class='del'>-				if (mi-&gt;folder == source) {</div><div class='del'>-					camel_folder_summary_remove_index(((CamelFolder *)folder_unmatched)-&gt;summary, i);</div><div class='del'>-					camel_folder_change_info_remove_uid(folder_unmatched-&gt;changes, camel_message_info_uid(mi));</div><div class='del'>-					i--;</div><div class='del'>-				}</div><div class='del'>-				camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(folder-&gt;summary, i);</div><div class='del'>-		if (mi) {</div><div class='del'>-			if (mi-&gt;folder == source) {</div><div class='del'>-				const char *uid = camel_message_info_uid(mi);</div><div class='del'>-</div><div class='del'>-				camel_folder_change_info_remove_uid(vf-&gt;changes, uid);</div><div class='del'>-				camel_folder_summary_remove_index(folder-&gt;summary, i);</div><div class='del'>-				i--;</div><div class='del'>-				if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-					if (still) {</div><div class='del'>-						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-							if (n == 1) {</div><div class='del'>-								g_hash_table_remove(unmatched_uids, oldkey);</div><div class='del'>-								if (vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash))</div><div class='del'>-									camel_folder_change_info_add_uid(folder_unmatched-&gt;changes, oldkey);</div><div class='del'>-								g_free(oldkey);</div><div class='del'>-							} else {</div><div class='del'>-								g_hash_table_insert(unmatched_uids, oldkey, (void *)(n-1));</div><div class='del'>-							}</div><div class='del'>-						}</div><div class='del'>-					} else {</div><div class='del'>-						if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-							g_hash_table_remove(unmatched_uids, oldkey);</div><div class='del'>-							g_free(oldkey);</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(folder_unmatched-&gt;changes)) {</div><div class='del'>-		unmatched_changes = folder_unmatched-&gt;changes;</div><div class='del'>-		folder_unmatched-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(vf-&gt;changes)) {</div><div class='del'>-		vf_changes = vf-&gt;changes;</div><div class='del'>-		vf-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, summary_lock);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);</div><div class='del'>-</div><div class='del'>-	if (unmatched_changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes);</div><div class='del'>-		camel_folder_change_info_free(unmatched_changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vf_changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)vf, "folder_changed", vf_changes);</div><div class='del'>-		camel_folder_change_info_free(vf_changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _update_data {</div><div class='del'>-	CamelFolder *source;</div><div class='del'>-	CamelVeeFolder *vf;</div><div class='del'>-	char hash[8];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unmatched_check_uid(char *uidin, void *value, struct _update_data *u)</div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	uid = alloca(strlen(uidin)+9);</div><div class='del'>-	memcpy(uid, u-&gt;hash, 8);</div><div class='del'>-	strcpy(uid+8, uidin);</div><div class='del'>-	n = (int)g_hash_table_lookup(unmatched_uids, uid);</div><div class='del'>-	if (n == 0) {</div><div class='del'>-		if (vee_folder_add_uid(folder_unmatched, u-&gt;source, uidin, u-&gt;hash))</div><div class='del'>-			camel_folder_change_info_add_uid(folder_unmatched-&gt;changes, uid);</div><div class='del'>-	} else {</div><div class='del'>-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_uid(((CamelFolder *)folder_unmatched)-&gt;summary, uid);</div><div class='del'>-		if (mi) {</div><div class='del'>-			camel_folder_summary_remove(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-			camel_folder_change_info_remove_uid(folder_unmatched-&gt;changes, uid);</div><div class='del'>-			camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_added_uid(char *uidin, void *value, struct _update_data *u)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	char *oldkey;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	if ( (mi = vee_folder_add_uid(u-&gt;vf, u-&gt;source, uidin, u-&gt;hash)) ) {</div><div class='del'>-		camel_folder_change_info_add_uid(u-&gt;vf-&gt;changes, camel_message_info_uid(mi));</div><div class='del'>-</div><div class='del'>-		if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-			g_hash_table_insert(unmatched_uids, oldkey, (void *)(n+1));</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(unmatched_uids, g_strdup(camel_message_info_uid(mi)), (void *)1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* build query contents for a single folder */</div><div class='del'>-static int</div><div class='del'>-vee_folder_build_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *match, *all;</div><div class='del'>-	GHashTable *allhash, *matchhash;</div><div class='del'>-	CamelFolder *f = source;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-	int i, n, count;</div><div class='del'>-	struct _update_data u;</div><div class='del'>-	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;</div><div class='del'>-</div><div class='del'>-	if (vf == folder_unmatched)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* if we have no expression, or its been cleared, then act as if no matches */</div><div class='del'>-	if (vf-&gt;expression == NULL) {</div><div class='del'>-		match = g_ptr_array_new();</div><div class='del'>-	} else {</div><div class='del'>-		match = camel_folder_search_by_expression(f, vf-&gt;expression, ex);</div><div class='del'>-		if (match == NULL)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	u.source = source;</div><div class='del'>-	u.vf = vf;</div><div class='del'>-	camel_vee_folder_hash_folder(source, u.hash);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);</div><div class='del'>-</div><div class='del'>-	/* we build 2 hash tables, one for all uid's not matched, the other for all matched uid's,</div><div class='del'>-	   we just ref the real memory */</div><div class='del'>-	matchhash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	for (i=0;i&lt;match-&gt;len;i++)</div><div class='del'>-		g_hash_table_insert(matchhash, match-&gt;pdata[i], (void *)1);</div><div class='del'>-</div><div class='del'>-	allhash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	all = camel_folder_get_uids(f);</div><div class='del'>-	for (i=0;i&lt;all-&gt;len;i++)</div><div class='del'>-		if (g_hash_table_lookup(matchhash, all-&gt;pdata[i]) == NULL)</div><div class='del'>-			g_hash_table_insert(allhash, all-&gt;pdata[i], (void *)1);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);</div><div class='del'>-</div><div class='del'>-	/* scan, looking for "old" uid's to be removed */</div><div class='del'>-	count = camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(folder-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-		if (mi) {</div><div class='del'>-			if (mi-&gt;folder == source) {</div><div class='del'>-				char *uid = (char *)camel_message_info_uid(mi), *oldkey;</div><div class='del'>-</div><div class='del'>-				if (g_hash_table_lookup(matchhash, uid+8) == NULL) {</div><div class='del'>-					camel_folder_summary_remove_index(folder-&gt;summary, i);</div><div class='del'>-					camel_folder_change_info_remove_uid(vf-&gt;changes, camel_message_info_uid(mi));</div><div class='del'>-					i--;</div><div class='del'>-					if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-						if (n == 1) {</div><div class='del'>-							g_hash_table_remove(unmatched_uids, oldkey);</div><div class='del'>-							g_free(oldkey);</div><div class='del'>-						} else {</div><div class='del'>-							g_hash_table_insert(unmatched_uids, oldkey, (void *)(n-1));</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					g_hash_table_remove(matchhash, uid+8);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now matchhash contains any new uid's, add them, etc */</div><div class='del'>-	g_hash_table_foreach(matchhash, (GHFunc)folder_added_uid, &amp;u);</div><div class='del'>-</div><div class='del'>-	/* scan unmatched, remove any that have vanished, etc */</div><div class='del'>-	count = camel_folder_summary_count(((CamelFolder *)folder_unmatched)-&gt;summary);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		CamelVeeMessageInfo *mi = (CamelVeeMessageInfo *)camel_folder_summary_index(((CamelFolder *)folder_unmatched)-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-		if (mi) {</div><div class='del'>-			if (mi-&gt;folder == source) {</div><div class='del'>-				char *uid = (char *)camel_message_info_uid(mi);</div><div class='del'>-</div><div class='del'>-				if (g_hash_table_lookup(allhash, uid+8) == NULL) {</div><div class='del'>-					/* no longer exists at all, just remove it entirely */</div><div class='del'>-					camel_folder_summary_remove_index(((CamelFolder *)folder_unmatched)-&gt;summary, i);</div><div class='del'>-					camel_folder_change_info_remove_uid(folder_unmatched-&gt;changes, camel_message_info_uid(mi));</div><div class='del'>-					i--;</div><div class='del'>-				} else {</div><div class='del'>-					g_hash_table_remove(allhash, uid+8);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now allhash contains all potentially new uid's for the unmatched folder, process */</div><div class='del'>-	g_hash_table_foreach(allhash, (GHFunc)unmatched_check_uid, &amp;u);</div><div class='del'>-</div><div class='del'>-	/* copy any changes so we can raise them outside the lock */</div><div class='del'>-	if (camel_folder_change_info_changed(folder_unmatched-&gt;changes)) {</div><div class='del'>-		unmatched_changes = folder_unmatched-&gt;changes;</div><div class='del'>-		folder_unmatched-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(vf-&gt;changes)) {</div><div class='del'>-		vf_changes = vf-&gt;changes;</div><div class='del'>-		vf-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, summary_lock);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(matchhash);</div><div class='del'>-	g_hash_table_destroy(allhash);</div><div class='del'>-	/* if expression not set, we only had a null list */</div><div class='del'>-	if (vf-&gt;expression == NULL)</div><div class='del'>-		g_ptr_array_free(match, TRUE);</div><div class='del'>-	else</div><div class='del'>-		camel_folder_search_free(f, match);</div><div class='del'>-	camel_folder_free_uids(f, all);</div><div class='del'>-</div><div class='del'>-	if (unmatched_changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes);</div><div class='del'>-		camel_folder_change_info_free(unmatched_changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (vf_changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)vf, "folder_changed", vf_changes);</div><div class='del'>-		camel_folder_change_info_free(vf_changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>-  (match-folder "folder1" "folder2")</div><div class='del'>-</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Hold all these with summary lock and unmatched summary lock held */</div><div class='del'>-static void</div><div class='del'>-folder_changed_add_uid(CamelFolder *sub, const char *uid, const char hash[8], CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *vinfo;</div><div class='del'>-	const char *vuid;</div><div class='del'>-	char *oldkey;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	vinfo = vee_folder_add_uid(vf, sub, uid, hash);</div><div class='del'>-	if (vinfo == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	vuid = camel_message_info_uid(vinfo);</div><div class='del'>-	camel_folder_change_info_add_uid(vf-&gt;changes,  vuid);</div><div class='del'>-</div><div class='del'>-	if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-		if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-			g_hash_table_insert(unmatched_uids, oldkey, (void *)(n+1));</div><div class='del'>-		} else {</div><div class='del'>-			g_hash_table_insert(unmatched_uids, g_strdup(vuid), (void *)1);</div><div class='del'>-		}</div><div class='del'>-		vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);</div><div class='del'>-		if (vinfo) {</div><div class='del'>-			camel_folder_change_info_remove_uid(folder_unmatched-&gt;changes, vuid);</div><div class='del'>-			camel_folder_summary_remove(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-			camel_folder_free_message_info((CamelFolder *)folder_unmatched, (CamelMessageInfo *)vinfo);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed_remove_uid(CamelFolder *sub, const char *uid, const char hash[8], int keep, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-	char *vuid, *oldkey;</div><div class='del'>-	int n;</div><div class='del'>-	CamelVeeMessageInfo *vinfo;</div><div class='del'>-</div><div class='del'>-	vuid = alloca(strlen(uid)+9);</div><div class='del'>-	memcpy(vuid, hash, 8);</div><div class='del'>-	strcpy(vuid+8, uid);</div><div class='del'>-</div><div class='del'>-	vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, vuid);</div><div class='del'>-	if (vinfo) {</div><div class='del'>-		camel_folder_change_info_remove_uid(vf-&gt;changes, vuid);</div><div class='del'>-		camel_folder_summary_remove(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-		if (keep) {</div><div class='del'>-			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-				if (n == 1) {</div><div class='del'>-					g_hash_table_remove(unmatched_uids, oldkey);</div><div class='del'>-					if (vee_folder_add_uid(folder_unmatched, sub, uid, hash))</div><div class='del'>-						camel_folder_change_info_add_uid(folder_unmatched-&gt;changes, oldkey);</div><div class='del'>-					g_free(oldkey);</div><div class='del'>-				} else {</div><div class='del'>-					g_hash_table_insert(unmatched_uids, oldkey, (void *)(n-1));</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (vee_folder_add_uid(folder_unmatched, sub, uid, hash))</div><div class='del'>-					camel_folder_change_info_add_uid(folder_unmatched-&gt;changes, oldkey);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&amp;oldkey, (void **)&amp;n)) {</div><div class='del'>-				g_hash_table_remove(unmatched_uids, oldkey);</div><div class='del'>-				g_free(oldkey);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);</div><div class='del'>-			if (vinfo) {</div><div class='del'>-				camel_folder_change_info_remove_uid(folder_unmatched-&gt;changes, vuid);</div><div class='del'>-				camel_folder_summary_remove_uid(((CamelFolder *)folder_unmatched)-&gt;summary, vuid);</div><div class='del'>-				camel_folder_free_message_info((CamelFolder *)folder_unmatched, (CamelMessageInfo *)vinfo);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed_change_uid(CamelFolder *sub, const char *uid, const char hash[8], CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	char *vuid;</div><div class='del'>-	CamelVeeMessageInfo *vinfo, *uinfo;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)vf;</div><div class='del'>-</div><div class='del'>-	vuid = alloca(strlen(uid)+9);</div><div class='del'>-	memcpy(vuid, hash, 8);</div><div class='del'>-	strcpy(vuid+8, uid);</div><div class='del'>-</div><div class='del'>-	vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, vuid);</div><div class='del'>-	uinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(((CamelFolder *)folder_unmatched)-&gt;summary, vuid);</div><div class='del'>-	if (vinfo || uinfo) {</div><div class='del'>-		info = camel_folder_get_message_info(sub, uid);</div><div class='del'>-		if (info) {</div><div class='del'>-			if (vinfo) {</div><div class='del'>-				int changed = FALSE;</div><div class='del'>-</div><div class='del'>-				if (vinfo-&gt;info.flags != info-&gt;flags){</div><div class='del'>-					vinfo-&gt;info.flags = info-&gt;flags;</div><div class='del'>-					changed = TRUE;</div><div class='del'>-				}</div><div class='del'>-			</div><div class='del'>-				changed |= camel_flag_list_copy(&amp;vinfo-&gt;info.user_flags, &amp;info-&gt;user_flags);</div><div class='del'>-				changed |= camel_tag_list_copy(&amp;vinfo-&gt;info.user_tags, &amp;info-&gt;user_tags);</div><div class='del'>-				if (changed)</div><div class='del'>-					camel_folder_change_info_change_uid(vf-&gt;changes, vuid);</div><div class='del'>-</div><div class='del'>-				camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (uinfo) {</div><div class='del'>-				int changed = FALSE;</div><div class='del'>-</div><div class='del'>-				if (uinfo-&gt;info.flags != info-&gt;flags){</div><div class='del'>-					uinfo-&gt;info.flags = info-&gt;flags;</div><div class='del'>-					changed = TRUE;</div><div class='del'>-				}</div><div class='del'>-			</div><div class='del'>-				changed |= camel_flag_list_copy(&amp;uinfo-&gt;info.user_flags, &amp;info-&gt;user_flags);</div><div class='del'>-				changed |= camel_tag_list_copy(&amp;uinfo-&gt;info.user_tags, &amp;info-&gt;user_tags);</div><div class='del'>-				if (changed)</div><div class='del'>-					camel_folder_change_info_change_uid(folder_unmatched-&gt;changes, vuid);</div><div class='del'>-</div><div class='del'>-				camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)uinfo);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_folder_free_message_info(sub, info);</div><div class='del'>-		} else {</div><div class='del'>-			if (vinfo) {</div><div class='del'>-				folder_changed_remove_uid(sub, uid, hash, FALSE, vf);</div><div class='del'>-				camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-			}</div><div class='del'>-			if (uinfo)</div><div class='del'>-				camel_folder_summary_info_free(((CamelFolder *)folder_unmatched)-&gt;summary, (CamelMessageInfo *)uinfo);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _folder_changed_msg {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	CamelSessionThreadMsg msg;</div><div class='del'>-#endif</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	CamelFolder *sub;</div><div class='del'>-	CamelVeeFolder *vf;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed_change(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_changed_msg *m = (struct _folder_changed_msg *)msg;</div><div class='del'>-	CamelFolder *sub = m-&gt;sub;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)m-&gt;vf;</div><div class='del'>-	CamelVeeFolder *vf = m-&gt;vf;</div><div class='del'>-	CamelFolderChangeInfo *changes = m-&gt;changes;</div><div class='del'>-	char *vuid = NULL, hash[8];</div><div class='del'>-	const char *uid;</div><div class='del'>-	CamelVeeMessageInfo *vinfo;</div><div class='del'>-	int i, vuidlen = 0;</div><div class='del'>-	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;</div><div class='del'>-	GPtrArray *matches_added = NULL, /* newly added, that match */</div><div class='del'>-		*matches_changed = NULL, /* newly changed, that now match */</div><div class='del'>-		*newchanged = NULL,</div><div class='del'>-		*changed;</div><div class='del'>-	GPtrArray *always_changed = NULL;</div><div class='del'>-	GHashTable *matches_hash;</div><div class='del'>-</div><div class='del'>-	/* Check the folder hasn't beem removed while we weren't watching */</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, subfolder_lock);</div><div class='del'>-	if (g_list_find(_PRIVATE(vf)-&gt;folders, sub) == NULL) {</div><div class='del'>-		CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_vee_folder_hash_folder(sub, hash);</div><div class='del'>-</div><div class='del'>-	/* Lookup anything before we lock anything, to avoid deadlock with build_folder */</div><div class='del'>-</div><div class='del'>-	/* Find newly added that match */</div><div class='del'>-	if (changes-&gt;uid_added-&gt;len &gt; 0) {</div><div class='del'>-		dd(printf(" Searching for added matches '%s'\n", vf-&gt;expression));</div><div class='del'>-		matches_added = camel_folder_search_by_uids(sub, vf-&gt;expression, changes-&gt;uid_added, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO:</div><div class='del'>-	   In this code around here, we can work out if the search will affect the changes</div><div class='del'>-	   we had, and only re-search against them if they might have */</div><div class='del'>-</div><div class='del'>-	/* Search for changed items that newly match, but only if we dont have them */</div><div class='del'>-	changed = changes-&gt;uid_changed;</div><div class='del'>-	if (changed-&gt;len &gt; 0) {</div><div class='del'>-		dd(printf(" Searching for changed matches '%s'\n", vf-&gt;expression));</div><div class='del'>-</div><div class='del'>-		if ((vf-&gt;flags &amp; CAMEL_STORE_VEE_FOLDER_AUTO) == 0) {</div><div class='del'>-			newchanged = g_ptr_array_new();</div><div class='del'>-			always_changed = g_ptr_array_new();</div><div class='del'>-			for (i=0;i&lt;changed-&gt;len;i++) {</div><div class='del'>-				uid = changed-&gt;pdata[i];</div><div class='del'>-				if (strlen(uid)+9 &gt; vuidlen) {</div><div class='del'>-					vuidlen = strlen(uid)+64;</div><div class='del'>-					vuid = g_realloc(vuid, vuidlen);</div><div class='del'>-				}</div><div class='del'>-				memcpy(vuid, hash, 8);</div><div class='del'>-				strcpy(vuid+8, uid);</div><div class='del'>-				vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, vuid);</div><div class='del'>-				if (vinfo == NULL) {</div><div class='del'>-					g_ptr_array_add(newchanged, (char *)uid);</div><div class='del'>-				} else {</div><div class='del'>-					g_ptr_array_add(always_changed, (char *)uid);</div><div class='del'>-					camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			changed = newchanged;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (changed-&gt;len)</div><div class='del'>-			matches_changed = camel_folder_search_by_uids(sub, vf-&gt;expression, changed, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);</div><div class='del'>-	CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);</div><div class='del'>-</div><div class='del'>-	dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder-&gt;full_name, sub-&gt;full_name));</div><div class='del'>-	dd(printf(" changed %d added %d removed %d\n", changes-&gt;uid_changed-&gt;len, changes-&gt;uid_added-&gt;len, changes-&gt;uid_removed-&gt;len));</div><div class='del'>-</div><div class='del'>-	/* Always remove removed uid's, in any case */</div><div class='del'>-	for (i=0;i&lt;changes-&gt;uid_removed-&gt;len;i++) {</div><div class='del'>-		dd(printf("  removing uid '%s'\n", (char *)changes-&gt;uid_removed-&gt;pdata[i]));</div><div class='del'>-		folder_changed_remove_uid(sub, changes-&gt;uid_removed-&gt;pdata[i], hash, FALSE, vf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add any newly matched or to unmatched folder if they dont */</div><div class='del'>-	if (matches_added) {</div><div class='del'>-		matches_hash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-		for (i=0;i&lt;matches_added-&gt;len;i++) {</div><div class='del'>-			dd(printf(" %s", (char *)matches_added-&gt;pdata[i]));</div><div class='del'>-			g_hash_table_insert(matches_hash, matches_added-&gt;pdata[i], matches_added-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		for (i=0;i&lt;changes-&gt;uid_added-&gt;len;i++) {</div><div class='del'>-			uid = changes-&gt;uid_added-&gt;pdata[i];</div><div class='del'>-			if (g_hash_table_lookup(matches_hash, uid)) {</div><div class='del'>-				dd(printf("  adding uid '%s' [newly matched]\n", (char *)uid));</div><div class='del'>-				folder_changed_add_uid(sub, uid, hash, vf);</div><div class='del'>-			} else if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-				if (strlen(uid)+9 &gt; vuidlen) {</div><div class='del'>-					vuidlen = strlen(uid)+64;</div><div class='del'>-					vuid = g_realloc(vuid, vuidlen);</div><div class='del'>-				}</div><div class='del'>-				memcpy(vuid, hash, 8);</div><div class='del'>-				strcpy(vuid+8, uid);</div><div class='del'>-				</div><div class='del'>-				if (g_hash_table_lookup(unmatched_uids, vuid) == NULL) {</div><div class='del'>-					dd(printf("  adding uid '%s' to Unmatched [newly unmatched]\n", (char *)uid));</div><div class='del'>-					vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);</div><div class='del'>-					if (vinfo == NULL) {</div><div class='del'>-						if (vee_folder_add_uid(folder_unmatched, sub, uid, hash))</div><div class='del'>-							camel_folder_change_info_add_uid(folder_unmatched-&gt;changes, vuid);</div><div class='del'>-					} else {</div><div class='del'>-						camel_folder_free_message_info((CamelFolder *)folder_unmatched, (CamelMessageInfo *)vinfo);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_destroy(matches_hash);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Change any newly changed */</div><div class='del'>-	if (always_changed) {</div><div class='del'>-		for (i=0;i&lt;always_changed-&gt;len;i++)</div><div class='del'>-			folder_changed_change_uid(sub, always_changed-&gt;pdata[i], hash, vf);</div><div class='del'>-		g_ptr_array_free(always_changed, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Change/add/remove any changed */</div><div class='del'>-	if (matches_changed) {</div><div class='del'>-		/* If we are auto-updating, then re-check changed uids still match */</div><div class='del'>-		dd(printf(" Vfolder %supdate\nuids match:", (vf-&gt;flags &amp; CAMEL_STORE_VEE_FOLDER_AUTO)?"auto-":""));</div><div class='del'>-		matches_hash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-		for (i=0;i&lt;matches_changed-&gt;len;i++) {</div><div class='del'>-			dd(printf(" %s", (char *)matches_changed-&gt;pdata[i]));</div><div class='del'>-			g_hash_table_insert(matches_hash, matches_changed-&gt;pdata[i], matches_changed-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		dd(printf("\n"));</div><div class='del'>-		for (i=0;i&lt;changed-&gt;len;i++) {</div><div class='del'>-			uid = changed-&gt;pdata[i];</div><div class='del'>-			if (strlen(uid)+9 &gt; vuidlen) {</div><div class='del'>-				vuidlen = strlen(uid)+64;</div><div class='del'>-				vuid = g_realloc(vuid, vuidlen);</div><div class='del'>-			}</div><div class='del'>-			memcpy(vuid, hash, 8);</div><div class='del'>-			strcpy(vuid+8, uid);</div><div class='del'>-			vinfo = (CamelVeeMessageInfo *)camel_folder_summary_uid(folder-&gt;summary, vuid);</div><div class='del'>-			if (vinfo == NULL) {</div><div class='del'>-				/* A uid we dont have, but now it matches, add it */</div><div class='del'>-				if (g_hash_table_lookup(matches_hash, uid)) {</div><div class='del'>-					dd(printf("  adding uid '%s' [newly matched]\n", uid));</div><div class='del'>-					folder_changed_add_uid(sub, uid, hash, vf);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if ((vf-&gt;flags &amp; CAMEL_STORE_VEE_FOLDER_AUTO) == 0</div><div class='del'>-				    || g_hash_table_lookup(matches_hash, uid)) {</div><div class='del'>-					/* still match, or we're not auto-updating, change event, (if it changed) */</div><div class='del'>-					dd(printf("  changing uid '%s' [still matches]\n", uid));</div><div class='del'>-					folder_changed_change_uid(sub, uid, hash, vf);</div><div class='del'>-				} else {</div><div class='del'>-					/* No longer matches, remove it, but keep it in unmatched (potentially) */</div><div class='del'>-					dd(printf("  removing uid '%s' [did match]\n", uid));</div><div class='del'>-					folder_changed_remove_uid(sub, uid, hash, TRUE, vf);</div><div class='del'>-				}</div><div class='del'>-				camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)vinfo);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_destroy(matches_hash);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(folder_unmatched-&gt;changes)) {</div><div class='del'>-		unmatched_changes = folder_unmatched-&gt;changes;</div><div class='del'>-		folder_unmatched-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	if (camel_folder_change_info_changed(vf-&gt;changes)) {</div><div class='del'>-		vf_changes = vf-&gt;changes;</div><div class='del'>-		vf-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(folder_unmatched, summary_lock);</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);</div><div class='del'>-</div><div class='del'>-	/* Cleanup stuff on our folder */</div><div class='del'>-	if (matches_added)</div><div class='del'>-		camel_folder_search_free(sub, matches_added);</div><div class='del'>-</div><div class='del'>-	if (matches_changed)</div><div class='del'>-		camel_folder_search_free(sub, matches_changed);</div><div class='del'>-</div><div class='del'>-	CAMEL_VEE_FOLDER_UNLOCK(vf, subfolder_lock);</div><div class='del'>-</div><div class='del'>-	/* cleanup the rest */</div><div class='del'>-	if (newchanged)</div><div class='del'>-		g_ptr_array_free(newchanged, TRUE);</div><div class='del'>-</div><div class='del'>-	g_free(vuid);</div><div class='del'>-</div><div class='del'>-	if (unmatched_changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes);</div><div class='del'>-		camel_folder_change_info_free(unmatched_changes);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (vf_changes) {</div><div class='del'>-		/* If not auto-updating, keep track of changed folders for later re-sync */</div><div class='del'>-		if ((vf-&gt;flags &amp; CAMEL_STORE_VEE_FOLDER_AUTO) == 0) {</div><div class='del'>-			CAMEL_VEE_FOLDER_LOCK(vf, changed_lock);</div><div class='del'>-			if (g_list_find(vf-&gt;priv-&gt;folders_changed, sub) != NULL)</div><div class='del'>-				vf-&gt;priv-&gt;folders_changed = g_list_prepend(vf-&gt;priv-&gt;folders_changed, sub);</div><div class='del'>-			CAMEL_VEE_FOLDER_UNLOCK(vf, changed_lock);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_object_trigger_event((CamelObject *)vf, "folder_changed", vf_changes);</div><div class='del'>-		camel_folder_change_info_free(vf_changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed_free(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_changed_msg *m = (struct _folder_changed_msg *)msg;</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(m-&gt;changes);</div><div class='del'>-	camel_object_unref((CamelObject *)m-&gt;vf);</div><div class='del'>-	camel_object_unref((CamelObject *)m-&gt;sub);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-static CamelSessionThreadOps folder_changed_ops = {</div><div class='del'>-	folder_changed_change,</div><div class='del'>-	folder_changed_free,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed(CamelFolder *sub, CamelFolderChangeInfo *changes, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	struct _folder_changed_msg *m;</div><div class='del'>-	CamelSession *session = ((CamelService *)((CamelFolder *)vf)-&gt;parent_store)-&gt;session;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	m = camel_session_thread_msg_new(session, &amp;folder_changed_ops, sizeof(*m));</div><div class='del'>-	m-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	camel_folder_change_info_cat(m-&gt;changes, changes);</div><div class='del'>-	m-&gt;sub = sub;</div><div class='del'>-	camel_object_ref((CamelObject *)sub);</div><div class='del'>-	m-&gt;vf = vf;</div><div class='del'>-	camel_object_ref((CamelObject *)vf);</div><div class='del'>-	camel_session_thread_queue(session, &amp;m-&gt;msg, 0);</div><div class='del'>-#else</div><div class='del'>-	m = g_malloc(sizeof(*m));</div><div class='del'>-	m-&gt;changes = changes;</div><div class='del'>-	m-&gt;sub = sub;</div><div class='del'>-	m-&gt;vf = vf;</div><div class='del'>-	folder_changed_change(session, &amp;m-&gt;msg);</div><div class='del'>-	folder_changed_free(&amp;m-&gt;msg);</div><div class='del'>-	g_free(m);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* track flag changes in the summary, we just promote it to a folder_changed event */</div><div class='del'>-static void</div><div class='del'>-message_changed(CamelFolder *f, const char *uid, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-</div><div class='del'>-	changes = camel_folder_change_info_new();</div><div class='del'>-	camel_folder_change_info_change_uid(changes, uid);</div><div class='del'>-	folder_changed(f, changes, vf);</div><div class='del'>-	camel_folder_change_info_free(changes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* track vanishing folders */</div><div class='del'>-static void</div><div class='del'>-subfolder_deleted(CamelFolder *f, void *event_data, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	camel_vee_folder_remove_folder(vf, f);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h<br/>deleted file mode 100644<br/>index 8d6770b4bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vee-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vee-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_VEE_FOLDER_H</div><div class='del'>-#define _CAMEL_VEE_FOLDER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_VEE_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_vee_folder_get_type (), CamelVeeFolder)</div><div class='del'>-#define CAMEL_VEE_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass)</div><div class='del'>-#define CAMEL_IS_VEE_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_folder_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelVeeFolder      CamelVeeFolder;</div><div class='del'>-typedef struct _CamelVeeFolderClass CamelVeeFolderClass;</div><div class='del'>-</div><div class='del'>-/* our message info includes the parent folder */</div><div class='del'>-typedef struct _CamelVeeMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-} CamelVeeMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelVeeFolder {</div><div class='del'>-	CamelFolder parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelVeeFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *expression;	/* query expression */</div><div class='del'>-	char *vname;		/* local name */</div><div class='del'>-</div><div class='del'>-	guint32 flags;		/* folder open flags */</div><div class='del'>-</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	CamelFolderSearch *search;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelVeeFolderClass {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_UNMATCHED_NAME "UNMATCHED"</div><div class='del'>-</div><div class='del'>-CamelType	      camel_vee_folder_get_type		(void);</div><div class='del'>-CamelFolder  *camel_vee_folder_new		(CamelStore *parent_store, const char *name, guint32 flags);</div><div class='del'>-void         camel_vee_folder_construct		(CamelVeeFolder *vf, CamelStore *parent_store, const char *name, guint32 flags);</div><div class='del'>-</div><div class='del'>-void         camel_vee_folder_add_folder        (CamelVeeFolder *vf, CamelFolder *sub);</div><div class='del'>-void         camel_vee_folder_remove_folder     (CamelVeeFolder *vf, CamelFolder *sub);</div><div class='del'>-void	     camel_vee_folder_set_folders	(CamelVeeFolder *vf, GList *folders);</div><div class='del'>-void	     camel_vee_folder_set_expression	(CamelVeeFolder *vf, const char *expr);</div><div class='del'>-</div><div class='del'>-void	     camel_vee_folder_hash_folder	(CamelFolder *folder, char buffer[8]);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_VEE_FOLDER_H */</div><div class='head'>diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c<br/>deleted file mode 100644<br/>index e8fa1054e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vee-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vee-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,322 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-vee-store.h"</div><div class='del'>-#include "camel-vee-folder.h"</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelFolder *vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static void vee_delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void vee_rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex);</div><div class='del'>-static void vee_init_trash (CamelStore *store);</div><div class='del'>-static CamelFolder *vee_get_trash  (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *vee_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-struct _CamelVeeStorePrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelVeeStore *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void camel_vee_store_class_init (CamelVeeStoreClass *klass);</div><div class='del'>-static void camel_vee_store_init       (CamelVeeStore *obj);</div><div class='del'>-static void camel_vee_store_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *camel_vee_store_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_vee_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_store_get_type (), "CamelVeeStore",</div><div class='del'>-					    sizeof (CamelVeeStore),</div><div class='del'>-					    sizeof (CamelVeeStoreClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_vee_store_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_vee_store_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_vee_store_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_store_class_init (CamelVeeStoreClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *store_class = (CamelStoreClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_vee_store_parent = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	store_class-&gt;get_folder = vee_get_folder;</div><div class='del'>-	store_class-&gt;rename_folder = vee_rename_folder;</div><div class='del'>-	store_class-&gt;delete_folder = vee_delete_folder;</div><div class='del'>-	store_class-&gt;get_folder_info = vee_get_folder_info;</div><div class='del'>-	store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-</div><div class='del'>-	store_class-&gt;init_trash = vee_init_trash;</div><div class='del'>-	store_class-&gt;get_trash = vee_get_trash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_store_init (CamelVeeStore *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeStorePrivate *p;</div><div class='del'>-	CamelStore *store = (CamelStore *)obj;</div><div class='del'>-</div><div class='del'>-	/* we dont want a vtrash on this one */</div><div class='del'>-	store-&gt;flags &amp;= ~(CAMEL_STORE_VTRASH);	</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_store_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelVeeStore *vs = (CamelVeeStore *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(vs-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_store_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelVeeStore object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelVeeStore widget.</div><div class='del'>- **/</div><div class='del'>-CamelVeeStore *</div><div class='del'>-camel_vee_store_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelVeeStore *new = CAMEL_VEE_STORE(camel_object_new(camel_vee_store_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	CamelVeeFolder *vf;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	vf = (CamelVeeFolder *)camel_vee_folder_new(store, folder_name, flags);</div><div class='del'>-	if ((vf-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0) {</div><div class='del'>-		fi = g_malloc0(sizeof(*fi));</div><div class='del'>-		fi-&gt;full_name = g_strdup(vf-&gt;vname);</div><div class='del'>-		name = strrchr(vf-&gt;vname, '/');</div><div class='del'>-		if (name == NULL)</div><div class='del'>-			name = vf-&gt;vname;</div><div class='del'>-		fi-&gt;name = g_strdup(name);</div><div class='del'>-		fi-&gt;url = g_strdup_printf("vfolder:%s#%s", ((CamelService *)store)-&gt;url-&gt;path,</div><div class='del'>-					  ((CamelFolder *)vf)-&gt;full_name);</div><div class='del'>-		fi-&gt;unread_message_count = camel_folder_get_message_count((CamelFolder *)vf);</div><div class='del'>-		camel_folder_info_build_path(fi, '/');</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(store), "folder_created", fi);</div><div class='del'>-		camel_folder_info_free(fi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (CamelFolder *)vf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_init_trash (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-vee_get_trash (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _build_info {</div><div class='del'>-	const char *top;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	GPtrArray *infos;</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_info(char *name, CamelVeeFolder *folder, struct _build_info *data)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-</div><div class='del'>-	/* check we have to include this one */</div><div class='del'>-	if (data-&gt;top) {</div><div class='del'>-		if (data-&gt;flags &amp; CAMEL_STORE_FOLDER_INFO_RECURSIVE) {</div><div class='del'>-			int namelen = strlen(name);</div><div class='del'>-			int toplen = strlen(data-&gt;top);</div><div class='del'>-</div><div class='del'>-			if (!((namelen == toplen &amp;&amp;</div><div class='del'>-			       strcmp(name, data-&gt;top) == 0)</div><div class='del'>-			      || ((namelen &gt; toplen)</div><div class='del'>-				  &amp;&amp; strncmp(name, data-&gt;top, toplen) == 0</div><div class='del'>-				  &amp;&amp; name[toplen] == '/')))</div><div class='del'>-				return;</div><div class='del'>-		} else {</div><div class='del'>-			if (strcmp(name, data-&gt;top))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if ((data-&gt;flags &amp; CAMEL_STORE_FOLDER_INFO_RECURSIVE) == 0) {</div><div class='del'>-			if (strchr(name, '/'))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	info = g_malloc0(sizeof(*info));</div><div class='del'>-	info-&gt;url = g_strdup_printf("vfolder:%s#%s", ((CamelService *)((CamelFolder *)folder)-&gt;parent_store)-&gt;url-&gt;path,</div><div class='del'>-				    ((CamelFolder *)folder)-&gt;full_name);</div><div class='del'>-	info-&gt;full_name = g_strdup(((CamelFolder *)folder)-&gt;full_name);</div><div class='del'>-	info-&gt;name = g_strdup(((CamelFolder *)folder)-&gt;name);</div><div class='del'>-	info-&gt;unread_message_count = -1;</div><div class='del'>-	g_ptr_array_add(data-&gt;infos, info);</div><div class='del'>-	camel_object_ref((CamelObject *)folder);</div><div class='del'>-	g_ptr_array_add(data-&gt;folders, folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-vee_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct _build_info data;</div><div class='del'>-	CamelFolderInfo *info;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* first, build the info list */</div><div class='del'>-	data.top = top;</div><div class='del'>-	data.flags = flags;</div><div class='del'>-	data.infos = g_ptr_array_new();</div><div class='del'>-	data.folders = g_ptr_array_new();</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	g_hash_table_foreach(store-&gt;folders, (GHFunc)build_info, &amp;data);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-	/* then make sure the unread counts are accurate */</div><div class='del'>-	for (i=0;i&lt;data.infos-&gt;len;i++) {</div><div class='del'>-		CamelFolderInfo *info = data.infos-&gt;pdata[i];</div><div class='del'>-		CamelFolder *folder = data.folders-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		camel_folder_refresh_info(folder, NULL);</div><div class='del'>-		info-&gt;unread_message_count = camel_folder_get_unread_message_count(folder);</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free(data.folders, TRUE);</div><div class='del'>-</div><div class='del'>-	/* and always add UNMATCHED, if scanning from top/etc */</div><div class='del'>-	if (top == NULL || top[0] == 0 || strncmp(top, CAMEL_UNMATCHED_NAME, strlen(CAMEL_UNMATCHED_NAME)) == 0) {</div><div class='del'>-		info = g_malloc0(sizeof(*info));</div><div class='del'>-		info-&gt;url = g_strdup_printf("vfolder:%s#%s", ((CamelService *)store)-&gt;url-&gt;path, CAMEL_UNMATCHED_NAME);</div><div class='del'>-		info-&gt;full_name = g_strdup(CAMEL_UNMATCHED_NAME);</div><div class='del'>-		info-&gt;name = g_strdup(CAMEL_UNMATCHED_NAME);</div><div class='del'>-		info-&gt;unread_message_count = -1;</div><div class='del'>-		camel_folder_info_build_path(info, '/');</div><div class='del'>-		g_ptr_array_add(data.infos, info);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	/* convert it into a tree */</div><div class='del'>-	info = camel_folder_info_build(data.infos, (top&amp;&amp;top[0])?top:"", '/', TRUE);</div><div class='del'>-	g_ptr_array_free(data.infos, TRUE);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	char *key;</div><div class='del'>-</div><div class='del'>-	if (strcmp(folder_name, CAMEL_UNMATCHED_NAME) == 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot delete folder: %s: Invalid operation"), folder_name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	if (g_hash_table_lookup_extended(store-&gt;folders, folder_name, (void **)&amp;key, (void **)&amp;folder)) {</div><div class='del'>-		int update;</div><div class='del'>-</div><div class='del'>-		update = (((CamelVeeFolder *)folder)-&gt;flags &amp; CAMEL_STORE_FOLDER_PRIVATE) == 0;</div><div class='del'>-		g_hash_table_remove(store-&gt;folders, key);</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-		if (store-&gt;vtrash)</div><div class='del'>-			camel_vee_folder_remove_folder((CamelVeeFolder *)store-&gt;vtrash, folder);</div><div class='del'>-</div><div class='del'>-		if (update) {</div><div class='del'>-			CamelFolderInfo *fi = g_malloc0(sizeof(*fi));</div><div class='del'>-</div><div class='del'>-			fi-&gt;full_name = g_strdup(key);</div><div class='del'>-			fi-&gt;name = strrchr(key, '/');</div><div class='del'>-			if (fi-&gt;name == NULL)</div><div class='del'>-				fi-&gt;name = g_strdup(key);</div><div class='del'>-			else</div><div class='del'>-				fi-&gt;name = g_strdup(fi-&gt;name);</div><div class='del'>-			fi-&gt;url = g_strdup_printf("vfolder:%s#%s", ((CamelService *)store)-&gt;url-&gt;path, key);</div><div class='del'>-			fi-&gt;unread_message_count = -1;</div><div class='del'>-			camel_folder_info_build_path(fi, '/');</div><div class='del'>-	</div><div class='del'>-			camel_object_trigger_event(CAMEL_OBJECT(store), "folder_deleted", fi);</div><div class='del'>-			camel_folder_info_free(fi);</div><div class='del'>-		}</div><div class='del'>-		g_free(key);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot delete folder: %s: No such folder"), folder_name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("vee rename folder '%s' '%s'\n", old, new));</div><div class='del'>-</div><div class='del'>-	if (strcmp(old, CAMEL_UNMATCHED_NAME) == 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot rename folder: %s: Invalid operation"), old);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if it exists, for vfolders, all folders are in the folders hash */</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	if ((folder = g_hash_table_lookup(store-&gt;folders, old)) == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot rename folder: %s: No such folder"), old);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h<br/>deleted file mode 100644<br/>index b7309c33c5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vee-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vee-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_VEE_STORE_H</div><div class='del'>-#define _CAMEL_VEE_STORE_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_VEE_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_vee_store_get_type (), CamelVeeStore)</div><div class='del'>-#define CAMEL_VEE_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass)</div><div class='del'>-#define CAMEL_IS_VEE_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_store_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelVeeStore      CamelVeeStore;</div><div class='del'>-typedef struct _CamelVeeStoreClass CamelVeeStoreClass;</div><div class='del'>-</div><div class='del'>-/* open mode for folder, vee folder auto-update */</div><div class='del'>-#define CAMEL_STORE_VEE_FOLDER_AUTO (1&lt;&lt;16)</div><div class='del'>-</div><div class='del'>-struct _CamelVeeStore {</div><div class='del'>-	CamelStore parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelVeeStorePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelVeeStoreClass {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_vee_store_get_type	(void);</div><div class='del'>-CamelVeeStore      *camel_vee_store_new	(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_VEE_STORE_H */</div><div class='head'>diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c<br/>deleted file mode 100644<br/>index 5c6e993c4f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vtrash-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vtrash-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,210 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-vtrash-folder.h"</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#include "camel-vee-store.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelFolder */</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelVeeFolderClass *camel_vtrash_folder_parent;</div><div class='del'>-</div><div class='del'>-static void vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				   const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-static void vtrash_transfer_messages_to (CamelFolder *folder, GPtrArray *uids,</div><div class='del'>-					 CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-					 gboolean delete_originals, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vtrash_folder_class_init (CamelVTrashFolderClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_vtrash_folder_parent =</div><div class='del'>-		CAMEL_VEE_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-	</div><div class='del'>-	folder_class-&gt;append_message = vtrash_append_message;</div><div class='del'>-	folder_class-&gt;transfer_messages_to = vtrash_transfer_messages_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vtrash_folder_init (CamelVTrashFolder *vtrash)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (vtrash);</div><div class='del'>-</div><div class='del'>-	folder-&gt;folder_flags |= CAMEL_FOLDER_IS_TRASH;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_vtrash_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_vee_folder_get_type (),</div><div class='del'>-					    "CamelVTrashFolder",</div><div class='del'>-					    sizeof (CamelVTrashFolder),</div><div class='del'>-					    sizeof (CamelVTrashFolderClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_vtrash_folder_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_vtrash_folder_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vtrash_folder_new:</div><div class='del'>- * @parent_store: the parent CamelVeeStore</div><div class='del'>- * @name: the vfolder name</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Create a new CamelVeeFolder object.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelVeeFolder widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_vtrash_folder_new (CamelStore *parent_store, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *vtrash;</div><div class='del'>-	</div><div class='del'>-	vtrash = (CamelFolder *)camel_object_new (camel_vtrash_folder_get_type ());</div><div class='del'>-	camel_vee_folder_construct (CAMEL_VEE_FOLDER (vtrash), parent_store, name,</div><div class='del'>-				    CAMEL_STORE_FOLDER_PRIVATE | CAMEL_STORE_FOLDER_CREATE | CAMEL_STORE_VEE_FOLDER_AUTO);</div><div class='del'>-	camel_vee_folder_set_expression((CamelVeeFolder *)vtrash, "(match-all (system-flag \"Deleted\"))");</div><div class='del'>-</div><div class='del'>-	return vtrash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vtrash_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		       const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _transfer_data {</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolder *dest;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	gboolean delete;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transfer_messages(CamelFolder *folder, struct _transfer_data *md, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!camel_exception_is_set (ex))</div><div class='del'>-		camel_folder_transfer_messages_to(md-&gt;folder, md-&gt;uids, md-&gt;dest, NULL, md-&gt;delete, ex);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;md-&gt;uids-&gt;len;i++)</div><div class='del'>-		g_free(md-&gt;uids-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(md-&gt;uids, TRUE);</div><div class='del'>-	camel_object_unref((CamelObject *)md-&gt;folder);</div><div class='del'>-	g_free(md);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vtrash_transfer_messages_to (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-			     CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-			     gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	int i;</div><div class='del'>-	GHashTable *batch = NULL;</div><div class='del'>-	const char *tuid;</div><div class='del'>-	struct _transfer_data *md;</div><div class='del'>-</div><div class='del'>-	/* This is a special case of transfer_messages_to: Either the</div><div class='del'>-	 * source or the destination is a vtrash folder (but not both</div><div class='del'>-	 * since a store should never have more than one).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (transferred_uids)</div><div class='del'>-		*transferred_uids = NULL;</div><div class='del'>-</div><div class='del'>-	if (CAMEL_IS_VTRASH_FOLDER (dest)) {</div><div class='del'>-		/* Copy to trash is meaningless. */</div><div class='del'>-		if (!delete_originals)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		/* Move to trash is the same as deleting the message */</div><div class='del'>-		for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-			camel_folder_delete_message (source, uids-&gt;pdata[i]);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_VTRASH_FOLDER (source));</div><div class='del'>-</div><div class='del'>-	/* Moving/Copying from the trash to the original folder = undelete.</div><div class='del'>-	 * Moving/Copying from the trash to a different folder = move/copy.</div><div class='del'>-	 *</div><div class='del'>-	 * Need to check this uid by uid, but we batch up the copies.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		mi = (CamelVeeMessageInfo *)camel_folder_get_message_info (source, uids-&gt;pdata[i]);</div><div class='del'>-		if (mi == NULL) {</div><div class='del'>-			g_warning ("Cannot find uid %s in source folder during transfer", (char *) uids-&gt;pdata[i]);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (dest == mi-&gt;folder) {</div><div class='del'>-			/* Just undelete the original message */</div><div class='del'>-			camel_folder_set_message_flags (source, uids-&gt;pdata[i], CAMEL_MESSAGE_DELETED, 0);</div><div class='del'>-		} else {</div><div class='del'>-			if (batch == NULL)</div><div class='del'>-				batch = g_hash_table_new(NULL, NULL);</div><div class='del'>-			md = g_hash_table_lookup(batch, mi-&gt;folder);</div><div class='del'>-			if (md == NULL) {</div><div class='del'>-				md = g_malloc0(sizeof(*md));</div><div class='del'>-				md-&gt;folder = mi-&gt;folder;</div><div class='del'>-				camel_object_ref((CamelObject *)md-&gt;folder);</div><div class='del'>-				md-&gt;uids = g_ptr_array_new();</div><div class='del'>-				md-&gt;dest = dest;</div><div class='del'>-				g_hash_table_insert(batch, mi-&gt;folder, md);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			tuid = uids-&gt;pdata[i];</div><div class='del'>-			if (strlen(tuid)&gt;8)</div><div class='del'>-				tuid += 8;</div><div class='del'>-			g_ptr_array_add(md-&gt;uids, g_strdup(tuid));</div><div class='del'>-		}</div><div class='del'>-		camel_folder_free_message_info (source, (CamelMessageInfo *)mi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (batch) {</div><div class='del'>-		g_hash_table_foreach(batch, (GHFunc)transfer_messages, ex);</div><div class='del'>-		g_hash_table_destroy(batch);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h<br/>deleted file mode 100644<br/>index f0441c4c82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-vtrash-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel-vtrash-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_VTRASH_FOLDER_H</div><div class='del'>-#define _CAMEL_VTRASH_FOLDER_H</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-vee-folder.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_VTRASH_NAME "Trash"</div><div class='del'>-</div><div class='del'>-#define CAMEL_VTRASH_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_vtrash_folder_get_type (), CamelVTrashFolder)</div><div class='del'>-#define CAMEL_VTRASH_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vtrash_folder_get_type (), CamelVTrashFolderClass)</div><div class='del'>-#define CAMEL_IS_VTRASH_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_vtrash_folder_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelVTrashFolder      CamelVTrashFolder;</div><div class='del'>-typedef struct _CamelVTrashFolderClass CamelVTrashFolderClass;</div><div class='del'>-</div><div class='del'>-struct _CamelVTrashFolder {</div><div class='del'>-	CamelVeeFolder parent;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelVTrashFolderClass {</div><div class='del'>-	CamelVeeFolderClass parent_class;</div><div class='del'>-	</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType       camel_vtrash_folder_get_type    (void);</div><div class='del'>-</div><div class='del'>-CamelFolder    *camel_vtrash_folder_new		(CamelStore *parent_store, const char *name);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_VTRASH_FOLDER_H */</div><div class='head'>diff --git a/camel/camel.c b/camel/camel.c<br/>deleted file mode 100644<br/>index 25807b5aac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_NSS</div><div class='del'>-#include &lt;nspr.h&gt;</div><div class='del'>-#include &lt;prthread.h&gt;</div><div class='del'>-#include "nss.h"      /* Don't use &lt;&gt; here or it will include the system nss.h instead */</div><div class='del'>-#include &lt;ssl.h&gt;</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='del'>-</div><div class='del'>-#include "camel.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-</div><div class='del'>-gboolean camel_verbose_debug = FALSE;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_NSS</div><div class='del'>-static void</div><div class='del'>-camel_shutdown (void)</div><div class='del'>-{</div><div class='del'>-	NSS_Shutdown ();</div><div class='del'>-	</div><div class='del'>-	PR_Cleanup ();</div><div class='del'>-}</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_init (const char *configdir, gboolean nss_init)</div><div class='del'>-{</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#ifdef G_THREADS_ENABLED	</div><div class='del'>-	/*g_thread_init (NULL);*/</div><div class='del'>-#else /* G_THREADS_ENABLED */</div><div class='del'>-	g_warning ("Threads are not supported by your version of glib");</div><div class='del'>-#endif /* G_THREADS_ENABLED */</div><div class='del'>-#endif /* ENABLE_THREADS */</div><div class='del'>-	</div><div class='del'>-	if (getenv ("CAMEL_VERBOSE_DEBUG"))</div><div class='del'>-		camel_verbose_debug = TRUE;</div><div class='del'>-</div><div class='del'>-	/* initialise global camel_object_type */</div><div class='del'>-	camel_object_get_type();</div><div class='del'>-</div><div class='del'>-	camel_mime_utils_init();</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_NSS</div><div class='del'>-	if (nss_init) {</div><div class='del'>-		PR_Init (PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 10);</div><div class='del'>-		</div><div class='del'>-		if (NSS_InitReadWrite (configdir) == SECFailure) {</div><div class='del'>-			/* fall back on using volatile dbs? */</div><div class='del'>-			if (NSS_NoDB_Init (configdir) == SECFailure) {</div><div class='del'>-				g_warning ("Failed to initialize NSS");</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		NSS_SetDomesticPolicy ();</div><div class='del'>-		</div><div class='del'>-		g_atexit (camel_shutdown);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	SSL_OptionSetDefault (SSL_ENABLE_SSL2, PR_TRUE);</div><div class='del'>-	SSL_OptionSetDefault (SSL_ENABLE_SSL3, PR_TRUE);</div><div class='del'>-	SSL_OptionSetDefault (SSL_ENABLE_TLS, PR_TRUE);</div><div class='del'>-	SSL_OptionSetDefault (SSL_V2_COMPATIBLE_HELLO, PR_TRUE /* maybe? */);</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel.h b/camel/camel.h<br/>deleted file mode 100644<br/>index 722b6190fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/camel.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_H</div><div class='del'>-#define CAMEL_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-cipher-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-cms-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-data-wrapper.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-digest-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-digest-store.h&gt;</div><div class='del'>-#include &lt;camel/camel-disco-diary.h&gt;</div><div class='del'>-#include &lt;camel/camel-disco-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-disco-store.h&gt;</div><div class='del'>-#include &lt;camel/camel-vee-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-medium.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-basic.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-charset.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-index.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-save.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-crlf.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-tohtml.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-parser.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-movemail.h&gt;</div><div class='del'>-#include &lt;camel/camel-multipart.h&gt;</div><div class='del'>-#include &lt;camel/camel-pgp-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-pgp-mime.h&gt;</div><div class='del'>-#include &lt;camel/camel-provider.h&gt;</div><div class='del'>-#include &lt;camel/camel-seekable-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-seekable-substream.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-#include &lt;camel/camel-smime-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-smime-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-buffer.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-tcp-stream-raw.h&gt;</div><div class='del'>-#include &lt;camel/camel-tcp-stream-ssl.h&gt;</div><div class='del'>-#include &lt;camel/camel-tcp-stream.h&gt;</div><div class='del'>-#include &lt;camel/camel-transport.h&gt;</div><div class='del'>-#include &lt;camel/camel-uid-cache.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-#include &lt;camel/gstring-util.h&gt;</div><div class='del'>-#include &lt;camel/hash-table-utils.h&gt;</div><div class='del'>-#include &lt;camel/string-utils.h&gt;</div><div class='del'>-</div><div class='del'>-gint camel_init (const char *certdb_dir, gboolean nss_init);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_H */</div><div class='head'>diff --git a/camel/devel-docs/camel-index.txt b/camel/devel-docs/camel-index.txt<br/>deleted file mode 100644<br/>index 0ebc250db0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/devel-docs/camel-index.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/devel-docs/camel-index.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,407 +0,0 @@</div><div class='del'>-</div><div class='del'>-The history of text-indexing in evolution.</div><div class='del'>-</div><div class='del'>-CamelTextIndex was written to address several shortcomings in the</div><div class='del'>-existing libibex (referred to as libibex2), which had been written to</div><div class='del'>-address shortcomings in the original libibex.</div><div class='del'>-</div><div class='del'>-Mail indexing characteristics</div><div class='del'>-</div><div class='del'>-First, i'll cover some of the scenarios that a mail indexing system</div><div class='del'>-must cover.  They are slightly different from other indexing systems,</div><div class='del'>-at least we wanted them to be.</div><div class='del'>-</div><div class='del'>-1. Indexing a few new messages, they may potentially reference most of</div><div class='del'>-   the alphabet in the index.</div><div class='del'>-2. Indexing a whole mailbox for the first time</div><div class='del'>-3. Unindexing anywhere from a few to all existing messages during expunge.</div><div class='del'>-4. Searching.</div><div class='del'>-</div><div class='del'>-Cases 1, 3, and 4 occur the most often, however 2 is the most noticeable</div><div class='del'>-at first use, or if the index must be reset.  So the code needs to</div><div class='del'>-work fast in all cases, which generally leads to trade-offs being</div><div class='del'>-made.  Each implementation aimed to address or ignore these</div><div class='del'>-requirements in different ways, with the final implementation probably</div><div class='del'>-having the best balance so far.</div><div class='del'>-</div><div class='del'>-The main issue is that the indexing be performed real time.  We index</div><div class='del'>-as we add the messages.  We index before we open the mailbox.  We</div><div class='del'>-index as we remove messages.  Because of this we need to approach</div><div class='del'>-things differently to many other indexing systems; most of which work</div><div class='del'>-with static data in an off-line mode.  This allows them to index the</div><div class='del'>-whole body of content and use as much memory and cpu time as required.</div><div class='del'>-</div><div class='del'>-We probably need to look at doing offline, or at least delayed</div><div class='del'>-indexing in the future - but this introduces some coherency problems</div><div class='del'>-with vFolders and any body searches.  However, having the indexing</div><div class='del'>-library a base part of Camel helps in implementing a mechanism to</div><div class='del'>-achieve this.</div><div class='del'>-</div><div class='del'>-Ibex the first</div><div class='del'>-</div><div class='del'>-The original ibex used a memory-based hash table to store words.  This made</div><div class='del'>-the index very fast for both lookups and modifications.   However any</div><div class='del'>-queries required a full load of the index into memory, and any updates</div><div class='del'>-required a full write of the index to disk.  After about 5-10 000</div><div class='del'>-messages occasionaly adding to the index became appreciably slower as</div><div class='del'>-the whole index needed to be loaded into memory first.  This obviously</div><div class='del'>-took a toll on memory as well.</div><div class='del'>-</div><div class='del'>-I wont cover the algorithms used, they were all pretty basic, the only</div><div class='del'>-real smarts were that index deletes were only flagged and that data</div><div class='del'>-not written to disk when the index saved.</div><div class='del'>-</div><div class='del'>-Evolution 1.x, ibex 2.</div><div class='del'>-</div><div class='del'>-In an attempt to rectify the incremental update performance of</div><div class='del'>-libibex, it was completely rewritten to use an on-disk block-based</div><div class='del'>-filesystem.</div><div class='del'>-</div><div class='del'>-Note: the first attempt used libdb - however performance was so slow</div><div class='del'>-and the indices were so large it was dropped in favour of a custom</div><div class='del'>-filesystem-like data file.</div><div class='del'>-</div><div class='del'>-The motivation was that a few extra disk lookups during</div><div class='del'>-retrieval wouldn't be noticeably slower, however it should be able to</div><div class='del'>-scale up to many more messages with lower memory overhead and slower</div><div class='del'>-startup time.</div><div class='del'>-</div><div class='del'>-The block filesystem contains 3 major components:</div><div class='del'>-</div><div class='del'>-1. A hash table that mapped message's to a word id sequence list.</div><div class='del'>-2. A hash table that mapped word's to a message id sequence list.</div><div class='del'>-3. A sequence filesystem that stored sequences of id's.</div><div class='del'>-</div><div class='del'>-The id's are 32 bit identifiers that are unique for each word or</div><div class='del'>-message.  They are also designed to be reversible and static.</div><div class='del'>-That is, given the id, you can map it to the string identifier that it</div><div class='del'>-represents directly, without having to look it up in the hash table.</div><div class='del'>-</div><div class='del'>-Other features of this design is that the database file should be</div><div class='del'>-kept in sync at all times with the state of the index.  The message to</div><div class='del'>-wordid tables are used to remove the messageid's from the word's it</div><div class='del'>-contains when the message is expunged, and so on.</div><div class='del'>-</div><div class='del'>-Indexing operation</div><div class='del'>-</div><div class='del'>-The indexing operation consists of the basic steps:</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid from the message name, using the messageid table.</div><div class='del'>-2. Generate a list of words in the message</div><div class='del'>-3. For each word:</div><div class='del'>-4.   Lookup the wordid and sequence information</div><div class='del'>-5.   If the word doesn't exist, create a new word/wordid</div><div class='del'>-6.   Add the messageid to the word sequence.</div><div class='del'>-7.   Add the wordid to the message sequence.</div><div class='del'>-</div><div class='del'>-The initial implementation only used caching at the disk-block level.</div><div class='del'>-Unfortunately, the simple hash table design chosen (fixed sized base</div><div class='del'>-table with chained buckets) scaled very poorly above about 10 000</div><div class='del'>-messages.  So this approach proved to be too i/o intensive for</div><div class='del'>-practical use, and several other caches were added to improve</div><div class='del'>-performance:</div><div class='del'>-</div><div class='del'>-1. Stage (1) above is done entirely in memory.  At initial startup</div><div class='del'>-   the whole list of potential names is read into an in-memory hash</div><div class='del'>-   table.</div><div class='del'>-2. Stage (4) above is also done entirely in memory.  Even a large</div><div class='del'>-   cache provided little benefit due to wide distribution of potential</div><div class='del'>-   words.  This cache is only created when adding to the index.</div><div class='del'>-3. Stage (6) uses the table from stage (4) and concatenates upto</div><div class='del'>-   approximately one disk blocks worth of messageid's before writing</div><div class='del'>-   them out to the word sequence.</div><div class='del'>-4. Stage (7) concatenates all wordid's for a given message before</div><div class='del'>-   writing them out at once.</div><div class='del'>-</div><div class='del'>-As you can see, the added complexity meant we nearly have to cache as</div><div class='del'>-much as the original version!  This also almost removed all of the</div><div class='del'>-startup-time benefit for incremental update of the index, as the table</div><div class='del'>-was not stored as compactly on disk as the original version.</div><div class='del'>-</div><div class='del'>-However, we only ever stored a subset of the index in memory, and only</div><div class='del'>-during updates, with some tricks to reduce memory usage for very rare</div><div class='del'>-words, so the overall memory use was still much lower.</div><div class='del'>-</div><div class='del'>-Removing a message</div><div class='del'>-</div><div class='del'>-Removing a message is fairly involved:</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid and word sequence list from the messageid table.</div><div class='del'>-2. For each wordid in the sequence list</div><div class='del'>-3.   Lookup the message sequence list directly from the wordid table.</div><div class='del'>-4.   Scan each block in the sequence, and remove any instances of the</div><div class='del'>-     messageid.</div><div class='del'>-5. Remove the message to messageid mapping in the messageid table.</div><div class='del'>-</div><div class='del'>-Unfortunately caching helped very little here, particularly if many</div><div class='del'>-messages were removed.  Also note that the file could never shrink as</div><div class='del'>-the data could be spread randomly over it.  Removal is an extremely</div><div class='del'>-expensive an unbounded process.  Deleting all of the messages in a</div><div class='del'>-mailbox is extremely i/o intensive, with blocks potentially being</div><div class='del'>-accessed dozens of times.</div><div class='del'>-</div><div class='del'>-Performing a query</div><div class='del'>-</div><div class='del'>-Performing a query is fast:</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid sequence list from the wordid table.</div><div class='del'>-2. For each messageid</div><div class='del'>-3.   Lookup the message name directly from the messageid table.</div><div class='del'>-</div><div class='del'>-Even without caching this performs at a very acceptable level.</div><div class='del'>-</div><div class='del'>-Summary</div><div class='del'>-</div><div class='del'>-This index performs reasonably well upto about 10 000 messages for a</div><div class='del'>-complete re-index.  However with incremental updates it degrads much</div><div class='del'>-faster, only a few thousand messages added and it becomes tiresomely</div><div class='del'>-slow and i/o bound.  The index becomes more fragmented with random</div><div class='del'>-updates and removals and heavily bogs down the system as you go much</div><div class='del'>-beyond those few thousand messages.</div><div class='del'>-</div><div class='del'>-The code is also very complicated and hard to follow.  There are too</div><div class='del'>-many special cases, and it is buggy.  Detected on-disk structure</div><div class='del'>-errors result in the index being reset, which although it shrinks the</div><div class='del'>-index, is very slow.</div><div class='del'>-</div><div class='del'>-The indices created are bulky, and never shrink.  Because of the</div><div class='del'>-reverse index used for message removal, there is 50% redundant data at</div><div class='del'>-all times.  Some overly tricky techniques (very much like ReiserFS's</div><div class='del'>-tail packing) are used to waste as little space as possible, with a</div><div class='del'>-great impact on performance.</div><div class='del'>-</div><div class='del'>-One other problem is that because the index is disk based, we</div><div class='del'>-use a file descriptor continuously.  With some users having</div><div class='del'>-&gt;100 folders, they quickly run out of process file descriptors and</div><div class='del'>-evolution fails.  To get around this a cache of least recently used</div><div class='del'>-index files is used to flush away and free file descriptors so they</div><div class='del'>-can be re-used.  This makes it hard to lock the files; this problem</div><div class='del'>-still exists with the next implementation.</div><div class='del'>-</div><div class='del'>-Anyway, a better solution is required.</div><div class='del'>-</div><div class='del'>-CamelIndex</div><div class='del'>-</div><div class='del'>-The first problem to address was the api.  It was starting to age.</div><div class='del'>-Although adequate, the api wasn't terribly clean, reusable, or</div><div class='del'>-scalable.  The first thing was to objectise the library, and since we</div><div class='del'>-needed to use it in Camel, the best way was to create a CamelObject.</div><div class='del'>-</div><div class='del'>-CamelIndex was born.  A mostly abstract class that provides a simple</div><div class='del'>-common interface for accessing indices, including cursors and utility</div><div class='del'>-and maintenance functions.</div><div class='del'>-</div><div class='del'>-In addition, a number of the features in libibex2 were simplified or</div><div class='del'>-rewritten and abstracted into the re-usable classes that follow.</div><div class='del'>-</div><div class='del'>-By providing simple cursors, more complex queries were easier to write</div><div class='del'>-and can execute more efficiently; camel searching now does sub-string</div><div class='del'>-searches for all body queries, and still runs at a very healthy speed</div><div class='del'>-and uses less memory than before.</div><div class='del'>-</div><div class='del'>-CamelBlockFile</div><div class='del'>-</div><div class='del'>-This is basically the same block filesystem used in libibex2.  It</div><div class='del'>-handles disk i/o based on blocks (CamelBlock), flushing modified</div><div class='del'>-blocks to disk, and caching of recently accessed blocks.  It was</div><div class='del'>-enhanced slightly to allow blocks to be locked in memory.</div><div class='del'>-</div><div class='del'>-CamelKeyFile</div><div class='del'>-</div><div class='del'>-This is a simple reverse-linked list of sequences of keyid's.</div><div class='del'>-</div><div class='del'>-The main property of this file is that updates are only ever appended</div><div class='del'>-to the end of the file, which improves i/o characteristics markedly.</div><div class='del'>-</div><div class='del'>-When an existing keyid sequence is updated, it simply points back to</div><div class='del'>-the start of the previous one, and provides a pointer to the new</div><div class='del'>-entry.  i.e. a simple linked list.</div><div class='del'>-</div><div class='del'>-CamelKeyTable</div><div class='del'>-</div><div class='del'>-This is taken from the libibex2 code for mapping keys, with few</div><div class='del'>-changes.  It uses a CamelBlockFile for its i/o.</div><div class='del'>-</div><div class='del'>-The key table is a linked list of blocks (CamelKeyBlock) which contain</div><div class='del'>-key strings and and a data pointer and flags for each key.  Each block</div><div class='del'>-is a packed array of string descriptors (CamelKeyKey's).</div><div class='del'>-</div><div class='del'>-A keyid (camel_key_t) is a 32 bit descriptor which identifies this key</div><div class='del'>-in a reversible way.  In this case the bottom 10 bits are used to</div><div class='del'>-identify the index of the key within the key block, and the top 22</div><div class='del'>-bits are used to identify the key block itself.  In this way, given</div><div class='del'>-the 32 bit key id, we can reference the block containing the key</div><div class='del'>-directly (with at most 1 access), and access the flags and key string</div><div class='del'>-using the key index.</div><div class='del'>-</div><div class='del'>-Keys can potentially be removed and their keyid's reused by simply</div><div class='del'>-re-packing the key block.  This was used in libibex2, but not in</div><div class='del'>-CamelIndex.</div><div class='del'>-</div><div class='del'>-[diagram - camelkeyblock]</div><div class='del'>-</div><div class='del'>-CamelPartitionTable</div><div class='del'>-</div><div class='del'>-An implementation of a scalable, on-disk 'perfect' hash table.  It</div><div class='del'>-uses the CamelBlockFile to handle its i/o.  This is a completely new</div><div class='del'>-hash table implementation which was not present in libibex2.</div><div class='del'>-</div><div class='del'>-[FIXME: Reference the original paper the algorithm is based on.]</div><div class='del'>-</div><div class='del'>-A partition table consists of a list of mapping blocks</div><div class='del'>-(CamelPartitionMapBlock), which is a compact table that maps a range</div><div class='del'>-of hashid's to a partition block (CamelPartitionKeyBlock), which</div><div class='del'>-contains hashid's of that range.</div><div class='del'>-</div><div class='del'>-[diagram - camelpartitiontable]</div><div class='del'>-</div><div class='del'>-The partition block only maps the hashid to a keyid (see CamelKeyTable)</div><div class='del'>-which means it can store a lot of keys in each block.</div><div class='del'>-</div><div class='del'>-To add a new value to the partition table:</div><div class='del'>-</div><div class='del'>-1. Calculate the hash value of the key</div><div class='del'>-2. Find out which partition block the key will fit into, using the</div><div class='del'>-   partition table.</div><div class='del'>-3. If the partition block is full:</div><div class='del'>-4.   If there is room in the next or previous block:</div><div class='del'>-5.     Merge the 2 blocks together, and split at the half-way point</div><div class='del'>-6.     Update the partition table hash indices to match the blocks</div><div class='del'>-7.   Else</div><div class='del'>-8.     Create a new block, and split the existing block across it</div><div class='del'>-9.     Insert the new block into the partition table</div><div class='del'>-10. Else</div><div class='del'>-11.   Just add the key to the end of the block.</div><div class='del'>-</div><div class='del'>-Steps 5 and 8 perform a sorting of the partition key entries by hashid</div><div class='del'>-to find the midpoint.  It may be beneficial to store the hashid's</div><div class='del'>-sorted always, it would then not require a sort to split the blocks.</div><div class='del'>-This would also benefit key lookups by being able to use a binary</div><div class='del'>-search.  However, the incremental sort may be more expensive.</div><div class='del'>-</div><div class='del'>-If the partition table itself fills up, then perform a similar</div><div class='del'>-splitting function on its blocks, and store it over multiple blocks.</div><div class='del'>-With a block size of 1024 bytes, we can fit 127 blocks pointers, each</div><div class='del'>-with 127 keys in it - around 16000 keys.  So we only need 1024 bytes</div><div class='del'>-of memory for each 16000 on-disk keys (assuming full tables).</div><div class='del'>-</div><div class='del'>-Removal is basically the same, but if we end up with an empty block we</div><div class='del'>-just remove it from the partition table.  CamelTextIndex doesn't</div><div class='del'>-actually use removal although it is implemented in</div><div class='del'>-CamelPartitionTable.</div><div class='del'>-</div><div class='del'>-Lookup is very simple.  We basically follow steps 1 and 2, and then</div><div class='del'>-perform a linear search through the block to find a matching hash id.</div><div class='del'>-That is our key.  This is assuming a perfect hash, additionally the</div><div class='del'>-code could use the keyid to lookup in a keytable to verify the key is</div><div class='del'>-indeed the right one.  This would require having to support duplicate</div><div class='del'>-hashid's and would make block splitting slightly more complex, but</div><div class='del'>-only by a couple of lines of code.  This is something that will</div><div class='del'>-probably have to be addressed in the future.</div><div class='del'>-</div><div class='del'>-Using a partition table means that we can tell with 1 disk access</div><div class='del'>-whether or not a key exists (assuming a perfect hash function), and 1</div><div class='del'>-more access to look up all of the details of the key since the keyid</div><div class='del'>-is reversible.  Another feature is that the partition table is always</div><div class='del'>-self-balancing for any data processed in any order.</div><div class='del'>-</div><div class='del'>-Yet one more feature is that it is quite easy to order the writes to</div><div class='del'>-the partition table so that its structure is always consistent, even</div><div class='del'>-in the event of program failure.  Although this has been disabled in</div><div class='del'>-the current code to take maximal advantage of the block cache.</div><div class='del'>-</div><div class='del'>-CamelTextIndex</div><div class='del'>-</div><div class='del'>-CamelTextIndex is the implementation of CamelIndex now used by camel</div><div class='del'>-for indexing mail.  It shares some features with the second</div><div class='del'>-incarnation of libibex, but is generally simpler.  It uses the</div><div class='del'>-previously described classes to implement the CamelIndex interface.</div><div class='del'>-</div><div class='del'>-Indexing operation</div><div class='del'>-</div><div class='del'>-Indexing operation is similar to libibex2, but without the requirement</div><div class='del'>-to maintain the reverse index.</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid from the message name, using the messageid</div><div class='del'>-   partition table.</div><div class='del'>-2. Generate a list of words in the message</div><div class='del'>-3. For each word</div><div class='del'>-4.  Lookup the wordid and sequence information.</div><div class='del'>-5.  Append the messageid to the word sequence.</div><div class='del'>-</div><div class='del'>-In practice we also have a word cache which caches upto 32 messageid's</div><div class='del'>-for each word before it is written to the key file.</div><div class='del'>-</div><div class='del'>-Removing a message</div><div class='del'>-</div><div class='del'>-Removal is not immediate.  This is one of the major performance</div><div class='del'>-improvements in CamelIndex.</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid from the message name partition table</div><div class='del'>-2. Use the messageid to set a flag in the message key table to</div><div class='del'>-   indicate the message has been deleted.</div><div class='del'>-3. Remove the key hash from the partition table.</div><div class='del'>-</div><div class='del'>-This comes down to a maximum of 2 disk reads and 2 disk writes.</div><div class='del'>-libibex2 had unbounded maximums, depending on the number of words in a</div><div class='del'>-given message.  The key file is not changed.</div><div class='del'>-</div><div class='del'>-Because data is not removed from the files at all, an additional</div><div class='del'>-optional step is required, that of compressing the indices.</div><div class='del'>-</div><div class='del'>-Performing a query</div><div class='del'>-</div><div class='del'>-Performing a query is much the same as with libibex2.  We usually have</div><div class='del'>-slightly less disk i/o because of a more efficient and scalable hash</div><div class='del'>-table implementation, and improved locality of reference of the key</div><div class='del'>-table data.</div><div class='del'>-</div><div class='del'>-1. Lookup the messageid from the message name partition table</div><div class='del'>-2. Use the messageid to get the data pointer directly from the key</div><div class='del'>-   table.</div><div class='del'>-3. Iterate through the key file, reading blocks backwards through the</div><div class='del'>-   file.</div><div class='del'>-</div><div class='del'>-Compressing</div><div class='del'>-</div><div class='del'>-Although it could have benefited from it, libibex2 did not ever</div><div class='del'>-compress indices - the only way to compress an index was to remove it</div><div class='del'>-and have it be rebuilt.</div><div class='del'>-</div><div class='del'>-CamelIndex requires a compression stage as data is never removed from</div><div class='del'>-it otherwise.  Because of the much greater locality of reference, the</div><div class='del'>-compression stage is actually much faster than an incremental removal</div><div class='del'>-of data inside the data files.</div><div class='del'>-</div><div class='del'>-Compressing comprises the following steps:</div><div class='del'>-</div><div class='del'>-1. Open a new temporary index, an index block file and an index key</div><div class='del'>-   file.</div><div class='del'>-2. For each message in the message partition table</div><div class='del'>-3.   If the message is not marked deleted, add it to the new message</div><div class='del'>-     partition table, and recored the old messageid to new messageid</div><div class='del'>-     mapping.</div><div class='del'>-4. For each word in the word partition table</div><div class='del'>-5.   For each messageid's in the word sequence list</div><div class='del'>-6.     If the messageid maps to a new messageid, remap the messageid,</div><div class='del'>-       else discard it.</div><div class='del'>-7.     Concatenate upto 256 messageid's in a row before writing to the</div><div class='del'>-       key file, to improve lookups.</div><div class='del'>-8.   Create a new word in the new word key table</div><div class='del'>-9.   Add the wordid and new sequence id to the word partition table.</div><div class='del'>-</div><div class='del'>-Note that at step 8 we could (should?) also check if the word has any</div><div class='del'>-messages associated with it, and discard the word from the new index.</div><div class='del'>-</div><div class='del'>-After compression, the name partition index only contains names which</div><div class='del'>-are not deleted, and the key file is compressed into larger blocks</div><div class='del'>-which takes up less space and is faster to retrieve.</div><div class='del'>-</div><div class='del'>-During index operations a number of statistics are taken which trigger</div><div class='del'>-an automatic compress when the file fragmentation or number of deleted</div><div class='del'>-messages exceed a threshold.  So the index maintains itself, and does</div><div class='del'>-not need manual compression.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/devel-docs/camel_data_wrapper.dia b/camel/devel-docs/camel_data_wrapper.dia<br/>deleted file mode 100644<br/>index 301563d1ee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/devel-docs/camel_data_wrapper.dia?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/devel-docs/camel_data_wrapper.dia</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/camel/devel-docs/camel_parser_states.dia b/camel/devel-docs/camel_parser_states.dia<br/>deleted file mode 100644<br/>index 556a5b1c49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/devel-docs/camel_parser_states.dia?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/devel-docs/camel_parser_states.dia</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/camel/devel-docs/camel_stream.dia b/camel/devel-docs/camel_stream.dia<br/>deleted file mode 100644<br/>index d91d1bb153..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/devel-docs/camel_stream.dia?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/devel-docs/camel_stream.dia</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/camel/gstring-util.c b/camel/gstring-util.c<br/>deleted file mode 100644<br/>index e0d404aede..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gstring-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/gstring-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,216 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* gstring-util : utilities for gstring object  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "gstring-util.h"</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * g_string_equals : test if two string are equal</div><div class='del'>- *</div><div class='del'>- * @string1 : first string</div><div class='del'>- * @string2 : second string</div><div class='del'>- *</div><div class='del'>- * @Return Value : true if the strings equal, false otherwise</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-g_string_equals (GString *string1, GString *string2)</div><div class='del'>-{</div><div class='del'>-	g_assert (string1);</div><div class='del'>-	g_assert (string2);</div><div class='del'>-	return !strcmp (string1-&gt;str, string2-&gt;str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * g_string_clone : clone a GString</div><div class='del'>- *</div><div class='del'>- * @string : the string to clone</div><div class='del'>- *</div><div class='del'>- * @Return Value : the clone ...</div><div class='del'>- **/</div><div class='del'>-GString *</div><div class='del'>-g_string_clone (GString *string)</div><div class='del'>-{</div><div class='del'>-	return g_string_new (string-&gt;str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * g_string_append_g_string : append a GString to another  GString</div><div class='del'>- *</div><div class='del'>- * @dest_string : string which will be appended</div><div class='del'>- * @other_string : string to append</div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-g_string_append_g_string(GString *dest_string, GString *other_string)</div><div class='del'>-{</div><div class='del'>-	g_assert(other_string);</div><div class='del'>-	g_assert(dest_string);</div><div class='del'>-</div><div class='del'>-	if (other_string-&gt;len)</div><div class='del'>-		g_string_append(dest_string, other_string-&gt;str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * g_string_equal_for_hash: test equality of two GStrings for hash tables</div><div class='del'>- * @v: string 1</div><div class='del'>- * @v2: string 2</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-gint</div><div class='del'>-g_string_equal_for_hash (gconstpointer v, gconstpointer v2)</div><div class='del'>-{</div><div class='del'>-  return strcmp ( ((const GString*)v)-&gt;str, ((const GString*)v2)-&gt;str) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-g_string_equal_for_glist (gconstpointer v, gconstpointer v2)</div><div class='del'>-{</div><div class='del'>-  return !strcmp ( ((const GString*)v)-&gt;str, ((const GString*)v2)-&gt;str) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * g_string_hash: computes a hash value for a Gstring</div><div class='del'>- * @v: Gstring object</div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-guint </div><div class='del'>-g_string_hash (gconstpointer v)</div><div class='del'>-{</div><div class='del'>-	return g_str_hash(((const GString*)v)-&gt;str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* utility func : frees a GString element in a GList */</div><div class='del'>-static void </div><div class='del'>-__g_string_list_free_string (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GString *string = (GString *)data;</div><div class='del'>-	g_string_free(string, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-g_string_list_free (GList *string_list)</div><div class='del'>-{</div><div class='del'>-	g_list_foreach(string_list, __g_string_list_free_string, NULL);</div><div class='del'>-	g_list_free(string_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-g_string_split (GString *string, char sep, gchar *trim_chars, GStringTrimOption trim_options)</div><div class='del'>-{</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-	gint first, last, pos;</div><div class='del'>-	gchar *str;</div><div class='del'>-	gchar *new_str;</div><div class='del'>-	GString *new_gstring;</div><div class='del'>-</div><div class='del'>-	g_assert (string);</div><div class='del'>-	str = string-&gt;str;</div><div class='del'>-	if (!str) return NULL;</div><div class='del'>-</div><div class='del'>-	first = 0;</div><div class='del'>-	last = strlen(str) - 1;</div><div class='del'>-	</div><div class='del'>-	/* strip leading and trailing separators */</div><div class='del'>-	while ( (first&lt;=last) &amp;&amp; (str[first]==sep) )</div><div class='del'>-		first++;</div><div class='del'>-	while ( (first&lt;=last) &amp;&amp; (str[last]==sep) )</div><div class='del'>-		last--;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	while (first&lt;=last)  {</div><div class='del'>-		pos = first;</div><div class='del'>-		/* find next separator */</div><div class='del'>-		while ((pos&lt;=last) &amp;&amp; (str[pos]!=sep)) pos++;</div><div class='del'>-		if (first != pos) {</div><div class='del'>-			new_str = g_strndup (str+first, pos-first);</div><div class='del'>-			new_gstring = g_string_new (new_str);</div><div class='del'>-			g_free (new_str);</div><div class='del'>-			/* could do trimming in line to speed up this code */</div><div class='del'>-			if (trim_chars) g_string_trim (new_gstring, trim_chars, trim_options);</div><div class='del'>-			result = g_list_append (result, new_gstring);</div><div class='del'>-		}	</div><div class='del'>-		first = pos + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-g_string_trim (GString *string, gchar *chars, GStringTrimOption options)</div><div class='del'>-{</div><div class='del'>-	gint first_ok;</div><div class='del'>-	gint last_ok;</div><div class='del'>-	guint length;</div><div class='del'>-	gchar *str;</div><div class='del'>-</div><div class='del'>-	if ((!string) || (!string-&gt;str))</div><div class='del'>-		return; </div><div class='del'>-	str = string-&gt;str;</div><div class='del'>-	length = strlen (str);</div><div class='del'>-	if (!length)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	first_ok = 0;</div><div class='del'>-	last_ok = length - 1;</div><div class='del'>-	</div><div class='del'>-	if (options &amp; GSTRING_TRIM_STRIP_LEADING)</div><div class='del'>-		while  ( (first_ok &lt;= last_ok) &amp;&amp; (strchr (chars, str[first_ok])) )</div><div class='del'>-			first_ok++;</div><div class='del'>-</div><div class='del'>-	if (options &amp; GSTRING_TRIM_STRIP_TRAILING)</div><div class='del'>-		while  ( (first_ok &lt;= last_ok) &amp;&amp; (strchr (chars, str[last_ok])) )</div><div class='del'>-			last_ok++;</div><div class='del'>-</div><div class='del'>-	if (first_ok &gt; 0)</div><div class='del'>-		g_string_erase (string, 0, first_ok);</div><div class='del'>-</div><div class='del'>-	if (last_ok &lt; length-1)</div><div class='del'>-		g_string_truncate (string, last_ok - first_ok +1);</div><div class='del'>-	</div><div class='del'>-}</div><div class='head'>diff --git a/camel/gstring-util.h b/camel/gstring-util.h<br/>deleted file mode 100644<br/>index 39fdf32fd1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/gstring-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/gstring-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* gstring-util : utilities for gstring object  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef GSTRING_UTIL_H</div><div class='del'>-#define GSTRING_UTIL_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-    GSTRING_TRIM_NONE            =     0,</div><div class='del'>-    GSTRING_TRIM_STRIP_TRAILING  =     1,</div><div class='del'>-    GSTRING_TRIM_STRIP_LEADING   =     2</div><div class='del'>-} GStringTrimOption;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean g_string_equals          (GString *string1, GString *string2);</div><div class='del'>-GString *g_string_clone           (GString *string);</div><div class='del'>-void     g_string_append_g_string (GString *dest_string,</div><div class='del'>-				   GString *other_string);</div><div class='del'>-</div><div class='del'>-gboolean g_string_equal_for_hash  (gconstpointer v, gconstpointer v2);</div><div class='del'>-gboolean g_string_equal_for_glist (gconstpointer v, gconstpointer v2);</div><div class='del'>-guint    g_string_hash            (gconstpointer v);</div><div class='del'>-void     g_string_list_free       (GList *string_list);</div><div class='del'>-</div><div class='del'>-GList   *g_string_split           (GString *string, char sep,</div><div class='del'>-				   gchar *trim_chars, GStringTrimOption trim_options);</div><div class='del'>-void     g_string_trim            (GString *string, gchar *chars,</div><div class='del'>-				   GStringTrimOption options);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* GSTRING_UTIL_H */</div><div class='head'>diff --git a/camel/hash-table-utils.c b/camel/hash-table-utils.c<br/>deleted file mode 100644<br/>index f17f6ce5d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/hash-table-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/hash-table-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* generic utilities for hash tables */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * free a (key/value) hash table pair.</div><div class='del'>- * to be called in a g_hash_table_foreach()</div><div class='del'>- * before g_hash_table_destroy().</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***/</div><div class='del'>-/* use these two funcs for case insensitive hash table */</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-g_strcase_equal (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	return (g_strcasecmp ((gchar *)a, (gchar *)b) == 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* modified g_str_hash from glib/gstring.c</div><div class='del'>-   because it would have been too slow to</div><div class='del'>-   us g_strdown() on the string */</div><div class='del'>-/* a char* hash function from ASU */</div><div class='del'>-guint</div><div class='del'>-g_strcase_hash (gconstpointer v)</div><div class='del'>-{</div><div class='del'>-	const char *s = (char*)v;</div><div class='del'>-	const char *p;</div><div class='del'>-	guint h=0, g;</div><div class='del'>-	</div><div class='del'>-	for(p = s; *p != '\0'; p += 1) {</div><div class='del'>-		h = ( h &lt;&lt; 4 ) + toupper(*p);</div><div class='del'>-		if ( ( g = h &amp; 0xf0000000 ) ) {</div><div class='del'>-			h = h ^ (g &gt;&gt; 24);</div><div class='del'>-			h = h ^ g;</div><div class='del'>-		}</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  return h /* % M */;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/***/</div><div class='head'>diff --git a/camel/hash-table-utils.h b/camel/hash-table-utils.h<br/>deleted file mode 100644<br/>index 80e9a6057c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/hash-table-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/hash-table-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* generic utilities for hash tables */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef HASH_TABLE_UTILS_H</div><div class='del'>-#define HASH_TABLE_UTILS_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-void g_hash_table_generic_free (gpointer key, gpointer value, gpointer user_data);</div><div class='del'>-</div><div class='del'>-gint g_strcase_equal (gconstpointer a, gconstpointer b);</div><div class='del'>-guint g_strcase_hash (gconstpointer v);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* HASH_TABLE_UTILS_H */</div><div class='head'>diff --git a/camel/providers/.cvsignore b/camel/providers/.cvsignore<br/>deleted file mode 100644<br/>index 3dda72986f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='head'>diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am<br/>deleted file mode 100644<br/>index 5a0df08299..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-if ENABLE_NNTP</div><div class='del'>-NNTP_DIR=nntp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-SUBDIRS = pop3 sendmail smtp imap $(NNTP_DIR) local</div><div class='head'>diff --git a/camel/providers/imap/.cvsignore b/camel/providers/imap/.cvsignore<br/>deleted file mode 100644<br/>index 3fa8afaa38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am<br/>deleted file mode 100644<br/>index dbee888f39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelimapincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamelimap.la</div><div class='del'>-camel_provider_DATA = libcamelimap.urls</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. \</div><div class='del'>-	-I$(srcdir)/..				\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(includedir)				\</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-imap-provider\"	</div><div class='del'>-</div><div class='del'>-libcamelimap_la_SOURCES = 			\</div><div class='del'>-	camel-imap-command.c			\</div><div class='del'>-	camel-imap-folder.c			\</div><div class='del'>-	camel-imap-message-cache.c		\</div><div class='del'>-	camel-imap-provider.c			\</div><div class='del'>-	camel-imap-search.c			\</div><div class='del'>-	camel-imap-store.c			\</div><div class='del'>-	camel-imap-summary.c			\</div><div class='del'>-	camel-imap-utils.c			\</div><div class='del'>-	camel-imap-wrapper.c</div><div class='del'>-</div><div class='del'>-libcamelimapinclude_HEADERS =			\</div><div class='del'>-	camel-imap-command.h			\</div><div class='del'>-	camel-imap-folder.h			\</div><div class='del'>-	camel-imap-message-cache.h		\</div><div class='del'>-	camel-imap-search.h			\</div><div class='del'>-	camel-imap-store.h			\</div><div class='del'>-	camel-imap-summary.h			\</div><div class='del'>-	camel-imap-types.h			\</div><div class='del'>-	camel-imap-utils.h			\</div><div class='del'>-	camel-imap-wrapper.h</div><div class='del'>-</div><div class='del'>-libcamelimap_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-noinst_HEADERS =				\</div><div class='del'>-	camel-imap-private.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelimap.urls</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c<br/>deleted file mode 100644<br/>index f8ea456439..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-command.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-command.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,798 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-command.c: IMAP command sending/parsing routines */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors:</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *    Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdarg.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-private.h"</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-static gboolean imap_command_start (CamelImapStore *store, CamelFolder *folder,</div><div class='del'>-				    const char *cmd, CamelException *ex);</div><div class='del'>-CamelImapResponse *imap_read_response (CamelImapStore *store,</div><div class='del'>-				       CamelException *ex);</div><div class='del'>-static char *imap_read_untagged (CamelImapStore *store, char *line,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-static char *imap_command_strdup_vprintf (CamelImapStore *store,</div><div class='del'>-					  const char *fmt, va_list ap);</div><div class='del'>-static char *imap_command_strdup_printf (CamelImapStore *store,</div><div class='del'>-					 const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command:</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @folder: The folder to perform the operation in (or %NULL if not</div><div class='del'>- * relevant).</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @fmt: a sort of printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This function calls camel_imap_command_start() to send the</div><div class='del'>- * command, then reads the complete response to it using</div><div class='del'>- * camel_imap_command_response() and returns a CamelImapResponse</div><div class='del'>- * structure.</div><div class='del'>- *</div><div class='del'>- * As a special case, if @fmt is %NULL, it will just select @folder</div><div class='del'>- * and return the response from doing so.</div><div class='del'>- *</div><div class='del'>- * See camel_imap_command_start() for details on @fmt.</div><div class='del'>- *</div><div class='del'>- * On success, the store's command_lock will be locked. It will be freed</div><div class='del'>- * when you call camel_imap_response_free. (The lock is recursive, so</div><div class='del'>- * callers can grab and release it themselves if they need to run</div><div class='del'>- * multiple commands atomically.)</div><div class='del'>- *</div><div class='del'>- * Return value: %NULL if an error occurred (in which case @ex will</div><div class='del'>- * be set). Otherwise, a CamelImapResponse describing the server's</div><div class='del'>- * response, which the caller must free with camel_imap_response_free().</div><div class='del'>- **/</div><div class='del'>-CamelImapResponse *</div><div class='del'>-camel_imap_command (CamelImapStore *store, CamelFolder *folder,</div><div class='del'>-		    CamelException *ex, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *cmd;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	if (fmt) {</div><div class='del'>-		va_start (ap, fmt);</div><div class='del'>-		cmd = imap_command_strdup_vprintf (store, fmt, ap);</div><div class='del'>-		va_end (ap);</div><div class='del'>-	} else {</div><div class='del'>-		if (store-&gt;current_folder) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (store-&gt;current_folder));</div><div class='del'>-			store-&gt;current_folder = NULL;</div><div class='del'>-		}</div><div class='del'>-		store-&gt;current_folder = folder;</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (folder));</div><div class='del'>-		cmd = imap_command_strdup_printf (store, "SELECT %F",</div><div class='del'>-						  folder-&gt;full_name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!imap_command_start (store, folder, cmd, ex)) {</div><div class='del'>-		g_free (cmd);</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmd);</div><div class='del'>-	</div><div class='del'>-	return imap_read_response (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command_start:</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @folder: The folder to perform the operation in (or %NULL if not</div><div class='del'>- * relevant).</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @fmt: a sort of printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This function makes sure that @folder (if non-%NULL) is the</div><div class='del'>- * currently-selected folder on @store and then sends the IMAP command</div><div class='del'>- * specified by @fmt and the following arguments.</div><div class='del'>- *</div><div class='del'>- * @fmt can include the following %-escapes ONLY:</div><div class='del'>- *	%s, %d, %%: as with printf</div><div class='del'>- *	%S: an IMAP "string" (quoted string or literal)</div><div class='del'>- *	%F: an IMAP folder name</div><div class='del'>- *</div><div class='del'>- * %S strings will be passed as literals if the server supports LITERAL+</div><div class='del'>- * and quoted strings otherwise. (%S does not support strings that</div><div class='del'>- * contain newlines.)</div><div class='del'>- *</div><div class='del'>- * %F will have the imap store's namespace prepended and then be processed</div><div class='del'>- * like %S.</div><div class='del'>- *</div><div class='del'>- * On success, the store's command_lock will be locked. It will be</div><div class='del'>- * freed when %CAMEL_IMAP_RESPONSE_TAGGED or %CAMEL_IMAP_RESPONSE_ERROR</div><div class='del'>- * is returned from camel_imap_command_response(). (The lock is</div><div class='del'>- * recursive, so callers can grab and release it themselves if they</div><div class='del'>- * need to run multiple commands atomically.)</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE if the command was sent successfully, %FALSE if</div><div class='del'>- * an error occurred (in which case @ex will be set).</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_imap_command_start (CamelImapStore *store, CamelFolder *folder,</div><div class='del'>-			  CamelException *ex, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *cmd;</div><div class='del'>-	gboolean ok;</div><div class='del'>-	</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	cmd = imap_command_strdup_vprintf (store, fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	ok = imap_command_start (store, folder, cmd, ex);</div><div class='del'>-	g_free (cmd);</div><div class='del'>-	</div><div class='del'>-	if (!ok)</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_command_start (CamelImapStore *store, CamelFolder *folder,</div><div class='del'>-		    const char *cmd, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* Check for current folder */</div><div class='del'>-	if (folder &amp;&amp; folder != store-&gt;current_folder) {</div><div class='del'>-		CamelImapResponse *response;</div><div class='del'>-		CamelException internal_ex;</div><div class='del'>-		</div><div class='del'>-		response = camel_imap_command (store, folder, ex, NULL);</div><div class='del'>-		if (!response)</div><div class='del'>-			return FALSE;</div><div class='del'>-		camel_exception_init (&amp;internal_ex);</div><div class='del'>-		camel_imap_folder_selected (folder, response, &amp;internal_ex);</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-		if (camel_exception_is_set (&amp;internal_ex)) {</div><div class='del'>-			camel_exception_xfer (ex, &amp;internal_ex);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Send the command */</div><div class='del'>-	return camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,</div><div class='del'>-					       "%c%.5d %s\r\n",</div><div class='del'>-					       store-&gt;tag_prefix,</div><div class='del'>-					       store-&gt;command++, cmd) != -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command_continuation:</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @cmd: buffer containing the response/request data</div><div class='del'>- * @cmdlen: command length</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This method is for sending continuing responses to the IMAP server</div><div class='del'>- * after camel_imap_command() or camel_imap_command_response() returns</div><div class='del'>- * a continuation response.</div><div class='del'>- * </div><div class='del'>- * This function assumes you have an exclusive lock on the remote stream.</div><div class='del'>- *</div><div class='del'>- * Return value: as for camel_imap_command(). On failure, the store's</div><div class='del'>- * command_lock will be released.</div><div class='del'>- **/</div><div class='del'>-CamelImapResponse *</div><div class='del'>-camel_imap_command_continuation (CamelImapStore *store, const char *cmd,</div><div class='del'>-				 size_t cmdlen, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	stream = CAMEL_REMOTE_STORE (store)-&gt;ostream;</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (stream, cmd, cmdlen) == -1 ||</div><div class='del'>-	    camel_stream_write (stream, "\r\n", 2) == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-					     _("Operation cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					     g_strerror (errno));</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return imap_read_response (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command_response:</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @response: a pointer to pass back the response data in</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This reads a single tagged, untagged, or continuation response from</div><div class='del'>- * @store into *@response. The caller must free the string when it is</div><div class='del'>- * done with it.</div><div class='del'>- *</div><div class='del'>- * Return value: One of %CAMEL_IMAP_RESPONSE_CONTINUATION,</div><div class='del'>- * %CAMEL_IMAP_RESPONSE_UNTAGGED, %CAMEL_IMAP_RESPONSE_TAGGED, or</div><div class='del'>- * %CAMEL_IMAP_RESPONSE_ERROR. If either of the last two, @store's</div><div class='del'>- * command lock will be unlocked.</div><div class='del'>- **/</div><div class='del'>-CamelImapResponseType</div><div class='del'>-camel_imap_command_response (CamelImapStore *store, char **response,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponseType type;</div><div class='del'>-	char *respbuf;</div><div class='del'>-	</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),</div><div class='del'>-					  &amp;respbuf, ex) &lt; 0) {</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return CAMEL_IMAP_RESPONSE_ERROR;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (*respbuf) {</div><div class='del'>-	case '*':</div><div class='del'>-		if (!g_strncasecmp (respbuf, "* BYE", 5)) {</div><div class='del'>-			/* Connection was lost, no more data to fetch */</div><div class='del'>-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      _("Server unexpectedly disconnected: %s"),</div><div class='del'>-					      _("Unknown error")); /* g_strerror (104));  FIXME after 1.0 is released */</div><div class='del'>-			store-&gt;connected = FALSE;</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			respbuf = NULL;</div><div class='del'>-			type = CAMEL_IMAP_RESPONSE_ERROR;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Read the rest of the response. */</div><div class='del'>-		type = CAMEL_IMAP_RESPONSE_UNTAGGED;</div><div class='del'>-		respbuf = imap_read_untagged (store, respbuf, ex);</div><div class='del'>-		if (!respbuf)</div><div class='del'>-			type = CAMEL_IMAP_RESPONSE_ERROR;</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	case '+':</div><div class='del'>-		type = CAMEL_IMAP_RESPONSE_CONTINUATION;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		type = CAMEL_IMAP_RESPONSE_TAGGED;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	*response = respbuf;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_IMAP_RESPONSE_ERROR ||</div><div class='del'>-	    type == CAMEL_IMAP_RESPONSE_TAGGED)</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelImapResponse *</div><div class='del'>-imap_read_response (CamelImapStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelImapResponseType type;</div><div class='del'>-	char *respbuf, *p;</div><div class='del'>-	</div><div class='del'>-	/* Get another lock so that when we reach the tagged</div><div class='del'>-	 * response and camel_imap_command_response unlocks,</div><div class='del'>-	 * we're still locked. This lock is owned by response</div><div class='del'>-	 * and gets unlocked when response is freed.</div><div class='del'>-	 */</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	response = g_new0 (CamelImapResponse, 1);</div><div class='del'>-	if (store-&gt;current_folder &amp;&amp; camel_disco_store_status (CAMEL_DISCO_STORE (store)) != CAMEL_DISCO_STORE_RESYNCING) {</div><div class='del'>-		response-&gt;folder = store-&gt;current_folder;</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (response-&gt;folder));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	response-&gt;untagged = g_ptr_array_new ();</div><div class='del'>-	while ((type = camel_imap_command_response (store, &amp;respbuf, ex))</div><div class='del'>-	       == CAMEL_IMAP_RESPONSE_UNTAGGED)</div><div class='del'>-		g_ptr_array_add (response-&gt;untagged, respbuf);</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_IMAP_RESPONSE_ERROR) {</div><div class='del'>-		camel_imap_response_free_without_processing (store, response);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	response-&gt;status = respbuf;</div><div class='del'>-	</div><div class='del'>-	/* Check for OK or continuation response. */</div><div class='del'>-	if (*respbuf == '+')</div><div class='del'>-		return response;</div><div class='del'>-	p = strchr (respbuf, ' ');</div><div class='del'>-	if (p &amp;&amp; !g_strncasecmp (p, " OK", 3))</div><div class='del'>-		return response;</div><div class='del'>-	</div><div class='del'>-	/* We should never get BAD, or anything else but +, OK, or NO</div><div class='del'>-	 * for that matter.</div><div class='del'>-	 */</div><div class='del'>-	if (!p || g_strncasecmp (p, " NO", 3) != 0) {</div><div class='del'>-		g_warning ("Unexpected response from IMAP server: %s",</div><div class='del'>-			   respbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unexpected response from IMAP "</div><div class='del'>-					"server: %s"), respbuf);</div><div class='del'>-		camel_imap_response_free_without_processing (store, response);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p += 3;</div><div class='del'>-	if (!*p++)</div><div class='del'>-		p = NULL;</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-			      _("IMAP command failed: %s"),</div><div class='del'>-			      p ? p : _("Unknown error"));</div><div class='del'>-	camel_imap_response_free_without_processing (store, response);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Given a line that is the start of an untagged response, read and</div><div class='del'>- * return the complete response, which may include an arbitrary number</div><div class='del'>- * of literals.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int fulllen, length, ldigits, nread, i;</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-	GString *str;</div><div class='del'>-	char *end, *p, *s, *d;</div><div class='del'>-	</div><div class='del'>-	p = strrchr (line, '{');</div><div class='del'>-	if (!p)</div><div class='del'>-		return line;</div><div class='del'>-	</div><div class='del'>-	data = g_ptr_array_new ();</div><div class='del'>-	fulllen = 0;</div><div class='del'>-	</div><div class='del'>-	while (1) {</div><div class='del'>-		str = g_string_new (line);</div><div class='del'>-		g_free (line);</div><div class='del'>-		fulllen += str-&gt;len;</div><div class='del'>-		g_ptr_array_add (data, str);</div><div class='del'>-		</div><div class='del'>-		p = strrchr (str-&gt;str, '{');</div><div class='del'>-		if (!p)</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		length = strtoul (p + 1, &amp;end, 10);</div><div class='del'>-		if (*end != '}' || *(end + 1) || end == p + 1)</div><div class='del'>-			break;</div><div class='del'>-		ldigits = end - (p + 1);</div><div class='del'>-		</div><div class='del'>-		/* Read the literal */</div><div class='del'>-		str = g_string_sized_new (length + 2);</div><div class='del'>-		str-&gt;str[0] = '\n';</div><div class='del'>-		nread = camel_stream_read (CAMEL_REMOTE_STORE (store)-&gt;istream,</div><div class='del'>-					   str-&gt;str + 1, length);</div><div class='del'>-		if (nread == -1) {</div><div class='del'>-			if (errno == EINTR)</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));</div><div class='del'>-			else</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE, g_strerror (errno));</div><div class='del'>-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		if (nread &lt; length) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					     _("Server response ended too soon."));</div><div class='del'>-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		str-&gt;str[length + 1] = '\0';</div><div class='del'>-		</div><div class='del'>-		/* Fix up the literal, turning CRLFs into LF. Also, if</div><div class='del'>-		 * we find any embedded NULs, strip them. This is</div><div class='del'>-		 * dubious, but:</div><div class='del'>-		 *   - The IMAP grammar says you can't have NULs here</div><div class='del'>-		 *     anyway, so this will not affect our behavior</div><div class='del'>-		 *     against any completely correct server.</div><div class='del'>-		 *   - WU-imapd 12.264 (at least) will cheerily pass</div><div class='del'>-		 *     NULs along if they are embedded in the message</div><div class='del'>-		 *   - The only cause of embedded NULs we've seen is an</div><div class='del'>-		 *     Evolution base64-encoder bug that sometimes</div><div class='del'>-		 *     inserts a NUL into the last line when it</div><div class='del'>-		 *     shouldn't.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		s = d = str-&gt;str + 1;</div><div class='del'>-		end = str-&gt;str + 1 + length;</div><div class='del'>-		while (s &lt; end) {</div><div class='del'>-			while (s &lt; end &amp;&amp; *s == '\0') {</div><div class='del'>-				s++;</div><div class='del'>-				length--;</div><div class='del'>-			}</div><div class='del'>-			if (*s == '\r' &amp;&amp; *(s + 1) == '\n') {</div><div class='del'>-				s++;</div><div class='del'>-				length--;</div><div class='del'>-			}</div><div class='del'>-			*d++ = *s++;</div><div class='del'>-		}</div><div class='del'>-		*d = '\0';</div><div class='del'>-		str-&gt;len = length + 1;</div><div class='del'>-		</div><div class='del'>-		/* p points to the "{" in the line that starts the</div><div class='del'>-		 * literal. The length of the CR-less response must be</div><div class='del'>-		 * less than or equal to the length of the response</div><div class='del'>-		 * with CRs, therefore overwriting the old value with</div><div class='del'>-		 * the new value cannot cause an overrun. However, we</div><div class='del'>-		 * don't want it to be shorter either, because then the</div><div class='del'>-		 * GString's length would be off...</div><div class='del'>-		 */</div><div class='del'>-		sprintf (p, "{%0*d}", ldigits, length);</div><div class='del'>-		</div><div class='del'>-		fulllen += str-&gt;len;</div><div class='del'>-		g_ptr_array_add (data, str);</div><div class='del'>-		</div><div class='del'>-		/* Read the next line. */</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),</div><div class='del'>-						  &amp;line, ex) &lt; 0)</div><div class='del'>-			goto lose;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now reassemble the data. */</div><div class='del'>-	p = line = g_malloc (fulllen + 1);</div><div class='del'>-	for (i = 0; i &lt; data-&gt;len; i++) {</div><div class='del'>-		str = data-&gt;pdata[i];</div><div class='del'>-		memcpy (p, str-&gt;str, str-&gt;len);</div><div class='del'>-		p += str-&gt;len;</div><div class='del'>-		g_string_free (str, TRUE);</div><div class='del'>-	}</div><div class='del'>-	*p = '\0';</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-	return line;</div><div class='del'>-	</div><div class='del'>- lose:</div><div class='del'>-	for (i = 0; i &lt; data-&gt;len; i++)</div><div class='del'>-		g_string_free (data-&gt;pdata[i], TRUE);</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_free:</div><div class='del'>- * @store: the CamelImapStore the response is from</div><div class='del'>- * @response: a CamelImapResponse</div><div class='del'>- *</div><div class='del'>- * Frees all of the data in @response and processes any untagged</div><div class='del'>- * EXPUNGE and EXISTS responses in it. Releases @store's command_lock.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_response_free (CamelImapStore *store, CamelImapResponse *response)</div><div class='del'>-{</div><div class='del'>-	int i, number, exists = 0;</div><div class='del'>-	GArray *expunged = NULL;</div><div class='del'>-	char *resp, *p;</div><div class='del'>-	</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		</div><div class='del'>-		if (response-&gt;folder) {</div><div class='del'>-			/* Check if it's something we need to handle. */</div><div class='del'>-			number = strtoul (resp + 2, &amp;p, 10);</div><div class='del'>-			if (!g_strcasecmp (p, " EXISTS")) {</div><div class='del'>-				exists = number;</div><div class='del'>-			} else if (!g_strcasecmp (p, " EXPUNGE")) {</div><div class='del'>-				if (!expunged) {</div><div class='del'>-					expunged = g_array_new (FALSE, FALSE,</div><div class='del'>-								sizeof (int));</div><div class='del'>-				}</div><div class='del'>-				g_array_append_val (expunged, number);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free (resp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_free (response-&gt;untagged, TRUE);</div><div class='del'>-	g_free (response-&gt;status);</div><div class='del'>-	</div><div class='del'>-	if (response-&gt;folder) {</div><div class='del'>-		if (exists &gt; 0 || expunged) {</div><div class='del'>-			/* Update the summary */</div><div class='del'>-			camel_imap_folder_changed (response-&gt;folder,</div><div class='del'>-						   exists, expunged, NULL);</div><div class='del'>-			if (expunged)</div><div class='del'>-				g_array_free (expunged, TRUE);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (response-&gt;folder));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (response);</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_free_without_processing:</div><div class='del'>- * @store: the CamelImapStore the response is from.</div><div class='del'>- * @response: a CamelImapResponse:</div><div class='del'>- *</div><div class='del'>- * Frees all of the data in @response without processing any untagged</div><div class='del'>- * responses. Releases @store's command lock.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_response_free_without_processing (CamelImapStore *store,</div><div class='del'>-					     CamelImapResponse *response)</div><div class='del'>-{</div><div class='del'>-	if (response-&gt;folder) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (response-&gt;folder));</div><div class='del'>-		response-&gt;folder = NULL;</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_extract:</div><div class='del'>- * @store: the store the response came from</div><div class='del'>- * @response: the response data returned from camel_imap_command</div><div class='del'>- * @type: the response type to extract</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This checks that @response contains a single untagged response of</div><div class='del'>- * type @type and returns just that response data. If @response</div><div class='del'>- * doesn't contain the right information, the function will set @ex</div><div class='del'>- * and return %NULL. Either way, @response will be freed and the</div><div class='del'>- * store's command_lock released.</div><div class='del'>- *</div><div class='del'>- * Return value: the desired response string, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_imap_response_extract (CamelImapStore *store,</div><div class='del'>-			     CamelImapResponse *response,</div><div class='del'>-			     const char *type,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int len = strlen (type), i;</div><div class='del'>-	char *resp;</div><div class='del'>-	</div><div class='del'>-	len = strlen (type);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		/* Skip "* ", and initial sequence number, if present */</div><div class='del'>-		strtoul (resp + 2, &amp;resp, 10);</div><div class='del'>-		if (*resp == ' ')</div><div class='del'>-			resp = (char *) imap_next_word (resp);</div><div class='del'>-		</div><div class='del'>-		if (!g_strncasecmp (resp, type, len))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (i &lt; response-&gt;untagged-&gt;len) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		g_ptr_array_remove_index (response-&gt;untagged, i);</div><div class='del'>-	} else {</div><div class='del'>-		resp = NULL;</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("IMAP server response did not contain "</div><div class='del'>-					"%s information"), type);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_extract_continuation:</div><div class='del'>- * @store: the store the response came from</div><div class='del'>- * @response: the response data returned from camel_imap_command</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This checks that @response contains a continuation response, and</div><div class='del'>- * returns just that data. If @response doesn't contain a continuation</div><div class='del'>- * response, the function will set @ex, release @store's command_lock,</div><div class='del'>- * and return %NULL. Either way, @response will be freed.</div><div class='del'>- *</div><div class='del'>- * Return value: the desired response string, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_imap_response_extract_continuation (CamelImapStore *store,</div><div class='del'>-					  CamelImapResponse *response,</div><div class='del'>-					  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *status;</div><div class='del'>-	</div><div class='del'>-	if (response-&gt;status &amp;&amp; *response-&gt;status == '+') {</div><div class='del'>-		status = response-&gt;status;</div><div class='del'>-		response-&gt;status = NULL;</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-			      _("Unexpected OK response from IMAP server: %s"),</div><div class='del'>-			      response-&gt;status);</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-imap_command_strdup_vprintf (CamelImapStore *store, const char *fmt,</div><div class='del'>-			     va_list ap)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *args;</div><div class='del'>-	const char *p, *start;</div><div class='del'>-	char *out, *op, *string;</div><div class='del'>-	int num, len, i, arglen;</div><div class='del'>-	</div><div class='del'>-	args = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	/* Determine the length of the data */</div><div class='del'>-	len = strlen (fmt);</div><div class='del'>-	p = start = fmt;</div><div class='del'>-	while (*p) {</div><div class='del'>-		p = strchr (start, '%');</div><div class='del'>-		if (!p)</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		switch (*++p) {</div><div class='del'>-		case 'd':</div><div class='del'>-			num = va_arg (ap, int);</div><div class='del'>-			g_ptr_array_add (args, GINT_TO_POINTER (num));</div><div class='del'>-			start = p + 1;</div><div class='del'>-			len += 10;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case 's':</div><div class='del'>-			string = va_arg (ap, char *);</div><div class='del'>-			g_ptr_array_add (args, string);</div><div class='del'>-			start = p + 1;</div><div class='del'>-			len += strlen (string);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case 'S':</div><div class='del'>-		case 'F':</div><div class='del'>-			string = va_arg (ap, char *);</div><div class='del'>-			arglen = strlen (string);</div><div class='del'>-			if (*p == 'F') {</div><div class='del'>-				if (store-&gt;namespace == NULL) {</div><div class='del'>-					if (*string != '\0') /*ok if foldername is "" */</div><div class='del'>-						g_warning ("trying to list folder \"%s\" but no namespace. Hope for the best", string);</div><div class='del'>-					arglen += 2;</div><div class='del'>-				} else</div><div class='del'>-					arglen += strlen (store-&gt;namespace) + 1;</div><div class='del'>-			}</div><div class='del'>-			g_ptr_array_add (args, string);</div><div class='del'>-			if (imap_is_atom(string)) {</div><div class='del'>-				len += arglen;</div><div class='del'>-			} else {</div><div class='del'>-				if (store-&gt;capabilities &amp; IMAP_CAPABILITY_LITERALPLUS)</div><div class='del'>-					len += arglen + 15;</div><div class='del'>-				else</div><div class='del'>-					len += arglen * 2;</div><div class='del'>-			}</div><div class='del'>-			start = p + 1;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '%':</div><div class='del'>-			start = p;</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		default:</div><div class='del'>-			g_warning ("camel-imap-command is not printf. I don't "</div><div class='del'>-				   "know what '%%%c' means.", *p);</div><div class='del'>-			start = *p ? p + 1 : p;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now write out the string */</div><div class='del'>-	op = out = g_malloc (len + 1);</div><div class='del'>-	p = start = fmt;</div><div class='del'>-	i = 0;</div><div class='del'>-	while (*p) {</div><div class='del'>-		p = strchr (start, '%');</div><div class='del'>-		if (!p) {</div><div class='del'>-			strcpy (op, start);</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			strncpy (op, start, p - start);</div><div class='del'>-			op += p - start;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		switch (*++p) {</div><div class='del'>-		case 'd':</div><div class='del'>-			num = GPOINTER_TO_INT (args-&gt;pdata[i++]);</div><div class='del'>-			op += sprintf (op, "%d", num);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case 's':</div><div class='del'>-			string = args-&gt;pdata[i++];</div><div class='del'>-			op += sprintf (op, "%s", string);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		case 'S':</div><div class='del'>-		case 'F':</div><div class='del'>-			string = args-&gt;pdata[i++];</div><div class='del'>-			if (*p == 'F') {</div><div class='del'>-				char *mailbox;</div><div class='del'>-				</div><div class='del'>-				mailbox = imap_namespace_concat (store, string);</div><div class='del'>-				string = imap_mailbox_encode (mailbox, strlen (mailbox));</div><div class='del'>-				g_free (mailbox);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (imap_is_atom(string)) {</div><div class='del'>-				op += sprintf(op, "%s", string);</div><div class='del'>-			} else {</div><div class='del'>-				if (store-&gt;capabilities &amp; IMAP_CAPABILITY_LITERALPLUS) {</div><div class='del'>-					op += sprintf (op, "{%d+}\r\n%s",</div><div class='del'>-						       strlen (string), string);</div><div class='del'>-				} else {</div><div class='del'>-					char *quoted = imap_quote_string (string);</div><div class='del'>-</div><div class='del'>-					op += sprintf (op, "%s", quoted);</div><div class='del'>-					g_free (quoted);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (*p == 'F')</div><div class='del'>-				g_free (string);</div><div class='del'>-			break;</div><div class='del'>-			</div><div class='del'>-		default:</div><div class='del'>-			*op++ = '%';</div><div class='del'>-			*op++ = *p;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		start = *p ? p + 1 : p;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-imap_command_strdup_printf (CamelImapStore *store, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *result;</div><div class='del'>-	</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	result = imap_command_strdup_vprintf (store, fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-	</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h<br/>deleted file mode 100644<br/>index 3539ac63d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-command.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-command.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-command.h: IMAP command sending/parsing routines */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_COMMAND_H</div><div class='del'>-#define CAMEL_IMAP_COMMAND_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_IMAP_RESPONSE_ERROR,</div><div class='del'>-	CAMEL_IMAP_RESPONSE_CONTINUATION,</div><div class='del'>-	CAMEL_IMAP_RESPONSE_UNTAGGED,</div><div class='del'>-	CAMEL_IMAP_RESPONSE_TAGGED</div><div class='del'>-} CamelImapResponseType;</div><div class='del'>-</div><div class='del'>-struct _CamelImapResponse {</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	GPtrArray *untagged;</div><div class='del'>-	char *status;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelImapResponse *camel_imap_command              (CamelImapStore *store,</div><div class='del'>-						    CamelFolder *folder,</div><div class='del'>-						    CamelException *ex,</div><div class='del'>-						    const char *fmt, ...);</div><div class='del'>-CamelImapResponse *camel_imap_command_continuation (CamelImapStore *store,</div><div class='del'>-						    const char *cmd,</div><div class='del'>-						    size_t cmdlen,</div><div class='del'>-						    CamelException *ex);</div><div class='del'>-</div><div class='del'>-void  camel_imap_response_free                     (CamelImapStore *store,</div><div class='del'>-						    CamelImapResponse *response);</div><div class='del'>-void  camel_imap_response_free_without_processing  (CamelImapStore *store,</div><div class='del'>-						    CamelImapResponse *response);</div><div class='del'>-char *camel_imap_response_extract                  (CamelImapStore *store,</div><div class='del'>-						    CamelImapResponse *response,</div><div class='del'>-						    const char *type,</div><div class='del'>-						    CamelException *ex);</div><div class='del'>-char *camel_imap_response_extract_continuation     (CamelImapStore *store,</div><div class='del'>-						    CamelImapResponse *response,</div><div class='del'>-						    CamelException *ex);</div><div class='del'>-</div><div class='del'>-gboolean           camel_imap_command_start        (CamelImapStore *store,</div><div class='del'>-						    CamelFolder *folder,</div><div class='del'>-						    CamelException *ex,</div><div class='del'>-						    const char *fmt, ...);</div><div class='del'>-CamelImapResponseType camel_imap_command_response  (CamelImapStore *store,</div><div class='del'>-						    char **respbuf,</div><div class='del'>-						    CamelException *ex);</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_COMMAND_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c<br/>deleted file mode 100644<br/>index 44161f7868..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2381 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-folder.c: class for an imap folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt; </div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-path.h"</div><div class='del'>-</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-message-cache.h"</div><div class='del'>-#include "camel-imap-private.h"</div><div class='del'>-#include "camel-imap-search.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-wrapper.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-disco-diary.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-mime-utils.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/* set to -1 for infinite size */</div><div class='del'>-#define UID_SET_LIMIT  (4096)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-static CamelDiscoFolderClass *disco_folder_class = NULL;</div><div class='del'>-</div><div class='del'>-static void imap_finalize (CamelObject *object);</div><div class='del'>-static void imap_rescan (CamelFolder *folder, int exists, CamelException *ex);</div><div class='del'>-static void imap_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_sync_online (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_sync_offline (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_expunge_uids_online (CamelFolder *folder, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void imap_expunge_uids_offline (CamelFolder *folder, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void imap_expunge_uids_resyncing (CamelFolder *folder, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void imap_cache_message (CamelDiscoFolder *disco_folder, const char *uid, CamelException *ex);</div><div class='del'>-static void imap_rename (CamelFolder *folder, const char *new);</div><div class='del'>-</div><div class='del'>-/* message manipulation */</div><div class='del'>-static CamelMimeMessage *imap_get_message (CamelFolder *folder, const gchar *uid,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-static void imap_append_online (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-				CamelException *ex);</div><div class='del'>-static void imap_append_offline (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				 const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-static void imap_append_resyncing (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				   const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void imap_transfer_online (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				  CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-				  gboolean delete_originals,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-static void imap_transfer_offline (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				   CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-				   gboolean delete_originals,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-static void imap_transfer_resyncing (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-				     CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-				     gboolean delete_originals,</div><div class='del'>-				     CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* searching */</div><div class='del'>-static GPtrArray *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-static GPtrArray *imap_search_by_uids	    (CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void       imap_search_free          (CamelFolder *folder, GPtrArray *uids);</div><div class='del'>-</div><div class='del'>-static void imap_thaw (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-GData *parse_fetch_response (CamelImapFolder *imap_folder, char *msg_att);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_folder_class_init (CamelImapFolderClass *camel_imap_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_imap_folder_class);</div><div class='del'>-	CamelDiscoFolderClass *camel_disco_folder_class = CAMEL_DISCO_FOLDER_CLASS (camel_imap_folder_class);</div><div class='del'>-</div><div class='del'>-	disco_folder_class = CAMEL_DISCO_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_disco_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;get_message = imap_get_message;</div><div class='del'>-	camel_folder_class-&gt;rename = imap_rename;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = imap_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_by_uids = imap_search_by_uids;</div><div class='del'>-	camel_folder_class-&gt;search_free = imap_search_free;</div><div class='del'>-	camel_folder_class-&gt;thaw = imap_thaw;</div><div class='del'>-</div><div class='del'>-	camel_disco_folder_class-&gt;refresh_info_online = imap_refresh_info;</div><div class='del'>-	camel_disco_folder_class-&gt;sync_online = imap_sync_online;</div><div class='del'>-	camel_disco_folder_class-&gt;sync_offline = imap_sync_offline;</div><div class='del'>-	/* We don't sync flags at resync time: the online code will</div><div class='del'>-	 * deal with it eventually.</div><div class='del'>-	 */</div><div class='del'>-	camel_disco_folder_class-&gt;sync_resyncing = imap_sync_offline;</div><div class='del'>-	camel_disco_folder_class-&gt;expunge_uids_online = imap_expunge_uids_online;</div><div class='del'>-	camel_disco_folder_class-&gt;expunge_uids_offline = imap_expunge_uids_offline;</div><div class='del'>-	camel_disco_folder_class-&gt;expunge_uids_resyncing = imap_expunge_uids_resyncing;</div><div class='del'>-	camel_disco_folder_class-&gt;append_online = imap_append_online;</div><div class='del'>-	camel_disco_folder_class-&gt;append_offline = imap_append_offline;</div><div class='del'>-	camel_disco_folder_class-&gt;append_resyncing = imap_append_resyncing;</div><div class='del'>-	camel_disco_folder_class-&gt;transfer_online = imap_transfer_online;</div><div class='del'>-	camel_disco_folder_class-&gt;transfer_offline = imap_transfer_offline;</div><div class='del'>-	camel_disco_folder_class-&gt;transfer_resyncing = imap_transfer_resyncing;</div><div class='del'>-	camel_disco_folder_class-&gt;cache_message = imap_cache_message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_folder_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (object);</div><div class='del'>-	</div><div class='del'>-	folder-&gt;folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |</div><div class='del'>-				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);</div><div class='del'>-	</div><div class='del'>-	imap_folder-&gt;priv = g_malloc0(sizeof(*imap_folder-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	imap_folder-&gt;priv-&gt;search_lock = e_mutex_new(E_MUTEX_SIMPLE);</div><div class='del'>-	imap_folder-&gt;priv-&gt;cache_lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	imap_folder-&gt;need_rescan = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_folder_type =</div><div class='del'>-			camel_type_register (CAMEL_DISCO_FOLDER_TYPE, "CamelImapFolder",</div><div class='del'>-					     sizeof (CamelImapFolder),</div><div class='del'>-					     sizeof (CamelImapFolderClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_imap_folder_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_imap_folder_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) imap_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_imap_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_imap_folder_new (CamelStore *parent, const char *folder_name,</div><div class='del'>-		       const char *folder_dir, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (parent);</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelImapFolder *imap_folder;</div><div class='del'>-	const char *short_name;</div><div class='del'>-	char *summary_file;</div><div class='del'>-</div><div class='del'>-	if (camel_mkdir_hier (folder_dir, S_IRWXU) != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create directory %s: %s"),</div><div class='del'>-				      folder_dir, g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new (camel_imap_folder_get_type ()));</div><div class='del'>-	short_name = strrchr (folder_name, imap_store-&gt;dir_sep);</div><div class='del'>-	if (short_name)</div><div class='del'>-		short_name++;</div><div class='del'>-	else</div><div class='del'>-		short_name = folder_name;</div><div class='del'>-	camel_folder_construct (folder, parent, folder_name, short_name);</div><div class='del'>-</div><div class='del'>-	summary_file = g_strdup_printf ("%s/summary", folder_dir);</div><div class='del'>-	folder-&gt;summary = camel_imap_summary_new (summary_file);</div><div class='del'>-	g_free (summary_file);</div><div class='del'>-	if (!folder-&gt;summary) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not load summary for %s"),</div><div class='del'>-				      folder_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	imap_folder-&gt;cache = camel_imap_message_cache_new (folder_dir, folder-&gt;summary, ex);</div><div class='del'>-	if (!imap_folder-&gt;cache) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((imap_store-&gt;parameters &amp; IMAP_PARAM_FILTER_INBOX) &amp;&amp;</div><div class='del'>-	    !g_strcasecmp (folder_name, "INBOX"))</div><div class='del'>-		folder-&gt;folder_flags |= CAMEL_FOLDER_FILTER_RECENT;</div><div class='del'>-</div><div class='del'>-	imap_folder-&gt;search = camel_imap_search_new(folder_dir);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called with the store's command_lock locked */</div><div class='del'>-void</div><div class='del'>-camel_imap_folder_selected (CamelFolder *folder, CamelImapResponse *response,</div><div class='del'>-			    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapSummary *imap_summary = CAMEL_IMAP_SUMMARY (folder-&gt;summary);</div><div class='del'>-	unsigned long exists = 0, validity = 0, val, uid;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GData *fetch_data;</div><div class='del'>-	int i, count;</div><div class='del'>-	char *resp;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (folder-&gt;parent_store, command_lock);</div><div class='del'>-	</div><div class='del'>-	count = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i] + 2;</div><div class='del'>-		if (!g_strncasecmp (resp, "FLAGS ", 6) &amp;&amp;</div><div class='del'>-		    !folder-&gt;permanent_flags) {</div><div class='del'>-			resp += 6;</div><div class='del'>-			folder-&gt;permanent_flags = imap_parse_flag_list (&amp;resp);</div><div class='del'>-		} else if (!g_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {</div><div class='del'>-			resp += 19;</div><div class='del'>-			folder-&gt;permanent_flags = imap_parse_flag_list (&amp;resp);</div><div class='del'>-		} else if (!g_strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {</div><div class='del'>-			validity = strtoul (resp + 16, NULL, 10);</div><div class='del'>-		} else if (isdigit ((unsigned char)*resp)) {</div><div class='del'>-			unsigned long num = strtoul (resp, &amp;resp, 10);</div><div class='del'>-			</div><div class='del'>-			if (!g_strncasecmp (resp, " EXISTS", 7)) {</div><div class='del'>-				exists = num;</div><div class='del'>-				/* Remove from the response so nothing</div><div class='del'>-				 * else tries to interpret it.</div><div class='del'>-				 */</div><div class='del'>-				g_free (response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-				g_ptr_array_remove_index (response-&gt;untagged, i--);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (camel_disco_store_status (CAMEL_DISCO_STORE (folder-&gt;parent_store)) == CAMEL_DISCO_STORE_RESYNCING) {</div><div class='del'>-		if (validity != imap_summary-&gt;validity) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,</div><div class='del'>-					      _("Folder was destroyed and recreated on server."));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* FIXME: find missing UIDs ? */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!imap_summary-&gt;validity)</div><div class='del'>-		imap_summary-&gt;validity = validity;</div><div class='del'>-	else if (validity != imap_summary-&gt;validity) {</div><div class='del'>-		imap_summary-&gt;validity = validity;</div><div class='del'>-		camel_folder_summary_clear (folder-&gt;summary);</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);</div><div class='del'>-		camel_imap_message_cache_clear (imap_folder-&gt;cache);</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-		imap_folder-&gt;need_rescan = FALSE;</div><div class='del'>-		camel_imap_folder_changed (folder, exists, NULL, ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we've lost messages, we have to rescan everything */</div><div class='del'>-	if (exists &lt; count)</div><div class='del'>-		imap_folder-&gt;need_rescan = TRUE;</div><div class='del'>-	else if (count != 0 &amp;&amp; !imap_folder-&gt;need_rescan) {</div><div class='del'>-		CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-		</div><div class='del'>-		/* Similarly, if the UID of the highest message we</div><div class='del'>-		 * know about has changed, then that indicates that</div><div class='del'>-		 * messages have been both added and removed, so we</div><div class='del'>-		 * have to rescan to find the removed ones. (We pass</div><div class='del'>-		 * NULL for the folder since we know that this folder</div><div class='del'>-		 * is selected, and we don't want camel_imap_command</div><div class='del'>-		 * to worry about it.)</div><div class='del'>-		 */</div><div class='del'>-		response = camel_imap_command (store, NULL, ex, "FETCH %d UID", count);</div><div class='del'>-		if (!response)</div><div class='del'>-			return;</div><div class='del'>-		uid = 0;</div><div class='del'>-		for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-			resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-			val = strtoul (resp + 2, &amp;resp, 10);</div><div class='del'>-			if (val == 0)</div><div class='del'>-				continue;</div><div class='del'>-			if (!g_strcasecmp (resp, " EXISTS")) {</div><div class='del'>-				/* Another one?? */</div><div class='del'>-				exists = val;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (uid != 0 || val != count || g_strncasecmp (resp, " FETCH (", 8) != 0)</div><div class='del'>-				continue;</div><div class='del'>-			</div><div class='del'>-			fetch_data = parse_fetch_response (imap_folder, resp + 7);</div><div class='del'>-			uid = strtoul (g_datalist_get_data (&amp;fetch_data, "UID"), NULL, 10);</div><div class='del'>-			g_datalist_clear (&amp;fetch_data);</div><div class='del'>-		}</div><div class='del'>-		camel_imap_response_free_without_processing (store, response);</div><div class='del'>-		</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, count - 1);</div><div class='del'>-		val = strtoul (camel_message_info_uid (info), NULL, 10);</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-		if (uid == 0 || uid != val)</div><div class='del'>-			imap_folder-&gt;need_rescan = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now rescan if we need to */</div><div class='del'>-	if (imap_folder-&gt;need_rescan) {</div><div class='del'>-		imap_rescan (folder, exists, ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we don't need to rescan completely, but new messages</div><div class='del'>-	 * have been added, find out about them.</div><div class='del'>-	 */</div><div class='del'>-	if (exists &gt; count)</div><div class='del'>-		camel_imap_folder_changed (folder, exists, NULL, ex);</div><div class='del'>-	</div><div class='del'>-	/* And we're done. */</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-imap_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	if (imap_folder-&gt;search)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (imap_folder-&gt;search));</div><div class='del'>-	if (imap_folder-&gt;cache)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (imap_folder-&gt;cache));</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy(imap_folder-&gt;priv-&gt;search_lock);</div><div class='del'>-	e_mutex_destroy(imap_folder-&gt;priv-&gt;cache_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(imap_folder-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_rename (CamelFolder *folder, const char *new)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = (CamelImapFolder *)folder;</div><div class='del'>-	CamelImapStore *imap_store = (CamelImapStore *)folder-&gt;parent_store;</div><div class='del'>-	char *folder_dir, *summary_path;</div><div class='del'>-</div><div class='del'>-	folder_dir = e_path_to_physical (imap_store-&gt;storage_path, new);</div><div class='del'>-	summary_path = g_strdup_printf("%s/summary", folder_dir);</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK (folder, cache_lock);</div><div class='del'>-	camel_imap_message_cache_set_path(imap_folder-&gt;cache, folder_dir);</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK (folder, cache_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_filename(folder-&gt;summary, summary_path);</div><div class='del'>-</div><div class='del'>-	g_free(summary_path);</div><div class='del'>-	g_free(folder_dir);</div><div class='del'>-</div><div class='del'>-	((CamelFolderClass *)disco_folder_class)-&gt;rename(folder, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	if (camel_disco_store_status (CAMEL_DISCO_STORE (imap_store)) == CAMEL_DISCO_STORE_OFFLINE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (camel_folder_is_frozen (folder)) {</div><div class='del'>-		imap_folder-&gt;need_refresh = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the folder isn't selected, select it (which will force</div><div class='del'>-	 * a rescan if one is needed.</div><div class='del'>-	 */</div><div class='del'>-	if (imap_store-&gt;current_folder != folder) {</div><div class='del'>-		response = camel_imap_command (imap_store, folder, ex, NULL);</div><div class='del'>-		camel_imap_response_free (imap_store, response);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Otherwise, if we need a rescan, do it, and if not, just do</div><div class='del'>-	 * a NOOP to give the server a chance to tell us about new</div><div class='del'>-	 * messages.</div><div class='del'>-	 */</div><div class='del'>-	if (imap_folder-&gt;need_rescan)</div><div class='del'>-		imap_rescan (folder, camel_folder_summary_count (folder-&gt;summary), ex);</div><div class='del'>-	else {</div><div class='del'>-		response = camel_imap_command (imap_store, folder, ex, "NOOP");</div><div class='del'>-		camel_imap_response_free (imap_store, response);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called with the store's command_lock locked */</div><div class='del'>-static void</div><div class='del'>-imap_rescan (CamelFolder *folder, int exists, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	struct {</div><div class='del'>-		char *uid;</div><div class='del'>-		guint32 flags;</div><div class='del'>-	} *new;</div><div class='del'>-	char *resp;</div><div class='del'>-	CamelImapResponseType type;</div><div class='del'>-	int i, seq, summary_len, summary_got;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelImapMessageInfo *iinfo;</div><div class='del'>-	GArray *removed;</div><div class='del'>-	gboolean ok;</div><div class='del'>-	CamelFolderChangeInfo *changes = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (store, command_lock);</div><div class='del'>-	imap_folder-&gt;need_rescan = FALSE;</div><div class='del'>-	</div><div class='del'>-	summary_len = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	if (summary_len == 0) {</div><div class='del'>-		if (exists)</div><div class='del'>-			camel_imap_folder_changed (folder, exists, NULL, ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Check UIDs and flags of all messages we already know of. */</div><div class='del'>-	camel_operation_start (NULL, _("Scanning for changed messages"));</div><div class='del'>-	info = camel_folder_summary_index (folder-&gt;summary, summary_len - 1);</div><div class='del'>-	ok = camel_imap_command_start (store, folder, ex,</div><div class='del'>-				       "UID FETCH 1:%s (FLAGS)",</div><div class='del'>-				       camel_message_info_uid (info));</div><div class='del'>-	camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-	if (!ok) {</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	new = g_malloc0 (summary_len * sizeof (*new));</div><div class='del'>-	summary_got = 0;</div><div class='del'>-	while ((type = camel_imap_command_response (store, &amp;resp, ex)) == CAMEL_IMAP_RESPONSE_UNTAGGED) {</div><div class='del'>-		GData *data;</div><div class='del'>-		char *uid;</div><div class='del'>-		guint32 flags;</div><div class='del'>-		</div><div class='del'>-		data = parse_fetch_response (imap_folder, resp);</div><div class='del'>-		g_free (resp);</div><div class='del'>-		if (!data)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		seq = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "SEQUENCE"));</div><div class='del'>-		uid = g_datalist_get_data (&amp;data, "UID");</div><div class='del'>-		flags = GPOINTER_TO_UINT (g_datalist_get_data (&amp;data, "FLAGS"));</div><div class='del'>-		</div><div class='del'>-		if (!uid || !seq || seq &gt;= summary_len) {</div><div class='del'>-			g_datalist_clear (&amp;data);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_operation_progress (NULL, ++summary_got * 100 / summary_len);</div><div class='del'>-		new[seq - 1].uid = g_strdup (uid);</div><div class='del'>-		new[seq - 1].flags = flags;</div><div class='del'>-		g_datalist_clear (&amp;data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	if (type == CAMEL_IMAP_RESPONSE_ERROR) {</div><div class='del'>-		for (i = 0; i &lt; summary_len &amp;&amp; new[i].uid; i++)</div><div class='del'>-			g_free (new[i].uid);</div><div class='del'>-		g_free (new);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	/* Free the final tagged response */</div><div class='del'>-	g_free (resp);</div><div class='del'>-	</div><div class='del'>-	/* If we find a UID in the summary that doesn't correspond to</div><div class='del'>-	 * the UID in the folder, then either: (a) it's a real UID,</div><div class='del'>-	 * but the message was deleted on the server, or (b) it's a</div><div class='del'>-	 * fake UID, and needs to be removed from the summary in order</div><div class='del'>-	 * to sync up with the server. So either way, we remove it</div><div class='del'>-	 * from the summary.</div><div class='del'>-	 */</div><div class='del'>-	removed = g_array_new (FALSE, FALSE, sizeof (int));</div><div class='del'>-	for (i = 0; i &lt; summary_len &amp;&amp; new[i].uid; i++) {</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, i);</div><div class='del'>-		iinfo = (CamelImapMessageInfo *)info;</div><div class='del'>-		</div><div class='del'>-		if (strcmp (camel_message_info_uid (info), new[i].uid) != 0) {</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-			seq = i + 1;</div><div class='del'>-			g_array_append_val (removed, seq);</div><div class='del'>-			i--;</div><div class='del'>-			summary_len--;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Update summary flags */</div><div class='del'>-		if (new[i].flags != iinfo-&gt;server_flags) {</div><div class='del'>-			guint32 server_set, server_cleared;</div><div class='del'>-			</div><div class='del'>-			server_set = new[i].flags &amp; ~iinfo-&gt;server_flags;</div><div class='del'>-			server_cleared = iinfo-&gt;server_flags &amp; ~new[i].flags;</div><div class='del'>-			</div><div class='del'>-			info-&gt;flags = (info-&gt;flags | server_set) &amp; ~server_cleared;</div><div class='del'>-			iinfo-&gt;server_flags = new[i].flags;</div><div class='del'>-</div><div class='del'>-			if (changes == NULL)</div><div class='del'>-				changes = camel_folder_change_info_new();</div><div class='del'>-			camel_folder_change_info_change_uid(changes, new[i].uid);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-		g_free (new[i].uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (changes) {</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT (folder), "folder_changed", changes);</div><div class='del'>-		camel_folder_change_info_free(changes);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	seq = i + 1;</div><div class='del'>-	</div><div class='del'>-	/* Free remaining memory. */</div><div class='del'>-	while (i &lt; summary_len &amp;&amp; new[i].uid)</div><div class='del'>-		g_free (new[i++].uid);</div><div class='del'>-	g_free (new);</div><div class='del'>-	</div><div class='del'>-	/* Remove any leftover cached summary messages. (Yes, we</div><div class='del'>-	 * repeatedly add the same number to the removed array.</div><div class='del'>-	 * See RFC2060 7.4.1)</div><div class='del'>-	 */</div><div class='del'>-	for (i = seq; i &lt;= summary_len; i++)</div><div class='del'>-		g_array_append_val (removed, seq);</div><div class='del'>-	</div><div class='del'>-	/* And finally update the summary. */</div><div class='del'>-	camel_imap_folder_changed (folder, exists, removed, ex);</div><div class='del'>-	g_array_free (removed, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the max number of chars that an unsigned 32-bit int can be is 10 chars plus 1 for a possible : */</div><div class='del'>-#define UID_SET_FULL(setlen, maxlen) (maxlen &gt; 0 ? setlen + 11 &gt;= maxlen : FALSE)</div><div class='del'>-</div><div class='del'>-/* Find all messages in @folder with flags matching @flags and @mask.</div><div class='del'>- * If no messages match, returns %NULL. Otherwise, returns an array of</div><div class='del'>- * CamelMessageInfo and sets *@set to a message set corresponding the</div><div class='del'>- * UIDs of the matched messages (up to @UID_SET_LIMIT bytes). The</div><div class='del'>- * caller must free the infos, the array, and the set string.</div><div class='del'>- */</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_matching (CamelFolder *folder, guint32 flags, guint32 mask, char **set)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *matches;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	int i, max, range;</div><div class='del'>-	GString *gset;</div><div class='del'>-	</div><div class='del'>-	matches = g_ptr_array_new ();</div><div class='del'>-	gset = g_string_new ("");</div><div class='del'>-	max = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	range = -1;</div><div class='del'>-	for (i = 0; i &lt; max &amp;&amp; !UID_SET_FULL (gset-&gt;len, UID_SET_LIMIT); i++) {</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, i);</div><div class='del'>-		if (!info)</div><div class='del'>-			continue;</div><div class='del'>-		if ((info-&gt;flags &amp; mask) != flags) {</div><div class='del'>-			camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-			if (range != -1) {</div><div class='del'>-				if (range != i - 1) {</div><div class='del'>-					info = matches-&gt;pdata[matches-&gt;len - 1];</div><div class='del'>-					g_string_sprintfa (gset, ":%s", camel_message_info_uid (info));</div><div class='del'>-				}</div><div class='del'>-				range = -1;</div><div class='del'>-			}</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (matches, info);</div><div class='del'>-		if (range != -1)</div><div class='del'>-			continue;</div><div class='del'>-		range = i;</div><div class='del'>-		if (gset-&gt;len)</div><div class='del'>-			g_string_append_c (gset, ',');</div><div class='del'>-		g_string_sprintfa (gset, "%s", camel_message_info_uid (info));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (range != -1 &amp;&amp; range != max - 1) {</div><div class='del'>-		info = matches-&gt;pdata[matches-&gt;len - 1];</div><div class='del'>-		g_string_sprintfa (gset, ":%s", camel_message_info_uid (info));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (matches-&gt;len) {</div><div class='del'>-		*set = gset-&gt;str;</div><div class='del'>-		g_string_free (gset, FALSE);</div><div class='del'>-		return matches;</div><div class='del'>-	} else {</div><div class='del'>-		g_string_free (gset, TRUE);</div><div class='del'>-		g_ptr_array_free (matches, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_sync_offline (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_folder_summary_save (folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_sync_online (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response = NULL;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *matches;</div><div class='del'>-	char *set, *flaglist;</div><div class='del'>-	gboolean unset;</div><div class='del'>-	int i, j, max;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	/* Find a message with changed flags, find all of the other</div><div class='del'>-	 * messages like it, sync them as a group, mark them as</div><div class='del'>-	 * updated, and continue.</div><div class='del'>-	 */</div><div class='del'>-	max = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, i);</div><div class='del'>-		if (!info)</div><div class='del'>-			continue;</div><div class='del'>-		if (!(info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Note: Cyrus is broken and will not accept an</div><div class='del'>-		   empty-set of flags so... if this is true then we</div><div class='del'>-		   want to unset the previously set flags.*/</div><div class='del'>-		unset = !(info-&gt;flags &amp; CAMEL_IMAP_SERVER_FLAGS);</div><div class='del'>-		</div><div class='del'>-		/* FIXME: since we don't know the previously set</div><div class='del'>-		   flags, if unset is TRUE then just unset all the flags? */</div><div class='del'>-		flaglist = imap_create_flag_list (unset ? CAMEL_IMAP_SERVER_FLAGS : info-&gt;flags);</div><div class='del'>-		</div><div class='del'>-		/* Note: get_matching() uses UID_SET_LIMIT to limit</div><div class='del'>-		   the size of the uid-set string. We don't have to</div><div class='del'>-		   loop here to flush all the matching uids because</div><div class='del'>-		   they will be scooped up later by our parent loop (I</div><div class='del'>-		   think?). -- Jeff */</div><div class='del'>-		matches = get_matching (folder, info-&gt;flags &amp; (CAMEL_IMAP_SERVER_FLAGS | CAMEL_MESSAGE_FOLDER_FLAGGED),</div><div class='del'>-					CAMEL_IMAP_SERVER_FLAGS | CAMEL_MESSAGE_FOLDER_FLAGGED, &amp;set);</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-		</div><div class='del'>-		/* Note: to `unset' flags, use -FLAGS.SILENT (&lt;flag list&gt;) */</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "UID STORE %s %sFLAGS.SILENT %s",</div><div class='del'>-					       set, unset ? "-" : "", flaglist);</div><div class='del'>-		g_free (set);</div><div class='del'>-		g_free (flaglist);</div><div class='del'>-		</div><div class='del'>-		if (response)</div><div class='del'>-			camel_imap_response_free (store, response);</div><div class='del'>-		</div><div class='del'>-		if (!camel_exception_is_set (ex)) {</div><div class='del'>-			for (j = 0; j &lt; matches-&gt;len; j++) {</div><div class='del'>-				info = matches-&gt;pdata[j];</div><div class='del'>-				info-&gt;flags &amp;= ~CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-				((CamelImapMessageInfo*)info)-&gt;server_flags =</div><div class='del'>-					info-&gt;flags &amp; CAMEL_IMAP_SERVER_FLAGS;</div><div class='del'>-			}</div><div class='del'>-			camel_folder_summary_touch (folder-&gt;summary);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (j = 0; j &lt; matches-&gt;len; j++) {</div><div class='del'>-			info = matches-&gt;pdata[j];</div><div class='del'>-			camel_folder_summary_info_free (folder-&gt;summary, info);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (matches, TRUE);</div><div class='del'>-		</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Save the summary */</div><div class='del'>-	imap_sync_offline (folder, ex);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_expunge_uids_offline (CamelFolder *folder, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		camel_folder_summary_remove_uid (folder-&gt;summary, uids-&gt;pdata[i]);</div><div class='del'>-		/* We intentionally don't remove it from the cache because</div><div class='del'>-		 * the cached data may be useful in replaying a COPY later.</div><div class='del'>-		 */</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_save (folder-&gt;summary);</div><div class='del'>-	</div><div class='del'>-	camel_disco_diary_log (CAMEL_DISCO_STORE (folder-&gt;parent_store)-&gt;diary,</div><div class='del'>-			       CAMEL_DISCO_DIARY_FOLDER_EXPUNGE, folder, uids);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_expunge_uids_online (CamelFolder *folder, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	int uid = 0;</div><div class='del'>-	char *set;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	while (uid &lt; uids-&gt;len) {</div><div class='del'>-		set = imap_uid_array_to_set (folder-&gt;summary, uids, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "UID STORE %s +FLAGS.SILENT \\Deleted",</div><div class='del'>-					       set);</div><div class='del'>-		if (response)</div><div class='del'>-			camel_imap_response_free (store, response);</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-			g_free (set);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (store-&gt;capabilities &amp; IMAP_CAPABILITY_UIDPLUS) {</div><div class='del'>-			response = camel_imap_command (store, folder, ex,</div><div class='del'>-						       "UID EXPUNGE %s", set);</div><div class='del'>-		} else</div><div class='del'>-			response = camel_imap_command (store, folder, ex, "EXPUNGE");</div><div class='del'>-		</div><div class='del'>-		if (response)</div><div class='del'>-			camel_imap_response_free (store, response);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-uid_compar (const void *va, const void *vb)</div><div class='del'>-{</div><div class='del'>-	const char **sa = (const char **)va, **sb = (const char **)vb;</div><div class='del'>-	unsigned long a, b;</div><div class='del'>-</div><div class='del'>-	a = strtoul (*sa, NULL, 10);</div><div class='del'>-	b = strtoul (*sb, NULL, 10);</div><div class='del'>-	if (a &lt; b)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (a == b)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_expunge_uids_resyncing (CamelFolder *folder, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	GPtrArray *keep_uids, *mark_uids;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *result;</div><div class='del'>-</div><div class='del'>-	if (store-&gt;capabilities &amp; IMAP_CAPABILITY_UIDPLUS) {</div><div class='del'>-		imap_expunge_uids_online (folder, uids, ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we don't have UID EXPUNGE we need to avoid expunging any</div><div class='del'>-	 * of the wrong messages. So we search for deleted messages,</div><div class='del'>-	 * and any that aren't in our to-expunge list get temporarily</div><div class='del'>-	 * marked un-deleted.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	response = camel_imap_command (store, folder, ex, "UID SEARCH DELETED");</div><div class='del'>-	if (!response) {</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	result = camel_imap_response_extract (store, response, "SEARCH", ex);</div><div class='del'>-	if (!result) {</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (result[8] == ' ') {</div><div class='del'>-		char *uid, *lasts = NULL;</div><div class='del'>-		unsigned long euid, kuid;</div><div class='del'>-		int ei, ki;</div><div class='del'>-		</div><div class='del'>-		keep_uids = g_ptr_array_new ();</div><div class='del'>-		mark_uids = g_ptr_array_new ();</div><div class='del'>-		</div><div class='del'>-		/* Parse SEARCH response */</div><div class='del'>-		for (uid = strtok_r (result + 9, " ", &amp;lasts); uid; uid = strtok_r (NULL, " ", &amp;lasts))</div><div class='del'>-			g_ptr_array_add (keep_uids, uid);</div><div class='del'>-		qsort (keep_uids-&gt;pdata, keep_uids-&gt;len,</div><div class='del'>-		       sizeof (void *), uid_compar);</div><div class='del'>-		</div><div class='del'>-		/* Fill in "mark_uids", empty out "keep_uids" as needed */</div><div class='del'>-		for (ei = ki = 0; ei &lt; uids-&gt;len; ei++) {</div><div class='del'>-			euid = strtoul (uids-&gt;pdata[ei], NULL, 10);</div><div class='del'>-			</div><div class='del'>-			for (kuid = 0; ki &lt; keep_uids-&gt;len; ki++) {</div><div class='del'>-				kuid = strtoul (keep_uids-&gt;pdata[ki], NULL, 10);</div><div class='del'>-				</div><div class='del'>-				if (kuid &gt;= euid)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (euid == kuid)</div><div class='del'>-				g_ptr_array_remove_index (keep_uids, ki);</div><div class='del'>-			else</div><div class='del'>-				g_ptr_array_add (mark_uids, uids-&gt;pdata[ei]);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Empty SEARCH result, meaning nothing is marked deleted</div><div class='del'>-		 * on server.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		keep_uids = NULL;</div><div class='del'>-		mark_uids = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (result);</div><div class='del'>-	</div><div class='del'>-	/* Unmark messages to be kept */</div><div class='del'>-	if (keep_uids) {</div><div class='del'>-		char *uidset;</div><div class='del'>-		int uid = 0;</div><div class='del'>-		</div><div class='del'>-		while (uid &lt; keep_uids-&gt;len) {</div><div class='del'>-			uidset = imap_uid_array_to_set (folder-&gt;summary, keep_uids, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-			</div><div class='del'>-			response = camel_imap_command (store, folder, ex,</div><div class='del'>-						       "UID STORE %s -FLAGS.SILENT \\Deleted",</div><div class='del'>-						       uidset);</div><div class='del'>-			</div><div class='del'>-			g_free (uidset);</div><div class='del'>-			</div><div class='del'>-			if (!response) {</div><div class='del'>-				g_ptr_array_free (keep_uids, TRUE);</div><div class='del'>-				g_ptr_array_free (mark_uids, TRUE);</div><div class='del'>-				CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			camel_imap_response_free (store, response);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Mark any messages that still need to be marked */</div><div class='del'>-	if (mark_uids) {</div><div class='del'>-		char *uidset;</div><div class='del'>-		int uid = 0;</div><div class='del'>-		</div><div class='del'>-		while (uid &lt; mark_uids-&gt;len) {</div><div class='del'>-			uidset = imap_uid_array_to_set (folder-&gt;summary, mark_uids, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-			</div><div class='del'>-			response = camel_imap_command (store, folder, ex,</div><div class='del'>-						       "UID STORE %s +FLAGS.SILENT \\Deleted",</div><div class='del'>-						       uidset);</div><div class='del'>-			</div><div class='del'>-			g_free (uidset);</div><div class='del'>-			</div><div class='del'>-			if (!response) {</div><div class='del'>-				g_ptr_array_free (keep_uids, TRUE);</div><div class='del'>-				g_ptr_array_free (mark_uids, TRUE);</div><div class='del'>-				CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			camel_imap_response_free (store, response);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (mark_uids, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Do the actual expunging */</div><div class='del'>-	response = camel_imap_command (store, folder, ex, "EXPUNGE");</div><div class='del'>-	if (response)</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-	</div><div class='del'>-	/* And fix the remaining messages if we mangled them */</div><div class='del'>-	if (keep_uids) {</div><div class='del'>-		char *uidset;</div><div class='del'>-		int uid = 0;</div><div class='del'>-		</div><div class='del'>-		while (uid &lt; keep_uids-&gt;len) {</div><div class='del'>-			uidset = imap_uid_array_to_set (folder-&gt;summary, keep_uids, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-			</div><div class='del'>-			/* Don't pass ex if it's already been set */</div><div class='del'>-			response = camel_imap_command (store, folder,</div><div class='del'>-						       camel_exception_is_set (ex) ? NULL : ex,</div><div class='del'>-						       "UID STORE %s +FLAGS.SILENT \\Deleted",</div><div class='del'>-						       uidset);</div><div class='del'>-			</div><div class='del'>-			g_free (uidset);</div><div class='del'>-			if (response)</div><div class='del'>-				camel_imap_response_free (store, response);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (keep_uids, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_append_offline (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		     const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapMessageCache *cache = CAMEL_IMAP_FOLDER (folder)-&gt;cache;</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	char *uid;</div><div class='del'>-</div><div class='del'>-	/* We could keep a separate counter, but this one works fine. */</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (imap_store, command_lock);</div><div class='del'>-	uid = g_strdup_printf ("append-%d", imap_store-&gt;command++);</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);</div><div class='del'>-</div><div class='del'>-	camel_imap_summary_add_offline (folder-&gt;summary, uid, message, info);</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK (folder, cache_lock);</div><div class='del'>-	camel_imap_message_cache_insert_wrapper (cache, uid, "",</div><div class='del'>-						 CAMEL_DATA_WRAPPER (message), ex);</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK (folder, cache_lock);</div><div class='del'>-</div><div class='del'>-	changes = camel_folder_change_info_new ();</div><div class='del'>-	camel_folder_change_info_add_uid (changes, uid);</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed",</div><div class='del'>-				    changes);</div><div class='del'>-	camel_folder_change_info_free (changes);</div><div class='del'>-</div><div class='del'>-	camel_disco_diary_log (CAMEL_DISCO_STORE (imap_store)-&gt;diary,</div><div class='del'>-			       CAMEL_DISCO_DIARY_FOLDER_APPEND, folder, uid);</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = uid;</div><div class='del'>-	else</div><div class='del'>-		g_free (uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelImapResponse *</div><div class='del'>-do_append (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-	   const CamelMessageInfo *info, char **uid,</div><div class='del'>-	   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelStream *memstream;</div><div class='del'>-	CamelMimeFilter *crlf_filter;</div><div class='del'>-	CamelStreamFilter *streamfilter;</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-	char *flagstr, *result, *end;</div><div class='del'>-	</div><div class='del'>-	/* create flag string param */</div><div class='del'>-	if (info &amp;&amp; info-&gt;flags)</div><div class='del'>-		flagstr = imap_create_flag_list (info-&gt;flags);</div><div class='del'>-	else</div><div class='del'>-		flagstr = NULL;</div><div class='del'>-	</div><div class='del'>-	/* encode any 8bit parts so we avoid sending embedded nul-chars and such  */</div><div class='del'>-	camel_mime_message_encode_8bit_parts (message);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: We could avoid this if we knew how big the message was. */</div><div class='del'>-	memstream = camel_stream_mem_new ();</div><div class='del'>-	ba = g_byte_array_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);</div><div class='del'>-	</div><div class='del'>-	streamfilter = camel_stream_filter_new_with_stream (memstream);</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-						  CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	camel_stream_filter_add (streamfilter, crlf_filter);</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),</div><div class='del'>-					    CAMEL_STREAM (streamfilter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (streamfilter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (memstream));</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "APPEND %F%s%s {%d}",</div><div class='del'>-				       folder-&gt;full_name, flagstr ? " " : "",</div><div class='del'>-				       flagstr ? flagstr : "", ba-&gt;len);</div><div class='del'>-	g_free (flagstr);</div><div class='del'>-	</div><div class='del'>-	if (!response) {</div><div class='del'>-		g_byte_array_free (ba, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	result = camel_imap_response_extract_continuation (store, response, ex);</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_byte_array_free (ba, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-	</div><div class='del'>-	/* send the rest of our data - the mime message */</div><div class='del'>-	response = camel_imap_command_continuation (store, ba-&gt;data, ba-&gt;len, ex);</div><div class='del'>-	g_byte_array_free (ba, TRUE);</div><div class='del'>-	if (!response)</div><div class='del'>-		return response;</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;capabilities &amp; IMAP_CAPABILITY_UIDPLUS) {</div><div class='del'>-		*uid = strstrcase (response-&gt;status, "[APPENDUID ");</div><div class='del'>-		if (*uid)</div><div class='del'>-			*uid = strchr (*uid + 11, ' ');</div><div class='del'>-		if (*uid) {</div><div class='del'>-			*uid = g_strndup (*uid + 1, strcspn (*uid + 1, "]"));</div><div class='del'>-			/* Make sure it's a number */</div><div class='del'>-			if (strtoul (*uid, &amp;end, 10) == 0 || *end) {</div><div class='del'>-				g_free (*uid);</div><div class='del'>-				*uid = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		*uid = NULL;</div><div class='del'>-	</div><div class='del'>-	return response;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_append_online (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		    const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *uid;</div><div class='del'>-	int count;</div><div class='del'>-	</div><div class='del'>-	count = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	response = do_append (folder, message, info, &amp;uid, ex);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (uid) {</div><div class='del'>-		/* Cache first, since freeing response may trigger a</div><div class='del'>-		 * summary update that will want this information.</div><div class='del'>-		 */</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (folder, cache_lock);</div><div class='del'>-		camel_imap_message_cache_insert_wrapper (</div><div class='del'>-			CAMEL_IMAP_FOLDER (folder)-&gt;cache, uid,</div><div class='del'>-			"", CAMEL_DATA_WRAPPER (message), ex);</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (folder, cache_lock);</div><div class='del'>-		if (appended_uid)</div><div class='del'>-			*appended_uid = uid;</div><div class='del'>-		else</div><div class='del'>-			g_free (uid);</div><div class='del'>-	} else if (appended_uid)</div><div class='del'>-		*appended_uid = NULL;</div><div class='del'>-	</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-	</div><div class='del'>-	/* Make sure a "folder_changed" is emitted. */</div><div class='del'>-	if (store-&gt;current_folder != folder ||</div><div class='del'>-	    camel_folder_summary_count (folder-&gt;summary) == count)</div><div class='del'>-		imap_refresh_info (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_append_resyncing (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		       const CamelMessageInfo *info, char **appended_uid,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *uid;</div><div class='del'>-	</div><div class='del'>-	response = do_append (folder, message, info, &amp;uid, ex);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (uid) {</div><div class='del'>-		CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-		const char *olduid = camel_message_info_uid (info);</div><div class='del'>-		</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);</div><div class='del'>-		camel_imap_message_cache_copy (imap_folder-&gt;cache, olduid,</div><div class='del'>-					       imap_folder-&gt;cache, uid, ex);</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-</div><div class='del'>-		if (appended_uid)</div><div class='del'>-			*appended_uid = uid;</div><div class='del'>-		else</div><div class='del'>-			g_free (uid);</div><div class='del'>-	} else if (appended_uid)</div><div class='del'>-		*appended_uid = NULL;</div><div class='del'>-	</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_transfer_offline (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-		       CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-		       gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (source-&gt;parent_store);</div><div class='del'>-	CamelImapMessageCache *sc = CAMEL_IMAP_FOLDER (source)-&gt;cache;</div><div class='del'>-	CamelImapMessageCache *dc = CAMEL_IMAP_FOLDER (dest)-&gt;cache;</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *uid, *destuid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* We grab the store's command lock first, and then grab the</div><div class='del'>-	 * source and destination cache_locks. This way we can't</div><div class='del'>-	 * deadlock in the case where we're simultaneously also trying</div><div class='del'>-	 * to copy messages in the other direction from another thread.</div><div class='del'>-	 */</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK (source, cache_lock);</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK (dest, cache_lock);</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (transferred_uids) {</div><div class='del'>-		*transferred_uids = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_set_size (*transferred_uids, uids-&gt;len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	changes = camel_folder_change_info_new ();</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		uid = uids-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		message = camel_folder_get_message (source, uid, NULL);</div><div class='del'>-		if (!message)</div><div class='del'>-			continue;</div><div class='del'>-		mi = camel_folder_summary_uid (source-&gt;summary, uid);</div><div class='del'>-		g_return_if_fail (mi != NULL);</div><div class='del'>-</div><div class='del'>-		destuid = g_strdup_printf ("copy-%s:%s", source-&gt;full_name, uid);</div><div class='del'>-		camel_imap_summary_add_offline (dest-&gt;summary, destuid, message, mi);</div><div class='del'>-</div><div class='del'>-		camel_imap_message_cache_copy (sc, uid, dc, destuid, ex);</div><div class='del'>-		camel_folder_summary_info_free (source-&gt;summary, mi);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-</div><div class='del'>-		camel_folder_change_info_add_uid (changes, destuid);</div><div class='del'>-		if (transferred_uids)</div><div class='del'>-			(*transferred_uids)-&gt;pdata[i] = destuid;</div><div class='del'>-		else</div><div class='del'>-			g_free (destuid);</div><div class='del'>-</div><div class='del'>-		if (delete_originals)</div><div class='del'>-			camel_folder_delete_message (source, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK (dest, cache_lock);</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK (source, cache_lock);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (dest), "folder_changed", changes);</div><div class='del'>-	camel_folder_change_info_free (changes);</div><div class='del'>-</div><div class='del'>-	camel_disco_diary_log (CAMEL_DISCO_STORE (store)-&gt;diary,</div><div class='del'>-			       CAMEL_DISCO_DIARY_FOLDER_TRANSFER,</div><div class='del'>-			       source, dest, uids, delete_originals);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-handle_copyuid (CamelImapResponse *response, CamelFolder *source,</div><div class='del'>-		CamelFolder *destination)</div><div class='del'>-{</div><div class='del'>-	CamelImapMessageCache *scache = CAMEL_IMAP_FOLDER (source)-&gt;cache;</div><div class='del'>-	CamelImapMessageCache *dcache = CAMEL_IMAP_FOLDER (destination)-&gt;cache;</div><div class='del'>-	char *validity, *srcset, *destset;</div><div class='del'>-	GPtrArray *src, *dest;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	validity = strstrcase (response-&gt;status, "[COPYUID ");</div><div class='del'>-	if (!validity)</div><div class='del'>-		return;</div><div class='del'>-	validity += 9;</div><div class='del'>-	if (strtoul (validity, NULL, 10) !=</div><div class='del'>-	    CAMEL_IMAP_SUMMARY (destination-&gt;summary)-&gt;validity)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	srcset = strchr (validity, ' ');</div><div class='del'>-	if (!srcset++)</div><div class='del'>-		goto lose;</div><div class='del'>-	destset = strchr (srcset, ' ');</div><div class='del'>-	if (!destset++)</div><div class='del'>-		goto lose;</div><div class='del'>-</div><div class='del'>-	src = imap_uid_set_to_array (source-&gt;summary, srcset);</div><div class='del'>-	dest = imap_uid_set_to_array (destination-&gt;summary, destset);</div><div class='del'>-</div><div class='del'>-	if (src &amp;&amp; dest &amp;&amp; src-&gt;len == dest-&gt;len) {</div><div class='del'>-		/* We don't have to worry about deadlocking on the</div><div class='del'>-		 * cache locks here, because we've got the store's</div><div class='del'>-		 * command lock too, so no one else could be here.</div><div class='del'>-		 */</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (source, cache_lock);</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (destination, cache_lock);</div><div class='del'>-		for (i = 0; i &lt; src-&gt;len; i++) {</div><div class='del'>-			camel_imap_message_cache_copy (scache, src-&gt;pdata[i],</div><div class='del'>-						       dcache, dest-&gt;pdata[i],</div><div class='del'>-						       NULL);</div><div class='del'>-		}</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (source, cache_lock);</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (destination, cache_lock);</div><div class='del'>-</div><div class='del'>-		imap_uid_array_free (src);</div><div class='del'>-		imap_uid_array_free (dest);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imap_uid_array_free (src);</div><div class='del'>-	imap_uid_array_free (dest);</div><div class='del'>- lose:</div><div class='del'>-	g_warning ("Bad COPYUID response from server");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_copy (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-	 CamelFolder *destination, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (source-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *uidset;</div><div class='del'>-	int uid = 0;</div><div class='del'>-	</div><div class='del'>-	while (uid &lt; uids-&gt;len &amp;&amp; !camel_exception_is_set (ex)) {</div><div class='del'>-		uidset = imap_uid_array_to_set (source-&gt;summary, uids, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-		</div><div class='del'>-		response = camel_imap_command (store, source, ex, "UID COPY %s %F",</div><div class='del'>-					       uidset, destination-&gt;full_name);</div><div class='del'>-		</div><div class='del'>-		g_free (uidset);</div><div class='del'>-		</div><div class='del'>-		if (response &amp;&amp; (store-&gt;capabilities &amp; IMAP_CAPABILITY_UIDPLUS))</div><div class='del'>-			handle_copyuid (response, source, destination);</div><div class='del'>-		</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_transfer_online (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-		      CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-		      gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (source-&gt;parent_store);</div><div class='del'>-	int count, i;</div><div class='del'>-</div><div class='del'>-	/* Sync message flags if needed. */</div><div class='del'>-	imap_sync_online (source, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count (dest-&gt;summary);</div><div class='del'>-</div><div class='del'>-	/* Now copy the messages */</div><div class='del'>-	do_copy (source, uids, dest, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Make the destination notice its new messages */</div><div class='del'>-	if (store-&gt;current_folder != dest ||</div><div class='del'>-	    camel_folder_summary_count (dest-&gt;summary) == count)</div><div class='del'>-		camel_folder_refresh_info (dest, ex);</div><div class='del'>-</div><div class='del'>-	if (delete_originals) {</div><div class='del'>-		for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-			camel_folder_delete_message (source, uids-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	if (transferred_uids)</div><div class='del'>-		*transferred_uids = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_transfer_resyncing (CamelFolder *source, GPtrArray *uids,</div><div class='del'>-			 CamelFolder *dest, GPtrArray **transferred_uids,</div><div class='del'>-			 gboolean delete_originals, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDiscoDiary *diary = CAMEL_DISCO_STORE (source-&gt;parent_store)-&gt;diary;</div><div class='del'>-	GPtrArray *realuids;</div><div class='del'>-	int first, i;</div><div class='del'>-	const char *uid;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	/* This is trickier than append_resyncing, because some of</div><div class='del'>-	 * the messages we are copying may have been copied or</div><div class='del'>-	 * appended into @source while we were offline, in which case</div><div class='del'>-	 * if we don't have UIDPLUS, we won't know their real UIDs,</div><div class='del'>-	 * so we'll have to append them rather than copying.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	realuids = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	while (i &lt; uids-&gt;len) {</div><div class='del'>-		/* Skip past real UIDs */</div><div class='del'>-		for (first = i; i &lt; uids-&gt;len; i++) {</div><div class='del'>-			uid = uids-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-			if (!isdigit ((unsigned char)*uid)) {</div><div class='del'>-				uid = camel_disco_diary_uidmap_lookup (diary, uid);</div><div class='del'>-				if (!uid)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			g_ptr_array_add (realuids, (char *)uid);</div><div class='del'>-</div><div class='del'>-			if (delete_originals)</div><div class='del'>-				camel_folder_delete_message (source, uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* If we saw any real UIDs, do a COPY */</div><div class='del'>-		if (i != first) {</div><div class='del'>-			do_copy (source, realuids, dest, ex);</div><div class='del'>-			g_ptr_array_set_size (realuids, 0);</div><div class='del'>-			if (i == uids-&gt;len || camel_exception_is_set (ex))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Deal with fake UIDs */</div><div class='del'>-		while (i &lt; uids-&gt;len &amp;&amp;</div><div class='del'>-		       !isdigit (*(unsigned char *)(uids-&gt;pdata[i])) &amp;&amp;</div><div class='del'>-		       !camel_exception_is_set (ex)) {</div><div class='del'>-			uid = uids-&gt;pdata[i];</div><div class='del'>-			message = camel_folder_get_message (source, uid, NULL);</div><div class='del'>-			if (!message) {</div><div class='del'>-				/* Message must have been expunged */</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			info = camel_folder_get_message_info (source, uid);</div><div class='del'>-			g_return_if_fail (info != NULL);</div><div class='del'>-</div><div class='del'>-			imap_append_online (dest, message, info, NULL, ex);</div><div class='del'>-			camel_folder_free_message_info (source, info);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-			if (delete_originals)</div><div class='del'>-				camel_folder_delete_message (source, uid);</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (realuids, FALSE);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	if (transferred_uids)</div><div class='del'>-		*transferred_uids = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	GPtrArray *matches, *summary;</div><div class='del'>-</div><div class='del'>-	/* we could get around this by creating a new search object each time,</div><div class='del'>-	   but i doubt its worth it since any long operation would lock the</div><div class='del'>-	   command channel too */</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder (imap_folder-&gt;search, folder);</div><div class='del'>-	summary = camel_folder_get_summary(folder);</div><div class='del'>-	camel_folder_search_set_summary(imap_folder-&gt;search, summary);</div><div class='del'>-	matches = camel_folder_search_execute_expression (imap_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_free_summary(folder, summary);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	summary = g_ptr_array_new();</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		info = camel_folder_get_message_info(folder, uids-&gt;pdata[i]);</div><div class='del'>-		if (info)</div><div class='del'>-			g_ptr_array_add(summary, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;len == 0)</div><div class='del'>-		return summary;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(imap_folder-&gt;search, folder);</div><div class='del'>-	camel_folder_search_set_summary(imap_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(imap_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++)</div><div class='del'>-		camel_folder_free_message_info(folder, summary-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(summary, TRUE);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_search_free (CamelFolder *folder, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (imap_folder-&gt;search);</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result (imap_folder-&gt;search, uids);</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *get_message (CamelImapFolder *imap_folder,</div><div class='del'>-				      const char *uid,</div><div class='del'>-				      const char *part_specifier,</div><div class='del'>-				      CamelMessageContentInfo *ci,</div><div class='del'>-				      CamelException *ex);</div><div class='del'>-</div><div class='del'>-struct _part_spec_stack {</div><div class='del'>-	struct _part_spec_stack *parent;</div><div class='del'>-	int part;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-part_spec_push (struct _part_spec_stack **stack, int part)</div><div class='del'>-{</div><div class='del'>-	struct _part_spec_stack *node;</div><div class='del'>-	</div><div class='del'>-	printf ("pushing %d\n", part);</div><div class='del'>-	</div><div class='del'>-	node = g_new (struct _part_spec_stack, 1);</div><div class='del'>-	node-&gt;parent = *stack;</div><div class='del'>-	node-&gt;part = part;</div><div class='del'>-	</div><div class='del'>-	*stack = node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-part_spec_pop (struct _part_spec_stack **stack)</div><div class='del'>-{</div><div class='del'>-	struct _part_spec_stack *node;</div><div class='del'>-	int part;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (*stack != NULL, 0);</div><div class='del'>-	</div><div class='del'>-	node = *stack;</div><div class='del'>-	*stack = node-&gt;parent;</div><div class='del'>-	</div><div class='del'>-	part = node-&gt;part;</div><div class='del'>-	g_free (node);</div><div class='del'>-	</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-content_info_get_part_spec (CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	struct _part_spec_stack *stack = NULL;</div><div class='del'>-	CamelMessageContentInfo *node;</div><div class='del'>-	char *part_spec, *buf;</div><div class='del'>-	size_t len = 1;</div><div class='del'>-	int part;</div><div class='del'>-	</div><div class='del'>-	node = ci;</div><div class='del'>-	while (node-&gt;parent) {</div><div class='del'>-		CamelMessageContentInfo *child;</div><div class='del'>-		</div><div class='del'>-		child = node-&gt;parent-&gt;childs;</div><div class='del'>-		for (part = 1; child; part++) {</div><div class='del'>-			if (child == node)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			child = child-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		part_spec_push (&amp;stack, part);</div><div class='del'>-		</div><div class='del'>-		len++;</div><div class='del'>-		while ((part = part / 10))</div><div class='del'>-			len++;</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;parent;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	buf = part_spec = g_malloc (len);</div><div class='del'>-	part_spec[0] = '\0';</div><div class='del'>-	</div><div class='del'>-	while (stack) {</div><div class='del'>-		part = part_spec_pop (&amp;stack);</div><div class='del'>-		buf += sprintf (buf, "%d%s", part, stack ? "." : "");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return part_spec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fetch the contents of the MIME part indicated by @ci, which is part</div><div class='del'>- * of message @uid in @folder.</div><div class='del'>- */</div><div class='del'>-static CamelDataWrapper *</div><div class='del'>-get_content (CamelImapFolder *imap_folder, const char *uid,</div><div class='del'>-	     CamelMimePart *part, CamelMessageContentInfo *ci,</div><div class='del'>-	     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *content = NULL;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *part_spec;</div><div class='del'>-	</div><div class='del'>-	part_spec = content_info_get_part_spec (ci);</div><div class='del'>-	</div><div class='del'>-	/* There are three cases: multipart, message/rfc822, and "other" */</div><div class='del'>-	if (header_content_type_is (ci-&gt;type, "multipart", "*")) {</div><div class='del'>-		CamelMultipart *body_mp;</div><div class='del'>-		char *child_spec;</div><div class='del'>-		int speclen, num;</div><div class='del'>-		</div><div class='del'>-		body_mp = camel_multipart_new ();</div><div class='del'>-		camel_data_wrapper_set_mime_type_field (</div><div class='del'>-			CAMEL_DATA_WRAPPER (body_mp), ci-&gt;type);</div><div class='del'>-		</div><div class='del'>-		camel_multipart_set_boundary (body_mp, NULL);</div><div class='del'>-		</div><div class='del'>-		speclen = strlen (part_spec);</div><div class='del'>-		child_spec = g_malloc (speclen + 16);</div><div class='del'>-		memcpy (child_spec, part_spec, speclen);</div><div class='del'>-		if (speclen &gt; 0)</div><div class='del'>-			child_spec[speclen++] = '.';</div><div class='del'>-		g_free (part_spec);</div><div class='del'>-		</div><div class='del'>-		ci = ci-&gt;childs;</div><div class='del'>-		num = 1;</div><div class='del'>-		while (ci) {</div><div class='del'>-			sprintf (child_spec + speclen, "%d.MIME", num++);</div><div class='del'>-			stream = camel_imap_folder_fetch_data (imap_folder, uid, child_spec, FALSE, ex);</div><div class='del'>-			if (stream) {</div><div class='del'>-				int ret;</div><div class='del'>-				</div><div class='del'>-				part = camel_mime_part_new ();</div><div class='del'>-				ret = camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (part), stream);</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-				if (ret == -1) {</div><div class='del'>-					camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-					camel_object_unref (CAMEL_OBJECT (body_mp));</div><div class='del'>-					g_free (child_spec);</div><div class='del'>-					return NULL;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				content = get_content (imap_folder, uid, part, ci, ex);</div><div class='del'>-			}</div><div class='del'>-			if (!stream || !content) {</div><div class='del'>-				g_free (child_spec);</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (body_mp));</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_medium_set_content_object (CAMEL_MEDIUM (part), content);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (content));</div><div class='del'>-			camel_multipart_add_part (body_mp, part);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-			</div><div class='del'>-			ci = ci-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_free (child_spec);</div><div class='del'>-		</div><div class='del'>-		return (CamelDataWrapper *)body_mp;</div><div class='del'>-	} else if (header_content_type_is (ci-&gt;type, "message", "rfc822")) {</div><div class='del'>-		content = (CamelDataWrapper *) get_message (imap_folder, uid, part_spec, ci-&gt;childs, ex);</div><div class='del'>-		g_free (part_spec);</div><div class='del'>-		return content;</div><div class='del'>-	} else {</div><div class='del'>-		content = camel_imap_wrapper_new (imap_folder, ci-&gt;type, uid, part_spec, part);</div><div class='del'>-		g_free (part_spec);</div><div class='del'>-		return content;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message (CamelImapFolder *imap_folder, const char *uid,</div><div class='del'>-	     const char *part_spec, CamelMessageContentInfo *ci,</div><div class='del'>-	     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (CAMEL_FOLDER (imap_folder)-&gt;parent_store);</div><div class='del'>-	CamelDataWrapper *content;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *section_text;</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	section_text = g_strdup_printf ("%s%s%s", part_spec, *part_spec ? "." : "",</div><div class='del'>-					store-&gt;server_level &gt;= IMAP_LEVEL_IMAP4REV1 ? "HEADER" : "0");</div><div class='del'>-	stream = camel_imap_folder_fetch_data (imap_folder, uid, section_text, FALSE, ex);</div><div class='del'>-	g_free (section_text);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	ret = camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	content = get_content (imap_folder, uid, CAMEL_MIME_PART (msg), ci, ex);</div><div class='del'>-	if (!content) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (msg), content);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (content));</div><div class='del'>-	</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: I pulled this number out of my butt. */</div><div class='del'>-#define IMAP_SMALL_BODY_SIZE 5120</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message_simple (CamelImapFolder *imap_folder, const char *uid,</div><div class='del'>-		    CamelStream *stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelImapStore *imap_store =</div><div class='del'>-		CAMEL_IMAP_STORE (CAMEL_FOLDER (imap_folder)-&gt;parent_store);</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	if (!stream) {</div><div class='del'>-		stream = camel_imap_folder_fetch_data (imap_folder, uid, "",</div><div class='del'>-						       FALSE, ex);</div><div class='del'>-		if (!stream)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	ret = camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),</div><div class='del'>-							stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME, this shouldn't be done this way. */</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Source",</div><div class='del'>-				 imap_store-&gt;base_url);</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-imap_get_message (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-	</div><div class='del'>-	/* If the server doesn't support IMAP4rev1, or we already have</div><div class='del'>-	 * the whole thing cached, fetch it in one piece.</div><div class='del'>-	 */</div><div class='del'>-	if (store-&gt;server_level &lt; IMAP_LEVEL_IMAP4REV1 ||</div><div class='del'>-	    (stream = camel_imap_folder_fetch_data (imap_folder, uid, "", TRUE, NULL)))</div><div class='del'>-		return get_message_simple (imap_folder, uid, stream, ex);</div><div class='del'>-	</div><div class='del'>-	mi = camel_folder_summary_uid (folder-&gt;summary, uid);</div><div class='del'>-	g_return_val_if_fail (mi != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	/* If the message is small, fetch it in one piece. */</div><div class='del'>-	if (mi-&gt;size &lt; IMAP_SMALL_BODY_SIZE) {</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, mi);</div><div class='del'>-		return get_message_simple (imap_folder, uid, NULL, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* For larger messages, fetch the structure and build a message</div><div class='del'>-	 * with offline parts. (We check mi-&gt;content-&gt;type rather than</div><div class='del'>-	 * mi-&gt;content because camel_folder_summary_info_new always creates</div><div class='del'>-	 * an empty content struct.)</div><div class='del'>-	 */</div><div class='del'>-	if (!mi-&gt;content-&gt;type) {</div><div class='del'>-		CamelImapResponse *response;</div><div class='del'>-		GData *fetch_data = NULL;</div><div class='del'>-		char *body, *found_uid;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		if (camel_disco_store_status (CAMEL_DISCO_STORE (store)) == CAMEL_DISCO_STORE_OFFLINE) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					     _("This message is not currently available"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "UID FETCH %s BODY", uid);</div><div class='del'>-		if (!response) {</div><div class='del'>-			camel_folder_summary_info_free (folder-&gt;summary, mi);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		for (i = 0, body = NULL; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-			fetch_data = parse_fetch_response (imap_folder, response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-			if (fetch_data) {</div><div class='del'>-				found_uid = g_datalist_get_data (&amp;fetch_data, "UID");</div><div class='del'>-				body = g_datalist_get_data (&amp;fetch_data, "BODY");</div><div class='del'>-				if (found_uid &amp;&amp; body &amp;&amp; !strcmp (found_uid, uid))</div><div class='del'>-					break;</div><div class='del'>-				g_datalist_clear (&amp;fetch_data);</div><div class='del'>-				fetch_data = NULL;</div><div class='del'>-				body = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (body)</div><div class='del'>-			imap_parse_body (&amp;body, folder, mi-&gt;content);</div><div class='del'>-		</div><div class='del'>-		if (fetch_data)</div><div class='del'>-			g_datalist_clear (&amp;fetch_data);</div><div class='del'>-		</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-		</div><div class='del'>-		d(camel_content_info_dump (mi-&gt;content, 0));</div><div class='del'>-		</div><div class='del'>-		if (!mi-&gt;content-&gt;type) {</div><div class='del'>-			/* FETCH returned OK, but we didn't parse a BODY</div><div class='del'>-			 * response. Courier will return invalid BODY</div><div class='del'>-			 * responses for invalidly MIMEd messages, so</div><div class='del'>-			 * fall back to fetching the entire thing and</div><div class='del'>-			 * let the mailer's "bad MIME" code handle it.</div><div class='del'>-			 */</div><div class='del'>-			camel_folder_summary_info_free (folder-&gt;summary, mi);</div><div class='del'>-			return get_message_simple (imap_folder, uid, NULL, ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	msg = get_message (imap_folder, uid, "", mi-&gt;content, ex);</div><div class='del'>-	/* FIXME, this shouldn't be done this way. */</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Source",</div><div class='del'>-				 store-&gt;base_url);</div><div class='del'>-	camel_folder_summary_info_free (folder-&gt;summary, mi);</div><div class='del'>-	</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_cache_message (CamelDiscoFolder *disco_folder, const char *uid,</div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (disco_folder);</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = camel_imap_folder_fetch_data (imap_folder, uid, "", FALSE, ex);</div><div class='del'>-	if (stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We pretend that a FLAGS or RFC822.SIZE response is always exactly</div><div class='del'>- * 20 bytes long, and a BODY[HEADERS] response is always 2000 bytes</div><div class='del'>- * long. Since we know how many of each kind of response we're</div><div class='del'>- * expecting, we can find the total (pretend) amount of server traffic</div><div class='del'>- * to expect and then count off the responses as we read them to update</div><div class='del'>- * the progress bar.</div><div class='del'>- */</div><div class='del'>-#define IMAP_PRETEND_SIZEOF_FLAGS	  20</div><div class='del'>-#define IMAP_PRETEND_SIZEOF_SIZE	  20</div><div class='del'>-#define IMAP_PRETEND_SIZEOF_HEADERS	2000</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_message_from_data (CamelFolder *folder, GPtrArray *messages,</div><div class='del'>-		       int first, GData *data)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	int seq;</div><div class='del'>-	</div><div class='del'>-	seq = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "SEQUENCE"));</div><div class='del'>-	if (seq &lt; first)</div><div class='del'>-		return;</div><div class='del'>-	stream = g_datalist_get_data (&amp;data, "BODY_PART_STREAM");</div><div class='del'>-	if (!stream)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (seq - first &gt;= messages-&gt;len)</div><div class='del'>-		g_ptr_array_set_size (messages, seq - first + 1);</div><div class='del'>-</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	if (camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	mi = camel_folder_summary_info_new_from_message (folder-&gt;summary, msg);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-	</div><div class='del'>-	messages-&gt;pdata[seq - first] = mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_update_summary (CamelFolder *folder, int exists,</div><div class='del'>-		     CamelFolderChangeInfo *changes,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	GPtrArray *fetch_data = NULL, *messages = NULL, *needheaders;</div><div class='del'>-	guint32 flags, uidval, maxuid;</div><div class='del'>-	int i, seq, first, size, got;</div><div class='del'>-	CamelImapResponseType type;</div><div class='del'>-	const char *header_spec;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *uid, *resp;</div><div class='del'>-	GData *data;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (store, command_lock);</div><div class='del'>-	if (store-&gt;server_level &gt;= IMAP_LEVEL_IMAP4REV1)</div><div class='del'>-		header_spec = "HEADER";</div><div class='del'>-	else</div><div class='del'>-		header_spec = "0";</div><div class='del'>-	</div><div class='del'>-	/* Figure out if any of the new messages are already cached (which</div><div class='del'>-	 * may be the case if we're re-syncing after disconnected operation).</div><div class='del'>-	 * If so, get their UIDs, FLAGS, and SIZEs. If not, get all that</div><div class='del'>-	 * and ask for the headers too at the same time.</div><div class='del'>-	 */</div><div class='del'>-	seq = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	first = seq + 1;</div><div class='del'>-	if (seq &gt; 0) {</div><div class='del'>-		mi = camel_folder_summary_index (folder-&gt;summary, seq - 1);</div><div class='del'>-		uidval = atoi (camel_message_info_uid (mi));</div><div class='del'>-		camel_folder_summary_info_free (folder-&gt;summary, mi);</div><div class='del'>-	} else</div><div class='del'>-		uidval = 0;</div><div class='del'>-	</div><div class='del'>-	size = (exists - seq) * (IMAP_PRETEND_SIZEOF_FLAGS + IMAP_PRETEND_SIZEOF_SIZE);</div><div class='del'>-	got = 0;</div><div class='del'>-	</div><div class='del'>-	maxuid = camel_imap_message_cache_max_uid (imap_folder-&gt;cache);</div><div class='del'>-	if (uidval &gt;= maxuid) {</div><div class='del'>-		/* None of the new messages are cached */</div><div class='del'>-		size += (exists - seq) * IMAP_PRETEND_SIZEOF_HEADERS;</div><div class='del'>-		if (!camel_imap_command_start (store, folder, ex,</div><div class='del'>-					       "UID FETCH %d:* (FLAGS RFC822.SIZE BODY.PEEK[%s])",</div><div class='del'>-					       maxuid + 1, header_spec))</div><div class='del'>-			return;</div><div class='del'>-		camel_operation_start (NULL, _("Fetching summary information for new messages"));</div><div class='del'>-	} else {</div><div class='del'>-		if (!camel_imap_command_start (store, folder, ex,</div><div class='del'>-					       "UID FETCH %d:* (FLAGS RFC822.SIZE)",</div><div class='del'>-					       uidval + 1))</div><div class='del'>-			return;</div><div class='del'>-		camel_operation_start (NULL, _("Scanning for new messages"));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Parse the responses. We can't add a message to the summary</div><div class='del'>-	 * until we've gotten its headers, and there's no guarantee</div><div class='del'>-	 * the server will send the responses in a useful order...</div><div class='del'>-	 */</div><div class='del'>-	fetch_data = g_ptr_array_new ();</div><div class='del'>-	messages = g_ptr_array_new ();</div><div class='del'>-	while ((type = camel_imap_command_response (store, &amp;resp, ex)) ==</div><div class='del'>-	       CAMEL_IMAP_RESPONSE_UNTAGGED) {</div><div class='del'>-		data = parse_fetch_response (imap_folder, resp);</div><div class='del'>-		g_free (resp);</div><div class='del'>-		if (!data)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		seq = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "SEQUENCE"));</div><div class='del'>-		if (seq &lt; first) {</div><div class='del'>-			g_datalist_clear (&amp;data);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (g_datalist_get_data (&amp;data, "FLAGS"))</div><div class='del'>-			got += IMAP_PRETEND_SIZEOF_FLAGS;</div><div class='del'>-		if (g_datalist_get_data (&amp;data, "RFC822.SIZE"))</div><div class='del'>-			got += IMAP_PRETEND_SIZEOF_SIZE;</div><div class='del'>-		stream = g_datalist_get_data (&amp;data, "BODY_PART_STREAM");</div><div class='del'>-		if (stream) {</div><div class='del'>-			got += IMAP_PRETEND_SIZEOF_HEADERS;</div><div class='del'>-			</div><div class='del'>-			/* Use the stream now so we don't tie up many</div><div class='del'>-			 * many fds if we're fetching many many messages.</div><div class='del'>-			 */</div><div class='del'>-			add_message_from_data (folder, messages, first, data);</div><div class='del'>-			g_datalist_set_data (&amp;data, "BODY_PART_STREAM", NULL);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_operation_progress (NULL, got * 100 / size);</div><div class='del'>-		g_ptr_array_add (fetch_data, data);</div><div class='del'>-	}</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_IMAP_RESPONSE_ERROR)</div><div class='del'>-		goto lose;</div><div class='del'>-	</div><div class='del'>-	/* Figure out which headers we still need to fetch. */</div><div class='del'>-	needheaders = g_ptr_array_new ();</div><div class='del'>-	size = got = 0;</div><div class='del'>-	for (i = 0; i &lt; fetch_data-&gt;len; i++) {</div><div class='del'>-		data = fetch_data-&gt;pdata[i];</div><div class='del'>-		if (g_datalist_get_data (&amp;data, "BODY_PART_LEN"))</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		uid = g_datalist_get_data (&amp;data, "UID");</div><div class='del'>-		if (uid) {</div><div class='del'>-			g_ptr_array_add (needheaders, uid);</div><div class='del'>-			size += IMAP_PRETEND_SIZEOF_HEADERS;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* And fetch them */</div><div class='del'>-	if (needheaders-&gt;len) {</div><div class='del'>-		char *uidset;</div><div class='del'>-		int uid = 0;</div><div class='del'>-		</div><div class='del'>-		qsort (needheaders-&gt;pdata, needheaders-&gt;len,</div><div class='del'>-		       sizeof (void *), uid_compar);</div><div class='del'>-		</div><div class='del'>-		camel_operation_start (NULL, _("Fetching summary information for new messages"));</div><div class='del'>-		</div><div class='del'>-		while (uid &lt; needheaders-&gt;len) {</div><div class='del'>-			uidset = imap_uid_array_to_set (folder-&gt;summary, needheaders, uid, UID_SET_LIMIT, &amp;uid);</div><div class='del'>-			if (!camel_imap_command_start (store, folder, ex,</div><div class='del'>-						       "UID FETCH %s BODY.PEEK[%s]",</div><div class='del'>-						       uidset, header_spec)) {</div><div class='del'>-				g_ptr_array_free (needheaders, TRUE);</div><div class='del'>-				camel_operation_end (NULL);</div><div class='del'>-				g_free (uidset);</div><div class='del'>-				goto lose;</div><div class='del'>-			}</div><div class='del'>-			g_free (uidset);</div><div class='del'>-			</div><div class='del'>-			while ((type = camel_imap_command_response (store, &amp;resp, ex))</div><div class='del'>-			       == CAMEL_IMAP_RESPONSE_UNTAGGED) {</div><div class='del'>-				data = parse_fetch_response (imap_folder, resp);</div><div class='del'>-				g_free (resp);</div><div class='del'>-				if (!data)</div><div class='del'>-					continue;</div><div class='del'>-				</div><div class='del'>-				stream = g_datalist_get_data (&amp;data, "BODY_PART_STREAM");</div><div class='del'>-				if (stream) {</div><div class='del'>-					add_message_from_data (folder, messages, first, data);</div><div class='del'>-					got += IMAP_PRETEND_SIZEOF_HEADERS;</div><div class='del'>-					camel_operation_progress (NULL, got * 100 / size);</div><div class='del'>-				}</div><div class='del'>-				g_datalist_clear (&amp;data);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (type == CAMEL_IMAP_RESPONSE_ERROR) {</div><div class='del'>-				g_ptr_array_free (needheaders, TRUE);</div><div class='del'>-				camel_operation_end (NULL);</div><div class='del'>-				goto lose;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (needheaders, TRUE);</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now finish up summary entries (fix UIDs, set flags and size) */</div><div class='del'>-	for (i = 0; i &lt; fetch_data-&gt;len; i++) {</div><div class='del'>-		data = fetch_data-&gt;pdata[i];</div><div class='del'>-		</div><div class='del'>-		seq = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "SEQUENCE"));</div><div class='del'>-		if (seq &gt;= first + messages-&gt;len) {</div><div class='del'>-			g_datalist_clear (&amp;data);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		mi = messages-&gt;pdata[seq - first];</div><div class='del'>-		if (mi == NULL) {</div><div class='del'>-			CamelMessageInfo *pmi = NULL;</div><div class='del'>-			int j;</div><div class='del'>-			</div><div class='del'>-			/* This is a kludge around a bug in Exchange</div><div class='del'>-			 * 5.5 that sometimes claims multiple messages</div><div class='del'>-			 * have the same UID. See bug #17694 for</div><div class='del'>-			 * details. The "solution" is to create a fake</div><div class='del'>-			 * message-info with the same details as the</div><div class='del'>-			 * previously valid message. Yes, the user</div><div class='del'>-			 * will have a clone in his/her message-list,</div><div class='del'>-			 * but at least we don't crash.</div><div class='del'>-			 */</div><div class='del'>-			</div><div class='del'>-			/* find the previous valid message info */</div><div class='del'>-			for (j = seq - first - 1; j &gt;= 0; j--) {</div><div class='del'>-				pmi = messages-&gt;pdata[j];</div><div class='del'>-				if (pmi != NULL)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (pmi == NULL) {</div><div class='del'>-				/* Server response is *really* fucked up,</div><div class='del'>-				   I guess we just pretend it never happened? */</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			mi = camel_message_info_new ();</div><div class='del'>-			camel_message_info_dup_to (pmi, mi);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		uid = g_datalist_get_data (&amp;data, "UID");</div><div class='del'>-		if (uid)</div><div class='del'>-			camel_message_info_set_uid (mi, g_strdup (uid));</div><div class='del'>-		flags = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "FLAGS"));</div><div class='del'>-		if (flags) {</div><div class='del'>-			((CamelImapMessageInfo *)mi)-&gt;server_flags = flags;</div><div class='del'>-			/* "or" them in with the existing flags that may</div><div class='del'>-			 * have been set by summary_info_new_from_message.</div><div class='del'>-			 */</div><div class='del'>-			mi-&gt;flags |= flags;</div><div class='del'>-		}</div><div class='del'>-		size = GPOINTER_TO_INT (g_datalist_get_data (&amp;data, "RFC822.SIZE"));</div><div class='del'>-		if (size)</div><div class='del'>-			mi-&gt;size = size;</div><div class='del'>-		</div><div class='del'>-		g_datalist_clear (&amp;data);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (fetch_data, TRUE);</div><div class='del'>-	</div><div class='del'>-	/* And add the entries to the summary, etc. */</div><div class='del'>-	for (i = 0; i &lt; messages-&gt;len; i++) {</div><div class='del'>-		mi = messages-&gt;pdata[i];</div><div class='del'>-		if (!mi) {</div><div class='del'>-			g_warning ("No information for message %d", i + first);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		camel_folder_summary_add (folder-&gt;summary, mi);</div><div class='del'>-		camel_folder_change_info_add_uid (changes, camel_message_info_uid (mi));</div><div class='del'>-		</div><div class='del'>-		if ((mi-&gt;flags &amp; CAMEL_IMAP_MESSAGE_RECENT))</div><div class='del'>-			camel_folder_change_info_recent_uid(changes, camel_message_info_uid (mi));</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (messages, TRUE);</div><div class='del'>-	</div><div class='del'>-	/* Kludge around Microsoft Exchange 5.5 IMAP - See bug #5348 for details */</div><div class='del'>-	if (camel_folder_summary_count (folder-&gt;summary) != exists) {</div><div class='del'>-		CamelImapStore *imap_store = (CamelImapStore *) folder-&gt;parent_store;</div><div class='del'>-		CamelImapResponse *response;</div><div class='del'>-		</div><div class='del'>-		/* forget the currently selected folder */</div><div class='del'>-		if (imap_store-&gt;current_folder) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (imap_store-&gt;current_folder));</div><div class='del'>-			imap_store-&gt;current_folder = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* now re-select it and process the EXISTS response */</div><div class='del'>-		response = camel_imap_command (imap_store, folder, ex, NULL);</div><div class='del'>-		camel_imap_response_free (imap_store, response);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>- lose:</div><div class='del'>-	if (fetch_data) {</div><div class='del'>-		for (i = 0; i &lt; fetch_data-&gt;len; i++) {</div><div class='del'>-			data = fetch_data-&gt;pdata[i];</div><div class='del'>-			g_datalist_clear (&amp;data);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (fetch_data, TRUE);</div><div class='del'>-	}</div><div class='del'>-	if (messages) {</div><div class='del'>-		for (i = 0; i &lt; messages-&gt;len; i++) {</div><div class='del'>-			if (messages-&gt;pdata[i])</div><div class='del'>-				camel_folder_summary_info_free (folder-&gt;summary, messages-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (messages, TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called with the store's command_lock locked */</div><div class='del'>-void</div><div class='del'>-camel_imap_folder_changed (CamelFolder *folder, int exists,</div><div class='del'>-			   GArray *expunged, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (folder-&gt;parent_store, command_lock);</div><div class='del'>-	</div><div class='del'>-	changes = camel_folder_change_info_new ();</div><div class='del'>-	if (expunged) {</div><div class='del'>-		int i, id;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; expunged-&gt;len; i++) {</div><div class='del'>-			id = g_array_index (expunged, int, i);</div><div class='del'>-			info = camel_folder_summary_index (folder-&gt;summary, id - 1);</div><div class='del'>-			if (info == NULL) {</div><div class='del'>-				/* FIXME: danw: does this mean that the summary is corrupt? */</div><div class='del'>-				/* I guess a message that we never retrieved got expunged? */</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_folder_change_info_remove_uid (changes, camel_message_info_uid (info));</div><div class='del'>-			CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);</div><div class='del'>-			camel_imap_message_cache_remove (imap_folder-&gt;cache, camel_message_info_uid (info));</div><div class='del'>-			CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-			camel_folder_summary_remove (folder-&gt;summary, info);</div><div class='del'>-			camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	len = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	if (exists &gt; len)</div><div class='del'>-		imap_update_summary (folder, exists, changes, ex);</div><div class='del'>-	</div><div class='del'>-	if (camel_folder_change_info_changed (changes))</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);</div><div class='del'>-	</div><div class='del'>-	camel_folder_change_info_free (changes);</div><div class='del'>-	camel_folder_summary_save (folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_thaw (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder;</div><div class='del'>-</div><div class='del'>-	CAMEL_FOLDER_CLASS (disco_folder_class)-&gt;thaw (folder);</div><div class='del'>-	if (camel_folder_is_frozen (folder))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	if (imap_folder-&gt;need_refresh) {</div><div class='del'>-		imap_folder-&gt;need_refresh = FALSE;</div><div class='del'>-		imap_refresh_info (folder, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_imap_folder_fetch_data (CamelImapFolder *imap_folder, const char *uid,</div><div class='del'>-			      const char *section_text, gboolean cache_only,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (imap_folder);</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GData *fetch_data;</div><div class='del'>-	char *found_uid;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	/* EXPUNGE responses have to modify the cache, which means</div><div class='del'>-	 * they have to grab the cache_lock while holding the</div><div class='del'>-	 * command_lock. So we grab the command_lock now, in case</div><div class='del'>-	 * we're going to need it below, since we can't grab it</div><div class='del'>-	 * after the cache_lock.</div><div class='del'>-	 */</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);</div><div class='del'>-	stream = camel_imap_message_cache_get (imap_folder-&gt;cache, uid, section_text);</div><div class='del'>-	if (!stream &amp;&amp; (!strcmp (section_text, "HEADER") || !strcmp (section_text, "0")))</div><div class='del'>-		stream = camel_imap_message_cache_get (imap_folder-&gt;cache, uid, "");</div><div class='del'>-	if (stream || cache_only) {</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return stream;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (camel_disco_store_status (CAMEL_DISCO_STORE (store)) == CAMEL_DISCO_STORE_OFFLINE) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     _("This message is not currently available"));</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;server_level &lt; IMAP_LEVEL_IMAP4REV1 &amp;&amp; !*section_text) {</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "UID FETCH %s RFC822.PEEK",</div><div class='del'>-					       uid);</div><div class='del'>-	} else {</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "UID FETCH %s BODY.PEEK[%s]",</div><div class='del'>-					       uid, section_text);</div><div class='del'>-	}</div><div class='del'>-	/* We won't need the command_lock again after this. */</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	if (!response) {</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		fetch_data = parse_fetch_response (imap_folder, response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-		found_uid = g_datalist_get_data (&amp;fetch_data, "UID");</div><div class='del'>-		stream = g_datalist_get_data (&amp;fetch_data, "BODY_PART_STREAM");</div><div class='del'>-		if (found_uid &amp;&amp; stream &amp;&amp; !strcmp (uid, found_uid))</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		g_datalist_clear (&amp;fetch_data);</div><div class='del'>-		stream = NULL;</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (store, response);</div><div class='del'>-	CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-	if (!stream) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Could not find message body in FETCH "</div><div class='del'>-					"response."));</div><div class='del'>-	} else {</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (stream));</div><div class='del'>-		g_datalist_clear (&amp;fetch_data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GData *</div><div class='del'>-parse_fetch_response (CamelImapFolder *imap_folder, char *response)</div><div class='del'>-{</div><div class='del'>-	GData *data = NULL;</div><div class='del'>-	char *start, *part_spec = NULL, *body = NULL, *uid = NULL;</div><div class='del'>-	int body_len = 0;</div><div class='del'>-</div><div class='del'>-	if (*response != '(') {</div><div class='del'>-		long seq;</div><div class='del'>-</div><div class='del'>-		if (*response != '*' || *(response + 1) != ' ')</div><div class='del'>-			return NULL;</div><div class='del'>-		seq = strtol (response + 2, &amp;response, 10);</div><div class='del'>-		if (seq == 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		if (g_strncasecmp (response, " FETCH (", 8) != 0)</div><div class='del'>-			return NULL;</div><div class='del'>-		response += 7;</div><div class='del'>-</div><div class='del'>-		g_datalist_set_data (&amp;data, "SEQUENCE", GINT_TO_POINTER (seq));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		/* Skip the initial '(' or the ' ' between elements */</div><div class='del'>-		response++;</div><div class='del'>-</div><div class='del'>-		if (!g_strncasecmp (response, "FLAGS ", 6)) {</div><div class='del'>-			guint32 flags;</div><div class='del'>-</div><div class='del'>-			response += 6;</div><div class='del'>-			/* FIXME user flags */</div><div class='del'>-			flags = imap_parse_flag_list (&amp;response);</div><div class='del'>-</div><div class='del'>-			g_datalist_set_data (&amp;data, "FLAGS", GUINT_TO_POINTER (flags));</div><div class='del'>-		} else if (!g_strncasecmp (response, "RFC822.SIZE ", 12)) {</div><div class='del'>-			unsigned long size;</div><div class='del'>-</div><div class='del'>-			response += 12;</div><div class='del'>-			size = strtoul (response, &amp;response, 10);</div><div class='del'>-			g_datalist_set_data (&amp;data, "RFC822.SIZE", GUINT_TO_POINTER (size));</div><div class='del'>-		} else if (!g_strncasecmp (response, "BODY[", 5) ||</div><div class='del'>-			   !g_strncasecmp (response, "RFC822 ", 7)) {</div><div class='del'>-			char *p;</div><div class='del'>-</div><div class='del'>-			if (*response == 'B') {</div><div class='del'>-				response += 5;</div><div class='del'>-				p = strchr (response, ']');</div><div class='del'>-				if (!p || *(p + 1) != ' ')</div><div class='del'>-					break;</div><div class='del'>-				part_spec = g_strndup (response, p - response);</div><div class='del'>-				response = p + 2;</div><div class='del'>-			} else {</div><div class='del'>-				part_spec = g_strdup ("");</div><div class='del'>-				response += 7;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			body = imap_parse_nstring (&amp;response, &amp;body_len);</div><div class='del'>-			if (!response) {</div><div class='del'>-				g_free (part_spec);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!body)</div><div class='del'>-				body = g_strdup ("");</div><div class='del'>-			g_datalist_set_data_full (&amp;data, "BODY_PART_SPEC", part_spec, g_free);</div><div class='del'>-			g_datalist_set_data_full (&amp;data, "BODY_PART_DATA", body, g_free);</div><div class='del'>-			g_datalist_set_data (&amp;data, "BODY_PART_LEN", GINT_TO_POINTER (body_len));</div><div class='del'>-		} else if (!g_strncasecmp (response, "BODY ", 5) ||</div><div class='del'>-			   !g_strncasecmp (response, "BODYSTRUCTURE ", 14)) {</div><div class='del'>-			response = strchr (response, ' ') + 1;</div><div class='del'>-			start = response;</div><div class='del'>-			imap_skip_list (&amp;response);</div><div class='del'>-			g_datalist_set_data_full (&amp;data, "BODY", g_strndup (start, response - start), g_free);</div><div class='del'>-		} else if (!g_strncasecmp (response, "UID ", 4)) {</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			len = strcspn (response + 4, " )");</div><div class='del'>-			uid = g_strndup (response + 4, len);</div><div class='del'>-			g_datalist_set_data_full (&amp;data, "UID", uid, g_free);</div><div class='del'>-			response += 4 + len;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unexpected FETCH response from server: "</div><div class='del'>-				   "(%s", response);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while (response &amp;&amp; *response != ')');</div><div class='del'>-</div><div class='del'>-	if (!response || *response != ')') {</div><div class='del'>-		g_datalist_clear (&amp;data);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (uid &amp;&amp; body) {</div><div class='del'>-		CamelStream *stream;</div><div class='del'>-</div><div class='del'>-		CAMEL_IMAP_FOLDER_LOCK (imap_folder, cache_lock);</div><div class='del'>-		stream = camel_imap_message_cache_insert (imap_folder-&gt;cache,</div><div class='del'>-							  uid, part_spec,</div><div class='del'>-							  body, body_len, NULL);</div><div class='del'>-		CAMEL_IMAP_FOLDER_UNLOCK (imap_folder, cache_lock);</div><div class='del'>-		g_datalist_set_data_full (&amp;data, "BODY_PART_STREAM", stream,</div><div class='del'>-					  (GDestroyNotify)camel_object_unref);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h<br/>deleted file mode 100644<br/>index 8ab7d009da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-folder.h: class for an imap folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_FOLDER_H</div><div class='del'>-#define CAMEL_IMAP_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-#include &lt;camel/camel-disco-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-search.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_FOLDER_TYPE     (camel_imap_folder_get_type ())</div><div class='del'>-#define CAMEL_IMAP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))</div><div class='del'>-#define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))</div><div class='del'>-#define CAMEL_IS_IMAP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelImapFolder {</div><div class='del'>-	CamelDiscoFolder parent_object;</div><div class='del'>-</div><div class='del'>-	struct _CamelImapFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	gboolean need_rescan, need_refresh;</div><div class='del'>-	CamelFolderSearch *search;</div><div class='del'>-	CamelImapMessageCache *cache;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDiscoFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelImapFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *camel_imap_folder_new (CamelStore *parent,</div><div class='del'>-				    const char *folder_name,</div><div class='del'>-				    const char *folder_dir,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_imap_folder_selected (CamelFolder *folder,</div><div class='del'>-				 CamelImapResponse *response,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_imap_folder_changed (CamelFolder *folder, int exists,</div><div class='del'>-				GArray *expunged, CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelStream *camel_imap_folder_fetch_data (CamelImapFolder *imap_folder,</div><div class='del'>-					   const char *uid,</div><div class='del'>-					   const char *section_text,</div><div class='del'>-					   gboolean cache_only,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c<br/>deleted file mode 100644<br/>index f7ed6e2a5e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-message-cache.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-message-cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,519 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-message-cache.c: Class for an IMAP message cache */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author: </div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-message-cache.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-</div><div class='del'>-static void finalize (CamelImapMessageCache *cache);</div><div class='del'>-static void stream_finalize (CamelObject *stream, gpointer event_data, gpointer user_data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_message_cache_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_message_cache_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_message_cache_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_message_cache_type = camel_type_register (</div><div class='del'>-			CAMEL_OBJECT_TYPE, "CamelImapMessageCache",</div><div class='del'>-			sizeof (CamelImapMessageCache),</div><div class='del'>-			sizeof (CamelImapMessageCacheClass),</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectFinalizeFunc) finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_imap_message_cache_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_part (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (value) {</div><div class='del'>-		if (strchr (key, '.')) {</div><div class='del'>-			camel_object_unhook_event (value, "finalize",</div><div class='del'>-						   stream_finalize, data);</div><div class='del'>-			camel_object_unref (value);</div><div class='del'>-		} else</div><div class='del'>-			g_ptr_array_free (value, TRUE);</div><div class='del'>-	}</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelImapMessageCache *cache)</div><div class='del'>-{</div><div class='del'>-	if (cache-&gt;path)</div><div class='del'>-		g_free (cache-&gt;path);</div><div class='del'>-	if (cache-&gt;parts) {</div><div class='del'>-		g_hash_table_foreach (cache-&gt;parts, free_part, cache);</div><div class='del'>-		g_hash_table_destroy (cache-&gt;parts);</div><div class='del'>-	}</div><div class='del'>-	if (cache-&gt;cached)</div><div class='del'>-		g_hash_table_destroy (cache-&gt;cached);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cache_put (CamelImapMessageCache *cache, const char *uid, const char *key,</div><div class='del'>-	   CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	char *hash_key;</div><div class='del'>-	GPtrArray *subparts;</div><div class='del'>-	gpointer okey, ostream;</div><div class='del'>-	guint32 uidval;</div><div class='del'>-</div><div class='del'>-	uidval = strtoul (uid, NULL, 10);</div><div class='del'>-	if (uidval &gt; cache-&gt;max_uid)</div><div class='del'>-		cache-&gt;max_uid = uidval;</div><div class='del'>-</div><div class='del'>-	subparts = g_hash_table_lookup (cache-&gt;parts, uid);</div><div class='del'>-	if (!subparts) {</div><div class='del'>-		subparts = g_ptr_array_new ();</div><div class='del'>-		g_hash_table_insert (cache-&gt;parts, g_strdup (uid), subparts);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended (cache-&gt;parts, key, &amp;okey, &amp;ostream)) {</div><div class='del'>-		if (ostream) {</div><div class='del'>-			camel_object_unhook_event (ostream, "finalize",</div><div class='del'>-						   stream_finalize, cache);</div><div class='del'>-			g_hash_table_remove (cache-&gt;cached, ostream);</div><div class='del'>-			camel_object_unref (ostream);</div><div class='del'>-		}</div><div class='del'>-		hash_key = okey;</div><div class='del'>-	} else {</div><div class='del'>-		hash_key = g_strdup (key);</div><div class='del'>-		g_ptr_array_add (subparts, hash_key);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (cache-&gt;parts, hash_key, stream);</div><div class='del'>-	g_hash_table_insert (cache-&gt;cached, stream, hash_key);</div><div class='del'>-</div><div class='del'>-	if (stream) {</div><div class='del'>-		camel_object_hook_event (CAMEL_OBJECT (stream), "finalize",</div><div class='del'>-					 stream_finalize, cache);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_new:</div><div class='del'>- * @path: directory to use for storage</div><div class='del'>- * @summary: CamelFolderSummary for the folder we are caching</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelImapMessageCache object using @path for</div><div class='del'>- * storage. If cache files already exist in @path, then any that do not</div><div class='del'>- * correspond to messages in @summary will be deleted.</div><div class='del'>- **/</div><div class='del'>-CamelImapMessageCache *</div><div class='del'>-camel_imap_message_cache_new (const char *path, CamelFolderSummary *summary,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapMessageCache *cache;</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *uid, *p;</div><div class='del'>-	GPtrArray *deletes;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	dir = opendir (path);</div><div class='del'>-	if (!dir) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not open cache directory: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cache = (CamelImapMessageCache *)camel_object_new (CAMEL_IMAP_MESSAGE_CACHE_TYPE);</div><div class='del'>-	cache-&gt;path = g_strdup (path);</div><div class='del'>-</div><div class='del'>-	cache-&gt;parts = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	cache-&gt;cached = g_hash_table_new (NULL, NULL);</div><div class='del'>-	deletes = g_ptr_array_new ();</div><div class='del'>-	while ((d = readdir (dir))) {</div><div class='del'>-		if (!isdigit (d-&gt;d_name[0]))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		p = strchr (d-&gt;d_name, '.');</div><div class='del'>-		if (p)</div><div class='del'>-			uid = g_strndup (d-&gt;d_name, p - d-&gt;d_name);</div><div class='del'>-		else</div><div class='del'>-			uid = g_strdup (d-&gt;d_name);</div><div class='del'>-</div><div class='del'>-		info = camel_folder_summary_uid (summary, uid);</div><div class='del'>-		if (info) {</div><div class='del'>-			camel_folder_summary_info_free (summary, info);</div><div class='del'>-			cache_put (cache, uid, d-&gt;d_name, NULL);</div><div class='del'>-		} else</div><div class='del'>-			g_ptr_array_add (deletes, g_strdup_printf ("%s/%s", cache-&gt;path, d-&gt;d_name));</div><div class='del'>-		g_free (uid);</div><div class='del'>-	}</div><div class='del'>-	closedir (dir);</div><div class='del'>-</div><div class='del'>-	while (deletes-&gt;len) {</div><div class='del'>-		unlink (deletes-&gt;pdata[0]);</div><div class='del'>-		g_free (deletes-&gt;pdata[0]);</div><div class='del'>-		g_ptr_array_remove_index_fast (deletes, 0);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (deletes, TRUE);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cache));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cache;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_max_uid:</div><div class='del'>- * @cache: the cache</div><div class='del'>- *</div><div class='del'>- * Return value: the largest (real) UID in the cache.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_imap_message_cache_max_uid (CamelImapMessageCache *cache)</div><div class='del'>-{</div><div class='del'>-	return cache-&gt;max_uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_set_path:</div><div class='del'>- * @cache: </div><div class='del'>- * @path: </div><div class='del'>- * </div><div class='del'>- * Set the path used for the message cache.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_set_path (CamelImapMessageCache *cache, const char *path)</div><div class='del'>-{</div><div class='del'>-	g_free(cache-&gt;path);</div><div class='del'>-	cache-&gt;path = g_strdup(path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stream_finalize (CamelObject *stream, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelImapMessageCache *cache = user_data;</div><div class='del'>-	char *key;</div><div class='del'>-</div><div class='del'>-	key = g_hash_table_lookup (cache-&gt;cached, stream);</div><div class='del'>-	if (!key)</div><div class='del'>-		return;</div><div class='del'>-	g_hash_table_remove (cache-&gt;cached, stream);</div><div class='del'>-	g_hash_table_insert (cache-&gt;parts, key, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelStream *</div><div class='del'>-insert_setup (CamelImapMessageCache *cache, const char *uid, const char *part_spec,</div><div class='del'>-	      char **path, char **key, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	*path = g_strdup_printf ("%s/%s.%s", cache-&gt;path, uid, part_spec);</div><div class='del'>-	*key = strrchr (*path, '/') + 1;</div><div class='del'>-	stream = g_hash_table_lookup (cache-&gt;parts, *key);</div><div class='del'>-	if (stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	fd = open (*path, O_RDWR | O_CREAT | O_TRUNC, 0600);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to cache message %s: %s"),</div><div class='del'>-				      uid, g_strerror (errno));</div><div class='del'>-		g_free (*path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_stream_fs_new_with_fd (fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelStream *</div><div class='del'>-insert_abort (char *path, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	unlink (path);</div><div class='del'>-	g_free (path);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelStream *</div><div class='del'>-insert_finish (CamelImapMessageCache *cache, const char *uid, char *path,</div><div class='del'>-	       char *key, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	camel_stream_flush (stream);</div><div class='del'>-	camel_stream_reset (stream);</div><div class='del'>-	cache_put (cache, uid, key, stream);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_insert:</div><div class='del'>- * @cache: the cache</div><div class='del'>- * @uid: UID of the message data to cache</div><div class='del'>- * @part_spec: the IMAP part_spec of the data</div><div class='del'>- * @data: the data</div><div class='del'>- * @len: length of @data</div><div class='del'>- *</div><div class='del'>- * Caches the provided data into @cache.</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelStream containing the cached data, which the</div><div class='del'>- * caller must unref.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_imap_message_cache_insert (CamelImapMessageCache *cache, const char *uid,</div><div class='del'>-				 const char *part_spec, const char *data,</div><div class='del'>-				 int len, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path, *key;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	stream = insert_setup (cache, uid, part_spec, &amp;path, &amp;key, ex);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (stream, data, len) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to cache message %s: %s"),</div><div class='del'>-				      uid, g_strerror (errno));</div><div class='del'>-		return insert_abort (path, stream);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return insert_finish (cache, uid, path, key, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_insert_stream:</div><div class='del'>- * @cache: the cache</div><div class='del'>- * @uid: UID of the message data to cache</div><div class='del'>- * @part_spec: the IMAP part_spec of the data</div><div class='del'>- * @data_stream: the stream to cache</div><div class='del'>- *</div><div class='del'>- * Caches the provided data into @cache.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_insert_stream (CamelImapMessageCache *cache,</div><div class='del'>-					const char *uid, const char *part_spec,</div><div class='del'>-					CamelStream *data_stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path, *key;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	</div><div class='del'>-	stream = insert_setup (cache, uid, part_spec, &amp;path, &amp;key, ex);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write_to_stream (data_stream, stream) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to cache message %s: %s"),</div><div class='del'>-				      uid, g_strerror (errno));</div><div class='del'>-		insert_abort (path, stream);</div><div class='del'>-	} else {</div><div class='del'>-		insert_finish (cache, uid, path, key, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_insert_wrapper:</div><div class='del'>- * @cache: the cache</div><div class='del'>- * @uid: UID of the message data to cache</div><div class='del'>- * @part_spec: the IMAP part_spec of the data</div><div class='del'>- * @wrapper: the wrapper to cache</div><div class='del'>- *</div><div class='del'>- * Caches the provided data into @cache.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_insert_wrapper (CamelImapMessageCache *cache,</div><div class='del'>-					 const char *uid, const char *part_spec,</div><div class='del'>-					 CamelDataWrapper *wrapper, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path, *key;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = insert_setup (cache, uid, part_spec, &amp;path, &amp;key, ex);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (camel_data_wrapper_write_to_stream (wrapper, stream) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to cache message %s: %s"),</div><div class='del'>-				      uid, g_strerror (errno));</div><div class='del'>-		insert_abort (path, stream);</div><div class='del'>-	} else {</div><div class='del'>-		insert_finish (cache, uid, path, key, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_get:</div><div class='del'>- * @cache: the cache</div><div class='del'>- * @uid: the UID of the data to get</div><div class='del'>- * @part_spec: the part_spec of the data to get</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelStream containing the cached data (which the</div><div class='del'>- * caller must unref), or %NULL if that data is not cached.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_imap_message_cache_get (CamelImapMessageCache *cache, const char *uid,</div><div class='del'>-			      const char *part_spec)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *path, *key;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/%s.%s", cache-&gt;path, uid, part_spec);</div><div class='del'>-	key = strrchr (path, '/') + 1;</div><div class='del'>-	stream = g_hash_table_lookup (cache-&gt;parts, key);</div><div class='del'>-	if (stream) {</div><div class='del'>-		camel_stream_reset (CAMEL_STREAM (stream));</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (stream));</div><div class='del'>-		return stream;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_name (path, O_RDONLY, 0);</div><div class='del'>-	if (stream)</div><div class='del'>-		cache_put (cache, uid, key, stream);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_remove:</div><div class='del'>- * @cache: the cache</div><div class='del'>- * @uid: UID of the data to remove</div><div class='del'>- *</div><div class='del'>- * Removes all data associated with @uid from @cache.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_remove (CamelImapMessageCache *cache, const char *uid)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *subparts;</div><div class='del'>-	char *key, *path;</div><div class='del'>-	CamelObject *stream;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	subparts = g_hash_table_lookup (cache-&gt;parts, uid);</div><div class='del'>-	if (!subparts)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; subparts-&gt;len; i++) {</div><div class='del'>-		key = subparts-&gt;pdata[i];</div><div class='del'>-		path = g_strdup_printf ("%s/%s", cache-&gt;path, key);</div><div class='del'>-		unlink (path);</div><div class='del'>-		g_free (path);</div><div class='del'>-		stream = g_hash_table_lookup (cache-&gt;parts, key);</div><div class='del'>-		if (stream) {</div><div class='del'>-			camel_object_unhook_event (stream, "finalize",</div><div class='del'>-						   stream_finalize, cache);</div><div class='del'>-			camel_object_unref (stream);</div><div class='del'>-			g_hash_table_remove (cache-&gt;cached, stream);</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_remove (cache-&gt;parts, key);</div><div class='del'>-		g_free (key);</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_remove (cache-&gt;parts, uid);</div><div class='del'>-	g_ptr_array_free (subparts, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_uids (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (!strchr (key, '.'))</div><div class='del'>-		g_ptr_array_add (data, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_clear:</div><div class='del'>- * @cache: the cache</div><div class='del'>- *</div><div class='del'>- * Removes all cached data from @cache.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_clear (CamelImapMessageCache *cache)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uids = g_ptr_array_new ();</div><div class='del'>-	g_hash_table_foreach (cache-&gt;parts, add_uids, uids);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-		camel_imap_message_cache_remove (cache, uids-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (uids, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_message_cache_copy:</div><div class='del'>- * @source: the source message cache</div><div class='del'>- * @source_uid: UID of a message in @source</div><div class='del'>- * @dest: the destination message cache</div><div class='del'>- * @dest_uid: UID of the message in @dest</div><div class='del'>- *</div><div class='del'>- * Copies all cached parts from @source_uid in @source to @dest_uid in</div><div class='del'>- * @destination.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_message_cache_copy (CamelImapMessageCache *source,</div><div class='del'>-			       const char *source_uid,</div><div class='del'>-			       CamelImapMessageCache *dest,</div><div class='del'>-			       const char *dest_uid,</div><div class='del'>-			       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *subparts;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *part;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	subparts = g_hash_table_lookup (source-&gt;parts, source_uid);</div><div class='del'>-	if (!subparts || !subparts-&gt;len)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; subparts-&gt;len; i++) {</div><div class='del'>-		part = strchr (subparts-&gt;pdata[i], '.');</div><div class='del'>-		if (!part++)</div><div class='del'>-			continue;</div><div class='del'>-		stream = camel_imap_message_cache_get (source, source_uid, part);</div><div class='del'>-		camel_imap_message_cache_insert_stream (dest, dest_uid, part, stream, ex);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h<br/>deleted file mode 100644<br/>index eb3f056b44..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-message-cache.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-message-cache.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,109 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-message-cache.h: Class for an IMAP message cache */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author: </div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_MESSAGE_CACHE_H</div><div class='del'>-#define CAMEL_IMAP_MESSAGE_CACHE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include &lt;camel/camel-folder-search.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_MESSAGE_CACHE_TYPE     (camel_imap_message_cache_get_type ())</div><div class='del'>-#define CAMEL_IMAP_MESSAGE_CACHE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_MESSAGE_CACHE_TYPE, CamelImapFolder))</div><div class='del'>-#define CAMEL_IMAP_MESSAGE_CACHE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_MESSAGE_CACHE_TYPE, CamelImapFolderClass))</div><div class='del'>-#define CAMEL_IS_IMAP_MESSAGE_CACHE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_MESSAGE_CACHE_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelImapMessageCache {</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	char *path;</div><div class='del'>-	GHashTable *parts, *cached;</div><div class='del'>-	guint32 max_uid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelImapMessageCacheClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelImapMessageCache *camel_imap_message_cache_new (const char *path,</div><div class='del'>-						     CamelFolderSummary *summ,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_imap_message_cache_set_path (CamelImapMessageCache *cache,</div><div class='del'>-					const char *path);</div><div class='del'>-</div><div class='del'>-guint32     camel_imap_message_cache_max_uid (CamelImapMessageCache *cache);</div><div class='del'>-</div><div class='del'>-CamelStream *camel_imap_message_cache_insert (CamelImapMessageCache *cache,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *part_spec,</div><div class='del'>-					      const char *data,</div><div class='del'>-					      int len,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-void camel_imap_message_cache_insert_stream  (CamelImapMessageCache *cache,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *part_spec,</div><div class='del'>-					      CamelStream *data_stream,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-void camel_imap_message_cache_insert_wrapper (CamelImapMessageCache *cache,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *part_spec,</div><div class='del'>-					      CamelDataWrapper *wrapper,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelStream *camel_imap_message_cache_get    (CamelImapMessageCache *cache,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *part_spec);</div><div class='del'>-void         camel_imap_message_cache_remove (CamelImapMessageCache *cache,</div><div class='del'>-					      const char *uid);</div><div class='del'>-</div><div class='del'>-void         camel_imap_message_cache_clear  (CamelImapMessageCache *cache);</div><div class='del'>-</div><div class='del'>-void         camel_imap_message_cache_copy   (CamelImapMessageCache *source,</div><div class='del'>-					      const char *source_uid,</div><div class='del'>-					      CamelImapMessageCache *dest,</div><div class='del'>-					      const char *dest_uid,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_message_cache_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_MESSAGE_CACHE_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h<br/>deleted file mode 100644<br/>index 07b790c6a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *  camel-imap-private.h: Private info for imap.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_PRIVATE_H</div><div class='del'>-#define CAMEL_IMAP_PRIVATE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* need a way to configure and save this data, if this header is to</div><div class='del'>-   be installed.  For now, dont install it */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelImapStorePrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *command_lock;	/* for locking the command stream for a complete operation */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_IMAP_STORE_LOCK(f, l) (e_mutex_lock(((CamelImapStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_IMAP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelImapStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#  if 0</div><div class='del'>-#  define CAMEL_IMAP_STORE_ASSERT_LOCKED(f, l) (e_mutex_assert_locked(((CamelImapStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#  else</div><div class='del'>-#  define CAMEL_IMAP_STORE_ASSERT_LOCKED(f, l)</div><div class='del'>-#  endif</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_IMAP_STORE_LOCK(f, l)</div><div class='del'>-#define CAMEL_IMAP_STORE_UNLOCK(f, l)</div><div class='del'>-#define CAMEL_IMAP_STORE_ASSERT_LOCKED(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelImapFolderPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *search_lock;	/* for locking the search object */</div><div class='del'>-	EMutex *cache_lock;     /* for locking the cache object */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_IMAP_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelImapFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_IMAP_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelImapFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_IMAP_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_IMAP_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelImapWrapperPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_LOCK(f, l) (g_mutex_lock(((CamelImapWrapper *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_UNLOCK(f, l) (g_mutex_unlock(((CamelImapWrapper *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_LOCK(f, l)</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_PRIVATE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c<br/>deleted file mode 100644<br/>index 305dbab443..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,150 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-provider.c: imap provider registration code */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-</div><div class='del'>-static void add_hash (guint *hash, char *s);</div><div class='del'>-static guint imap_url_hash (gconstpointer key);</div><div class='del'>-static gint check_equal (char *s1, char *s2);</div><div class='del'>-static gint imap_url_equal (gconstpointer a, gconstpointer b);</div><div class='del'>-</div><div class='del'>-CamelProviderConfEntry imap_conf_entries[] = {</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL,</div><div class='del'>-	  N_("Checking for new mail") },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_all", NULL,</div><div class='del'>-	  N_("Check for new messages in all folders"), "1" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_END },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_START, "folders", NULL,</div><div class='del'>-	  N_("Folders") },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_lsub", NULL,</div><div class='del'>-	  N_("Show only subscribed folders"), "1" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "override_namespace", NULL,</div><div class='del'>-	  N_("Override server-supplied folder namespace"), "0" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_ENTRY, "namespace", "override_namespace",</div><div class='del'>-	  N_("Namespace") },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_END },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,</div><div class='del'>-	  N_("Apply filters to new messages in INBOX on this server"), "0" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider imap_provider = {</div><div class='del'>-	"imap",</div><div class='del'>-	N_("IMAP"),</div><div class='del'>-</div><div class='del'>-	N_("For reading and storing mail on IMAP servers."),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |</div><div class='del'>-	CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_SUPPORTS_SSL,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,</div><div class='del'>-</div><div class='del'>-	imap_conf_entries,</div><div class='del'>-</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_imap_password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will connect to the IMAP server using a "</div><div class='del'>-	   "plaintext password."),</div><div class='del'>-	</div><div class='del'>-	"",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	imap_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_imap_store_get_type ();</div><div class='del'>-	imap_provider.url_hash = imap_url_hash;</div><div class='del'>-	imap_provider.url_equal = imap_url_equal;</div><div class='del'>-	imap_provider.authtypes = g_list_concat (camel_remote_store_authtype_list (),</div><div class='del'>-						 camel_sasl_authtype_list (FALSE));</div><div class='del'>-	imap_provider.authtypes = g_list_prepend (imap_provider.authtypes,</div><div class='del'>-						  &amp;camel_imap_password_authtype);</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider (session, &amp;imap_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_hash (guint *hash, char *s)</div><div class='del'>-{</div><div class='del'>-	if (s)</div><div class='del'>-		*hash ^= g_str_hash(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-imap_url_hash (gconstpointer key)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u = (CamelURL *)key;</div><div class='del'>-	guint hash = 0;</div><div class='del'>-</div><div class='del'>-	add_hash (&amp;hash, u-&gt;user);</div><div class='del'>-	add_hash (&amp;hash, u-&gt;authmech);</div><div class='del'>-	add_hash (&amp;hash, u-&gt;host);</div><div class='del'>-	hash ^= u-&gt;port;</div><div class='del'>-	</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-check_equal (char *s1, char *s2)</div><div class='del'>-{</div><div class='del'>-	if (s1 == NULL) {</div><div class='del'>-		if (s2 == NULL)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (s2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return strcmp (s1, s2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-imap_url_equal (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u1 = a, *u2 = b;</div><div class='del'>-	</div><div class='del'>-	return check_equal (u1-&gt;user, u2-&gt;user)</div><div class='del'>-		&amp;&amp; check_equal (u1-&gt;authmech, u2-&gt;authmech)</div><div class='del'>-		&amp;&amp; check_equal (u1-&gt;host, u2-&gt;host)</div><div class='del'>-		&amp;&amp; u1-&gt;port == u2-&gt;port;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c<br/>deleted file mode 100644<br/>index c30fa5611e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-search.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,499 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-search.c: IMAP folder search */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors:</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000, 2001, 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-search.h"</div><div class='del'>-#include "camel-imap-private.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/md5-utils.h"	/* md5 hash building */</div><div class='del'>-#include "camel-mime-utils.h"	/* base64 encoding */</div><div class='del'>-</div><div class='del'>-#include "camel-seekable-stream.h"</div><div class='del'>-#include "camel-search-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  File is:</div><div class='del'>-   BODY	 (as in body search)</div><div class='del'>-   Last uid when search performed</div><div class='del'>-   termcount: number of search terms</div><div class='del'>-   matchcount: number of matches</div><div class='del'>-   term0, term1 ...</div><div class='del'>-   match0, match1, match2, ...</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-/* size of in-memory cache */</div><div class='del'>-#define MATCH_CACHE_SIZE (32)</div><div class='del'>-</div><div class='del'>-/* Also takes care of 'endianness' file magic */</div><div class='del'>-#define MATCH_MARK (('B' &lt;&lt; 24) | ('O' &lt;&lt; 16) | ('D' &lt;&lt; 8) | 'Y')</div><div class='del'>-</div><div class='del'>-/* on-disk header, in native endianness format, matches follow */</div><div class='del'>-struct _match_header {</div><div class='del'>-	guint32 mark;</div><div class='del'>-	guint32 validity;	/* uidvalidity for this folder */</div><div class='del'>-	guint32 lastuid;</div><div class='del'>-	guint32 termcount;</div><div class='del'>-	guint32 matchcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* in-memory record */</div><div class='del'>-struct _match_record {</div><div class='del'>-	struct _match_record *next;</div><div class='del'>-	struct _match_record *prev;</div><div class='del'>-</div><div class='del'>-	char hash[17];</div><div class='del'>-</div><div class='del'>-	guint32 lastuid;</div><div class='del'>-	guint32 validity;</div><div class='del'>-</div><div class='del'>-	unsigned int termcount;</div><div class='del'>-	char **terms;</div><div class='del'>-	GArray *matches;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void free_match(CamelImapSearch *is, struct _match_record *mr);</div><div class='del'>-static ESExpResult *imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-static CamelFolderSearchClass *imap_search_parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_search_class_init (CamelImapSearchClass *camel_imap_search_class)</div><div class='del'>-{</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	CamelFolderSearchClass *camel_folder_search_class =</div><div class='del'>-		CAMEL_FOLDER_SEARCH_CLASS (camel_imap_search_class);</div><div class='del'>-</div><div class='del'>-	imap_search_parent_class = (CamelFolderSearchClass *)camel_type_get_global_classfuncs (camel_folder_search_get_type ());</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_search_class-&gt;body_contains = imap_body_contains;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_search_init(CamelImapSearch *is)</div><div class='del'>-{</div><div class='del'>-	e_dlist_init(&amp;is-&gt;matches);</div><div class='del'>-	is-&gt;matches_hash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	is-&gt;matches_count = 0;</div><div class='del'>-	is-&gt;lastuid = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_search_finalise(CamelImapSearch *is)</div><div class='del'>-{</div><div class='del'>-	struct _match_record *mr;</div><div class='del'>-</div><div class='del'>-	while ( (mr = (struct _match_record *)e_dlist_remtail(&amp;is-&gt;matches)) )</div><div class='del'>-		free_match(is, mr);</div><div class='del'>-	g_hash_table_destroy(is-&gt;matches_hash);</div><div class='del'>-	if (is-&gt;cache)</div><div class='del'>-		camel_object_unref((CamelObject *)is-&gt;cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_search_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_search_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_search_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_search_type = camel_type_register (</div><div class='del'>-			CAMEL_FOLDER_SEARCH_TYPE, "CamelImapSearch",</div><div class='del'>-			sizeof (CamelImapSearch),</div><div class='del'>-			sizeof (CamelImapSearchClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_imap_search_class_init, NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_imap_search_init,</div><div class='del'>-			(CamelObjectFinalizeFunc) camel_imap_search_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_imap_search_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_search_new:</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelImapSearch widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSearch *</div><div class='del'>-camel_imap_search_new (const char *cachedir)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSearch *new = CAMEL_FOLDER_SEARCH (camel_object_new (camel_imap_search_get_type ()));</div><div class='del'>-	CamelImapSearch *is = (CamelImapSearch *)new;</div><div class='del'>-</div><div class='del'>-	camel_folder_search_construct (new);</div><div class='del'>-</div><div class='del'>-	is-&gt;cache = camel_data_cache_new(cachedir, 0, NULL);</div><div class='del'>-	if (is-&gt;cache) {</div><div class='del'>-		/* Expire entries after 14 days of inactivity */</div><div class='del'>-		camel_data_cache_set_expire_access(is-&gt;cache, 60*60*24*14);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-hash_match(char hash[17], int argc, struct _ESExpResult **argv)</div><div class='del'>-{</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	unsigned char digest[16];</div><div class='del'>-	unsigned int state = 0, save = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	md5_init(&amp;ctx);</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING)</div><div class='del'>-			md5_update(&amp;ctx, argv[i]-&gt;value.string, strlen(argv[i]-&gt;value.string));</div><div class='del'>-	}</div><div class='del'>-	md5_final(&amp;ctx, digest);</div><div class='del'>-</div><div class='del'>-	base64_encode_close(digest, 12, FALSE, hash, &amp;state, &amp;save);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;16;i++) {</div><div class='del'>-		if (hash[i] == '+')</div><div class='del'>-			hash[i] = ',';</div><div class='del'>-		if (hash[i] == '/')</div><div class='del'>-			hash[i] = '_';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hash[16] = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-save_match(CamelImapSearch *is, struct _match_record *mr)</div><div class='del'>-{</div><div class='del'>-	guint32 mark = MATCH_MARK;</div><div class='del'>-	int ret = 0;</div><div class='del'>-	struct _match_header header;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	/* since its a cache, doesn't matter if it doesn't save, at least we have the in-memory cache</div><div class='del'>-	   for this session */</div><div class='del'>-	if (is-&gt;cache == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	stream = camel_data_cache_add(is-&gt;cache, "search/body-contains", mr-&gt;hash, NULL);</div><div class='del'>-	if (stream == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	d(printf("Saving search cache entry to '%s': %s\n", mr-&gt;hash, mr-&gt;terms[0]));</div><div class='del'>-	</div><div class='del'>-	/* we write the whole thing, then re-write the header magic, saves fancy sync code */</div><div class='del'>-	memcpy(&amp;header.mark, "    ", 4);</div><div class='del'>-	header.termcount = 0;</div><div class='del'>-	header.matchcount = mr-&gt;matches-&gt;len;</div><div class='del'>-	header.lastuid = mr-&gt;lastuid;</div><div class='del'>-	header.validity = mr-&gt;validity;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_write(stream, (char *)&amp;header, sizeof(header)) != sizeof(header)</div><div class='del'>-	    || camel_stream_write(stream, mr-&gt;matches-&gt;data, mr-&gt;matches-&gt;len*sizeof(guint32)) != mr-&gt;matches-&gt;len*sizeof(guint32)</div><div class='del'>-	    || camel_seekable_stream_seek((CamelSeekableStream *)stream, 0, CAMEL_STREAM_SET) == -1</div><div class='del'>-	    || camel_stream_write(stream, (char *)&amp;mark, sizeof(mark)) != sizeof(mark)) {</div><div class='del'>-		d(printf(" saving failed, removing cache entry\n"));</div><div class='del'>-		camel_data_cache_remove(is-&gt;cache, "search/body-contains", mr-&gt;hash, NULL);</div><div class='del'>-		ret = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)stream);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_match(CamelImapSearch *is, struct _match_record *mr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;mr-&gt;termcount;i++)</div><div class='del'>-		g_free(mr-&gt;terms[i]);</div><div class='del'>-	g_free(mr-&gt;terms);</div><div class='del'>-	g_array_free(mr-&gt;matches, TRUE);</div><div class='del'>-	g_free(mr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _match_record *</div><div class='del'>-load_match(CamelImapSearch *is, char hash[17], int argc, struct _ESExpResult **argv)</div><div class='del'>-{</div><div class='del'>-	struct _match_record *mr;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-	struct _match_header header;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	mr = g_malloc0(sizeof(*mr));</div><div class='del'>-	mr-&gt;matches = g_array_new(0, 0, sizeof(guint32));</div><div class='del'>-	g_assert(strlen(hash) == 16);</div><div class='del'>-	strcpy(mr-&gt;hash, hash);</div><div class='del'>-	mr-&gt;terms = g_malloc0(sizeof(mr-&gt;terms[0]) * argc);</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			mr-&gt;termcount++;</div><div class='del'>-			mr-&gt;terms[i] = g_strdup(argv[i]-&gt;value.string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("Loading search cache entry to '%s': %s\n", mr-&gt;hash, mr-&gt;terms[0]));</div><div class='del'>-</div><div class='del'>-	memset(&amp;header, 0, sizeof(header));</div><div class='del'>-	if (is-&gt;cache)</div><div class='del'>-		stream = camel_data_cache_get(is-&gt;cache, "search/body-contains", mr-&gt;hash, NULL);</div><div class='del'>-	if (stream != NULL) {</div><div class='del'>-		/* 'cause i'm gonna be lazy, i'm going to have the termcount == 0 for now,</div><div class='del'>-		   and not load or save them since i can't think of a nice way to do it, the hash</div><div class='del'>-		   should be sufficient to key it */</div><div class='del'>-		/* This check should also handle endianness changes, we just throw away</div><div class='del'>-		   the data (its only a cache) */</div><div class='del'>-		if (camel_stream_read(stream, (char *)&amp;header, sizeof(header)) == sizeof(header)</div><div class='del'>-		    &amp;&amp; header.validity == is-&gt;validity</div><div class='del'>-		    &amp;&amp; header.mark == MATCH_MARK</div><div class='del'>-		    &amp;&amp; header.termcount == 0) {</div><div class='del'>-			d(printf(" found %d matches\n", header.matchcount));</div><div class='del'>-			g_array_set_size(mr-&gt;matches, header.matchcount);</div><div class='del'>-			camel_stream_read(stream, mr-&gt;matches-&gt;data, sizeof(guint32)*header.matchcount);</div><div class='del'>-		} else {</div><div class='del'>-			d(printf(" file format invalid/validity changed\n"));</div><div class='del'>-			memset(&amp;header, 0, sizeof(header));</div><div class='del'>-		}</div><div class='del'>-		camel_object_unref((CamelObject *)stream);</div><div class='del'>-	} else {</div><div class='del'>-		d(printf(" no cache entry found\n"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mr-&gt;validity = header.validity;</div><div class='del'>-	if (mr-&gt;validity != is-&gt;validity)</div><div class='del'>-		mr-&gt;lastuid = 0;</div><div class='del'>-	else</div><div class='del'>-		mr-&gt;lastuid = header.lastuid;</div><div class='del'>-</div><div class='del'>-	return mr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sync_match(CamelImapSearch *is, struct _match_record *mr)</div><div class='del'>-{</div><div class='del'>-	char *p, *result, *lasts = NULL;</div><div class='del'>-	CamelImapResponse *response = NULL;</div><div class='del'>-	guint32 uid;</div><div class='del'>-	CamelFolder *folder = ((CamelFolderSearch *)is)-&gt;folder;</div><div class='del'>-	CamelImapStore *store = (CamelImapStore *)folder-&gt;parent_store;</div><div class='del'>-	struct _camel_search_words *words;</div><div class='del'>-	GString *search;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (mr-&gt;lastuid &gt;= is-&gt;lastuid &amp;&amp; mr-&gt;validity == is-&gt;validity)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	d(printf("updating match record for uid's %d:%d\n", mr-&gt;lastuid+1, is-&gt;lastuid));</div><div class='del'>-</div><div class='del'>-	/* TODO: Handle multiple search terms */</div><div class='del'>-</div><div class='del'>-	/* This handles multiple search words within a single term */</div><div class='del'>-	words = camel_search_words_split(mr-&gt;terms[0]);</div><div class='del'>-	search = g_string_new("");</div><div class='del'>-	g_string_sprintfa(search, "UID %d:%d", mr-&gt;lastuid+1, is-&gt;lastuid);</div><div class='del'>-	for (i=0;i&lt;words-&gt;len;i++) {</div><div class='del'>-		char *w = words-&gt;words[i]-&gt;word, c;</div><div class='del'>-</div><div class='del'>-		g_string_sprintfa(search, " BODY \"");</div><div class='del'>-		while ((c = *w++)) {</div><div class='del'>-			if (c == '\\' || c == '"')</div><div class='del'>-				g_string_append_c(search, '\\');</div><div class='del'>-			g_string_append_c(search, c);</div><div class='del'>-		}</div><div class='del'>-		g_string_append_c(search, '"');</div><div class='del'>-	}</div><div class='del'>-	camel_search_words_free(words);</div><div class='del'>-</div><div class='del'>-	/* We only try search using utf8 if its non us-ascii text? */</div><div class='del'>-	if ((words-&gt;type &amp; CAMEL_SEARCH_WORD_8BIT) &amp;&amp;  (store-&gt;capabilities &amp; IMAP_CAPABILITY_utf8_search)) {</div><div class='del'>-		response = camel_imap_command(store, folder, NULL,</div><div class='del'>-					      "UID SEARCH CHARSET UTF-8 %s", search-&gt;str);</div><div class='del'>-		/* We can't actually tell if we got a NO response, so assume always */</div><div class='del'>-		if (response == NULL)</div><div class='del'>-			store-&gt;capabilities &amp;= ~IMAP_CAPABILITY_utf8_search;</div><div class='del'>-	}</div><div class='del'>-	if (response == NULL)</div><div class='del'>-		response = camel_imap_command (store, folder, NULL,</div><div class='del'>-					       "UID SEARCH %s", search-&gt;str);</div><div class='del'>-	g_string_free(search, TRUE);</div><div class='del'>-</div><div class='del'>-	if (!response)</div><div class='del'>-		return -1;</div><div class='del'>-	result = camel_imap_response_extract (store, response, "SEARCH", NULL);</div><div class='del'>-	if (!result)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	p = result + sizeof ("* SEARCH");</div><div class='del'>-	for (p = strtok_r (p, " ", &amp;lasts); p; p = strtok_r (NULL, " ", &amp;lasts)) {</div><div class='del'>-		uid = strtoul(p, NULL, 10);</div><div class='del'>-		g_array_append_vals(mr-&gt;matches, &amp;uid, 1);</div><div class='del'>-	}</div><div class='del'>-	g_free(result);</div><div class='del'>-</div><div class='del'>-	mr-&gt;validity = is-&gt;validity;</div><div class='del'>-	mr-&gt;lastuid = is-&gt;lastuid;</div><div class='del'>-	save_match(is, mr);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _match_record *</div><div class='del'>-get_match(CamelImapSearch *is, int argc, struct _ESExpResult **argv)</div><div class='del'>-{</div><div class='del'>-	char hash[17];</div><div class='del'>-	struct _match_record *mr;</div><div class='del'>-</div><div class='del'>-	hash_match(hash, argc, argv);</div><div class='del'>-</div><div class='del'>-	mr = g_hash_table_lookup(is-&gt;matches_hash, hash);</div><div class='del'>-	if (mr == NULL) {</div><div class='del'>-		while (is-&gt;matches_count &gt;= MATCH_CACHE_SIZE) {</div><div class='del'>-			mr = (struct _match_record *)e_dlist_remtail(&amp;is-&gt;matches);</div><div class='del'>-			if (mr) {</div><div class='del'>-				printf("expiring match '%s' (%s)\n", mr-&gt;hash, mr-&gt;terms[0]);</div><div class='del'>-				g_hash_table_remove(is-&gt;matches_hash, mr-&gt;hash);</div><div class='del'>-				free_match(is, mr);</div><div class='del'>-				is-&gt;matches_count--;</div><div class='del'>-			} else {</div><div class='del'>-				is-&gt;matches_count = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		mr = load_match(is, hash, argc, argv);</div><div class='del'>-		g_hash_table_insert(is-&gt;matches_hash, mr-&gt;hash, mr);</div><div class='del'>-		is-&gt;matches_count++;</div><div class='del'>-	} else {</div><div class='del'>-		e_dlist_remove((EDListNode *)mr);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dlist_addhead(&amp;is-&gt;matches, (EDListNode *)mr);</div><div class='del'>-</div><div class='del'>-	/* what about offline mode? */</div><div class='del'>-	/* We could cache those results too, or should we cache them elsewhere? */</div><div class='del'>-	sync_match(is, mr);</div><div class='del'>-</div><div class='del'>-	return mr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-imap_body_contains (struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (s-&gt;folder-&gt;parent_store);</div><div class='del'>-	CamelImapSearch *is = (CamelImapSearch *)s;</div><div class='del'>-	char *uid;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	CamelMessageInfo *info;	</div><div class='del'>-	GHashTable *uid_hash = NULL;</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	int i, j;</div><div class='del'>-	struct _match_record *mr;</div><div class='del'>-	guint32 uidn, *uidp;</div><div class='del'>-</div><div class='del'>-	d(printf("Performing body search '%s'\n", argv[0]-&gt;value.string));</div><div class='del'>-</div><div class='del'>-	/* TODO: Cache offline searches too? */</div><div class='del'>-</div><div class='del'>-	/* If offline, search using the parent class, which can handle this manually */</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), NULL))</div><div class='del'>-		return imap_search_parent_class-&gt;body_contains(f, argc, argv, s);</div><div class='del'>-</div><div class='del'>-	/* optimise the match "" case - match everything */</div><div class='del'>-	if (argc == 1 &amp;&amp; argv[0]-&gt;value.string[0] == '\0') {</div><div class='del'>-		if (s-&gt;current) {</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-			r-&gt;value.bool = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-			r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-			for (i = 0; i &lt; s-&gt;summary-&gt;len; i++) {</div><div class='del'>-				info = g_ptr_array_index(s-&gt;summary, i);</div><div class='del'>-				g_ptr_array_add(r-&gt;value.ptrarray, (char *)camel_message_info_uid(info));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (argc == 0 || s-&gt;summary-&gt;len == 0) {</div><div class='del'>-		/* nothing to match case, do nothing (should be handled higher up?) */</div><div class='del'>-		if (s-&gt;current) {</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-			r-&gt;value.bool = FALSE;</div><div class='del'>-		} else {</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-			r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		int truth = FALSE;</div><div class='del'>-</div><div class='del'>-		/* setup lastuid/validity for synchronising */</div><div class='del'>-		info = g_ptr_array_index(s-&gt;summary, s-&gt;summary-&gt;len-1);</div><div class='del'>-		is-&gt;lastuid = strtoul(camel_message_info_uid(info), NULL, 10);</div><div class='del'>-		is-&gt;validity = ((CamelImapSummary *)(s-&gt;folder-&gt;summary))-&gt;validity;</div><div class='del'>-</div><div class='del'>-		mr = get_match(is, argc, argv);</div><div class='del'>-</div><div class='del'>-		if (s-&gt;current) {</div><div class='del'>-			uidn = strtoul(camel_message_info_uid(s-&gt;current), NULL, 10);</div><div class='del'>-			uidp = (guint32 *)mr-&gt;matches-&gt;data;</div><div class='del'>-			j = mr-&gt;matches-&gt;len;</div><div class='del'>-			for (i=0;i&lt;j &amp;&amp; !truth;i++)</div><div class='del'>-				truth = *uidp++ == uidn;</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-			r-&gt;value.bool = truth;</div><div class='del'>-		} else {</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_ARRAY_PTR);</div><div class='del'>-			array = r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-			/* We use a hash to map the uid numbers to uid strings as required by the search api */</div><div class='del'>-			/* We use the summary's strings so we dont need to alloc more */</div><div class='del'>-			uid_hash = g_hash_table_new(NULL, NULL);</div><div class='del'>-			for (i = 0; i &lt; s-&gt;summary-&gt;len; i++) {</div><div class='del'>-				info = s-&gt;summary-&gt;pdata[i];</div><div class='del'>-				uid = (char *)camel_message_info_uid(info);</div><div class='del'>-				uidn = strtoul(uid, NULL, 10);</div><div class='del'>-				g_hash_table_insert(uid_hash, (void *)uidn, uid);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			uidp = (guint32 *)mr-&gt;matches-&gt;data;</div><div class='del'>-			j = mr-&gt;matches-&gt;len;</div><div class='del'>-			for (i=0;i&lt;j &amp;&amp; !truth;i++) {</div><div class='del'>-				uid = g_hash_table_lookup(uid_hash, (void *)*uidp++);</div><div class='del'>-				if (uid)</div><div class='del'>-					g_ptr_array_add(array, uid);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_hash_table_destroy(uid_hash);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h<br/>deleted file mode 100644<br/>index 7664c4c2ed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-search.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-search.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-search.h: IMAP folder search */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors:</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_IMAP_SEARCH_H</div><div class='del'>-#define _CAMEL_IMAP_SEARCH_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-search.h&gt;</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-#include &lt;camel/camel-data-cache.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_SEARCH_TYPE         (camel_imap_search_get_type ())</div><div class='del'>-#define CAMEL_IMAP_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_imap_search_get_type (), CamelImapSearch)</div><div class='del'>-#define CAMEL_IMAP_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_search_get_type (), CamelImapSearchClass)</div><div class='del'>-#define CAMEL_IS_IMAP_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_search_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapSearchClass CamelImapSearchClass;</div><div class='del'>-</div><div class='del'>-struct _CamelImapSearch {</div><div class='del'>-	CamelFolderSearch parent;</div><div class='del'>-</div><div class='del'>-	guint32 lastuid;	/* current 'last uid' for the folder */</div><div class='del'>-	guint32 validity;	/* validity of the current folder */</div><div class='del'>-</div><div class='del'>-	CamelDataCache *cache;	/* disk-cache for searches */</div><div class='del'>-</div><div class='del'>-	/* cache of body search matches */</div><div class='del'>-	unsigned int matches_count;</div><div class='del'>-	EDList matches;</div><div class='del'>-	GHashTable *matches_hash;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelImapSearchClass {</div><div class='del'>-	CamelFolderSearchClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType              camel_imap_search_get_type (void);</div><div class='del'>-CamelFolderSearch *camel_imap_search_new      (const char *cachedir);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_IMAP_SEARCH_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c<br/>deleted file mode 100644<br/>index 6b7c293cca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1991 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-store.c : class for an imap store */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors:</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *    Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-path.h"</div><div class='del'>-</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-#include "camel-imap-message-cache.h"</div><div class='del'>-#include "camel-disco-diary.h"</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#include "camel-imap-private.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-/* Specified in RFC 2060 */</div><div class='del'>-#define IMAP_PORT 143</div><div class='del'>-</div><div class='del'>-static CamelDiscoStoreClass *disco_store_class = NULL;</div><div class='del'>-static CamelRemoteStoreClass *remote_store_class = NULL;</div><div class='del'>-static char imap_tag_prefix = 'A';</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session,</div><div class='del'>-		       CamelProvider *provider, CamelURL *url,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static int imap_setv (CamelObject *object, CamelException *ex, CamelArgV *args);</div><div class='del'>-static int imap_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args);</div><div class='del'>-</div><div class='del'>-static gboolean can_work_offline (CamelDiscoStore *disco_store);</div><div class='del'>-static gboolean imap_connect_online (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean imap_connect_offline (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean imap_disconnect_online (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static gboolean imap_disconnect_offline (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static guint hash_folder_name (gconstpointer key);</div><div class='del'>-static gint compare_folder_name (gconstpointer a, gconstpointer b);</div><div class='del'>-static CamelFolder *get_folder_online (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static CamelFolder *get_folder_offline (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *create_folder (CamelStore *store, const char *parent_name, const char *folder_name, CamelException *ex);</div><div class='del'>-static void             delete_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void             rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info_online (CamelStore *store,</div><div class='del'>-						const char *top,</div><div class='del'>-						guint32 flags,</div><div class='del'>-						CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info_offline (CamelStore *store,</div><div class='del'>-						 const char *top,</div><div class='del'>-						 guint32 flags,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);</div><div class='del'>-static void subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			      CamelException *ex);</div><div class='del'>-static void unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-				CamelException *ex);</div><div class='del'>-static void imap_keepalive (CamelRemoteStore *store);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void get_folders_online (CamelImapStore *imap_store, const char *pattern,</div><div class='del'>-				GPtrArray *folders, gboolean lsub, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_store_class_init (CamelImapStoreClass *camel_imap_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class =</div><div class='del'>-		CAMEL_OBJECT_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelRemoteStoreClass *camel_remote_store_class =</div><div class='del'>-		CAMEL_REMOTE_STORE_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelDiscoStoreClass *camel_disco_store_class =</div><div class='del'>-		CAMEL_DISCO_STORE_CLASS (camel_imap_store_class);</div><div class='del'>-</div><div class='del'>-	disco_store_class = CAMEL_DISCO_STORE_CLASS (camel_type_get_global_classfuncs (camel_disco_store_get_type ()));</div><div class='del'>-	remote_store_class = CAMEL_REMOTE_STORE_CLASS (camel_type_get_global_classfuncs (camel_remote_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class-&gt;setv = imap_setv;</div><div class='del'>-	camel_object_class-&gt;getv = imap_getv;</div><div class='del'>-	</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	</div><div class='del'>-	camel_store_class-&gt;hash_folder_name = hash_folder_name;</div><div class='del'>-	camel_store_class-&gt;compare_folder_name = compare_folder_name;</div><div class='del'>-	camel_store_class-&gt;create_folder = create_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-	camel_store_class-&gt;folder_subscribed = folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = unsubscribe_folder;</div><div class='del'>-</div><div class='del'>-	camel_remote_store_class-&gt;keepalive = imap_keepalive;</div><div class='del'>-</div><div class='del'>-	camel_disco_store_class-&gt;can_work_offline = can_work_offline;</div><div class='del'>-	camel_disco_store_class-&gt;connect_online = imap_connect_online;</div><div class='del'>-	camel_disco_store_class-&gt;connect_offline = imap_connect_offline;</div><div class='del'>-	camel_disco_store_class-&gt;disconnect_online = imap_disconnect_online;</div><div class='del'>-	camel_disco_store_class-&gt;disconnect_offline = imap_disconnect_offline;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_online = get_folder_online;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_offline = get_folder_offline;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_resyncing = get_folder_online;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_info_online = get_folder_info_online;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_info_offline = get_folder_info_offline;</div><div class='del'>-	camel_disco_store_class-&gt;get_folder_info_resyncing = get_folder_info_online;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-free_key (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_store_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);</div><div class='del'>-</div><div class='del'>-	/* This frees current_folder, folders, authtypes, and namespace. */</div><div class='del'>-	imap_disconnect_offline (CAMEL_SERVICE (object), FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	if (imap_store-&gt;base_url)</div><div class='del'>-		g_free (imap_store-&gt;base_url);</div><div class='del'>-	if (imap_store-&gt;storage_path)</div><div class='del'>-		g_free (imap_store-&gt;storage_path);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy (imap_store-&gt;priv-&gt;command_lock);</div><div class='del'>-	e_thread_destroy(imap_store-&gt;async_thread);</div><div class='del'>-#endif</div><div class='del'>-	g_free (imap_store-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-static void async_destroy(EThread *et, EMsg *em, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = data;</div><div class='del'>-	CamelImapMsg *msg = (CamelImapMsg *)em;</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;free)</div><div class='del'>-		msg-&gt;free(imap_store, msg);</div><div class='del'>-</div><div class='del'>-	g_free(msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void async_received(EThread *et, EMsg *em, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = data;</div><div class='del'>-	CamelImapMsg *msg = (CamelImapMsg *)em;</div><div class='del'>-</div><div class='del'>-	if (msg-&gt;receive)</div><div class='del'>-		msg-&gt;receive(imap_store, msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelImapMsg *camel_imap_msg_new(void (*receive)(CamelImapStore *store, struct _CamelImapMsg *m),</div><div class='del'>-				 void (*free)(CamelImapStore *store, struct _CamelImapMsg *m),</div><div class='del'>-				 size_t size)</div><div class='del'>-{</div><div class='del'>-	CamelImapMsg *msg;</div><div class='del'>-</div><div class='del'>-	g_assert(size &gt;= sizeof(*msg));</div><div class='del'>-</div><div class='del'>-	msg = g_malloc0(size);</div><div class='del'>-	msg-&gt;receive = receive;</div><div class='del'>-	msg-&gt;free = free;</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_imap_msg_queue(CamelImapStore *store, CamelImapMsg *msg)</div><div class='del'>-{</div><div class='del'>-	e_thread_put(store-&gt;async_thread, (EMsg *)msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);</div><div class='del'>-	</div><div class='del'>-	remote_store-&gt;default_port = 143;</div><div class='del'>-	remote_store-&gt;default_ssl_port = 993;</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;dir_sep = '\0';</div><div class='del'>-	imap_store-&gt;current_folder = NULL;</div><div class='del'>-	imap_store-&gt;connected = FALSE;</div><div class='del'>-	imap_store-&gt;subscribed_folders = NULL;</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;tag_prefix = imap_tag_prefix++;</div><div class='del'>-	if (imap_tag_prefix &gt; 'Z')</div><div class='del'>-		imap_tag_prefix = 'A';</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;priv = g_malloc0 (sizeof (*imap_store-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	imap_store-&gt;priv-&gt;command_lock = e_mutex_new (E_MUTEX_REC);</div><div class='del'>-	imap_store-&gt;async_thread = e_thread_new(E_THREAD_QUEUE);</div><div class='del'>-	e_thread_set_msg_destroy(imap_store-&gt;async_thread, async_destroy, imap_store);</div><div class='del'>-	e_thread_set_msg_received(imap_store-&gt;async_thread, async_received, imap_store);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_imap_store_type =</div><div class='del'>-			camel_type_register (CAMEL_DISCO_STORE_TYPE, "CamelImapStore",</div><div class='del'>-					     sizeof (CamelImapStore),</div><div class='del'>-					     sizeof (CamelImapStoreClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_imap_store_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_imap_store_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) camel_imap_store_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_imap_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session,</div><div class='del'>-	   CamelProvider *provider, CamelURL *url,</div><div class='del'>-	   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (service);</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (disco_store_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	imap_store-&gt;storage_path = camel_session_get_storage_path (session, service, ex);</div><div class='del'>-	if (!imap_store-&gt;storage_path)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	imap_store-&gt;base_url = camel_url_to_string (service-&gt;url, (CAMEL_URL_HIDE_PASSWORD |</div><div class='del'>-								   CAMEL_URL_HIDE_PARAMS |</div><div class='del'>-								   CAMEL_URL_HIDE_AUTH));</div><div class='del'>-</div><div class='del'>-	imap_store-&gt;parameters = 0;</div><div class='del'>-	if (camel_url_get_param (url, "use_lsub"))</div><div class='del'>-		store-&gt;flags |= CAMEL_STORE_SUBSCRIPTIONS;</div><div class='del'>-	if (camel_url_get_param (url, "namespace")) {</div><div class='del'>-		imap_store-&gt;parameters |= IMAP_PARAM_OVERRIDE_NAMESPACE;</div><div class='del'>-		imap_store-&gt;namespace = g_strdup (camel_url_get_param (url, "namespace"));</div><div class='del'>-	}</div><div class='del'>-	if (camel_url_get_param (url, "check_all"))</div><div class='del'>-		imap_store-&gt;parameters |= IMAP_PARAM_CHECK_ALL;</div><div class='del'>-	if (camel_url_get_param (url, "filter")) {</div><div class='del'>-		imap_store-&gt;parameters |= IMAP_PARAM_FILTER_INBOX;</div><div class='del'>-		store-&gt;flags |= CAMEL_STORE_FILTER_INBOX;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-imap_setv (CamelObject *object, CamelException *ex, CamelArgV *args)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = (CamelImapStore *) object;</div><div class='del'>-	guint32 tag, flags;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this arg wasn't already handled */</div><div class='del'>-		if (tag &amp; CAMEL_ARG_IGNORE)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_IMAP_STORE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_IMAP_STORE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (tag == CAMEL_IMAP_STORE_NAMESPACE) {</div><div class='del'>-			if (strcmp (store-&gt;namespace, args-&gt;argv[i].ca_str) != 0) {</div><div class='del'>-				g_free (store-&gt;namespace);</div><div class='del'>-				store-&gt;namespace = g_strdup (args-&gt;argv[i].ca_str);</div><div class='del'>-				/* the current imap code will need to do a reconnect for this to take effect */</div><div class='del'>-				/*reconnect = TRUE;*/</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE) {</div><div class='del'>-			flags = args-&gt;argv[i].ca_int ? IMAP_PARAM_OVERRIDE_NAMESPACE : 0;</div><div class='del'>-			flags |= (store-&gt;parameters &amp; ~IMAP_PARAM_OVERRIDE_NAMESPACE);</div><div class='del'>-			</div><div class='del'>-			if (store-&gt;parameters != flags) {</div><div class='del'>-				store-&gt;parameters = flags;</div><div class='del'>-				/* the current imap code will need to do a reconnect for this to take effect */</div><div class='del'>-				/*reconnect = TRUE;*/</div><div class='del'>-			}</div><div class='del'>-		} else if (tag == CAMEL_IMAP_STORE_CHECK_ALL) {</div><div class='del'>-			flags = args-&gt;argv[i].ca_int ? IMAP_PARAM_CHECK_ALL : 0;</div><div class='del'>-			flags |= (store-&gt;parameters &amp; ~IMAP_PARAM_CHECK_ALL);</div><div class='del'>-			store-&gt;parameters = flags;</div><div class='del'>-			/* no need to reconnect for this option to take effect... */</div><div class='del'>-		} else if (tag == CAMEL_IMAP_STORE_FILTER_INBOX) {</div><div class='del'>-			flags = args-&gt;argv[i].ca_int ? IMAP_PARAM_FILTER_INBOX : 0;</div><div class='del'>-			flags |= (store-&gt;parameters &amp; ~IMAP_PARAM_FILTER_INBOX);</div><div class='del'>-			store-&gt;parameters = flags;</div><div class='del'>-			/* no need to reconnect for this option to take effect... */</div><div class='del'>-		} else {</div><div class='del'>-			/* error?? */</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* let our parent know that we've handled this arg */</div><div class='del'>-		camel_argv_ignore (args, i);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* FIXME: if we need to reconnect for a change to take affect,</div><div class='del'>-           we need to do it here... or, better yet, somehow chain it</div><div class='del'>-           up to CamelService's setv implementation. */</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (disco_store_class)-&gt;setv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-imap_getv (CamelObject *object, CamelException *ex, CamelArgGetV *args)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = (CamelImapStore *) object;</div><div class='del'>-	guint32 tag;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; args-&gt;argc; i++) {</div><div class='del'>-		tag = args-&gt;argv[i].tag;</div><div class='del'>-		</div><div class='del'>-		/* make sure this is an arg we're supposed to handle */</div><div class='del'>-		if ((tag &amp; CAMEL_ARG_TAG) &lt;= CAMEL_IMAP_STORE_ARG_FIRST ||</div><div class='del'>-		    (tag &amp; CAMEL_ARG_TAG) &gt;= CAMEL_IMAP_STORE_ARG_FIRST + 100)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		switch (tag) {</div><div class='del'>-		case CAMEL_IMAP_STORE_NAMESPACE:</div><div class='del'>-			/* get the username */</div><div class='del'>-			*args-&gt;argv[i].ca_str = store-&gt;namespace;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE:</div><div class='del'>-			/* get the auth mechanism */</div><div class='del'>-			*args-&gt;argv[i].ca_int = store-&gt;parameters &amp; IMAP_PARAM_OVERRIDE_NAMESPACE ? TRUE : FALSE;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_IMAP_STORE_CHECK_ALL:</div><div class='del'>-			/* get the hostname */</div><div class='del'>-			*args-&gt;argv[i].ca_int = store-&gt;parameters &amp; IMAP_PARAM_CHECK_ALL ? TRUE : FALSE;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_IMAP_STORE_FILTER_INBOX:</div><div class='del'>-			/* get the port */</div><div class='del'>-			*args-&gt;argv[i].ca_int = store-&gt;parameters &amp; IMAP_PARAM_FILTER_INBOX ? TRUE : FALSE;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* error? */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return CAMEL_OBJECT_CLASS (disco_store_class)-&gt;getv (object, ex, args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_set_server_level (CamelImapStore *store)</div><div class='del'>-{</div><div class='del'>-	if (store-&gt;capabilities &amp; IMAP_CAPABILITY_IMAP4REV1) {</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_IMAP4REV1;</div><div class='del'>-		store-&gt;capabilities |= IMAP_CAPABILITY_STATUS;</div><div class='del'>-	} else if (store-&gt;capabilities &amp; IMAP_CAPABILITY_IMAP4)</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_IMAP4;</div><div class='del'>-	else</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	guint32 flag;</div><div class='del'>-} capabilities[] = {</div><div class='del'>-	{ "IMAP4",		IMAP_CAPABILITY_IMAP4 },</div><div class='del'>-	{ "IMAP4REV1",		IMAP_CAPABILITY_IMAP4REV1 },</div><div class='del'>-	{ "STATUS",		IMAP_CAPABILITY_STATUS },</div><div class='del'>-	{ "NAMESPACE",		IMAP_CAPABILITY_NAMESPACE },</div><div class='del'>-	{ "UIDPLUS",		IMAP_CAPABILITY_UIDPLUS },</div><div class='del'>-	{ "LITERAL+",		IMAP_CAPABILITY_LITERALPLUS },</div><div class='del'>-	{ NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* we have remote-store:connect_lock by now */</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *result, *buf, *capa, *lasts;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (store, command_lock);</div><div class='del'>-</div><div class='del'>-	store-&gt;command = 0;</div><div class='del'>-</div><div class='del'>-	/* Read the greeting, if any. FIXME: deal with PREAUTH */</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service),</div><div class='del'>-					  &amp;buf, ex) &lt; 0) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (buf);</div><div class='del'>-	store-&gt;connected = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Find out the IMAP capabilities */</div><div class='del'>-	/* We assume we have utf8 capable search until a failed search tells us otherwise */</div><div class='del'>-	store-&gt;capabilities = IMAP_CAPABILITY_utf8_search;</div><div class='del'>-	store-&gt;authtypes = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "CAPABILITY");</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	result = camel_imap_response_extract (store, response, "CAPABILITY ", ex);</div><div class='del'>-	if (!result)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Skip over "* CAPABILITY ". */</div><div class='del'>-	capa = result + 13;</div><div class='del'>-	for (capa = strtok_r (capa, " ", &amp;lasts); capa;</div><div class='del'>-	     capa = strtok_r (NULL, " ", &amp;lasts)) {</div><div class='del'>-		if (!strncmp (capa, "AUTH=", 5)) {</div><div class='del'>-			g_hash_table_insert (store-&gt;authtypes,</div><div class='del'>-					     g_strdup (capa + 5),</div><div class='del'>-					     GINT_TO_POINTER (1));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		for (i = 0; capabilities[i].name; i++) {</div><div class='del'>-			if (g_strcasecmp (capa, capabilities[i].name) == 0) {</div><div class='del'>-				store-&gt;capabilities |= capabilities[i].flag;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	imap_set_server_level (store);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_imap_password_authtype;</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelServiceAuthType *authtype;</div><div class='del'>-	GList *types, *sasl_types, *t, *next;</div><div class='del'>-	gboolean connected;</div><div class='del'>-</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	connected = CAMEL_SERVICE_CLASS (remote_store_class)-&gt;connect (service, ex) &amp;&amp; connect_to_server (service, ex);</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-	if (!connected)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	types = CAMEL_SERVICE_CLASS (disco_store_class)-&gt;query_auth_types (service, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return types;</div><div class='del'>-</div><div class='del'>-	sasl_types = camel_sasl_authtype_list (FALSE);</div><div class='del'>-	for (t = sasl_types; t; t = next) {</div><div class='del'>-		authtype = t-&gt;data;</div><div class='del'>-		next = t-&gt;next;</div><div class='del'>-</div><div class='del'>-		if (!g_hash_table_lookup (store-&gt;authtypes, authtype-&gt;authproto)) {</div><div class='del'>-			sasl_types = g_list_remove_link (sasl_types, t);</div><div class='del'>-			g_list_free_1 (t);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	types = g_list_concat (types, sasl_types);</div><div class='del'>-</div><div class='del'>-	return g_list_prepend (types, &amp;camel_imap_password_authtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_folder(char *key, CamelFolder *folder, GPtrArray *out)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_add(out, folder);</div><div class='del'>-	camel_object_ref((CamelObject *)folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is a little 'hack' to avoid the deadlock conditions that would otherwise</div><div class='del'>-   ensue when calling camel_folder_refresh_info from inside a lock */</div><div class='del'>-/* NB: on second thougts this is probably not entirely safe, but it'll do for now */</div><div class='del'>-/* No, its definetly not safe.  So its been changed to copy the folders first */</div><div class='del'>-/* the alternative is to:</div><div class='del'>-   make the camel folder-&gt;lock recursive (which should probably be done)</div><div class='del'>-   or remove it from camel_folder_refresh_info, and use another locking mechanism */</div><div class='del'>-static void</div><div class='del'>-imap_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	folders = g_ptr_array_new();</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	g_hash_table_foreach (CAMEL_STORE (store)-&gt;folders, (GHFunc)copy_folder, folders);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;folders-&gt;len;i++) {</div><div class='del'>-		CamelFolder *folder = folders-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		CAMEL_IMAP_FOLDER (folder)-&gt;need_rescan = TRUE;</div><div class='del'>-		if (!camel_exception_is_set(ex))</div><div class='del'>-			CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))-&gt;refresh_info(folder, ex);</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free(folders, TRUE);</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-try_auth (CamelImapStore *store, const char *mech, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSasl *sasl;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *resp;</div><div class='del'>-	char *sasl_resp;</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "AUTHENTICATE %s", mech);</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	sasl = camel_sasl_new ("imap", mech, CAMEL_SERVICE (store));</div><div class='del'>-	while (!camel_sasl_authenticated (sasl)) {</div><div class='del'>-		resp = camel_imap_response_extract_continuation (store, response, ex);</div><div class='del'>-		if (!resp)</div><div class='del'>-			goto lose;</div><div class='del'>-		</div><div class='del'>-		sasl_resp = camel_sasl_challenge_base64 (sasl, imap_next_word (resp), ex);</div><div class='del'>-		g_free (resp);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			goto break_and_lose;</div><div class='del'>-		</div><div class='del'>-		response = camel_imap_command_continuation (store, sasl_resp, strlen (sasl_resp), ex);</div><div class='del'>-		g_free (sasl_resp);</div><div class='del'>-		if (!response)</div><div class='del'>-			goto lose;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	resp = camel_imap_response_extract_continuation (store, response, NULL);</div><div class='del'>-	if (resp) {</div><div class='del'>-		/* Oops. SASL claims we're done, but the IMAP server</div><div class='del'>-		 * doesn't think so...</div><div class='del'>-		 */</div><div class='del'>-		g_free (resp);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sasl));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>- break_and_lose:</div><div class='del'>-	/* Get the server out of "waiting for continuation data" mode. */</div><div class='del'>-	response = camel_imap_command_continuation (store, "*", 1, NULL);</div><div class='del'>-	if (response)</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-	</div><div class='del'>- lose:</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Bad authentication response from server."));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sasl));</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_auth_loop (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelSession *session = camel_service_get_session (service);</div><div class='del'>-	CamelServiceAuthType *authtype = NULL;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *errbuf = NULL;</div><div class='del'>-	gboolean authenticated = FALSE;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_STORE_ASSERT_LOCKED (store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url-&gt;authmech) {</div><div class='del'>-		if (!g_hash_table_lookup (store-&gt;authtypes, service-&gt;url-&gt;authmech)) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("IMAP server %s does not support requested "</div><div class='del'>-						"authentication type %s"),</div><div class='del'>-					      service-&gt;url-&gt;host,</div><div class='del'>-					      service-&gt;url-&gt;authmech);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		authtype = camel_sasl_authtype (service-&gt;url-&gt;authmech);</div><div class='del'>-		if (!authtype) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("No support for authentication type %s"),</div><div class='del'>-					      service-&gt;url-&gt;authmech);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!authtype-&gt;need_password) {</div><div class='del'>-			authenticated = try_auth (store, authtype-&gt;authproto, ex);</div><div class='del'>-			if (!authenticated)</div><div class='del'>-				return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!authenticated) {</div><div class='del'>-		if (errbuf) {</div><div class='del'>-			/* We need to un-cache the password before prompting again */</div><div class='del'>-			camel_session_forget_password (</div><div class='del'>-				session, service, "password", ex);</div><div class='del'>-			g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-			service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-			char *prompt;</div><div class='del'>-</div><div class='del'>-			prompt = g_strdup_printf (_("%sPlease enter the IMAP "</div><div class='del'>-						    "password for %s@%s"),</div><div class='del'>-						  errbuf ? errbuf : "",</div><div class='del'>-						  service-&gt;url-&gt;user,</div><div class='del'>-						  service-&gt;url-&gt;host);</div><div class='del'>-			service-&gt;url-&gt;passwd =</div><div class='del'>-				camel_session_get_password (</div><div class='del'>-					session, prompt, TRUE,</div><div class='del'>-					service, "password", ex);</div><div class='del'>-			g_free (prompt);</div><div class='del'>-			g_free (errbuf);</div><div class='del'>-			errbuf = NULL;</div><div class='del'>-</div><div class='del'>-			if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-						     _("You didn't enter a password."));</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!store-&gt;connected) {</div><div class='del'>-			/* Some servers (eg, courier) will disconnect on</div><div class='del'>-			 * a bad password. So reconnect here.</div><div class='del'>-			 */</div><div class='del'>-			if (!connect_to_server (service, ex))</div><div class='del'>-				return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (authtype)</div><div class='del'>-			authenticated = try_auth (store, authtype-&gt;authproto, ex);</div><div class='del'>-		else {</div><div class='del'>-			response = camel_imap_command (store, NULL, ex,</div><div class='del'>-						       "LOGIN %S %S",</div><div class='del'>-						       service-&gt;url-&gt;user,</div><div class='del'>-						       service-&gt;url-&gt;passwd);</div><div class='del'>-			if (response) {</div><div class='del'>-				camel_imap_response_free (store, response);</div><div class='del'>-				authenticated = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!authenticated) {</div><div class='del'>-			if (camel_exception_get_id(ex) == CAMEL_EXCEPTION_USER_CANCEL)</div><div class='del'>-				return FALSE;</div><div class='del'>-</div><div class='del'>-			errbuf = g_strdup_printf (_("Unable to authenticate "</div><div class='del'>-						    "to IMAP server.\n%s\n\n"),</div><div class='del'>-						  camel_exception_get_description (ex));</div><div class='del'>-			camel_exception_clear (ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define IMAP_STOREINFO_VERSION 1</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-can_work_offline (CamelDiscoStore *disco_store)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (disco_store);</div><div class='del'>-	char *path;</div><div class='del'>-	gboolean can;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/storeinfo", store-&gt;storage_path);</div><div class='del'>-	can = access (path, F_OK) == 0;</div><div class='del'>-	g_free (path);</div><div class='del'>-	return can;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_connect_online (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (service);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *result, *name, *path;</div><div class='del'>-	FILE *storeinfo;</div><div class='del'>-	int i, flags;</div><div class='del'>-	size_t len;</div><div class='del'>-</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	if (!connect_to_server (service, ex) ||</div><div class='del'>-	    !imap_auth_loop (service, ex)) {</div><div class='del'>-		CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-		camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/storeinfo", store-&gt;storage_path);</div><div class='del'>-	storeinfo = fopen (path, "w");</div><div class='del'>-	if (!storeinfo)</div><div class='del'>-		g_warning ("Could not open storeinfo %s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	/* Write header and capabilities */</div><div class='del'>-	camel_file_util_encode_uint32 (storeinfo, IMAP_STOREINFO_VERSION);</div><div class='del'>-	camel_file_util_encode_uint32 (storeinfo, store-&gt;capabilities);</div><div class='del'>-</div><div class='del'>-	/* Get namespace and hierarchy separator */</div><div class='del'>-	if ((store-&gt;capabilities &amp; IMAP_CAPABILITY_NAMESPACE) &amp;&amp;</div><div class='del'>-	    !(store-&gt;parameters &amp; IMAP_PARAM_OVERRIDE_NAMESPACE)) {</div><div class='del'>-		response = camel_imap_command (store, NULL, ex, "NAMESPACE");</div><div class='del'>-		if (!response)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		result = camel_imap_response_extract (store, response, "NAMESPACE", ex);</div><div class='del'>-		if (!result)</div><div class='del'>-			goto done;</div><div class='del'>-</div><div class='del'>-		name = strstrcase (result, "NAMESPACE ((");</div><div class='del'>-		if (name) {</div><div class='del'>-			char *sep;</div><div class='del'>-</div><div class='del'>-			name += 12;</div><div class='del'>-			store-&gt;namespace = imap_parse_string (&amp;name, &amp;len);</div><div class='del'>-			if (name &amp;&amp; *name++ == ' ') {</div><div class='del'>-				sep = imap_parse_string (&amp;name, &amp;len);</div><div class='del'>-				if (sep) {</div><div class='del'>-					store-&gt;dir_sep = *sep;</div><div class='del'>-					((CamelStore *)store)-&gt;dir_sep = store-&gt;dir_sep;</div><div class='del'>-					g_free (sep);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free (result);</div><div class='del'>-	}</div><div class='del'>-	if (!store-&gt;namespace)</div><div class='del'>-		store-&gt;namespace = g_strdup ("");</div><div class='del'>-	</div><div class='del'>-	if (!store-&gt;dir_sep) {</div><div class='del'>-		if (store-&gt;server_level &gt;= IMAP_LEVEL_IMAP4REV1) {</div><div class='del'>-			/* This idiom means "tell me the hierarchy separator</div><div class='del'>-			 * for the given path, even if that path doesn't exist.</div><div class='del'>-			 */</div><div class='del'>-			response = camel_imap_command (store, NULL, ex,</div><div class='del'>-						       "LIST %S \"\"",</div><div class='del'>-						       store-&gt;namespace);</div><div class='del'>-		} else {</div><div class='del'>-			/* Plain IMAP4 doesn't have that idiom, so we fall back</div><div class='del'>-			 * to "tell me about this folder", which will fail if</div><div class='del'>-			 * the folder doesn't exist (eg, if namespace is "").</div><div class='del'>-			 */</div><div class='del'>-			response = camel_imap_command (store, NULL, ex,</div><div class='del'>-						       "LIST \"\" %S",</div><div class='del'>-						       store-&gt;namespace);</div><div class='del'>-		}</div><div class='del'>-		if (!response)</div><div class='del'>-			goto done;</div><div class='del'>-		</div><div class='del'>-		result = camel_imap_response_extract (store, response, "LIST", NULL);</div><div class='del'>-		if (result) {</div><div class='del'>-			imap_parse_list_response (store, result, NULL, &amp;store-&gt;dir_sep, NULL);</div><div class='del'>-			g_free (result);</div><div class='del'>-		}</div><div class='del'>-		if (!store-&gt;dir_sep) {</div><div class='del'>-			store-&gt;dir_sep = '/';	/* Guess */</div><div class='del'>-			((CamelStore *)store)-&gt;dir_sep = store-&gt;dir_sep;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* canonicalize the namespace to end with dir_sep */</div><div class='del'>-	len = strlen (store-&gt;namespace);</div><div class='del'>-	if (len &amp;&amp; store-&gt;namespace[len - 1] != store-&gt;dir_sep) {</div><div class='del'>-		gchar *tmp;</div><div class='del'>-		</div><div class='del'>-		tmp = g_strdup_printf ("%s%c", store-&gt;namespace, store-&gt;dir_sep);</div><div class='del'>-		g_free (store-&gt;namespace);</div><div class='del'>-		store-&gt;namespace = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Write namespace/separator out */</div><div class='del'>-	camel_file_util_encode_string (storeinfo, store-&gt;namespace);</div><div class='del'>-	camel_file_util_encode_uint32 (storeinfo, store-&gt;dir_sep);</div><div class='del'>-</div><div class='del'>-	if (CAMEL_STORE (store)-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS) {</div><div class='del'>-		/* Get subscribed folders */</div><div class='del'>-		response = camel_imap_command (store, NULL, ex, "LSUB \"\" \"*\"");</div><div class='del'>-		if (!response)</div><div class='del'>-			goto done;</div><div class='del'>-		store-&gt;subscribed_folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-		for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-			result = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-			if (!imap_parse_list_response (store, result, &amp;flags, NULL, &amp;name))</div><div class='del'>-				continue;</div><div class='del'>-			if (flags &amp; (IMAP_LIST_FLAG_MARKED | IMAP_LIST_FLAG_UNMARKED))</div><div class='del'>-				store-&gt;capabilities |= IMAP_CAPABILITY_useful_lsub;</div><div class='del'>-			if (flags &amp; IMAP_LIST_FLAG_NOSELECT) {</div><div class='del'>-				g_free (name);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			g_hash_table_insert (store-&gt;subscribed_folders, name,</div><div class='del'>-					     GINT_TO_POINTER (1));</div><div class='del'>-			camel_file_util_encode_string (storeinfo, result);</div><div class='del'>-		}</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/journal", store-&gt;storage_path);</div><div class='del'>-	disco_store-&gt;diary = camel_disco_diary_new (disco_store, path, ex);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-	fclose (storeinfo);</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-	else</div><div class='del'>-		imap_store_refresh_folders (CAMEL_REMOTE_STORE (store), ex);</div><div class='del'>-	return !camel_exception_is_set (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_connect_offline (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (service);</div><div class='del'>-	char *buf, *name, *path;</div><div class='del'>-	FILE *storeinfo;</div><div class='del'>-	guint32 tmp;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/journal", store-&gt;storage_path);</div><div class='del'>-	disco_store-&gt;diary = camel_disco_diary_new (disco_store, path, ex);</div><div class='del'>-	g_free (path);</div><div class='del'>-	if (!disco_store-&gt;diary)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("%s/storeinfo", store-&gt;storage_path);</div><div class='del'>-	storeinfo = fopen (path, "r");</div><div class='del'>-	g_free (path);</div><div class='del'>-	tmp = 0;</div><div class='del'>-	if (storeinfo)</div><div class='del'>-		camel_file_util_decode_uint32 (storeinfo, &amp;tmp);</div><div class='del'>-	if (tmp != IMAP_STOREINFO_VERSION) {</div><div class='del'>-		if (storeinfo)</div><div class='del'>-			fclose (storeinfo);</div><div class='del'>-</div><div class='del'>-		/* We know we're offline, so this will have to set ex</div><div class='del'>-		 * and return FALSE.</div><div class='del'>-		 */</div><div class='del'>-		return camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_file_util_decode_uint32 (storeinfo, &amp;store-&gt;capabilities);</div><div class='del'>-	imap_set_server_level (store);</div><div class='del'>-	camel_file_util_decode_string (storeinfo, &amp;store-&gt;namespace);</div><div class='del'>-	camel_file_util_decode_uint32 (storeinfo, &amp;tmp);</div><div class='del'>-	store-&gt;dir_sep = tmp;</div><div class='del'>-	((CamelStore *)store)-&gt;dir_sep = tmp;</div><div class='del'>-</div><div class='del'>-	/* Get subscribed folders */</div><div class='del'>-	store-&gt;subscribed_folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	while (camel_file_util_decode_string (storeinfo, &amp;buf) == 0) {</div><div class='del'>-		if (!imap_parse_list_response (store, buf, NULL, NULL, &amp;name)) {</div><div class='del'>-			g_free (buf);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		g_hash_table_insert (store-&gt;subscribed_folders, name,</div><div class='del'>-				     GINT_TO_POINTER (1));</div><div class='del'>-		g_free (buf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (storeinfo);</div><div class='del'>-	imap_store_refresh_folders (CAMEL_REMOTE_STORE (store), ex);</div><div class='del'>-</div><div class='del'>-	store-&gt;connected = !camel_exception_is_set (ex);</div><div class='del'>-	return store-&gt;connected;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_disconnect_offline (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelDiscoStore *disco = CAMEL_DISCO_STORE (service);</div><div class='del'>-</div><div class='del'>-	store-&gt;connected = FALSE;</div><div class='del'>-	if (store-&gt;current_folder) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (store-&gt;current_folder));</div><div class='del'>-		store-&gt;current_folder = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (store-&gt;subscribed_folders) {</div><div class='del'>-		g_hash_table_foreach_remove (store-&gt;subscribed_folders,</div><div class='del'>-					     free_key, NULL);</div><div class='del'>-		g_hash_table_destroy (store-&gt;subscribed_folders);</div><div class='del'>-		store-&gt;subscribed_folders = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (store-&gt;authtypes) {</div><div class='del'>-		g_hash_table_foreach_remove (store-&gt;authtypes,</div><div class='del'>-					     free_key, NULL);</div><div class='del'>-		g_hash_table_destroy (store-&gt;authtypes);</div><div class='del'>-		store-&gt;authtypes = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (store-&gt;namespace &amp;&amp; !(store-&gt;parameters &amp; IMAP_PARAM_OVERRIDE_NAMESPACE)) {</div><div class='del'>-		g_free (store-&gt;namespace);</div><div class='del'>-		store-&gt;namespace = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (disco-&gt;diary) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (disco-&gt;diary));</div><div class='del'>-		disco-&gt;diary = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_disconnect_online (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	if (store-&gt;connected &amp;&amp; clean) {</div><div class='del'>-		response = camel_imap_command (store, NULL, NULL, "LOGOUT");</div><div class='del'>-		camel_imap_response_free (store, response);</div><div class='del'>-	}</div><div class='del'>-	imap_disconnect_offline (service, clean, ex);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-hash_folder_name (gconstpointer key)</div><div class='del'>-{</div><div class='del'>-	if (g_strcasecmp (key, "INBOX") == 0)</div><div class='del'>-		return g_str_hash ("INBOX");</div><div class='del'>-	else</div><div class='del'>-		return g_str_hash (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare_folder_name (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	gconstpointer aname = a, bname = b;</div><div class='del'>-</div><div class='del'>-	if (g_strcasecmp (a, "INBOX") == 0)</div><div class='del'>-		aname = "INBOX";</div><div class='del'>-	if (g_strcasecmp (b, "INBOX") == 0)</div><div class='del'>-		bname = "INBOX";</div><div class='del'>-	return g_str_equal (aname, bname);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-no_such_folder (const char *name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-			      _("No such folder %s"), name);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_folder_status (CamelImapStore *imap_store, const char *folder_name, const char *type)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *status, *p;</div><div class='del'>-	int out;</div><div class='del'>-</div><div class='del'>-	/* FIXME: we assume the server is STATUS-capable */</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, NULL,</div><div class='del'>-				       "STATUS %F (%s)",</div><div class='del'>-				       folder_name,</div><div class='del'>-				       type);</div><div class='del'>-</div><div class='del'>-	if (!response)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	status = camel_imap_response_extract (imap_store, response,</div><div class='del'>-					      "STATUS", NULL);</div><div class='del'>-	if (!status)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	p = strstrcase (status, type);</div><div class='del'>-	if (p)</div><div class='del'>-		out = strtoul (p + strlen (type), NULL, 10);</div><div class='del'>-	else</div><div class='del'>-		out = -1;</div><div class='del'>-</div><div class='del'>-	g_free (status);</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder_online (CamelStore *store, const char *folder_name,</div><div class='del'>-		   guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-	char *folder_dir;</div><div class='del'>-	</div><div class='del'>-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (!g_strcasecmp (folder_name, "INBOX"))</div><div class='del'>-		folder_name = "INBOX";</div><div class='del'>-	</div><div class='del'>-	/* Lock around the whole lot to check/create atomically */</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (imap_store, command_lock);</div><div class='del'>-	if (imap_store-&gt;current_folder) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (imap_store-&gt;current_folder));</div><div class='del'>-		imap_store-&gt;current_folder = NULL;</div><div class='del'>-	}</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, NULL,</div><div class='del'>-				       "SELECT %F", folder_name);</div><div class='del'>-	if (!response) {</div><div class='del'>-		if (!flags &amp; CAMEL_STORE_FOLDER_CREATE) {</div><div class='del'>-			CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);</div><div class='del'>-			return no_such_folder (folder_name, ex);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-					       "CREATE %F", folder_name);</div><div class='del'>-		if (response) {</div><div class='del'>-			camel_imap_response_free (imap_store, response);</div><div class='del'>-			</div><div class='del'>-			response = camel_imap_command (imap_store, NULL, NULL,</div><div class='del'>-						       "SELECT %F", folder_name);</div><div class='del'>-		}</div><div class='del'>-		if (!response) {</div><div class='del'>-			CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	folder_dir = e_path_to_physical (imap_store-&gt;storage_path, folder_name);</div><div class='del'>-	new_folder = camel_imap_folder_new (store, folder_name, folder_dir, ex);</div><div class='del'>-	g_free (folder_dir);</div><div class='del'>-	if (new_folder) {</div><div class='del'>-		imap_store-&gt;current_folder = new_folder;</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (new_folder));</div><div class='del'>-		camel_imap_folder_selected (new_folder, response, ex);</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (imap_store-&gt;current_folder));</div><div class='del'>-			imap_store-&gt;current_folder = NULL;</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (new_folder));</div><div class='del'>-			new_folder = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free_without_processing (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (imap_store, command_lock);</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder_offline (CamelStore *store, const char *folder_name,</div><div class='del'>-		    guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelFolder *new_folder;</div><div class='del'>-	char *folder_dir;</div><div class='del'>-	</div><div class='del'>-	if (!imap_store-&gt;connected &amp;&amp;</div><div class='del'>-	    !camel_service_connect (CAMEL_SERVICE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (!g_strcasecmp (folder_name, "INBOX"))</div><div class='del'>-		folder_name = "INBOX";</div><div class='del'>-	</div><div class='del'>-	folder_dir = e_path_to_physical (imap_store-&gt;storage_path, folder_name);</div><div class='del'>-	if (access (folder_dir, F_OK) != 0)</div><div class='del'>-		return no_such_folder (folder_name, ex);</div><div class='del'>-	</div><div class='del'>-	new_folder = camel_imap_folder_new (store, folder_name, folder_dir, ex);</div><div class='del'>-	g_free (folder_dir);</div><div class='del'>-	</div><div class='del'>-	return new_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* make sure this folder isn't currently SELECTed */</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "SELECT INBOX");</div><div class='del'>-	if (response) {</div><div class='del'>-		camel_imap_response_free_without_processing (imap_store, response);</div><div class='del'>-		</div><div class='del'>-		if (imap_store-&gt;current_folder)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (imap_store-&gt;current_folder));</div><div class='del'>-		/* no need to actually create a CamelFolder for INBOX */</div><div class='del'>-		imap_store-&gt;current_folder = NULL;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "DELETE %F",</div><div class='del'>-				       folder_name);</div><div class='del'>-	</div><div class='del'>-	if (response) {</div><div class='del'>-		CamelFolderSummary *summary;</div><div class='del'>-		CamelImapMessageCache *cache;</div><div class='del'>-		char *summary_file;</div><div class='del'>-		char *journal_file;</div><div class='del'>-		char *folder_dir;</div><div class='del'>-		CamelFolderInfo *fi;</div><div class='del'>-		const char *name;</div><div class='del'>-		</div><div class='del'>-		camel_imap_response_free (imap_store, response);</div><div class='del'>-		</div><div class='del'>-		folder_dir = e_path_to_physical (imap_store-&gt;storage_path, folder_name);</div><div class='del'>-		if (access (folder_dir, F_OK) != 0) {</div><div class='del'>-			g_free (folder_dir);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		summary_file = g_strdup_printf ("%s/summary", folder_dir);</div><div class='del'>-		summary = camel_imap_summary_new (summary_file);</div><div class='del'>-		if (!summary) {</div><div class='del'>-			g_free (summary_file);</div><div class='del'>-			g_free (folder_dir);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		cache = camel_imap_message_cache_new (folder_dir, summary, ex);</div><div class='del'>-		if (cache)</div><div class='del'>-			camel_imap_message_cache_clear (cache);</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cache));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (summary));</div><div class='del'>-		</div><div class='del'>-		unlink (summary_file);</div><div class='del'>-		g_free (summary_file);</div><div class='del'>-		</div><div class='del'>-		journal_file = g_strdup_printf ("%s/summary", folder_dir);</div><div class='del'>-		unlink (journal_file);</div><div class='del'>-		g_free (journal_file);</div><div class='del'>-		</div><div class='del'>-		rmdir (folder_dir);</div><div class='del'>-		g_free (folder_dir);</div><div class='del'>-		</div><div class='del'>-		name = strrchr (folder_name, imap_store-&gt;dir_sep);</div><div class='del'>-		if (name)</div><div class='del'>-			name++;</div><div class='del'>-		else</div><div class='del'>-			name = folder_name;</div><div class='del'>-		</div><div class='del'>-		fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-		fi-&gt;full_name = g_strdup (folder_name);</div><div class='del'>-		fi-&gt;name = g_strdup (name);</div><div class='del'>-		fi-&gt;url = g_strdup_printf ("%s/%s", imap_store-&gt;base_url, folder_name);</div><div class='del'>-		fi-&gt;unread_message_count = -1;</div><div class='del'>-		camel_folder_info_build_path (fi, imap_store-&gt;dir_sep);</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (store), "folder_deleted", fi);</div><div class='del'>-		camel_folder_info_free (fi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-manage_subscriptions (CamelStore *store, CamelFolderInfo *fi, gboolean subscribe)</div><div class='del'>-{</div><div class='del'>-	while (fi) {</div><div class='del'>-		if (fi-&gt;child)</div><div class='del'>-			manage_subscriptions (store, fi-&gt;child, subscribe);</div><div class='del'>-		</div><div class='del'>-		if (subscribe)</div><div class='del'>-			subscribe_folder (store, fi-&gt;full_name, NULL);</div><div class='del'>-		else</div><div class='del'>-			unsubscribe_folder (store, fi-&gt;full_name, NULL);</div><div class='del'>-		</div><div class='del'>-		fi = fi-&gt;sibling;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define subscribe_folders(store, fi) manage_subscriptions (store, fi, TRUE)</div><div class='del'>-#define unsubscribe_folders(store, fi) manage_subscriptions (store, fi, FALSE)</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rename_folder_info (CamelImapStore *imap_store, CamelFolderInfo *fi, const char *old_name, const char *new_name)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *name;</div><div class='del'>-	</div><div class='del'>-	while (fi) {</div><div class='del'>-		if (fi-&gt;child)</div><div class='del'>-			rename_folder_info (imap_store, fi-&gt;child, old_name, new_name);</div><div class='del'>-		</div><div class='del'>-		name = g_strdup_printf ("%s%s", new_name, fi-&gt;full_name + strlen (old_name));</div><div class='del'>-		</div><div class='del'>-		if (imap_store-&gt;dir_sep == '.') {</div><div class='del'>-			/* kludge around imap servers like Courier that don't rename</div><div class='del'>-			   subfolders when you rename the parent folder - like</div><div class='del'>-			   the spec says to do!!! */</div><div class='del'>-			response = camel_imap_command (imap_store, NULL, NULL, "RENAME %F %F", fi-&gt;full_name, name);</div><div class='del'>-			if (response)</div><div class='del'>-				camel_imap_response_free (imap_store, response);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (fi-&gt;full_name);</div><div class='del'>-		fi-&gt;full_name = name;</div><div class='del'>-		</div><div class='del'>-		fi = fi-&gt;sibling;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *oldpath, *newpath;</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* make sure this folder isn't currently SELECTed - it's</div><div class='del'>-           actually possible to rename INBOX but if you do another</div><div class='del'>-           INBOX will immediately be created by the server */</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "SELECT INBOX");</div><div class='del'>-	if (response) {</div><div class='del'>-		camel_imap_response_free_without_processing (imap_store, response);</div><div class='del'>-		</div><div class='del'>-		if (imap_store-&gt;current_folder)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (imap_store-&gt;current_folder));</div><div class='del'>-		/* no need to actually create a CamelFolder for INBOX */</div><div class='del'>-		imap_store-&gt;current_folder = NULL;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;renaming = TRUE;</div><div class='del'>-	</div><div class='del'>-	flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE |</div><div class='del'>-		(store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS ? CAMEL_STORE_FOLDER_INFO_SUBSCRIBED : 0);</div><div class='del'>-	</div><div class='del'>-	fi = ((CamelStoreClass *)((CamelObject *)store)-&gt;klass)-&gt;get_folder_info (store, old_name, flags, ex);</div><div class='del'>-	if (fi &amp;&amp; store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS)</div><div class='del'>-		unsubscribe_folders (store, fi);</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "RENAME %F %F", old_name, new_name);</div><div class='del'>-	</div><div class='del'>-	if (!response) {</div><div class='del'>-		if (fi &amp;&amp; store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS)</div><div class='del'>-			subscribe_folders (store, fi);</div><div class='del'>-		</div><div class='del'>-		camel_store_free_folder_info (store, fi);</div><div class='del'>-		imap_store-&gt;renaming = FALSE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	rename_folder_info (imap_store, fi, old_name, new_name);</div><div class='del'>-	if (fi &amp;&amp; store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS)</div><div class='del'>-		subscribe_folders (store, fi);</div><div class='del'>-	</div><div class='del'>-	camel_store_free_folder_info (store, fi);</div><div class='del'>-	</div><div class='del'>-	oldpath = e_path_to_physical (imap_store-&gt;storage_path, old_name);</div><div class='del'>-	newpath = e_path_to_physical (imap_store-&gt;storage_path, new_name);</div><div class='del'>-	</div><div class='del'>-	/* So do we care if this didn't work?  Its just a cache? */</div><div class='del'>-	if (rename (oldpath, newpath) == -1) {</div><div class='del'>-		g_warning ("Could not rename message cache '%s' to '%s': %s: cache reset",</div><div class='del'>-			   oldpath, newpath, strerror (errno));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (oldpath);</div><div class='del'>-	g_free (newpath);</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;renaming = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-create_folder (CamelStore *store, const char *parent_name,</div><div class='del'>-	       const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	char *full_name, *resp, *thisone;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelException internal_ex;</div><div class='del'>-	CamelFolderInfo *root = NULL;</div><div class='del'>-	gboolean need_convert;</div><div class='del'>-	char **pathnames = NULL;</div><div class='del'>-	GPtrArray *folders = NULL;</div><div class='del'>-	int i = 0, flags;</div><div class='del'>-	</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	if (!parent_name)</div><div class='del'>-		parent_name = "";</div><div class='del'>-	</div><div class='del'>-	/* check if the parent allows inferiors */</div><div class='del'>-	</div><div class='del'>-	need_convert = FALSE;</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "LIST \"\" %F",</div><div class='del'>-				       parent_name);</div><div class='del'>-	if (!response) /* whoa, this is bad */</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: does not handle unexpected circumstances very well */</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		</div><div class='del'>-		if (!imap_parse_list_response (imap_store, resp, &amp;flags, NULL, &amp;thisone))</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (strcmp (thisone, parent_name) == 0) {</div><div class='del'>-			if (flags &amp; IMAP_LIST_FLAG_NOINFERIORS)</div><div class='del'>-				need_convert = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	camel_exception_init (&amp;internal_ex);</div><div class='del'>-	</div><div class='del'>-	/* if not, check if we can delete it and recreate it */</div><div class='del'>-	if (need_convert) {</div><div class='del'>-		char *name;</div><div class='del'>-		</div><div class='del'>-		if (get_folder_status (imap_store, parent_name, "MESSAGES")) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_FOLDER_INVALID_STATE,</div><div class='del'>-					     _("The parent folder is not allowed to contain subfolders"));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* delete the old parent and recreate it */</div><div class='del'>-		delete_folder (store, parent_name, &amp;internal_ex);</div><div class='del'>-		if (camel_exception_is_set (&amp;internal_ex)) {</div><div class='del'>-			camel_exception_xfer (ex, &amp;internal_ex);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* add the dirsep to the end of parent_name */</div><div class='del'>-		name = g_strdup_printf ("%s%c", parent_name, imap_store-&gt;dir_sep);</div><div class='del'>-		response = camel_imap_command (imap_store, NULL, ex, "CREATE %F",</div><div class='del'>-					       name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		</div><div class='del'>-		if (!response)</div><div class='del'>-			return NULL;</div><div class='del'>-		else</div><div class='del'>-			camel_imap_response_free (imap_store, response);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* ok now we can create the folder */</div><div class='del'>-	</div><div class='del'>-	full_name = imap_concat (imap_store, parent_name, folder_name);</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "CREATE %F",</div><div class='del'>-				       full_name);</div><div class='del'>-	g_free (full_name);</div><div class='del'>-	</div><div class='del'>-	if (response) {</div><div class='del'>-		CamelFolderInfo *parent, *fi;</div><div class='del'>-		</div><div class='del'>-		camel_imap_response_free (imap_store, response);</div><div class='del'>-		</div><div class='del'>-		/* We have to do this in case we are creating a</div><div class='del'>-                   recursive directory structure */</div><div class='del'>-		i = 0;</div><div class='del'>-		pathnames = imap_parse_folder_name (imap_store, folder_name);</div><div class='del'>-		full_name = imap_concat (imap_store, parent_name, pathnames[i]);</div><div class='del'>-		g_free (pathnames[i]);</div><div class='del'>-		</div><div class='del'>-		folders = g_ptr_array_new ();</div><div class='del'>-		</div><div class='del'>-		get_folders_online (imap_store, full_name, folders, FALSE, ex);</div><div class='del'>-		g_free (full_name);</div><div class='del'>-		if (camel_exception_is_set (&amp;internal_ex)) {</div><div class='del'>-			camel_exception_xfer (&amp;internal_ex, ex);</div><div class='del'>-			goto exception;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		root = parent = folders-&gt;pdata[i];</div><div class='del'>-		</div><div class='del'>-		for (i = 1; parent &amp;&amp; pathnames[i]; i++) {</div><div class='del'>-			full_name = imap_concat (imap_store, parent_name, pathnames[i]);</div><div class='del'>-			g_free (pathnames[i]);</div><div class='del'>-			</div><div class='del'>-			get_folders_online (imap_store, full_name, folders, FALSE, &amp;internal_ex);</div><div class='del'>-			if (camel_exception_is_set (&amp;internal_ex)) {</div><div class='del'>-				camel_exception_xfer (&amp;internal_ex, ex);</div><div class='del'>-				goto exception;</div><div class='del'>-			}</div><div class='del'>-			g_free (full_name);</div><div class='del'>-			</div><div class='del'>-			if (folders-&gt;len != i + 1)</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			fi = folders-&gt;pdata[i];</div><div class='del'>-			camel_folder_info_build_path (fi, imap_store-&gt;dir_sep);</div><div class='del'>-			parent-&gt;child = fi;</div><div class='del'>-			fi-&gt;parent = parent;</div><div class='del'>-			parent = fi;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_folder_info_build_path(root, imap_store-&gt;dir_sep);</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (store), "folder_created", root);</div><div class='del'>-		</div><div class='del'>-		g_free (pathnames);</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (folders, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return root;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	for (/* i is already set */; pathnames &amp;&amp; pathnames[i]; i++)</div><div class='del'>-		g_free (pathnames[i]);</div><div class='del'>-	g_free (pathnames);</div><div class='del'>-	</div><div class='del'>-	if (folders) {</div><div class='del'>-		for (i = 0; i &lt; folders-&gt;len; i++)</div><div class='del'>-			camel_folder_info_free (folders-&gt;pdata[i]);</div><div class='del'>-		g_ptr_array_free (folders, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-parse_list_response_as_folder_info (CamelImapStore *imap_store,</div><div class='del'>-				    const char *response)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	int flags;</div><div class='del'>-	char sep, *dir, *name = NULL;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	</div><div class='del'>-	if (!imap_parse_list_response (imap_store, response, &amp;flags, &amp;sep, &amp;dir))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (sep) {</div><div class='del'>-		name = strrchr (dir, sep);</div><div class='del'>-		if (name &amp;&amp; !*++name) {</div><div class='del'>-			g_free (dir);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = dir;</div><div class='del'>-	if (sep &amp;&amp; name)</div><div class='del'>-		fi-&gt;name = g_strdup (name);</div><div class='del'>-	else</div><div class='del'>-		fi-&gt;name = g_strdup (dir);</div><div class='del'>-	</div><div class='del'>-	url = camel_url_new (imap_store-&gt;base_url, NULL);</div><div class='del'>-	g_free (url-&gt;path);</div><div class='del'>-	url-&gt;path = g_strdup_printf ("/%s", dir);</div><div class='del'>-	if (flags &amp; IMAP_LIST_FLAG_NOSELECT || fi-&gt;name[0] == 0)</div><div class='del'>-		camel_url_set_param (url, "noselect", "yes");</div><div class='del'>-	fi-&gt;url = camel_url_to_string (url, 0);</div><div class='del'>-	camel_url_free (url);</div><div class='del'>-	</div><div class='del'>-	if (flags &amp; IMAP_LIST_FLAG_UNMARKED)</div><div class='del'>-		fi-&gt;unread_message_count = -1;</div><div class='del'>-	</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_folder_name (gpointer name, gpointer key, gpointer array)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_add (array, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_subscribed_folders_by_hand (CamelImapStore *imap_store, const char *top,</div><div class='del'>-				GPtrArray *folders, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *names;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	char *result;</div><div class='del'>-	int i, toplen = strlen (top);</div><div class='del'>-	</div><div class='del'>-	names = g_ptr_array_new ();</div><div class='del'>-	g_hash_table_foreach (imap_store-&gt;subscribed_folders,</div><div class='del'>-			      copy_folder_name, names);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; names-&gt;len; i++) {</div><div class='del'>-		response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-					       "LIST \"\" %F",</div><div class='del'>-					       names-&gt;pdata[i]);</div><div class='del'>-		if (!response) {</div><div class='del'>-			g_ptr_array_free (names, TRUE);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		result = camel_imap_response_extract (imap_store, response, "LIST", NULL);</div><div class='del'>-		if (!result) {</div><div class='del'>-			g_hash_table_remove (imap_store-&gt;subscribed_folders,</div><div class='del'>-					     names-&gt;pdata[i]);</div><div class='del'>-			g_free (names-&gt;pdata[i]);</div><div class='del'>-			g_ptr_array_remove_index_fast (names, i--);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		fi = parse_list_response_as_folder_info (imap_store, result);</div><div class='del'>-		if (!fi)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		if (strncmp (top, fi-&gt;full_name, toplen) != 0) {</div><div class='del'>-			camel_folder_info_free (fi);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_add (folders, fi);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_free (names, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_folders_online (CamelImapStore *imap_store, const char *pattern,</div><div class='del'>-		    GPtrArray *folders, gboolean lsub, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	char *list;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "%s \"\" %F", lsub ? "LSUB" : "LIST",</div><div class='del'>-				       pattern);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		list = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		fi = parse_list_response_as_folder_info (imap_store, list);</div><div class='del'>-		if (fi)</div><div class='del'>-			g_ptr_array_add (folders, fi);</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info_online (CamelStore *store, const char *top,</div><div class='del'>-			guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	gboolean need_inbox = FALSE;</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-	const char *name;</div><div class='del'>-	char *pattern;</div><div class='del'>-	CamelFolderInfo *fi, *tree;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	name = top;</div><div class='del'>-	if (!name || name[0] == '\0') {</div><div class='del'>-		need_inbox = TRUE;</div><div class='del'>-		name = "";</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	folders = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	/* Get top-level */</div><div class='del'>-	get_folders_online (imap_store, name, folders, FALSE, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		goto lose;</div><div class='del'>-	</div><div class='del'>-	if (folders-&gt;len) {</div><div class='del'>-		const char *noselect;</div><div class='del'>-		CamelURL *url;</div><div class='del'>-		</div><div class='del'>-		fi = folders-&gt;pdata[0];</div><div class='del'>-		</div><div class='del'>-		url = camel_url_new (fi-&gt;url, NULL);</div><div class='del'>-		noselect = url ? camel_url_get_param (url, "noselect") : NULL;</div><div class='del'>-		if (noselect &amp;&amp; !g_strcasecmp (noselect, "yes") &amp;&amp; name[0] == '\0') {</div><div class='del'>-			camel_folder_info_free (fi);</div><div class='del'>-			g_ptr_array_remove_index (folders, 0);</div><div class='del'>-		}</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* If we want to look at only subscribed folders AND check if</div><div class='del'>-	 * any of them have new mail, AND the server doesn't return</div><div class='del'>-	 * Marked/UnMarked with LSUB, then use</div><div class='del'>-	 * get_subscribed_folders_by_hand. In all other cases, use a</div><div class='del'>-	 * single LIST or LSUB command.</div><div class='del'>-	 */</div><div class='del'>-	if ((flags &amp; CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) &amp;&amp;</div><div class='del'>-	    !(imap_store-&gt;capabilities &amp; IMAP_CAPABILITY_useful_lsub) &amp;&amp;</div><div class='del'>-	    (imap_store-&gt;parameters &amp; IMAP_PARAM_CHECK_ALL)) {</div><div class='del'>-		get_subscribed_folders_by_hand (imap_store, name, folders, ex);</div><div class='del'>-	} else {</div><div class='del'>-		pattern = imap_concat (imap_store, name, (flags &amp; CAMEL_STORE_FOLDER_INFO_RECURSIVE) ? "*" : "%");</div><div class='del'>-		get_folders_online (imap_store, pattern, folders, (flags &amp; CAMEL_STORE_FOLDER_INFO_SUBSCRIBED), ex);</div><div class='del'>-		g_free (pattern);</div><div class='del'>-	}</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-	lose:</div><div class='del'>-		for (i = 0; i &lt; folders-&gt;len; i++)</div><div class='del'>-			camel_folder_info_free (folders-&gt;pdata[i]);</div><div class='del'>-		g_ptr_array_free (folders, TRUE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add INBOX, if necessary */</div><div class='del'>-	if (need_inbox) {</div><div class='del'>-		for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-			fi = folders-&gt;pdata[i];</div><div class='del'>-			if (!g_strcasecmp (fi-&gt;full_name, "INBOX")) {</div><div class='del'>-				need_inbox = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (need_inbox) {</div><div class='del'>-			CamelURL *url;</div><div class='del'>-			char *uri;</div><div class='del'>-			</div><div class='del'>-			url = camel_url_new (imap_store-&gt;base_url, NULL);</div><div class='del'>-			g_free (url-&gt;path);</div><div class='del'>-			url-&gt;path = g_strdup ("/INBOX");</div><div class='del'>-			uri = camel_url_to_string (url, 0);</div><div class='del'>-			camel_url_free (url);</div><div class='del'>-			</div><div class='del'>-			fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-			fi-&gt;full_name = g_strdup ("INBOX");</div><div class='del'>-			fi-&gt;name = g_strdup ("INBOX");</div><div class='del'>-			fi-&gt;url = uri;</div><div class='del'>-			fi-&gt;unread_message_count = 0;</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (folders, fi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Assemble. */</div><div class='del'>-	tree = camel_folder_info_build (folders, name, imap_store-&gt;dir_sep, TRUE);</div><div class='del'>-	if (flags &amp; CAMEL_STORE_FOLDER_INFO_FAST) {</div><div class='del'>-		g_ptr_array_free (folders, TRUE);</div><div class='del'>-		return tree;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Get unread counts. Sync flag changes to the server first so</div><div class='del'>-	 * it has the same ideas about read/unread as we do.</div><div class='del'>-	 */</div><div class='del'>-	camel_store_sync (store, NULL);</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		const char *noselect;</div><div class='del'>-		CamelURL *url;</div><div class='del'>-		</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		</div><div class='del'>-		/* Don't check if it doesn't contain messages or if it</div><div class='del'>-		 * was \UnMarked.</div><div class='del'>-		 */</div><div class='del'>-		url = camel_url_new (fi-&gt;url, NULL);</div><div class='del'>-		noselect = url ? camel_url_get_param (url, "noselect") : NULL;</div><div class='del'>-		if (fi-&gt;unread_message_count == -1 || (noselect &amp;&amp; !g_strcasecmp (noselect, "yes"))) {</div><div class='del'>-			camel_url_free (url);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		</div><div class='del'>-		/* Don't check if it's not INBOX and we're only</div><div class='del'>-		 * checking INBOX.</div><div class='del'>-		 */</div><div class='del'>-		if ((!(imap_store-&gt;parameters &amp; IMAP_PARAM_CHECK_ALL))</div><div class='del'>-		    &amp;&amp; (g_strcasecmp (fi-&gt;name, "INBOX") != 0)) {</div><div class='del'>-			fi-&gt;unread_message_count = -1;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* For the current folder, poke it to check for new</div><div class='del'>-		 * messages and then report that number, rather than</div><div class='del'>-		 * doing a STATUS command.</div><div class='del'>-		 */</div><div class='del'>-		if (imap_store-&gt;current_folder &amp;&amp;</div><div class='del'>-		    !strcmp (imap_store-&gt;current_folder-&gt;full_name, fi-&gt;full_name)) {</div><div class='del'>-			camel_folder_refresh_info (imap_store-&gt;current_folder, NULL);</div><div class='del'>-			fi-&gt;unread_message_count = camel_folder_get_unread_message_count (imap_store-&gt;current_folder);</div><div class='del'>-		} else</div><div class='del'>-			fi-&gt;unread_message_count = get_folder_status (imap_store, fi-&gt;full_name, "UNSEEN");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_free (folders, TRUE);</div><div class='del'>-	</div><div class='del'>-	return tree;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_one_folder_offline (const char *physical_path, const char *path, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *folders = data;</div><div class='del'>-	CamelImapStore *imap_store = folders-&gt;pdata[0];</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-</div><div class='del'>-	if (*path != '/')</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = g_strdup (path+1);</div><div class='del'>-	fi-&gt;name = strrchr (fi-&gt;full_name, imap_store-&gt;dir_sep);</div><div class='del'>-	if (fi-&gt;name)</div><div class='del'>-		fi-&gt;name = g_strdup (fi-&gt;name + 1);</div><div class='del'>-	else</div><div class='del'>-		fi-&gt;name = g_strdup (fi-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	url = camel_url_new(imap_store-&gt;base_url, NULL);</div><div class='del'>-	camel_url_set_path(url, path);</div><div class='del'>-	fi-&gt;url = camel_url_to_string(url, 0);</div><div class='del'>-	camel_url_free(url);</div><div class='del'>-</div><div class='del'>-	/* FIXME: check summary */</div><div class='del'>-	fi-&gt;unread_message_count = -1;</div><div class='del'>-</div><div class='del'>-	g_ptr_array_add (folders, fi);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info_offline (CamelStore *store, const char *top,</div><div class='del'>-			 guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-</div><div class='del'>-	if (!imap_store-&gt;connected &amp;&amp;</div><div class='del'>-	    !camel_service_connect (CAMEL_SERVICE (store), ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if ((store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS) &amp;&amp;</div><div class='del'>-	    !(flags &amp; CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)) {</div><div class='del'>-		camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: obey other flags */</div><div class='del'>-</div><div class='del'>-	folders = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	/* A kludge to avoid having to pass a struct to the callback */</div><div class='del'>-	g_ptr_array_add (folders, imap_store);</div><div class='del'>-	if (!e_path_find_folders (imap_store-&gt;storage_path, get_one_folder_offline, folders)) {</div><div class='del'>-		camel_disco_store_check_online (CAMEL_DISCO_STORE (imap_store), ex);</div><div class='del'>-		fi = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		g_ptr_array_remove_index_fast (folders, 0);</div><div class='del'>-		fi = camel_folder_info_build (folders, "",</div><div class='del'>-					      imap_store-&gt;dir_sep, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (folders, TRUE);</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (imap_store-&gt;subscribed_folders != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return g_hash_table_lookup (imap_store-&gt;subscribed_folders,</div><div class='del'>-				    folder_name) != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	const char *name;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "SUBSCRIBE %F", folder_name);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_insert (imap_store-&gt;subscribed_folders,</div><div class='del'>-			     g_strdup (folder_name), GUINT_TO_POINTER (1));</div><div class='del'>-	</div><div class='del'>-	if (imap_store-&gt;renaming) {</div><div class='del'>-		/* we don't need to emit a "folder_subscribed" signal</div><div class='del'>-                   if we are in the process of renaming folders, so we</div><div class='del'>-                   are done here... */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	name = strrchr (folder_name, imap_store-&gt;dir_sep);</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = folder_name;</div><div class='del'>-	</div><div class='del'>-	url = camel_url_new (imap_store-&gt;base_url, NULL);</div><div class='del'>-	g_free (url-&gt;path);</div><div class='del'>-	url-&gt;path = g_strdup_printf ("/%s", folder_name);</div><div class='del'>-	</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = g_strdup (folder_name);</div><div class='del'>-	fi-&gt;name = g_strdup (name);</div><div class='del'>-	fi-&gt;url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-	fi-&gt;unread_message_count = -1;</div><div class='del'>-	camel_folder_info_build_path (fi, imap_store-&gt;dir_sep);</div><div class='del'>-	</div><div class='del'>-	camel_url_free (url);</div><div class='del'>-	</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (store), "folder_subscribed", fi);</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	gpointer key, value;</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	const char *name;</div><div class='del'>-	</div><div class='del'>-	if (!camel_disco_store_check_online (CAMEL_DISCO_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	if (!camel_remote_store_connected (CAMEL_REMOTE_STORE (store), ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "UNSUBSCRIBE %F", folder_name);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended (imap_store-&gt;subscribed_folders,</div><div class='del'>-					  folder_name, &amp;key, &amp;value)) {</div><div class='del'>-		g_hash_table_remove (imap_store-&gt;subscribed_folders, key);</div><div class='del'>-		g_free (key);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (imap_store-&gt;renaming) {</div><div class='del'>-		/* we don't need to emit a "folder_unsubscribed" signal</div><div class='del'>-                   if we are in the process of renaming folders, so we</div><div class='del'>-                   are done here... */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	name = strrchr (folder_name, imap_store-&gt;dir_sep);</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = folder_name;</div><div class='del'>-	</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = g_strdup (folder_name);</div><div class='del'>-	fi-&gt;name = g_strdup (name);</div><div class='del'>-	fi-&gt;url = g_strdup_printf ("%s/%s", imap_store-&gt;base_url, folder_name);</div><div class='del'>-	fi-&gt;unread_message_count = -1;</div><div class='del'>-	camel_folder_info_build_path (fi, imap_store-&gt;dir_sep);</div><div class='del'>-	</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (store), "folder_unsubscribed", fi);</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_flags_have_changed (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	int i, max;</div><div class='del'>-	</div><div class='del'>-	max = camel_folder_summary_count (folder-&gt;summary);</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		info = camel_folder_summary_index (folder-&gt;summary, i);</div><div class='del'>-		if (!info)</div><div class='del'>-			continue;</div><div class='del'>-		if (info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) {</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_keepalive (CamelRemoteStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	/* FIXME: should this check to see if we are online? */</div><div class='del'>-	</div><div class='del'>-	/* Note: the idea here is to sync the flags of our currently</div><div class='del'>-	   selected folder if there have been changes... */</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-	if (imap_store-&gt;current_folder &amp;&amp; folder_flags_have_changed (imap_store-&gt;current_folder)) {</div><div class='del'>-		camel_folder_sync (imap_store-&gt;current_folder, FALSE, ex);</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* ...but we also want to NOOP so that we get an untagged response. */</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_LOCK (store, command_lock);</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex, "NOOP");</div><div class='del'>-	camel_imap_response_free (imap_store, response);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_STORE_UNLOCK (store, command_lock);</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h<br/>deleted file mode 100644<br/>index 0865a52e09..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-store.h : class for an imap store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_STORE_H</div><div class='del'>-#define CAMEL_IMAP_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-#include &lt;camel/camel-disco-store.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;e-util/e-msgport.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapMsg CamelImapMsg;</div><div class='del'>-</div><div class='del'>-struct _CamelImapMsg {</div><div class='del'>-	EMsg msg;</div><div class='del'>-</div><div class='del'>-	void (*receive)(CamelImapStore *store, struct _CamelImapMsg *m);</div><div class='del'>-	void (*free)(CamelImapStore *store, struct _CamelImapMsg *m);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelImapMsg *camel_imap_msg_new(void (*receive)(CamelImapStore *store, struct _CamelImapMsg *m),</div><div class='del'>-				 void (*free)(CamelImapStore *store, struct _CamelImapMsg *m),</div><div class='del'>-				 size_t size);</div><div class='del'>-void camel_imap_msg_queue(CamelImapStore *store, CamelImapMsg *msg);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_STORE_TYPE     (camel_imap_store_get_type ())</div><div class='del'>-#define CAMEL_IMAP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STORE_TYPE, CamelImapStore))</div><div class='del'>-#define CAMEL_IMAP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass))</div><div class='del'>-#define CAMEL_IS_IMAP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_IMAP_STORE_ARG_FIRST  = CAMEL_DISCO_STORE_ARG_FIRST + 100,</div><div class='del'>-	CAMEL_IMAP_STORE_ARG_NAMESPACE,</div><div class='del'>-	CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE,</div><div class='del'>-	CAMEL_IMAP_STORE_ARG_CHECK_ALL,</div><div class='del'>-	CAMEL_IMAP_STORE_ARG_FILTER_INBOX</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_STORE_NAMESPACE           (CAMEL_IMAP_STORE_ARG_NAMESPACE | CAMEL_ARG_STR)</div><div class='del'>-#define CAMEL_IMAP_STORE_OVERRIDE_NAMESPACE  (CAMEL_IMAP_STORE_ARG_OVERRIDE_NAMESPACE | CAMEL_ARG_INT)</div><div class='del'>-#define CAMEL_IMAP_STORE_CHECK_ALL           (CAMEL_IMAP_STORE_ARG_CHECK_ALL | CAMEL_ARG_INT)</div><div class='del'>-#define CAMEL_IMAP_STORE_FILTER_INBOX        (CAMEL_IMAP_STORE_ARG_FILTER_INBOX | CAMEL_ARG_INT)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	IMAP_LEVEL_UNKNOWN,</div><div class='del'>-	IMAP_LEVEL_IMAP4,</div><div class='del'>-	IMAP_LEVEL_IMAP4REV1</div><div class='del'>-} CamelImapServerLevel;</div><div class='del'>-</div><div class='del'>-#define IMAP_CAPABILITY_IMAP4			(1 &lt;&lt; 0)</div><div class='del'>-#define IMAP_CAPABILITY_IMAP4REV1		(1 &lt;&lt; 1)</div><div class='del'>-#define IMAP_CAPABILITY_STATUS			(1 &lt;&lt; 2)</div><div class='del'>-#define IMAP_CAPABILITY_NAMESPACE		(1 &lt;&lt; 3)</div><div class='del'>-#define IMAP_CAPABILITY_UIDPLUS			(1 &lt;&lt; 4)</div><div class='del'>-#define IMAP_CAPABILITY_LITERALPLUS		(1 &lt;&lt; 5)</div><div class='del'>-#define IMAP_CAPABILITY_useful_lsub		(1 &lt;&lt; 6)</div><div class='del'>-#define IMAP_CAPABILITY_utf8_search		(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-#define IMAP_PARAM_OVERRIDE_NAMESPACE		(1 &lt;&lt; 0)</div><div class='del'>-#define IMAP_PARAM_CHECK_ALL			(1 &lt;&lt; 1)</div><div class='del'>-#define IMAP_PARAM_FILTER_INBOX			(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-struct _CamelImapStore {</div><div class='del'>-	CamelDiscoStore parent_object;	</div><div class='del'>-	struct _CamelImapStorePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	/* Information about the command channel / connection status */</div><div class='del'>-	gboolean connected;</div><div class='del'>-	char tag_prefix;</div><div class='del'>-	guint32 command;</div><div class='del'>-	CamelFolder *current_folder;</div><div class='del'>-	</div><div class='del'>-	/* Information about the server */</div><div class='del'>-	CamelImapServerLevel server_level;</div><div class='del'>-	guint32 capabilities, parameters;</div><div class='del'>-	char *namespace, dir_sep, *base_url, *storage_path;</div><div class='del'>-	GHashTable *authtypes, *subscribed_folders;</div><div class='del'>-	</div><div class='del'>-	gboolean renaming;</div><div class='del'>-	</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EThread *async_thread;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDiscoStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelImapStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_STORE_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c<br/>deleted file mode 100644<br/>index f64cc00c19..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,232 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors:</div><div class='del'>- *    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_SUMMARY_VERSION (0x300)</div><div class='del'>-</div><div class='del'>-static int summary_header_load (CamelFolderSummary *, FILE *);</div><div class='del'>-static int summary_header_save (CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *message_info_load (CamelFolderSummary *s, FILE *in);</div><div class='del'>-static int message_info_save (CamelFolderSummary *s, FILE *out,</div><div class='del'>-			      CamelMessageInfo *info);</div><div class='del'>-static CamelMessageContentInfo *content_info_load (CamelFolderSummary *s, FILE *in);</div><div class='del'>-static int content_info_save (CamelFolderSummary *s, FILE *out,</div><div class='del'>-			      CamelMessageContentInfo *info);</div><div class='del'>-</div><div class='del'>-static void camel_imap_summary_class_init (CamelImapSummaryClass *klass);</div><div class='del'>-static void camel_imap_summary_init       (CamelImapSummary *obj);</div><div class='del'>-</div><div class='del'>-static CamelFolderSummaryClass *camel_imap_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(</div><div class='del'>-			camel_folder_summary_get_type(), "CamelImapSummary",</div><div class='del'>-			sizeof (CamelImapSummary),</div><div class='del'>-			sizeof (CamelImapSummaryClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_imap_summary_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_imap_summary_init,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_summary_class_init (CamelImapSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *cfs_class = (CamelFolderSummaryClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_imap_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs (camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	cfs_class-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	cfs_class-&gt;summary_header_save = summary_header_save;</div><div class='del'>-	cfs_class-&gt;message_info_load = message_info_load;</div><div class='del'>-	cfs_class-&gt;message_info_save = message_info_save;</div><div class='del'>-	cfs_class-&gt;content_info_load = content_info_load;</div><div class='del'>-	cfs_class-&gt;content_info_save = content_info_save;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_summary_init (CamelImapSummary *obj)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelImapMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelImapMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_IMAP_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_summary_new:</div><div class='del'>- * @filename: the file to store the summary in.</div><div class='del'>- *</div><div class='del'>- * This will create a new CamelImapSummary object and read in the</div><div class='del'>- * summary data from disk, if it exists.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelImapSummary object.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSummary *</div><div class='del'>-camel_imap_summary_new (const char *filename)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (</div><div class='del'>-		camel_object_new (camel_imap_summary_get_type ()));</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_build_content (summary, TRUE);</div><div class='del'>-	camel_folder_summary_set_filename (summary, filename);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_summary_load (summary) == -1) {</div><div class='del'>-		camel_folder_summary_clear (summary);</div><div class='del'>-		camel_folder_summary_touch (summary);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return summary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load (CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY (s);</div><div class='del'>-</div><div class='del'>-	if (camel_imap_summary_parent-&gt;summary_header_load (s, in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_decode_uint32 (in, &amp;ims-&gt;validity);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save (CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (camel_imap_summary_parent-&gt;summary_header_save (s, out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_encode_uint32 (out, ims-&gt;validity);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load (CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelImapMessageInfo *iinfo;</div><div class='del'>-</div><div class='del'>-	info = camel_imap_summary_parent-&gt;message_info_load (s, in);</div><div class='del'>-	if (info) {</div><div class='del'>-		iinfo = (CamelImapMessageInfo *)info;</div><div class='del'>-</div><div class='del'>-		if (camel_file_util_decode_uint32 (in, &amp;iinfo-&gt;server_flags) == -1)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-error:</div><div class='del'>-	camel_folder_summary_info_free (s, info);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-message_info_save (CamelFolderSummary *s, FILE *out, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	CamelImapMessageInfo *iinfo = (CamelImapMessageInfo *)info;</div><div class='del'>-</div><div class='del'>-	if (camel_imap_summary_parent-&gt;message_info_save (s, out, info) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_encode_uint32 (out, iinfo-&gt;server_flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-content_info_load (CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	if (fgetc (in))</div><div class='del'>-		return camel_imap_summary_parent-&gt;content_info_load (s, in);</div><div class='del'>-	else</div><div class='del'>-		return camel_folder_summary_content_info_new (s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-content_info_save (CamelFolderSummary *s, FILE *out,</div><div class='del'>-		   CamelMessageContentInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;type) {</div><div class='del'>-		fputc (1, out);</div><div class='del'>-		return camel_imap_summary_parent-&gt;content_info_save (s, out, info);</div><div class='del'>-	} else</div><div class='del'>-		return fputc (0, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_imap_summary_add_offline (CamelFolderSummary *summary, const char *uid,</div><div class='del'>-				CamelMimeMessage *message,</div><div class='del'>-				const CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	/* Create summary entry */</div><div class='del'>-	mi = camel_folder_summary_info_new_from_message (summary, message);</div><div class='del'>-</div><div class='del'>-	/* Copy flags 'n' tags */</div><div class='del'>-	mi-&gt;flags = info-&gt;flags;</div><div class='del'>-	flag = info-&gt;user_flags;</div><div class='del'>-	while (flag) {</div><div class='del'>-		camel_flag_set (&amp;mi-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	tag = info-&gt;user_tags;</div><div class='del'>-	while (tag) {</div><div class='del'>-		camel_tag_set (&amp;mi-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set uid and add to summary */</div><div class='del'>-	camel_message_info_set_uid (mi, g_strdup (uid));</div><div class='del'>-	camel_folder_summary_add (summary, mi);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h<br/>deleted file mode 100644<br/>index 3b203f639b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors:</div><div class='del'>- *    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *    Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_IMAP_SUMMARY_H</div><div class='del'>-#define _CAMEL_IMAP_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_imap_summary_get_type (), CamelImapSummary)</div><div class='del'>-#define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass)</div><div class='del'>-#define CAMEL_IS_IMAP_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_summary_get_type ())</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_SERVER_FLAGS (CAMEL_MESSAGE_ANSWERED | \</div><div class='del'>-				 CAMEL_MESSAGE_DELETED | \</div><div class='del'>-				 CAMEL_MESSAGE_DRAFT | \</div><div class='del'>-				 CAMEL_MESSAGE_FLAGGED | \</div><div class='del'>-				 CAMEL_MESSAGE_SEEN)</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_MESSAGE_RECENT (1 &lt;&lt; 8)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapSummaryClass CamelImapSummaryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapMessageContentInfo {</div><div class='del'>-	CamelMessageContentInfo info;</div><div class='del'>-</div><div class='del'>-} CamelImapMessageContentInfo;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-</div><div class='del'>-	guint32 server_flags;</div><div class='del'>-} CamelImapMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelImapSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	guint32 validity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelImapSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType               camel_imap_summary_get_type     (void);</div><div class='del'>-CamelFolderSummary *camel_imap_summary_new          (const char *filename);</div><div class='del'>-</div><div class='del'>-void camel_imap_summary_add_offline (CamelFolderSummary *summary,</div><div class='del'>-				     const char *uid,</div><div class='del'>-				     CamelMimeMessage *message,</div><div class='del'>-				     const CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_IMAP_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h<br/>deleted file mode 100644<br/>index c5ea41acff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-types.h: IMAP types */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_TYPES_H</div><div class='del'>-#define CAMEL_IMAP_TYPES_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-types.h"</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapFolder       CamelImapFolder;</div><div class='del'>-typedef struct _CamelImapMessageCache CamelImapMessageCache;</div><div class='del'>-typedef struct _CamelImapResponse     CamelImapResponse;</div><div class='del'>-typedef struct _CamelImapSearch       CamelImapSearch;</div><div class='del'>-typedef struct _CamelImapStore        CamelImapStore;</div><div class='del'>-typedef struct _CamelImapSummary      CamelImapSummary;</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_TYPES_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c<br/>deleted file mode 100644<br/>index 304ef97448..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1164 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-imap_next_word (const char *buf)</div><div class='del'>-{</div><div class='del'>-	const char *word;</div><div class='del'>-	</div><div class='del'>-	/* skip over current word */</div><div class='del'>-	for (word = buf; *word &amp;&amp; *word != ' '; word++);</div><div class='del'>-	</div><div class='del'>-	/* skip over white space */</div><div class='del'>-	for ( ; *word &amp;&amp; *word == ' '; word++);</div><div class='del'>-	</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_list_response:</div><div class='del'>- * @store: the IMAP store whose list response we're parsing</div><div class='del'>- * @buf: the LIST or LSUB response</div><div class='del'>- * @flags: a pointer to a variable to store the flags in, or %NULL</div><div class='del'>- * @sep: a pointer to a variable to store the hierarchy separator in, or %NULL</div><div class='del'>- * @folder: a pointer to a variable to store the folder name in, or %NULL</div><div class='del'>- *</div><div class='del'>- * Parses a LIST or LSUB response and returns the desired parts of it.</div><div class='del'>- * If @folder is non-%NULL, its value must be freed by the caller.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the response was successfully parsed.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-imap_parse_list_response (CamelImapStore *store, const char *buf, int *flags, char *sep, char **folder)</div><div class='del'>-{</div><div class='del'>-	const char *word;</div><div class='del'>-	size_t len;</div><div class='del'>-	</div><div class='del'>-	if (*buf != '*')</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	word = imap_next_word (buf);</div><div class='del'>-	if (g_strncasecmp (word, "LIST", 4) &amp;&amp; g_strncasecmp (word, "LSUB", 4))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* get the flags */</div><div class='del'>-	word = imap_next_word (word);</div><div class='del'>-	if (*word != '(')</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (flags)</div><div class='del'>-		*flags = 0;</div><div class='del'>-	</div><div class='del'>-	word++;</div><div class='del'>-	while (*word != ')') {</div><div class='del'>-		len = strcspn (word, " )");</div><div class='del'>-		if (flags) {</div><div class='del'>-			if (!g_strncasecmp (word, "\\NoInferiors", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_NOINFERIORS;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\NoSelect", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_NOSELECT;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\Marked", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_MARKED;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\Unmarked", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_UNMARKED;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		word += len;</div><div class='del'>-		while (*word == ' ')</div><div class='del'>-			word++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the directory separator */</div><div class='del'>-	word = imap_next_word (word);</div><div class='del'>-	if (!strncmp (word, "NIL", 3)) {</div><div class='del'>-		if (sep)</div><div class='del'>-			*sep = '\0';</div><div class='del'>-	} else if (*word++ == '"') {</div><div class='del'>-		if (*word == '\\')</div><div class='del'>-			word++;</div><div class='del'>-		if (sep)</div><div class='del'>-			*sep = *word;</div><div class='del'>-		word++;</div><div class='del'>-		if (*word++ != '"')</div><div class='del'>-			return FALSE;</div><div class='del'>-	} else</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (folder) {</div><div class='del'>-		char *astring, *mailbox;</div><div class='del'>-		size_t nlen;</div><div class='del'>-		</div><div class='del'>-		/* get the folder name */</div><div class='del'>-		word = imap_next_word (word);</div><div class='del'>-		astring = imap_parse_astring ((char **) &amp;word, &amp;len);</div><div class='del'>-		if (!astring)</div><div class='del'>-			return FALSE;</div><div class='del'>-		</div><div class='del'>-		mailbox = imap_mailbox_decode (astring, strlen (astring));</div><div class='del'>-		g_free (astring);</div><div class='del'>-		if (!mailbox)</div><div class='del'>-			return FALSE;</div><div class='del'>-		</div><div class='del'>-		nlen = strlen (store-&gt;namespace);</div><div class='del'>-		</div><div class='del'>-		if (!strncmp (mailbox, store-&gt;namespace, nlen)) {</div><div class='del'>-			/* strip off the namespace */</div><div class='del'>-			if (nlen &gt; 0)</div><div class='del'>-				memmove (mailbox, mailbox + nlen, (len - nlen) + 1);</div><div class='del'>-			*folder = mailbox;</div><div class='del'>-		} else if (!g_strcasecmp (mailbox, "INBOX")) {</div><div class='del'>-			*folder = mailbox;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("IMAP folder name \"%s\" does not begin with \"%s\"", mailbox, store-&gt;namespace);</div><div class='del'>-			*folder = mailbox;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return *folder != NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_folder_name:</div><div class='del'>- * @store:</div><div class='del'>- * @folder_name:</div><div class='del'>- *</div><div class='del'>- * Return an array of folder paths representing the folder heirarchy.</div><div class='del'>- * For example:</div><div class='del'>- *   Full/Path/"to / from"/Folder</div><div class='del'>- * Results in:</div><div class='del'>- *   Full, Full/Path, Full/Path/"to / from", Full/Path/"to / from"/Folder</div><div class='del'>- **/</div><div class='del'>-char **</div><div class='del'>-imap_parse_folder_name (CamelImapStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *heirarchy;</div><div class='del'>-	char **paths;</div><div class='del'>-	const char *p;</div><div class='del'>-	</div><div class='del'>-	p = folder_name;</div><div class='del'>-	if (*p == store-&gt;dir_sep)</div><div class='del'>-		p++;</div><div class='del'>-	</div><div class='del'>-	heirarchy = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	while (*p) {</div><div class='del'>-		if (*p == '"') {</div><div class='del'>-			p++;</div><div class='del'>-			while (*p &amp;&amp; *p != '"')</div><div class='del'>-				p++;</div><div class='del'>-			if (*p)</div><div class='del'>-				p++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (*p == store-&gt;dir_sep)</div><div class='del'>-			g_ptr_array_add (heirarchy, g_strndup (folder_name, p - folder_name));</div><div class='del'>-		</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_add (heirarchy, g_strdup (folder_name));</div><div class='del'>-	g_ptr_array_add (heirarchy, NULL);</div><div class='del'>-	</div><div class='del'>-	paths = (char **) heirarchy-&gt;pdata;</div><div class='del'>-	g_ptr_array_free (heirarchy, FALSE);</div><div class='del'>-	</div><div class='del'>-	return paths;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_create_flag_list (guint32 flags)</div><div class='del'>-{</div><div class='del'>-	GString *gstr;</div><div class='del'>-	char *flag_list;</div><div class='del'>-	</div><div class='del'>-	gstr = g_string_new ("(");</div><div class='del'>-	</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_ANSWERED)</div><div class='del'>-		g_string_append (gstr, "\\Answered ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_DELETED)</div><div class='del'>-		g_string_append (gstr, "\\Deleted ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_DRAFT)</div><div class='del'>-		g_string_append (gstr, "\\Draft ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_FLAGGED)</div><div class='del'>-		g_string_append (gstr, "\\Flagged ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_SEEN)</div><div class='del'>-		g_string_append (gstr, "\\Seen ");</div><div class='del'>-	</div><div class='del'>-	if (gstr-&gt;str[gstr-&gt;len - 1] == ' ')</div><div class='del'>-		gstr-&gt;str[gstr-&gt;len - 1] = ')';</div><div class='del'>-	else</div><div class='del'>-		g_string_append_c (gstr, ')');</div><div class='del'>-	</div><div class='del'>-	flag_list = gstr-&gt;str;</div><div class='del'>-	g_string_free (gstr, FALSE);</div><div class='del'>-	return flag_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint32</div><div class='del'>-imap_parse_flag_list (char **flag_list_p)</div><div class='del'>-{</div><div class='del'>-	char *flag_list = *flag_list_p;</div><div class='del'>-	guint32 flags = 0;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	if (*flag_list++ != '(') {</div><div class='del'>-		*flag_list_p = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while (*flag_list &amp;&amp; *flag_list != ')') {</div><div class='del'>-		len = strcspn (flag_list, " )");</div><div class='del'>-		if (!g_strncasecmp (flag_list, "\\Answered", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_ANSWERED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Deleted", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_DELETED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Draft", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_DRAFT;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Flagged", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_FLAGGED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Seen", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Recent", len))</div><div class='del'>-			flags |= CAMEL_IMAP_MESSAGE_RECENT;</div><div class='del'>-		</div><div class='del'>-		flag_list += len;</div><div class='del'>-		if (*flag_list == ' ')</div><div class='del'>-			flag_list++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*flag_list++ != ')') {</div><div class='del'>-		*flag_list_p = NULL;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*flag_list_p = flag_list;</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- From rfc2060</div><div class='del'>-</div><div class='del'>-ATOM_CHAR       ::= &lt;any CHAR except atom_specials&gt;</div><div class='del'>-</div><div class='del'>-atom_specials   ::= "(" / ")" / "{" / SPACE / CTL / list_wildcards /</div><div class='del'>-                    quoted_specials</div><div class='del'>-</div><div class='del'>-CHAR            ::= &lt;any 7-bit US-ASCII character except NUL,</div><div class='del'>-                     0x01 - 0x7f&gt;</div><div class='del'>-</div><div class='del'>-CTL             ::= &lt;any ASCII control character and DEL,</div><div class='del'>-                        0x00 - 0x1f, 0x7f&gt;</div><div class='del'>-</div><div class='del'>-SPACE           ::= &lt;ASCII SP, space, 0x20&gt;</div><div class='del'>-</div><div class='del'>-list_wildcards  ::= "%" / "*"</div><div class='del'>-</div><div class='del'>-quoted_specials ::= &lt;"&gt; / "\"</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static unsigned char imap_atom_specials[256] = {</div><div class='del'>-/* 00 */0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-/* 10 */0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,</div><div class='del'>-/* 20 */0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1,</div><div class='del'>-/* 30 */1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-/* 40 */1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-/* 50 */1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,</div><div class='del'>-/* 60 */1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,</div><div class='del'>-/* 70 */1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0,</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define imap_is_atom_char(c) ((imap_atom_specials[(c)&amp;0xff] &amp; 0x01) != 0)</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-imap_is_atom(const char *in)</div><div class='del'>-{</div><div class='del'>-	register unsigned char c;</div><div class='del'>-	register const char *p = in;</div><div class='del'>-</div><div class='del'>-	while ((c = (unsigned char)*p)) {</div><div class='del'>-		if (!imap_is_atom_char(c))</div><div class='del'>-			return FALSE;</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check for empty string */</div><div class='del'>-	return p!=in;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_string_generic:</div><div class='del'>- * @str_p: a pointer to a string</div><div class='del'>- * @len: a pointer to a size_t to return the length in</div><div class='del'>- * @type: type of string (#IMAP_STRING, #IMAP_ASTRING, or #IMAP_NSTRING)</div><div class='del'>- * to parse.</div><div class='del'>- *</div><div class='del'>- * This parses an IMAP "string" (quoted string or literal), "nstring"</div><div class='del'>- * (NIL or string), or "astring" (atom or string) starting at *@str_p.</div><div class='del'>- * On success, *@str_p will point to the first character after the end</div><div class='del'>- * of the string, and *@len will contain the length of the returned</div><div class='del'>- * string. On failure, *@str_p will be set to %NULL.</div><div class='del'>- *</div><div class='del'>- * This assumes that the string is in the form returned by</div><div class='del'>- * camel_imap_command(): that line breaks are indicated by LF rather</div><div class='del'>- * than CRLF.</div><div class='del'>- *</div><div class='del'>- * Return value: the parsed string, or %NULL if a NIL or no string</div><div class='del'>- * was parsed. (In the former case, *@str_p will be %NULL; in the</div><div class='del'>- * latter, it will point to the character after the NIL.)</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-imap_parse_string_generic (char **str_p, size_t *len, int type)</div><div class='del'>-{</div><div class='del'>-	char *str = *str_p;</div><div class='del'>-	char *out;</div><div class='del'>-	</div><div class='del'>-	if (!str)</div><div class='del'>-		return NULL;</div><div class='del'>-	else if (*str == '"') {</div><div class='del'>-		char *p;</div><div class='del'>-		size_t size;</div><div class='del'>-		</div><div class='del'>-		str++;</div><div class='del'>-		size = strcspn (str, "\"") + 1;</div><div class='del'>-		p = out = g_malloc (size);</div><div class='del'>-		</div><div class='del'>-		/* a quoted string cannot be broken into multiple lines */</div><div class='del'>-		while (*str &amp;&amp; *str != '"' &amp;&amp; *str != '\n') {</div><div class='del'>-			if (*str == '\\')</div><div class='del'>-				str++;</div><div class='del'>-			*p++ = *str++;</div><div class='del'>-			if (p - out == size) {</div><div class='del'>-				out = g_realloc (out, size * 2);</div><div class='del'>-				p = out + size;</div><div class='del'>-				size *= 2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (*str != '"') {</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-			g_free (out);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		*p = '\0';</div><div class='del'>-		*str_p = str + 1;</div><div class='del'>-		*len = strlen (out);</div><div class='del'>-		return out;</div><div class='del'>-	} else if (*str == '{') {</div><div class='del'>-		*len = strtoul (str + 1, (char **)&amp;str, 10);</div><div class='del'>-		if (*str++ != '}' || *str++ != '\n' || strlen (str) &lt; *len) {</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		out = g_strndup (str, *len);</div><div class='del'>-		*str_p = str + *len;</div><div class='del'>-		return out;</div><div class='del'>-	} else if (type == IMAP_NSTRING &amp;&amp; !g_strncasecmp (str, "nil", 3)) {</div><div class='del'>-		*str_p += 3;</div><div class='del'>-		*len = 0;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else if (type == IMAP_ASTRING &amp;&amp; imap_is_atom_char ((unsigned char)*str)) {</div><div class='del'>-		while (imap_is_atom_char ((unsigned char)*str))</div><div class='del'>-			str++;</div><div class='del'>-		</div><div class='del'>-		*len = str - *str_p;</div><div class='del'>-		str = g_strndup (*str_p, *len);</div><div class='del'>-		*str_p += *len;</div><div class='del'>-		return str;</div><div class='del'>-	} else {</div><div class='del'>-		*str_p = NULL;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static inline void</div><div class='del'>-skip_char (char **str_p, char ch)</div><div class='del'>-{</div><div class='del'>-	if (*str_p &amp;&amp; **str_p == ch)</div><div class='del'>-		*str_p = *str_p + 1;</div><div class='del'>-	else</div><div class='del'>-		*str_p = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Skip atom, string, or number */</div><div class='del'>-static void</div><div class='del'>-skip_asn (char **str_p)</div><div class='del'>-{</div><div class='del'>-	char *str = *str_p;</div><div class='del'>-	</div><div class='del'>-	if (!str)</div><div class='del'>-		return;</div><div class='del'>-	else if (*str == '"') {</div><div class='del'>-		while (*++str &amp;&amp; *str != '"') {</div><div class='del'>-			if (*str == '\\') {</div><div class='del'>-				str++;</div><div class='del'>-				if (!*str)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (*str == '"')</div><div class='del'>-			*str_p = str + 1;</div><div class='del'>-		else</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-	} else if (*str == '{') {</div><div class='del'>-		unsigned long len;</div><div class='del'>-		</div><div class='del'>-		len = strtoul (str + 1, &amp;str, 10);</div><div class='del'>-		if (*str != '}' || *(str + 1) != '\n' ||</div><div class='del'>-		    strlen (str + 2) &lt; len) {</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		*str_p = str + 2 + len;</div><div class='del'>-	} else {</div><div class='del'>-		/* We assume the string is well-formed and don't</div><div class='del'>-		 * bother making sure it's a valid atom.</div><div class='del'>-		 */</div><div class='del'>-		while (*str &amp;&amp; *str != ')' &amp;&amp; *str != ' ')</div><div class='del'>-			str++;</div><div class='del'>-		*str_p = str;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-imap_skip_list (char **str_p)</div><div class='del'>-{</div><div class='del'>-	skip_char (str_p, '(');</div><div class='del'>-	while (*str_p &amp;&amp; **str_p != ')') {</div><div class='del'>-		if (**str_p == '(')</div><div class='del'>-			imap_skip_list (str_p);</div><div class='del'>-		else</div><div class='del'>-			skip_asn (str_p);</div><div class='del'>-		if (*str_p &amp;&amp; **str_p == ' ')</div><div class='del'>-			skip_char (str_p, ' ');</div><div class='del'>-	}</div><div class='del'>-	skip_char (str_p, ')');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_params (char **parms_p, CamelContentType *type)</div><div class='del'>-{</div><div class='del'>-	char *parms = *parms_p, *name, *value;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	if (!g_strncasecmp (parms, "nil", 3)) {</div><div class='del'>-		*parms_p += 3;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*parms++ != '(') {</div><div class='del'>-		*parms_p = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while (parms &amp;&amp; *parms != ')') {</div><div class='del'>-		name = imap_parse_nstring (&amp;parms, &amp;len);</div><div class='del'>-		skip_char (&amp;parms, ' ');</div><div class='del'>-		value = imap_parse_nstring (&amp;parms, &amp;len);</div><div class='del'>-		</div><div class='del'>-		if (name &amp;&amp; value)</div><div class='del'>-			header_content_type_set_param (type, name, value);</div><div class='del'>-		g_free (name);</div><div class='del'>-		g_free (value);</div><div class='del'>-		</div><div class='del'>-		if (parms &amp;&amp; *parms == ' ')</div><div class='del'>-			parms++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!parms || *parms++ != ')') {</div><div class='del'>-		*parms_p = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	*parms_p = parms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_body:</div><div class='del'>- * @body_p: pointer to the start of an IMAP "body"</div><div class='del'>- * @folder: an imap folder</div><div class='del'>- * @ci: a CamelMessageContentInfo to fill in</div><div class='del'>- *</div><div class='del'>- * This fills in @ci with data from *@body_p. On success *@body_p</div><div class='del'>- * will point to the character after the body. On failure, it will be</div><div class='del'>- * set to %NULL and @ci will be unchanged.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-imap_parse_body (char **body_p, CamelFolder *folder,</div><div class='del'>-		 CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	char *body = *body_p;</div><div class='del'>-	CamelMessageContentInfo *child;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-	size_t len;</div><div class='del'>-	</div><div class='del'>-	if (!body || *body++ != '(') {</div><div class='del'>-		*body_p = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*body == '(') {</div><div class='del'>-		/* multipart */</div><div class='del'>-		GPtrArray *children;</div><div class='del'>-		char *subtype;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		/* Parse the child body parts */</div><div class='del'>-		children = g_ptr_array_new ();</div><div class='del'>-		while (body &amp;&amp; *body == '(') {</div><div class='del'>-			child = camel_folder_summary_content_info_new (folder-&gt;summary);</div><div class='del'>-			g_ptr_array_add (children, child);</div><div class='del'>-			imap_parse_body (&amp;body, folder, child);</div><div class='del'>-			if (!body)</div><div class='del'>-				break;</div><div class='del'>-			child-&gt;parent = ci;</div><div class='del'>-		}</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		</div><div class='del'>-		/* Parse the multipart subtype */</div><div class='del'>-		subtype = imap_parse_string (&amp;body, &amp;len);</div><div class='del'>-		</div><div class='del'>-		/* If there is a parse error, abort. */</div><div class='del'>-		if (!body) {</div><div class='del'>-			for (i = 0; i &lt; children-&gt;len; i++) {</div><div class='del'>-				child = children-&gt;pdata[i];</div><div class='del'>-				camel_folder_summary_content_info_free (folder-&gt;summary, child);</div><div class='del'>-			}</div><div class='del'>-			g_ptr_array_free (children, TRUE);</div><div class='del'>-			*body_p = NULL;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_strdown (subtype);</div><div class='del'>-		ci-&gt;type = header_content_type_new ("multipart", subtype);</div><div class='del'>-		g_free (subtype);</div><div class='del'>-		</div><div class='del'>-		/* Chain the children. */</div><div class='del'>-		ci-&gt;childs = children-&gt;pdata[0];</div><div class='del'>-		ci-&gt;size = 0;</div><div class='del'>-		for (i = 0; i &lt; children-&gt;len - 1; i++) {</div><div class='del'>-			child = children-&gt;pdata[i];</div><div class='del'>-			child-&gt;next = children-&gt;pdata[i + 1];</div><div class='del'>-			ci-&gt;size += child-&gt;size;</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (children, TRUE);</div><div class='del'>-	} else {</div><div class='del'>-		/* single part */</div><div class='del'>-		char *main_type, *subtype;</div><div class='del'>-		char *id, *description, *encoding;</div><div class='del'>-		guint32 size = 0;</div><div class='del'>-		</div><div class='del'>-		main_type = imap_parse_string (&amp;body, &amp;len);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		subtype = imap_parse_string (&amp;body, &amp;len);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		if (!body) {</div><div class='del'>-			g_free (main_type);</div><div class='del'>-			g_free (subtype);</div><div class='del'>-			*body_p = NULL;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		g_strdown (main_type);</div><div class='del'>-		g_strdown (subtype);</div><div class='del'>-		type = header_content_type_new (main_type, subtype);</div><div class='del'>-		g_free (main_type);</div><div class='del'>-		g_free (subtype);</div><div class='del'>-		parse_params (&amp;body, type);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		</div><div class='del'>-		id = imap_parse_nstring (&amp;body, &amp;len);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		description = imap_parse_nstring (&amp;body, &amp;len);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		encoding = imap_parse_string (&amp;body, &amp;len);</div><div class='del'>-		skip_char (&amp;body, ' ');</div><div class='del'>-		if (body)</div><div class='del'>-			size = strtoul (body, &amp;body, 10);</div><div class='del'>-		</div><div class='del'>-		child = NULL;</div><div class='del'>-		if (header_content_type_is (type, "message", "rfc822")) {</div><div class='del'>-			skip_char (&amp;body, ' ');</div><div class='del'>-			imap_skip_list (&amp;body); /* envelope */</div><div class='del'>-			skip_char (&amp;body, ' ');</div><div class='del'>-			child = camel_folder_summary_content_info_new (folder-&gt;summary);</div><div class='del'>-			imap_parse_body (&amp;body, folder, child);</div><div class='del'>-			if (!body)</div><div class='del'>-				camel_folder_summary_content_info_free (folder-&gt;summary, child);</div><div class='del'>-			skip_char (&amp;body, ' ');</div><div class='del'>-			if (body)</div><div class='del'>-				strtoul (body, &amp;body, 10);</div><div class='del'>-			child-&gt;parent = ci;</div><div class='del'>-		} else if (header_content_type_is (type, "text", "*")) {</div><div class='del'>-			if (body)</div><div class='del'>-				strtoul (body, &amp;body, 10);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (body) {</div><div class='del'>-			ci-&gt;type = type;</div><div class='del'>-			ci-&gt;id = id;</div><div class='del'>-			ci-&gt;description = description;</div><div class='del'>-			ci-&gt;encoding = encoding;</div><div class='del'>-			ci-&gt;size = size;</div><div class='del'>-			ci-&gt;childs = child;</div><div class='del'>-		} else {</div><div class='del'>-			header_content_type_unref (type);</div><div class='del'>-			g_free (id);</div><div class='del'>-			g_free (description);</div><div class='del'>-			g_free (encoding);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!body || *body++ != ')') {</div><div class='del'>-		*body_p = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*body_p = body;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_quote_string:</div><div class='del'>- * @str: the string to quote, which must not contain CR or LF</div><div class='del'>- *</div><div class='del'>- * Return value: an IMAP "quoted" corresponding to the string, which</div><div class='del'>- * the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-imap_quote_string (const char *str)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	char *quoted, *q;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	g_assert (strchr (str, '\r') == NULL);</div><div class='del'>-	</div><div class='del'>-	len = strlen (str);</div><div class='del'>-	p = str;</div><div class='del'>-	while ((p = strpbrk (p, "\"\\"))) {</div><div class='del'>-		len++;</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	quoted = q = g_malloc (len + 3);</div><div class='del'>-	*q++ = '"';</div><div class='del'>-	for (p = str; *p; ) {</div><div class='del'>-		if (strchr ("\"\\", *p))</div><div class='del'>-			*q++ = '\\';</div><div class='del'>-		*q++ = *p++;</div><div class='del'>-	}</div><div class='del'>-	*q++ = '"';</div><div class='del'>-	*q = '\0';</div><div class='del'>-	</div><div class='del'>-	return quoted;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline unsigned long</div><div class='del'>-get_summary_uid_numeric (CamelFolderSummary *summary, int index)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	unsigned long uid;</div><div class='del'>-	</div><div class='del'>-	info = camel_folder_summary_index (summary, index);</div><div class='del'>-	uid = strtoul (camel_message_info_uid (info), NULL, 10);</div><div class='del'>-	camel_folder_summary_info_free (summary, info);</div><div class='del'>-	return uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the max number of chars that an unsigned 32-bit int can be is 10 chars plus 1 for a possible : */</div><div class='del'>-#define UID_SET_FULL(setlen, maxlen) (maxlen &gt; 0 ? setlen + 11 &gt;= maxlen : FALSE)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_uid_array_to_set:</div><div class='del'>- * @summary: summary for the folder the UIDs come from</div><div class='del'>- * @uids: a (sorted) array of UIDs</div><div class='del'>- * @uid: uid index to start at</div><div class='del'>- * @maxlen: max length of the set string (or -1 for infinite)</div><div class='del'>- * @lastuid: index offset of the last uid used</div><div class='del'>- *</div><div class='del'>- * Creates an IMAP "set" up to @maxlen bytes long, covering the listed</div><div class='del'>- * UIDs starting at index @uid and not covering any UIDs that are in</div><div class='del'>- * @summary but not in @uids. It doesn't actually require that all (or</div><div class='del'>- * any) of the UIDs be in @summary.</div><div class='del'>- *</div><div class='del'>- * After calling, @lastuid will be set the index of the first uid</div><div class='del'>- * *not* included in the returned set string.</div><div class='del'>- * </div><div class='del'>- * Return value: the set, which the caller must free with g_free()</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-imap_uid_array_to_set (CamelFolderSummary *summary, GPtrArray *uids, int uid, ssize_t maxlen, int *lastuid)</div><div class='del'>-{</div><div class='del'>-	unsigned long last_uid, next_summary_uid, this_uid;</div><div class='del'>-	gboolean range = FALSE;</div><div class='del'>-	int si, scount;</div><div class='del'>-	GString *gset;</div><div class='del'>-	char *set;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (uids-&gt;len &gt; uid, NULL);</div><div class='del'>-	</div><div class='del'>-	gset = g_string_new (uids-&gt;pdata[uid]);</div><div class='del'>-	last_uid = strtoul (uids-&gt;pdata[uid], NULL, 10);</div><div class='del'>-	next_summary_uid = 0;</div><div class='del'>-	scount = camel_folder_summary_count (summary);</div><div class='del'>-	</div><div class='del'>-	for (uid++, si = 0; uid &lt; uids-&gt;len &amp;&amp; !UID_SET_FULL (gset-&gt;len, maxlen); uid++) {</div><div class='del'>-		/* Find the next UID in the summary after the one we</div><div class='del'>-		 * just wrote out.</div><div class='del'>-		 */</div><div class='del'>-		for ( ; last_uid &gt;= next_summary_uid &amp;&amp; si &lt; scount; si++)</div><div class='del'>-			next_summary_uid = get_summary_uid_numeric (summary, si);</div><div class='del'>-		if (last_uid &gt;= next_summary_uid)</div><div class='del'>-			next_summary_uid = (unsigned long) -1;</div><div class='del'>-		</div><div class='del'>-		/* Now get the next UID from @uids */</div><div class='del'>-		this_uid = strtoul (uids-&gt;pdata[uid], NULL, 10);</div><div class='del'>-		if (this_uid == next_summary_uid || this_uid == last_uid + 1)</div><div class='del'>-			range = TRUE;</div><div class='del'>-		else {</div><div class='del'>-			if (range) {</div><div class='del'>-				g_string_sprintfa (gset, ":%lu", last_uid);</div><div class='del'>-				range = FALSE;</div><div class='del'>-			}</div><div class='del'>-			g_string_sprintfa (gset, ",%lu", this_uid);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		last_uid = this_uid;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (range)</div><div class='del'>-		g_string_sprintfa (gset, ":%lu", last_uid);</div><div class='del'>-	</div><div class='del'>-	*lastuid = uid;</div><div class='del'>-	</div><div class='del'>-	set = gset-&gt;str;</div><div class='del'>-	g_string_free (gset, FALSE);</div><div class='del'>-	</div><div class='del'>-	return set;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_uid_set_to_array:</div><div class='del'>- * @summary: summary for the folder the UIDs come from</div><div class='del'>- * @uids: a pointer to the start of an IMAP "set" of UIDs</div><div class='del'>- *</div><div class='del'>- * Fills an array with the UIDs corresponding to @uids and @summary.</div><div class='del'>- * There can be text after the uid set in @uids, which will be</div><div class='del'>- * ignored.</div><div class='del'>- *</div><div class='del'>- * If @uids specifies a range of UIDs that extends outside the range</div><div class='del'>- * of @summary, the function will assume that all of the "missing" UIDs</div><div class='del'>- * do exist.</div><div class='del'>- *</div><div class='del'>- * Return value: the array of uids, which the caller must free with</div><div class='del'>- * imap_uid_array_free(). (Or %NULL if the uid set can't be parsed.)</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-imap_uid_set_to_array (CamelFolderSummary *summary, const char *uids)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *arr;</div><div class='del'>-	char *p, *q;</div><div class='del'>-	unsigned long uid, suid;</div><div class='del'>-	int si, scount;</div><div class='del'>-	</div><div class='del'>-	arr = g_ptr_array_new ();</div><div class='del'>-	scount = camel_folder_summary_count (summary);</div><div class='del'>-	</div><div class='del'>-	p = (char *)uids;</div><div class='del'>-	si = 0;</div><div class='del'>-	do {</div><div class='del'>-		uid = strtoul (p, &amp;q, 10);</div><div class='del'>-		if (p == q)</div><div class='del'>-			goto lose;</div><div class='del'>-		g_ptr_array_add (arr, g_strndup (p, q - p));</div><div class='del'>-		</div><div class='del'>-		if (*q == ':') {</div><div class='del'>-			/* Find the summary entry for the UID after the one</div><div class='del'>-			 * we just saw.</div><div class='del'>-			 */</div><div class='del'>-			while (++si &lt; scount) {</div><div class='del'>-				suid = get_summary_uid_numeric (summary, si);</div><div class='del'>-				if (suid &gt; uid)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (si &gt;= scount)</div><div class='del'>-				suid = uid + 1;</div><div class='del'>-			</div><div class='del'>-			uid = strtoul (q + 1, &amp;p, 10);</div><div class='del'>-			if (p == q + 1)</div><div class='del'>-				goto lose;</div><div class='del'>-			</div><div class='del'>-			/* Add each summary UID until we find one</div><div class='del'>-			 * larger than the end of the range</div><div class='del'>-			 */</div><div class='del'>-			while (suid &lt;= uid) {</div><div class='del'>-				g_ptr_array_add (arr, g_strdup_printf ("%lu", suid));</div><div class='del'>-				if (++si &lt; scount)</div><div class='del'>-					suid = get_summary_uid_numeric (summary, si);</div><div class='del'>-				else</div><div class='del'>-					suid++;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			p = q;</div><div class='del'>-	} while (*p++ == ',');</div><div class='del'>-	</div><div class='del'>-	return arr;</div><div class='del'>-	</div><div class='del'>- lose:</div><div class='del'>-	g_warning ("Invalid uid set %s", uids);</div><div class='del'>-	imap_uid_array_free (arr);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_uid_array_free:</div><div class='del'>- * @arr: an array returned from imap_uid_set_to_array()</div><div class='del'>- *</div><div class='del'>- * Frees @arr</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-imap_uid_array_free (GPtrArray *arr)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; arr-&gt;len; i++)</div><div class='del'>-		g_free (arr-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (arr, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_concat (CamelImapStore *imap_store, const char *prefix, const char *suffix)</div><div class='del'>-{</div><div class='del'>-	size_t len;</div><div class='del'>-	</div><div class='del'>-	len = strlen (prefix);</div><div class='del'>-	if (len == 0 || prefix[len - 1] == imap_store-&gt;dir_sep)</div><div class='del'>-		return g_strdup_printf ("%s%s", prefix, suffix);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf ("%s%c%s", prefix, imap_store-&gt;dir_sep, suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_namespace_concat (CamelImapStore *store, const char *name)</div><div class='del'>-{</div><div class='del'>-	if (!name || *name == '\0') {</div><div class='del'>-		if (store-&gt;namespace)</div><div class='del'>-			return g_strdup (store-&gt;namespace);</div><div class='del'>-		else</div><div class='del'>-			return g_strdup ("");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!g_strcasecmp (name, "INBOX"))</div><div class='del'>-		return g_strdup ("INBOX");</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;namespace == NULL) {</div><div class='del'>-		g_warning ("Trying to concat NULL namespace to \"%s\"!", name);</div><div class='del'>-		return g_strdup (name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return imap_concat (store, store-&gt;namespace, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define UTF8_TO_UTF7_LEN(len)  ((len * 3) + 8)</div><div class='del'>-#define UTF7_TO_UTF8_LEN(len)  (len)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	MODE_USASCII,</div><div class='del'>-	MODE_AMPERSAND,</div><div class='del'>-	MODE_MODUTF7</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define is_usascii(c)  (((c) &gt;= 0x20 &amp;&amp; (c) &lt;= 0x25) || ((c) &gt;= 0x27 &amp;&amp; (c) &lt;= 0x7e))</div><div class='del'>-#define encode_mode(c) (is_usascii (c) ? MODE_USASCII : (c) == '&amp;' ? MODE_AMPERSAND : MODE_MODUTF7)</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_mailbox_encode (const unsigned char *in, size_t inlen)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *start, *inptr, *inend;</div><div class='del'>-	unsigned char *mailbox, *m, *mend;</div><div class='del'>-	size_t inleft, outleft, conv;</div><div class='del'>-	char *inbuf, *outbuf;</div><div class='del'>-	iconv_t cd;</div><div class='del'>-	int mode;</div><div class='del'>-	</div><div class='del'>-	cd = (iconv_t) -1;</div><div class='del'>-	m = mailbox = g_malloc (UTF8_TO_UTF7_LEN (inlen) + 1);</div><div class='del'>-	mend = mailbox + UTF8_TO_UTF7_LEN (inlen);</div><div class='del'>-	</div><div class='del'>-	start = inptr = in;</div><div class='del'>-	inend = in + inlen;</div><div class='del'>-	mode = MODE_USASCII;</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		int new_mode;</div><div class='del'>-		</div><div class='del'>-		new_mode = encode_mode (*inptr);</div><div class='del'>-		</div><div class='del'>-		if (new_mode != mode) {</div><div class='del'>-			switch (mode) {</div><div class='del'>-			case MODE_USASCII:</div><div class='del'>-				memcpy (m, start, inptr - start);</div><div class='del'>-				m += (inptr - start);</div><div class='del'>-				break;</div><div class='del'>-			case MODE_AMPERSAND:</div><div class='del'>-				while (start &lt; inptr) {</div><div class='del'>-					*m++ = '&amp;';</div><div class='del'>-					*m++ = '-';</div><div class='del'>-					start++;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case MODE_MODUTF7:</div><div class='del'>-				inbuf = (char *) start;</div><div class='del'>-				inleft = inptr - start;</div><div class='del'>-				outbuf = (char *) m;</div><div class='del'>-				outleft = mend - m;</div><div class='del'>-				</div><div class='del'>-				if (cd == (iconv_t) -1)</div><div class='del'>-					cd = iconv_open ("UTF-7", "UTF-8");</div><div class='del'>-				</div><div class='del'>-				conv = iconv (cd, &amp;inbuf, &amp;inleft, &amp;outbuf, &amp;outleft);</div><div class='del'>-				if (conv == (size_t) -1) {</div><div class='del'>-					g_warning ("error converting mailbox to UTF-7!");</div><div class='del'>-				}</div><div class='del'>-				iconv (cd, NULL, NULL, &amp;outbuf, &amp;outleft);</div><div class='del'>-				</div><div class='del'>-				/* shift into modified UTF-7 mode (overwrite UTF-7's '+' shift)... */</div><div class='del'>-				*m++ = '&amp;';</div><div class='del'>-				</div><div class='del'>-				while (m &lt; (unsigned char *) outbuf) {</div><div class='del'>-					/* replace '/' with ',' */</div><div class='del'>-					if (*m == '/')</div><div class='del'>-						*m = ',';</div><div class='del'>-					</div><div class='del'>-					m++;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			mode = new_mode;</div><div class='del'>-			start = inptr;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		inptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case MODE_USASCII:</div><div class='del'>-		memcpy (m, start, inptr - start);</div><div class='del'>-		m += (inptr - start);</div><div class='del'>-		break;</div><div class='del'>-	case MODE_AMPERSAND:</div><div class='del'>-		while (start &lt; inptr) {</div><div class='del'>-			*m++ = '&amp;';</div><div class='del'>-			*m++ = '-';</div><div class='del'>-			start++;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case MODE_MODUTF7:</div><div class='del'>-		inbuf = (char *) start;</div><div class='del'>-		inleft = inptr - start;</div><div class='del'>-		outbuf = (char *) m;</div><div class='del'>-		outleft = mend - m;</div><div class='del'>-		</div><div class='del'>-		if (cd == (iconv_t) -1)</div><div class='del'>-			cd = iconv_open ("UTF-7", "UTF-8");</div><div class='del'>-		</div><div class='del'>-		conv = iconv (cd, &amp;inbuf, &amp;inleft, &amp;outbuf, &amp;outleft);</div><div class='del'>-		if (conv == (size_t) -1) {</div><div class='del'>-			g_warning ("error converting mailbox to UTF-7!");</div><div class='del'>-		}</div><div class='del'>-		iconv (cd, NULL, NULL, &amp;outbuf, &amp;outleft);</div><div class='del'>-		</div><div class='del'>-		/* shift into modified UTF-7 mode (overwrite UTF-7's '+' shift)... */</div><div class='del'>-		*m++ = '&amp;';</div><div class='del'>-		</div><div class='del'>-		while (m &lt; (unsigned char *) outbuf) {</div><div class='del'>-			/* replace '/' with ',' */</div><div class='del'>-			if (*m == '/')</div><div class='del'>-				*m = ',';</div><div class='del'>-			</div><div class='del'>-			m++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*m = '\0';</div><div class='del'>-	</div><div class='del'>-	if (cd != (iconv_t) -1)</div><div class='del'>-		iconv_close (cd);</div><div class='del'>-	</div><div class='del'>-	return mailbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_mailbox_decode (const unsigned char *in, size_t inlen)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *start, *inptr, *inend;</div><div class='del'>-	unsigned char *mailbox, *m, *mend;</div><div class='del'>-	unsigned char mode_switch;</div><div class='del'>-	iconv_t cd;</div><div class='del'>-	</div><div class='del'>-	cd = (iconv_t) -1;</div><div class='del'>-	m = mailbox = g_malloc (UTF7_TO_UTF8_LEN (inlen) + 1);</div><div class='del'>-	mend = mailbox + UTF7_TO_UTF8_LEN (inlen);</div><div class='del'>-	</div><div class='del'>-	start = inptr = in;</div><div class='del'>-	inend = in + inlen;</div><div class='del'>-	mode_switch = '&amp;';</div><div class='del'>-	</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		if (*inptr == mode_switch) {</div><div class='del'>-			if (mode_switch == '&amp;') {</div><div class='del'>-				/* mode switch from US-ASCII to UTF-7 */</div><div class='del'>-				mode_switch = '-';</div><div class='del'>-				memcpy (m, start, inptr - start);</div><div class='del'>-				m += (inptr - start);</div><div class='del'>-				start = inptr;</div><div class='del'>-			} else if (mode_switch == '-') {</div><div class='del'>-				/* mode switch from UTF-7 to US-ASCII or an ampersand (&amp;) */</div><div class='del'>-				mode_switch = '&amp;';</div><div class='del'>-				start++;</div><div class='del'>-				if (start == inptr) {</div><div class='del'>-					/* we had the sequence "&amp;-" which becomes "&amp;" when decoded */</div><div class='del'>-					*m++ = '&amp;';</div><div class='del'>-				} else {</div><div class='del'>-					char *buffer, *inbuf, *outbuf;</div><div class='del'>-					size_t buflen, outleft, conv;</div><div class='del'>-					</div><div class='del'>-					buflen = (inptr - start) + 2;</div><div class='del'>-					inbuf = buffer = alloca (buflen);</div><div class='del'>-					*inbuf++ = '+';</div><div class='del'>-					while (start &lt; inptr) {</div><div class='del'>-						*inbuf++ = *start == ',' ? '/' : *start;</div><div class='del'>-						start++;</div><div class='del'>-					}</div><div class='del'>-					*inbuf = '-';</div><div class='del'>-					</div><div class='del'>-					inbuf = buffer;</div><div class='del'>-					outbuf = (char *) m;</div><div class='del'>-					outleft = mend - m;</div><div class='del'>-					</div><div class='del'>-					if (cd == (iconv_t) -1)</div><div class='del'>-						cd = iconv_open ("UTF-8", "UTF-7");</div><div class='del'>-					</div><div class='del'>-					conv = iconv (cd, &amp;inbuf, &amp;buflen, &amp;outbuf, &amp;outleft);</div><div class='del'>-					if (conv == (size_t) -1) {</div><div class='del'>-						g_warning ("error decoding mailbox: %.*s", inlen, in);</div><div class='del'>-					}</div><div class='del'>-					iconv (cd, NULL, NULL, NULL, NULL);</div><div class='del'>-					</div><div class='del'>-					m = (unsigned char *) outbuf;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* point to the char after the '-' */</div><div class='del'>-				start = inptr + 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		inptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*inptr == mode_switch) {</div><div class='del'>-		if (mode_switch == '&amp;') {</div><div class='del'>-			/* the remaining text is US-ASCII */</div><div class='del'>-			memcpy (m, start, inptr - start);</div><div class='del'>-			m += (inptr - start);</div><div class='del'>-			start = inptr;</div><div class='del'>-		} else if (mode_switch == '-') {</div><div class='del'>-			/* We've got encoded UTF-7 or else an ampersand */</div><div class='del'>-			start++;</div><div class='del'>-			if (start == inptr) {</div><div class='del'>-				/* we had the sequence "&amp;-" which becomes "&amp;" when decoded */</div><div class='del'>-				*m++ = '&amp;';</div><div class='del'>-			} else {</div><div class='del'>-				char *buffer, *inbuf, *outbuf;</div><div class='del'>-				size_t buflen, outleft, conv;</div><div class='del'>-				</div><div class='del'>-				buflen = (inptr - start) + 2;</div><div class='del'>-				inbuf = buffer = alloca (buflen);</div><div class='del'>-				*inbuf++ = '+';</div><div class='del'>-				while (start &lt; inptr) {</div><div class='del'>-					*inbuf++ = *start == ',' ? '/' : *start;</div><div class='del'>-					start++;</div><div class='del'>-				}</div><div class='del'>-				*inbuf = '-';</div><div class='del'>-				</div><div class='del'>-				inbuf = buffer;</div><div class='del'>-				outbuf = (char *) m;</div><div class='del'>-				outleft = mend - m;</div><div class='del'>-				</div><div class='del'>-				if (cd == (iconv_t) -1)</div><div class='del'>-					cd = iconv_open ("UTF-8", "UTF-7");</div><div class='del'>-				</div><div class='del'>-				conv = iconv (cd, &amp;inbuf, &amp;buflen, &amp;outbuf, &amp;outleft);</div><div class='del'>-				if (conv == (size_t) -1) {</div><div class='del'>-					g_warning ("error decoding mailbox: %.*s", inlen, in);</div><div class='del'>-				}</div><div class='del'>-				iconv (cd, NULL, NULL, NULL, NULL);</div><div class='del'>-				</div><div class='del'>-				m = (unsigned char *) outbuf;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (mode_switch == '-') {</div><div class='del'>-			/* illegal encoded mailbox... */</div><div class='del'>-			g_warning ("illegal mailbox name encountered: %.*s", inlen, in);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		memcpy (m, start, inptr - start);</div><div class='del'>-		m += (inptr - start);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*m = '\0';</div><div class='del'>-	</div><div class='del'>-	if (cd != (iconv_t) -1)</div><div class='del'>-		iconv_close (cd);</div><div class='del'>-	</div><div class='del'>-	return mailbox;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h<br/>deleted file mode 100644<br/>index 7078e12335..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_UTILS_H</div><div class='del'>-#define CAMEL_IMAP_UTILS_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-</div><div class='del'>-const char *imap_next_word (const char *buf);</div><div class='del'>-</div><div class='del'>-#define IMAP_LIST_FLAG_NOINFERIORS	(1 &lt;&lt; 0)</div><div class='del'>-#define IMAP_LIST_FLAG_NOSELECT		(1 &lt;&lt; 1)</div><div class='del'>-#define IMAP_LIST_FLAG_MARKED		(1 &lt;&lt; 2)</div><div class='del'>-#define IMAP_LIST_FLAG_UNMARKED		(1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-gboolean imap_parse_list_response  (CamelImapStore *store, const char *buf, int *flags,</div><div class='del'>-				    char *sep, char **folder);</div><div class='del'>-</div><div class='del'>-char   **imap_parse_folder_name    (CamelImapStore *store, const char *folder_name);</div><div class='del'>-</div><div class='del'>-char    *imap_create_flag_list     (guint32 flags);</div><div class='del'>-guint32  imap_parse_flag_list      (char **flag_list);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum { IMAP_STRING, IMAP_NSTRING, IMAP_ASTRING };</div><div class='del'>-</div><div class='del'>-char    *imap_parse_string_generic (char **str_p, size_t *len, int type);</div><div class='del'>-</div><div class='del'>-#define imap_parse_string(str_p, len_p) \</div><div class='del'>-	imap_parse_string_generic (str_p, len_p, IMAP_STRING)</div><div class='del'>-#define imap_parse_nstring(str_p, len_p) \</div><div class='del'>-	imap_parse_string_generic (str_p, len_p, IMAP_NSTRING)</div><div class='del'>-#define imap_parse_astring(str_p, len_p) \</div><div class='del'>-	imap_parse_string_generic (str_p, len_p, IMAP_ASTRING)</div><div class='del'>-</div><div class='del'>-void     imap_parse_body           (char **body_p, CamelFolder *folder,</div><div class='del'>-				    CamelMessageContentInfo *ci);</div><div class='del'>-</div><div class='del'>-gboolean imap_is_atom              (const char *in);</div><div class='del'>-char    *imap_quote_string         (const char *str);</div><div class='del'>-</div><div class='del'>-void     imap_skip_list            (char **str_p);</div><div class='del'>-</div><div class='del'>-char    *imap_uid_array_to_set     (CamelFolderSummary *summary, GPtrArray *uids, int uid, ssize_t maxlen, int *lastuid);</div><div class='del'>-GPtrArray *imap_uid_set_to_array   (CamelFolderSummary *summary, const char *uids);</div><div class='del'>-void     imap_uid_array_free       (GPtrArray *arr);</div><div class='del'>-</div><div class='del'>-char *imap_concat (CamelImapStore *imap_store, const char *prefix, const char *suffix);</div><div class='del'>-char *imap_namespace_concat (CamelImapStore *store, const char *name);</div><div class='del'>-</div><div class='del'>-char *imap_mailbox_encode (const unsigned char *in, size_t inlen);</div><div class='del'>-char *imap_mailbox_decode (const unsigned char *in, size_t inlen);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_UTILS_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c<br/>deleted file mode 100644<br/>index 8559203c16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-wrapper.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-wrapper.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; -*- */</div><div class='del'>-/* camel-imap-wrapper.c: data wrapper for offline IMAP data */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-wrapper.h"</div><div class='del'>-#include "camel-imap-private.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-basic.h"</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-charset.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-</div><div class='del'>-static CamelDataWrapperClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelDataWrapper */</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int write_to_stream (CamelDataWrapper *imap_wrapper, CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_wrapper_class_init (CamelImapWrapperClass *camel_imap_wrapper_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class =</div><div class='del'>-		CAMEL_DATA_WRAPPER_CLASS (camel_imap_wrapper_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_wrapper_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (object);</div><div class='del'>-</div><div class='del'>-	if (imap_wrapper-&gt;folder)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (imap_wrapper-&gt;folder));</div><div class='del'>-	if (imap_wrapper-&gt;uid)</div><div class='del'>-		g_free (imap_wrapper-&gt;uid);</div><div class='del'>-	if (imap_wrapper-&gt;part)</div><div class='del'>-		g_free (imap_wrapper-&gt;part_spec);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free (imap_wrapper-&gt;priv-&gt;lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free (imap_wrapper-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_wrapper_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (object);</div><div class='del'>-</div><div class='del'>-	imap_wrapper-&gt;priv = g_new0 (struct _CamelImapWrapperPrivate, 1);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	imap_wrapper-&gt;priv-&gt;lock = g_mutex_new ();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_wrapper_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_wrapper_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_imap_wrapper_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_wrapper_type = camel_type_register (</div><div class='del'>-			CAMEL_DATA_WRAPPER_TYPE, "CamelImapWrapper",</div><div class='del'>-			sizeof (CamelImapWrapper),</div><div class='del'>-			sizeof (CamelImapWrapperClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_imap_wrapper_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_imap_wrapper_init,</div><div class='del'>-			(CamelObjectFinalizeFunc) camel_imap_wrapper_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_imap_wrapper_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_wrapper_hydrate (CamelImapWrapper *imap_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *data_wrapper = CAMEL_DATA_WRAPPER (imap_wrapper);</div><div class='del'>-	CamelStreamFilter *filterstream;</div><div class='del'>-	CamelMimeFilter *filter;</div><div class='del'>-	CamelContentType *ct;</div><div class='del'>-	</div><div class='del'>-	filterstream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: lame. We already have code to do all this shit in camel-mime-part-utils.c */</div><div class='del'>-	switch (camel_mime_part_get_encoding (imap_wrapper-&gt;part)) {</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_BASE64:</div><div class='del'>-		filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_BASE64_DEC);</div><div class='del'>-		camel_stream_filter_add (filterstream, filter);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:</div><div class='del'>-		filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_QP_DEC);</div><div class='del'>-		camel_stream_filter_add (filterstream, filter);</div><div class='del'>-		break;</div><div class='del'>-	case CAMEL_MIME_PART_ENCODING_UUENCODE:</div><div class='del'>-		filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type (CAMEL_MIME_FILTER_BASIC_UU_DEC);</div><div class='del'>-		camel_stream_filter_add (filterstream, filter);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		filter = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ct = camel_mime_part_get_content_type (imap_wrapper-&gt;part);</div><div class='del'>-	if (header_content_type_is (ct, "text", "*")) {</div><div class='del'>-		const char *charset;</div><div class='del'>-		</div><div class='del'>-		/* If we just did B64/QP/UU, need to also do CRLF-&gt;LF */</div><div class='del'>-		if (filter) {</div><div class='del'>-			filter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_DECODE,</div><div class='del'>-							     CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-			camel_stream_filter_add (filterstream, filter);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		charset = header_content_type_param (ct, "charset");</div><div class='del'>-		if (charset &amp;&amp; !(strcasecmp (charset, "us-ascii") == 0</div><div class='del'>-				 || strcasecmp (charset, "utf-8") == 0)) {</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_charset_new_convert (charset, "UTF-8");</div><div class='del'>-			if (filter)</div><div class='del'>-				camel_stream_filter_add (filterstream, filter);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	data_wrapper-&gt;stream = CAMEL_STREAM (filterstream);</div><div class='del'>-	data_wrapper-&gt;offline = FALSE;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (imap_wrapper-&gt;folder));</div><div class='del'>-	imap_wrapper-&gt;folder = NULL;</div><div class='del'>-	g_free (imap_wrapper-&gt;uid);</div><div class='del'>-	imap_wrapper-&gt;uid = NULL;</div><div class='del'>-	g_free (imap_wrapper-&gt;part_spec);</div><div class='del'>-	imap_wrapper-&gt;part = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelImapWrapper *imap_wrapper = CAMEL_IMAP_WRAPPER (data_wrapper);</div><div class='del'>-	</div><div class='del'>-	CAMEL_IMAP_WRAPPER_LOCK (imap_wrapper, lock);</div><div class='del'>-	if (data_wrapper-&gt;offline) {</div><div class='del'>-		CamelStream *datastream;</div><div class='del'>-		</div><div class='del'>-		datastream = camel_imap_folder_fetch_data (</div><div class='del'>-			imap_wrapper-&gt;folder, imap_wrapper-&gt;uid,</div><div class='del'>-			imap_wrapper-&gt;part_spec, FALSE, NULL);</div><div class='del'>-		if (!datastream) {</div><div class='del'>-			CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);</div><div class='del'>-			errno = ENETUNREACH;</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		imap_wrapper_hydrate (imap_wrapper, datastream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (datastream));</div><div class='del'>-	}</div><div class='del'>-	CAMEL_IMAP_WRAPPER_UNLOCK (imap_wrapper, lock);</div><div class='del'>-	</div><div class='del'>-	return parent_class-&gt;write_to_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelDataWrapper *</div><div class='del'>-camel_imap_wrapper_new (CamelImapFolder *imap_folder, CamelContentType *type,</div><div class='del'>-			const char *uid, const char *part_spec,</div><div class='del'>-			CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	CamelImapWrapper *imap_wrapper;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	imap_wrapper = (CamelImapWrapper *)camel_object_new(camel_imap_wrapper_get_type());</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (imap_wrapper), type);</div><div class='del'>-	((CamelDataWrapper *)imap_wrapper)-&gt;offline = TRUE;</div><div class='del'>-</div><div class='del'>-	imap_wrapper-&gt;folder = imap_folder;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (imap_folder));</div><div class='del'>-	imap_wrapper-&gt;uid = g_strdup (uid);</div><div class='del'>-	imap_wrapper-&gt;part_spec = g_strdup (part_spec);</div><div class='del'>-</div><div class='del'>-	/* Don't ref this, it's our parent. */</div><div class='del'>-	imap_wrapper-&gt;part = part;</div><div class='del'>-</div><div class='del'>-	/* Try the cache. */</div><div class='del'>-	stream = camel_imap_folder_fetch_data (imap_folder, uid, part_spec,</div><div class='del'>-					       TRUE, NULL);</div><div class='del'>-	if (stream) {</div><div class='del'>-		imap_wrapper_hydrate (imap_wrapper, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (CamelDataWrapper *)imap_wrapper;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h<br/>deleted file mode 100644<br/>index 4f7ca5097a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-wrapper.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/camel-imap-wrapper.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-wrapper.h: data wrapper for offline IMAP data */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_IMAP_WRAPPER_H</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-data-wrapper.h&gt;</div><div class='del'>-#include "camel-imap-types.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_TYPE     (camel_imap_wrapper_get_type ())</div><div class='del'>-#define CAMEL_IMAP_WRAPPER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapper))</div><div class='del'>-#define CAMEL_IMAP_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapperClass))</div><div class='del'>-#define CAMEL_IS_IMAP_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_WRAPPER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper parent_object;</div><div class='del'>-</div><div class='del'>-	struct _CamelImapWrapperPrivate *priv;</div><div class='del'>-</div><div class='del'>-	CamelImapFolder *folder;</div><div class='del'>-	char *uid, *part_spec;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-} CamelImapWrapper;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDataWrapperClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelImapWrapperClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_wrapper_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Constructor */</div><div class='del'>-CamelDataWrapper *camel_imap_wrapper_new (CamelImapFolder *imap_folder,</div><div class='del'>-					  CamelContentType *type,</div><div class='del'>-					  const char *uid,</div><div class='del'>-					  const char *part_spec,</div><div class='del'>-					  CamelMimePart *part);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_DATA_WRAPPER_H */</div><div class='head'>diff --git a/camel/providers/imap/libcamelimap.urls b/camel/providers/imap/libcamelimap.urls<br/>deleted file mode 100644<br/>index c301c0ffac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/libcamelimap.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/imap/libcamelimap.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-imap</div><div class='head'>diff --git a/camel/providers/local/.cvsignore b/camel/providers/local/.cvsignore<br/>deleted file mode 100644<br/>index 3fa8afaa38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am<br/>deleted file mode 100644<br/>index 1261dad798..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamellocalincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamellocal.la</div><div class='del'>-camel_provider_DATA = libcamellocal.urls</div><div class='del'>-</div><div class='del'>-INCLUDES = -I.. \</div><div class='del'>-	-I$(srcdir)/..				\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(includedir)				\</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-local-provider\"	</div><div class='del'>-</div><div class='del'>-libcamellocal_la_SOURCES = 			\</div><div class='del'>-	camel-local-folder.c			\</div><div class='del'>-	camel-local-store.c			\</div><div class='del'>-	camel-local-summary.c			\</div><div class='del'>-	camel-local-provider.c			\</div><div class='del'>-	camel-mh-folder.c			\</div><div class='del'>-	camel-mh-store.c			\</div><div class='del'>-	camel-mh-summary.c			\</div><div class='del'>-	camel-mbox-folder.c			\</div><div class='del'>-	camel-mbox-store.c			\</div><div class='del'>-	camel-mbox-summary.c			\</div><div class='del'>-	camel-maildir-folder.c			\</div><div class='del'>-	camel-maildir-store.c			\</div><div class='del'>-	camel-maildir-summary.c			\</div><div class='del'>-	camel-spool-folder.c			\</div><div class='del'>-	camel-spool-store.c			\</div><div class='del'>-	camel-spool-summary.c			\</div><div class='del'>-	camel-spoold-store.c</div><div class='del'>-</div><div class='del'>-libcamellocalinclude_HEADERS =			\</div><div class='del'>-	camel-local-folder.h			\</div><div class='del'>-	camel-local-store.h			\</div><div class='del'>-	camel-local-summary.h			\</div><div class='del'>-	camel-mh-folder.h			\</div><div class='del'>-	camel-mh-store.h			\</div><div class='del'>-	camel-mh-summary.h			\</div><div class='del'>-	camel-mbox-folder.h			\</div><div class='del'>-	camel-mbox-store.h			\</div><div class='del'>-	camel-mbox-summary.h			\</div><div class='del'>-	camel-maildir-folder.h			\</div><div class='del'>-	camel-maildir-store.h			\</div><div class='del'>-	camel-maildir-summary.h			\</div><div class='del'>-	camel-spool-folder.h			\</div><div class='del'>-	camel-spool-store.h			\</div><div class='del'>-	camel-spool-summary.h			\</div><div class='del'>-	camel-spoold-store.h</div><div class='del'>-</div><div class='del'>-noinst_HEADERS =				\</div><div class='del'>-	camel-local-private.h</div><div class='del'>-</div><div class='del'>-libcamellocal_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-libcamellocal_la_LIBADD = $(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamellocal.urls</div><div class='head'>diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c<br/>deleted file mode 100644<br/>index 3ae6c74873..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,447 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- * </div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;limits.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef _POSIX_PATH_MAX</div><div class='del'>-#include &lt;posix1_lim.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-local-folder.h"</div><div class='del'>-#include "camel-local-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include "camel-local-private.h"</div><div class='del'>-</div><div class='del'>-#include "camel-text-index.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#ifndef PATH_MAX</div><div class='del'>-#define PATH_MAX _POSIX_PATH_MAX</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelLocalFolder */</div><div class='del'>-#define CLOCALF_CLASS(so) CAMEL_LOCAL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CLOCALS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int local_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);</div><div class='del'>-static void local_unlock(CamelLocalFolder *lf);</div><div class='del'>-</div><div class='del'>-static void local_sync(CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static void local_expunge(CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *local_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-static GPtrArray *local_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void local_search_free(CamelFolder *folder, GPtrArray * result);</div><div class='del'>-</div><div class='del'>-static void local_rename(CamelFolder *folder, const char *newname);</div><div class='del'>-</div><div class='del'>-static void local_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_folder_class_init(CamelLocalFolderClass * camel_local_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_local_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs(camel_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = local_sync;</div><div class='del'>-	camel_folder_class-&gt;expunge = local_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = local_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_by_uids = local_search_by_uids;</div><div class='del'>-	camel_folder_class-&gt;search_free = local_search_free;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;rename = local_rename;</div><div class='del'>-</div><div class='del'>-	camel_local_folder_class-&gt;lock = local_lock;</div><div class='del'>-	camel_local_folder_class-&gt;unlock = local_unlock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-	CamelLocalFolder *local_folder = object;</div><div class='del'>-</div><div class='del'>-	folder-&gt;folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |</div><div class='del'>-				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);</div><div class='del'>-</div><div class='del'>-	folder-&gt;permanent_flags = CAMEL_MESSAGE_ANSWERED |</div><div class='del'>-	    CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |</div><div class='del'>-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;</div><div class='del'>-</div><div class='del'>-	folder-&gt;summary = NULL;</div><div class='del'>-	local_folder-&gt;search = NULL;</div><div class='del'>-</div><div class='del'>-	local_folder-&gt;priv = g_malloc0(sizeof(*local_folder-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	local_folder-&gt;priv-&gt;search_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(object);</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)object;</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;summary) {</div><div class='del'>-		camel_local_summary_sync((CamelLocalSummary *)folder-&gt;summary, FALSE, local_folder-&gt;changes, NULL);</div><div class='del'>-		camel_object_unref((CamelObject *)folder-&gt;summary);</div><div class='del'>-		folder-&gt;summary = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local_folder-&gt;search) {</div><div class='del'>-		camel_object_unref((CamelObject *)local_folder-&gt;search);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local_folder-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)local_folder-&gt;index);</div><div class='del'>-</div><div class='del'>-	while (local_folder-&gt;locked&gt; 0)</div><div class='del'>-		camel_local_folder_unlock(local_folder);</div><div class='del'>-</div><div class='del'>-	g_free(local_folder-&gt;base_path);</div><div class='del'>-	g_free(local_folder-&gt;folder_path);</div><div class='del'>-	g_free(local_folder-&gt;summary_path);</div><div class='del'>-	g_free(local_folder-&gt;index_path);</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(local_folder-&gt;changes);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(local_folder-&gt;priv-&gt;search_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(local_folder-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_local_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_local_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_local_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_local_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelLocalFolder",</div><div class='del'>-							     sizeof(CamelLocalFolder),</div><div class='del'>-							     sizeof(CamelLocalFolderClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_local_folder_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) local_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) local_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_local_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelLocalFolder *</div><div class='del'>-camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	const char *root_dir_path, *name;</div><div class='del'>-	char folder_path[PATH_MAX];</div><div class='del'>-	struct stat st;</div><div class='del'>-	int forceindex;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)lf;</div><div class='del'>-</div><div class='del'>-	name = strrchr(full_name, '/');</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = full_name;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct(folder, parent_store, full_name, name);</div><div class='del'>-</div><div class='del'>-	root_dir_path = camel_local_store_get_toplevel_dir(CAMEL_LOCAL_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	lf-&gt;base_path = g_strdup(root_dir_path);</div><div class='del'>-	lf-&gt;folder_path = g_strdup_printf("%s/%s", root_dir_path, full_name);</div><div class='del'>-	lf-&gt;summary_path = g_strdup_printf("%s/%s.ev-summary", root_dir_path, full_name);</div><div class='del'>-	lf-&gt;index_path = g_strdup_printf("%s/%s.ibex", root_dir_path, full_name);</div><div class='del'>-	</div><div class='del'>-	/* follow any symlinks to the mailbox */</div><div class='del'>-	if (lstat (lf-&gt;folder_path, &amp;st) != -1 &amp;&amp; S_ISLNK (st.st_mode) &amp;&amp;</div><div class='del'>-	    realpath (lf-&gt;folder_path, folder_path) != NULL) {</div><div class='del'>-		g_free (lf-&gt;folder_path);</div><div class='del'>-		lf-&gt;folder_path = g_strdup (folder_path);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	lf-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-</div><div class='del'>-	/* TODO: Remove the following line, it is a temporary workaround to remove</div><div class='del'>-	   the old-format 'ibex' files that might be lying around */</div><div class='del'>-	unlink(lf-&gt;index_path);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	forceindex = FALSE;</div><div class='del'>-#else</div><div class='del'>-	/* if we have no/invalid index file, force it */</div><div class='del'>-	forceindex = camel_text_index_check(lf-&gt;index_path) == -1;</div><div class='del'>-	if (flags &amp; CAMEL_STORE_FOLDER_BODY_INDEX) {</div><div class='del'>-		int flag = O_RDWR|O_CREAT;</div><div class='del'>-		if (forceindex)</div><div class='del'>-			flag |= O_TRUNC;</div><div class='del'>-		lf-&gt;index = (CamelIndex *)camel_text_index_new(lf-&gt;index_path, flag);</div><div class='del'>-		if (lf-&gt;index == NULL) {</div><div class='del'>-			/* yes, this isn't fatal at all */</div><div class='del'>-			g_warning("Could not open/create index file: %s: indexing not performed", strerror(errno));</div><div class='del'>-			forceindex = FALSE;</div><div class='del'>-			/* record that we dont have an index afterall */</div><div class='del'>-			flags &amp;= ~CAMEL_STORE_FOLDER_BODY_INDEX;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* if we do have an index file, remove it (?) */</div><div class='del'>-		if (forceindex == FALSE)</div><div class='del'>-			camel_text_index_remove(lf-&gt;index_path);</div><div class='del'>-		forceindex = FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	lf-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	folder-&gt;summary = (CamelFolderSummary *)CLOCALF_CLASS(lf)-&gt;create_summary(lf-&gt;summary_path, lf-&gt;folder_path, lf-&gt;index);</div><div class='del'>-	if (camel_local_summary_load((CamelLocalSummary *)folder-&gt;summary, forceindex, ex) == -1) {</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/*if (camel_local_summary_check((CamelLocalSummary *)folder-&gt;summary, lf-&gt;changes, ex) == -1) {*/</div><div class='del'>-	/* we sync here so that any hard work setting up the folder isn't lost */</div><div class='del'>-	if (camel_local_summary_sync((CamelLocalSummary *)folder-&gt;summary, FALSE, lf-&gt;changes, ex) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = g_strdup (full_name);</div><div class='del'>-	fi-&gt;name = g_strdup (name);</div><div class='del'>-	fi-&gt;url = g_strdup_printf("%s:%s#%s", ((CamelService *)parent_store)-&gt;url-&gt;protocol, ((CamelService *)parent_store)-&gt;url-&gt;path, full_name);</div><div class='del'>-	fi-&gt;unread_message_count = camel_folder_get_unread_message_count(folder);</div><div class='del'>-	camel_folder_info_build_path(fi, '/');</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT (parent_store), "folder_created", fi);</div><div class='del'>-	camel_folder_info_free(fi);</div><div class='del'>-	</div><div class='del'>-	return lf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* lock the folder, may be called repeatedly (with matching unlock calls),</div><div class='del'>-   with type the same or less than the first call */</div><div class='del'>-int camel_local_folder_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (lf-&gt;locked &gt; 0) {</div><div class='del'>-		/* lets be anal here - its important the code knows what its doing */</div><div class='del'>-		g_assert(lf-&gt;locktype == type || lf-&gt;locktype == CAMEL_LOCK_WRITE);</div><div class='del'>-	} else {</div><div class='del'>-		if (CLOCALF_CLASS(lf)-&gt;lock(lf, type, ex) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		lf-&gt;locktype = type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lf-&gt;locked++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock folder */</div><div class='del'>-int camel_local_folder_unlock(CamelLocalFolder *lf)</div><div class='del'>-{</div><div class='del'>-	g_assert(lf-&gt;locked&gt;0);</div><div class='del'>-	lf-&gt;locked--;</div><div class='del'>-	if (lf-&gt;locked == 0)</div><div class='del'>-		CLOCALF_CLASS(lf)-&gt;unlock(lf);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_unlock(CamelLocalFolder *lf)</div><div class='del'>-{</div><div class='del'>-	/* nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = CAMEL_LOCAL_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	d(printf("local sync, expunge=%s\n", expunge?"true":"false"));</div><div class='del'>-</div><div class='del'>-	if (camel_local_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* if sync fails, we'll pass it up on exit through ex */</div><div class='del'>-	camel_local_summary_sync((CamelLocalSummary *)folder-&gt;summary, expunge, lf-&gt;changes, ex);</div><div class='del'>-	camel_local_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_expunge(CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	d(printf("expunge\n"));</div><div class='del'>-</div><div class='del'>-	/* Just do a sync with expunge, serves the same purpose */</div><div class='del'>-	/* call the callback directly, to avoid locking problems */</div><div class='del'>-	CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))-&gt;sync(folder, TRUE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_rename(CamelFolder *folder, const char *newname)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-</div><div class='del'>-	d(printf("renaming local folder paths to '%s'\n", newname));</div><div class='del'>-</div><div class='del'>-	/* Sync? */</div><div class='del'>-</div><div class='del'>-	g_free(lf-&gt;folder_path);</div><div class='del'>-	g_free(lf-&gt;summary_path);</div><div class='del'>-	g_free(lf-&gt;index_path);</div><div class='del'>-	lf-&gt;folder_path = g_strdup_printf("%s/%s", lf-&gt;base_path, newname);</div><div class='del'>-	lf-&gt;summary_path = g_strdup_printf("%s/%s.ev-summary", lf-&gt;base_path, newname);</div><div class='del'>-	lf-&gt;index_path = g_strdup_printf("%s/%s.ibex", lf-&gt;base_path, newname);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Poke some internals, sigh */</div><div class='del'>-	camel_folder_summary_set_filename(folder-&gt;summary, lf-&gt;summary_path);</div><div class='del'>-	g_free(((CamelLocalSummary *)folder-&gt;summary)-&gt;folder_path);</div><div class='del'>-	((CamelLocalSummary *)folder-&gt;summary)-&gt;folder_path = g_strdup(lf-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	parent_class-&gt;rename(folder, newname);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-local_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	CAMEL_LOCAL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if (local_folder-&gt;search == NULL)</div><div class='del'>-		local_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(local_folder-&gt;search, folder);</div><div class='del'>-	camel_folder_search_set_body_index(local_folder-&gt;search, local_folder-&gt;index);</div><div class='del'>-	summary = camel_folder_get_summary(folder);</div><div class='del'>-	camel_folder_search_set_summary(local_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(local_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOCAL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_free_summary(folder, summary);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-local_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	summary = g_ptr_array_new();</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		info = camel_folder_get_message_info(folder, uids-&gt;pdata[i]);</div><div class='del'>-		if (info)</div><div class='del'>-			g_ptr_array_add(summary, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;len == 0)</div><div class='del'>-		return summary;</div><div class='del'>-</div><div class='del'>-	CAMEL_LOCAL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if (local_folder-&gt;search == NULL)</div><div class='del'>-		local_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(local_folder-&gt;search, folder);</div><div class='del'>-	camel_folder_search_set_body_index(local_folder-&gt;search, local_folder-&gt;index);</div><div class='del'>-	camel_folder_search_set_summary(local_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(local_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOCAL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++)</div><div class='del'>-		camel_folder_free_message_info(folder, summary-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(summary, TRUE);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_search_free(CamelFolder *folder, GPtrArray * result)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *local_folder = CAMEL_LOCAL_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	/* we need to lock this free because of the way search_free_result works */</div><div class='del'>-	/* FIXME: put the lock inside search_free_result */</div><div class='del'>-	CAMEL_LOCAL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result(local_folder-&gt;search, result);</div><div class='del'>-</div><div class='del'>-	CAMEL_LOCAL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h<br/>deleted file mode 100644<br/>index c958bde835..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian (www.ximian.com/).</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_LOCAL_FOLDER_H</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-search.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-#include "camel-lock.h"</div><div class='del'>-</div><div class='del'>-/*  #include "camel-store.h" */</div><div class='del'>-</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_TYPE     (camel_local_folder_get_type ())</div><div class='del'>-#define CAMEL_LOCAL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_LOCAL_FOLDER_TYPE, CamelLocalFolder))</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_FOLDER_TYPE, CamelLocalFolderClass))</div><div class='del'>-#define CAMEL_IS_LOCAL_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolder parent_object;</div><div class='del'>-	struct _CamelLocalFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	guint32 flags;		/* open mode flags */</div><div class='del'>-</div><div class='del'>-	int locked;		/* lock counter */</div><div class='del'>-	CamelLockType locktype;	/* what type of lock we have */</div><div class='del'>-</div><div class='del'>-	char *base_path;	/* base path of the local folder */</div><div class='del'>-	char *folder_path;	/* the path to the folder itself */</div><div class='del'>-	char *summary_path;	/* where the summary lives */</div><div class='del'>-	char *index_path;	/* where the index file lives */</div><div class='del'>-</div><div class='del'>-	CamelIndex *index;	   /* index for this folder */</div><div class='del'>-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */</div><div class='del'>-	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */</div><div class='del'>-} CamelLocalFolder;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-</div><div class='del'>-	/* summary factory, only used at init */</div><div class='del'>-	CamelLocalSummary *(*create_summary)(const char *path, const char *folder, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-	/* Lock the folder for my operations */</div><div class='del'>-	int (*lock)(CamelLocalFolder *, CamelLockType type, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	/* Unlock the folder for my operations */</div><div class='del'>-	void (*unlock)(CamelLocalFolder *);</div><div class='del'>-} CamelLocalFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-/* flags are taken from CAMEL_STORE_FOLDER_* flags */</div><div class='del'>-CamelLocalFolder *camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store,</div><div class='del'>-					       const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_local_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-/* Lock the folder for internal use.  May be called repeatedly */</div><div class='del'>-/* UNIMPLEMENTED */</div><div class='del'>-int camel_local_folder_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);</div><div class='del'>-int camel_local_folder_unlock(CamelLocalFolder *lf);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_LOCAL_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h<br/>deleted file mode 100644<br/>index 4dfe9f635c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *  camel-local-private.h: Private info for local provider.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_PRIVATE_H</div><div class='del'>-#define CAMEL_PRIVATE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* need a way to configure and save this data, if this header is to</div><div class='del'>-   be installed.  For now, dont install it */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelLocalFolderPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *search_lock;	/* for locking the search object */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelLocalFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelLocalFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_LOCAL_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelSpoolFolderPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *search_lock;	/* for locking the search object */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelSpoolFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelSpoolFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c<br/>deleted file mode 100644<br/>index bae68e6aa7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,244 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- * </div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian (www.ximian.com).</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "camel-mbox-store.h"</div><div class='del'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "camel-spool-store.h"</div><div class='del'>-#include "camel-spoold-store.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelProviderConfEntry mh_conf_entries[] = {</div><div class='del'>-	CAMEL_PROVIDER_CONF_DEFAULT_PATH,</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider mh_provider = {</div><div class='del'>-	"mh",</div><div class='del'>-	N_("MH-format mail directories"),</div><div class='del'>-	N_("For storing local mail in MH-like mail directories."),</div><div class='del'>-	"mail",</div><div class='del'>-	CAMEL_PROVIDER_IS_LOCAL,</div><div class='del'>-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,</div><div class='del'>-	mh_conf_entries,</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProviderConfEntry mbox_conf_entries[] = {</div><div class='del'>-	CAMEL_PROVIDER_CONF_DEFAULT_PATH,</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider mbox_provider = {</div><div class='del'>-	"mbox",</div><div class='del'>-	N_("Local delivery"),</div><div class='del'>-	N_("For retrieving local mail from standard mbox formated spools."),</div><div class='del'>-	"mail",</div><div class='del'>-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_LOCAL,</div><div class='del'>-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,</div><div class='del'>-	mbox_conf_entries,</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProviderConfEntry maildir_conf_entries[] = {</div><div class='del'>-	CAMEL_PROVIDER_CONF_DEFAULT_PATH,</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,</div><div class='del'>-	  N_("Apply filters to new messages in INBOX"), "0" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider maildir_provider = {</div><div class='del'>-	"maildir",</div><div class='del'>-	N_("Maildir-format mail directories"),</div><div class='del'>-	N_("For storing local mail in maildir directories."),</div><div class='del'>-	"mail",</div><div class='del'>-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,</div><div class='del'>-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,</div><div class='del'>-	maildir_conf_entries,</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProviderConfEntry spool_conf_entries[] = {</div><div class='del'>-	CAMEL_PROVIDER_CONF_DEFAULT_PATH,</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,</div><div class='del'>-	  N_("Apply filters to new messages in INBOX"), "0" },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider spool_provider = {</div><div class='del'>-	"spool",</div><div class='del'>-	N_("Standard Unix mbox spools"),</div><div class='del'>-	N_("For reading and storing local mail in standard mbox spool files."),</div><div class='del'>-	"mail",</div><div class='del'>-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,</div><div class='del'>-	spool_conf_entries,</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProviderConfEntry spoold_conf_entries[] = {</div><div class='del'>-	CAMEL_PROVIDER_CONF_DEFAULT_PATH,</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider spoold_provider = {</div><div class='del'>-	"spoold",</div><div class='del'>-	N_("Directory tree of mbox files"),</div><div class='del'>-	N_("For accessing mail storedin an external tree of mbox files.\nThis will allow you to directly access pine and elm folders.\nNOTE: This provider is still experimental so ensure you backup any mail folders first."),</div><div class='del'>-	"mail",</div><div class='del'>-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL,</div><div class='del'>-	CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE,</div><div class='del'>-	spoold_conf_entries,</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* build a canonical 'path' */</div><div class='del'>-static char *</div><div class='del'>-make_can_path(char *p, char *o)</div><div class='del'>-{</div><div class='del'>-	char c, last, *start = o;</div><div class='del'>-</div><div class='del'>-	d(printf("canonical '%s' = ", p));</div><div class='del'>-</div><div class='del'>-	last = 0;</div><div class='del'>-	while ((c = *p++)) {</div><div class='del'>-		if (c!='/'</div><div class='del'>-		    || (c=='/' &amp;&amp; last != '/'))</div><div class='del'>-			*o++ = c;</div><div class='del'>-		last = c;</div><div class='del'>-	}</div><div class='del'>-	if (o&gt;start &amp;&amp; o[-1] == '/')</div><div class='del'>-		o[-1] = 0;</div><div class='del'>-	else</div><div class='del'>-		*o = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("'%s'\n", start));</div><div class='del'>-</div><div class='del'>-	return start;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'helper' function for it */</div><div class='del'>-#define get_can_path(p) ((p==NULL)?NULL:(make_can_path((p), alloca(strlen(p)+1))))</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-local_url_hash (const void *v)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u = v;</div><div class='del'>-	guint hash = 0;</div><div class='del'>-</div><div class='del'>-#define ADD_HASH(s) if (s) hash ^= g_str_hash (s);</div><div class='del'>-</div><div class='del'>-	ADD_HASH (u-&gt;protocol);</div><div class='del'>-	ADD_HASH (u-&gt;user);</div><div class='del'>-	ADD_HASH (u-&gt;authmech);</div><div class='del'>-	ADD_HASH (u-&gt;host);</div><div class='del'>-	if (u-&gt;path)</div><div class='del'>-		hash ^= g_str_hash(get_can_path(u-&gt;path));</div><div class='del'>-	ADD_HASH (u-&gt;path);</div><div class='del'>-	ADD_HASH (u-&gt;query);</div><div class='del'>-	hash ^= u-&gt;port;</div><div class='del'>-	</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-check_equal (char *s1, char *s2)</div><div class='del'>-{</div><div class='del'>-	if (s1 == NULL) {</div><div class='del'>-		if (s2 == NULL)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (s2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return strcmp (s1, s2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_url_equal(const void *v, const void *v2)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u1 = v, *u2 = v2;</div><div class='del'>-	char *p1, *p2;</div><div class='del'>-</div><div class='del'>-	p1 = get_can_path(u1-&gt;path);</div><div class='del'>-	p2 = get_can_path(u2-&gt;path);</div><div class='del'>-	return check_equal(p1, p2)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;protocol, u2-&gt;protocol)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;user, u2-&gt;user)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;authmech, u2-&gt;authmech)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;host, u2-&gt;host)</div><div class='del'>-		&amp;&amp; check_equal(u1-&gt;query, u2-&gt;query)</div><div class='del'>-		&amp;&amp; u1-&gt;port == u2-&gt;port;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_provider_module_init(CamelSession * session)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	</div><div class='del'>-	mh_conf_entries[0].value = "";  /* default path */</div><div class='del'>-	mh_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mh_store_get_type ();</div><div class='del'>-	mh_provider.url_hash = local_url_hash;</div><div class='del'>-	mh_provider.url_equal = local_url_equal;</div><div class='del'>-	camel_session_register_provider(session, &amp;mh_provider);</div><div class='del'>-	</div><div class='del'>-	if (!(path = getenv ("MAIL")))</div><div class='del'>-		path = g_strdup_printf (SYSTEM_MAIL_DIR "/%s", g_get_user_name ());</div><div class='del'>-	mbox_conf_entries[0].value = path;  /* default path */</div><div class='del'>-	mbox_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mbox_store_get_type ();</div><div class='del'>-	mbox_provider.url_hash = local_url_hash;</div><div class='del'>-	mbox_provider.url_equal = local_url_equal;</div><div class='del'>-	camel_session_register_provider(session, &amp;mbox_provider);</div><div class='del'>-	</div><div class='del'>-	spool_conf_entries[0].value = path;  /* default path - same as mbox */</div><div class='del'>-	spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type ();</div><div class='del'>-	spool_provider.url_hash = local_url_hash;</div><div class='del'>-	spool_provider.url_equal = local_url_equal;</div><div class='del'>-	camel_session_register_provider(session, &amp;spool_provider);</div><div class='del'>-	</div><div class='del'>-	path = getenv ("MAILDIR");</div><div class='del'>-	maildir_conf_entries[0].value = path ? path : "";  /* default path */</div><div class='del'>-	maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type ();</div><div class='del'>-	maildir_provider.url_hash = local_url_hash;</div><div class='del'>-	maildir_provider.url_equal = local_url_equal;</div><div class='del'>-	camel_session_register_provider(session, &amp;maildir_provider);</div><div class='del'>-	</div><div class='del'>-	path = g_strdup_printf ("%s/mail", g_get_home_dir ());</div><div class='del'>-	spoold_conf_entries[0].value = path;  /* default path */</div><div class='del'>-	spoold_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spoold_store_get_type ();</div><div class='del'>-	spoold_provider.url_hash = local_url_hash;</div><div class='del'>-	spoold_provider.url_equal = local_url_equal;</div><div class='del'>-	camel_session_register_provider(session, &amp;spoold_provider);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c<br/>deleted file mode 100644<br/>index a0d3708346..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,409 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#include "camel-local-store.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-#include "camel-local-folder.h"</div><div class='del'>-#include &lt;camel/camel-text-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelLocalStore */</div><div class='del'>-#define CLOCALS_CLASS(so) CAMEL_LOCAL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex);</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static char *get_name(CamelService *service, gboolean brief);</div><div class='del'>-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *create_folder(CamelStore *store, const char *parent_name, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_store_class_init (CamelLocalStoreClass *camel_local_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_local_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_local_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_inbox = get_inbox;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;create_folder = create_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_store_finalize (CamelLocalStore *local_store)</div><div class='del'>-{</div><div class='del'>-	if (local_store-&gt;toplevel_dir)</div><div class='del'>-		g_free (local_store-&gt;toplevel_dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_local_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_local_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_local_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_local_store_type = camel_type_register (CAMEL_STORE_TYPE, "CamelLocalStore",</div><div class='del'>-							     sizeof (CamelLocalStore),</div><div class='del'>-							     sizeof (CamelLocalStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_local_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectFinalizeFunc) camel_local_store_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_local_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalStore *local_store = CAMEL_LOCAL_STORE (service);</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	len = strlen (service-&gt;url-&gt;path);</div><div class='del'>-	if (service-&gt;url-&gt;path[len - 1] != '/')</div><div class='del'>-		local_store-&gt;toplevel_dir = g_strdup_printf ("%s/", service-&gt;url-&gt;path);</div><div class='del'>-	else</div><div class='del'>-		local_store-&gt;toplevel_dir = g_strdup (service-&gt;url-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_local_store_get_toplevel_dir (CamelLocalStore *store)</div><div class='del'>-{</div><div class='del'>-	return store-&gt;toplevel_dir;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *path = ((CamelLocalStore *)store)-&gt;toplevel_dir;</div><div class='del'>-	char *sub, *slash;</div><div class='del'>-</div><div class='del'>-	if (path[0] != '/') {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Store root %s is not an absolute path"), path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stat(path, &amp;st) == 0) {</div><div class='del'>-		if (!S_ISDIR(st.st_mode)) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Store root %s is not a regular directory"), path);</div><div class='del'>-		}</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (errno != ENOENT</div><div class='del'>-	    || (flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot get folder: %s: %s"), path, strerror(errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* need to create the dir heirarchy */</div><div class='del'>-	sub = alloca(strlen(path)+1);</div><div class='del'>-	strcpy(sub, path);</div><div class='del'>-	slash = sub;</div><div class='del'>-	do {</div><div class='del'>-		slash = strchr(slash+1, '/');</div><div class='del'>-		if (slash)</div><div class='del'>-			*slash = 0;</div><div class='del'>-		if (stat(sub, &amp;st) == -1) {</div><div class='del'>-			if (errno != ENOENT</div><div class='del'>-			    || mkdir(sub, 0700) == -1) {</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-						     _("Cannot get folder: %s: %s"), path, strerror(errno));</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (slash)</div><div class='del'>-			*slash = '/';</div><div class='del'>-	} while (slash);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_inbox(CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_set(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-			    _("Local stores do not have an inbox"));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	char *dir = ((CamelLocalStore*)service)-&gt;toplevel_dir;</div><div class='del'>-</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (dir);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("Local mail file %s"), dir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: This is broken, but it corresponds to what was</div><div class='del'>-	 * there before.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	d(printf("-- LOCAL STRE -- get folder info: %s\n", top));</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-create_folder(CamelStore *store, const char *parent_name, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path = ((CamelLocalStore *)store)-&gt;toplevel_dir;</div><div class='del'>-	char *name;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolderInfo *info = NULL;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	/* This is a pretty hacky version of create folder, but should basically work */</div><div class='del'>-</div><div class='del'>-	/* FIXME: The strings here are funny because of string freeze */</div><div class='del'>-</div><div class='del'>-	if (path[0] != '/') {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Store root %s is not an absolute path"), path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s/%s/%s", path, parent_name, folder_name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == 0 || errno != ENOENT) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Cannot get folder: %s: %s"), name, strerror(errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s/%s", parent_name, folder_name);</div><div class='del'>-</div><div class='del'>-	folder = ((CamelStoreClass *)((CamelObject *)store)-&gt;klass)-&gt;get_folder(store, name, CAMEL_STORE_FOLDER_CREATE, ex);</div><div class='del'>-	if (folder) {</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-		info = ((CamelStoreClass *)((CamelObject *)store)-&gt;klass)-&gt;get_folder_info(store, name, 0, ex);</div><div class='del'>-</div><div class='del'>-		/* get_folder(CREATE) will emit a folder_created event for us */</div><div class='del'>-		/*if (info)</div><div class='del'>-		  camel_object_trigger_event((CamelObject *)store, "folder_created", info);*/</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, int missingok, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *old = g_strconcat(prefix, oldp, suffix, 0);</div><div class='del'>-	char *new = g_strconcat(prefix, newp, suffix, 0);</div><div class='del'>-	int ret = -1;</div><div class='del'>-	int err = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("renaming %s%s to %s%s\n", oldp, suffix, newp, suffix));</div><div class='del'>-</div><div class='del'>-	if (stat(old, &amp;st) == -1) {</div><div class='del'>-		if (missingok &amp;&amp; errno == ENOENT) {</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			err = errno;</div><div class='del'>-			ret = -1;</div><div class='del'>-		}</div><div class='del'>-	} else if (S_ISDIR(st.st_mode)) { /* use rename for dirs */</div><div class='del'>-		if (rename(old, new) == 0</div><div class='del'>-		    || stat(new, &amp;st) == 0) {</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			err = errno;</div><div class='del'>-			ret = -1;</div><div class='del'>-		}</div><div class='del'>-	} else if (link(old, new) == 0 /* and link for files */</div><div class='del'>-		   || (stat(new, &amp;st) == 0 &amp;&amp; st.st_nlink == 2)) {</div><div class='del'>-		if (unlink(old) == 0) {</div><div class='del'>-			ret = 0;</div><div class='del'>-		} else {</div><div class='del'>-			err = errno;</div><div class='del'>-			unlink(new);</div><div class='del'>-			ret = -1;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		err = errno;</div><div class='del'>-		ret = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not rename folder %s to %s: %s"),</div><div class='del'>-				     old, new, strerror(err));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(old);</div><div class='del'>-	g_free(new);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default implementation, rename all */</div><div class='del'>-static void</div><div class='del'>-rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path = CAMEL_LOCAL_STORE (store)-&gt;toplevel_dir;</div><div class='del'>-	CamelLocalFolder *folder;</div><div class='del'>-	char *newibex = g_strdup_printf("%s%s.ibex", path, new);</div><div class='del'>-	char *oldibex = g_strdup_printf("%s%s.ibex", path, old);</div><div class='del'>-</div><div class='del'>-	/* try to rollback failures, has obvious races */</div><div class='del'>-</div><div class='del'>-	d(printf("local rename folder '%s' '%s'\n", old, new));</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	folder = g_hash_table_lookup(store-&gt;folders, old);</div><div class='del'>-	if (folder &amp;&amp; folder-&gt;index) {</div><div class='del'>-		if (camel_index_rename(folder-&gt;index, newibex) == -1)</div><div class='del'>-			goto ibex_failed;</div><div class='del'>-	} else {</div><div class='del'>-		/* TODO: camel_text_index_rename should find out if we have an active index itself? */</div><div class='del'>-		if (camel_text_index_rename(oldibex, newibex) == -1)</div><div class='del'>-			goto ibex_failed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xrename(old, new, path, ".ev-summary", TRUE, ex))</div><div class='del'>-		goto summary_failed;</div><div class='del'>-</div><div class='del'>-	if (xrename(old, new, path, "", FALSE, ex))</div><div class='del'>-		goto base_failed;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-	g_free(newibex);</div><div class='del'>-	g_free(oldibex);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-base_failed:</div><div class='del'>-	xrename(new, old, path, ".ev-summary", TRUE, ex);</div><div class='del'>-</div><div class='del'>-summary_failed:</div><div class='del'>-	if (folder) {</div><div class='del'>-		if (folder-&gt;index)</div><div class='del'>-			camel_index_rename(folder-&gt;index, oldibex);</div><div class='del'>-	} else</div><div class='del'>-		camel_text_index_rename(newibex, oldibex);</div><div class='del'>-ibex_failed:</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Could not rename '%s': %s"),</div><div class='del'>-			     old, strerror(errno));</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-	g_free(newibex);</div><div class='del'>-	g_free(oldibex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default implementation, only delete metadata */</div><div class='del'>-static void</div><div class='del'>-delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	char *name;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	/* remove metadata only */</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-	str = g_strdup_printf("%s.ev-summary", name);</div><div class='del'>-	if (unlink(str) == -1 &amp;&amp; errno != ENOENT) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not delete folder summary file `%s': %s"),</div><div class='del'>-				     str, strerror(errno));</div><div class='del'>-		g_free(str);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free(str);</div><div class='del'>-	str = g_strdup_printf("%s.ibex", name);</div><div class='del'>-	if (camel_text_index_remove(str) == -1 &amp;&amp; errno != ENOENT) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not delete folder index file `%s': %s"),</div><div class='del'>-				     str, strerror(errno));</div><div class='del'>-		g_free(str);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free(str);</div><div class='del'>-	g_free(name);</div><div class='del'>-	</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = g_strdup (folder_name);</div><div class='del'>-	fi-&gt;name = g_strdup (g_basename (folder_name));</div><div class='del'>-	fi-&gt;url = g_strdup_printf ("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-	fi-&gt;unread_message_count = -1;</div><div class='del'>-	camel_folder_info_build_path(fi, '/');</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (store),</div><div class='del'>-				    "folder_deleted", fi);</div><div class='del'>-	</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h<br/>deleted file mode 100644<br/>index 21d854c562..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mbox-store.h : class for an mbox store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_LOCAL_STORE_H</div><div class='del'>-#define CAMEL_LOCAL_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_LOCAL_STORE_TYPE     (camel_local_store_get_type ())</div><div class='del'>-#define CAMEL_LOCAL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_LOCAL_STORE_TYPE, CamelLocalStore))</div><div class='del'>-#define CAMEL_LOCAL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_STORE_TYPE, CamelLocalStoreClass))</div><div class='del'>-#define CAMEL_IS_LOCAL_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;	</div><div class='del'>-	char *toplevel_dir;</div><div class='del'>-	</div><div class='del'>-} CamelLocalStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelLocalStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_local_store_get_type (void);</div><div class='del'>-</div><div class='del'>-const gchar *camel_local_store_get_toplevel_dir (CamelLocalStore *store);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_LOCAL_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c<br/>deleted file mode 100644<br/>index eae265d5a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,583 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-stream-null.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-#define io(x)</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_LOCAL_SUMMARY_VERSION (0x200)</div><div class='del'>-</div><div class='del'>-struct _CamelLocalSummaryPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelLocalSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-</div><div class='del'>-static int local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi);</div><div class='del'>-static char *local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-static int local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-static int local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static int local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static CamelMessageInfo *local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_local_summary_class_init (CamelLocalSummaryClass *klass);</div><div class='del'>-static void camel_local_summary_init       (CamelLocalSummary *obj);</div><div class='del'>-static void camel_local_summary_finalise   (CamelObject *obj);</div><div class='del'>-static CamelFolderSummaryClass *camel_local_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_local_summary_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_folder_summary_get_type(), "CamelLocalSummary",</div><div class='del'>-					   sizeof (CamelLocalSummary),</div><div class='del'>-					   sizeof (CamelLocalSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_local_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_local_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_local_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_summary_class_init(CamelLocalSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_local_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	sklass-&gt;message_info_new  = message_info_new;</div><div class='del'>-</div><div class='del'>-	klass-&gt;load = local_summary_load;</div><div class='del'>-	klass-&gt;check = local_summary_check;</div><div class='del'>-	klass-&gt;sync = local_summary_sync;</div><div class='del'>-	klass-&gt;add = local_summary_add;</div><div class='del'>-</div><div class='del'>-	klass-&gt;encode_x_evolution = local_summary_encode_x_evolution;</div><div class='del'>-	klass-&gt;decode_x_evolution = local_summary_decode_x_evolution;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_summary_init(CamelLocalSummary *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelLocalSummaryPrivate *p;</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_LOCAL_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_local_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelLocalSummary *mbs = CAMEL_LOCAL_SUMMARY(obj);</div><div class='del'>-</div><div class='del'>-	if (mbs-&gt;index)</div><div class='del'>-		camel_object_unref((CamelObject *)mbs-&gt;index);</div><div class='del'>-	g_free(mbs-&gt;folder_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_local_summary_construct(CamelLocalSummary *new, const char *filename, const char *local_name, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	camel_folder_summary_set_build_content(CAMEL_FOLDER_SUMMARY(new), FALSE);</div><div class='del'>-	camel_folder_summary_set_filename(CAMEL_FOLDER_SUMMARY(new), filename);</div><div class='del'>-	new-&gt;folder_path = g_strdup(local_name);</div><div class='del'>-	new-&gt;index = index;</div><div class='del'>-	if (index)</div><div class='del'>-		camel_object_ref((CamelObject *)index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return camel_folder_summary_load((CamelFolderSummary *)cls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int</div><div class='del'>-camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-</div><div class='del'>-	d(printf("Loading summary ...\n"));</div><div class='del'>-</div><div class='del'>-	if (forceindex</div><div class='del'>-	    || stat(s-&gt;summary_path, &amp;st) == -1</div><div class='del'>-	    || ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;load(cls, forceindex, ex) == -1) {</div><div class='del'>-		w(g_warning("Could not load summary: flags may be reset"));</div><div class='del'>-		camel_folder_summary_clear((CamelFolderSummary *)cls);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;encode_x_evolution(cls, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;decode_x_evolution(cls, xev, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*#define DOSTATS*/</div><div class='del'>-#ifdef DOSTATS</div><div class='del'>-struct _stat_info {</div><div class='del'>-	int mitotal;</div><div class='del'>-	int micount;</div><div class='del'>-	int citotal;</div><div class='del'>-	int cicount;</div><div class='del'>-	int msgid;</div><div class='del'>-	int msgcount;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_stat_ci(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageContentInfo *ci)</div><div class='del'>-{</div><div class='del'>-	info-&gt;cicount++;</div><div class='del'>-	info-&gt;citotal += ((CamelFolderSummary *)cls)-&gt;content_info_size /*+ 4 memchunks are 1/4 byte overhead per mi */;</div><div class='del'>-	if (ci-&gt;id)</div><div class='del'>-		info-&gt;citotal += strlen(ci-&gt;id) + 4;</div><div class='del'>-	if (ci-&gt;description)</div><div class='del'>-		info-&gt;citotal += strlen(ci-&gt;description) + 4;</div><div class='del'>-	if (ci-&gt;encoding)</div><div class='del'>-		info-&gt;citotal += strlen(ci-&gt;encoding) + 4;</div><div class='del'>-	if (ci-&gt;type) {</div><div class='del'>-		struct _header_content_type *ct = ci-&gt;type;</div><div class='del'>-		struct _header_param *param;</div><div class='del'>-</div><div class='del'>-		info-&gt;citotal += sizeof(*ct) + 4;</div><div class='del'>-		if (ct-&gt;type)</div><div class='del'>-			info-&gt;citotal += strlen(ct-&gt;type) + 4;</div><div class='del'>-		if (ct-&gt;subtype)</div><div class='del'>-			info-&gt;citotal += strlen(ct-&gt;subtype) + 4;</div><div class='del'>-		param = ct-&gt;params;</div><div class='del'>-		while (param) {</div><div class='del'>-			info-&gt;citotal += sizeof(*param) + 4;</div><div class='del'>-			if (param-&gt;name)</div><div class='del'>-				info-&gt;citotal += strlen(param-&gt;name)+4;</div><div class='del'>-			if (param-&gt;value)</div><div class='del'>-				info-&gt;citotal += strlen(param-&gt;value)+4;</div><div class='del'>-			param = param-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ci = ci-&gt;childs;</div><div class='del'>-	while (ci) {</div><div class='del'>-		do_stat_ci(cls, info, ci);</div><div class='del'>-		ci = ci-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_stat_mi(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	info-&gt;micount++;</div><div class='del'>-	info-&gt;mitotal += ((CamelFolderSummary *)cls)-&gt;content_info_size /*+ 4*/;</div><div class='del'>-</div><div class='del'>-	if (mi-&gt;subject)</div><div class='del'>-		info-&gt;mitotal += strlen(mi-&gt;subject) + 4;</div><div class='del'>-	if (mi-&gt;to)</div><div class='del'>-		info-&gt;mitotal += strlen(mi-&gt;to) + 4;</div><div class='del'>-	if (mi-&gt;from)</div><div class='del'>-		info-&gt;mitotal += strlen(mi-&gt;from) + 4;</div><div class='del'>-	if (mi-&gt;cc)</div><div class='del'>-		info-&gt;mitotal += strlen(mi-&gt;cc) + 4;</div><div class='del'>-	if (mi-&gt;uid)</div><div class='del'>-		info-&gt;mitotal += strlen(mi-&gt;uid) + 4;</div><div class='del'>-</div><div class='del'>-	if (mi-&gt;references) {</div><div class='del'>-		info-&gt;mitotal += (mi-&gt;references-&gt;size-1) * sizeof(CamelSummaryMessageID) + sizeof(CamelSummaryReferences) + 4;</div><div class='del'>-		info-&gt;msgid += (mi-&gt;references-&gt;size) * sizeof(CamelSummaryMessageID);</div><div class='del'>-		info-&gt;msgcount += mi-&gt;references-&gt;size;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* dont have any user flags yet */</div><div class='del'>-</div><div class='del'>-	if (mi-&gt;content) {</div><div class='del'>-		do_stat_ci(cls, info, mi-&gt;content);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;check(cls, changeinfo, ex);</div><div class='del'>-</div><div class='del'>-#ifdef DOSTATS</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		int i;</div><div class='del'>-		CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-		struct _stat_info stats = { 0 };</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;camel_folder_summary_count(s);i++) {</div><div class='del'>-			CamelMessageInfo *info = camel_folder_summary_index(s, i);</div><div class='del'>-			do_stat_mi(cls, &amp;stats, info);</div><div class='del'>-			camel_folder_summary_info_free(s, info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printf("\nMemory used by summary:\n\n");</div><div class='del'>-		printf("Total of %d messages\n", camel_folder_summary_count(s)); </div><div class='del'>-		printf("Total: %d bytes (ave %f)\n", stats.citotal + stats.mitotal,</div><div class='del'>-		       (double)(stats.citotal+stats.mitotal)/(double)camel_folder_summary_count(s));</div><div class='del'>-		printf("Message Info: %d (ave %f)\n", stats.mitotal, (double)stats.mitotal/(double)stats.micount);</div><div class='del'>-		printf("Content Info; %d (ave %f) count %d\n", stats.citotal, (double)stats.citotal/(double)stats.cicount, stats.cicount);</div><div class='del'>-		printf("message id's: %d (ave %f) count %d\n", stats.msgid, (double)stats.msgid/(double)stats.msgcount, stats.msgcount);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;sync(cls, expunge, changeinfo, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;add(cls, msg, info, ci, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_local_summary_write_headers:</div><div class='del'>- * @fd: </div><div class='del'>- * @header: </div><div class='del'>- * @xevline: </div><div class='del'>- * </div><div class='del'>- * Write a bunch of headers to the file @fd.  IF xevline is non NULL, then</div><div class='del'>- * an X-Evolution header line is created at the end of all of the headers.</div><div class='del'>- * The headers written are termianted with a blank line.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error, otherwise the number of bytes written.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_local_summary_write_headers(int fd, struct _header_raw *header, char *xevline)</div><div class='del'>-{</div><div class='del'>-	int outlen = 0, len;</div><div class='del'>-	int newfd;</div><div class='del'>-	FILE *out;</div><div class='del'>-</div><div class='del'>-	/* dum de dum, maybe the whole sync function should just use stdio for output */</div><div class='del'>-	newfd = dup(fd);</div><div class='del'>-	if (newfd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	out = fdopen(newfd, "w");</div><div class='del'>-	if (out == NULL) {</div><div class='del'>-		close(newfd);</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (header) {</div><div class='del'>-		if (strcmp(header-&gt;name, "X-Evolution")) {</div><div class='del'>-			len = fprintf(out, "%s:%s\n", header-&gt;name, header-&gt;value);</div><div class='del'>-			if (len == -1) {</div><div class='del'>-				fclose(out);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			outlen += len;</div><div class='del'>-		}</div><div class='del'>-		header = header-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xevline) {</div><div class='del'>-		len = fprintf(out, "X-Evolution: %s\n\n", xevline);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			fclose(out);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		outlen += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fclose(out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return outlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: sync index here ? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	ret = camel_folder_summary_save((CamelFolderSummary *)cls);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not save summary: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		g_warning("Could not save summary for %s: %s", cls-&gt;folder_path, strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cls-&gt;index &amp;&amp; camel_index_sync(cls-&gt;index) == -1)</div><div class='del'>-		g_warning("Could not sync index for %s: %s", cls-&gt;folder_path, strerror(errno));</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *xev;</div><div class='del'>-</div><div class='del'>-	d(printf("Adding message to summary\n"));</div><div class='del'>-	</div><div class='del'>-	mi = camel_folder_summary_add_from_message((CamelFolderSummary *)cls, msg);</div><div class='del'>-	if (mi) {</div><div class='del'>-		d(printf("Added, uid = %s\n", mi-&gt;uid));</div><div class='del'>-		if (info) {</div><div class='del'>-			CamelTag *tag = info-&gt;user_tags;</div><div class='del'>-			CamelFlag *flag = info-&gt;user_flags;</div><div class='del'>-</div><div class='del'>-			while (flag) {</div><div class='del'>-				camel_flag_set(&amp;mi-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			while (tag) {</div><div class='del'>-				camel_tag_set(&amp;mi-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-				tag = tag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mi-&gt;flags = mi-&gt;flags | (info-&gt;flags &amp; 0xffff);</div><div class='del'>-			if (info-&gt;size)</div><div class='del'>-				mi-&gt;size = info-&gt;size;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we need to calculate the size ourselves */</div><div class='del'>-		if (mi-&gt;size == 0) {</div><div class='del'>-			CamelStreamNull *sn = (CamelStreamNull *)camel_stream_null_new();</div><div class='del'>-</div><div class='del'>-			camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, (CamelStream *)sn);</div><div class='del'>-			mi-&gt;size = sn-&gt;written;</div><div class='del'>-			camel_object_unref((CamelObject *)sn);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mi-&gt;flags &amp;= ~(CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED);</div><div class='del'>-		xev = camel_local_summary_encode_x_evolution(cls, mi);</div><div class='del'>-		camel_medium_set_header((CamelMedium *)msg, "X-Evolution", xev);</div><div class='del'>-		g_free(xev);</div><div class='del'>-		camel_folder_change_info_add_uid(ci, camel_message_info_uid(mi));</div><div class='del'>-	} else {</div><div class='del'>-		d(printf("Failed!\n"));</div><div class='del'>-		camel_exception_set(ex, 1, _("Unable to add message to summary: unknown reason"));</div><div class='del'>-	}</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-	struct _header_param *params = NULL;</div><div class='del'>-	GString *val = g_string_new("");</div><div class='del'>-	CamelFlag *flag = mi-&gt;user_flags;</div><div class='del'>-	CamelTag *tag = mi-&gt;user_tags;</div><div class='del'>-	char *ret;</div><div class='del'>-	const char *p, *uidstr;</div><div class='del'>-	guint32 uid;</div><div class='del'>-</div><div class='del'>-	/* FIXME: work out what to do with uid's that aren't stored here? */</div><div class='del'>-	/* FIXME: perhaps make that a mbox folder only issue?? */</div><div class='del'>-	p = uidstr = camel_message_info_uid(mi);</div><div class='del'>-	while (*p &amp;&amp; isdigit(*p))</div><div class='del'>-		p++;</div><div class='del'>-	if (*p == 0 &amp;&amp; sscanf(uidstr, "%u", &amp;uid) == 1) {</div><div class='del'>-		g_string_sprintf(out, "%08x-%04x", uid, mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	} else {</div><div class='del'>-		g_string_sprintf(out, "%s-%04x", uidstr, mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flag || tag) {</div><div class='del'>-		val = g_string_new("");</div><div class='del'>-</div><div class='del'>-		if (flag) {</div><div class='del'>-			while (flag) {</div><div class='del'>-				g_string_append(val, flag-&gt;name);</div><div class='del'>-				if (flag-&gt;next)</div><div class='del'>-					g_string_append_c(val, ',');</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			header_set_param(&amp;params, "flags", val-&gt;str);</div><div class='del'>-			g_string_truncate(val, 0);</div><div class='del'>-		}</div><div class='del'>-		if (tag) {</div><div class='del'>-			while (tag) {</div><div class='del'>-				g_string_append(val, tag-&gt;name);</div><div class='del'>-				g_string_append_c(val, '=');</div><div class='del'>-				g_string_append(val, tag-&gt;value);</div><div class='del'>-				if (tag-&gt;next)</div><div class='del'>-					g_string_append_c(val, ',');</div><div class='del'>-				tag = tag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			header_set_param(&amp;params, "tags", val-&gt;str);</div><div class='del'>-		}</div><div class='del'>-		g_string_free(val, TRUE);</div><div class='del'>-		header_param_list_format_append(out, params);</div><div class='del'>-		header_param_list_free(params);</div><div class='del'>-	}</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *params, *scan;</div><div class='del'>-	guint32 uid, flags;</div><div class='del'>-	char *header;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* check for uid/flags */</div><div class='del'>-	header = header_token_decode(xev);</div><div class='del'>-	if (header &amp;&amp; strlen(header) == strlen("00000000-0000")</div><div class='del'>-	    &amp;&amp; sscanf(header, "%08x-%04x", &amp;uid, &amp;flags) == 2) {</div><div class='del'>-		char uidstr[20];</div><div class='del'>-		if (mi) {</div><div class='del'>-			sprintf(uidstr, "%u", uid);</div><div class='del'>-			camel_message_info_set_uid(mi, g_strdup(uidstr));</div><div class='del'>-			mi-&gt;flags = flags;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_free(header);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free(header);</div><div class='del'>-</div><div class='del'>-	if (mi == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check for additional data */	</div><div class='del'>-	header = strchr(xev, ';');</div><div class='del'>-	if (header) {</div><div class='del'>-		params = header_param_list_decode(header+1);</div><div class='del'>-		scan = params;</div><div class='del'>-		while (scan) {</div><div class='del'>-			if (!strcasecmp(scan-&gt;name, "flags")) {</div><div class='del'>-				char **flagv = g_strsplit(scan-&gt;value, ",", 1000);</div><div class='del'>-</div><div class='del'>-				for (i=0;flagv[i];i++) {</div><div class='del'>-					camel_flag_set(&amp;mi-&gt;user_flags, flagv[i], TRUE);</div><div class='del'>-				}</div><div class='del'>-				g_strfreev(flagv);</div><div class='del'>-			} else if (!strcasecmp(scan-&gt;name, "tags")) {</div><div class='del'>-				char **tagv = g_strsplit(scan-&gt;value, ",", 10000);</div><div class='del'>-				char *val;</div><div class='del'>-</div><div class='del'>-				for (i=0;tagv[i];i++) {</div><div class='del'>-					val = strchr(tagv[i], '=');</div><div class='del'>-					if (val) {</div><div class='del'>-						*val++ = 0;</div><div class='del'>-						camel_tag_set(&amp;mi-&gt;user_tags, tagv[i], val);</div><div class='del'>-						val[-1]='=';</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				g_strfreev(tagv);</div><div class='del'>-			}</div><div class='del'>-			scan = scan-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		header_param_list_free(params);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelLocalSummary *cls = (CamelLocalSummary *)s;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_local_summary_parent)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		const char *xev;</div><div class='del'>-		int doindex = FALSE;</div><div class='del'>-</div><div class='del'>-		xev = header_raw_find(&amp;h, "X-Evolution", NULL);</div><div class='del'>-		if (xev==NULL || camel_local_summary_decode_x_evolution(cls, xev, mi) == -1) {</div><div class='del'>-			/* to indicate it has no xev header */</div><div class='del'>-			mi-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV;</div><div class='del'>-			camel_message_info_set_uid(mi, camel_folder_summary_next_uid_string(s));</div><div class='del'>-</div><div class='del'>-			/* shortcut, no need to look it up in the index library */</div><div class='del'>-			doindex = TRUE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (cls-&gt;index</div><div class='del'>-		    &amp;&amp; (doindex</div><div class='del'>-			|| cls-&gt;index_force</div><div class='del'>-			|| !camel_index_has_name(cls-&gt;index, camel_message_info_uid(mi)))) {</div><div class='del'>-			d(printf("Am indexing message %s\n", camel_message_info_uid(mi)));</div><div class='del'>-			camel_folder_summary_set_index(s, cls-&gt;index);</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("Not indexing message %s\n", camel_message_info_uid(mi)));</div><div class='del'>-			camel_folder_summary_set_index(s, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h<br/>deleted file mode 100644<br/>index d1153fa8c6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-local-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-local-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_LOCAL_SUMMARY_H</div><div class='del'>-#define _CAMEL_LOCAL_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_LOCAL_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_local_summary_get_type (), CamelLocalSummary)</div><div class='del'>-#define CAMEL_LOCAL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_local_summary_get_type (), CamelLocalSummaryClass)</div><div class='del'>-#define CAMEL_IS_LOCAL_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_local_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelLocalSummary      CamelLocalSummary;</div><div class='del'>-typedef struct _CamelLocalSummaryClass CamelLocalSummaryClass;</div><div class='del'>-</div><div class='del'>-/* extra summary flags */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_NOXEV = 1&lt;&lt;17,</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_XEVCHANGE = 1&lt;&lt;18,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelLocalSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelLocalSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *folder_path;	/* name of matching folder */</div><div class='del'>-</div><div class='del'>-	CamelIndex *index;</div><div class='del'>-	int index_force;	/* do we force index during creation? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelLocalSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-	int (*load)(CamelLocalSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-	int (*check)(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-	int (*sync)(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-	CamelMessageInfo *(*add)(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	char *(*encode_x_evolution)(CamelLocalSummary *cls, const CamelMessageInfo *info);</div><div class='del'>-	int (*decode_x_evolution)(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	camel_local_summary_get_type	(void);</div><div class='del'>-void	camel_local_summary_construct	(CamelLocalSummary *new, const char *filename, const char *local_name, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-/* check for new/removed messages */</div><div class='del'>-int camel_local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* perform a folder sync or expunge, if needed */</div><div class='del'>-int camel_local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* add a new message to the summary */</div><div class='del'>-CamelMessageInfo *camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* generate an X-Evolution header line */</div><div class='del'>-char *camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *info);</div><div class='del'>-int camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-/* utility functions - write headers to a file with optional X-Evolution header */</div><div class='del'>-int camel_local_summary_write_headers(int fd, struct _header_raw *header, char *xevline);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_LOCAL_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c<br/>deleted file mode 100644<br/>index 05fdd70e10..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,245 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-maildir-folder.h"</div><div class='del'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-maildir-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-static CamelLocalFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMaildirFolder */</div><div class='del'>-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMAILDIRS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelLocalSummary *maildir_create_summary(const char *path, const char *folder, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-static void maildir_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, char **appended_uid, CamelException * ex);</div><div class='del'>-static CamelMimeMessage *maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static void maildir_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void camel_maildir_folder_class_init(CamelObjectClass * camel_maildir_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_maildir_folder_class);</div><div class='del'>-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_maildir_folder_class;</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_LOCAL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_local_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;append_message = maildir_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_message = maildir_get_message;</div><div class='del'>-</div><div class='del'>-	lclass-&gt;create_summary = maildir_create_summary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void maildir_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	/*CamelFolder *folder = object;</div><div class='del'>-	  CamelMaildirFolder *maildir_folder = object;*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void maildir_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	/*CamelMaildirFolder *maildir_folder = CAMEL_MAILDIR_FOLDER(object);*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_maildir_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_maildir_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_maildir_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_maildir_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMaildirFolder",</div><div class='del'>-							   sizeof(CamelMaildirFolder),</div><div class='del'>-							   sizeof(CamelMaildirFolderClass),</div><div class='del'>-							   (CamelObjectClassInitFunc) camel_maildir_folder_class_init,</div><div class='del'>-							   NULL,</div><div class='del'>-							   (CamelObjectInitFunc) maildir_init,</div><div class='del'>-							   (CamelObjectFinalizeFunc) maildir_finalize);</div><div class='del'>-	}</div><div class='del'>- </div><div class='del'>-	return camel_maildir_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("Creating maildir folder: %s\n", full_name));</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)camel_object_new(CAMEL_MAILDIR_FOLDER_TYPE);</div><div class='del'>-</div><div class='del'>-	if (parent_store-&gt;flags &amp; CAMEL_STORE_FILTER_INBOX</div><div class='del'>-	    &amp;&amp; strcmp(full_name, ".") == 0)</div><div class='del'>-		folder-&gt;folder_flags |= CAMEL_FOLDER_FILTER_RECENT;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,</div><div class='del'>-							     parent_store, full_name, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelLocalSummary *maildir_create_summary(const char *path, const char *folder, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	return (CamelLocalSummary *)camel_maildir_summary_new(path, folder, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirFolder *maildir_folder = (CamelMaildirFolder *)folder;</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelStream *output_stream;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMaildirMessageInfo *mdi;</div><div class='del'>-	char *name, *dest = NULL;</div><div class='del'>-	</div><div class='del'>-	d(printf("Appending message\n"));</div><div class='del'>-</div><div class='del'>-	/* add it to the summary/assign the uid, etc */</div><div class='del'>-	mi = camel_local_summary_add((CamelLocalSummary *)folder-&gt;summary, message, info, lf-&gt;changes, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	mdi = (CamelMaildirMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message: uid is %s filename is %s\n", camel_message_info_uid(mi), mdi-&gt;filename));</div><div class='del'>-</div><div class='del'>-	/* write it out to tmp, use the uid we got from the summary */</div><div class='del'>-	name = g_strdup_printf ("%s/tmp/%s", lf-&gt;folder_path, camel_message_info_uid(mi));</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name (name, O_WRONLY|O_CREAT, 0600);</div><div class='del'>-	if (output_stream == NULL)</div><div class='del'>-		goto fail_write;</div><div class='del'>-	</div><div class='del'>-	if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *)message, output_stream) == -1</div><div class='del'>-	    || camel_stream_close (output_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-	</div><div class='del'>-	/* now move from tmp to cur (bypass new, does it matter?) */</div><div class='del'>-	dest = g_strdup_printf("%s/cur/%s", lf-&gt;folder_path, camel_maildir_info_filename (mdi));</div><div class='del'>-	if (rename (name, dest) == 1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	g_free (dest);</div><div class='del'>-	g_free (name);</div><div class='del'>-	</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed",</div><div class='del'>-				    ((CamelLocalFolder *)maildir_folder)-&gt;changes);</div><div class='del'>-	camel_folder_change_info_clear (((CamelLocalFolder *)maildir_folder)-&gt;changes);</div><div class='del'>-	</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = g_strdup(camel_message_info_uid(mi));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>- fail_write:</div><div class='del'>-	</div><div class='del'>-	/* remove the summary info so we are not out-of-sync with the mh folder */</div><div class='del'>-	camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (folder-&gt;summary),</div><div class='del'>-					 camel_message_info_uid (mi));</div><div class='del'>-	</div><div class='del'>-	if (errno == EINTR)</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("Maildir append message cancelled"));</div><div class='del'>-	else</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot append message to maildir folder: %s: %s"),</div><div class='del'>-				      name, g_strerror (errno));</div><div class='del'>-	</div><div class='del'>-	if (output_stream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (output_stream));</div><div class='del'>-		unlink (name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (name);</div><div class='del'>-	g_free (dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *maildir_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelStream *message_stream = NULL;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *name;</div><div class='del'>-	CamelMaildirMessageInfo *mdi;</div><div class='del'>-</div><div class='del'>-	d(printf("getting message: %s\n", uid));</div><div class='del'>-</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	if ((info = camel_folder_summary_uid(folder-&gt;summary, uid)) == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"), uid, _("No such message"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mdi = (CamelMaildirMessageInfo *)info;</div><div class='del'>-</div><div class='del'>-	/* what do we do if the message flags (and :info data) changes?  filename mismatch - need to recheck I guess */</div><div class='del'>-	name = g_strdup_printf("%s/cur/%s", lf-&gt;folder_path, camel_maildir_info_filename(mdi));</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	if ((message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0)) == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),</div><div class='del'>-				     name, g_strerror(errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	message = camel_mime_message_new();</div><div class='del'>-	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, message_stream) == -1) {</div><div class='del'>-		camel_exception_setv(ex, (errno==EINTR)?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s\n  %s"),</div><div class='del'>-				     name, _("Invalid message contents"));</div><div class='del'>-		g_free(name);</div><div class='del'>-		camel_object_unref((CamelObject *)message_stream);</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)message_stream);</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h<br/>deleted file mode 100644<br/>index c495d9b14d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * 	Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MAILDIR_FOLDER_H</div><div class='del'>-#define CAMEL_MAILDIR_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-#include "camel-local-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MAILDIR_FOLDER_TYPE     (camel_maildir_folder_get_type ())</div><div class='del'>-#define CAMEL_MAILDIR_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolder))</div><div class='del'>-#define CAMEL_MAILDIR_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolderClass))</div><div class='del'>-#define CAMEL_IS_MAILDIR_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolder parent_object;</div><div class='del'>-</div><div class='del'>-} CamelMaildirFolder;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolderClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	</div><div class='del'>-} CamelMaildirFolderClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_maildir_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-#endif				/* CAMEL_MAILDIR_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c<br/>deleted file mode 100644<br/>index ef152b132f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,413 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-maildir-store.h"</div><div class='del'>-#include "camel-maildir-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static CamelLocalStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMaildirStore */</div><div class='del'>-#define CMAILDIRS_CLASS(so) CAMEL_MAILDIR_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMAILDIRF_CLASS(so) CAMEL_MAILDIR_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo * get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_maildir_store_class_init(CamelObjectClass * camel_maildir_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_maildir_store_class);</div><div class='del'>-	/*CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_maildir_store_class);*/</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload, use defaults for most */</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_inbox = get_inbox;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_maildir_store_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_maildir_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_maildir_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_maildir_store_type = camel_type_register(CAMEL_LOCAL_STORE_TYPE, "CamelMaildirStore",</div><div class='del'>-							  sizeof(CamelMaildirStore),</div><div class='del'>-							  sizeof(CamelMaildirStoreClass),</div><div class='del'>-							  (CamelObjectClassInitFunc) camel_maildir_store_class_init,</div><div class='del'>-							  NULL,</div><div class='del'>-							  NULL,</div><div class='del'>-							  NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_maildir_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name, *tmp, *cur, *new;</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolder *folder = NULL;</div><div class='del'>-</div><div class='del'>-	(void) ((CamelStoreClass *)parent_class)-&gt;get_folder(store, folder_name, flags, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-	tmp = g_strdup_printf("%s/tmp", name);</div><div class='del'>-	cur = g_strdup_printf("%s/cur", name);</div><div class='del'>-	new = g_strdup_printf("%s/new", name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not open folder `%s':\n%s"),</div><div class='del'>-					     folder_name, strerror(errno));</div><div class='del'>-		} else if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Folder `%s' does not exist."), folder_name);</div><div class='del'>-		} else {</div><div class='del'>-			if (mkdir(name, 0700) != 0</div><div class='del'>-			    || mkdir(tmp, 0700) != 0</div><div class='del'>-			    || mkdir(cur, 0700) != 0</div><div class='del'>-			    || mkdir(new, 0700) != 0) {</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Could not create folder `%s':\n%s"),</div><div class='del'>-						     folder_name, strerror(errno));</div><div class='del'>-				rmdir(tmp);</div><div class='del'>-				rmdir(cur);</div><div class='del'>-				rmdir(new);</div><div class='del'>-				rmdir(name);</div><div class='del'>-			} else {</div><div class='del'>-				folder = camel_maildir_folder_new(store, folder_name, flags, ex);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (!S_ISDIR(st.st_mode)</div><div class='del'>-		   || stat(tmp, &amp;st) != 0 || !S_ISDIR(st.st_mode)</div><div class='del'>-		   || stat(cur, &amp;st) != 0 || !S_ISDIR(st.st_mode)</div><div class='del'>-		   || stat(new, &amp;st) != 0 || !S_ISDIR(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("`%s' is not a maildir directory."), name);</div><div class='del'>-	} else {</div><div class='del'>-		folder = camel_maildir_folder_new(store, folder_name, flags, ex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_free(tmp);</div><div class='del'>-	g_free(cur);</div><div class='del'>-	g_free(new);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_inbox (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return get_folder (store, ".", 0, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name, *tmp, *cur, *new;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-</div><div class='del'>-	tmp = g_strdup_printf("%s/tmp", name);</div><div class='del'>-	cur = g_strdup_printf("%s/cur", name);</div><div class='del'>-	new = g_strdup_printf("%s/new", name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1 || !S_ISDIR(st.st_mode)</div><div class='del'>-	    || stat(tmp, &amp;st) == -1 || !S_ISDIR(st.st_mode)</div><div class='del'>-	    || stat(cur, &amp;st) == -1 || !S_ISDIR(st.st_mode)</div><div class='del'>-	    || stat(new, &amp;st) == -1 || !S_ISDIR(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not delete folder `%s': %s"),</div><div class='del'>-				     folder_name, errno?strerror(errno):_("not a maildir directory"));</div><div class='del'>-	} else {</div><div class='del'>-		int err = 0;</div><div class='del'>-</div><div class='del'>-		/* remove subdirs first - will fail if not empty */</div><div class='del'>-		if (rmdir(cur) == -1 || rmdir(new) == -1) {</div><div class='del'>-			err = errno;</div><div class='del'>-		} else {</div><div class='del'>-			DIR *dir;</div><div class='del'>-			struct dirent *d;</div><div class='del'>-</div><div class='del'>-			/* for tmp (only), its contents is irrelevant */</div><div class='del'>-			dir = opendir(tmp);</div><div class='del'>-			if (dir) {</div><div class='del'>-				while ( (d=readdir(dir)) ) {</div><div class='del'>-					char *name = d-&gt;d_name, *file;</div><div class='del'>-</div><div class='del'>-					if (!strcmp(name, ".") || !strcmp(name, ".."))</div><div class='del'>-						continue;</div><div class='del'>-					file = g_strdup_printf("%s/%s", tmp, name);</div><div class='del'>-					unlink(file);</div><div class='del'>-					g_free(file);</div><div class='del'>-				}</div><div class='del'>-				closedir(dir);</div><div class='del'>-			}</div><div class='del'>-			if (rmdir(tmp) == -1 || rmdir(name) == -1)</div><div class='del'>-				err = errno;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (err != 0) {</div><div class='del'>-			/* easier just to mkdir all (and let them fail), than remember what we got to */</div><div class='del'>-			mkdir(name, 0700);</div><div class='del'>-			mkdir(cur, 0700);</div><div class='del'>-			mkdir(new, 0700);</div><div class='del'>-			mkdir(tmp, 0700);</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not delete folder `%s': %s"),</div><div class='del'>-					     folder_name, strerror(err));</div><div class='del'>-		} else {</div><div class='del'>-			/* and remove metadata */</div><div class='del'>-			((CamelStoreClass *)parent_class)-&gt;delete_folder(store, folder_name, ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_free(tmp);</div><div class='del'>-	g_free(cur);</div><div class='del'>-	g_free(new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *camel_folder_info_new(const char *url, const char *full, const char *name, int unread)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	fi = g_malloc0(sizeof(*fi));</div><div class='del'>-	fi-&gt;url = g_strdup(url);</div><div class='del'>-	fi-&gt;full_name = g_strdup(full);</div><div class='del'>-	fi-&gt;name = g_strdup(name);</div><div class='del'>-	fi-&gt;unread_message_count = unread;</div><div class='del'>-	camel_folder_info_build_path(fi, '/');</div><div class='del'>-</div><div class='del'>-	d(printf("Adding maildir info: '%s' '%s' '%s' '%s'\n", fi-&gt;path, fi-&gt;name, fi-&gt;full_name, fi-&gt;url));</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used to find out where we've visited already */</div><div class='del'>-struct _inode {</div><div class='del'>-	dev_t dnode;</div><div class='del'>-	ino_t inode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* returns number of records found at or below this level */</div><div class='del'>-static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const char *path, guint32 flags, CamelFolderInfo *parent, CamelFolderInfo **fip, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *name, *uri, *tmp, *cur, *new;</div><div class='del'>-	const char *base;</div><div class='del'>-	CamelFolderInfo *fi = NULL;</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	int unread;</div><div class='del'>-</div><div class='del'>-	/* look for folders matching the right structure, recursively */</div><div class='del'>-	name = g_strdup_printf("%s/%s", root, path);</div><div class='del'>-</div><div class='del'>-	d(printf("checking dir '%s' part '%s' for maildir content\n", root, path));</div><div class='del'>-</div><div class='del'>-	tmp = g_strdup_printf("%s/tmp", name);</div><div class='del'>-	cur = g_strdup_printf("%s/cur", name);</div><div class='del'>-	new = g_strdup_printf("%s/new", name);</div><div class='del'>-</div><div class='del'>-	if (stat(tmp, &amp;st) == 0 &amp;&amp; S_ISDIR(st.st_mode)</div><div class='del'>-	    &amp;&amp; stat(cur, &amp;st) == 0 &amp;&amp; S_ISDIR(st.st_mode)</div><div class='del'>-	    &amp;&amp; stat(new, &amp;st) == 0 &amp;&amp; S_ISDIR(st.st_mode)) {</div><div class='del'>-		uri = g_strdup_printf("maildir:%s#%s", root, path);</div><div class='del'>-	} else</div><div class='del'>-		uri = g_strdup_printf("maildir:%s;noselect=yes#%s", root, path);</div><div class='del'>-</div><div class='del'>-	base = strrchr(path, '/');</div><div class='del'>-	if (base)</div><div class='del'>-		base++;</div><div class='del'>-	else</div><div class='del'>-		base = path;</div><div class='del'>-</div><div class='del'>-	/* if we have this folder open, get the real unread count */</div><div class='del'>-	unread = -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-	folder = g_hash_table_lookup(store-&gt;folders, path);</div><div class='del'>-	if (folder)</div><div class='del'>-		unread = camel_folder_get_unread_message_count(folder);</div><div class='del'>-	CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-	/* if we dont have a folder, then scan the directory and get the unread</div><div class='del'>-	   count from there, which is reasonably cheap (on decent filesystem) */</div><div class='del'>-	/* Well we could get this from the summary, but this is more accurate */</div><div class='del'>-	if (folder == NULL</div><div class='del'>-	    &amp;&amp; (flags &amp; CAMEL_STORE_FOLDER_INFO_FAST) == 0) {</div><div class='del'>-		unread = 0;</div><div class='del'>-		dir = opendir(new);</div><div class='del'>-		if (dir) {</div><div class='del'>-			/* we assume that all files here are unread ones */</div><div class='del'>-			while ( (d = readdir(dir)) ) {</div><div class='del'>-				if (d-&gt;d_name[0] != '.')</div><div class='del'>-					unread++;</div><div class='del'>-			}</div><div class='del'>-			closedir(dir);</div><div class='del'>-		}</div><div class='del'>-		dir = opendir(cur);</div><div class='del'>-		if (dir) {</div><div class='del'>-			/* any files with flags but not the 'S' (seen) flag are unread */</div><div class='del'>-			while ( (d = readdir(dir)) ) {</div><div class='del'>-				char *p = strstr(d-&gt;d_name, ":2,");</div><div class='del'>-</div><div class='del'>-				if (p &amp;&amp; strchr(p, 'S') == NULL)</div><div class='del'>-					unread++;</div><div class='del'>-			}</div><div class='del'>-			closedir(dir);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	fi = camel_folder_info_new(uri, path, base, unread);</div><div class='del'>-	</div><div class='del'>-	d(printf("found! uri = %s\n", fi-&gt;url));</div><div class='del'>-	d(printf("  full_name = %s\n  name = '%s'\n", fi-&gt;full_name, fi-&gt;name));</div><div class='del'>-	</div><div class='del'>-	fi-&gt;parent = parent;</div><div class='del'>-	fi-&gt;sibling = *fip;</div><div class='del'>-	*fip = fi;</div><div class='del'>-	g_free(uri);</div><div class='del'>-</div><div class='del'>-	g_free(tmp);</div><div class='del'>-	g_free(cur);</div><div class='del'>-	g_free(new);</div><div class='del'>-</div><div class='del'>-	unread = 0;</div><div class='del'>-</div><div class='del'>-	/* always look further if asked */</div><div class='del'>-	if (((flags &amp; CAMEL_STORE_FOLDER_INFO_RECURSIVE) || parent == NULL)) {</div><div class='del'>-		dir = opendir(name);</div><div class='del'>-		if (dir == NULL) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not scan folder `%s': %s"),</div><div class='del'>-					     root, strerror(errno));</div><div class='del'>-			g_free(name);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		while ( (d = readdir(dir)) ) {</div><div class='del'>-			if (strcmp(d-&gt;d_name, "tmp") == 0</div><div class='del'>-			    || strcmp(d-&gt;d_name, "cur") == 0</div><div class='del'>-			    || strcmp(d-&gt;d_name, "new") == 0</div><div class='del'>-			    || strcmp(d-&gt;d_name, ".") == 0</div><div class='del'>-			    || strcmp(d-&gt;d_name, "..") == 0)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			tmp = g_strdup_printf("%s/%s", name, d-&gt;d_name);</div><div class='del'>-			if (stat(tmp, &amp;st) == 0 &amp;&amp; S_ISDIR(st.st_mode)) {</div><div class='del'>-				struct _inode in = { st.st_dev, st.st_ino };</div><div class='del'>-</div><div class='del'>-				/* see if we've visited already */</div><div class='del'>-				if (g_hash_table_lookup(visited, &amp;in) == NULL) {</div><div class='del'>-					struct _inode *inew = g_malloc(sizeof(*inew));</div><div class='del'>-</div><div class='del'>-					*inew = in;</div><div class='del'>-					g_hash_table_insert(visited, inew, inew);</div><div class='del'>-					new = g_strdup_printf("%s/%s", path, d-&gt;d_name);</div><div class='del'>-					if (scan_dir(store, visited, root, new, flags, fi, &amp;fi-&gt;child, ex) == -1) {</div><div class='del'>-						g_free(tmp);</div><div class='del'>-						g_free(new);</div><div class='del'>-						closedir(dir);</div><div class='del'>-						return -1;</div><div class='del'>-					}</div><div class='del'>-					g_free(new);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free(tmp);</div><div class='del'>-		}</div><div class='del'>-		closedir(dir);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint inode_hash(const void *d)</div><div class='del'>-{</div><div class='del'>-	const struct _inode *v = d;</div><div class='del'>-</div><div class='del'>-	return v-&gt;inode ^ v-&gt;dnode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean inode_equal(const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	const struct _inode *v1 = a, *v2 = b;</div><div class='del'>-	</div><div class='del'>-	return v1-&gt;inode == v2-&gt;inode &amp;&amp; v1-&gt;dnode == v2-&gt;dnode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inode_free(void *k, void *v, void *d)</div><div class='del'>-{</div><div class='del'>-	g_free(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi = NULL;</div><div class='del'>-	CamelLocalStore *local_store = (CamelLocalStore *)store;</div><div class='del'>-	GHashTable *visited;</div><div class='del'>-</div><div class='del'>-	visited = g_hash_table_new(inode_hash, inode_equal);</div><div class='del'>-</div><div class='del'>-	if (scan_dir(store, visited, ((CamelService *)local_store)-&gt;url-&gt;path, top?top:".", flags, NULL, &amp;fi, ex) == -1 &amp;&amp; fi != NULL) {</div><div class='del'>-		camel_store_free_folder_info_full(store, fi);</div><div class='del'>-		fi = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(visited, inode_free, NULL);</div><div class='del'>-	g_hash_table_destroy(visited);</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h<br/>deleted file mode 100644<br/>index f7725bc189..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MAILDIR_STORE_H</div><div class='del'>-#define CAMEL_MAILDIR_STORE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-</div><div class='del'>-#include "camel-local-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MAILDIR_STORE_TYPE     (camel_maildir_store_get_type ())</div><div class='del'>-#define CAMEL_MAILDIR_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStore))</div><div class='del'>-#define CAMEL_MAILDIR_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStoreClass))</div><div class='del'>-#define CAMEL_IS_MAILDIR_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStore parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelMaildirStore;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStoreClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelMaildirStoreClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_maildir_store_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-#endif				/* CAMEL_MAILDIR_STORE_H */</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c<br/>deleted file mode 100644<br/>index b0bd172257..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,792 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-maildir-summary.h"</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-operation.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-#include "e-util/e-memory.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_MAILDIR_SUMMARY_VERSION (0x2000)</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *message_info_load(CamelFolderSummary *s, FILE *in);</div><div class='del'>-static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static void message_info_free(CamelFolderSummary *, CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-static int maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static int maildir_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static char *maildir_summary_next_uid_string(CamelFolderSummary *s);</div><div class='del'>-static int maildir_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi);</div><div class='del'>-static char *maildir_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-static void camel_maildir_summary_class_init	(CamelMaildirSummaryClass *class);</div><div class='del'>-static void camel_maildir_summary_init	(CamelMaildirSummary *gspaper);</div><div class='del'>-static void camel_maildir_summary_finalise	(CamelObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((CamelMaildirSummary *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _CamelMaildirSummaryPrivate {</div><div class='del'>-	char *current_file;</div><div class='del'>-	char *hostname;</div><div class='del'>-</div><div class='del'>-	GHashTable *load_map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelLocalSummaryClass *parent_class;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_maildir_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_local_summary_get_type (), "CamelMaildirSummary",</div><div class='del'>-					   sizeof(CamelMaildirSummary),</div><div class='del'>-					   sizeof(CamelMaildirSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc)camel_maildir_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc)camel_maildir_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc)camel_maildir_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_summary_class_init (CamelMaildirSummaryClass *class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;</div><div class='del'>-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)class;</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	sklass-&gt;message_info_load = message_info_load;</div><div class='del'>-	sklass-&gt;message_info_new = message_info_new;</div><div class='del'>-	sklass-&gt;message_info_free = message_info_free;</div><div class='del'>-	sklass-&gt;next_uid_string = maildir_summary_next_uid_string;</div><div class='del'>-</div><div class='del'>-	lklass-&gt;load = maildir_summary_load;</div><div class='del'>-	lklass-&gt;check = maildir_summary_check;</div><div class='del'>-	lklass-&gt;sync = maildir_summary_sync;</div><div class='del'>-	lklass-&gt;add = maildir_summary_add;</div><div class='del'>-	lklass-&gt;encode_x_evolution = maildir_summary_encode_x_evolution;</div><div class='del'>-	lklass-&gt;decode_x_evolution = maildir_summary_decode_x_evolution;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_summary_init (CamelMaildirSummary *o)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;</div><div class='del'>-	char hostname[256];</div><div class='del'>-</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-	/* set unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_MAILDIR_SUMMARY_VERSION;</div><div class='del'>-</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMaildirMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMaildirMessageContentInfo);</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-	s-&gt;message_info_strings = CAMEL_MAILDIR_INFO_LAST;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (gethostname(hostname, 256) == 0) {</div><div class='del'>-		o-&gt;priv-&gt;hostname = g_strdup(hostname);</div><div class='del'>-	} else {</div><div class='del'>-		o-&gt;priv-&gt;hostname = g_strdup("localhost");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_maildir_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirSummary *o = (CamelMaildirSummary *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv-&gt;hostname);</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_maildir_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMaildirSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #CamelMaildirSummary object.</div><div class='del'>- **/</div><div class='del'>-CamelMaildirSummary	*camel_maildir_summary_new	(const char *filename, const char *maildirdir, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirSummary *o = (CamelMaildirSummary *)camel_object_new(camel_maildir_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	camel_local_summary_construct((CamelLocalSummary *)o, filename, maildirdir, index);</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the 'standard' maildir flags.  should be defined in sorted order. */</div><div class='del'>-static struct {</div><div class='del'>-	char flag;</div><div class='del'>-	guint32 flagbit;</div><div class='del'>-} flagbits[] = {</div><div class='del'>-	{ 'F', CAMEL_MESSAGE_FLAGGED },</div><div class='del'>-	{ 'R', CAMEL_MESSAGE_ANSWERED },</div><div class='del'>-	{ 'S', CAMEL_MESSAGE_SEEN },</div><div class='del'>-	{ 'T', CAMEL_MESSAGE_DELETED },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* convert the uid + flags into a unique:info maildir format */</div><div class='del'>-char *camel_maildir_summary_info_to_name(const CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	char *p, *buf;</div><div class='del'>-	int i;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	uid = camel_message_info_uid(info);</div><div class='del'>-	buf = alloca(strlen(uid) + strlen(":2,") +  (sizeof(flagbits)/sizeof(flagbits[0])) + 1);</div><div class='del'>-	p = buf + sprintf(buf, "%s:2,", uid);</div><div class='del'>-	for (i=0;i&lt;sizeof(flagbits)/sizeof(flagbits[0]);i++) {</div><div class='del'>-		if (info-&gt;flags &amp; flagbits[i].flagbit)</div><div class='del'>-			*p++ = flagbits[i].flag;</div><div class='del'>-	}</div><div class='del'>-	*p = 0;</div><div class='del'>-</div><div class='del'>-	return g_strdup(buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns 0 if the info matches (or there was none), otherwise we changed it */</div><div class='del'>-int camel_maildir_summary_name_to_info(CamelMessageInfo *info, const char *name)</div><div class='del'>-{</div><div class='del'>-	char *p, c;</div><div class='del'>-	guint32 set = 0;	/* what we set */</div><div class='del'>-	/*guint32 all = 0;*/	/* all flags */</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	p = strstr(name, ":2,");</div><div class='del'>-	if (p) {</div><div class='del'>-		p+=3;</div><div class='del'>-		while ((c = *p++)) {</div><div class='del'>-			/* we could assume that the flags are in order, but its just as easy not to require */</div><div class='del'>-			for (i=0;i&lt;sizeof(flagbits)/sizeof(flagbits[0]);i++) {</div><div class='del'>-				if (flagbits[i].flag == c &amp;&amp; (info-&gt;flags &amp; flagbits[i].flagbit) == 0) {</div><div class='del'>-					set |= flagbits[i].flagbit;</div><div class='del'>-				}</div><div class='del'>-				/*all |= flagbits[i].flagbit;*/</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* changed? */</div><div class='del'>-		/*if ((info-&gt;flags &amp; all) != set) {*/</div><div class='del'>-		if ((info-&gt;flags &amp; set) != set) {</div><div class='del'>-			/* ok, they did change, only add the new flags ('merge flags'?) */</div><div class='del'>-			/*info-&gt;flags &amp;= all;  if we wanted to set only the new flags, which we probably dont */</div><div class='del'>-			info-&gt;flags |= set;</div><div class='del'>-			return 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for maildir, x-evolution isn't used, so dont try and get anything out of it */</div><div class='del'>-static int maildir_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *maildir_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME:</div><div class='del'>-   both 'new' and 'add' will try and set the filename, this is not ideal ...</div><div class='del'>-*/</div><div class='del'>-static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelLocalSummaryClass *) parent_class)-&gt;add(cls, msg, info, changes, ex);</div><div class='del'>-	if (mi) {</div><div class='del'>-		if (info) {</div><div class='del'>-			camel_maildir_info_set_filename(mi, camel_maildir_summary_info_to_name(mi));</div><div class='del'>-			d(printf("Setting filename to %s\n", camel_maildir_info_filename(mi)));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;</div><div class='del'>-	CamelMaildirMessageInfo *mdi;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *) parent_class)-&gt;message_info_new(s, h);</div><div class='del'>-	/* assign the uid and new filename */</div><div class='del'>-	if (mi) {</div><div class='del'>-		mdi = (CamelMaildirMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		uid = camel_message_info_uid(mi);</div><div class='del'>-		if (uid==NULL || uid[0] == 0)</div><div class='del'>-			camel_message_info_set_uid(mi, camel_folder_summary_next_uid_string(s));</div><div class='del'>-</div><div class='del'>-		/* with maildir we know the real received date, from the filename */</div><div class='del'>-		mi-&gt;date_received = strtoul(camel_message_info_uid(mi), NULL, 10);</div><div class='del'>-</div><div class='del'>-		if (mds-&gt;priv-&gt;current_file) {</div><div class='del'>-#if 0</div><div class='del'>-			char *p1, *p2, *p3;</div><div class='del'>-			unsigned long uid;</div><div class='del'>-#endif</div><div class='del'>-			/* if setting from a file, grab the flags from it */</div><div class='del'>-			camel_maildir_info_set_filename(mi, g_strdup(mds-&gt;priv-&gt;current_file));</div><div class='del'>-			camel_maildir_summary_name_to_info(mi, mds-&gt;priv-&gt;current_file);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-			/* Actually, I dont think all this effort is worth it at all ... */</div><div class='del'>-</div><div class='del'>-			/* also, see if we can extract the next-id from tne name, and safe-if-fy ourselves against collisions */</div><div class='del'>-			/* we check for something.something_number.something */</div><div class='del'>-			p1 = strchr(mdi-&gt;filename, '.');</div><div class='del'>-			if (p1) {</div><div class='del'>-				p2 = strchr(p1+1, '.');</div><div class='del'>-				p3 = strchr(p1+1, '_');</div><div class='del'>-				if (p2 &amp;&amp; p3 &amp;&amp; p3&lt;p2) {</div><div class='del'>-					uid = strtoul(p3+1, &amp;p1, 10);</div><div class='del'>-					if (p1 == p2 &amp;&amp; uid&gt;0)</div><div class='del'>-						camel_folder_summary_set_uid(s, uid);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		} else {</div><div class='del'>-			/* if creating a file, set its name from the flags we have */</div><div class='del'>-			camel_maildir_info_set_filename(mdi, camel_maildir_summary_info_to_name(mi));</div><div class='del'>-			d(printf("Setting filename to %s\n", camel_maildir_info_filename(mi)));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-#if !defined (DOEPOOLV) &amp;&amp; !defined (DOESTRV)</div><div class='del'>-	CamelMaildirMessageInfo *mdi = (CamelMaildirMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-	g_free(mdi-&gt;filename);</div><div class='del'>-#endif</div><div class='del'>-	((CamelFolderSummaryClass *) parent_class)-&gt;message_info_free(s, mi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *maildir_summary_next_uid_string(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;</div><div class='del'>-</div><div class='del'>-	d(printf("next uid string called?\n"));</div><div class='del'>-</div><div class='del'>-	/* if we have a current file, then use that to get the uid */</div><div class='del'>-	if (mds-&gt;priv-&gt;current_file) {</div><div class='del'>-		char *cln;</div><div class='del'>-</div><div class='del'>-		cln = strchr(mds-&gt;priv-&gt;current_file, ':');</div><div class='del'>-		if (cln)</div><div class='del'>-			return g_strndup(mds-&gt;priv-&gt;current_file, cln-mds-&gt;priv-&gt;current_file);</div><div class='del'>-		else</div><div class='del'>-			return g_strdup(mds-&gt;priv-&gt;current_file);</div><div class='del'>-	} else {</div><div class='del'>-		/* the first would probably work, but just to be safe, check for collisions */</div><div class='del'>-#if 0</div><div class='del'>-		return g_strdup_printf("%ld.%d_%u.%s", time(0), getpid(), camel_folder_summary_next_uid(s), mds-&gt;priv-&gt;hostname);</div><div class='del'>-#else</div><div class='del'>-		CamelLocalSummary *cls = (CamelLocalSummary *)s;</div><div class='del'>-		char *name = NULL, *uid = NULL;</div><div class='del'>-		struct stat st;</div><div class='del'>-		int retry = 0;</div><div class='del'>-		guint32 nextuid = camel_folder_summary_next_uid(s);</div><div class='del'>-</div><div class='del'>-		/* we use time.pid_count.hostname */</div><div class='del'>-		do {</div><div class='del'>-			if (retry &gt; 0) {</div><div class='del'>-				g_free(name);</div><div class='del'>-				g_free(uid);</div><div class='del'>-				sleep(2);</div><div class='del'>-			}</div><div class='del'>-			uid = g_strdup_printf("%ld.%d_%u.%s", time(0), getpid(), nextuid, mds-&gt;priv-&gt;hostname);</div><div class='del'>-			name = g_strdup_printf("%s/tmp/%s", cls-&gt;folder_path, uid);</div><div class='del'>-			retry++;</div><div class='del'>-		} while (stat(name, &amp;st) == 0 &amp;&amp; retry&lt;3);</div><div class='del'>-</div><div class='del'>-		/* I dont know what we're supposed to do if it fails to find a unique name?? */</div><div class='del'>-</div><div class='del'>-		g_free(name);</div><div class='del'>-		return uid;</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *) parent_class)-&gt;message_info_load(s, in);</div><div class='del'>-	if (mi) {</div><div class='del'>-		char *name;</div><div class='del'>-</div><div class='del'>-		if (mds-&gt;priv-&gt;load_map</div><div class='del'>-		    &amp;&amp; (name = g_hash_table_lookup(mds-&gt;priv-&gt;load_map, camel_message_info_uid(mi)))) {</div><div class='del'>-			d(printf("Setting filename of %s to %s\n", camel_message_info_uid(mi), name));</div><div class='del'>-			camel_maildir_info_set_filename(mi, g_strdup(name));</div><div class='del'>-			camel_maildir_summary_name_to_info(mi, name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *cur;</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	CamelMaildirSummary *mds = (CamelMaildirSummary *)cls;</div><div class='del'>-	char *uid;</div><div class='del'>-	EMemPool *pool;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	cur = g_strdup_printf("%s/cur", cls-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	d(printf("pre-loading uid &lt;&gt; filename map\n"));</div><div class='del'>-</div><div class='del'>-	dir = opendir(cur);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		g_free(cur);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mds-&gt;priv-&gt;load_map = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		if (d-&gt;d_name[0] == '.')</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		/* map the filename -&gt; uid */</div><div class='del'>-		uid = strchr(d-&gt;d_name, ':');</div><div class='del'>-		if (uid) {</div><div class='del'>-			int len = uid-d-&gt;d_name;</div><div class='del'>-			uid = e_mempool_alloc(pool, len+1);</div><div class='del'>-			memcpy(uid, d-&gt;d_name, len);</div><div class='del'>-			uid[len] = 0;</div><div class='del'>-			g_hash_table_insert(mds-&gt;priv-&gt;load_map, uid, e_mempool_strdup(pool, d-&gt;d_name));</div><div class='del'>-		} else {</div><div class='del'>-			uid = e_mempool_strdup(pool, d-&gt;d_name);</div><div class='del'>-			g_hash_table_insert(mds-&gt;priv-&gt;load_map, uid, uid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-	g_free(cur);</div><div class='del'>-</div><div class='del'>-	ret = ((CamelLocalSummaryClass *) parent_class)-&gt;load(cls, forceindex, ex);</div><div class='del'>-</div><div class='del'>-	g_hash_table_destroy(mds-&gt;priv-&gt;load_map);</div><div class='del'>-	mds-&gt;priv-&gt;load_map = NULL;</div><div class='del'>-	e_mempool_destroy(pool);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int camel_maildir_summary_add(CamelLocalSummary *cls, const char *name, int forceindex)</div><div class='del'>-{</div><div class='del'>-	CamelMaildirSummary *maildirs = (CamelMaildirSummary *)cls;</div><div class='del'>-	char *filename = g_strdup_printf("%s/cur/%s", cls-&gt;folder_path, name);</div><div class='del'>-	int fd;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-</div><div class='del'>-	d(printf("summarising: %s\n", name));</div><div class='del'>-</div><div class='del'>-	fd = open(filename, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));</div><div class='del'>-		g_free(filename);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, FALSE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	if (cls-&gt;index &amp;&amp; (forceindex || !camel_index_has_name(cls-&gt;index, name))) {</div><div class='del'>-		d(printf("forcing indexing of message content\n"));</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)maildirs, cls-&gt;index);</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)maildirs, NULL);</div><div class='del'>-	}</div><div class='del'>-	maildirs-&gt;priv-&gt;current_file = (char *)name;</div><div class='del'>-	camel_folder_summary_add_from_parser((CamelFolderSummary *)maildirs, mp);</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	maildirs-&gt;priv-&gt;current_file = NULL;</div><div class='del'>-	camel_folder_summary_set_index((CamelFolderSummary *)maildirs, NULL);</div><div class='del'>-	g_free(filename);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_summary(char *key, CamelMessageInfo *info, CamelLocalSummary *cls)</div><div class='del'>-{</div><div class='del'>-	d(printf("removing message %s from summary\n", key));</div><div class='del'>-	if (cls-&gt;index)</div><div class='del'>-		camel_index_delete_name(cls-&gt;index, camel_message_info_uid(info));</div><div class='del'>-	camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-	camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-sort_receive_cmp(const void *ap, const void *bp)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo</div><div class='del'>-		*a = *((CamelMessageInfo **)ap),</div><div class='del'>-		*b = *((CamelMessageInfo **)bp);</div><div class='del'>-</div><div class='del'>-	if (a-&gt;date_received &lt; b-&gt;date_received)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (a-&gt;date_received &gt; b-&gt;date_received)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *p;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMaildirMessageInfo *mdi;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	GHashTable *left;</div><div class='del'>-	int i, count, total;</div><div class='del'>-	int forceindex;</div><div class='del'>-	char *new, *cur;</div><div class='del'>-	char *uid;</div><div class='del'>-</div><div class='del'>-	new = g_strdup_printf("%s/new", cls-&gt;folder_path);</div><div class='del'>-	cur = g_strdup_printf("%s/cur", cls-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Handle changeinfo */</div><div class='del'>-</div><div class='del'>-	d(printf("checking summary ...\n"));</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Checking folder consistency"));</div><div class='del'>-</div><div class='del'>-	/* scan the directory, check for mail files not in the index, or index entries that</div><div class='del'>-	   no longer exist */</div><div class='del'>-	dir = opendir(cur);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot open maildir directory path: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		g_free(cur);</div><div class='del'>-		g_free(new);</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* keeps track of all uid's that have not been processed */</div><div class='del'>-	left = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)cls);</div><div class='del'>-	forceindex = count == 0;</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);</div><div class='del'>-		if (info) {</div><div class='del'>-			g_hash_table_insert(left, (char *)camel_message_info_uid(info), info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* joy, use this to pre-count the total, so we can report progress meaningfully */</div><div class='del'>-	total = 0;</div><div class='del'>-	count = 0;</div><div class='del'>-	while ( (d = readdir(dir)) )</div><div class='del'>-		total++;</div><div class='del'>-	rewinddir(dir);</div><div class='del'>-</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		int pc = count * 100 / total;</div><div class='del'>-</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-		count++;</div><div class='del'>-</div><div class='del'>-		/* FIXME: also run stat to check for regular file */</div><div class='del'>-		p = d-&gt;d_name;</div><div class='del'>-		if (p[0] == '.')</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		/* map the filename -&gt; uid */</div><div class='del'>-		uid = strchr(d-&gt;d_name, ':');</div><div class='del'>-		if (uid)</div><div class='del'>-			uid = g_strndup(d-&gt;d_name, uid-d-&gt;d_name);</div><div class='del'>-		else</div><div class='del'>-			uid = g_strdup(d-&gt;d_name);</div><div class='del'>-</div><div class='del'>-		info = camel_folder_summary_uid((CamelFolderSummary *)cls, uid);</div><div class='del'>-		if (info == NULL || (cls-&gt;index &amp;&amp; (!camel_index_has_name(cls-&gt;index, uid)))) {</div><div class='del'>-			/* need to add this file to the summary */</div><div class='del'>-			if (info != NULL) {</div><div class='del'>-				CamelMessageInfo *old = g_hash_table_lookup(left, camel_message_info_uid(info));</div><div class='del'>-				if (old) {</div><div class='del'>-					g_hash_table_remove(left, uid);</div><div class='del'>-					camel_folder_summary_info_free((CamelFolderSummary *)cls, old);</div><div class='del'>-				}</div><div class='del'>-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-			}</div><div class='del'>-			camel_maildir_summary_add(cls, d-&gt;d_name, forceindex);</div><div class='del'>-		} else {</div><div class='del'>-			const char *filename;</div><div class='del'>-			CamelMessageInfo *old;</div><div class='del'>-</div><div class='del'>-			old = g_hash_table_lookup(left, camel_message_info_uid(info));</div><div class='del'>-			if (old) {</div><div class='del'>-				camel_folder_summary_info_free((CamelFolderSummary *)cls, old);</div><div class='del'>-				g_hash_table_remove(left, camel_message_info_uid(info));</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mdi = (CamelMaildirMessageInfo *)info;</div><div class='del'>-			filename = camel_maildir_info_filename(mdi);</div><div class='del'>-			/* TODO: only store the extension in the mdi-&gt;filename struct, not the whole lot */</div><div class='del'>-			if (filename == NULL || strcmp(filename, d-&gt;d_name) != 0) {</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-#warning "cannot modify the estrv after its been setup, for mt-safe code"</div><div class='del'>-				CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-				/* need to update the summary hash ref */</div><div class='del'>-				g_hash_table_remove(s-&gt;messages_uid, camel_message_info_uid(info));</div><div class='del'>-				info-&gt;strings = e_strv_set_ref(info-&gt;strings, CAMEL_MAILDIR_INFO_FILENAME, d-&gt;d_name);</div><div class='del'>-				info-&gt;strings = e_strv_pack(info-&gt;strings);</div><div class='del'>-				g_hash_table_insert(s-&gt;messages_uid, (char *)camel_message_info_uid(info), info);</div><div class='del'>-				CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-#else</div><div class='del'>-# ifdef DOEPOOLV</div><div class='del'>-				info-&gt;strings = e_poolv_set(info-&gt;strings, CAMEL_MAILDIR_INFO_FILENAME, d-&gt;d_name, FALSE);</div><div class='del'>-# else	</div><div class='del'>-				g_free(mdi-&gt;filename);</div><div class='del'>-				mdi-&gt;filename = g_strdup(d-&gt;d_name);</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-			camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-		}</div><div class='del'>-		g_free(uid);</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-	g_hash_table_foreach(left, (GHFunc)remove_summary, cls);</div><div class='del'>-	g_hash_table_destroy(left);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Checking for new messages"));</div><div class='del'>-</div><div class='del'>-	/* now, scan new for new messages, and copy them to cur, and so forth */</div><div class='del'>-	dir = opendir(new);</div><div class='del'>-	if (dir != NULL) {</div><div class='del'>-		total = 0;</div><div class='del'>-		count = 0;</div><div class='del'>-		while ( (d = readdir(dir)) )</div><div class='del'>-			total++;</div><div class='del'>-		rewinddir(dir);</div><div class='del'>-</div><div class='del'>-		while ( (d = readdir(dir)) ) {</div><div class='del'>-			char *name, *newname, *destname, *destfilename;</div><div class='del'>-			char *src, *dest;</div><div class='del'>-			int pc = count * 100 / total;</div><div class='del'>-</div><div class='del'>-			camel_operation_progress(NULL, pc);</div><div class='del'>-			count++;</div><div class='del'>-</div><div class='del'>-			name = d-&gt;d_name;</div><div class='del'>-			if (name[0] == '.')</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			/* already in summary?  shouldn't happen, but just incase ... */</div><div class='del'>-			if ((info = camel_folder_summary_uid((CamelFolderSummary *)cls, name))) {</div><div class='del'>-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-				newname = destname = camel_folder_summary_next_uid_string(s);</div><div class='del'>-			} else {</div><div class='del'>-				newname = NULL;</div><div class='del'>-				destname = name;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* copy this to the destination folder, use 'standard' semantics for maildir info field */</div><div class='del'>-			src = g_strdup_printf("%s/%s", new, name);</div><div class='del'>-			destfilename = g_strdup_printf("%s:2,", destname);</div><div class='del'>-			dest = g_strdup_printf("%s/%s", cur, destfilename);</div><div class='del'>-</div><div class='del'>-			/* FIXME: This should probably use link/unlink */</div><div class='del'>-</div><div class='del'>-			if (rename(src, dest) == 0) {</div><div class='del'>-				camel_maildir_summary_add(cls, destfilename, forceindex);</div><div class='del'>-				if (changes) {</div><div class='del'>-					camel_folder_change_info_add_uid(changes, destname);</div><div class='del'>-					camel_folder_change_info_recent_uid(changes, destname);</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* else?  we should probably care about failures, but wont */</div><div class='del'>-				g_warning("Failed to move new maildir message %s to cur %s", src, dest);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* c strings are painful to work with ... */</div><div class='del'>-			g_free(destfilename);</div><div class='del'>-			g_free(newname);</div><div class='del'>-			g_free(src);</div><div class='del'>-			g_free(dest);</div><div class='del'>-		}</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-</div><div class='del'>-	g_free(new);</div><div class='del'>-	g_free(cur);</div><div class='del'>-</div><div class='del'>-	/* sort the summary based on receive time, since the directory order is not useful */</div><div class='del'>-	CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-	qsort(s-&gt;messages-&gt;pdata, s-&gt;messages-&gt;len, sizeof(CamelMessageInfo *), sort_receive_cmp);</div><div class='del'>-	CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sync the summary with the ondisk files. */</div><div class='del'>-static int</div><div class='del'>-maildir_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int count, i;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMaildirMessageInfo *mdi;</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-#endif</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	d(printf("summary_sync(expunge=%s)\n", expunge?"true":"false"));</div><div class='del'>-</div><div class='del'>-	if (camel_local_summary_check(cls, changes, ex) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)cls);</div><div class='del'>-	for (i=count-1;i&gt;=0;i--) {</div><div class='del'>-		camel_operation_progress(NULL, (count-i)*100/count);</div><div class='del'>-</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);</div><div class='del'>-		mdi = (CamelMaildirMessageInfo *)info;</div><div class='del'>-		if (info &amp;&amp; (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED) &amp;&amp; expunge) {</div><div class='del'>-			name = g_strdup_printf("%s/cur/%s", cls-&gt;folder_path, camel_maildir_info_filename(mdi));</div><div class='del'>-			d(printf("deleting %s\n", name));</div><div class='del'>-			if (unlink(name) == 0 || errno==ENOENT) {</div><div class='del'>-</div><div class='del'>-				/* FIXME: put this in folder_summary::remove()? */</div><div class='del'>-				if (cls-&gt;index)</div><div class='del'>-					camel_index_delete_name(cls-&gt;index, camel_message_info_uid(info));</div><div class='del'>-</div><div class='del'>-				camel_folder_change_info_remove_uid(changes, camel_message_info_uid(info));</div><div class='del'>-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-			}</div><div class='del'>-			g_free(name);</div><div class='del'>-		} else if (info &amp;&amp; (info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			char *newname = camel_maildir_summary_info_to_name(info);</div><div class='del'>-			char *dest;</div><div class='del'>-</div><div class='del'>-			/* do we care about additional metainfo stored inside the message? */</div><div class='del'>-			/* probably should all go in the filename? */</div><div class='del'>-</div><div class='del'>-			/* have our flags/ i.e. name changed? */</div><div class='del'>-			if (strcmp(newname, camel_maildir_info_filename(mdi))) {</div><div class='del'>-				name = g_strdup_printf("%s/cur/%s", cls-&gt;folder_path, camel_maildir_info_filename(mdi));</div><div class='del'>-				dest = g_strdup_printf("%s/cur/%s", cls-&gt;folder_path, newname);</div><div class='del'>-				rename(name, dest);</div><div class='del'>-				if (stat(dest, &amp;st) == -1) {</div><div class='del'>-					/* we'll assume it didn't work, but dont change anything else */</div><div class='del'>-					g_free(newname);</div><div class='del'>-				} else {</div><div class='del'>-					/* TODO: If this is made mt-safe, then this code could be a problem, since</div><div class='del'>-					   the estrv is being modified.</div><div class='del'>-					   Sigh, this may mean the maildir name has to be cached another way */</div><div class='del'>-#ifdef DOESTRV</div><div class='del'>-#warning "cannot modify the estrv after its been setup, for mt-safe code"</div><div class='del'>-					CAMEL_SUMMARY_LOCK(s, summary_lock);</div><div class='del'>-					/* need to update the summary hash ref */</div><div class='del'>-					g_hash_table_remove(s-&gt;messages_uid, camel_message_info_uid(info));</div><div class='del'>-					info-&gt;strings = e_strv_set_ref_free(info-&gt;strings, CAMEL_MAILDIR_INFO_FILENAME, newname);</div><div class='del'>-					info-&gt;strings = e_strv_pack(info-&gt;strings);</div><div class='del'>-					g_hash_table_insert(s-&gt;messages_uid, (char *)camel_message_info_uid(info), info);</div><div class='del'>-					CAMEL_SUMMARY_UNLOCK(s, summary_lock);</div><div class='del'>-#else</div><div class='del'>-# ifdef DOEPOOLV</div><div class='del'>-					info-&gt;strings = e_poolv_set(info-&gt;strings, CAMEL_MAILDIR_INFO_FILENAME, newname, TRUE);</div><div class='del'>-# else</div><div class='del'>-					g_free(mdi-&gt;filename);</div><div class='del'>-					mdi-&gt;filename = newname;</div><div class='del'>-# endif</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				g_free(name);</div><div class='del'>-				g_free(dest);</div><div class='del'>-			} else {</div><div class='del'>-				g_free(newname);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* strip FOLDER_MESSAGE_FLAGED, etc */</div><div class='del'>-			info-&gt;flags &amp;= 0xffff;</div><div class='del'>-		}</div><div class='del'>-		camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return ((CamelLocalSummaryClass *)parent_class)-&gt;sync(cls, expunge, changes, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h<br/>deleted file mode 100644<br/>index 0cae785c6c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-maildir-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-maildir-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MAILDIR_SUMMARY_H</div><div class='del'>-#define _CAMEL_MAILDIR_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MAILDIR_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_maildir_summary_get_type (), CamelMaildirSummary)</div><div class='del'>-#define CAMEL_MAILDIR_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_maildir_summary_get_type (), CamelMaildirSummaryClass)</div><div class='del'>-#define CAMEL_IS_MAILDIR_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_maildir_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMaildirSummary	CamelMaildirSummary;</div><div class='del'>-typedef struct _CamelMaildirSummaryClass	CamelMaildirSummaryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMaildirMessageContentInfo {</div><div class='del'>-	CamelMessageContentInfo info;</div><div class='del'>-} CamelMaildirMessageContentInfo;</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_MAILDIR_INFO_FILENAME = CAMEL_MESSAGE_INFO_LAST,</div><div class='del'>-	CAMEL_MAILDIR_INFO_LAST,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMaildirMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-</div><div class='del'>-#if !defined (DOEPOOLV) &amp;&amp; !defined (DOESTRV)</div><div class='del'>-	char *filename;		/* maildir has this annoying status shit on the end of the filename, use this to get the real message id */</div><div class='del'>-#endif</div><div class='del'>-} CamelMaildirMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelMaildirSummary {</div><div class='del'>-	CamelLocalSummary parent;</div><div class='del'>-	struct _CamelMaildirSummaryPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMaildirSummaryClass {</div><div class='del'>-	CamelLocalSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	 camel_maildir_summary_get_type	(void);</div><div class='del'>-CamelMaildirSummary	*camel_maildir_summary_new	(const char *filename, const char *maildirdir, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-/* convert some info-&gt;flags to/from the messageinfo */</div><div class='del'>-char *camel_maildir_summary_info_to_name(const CamelMessageInfo *info);</div><div class='del'>-int camel_maildir_summary_name_to_info(CamelMessageInfo *info, const char *name);</div><div class='del'>-</div><div class='del'>-#if defined (DOEPOOLV) || defined (DOESTRV)</div><div class='del'>-#define camel_maildir_info_filename(x) camel_message_info_string((const CamelMessageInfo *)(x), CAMEL_MAILDIR_INFO_FILENAME)</div><div class='del'>-#define camel_maildir_info_set_filename(x, s) camel_message_info_set_string((CamelMessageInfo *)(x), CAMEL_MAILDIR_INFO_FILENAME, s)</div><div class='del'>-#else</div><div class='del'>-#define camel_maildir_info_filename(x) (((CamelMaildirMessageInfo *)x)-&gt;filename)</div><div class='del'>-#define camel_maildir_info_set_filename(x, s) (g_free(((CamelMaildirMessageInfo *)x)-&gt;filename),((CamelMaildirMessageInfo *)x)-&gt;filename = s)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c<br/>deleted file mode 100644<br/>index 0d4a61739d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,452 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mbox-folder.h"</div><div class='del'>-#include "camel-mbox-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-mbox-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-static CamelLocalFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMboxFolder */</div><div class='del'>-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex);</div><div class='del'>-static void mbox_unlock(CamelLocalFolder *lf);</div><div class='del'>-</div><div class='del'>-static void mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,	char **appended_uid, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);</div><div class='del'>-static CamelLocalSummary *mbox_create_summary(const char *path, const char *folder, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-static void mbox_finalise(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_folder_class_init(CamelMboxFolderClass * camel_mbox_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mbox_folder_class);</div><div class='del'>-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_mbox_folder_class;</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalFolderClass *)camel_type_get_global_classfuncs(camel_local_folder_get_type());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;append_message = mbox_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_message = mbox_get_message;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = mbox_set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = mbox_set_message_user_tag;</div><div class='del'>-</div><div class='del'>-	lclass-&gt;create_summary = mbox_create_summary;</div><div class='del'>-	lclass-&gt;lock = mbox_lock;</div><div class='del'>-	lclass-&gt;unlock = mbox_unlock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	/*CamelFolder *folder = object;*/</div><div class='del'>-	CamelMboxFolder *mbox_folder = object;</div><div class='del'>-</div><div class='del'>-	mbox_folder-&gt;lockfd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_finalise(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = (CamelMboxFolder *)object;</div><div class='del'>-</div><div class='del'>-	g_assert(mbox_folder-&gt;lockfd == -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_mbox_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mbox_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mbox_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mbox_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMboxFolder",</div><div class='del'>-							     sizeof(CamelMboxFolder),</div><div class='del'>-							     sizeof(CamelMboxFolderClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_mbox_folder_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) mbox_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) mbox_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mbox_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("Creating mbox folder: %s in %s\n", full_name, camel_local_store_get_toplevel_dir((CamelLocalStore *)parent_store)));</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)camel_object_new(CAMEL_MBOX_FOLDER_TYPE);</div><div class='del'>-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,</div><div class='del'>-							     parent_store, full_name, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelLocalSummary *mbox_create_summary(const char *path, const char *folder, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	return (CamelLocalSummary *)camel_mbox_summary_new(path, folder, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int mbox_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)lf;</div><div class='del'>-</div><div class='del'>-	/* make sure we have matching unlocks for locks, camel-local-folder class should enforce this */</div><div class='del'>-	g_assert(mf-&gt;lockfd == -1);</div><div class='del'>-</div><div class='del'>-	mf-&gt;lockfd = open(lf-&gt;folder_path, O_RDWR, 0);</div><div class='del'>-	if (mf-&gt;lockfd == -1) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot create folder lock on %s: %s"), lf-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_lock_folder(lf-&gt;folder_path, mf-&gt;lockfd, type, ex) == -1) {</div><div class='del'>-		close(mf-&gt;lockfd);</div><div class='del'>-		mf-&gt;lockfd = -1;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mbox_unlock(CamelLocalFolder *lf)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mf = (CamelMboxFolder *)lf;</div><div class='del'>-</div><div class='del'>-	g_assert(mf-&gt;lockfd != -1);</div><div class='del'>-	camel_unlock_folder(lf-&gt;folder_path, mf-&gt;lockfd);</div><div class='del'>-	close(mf-&gt;lockfd);</div><div class='del'>-	mf-&gt;lockfd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelStream *output_stream = NULL, *filter_stream = NULL;</div><div class='del'>-	CamelMimeFilter *filter_from = NULL;</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)folder-&gt;summary;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *fromline = NULL;</div><div class='del'>-	int fd, retval;</div><div class='del'>-	struct stat st;</div><div class='del'>-#if 0</div><div class='del'>-	char *xev;</div><div class='del'>-#endif</div><div class='del'>-	/* If we can't lock, dont do anything */</div><div class='del'>-	if (camel_local_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message\n"));</div><div class='del'>-</div><div class='del'>-	/* first, check the summary is correct (updates folder_size too) */</div><div class='del'>-	retval = camel_local_summary_check ((CamelLocalSummary *)folder-&gt;summary, lf-&gt;changes, ex);</div><div class='del'>-	if (retval == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* add it to the summary/assign the uid, etc */</div><div class='del'>-	mi = camel_local_summary_add((CamelLocalSummary *)folder-&gt;summary, message, info, lf-&gt;changes, ex);</div><div class='del'>-	if (mi == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message: uid is %s\n", camel_message_info_uid(mi)));</div><div class='del'>-</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name(lf-&gt;folder_path, O_WRONLY|O_APPEND, 0600);</div><div class='del'>-	if (output_stream == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot open mailbox: %s: %s\n"), lf-&gt;folder_path, strerror(errno));</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and we need to set the frompos/XEV explicitly */</div><div class='del'>-	((CamelMboxMessageInfo *)mi)-&gt;frompos = mbs-&gt;folder_size?mbs-&gt;folder_size+1:0;</div><div class='del'>-#if 0</div><div class='del'>-	xev = camel_local_summary_encode_x_evolution((CamelLocalSummary *)folder-&gt;summary, mi);</div><div class='del'>-	if (xev) {</div><div class='del'>-		/* the x-ev header should match the 'current' flags, no problem, so store as much */</div><div class='del'>-		camel_medium_set_header((CamelMedium *)message, "X-Evolution", xev);</div><div class='del'>-		mi-&gt;flags &amp;= ~ CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		g_free(xev);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* we must write this to the non-filtered stream ... prepend a \n if not at the start of the file */</div><div class='del'>-	fromline = camel_mbox_summary_build_from(((CamelMimePart *)message)-&gt;headers);</div><div class='del'>-	if (camel_stream_printf(output_stream, mbs-&gt;folder_size==0?"%s":"\n%s", fromline) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	/* and write the content to the filtering stream, that translated '\nFrom' into '\n&gt;From' */</div><div class='del'>-	filter_stream = (CamelStream *) camel_stream_filter_new_with_stream(output_stream);</div><div class='del'>-	filter_from = (CamelMimeFilter *) camel_mime_filter_from_new();</div><div class='del'>-	camel_stream_filter_add((CamelStreamFilter *) filter_stream, filter_from);</div><div class='del'>-	if (camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, filter_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_close(filter_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	/* unlock as soon as we can */</div><div class='del'>-	camel_local_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	/* filter stream ref's the output stream itself, so we need to unref it too */</div><div class='del'>-	camel_object_unref((CamelObject *)filter_from);</div><div class='del'>-	camel_object_unref((CamelObject *)filter_stream);</div><div class='del'>-	camel_object_unref((CamelObject *)output_stream);</div><div class='del'>-	g_free(fromline);</div><div class='del'>-</div><div class='del'>-	/* now we 'fudge' the summary  to tell it its uptodate, because its idea of uptodate has just changed */</div><div class='del'>-	/* the stat really shouldn't fail, we just wrote to it */</div><div class='del'>-	if (stat(lf-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		((CamelFolderSummary *)mbs)-&gt;time = st.st_mtime;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = g_strdup(camel_message_info_uid(mi));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-fail_write:</div><div class='del'>-	if (errno == EINTR)</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("Mail append cancelled"));</div><div class='del'>-	else</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot append message to mbox file: %s: %s"),</div><div class='del'>-				      lf-&gt;folder_path, g_strerror (errno));</div><div class='del'>-	</div><div class='del'>-	if (filter_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(filter_stream));</div><div class='del'>-</div><div class='del'>-	if (output_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(output_stream));</div><div class='del'>-</div><div class='del'>-	if (filter_from)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(filter_from));</div><div class='del'>-</div><div class='del'>-	g_free(fromline);</div><div class='del'>-</div><div class='del'>-	/* reset the file to original size */</div><div class='del'>-	fd = open(lf-&gt;folder_path, O_WRONLY, 0600);</div><div class='del'>-	if (fd != -1) {</div><div class='del'>-		ftruncate(fd, mbs-&gt;folder_size);</div><div class='del'>-		close(fd);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* remove the summary info so we are not out-of-sync with the mbox */</div><div class='del'>-	camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (mbs), camel_message_info_uid (mi));</div><div class='del'>-	</div><div class='del'>-	/* and tell the summary its uptodate */</div><div class='del'>-	if (stat(lf-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		((CamelFolderSummary *)mbs)-&gt;time = st.st_mtime;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-fail:</div><div class='del'>-	/* make sure we unlock the folder - before we start triggering events into appland */</div><div class='del'>-	camel_local_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	/* cascade the changes through, anyway, if there are any outstanding */</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-mbox_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelMboxMessageInfo *info;</div><div class='del'>-	CamelMimeParser *parser;</div><div class='del'>-	int fd, retval;</div><div class='del'>-	int retried = FALSE;</div><div class='del'>-	</div><div class='del'>-	d(printf("Getting message %s\n", uid));</div><div class='del'>-</div><div class='del'>-	/* lock the folder first, burn if we can't */</div><div class='del'>-	if (camel_local_folder_lock(lf, CAMEL_LOCK_READ, ex) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-retry:</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	info = (CamelMboxMessageInfo *) camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s\n  %s"), uid, _("No such message"));</div><div class='del'>-		camel_local_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* no frompos, its an error in the library (and we can't do anything with it */</div><div class='del'>-	g_assert(info-&gt;frompos != -1);</div><div class='del'>-	</div><div class='del'>-	/* we use an fd instead of a normal stream here - the reason is subtle, camel_mime_part will cache</div><div class='del'>-	   the whole message in memory if the stream is non-seekable (which it is when built from a parser</div><div class='del'>-	   with no stream).  This means we dont have to lock the mbox for the life of the message, but only</div><div class='del'>-	   while it is being created. */</div><div class='del'>-</div><div class='del'>-	fd = open(lf-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		camel_local_folder_unlock(lf);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we use a parser to verify the message is correct, and in the correct position */</div><div class='del'>-	parser = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_init_with_fd(parser, fd);</div><div class='del'>-	camel_mime_parser_scan_from(parser, TRUE);</div><div class='del'>-</div><div class='del'>-	camel_mime_parser_seek(parser, info-&gt;frompos, SEEK_SET);</div><div class='del'>-	if (camel_mime_parser_step(parser, NULL, NULL) != HSCAN_FROM</div><div class='del'>-	    || camel_mime_parser_tell_start_from(parser) != info-&gt;frompos) {</div><div class='del'>-</div><div class='del'>-		g_warning("Summary doesn't match the folder contents!  eek!\n"</div><div class='del'>-			  "  expecting offset %ld got %ld, state = %d", (long int)info-&gt;frompos,</div><div class='del'>-			  (long int)camel_mime_parser_tell_start_from(parser),</div><div class='del'>-			  camel_mime_parser_state(parser));</div><div class='del'>-</div><div class='del'>-		camel_object_unref((CamelObject *)parser);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-		if (!retried) {</div><div class='del'>-			retried = TRUE;</div><div class='del'>-			retval = camel_local_summary_check ((CamelLocalSummary *)folder-&gt;summary, lf-&gt;changes, ex);</div><div class='del'>-			if (retval != -1)</div><div class='del'>-				goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     _("The folder appears to be irrecoverably corrupted."));</div><div class='del'>-</div><div class='del'>-		camel_local_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-	</div><div class='del'>-	message = camel_mime_message_new();</div><div class='del'>-	if (camel_mime_part_construct_from_parser((CamelMimePart *)message, parser) == -1) {</div><div class='del'>-		camel_exception_setv(ex, errno==EINTR?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     _("Message construction failed: Corrupt mailbox?"));</div><div class='del'>-		camel_object_unref((CamelObject *)parser);</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-		camel_local_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_medium_remove_header((CamelMedium *)message, "X-Evolution");</div><div class='del'>-</div><div class='del'>-	/* and unlock now we're finished with it */</div><div class='del'>-	camel_local_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)parser);</div><div class='del'>-	</div><div class='del'>-	/* use the opportunity to notify of changes (particularly if we had a rebuild) */</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_flag_set(&amp;info-&gt;user_flags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_tag_set(&amp;info-&gt;user_tags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h<br/>deleted file mode 100644<br/>index aa0b67201f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MBOX_FOLDER_H</div><div class='del'>-#define CAMEL_MBOX_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-local-folder.h"</div><div class='del'>-#include "camel-mbox-summary.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_FOLDER_TYPE     (camel_mbox_folder_get_type ())</div><div class='del'>-#define CAMEL_MBOX_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolder))</div><div class='del'>-#define CAMEL_MBOX_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass))</div><div class='del'>-#define CAMEL_IS_MBOX_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolder parent_object;</div><div class='del'>-</div><div class='del'>-	int lockfd;		/* for when we have a lock on the folder */</div><div class='del'>-} CamelMboxFolder;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelMboxFolderClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-/* flags are taken from CAMEL_STORE_FOLDER_* flags */</div><div class='del'>-CamelFolder *camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mbox_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MBOX_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c<br/>deleted file mode 100644<br/>index 3333580766..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,172 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mbox-store.h"</div><div class='del'>-#include "camel-mbox-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-static CamelLocalStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMboxStore */</div><div class='del'>-#define CMBOXS_CLASS(so) CAMEL_MBOX_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_store_class_init (CamelMboxStoreClass *camel_mbox_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_mbox_store_class);</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mbox_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mbox_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mbox_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mbox_store_type = camel_type_register (CAMEL_LOCAL_STORE_TYPE, "CamelMboxStore",</div><div class='del'>-							     sizeof (CamelMboxStore),</div><div class='del'>-							     sizeof (CamelMboxStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_mbox_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mbox_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	(void) ((CamelStoreClass *)parent_class)-&gt;get_folder(store, folder_name, flags, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		int fd;</div><div class='del'>-</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not open file `%s':\n%s"),</div><div class='del'>-					     name, g_strerror(errno));</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Folder `%s' does not exist."),</div><div class='del'>-					     folder_name);</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0600);</div><div class='del'>-		if (fd == -1) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not create file `%s':\n%s"),</div><div class='del'>-					     name, g_strerror(errno));</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		g_free(name);</div><div class='del'>-		close(fd);</div><div class='del'>-	} else if (!S_ISREG(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("`%s' is not a regular file."),</div><div class='del'>-				     name);</div><div class='del'>-		g_free(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else</div><div class='del'>-		g_free(name);</div><div class='del'>-</div><div class='del'>-	return camel_mbox_folder_new(store, folder_name, flags, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf ("%s%s", CAMEL_LOCAL_STORE (store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-	if (stat (name, &amp;st) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not delete folder `%s':\n%s"),</div><div class='del'>-				      folder_name, g_strerror (errno));</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!S_ISREG (st.st_mode)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				      _("`%s' is not a regular file."), name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (st.st_size != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,</div><div class='del'>-				      _("Folder `%s' is not empty. Not deleted."),</div><div class='del'>-				      folder_name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (unlink(name) == -1 &amp;&amp; errno != ENOENT) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not delete folder `%s':\n%s"),</div><div class='del'>-				      name, g_strerror (errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	/* and remove metadata */</div><div class='del'>-	((CamelStoreClass *)parent_class)-&gt;delete_folder(store, folder_name, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h<br/>deleted file mode 100644<br/>index 5b6fbdd926..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MBOX_STORE_H</div><div class='del'>-#define CAMEL_MBOX_STORE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-local-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_STORE_TYPE     (camel_mbox_store_get_type ())</div><div class='del'>-#define CAMEL_MBOX_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_STORE_TYPE, CamelMboxStore))</div><div class='del'>-#define CAMEL_MBOX_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass))</div><div class='del'>-#define CAMEL_IS_MBOX_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStore parent_object;	</div><div class='del'>-	</div><div class='del'>-} CamelMboxStore;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelMboxStoreClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mbox_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MBOX_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c<br/>deleted file mode 100644<br/>index 2d06d29a38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,886 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-mbox-summary.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-operation.h"</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mbox-summary.h"</div><div class='del'>-#include "camel/camel-file-utils.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-operation.h"</div><div class='del'>-</div><div class='del'>-#define io(x)</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_SUMMARY_VERSION (0x1000)</div><div class='del'>-</div><div class='del'>-struct _CamelMboxSummaryPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelMboxSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static int summary_header_load (CamelFolderSummary *, FILE *);</div><div class='del'>-static int summary_header_save (CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);</div><div class='del'>-static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *);</div><div class='del'>-static int		  message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *);</div><div class='del'>-/*static void		  message_info_free (CamelFolderSummary *, CamelMessageInfo *);*/</div><div class='del'>-</div><div class='del'>-static int mbox_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static int mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_mbox_summary_class_init (CamelMboxSummaryClass *klass);</div><div class='del'>-static void camel_mbox_summary_init       (CamelMboxSummary *obj);</div><div class='del'>-static void camel_mbox_summary_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelLocalSummaryClass *camel_mbox_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mbox_summary_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_local_summary_get_type(), "CamelMboxSummary",</div><div class='del'>-					   sizeof (CamelMboxSummary),</div><div class='del'>-					   sizeof (CamelMboxSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_mbox_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_mbox_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_mbox_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_class_init(CamelMboxSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *)klass;</div><div class='del'>-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)klass;</div><div class='del'>-	</div><div class='del'>-	camel_mbox_summary_parent = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type());</div><div class='del'>-</div><div class='del'>-	sklass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	sklass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	sklass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	sklass-&gt;message_info_new_from_parser = message_info_new_from_parser;</div><div class='del'>-	sklass-&gt;message_info_load = message_info_load;</div><div class='del'>-	sklass-&gt;message_info_save = message_info_save;</div><div class='del'>-	/*sklass-&gt;message_info_free = message_info_free;*/</div><div class='del'>-</div><div class='del'>-	lklass-&gt;check = mbox_summary_check;</div><div class='del'>-	lklass-&gt;sync = mbox_summary_sync;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_init(CamelMboxSummary *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelMboxSummaryPrivate *p;</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMboxMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMboxMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_MBOX_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	/*CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(obj);*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mbox_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMboxSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMboxSummary widget.</div><div class='del'>- **/</div><div class='del'>-CamelMboxSummary *</div><div class='del'>-camel_mbox_summary_new(const char *filename, const char *mbox_name, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *new = (CamelMboxSummary *)camel_object_new(camel_mbox_summary_get_type());</div><div class='del'>-</div><div class='del'>-	camel_local_summary_construct((CamelLocalSummary *)new, filename, mbox_name, index);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;summary_header_load(s, in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_decode_uint32(in, &amp;mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save(CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;summary_header_save(s, out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_encode_uint32(out, mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		mbi-&gt;frompos = -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_new_from_parser(s, mp);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		mbi-&gt;frompos = camel_mime_parser_tell_start_from(mp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	io(printf("loading mbox message info\n"));</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_load(s, in);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-		</div><div class='del'>-		if (camel_file_util_decode_off_t(in, &amp;mbi-&gt;frompos) == -1)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-error:</div><div class='del'>-	camel_folder_summary_info_free(s, mi);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-	io(printf("saving mbox message info\n"));</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_save(s, out, mi) == -1</div><div class='del'>-	    || camel_file_util_encode_off_t(out, mbi-&gt;frompos) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_rebuild(CamelMboxSummary *mbs, off_t offset, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalSummary *cls = (CamelLocalSummary *)mbs;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	int fd;</div><div class='del'>-	int ok = 0;</div><div class='del'>-	struct stat st;</div><div class='del'>-	off_t size = 0;</div><div class='del'>-</div><div class='del'>-	/* FIXME: If there is a failure, it shouldn't clear the summary and restart,</div><div class='del'>-	   it should try and merge the summary info's.  This is a bit tricky. */</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		d(printf("%s failed to open: %s\n", cls-&gt;folder_path, strerror(errno)));</div><div class='del'>-		camel_exception_setv(ex, 1, _("Could not open folder: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (fstat(fd, &amp;st) == 0)</div><div class='del'>-		size = st.st_size;</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_seek(mp, offset, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	if (offset &gt; 0) {</div><div class='del'>-		if (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {</div><div class='del'>-			if (camel_mime_parser_tell_start_from(mp) != offset) {</div><div class='del'>-				g_warning("The next message didn't start where I expected, building summary from start");</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				offset = 0;</div><div class='del'>-				camel_mime_parser_seek(mp, offset, SEEK_SET);</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-			} else {</div><div class='del'>-				camel_mime_parser_unstep(mp);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("mime parser state ran out? state is %d\n", camel_mime_parser_state(mp)));</div><div class='del'>-			camel_object_unref(CAMEL_OBJECT(mp));</div><div class='del'>-			/* end of file - no content? no error either */</div><div class='del'>-			camel_operation_end(NULL);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-		off_t pc = camel_mime_parser_tell_start_from (mp) + 1;</div><div class='del'>-		</div><div class='del'>-		camel_operation_progress (NULL, (int) (((float) pc / size) * 100));</div><div class='del'>-</div><div class='del'>-		info = camel_folder_summary_add_from_parser(s, mp);</div><div class='del'>-		if (info == NULL) {</div><div class='del'>-			camel_exception_setv(ex, 1, _("Fatal mail parser error near position %ld in folder %s"),</div><div class='del'>-					     camel_mime_parser_tell(mp), cls-&gt;folder_path);</div><div class='del'>-			ok = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT (mp));</div><div class='del'>-	</div><div class='del'>-	/* update the file size/mtime in the summary */</div><div class='del'>-	if (ok != -1) {</div><div class='del'>-		if (stat(cls-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-			camel_folder_summary_touch(s);</div><div class='del'>-			mbs-&gt;folder_size = st.st_size;</div><div class='del'>-			s-&gt;time = st.st_mtime;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* like summary_rebuild, but also do changeinfo stuff (if supplied) */</div><div class='del'>-static int</div><div class='del'>-summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret, i, count;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;</div><div class='del'>-</div><div class='del'>-	d(printf("Calling summary update, from pos %d\n", (int)offset));</div><div class='del'>-</div><div class='del'>-	if (changeinfo) {</div><div class='del'>-		/* we use the diff function of the change_info to build the update list. */</div><div class='del'>-		for (i = 0; i &lt; camel_folder_summary_count(s); i++) {</div><div class='del'>-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-			camel_folder_change_info_add_source(changeinfo, camel_message_info_uid(mi));</div><div class='del'>-			camel_folder_summary_info_free(s, mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* do the actual work */</div><div class='del'>-	cls-&gt;index_force = FALSE;</div><div class='del'>-	ret = summary_rebuild(mbs, offset, ex);</div><div class='del'>-</div><div class='del'>-	if (changeinfo) {</div><div class='del'>-		count = camel_folder_summary_count(s);</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-			camel_folder_change_info_add_update(changeinfo, camel_message_info_uid(mi));</div><div class='del'>-			camel_folder_summary_info_free(s, mi);</div><div class='del'>-		}</div><div class='del'>-		camel_folder_change_info_build_diff(changeinfo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mbox_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("Checking summary\n"));</div><div class='del'>-</div><div class='del'>-	/* check if the summary is up-to-date */</div><div class='del'>-	if (stat(cls-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot check folder: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (st.st_size == 0) {</div><div class='del'>-		/* empty?  No need to scan at all */</div><div class='del'>-		d(printf("Empty mbox, clearing summary\n"));</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else if (s-&gt;messages-&gt;len == 0) {</div><div class='del'>-		/* if we are empty, then we rebuilt from scratch */</div><div class='del'>-		d(printf("Empty summary, rebuilding from start\n"));</div><div class='del'>-		ret = summary_update(cls, 0, changes, ex);</div><div class='del'>-	} else {</div><div class='del'>-		/* is the summary uptodate? */</div><div class='del'>-		if (st.st_size != mbs-&gt;folder_size || st.st_mtime != s-&gt;time) {</div><div class='del'>-			if (mbs-&gt;folder_size &lt; st.st_size) {</div><div class='del'>-				/* this will automatically rescan from 0 if there is a problem */</div><div class='del'>-				d(printf("folder grew, attempting to rebuild from %d\n", mbs-&gt;folder_size));</div><div class='del'>-				ret = summary_update(cls, mbs-&gt;folder_size, changes, ex);</div><div class='del'>-			} else {</div><div class='del'>-				d(printf("folder shrank!  rebuilding from start\n"));</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-				ret = summary_update(cls, 0, changes, ex);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: move upstream? */</div><div class='del'>-</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		if (mbs-&gt;folder_size != st.st_size || s-&gt;time != st.st_mtime) {</div><div class='del'>-			mbs-&gt;folder_size = st.st_size;</div><div class='del'>-			s-&gt;time = st.st_mtime;</div><div class='del'>-			camel_folder_summary_touch(s);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *tz_months[] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tz_days[] = {</div><div class='del'>-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tries to build a From line, based on message headers */</div><div class='del'>-char *</div><div class='del'>-camel_mbox_summary_build_from(struct _header_raw *header)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("From ");</div><div class='del'>-	char *ret;</div><div class='del'>-	const char *tmp;</div><div class='del'>-	time_t thetime;</div><div class='del'>-	int offset;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Sender", NULL);</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "From", NULL);</div><div class='del'>-	if (tmp != NULL) {</div><div class='del'>-		struct _header_address *addr = header_address_decode(tmp);</div><div class='del'>-</div><div class='del'>-		tmp = NULL;</div><div class='del'>-		if (addr) {</div><div class='del'>-			if (addr-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				g_string_append(out, addr-&gt;v.addr);</div><div class='del'>-				tmp = "";</div><div class='del'>-			}</div><div class='del'>-			header_address_unref(addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (tmp == NULL) {</div><div class='del'>-		g_string_append(out, "unknown@nodomain.now.au");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* try use the received header to get the date */</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Received", NULL);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		tmp = strrchr(tmp, ';');</div><div class='del'>-		if (tmp)</div><div class='del'>-			tmp++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if there isn't one, try the Date field */</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "Date", NULL);</div><div class='del'>-</div><div class='del'>-	thetime = header_decode_date(tmp, &amp;offset);</div><div class='del'>-</div><div class='del'>-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;</div><div class='del'>-</div><div class='del'>-	/* a pseudo, but still bogus attempt at thread safing the function */</div><div class='del'>-	/*memcpy(&amp;tm, gmtime(&amp;thetime), sizeof(tm));*/</div><div class='del'>-	gmtime_r(&amp;thetime, &amp;tm);</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa(out, " %s %s %2d %02d:%02d:%02d %4d\n",</div><div class='del'>-			  tz_days[tm.tm_wday],</div><div class='del'>-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);</div><div class='del'>-</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform a full sync */</div><div class='del'>-static int</div><div class='del'>-mbox_summary_sync_full(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-	CamelMimeParser *mp = NULL;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelMboxMessageInfo *info = NULL;</div><div class='del'>-	int fd = -1, fdout = -1;</div><div class='del'>-	char *tmpname = NULL;</div><div class='del'>-	char *buffer, *xevnew = NULL;</div><div class='del'>-	int len;</div><div class='del'>-	const char *fromline;</div><div class='del'>-	int lastdel = FALSE;</div><div class='del'>-</div><div class='del'>-	d(printf("performing full summary/sync\n"));</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not open file: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_scan_pre_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-	tmpname = alloca(strlen (cls-&gt;folder_path) + 5);</div><div class='del'>-	sprintf(tmpname, "%s.tmp", cls-&gt;folder_path);</div><div class='del'>-	d(printf("Writing tmp file to %s\n", tmpname));</div><div class='del'>-	fdout = open(tmpname, O_WRONLY|O_CREAT|O_TRUNC, 0600);</div><div class='del'>-	if (fdout == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot open temporary mailbox: %s"), strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		int pc = (i + 1) * 100 / count;</div><div class='del'>-</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-</div><div class='del'>-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-		g_assert(info);</div><div class='del'>-</div><div class='del'>-		d(printf("Looking at message %s\n", camel_message_info_uid(info)));</div><div class='del'>-</div><div class='del'>-		/* only need to seek past deleted messages, otherwise we should be at the right spot/state already */</div><div class='del'>-		if (lastdel) {</div><div class='del'>-			d(printf("seeking to %d\n", (int)info-&gt;frompos));</div><div class='del'>-			camel_mime_parser_seek(mp, info-&gt;frompos, SEEK_SET);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_FROM) {</div><div class='del'>-			g_warning("Expected a From line here, didn't get it");</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_tell_start_from(mp) != info-&gt;frompos) {</div><div class='del'>-			g_warning("Didn't get the next message where I expected (%d) got %d instead",</div><div class='del'>-				  (int)info-&gt;frompos, (int)camel_mime_parser_tell_start_from(mp));</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lastdel = FALSE;</div><div class='del'>-		if (expunge &amp;&amp; info-&gt;info.flags &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			const char *uid = camel_message_info_uid(info);</div><div class='del'>-</div><div class='del'>-			d(printf("Deleting %s\n", uid));</div><div class='del'>-</div><div class='del'>-			if (cls-&gt;index)</div><div class='del'>-				camel_index_delete_name(cls-&gt;index, uid);</div><div class='del'>-</div><div class='del'>-			/* remove it from the change list */</div><div class='del'>-			camel_folder_change_info_remove_uid(changeinfo, uid);</div><div class='del'>-			camel_folder_summary_remove(s, (CamelMessageInfo *)info);</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			count--;</div><div class='del'>-			i--;</div><div class='del'>-			info = NULL;</div><div class='del'>-			lastdel = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			/* otherwise, the message is staying, copy its From_ line across */</div><div class='del'>-			if (i&gt;0) {</div><div class='del'>-				write(fdout, "\n", 1);</div><div class='del'>-			}</div><div class='del'>-			info-&gt;frompos = lseek(fdout, 0, SEEK_CUR);</div><div class='del'>-			fromline = camel_mime_parser_from_line(mp);</div><div class='del'>-			write(fdout, fromline, strlen(fromline));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (info &amp;&amp; info-&gt;info.flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV | CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			d(printf("Updating header for %s flags = %08x\n", camel_message_info_uid(info), info-&gt;info.flags));</div><div class='del'>-</div><div class='del'>-			if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_FROM_END) {</div><div class='del'>-				g_warning("camel_mime_parser_step failed (2)");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			xevnew = camel_local_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);</div><div class='del'>-			if (camel_local_summary_write_headers(fdout, camel_mime_parser_headers_raw(mp), xevnew) == -1) {</div><div class='del'>-				d(printf("Error writing to tmp mailbox\n"));</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Error writing to temp mailbox: %s"),</div><div class='del'>-						     strerror(errno));</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-			info-&gt;info.flags &amp;= 0xffff;</div><div class='del'>-			g_free(xevnew);</div><div class='del'>-			xevnew = NULL;</div><div class='del'>-			camel_mime_parser_drop_step(mp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-		if (info) {</div><div class='del'>-			d(printf("looking for message content to copy across from %d\n", (int)camel_mime_parser_tell(mp)));</div><div class='del'>-			while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_PRE_FROM) {</div><div class='del'>-				/*d(printf("copying mbox contents to tmp: '%.*s'\n", len, buffer));*/</div><div class='del'>-				if (write(fdout, buffer, len) != len) {</div><div class='del'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Writing to tmp mailbox failed: %s: %s"),</div><div class='del'>-							     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			d(printf("we are now at %d, from = %d\n", (int)camel_mime_parser_tell(mp),</div><div class='del'>-				 (int)camel_mime_parser_tell_start_from(mp)));</div><div class='del'>-			camel_mime_parser_unstep(mp);</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			info = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("Closing folders\n"));</div><div class='del'>-</div><div class='del'>-	if (close(fd) == -1) {</div><div class='del'>-		g_warning("Cannot close source folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not close source folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		fd = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (close(fdout) == -1) {</div><div class='del'>-		g_warning("Cannot close tmp folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not close temp folder: %s"),</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		fdout = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this should probably either use unlink/link/unlink, or recopy over</div><div class='del'>-	   the original mailbox, for various locking reasons/etc */</div><div class='del'>-	if (rename(tmpname, cls-&gt;folder_path) == -1) {</div><div class='del'>-		g_warning("Cannot rename folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not rename folder: %s"),</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	tmpname = NULL;</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-		</div><div class='del'>-	return 0;</div><div class='del'>- error:</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close(fd);</div><div class='del'>-	</div><div class='del'>-	if (fdout != -1)</div><div class='del'>-		close(fdout);</div><div class='del'>-	</div><div class='del'>-	g_free(xevnew);</div><div class='del'>-	</div><div class='del'>-	if (tmpname)</div><div class='del'>-		unlink(tmpname);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref((CamelObject *)mp);</div><div class='del'>-	if (info)</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform a quick sync - only system flags have changed */</div><div class='del'>-static int</div><div class='del'>-mbox_summary_sync_quick(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-	CamelMimeParser *mp = NULL;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelMboxMessageInfo *info = NULL;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	char *xevnew, *xevtmp;</div><div class='del'>-	const char *xev;</div><div class='del'>-	int len;</div><div class='del'>-	off_t lastpos;</div><div class='del'>-</div><div class='del'>-	d(printf("Performing quick summary sync\n"));</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDWR);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not open file: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_scan_pre_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		int xevoffset;</div><div class='del'>-		int pc = (i+1)*100/count;</div><div class='del'>-</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-</div><div class='del'>-		info = (CamelMboxMessageInfo *)camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-		g_assert(info);</div><div class='del'>-</div><div class='del'>-		d(printf("Checking message %s %08x\n", camel_message_info_uid(info), info-&gt;info.flags));</div><div class='del'>-</div><div class='del'>-		if ((info-&gt;info.flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) == 0) {</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			info = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d(printf("Updating message %s\n", camel_message_info_uid(info)));</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_seek(mp, info-&gt;frompos, SEEK_SET);</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, 0, 0) != HSCAN_FROM) {</div><div class='del'>-			g_warning("Expected a From line here, didn't get it");</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_tell_start_from(mp) != info-&gt;frompos) {</div><div class='del'>-			g_warning("Didn't get the next message where I expected (%d) got %d instead",</div><div class='del'>-				  (int)info-&gt;frompos, (int)camel_mime_parser_tell_start_from(mp));</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, 0, 0) == HSCAN_FROM_END) {</div><div class='del'>-			g_warning("camel_mime_parser_step failed (2)");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xev = camel_mime_parser_header(mp, "X-Evolution", &amp;xevoffset);</div><div class='del'>-		if (xev == NULL || camel_local_summary_decode_x_evolution(cls, xev, NULL) == -1) {</div><div class='del'>-			g_warning("We're supposed to have a valid x-ev header, but we dont");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		xevnew = camel_local_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);</div><div class='del'>-		/* SIGH: encode_param_list is about the only function which folds headers by itself.</div><div class='del'>-		   This should be fixed somehow differently (either parser doesn't fold headers,</div><div class='del'>-		   or param_list doesn't, or something */</div><div class='del'>-		xevtmp = header_unfold(xevnew);</div><div class='del'>-		/* the raw header contains a leading ' ', so (dis)count that too */</div><div class='del'>-		if (strlen(xev)-1 != strlen(xevtmp)) {</div><div class='del'>-			g_free(xevnew);</div><div class='del'>-			g_free(xevtmp);</div><div class='del'>-			g_warning("Hmm, the xev headers shouldn't have changed size, but they did");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		g_free(xevtmp);</div><div class='del'>-</div><div class='del'>-		/* we write out the xevnew string, assuming its been folded identically to the original too! */</div><div class='del'>-</div><div class='del'>-		lastpos = lseek(fd, 0, SEEK_CUR);</div><div class='del'>-		lseek(fd, xevoffset+strlen("X-Evolution: "), SEEK_SET);</div><div class='del'>-		do {</div><div class='del'>-			len = write(fd, xevnew, strlen(xevnew));</div><div class='del'>-		} while (len == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-		lseek(fd, lastpos, SEEK_SET);</div><div class='del'>-		g_free(xevnew);</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-</div><div class='del'>-		info-&gt;info.flags &amp;= 0xffff;</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("Closing folders\n"));</div><div class='del'>-</div><div class='del'>-	if (close(fd) == -1) {</div><div class='del'>-		g_warning("Cannot close source folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not close source folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		fd = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>- error:</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close(fd);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref((CamelObject *)mp);</div><div class='del'>-	if (info)</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mbox_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelMboxSummary *mbs = (CamelMboxSummary *)cls;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	int i, count;</div><div class='del'>-	int quick = TRUE, work=FALSE;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* first, sync ourselves up, just to make sure */</div><div class='del'>-	if (camel_local_summary_check(cls, changeinfo, ex) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check what work we have to do, if any */</div><div class='del'>-	for (i=0;quick &amp;&amp; i&lt;count; i++) {</div><div class='del'>-		CamelMessageInfo *info = camel_folder_summary_index(s, i);</div><div class='del'>-		g_assert(info);</div><div class='del'>-		if ((expunge &amp;&amp; (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)) ||</div><div class='del'>-		    (info-&gt;flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_XEVCHANGE)))</div><div class='del'>-			quick = FALSE;</div><div class='del'>-		else</div><div class='del'>-			work |= (info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) != 0;</div><div class='del'>-		camel_folder_summary_info_free(s, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* yuck i hate this logic, but its to simplify the 'all ok, update summary' and failover cases */</div><div class='del'>-	ret = -1;</div><div class='del'>-	if (quick) {</div><div class='del'>-		if (work) {</div><div class='del'>-			ret = mbox_summary_sync_quick(cls, expunge, changeinfo, ex);</div><div class='del'>-			if (ret == -1) {</div><div class='del'>-				g_warning("failed a quick-sync, trying a full sync");</div><div class='del'>-				camel_exception_clear(ex);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		ret = mbox_summary_sync_full(cls, expunge, changeinfo, ex);</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (stat(cls-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unknown error: %s"), strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (mbs-&gt;folder_size != st.st_size || s-&gt;time != st.st_mtime) {</div><div class='del'>-		s-&gt;time = st.st_mtime;</div><div class='del'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		camel_folder_summary_touch(s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ((CamelLocalSummaryClass *)camel_mbox_summary_parent)-&gt;sync(cls, expunge, changeinfo, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h<br/>deleted file mode 100644<br/>index 6c61da21e5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mbox-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mbox-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MBOX_SUMMARY_H</div><div class='del'>-#define _CAMEL_MBOX_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_mbox_summary_get_type (), CamelMboxSummary)</div><div class='del'>-#define CAMEL_MBOX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass)</div><div class='del'>-#define CAMEL_IS_MBOX_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mbox_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMboxSummary      CamelMboxSummary;</div><div class='del'>-typedef struct _CamelMboxSummaryClass CamelMboxSummaryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMboxMessageContentInfo {</div><div class='del'>-	CamelMessageContentInfo info;</div><div class='del'>-} CamelMboxMessageContentInfo;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMboxMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-</div><div class='del'>-	off_t frompos;</div><div class='del'>-} CamelMboxMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelMboxSummary {</div><div class='del'>-	CamelLocalSummary parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMboxSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	size_t folder_size;	/* size of the mbox file, last sync */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMboxSummaryClass {</div><div class='del'>-	CamelLocalSummaryClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		camel_mbox_summary_get_type	(void);</div><div class='del'>-CamelMboxSummary      *camel_mbox_summary_new	(const char *filename, const char *mbox_name, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-/* generate a From line from headers */</div><div class='del'>-char *camel_mbox_summary_build_from(struct _header_raw *header);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MBOX_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c<br/>deleted file mode 100644<br/>index 396435da0e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-mh-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-static CamelLocalFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMhFolder */</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMHS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelLocalSummary *mh_create_summary(const char *path, const char *folder, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, char **appended_uid, CamelException * ex);</div><div class='del'>-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static void mh_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void camel_mh_folder_class_init(CamelObjectClass * camel_mh_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mh_folder_class);</div><div class='del'>-	CamelLocalFolderClass *lclass = (CamelLocalFolderClass *)camel_mh_folder_class;</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_LOCAL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_local_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;append_message = mh_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_message = mh_get_message;</div><div class='del'>-</div><div class='del'>-	lclass-&gt;create_summary = mh_create_summary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	/*CamelFolder *folder = object;</div><div class='del'>-	  CamelMhFolder *mh_folder = object;*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	/*CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(object);*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_mh_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mh_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mh_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mh_folder_type = camel_type_register(CAMEL_LOCAL_FOLDER_TYPE, "CamelMhFolder",</div><div class='del'>-							   sizeof(CamelMhFolder),</div><div class='del'>-							   sizeof(CamelMhFolderClass),</div><div class='del'>-							   (CamelObjectClassInitFunc) camel_mh_folder_class_init,</div><div class='del'>-							   NULL,</div><div class='del'>-							   (CamelObjectInitFunc) mh_init,</div><div class='del'>-							   (CamelObjectFinalizeFunc) mh_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mh_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("Creating mh folder: %s\n", full_name));</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)camel_object_new(CAMEL_MH_FOLDER_TYPE);</div><div class='del'>-	folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder,</div><div class='del'>-							     parent_store, full_name, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelLocalSummary *mh_create_summary(const char *path, const char *folder, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	return (CamelLocalSummary *)camel_mh_summary_new(path, folder, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mh_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = (CamelMhFolder *)folder;</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelStream *output_stream;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	/* FIXME: probably needs additional locking (although mh doesn't appear do do it) */</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message\n"));</div><div class='del'>-</div><div class='del'>-	/* add it to the summary/assign the uid, etc */</div><div class='del'>-	mi = camel_local_summary_add((CamelLocalSummary *)folder-&gt;summary, message, info, lf-&gt;changes, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	d(printf("Appending message: uid is %s\n", camel_message_info_uid(mi)));</div><div class='del'>-	</div><div class='del'>-	/* write it out, use the uid we got from the summary */</div><div class='del'>-	name = g_strdup_printf("%s/%s", lf-&gt;folder_path, camel_message_info_uid(mi));</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name(name, O_WRONLY|O_CREAT, 0600);</div><div class='del'>-	if (output_stream == NULL)</div><div class='del'>-		goto fail_write;</div><div class='del'>-	</div><div class='del'>-	if (camel_data_wrapper_write_to_stream ((CamelDataWrapper *)message, output_stream) == -1</div><div class='del'>-	    || camel_stream_close (output_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-	</div><div class='del'>-	/* close this? */</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (output_stream));</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-	</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed",</div><div class='del'>-				    ((CamelLocalFolder *)mh_folder)-&gt;changes);</div><div class='del'>-	camel_folder_change_info_clear (((CamelLocalFolder *)mh_folder)-&gt;changes);</div><div class='del'>-	</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = g_strdup(camel_message_info_uid(mi));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>- fail_write:</div><div class='del'>-	</div><div class='del'>-	/* remove the summary info so we are not out-of-sync with the mh folder */</div><div class='del'>-	camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (folder-&gt;summary),</div><div class='del'>-					 camel_message_info_uid (mi));</div><div class='del'>-	</div><div class='del'>-	if (errno == EINTR)</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-				     _("MH append message cancelled"));</div><div class='del'>-	else</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot append message to mh folder: %s: %s"),</div><div class='del'>-				      name, g_strerror (errno));</div><div class='del'>-	</div><div class='del'>-	if (output_stream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (output_stream));</div><div class='del'>-		unlink (name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	CamelLocalFolder *lf = (CamelLocalFolder *)folder;</div><div class='del'>-	CamelStream *message_stream = NULL;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	d(printf("getting message: %s\n", uid));</div><div class='del'>-</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	if ((info = camel_folder_summary_uid(folder-&gt;summary, uid)) == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"), uid, _("No such message"));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we only need it to check the message exists */</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s/%s", lf-&gt;folder_path, uid);</div><div class='del'>-	if ((message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0)) == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),</div><div class='del'>-				     name, g_strerror(errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	message = camel_mime_message_new();</div><div class='del'>-	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, message_stream) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),</div><div class='del'>-				     name, _("Invalid message contents"));</div><div class='del'>-		g_free(name);</div><div class='del'>-		camel_object_unref((CamelObject *)message_stream);</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)message_stream);</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h<br/>deleted file mode 100644<br/>index 125f8c8ac5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * 	Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MH_FOLDER_H</div><div class='del'>-#define CAMEL_MH_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-#include "camel-local-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_FOLDER_TYPE     (camel_mh_folder_get_type ())</div><div class='del'>-#define CAMEL_MH_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_FOLDER_TYPE, CamelMhFolder))</div><div class='del'>-#define CAMEL_MH_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass))</div><div class='del'>-#define CAMEL_IS_MH_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolder parent_object;</div><div class='del'>-</div><div class='del'>-} CamelMhFolder;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalFolderClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	</div><div class='del'>-} CamelMhFolderClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mh_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-#endif				/* CAMEL_MH_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c<br/>deleted file mode 100644<br/>index 8b8c2e5f0e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-static CamelLocalStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMhStore */</div><div class='del'>-#define CMHS_CLASS(so) CAMEL_MH_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static void camel_mh_store_class_init(CamelObjectClass * camel_mh_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_mh_store_class);</div><div class='del'>-	/*CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_mh_store_class);*/</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalStoreClass *)camel_type_get_global_classfuncs(camel_local_store_get_type());</div><div class='del'>-</div><div class='del'>-	/* virtual method overload, use defaults for most */</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_mh_store_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mh_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mh_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mh_store_type = camel_type_register(CAMEL_LOCAL_STORE_TYPE, "CamelMhStore",</div><div class='del'>-							  sizeof(CamelMhStore),</div><div class='del'>-							  sizeof(CamelMhStoreClass),</div><div class='del'>-							  (CamelObjectClassInitFunc) camel_mh_store_class_init,</div><div class='del'>-							  NULL,</div><div class='del'>-							  NULL,</div><div class='del'>-							  NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mh_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	(void) ((CamelStoreClass *)parent_class)-&gt;get_folder(store, folder_name, flags, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not open folder `%s':\n%s"),</div><div class='del'>-					     folder_name, g_strerror(errno));</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Folder `%s' does not exist."), folder_name);</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if (mkdir(name, 0700) != 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not create folder `%s':\n%s"),</div><div class='del'>-					     folder_name, g_strerror(errno));</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	} else if (!S_ISDIR(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("`%s' is not a directory."), name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return camel_mh_folder_new(store, folder_name, flags, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	/* remove folder directory - will fail if not empty */</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)-&gt;toplevel_dir, folder_name);</div><div class='del'>-	if (rmdir(name) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not delete folder `%s': %s"),</div><div class='del'>-				     folder_name, strerror(errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	/* and remove metadata */</div><div class='del'>-	((CamelStoreClass *)parent_class)-&gt;delete_folder(store, folder_name, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h<br/>deleted file mode 100644<br/>index b69bddb7c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MH_STORE_H</div><div class='del'>-#define CAMEL_MH_STORE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-</div><div class='del'>-#include "camel-local-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_STORE_TYPE     (camel_mh_store_get_type ())</div><div class='del'>-#define CAMEL_MH_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_STORE_TYPE, CamelMhStore))</div><div class='del'>-#define CAMEL_MH_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass))</div><div class='del'>-#define CAMEL_IS_MH_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStore parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelMhStore;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelLocalStoreClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelMhStoreClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mh_store_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-#endif				/* CAMEL_MH_STORE_H */</div><div class='head'>diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c<br/>deleted file mode 100644<br/>index 530baa3caf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,390 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-mh-summary.h"</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_SUMMARY_VERSION (0x2000)</div><div class='del'>-</div><div class='del'>-static int mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static int mh_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-/*static int mh_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);*/</div><div class='del'>-</div><div class='del'>-static char *mh_summary_next_uid_string(CamelFolderSummary *s);</div><div class='del'>-</div><div class='del'>-static void camel_mh_summary_class_init	(CamelMhSummaryClass *class);</div><div class='del'>-static void camel_mh_summary_init	(CamelMhSummary *gspaper);</div><div class='del'>-static void camel_mh_summary_finalise	(CamelObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((CamelMhSummary *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummaryPrivate {</div><div class='del'>-	char *current_uid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelLocalSummaryClass *parent_class;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mh_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_local_summary_get_type (), "CamelMhSummary",</div><div class='del'>-					   sizeof(CamelMhSummary),</div><div class='del'>-					   sizeof(CamelMhSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc)camel_mh_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc)camel_mh_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc)camel_mh_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_class_init (CamelMhSummaryClass *class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;</div><div class='del'>-	CamelLocalSummaryClass *lklass = (CamelLocalSummaryClass *)class;</div><div class='del'>-</div><div class='del'>-	parent_class = (CamelLocalSummaryClass *)camel_type_get_global_classfuncs(camel_local_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	sklass-&gt;next_uid_string = mh_summary_next_uid_string;</div><div class='del'>-</div><div class='del'>-	lklass-&gt;check = mh_summary_check;</div><div class='del'>-	lklass-&gt;sync = mh_summary_sync;</div><div class='del'>-	/*lklass-&gt;add = mh_summary_add;*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_init (CamelMhSummary *o)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;</div><div class='del'>-</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-	/* set unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_MH_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *o = (CamelMhSummary *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mh_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMhSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #CamelMhSummary object.</div><div class='del'>- **/</div><div class='del'>-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, CamelIndex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *o = (CamelMhSummary *)camel_object_new(camel_mh_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	camel_local_summary_construct((CamelLocalSummary *)o, filename, mhdir, index);</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *mh_summary_next_uid_string(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *mhs = (CamelMhSummary *)s;</div><div class='del'>-	CamelLocalSummary *cls = (CamelLocalSummary *)s;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	guint32 uid;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	/* if we are working to add an existing file, then use current_uid */</div><div class='del'>-	if (mhs-&gt;priv-&gt;current_uid)</div><div class='del'>-		return g_strdup(mhs-&gt;priv-&gt;current_uid);</div><div class='del'>-</div><div class='del'>-	/* else scan for one - and create it too, to make sure */</div><div class='del'>-	do {</div><div class='del'>-		close(fd);</div><div class='del'>-		uid = camel_folder_summary_next_uid(s);</div><div class='del'>-		name = g_strdup_printf("%s/%u", cls-&gt;folder_path, uid);</div><div class='del'>-		/* O_EXCL isn't guaranteed, sigh.  Oh well, bad luck, mh has problems anyway */</div><div class='del'>-		fd = open(name, O_WRONLY|O_CREAT|O_EXCL, 0600);</div><div class='del'>-		g_free(name);</div><div class='del'>-	} while (fd == -1 &amp;&amp; errno == EEXIST);</div><div class='del'>-</div><div class='del'>-	close(fd);</div><div class='del'>-</div><div class='del'>-	return g_strdup_printf("%u", uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int camel_mh_summary_add(CamelLocalSummary *cls, const char *name, int forceindex)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *mhs = (CamelMhSummary *)cls;</div><div class='del'>-	char *filename = g_strdup_printf("%s/%s", cls-&gt;folder_path, name);</div><div class='del'>-	int fd;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-</div><div class='del'>-	d(printf("summarising: %s\n", name));</div><div class='del'>-</div><div class='del'>-	fd = open(filename, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));</div><div class='del'>-		g_free(filename);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, FALSE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	if (cls-&gt;index &amp;&amp; (forceindex || !camel_index_has_name(cls-&gt;index, name))) {</div><div class='del'>-		d(printf("forcing indexing of message content\n"));</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, cls-&gt;index);</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);</div><div class='del'>-	}</div><div class='del'>-	mhs-&gt;priv-&gt;current_uid = (char *)name;</div><div class='del'>-	camel_folder_summary_add_from_parser((CamelFolderSummary *)mhs, mp);</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	mhs-&gt;priv-&gt;current_uid = NULL;</div><div class='del'>-	camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);</div><div class='del'>-	g_free(filename);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_summary(char *key, CamelMessageInfo *info, CamelLocalSummary *cls)</div><div class='del'>-{</div><div class='del'>-	d(printf("removing message %s from summary\n", key));</div><div class='del'>-	if (cls-&gt;index)</div><div class='del'>-		camel_index_delete_name(cls-&gt;index, camel_message_info_uid(info));</div><div class='del'>-	camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-	camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mh_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *p, c;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GHashTable *left;</div><div class='del'>-	int i, count;</div><div class='del'>-	int forceindex;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Handle changeinfo */</div><div class='del'>-</div><div class='del'>-	d(printf("checking summary ...\n"));</div><div class='del'>-</div><div class='del'>-	/* scan the directory, check for mail files not in the index, or index entries that</div><div class='del'>-	   no longer exist */</div><div class='del'>-	dir = opendir(cls-&gt;folder_path);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot open MH directory path: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* keeps track of all uid's that have not been processed */</div><div class='del'>-	left = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)cls);</div><div class='del'>-	forceindex = count == 0;</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);</div><div class='del'>-		if (info) {</div><div class='del'>-			g_hash_table_insert(left, (char *)camel_message_info_uid(info), info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		/* FIXME: also run stat to check for regular file */</div><div class='del'>-		p = d-&gt;d_name;</div><div class='del'>-		while ( (c = *p++) ) {</div><div class='del'>-			if (!isdigit(c))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (c==0) {</div><div class='del'>-			info = camel_folder_summary_uid((CamelFolderSummary *)cls, d-&gt;d_name);</div><div class='del'>-			if (info == NULL || (cls-&gt;index &amp;&amp; (!camel_index_has_name(cls-&gt;index, d-&gt;d_name)))) {</div><div class='del'>-				/* need to add this file to the summary */</div><div class='del'>-				if (info != NULL) {</div><div class='del'>-					g_hash_table_remove(left, camel_message_info_uid(info));</div><div class='del'>-					camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-					camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-				}</div><div class='del'>-				camel_mh_summary_add(cls, d-&gt;d_name, forceindex);</div><div class='del'>-			} else {</div><div class='del'>-				const char *uid = camel_message_info_uid(info);</div><div class='del'>-				CamelMessageInfo *old = g_hash_table_lookup(left, uid);</div><div class='del'>-</div><div class='del'>-				if (old) {</div><div class='del'>-					camel_folder_summary_info_free((CamelFolderSummary *)cls, old);</div><div class='del'>-					g_hash_table_remove(left, uid);</div><div class='del'>-				}</div><div class='del'>-				camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-			}	</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-	g_hash_table_foreach(left, (GHFunc)remove_summary, cls);</div><div class='del'>-	g_hash_table_destroy(left);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-mh_summary_sync_message(CamelLocalSummary *cls, CamelMessageInfo *info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	const char *xev, *buffer;</div><div class='del'>-	int xevoffset;</div><div class='del'>-	int fd, outfd, len, outlen, ret=0;</div><div class='del'>-	char *name, *tmpname, *xevnew;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s/%s", cls-&gt;folder_path, camel_message_info_uid(info));</div><div class='del'>-	fd = open(name, O_RDWR);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	if (camel_mime_parser_step(mp, 0, 0) != HSCAN_EOF) {</div><div class='del'>-		xev = camel_mime_parser_header(mp, "X-Evolution", &amp;xevoffset);</div><div class='del'>-		d(printf("xev = '%s'\n", xev));</div><div class='del'>-		xevnew = camel_local_summary_encode_x_evolution(cls, info);</div><div class='del'>-		if (xev == NULL</div><div class='del'>-		    || camel_local_summary_decode_x_evolution(cls, xev, NULL) == -1</div><div class='del'>-		    || strlen(xev)-1 != strlen(xevnew)) {</div><div class='del'>-</div><div class='del'>-			d(printf("camel local summary_decode_xev = %d\n", camel_local_summary_decode_x_evolution(cls, xev, NULL)));</div><div class='del'>-</div><div class='del'>-			/* need to write a new copy/unlink old */</div><div class='del'>-			tmpname = g_strdup_printf("%s/.tmp.%d.%s", cls-&gt;folder_path, getpid(), camel_message_info_uid(info));</div><div class='del'>-			d(printf("old xev was %d %s new xev is %d %s\n", strlen(xev), xev, strlen(xevnew), xevnew));</div><div class='del'>-			d(printf("creating new message %s\n", tmpname));</div><div class='del'>-			outfd = open(tmpname, O_CREAT|O_WRONLY|O_TRUNC, 0600);</div><div class='del'>-			if (outfd != -1) {</div><div class='del'>-				outlen = 0;</div><div class='del'>-				len = camel_local_summary_write_headers(outfd, camel_mime_parser_headers_raw(mp), xevnew);</div><div class='del'>-				if (len != -1) {</div><div class='del'>-					while (outlen != -1 &amp;&amp; (len = camel_mime_parser_read(mp, &amp;buffer, 10240)) &gt; 0) {</div><div class='del'>-						d(printf("camel mime parser read, read %d bytes: %.*s\n", len, len, buffer));</div><div class='del'>-						do {</div><div class='del'>-							outlen = write(outfd, buffer, len);</div><div class='del'>-						} while (outlen == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				d(printf("len = %d outlen = %d, renaming/finishing\n", len, outlen));</div><div class='del'>-				if (close(outfd) == -1</div><div class='del'>-				    || len == -1</div><div class='del'>-				    || outlen == -1</div><div class='del'>-				    || rename(tmpname, name) == -1) {</div><div class='del'>-					unlink(tmpname);</div><div class='del'>-					ret = -1;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("sync can't create tmp file: %s", strerror(errno));</div><div class='del'>-			}</div><div class='del'>-			g_free(tmpname);</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("stamping in updated X-EV at %d\n", (int)xevoffset));</div><div class='del'>-			/* else, we can just update the flags field */</div><div class='del'>-			lseek(fd, xevoffset+strlen("X-Evolution: "), SEEK_SET);</div><div class='del'>-			do {</div><div class='del'>-				len = write(fd, xevnew, strlen(xevnew));</div><div class='del'>-			} while (len == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-			if (len == -1)</div><div class='del'>-				ret = -1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free(xevnew);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	g_free(name);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sync the summary file with the ondisk files */</div><div class='del'>-static int</div><div class='del'>-mh_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int count, i;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *name;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	d(printf("summary_sync(expunge=%s)\n", expunge?"true":"false"));</div><div class='del'>-</div><div class='del'>-	/* we could probably get away without this ... but why not use it, esp if we're going to</div><div class='del'>-	   be doing any significant io already */</div><div class='del'>-	if (camel_local_summary_check(cls, changes, ex) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)cls);</div><div class='del'>-	for (i=count-1;i&gt;=0;i--) {</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)cls, i);</div><div class='del'>-		g_assert(info);</div><div class='del'>-		if (expunge &amp;&amp; (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)) {</div><div class='del'>-			uid = camel_message_info_uid(info);</div><div class='del'>-			name = g_strdup_printf("%s/%s", cls-&gt;folder_path, uid);</div><div class='del'>-			d(printf("deleting %s\n", name));</div><div class='del'>-			if (unlink(name) == 0 || errno==ENOENT) {</div><div class='del'>-</div><div class='del'>-				/* FIXME: put this in folder_summary::remove()? */</div><div class='del'>-				if (cls-&gt;index)</div><div class='del'>-					camel_index_delete_name(cls-&gt;index, (char *)uid);</div><div class='del'>-				</div><div class='del'>-				camel_folder_change_info_remove_uid(changes, uid);</div><div class='del'>-				camel_folder_summary_remove((CamelFolderSummary *)cls, info);</div><div class='del'>-			}</div><div class='del'>-			g_free(name);</div><div class='del'>-		} else if (info-&gt;flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			if (mh_summary_sync_message(cls, info, ex) != -1) {</div><div class='del'>-				info-&gt;flags &amp;= 0xffff;</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("Problem occured when trying to expunge, ignored");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_folder_summary_info_free((CamelFolderSummary *)cls, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ((CamelLocalSummaryClass *)parent_class)-&gt;sync(cls, expunge, changes, ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h<br/>deleted file mode 100644<br/>index 4ee30df63b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-mh-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-mh-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_MH_SUMMARY_H</div><div class='del'>-#define _CAMEL_MH_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include "camel-local-summary.h"</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_mh_summary_get_type (), CamelMhSummary)</div><div class='del'>-#define CAMEL_MH_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass)</div><div class='del'>-#define CAMEL_IS_MH_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mh_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMhSummary	CamelMhSummary;</div><div class='del'>-typedef struct _CamelMhSummaryClass	CamelMhSummaryClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummary {</div><div class='del'>-	CamelLocalSummary parent;</div><div class='del'>-	struct _CamelMhSummaryPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummaryClass {</div><div class='del'>-	CamelLocalSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	 camel_mh_summary_get_type	(void);</div><div class='del'>-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MH_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c<br/>deleted file mode 100644<br/>index a519c58683..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,701 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- * </div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-spool-folder.h"</div><div class='del'>-#include "camel-spool-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-spool-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-filter-from.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include "camel-lock-client.h"</div><div class='del'>-</div><div class='del'>-#include "camel-local-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSpoolFolder */</div><div class='del'>-#define CSPOOLF_CLASS(so) CAMEL_SPOOL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CSPOOLS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static int spool_lock(CamelSpoolFolder *lf, CamelLockType type, CamelException *ex);</div><div class='del'>-static void spool_unlock(CamelSpoolFolder *lf);</div><div class='del'>-</div><div class='del'>-static void spool_sync(CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static void spool_expunge(CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *spool_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-static GPtrArray *spool_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex);</div><div class='del'>-static void spool_search_free(CamelFolder *folder, GPtrArray * result);</div><div class='del'>-</div><div class='del'>-static void spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex);</div><div class='del'>-static CamelMimeMessage *spool_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex);</div><div class='del'>-static void spool_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-static void spool_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static void spool_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spool_folder_class_init(CamelSpoolFolderClass * camel_spool_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_spool_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs(camel_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = spool_sync;</div><div class='del'>-	camel_folder_class-&gt;expunge = spool_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = spool_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_by_uids = spool_search_by_uids;</div><div class='del'>-	camel_folder_class-&gt;search_free = spool_search_free;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;append_message = spool_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_message = spool_get_message;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = spool_set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = spool_set_message_user_tag;</div><div class='del'>-</div><div class='del'>-	camel_spool_folder_class-&gt;lock = spool_lock;</div><div class='del'>-	camel_spool_folder_class-&gt;unlock = spool_unlock;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-	CamelSpoolFolder *spool_folder = object;</div><div class='del'>-</div><div class='del'>-	folder-&gt;folder_flags |= (CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY |</div><div class='del'>-				 CAMEL_FOLDER_HAS_SEARCH_CAPABILITY);</div><div class='del'>-</div><div class='del'>-	folder-&gt;permanent_flags = CAMEL_MESSAGE_ANSWERED |</div><div class='del'>-	    CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_DRAFT |</div><div class='del'>-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;</div><div class='del'>-</div><div class='del'>-	folder-&gt;summary = NULL;</div><div class='del'>-	spool_folder-&gt;search = NULL;</div><div class='del'>-</div><div class='del'>-	spool_folder-&gt;priv = g_malloc0(sizeof(*spool_folder-&gt;priv));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	spool_folder-&gt;priv-&gt;search_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *spool_folder = CAMEL_SPOOL_FOLDER(object);</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)object;</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;summary) {</div><div class='del'>-		camel_spool_summary_sync((CamelSpoolSummary *)folder-&gt;summary, FALSE, spool_folder-&gt;changes, NULL);</div><div class='del'>-		camel_object_unref((CamelObject *)folder-&gt;summary);</div><div class='del'>-		folder-&gt;summary = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (spool_folder-&gt;search) {</div><div class='del'>-		camel_object_unref((CamelObject *)spool_folder-&gt;search);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (spool_folder-&gt;locked&gt; 0)</div><div class='del'>-		camel_spool_folder_unlock(spool_folder);</div><div class='del'>-</div><div class='del'>-	g_free(spool_folder-&gt;base_path);</div><div class='del'>-	g_free(spool_folder-&gt;folder_path);</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(spool_folder-&gt;changes);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	g_mutex_free(spool_folder-&gt;priv-&gt;search_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(spool_folder-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_spool_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_spool_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_spool_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_spool_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelSpoolFolder",</div><div class='del'>-							     sizeof(CamelSpoolFolder),</div><div class='del'>-							     sizeof(CamelSpoolFolderClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_spool_folder_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) spool_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) spool_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_spool_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelSpoolFolder *</div><div class='del'>-camel_spool_folder_construct(CamelSpoolFolder *lf, CamelStore *parent_store, const char *full_name, const char *path, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	const char *root_dir_path, *name;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)lf;</div><div class='del'>-</div><div class='del'>-	name = strrchr(full_name, '/');</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = full_name;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct(folder, parent_store, full_name, name);</div><div class='del'>-</div><div class='del'>-	root_dir_path = camel_spool_store_get_toplevel_dir(CAMEL_SPOOL_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	lf-&gt;base_path = g_strdup(root_dir_path);</div><div class='del'>-	lf-&gt;folder_path = g_strdup(root_dir_path);</div><div class='del'>-#else</div><div class='del'>-	lf-&gt;base_path = g_strdup(path);</div><div class='del'>-	lf-&gt;folder_path = g_strdup(path);</div><div class='del'>-#endif</div><div class='del'>-	lf-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	lf-&gt;flags = flags;</div><div class='del'>-</div><div class='del'>-	folder-&gt;summary = (CamelFolderSummary *)camel_spool_summary_new(lf-&gt;folder_path);</div><div class='del'>-	if (camel_spool_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1) {</div><div class='del'>-		camel_object_unref((CamelObject *)lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_spool_summary_check((CamelSpoolSummary *)folder-&gt;summary, lf-&gt;changes, ex);</div><div class='del'>-	camel_spool_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	fi = g_malloc0(sizeof(*fi));</div><div class='del'>-	fi-&gt;full_name = g_strdup(full_name);</div><div class='del'>-	fi-&gt;name = g_strdup(name);</div><div class='del'>-	fi-&gt;url = g_strdup_printf("spool:%s#%s", ((CamelService *)parent_store)-&gt;url-&gt;path, full_name);</div><div class='del'>-	fi-&gt;unread_message_count = camel_folder_get_unread_message_count(folder);</div><div class='del'>-	camel_folder_info_build_path(fi, '/');</div><div class='del'>-	</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(parent_store), "folder_created", fi);</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-</div><div class='del'>-	return lf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_spool_folder_new(CamelStore *parent_store, const char *full_name, const char *path, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("Creating spool folder: %s in %s\n", full_name, camel_local_store_get_toplevel_dir((CamelLocalStore *)parent_store)));</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)camel_object_new(CAMEL_SPOOL_FOLDER_TYPE);</div><div class='del'>-</div><div class='del'>-	if (parent_store-&gt;flags &amp; CAMEL_STORE_FILTER_INBOX</div><div class='del'>-	    &amp;&amp; strcmp(full_name, "INBOX") == 0)</div><div class='del'>-		folder-&gt;folder_flags |= CAMEL_FOLDER_FILTER_RECENT;</div><div class='del'>-	folder = (CamelFolder *)camel_spool_folder_construct((CamelSpoolFolder *)folder, parent_store, full_name, path, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* lock the folder, may be called repeatedly (with matching unlock calls),</div><div class='del'>-   with type the same or less than the first call */</div><div class='del'>-int camel_spool_folder_lock(CamelSpoolFolder *lf, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (lf-&gt;locked &gt; 0) {</div><div class='del'>-		/* lets be anal here - its important the code knows what its doing */</div><div class='del'>-		g_assert(lf-&gt;locktype == type || lf-&gt;locktype == CAMEL_LOCK_WRITE);</div><div class='del'>-	} else {</div><div class='del'>-		if (CSPOOLF_CLASS(lf)-&gt;lock(lf, type, ex) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		lf-&gt;locktype = type;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	lf-&gt;locked++;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* unlock folder */</div><div class='del'>-int camel_spool_folder_unlock(CamelSpoolFolder *lf)</div><div class='del'>-{</div><div class='del'>-	g_assert(lf-&gt;locked&gt;0);</div><div class='del'>-	lf-&gt;locked--;</div><div class='del'>-	if (lf-&gt;locked == 0)</div><div class='del'>-		CSPOOLF_CLASS(lf)-&gt;unlock(lf);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spool_lock(CamelSpoolFolder *lf, CamelLockType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int retry = 0;</div><div class='del'>-</div><div class='del'>-	lf-&gt;lockfd = open(lf-&gt;folder_path, O_RDWR, 0);</div><div class='del'>-	if (lf-&gt;lockfd == -1) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot create folder lock on %s: %s"), lf-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (retry &lt; CAMEL_LOCK_RETRY) {</div><div class='del'>-		if (retry &gt; 0)</div><div class='del'>-			sleep(CAMEL_LOCK_DELAY);</div><div class='del'>-</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-		if (camel_lock_fcntl(lf-&gt;lockfd, type, ex) == 0) {</div><div class='del'>-			if (camel_lock_flock(lf-&gt;lockfd, type, ex) == 0) {</div><div class='del'>-				if ((lf-&gt;lockid = camel_lock_helper_lock(lf-&gt;folder_path, ex)) != -1)</div><div class='del'>-					return 0;</div><div class='del'>-				camel_unlock_flock(lf-&gt;lockfd);</div><div class='del'>-			}</div><div class='del'>-			camel_unlock_fcntl(lf-&gt;lockfd);</div><div class='del'>-		}</div><div class='del'>-		retry++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_unlock(CamelSpoolFolder *lf)</div><div class='del'>-{</div><div class='del'>-	camel_lock_helper_unlock(lf-&gt;lockid);</div><div class='del'>-	lf-&gt;lockid = -1;</div><div class='del'>-	camel_unlock_flock(lf-&gt;lockid);</div><div class='del'>-	camel_unlock_fcntl(lf-&gt;lockid);</div><div class='del'>-</div><div class='del'>-	close(lf-&gt;lockfd);</div><div class='del'>-	lf-&gt;lockfd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *lf = CAMEL_SPOOL_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	d(printf("spool sync, expunge=%s\n", expunge?"true":"false"));</div><div class='del'>-</div><div class='del'>-	if (camel_spool_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* if sync fails, we'll pass it up on exit through ex */</div><div class='del'>-	camel_spool_summary_sync((CamelSpoolSummary *)folder-&gt;summary, expunge, lf-&gt;changes, ex);</div><div class='del'>-	camel_spool_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_expunge(CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	d(printf("expunge\n"));</div><div class='del'>-</div><div class='del'>-	/* Just do a sync with expunge, serves the same purpose */</div><div class='del'>-	/* call the callback directly, to avoid locking problems */</div><div class='del'>-	CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(folder))-&gt;sync(folder, TRUE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-spool_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *spool_folder = CAMEL_SPOOL_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	CAMEL_SPOOL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if (spool_folder-&gt;search == NULL)</div><div class='del'>-		spool_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(spool_folder-&gt;search, folder);</div><div class='del'>-	summary = camel_folder_get_summary(folder);</div><div class='del'>-	camel_folder_search_set_summary(spool_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(spool_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_SPOOL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_free_summary(folder, summary);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-spool_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *spool_folder = CAMEL_SPOOL_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	summary = g_ptr_array_new();</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		info = camel_folder_get_message_info(folder, uids-&gt;pdata[i]);</div><div class='del'>-		if (info)</div><div class='del'>-			g_ptr_array_add(summary, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;len == 0)</div><div class='del'>-		return summary;</div><div class='del'>-</div><div class='del'>-	CAMEL_SPOOL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if (spool_folder-&gt;search == NULL)</div><div class='del'>-		spool_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(spool_folder-&gt;search, folder);</div><div class='del'>-	camel_folder_search_set_summary(spool_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(spool_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_SPOOL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++)</div><div class='del'>-		camel_folder_free_message_info(folder, summary-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(summary, TRUE);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_search_free(CamelFolder *folder, GPtrArray * result)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *spool_folder = CAMEL_SPOOL_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	/* we need to lock this free because of the way search_free_result works */</div><div class='del'>-	/* FIXME: put the lock inside search_free_result */</div><div class='del'>-	CAMEL_SPOOL_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result(spool_folder-&gt;search, result);</div><div class='del'>-</div><div class='del'>-	CAMEL_SPOOL_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info, char **appended_uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *lf = (CamelSpoolFolder *)folder;</div><div class='del'>-	CamelStream *output_stream = NULL, *filter_stream = NULL;</div><div class='del'>-	CamelMimeFilter *filter_from = NULL;</div><div class='del'>-	CamelSpoolSummary *mbs = (CamelSpoolSummary *)folder-&gt;summary;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *fromline = NULL;</div><div class='del'>-	int fd;</div><div class='del'>-	struct stat st;</div><div class='del'>-#if 0</div><div class='del'>-	char *xev;</div><div class='del'>-#endif</div><div class='del'>-	/* If we can't lock, dont do anything */</div><div class='del'>-	if (camel_spool_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message\n"));</div><div class='del'>-</div><div class='del'>-	/* first, check the summary is correct (updates folder_size too) */</div><div class='del'>-	camel_spool_summary_check((CamelSpoolSummary *)folder-&gt;summary, lf-&gt;changes, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* add it to the summary/assign the uid, etc */</div><div class='del'>-	mi = camel_spool_summary_add((CamelSpoolSummary *)folder-&gt;summary, message, info, lf-&gt;changes, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	d(printf("Appending message: uid is %s\n", camel_message_info_uid(mi)));</div><div class='del'>-</div><div class='del'>-	output_stream = camel_stream_fs_new_with_name(lf-&gt;folder_path, O_WRONLY|O_APPEND, 0600);</div><div class='del'>-	if (output_stream == NULL) {</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot open mailbox: %s: %s\n"), lf-&gt;folder_path, strerror(errno));</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and we need to set the frompos/XEV explicitly */</div><div class='del'>-	((CamelSpoolMessageInfo *)mi)-&gt;frompos = mbs-&gt;folder_size?mbs-&gt;folder_size+1:0;</div><div class='del'>-#if 0</div><div class='del'>-	xev = camel_spool_summary_encode_x_evolution((CamelLocalSummary *)folder-&gt;summary, mi);</div><div class='del'>-	if (xev) {</div><div class='del'>-		/* the x-ev header should match the 'current' flags, no problem, so store as much */</div><div class='del'>-		camel_medium_set_header((CamelMedium *)message, "X-Evolution", xev);</div><div class='del'>-		mi-&gt;flags &amp;= ~ CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		g_free(xev);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* we must write this to the non-filtered stream ... prepend a \n if not at the start of the file */</div><div class='del'>-	fromline = camel_spool_summary_build_from(((CamelMimePart *)message)-&gt;headers);</div><div class='del'>-	if (camel_stream_printf(output_stream, mbs-&gt;folder_size==0?"%s":"\n%s", fromline) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	/* and write the content to the filtering stream, that translated '\nFrom' into '\n&gt;From' */</div><div class='del'>-	filter_stream = (CamelStream *) camel_stream_filter_new_with_stream(output_stream);</div><div class='del'>-	filter_from = (CamelMimeFilter *) camel_mime_filter_from_new();</div><div class='del'>-	camel_stream_filter_add((CamelStreamFilter *) filter_stream, filter_from);</div><div class='del'>-	if (camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, filter_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_close(filter_stream) == -1)</div><div class='del'>-		goto fail_write;</div><div class='del'>-</div><div class='del'>-	/* unlock as soon as we can */</div><div class='del'>-	camel_spool_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	/* filter stream ref's the output stream itself, so we need to unref it too */</div><div class='del'>-	camel_object_unref((CamelObject *)filter_from);</div><div class='del'>-	camel_object_unref((CamelObject *)filter_stream);</div><div class='del'>-	camel_object_unref((CamelObject *)output_stream);</div><div class='del'>-	g_free(fromline);</div><div class='del'>-</div><div class='del'>-	/* now we 'fudge' the summary  to tell it its uptodate, because its idea of uptodate has just changed */</div><div class='del'>-	/* the stat really shouldn't fail, we just wrote to it */</div><div class='del'>-	if (stat(lf-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		((CamelFolderSummary *)mbs)-&gt;time = st.st_mtime;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (appended_uid)</div><div class='del'>-		*appended_uid = g_strdup(camel_message_info_uid(mi));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-fail_write:</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			      _("Cannot append message to spool file: %s: %s"),</div><div class='del'>-			      lf-&gt;folder_path, g_strerror (errno));</div><div class='del'>-</div><div class='del'>-	if (filter_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(filter_stream));</div><div class='del'>-</div><div class='del'>-	if (output_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(output_stream));</div><div class='del'>-</div><div class='del'>-	if (filter_from)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(filter_from));</div><div class='del'>-</div><div class='del'>-	g_free(fromline);</div><div class='del'>-</div><div class='del'>-	/* reset the file to original size */</div><div class='del'>-	fd = open(lf-&gt;folder_path, O_WRONLY, 0600);</div><div class='del'>-	if (fd != -1) {</div><div class='del'>-		ftruncate(fd, mbs-&gt;folder_size);</div><div class='del'>-		close(fd);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* remove the summary info so we are not out-of-sync with the spool */</div><div class='del'>-	camel_folder_summary_remove_uid (CAMEL_FOLDER_SUMMARY (mbs), camel_message_info_uid (mi));</div><div class='del'>-	</div><div class='del'>-	/* and tell the summary its uptodate */</div><div class='del'>-	if (stat(lf-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-		mbs-&gt;folder_size = st.st_size;</div><div class='del'>-		((CamelFolderSummary *)mbs)-&gt;time = st.st_mtime;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-fail:</div><div class='del'>-	/* make sure we unlock the folder - before we start triggering events into appland */</div><div class='del'>-	camel_spool_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	/* cascade the changes through, anyway, if there are any outstanding */</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-spool_get_message(CamelFolder *folder, const gchar * uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolFolder *lf = (CamelSpoolFolder *)folder;</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelSpoolMessageInfo *info;</div><div class='del'>-	CamelMimeParser *parser;</div><div class='del'>-	int fd;</div><div class='del'>-	int retried = FALSE;</div><div class='del'>-	</div><div class='del'>-	d(printf("Getting message %s\n", uid));</div><div class='del'>-</div><div class='del'>-	/* lock the folder first, burn if we can't, need write lock for summary check */</div><div class='del'>-	if (camel_spool_folder_lock(lf, CAMEL_LOCK_WRITE, ex) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* check for new messages, this may renumber uid's though */</div><div class='del'>-	if (camel_spool_summary_check((CamelSpoolSummary *)folder-&gt;summary, lf-&gt;changes, ex) == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-retry:</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	info = (CamelSpoolMessageInfo *) camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s\n  %s"), uid, _("No such message"));</div><div class='del'>-		camel_spool_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* no frompos, its an error in the library (and we can't do anything with it */</div><div class='del'>-	g_assert(info-&gt;frompos != -1);</div><div class='del'>-	</div><div class='del'>-	/* we use an fd instead of a normal stream here - the reason is subtle, camel_mime_part will cache</div><div class='del'>-	   the whole message in memory if the stream is non-seekable (which it is when built from a parser</div><div class='del'>-	   with no stream).  This means we dont have to lock the spool for the life of the message, but only</div><div class='del'>-	   while it is being created. */</div><div class='del'>-</div><div class='del'>-	fd = open(lf-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		camel_spool_folder_unlock(lf);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* we use a parser to verify the message is correct, and in the correct position */</div><div class='del'>-	parser = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_init_with_fd(parser, fd);</div><div class='del'>-	camel_mime_parser_scan_from(parser, TRUE);</div><div class='del'>-</div><div class='del'>-	camel_mime_parser_seek(parser, info-&gt;frompos, SEEK_SET);</div><div class='del'>-	if (camel_mime_parser_step(parser, NULL, NULL) != HSCAN_FROM</div><div class='del'>-	    || camel_mime_parser_tell_start_from(parser) != info-&gt;frompos) {</div><div class='del'>-</div><div class='del'>-		g_warning("Summary doesn't match the folder contents!  eek!\n"</div><div class='del'>-			  "  expecting offset %ld got %ld, state = %d", (long int)info-&gt;frompos,</div><div class='del'>-			  (long int)camel_mime_parser_tell_start_from(parser),</div><div class='del'>-			  camel_mime_parser_state(parser));</div><div class='del'>-</div><div class='del'>-		camel_object_unref((CamelObject *)parser);</div><div class='del'>-		camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-		if (!retried) {</div><div class='del'>-			retried = TRUE;</div><div class='del'>-			camel_spool_summary_check((CamelSpoolSummary *)folder-&gt;summary, lf-&gt;changes, ex);</div><div class='del'>-			if (!camel_exception_is_set(ex))</div><div class='del'>-				goto retry;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     _("The folder appears to be irrecoverably corrupted."));</div><div class='del'>-</div><div class='del'>-		camel_spool_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, (CamelMessageInfo *)info);</div><div class='del'>-	</div><div class='del'>-	message = camel_mime_message_new();</div><div class='del'>-	if (camel_mime_part_construct_from_parser((CamelMimePart *)message, parser) == -1) {</div><div class='del'>-		camel_exception_setv(ex, (errno==EINTR)?CAMEL_EXCEPTION_USER_CANCEL:CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				     _("Cannot get message: %s from folder %s\n  %s"), uid, lf-&gt;folder_path,</div><div class='del'>-				     _("Message construction failed: Corrupt mailbox?"));</div><div class='del'>-		camel_object_unref((CamelObject *)parser);</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-		camel_spool_folder_unlock(lf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and unlock now we're finished with it */</div><div class='del'>-	camel_spool_folder_unlock(lf);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)parser);</div><div class='del'>-	</div><div class='del'>-	/* use the opportunity to notify of changes (particularly if we had a rebuild) */</div><div class='del'>-	if (camel_folder_change_info_changed(lf-&gt;changes)) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", lf-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(lf-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_flag_set(&amp;info-&gt;user_flags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spool_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(folder-&gt;summary != NULL);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	if (camel_tag_set(&amp;info-&gt;user_tags, name, value)) {</div><div class='del'>-		info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED|CAMEL_MESSAGE_FOLDER_XEVCHANGE;</div><div class='del'>-		camel_folder_summary_touch(folder-&gt;summary);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_summary_info_free(folder-&gt;summary, info);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h<br/>deleted file mode 100644<br/>index af43e0dca1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Author: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SPOOL_FOLDER_H</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-search.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-#include "camel-spool-summary.h"</div><div class='del'>-#include "camel-lock.h"</div><div class='del'>-</div><div class='del'>-/*  #include "camel-store.h" */</div><div class='del'>-</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_TYPE     (camel_spool_folder_get_type ())</div><div class='del'>-#define CAMEL_SPOOL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SPOOL_FOLDER_TYPE, CamelSpoolFolder))</div><div class='del'>-#define CAMEL_SPOOL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SPOOL_FOLDER_TYPE, CamelSpoolFolderClass))</div><div class='del'>-#define CAMEL_IS_SPOOL_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SPOOL_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolder parent_object;</div><div class='del'>-	struct _CamelSpoolFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	guint32 flags;		/* open mode flags */</div><div class='del'>-</div><div class='del'>-	int locked;		/* lock counter */</div><div class='del'>-	CamelLockType locktype;	/* what type of lock we have */</div><div class='del'>-	int lockfd;		/* lock fd used for fcntl/etc locking */</div><div class='del'>-	int lockid;		/* lock id for dot locking */</div><div class='del'>-</div><div class='del'>-	char *base_path;	/* base path of the spool folder */</div><div class='del'>-	char *folder_path;	/* the path to the folder itself */</div><div class='del'>-#if 0</div><div class='del'>-	char *summary_path;	/* where the summary lives */</div><div class='del'>-	char *index_path;	/* where the index file lives */</div><div class='del'>-</div><div class='del'>-	ibex *index;		   /* index for this folder */</div><div class='del'>-#endif</div><div class='del'>-	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */</div><div class='del'>-	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */</div><div class='del'>-} CamelSpoolFolder;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-</div><div class='del'>-	/* summary factory, only used at init */</div><div class='del'>-	CamelSpoolSummary *(*create_summary)(const char *path, const char *folder, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-	/* Lock the folder for my operations */</div><div class='del'>-	int (*lock)(CamelSpoolFolder *, CamelLockType type, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	/* Unlock the folder for my operations */</div><div class='del'>-	void (*unlock)(CamelSpoolFolder *);</div><div class='del'>-} CamelSpoolFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-/* flags are taken from CAMEL_STORE_FOLDER_* flags */</div><div class='del'>-CamelSpoolFolder *camel_spool_folder_construct(CamelSpoolFolder *lf, CamelStore *parent_store,</div><div class='del'>-					       const char *full_name, const char *path, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_spool_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-CamelFolder *camel_spool_folder_new(CamelStore *parent_store, const char *full_name, const char *path,</div><div class='del'>-				    guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Lock the folder for internal use.  May be called repeatedly */</div><div class='del'>-/* UNIMPLEMENTED */</div><div class='del'>-int camel_spool_folder_lock(CamelSpoolFolder *lf, CamelLockType type, CamelException *ex);</div><div class='del'>-int camel_spool_folder_unlock(CamelSpoolFolder *lf);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SPOOL_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c<br/>deleted file mode 100644<br/>index b0a1bda602..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,217 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-spool-store.h"</div><div class='del'>-#include "camel-spool-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSpoolStore */</div><div class='del'>-#define CSPOOLS_CLASS(so) CAMEL_SPOOL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex);</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static char *get_name(CamelService *service, gboolean brief);</div><div class='del'>-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spool_store_class_init (CamelSpoolStoreClass *camel_spool_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_spool_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_spool_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_inbox = get_inbox;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = free_folder_info;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_spool_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_spool_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_spool_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_spool_store_type = camel_type_register (CAMEL_STORE_TYPE, "CamelSpoolStore",</div><div class='del'>-							     sizeof (CamelSpoolStore),</div><div class='del'>-							     sizeof (CamelSpoolStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_spool_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_spool_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	d(printf("constructing store of type %s '%s:%s'\n",</div><div class='del'>-		 camel_type_to_name(((CamelObject *)service)-&gt;s.type), url-&gt;protocol, url-&gt;path));</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url-&gt;path[0] != '/') {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Store root %s is not an absolute path"), service-&gt;url-&gt;path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stat(service-&gt;url-&gt;path, &amp;st) == -1 || !S_ISREG(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Spool `%s' does not exist or is not a regular file"),</div><div class='del'>-				     service-&gt;url-&gt;path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_spool_store_get_toplevel_dir (CamelSpoolStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-</div><div class='del'>-	g_assert (url != NULL);</div><div class='del'>-	return url-&gt;path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *path = ((CamelService *)store)-&gt;url-&gt;path;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("opening folder %s on path %s\n", folder_name, path));</div><div class='del'>-</div><div class='del'>-	/* we only support an 'INBOX' */</div><div class='del'>-	if (strcmp(folder_name, "INBOX") != 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Folder `%s/%s' does not exist."),</div><div class='del'>-				     path, folder_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folder = camel_spool_folder_new(store, folder_name, path, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_inbox(CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return get_folder (store, "INBOX", CAMEL_STORE_FOLDER_CREATE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (service-&gt;url-&gt;path);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("Spool mail file %s"), service-&gt;url-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi = NULL;</div><div class='del'>-	CamelService *service = (CamelService *)store;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	if (top == NULL || strcmp(top, "INBOX") == 0) {</div><div class='del'>-		fi = g_malloc0(sizeof(*fi));</div><div class='del'>-		fi-&gt;full_name = "INBOX";</div><div class='del'>-		fi-&gt;name = "INBOX";</div><div class='del'>-		fi-&gt;url = g_strdup_printf("spool:%s#%s", service-&gt;url-&gt;path, fi-&gt;name);</div><div class='del'>-</div><div class='del'>-		CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-		folder = g_hash_table_lookup(store-&gt;folders, fi-&gt;full_name);</div><div class='del'>-		if (folder)</div><div class='del'>-			fi-&gt;unread_message_count = camel_folder_get_unread_message_count(folder);</div><div class='del'>-		else</div><div class='del'>-			fi-&gt;unread_message_count = -1;</div><div class='del'>-		CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-		camel_folder_info_build_path(fi, '/');</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi) {</div><div class='del'>-		g_free(fi-&gt;url);</div><div class='del'>-		g_free(fi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* default implementation, rename all */</div><div class='del'>-static void</div><div class='del'>-rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Spool folders cannot be renamed"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default implementation, only delete metadata */</div><div class='del'>-static void</div><div class='del'>-delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Spool folders cannot be deleted"));</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h<br/>deleted file mode 100644<br/>index 677f6aa0ed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SPOOL_STORE_H</div><div class='del'>-#define CAMEL_SPOOL_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_SPOOL_STORE_TYPE     (camel_spool_store_get_type ())</div><div class='del'>-#define CAMEL_SPOOL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SPOOL_STORE_TYPE, CamelSpoolStore))</div><div class='del'>-#define CAMEL_SPOOL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SPOOL_STORE_TYPE, CamelSpoolStoreClass))</div><div class='del'>-#define CAMEL_IS_SPOOL_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SPOOL_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;	</div><div class='del'>-</div><div class='del'>-} CamelSpoolStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSpoolStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_spool_store_get_type (void);</div><div class='del'>-</div><div class='del'>-const gchar *camel_spool_store_get_toplevel_dir (CamelSpoolStore *store);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SPOOL_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c<br/>deleted file mode 100644<br/>index ff8f6a85a9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1288 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-spool-summary.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-file-utils.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-#define io(x)</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-</div><div class='del'>-#define CAMEL_SPOOL_SUMMARY_VERSION (0x400)</div><div class='del'>-</div><div class='del'>-struct _CamelSpoolSummaryPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelSpoolSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static int summary_header_load (CamelFolderSummary *, FILE *);</div><div class='del'>-static int summary_header_save (CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static CamelMessageInfo * message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp);</div><div class='del'>-static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *);</div><div class='del'>-static int		  message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *);</div><div class='del'>-</div><div class='del'>-static int spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *mi);</div><div class='del'>-static char *spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-static int spool_summary_load(CamelSpoolSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-static int spool_summary_check(CamelSpoolSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static int spool_summary_sync(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-static CamelMessageInfo *spool_summary_add(CamelSpoolSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static int spool_summary_sync_full(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_spool_summary_class_init (CamelSpoolSummaryClass *klass);</div><div class='del'>-static void camel_spool_summary_init       (CamelSpoolSummary *obj);</div><div class='del'>-static void camel_spool_summary_finalise   (CamelObject *obj);</div><div class='del'>-static CamelFolderSummaryClass *camel_spool_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_spool_summary_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_folder_summary_get_type(), "CamelSpoolSummary",</div><div class='del'>-					   sizeof (CamelSpoolSummary),</div><div class='del'>-					   sizeof (CamelSpoolSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_spool_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_spool_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_spool_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spool_summary_class_init(CamelSpoolSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_spool_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	sklass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	sklass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	sklass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	sklass-&gt;message_info_new_from_parser  = message_info_new_from_parser;</div><div class='del'>-	sklass-&gt;message_info_load = message_info_load;</div><div class='del'>-	sklass-&gt;message_info_save = message_info_save;</div><div class='del'>-</div><div class='del'>-	klass-&gt;load = spool_summary_load;</div><div class='del'>-	klass-&gt;check = spool_summary_check;</div><div class='del'>-	klass-&gt;sync = spool_summary_sync;</div><div class='del'>-	klass-&gt;add = spool_summary_add;</div><div class='del'>-</div><div class='del'>-	klass-&gt;encode_x_evolution = spool_summary_encode_x_evolution;</div><div class='del'>-	klass-&gt;decode_x_evolution = spool_summary_decode_x_evolution;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spool_summary_init(CamelSpoolSummary *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelSpoolSummaryPrivate *p;</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelSpoolMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_SPOOL_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spool_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolSummary *mbs = CAMEL_SPOOL_SUMMARY(obj);</div><div class='del'>-</div><div class='del'>-	g_free(mbs-&gt;folder_path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelSpoolSummary *</div><div class='del'>-camel_spool_summary_new(const char *filename)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolSummary *new = (CamelSpoolSummary *)camel_object_new(camel_spool_summary_get_type());</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_build_content(CAMEL_FOLDER_SUMMARY(new), FALSE);</div><div class='del'>-	new-&gt;folder_path = g_strdup(filename);</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spool_summary_load(CamelSpoolSummary *cls, int forceindex, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning("spool_summary_load() should nto b e called\n");</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_load((CamelFolderSummary *)cls);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int</div><div class='del'>-camel_spool_summary_load(CamelSpoolSummary *cls, int forceindex, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-</div><div class='del'>-	g_warning("spool_summary_load() should nto b e called\n");</div><div class='del'>-</div><div class='del'>-	d(printf("Loading summary ...\n"));</div><div class='del'>-</div><div class='del'>-	if (forceindex</div><div class='del'>-	    || stat(s-&gt;summary_path, &amp;st) == -1</div><div class='del'>-	    || ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;load(cls, forceindex, ex) == -1) {</div><div class='del'>-		camel_folder_summary_clear((CamelFolderSummary *)cls);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_spool_summary_check(cls, NULL, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	return ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;encode_x_evolution(cls, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	return ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;decode_x_evolution(cls, xev, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_spool_summary_check(CamelSpoolSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	ret = ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;check(cls, changeinfo, ex);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_spool_summary_sync(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;sync(cls, expunge, changeinfo, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMessageInfo *</div><div class='del'>-camel_spool_summary_add(CamelSpoolSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return ((CamelSpoolSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))-&gt;add(cls, msg, info, ci, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_spool_summary_write_headers:</div><div class='del'>- * @fd: </div><div class='del'>- * @header: </div><div class='del'>- * @xevline: </div><div class='del'>- * </div><div class='del'>- * Write a bunch of headers to the file @fd.  IF xevline is non NULL, then</div><div class='del'>- * an X-Evolution header line is created at the end of all of the headers.</div><div class='del'>- * The headers written are termianted with a blank line.</div><div class='del'>- * </div><div class='del'>- * Return value: -1 on error, otherwise the number of bytes written.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_spool_summary_write_headers(int fd, struct _header_raw *header, char *xevline)</div><div class='del'>-{</div><div class='del'>-	int outlen = 0, len;</div><div class='del'>-	int newfd;</div><div class='del'>-	FILE *out;</div><div class='del'>-</div><div class='del'>-	/* dum de dum, maybe the whole sync function should just use stdio for output */</div><div class='del'>-	newfd = dup(fd);</div><div class='del'>-	if (newfd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	out = fdopen(newfd, "w");</div><div class='del'>-	if (out == NULL) {</div><div class='del'>-		close(newfd);</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (header) {</div><div class='del'>-		if (strcmp(header-&gt;name, "X-Evolution")) {</div><div class='del'>-			len = fprintf(out, "%s:%s\n", header-&gt;name, header-&gt;value);</div><div class='del'>-			if (len == -1) {</div><div class='del'>-				fclose(out);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-			outlen += len;</div><div class='del'>-		}</div><div class='del'>-		header = header-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (xevline) {</div><div class='del'>-		len = fprintf(out, "X-Evolution: %s\n\n", xevline);</div><div class='del'>-		if (len == -1) {</div><div class='del'>-			fclose(out);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		outlen += len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fclose(out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return outlen;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolSummary *mbs = CAMEL_SPOOL_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;summary_header_load(s, in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_decode_uint32(in, &amp;mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save(CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolSummary *mbs = CAMEL_SPOOL_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;summary_header_save(s, out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_file_util_encode_uint32(out, mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelSpoolSummary *cls = (CamelSpoolSummary *)s;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelSpoolMessageInfo *mbi = (CamelSpoolMessageInfo *)mi;</div><div class='del'>-		const char *xev;</div><div class='del'>-</div><div class='del'>-		xev = header_raw_find(&amp;h, "X-Evolution", NULL);</div><div class='del'>-		if (xev==NULL || camel_spool_summary_decode_x_evolution(cls, xev, mi) == -1) {</div><div class='del'>-			/* to indicate it has no xev header */</div><div class='del'>-			mi-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV;</div><div class='del'>-			camel_message_info_set_uid(mi, camel_folder_summary_next_uid_string(s));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		mbi-&gt;frompos = -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;message_info_new_from_parser(s, mp);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelSpoolMessageInfo *mbi = (CamelSpoolMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		mbi-&gt;frompos = camel_mime_parser_tell_start_from(mp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	io(printf("loading spool message info\n"));</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;message_info_load(s, in);</div><div class='del'>-	if (mi) {</div><div class='del'>-		CamelSpoolMessageInfo *mbi = (CamelSpoolMessageInfo *)mi;</div><div class='del'>-		</div><div class='del'>-		if (camel_file_util_decode_off_t(in, &amp;mbi-&gt;frompos) == -1)</div><div class='del'>-			goto error;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-error:</div><div class='del'>-	camel_folder_summary_info_free(s, mi);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-message_info_save(CamelFolderSummary *s, FILE *out, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	CamelSpoolMessageInfo *mbi = (CamelSpoolMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-	io(printf("saving spool message info\n"));</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_spool_summary_parent)-&gt;message_info_save(s, out, mi) == -1</div><div class='del'>-	    || camel_file_util_encode_off_t(out, mbi-&gt;frompos) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_rebuild(CamelSpoolSummary *cls, off_t offset, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	int fd;</div><div class='del'>-	int ok = 0;</div><div class='del'>-	struct stat st;</div><div class='del'>-	off_t size = 0;</div><div class='del'>-</div><div class='del'>-	/* FIXME: If there is a failure, it shouldn't clear the summary and restart,</div><div class='del'>-	   it should try and merge the summary info's.  This is a bit tricky. */</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		d(printf("%s failed to open: %s\n", cls-&gt;folder_path, strerror(errno)));</div><div class='del'>-		camel_exception_setv(ex, 1, _("Could not open folder: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, offset, strerror(errno));</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (fstat(fd, &amp;st) == 0)</div><div class='del'>-		size = st.st_size;</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_seek(mp, offset, SEEK_SET);</div><div class='del'>-</div><div class='del'>-	if (offset &gt; 0) {</div><div class='del'>-		if (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {</div><div class='del'>-			if (camel_mime_parser_tell_start_from(mp) != offset) {</div><div class='del'>-				g_warning("The next message didn't start where I expected, building summary from start");</div><div class='del'>-				camel_mime_parser_drop_step(mp);</div><div class='del'>-				offset = 0;</div><div class='del'>-				camel_mime_parser_seek(mp, offset, SEEK_SET);</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-			} else {</div><div class='del'>-				camel_mime_parser_unstep(mp);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			d(printf("mime parser state ran out? state is %d\n", camel_mime_parser_state(mp)));</div><div class='del'>-			camel_object_unref(CAMEL_OBJECT(mp));</div><div class='del'>-			/* end of file - no content? no error either */</div><div class='del'>-			camel_operation_end(NULL);</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-		off_t pc = camel_mime_parser_tell_start_from (mp) + 1;</div><div class='del'>-		</div><div class='del'>-		camel_operation_progress (NULL, (int) (((float) pc / size) * 100));</div><div class='del'>-		</div><div class='del'>-		info = camel_folder_summary_add_from_parser(s, mp);</div><div class='del'>-		if (info == NULL) {</div><div class='del'>-			camel_exception_setv(ex, 1, _("Fatal mail parser error near position %ld in folder %s"),</div><div class='del'>-					     camel_mime_parser_tell(mp), cls-&gt;folder_path);</div><div class='del'>-			ok = -1;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT (mp));</div><div class='del'>-	</div><div class='del'>-	/* update the file size/mtime in the summary */</div><div class='del'>-	if (ok != -1) {</div><div class='del'>-		if (stat(cls-&gt;folder_path, &amp;st) == 0) {</div><div class='del'>-			camel_folder_summary_touch(s);</div><div class='del'>-			cls-&gt;folder_size = st.st_size;</div><div class='del'>-			s-&gt;time = st.st_mtime;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* like summary_rebuild, but also do changeinfo stuff (if supplied) */</div><div class='del'>-static int</div><div class='del'>-summary_update(CamelSpoolSummary *cls, off_t offset, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret, i, count;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-</div><div class='del'>-	d(printf("Calling summary update, from pos %d\n", (int)offset));</div><div class='del'>-</div><div class='del'>-	if (changeinfo) {</div><div class='del'>-		/* we use the diff function of the change_info to build the update list. */</div><div class='del'>-		for (i = 0; i &lt; camel_folder_summary_count(s); i++) {</div><div class='del'>-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-			camel_folder_change_info_add_source(changeinfo, camel_message_info_uid(mi));</div><div class='del'>-			camel_folder_summary_info_free(s, mi);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* do the actual work */</div><div class='del'>-	ret = summary_rebuild(cls, offset, ex);</div><div class='del'>-</div><div class='del'>-	if (changeinfo) {</div><div class='del'>-		count = camel_folder_summary_count(s);</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-			camel_folder_change_info_add_update(changeinfo, camel_message_info_uid(mi));</div><div class='del'>-			camel_folder_summary_info_free(s, mi);</div><div class='del'>-		}</div><div class='del'>-		camel_folder_change_info_build_diff(changeinfo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spool_summary_check(CamelSpoolSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("Checking summary\n"));</div><div class='del'>-</div><div class='del'>-	/* check if the summary is up-to-date */</div><div class='del'>-	if (stat(cls-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		camel_exception_setv(ex, 1, _("Cannot check folder: %s: %s"), cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (st.st_size == 0) {</div><div class='del'>-		/* empty?  No need to scan at all */</div><div class='del'>-		d(printf("Empty spool, clearing summary\n"));</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else if (s-&gt;messages-&gt;len == 0) {</div><div class='del'>-		/* if we are empty, then we rebuilt from scratch */</div><div class='del'>-		d(printf("Empty summary, rebuilding from start\n"));</div><div class='del'>-		ret = summary_update(cls, 0, changeinfo, ex);</div><div class='del'>-	} else {</div><div class='del'>-		/* is the summary uptodate? */</div><div class='del'>-		if (st.st_size != cls-&gt;folder_size || st.st_mtime != s-&gt;time) {</div><div class='del'>-			if (cls-&gt;folder_size &lt; st.st_size) {</div><div class='del'>-				/* this will automatically rescan from 0 if there is a problem */</div><div class='del'>-				d(printf("folder grew, attempting to rebuild from %d\n", cls-&gt;folder_size));</div><div class='del'>-				ret = summary_update(cls, cls-&gt;folder_size, changeinfo, ex);</div><div class='del'>-			} else {</div><div class='del'>-				d(printf("folder shrank!  rebuilding from start\n"));</div><div class='del'>-				camel_folder_summary_clear(s);</div><div class='del'>-				ret = summary_update(cls, 0, changeinfo, ex);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		int i, work, count;</div><div class='del'>-</div><div class='del'>-		/* check to see if we need to copy/update the file; missing xev headers prompt this */</div><div class='del'>-		work = FALSE;</div><div class='del'>-		count = camel_folder_summary_count(s);</div><div class='del'>-		for (i=0;!work &amp;&amp; i&lt;count; i++) {</div><div class='del'>-			CamelMessageInfo *info = camel_folder_summary_index(s, i);</div><div class='del'>-			g_assert(info);</div><div class='del'>-			work = (info-&gt;flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV)) != 0;</div><div class='del'>-			camel_folder_summary_info_free(s, info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* if we do, then write out the headers using sync_full, etc */</div><div class='del'>-		if (work) {</div><div class='del'>-			d(printf("Have to add new headers, re-syncing from the start to accomplish this\n"));</div><div class='del'>-			ret = spool_summary_sync_full(cls, FALSE, changeinfo, ex);</div><div class='del'>-</div><div class='del'>-			if (stat(cls-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unknown error: %s"), strerror(errno));</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		cls-&gt;folder_size = st.st_size;</div><div class='del'>-		s-&gt;time = st.st_mtime;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *tz_months[] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tz_days[] = {</div><div class='del'>-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tries to build a From line, based on message headers */</div><div class='del'>-char *</div><div class='del'>-camel_spool_summary_build_from(struct _header_raw *header)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("From ");</div><div class='del'>-	char *ret;</div><div class='del'>-	const char *tmp;</div><div class='del'>-	time_t thetime;</div><div class='del'>-	int offset;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Sender", NULL);</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "From", NULL);</div><div class='del'>-	if (tmp != NULL) {</div><div class='del'>-		struct _header_address *addr = header_address_decode(tmp);</div><div class='del'>-</div><div class='del'>-		tmp = NULL;</div><div class='del'>-		if (addr) {</div><div class='del'>-			if (addr-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				g_string_append(out, addr-&gt;v.addr);</div><div class='del'>-				tmp = "";</div><div class='del'>-			}</div><div class='del'>-			header_address_unref(addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (tmp == NULL) {</div><div class='del'>-		g_string_append(out, "unknown@nodomain.now.au");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* try use the received header to get the date */</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Received", NULL);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		tmp = strrchr(tmp, ';');</div><div class='del'>-		if (tmp)</div><div class='del'>-			tmp++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if there isn't one, try the Date field */</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "Date", NULL);</div><div class='del'>-</div><div class='del'>-	thetime = header_decode_date(tmp, &amp;offset);</div><div class='del'>-</div><div class='del'>-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;</div><div class='del'>-</div><div class='del'>-	/* a pseudo, but still bogus attempt at thread safing the function */</div><div class='del'>-	/*memcpy(&amp;tm, gmtime(&amp;thetime), sizeof(tm));*/</div><div class='del'>-	gmtime_r(&amp;thetime, &amp;tm);</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa(out, " %s %s %2d %02d:%02d:%02d %4d\n",</div><div class='del'>-			  tz_days[tm.tm_wday],</div><div class='del'>-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);</div><div class='del'>-</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform a full sync */</div><div class='del'>-static int</div><div class='del'>-spool_summary_sync_full(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	CamelMimeParser *mp = NULL;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelSpoolMessageInfo *info = NULL;</div><div class='del'>-	int fd = -1, fdout = -1;</div><div class='del'>-	char *tmpname = NULL;</div><div class='del'>-	char *buffer, *xevnew = NULL, *p;</div><div class='del'>-	int len;</div><div class='del'>-	const char *fromline;</div><div class='del'>-	int lastdel = FALSE;</div><div class='del'>-	off_t spoollen, outlen;</div><div class='del'>-	int size, sizeout;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	d(printf("performing full summary/sync\n"));</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDWR);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not open file: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_scan_pre_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_MKSTEMP</div><div class='del'>-	tmpname = alloca(64);</div><div class='del'>-	sprintf(tmpname, "/tmp/spool.camel.XXXXXX");</div><div class='del'>-	fdout = mkstemp(tmpname);</div><div class='del'>-#else</div><div class='del'>-#warning "Your system has no mkstemp(3), spool updating may be insecure"</div><div class='del'>-	tmpname = alloca(L_tmpnam);</div><div class='del'>-	tmpnam(tmpname);</div><div class='del'>-	fdout = open(tmpname, O_RDWR|O_CREAT|O_EXCL, 0600);</div><div class='del'>-#endif</div><div class='del'>-	d(printf("Writing tmp file to %s\n", tmpname));</div><div class='del'>-	if (fdout == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Cannot open temporary mailbox: %s"), strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		int pc = (i + 1) * 100 / count;</div><div class='del'>-</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-</div><div class='del'>-		info = (CamelSpoolMessageInfo *)camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-		g_assert(info);</div><div class='del'>-</div><div class='del'>-		d(printf("Looking at message %s\n", camel_message_info_uid(info)));</div><div class='del'>-</div><div class='del'>-		/* only need to seek past deleted messages, otherwise we should be at the right spot/state already */</div><div class='del'>-		if (lastdel) {</div><div class='del'>-			d(printf("seeking to %d\n", (int)info-&gt;frompos));</div><div class='del'>-			camel_mime_parser_seek(mp, info-&gt;frompos, SEEK_SET);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) != HSCAN_FROM) {</div><div class='del'>-			g_warning("Expected a From line here, didn't get it");</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_tell_start_from(mp) != info-&gt;frompos) {</div><div class='del'>-			g_warning("Didn't get the next message where I expected (%d) got %d instead",</div><div class='del'>-				  (int)info-&gt;frompos, (int)camel_mime_parser_tell_start_from(mp));</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lastdel = FALSE;</div><div class='del'>-		if (expunge &amp;&amp; info-&gt;info.flags &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			const char *uid = camel_message_info_uid(info);</div><div class='del'>-</div><div class='del'>-			d(printf("Deleting %s\n", uid));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-			if (cls-&gt;index)</div><div class='del'>-				ibex_unindex(cls-&gt;index, (char *)uid);</div><div class='del'>-#endif</div><div class='del'>-			/* remove it from the change list */</div><div class='del'>-			camel_folder_change_info_remove_uid(changeinfo, uid);</div><div class='del'>-			camel_folder_summary_remove(s, (CamelMessageInfo *)info);</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			count--;</div><div class='del'>-			i--;</div><div class='del'>-			info = NULL;</div><div class='del'>-			lastdel = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			/* otherwise, the message is staying, copy its From_ line across */</div><div class='del'>-			if (i&gt;0) {</div><div class='del'>-				write(fdout, "\n", 1);</div><div class='del'>-			}</div><div class='del'>-			info-&gt;frompos = lseek(fdout, 0, SEEK_CUR);</div><div class='del'>-			fromline = camel_mime_parser_from_line(mp);</div><div class='del'>-			write(fdout, fromline, strlen(fromline));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (info &amp;&amp; info-&gt;info.flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV | CAMEL_MESSAGE_FOLDER_FLAGGED)) {</div><div class='del'>-			d(printf("Updating header for %s flags = %08x\n", camel_message_info_uid(info), info-&gt;info.flags));</div><div class='del'>-</div><div class='del'>-			if (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_FROM_END) {</div><div class='del'>-				g_warning("camel_mime_parser_step failed (2)");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			xevnew = camel_spool_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);</div><div class='del'>-			if (camel_spool_summary_write_headers(fdout, camel_mime_parser_headers_raw(mp), xevnew) == -1) {</div><div class='del'>-				d(printf("Error writing to tmp mailbox\n"));</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Error writing to temp mailbox: %s"),</div><div class='del'>-						     strerror(errno));</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* mark this message as recent */</div><div class='del'>-			if (info-&gt;info.flags &amp; CAMEL_MESSAGE_FOLDER_NOXEV)</div><div class='del'>-				camel_folder_change_info_recent_uid(changeinfo, camel_message_info_uid(info));</div><div class='del'>-</div><div class='del'>-			info-&gt;info.flags &amp;= 0xffff;</div><div class='del'>-			g_free(xevnew);</div><div class='del'>-			xevnew = NULL;</div><div class='del'>-			camel_mime_parser_drop_step(mp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-		if (info) {</div><div class='del'>-			d(printf("looking for message content to copy across from %d\n", (int)camel_mime_parser_tell(mp)));</div><div class='del'>-			while (camel_mime_parser_step(mp, &amp;buffer, &amp;len) == HSCAN_PRE_FROM) {</div><div class='del'>-				d(printf("copying spool contents to tmp: '%.*s'\n", len, buffer));</div><div class='del'>-				if (write(fdout, buffer, len) != len) {</div><div class='del'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Writing to tmp mailbox failed: %s: %s"),</div><div class='del'>-							     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			d(printf("we are now at %d, from = %d\n", (int)camel_mime_parser_tell(mp),</div><div class='del'>-				 (int)camel_mime_parser_tell_start_from(mp)));</div><div class='del'>-			camel_mime_parser_unstep(mp);</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			info = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if the last message was deleted, and we had any messages left,</div><div class='del'>-	   make sure we close out with a closing \n - since we removed the</div><div class='del'>-	   one part of the From line following it */</div><div class='del'>-	if (lastdel &amp;&amp; count &gt; 0) {</div><div class='del'>-		write(fdout, "\n", 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* sync out content */</div><div class='del'>-	if (fsync(fdout) == -1) {</div><div class='del'>-		g_warning("Cannot sync temporary folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync temporary folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* see if we can write this much to the spool file */</div><div class='del'>-	if (fstat(fd, &amp;st) == -1) {</div><div class='del'>-		g_warning("Cannot sync temporary folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync temporary folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	spoollen = st.st_size;</div><div class='del'>-</div><div class='del'>-	if (fstat(fdout, &amp;st) == -1) {</div><div class='del'>-		g_warning("Cannot sync temporary folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync temporary folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-	outlen = st.st_size;</div><div class='del'>-</div><div class='del'>-	/* I think this is the right way to do this */</div><div class='del'>-	if (outlen&gt;0</div><div class='del'>-	    &amp;&amp; (lseek(fd, outlen-1, SEEK_SET) == -1</div><div class='del'>-		|| write(fd, "", 1) != 1</div><div class='del'>-		|| fsync(fd) == -1</div><div class='del'>-		|| lseek(fd, 0, SEEK_SET) == -1</div><div class='del'>-		|| lseek(fdout, 0, SEEK_SET) == -1)) {</div><div class='del'>-		g_warning("Cannot sync spool folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync spool folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		/* incase we ran out of room, remove any trailing space first */</div><div class='del'>-		ftruncate(fd, spoollen);</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* now copy content back */</div><div class='del'>-	buffer = g_malloc(8192);</div><div class='del'>-	size = 1;</div><div class='del'>-	while (size&gt;0) {</div><div class='del'>-		do {</div><div class='del'>-			size = read(fdout, buffer, 8192);</div><div class='del'>-		} while (size == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (size &gt; 0) {</div><div class='del'>-			p = buffer;</div><div class='del'>-			do {</div><div class='del'>-				sizeout = write(fd, p, size);</div><div class='del'>-				if (sizeout &gt; 0) {</div><div class='del'>-					p+= sizeout;</div><div class='del'>-					size -= sizeout;</div><div class='del'>-				}</div><div class='del'>-			} while ((sizeout == -1 &amp;&amp; errno == EINTR) &amp;&amp; size &gt; 0);</div><div class='del'>-			size = sizeout;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (size == -1) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not sync spool folder %s: %s\n"</div><div class='del'>-					       "Folder may be corrupt, copy saved in `%s'"),</div><div class='del'>-					     cls-&gt;folder_path, strerror(errno), tmpnam);</div><div class='del'>-			/* so we dont delete it */</div><div class='del'>-			close(fdout);</div><div class='del'>-			tmpname = NULL;</div><div class='del'>-			fdout = -1;</div><div class='del'>-			g_free(buffer);</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(buffer);</div><div class='del'>-</div><div class='del'>-	d(printf("Closing folders\n"));</div><div class='del'>-</div><div class='del'>-	if (ftruncate(fd, outlen) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync spool folder %s: %s\n"</div><div class='del'>-				       "Folder may be corrupt, copy saved in `%s'"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno), tmpnam);</div><div class='del'>-		close(fdout);</div><div class='del'>-		tmpname = NULL;</div><div class='del'>-		fdout = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (close(fd) == -1) {</div><div class='del'>-		g_warning("Cannot close source folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not sync spool folder %s: %s\n"</div><div class='del'>-				       "Folder may be corrupt, copy saved in `%s'"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno), tmpnam);</div><div class='del'>-		close(fdout);</div><div class='del'>-		tmpname = NULL;</div><div class='del'>-		fdout = -1;</div><div class='del'>-		fd = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close(fdout);</div><div class='del'>-	unlink(tmpname);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-		</div><div class='del'>-	return 0;</div><div class='del'>- error:</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close(fd);</div><div class='del'>-	</div><div class='del'>-	if (fdout != -1)</div><div class='del'>-		close(fdout);</div><div class='del'>-	</div><div class='del'>-	g_free(xevnew);</div><div class='del'>-	</div><div class='del'>-	if (tmpname)</div><div class='del'>-		unlink(tmpname);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref((CamelObject *)mp);</div><div class='del'>-	if (info)</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform a quick sync - only system flags have changed */</div><div class='del'>-static int</div><div class='del'>-spool_summary_sync_quick(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	CamelMimeParser *mp = NULL;</div><div class='del'>-	int i, count;</div><div class='del'>-	CamelSpoolMessageInfo *info = NULL;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	char *xevnew, *xevtmp;</div><div class='del'>-	const char *xev;</div><div class='del'>-	int len;</div><div class='del'>-	off_t lastpos;</div><div class='del'>-</div><div class='del'>-	d(printf("Performing quick summary sync\n"));</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Storing folder"));</div><div class='del'>-</div><div class='del'>-	fd = open(cls-&gt;folder_path, O_RDWR);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not file: %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_scan_pre_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		int xevoffset;</div><div class='del'>-		int pc = (i+1)*100/count;</div><div class='del'>-</div><div class='del'>-		camel_operation_progress(NULL, pc);</div><div class='del'>-</div><div class='del'>-		info = (CamelSpoolMessageInfo *)camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-		g_assert(info);</div><div class='del'>-</div><div class='del'>-		d(printf("Checking message %s %08x\n", camel_message_info_uid(info), info-&gt;info.flags));</div><div class='del'>-</div><div class='del'>-		if ((info-&gt;info.flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) == 0) {</div><div class='del'>-			camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-			info = NULL;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		d(printf("Updating message %s\n", camel_message_info_uid(info)));</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_seek(mp, info-&gt;frompos, SEEK_SET);</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, 0, 0) != HSCAN_FROM) {</div><div class='del'>-			g_warning("Expected a From line here, didn't get it");</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_tell_start_from(mp) != info-&gt;frompos) {</div><div class='del'>-			g_warning("Didn't get the next message where I expected (%d) got %d instead",</div><div class='del'>-				  (int)info-&gt;frompos, (int)camel_mime_parser_tell_start_from(mp));</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Summary and folder mismatch, even after a sync"));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_mime_parser_step(mp, 0, 0) == HSCAN_FROM_END) {</div><div class='del'>-			g_warning("camel_mime_parser_step failed (2)");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		xev = camel_mime_parser_header(mp, "X-Evolution", &amp;xevoffset);</div><div class='del'>-		if (xev == NULL || camel_spool_summary_decode_x_evolution(cls, xev, NULL) == -1) {</div><div class='del'>-			g_warning("We're supposed to have a valid x-ev header, but we dont");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		xevnew = camel_spool_summary_encode_x_evolution(cls, (CamelMessageInfo *)info);</div><div class='del'>-		/* SIGH: encode_param_list is about the only function which folds headers by itself.</div><div class='del'>-		   This should be fixed somehow differently (either parser doesn't fold headers,</div><div class='del'>-		   or param_list doesn't, or something */</div><div class='del'>-		xevtmp = header_unfold(xevnew);</div><div class='del'>-		/* the raw header contains a leading ' ', so (dis)count that too */</div><div class='del'>-		if (strlen(xev)-1 != strlen(xevtmp)) {</div><div class='del'>-			g_free(xevnew);</div><div class='del'>-			g_free(xevtmp);</div><div class='del'>-			g_warning("Hmm, the xev headers shouldn't have changed size, but they did");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		g_free(xevtmp);</div><div class='del'>-</div><div class='del'>-		/* we write out the xevnew string, assuming its been folded identically to the original too! */</div><div class='del'>-</div><div class='del'>-		lastpos = lseek(fd, 0, SEEK_CUR);</div><div class='del'>-		lseek(fd, xevoffset+strlen("X-Evolution: "), SEEK_SET);</div><div class='del'>-		do {</div><div class='del'>-			len = write(fd, xevnew, strlen(xevnew));</div><div class='del'>-		} while (len == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-		lseek(fd, lastpos, SEEK_SET);</div><div class='del'>-		g_free(xevnew);</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-		camel_mime_parser_drop_step(mp);</div><div class='del'>-</div><div class='del'>-		info-&gt;info.flags &amp;= 0xffff;</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("Closing folders\n"));</div><div class='del'>-</div><div class='del'>-	if (close(fd) == -1) {</div><div class='del'>-		g_warning("Cannot close source folder: %s", strerror(errno));</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not close source folder %s: %s"),</div><div class='del'>-				     cls-&gt;folder_path, strerror(errno));</div><div class='del'>-		fd = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>- error:</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close(fd);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref((CamelObject *)mp);</div><div class='del'>-	if (info)</div><div class='del'>-		camel_folder_summary_info_free(s, (CamelMessageInfo *)info);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spool_summary_sync(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)cls;</div><div class='del'>-	int i, count;</div><div class='del'>-	int quick = TRUE, work=FALSE;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* first, sync ourselves up, just to make sure */</div><div class='del'>-	summary_update(cls, cls-&gt;folder_size, changeinfo, ex);</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check what work we have to do, if any */</div><div class='del'>-	for (i=0;quick &amp;&amp; i&lt;count; i++) {</div><div class='del'>-		CamelMessageInfo *info = camel_folder_summary_index(s, i);</div><div class='del'>-		g_assert(info);</div><div class='del'>-		if ((expunge &amp;&amp; (info-&gt;flags &amp; CAMEL_MESSAGE_DELETED)) ||</div><div class='del'>-		    (info-&gt;flags &amp; (CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_XEVCHANGE)))</div><div class='del'>-			quick = FALSE;</div><div class='del'>-		else</div><div class='del'>-			work |= (info-&gt;flags &amp; CAMEL_MESSAGE_FOLDER_FLAGGED) != 0;</div><div class='del'>-		camel_folder_summary_info_free(s, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* yuck i hate this logic, but its to simplify the 'all ok, update summary' and failover cases */</div><div class='del'>-	ret = -1;</div><div class='del'>-	if (quick) {</div><div class='del'>-		if (work) {</div><div class='del'>-			ret = spool_summary_sync_quick(cls, expunge, changeinfo, ex);</div><div class='del'>-			if (ret == -1) {</div><div class='del'>-				g_warning("failed a quick-sync, trying a full sync");</div><div class='del'>-				camel_exception_clear(ex);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			ret = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		ret = spool_summary_sync_full(cls, expunge, changeinfo, ex);</div><div class='del'>-	if (ret == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (stat(cls-&gt;folder_path, &amp;st) == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unknown error: %s"), strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_touch(s);</div><div class='del'>-	s-&gt;time = st.st_mtime;</div><div class='del'>-	cls-&gt;folder_size = st.st_size;</div><div class='del'>-	/*camel_folder_summary_save(s);*/</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-spool_summary_add(CamelSpoolSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	char *xev;</div><div class='del'>-</div><div class='del'>-	d(printf("Adding message to summary\n"));</div><div class='del'>-	</div><div class='del'>-	mi = camel_folder_summary_add_from_message((CamelFolderSummary *)cls, msg);</div><div class='del'>-	if (mi) {</div><div class='del'>-		d(printf("Added, uid = %s\n", camel_message_info_uid(mi)));</div><div class='del'>-		if (info) {</div><div class='del'>-			CamelTag *tag = info-&gt;user_tags;</div><div class='del'>-			CamelFlag *flag = info-&gt;user_flags;</div><div class='del'>-</div><div class='del'>-			while (flag) {</div><div class='del'>-				camel_flag_set(&amp;mi-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			while (tag) {</div><div class='del'>-				camel_tag_set(&amp;mi-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-				tag = tag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mi-&gt;flags = mi-&gt;flags | (info-&gt;flags &amp; 0xffff);</div><div class='del'>-		}</div><div class='del'>-		mi-&gt;flags &amp;= ~(CAMEL_MESSAGE_FOLDER_NOXEV|CAMEL_MESSAGE_FOLDER_FLAGGED);</div><div class='del'>-		xev = camel_spool_summary_encode_x_evolution(cls, mi);</div><div class='del'>-		camel_medium_set_header((CamelMedium *)msg, "X-Evolution", xev);</div><div class='del'>-		g_free(xev);</div><div class='del'>-		camel_folder_change_info_add_uid(ci, camel_message_info_uid(mi));</div><div class='del'>-	} else {</div><div class='del'>-		d(printf("Failed!\n"));</div><div class='del'>-		camel_exception_set(ex, 1, _("Unable to add message to summary: unknown reason"));</div><div class='del'>-	}</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-	struct _header_param *params = NULL;</div><div class='del'>-	GString *val = g_string_new("");</div><div class='del'>-	CamelFlag *flag = mi-&gt;user_flags;</div><div class='del'>-	CamelTag *tag = mi-&gt;user_tags;</div><div class='del'>-	char *ret;</div><div class='del'>-	const char *p, *uidstr;</div><div class='del'>-	guint32 uid;</div><div class='del'>-</div><div class='del'>-	/* FIXME: work out what to do with uid's that aren't stored here? */</div><div class='del'>-	/* FIXME: perhaps make that a mbox folder only issue?? */</div><div class='del'>-	p = uidstr = camel_message_info_uid(mi);</div><div class='del'>-	while (*p &amp;&amp; isdigit(*p))</div><div class='del'>-		p++;</div><div class='del'>-	if (*p == 0 &amp;&amp; sscanf(uidstr, "%u", &amp;uid) == 1) {</div><div class='del'>-		g_string_sprintf(out, "%08x-%04x", uid, mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	} else {</div><div class='del'>-		g_string_sprintf(out, "%s-%04x", uidstr, mi-&gt;flags &amp; 0xffff);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (flag || tag) {</div><div class='del'>-		val = g_string_new("");</div><div class='del'>-</div><div class='del'>-		if (flag) {</div><div class='del'>-			while (flag) {</div><div class='del'>-				g_string_append(val, flag-&gt;name);</div><div class='del'>-				if (flag-&gt;next)</div><div class='del'>-					g_string_append_c(val, ',');</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			header_set_param(&amp;params, "flags", val-&gt;str);</div><div class='del'>-			g_string_truncate(val, 0);</div><div class='del'>-		}</div><div class='del'>-		if (tag) {</div><div class='del'>-			while (tag) {</div><div class='del'>-				g_string_append(val, tag-&gt;name);</div><div class='del'>-				g_string_append_c(val, '=');</div><div class='del'>-				g_string_append(val, tag-&gt;value);</div><div class='del'>-				if (tag-&gt;next)</div><div class='del'>-					g_string_append_c(val, ',');</div><div class='del'>-				tag = tag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			header_set_param(&amp;params, "tags", val-&gt;str);</div><div class='del'>-		}</div><div class='del'>-		g_string_free(val, TRUE);</div><div class='del'>-		header_param_list_format_append(out, params);</div><div class='del'>-		header_param_list_free(params);</div><div class='del'>-	}</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *params, *scan;</div><div class='del'>-	guint32 uid, flags;</div><div class='del'>-	char *header;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* check for uid/flags */</div><div class='del'>-	header = header_token_decode(xev);</div><div class='del'>-	if (header &amp;&amp; strlen(header) == strlen("00000000-0000")</div><div class='del'>-	    &amp;&amp; sscanf(header, "%08x-%04x", &amp;uid, &amp;flags) == 2) {</div><div class='del'>-		char uidstr[20];</div><div class='del'>-		if (mi) {</div><div class='del'>-			sprintf(uidstr, "%u", uid);</div><div class='del'>-			camel_message_info_set_uid(mi, g_strdup(uidstr));</div><div class='del'>-			mi-&gt;flags = flags;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		g_free(header);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free(header);</div><div class='del'>-</div><div class='del'>-	if (mi == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* check for additional data */	</div><div class='del'>-	header = strchr(xev, ';');</div><div class='del'>-	if (header) {</div><div class='del'>-		params = header_param_list_decode(header+1);</div><div class='del'>-		scan = params;</div><div class='del'>-		while (scan) {</div><div class='del'>-			if (!strcasecmp(scan-&gt;name, "flags")) {</div><div class='del'>-				char **flagv = g_strsplit(scan-&gt;value, ",", 1000);</div><div class='del'>-</div><div class='del'>-				for (i=0;flagv[i];i++) {</div><div class='del'>-					camel_flag_set(&amp;mi-&gt;user_flags, flagv[i], TRUE);</div><div class='del'>-				}</div><div class='del'>-				g_strfreev(flagv);</div><div class='del'>-			} else if (!strcasecmp(scan-&gt;name, "tags")) {</div><div class='del'>-				char **tagv = g_strsplit(scan-&gt;value, ",", 10000);</div><div class='del'>-				char *val;</div><div class='del'>-</div><div class='del'>-				for (i=0;tagv[i];i++) {</div><div class='del'>-					val = strchr(tagv[i], '=');</div><div class='del'>-					if (val) {</div><div class='del'>-						*val++ = 0;</div><div class='del'>-						camel_tag_set(&amp;mi-&gt;user_tags, tagv[i], val);</div><div class='del'>-						val[-1]='=';</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				g_strfreev(tagv);</div><div class='del'>-			}</div><div class='del'>-			scan = scan-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		header_param_list_free(params);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h<br/>deleted file mode 100644<br/>index 77fa6bdb3e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spool-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spool-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_SPOOL_SUMMARY_H</div><div class='del'>-#define _CAMEL_SPOOL_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-index.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_SPOOL_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_spool_summary_get_type (), CamelSpoolSummary)</div><div class='del'>-#define CAMEL_SPOOL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_spool_summary_get_type (), CamelSpoolSummaryClass)</div><div class='del'>-#define CAMEL_IS_SPOOL_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_spool_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSpoolSummary      CamelSpoolSummary;</div><div class='del'>-typedef struct _CamelSpoolSummaryClass CamelSpoolSummaryClass;</div><div class='del'>-</div><div class='del'>-/* extra summary flags */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_NOXEV = 1&lt;&lt;17,</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_XEVCHANGE = 1&lt;&lt;18,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _CamelSpoolMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-</div><div class='del'>-	off_t frompos;</div><div class='del'>-} CamelSpoolMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelSpoolSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelSpoolSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *folder_path;	/* name of matching folder */</div><div class='del'>-</div><div class='del'>-	size_t folder_size;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelSpoolSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-	int (*load)(CamelSpoolSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-	int (*check)(CamelSpoolSummary *cls, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-	int (*sync)(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-	CamelMessageInfo *(*add)(CamelSpoolSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	char *(*encode_x_evolution)(CamelSpoolSummary *cls, const CamelMessageInfo *info);</div><div class='del'>-	int (*decode_x_evolution)(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *info);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	camel_spool_summary_get_type	(void);</div><div class='del'>-void	camel_spool_summary_construct	(CamelSpoolSummary *new, const char *filename, const char *spool_name, CamelIndex *index);</div><div class='del'>-</div><div class='del'>-/* create the summary, in-memory only */</div><div class='del'>-CamelSpoolSummary *camel_spool_summary_new(const char *filename);</div><div class='del'>-</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int camel_spool_summary_load(CamelSpoolSummary *cls, int forceindex, CamelException *ex);</div><div class='del'>-/* check for new/removed messages */</div><div class='del'>-int camel_spool_summary_check(CamelSpoolSummary *cls, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* perform a folder sync or expunge, if needed */</div><div class='del'>-int camel_spool_summary_sync(CamelSpoolSummary *cls, gboolean expunge, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* add a new message to the summary */</div><div class='del'>-CamelMessageInfo *camel_spool_summary_add(CamelSpoolSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* generate an X-Evolution header line */</div><div class='del'>-char *camel_spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const CamelMessageInfo *info);</div><div class='del'>-int camel_spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *info);</div><div class='del'>-</div><div class='del'>-/* utility functions - write headers to a file with optional X-Evolution header */</div><div class='del'>-int camel_spool_summary_write_headers(int fd, struct _header_raw *header, char *xevline);</div><div class='del'>-/* build a from line: FIXME: remove, or move to common code */</div><div class='del'>-char *camel_spool_summary_build_from(struct _header_raw *header);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_SPOOL_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-spoold-store.c b/camel/providers/local/camel-spoold-store.c<br/>deleted file mode 100644<br/>index e6b375ce44..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spoold-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spoold-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,389 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com/)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-spoold-store.h"</div><div class='del'>-#include "camel-spool-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-private.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelSpoolDStore */</div><div class='del'>-#define CSPOOLS_CLASS(so) CAMEL_SPOOLD_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex);</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static char *get_name(CamelService *service, gboolean brief);</div><div class='del'>-static CamelFolder *get_inbox (CamelStore *store, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex);</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_spoold_store_class_init (CamelSpoolDStoreClass *camel_spoold_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_spoold_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_spoold_store_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;construct = construct;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;get_inbox = get_inbox;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = free_folder_info;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_spoold_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_spoold_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_spoold_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_spoold_store_type = camel_type_register (CAMEL_SPOOL_STORE_TYPE, "CamelSpoolDStore",</div><div class='del'>-							     sizeof (CamelSpoolDStore),</div><div class='del'>-							     sizeof (CamelSpoolDStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_spoold_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL,</div><div class='del'>-							     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_spoold_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-construct (CamelService *service, CamelSession *session, CamelProvider *provider, CamelURL *url, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	d(printf("constructing store of type %s '%s:%s'\n",</div><div class='del'>-		 camel_type_to_name(((CamelObject *)service)-&gt;s.type), url-&gt;protocol, url-&gt;path));</div><div class='del'>-</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url-&gt;path[0] != '/') {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Store root %s is not an absolute path"), service-&gt;url-&gt;path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stat(service-&gt;url-&gt;path, &amp;st) == -1 || !S_ISDIR(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Store `%s' does not exist or is not a directory"),</div><div class='del'>-				     service-&gt;url-&gt;path);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-camel_spoold_store_get_toplevel_dir (CamelSpoolDStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-</div><div class='del'>-	g_assert (url != NULL);</div><div class='del'>-	return url-&gt;path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *path = ((CamelService *)store)-&gt;url-&gt;path;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	path = alloca(strlen(((CamelService *)store)-&gt;url-&gt;path) + strlen(folder_name)+2);</div><div class='del'>-	sprintf(path, "%s/%s", ((CamelService *)store)-&gt;url-&gt;path, folder_name);</div><div class='del'>-</div><div class='del'>-	d(printf("opening folder %s on path %s\n", folder_name, path));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* need to check path? */</div><div class='del'>-	if (strcmp(folder_name, "INBOX") != 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("Folder `%s/%s' does not exist."),</div><div class='del'>-				     path, folder_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	folder = camel_spool_folder_new(store, folder_name, path, flags, ex);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_inbox(CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-			     _("Store does not support an INBOX"));</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (service-&gt;url-&gt;path);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("Mail tree %s"), service-&gt;url-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi) {</div><div class='del'>-		g_free(fi-&gt;url);</div><div class='del'>-		g_free(fi-&gt;name);</div><div class='del'>-		g_free(fi-&gt;full_name);</div><div class='del'>-		g_free(fi-&gt;path);</div><div class='del'>-		g_free(fi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* default implementation, rename all */</div><div class='del'>-static void</div><div class='del'>-rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Spool folders cannot be renamed"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default implementation, only delete metadata */</div><div class='del'>-static void</div><div class='del'>-delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			     _("Spool folders cannot be deleted"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *camel_folder_info_new(const char *url, const char *full, const char *name, int unread)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	fi = g_malloc0(sizeof(*fi));</div><div class='del'>-	fi-&gt;url = g_strdup(url);</div><div class='del'>-	fi-&gt;full_name = g_strdup(full);</div><div class='del'>-	fi-&gt;name = g_strdup(name);</div><div class='del'>-	fi-&gt;unread_message_count = unread;</div><div class='del'>-	camel_folder_info_build_path(fi, '/');</div><div class='del'>-</div><div class='del'>-	d(printf("Adding spoold info: '%s' '%s' '%s' '%s'\n", fi-&gt;path, fi-&gt;name, fi-&gt;full_name, fi-&gt;url));</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used to find out where we've visited already */</div><div class='del'>-struct _inode {</div><div class='del'>-	dev_t dnode;</div><div class='del'>-	ino_t inode;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* returns number of records found at or below this level */</div><div class='del'>-static int scan_dir(CamelStore *store, GHashTable *visited, char *root, const char *path, guint32 flags, CamelFolderInfo *parent, CamelFolderInfo **fip, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *name, *uri, *tmp, *fname;</div><div class='del'>-	CamelFolderInfo *fi = NULL;</div><div class='del'>-	struct stat st;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	int unread;</div><div class='del'>-	char from[80];</div><div class='del'>-	FILE *fp;</div><div class='del'>-</div><div class='del'>-	d(printf("checking dir '%s' part '%s' for mbox content\n", root, path));</div><div class='del'>-</div><div class='del'>-	/* look for folders matching the right structure, recursively */</div><div class='del'>-	if (path) {</div><div class='del'>-		name = alloca(strlen(root)+strlen(path)+2);</div><div class='del'>-		sprintf(name, "%s/%s", root, path);</div><div class='del'>-	} else</div><div class='del'>-		name = root;</div><div class='del'>-</div><div class='del'>-	dir = opendir(name);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not scan folder `%s': %s"),</div><div class='del'>-				     root, strerror(errno));</div><div class='del'>-		g_free(name);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (path != NULL) {</div><div class='del'>-		uri = g_strdup_printf("spoold:%s;noselect=yes#%s", root, path);</div><div class='del'>-		tmp = strrchr(path, '/');</div><div class='del'>-		if (tmp == NULL)</div><div class='del'>-			tmp = (char *)path;</div><div class='del'>-		else</div><div class='del'>-			tmp++;</div><div class='del'>-		fi = camel_folder_info_new(uri, path, tmp, -1);</div><div class='del'>-		fi-&gt;parent = parent;</div><div class='del'>-		fi-&gt;sibling = *fip;</div><div class='del'>-		*fip = fi;</div><div class='del'>-		g_free(uri);</div><div class='del'>-	</div><div class='del'>-		fip = &amp;fi-&gt;child;</div><div class='del'>-		parent = fi;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		if (strcmp(d-&gt;d_name, ".") == 0</div><div class='del'>-		    || strcmp(d-&gt;d_name, "..") == 0)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		tmp = g_strdup_printf("%s/%s", name, d-&gt;d_name);</div><div class='del'>-		if (stat(tmp, &amp;st) == 0) {</div><div class='del'>-			if (path)</div><div class='del'>-				fname = g_strdup_printf("%s/%s", path, d-&gt;d_name);</div><div class='del'>-			else</div><div class='del'>-				fname = g_strdup(d-&gt;d_name);</div><div class='del'>-</div><div class='del'>-			if (S_ISREG(st.st_mode)) {</div><div class='del'>-				/* first, see if we already have it open */</div><div class='del'>-				CAMEL_STORE_LOCK(store, cache_lock);</div><div class='del'>-				folder = g_hash_table_lookup(store-&gt;folders, fname);</div><div class='del'>-				if (folder)</div><div class='del'>-					unread = camel_folder_get_unread_message_count(folder);</div><div class='del'>-				else</div><div class='del'>-					unread = -1;</div><div class='del'>-				CAMEL_STORE_UNLOCK(store, cache_lock);</div><div class='del'>-</div><div class='del'>-				/* no?  check its content to see if its a folder or not */</div><div class='del'>-				if (folder == NULL) {</div><div class='del'>-					fp = fopen(tmp, "r");</div><div class='del'>-					if (fp != NULL) {</div><div class='del'>-						if (fgets(from, sizeof(from), fp) != NULL</div><div class='del'>-						    &amp;&amp; strncmp(from, "From ", 5) == 0) {</div><div class='del'>-							folder = (CamelFolder *)1;</div><div class='del'>-							/* TODO: if slow mode selected, we could look up unread counts here -</div><div class='del'>-							   but its pretty expensive */</div><div class='del'>-						}</div><div class='del'>-						fclose(fp);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				if (folder != NULL) {</div><div class='del'>-					uri = g_strdup_printf("spoold:%s#%s", root, fname);</div><div class='del'>-					fi = camel_folder_info_new(uri, fname, d-&gt;d_name, unread);</div><div class='del'>-					fi-&gt;parent = parent;</div><div class='del'>-					fi-&gt;sibling = *fip;</div><div class='del'>-					*fip = fi;</div><div class='del'>-					g_free(uri);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-			} else if (S_ISDIR(st.st_mode)) {</div><div class='del'>-				struct _inode in = { st.st_dev, st.st_ino };</div><div class='del'>-			</div><div class='del'>-				/* see if we've visited already */</div><div class='del'>-				if (g_hash_table_lookup(visited, &amp;in) == NULL) {</div><div class='del'>-					struct _inode *inew = g_malloc(sizeof(*inew));</div><div class='del'>-				</div><div class='del'>-					*inew = in;</div><div class='del'>-					g_hash_table_insert(visited, inew, inew);</div><div class='del'>-</div><div class='del'>-					if (scan_dir(store, visited, root, fname, flags, parent, fip, ex) == -1) {</div><div class='del'>-						g_free(tmp);</div><div class='del'>-						g_free(fname);</div><div class='del'>-						closedir(dir);</div><div class='del'>-						return -1;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free(fname);</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		g_free(tmp);</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint inode_hash(const void *d)</div><div class='del'>-{</div><div class='del'>-	const struct _inode *v = d;</div><div class='del'>-</div><div class='del'>-	return v-&gt;inode ^ v-&gt;dnode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean inode_equal(const void *a, const void *b)</div><div class='del'>-{</div><div class='del'>-	const struct _inode *v1 = a, *v2 = b;</div><div class='del'>-	</div><div class='del'>-	return v1-&gt;inode == v2-&gt;inode &amp;&amp; v1-&gt;dnode == v2-&gt;dnode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void inode_free(void *k, void *v, void *d)</div><div class='del'>-{</div><div class='del'>-	g_free(k);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi = NULL;</div><div class='del'>-	GHashTable *visited;</div><div class='del'>-</div><div class='del'>-	visited = g_hash_table_new(inode_hash, inode_equal);</div><div class='del'>-</div><div class='del'>-	if (scan_dir(store, visited, ((CamelService *)store)-&gt;url-&gt;path, top, flags, NULL, &amp;fi, ex) == -1 &amp;&amp; fi != NULL) {</div><div class='del'>-		camel_store_free_folder_info_full(store, fi);</div><div class='del'>-		fi = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(visited, inode_free, NULL);</div><div class='del'>-	g_hash_table_destroy(visited);</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/camel-spoold-store.h b/camel/providers/local/camel-spoold-store.h<br/>deleted file mode 100644<br/>index 0f80e1bdfb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/camel-spoold-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/camel-spoold-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian Inc (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SPOOLD_STORE_H</div><div class='del'>-#define CAMEL_SPOOLD_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-spool-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_SPOOLD_STORE_TYPE     (camel_spoold_store_get_type ())</div><div class='del'>-#define CAMEL_SPOOLD_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SPOOLD_STORE_TYPE, CamelSpoolDStore))</div><div class='del'>-#define CAMEL_SPOOLD_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SPOOLD_STORE_TYPE, CamelSpoolDStoreClass))</div><div class='del'>-#define CAMEL_IS_SPOOLD_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SPOOLD_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSpoolStore parent_object;	</div><div class='del'>-</div><div class='del'>-} CamelSpoolDStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSpoolStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSpoolDStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_spoold_store_get_type (void);</div><div class='del'>-</div><div class='del'>-const gchar *camel_spoold_store_get_toplevel_dir (CamelSpoolDStore *store);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SPOOLD_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/local/libcamellocal.urls b/camel/providers/local/libcamellocal.urls<br/>deleted file mode 100644<br/>index e2279ed72a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/local/libcamellocal.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/local/libcamellocal.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-mh</div><div class='del'>-mbox</div><div class='del'>-maildir</div><div class='del'>-spool</div><div class='del'>-spoold</div><div class='head'>diff --git a/camel/providers/nntp/.cvsignore b/camel/providers/nntp/.cvsignore<br/>deleted file mode 100644<br/>index 2fbeab8712..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-newsrc</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am<br/>deleted file mode 100644<br/>index 5ef9ba71f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelnntpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamelnntp.la</div><div class='del'>-camel_provider_DATA = libcamelnntp.urls</div><div class='del'>-</div><div class='del'>-INCLUDES = -I../..				\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(includedir)				\</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"</div><div class='del'>-</div><div class='del'>-libcamelnntp_la_SOURCES = 			\</div><div class='del'>-	camel-nntp-provider.c			\</div><div class='del'>-	camel-nntp-store.c			\</div><div class='del'>-	camel-nntp-folder.c			\</div><div class='del'>-	camel-nntp-stream.c			\</div><div class='del'>-	camel-nntp-summary.c</div><div class='del'>-</div><div class='del'>-libcamelnntpinclude_HEADERS =			\</div><div class='del'>-	camel-nntp-store.h			\</div><div class='del'>-	camel-nntp-folder.h			\</div><div class='del'>-	camel-nntp-stream.h			\</div><div class='del'>-	camel-nntp-summary.h</div><div class='del'>-</div><div class='del'>-noinst_HEADERS =				\</div><div class='del'>-	camel-nntp-private.h</div><div class='del'>-</div><div class='del'>-libcamelnntp_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelnntp.urls</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c<br/>deleted file mode 100644<br/>index f8d3a62e27..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-auth.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-auth.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-auth.c : authentication for nntp */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;camel-nntp-auth.h&gt;</div><div class='del'>-#include &lt;camel-nntp-store.h&gt;</div><div class='del'>-#include &lt;camel-nntp-resp-codes.h&gt;</div><div class='del'>-#include &lt;camel-exception.h&gt;</div><div class='del'>-#include &lt;camel-session.h&gt;</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-	CamelSession *session = camel_service_get_session (service);</div><div class='del'>-	int resp;</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;authmech &amp;&amp; !service-&gt;url-&gt;passwd) {</div><div class='del'>-		gchar *prompt;</div><div class='del'>-			</div><div class='del'>-		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),</div><div class='del'>-					  service-&gt;url-&gt;user, service-&gt;url-&gt;host);</div><div class='del'>-		service-&gt;url-&gt;passwd =</div><div class='del'>-			camel_session_get_password (session, prompt,</div><div class='del'>-						    TRUE, service, "password", ex);</div><div class='del'>-		g_free (prompt);</div><div class='del'>-			</div><div class='del'>-		if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, </div><div class='del'>-					     "You didn\'t enter a password.");</div><div class='del'>-			resp = 666;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first send username */</div><div class='del'>-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO USER %s", service-&gt;url-&gt;user);</div><div class='del'>-</div><div class='del'>-	if (resp == NNTP_AUTH_REJECTED) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Server rejected username"));</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else if (resp != NNTP_AUTH_CONTINUE) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Failed to send username to server"));</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* then send the username if the server asks for it */</div><div class='del'>-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO PASS %s", service-&gt;url-&gt;passwd);</div><div class='del'>-</div><div class='del'>-	if (resp == NNTP_AUTH_REJECTED) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Server rejected username/password"));</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url-&gt;passwd) {</div><div class='del'>-		/* let's be paranoid */</div><div class='del'>-		memset (service-&gt;url-&gt;passwd, 0, strlen (service-&gt;url-&gt;passwd));</div><div class='del'>-		g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-		service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-	}</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h<br/>deleted file mode 100644<br/>index fc96cf6a4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-auth.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-auth.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-auth.h : authentication for nntp */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_AUTH_H</div><div class='del'>-#define CAMEL_NNTP_AUTH_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;camel-nntp-store.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_AUTH_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c<br/>deleted file mode 100644<br/>index cfe1466561..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,406 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-folder.c : Class for a news folder</div><div class='del'>- *</div><div class='del'>- * Authors : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *           Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt; </div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/string-utils.h"</div><div class='del'>-#include "camel/camel-stream-mem.h"</div><div class='del'>-#include "camel/camel-data-wrapper.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-folder-search.h"</div><div class='del'>-#include "camel/camel-exception.h"</div><div class='del'>-#include "camel/camel-session.h"</div><div class='del'>-#include "camel/camel-data-cache.h"</div><div class='del'>-</div><div class='del'>-#include "camel-nntp-summary.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-private.h"</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class=NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelNNTPFolder */</div><div class='del'>-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store;</div><div class='del'>-	CamelFolderChangeInfo *changes = NULL;</div><div class='del'>-	CamelNNTPFolder *nntp_folder;</div><div class='del'>-</div><div class='del'>-	nntp_store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	nntp_folder = (CamelNNTPFolder *)folder;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (camel_nntp_summary_check((CamelNNTPSummary *)folder-&gt;summary, nntp_folder-&gt;changes, ex) != -1)</div><div class='del'>-		camel_folder_summary_save (folder-&gt;summary);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(nntp_folder-&gt;changes)) {</div><div class='del'>-		changes = nntp_folder-&gt;changes;</div><div class='del'>-		nntp_folder-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", changes);</div><div class='del'>-		camel_folder_change_info_free(changes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-        ((CamelFolderClass *)parent_class)-&gt;set_message_flags(folder, uid, flags, set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelNNTPStore *nntp_store;</div><div class='del'>-	CamelFolderChangeInfo *changes;</div><div class='del'>-	CamelNNTPFolder *nntp_folder;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-	char *line;</div><div class='del'>-	const char *msgid;</div><div class='del'>-</div><div class='del'>-	nntp_store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	nntp_folder = (CamelNNTPFolder *)folder;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	msgid = strchr(uid, ',');</div><div class='del'>-	if (msgid == 0) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Internal error: uid in invalid format: %s"), uid);</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	msgid++;</div><div class='del'>-</div><div class='del'>-	/* Lookup in cache, NEWS is global messageid's so use a global cache path */</div><div class='del'>-	stream = camel_data_cache_get(nntp_store-&gt;cache, "cache", msgid, NULL);</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		/* Not in cache, retrieve and put in cache */</div><div class='del'>-		if (camel_nntp_store_set_folder(nntp_store, folder, nntp_folder-&gt;changes, ex) == -1)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		ret = camel_nntp_command(nntp_store, &amp;line, "article %s", msgid);</div><div class='del'>-		if (ret == -1)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		if (ret == 220) {</div><div class='del'>-			stream = camel_data_cache_add(nntp_store-&gt;cache, "cache", msgid, NULL);</div><div class='del'>-			if (stream) {</div><div class='del'>-				if (camel_stream_write_to_stream((CamelStream *)nntp_store-&gt;stream, stream) == -1)</div><div class='del'>-					goto error;</div><div class='del'>-				if (camel_stream_reset(stream) == -1)</div><div class='del'>-					goto error;</div><div class='del'>-			} else {</div><div class='del'>-				stream = (CamelStream *)nntp_store-&gt;stream;</div><div class='del'>-				camel_object_ref((CamelObject *)stream);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (stream) {</div><div class='del'>-		message = camel_mime_message_new();</div><div class='del'>-		if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, stream) == -1)</div><div class='del'>-			goto error;</div><div class='del'>-</div><div class='del'>-		CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-		camel_object_unref((CamelObject *)stream);</div><div class='del'>-		return message;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, line);</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	if (errno == EINTR)</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));</div><div class='del'>-	else</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, strerror(errno));</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	if (message)</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-</div><div class='del'>-	if (stream)</div><div class='del'>-		camel_object_unref((CamelObject *)stream);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_change_info_changed(nntp_folder-&gt;changes)) {</div><div class='del'>-		changes = nntp_folder-&gt;changes;</div><div class='del'>-		nntp_folder-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-	} else {</div><div class='del'>-		changes = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (changes) {</div><div class='del'>-		camel_object_trigger_event((CamelObject *)folder, "folder_changed", changes);</div><div class='del'>-		camel_folder_change_info_free(changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray*</div><div class='del'>-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	GPtrArray *matches, *summary;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_FOLDER_LOCK(nntp_folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if(nntp_folder-&gt;search == NULL)</div><div class='del'>-		nntp_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-	</div><div class='del'>-	camel_folder_search_set_folder(nntp_folder-&gt;search, folder);</div><div class='del'>-	summary = camel_folder_get_summary(folder);</div><div class='del'>-	camel_folder_search_set_summary(nntp_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(nntp_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_FOLDER_UNLOCK(nntp_folder, search_lock);</div><div class='del'>-</div><div class='del'>-	camel_folder_free_summary(folder, summary);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-nntp_folder_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER(folder);</div><div class='del'>-	GPtrArray *summary, *matches;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* NOTE: could get away without the search lock by creating a new</div><div class='del'>-	   search object each time */</div><div class='del'>-</div><div class='del'>-	summary = g_ptr_array_new();</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		info = camel_folder_get_message_info(folder, uids-&gt;pdata[i]);</div><div class='del'>-		if (info)</div><div class='del'>-			g_ptr_array_add(summary, info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;len == 0)</div><div class='del'>-		return summary;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_FOLDER_LOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	if (nntp_folder-&gt;search == NULL)</div><div class='del'>-		nntp_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(nntp_folder-&gt;search, folder);</div><div class='del'>-	camel_folder_search_set_summary(nntp_folder-&gt;search, summary);</div><div class='del'>-</div><div class='del'>-	matches = camel_folder_search_execute_expression(nntp_folder-&gt;search, expression, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_FOLDER_UNLOCK(folder, search_lock);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;summary-&gt;len;i++)</div><div class='del'>-		camel_folder_free_message_info(folder, summary-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(summary, TRUE);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_search_free(CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result(nntp_folder-&gt;search, result);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-nntp_folder_init(CamelNNTPFolder *nntp_folder, CamelNNTPFolderClass *klass)</div><div class='del'>-{</div><div class='del'>-	struct _CamelNNTPFolderPrivate *p;</div><div class='del'>-</div><div class='del'>-	nntp_folder-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p = nntp_folder-&gt;priv = g_malloc0(sizeof(*nntp_folder-&gt;priv));</div><div class='del'>-	p-&gt;search_lock = g_mutex_new();</div><div class='del'>-	p-&gt;cache_lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-nntp_folder_finalise (CamelNNTPFolder *nntp_folder)</div><div class='del'>-{</div><div class='del'>-	struct _CamelNNTPFolderPrivate *p;</div><div class='del'>-</div><div class='del'>-	g_free(nntp_folder-&gt;storage_path);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p = nntp_folder-&gt;priv;</div><div class='del'>-	g_mutex_free(p-&gt;search_lock);</div><div class='del'>-	g_mutex_free(p-&gt;cache_lock);</div><div class='del'>-	g_free(p);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_nntp_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-		</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = nntp_folder_sync;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = nntp_folder_set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message = nntp_folder_get_message;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = nntp_folder_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_by_uids = nntp_folder_search_by_uids;</div><div class='del'>-	camel_folder_class-&gt;search_free = nntp_folder_search_free;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_nntp_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_nntp_folder_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_nntp_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelNNTPFolder",</div><div class='del'>-							      sizeof (CamelNNTPFolder),</div><div class='del'>-							      sizeof (CamelNNTPFolderClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) nntp_folder_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectInitFunc) nntp_folder_init,</div><div class='del'>-							      (CamelObjectFinalizeFunc) nntp_folder_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_nntp_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* not yet */</div><div class='del'>-/* Idea is we update in stages, but this requires a different xover command, etc */</div><div class='del'>-#ifdef ASYNC_SUMMARY</div><div class='del'>-struct _folder_check_msg {</div><div class='del'>-	CamelSessionThreadMsg msg;</div><div class='del'>-	CamelNNTPFolder *folder;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_check(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_check_msg *m = (struct _folder_check_msg *)msg;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelNNTPStore *nntp_store;</div><div class='del'>-</div><div class='del'>-	nntp_store = (CamelNNTPStore *)m-&gt;folder-&gt;parent.parent_store;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-	camel_nntp_summary_check((CamelNNTPSummary *)m-&gt;folder-&gt;parent.summary, m-&gt;folder-&gt;changes, ex);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_check_free(CamelSession *session, CamelSessionThreadMsg *msg)</div><div class='del'>-{</div><div class='del'>-	struct _folder_check_msg *m = (struct _folder_check_msg *)msg;</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)m-&gt;folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelSessionThreadOps folder_check_ops = {</div><div class='del'>-	folder_check,</div><div class='del'>-	folder_check_free,</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelNNTPFolder *nntp_folder;</div><div class='del'>-	char *root;</div><div class='del'>-	CamelService *service;</div><div class='del'>-#ifdef ASYNC_SUMMARY</div><div class='del'>-	struct _folder_check_msg *m;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	service = (CamelService *)parent;</div><div class='del'>-	root = camel_session_get_storage_path(service-&gt;session, service, ex);</div><div class='del'>-	if (root == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* If this doesn't work, stuff wont save, but let it continue anyway */</div><div class='del'>-	(void) camel_mkdir_hier(root, 0777);</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *) camel_object_new (CAMEL_NNTP_FOLDER_TYPE);</div><div class='del'>-	nntp_folder = (CamelNNTPFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct (folder, parent, folder_name, folder_name);</div><div class='del'>-	folder-&gt;folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY|CAMEL_FOLDER_HAS_SEARCH_CAPABILITY;</div><div class='del'>-</div><div class='del'>-	nntp_folder-&gt;storage_path = g_strdup_printf("%s/%s", root, folder-&gt;full_name);</div><div class='del'>-	g_free(root);</div><div class='del'>-</div><div class='del'>-	folder-&gt;summary = (CamelFolderSummary *)camel_nntp_summary_new(nntp_folder);</div><div class='del'>-	camel_folder_summary_load (folder-&gt;summary);</div><div class='del'>-#ifdef ASYNC_SUMMARY</div><div class='del'>-	m = camel_session_thread_msg_new(service-&gt;session, &amp;folder_check_ops, sizeof(*m));</div><div class='del'>-	m-&gt;folder = nntp_folder;</div><div class='del'>-	camel_object_ref((CamelObject *)folder);</div><div class='del'>-	camel_session_thread_queue(service-&gt;session, &amp;m-&gt;msg, 0);</div><div class='del'>-#else</div><div class='del'>-	if (camel_nntp_summary_check((CamelNNTPSummary *)folder-&gt;summary, nntp_folder-&gt;changes, ex) == -1) {</div><div class='del'>-		camel_object_unref((CamelObject *)folder);</div><div class='del'>-		folder = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h<br/>deleted file mode 100644<br/>index 300d61762d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-folder.h : NNTP group (folder) support. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_FOLDER_H</div><div class='del'>-#define CAMEL_NNTP_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel/camel-folder.h"</div><div class='del'>-</div><div class='del'>-/*  #include "camel-store.h" */</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_FOLDER_TYPE     (camel_nntp_folder_get_type ())</div><div class='del'>-#define CAMEL_NNTP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))</div><div class='del'>-#define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))</div><div class='del'>-#define CAMEL_IS_NNTP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNNTPFolder {</div><div class='del'>-	CamelFolder parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelNNTPFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderChangeInfo *changes;</div><div class='del'>-	char *storage_path;</div><div class='del'>-	CamelFolderSearch *search;</div><div class='del'>-} CamelNNTPFolder;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNNTPFolderClass {</div><div class='del'>-	CamelFolderClass parent;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelNNTPFolderClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_nntp_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c<br/>deleted file mode 100644<br/>index 7f3850f9c1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-grouplist.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-grouplist.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,219 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-nntp-grouplist.h"</div><div class='del'>-#include "camel-nntp-resp-codes.h"</div><div class='del'>-</div><div class='del'>-static CamelNNTPGroupList *</div><div class='del'>-camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	gboolean done = FALSE;</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(store);</div><div class='del'>-	status = camel_nntp_command (store, ex, NULL,</div><div class='del'>-				     "LIST");</div><div class='del'>-</div><div class='del'>-	if (status != NNTP_LIST_FOLLOWS) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not get group list from server."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = g_new0 (CamelNNTPGroupList, 1);</div><div class='del'>-	list-&gt;time = time (NULL);</div><div class='del'>-</div><div class='del'>-	while (!done) {</div><div class='del'>-		char *line;</div><div class='del'>-</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;line, ex) &lt; 0) {</div><div class='del'>-			list-&gt;group_list = g_list_reverse(list-&gt;group_list);</div><div class='del'>-			return list;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (*line == '.') {</div><div class='del'>-			done = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);</div><div class='del'>-			char **split_line = g_strsplit (line, " ", 4);</div><div class='del'>-</div><div class='del'>-			entry-&gt;group_name = g_strdup (split_line[0]);</div><div class='del'>-			entry-&gt;high = atoi (split_line[1]);</div><div class='del'>-			entry-&gt;low = atoi (split_line[2]);</div><div class='del'>-</div><div class='del'>-			g_strfreev (split_line);</div><div class='del'>-			</div><div class='del'>-			list-&gt;group_list = g_list_prepend (list-&gt;group_list, entry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(store);</div><div class='del'>-</div><div class='del'>-	list-&gt;group_list = g_list_reverse(list-&gt;group_list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelNNTPGroupList*</div><div class='del'>-camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));</div><div class='del'>-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-	FILE *fp;</div><div class='del'>-	char buf[300];</div><div class='del'>-	unsigned long time;</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-	fp = fopen (grouplist_file, "r");</div><div class='del'>-	g_free (grouplist_file);</div><div class='del'>-</div><div class='del'>-	if (fp == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to load grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read the time */</div><div class='del'>-	if (!fgets (buf, sizeof (buf), fp)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to load grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		fclose (fp);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	list = g_new0 (CamelNNTPGroupList, 1);</div><div class='del'>-	list-&gt;store = store;</div><div class='del'>-	sscanf (buf, "%lu", &amp;time);</div><div class='del'>-	list-&gt;time = time;</div><div class='del'>-</div><div class='del'>-	while (fgets (buf, sizeof (buf), fp)) {</div><div class='del'>-		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);</div><div class='del'>-		char **split_line = g_strsplit (buf, " ", 4);</div><div class='del'>-</div><div class='del'>-		entry-&gt;group_name = g_strdup (split_line[0]);</div><div class='del'>-		entry-&gt;high = atoi (split_line[1]);</div><div class='del'>-		entry-&gt;low = atoi (split_line[2]);</div><div class='del'>-</div><div class='del'>-		g_strfreev (split_line);</div><div class='del'>-</div><div class='del'>-		list-&gt;group_list = g_list_prepend (list-&gt;group_list, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-</div><div class='del'>-	list-&gt;group_list = g_list_reverse(list-&gt;group_list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_entry (CamelNNTPGroupListEntry *entry, FILE *fp)</div><div class='del'>-{</div><div class='del'>-	fprintf (fp, "%s %d %d\n", entry-&gt;group_name, entry-&gt;low, entry-&gt;high);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(group_list-&gt;store));</div><div class='del'>-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-	fp = fopen (grouplist_file, "w");</div><div class='del'>-	g_free (grouplist_file);</div><div class='del'>-</div><div class='del'>-	if (fp == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to save grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(group_list-&gt;store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "%lu\n", (long)group_list-&gt;time);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (group_list-&gt;group_list, (GFunc)save_entry, fp);</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_entry (CamelNNTPGroupListEntry *entry, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (entry-&gt;group_name);</div><div class='del'>-	g_free (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_grouplist_free (CamelNNTPGroupList *group_list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (group_list);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (group_list-&gt;group_list, (GFunc)free_entry, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (group_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelNNTPGroupList*</div><div class='del'>-camel_nntp_grouplist_fetch (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-</div><div class='del'>-	list = camel_nntp_get_grouplist_from_file (store, ex);</div><div class='del'>-</div><div class='del'>-	printf ("camel_nntp_get_grouplist_from_file returned %p\n", list);</div><div class='del'>-</div><div class='del'>-	if (!list) {</div><div class='del'>-		camel_exception_clear (ex);</div><div class='del'>-</div><div class='del'>-		list = camel_nntp_get_grouplist_from_server (store, ex);</div><div class='del'>-</div><div class='del'>-		if (!list) {</div><div class='del'>-			camel_nntp_grouplist_free (list);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			list-&gt;store = store;</div><div class='del'>-			camel_nntp_grouplist_save (list, ex);</div><div class='del'>-			return list;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h<br/>deleted file mode 100644<br/>index edd1e64cb9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-grouplist.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-grouplist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_GROUPLIST_H</div><div class='del'>-#define CAMEL_NNTP_GROUPLIST_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-</div><div class='del'>-struct CamelNNTPGroupListEntry {</div><div class='del'>-	char *group_name;</div><div class='del'>-	guint32 low;</div><div class='del'>-	guint32 high;</div><div class='del'>-	guint32 flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct CamelNNTPGroupList {</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	time_t time;</div><div class='del'>-	GList *group_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);</div><div class='del'>-gint                camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex);</div><div class='del'>-void                camel_nntp_grouplist_save   (CamelNNTPGroupList *group_list, CamelException *ex);</div><div class='del'>-void                camel_nntp_grouplist_free   (CamelNNTPGroupList *group_list);</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_GROUPLIST_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c<br/>deleted file mode 100644<br/>index 8475a137a2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-newsrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,655 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include "camel-nntp-newsrc.h"</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-</div><div class='del'>-#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)-&gt;l))</div><div class='del'>-#define NEWSRC_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPNewsrc *)f)-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define NEWSRC_LOCK(f, l)</div><div class='del'>-#define NEWSRC_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	guint low;</div><div class='del'>-	guint high;</div><div class='del'>-} ArticleRange;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	GArray *ranges;</div><div class='del'>-	gboolean subscribed;</div><div class='del'>-} NewsrcGroup;</div><div class='del'>-</div><div class='del'>-struct CamelNNTPNewsrc {</div><div class='del'>-	gchar *filename;</div><div class='del'>-	GHashTable *groups;</div><div class='del'>-	gboolean dirty;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *lock;</div><div class='del'>-#endif</div><div class='del'>-} ;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static NewsrcGroup *</div><div class='del'>-camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const char *group_name, gboolean subscribed)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *new_group = g_malloc(sizeof(NewsrcGroup));</div><div class='del'>-</div><div class='del'>-	new_group-&gt;name = g_strdup(group_name);</div><div class='del'>-	new_group-&gt;subscribed = subscribed;</div><div class='del'>-	new_group-&gt;ranges = g_array_new (FALSE, FALSE, sizeof (ArticleRange));</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (newsrc-&gt;groups, new_group-&gt;name, new_group);</div><div class='del'>-</div><div class='del'>-	newsrc-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	return new_group;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_nntp_newsrc_group_get_highest_article_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)</div><div class='del'>-{</div><div class='del'>-	if (!group || group-&gt;ranges-&gt;len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return g_array_index(group-&gt;ranges, ArticleRange, group-&gt;ranges-&gt;len - 1).high;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	if (group == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++)</div><div class='del'>-		count += (g_array_index(group-&gt;ranges, ArticleRange, i).high -</div><div class='del'>-			  g_array_index(group-&gt;ranges, ArticleRange, i).low) + 1;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, long low, long high)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (group-&gt;ranges-&gt;len == 1</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).low == 0</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).high == 0) {</div><div class='del'>-		g_array_index (group-&gt;ranges, ArticleRange, 0).low = low;</div><div class='del'>-		g_array_index (group-&gt;ranges, ArticleRange, 0).high = high;</div><div class='del'>-</div><div class='del'>-		newsrc-&gt;dirty = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else  {</div><div class='del'>-		ArticleRange tmp_range;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++) {</div><div class='del'>-			guint range_low = g_array_index (group-&gt;ranges, ArticleRange, i).low;</div><div class='del'>-			guint range_high = g_array_index (group-&gt;ranges, ArticleRange, i).high;</div><div class='del'>-			</div><div class='del'>-			/* if it's already part of a range, return immediately. */</div><div class='del'>-			if (low &gt;= range_low &amp;&amp;</div><div class='del'>-			    low &lt;= range_high &amp;&amp;</div><div class='del'>-			    high &gt;= range_low &amp;&amp;</div><div class='del'>-			    high &lt;= range_high) {</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we have a new lower bound for this range, set it. */</div><div class='del'>-			else if (low &lt;= range_low</div><div class='del'>-				 &amp;&amp; high &gt;= range_low</div><div class='del'>-				 &amp;&amp; high &lt;= range_high) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).low = low;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we have a new upper bound for this range, set it. */</div><div class='del'>-			else if (high &gt;= range_high</div><div class='del'>-				 &amp;&amp; low &gt;= range_low</div><div class='del'>-				 &amp;&amp; low &lt;= range_high) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).high = high;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we would be inserting another range that</div><div class='del'>-                           starts one index higher than an existing</div><div class='del'>-                           one, make the upper value of the existing</div><div class='del'>-                           range the upper value of the new one. */</div><div class='del'>-			else if (low == range_high + 1) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).high = high;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we would be inserting another range that</div><div class='del'>-                           ends one index lower than an existing one,</div><div class='del'>-                           group the existing range by setting its low</div><div class='del'>-                           to the new low */</div><div class='del'>-			else if (high == range_low - 1) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).low = low;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if the range lies entirely outside another</div><div class='del'>-                           range, doesn't coincide with it's</div><div class='del'>-                           endpoints, and has lower values, insert it</div><div class='del'>-                           into the middle of the list. */</div><div class='del'>-			else if (low &lt; range_low</div><div class='del'>-				 &amp;&amp; high &lt; range_low) {</div><div class='del'>-				tmp_range.low = low;</div><div class='del'>-				tmp_range.high = high;</div><div class='del'>-</div><div class='del'>-				group-&gt;ranges = g_array_insert_val (group-&gt;ranges, i, tmp_range);</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* if we made it here, the range needs to go at the end */</div><div class='del'>-		tmp_range.low = low;</div><div class='del'>-		tmp_range.high = high;</div><div class='del'>-		group-&gt;ranges = g_array_append_val (group-&gt;ranges, tmp_range);</div><div class='del'>-		newsrc-&gt;dirty = TRUE;</div><div class='del'>-	} </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group)</div><div class='del'>-		ret = camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_newsrc_get_num_articles_read (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group)</div><div class='del'>-		ret = camel_nntp_newsrc_group_get_num_articles_read (newsrc, group);</div><div class='del'>-	else</div><div class='del'>-		ret = 0;</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_mark_article_read (CamelNNTPNewsrc *newsrc, const char *group_name, int num)</div><div class='del'>-{</div><div class='del'>-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_mark_range_read(CamelNNTPNewsrc *newsrc, const char *group_name, long low, long high)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	/* swap them if they're in the wrong order. */</div><div class='del'>-	if (low &gt; high) {</div><div class='del'>-		long tmp;</div><div class='del'>-</div><div class='del'>-		tmp = high;</div><div class='del'>-		high = low;</div><div class='del'>-		low = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group)</div><div class='del'>-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_nntp_newsrc_article_is_read (CamelNNTPNewsrc *newsrc, const char *group_name, long num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-	int ret = FALSE;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		for (i = 0; i &lt; group-&gt;ranges-&gt;len; i++) {</div><div class='del'>-			if (num &gt;= g_array_index (group-&gt;ranges, ArticleRange, i).low &amp;&amp; </div><div class='del'>-			    num &lt;= g_array_index (group-&gt;ranges, ArticleRange, i).high) {</div><div class='del'>-				ret = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean  </div><div class='del'>-camel_nntp_newsrc_group_is_subscribed (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-	int ret = FALSE;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		ret = group-&gt;subscribed;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_subscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		if (!group-&gt;subscribed)</div><div class='del'>-			newsrc-&gt;dirty = TRUE;</div><div class='del'>-		group-&gt;subscribed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		camel_nntp_newsrc_group_add (newsrc, group_name, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_unsubscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-	if (group) {</div><div class='del'>-		if (group-&gt;subscribed)</div><div class='del'>-			newsrc-&gt;dirty = TRUE;</div><div class='del'>-		group-&gt;subscribed = FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		camel_nntp_newsrc_group_add (newsrc, group_name, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct newsrc_ptr_array {</div><div class='del'>-	GPtrArray *ptr_array;</div><div class='del'>-	gboolean subscribed_only;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* this needs to strdup the grup_name, if the group array is likely to change */</div><div class='del'>-static void</div><div class='del'>-get_group_foreach (char *group_name, NewsrcGroup *group, struct newsrc_ptr_array *npa)</div><div class='del'>-{</div><div class='del'>-	if (group-&gt;subscribed || !npa-&gt;subscribed_only) {</div><div class='del'>-		g_ptr_array_add (npa-&gt;ptr_array, group_name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc)</div><div class='del'>-{</div><div class='del'>-	struct newsrc_ptr_array npa;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (newsrc, NULL);</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	npa.ptr_array = g_ptr_array_new();</div><div class='del'>-	npa.subscribed_only = TRUE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (newsrc-&gt;groups,</div><div class='del'>-			      (GHFunc)get_group_foreach, &amp;npa);</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return npa.ptr_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)</div><div class='del'>-{</div><div class='del'>-	struct newsrc_ptr_array npa;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (newsrc, NULL);</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	npa.ptr_array = g_ptr_array_new();</div><div class='del'>-	npa.subscribed_only = FALSE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (newsrc-&gt;groups,</div><div class='del'>-			      (GHFunc)get_group_foreach, &amp;npa);</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	return npa.ptr_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_free_group_names (CamelNNTPNewsrc *newsrc, GPtrArray *group_names)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_free (group_names, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct newsrc_fp {</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-	FILE *fp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_newsrc_write_group_line(gpointer key, NewsrcGroup *group, struct newsrc_fp *newsrc_fp)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-	FILE *fp;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	fp = newsrc_fp-&gt;fp;</div><div class='del'>-	newsrc = newsrc_fp-&gt;newsrc;</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "%s%c", group-&gt;name, group-&gt;subscribed ? ':' : '!');</div><div class='del'>-</div><div class='del'>-	if (group-&gt;ranges-&gt;len == 1</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).low == 0</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).high == 0) {</div><div class='del'>-		fprintf (fp, "\n");</div><div class='del'>-</div><div class='del'>-		return; /* special case since our parsing code will insert this</div><div class='del'>-			   bogus range if there were no read articles.  The code</div><div class='del'>-			   to add a range is smart enough to remove this one if we</div><div class='del'>-			   ever mark an article read, but we still need to deal with</div><div class='del'>-			   it if that code doesn't get hit. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, " ");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++) {</div><div class='del'>-		char range_buffer[100];</div><div class='del'>-		guint low = g_array_index (group-&gt;ranges, ArticleRange, i).low;</div><div class='del'>-		guint high = g_array_index (group-&gt;ranges, ArticleRange, i).high;</div><div class='del'>-</div><div class='del'>-		if (low == high)</div><div class='del'>-			sprintf(range_buffer, "%d", low);</div><div class='del'>-		else if (low == high - 1)</div><div class='del'>-			sprintf(range_buffer, "%d,%d", low, high);</div><div class='del'>-		else</div><div class='del'>-			sprintf(range_buffer, "%d-%d", low, high);</div><div class='del'>-</div><div class='del'>-		if (i != group-&gt;ranges-&gt;len - 1)</div><div class='del'>-			strcat(range_buffer, ",");</div><div class='del'>-</div><div class='del'>-		fprintf (fp, range_buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)</div><div class='del'>-{</div><div class='del'>-	struct newsrc_fp newsrc_fp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (newsrc);</div><div class='del'>-</div><div class='del'>-	newsrc_fp.newsrc = newsrc;</div><div class='del'>-	newsrc_fp.fp = fp;</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (newsrc-&gt;groups,</div><div class='del'>-			      (GHFunc)camel_nntp_newsrc_write_group_line,</div><div class='del'>-			      &amp;newsrc_fp);</div><div class='del'>-</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_write(CamelNNTPNewsrc *newsrc)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (newsrc);</div><div class='del'>-</div><div class='del'>-	NEWSRC_LOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	if (!newsrc-&gt;dirty) {</div><div class='del'>-		NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((fp = fopen(newsrc-&gt;filename, "w")) == NULL) {</div><div class='del'>-		g_warning ("Couldn't open newsrc file '%s'.\n", newsrc-&gt;filename);</div><div class='del'>-		NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	newsrc-&gt;dirty = FALSE;</div><div class='del'>-	NEWSRC_UNLOCK(newsrc, lock);</div><div class='del'>-</div><div class='del'>-	camel_nntp_newsrc_write_to_file(newsrc, fp);</div><div class='del'>-</div><div class='del'>-	fclose(fp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, char *line)</div><div class='del'>-{</div><div class='del'>-	char *p, *comma, *dash;</div><div class='del'>-	gboolean is_subscribed;</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	p = strchr(line, ':');</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		is_subscribed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		p = strchr(line, '!');</div><div class='del'>-		if (p)</div><div class='del'>-			is_subscribed = FALSE;</div><div class='del'>-		else</div><div class='del'>-			return; /* bogus line. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p++ = '\0';</div><div class='del'>-</div><div class='del'>-	group = camel_nntp_newsrc_group_add (newsrc, line, is_subscribed);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		guint high, low;</div><div class='del'>-</div><div class='del'>-		comma = strchr(p, ',');</div><div class='del'>-</div><div class='del'>-		if (comma)</div><div class='del'>-			*comma = '\0';</div><div class='del'>-</div><div class='del'>-		dash = strchr(p, '-');</div><div class='del'>-</div><div class='del'>-		if (!dash) { /* there wasn't a dash.  must be just one number */</div><div class='del'>-			high = low = atol(p);</div><div class='del'>-		}</div><div class='del'>-		else { /* there was a dash. */</div><div class='del'>-			*dash = '\0';</div><div class='del'>-			low = atol(p);</div><div class='del'>-			*dash = '-';</div><div class='del'>-			p = dash + 1;</div><div class='del'>-			high = atol(p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);</div><div class='del'>-</div><div class='del'>-		if (comma) {</div><div class='del'>-			*comma = ',';</div><div class='del'>-			p = comma + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} while(comma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_line (char *buf, char **p)</div><div class='del'>-{</div><div class='del'>-	char *l;</div><div class='del'>-	char *line;</div><div class='del'>-</div><div class='del'>-	g_assert (*p == NULL || **p == '\n' || **p == '\0');</div><div class='del'>-</div><div class='del'>-	if (*p == NULL) {</div><div class='del'>-		*p = buf;</div><div class='del'>-</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		(*p) ++;</div><div class='del'>-	</div><div class='del'>-		/* if we just incremented to the end of the buffer, return NULL */</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l = strchr (*p, '\n');</div><div class='del'>-	if (l) {</div><div class='del'>-		*l = '\0';</div><div class='del'>-		line = g_strdup (*p);</div><div class='del'>-		*l = '\n';</div><div class='del'>-		*p = l;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* we're at the last line (which isn't terminated by a \n, btw) */</div><div class='del'>-		line = g_strdup (*p);</div><div class='del'>-		(*p) += strlen (*p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return line;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelNNTPNewsrc *</div><div class='del'>-camel_nntp_newsrc_read_for_server (const char *server)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	char buf[1024];</div><div class='del'>-	char *file_contents, *line, *p;</div><div class='del'>-	char *filename;</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-	int newsrc_len;</div><div class='del'>-	int len_read = 0;</div><div class='del'>-	struct stat sb;</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);</div><div class='del'>-</div><div class='del'>-	newsrc = g_new0(CamelNNTPNewsrc, 1);</div><div class='del'>-	newsrc-&gt;filename = filename;</div><div class='del'>-	newsrc-&gt;groups = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	newsrc-&gt;lock = g_mutex_new();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if ((fd = open(filename, O_RDONLY)) == -1) {</div><div class='del'>-		g_warning ("~/.newsrc-%s not present.\n", server);</div><div class='del'>-		return newsrc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fstat (fd, &amp;sb) == -1) {</div><div class='del'>-		g_warning ("failed fstat on ~/.newsrc-%s: %s\n", server, strerror(errno));</div><div class='del'>-		return newsrc;</div><div class='del'>-	}</div><div class='del'>-	newsrc_len = sb.st_size;</div><div class='del'>-</div><div class='del'>-	file_contents = g_malloc (newsrc_len + 1);</div><div class='del'>-</div><div class='del'>-	while (len_read &lt; newsrc_len) {</div><div class='del'>-		int c = read (fd, buf, sizeof (buf));</div><div class='del'>-</div><div class='del'>-		if (c == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy (&amp;file_contents[len_read], buf, c);</div><div class='del'>-		len_read += c;</div><div class='del'>-	}</div><div class='del'>-	file_contents [len_read] = 0;</div><div class='del'>-</div><div class='del'>-	p = NULL;</div><div class='del'>-	while ((line = get_line (file_contents, &amp;p))) {</div><div class='del'>-		camel_nntp_newsrc_parse_line(newsrc, line);</div><div class='del'>-		g_free (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close (fd);</div><div class='del'>-	g_free (file_contents);</div><div class='del'>-</div><div class='del'>-	return newsrc;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h<br/>deleted file mode 100644<br/>index 652e3edbce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-newsrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_NNTP_NEWSRC_H_</div><div class='del'>-#define _CAMEL_NNTP_NEWSRC_H_</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "glib.h"</div><div class='del'>-</div><div class='del'>-typedef struct CamelNNTPNewsrc CamelNNTPNewsrc;</div><div class='del'>-</div><div class='del'>-int              camel_nntp_newsrc_get_highest_article_read   (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-int              camel_nntp_newsrc_get_num_articles_read      (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_mark_article_read          (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, int num);</div><div class='del'>-void             camel_nntp_newsrc_mark_range_read            (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, long low, long high);</div><div class='del'>-</div><div class='del'>-gboolean         camel_nntp_newsrc_article_is_read            (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, long num);</div><div class='del'>-</div><div class='del'>-gboolean         camel_nntp_newsrc_group_is_subscribed        (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_subscribe_group            (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_unsubscribe_group          (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-</div><div class='del'>-GPtrArray*       camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc);</div><div class='del'>-GPtrArray*       camel_nntp_newsrc_get_all_group_names        (CamelNNTPNewsrc *newsrc);</div><div class='del'>-void             camel_nntp_newsrc_free_group_names           (CamelNNTPNewsrc *newsrc, GPtrArray *group_names);</div><div class='del'>-</div><div class='del'>-void             camel_nntp_newsrc_write_to_file              (CamelNNTPNewsrc *newsrc, FILE *fp);</div><div class='del'>-void             camel_nntp_newsrc_write                      (CamelNNTPNewsrc *newsrc);</div><div class='del'>-CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server            (const char *server);</div><div class='del'>-</div><div class='del'>-#endif /* _CAMEL_NNTP_NEWSRC_H_ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h<br/>deleted file mode 100644<br/>index 95b29ba6b9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-private.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-</div><div class='del'>- *  camel-nntp-private.h: Private info for nntp.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_PRIVATE_H</div><div class='del'>-#define CAMEL_NNTP_PRIVATE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-/* need a way to configure and save this data, if this header is to</div><div class='del'>-   be installed.  For now, dont install it */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPStorePrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	EMutex *command_lock;	/* for locking the command stream for a complete operation */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_NNTP_STORE_LOCK(f, l) (e_mutex_lock(((CamelNNTPStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_NNTP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelNNTPStore *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_NNTP_STORE_LOCK(f, l)</div><div class='del'>-#define CAMEL_NNTP_STORE_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPFolderPrivate {</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	GMutex *search_lock;	/* for locking the search object */</div><div class='del'>-	GMutex *cache_lock;     /* for locking the cache object */</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#define CAMEL_NNTP_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelNNTPFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#define CAMEL_NNTP_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPFolder *)f)-&gt;priv-&gt;l))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_NNTP_FOLDER_LOCK(f, l)</div><div class='del'>-#define CAMEL_NNTP_FOLDER_UNLOCK(f, l)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_PRIVATE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c<br/>deleted file mode 100644<br/>index c38b794504..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-provider.c: nntp provider registration code */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors :</div><div class='del'>- *   Chris Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-</div><div class='del'>-static void add_hash (guint *hash, char *s);</div><div class='del'>-static guint nntp_url_hash (gconstpointer key);</div><div class='del'>-static gint check_equal (char *s1, char *s2);</div><div class='del'>-static gint nntp_url_equal (gconstpointer a, gconstpointer b);</div><div class='del'>-</div><div class='del'>-static CamelProvider news_provider = {</div><div class='del'>-	"nntp",</div><div class='del'>-	N_("USENET news"),</div><div class='del'>-</div><div class='del'>-	N_("This is a provider for reading from and posting to"</div><div class='del'>-	   "USENET newsgroups."),</div><div class='del'>-</div><div class='del'>-	"news",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |</div><div class='del'>-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,</div><div class='del'>-</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	news_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_nntp_store_get_type();</div><div class='del'>-</div><div class='del'>-	news_provider.url_hash = nntp_url_hash;</div><div class='del'>-	news_provider.url_equal = nntp_url_equal;</div><div class='del'>-	</div><div class='del'>-	camel_session_register_provider (session, &amp;news_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_hash (guint *hash, char *s)</div><div class='del'>-{</div><div class='del'>-	if (s)</div><div class='del'>-		*hash ^= g_str_hash(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-nntp_url_hash (gconstpointer key)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u = (CamelURL *)key;</div><div class='del'>-	guint hash = 0;</div><div class='del'>-</div><div class='del'>-	add_hash (&amp;hash, u-&gt;user);</div><div class='del'>-	add_hash (&amp;hash, u-&gt;host);</div><div class='del'>-	hash ^= u-&gt;port;</div><div class='del'>-	</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-check_equal (char *s1, char *s2)</div><div class='del'>-{</div><div class='del'>-	if (s1 == NULL) {</div><div class='del'>-		if (s2 == NULL)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (s2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return strcmp (s1, s2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-nntp_url_equal (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u1 = a, *u2 = b;</div><div class='del'>-	</div><div class='del'>-	return check_equal (u1-&gt;user, u2-&gt;user)</div><div class='del'>-		&amp;&amp; check_equal (u1-&gt;host, u2-&gt;host)</div><div class='del'>-		&amp;&amp; u1-&gt;port == u2-&gt;port;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h<br/>deleted file mode 100644<br/>index d9aace81ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-resp-codes.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-resp-codes.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-resp-codes.h : #defines for all the response codes we care about */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_RESP_CODES_H</div><div class='del'>-#define CAMEL_NNTP_RESP_CODES_H 1</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_OK(x) ((x) &lt; 400)</div><div class='del'>-#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) &amp;&amp; (x) &lt; 500)</div><div class='del'>-#define CAMEL_NNTP_FAIL(x) (!CAMEL_NNTP_OK(x) &amp;&amp; !CAMEL_NNTP_ERR(x))</div><div class='del'>-</div><div class='del'>-#define NNTP_GREETING_POSTING_OK    200</div><div class='del'>-#define NNTP_GREETING_NO_POSTING    201</div><div class='del'>-</div><div class='del'>-#define NNTP_EXTENSIONS_SUPPORTED     202</div><div class='del'>-#define NNTP_GROUP_SELECTED           211</div><div class='del'>-#define NNTP_LIST_FOLLOWS             215</div><div class='del'>-#define NNTP_ARTICLE_FOLLOWS          220</div><div class='del'>-#define NNTP_HEAD_FOLLOWS             221</div><div class='del'>-#define NNTP_DATA_FOLLOWS             224</div><div class='del'>-#define NNTP_NEW_ARTICLE_LIST_FOLLOWS 230</div><div class='del'>-#define NNTP_NEW_GROUP_LIST_FOLLOWS   231</div><div class='del'>-</div><div class='del'>-#define NNTP_NO_SUCH_GROUP          411</div><div class='del'>-#define NNTP_NO_SUCH_ARTICLE        430</div><div class='del'>-</div><div class='del'>-#define NNTP_NO_PERMISSION          502</div><div class='del'>-</div><div class='del'>-/* authentication */</div><div class='del'>-#define NNTP_AUTH_ACCEPTED          281</div><div class='del'>-#define NNTP_AUTH_CONTINUE          381</div><div class='del'>-#define NNTP_AUTH_REQUIRED          480</div><div class='del'>-#define NNTP_AUTH_REJECTED          482</div><div class='del'>-</div><div class='del'>-#define NNTP_PROTOCOL_ERROR         666</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_RESP_CODES_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c<br/>deleted file mode 100644<br/>index c4737add36..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,462 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-store.c : class for an nntp store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc. &lt;www.ximain.com&gt;</div><div class='del'>- *</div><div class='del'>- * Authors: Christopher Toshok &lt;toshok@ximian.com&gt;</div><div class='del'>- *    	    Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-exception.h"</div><div class='del'>-#include "camel/camel-url.h"</div><div class='del'>-#include "camel/string-utils.h"</div><div class='del'>-#include "camel/camel-stream-mem.h"</div><div class='del'>-#include "camel/camel-session.h"</div><div class='del'>-#include "camel/camel-data-cache.h"</div><div class='del'>-</div><div class='del'>-#include "camel-nntp-stream.h"</div><div class='del'>-#include "camel-nntp-summary.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-private.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-#define NNTP_PORT 119</div><div class='del'>-</div><div class='del'>-#define DUMP_EXTENSIONS</div><div class='del'>-</div><div class='del'>-/* define if you want the subscribe ui to show folders in tree form */</div><div class='del'>-/* #define INFO_AS_TREE */</div><div class='del'>-</div><div class='del'>-static CamelRemoteStoreClass *remote_store_class = NULL;</div><div class='del'>-</div><div class='del'>-static CamelServiceClass *service_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelNNTPStore */</div><div class='del'>-#define CNNTPS_CLASS(so) CAMEL_NNTP_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-nntp_store_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	unsigned char *line;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int ret = FALSE;</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(store, command_lock);</div><div class='del'>-</div><div class='del'>-	/* setup store-wide cache */</div><div class='del'>-	if (store-&gt;cache == NULL) {</div><div class='del'>-		char *root;</div><div class='del'>-</div><div class='del'>-		root = camel_session_get_storage_path(service-&gt;session, service, ex);</div><div class='del'>-		if (root == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		store-&gt;cache = camel_data_cache_new(root, 0, ex);</div><div class='del'>-		g_free(root);</div><div class='del'>-		if (store-&gt;cache == NULL)</div><div class='del'>-			goto fail;</div><div class='del'>-</div><div class='del'>-		/* Default cache expiry - 2 weeks old, or not visited in 5 days */</div><div class='del'>-		camel_data_cache_set_expire_age(store-&gt;cache, 60*60*24*14);</div><div class='del'>-		camel_data_cache_set_expire_access(store-&gt;cache, 60*60*24*5);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CAMEL_SERVICE_CLASS (remote_store_class)-&gt;connect (service, ex) == FALSE)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	store-&gt;stream = (CamelNNTPStream *)camel_nntp_stream_new(((CamelRemoteStore *)service)-&gt;ostream);</div><div class='del'>-	if (camel_nntp_stream_line(store-&gt;stream, &amp;line, &amp;len) == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	len = strtoul(line, (char **)&amp;line, 10);</div><div class='del'>-	if (len != 200 &amp;&amp; len != 201)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* set 'reader' mode &amp; ignore return code */</div><div class='del'>-	camel_nntp_command(store, (char **)&amp;line, "mode reader");</div><div class='del'>-	ret = TRUE;</div><div class='del'>-fail:</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(store, command_lock);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);</div><div class='del'>-	char *line;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (clean)</div><div class='del'>-		camel_nntp_command (store, &amp;line, "quit");</div><div class='del'>-</div><div class='del'>-	if (!service_class-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)store-&gt;stream);</div><div class='del'>-	store-&gt;stream = NULL;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(store, command_lock);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-nntp_store_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf ("%s", service-&gt;url-&gt;host);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("USENET News via %s"), service-&gt;url-&gt;host);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will authenticate with the NNTP server using a "</div><div class='del'>-	   "plaintext password."),</div><div class='del'>-	</div><div class='del'>-	"",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-nntp_store_query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *prev;</div><div class='del'>-	</div><div class='del'>-	g_warning ("nntp::query_auth_types: not implemented. Defaulting.");</div><div class='del'>-	prev = CAMEL_SERVICE_CLASS (remote_store_class)-&gt;query_auth_types (service, ex);</div><div class='del'>-	return g_list_prepend (prev, &amp;password_authtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-nntp_store_get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	folder = camel_nntp_folder_new(store, folder_name, ex);</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-nntp_store_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)store;</div><div class='del'>-	CamelFolderInfo *groups = NULL, *last = NULL, *fi;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned char *line, *space;</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_LOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	ret = camel_nntp_command(nntp_store, (char **)&amp;line, "list");</div><div class='del'>-	if (ret != 215) {</div><div class='del'>-		ret = -1;</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while ( (ret = camel_nntp_stream_line(nntp_store-&gt;stream, &amp;line, &amp;len)) &gt; 0) {</div><div class='del'>-		space = strchr(line, ' ');</div><div class='del'>-		if (space)</div><div class='del'>-			*space = 0;</div><div class='del'>-</div><div class='del'>-		if (top == NULL || top[0] == 0 || strcmp(top, line) == 0) {</div><div class='del'>-			fi = g_malloc0(sizeof(*fi));</div><div class='del'>-			fi-&gt;name = g_strdup(line);</div><div class='del'>-			fi-&gt;full_name = g_strdup(line);</div><div class='del'>-			if (url-&gt;user)</div><div class='del'>-				fi-&gt;url = g_strdup_printf ("nntp://%s@%s/%s", url-&gt;user, url-&gt;host, line);</div><div class='del'>-			else</div><div class='del'>-				fi-&gt;url = g_strdup_printf ("nntp://%s/%s", url-&gt;host, line);</div><div class='del'>-			fi-&gt;unread_message_count = -1;</div><div class='del'>-			camel_folder_info_build_path(fi, '/');</div><div class='del'>-</div><div class='del'>-			if (last)</div><div class='del'>-				last-&gt;sibling = fi;</div><div class='del'>-			else</div><div class='del'>-				groups = fi;</div><div class='del'>-			last = fi;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (ret &lt; 0)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	return groups;</div><div class='del'>-</div><div class='del'>-error:</div><div class='del'>-	CAMEL_NNTP_STORE_UNLOCK(nntp_store, command_lock);</div><div class='del'>-</div><div class='del'>-	if (groups)</div><div class='del'>-		camel_store_free_folder_info(store, groups);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	nntp_store = nntp_store;</div><div class='del'>-</div><div class='del'>-	/* FIXME: implement */</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	nntp_store = nntp_store;</div><div class='del'>-</div><div class='del'>-	/* FIXME: implement */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	nntp_store = nntp_store;</div><div class='del'>-</div><div class='del'>-	/* FIXME: implement */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_finalise (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);</div><div class='del'>-	struct _CamelNNTPStorePrivate *p = nntp_store-&gt;priv;</div><div class='del'>-</div><div class='del'>-	camel_service_disconnect((CamelService *)object, TRUE, NULL);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)nntp_store-&gt;mem);</div><div class='del'>-	nntp_store-&gt;mem = NULL;</div><div class='del'>-	if (nntp_store-&gt;stream)</div><div class='del'>-		camel_object_unref((CamelObject *)nntp_store-&gt;stream);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	e_mutex_destroy(p-&gt;command_lock);</div><div class='del'>-#endif</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_nntp_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_class);</div><div class='del'>-</div><div class='del'>-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs </div><div class='del'>-						      (camel_remote_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;connect = nntp_store_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = nntp_store_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = nntp_store_query_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = nntp_store_get_name;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = nntp_store_get_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = nntp_store_get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;folder_subscribed = nntp_store_folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = nntp_store_subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = nntp_store_unsubscribe_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-	struct _CamelNNTPStorePrivate *p;</div><div class='del'>-</div><div class='del'>-	remote_store-&gt;default_port = NNTP_PORT;</div><div class='del'>-</div><div class='del'>-	store-&gt;flags = CAMEL_STORE_SUBSCRIPTIONS;</div><div class='del'>-</div><div class='del'>-	nntp_store-&gt;mem = (CamelStreamMem *)camel_stream_mem_new();</div><div class='del'>-</div><div class='del'>-	p = nntp_store-&gt;priv = g_malloc0(sizeof(*p));</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	p-&gt;command_lock = e_mutex_new(E_MUTEX_REC);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_nntp_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_nntp_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_nntp_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelNNTPStore",</div><div class='del'>-							     sizeof (CamelNNTPStore),</div><div class='del'>-							     sizeof (CamelNNTPStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) nntp_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) nntp_store_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) nntp_store_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_nntp_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* enter owning lock */</div><div class='del'>-int camel_nntp_store_set_folder(CamelNNTPStore *store, CamelFolder *folder, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	if (store-&gt;current_folder &amp;&amp; strcmp(folder-&gt;full_name, store-&gt;current_folder) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Do something with changeinfo */</div><div class='del'>-	ret = camel_nntp_summary_check((CamelNNTPSummary *)folder-&gt;summary, changes, ex);</div><div class='del'>-</div><div class='del'>-	g_free(store-&gt;current_folder);</div><div class='del'>-	store-&gt;current_folder = g_strdup(folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Enter owning lock */</div><div class='del'>-int</div><div class='del'>-camel_nntp_command(CamelNNTPStore *store, char **line, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *p, *ps;</div><div class='del'>-	unsigned char c;</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *s;</div><div class='del'>-	int d;</div><div class='del'>-	unsigned int u, u2;</div><div class='del'>-</div><div class='del'>-	e_mutex_assert_locked(store-&gt;priv-&gt;command_lock);</div><div class='del'>-</div><div class='del'>-	if (!camel_remote_store_connected((CamelRemoteStore *)store, NULL))</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* Check for unprocessed data, ! */</div><div class='del'>-	if (store-&gt;stream-&gt;mode == CAMEL_NNTP_STREAM_DATA) {</div><div class='del'>-		g_warning("Unprocessed data left in stream, flushing");</div><div class='del'>-		while (camel_nntp_stream_getd(store-&gt;stream, (unsigned char **)&amp;p, &amp;u) &gt; 0)</div><div class='del'>-			;</div><div class='del'>-	}</div><div class='del'>-	camel_nntp_stream_set_mode(store-&gt;stream, CAMEL_NNTP_STREAM_LINE);</div><div class='del'>-</div><div class='del'>-	va_start(ap, fmt);</div><div class='del'>-	ps = p = fmt;</div><div class='del'>-	while ( (c = *p++) ) {</div><div class='del'>-		switch (c) {</div><div class='del'>-		case '%':</div><div class='del'>-			c = *p++;</div><div class='del'>-			camel_stream_write((CamelStream *)store-&gt;mem, ps, p-ps-(c=='%'?1:2));</div><div class='del'>-			ps = p;</div><div class='del'>-			switch (c) {</div><div class='del'>-			case 's':</div><div class='del'>-				s = va_arg(ap, char *);</div><div class='del'>-				camel_stream_write((CamelStream *)store-&gt;mem, s, strlen(s));</div><div class='del'>-				break;</div><div class='del'>-			case 'd':</div><div class='del'>-				d = va_arg(ap, int);</div><div class='del'>-				camel_stream_printf((CamelStream *)store-&gt;mem, "%d", d);</div><div class='del'>-				break;</div><div class='del'>-			case 'u':</div><div class='del'>-				u = va_arg(ap, unsigned int);</div><div class='del'>-				camel_stream_printf((CamelStream *)store-&gt;mem, "%u", u);</div><div class='del'>-				break;</div><div class='del'>-			case 'm':</div><div class='del'>-				s = va_arg(ap, char *);</div><div class='del'>-				camel_stream_printf((CamelStream *)store-&gt;mem, "&lt;%s&gt;", s);</div><div class='del'>-				break;</div><div class='del'>-			case 'r':</div><div class='del'>-				u = va_arg(ap, unsigned int);</div><div class='del'>-				u2 = va_arg(ap, unsigned int);</div><div class='del'>-				if (u == u2)</div><div class='del'>-					camel_stream_printf((CamelStream *)store-&gt;mem, "%u", u);</div><div class='del'>-				else</div><div class='del'>-					camel_stream_printf((CamelStream *)store-&gt;mem, "%u-%u", u, u2);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				g_warning("Passing unknown format to nntp_command: %c\n", c);</div><div class='del'>-				g_assert(0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_stream_write((CamelStream *)store-&gt;mem, ps, p-ps-1);</div><div class='del'>-	dd(printf("NNTP_COMMAND: '%.*s'\n", (int)store-&gt;mem-&gt;buffer-&gt;len, store-&gt;mem-&gt;buffer-&gt;data));</div><div class='del'>-	camel_stream_write((CamelStream *)store-&gt;mem, "\r\n", 2);</div><div class='del'>-	camel_stream_write((CamelStream *)store-&gt;stream, store-&gt;mem-&gt;buffer-&gt;data, store-&gt;mem-&gt;buffer-&gt;len);</div><div class='del'>-	camel_stream_reset((CamelStream *)store-&gt;mem);</div><div class='del'>-	/* FIXME: hack */</div><div class='del'>-	g_byte_array_set_size(store-&gt;mem-&gt;buffer, 0);</div><div class='del'>-</div><div class='del'>-	if (camel_nntp_stream_line(store-&gt;stream, (unsigned char **)line, &amp;u) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	u = strtoul(*line, NULL, 10);</div><div class='del'>-</div><div class='del'>-	/* Handle all switching to data mode here, to make callers job easier */</div><div class='del'>-	if (u == 215 || (u &gt;= 220 &amp;&amp; u &lt;=224) || (u &gt;= 230 &amp;&amp; u &lt;= 231))</div><div class='del'>-		camel_nntp_stream_set_mode(store-&gt;stream, CAMEL_NNTP_STREAM_DATA);</div><div class='del'>-</div><div class='del'>-	return u;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h<br/>deleted file mode 100644<br/>index 04a69b02e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-store.h : class for an nntp store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. &lt;toshok@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_STORE_H</div><div class='del'>-#define CAMEL_NNTP_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel/camel-remote-store.h"</div><div class='del'>-#include "camel/camel-exception.h"</div><div class='del'>-#include "camel/camel-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())</div><div class='del'>-#define CAMEL_NNTP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))</div><div class='del'>-#define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))</div><div class='del'>-#define CAMEL_IS_NNTP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_EXT_SEARCH     (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_NNTP_EXT_SETGET     (1&lt;&lt;1)</div><div class='del'>-#define CAMEL_NNTP_EXT_OVER       (1&lt;&lt;2)</div><div class='del'>-#define CAMEL_NNTP_EXT_XPATTEXT   (1&lt;&lt;3)</div><div class='del'>-#define CAMEL_NNTP_EXT_XACTIVE    (1&lt;&lt;4)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTMOTD   (1&lt;&lt;5)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTSUBSCR (1&lt;&lt;6)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTPNAMES (1&lt;&lt;7)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNNTPStore CamelNNTPStore;</div><div class='del'>-typedef struct _CamelNNTPStoreClass CamelNNTPStoreClass;</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPStore {</div><div class='del'>-	CamelRemoteStore parent_object;	</div><div class='del'>-</div><div class='del'>-	struct _CamelNNTPStorePrivate *priv;</div><div class='del'>-</div><div class='del'>-	guint32 extensions;</div><div class='del'>-</div><div class='del'>-	gboolean posting_allowed;</div><div class='del'>-</div><div class='del'>-	struct _CamelNNTPStream *stream;</div><div class='del'>-	struct _CamelStreamMem *mem;</div><div class='del'>-</div><div class='del'>-	struct _CamelDataCache *cache;</div><div class='del'>-</div><div class='del'>-	char *current_folder;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPStoreClass {</div><div class='del'>-	CamelRemoteStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_nntp_store_get_type (void);</div><div class='del'>-</div><div class='del'>-int camel_nntp_command(CamelNNTPStore *store, char **line, const char *fmt, ...);</div><div class='del'>-int camel_nntp_store_set_folder(CamelNNTPStore *store, CamelFolder *folder, CamelFolderChangeInfo *changes, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c<br/>deleted file mode 100644<br/>index 9072a8b75a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,462 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-nntp-stream.h"</div><div class='del'>-</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStream */</div><div class='del'>-#define CS_CLASS(so) CAMEL_NNTP_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_STREAM_SIZE (4096)</div><div class='del'>-#define CAMEL_NNTP_STREAM_LINE (1024) /* maximum line size */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_fill(CamelNNTPStream *is)</div><div class='del'>-{</div><div class='del'>-	int left = 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;source) {</div><div class='del'>-		left = is-&gt;end - is-&gt;ptr;</div><div class='del'>-		memcpy(is-&gt;buf, is-&gt;ptr, left);</div><div class='del'>-		is-&gt;end = is-&gt;buf + left;</div><div class='del'>-		is-&gt;ptr = is-&gt;buf;</div><div class='del'>-		left = camel_stream_read(is-&gt;source, is-&gt;end, CAMEL_NNTP_STREAM_SIZE - (is-&gt;end - is-&gt;buf));</div><div class='del'>-		if (left &gt; 0) {</div><div class='del'>-			is-&gt;end += left;</div><div class='del'>-			is-&gt;end[0] = '\n';</div><div class='del'>-			return is-&gt;end - is-&gt;ptr;</div><div class='del'>-		} else {</div><div class='del'>-			dd(printf("NNTP_STREAM_FILL(ERROR): '%s'\n", strerror(errno)));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read(CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStream *is = (CamelNNTPStream *)stream;</div><div class='del'>-	char *o, *oe;</div><div class='del'>-	unsigned char *p, *e, c;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode != CAMEL_NNTP_STREAM_DATA || n == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	o = buffer;</div><div class='del'>-	oe = buffer + n;</div><div class='del'>-	state = is-&gt;state;</div><div class='del'>-</div><div class='del'>-	/* Need to copy/strip '.'s and whatnot */</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	switch(state) {</div><div class='del'>-	state_0:</div><div class='del'>-	case 0:		/* start of line, always read at least 3 chars */</div><div class='del'>-		while (e - p &lt; 3) {</div><div class='del'>-			is-&gt;ptr = p;</div><div class='del'>-			if (stream_fill(is) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			p = is-&gt;ptr;</div><div class='del'>-			e = is-&gt;end;</div><div class='del'>-		}</div><div class='del'>-		if (p[0] == '.') {</div><div class='del'>-			if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-				is-&gt;ptr = p+3;</div><div class='del'>-				is-&gt;mode = CAMEL_NNTP_STREAM_EOD;</div><div class='del'>-				is-&gt;state = 0;</div><div class='del'>-				dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));</div><div class='del'>-				return o-buffer;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-		state = 1;</div><div class='del'>-		/* FALLS THROUGH */</div><div class='del'>-	case 1:		/* looking for next sol */</div><div class='del'>-		while (o &lt; oe) {</div><div class='del'>-			c = *p++;</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				/* end of input sentinal check */</div><div class='del'>-				if (p &gt; e) {</div><div class='del'>-					is-&gt;ptr = e;</div><div class='del'>-					if (stream_fill(is) == -1)</div><div class='del'>-						return -1;</div><div class='del'>-					p = is-&gt;ptr;</div><div class='del'>-					e = is-&gt;end;</div><div class='del'>-				} else {</div><div class='del'>-					*o++ = '\n';</div><div class='del'>-					state = 0;</div><div class='del'>-					goto state_0;</div><div class='del'>-				}</div><div class='del'>-			} else if (c != '\r') {</div><div class='del'>-				*o++ = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	is-&gt;ptr = p;</div><div class='del'>-	is-&gt;state = state;</div><div class='del'>-</div><div class='del'>-	dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));</div><div class='del'>-</div><div class='del'>-	return o-buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write(CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStream *is = (CamelNNTPStream *)stream;</div><div class='del'>-</div><div class='del'>-	return camel_stream_write(is-&gt;source, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-stream_eos(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStream *is = (CamelNNTPStream *)stream;</div><div class='del'>-</div><div class='del'>-	return is-&gt;mode != CAMEL_NNTP_STREAM_DATA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_reset(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop?  reset literal mode? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_stream_class_init (CamelStreamClass *camel_nntp_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_nntp_stream_class;</div><div class='del'>-</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_stream_init(CamelNNTPStream *is, CamelNNTPStreamClass *isclass)</div><div class='del'>-{</div><div class='del'>-	/* +1 is room for appending a 0 if we need to for a line */</div><div class='del'>-	is-&gt;ptr = is-&gt;end = is-&gt;buf = g_malloc(CAMEL_NNTP_STREAM_SIZE+1);</div><div class='del'>-	is-&gt;lineptr = is-&gt;linebuf = g_malloc(CAMEL_NNTP_STREAM_LINE+1);</div><div class='del'>-	is-&gt;lineend = is-&gt;linebuf + CAMEL_NNTP_STREAM_LINE;</div><div class='del'>-</div><div class='del'>-	/* init sentinal */</div><div class='del'>-	is-&gt;ptr[0] = '\n';</div><div class='del'>-</div><div class='del'>-	is-&gt;state = 0;</div><div class='del'>-	is-&gt;mode = CAMEL_NNTP_STREAM_LINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_stream_finalise(CamelNNTPStream *is)</div><div class='del'>-{</div><div class='del'>-	g_free(is-&gt;buf);</div><div class='del'>-	g_free(is-&gt;linebuf);</div><div class='del'>-	if (is-&gt;source)</div><div class='del'>-		camel_object_unref((CamelObject *)is-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_nntp_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_nntp_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_nntp_stream_type = camel_type_register( camel_stream_get_type(),</div><div class='del'>-							    "CamelNNTPStream",</div><div class='del'>-							    sizeof( CamelNNTPStream ),</div><div class='del'>-							    sizeof( CamelNNTPStreamClass ),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_nntp_stream_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_nntp_stream_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_nntp_stream_finalise );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_nntp_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_nntp_stream_new:</div><div class='del'>- *</div><div class='del'>- * Returns a NULL stream.  A null stream is always at eof, and</div><div class='del'>- * always returns success for all reads and writes.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_nntp_stream_new(CamelStream *source)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStream *is;</div><div class='del'>-</div><div class='del'>-	is = (CamelNNTPStream *)camel_object_new(camel_nntp_stream_get_type ());</div><div class='del'>-	camel_object_ref((CamelObject *)source);</div><div class='del'>-	is-&gt;source = source;</div><div class='del'>-</div><div class='del'>-	return (CamelStream *)is;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get one line from the nntp stream */</div><div class='del'>-int</div><div class='del'>-camel_nntp_stream_line(CamelNNTPStream *is, unsigned char **data, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	register unsigned char c, *p, *o, *oe;</div><div class='del'>-	int newlen, oldlen;</div><div class='del'>-	unsigned char *e;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_NNTP_STREAM_EOD) {</div><div class='del'>-		*data = is-&gt;linebuf;</div><div class='del'>-		*len = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	o = is-&gt;linebuf;</div><div class='del'>-	oe = is-&gt;lineend - 1;</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	/* Data mode, convert leading '..' to '.', and stop when we reach a solitary '.' */</div><div class='del'>-	if (is-&gt;mode == CAMEL_NNTP_STREAM_DATA) {</div><div class='del'>-		/* need at least 3 chars in buffer */</div><div class='del'>-		while (e-p &lt; 3) {</div><div class='del'>-			is-&gt;ptr = p;</div><div class='del'>-			if (stream_fill(is) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			p = is-&gt;ptr;</div><div class='del'>-			e = is-&gt;end;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* check for isolated '.\r\n' or begging of line '.' */</div><div class='del'>-		if (p[0] == '.') {</div><div class='del'>-			if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-				is-&gt;ptr = p+3;</div><div class='del'>-				is-&gt;mode = CAMEL_NNTP_STREAM_EOD;</div><div class='del'>-				*data = is-&gt;linebuf;</div><div class='del'>-				*len = 0;</div><div class='del'>-				is-&gt;linebuf[0] = 0;</div><div class='del'>-</div><div class='del'>-				dd(printf("NNTP_STREAM_LINE(END)\n"));</div><div class='del'>-</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		while (o &lt; oe) {</div><div class='del'>-			c = *p++;</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				/* sentinal? */</div><div class='del'>-				if (p&gt; e) {</div><div class='del'>-					is-&gt;ptr = e;</div><div class='del'>-					if (stream_fill(is) == -1)</div><div class='del'>-						return -1;</div><div class='del'>-					p = is-&gt;ptr;</div><div class='del'>-					e = is-&gt;end;</div><div class='del'>-				} else {</div><div class='del'>-					is-&gt;ptr = p;</div><div class='del'>-					*data = is-&gt;linebuf;</div><div class='del'>-					*len = o - is-&gt;linebuf;</div><div class='del'>-					*o = 0;</div><div class='del'>-</div><div class='del'>-					dd(printf("NNTP_STREAM_LINE(%d): '%s'\n", *len, *data));</div><div class='del'>-</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			} else if (c != '\r') {</div><div class='del'>-				*o++ = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* limit this for bad server data? */</div><div class='del'>-		oldlen = o - is-&gt;linebuf;</div><div class='del'>-		newlen = (is-&gt;lineend - is-&gt;linebuf) * 3 / 2;</div><div class='del'>-		is-&gt;lineptr = is-&gt;linebuf = g_realloc(is-&gt;linebuf, newlen);</div><div class='del'>-		is-&gt;lineend = is-&gt;linebuf + newlen;</div><div class='del'>-		oe = is-&gt;lineend - 1;</div><div class='del'>-		o = is-&gt;linebuf + oldlen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on error, 0 if last lot of data, &gt;0 if more remaining */</div><div class='del'>-int camel_nntp_stream_gets(CamelNNTPStream *is, unsigned char **start, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	int max;</div><div class='del'>-	unsigned char *end;</div><div class='del'>-</div><div class='del'>-	*len = 0;</div><div class='del'>-</div><div class='del'>-	max = is-&gt;end - is-&gt;ptr;</div><div class='del'>-	if (max == 0) {</div><div class='del'>-		max = stream_fill(is);</div><div class='del'>-		if (max &lt;= 0)</div><div class='del'>-			return max;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*start = is-&gt;ptr;</div><div class='del'>-	end = memchr(is-&gt;ptr, '\n', max);</div><div class='del'>-	if (end)</div><div class='del'>-		max = (end - is-&gt;ptr) + 1;</div><div class='del'>-	*start = is-&gt;ptr;</div><div class='del'>-	*len = max;</div><div class='del'>-	is-&gt;ptr += max;</div><div class='del'>-</div><div class='del'>-	dd(printf("NNTP_STREAM_GETS(%s,%d): '%.*s'\n", end==NULL?"more":"last", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-	return end == NULL?1:0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_nntp_stream_set_mode(CamelNNTPStream *is, camel_nntp_stream_mode_t mode)</div><div class='del'>-{</div><div class='del'>-	is-&gt;mode = mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on erorr, 0 if last data, &gt;0 if more data left */</div><div class='del'>-int camel_nntp_stream_getd(CamelNNTPStream *is, unsigned char **start, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *p, *e, *s;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	*len = 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_NNTP_STREAM_EOD)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_NNTP_STREAM_LINE) {</div><div class='del'>-		g_warning("nntp_stream reading data in line mode\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state = is-&gt;state;</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	while (e - p &lt; 3) {</div><div class='del'>-		is-&gt;ptr = p;</div><div class='del'>-		if (stream_fill(is) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		p = is-&gt;ptr;</div><div class='del'>-		e = is-&gt;end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = p;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		switch(state) {</div><div class='del'>-		case 0:</div><div class='del'>-			/* check leading '.', ... */</div><div class='del'>-			if (p[0] == '.') {</div><div class='del'>-				if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-					is-&gt;ptr = p+3;</div><div class='del'>-					*len = p-s;</div><div class='del'>-					*start = s;</div><div class='del'>-					is-&gt;mode = CAMEL_NNTP_STREAM_EOD;</div><div class='del'>-					is-&gt;state = 0;</div><div class='del'>-</div><div class='del'>-					dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "last", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* If at start, just skip '.', else return data upto '.' but skip it */</div><div class='del'>-				if (p == s) {</div><div class='del'>-					s++;</div><div class='del'>-					p++;</div><div class='del'>-				} else {</div><div class='del'>-					is-&gt;ptr = p+1;</div><div class='del'>-					*len = p-s;</div><div class='del'>-					*start = s;</div><div class='del'>-					is-&gt;state = 1;</div><div class='del'>-</div><div class='del'>-					dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			state = 1;</div><div class='del'>-		case 1:</div><div class='del'>-			/* Scan for sentinal */</div><div class='del'>-			while ((*p++)!='\n')</div><div class='del'>-				;</div><div class='del'>-</div><div class='del'>-			if (p &gt; e) {</div><div class='del'>-				p = e;</div><div class='del'>-			} else {</div><div class='del'>-				state = 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while ((e-p) &gt;= 3);</div><div class='del'>-</div><div class='del'>-	is-&gt;state = state;</div><div class='del'>-	is-&gt;ptr = p;</div><div class='del'>-	*len = p-s;</div><div class='del'>-	*start = s;</div><div class='del'>-</div><div class='del'>-	dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h<br/>deleted file mode 100644<br/>index eef217cef2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_NNTP_STREAM_H</div><div class='del'>-#define _CAMEL_NNTP_STREAM_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_STREAM(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_stream_get_type (), CamelNNTPStream)</div><div class='del'>-#define CAMEL_NNTP_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_stream_get_type (), CamelNNTPStreamClass)</div><div class='del'>-#define CAMEL_IS_NNTP_STREAM(obj)      CAMEL_CHECK_TYPE (obj, camel_nntp_stream_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNNTPStreamClass CamelNNTPStreamClass;</div><div class='del'>-typedef struct _CamelNNTPStream CamelNNTPStream;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_NNTP_STREAM_LINE,</div><div class='del'>-	CAMEL_NNTP_STREAM_DATA,</div><div class='del'>-	CAMEL_NNTP_STREAM_EOD,	/* end of data, acts as if end of stream */</div><div class='del'>-} camel_nntp_stream_mode_t;</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPStream {</div><div class='del'>-	CamelStream parent;</div><div class='del'>-</div><div class='del'>-	CamelStream *source;</div><div class='del'>-</div><div class='del'>-	camel_nntp_stream_mode_t mode;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	unsigned char *buf, *ptr, *end;</div><div class='del'>-	unsigned char *linebuf, *lineptr, *lineend;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPStreamClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		 camel_nntp_stream_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelStream     *camel_nntp_stream_new		(CamelStream *source);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void		 camel_nntp_stream_set_mode     (CamelNNTPStream *is, camel_nntp_stream_mode_t mode);</div><div class='del'>-</div><div class='del'>-int              camel_nntp_stream_line		(CamelNNTPStream *is, unsigned char **data, unsigned int *len);</div><div class='del'>-int 		 camel_nntp_stream_gets		(CamelNNTPStream *is, unsigned char **start, unsigned int *len);</div><div class='del'>-int 		 camel_nntp_stream_getd		(CamelNNTPStream *is, unsigned char **start, unsigned int *len);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_NNTP_STREAM_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c<br/>deleted file mode 100644<br/>index 9f6ff5f095..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,581 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/uio.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-file-utils.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-stream-null.h"</div><div class='del'>-#include "camel/camel-operation.h"</div><div class='del'>-#include "camel/camel-data-cache.h"</div><div class='del'>-</div><div class='del'>-#include "camel-nntp-summary.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-stream.h"</div><div class='del'>-</div><div class='del'>-#define w(x)</div><div class='del'>-#define io(x)</div><div class='del'>-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_SUMMARY_VERSION (0x200)</div><div class='del'>-</div><div class='del'>-static int xover_setup(CamelNNTPSummary *cns, CamelException *ex);</div><div class='del'>-static int add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex);</div><div class='del'>-static int add_range_head(CamelNNTPSummary *cns, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex);</div><div class='del'>-</div><div class='del'>-enum _xover_t {</div><div class='del'>-	XOVER_STRING = 0,</div><div class='del'>-	XOVER_MSGID,</div><div class='del'>-	XOVER_SIZE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _xover_header {</div><div class='del'>-	struct _xover_header *next;</div><div class='del'>-</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int skip:8;</div><div class='del'>-	enum _xover_t type:8;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPSummaryPrivate {</div><div class='del'>-	char *uid;</div><div class='del'>-</div><div class='del'>-	struct _xover_header *xover; /* xoverview format */</div><div class='del'>-	int xover_setup;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelNNTPSummary *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-static int summary_header_load(CamelFolderSummary *, FILE *);</div><div class='del'>-static int summary_header_save(CamelFolderSummary *, FILE *);</div><div class='del'>-</div><div class='del'>-static void camel_nntp_summary_class_init (CamelNNTPSummaryClass *klass);</div><div class='del'>-static void camel_nntp_summary_init       (CamelNNTPSummary *obj);</div><div class='del'>-static void camel_nntp_summary_finalise   (CamelObject *obj);</div><div class='del'>-static CamelFolderSummaryClass *camel_nntp_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_summary_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_folder_summary_get_type(), "CamelNNTPSummary",</div><div class='del'>-					   sizeof (CamelNNTPSummary),</div><div class='del'>-					   sizeof (CamelNNTPSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_nntp_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_nntp_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_nntp_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_summary_class_init(CamelNNTPSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_nntp_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	sklass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	sklass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	sklass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_summary_init(CamelNNTPSummary *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelNNTPSummaryPrivate *p;</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_NNTP_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(obj);</div><div class='del'>-	struct _xover_header *xover, *xn;</div><div class='del'>-</div><div class='del'>-	xover = cns-&gt;priv-&gt;xover;</div><div class='del'>-	while (xover) {</div><div class='del'>-		xn = xover-&gt;next;</div><div class='del'>-		g_free(xover);</div><div class='del'>-		xover = xn;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(cns-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelNNTPSummary *</div><div class='del'>-camel_nntp_summary_new(CamelNNTPFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPSummary *cns = (CamelNNTPSummary *)camel_object_new(camel_nntp_summary_get_type());</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	cns-&gt;folder = folder;</div><div class='del'>-	path = g_strdup_printf("%s.ev-summary", folder-&gt;storage_path);</div><div class='del'>-	camel_folder_summary_set_filename((CamelFolderSummary *)cns, path);</div><div class='del'>-	g_free(path);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_build_content((CamelFolderSummary *)cns, FALSE);</div><div class='del'>-</div><div class='del'>-	return cns;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelNNTPSummary *cns = (CamelNNTPSummary *)s;</div><div class='del'>-</div><div class='del'>-	/* error to call without this setup */</div><div class='del'>-	if (cns-&gt;priv-&gt;uid == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* we shouldn't be here if we already have this uid */</div><div class='del'>-	g_assert(camel_folder_summary_uid(s, cns-&gt;priv-&gt;uid) == NULL);</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_nntp_summary_parent)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		camel_message_info_set_uid(mi, cns-&gt;priv-&gt;uid);</div><div class='del'>-		cns-&gt;priv-&gt;uid = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_nntp_summary_parent)-&gt;summary_header_load(s, in) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;cns-&gt;high) == -1</div><div class='del'>-	    || camel_file_util_decode_fixed_int32(in, &amp;cns-&gt;low) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int summary_header_save(CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_nntp_summary_parent)-&gt;summary_header_save(s, out) == -1</div><div class='del'>-	    || camel_file_util_encode_fixed_int32(out, cns-&gt;high) == -1</div><div class='del'>-	    || camel_file_util_encode_fixed_int32(out, cns-&gt;low) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Assumes we have the stream */</div><div class='del'>-int camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolderSummary *s;</div><div class='del'>-	int ret, i;</div><div class='del'>-	char *line;</div><div class='del'>-	unsigned int n, f, l;</div><div class='del'>-	int count;</div><div class='del'>-</div><div class='del'>-	if (xover_setup(cns, ex) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)cns-&gt;folder;</div><div class='del'>-	store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	s = (CamelFolderSummary *)cns;</div><div class='del'>-</div><div class='del'>-	ret = camel_nntp_command(store, &amp;line, "group %s", folder-&gt;full_name);</div><div class='del'>-	if (ret == 411) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				     _("No such folder: %s"), line);</div><div class='del'>-		return -1;</div><div class='del'>-	} else if (ret != 211) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     _("Could not get group: %s"), line);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	line +=3;</div><div class='del'>-	n = strtoul(line, &amp;line, 10);</div><div class='del'>-	f = strtoul(line, &amp;line, 10);</div><div class='del'>-	l = strtoul(line, &amp;line, 10);</div><div class='del'>-</div><div class='del'>-	dd(printf("nntp_summary: got last '%u' first '%u'\n"</div><div class='del'>-		  "nntp_summary: high '%u' low '%u'\n", l, f, cns-&gt;high, cns-&gt;low));</div><div class='del'>-</div><div class='del'>-	if (cns-&gt;low == f &amp;&amp; cns-&gt;high == l) {</div><div class='del'>-		dd(printf("nntp_summary: no work to do!\n"));</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Need to work out what to do with our messages */</div><div class='del'>-</div><div class='del'>-	/* Check for messages no longer on the server */</div><div class='del'>-	if (cns-&gt;low != f) {</div><div class='del'>-		count = camel_folder_summary_count(s);</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-			if (mi) {</div><div class='del'>-				const char *uid = camel_message_info_uid(mi);</div><div class='del'>-				const char *msgid;</div><div class='del'>-</div><div class='del'>-				n = strtoul(uid, NULL, 10);</div><div class='del'>-				if (n &lt; f || n &gt; l) {</div><div class='del'>-					dd(printf("nntp_summary: %u is lower/higher than lowest/highest article, removed\n", n));</div><div class='del'>-					/* Since we use a global cache this could prematurely remove</div><div class='del'>-					   a cached message that might be in another folder - not that important as</div><div class='del'>-					   it is a true cache */</div><div class='del'>-					msgid = strchr(uid, ',');</div><div class='del'>-					if (msgid)</div><div class='del'>-						camel_data_cache_remove(store-&gt;cache, "cache", msgid+1, NULL);</div><div class='del'>-					camel_folder_change_info_remove_uid(changes, uid);</div><div class='del'>-					camel_folder_summary_remove(s, mi);</div><div class='del'>-					count--;</div><div class='del'>-					i--;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				camel_folder_summary_info_free(s, mi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		cns-&gt;low = f;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cns-&gt;high &lt; l) {</div><div class='del'>-		if (cns-&gt;high &lt; f)</div><div class='del'>-			cns-&gt;high = f-1;</div><div class='del'>-</div><div class='del'>-		if (cns-&gt;priv-&gt;xover) {</div><div class='del'>-			ret = add_range_xover(cns, l, cns-&gt;high+1, changes, ex);</div><div class='del'>-		} else {</div><div class='del'>-			ret = add_range_head(cns, l, cns-&gt;high+1, changes, ex);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_touch(s);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	int type;</div><div class='del'>-} headers[] = {</div><div class='del'>-	{ "subject", 0 },</div><div class='del'>-	{ "from", 0 },</div><div class='del'>-	{ "date", 0 },</div><div class='del'>-	{ "message-id", 1 },</div><div class='del'>-	{ "references", 0 },</div><div class='del'>-	{ "bytes", 2 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xover_setup(CamelNNTPSummary *cns, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolderSummary *s;</div><div class='del'>-	int ret, i;</div><div class='del'>-	char *line;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned char c, *p;</div><div class='del'>-	struct _xover_header *xover, *last;</div><div class='del'>-</div><div class='del'>-	if (cns-&gt;priv-&gt;xover_setup)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* manual override */</div><div class='del'>-	if (getenv("CAMEL_NNTP_DISABLE_XOVER") != NULL) {</div><div class='del'>-		cns-&gt;priv-&gt;xover_setup = TRUE;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)cns-&gt;folder;</div><div class='del'>-	store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	s = (CamelFolderSummary *)cns;</div><div class='del'>-</div><div class='del'>-	ret = camel_nntp_command(store, &amp;line, "list overview.fmt");</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("NNTP Command failed: %s"), strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cns-&gt;priv-&gt;xover_setup = TRUE;</div><div class='del'>-</div><div class='del'>-	/* unsupported command? */</div><div class='del'>-	if (ret != 215)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	last = (struct _xover_header *)&amp;cns-&gt;priv-&gt;xover;</div><div class='del'>-</div><div class='del'>-	/* supported command */</div><div class='del'>-	while ((ret = camel_nntp_stream_line(store-&gt;stream, (unsigned char **)&amp;line, &amp;len)) &gt; 0) {</div><div class='del'>-		p = line;</div><div class='del'>-		xover = g_malloc0(sizeof(*xover));</div><div class='del'>-		last-&gt;next = xover;</div><div class='del'>-		last = xover;</div><div class='del'>-		while ((c = *p++)) {</div><div class='del'>-			if (c == ':') {</div><div class='del'>-				p[-1] = 0;</div><div class='del'>-				for (i=0;i&lt;sizeof(headers)/sizeof(headers[0]);i++) {</div><div class='del'>-					if (strcmp(line, headers[i].name) == 0) {</div><div class='del'>-						xover-&gt;name = headers[i].name;</div><div class='del'>-						if (strncmp(p, "full", 4) == 0)</div><div class='del'>-							xover-&gt;skip = strlen(xover-&gt;name)+1;</div><div class='del'>-						else</div><div class='del'>-							xover-&gt;skip = 0;</div><div class='del'>-						xover-&gt;type = headers[i].type;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				p[-1] = tolower(c);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolderSummary *s;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	struct _header_raw *headers = NULL;</div><div class='del'>-	char *line, *tab;</div><div class='del'>-	int len, ret;</div><div class='del'>-	unsigned int n, count, total, size;</div><div class='del'>-	struct _xover_header *xover;</div><div class='del'>-	time_t last, now;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)cns-&gt;folder;</div><div class='del'>-	store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	s = (CamelFolderSummary *)cns;</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("%s: Scanning new messages"), ((CamelService *)store)-&gt;url-&gt;host);</div><div class='del'>-</div><div class='del'>-	ret = camel_nntp_command(store, &amp;line, "xover %r", low, high);</div><div class='del'>-	if (ret != 224) {</div><div class='del'>-		camel_operation_end(NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	last = time(0);</div><div class='del'>-	count = 0;</div><div class='del'>-	total = high-low+1;</div><div class='del'>-	while ((ret = camel_nntp_stream_line(store-&gt;stream, (unsigned char **)&amp;line, &amp;len)) &gt; 0) {</div><div class='del'>-		camel_operation_progress(NULL, (count * 100) / total);</div><div class='del'>-		count++;</div><div class='del'>-		n = strtoul(line, &amp;tab, 10);</div><div class='del'>-		if (*tab != '\t')</div><div class='del'>-			continue;</div><div class='del'>-		tab++;</div><div class='del'>-		xover = cns-&gt;priv-&gt;xover;</div><div class='del'>-		size = 0;</div><div class='del'>-		for (;tab[0] &amp;&amp; xover;xover = xover-&gt;next) {</div><div class='del'>-			line = tab;</div><div class='del'>-			tab = strchr(line, '\t');</div><div class='del'>-			if (tab)</div><div class='del'>-				*tab++ = 0;</div><div class='del'>-			else</div><div class='del'>-				tab = line+strlen(line);</div><div class='del'>-</div><div class='del'>-			/* do we care about this column? */</div><div class='del'>-			if (xover-&gt;name) {</div><div class='del'>-				line += xover-&gt;skip;</div><div class='del'>-				if (line &lt; tab) {</div><div class='del'>-					header_raw_append(&amp;headers, xover-&gt;name, line, -1);</div><div class='del'>-					switch(xover-&gt;type) {</div><div class='del'>-					case XOVER_STRING:</div><div class='del'>-						break;</div><div class='del'>-					case XOVER_MSGID:</div><div class='del'>-						cns-&gt;priv-&gt;uid = g_strdup_printf("%u,%s", n, line);</div><div class='del'>-						break;</div><div class='del'>-					case XOVER_SIZE:</div><div class='del'>-						size = strtoul(line, NULL, 10);</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* truncated line? ignore? */</div><div class='del'>-		if (xover == NULL) {</div><div class='del'>-			mi = camel_folder_summary_uid(s, cns-&gt;priv-&gt;uid);</div><div class='del'>-			if (mi == NULL) {</div><div class='del'>-				mi = camel_folder_summary_add_from_header(s, headers);</div><div class='del'>-				if (mi) {</div><div class='del'>-					mi-&gt;size = size;</div><div class='del'>-					cns-&gt;high = n;</div><div class='del'>-					camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi));</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				camel_folder_summary_info_free(s, mi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (cns-&gt;priv-&gt;uid) {</div><div class='del'>-			g_free(cns-&gt;priv-&gt;uid);</div><div class='del'>-			cns-&gt;priv-&gt;uid = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		header_raw_clear(&amp;headers);</div><div class='del'>-</div><div class='del'>-		now = time(0);</div><div class='del'>-		if (last + 2 &lt; now) {</div><div class='del'>-			camel_object_trigger_event((CamelObject *)folder, "folder_changed", changes);</div><div class='del'>-			camel_folder_change_info_clear(changes);</div><div class='del'>-			last = now;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-add_range_head(CamelNNTPSummary *cns, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelFolderSummary *s;</div><div class='del'>-	int i, ret = -1;</div><div class='del'>-	char *line, *msgid;</div><div class='del'>-	unsigned int n, count, total;</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	time_t now, last;</div><div class='del'>-</div><div class='del'>-	folder = (CamelFolder *)cns-&gt;folder;</div><div class='del'>-	store = (CamelNNTPStore *)folder-&gt;parent_store;</div><div class='del'>-	s = (CamelFolderSummary *)cns;</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("%s: Scanning new messages"), ((CamelService *)store)-&gt;url-&gt;host);</div><div class='del'>-</div><div class='del'>-	last = time(0);</div><div class='del'>-	count = 0;</div><div class='del'>-	total = high-low+1;</div><div class='del'>-	for (i=low;i&lt;high+1;i++) {</div><div class='del'>-		camel_operation_progress(NULL, (count * 100) / total);</div><div class='del'>-		count++;</div><div class='del'>-		ret = camel_nntp_command(store, &amp;line, "head %u", i);</div><div class='del'>-		/* unknown article, ignore */</div><div class='del'>-		if (ret == 423)</div><div class='del'>-			continue;</div><div class='del'>-		else if (ret == -1)</div><div class='del'>-			goto error;</div><div class='del'>-		else if (ret != 221) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unknown server response: %s"), line);</div><div class='del'>-			goto ioerror;</div><div class='del'>-		}</div><div class='del'>-		line += 3;</div><div class='del'>-		n = strtoul(line, &amp;line, 10);</div><div class='del'>-		if (n != i)</div><div class='del'>-			g_warning("retrieved message '%d' when i expected '%d'?\n", n, i);</div><div class='del'>-</div><div class='del'>-		if ((msgid = strchr(line, '&lt;')) &amp;&amp; (line = strchr(msgid+1, '&gt;'))){</div><div class='del'>-			line[1] = 0;</div><div class='del'>-			cns-&gt;priv-&gt;uid = g_strdup_printf("%u,%s\n", n, msgid);</div><div class='del'>-			mi = camel_folder_summary_uid(s, cns-&gt;priv-&gt;uid);</div><div class='del'>-			if (mi == NULL) {</div><div class='del'>-				if (camel_mime_parser_init_with_stream(mp, (CamelStream *)store-&gt;stream) == -1)</div><div class='del'>-					goto error;</div><div class='del'>-				mi = camel_folder_summary_add_from_parser(s, mp);</div><div class='del'>-				while (camel_mime_parser_step(mp, NULL, NULL) != HSCAN_EOF)</div><div class='del'>-					;</div><div class='del'>-				if (mi == NULL) {</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				cns-&gt;high = i;</div><div class='del'>-				camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi));</div><div class='del'>-			} else {</div><div class='del'>-				/* already have, ignore */</div><div class='del'>-				camel_folder_summary_info_free(s, mi);</div><div class='del'>-			}</div><div class='del'>-			if (cns-&gt;priv-&gt;uid) {</div><div class='del'>-				g_free(cns-&gt;priv-&gt;uid);</div><div class='del'>-				cns-&gt;priv-&gt;uid = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		now = time(0);</div><div class='del'>-		if (last + 2 &lt; now) {</div><div class='del'>-			camel_object_trigger_event((CamelObject *)folder, "folder_changed", changes);</div><div class='del'>-			camel_folder_change_info_clear(changes);</div><div class='del'>-			last = now;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = 0;</div><div class='del'>-error:</div><div class='del'>-</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Use cancel"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Operation failed: %s"), strerror(errno));</div><div class='del'>-	}</div><div class='del'>-ioerror:</div><div class='del'>-</div><div class='del'>-	if (cns-&gt;priv-&gt;uid) {</div><div class='del'>-		g_free(cns-&gt;priv-&gt;uid);</div><div class='del'>-		cns-&gt;priv-&gt;uid = NULL;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h<br/>deleted file mode 100644<br/>index 82070cdc31..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_NNTP_SUMMARY_H</div><div class='del'>-#define _CAMEL_NNTP_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary)</div><div class='del'>-#define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass)</div><div class='del'>-#define CAMEL_IS_LOCAL_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_nntp_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNNTPSummary      CamelNNTPSummary;</div><div class='del'>-typedef struct _CamelNNTPSummaryClass CamelNNTPSummaryClass;</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelNNTPSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	struct _CamelNNTPFolder *folder;</div><div class='del'>-</div><div class='del'>-	guint32 high, low;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNNTPSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	camel_nntp_summary_get_type	(void);</div><div class='del'>-CamelNNTPSummary *camel_nntp_summary_new(struct _CamelNNTPFolder *folder);</div><div class='del'>-</div><div class='del'>-int camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* load/check the summary */</div><div class='del'>-int camel_nntp_summary_load(CamelNNTPSummary *cls, CamelException *ex);</div><div class='del'>-/* check for new/removed messages */</div><div class='del'>-int camel_nntp_summary_check(CamelNNTPSummary *cls, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* perform a folder sync or expunge, if needed */</div><div class='del'>-int camel_nntp_summary_sync(CamelNNTPSummary *cls, gboolean expunge, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-/* add a new message to the summary */</div><div class='del'>-CamelMessageInfo *camel_nntp_summary_add(CamelNNTPSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *, CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_NNTP_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h<br/>deleted file mode 100644<br/>index a37179c521..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_TYPES_H</div><div class='del'>-#define CAMEL_NNTP_TYPES_H 1</div><div class='del'>-</div><div class='del'>-typedef struct CamelNNTPGroupList CamelNNTPGroupList;</div><div class='del'>-typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry;</div><div class='del'>-typedef struct CamelNNTPOverField CamelNNTPOverField;</div><div class='del'>-typedef struct CamelNNTPStore CamelNNTPStore;</div><div class='del'>-typedef struct CamelNNTPStoreClass CamelNNTPStoreClass;</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_TYPES_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c<br/>deleted file mode 100644<br/>index 5f26d7100f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-utils.c : utilities used by the nntp code. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-folder-summary.h"</div><div class='del'>-#include "camel-nntp-resp-codes.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-utils.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/md5-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,</div><div class='del'>-		  int first_message, int last_message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	char digest[16];</div><div class='del'>-</div><div class='del'>-	status = camel_nntp_command (nntp_store, ex, NULL,</div><div class='del'>-				     "XOVER %d-%d",</div><div class='del'>-				     first_message,</div><div class='del'>-				     last_message);</div><div class='del'>-</div><div class='del'>-	if (status == NNTP_DATA_FOLLOWS) {</div><div class='del'>-		gboolean done = FALSE;</div><div class='del'>-</div><div class='del'>-		while (!done) {</div><div class='del'>-			char *line;</div><div class='del'>-</div><div class='del'>-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (nntp_store), &amp;line, ex) &lt; 0) {</div><div class='del'>-				g_warning ("failed to recv_line while building OVER header list\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (*line == '.') {</div><div class='del'>-				done = TRUE;</div><div class='del'>-				g_print ("done\n");</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				CamelMessageInfo *new_info = camel_folder_summary_info_new(folder-&gt;summary);</div><div class='del'>-				char **split_line = g_strsplit (line, "\t", 7);</div><div class='del'>-				char *subject, *from, *date, *message_id, *bytes;</div><div class='del'>-				char *uid;</div><div class='del'>-</div><div class='del'>-				subject = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_SUBJECT].index];</div><div class='del'>-				from = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_FROM].index];</div><div class='del'>-				date = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_DATE].index];</div><div class='del'>-				message_id = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_MESSAGE_ID].index];</div><div class='del'>-				bytes = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_BYTES].index];</div><div class='del'>-				</div><div class='del'>-				/* if the overview format flagged this</div><div class='del'>-                                   field as "full", skip over the</div><div class='del'>-                                   preceding field name and colon */</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_SUBJECT ].full)</div><div class='del'>-					subject += strlen ("Subject:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_FROM ].full)</div><div class='del'>-					from += strlen ("From:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_DATE ].full)</div><div class='del'>-					date += strlen ("Date:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ].full)</div><div class='del'>-					message_id += strlen ("Message-ID:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_BYTES ].full)</div><div class='del'>-					bytes += strlen ("Bytes:");</div><div class='del'>-</div><div class='del'>-				uid = g_strdup_printf ("%s,%s", split_line[0], message_id);</div><div class='del'>-				camel_message_info_set_subject(new_info, g_strdup(subject));</div><div class='del'>-				camel_message_info_set_from(new_info, g_strdup(from));</div><div class='del'>-				camel_message_info_set_to(new_info, g_strdup(folder-&gt;name));</div><div class='del'>-				camel_message_info_set_uid(new_info, uid);</div><div class='del'>-</div><div class='del'>-				new_info-&gt;date_sent = header_decode_date(date, NULL);</div><div class='del'>-#if 0</div><div class='del'>-				/* XXX do we need to fill in both dates? */</div><div class='del'>-				new_info-&gt;headers.date_received = g_strdup(date);</div><div class='del'>-#endif</div><div class='del'>-				new_info-&gt;size = atoi(bytes);</div><div class='del'>-				md5_get_digest(message_id, strlen(message_id), digest);</div><div class='del'>-				memcpy(new_info-&gt;message_id.id.hash, digest, sizeof(new_info-&gt;message_id.id.hash));</div><div class='del'>-</div><div class='del'>-				if (camel_nntp_newsrc_article_is_read (nntp_store-&gt;newsrc,</div><div class='del'>-								       folder-&gt;name,</div><div class='del'>-								       atoi (split_line[0])))</div><div class='del'>-				    new_info-&gt;flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-</div><div class='del'>-				camel_folder_summary_add (folder-&gt;summary, new_info);</div><div class='del'>-				g_strfreev (split_line);</div><div class='del'>-			}</div><div class='del'>-			g_free (line);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* XXX */</div><div class='del'>-		g_warning ("weird nntp response for XOVER: %d\n", status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static GArray*</div><div class='del'>-get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,</div><div class='del'>-		 int first_message, int last_message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	for (i = first_message; i &lt; last_message; i ++) {</div><div class='del'>-		status = camel_nntp_command (nntp_store, ex, NULL,</div><div class='del'>-					     "HEAD %d", i);</div><div class='del'>-</div><div class='del'>-		if (status == NNTP_HEAD_FOLLOWS) {</div><div class='del'>-			gboolean done = FALSE;</div><div class='del'>-			char *buf;</div><div class='del'>-			int buf_len;</div><div class='del'>-			int buf_alloc;</div><div class='del'>-			int h;</div><div class='del'>-			CamelStream *header_stream;</div><div class='del'>-			GArray *header_array;</div><div class='del'>-			CamelStream *nntp_istream;</div><div class='del'>-			CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);</div><div class='del'>-</div><div class='del'>-			buf_alloc = 2048;</div><div class='del'>-			buf_len = 0;</div><div class='del'>-			buf = g_malloc(buf_alloc);</div><div class='del'>-			done = FALSE;</div><div class='del'>-</div><div class='del'>-			buf[0] = 0;</div><div class='del'>-</div><div class='del'>-			nntp_istream = nntp_store-&gt;istream;</div><div class='del'>-</div><div class='del'>-			while (!done) {</div><div class='del'>-				char *line;</div><div class='del'>-				int line_length;</div><div class='del'>-</div><div class='del'>-				line = camel_stream_buffer_read_line ( </div><div class='del'>-						      CAMEL_STREAM_BUFFER ( nntp_istream ));</div><div class='del'>-				line_length = strlen ( line );</div><div class='del'>-</div><div class='del'>-				if (*line == '.') {</div><div class='del'>-					done = TRUE;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					if (buf_len + line_length &gt; buf_alloc) {</div><div class='del'>-						buf_alloc *= 2;</div><div class='del'>-						buf = g_realloc (buf, buf_alloc);</div><div class='del'>-					}</div><div class='del'>-					strcat(buf, line);</div><div class='del'>-					strcat(buf, "\n");</div><div class='del'>-					buf_len += strlen(line);</div><div class='del'>-					g_free (line);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* create a stream from which to parse the headers */</div><div class='del'>-			header_stream = camel_stream_mem_new_with_buffer(buf,</div><div class='del'>-								 buf_len,</div><div class='del'>-								 CAMEL_STREAM_MEM_READ);</div><div class='del'>-</div><div class='del'>-			header_array = get_header_array_from_stream (header_stream);</div><div class='del'>-</div><div class='del'>-			memset (&amp;info, 0, sizeof(info));</div><div class='del'>-</div><div class='del'>-			for (h = 0; h &lt; header_array-&gt;len; h ++) {</div><div class='del'>-				Rfc822Header *header = &amp;((Rfc822Header*)header_array-&gt;data)[h];</div><div class='del'>-				if (!g_strcasecmp(header-&gt;name, "From"))</div><div class='del'>-					new_info-&gt;from = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "To"))</div><div class='del'>-					new_info-&gt;to = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Subject"))</div><div class='del'>-					new_info-&gt;subject = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Message-ID")) {</div><div class='del'>-					new_info-&gt;uid = g_strdup_printf("%d,%s", i, header-&gt;value);</div><div class='del'>-					new_info-&gt;message_id = g_strdup(header-&gt;value);</div><div class='del'>-				}</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Date")) {</div><div class='del'>-					new_info-&gt;date_sent = header_decode_date (header-&gt;value);</div><div class='del'>-#if 0</div><div class='del'>-					new_info-&gt;date_sent = g_strdup(header-&gt;value);</div><div class='del'>-					new_info-&gt;date_received = g_strdup(header-&gt;value);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_folder_summary_add (nntp_folder-&gt;summary, new_info);</div><div class='del'>-		}</div><div class='del'>-		else if (status == CAMEL_NNTP_FAIL) {</div><div class='del'>-			/* nasty things are afoot */</div><div class='del'>-			g_warning ("failure doing HEAD\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-uid_num (CamelFolderSummary *summary, int index)</div><div class='del'>-{</div><div class='del'>-	char *tmp;</div><div class='del'>-	char *brk;</div><div class='del'>-	CamelMessageInfo *minfo;</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	minfo = camel_folder_summary_index(summary, index);</div><div class='del'>-	if(minfo == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	tmp = g_strdup(camel_message_info_uid(minfo));</div><div class='del'>-	camel_message_info_free(minfo);</div><div class='del'>-	</div><div class='del'>-	if((brk = strchr(tmp, ',')) == NULL)</div><div class='del'>-		ret = 0;</div><div class='del'>-	else {</div><div class='del'>-		*brk = 0;</div><div class='del'>-		ret = atoi(tmp);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free(tmp);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_get_headers (CamelStore *store,</div><div class='del'>-			CamelNNTPFolder *nntp_folder,</div><div class='del'>-			CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (nntp_folder);</div><div class='del'>-	char *ret;</div><div class='del'>-	int first_message, nb_message, last_message, last_summary;</div><div class='del'>-	int status;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	status = camel_nntp_command (nntp_store, ex, &amp;ret,</div><div class='del'>-				     "GROUP %s", folder-&gt;name);</div><div class='del'>-	sscanf (ret, "%d %d %d", &amp;nb_message, &amp;first_message, &amp;last_message);</div><div class='del'>-	g_free (ret);</div><div class='del'>-</div><div class='del'>-	i = camel_folder_summary_count(folder-&gt;summary);</div><div class='del'>-	if(i != 0) {</div><div class='del'>-		last_summary = uid_num(folder-&gt;summary, i-1);</div><div class='del'>-</div><div class='del'>-		if(last_summary &lt; first_message)</div><div class='del'>-			camel_folder_summary_clear(folder-&gt;summary);</div><div class='del'>-		else {</div><div class='del'>-			while(uid_num(folder-&gt;summary, 0) &lt; first_message) </div><div class='del'>-				camel_folder_summary_remove_index(folder-&gt;summary, 0);</div><div class='del'>-			</div><div class='del'>-			if(last_summary &gt;= last_message)</div><div class='del'>-				return;</div><div class='del'>-			</div><div class='del'>-			first_message = last_summary;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-			</div><div class='del'>-	if (status == NNTP_NO_SUCH_GROUP) {</div><div class='del'>-		/* XXX throw invalid group exception */</div><div class='del'>-		camel_exception_setv (ex, </div><div class='del'>-				      CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				      "group %s not found on server",</div><div class='del'>-				      folder-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (nntp_store-&gt;extensions &amp; CAMEL_NNTP_EXT_OVER) {</div><div class='del'>-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("need to fix get_HEAD_headers\n");</div><div class='del'>-#if 0</div><div class='del'>-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-#endif</div><div class='del'>-	}		</div><div class='del'>-</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h<br/>deleted file mode 100644<br/>index 48fd7490c9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/camel-nntp-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-utils.h : Utilities for the NNTP provider */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : Chris Toshok &lt;toshok@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian .</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_NNTP_UTILS_H</div><div class='del'>-#define CAMEL_NNTP_UTILS_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-void camel_nntp_get_headers (CamelStore *store, CamelNNTPFolder *nntp_folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_UTILS_H */</div><div class='head'>diff --git a/camel/providers/nntp/libcamelnntp.urls b/camel/providers/nntp/libcamelnntp.urls<br/>deleted file mode 100644<br/>index dee2e70f14..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/libcamelnntp.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/libcamelnntp.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-news</div><div class='del'>-nntp</div><div class='head'>diff --git a/camel/providers/nntp/test-newsrc.c b/camel/providers/nntp/test-newsrc.c<br/>deleted file mode 100644<br/>index c4b985e565..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/test-newsrc.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/nntp/test-newsrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "camel-nntp-newsrc.h"</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main(int argc, char *argv[])</div><div class='del'>-{</div><div class='del'>-  CamelNNTPNewsrc *newsrc = camel_nntp_newsrc_read_for_server (argv[1]);</div><div class='del'>-  camel_nntp_newsrc_write_to_file (newsrc, stdout);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/.cvsignore b/camel/providers/pop3/.cvsignore<br/>deleted file mode 100644<br/>index ddf4c8b28d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am<br/>deleted file mode 100644<br/>index 9e94c5c89a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelpop3includedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamelpop3.la</div><div class='del'>-camel_provider_DATA = libcamelpop3.urls</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I..					\</div><div class='del'>-	-I$(srcdir)/..				\</div><div class='del'>-	-I$(srcdir)/../../..			\</div><div class='del'>-        -I$(includedir)				\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-pop3-provider\"</div><div class='del'>-</div><div class='del'>-libcamelpop3_la_SOURCES = 			\</div><div class='del'>-	camel-pop3-engine.c			\</div><div class='del'>-	camel-pop3-folder.c			\</div><div class='del'>-	camel-pop3-provider.c			\</div><div class='del'>-	camel-pop3-stream.c			\</div><div class='del'>-	camel-pop3-store.c</div><div class='del'>-</div><div class='del'>-libcamelpop3include_HEADERS =			\</div><div class='del'>-	camel-pop3-engine.h			\</div><div class='del'>-	camel-pop3-folder.h			\</div><div class='del'>-	camel-pop3-stream.h			\</div><div class='del'>-	camel-pop3-store.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-libcamelpop3_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelpop3.urls</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c<br/>deleted file mode 100644<br/>index a76df8f9bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-engine.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-engine.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,366 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-pop3-engine.h"</div><div class='del'>-#include "camel-pop3-stream.h"</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-sasl.h&gt;</div><div class='del'>-</div><div class='del'>-/* max 'outstanding' bytes in output stream, so we can't deadlock waiting</div><div class='del'>-   for the server to accept our data when pipelining */</div><div class='del'>-#define CAMEL_POP3_SEND_LIMIT (1024)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-static void get_capabilities(CamelPOP3Engine *pe, int read_greeting);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStream */</div><div class='del'>-#define CS_CLASS(so) CAMEL_POP3_ENGINE_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_engine_class_init (CamelPOP3EngineClass *camel_pop3_engine_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_engine_init(CamelPOP3Engine *pe, CamelPOP3EngineClass *peclass)</div><div class='del'>-{</div><div class='del'>-	e_dlist_init(&amp;pe-&gt;active);</div><div class='del'>-	e_dlist_init(&amp;pe-&gt;queue);</div><div class='del'>-	e_dlist_init(&amp;pe-&gt;done);</div><div class='del'>-	pe-&gt;state = CAMEL_POP3_ENGINE_DISCONNECT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_engine_finalise(CamelPOP3Engine *pe)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: Also flush/free any outstanding requests, etc */</div><div class='del'>-</div><div class='del'>-	if (pe-&gt;stream)</div><div class='del'>-		camel_object_unref((CamelObject *)pe-&gt;stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_engine_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_engine_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_pop3_engine_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_pop3_engine_type = camel_type_register(camel_object_get_type(),</div><div class='del'>-							     "CamelPOP3Engine",</div><div class='del'>-							     sizeof( CamelPOP3Engine ),</div><div class='del'>-							     sizeof( CamelPOP3EngineClass ),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_pop3_engine_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_pop3_engine_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) camel_pop3_engine_finalise );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_pop3_engine_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pop3_engine_new:</div><div class='del'>- * @source: source stream</div><div class='del'>- *</div><div class='del'>- * Returns a NULL stream.  A null stream is always at eof, and</div><div class='del'>- * always returns success for all reads and writes.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelPOP3Engine *</div><div class='del'>-camel_pop3_engine_new(CamelStream *source)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Engine *pe;</div><div class='del'>-</div><div class='del'>-	pe = (CamelPOP3Engine *)camel_object_new(camel_pop3_engine_get_type ());</div><div class='del'>-</div><div class='del'>-	pe-&gt;stream = (CamelPOP3Stream *)camel_pop3_stream_new(source);</div><div class='del'>-	pe-&gt;state = CAMEL_POP3_ENGINE_AUTH;</div><div class='del'>-</div><div class='del'>-	get_capabilities(pe, TRUE);</div><div class='del'>-</div><div class='del'>-	return pe;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pop3_engine_reget_capabilities:</div><div class='del'>- * @engine: pop3 engine</div><div class='del'>- *</div><div class='del'>- * Regets server capabilities (needed after a STLS command is issued for example).</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_pop3_engine_reget_capabilities (CamelPOP3Engine *engine)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_POP3_ENGINE (engine));</div><div class='del'>-	</div><div class='del'>-	get_capabilities (engine, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* TODO: read implementation too?</div><div class='del'>-   etc? */</div><div class='del'>-struct {</div><div class='del'>-	char *cap;</div><div class='del'>-	guint32 flag;</div><div class='del'>-} capa[] = {</div><div class='del'>-	{ "APOP" , CAMEL_POP3_CAP_APOP },</div><div class='del'>-	{ "TOP" , CAMEL_POP3_CAP_TOP },</div><div class='del'>-	{ "UIDL", CAMEL_POP3_CAP_UIDL },</div><div class='del'>-	{ "PIPELINING", CAMEL_POP3_CAP_PIPE },</div><div class='del'>-	{ "STLS", CAMEL_POP3_CAP_STLS },  /* STARTTLS */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cmd_capa(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)</div><div class='del'>-{</div><div class='del'>-	unsigned char *line, *tok, *next;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int ret;</div><div class='del'>-	int i;</div><div class='del'>-	CamelServiceAuthType *auth;</div><div class='del'>-</div><div class='del'>-	dd(printf("cmd_capa\n"));</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = camel_pop3_stream_line(stream, &amp;line, &amp;len);</div><div class='del'>-		if (ret &gt;= 0) {</div><div class='del'>-			if (strncmp(line, "SASL ", 5) == 0) {</div><div class='del'>-				tok = line+5;</div><div class='del'>-				dd(printf("scanning tokens '%s'\n", tok));</div><div class='del'>-				while (tok) {</div><div class='del'>-					next = strchr(tok, ' ');</div><div class='del'>-					if (next)</div><div class='del'>-						*next++ = 0;</div><div class='del'>-					auth = camel_sasl_authtype(tok);</div><div class='del'>-					if (auth) {</div><div class='del'>-						dd(printf("got auth type '%s'\n", tok));</div><div class='del'>-						pe-&gt;auth = g_list_prepend(pe-&gt;auth, auth);</div><div class='del'>-					} else {</div><div class='del'>-						dd(printf("unsupported auth type '%s'\n", tok));</div><div class='del'>-					}</div><div class='del'>-					tok = next;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				for (i=0;i&lt;sizeof(capa)/sizeof(capa[0]);i++) {</div><div class='del'>-					if (strcmp(capa[i].cap, line) == 0)</div><div class='del'>-						pe-&gt;capa |= capa[i].flag;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (ret&gt;0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_capabilities(CamelPOP3Engine *pe, int read_greeting)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Command *pc;</div><div class='del'>-	unsigned char *line, *apop, *apopend;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	extern CamelServiceAuthType camel_pop3_password_authtype;</div><div class='del'>-	extern CamelServiceAuthType camel_pop3_apop_authtype;</div><div class='del'>-	</div><div class='del'>-	if (read_greeting) {</div><div class='del'>-		/* first, read the greeting */</div><div class='del'>-		if (camel_pop3_stream_line(pe-&gt;stream, &amp;line, &amp;len) == -1</div><div class='del'>-		    || strncmp(line, "+OK", 3) != 0)</div><div class='del'>-			return;</div><div class='del'>-		</div><div class='del'>-		if ((apop = strchr(line+3, '&lt;'))</div><div class='del'>-		    &amp;&amp; (apopend = strchr(apop, '&gt;'))) {</div><div class='del'>-			apopend[1] = 0;</div><div class='del'>-			pe-&gt;apop = g_strdup(apop);</div><div class='del'>-			pe-&gt;capa = CAMEL_POP3_CAP_APOP;</div><div class='del'>-			pe-&gt;auth = g_list_append(pe-&gt;auth, &amp;camel_pop3_apop_authtype);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pe-&gt;auth = g_list_prepend(pe-&gt;auth, &amp;camel_pop3_password_authtype);</div><div class='del'>-</div><div class='del'>-	pc = camel_pop3_engine_command_new(pe, CAMEL_POP3_COMMAND_MULTI, cmd_capa, NULL, "CAPA\r\n");</div><div class='del'>-	while (camel_pop3_engine_iterate(pe, pc) &gt; 0)</div><div class='del'>-		;</div><div class='del'>-	camel_pop3_engine_command_free(pe, pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns true if the command was sent, false if it was just queued */</div><div class='del'>-static int</div><div class='del'>-engine_command_queue(CamelPOP3Engine *pe, CamelPOP3Command *pc)</div><div class='del'>-{</div><div class='del'>-	if (((pe-&gt;capa &amp; CAMEL_POP3_CAP_PIPE) == 0 || (pe-&gt;sentlen + strlen(pc-&gt;data)) &gt; CAMEL_POP3_SEND_LIMIT)</div><div class='del'>-	    &amp;&amp; pe-&gt;current != NULL) {</div><div class='del'>-		e_dlist_addtail(&amp;pe-&gt;queue, (EDListNode *)pc);</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		/* ??? */</div><div class='del'>-		if (camel_stream_write((CamelStream *)pe-&gt;stream, pc-&gt;data, strlen(pc-&gt;data)) == -1) {</div><div class='del'>-			e_dlist_addtail(&amp;pe-&gt;queue, (EDListNode *)pc);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		pe-&gt;sentlen += strlen(pc-&gt;data);</div><div class='del'>-</div><div class='del'>-		pc-&gt;state = CAMEL_POP3_COMMAND_DISPATCHED;</div><div class='del'>-</div><div class='del'>-		if (pe-&gt;current == NULL)</div><div class='del'>-			pe-&gt;current = pc;</div><div class='del'>-		else</div><div class='del'>-			e_dlist_addtail(&amp;pe-&gt;active, (EDListNode *)pc);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on error (sets errno), 0 when no work to do, or &gt;0 if work remaining */</div><div class='del'>-int</div><div class='del'>-camel_pop3_engine_iterate(CamelPOP3Engine *pe, CamelPOP3Command *pcwait)</div><div class='del'>-{</div><div class='del'>-	unsigned char *p;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	CamelPOP3Command *pc, *pw, *pn;</div><div class='del'>-</div><div class='del'>-	if (pcwait &amp;&amp; pcwait-&gt;state &gt;= CAMEL_POP3_COMMAND_OK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pc = pe-&gt;current;</div><div class='del'>-	if (pc == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	/* LOCK */</div><div class='del'>-</div><div class='del'>-	if (camel_pop3_stream_line(pe-&gt;stream, &amp;pe-&gt;line, &amp;pe-&gt;linelen) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	p = pe-&gt;line;</div><div class='del'>-	switch (p[0]) {</div><div class='del'>-	case '+':</div><div class='del'>-		dd(printf("Got + response\n"));</div><div class='del'>-		if (pc-&gt;flags &amp; CAMEL_POP3_COMMAND_MULTI) {</div><div class='del'>-			pc-&gt;state = CAMEL_POP3_COMMAND_DATA;</div><div class='del'>-			camel_pop3_stream_set_mode(pe-&gt;stream, CAMEL_POP3_STREAM_DATA);</div><div class='del'>-</div><div class='del'>-			if (pc-&gt;func)</div><div class='del'>-				pc-&gt;func(pe, pe-&gt;stream, pc-&gt;func_data);</div><div class='del'>-</div><div class='del'>-			/* Make sure we get all data before going back to command mode */</div><div class='del'>-			while (camel_pop3_stream_getd(pe-&gt;stream, &amp;p, &amp;len) &gt; 0)</div><div class='del'>-				;</div><div class='del'>-			camel_pop3_stream_set_mode(pe-&gt;stream, CAMEL_POP3_STREAM_LINE);</div><div class='del'>-		} else {</div><div class='del'>-			pc-&gt;state = CAMEL_POP3_COMMAND_OK;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case '-':</div><div class='del'>-		pc-&gt;state = CAMEL_POP3_COMMAND_ERR;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* what do we do now?  f'knows! */</div><div class='del'>-		g_warning("Bad server response: %s\n", p);</div><div class='del'>-		errno = EIO;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dlist_addtail(&amp;pe-&gt;done, (EDListNode *)pc);</div><div class='del'>-	pe-&gt;sentlen -= strlen(pc-&gt;data);</div><div class='del'>-</div><div class='del'>-	/* Set next command */</div><div class='del'>-	pe-&gt;current = (CamelPOP3Command *)e_dlist_remhead(&amp;pe-&gt;active);</div><div class='del'>-</div><div class='del'>-	/* check the queue for sending any we can now send also */</div><div class='del'>-	pw = (CamelPOP3Command *)pe-&gt;queue.head;</div><div class='del'>-	pn = pw-&gt;next;</div><div class='del'>-	while (pn) {</div><div class='del'>-		if (((pe-&gt;capa &amp; CAMEL_POP3_CAP_PIPE) == 0 || (pe-&gt;sentlen + strlen(pw-&gt;data)) &gt; CAMEL_POP3_SEND_LIMIT)</div><div class='del'>-		    &amp;&amp; pe-&gt;current != NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (camel_stream_write((CamelStream *)pe-&gt;stream, pw-&gt;data, strlen(pw-&gt;data)) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-		e_dlist_remove((EDListNode *)pw);</div><div class='del'>-</div><div class='del'>-		pe-&gt;sentlen += strlen(pw-&gt;data);</div><div class='del'>-		pw-&gt;state = CAMEL_POP3_COMMAND_DISPATCHED;</div><div class='del'>-</div><div class='del'>-		if (pe-&gt;current == NULL)</div><div class='del'>-			pe-&gt;current = pw;</div><div class='del'>-		else</div><div class='del'>-			e_dlist_addtail(&amp;pe-&gt;active, (EDListNode *)pw);</div><div class='del'>-</div><div class='del'>-		pw = pn;</div><div class='del'>-		pn = pn-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* UNLOCK */</div><div class='del'>-</div><div class='del'>-	if (pcwait &amp;&amp; pcwait-&gt;state &gt;= CAMEL_POP3_COMMAND_OK)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return pe-&gt;current==NULL?0:1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelPOP3Command *</div><div class='del'>-camel_pop3_engine_command_new(CamelPOP3Engine *pe, guint32 flags, CamelPOP3CommandFunc func, void *data, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Command *pc;</div><div class='del'>-	va_list ap;</div><div class='del'>-</div><div class='del'>-	pc = g_malloc0(sizeof(*pc));</div><div class='del'>-	pc-&gt;func = func;</div><div class='del'>-	pc-&gt;func_data = data;</div><div class='del'>-	pc-&gt;flags = flags;</div><div class='del'>-	</div><div class='del'>-	va_start(ap, fmt);</div><div class='del'>-	pc-&gt;data = g_strdup_vprintf(fmt, ap);</div><div class='del'>-	pc-&gt;state = CAMEL_POP3_COMMAND_IDLE;</div><div class='del'>-</div><div class='del'>-	/* TODO: what abou write errors? */</div><div class='del'>-	engine_command_queue(pe, pc);</div><div class='del'>-</div><div class='del'>-	return pc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_pop3_engine_command_free(CamelPOP3Engine *pe, CamelPOP3Command *pc)</div><div class='del'>-{</div><div class='del'>-	if (pe-&gt;current != pc)</div><div class='del'>-		e_dlist_remove((EDListNode *)pc);</div><div class='del'>-	g_free(pc-&gt;data);</div><div class='del'>-	g_free(pc);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h<br/>deleted file mode 100644<br/>index caf6ca1d2a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-engine.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-engine.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,127 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_POP3_ENGINE_H</div><div class='del'>-#define _CAMEL_POP3_ENGINE_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-object.h&gt;</div><div class='del'>-#include "e-util/e-msgport.h"</div><div class='del'>-#include "camel-pop3-stream.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_ENGINE(obj)         CAMEL_CHECK_CAST (obj, camel_pop3_engine_get_type (), CamelPOP3Engine)</div><div class='del'>-#define CAMEL_POP3_ENGINE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_pop3_engine_get_type (), CamelPOP3EngineClass)</div><div class='del'>-#define CAMEL_IS_POP3_ENGINE(obj)      CAMEL_CHECK_TYPE (obj, camel_pop3_engine_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPOP3EngineClass CamelPOP3EngineClass;</div><div class='del'>-typedef struct _CamelPOP3Engine CamelPOP3Engine;</div><div class='del'>-typedef struct _CamelPOP3Command CamelPOP3Command;</div><div class='del'>-</div><div class='del'>-/* pop 3 connection states, actually since we're given a connected socket, we always start in auth state */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_POP3_ENGINE_DISCONNECT = 0,</div><div class='del'>-	CAMEL_POP3_ENGINE_AUTH,</div><div class='del'>-	CAMEL_POP3_ENGINE_TRANSACTION,</div><div class='del'>-	CAMEL_POP3_ENGINE_UPDATE,</div><div class='del'>-} camel_pop3_engine_t;</div><div class='del'>-</div><div class='del'>-/* state of a command */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_POP3_COMMAND_IDLE = 0, /* command created or queued, not yet sent (e.g. non pipelined server) */</div><div class='del'>-	CAMEL_POP3_COMMAND_DISPATCHED, /* command sent to server */</div><div class='del'>-</div><div class='del'>-	/* completion codes */</div><div class='del'>-	CAMEL_POP3_COMMAND_OK,	/* plain ok response */</div><div class='del'>-	CAMEL_POP3_COMMAND_DATA, /* processing command response */</div><div class='del'>-	CAMEL_POP3_COMMAND_ERR,	/* error response */</div><div class='del'>-} camel_pop3_command_t;</div><div class='del'>-</div><div class='del'>-/* flags for command types */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_POP3_COMMAND_SIMPLE = 0, /* dont expect multiline response */</div><div class='del'>-	CAMEL_POP3_COMMAND_MULTI = 1, /* expect multiline response */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* flags for server options */</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_POP3_CAP_APOP = 1&lt;&lt;0,</div><div class='del'>-	CAMEL_POP3_CAP_UIDL = 1&lt;&lt;1,</div><div class='del'>-	CAMEL_POP3_CAP_SASL = 1&lt;&lt;2,</div><div class='del'>-	CAMEL_POP3_CAP_TOP  = 1&lt;&lt;3,</div><div class='del'>-	CAMEL_POP3_CAP_PIPE = 1&lt;&lt;4,</div><div class='del'>-	CAMEL_POP3_CAP_STLS = 1&lt;&lt;5</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*CamelPOP3CommandFunc)(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data);</div><div class='del'>-</div><div class='del'>-struct _CamelPOP3Command {</div><div class='del'>-	struct _CamelPOP3Command *next;</div><div class='del'>-	struct _CamelPOP3Command *prev;</div><div class='del'>-</div><div class='del'>-	guint32 flags;</div><div class='del'>-	camel_pop3_command_t state;</div><div class='del'>-</div><div class='del'>-	CamelPOP3CommandFunc func;</div><div class='del'>-	void *func_data;</div><div class='del'>-</div><div class='del'>-	int data_size;</div><div class='del'>-	char *data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPOP3Engine {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	camel_pop3_engine_t state;</div><div class='del'>-</div><div class='del'>-	GList *auth;		/* authtypes supported */</div><div class='del'>-</div><div class='del'>-	guint32 capa;		/* capabilities */</div><div class='del'>-	char *apop;		/* apop time string */</div><div class='del'>-</div><div class='del'>-	unsigned char *line;	/* current line buffer */</div><div class='del'>-	unsigned int linelen;</div><div class='del'>-</div><div class='del'>-	struct _CamelPOP3Stream *stream;</div><div class='del'>-</div><div class='del'>-	unsigned int sentlen;	/* data sent (so we dont overflow network buffer) */</div><div class='del'>-</div><div class='del'>-	EDList active;		/* active commands */</div><div class='del'>-	EDList queue;		/* queue of waiting commands */</div><div class='del'>-	EDList done;		/* list of done commands, awaiting free */</div><div class='del'>-</div><div class='del'>-	CamelPOP3Command *current; /* currently busy (downloading) response */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPOP3EngineClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		  camel_pop3_engine_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelPOP3Engine  *camel_pop3_engine_new		(CamelStream *source);</div><div class='del'>-</div><div class='del'>-void              camel_pop3_engine_reget_capabilities (CamelPOP3Engine *engine);</div><div class='del'>-</div><div class='del'>-void              camel_pop3_engine_command_free(CamelPOP3Engine *pe, CamelPOP3Command *pc);</div><div class='del'>-</div><div class='del'>-int 		  camel_pop3_engine_iterate	(CamelPOP3Engine *pe, CamelPOP3Command *pc);</div><div class='del'>-</div><div class='del'>-CamelPOP3Command *camel_pop3_engine_command_new	(CamelPOP3Engine *pe, guint32 flags, CamelPOP3CommandFunc func, void *data, const char *fmt, ...);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_POP3_ENGINE_H */</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c<br/>deleted file mode 100644<br/>index f15b20dcb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,569 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-pop3-folder.c : class for a pop3 folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-pop3-folder.h"</div><div class='del'>-#include "camel-pop3-store.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-data-cache.h"</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/md5-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-static CamelFolderClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void pop3_finalize (CamelObject *object);</div><div class='del'>-static void pop3_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static gint pop3_get_message_count (CamelFolder *folder);</div><div class='del'>-static GPtrArray *pop3_get_uids (CamelFolder *folder);</div><div class='del'>-static CamelMimeMessage *pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex);</div><div class='del'>-static void pop3_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_folder_class_init (CamelPOP3FolderClass *camel_pop3_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class =</div><div class='del'>-		CAMEL_FOLDER_CLASS (camel_pop3_folder_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;refresh_info = pop3_refresh_info;</div><div class='del'>-	camel_folder_class-&gt;sync = pop3_sync;</div><div class='del'>-	</div><div class='del'>-	camel_folder_class-&gt;get_message_count = pop3_get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_uids = pop3_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = camel_folder_free_shallow;</div><div class='del'>-	</div><div class='del'>-	camel_folder_class-&gt;get_message = pop3_get_message;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = pop3_set_message_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (!camel_pop3_folder_type) {</div><div class='del'>-		camel_pop3_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelPOP3Folder",</div><div class='del'>-							      sizeof (CamelPOP3Folder),</div><div class='del'>-							      sizeof (CamelPOP3FolderClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_pop3_folder_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectFinalizeFunc) pop3_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_pop3_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pop3_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);</div><div class='del'>-	CamelPOP3FolderInfo **fi = (CamelPOP3FolderInfo **)pop3_folder-&gt;uids-&gt;pdata;</div><div class='del'>-	CamelPOP3Store *pop3_store = (CamelPOP3Store *)((CamelFolder *)pop3_folder)-&gt;parent_store;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;pop3_folder-&gt;uids-&gt;len;i++,fi++) {</div><div class='del'>-		if (fi[0]-&gt;cmd) {</div><div class='del'>-			while (camel_pop3_engine_iterate(pop3_store-&gt;engine, fi[0]-&gt;cmd) &gt; 0)</div><div class='del'>-				;</div><div class='del'>-			camel_pop3_engine_command_free(pop3_store-&gt;engine, fi[0]-&gt;cmd);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free(fi[0]-&gt;uid);</div><div class='del'>-		g_free(fi[0]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(pop3_folder-&gt;uids, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_pop3_folder_new (CamelStore *parent, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	d(printf("opening pop3 INBOX folder\n"));</div><div class='del'>-	</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_POP3_FOLDER_TYPE));</div><div class='del'>-	camel_folder_construct (folder, parent, "inbox", "inbox");</div><div class='del'>-	</div><div class='del'>-	/* mt-ok, since we dont have the folder-lock for new() */</div><div class='del'>-	camel_folder_refresh_info (folder, ex);/* mt-ok */</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		folder = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelPOP3FolderInfo *</div><div class='del'>-id_to_fi(CamelPOP3Folder *folder, guint32 id)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelPOP3FolderInfo **fi = (CamelPOP3FolderInfo **)folder-&gt;uids-&gt;pdata;</div><div class='del'>-	int len = folder-&gt;uids-&gt;len;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;len;i++, fi++)</div><div class='del'>-		if (fi[0]-&gt;id == id)</div><div class='del'>-			return fi[0];</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelPOP3FolderInfo *</div><div class='del'>-uid_to_fi(CamelPOP3Folder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelPOP3FolderInfo **fi = (CamelPOP3FolderInfo **)folder-&gt;uids-&gt;pdata;</div><div class='del'>-	int len = folder-&gt;uids-&gt;len;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;len;i++,fi++)</div><div class='del'>-		if (fi[0]-&gt;uid &amp;&amp; strcmp(fi[0]-&gt;uid, uid) == 0)</div><div class='del'>-			return fi[0];</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-fi_to_index(CamelPOP3Folder *folder, CamelPOP3FolderInfo *fin)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelPOP3FolderInfo **fi = (CamelPOP3FolderInfo **)folder-&gt;uids-&gt;pdata;</div><div class='del'>-	int len = folder-&gt;uids-&gt;len;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;len;i++,fi++)</div><div class='del'>-		if (fi[0] == fin)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* create a uid from md5 of 'top' output */</div><div class='del'>-static void</div><div class='del'>-cmd_builduid(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3FolderInfo *fi = data;</div><div class='del'>-	MD5Context md5;</div><div class='del'>-	unsigned char *start;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned char digest[16];</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	/* TODO; somehow work out the limit and use that for proper progress reporting</div><div class='del'>-	   We need a pointer to the folder perhaps? */</div><div class='del'>-	camel_operation_progress_count(NULL, fi-&gt;id);</div><div class='del'>-</div><div class='del'>-	md5_init(&amp;md5);</div><div class='del'>-	do {</div><div class='del'>-		ret = camel_pop3_stream_getd(stream, &amp;start, &amp;len);</div><div class='del'>-		if (ret &gt;= 0)</div><div class='del'>-			md5_update(&amp;md5, start, len);</div><div class='del'>-	} while (ret &gt; 0);</div><div class='del'>-	md5_final(&amp;md5, digest);</div><div class='del'>-	fi-&gt;uid = base64_encode_simple (digest, 16);</div><div class='del'>-</div><div class='del'>-	d(printf("building uid for id '%d' = '%s'\n", fi-&gt;id, fi-&gt;uid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cmd_list(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int len, id, size;</div><div class='del'>-	unsigned char *line;</div><div class='del'>-	CamelFolder *folder = data;</div><div class='del'>-	CamelPOP3Store *pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelPOP3FolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		ret = camel_pop3_stream_line(stream, &amp;line, &amp;len);</div><div class='del'>-		if (ret&gt;=0) {</div><div class='del'>-			if (sscanf(line, "%u %u", &amp;id, &amp;size) == 2) {</div><div class='del'>-				fi = g_malloc0(sizeof(*fi));</div><div class='del'>-				fi-&gt;size = size;</div><div class='del'>-				fi-&gt;id = id;</div><div class='del'>-				if ((pop3_store-&gt;engine-&gt;capa &amp; CAMEL_POP3_CAP_UIDL) == 0)</div><div class='del'>-					fi-&gt;cmd = camel_pop3_engine_command_new(pe, CAMEL_POP3_COMMAND_MULTI, cmd_builduid, fi, "TOP %u 0\r\n", id);</div><div class='del'>-				g_ptr_array_add(((CamelPOP3Folder *)folder)-&gt;uids, fi);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (ret&gt;0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cmd_uidl(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)</div><div class='del'>-{</div><div class='del'>-	int ret;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	unsigned char *line;</div><div class='del'>-	char uid[1025];</div><div class='del'>-	unsigned int id, i=0;</div><div class='del'>-	CamelPOP3FolderInfo *fi;</div><div class='del'>-	CamelPOP3Folder *folder = data;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		ret = camel_pop3_stream_line(stream, &amp;line, &amp;len);</div><div class='del'>-		if (ret&gt;=0) {			</div><div class='del'>-			if (strlen(line) &gt; 1024)</div><div class='del'>-				line[1024] = 0;</div><div class='del'>-			if (sscanf(line, "%u %s", &amp;id, uid) == 2) {</div><div class='del'>-				fi = id_to_fi(folder, id);</div><div class='del'>-				if (fi) {</div><div class='del'>-					/* fixme: dreadfully inefficient */</div><div class='del'>-					i = fi_to_index(folder, fi);</div><div class='del'>-					camel_operation_progress(NULL, (i+1) * 100 / folder-&gt;uids-&gt;len);</div><div class='del'>-					fi-&gt;uid = g_strdup(uid);</div><div class='del'>-				} else {</div><div class='del'>-					g_warning("ID %u (uid: %s) not in previous LIST output", id, uid);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (ret&gt;0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-pop3_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelPOP3Folder *pop3_folder = (CamelPOP3Folder *) folder;</div><div class='del'>-	CamelPOP3Command *pcl, *pcu = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_operation_start (NULL, _("Retrieving POP summary"));</div><div class='del'>-</div><div class='del'>-	pop3_folder-&gt;uids = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	pcl = camel_pop3_engine_command_new(pop3_store-&gt;engine, CAMEL_POP3_COMMAND_MULTI, cmd_list, folder, "LIST\r\n");</div><div class='del'>-	if (pop3_store-&gt;engine-&gt;capa &amp; CAMEL_POP3_CAP_UIDL) {</div><div class='del'>-		pcu = camel_pop3_engine_command_new(pop3_store-&gt;engine, CAMEL_POP3_COMMAND_MULTI, cmd_uidl, folder, "UIDL\r\n");</div><div class='del'>-	}</div><div class='del'>-	while ((i = camel_pop3_engine_iterate(pop3_store-&gt;engine, NULL)) &gt; 0)</div><div class='del'>-		;</div><div class='del'>-</div><div class='del'>-	if (i == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get POP summary: %s"), strerror(errno));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: check every id has a uid &amp; commands returned OK too? */</div><div class='del'>-	</div><div class='del'>-	/* Free any commands we created along the way */</div><div class='del'>-	camel_pop3_engine_command_free (pop3_store-&gt;engine, pcl);</div><div class='del'>-	</div><div class='del'>-	if (pop3_store-&gt;engine-&gt;capa &amp; CAMEL_POP3_CAP_UIDL) {</div><div class='del'>-		camel_pop3_engine_command_free(pop3_store-&gt;engine, pcu);</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0;i&lt;pop3_folder-&gt;uids-&gt;len;i++) {</div><div class='del'>-			CamelPOP3FolderInfo *fi = pop3_folder-&gt;uids-&gt;pdata[i];</div><div class='del'>-			if (fi-&gt;cmd) {</div><div class='del'>-				camel_pop3_engine_command_free(pop3_store-&gt;engine, fi-&gt;cmd);</div><div class='del'>-				fi-&gt;cmd = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Folder *pop3_folder;</div><div class='del'>-	CamelPOP3Store *pop3_store;</div><div class='del'>-	int i;</div><div class='del'>-	CamelPOP3FolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	if (!expunge)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	camel_operation_start(NULL, _("Expunging deleted messages"));</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; pop3_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-		fi = pop3_folder-&gt;uids-&gt;pdata[i];</div><div class='del'>-		/* busy already?  wait for that to finish first */</div><div class='del'>-		if (fi-&gt;cmd) {</div><div class='del'>-			while (camel_pop3_engine_iterate(pop3_store-&gt;engine, fi-&gt;cmd) &gt; 0)</div><div class='del'>-				;</div><div class='del'>-			camel_pop3_engine_command_free(pop3_store-&gt;engine, fi-&gt;cmd);</div><div class='del'>-			fi-&gt;cmd = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (fi-&gt;flags &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			fi-&gt;cmd = camel_pop3_engine_command_new(pop3_store-&gt;engine, 0, NULL, NULL, "DELE %u\r\n", fi-&gt;id);</div><div class='del'>-</div><div class='del'>-			/* also remove from cache */</div><div class='del'>-			if (pop3_store-&gt;cache &amp;&amp; fi-&gt;uid)</div><div class='del'>-				camel_data_cache_remove(pop3_store-&gt;cache, "cache", fi-&gt;uid, NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pop3_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-		fi = pop3_folder-&gt;uids-&gt;pdata[i];</div><div class='del'>-		/* wait for delete commands to finish */</div><div class='del'>-		if (fi-&gt;cmd) {</div><div class='del'>-			while (camel_pop3_engine_iterate(pop3_store-&gt;engine, fi-&gt;cmd) &gt; 0)</div><div class='del'>-				;</div><div class='del'>-			camel_pop3_engine_command_free(pop3_store-&gt;engine, fi-&gt;cmd);</div><div class='del'>-			fi-&gt;cmd = NULL;</div><div class='del'>-		}</div><div class='del'>-		camel_operation_progress(NULL, (i+1) * 100 / pop3_folder-&gt;uids-&gt;len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	camel_pop3_store_expunge (pop3_store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cmd_tocache(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3FolderInfo *fi = data;</div><div class='del'>-	char buffer[2048];</div><div class='del'>-	int w = 0, n;</div><div class='del'>-</div><div class='del'>-	/* What if it fails? */</div><div class='del'>-</div><div class='del'>-	/* We write an '*' to the start of the stream to say its not complete yet */</div><div class='del'>-	/* This should probably be part of the cache code */</div><div class='del'>-	if ((n = camel_stream_write(fi-&gt;stream, "*", 1)) == -1)</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	while ((n = camel_stream_read((CamelStream *)stream, buffer, sizeof(buffer))) &gt; 0) {</div><div class='del'>-		n = camel_stream_write(fi-&gt;stream, buffer, n);</div><div class='del'>-		if (n == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		w += n;</div><div class='del'>-		if (w &gt; fi-&gt;size)</div><div class='del'>-			w = fi-&gt;size;</div><div class='del'>-		camel_operation_progress(NULL, (w * 100) / fi-&gt;size);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* it all worked, output a '#' to say we're a-ok */</div><div class='del'>-	if (n != -1) {</div><div class='del'>-		camel_stream_reset(fi-&gt;stream);</div><div class='del'>-		n = camel_stream_write(fi-&gt;stream, "#", 1);</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	if (n == -1) {</div><div class='del'>-		fi-&gt;err = errno;</div><div class='del'>-		g_warning("POP3 retrieval failed: %s", strerror(errno));</div><div class='del'>-	} else {</div><div class='del'>-		fi-&gt;err = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref((CamelObject *)fi-&gt;stream);</div><div class='del'>-	fi-&gt;stream = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelPOP3Store *pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelPOP3Folder *pop3_folder = (CamelPOP3Folder *)folder;</div><div class='del'>-	CamelPOP3Command *pcr;</div><div class='del'>-	CamelPOP3FolderInfo *fi;</div><div class='del'>-	char buffer[1];</div><div class='del'>-	int ok, i, last;</div><div class='del'>-	CamelStream *stream = NULL;</div><div class='del'>-</div><div class='del'>-	fi = uid_to_fi(pop3_folder, uid);</div><div class='del'>-	if (fi == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				      _("No message with uid %s"), uid);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Sigh, most of the crap in this function is so that the cancel button</div><div class='del'>-	   returns the proper exception code.  Sigh. */</div><div class='del'>-</div><div class='del'>-	camel_operation_start_transient(NULL, _("Retrieving POP message %d"), fi-&gt;id);</div><div class='del'>-</div><div class='del'>-	/* If we have an oustanding retrieve message running, wait for that to complete</div><div class='del'>-	   &amp; then retrieve from cache, otherwise, start a new one, and similar */</div><div class='del'>-</div><div class='del'>-	if (fi-&gt;cmd != NULL) {</div><div class='del'>-		while ((i = camel_pop3_engine_iterate(pop3_store-&gt;engine, fi-&gt;cmd)) &gt; 0)</div><div class='del'>-			;</div><div class='del'>-</div><div class='del'>-		if (i == -1)</div><div class='del'>-			fi-&gt;err = errno;</div><div class='del'>-</div><div class='del'>-		/* getting error code? */</div><div class='del'>-		ok = fi-&gt;cmd-&gt;state == CAMEL_POP3_COMMAND_DATA;</div><div class='del'>-		camel_pop3_engine_command_free(pop3_store-&gt;engine, fi-&gt;cmd);</div><div class='del'>-		fi-&gt;cmd = NULL;</div><div class='del'>-</div><div class='del'>-		if (fi-&gt;err != 0) {</div><div class='del'>-			if (fi-&gt;err == EINTR)</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));</div><div class='del'>-			else</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, strerror(fi-&gt;err));</div><div class='del'>-			goto fail;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* check to see if we have safely written flag set */</div><div class='del'>-	if (pop3_store-&gt;cache == NULL</div><div class='del'>-	    || (stream = camel_data_cache_get(pop3_store-&gt;cache, "cache", fi-&gt;uid, NULL)) == NULL</div><div class='del'>-	    || camel_stream_read(stream, buffer, 1) != 1</div><div class='del'>-	    || buffer[0] != '#') {</div><div class='del'>-</div><div class='del'>-		/* Initiate retrieval, if disk backing fails, use a memory backing */</div><div class='del'>-		if (pop3_store-&gt;cache == NULL</div><div class='del'>-		    || (stream = camel_data_cache_add(pop3_store-&gt;cache, "cache", fi-&gt;uid, NULL)) == NULL)</div><div class='del'>-			stream = camel_stream_mem_new();</div><div class='del'>-</div><div class='del'>-		/* ref it, the cache storage routine unref's when done */</div><div class='del'>-		camel_object_ref((CamelObject *)stream);</div><div class='del'>-		fi-&gt;stream = stream;</div><div class='del'>-		fi-&gt;err = EIO;</div><div class='del'>-		pcr = camel_pop3_engine_command_new(pop3_store-&gt;engine, CAMEL_POP3_COMMAND_MULTI, cmd_tocache, fi, "RETR %u\r\n", fi-&gt;id);</div><div class='del'>-</div><div class='del'>-		/* Also initiate retrieval of some of the following messages, assume we'll be receiving them */</div><div class='del'>-		if (pop3_store-&gt;cache != NULL) {</div><div class='del'>-			/* This should keep track of the last one retrieved, also how many are still</div><div class='del'>-			   oustanding incase of random access on large folders */</div><div class='del'>-			i = fi_to_index(pop3_folder, fi)+1;</div><div class='del'>-			last = MIN(i+10, pop3_folder-&gt;uids-&gt;len);</div><div class='del'>-			for (;i&lt;last;i++) {</div><div class='del'>-				CamelPOP3FolderInfo *pfi = pop3_folder-&gt;uids-&gt;pdata[i];</div><div class='del'>-				</div><div class='del'>-				if (pfi-&gt;uid &amp;&amp; pfi-&gt;cmd == NULL) {</div><div class='del'>-					pfi-&gt;stream = camel_data_cache_add(pop3_store-&gt;cache, "cache", pfi-&gt;uid, NULL);</div><div class='del'>-					if (pfi-&gt;stream) {</div><div class='del'>-						pfi-&gt;err = EIO;</div><div class='del'>-						pfi-&gt;cmd = camel_pop3_engine_command_new(pop3_store-&gt;engine, CAMEL_POP3_COMMAND_MULTI,</div><div class='del'>-											 cmd_tocache, pfi, "RETR %u\r\n", pfi-&gt;id);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* now wait for the first one to finish */</div><div class='del'>-		while ((i = camel_pop3_engine_iterate(pop3_store-&gt;engine, pcr)) &gt; 0)</div><div class='del'>-			;</div><div class='del'>-</div><div class='del'>-		if (i == -1)</div><div class='del'>-			fi-&gt;err = errno;</div><div class='del'>-</div><div class='del'>-		/* getting error code? */</div><div class='del'>-		ok = pcr-&gt;state == CAMEL_POP3_COMMAND_DATA;</div><div class='del'>-		camel_pop3_engine_command_free(pop3_store-&gt;engine, pcr);</div><div class='del'>-		camel_stream_reset(stream);</div><div class='del'>-</div><div class='del'>-		/* Check to see we have safely written flag set */</div><div class='del'>-		if (fi-&gt;err != 0) {</div><div class='del'>-			if (fi-&gt;err == EINTR)</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));</div><div class='del'>-			else</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, strerror(fi-&gt;err));</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (camel_stream_read(stream, buffer, 1) != 1</div><div class='del'>-		    || buffer[0] != '#') {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-					     _("Cannot get message %s: %s"), uid, _("Unknown reason"));</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	message = camel_mime_message_new ();</div><div class='del'>-	if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)message, stream) == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, strerror(errno));</div><div class='del'>-		camel_object_unref((CamelObject *)message);</div><div class='del'>-		message = NULL;</div><div class='del'>-	}</div><div class='del'>-done:</div><div class='del'>-	camel_object_unref((CamelObject *)stream);</div><div class='del'>-fail:</div><div class='del'>-	camel_operation_end(NULL);</div><div class='del'>-</div><div class='del'>-	return message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pop3_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	CamelPOP3FolderInfo *fi;</div><div class='del'>-</div><div class='del'>-	fi = uid_to_fi(pop3_folder, uid);</div><div class='del'>-	if (fi)</div><div class='del'>-		fi-&gt;flags = (fi-&gt;flags &amp; ~flags) | (set &amp; flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-pop3_get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	</div><div class='del'>-	return pop3_folder-&gt;uids-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-pop3_get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	GPtrArray *uids = g_ptr_array_new();</div><div class='del'>-	CamelPOP3FolderInfo **fi = (CamelPOP3FolderInfo **)pop3_folder-&gt;uids-&gt;pdata;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;pop3_folder-&gt;uids-&gt;len;i++,fi++) {</div><div class='del'>-		if (fi[0]-&gt;uid)</div><div class='del'>-			g_ptr_array_add(uids, fi[0]-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h<br/>deleted file mode 100644<br/>index 55eb1d253b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-pop3-folder.h : Class for a POP3 folder */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_POP3_FOLDER_H</div><div class='del'>-#define CAMEL_POP3_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_FOLDER_TYPE     (camel_pop3_folder_get_type ())</div><div class='del'>-#define CAMEL_POP3_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPOP3Folder))</div><div class='del'>-#define CAMEL_POP3_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPOP3FolderClass))</div><div class='del'>-#define CAMEL_IS_POP3_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	guint32 id;</div><div class='del'>-	guint32 size;</div><div class='del'>-	guint32 flags;</div><div class='del'>-	char *uid;</div><div class='del'>-	int err;</div><div class='del'>-	struct _CamelPOP3Command *cmd;</div><div class='del'>-	struct _CamelStream *stream;</div><div class='del'>-} CamelPOP3FolderInfo;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolder parent_object;</div><div class='del'>-</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-</div><div class='del'>-} CamelPOP3Folder;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelPOP3FolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *camel_pop3_folder_new (CamelStore *parent, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_pop3_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_POP3_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c<br/>deleted file mode 100644<br/>index f01cf74253..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-pop3-provider.c: pop3 provider registration code */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors :</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-pop3-store.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-</div><div class='del'>-CamelProviderConfEntry pop3_conf_entries[] = {</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_START, NULL, NULL,</div><div class='del'>-	  N_("Message storage") },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "keep_on_server", NULL,</div><div class='del'>-	  N_("Leave messages on server"), "0" },</div><div class='del'>-#ifdef NOT_FOR_1_0</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_CHECKSPIN, "delete_after", "UNIMPLEMENTED",</div><div class='del'>-	  N_("Delete after %s day(s)"), "0:1:7:365" },</div><div class='del'>-#endif</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_SECTION_END },</div><div class='del'>-	{ CAMEL_PROVIDER_CONF_END }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelProvider pop3_provider = {</div><div class='del'>-	"pop",</div><div class='del'>-	</div><div class='del'>-	N_("POP"),</div><div class='del'>-	</div><div class='del'>-	N_("For connecting to and downloading mail from POP servers."),</div><div class='del'>-	</div><div class='del'>-	"mail",</div><div class='del'>-	</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |</div><div class='del'>-	CAMEL_PROVIDER_SUPPORTS_SSL,</div><div class='del'>-	</div><div class='del'>-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,</div><div class='del'>-	</div><div class='del'>-	pop3_conf_entries,</div><div class='del'>-	</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_pop3_password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the POP server using a plaintext "</div><div class='del'>-	   "password. This is the only option supported by many POP servers."),</div><div class='del'>-</div><div class='del'>-	"",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelServiceAuthType camel_pop3_apop_authtype = {</div><div class='del'>-	"APOP",</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the POP server using an encrypted "</div><div class='del'>-	   "password via the APOP protocol. This may not work for all users "</div><div class='del'>-	   "even on servers that claim to support it."),</div><div class='del'>-</div><div class='del'>-	"+APOP",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	CamelServiceAuthType *auth;</div><div class='del'>-</div><div class='del'>-	pop3_provider.object_types[CAMEL_PROVIDER_STORE] = camel_pop3_store_get_type();</div><div class='del'>-	pop3_provider.url_hash = camel_url_hash;</div><div class='del'>-	pop3_provider.url_equal = camel_url_equal;</div><div class='del'>-</div><div class='del'>-	pop3_provider.authtypes = camel_sasl_authtype_list (FALSE);</div><div class='del'>-	auth = camel_sasl_authtype("LOGIN");</div><div class='del'>-	if (auth)</div><div class='del'>-		pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, auth);</div><div class='del'>-	pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, &amp;camel_pop3_apop_authtype);</div><div class='del'>-	pop3_provider.authtypes = g_list_prepend(pop3_provider.authtypes, &amp;camel_pop3_password_authtype);</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider(session, &amp;pop3_provider);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c<br/>deleted file mode 100644<br/>index 4015cb6ea1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,619 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-pop3-store.c : class for a pop3 store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000-2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-</div><div class='del'>-#include "camel-pop3-store.h"</div><div class='del'>-#include "camel-pop3-folder.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "e-util/md5-utils.h"</div><div class='del'>-#include "camel-pop3-engine.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-#include "camel-data-cache.h"</div><div class='del'>-#include "camel-tcp-stream.h"</div><div class='del'>-#include "camel-tcp-stream-raw.h"</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* Specified in RFC 1939 */</div><div class='del'>-#define POP3_PORT 110</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static gboolean pop3_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, </div><div class='del'>-				guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void init_trash (CamelStore *store);</div><div class='del'>-static CamelFolder *get_trash  (CamelStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_store_class_init (CamelPOP3StoreClass *camel_pop3_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_pop3_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_pop3_store_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;connect = pop3_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = pop3_disconnect;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;init_trash = init_trash;</div><div class='del'>-	camel_store_class-&gt;get_trash = get_trash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (!camel_pop3_store_type) {</div><div class='del'>-		camel_pop3_store_type = camel_type_register (CAMEL_STORE_TYPE,</div><div class='del'>-							     "CamelPOP3Store",</div><div class='del'>-							     sizeof (CamelPOP3Store),</div><div class='del'>-							     sizeof (CamelPOP3StoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_pop3_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_pop3_store_init,</div><div class='del'>-							     finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_pop3_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *pop3_store = CAMEL_POP3_STORE (object);</div><div class='del'>-</div><div class='del'>-	/* force disconnect so we dont have it run later, after we've cleaned up some stuff */</div><div class='del'>-	/* SIGH */</div><div class='del'>-</div><div class='del'>-	camel_service_disconnect((CamelService *)pop3_store, TRUE, NULL);</div><div class='del'>-</div><div class='del'>-	if (pop3_store-&gt;engine)</div><div class='del'>-		camel_object_unref((CamelObject *)pop3_store-&gt;engine);</div><div class='del'>-	if (pop3_store-&gt;cache)</div><div class='del'>-		camel_object_unref((CamelObject *)pop3_store-&gt;cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	USE_SSL_NEVER,</div><div class='del'>-	USE_SSL_ALWAYS,</div><div class='del'>-	USE_SSL_WHEN_POSSIBLE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server (CamelService *service, int ssl_mode, int try_starttls, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-	CamelStream *tcp_stream;</div><div class='del'>-	CamelPOP3Command *pc;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	int clean_quit;</div><div class='del'>-	int ret, port;</div><div class='del'>-	</div><div class='del'>-	h = camel_service_gethost (service, ex);</div><div class='del'>-	if (!h)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	port = service-&gt;url-&gt;port ? service-&gt;url-&gt;port : 110;</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	if (camel_url_get_param (service-&gt;url, "use_ssl")) {</div><div class='del'>-		if (try_starttls)</div><div class='del'>-			tcp_stream = camel_tcp_stream_ssl_new_raw (service, service-&gt;url-&gt;host);</div><div class='del'>-		else {</div><div class='del'>-			port = service-&gt;url-&gt;port ? service-&gt;url-&gt;port : 995;</div><div class='del'>-			tcp_stream = camel_tcp_stream_ssl_new (service, service-&gt;url-&gt;host);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-	</div><div class='del'>-	ret = camel_tcp_stream_connect (CAMEL_TCP_STREAM (tcp_stream), h, port);</div><div class='del'>-	camel_free_host (h);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		if (errno == EINTR)</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-					     _("Connection cancelled"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      _("Could not connect to %s (port %d): %s"),</div><div class='del'>-					      service-&gt;url-&gt;host, port, g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* parent class connect initialization */</div><div class='del'>-	if (CAMEL_SERVICE_CLASS (parent_class)-&gt;connect (service, ex) == FALSE) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (tcp_stream));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	store-&gt;engine = camel_pop3_engine_new (tcp_stream);</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	if (store-&gt;engine) {</div><div class='del'>-		if (ssl_mode == USE_SSL_WHEN_POSSIBLE) {</div><div class='del'>-			if (store-&gt;engine-&gt;capa &amp; CAMEL_POP3_CAP_STLS)</div><div class='del'>-				goto starttls;</div><div class='del'>-		} else if (ssl_mode == USE_SSL_ALWAYS) {</div><div class='del'>-			if (try_starttls) {</div><div class='del'>-				if (store-&gt;engine-&gt;capa &amp; CAMEL_POP3_CAP_STLS) {</div><div class='del'>-				/* attempt to toggle STARTTLS mode */</div><div class='del'>-					goto starttls;</div><div class='del'>-				} else {</div><div class='del'>-				/* server doesn't support STARTTLS, abort */</div><div class='del'>-					camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							      _("Failed to connect to POP server %s in secure mode: %s"),</div><div class='del'>-							      service-&gt;url-&gt;host, _("SSL/TLS extension not supported."));</div><div class='del'>-					/* we have the possibility of quitting cleanly here */</div><div class='del'>-					clean_quit = TRUE;</div><div class='del'>-					goto stls_exception;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (tcp_stream));</div><div class='del'>-	</div><div class='del'>-	return store-&gt;engine != NULL;</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>- starttls:</div><div class='del'>-	/* as soon as we send a STLS command, all hope is lost of a clean QUIT if problems arise */</div><div class='del'>-	clean_quit = FALSE;</div><div class='del'>-	</div><div class='del'>-	pc = camel_pop3_engine_command_new (store-&gt;engine, 0, NULL, NULL, "STLS\r\n");</div><div class='del'>-	while (camel_pop3_engine_iterate (store-&gt;engine, NULL) &gt; 0)</div><div class='del'>-		;</div><div class='del'>-	</div><div class='del'>-	ret = pc-&gt;state == CAMEL_POP3_COMMAND_OK;</div><div class='del'>-	camel_pop3_engine_command_free (store-&gt;engine, pc);</div><div class='del'>-	</div><div class='del'>-	if (ret == FALSE) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to connect to POP server %s in secure mode: %s"),</div><div class='del'>-				      service-&gt;url-&gt;host, store-&gt;engine-&gt;line);</div><div class='del'>-		goto stls_exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Okay, now toggle SSL/TLS mode */</div><div class='del'>-	ret = camel_tcp_stream_ssl_enable_ssl (CAMEL_TCP_STREAM_SSL (tcp_stream));</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (tcp_stream));</div><div class='del'>-	</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Failed to connect to POP server %s in secure mode: %s"),</div><div class='del'>-				      service-&gt;url-&gt;host, _("SSL negotiations failed"));</div><div class='del'>-		goto stls_exception;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* rfc2595, section 4 states that after a successful STLS</div><div class='del'>-           command, the client MUST discard prior CAPA responses */</div><div class='del'>-	camel_pop3_engine_reget_capabilities (store-&gt;engine);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>- stls_exception:</div><div class='del'>-	if (clean_quit) {</div><div class='del'>-		/* try to disconnect cleanly */</div><div class='del'>-		pc = camel_pop3_engine_command_new (store-&gt;engine, 0, NULL, NULL, "QUIT\r\n");</div><div class='del'>-		while (camel_pop3_engine_iterate (store-&gt;engine, NULL) &gt; 0)</div><div class='del'>-			;</div><div class='del'>-		camel_pop3_engine_command_free (store-&gt;engine, pc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (store-&gt;engine));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (tcp_stream));</div><div class='del'>-	store-&gt;engine = NULL;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *value;</div><div class='del'>-	int mode;</div><div class='del'>-} ssl_options[] = {</div><div class='del'>-	{ "",              USE_SSL_ALWAYS        },</div><div class='del'>-	{ "always",        USE_SSL_ALWAYS        },</div><div class='del'>-	{ "when-possible", USE_SSL_WHEN_POSSIBLE },</div><div class='del'>-	{ "never",         USE_SSL_NEVER         },</div><div class='del'>-	{ NULL,            USE_SSL_NEVER         },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server_wrapper (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	const char *use_ssl;</div><div class='del'>-	int i, ssl_mode;</div><div class='del'>-	</div><div class='del'>-	use_ssl = camel_url_get_param (service-&gt;url, "use_ssl");</div><div class='del'>-	if (use_ssl) {</div><div class='del'>-		for (i = 0; ssl_options[i].value; i++)</div><div class='del'>-			if (!strcmp (ssl_options[i].value, use_ssl))</div><div class='del'>-				break;</div><div class='del'>-		ssl_mode = ssl_options[i].mode;</div><div class='del'>-	} else</div><div class='del'>-		ssl_mode = USE_SSL_NEVER;</div><div class='del'>-	</div><div class='del'>-	if (ssl_mode == USE_SSL_ALWAYS) {</div><div class='del'>-		/* First try the ssl port */</div><div class='del'>-		if (!connect_to_server (service, ssl_mode, FALSE, ex)) {</div><div class='del'>-			if (camel_exception_get_id (ex) == CAMEL_EXCEPTION_SERVICE_UNAVAILABLE) {</div><div class='del'>-				/* The ssl port seems to be unavailable, lets try STARTTLS */</div><div class='del'>-				camel_exception_clear (ex);</div><div class='del'>-				return connect_to_server (service, ssl_mode, TRUE, ex);</div><div class='del'>-			} else {</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (ssl_mode == USE_SSL_WHEN_POSSIBLE) {</div><div class='del'>-		/* If the server supports STARTTLS, use it */</div><div class='del'>-		return connect_to_server (service, ssl_mode, TRUE, ex);</div><div class='del'>-	} else {</div><div class='del'>-		/* User doesn't care about SSL */</div><div class='del'>-		return connect_to_server (service, ssl_mode, FALSE, ex);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	return connect_to_server (service, USE_SSL_NEVER, FALSE, ex);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-extern CamelServiceAuthType camel_pop3_password_authtype;</div><div class='del'>-extern CamelServiceAuthType camel_pop3_apop_authtype;</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-	GList *types = NULL;</div><div class='del'>-</div><div class='del'>-        types = CAMEL_SERVICE_CLASS (parent_class)-&gt;query_auth_types (service, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (connect_to_server_wrapper (service, NULL)) {</div><div class='del'>-		types = g_list_concat(types, g_list_copy(store-&gt;engine-&gt;auth));</div><div class='del'>-		pop3_disconnect (service, TRUE, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Could not connect to POP server on %s"),</div><div class='del'>-				      service-&gt;url-&gt;host);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return types;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pop3_store_expunge:</div><div class='del'>- * @store: the store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Expunge messages from the store. This will result in the connection</div><div class='del'>- * being closed, which may cause later commands to fail if they can't</div><div class='del'>- * reconnect.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_pop3_store_expunge (CamelPOP3Store *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Command *pc;</div><div class='del'>-</div><div class='del'>-	pc = camel_pop3_engine_command_new(store-&gt;engine, 0, NULL, NULL, "QUIT\r\n");</div><div class='del'>-	while (camel_pop3_engine_iterate(store-&gt;engine, NULL) &gt; 0)</div><div class='del'>-		;</div><div class='del'>-	camel_pop3_engine_command_free(store-&gt;engine, pc);</div><div class='del'>-</div><div class='del'>-	camel_service_disconnect (CAMEL_SERVICE (store), FALSE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-try_sasl(CamelPOP3Store *store, const char *mech, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Stream *stream = store-&gt;engine-&gt;stream;</div><div class='del'>-	unsigned char *line, *resp;</div><div class='del'>-	CamelSasl *sasl;</div><div class='del'>-	unsigned int len;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	sasl = camel_sasl_new("pop3", mech, (CamelService *)store);</div><div class='del'>-	if (sasl == NULL) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Unable to connect to POP server.\n"</div><div class='del'>-				       "No support for requested "</div><div class='del'>-				       "authentication mechanism."));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_stream_printf((CamelStream *)stream, "AUTH %s\r\n", mech) == -1)</div><div class='del'>-		goto ioerror;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		if (camel_pop3_stream_line(stream, &amp;line, &amp;len) == -1)</div><div class='del'>-			goto ioerror;</div><div class='del'>-		if (strncmp(line, "+OK", 3) == 0)</div><div class='del'>-			break;</div><div class='del'>-		if (strncmp(line, "-ERR", 4) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					     _("SASL `%s' Login failed: %s"), mech, line);</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-		/* If we dont get continuation, or the sasl object's run out of work, or we dont get a challenge,</div><div class='del'>-		   its a protocol error, so fail, and try reset the server */</div><div class='del'>-		if (strncmp(line, "+ ", 2) != 0</div><div class='del'>-		    || camel_sasl_authenticated(sasl)</div><div class='del'>-		    || (resp = camel_sasl_challenge_base64(sasl, line+2, ex)) == NULL) {</div><div class='del'>-			camel_stream_printf((CamelStream *)stream, "*\r\n");</div><div class='del'>-			camel_pop3_stream_line(stream, &amp;line, &amp;len);</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					     _("SASL Protocol error"));</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ret = camel_stream_printf((CamelStream *)stream, "%s\r\n", resp);</div><div class='del'>-		g_free(resp);</div><div class='del'>-		if (ret == -1)</div><div class='del'>-			goto ioerror;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)sasl);</div><div class='del'>-	return 0;</div><div class='del'>-</div><div class='del'>-ioerror:</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-			     _("I/O Error: %s"), strerror(errno));</div><div class='del'>-done:</div><div class='del'>-	camel_object_unref((CamelObject *)sasl);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_try_authenticate (CamelService *service, const char *errmsg,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *store = (CamelPOP3Store *)service;</div><div class='del'>-	CamelPOP3Command *pcu = NULL, *pcp = NULL;</div><div class='del'>-	int status;</div><div class='del'>-	</div><div class='del'>-	/* override, testing only */</div><div class='del'>-	/*printf("Forcing authmech to 'login'\n");</div><div class='del'>-	service-&gt;url-&gt;authmech = g_strdup("LOGIN");*/</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-		char *prompt;</div><div class='del'>-		</div><div class='del'>-		prompt = g_strdup_printf (_("%sPlease enter the POP password for %s@%s"),</div><div class='del'>-					  errmsg ? errmsg : "",</div><div class='del'>-					  service-&gt;url-&gt;user,</div><div class='del'>-					  service-&gt;url-&gt;host);</div><div class='del'>-		service-&gt;url-&gt;passwd = camel_session_get_password (camel_service_get_session (service),</div><div class='del'>-								   prompt, TRUE, service, "password", ex);</div><div class='del'>-		g_free (prompt);</div><div class='del'>-		if (!service-&gt;url-&gt;passwd)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;authmech) {</div><div class='del'>-		/* pop engine will take care of pipelining ability */</div><div class='del'>-		pcu = camel_pop3_engine_command_new(store-&gt;engine, 0, NULL, NULL, "USER %s\r\n", service-&gt;url-&gt;user);</div><div class='del'>-		pcp = camel_pop3_engine_command_new(store-&gt;engine, 0, NULL, NULL, "PASS %s\r\n", service-&gt;url-&gt;passwd);</div><div class='del'>-	} else if (strcmp(service-&gt;url-&gt;authmech, "+APOP") == 0 &amp;&amp; store-&gt;engine-&gt;apop) {</div><div class='del'>-		char *secret, md5asc[33], *d;</div><div class='del'>-		unsigned char md5sum[16], *s;</div><div class='del'>-		</div><div class='del'>-		secret = alloca(strlen(store-&gt;engine-&gt;apop)+strlen(service-&gt;url-&gt;passwd)+1);</div><div class='del'>-		sprintf(secret, "%s%s",  store-&gt;engine-&gt;apop, service-&gt;url-&gt;passwd);</div><div class='del'>-		md5_get_digest(secret, strlen (secret), md5sum);</div><div class='del'>-</div><div class='del'>-		for (s = md5sum, d = md5asc; d &lt; md5asc + 32; s++, d += 2)</div><div class='del'>-			sprintf (d, "%.2x", *s);</div><div class='del'>-		</div><div class='del'>-		pcp = camel_pop3_engine_command_new(store-&gt;engine, 0, NULL, NULL, "APOP %s %s\r\n", service-&gt;url-&gt;user, md5asc);</div><div class='del'>-	} else {</div><div class='del'>-		CamelServiceAuthType *auth;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		l = store-&gt;engine-&gt;auth;</div><div class='del'>-		while (l) {</div><div class='del'>-			auth = l-&gt;data;</div><div class='del'>-			if (strcmp(auth-&gt;authproto, service-&gt;url-&gt;authmech) == 0)</div><div class='del'>-				return try_sasl(store, service-&gt;url-&gt;authmech, ex) == -1;</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Unable to connect to POP server.\n"</div><div class='del'>-				       "No support for requested "</div><div class='del'>-				       "authentication mechanism."));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while ((status = camel_pop3_engine_iterate (store-&gt;engine, pcp)) &gt; 0)</div><div class='del'>-		;</div><div class='del'>-	</div><div class='del'>-	if (pcp-&gt;state != CAMEL_POP3_COMMAND_OK) {</div><div class='del'>-		if (status == -1)</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Unable to connect to POP server.\nError sending password: %s"),</div><div class='del'>-					      errno ? g_strerror (errno) : _("Unknown error"));</div><div class='del'>-		else</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("Unable to connect to POP server.\nError sending password: %s"),</div><div class='del'>-					      store-&gt;engine-&gt;line);</div><div class='del'>-	}</div><div class='del'>-	camel_pop3_engine_command_free(store-&gt;engine, pcp);</div><div class='del'>-</div><div class='del'>-	if (pcu)</div><div class='del'>-		camel_pop3_engine_command_free(store-&gt;engine, pcu);</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *errbuf = NULL;</div><div class='del'>-	gboolean tryagain;</div><div class='del'>-	CamelPOP3Store *store = (CamelPOP3Store *)service;</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;cache == NULL) {</div><div class='del'>-		char *root;</div><div class='del'>-</div><div class='del'>-		root = camel_session_get_storage_path(service-&gt;session, service, ex);</div><div class='del'>-		if (root) {</div><div class='del'>-			store-&gt;cache = camel_data_cache_new(root, 0, ex);</div><div class='del'>-			g_free(root);</div><div class='del'>-			if (store-&gt;cache) {</div><div class='del'>-				/* Default cache expiry - 1 week or not visited in a day */</div><div class='del'>-				camel_data_cache_set_expire_age(store-&gt;cache, 60*60*24*7);</div><div class='del'>-				camel_data_cache_set_expire_access(store-&gt;cache, 60*60*24);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!connect_to_server_wrapper (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	do {</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			errbuf = g_strdup_printf ("%s\n\n", camel_exception_get_description (ex));</div><div class='del'>-			camel_exception_clear (ex);</div><div class='del'>-			</div><div class='del'>-			/* don't forget the password if we encountered an unknown error */</div><div class='del'>-			if (camel_exception_get_id (ex) == CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE) {</div><div class='del'>-				/* Uncache the password before prompting again. */</div><div class='del'>-				camel_session_forget_password (camel_service_get_session (service),</div><div class='del'>-							       service, "password", ex);</div><div class='del'>-				g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-				service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		tryagain = pop3_try_authenticate (service, errbuf, ex);</div><div class='del'>-		g_free (errbuf);</div><div class='del'>-		errbuf = NULL;</div><div class='del'>-	} while (tryagain);</div><div class='del'>-	</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_service_disconnect (service, TRUE, ex);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-	</div><div class='del'>-	if (clean) {</div><div class='del'>-		CamelPOP3Command *pc;</div><div class='del'>-		</div><div class='del'>-		pc = camel_pop3_engine_command_new(store-&gt;engine, 0, NULL, NULL, "QUIT\r\n");</div><div class='del'>-		while (camel_pop3_engine_iterate(store-&gt;engine, NULL) &gt; 0)</div><div class='del'>-			;</div><div class='del'>-		camel_pop3_engine_command_free(store-&gt;engine, pc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	camel_object_unref((CamelObject *)store-&gt;engine);</div><div class='del'>-	store-&gt;engine = NULL;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (strcasecmp (folder_name, "inbox") != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				      _("No such folder `%s'."), folder_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return camel_pop3_folder_new (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_trash (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_trash (CamelStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* no-op */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h<br/>deleted file mode 100644<br/>index 3b9b1f7ae1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-pop3-store.h : class for an pop3 store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000-2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_POP3_STORE_H</div><div class='del'>-#define CAMEL_POP3_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-#include "camel-pop3-engine.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_STORE_TYPE     (camel_pop3_store_get_type ())</div><div class='del'>-#define CAMEL_POP3_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_STORE_TYPE, CamelPOP3Store))</div><div class='del'>-#define CAMEL_POP3_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPOP3StoreClass))</div><div class='del'>-#define CAMEL_IS_POP3_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;</div><div class='del'>-</div><div class='del'>-	CamelPOP3Engine *engine; /* pop processing engine */</div><div class='del'>-</div><div class='del'>-	struct _CamelDataCache *cache;</div><div class='del'>-} CamelPOP3Store;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelPOP3StoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void camel_pop3_store_expunge (CamelPOP3Store *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* support functions */</div><div class='del'>-enum { CAMEL_POP3_OK, CAMEL_POP3_ERR, CAMEL_POP3_FAIL };</div><div class='del'>-int camel_pop3_command (CamelPOP3Store *store, char **ret, CamelException *ex, char *fmt, ...);</div><div class='del'>-char *camel_pop3_command_get_additional_data (CamelPOP3Store *store, int total, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_pop3_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_POP3_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-stream.c b/camel/providers/pop3/camel-pop3-stream.c<br/>deleted file mode 100644<br/>index 5b0dd979ca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-stream.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,468 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is *identical* to the camel-nntp-stream, so should probably</div><div class='del'>-   work out a way to merge them */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-pop3-stream.h"</div><div class='del'>-</div><div class='del'>-extern int camel_verbose_debug;</div><div class='del'>-#define dd(x) (camel_verbose_debug?(x):0)</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStream */</div><div class='del'>-#define CS_CLASS(so) CAMEL_POP3_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_STREAM_SIZE (4096)</div><div class='del'>-#define CAMEL_POP3_STREAM_LINE (1024) /* maximum line size */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_fill(CamelPOP3Stream *is)</div><div class='del'>-{</div><div class='del'>-	int left = 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;source) {</div><div class='del'>-		left = is-&gt;end - is-&gt;ptr;</div><div class='del'>-		memcpy(is-&gt;buf, is-&gt;ptr, left);</div><div class='del'>-		is-&gt;end = is-&gt;buf + left;</div><div class='del'>-		is-&gt;ptr = is-&gt;buf;</div><div class='del'>-		left = camel_stream_read(is-&gt;source, is-&gt;end, CAMEL_POP3_STREAM_SIZE - (is-&gt;end - is-&gt;buf));</div><div class='del'>-		if (left &gt; 0) {</div><div class='del'>-			is-&gt;end += left;</div><div class='del'>-			is-&gt;end[0] = '\n';</div><div class='del'>-			return is-&gt;end - is-&gt;ptr;</div><div class='del'>-		} else {</div><div class='del'>-			dd(printf("POP3_STREAM_FILL(ERROR): '%s'\n", strerror(errno)));</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read(CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Stream *is = (CamelPOP3Stream *)stream;</div><div class='del'>-	char *o, *oe;</div><div class='del'>-	unsigned char *p, *e, c;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode != CAMEL_POP3_STREAM_DATA || n == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	o = buffer;</div><div class='del'>-	oe = buffer + n;</div><div class='del'>-	state = is-&gt;state;</div><div class='del'>-</div><div class='del'>-	/* Need to copy/strip '.'s and whatnot */</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	switch(state) {</div><div class='del'>-	state_0:</div><div class='del'>-	case 0:		/* start of line, always read at least 3 chars */</div><div class='del'>-		while (e - p &lt; 3) {</div><div class='del'>-			is-&gt;ptr = p;</div><div class='del'>-			if (stream_fill(is) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			p = is-&gt;ptr;</div><div class='del'>-			e = is-&gt;end;</div><div class='del'>-		}</div><div class='del'>-		if (p[0] == '.') {</div><div class='del'>-			if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-				is-&gt;ptr = p+3;</div><div class='del'>-				is-&gt;mode = CAMEL_POP3_STREAM_EOD;</div><div class='del'>-				is-&gt;state = 0;</div><div class='del'>-				dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));</div><div class='del'>-				return o-buffer;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-		state = 1;</div><div class='del'>-		/* FALLS THROUGH */</div><div class='del'>-	case 1:		/* looking for next sol */</div><div class='del'>-		while (o &lt; oe) {</div><div class='del'>-			c = *p++;</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				/* end of input sentinal check */</div><div class='del'>-				if (p &gt; e) {</div><div class='del'>-					is-&gt;ptr = e;</div><div class='del'>-					if (stream_fill(is) == -1)</div><div class='del'>-						return -1;</div><div class='del'>-					p = is-&gt;ptr;</div><div class='del'>-					e = is-&gt;end;</div><div class='del'>-				} else {</div><div class='del'>-					*o++ = '\n';</div><div class='del'>-					state = 0;</div><div class='del'>-					goto state_0;</div><div class='del'>-				}</div><div class='del'>-			} else if (c != '\r') {</div><div class='del'>-				*o++ = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	is-&gt;ptr = p;</div><div class='del'>-	is-&gt;state = state;</div><div class='del'>-</div><div class='del'>-	dd(printf("POP3_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));</div><div class='del'>-</div><div class='del'>-	return o-buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_write(CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Stream *is = (CamelPOP3Stream *)stream;</div><div class='del'>-</div><div class='del'>-	dd(printf("POP3_STREAM_WRITE(%d):\n%.*s\n", n, (int)n, buffer));</div><div class='del'>-</div><div class='del'>-	return camel_stream_write(is-&gt;source, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_close(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_flush(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-stream_eos(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Stream *is = (CamelPOP3Stream *)stream;</div><div class='del'>-</div><div class='del'>-	return is-&gt;mode != CAMEL_POP3_STREAM_DATA;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_reset(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	/* nop?  reset literal mode? */</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_stream_class_init (CamelStreamClass *camel_pop3_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_pop3_stream_class;</div><div class='del'>-</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_stream_init(CamelPOP3Stream *is, CamelPOP3StreamClass *isclass)</div><div class='del'>-{</div><div class='del'>-	/* +1 is room for appending a 0 if we need to for a line */</div><div class='del'>-	is-&gt;ptr = is-&gt;end = is-&gt;buf = g_malloc(CAMEL_POP3_STREAM_SIZE+1);</div><div class='del'>-	is-&gt;lineptr = is-&gt;linebuf = g_malloc(CAMEL_POP3_STREAM_LINE+1);</div><div class='del'>-	is-&gt;lineend = is-&gt;linebuf + CAMEL_POP3_STREAM_LINE;</div><div class='del'>-</div><div class='del'>-	/* init sentinal */</div><div class='del'>-	is-&gt;ptr[0] = '\n';</div><div class='del'>-</div><div class='del'>-	is-&gt;state = 0;</div><div class='del'>-	is-&gt;mode = CAMEL_POP3_STREAM_LINE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_stream_finalise(CamelPOP3Stream *is)</div><div class='del'>-{</div><div class='del'>-	g_free(is-&gt;buf);</div><div class='del'>-	g_free(is-&gt;linebuf);</div><div class='del'>-	if (is-&gt;source)</div><div class='del'>-		camel_object_unref((CamelObject *)is-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_pop3_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_pop3_stream_type = camel_type_register( camel_stream_get_type(),</div><div class='del'>-							    "CamelPOP3Stream",</div><div class='del'>-							    sizeof( CamelPOP3Stream ),</div><div class='del'>-							    sizeof( CamelPOP3StreamClass ),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_pop3_stream_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_pop3_stream_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_pop3_stream_finalise );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_pop3_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_pop3_stream_new:</div><div class='del'>- *</div><div class='del'>- * Returns a NULL stream.  A null stream is always at eof, and</div><div class='del'>- * always returns success for all reads and writes.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_pop3_stream_new(CamelStream *source)</div><div class='del'>-{</div><div class='del'>-	CamelPOP3Stream *is;</div><div class='del'>-</div><div class='del'>-	is = (CamelPOP3Stream *)camel_object_new(camel_pop3_stream_get_type ());</div><div class='del'>-	camel_object_ref((CamelObject *)source);</div><div class='del'>-	is-&gt;source = source;</div><div class='del'>-</div><div class='del'>-	return (CamelStream *)is;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get one line from the pop3 stream */</div><div class='del'>-int</div><div class='del'>-camel_pop3_stream_line(CamelPOP3Stream *is, unsigned char **data, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	register unsigned char c, *p, *o, *oe;</div><div class='del'>-	int newlen, oldlen;</div><div class='del'>-	unsigned char *e;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_POP3_STREAM_EOD) {</div><div class='del'>-		*data = is-&gt;linebuf;</div><div class='del'>-		*len = 0;</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	o = is-&gt;linebuf;</div><div class='del'>-	oe = is-&gt;lineend - 1;</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	/* Data mode, convert leading '..' to '.', and stop when we reach a solitary '.' */</div><div class='del'>-	if (is-&gt;mode == CAMEL_POP3_STREAM_DATA) {</div><div class='del'>-		/* need at least 3 chars in buffer */</div><div class='del'>-		while (e-p &lt; 3) {</div><div class='del'>-			is-&gt;ptr = p;</div><div class='del'>-			if (stream_fill(is) == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			p = is-&gt;ptr;</div><div class='del'>-			e = is-&gt;end;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* check for isolated '.\r\n' or begging of line '.' */</div><div class='del'>-		if (p[0] == '.') {</div><div class='del'>-			if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-				is-&gt;ptr = p+3;</div><div class='del'>-				is-&gt;mode = CAMEL_POP3_STREAM_EOD;</div><div class='del'>-				*data = is-&gt;linebuf;</div><div class='del'>-				*len = 0;</div><div class='del'>-				is-&gt;linebuf[0] = 0;</div><div class='del'>-</div><div class='del'>-				dd(printf("POP3_STREAM_LINE(END)\n"));</div><div class='del'>-</div><div class='del'>-				return 0;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		while (o &lt; oe) {</div><div class='del'>-			c = *p++;</div><div class='del'>-			if (c == '\n') {</div><div class='del'>-				/* sentinal? */</div><div class='del'>-				if (p&gt; e) {</div><div class='del'>-					is-&gt;ptr = e;</div><div class='del'>-					if (stream_fill(is) == -1)</div><div class='del'>-						return -1;</div><div class='del'>-					p = is-&gt;ptr;</div><div class='del'>-					e = is-&gt;end;</div><div class='del'>-				} else {</div><div class='del'>-					is-&gt;ptr = p;</div><div class='del'>-					*data = is-&gt;linebuf;</div><div class='del'>-					*len = o - is-&gt;linebuf;</div><div class='del'>-					*o = 0;</div><div class='del'>-</div><div class='del'>-					dd(printf("POP3_STREAM_LINE(%d): '%s'\n", *len, *data));</div><div class='del'>-</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			} else if (c != '\r') {</div><div class='del'>-				*o++ = c;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* limit this for bad server data? */</div><div class='del'>-		oldlen = o - is-&gt;linebuf;</div><div class='del'>-		newlen = (is-&gt;lineend - is-&gt;linebuf) * 3 / 2;</div><div class='del'>-		is-&gt;lineptr = is-&gt;linebuf = g_realloc(is-&gt;linebuf, newlen);</div><div class='del'>-		is-&gt;lineend = is-&gt;linebuf + newlen;</div><div class='del'>-		oe = is-&gt;lineend - 1;</div><div class='del'>-		o = is-&gt;linebuf + oldlen;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on error, 0 if last lot of data, &gt;0 if more remaining */</div><div class='del'>-int camel_pop3_stream_gets(CamelPOP3Stream *is, unsigned char **start, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	int max;</div><div class='del'>-	unsigned char *end;</div><div class='del'>-</div><div class='del'>-	*len = 0;</div><div class='del'>-</div><div class='del'>-	max = is-&gt;end - is-&gt;ptr;</div><div class='del'>-	if (max == 0) {</div><div class='del'>-		max = stream_fill(is);</div><div class='del'>-		if (max &lt;= 0)</div><div class='del'>-			return max;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*start = is-&gt;ptr;</div><div class='del'>-	end = memchr(is-&gt;ptr, '\n', max);</div><div class='del'>-	if (end)</div><div class='del'>-		max = (end - is-&gt;ptr) + 1;</div><div class='del'>-	*start = is-&gt;ptr;</div><div class='del'>-	*len = max;</div><div class='del'>-	is-&gt;ptr += max;</div><div class='del'>-</div><div class='del'>-	dd(printf("POP3_STREAM_GETS(%s,%d): '%.*s'\n", end==NULL?"more":"last", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-	return end == NULL?1:0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_pop3_stream_set_mode(CamelPOP3Stream *is, camel_pop3_stream_mode_t mode)</div><div class='del'>-{</div><div class='del'>-	is-&gt;mode = mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on erorr, 0 if last data, &gt;0 if more data left */</div><div class='del'>-int camel_pop3_stream_getd(CamelPOP3Stream *is, unsigned char **start, unsigned int *len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *p, *e, *s;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	*len = 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_POP3_STREAM_EOD)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (is-&gt;mode == CAMEL_POP3_STREAM_LINE) {</div><div class='del'>-		g_warning("pop3_stream reading data in line mode\n");</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	state = is-&gt;state;</div><div class='del'>-	p = is-&gt;ptr;</div><div class='del'>-	e = is-&gt;end;</div><div class='del'>-</div><div class='del'>-	while (e - p &lt; 3) {</div><div class='del'>-		is-&gt;ptr = p;</div><div class='del'>-		if (stream_fill(is) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		p = is-&gt;ptr;</div><div class='del'>-		e = is-&gt;end;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = p;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		switch(state) {</div><div class='del'>-		case 0:</div><div class='del'>-			/* check leading '.', ... */</div><div class='del'>-			if (p[0] == '.') {</div><div class='del'>-				if (p[1] == '\r' &amp;&amp; p[2] == '\n') {</div><div class='del'>-					is-&gt;ptr = p+3;</div><div class='del'>-					*len = p-s;</div><div class='del'>-					*start = s;</div><div class='del'>-					is-&gt;mode = CAMEL_POP3_STREAM_EOD;</div><div class='del'>-					is-&gt;state = 0;</div><div class='del'>-</div><div class='del'>-					dd(printf("POP3_STREAM_GETD(%s,%d): '%.*s'\n", "last", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-					return 0;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* If at start, just skip '.', else return data upto '.' but skip it */</div><div class='del'>-				if (p == s) {</div><div class='del'>-					s++;</div><div class='del'>-					p++;</div><div class='del'>-				} else {</div><div class='del'>-					is-&gt;ptr = p+1;</div><div class='del'>-					*len = p-s;</div><div class='del'>-					*start = s;</div><div class='del'>-					is-&gt;state = 1;</div><div class='del'>-</div><div class='del'>-					dd(printf("POP3_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-					return 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			state = 1;</div><div class='del'>-		case 1:</div><div class='del'>-			/* Scan for sentinal */</div><div class='del'>-			while ((*p++)!='\n')</div><div class='del'>-				;</div><div class='del'>-</div><div class='del'>-			if (p &gt; e) {</div><div class='del'>-				p = e;</div><div class='del'>-			} else {</div><div class='del'>-				state = 0;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} while ((e-p) &gt;= 3);</div><div class='del'>-</div><div class='del'>-	is-&gt;state = state;</div><div class='del'>-	is-&gt;ptr = p;</div><div class='del'>-	*len = p-s;</div><div class='del'>-	*start = s;</div><div class='del'>-</div><div class='del'>-	dd(printf("POP3_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h<br/>deleted file mode 100644<br/>index 2a4ebc01f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-stream.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/camel-pop3-stream.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2002 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is *identical* to the camel-nntp-stream, so should probably</div><div class='del'>-   work out a way to merge them */</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_POP3_STREAM_H</div><div class='del'>-#define _CAMEL_POP3_STREAM_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_STREAM(obj)         CAMEL_CHECK_CAST (obj, camel_pop3_stream_get_type (), CamelPOP3Stream)</div><div class='del'>-#define CAMEL_POP3_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_pop3_stream_get_type (), CamelPOP3StreamClass)</div><div class='del'>-#define CAMEL_IS_POP3_STREAM(obj)      CAMEL_CHECK_TYPE (obj, camel_pop3_stream_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPOP3StreamClass CamelPOP3StreamClass;</div><div class='del'>-typedef struct _CamelPOP3Stream CamelPOP3Stream;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_POP3_STREAM_LINE,</div><div class='del'>-	CAMEL_POP3_STREAM_DATA,</div><div class='del'>-	CAMEL_POP3_STREAM_EOD,	/* end of data, acts as if end of stream */</div><div class='del'>-} camel_pop3_stream_mode_t;</div><div class='del'>-</div><div class='del'>-struct _CamelPOP3Stream {</div><div class='del'>-	CamelStream parent;</div><div class='del'>-</div><div class='del'>-	CamelStream *source;</div><div class='del'>-</div><div class='del'>-	camel_pop3_stream_mode_t mode;</div><div class='del'>-	int state;</div><div class='del'>-</div><div class='del'>-	unsigned char *buf, *ptr, *end;</div><div class='del'>-	unsigned char *linebuf, *lineptr, *lineend;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelPOP3StreamClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType		 camel_pop3_stream_get_type	(void);</div><div class='del'>-</div><div class='del'>-CamelStream     *camel_pop3_stream_new		(CamelStream *source);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void		 camel_pop3_stream_set_mode     (CamelPOP3Stream *is, camel_pop3_stream_mode_t mode);</div><div class='del'>-</div><div class='del'>-int              camel_pop3_stream_line		(CamelPOP3Stream *is, unsigned char **data, unsigned int *len);</div><div class='del'>-int 		 camel_pop3_stream_gets		(CamelPOP3Stream *is, unsigned char **start, unsigned int *len);</div><div class='del'>-int 		 camel_pop3_stream_getd		(CamelPOP3Stream *is, unsigned char **start, unsigned int *len);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_POP3_STREAM_H */</div><div class='head'>diff --git a/camel/providers/pop3/libcamelpop3.urls b/camel/providers/pop3/libcamelpop3.urls<br/>deleted file mode 100644<br/>index 7fffa4d861..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/libcamelpop3.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/pop3/libcamelpop3.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-pop</div><div class='head'>diff --git a/camel/providers/sendmail/.cvsignore b/camel/providers/sendmail/.cvsignore<br/>deleted file mode 100644<br/>index 097fdedafb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.o</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am<br/>deleted file mode 100644<br/>index 57834b9853..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelsendmailincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamelsendmail.la</div><div class='del'>-camel_provider_DATA = libcamelsendmail.urls</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I..					\</div><div class='del'>-	-I$(srcdir)/..				\</div><div class='del'>-	-I$(srcdir)/../../..			\</div><div class='del'>-	-I$(includedir)				\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/camel                   \</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR) 			\</div><div class='del'>-        -DG_LOG_DOMAIN=\"camel-sendmail-provider\"</div><div class='del'>-</div><div class='del'>-libcamelsendmail_la_SOURCES = 			\</div><div class='del'>-	camel-sendmail-provider.c		\</div><div class='del'>-	camel-sendmail-transport.c</div><div class='del'>-</div><div class='del'>-libcamelsendmailinclude_HEADERS =		\</div><div class='del'>-	camel-sendmail-transport.h</div><div class='del'>-</div><div class='del'>-libcamelsendmail_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelsendmail.urls</div><div class='head'>diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c<br/>deleted file mode 100644<br/>index 9615dff1b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/camel-sendmail-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-sendmail-provider.c: sendmail provider registration code */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors :</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-sendmail-transport.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-static CamelProvider sendmail_provider = {</div><div class='del'>-	"sendmail",</div><div class='del'>-	N_("Sendmail"),</div><div class='del'>-</div><div class='del'>-	N_("For delivering mail by passing it to the \"sendmail\" program "</div><div class='del'>-	   "on the local system."),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	0, /* flags */</div><div class='del'>-</div><div class='del'>-	0, /* url_flags */</div><div class='del'>-</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	sendmail_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =</div><div class='del'>-		camel_sendmail_transport_get_type();</div><div class='del'>-	</div><div class='del'>-	sendmail_provider.url_hash = camel_url_hash;</div><div class='del'>-	sendmail_provider.url_equal = camel_url_equal;</div><div class='del'>-	</div><div class='del'>-	camel_session_register_provider (session, &amp;sendmail_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c<br/>deleted file mode 100644<br/>index 604d7f293d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/camel-sendmail-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,207 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-sendmail-transport.c: Sendmail-based transport class. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-sendmail-transport.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-static char *get_name (CamelService *service, gboolean brief);</div><div class='del'>-</div><div class='del'>-static gboolean sendmail_send_to (CamelTransport *transport,</div><div class='del'>-				  CamelMimeMessage *message,</div><div class='del'>-				  CamelAddress *from, CamelAddress *recipients,</div><div class='del'>-				  CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_sendmail_transport_class_init (CamelSendmailTransportClass *camel_sendmail_transport_class)</div><div class='del'>-{</div><div class='del'>-	CamelTransportClass *camel_transport_class =</div><div class='del'>-		CAMEL_TRANSPORT_CLASS (camel_sendmail_transport_class);</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_sendmail_transport_class);</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_transport_class-&gt;send_to = sendmail_send_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_sendmail_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_sendmail_transport_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_sendmail_transport_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_sendmail_transport_type =</div><div class='del'>-			camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSendmailTransport",</div><div class='del'>-					     sizeof (CamelSendmailTransport),</div><div class='del'>-					     sizeof (CamelSendmailTransportClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_sendmail_transport_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) NULL,</div><div class='del'>-					     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_sendmail_transport_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,</div><div class='del'>-		  CamelAddress *from, CamelAddress *recipients,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *from_addr, *addr, **argv;</div><div class='del'>-	int i, len, fd[2], nullfd, wstat;</div><div class='del'>-	sigset_t mask, omask;</div><div class='del'>-	CamelStream *out;</div><div class='del'>-	pid_t pid;</div><div class='del'>-</div><div class='del'>-	if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (from), 0, NULL, &amp;from_addr))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	len = camel_address_length (recipients);</div><div class='del'>-	argv = g_malloc ((len + 6) * sizeof (char *));</div><div class='del'>-	argv[0] = "sendmail";</div><div class='del'>-	argv[1] = "-i";</div><div class='del'>-	argv[2] = "-f";</div><div class='del'>-	argv[3] = from_addr;</div><div class='del'>-	argv[4] = "--";</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (recipients), i, NULL, &amp;addr)) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not parse recipient list"));</div><div class='del'>-			g_free (argv);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		argv[i + 5] = addr;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	argv[i + 5] = NULL;</div><div class='del'>-	</div><div class='del'>-	if (pipe (fd) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create pipe to sendmail: "</div><div class='del'>-					"%s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Block SIGCHLD so the calling application doesn't notice</div><div class='del'>-	 * sendmail exiting before we do.</div><div class='del'>-	 */</div><div class='del'>-	sigemptyset (&amp;mask);</div><div class='del'>-	sigaddset (&amp;mask, SIGCHLD);</div><div class='del'>-	sigprocmask (SIG_BLOCK, &amp;mask, &amp;omask);</div><div class='del'>-</div><div class='del'>-	pid = fork ();</div><div class='del'>-	switch (pid) {</div><div class='del'>-	case -1:</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not fork sendmail: "</div><div class='del'>-					"%s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-		g_free (argv);</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-		/* Child process */</div><div class='del'>-		nullfd = open ("/dev/null", O_RDWR);</div><div class='del'>-		dup2 (fd[0], STDIN_FILENO);</div><div class='del'>-		/*		dup2 (nullfd, STDOUT_FILENO);</div><div class='del'>-				dup2 (nullfd, STDERR_FILENO);*/</div><div class='del'>-		close (nullfd);</div><div class='del'>-		close (fd[1]);</div><div class='del'>-</div><div class='del'>-		execv (SENDMAIL_PATH, (char **)argv);</div><div class='del'>-		_exit (255);</div><div class='del'>-	}</div><div class='del'>-	g_free (argv);</div><div class='del'>-</div><div class='del'>-	/* Parent process. Write the message out. */</div><div class='del'>-	close (fd[0]);</div><div class='del'>-	out = camel_stream_fs_new_with_fd (fd[1]);</div><div class='del'>-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), out) == -1</div><div class='del'>-	    || camel_stream_close(out) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (out));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not send message: %s"),</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (out));</div><div class='del'>-</div><div class='del'>-	/* Wait for sendmail to exit. */</div><div class='del'>-	while (waitpid (pid, &amp;wstat, 0) == -1 &amp;&amp; errno == EINTR)</div><div class='del'>-		;</div><div class='del'>-	sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-</div><div class='del'>-	if (!WIFEXITED (wstat)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("sendmail exited with signal %s: "</div><div class='del'>-					"mail not sent."),</div><div class='del'>-				      g_strsignal (WTERMSIG (wstat)));</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else if (WEXITSTATUS (wstat) != 0) {</div><div class='del'>-		if (WEXITSTATUS (wstat) == 255) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Could not execute %s: "</div><div class='del'>-						"mail not sent."),</div><div class='del'>-					      SENDMAIL_PATH);</div><div class='del'>-		} else {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("sendmail exited with status "</div><div class='del'>-						"%d: mail not sent."),</div><div class='del'>-					      WEXITSTATUS (wstat));</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (_("sendmail"));</div><div class='del'>-	else</div><div class='del'>-		return g_strdup (_("Mail delivery via the sendmail program"));</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h<br/>deleted file mode 100644<br/>index 056be03bc8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/camel-sendmail-transport.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-sendmail-transport.h: Sendmail-based transport class */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SENDMAIL_TRANSPORT_H</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-transport.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT_TYPE     (camel_sendmail_transport_get_type ())</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass))</div><div class='del'>-#define CAMEL_IS_SENDMAIL_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SENDMAIL_TRANSPORT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransport parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSendmailTransport;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransportClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSendmailTransportClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sendmail_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SENDMAIL_TRANSPORT_H */</div><div class='head'>diff --git a/camel/providers/sendmail/libcamelsendmail.urls b/camel/providers/sendmail/libcamelsendmail.urls<br/>deleted file mode 100644<br/>index ccad52828e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/libcamelsendmail.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/sendmail/libcamelsendmail.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-sendmail</div><div class='head'>diff --git a/camel/providers/smtp/.cvsignore b/camel/providers/smtp/.cvsignore<br/>deleted file mode 100644<br/>index b948585108..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am<br/>deleted file mode 100644<br/>index f70f19e56a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelsmtpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-camel_provider_LTLIBRARIES = libcamelsmtp.la</div><div class='del'>-camel_provider_DATA = libcamelsmtp.urls</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I..					\</div><div class='del'>-	-I$(srcdir)/..				\</div><div class='del'>-	-I$(srcdir)/../../..			\</div><div class='del'>-	-I$(includedir)				\</div><div class='del'>-	-I$(top_srcdir)/intl			\</div><div class='del'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	$(CAMEL_CFLAGS)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	$(NSPR_CFLAGS)				\</div><div class='del'>-	$(NSS_CFLAGS)				\</div><div class='del'>-	$(OPENSSL_CFLAGS)			\</div><div class='del'>-        -DG_LOG_DOMAIN=\"camel-smtp-provider\"</div><div class='del'>-</div><div class='del'>-libcamelsmtp_la_SOURCES = 			\</div><div class='del'>-	camel-smtp-provider.c			\</div><div class='del'>-	camel-smtp-transport.c</div><div class='del'>-</div><div class='del'>-libcamelsmtpinclude_HEADERS =			\</div><div class='del'>-	camel-smtp-transport.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-libcamelsmtp_la_LDFLAGS = -avoid-version -module</div><div class='del'>-</div><div class='del'>-libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelsmtp.urls</div><div class='head'>diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c<br/>deleted file mode 100644<br/>index 07991eb695..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-provider.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/camel-smtp-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-smtp-provider.c: smtp provider registration code */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "camel-smtp-transport.h"</div><div class='del'>-#include "camel-provider.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-</div><div class='del'>-static CamelProvider smtp_provider = {</div><div class='del'>-	"smtp",</div><div class='del'>-	N_("SMTP"),</div><div class='del'>-</div><div class='del'>-	N_("For delivering mail by connecting to a remote mailhub "</div><div class='del'>-	   "using SMTP.\n"),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_SUPPORTS_SSL,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH | CAMEL_URL_ALLOW_USER,</div><div class='del'>-</div><div class='del'>-	/* ... */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	smtp_provider.object_types[CAMEL_PROVIDER_TRANSPORT] =</div><div class='del'>-		camel_smtp_transport_get_type ();</div><div class='del'>-	smtp_provider.authtypes = g_list_append (camel_sasl_authtype_list (TRUE), camel_sasl_authtype ("LOGIN"));</div><div class='del'>-	smtp_provider.authtypes = g_list_append (smtp_provider.authtypes, camel_sasl_authtype ("POPB4SMTP"));</div><div class='del'>-	smtp_provider.url_hash = camel_url_hash;</div><div class='del'>-	smtp_provider.url_equal = camel_url_equal;</div><div class='del'>-	</div><div class='del'>-	camel_session_register_provider (session, &amp;smtp_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c<br/>deleted file mode 100644<br/>index aa37ae5e8c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/camel-smtp-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1325 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-smtp-transport.c : class for a smtp transport */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;sys/param.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/socket.h&gt;</div><div class='del'>-#include &lt;netinet/in.h&gt;</div><div class='del'>-#include &lt;arpa/inet.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#undef MIN</div><div class='del'>-#undef MAX</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-linewrap.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-smtp-transport.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include "camel-operation.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-tcp-stream.h"</div><div class='del'>-#include "camel-tcp-stream-raw.h"</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-#include "camel-tcp-stream-ssl.h"</div><div class='del'>-#endif</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-sasl.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/* Specified in RFC 821 */</div><div class='del'>-#define SMTP_PORT 25</div><div class='del'>-</div><div class='del'>-/* camel smtp transport class prototypes */</div><div class='del'>-static gboolean smtp_send_to (CamelTransport *transport, CamelMimeMessage *message,</div><div class='del'>-			      CamelAddress *from, CamelAddress *recipients, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* support prototypes */</div><div class='del'>-static void smtp_construct (CamelService *service, CamelSession *session,</div><div class='del'>-			    CamelProvider *provider, CamelURL *url,</div><div class='del'>-			    CamelException *ex);</div><div class='del'>-static gboolean smtp_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GHashTable *esmtp_get_authtypes (const unsigned char *buffer);</div><div class='del'>-static GList *query_auth_types (CamelService *service, CamelException *ex);</div><div class='del'>-static char *get_name (CamelService *service, gboolean brief);</div><div class='del'>-</div><div class='del'>-static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-static gboolean smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex);</div><div class='del'>-static gboolean smtp_mail (CamelSmtpTransport *transport, const char *sender,</div><div class='del'>-			   gboolean has_8bit_parts, CamelException *ex);</div><div class='del'>-static gboolean smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex);</div><div class='del'>-static gboolean smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message,</div><div class='del'>-			   gboolean has_8bit_parts, CamelException *ex);</div><div class='del'>-static gboolean smtp_rset (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-static gboolean smtp_quit (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void smtp_set_exception (CamelSmtpTransport *transport, const char *respbuf,</div><div class='del'>-				const char *message, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* private data members */</div><div class='del'>-static CamelTransportClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_smtp_transport_class_init (CamelSmtpTransportClass *camel_smtp_transport_class)</div><div class='del'>-{</div><div class='del'>-	CamelTransportClass *camel_transport_class =</div><div class='del'>-		CAMEL_TRANSPORT_CLASS (camel_smtp_transport_class);</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_smtp_transport_class);</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_TRANSPORT_CLASS (camel_type_get_global_classfuncs (camel_transport_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;construct = smtp_construct;</div><div class='del'>-	camel_service_class-&gt;connect = smtp_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = smtp_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types = query_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	</div><div class='del'>-	camel_transport_class-&gt;send_to = smtp_send_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_smtp_transport_init (gpointer object)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *smtp = CAMEL_SMTP_TRANSPORT (object);</div><div class='del'>-	</div><div class='del'>-	smtp-&gt;flags = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_smtp_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type =</div><div class='del'>-			camel_type_register (CAMEL_TRANSPORT_TYPE,</div><div class='del'>-					     "CamelSmtpTransport",</div><div class='del'>-					     sizeof (CamelSmtpTransport),</div><div class='del'>-					     sizeof (CamelSmtpTransportClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_smtp_transport_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_smtp_transport_init,</div><div class='del'>-					     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-smtp_construct (CamelService *service, CamelSession *session,</div><div class='del'>-		CamelProvider *provider, CamelURL *url,</div><div class='del'>-		CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	const char *use_ssl;</div><div class='del'>-	</div><div class='del'>-	CAMEL_SERVICE_CLASS (parent_class)-&gt;construct (service, session, provider, url, ex);</div><div class='del'>-	</div><div class='del'>-	if ((use_ssl = camel_url_get_param (url, "use_ssl"))) {</div><div class='del'>-		/* Note: previous versions would use "" to toggle use_ssl to 'on' */</div><div class='del'>-		if (!*use_ssl || !strcmp (use_ssl, "always"))</div><div class='del'>-			smtp_transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_USE_SSL_ALWAYS;</div><div class='del'>-		else if (!strcmp (use_ssl, "when-possible"))</div><div class='del'>-			smtp_transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_USE_SSL_WHEN_POSSIBLE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-smtp_error_string (int error)</div><div class='del'>-{</div><div class='del'>-	/* SMTP error codes grabbed from rfc821 */</div><div class='del'>-	switch (error) {</div><div class='del'>-	case 0:</div><div class='del'>-		/* looks like a read problem, check errno */</div><div class='del'>-		if (errno)</div><div class='del'>-			return g_strerror (errno);</div><div class='del'>-		else</div><div class='del'>-			return _("Unknown");</div><div class='del'>-	case 500:</div><div class='del'>-		return _("Syntax error, command unrecognized");</div><div class='del'>-	case 501:</div><div class='del'>-		return _("Syntax error in parameters or arguments");</div><div class='del'>-	case 502:</div><div class='del'>-		return _("Command not implemented");</div><div class='del'>-	case 504:</div><div class='del'>-		return _("Command parameter not implemented");</div><div class='del'>-	case 211:</div><div class='del'>-		return _("System status, or system help reply");</div><div class='del'>-	case 214:</div><div class='del'>-		return _("Help message");</div><div class='del'>-	case 220:</div><div class='del'>-		return _("Service ready");</div><div class='del'>-	case 221:</div><div class='del'>-		return _("Service closing transmission channel");</div><div class='del'>-	case 421:</div><div class='del'>-		return _("Service not available, closing transmission channel");</div><div class='del'>-	case 250:</div><div class='del'>-		return _("Requested mail action okay, completed");</div><div class='del'>-	case 251:</div><div class='del'>-		return _("User not local; will forward to &lt;forward-path&gt;");</div><div class='del'>-	case 450:</div><div class='del'>-		return _("Requested mail action not taken: mailbox unavailable");</div><div class='del'>-	case 550:</div><div class='del'>-		return _("Requested action not taken: mailbox unavailable");</div><div class='del'>-	case 451:</div><div class='del'>-		return _("Requested action aborted: error in processing");</div><div class='del'>-	case 551:</div><div class='del'>-		return _("User not local; please try &lt;forward-path&gt;");</div><div class='del'>-	case 452:</div><div class='del'>-		return _("Requested action not taken: insufficient system storage");</div><div class='del'>-	case 552:</div><div class='del'>-		return _("Requested mail action aborted: exceeded storage allocation");</div><div class='del'>-	case 553:</div><div class='del'>-		return _("Requested action not taken: mailbox name not allowed");</div><div class='del'>-	case 354:</div><div class='del'>-		return _("Start mail input; end with &lt;CRLF&gt;.&lt;CRLF&gt;");</div><div class='del'>-	case 554:</div><div class='del'>-		return _("Transaction failed");</div><div class='del'>-		</div><div class='del'>-	/* AUTH error codes: */</div><div class='del'>-	case 432:</div><div class='del'>-		return _("A password transition is needed");</div><div class='del'>-	case 534:</div><div class='del'>-		return _("Authentication mechanism is too weak");</div><div class='del'>-	case 538:</div><div class='del'>-		return _("Encryption required for requested authentication mechanism");</div><div class='del'>-	case 454:</div><div class='del'>-		return _("Temporary authentication failure");</div><div class='del'>-	case 530:</div><div class='del'>-		return _("Authentication required");</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		return _("Unknown");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server (CamelService *service, int try_starttls, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	CamelStream *tcp_stream;</div><div class='del'>-	char *respbuf = NULL;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	int port, ret;</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;connect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	h = camel_service_gethost (service, ex);</div><div class='del'>-	if (!h)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* set some smtp transport defaults */</div><div class='del'>-	transport-&gt;flags &amp;= ~(CAMEL_SMTP_TRANSPORT_IS_ESMTP |</div><div class='del'>-			      CAMEL_SMTP_TRANSPORT_8BITMIME |</div><div class='del'>-			      CAMEL_SMTP_TRANSPORT_STARTTLS |</div><div class='del'>-			      CAMEL_SMTP_TRANSPORT_ENHANCEDSTATUSCODES);</div><div class='del'>-	</div><div class='del'>-	transport-&gt;authtypes = NULL;</div><div class='del'>-	</div><div class='del'>-	port = service-&gt;url-&gt;port ? service-&gt;url-&gt;port : SMTP_PORT;</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_USE_SSL) {</div><div class='del'>-		if (try_starttls)</div><div class='del'>-			tcp_stream = camel_tcp_stream_ssl_new_raw (service, service-&gt;url-&gt;host);</div><div class='del'>-		else {</div><div class='del'>-			port = service-&gt;url-&gt;port ? service-&gt;url-&gt;port : 465;</div><div class='del'>-			tcp_stream = camel_tcp_stream_ssl_new (service, service-&gt;url-&gt;host);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	tcp_stream = camel_tcp_stream_raw_new ();</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-	</div><div class='del'>-	ret = camel_tcp_stream_connect (CAMEL_TCP_STREAM (tcp_stream), h, port);</div><div class='del'>-	camel_free_host (h);</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Could not connect to %s (port %d): %s"),</div><div class='del'>-				      service-&gt;url-&gt;host, port,</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* get the localaddr - needed later by smtp_helo */</div><div class='del'>-	transport-&gt;localaddr = camel_tcp_stream_get_local_address (CAMEL_TCP_STREAM (tcp_stream));</div><div class='del'>-	</div><div class='del'>-	transport-&gt;ostream = tcp_stream;</div><div class='del'>-	transport-&gt;istream = camel_stream_buffer_new (tcp_stream, CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-	</div><div class='del'>-	/* Read the greeting, note whether the server is ESMTP or not. */</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "220" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "220", 3)) {</div><div class='del'>-			int error;</div><div class='del'>-			</div><div class='del'>-			error = respbuf ? atoi (respbuf) : 0;</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Welcome response error: %s: possibly non-fatal"),</div><div class='del'>-					      smtp_error_string (error));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		if (strstr (respbuf, "ESMTP"))</div><div class='del'>-			transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_IS_ESMTP;</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "220-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	/* send HELO (or EHLO, depending on the service type) */</div><div class='del'>-	if (!(transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_IS_ESMTP)) {</div><div class='del'>-		/* If we did not auto-detect ESMTP, we should still send EHLO */</div><div class='del'>-		transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_IS_ESMTP;</div><div class='del'>-		if (!smtp_helo (transport, NULL)) {</div><div class='del'>-			/* Okay, apprently this server doesn't support ESMTP */</div><div class='del'>-			transport-&gt;flags &amp;= ~CAMEL_SMTP_TRANSPORT_IS_ESMTP;</div><div class='del'>-			smtp_helo (transport, ex);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* send EHLO */</div><div class='del'>-		smtp_helo (transport, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_USE_SSL_WHEN_POSSIBLE) {</div><div class='del'>-		/* try_starttls is always TRUE here */</div><div class='del'>-		if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_STARTTLS)</div><div class='del'>-			goto starttls;</div><div class='del'>-	} else if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_USE_SSL_ALWAYS) {</div><div class='del'>-		if (try_starttls) {</div><div class='del'>-			if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_STARTTLS) {</div><div class='del'>-				goto starttls;</div><div class='del'>-			} else {</div><div class='del'>-				/* server doesn't support STARTTLS, abort */</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						      _("Failed to connect to SMTP server %s in secure mode: %s"),</div><div class='del'>-						      service-&gt;url-&gt;host, _("server does not appear to support SSL"));</div><div class='del'>-				goto exception_cleanup;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>- starttls:</div><div class='del'>-	d(fprintf (stderr, "sending : STARTTLS\r\n"));</div><div class='del'>-	if (camel_stream_write (tcp_stream, "STARTTLS\r\n", 10) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("STARTTLS request timed out: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		goto exception_cleanup;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "220 Ready for TLS" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "220", 3)) {</div><div class='del'>-			smtp_set_exception (transport, respbuf, _("STARTTLS response error"), ex);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			goto exception_cleanup;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "220-" then loop again */</div><div class='del'>-	</div><div class='del'>-	/* Okay, now toggle SSL/TLS mode */</div><div class='del'>-	ret = camel_tcp_stream_ssl_enable_ssl (CAMEL_TCP_STREAM_SSL (tcp_stream));</div><div class='del'>-	if (ret != -1)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-			      _("Failed to connect to SMTP server %s in secure mode: %s"),</div><div class='del'>-			      service-&gt;url-&gt;host, g_strerror (errno));</div><div class='del'>-	</div><div class='del'>- exception_cleanup:</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;istream));</div><div class='del'>-	transport-&gt;istream = NULL;</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;ostream));</div><div class='del'>-	transport-&gt;ostream = NULL;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-#endif /* HAVE_SSL */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server_wrapper (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_SSL</div><div class='del'>-	CamelSmtpTransport *transport = (CamelSmtpTransport *) service;</div><div class='del'>-	</div><div class='del'>-	if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_USE_SSL_ALWAYS) {</div><div class='del'>-		/* First try connecting to the SSL port  */</div><div class='del'>-		if (!connect_to_server (service, FALSE, ex)) {</div><div class='del'>-			if (camel_exception_get_id (ex) == CAMEL_EXCEPTION_SERVICE_UNAVAILABLE) {</div><div class='del'>-				/* Seems the SSL port is unavailable, lets try STARTTLS */</div><div class='del'>-				camel_exception_clear (ex);</div><div class='del'>-				return connect_to_server (service, TRUE, ex);</div><div class='del'>-			} else {</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_USE_SSL_WHEN_POSSIBLE) {</div><div class='del'>-		/* If the server supports STARTTLS, use it */</div><div class='del'>-		return connect_to_server (service, TRUE, ex);</div><div class='del'>-	} else {</div><div class='del'>-		/* User doesn't care about SSL */</div><div class='del'>-		return connect_to_server (service, FALSE, ex);</div><div class='del'>-	}</div><div class='del'>-#else</div><div class='del'>-	return connect_to_server (service, FALSE, ex);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	</div><div class='del'>-	/* We (probably) need to check popb4smtp before we connect ... */</div><div class='del'>-	if (service-&gt;url-&gt;authmech &amp;&amp; !strcmp (service-&gt;url-&gt;authmech, "POPB4SMTP")) {</div><div class='del'>-		int truth;</div><div class='del'>-		GByteArray *chal;</div><div class='del'>-		CamelSasl *sasl;</div><div class='del'>-		</div><div class='del'>-		sasl = camel_sasl_new ("smtp", "POPB4SMTP", service);</div><div class='del'>-		chal = camel_sasl_challenge (sasl, NULL, ex);</div><div class='del'>-		truth = camel_sasl_authenticated (sasl);</div><div class='del'>-		if (chal)</div><div class='del'>-			g_byte_array_free (chal, TRUE);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (sasl));</div><div class='del'>-		</div><div class='del'>-		if (!truth)</div><div class='del'>-			return FALSE;</div><div class='del'>-		</div><div class='del'>-		return connect_to_server_wrapper (service, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!connect_to_server_wrapper (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* check to see if AUTH is required, if so...then AUTH ourselves */</div><div class='del'>-	if (service-&gt;url-&gt;authmech) {</div><div class='del'>-		CamelSession *session = camel_service_get_session (service);</div><div class='del'>-		CamelServiceAuthType *authtype;</div><div class='del'>-		gboolean authenticated = FALSE;</div><div class='del'>-		char *errbuf = NULL;</div><div class='del'>-		</div><div class='del'>-		if (!(transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_IS_ESMTP) ||</div><div class='del'>-		    !g_hash_table_lookup (transport-&gt;authtypes, service-&gt;url-&gt;authmech)) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("SMTP server %s does not support requested "</div><div class='del'>-						"authentication type %s"), service-&gt;url-&gt;host,</div><div class='del'>-					      service-&gt;url-&gt;authmech);</div><div class='del'>-			camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		authtype = camel_sasl_authtype (service-&gt;url-&gt;authmech);</div><div class='del'>-		if (!authtype) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      _("No support for authentication type %s"),</div><div class='del'>-					      service-&gt;url-&gt;authmech);</div><div class='del'>-			camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (!authtype-&gt;need_password) {</div><div class='del'>-			/* authentication mechanism doesn't need a password,</div><div class='del'>-			   so if it fails there's nothing we can do */</div><div class='del'>-			authenticated = smtp_auth (transport, authtype-&gt;authproto, ex);</div><div class='del'>-			if (!authenticated) {</div><div class='del'>-				camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* keep trying to login until either we succeed or the user cancels */</div><div class='del'>-		while (!authenticated) {</div><div class='del'>-			if (errbuf) {</div><div class='del'>-				/* We need to un-cache the password before prompting again */</div><div class='del'>-				camel_session_forget_password (session, service, "password", ex);</div><div class='del'>-				g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-				service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-				char *prompt;</div><div class='del'>-				</div><div class='del'>-				prompt = g_strdup_printf (_("%sPlease enter the SMTP password for %s@%s"),</div><div class='del'>-							  errbuf ? errbuf : "", service-&gt;url-&gt;user,</div><div class='del'>-							  service-&gt;url-&gt;host);</div><div class='del'>-				</div><div class='del'>-				service-&gt;url-&gt;passwd = camel_session_get_password (session, prompt, TRUE,</div><div class='del'>-										   service, "password", ex);</div><div class='del'>-				</div><div class='del'>-				g_free (prompt);</div><div class='del'>-				g_free (errbuf);</div><div class='del'>-				errbuf = NULL;</div><div class='del'>-				</div><div class='del'>-				if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-					camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-							     _("You didn't enter a password."));</div><div class='del'>-					camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-					return FALSE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			authenticated = smtp_auth (transport, authtype-&gt;authproto, ex);</div><div class='del'>-			if (!authenticated) {</div><div class='del'>-				errbuf = g_strdup_printf (_("Unable to authenticate "</div><div class='del'>-							    "to SMTP server.\n%s\n\n"),</div><div class='del'>-							  camel_exception_get_description (ex));</div><div class='del'>-				camel_exception_clear (ex);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* The spec says we have to re-EHLO, but some servers</div><div class='del'>-		 * we won't bother to name don't want you to... so ignore</div><div class='del'>-		 * errors.</div><div class='del'>-		 */</div><div class='del'>-		smtp_helo (transport, NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-authtypes_free (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (value);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	</div><div class='del'>-	/*if (!service-&gt;connected)</div><div class='del'>-	 *	return TRUE;</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	if (clean) {</div><div class='del'>-		/* send the QUIT command to the SMTP server */</div><div class='del'>-		smtp_quit (transport, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (transport-&gt;authtypes) {</div><div class='del'>-		g_hash_table_foreach_remove (transport-&gt;authtypes, authtypes_free, NULL);</div><div class='del'>-		g_hash_table_destroy (transport-&gt;authtypes);</div><div class='del'>-		transport-&gt;authtypes = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;ostream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;istream));</div><div class='del'>-	transport-&gt;ostream = NULL;</div><div class='del'>-	transport-&gt;istream = NULL;</div><div class='del'>-</div><div class='del'>-	camel_tcp_address_free (transport-&gt;localaddr);</div><div class='del'>-	transport-&gt;localaddr = NULL;</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GHashTable *</div><div class='del'>-esmtp_get_authtypes (const unsigned char *buffer)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *start, *end;</div><div class='del'>-	GHashTable *table = NULL;</div><div class='del'>-	</div><div class='del'>-	/* advance to the first token */</div><div class='del'>-	start = buffer;</div><div class='del'>-	while (isspace ((int) *start) || *start == '=')</div><div class='del'>-		start++;</div><div class='del'>-	</div><div class='del'>-	if (!*start)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	table = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	for ( ; *start; ) {</div><div class='del'>-		char *type;</div><div class='del'>-		</div><div class='del'>-		/* advance to the end of the token */</div><div class='del'>-		end = start;</div><div class='del'>-		while (*end &amp;&amp; !isspace ((int) *end))</div><div class='del'>-			end++;</div><div class='del'>-		</div><div class='del'>-		type = g_strndup (start, end - start);</div><div class='del'>-		g_hash_table_insert (table, type, type);</div><div class='del'>-		</div><div class='del'>-		/* advance to the next token */</div><div class='del'>-		start = end;</div><div class='del'>-		while (isspace ((int) *start))</div><div class='del'>-			start++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	CamelServiceAuthType *authtype;</div><div class='del'>-	GList *types, *t, *next;</div><div class='del'>-	</div><div class='del'>-	if (!connect_to_server_wrapper (service, ex))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	types = g_list_copy (service-&gt;provider-&gt;authtypes);</div><div class='del'>-	for (t = types; t; t = next) {</div><div class='del'>-		authtype = t-&gt;data;</div><div class='del'>-		next = t-&gt;next;</div><div class='del'>-		</div><div class='del'>-		if (!g_hash_table_lookup (transport-&gt;authtypes, authtype-&gt;authproto)) {</div><div class='del'>-			types = g_list_remove_link (types, t);</div><div class='del'>-			g_list_free_1 (t);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	smtp_disconnect (service, TRUE, NULL);</div><div class='del'>-	</div><div class='del'>-	return types;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf (_("SMTP server %s"), service-&gt;url-&gt;host);</div><div class='del'>-	else {</div><div class='del'>-		return g_strdup_printf (_("SMTP mail delivery via %s"),</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_send_to (CamelTransport *transport, CamelMimeMessage *message,</div><div class='del'>-	      CamelAddress *from, CamelAddress *recipients,</div><div class='del'>-	      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);</div><div class='del'>-	const CamelInternetAddress *cia;</div><div class='del'>-	gboolean has_8bit_parts;</div><div class='del'>-	const char *addr;</div><div class='del'>-	int i, len;</div><div class='del'>-	</div><div class='del'>-	if (!camel_internet_address_get (CAMEL_INTERNET_ADDRESS (from), 0, NULL, &amp;addr)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot send message: "</div><div class='del'>-					"sender address not valid."));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_operation_start (NULL, _("Sending message"));</div><div class='del'>-	</div><div class='del'>-	/* find out if the message has 8bit mime parts */</div><div class='del'>-	has_8bit_parts = camel_mime_message_has_8bit_parts (message);</div><div class='del'>-	</div><div class='del'>-	/* rfc1652 (8BITMIME) requires that you notify the ESMTP daemon that</div><div class='del'>-	   you'll be sending an 8bit mime message at "MAIL FROM:" time. */</div><div class='del'>-	smtp_mail (smtp_transport, addr, has_8bit_parts, ex);</div><div class='del'>-	</div><div class='del'>-	if (!recipients) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot send message: no recipients defined."));</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	len = camel_address_length (recipients);</div><div class='del'>-	cia = CAMEL_INTERNET_ADDRESS (recipients);</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		if (!camel_internet_address_get (cia, i, NULL, &amp;addr)) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Cannot send message: one or more invalid recipients"));</div><div class='del'>-			camel_operation_end (NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (!smtp_rcpt (smtp_transport, addr, ex)) {</div><div class='del'>-			camel_operation_end (NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* passing in has_8bit_parts saves time as we don't have to</div><div class='del'>-           recurse through the message all over again if the user is</div><div class='del'>-           not sending 8bit mime parts */</div><div class='del'>-	if (!smtp_data (smtp_transport, message, has_8bit_parts, ex)) {</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* reset the service for our next transfer session */</div><div class='del'>-	smtp_rset (smtp_transport, ex);</div><div class='del'>-	</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-smtp_next_token (const char *buf)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *token;</div><div class='del'>-	</div><div class='del'>-	token = (const unsigned char *) buf;</div><div class='del'>-	while (*token &amp;&amp; !isspace ((int) *token))</div><div class='del'>-		token++;</div><div class='del'>-	</div><div class='del'>-	while (*token &amp;&amp; isspace ((int) *token))</div><div class='del'>-		token++;</div><div class='del'>-	</div><div class='del'>-	return (const char *) token;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : (c) - 'A' + 10)</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * example (rfc2034):</div><div class='del'>- * 5.1.1 Mailbox "nosuchuser" does not exist</div><div class='del'>- *</div><div class='del'>- * The human-readable status code is what we want. Since this text</div><div class='del'>- * could possibly be encoded, we must decode it.</div><div class='del'>- *</div><div class='del'>- * "xtext" is formally defined as follows:</div><div class='del'>- *</div><div class='del'>- *   xtext = *( xchar / hexchar / linear-white-space / comment )</div><div class='del'>- *</div><div class='del'>- *   xchar = any ASCII CHAR between "!" (33) and "~" (126) inclusive,</div><div class='del'>- *        except for "+", "\" and "(".</div><div class='del'>- *</div><div class='del'>- * "hexchar"s are intended to encode octets that cannot be represented</div><div class='del'>- * as plain text, either because they are reserved, or because they are</div><div class='del'>- * non-printable.  However, any octet value may be represented by a</div><div class='del'>- * "hexchar".</div><div class='del'>- *</div><div class='del'>- *   hexchar = ASCII "+" immediately followed by two upper case</div><div class='del'>- *        hexadecimal digits</div><div class='del'>- **/</div><div class='del'>-static char *</div><div class='del'>-smtp_decode_status_code (const char *in, size_t len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *inptr, *outptr;</div><div class='del'>-	const unsigned char *inend;</div><div class='del'>-	char *outbuf;</div><div class='del'>-	</div><div class='del'>-	outptr = outbuf = g_malloc (len + 1);</div><div class='del'>-	</div><div class='del'>-	inptr = (unsigned char *) in;</div><div class='del'>-	inend = inptr + len;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		if (*inptr == '+') {</div><div class='del'>-			if (isxdigit (inptr[1]) &amp;&amp; isxdigit (inptr[2])) {</div><div class='del'>-				*outptr++ = HEXVAL (inptr[1]) * 16 + HEXVAL (inptr[2]);</div><div class='del'>-				inptr += 3;</div><div class='del'>-			} else</div><div class='del'>-				*outptr++ = *inptr++;</div><div class='del'>-		} else</div><div class='del'>-			*outptr++ = *inptr++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*outptr = '\0';</div><div class='del'>-	</div><div class='del'>-	return outbuf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-smtp_set_exception (CamelSmtpTransport *transport, const char *respbuf, const char *message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	const char *token, *rbuf = respbuf;</div><div class='del'>-	char *buffer = NULL;</div><div class='del'>-	GString *string;</div><div class='del'>-	int error;</div><div class='del'>-	</div><div class='del'>-	if (!respbuf || !(transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_ENHANCEDSTATUSCODES)) {</div><div class='del'>-	fake_status_code:</div><div class='del'>-		error = respbuf ? atoi (respbuf) : 0;</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "%s: %s", message,</div><div class='del'>-				      smtp_error_string (error));</div><div class='del'>-	} else {</div><div class='del'>-		string = g_string_new ("");</div><div class='del'>-		do {</div><div class='del'>-			token = smtp_next_token (rbuf + 4);</div><div class='del'>-			if (*token == '\0') {</div><div class='del'>-				g_free (buffer);</div><div class='del'>-				g_string_free (string, TRUE);</div><div class='del'>-				goto fake_status_code;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			g_string_append (string, token);</div><div class='del'>-			if (*(rbuf + 3) == '-') {</div><div class='del'>-				g_free (buffer);</div><div class='del'>-				buffer = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-			} else {</div><div class='del'>-				g_free (buffer);</div><div class='del'>-				buffer = NULL;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			rbuf = buffer;</div><div class='del'>-		} while (rbuf);</div><div class='del'>-		</div><div class='del'>-		buffer = smtp_decode_status_code (string-&gt;str, string-&gt;len);</div><div class='del'>-		g_string_free (string, TRUE);</div><div class='del'>-		if (!buffer)</div><div class='del'>-			goto fake_status_code;</div><div class='del'>-		</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "%s: %s", message, buffer);</div><div class='del'>-		</div><div class='del'>-		g_free (buffer);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_helo (CamelSmtpTransport *transport, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* say hello to the server */</div><div class='del'>-	char *name, *cmdbuf, *respbuf = NULL;</div><div class='del'>-	struct hostent *host;</div><div class='del'>-	CamelException err;</div><div class='del'>-	const char *token;</div><div class='del'>-	</div><div class='del'>-	camel_operation_start_transient (NULL, _("SMTP Greeting"));</div><div class='del'>-	</div><div class='del'>-	/* get the local host name */</div><div class='del'>-	camel_exception_init (&amp;err);</div><div class='del'>-	host = camel_gethostbyaddr ((char *) &amp;transport-&gt;localaddr-&gt;address,</div><div class='del'>-				    transport-&gt;localaddr-&gt;length, AF_INET, &amp;err);</div><div class='del'>-	camel_exception_clear (&amp;err);</div><div class='del'>-	</div><div class='del'>-	if (host &amp;&amp; host-&gt;h_name) {</div><div class='del'>-		name = g_strdup (host-&gt;h_name);</div><div class='del'>-	} else {</div><div class='del'>-		name = g_strdup_printf ("[%d.%d.%d.%d]",</div><div class='del'>-					transport-&gt;localaddr-&gt;address[0],</div><div class='del'>-					transport-&gt;localaddr-&gt;address[1],</div><div class='del'>-					transport-&gt;localaddr-&gt;address[2],</div><div class='del'>-					transport-&gt;localaddr-&gt;address[3]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_free_host (host);</div><div class='del'>-	</div><div class='del'>-	/* hiya server! how are you today? */</div><div class='del'>-	if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_IS_ESMTP)</div><div class='del'>-		cmdbuf = g_strdup_printf ("EHLO %s\r\n", name);</div><div class='del'>-	else</div><div class='del'>-		cmdbuf = g_strdup_printf ("HELO %s\r\n", name);</div><div class='del'>-	g_free (name);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("HELO request timed out: %s: non-fatal"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			int error;</div><div class='del'>-			</div><div class='del'>-			error = respbuf ? atoi (respbuf) : 0;</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("HELO response error: %s: non-fatal"),</div><div class='del'>-					      smtp_error_string (error));</div><div class='del'>-			camel_operation_end (NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		token = respbuf + 4;</div><div class='del'>-		</div><div class='del'>-		if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_IS_ESMTP) {</div><div class='del'>-			if (!strncmp (token, "8BITMIME", 8)) {</div><div class='del'>-				d(fprintf (stderr, "This server supports 8bit MIME\n"));</div><div class='del'>-				transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_8BITMIME;</div><div class='del'>-			} else if (!strncmp (token, "ENHANCEDSTATUSCODES", 19)) {</div><div class='del'>-				d(fprintf (stderr, "This server supports enhanced status codes\n"));</div><div class='del'>-				transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_ENHANCEDSTATUSCODES;</div><div class='del'>-			} else if (!strncmp (token, "STARTTLS", 8)) {</div><div class='del'>-				d(fprintf (stderr, "This server supports STARTTLS\n"));</div><div class='del'>-				transport-&gt;flags |= CAMEL_SMTP_TRANSPORT_STARTTLS;</div><div class='del'>-			} else if (!transport-&gt;authtypes &amp;&amp; !strncmp (token, "AUTH", 4)) {</div><div class='del'>-				/* Don't bother parsing any authtypes if we already have a list.</div><div class='del'>-				 * Some servers will list AUTH twice, once the standard way and</div><div class='del'>-				 * once the way Microsoft Outlook requires them to be:</div><div class='del'>-				 *</div><div class='del'>-				 * 250-AUTH LOGIN PLAIN DIGEST-MD5 CRAM-MD5</div><div class='del'>-				 * 250-AUTH=LOGIN PLAIN DIGEST-MD5 CRAM-MD5</div><div class='del'>-				 **/</div><div class='del'>-				</div><div class='del'>-				/* parse for supported AUTH types */</div><div class='del'>-				token += 5;</div><div class='del'>-				</div><div class='del'>-				transport-&gt;authtypes = esmtp_get_authtypes (token);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_auth (CamelSmtpTransport *transport, const char *mech, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *cmdbuf, *respbuf = NULL, *challenge;</div><div class='del'>-	gboolean auth_challenge = FALSE;</div><div class='del'>-	CamelSasl *sasl = NULL;</div><div class='del'>-	</div><div class='del'>-	camel_operation_start_transient (NULL, _("SMTP Authentication"));</div><div class='del'>-	</div><div class='del'>-	sasl = camel_sasl_new ("smtp", mech, CAMEL_SERVICE (transport));</div><div class='del'>-	if (!sasl) {</div><div class='del'>-		camel_operation_end (NULL);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Error creating SASL authentication object."));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	challenge = camel_sasl_challenge_base64 (sasl, NULL, ex);</div><div class='del'>-	if (challenge) {</div><div class='del'>-		auth_challenge = TRUE;</div><div class='del'>-		cmdbuf = g_strdup_printf ("AUTH %s %s\r\n", mech, challenge);</div><div class='del'>-		g_free (challenge);</div><div class='del'>-	} else {</div><div class='del'>-		cmdbuf = g_strdup_printf ("AUTH %s\r\n", mech);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("AUTH request timed out: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-	</div><div class='del'>-	while (!camel_sasl_authenticated (sasl)) {</div><div class='del'>-		if (!respbuf) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("AUTH request timed out: %s"),</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* the server challenge/response should follow a 334 code */</div><div class='del'>-		if (strncmp (respbuf, "334", 3)) {</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("AUTH request failed."));</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (FALSE) {</div><div class='del'>-		broken_smtp_server:</div><div class='del'>-			d(fprintf (stderr, "Your SMTP server's implementation of the %s SASL\n"</div><div class='del'>-				   "authentication mechanism is broken. Please report this to the\n"</div><div class='del'>-				   "appropriate vendor and suggest that they re-read rfc2222 again\n"</div><div class='del'>-				   "for the first time (specifically Section 4, paragraph 2).\n",</div><div class='del'>-				   mech));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* eat whtspc */</div><div class='del'>-		for (challenge = respbuf + 4; isspace (*challenge); challenge++);</div><div class='del'>-		</div><div class='del'>-		challenge = camel_sasl_challenge_base64 (sasl, challenge, ex);</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		if (challenge == NULL)</div><div class='del'>-			goto break_and_lose;</div><div class='del'>-		</div><div class='del'>-		/* send our challenge */</div><div class='del'>-		cmdbuf = g_strdup_printf ("%s\r\n", challenge);</div><div class='del'>-		g_free (challenge);</div><div class='del'>-		d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-		if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-			g_free (cmdbuf);</div><div class='del'>-			goto lose;</div><div class='del'>-		}</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		</div><div class='del'>-		/* get the server's response */</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* check that the server says we are authenticated */</div><div class='del'>-	if (!respbuf || strncmp (respbuf, "235", 3)) {</div><div class='del'>-		if (respbuf &amp;&amp; auth_challenge &amp;&amp; !strncmp (respbuf, "334", 3)) {</div><div class='del'>-			/* broken server, but lets try and work around it anyway... */</div><div class='del'>-			goto broken_smtp_server;</div><div class='del'>-		}</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sasl));</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-	</div><div class='del'>- break_and_lose:</div><div class='del'>-	/* Get the server out of "waiting for continuation data" mode. */</div><div class='del'>-	d(fprintf (stderr, "sending : *\n"));</div><div class='del'>-	camel_stream_write (transport-&gt;ostream, "*\r\n", 3);</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-	</div><div class='del'>- lose:</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				     _("Bad authentication response from server.\n"));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (sasl));</div><div class='del'>-	camel_operation_end (NULL);</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_mail (CamelSmtpTransport *transport, const char *sender, gboolean has_8bit_parts, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we gotta tell the smtp server who we are. (our email addy) */</div><div class='del'>-	char *cmdbuf, *respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	if (transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_8BITMIME &amp;&amp; has_8bit_parts)</div><div class='del'>-		cmdbuf = g_strdup_printf ("MAIL FROM:&lt;%s&gt; BODY=8BITMIME\r\n", sender);</div><div class='del'>-	else</div><div class='del'>-		cmdbuf = g_strdup_printf ("MAIL FROM:&lt;%s&gt;\r\n", sender);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("MAIL FROM request timed out: %s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250 Sender OK..." */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			smtp_set_exception (transport, respbuf, _("MAIL FROM response error"), ex);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we gotta tell the smtp server who we are going to be sending</div><div class='del'>-	 * our email to */</div><div class='del'>-	char *cmdbuf, *respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	cmdbuf = g_strdup_printf ("RCPT TO:&lt;%s&gt;\r\n", recipient);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("RCPT TO request timed out: %s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250 Recipient OK..." */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			char *message;</div><div class='del'>-			</div><div class='del'>-			message = g_strdup_printf (_("RCPT TO &lt;%s&gt; failed"), recipient);</div><div class='del'>-			smtp_set_exception (transport, respbuf, message, ex);</div><div class='del'>-			g_free (message);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message, gboolean has_8bit_parts, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* now we can actually send what's important :p */</div><div class='del'>-	char *cmdbuf, *respbuf = NULL;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlffilter;</div><div class='del'>-	struct _header_raw *header;</div><div class='del'>-	GSList *h, *bcc = NULL;</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	/* if the message contains 8bit mime parts and the server</div><div class='del'>-           doesn't support it, encode 8bit parts to the best</div><div class='del'>-           encoding.  This will also enforce an encoding to keep the lines in limit */</div><div class='del'>-	if (has_8bit_parts &amp;&amp; !(transport-&gt;flags &amp; CAMEL_SMTP_TRANSPORT_8BITMIME))</div><div class='del'>-		camel_mime_message_encode_8bit_parts (message);</div><div class='del'>-	</div><div class='del'>-	cmdbuf = g_strdup ("DATA\r\n");</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("DATA request timed out: %s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-	</div><div class='del'>-	if (!respbuf || strncmp (respbuf, "354", 3)) {</div><div class='del'>-		/* we should have gotten instructions on how to use the DATA command:</div><div class='del'>-		 * 354 Enter mail, end with "." on a line by itself</div><div class='del'>-		 */</div><div class='del'>-		smtp_set_exception (transport, respbuf, _("DATA response error"), ex);</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	/* setup stream filtering */</div><div class='del'>-	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (transport-&gt;ostream);</div><div class='del'>-	camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlffilter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlffilter));</div><div class='del'>-	</div><div class='del'>-	/* copy and remove the bcc headers */</div><div class='del'>-	header = CAMEL_MIME_PART (message)-&gt;headers;</div><div class='del'>-	while (header) {</div><div class='del'>-		if (!g_strcasecmp (header-&gt;name, "Bcc"))</div><div class='del'>-			bcc = g_slist_append (bcc, g_strdup (header-&gt;value));</div><div class='del'>-		header = header-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_medium_remove_header (CAMEL_MEDIUM (message), "Bcc");</div><div class='del'>-	</div><div class='del'>-	/* write the message */</div><div class='del'>-	ret = camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	/* add the bcc headers back */</div><div class='del'>-	if (bcc) {</div><div class='del'>-		h = bcc;</div><div class='del'>-		while (h) {</div><div class='del'>-			camel_medium_add_header (CAMEL_MEDIUM (message), "Bcc", h-&gt;data);</div><div class='del'>-			g_free (h-&gt;data);</div><div class='del'>-			h = h-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_slist_free (bcc);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ret == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("DATA send timed out: message termination: "</div><div class='del'>-					"%s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-		</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_stream_flush (CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	/* terminate the message body */</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : \\r\\n.\\r\\n\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, "\r\n.\r\n", 5) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("DATA send timed out: message termination: "</div><div class='del'>-					"%s: mail not sent"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250 Sender OK..." */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			smtp_set_exception (transport, respbuf, _("DATA termination response error"), ex);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_rset (CamelSmtpTransport *transport, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we are going to reset the smtp server (just to be nice) */</div><div class='del'>-	char *cmdbuf, *respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	cmdbuf = g_strdup ("RSET\r\n");</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("RSET request timed out: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			smtp_set_exception (transport, respbuf, _("RSET response error"), ex);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "250-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-smtp_quit (CamelSmtpTransport *transport, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we are going to reset the smtp server (just to be nice) */</div><div class='del'>-	char *cmdbuf, *respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	cmdbuf = g_strdup ("QUIT\r\n");</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("QUIT request timed out: %s: non-fatal"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "221" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "221", 3)) {</div><div class='del'>-			smtp_set_exception (transport, respbuf, _("QUIT response error"), ex);</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} while (*(respbuf+3) == '-'); /* if we got "221-" then loop again */</div><div class='del'>-	g_free (respbuf);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h<br/>deleted file mode 100644<br/>index 907906c82b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/camel-smtp-transport.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-smtp-transport.h : class for an smtp transfer */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Jeffrey Stedfast &lt;fejj@stampede.org&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_SMTP_TRANSPORT_H</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include "camel-transport.h"</div><div class='del'>-#include "camel-tcp-stream.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_TYPE     (camel_smtp_transport_get_type ())</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))</div><div class='del'>-#define CAMEL_IS_SMTP_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SMTP_TRANSPORT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_IS_ESMTP               (1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_8BITMIME               (1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_ENHANCEDSTATUSCODES    (1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_STARTTLS               (1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_USE_SSL_ALWAYS         (1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_USE_SSL_WHEN_POSSIBLE  (1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_USE_SSL                (CAMEL_SMTP_TRANSPORT_USE_SSL_ALWAYS | \</div><div class='del'>-						     CAMEL_SMTP_TRANSPORT_USE_SSL_WHEN_POSSIBLE)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransport parent_object;</div><div class='del'>-	</div><div class='del'>-	CamelStream *istream, *ostream;</div><div class='del'>-	</div><div class='del'>-	guint32 flags;</div><div class='del'>-	</div><div class='del'>-	CamelTcpAddress *localaddr;</div><div class='del'>-	</div><div class='del'>-	GHashTable *authtypes;</div><div class='del'>-	</div><div class='del'>-} CamelSmtpTransport;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransportClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSmtpTransportClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_smtp_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SMTP_TRANSPORT_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/smtp/libcamelsmtp.urls b/camel/providers/smtp/libcamelsmtp.urls<br/>deleted file mode 100644<br/>index ec2fc0fc16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/libcamelsmtp.urls?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/providers/smtp/libcamelsmtp.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-smtp</div><div class='head'>diff --git a/camel/string-utils.c b/camel/string-utils.c<br/>deleted file mode 100644<br/>index 1e2fa103ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/string-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,232 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* string-util : utilities for gchar* strings  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "string.h"</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-string_equal_for_glist (gconstpointer v, gconstpointer v2)</div><div class='del'>-{</div><div class='del'>-	return (!strcmp ( ((const gchar *)v), ((const gchar*)v2))) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* utility func : frees a gchar element in a GList */</div><div class='del'>-static void </div><div class='del'>-__string_list_free_string (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	gchar *string = (gchar *)data;</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-string_list_free (GList *string_list)</div><div class='del'>-{</div><div class='del'>-	if (string_list == NULL) return; </div><div class='del'>-</div><div class='del'>-	g_list_foreach (string_list, __string_list_free_string, NULL);</div><div class='del'>-	g_list_free (string_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-string_split (const gchar *string, char sep, const gchar *trim_chars, StringTrimOption trim_options)</div><div class='del'>-{</div><div class='del'>-	GList *result = NULL;</div><div class='del'>-	gint first, last, pos;</div><div class='del'>-	gchar *new_string;</div><div class='del'>-</div><div class='del'>-	g_assert (string);</div><div class='del'>-	</div><div class='del'>-	first = 0;</div><div class='del'>-	last = strlen(string) - 1;</div><div class='del'>-	</div><div class='del'>-	/* strip leading and trailing separators */</div><div class='del'>-	while ( (first&lt;=last) &amp;&amp; (string[first]==sep) )</div><div class='del'>-		first++;</div><div class='del'>-	while ( (first&lt;=last) &amp;&amp; (string[last]==sep) )</div><div class='del'>-		last--;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	while (first&lt;=last)  {</div><div class='del'>-		pos = first;</div><div class='del'>-		/* find next separator */</div><div class='del'>-		while ((pos&lt;=last) &amp;&amp; (string[pos]!=sep)) pos++;</div><div class='del'>-		if (first != pos) {</div><div class='del'>-			new_string = g_strndup (string+first, pos-first);</div><div class='del'>-			/* could do trimming in line to speed up this code */</div><div class='del'>-			if (trim_chars) string_trim (new_string, trim_chars, trim_options);</div><div class='del'>-			result = g_list_append (result, new_string);</div><div class='del'>-		}	</div><div class='del'>-		first = pos + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-string_trim (gchar *string, const gchar *trim_chars, StringTrimOption options)</div><div class='del'>-{</div><div class='del'>-	gint first_ok;</div><div class='del'>-	gint last_ok;</div><div class='del'>-	guint length;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (string);</div><div class='del'>-	length = strlen (string);</div><div class='del'>-	if (length==0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	first_ok = 0;</div><div class='del'>-	last_ok = length - 1;</div><div class='del'>-</div><div class='del'>-	if (options &amp; STRING_TRIM_STRIP_LEADING)</div><div class='del'>-		while  ( (first_ok &lt;= last_ok) &amp;&amp; (strchr (trim_chars, string[first_ok])!=NULL) )</div><div class='del'>-			first_ok++;</div><div class='del'>-	</div><div class='del'>-	if (options &amp; STRING_TRIM_STRIP_TRAILING)</div><div class='del'>-		while  ( (first_ok &lt;= last_ok) &amp;&amp; (strchr (trim_chars, string[last_ok])!=NULL) )</div><div class='del'>-			last_ok--;</div><div class='del'>-	</div><div class='del'>-	if (first_ok &gt; 0)</div><div class='del'>-		memmove (string, string+first_ok, last_ok - first_ok + 1);</div><div class='del'>-	string[last_ok - first_ok +1] = '\0';</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * remove_suffix: remove a suffix from a string</div><div class='del'>- * @s: the string to remove the suffix from. </div><div class='del'>- * @suffix: the suffix to remove</div><div class='del'>- * @suffix_found : suffix found flag</div><div class='del'>- *</div><div class='del'>- * Remove a suffix from a string. If the </div><div class='del'>- * string ends with the full suffix, a copy </div><div class='del'>- * of the string without the suffix is returned and</div><div class='del'>- * @suffix_found is set to %TRUE. </div><div class='del'>- * Otherwise, NULL is returned and</div><div class='del'>- * @suffix_found is set to %FALSE. </div><div class='del'>- * </div><div class='del'>- * Return value: an allocated copy of the string without the suffix or NULL if the suffix was not found.</div><div class='del'>- **/</div><div class='del'>-gchar *</div><div class='del'>-string_prefix (const gchar *s, const gchar *suffix, gboolean *suffix_found)</div><div class='del'>-{</div><div class='del'>-	guint s_len, suf_len;</div><div class='del'>-	guint suffix_pos;</div><div class='del'>-	char *result_string;</div><div class='del'>-</div><div class='del'>-	g_assert (s);</div><div class='del'>-	g_assert (suffix);</div><div class='del'>-	g_assert (suffix_found);</div><div class='del'>-</div><div class='del'>-	s_len = strlen (s);</div><div class='del'>-	suf_len = strlen (suffix);</div><div class='del'>-</div><div class='del'>-	/* if the string is shorter than the suffix, do nothing */</div><div class='del'>-	if (s_len &lt; suf_len) {</div><div class='del'>-		*suffix_found = FALSE;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* theoretical position of the prefix */</div><div class='del'>-	suffix_pos = s_len - suf_len;</div><div class='del'>-</div><div class='del'>-	/* compare the right hand side of the string with the suffix */</div><div class='del'>-	if (!strncmp (s+suffix_pos, suffix, suf_len)) {</div><div class='del'>-</div><div class='del'>-		/* if the suffix matches, check that there are </div><div class='del'>-		   characters before */</div><div class='del'>-		if (suffix_pos == 0) {</div><div class='del'>-			result_string = NULL;</div><div class='del'>-			*suffix_found = TRUE;</div><div class='del'>-		} else { </div><div class='del'>-			result_string = g_strndup (s, suffix_pos);</div><div class='del'>-			*suffix_found = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} else { </div><div class='del'>-		result_string = NULL;</div><div class='del'>-		*suffix_found = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return result_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-string_unquote (gchar *string)</div><div class='del'>-{</div><div class='del'>-	/* if the string is quoted, unquote it */</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (string != NULL);</div><div class='del'>-	</div><div class='del'>-	if (*string == '"' &amp;&amp; *(string + strlen (string) - 1) == '"') {</div><div class='del'>-		*(string + strlen (string) - 1) = '\0';</div><div class='del'>-		if (*string)</div><div class='del'>-			memmove (string, string+1, strlen (string));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-strip (gchar *string, gchar c)</div><div class='del'>-{</div><div class='del'>-	/* strip all occurances of c from the string */</div><div class='del'>-	gchar *src, *dst;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (string != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	for (src = dst = string; *src; src++)</div><div class='del'>-		if (*src != c)</div><div class='del'>-			*dst++ = *src;</div><div class='del'>-	*dst = '\0';</div><div class='del'>-	</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-strstrcase (const char *haystack, const char *needle)</div><div class='del'>-{</div><div class='del'>-	/* find the needle in the haystack neglecting case */</div><div class='del'>-	const char *ptr;</div><div class='del'>-	guint len;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (haystack != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (needle != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	len = strlen (needle);</div><div class='del'>-	if (len &gt; strlen (haystack))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return (char *) haystack;</div><div class='del'>-	</div><div class='del'>-	for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)</div><div class='del'>-		if (!g_strncasecmp (ptr, needle, len))</div><div class='del'>-			return (char *) ptr;</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/string-utils.h b/camel/string-utils.h<br/>deleted file mode 100644<br/>index 0402eb15ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/string-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* string-util : utilities for normal gchar * strings  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef STRING_UTIL_H</div><div class='del'>-#define STRING_UTIL_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	STRING_TRIM_NONE            =     0,</div><div class='del'>-	STRING_TRIM_STRIP_TRAILING  =     1,</div><div class='del'>-	STRING_TRIM_STRIP_LEADING   =     2</div><div class='del'>-} StringTrimOption;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean string_equal_for_glist (gconstpointer v, gconstpointer v2);</div><div class='del'>-</div><div class='del'>-void     string_list_free       (GList *string_list);</div><div class='del'>-</div><div class='del'>-GList   *string_split           (const gchar *string, char sep,</div><div class='del'>-				 const gchar *trim_chars, StringTrimOption trim_options);</div><div class='del'>-void     string_trim            (gchar *string, const gchar *chars,</div><div class='del'>-				 StringTrimOption options);</div><div class='del'>-</div><div class='del'>-gchar   *string_prefix          (const gchar *s, const gchar *suffix,</div><div class='del'>-				 gboolean *suffix_found);</div><div class='del'>-</div><div class='del'>-void    string_unquote          (gchar *string);</div><div class='del'>-</div><div class='del'>-gchar   *strip                  (gchar *string, gchar c);</div><div class='del'>-</div><div class='del'>-char    *strstrcase             (const char *haystack, const char *needle);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* STRING_UTIL_H */</div><div class='head'>diff --git a/camel/tests/.cvsignore b/camel/tests/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/camel/tests/Makefile.am b/camel/tests/Makefile.am<br/>deleted file mode 100644<br/>index e32f2e455f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-</div><div class='del'>-SUBDIRS = lib \</div><div class='del'>-	message folder stream smime misc mime-filter</div><div class='head'>diff --git a/camel/tests/README b/camel/tests/README<br/>deleted file mode 100644<br/>index 6815330102..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-</div><div class='del'>-This directory is to contain regression tests that should be run</div><div class='del'>-before committing anything to camel.</div><div class='del'>-</div><div class='del'>-In each subdirectory of tests there is a README containing a</div><div class='del'>-one-line description of each test file.  This README must be kept</div><div class='del'>-uptodate.</div><div class='del'>-</div><div class='del'>-To write a new test: copy an existing one and replace the contents.</div><div class='del'>-</div><div class='del'>-See camel-test.h for a number of functions and macros which setup and</div><div class='del'>-define the test environmet, and help provide meaningful messages when</div><div class='del'>-something actually fails.</div><div class='del'>-</div><div class='del'>-All tests have the following options:</div><div class='del'>- -v[vvvv]</div><div class='del'>-	verbose.  more v's more verbose.  2 v's will give you</div><div class='del'>-	a simple test backtrace of any partially failed tests.</div><div class='del'>-	No v's give you a simple backtrace of any failed tests.</div><div class='del'>- -q</div><div class='del'>-	quiet.  Dont print anything, unless there is a SEGV.</div><div class='del'>-</div><div class='del'>-See the other files in lib/* for utility functions that help to</div><div class='del'>-write the tests (object comparison, creation, etc functions).</div><div class='del'>-</div><div class='del'>-Tests may fail and be non-fatal.  In this case, you will see "Partial</div><div class='del'>-success" on the result of each test line.  To get more information</div><div class='del'>-about the test, run the test manually with a -v command line argument.</div><div class='del'>-The more v's you have the more detail you get (upto about -vvvvv),</div><div class='del'>-generally use -vv to find out which parts of a partially successful</div><div class='del'>-test failed, and where.</div><div class='del'>-</div><div class='del'>-Note that if writing tests, non-fatal tests (bracketed by a</div><div class='del'>-camel_test_nonfatal() and camel_test_fatal() pair) should only be</div><div class='del'>-defined where: 1. The test in question should ideally pass, and 2. The</div><div class='del'>-code has known limitations currently that stop it passing, but</div><div class='del'>-otherwise works for nominal input.</div><div class='del'>-</div><div class='del'>-To debug tests, set a breakpoint on camel_test_fail, which will be</div><div class='del'>-called for any failure, even a non-fatal one.  Or set it to</div><div class='del'>-camel_test_break, which will only be called for fatal errors which are</div><div class='del'>-to print to the screen.</div><div class='del'>-</div><div class='del'>- Michael &lt;notzed@helixcode.com&gt;</div><div class='head'>diff --git a/camel/tests/data/gendoc.pl b/camel/tests/data/gendoc.pl<br/>deleted file mode 100755<br/>index 732f05a4ed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/data/gendoc.pl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/data/gendoc.pl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-#!/usr/bin/perl</div><div class='del'>-</div><div class='del'>-# Generate 'documents' in different encodings, from po files</div><div class='del'>-</div><div class='del'>-if ($#ARGV &lt; 0) {</div><div class='del'>-    print "Usage: gendoc.pl pofile pofile ...\n";</div><div class='del'>-    exit 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$fmt = "| fmt -u ";</div><div class='del'>-</div><div class='del'>-sub read_msgstr()</div><div class='del'>-{</div><div class='del'>-    my $str = "";</div><div class='del'>-    while (&lt;IN&gt;) {</div><div class='del'>-	if (m/^msgstr \"(.*)\"/) {</div><div class='del'>-	    $str = $1;</div><div class='del'>-	    if ($str eq "") {</div><div class='del'>-		while (&lt;IN&gt;) {</div><div class='del'>-		    if (m/\"(.*)\"/) {</div><div class='del'>-			$str .= $1;</div><div class='del'>-		    } else {</div><div class='del'>-			last;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	    return $str;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$unknown = "x-unknown-1";</div><div class='del'>-</div><div class='del'>-foreach $name (@ARGV) {</div><div class='del'>-    if ($name =~ m@([^/]*).po$@) {</div><div class='del'>-	$poname = $1;</div><div class='del'>-	    </div><div class='del'>-	open IN,"&lt;$name";</div><div class='del'>-</div><div class='del'>-	$header = read_msgstr;</div><div class='del'>-	if ($header =~ /Content-Type:.*charset=([-a-zA-Z0-9]*)/i) {</div><div class='del'>-	    $charset = $1;</div><div class='del'>-	} else {</div><div class='del'>-	    $charset = $unknown++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	print "Building $poname.$charset.txt from $name\n";</div><div class='del'>-</div><div class='del'>-	open OUT,"$fmt &gt; $poname.$charset.txt";</div><div class='del'>-	while (!eof(IN)) {</div><div class='del'>-	    $msg = read_msgstr;</div><div class='del'>-	    # de-escape</div><div class='del'>-	    $msg =~ s/\\n/\n/gso;</div><div class='del'>-	    $msg =~ s/\\t/\t/gso;</div><div class='del'>-	    $msg =~ s/\\(.)/$1/gso;</div><div class='del'>-	    print OUT $msg." ";</div><div class='del'>-	}</div><div class='del'>-	close OUT;</div><div class='del'>-	close IN;</div><div class='del'>-    } else {</div><div class='del'>-	printf("ignoring $name, probably not intended\n");</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/data/genline.pl b/camel/tests/data/genline.pl<br/>deleted file mode 100755<br/>index 99ff43c882..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/data/genline.pl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/data/genline.pl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-#!/usr/bin/perl</div><div class='del'>-</div><div class='del'>-# Generate 'documents' in different encodings, from po files</div><div class='del'>-</div><div class='del'>-if ($#ARGV &lt; 0) {</div><div class='del'>-    print "Usage: genline.pl pofile pofile ...\n";</div><div class='del'>-    exit 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-sub read_msgstr()</div><div class='del'>-{</div><div class='del'>-    my $str = "";</div><div class='del'>-    while (&lt;IN&gt;) {</div><div class='del'>-	if (m/^msgstr \"(.*)\"/) {</div><div class='del'>-	    $str = $1;</div><div class='del'>-	    if ($str eq "") {</div><div class='del'>-		while (&lt;IN&gt;) {</div><div class='del'>-		    if (m/\"(.*)\"/) {</div><div class='del'>-			$str .= $1;</div><div class='del'>-		    } else {</div><div class='del'>-			last;</div><div class='del'>-		    }</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	    return $str;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-$unknown = "x-unknown-1";</div><div class='del'>-open OUT, "&gt;test-lines.h";</div><div class='del'>-</div><div class='del'>-print OUT &lt;&lt;END;</div><div class='del'>-struct _l {</div><div class='del'>-    char *type;</div><div class='del'>-    char *line;</div><div class='del'>-} test_lines[] = {</div><div class='del'>-END</div><div class='del'>-</div><div class='del'>-foreach $name (@ARGV) {</div><div class='del'>-    if ($name =~ m@([^/]*).po$@) {</div><div class='del'>-	$poname = $1;</div><div class='del'>-	    </div><div class='del'>-	open IN,"&lt;$name";</div><div class='del'>-</div><div class='del'>-	$header = read_msgstr;</div><div class='del'>-	if ($header =~ /Content-Type:.*charset=([-a-zA-Z0-9]*)/i) {</div><div class='del'>-	    $charset = $1;</div><div class='del'>-	} else {</div><div class='del'>-	    $charset = $unknown++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!eof(IN)) {</div><div class='del'>-	    $msg = read_msgstr;</div><div class='del'>-	    if (length($msg) &gt; 60 &amp;&amp; length($msg) &lt; 160) {</div><div class='del'>-		print OUT "\t{ \"$charset\", \"$msg\" },\n";</div><div class='del'>-		last;</div><div class='del'>-	    }</div><div class='del'>-#	    $msg =~ s/\\n/\n/gso;</div><div class='del'>-#	    $msg =~ s/\\t/\t/gso;</div><div class='del'>-#	    $msg =~ s/\\(.)/$1/gso;</div><div class='del'>-#	    print OUT $msg." ";</div><div class='del'>-	}</div><div class='del'>-	close IN;</div><div class='del'>-    } else {</div><div class='del'>-	printf("ignoring $name, probably not intended\n");</div><div class='del'>-    }</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-print OUT "};\n";</div><div class='del'>-close OUT;</div><div class='head'>diff --git a/camel/tests/data/getaddr.pl b/camel/tests/data/getaddr.pl<br/>deleted file mode 100755<br/>index 74a8a81f74..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/data/getaddr.pl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/data/getaddr.pl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-#!/usr/bin/perl</div><div class='del'>-</div><div class='del'>-# get addresses out of messages</div><div class='del'>-</div><div class='del'>-if ($#ARGV &lt; 0) {</div><div class='del'>-    print "Usage: $0 message(s) mbox(es)\n";</div><div class='del'>-    exit 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-foreach $name (@ARGV) {</div><div class='del'>-    open IN,"&lt;$name";</div><div class='del'>-    while (&lt;IN&gt;) {</div><div class='del'>-	if (/^From: (.*)/i</div><div class='del'>-	    || /^To: (.*)/i</div><div class='del'>-	    || /^Cc: (.*)/i) {</div><div class='del'>-	    $base = $1;</div><div class='del'>-	    while (&lt;IN&gt;) {</div><div class='del'>-		if (/^\s+(.*)/) {</div><div class='del'>-		    $base .= " ".$1;</div><div class='del'>-		} else {</div><div class='del'>-		    last;</div><div class='del'>-		}</div><div class='del'>-	    }</div><div class='del'>-	    $uniq{$base} = 1;</div><div class='del'>-	}</div><div class='del'>-    }</div><div class='del'>-    close IN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-foreach $key (sort keys %uniq) {</div><div class='del'>-    print $key."\n";</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/.cvsignore b/camel/tests/folder/.cvsignore<br/>deleted file mode 100644<br/>index 26eaf2f7e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-temp-test</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='del'>-test1</div><div class='del'>-test2</div><div class='del'>-test3</div><div class='del'>-test4</div><div class='del'>-test5</div><div class='del'>-test6</div><div class='del'>-test7</div><div class='del'>-test8</div><div class='del'>-test9</div><div class='head'>diff --git a/camel/tests/folder/Makefile.am b/camel/tests/folder/Makefile.am<br/>deleted file mode 100644<br/>index 143fd7f4ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\"	</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  	\</div><div class='del'>-	test1	test4	test5	\</div><div class='del'>-	test2	test6	test7	\</div><div class='del'>-	test3			\</div><div class='del'>-	test8			\</div><div class='del'>-	test9</div><div class='del'>-</div><div class='del'>-TESTS = test1 test4 test5 \</div><div class='del'>-	test2 test6 test7 \</div><div class='del'>-	test3		  \</div><div class='del'>-	test8		  \</div><div class='del'>-	test9</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/folder/README b/camel/tests/folder/README<br/>deleted file mode 100644<br/>index 4fed421413..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-</div><div class='del'>-test1	camel store folder operations (local only)</div><div class='del'>-test2	basic folder operations, local</div><div class='del'>-test3	folder searching and indexing, local</div><div class='del'>-test4	camel store folder operations, IMAP</div><div class='del'>-test5	camel store folder operations, NNTP</div><div class='del'>-test6	basic folder operations, IMAP</div><div class='del'>-test7	basic folder operations, NNTP</div><div class='del'>-</div><div class='del'>-test8	multithreaded folder torture test, local</div><div class='del'>-test9	filtering</div><div class='head'>diff --git a/camel/tests/folder/test1.c b/camel/tests/folder/test1.c<br/>deleted file mode 100644<br/>index c1d3809852..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test1.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test1.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-/* store testing */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *local_providers[] = {</div><div class='del'>-	"mbox",</div><div class='del'>-	"mh",</div><div class='del'>-	"maildir"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-	/* todo: subscriptions? */</div><div class='del'>-	/* todo: work out how to do imap/pop/nntp tests */</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(local_providers);i++) {</div><div class='del'>-		path = g_strdup_printf("%s:///tmp/camel-test/%s", local_providers[i], local_providers[i]);</div><div class='del'>-</div><div class='del'>-		test_folder_basic(session, path, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-		g_free(path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)session);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test2.c b/camel/tests/folder/test2.c<br/>deleted file mode 100644<br/>index 50a89f89e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test2.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* folder testing */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *stores[] = {</div><div class='del'>-	"mbox:///tmp/camel-test/mbox",</div><div class='del'>-	"mh:///tmp/camel-test/mh",</div><div class='del'>-	"maildir:///tmp/camel-test/maildir"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* we iterate over all stores we want to test, with indexing or indexing turned on or off */</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(stores);i++) {</div><div class='del'>-		char *name = stores[i];</div><div class='del'>-</div><div class='del'>-		test_folder_message_ops(session, name, TRUE, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create a pseudo-spool file, and check that */</div><div class='del'>-	creat("/tmp/camel-test/testbox", 0600);</div><div class='del'>-	test_folder_message_ops(session, "spool:///tmp/camel-test/testbox", FALSE, TRUE);</div><div class='del'>-</div><div class='del'>-	check_unref(session, 1);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test3.c b/camel/tests/folder/test3.c<br/>deleted file mode 100644<br/>index dc2946956f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test3.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,335 +0,0 @@</div><div class='del'>-/* folder/index testing */</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_folder_search_sub(CamelFolder *folder, const char *expr, int expected)</div><div class='del'>-{</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uids = camel_folder_search_by_expression(folder, expr, ex);</div><div class='del'>-	check(uids != NULL);</div><div class='del'>-	check_msg(uids-&gt;len == expected, "search %s expected %d got %d", expr, expected, uids-&gt;len);</div><div class='del'>-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-	/* check the uid's are actually unique, too */</div><div class='del'>-	hash = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		check(g_hash_table_lookup(hash, uids-&gt;pdata[i]) == NULL);</div><div class='del'>-		g_hash_table_insert(hash, uids-&gt;pdata[i], uids-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(hash);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free(folder, uids);</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_folder_search(CamelFolder *folder, const char *expr, int expected)</div><div class='del'>-{</div><div class='del'>-	char *matchall;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: ??? */</div><div class='del'>-	camel_test_nonfatal("most searches require match-all construct");</div><div class='del'>-	push("Testing search: %s", expr);</div><div class='del'>-	test_folder_search_sub(folder, expr, expected);</div><div class='del'>-	pull();</div><div class='del'>-	camel_test_fatal();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	matchall = g_strdup_printf("(match-all %s)", expr);</div><div class='del'>-	push("Testing search: %s", matchall);</div><div class='del'>-	test_folder_search_sub(folder, matchall, expected);</div><div class='del'>-	test_free(matchall);</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	int counts[3];</div><div class='del'>-	char *expr;</div><div class='del'>-} searches[] = {</div><div class='del'>-	{ { 1, 1, 0 }, "(header-matches \"subject\" \"Test1 message99 subject\")" },</div><div class='del'>-	</div><div class='del'>-	{ { 100, 50, 0 }, "(header-contains \"subject\" \"subject\")" },</div><div class='del'>-	{ { 0, 0, 0 }, "(header-contains \"subject\" \"Subject\")" },</div><div class='del'>-</div><div class='del'>-	{ { 100, 50, 0 }, "(body-contains \"content\")" },</div><div class='del'>-	{ { 100, 50, 0 }, "(body-contains \"Content\")" },</div><div class='del'>-</div><div class='del'>-	{ { 0, 0, 0 }, "(user-flag \"every7\")" },</div><div class='del'>-	{ { 100/13+1, 50/13+1, 0 }, "(user-flag \"every13\")" },</div><div class='del'>-	{ { 1, 1, 0 }, "(= \"7tag1\" (user-tag \"every7\"))" },</div><div class='del'>-	{ { 100/11+1, 50/11+1, 0 }, "(= \"11tag\" (user-tag \"every11\"))" },</div><div class='del'>-	</div><div class='del'>-	{ { 100/13 + 100/17 + 1, 50/13 + 50/17 + 2, 0 }, "(user-flag \"every13\" \"every17\")" },</div><div class='del'>-	{ { 100/13 + 100/17 + 1, 50/13 + 50/17 + 2, 0 }, "(or (user-flag \"every13\") (user-flag \"every17\"))" },</div><div class='del'>-	{ { 1, 0, 0 }, "(and (user-flag \"every13\") (user-flag \"every17\"))" },</div><div class='del'>-	</div><div class='del'>-	{ { 0, 0, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"Test2\"))" },</div><div class='del'>-	/* we get 11 here as the header-contains is a substring match */</div><div class='del'>-	{ { 11, 6, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))" },</div><div class='del'>-	{ { 1, 1, 0 }, "(and (header-contains \"subject\" \"Test19\") (header-contains \"subject\" \"subject\"))" },</div><div class='del'>-	{ { 0, 0, 0 }, "(and (header-contains \"subject\" \"Test191\") (header-contains \"subject\" \"subject\"))" },</div><div class='del'>-	{ { 1, 1, 0 }, "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"message99\"))" },</div><div class='del'>-	</div><div class='del'>-	{ { 22, 11, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"Test2\"))" },</div><div class='del'>-	{ { 2, 1, 0 }, "(or (header-contains \"subject\" \"Test16\") (header-contains \"subject\" \"Test99\"))" },</div><div class='del'>-	{ { 1, 1, 0 }, "(or (header-contains \"subject\" \"Test123\") (header-contains \"subject\" \"Test99\"))" },</div><div class='del'>-	{ { 100, 50, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))" },</div><div class='del'>-	{ { 11, 6, 0 }, "(or (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"message99\"))" },</div><div class='del'>-	</div><div class='del'>-	/* 72000 is 24*60*100 == half the 'sent date' of the messages */</div><div class='del'>-	{ { 100/2, 50/2, 0 }, "(&gt; 72000 (get-sent-date))" },</div><div class='del'>-	{ { 100/2-1, 50/2, 0 }, "(&lt; 72000 (get-sent-date))" },</div><div class='del'>-	{ { 1, 0, 0 }, "(= 72000 (get-sent-date))" },</div><div class='del'>-	{ { 0, 0, 0 }, "(= 72001 (get-sent-date))" },</div><div class='del'>-	</div><div class='del'>- 	{ { (100/2-1)/17+1, (50/2-1)/17+1, 0 }, "(and (user-flag \"every17\") (&lt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { (100/2-1)/17+1, (50/2-1)/17, 0 }, "(and (user-flag \"every17\") (&gt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { (100/2-1)/13+1, (50/2-1)/13+1, 0 }, "(and (user-flag \"every13\") (&lt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { (100/2-1)/13+1, (50/2-1)/13+1, 0 }, "(and (user-flag \"every13\") (&gt; 72000 (get-sent-date)))" },</div><div class='del'>-	</div><div class='del'>-	{ { 100/2+100/2/17, 50/2+50/2/17, 0 }, "(or (user-flag \"every17\") (&lt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { 100/2+100/2/17+1, 50/2+50/2/17+1, 0 }, "(or (user-flag \"every17\") (&gt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { 100/2+100/2/13, 50/2+50/2/13+1, 0 }, "(or (user-flag \"every13\") (&lt; 72000 (get-sent-date)))" },</div><div class='del'>-	{ { 100/2+100/2/13+1, 50/2+50/2/13+1, 0 }, "(or (user-flag \"every13\") (&gt; 72000 (get-sent-date)))" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-run_search(CamelFolder *folder, int m)</div><div class='del'>-{</div><div class='del'>-	int i, j = 0;</div><div class='del'>-</div><div class='del'>-	check(m == 50 || m == 100 || m == 0);</div><div class='del'>-</div><div class='del'>-	/* *shrug* messy, but it'll do */</div><div class='del'>-	if (m==50)</div><div class='del'>-		j = 1;</div><div class='del'>-	else if (m==0)</div><div class='del'>-		j = 2;</div><div class='del'>-</div><div class='del'>-	push("performing searches, expected %d", m);</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(searches);i++) {</div><div class='del'>-		push("running search %d: %s", i, searches[i].expr);</div><div class='del'>-		test_folder_search(folder, searches[i].expr, searches[i].counts[j]);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *stores[] = {</div><div class='del'>-	"mbox:///tmp/camel-test/mbox",</div><div class='del'>-	"mh:///tmp/camel-test/mh",</div><div class='del'>-	"maildir:///tmp/camel-test/maildir"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	int i, j;</div><div class='del'>-	int indexed;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-</div><div class='del'>-	gtk_init(&amp;argc, &amp;argv);</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-	/* todo: work out how to do imap/pop/nntp tests */</div><div class='del'>-</div><div class='del'>-	/* we iterate over all stores we want to test, with indexing or indexing turned on or off */</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(stores);i++) {</div><div class='del'>-		char *name = stores[i];</div><div class='del'>-		for (indexed = 0;indexed&lt;2;indexed++) {</div><div class='del'>-			char *what = g_strdup_printf("folder search: %s (%sindexed)", name, indexed?"":"non-");</div><div class='del'>-			int flags;</div><div class='del'>-</div><div class='del'>-			camel_test_start(what);</div><div class='del'>-			test_free(what);</div><div class='del'>-</div><div class='del'>-			push("getting store");</div><div class='del'>-			store = camel_session_get_store(session, stores[i], ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));</div><div class='del'>-			check(store != NULL);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("creating %sindexed folder", indexed?"":"non-");</div><div class='del'>-			if (indexed)</div><div class='del'>-				flags = CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX;</div><div class='del'>-			else</div><div class='del'>-				flags = CAMEL_STORE_FOLDER_CREATE;</div><div class='del'>-			folder = camel_store_get_folder(store, "testbox", flags, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			check(folder != NULL);</div><div class='del'>-</div><div class='del'>-			/* we need an empty folder for this to work */</div><div class='del'>-			test_folder_counts(folder, 0, 0);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			/* append a bunch of messages with specific content */</div><div class='del'>-			push("appending 100 test messages");</div><div class='del'>-			for (j=0;j&lt;100;j++) {</div><div class='del'>-				char *content, *subject;</div><div class='del'>-</div><div class='del'>-				push("creating test message");</div><div class='del'>-				msg = test_message_create_simple();</div><div class='del'>-				content = g_strdup_printf("data%d content\n", j);</div><div class='del'>-				test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",</div><div class='del'>-								content, strlen(content));</div><div class='del'>-				test_free(content);</div><div class='del'>-				subject = g_strdup_printf("Test%d message%d subject", j, 100-j);</div><div class='del'>-				camel_mime_message_set_subject(msg, subject);</div><div class='del'>-</div><div class='del'>-				camel_mime_message_set_date(msg, j*60*24, 0);</div><div class='del'>-				pull();</div><div class='del'>-</div><div class='del'>-				push("appending simple message %d", j);</div><div class='del'>-				camel_folder_append_message(folder, msg, NULL, ex);</div><div class='del'>-				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-				pull();</div><div class='del'>-</div><div class='del'>-				test_free(subject);</div><div class='del'>-</div><div class='del'>-				check_unref(msg, 1);</div><div class='del'>-			}</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("Setting up some flags &amp;c");</div><div class='del'>-			uids = camel_folder_get_uids(folder);</div><div class='del'>-			check(uids-&gt;len == 100);</div><div class='del'>-			for (j=0;j&lt;100;j++) {</div><div class='del'>-				char *uid = uids-&gt;pdata[j];</div><div class='del'>-</div><div class='del'>-				if ((j/13)*13 == j) {</div><div class='del'>-					camel_folder_set_message_user_flag(folder, uid, "every13", TRUE);</div><div class='del'>-				}</div><div class='del'>-				if ((j/17)*17 == j) {</div><div class='del'>-					camel_folder_set_message_user_flag(folder, uid, "every17", TRUE);</div><div class='del'>-				}</div><div class='del'>-				if ((j/7)*7 == j) {</div><div class='del'>-					char *tag = g_strdup_printf("7tag%d", j/7);</div><div class='del'>-					camel_folder_set_message_user_tag(folder, uid, "every7", tag);</div><div class='del'>-					test_free(tag);</div><div class='del'>-				}</div><div class='del'>-				if ((j/11)*11 == j) {</div><div class='del'>-					camel_folder_set_message_user_tag(folder, uid, "every11", "11tag");</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			camel_folder_free_uids(folder, uids);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("Search before sync");</div><div class='del'>-			run_search(folder, 100);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("syncing folder, searching");</div><div class='del'>-			camel_folder_sync(folder, FALSE, ex);</div><div class='del'>-			run_search(folder, 100);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("syncing wiht expunge, search");</div><div class='del'>-			camel_folder_sync(folder, TRUE, ex);</div><div class='del'>-			run_search(folder, 100);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("deleting every 2nd message");</div><div class='del'>-			uids = camel_folder_get_uids(folder);</div><div class='del'>-			check(uids-&gt;len == 100);</div><div class='del'>-			for (j=0;j&lt;uids-&gt;len;j+=2) {</div><div class='del'>-				camel_folder_delete_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-			}</div><div class='del'>-			camel_folder_free_uids(folder, uids);</div><div class='del'>-			run_search(folder, 100);</div><div class='del'>-</div><div class='del'>-			push("syncing");</div><div class='del'>-			camel_folder_sync(folder, FALSE, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			run_search(folder, 100);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("expunging");</div><div class='del'>-			camel_folder_expunge(folder, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			run_search(folder, 50);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("closing and re-opening folder");</div><div class='del'>-			check_unref(folder, 1);</div><div class='del'>-			folder = camel_store_get_folder(store, "testbox", flags&amp;~(CAMEL_STORE_FOLDER_CREATE), ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			check(folder != NULL);</div><div class='del'>-</div><div class='del'>-			push("deleting remaining messages");</div><div class='del'>-			uids = camel_folder_get_uids(folder);</div><div class='del'>-			check(uids-&gt;len == 50);</div><div class='del'>-			for (j=0;j&lt;uids-&gt;len;j++) {</div><div class='del'>-				camel_folder_delete_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-			}</div><div class='del'>-			camel_folder_free_uids(folder, uids);</div><div class='del'>-			run_search(folder, 50);</div><div class='del'>-</div><div class='del'>-			push("syncing");</div><div class='del'>-			camel_folder_sync(folder, FALSE, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			run_search(folder, 50);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("expunging");</div><div class='del'>-			camel_folder_expunge(folder, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			run_search(folder, 0);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			check_unref(folder, 1);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("deleting test folder, with no messages in it");</div><div class='del'>-			camel_store_delete_folder(store, "testbox", ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			check_unref(store, 1);</div><div class='del'>-			camel_test_end();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	check_unref(session, 1);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test4.c b/camel/tests/folder/test4.c<br/>deleted file mode 100644<br/>index eb0bd3420b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test4.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test4.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* store testing, for remote folders */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *remote_providers[] = {</div><div class='del'>-	"IMAP_TEST_URL",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-	/* todo: subscriptions? */</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(remote_providers);i++) {</div><div class='del'>-		path = getenv(remote_providers[i]);</div><div class='del'>-</div><div class='del'>-		if (path == NULL) {</div><div class='del'>-			printf("Aborted (ignored).\n");</div><div class='del'>-			printf("Set '%s', to re-run test.\n", remote_providers[i]);</div><div class='del'>-			/* tells make check to ignore us in the total count */</div><div class='del'>-			_exit(77);</div><div class='del'>-		}</div><div class='del'>-		camel_test_nonfatal("The IMAP code is just rooted");</div><div class='del'>-		test_folder_basic(session, path, FALSE, FALSE);</div><div class='del'>-		camel_test_fatal();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)session);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test5.c b/camel/tests/folder/test5.c<br/>deleted file mode 100644<br/>index ccdfb23b23..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test5.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test5.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* store testing, for remote folders */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *remote_providers[] = {</div><div class='del'>-	"NNTP_TEST_URL",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-	/* todo: subscriptions? */</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(remote_providers);i++) {</div><div class='del'>-		path = getenv(remote_providers[i]);</div><div class='del'>-</div><div class='del'>-		if (path == NULL) {</div><div class='del'>-			printf("Aborted (ignored).\n");</div><div class='del'>-			printf("Set '%s', to re-run test.\n", remote_providers[i]);</div><div class='del'>-			/* tells make check to ignore us in the total count */</div><div class='del'>-			_exit(77);</div><div class='del'>-		}</div><div class='del'>-		camel_test_nonfatal("Not sure how many tests apply to NNTP");</div><div class='del'>-		test_folder_basic(session, path, FALSE, FALSE);</div><div class='del'>-		camel_test_fatal();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)session);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test6.c b/camel/tests/folder/test6.c<br/>deleted file mode 100644<br/>index 215fa999bf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test6.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test6.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* folder testing */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *remote_providers[] = {</div><div class='del'>-	"IMAP_TEST_URL",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(remote_providers);i++) {</div><div class='del'>-		path = getenv(remote_providers[i]);</div><div class='del'>-</div><div class='del'>-		if (path == NULL) {</div><div class='del'>-			printf("Aborted (ignored).\n");</div><div class='del'>-			printf("Set '%s', to re-run test.\n", remote_providers[i]);</div><div class='del'>-			/* tells make check to ignore us in the total count */</div><div class='del'>-			_exit(77);</div><div class='del'>-		}</div><div class='del'>-		/*camel_test_nonfatal("The IMAP code is just rooted");*/</div><div class='del'>-		test_folder_message_ops(session, path, FALSE);</div><div class='del'>-		/*camel_test_fatal();*/</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	check_unref(session, 1);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test7.c b/camel/tests/folder/test7.c<br/>deleted file mode 100644<br/>index 2f08712e4c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test7.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test7.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* folder testing */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *remote_providers[] = {</div><div class='del'>-	"NNTP_TEST_URL",</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(remote_providers);i++) {</div><div class='del'>-		path = getenv(remote_providers[i]);</div><div class='del'>-</div><div class='del'>-		if (path == NULL) {</div><div class='del'>-			printf("Aborted (ignored).\n");</div><div class='del'>-			printf("Set '%s', to re-run test.\n", remote_providers[i]);</div><div class='del'>-			/* tells make check to ignore us in the total count */</div><div class='del'>-			_exit(77);</div><div class='del'>-		}</div><div class='del'>-		camel_test_nonfatal("Dont know how many tests apply to NNTP");</div><div class='del'>-		test_folder_message_ops(session, path, FALSE);</div><div class='del'>-		camel_test_fatal();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	check_unref(session, 1);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/folder/test8.c b/camel/tests/folder/test8.c<br/>deleted file mode 100644<br/>index cf8a7ecc8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test8.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test8.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,215 +0,0 @@</div><div class='del'>-/* threaded folder testing */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define MAX_MESSAGES (100)</div><div class='del'>-#define MAX_THREADS (10)</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-#ifndef ENABLE_THREADS</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	printf("Test %s is only compiled with threads enabled\n", argv[0]);</div><div class='del'>-	return 77;</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-static char *local_providers[] = {</div><div class='del'>-	"mbox",</div><div class='del'>-	"mh",</div><div class='del'>-	"maildir"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-test_add_message(CamelFolder *folder, int j)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	char *content;</div><div class='del'>-	char *subject;</div><div class='del'>-	CamelException ex;</div><div class='del'>-</div><div class='del'>-	camel_exception_init(&amp;ex);</div><div class='del'>-</div><div class='del'>-	push("creating message %d\n", j);</div><div class='del'>-	msg = test_message_create_simple();</div><div class='del'>-	content = g_strdup_printf("Test message %d contents\n\n", j);</div><div class='del'>-	test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",</div><div class='del'>-							content, strlen(content));</div><div class='del'>-	test_free(content);</div><div class='del'>-	subject = g_strdup_printf("Test message %d subject", j);</div><div class='del'>-	camel_mime_message_set_subject(msg, subject);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("appending simple message %d", j);</div><div class='del'>-	camel_folder_append_message(folder, msg, NULL, &amp;ex);</div><div class='del'>-	check_msg(!camel_exception_is_set(&amp;ex), "%s", camel_exception_get_description(&amp;ex));</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	check_unref(msg, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _threadinfo {</div><div class='del'>-	int id;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-worker(void *d)</div><div class='del'>-{</div><div class='del'>-	struct _threadinfo *info = d;</div><div class='del'>-	int i, j, id = info-&gt;id;</div><div class='del'>-	char *sub, *content;</div><div class='del'>-	GPtrArray *res;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-</div><div class='del'>-	/* we add a message, search for it, twiddle some flags, delete it */</div><div class='del'>-	/* and flat out */</div><div class='del'>-	for (i=0;i&lt;MAX_MESSAGES;i++) {</div><div class='del'>-		d(printf("Thread %ld message %i\n", pthread_self(), i));</div><div class='del'>-		test_add_message(info-&gt;folder, id+i);</div><div class='del'>-</div><div class='del'>-		sub = g_strdup_printf("(match-all (header-contains \"subject\" \"message %d subject\"))", id+i);</div><div class='del'>-</div><div class='del'>-		push("searching for message %d\n\tusing: %s", id+i, sub);</div><div class='del'>-		res = camel_folder_search_by_expression(info-&gt;folder, sub, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check_msg(res-&gt;len == 1, "res-&gt;len = %d", res-&gt;len);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("getting message '%s'", res-&gt;pdata[0]);</div><div class='del'>-		msg = camel_folder_get_message(info-&gt;folder, (char *)res-&gt;pdata[0], ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("comparing content");</div><div class='del'>-		content = g_strdup_printf("Test message %d contents\n\n", id+i);</div><div class='del'>-		test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg), content, strlen(content));</div><div class='del'>-		test_free(content);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("deleting message, cleanup");</div><div class='del'>-		j=(100.0*rand()/(RAND_MAX+1.0));</div><div class='del'>-		if (j&lt;=70) {</div><div class='del'>-			camel_folder_delete_message(info-&gt;folder, res-&gt;pdata[0]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_folder_search_free(info-&gt;folder, res);</div><div class='del'>-		res = NULL;</div><div class='del'>-		test_free(sub);</div><div class='del'>-</div><div class='del'>-		check_unref(msg, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		/* about 1-in 100 calls will expunge */</div><div class='del'>-		j=(200.0*rand()/(RAND_MAX+1.0));</div><div class='del'>-		if (j&lt;=2) {</div><div class='del'>-			d(printf("Forcing an expuge\n"));</div><div class='del'>-			push("expunging folder");</div><div class='del'>-			camel_folder_expunge(info-&gt;folder, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	int i, j, index;</div><div class='del'>-	char *path;</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	pthread_t threads[MAX_THREADS];</div><div class='del'>-	struct _threadinfo *info;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	for (j=0;j&lt;ARRAY_LEN(local_providers);j++) {</div><div class='del'>-		for (index=0;index&lt;2;index++) {</div><div class='del'>-			path = g_strdup_printf("method %s %s", local_providers[j], index?"indexed":"nonindexed");</div><div class='del'>-			camel_test_start(path);</div><div class='del'>-			test_free(path);</div><div class='del'>-</div><div class='del'>-			push("trying %s index %d", local_providers[j], index);</div><div class='del'>-			path = g_strdup_printf("%s:///tmp/camel-test/%s", local_providers[j], local_providers[j]);</div><div class='del'>-			store = camel_session_get_store(session, path, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			test_free(path);</div><div class='del'>-			</div><div class='del'>-			if (index == 0)</div><div class='del'>-				folder = camel_store_get_folder(store, "testbox", CAMEL_STORE_FOLDER_CREATE, ex);</div><div class='del'>-			else</div><div class='del'>-				folder = camel_store_get_folder(store, "testbox",</div><div class='del'>-								CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-			for (i=0;i&lt;MAX_THREADS;i++) {</div><div class='del'>-				info = g_malloc(sizeof(*info));</div><div class='del'>-				info-&gt;id = i*MAX_MESSAGES;</div><div class='del'>-				info-&gt;folder = folder;</div><div class='del'>-				pthread_create(&amp;threads[i], 0, worker, info);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			for (i=0;i&lt;MAX_THREADS;i++) {</div><div class='del'>-				pthread_join(threads[i], (void **)&amp;info);</div><div class='del'>-				g_free(info);</div><div class='del'>-			}</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("deleting remaining messages");</div><div class='del'>-			uids = camel_folder_get_uids(folder);</div><div class='del'>-			for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-				camel_folder_delete_message(folder, uids-&gt;pdata[i]);</div><div class='del'>-			}</div><div class='del'>-			camel_folder_free_uids(folder, uids);</div><div class='del'>-</div><div class='del'>-			camel_folder_expunge(folder, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-			check_unref(folder, 1);</div><div class='del'>-</div><div class='del'>-			camel_store_delete_folder(store, "testbox", ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-			check_unref(store, 1);</div><div class='del'>-</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			camel_test_end();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)session);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* ENABLE_THREADS */</div><div class='head'>diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c<br/>deleted file mode 100644<br/>index 974c2c7793..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/folder/test9.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/folder/test9.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,227 +0,0 @@</div><div class='del'>-/* folder/index testing */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-exception.h"</div><div class='del'>-#include "camel/camel-service.h"</div><div class='del'>-#include "camel/camel-store.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-folder.h"</div><div class='del'>-#include "camel/camel-folder-summary.h"</div><div class='del'>-#include "camel/camel-mime-message.h"</div><div class='del'>-#include "camel/camel-filter-driver.h"</div><div class='del'>-#include "camel/camel-stream-fs.h"</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *name;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-} mailboxes[] = {</div><div class='del'>-	{ "INBOX", NULL },</div><div class='del'>-	{ "folder1", NULL },</div><div class='del'>-	{ "folder2", NULL },</div><div class='del'>-	{ "folder3", NULL },</div><div class='del'>-	{ "folder4", NULL },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *name, *match, *action;</div><div class='del'>-} rules[] = {</div><div class='del'>-	{ "empty1", "(match-all (header-contains \"Frobnitz\"))", "(copy-to \"folder1\")" },</div><div class='del'>-	{ "empty2", "(header-contains \"Frobnitz\")", "(copy-to \"folder2\")" },</div><div class='del'>-	{ "count11", "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))", "(move-to \"folder3\")" },</div><div class='del'>-	{ "empty3", "(and (header-contains \"subject\" \"Test1\") (header-contains \"subject\" \"subject\"))", "(move-to \"folder4\")" },</div><div class='del'>-	{ "count1", "(body-contains \"data50\")", "(copy-to \"folder1\")" },</div><div class='del'>-	{ "stop", "(body-contains \"data2\")", "(stop)" },</div><div class='del'>-	{ "notreached1", "(body-contains \"data2\")", "(move-to \"folder2\")" },</div><div class='del'>-	{ "count1", "(body-contains \"data3\")", "(move-to \"folder2\")" },</div><div class='del'>-	{ "ustrcasecmp", "(header-matches \"Subject\" \"Test0 message100 subject\")", "(copy-to \"folder2\")" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* broken match rules */</div><div class='del'>-struct {</div><div class='del'>-	char *name, *match, *action;</div><div class='del'>-} brokens[] = {</div><div class='del'>-	{ "count1", "(body-contains data50)", "(copy-to \"folder1\")" }, /* non string argument */</div><div class='del'>-	{ "count1", "(body-contains-stuff \"data3\")", "(move-to-folder \"folder2\")" }, /* invalid function */</div><div class='del'>-	{ "count1", "(or (body-contains \"data3\") (foo))", "(move-to-folder \"folder2\")" }, /* invalid function */</div><div class='del'>-	{ "count1", "(or (body-contains \"data3\") (foo)", "(move-to-folder \"folder2\")" }, /* missing ) */</div><div class='del'>-	{ "count1", "(and body-contains \"data3\") (foo)", "(move-to-folder \"folder2\")" }, /* missing ( */</div><div class='del'>-	{ "count1", "body-contains \"data3\")", "(move-to-folder \"folder2\")" }, /* missing ( */</div><div class='del'>-	{ "count1", "body-contains \"data3\"", "(move-to-folder \"folder2\")" }, /* missing ( ) */</div><div class='del'>-	{ "count1", "(body-contains \"data3\" ())", "(move-to-folder \"folder2\")" }, /* extra () */</div><div class='del'>-	{ "count1", "()", "(move-to-folder \"folder2\")" }, /* invalid () */</div><div class='del'>-	{ "count1", "", "(move-to-folder \"folder2\")" }, /* empty */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* broken action rules */</div><div class='del'>-struct {</div><div class='del'>-	char *name, *match, *action;</div><div class='del'>-} brokena[] = {</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "(body-contains \"help\")" }, /* rule in action */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "(move-to-folder-name \"folder2\")" }, /* unknown function */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "(or (move-to-folder \"folder2\")" }, /* missing ) */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "(or move-to-folder \"folder2\"))" }, /* missing ( */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "move-to-folder \"folder2\")" }, /* missing ( */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "(move-to-folder \"folder2\" ())" }, /* invalid () */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "()" }, /* invalid () */</div><div class='del'>-	{ "a", "(body-contains \"data2\")", "" }, /* empty */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(mailboxes);i++)</div><div class='del'>-		if (!strcmp(mailboxes[i].name, uri)) {</div><div class='del'>-			camel_object_ref((CamelObject *)mailboxes[i].folder);</div><div class='del'>-			return mailboxes[i].folder;</div><div class='del'>-		}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	int i, j;</div><div class='del'>-	CamelStream *mbox;</div><div class='del'>-	CamelFilterDriver *driver;</div><div class='del'>-</div><div class='del'>-	/*gtk_init(&amp;argc, &amp;argv);*/</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	camel_test_start("Simple filtering of mbox");</div><div class='del'>-</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-</div><div class='del'>-	/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-	/* todo: work out how to do imap/pop/nntp tests */</div><div class='del'>-</div><div class='del'>-	push("getting store");</div><div class='del'>-	store = camel_session_get_store(session, "mbox:///tmp/camel-test/mbox", ex);</div><div class='del'>-	check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));</div><div class='del'>-	check(store != NULL);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Creating output folders");</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(mailboxes);i++) {</div><div class='del'>-		push("creating %s", mailboxes[i].name);</div><div class='del'>-		mailboxes[i].folder = folder = camel_store_get_folder(store, mailboxes[i].name, CAMEL_STORE_FOLDER_CREATE, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-		</div><div class='del'>-		/* we need an empty folder for this to work */</div><div class='del'>-		test_folder_counts(folder, 0, 0);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	/* append a bunch of messages with specific content */</div><div class='del'>-	push("creating 100 test message mbox");</div><div class='del'>-	mbox = camel_stream_fs_new_with_name("/tmp/camel-test/inbox", O_WRONLY|O_CREAT|O_EXCL, 0600);</div><div class='del'>-	for (j=0;j&lt;100;j++) {</div><div class='del'>-		char *content, *subject;</div><div class='del'>-			</div><div class='del'>-		push("creating test message");</div><div class='del'>-		msg = test_message_create_simple();</div><div class='del'>-		content = g_strdup_printf("data%d content\n", j);</div><div class='del'>-		test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",</div><div class='del'>-						content, strlen(content));</div><div class='del'>-		test_free(content);</div><div class='del'>-		subject = g_strdup_printf("Test%d message%d subject", j, 100-j);</div><div class='del'>-		camel_mime_message_set_subject(msg, subject);</div><div class='del'>-		</div><div class='del'>-		camel_mime_message_set_date(msg, j*60*24, 0);</div><div class='del'>-		pull();</div><div class='del'>-		</div><div class='del'>-		camel_stream_printf(mbox, "From \n");</div><div class='del'>-		check(camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, mbox) != -1);</div><div class='del'>-#if 0		</div><div class='del'>-		push("appending simple message %d", j);</div><div class='del'>-		camel_folder_append_message(folder, msg, NULL, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		pull();</div><div class='del'>-#endif				</div><div class='del'>-		test_free(subject);</div><div class='del'>-		</div><div class='del'>-		check_unref(msg, 1);</div><div class='del'>-	}</div><div class='del'>-	check(camel_stream_close(mbox) != -1);</div><div class='del'>-	check_unref(mbox, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Building filters");</div><div class='del'>-	driver = camel_filter_driver_new();</div><div class='del'>-	camel_filter_driver_set_folder_func(driver, get_folder, NULL);</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(rules);i++) {</div><div class='del'>-		camel_filter_driver_add_rule(driver, rules[i].name, rules[i].match, rules[i].action);</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Executing filters");</div><div class='del'>-	camel_filter_driver_set_default_folder(driver, mailboxes[0].folder);</div><div class='del'>-	camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", NULL, ex);</div><div class='del'>-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-	/* now need to check the folder counts/etc */</div><div class='del'>-</div><div class='del'>-	check_unref(driver, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	/* this tests that invalid rules are caught */</div><div class='del'>-	push("Testing broken match rules");</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(brokens);i++) {</div><div class='del'>-		push("rule %s", brokens[i].match);</div><div class='del'>-		driver = camel_filter_driver_new();</div><div class='del'>-		camel_filter_driver_set_folder_func(driver, get_folder, NULL);</div><div class='del'>-		camel_filter_driver_add_rule(driver, brokens[i].name, brokens[i].match, brokens[i].action);</div><div class='del'>-		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", NULL, ex);</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		check_unref(driver, 1);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Testing broken action rules");</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(brokena);i++) {</div><div class='del'>-		push("rule %s", brokena[i].action);</div><div class='del'>-		driver = camel_filter_driver_new();</div><div class='del'>-		camel_filter_driver_set_folder_func(driver, get_folder, NULL);</div><div class='del'>-		camel_filter_driver_add_rule(driver, brokena[i].name, brokena[i].match, brokena[i].action);</div><div class='del'>-		camel_filter_driver_filter_mbox(driver, "/tmp/camel-test/inbox", NULL, ex);</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		check_unref(driver, 1);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(mailboxes);i++) {</div><div class='del'>-		check_unref(mailboxes[i].folder, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	check_unref(store, 1);</div><div class='del'>-</div><div class='del'>-	check_unref(session, 1);</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/lib/.cvsignore b/camel/tests/lib/.cvsignore<br/>deleted file mode 100644<br/>index ba98331a6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-temp-test</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/tests/lib/Makefile.am b/camel/tests/lib/Makefile.am<br/>deleted file mode 100644<br/>index f3a92899b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/camel</div><div class='del'>-</div><div class='del'>-check_LIBRARIES = libcameltest.a</div><div class='del'>-</div><div class='del'>-libcameltest_a_SOURCES = \</div><div class='del'>-	camel-test.c camel-test.h \</div><div class='del'>-	messages.c messages.h \</div><div class='del'>-	addresses.c addresses.h \</div><div class='del'>-	folders.c folders.h \</div><div class='del'>-	session.c session.h \</div><div class='del'>-	streams.c streams.h \</div><div class='del'>-	address-data.h</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/lib/address-data.h b/camel/tests/lib/address-data.h<br/>deleted file mode 100644<br/>index acecac596a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/address-data.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/address-data.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-/* BE WARY of editing this file with emacs.</div><div class='del'>-	Otherwise it might be smart and try to re-encode everything, which</div><div class='del'>-	you really do not want</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static struct _a {</div><div class='del'>-	int count;</div><div class='del'>-	char *addr;</div><div class='del'>-	char *utf8;		/* the utf8 in this table was generated by camel itself.  As a result i'm making the assumption it</div><div class='del'>-				   was right when it was created.  It also depends on the format of ::format(),. which is likely to</div><div class='del'>-				   change, to handle other bugs ! */</div><div class='del'>-} test_address[] = {</div><div class='del'>-	{ 1, "\"=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=\" &lt;david@iiia.csic.es&gt;", "David Gutiérrez Magallanes &lt;david@iiia.csic.es&gt;" },</div><div class='del'>-	{ 1, "\"=?iso-8859-1?Q?Jos=E9?= Antonio Milke G.\" &lt;gerencia@ovoplus.com&gt;", "José Antonio Milke G. &lt;gerencia@ovoplus.com&gt;" },</div><div class='del'>-	{ 1, "\"=?iso-8859-2?Q?Hi-Fi_Internert_market_=3D_1.Virtu=E1ln=ED_Internetov=E9_H?= =?iso-8859-2?Q?i-Fi_Studio?=\" &lt;hifimarket@atlas.cz&gt;", "Hi-Fi Internert market = 1.Virtuální Internetové Hi-Fi Studio &lt;hifimarket@atlas.cz&gt;" },</div><div class='del'>-	{ 3, "\"James M. Cape\" &lt;jcape@jcinteractive.com&gt;, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= &lt;cuenca@ie2.u-psud.fr&gt;, gnome-hackers@nuclecu.unam.mx", "James M. Cape &lt;jcape@jcinteractive.com&gt;, Joaquín Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;, gnome-hackers@nuclecu.unam.mx" },</div><div class='del'>-	{ 1, "=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?= &lt;david@iiia.csic.es&gt;", "David Gutiérrez Magallanes &lt;david@iiia.csic.es&gt;" },</div><div class='del'>-	{ 1, "=?ISO-8859-2?Q?Tomasz_K=B3oczko?= &lt;kloczek@rudy.mif.pg.gda.pl&gt;", "Tomasz KÅ‚oczko &lt;kloczek@rudy.mif.pg.gda.pl&gt;" },</div><div class='del'>-	{ 1, "=?ISO-8859-2?Q?Vladim=EDr_Solnick=FD?= &lt;vs@utia.cas.cz&gt;", "Vladimír Solnický &lt;vs@utia.cas.cz&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?=22S=F6rensen=2C_Daniel=22?= &lt;dasar@wmdata.com&gt;", "\"Sörensen, Daniel\" &lt;dasar@wmdata.com&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?=C1=C2=AAQ=A7=CA?= &lt;dennys@iim.nctu.edu.tw&gt;", "Ã�ªQ§Ê &lt;dennys@iim.nctu.edu.tw&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?=C1=C2=AAQ=A7=CA?= &lt;dennys@news.iim.nctu.edu.tw&gt;", "Ã�ªQ§Ê &lt;dennys@news.iim.nctu.edu.tw&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?=C1kos?= Valentinyi &lt;A.Valentinyi@soton.ac.uk&gt;", "Ã�kos Valentinyi &lt;A.Valentinyi@soton.ac.uk&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Joaqu=EDn?= Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;", "Joaquín Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;" },</div><div class='del'>-	{ 2, "=?iso-8859-1?Q?Joaqu=EDn?= Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;, gnome-hackers@nuclecu.unam.mx", "Joaquín Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;, gnome-hackers@nuclecu.unam.mx" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= &lt;cuenca@celium.net&gt;", "Joaquín Cuenca Abela &lt;cuenca@celium.net&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Juantom=E1s=20Garc=EDa?= &lt;juantomas@lared.es&gt;", "Juantomás García &lt;juantomas@lared.es&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Kenneth_ll=E9phaane_Christiansen?= &lt;kenneth@ripen.dk&gt;", "Kenneth lléphaane Christiansen &lt;kenneth@ripen.dk&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Kjell_Tage_=D8hman?= &lt;tage@ohman.no&gt;", "Kjell Tage Øhman &lt;tage@ohman.no&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Martin_Norb=E4ck?= &lt;d95mback@dtek.chalmers.se&gt;", "Martin Norbäck &lt;d95mback@dtek.chalmers.se&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?P=E5llen?= &lt;pollen@astrakan.hig.se&gt;", "PÃ¥llen &lt;pollen@astrakan.hig.se&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?Q?Ville_P=E4tsi?= &lt;drc@gnu.org&gt;", "Ville Pätsi &lt;drc@gnu.org&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-1?q?Joaqu=EDn?= Cuenca Abela &lt;cuenca@celium.net&gt;", "Joaquín Cuenca Abela &lt;cuenca@celium.net&gt;" },</div><div class='del'>-	{ 1, "=?iso-8859-2?Q?Dra=BEen_Ka=E8ar?= &lt;dave@srce.hr&gt;", "Dražen KaÄ�ar &lt;dave@srce.hr&gt;" },</div><div class='del'>-        /* yep this is right, this isn't valid so doesn't decode at all */</div><div class='del'>-	{ 1, "=?windows-1250?Q? \"Jaka Mo=E8nik\" ?= &lt;jaka.mocnik@kiss.uni-lj.si&gt;", "=?windows-1250?Q? Jaka Mo=E8nik ?= &lt;jaka.mocnik@kiss.uni-lj.si&gt;" },</div><div class='del'>-	{ 3, "George &lt;jirka@5z.com&gt;, Juantomas =?ISO-8859-1?Q?Garc=C3=83=C2=ADa?= &lt;juantomas@lared.es&gt;, gnome-hackers@gnome.org", "George &lt;jirka@5z.com&gt;, Juantomas García &lt;juantomas@lared.es&gt;, gnome-hackers@gnome.org" },</div><div class='del'>-	{ 7, "Jon Trowbridge &lt;trow@emccta.com&gt;, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz &lt;cinamod@hotmail.com&gt;, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= &lt;cuenca@celium.net&gt;, sam th &lt;sam@uchicago.edu&gt;", "Jon Trowbridge &lt;trow@emccta.com&gt;, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz &lt;cinamod@hotmail.com&gt;, Joaquín Cuenca Abela &lt;cuenca@celium.net&gt;, sam th &lt;sam@uchicago.edu&gt;" },</div><div class='del'>-	{ 6, "Jon Trowbridge &lt;trow@emccta.com&gt;, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz &lt;cinamod@hotmail.com&gt;, =?iso-8859-1?Q?Joaqu=EDn_Cuenca_Abela?= &lt;cuenca@ie2.u-psud.fr&gt;", "Jon Trowbridge &lt;trow@emccta.com&gt;, gnome-1.4-list@gnome.org, gnome-devel-list@gnome.org, gnome-hackers@gnome.org, Dom Lachowicz &lt;cinamod@hotmail.com&gt;, Joaquín Cuenca Abela &lt;cuenca@ie2.u-psud.fr&gt;" },</div><div class='del'>-	{ 1, "Kai =?iso-8859-1?Q?Gro=DFjohann?= &lt;Kai.Grossjohann@CS.Uni-Dortmund.DE&gt;", "Kai Großjohann &lt;Kai.Grossjohann@CS.Uni-Dortmund.DE&gt;" },</div><div class='del'>-	{ 1, "Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai =?iso-8859-1?q?Gro=DFjohann?=)", "Kai Großjohann &lt;Kai.Grossjohann@CS.Uni-Dortmund.DE&gt;" },</div><div class='del'>-	{ 1, "Rickard =?iso-8859-1?Q?Nordstr=F6m?= &lt;rzi@ebox.tninet.se&gt;", "Rickard Nordström &lt;rzi@ebox.tninet.se&gt;" },</div><div class='del'>-	{ 1, "Tomasz =?iso-8859-2?q?K=B3oczko?= &lt;kloczek@rudy.mif.pg.gda.pl&gt;", "Tomasz KÅ‚oczko &lt;kloczek@rudy.mif.pg.gda.pl&gt;" },</div><div class='del'>-	{ 1, "VALCKE =?iso-8859-1?Q?C=E9dric?= &lt;cvalcke@freesurf.fr&gt;", "VALCKE Cédric &lt;cvalcke@freesurf.fr&gt;" },</div><div class='del'>-	{ 1, "Ville =?iso-8859-1?q?P=E4tsi?= &lt;drc@gnu.org&gt;", "Ville Pätsi &lt;drc@gnu.org&gt;" },</div><div class='del'>-	{ 1, "david@iiia.csic.es (=?ISO-8859-1?Q?David_Guti=E9rrez_Magallanes?=)", "David Gutiérrez Magallanes &lt;david@iiia.csic.es&gt;" },</div><div class='del'>-	{ 1, "kloczek@rudy.mif.pg.gda.pl (=?ISO-8859-2?Q?Tomasz_K=B3oczko?=)", "Tomasz KÅ‚oczko &lt;kloczek@rudy.mif.pg.gda.pl&gt;" },</div><div class='del'>-	{ 1, "lassehp@imv.aau.dk (Lasse =?ISO-8859-1?Q?Hiller=F8e?= Petersen)", "Lasse Hillerøe Petersen &lt;lassehp@imv.aau.dk&gt;" },</div><div class='del'>-	{ 1, "ysato@etl.go.jp (Yutaka Sato =?ISO-2022-JP?B?GyRAOjRGI0stGyhK?=)", "Yutaka Sato ä½�藤豊 &lt;ysato@etl.go.jp&gt;" },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static struct _l {</div><div class='del'>-    char *type;</div><div class='del'>-    char *line;</div><div class='del'>-} test_lines[] = {</div><div class='del'>-	/* commented out unsupported charsets - FIXME: camel should somehow handle this, although it can't really of course */</div><div class='del'>-	/*{ "windows-1251", "Åäèí àïëåò íå îòãîâàðÿ íà çàÿâêà çà çàïèñ.\nÄà ãî ïðåìàõíà ëè èëè äà ïî÷àêàì?" },*/</div><div class='del'>-	{ "iso-8859-1", "Omple les miniatures de la finestra amb contingut de la pantalla" },</div><div class='del'>-	{ "ISO-8859-2", "Správce oken hýbe s okrajem okna\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "ISO-8859-1", "Vindueshåndtering flytter dekorationsvindue istedet\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	{ "ISO-8859-1", "Vorschaubilder der Fenster mit dem Bildschirminhalt ausfüllen" },</div><div class='del'>-	{ "iso-8859-7", "ÅìöÜíéóç åñãáóéþí ðïõ äå öáßíïíôáé óôç ëßóôá ðáñáèýñùí (ÐÁÑÁÊÁÌØÇ-ËÉÓÔÁÐÁÑÁÈÕÑÙÍ)" },</div><div class='del'>-	{ "iso-8859-1", "You've chosen to disable the startup hint.\nTo re-enable it, choose \"Startup Hint\"\nin the GNOME Control Centre" },</div><div class='del'>-	{ "iso-8859-1", "El aplique de reloj muestra en su panel la fecha y la hora de forma simple \ny ligero " },</div><div class='del'>-	{ "iso-8859-1", "Applet ei vasta salvestuskäsule.\nKas peaks ta niisama sulgema, või veel ootama?" },</div><div class='del'>-	{ "iso-8859-1", "Lehio kudeatzaileak lehioaren dekorazaioa mugiarazten\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-15", "Näytä sovellukset, joiden ikkunoista on näkyvillä vain otsikkopalkki" },</div><div class='del'>-	{ "ISO-8859-1", "Afficher les tâches qui ne sont pas dans la liste des fenêtres" },</div><div class='del'>-	{ "iso-8859-1", "Níl applet ag tabhair freagra ar iarratas sábháil.\nBain amach an applet nó lean ar fánacht?" },</div><div class='del'>-	{ "iso-8859-1", "Amosa-las tarefas agochadas da lista de fiestras (SKIP-WINLIST)" },</div><div class='del'>-	{ "iso-8859-2", "Az ablakkezelõ a dekorációt mozgassa az ablak helyett\n(AfterStep, Enlightenment, FVWM, IceWM, SawMill)" },</div><div class='del'>-	{ "iso-8859-1", "Riempi la finestra delle anteprime con il contenuto dello schermo" },</div><div class='del'>-	{ "euc-jp", "¥¦¥¤¥ó¥É¥¦¥Þ¥Í¡¼¥¸¥ã¤Ï¾þ¤ê¥¦¥¤¥ó¥É¥¦¤òÆ°¤«¤¹\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	{ "euc-kr", "â °ü¸®ÀÚ°¡ ²Ù¹Î â ´ë½Å À̵¿\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-13", "Priedas neatsakinëja á praðymà iðsisaugoti.\nPaðalinti priedà ar laukti toliau?" },</div><div class='del'>-	{ "iso-8859-1", "Window manager verplaatst dekoratie\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-1", "Vindushåndtereren flytter dekorasjonsvinduet i stedet\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	{ "iso-8859-2", "Przemieszczanie dekoracji zamiast okna\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-1", "Este programa é responsável por executar outras aplicações, embeber pequenos applets, a paz no mundo e crashes aleatórios do X." },</div><div class='del'>-	{ "iso-8859-1", "Mostrar tarefas que se escondem da lista de janelas (SKIP-WINLIST)" },</div><div class='del'>-	{ "koi8-r", "÷ÙÓÏÔÁ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ × ÐÅÒÅËÌÀÞÁÔÅÌÅ ÓÏ×ÐÁÄÁÅÔ Ó ×ÙÓÏÔÏÊ ÐÁÎÅÌÉ" },</div><div class='del'>-	{ "iso-8859-2", "Správca okien presúva okraje okien\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	{ "iso-8859-2", "Ka¾i posle, ki se skrivajo pred upravljalnik oken (SKIP-WINLIST)" },</div><div class='del'>-	{ "iso-8859-5", "Window ÜÕÝÐÔ×ÕàØ ßÞÜÕàÐ ÔÕÚÞàÐæØÞÝØ ßàÞ×Þà ãÜÕáâÞ âÞÓa\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-2", "Window menadzeri pomera dekoracioni prozor umesto toga\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-	{ "iso-8859-1", "Fönsterhanteraren flyttar dekorationsfönstret istället\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	/*{ "TSCII", "À½¢ì¸¼î-ºð¼¸ò¾¢ø À¡÷ì¸ ÓÊ¡¾ À½¢ì¸¼í¸¨Ç ¸¡Á¢ (À½¢ì¸¼î-ºð¼¸õ-¾Å¢÷)" },*/</div><div class='del'>-	{ "iso-8859-9", "Kaydetme isteðine bir uygulak cevap vermiyor .\nUygulaðý sileyim mi , yoksa bekleyeyim mi ?" },</div><div class='del'>-	{ "koi8-u", "ðÅÒÅͦÝÅÎÎÑ ÄÅËÏÒÁæ§ ÚÁͦÓÔØ ×¦ËÎÁ\n(AfterStep, Enlightenment, FVWM, IceWM, Sawfish)" },</div><div class='del'>-	{ "iso-8859-1", "Cwand on scriftôr est bodjî foû, li scriftôr èt totes\nles apliketes å dvins sont pierdowes. Bodjî ci scriftôr chal?" },</div><div class='del'>-	{ "gb2312", "ǨÒƵ½×°Êδ°¿Ú¹ÜÀí³ÌÐò(AfterStep, Enlightenment, FVWM, IceWM, SawMill)" },</div><div class='del'>-	{ "big5", "µøµ¡ºÞ²zªÌ¥u²¾°Ê¸Ë¹¢µøµ¡\n(AfterStep, Enlightenment, FVWM, IceWM, Sawmill)" },</div><div class='del'>-};</div><div class='head'>diff --git a/camel/tests/lib/addresses.c b/camel/tests/lib/addresses.c<br/>deleted file mode 100644<br/>index a97ac5e4f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/addresses.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/addresses.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include "addresses.h"</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_address_compare(CamelInternetAddress *addr, CamelInternetAddress *addr2)</div><div class='del'>-{</div><div class='del'>-	const char *r1, *r2, *a1, *a2;</div><div class='del'>-	char *e1, *e2, *f1, *f2;</div><div class='del'>-	int j;</div><div class='del'>-</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr)) == camel_address_length(CAMEL_ADDRESS(addr2)));</div><div class='del'>-	for (j=0;j&lt;camel_address_length(CAMEL_ADDRESS(addr));j++) {</div><div class='del'>-		</div><div class='del'>-		check(camel_internet_address_get(addr, j, &amp;r1, &amp;a1) == TRUE);</div><div class='del'>-		check(camel_internet_address_get(addr2, j, &amp;r2, &amp;a2) == TRUE);</div><div class='del'>-</div><div class='del'>-		check(string_equal(r1, r2));</div><div class='del'>-		check(strcmp(a1, a2) == 0);</div><div class='del'>-	}</div><div class='del'>-	check(camel_internet_address_get(addr, j, &amp;r1, &amp;a1) == FALSE);</div><div class='del'>-	check(camel_internet_address_get(addr2, j, &amp;r2, &amp;a2) == FALSE);</div><div class='del'>-</div><div class='del'>-	e1 = camel_address_encode(CAMEL_ADDRESS(addr));</div><div class='del'>-	e2 = camel_address_encode(CAMEL_ADDRESS(addr2));</div><div class='del'>-</div><div class='del'>-	if (camel_address_length(CAMEL_ADDRESS(addr)) == 0)</div><div class='del'>-		check(e1 == NULL &amp;&amp; e2 == NULL);</div><div class='del'>-	else</div><div class='del'>-		check(e1 != NULL &amp;&amp; e2 != NULL);</div><div class='del'>-</div><div class='del'>-	if (e1 != NULL) {</div><div class='del'>-		check_msg(string_equal(e1, e2), "e1 = '%s' e2 = '%s'", e1, e2);</div><div class='del'>-		test_free(e1);</div><div class='del'>-		test_free(e2);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f1 = camel_address_format(CAMEL_ADDRESS(addr));</div><div class='del'>-	f2 = camel_address_format(CAMEL_ADDRESS(addr2));</div><div class='del'>-</div><div class='del'>-	if (camel_address_length(CAMEL_ADDRESS(addr)) == 0)</div><div class='del'>-		check(f1 == NULL &amp;&amp; f2 == NULL);</div><div class='del'>-	else</div><div class='del'>-		check(f1 != NULL &amp;&amp; f2 != NULL);</div><div class='del'>-</div><div class='del'>-	if (f1 != NULL) {</div><div class='del'>-		check_msg(string_equal(f1, f2), "f1 = '%s' f2 = '%s'", f1, f2);</div><div class='del'>-		test_free(f1);</div><div class='del'>-		test_free(f2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/lib/addresses.h b/camel/tests/lib/addresses.h<br/>deleted file mode 100644<br/>index dc35a19f05..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/addresses.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/addresses.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-internet-address.h&gt;</div><div class='del'>-</div><div class='del'>-/* addresses.c */</div><div class='del'>-void test_address_compare(CamelInternetAddress *addr, CamelInternetAddress *addr2);</div><div class='head'>diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c<br/>deleted file mode 100644<br/>index a61f949f0a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/camel-test.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/camel-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,350 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-/* well i dunno, doesn't seem to be in the headers but hte manpage mentions it */</div><div class='del'>-/* a nonportable checking mutex for glibc, not really needed, just validates</div><div class='del'>-   the test harness really */</div><div class='del'>-# ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP</div><div class='del'>-static pthread_mutex_t lock = PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP;</div><div class='del'>-# else</div><div class='del'>-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-# endif</div><div class='del'>-#define CAMEL_TEST_LOCK pthread_mutex_lock(&amp;lock)</div><div class='del'>-#define CAMEL_TEST_UNLOCK pthread_mutex_unlock(&amp;lock)</div><div class='del'>-#define CAMEL_TEST_ID (pthread_self())</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_TEST_LOCK</div><div class='del'>-#define CAMEL_TEST_UNLOCK</div><div class='del'>-#define CAMEL_TEST_ID (0)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static int setup;</div><div class='del'>-static int ok;</div><div class='del'>-</div><div class='del'>-struct _stack {</div><div class='del'>-	struct _stack *next;</div><div class='del'>-	int fatal;</div><div class='del'>-	char *what;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* per-thread state */</div><div class='del'>-struct _state {</div><div class='del'>-	char *test;</div><div class='del'>-	int nonfatal;</div><div class='del'>-	struct _stack *state;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GHashTable *info_table;</div><div class='del'>-</div><div class='del'>-int camel_test_verbose;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dump_action(int id, struct _state *s, void *d)</div><div class='del'>-{</div><div class='del'>-	struct _stack *node;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-	printf("\nThread %d:\n", id);</div><div class='del'>-#endif</div><div class='del'>-	node = s-&gt;state;</div><div class='del'>-	if (node) {</div><div class='del'>-		printf("Current action:\n");</div><div class='del'>-		while (node) {</div><div class='del'>-			printf("\t%s%s\n", node-&gt;fatal?"":"[nonfatal]", node-&gt;what);</div><div class='del'>-			node = node-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	printf("\tTest: %s\n", s-&gt;test);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void die(int sig)</div><div class='del'>-{</div><div class='del'>-	static int indie = 0;</div><div class='del'>-</div><div class='del'>-	if (!indie) {</div><div class='del'>-		indie = 1;</div><div class='del'>-		printf("\n\nReceived fatal signal %d\n", sig);</div><div class='del'>-		g_hash_table_foreach(info_table, (GHFunc)dump_action, 0);</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-		if (camel_test_verbose &gt; 2) {</div><div class='del'>-			printf("Attach debugger to pid %d to debug\n", getpid());</div><div class='del'>-			sleep(1000);</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	_exit(1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _state *</div><div class='del'>-current_state(void)</div><div class='del'>-{</div><div class='del'>-	struct _state *info;</div><div class='del'>-</div><div class='del'>-	if (info_table == NULL)</div><div class='del'>-		info_table = g_hash_table_new(0, 0);</div><div class='del'>-</div><div class='del'>-	info = g_hash_table_lookup(info_table, (void *)CAMEL_TEST_ID);</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		info = g_malloc0(sizeof(*info));</div><div class='del'>-		g_hash_table_insert(info_table, (void *)CAMEL_TEST_ID, info);</div><div class='del'>-	}</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-void camel_test_init(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	void camel_init(void);</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	setup = 1;</div><div class='del'>-</div><div class='del'>-#ifndef ENABLE_THREADS</div><div class='del'>-	camel_init();</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	info_table = g_hash_table_new(0, 0);</div><div class='del'>-</div><div class='del'>-	/* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */</div><div class='del'>-	g_thread_init(NULL);</div><div class='del'>-</div><div class='del'>-	signal(SIGSEGV, die);</div><div class='del'>-	signal(SIGABRT, die);</div><div class='del'>-</div><div class='del'>-	/* default, just say what, how well we did, unless fail, then abort */</div><div class='del'>-	camel_test_verbose = 1;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (argv[i][0] == '-') {</div><div class='del'>-			switch (argv[i][1]) {</div><div class='del'>-			case 'v':</div><div class='del'>-				camel_test_verbose = strlen(argv[i]);</div><div class='del'>-				break;</div><div class='del'>-			case 'q':</div><div class='del'>-				camel_test_verbose = 0;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_start(const char *what)</div><div class='del'>-{</div><div class='del'>-	struct _state *s;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_LOCK;</div><div class='del'>-</div><div class='del'>-	s = current_state();</div><div class='del'>-</div><div class='del'>-	if (!setup)</div><div class='del'>-		camel_test_init(0, 0);</div><div class='del'>-</div><div class='del'>-	ok = 1;</div><div class='del'>-</div><div class='del'>-	s-&gt;test = g_strdup(what);</div><div class='del'>-</div><div class='del'>-	if (camel_test_verbose &gt; 0) {</div><div class='del'>-		printf("Test: %s ... ", what);</div><div class='del'>-		fflush(stdout);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_UNLOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_push(const char *what, ...)</div><div class='del'>-{</div><div class='del'>-	struct _stack *node;</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *text;</div><div class='del'>-	struct _state *s;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_LOCK;</div><div class='del'>-</div><div class='del'>-	s = current_state();</div><div class='del'>-</div><div class='del'>-	va_start(ap, what);</div><div class='del'>-	text = g_strdup_vprintf(what, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-</div><div class='del'>-	if (camel_test_verbose &gt; 3)</div><div class='del'>-		printf("Start step: %s\n", text);</div><div class='del'>-</div><div class='del'>-	node = g_malloc(sizeof(*node));</div><div class='del'>-	node-&gt;what = text;</div><div class='del'>-	node-&gt;next = s-&gt;state;</div><div class='del'>-	node-&gt;fatal = 1;</div><div class='del'>-	s-&gt;state = node;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_UNLOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_pull(void)</div><div class='del'>-{</div><div class='del'>-	struct _stack *node;</div><div class='del'>-	struct _state *s;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_LOCK;</div><div class='del'>-</div><div class='del'>-	s = current_state();</div><div class='del'>-</div><div class='del'>-	g_assert(s-&gt;state);</div><div class='del'>-</div><div class='del'>-	if (camel_test_verbose &gt; 3)</div><div class='del'>-		printf("Finish step: %s\n", s-&gt;state-&gt;what);</div><div class='del'>-</div><div class='del'>-	node = s-&gt;state;</div><div class='del'>-	s-&gt;state = node-&gt;next;</div><div class='del'>-	if (!node-&gt;fatal)</div><div class='del'>-		s-&gt;nonfatal--;</div><div class='del'>-	g_free(node-&gt;what);</div><div class='del'>-	g_free(node);</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_UNLOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* where to set breakpoints */</div><div class='del'>-void camel_test_break(void);</div><div class='del'>-</div><div class='del'>-void camel_test_break(void)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_fail(const char *why, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-</div><div class='del'>-	va_start(ap, why);</div><div class='del'>-	camel_test_failv(why, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void camel_test_failv(const char *why, va_list ap)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	struct _state *s;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_LOCK;</div><div class='del'>-</div><div class='del'>-	s = current_state();</div><div class='del'>-</div><div class='del'>-	text = g_strdup_vprintf(why, ap);</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;nonfatal == 0 &amp;&amp; camel_test_verbose &gt; 0)</div><div class='del'>-	    || (s-&gt;nonfatal &amp;&amp; camel_test_verbose &gt; 1)) {</div><div class='del'>-		printf("Failed.\n%s\n", text);</div><div class='del'>-		camel_test_break();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(text);</div><div class='del'>-</div><div class='del'>-	if ((s-&gt;nonfatal == 0 &amp;&amp; camel_test_verbose &gt; 0)</div><div class='del'>-	    || (s-&gt;nonfatal &amp;&amp; camel_test_verbose &gt; 2)) {</div><div class='del'>-		g_hash_table_foreach(info_table, (GHFunc)dump_action, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (s-&gt;nonfatal == 0) {</div><div class='del'>-		exit(1);</div><div class='del'>-	} else {</div><div class='del'>-		ok=0;</div><div class='del'>-		if (camel_test_verbose &gt; 1) {</div><div class='del'>-			printf("Known problem (ignored):\n");</div><div class='del'>-			dump_action(CAMEL_TEST_ID, s, 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_UNLOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_nonfatal(const char *what, ...)</div><div class='del'>-{</div><div class='del'>-	struct _stack *node;</div><div class='del'>-	va_list ap;</div><div class='del'>-	char *text;</div><div class='del'>-	struct _state *s;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_LOCK;</div><div class='del'>-</div><div class='del'>-	s = current_state();</div><div class='del'>-</div><div class='del'>-	va_start(ap, what);</div><div class='del'>-	text = g_strdup_vprintf(what, ap);</div><div class='del'>-	va_end(ap);</div><div class='del'>-</div><div class='del'>-	if (camel_test_verbose &gt; 3)</div><div class='del'>-		printf("Start nonfatal: %s\n", text);</div><div class='del'>-</div><div class='del'>-	node = g_malloc(sizeof(*node));</div><div class='del'>-	node-&gt;what = text;</div><div class='del'>-	node-&gt;next = s-&gt;state;</div><div class='del'>-	node-&gt;fatal = 0;</div><div class='del'>-	s-&gt;nonfatal++;</div><div class='del'>-	s-&gt;state = node;</div><div class='del'>-</div><div class='del'>-	CAMEL_TEST_UNLOCK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_fatal(void)</div><div class='del'>-{</div><div class='del'>-	camel_test_pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_test_end(void)</div><div class='del'>-{</div><div class='del'>-	if (camel_test_verbose &gt; 0) {</div><div class='del'>-		if (ok)</div><div class='del'>-			printf("Ok\n");</div><div class='del'>-		else</div><div class='del'>-			printf("Partial success\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fflush(stdout);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* compare strings, ignore whitespace though */</div><div class='del'>-int string_equal(const char *a, const char *b)</div><div class='del'>-{</div><div class='del'>-	const char *ap, *bp;</div><div class='del'>-</div><div class='del'>-	ap = a;</div><div class='del'>-	bp = b;</div><div class='del'>-</div><div class='del'>-	while (*ap &amp;&amp; *bp) {</div><div class='del'>-		while (*ap == ' ' || *ap == '\n' || *ap == '\t')</div><div class='del'>-			ap++;</div><div class='del'>-		while (*bp == ' ' || *bp == '\n' || *bp == '\t')</div><div class='del'>-			bp++;</div><div class='del'>-</div><div class='del'>-		a = ap;</div><div class='del'>-		b = bp;</div><div class='del'>-</div><div class='del'>-		while (*ap &amp;&amp; *ap != ' ' &amp;&amp; *ap != '\n' &amp;&amp; *ap != '\t')</div><div class='del'>-			ap++;</div><div class='del'>-		while (*bp &amp;&amp; *bp != ' ' &amp;&amp; *bp != '\n' &amp;&amp; *bp != '\t')</div><div class='del'>-			bp++;</div><div class='del'>-</div><div class='del'>-		if (ap - a != bp - a</div><div class='del'>-		    &amp;&amp; ap - 1 &gt; 0</div><div class='del'>-		    &amp;&amp; memcmp(a, b, ap-a) != 0) {</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/lib/camel-test.h b/camel/tests/lib/camel-test.h<br/>deleted file mode 100644<br/>index 986a943fa3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/camel-test.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/camel-test.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-</div><div class='del'>-/* some utilities for testing */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-void camel_test_failv(const char *why, va_list ap);</div><div class='del'>-</div><div class='del'>-/* perform a check assertion */</div><div class='del'>-#define check(x) do {if (!(x)) { camel_test_fail("%s:%d: %s", __FILE__, __LINE__, #x); } } while (0)</div><div class='del'>-/* check with message */</div><div class='del'>-#ifdef  __GNUC__</div><div class='del'>-#define check_msg(x, y, z...) do {if (!(x)) { camel_test_fail("%s:%d: %s\n\t" #y, __FILE__, __LINE__, #x, ##z); } } while (0)</div><div class='del'>-#else</div><div class='del'>-static void check_msg(int truth, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	/* no gcc, we lose the condition that failed, nm */</div><div class='del'>-	if (!truth) {</div><div class='del'>-		va_list ap;</div><div class='del'>-		va_start(ap, fmt);</div><div class='del'>-		camel_test_failv(fmt, ap);</div><div class='del'>-		va_end(ap);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define check_count(object, expected) do { \</div><div class='del'>-	if (CAMEL_OBJECT(object)-&gt;ref_count != expected) { \</div><div class='del'>-		camel_test_fail("%s-&gt;ref_count != %s\n\tref_count = %d", #object, #expected, CAMEL_OBJECT(object)-&gt;ref_count); \</div><div class='del'>-	} \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define check_unref(object, expected) do { \</div><div class='del'>-	check_count(object, expected); \</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT(object)); \</div><div class='del'>-	if (expected == 1) { \</div><div class='del'>-		object = NULL; \</div><div class='del'>-	} \</div><div class='del'>-} while (0)</div><div class='del'>-</div><div class='del'>-#define test_free(mem) (g_free(mem), mem=NULL)</div><div class='del'>-</div><div class='del'>-#define push camel_test_push</div><div class='del'>-#define pull camel_test_pull</div><div class='del'>-</div><div class='del'>-void camel_test_init(int argc, char **argv);</div><div class='del'>-</div><div class='del'>-/* start/finish a new test */</div><div class='del'>-void camel_test_start(const char *what);</div><div class='del'>-void camel_test_end(void);</div><div class='del'>-</div><div class='del'>-/* start/finish a new test part */</div><div class='del'>-void camel_test_push(const char *what, ...);</div><div class='del'>-void camel_test_pull(void);</div><div class='del'>-</div><div class='del'>-/* fail a test, with a reason why */</div><div class='del'>-void camel_test_fail(const char *why, ...);</div><div class='del'>-void camel_test_failv(const char *why, va_list ap);</div><div class='del'>-</div><div class='del'>-/* Set whether a failed test quits.  May be nested, but must be called in nonfatal/fatal pairs  */</div><div class='del'>-void camel_test_nonfatal(const char *why, ...);</div><div class='del'>-void camel_test_fatal(void);</div><div class='del'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-/* compare strings, ignore whitespace though */</div><div class='del'>-int string_equal(const char *a, const char *b);</div><div class='head'>diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c<br/>deleted file mode 100644<br/>index 86d9a1f3ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/folders.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/folders.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,524 +0,0 @@</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "folders.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-exception.h"</div><div class='del'>-</div><div class='del'>-/* check the total/unread is what we think it should be */</div><div class='del'>-void</div><div class='del'>-test_folder_counts(CamelFolder *folder, int total, int unread)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *s;</div><div class='del'>-	int i, myunread;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	push("test folder counts %d total %d unread", total, unread);</div><div class='del'>-</div><div class='del'>-	/* first, use the standard functions */</div><div class='del'>-	check(camel_folder_get_message_count(folder) == total);</div><div class='del'>-	check(camel_folder_get_unread_message_count(folder) == total);</div><div class='del'>-</div><div class='del'>-	/* next, use the summary */</div><div class='del'>-	s = camel_folder_get_summary(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	check(s-&gt;len == total);</div><div class='del'>-	myunread = s-&gt;len;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		info = s-&gt;pdata[i];</div><div class='del'>-		if (info-&gt;flags &amp; CAMEL_MESSAGE_SEEN)</div><div class='del'>-			myunread--;</div><div class='del'>-	}</div><div class='del'>-	check(unread == myunread);</div><div class='del'>-	camel_folder_free_summary(folder, s);</div><div class='del'>-</div><div class='del'>-	/* last, use the uid list */</div><div class='del'>-	s = camel_folder_get_uids(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	check(s-&gt;len == total);</div><div class='del'>-	myunread = s-&gt;len;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		info = camel_folder_get_message_info(folder, s-&gt;pdata[i]);</div><div class='del'>-		if (info-&gt;flags &amp; CAMEL_MESSAGE_SEEN)</div><div class='del'>-			myunread--;</div><div class='del'>-		camel_folder_free_message_info(folder, info);</div><div class='del'>-	}</div><div class='del'>-	check(unread == myunread);</div><div class='del'>-	camel_folder_free_uids(folder, s);</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-safe_strcmp(const char *a, const char *b)</div><div class='del'>-{</div><div class='del'>-	if (a == NULL &amp;&amp; b == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	if (a == NULL)</div><div class='del'>-		return 1;</div><div class='del'>-	if (b == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-	return strcmp(a, b);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_message_info(CamelMimeMessage *msg, const CamelMessageInfo *info)</div><div class='del'>-{</div><div class='del'>-	check_msg(safe_strcmp(camel_message_info_subject(info), camel_mime_message_get_subject(msg)) == 0,</div><div class='del'>-		  "info-&gt;subject = '%s', get_subject() = '%s'", camel_message_info_subject(info), camel_mime_message_get_subject(msg));</div><div class='del'>-</div><div class='del'>-	/* FIXME: testing from/cc/to, etc is more tricky */</div><div class='del'>-</div><div class='del'>-	check(info-&gt;date_sent == camel_mime_message_get_date(msg, NULL));</div><div class='del'>-</div><div class='del'>-	/* date received isn't set for messages that haven't been sent anywhere ... */</div><div class='del'>-	/*check(info-&gt;date_received == camel_mime_message_get_date_received(msg, NULL));*/</div><div class='del'>-</div><div class='del'>-	/* so is messageid/references, etc */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check a message is present */</div><div class='del'>-void</div><div class='del'>-test_folder_message(CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *s;</div><div class='del'>-	int i;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	int found;</div><div class='del'>-</div><div class='del'>-	push("uid %s is in folder", uid);</div><div class='del'>-</div><div class='del'>-	/* first try getting info */</div><div class='del'>-	info = camel_folder_get_message_info(folder, uid);</div><div class='del'>-	check(info != NULL);</div><div class='del'>-	check(strcmp(camel_message_info_uid(info), uid) == 0);</div><div class='del'>-	camel_folder_free_message_info(folder, info);</div><div class='del'>-</div><div class='del'>-	/* then, getting message */</div><div class='del'>-	msg = camel_folder_get_message(folder, uid, ex);</div><div class='del'>-	check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-	check(msg != NULL);</div><div class='del'>-</div><div class='del'>-	/* cross check with info */</div><div class='del'>-	test_message_info(msg, info);</div><div class='del'>-</div><div class='del'>-	camel_object_unref((CamelObject *)msg);</div><div class='del'>-</div><div class='del'>-	/* see if it is in the summary (only once) */</div><div class='del'>-	s = camel_folder_get_summary(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	found = 0;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		info = s-&gt;pdata[i];</div><div class='del'>-		if (strcmp(camel_message_info_uid(info), uid) == 0)</div><div class='del'>-			found++;</div><div class='del'>-	}</div><div class='del'>-	check(found == 1);</div><div class='del'>-	camel_folder_free_summary(folder, s);</div><div class='del'>-</div><div class='del'>-	/* check it is in the uid list */</div><div class='del'>-	s = camel_folder_get_uids(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	found = 0;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		if (strcmp(s-&gt;pdata[i], uid) == 0)</div><div class='del'>-			found++;</div><div class='del'>-	}</div><div class='del'>-	check(found == 1);</div><div class='del'>-	camel_folder_free_uids(folder, s);</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* check message not present */</div><div class='del'>-void</div><div class='del'>-test_folder_not_message(CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *s;</div><div class='del'>-	int i;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	int found;</div><div class='del'>-</div><div class='del'>-	push("uid %s is not in folder", uid);</div><div class='del'>-</div><div class='del'>-	/* first try getting info */</div><div class='del'>-	info = camel_folder_get_message_info(folder, uid);</div><div class='del'>-	check(info == NULL);</div><div class='del'>-</div><div class='del'>-	/* then, getting message */</div><div class='del'>-	msg = camel_folder_get_message(folder, uid, ex);</div><div class='del'>-	check(camel_exception_is_set(ex));</div><div class='del'>-	check(msg == NULL);</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-</div><div class='del'>-	/* see if it is not in the summary (only once) */</div><div class='del'>-	s = camel_folder_get_summary(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	found = 0;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		info = s-&gt;pdata[i];</div><div class='del'>-		if (strcmp(camel_message_info_uid(info), uid) == 0)</div><div class='del'>-			found++;</div><div class='del'>-	}</div><div class='del'>-	check(found == 0);</div><div class='del'>-	camel_folder_free_summary(folder, s);</div><div class='del'>-</div><div class='del'>-	/* check it is not in the uid list */</div><div class='del'>-	s = camel_folder_get_uids(folder);</div><div class='del'>-	check(s != NULL);</div><div class='del'>-	found = 0;</div><div class='del'>-	for (i=0;i&lt;s-&gt;len;i++) {</div><div class='del'>-		if (strcmp(s-&gt;pdata[i], uid) == 0)</div><div class='del'>-			found++;</div><div class='del'>-	}</div><div class='del'>-	check(found == 0);</div><div class='del'>-	camel_folder_free_uids(folder, s);</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* test basic store operations on folders */</div><div class='del'>-/* TODO: Add subscription stuff */</div><div class='del'>-void</div><div class='del'>-test_folder_basic(CamelSession *session, const char *storename, int local, int spool)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	char *what = g_strdup_printf("testing store: %s", storename);</div><div class='del'>-</div><div class='del'>-	camel_test_start(what);</div><div class='del'>-	test_free(what);</div><div class='del'>-</div><div class='del'>-	push("getting store");</div><div class='del'>-	store = camel_session_get_store(session, storename, ex);</div><div class='del'>-	check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));</div><div class='del'>-	check(store != NULL);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	/* local providers == no inbox */</div><div class='del'>-	push("getting inbox folder");</div><div class='del'>-	folder = camel_store_get_inbox(store, ex);</div><div class='del'>-	if (local) {</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		check(folder == NULL);</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-	} else {</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("getting a non-existant folder, no create");</div><div class='del'>-	folder = camel_store_get_folder(store, "unknown", 0, ex);</div><div class='del'>-	check(camel_exception_is_set(ex));</div><div class='del'>-	check(folder == NULL);</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	if (!spool) {</div><div class='del'>-		push("getting a non-existant folder, with create");</div><div class='del'>-		folder = camel_store_get_folder(store, "testbox", CAMEL_STORE_FOLDER_CREATE, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("getting an existing folder");</div><div class='del'>-		folder = camel_store_get_folder(store, "testbox", 0, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("renaming a non-existant folder");</div><div class='del'>-		camel_store_rename_folder(store, "unknown1", "unknown2", ex);</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("renaming an existing folder");</div><div class='del'>-		camel_store_rename_folder(store, "testbox", "testbox2", ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("opening the old name of a renamed folder");</div><div class='del'>-		folder = camel_store_get_folder(store, "testbox", 0, ex);</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		check(folder == NULL);</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("opening the new name of a renamed folder");</div><div class='del'>-		folder = camel_store_get_folder(store, "testbox2", 0, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	push("deleting a non-existant folder");</div><div class='del'>-	camel_store_delete_folder(store, "unknown", ex);</div><div class='del'>-	check(camel_exception_is_set(ex));</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	if (!spool) {</div><div class='del'>-		push("deleting an existing folder");</div><div class='del'>-		camel_store_delete_folder(store, "testbox2", ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	push("opening a folder that has been deleted");</div><div class='del'>-	folder = camel_store_get_folder(store, "testbox2", 0, ex);</div><div class='del'>-	check(camel_exception_is_set(ex));</div><div class='del'>-	check(folder == NULL);</div><div class='del'>-	camel_exception_clear(ex);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	check_unref(store, 1);</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* todo: cross-check everything with folder_info checks as well */</div><div class='del'>-/* this should probably take a folder instead of a session ... */</div><div class='del'>-void</div><div class='del'>-test_folder_message_ops(CamelSession *session, const char *name, int local, int spool)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store;</div><div class='del'>-	CamelException *ex = camel_exception_new();</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	int j;</div><div class='del'>-	int indexed, max;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *mailbox;</div><div class='del'>-</div><div class='del'>-	if (spool)</div><div class='del'>-		mailbox = "INBOX";</div><div class='del'>-	else</div><div class='del'>-		mailbox = "testbox";</div><div class='del'>-</div><div class='del'>-	max=local?2:1;</div><div class='del'>-</div><div class='del'>-	for (indexed = 0;indexed&lt;max;indexed++) {</div><div class='del'>-		char *what = g_strdup_printf("folder ops: %s %s", name, local?(indexed?"indexed":"non-indexed"):"");</div><div class='del'>-		int flags;</div><div class='del'>-</div><div class='del'>-		camel_test_start(what);</div><div class='del'>-		test_free(what);</div><div class='del'>-</div><div class='del'>-		push("getting store");</div><div class='del'>-		store = camel_session_get_store(session, name, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "getting store: %s", camel_exception_get_description(ex));</div><div class='del'>-		check(store != NULL);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("creating %sindexed folder", indexed?"":"non-");</div><div class='del'>-		if (indexed)</div><div class='del'>-			flags = CAMEL_STORE_FOLDER_CREATE|CAMEL_STORE_FOLDER_BODY_INDEX;</div><div class='del'>-		else</div><div class='del'>-			flags = CAMEL_STORE_FOLDER_CREATE;</div><div class='del'>-		folder = camel_store_get_folder(store, mailbox, flags, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-</div><div class='del'>-		/* verify empty/can't get nonexistant stuff */</div><div class='del'>-		test_folder_counts(folder, 0, 0);</div><div class='del'>-		test_folder_not_message(folder, "0");</div><div class='del'>-		test_folder_not_message(folder, "");</div><div class='del'>-</div><div class='del'>-		for (j=0;j&lt;10;j++) {</div><div class='del'>-			char *content, *subject;</div><div class='del'>-</div><div class='del'>-			push("creating test message");</div><div class='del'>-			msg = test_message_create_simple();</div><div class='del'>-			content = g_strdup_printf("Test message %d contents\n\n", j);</div><div class='del'>-			test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain",</div><div class='del'>-							content, strlen(content));</div><div class='del'>-			test_free(content);</div><div class='del'>-			subject = g_strdup_printf("Test message %d", j);</div><div class='del'>-			camel_mime_message_set_subject(msg, subject);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("appending simple message %d", j);</div><div class='del'>-			camel_folder_append_message(folder, msg, NULL, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-</div><div class='del'>-			/* sigh, this shouldn't be required, but the imap code is too dumb to do it itself */</div><div class='del'>-			if (!local) {</div><div class='del'>-				push("forcing a refresh of folder updates");</div><div class='del'>-				camel_folder_refresh_info(folder, ex);</div><div class='del'>-				check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-				pull();</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!local)</div><div class='del'>-				camel_test_nonfatal("unread counts dont seem right for imap");</div><div class='del'>-</div><div class='del'>-			test_folder_counts(folder, j+1, j+1);</div><div class='del'>-</div><div class='del'>-			if (!local)</div><div class='del'>-				camel_test_fatal();</div><div class='del'>-</div><div class='del'>-			push("checking it is in the right uid slot &amp; exists");</div><div class='del'>-			uids = camel_folder_get_uids(folder);</div><div class='del'>-			check(uids != NULL);</div><div class='del'>-			check(uids-&gt;len == j+1);</div><div class='del'>-			test_folder_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("checking it is the right message (subject): %s", subject);</div><div class='del'>-			info = camel_folder_get_message_info(folder, uids-&gt;pdata[j]);</div><div class='del'>-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,</div><div class='del'>-				  "info-&gt;subject %s", camel_message_info_subject(info));</div><div class='del'>-			camel_folder_free_uids(folder, uids);</div><div class='del'>-			camel_folder_free_message_info(folder, info);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			test_free(subject);</div><div class='del'>-</div><div class='del'>-			check_unref(msg, 1);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("deleting test folder, with messages in it");</div><div class='del'>-		camel_store_delete_folder(store, mailbox, ex);</div><div class='del'>-		check(camel_exception_is_set(ex));</div><div class='del'>-		camel_exception_clear(ex);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("re-opening folder");</div><div class='del'>-		folder = camel_store_get_folder(store, mailbox, flags, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		check(folder != NULL);</div><div class='del'>-</div><div class='del'>-			/* verify counts */</div><div class='del'>-		test_folder_counts(folder, 10, 10);</div><div class='del'>-</div><div class='del'>-		/* re-check uid's, after a reload */</div><div class='del'>-		uids = camel_folder_get_uids(folder);</div><div class='del'>-		check(uids != NULL);</div><div class='del'>-		check(uids-&gt;len == 10);</div><div class='del'>-		for (j=0;j&lt;10;j++) {</div><div class='del'>-			char *subject = g_strdup_printf("Test message %d", j);</div><div class='del'>-</div><div class='del'>-			push("verify reload of %s", subject);</div><div class='del'>-			test_folder_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-</div><div class='del'>-			info = camel_folder_get_message_info(folder, uids-&gt;pdata[j]);</div><div class='del'>-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,</div><div class='del'>-				  "info-&gt;subject %s", camel_message_info_subject(info));</div><div class='del'>-			test_free(subject);</div><div class='del'>-			camel_folder_free_message_info(folder, info);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		push("deleting first message &amp; expunging");</div><div class='del'>-		camel_folder_delete_message(folder, uids-&gt;pdata[0]);</div><div class='del'>-		test_folder_counts(folder, 10, 10);</div><div class='del'>-		camel_folder_expunge(folder, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		test_folder_not_message(folder, uids-&gt;pdata[0]);</div><div class='del'>-		test_folder_counts(folder, 9, 9);</div><div class='del'>-</div><div class='del'>-		camel_folder_free_uids(folder, uids);</div><div class='del'>-</div><div class='del'>-		uids = camel_folder_get_uids(folder);</div><div class='del'>-		check(uids != NULL);</div><div class='del'>-		check(uids-&gt;len == 9);</div><div class='del'>-		for (j=0;j&lt;9;j++) {</div><div class='del'>-			char *subject = g_strdup_printf("Test message %d", j+1);</div><div class='del'>-</div><div class='del'>-			push("verify after expunge of %s", subject);</div><div class='del'>-			test_folder_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-</div><div class='del'>-			info = camel_folder_get_message_info(folder, uids-&gt;pdata[j]);</div><div class='del'>-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,</div><div class='del'>-				  "info-&gt;subject %s", camel_message_info_subject(info));</div><div class='del'>-			test_free(subject);</div><div class='del'>-			camel_folder_free_message_info(folder, info);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("deleting last message &amp; expunging");</div><div class='del'>-		camel_folder_delete_message(folder, uids-&gt;pdata[8]);</div><div class='del'>-		/* sync? */</div><div class='del'>-		test_folder_counts(folder, 9, 9);</div><div class='del'>-		camel_folder_expunge(folder, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		test_folder_not_message(folder, uids-&gt;pdata[8]);</div><div class='del'>-		test_folder_counts(folder, 8, 8);</div><div class='del'>-</div><div class='del'>-		camel_folder_free_uids(folder, uids);</div><div class='del'>-</div><div class='del'>-		uids = camel_folder_get_uids(folder);</div><div class='del'>-		check(uids != NULL);</div><div class='del'>-		check(uids-&gt;len == 8);</div><div class='del'>-		for (j=0;j&lt;8;j++) {</div><div class='del'>-			char *subject = g_strdup_printf("Test message %d", j+1);</div><div class='del'>-</div><div class='del'>-			push("verify after expunge of %s", subject);</div><div class='del'>-			test_folder_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-</div><div class='del'>-			info = camel_folder_get_message_info(folder, uids-&gt;pdata[j]);</div><div class='del'>-			check_msg(strcmp(camel_message_info_subject(info), subject)==0,</div><div class='del'>-				  "info-&gt;subject %s", camel_message_info_subject(info));</div><div class='del'>-			test_free(subject);</div><div class='del'>-			camel_folder_free_message_info(folder, info);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("deleting all messages &amp; expunging");</div><div class='del'>-		for (j=0;j&lt;8;j++) {</div><div class='del'>-			camel_folder_delete_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-		}</div><div class='del'>-		/* sync? */</div><div class='del'>-		test_folder_counts(folder, 8, 8);</div><div class='del'>-		camel_folder_expunge(folder, ex);</div><div class='del'>-		check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-		for (j=0;j&lt;8;j++) {</div><div class='del'>-			test_folder_not_message(folder, uids-&gt;pdata[j]);</div><div class='del'>-		}</div><div class='del'>-		test_folder_counts(folder, 0, 0);</div><div class='del'>-</div><div class='del'>-		camel_folder_free_uids(folder, uids);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		check_unref(folder, 1);</div><div class='del'>-		pull(); /* re-opening folder */</div><div class='del'>-</div><div class='del'>-		if (!spool) {</div><div class='del'>-			push("deleting test folder, with no messages in it");</div><div class='del'>-			camel_store_delete_folder(store, mailbox, ex);</div><div class='del'>-			check_msg(!camel_exception_is_set(ex), "%s", camel_exception_get_description(ex));</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		check_unref(store, 1);</div><div class='del'>-		camel_test_end();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/lib/folders.h b/camel/tests/lib/folders.h<br/>deleted file mode 100644<br/>index d3c9686dc2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/folders.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/folders.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include "camel/camel-session.h"</div><div class='del'>-#include "camel/camel-store.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-/* check the total/unread is what we think it should be, everywhere it can be determined */</div><div class='del'>-void test_folder_counts(CamelFolder *folder, int total, int unread);</div><div class='del'>-/* cross-check info/msg */</div><div class='del'>-void test_message_info(CamelMimeMessage *msg, const CamelMessageInfo *info);</div><div class='del'>-/* check a message is present everywhere it should be */</div><div class='del'>-void test_folder_message(CamelFolder *folder, const char *uid);</div><div class='del'>-/* check message not present everywhere it shouldn't be */</div><div class='del'>-void test_folder_not_message(CamelFolder *folder, const char *uid);</div><div class='del'>-/* test basic folder ops on a store */</div><div class='del'>-void test_folder_basic(CamelSession *session, const char *storename, int local, int spool);</div><div class='del'>-/* test basic message operations on a folder */</div><div class='del'>-void test_folder_message_ops(CamelSession *session, const char *storename, int local, int spool);</div><div class='head'>diff --git a/camel/tests/lib/messages.c b/camel/tests/lib/messages.c<br/>deleted file mode 100644<br/>index 21d77582ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/messages.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/messages.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-test_message_create_simple(void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-</div><div class='del'>-	msg = camel_mime_message_new();</div><div class='del'>-</div><div class='del'>-	addr = camel_internet_address_new();</div><div class='del'>-	camel_internet_address_add(addr, "Michael Zucchi", "zed@nowhere.com");</div><div class='del'>-	camel_mime_message_set_from(msg, addr);</div><div class='del'>-	camel_address_remove((CamelAddress *)addr, -1);</div><div class='del'>-	camel_internet_address_add(addr, "POSTMASTER", "POSTMASTER@somewhere.net");</div><div class='del'>-	camel_mime_message_set_recipients(msg, CAMEL_RECIPIENT_TYPE_TO, addr);</div><div class='del'>-	camel_address_remove((CamelAddress *)addr, -1);</div><div class='del'>-	camel_internet_address_add(addr, "Michael Zucchi", "zed@nowhere.com");</div><div class='del'>-	camel_mime_message_set_recipients(msg, CAMEL_RECIPIENT_TYPE_CC, addr);</div><div class='del'>-</div><div class='del'>-	check_unref(addr, 1);</div><div class='del'>-</div><div class='del'>-	camel_mime_message_set_subject(msg, "Simple message subject");</div><div class='del'>-	camel_mime_message_set_date(msg, time(0), 930);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-content_finalise(CamelObject *folder, void *crap, void *ba)</div><div class='del'>-{</div><div class='del'>-	g_byte_array_free(ba, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_message_set_content_simple(CamelMimePart *part, int how, const char *type, const char *text, int len)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *content = NULL;</div><div class='del'>-	CamelDataWrapper *dw;</div><div class='del'>-	static GByteArray *ba;</div><div class='del'>-</div><div class='del'>-	switch (how) {</div><div class='del'>-	case 0:</div><div class='del'>-		camel_mime_part_set_content(part, text, len, type);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		content = (CamelStreamMem *)camel_stream_mem_new_with_buffer(text, len);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		content = (CamelStreamMem *)camel_stream_mem_new();</div><div class='del'>-		camel_stream_mem_set_buffer(content, text, len);</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		ba = g_byte_array_new();</div><div class='del'>-		g_byte_array_append(ba, text, len);</div><div class='del'>-</div><div class='del'>-		content = (CamelStreamMem *)camel_stream_mem_new_with_byte_array(ba);</div><div class='del'>-		ba = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case 4:</div><div class='del'>-		ba = g_byte_array_new();</div><div class='del'>-		g_byte_array_append(ba, text, len);</div><div class='del'>-</div><div class='del'>-		content = (CamelStreamMem *)camel_stream_mem_new();</div><div class='del'>-		camel_stream_mem_set_byte_array(content, ba);</div><div class='del'>-</div><div class='del'>-		camel_object_hook_event((CamelObject *)content, "finalize", content_finalise, ba);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (content != 0) {</div><div class='del'>-		dw = camel_data_wrapper_new();</div><div class='del'>-                camel_data_wrapper_set_mime_type (dw, type);</div><div class='del'>-</div><div class='del'>-		camel_data_wrapper_construct_from_stream(dw, (CamelStream *)content);</div><div class='del'>-		camel_medium_set_content_object((CamelMedium *)part, dw);</div><div class='del'>-</div><div class='del'>-		check_unref(content, 2);</div><div class='del'>-		check_unref(dw, 2);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-test_message_write_file(CamelMimeMessage *msg, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *file;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	file = (CamelStreamFs *)camel_stream_fs_new_with_name(name, O_CREAT|O_WRONLY, 0600);</div><div class='del'>-	camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, (CamelStream *)file);</div><div class='del'>-	ret = camel_stream_close((CamelStream *)file);</div><div class='del'>-</div><div class='del'>-	check(((CamelObject *)file)-&gt;ref_count == 1);</div><div class='del'>-	camel_object_unref((CamelObject *)file);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-test_message_read_file(const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *file;</div><div class='del'>-	CamelMimeMessage *msg2;</div><div class='del'>-</div><div class='del'>-	file = (CamelStreamFs *)camel_stream_fs_new_with_name(name, O_RDONLY, 0);</div><div class='del'>-	msg2 = camel_mime_message_new();</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg2, (CamelStream *)file);</div><div class='del'>-	/* file's refcount may be &gt; 1 if the message is real big */</div><div class='del'>-	check(CAMEL_OBJECT(file)-&gt;ref_count &gt;=1);</div><div class='del'>-	camel_object_unref((CamelObject *)file);</div><div class='del'>-</div><div class='del'>-	return msg2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-test_message_compare_content(CamelDataWrapper *dw, const char *text, int len)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *content;</div><div class='del'>-</div><div class='del'>-	/* sigh, ok, so i len == 0, dw will probably be 0 too</div><div class='del'>-	   camel_mime_part_set_content is weird like that */</div><div class='del'>-	if (dw == 0 &amp;&amp; len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	content = (CamelStreamMem *)camel_stream_mem_new();</div><div class='del'>-	camel_data_wrapper_write_to_stream(dw, (CamelStream *)content);</div><div class='del'>-</div><div class='del'>-	check_msg(content-&gt;buffer-&gt;len == len, "buffer-&gt;len = %d, len = %d", content-&gt;buffer-&gt;len, len);</div><div class='del'>-	check_msg(memcmp(content-&gt;buffer-&gt;data, text, content-&gt;buffer-&gt;len) == 0, "len = %d", len);</div><div class='del'>-</div><div class='del'>-	check_unref(content, 1);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-test_message_compare_header(CamelMimeMessage *m1, CamelMimeMessage *m2)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-test_message_compare_messages(CamelMimeMessage *m1, CamelMimeMessage *m2)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/lib/messages.h b/camel/tests/lib/messages.h<br/>deleted file mode 100644<br/>index 9cb5758826..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/messages.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/messages.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-</div><div class='del'>-/* how many ways to set the content contents */</div><div class='del'>-#define SET_CONTENT_WAYS (5)</div><div class='del'>-</div><div class='del'>-/* messages.c */</div><div class='del'>-CamelMimeMessage *test_message_create_simple(void);</div><div class='del'>-void test_message_set_content_simple(CamelMimePart *part, int how, const char *type, const char *text, int len);</div><div class='del'>-int test_message_write_file(CamelMimeMessage *msg, const char *name);</div><div class='del'>-CamelMimeMessage *test_message_read_file(const char *name);</div><div class='del'>-int test_message_compare_content(CamelDataWrapper *dw, const char *text, int len);</div><div class='head'>diff --git a/camel/tests/lib/session.c b/camel/tests/lib/session.c<br/>deleted file mode 100644<br/>index 2ebf6e2d7f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/session.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/session.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-register_timeout (CamelSession *session, guint32 interval, CamelTimeoutCallback callback, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-unregister_timeout (CamelSession *session, guint handle)</div><div class='del'>-{</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (CamelTestSessionClass *camel_test_session_class)</div><div class='del'>-{</div><div class='del'>-	CamelSessionClass *camel_session_class =</div><div class='del'>-		CAMEL_SESSION_CLASS (camel_test_session_class);</div><div class='del'>-	</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	camel_session_class-&gt;register_timeout = register_timeout;</div><div class='del'>-	camel_session_class-&gt;remove_timeout = unregister_timeout;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_test_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (</div><div class='del'>-			camel_session_get_type (),</div><div class='del'>-			"CamelTestSession",</div><div class='del'>-			sizeof (CamelTestSession),</div><div class='del'>-			sizeof (CamelTestSessionClass),</div><div class='del'>-			(CamelObjectClassInitFunc) class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelSession *</div><div class='del'>-camel_test_session_new (const char *path)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	</div><div class='del'>-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_session_construct (session, path);</div><div class='del'>-	</div><div class='del'>-	return session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/lib/session.h b/camel/tests/lib/session.h<br/>deleted file mode 100644<br/>index e69ef65e2e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/session.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/session.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-#include &lt;camel/camel-session.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())</div><div class='del'>-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))</div><div class='del'>-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))</div><div class='del'>-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTestSession {</div><div class='del'>-	CamelSession parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelTestSession;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTestSessionClass {</div><div class='del'>-	CamelSessionClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelTestSessionClass;</div><div class='del'>-</div><div class='del'>-CamelType camel_test_session_get_type (void);</div><div class='del'>-CamelSession *camel_test_session_new (const char *path);</div><div class='head'>diff --git a/camel/tests/lib/streams.c b/camel/tests/lib/streams.c<br/>deleted file mode 100644<br/>index e4dc006363..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/streams.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/streams.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,244 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-	stream tests</div><div class='del'>-</div><div class='del'>-	todo: do we need a seek test that seeks beyond the eos, writes,</div><div class='del'>-		then reads and checks for 0's in the space?</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-stream.h"</div><div class='del'>-#include "camel/camel-seekable-stream.h"</div><div class='del'>-#include "camel/camel-seekable-substream.h"</div><div class='del'>-</div><div class='del'>-#include "streams.h"</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-static char teststring[] = "\xaa\x55\xc0\x0c\xff\x00";</div><div class='del'>-static char testbuf[10240];</div><div class='del'>-</div><div class='del'>-/* pass in an empty read/write stream */</div><div class='del'>-void</div><div class='del'>-test_stream_seekable_writepart(CamelSeekableStream *s)</div><div class='del'>-{</div><div class='del'>-	off_t end;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	push("seekable stream test, writing ");</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_tell(s) == 0);</div><div class='del'>-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_SET) == 0);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == 0);</div><div class='del'>-</div><div class='del'>-	check(camel_stream_write(CAMEL_STREAM(s), "", 0) == 0);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == 0);</div><div class='del'>-	check(camel_stream_write(CAMEL_STREAM(s), "\n", 1) == 1);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == 1);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;10240;i++) {</div><div class='del'>-		check(camel_stream_write(CAMEL_STREAM(s), teststring, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-		check(camel_seekable_stream_tell(s) == 1 + (i+1)*sizeof(teststring));</div><div class='del'>-	}</div><div class='del'>-	end = 10240*sizeof(teststring)+1;</div><div class='del'>-</div><div class='del'>-	check_msg(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END) == end, "seek =%d end = %d",</div><div class='del'>-		  camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END), end);</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_END) == end);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == end);</div><div class='del'>-	/* need to read 0 first to set eos */</div><div class='del'>-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 0);</div><div class='del'>-	check(camel_stream_eos(CAMEL_STREAM(s)));</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_stream_seekable_readpart(CamelSeekableStream *s)</div><div class='del'>-{</div><div class='del'>-	off_t off, new, end;</div><div class='del'>-	int i, j;</div><div class='del'>-</div><div class='del'>-	push("seekable stream test, re-reading");</div><div class='del'>-</div><div class='del'>-	end = 10240*sizeof(teststring)+1;</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_SET) == 0);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == 0);</div><div class='del'>-	check(!camel_stream_eos(CAMEL_STREAM(s)));</div><div class='del'>-</div><div class='del'>-	off = 0;</div><div class='del'>-	for (i=0;i&lt;1024;i++) {</div><div class='del'>-</div><div class='del'>-		new = i*3;</div><div class='del'>-</div><div class='del'>-		/* exercise all seek methods */</div><div class='del'>-		switch(i % 3) {</div><div class='del'>-		case 0:</div><div class='del'>-			check(camel_seekable_stream_seek(s, new, CAMEL_STREAM_SET) == new);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			check(camel_seekable_stream_seek(s, new-off, CAMEL_STREAM_CUR) == new);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			check(camel_seekable_stream_seek(s, new-end, CAMEL_STREAM_END) == new);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(camel_seekable_stream_tell(s) == new);</div><div class='del'>-</div><div class='del'>-		check(camel_stream_read(CAMEL_STREAM(s), testbuf, i*3) == i*3);</div><div class='del'>-		for (j=0;j&lt;i*3;j++) {</div><div class='del'>-			int k = new + j;</div><div class='del'>-</div><div class='del'>-			if (k==0) {</div><div class='del'>-				check(testbuf[j] == '\n');</div><div class='del'>-			} else {</div><div class='del'>-				check(testbuf[j] == teststring[(k-1) % sizeof(teststring)]);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		off = new+i*3;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* verify end-of-file behaviour */</div><div class='del'>-	check(camel_seekable_stream_seek(s, -1, CAMEL_STREAM_END) == end-1);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == end-1);</div><div class='del'>-</div><div class='del'>-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 1);</div><div class='del'>-	check(testbuf[0] == teststring[sizeof(teststring)-1]);</div><div class='del'>-</div><div class='del'>-	check(camel_stream_read(CAMEL_STREAM(s), testbuf, 10240) == 0);</div><div class='del'>-	check(camel_seekable_stream_seek(s, 0, CAMEL_STREAM_CUR) == end);</div><div class='del'>-	check(camel_seekable_stream_tell(s) == end);</div><div class='del'>-	check(camel_stream_eos(CAMEL_STREAM(s)));</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  0 = write to the substream</div><div class='del'>-  1 = write to the parent stream at the right spot</div><div class='del'>-*/</div><div class='del'>-void</div><div class='del'>-test_seekable_substream_writepart(CamelStream *s, int type)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *ss = (CamelSeekableStream *)s;</div><div class='del'>-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s;</div><div class='del'>-	CamelSeekableStream *sp = sus-&gt;parent_stream;</div><div class='del'>-	int i, len;</div><div class='del'>-	off_t end;</div><div class='del'>-</div><div class='del'>-	push("writing substream, type %d", type);</div><div class='del'>-</div><div class='del'>-	if (type == 1) {</div><div class='del'>-		check(camel_seekable_stream_seek(sp, ss-&gt;bound_start, CAMEL_STREAM_SET) == ss-&gt;bound_start);</div><div class='del'>-		s = (CamelStream *)sp;</div><div class='del'>-	} else {</div><div class='del'>-		check(camel_seekable_stream_tell(ss) == ss-&gt;bound_start);</div><div class='del'>-		check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_SET) == ss-&gt;bound_start);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	check(camel_stream_write(s, "", 0) == 0);</div><div class='del'>-	check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	/* fill up the bounds with writes */</div><div class='del'>-	if (ss-&gt;bound_end != CAMEL_STREAM_UNBOUND) {</div><div class='del'>-		for (i=0;i&lt;(ss-&gt;bound_end-ss-&gt;bound_start)/sizeof(teststring);i++) {</div><div class='del'>-			check(camel_stream_write(s, teststring, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-		}</div><div class='del'>-		len = (ss-&gt;bound_end-ss-&gt;bound_start) % sizeof(teststring);</div><div class='del'>-		check(camel_stream_write(s, teststring, len) == len);</div><div class='del'>-		check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_end);</div><div class='del'>-		if (type == 0) {</div><div class='del'>-			check(camel_stream_write(s, teststring, sizeof(teststring)) == 0);</div><div class='del'>-			check(camel_stream_eos(s));</div><div class='del'>-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_end);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* just 10K */</div><div class='del'>-		for (i=0;i&lt;10240;i++) {</div><div class='del'>-			check(camel_stream_write(CAMEL_STREAM(s), teststring, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(camel_seekable_stream_tell(CAMEL_SEEKABLE_STREAM(s)) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we can't really verify any end length here */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_seekable_substream_readpart(CamelStream *s)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *ss = (CamelSeekableStream *)s;</div><div class='del'>-	CamelSeekableSubstream *sus = (CamelSeekableSubstream *)s;</div><div class='del'>-	CamelSeekableStream *sp = sus-&gt;parent_stream;</div><div class='del'>-	int i, len;</div><div class='del'>-	off_t end;</div><div class='del'>-</div><div class='del'>-	push("reading substream");</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_SET) == ss-&gt;bound_start);</div><div class='del'>-	check(camel_seekable_stream_tell(ss) == ss-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	check(camel_seekable_stream_seek(sp, ss-&gt;bound_start, CAMEL_STREAM_SET) == ss-&gt;bound_start);</div><div class='del'>-	check(camel_seekable_stream_tell(sp) == ss-&gt;bound_start);</div><div class='del'>-</div><div class='del'>-	/* check writes, cross check with parent stream */</div><div class='del'>-	if (ss-&gt;bound_end != CAMEL_STREAM_UNBOUND) {</div><div class='del'>-		for (i=0;i&lt;(ss-&gt;bound_end-ss-&gt;bound_start)/sizeof(teststring);i++) {</div><div class='del'>-			check(camel_stream_read(s, testbuf, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);</div><div class='del'>-			check(camel_seekable_stream_tell(ss) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-</div><div class='del'>-			/* yeah great, the substreams affect the seek ... */</div><div class='del'>-			check(camel_seekable_stream_seek(sp, ss-&gt;bound_start + (i)*sizeof(teststring), CAMEL_STREAM_SET) == ss-&gt;bound_start + i*sizeof(teststring));</div><div class='del'>-			check(camel_stream_read(CAMEL_STREAM(sp), testbuf, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);</div><div class='del'>-			check(camel_seekable_stream_tell(sp) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-		}</div><div class='del'>-		len = (ss-&gt;bound_end-ss-&gt;bound_start) % sizeof(teststring);</div><div class='del'>-		check(camel_stream_read(s, testbuf, len) == len);</div><div class='del'>-		check(memcmp(testbuf, teststring, len) == 0);</div><div class='del'>-</div><div class='del'>-		check(camel_seekable_stream_seek(sp, ss-&gt;bound_end - len, CAMEL_STREAM_SET) == ss-&gt;bound_end - len);</div><div class='del'>-		check(camel_stream_read(CAMEL_STREAM(sp), testbuf, len) == len);</div><div class='del'>-		check(memcmp(testbuf, teststring, len) == 0);</div><div class='del'>-</div><div class='del'>-		check(camel_stream_eos(s));</div><div class='del'>-		check(camel_seekable_stream_tell(ss) == ss-&gt;bound_end);</div><div class='del'>-		check(camel_seekable_stream_tell(sp) == ss-&gt;bound_end);</div><div class='del'>-		check(camel_stream_read(s, testbuf, 1024) == 0);</div><div class='del'>-		check(camel_seekable_stream_tell(ss) == ss-&gt;bound_end);</div><div class='del'>-		check(camel_seekable_stream_tell(sp) == ss-&gt;bound_end);</div><div class='del'>-		check(camel_stream_eos(s));</div><div class='del'>-	} else {</div><div class='del'>-		/* just 10K */</div><div class='del'>-		for (i=0;i&lt;10240;i++) {</div><div class='del'>-			check(camel_stream_read(s, testbuf, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);</div><div class='del'>-			check(camel_seekable_stream_tell(ss) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-</div><div class='del'>-			check(camel_seekable_stream_seek(sp, ss-&gt;bound_start + (i)*sizeof(teststring), CAMEL_STREAM_SET) == ss-&gt;bound_start + i*sizeof(teststring));</div><div class='del'>-			check(camel_stream_read(CAMEL_STREAM(sp), testbuf, sizeof(teststring)) == sizeof(teststring));</div><div class='del'>-			check(memcmp(testbuf, teststring, sizeof(teststring)) == 0);</div><div class='del'>-			check(camel_seekable_stream_tell(sp) == ss-&gt;bound_start + (i+1)*sizeof(teststring));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* unbound - we dont know the real length */</div><div class='del'>-#if 0</div><div class='del'>-		end = 10240*sizeof(teststring)+ss-&gt;bound_start;</div><div class='del'>-</div><div class='del'>-		check(camel_seekable_stream_seek(ss, 0, CAMEL_STREAM_END) == end);</div><div class='del'>-		check(camel_seekable_stream_tell(ss) == end);</div><div class='del'>-		/* need to read 0 first to set eos */</div><div class='del'>-		check(camel_stream_read(s, testbuf, 10240) == 0);</div><div class='del'>-		check(camel_stream_eos(s));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/lib/streams.h b/camel/tests/lib/streams.h<br/>deleted file mode 100644<br/>index df52e283d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/lib/streams.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/lib/streams.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include "camel/camel-seekable-stream.h"</div><div class='del'>-</div><div class='del'>-/* call one, then the other on the same stream content */</div><div class='del'>-void test_stream_seekable_writepart(CamelSeekableStream *s);</div><div class='del'>-void test_stream_seekable_readpart(CamelSeekableStream *s);</div><div class='del'>-</div><div class='del'>-/* same, for substreams, multiple ways of writing */</div><div class='del'>-#define SEEKABLE_SUBSTREAM_WAYS (2)</div><div class='del'>-</div><div class='del'>-void test_seekable_substream_writepart(CamelStream *s, int type);</div><div class='del'>-void test_seekable_substream_readpart(CamelStream *s);</div><div class='head'>diff --git a/camel/tests/message/.cvsignore b/camel/tests/message/.cvsignore<br/>deleted file mode 100644<br/>index 4f58c83bd0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test1</div><div class='del'>-test2</div><div class='del'>-test3</div><div class='del'>-*.msg</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='head'>diff --git a/camel/tests/message/Makefile.am b/camel/tests/message/Makefile.am<br/>deleted file mode 100644<br/>index 5487a13f42..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\"	</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  	\</div><div class='del'>-	test1		\</div><div class='del'>-	test2		\</div><div class='del'>-	test3</div><div class='del'>-</div><div class='del'>-TESTS = test1 test2 test3</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/message/README b/camel/tests/message/README<br/>deleted file mode 100644<br/>index 280344ce9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-</div><div class='del'>-test1	creating, saving, loading simple messages</div><div class='del'>-test2	camelinternetaddress tests, internationalised addresses, etc.</div><div class='del'>-test3	multipart messages</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/message/test1.c b/camel/tests/message/test1.c<br/>deleted file mode 100644<br/>index 3294000550..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/test1.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/test1.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,200 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test1.c</div><div class='del'>-</div><div class='del'>-  Create a message, save it.</div><div class='del'>-</div><div class='del'>-  Retrieve message, compare content.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Operations:</div><div class='del'>-	writing/loading from different types of streams</div><div class='del'>-	reading/writing different content</div><div class='del'>-	reading/writing different encodings</div><div class='del'>-	reading/writing different charsets</div><div class='del'>-</div><div class='del'>-  Just testing streams:</div><div class='del'>-  	different stream types</div><div class='del'>-	different file ops</div><div class='del'>-	seek, eof, etc.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-</div><div class='del'>-/* for stat */</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-struct _text {</div><div class='del'>-	char *text;</div><div class='del'>-	int len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define MAX_TEXTS (14)</div><div class='del'>-struct _text texts[MAX_TEXTS];</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup(void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/* setup various edge and other general cases */</div><div class='del'>-	texts[0].text = "";</div><div class='del'>-	texts[0].len = 0;</div><div class='del'>-	texts[1].text = "";</div><div class='del'>-	texts[1].len = 1;</div><div class='del'>-	texts[2].text = "\n";</div><div class='del'>-	texts[2].len = 1;</div><div class='del'>-	texts[3].text = "A";</div><div class='del'>-	texts[3].len = 1;</div><div class='del'>-	texts[4].text = "This is a test.\n.";</div><div class='del'>-	texts[4].len = strlen(texts[4].text);</div><div class='del'>-	texts[5].text = "This is a test.\n\n.\n";</div><div class='del'>-	texts[5].len = strlen(texts[5].text);</div><div class='del'>-	texts[6].text = g_malloc0(1024);</div><div class='del'>-	texts[6].len = 1024;</div><div class='del'>-	texts[7].text = g_malloc0(102400);</div><div class='del'>-	texts[7].len = 102400;</div><div class='del'>-	texts[8].text = g_malloc(1024);</div><div class='del'>-	memset(texts[8].text, '\n', 1024);</div><div class='del'>-	texts[8].len = 1024;</div><div class='del'>-	texts[9].text = g_malloc(102400);</div><div class='del'>-	memset(texts[9].text, '\n', 102400);</div><div class='del'>-	texts[9].len = 102400;</div><div class='del'>-	texts[10].text = g_malloc(1024);</div><div class='del'>-	memset(texts[10].text, ' ', 1024);</div><div class='del'>-	texts[10].len = 1024;</div><div class='del'>-	texts[11].text = g_malloc(102400);</div><div class='del'>-	memset(texts[11].text, ' ', 102400);</div><div class='del'>-	texts[11].len = 102400;</div><div class='del'>-</div><div class='del'>-	srand(42);</div><div class='del'>-	p = texts[12].text = g_malloc(1024);</div><div class='del'>-	for (i=0;i&lt;1024;i++) {</div><div class='del'>-		j = rand();</div><div class='del'>-		if (j&lt;RAND_MAX/120)</div><div class='del'>-			*p++ = '\n';</div><div class='del'>-		else</div><div class='del'>-			*p++ = (j % 95) + 32;</div><div class='del'>-	}</div><div class='del'>-	texts[12].len = 1024;</div><div class='del'>-	p = texts[13].text = g_malloc(102400);</div><div class='del'>-	for (i=0;i&lt;102400;i++) {</div><div class='del'>-		j = rand();</div><div class='del'>-		if (j&lt;RAND_MAX/120)</div><div class='del'>-			*p++ = '\n';</div><div class='del'>-		else</div><div class='del'>-			*p++ = (j % 95) + 32;</div><div class='del'>-	}</div><div class='del'>-	texts[13].len = 102400;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void cleanup(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=6;i&lt;14;i++) {</div><div class='del'>-		g_free(texts[i].text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg, *msg2;</div><div class='del'>-	int i, j;</div><div class='del'>-	char *text;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	setup();</div><div class='del'>-</div><div class='del'>-	camel_test_start("Simple memory-based content creation");</div><div class='del'>-</div><div class='del'>-	/* test all ways of setting simple content for a message (i.e. memory based) */</div><div class='del'>-	for (j=0;j&lt;MAX_TEXTS;j++) {</div><div class='del'>-		push("testing text number %d", j);</div><div class='del'>-		text = texts[j].text;</div><div class='del'>-		len = texts[j].len;</div><div class='del'>-		for (i=0;i&lt;SET_CONTENT_WAYS;i++) {</div><div class='del'>-			push("create simple message %d", i);</div><div class='del'>-			msg = test_message_create_simple();</div><div class='del'>-</div><div class='del'>-			push("set simple content");</div><div class='del'>-			test_message_set_content_simple((CamelMimePart *)msg, i, "text/plain", text, len);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("compare original content");</div><div class='del'>-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg), text, len);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("save message to test1.msg");</div><div class='del'>-			unlink("test1.msg");</div><div class='del'>-			test_message_write_file(msg, "test1.msg");</div><div class='del'>-			check_unref(msg, 1);</div><div class='del'>-			pull();</div><div class='del'>-	</div><div class='del'>-			push("read from test1.msg");</div><div class='del'>-			msg2 = test_message_read_file("test1.msg");</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("compare read with original content");</div><div class='del'>-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg2), text, len);</div><div class='del'>-			check_unref(msg2, 1);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			unlink("test1.msg");</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	camel_test_start("Different encodings");</div><div class='del'>-	for (j=0;j&lt;MAX_TEXTS;j++) {</div><div class='del'>-		push("testing text number %d", j);</div><div class='del'>-		text = texts[j].text;</div><div class='del'>-		len = texts[j].len;</div><div class='del'>-		for (i=0;i&lt;CAMEL_MIME_PART_NUM_ENCODINGS;i++) {</div><div class='del'>-			</div><div class='del'>-			push("test simple message, encoding %s", camel_mime_part_encoding_to_string(i));</div><div class='del'>-			msg = test_message_create_simple();</div><div class='del'>-</div><div class='del'>-			push("set simple content");</div><div class='del'>-			test_message_set_content_simple((CamelMimePart *)msg, 0, "text/plain", text, len);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			camel_mime_part_set_encoding((CamelMimePart *)msg, i);</div><div class='del'>-</div><div class='del'>-			push("save message to test1.msg");</div><div class='del'>-			unlink("test1.msg");</div><div class='del'>-			test_message_write_file(msg, "test1.msg");</div><div class='del'>-			check_unref(msg, 1);</div><div class='del'>-			pull();</div><div class='del'>-	</div><div class='del'>-			push("read from test1.msg");</div><div class='del'>-			msg2 = test_message_read_file("test1.msg");</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			push("compare read with original content");</div><div class='del'>-			test_message_compare_content(camel_medium_get_content_object((CamelMedium *)msg2), text, len);</div><div class='del'>-			check_unref(msg2, 1);</div><div class='del'>-			pull();</div><div class='del'>-</div><div class='del'>-			unlink("test1.msg");</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	cleanup();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c<br/>deleted file mode 100644<br/>index 95b0e324aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/test2.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/test2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,326 +0,0 @@</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-#include "addresses.h"</div><div class='del'>-</div><div class='del'>-/* for stat */</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-internet-address.h&gt;</div><div class='del'>-#include &lt;camel/camel-address.h&gt;</div><div class='del'>-</div><div class='del'>-#include "address-data.h"</div><div class='del'>-</div><div class='del'>-static char *convert(const char *in, const char *from, const char *to)</div><div class='del'>-{</div><div class='del'>-	iconv_t ic = iconv_open(to, from);</div><div class='del'>-	char *out, *outp;</div><div class='del'>-	const char *inp;</div><div class='del'>-	int inlen, outlen;</div><div class='del'>-</div><div class='del'>-	if (ic == (iconv_t)-1)</div><div class='del'>-		return g_strdup(in);</div><div class='del'>-</div><div class='del'>-	inlen = strlen(in);</div><div class='del'>-	outlen = inlen*5 + 16;</div><div class='del'>-</div><div class='del'>-	outp = out = g_malloc(outlen);</div><div class='del'>-	inp = in;</div><div class='del'>-</div><div class='del'>-	if (iconv(ic, &amp;inp, &amp;inlen, &amp;outp, &amp;outlen) == -1) {</div><div class='del'>-		test_free(out);</div><div class='del'>-		iconv_close(ic);</div><div class='del'>-		return g_strdup(in);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (iconv(ic, NULL, 0, &amp;outp, &amp;outlen) == -1) {</div><div class='del'>-		test_free(out);</div><div class='del'>-		iconv_close(ic);</div><div class='del'>-		return g_strdup(in);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iconv_close(ic);</div><div class='del'>-</div><div class='del'>-	*outp = 0;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* lets see if we can convert back again? */</div><div class='del'>-	{</div><div class='del'>-		char *nout, *noutp;</div><div class='del'>-		iconv_t ic = iconv_open(from, to);</div><div class='del'>-</div><div class='del'>-		inp = out;</div><div class='del'>-		inlen = strlen(out);</div><div class='del'>-		outlen = inlen*5 + 16;</div><div class='del'>-		noutp = nout = g_malloc(outlen);</div><div class='del'>-		if (iconv(ic, &amp;inp, &amp;inlen, &amp;noutp, &amp;outlen) == -1</div><div class='del'>-		    || iconv(ic, NULL, 0, &amp;noutp, &amp;outlen) == -1) {</div><div class='del'>-			g_warning("Cannot convert '%s' \n from %s to %s: %s\n", in, to, from, strerror(errno));</div><div class='del'>-		}</div><div class='del'>-		iconv_close(ic);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* and lets see what camel thinks out optimal charset is */</div><div class='del'>-	{</div><div class='del'>-		printf("Camel thinks the best encoding of '%s' is %s, although we converted from %s\n",</div><div class='del'>-		       in, camel_charset_best(out, strlen(out)), from);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define to_utf8(in, type) convert(in, type, "utf-8")</div><div class='del'>-#define from_utf8(in, type) convert(in, "utf-8", type)</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelInternetAddress *addr, *addr2;</div><div class='del'>-	char *name;</div><div class='del'>-	char *charset;</div><div class='del'>-	const char *real, *where;</div><div class='del'>-	char *enc, *enc2, *format, *format2;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelInternetAddress, basics");</div><div class='del'>-</div><div class='del'>-	addr = camel_internet_address_new();</div><div class='del'>-</div><div class='del'>-	push("Test blank address");</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 0);</div><div class='del'>-	check(camel_internet_address_get(addr, 0, &amp;real, &amp;where) == FALSE);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Test blank clone");</div><div class='del'>-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Test add 1");</div><div class='del'>-	camel_internet_address_add(addr, "Zed", "nowhere@here.com.au");</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 1);</div><div class='del'>-	check(camel_internet_address_get(addr, 0, &amp;real, &amp;where) == TRUE);</div><div class='del'>-	check_msg(string_equal("Zed", real), "real = '%s'", real);</div><div class='del'>-	check(strcmp(where, "nowhere@here.com.au") == 0);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Test clone 1");</div><div class='del'>-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Test add many");</div><div class='del'>-	for (i=1;i&lt;10;i++) {</div><div class='del'>-		char name[16], a[32];</div><div class='del'>-		sprintf(name, "Zed %d", i);</div><div class='del'>-		sprintf(a, "nowhere@here-%d.com.au", i);</div><div class='del'>-		camel_internet_address_add(addr, name, a);</div><div class='del'>-		check(camel_address_length(CAMEL_ADDRESS(addr)) == i+1);</div><div class='del'>-		check(camel_internet_address_get(addr, i, &amp;real, &amp;where) == TRUE);</div><div class='del'>-		check_msg(string_equal(name, real), "name = '%s' real = '%s'", name, real);</div><div class='del'>-		check(strcmp(where, a) == 0);</div><div class='del'>-	}</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	/* put a few of these in to make it look like its doing something impressive ... :) */</div><div class='del'>-	camel_test_end();</div><div class='del'>-	camel_test_start("CamelInternetAddress, search");</div><div class='del'>-</div><div class='del'>-	push("Test search");</div><div class='del'>-	camel_test_nonfatal("Address comparisons should ignore whitespace??");</div><div class='del'>-	check(camel_internet_address_find_name(addr, "Zed 1", &amp;where) == 1);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "Zed 9", &amp;where) == 9);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "Zed", &amp;where) == 0);</div><div class='del'>-	check(camel_internet_address_find_name(addr, " Zed", &amp;where) == 0);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "Zed ", &amp;where) == 0);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "  Zed ", &amp;where) == 0);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "Zed 20", &amp;where) == -1);</div><div class='del'>-	check(camel_internet_address_find_name(addr, "", &amp;where) == -1);</div><div class='del'>-	/* interface dont handle nulls :) */</div><div class='del'>-	/*check(camel_internet_address_find_name(addr, NULL, &amp;where) == -1);*/</div><div class='del'>-</div><div class='del'>-	check(camel_internet_address_find_address(addr, "nowhere@here-1.com.au", &amp;where) == 1);</div><div class='del'>-	check(camel_internet_address_find_address(addr, "nowhere@here-1 . com.au", &amp;where) == 1);</div><div class='del'>-	check(camel_internet_address_find_address(addr, "nowhere@here-2 .com.au ", &amp;where) == 2);</div><div class='del'>-	check(camel_internet_address_find_address(addr, " nowhere @here-3.com.au", &amp;where) == 3);</div><div class='del'>-	check(camel_internet_address_find_address(addr, "nowhere@here-20.com.au ", &amp;where) == -1);</div><div class='del'>-	check(camel_internet_address_find_address(addr, "", &amp;where) == -1);</div><div class='del'>-	/*check(camel_internet_address_find_address(addr, NULL, &amp;where) == -1);*/</div><div class='del'>-	camel_test_fatal();</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-	camel_test_start("CamelInternetAddress, copy/cat/clone");</div><div class='del'>-</div><div class='del'>-	push("Test clone many");</div><div class='del'>-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Test remove items");</div><div class='del'>-	camel_address_remove(CAMEL_ADDRESS(addr2), 0);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 9);</div><div class='del'>-	camel_address_remove(CAMEL_ADDRESS(addr2), 0);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 8);</div><div class='del'>-	camel_address_remove(CAMEL_ADDRESS(addr2), 5);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 7);</div><div class='del'>-	camel_address_remove(CAMEL_ADDRESS(addr2), 10);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 7);</div><div class='del'>-	camel_address_remove(CAMEL_ADDRESS(addr2), -1);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 0);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("Testing copy/cat");</div><div class='del'>-	push("clone + cat");</div><div class='del'>-	addr2 = CAMEL_INTERNET_ADDRESS(camel_address_new_clone(CAMEL_ADDRESS(addr)));</div><div class='del'>-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 10);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 20);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("cat + cat + copy");</div><div class='del'>-	addr2 = camel_internet_address_new();</div><div class='del'>-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	camel_address_cat(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr)) == 10);</div><div class='del'>-	check(camel_address_length(CAMEL_ADDRESS(addr2)) == 20);</div><div class='del'>-	camel_address_copy(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("copy");</div><div class='del'>-	addr2 = camel_internet_address_new();</div><div class='del'>-	camel_address_copy(CAMEL_ADDRESS(addr2), CAMEL_ADDRESS(addr));</div><div class='del'>-	test_address_compare(addr, addr2);</div><div class='del'>-	check_unref(addr2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	check_unref(addr, 1);</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelInternetAddress, I18N");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(test_lines);i++) {</div><div class='del'>-		push("Testing text line %d (%s) '%s'", i, test_lines[i].type, test_lines[i].line);</div><div class='del'>-</div><div class='del'>-		addr = camel_internet_address_new();</div><div class='del'>-</div><div class='del'>-		/* first, convert to api format (utf-8) */</div><div class='del'>-		charset = test_lines[i].type;</div><div class='del'>-		name = to_utf8(test_lines[i].line, charset);</div><div class='del'>-</div><div class='del'>-		push("Address setup");</div><div class='del'>-		camel_internet_address_add(addr, name, "nobody@nowhere.com");</div><div class='del'>-		check(camel_internet_address_get(addr, 0, &amp;real, &amp;where) == TRUE);</div><div class='del'>-		check_msg(string_equal(name, real), "name = '%s' real = '%s'", name, real);</div><div class='del'>-		check(strcmp(where, "nobody@nowhere.com") == 0);</div><div class='del'>-		test_free(name);</div><div class='del'>-</div><div class='del'>-		check(camel_internet_address_get(addr, 1, &amp;real, &amp;where) == FALSE);</div><div class='del'>-		check(camel_address_length(CAMEL_ADDRESS(addr)) == 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("Address encode/decode");</div><div class='del'>-		enc = camel_address_encode(CAMEL_ADDRESS(addr));</div><div class='del'>-</div><div class='del'>-		addr2 = camel_internet_address_new();</div><div class='del'>-		check(camel_address_decode(CAMEL_ADDRESS(addr2), enc) == 1);</div><div class='del'>-		check(camel_address_length(CAMEL_ADDRESS(addr2)) == 1);</div><div class='del'>-</div><div class='del'>-		enc2 = camel_address_encode(CAMEL_ADDRESS(addr2));</div><div class='del'>-		check_msg(string_equal(enc, enc2), "enc = '%s' enc2 = '%s'", enc, enc2);</div><div class='del'>-		test_free(enc2);</div><div class='del'>-</div><div class='del'>-		push("Compare addresses");</div><div class='del'>-		test_address_compare(addr, addr2);</div><div class='del'>-		pull();</div><div class='del'>-		check_unref(addr2, 1);</div><div class='del'>-		test_free(enc);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		/* FIXME: format/unformat arne't guaranteed to be reversible, at least at the moment */</div><div class='del'>-		camel_test_nonfatal("format/unformat not (yet) reversible for all cases");</div><div class='del'>-</div><div class='del'>-		push("Address format/unformat");</div><div class='del'>-		format = camel_address_format(CAMEL_ADDRESS(addr));</div><div class='del'>-</div><div class='del'>-		addr2 = camel_internet_address_new();</div><div class='del'>-		check(camel_address_unformat(CAMEL_ADDRESS(addr2), format) == 1);</div><div class='del'>-		check(camel_address_length(CAMEL_ADDRESS(addr2)) == 1);</div><div class='del'>-</div><div class='del'>-		format2 = camel_address_format(CAMEL_ADDRESS(addr2));</div><div class='del'>-		check_msg(string_equal(format, format2), "format = '%s\n\tformat2 = '%s'", format, format2);</div><div class='del'>-		test_free(format2);</div><div class='del'>-</div><div class='del'>-		/* currently format/unformat doesn't handle ,'s and other special chars at all */</div><div class='del'>-		if (camel_address_length(CAMEL_ADDRESS(addr2)) == 1) {</div><div class='del'>-			push("Compare addresses");</div><div class='del'>-			test_address_compare(addr, addr2);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		test_free(format);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		camel_test_fatal();</div><div class='del'>-</div><div class='del'>-		check_unref(addr2, 1);</div><div class='del'>-</div><div class='del'>-		check_unref(addr, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelInternetAddress, I18N decode");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;ARRAY_LEN(test_address);i++) {</div><div class='del'>-		push("Testing address line %d '%s'", i, test_address[i].addr);</div><div class='del'>-</div><div class='del'>-		addr = camel_internet_address_new();</div><div class='del'>-		push("checking decoded");</div><div class='del'>-		check(camel_address_decode(CAMEL_ADDRESS(addr), test_address[i].addr) == test_address[i].count);</div><div class='del'>-		format = camel_address_format(CAMEL_ADDRESS(addr));</div><div class='del'>-		check(strcmp(format, test_address[i].utf8) == 0);</div><div class='del'>-		test_free(format);</div><div class='del'>-		pull();</div><div class='del'>-		</div><div class='del'>-		push("Comparing re-encoded output");</div><div class='del'>-		addr2 = CAMEL_INTERNET_ADDRESS(camel_internet_address_new());</div><div class='del'>-		enc = camel_address_encode(CAMEL_ADDRESS(addr));</div><div class='del'>-		check_msg(camel_address_decode(CAMEL_ADDRESS(addr2), enc) == test_address[i].count, "enc = '%s'", enc);</div><div class='del'>-		test_free(enc);</div><div class='del'>-		test_address_compare(addr, addr2);</div><div class='del'>-		check_unref(addr2, 1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		check_unref(addr, 1);</div><div class='del'>-</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	/* FIXME: Add test of decoding of broken addresses */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/message/test3.c b/camel/tests/message/test3.c<br/>deleted file mode 100644<br/>index 0a9683d146..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/message/test3.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/message/test3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,199 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  Multipart.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "messages.h"</div><div class='del'>-</div><div class='del'>-/* for stat */</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-#include "camel/camel-multipart.h"</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg, *msg2, *msg3;</div><div class='del'>-	CamelMultipart *mp, *mp2;</div><div class='del'>-	CamelMimePart *part, *part2, *part3;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start("multipart message");</div><div class='del'>-</div><div class='del'>-	push("building message");</div><div class='del'>-	msg = test_message_create_simple();</div><div class='del'>-	mp = camel_multipart_new();</div><div class='del'>-</div><div class='del'>-	/* Hrm, this should be able to set its own boundary, no? */</div><div class='del'>-	camel_multipart_set_boundary(mp, "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D");</div><div class='del'>-	check(strcmp(camel_multipart_get_boundary(mp), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);</div><div class='del'>-</div><div class='del'>-	camel_medium_set_content_object((CamelMedium *)msg, (CamelDataWrapper *)mp);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 0);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == NULL);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	push("adding/removing parts");</div><div class='del'>-	part = camel_mime_part_new();</div><div class='del'>-	test_message_set_content_simple(part, 0, "text/plain", "content part 1", strlen("content part 1"));</div><div class='del'>-	camel_multipart_add_part(mp, part);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 1);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	camel_multipart_remove_part(mp, part);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 1);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 0);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == NULL);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	camel_multipart_add_part_at(mp, part, 0);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 1);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	check(camel_multipart_remove_part_at(mp, 1) == NULL);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 1);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	check(camel_multipart_remove_part_at(mp, 0) == part);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 1);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 0);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == NULL);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	camel_multipart_add_part(mp, part);</div><div class='del'>-	check(CAMEL_OBJECT(part)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 1);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == NULL);</div><div class='del'>-</div><div class='del'>-	part2 = camel_mime_part_new();</div><div class='del'>-	test_message_set_content_simple(part2, 0, "text/plain", "content part 2", strlen("content part 2"));</div><div class='del'>-	camel_multipart_add_part(mp, part2);</div><div class='del'>-	check(CAMEL_OBJECT(part2)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 2);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == part2);</div><div class='del'>-</div><div class='del'>-	part3 = camel_mime_part_new();</div><div class='del'>-	test_message_set_content_simple(part3, 0, "text/plain", "content part 3", strlen("content part 3"));</div><div class='del'>-	camel_multipart_add_part_at(mp, part3, 1);</div><div class='del'>-	check(CAMEL_OBJECT(part3)-&gt;ref_count == 2);</div><div class='del'>-	check(camel_multipart_get_number(mp) == 3);</div><div class='del'>-	check(camel_multipart_get_part(mp, 0) == part);</div><div class='del'>-	check(camel_multipart_get_part(mp, 1) == part3);</div><div class='del'>-	check(camel_multipart_get_part(mp, 2) == part2);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("save message to test3.msg");</div><div class='del'>-	unlink("test3.msg");</div><div class='del'>-	test_message_write_file(msg, "test3.msg");</div><div class='del'>-	pull();</div><div class='del'>-	</div><div class='del'>-	push("read from test3.msg");</div><div class='del'>-	msg2 = test_message_read_file("test3.msg");</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("compre content of multipart");</div><div class='del'>-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);</div><div class='del'>-	check(mp2 != NULL);</div><div class='del'>-	check(CAMEL_IS_MULTIPART(mp2));</div><div class='del'>-	check(camel_multipart_get_number(mp2) == 3);</div><div class='del'>-</div><div class='del'>-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);</div><div class='del'>-	check(mp2-&gt;preface == NULL || strlen(mp2-&gt;preface) == 0);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	camel_test_nonfatal("postface may gain a single \\n?");</div><div class='del'>-	check_msg(mp2-&gt;postface == NULL || strlen(mp2-&gt;postface) == 0, "postface: '%s'", mp2-&gt;postface);</div><div class='del'>-	camel_test_fatal();</div><div class='del'>-</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),</div><div class='del'>-				     "content part 1", strlen("content part 1"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),</div><div class='del'>-				     "content part 3", strlen("content part 3"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),</div><div class='del'>-				     "content part 2", strlen("content part 2"));</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	push("writing again, &amp; re-reading");</div><div class='del'>-	unlink("test3-2.msg");</div><div class='del'>-	test_message_write_file(msg2, "test3-2.msg");</div><div class='del'>-	msg3 = test_message_read_file("test3-2.msg");</div><div class='del'>-</div><div class='del'>-	push("comparing again");</div><div class='del'>-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg3);</div><div class='del'>-	check(mp2 != NULL);</div><div class='del'>-	check(CAMEL_IS_MULTIPART(mp2));</div><div class='del'>-	check(camel_multipart_get_number(mp2) == 3);</div><div class='del'>-</div><div class='del'>-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);</div><div class='del'>-	check(mp2-&gt;preface == NULL || strlen(mp2-&gt;preface) == 0);</div><div class='del'>-</div><div class='del'>-	/* FIXME */</div><div class='del'>-	camel_test_nonfatal("postface may gain a single \\n?");</div><div class='del'>-	check_msg(mp2-&gt;postface == NULL || strlen(mp2-&gt;postface) == 0, "postface: '%s'", mp2-&gt;postface);</div><div class='del'>-	camel_test_fatal();</div><div class='del'>-</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),</div><div class='del'>-				     "content part 1", strlen("content part 1"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),</div><div class='del'>-				     "content part 3", strlen("content part 3"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),</div><div class='del'>-				     "content part 2", strlen("content part 2"));</div><div class='del'>-	pull();</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	check_unref(msg2, 1);</div><div class='del'>-	check_unref(msg3, 1);</div><div class='del'>-</div><div class='del'>-	push("testing pre/post text");</div><div class='del'>-	camel_multipart_set_preface(mp, "pre-text\nLines.");</div><div class='del'>-	camel_multipart_set_postface(mp, "post-text, no lines.\nOne line.\n");</div><div class='del'>-</div><div class='del'>-	check(strcmp(mp-&gt;preface, "pre-text\nLines.") == 0);</div><div class='del'>-	check(strcmp(mp-&gt;postface, "post-text, no lines.\nOne line.\n") == 0);</div><div class='del'>-</div><div class='del'>-	push("writing /re-reading");</div><div class='del'>-	unlink("test3-3.msg");</div><div class='del'>-	test_message_write_file(msg, "test3-3.msg");</div><div class='del'>-	msg2 = test_message_read_file("test3-3.msg");</div><div class='del'>-</div><div class='del'>-	mp2 = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)msg2);</div><div class='del'>-	check(mp2 != NULL);</div><div class='del'>-	check(CAMEL_IS_MULTIPART(mp2));</div><div class='del'>-	check(camel_multipart_get_number(mp2) == 3);</div><div class='del'>-</div><div class='del'>-	check(strcmp(camel_multipart_get_boundary(mp2), "_=,.XYZ_Kangaroo_Meat_is_!_ABADF00D") == 0);</div><div class='del'>-	check(strcmp(mp2-&gt;preface, "pre-text\nLines.") == 0);</div><div class='del'>-	check(strcmp(mp2-&gt;postface, "post-text, no lines.\nOne line.\n") == 0);</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 0))),</div><div class='del'>-					   "content part 1", strlen("content part 1"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 1))),</div><div class='del'>-				     "content part 3", strlen("content part 3"));</div><div class='del'>-	test_message_compare_content(camel_medium_get_content_object(CAMEL_MEDIUM(camel_multipart_get_part(mp2, 2))),</div><div class='del'>-				     "content part 2", strlen("content part 2"));</div><div class='del'>-	pull();</div><div class='del'>-	check_unref(msg2, 1);</div><div class='del'>-	pull();</div><div class='del'>-</div><div class='del'>-	check_unref(msg, 1);</div><div class='del'>-	check_unref(mp, 1);</div><div class='del'>-	check_unref(part, 1);</div><div class='del'>-	check_unref(part2, 1);</div><div class='del'>-	check_unref(part3, 1);</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/mime-filter/.cvsignore b/camel/tests/mime-filter/.cvsignore<br/>deleted file mode 100644<br/>index c1f16ee7d4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-stripheader</div><div class='del'>-test-crlf</div><div class='head'>diff --git a/camel/tests/mime-filter/Makefile.am b/camel/tests/mime-filter/Makefile.am<br/>deleted file mode 100644<br/>index d3c2a7d29f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\" \</div><div class='del'>-	-DSOURCEDIR=\"$(srcdir)\"</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			\</div><div class='del'>-	crlf-1.in		\</div><div class='del'>-	crlf-1.out		\</div><div class='del'>-	stripheader-1.in	\</div><div class='del'>-	stripheader-1.out	\</div><div class='del'>-	stripheader-2.in	\</div><div class='del'>-	stripheader-2.out	\</div><div class='del'>-	stripheader-3.in	\</div><div class='del'>-	stripheader-3.out	\</div><div class='del'>-	stripheader-4.in	\</div><div class='del'>-	stripheader-4.out	\</div><div class='del'>-	stripheader-5.in	\</div><div class='del'>-	stripheader-5.out	\</div><div class='del'>-	stripheader-6.in	\</div><div class='del'>-	stripheader-6.out</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  		\</div><div class='del'>-	test-crlf		\</div><div class='del'>-	test-stripheader</div><div class='del'>-</div><div class='del'>-TESTS = test-crlf test-stripheader</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/mime-filter/crlf-1.in b/camel/tests/mime-filter/crlf-1.in<br/>deleted file mode 100644<br/>index d98703c725..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/crlf-1.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/crlf-1.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-This is some text to filter and stuff. Hopefully that . will not become '..'</div><div class='del'>-when the filter is run on this text. It should, however, '..' the next line</div><div class='del'>-. The previous . should become .. in the output file, or so I hope...</div><div class='del'>-</div><div class='del'>-.</div><div class='del'>-..</div><div class='del'>-...</div><div class='del'>-....</div><div class='del'>-</div><div class='del'>-Once this text is decoded again, the above set of dots should look like:</div><div class='del'>-</div><div class='del'>- .</div><div class='del'>- ..</div><div class='del'>- ...</div><div class='del'>- ....</div><div class='del'>-</div><div class='del'>-Only it shouldn't be indented, obviously.</div><div class='del'>-</div><div class='del'>-Jeff
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/crlf-1.out b/camel/tests/mime-filter/crlf-1.out<br/>deleted file mode 100644<br/>index c0b688f334..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/crlf-1.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/crlf-1.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-This is some text to filter and stuff. Hopefully that . will not become '..'
</div><div class='del'>-when the filter is run on this text. It should, however, '..' the next line
</div><div class='del'>-.. The previous . should become .. in the output file, or so I hope...
</div><div class='del'>-
</div><div class='del'>-..
</div><div class='del'>-...
</div><div class='del'>-....
</div><div class='del'>-.....
</div><div class='del'>-
</div><div class='del'>-Once this text is decoded again, the above set of dots should look like:
</div><div class='del'>-
</div><div class='del'>- .
</div><div class='del'>- ..
</div><div class='del'>- ...
</div><div class='del'>- ....
</div><div class='del'>-
</div><div class='del'>-Only it shouldn't be indented, obviously.
</div><div class='del'>-
</div><div class='del'>-Jeff
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-1.in b/camel/tests/mime-filter/stripheader-1.in<br/>deleted file mode 100644<br/>index 1db4bf86e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-1.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-1.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-1.out b/camel/tests/mime-filter/stripheader-1.out<br/>deleted file mode 100644<br/>index 3101c1e6bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-1.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-1.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-2.in b/camel/tests/mime-filter/stripheader-2.in<br/>deleted file mode 100644<br/>index 0a16133bc0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-2.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-2.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-Stripped: this header should also be stripped</div><div class='del'>-BCC: but not this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.</div><div class='del'>-There are several lines to it. Oh boy oh boy.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-2.out b/camel/tests/mime-filter/stripheader-2.out<br/>deleted file mode 100644<br/>index 626dd9c170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-2.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-2.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: but not this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.</div><div class='del'>-There are several lines to it. Oh boy oh boy.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-3.in b/camel/tests/mime-filter/stripheader-3.in<br/>deleted file mode 100644<br/>index d7c348125b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-3.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-3.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Subject: this is a simple test with a different subject</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>-Stripped: this header should also be stripped</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: and so should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.</div><div class='del'>-There are several lines to it. Oh boy oh boy.</div><div class='del'>-Let's add lots of characters on this line just for fun because I love fun don't you who wouldn't love fun I sure do.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-3.out b/camel/tests/mime-filter/stripheader-3.out<br/>deleted file mode 100644<br/>index a6da94594e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-3.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-3.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-Subject: this is a simple test with a different subject</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: and so should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.</div><div class='del'>-There are several lines to it. Oh boy oh boy.</div><div class='del'>-Let's add lots of characters on this line just for fun because I love fun don't you who wouldn't love fun I sure do.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-4.in b/camel/tests/mime-filter/stripheader-4.in<br/>deleted file mode 100644<br/>index 5b0b12e080..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-4.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-4.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>- ooh look this header spans two lines.</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-4.out b/camel/tests/mime-filter/stripheader-4.out<br/>deleted file mode 100644<br/>index 3101c1e6bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-4.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-4.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-5.in b/camel/tests/mime-filter/stripheader-5.in<br/>deleted file mode 100644<br/>index 99258daec6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-5.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-5.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>- ooh look this header spans many</div><div class='del'>-	 lines look at all the freaking lines</div><div class='del'>- 	that this header spans. Wowwww.</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-5.out b/camel/tests/mime-filter/stripheader-5.out<br/>deleted file mode 100644<br/>index 3101c1e6bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-5.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-5.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-CC: this header should be preserved</div><div class='del'>-BCC: as should this one</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-6.in b/camel/tests/mime-filter/stripheader-6.in<br/>deleted file mode 100644<br/>index 8bf0e848d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-6.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-6.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Stripped: of the header stripping filter</div><div class='del'>- ooh look this header spans many</div><div class='del'>-	 lines look at all the freaking lines</div><div class='del'>- that this header spans. Wowwww.</div><div class='del'>-Stripped: and then another one to strip that extends fairly far across the page</div><div class='del'>-Other: let's not use CC here.</div><div class='del'>-Stripped: oops, I stripped it again</div><div class='del'>-Stripped: then single line....</div><div class='del'>-   followed by multi-line. Huzzah.</div><div class='del'>-NotBCC: definitely not BCC</div><div class='del'>-  however this one is definitely continued</div><div class='del'>-Stripped: god-damn look at that stripping.</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/stripheader-6.out b/camel/tests/mime-filter/stripheader-6.out<br/>deleted file mode 100644<br/>index d8d4202ed0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/stripheader-6.out?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/stripheader-6.out</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-Subject: this is a simple test</div><div class='del'>-Other: let's not use CC here.</div><div class='del'>-NotBCC: definitely not BCC</div><div class='del'>-  however this one is definitely continued</div><div class='del'>-</div><div class='del'>-This is the body of the message.
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/mime-filter/test-crlf.c b/camel/tests/mime-filter/test-crlf.c<br/>deleted file mode 100644<br/>index 2e8a4333fa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/test-crlf.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/test-crlf.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,163 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test-crlf.c</div><div class='del'>-</div><div class='del'>-  Test the CamelMimeFilterCrlf class</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-crlf.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-#define NUM_CASES 1</div><div class='del'>-#define CHUNK_SIZE 32</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CRLF_ENCODE,</div><div class='del'>-	CRLF_DECODE,</div><div class='del'>-	CRLF_DONE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelStream *source;</div><div class='del'>-	CamelStream *correct;</div><div class='del'>-	CamelStreamFilter *filter;</div><div class='del'>-	CamelMimeFilter *sh;</div><div class='del'>-	gchar *work;</div><div class='del'>-	int i;</div><div class='del'>-	ssize_t comp_progress, comp_correct_chunk, comp_filter_chunk;</div><div class='del'>-	int comp_i;</div><div class='del'>-	char comp_correct[CHUNK_SIZE], comp_filter[CHUNK_SIZE];</div><div class='del'>-	</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; NUM_CASES; i++) {</div><div class='del'>-		int j;</div><div class='del'>-		</div><div class='del'>-		work = g_strdup_printf ("CRLF/DOT filter, test case %d", i);</div><div class='del'>-		camel_test_start (work);</div><div class='del'>-		g_free (work);</div><div class='del'>-		</div><div class='del'>-		for (j = CRLF_ENCODE; j &lt; CRLF_DONE; j++) {</div><div class='del'>-			CamelMimeFilterCRLFDirection direction;</div><div class='del'>-			char *infile, *outfile;</div><div class='del'>-			</div><div class='del'>-			switch (j) {</div><div class='del'>-			case CRLF_ENCODE:</div><div class='del'>-				camel_test_push ("Test of the encoder");</div><div class='del'>-				direction = CAMEL_MIME_FILTER_CRLF_ENCODE;</div><div class='del'>-				infile = g_strdup_printf ("%s/crlf-%d.in", SOURCEDIR, i + 1);</div><div class='del'>-				outfile = g_strdup_printf ("%s/crlf-%d.out", SOURCEDIR, i + 1);</div><div class='del'>-				break;</div><div class='del'>-			case CRLF_DECODE:</div><div class='del'>-				camel_test_push ("Test of the decoder");</div><div class='del'>-				direction = CAMEL_MIME_FILTER_CRLF_DECODE;</div><div class='del'>-				infile = g_strdup_printf ("%s/crlf-%d.out", SOURCEDIR, i + 1);</div><div class='del'>-				outfile = g_strdup_printf ("%s/crlf-%d.in", SOURCEDIR, i + 1);</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_test_push ("Initializing objects");</div><div class='del'>-			source = camel_stream_fs_new_with_name (infile, 0, O_RDONLY);</div><div class='del'>-			if (!source) {</div><div class='del'>-				camel_test_fail ("Failed to open input case in \"%s\"", infile);</div><div class='del'>-				g_free (infile);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			g_free (infile);</div><div class='del'>-			</div><div class='del'>-			correct = camel_stream_fs_new_with_name (outfile, 0, O_RDONLY);</div><div class='del'>-			if (!correct) {</div><div class='del'>-				camel_test_fail ("Failed to open correct output in \"%s\"", outfile);</div><div class='del'>-				g_free (outfile);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			g_free (outfile);</div><div class='del'>-			</div><div class='del'>-			filter = camel_stream_filter_new_with_stream (CAMEL_STREAM (source));</div><div class='del'>-			if (!filter) {</div><div class='del'>-				camel_test_fail ("Couldn't create CamelStreamFilter??");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			sh = camel_mime_filter_crlf_new (direction, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);</div><div class='del'>-			if (!sh) {</div><div class='del'>-				camel_test_fail ("Couldn't create CamelMimeFilterCrlf??");</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_stream_filter_add (filter, sh);</div><div class='del'>-			camel_test_pull ();</div><div class='del'>-			</div><div class='del'>-			camel_test_push ("Running filter and comparing to correct result");</div><div class='del'>-			</div><div class='del'>-			comp_progress = 0;</div><div class='del'>-			</div><div class='del'>-			while (1) {</div><div class='del'>-				comp_correct_chunk = camel_stream_read (correct, comp_correct, CHUNK_SIZE);</div><div class='del'>-				comp_filter_chunk = 0;</div><div class='del'>-				</div><div class='del'>-				if (comp_correct_chunk == 0)</div><div class='del'>-					break;</div><div class='del'>-				</div><div class='del'>-				while (comp_filter_chunk &lt; comp_correct_chunk) {</div><div class='del'>-					ssize_t delta;</div><div class='del'>-					</div><div class='del'>-					delta = camel_stream_read (CAMEL_STREAM (filter), </div><div class='del'>-								   comp_filter + comp_filter_chunk, </div><div class='del'>-								   CHUNK_SIZE - comp_filter_chunk);</div><div class='del'>-					</div><div class='del'>-					if (delta == 0) {</div><div class='del'>-						camel_test_fail ("Chunks are different sizes: correct is %d, "</div><div class='del'>-								 "filter is %d, %d bytes into stream",</div><div class='del'>-								 comp_correct_chunk, comp_filter_chunk, comp_progress);</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					comp_filter_chunk += delta;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				d(printf ("\n\nCORRECT: &gt;&gt;%.*s&lt;&lt;", comp_correct_chunk, comp_correct));</div><div class='del'>-				d(printf ("\nFILTER : &gt;&gt;%.*s&lt;&lt;\n", comp_filter_chunk, comp_filter));</div><div class='del'>-				</div><div class='del'>-				for (comp_i = 0; comp_i &lt; comp_filter_chunk; comp_i++) {</div><div class='del'>-					if (comp_correct[comp_i] != comp_filter[comp_i]) {</div><div class='del'>-						camel_test_fail ("Difference: correct is %c, filter is %c, "</div><div class='del'>-								 "%d bytes into stream",</div><div class='del'>-								 comp_correct[comp_i], </div><div class='del'>-								 comp_filter[comp_i],</div><div class='del'>-								 comp_progress + comp_i);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				comp_progress += comp_filter_chunk;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			camel_test_pull ();</div><div class='del'>-			</div><div class='del'>-			/* inefficient */</div><div class='del'>-			camel_test_push ("Cleaning up");</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (filter));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (correct));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (source));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (sh));</div><div class='del'>-			camel_test_pull ();</div><div class='del'>-			</div><div class='del'>-			camel_test_pull ();</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_test_end ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/mime-filter/test-stripheader.c b/camel/tests/mime-filter/test-stripheader.c<br/>deleted file mode 100644<br/>index ff5446635b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/mime-filter/test-stripheader.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/mime-filter/test-stripheader.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test-stripheader.c</div><div class='del'>-</div><div class='del'>-  Test the CamelMimeFilterStripHeader class</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-stream-fs.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-filter.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-filter-stripheader.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-#define NUM_CASES 6</div><div class='del'>-#define CHUNK_SIZE 32</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelStream *source;</div><div class='del'>-	CamelStream *correct;</div><div class='del'>-	CamelStreamFilter *filter;</div><div class='del'>-	CamelMimeFilter *sh;</div><div class='del'>-	gchar *work;</div><div class='del'>-	int i;</div><div class='del'>-	ssize_t comp_progress, comp_correct_chunk, comp_filter_chunk;</div><div class='del'>-	int comp_i;</div><div class='del'>-	char comp_correct[CHUNK_SIZE], comp_filter[CHUNK_SIZE];</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; NUM_CASES; i++) {</div><div class='del'>-		work = g_strdup_printf ("Header stripping filter, test case %d", i);</div><div class='del'>-		camel_test_start (work);</div><div class='del'>-		g_free (work);</div><div class='del'>-</div><div class='del'>-		camel_test_push ("Initializing objects");</div><div class='del'>-		work = g_strdup_printf ("%s/stripheader-%d.in", SOURCEDIR, i + 1);</div><div class='del'>-		source = camel_stream_fs_new_with_name (work, 0, O_RDONLY);</div><div class='del'>-		if (!source) {</div><div class='del'>-			camel_test_fail ("Failed to open input case in \"%s\"", work);</div><div class='del'>-			g_free (work);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		g_free (work);</div><div class='del'>-</div><div class='del'>-		work = g_strdup_printf ("%s/stripheader-%d.out", SOURCEDIR, i + 1);</div><div class='del'>-		correct = camel_stream_fs_new_with_name (work, 0, O_RDONLY);</div><div class='del'>-		if (!correct) {</div><div class='del'>-			camel_test_fail ("Failed to open correct output in \"%s\"", work);</div><div class='del'>-			g_free (work);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		g_free (work);</div><div class='del'>-</div><div class='del'>-		filter = camel_stream_filter_new_with_stream (CAMEL_STREAM (source));</div><div class='del'>-		if (!filter) {</div><div class='del'>-			camel_test_fail ("Couldn't create CamelStreamFilter??");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		sh = camel_mime_filter_stripheader_new ("Stripped");</div><div class='del'>-		if (!sh) {</div><div class='del'>-			camel_test_fail ("Couldn't create CamelMimeFilterStripHeader??");</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_stream_filter_add (filter, sh);</div><div class='del'>-		camel_test_pull ();</div><div class='del'>-</div><div class='del'>-		camel_test_push ("Running filter and comparing to correct result");</div><div class='del'>-</div><div class='del'>-		comp_progress = 0;</div><div class='del'>-</div><div class='del'>-		while (1) {</div><div class='del'>-			comp_correct_chunk = camel_stream_read (correct, comp_correct, CHUNK_SIZE);</div><div class='del'>-			comp_filter_chunk = 0;</div><div class='del'>-</div><div class='del'>-			if (comp_correct_chunk == 0)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			while (comp_filter_chunk &lt; comp_correct_chunk) {</div><div class='del'>-				ssize_t delta;</div><div class='del'>-</div><div class='del'>-				delta = camel_stream_read (CAMEL_STREAM (filter), </div><div class='del'>-							   comp_filter + comp_filter_chunk, </div><div class='del'>-							   CHUNK_SIZE - comp_filter_chunk);</div><div class='del'>-</div><div class='del'>-				if (delta == 0) {</div><div class='del'>-					camel_test_fail ("Chunks are different sizes: correct is %d, filter is %d, %d bytes into stream",</div><div class='del'>-							 comp_correct_chunk, comp_filter_chunk, comp_progress);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				comp_filter_chunk += delta;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			d(printf ("\n\nCORRECT: &gt;&gt;%.*s&lt;&lt;", comp_correct_chunk, comp_correct);)</div><div class='del'>-			d(printf ("\nFILTER : &gt;&gt;%.*s&lt;&lt;\n", comp_filter_chunk, comp_filter);)</div><div class='del'>-</div><div class='del'>-			for (comp_i = 0; comp_i &lt; comp_filter_chunk; comp_i++) {</div><div class='del'>-				if (comp_correct[comp_i] != comp_filter[comp_i]) {</div><div class='del'>-					camel_test_fail ("Difference: correct is %c, filter is %c, %d bytes into stream",</div><div class='del'>-							 comp_correct[comp_i], </div><div class='del'>-							 comp_filter[comp_i],</div><div class='del'>-							 comp_progress + comp_i);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			comp_progress += comp_filter_chunk;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_test_pull ();</div><div class='del'>-</div><div class='del'>-		/* inefficient */</div><div class='del'>-		camel_test_push ("Cleaning up");</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (filter));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (correct));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (source));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (sh));</div><div class='del'>-		camel_test_pull ();</div><div class='del'>-</div><div class='del'>-		camel_test_end();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/misc/.cvsignore b/camel/tests/misc/.cvsignore<br/>deleted file mode 100644<br/>index 7ef94ab5fa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/misc/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/misc/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='del'>-url
\ No newline at end of file</div><div class='head'>diff --git a/camel/tests/misc/Makefile.am b/camel/tests/misc/Makefile.am<br/>deleted file mode 100644<br/>index dc34d1ea16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/misc/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/misc/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\"	</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  	\</div><div class='del'>-	url</div><div class='del'>-</div><div class='del'>-TESTS = url</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/misc/README b/camel/tests/misc/README<br/>deleted file mode 100644<br/>index d972108860..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/misc/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/misc/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-</div><div class='del'>-url	URL parsing</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/misc/url.c b/camel/tests/misc/url.c<br/>deleted file mode 100644<br/>index adc6278bae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/misc/url.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/misc/url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-char *base = "http://a/b/c/d;p?q#f";</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *url_string, *result;</div><div class='del'>-} tests[] = {</div><div class='del'>-	{ "g:h", "g:h" },</div><div class='del'>-	{ "g", "http://a/b/c/g" },</div><div class='del'>-	{ "./g", "http://a/b/c/g" },</div><div class='del'>-	{ "g/", "http://a/b/c/g/" },</div><div class='del'>-	{ "/g", "http://a/g" },</div><div class='del'>-	{ "//g", "http://g" },</div><div class='del'>-	{ "?y", "http://a/b/c/d;p?y" },</div><div class='del'>-	{ "g?y", "http://a/b/c/g?y" },</div><div class='del'>-	{ "g?y/./x", "http://a/b/c/g?y/./x" },</div><div class='del'>-	{ "#s", "http://a/b/c/d;p?q#s" },</div><div class='del'>-	{ "g#s", "http://a/b/c/g#s" },</div><div class='del'>-	{ "g#s/./x", "http://a/b/c/g#s/./x" },</div><div class='del'>-	{ "g?y#s", "http://a/b/c/g?y#s" },</div><div class='del'>-	{ ";x", "http://a/b/c/d;x" },</div><div class='del'>-	{ "g;x", "http://a/b/c/g;x" },</div><div class='del'>-	{ "g;x?y#s", "http://a/b/c/g;x?y#s" },</div><div class='del'>-	{ ".", "http://a/b/c/" },</div><div class='del'>-	{ "./", "http://a/b/c/" },</div><div class='del'>-	{ "..", "http://a/b/" },</div><div class='del'>-	{ "../", "http://a/b/" },</div><div class='del'>-	{ "../g", "http://a/b/g" },</div><div class='del'>-	{ "../..", "http://a/" },</div><div class='del'>-	{ "../../", "http://a/" },</div><div class='del'>-	{ "../../g", "http://a/g" },</div><div class='del'>-	{ "", "http://a/b/c/d;p?q#f" },</div><div class='del'>-	{ "../../../g", "http://a/../g" },</div><div class='del'>-	{ "../../../../g", "http://a/../../g" },</div><div class='del'>-	{ "/./g", "http://a/./g" },</div><div class='del'>-	{ "/../g", "http://a/../g" },</div><div class='del'>-	{ "g.", "http://a/b/c/g." },</div><div class='del'>-	{ ".g", "http://a/b/c/.g" },</div><div class='del'>-	{ "g..", "http://a/b/c/g.." },</div><div class='del'>-	{ "..g", "http://a/b/c/..g" },</div><div class='del'>-	{ "./../g", "http://a/b/g" },</div><div class='del'>-	{ "./g/.", "http://a/b/c/g/" },</div><div class='del'>-	{ "g/./h", "http://a/b/c/g/h" },</div><div class='del'>-	{ "g/../h", "http://a/b/c/h" },</div><div class='del'>-	{ "http:g", "http:g" },</div><div class='del'>-	{ "http:", "http:" }</div><div class='del'>-};</div><div class='del'>-int num_tests = sizeof (tests) / sizeof (tests[0]);</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelURL *base_url, *url;</div><div class='del'>-	CamelException ex;</div><div class='del'>-	char *url_string;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_test_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start ("RFC1808 relative URL parsing");</div><div class='del'>-</div><div class='del'>-	camel_test_push ("base URL parsing");</div><div class='del'>-	camel_exception_init (&amp;ex);</div><div class='del'>-	base_url = camel_url_new (base, &amp;ex);</div><div class='del'>-	if (!base_url) {</div><div class='del'>-		camel_test_fail ("Could not parse %s: %s\n", base,</div><div class='del'>-				 camel_exception_get_description (&amp;ex));</div><div class='del'>-	}</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-</div><div class='del'>-	camel_test_push ("base URL unparsing");</div><div class='del'>-	url_string = camel_url_to_string (base_url, 0);</div><div class='del'>-	if (strcmp (url_string, base) != 0) {</div><div class='del'>-		camel_test_fail ("URL &lt;%s&gt; unparses to &lt;%s&gt;\n",</div><div class='del'>-				 base, url_string);</div><div class='del'>-	}</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	g_free (url_string);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_tests; i++) {</div><div class='del'>-		camel_test_push ("&lt;%s&gt; + &lt;%s&gt; = &lt;%s&gt;?", base, tests[i].url_string, tests[i].result);</div><div class='del'>-		url = camel_url_new_with_base (base_url, tests[i].url_string);</div><div class='del'>-		if (!url) {</div><div class='del'>-			camel_test_fail ("could not parse");</div><div class='del'>-			camel_test_pull ();</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		url_string = camel_url_to_string (url, 0);</div><div class='del'>-		if (strcmp (url_string, tests[i].result) != 0)</div><div class='del'>-			camel_test_fail ("got &lt;%s&gt;!", url_string);</div><div class='del'>-		g_free (url_string);</div><div class='del'>-		camel_test_pull ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/smime/.cvsignore b/camel/tests/smime/.cvsignore<br/>deleted file mode 100644<br/>index c0feca5888..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile*</div><div class='del'>-pgp</div><div class='del'>-pgp-mime</div><div class='head'>diff --git a/camel/tests/smime/Makefile.am b/camel/tests/smime/Makefile.am<br/>deleted file mode 100644<br/>index e8b098745f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\"	</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  	\</div><div class='del'>-	pgp		\</div><div class='del'>-	pgp-mime	</div><div class='del'>-#	pkcs7</div><div class='del'>-</div><div class='del'>-TESTS = pgp pgp-mime #pkcs7</div><div class='head'>diff --git a/camel/tests/smime/README b/camel/tests/smime/README<br/>deleted file mode 100644<br/>index baad91ba00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-pgp	PGP test suite</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c<br/>deleted file mode 100644<br/>index d2e243e084..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/pgp-mime.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/pgp-mime.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,170 +0,0 @@</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;camel/camel-pgp-mime.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-static char test_msg[] = "Since we need to make sure that\nFrom lines work okay, we should test that"</div><div class='del'>-"as well as test 8bit chars and other fun stuff? 8bit chars: Dra¾en Kaèar\n\nOkay, I guess that covers"</div><div class='del'>-"the basics at least...\n";</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_PGP_SESSION_TYPE     (camel_pgp_session_get_type ())</div><div class='del'>-#define CAMEL_PGP_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PGP_SESSION_TYPE, CamelPgpSession))</div><div class='del'>-#define CAMEL_PGP_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_SESSION_TYPE, CamelPgpSessionClass))</div><div class='del'>-#define CAMEL_PGP_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpSession {</div><div class='del'>-	CamelSession parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelPgpSession;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpSessionClass {</div><div class='del'>-	CamelSessionClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelPgpSessionClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *get_password (CamelSession *session, const char *prompt,</div><div class='del'>-			   gboolean secret, CamelService *service,</div><div class='del'>-			   const char *item, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (CamelPgpSession *session)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (CamelPgpSessionClass *camel_pgp_session_class)</div><div class='del'>-{</div><div class='del'>-	CamelSessionClass *camel_session_class =</div><div class='del'>-		CAMEL_SESSION_CLASS (camel_pgp_session_class);</div><div class='del'>-	</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	camel_session_class-&gt;get_password = get_password;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelType</div><div class='del'>-camel_pgp_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (</div><div class='del'>-			camel_test_session_get_type (),</div><div class='del'>-			"CamelPgpSession",</div><div class='del'>-			sizeof (CamelPgpSession),</div><div class='del'>-			sizeof (CamelPgpSessionClass),</div><div class='del'>-			(CamelObjectClassInitFunc) class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) init,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_password (CamelSession *session, const char *prompt, gboolean secret,</div><div class='del'>-	      CamelService *service, const char *item, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("PGP/MIME is rfc2015, now go and read it.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelSession *</div><div class='del'>-camel_pgp_session_new (const char *path)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	</div><div class='del'>-	session = CAMEL_SESSION (camel_object_new (CAMEL_PGP_SESSION_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_session_construct (session, path);</div><div class='del'>-	</div><div class='del'>-	return session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelPgpContext *ctx;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelCipherValidity *valid;</div><div class='del'>-	CamelMimePart *mime_part, *part;</div><div class='del'>-	GPtrArray *recipients;</div><div class='del'>-	</div><div class='del'>-	camel_test_init (argc, argv);</div><div class='del'>-	</div><div class='del'>-	ex = camel_exception_new ();</div><div class='del'>-	</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	session = camel_pgp_session_new ("/tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg", FALSE);</div><div class='del'>-	</div><div class='del'>-	camel_test_start ("Test of PGP/MIME functions");</div><div class='del'>-	</div><div class='del'>-	mime_part = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (mime_part, test_msg, strlen (test_msg), "text/plain");</div><div class='del'>-	camel_mime_part_set_description (mime_part, "Test of PGP/MIME multipart/signed stuff");</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP/MIME signing");</div><div class='del'>-	camel_pgp_mime_part_sign (ctx, &amp;mime_part, "pgp-mime@xtorshun.org", CAMEL_CIPHER_HASH_SHA1, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	check_msg (camel_pgp_mime_is_rfc2015_signed (mime_part),</div><div class='del'>-		   "Huh, the MIME part does not seem to be a valid multipart/signed part");</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP/MIME verify");</div><div class='del'>-	valid = camel_pgp_mime_part_verify (ctx, mime_part, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	check_msg (camel_cipher_validity_get_valid (valid), "%s", camel_cipher_validity_get_description (valid));</div><div class='del'>-	camel_cipher_validity_free (valid);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (mime_part));</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	mime_part = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (mime_part, test_msg, strlen (test_msg), "text/plain");</div><div class='del'>-	camel_mime_part_set_description (mime_part, "Test of PGP/MIME multipart/encrypted stuff");</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP/MIME encrypt");</div><div class='del'>-	recipients = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_add (recipients, "pgp-mime@xtorshun.org");</div><div class='del'>-	camel_pgp_mime_part_encrypt (ctx, &amp;mime_part, recipients, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	check_msg (camel_pgp_mime_is_rfc2015_encrypted (mime_part),</div><div class='del'>-		   "Huh, the MIME part does not seem to be a valid multipart/encrypted part");</div><div class='del'>-	g_ptr_array_free (recipients, TRUE);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP/MIME decrypt");</div><div class='del'>-	part = camel_pgp_mime_part_decrypt (ctx, mime_part, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (mime_part));</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ctx));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (session));</div><div class='del'>-	</div><div class='del'>-	camel_test_end ();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c<br/>deleted file mode 100644<br/>index 2d5ff7228c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/pgp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/pgp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;camel/camel-pgp-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "session.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_PGP_SESSION_TYPE     (camel_pgp_session_get_type ())</div><div class='del'>-#define CAMEL_PGP_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_PGP_SESSION_TYPE, CamelPgpSession))</div><div class='del'>-#define CAMEL_PGP_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_PGP_SESSION_TYPE, CamelPgpSessionClass))</div><div class='del'>-#define CAMEL_PGP_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_PGP_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpSession {</div><div class='del'>-	CamelSession parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelPgpSession;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelPgpSessionClass {</div><div class='del'>-	CamelSessionClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelPgpSessionClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *get_password (CamelSession *session, const char *prompt,</div><div class='del'>-			   gboolean secret, CamelService *service,</div><div class='del'>-			   const char *item, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (CamelPgpSession *session)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (CamelPgpSessionClass *camel_pgp_session_class)</div><div class='del'>-{</div><div class='del'>-	CamelSessionClass *camel_session_class =</div><div class='del'>-		CAMEL_SESSION_CLASS (camel_pgp_session_class);</div><div class='del'>-	</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	camel_session_class-&gt;get_password = get_password;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelType</div><div class='del'>-camel_pgp_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (</div><div class='del'>-			camel_test_session_get_type (),</div><div class='del'>-			"CamelPgpSession",</div><div class='del'>-			sizeof (CamelPgpSession),</div><div class='del'>-			sizeof (CamelPgpSessionClass),</div><div class='del'>-			(CamelObjectClassInitFunc) class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) init,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_password (CamelSession *session, const char *prompt, gboolean secret,</div><div class='del'>-	      CamelService *service, const char *item, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("PGP/MIME is rfc2015, now go and read it.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelSession *</div><div class='del'>-camel_pgp_session_new (const char *path)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	</div><div class='del'>-	session = CAMEL_SESSION (camel_object_new (CAMEL_PGP_SESSION_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_session_construct (session, path);</div><div class='del'>-	</div><div class='del'>-	return session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelPgpContext *ctx;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelCipherValidity *valid;</div><div class='del'>-	CamelStream *stream1, *stream2, *stream3;</div><div class='del'>-	GPtrArray *recipients;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	char *before, *after;</div><div class='del'>-	</div><div class='del'>-	camel_test_init (argc, argv);</div><div class='del'>-	</div><div class='del'>-	ex = camel_exception_new ();</div><div class='del'>-	</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	session = camel_pgp_session_new ("/tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	ctx = camel_pgp_context_new (session, CAMEL_PGP_TYPE_GPG, "/usr/bin/gpg", FALSE);</div><div class='del'>-	</div><div class='del'>-	camel_test_start ("Test of PGP functions");</div><div class='del'>-	</div><div class='del'>-	stream1 = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write (stream1, "Hello, I am a test stream.\n", 27);</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	</div><div class='del'>-	stream2 = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP signing");</div><div class='del'>-	camel_pgp_sign (ctx, "pgp-mime@xtorshun.org", CAMEL_CIPHER_HASH_SHA1,</div><div class='del'>-			stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP verify");</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	camel_stream_reset (stream2);</div><div class='del'>-	valid = camel_pgp_verify (ctx, stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	check_msg (camel_cipher_validity_get_valid (valid), "%s", camel_cipher_validity_get_description (valid));</div><div class='del'>-	camel_cipher_validity_free (valid);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream1));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream2));</div><div class='del'>-	</div><div class='del'>-	stream1 = camel_stream_mem_new ();</div><div class='del'>-	stream2 = camel_stream_mem_new ();</div><div class='del'>-	stream3 = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (stream1, "Hello, I am a test of encryption/decryption.", 44);</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP encrypt");</div><div class='del'>-	recipients = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_add (recipients, "pgp-mime@xtorshun.org");</div><div class='del'>-	camel_pgp_encrypt (ctx, FALSE, "pgp-mime@xtorshun.org", recipients,</div><div class='del'>-			   stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	g_ptr_array_free (recipients, TRUE);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_stream_reset (stream2);</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PGP decrypt");</div><div class='del'>-	camel_pgp_decrypt (ctx, stream2, stream3, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream1)-&gt;buffer;</div><div class='del'>-	before = g_strndup (buf-&gt;data, buf-&gt;len);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream3)-&gt;buffer;</div><div class='del'>-	after = g_strndup (buf-&gt;data, buf-&gt;len);</div><div class='del'>-	check_msg (string_equal (before, after), "before = '%s', after = '%s'", before, after);</div><div class='del'>-	g_free (before);</div><div class='del'>-	g_free (after);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ctx));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (session));</div><div class='del'>-	</div><div class='del'>-	camel_test_end ();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/smime/pkcs7.c b/camel/tests/smime/pkcs7.c<br/>deleted file mode 100644<br/>index 2248d8656d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/smime/pkcs7.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/smime/pkcs7.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;camel/camel-smime-context.h&gt;</div><div class='del'>-#include &lt;camel/camel-stream-mem.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_TEST_SESSION_TYPE     (camel_test_session_get_type ())</div><div class='del'>-#define CAMEL_TEST_SESSION(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_TEST_SESSION_TYPE, CamelTestSession))</div><div class='del'>-#define CAMEL_TEST_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TEST_SESSION_TYPE, CamelTestSessionClass))</div><div class='del'>-#define CAMEL_TEST_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TEST_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTestSession {</div><div class='del'>-	CamelSession parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelTestSession;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTestSessionClass {</div><div class='del'>-	CamelSessionClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelTestSessionClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *get_password (CamelSession *session, const char *prompt,</div><div class='del'>-			   gboolean secret, CamelService *service,</div><div class='del'>-			   const char *item, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (CamelTestSession *session)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (CamelTestSessionClass *camel_test_session_class)</div><div class='del'>-{</div><div class='del'>-	CamelSessionClass *camel_session_class =</div><div class='del'>-		CAMEL_SESSION_CLASS (camel_test_session_class);</div><div class='del'>-	</div><div class='del'>-	/* virtual method override */</div><div class='del'>-	camel_session_class-&gt;get_password = get_password;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelType</div><div class='del'>-camel_test_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (</div><div class='del'>-			camel_test_session_get_type (),</div><div class='del'>-			"CamelTestSession",</div><div class='del'>-			sizeof (CamelTestSession),</div><div class='del'>-			sizeof (CamelTestSessionClass),</div><div class='del'>-			(CamelObjectClassInitFunc) class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) init,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_password (CamelSession *session, const char *prompt, gboolean secret,</div><div class='del'>-	      CamelService *service, const char *item, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("S/MIME v3 is rfc263x, now go and read them.");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelSession *</div><div class='del'>-camel_test_session_new (const char *path)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	</div><div class='del'>-	session = CAMEL_SESSION (camel_object_new (CAMEL_TEST_SESSION_TYPE));</div><div class='del'>-	</div><div class='del'>-	camel_session_construct (session, path);</div><div class='del'>-	</div><div class='del'>-	return session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	CamelSMimeContext *ctx;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	CamelCipherValidity *valid;</div><div class='del'>-	CamelStream *stream1, *stream2, *stream3;</div><div class='del'>-	GPtrArray *recipients;</div><div class='del'>-	GByteArray *buf;</div><div class='del'>-	char *before, *after;</div><div class='del'>-	</div><div class='del'>-	camel_test_init (argc, argv);</div><div class='del'>-	</div><div class='del'>-	ex = camel_exception_new ();</div><div class='del'>-	</div><div class='del'>-	/* clear out any camel-test data */</div><div class='del'>-	system ("/bin/rm -rf /tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	session = camel_test_session_new ("/tmp/camel-test");</div><div class='del'>-	</div><div class='del'>-	ctx = camel_smime_context_new (session);</div><div class='del'>-	</div><div class='del'>-	camel_test_start ("Test of S/MIME PKCS7 functions");</div><div class='del'>-	</div><div class='del'>-	stream1 = camel_stream_mem_new ();</div><div class='del'>-	camel_stream_write (stream1, "Hello, I am a test stream.", 25);</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	</div><div class='del'>-	stream2 = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PKCS7 signing");</div><div class='del'>-	camel_smime_sign (ctx, "smime@xtorshun.org", CAMEL_CIPHER_HASH_SHA1,</div><div class='del'>-			  stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PKCS7 verify");</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	camel_stream_reset (stream2);</div><div class='del'>-	valid = camel_smime_verify (ctx, CAMEL_CIPHER_HASH_SHA1, stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	check_msg (camel_cipher_validity_get_valid (valid), "%s", camel_cipher_validity_get_description (valid));</div><div class='del'>-	camel_cipher_validity_free (valid);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream1));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream2));</div><div class='del'>-	</div><div class='del'>-	stream1 = camel_stream_mem_new ();</div><div class='del'>-	stream2 = camel_stream_mem_new ();</div><div class='del'>-	stream3 = camel_stream_mem_new ();</div><div class='del'>-	</div><div class='del'>-	camel_stream_write (stream1, "Hello, I am a test of encryption/decryption.", 44);</div><div class='del'>-	camel_stream_reset (stream1);</div><div class='del'>-	</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PKCS7 encrypt");</div><div class='del'>-	recipients = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_add (recipients, "smime@xtorshun.org");</div><div class='del'>-	camel_smime_encrypt (ctx, FALSE, "smime@xtorshun.org", recipients,</div><div class='del'>-			     stream1, stream2, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	g_ptr_array_free (recipients, TRUE);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_stream_reset (stream2);</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	</div><div class='del'>-	camel_test_push ("PKCS7 decrypt");</div><div class='del'>-	camel_smime_decrypt (ctx, stream2, stream3, ex);</div><div class='del'>-	check_msg (!camel_exception_is_set (ex), "%s", camel_exception_get_description (ex));</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream1)-&gt;buffer;</div><div class='del'>-	before = g_strndup (buf-&gt;data, buf-&gt;len);</div><div class='del'>-	buf = CAMEL_STREAM_MEM (stream3)-&gt;buffer;</div><div class='del'>-	after = g_strndup (buf-&gt;data, buf-&gt;len);</div><div class='del'>-	check_msg (string_equal (before, after), "before = '%s', after = '%s'", before, after);</div><div class='del'>-	g_free (before);</div><div class='del'>-	g_free (after);</div><div class='del'>-	camel_test_pull ();</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (ctx));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (session));</div><div class='del'>-	</div><div class='del'>-	camel_test_end ();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/stream/.cvsignore b/camel/tests/stream/.cvsignore<br/>deleted file mode 100644<br/>index 36f9336c1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-*.bb</div><div class='del'>-*.bbg</div><div class='del'>-*.da</div><div class='del'>-*.gcov</div><div class='del'>-test1</div><div class='del'>-test2</div><div class='del'>-test3</div><div class='head'>diff --git a/camel/tests/stream/Makefile.am b/camel/tests/stream/Makefile.am<br/>deleted file mode 100644<br/>index 37586766c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-</div><div class='del'>-INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir) -I$(top_srcdir)/camel \</div><div class='del'>-	-I$(includedir) \</div><div class='del'>-	-I$(top_srcdir)/camel/tests/lib \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-tests\"	</div><div class='del'>-</div><div class='del'>-LDADD = \</div><div class='del'>-	$(top_builddir)/camel/libcamel.la 	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(top_builddir)/libibex/libibex.la 	\</div><div class='del'>-	$(GNOME_LIBDIR) 			\</div><div class='del'>-	$(top_builddir)/camel/tests/lib/libcameltest.a			\</div><div class='del'>-	$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-check_PROGRAMS =  	\</div><div class='del'>-	test1 test2 test3</div><div class='del'>-</div><div class='del'>-TESTS = test1 test2 test3</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/tests/stream/README b/camel/tests/stream/README<br/>deleted file mode 100644<br/>index 8ca6a9602d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/README?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-</div><div class='del'>-test1	camelstreamfs, creating, read/write, eos, refcounting</div><div class='del'>-test2	camelstreammem, creating, read/write, eos, refcounting</div><div class='del'>-test3	camelseekablesubstream</div><div class='head'>diff --git a/camel/tests/stream/test1.c b/camel/tests/stream/test1.c<br/>deleted file mode 100644<br/>index 452d45274f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/test1.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/test1.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test ... camelstreamfs */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "streams.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-stream-fs.h"</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *ss = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int size;</div><div class='del'>-	char buffer[1024];</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelStream fs, open, seek, read, write, eos");</div><div class='del'>-	for (i=0;i&lt;2;i++) {</div><div class='del'>-</div><div class='del'>-		(void)unlink("stream.txt");</div><div class='del'>-</div><div class='del'>-		push("trying to open a nonexistant stream, method %d", i);</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 0:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			fd = open("stream.txt", O_RDWR, 0);</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(ss == NULL &amp;&amp; errno == ENOENT);</div><div class='del'>-		check(stat("stream.txt", &amp;st) == -1 &amp;&amp; errno == ENOENT);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("Creating stream using method %d", i);</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 0:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);</div><div class='del'>-			fd = ((CamelStreamFs *)ss)-&gt;fd;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			fd = open("stream.txt", O_CREAT|O_RDWR|O_TRUNC, 0600);</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-		check(stat("stream.txt", &amp;st) == 0 &amp;&amp; (st.st_mode&amp;0777) == 0600 &amp;&amp; S_ISREG(st.st_mode) &amp;&amp; st.st_size == 0);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		test_stream_seekable_writepart(ss);</div><div class='del'>-		test_stream_seekable_readpart(ss);</div><div class='del'>-</div><div class='del'>-		push("getting filesize");</div><div class='del'>-		check(stat("stream.txt", &amp;st) == 0 &amp;&amp; (st.st_mode&amp;0777) == 0600 &amp;&amp; S_ISREG(st.st_mode));</div><div class='del'>-		size = st.st_size;</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("checking close closes");</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		check(close(fd) == -1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("re-opening stream");</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 0:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR, 0);</div><div class='del'>-			fd = ((CamelStreamFs *)ss)-&gt;fd;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			fd = open("stream.txt", O_RDWR, 0);</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-		check(stat("stream.txt", &amp;st) == 0 &amp;&amp; (st.st_mode&amp;0777) == 0600 &amp;&amp; S_ISREG(st.st_mode) &amp;&amp; st.st_size == size);</div><div class='del'>-</div><div class='del'>-		test_stream_seekable_readpart(ss);</div><div class='del'>-</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		check(close(fd) == -1);</div><div class='del'>-		pull();</div><div class='del'>-</div><div class='del'>-		push("re-opening stream with truncate");</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 0:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_TRUNC, 0);</div><div class='del'>-			fd = ((CamelStreamFs *)ss)-&gt;fd;</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			fd = open("stream.txt", O_RDWR|O_TRUNC, 0);</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_fs_new_with_fd(fd);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-		check(stat("stream.txt", &amp;st) == 0 &amp;&amp; (st.st_mode&amp;0777) == 0600 &amp;&amp; S_ISREG(st.st_mode) &amp;&amp; st.st_size == 0);</div><div class='del'>-</div><div class='del'>-		/* read has to return 0 before eos is set */</div><div class='del'>-		check(camel_stream_read(CAMEL_STREAM(ss), buffer, 1) == 0);</div><div class='del'>-		check(camel_stream_eos(CAMEL_STREAM(ss)));</div><div class='del'>-</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		check(close(fd) == -1);</div><div class='del'>-		pull();</div><div class='del'>-		</div><div class='del'>-		(void)unlink("stream.txt");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/stream/test2.c b/camel/tests/stream/test2.c<br/>deleted file mode 100644<br/>index 02ad88e95c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/test2.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/test2.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test ... camelstreammem */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "streams.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *ss = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	int fd = -1;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int size;</div><div class='del'>-	char buffer[1024];</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelStream mem, create, seek, read, write, eos");</div><div class='del'>-	for (i=0;i&lt;3;i++) {</div><div class='del'>-</div><div class='del'>-		push("Creating stream using method %d", i);</div><div class='del'>-		switch(i) {</div><div class='del'>-		case 0:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_mem_new();</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			ba = g_byte_array_new();</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_mem_new_with_byte_array(ba);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			ss = (CamelSeekableStream *)camel_stream_mem_new_with_buffer("", 0);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-</div><div class='del'>-		test_stream_seekable_writepart(ss);</div><div class='del'>-		test_stream_seekable_readpart(ss);</div><div class='del'>-</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/tests/stream/test3.c b/camel/tests/stream/test3.c<br/>deleted file mode 100644<br/>index b870a7773e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/tests/stream/test3.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>camel/tests/stream/test3.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  test ... camelseekablesubstream */</div><div class='del'>-</div><div class='del'>-#include "camel-test.h"</div><div class='del'>-#include "streams.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-stream-mem.h"</div><div class='del'>-#include "camel/camel-stream-fs.h"</div><div class='del'>-#include "camel/camel-seekable-substream.h"</div><div class='del'>-</div><div class='del'>-#define ARRAY_LEN(x) (sizeof(x)/sizeof(x[0]))</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	off_t lower, upper;</div><div class='del'>-} ranges[] = {</div><div class='del'>-	{ 3, 10241 },</div><div class='del'>-	{ 0, 1024 },</div><div class='del'>-	{ 0, 0 },</div><div class='del'>-	{ 0, 1 },</div><div class='del'>-	{ 0, 2 },</div><div class='del'>-	{ 0, 3 },</div><div class='del'>-	{ 0, 7 },</div><div class='del'>-	{ 1, 8 },</div><div class='del'>-	{ 1, 9 },</div><div class='del'>-	{ 10245, 10300 },</div><div class='del'>-	{ 0, CAMEL_STREAM_UNBOUND },</div><div class='del'>-/*	{ 1, CAMEL_STREAM_UNBOUND },</div><div class='del'>-	{ 2, CAMEL_STREAM_UNBOUND },</div><div class='del'>-	{ 3, CAMEL_STREAM_UNBOUND },  these take too long to run</div><div class='del'>-	{ 7, CAMEL_STREAM_UNBOUND },*/</div><div class='del'>-	{ 10245, CAMEL_STREAM_UNBOUND },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *ss = NULL;</div><div class='del'>-	int i, j;</div><div class='del'>-	CamelSeekableSubstream *sus, *sus2;</div><div class='del'>-</div><div class='del'>-	camel_test_init(argc, argv);</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelSeekableSubstream, mem backing");</div><div class='del'>-	for (j=0;j&lt;SEEKABLE_SUBSTREAM_WAYS;j++) {</div><div class='del'>-		push("testing writing method %d", j);</div><div class='del'>-		ss = (CamelSeekableStream *)camel_stream_mem_new();</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-		for (i=0;i&lt;ARRAY_LEN(ranges);i++) {</div><div class='del'>-			push("stream subrange %d-%d", ranges[i].lower, ranges[i].upper);</div><div class='del'>-			sus = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);</div><div class='del'>-			check(sus != NULL);</div><div class='del'>-			</div><div class='del'>-			test_seekable_substream_writepart((CamelStream *)sus, j);</div><div class='del'>-			test_seekable_substream_readpart((CamelStream *)sus);</div><div class='del'>-			</div><div class='del'>-			sus2 = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);</div><div class='del'>-			check(sus2 != NULL);</div><div class='del'>-			test_seekable_substream_readpart((CamelStream *)sus2);</div><div class='del'>-			</div><div class='del'>-			check_unref(sus, 1);</div><div class='del'>-			check_unref(sus2, 1);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	(void)unlink("stream.txt");</div><div class='del'>-</div><div class='del'>-	camel_test_start("CamelSeekableSubstream, file backing");</div><div class='del'>-	for (j=0;j&lt;SEEKABLE_SUBSTREAM_WAYS;j++) {</div><div class='del'>-		push("testing writing method %d", j);</div><div class='del'>-		ss = (CamelSeekableStream *)camel_stream_fs_new_with_name("stream.txt", O_RDWR|O_CREAT|O_TRUNC, 0600);</div><div class='del'>-		check(ss != NULL);</div><div class='del'>-		for (i=0;i&lt;ARRAY_LEN(ranges);i++) {</div><div class='del'>-			push("stream subrange %d-%d", ranges[i].lower, ranges[i].upper);</div><div class='del'>-			sus = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);</div><div class='del'>-			check(sus != NULL);</div><div class='del'>-</div><div class='del'>-			test_seekable_substream_writepart((CamelStream *)sus, j);</div><div class='del'>-			test_seekable_substream_readpart((CamelStream *)sus);</div><div class='del'>-</div><div class='del'>-			sus2 = (CamelSeekableSubstream *)camel_seekable_substream_new_with_seekable_stream_and_bounds(ss, ranges[i].lower, ranges[i].upper);</div><div class='del'>-			check(sus2 != NULL);</div><div class='del'>-			test_seekable_substream_readpart((CamelStream *)sus2);</div><div class='del'>-			</div><div class='del'>-			check_unref(sus, 1);</div><div class='del'>-			check_unref(sus2, 1);</div><div class='del'>-			pull();</div><div class='del'>-		}</div><div class='del'>-		check_unref(ss, 1);</div><div class='del'>-		(void)unlink("stream.txt");</div><div class='del'>-		pull();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_test_end();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/.cvsignore b/composer/.cvsignore<br/>deleted file mode 100644<br/>index 061db72218..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-evolution-msg-composer</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-Composer-stubs.c</div><div class='del'>-Composer-skels.c</div><div class='del'>-Composer-common.c</div><div class='del'>-Composer.h</div><div class='del'>-Editor-stubs.c</div><div class='del'>-Editor-skels.c</div><div class='del'>-Editor.h</div><div class='del'>-Editor-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='del'>-HTMLEditor*.[ch]</div><div class='head'>diff --git a/composer/ChangeLog b/composer/ChangeLog<br/>deleted file mode 100644<br/>index a8c5e331e5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2898 +0,0 @@</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Check for empty-string pgp-key</div><div class='del'>-	ids and don't use them.</div><div class='del'>-</div><div class='del'>-2002-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (destroy): Unref the priv-&gt;tooltips object</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (destroy): Free the priv struct.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_signature): We don't need a 'name'?</div><div class='del'>-	So don't strdup it.</div><div class='del'>-</div><div class='del'>-2002-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (from_changed): Change the Reply-To header</div><div class='del'>-	contents.</div><div class='del'>-	(e_msg_composer_hdrs_set_reply_to): The Reply-To entry was an</div><div class='del'>-	EEntry, not a bonobo control so fix this to set the text using</div><div class='del'>-	e_entry_set_text.</div><div class='del'>-	(e_msg_composer_hdrs_get_reply_to): Use e_entry_get_text here for</div><div class='del'>-	the same reason.</div><div class='del'>-</div><div class='del'>-2002-04-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_text): No need to query for the</div><div class='del'>-	persist-stream interface here, just re-use</div><div class='del'>-	composer-&gt;persist_stream_interface - this might improve the speed</div><div class='del'>-	at which a reply action brings up the composer.</div><div class='del'>-</div><div class='del'>-2002-04-09  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Use decode</div><div class='del'>-	rather than unformat - the e_destination was changed (long time</div><div class='del'>-	ago) to rfc2047 encode the addresses, so we should decode</div><div class='del'>-	likewise.  Should fix #16158.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (next_word): g_utf8_next_char never returns</div><div class='del'>-	NULL, it just skips to the next character.  So like normal string</div><div class='del'>-	code, we just check for a nul explicitly.  Fixes a bug found while</div><div class='del'>-	checking #16158.</div><div class='del'>-</div><div class='del'>-2002-04-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Fixes bug #3980.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_cc): If a Cc list</div><div class='del'>-	is set to something non-empty, make sure to show the Cc widgets.</div><div class='del'>-	(e_msg_composer_hdrs_set_bcc): Same but for Bcc.</div><div class='del'>-	(e_msg_composer_hdrs_set_reply_to): And here.</div><div class='del'>-</div><div class='del'>-2002-03-28  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c: Switch to using EFileSelection</div><div class='del'>-	here instead of GtkFileSelection.</div><div class='del'>-</div><div class='del'>-2002-03-27  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: fix for the changes to GTKHTML_DATADIR that include</div><div class='del'>-	the release number.</div><div class='del'>-</div><div class='del'>-2002-03-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl, evolution-composer.c</div><div class='del'>-	(impl_Composer_show): "Forward as iCalendar" uses set_body, so we</div><div class='del'>-	can't make the composer un-showable after doing that. So get rid</div><div class='del'>-	of the "cannot show" exception.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_body): Prepare the composer</div><div class='del'>-	to be shown in its weird state: Put an explanatory message in the</div><div class='del'>-	body, then call disable_editor.</div><div class='del'>-	(disable_editor): Common editor-disabling code - makes the editor</div><div class='del'>-	and attachment bar insensitive and disables any menu items that</div><div class='del'>-	could be used to modify them.</div><div class='del'>-	(e_msg_composer_new_redirect): Use disable_editor here now.</div><div class='del'>-	</div><div class='del'>-2002-03-15  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: use gtkhtml editor API version 1.1</div><div class='del'>-</div><div class='del'>-2002-03-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): Remove the extremely verbose printf</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2002-03-07  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (destroy): ops, unregister and not register new</div><div class='del'>-	one sig_event_client</div><div class='del'>-</div><div class='del'>-2002-03-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Fix a dumb bug in previous</div><div class='del'>-	commit that broke iMIP containing 8-bit data.</div><div class='del'>-</div><div class='del'>-2002-02-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Mailer side of 14705.</div><div class='del'>-	</div><div class='del'>-	* Evolution-Composer.idl (setBody): Change setBodyText to setBody</div><div class='del'>-	and take a MIME type as well.</div><div class='del'>-	(show): Add an exception.</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (impl_Composer_set_body, etc): Update for</div><div class='del'>-	IDL change. While I'm here, fix this to DTRT with both plaintext</div><div class='del'>-	and HTML bodies. (It claimed to take plain text before, but then</div><div class='del'>-	passed it to the composer as HTML.)</div><div class='del'>-	(impl_Composer_show): Raise an exception if setBody has been</div><div class='del'>-	called, since the composer window will not display the real data</div><div class='del'>-	in that case.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_body): interface for</div><div class='del'>-	impl_Composer_set_body.</div><div class='del'>-	(build_message): If e_msg_composer_set_body has been called, use</div><div class='del'>-	the body and MIME type supplied to it rather than the contents of</div><div class='del'>-	the HTML editor.</div><div class='del'>-</div><div class='del'>-2002-02-14  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (delete_old_signature): don't insert paragraph</div><div class='del'>-	here, also delete paragraph where signature was</div><div class='del'>-	(e_msg_composer_show_sig_file): test if we are in empty document</div><div class='del'>-	and if so, insert new paragraph for signature</div><div class='del'>-</div><div class='del'>-2002-02-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_flush_pending_body): Use</div><div class='del'>-	set_editor_text()</div><div class='del'>-	(e_msg_composer_new_from_url): Same.</div><div class='del'>-	(e_msg_composer_set_body_text): Re-Show the signature.</div><div class='del'>-</div><div class='del'>-2002-02-12  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_is_dirty): reflect gtkhtml API</div><div class='del'>-	change</div><div class='del'>-</div><div class='del'>-2002-02-11  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_drop_editor_undo): new method,</div><div class='del'>-	drops undo in editor and resets dirty flag in editor</div><div class='del'>-	(do_exit): remove TRUE from condition as dirty flag in editor</div><div class='del'>-	should work now</div><div class='del'>-	(e_msg_composer_is_dirty): use new editor API for dirty flag</div><div class='del'>-</div><div class='del'>-2002-02-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (update_auto_recipients): Update the</div><div class='del'>-	auto-cc/bcc recipients in the composer header fields to match the</div><div class='del'>-	ones chosen in the account configuration.</div><div class='del'>-</div><div class='del'>-2002-01-31  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_ignore): new method, tells</div><div class='del'>-	composer to ignore all word in str string</div><div class='del'>-	(next_word): helper function to get next word from s, saves rest</div><div class='del'>-	of s to sr</div><div class='del'>-</div><div class='del'>-2002-01-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If we are in redirect mode,</div><div class='del'>-	use the original message and set the resent-* headers using</div><div class='del'>-	e_msg_composer_hdrs_to_redirect() and then return.</div><div class='del'>-	(destroy): Unref the redirected message if it exists.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_redirect): New</div><div class='del'>-	function for a composer in redirect mode.</div><div class='del'>-</div><div class='del'>-2002-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Use GNOME_FULL_CFLAGS.</div><div class='del'>-</div><div class='del'>-2002-01-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_file_content): Rewrote to use CamelStreams</div><div class='del'>-	and also convert the file contents to UTF-8 (assums the file</div><div class='del'>-	charset is the same charset that the composer is set to).</div><div class='del'>-	(menu_file_insert_file_cb): Pass the composer into</div><div class='del'>-	get_file_content().</div><div class='del'>-	(e_msg_composer_get_sig_file_content): Pass NULL as the composer</div><div class='del'>-	argument.</div><div class='del'>-</div><div class='del'>-2002-01-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (class_init): Fixed the setup of the</div><div class='del'>-	"save-draft" signal so that it would actually work.</div><div class='del'>-</div><div class='del'>-2002-01-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (is_special_header): Greatly simplified. No</div><div class='del'>-	need to have a list of headers to not accept - we can just refuse</div><div class='del'>-	all headers that are not X-* headers (other than X-Evolution</div><div class='del'>-	headers).</div><div class='del'>-</div><div class='del'>-2002-01-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the</div><div class='del'>-	X-Evolution-Format header to text/plain if that is the editing</div><div class='del'>-	mode we are really in. This fixes bug #11499.</div><div class='del'>-</div><div class='del'>-2002-01-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_from_url): A few minor</div><div class='del'>-	fixes to make it more compliant with rfc2368. Should now be fully</div><div class='del'>-	rfc compliant as far as I can tell.</div><div class='del'>-</div><div class='del'>-2002-01-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):</div><div class='del'>-	Only connect to the parent's destroy/hide signals while the</div><div class='del'>-	attachment editor dialog is "alive".</div><div class='del'>-</div><div class='del'>-2001-12-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (composer_hide_cb): Only cancel the</div><div class='del'>-	selection dialog if it is currently in use, otherwise we'll get an</div><div class='del'>-	extra gtk_main_quit and the mailer will exit :-(</div><div class='del'>-</div><div class='del'>-2001-12-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (read_file_content): Don't block forever if we</div><div class='del'>-	are reading a fifo with no data.</div><div class='del'>-</div><div class='del'>-2001-12-14  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (class_init): Setup the SAVE_DRAFT signal.</div><div class='del'>-	(menu_file_save_draft_cb): Emit the SAVE_DRAFT signal.</div><div class='del'>-	(exit_dialog_cb): Same here.</div><div class='del'>-	(save_draft): Removed. This code is now a signal that</div><div class='del'>-	mail-callbacks will connect to.</div><div class='del'>-</div><div class='del'>-2001-12-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):</div><div class='del'>-	Attach to the parent widget's destroy signal - when that gets</div><div class='del'>-	destroyed, we need to cancel the editor dialog too. Also connect</div><div class='del'>-	to our parent window's "hide" signal so that when the composer</div><div class='del'>-	gets hidden (ie, it's being sent), we also close the dialogs.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (init): Default composer-&gt;enable_autosave to</div><div class='del'>-	TRUE.</div><div class='del'>-</div><div class='del'>-2001-12-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (confirm): If multiple-selection is</div><div class='del'>-	enabled but nothing is slected, fall back to using the filename in</div><div class='del'>-	the entry box as the "selected" file.</div><div class='del'>-	(create_file_selection): If the composer gets hidden (ie it's</div><div class='del'>-	being "sent") then cancel the file selection dialog.</div><div class='del'>-</div><div class='del'>-2001-12-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c</div><div class='del'>-	(file_selection_info_destroy_notify): If the widget is non-NULL,</div><div class='del'>-	then gtk_widget_destroy that bad boy...</div><div class='del'>-</div><div class='del'>-2001-12-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_user):</div><div class='del'>-	select_file_attachments now returns a GPtrArray so handle that and</div><div class='del'>-	loop until we've added all the attachment files.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (confirm): Add an evil kludge to</div><div class='del'>-	get a list of filenames from the GtkFileSelection widget based on</div><div class='del'>-	the label in the history option menu item and the base filenames</div><div class='del'>-	of the selected items in the filename clist.</div><div class='del'>-	(create_file_selection): Setup the clist to allow multiple</div><div class='del'>-	selection.</div><div class='del'>-	(file_selection_info_destroy_notify): Destroy the GPtrArray</div><div class='del'>-	containing the list of xselected files.</div><div class='del'>-	(select_file_internal): Return a GPtrArray of files instead of a</div><div class='del'>-	char *.</div><div class='del'>-</div><div class='del'>-2001-12-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_file_content): Only execute an executable</div><div class='del'>-	sig file if a magic environment variable is set.</div><div class='del'>-</div><div class='del'>-2001-12-06  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (executed_file_output): Added.  Executes the</div><div class='del'>-	given file and returns its output as a string.</div><div class='del'>-	(get_file_content): Stats the file to see if it is executable.</div><div class='del'>-	If it is, execute it and return the string.  If not, just read</div><div class='del'>-	the file and return the contents.</div><div class='del'>-</div><div class='del'>-2001-11-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be</div><div class='del'>-	the same as the FileSendLater tooltip if we are in offline mode.</div><div class='del'>-</div><div class='del'>-2001-11-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (drag_data_received): Allow drag &amp; drop for</div><div class='del'>-	vcards.</div><div class='del'>-</div><div class='del'>-2001-11-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Change the FileSend tooltip the be</div><div class='del'>-	the same as the FileSendLater tooltip if we are in offline mode.</div><div class='del'>-</div><div class='del'>-2001-11-14  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_composer): popup failure dialog if we</div><div class='del'>-	cannot get a valid editor_engine.</div><div class='del'>-	(prepare_engine): make the checks robust and make sure that we</div><div class='del'>-	unset the engine if any part fails. </div><div class='del'>-</div><div class='del'>-2001-11-02  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_inlined_images): use hash table to</div><div class='del'>-	eliminate duplicates</div><div class='del'>-</div><div class='del'>-2001-11-02    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_enable_autosave): New</div><div class='del'>-	function, enable/disable autosave for the composer temporarily.</div><div class='del'>-	(autosave_run_foreach_cb): Only save if we have enable autosave</div><div class='del'>-	turned on.  In other cases we want to save it regardless.</div><div class='del'>-</div><div class='del'>-2001-10-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Add back the "remove</div><div class='del'>-	Content-Disposition when sending itip" hack.</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl (setMultipartType): New.</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (impl_Composer_set_multipart_type): Allow</div><div class='del'>-	caller to specify a multipart/alternative rather than</div><div class='del'>-	multipart/mixed.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Revert yesterday's changes.</div><div class='del'>-	Add new ones for sending multipart/alternative.</div><div class='del'>-</div><div class='del'>-2001-10-30  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: add dirty prototype.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: add dirty implementation.</div><div class='del'>-</div><div class='del'>-2001-10-30  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (insert_paragraph_before): new helper function,</div><div class='del'>-	extracted</div><div class='del'>-	(insert_paragraph_after): ditto</div><div class='del'>-	(impl_event): process command_before and command_after, use new</div><div class='del'>-	functions</div><div class='del'>-	(clear_signature): reset style to be sure</div><div class='del'>-	(reply_indent): ditto</div><div class='del'>-</div><div class='del'>-2001-10-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Remove Content-Disposition in</div><div class='del'>-	the no_body case. (More kludging around Outlook iCalendar</div><div class='del'>-	brokenness.)</div><div class='del'>-</div><div class='del'>-2001-10-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Put the charset encoding submenu in</div><div class='del'>-	the EncodingPlaceholder.</div><div class='del'>-</div><div class='del'>-2001-10-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (init): Set the (new) "no_body" flag on the</div><div class='del'>-	composer.</div><div class='del'>-	(impl_Composer_set_body_text): And unset it here.</div><div class='del'>-	(unset_no_body): And here (called if/when the composer is</div><div class='del'>-	realized).</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If the composer has the</div><div class='del'>-	"no_body" flag set, and a single attachment, promote that</div><div class='del'>-	attachment to be the message body.</div><div class='del'>-</div><div class='del'>-2001-10-30  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (reply_indent): simplified, requires new gtkhtml</div><div class='del'>-</div><div class='del'>-2001-10-29  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: add GList to hold the current images.</div><div class='del'>-</div><div class='del'>-	* listener.c (resolve_image_url): keep track of the images that</div><div class='del'>-	the editor is currently uses in current_images as well as storing</div><div class='del'>-	the images in the hash.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (clear_current_images): clear the list of</div><div class='del'>-	images actually in the message.</div><div class='del'>-	(add_inlined_images): use the current image list rather than the</div><div class='del'>-	hash tables.</div><div class='del'>-	(build_message): clear the current image list when appropriate.</div><div class='del'>-	(init): initialize current_images.</div><div class='del'>-	</div><div class='del'>-2001-10-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_attachments_from_multipart): New function</div><div class='del'>-	that replaces handle_multpart() and handle_multipart_alternative()</div><div class='del'>-	for add_message_attachments().</div><div class='del'>-	(e_msg_composer_add_message_attachments): Call</div><div class='del'>-	add_attachments_from_multipart().</div><div class='del'>-	(handle_multipart_alternative): Now only used by</div><div class='del'>-	new_with_message() and is really only designed to work well with</div><div class='del'>-	messages generated by Evolution (ie for editing Drafts and such).</div><div class='del'>-	(handle_multipart): Same.</div><div class='del'>-	(e_msg_composer_new_with_message): No longer calls</div><div class='del'>-	add_message_attachments() because we can't ever have this fail and</div><div class='del'>-	the logic in add_message_attachments() is impossible</div><div class='del'>-	logic. Instead do like what we used to do before the addition of</div><div class='del'>-	add_message_attachments() came along.</div><div class='del'>-</div><div class='del'>-2001-10-24  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c</div><div class='del'>-	(e_msg_composer_add_inline_image_from_mime_part): rework this so</div><div class='del'>-	that we don't end up freeing the cid then reading from it.</div><div class='del'>-</div><div class='del'>-2001-10-22  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_from_optionmenu): Check that</div><div class='del'>-	account-&gt;id-&gt;address != NULL.</div><div class='del'>-</div><div class='del'>-2001-10-21  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	Make inline images used for replies not show up as</div><div class='del'>-	attachments. Also, I think this should make replies to HTML</div><div class='del'>-	messages containing inline images referenced via Content-Location</div><div class='del'>-	work, but that's not tested.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (various): Keep two hash tables of inline image</div><div class='del'>-	data: one mapping from cid: URLs to CamelMimeParts for all</div><div class='del'>-	attachments, the other mapping from file: and Content-Location</div><div class='del'>-	urls to CamelMimeParts (for those inline images that came from a</div><div class='del'>-	file or have a Content-Location).</div><div class='del'>-	(add_inlined_images): Simplify. Most of this code is in</div><div class='del'>-	e_msg_composer_add_inline_image_from_file() now.</div><div class='del'>-	(e_msg_composer_add_message_attachments, handle_multipart): Change</div><div class='del'>-	"attach_all" arg to "just_inlines". If it is set, call</div><div class='del'>-	e_msg_composer_add_inline_image_from_mime_part on any attachment</div><div class='del'>-	with a Content-Id or Content-Location.</div><div class='del'>-	(e_msg_composer_add_inline_image_from_file): Create a mime part</div><div class='del'>-	from a file and add it to the inline images hash.</div><div class='del'>-	(e_msg_composer_add_inline_image_from_mime_part): Add a mime part</div><div class='del'>-	directly to the inline images hash.</div><div class='del'>-</div><div class='del'>-	* listener.c (resolve_image_url): If asked to resolve a file: URL</div><div class='del'>-	that isn't in the inline images hash, call</div><div class='del'>-	e_msg_composer_add_inline_image_from_file to get a cid for it.</div><div class='del'>-	(impl_event): Look up the URL in the inline_images and</div><div class='del'>-	inline_images_by_url hashes.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_find_message): Gone. No longer</div><div class='del'>-	used.</div><div class='del'>-</div><div class='del'>-2001-10-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (handle_multipart): Now takes a 'attach_all'</div><div class='del'>-	argument. If !attach_all, then only attach the attachment if the</div><div class='del'>-	part has a content-id, otherwise we can safely assume that nothing</div><div class='del'>-	references it thus we don't need to attach it.</div><div class='del'>-	(e_msg_composer_add_message_attachments): Now takes a 'attach_all'</div><div class='del'>-	argument that overrides the "only attach attachments if they have</div><div class='del'>-	a content-id header" behavior.</div><div class='del'>-	(e_msg_composer_new_with_message): Pass TRUE as the attach_all</div><div class='del'>-	argument to add_message_attachments.</div><div class='del'>-</div><div class='del'>-2001-10-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (best_encoding): Don't use a</div><div class='del'>-	g_return_val_if_fail after iconv_open, this is a valid error</div><div class='del'>-	condition and so should use check it for real.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Correctly</div><div class='del'>-	set the charset parameter and use camel's bestenc filter to</div><div class='del'>-	determine which content transfer encoding to use.</div><div class='del'>-</div><div class='del'>-2001-10-15  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_add_message_attachments):</div><div class='del'>-	s/apply/flush/.</div><div class='del'>-	(e_msg_composer_flush_pending_body): renamed from apply now takes</div><div class='del'>-	apply as an argument.</div><div class='del'>-	(e_msg_composer_show_sig_file): s/g_assert/g_return_if_fail/</div><div class='del'>-	warnings make for less painful bugs than crashes.</div><div class='del'>-	(set_editor_text): s/g_assert/g_return_if_fail/</div><div class='del'>-</div><div class='del'>-2001-10-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_unregister): Don't pop up an</div><div class='del'>-	"unable to retrieve message" if the composer never finished</div><div class='del'>-	initializing.</div><div class='del'>-	(init): Don't call autosave_manager_register here: wait until the</div><div class='del'>-	end of create_composer.</div><div class='del'>-	(create_composer): Remove the distinction between this and</div><div class='del'>-	e_msg_composer_construct since there's no need for the latter. Use</div><div class='del'>-	e_activation_failure_dialog if either the selectnames component or</div><div class='del'>-	the gtkhtml editor fails.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (setup_corba): Don't g_warn if the oaf</div><div class='del'>-	activation fails. create_composer() will tell the user.</div><div class='del'>-</div><div class='del'>-2001-10-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): Deleted declaration of len.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_add_message_attachments): Take</div><div class='del'>-	a settext argument.</div><div class='del'>-	(e_msg_composer_new_with_message): Updated to pass the settext argument.</div><div class='del'>-</div><div class='del'>-2001-10-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account):</div><div class='del'>-	Check for either a matching account name, or for a matching e-mail</div><div class='del'>-	address embedded in the passed-in string. (Fixes half of bug</div><div class='del'>-	#3255)</div><div class='del'>-	(destroy): Call bonobo_object_release_unref on corba_select_names,</div><div class='del'>-	not CORBA_Object_release.  Otherwise we leak stuff all over the</div><div class='del'>-	place. (Bug #11878)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): If our message</div><div class='del'>-	doesn't contain an X-Evolution-Account header, pass in the From</div><div class='del'>-	header as the account name.  (Fixes the other half of #3255)</div><div class='del'>-</div><div class='del'>-2001-10-10  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: add prototype.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_add_message_attachments): new</div><div class='del'>-	function to copy attachments from the a message to a composer.</div><div class='del'>-	(e_msg_composer_set_pending_body): make simple function to</div><div class='del'>-	abstract this.</div><div class='del'>-	(e_msg_composer_apply_pending_body): apply the pending body to</div><div class='del'>-	the composer.</div><div class='del'>-	(e_msg_composer_new_with_message): use</div><div class='del'>-	e_msg_composer_add_message_attachments to copy attachments.</div><div class='del'>-</div><div class='del'>-2001-10-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_file): If the</div><div class='del'>-	attachment fails, report the error to the user.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Now</div><div class='del'>-	takes a CamelException argument.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Pass /menu/Edit as the menu path to</div><div class='del'>-	e_charset_picker thingy.</div><div class='del'>-</div><div class='del'>-2001-10-05  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_find_message): fix cut&amp;pasteo.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	remove unused variable.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_find_message): generalize this to</div><div class='del'>-	lookup content locations as well.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.h: change prototype to match the</div><div class='del'>-	new function.</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): handle the url_requested event, look up</div><div class='del'>-	parts in the attachment part and feed them down the stream if it</div><div class='del'>-	is found.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (handle_multipart_alternative): delay setting</div><div class='del'>-	the body text.</div><div class='del'>-	(handle_multipart): delay setting body text</div><div class='del'>-	(e_msg_composer_new_with_message): set the body text from the</div><div class='del'>-	object data.  Doing this ensures that we will have the attachments</div><div class='del'>-	processed before we try to look them up.</div><div class='del'>-</div><div class='del'>-2001-10-04  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c </div><div class='del'>-	(e_msg_composer_attachment_bar_find_content_id): change to return</div><div class='del'>-	a CamelMimePart.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.h: update prototype.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_find_content_id): look up an</div><div class='del'>-	attachment by it's content id.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.h: add prototype for</div><div class='del'>-	e_msg_composer_attachment_bar_find_content_id.</div><div class='del'>-</div><div class='del'>-2001-10-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_save_draft): Make sure to unref the</div><div class='del'>-	message object so we don't leak it or any references to</div><div class='del'>-	attachments (child mime parts).</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	Unref the mime part after passing it along to new_from_mime_part.</div><div class='del'>-</div><div class='del'>-2001-10-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Pass an empty flags argument to</div><div class='del'>-	mail_get_folder.</div><div class='del'>-</div><div class='del'>-2001-10-02  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Use</div><div class='del'>-	`bonobo_ui_component_new_default()', not</div><div class='del'>-	`bonobo_ui_component_new()'.</div><div class='del'>-</div><div class='del'>-2001-09-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	Don't set Content-Ids on these parts since they are not contained</div><div class='del'>-	within a multipart/related - this fixes bug #10032.</div><div class='del'>-</div><div class='del'>-2001-09-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_from_url): Fixes glitch in</div><div class='del'>-	mailto: url parsing that caused it to fail when recipient names</div><div class='del'>-	contained commas. (Bug #10796)</div><div class='del'>-</div><div class='del'>-2001-09-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Update to reflect changes to</div><div class='del'>-	mail_get_folder.</div><div class='del'>-</div><div class='del'>-2001-09-20  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_file_content): Open the file with O_CREAT so</div><div class='del'>-	that if it doesn't exist, it's created. Never return a NULL as this</div><div class='del'>-	could potentially crash on Solaris.</div><div class='del'>-</div><div class='del'>-2001-09-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Attach an X-Evolution-Format</div><div class='del'>-	header so if people re-edit a message in say their Sent folder, we</div><div class='del'>-	will preserve format preferences.</div><div class='del'>-	(e_msg_composer_get_message_draft): Don't attach</div><div class='del'>-	X-Evolution-Format headers here since it is now done in</div><div class='del'>-	build_message().</div><div class='del'>-	(e_msg_composer_new_with_message): Make sure to remove *all*</div><div class='del'>-	X-Evolution headers by using the mail-tools functions.</div><div class='del'>-</div><div class='del'>-2001-09-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Don't</div><div class='del'>-	gtk_object_destroy() the pixbuf loader, unref it instead.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (destroy): Don't forget to free the</div><div class='del'>-	private structure.</div><div class='del'>-</div><div class='del'>-2001-09-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Automake 1.5 fixes pointed out by Richard Boulton</div><div class='del'>-	&lt;richard@tartarus.org&gt;, as per #9258.]</div><div class='del'>-</div><div class='del'>-	* Makefile.am (CLEANFILES): Set directly with `=' instead of `+='.</div><div class='del'>-</div><div class='del'>-2001-09-13  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (map_default_cb): free the text values we get</div><div class='del'>-	from the property bag and release the property bag properly.</div><div class='del'>-</div><div class='del'>-2001-09-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (corba_recipientlist_to_destv): null</div><div class='del'>-	terminate the destination vector</div><div class='del'>-</div><div class='del'>-2001-09-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (init): Don't call new_with_sig_file, it no</div><div class='del'>-	longer exists.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Make sure that the session is</div><div class='del'>-	non-NULL.</div><div class='del'>-	(menu_file_send_cb): And here too.</div><div class='del'>-	(e_msg_composer_new_with_sig_file): Removed.</div><div class='del'>-</div><div class='del'>-2001-09-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Wrap the S/MIME code in ifdef</div><div class='del'>-	SMIME_SUPPORTED which isn't defined but by some later version will</div><div class='del'>-	be.</div><div class='del'>-	(setup_ui): And again here.</div><div class='del'>-</div><div class='del'>-2001-09-09  Maciej Stachowiak  &lt;mjs@noisehavoc.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add VFS_CFLAGS so things don't break when the</div><div class='del'>-	gnome-vfs headers move.</div><div class='del'>-</div><div class='del'>-2001-09-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (corba_recipientlist_to_destv): Originally</div><div class='del'>-	was corba_recipientlist_to_glist.</div><div class='del'>-	(impl_Composer_set_headers): Use corba_recipientlist_to_destv, new</div><div class='del'>-	destination-based api.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Get rid of that 'sending'</div><div class='del'>-	stuff.  That was a bad idea.</div><div class='del'>-	(e_msg_composer_new_with_message): Apply the revised api and work</div><div class='del'>-	with vectors of destinations rather than just lists.</div><div class='del'>-	(e_msg_composer_get_recipients): Added.  Returns the full set of</div><div class='del'>-	recipient destinations in a vector.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Removed free_destv function.  We use</div><div class='del'>-	e_destination_freev instead.</div><div class='del'>-	(e_msg_composer_hdrs_get_to): Changed to return a vector of</div><div class='del'>-	EDestinations.  This function now works.</div><div class='del'>-	(e_msg_composer_hdrs_get_cc): Ditto.</div><div class='del'>-	(e_msg_composer_hdrs_get_bcc): Ditto.</div><div class='del'>-	(e_msg_composer_hdrs_get_recipients): Added.  Returns a vector of</div><div class='del'>-	EDestinations that is the union of the to, cc and bcc lines.</div><div class='del'>-	(e_msg_composer_hdrs_set_to): Changed to take a vector of</div><div class='del'>-	EDestinations, rather than a GList.</div><div class='del'>-	(e_msg_composer_hdrs_set_cc): Ditto.</div><div class='del'>-	(e_msg_composer_hdrs_set_bcc): Ditto.</div><div class='del'>-	(e_msg_composer_hdrs_to_message): Use our new, improved API, rather</div><div class='del'>-	than a bunch of poking around in BonoboPropertyBags, etc.</div><div class='del'>-</div><div class='del'>-2001-09-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Remove some</div><div class='del'>-	debugging messages that don't check for NULL strings and crash</div><div class='del'>-	Solaris.</div><div class='del'>-</div><div class='del'>-2001-09-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save): Have to specify a mode when using</div><div class='del'>-	O_CREAT.</div><div class='del'>-	(handle_multipart_alternative, handle_multipart,</div><div class='del'>-	e_msg_composer_new_with_message): Update for mail_get_message_body</div><div class='del'>-	change.</div><div class='del'>-</div><div class='del'>-2001-09-05  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_query_load_orphans):</div><div class='del'>-	s/Evolution/Ximian Evolution/.</div><div class='del'>-	(do_exit): Set the title to be "Warning: Modified Message".</div><div class='del'>-</div><div class='del'>-2001-08-29  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_message_draft): Pass</div><div class='del'>-	in FALSE as the 'sending' arg to e_msg_composer_get_message.</div><div class='del'>-	(build_message): Added a 'sending' arg, which is passed to</div><div class='del'>-	e_msg_composer_get_message.</div><div class='del'>-	(e_msg_composer_get_message): Added a 'sending' arg,</div><div class='del'>-	which gets passed directly on to build_message.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Added</div><div class='del'>-	a "sending" arg, which should be TRUE if the message is being</div><div class='del'>-	sent now (rather than being autosaved, etc.).  The address</div><div class='del'>-	use scores are only updated when sending. (Bug #8332)</div><div class='del'>-	Removed obsolete (#if 0/#endif-ed) code.</div><div class='del'>-</div><div class='del'>-2001-08-22  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients_from_destv): Added.  Try</div><div class='del'>-	to properly handle contact lists in which the addresses of the</div><div class='del'>-	list members should be hidden.</div><div class='del'>-	(e_msg_composer_hdrs_to_message): Changed to extract the</div><div class='del'>-	destination data from the entries and pass it along to</div><div class='del'>-	set_recipients_from_destv.</div><div class='del'>-</div><div class='del'>-2001-08-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save): When reporting an error, use</div><div class='del'>-	my_file_name instead of file_name since file_name can be NULL.</div><div class='del'>-</div><div class='del'>-2001-08-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_query_load_orphans):</div><div class='del'>-	s/attempt recovery/try to recover them/.</div><div class='del'>-</div><div class='del'>-2001-08-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Reset the "changed" state to</div><div class='del'>-	FALSE after a successful save.</div><div class='del'>-</div><div class='del'>-2001-08-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (show_attachments): Toggle the</div><div class='del'>-	View-&gt;Attachments menu item. This fixes bug #6107.</div><div class='del'>-</div><div class='del'>-2001-07-12  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (map_default_cb): New function. Figure out</div><div class='del'>-	which widget gets the default and assign it. Harder to do than</div><div class='del'>-	it sounds.</div><div class='del'>-	(e_msg_composer_construct): Hook map_default_cb up to the "map"</div><div class='del'>-	signal.</div><div class='del'>-	(set_focus_to_editor): Removed.</div><div class='del'>-	(set_focus_to_editor_idle): Removed.</div><div class='del'>-	</div><div class='del'>-2001-08-10  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Removed comment about</div><div class='del'>-	the need to resolve nicknames properly, because we now do that.</div><div class='del'>-</div><div class='del'>-2001-08-09  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_focus_to_editor): new helper function,</div><div class='del'>-	just setup idle callback to grab focus</div><div class='del'>-	(set_focus_to_editor_idle): grab focus for editor, before we have</div><div class='del'>-	better solution, it run grab-focus command on editor control</div><div class='del'>-	(e_msg_composer_construct): call prepare_engine here, set focus to</div><div class='del'>-	editor</div><div class='del'>-</div><div class='del'>-2001-08-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_query_load_orphans): Don't</div><div class='del'>-	forget to closedir() when we finish with dir.</div><div class='del'>-</div><div class='del'>-2001-08-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (from_changed_cb): Set the smime/pgp</div><div class='del'>-	always-sign options when here so it updates when the user changes</div><div class='del'>-	his/her identity.</div><div class='del'>-</div><div class='del'>-2001-08-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_message_draft): Set the</div><div class='del'>-	PGP/MIME and S/MIME options to FALSE before getting the message</div><div class='del'>-	draft and restore the values afterward.</div><div class='del'>-</div><div class='del'>-2001-08-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_inlined_image): Use g_basename().</div><div class='del'>-	(setup_ui): Get the default charset from the mail config db.</div><div class='del'>-</div><div class='del'>-2001-08-06  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): handle delete event</div><div class='del'>-</div><div class='del'>-2001-07-31  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Set the config path for the composer so</div><div class='del'>-	that the customize toolbar command works.</div><div class='del'>-</div><div class='del'>-2001-07-31  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Use Tuomas' and Jakub's new (and beautiful)</div><div class='del'>-	icons for Send and Send Later in the toolbar and menus.</div><div class='del'>-</div><div class='del'>-2001-07-30  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (message_rfc822_dnd): Properly add the</div><div class='del'>-	message/rfc822 part.</div><div class='del'>-</div><div class='del'>-2001-07-27  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature_html): "-- \n" is 4 chars long,</div><div class='del'>-	so when checking if it's already in the sig, strncmp should check</div><div class='del'>-	4 chars, not 3.</div><div class='del'>-</div><div class='del'>-2001-07-26  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature_html): Correct our manually inserted</div><div class='del'>-	signature dash thingie (it was missing the space).</div><div class='del'>-</div><div class='del'>-2001-07-26  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Get "destinations",</div><div class='del'>-	rather than "text" from the entry_widget.  (The getters/setters in</div><div class='del'>-	the control have been made more symmetric.)</div><div class='del'>-</div><div class='del'>-2001-07-18  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_from_optionmenu): Update to the</div><div class='del'>-	new way of finding the default account.</div><div class='del'>-</div><div class='del'>-2001-07-18  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): Use a messagebox.</div><div class='del'>-</div><div class='del'>-2001-07-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (drag_data_received): Correctly handle</div><div class='del'>-	text/uri-list's that contain more than a single file reference.</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_changed_charset_cb): Removed a warning</div><div class='del'>-	that I don't need anymore. This code is working wonderfully ;-)</div><div class='del'>-</div><div class='del'>-2001-07-10  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Fix typo. s/sesiion/session/</div><div class='del'>-	</div><div class='del'>-2001-07-09  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_query_load_orphans): Only ask</div><div class='del'>-	once about recovery, assume if they want to recover one file they</div><div class='del'>-	want to recover all of them.</div><div class='del'>-</div><div class='del'>-2001-07-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Use</div><div class='del'>-	camel_internet_address_format_address rather than</div><div class='del'>-	camel_address_encode since we want display-friendly addresses.</div><div class='del'>-</div><div class='del'>-2001-07-09  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (file_selection_info_destroy_notify):</div><div class='del'>-	Unref the file selection dialog when the data is destroyed.</div><div class='del'>-</div><div class='del'>-2001-07-09  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (composer_shutdown): Do the</div><div class='del'>-	autosave_manager_unregister at shutdown time instead of destroy</div><div class='del'>-	time (by which point the contents of the window, including the</div><div class='del'>-	remote editor control, will have already been destroyed).</div><div class='del'>-</div><div class='del'>-2001-07-09  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c: Added missing #include &lt;config.h&gt; to</div><div class='del'>-	make translations working.</div><div class='del'>-</div><div class='del'>-2001-07-07  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Make sure that our</div><div class='del'>-	destination string (dest_str) is not the empty string before we</div><div class='del'>-	try to use it.</div><div class='del'>-</div><div class='del'>-2001-07-06  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_new): add missing static.</div><div class='del'>-	(best_encoding): make sure we don't try to call iconv_open with a</div><div class='del'>-	NULL tocode.</div><div class='del'>-	(autosave_manager_query_load_orphans): remove zero length orphans</div><div class='del'>-	so that they don't clutter things up.</div><div class='del'>-</div><div class='del'>-2001-07-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	Convert the filename string to UTF8 before setting it on the</div><div class='del'>-	CamelMimePart because that code expects it to be in UTF8.</div><div class='del'>-</div><div class='del'>-2001-07-06  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_query_load_orphans): only ask</div><div class='del'>-	if there are actually contents in the file.  Asking about an</div><div class='del'>-	emptry fil is not very useful.</div><div class='del'>-	(autosave_load_draft): add some sanity chacks.</div><div class='del'>-	(autosave_run_foreach_cb): remove debugging warning.</div><div class='del'>-	(autosave_manager_new): add a missing static.</div><div class='del'>-</div><div class='del'>-2001-07-06  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_manager_unregister): make sure we</div><div class='del'>-	only remove the file if we think we saved it properly.</div><div class='del'>-	(autosave_manager_stop): make sure we set the timeout back to 0 so</div><div class='del'>-	that we will restart next time since we stop the timer when there</div><div class='del'>-	are no active composers.</div><div class='del'>-	(destroy): move this to the beginning of the destroy process.</div><div class='del'>-	(autosave_save_draft): add a return value indicating success.</div><div class='del'>-	(autosave_manager_register): go ahead and ask next time.</div><div class='del'>-</div><div class='del'>-2001-07-05  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: add ask argment.</div><div class='del'>-	(autosave_manager_query_load_orphans): move the load loop out of</div><div class='del'>-	the dir reading loop.</div><div class='del'>-	(autosave_manager_new): move initialization out or register.</div><div class='del'>-	(autosave_manager_register): protect against recursion with ask.</div><div class='del'>-	(init): call new, this still needs to be moved.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save): Play the "File exists, overwrite?"</div><div class='del'>-	game.</div><div class='del'>-	(autosave_run_foreach_cb): Change the return val from a gboolean</div><div class='del'>-	to void.</div><div class='del'>-</div><div class='del'>-2001-07-04  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_load_draft): attach send and postpone</div><div class='del'>-	handlers. and be more tolerant of errors.</div><div class='del'>-</div><div class='del'>-2001-07-03  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (autosave_save_draft): make sure we seek to the</div><div class='del'>-	begining.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: remove the timer id.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: use autosave manager.</div><div class='del'>-	(autosave_save_draft): moved initialization to</div><div class='del'>-	autosave_init_file. Only save the buffer if we get a valid</div><div class='del'>-	message.</div><div class='del'>-	(autosave_load_draft): unlink the old file, we own it now. and</div><div class='del'>-	unref the stream when we are done with it.</div><div class='del'>-	(autosave_is_owned): check if we own the file, this needs to be</div><div class='del'>-	extended to check for other valid processes.</div><div class='del'>-	(autosave_query_load_orphans): make this search through the</div><div class='del'>-	managers list as it walks the dir.</div><div class='del'>-	(autosave_query_load_orphans): make sure we use the full path.</div><div class='del'>-	(autosave_run_foreach_cb): timeout foreach handler.</div><div class='del'>-	(autosave_run): the timeout function.</div><div class='del'>-	(autosave_start): start timer.</div><div class='del'>-	(autosave_stop): stop timer.</div><div class='del'>-	(autosave_register): register a composer with the autosave manager.</div><div class='del'>-	(autosave_unregister): unregister a composer.</div><div class='del'>-	(destroy): unregister the composer, everything is okay.</div><div class='del'>-	(init): register the composer.</div><div class='del'>-</div><div class='del'>-2001-07-02  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: add autosave members.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (autosave_query_load_orphans): query the user to</div><div class='del'>-	check if they want to load any orphans we've found.</div><div class='del'>-	(autosave_query_cb): the dialog callback.</div><div class='del'>-	(autosave_is_orphan): test if if a particular file is orphaned.</div><div class='del'>-	(autosave_load_draft): load a message from an autosave file.</div><div class='del'>-	(autosave_save_draft): save the current buffer to the autosave file.</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added $(BONOBO_CONF_CFLAGS).</div><div class='del'>-</div><div class='del'>-2001-07-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Set the</div><div class='del'>-	user-chosen charset.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_change_charset_cb): New callback function</div><div class='del'>-	to get the user-set charset.</div><div class='del'>-	(init): Set the charset to NULL.</div><div class='del'>-	(best_charset): Take a default_charset param that holds the value</div><div class='del'>-	the user set for this particular message using the menu.</div><div class='del'>-	(destroy): Free the charset.</div><div class='del'>-</div><div class='del'>-2001-07-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_ui): Construct an e-charset-picker</div><div class='del'>-	bonobo-ui menu.</div><div class='del'>-	(menu_change_charset_cb): </div><div class='del'>-</div><div class='del'>-2001-06-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Touch all of our</div><div class='del'>-	EDestinations before we unref them, updating the last-use records</div><div class='del'>-	in the addressbook.</div><div class='del'>-</div><div class='del'>-2001-06-29  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_show_sig_file): remove now</div><div class='del'>-	invalid argument in the documentation.</div><div class='del'>-</div><div class='del'>-2001-06-28  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: removed obsolete e_msg_composer_get_sig_file</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: removed sig_file field from EMsgComposer</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_sig_file_content): exported</div><div class='del'>-	(get_file_content): make it const safe</div><div class='del'>-	(e_msg_composer_get_sig_file_content): refactored, don't try to be</div><div class='del'>-	clever about signature filename, as it's exact now</div><div class='del'>-	(get_signature_html): use has_html_signature flag</div><div class='del'>-	(e_msg_composer_show_sig_file): renamed from</div><div class='del'>-	e_msg_composer_set_sig_file, removed sig_file parameter as it's</div><div class='del'>-	obsolete now</div><div class='del'>-	(e_msg_composer_new_with_sig_file): removed obsolete parameters</div><div class='del'>-</div><div class='del'>-2001-06-27  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_insert_file_cb): make hook this up.</div><div class='del'>-	(get_sig_file_content): use get_file_content.</div><div class='del'>-	(get_file_content): make this usable for both insertion and</div><div class='del'>-	signatures.</div><div class='del'>-	(read_file_content): added helper function to read file.</div><div class='del'>-</div><div class='del'>-2001-06-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Added a pixcache array for special pixmaps to</div><div class='del'>-	use in the composer.</div><div class='del'>-	(setup_ui): Set the pixcache.</div><div class='del'>-</div><div class='del'>-2001-06-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_send_cb): Emit the POSTPONE signal</div><div class='del'>-	if we are offline.</div><div class='del'>-	(setup_ui): If we are offline, change the Control+Enter accel to</div><div class='del'>-	be on the SendLater menu item.</div><div class='del'>-</div><div class='del'>-2001-06-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Save the formatting preference</div><div class='del'>-	for this message draft using a X-Evolution-Format header.</div><div class='del'>-	(e_msg_composer_new_with_message): Restore the format editing</div><div class='del'>-	preference and also remove any other X-Evolution-* headers that we</div><div class='del'>-	may have set.</div><div class='del'>-</div><div class='del'>-2001-06-20  Dave Camp  &lt;dave@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl: Changed attachData to accept a sequence of</div><div class='del'>-	chars rather than a string.</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (impl_Composer_attach_data): Changed the 'data'</div><div class='del'>-	argument to a GNOME_Evolution_Composer_AttachmentData, and pass</div><div class='del'>-	data-&gt;_buffer and data-&gt;_length to camel_mime_part_set_content().</div><div class='del'>-</div><div class='del'>-2001-06-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (impl_Composer_send): send the message</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl: add a "send" method to send a message</div><div class='del'>-	without showing the editor</div><div class='del'>-</div><div class='del'>-2001-06-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Don't define the</div><div class='del'>-	drop_types here.</div><div class='del'>-	(drag_data_received): Implement message/rfc822 dnd drop type</div><div class='del'>-	handling.</div><div class='del'>-</div><div class='del'>-2001-06-12  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: Replace the disposition option</div><div class='del'>-	menu with a checkbox.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c</div><div class='del'>-	(e_msg_composer_select_file_attachment): New function to select a</div><div class='del'>-	file to attach. Adds a "suggest inline disposition" checkbox.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Add</div><div class='del'>-	a disposition argument rather than always defaulting to</div><div class='del'>-	"attachment".</div><div class='del'>-	(struct _DialogData, ok_cb, e_msg_composer_attachment_edit):</div><div class='del'>-	Update for optionmenu-&gt;checkbox change for disposition.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_file): Add a</div><div class='del'>-	disposition argument.</div><div class='del'>-	(add_from_user): Use e_msg_composer_select_file_attachment, pass</div><div class='del'>-	chosen disposition to add_from_file.</div><div class='del'>-	(e_msg_composer_attachment_bar_attach): Pass "attachment" to</div><div class='del'>-	add_from_file for the disposition.</div><div class='del'>-</div><div class='del'>-2001-06-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (best_charset): Fix again... don't leave</div><div class='del'>-	*encoding uninitialized in the US-ASCII case.</div><div class='del'>-</div><div class='del'>-2001-06-11  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Rearranged</div><div class='del'>-	gtk_widget_show()s a bit to fix Bug#3204.  The composer is now</div><div class='del'>-	(like the rest of Evo) properly network transparent.</div><div class='del'>-</div><div class='del'>-2001-06-08  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): When saving a draft, attach</div><div class='del'>-	information about the From: identity via X-Evolution-Account.</div><div class='del'>-	This lets us select the correct identity when we edit it later.</div><div class='del'>-	(e_msg_composer_new_with_message): If the message we are editting</div><div class='del'>-	is tagged with an account (via X-Evolution-Account), make sure</div><div class='del'>-	that the composer chooses that account's identity by default.</div><div class='del'>-</div><div class='del'>-2001-06-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (best_charset): Don't use the default charset</div><div class='del'>-	if the message is US-ASCII.</div><div class='del'>-</div><div class='del'>-2001-06-07  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): just set</div><div class='del'>-	sig_file field, but don't actualy insert signature, it will be</div><div class='del'>-	done by format menu item callback</div><div class='del'>-	(e_msg_composer_set_body_text): don't set signature here</div><div class='del'>-</div><div class='del'>-2001-06-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If user is trying to sign</div><div class='del'>-	his/her message, try first to use the key that they might have</div><div class='del'>-	provided in their account settings. If that was never set, default</div><div class='del'>-	to their email address. Also respect their config option to</div><div class='del'>-	encrypt-to-self.</div><div class='del'>-</div><div class='del'>-2001-05-31  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Oops. Fix a few compile problems.</div><div class='del'>-</div><div class='del'>-2001-05-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (HTML_EDITOR_GENERATED): Use GTKHTML_DATADIR here.</div><div class='del'>-</div><div class='del'>-2001-05-31  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Fixed up the S/MIME</div><div class='del'>-	signing/encrypting code to work with the new API.</div><div class='del'>-</div><div class='del'>-2001-05-31  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (best_encoding): Add a missing iconv_close</div><div class='del'>-</div><div class='del'>-2001-05-30  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use the config-specified</div><div class='del'>-	default character set (which in turn defaults to the locale</div><div class='del'>-	character set) as the default for encoding non-US-ASCII messages,</div><div class='del'>-	assuming it works. Fall back to camel_charset_best() if it fails.</div><div class='del'>-	Also, pick the Content-Transfer-Encoding based on how the data</div><div class='del'>-	looks in the destination charset, not in UTF8.</div><div class='del'>-</div><div class='del'>-	While I was here, I also refactored a bunch and tried to reduce</div><div class='del'>-	redundant code. There are still too many places that set the</div><div class='del'>-	transfer-encoding on the plaintext part though... Also, I think</div><div class='del'>-	some more cleanliness could happen if the sign/encrypt interfaces</div><div class='del'>-	returned CamelMultiparts instead of CamelMimeParts.</div><div class='del'>-</div><div class='del'>-2001-05-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Use</div><div class='del'>-	e_utf8_to_gtk_string() on the description of the attachment since</div><div class='del'>-	camel stores these as utf-8 strings.</div><div class='del'>-</div><div class='del'>-2001-05-28  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): srcdir != builddir fix.</div><div class='del'>-</div><div class='del'>-2001-05-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the</div><div class='del'>-	extra_hdr_* arrays with any non-special-case headers.</div><div class='del'>-	(is_special_header): New convenience function to determine if a</div><div class='del'>-	header is a "special" header or not.</div><div class='del'>-</div><div class='del'>-2001-05-24  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_edit_delete_all_cb): new callback</div><div class='del'>-	(menu_edit_delete_all_cb): set orig to 0 too</div><div class='del'>-	(menu_edit_delete_all_cb): be more careful about text color and</div><div class='del'>-	style</div><div class='del'>-</div><div class='del'>-2001-05-23  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_sig_file): set orig to 0</div><div class='del'>-</div><div class='del'>-2001-05-18  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Properly unserialize the</div><div class='del'>-	string returned by the "text" property of the bonobo control,</div><div class='del'>-	convert it into EDestinations, and use them to get the e-mail</div><div class='del'>-	addresses of our recipients.</div><div class='del'>-</div><div class='del'>-2001-05-17  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Draft messages should be marked</div><div class='del'>-	read.</div><div class='del'>-</div><div class='del'>-2001-05-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Added S/MIME sign/encrypt code.</div><div class='del'>-	(init): Initalize smime_sign/encrypt.</div><div class='del'>-	(e_msg_composer_get_smime_encrypt): new</div><div class='del'>-	(e_msg_composer_set_smime_encrypt): new</div><div class='del'>-	(e_msg_composer_get_smime_sign): new</div><div class='del'>-	(e_msg_composer_set_smime_sign): new</div><div class='del'>-	(menu_security_smime_sign_cb): new</div><div class='del'>-	(menu_security_smime_encrypt_cb): new</div><div class='del'>-	(setup_ui): Setup the UI for S/MIME stuff.</div><div class='del'>-</div><div class='del'>-2001-05-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If we are creating a message</div><div class='del'>-	with only a single part (ie no attachments and we will not be</div><div class='del'>-	signing/encrypting the part) then `part = CAMEL_MIME_PART(message)` </div><div class='del'>-	otherwise create a new MIME part and set it's content-object as the </div><div class='del'>-	message's content-object at a later date.</div><div class='del'>-</div><div class='del'>-2001-05-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_inlined_image): Don't wrap content-id with</div><div class='del'>-	brackets here as it is now done internally in camel.</div><div class='del'>-</div><div class='del'>-2001-05-03  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature_html): put signature in 100%</div><div class='del'>-	width table</div><div class='del'>-	(delete_old_signature): look only for first flow with signature == 1</div><div class='del'>-	(e_msg_composer_new): don't insert &lt;BR&gt;</div><div class='del'>-	(e_msg_composer_new_with_sig_file): ditto</div><div class='del'>-	(delete_old_signature): don't delete whole signature paragraph,</div><div class='del'>-	but just it's content</div><div class='del'>-	(delete_old_signature): if signature isn't found, insert new empty</div><div class='del'>-	paragraph to end of document for new signature</div><div class='del'>-	(e_msg_composer_set_sig_file): delete signature always</div><div class='del'>-	(e_msg_composer_set_sig_file): don't place signature to the end of</div><div class='del'>-	document, but place it where previous one was (if there wasn't</div><div class='del'>-	then new one is appended to the document)</div><div class='del'>-</div><div class='del'>-2001-05-02  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): do automagic indenting only when</div><div class='del'>-	in_signature_insert is FALSE</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_sig_file): do indent-zero</div><div class='del'>-	before signature inserting</div><div class='del'>-	(e_msg_composer_set_sig_file): use in_signature_insert flag</div><div class='del'>-</div><div class='del'>-2001-05-01  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): set signature to 0 in newly created</div><div class='del'>-	empty paragraphs</div><div class='del'>-	(clear_signature): new helper function</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS</div><div class='del'>-</div><div class='del'>-2001-04-25  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_send_html): block/unblock</div><div class='del'>-	redraw</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): reflect object data type change</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_sig_file_content): renamed from</div><div class='del'>-	get_signature</div><div class='del'>-	(get_signature_html): new helper function, uses</div><div class='del'>-	get_sig_file_content</div><div class='del'>-	(set_editor_text): removed signature parameters</div><div class='del'>-	(from_changed_cb): new signal handler, sets signature by identity</div><div class='del'>-	change</div><div class='del'>-	(delete_old_signature): new function, deletes old signature from</div><div class='del'>-	the document</div><div class='del'>-	(e_msg_composer_set_sig_file): new method, set's signature</div><div class='del'>-	filename</div><div class='del'>-	(e_msg_composer_mark_text_orig): removed (obsolete)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: added signal FROM_CHANGED</div><div class='del'>-</div><div class='del'>-2001-04-21  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Set window_icon to</div><div class='del'>-	"compose-message.png" for the composer window.</div><div class='del'>-</div><div class='del'>-	Did #include &lt;libgnomeui/gnome-window-icon.h&gt; so we could use</div><div class='del'>-	gnome_window_icon_set_from_file() here.</div><div class='del'>-</div><div class='del'>-2001-04-17  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (reply_indent): more auto-indentation magic</div><div class='del'>-</div><div class='del'>-2001-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use the mail-crypto pgp-mime</div><div class='del'>-	wrappers.</div><div class='del'>-	(build_message): s/CAMEL_PGP_HASH_TYPE_SHA1/CAMEL_CIPHER_HASH_SHA1</div><div class='del'>-</div><div class='del'>-2001-04-11  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (create_file_selection): Fix</div><div class='del'>-	previous.</div><div class='del'>-</div><div class='del'>-2001-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (create_file_selection): Set the</div><div class='del'>-	default filename to the user's homedir.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Fix headers.</div><div class='del'>-	* e-msg-composer-hdrs.c: Same here.</div><div class='del'>-	</div><div class='del'>-2001-03-29  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-msg-composer-attachment-bar.c: Replace #include &lt;gnome.h&gt;</div><div class='del'>-	* e-msg-composer-attachment-bar.h: Remove #include &lt;gnome.h&gt;</div><div class='del'>-	* e-msg-composer-attachment.c: Remove #include &lt;gnome.h&gt;</div><div class='del'>-	* e-msg-composer-attachment.h: Same here.</div><div class='del'>-	* e-msg-composer-hdrs.c: Replace #include &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* e-msg-composer-hdrs.h: Replace #include &lt;gnome.h&gt;</div><div class='del'>-	* e-msg-composer-file.c: #include &lt;gtk/gtkmain.h&gt;, &lt;gtk/gtksignal.h&gt;</div><div class='del'>-	* e-msg-composer.c: Replace #include &lt;bonobo.h&gt;, &lt;gnome.h&gt;</div><div class='del'>-	* e-msg-composer.h: Replace #include &lt;gnome.h&gt; and &lt;bonobo.h&gt;</div><div class='del'>-	* evolution-composer.c: Replace #include &lt;bonobo.h&gt;</div><div class='del'>-	* listener.c: Same here.</div><div class='del'>-	</div><div class='del'>-2001-03-28  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (save_draft): Use the drafts folder specified</div><div class='del'>-	by the account, if possible. Also, fix the setting of "send_html"</div><div class='del'>-	after saving the draft in case the user plans to keep editting...</div><div class='del'>-</div><div class='del'>-2001-03-27  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_send_html): set the</div><div class='del'>-	FormatHTML property on the editor to let it know the mode.</div><div class='del'>-	(e_msg_composer_construct): set the property at construct time.</div><div class='del'>-</div><div class='del'>-2001-03-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): Set</div><div class='del'>-	the mime part content-id.</div><div class='del'>-</div><div class='del'>-2001-03-19  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (reply_indent): set default text color</div><div class='del'>-</div><div class='del'>-2001-03-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to): Make</div><div class='del'>-	sure the reply_to text is non-NULL before trying to pass it off to</div><div class='del'>-	the address parser.</div><div class='del'>-</div><div class='del'>-2001-03-13  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (update_mime_type): Use</div><div class='del'>-	gnome_vfs_mime_type_from_name rather than gnome_vfs_mime_info,</div><div class='del'>-	since the entered filename doesn't have to be a real file on disk.</div><div class='del'>-	Deal with it returning NULL too.	</div><div class='del'>-	(e_msg_composer_attachment_edit): Select the right item in the</div><div class='del'>-	inline/attachment menu.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: s/Pair/EMsgComposerHdrPair/. Namespace!</div><div class='del'>-</div><div class='del'>-2001-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: Added view_replyto member.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_visible_flags): Find out if</div><div class='del'>-	we want to view the Reply-To header.</div><div class='del'>-	(e_msg_composer_set_view_replyto): A new function to set the state</div><div class='del'>-	of the replyto header.</div><div class='del'>-	(menu_view_replyto_cb): Callback for setting the ReplyTo state.</div><div class='del'>-	(set_config): Make static.</div><div class='del'>-	(setup_ui): Setup the ReplyTo bonobo stuff.</div><div class='del'>-	(load_from_property_bag): More defaults for the ReplyTo, yay.</div><div class='del'>-	(load_from_gnome_config): Again...</div><div class='del'>-	(e_msg_composer_get_view_bcc): Implemented.</div><div class='del'>-	(e_msg_composer_get_view_cc): Implemented.</div><div class='del'>-	(e_msg_composer_get_view_from): Implemented.</div><div class='del'>-	(e_msg_composer_get_view_replyto): Implemented.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_reply_to_entry):</div><div class='del'>-	New function, yay.</div><div class='del'>-	(e_msg_composer_hdrs_get_reply_to): Another new function.</div><div class='del'>-	(e_msg_composer_hdrs_set_reply_to): Yet another new function...</div><div class='del'>-	(create_headers): Create the reply-to header.</div><div class='del'>-	(attach_headers): Attach the reply_to.</div><div class='del'>-	(headers_set_visibility): Set the reply_to visibility.</div><div class='del'>-	(e_msg_composer_hdrs_to_message): Set the message's reply-to here</div><div class='del'>-	based on the user-set reply-to header.</div><div class='del'>-</div><div class='del'>-2001-03-06  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_config): New function.  Used to store</div><div class='del'>-	integer values into the configuration engine.  Handles the case of</div><div class='del'>-	Bonobo-conf being installed, or falls back to gnome_config.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): Renamed to be</div><div class='del'>-	header_new_recipient().  Now we take care of the other cases in</div><div class='del'>-	create_headers, which is a lot nicer now.</div><div class='del'>-	</div><div class='del'>-	(create_optionmenu): Removed extra "name" argument which was not</div><div class='del'>-	being used anyways (the only arg passed was From:).</div><div class='del'>-	(init): Removed all the redundant NULL initialization by using</div><div class='del'>-	nice g_new0</div><div class='del'>-	</div><div class='del'>-	(create_headers): New function, much cleaner. </div><div class='del'>-</div><div class='del'>-	Use of Pair structure everywhere instead of individual widgets to</div><div class='del'>-	keep track of which ones are visible and which ones are not.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (setup_ui): Handle ViewFrom and ViewBCC</div><div class='del'>-	commands. </div><div class='del'>-	(menu_view_bcc_cb, menu_view_from_cb): New functions that</div><div class='del'>-	implement the features described.</div><div class='del'>-</div><div class='del'>-	(menu_format_html_cb): Removed unrequired test, as</div><div class='del'>-	e_msg_composer_set_send_html already optimizes the case of the</div><div class='del'>-	state being the same.</div><div class='del'>-	(menu_security_pgp_encrypt_cb): Remove redundant code.</div><div class='del'>-	(menu_security_pgp_sign_cb): ditto.</div><div class='del'>-</div><div class='del'>-2001-03-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c (icon_new_from_pixbuf): Added a comment reminding</div><div class='del'>-	us that we should probably not force a particular font in the icon</div><div class='del'>-	caption.</div><div class='del'>-</div><div class='del'>-2001-02-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (factory_fn): If</div><div class='del'>-	!mail_config_is_configured(), give an error and return NULL.</div><div class='del'>-</div><div class='del'>-2001-02-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add `-I$(top_srcdir)/shell'.</div><div class='del'>-</div><div class='del'>-2001-02-21  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_save_draft_cb):</div><div class='del'>-	(exit_dialog_cb):  Use mail_append_mail to save to drafts instead</div><div class='del'>-	of custom thread handler.</div><div class='del'>-</div><div class='del'>-2001-02-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Handle exceptions a little</div><div class='del'>-	nicer and pop up a nice GnomeDialog with the error message - also,</div><div class='del'>-	don't return a CamelMimeMessage if it fails to sign/decrypt</div><div class='del'>-	because we want to let the user decide what to do based on the</div><div class='del'>-	error message he/she gets.</div><div class='del'>-</div><div class='del'>-2001-02-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_set_from_account): If</div><div class='del'>-	@account_name is NULL, pick the default account rather than giving</div><div class='del'>-	a g_warning.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_headers): Note in the</div><div class='del'>-	doc comment that @from can be NULL if you want the default account</div><div class='del'>-	(since there is code that expects this).</div><div class='del'>-</div><div class='del'>-2001-02-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (corba_recipientlist_to_glist): Use the</div><div class='del'>-	camel-internet-address code to format the address rather than</div><div class='del'>-	doing it the broken way.</div><div class='del'>-</div><div class='del'>-2001-02-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (impl_Composer_set_headers): Updated. We</div><div class='del'>-	might want to change the corba interface for this to allow setting</div><div class='del'>-	the from-address as well.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Updated.</div><div class='del'>-	(e_msg_composer_set_headers): Now takes a 'From' argument so that</div><div class='del'>-	we can try to pre-determine the account the user will want to send</div><div class='del'>-	from.</div><div class='del'>-</div><div class='del'>-2001-02-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade.h: removed.</div><div class='del'>-	* e-msg-composer-attachment.glade: do not write strings to above.</div><div class='del'>-	* Makefile.am: don't include glade.h in EXTRA_DIST.</div><div class='del'>-	</div><div class='del'>-2001-02-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart):</div><div class='del'>-	multipart/* is another mime type we DO NOT want to encode ;-)</div><div class='del'>-</div><div class='del'>-2001-02-06  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (address_button_clicked_cb, add_header):</div><div class='del'>-	Set the default argument to</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_activateDialog correctly.</div><div class='del'>-</div><div class='del'>-2001-01-30  Larry Ewing  &lt;lewing@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_optionmenu): make sure we convert</div><div class='del'>-	from utf-8 before creating the option menu items.</div><div class='del'>-</div><div class='del'>-2001-01-25  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-        (Moving the flag for has_changed from the Hdrs to the Composer</div><div class='del'>-	 itself. Providing public methods to set/unset a composer as</div><div class='del'>-	 changed. Adding attachments now flags the composer as changed)</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_unset_changed): New function.</div><div class='del'>-	(e_msg_composer_set_changed): New function.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (hdrs_changed_cb): Callback to the new signal,</div><div class='del'>-	uses the new composer_set_changed.</div><div class='del'>-	(attachment_bar_changed_cb): Add a call to the new</div><div class='del'>-	composer_set_changed.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer-hdrs.c (class_init): New signal "hdrs_changed" to</div><div class='del'>-	tell the parent composer that any of the headers have changed.</div><div class='del'>-	(addressbook_entry_changed): emit the new signal here.</div><div class='del'>-	(entry_changed): And here.</div><div class='del'>-</div><div class='del'>-2001-01-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_security_pgp_encrypt_cb): New callback.</div><div class='del'>-	(menu_security_pgp_sign_cb): Another new callback.</div><div class='del'>-	(setup_ui): Added initialization for the PGP sign and encrypt</div><div class='del'>-	bonobo menu items.</div><div class='del'>-	(e_msg_composer_set_pgp_encrypt): Change the Bonobo UI name to</div><div class='del'>-	SecurityPGPEncrypt.</div><div class='del'>-	(e_msg_composer_set_pgp_sign): Change the Bonobo UI name to</div><div class='del'>-	SecurityPGPSign.</div><div class='del'>-</div><div class='del'>-2001-01-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Fixed some memory leaks</div><div class='del'>-	dealing with content-type temp strings. Also implemented code to</div><div class='del'>-	sign and/or encrypt the message if the user has specified that it</div><div class='del'>-	should.</div><div class='del'>-</div><div class='del'>-2001-01-20  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	(Fix #1222: doing File-&gt;New-&gt;Mail Message doesn't include .sig)</div><div class='del'>-	</div><div class='del'>-	* evolution-composer.c (init): Get the users account information,</div><div class='del'>-	see if they've specified a sig file, if they do, create a composer</div><div class='del'>-	with that sig.</div><div class='del'>-</div><div class='del'>-2001-01-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_optionmenu): Use "Full Name</div><div class='del'>-	&lt;address&gt;" for the label in the menu rather than the account</div><div class='del'>-	name. Specify the account name only if it's not the same as the</div><div class='del'>-	address.</div><div class='del'>-</div><div class='del'>-2001-01-19  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_addressbook_entry): Listen for</div><div class='del'>-	property bag changes to "entry_changed" on here, which means on</div><div class='del'>-	the To, Cc, and Bcc entries.</div><div class='del'>-	(addressbook_entry_changed): New function that gets called when</div><div class='del'>-	"entry_changed" property is changed (to TRUE).</div><div class='del'>-</div><div class='del'>-2001-01-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Updated to reflect changes to</div><div class='del'>-	e_msg_composer_hdrs_get_from().</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Don't do anymore utf8</div><div class='del'>-	conversions, the widget already does this (or should unless there</div><div class='del'>-	is brokenness).</div><div class='del'>-	(e_msg_composer_hdrs_get_from): Return a CamelInternetAddress like</div><div class='del'>-	we should.</div><div class='del'>-	(e_msg_composer_hdrs_to_message): Update to reflect changes made</div><div class='del'>-	the the above function.</div><div class='del'>-</div><div class='del'>-2001-01-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Make the composer a standard library, not a libtool</div><div class='del'>-	one.  Nobody ever uses it as a shared library and it is not</div><div class='del'>-	installed. </div><div class='del'>-</div><div class='del'>-2001-01-17  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	(Bug #1192: Set the Composer window title to something useful)</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Connect up the new</div><div class='del'>-	signal here.</div><div class='del'>-	(subject_changed_cb): Set the composer window title to the subject</div><div class='del'>-	as it's changed, or if it goes blank make it the default "Compose</div><div class='del'>-	a message".</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (class_init): Create a new signal</div><div class='del'>-	"subject_changed".</div><div class='del'>-	(entry_changed): Emit the signal here when the subject entry is</div><div class='del'>-	changed.</div><div class='del'>-	</div><div class='del'>-2001-01-17  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):</div><div class='del'>-	Get the option menu from the XML file.</div><div class='del'>-	(ok_cb): Set the attachment disposition depending on the option</div><div class='del'>-	menu results.</div><div class='del'>-	(option_menu_get_history): Really should have been in GTK at some</div><div class='del'>-	point.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: Add the option menu.</div><div class='del'>-</div><div class='del'>-2001-01-17  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (enum_objects): comment out for now</div><div class='del'>-	to ease compat issues.</div><div class='del'>-	(evolution_composer_construct): pass in NULL for the item</div><div class='del'>-	handler enum_objects fn + calm warning.</div><div class='del'>-</div><div class='del'>-2001-01-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Use the </div><div class='del'>-	to/cc/bcc addresses insted of just the to.</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.[ch]: Ximianified email addresses.</div><div class='del'>-</div><div class='del'>-2001-01-16  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_mark_text_orig): publicate</div><div class='del'>-	mark_orig_text</div><div class='del'>-	(set_editor_text): don't call mark_orig_text, let it for reply</div><div class='del'>-</div><div class='del'>-2001-01-15  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	(Plug leaking the subject string on each message sent)</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_subject): Don't</div><div class='del'>-	strdup before returning the subject, it's already been strdup'd</div><div class='del'>-	from the gtk_object_get().</div><div class='del'>-</div><div class='del'>-2001-01-13  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	(Fix Bug #1083: Composer IDLs not getting installed)</div><div class='del'>-	</div><div class='del'>-	* Makefile.am: add @idl and @idl_DATA vars.</div><div class='del'>-</div><div class='del'>-2001-01-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_optionmenu): Oops. Make sure to</div><div class='del'>-	attach the item to the menu ;-)</div><div class='del'>-</div><div class='del'>-2001-01-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Call set_from_account which</div><div class='del'>-	means we no longer have to do all the crap involved in formatting</div><div class='del'>-	strings into an internet-address.</div><div class='del'>-	(e_msg_composer_get_preferred_account): New access function.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): case COMBOBOX has changed to</div><div class='del'>-	OPTIOMENU.</div><div class='del'>-	(create_optionmenu): Update to use an optionmenu of accounts.</div><div class='del'>-	(from_changed): New callback for the From optionmenu.</div><div class='del'>-	(setup_headers): s/COMBOBOX/OPTIONMENU</div><div class='del'>-	(init): Set the account and from_options to NULL.</div><div class='del'>-	(e_msg_composer_hdrs_get_from): Updated.</div><div class='del'>-	(destroy): free the from_options.</div><div class='del'>-	(e_msg_composer_hdrs_set_from_address): Renamed from set_from</div><div class='del'>-	because it no longer takes a string arg but rather an account arg.</div><div class='del'>-</div><div class='del'>-2001-01-12  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): Only attach to "changed" if</div><div class='del'>-	the widget is an EEntry.  The HEADER_COMBOBOX and the</div><div class='del'>-	HEADER_ADDRBOOK are a ComboBox and a remote Bonobo control</div><div class='del'>-	respectively. </div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (get_object): Move getObject functionality</div><div class='del'>-	here from e-msg-composer.c</div><div class='del'>-</div><div class='del'>-2001-01-11  Miguel de Icaza  &lt;miguel@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Only set the</div><div class='del'>-	popdown strings if we have anything to popdown.</div><div class='del'>-</div><div class='del'>-2001-01-10  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (evolution_composer_construct): Add an</div><div class='del'>-	ItemContainer Bonobo interface to allow client applications to</div><div class='del'>-	locate the Message Composer component.</div><div class='del'>-</div><div class='del'>-2001-01-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_save_draft_cb): New callback to save</div><div class='del'>-	draft. Fixes bug #1045.</div><div class='del'>-</div><div class='del'>-2001-01-10  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Removed more UNSAFE stuff.  Maybe we should</div><div class='del'>-	kill this macro, and have people that want these broken things</div><div class='del'>-	define their own macros.</div><div class='del'>-	(setup_item_container): Add an ItemContainer bonobo interface to</div><div class='del'>-	handle options to the window component.</div><div class='del'>-</div><div class='del'>-2001-01-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated for new</div><div class='del'>-	config code - this time it works!</div><div class='del'>-</div><div class='del'>-2001-01-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Reverted back to</div><div class='del'>-	old config code temporarily until I get the new config code</div><div class='del'>-	working 100%.</div><div class='del'>-</div><div class='del'>-2001-01-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Updated to</div><div class='del'>-	reflect changes to the mail-config API.</div><div class='del'>-</div><div class='del'>-2001-01-05  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): disable indenting for now, it crashes</div><div class='del'>-	editor</div><div class='del'>-</div><div class='del'>-2001-01-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): If the headers have changed, then</div><div class='del'>-	continue with the prompt else just destroy the window.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (init): Initialize has_changed to FALSE.</div><div class='del'>-	(entry_changed): New callback to set the value of has_changed.</div><div class='del'>-	(add_header): Attach the "changed" signal.</div><div class='del'>-</div><div class='del'>-2001-01-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): </div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Use</div><div class='del'>-	header_content_type_simple, not header_content_type_format.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Call</div><div class='del'>-	e_utf8_to_gtk_string on the combobox strings.</div><div class='del'>-</div><div class='del'>-2000-12-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (handle_multipart_alternative,</div><div class='del'>-	handle_multipart, e_msg_composer_new_with_message): Use</div><div class='del'>-	CamelContentType instead of GMimeContentField.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit): </div><div class='del'>-	* e-msg-composer-attachment-bar.c (update, attach_to_multipart):</div><div class='del'>-	Use CamelContentType, and use the header_content_type_* functions</div><div class='del'>-	rather than operating on the structure by hand.</div><div class='del'>-</div><div class='del'>-2000-12-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_pgp_encrypt): New function</div><div class='del'>-	to get whether or not to encrypt the message.</div><div class='del'>-	(e_msg_composer_set_pgp_encrypt): New function to set encryption.</div><div class='del'>-	(e_msg_composer_get_pgp_sign): New function to get whether or not</div><div class='del'>-	to sign the message.</div><div class='del'>-	(e_msg_composer_set_pgp_sign): New function to set pgp_sign.</div><div class='del'>-	(init): Initialize pgp_sign and pgp_encrypt to FALSE.</div><div class='del'>-</div><div class='del'>-2000-12-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): Made it so that carriage</div><div class='del'>-	return doesn't insert a newline in the subject entry.</div><div class='del'>-</div><div class='del'>-2000-12-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_entry): Don't convert the utf-8</div><div class='del'>-	string to a gtkstring because the widget expects to get a utf-8</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-2000-12-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Add $(IDLS). (From campd.)</div><div class='del'>-</div><div class='del'>-2000-12-07  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (prepare_engine): added warnings</div><div class='del'>-	(prepare_engine): updated to IDL:GNOME/GtkHTML/Editor/Engine:1.0</div><div class='del'>-</div><div class='del'>-	* Makefile.am: renamed HTMLEditor* to Editor*, added Editor-common.c:</div><div class='del'>-	$(HTML_EDITOR_GENERATED) rule</div><div class='del'>-</div><div class='del'>-2000-12-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_recipients): Use camel to construct the</div><div class='del'>-	list of recipients rather than just strchr(recips, ',') which is</div><div class='del'>-	very prone to errors.</div><div class='del'>-</div><div class='del'>-2000-11-03  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Pass NULL</div><div class='del'>-	instead of icon_name to the e_icon_list_append_pixbuf</div><div class='del'>-	function.</div><div class='del'>-	(init) Take the font size into account when setting the</div><div class='del'>-	height of the bar.</div><div class='del'>-</div><div class='del'>-2000-11-02  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Use the </div><div class='del'>-	pixbuf_for_mime_type function to get the icon.</div><div class='del'>-	(pixbuf_for_mime_type): Functino that searches nautilus/</div><div class='del'>-	and mc/ for icon files.</div><div class='del'>-</div><div class='del'>-2000-11-15  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (prepare_engine): update namespace</div><div class='del'>-</div><div class='del'>-	* updates for HTMLEditor API changes</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: added #include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: e_msg_composer_guess_mime_type renamed and</div><div class='del'>-	moved mime_guess_type_from_file_name from camel as it uses VFS</div><div class='del'>-</div><div class='del'>-2000-11-14  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (reply_indent): rename command to runCommand</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: updated to HTMLEditor API changes</div><div class='del'>-</div><div class='del'>-	* listener.c: updated to HTMLEditor API changes</div><div class='del'>-</div><div class='del'>-2000-11-13  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (reply_indent): extracted function, does reply</div><div class='del'>-	indentation, use updated editor engine api</div><div class='del'>-</div><div class='del'>-2000-11-10  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am ($(HTML_EDITOR_GENERATED)): rearrnace</div><div class='del'>-	includes.</div><div class='del'>-</div><div class='del'>-2000-11-10  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): set the HTML charset to utf-8</div><div class='del'>-	for all the html message parts.</div><div class='del'>-	(build_message): make sure we set the proper encoding on the html</div><div class='del'>-	part now that it may contain utf-8 characters</div><div class='del'>-</div><div class='del'>-2000-11-08  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_clear_inlined_table): new</div><div class='del'>-	function</div><div class='del'>-	(destroy): use e_msg_composer_clear_inlined_table, destroy</div><div class='del'>-	inlined_images hash table</div><div class='del'>-	(get_signature): added in_html arg, it tells if we should use HTML</div><div class='del'>-	signature</div><div class='del'>-	(set_editor_text): try to use HTML signature</div><div class='del'>-	(e_msg_composer_new_with_sig_file): added send_html arg to be able</div><div class='del'>-	to use HTML signature</div><div class='del'>-</div><div class='del'>-	* listener.c (resolve_image_url): don't add inlined images to</div><div class='del'>-	attachement bar</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (add_inlined_images): new function, adds</div><div class='del'>-	inlined images to multipart</div><div class='del'>-	(add_inlined_image): helper function, adds one image to multipart</div><div class='del'>-	(build_message): store HTML messages with inlined images to</div><div class='del'>-	multipart/related</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_file): removed</div><div class='del'>-	content_id arg</div><div class='del'>-	(e_msg_composer_attachment_bar_attach): likewise</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	removed content_id arg</div><div class='del'>-</div><div class='del'>-2000-11-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Changed</div><div class='del'>-	for message api changes.  Use camel_address_unformat to convert</div><div class='del'>-	the editable-&gt;usable.</div><div class='del'>-	(set_recipients): Same.  Now we set the recipients as</div><div class='del'>-	camel_internet_address's.  Fixed a memleak indirectly.</div><div class='del'>-	(decode_addresses): Removed, no longer needed.</div><div class='del'>-	(create_dropdown_entry): We dont want to use _encode(), we want to</div><div class='del'>-	_format, as we are displaying the result.  We can use the static</div><div class='del'>-	function too to avoid the object creation, and the memory leak!</div><div class='del'>-	(set_entry): Convert the args to gtk-safe characters, since the</div><div class='del'>-	entry doesn't understand utf8.</div><div class='del'>-	(set_recipients): And likewise do the reverse when retrieving the</div><div class='del'>-	contents of the widget.</div><div class='del'>-</div><div class='del'>-2000-11-06  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-        * e-msg-composer.c (build_message): set the content type on the</div><div class='del'>-        plain part of outgoing messages.</div><div class='del'>-        (best_content): a helper function to get the best content type for</div><div class='del'>-        the attachment.  This should probably use the helper functions in</div><div class='del'>-        the future.</div><div class='del'>-</div><div class='del'>-2000-11-06  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Added #include &lt;config.h&gt;</div><div class='del'>-	* e-msg-composer-hdrs.c: s/_HAVE_CONFIG_H/HAVE_CONFIG_H for</div><div class='del'>-	working i18n.</div><div class='del'>-	</div><div class='del'>-2000-11-04  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): fix</div><div class='del'>-	test for regular file to !S_ISREG (statbuf.st_mode)</div><div class='del'>-</div><div class='del'>-	* listener.c (resolve_image_url): use inline images hash table</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (init): create inlined images hash table</div><div class='del'>-	(destroy): destroy it</div><div class='del'>-	(clear_inline_images): helper function, used from</div><div class='del'>-	g_hash_table_foreach_remove to destroy one inline image record</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: added hash table with inlined images url -&gt;</div><div class='del'>-	cid info</div><div class='del'>-</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): updated for API changed</div><div class='del'>-	implemented image_url event</div><div class='del'>-	(resolve_image_url): new helper function, attaches image to mail</div><div class='del'>-	and returns new (resolved) url pointing to mime component</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	added conponent_id parameter</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_attach): added parameter content_id</div><div class='del'>-	(add_from_file): likewise</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	Don't allow attaching anything but regular files.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Clean the idl-generated files properly.</div><div class='del'>-</div><div class='del'>-2000-11-02  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): CamelStreamMem</div><div class='del'>-	steals our byte array; we can't destroy the byte array explicitly, and</div><div class='del'>-	we must unref the stream only when done using the array.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Don't create</div><div class='del'>-	the To, Cc, and Bcc lists based only on the address, use both the</div><div class='del'>-	name and address and camel_address_encode() them.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the</div><div class='del'>-	CTE kludge, calculate the best mime transfer encoding for the mime</div><div class='del'>-	part and use that. Include e-msg-composer-select-file.h</div><div class='del'>-</div><div class='del'>-2000-10-31  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (prepare_engine): new function, tries prepare</div><div class='del'>-	editor engine</div><div class='del'>-	(mark_orig_text): marks original text in editor</div><div class='del'>-	(set_editor_text): call mark_orig_text</div><div class='del'>-	(create_composer): call prepare_engine</div><div class='del'>-</div><div class='del'>-	* Makefile.am (IDL_GENERATED): added HTMLEditor generated files to</div><div class='del'>-	IDL_GENERATED</div><div class='del'>-	($(IDL_GENERATED)): generate also files from HTMLEditor.idl</div><div class='del'>-	(libcomposer_la_SOURCES): added listener.[ch]</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: added editor_engine and editor_listener to</div><div class='del'>-	EMsgComposer</div><div class='del'>-</div><div class='del'>-	* listener.[ch]: new files, implementation of HTMLEditor::Listener</div><div class='del'>-</div><div class='del'>-2000-10-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from</div><div class='del'>-	`$(srcdir)' so that it builds with builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my</div><div class='del'>-	not-quite-right logic so that we don't accidently set the body</div><div class='del'>-	contents using a plain text attachment instead of the actual body</div><div class='del'>-	of the message :-)</div><div class='del'>-</div><div class='del'>-2000-10-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the</div><div class='del'>-	composer with any attachments.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (create_file_selection): Set the</div><div class='del'>-	wmclass and wmclass_name for the file selectors so that Sawfish</div><div class='del'>-	doesn't make the dialogs the same size as the parent.</div><div class='del'>-</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (init): Attach send/postpone signal</div><div class='del'>-	handlers to the EMsgComposer.</div><div class='del'>-	(evolution_composer_factory_init): Take send/postpone signal</div><div class='del'>-	handlers as arguments.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: add some</div><div class='del'>-	missing _()s.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.*, e-msg-composer-address-entry.*:</div><div class='del'>-	Old cruft. Remove.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Update for removed files.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Remove e-msg-composer-address-entry.h</div><div class='del'>-	include.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove e-msg-composer-address-dialog.h include</div><div class='del'>-	</div><div class='del'>-2000-10-23  Ariel Rios   &lt;ariel@arcavia.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Include Composer.h</div><div class='del'>-	instead of volution-Addressbook-SelectNames.h</div><div class='del'>-</div><div class='del'>-2000-10-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: No, don't ignore Evolution-Addressbook-SelectNames*.</div><div class='del'>-	They're not supposed to be there any more. </div><div class='del'>-</div><div class='del'>-2000-10-22  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_cb): Removed.</div><div class='del'>-	(add_from_user): Use `e_msg_composer_select_file()' instead of</div><div class='del'>-	doing the file selector widget magic by yourself.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Ignore Evolution-Addressbook-SelectNames*</div><div class='del'>-</div><div class='del'>-2000-10-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl: Evolution::Composer interface</div><div class='del'>-</div><div class='del'>-	* evolution-composer.[ch]: Implementation and factory. So</div><div class='del'>-	entirely not tested.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcomposer_la_SOURCES): Add</div><div class='del'>-	evolution-composer.[ch]</div><div class='del'>-	(IDLS): Update this for Evolution-Composer.idl / Composer.idl</div><div class='del'>-</div><div class='del'>-	* main.c: Removed. (Old, dead code)</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.</div><div class='del'>-	(glade_messages): New.</div><div class='del'>-	(EXTRA_DIST): Add `$(glade_messages)'.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar_file, create_menubar_edit),</div><div class='del'>-	(create_menubar_format, create_menubar_view, create_menubar): kill.</div><div class='del'>-	(create_toolbar): die.</div><div class='del'>-	(setup_ui): impl.</div><div class='del'>-	(e_msg_composer_construct): hook in.</div><div class='del'>-	(menu_format_html_cb): update.</div><div class='del'>-	(menu_view_attachments_activate_cb): ditto.</div><div class='del'>-	(destroy): upd.</div><div class='del'>-	(e_msg_composer_construct): upd.</div><div class='del'>-	(e_msg_composer_set_send_html): upd.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (init): Don't need the ID anymore.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): If the body</div><div class='del'>-	text was NULL, then don't bother turning it into HTML (besides, it</div><div class='del'>-	causes a nasty segfault).</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing</div><div class='del'>-	any CPPFLAGS set at configure time.</div><div class='del'>-</div><div class='del'>-2000-10-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (set_entry): If the entry widget is</div><div class='del'>-	NULL, obviously we can't set any text on it.</div><div class='del'>-</div><div class='del'>-2000-10-14  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (init): Create a unique-ish id for this set</div><div class='del'>-	of headers, so that only one select-names dialog will be created for</div><div class='del'>-	a given set of headers.</div><div class='del'>-	(address_button_clicked_cb): Pass the unique-ish id to the activate</div><div class='del'>-	dialog command.</div><div class='del'>-</div><div class='del'>-2000-10-13  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): stop using format_text,</div><div class='del'>-	gtkhtml handles this now.</div><div class='del'>-	(format_text): function removed.</div><div class='del'>-</div><div class='del'>-2000-10-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: Allow NULL pixbufs, and load the "broken" image</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): If the image isn't </div><div class='del'>-	found load the default text/plain icon.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If the body of the message has</div><div class='del'>-	8-bit chars, set the Content-Transfer-Encoding type to the best</div><div class='del'>-	encoding.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: fix #include of gnome-canvas-pixbuf.h</div><div class='del'>-</div><div class='del'>-2000-10-02  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c: If the description of an attachment</div><div class='del'>-	is a blank string, revert to displaying the filename.</div><div class='del'>-</div><div class='del'>-2000-10-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: If you try to add an icon from a file that doesn't</div><div class='del'>-	exist put a "Broken icon" image.</div><div class='del'>-</div><div class='del'>-	* bad-icon.xpm: Broken icon image.</div><div class='del'>-</div><div class='del'>-2000-10-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.[ch] (update): If the attachment is</div><div class='del'>-	an image, then make a thumbnail for it.</div><div class='del'>-	Base the attachment bar on e-icon-list instead of gnome-icon-list.</div><div class='del'>-</div><div class='del'>-	* e-icon-list.[ch]: New files. These are modified versions of </div><div class='del'>-	gnome-icon-list from gnome-libs HEAD that uses gdk-pixbuf instead</div><div class='del'>-	of the evil Imlib.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.[ch]: Add a pixbuf_cache member, to</div><div class='del'>-	save us having to generate a thumbnail for the attachment every</div><div class='del'>-	time the bar changes.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Add dnd support for</div><div class='del'>-	files. Drag a file to the composer to add it as an attachment.</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Check to see if the body has</div><div class='del'>-	8bit chars, if so - set the Content-Transfer-Encoding to 8bit.</div><div class='del'>-	Addresses Bugzilla bug #652.</div><div class='del'>-</div><div class='del'>-2000-09-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (setup_headers): fix typo in tooltip.</div><div class='del'>-	* e-msg-composer.c (create_menubar_file): fix accelerator for</div><div class='del'>-	"Save as" to be different from "Save". (Both problems pointed out</div><div class='del'>-	by menthos@menthos.com.)</div><div class='del'>-</div><div class='del'>-2000-09-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): Updated to handle FIFO</div><div class='del'>-	streams.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Don't g_error out</div><div class='del'>-	if the html-editor-control fails.</div><div class='del'>-	(create_composer): New internal function to create and construct a</div><div class='del'>-	msg_composer and pop up an error message if it fails.</div><div class='del'>-	(e_msg_composer_new, e_msg_composer_new_with_sig_file,</div><div class='del'>-	e_msg_composer_new_with_message, e_msg_composer_new_from_url): Use</div><div class='del'>-	create_composer, return if it fails, change return type to</div><div class='del'>-	EMsgComposer *.</div><div class='del'>-</div><div class='del'>-2000-09-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (get_mime_type): Use</div><div class='del'>-	gnome_vfs_get_file_info.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Use gnome_vfs_mime</div><div class='del'>-	functions, not old gnome_mime.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,</div><div class='del'>-	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,</div><div class='del'>-	e-msg-composer.c: Fixed the #include lines to deal properly with</div><div class='del'>-	gal.</div><div class='del'>-</div><div class='del'>-2000-09-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Update for new UI handler.</div><div class='del'>-</div><div class='del'>-2000-09-12  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_common): add a make sure</div><div class='del'>-	the attachment isn't NULL.  A more complete fix coming soon.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am ($(IDL_GENERATED)): Add space after `-I'.</div><div class='del'>-</div><div class='del'>-2000-09-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar_format): Accelerate the</div><div class='del'>-	`Format' menu with an `o' instead of an `f' [the `f' is already</div><div class='del'>-	taken by the "File" menu].</div><div class='del'>-</div><div class='del'>-2000-09-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): Applied</div><div class='del'>-	Jesse's patch that sets the composer's sig_file</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_sig_file): This needs to</div><div class='del'>-	return a const char * and not a char *, because we're not actually</div><div class='del'>-	allocating memory here.</div><div class='del'>-	(create_menubar_file): Changed "Send" to "Send Now" and added</div><div class='del'>-	"Send Later"</div><div class='del'>-	(menu_file_send_later_cb): New callback that emits the POSTPONE</div><div class='del'>-	signal (equivalent to "Send Later"</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Always</div><div class='del'>-	request to import the HTML version if at all possible so that we</div><div class='del'>-	maintain formatting and other nifty stuff :-)</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the</div><div class='del'>-	"From" address in the CamelMimeMessage. Also updated to use</div><div class='del'>-	get_subject to both make our lives easier and prepare for using UTF8</div><div class='del'>-	(e_msg_composer_hdrs_get_subject): Updated to behave similarly to</div><div class='del'>-	get_from and return allocated memory (it will have to return</div><div class='del'>-	allocated memory once it's converted to use UTF8 anyways)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_save_draft): Always set</div><div class='del'>-	composer-&gt;send_html = TRUE so that formatting is preserved.</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-entry.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Use e_utf8 wrappers</div><div class='del'>-	</div><div class='del'>-2000-08-24  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add builddir/shell so we can</div><div class='del'>-	get Evolution.h</div><div class='del'>-</div><div class='del'>-2000-08-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_text): get_text not get_txt.</div><div class='del'>-</div><div class='del'>-2000-08-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Use</div><div class='del'>-	new config accessors</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove unneeded e-setup.h include</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (exit_dialog_cb): Made async</div><div class='del'>-</div><div class='del'>-2000-08-10  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): Temporarily disable draft saving</div><div class='del'>-	while we figure out how to work around Zucchi's new append_message.</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from): Return the</div><div class='del'>-	text in GtkCombo-&gt;entry</div><div class='del'>-</div><div class='del'>-2000-08-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList</div><div class='del'>-	identity stuff, should now display all configured identities.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Switched the composer to use an EEntry</div><div class='del'>-	for the subject field.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed the non scaling objects in this vbox</div><div class='del'>-	to be FALSE, FALSE instead of FALSE, TRUE.</div><div class='del'>-</div><div class='del'>-2000-08-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): Modified to allow dropdown</div><div class='del'>-	entry-boxes as well (for headers like From:)</div><div class='del'>-	(setup_headers): Modified to use the correct enum type.</div><div class='del'>-	(create_dropdown_entry): New convenience function to add a</div><div class='del'>-	drop-down combo box and fill it in with identities</div><div class='del'>-	(init): Set from_entry to NULL</div><div class='del'>-	(e_msg_composer_hdrs_get_from): New convenience function to get</div><div class='del'>-	the text in the From widget in the composer</div><div class='del'>-	(e_msg_composer_hdrs_set_from): New convenience function to set</div><div class='del'>-	the From header in the composer</div><div class='del'>-</div><div class='del'>-2000-08-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Fix build by allowing includes for e-table dir</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart):</div><div class='del'>-	s/strcasecmp/g_strcasecmp</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: s/strncasecmp/g_strncasecmp - this will help</div><div class='del'>-	later with building on different platforms :-)</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Added code</div><div class='del'>-	to set the body text based on the CamelMimeMessage.</div><div class='del'>-	(set_editor_text): Use lowercase html tags...</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): Prompt the user to save their</div><div class='del'>-	composition in Drafts.</div><div class='del'>-	(set_editor_text): Uhm, use "-- \n" not "--\n" because the space</div><div class='del'>-	is called for in the standard</div><div class='del'>-	(e_msg_composer_new_with_message): New convenience function that</div><div class='del'>-	takes a CamelMimeMessage as an argument. This will be useful when</div><div class='del'>-	we code the ability to resume the editing of a message draft (like</div><div class='del'>-	in the Drafts folder).</div><div class='del'>-</div><div class='del'>-2000-08-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: Constify param</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): Constify param</div><div class='del'>-	(set_editor_text): ditto</div><div class='del'>-	(e_msg_composer_new_with_sig_file): ditto</div><div class='del'>-</div><div class='del'>-2000-08-01  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_text): sizeof("--\") !=</div><div class='del'>-	strlen("--\n"), breaking the test for the signature prefix.</div><div class='del'>-</div><div class='del'>-2000-07-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New</div><div class='del'>-	function to create composer with sig file set.</div><div class='del'>-	(e_msg_composer_get_sig_file): New function to get sig file</div><div class='del'>-	(e_msg_composer_set_sig_file): New function to set sig file</div><div class='del'>-</div><div class='del'>-2000-07-25  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_text): add textual exception printout.</div><div class='del'>-	(set_editor_text): close pre tags &amp; check for pre-existing</div><div class='del'>-	sig separator.</div><div class='del'>-</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_insert_file_cb): Mark this function</div><div class='del'>-	as FIXME because we're waiting for the HTML Editor Control to</div><div class='del'>-	support paste commands. Also some updates for when that happens.</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove GOAD support.</div><div class='del'>-	(create_editor): Try to give a more helpful error message when</div><div class='del'>-	failing to load the editor control.</div><div class='del'>-</div><div class='del'>-2000-07-23  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_format_html_cb): New callback for the</div><div class='del'>-	"Send HTML" menu toggle item.</div><div class='del'>-	(create_menubar_format): New.</div><div class='del'>-	(create_menubar): Call it.</div><div class='del'>-	(create_menubar_options): Removed.</div><div class='del'>-	(init): Initialize `send_html' and `attachment_bar_visible' to</div><div class='del'>-	FALSE.</div><div class='del'>-	(get_signature): Add `void' to the declaration.  This is C, not</div><div class='del'>-	C++.</div><div class='del'>-	(menu_file_close_cb): Renamed from `exit_cb'.</div><div class='del'>-	(menu_file_send_cb): Renamed from `send_cb'.</div><div class='del'>-	(menu_file_save_as_cb): Renamed from `save_as_cb'.</div><div class='del'>-	(menu_file_save_cb): Renamed from `save_cb'.</div><div class='del'>-	(menu_file_open_cb): Renamed from `open_cb'.</div><div class='del'>-	(menu_file_add_attachment_cb): Renamed from `add_attachment_cb'.</div><div class='del'>-	(menu_file_insert_file_cb): Renamed from `insert_file_cb'.</div><div class='del'>-	(e_msg_composer_set_send_html): New.</div><div class='del'>-	(build_message): Use the `send_html' flag instead of peeking the</div><div class='del'>-	`msg_format' gnome-config value directly.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `send_html' in `EMsgComposer'.</div><div class='del'>-</div><div class='del'>-2000-07-23  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed to use BonoboUIHandler stuff directly</div><div class='del'>-	instead of translating from GnomeUIInfo.</div><div class='del'>-	(create_menubar_file): New.</div><div class='del'>-	(create_menubar_edit): New.</div><div class='del'>-	(create_menubar_view): New.</div><div class='del'>-	(create_menubar_options): New.</div><div class='del'>-	(create_menubar): Use these functions to set up the menu bar.</div><div class='del'>-	(create_toolbar): Use BonoboUIHandler directly instead of</div><div class='del'>-	converting from GnomeUIInfo.</div><div class='del'>-	(toolbar_view_attachments_clicked_cb): Removed.</div><div class='del'>-	(address_dialog_cb): Removed.</div><div class='del'>-	(address_dialog_destroy_cb): Removed.</div><div class='del'>-	(address_dialog_apply_cb): Removed.</div><div class='del'>-	(setup_address_dialog): Removed.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: (view_tree) Make the "View Attachments" item</div><div class='del'>-	a toggleitem ... so that it can be toggled...</div><div class='del'>-	(menu_view_attachments_activate_cb): Treat the widget correctly</div><div class='del'>-	and toggle correctly.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (exit_cb): Use it.</div><div class='del'>-	(delete_event): New, handler for the "delete_event" signal.</div><div class='del'>-</div><div class='del'>-2000-07-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_text): Don't load "" into the</div><div class='del'>-	editor, because it will cause the editor component to g_warning.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Removed the extra frame here.</div><div class='del'>-</div><div class='del'>-2000-07-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar): Create an empty "Edit" menu</div><div class='del'>-	for the editor control to insert itself into.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Ignore dynamically created source files</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_set_to): Use it.</div><div class='del'>-	(e_msg_composer_hdrs_set_cc): Likewise</div><div class='del'>-	(e_msg_composer_hdrs_set_bcc): Likewise.</div><div class='del'>-	(e_msg_composer_hdrs_get_to): Replace implementation with a</div><div class='del'>-	`g_assert_not_reached()'.</div><div class='del'>-	(e_msg_composer_hdrs_get_cc): Likewise.</div><div class='del'>-	(e_msg_composer_hdrs_get_bcc): Likewise.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Get rid of cut/copy/paste/undo as they</div><div class='del'>-	duplicate the editor toolbar and cannot be made to work for all</div><div class='del'>-	the widgets anyway.</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: New member `corba_select_names' in</div><div class='del'>-	`EMsgComposerHdrsPrivate'.</div><div class='del'>-	(destroy): If not `CORBA_OBJECT_NIL', release.</div><div class='del'>-	(init): Init to `CORBA_OBJECT_NIL'.</div><div class='del'>-	(setup_corba): New.</div><div class='del'>-	(e_msg_composer_hdrs_new): Call it.</div><div class='del'>-	(add_entry): Create the entries by using the ::SelectNames</div><div class='del'>-	interface.</div><div class='del'>-	(address_button_clicked_cb): Activate the dialog through the</div><div class='del'>-	::SelectNames interface.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed "Exit" to "Close" in the File menu.</div><div class='del'>-	This is a little more intuitive as it does not suggest exiting</div><div class='del'>-	the application, just says "close this window".</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-msg-composer-select-file.h for make</div><div class='del'>-	distcheck.</div><div class='del'>-</div><div class='del'>-2000-06-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c</div><div class='del'>-	(load): New.</div><div class='del'>-	(open_cb): Use it.</div><div class='del'>-	(save): New function.</div><div class='del'>-	(save_cb): Implemented by using it.</div><div class='del'>-	(save_as_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-17  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): I18N the title bar.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcomposerinclude_HEADERS): Removed.  Move all the</div><div class='del'>-	`.h' files into `libcomposer_la_SOURCES' so that they get</div><div class='del'>-	distributed, but not installed.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (open_cb): New; implement the `Open' command.</div><div class='del'>-	(save_as_cb): New; implement the `Save as' command.</div><div class='del'>-	(init): Initialize the `persist_file_interface' and</div><div class='del'>-	`persist_stream_interface' members to NULL.</div><div class='del'>-	(destroy): Release the PersistStream and PersistFile interfaces.</div><div class='del'>-	(e_msg_composer_construct): Query the PersistFile and</div><div class='del'>-	PersistStream interfaces on the control and save them in the</div><div class='del'>-	`persist_file_interface' and `persist_stream_interface' members.</div><div class='del'>-	(get_text): Renamed from `get_editor_text'.  Get a</div><div class='del'>-	@persist_stream_interface instead of querying it a the control.</div><div class='del'>-	(build_message): Return NULL if `persist_stream_interface' is nil.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `persist_file_interface' in</div><div class='del'>-	`EMsgComposer'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c: New.</div><div class='del'>-	* e-msg-composer-select-file.h: New.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Make the `To:'</div><div class='del'>-	entry grab the keyboard focus.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_cc_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_bcc_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_subject_entry): New.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Set the scroll</div><div class='del'>-	frame's shadow type to `GTK_SHADOW_IN'.</div><div class='del'>-	(format_text): Initialize `tabbing' to zero to shut down the</div><div class='del'>-	compiler.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_user): keep the</div><div class='del'>-	GtkFileSelection around between calls so we start up in the same</div><div class='del'>-	directory we ended up in last time around. (Also fixes a big</div><div class='del'>-	memory leak in that the code was already keeping the</div><div class='del'>-	GtkFileSelection around, it just wasn't remembering to reuse it.)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): Don't line-wrap lines that start</div><div class='del'>-	with "&gt;".</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): If a paragraph starts with TABs,</div><div class='del'>-	indent the whole paragraph to that tab level.</div><div class='del'>-</div><div class='del'>-2000-06-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Make the `attachment_scroll_frame' an</div><div class='del'>-	`EScrollFrame'.</div><div class='del'>-	(exit_cb): I18N the quit message.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: `attachment_scrolled_window' renamed to</div><div class='del'>-	`attachment_scroll_frame'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): Don't break on non-breaking</div><div class='del'>-	spaces, don't keep non-breaking spaces that fall after a line</div><div class='del'>-	wrap, and translate non-breaking spaces to regular ones after</div><div class='del'>-	wrapping.</div><div class='del'>-</div><div class='del'>-2000-06-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_attach): New convenience</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Store a CamelMimePart rather than</div><div class='del'>-	filename/description/mime_type info. Also record whether we were</div><div class='del'>-	told or guessed the MIME type.</div><div class='del'>-	(e_msg_composer_attachment_new_from_mime_part): New constructor.</div><div class='del'>-	(e_msg_composer_attachment_edit): Remove the "browse" button. (If</div><div class='del'>-	the user wants to change the actual file that the attachment is</div><div class='del'>-	based on, he should delete the attachment and create a new one...)</div><div class='del'>-	Remove the "Apply" button, because it's not all that useful. Make</div><div class='del'>-	the MIME type only track the filename if it was guessed rather</div><div class='del'>-	than being provided.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: Remove "browse" and "apply"</div><div class='del'>-	buttons. Make filename editable.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (sort): Removed. Send the</div><div class='del'>-	attachments in the order the user attached them in.</div><div class='del'>-	(text_changed): Removed, since we weren't enabling the relevant</div><div class='del'>-	GnomeIconList functionality that would have used this.</div><div class='del'>-	(update): Don't print the size if it's 0.</div><div class='del'>-	(attach_to_multipart, etc): adjust for EMsgComposerAttachment</div><div class='del'>-	changes.</div><div class='del'>-	(attach_to_multipart): Use 7bit encoding for message/ subparts.</div><div class='del'>-	(e_msg_composer_attachment_bar_attach_mime_part): New convenience</div><div class='del'>-	function.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Added the ability to save plain text mail.</div><div class='del'>-</div><div class='del'>-2000-05-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text): add a "format" argument so</div><div class='del'>-	we can fetch different kinds of text.</div><div class='del'>-	(format_text): New function to do line wrapping on plain text.</div><div class='del'>-	(build_message): Build multipart/alternative messages rather than</div><div class='del'>-	HTML-only ones. Yay. We don't suck (as much) any more!</div><div class='del'>-</div><div class='del'>-2000-05-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: #include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-2000-05-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text, set_editor_text): Update for</div><div class='del'>-	PersistStream changes</div><div class='del'>-	(build_message): Update for CamelMultipart changes.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): routine to read the user's</div><div class='del'>-	signature file.</div><div class='del'>-	(set_editor_text): If the user has configured a signature, append</div><div class='del'>-	it to the set text.</div><div class='del'>-	(e_msg_composer_new): Call set_editor_text with "" to load the</div><div class='del'>-	signature (if any).</div><div class='del'>-	</div><div class='del'>-2000-05-25  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use camel_data_wrapper_new</div><div class='del'>-	instead of camel_simple_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use</div><div class='del'>-	camel_simple_data_wrapper_new rather than camel_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-2000-05-13  Valek Filippov  &lt;frob@df.ru&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: save translatable strings</div><div class='del'>-	* e-msg-composer-attachment.glade.h: file with strings</div><div class='del'>-	* e-msg-composer-address-dialog.glade: save translatable strings</div><div class='del'>-	* e-msg-composer-address-dialog.glade.h: file with strings</div><div class='del'>-</div><div class='del'>-2000-05-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text): NUL-terminate the data</div><div class='del'>-	extracted from the BonoboStream.</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): deal with</div><div class='del'>-	Content-Transfer-Encoding a little bit at least.</div><div class='del'>-</div><div class='del'>-2000-05-07  Mathieu Lacage &lt;mathieu@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_editor): remove FIXME and hardcoded </div><div class='del'>-	string. You can write mails with OAF now.</div><div class='del'>-	</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): unref content, etc. after</div><div class='del'>-	attaching it to message.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): unref</div><div class='del'>-	part after attaching it.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Turned off focus in the To, Cc, and Bcc</div><div class='del'>-	buttons.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-</div><div class='del'>-2000-04-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Update (minimally) for</div><div class='del'>-	Camel recipient changes.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_from_url): New routine, to</div><div class='del'>-	process mailto URLs.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Only generate a multipart</div><div class='del'>-	message if there are attachments. Otherwise generate a single</div><div class='del'>-	part.</div><div class='del'>-</div><div class='del'>-	* Update for CamelMimeBodyPart -&gt; CamelMimePart</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): add a</div><div class='del'>-	s/SIMPLE_// that notzed missed. Update to use</div><div class='del'>-	camel_mime_part_set_content.</div><div class='del'>-	* e-msg-composer.c (build_message): remove a now-unused variable.</div><div class='del'>-	Update for camel_mime_part_set_content.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use camel_mime_part_set_text()</div><div class='del'>-	to set the text rather than messing with data wrappers.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Change</div><div class='del'>-	for new camel-stream interfaces.</div><div class='del'>-	(attach_to_multipart): Also set base64 encoding by default.</div><div class='del'>-</div><div class='del'>-2000-04-25  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_editor): use uih here</div><div class='del'>-	(e_msg_composer_construct): create menubar/toolbar before creating</div><div class='del'>-	editor control</div><div class='del'>-</div><div class='del'>-2000-04-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: build libcomposer static and don't install it.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was</div><div class='del'>-	only half-implemented. Finish it, mostly.</div><div class='del'>-</div><div class='del'>-2000-04-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_add_header): new function to</div><div class='del'>-	make the composer record additional headers it should output.</div><div class='del'>-	(In-Reply-To), etc.</div><div class='del'>-	(build_message): output them</div><div class='del'>-</div><div class='del'>-2000-04-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_headers): </div><div class='del'>-	(e_msg_composer_set_body_text): new functions</div><div class='del'>-	(exit_cb): Connect "Exit" menu item finally.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: const poisoning</div><div class='del'>-	(e_msg_composer_hdrs_set_subject): </div><div class='del'>-	(e_msg_composer_hdrs_get_subject): new functions</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-entry.c: const poisoning</div><div class='del'>-</div><div class='del'>-2000-04-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text, set_editor_text): new</div><div class='del'>-	functions to get and set the contents of the HTML editor via</div><div class='del'>-	Bonobo::PersistStream.</div><div class='del'>-	(build_message): use get_editor_text. This works again.</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Change</div><div class='del'>-	camel_mime_message_new_with_session to camel_mime_message_new</div><div class='del'>-</div><div class='del'>-2000-03-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar): Pass the composer as the data</div><div class='del'>-	for the menubar callbacks.</div><div class='del'>-</div><div class='del'>-2000-03-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Modified to make the composer into a library, to be</div><div class='del'>-	used by the mail component.</div><div class='del'>-</div><div class='del'>-2000-03-07  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_toolbar): Pass the composer as the data</div><div class='del'>-	for the toolbar callbacks.</div><div class='del'>-	(e_msg_composer_construct): Connect the "changed" signal of the</div><div class='del'>-	attachment bar to `attachment_bar_changed()'.</div><div class='del'>-	(attachment_bar_changed): Renamed to `attachment_bar_changed_cb'.</div><div class='del'>-</div><div class='del'>-2000-03-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new): Precondition:</div><div class='del'>-	gtk_main_level() greater than zero.</div><div class='del'>-	(e_msg_composer_construct): Likewise.</div><div class='del'>-	(create_menus): New function.  Set up menus through</div><div class='del'>-	BonoboUIHandler.</div><div class='del'>-	(e_msg_composer_construct): Use it.</div><div class='del'>-</div><div class='del'>-	* main.c (main): Initialize Bonobo.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (init): Initialize `uih' and `editor' to NULL.</div><div class='del'>-	Do not init `text' and `text_scrolled_window' anymore.</div><div class='del'>-	(destroy): Unref `uih'.</div><div class='del'>-	(e_msg_composer_construct): Create a new BonoboUIHandler and put</div><div class='del'>-	it into `uih'.</div><div class='del'>-	(create_editor): New helper function.</div><div class='del'>-	(e_msg_composer_construct): Use it to set up the editor.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `uih' in `EMsgComposer'.  Removed</div><div class='del'>-	members `text', `text_scrolled_window'.  New member `editor'.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	(evolution_msg_composer_LDADD): Add `$(BONOBO_GNOME_LIBS)'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (glade_connect): Removed.</div><div class='del'>-	(setup_signals): Removed.</div><div class='del'>-	(e_msg_composer_construct): Do not use libglade to set the toolbar</div><div class='del'>-	and menubar up.</div><div class='del'>-	(destroy): Removed libglade stuff.</div><div class='del'>-	(init): Likewise.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',</div><div class='del'>-	`appbar_gui'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.glade: Removed.</div><div class='del'>-</div><div class='del'>-2000-01-12  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (evolution_msg_composer_LDADD): </div><div class='del'>-	use $(EXTRA_GNOME_LIBS_THREADS) to link with gthread</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: New Makefile to compile the message composer</div><div class='del'>-	executable.</div><div class='del'>-</div><div class='del'>-	* main.c: New file.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use</div><div class='del'>-	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones</div><div class='del'>-	that do not exist anymore.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c</div><div class='del'>-	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'</div><div class='del'>-	instead of `E_GUIDIR'.</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):</div><div class='del'>-	Likewise.</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Likewise.</div><div class='del'>-</div><div class='del'>-(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the</div><div class='del'>-message composer.)</div><div class='head'>diff --git a/composer/Composer.idl b/composer/Composer.idl<br/>deleted file mode 100644<br/>index a6cb35c037..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Composer.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/Composer.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution-Addressbook-SelectNames.idl&gt;</div><div class='del'>-#include &lt;Evolution-Composer.idl&gt;</div><div class='head'>diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl<br/>deleted file mode 100644<br/>index 5163197220..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Evolution-Composer.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/Evolution-Composer.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Evolution-Composer.idl: Mail composer interfaces for Evolution</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- * </div><div class='del'>- * (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-	</div><div class='del'>-	interface Composer : Bonobo::Unknown {</div><div class='del'>-		struct Recipient {</div><div class='del'>-			string name;	/* UTF-8 */</div><div class='del'>-			string address;</div><div class='del'>-		};</div><div class='del'>-		typedef sequence&lt;Recipient&gt; RecipientList;</div><div class='del'>-</div><div class='del'>-		typedef sequence&lt;char&gt; AttachmentData;</div><div class='del'>-</div><div class='del'>-		enum MultipartType {</div><div class='del'>-			MIXED,</div><div class='del'>-			ALTERNATIVE</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * setHeaders:</div><div class='del'>-		 * @to: the "To" recipients</div><div class='del'>-		 * @cc: the "CC" recipients</div><div class='del'>-		 * @bcc: the "Bcc" recipients</div><div class='del'>-		 * @subject: the subject of the message</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the composer headers. Any of @to, @cc, and</div><div class='del'>-		 * @bcc may be an empty list, and @subject may be an</div><div class='del'>-		 * empty string.</div><div class='del'>-		 **/</div><div class='del'>-		void setHeaders (in RecipientList to, in RecipientList cc,</div><div class='del'>-				 in RecipientList bcc, in string subject);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * setMultipartType:</div><div class='del'>-		 * @type: a multipart subtype</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the kind of multipart message that is being</div><div class='del'>-		 * created.</div><div class='del'>-		 *</div><div class='del'>-		 * If @type is MIXED (the default), setBody()</div><div class='del'>-		 * will create the body, and attachMIME() and</div><div class='del'>-		 * attachData() will create attachments.</div><div class='del'>-		 *</div><div class='del'>-		 * If @type is ALTERNATIVE, setBody() will create</div><div class='del'>-		 * text/plain alternative, and each following</div><div class='del'>-		 * attachMIME() or attachData() call will create</div><div class='del'>-		 * another alternative.</div><div class='del'>-		 *</div><div class='del'>-		 * Other values of @type are not currently supported,</div><div class='del'>-		 * although "related" probably should be.</div><div class='del'>-		 **/</div><div class='del'>-		void setMultipartType (in MultipartType type);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * setBody:</div><div class='del'>-		 * @body: the body</div><div class='del'>-		 * @mime_type: the MIME type of @body</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the body of the composer to @body. If</div><div class='del'>-		 * @mime_type is something other than "text/plain" or</div><div class='del'>-		 * "text/html", the composer will not be editable</div><div class='del'>-		 * and it will not attempt to assign a non-UTF8</div><div class='del'>-		 * character set to the data. However, @mime_type may</div><div class='del'>-		 * include parameters in that case.</div><div class='del'>-		 **/</div><div class='del'>-		void setBody (in string body, in string mime_type);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * attachMIME:</div><div class='del'>-		 * @data: the attachment data</div><div class='del'>-		 *</div><div class='del'>-		 * This adds an attachment to the composer. @data</div><div class='del'>-		 * should be a fully-formed MIME body part.</div><div class='del'>-		 **/</div><div class='del'>-		exception CouldNotParse {};</div><div class='del'>-		void attachMIME (in string data)</div><div class='del'>-			raises (CouldNotParse);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * attachData:</div><div class='del'>-		 * @content_type: the Content-Type header</div><div class='del'>-		 * @filename: the suggested filename, or ""</div><div class='del'>-		 * @description: a description of the data, or ""</div><div class='del'>-		 * @show_inline: whether the attachment should be</div><div class='del'>-		 * displayed inline or not.</div><div class='del'>-		 * @data: the raw attachment data</div><div class='del'>-		 *</div><div class='del'>-		 * This adds @data as an attachment, using the provided</div><div class='del'>-		 * information to generate MIME headers. @content_type</div><div class='del'>-		 * may contain just a MIME content type, or it may</div><div class='del'>-		 * contain a complete Content-Type header. @filename</div><div class='del'>-		 * is a filename for the Content-Disposition header</div><div class='del'>-		 * @description (if not "") provides the</div><div class='del'>-		 * Content-Description, and @show_inline determines if the</div><div class='del'>-		 * Content-Disposition is "inline" or "attachment".</div><div class='del'>-		 *</div><div class='del'>-		 * If you need to specify headers or values other than</div><div class='del'>-		 * what this function can do, you will need to generate</div><div class='del'>-		 * all of the MIME headers yourself and use</div><div class='del'>-		 * add_attachment ().</div><div class='del'>-		 **/</div><div class='del'>-		void attachData (in string content_type,</div><div class='del'>-				 in string filename,</div><div class='del'>-				 in string description,</div><div class='del'>-				 in boolean show_inline,</div><div class='del'>-				 in AttachmentData data);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * show:</div><div class='del'>-		 *</div><div class='del'>-		 * Shows the composer and lets the user edit things</div><div class='del'>-		 * and send the message.</div><div class='del'>-		 **/</div><div class='del'>-		void show ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * send:</div><div class='del'>-		 *</div><div class='del'>-		 * Send the message without showing the user the composer</div><div class='del'>-		 **/</div><div class='del'>-		void send ();</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/composer/Makefile.am b/composer/Makefile.am<br/>deleted file mode 100644<br/>index 505c0c130e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,90 +0,0 @@</div><div class='del'>-## CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS =				\</div><div class='del'>-	Evolution-Composer.idl	\</div><div class='del'>-	Composer.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED =			\</div><div class='del'>-	Composer.h		\</div><div class='del'>-	Composer-common.c	\</div><div class='del'>-	Composer-skels.c	\</div><div class='del'>-	Composer-stubs.c</div><div class='del'>-</div><div class='del'>-HTML_EDITOR_GENERATED =		\</div><div class='del'>-	Editor.h		\</div><div class='del'>-	Editor-common.c	\</div><div class='del'>-	Editor-skels.c	\</div><div class='del'>-	Editor-stubs.c</div><div class='del'>-</div><div class='del'>-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\</div><div class='del'>-		-I $(selectnamesdir)  $(srcdir)/Composer.idl</div><div class='del'>-</div><div class='del'>-Editor-commmon.c:	$(GTKHTML_DATADIR)/Editor.idl</div><div class='del'>-</div><div class='del'>-$(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(GTKHTML_DATADIR)/gtkhtml $(GTKHTML_DATADIR)/Editor.idl</div><div class='del'>-</div><div class='del'>-##</div><div class='del'>-</div><div class='del'>-idldir = $(datadir)/idl</div><div class='del'>-idl_DATA = $(IDLS)</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA =					\</div><div class='del'>-	e-msg-composer-attachment.glade</div><div class='del'>-</div><div class='del'>-libcomposerincludedir = $(includedir)/composer</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libcomposer.a</div><div class='del'>-</div><div class='del'>-INCLUDES =								\</div><div class='del'>-	-I$(top_srcdir)							\</div><div class='del'>-	-I$(top_builddir)						\</div><div class='del'>-	-I$(top_srcdir)/widgets						\</div><div class='del'>-	-I$(top_builddir)/widgets					\</div><div class='del'>-	-I$(top_srcdir)/camel					 	\</div><div class='del'>-	-I$(top_builddir)/camel					 	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook			\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend/ebook			\</div><div class='del'>-	-I$(top_builddir)/addressbook/gui/component/select-names	\</div><div class='del'>-	-I$(top_builddir)/shell						\</div><div class='del'>-	-I$(top_srcdir)/shell						\</div><div class='del'>-	-DEVOLUTION_DATADIR=\"$(datadir)\"				\</div><div class='del'>-	-DE_GLADEDIR=\"$(gladedir)\"					\</div><div class='del'>-	-DG_LOG_DOMAIN=\"composer\"					\</div><div class='del'>-	$(GNOME_FULL_CFLAGS)</div><div class='del'>-</div><div class='del'>-libcomposer_a_SOURCES = 			\</div><div class='del'>-	$(IDL_GENERATED)			\</div><div class='del'>-	$(HTML_EDITOR_GENERATED)		\</div><div class='del'>-	e-msg-composer-attachment-bar.c		\</div><div class='del'>-	e-msg-composer-attachment-bar.h		\</div><div class='del'>-	e-msg-composer-attachment.c		\</div><div class='del'>-	e-msg-composer-attachment.h		\</div><div class='del'>-	e-msg-composer-hdrs.c			\</div><div class='del'>-	e-msg-composer-hdrs.h			\</div><div class='del'>-	e-msg-composer-select-file.c		\</div><div class='del'>-	e-msg-composer-select-file.h		\</div><div class='del'>-	e-msg-composer.c			\</div><div class='del'>-	e-msg-composer.h			\</div><div class='del'>-	e-icon-list.c				\</div><div class='del'>-	e-icon-list.h				\</div><div class='del'>-	evolution-composer.c			\</div><div class='del'>-	evolution-composer.h			\</div><div class='del'>-	listener.c				\</div><div class='del'>-	listener.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =					\</div><div class='del'>-	$(glade_DATA)				\</div><div class='del'>-	$(IDLS)					\</div><div class='del'>-	bad-icon.xpm</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/composer/bad-icon.xpm b/composer/bad-icon.xpm<br/>deleted file mode 100644<br/>index 0a9cac23cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/bad-icon.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/bad-icon.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * bad_icon_xpm[] = {</div><div class='del'>-"48 48 2 1",</div><div class='del'>-" 	g None",</div><div class='del'>-".	g #000000",</div><div class='del'>-"................................................",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".        .                              .      .",</div><div class='del'>-".         .                            .       .",</div><div class='del'>-".          .                          .        .",</div><div class='del'>-".           .                        .         .",</div><div class='del'>-".            .                      .          .",</div><div class='del'>-".             .                    .           .",</div><div class='del'>-".              .                  .            .",</div><div class='del'>-".               .                .             .",</div><div class='del'>-".                .              .              .",</div><div class='del'>-".                 .            .               .",</div><div class='del'>-".                  .          .                .",</div><div class='del'>-".                   .        .                 .",</div><div class='del'>-".                    .      .                  .",</div><div class='del'>-".                     .    .                   .",</div><div class='del'>-".                      .  .                    .",</div><div class='del'>-".                       ..                     .",</div><div class='del'>-".                       ..                     .",</div><div class='del'>-".                      .  .                    .",</div><div class='del'>-".                     .    .                   .",</div><div class='del'>-".                    .      .                  .",</div><div class='del'>-".                   .        .                 .",</div><div class='del'>-".                  .          .                .",</div><div class='del'>-".                 .            .               .",</div><div class='del'>-".                .              .              .",</div><div class='del'>-".               .                .             .",</div><div class='del'>-".              .                  .            .",</div><div class='del'>-".             .                    .           .",</div><div class='del'>-".            .                      .          .",</div><div class='del'>-".           .                        .         .",</div><div class='del'>-".          .                          .        .",</div><div class='del'>-".         .                            .       .",</div><div class='del'>-".        .                              .      .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-"................................................"};</div><div class='head'>diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c<br/>deleted file mode 100644<br/>index a5e7ac45cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-icon-list.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-icon-list.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2675 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1998, 1999, 2000 Free Software Foundation</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This file is part of the Gnome Library.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with the Gnome Library; see the file COPYING.LIB.  If not,</div><div class='del'>- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>-  @NOTATION@</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GnomeIconList widget - scrollable icon list</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *    Federico Mena &lt;federico@ximian.com&gt;</div><div class='del'>- *    Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Rewrote from scratch from the code written by Federico Mena</div><div class='del'>- * &lt;federico@ximian.com&gt; to be based on a GnomeCanvas, and</div><div class='del'>- * to support banding selection and allow inline icon renaming.</div><div class='del'>- *</div><div class='del'>- * Redone somewhat by Elliot to support gdk-pixbuf, and to use GArray instead of</div><div class='del'>- * GList for item storage.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-icon-item.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-#include "e-icon-list.h"</div><div class='del'>-</div><div class='del'>-#include "bad-icon.xpm"</div><div class='del'>-</div><div class='del'>-/* Aliases to minimize screen use in my laptop */</div><div class='del'>-#define EIL(x)       E_ICON_LIST(x)</div><div class='del'>-#define EIL_CLASS(x) E_ICON_LIST_CLASS(x)</div><div class='del'>-#define IS_EIL(x)    E_IS_ICON_LIST(x)</div><div class='del'>-</div><div class='del'>-typedef EIconList Eil;</div><div class='del'>-typedef EIconListClass EilClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* default spacings */</div><div class='del'>-#define DEFAULT_ROW_SPACING  4</div><div class='del'>-#define DEFAULT_COL_SPACING  2</div><div class='del'>-#define DEFAULT_TEXT_SPACING 2</div><div class='del'>-#define DEFAULT_ICON_BORDER  2</div><div class='del'>-</div><div class='del'>-/* Autoscroll timeout in milliseconds */</div><div class='del'>-#define SCROLL_TIMEOUT 30</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signals */</div><div class='del'>-enum {</div><div class='del'>-	SELECT_ICON,</div><div class='del'>-	UNSELECT_ICON,</div><div class='del'>-	TEXT_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	SYNC_INSERT,</div><div class='del'>-	SYNC_REMOVE</div><div class='del'>-} SyncType;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint eil_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Icon structure */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Icon image and text items */</div><div class='del'>-	GnomeCanvasPixbuf *image;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-</div><div class='del'>-	/* Filename of the icon file. */</div><div class='del'>-	gchar *icon_filename;</div><div class='del'>-</div><div class='del'>-	/* User data and destroy notify function */</div><div class='del'>-	gpointer data;</div><div class='del'>-	GtkDestroyNotify destroy;</div><div class='del'>-</div><div class='del'>-	/* ID for the text item's event signal handler */</div><div class='del'>-	guint text_event_id;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon is selected, and temporary storage for rubberband</div><div class='del'>-         * selections.</div><div class='del'>-	 */</div><div class='del'>-	guint selected : 1;</div><div class='del'>-	guint tmp_selected : 1;</div><div class='del'>-} Icon;</div><div class='del'>-</div><div class='del'>-/* A row of icons */</div><div class='del'>-typedef struct {</div><div class='del'>-	GList *line_icons;</div><div class='del'>-	gint16 y;</div><div class='del'>-	gint16 icon_height, text_height;</div><div class='del'>-} IconLine;</div><div class='del'>-</div><div class='del'>-/* Private data of the EIconList structure */</div><div class='del'>-struct _EIconListPrivate {</div><div class='del'>-	/* List of icons */</div><div class='del'>-	GArray *icon_list;</div><div class='del'>-</div><div class='del'>-	/* List of rows of icons */</div><div class='del'>-	GList *lines;</div><div class='del'>-</div><div class='del'>-	/* Separators used to wrap the text below icons */</div><div class='del'>-	char *separators;</div><div class='del'>-</div><div class='del'>-	Icon *last_selected_icon;</div><div class='del'>-</div><div class='del'>-	/* Rubberband rectangle */</div><div class='del'>-	GnomeCanvasItem *sel_rect;</div><div class='del'>-</div><div class='del'>-	/* Saved event for a pending selection */</div><div class='del'>-	GdkEvent select_pending_event;</div><div class='del'>-</div><div class='del'>-	/* Max of the height of all the icon rows and window height */</div><div class='del'>-	int total_height;</div><div class='del'>-</div><div class='del'>-	/* Selection mode */</div><div class='del'>-	GtkSelectionMode selection_mode;</div><div class='del'>-</div><div class='del'>-	/* A list of integers with the indices of the currently selected icons */</div><div class='del'>-	GList *selection;</div><div class='del'>-</div><div class='del'>-	/* Number of icons in the list */</div><div class='del'>-	int icons;</div><div class='del'>-</div><div class='del'>-	/* Freeze count */</div><div class='del'>-	int frozen;</div><div class='del'>-</div><div class='del'>-	/* Width allocated for icons */</div><div class='del'>-	int icon_width;</div><div class='del'>-</div><div class='del'>-	/* Spacing values */</div><div class='del'>-	int row_spacing;</div><div class='del'>-	int col_spacing;</div><div class='del'>-	int text_spacing;</div><div class='del'>-	int icon_border;</div><div class='del'>-</div><div class='del'>-	/* Index and pointer to last selected icon */</div><div class='del'>-	int last_selected_idx;</div><div class='del'>-</div><div class='del'>-	/* Timeout ID for autoscrolling */</div><div class='del'>-	guint timer_tag;</div><div class='del'>-</div><div class='del'>-	/* Change the adjustment value by this amount when autoscrolling */</div><div class='del'>-	int value_diff;</div><div class='del'>-</div><div class='del'>-	/* Mouse position for autoscrolling */</div><div class='del'>-	int event_last_x;</div><div class='del'>-	int event_last_y;</div><div class='del'>-</div><div class='del'>-	/* Selection start position */</div><div class='del'>-	int sel_start_x;</div><div class='del'>-	int sel_start_y;</div><div class='del'>-</div><div class='del'>-	/* Modifier state when the selection began */</div><div class='del'>-	guint sel_state;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon texts are editable */</div><div class='del'>-	guint is_editable : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon texts need to be copied */</div><div class='del'>-	guint static_text : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icons need to be laid out */</div><div class='del'>-	guint dirty : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the user is performing a rubberband selection */</div><div class='del'>-	guint selecting : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether editing an icon is pending after a button press */</div><div class='del'>-	guint edit_pending : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether selection is pending after a button press */</div><div class='del'>-	guint select_pending : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon that is pending selection was selected to begin with */</div><div class='del'>-	guint select_pending_was_selected : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-icon_line_height (Eil *eil, IconLine *il)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	return il-&gt;icon_height + il-&gt;text_height + priv-&gt;row_spacing + priv-&gt;text_spacing;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_get_height (Icon *icon, int *icon_height, int *text_height)</div><div class='del'>-{</div><div class='del'>-	double d_icon_height;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "height", &amp;d_icon_height, NULL);</div><div class='del'>-	*icon_height = d_icon_height;</div><div class='del'>-	*text_height = icon-&gt;text-&gt;ti-&gt;height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_get_items_per_line (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int items_per_line;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	items_per_line = GTK_WIDGET (eil)-&gt;allocation.width / (priv-&gt;icon_width + priv-&gt;col_spacing);</div><div class='del'>-	if (items_per_line == 0)</div><div class='del'>-		items_per_line = 1;</div><div class='del'>-</div><div class='del'>-	return items_per_line;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_items_per_line:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns the number of icons that fit in a line or row.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_get_items_per_line (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (eil != NULL, 1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), 1);</div><div class='del'>-</div><div class='del'>-	return eil_get_items_per_line (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_place_icon (Eil *eil, Icon *icon, int x, int y, int icon_height)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int x_offset, y_offset;</div><div class='del'>-	double d_icon_image_height;</div><div class='del'>-	double d_icon_image_width;</div><div class='del'>-	int icon_image_height;</div><div class='del'>-	int icon_image_width;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "height", &amp;d_icon_image_height, NULL);</div><div class='del'>-	icon_image_height = d_icon_image_height;</div><div class='del'>-	g_assert(icon_image_height != 0);</div><div class='del'>-	if (icon_height &gt; icon_image_height)</div><div class='del'>-		y_offset = (icon_height - icon_image_height) / 2;</div><div class='del'>-	else</div><div class='del'>-		y_offset = 0;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "width", &amp;d_icon_image_width, NULL);</div><div class='del'>-	icon_image_width = d_icon_image_width;</div><div class='del'>-	g_assert(icon_image_width != 0);</div><div class='del'>-	if (priv-&gt;icon_width &gt; icon_image_width)</div><div class='del'>-		x_offset = (priv-&gt;icon_width - icon_image_width) / 2;</div><div class='del'>-	else</div><div class='del'>-		x_offset = 0;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon-&gt;image),</div><div class='del'>-			       "x",  (double) (x + x_offset),</div><div class='del'>-			       "y",  (double) (y + y_offset),</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_icon_text_item_setxy (icon-&gt;text,</div><div class='del'>-				    x,</div><div class='del'>-				    y + icon_height + priv-&gt;text_spacing);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_line (Eil *eil, IconLine *il)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	int x;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	x = 0;</div><div class='del'>-	for (l = il-&gt;line_icons; l; l = l-&gt;next) {</div><div class='del'>-		Icon *icon = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		eil_place_icon (eil, icon, x, il-&gt;y, il-&gt;icon_height);</div><div class='del'>-		x += priv-&gt;icon_width + priv-&gt;col_spacing;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_add_and_layout_line (Eil *eil, GList *line_icons, int y,</div><div class='del'>-			 int icon_height, int text_height)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	IconLine *il;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	il = g_new (IconLine, 1);</div><div class='del'>-	il-&gt;line_icons = line_icons;</div><div class='del'>-	il-&gt;y = y;</div><div class='del'>-	il-&gt;icon_height = icon_height;</div><div class='del'>-	il-&gt;text_height = text_height;</div><div class='del'>-</div><div class='del'>-	eil_layout_line (eil, il);</div><div class='del'>-	priv-&gt;lines = g_list_append (priv-&gt;lines, il);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_relayout_icons_at (Eil *eil, int pos, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int col, row, text_height, icon_height;</div><div class='del'>-	int items_per_line, n;</div><div class='del'>-	GList *line_icons;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	items_per_line = eil_get_items_per_line (eil);</div><div class='del'>-</div><div class='del'>-	col = row = text_height = icon_height = 0;</div><div class='del'>-	line_icons = NULL;</div><div class='del'>-</div><div class='del'>-	for (n = pos; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		Icon *icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		int ih, th;</div><div class='del'>-</div><div class='del'>-		if (!(n % items_per_line)) {</div><div class='del'>-			if (line_icons) {</div><div class='del'>-				eil_add_and_layout_line (eil, line_icons, y,</div><div class='del'>-							 icon_height, text_height);</div><div class='del'>-				line_icons = NULL;</div><div class='del'>-</div><div class='del'>-				y += (icon_height + text_height</div><div class='del'>-				      + priv-&gt;row_spacing + priv-&gt;text_spacing);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			icon_height = 0;</div><div class='del'>-			text_height = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icon_get_height (icon, &amp;ih, &amp;th);</div><div class='del'>-</div><div class='del'>-		icon_height = MAX (ih, icon_height);</div><div class='del'>-		text_height = MAX (th, text_height);</div><div class='del'>-</div><div class='del'>-		line_icons = g_list_append (line_icons, icon);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (line_icons)</div><div class='del'>-		eil_add_and_layout_line (eil, line_icons, y, icon_height, text_height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_free_line_info (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_list_free (il-&gt;line_icons);</div><div class='del'>-		g_free (il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;lines);</div><div class='del'>-	priv-&gt;lines = NULL;</div><div class='del'>-	priv-&gt;total_height = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_free_line_info_from (Eil *eil, int first_line)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l, *ll;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	ll = g_list_nth (priv-&gt;lines, first_line);</div><div class='del'>-</div><div class='del'>-	for (l = ll; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_list_free (il-&gt;line_icons);</div><div class='del'>-		g_free (il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;lines) {</div><div class='del'>-		if (ll-&gt;prev)</div><div class='del'>-			ll-&gt;prev-&gt;next = NULL;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;lines = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (ll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_from_line (Eil *eil, int line)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	int height;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	eil_free_line_info_from (eil, line);</div><div class='del'>-</div><div class='del'>-	height = 0;</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		height += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_relayout_icons_at (eil, line * eil_get_items_per_line (eil), height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_all_icons (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	eil_free_line_info (eil);</div><div class='del'>-	eil_relayout_icons_at (eil, 0, 0);</div><div class='del'>-	priv-&gt;dirty = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_scrollbar_adjust (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GList *l;</div><div class='del'>-	double wx, wy, wx1, wy1, wx2, wy2;</div><div class='del'>-	int height, step_increment;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	height = 0;</div><div class='del'>-	step_increment = 0;</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		height += icon_line_height (eil, il);</div><div class='del'>-</div><div class='del'>-		if (l == priv-&gt;lines)</div><div class='del'>-			step_increment = height;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!step_increment)</div><div class='del'>-		step_increment = 10;</div><div class='del'>-</div><div class='del'>-	priv-&gt;total_height = MAX (height, GTK_WIDGET (eil)-&gt;allocation.height);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_c2w (GNOME_CANVAS (eil), 0, 0, &amp;wx1, &amp;wy1);</div><div class='del'>-	gnome_canvas_c2w (GNOME_CANVAS (eil),</div><div class='del'>-			  GTK_WIDGET (eil)-&gt;allocation.width,</div><div class='del'>-			  priv-&gt;total_height,</div><div class='del'>-			  &amp;wx2, &amp;wy2);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil),</div><div class='del'>-					wx1, wy1, wx2, wy2);</div><div class='del'>-</div><div class='del'>-	wx = wy = 0;</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), 0, 0, &amp;wx, &amp;wy);</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	adj-&gt;upper = priv-&gt;total_height;</div><div class='del'>-	adj-&gt;step_increment = step_increment;</div><div class='del'>-	adj-&gt;page_increment = GTK_WIDGET (eil)-&gt;allocation.height;</div><div class='del'>-	adj-&gt;page_size = GTK_WIDGET (eil)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	if (wy &gt; adj-&gt;upper - adj-&gt;page_size)</div><div class='del'>-		wy = adj-&gt;upper - adj-&gt;page_size;</div><div class='del'>-</div><div class='del'>-	adj-&gt;value = wy;</div><div class='del'>-</div><div class='del'>-	gtk_adjustment_changed (adj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the select_icon or unselect_icon signals as appropriate */</div><div class='del'>-static void</div><div class='del'>-emit_select (Eil *eil, int sel, int i, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eil),</div><div class='del'>-			 eil_signals[sel ? SELECT_ICON : UNSELECT_ICON],</div><div class='del'>-			 i,</div><div class='del'>-			 event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_unselect_all (EIconList *eil, GdkEvent *event, gpointer keep)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-	int i, idx = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), 0);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		if (icon == keep)</div><div class='del'>-			idx = i;</div><div class='del'>-		else if (icon-&gt;selected)</div><div class='del'>-			emit_select (eil, FALSE, i, event);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_unselect_all:</div><div class='del'>- * @eil:   An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns: the number of icons in the icon list</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_unselect_all (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	return eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_selection (Eil *eil, int pos, SyncType type)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	for (list = eil-&gt;_priv-&gt;selection; list; list = list-&gt;next) {</div><div class='del'>-		if (GPOINTER_TO_INT (list-&gt;data) &gt;= pos) {</div><div class='del'>-			int i = GPOINTER_TO_INT (list-&gt;data);</div><div class='del'>-</div><div class='del'>-			switch (type) {</div><div class='del'>-			case SYNC_INSERT:</div><div class='del'>-				list-&gt;data = GINT_TO_POINTER (i + 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SYNC_REMOVE:</div><div class='del'>-				list-&gt;data = GINT_TO_POINTER (i - 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				g_assert_not_reached ();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_icon_to_index (Eil *eil, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++)</div><div class='del'>-		if (g_array_index(priv-&gt;icon_list, Icon*, n) == icon)</div><div class='del'>-			return n;</div><div class='del'>-</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return -1; /* Shut up the compiler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons when we are in SINGLE or BROWSE mode */</div><div class='del'>-static gint</div><div class='del'>-selection_one_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* We use a separate variable and ref the object because it may be</div><div class='del'>-	 * destroyed by one of the signal handlers.</div><div class='del'>-	 */</div><div class='del'>-	text = icon-&gt;text;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		priv-&gt;edit_pending = FALSE;</div><div class='del'>-		priv-&gt;select_pending = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!icon-&gt;selected) {</div><div class='del'>-			eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-			emit_select (eil, TRUE, idx, event);</div><div class='del'>-		} else {</div><div class='del'>-			if (priv-&gt;selection_mode == GTK_SELECTION_SINGLE</div><div class='del'>-			    &amp;&amp; (event-&gt;button.state &amp; GDK_CONTROL_MASK))</div><div class='del'>-				emit_select (eil, FALSE, idx, event);</div><div class='del'>-			else if (on_text &amp;&amp; priv-&gt;is_editable &amp;&amp; event-&gt;button.button == 1)</div><div class='del'>-				priv-&gt;edit_pending = TRUE;</div><div class='del'>-			else</div><div class='del'>-				emit_select (eil, TRUE, idx, event);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, idx, event);</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the click was on the text and we actually did something, stop the</div><div class='del'>-	 * icon text item's own handler from executing.</div><div class='del'>-	 */</div><div class='del'>-	if (on_text &amp;&amp; retval)</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handles range selections when clicking on an icon */</div><div class='del'>-static void</div><div class='del'>-select_range (Eil *eil, Icon *icon, int idx, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int a, b;</div><div class='del'>-	Icon *i;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;last_selected_idx == -1) {</div><div class='del'>-		priv-&gt;last_selected_idx = idx;</div><div class='del'>-		priv-&gt;last_selected_icon = icon;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx &lt; priv-&gt;last_selected_idx) {</div><div class='del'>-		a = idx;</div><div class='del'>-		b = priv-&gt;last_selected_idx;</div><div class='del'>-	} else {</div><div class='del'>-		a = priv-&gt;last_selected_idx;</div><div class='del'>-		b = idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (; a &lt;= b; a++) {</div><div class='del'>-		i = g_array_index(priv-&gt;icon_list, Icon*, a);</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;selected)</div><div class='del'>-			emit_select (eil, TRUE, a, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Actually notify the client of the event */</div><div class='del'>-	emit_select (eil, TRUE, idx, event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handles icon selection for MULTIPLE or EXTENDED selection modes */</div><div class='del'>-static void</div><div class='del'>-do_select_many (Eil *eil, Icon *icon, int idx, GdkEvent *event, int use_event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int range, additive;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	range = (event-&gt;button.state &amp; GDK_SHIFT_MASK) != 0;</div><div class='del'>-	additive = (event-&gt;button.state &amp; GDK_CONTROL_MASK) != 0;</div><div class='del'>-</div><div class='del'>-	if (!additive) {</div><div class='del'>-		if (icon-&gt;selected)</div><div class='del'>-			eil_unselect_all (eil, NULL, icon);</div><div class='del'>-		else</div><div class='del'>-			eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!range) {</div><div class='del'>-		if (additive)</div><div class='del'>-			emit_select (eil, !icon-&gt;selected, idx, use_event ? event : NULL);</div><div class='del'>-		else</div><div class='del'>-			emit_select (eil, TRUE, idx, use_event ? event : NULL);</div><div class='del'>-</div><div class='del'>-		priv-&gt;last_selected_idx = idx;</div><div class='del'>-		priv-&gt;last_selected_icon = icon;</div><div class='del'>-	} else</div><div class='del'>-		select_range (eil, icon, idx, use_event ? event : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons when we are in MULTIPLE or EXTENDED mode */</div><div class='del'>-static gint</div><div class='del'>-selection_many_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-	int retval;</div><div class='del'>-	int additive, range;</div><div class='del'>-	int do_select;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* We use a separate variable and ref the object because it may be</div><div class='del'>-	 * destroyed by one of the signal handlers.</div><div class='del'>-	 */</div><div class='del'>-	text = icon-&gt;text;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	range = (event-&gt;button.state &amp; GDK_SHIFT_MASK) != 0;</div><div class='del'>-	additive = (event-&gt;button.state &amp; GDK_CONTROL_MASK) != 0;</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		priv-&gt;edit_pending = FALSE;</div><div class='del'>-		priv-&gt;select_pending = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		do_select = TRUE;</div><div class='del'>-</div><div class='del'>-		if (additive || range) {</div><div class='del'>-			if (additive &amp;&amp; !range) {</div><div class='del'>-				priv-&gt;select_pending = TRUE;</div><div class='del'>-				priv-&gt;select_pending_event = *event;</div><div class='del'>-				priv-&gt;select_pending_was_selected = icon-&gt;selected;</div><div class='del'>-</div><div class='del'>-				/* We have to emit this so that the client will</div><div class='del'>-				 * know about the click.</div><div class='del'>-				 */</div><div class='del'>-				emit_select (eil, TRUE, idx, event);</div><div class='del'>-				do_select = FALSE;</div><div class='del'>-			}</div><div class='del'>-		} else if (icon-&gt;selected) {</div><div class='del'>-			priv-&gt;select_pending = TRUE;</div><div class='del'>-			priv-&gt;select_pending_event = *event;</div><div class='del'>-			priv-&gt;select_pending_was_selected = icon-&gt;selected;</div><div class='del'>-</div><div class='del'>-			if (on_text &amp;&amp; priv-&gt;is_editable &amp;&amp; event-&gt;button.button == 1)</div><div class='del'>-				priv-&gt;edit_pending = TRUE;</div><div class='del'>-</div><div class='del'>-			emit_select (eil, TRUE, idx, event);</div><div class='del'>-			do_select = FALSE;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		} else if (icon-&gt;selected &amp;&amp; on_text &amp;&amp; priv-&gt;is_editable</div><div class='del'>-			   &amp;&amp; event-&gt;button.button == 1) {</div><div class='del'>-			priv-&gt;edit_pending = TRUE;</div><div class='del'>-			do_select = FALSE;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		if (do_select)</div><div class='del'>-			do_select_many (eil, icon, idx, event, TRUE);</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, idx, event);</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (priv-&gt;select_pending) {</div><div class='del'>-			icon-&gt;selected = priv-&gt;select_pending_was_selected;</div><div class='del'>-			do_select_many (eil, icon, idx, &amp;priv-&gt;select_pending_event, FALSE);</div><div class='del'>-			priv-&gt;select_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		if (priv-&gt;select_pending) {</div><div class='del'>-			icon-&gt;selected = priv-&gt;select_pending_was_selected;</div><div class='del'>-			do_select_many (eil, icon, idx, &amp;priv-&gt;select_pending_event);</div><div class='del'>-			priv-&gt;select_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		} else if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the click was on the text and we actually did something, stop the</div><div class='del'>-	 * icon text item's own handler from executing.</div><div class='del'>-	 */</div><div class='del'>-	if (on_text &amp;&amp; retval)</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons in the icon list */</div><div class='del'>-static gint</div><div class='del'>-icon_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int idx;</div><div class='del'>-	int on_text;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	idx = eil_icon_to_index (eil, icon);</div><div class='del'>-	on_text = item == GNOME_CANVAS_ITEM (icon-&gt;text);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		return selection_one_icon_event (eil, icon, idx, on_text, event);</div><div class='del'>-</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		return selection_many_icon_event (eil, icon, idx, on_text, event);</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return FALSE; /* Shut up the compiler */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handler for the editing_started signal of an icon text item.  We block the</div><div class='del'>- * event handler so that it will not be called while the text is being edited.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-editing_started (GnomeIconTextItem *iti, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	gtk_signal_handler_block (GTK_OBJECT (iti), icon-&gt;text_event_id);</div><div class='del'>-	eil_unselect_all (EIL (GNOME_CANVAS_ITEM (iti)-&gt;canvas), NULL, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handler for the editing_stopped signal of an icon text item.  We unblock the</div><div class='del'>- * event handler so that we can get events from it again.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-editing_stopped (GnomeIconTextItem *iti, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	gtk_signal_handler_unblock (GTK_OBJECT (iti), icon-&gt;text_event_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-text_changed (GnomeCanvasItem *item, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	gboolean accept;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	accept = TRUE;</div><div class='del'>-</div><div class='del'>-	idx = eil_icon_to_index (eil, icon);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eil),</div><div class='del'>-			 eil_signals[TEXT_CHANGED],</div><div class='del'>-			 idx, gnome_icon_text_item_get_text (icon-&gt;text),</div><div class='del'>-			 &amp;accept);</div><div class='del'>-</div><div class='del'>-	return accept;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-height_changed (GnomeCanvasItem *item, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = eil_icon_to_index (eil, icon);</div><div class='del'>-	eil_layout_from_line (eil, n / eil_get_items_per_line (eil));</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Icon *</div><div class='del'>-icon_new_from_pixbuf (EIconList *eil, GdkPixbuf *im,</div><div class='del'>-		      const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	canvas = GNOME_CANVAS (eil);</div><div class='del'>-	group = GNOME_CANVAS_GROUP (canvas-&gt;root);</div><div class='del'>-</div><div class='del'>-	icon = g_new0 (Icon, 1);</div><div class='del'>-</div><div class='del'>-	if (icon_filename)</div><div class='del'>-		icon-&gt;icon_filename = g_strdup (icon_filename);</div><div class='del'>-	else</div><div class='del'>-		icon-&gt;icon_filename = NULL;</div><div class='del'>-</div><div class='del'>-	if (im == NULL)</div><div class='del'>-		im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); </div><div class='del'>-	else</div><div class='del'>-		gdk_pixbuf_ref (im);</div><div class='del'>-</div><div class='del'>-	icon-&gt;image = GNOME_CANVAS_PIXBUF (gnome_canvas_item_new (</div><div class='del'>-		group,</div><div class='del'>-		gnome_canvas_pixbuf_get_type (),</div><div class='del'>-		"x", 0.0,</div><div class='del'>-		"y", 0.0,</div><div class='del'>-		"width", (double) gdk_pixbuf_get_width (im),</div><div class='del'>-		"height", (double) gdk_pixbuf_get_height (im),</div><div class='del'>-		"pixbuf", im,</div><div class='del'>-		NULL));</div><div class='del'>-	gdk_pixbuf_unref (im);</div><div class='del'>-</div><div class='del'>-	icon-&gt;text = GNOME_ICON_TEXT_ITEM (gnome_canvas_item_new (</div><div class='del'>-		group,</div><div class='del'>-		gnome_icon_text_item_get_type (),</div><div class='del'>-		NULL));</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon-&gt;text),</div><div class='del'>-			       "use_broken_event_handling", FALSE,</div><div class='del'>-			       NULL);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: should this use a selectable font?? */</div><div class='del'>-#warning "Ettore: should we allow this font to be selectable??"</div><div class='del'>-	gnome_icon_text_item_configure (icon-&gt;text,</div><div class='del'>-					0, 0, priv-&gt;icon_width, </div><div class='del'>-					"-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1",</div><div class='del'>-					text, priv-&gt;is_editable, priv-&gt;static_text);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;image), "event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (icon_event),</div><div class='del'>-			    icon);</div><div class='del'>-	icon-&gt;text_event_id = gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "event",</div><div class='del'>-						  GTK_SIGNAL_FUNC (icon_event),</div><div class='del'>-						  icon);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "editing_started",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editing_started),</div><div class='del'>-			    icon);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "editing_stopped",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editing_stopped),</div><div class='del'>-			    icon);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "text_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (text_changed),</div><div class='del'>-			    icon);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "height_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (height_changed),</div><div class='del'>-			    icon);</div><div class='del'>-</div><div class='del'>-	return icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Icon *</div><div class='del'>-icon_new (Eil *eil, const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	GdkPixbuf *im;</div><div class='del'>-	Icon *retval;</div><div class='del'>-</div><div class='del'>-	if (icon_filename) {</div><div class='del'>-		im = gdk_pixbuf_new_from_file (icon_filename);</div><div class='del'>-</div><div class='del'>-		/* Bad icon image </div><div class='del'>-		   Fixme. Need a better graphic. */</div><div class='del'>-		if (im == NULL)</div><div class='del'>-			im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); </div><div class='del'>-	} else</div><div class='del'>-		im = NULL;</div><div class='del'>-</div><div class='del'>-	retval = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-</div><div class='del'>-	if(im)</div><div class='del'>-		gdk_pixbuf_unref(im);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-icon_list_append (Eil *eil, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int pos;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	pos = priv-&gt;icons++;</div><div class='del'>-	g_array_append_val(priv-&gt;icon_list, icon);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		e_icon_list_select_icon (eil, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: this should only layout the last line */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;icons - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_list_insert (Eil *eil, int pos, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (pos == priv-&gt;icons) {</div><div class='del'>-		icon_list_append (eil, icon);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_insert_val(priv-&gt;icon_list, pos, icon);</div><div class='del'>-	priv-&gt;icons++;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		e_icon_list_select_icon (eil, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: this should only layout the lines from then one</div><div class='del'>-		 * containing the Icon to the end.</div><div class='del'>-		 */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	sync_selection (eil, pos, SYNC_INSERT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_insert_pixbuf:</div><div class='del'>- * @eil:      An icon list.</div><div class='del'>- * @pos:      Position at which the new icon should be inserted.</div><div class='del'>- * @im:       Pixbuf image with the icon image.</div><div class='del'>- * @filename: Filename of the image file.</div><div class='del'>- * @text:     Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Inserts an icon in the specified icon list.  The icon is created from the</div><div class='del'>- * specified Imlib image, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_insert_pixbuf (EIconList *eil, int pos, GdkPixbuf *im,</div><div class='del'>-			       const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-	icon_list_insert (eil, pos, icon);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_insert:</div><div class='del'>- * @eil:           An icon list.</div><div class='del'>- * @pos:           Position at which the new icon should be inserted.</div><div class='del'>- * @icon_filename: Name of the file that holds the icon's image.</div><div class='del'>- * @text:          Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Inserts an icon in the specified icon list.  The icon's image is loaded</div><div class='del'>- * from the specified file, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_insert (EIconList *eil, int pos, const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	icon = icon_new (eil, icon_filename, text);</div><div class='del'>-	icon_list_insert (eil, pos, icon);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_append_pixbuf:</div><div class='del'>- * @eil:      An icon list.</div><div class='del'>- * @im:       Pixbuf image with the icon image.</div><div class='del'>- * @filename: Filename of the image file.</div><div class='del'>- * @text:     Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Appends an icon to the specified icon list.  The icon is created from</div><div class='del'>- * the specified Imlib image.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_append_pixbuf (EIconList *eil, GdkPixbuf *im,</div><div class='del'>-			       const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-	return icon_list_append (eil, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_append:</div><div class='del'>- * @eil:           An icon list.</div><div class='del'>- * @icon_filename: Name of the file that holds the icon's image.</div><div class='del'>- * @text:          Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Appends an icon to the specified icon list.  The icon's image is loaded from</div><div class='del'>- * the specified file, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_append (EIconList *eil, const char *icon_filename,</div><div class='del'>-			const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	icon = icon_new (eil, icon_filename, text);</div><div class='del'>-	return icon_list_append (eil, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_destroy (Icon *icon)</div><div class='del'>-{</div><div class='del'>-	if (icon-&gt;destroy)</div><div class='del'>-		(* icon-&gt;destroy) (icon-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_free (icon-&gt;icon_filename);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (icon-&gt;image));</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (icon-&gt;text));</div><div class='del'>-	g_free (icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_remove:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon that should be removed.</div><div class='del'>- *</div><div class='del'>- * Removes the icon at index position @pos.  If a destroy handler was specified</div><div class='del'>- * for that icon, it will be called with the appropriate data.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_remove (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int was_selected;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	was_selected = FALSE;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index(priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-</div><div class='del'>-	if (icon-&gt;selected) {</div><div class='del'>-		was_selected = TRUE;</div><div class='del'>-</div><div class='del'>-		switch (priv-&gt;selection_mode) {</div><div class='del'>-		case GTK_SELECTION_SINGLE:</div><div class='del'>-		case GTK_SELECTION_BROWSE:</div><div class='del'>-		case GTK_SELECTION_MULTIPLE:</div><div class='del'>-		case GTK_SELECTION_EXTENDED:</div><div class='del'>-			e_icon_list_unselect_icon (eil, pos);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_remove_index(priv-&gt;icon_list, pos);</div><div class='del'>-	priv-&gt;icons--;</div><div class='del'>-</div><div class='del'>-	sync_selection (eil, pos, SYNC_REMOVE);</div><div class='del'>-</div><div class='del'>-	if (was_selected) {</div><div class='del'>-		switch (priv-&gt;selection_mode) {</div><div class='del'>-		case GTK_SELECTION_BROWSE:</div><div class='del'>-			if (pos == priv-&gt;icons)</div><div class='del'>-				e_icon_list_select_icon (eil, pos - 1);</div><div class='del'>-			else</div><div class='del'>-				e_icon_list_select_icon (eil, pos);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icons &gt;= priv-&gt;last_selected_idx)</div><div class='del'>-		priv-&gt;last_selected_idx = -1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;last_selected_icon == icon)</div><div class='del'>-		priv-&gt;last_selected_icon = NULL;</div><div class='del'>-</div><div class='del'>-	icon_destroy (icon);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: Optimize, only re-layout from pos to end */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_clear:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Clears the contents for the icon list by removing all the icons.  If destroy</div><div class='del'>- * handlers were specified for any of the icons, they will be called with the</div><div class='del'>- * appropriate data.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_clear (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++)</div><div class='del'>-		icon_destroy (g_array_index (priv-&gt;icon_list, Icon*, i));</div><div class='del'>-</div><div class='del'>-	eil_free_line_info (eil);</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;selection);</div><div class='del'>-	priv-&gt;selection = NULL;</div><div class='del'>-	g_array_set_size(priv-&gt;icon_list, 0);</div><div class='del'>-	priv-&gt;icons = 0;</div><div class='del'>-	priv-&gt;last_selected_idx = -1;</div><div class='del'>-	priv-&gt;last_selected_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	/* remember, destroy can be run multiple times! */</div><div class='del'>-</div><div class='del'>-	eil = EIL (object);</div><div class='del'>-</div><div class='del'>-	g_free (eil-&gt;_priv-&gt;separators);</div><div class='del'>-	eil-&gt;_priv-&gt;separators = NULL;</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen = 1;</div><div class='del'>-	eil-&gt;_priv-&gt;dirty  = TRUE;</div><div class='del'>-	if(eil-&gt;_priv-&gt;icon_list) {</div><div class='del'>-		e_icon_list_clear (eil);</div><div class='del'>-		g_array_free(eil-&gt;_priv-&gt;icon_list, TRUE);</div><div class='del'>-	}</div><div class='del'>-	eil-&gt;_priv-&gt;icon_list = NULL;</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (eil-&gt;_priv-&gt;timer_tag);</div><div class='del'>-		eil-&gt;_priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	eil = EIL (object);</div><div class='del'>-</div><div class='del'>-	g_free (eil-&gt;_priv);</div><div class='del'>-	eil-&gt;_priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;finalize) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_icon (Eil *eil, int pos, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	gint i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-			icon = g_array_index (priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-			if (i != pos &amp;&amp; icon-&gt;selected)</div><div class='del'>-				emit_select (eil, FALSE, i, event);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		emit_select (eil, TRUE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_select_icon:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon to be selected.</div><div class='del'>- *</div><div class='del'>- * Selects the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_select_icon (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	select_icon (eil, pos, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unselect_icon (Eil *eil, int pos, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		emit_select (eil, FALSE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_unselect_icon:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon to be unselected.</div><div class='del'>- *</div><div class='del'>- * Unselects the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_unselect_icon (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	unselect_icon (eil, pos, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_size_request (GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	requisition-&gt;width = 1;</div><div class='del'>-	requisition-&gt;height = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;frozen++;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;realize) (widget);</div><div class='del'>-</div><div class='del'>-	priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	/* Change the style to use the base color as the background */</div><div class='del'>-</div><div class='del'>-	style = gtk_style_copy (gtk_widget_get_style (widget));</div><div class='del'>-	style-&gt;bg[GTK_STATE_NORMAL] = style-&gt;base[GTK_STATE_NORMAL];</div><div class='del'>-	gtk_widget_set_style (widget, style);</div><div class='del'>-</div><div class='del'>-	gdk_window_set_background (GTK_LAYOUT (eil)-&gt;bin_window,</div><div class='del'>-				   &amp;widget-&gt;style-&gt;bg[GTK_STATE_NORMAL]);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;dirty) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_select_icon (Eil *eil, gint num, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (num &gt;= 0 &amp;&amp; num &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (priv-&gt;icon_list, Icon*, num);</div><div class='del'>-</div><div class='del'>-	if (icon-&gt;selected)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icon-&gt;selected = TRUE;</div><div class='del'>-	gnome_icon_text_item_select (icon-&gt;text, TRUE);</div><div class='del'>-	priv-&gt;selection = g_list_append (priv-&gt;selection, GINT_TO_POINTER (num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_unselect_icon (Eil *eil, gint num, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (num &gt;= 0 &amp;&amp; num &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (priv-&gt;icon_list, Icon*, num);</div><div class='del'>-</div><div class='del'>-	if (!icon-&gt;selected)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icon-&gt;selected = FALSE;</div><div class='del'>-	gnome_icon_text_item_select (icon-&gt;text, FALSE);</div><div class='del'>-	priv-&gt;selection = g_list_remove (priv-&gt;selection, GINT_TO_POINTER (num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the selection of the icon list to temporary storage */</div><div class='del'>-static void</div><div class='del'>-store_temp_selection (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		icon-&gt;tmp_selected = icon-&gt;selected;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define gray50_width 2</div><div class='del'>-#define gray50_height 2</div><div class='del'>-static const char gray50_bits[] = {</div><div class='del'>-  0x02, 0x01, };</div><div class='del'>-</div><div class='del'>-/* Button press handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_button_press (GtkWidget *widget, GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int only_one;</div><div class='del'>-	GdkBitmap *stipple;</div><div class='del'>-	double tx, ty;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	/* Invoke the canvas event handler and see if an item picks up the event */</div><div class='del'>-</div><div class='del'>-	if ((* GTK_WIDGET_CLASS (parent_class)-&gt;button_press_event) (widget, event))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (!(event-&gt;type == GDK_BUTTON_PRESS</div><div class='del'>-	      &amp;&amp; event-&gt;button == 1</div><div class='del'>-	      &amp;&amp; priv-&gt;selection_mode != GTK_SELECTION_BROWSE))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	only_one = priv-&gt;selection_mode == GTK_SELECTION_SINGLE;</div><div class='del'>-</div><div class='del'>-	if (only_one || (event-&gt;state &amp; (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0)</div><div class='del'>-		eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (only_one)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;selecting)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;tx, &amp;ty);</div><div class='del'>-	priv-&gt;sel_start_x = tx;</div><div class='del'>-	priv-&gt;sel_start_y = ty;</div><div class='del'>-	priv-&gt;sel_state = event-&gt;state;</div><div class='del'>-	priv-&gt;selecting = TRUE;</div><div class='del'>-</div><div class='del'>-	store_temp_selection (eil);</div><div class='del'>-</div><div class='del'>-	stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);</div><div class='del'>-	priv-&gt;sel_rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (eil)),</div><div class='del'>-						gnome_canvas_rect_get_type (),</div><div class='del'>-						"x1", tx,</div><div class='del'>-						"y1", ty,</div><div class='del'>-						"x2", tx,</div><div class='del'>-						"y2", ty,</div><div class='del'>-						"outline_color", "black",</div><div class='del'>-						"width_pixels", 1,</div><div class='del'>-						"outline_stipple", stipple,</div><div class='del'>-						NULL);</div><div class='del'>-	gdk_bitmap_unref (stipple);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_grab (priv-&gt;sel_rect, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				NULL, event-&gt;time);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified icon is at least partially inside the specified</div><div class='del'>- * rectangle.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-icon_is_in_area (Icon *icon, int x1, int y1, int x2, int y2)</div><div class='del'>-{</div><div class='del'>-	double ix1, iy1, ix2, iy2;</div><div class='del'>-</div><div class='del'>-	if (x1 == x2 &amp;&amp; y1 == y2)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon-&gt;image), &amp;ix1, &amp;iy1, &amp;ix2, &amp;iy2);</div><div class='del'>-</div><div class='del'>-	if (ix1 &lt;= x2 &amp;&amp; iy1 &lt;= y2 &amp;&amp; ix2 &gt;= x1 &amp;&amp; iy2 &gt;= y1)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon-&gt;text), &amp;ix1, &amp;iy1, &amp;ix2, &amp;iy2);</div><div class='del'>-</div><div class='del'>-	if (ix1 &lt;= x2 &amp;&amp; iy1 &lt;= y2 &amp;&amp; ix2 &gt;= x1 &amp;&amp; iy2 &gt;= y1)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Updates the rubberband selection to the specified point */</div><div class='del'>-static void</div><div class='del'>-update_drag_selection (Eil *eil, int x, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int x1, x2, y1, y2;</div><div class='del'>-	int i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-	int additive, invert;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	/* Update rubberband */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sel_start_x &lt; x) {</div><div class='del'>-		x1 = priv-&gt;sel_start_x;</div><div class='del'>-		x2 = x;</div><div class='del'>-	} else {</div><div class='del'>-		x1 = x;</div><div class='del'>-		x2 = priv-&gt;sel_start_x;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sel_start_y &lt; y) {</div><div class='del'>-		y1 = priv-&gt;sel_start_y;</div><div class='del'>-		y2 = y;</div><div class='del'>-	} else {</div><div class='del'>-		y1 = y;</div><div class='del'>-		y2 = priv-&gt;sel_start_y;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (x1 &lt; 0)</div><div class='del'>-		x1 = 0;</div><div class='del'>-</div><div class='del'>-	if (y1 &lt; 0)</div><div class='del'>-		y1 = 0;</div><div class='del'>-</div><div class='del'>-	if (x2 &gt;= GTK_WIDGET (eil)-&gt;allocation.width)</div><div class='del'>-		x2 = GTK_WIDGET (eil)-&gt;allocation.width - 1;</div><div class='del'>-</div><div class='del'>-	if (y2 &gt;= priv-&gt;total_height)</div><div class='del'>-		y2 = priv-&gt;total_height - 1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (priv-&gt;sel_rect,</div><div class='del'>-			       "x1", (double) x1,</div><div class='del'>-			       "y1", (double) y1,</div><div class='del'>-			       "x2", (double) x2,</div><div class='del'>-			       "y2", (double) y2,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Select or unselect icons as appropriate */</div><div class='del'>-</div><div class='del'>-	additive = priv-&gt;sel_state &amp; GDK_SHIFT_MASK;</div><div class='del'>-	invert = priv-&gt;sel_state &amp; GDK_CONTROL_MASK;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		if (icon_is_in_area (icon, x1, y1, x2, y2)) {</div><div class='del'>-			if (invert) {</div><div class='del'>-				if (icon-&gt;selected == icon-&gt;tmp_selected)</div><div class='del'>-					emit_select (eil, !icon-&gt;selected, i, NULL);</div><div class='del'>-			} else if (additive) {</div><div class='del'>-				if (!icon-&gt;selected)</div><div class='del'>-					emit_select (eil, TRUE, i, NULL);</div><div class='del'>-			} else {</div><div class='del'>-				if (!icon-&gt;selected)</div><div class='del'>-					emit_select (eil, TRUE, i, NULL);</div><div class='del'>-			}</div><div class='del'>-		} else if (icon-&gt;selected != icon-&gt;tmp_selected)</div><div class='del'>-			emit_select (eil, icon-&gt;tmp_selected, i, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Button release handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_button_release (GtkWidget *widget, GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;selecting)</div><div class='del'>-		return (* GTK_WIDGET_CLASS (parent_class)-&gt;button_release_event) (widget, event);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button != 1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-	gnome_canvas_item_ungrab (priv-&gt;sel_rect, event-&gt;time);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (priv-&gt;sel_rect));</div><div class='del'>-	priv-&gt;sel_rect = NULL;</div><div class='del'>-	priv-&gt;selecting = FALSE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (priv-&gt;timer_tag);</div><div class='del'>-		priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Autoscroll timeout handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-scroll_timeout (gpointer data)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	double x, y;</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	eil = data;</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	value = adj-&gt;value + priv-&gt;value_diff;</div><div class='del'>-	if (value &gt; adj-&gt;upper - adj-&gt;page_size)</div><div class='del'>-		value = adj-&gt;upper - adj-&gt;page_size;</div><div class='del'>-</div><div class='del'>-	gtk_adjustment_set_value (adj, value);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil),</div><div class='del'>-				      priv-&gt;event_last_x, priv-&gt;event_last_y,</div><div class='del'>-				      &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE();</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Motion event handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_motion_notify (GtkWidget *widget, GdkEventMotion *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;selecting)</div><div class='del'>-		return (* GTK_WIDGET_CLASS (parent_class)-&gt;motion_notify_event) (widget, event);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-</div><div class='del'>-	/* If we are out of bounds, schedule a timeout that will do the scrolling */</div><div class='del'>-</div><div class='del'>-	if (event-&gt;y &lt; 0 || event-&gt;y &gt; widget-&gt;allocation.height) {</div><div class='del'>-		if (priv-&gt;timer_tag == 0)</div><div class='del'>-			priv-&gt;timer_tag = gtk_timeout_add (SCROLL_TIMEOUT, scroll_timeout, eil);</div><div class='del'>-</div><div class='del'>-		if (event-&gt;y &lt; 0)</div><div class='del'>-			priv-&gt;value_diff = event-&gt;y;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;value_diff = event-&gt;y - widget-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-		priv-&gt;event_last_x = event-&gt;x;</div><div class='del'>-		priv-&gt;event_last_y = event-&gt;y;</div><div class='del'>-</div><div class='del'>-		/* Make the steppings be relative to the mouse distance from the</div><div class='del'>-		 * canvas.  Also notice the timeout above is small to give a</div><div class='del'>-		 * more smooth movement.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;value_diff /= 5;</div><div class='del'>-	} else if (priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (priv-&gt;timer_tag);</div><div class='del'>-		priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*xGtkSignal_BOOL__INT_POINTER) (GtkObject * object,</div><div class='del'>-						  gint     arg1,</div><div class='del'>-						  gpointer arg2,</div><div class='del'>-						  gpointer user_data);</div><div class='del'>-static void</div><div class='del'>-xgtk_marshal_BOOL__INT_POINTER (GtkObject *object, GtkSignalFunc func, gpointer func_data,</div><div class='del'>-				GtkArg *args)</div><div class='del'>-{</div><div class='del'>-  xGtkSignal_BOOL__INT_POINTER rfunc;</div><div class='del'>-  gboolean *return_val;</div><div class='del'>-</div><div class='del'>-  return_val = GTK_RETLOC_BOOL (args[2]);</div><div class='del'>-  rfunc = (xGtkSignal_BOOL__INT_POINTER) func;</div><div class='del'>-  *return_val = (*rfunc) (object,</div><div class='del'>-			  GTK_VALUE_INT (args[0]),</div><div class='del'>-			  GTK_VALUE_POINTER (args[1]),</div><div class='del'>-			  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EIconList *eil;</div><div class='del'>-</div><div class='del'>-	eil = E_ICON_LIST (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EIconList *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	eil = E_ICON_LIST (object);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_class_init (EilClass *eil_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	GtkLayoutClass *layout_class;</div><div class='del'>-	GnomeCanvasClass *canvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *)   eil_class;</div><div class='del'>-	widget_class = (GtkWidgetClass *)   eil_class;</div><div class='del'>-	layout_class = (GtkLayoutClass *)   eil_class;</div><div class='del'>-	canvas_class = (GnomeCanvasClass *) eil_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	eil_signals[SELECT_ICON] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"select_icon",</div><div class='del'>-			GTK_RUN_FIRST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, select_icon),</div><div class='del'>-			gtk_marshal_NONE__INT_POINTER,</div><div class='del'>-			GTK_TYPE_NONE, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	eil_signals[UNSELECT_ICON] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"unselect_icon",</div><div class='del'>-			GTK_RUN_FIRST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, unselect_icon),</div><div class='del'>-			gtk_marshal_NONE__INT_POINTER,</div><div class='del'>-			GTK_TYPE_NONE, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	eil_signals[TEXT_CHANGED] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"text_changed",</div><div class='del'>-			GTK_RUN_LAST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, text_changed),</div><div class='del'>-			xgtk_marshal_BOOL__INT_POINTER,</div><div class='del'>-			GTK_TYPE_BOOL, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, eil_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = eil_destroy;</div><div class='del'>-	object_class-&gt;finalize = eil_finalize;</div><div class='del'>-	object_class-&gt;set_arg = eil_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = eil_get_arg;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;size_request = eil_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = eil_size_allocate;</div><div class='del'>-	widget_class-&gt;realize = eil_realize;</div><div class='del'>-	widget_class-&gt;button_press_event = eil_button_press;</div><div class='del'>-	widget_class-&gt;button_release_event = eil_button_release;</div><div class='del'>-	widget_class-&gt;motion_notify_event = eil_motion_notify;</div><div class='del'>-</div><div class='del'>-	eil_class-&gt;select_icon = real_select_icon;</div><div class='del'>-	eil_class-&gt;unselect_icon = real_unselect_icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_init (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	eil-&gt;_priv = g_new0 (EIconListPrivate, 1);</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;icon_list = g_array_new(FALSE, FALSE, sizeof(gpointer));</div><div class='del'>-	eil-&gt;_priv-&gt;row_spacing = DEFAULT_ROW_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;col_spacing = DEFAULT_COL_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;text_spacing = DEFAULT_TEXT_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;icon_border = DEFAULT_ICON_BORDER;</div><div class='del'>-	eil-&gt;_priv-&gt;separators = g_strdup (" ");</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;selection_mode = GTK_SELECTION_SINGLE;</div><div class='del'>-	eil-&gt;_priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil), 0.0, 0.0, 1000000.0, 1000000.0);</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (eil), 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the &amp;EIconList class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Returns: The type ID of the &amp;EIconList class.</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_icon_list_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint eil_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!eil_type) {</div><div class='del'>-		GtkTypeInfo eil_info = {</div><div class='del'>-			"EIconList",</div><div class='del'>-			sizeof (EIconList),</div><div class='del'>-			sizeof (EIconListClass),</div><div class='del'>-			(GtkClassInitFunc) eil_class_init,</div><div class='del'>-			(GtkObjectInitFunc) eil_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eil_type = gtk_type_unique (gnome_canvas_get_type (),</div><div class='del'>-					    &amp;eil_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return eil_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_width:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @w:   New width for the icon columns.</div><div class='del'>- *</div><div class='del'>- * Sets the amount of horizontal space allocated to the icons, i.e. the column</div><div class='del'>- * width of the icon list.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_width (EIconList *eil, int w)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;icon_width  = w;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_construct:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @icon_width: Width for the icon columns.</div><div class='del'>- * @flags: A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.</div><div class='del'>- *</div><div class='del'>- * Constructor for the icon list, to be used by derived classes.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_icon_list_construct (EIconList *eil, guint icon_width, int flags)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	e_icon_list_set_icon_width (eil, icon_width);</div><div class='del'>-	priv-&gt;is_editable = (flags &amp; E_ICON_LIST_IS_EDITABLE) != 0;</div><div class='del'>-	priv-&gt;static_text = (flags &amp; E_ICON_LIST_STATIC_TEXT) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_new: [constructor]</div><div class='del'>- * @icon_width: Width for the icon columns.</div><div class='del'>- * @flags:      A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.</div><div class='del'>- *</div><div class='del'>- * Creates a new icon list widget.  The icon columns are allocated a width of</div><div class='del'>- * @icon_width pixels.  Icon captions will be word-wrapped to this width as</div><div class='del'>- * well.</div><div class='del'>- *</div><div class='del'>- * If @flags has the %E_ICON_LIST_IS_EDITABLE flag set, then the user will be</div><div class='del'>- * able to edit the text in the icon captions, and the "text_changed" signal</div><div class='del'>- * will be emitted when an icon's text is changed.</div><div class='del'>- *</div><div class='del'>- * If @flags has the %E_ICON_LIST_STATIC_TEXT flags set, then the text</div><div class='del'>- * for the icon captions will not be copied inside the icon list; it will only</div><div class='del'>- * store the pointers to the original text strings specified by the application.</div><div class='del'>- * This is intended to save memory.  If this flag is not set, then the text</div><div class='del'>- * strings will be copied and managed internally.</div><div class='del'>- *</div><div class='del'>- * Returns: a newly-created icon list widget</div><div class='del'>- */</div><div class='del'>-GtkWidget *</div><div class='del'>-e_icon_list_new (guint icon_width, int flags)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-	eil = EIL (gtk_type_new (e_icon_list_get_type ()));</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-</div><div class='del'>-	e_icon_list_construct (eil, icon_width, flags);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_freeze:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- *</div><div class='del'>- * Freezes an icon list so that any changes made to it will not be</div><div class='del'>- * reflected on the screen until it is thawed with e_icon_list_thaw().</div><div class='del'>- * It is recommended to freeze the icon list before inserting or deleting</div><div class='del'>- * many icons, for example, so that the layout process will only be executed</div><div class='del'>- * once, when the icon list is finally thawed.</div><div class='del'>- *</div><div class='del'>- * You can call this function multiple times, but it must be balanced with the</div><div class='del'>- * same number of calls to e_icon_list_thaw() before the changes will take</div><div class='del'>- * effect.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_freeze (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen++;</div><div class='del'>-</div><div class='del'>-	/* We hide the root so that the user will not see any changes while the</div><div class='del'>-	 * icon list is doing stuff.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;frozen == 1)</div><div class='del'>-		gnome_canvas_item_hide (GNOME_CANVAS (eil)-&gt;root);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_thaw:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- *</div><div class='del'>- * Thaws the icon list and performs any pending layout operations.  This</div><div class='del'>- * is to be used in conjunction with e_icon_list_freeze().</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_thaw (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (eil-&gt;_priv-&gt;frozen &gt; 0);</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;dirty) {</div><div class='del'>-                eil_layout_all_icons (eil);</div><div class='del'>-                eil_scrollbar_adjust (eil);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;frozen == 0)</div><div class='del'>-		gnome_canvas_item_show (GNOME_CANVAS (eil)-&gt;root);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_selection_mode</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- * @mode: New selection mode.</div><div class='del'>- *</div><div class='del'>- * Sets the selection mode for an icon list.  The %GTK_SELECTION_MULTIPLE and</div><div class='del'>- * %GTK_SELECTION_EXTENDED modes are considered equivalent.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_selection_mode (EIconList *eil, GtkSelectionMode mode)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;selection_mode = mode;</div><div class='del'>-	eil-&gt;_priv-&gt;last_selected_idx = -1;</div><div class='del'>-	eil-&gt;_priv-&gt;last_selected_icon = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_data_full:</div><div class='del'>- * @eil:     An icon list.</div><div class='del'>- * @pos:     Index of an icon.</div><div class='del'>- * @data:    User data to set on the icon.</div><div class='del'>- * @destroy: Destroy notification handler for the icon.</div><div class='del'>- *</div><div class='del'>- * Associates the @data pointer to the icon at the index specified by @pos.  The</div><div class='del'>- * @destroy argument points to a function that will be called when the icon is</div><div class='del'>- * destroyed, or NULL if no function is to be called when this happens.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_data_full (EIconList *eil,</div><div class='del'>-				    int pos, gpointer data,</div><div class='del'>-				    GtkDestroyNotify destroy)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-	icon-&gt;data = data;</div><div class='del'>-	icon-&gt;destroy = destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_data:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- * @pos:  Index of an icon.</div><div class='del'>- * @data: User data to set on the icon.</div><div class='del'>- *</div><div class='del'>- * Associates the @data pointer to the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_data (EIconList *eil, int pos, gpointer data)</div><div class='del'>-{</div><div class='del'>-	e_icon_list_set_icon_data_full (eil, pos, data, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_data:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the user data pointer associated to the icon at the index specified</div><div class='del'>- * by @pos.</div><div class='del'>- */</div><div class='del'>-gpointer</div><div class='del'>-e_icon_list_get_icon_data (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), NULL);</div><div class='del'>-	g_return_val_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons, NULL);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-	return icon-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_find_icon_from_data:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @data:   Data pointer associated to an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon whose user data has been set to @data,</div><div class='del'>- * or -1 if no icon has this data associated to it.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_find_icon_from_data (EIconList *eil, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		if (icon-&gt;data == data)</div><div class='del'>-			return n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets an integer value in the private structure of the icon list, and updates it */</div><div class='del'>-static void</div><div class='del'>-set_value (EIconList *eil, EIconListPrivate *priv, int *dest, int val)</div><div class='del'>-{</div><div class='del'>-	if (val == *dest)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*dest = val;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_row_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels for inter-row spacing.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between rows of icons.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_row_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;row_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_col_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels for inter-column spacing.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between columns of icons.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_col_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;col_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_text_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels between an icon's image and its caption.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between an icon's image and its text caption.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_text_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;text_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_border:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of border pixels to be used around an icon's image.</div><div class='del'>- *</div><div class='del'>- * Sets the width of the border to be displayed around an icon's image.  This is</div><div class='del'>- * currently not implemented.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_border (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;icon_border, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_separators:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @sep: String with characters to be used as word separators.</div><div class='del'>- *</div><div class='del'>- * Sets the characters that can be used as word separators when doing</div><div class='del'>- * word-wrapping in the icon text captions.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_separators (EIconList *eil, const char *sep)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (sep != NULL);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;separators)</div><div class='del'>-		g_free (priv-&gt;separators);</div><div class='del'>-</div><div class='del'>-	priv-&gt;separators = g_strdup (sep);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_moveto:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pos:    Index of an icon.</div><div class='del'>- * @yalign: Vertical alignment of the icon.</div><div class='del'>- *</div><div class='del'>- * Makes the icon whose index is @pos be visible on the screen.  The icon list</div><div class='del'>- * gets scrolled so that the icon is visible.  An alignment of 0.0 represents</div><div class='del'>- * the top of the visible part of the icon list, and 1.0 represents the bottom.</div><div class='del'>- * An icon can be centered on the icon list.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_moveto (EIconList *eil, int pos, double yalign)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	IconLine *il;</div><div class='del'>-	GList *l;</div><div class='del'>-	int i, y, uh, line;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-	g_return_if_fail (yalign &gt;= 0.0 &amp;&amp; yalign &lt;= 1.0);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;lines != NULL);</div><div class='del'>-</div><div class='del'>-	line = pos / eil_get_items_per_line (eil);</div><div class='del'>-</div><div class='del'>-	y = 0;</div><div class='del'>-	for (i = 0, l = priv-&gt;lines; l &amp;&amp; i &lt; line; l = l-&gt;next, i++) {</div><div class='del'>-		il = l-&gt;data;</div><div class='del'>-		y += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-	uh = GTK_WIDGET (eil)-&gt;allocation.height - icon_line_height (eil,il);</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-	gtk_adjustment_set_value (adj, y - uh * yalign);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_is_visible:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns whether the icon at the index specified by @pos is visible.  This</div><div class='del'>- * will be %GTK_VISIBILITY_NONE if the icon is not visible at all,</div><div class='del'>- * %GTK_VISIBILITY_PARTIAL if the icon is at least partially shown, and</div><div class='del'>- * %GTK_VISIBILITY_FULL if the icon is fully visible.</div><div class='del'>- */</div><div class='del'>-GtkVisibility</div><div class='del'>-e_icon_list_icon_is_visible (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	IconLine *il;</div><div class='del'>-	GList *l;</div><div class='del'>-	int line, y1, y2, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, GTK_VISIBILITY_NONE);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), GTK_VISIBILITY_NONE);</div><div class='del'>-	g_return_val_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons,</div><div class='del'>-			      GTK_VISIBILITY_NONE);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;lines == NULL)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	line = pos / eil_get_items_per_line (eil);</div><div class='del'>-	y1 = 0;</div><div class='del'>-	for (i = 0, l = priv-&gt;lines; l &amp;&amp; i &lt; line; l = l-&gt;next, i++) {</div><div class='del'>-		il = l-&gt;data;</div><div class='del'>-		y1 += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	y2 = y1 + icon_line_height (eil, (IconLine *) l-&gt;data);</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	if (y2 &lt; adj-&gt;value)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	if (y1 &gt; adj-&gt;value + GTK_WIDGET (eil)-&gt;allocation.height)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	if (y2 &lt;= adj-&gt;value + GTK_WIDGET (eil)-&gt;allocation.height &amp;&amp;</div><div class='del'>-	    y1 &gt;= adj-&gt;value)</div><div class='del'>-		return GTK_VISIBILITY_FULL;</div><div class='del'>-</div><div class='del'>-	return GTK_VISIBILITY_PARTIAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_at:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @x:   X position in the icon list window.</div><div class='del'>- * @y:   Y position in the icon list window.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon that is under the specified coordinates, which</div><div class='del'>- * are relative to the icon list's window.  If there is no icon in that</div><div class='del'>- * position, -1 is returned.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_get_icon_at (EIconList *eil, int x, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double wx, wy;</div><div class='del'>-	double dx, dy;</div><div class='del'>-	int cx, cy;</div><div class='del'>-	int n;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	double dist;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	dx = x;</div><div class='del'>-	dy = y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), dx, dy, &amp;wx, &amp;wy);</div><div class='del'>-	gnome_canvas_w2c (GNOME_CANVAS (eil), wx, wy, &amp;cx, &amp;cy);</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		Icon *icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		GnomeCanvasItem *image = GNOME_CANVAS_ITEM (icon-&gt;image);</div><div class='del'>-		GnomeCanvasItem *text = GNOME_CANVAS_ITEM (icon-&gt;text);</div><div class='del'>-</div><div class='del'>-		if (wx &gt;= image-&gt;x1 &amp;&amp; wx &lt;= image-&gt;x2 &amp;&amp; wy &gt;= image-&gt;y1 &amp;&amp; wy &lt;= image-&gt;y2) {</div><div class='del'>-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (image)-&gt;klass)-&gt;point) (</div><div class='del'>-				image,</div><div class='del'>-				wx, wy,</div><div class='del'>-				cx, cy,</div><div class='del'>-				&amp;item);</div><div class='del'>-</div><div class='del'>-			if ((int) (dist * GNOME_CANVAS (eil)-&gt;pixels_per_unit + 0.5)</div><div class='del'>-			    &lt;= GNOME_CANVAS (eil)-&gt;close_enough)</div><div class='del'>-				return n;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wx &gt;= text-&gt;x1 &amp;&amp; wx &lt;= text-&gt;x2 &amp;&amp; wy &gt;= text-&gt;y1 &amp;&amp; wy &lt;= text-&gt;y2) {</div><div class='del'>-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (text)-&gt;klass)-&gt;point) (</div><div class='del'>-				text,</div><div class='del'>-				wx, wy,</div><div class='del'>-				cx, cy,</div><div class='del'>-				&amp;item);</div><div class='del'>-</div><div class='del'>-			if ((int) (dist * GNOME_CANVAS (eil)-&gt;pixels_per_unit + 0.5)</div><div class='del'>-			    &lt;= GNOME_CANVAS (eil)-&gt;close_enough)</div><div class='del'>-				return n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_num_icons:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns the number of icons in the icon list.</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_icon_list_get_num_icons (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_ICON_LIST (eil), 0);</div><div class='del'>-</div><div class='del'>-	return eil-&gt;_priv-&gt;icons;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_selection:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns a list of integers with the indices of the currently selected icons.</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-e_icon_list_get_selection (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_ICON_LIST (eil), NULL);</div><div class='del'>-</div><div class='del'>-	return eil-&gt;_priv-&gt;selection;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_selection:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @idx: Index of an @icon.</div><div class='del'>- *</div><div class='del'>- * Returns the filename of the icon with index @idx.</div><div class='del'>- */</div><div class='del'>-gchar *</div><div class='del'>-e_icon_list_get_icon_filename (EIconList *eil, int idx)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), NULL);</div><div class='del'>-	g_return_val_if_fail (idx &gt;= 0 &amp;&amp; idx &lt; eil-&gt;_priv-&gt;icons, NULL);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, idx);</div><div class='del'>-	return icon-&gt;icon_filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_find_icon_from_filename:</div><div class='del'>- * @eil:       An icon list.</div><div class='del'>- * @filename:  Filename of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon whose filename is @filename or -1 if</div><div class='del'>- * there is no icon with this filename.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_find_icon_from_filename (EIconList *eil,</div><div class='del'>-				     const gchar *filename)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-	g_return_val_if_fail (filename != NULL, -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		if (!strcmp (icon-&gt;icon_filename, filename))</div><div class='del'>-			return n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h<br/>deleted file mode 100644<br/>index 7cdaf6e85f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-icon-list.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-icon-list.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1998, 1999 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Red Hat, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This file is part of the Gnome Library.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with the Gnome Library; see the file COPYING.LIB.  If not,</div><div class='del'>- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>-  @NOTATION@</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* GnomeIconList widget - scrollable icon list</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Federico Mena   &lt;federico@ximian.com&gt;</div><div class='del'>- *   Miguel de Icaza &lt;miguel@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_ICON_LIST_H_</div><div class='del'>-#define _E_ICON_LIST_H_</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_TYPE_ICON_LIST            (e_icon_list_get_type ())</div><div class='del'>-#define E_ICON_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList))</div><div class='del'>-#define E_ICON_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass))</div><div class='del'>-#define E_IS_ICON_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ICON_LIST))</div><div class='del'>-#define E_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST))</div><div class='del'>-#define E_ICON_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ICON_LIST, EIconListClass))</div><div class='del'>-</div><div class='del'>-typedef struct _EIconList        EIconList;</div><div class='del'>-typedef struct _EIconListPrivate EIconListPrivate;</div><div class='del'>-typedef struct _EIconListClass   EIconListClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_ICON_LIST_ICONS,</div><div class='del'>-	E_ICON_LIST_TEXT_BELOW,</div><div class='del'>-	E_ICON_LIST_TEXT_RIGHT</div><div class='del'>-} EIconListMode;</div><div class='del'>-</div><div class='del'>-/* This structure has been converted to use public and private parts.  To avoid</div><div class='del'>- * breaking binary compatibility, the slots for private fields have been</div><div class='del'>- * replaced with padding.  Please remove these fields when gnome-libs has</div><div class='del'>- * reached another major version and it is "fine" to break binary compatibility.</div><div class='del'>- */</div><div class='del'>-struct _EIconList {</div><div class='del'>-	GnomeCanvas canvas;</div><div class='del'>-</div><div class='del'>-	/*&lt; private &gt;*/</div><div class='del'>-	EIconListPrivate * _priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EIconListClass {</div><div class='del'>-	GnomeCanvasClass parent_class;</div><div class='del'>-</div><div class='del'>-	void     (*select_icon)    (EIconList *gil, gint num, GdkEvent *event);</div><div class='del'>-	void     (*unselect_icon)  (EIconList *gil, gint num, GdkEvent *event);</div><div class='del'>-	gboolean (*text_changed)   (EIconList *gil, gint num, const char *new_text);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_ICON_LIST_IS_EDITABLE	= 1 &lt;&lt; 0,</div><div class='del'>-	E_ICON_LIST_STATIC_TEXT	= 1 &lt;&lt; 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint          e_icon_list_get_type            (void) G_GNUC_CONST;</div><div class='del'>-</div><div class='del'>-GtkWidget     *e_icon_list_new                 (guint         icon_width,</div><div class='del'>-						int           flags);</div><div class='del'>-void           e_icon_list_construct           (EIconList *gil,</div><div class='del'>-						guint icon_width,</div><div class='del'>-						int flags);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* To avoid excesive recomputes during insertion/deletion */</div><div class='del'>-void           e_icon_list_freeze              (EIconList *gil);</div><div class='del'>-void           e_icon_list_thaw                (EIconList *gil);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void           e_icon_list_insert              (EIconList *gil,</div><div class='del'>-						int idx,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-void           e_icon_list_insert_pixbuf       (EIconList *gil,</div><div class='del'>-						int idx,</div><div class='del'>-						GdkPixbuf *im,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_append              (EIconList *gil,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-int            e_icon_list_append_pixbuf       (EIconList *gil,</div><div class='del'>-						GdkPixbuf *im,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-</div><div class='del'>-void           e_icon_list_clear               (EIconList *gil);</div><div class='del'>-void           e_icon_list_remove              (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-guint          e_icon_list_get_num_icons       (EIconList *gil);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Managing the selection */</div><div class='del'>-void           e_icon_list_set_selection_mode  (EIconList *gil,</div><div class='del'>-						GtkSelectionMode mode);</div><div class='del'>-void           e_icon_list_select_icon         (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-void           e_icon_list_unselect_icon       (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-int            e_icon_list_unselect_all        (EIconList *gil);</div><div class='del'>-GList *        e_icon_list_get_selection       (EIconList *gil);</div><div class='del'>-</div><div class='del'>-/* Setting the spacing values */</div><div class='del'>-void           e_icon_list_set_icon_width      (EIconList *gil,</div><div class='del'>-						int w);</div><div class='del'>-void           e_icon_list_set_row_spacing     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_col_spacing     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_text_spacing    (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_icon_border     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_separators      (EIconList *gil,</div><div class='del'>-						const char *sep);</div><div class='del'>-/* Icon filename. */</div><div class='del'>-gchar *        e_icon_list_get_icon_filename   (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-int            e_icon_list_find_icon_from_filename (EIconList *gil,</div><div class='del'>-						    const char *filename);</div><div class='del'>-</div><div class='del'>-/* Attaching information to the icons */</div><div class='del'>-void           e_icon_list_set_icon_data       (EIconList *gil,</div><div class='del'>-						int idx, gpointer data);</div><div class='del'>-void           e_icon_list_set_icon_data_full  (EIconList *gil,</div><div class='del'>-						int idx, gpointer data,</div><div class='del'>-						GtkDestroyNotify destroy);</div><div class='del'>-int            e_icon_list_find_icon_from_data (EIconList *gil,</div><div class='del'>-						gpointer data);</div><div class='del'>-gpointer       e_icon_list_get_icon_data       (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-/* Visibility */</div><div class='del'>-void           e_icon_list_moveto              (EIconList *gil,</div><div class='del'>-						int idx, double yalign);</div><div class='del'>-GtkVisibility  e_icon_list_icon_is_visible     (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_get_icon_at         (EIconList *gil,</div><div class='del'>-						int x, int y);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_get_items_per_line  (EIconList *gil);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _GNOME_ICON_LIST_H_ */</div><div class='head'>diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c<br/>deleted file mode 100644<br/>index 6df2d65485..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-attachment-bar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,825 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer-attachment-bar.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app-helper.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-popup-menu.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-mime-info.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf-loader.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-#include "e-msg-composer-attachment.h"</div><div class='del'>-#include "e-msg-composer-attachment-bar.h"</div><div class='del'>-</div><div class='del'>-#include "e-icon-list.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel-data-wrapper.h"</div><div class='del'>-#include "camel/camel-stream-fs.h"</div><div class='del'>-#include "camel/camel-stream-null.h"</div><div class='del'>-#include "camel/camel-stream-filter.h"</div><div class='del'>-#include "camel/camel-mime-filter-bestenc.h"</div><div class='del'>-#include "camel/camel-mime-part.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define ICON_WIDTH 64</div><div class='del'>-#define ICON_SEPARATORS " /-_"</div><div class='del'>-#define ICON_SPACING 2</div><div class='del'>-#define ICON_ROW_SPACING ICON_SPACING</div><div class='del'>-#define ICON_COL_SPACING ICON_SPACING</div><div class='del'>-#define ICON_BORDER 2</div><div class='del'>-#define ICON_TEXT_SPACING 2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EIconListClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBarPrivate {</div><div class='del'>-	GList *attachments;</div><div class='del'>-	guint num_attachments;</div><div class='del'>-</div><div class='del'>-	GtkWidget *context_menu;</div><div class='del'>-	GtkWidget *icon_context_menu;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void update (EMsgComposerAttachmentBar *bar);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-size_to_string (gulong size)</div><div class='del'>-{</div><div class='del'>-	gchar *size_string;</div><div class='del'>-	</div><div class='del'>-	/* FIXME: The following should probably go into a separate module, as</div><div class='del'>-           we might have to do the same thing in other places as well.  Also,</div><div class='del'>-	   I am not sure this will be OK for all the languages.  */</div><div class='del'>-	</div><div class='del'>-	if (size &lt; 1e3L) {</div><div class='del'>-		if (size == 1)</div><div class='del'>-			size_string = g_strdup (_("1 byte"));</div><div class='del'>-		else</div><div class='del'>-			size_string = g_strdup_printf (_("%u bytes"),</div><div class='del'>-						       (guint) size);</div><div class='del'>-	} else {</div><div class='del'>-		gdouble displayed_size;</div><div class='del'>-		</div><div class='del'>-		if (size &lt; 1e6L) {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e3;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fK"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		} else if (size &lt; 1e9L) {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e6;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fM"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		} else {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e9;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fG"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return size_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Attachment handling functions.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_attachment_list (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	GList *p;</div><div class='del'>-	</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	for (p = priv-&gt;attachments; p != NULL; p = p-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-	</div><div class='del'>-	priv-&gt;attachments = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attachment_changed_cb (EMsgComposerAttachment *attachment,</div><div class='del'>-		       gpointer data)</div><div class='del'>-{</div><div class='del'>-	update (E_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_common (EMsgComposerAttachmentBar *bar,</div><div class='del'>-	    EMsgComposerAttachment *attachment)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (attachment != NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (attachment), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (attachment_changed_cb),</div><div class='del'>-			    bar);</div><div class='del'>-	</div><div class='del'>-	bar-&gt;priv-&gt;attachments = g_list_append (bar-&gt;priv-&gt;attachments,</div><div class='del'>-						attachment);</div><div class='del'>-	bar-&gt;priv-&gt;num_attachments++;</div><div class='del'>-	</div><div class='del'>-	update (bar);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_mime_part (EMsgComposerAttachmentBar *bar,</div><div class='del'>-		    CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	add_common (bar, e_msg_composer_attachment_new_from_mime_part (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_file (EMsgComposerAttachmentBar *bar,</div><div class='del'>-	       const char *file_name,</div><div class='del'>-	       const char *disposition)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	CamelException ex;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	camel_exception_init (&amp;ex);</div><div class='del'>-	attachment = e_msg_composer_attachment_new (file_name, disposition, &amp;ex);</div><div class='del'>-	if (attachment) {</div><div class='del'>-		add_common (bar, attachment);</div><div class='del'>-	} else {</div><div class='del'>-		composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));</div><div class='del'>-		</div><div class='del'>-		dialog = gnome_error_dialog_parented (camel_exception_get_description (&amp;ex),</div><div class='del'>-						      GTK_WINDOW (composer));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_attachment (EMsgComposerAttachmentBar *bar,</div><div class='del'>-		   EMsgComposerAttachment *attachment)</div><div class='del'>-{</div><div class='del'>-	bar-&gt;priv-&gt;attachments = g_list_remove (bar-&gt;priv-&gt;attachments,</div><div class='del'>-						attachment);</div><div class='del'>-	bar-&gt;priv-&gt;num_attachments--;</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (attachment));</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Icon list contents handling.  */</div><div class='del'>-</div><div class='del'>-static GdkPixbuf *</div><div class='del'>-pixbuf_for_mime_type (const char *mime_type)</div><div class='del'>-{</div><div class='del'>-	const char *icon_name;</div><div class='del'>-	char *filename = NULL;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	</div><div class='del'>-	icon_name = gnome_vfs_mime_get_value (mime_type, "icon-filename");</div><div class='del'>-	if (icon_name) {</div><div class='del'>-		if (*icon_name == '/') {</div><div class='del'>-			pixbuf = gdk_pixbuf_new_from_file (icon_name);</div><div class='del'>-			if (pixbuf)</div><div class='del'>-				return pixbuf;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		filename = gnome_pixmap_file (icon_name);</div><div class='del'>-		if (!filename) {</div><div class='del'>-			char *fm_icon;</div><div class='del'>-			</div><div class='del'>-			fm_icon = g_strdup_printf ("nautilus/%s", icon_name);</div><div class='del'>-			filename = gnome_pixmap_file (fm_icon);</div><div class='del'>-			if (!filename) {</div><div class='del'>-				fm_icon = g_strdup_printf ("mc/%s", icon_name);</div><div class='del'>-				filename = gnome_pixmap_file (fm_icon);</div><div class='del'>-			}</div><div class='del'>-			g_free (fm_icon);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!filename)</div><div class='del'>-		filename = gnome_pixmap_file ("gnome-unknown.png");</div><div class='del'>-	</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_file (filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	return pixbuf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	GList *p;</div><div class='del'>-	</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-	</div><div class='del'>-	e_icon_list_freeze (icon_list);</div><div class='del'>-	</div><div class='del'>-	e_icon_list_clear (icon_list);</div><div class='del'>-	</div><div class='del'>-	/* FIXME could be faster, but we don't care.  */</div><div class='del'>-	for (p = priv-&gt;attachments; p != NULL; p = p-&gt;next) {</div><div class='del'>-		EMsgComposerAttachment *attachment;</div><div class='del'>-		gchar *size_string, *label;</div><div class='del'>-		CamelContentType *content_type;</div><div class='del'>-		GdkPixbuf *pixbuf;</div><div class='del'>-		gboolean image;</div><div class='del'>-		char *desc;</div><div class='del'>-		</div><div class='del'>-		attachment = p-&gt;data;</div><div class='del'>-		content_type = camel_mime_part_get_content_type (attachment-&gt;body);</div><div class='del'>-		/* Get the image out of the attachment </div><div class='del'>-		   and create a thumbnail for it */</div><div class='del'>-		image = header_content_type_is (content_type, "image", "*");</div><div class='del'>-		</div><div class='del'>-		if (image &amp;&amp; attachment-&gt;pixbuf_cache == NULL) {</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelStream *mstream;</div><div class='del'>-			GdkPixbufLoader *loader;</div><div class='del'>-			gboolean error = TRUE;</div><div class='del'>-			char tmp[4096];</div><div class='del'>-			int t;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment-&gt;body));</div><div class='del'>-			mstream = camel_stream_mem_new ();</div><div class='del'>-			</div><div class='del'>-			camel_data_wrapper_write_to_stream (wrapper, mstream);</div><div class='del'>-			</div><div class='del'>-			camel_stream_reset (mstream);</div><div class='del'>-			</div><div class='del'>-			/* Stream image into pixbuf loader */</div><div class='del'>-			loader = gdk_pixbuf_loader_new ();</div><div class='del'>-			do {</div><div class='del'>-				t = camel_stream_read (mstream, tmp, 4096);</div><div class='del'>-				if (t &gt; 0) {</div><div class='del'>-					error = !gdk_pixbuf_loader_write (loader,</div><div class='del'>-									  tmp, t);</div><div class='del'>-					if (error) {</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (camel_stream_eos (mstream))</div><div class='del'>-						break;</div><div class='del'>-					error = TRUE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-			} while (!camel_stream_eos (mstream));</div><div class='del'>-			</div><div class='del'>-			if (!error) {</div><div class='del'>-				int ratio, width, height;</div><div class='del'>-				</div><div class='del'>-				/* Shrink pixbuf */</div><div class='del'>-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);</div><div class='del'>-				width = gdk_pixbuf_get_width (pixbuf);</div><div class='del'>-				height = gdk_pixbuf_get_height (pixbuf);</div><div class='del'>-				if (width &gt;= height) {</div><div class='del'>-					if (width &gt; 48) {</div><div class='del'>-						ratio = width / 48;</div><div class='del'>-						width = 48;</div><div class='del'>-						height = height / ratio;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (height &gt; 48) {</div><div class='del'>-						ratio = height / 48;</div><div class='del'>-						height = 48;</div><div class='del'>-						width = width / ratio;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				attachment-&gt;pixbuf_cache = gdk_pixbuf_scale_simple </div><div class='del'>-					(pixbuf,</div><div class='del'>-					 width,</div><div class='del'>-					 height,</div><div class='del'>-					 GDK_INTERP_BILINEAR);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning ("GdkPixbufLoader Error");</div><div class='del'>-				image = FALSE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* Destroy everything */</div><div class='del'>-			gdk_pixbuf_loader_close (loader);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (loader));</div><div class='del'>-			camel_stream_close (mstream);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		desc = e_utf8_to_gtk_string (GTK_WIDGET (icon_list), camel_mime_part_get_description (attachment-&gt;body));</div><div class='del'>-		if (!desc || *desc == '\0')</div><div class='del'>-			desc = e_utf8_to_gtk_string (GTK_WIDGET (icon_list),</div><div class='del'>-						     camel_mime_part_get_filename (attachment-&gt;body));</div><div class='del'>-		</div><div class='del'>-		if (!desc)</div><div class='del'>-			desc = g_strdup (_("attachment"));</div><div class='del'>-		</div><div class='del'>-		if (attachment-&gt;size) {</div><div class='del'>-			size_string = size_to_string (attachment-&gt;size);</div><div class='del'>-			label = g_strdup_printf ("%s (%s)", desc, size_string);</div><div class='del'>-			g_free (size_string);</div><div class='del'>-		} else</div><div class='del'>-			label = g_strdup (desc);</div><div class='del'>-		</div><div class='del'>-		if (image) {</div><div class='del'>-			e_icon_list_append_pixbuf (icon_list, attachment-&gt;pixbuf_cache, NULL, label);</div><div class='del'>-		} else {</div><div class='del'>-			char *mime_type;</div><div class='del'>-			</div><div class='del'>-			mime_type = header_content_type_simple (content_type);</div><div class='del'>-			pixbuf = pixbuf_for_mime_type (mime_type);</div><div class='del'>-			g_free (mime_type);</div><div class='del'>-			e_icon_list_append_pixbuf (icon_list, pixbuf, </div><div class='del'>-						   NULL, label);</div><div class='del'>-			if (pixbuf)</div><div class='del'>-				gdk_pixbuf_unref (pixbuf);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (desc);</div><div class='del'>-		g_free (label);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_icon_list_thaw (icon_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_selected (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	GList *attachment_list;</div><div class='del'>-	GList *p;</div><div class='del'>-	gint num;</div><div class='del'>-	</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-	</div><div class='del'>-	/* Weee!  I am especially proud of this piece of cheesy code: it is</div><div class='del'>-           truly awful.  But unless one attaches a huge number of files, it</div><div class='del'>-           will not be as greedy as intended.  FIXME of course.  */</div><div class='del'>-	</div><div class='del'>-	attachment_list = NULL;</div><div class='del'>-	p = e_icon_list_get_selection (icon_list);</div><div class='del'>-	for (; p != NULL; p = p-&gt;next) {</div><div class='del'>-		num = GPOINTER_TO_INT (p-&gt;data);</div><div class='del'>-		attachment = E_MSG_COMPOSER_ATTACHMENT</div><div class='del'>-			(g_list_nth (bar-&gt;priv-&gt;attachments, num)-&gt;data);</div><div class='del'>-		attachment_list = g_list_prepend (attachment_list, attachment);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	for (p = attachment_list; p != NULL; p = p-&gt;next)</div><div class='del'>-		remove_attachment (bar, E_MSG_COMPOSER_ATTACHMENT (p-&gt;data));</div><div class='del'>-	</div><div class='del'>-	g_list_free (attachment_list);</div><div class='del'>-	</div><div class='del'>-	update (bar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_selected (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	GList *selection;</div><div class='del'>-	gint num;</div><div class='del'>-	</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-	</div><div class='del'>-	selection = e_icon_list_get_selection (icon_list);</div><div class='del'>-	num = GPOINTER_TO_INT (selection-&gt;data);</div><div class='del'>-	attachment = g_list_nth (bar-&gt;priv-&gt;attachments, num)-&gt;data;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_attachment_edit (attachment, GTK_WIDGET (bar));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* "Attach" dialog.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_user (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	GPtrArray *file_list;</div><div class='del'>-	gboolean is_inline = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));</div><div class='del'>-	</div><div class='del'>-	file_list = e_msg_composer_select_file_attachments (composer, &amp;is_inline);</div><div class='del'>-	if (!file_list)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; file_list-&gt;len; i++) {</div><div class='del'>-		add_from_file (bar, file_list-&gt;pdata[i], is_inline ? "inline" : "attachment");</div><div class='del'>-		g_free (file_list-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_free (file_list, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_cb (GtkWidget *widget,</div><div class='del'>-	gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-	</div><div class='del'>-	add_from_user (E_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-properties_cb (GtkWidget *widget,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-	</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);</div><div class='del'>-	edit_selected (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_cb (GtkWidget *widget,</div><div class='del'>-	   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-	</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (data);</div><div class='del'>-	remove_selected (bar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Popup menu handling.  */</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo icon_context_menu_info[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM (N_("Remove"),</div><div class='del'>-			  N_("Remove selected items from the attachment list"),</div><div class='del'>-			  remove_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_MENU_PROPERTIES_ITEM (properties_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_icon_context_menu (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	if (priv-&gt;icon_context_menu == NULL)</div><div class='del'>-		priv-&gt;icon_context_menu = gnome_popup_menu_new</div><div class='del'>-			(icon_context_menu_info);</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;icon_context_menu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_icon_context_menu (EMsgComposerAttachmentBar *bar,</div><div class='del'>-			 gint num,</div><div class='del'>-			 GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	</div><div class='del'>-	menu = get_icon_context_menu (bar);</div><div class='del'>-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo context_menu_info[] = {</div><div class='del'>-	GNOMEUIINFO_ITEM (N_("Add attachment..."),</div><div class='del'>-			  N_("Attach a file to the message"),</div><div class='del'>-			  add_cb, NULL),</div><div class='del'>-	GNOMEUIINFO_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_context_menu (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	if (priv-&gt;context_menu == NULL)</div><div class='del'>-		priv-&gt;context_menu = gnome_popup_menu_new (context_menu_info);</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;context_menu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-popup_context_menu (EMsgComposerAttachmentBar *bar,</div><div class='del'>-		    GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	</div><div class='del'>-	menu = get_context_menu (bar);</div><div class='del'>-	gnome_popup_menu_do_popup (menu, NULL, NULL, event, bar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-	</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (object);</div><div class='del'>-	</div><div class='del'>-	free_attachment_list (bar);</div><div class='del'>-	</div><div class='del'>-	g_free (bar-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkWidget methods.  */</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-button_press_event (GtkWidget *widget,</div><div class='del'>-		    GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	gint icon_number;</div><div class='del'>-	</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (widget);</div><div class='del'>-	icon_list = E_ICON_LIST (widget);</div><div class='del'>-	</div><div class='del'>-	if (event-&gt;button != 3)</div><div class='del'>-		return GTK_WIDGET_CLASS (parent_class)-&gt;button_press_event</div><div class='del'>-			(widget, event);</div><div class='del'>-	</div><div class='del'>-	icon_number = e_icon_list_get_icon_at (icon_list, event-&gt;x, event-&gt;y);</div><div class='del'>-	</div><div class='del'>-	if (icon_number &gt;= 0) {</div><div class='del'>-		e_icon_list_select_icon (icon_list, icon_number);</div><div class='del'>-		popup_icon_context_menu (bar, icon_number, event);</div><div class='del'>-	} else {</div><div class='del'>-		popup_context_menu (bar, event);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Initialization.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerAttachmentBarClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	EIconListClass *icon_list_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (class);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (class);</div><div class='del'>-	icon_list_class = E_ICON_LIST_CLASS (class);</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (e_icon_list_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-	</div><div class='del'>-	widget_class-&gt;button_press_event = button_press_event;</div><div class='del'>-	</div><div class='del'>-	/* Setup signals.  */</div><div class='del'>-	</div><div class='del'>-	signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerAttachmentBarClass,</div><div class='del'>-						   changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	guint icon_size, icon_height;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	</div><div class='del'>-	priv = g_new (EMsgComposerAttachmentBarPrivate, 1);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;attachments = NULL;</div><div class='del'>-	priv-&gt;context_menu = NULL;</div><div class='del'>-	priv-&gt;icon_context_menu = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;num_attachments = 0;</div><div class='del'>-	</div><div class='del'>-	bar-&gt;priv = priv;</div><div class='del'>-	</div><div class='del'>-	/* FIXME partly hardcoded.  We should compute height from the font, and</div><div class='del'>-           allow at least 2 lines for every item.  */</div><div class='del'>-	icon_size = ICON_WIDTH + ICON_SPACING + ICON_BORDER + ICON_TEXT_SPACING;</div><div class='del'>-	</div><div class='del'>-	font = GTK_WIDGET (bar)-&gt;style-&gt;font;</div><div class='del'>-	icon_height = icon_size + ((font-&gt;ascent + font-&gt;descent) * 2);</div><div class='del'>-	icon_size += 24;</div><div class='del'>-	</div><div class='del'>-	gtk_widget_set_usize (GTK_WIDGET (bar), icon_size * 4, icon_height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_attachment_bar_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposerAttachmentBar",</div><div class='del'>-			sizeof (EMsgComposerAttachmentBar),</div><div class='del'>-			sizeof (EMsgComposerAttachmentBarClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (e_icon_list_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_attachment_bar_new (GtkAdjustment *adj)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *new;</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	</div><div class='del'>-	gdk_rgb_init ();</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-	new = gtk_type_new (e_msg_composer_attachment_bar_get_type ());</div><div class='del'>-	gtk_widget_pop_visual ();</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-	</div><div class='del'>-	icon_list = E_ICON_LIST (new);</div><div class='del'>-	</div><div class='del'>-	e_icon_list_construct (icon_list, ICON_WIDTH, 0);</div><div class='del'>-	</div><div class='del'>-	e_icon_list_set_separators (icon_list, ICON_SEPARATORS);</div><div class='del'>-	e_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);</div><div class='del'>-	e_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);</div><div class='del'>-	e_icon_list_set_icon_border (icon_list, ICON_BORDER);</div><div class='del'>-	e_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);</div><div class='del'>-	e_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);</div><div class='del'>-	</div><div class='del'>-	return GTK_WIDGET (new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attach_to_multipart (CamelMultipart *multipart,</div><div class='del'>-		     EMsgComposerAttachment *attachment,</div><div class='del'>-		     const char *default_charset)</div><div class='del'>-{</div><div class='del'>-	CamelContentType *content_type;</div><div class='del'>-	</div><div class='del'>-	content_type = camel_mime_part_get_content_type (attachment-&gt;body);</div><div class='del'>-	</div><div class='del'>-	if (!header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-		if (header_content_type_is (content_type, "text", "*")) {</div><div class='del'>-			CamelMimePartEncodingType encoding;</div><div class='del'>-			CamelStreamFilter *filtered_stream;</div><div class='del'>-			CamelMimeFilterBestenc *bestenc;</div><div class='del'>-			CamelStream *stream;</div><div class='del'>-			char *type;</div><div class='del'>-			</div><div class='del'>-			stream = camel_stream_null_new ();</div><div class='del'>-			filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-			bestenc = camel_mime_filter_bestenc_new (CAMEL_BESTENC_GET_ENCODING);</div><div class='del'>-			camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (bestenc));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-			</div><div class='del'>-			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment-&gt;body),</div><div class='del'>-							    CAMEL_STREAM (filtered_stream));</div><div class='del'>-			</div><div class='del'>-			encoding = camel_mime_filter_bestenc_get_best_encoding (bestenc, CAMEL_BESTENC_8BIT);</div><div class='del'>-			camel_mime_part_set_encoding (attachment-&gt;body, encoding);</div><div class='del'>-			</div><div class='del'>-			/* looks kinda nasty, but this is how ya have to do it */</div><div class='del'>-			header_content_type_set_param (content_type, "charset", default_charset);</div><div class='del'>-			type = header_content_type_format (content_type);</div><div class='del'>-			camel_mime_part_set_content_type (attachment-&gt;body, type);</div><div class='del'>-			g_free (type);</div><div class='del'>-			</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (bestenc));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-		} else if (!header_content_type_is (content_type, "message", "*")) {</div><div class='del'>-			camel_mime_part_set_encoding (attachment-&gt;body,</div><div class='del'>-						      CAMEL_MIME_PART_ENCODING_BASE64);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_multipart_add_part (multipart, attachment-&gt;body);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar,</div><div class='del'>-					    CamelMultipart *multipart,</div><div class='del'>-					    const char *default_charset)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	GList *p;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (bar != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));</div><div class='del'>-	g_return_if_fail (multipart != NULL);</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	for (p = priv-&gt;attachments; p != NULL; p = p-&gt;next) {</div><div class='del'>-		EMsgComposerAttachment *attachment;</div><div class='del'>-		</div><div class='del'>-		attachment = E_MSG_COMPOSER_ATTACHMENT (p-&gt;data);</div><div class='del'>-		attach_to_multipart (multipart, attachment, default_charset);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (bar != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar), 0);</div><div class='del'>-	</div><div class='del'>-	return bar-&gt;priv-&gt;num_attachments;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar,</div><div class='del'>-				      const gchar *file_name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));</div><div class='del'>-	</div><div class='del'>-	if (file_name == NULL)</div><div class='del'>-		add_from_user (bar);</div><div class='del'>-	else</div><div class='del'>-		add_from_file (bar, file_name, "attachment");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar,</div><div class='del'>-						CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT_BAR (bar));</div><div class='del'>-	</div><div class='del'>-	add_from_mime_part (bar, part);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-attachment-bar.h b/composer/e-msg-composer-attachment-bar.h<br/>deleted file mode 100644<br/>index 9a6fe3265f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-attachment-bar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* msg-composer-attachment-bar.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_MSG_COMPOSER_ATTACHMENT_BAR_H__</div><div class='del'>-#define __E_MSG_COMPOSER_ATTACHMENT_BAR_H__</div><div class='del'>-</div><div class='del'>-#include "e-icon-list.h"</div><div class='del'>-#include &lt;camel/camel-multipart.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR \</div><div class='del'>-	(e_msg_composer_attachment_bar_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_BAR(obj) \</div><div class='del'>-	(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar))</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \</div><div class='del'>-	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \</div><div class='del'>-	(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \</div><div class='del'>-	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBar {</div><div class='del'>-	EIconList parent;</div><div class='del'>-</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-};</div><div class='del'>-typedef struct _EMsgComposerAttachmentBar       EMsgComposerAttachmentBar;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBarClass {</div><div class='del'>-	EIconListClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed) (EMsgComposerAttachmentBar *bar);</div><div class='del'>-};</div><div class='del'>-typedef struct _EMsgComposerAttachmentBarClass  EMsgComposerAttachmentBarClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_msg_composer_attachment_bar_get_type (void);</div><div class='del'>-GtkWidget *e_msg_composer_attachment_bar_new (GtkAdjustment *adj);</div><div class='del'>-void e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar, CamelMultipart *multipart,</div><div class='del'>-						 const char *default_charset);</div><div class='del'>-guint e_msg_composer_attachment_bar_get_num_attachments (EMsgComposerAttachmentBar *bar);</div><div class='del'>-void e_msg_composer_attachment_bar_attach (EMsgComposerAttachmentBar *bar, const gchar *file_name);</div><div class='del'>-void e_msg_composer_attachment_bar_attach_mime_part (EMsgComposerAttachmentBar *bar, CamelMimePart *part);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_MSG_COMPOSER_ATTACHMENT_BAR_H__ */</div><div class='head'>diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c<br/>deleted file mode 100644<br/>index ddb73f2f52..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-attachment.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,470 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer-attachment.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999,2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* This is the object representing an email attachment.  It is implemented as a</div><div class='del'>-   GtkObject to make it easier for the application to handle it.  For example,</div><div class='del'>-   the "changed" signal is emitted whenever something changes in the</div><div class='del'>-   attachment.  Also, this contains the code to let users edit the</div><div class='del'>-   attachment manually. */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtknotebook.h&gt;</div><div class='del'>-#include &lt;gtk/gtktogglebutton.h&gt;</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs-mime.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-attachment.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-changed (EMsgComposerAttachment *attachment)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (attachment), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-</div><div class='del'>-	attachment = E_MSG_COMPOSER_ATTACHMENT (object);</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment-&gt;body));</div><div class='del'>-	if (attachment-&gt;pixbuf_cache != NULL)</div><div class='del'>-		gdk_pixbuf_unref (attachment-&gt;pixbuf_cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signals.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_changed (EMsgComposerAttachment *msg_composer_attachment)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (msg_composer_attachment != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (msg_composer_attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerAttachmentClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	signals[CHANGED] = gtk_signal_new ("changed",</div><div class='del'>-					   GTK_RUN_FIRST,</div><div class='del'>-					   object_class-&gt;type,</div><div class='del'>-					   GTK_SIGNAL_OFFSET</div><div class='del'>-					   	(EMsgComposerAttachmentClass,</div><div class='del'>-						 changed),</div><div class='del'>-					   gtk_marshal_NONE__NONE,</div><div class='del'>-					   GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;changed = real_changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerAttachment *msg_composer_attachment)</div><div class='del'>-{</div><div class='del'>-	msg_composer_attachment-&gt;editor_gui = NULL;</div><div class='del'>-	msg_composer_attachment-&gt;body = NULL;</div><div class='del'>-	msg_composer_attachment-&gt;size = 0;</div><div class='del'>-	msg_composer_attachment-&gt;pixbuf_cache = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_attachment_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposerAttachment",</div><div class='del'>-			sizeof (EMsgComposerAttachment),</div><div class='del'>-			sizeof (EMsgComposerAttachmentClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_attachment_new:</div><div class='del'>- * @file_name: filename to attach</div><div class='del'>- * @disposition: Content-Disposition of the attachment</div><div class='del'>- * @ex: exception</div><div class='del'>- *</div><div class='del'>- * Return value: the new attachment, or %NULL on error</div><div class='del'>- **/</div><div class='del'>-EMsgComposerAttachment *</div><div class='del'>-e_msg_composer_attachment_new (const char *file_name,</div><div class='del'>-			       const char *disposition,</div><div class='del'>-			       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *new;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	char *mime_type;</div><div class='del'>-	char *filename;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (file_name != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	if (stat (file_name, &amp;statbuf) &lt; 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot attach file %s: %s"),</div><div class='del'>-				      file_name, g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* return if it's not a regular file */</div><div class='del'>-	if (!S_ISREG (statbuf.st_mode)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot attach file %s: not a regular file"),</div><div class='del'>-				      file_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);</div><div class='del'>-	if (!stream) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Cannot attach file %s: %s"),</div><div class='del'>-				      file_name, g_strerror (errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	wrapper = camel_data_wrapper_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (wrapper, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	mime_type = e_msg_composer_guess_mime_type (file_name);</div><div class='del'>-	if (mime_type) {</div><div class='del'>-		camel_data_wrapper_set_mime_type (wrapper, mime_type);</div><div class='del'>-		g_free (mime_type);</div><div class='del'>-	} else</div><div class='del'>-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");</div><div class='del'>-	</div><div class='del'>-	part = camel_mime_part_new ();</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (wrapper));</div><div class='del'>-	</div><div class='del'>-	camel_mime_part_set_disposition (part, disposition);</div><div class='del'>-	if (strchr (file_name, '/'))</div><div class='del'>-		filename = e_utf8_from_locale_string (strrchr (file_name, '/') + 1);</div><div class='del'>-	else</div><div class='del'>-		filename = e_utf8_from_locale_string (file_name);</div><div class='del'>-	</div><div class='del'>-	camel_mime_part_set_filename (part, filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-#if 0</div><div class='del'>-	/* Note: Outlook 2002 is broken with respect to Content-Ids on</div><div class='del'>-           non-multipart/related parts, so as an interoperability</div><div class='del'>-           workwaround, don't set a Content-Id on these parts. Fixes</div><div class='del'>-           bug #10032 */</div><div class='del'>-	/* set the Content-Id */</div><div class='del'>-	content_id = header_msgid_generate ();</div><div class='del'>-	camel_mime_part_set_content_id (part, content_id);</div><div class='del'>-	g_free (content_id);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	new = e_msg_composer_attachment_new_from_mime_part (part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-	</div><div class='del'>-	new-&gt;size = statbuf.st_size;</div><div class='del'>-	new-&gt;guessed_type = TRUE;</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_attachment_new_from_mime_part:</div><div class='del'>- * @part: a CamelMimePart</div><div class='del'>- * </div><div class='del'>- * Return value: a new EMsgComposerAttachment based on the mime part</div><div class='del'>- **/</div><div class='del'>-EMsgComposerAttachment *</div><div class='del'>-e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *new;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (e_msg_composer_attachment_get_type ());</div><div class='del'>-</div><div class='del'>-	new-&gt;editor_gui = NULL;</div><div class='del'>-	new-&gt;body = part;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-	new-&gt;guessed_type = FALSE;</div><div class='del'>-	new-&gt;size = 0;</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The attachment property dialog.  */</div><div class='del'>-</div><div class='del'>-struct _DialogData {</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkEntry *file_name_entry;</div><div class='del'>-	GtkEntry *description_entry;</div><div class='del'>-	GtkEntry *mime_type_entry;</div><div class='del'>-	GtkToggleButton *disposition_checkbox;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-};</div><div class='del'>-typedef struct _DialogData DialogData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_dialog_data (DialogData *data)</div><div class='del'>-{</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * fixme: I am converting EVERYTHING to/from UTF-8, although mime types</div><div class='del'>- * are in ASCII. This is not strictly necessary, but we want to be</div><div class='del'>- * consistent and possibly check for errors somewhere.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_mime_type (DialogData *data)</div><div class='del'>-{</div><div class='del'>-	const gchar *mime_type;</div><div class='del'>-	gchar *file_name;</div><div class='del'>-</div><div class='del'>-	if (!data-&gt;attachment-&gt;guessed_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	file_name = e_utf8_gtk_entry_get_text (data-&gt;file_name_entry);</div><div class='del'>-	mime_type = gnome_vfs_mime_type_from_name_or_default (file_name, NULL);</div><div class='del'>-	g_free (file_name);</div><div class='del'>-</div><div class='del'>-	if (mime_type)</div><div class='del'>-		e_utf8_gtk_entry_set_text (data-&gt;mime_type_entry, mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_entry (GladeXML *xml,</div><div class='del'>-	   const gchar *widget_name,</div><div class='del'>-	   const gchar *value)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry;</div><div class='del'>-</div><div class='del'>-	entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name));</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		g_warning ("Entry for `%s' not found.", widget_name);</div><div class='del'>-	else</div><div class='del'>-		e_utf8_gtk_entry_set_text (entry, value ? value : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_widget (GladeXML *gui,</div><div class='del'>-		const gchar *name,</div><div class='del'>-		const gchar *signal_name,</div><div class='del'>-		GtkSignalFunc func,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget (gui, name);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (widget), signal_name, func, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-	attachment = dialog_data-&gt;attachment;</div><div class='del'>-	</div><div class='del'>-	gtk_widget_destroy (dialog_data-&gt;dialog);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (attachment-&gt;editor_gui));</div><div class='del'>-	attachment-&gt;editor_gui = NULL;</div><div class='del'>-	</div><div class='del'>-	destroy_dialog_data (dialog_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ok_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-	attachment = dialog_data-&gt;attachment;</div><div class='del'>-	</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;file_name_entry);</div><div class='del'>-	camel_mime_part_set_filename (attachment-&gt;body, str);</div><div class='del'>-	g_free (str);</div><div class='del'>-	</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;description_entry);</div><div class='del'>-	camel_mime_part_set_description (attachment-&gt;body, str);</div><div class='del'>-	g_free (str);</div><div class='del'>-	</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;mime_type_entry);</div><div class='del'>-	camel_mime_part_set_content_type (attachment-&gt;body, str);</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_set_mime_type (</div><div class='del'>-		camel_medium_get_content_object (CAMEL_MEDIUM (attachment-&gt;body)), str);</div><div class='del'>-	g_free (str);</div><div class='del'>-	</div><div class='del'>-	switch (gtk_toggle_button_get_active (dialog_data-&gt;disposition_checkbox)) {</div><div class='del'>-	case 0:</div><div class='del'>-		camel_mime_part_set_disposition (attachment-&gt;body, "attachment");</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		camel_mime_part_set_disposition (attachment-&gt;body, "inline");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* Hmmmm? */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	changed (attachment);</div><div class='del'>-	close_cb (widget, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_name_focus_out_cb (GtkWidget *widget,</div><div class='del'>-			GdkEventFocus *event,</div><div class='del'>-			gpointer data)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-	update_mime_type (dialog_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,</div><div class='del'>-				GtkWidget *parent)</div><div class='del'>-{</div><div class='del'>-	DialogData *dialog_data;</div><div class='del'>-	GladeXML *editor_gui;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (attachment != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (attachment));</div><div class='del'>-	</div><div class='del'>-	if (attachment-&gt;editor_gui != NULL) {</div><div class='del'>-		GtkWidget *window;</div><div class='del'>-		</div><div class='del'>-		window = glade_xml_get_widget (attachment-&gt;editor_gui,</div><div class='del'>-					       "dialog");</div><div class='del'>-		gdk_window_show (window-&gt;window);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	editor_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer-attachment.glade",</div><div class='del'>-				    NULL);</div><div class='del'>-	if (editor_gui == NULL) {</div><div class='del'>-		g_warning ("Cannot load `e-msg-composer-attachment.glade'");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	attachment-&gt;editor_gui = editor_gui;</div><div class='del'>-	</div><div class='del'>-	gtk_window_set_transient_for</div><div class='del'>-		(GTK_WINDOW (glade_xml_get_widget (editor_gui, "dialog")),</div><div class='del'>-		 GTK_WINDOW (gtk_widget_get_toplevel (parent)));</div><div class='del'>-	</div><div class='del'>-	dialog_data = g_new (DialogData, 1);</div><div class='del'>-	dialog_data-&gt;attachment = attachment;</div><div class='del'>-	dialog_data-&gt;dialog = glade_xml_get_widget (editor_gui, "dialog");</div><div class='del'>-	dialog_data-&gt;file_name_entry = GTK_ENTRY (</div><div class='del'>-		glade_xml_get_widget (editor_gui, "file_name_entry"));</div><div class='del'>-	dialog_data-&gt;description_entry = GTK_ENTRY (</div><div class='del'>-		glade_xml_get_widget (editor_gui, "description_entry"));</div><div class='del'>-	dialog_data-&gt;mime_type_entry = GTK_ENTRY (</div><div class='del'>-		glade_xml_get_widget (editor_gui, "mime_type_entry"));</div><div class='del'>-	dialog_data-&gt;disposition_checkbox = GTK_TOGGLE_BUTTON (</div><div class='del'>-		glade_xml_get_widget (editor_gui, "disposition_checkbox"));</div><div class='del'>-	</div><div class='del'>-	if (attachment != NULL) {</div><div class='del'>-		CamelContentType *content_type;</div><div class='del'>-		const char *disposition;</div><div class='del'>-		char *type;</div><div class='del'>-		</div><div class='del'>-		set_entry (editor_gui, "file_name_entry",</div><div class='del'>-			   camel_mime_part_get_filename (attachment-&gt;body));</div><div class='del'>-		set_entry (editor_gui, "description_entry",</div><div class='del'>-			   camel_mime_part_get_description (attachment-&gt;body));</div><div class='del'>-		content_type = camel_mime_part_get_content_type (attachment-&gt;body);</div><div class='del'>-		type = header_content_type_simple (content_type);</div><div class='del'>-		set_entry (editor_gui, "mime_type_entry", type);</div><div class='del'>-		g_free (type);</div><div class='del'>-		</div><div class='del'>-		disposition = camel_mime_part_get_disposition (attachment-&gt;body);</div><div class='del'>-		gtk_toggle_button_set_active (dialog_data-&gt;disposition_checkbox,</div><div class='del'>-					      disposition &amp;&amp; !g_strcasecmp (disposition, "inline"));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	connect_widget (editor_gui, "ok_button", "clicked", ok_cb, dialog_data);</div><div class='del'>-	connect_widget (editor_gui, "close_button", "clicked", close_cb, dialog_data);</div><div class='del'>-	</div><div class='del'>-	connect_widget (editor_gui, "file_name_entry", "focus_out_event",</div><div class='del'>-			file_name_focus_out_cb, dialog_data);</div><div class='del'>-	</div><div class='del'>-	/* make sure that when the composer gets hidden/closed that our windows also close */</div><div class='del'>-	parent = gtk_widget_get_toplevel (parent);</div><div class='del'>-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy", close_cb, dialog_data,</div><div class='del'>-					GTK_OBJECT (dialog_data-&gt;dialog));</div><div class='del'>-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "hide", close_cb, dialog_data,</div><div class='del'>-					GTK_OBJECT (dialog_data-&gt;dialog));</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-attachment.glade b/composer/e-msg-composer-attachment.glade<br/>deleted file mode 100644<br/>index 5b585e2d5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-attachment.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,280 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-msg-composer-attachment&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-msg-composer-attachment&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;dialog&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Attachment properties&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;ok_button&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;close_button&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-      &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;10&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;5&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;description_entry&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox3&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;10&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;True&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;True&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;True&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;file_name_entry&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;290&lt;/width&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;mime_type_entry&lt;/name&gt;</div><div class='del'>-	&lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;mime_label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;MIME type:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;description_label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Description:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;filename_label&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;File name:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;disposition_checkbox&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;Suggest automatic display of attachment&lt;/label&gt;</div><div class='del'>-	&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-	&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/composer/e-msg-composer-attachment.h b/composer/e-msg-composer-attachment.h<br/>deleted file mode 100644<br/>index a966acaa82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-attachment.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer-attachment.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-#ifndef __E_MSG_COMPOSER_ATTACHMENT_H__</div><div class='del'>-#define __E_MSG_COMPOSER_ATTACHMENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;glade/glade-xml.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-part.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER_ATTACHMENT			(e_msg_composer_attachment_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment))</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAttachment       EMsgComposerAttachment;</div><div class='del'>-typedef struct _EMsgComposerAttachmentClass  EMsgComposerAttachmentClass;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachment {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	GladeXML *editor_gui;</div><div class='del'>-</div><div class='del'>-	CamelMimePart *body;</div><div class='del'>-	gboolean guessed_type;</div><div class='del'>-	gulong size;</div><div class='del'>-</div><div class='del'>-	GdkPixbuf *pixbuf_cache;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed)	(EMsgComposerAttachment *msg_composer_attachment);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_msg_composer_attachment_get_type (void);</div><div class='del'>-EMsgComposerAttachment *e_msg_composer_attachment_new (const char *file_name,</div><div class='del'>-						       const char *disposition,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-EMsgComposerAttachment *e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part);</div><div class='del'>-void e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment,</div><div class='del'>-				     GtkWidget *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_MSG_COMPOSER_ATTACHMENT_H__ */</div><div class='head'>diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c<br/>deleted file mode 100644<br/>index 9930ee3b1a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-hdrs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* msg-composer-hdrs.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtktooltips.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtktooltips.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-#include "mail/mail-config.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-util.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Indexes in the GtkTable assigned to various items */</div><div class='del'>-</div><div class='del'>-#define LINE_FROM    0</div><div class='del'>-#define LINE_REPLYTO 1</div><div class='del'>-#define LINE_TO      2</div><div class='del'>-#define LINE_CC      3</div><div class='del'>-#define LINE_BCC     4</div><div class='del'>-#define LINE_SUBJECT 5</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-} EMsgComposerHdrPair;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerHdrsPrivate {</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	</div><div class='del'>-	/* The tooltips.  */</div><div class='del'>-	GtkTooltips *tooltips;</div><div class='del'>-	</div><div class='del'>-	GSList *from_options;</div><div class='del'>-	</div><div class='del'>-	/* Standard headers.  */</div><div class='del'>-	EMsgComposerHdrPair from, reply_to, to, cc, bcc, subject;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SHOW_ADDRESS_DIALOG,</div><div class='del'>-	SUBJECT_CHANGED,</div><div class='del'>-	HDRS_CHANGED,</div><div class='del'>-	FROM_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int signals[LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-setup_corba (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;corba_select_names == CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFIID, 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without</div><div class='del'>-           raising an exception in `ev'.  */</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || priv-&gt;corba_select_names == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	char *string;</div><div class='del'>-} EMsgComposerHdrsAndString;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_msg_composer_hdrs_and_string_free (EMsgComposerHdrsAndString *emchas)</div><div class='del'>-{</div><div class='del'>-	if (emchas-&gt;hdrs)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (emchas-&gt;hdrs));</div><div class='del'>-	g_free (emchas-&gt;string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMsgComposerHdrsAndString *</div><div class='del'>-e_msg_composer_hdrs_and_string_create (EMsgComposerHdrs *hdrs, const char *string)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsAndString *emchas;</div><div class='del'>-	</div><div class='del'>-	emchas = g_new (EMsgComposerHdrsAndString, 1);</div><div class='del'>-	emchas-&gt;hdrs = hdrs;</div><div class='del'>-	emchas-&gt;string = g_strdup (string);</div><div class='del'>-	if (emchas-&gt;hdrs)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (emchas-&gt;hdrs));</div><div class='del'>-	</div><div class='del'>-	return emchas;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_button_clicked_cb (GtkButton *button,</div><div class='del'>-			   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsAndString *emchas;</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	emchas = data;</div><div class='del'>-	hdrs = emchas-&gt;hdrs;</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_activateDialog (</div><div class='del'>-		priv-&gt;corba_select_names, emchas-&gt;string, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-from_changed (GtkWidget *item, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (data);</div><div class='del'>-	const char *reply_to;</div><div class='del'>-	</div><div class='del'>-	hdrs-&gt;account = gtk_object_get_data (GTK_OBJECT (item), "account");</div><div class='del'>-	</div><div class='del'>-	/* we do this rather than calling e_msg_composer_hdrs_set_reply_to()</div><div class='del'>-	   because we don't want to change the visibility of the header */</div><div class='del'>-	reply_to = hdrs-&gt;account-&gt;id-&gt;reply_to;</div><div class='del'>-	e_entry_set_text (E_ENTRY (hdrs-&gt;priv-&gt;reply_to.entry), reply_to ? reply_to : "");</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (hdrs), signals [FROM_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_from_optionmenu (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *omenu, *menu, *first = NULL;</div><div class='del'>-	const GSList *accounts;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	int i = 0, history = 0;</div><div class='del'>-	int default_account;</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	</div><div class='del'>-	default_account = mail_config_get_default_account_num ();</div><div class='del'>-	</div><div class='del'>-	accounts = mail_config_get_accounts ();</div><div class='del'>-	while (accounts) {</div><div class='del'>-		const MailConfigAccount *account;</div><div class='del'>-		char *label;</div><div class='del'>-		char *native_label;</div><div class='del'>-		</div><div class='del'>-		account = accounts-&gt;data;</div><div class='del'>-		</div><div class='del'>-		/* this should never ever fail */</div><div class='del'>-		if (!account || !account-&gt;name || !account-&gt;id) {</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (account-&gt;id-&gt;address &amp;&amp; *account-&gt;id-&gt;address) {</div><div class='del'>-			if (strcmp (account-&gt;name, account-&gt;id-&gt;address))</div><div class='del'>-				label = g_strdup_printf ("%s &lt;%s&gt; (%s)", account-&gt;id-&gt;name,</div><div class='del'>-							 account-&gt;id-&gt;address, account-&gt;name);</div><div class='del'>-			else</div><div class='del'>-				label = g_strdup_printf ("%s &lt;%s&gt;", account-&gt;id-&gt;name, account-&gt;id-&gt;address);</div><div class='del'>-			</div><div class='del'>-			native_label = e_utf8_to_gtk_string (GTK_WIDGET (menu), label);</div><div class='del'>-			item = gtk_menu_item_new_with_label (native_label);</div><div class='del'>-			g_free (native_label);</div><div class='del'>-			g_free (label);</div><div class='del'>-			</div><div class='del'>-			gtk_object_set_data (GTK_OBJECT (item), "account", account_copy (account));</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-					    GTK_SIGNAL_FUNC (from_changed), hdrs);</div><div class='del'>-			</div><div class='del'>-			if (i == default_account) {</div><div class='del'>-				first = item;</div><div class='del'>-				history = i;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* this is so we can later set which one we want */</div><div class='del'>-			hdrs-&gt;priv-&gt;from_options = g_slist_append (hdrs-&gt;priv-&gt;from_options, item);</div><div class='del'>-			</div><div class='del'>-			gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-			gtk_widget_show (item);</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		accounts = accounts-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	</div><div class='del'>-	if (first) {</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), history);</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", hdrs);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_entry_changed (BonoboListener    *listener,</div><div class='del'>-			   char              *event_name,</div><div class='del'>-			   CORBA_any         *arg,</div><div class='del'>-			   CORBA_Environment *ev,</div><div class='del'>-			   gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (user_data);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[HDRS_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_addressbook_entry (EMsgComposerHdrs *hdrs,</div><div class='del'>-			  const char *name)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	Bonobo_Control corba_control;</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	BonoboControlFrame *cf;</div><div class='del'>-	Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-	corba_select_names = priv-&gt;corba_select_names;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Addressbook_SelectNames_addSection (</div><div class='del'>-		corba_select_names, name, name, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	corba_control =</div><div class='del'>-		GNOME_Evolution_Addressbook_SelectNames_getEntryBySection (</div><div class='del'>-			corba_select_names, name, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	control_widget = bonobo_widget_new_control_from_objref (</div><div class='del'>-		corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control_widget));</div><div class='del'>-	pb = bonobo_control_frame_get_control_property_bag (cf, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_event_source_client_add_listener (</div><div class='del'>-		pb, addressbook_entry_changed,</div><div class='del'>-		"Bonobo/Property:change:entry_changed",</div><div class='del'>-		NULL, hdrs);</div><div class='del'>-	</div><div class='del'>-	return control_widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMsgComposerHdrPair </div><div class='del'>-header_new_recipient (EMsgComposerHdrs *hdrs, const gchar *name, const gchar *tip)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	EMsgComposerHdrPair ret;</div><div class='del'>-	</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	ret.label = gtk_button_new_with_label (name);</div><div class='del'>-	GTK_OBJECT_UNSET_FLAGS (ret.label, GTK_CAN_FOCUS);</div><div class='del'>-	gtk_signal_connect_full (</div><div class='del'>-		GTK_OBJECT (ret.label), "clicked",</div><div class='del'>-		GTK_SIGNAL_FUNC (address_button_clicked_cb), NULL,</div><div class='del'>-		e_msg_composer_hdrs_and_string_create(hdrs, name),</div><div class='del'>-		(GtkDestroyNotify) e_msg_composer_hdrs_and_string_free,</div><div class='del'>-		FALSE, FALSE);</div><div class='del'>-	</div><div class='del'>-	gtk_tooltips_set_tip (</div><div class='del'>-		hdrs-&gt;priv-&gt;tooltips, ret.label,</div><div class='del'>-		_("Click here for the address book"),</div><div class='del'>-		NULL);</div><div class='del'>-	</div><div class='del'>-	ret.entry = create_addressbook_entry (hdrs, name);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_changed (GtkWidget *entry, EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	char *subject, *tmp;</div><div class='del'>-	</div><div class='del'>-	tmp = e_msg_composer_hdrs_get_subject (hdrs);</div><div class='del'>-	subject = e_utf8_to_gtk_string (GTK_WIDGET (entry), tmp);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[SUBJECT_CHANGED], subject);</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (hdrs), signals[HDRS_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_headers (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv = hdrs-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * From:</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;from.label = gtk_label_new (_("From:"));</div><div class='del'>-	priv-&gt;from.entry = create_from_optionmenu (hdrs);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Reply-To:</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;reply_to.label = gtk_label_new (_("Reply-To:"));</div><div class='del'>-	priv-&gt;reply_to.entry = e_entry_new ();</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;reply_to.entry),</div><div class='del'>-			"editable", TRUE,</div><div class='del'>-			"use_ellipsis", TRUE,</div><div class='del'>-			"allow_newlines", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Subject:</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;subject.label = gtk_label_new (_("Subject:"));</div><div class='del'>-	priv-&gt;subject.entry = e_entry_new ();</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;subject.entry),</div><div class='del'>-			"editable", TRUE,</div><div class='del'>-			"use_ellipsis", TRUE,</div><div class='del'>-			"allow_newlines", FALSE,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;subject.entry), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (entry_changed), hdrs);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * To: CC: and Bcc:</div><div class='del'>-	 */</div><div class='del'>-	priv-&gt;to = header_new_recipient (</div><div class='del'>-		hdrs, _("To:"),</div><div class='del'>-		_("Enter the recipients of the message"));</div><div class='del'>-	</div><div class='del'>-	priv-&gt;cc = header_new_recipient (</div><div class='del'>-		hdrs, _("Cc:"),</div><div class='del'>-		_("Enter the addresses that will receive a carbon copy of the message"));</div><div class='del'>-	</div><div class='del'>-	priv-&gt;bcc = header_new_recipient (</div><div class='del'>-		hdrs, _("Bcc:"),</div><div class='del'>-		 _("Enter the addresses that will receive a carbon copy of "</div><div class='del'>-		   "the message without appearing in the recipient list of "</div><div class='del'>-		   "the message."));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkDirectionType</div><div class='del'>-focus_cb (GtkContainer *contain, GtkDirectionType dir, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	g_message ("FOCUS: %d", dir);</div><div class='del'>-	return dir;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attach_couple (EMsgComposerHdrs *hdrs, EMsgComposerHdrPair *pair, int line)</div><div class='del'>-{</div><div class='del'>-	int pad;</div><div class='del'>-	</div><div class='del'>-	if (GTK_IS_LABEL (pair-&gt;label))</div><div class='del'>-		pad = GNOME_PAD;</div><div class='del'>-	else</div><div class='del'>-		pad = 2;</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach (GTK_TABLE (hdrs),</div><div class='del'>-			  pair-&gt;label, 0, 1,</div><div class='del'>-			  line, line + 1,</div><div class='del'>-			  GTK_FILL, GTK_FILL, pad, pad);</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach (GTK_TABLE (hdrs),</div><div class='del'>-			  pair-&gt;entry, 1, 2,</div><div class='del'>-			  line, line + 1,</div><div class='del'>-			  GTK_FILL | GTK_EXPAND, 0, 2, 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attach_headers (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *p = hdrs-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;from, LINE_FROM);</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;reply_to, LINE_REPLYTO);</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;to, LINE_TO);</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;cc, LINE_CC);</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;bcc, LINE_BCC);</div><div class='del'>-	attach_couple (hdrs, &amp;p-&gt;subject, LINE_SUBJECT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_pair_visibility (EMsgComposerHdrs *h, EMsgComposerHdrPair *pair, gboolean visible)</div><div class='del'>-{</div><div class='del'>-	if (visible){</div><div class='del'>-		gtk_widget_show (pair-&gt;label);</div><div class='del'>-		gtk_widget_show (pair-&gt;entry);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (pair-&gt;label);</div><div class='del'>-		gtk_widget_hide (pair-&gt;entry);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-headers_set_visibility (EMsgComposerHdrs *h, int visible_flags)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *p = h-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	set_pair_visibility (h, &amp;p-&gt;from, visible_flags &amp; E_MSG_COMPOSER_VISIBLE_FROM);</div><div class='del'>-	set_pair_visibility (h, &amp;p-&gt;reply_to, visible_flags &amp; E_MSG_COMPOSER_VISIBLE_REPLYTO);</div><div class='del'>-	set_pair_visibility (h, &amp;p-&gt;cc, visible_flags &amp; E_MSG_COMPOSER_VISIBLE_CC);</div><div class='del'>-	set_pair_visibility (h, &amp;p-&gt;bcc, visible_flags &amp; E_MSG_COMPOSER_VISIBLE_BCC);</div><div class='del'>-	set_pair_visibility (h, &amp;p-&gt;subject, visible_flags &amp; E_MSG_COMPOSER_VISIBLE_SUBJECT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_hdrs_visible (EMsgComposerHdrs *hdrs, int visible_flags)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	headers_set_visibility (hdrs, visible_flags);</div><div class='del'>-	gtk_widget_queue_resize (GTK_WIDGET (hdrs));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_headers (EMsgComposerHdrs *hdrs, int visible_flags)</div><div class='del'>-{</div><div class='del'>-	create_headers (hdrs);</div><div class='del'>-	attach_headers (hdrs);</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * To: is always visible</div><div class='del'>-	 */</div><div class='del'>-	gtk_widget_show (hdrs-&gt;priv-&gt;to.label);</div><div class='del'>-	gtk_widget_show (hdrs-&gt;priv-&gt;to.entry);</div><div class='del'>-	</div><div class='del'>-	headers_set_visibility (hdrs, visible_flags);</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-	</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (object);</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		bonobo_object_release_unref (priv-&gt;corba_select_names, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (priv-&gt;tooltips));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;tooltips));</div><div class='del'>-	</div><div class='del'>-	l = priv-&gt;from_options;</div><div class='del'>-	while (l) {</div><div class='del'>-		MailConfigAccount *account;</div><div class='del'>-		GtkWidget *item = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		account = gtk_object_get_data (GTK_OBJECT (item), "account");</div><div class='del'>-		account_destroy (account);</div><div class='del'>-		</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	g_slist_free (priv-&gt;from_options);</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerHdrsClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (class);</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (gtk_table_get_type ());</div><div class='del'>-	</div><div class='del'>-	signals[SHOW_ADDRESS_DIALOG] =</div><div class='del'>-		gtk_signal_new ("show_address_dialog",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,</div><div class='del'>-						   show_address_dialog),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	signals[SUBJECT_CHANGED] =</div><div class='del'>-		gtk_signal_new ("subject_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,</div><div class='del'>-						   subject_changed),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE,</div><div class='del'>-				1, GTK_TYPE_STRING);</div><div class='del'>-	</div><div class='del'>-	signals[HDRS_CHANGED] =</div><div class='del'>-		gtk_signal_new ("hdrs_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,</div><div class='del'>-						   hdrs_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	signals[FROM_CHANGED] =</div><div class='del'>-		gtk_signal_new ("from_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerHdrsClass,</div><div class='del'>-						   from_changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (EMsgComposerHdrsPrivate, 1);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;tooltips = gtk_tooltips_new ();</div><div class='del'>-	</div><div class='del'>-	hdrs-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_hdrs_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposerHdrs",</div><div class='del'>-			sizeof (EMsgComposerHdrs),</div><div class='del'>-			sizeof (EMsgComposerHdrsClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_table_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_new (int visible_flags)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *new;</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	new = gtk_type_new (e_msg_composer_hdrs_get_type ());</div><div class='del'>-	priv = new-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	if (!setup_corba (new)) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (new));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	setup_headers (new, visible_flags);</div><div class='del'>-	</div><div class='del'>-	return GTK_WIDGET (new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_recipients_from_destv (CamelMimeMessage *msg,</div><div class='del'>-			   EDestination **to_destv,</div><div class='del'>-			   EDestination **cc_destv,</div><div class='del'>-			   EDestination **bcc_destv,</div><div class='del'>-			   gboolean redirect)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *to_addr;</div><div class='del'>-	CamelInternetAddress *cc_addr;</div><div class='del'>-	CamelInternetAddress *bcc_addr;</div><div class='del'>-	CamelInternetAddress *target;</div><div class='del'>-	const char *text_addr, *header;</div><div class='del'>-	gboolean seen_hidden_list = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	to_addr  = camel_internet_address_new ();</div><div class='del'>-	cc_addr  = camel_internet_address_new ();</div><div class='del'>-	bcc_addr = camel_internet_address_new ();</div><div class='del'>-	</div><div class='del'>-	if (to_destv) {</div><div class='del'>-		for (i = 0; to_destv[i] != NULL; ++i) {</div><div class='del'>-			text_addr = e_destination_get_address (to_destv[i]);</div><div class='del'>-			</div><div class='del'>-			if (text_addr &amp;&amp; *text_addr) {</div><div class='del'>-				target = to_addr;</div><div class='del'>-				if (e_destination_is_evolution_list (to_destv[i])</div><div class='del'>-				    &amp;&amp; !e_destination_list_show_addresses (to_destv[i])) {</div><div class='del'>-					target = bcc_addr;</div><div class='del'>-					seen_hidden_list = TRUE;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				camel_address_decode (CAMEL_ADDRESS (target), text_addr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (cc_destv) {</div><div class='del'>-		for (i = 0; cc_destv[i] != NULL; ++i) {</div><div class='del'>-			text_addr = e_destination_get_address (cc_destv[i]);</div><div class='del'>-			if (text_addr &amp;&amp; *text_addr) {</div><div class='del'>-				target = cc_addr;</div><div class='del'>-				if (e_destination_is_evolution_list (cc_destv[i])</div><div class='del'>-				    &amp;&amp; !e_destination_list_show_addresses (cc_destv[i])) {</div><div class='del'>-					target = bcc_addr;</div><div class='del'>-					seen_hidden_list = TRUE;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				camel_address_decode (CAMEL_ADDRESS (target), text_addr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (bcc_destv) {</div><div class='del'>-		for (i = 0; bcc_destv[i] != NULL; ++i) {</div><div class='del'>-			text_addr = e_destination_get_address (bcc_destv[i]);</div><div class='del'>-			if (text_addr &amp;&amp; *text_addr) {				</div><div class='del'>-				camel_address_decode (CAMEL_ADDRESS (bcc_addr), text_addr);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_TO : CAMEL_RECIPIENT_TYPE_TO;</div><div class='del'>-	if (camel_address_length (CAMEL_ADDRESS (to_addr)) &gt; 0) {</div><div class='del'>-		camel_mime_message_set_recipients (msg, header, to_addr);</div><div class='del'>-	} else if (seen_hidden_list) {</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (msg), header, "Undisclosed-Recipient:;");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_CC : CAMEL_RECIPIENT_TYPE_CC;</div><div class='del'>-	if (camel_address_length (CAMEL_ADDRESS (cc_addr)) &gt; 0) {</div><div class='del'>-		camel_mime_message_set_recipients (msg, header, cc_addr);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	header = redirect ? CAMEL_RECIPIENT_TYPE_RESENT_BCC : CAMEL_RECIPIENT_TYPE_BCC;</div><div class='del'>-	if (camel_address_length (CAMEL_ADDRESS (bcc_addr)) &gt; 0) {</div><div class='del'>-		camel_mime_message_set_recipients (msg, header, bcc_addr);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (to_addr));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cc_addr));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (bcc_addr));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_msg_composer_hdrs_to_message_internal (EMsgComposerHdrs *hdrs,</div><div class='del'>-					 CamelMimeMessage *msg,</div><div class='del'>-					 gboolean redirect)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	char *subject, *header;</div><div class='del'>-	EDestination **to_destv, **cc_destv, **bcc_destv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	g_return_if_fail (msg != NULL);</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));</div><div class='del'>-	</div><div class='del'>-	subject = e_msg_composer_hdrs_get_subject (hdrs);</div><div class='del'>-	camel_mime_message_set_subject (msg, subject);</div><div class='del'>-	g_free (subject);</div><div class='del'>-	</div><div class='del'>-	addr = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-	if (redirect) {</div><div class='del'>-		header = camel_address_format (CAMEL_ADDRESS (addr));</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (msg), "Resent-From", header);</div><div class='del'>-		g_free (header);</div><div class='del'>-	} else {</div><div class='del'>-		camel_mime_message_set_from (msg, addr);</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-	</div><div class='del'>- 	addr = e_msg_composer_hdrs_get_reply_to (hdrs);</div><div class='del'>-	if (addr) {</div><div class='del'>-		camel_mime_message_set_reply_to (msg, addr);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	to_destv  = e_msg_composer_hdrs_get_to (hdrs);</div><div class='del'>-	cc_destv  = e_msg_composer_hdrs_get_cc (hdrs);</div><div class='del'>-	bcc_destv = e_msg_composer_hdrs_get_bcc (hdrs);</div><div class='del'>-	</div><div class='del'>-	/* Attach destinations to the message. */</div><div class='del'>-	</div><div class='del'>-	set_recipients_from_destv (msg, to_destv, cc_destv, bcc_destv, redirect);</div><div class='del'>-	</div><div class='del'>-	e_destination_freev (to_destv);</div><div class='del'>-	e_destination_freev (cc_destv);</div><div class='del'>-	e_destination_freev (bcc_destv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_to_message (EMsgComposerHdrs *hdrs,</div><div class='del'>-				CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	e_msg_composer_hdrs_to_message_internal (hdrs, msg, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_to_redirect (EMsgComposerHdrs *hdrs,</div><div class='del'>-				 CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	e_msg_composer_hdrs_to_message_internal (hdrs, msg, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: yea, this could be better... but it's doubtful it'll be used much */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,</div><div class='del'>-				      const char *account_name)</div><div class='del'>-{</div><div class='del'>-	GtkOptionMenu *omenu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int i = 0;</div><div class='del'>-	int default_account = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	omenu = GTK_OPTION_MENU (hdrs-&gt;priv-&gt;from.entry);</div><div class='del'>-	</div><div class='del'>-	if (account_name)</div><div class='del'>-		default_account = -1;</div><div class='del'>-	else</div><div class='del'>-		default_account = mail_config_get_default_account_num ();</div><div class='del'>-	</div><div class='del'>-	/* find the item that represents the account and activate it */</div><div class='del'>-	l = hdrs-&gt;priv-&gt;from_options;</div><div class='del'>-	while (l) {</div><div class='del'>-		MailConfigAccount *account;</div><div class='del'>-		item = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		account = gtk_object_get_data (GTK_OBJECT (item), "account");</div><div class='del'>-		if (i == default_account ||</div><div class='del'>-		    (account_name &amp;&amp; ((account-&gt;name &amp;&amp; !strcmp (account_name, account-&gt;name))</div><div class='del'>-				      || (account-&gt;id-&gt;address &amp;&amp; strstr (account_name, account-&gt;id-&gt;address))))) {</div><div class='del'>-			/* set the correct optionlist item */</div><div class='del'>-			gtk_option_menu_set_history (omenu, i);</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (item), "activate", hdrs);</div><div class='del'>-			</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,</div><div class='del'>-				  const char *reply_to)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	e_entry_set_text (E_ENTRY (hdrs-&gt;priv-&gt;reply_to.entry), reply_to ? reply_to : "");</div><div class='del'>-	</div><div class='del'>-	if (reply_to &amp;&amp; *reply_to)</div><div class='del'>-		set_pair_visibility (hdrs, &amp;hdrs-&gt;priv-&gt;cc, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_to (EMsgComposerHdrs *hdrs,</div><div class='del'>-			    EDestination **to_destv)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	str = e_destination_exportv (to_destv);</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;to.entry), "destinations", str, NULL); </div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_cc (EMsgComposerHdrs *hdrs,</div><div class='del'>-			    EDestination **cc_destv)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	str = e_destination_exportv (cc_destv);</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;cc.entry), "destinations", str, NULL);</div><div class='del'>-	if (str &amp;&amp; *str)</div><div class='del'>-		set_pair_visibility (hdrs, &amp;hdrs-&gt;priv-&gt;cc, TRUE);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_bcc (EMsgComposerHdrs *hdrs,</div><div class='del'>-			     EDestination **bcc_destv)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	</div><div class='del'>-	str = e_destination_exportv (bcc_destv);</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;bcc.entry), "destinations", str, NULL); </div><div class='del'>-	if (str &amp;&amp; *str)</div><div class='del'>-		set_pair_visibility (hdrs, &amp;hdrs-&gt;priv-&gt;bcc, TRUE);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_subject (EMsgComposerHdrs *hdrs,</div><div class='del'>-				 const char *subject)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	g_return_if_fail (subject != NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_object_set (GTK_OBJECT (hdrs-&gt;priv-&gt;subject.entry),</div><div class='del'>-			"text", subject,</div><div class='del'>-			NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelInternetAddress *</div><div class='del'>-e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	const MailConfigAccount *account;</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	account = hdrs-&gt;account;</div><div class='del'>-	if (!account || !account-&gt;id) {</div><div class='del'>-		/* FIXME: perhaps we should try the default account? */</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	addr = camel_internet_address_new ();</div><div class='del'>-	camel_internet_address_add (addr, account-&gt;id-&gt;name, account-&gt;id-&gt;address);</div><div class='del'>-	</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelInternetAddress *</div><div class='del'>-e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *addr;</div><div class='del'>-	const char *reply_to;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	reply_to = e_entry_get_text (E_ENTRY (hdrs-&gt;priv-&gt;reply_to.entry));</div><div class='del'>-	</div><div class='del'>-	if (!reply_to || *reply_to == '\0')</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	addr = camel_internet_address_new ();</div><div class='del'>-	if (camel_address_unformat (CAMEL_ADDRESS (addr), reply_to) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_msg_composer_hdrs_get_to (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	char *str = NULL;</div><div class='del'>-	EDestination **destv = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;to.entry), "destinations", &amp;str, NULL); </div><div class='del'>-	</div><div class='del'>-	if (str != NULL) {</div><div class='del'>-		destv = e_destination_importv (str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_msg_composer_hdrs_get_cc (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	char *str = NULL;</div><div class='del'>-	EDestination **destv = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;cc.entry), "destinations", &amp;str, NULL); </div><div class='del'>-	</div><div class='del'>-	if (str != NULL) {</div><div class='del'>-		destv = e_destination_importv (str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_msg_composer_hdrs_get_bcc (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	char *str = NULL;</div><div class='del'>-	EDestination **destv = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (hdrs-&gt;priv-&gt;bcc.entry), "destinations", &amp;str, NULL); </div><div class='del'>-	</div><div class='del'>-	if (str != NULL) {</div><div class='del'>-		destv = e_destination_importv (str);</div><div class='del'>-		g_free (str);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_msg_composer_hdrs_get_recipients (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EDestination **to_destv;</div><div class='del'>-	EDestination **cc_destv;</div><div class='del'>-	EDestination **bcc_destv;</div><div class='del'>-	EDestination **recip_destv;</div><div class='del'>-	int i, j, n;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	to_destv  = e_msg_composer_hdrs_get_to (hdrs);</div><div class='del'>-	cc_destv  = e_msg_composer_hdrs_get_cc (hdrs);</div><div class='del'>-	bcc_destv = e_msg_composer_hdrs_get_bcc (hdrs);</div><div class='del'>-	</div><div class='del'>-	n = 0;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; to_destv &amp;&amp; to_destv[i] != NULL; i++, n++);</div><div class='del'>-	for (i = 0; cc_destv &amp;&amp; cc_destv[i] != NULL; i++, n++);</div><div class='del'>-	for (i = 0; bcc_destv &amp;&amp; bcc_destv[i] != NULL; i++, n++);</div><div class='del'>-	</div><div class='del'>-	if (n == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	recip_destv = g_new (EDestination *, n + 1);</div><div class='del'>-	</div><div class='del'>-	j = 0;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; to_destv &amp;&amp; to_destv[i] != NULL; i++, j++)</div><div class='del'>-		recip_destv[j] = to_destv[i];</div><div class='del'>-	for (i = 0; cc_destv &amp;&amp; cc_destv[i] != NULL; i++, j++)</div><div class='del'>-		recip_destv[j] = cc_destv[i];</div><div class='del'>-	for (i = 0; bcc_destv &amp;&amp; bcc_destv[i] != NULL; i++, j++)</div><div class='del'>-		recip_destv[j] = bcc_destv[i];</div><div class='del'>-	</div><div class='del'>-	g_assert (j == n);</div><div class='del'>-	recip_destv[j] = NULL;</div><div class='del'>-	</div><div class='del'>-	g_free (to_destv);</div><div class='del'>-	g_free (cc_destv);</div><div class='del'>-	g_free (bcc_destv);</div><div class='del'>-	</div><div class='del'>-	return recip_destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	char *subject;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_object_get (GTK_OBJECT (hdrs-&gt;priv-&gt;subject.entry),</div><div class='del'>-			"text", &amp;subject, NULL);</div><div class='del'>-	</div><div class='del'>-	return subject;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_reply_to_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;reply_to.entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_to_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;to.entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_cc_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;cc.entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_bcc_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;bcc.entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_subject_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;subject.entry;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h<br/>deleted file mode 100644<br/>index 373bf36b8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-hdrs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* msg-composer-hdrs.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ___E_MSG_COMPOSER_HDRS_H__</div><div class='del'>-#define ___E_MSG_COMPOSER_HDRS_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;camel/camel-mime-message.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-destination.h&gt;</div><div class='del'>-#include &lt;mail/mail-config.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER_HDRS		(e_msg_composer_hdrs_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_HDRS(obj)		(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrs))</div><div class='del'>-#define E_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_HDRS, EMsgComposerHdrsClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_HDRS(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))</div><div class='del'>-#define E_IS_MSG_COMPOSER_HDRS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_HDRS))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SELECT_NAMES_OAFIID "OAFIID:GNOME_Evolution_Addressbook_SelectNames"</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerHdrs        EMsgComposerHdrs;</div><div class='del'>-typedef struct _EMsgComposerHdrsClass   EMsgComposerHdrsClass;</div><div class='del'>-typedef struct _EMsgComposerHdrsPrivate EMsgComposerHdrsPrivate;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerHdrs {</div><div class='del'>-	GtkTable parent;</div><div class='del'>-</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	const MailConfigAccount *account;</div><div class='del'>-	</div><div class='del'>-	gboolean has_changed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerHdrsClass {</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* show_address_dialog) (EMsgComposerHdrs *hdrs);</div><div class='del'>-</div><div class='del'>-	void (* subject_changed) (EMsgComposerHdrs *hdrs, gchar *subject);</div><div class='del'>-</div><div class='del'>-	void (* hdrs_changed) (EMsgComposerHdrs *hdrs);</div><div class='del'>-</div><div class='del'>-	void (* from_changed) (EMsgComposerHdrs *hdrs);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_MSG_COMPOSER_VISIBLE_FROM    = 1,</div><div class='del'>-	E_MSG_COMPOSER_VISIBLE_REPLYTO = 2,</div><div class='del'>-	E_MSG_COMPOSER_VISIBLE_CC      = 4,</div><div class='del'>-	E_MSG_COMPOSER_VISIBLE_BCC     = 8,</div><div class='del'>-	E_MSG_COMPOSER_VISIBLE_SUBJECT = 16</div><div class='del'>-} EMsgComposerHeaderVisibleFlags;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType     e_msg_composer_hdrs_get_type           (void);</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_new                (gint visible_flags);</div><div class='del'>-</div><div class='del'>-void        e_msg_composer_hdrs_to_message         (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    CamelMimeMessage *msg);</div><div class='del'>-</div><div class='del'>-void        e_msg_composer_hdrs_to_redirect        (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    CamelMimeMessage *msg);</div><div class='del'>-</div><div class='del'>-void        e_msg_composer_hdrs_set_from_account   (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const char *account_name);</div><div class='del'>-void        e_msg_composer_hdrs_set_reply_to       (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const char *reply_to);</div><div class='del'>-void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    EDestination    **to_destv);</div><div class='del'>-void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    EDestination    **cc_destv);</div><div class='del'>-void        e_msg_composer_hdrs_set_bcc            (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    EDestination    **bcc_destv);</div><div class='del'>-void        e_msg_composer_hdrs_set_subject        (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const char       *subject);</div><div class='del'>-</div><div class='del'>-CamelInternetAddress *e_msg_composer_hdrs_get_from (EMsgComposerHdrs *hdrs);</div><div class='del'>-CamelInternetAddress *e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs);</div><div class='del'>-</div><div class='del'>-EDestination **e_msg_composer_hdrs_get_to          (EMsgComposerHdrs *hdrs);</div><div class='del'>-EDestination **e_msg_composer_hdrs_get_cc          (EMsgComposerHdrs *hdrs);</div><div class='del'>-EDestination **e_msg_composer_hdrs_get_bcc         (EMsgComposerHdrs *hdrs);</div><div class='del'>-EDestination **e_msg_composer_hdrs_get_recipients  (EMsgComposerHdrs *hdrs);</div><div class='del'>-char          *e_msg_composer_hdrs_get_subject     (EMsgComposerHdrs *hdrs);</div><div class='del'>-</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_get_reply_to_entry (EMsgComposerHdrs *hdrs);</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_get_to_entry       (EMsgComposerHdrs *hdrs);</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_get_cc_entry       (EMsgComposerHdrs *hdrs);</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_get_bcc_entry      (EMsgComposerHdrs *hdrs);</div><div class='del'>-GtkWidget  *e_msg_composer_hdrs_get_subject_entry  (EMsgComposerHdrs *hdrs);</div><div class='del'>-</div><div class='del'>-void        e_msg_composer_set_hdrs_visible        (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    gint flags);</div><div class='del'>-</div><div class='del'>-#ifdef _cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* _cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MSG_COMPOSER_HDRS_H__ */</div><div class='head'>diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c<br/>deleted file mode 100644<br/>index e46c4ad2be..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-select-file.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-select-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,268 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer-select-file.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtkfilesel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-file-selection.h&gt;</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _FileSelectionInfo {</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkToggleButton *inline_checkbox;</div><div class='del'>-	gboolean multiple;</div><div class='del'>-	GPtrArray *selected_files;</div><div class='del'>-} FileSelectionInfo;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-confirm (FileSelectionInfo *info)</div><div class='del'>-{</div><div class='del'>-	char **file_list;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	file_list = e_file_selection_get_filenames (E_FILE_SELECTION (info-&gt;widget));</div><div class='del'>-</div><div class='del'>-	if (!info-&gt;selected_files)</div><div class='del'>-		info-&gt;selected_files = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	for (i = 0; file_list[i]; i++)</div><div class='del'>-		g_ptr_array_add (info-&gt;selected_files, file_list[i]);</div><div class='del'>-</div><div class='del'>-	g_free (file_list);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_hide (info-&gt;widget);</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel (FileSelectionInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_assert (info-&gt;selected_files == NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_hide (info-&gt;widget);</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ok_clicked_cb (GtkWidget *widget, void *data)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = (FileSelectionInfo *) data;</div><div class='del'>-	confirm (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cancel_clicked_cb (GtkWidget *widget, void *data)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = (FileSelectionInfo *) data;</div><div class='del'>-	cancel (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-delete_event_cb (GtkWidget *widget, GdkEventAny *event, void *data)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = (FileSelectionInfo *) data;</div><div class='del'>-	cancel (info);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-composer_hide_cb (GtkWidget *widget, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = (FileSelectionInfo *) user_data;</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (info-&gt;widget))</div><div class='del'>-		cancel (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Setup.  */</div><div class='del'>-</div><div class='del'>-static FileSelectionInfo *</div><div class='del'>-create_file_selection (EMsgComposer *composer, gboolean multiple)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *ok_button;</div><div class='del'>-	GtkWidget *cancel_button;</div><div class='del'>-	GtkWidget *inline_checkbox;</div><div class='del'>-	GtkWidget *box;</div><div class='del'>-	char *path;</div><div class='del'>-	</div><div class='del'>-	info = g_new (FileSelectionInfo, 1);</div><div class='del'>-	</div><div class='del'>-	widget = e_file_selection_new (NULL);</div><div class='del'>-	path = g_strdup_printf ("%s/", g_get_home_dir ());</div><div class='del'>-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (widget), path);</div><div class='del'>-	g_free (path);</div><div class='del'>-	gtk_window_set_wmclass (GTK_WINDOW (widget), "fileselection", </div><div class='del'>-				"Evolution:composer");</div><div class='del'>-	</div><div class='del'>-	gtk_object_set (GTK_OBJECT (widget),</div><div class='del'>-			"multiple", multiple,</div><div class='del'>-			NULL);</div><div class='del'>-	</div><div class='del'>-	ok_button     = GTK_FILE_SELECTION (widget)-&gt;ok_button;</div><div class='del'>-	cancel_button = GTK_FILE_SELECTION (widget)-&gt;cancel_button;</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ok_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC (ok_clicked_cb), info);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (cancel_button),</div><div class='del'>-			    "clicked", GTK_SIGNAL_FUNC (cancel_clicked_cb), info);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (widget), "delete_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_event_cb), info);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer), "hide",</div><div class='del'>-			    GTK_SIGNAL_FUNC (composer_hide_cb), info);</div><div class='del'>-	</div><div class='del'>-	inline_checkbox = gtk_check_button_new_with_label (_("Suggest automatic display of attachment"));</div><div class='del'>-	box = gtk_widget_get_ancestor (GTK_FILE_SELECTION (widget)-&gt;selection_entry, GTK_TYPE_BOX);</div><div class='del'>-	gtk_box_pack_end (GTK_BOX (box), inline_checkbox, FALSE, FALSE, 4);</div><div class='del'>-	</div><div class='del'>-	info-&gt;widget          = widget;</div><div class='del'>-	info-&gt;multiple        = multiple;</div><div class='del'>-	info-&gt;selected_files  = NULL;</div><div class='del'>-	info-&gt;inline_checkbox = GTK_TOGGLE_BUTTON (inline_checkbox);</div><div class='del'>-	</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_selection_info_destroy_notify (void *data)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	info = (FileSelectionInfo *) data;</div><div class='del'>-	</div><div class='del'>-	if (info-&gt;widget != NULL)</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (info-&gt;widget));</div><div class='del'>-	</div><div class='del'>-	if (info-&gt;selected_files) {</div><div class='del'>-		for (i = 0; i &lt; info-&gt;selected_files-&gt;len; i++)</div><div class='del'>-			g_free (info-&gt;selected_files-&gt;pdata[i]);</div><div class='del'>-		</div><div class='del'>-		g_ptr_array_free (info-&gt;selected_files, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-select_file_internal (EMsgComposer *composer,</div><div class='del'>-		      const char *title,</div><div class='del'>-		      gboolean multiple,</div><div class='del'>-		      gboolean *inline_p)</div><div class='del'>-{</div><div class='del'>-	FileSelectionInfo *info;</div><div class='del'>-	GPtrArray *files;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);</div><div class='del'>-	</div><div class='del'>-	info = gtk_object_get_data (GTK_OBJECT (composer),</div><div class='del'>-				    "e-msg-composer-file-selection-info");</div><div class='del'>-	</div><div class='del'>-	if (info == NULL) {</div><div class='del'>-		info = create_file_selection (composer, multiple);</div><div class='del'>-		gtk_object_set_data_full (GTK_OBJECT (composer),</div><div class='del'>-					  "e-msg-composer-file-selection-info", info,</div><div class='del'>-					  file_selection_info_destroy_notify);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (GTK_WIDGET_VISIBLE (info-&gt;widget))</div><div class='del'>-		return NULL;		/* Busy!  */</div><div class='del'>-	</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (info-&gt;widget), title);</div><div class='del'>-	if (inline_p)</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (info-&gt;inline_checkbox));</div><div class='del'>-	else</div><div class='del'>-		gtk_widget_hide (GTK_WIDGET (info-&gt;inline_checkbox));</div><div class='del'>-	gtk_widget_show (info-&gt;widget);</div><div class='del'>-	</div><div class='del'>-	GDK_THREADS_ENTER();</div><div class='del'>-	gtk_main ();</div><div class='del'>-	GDK_THREADS_LEAVE();</div><div class='del'>-	</div><div class='del'>-	files = info-&gt;selected_files;</div><div class='del'>-	info-&gt;selected_files = NULL;</div><div class='del'>-	</div><div class='del'>-	if (inline_p) {</div><div class='del'>-		*inline_p = gtk_toggle_button_get_active (info-&gt;inline_checkbox);</div><div class='del'>-		gtk_toggle_button_set_active (info-&gt;inline_checkbox, FALSE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return files;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_select_file:</div><div class='del'>- * @composer: a composer</div><div class='del'>- * @title: the title for the file selection dialog box</div><div class='del'>- *</div><div class='del'>- * This pops up a file selection dialog box with the given title</div><div class='del'>- * and allows the user to select a file.</div><div class='del'>- *</div><div class='del'>- * Return value: the selected filename, or %NULL if the user</div><div class='del'>- * cancelled.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_msg_composer_select_file (EMsgComposer *composer,</div><div class='del'>-			    const char *title)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *files;</div><div class='del'>-	char *filename = NULL;</div><div class='del'>-	</div><div class='del'>-	files = select_file_internal (composer, title, FALSE, NULL);</div><div class='del'>-	if (files) {</div><div class='del'>-		filename = files-&gt;pdata[0];</div><div class='del'>-		g_ptr_array_free (files, FALSE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *</div><div class='del'>-e_msg_composer_select_file_attachments (EMsgComposer *composer,</div><div class='del'>-					gboolean *inline_p)</div><div class='del'>-{</div><div class='del'>-	return select_file_internal (composer, _("Attach a file"), TRUE, inline_p);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-select-file.h b/composer/e-msg-composer-select-file.h<br/>deleted file mode 100644<br/>index 8216089130..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-select-file.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer-select-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer-select-file.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_MSG_COMPOSER_SELECT_FILE_H</div><div class='del'>-#define E_MSG_COMPOSER_SELECT_FILE_H</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-char *e_msg_composer_select_file (EMsgComposer *composer,</div><div class='del'>-				  const char *title);</div><div class='del'>-</div><div class='del'>-GPtrArray *e_msg_composer_select_file_attachments (EMsgComposer *composer,</div><div class='del'>-						   gboolean *inline_p);</div><div class='del'>-</div><div class='del'>-#endif /* E_MSG_COMPOSER_SELECT_FILE_H */</div><div class='head'>diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c<br/>deleted file mode 100644<br/>index bf93b80762..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4323 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Ettore Perazzoli (ettore@ximian.com)</div><div class='del'>- *   Jeffrey Stedfast (fejj@ximian.com)</div><div class='del'>- *   Miguel de Icaza  (miguel@ximian.com)</div><div class='del'>- *   Radek Doulik     (rodo@ximian.com)</div><div class='del'>- * </div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-</div><div class='del'>-   TODO</div><div class='del'>-</div><div class='del'>-   - Somehow users should be able to see if any file(s) are attached even when</div><div class='del'>-     the attachment bar is not shown.</div><div class='del'>-</div><div class='del'>-   Should use EventSources to keep track of global changes made to configuration</div><div class='del'>-   values.  Right now it ignores the problem olympically. Miguel.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-exec.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-window-icon.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object-client.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-memory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/htmlselection.h&gt;</div><div class='del'>-</div><div class='del'>-/*#include &lt;addressbook/backend/ebook/e-card.h&gt;*/</div><div class='del'>-</div><div class='del'>-#include "widgets/misc/e-charset-picker.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel.h"</div><div class='del'>-#include "camel/camel-charset-map.h"</div><div class='del'>-#include "camel/camel-session.h"</div><div class='del'>-</div><div class='del'>-#include "mail/mail.h"</div><div class='del'>-#include "mail/mail-crypto.h"</div><div class='del'>-#include "mail/mail-tools.h"</div><div class='del'>-#include "mail/mail-ops.h"</div><div class='del'>-#include "mail/mail-mt.h"</div><div class='del'>-#include "mail/mail-session.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/e-html-utils.h"</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-attachment-bar.h"</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-#include "Editor.h"</div><div class='del'>-#include "listener.h"</div><div class='del'>-</div><div class='del'>-#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:1.1"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DEFAULT_WIDTH 600</div><div class='del'>-#define DEFAULT_HEIGHT 500</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	SEND,</div><div class='del'>-	POSTPONE,</div><div class='del'>-	SAVE_DRAFT,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	DND_TYPE_MESSAGE_RFC822,</div><div class='del'>-	DND_TYPE_TEXT_URI_LIST,</div><div class='del'>-	DND_TYPE_TEXT_VCARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkTargetEntry drop_types[] = {</div><div class='del'>-	{ "message/rfc822", 0, DND_TYPE_MESSAGE_RFC822 },</div><div class='del'>-	{ "text/uri-list", 0, DND_TYPE_TEXT_URI_LIST },</div><div class='del'>-	{ "text/x-vcard", 0, DND_TYPE_TEXT_VCARD },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int num_drop_types = sizeof (drop_types) / sizeof (drop_types[0]);</div><div class='del'>-</div><div class='del'>-static GnomeAppClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* local prototypes */</div><div class='del'>-static GList *add_recipients   (GList *list, const char *recips, gboolean decode);</div><div class='del'>-</div><div class='del'>-static void message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream);</div><div class='del'>-</div><div class='del'>-/* used by e_msg_composer_add_message_attachments() */</div><div class='del'>-static void add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,</div><div class='del'>-					    gboolean just_inlines, int depth);</div><div class='del'>-</div><div class='del'>-/* used by e_msg_composer_new_with_message() */</div><div class='del'>-static void handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth);</div><div class='del'>-</div><div class='del'>-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);</div><div class='del'>-</div><div class='del'>-static void set_editor_signature (EMsgComposer *composer);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GByteArray *</div><div class='del'>-get_text (Bonobo_PersistStream persist, char *format)</div><div class='del'>-{</div><div class='del'>-	BonoboStream *stream;</div><div class='del'>-	BonoboStreamMem *stream_mem;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GByteArray *text;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	stream = bonobo_stream_mem_create (NULL, 0, FALSE, TRUE);</div><div class='del'>-	Bonobo_PersistStream_save (persist, (Bonobo_Stream)bonobo_object_corba_objref (BONOBO_OBJECT (stream)),</div><div class='del'>-				   format, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Exception getting mail '%s'",</div><div class='del'>-			   bonobo_exception_get_text (&amp;ev));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	stream_mem = BONOBO_STREAM_MEM (stream);</div><div class='del'>-	text = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (text, stream_mem-&gt;buffer, stream_mem-&gt;pos);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT(stream));</div><div class='del'>-	</div><div class='del'>-	return text;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define LINE_LEN 72</div><div class='del'>-</div><div class='del'>-static CamelMimePartEncodingType</div><div class='del'>-best_encoding (GByteArray *buf, const char *charset)</div><div class='del'>-{</div><div class='del'>-	char *in, *out, outbuf[256], *ch;</div><div class='del'>-	size_t inlen, outlen;</div><div class='del'>-	int status, count = 0;</div><div class='del'>-	iconv_t cd;</div><div class='del'>-	</div><div class='del'>-	if (!charset)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	cd = iconv_open (charset, "utf-8");</div><div class='del'>-	if (cd == (iconv_t) -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	in = buf-&gt;data;</div><div class='del'>-	inlen = buf-&gt;len;</div><div class='del'>-	do {</div><div class='del'>-		out = outbuf;</div><div class='del'>-		outlen = sizeof (outbuf);</div><div class='del'>-		status = iconv (cd, &amp;in, &amp;inlen, &amp;out, &amp;outlen);</div><div class='del'>-		for (ch = out - 1; ch &gt;= outbuf; ch--) {</div><div class='del'>-			if ((unsigned char)*ch &gt; 127)</div><div class='del'>-				count++;</div><div class='del'>-		}</div><div class='del'>-	} while (status == -1 &amp;&amp; errno == E2BIG);</div><div class='del'>-	iconv_close (cd);</div><div class='del'>-	</div><div class='del'>-	if (status == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	if (count == 0)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_7BIT;</div><div class='del'>-	else if (count &lt;= buf-&gt;len * 0.17)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	else</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-best_charset (GByteArray *buf, const char *default_charset, CamelMimePartEncodingType *encoding)</div><div class='del'>-{</div><div class='del'>-	const char *charset;</div><div class='del'>-	</div><div class='del'>-	/* First try US-ASCII */</div><div class='del'>-	*encoding = best_encoding (buf, "US-ASCII");</div><div class='del'>-	if (*encoding == CAMEL_MIME_PART_ENCODING_7BIT)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Next try the user-specified charset for this message */</div><div class='del'>-	charset = default_charset;</div><div class='del'>-	*encoding = best_encoding (buf, charset);</div><div class='del'>-	if (*encoding != -1)</div><div class='del'>-		return charset;</div><div class='del'>-	</div><div class='del'>-	/* Now try the user's default charset from the mail config */</div><div class='del'>-	charset = mail_config_get_default_charset ();</div><div class='del'>-	*encoding = best_encoding (buf, charset);</div><div class='del'>-	if (*encoding != -1)</div><div class='del'>-		return charset;</div><div class='del'>-	</div><div class='del'>-	/* Try to find something that will work */</div><div class='del'>-	charset = camel_charset_best (buf-&gt;data, buf-&gt;len);</div><div class='del'>-	if (!charset)</div><div class='del'>-		*encoding = CAMEL_MIME_PART_ENCODING_7BIT;</div><div class='del'>-	else</div><div class='del'>-		*encoding = best_encoding (buf, charset);</div><div class='del'>-	return charset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-clear_inline_images (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	camel_object_unref (value);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clear_current_images (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_list_free (composer-&gt;current_images);</div><div class='del'>-	composer-&gt;current_images = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-clear_url (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_clear_inlined_table (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach_remove (composer-&gt;inline_images, clear_inline_images, NULL);</div><div class='del'>-	g_hash_table_foreach_remove (composer-&gt;inline_images_by_url, clear_url, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_inlined_images (EMsgComposer *composer, CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	GList *d = composer-&gt;current_images;</div><div class='del'>-	GHashTable *added;</div><div class='del'>-</div><div class='del'>-	added = g_hash_table_new (g_direct_hash, g_direct_equal);</div><div class='del'>-	while (d) {</div><div class='del'>-		CamelMimePart *part = d-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!g_hash_table_lookup (added, part)) {</div><div class='del'>-			camel_multipart_add_part (multipart, part);</div><div class='del'>-			g_hash_table_insert (added, part, part);</div><div class='del'>-		}</div><div class='del'>-		d = d-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy (added);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This functions builds a CamelMimeMessage for the message that the user has</div><div class='del'>- * composed in `composer'.</div><div class='del'>- */</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-build_message (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *attachment_bar =</div><div class='del'>-		E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar);</div><div class='del'>-	EMsgComposerHdrs *hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-	CamelMimeMessage *new;</div><div class='del'>-	GByteArray *data;</div><div class='del'>-	CamelDataWrapper *plain, *html, *current;</div><div class='del'>-	CamelMimePartEncodingType plain_encoding;</div><div class='del'>-	const char *charset;</div><div class='del'>-	CamelContentType *type;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelMultipart *body = NULL;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelException ex;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;persist_stream_interface == CORBA_OBJECT_NIL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* evil kludgy hack for Redirect */</div><div class='del'>-	if (composer-&gt;redirect) {</div><div class='del'>-		e_msg_composer_hdrs_to_redirect (hdrs, composer-&gt;redirect);</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (composer-&gt;redirect));</div><div class='del'>-		return composer-&gt;redirect;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	new = camel_mime_message_new ();</div><div class='del'>-	e_msg_composer_hdrs_to_message (hdrs, new);</div><div class='del'>-	for (i = 0; i &lt; composer-&gt;extra_hdr_names-&gt;len; i++) {</div><div class='del'>-		camel_medium_add_header (CAMEL_MEDIUM (new),</div><div class='del'>-					 composer-&gt;extra_hdr_names-&gt;pdata[i],</div><div class='del'>-					 composer-&gt;extra_hdr_values-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;mime_body) {</div><div class='del'>-		plain_encoding = CAMEL_MIME_PART_ENCODING_7BIT;</div><div class='del'>-		for (i = 0; composer-&gt;mime_body[i]; i++) {</div><div class='del'>-			if ((unsigned char)composer-&gt;mime_body[i] &gt; 127) {</div><div class='del'>-				plain_encoding = CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		data = g_byte_array_new ();</div><div class='del'>-		g_byte_array_append (data, composer-&gt;mime_body, strlen (composer-&gt;mime_body));</div><div class='del'>-		type = header_content_type_decode (composer-&gt;mime_type);</div><div class='del'>-	} else {</div><div class='del'>-		data = get_text (composer-&gt;persist_stream_interface, "text/plain");</div><div class='del'>-		if (!data) {</div><div class='del'>-			/* The component has probably died */</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (new));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* FIXME: we may want to do better than this... */</div><div class='del'>-		charset = best_charset (data, composer-&gt;charset, &amp;plain_encoding);</div><div class='del'>-		type = header_content_type_new ("text", "plain");</div><div class='del'>-		if (charset)</div><div class='del'>-			header_content_type_set_param (type, "charset", charset);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	plain = camel_data_wrapper_new ();</div><div class='del'>-	stream = camel_stream_mem_new_with_byte_array (data);</div><div class='del'>-	camel_data_wrapper_construct_from_stream (plain, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	camel_data_wrapper_set_mime_type_field (plain, type);</div><div class='del'>-	header_content_type_unref (type);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;send_html) {</div><div class='del'>-		clear_current_images (composer);</div><div class='del'>-		</div><div class='del'>-		data = get_text (composer-&gt;persist_stream_interface, "text/html");		</div><div class='del'>-		if (!data) {</div><div class='del'>-			/* The component has probably died */</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (new));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (plain));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		html = camel_data_wrapper_new ();</div><div class='del'>-		stream = camel_stream_mem_new_with_byte_array (data);</div><div class='del'>-		camel_data_wrapper_construct_from_stream (html, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_data_wrapper_set_mime_type (html, "text/html; charset=utf-8");</div><div class='del'>-		</div><div class='del'>-		/* Build the multipart/alternative */</div><div class='del'>-		body = camel_multipart_new ();</div><div class='del'>-		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),</div><div class='del'>-						  "multipart/alternative");</div><div class='del'>-		camel_multipart_set_boundary (body, NULL);</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (part), plain);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (plain));</div><div class='del'>-		camel_mime_part_set_encoding (part, plain_encoding);</div><div class='del'>-		camel_multipart_add_part (body, part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (part), html);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (html));</div><div class='del'>-		camel_multipart_add_part (body, part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		/* If there are inlined images, construct a</div><div class='del'>-		 * multipart/related containing the</div><div class='del'>-		 * multipart/alternative and the images.</div><div class='del'>-		 */</div><div class='del'>-		if (composer-&gt;current_images) {</div><div class='del'>-			CamelMultipart *html_with_images;</div><div class='del'>-			</div><div class='del'>-			html_with_images = camel_multipart_new ();</div><div class='del'>-			camel_data_wrapper_set_mime_type (</div><div class='del'>-				CAMEL_DATA_WRAPPER (html_with_images),</div><div class='del'>-				"multipart/related; type=\"multipart/alternative\"");</div><div class='del'>-			camel_multipart_set_boundary (html_with_images, NULL);</div><div class='del'>-			</div><div class='del'>-			part = camel_mime_part_new ();</div><div class='del'>-			camel_medium_set_content_object (CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER (body));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (body));</div><div class='del'>-			camel_multipart_add_part (html_with_images, part);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-			</div><div class='del'>-			add_inlined_images (composer, html_with_images);</div><div class='del'>-			clear_current_images (composer);</div><div class='del'>-			</div><div class='del'>-			current = CAMEL_DATA_WRAPPER (html_with_images);</div><div class='del'>-		} else</div><div class='del'>-			current = CAMEL_DATA_WRAPPER (body);</div><div class='del'>-	} else</div><div class='del'>-		current = plain;</div><div class='del'>-	</div><div class='del'>-	if (e_msg_composer_attachment_bar_get_num_attachments (attachment_bar)) {</div><div class='del'>-		CamelMultipart *multipart = camel_multipart_new ();</div><div class='del'>-		</div><div class='del'>-		if (composer-&gt;is_alternative) {</div><div class='del'>-			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),</div><div class='del'>-							  "multipart/alternative");</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* Generate a random boundary. */</div><div class='del'>-		camel_multipart_set_boundary (multipart, NULL);</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);</div><div class='del'>-		if (current == plain)</div><div class='del'>-			camel_mime_part_set_encoding (part, plain_encoding);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (current));</div><div class='del'>-		camel_multipart_add_part (multipart, part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart, composer-&gt;charset);</div><div class='del'>-		</div><div class='del'>-		if (composer-&gt;is_alternative) {</div><div class='del'>-			int i;</div><div class='del'>-			</div><div class='del'>-			for (i = camel_multipart_get_number (multipart); i &gt; 1; i--) {</div><div class='del'>-				part = camel_multipart_get_part (multipart, i - 1);</div><div class='del'>-				camel_medium_remove_header (CAMEL_MEDIUM (part), "Content-Disposition");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		current = CAMEL_DATA_WRAPPER (multipart);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;pgp_sign || composer-&gt;pgp_encrypt) {</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (part), current);</div><div class='del'>-		if (current == plain)</div><div class='del'>-			camel_mime_part_set_encoding (part, plain_encoding);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (current));</div><div class='del'>-		</div><div class='del'>-		if (composer-&gt;pgp_sign) {</div><div class='del'>-			CamelInternetAddress *from = NULL;</div><div class='del'>-			const char *pgpid;</div><div class='del'>-			</div><div class='del'>-			camel_exception_init (&amp;ex);</div><div class='del'>-			</div><div class='del'>-			if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;pgp_key &amp;&amp; *hdrs-&gt;account-&gt;pgp_key) {</div><div class='del'>-				pgpid = hdrs-&gt;account-&gt;pgp_key;</div><div class='del'>-			} else {</div><div class='del'>-				/* time for plan b */</div><div class='del'>-				from = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-				camel_internet_address_get (from, 0, NULL, &amp;pgpid);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			printf ("build_message(): pgpid = '%s'\n", pgpid);</div><div class='del'>-			</div><div class='del'>-			mail_crypto_pgp_mime_part_sign (&amp;part, pgpid, CAMEL_CIPHER_HASH_SHA1, &amp;ex);</div><div class='del'>-			</div><div class='del'>-			if (from)</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (from));</div><div class='del'>-			</div><div class='del'>-			if (camel_exception_is_set (&amp;ex))</div><div class='del'>-				goto exception;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (composer-&gt;pgp_encrypt) {</div><div class='del'>-			/* FIXME: recipients should be an array of key ids rather than email addresses */</div><div class='del'>-			const CamelInternetAddress *addr;</div><div class='del'>-			const char *address;</div><div class='del'>-			GPtrArray *recipients;</div><div class='del'>-			int i, len;</div><div class='del'>-			</div><div class='del'>-			camel_exception_init (&amp;ex);</div><div class='del'>-			recipients = g_ptr_array_new ();</div><div class='del'>-			</div><div class='del'>-			/* check to see if we should encrypt to self */</div><div class='del'>-			if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;pgp_encrypt_to_self) {</div><div class='del'>-				CamelInternetAddress *from = NULL;</div><div class='del'>-				</div><div class='del'>-				if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;pgp_key &amp;&amp; *hdrs-&gt;account-&gt;pgp_key) {</div><div class='del'>-					address = hdrs-&gt;account-&gt;pgp_key;</div><div class='del'>-				} else {</div><div class='del'>-					/* time for plan b */</div><div class='del'>-					from = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-					camel_internet_address_get (from, 0, NULL, &amp;address);</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-				</div><div class='del'>-				if (from)</div><div class='del'>-					camel_object_unref (CAMEL_OBJECT (from));</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-			len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-			for (i = 0; i &lt; len; i++) {</div><div class='del'>-				camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-				g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-			len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-			for (i = 0; i &lt; len; i++) {</div><div class='del'>-				camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-				g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_BCC);</div><div class='del'>-			len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-			for (i = 0; i &lt; len; i++) {</div><div class='del'>-				camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-				g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			mail_crypto_pgp_mime_part_encrypt (&amp;part, recipients, &amp;ex);</div><div class='del'>-			for (i = 0; i &lt; recipients-&gt;len; i++)</div><div class='del'>-				g_free (recipients-&gt;pdata[i]);</div><div class='del'>-			g_ptr_array_free (recipients, TRUE);</div><div class='del'>-			if (camel_exception_is_set (&amp;ex))</div><div class='del'>-				goto exception;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		current = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (current));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (new), current);</div><div class='del'>-	if (current == plain)</div><div class='del'>-		camel_mime_part_set_encoding (CAMEL_MIME_PART (new), plain_encoding);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (current));</div><div class='del'>-	</div><div class='del'>-#if defined (HAVE_NSS) &amp;&amp; defined (SMIME_SUPPORTED)</div><div class='del'>-	if (composer-&gt;smime_sign) {</div><div class='del'>-		CamelInternetAddress *from = NULL;</div><div class='del'>-		CamelMimeMessage *smime_mesg;</div><div class='del'>-		const char *certname;</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		</div><div class='del'>-		if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;smime_key &amp;&amp; *hdrs-&gt;account-&gt;smime_key) {</div><div class='del'>-			certname = hdrs-&gt;account-&gt;smime_key;</div><div class='del'>-		} else {</div><div class='del'>-			/* time for plan b */</div><div class='del'>-			from = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-			camel_internet_address_get (from, 0, NULL, &amp;certname);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		smime_mesg = mail_crypto_smime_sign (new, certname, TRUE, TRUE, &amp;ex);</div><div class='del'>-		</div><div class='del'>-		if (from)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (from));</div><div class='del'>-		</div><div class='del'>-		if (camel_exception_is_set (&amp;ex))</div><div class='del'>-			goto exception;</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (new));</div><div class='del'>-		new = smime_mesg;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;smime_encrypt) {</div><div class='del'>-		/* FIXME: we should try to get the preferred cert "nickname" for each recipient */</div><div class='del'>-		const CamelInternetAddress *addr = NULL;</div><div class='del'>-		CamelInternetAddress *from = NULL;</div><div class='del'>-		CamelMimeMessage *smime_mesg;</div><div class='del'>-		const char *address;</div><div class='del'>-		GPtrArray *recipients;</div><div class='del'>-		int i, len;</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		recipients = g_ptr_array_new ();</div><div class='del'>-		</div><div class='del'>-		/* check to see if we should encrypt to self */</div><div class='del'>-		if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;smime_encrypt_to_self) {</div><div class='del'>-			if (hdrs-&gt;account &amp;&amp; hdrs-&gt;account-&gt;smime_key &amp;&amp; *hdrs-&gt;account-&gt;smime_key) {</div><div class='del'>-				address = hdrs-&gt;account-&gt;smime_key;</div><div class='del'>-			} else {</div><div class='del'>-				/* time for plan b */</div><div class='del'>-				from = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-				camel_internet_address_get (from, 0, NULL, &amp;address);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-			</div><div class='del'>-			if (from)</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (addr));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-		len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-		for (i = 0; i &lt; len; i++) {</div><div class='del'>-			camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-			g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-		len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-		for (i = 0; i &lt; len; i++) {</div><div class='del'>-			camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-			g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		addr = camel_mime_message_get_recipients (new, CAMEL_RECIPIENT_TYPE_BCC);</div><div class='del'>-		len = camel_address_length (CAMEL_ADDRESS (addr));</div><div class='del'>-		for (i = 0; i &lt; len; i++) {</div><div class='del'>-			camel_internet_address_get (addr, i, NULL, &amp;address);</div><div class='del'>-			g_ptr_array_add (recipients, g_strdup (address));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs));</div><div class='del'>-		camel_internet_address_get (from, 0, NULL, &amp;address);</div><div class='del'>-		</div><div class='del'>-		smime_mesg = mail_crypto_smime_encrypt (new, address, recipients, &amp;ex);</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (from));</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; recipients-&gt;len; i++)</div><div class='del'>-			g_free (recipients-&gt;pdata[i]);</div><div class='del'>-		g_ptr_array_free (recipients, TRUE);</div><div class='del'>-		</div><div class='del'>-		if (camel_exception_is_set (&amp;ex))</div><div class='del'>-			goto exception;</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (new));</div><div class='del'>-		new = smime_mesg;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* FIXME: what about mail_crypto_smime_certsonly()?? */</div><div class='del'>-	</div><div class='del'>-	/* FIXME: what about mail_crypto_smime_envelope()?? */</div><div class='del'>-	</div><div class='del'>-#endif /* HAVE_NSS */</div><div class='del'>-	</div><div class='del'>-	/* Attach whether this message was written in HTML */</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (new), "X-Evolution-Format",</div><div class='del'>-				 composer-&gt;send_html ? "text/html" : "text/plain");</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-	</div><div class='del'>- exception:</div><div class='del'>-	</div><div class='del'>-	if (part != CAMEL_MIME_PART (new))</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (new));</div><div class='del'>-	</div><div class='del'>-	if (camel_exception_is_set (&amp;ex)) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		</div><div class='del'>-		dialog = gnome_error_dialog_parented (camel_exception_get_description (&amp;ex),</div><div class='del'>-						      GTK_WINDOW (composer));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_html, guint flags, gboolean warn)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelStreamMem *memstream;</div><div class='del'>-	CamelMimeFilter *html, *charenc;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	GByteArray *buffer;</div><div class='del'>-	const char *charset;</div><div class='del'>-	char *content;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	fd = open (file_name, O_RDONLY | O_CREAT, 0644);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		char *msg;</div><div class='del'>-		</div><div class='del'>-		if (warn) {</div><div class='del'>-			msg = g_strdup_printf (_("Error while reading file %s:\n%s"),</div><div class='del'>-					       file_name, g_strerror (errno));</div><div class='del'>-			gnome_error_dialog (msg);</div><div class='del'>-			g_free (msg);</div><div class='del'>-		}</div><div class='del'>-		return g_strdup ("");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	charset = composer ? composer-&gt;charset : mail_config_get_default_charset ();</div><div class='del'>-	charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "utf-8");</div><div class='del'>-	camel_stream_filter_add (filtered_stream, charenc);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (charenc));</div><div class='del'>-	</div><div class='del'>-	if (want_html) {</div><div class='del'>-		html = camel_mime_filter_tohtml_new (flags, 0);</div><div class='del'>-		camel_stream_filter_add (filtered_stream, html);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (html));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	memstream = (CamelStreamMem *) camel_stream_mem_new ();</div><div class='del'>-	buffer = g_byte_array_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (memstream, buffer);</div><div class='del'>-	</div><div class='del'>-	camel_stream_write_to_stream (CAMEL_STREAM (filtered_stream), CAMEL_STREAM (memstream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (memstream));</div><div class='del'>-	</div><div class='del'>-	g_byte_array_append (buffer, "", 1);</div><div class='del'>-	content = buffer-&gt;data;</div><div class='del'>-	g_byte_array_free (buffer, FALSE);</div><div class='del'>-	</div><div class='del'>-	return content;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_msg_composer_get_sig_file_content (const char *sigfile, gboolean in_html)</div><div class='del'>-{</div><div class='del'>-	if (!sigfile || !*sigfile) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return get_file_content (NULL, sigfile, !in_html, 0, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-prepare_engine (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	/* printf ("prepare_engine\n"); */</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	composer-&gt;editor_engine = (GNOME_GtkHTML_Editor_Engine) bonobo_object_client_query_interface</div><div class='del'>-		(bonobo_widget_get_server (BONOBO_WIDGET (composer-&gt;editor)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", &amp;ev);</div><div class='del'>-	if ((composer-&gt;editor_engine != CORBA_OBJECT_NIL) &amp;&amp; (ev._major == CORBA_NO_EXCEPTION)) {</div><div class='del'>-		</div><div class='del'>-		/* printf ("trying set listener\n"); */</div><div class='del'>-		composer-&gt;editor_listener = BONOBO_OBJECT (listener_new (composer));</div><div class='del'>-		if (composer-&gt;editor_listener != NULL)</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine__set_listener (composer-&gt;editor_engine,</div><div class='del'>-								   (GNOME_GtkHTML_Editor_Listener)</div><div class='del'>-								   bonobo_object_dup_ref</div><div class='del'>-								   (bonobo_object_corba_objref (composer-&gt;editor_listener),</div><div class='del'>-								    &amp;ev),</div><div class='del'>-								   &amp;ev);</div><div class='del'>-		</div><div class='del'>-		if ((ev._major != CORBA_NO_EXCEPTION) || (composer-&gt;editor_listener == NULL)) {</div><div class='del'>-			CORBA_Environment err_ev;</div><div class='del'>-</div><div class='del'>-			CORBA_exception_init (&amp;err_ev);</div><div class='del'>-			</div><div class='del'>-			Bonobo_Unknown_unref (composer-&gt;editor_engine, &amp;err_ev);</div><div class='del'>-			CORBA_Object_release (composer-&gt;editor_engine, &amp;err_ev);</div><div class='del'>-</div><div class='del'>-			CORBA_exception_free (&amp;err_ev);</div><div class='del'>-</div><div class='del'>-			composer-&gt;editor_engine = CORBA_OBJECT_NIL;</div><div class='del'>-			g_warning ("Can't establish Editor Listener\n");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		composer-&gt;editor_engine = CORBA_OBJECT_NIL;</div><div class='del'>-		g_warning ("Can't get Editor Engine\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-get_signature_html (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	gboolean format_html = FALSE;</div><div class='del'>-	char *text, *html = NULL, *sig_file = NULL, *script = NULL;</div><div class='del'>-	static gboolean random_initialized = FALSE;</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;signature) {</div><div class='del'>-		sig_file = composer-&gt;signature-&gt;filename;</div><div class='del'>-		format_html = composer-&gt;signature-&gt;html;</div><div class='del'>-		script = composer-&gt;signature-&gt;script;</div><div class='del'>-	} else if (composer-&gt;random_signature) {</div><div class='del'>-		GList *l;</div><div class='del'>-		gint pos;</div><div class='del'>-</div><div class='del'>-		if (!random_initialized) {</div><div class='del'>-			printf ("initialize random generator\n");</div><div class='del'>-			srand (time (NULL));</div><div class='del'>-			random_initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-		pos = (int) (((gdouble) mail_config_get_signatures_random ())*rand()/(RAND_MAX+1.0));</div><div class='del'>-		printf ("using %d sig\n", pos);</div><div class='del'>-</div><div class='del'>-		for (l = mail_config_get_signature_list (); l; l = l-&gt;next) {</div><div class='del'>-			MailConfigSignature *sig = (MailConfigSignature *) l-&gt;data;</div><div class='del'>-</div><div class='del'>-			if (sig-&gt;random) {</div><div class='del'>-				if (pos == 0) {</div><div class='del'>-					printf ("using %s\n", sig-&gt;name);</div><div class='del'>-					sig_file = sig-&gt;filename;</div><div class='del'>-					script = sig-&gt;script;</div><div class='del'>-					format_html = sig-&gt;html;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				pos --;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!sig_file)</div><div class='del'>-		return NULL;</div><div class='del'>-	printf ("sig file: %s\n", sig_file);</div><div class='del'>-</div><div class='del'>-	mail_config_signature_run_script (script);</div><div class='del'>-	text = e_msg_composer_get_sig_file_content (sig_file, format_html);</div><div class='del'>-	/* printf ("text: %s\n", text); */</div><div class='del'>-	if (text) {</div><div class='del'>-		/* The signature dash convention ("-- \n") is specified in the</div><div class='del'>-		 * "Son of RFC 1036": http://www.chemie.fu-berlin.de/outerspace/netnews/son-of-1036.html,</div><div class='del'>-		 * section 4.3.2.</div><div class='del'>-		 */</div><div class='del'>-		html = g_strdup_printf ("&lt;!--+GtkHTML:&lt;DATA class=\"ClueFlow\" key=\"signature\" value=\"1\"&gt;--&gt;"</div><div class='del'>-					"&lt;TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"&gt;&lt;TR&gt;&lt;TD&gt;"</div><div class='del'>-					"%s%s%s%s"</div><div class='del'>-					"&lt;/TD&gt;&lt;/TR&gt;&lt;/TABLE&gt;",</div><div class='del'>-					format_html ? "" : "&lt;PRE&gt;\n",</div><div class='del'>-					format_html || !strncmp ("-- \n", text, 4) ? "" : "-- \n",</div><div class='del'>-					text,</div><div class='del'>-					format_html ? "" : "&lt;/PRE&gt;\n");</div><div class='del'>-		g_free (text);</div><div class='del'>-		text = html;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return text;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editor_text (EMsgComposer *composer, const char *text)</div><div class='del'>-{</div><div class='del'>-	Bonobo_PersistStream persist;</div><div class='del'>-	BonoboStream *stream;</div><div class='del'>-	BonoboWidget *editor;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Bonobo_Unknown object;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (composer-&gt;persist_stream_interface != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	persist = composer-&gt;persist_stream_interface;</div><div class='del'>-	</div><div class='del'>-	editor = BONOBO_WIDGET (composer-&gt;editor);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	stream = bonobo_stream_mem_create (text, strlen (text), TRUE, FALSE);</div><div class='del'>-	object = bonobo_object_corba_objref (BONOBO_OBJECT (stream));</div><div class='del'>-	Bonobo_PersistStream_load (persist, (Bonobo_Stream) object, "text/html", &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		/* FIXME. Some error message. */</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (stream));</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_config (EMsgComposer *composer, char *key, int val)</div><div class='del'>-{</div><div class='del'>-	char *full_key;</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;config_db == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	full_key = g_strconcat ("/Mail/Composer/", key, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_config_set_long (composer-&gt;config_db, full_key, val, NULL);</div><div class='del'>-	</div><div class='del'>-	g_free (full_key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Commands.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_attachments (EMsgComposer *composer,</div><div class='del'>-		  gboolean show)</div><div class='del'>-{</div><div class='del'>-	if (show) {</div><div class='del'>-		gtk_widget_show (composer-&gt;attachment_scroll_frame);</div><div class='del'>-		gtk_widget_show (composer-&gt;attachment_bar);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (composer-&gt;attachment_scroll_frame);</div><div class='del'>-		gtk_widget_hide (composer-&gt;attachment_bar);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_bar_visible = show;</div><div class='del'>-	</div><div class='del'>-	/* Update the GUI.  */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewAttach",</div><div class='del'>-		"state", show ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save (EMsgComposer *composer,</div><div class='del'>-      const char *file_name)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *my_file_name;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	if (file_name != NULL)</div><div class='del'>-		my_file_name = g_strdup (file_name);</div><div class='del'>-	else</div><div class='del'>-		my_file_name = e_msg_composer_select_file (composer, _("Save as..."));</div><div class='del'>-	</div><div class='del'>-	if (my_file_name == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* check to see if we already have the file */</div><div class='del'>-	if ((fd = open (my_file_name, O_RDONLY | O_CREAT | O_EXCL, 0777)) == -1) {</div><div class='del'>-		GtkWidget *dialog, *label;</div><div class='del'>-		</div><div class='del'>-		dialog = gnome_dialog_new (_("Warning!"),</div><div class='del'>-					   GNOME_STOCK_BUTTON_YES,</div><div class='del'>-					   GNOME_STOCK_BUTTON_NO,</div><div class='del'>-					   NULL);</div><div class='del'>-		label = gtk_label_new (_("File exists, overwrite?"));</div><div class='del'>-		gtk_widget_show (label);</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), label, TRUE, TRUE, 0);</div><div class='del'>-		</div><div class='del'>-		switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) {</div><div class='del'>-		case -1:</div><div class='del'>-			gtk_widget_destroy (dialog);</div><div class='del'>-			return;</div><div class='del'>-		case 1:</div><div class='del'>-			return;</div><div class='del'>-		default:</div><div class='del'>-			/* ie, the user hit "Yes" so just continue as normal */</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		close (fd);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	Bonobo_PersistFile_save (composer-&gt;persist_file_interface, my_file_name, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error saving file: %s"), g_basename (my_file_name));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	g_free (my_file_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load (EMsgComposer *composer, const char *file_name)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	Bonobo_PersistFile_load (composer-&gt;persist_file_interface, file_name, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error loading file: %s"), g_basename (file_name));</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define AUTOSAVE_SEED ".evolution-composer.autosave-XXXXXX"</div><div class='del'>-#define AUTOSAVE_INTERVAL 60000</div><div class='del'>-</div><div class='del'>-typedef struct _AutosaveManager AutosaveManager;</div><div class='del'>-struct _AutosaveManager {</div><div class='del'>-	GHashTable *table;</div><div class='del'>-	guint id;</div><div class='del'>-	gboolean ask;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static AutosaveManager *am = NULL;</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-autosave_save_draft (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	char *file;</div><div class='del'>-	int fd;</div><div class='del'>-	gboolean success = TRUE;</div><div class='del'>-	</div><div class='del'>-	fd = composer-&gt;autosave_fd;</div><div class='del'>-	file = composer-&gt;autosave_file;</div><div class='del'>-	</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error accessing file: %s"), file);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	message = e_msg_composer_get_message_draft (composer);</div><div class='del'>-	</div><div class='del'>-	if (message == NULL) {</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Unable to retrieve message from editor"));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (lseek (fd, (off_t)0, SEEK_SET) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Unable to seek on file: %s\n%s"), file, g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (ftruncate (fd, (off_t)0) == -1) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Unable to truncate file: %s\n%s"), file, g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* this does an lseek so we don't have to */</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	if (camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream) == -1</div><div class='del'>-	    || camel_stream_flush (CAMEL_STREAM (stream)) == -1) {</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error autosaving message: %s\n %s"), file, strerror(errno));</div><div class='del'>-		</div><div class='del'>-		success = FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* set the fd to -1 in the stream so camel doesn't close it we want to keep it open */</div><div class='del'>-	CAMEL_STREAM_FS (stream)-&gt;fd = -1;</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-	</div><div class='del'>-	return success;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMsgComposer * </div><div class='del'>-autosave_load_draft (const char *filename)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (filename != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	g_warning ("autosave load filename = \"%s\"", filename);</div><div class='del'>-        </div><div class='del'>-	stream = camel_stream_fs_new_with_name (filename, O_RDONLY, 0);</div><div class='del'>-	</div><div class='del'>-	if (stream == NULL) </div><div class='del'>-		return NULL;</div><div class='del'>-		</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg), stream);</div><div class='del'>-	unlink (filename);</div><div class='del'>-	</div><div class='del'>-	composer = e_msg_composer_new_with_message (msg);</div><div class='del'>-	if (composer) {</div><div class='del'>-		autosave_save_draft (composer);</div><div class='del'>-		</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (composer), "send",</div><div class='del'>-				    GTK_SIGNAL_FUNC (composer_send_cb), NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (composer), "postpone",</div><div class='del'>-				    GTK_SIGNAL_FUNC (composer_postpone_cb), NULL);</div><div class='del'>-		</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (composer));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref ((CamelObject *)stream);</div><div class='del'>-	return composer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-autosave_is_owned (AutosaveManager *am, const char *file)</div><div class='del'>-{</div><div class='del'>-        return g_hash_table_lookup (am-&gt;table, file) != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_query_cb (gint reply, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int *yes = data;</div><div class='del'>-	</div><div class='del'>-	*yes = !reply;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_manager_query_load_orphans (AutosaveManager *am, EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	GSList *match = NULL;</div><div class='del'>-	gint len = strlen (AUTOSAVE_SEED);</div><div class='del'>-	gint load = FALSE;</div><div class='del'>-	</div><div class='del'>-	dir = opendir (g_get_home_dir());</div><div class='del'>-	if (!dir) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while ((d = readdir (dir))) {</div><div class='del'>-		if ((!strncmp (d-&gt;d_name, AUTOSAVE_SEED, len - 6))</div><div class='del'>-		    &amp;&amp; (strlen (d-&gt;d_name) == len)</div><div class='del'>-		    &amp;&amp; (!autosave_is_owned (am, d-&gt;d_name))) {</div><div class='del'>-			char *filename =  g_strdup_printf ("%s/%s", g_get_home_dir(), d-&gt;d_name);</div><div class='del'>-			struct stat st;</div><div class='del'>-		</div><div class='del'>-			/*</div><div class='del'>-			 * check if the file has any length,  It is a valid case if it doesn't </div><div class='del'>-			 * so we simply don't ask then.</div><div class='del'>-			 */</div><div class='del'>-			if (stat (filename, &amp;st) &lt; 0 || st.st_size == 0) {</div><div class='del'>-				unlink (filename);</div><div class='del'>-				g_free (filename);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			match = g_slist_prepend (match, filename);				</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	closedir (dir);</div><div class='del'>-	</div><div class='del'>-	if (match != NULL) {</div><div class='del'>-		dialog = gnome_question_dialog_parented (_("Ximian Evolution has found unsaved files from a previous session.\n"</div><div class='del'>-							   "Would you like to try to recover them?"),</div><div class='del'>-							 autosave_query_cb, &amp;load, GTK_WINDOW (composer));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while (match != NULL) {</div><div class='del'>-		GSList *next = match-&gt;next;</div><div class='del'>-		char *filename = match-&gt;data;</div><div class='del'>-		EMsgComposer *composer;</div><div class='del'>-		</div><div class='del'>-		if (load) { </div><div class='del'>-			composer = autosave_load_draft (filename);</div><div class='del'>-		} else {</div><div class='del'>-			unlink (filename);</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		g_free (filename);</div><div class='del'>-		g_slist_free_1 (match);</div><div class='del'>-		match = next;</div><div class='del'>-	}			</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_run_foreach_cb (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer = E_MSG_COMPOSER (value);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;enable_autosave)</div><div class='del'>-		autosave_save_draft (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-autosave_run (gpointer data)</div><div class='del'>-{</div><div class='del'>-	AutosaveManager *am = data;</div><div class='del'>-	</div><div class='del'>-	g_hash_table_foreach (am-&gt;table, (GHFunc)autosave_run_foreach_cb, am);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-autosave_init_file (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	if (composer-&gt;autosave_file == NULL) {</div><div class='del'>-		composer-&gt;autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);</div><div class='del'>-		composer-&gt;autosave_fd = mkstemp (composer-&gt;autosave_file);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_manager_start (AutosaveManager *am)</div><div class='del'>-{</div><div class='del'>-	if (am-&gt;id == 0)</div><div class='del'>-		am-&gt;id = gtk_timeout_add (AUTOSAVE_INTERVAL, autosave_run, am);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_manager_stop (AutosaveManager *am)</div><div class='del'>-{</div><div class='del'>-	if (am-&gt;id) {</div><div class='del'>-		gtk_timeout_remove (am-&gt;id);</div><div class='del'>-		am-&gt;id = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static AutosaveManager *</div><div class='del'>-autosave_manager_new ()</div><div class='del'>-{</div><div class='del'>-	AutosaveManager *am;</div><div class='del'>-	</div><div class='del'>-	am = g_new (AutosaveManager, 1);</div><div class='del'>-	am-&gt;table = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	am-&gt;id = 0;</div><div class='del'>-	am-&gt;ask = TRUE;</div><div class='del'>-	</div><div class='del'>-	return am;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_manager_register (AutosaveManager *am, EMsgComposer *composer) </div><div class='del'>-{</div><div class='del'>-	char *key;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	</div><div class='del'>-	if (autosave_init_file (composer)) {</div><div class='del'>-		key = g_basename (composer-&gt;autosave_file);</div><div class='del'>-		g_hash_table_insert (am-&gt;table, key, composer);</div><div class='del'>-		if (am-&gt;ask) {</div><div class='del'>-			/* keep recursion out of our bedrooms. */</div><div class='del'>-			am-&gt;ask = FALSE;</div><div class='del'>-			autosave_manager_query_load_orphans (am, composer);</div><div class='del'>-			am-&gt;ask = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	autosave_manager_start (am);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-autosave_manager_unregister (AutosaveManager *am, EMsgComposer *composer) </div><div class='del'>-{</div><div class='del'>-	if (!composer-&gt;autosave_file)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (am-&gt;table, g_basename (composer-&gt;autosave_file));</div><div class='del'>-	</div><div class='del'>-	/* only remove the file if we can successfully save it */</div><div class='del'>-	/* FIXME this test could probably be more efficient */</div><div class='del'>-	if (autosave_save_draft (composer)) {</div><div class='del'>-		unlink (composer-&gt;autosave_file);</div><div class='del'>-	}</div><div class='del'>-	close (composer-&gt;autosave_fd);</div><div class='del'>-	g_free (composer-&gt;autosave_file);</div><div class='del'>-	composer-&gt;autosave_file = NULL;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_size (am-&gt;table) == 0)</div><div class='del'>-		autosave_manager_stop (am);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_save_draft_cb (BonoboUIComponent *uic, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (data), signals[SAVE_DRAFT], FALSE);</div><div class='del'>-	e_msg_composer_unset_changed (E_MSG_COMPOSER (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */</div><div class='del'>-</div><div class='del'>-enum { REPLY_YES = 0, REPLY_NO, REPLY_CANCEL };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-exit_dialog_cb (int reply, EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	switch (reply) {</div><div class='del'>-	case REPLY_YES:</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (composer), signals[SAVE_DRAFT], TRUE);</div><div class='del'>-		e_msg_composer_unset_changed (composer);</div><div class='del'>-		break;</div><div class='del'>-	case REPLY_NO:</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (composer));</div><div class='del'>-		break;</div><div class='del'>-	case REPLY_CANCEL:</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_exit (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	gint button;</div><div class='del'>-	</div><div class='del'>-	if (e_msg_composer_is_dirty (composer)) {</div><div class='del'>-		dialog = gnome_message_box_new (_("This message has not been sent.\n\nDo you wish to save your changes?"),</div><div class='del'>-						GNOME_MESSAGE_BOX_QUESTION,</div><div class='del'>-						GNOME_STOCK_BUTTON_YES,      /* Save */</div><div class='del'>-						GNOME_STOCK_BUTTON_NO,       /* Don't save */</div><div class='del'>-						GNOME_STOCK_BUTTON_CANCEL,   /* Cancel */</div><div class='del'>-						NULL);</div><div class='del'>-	</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (dialog), _("Warning: Modified Message"));</div><div class='del'>-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (composer));</div><div class='del'>-		gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-		button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		exit_dialog_cb (button, composer);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (composer));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_open_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	char *file_name;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	file_name = e_msg_composer_select_file (composer, _("Open file"));</div><div class='del'>-	if (file_name == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	load (composer, file_name);</div><div class='del'>-	</div><div class='del'>-	g_free (file_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_save_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	CORBA_char *file_name;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	file_name = Bonobo_PersistFile_getCurrentFile (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		save (composer, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		save (composer, file_name);</div><div class='del'>-		CORBA_free (file_name);</div><div class='del'>-	}</div><div class='del'>-      	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_save_as_cb (BonoboUIComponent *uic,</div><div class='del'>-		      void *data,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	save (composer, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_send_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	if (session &amp;&amp; camel_session_is_online (session))</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);</div><div class='del'>-	else</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_send_later_cb (BonoboUIComponent *uic,</div><div class='del'>-			 void *data,</div><div class='del'>-			 const char *path)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_close_cb (BonoboUIComponent *uic,</div><div class='del'>-		    void *data,</div><div class='del'>-		    const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	do_exit (composer);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-menu_file_add_attachment_cb (BonoboUIComponent *uic,</div><div class='del'>-			     void *data,</div><div class='del'>-			     const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_attachment_bar_attach</div><div class='del'>-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-		 NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_edit_delete_all_cb (BonoboUIComponent *uic, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer-&gt;editor_engine, "Delete all but signature", "Undelete all", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_freeze (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "disable-selection", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "text-default-color", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "bold-off", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "italic-off", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "underline-off", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "strikeout-off", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "select-all", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "delete", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer-&gt;editor_engine, "signature", "0", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_setParagraphData (composer-&gt;editor_engine, "orig", "0", &amp;ev);</div><div class='del'>-	e_msg_composer_show_sig_file (composer);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "style-normal", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_thaw (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	printf ("delete all\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_attachments_activate_cb (BonoboUIComponent           *component,</div><div class='del'>-				   const char                  *path,</div><div class='del'>-				   Bonobo_UIComponent_EventType type,</div><div class='del'>-				   const char                  *state,</div><div class='del'>-				   gpointer                     user_data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	gboolean new_state;</div><div class='del'>-	</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	new_state = atoi (state);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_show_attachments (E_MSG_COMPOSER (user_data), new_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_insert_file_cb (BonoboUIComponent *uic,</div><div class='del'>-			  void *data,</div><div class='del'>-			  const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	char *file_name;</div><div class='del'>-	char *html;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	file_name = e_msg_composer_select_file (composer, _("Insert File"));</div><div class='del'>-	if (file_name == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	html = get_file_content (composer, file_name, TRUE, E_TEXT_TO_HTML_PRE, TRUE);</div><div class='del'>-	if (html == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_freeze (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-position-save", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer-&gt;editor_engine, "Insert file", "Uninsert file", &amp;ev);</div><div class='del'>-	if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (composer-&gt;editor_engine, &amp;ev))</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "insert-paragraph", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_insertHTML (composer-&gt;editor_engine, html, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-position-restore", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_thaw (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	g_free (html);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_format_html_cb (BonoboUIComponent           *component,</div><div class='del'>-		     const char                  *path,</div><div class='del'>-		     Bonobo_UIComponent_EventType type,</div><div class='del'>-		     const char                  *state,</div><div class='del'>-		     gpointer                     user_data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_send_html (E_MSG_COMPOSER (user_data), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_security_pgp_sign_cb (BonoboUIComponent           *component,</div><div class='del'>-			   const char                  *path,</div><div class='del'>-			   Bonobo_UIComponent_EventType type,</div><div class='del'>-			   const char                  *state,</div><div class='del'>-			   gpointer                     composer)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_pgp_sign (E_MSG_COMPOSER (composer), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_security_pgp_encrypt_cb (BonoboUIComponent           *component,</div><div class='del'>-			      const char                  *path,</div><div class='del'>-			      Bonobo_UIComponent_EventType type,</div><div class='del'>-			      const char                  *state,</div><div class='del'>-			      gpointer                     composer)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_pgp_encrypt (E_MSG_COMPOSER (composer), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_security_smime_sign_cb (BonoboUIComponent           *component,</div><div class='del'>-			     const char                  *path,</div><div class='del'>-			     Bonobo_UIComponent_EventType type,</div><div class='del'>-			     const char                  *state,</div><div class='del'>-			     gpointer                     composer)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_smime_sign (E_MSG_COMPOSER (composer), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_security_smime_encrypt_cb (BonoboUIComponent           *component,</div><div class='del'>-				const char                  *path,</div><div class='del'>-				Bonobo_UIComponent_EventType type,</div><div class='del'>-				const char                  *state,</div><div class='del'>-				gpointer                     composer)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_smime_encrypt (E_MSG_COMPOSER (composer), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_from_cb (BonoboUIComponent           *component,</div><div class='del'>-		   const char                  *path,</div><div class='del'>-		   Bonobo_UIComponent_EventType type,</div><div class='del'>-		   const char                  *state,</div><div class='del'>-		   gpointer                     user_data)</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_view_from (E_MSG_COMPOSER (user_data), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_replyto_cb (BonoboUIComponent           *component,</div><div class='del'>-		      const char                  *path,</div><div class='del'>-		      Bonobo_UIComponent_EventType type,</div><div class='del'>-		      const char                  *state,</div><div class='del'>-		      gpointer                     user_data)</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_view_replyto (E_MSG_COMPOSER (user_data), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_bcc_cb (BonoboUIComponent           *component,</div><div class='del'>-		  const char                  *path,</div><div class='del'>-		  Bonobo_UIComponent_EventType type,</div><div class='del'>-		  const char                  *state,</div><div class='del'>-		  gpointer                     user_data)</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_view_bcc (E_MSG_COMPOSER (user_data), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_cc_cb (BonoboUIComponent           *component,</div><div class='del'>-		 const char                  *path,</div><div class='del'>-		 Bonobo_UIComponent_EventType type,</div><div class='del'>-		 const char                  *state,</div><div class='del'>-		 gpointer                     user_data)</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_view_cc (E_MSG_COMPOSER (user_data), atoi (state));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_changed_charset_cb (BonoboUIComponent           *component,</div><div class='del'>-			 const char                  *path,</div><div class='del'>-			 Bonobo_UIComponent_EventType type,</div><div class='del'>-			 const char                  *state,</div><div class='del'>-			 gpointer                     user_data)</div><div class='del'>-{</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (atoi (state)) {</div><div class='del'>-		/* Charset menu names are "Charset-%s" where %s is the charset name */</div><div class='del'>-		g_free (E_MSG_COMPOSER (user_data)-&gt;charset);</div><div class='del'>-		E_MSG_COMPOSER (user_data)-&gt;charset = g_strdup (path + strlen ("Charset-"));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB ("FileOpen",   menu_file_open_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileSave",   menu_file_save_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileSaveAs", menu_file_save_as_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileSaveDraft", menu_file_save_draft_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileClose",  menu_file_close_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB ("FileInsertFile", menu_file_insert_file_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileAttach",     menu_file_add_attachment_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB ("FileSend",       menu_file_send_cb),</div><div class='del'>-	BONOBO_UI_VERB ("FileSendLater",  menu_file_send_later_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB ("DeleteAll",  menu_edit_delete_all_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixcache [] = {</div><div class='del'>-	E_PIXMAP ("/Toolbar/FileAttach", "buttons/add-attachment.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/FileSend", "buttons/send-24.png"),</div><div class='del'>-	</div><div class='del'>-/*	E_PIXMAP ("/menu/Insert/FileAttach", "buttons/add-attachment.png"), */</div><div class='del'>-	E_PIXMAP ("/commands/FileSend", "send-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/FileSendLater", "send-later-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/FileSave", "save-16.png"),</div><div class='del'>-	E_PIXMAP ("/commands/FileSaveAs", "save-as-16.png"),</div><div class='del'>-	</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-signature_regenerate_cb (BonoboUIComponent *uic, gpointer user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	printf ("signature_regenerate_cb: %s\n", path);</div><div class='del'>-</div><div class='del'>-	e_msg_composer_show_sig_file (E_MSG_COMPOSER (user_data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-signature_cb (BonoboUIComponent *uic, const char *path, Bonobo_UIComponent_EventType type,</div><div class='del'>-	      const char *state, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer = (EMsgComposer *) user_data;</div><div class='del'>-</div><div class='del'>-	printf ("signature_cb: %s (%s)\n", path, state);</div><div class='del'>-</div><div class='del'>-	if (state &amp;&amp; *state == '1') {</div><div class='del'>-		if (path &amp;&amp; !strncmp (path, "Signature", 9)) {</div><div class='del'>-			MailConfigSignature *old_sig;</div><div class='del'>-			gboolean old_random;</div><div class='del'>-</div><div class='del'>-			old_sig = composer-&gt;signature;</div><div class='del'>-			old_random = composer-&gt;random_signature;</div><div class='del'>-</div><div class='del'>-			printf ("I'm going to set signature (%d)\n", atoi (path + 9));</div><div class='del'>-			if (path [9] == 'N') {</div><div class='del'>-				composer-&gt;signature = NULL;</div><div class='del'>-				composer-&gt;random_signature = FALSE;</div><div class='del'>-			} else if (path [9] == 'R') {</div><div class='del'>-				composer-&gt;signature = NULL;</div><div class='del'>-				composer-&gt;random_signature = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				composer-&gt;signature = g_list_nth_data (mail_config_get_signature_list (), atoi (path + 9));</div><div class='del'>-				composer-&gt;random_signature = FALSE;</div><div class='del'>-			}</div><div class='del'>-			if (old_sig != composer-&gt;signature || old_random != composer-&gt;random_signature)</div><div class='del'>-				e_msg_composer_show_sig_file (composer);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf ("signature_cb end\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void setup_signatures_menu (EMsgComposer *composer);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_signature_list (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	gchar path [64];</div><div class='del'>-	gint len = g_list_length (mail_config_get_signature_list ());</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_rm (composer-&gt;uic, "/menu/Edit/EditMisc/EditSignaturesSubmenu/SeparatorList", NULL);</div><div class='del'>-	bonobo_ui_component_rm (composer-&gt;uic, "/menu/Edit/EditMisc/EditSignaturesSubmenu/SeparatorRegenerate", NULL);</div><div class='del'>-	bonobo_ui_component_rm (composer-&gt;uic, "/menu/Edit/EditMisc/EditSignaturesSubmenu/SignatureRegenerate", NULL);</div><div class='del'>-	for (; len; len --) {</div><div class='del'>-		g_snprintf (path, 64, "/menu/Edit/EditMisc/EditSignaturesSubmenu/Signature%d", len - 1);</div><div class='del'>-		bonobo_ui_component_rm (composer-&gt;uic, path, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sig_event_client (MailConfigSigEvent event, MailConfigSignature *sig, EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	gchar *path;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_freeze (composer-&gt;uic, NULL);</div><div class='del'>-	switch (event) {</div><div class='del'>-	case MAIL_CONFIG_SIG_EVENT_DELETED:</div><div class='del'>-		if (sig == composer-&gt;signature)</div><div class='del'>-			composer-&gt;signature = NULL;</div><div class='del'>-		path = g_strdup_printf ("/menu/Edit/EditMisc/EditSignaturesSubmenu/Signature%d",</div><div class='del'>-					g_list_length (mail_config_get_signature_list ()));</div><div class='del'>-		bonobo_ui_component_rm (composer-&gt;uic, path, NULL);</div><div class='del'>-		g_free (path);</div><div class='del'>-		setup_signatures_menu (composer);</div><div class='del'>-		break;</div><div class='del'>-	case MAIL_CONFIG_SIG_EVENT_RANDOM_OFF:</div><div class='del'>-		composer-&gt;random_signature = FALSE;</div><div class='del'>-		bonobo_ui_component_rm (composer-&gt;uic, "/menu/Edit/EditMisc/EditSignaturesSubmenu/SignatureRandom", NULL);</div><div class='del'>-		bonobo_ui_component_rm (composer-&gt;uic, "/menu/Edit/EditMisc/EditSignaturesSubmenu/SeparatorRandom", NULL);</div><div class='del'>-		setup_signatures_menu (composer);</div><div class='del'>-		break;</div><div class='del'>-	case MAIL_CONFIG_SIG_EVENT_RANDOM_ON:</div><div class='del'>-		remove_signature_list (composer);</div><div class='del'>-		setup_signatures_menu (composer);</div><div class='del'>-		break;</div><div class='del'>-	case MAIL_CONFIG_SIG_EVENT_ADDED:</div><div class='del'>-	case MAIL_CONFIG_SIG_EVENT_NAME_CHANGED:</div><div class='del'>-		setup_signatures_menu (composer);</div><div class='del'>-	default:</div><div class='del'>-		;</div><div class='del'>-	}</div><div class='del'>-	bonobo_ui_component_thaw (composer-&gt;uic, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_signatures_menu (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GList *l, *list;</div><div class='del'>-	GString *str;</div><div class='del'>-	gchar *line;</div><div class='del'>-	gint i, len = 0;</div><div class='del'>-</div><div class='del'>-	str = g_string_new ("&lt;submenu name=\"EditSignaturesSubmenu\" _label=\"Signatures\"&gt;\n"</div><div class='del'>-			    "&lt;menuitem name=\"SignatureNone\" _label=\"None\" verb=\"SignatureNone\""</div><div class='del'>-			    " type=\"radio\" group=\"signatures_group\"/&gt;\n");</div><div class='del'>-	if (mail_config_get_signatures_random ()) {</div><div class='del'>-		g_string_append (str,</div><div class='del'>-				 "&lt;separator name=\"SeparatorRandom\"/&gt;\n"</div><div class='del'>-				 "&lt;menuitem name=\"SignatureRandom\" _label=\"Random\" verb=\"SignatureRandom\""</div><div class='del'>-				 " type=\"radio\" group=\"signatures_group\"/&gt;\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = mail_config_get_signature_list ();</div><div class='del'>-	if (list) {</div><div class='del'>-</div><div class='del'>-		g_string_append (str, "&lt;separator name=\"SeparatorList\"/&gt;");</div><div class='del'>-</div><div class='del'>-		for (l = list; l; len ++, l = l-&gt;next) {</div><div class='del'>-			line = g_strdup_printf ("&lt;menuitem name=\"Signature%d\" _label=\"%s\""</div><div class='del'>-						" verb=\"Signature%d\" type=\"radio\" group=\"signatures_group\"/&gt;\n",</div><div class='del'>-						len, ((MailConfigSignature *)l-&gt;data)-&gt;name, len);</div><div class='del'>-			g_string_append (str, line);</div><div class='del'>-			g_free (line);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_string_append (str,</div><div class='del'>-			 "&lt;separator name=\"SeparatorRegenerate\"/&gt;\n"</div><div class='del'>-			 "&lt;menuitem name=\"SignatureRegenerate\" _label=\"_Regenerate\""</div><div class='del'>-			 " verb=\"SignatureRegenerate\" accel=\"*Ctrl**Shift*G\"/&gt;");</div><div class='del'>-	g_string_append (str, "&lt;/submenu&gt;\n");</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_translate (composer-&gt;uic, "/menu/Edit/EditMisc/", str-&gt;str, NULL);</div><div class='del'>-	bonobo_ui_component_set (composer-&gt;uic, "/menu/Edit/EditMisc/", "&lt;separator/&gt;", NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_listener (composer-&gt;uic, "SignatureNone", signature_cb, composer);</div><div class='del'>-	bonobo_ui_component_add_listener (composer-&gt;uic, "SignatureRandom", signature_cb, composer);</div><div class='del'>-	bonobo_ui_component_add_verb (composer-&gt;uic, "SignatureRegenerate", signature_regenerate_cb, composer);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i ++) {</div><div class='del'>-		g_string_sprintf (str, "Signature%d", i + 1);</div><div class='del'>-		bonobo_ui_component_add_listener (composer-&gt;uic, str-&gt;str, signature_cb, composer);</div><div class='del'>-	}</div><div class='del'>-	g_string_free (str, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_ui (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-	char *default_charset;</div><div class='del'>-	gboolean hide_smime;</div><div class='del'>-	</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));</div><div class='del'>-	</div><div class='del'>-	composer-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	bonobo_ui_component_set_container (composer-&gt;uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (composer-&gt;uic, verbs, composer);</div><div class='del'>-	</div><div class='del'>-        /* Customize Toolbar thingie */</div><div class='del'>-	bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (composer)),</div><div class='del'>-                                          "/evolution/UIConf/composer");</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_freeze (composer-&gt;uic, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_util_set_ui (composer-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-message-composer.xml",</div><div class='del'>-			       "evolution-message-composer");</div><div class='del'>-	</div><div class='del'>-	e_pixmaps_update (composer-&gt;uic, pixcache);</div><div class='del'>-	</div><div class='del'>-	/* Populate the Charset Encoding menu and default it to whatever the user</div><div class='del'>-	   chose as his default charset in the mailer */</div><div class='del'>-	default_charset = bonobo_config_get_string (composer-&gt;config_db,</div><div class='del'>-						    "/Mail/Format/default_charset",</div><div class='del'>-						    NULL);</div><div class='del'>-	e_charset_picker_bonobo_ui_populate (composer-&gt;uic, "/menu/Edit/EncodingPlaceholder",</div><div class='del'>-					     default_charset,</div><div class='del'>-					     menu_changed_charset_cb,</div><div class='del'>-					     composer);</div><div class='del'>-	g_free (default_charset);</div><div class='del'>-	</div><div class='del'>-	if (!session || !camel_session_is_online (session)) {</div><div class='del'>-		char *tooltip;</div><div class='del'>-		</div><div class='del'>-		/* Move the accelerator from Send to Send Later */</div><div class='del'>-		bonobo_ui_component_set_prop (</div><div class='del'>-			composer-&gt;uic, "/commands/FileSend",</div><div class='del'>-			"accel", NULL, NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (</div><div class='del'>-			composer-&gt;uic, "/commands/FileSendLater",</div><div class='del'>-			"accel", "*Ctrl*Return", NULL);</div><div class='del'>-		</div><div class='del'>-		/* Update the FileSend tooltip to be the same as the FileSendLater tooltip... */</div><div class='del'>-		tooltip = bonobo_ui_component_get_prop (</div><div class='del'>-			composer-&gt;uic, "/commands/FileSendLater",</div><div class='del'>-			"tip", NULL);</div><div class='del'>-		bonobo_ui_component_set_prop (</div><div class='del'>-			composer-&gt;uic, "/commands/FileSend",</div><div class='del'>-			"tip", tooltip, NULL);</div><div class='del'>-		g_free (tooltip);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Format -&gt; HTML */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/FormatHtml",</div><div class='del'>-		"state", composer-&gt;send_html ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "FormatHtml",</div><div class='del'>-		menu_format_html_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* View/From */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewFrom",</div><div class='del'>-		"state", composer-&gt;view_from ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewFrom",</div><div class='del'>-		menu_view_from_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* View/ReplyTo */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewReplyTo",</div><div class='del'>-		"state", composer-&gt;view_replyto ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewReplyTo",</div><div class='del'>-		menu_view_replyto_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* View/BCC */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewBCC",</div><div class='del'>-		"state", composer-&gt;view_bcc ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewBCC",</div><div class='del'>-		menu_view_bcc_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* View/CC */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewCC",</div><div class='del'>-		"state", composer-&gt;view_cc ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewCC",</div><div class='del'>-		menu_view_cc_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* Security -&gt; PGP Sign */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecurityPGPSign",</div><div class='del'>-		"state", composer-&gt;pgp_sign ? "1" : "0", NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "SecurityPGPSign",</div><div class='del'>-		menu_security_pgp_sign_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* Security -&gt; PGP Encrypt */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecurityPGPEncrypt",</div><div class='del'>-		"state", composer-&gt;pgp_encrypt ? "1" : "0", NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "SecurityPGPEncrypt",</div><div class='del'>-		menu_security_pgp_encrypt_cb, composer);</div><div class='del'>-	</div><div class='del'>-#if defined(HAVE_NSS) &amp;&amp; defined(SMIME_SUPPORTED)</div><div class='del'>-	hide_smime = FALSE;</div><div class='del'>-#else</div><div class='del'>-	hide_smime = TRUE;</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	/* Security -&gt; S/MIME Sign */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecuritySMimeSign",</div><div class='del'>-		"state", composer-&gt;smime_sign ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecuritySMimeSign",</div><div class='del'>-		"hidden", hide_smime ? "1" : "0", NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "SecuritySMimeSign",</div><div class='del'>-		menu_security_smime_sign_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* Security -&gt; S/MIME Encrypt */</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecuritySMimeEncrypt",</div><div class='del'>-		"state", composer-&gt;smime_encrypt ? "1" : "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/SecuritySMimeEncrypt",</div><div class='del'>-		"hidden", hide_smime ? "1" : "0", NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "SecuritySMimeEncrypt",</div><div class='del'>-		menu_security_smime_encrypt_cb, composer);</div><div class='del'>-	</div><div class='del'>-	/* View -&gt; Attachments */</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewAttach",</div><div class='del'>-		menu_view_attachments_activate_cb, composer);</div><div class='del'>-</div><div class='del'>-	setup_signatures_menu (composer);</div><div class='del'>-	mail_config_signature_register_client ((MailConfigSignatureClient) sig_event_client, composer);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_thaw (composer-&gt;uic, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Miscellaneous callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,</div><div class='del'>-			   void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	gboolean show = FALSE;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	if (e_msg_composer_attachment_bar_get_num_attachments (bar) &gt; 0)</div><div class='del'>-		show = TRUE;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_show_attachments (composer, show);</div><div class='del'>-	</div><div class='del'>-	/* Mark the composer as changed so it prompts about unsaved</div><div class='del'>-           changes on close */</div><div class='del'>-	e_msg_composer_set_changed (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-subject_changed_cb (EMsgComposerHdrs *hdrs,</div><div class='del'>-		    gchar *subject,</div><div class='del'>-		    void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	if (strlen (subject))</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (composer), subject);</div><div class='del'>-	else</div><div class='del'>-		gtk_window_set_title (GTK_WINDOW (composer),</div><div class='del'>-				      _("Compose a message"));</div><div class='del'>-	g_free (subject);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-hdrs_changed_cb (EMsgComposerHdrs *hdrs,</div><div class='del'>-		 void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	/* Mark the composer as changed so it prompts about unsaved changes on close */</div><div class='del'>-	e_msg_composer_set_changed (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	UPDATE_AUTO_CC,</div><div class='del'>-	UPDATE_AUTO_BCC,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_auto_recipients (EMsgComposerHdrs *hdrs, int mode, const char *auto_addrs)</div><div class='del'>-{</div><div class='del'>-	EDestination *dest, **destv = NULL;</div><div class='del'>-	CamelInternetAddress *iaddr;</div><div class='del'>-	GList *list, *tail, *node;</div><div class='del'>-	int i, n = 0;</div><div class='del'>-	</div><div class='del'>-	tail = list = NULL;</div><div class='del'>-	</div><div class='del'>-	if (auto_addrs) {</div><div class='del'>-		iaddr = camel_internet_address_new ();</div><div class='del'>-		if (camel_address_decode (CAMEL_ADDRESS (iaddr), auto_addrs) != -1) {</div><div class='del'>-			for (i = 0; i &lt; camel_address_length (CAMEL_ADDRESS (iaddr)); i++) {</div><div class='del'>-				const char *name, *addr;</div><div class='del'>-				</div><div class='del'>-				if (!camel_internet_address_get (iaddr, i, &amp;name, &amp;addr))</div><div class='del'>-					continue;</div><div class='del'>-				</div><div class='del'>-				dest = e_destination_new ();</div><div class='del'>-				e_destination_set_auto_recipient (dest, TRUE);</div><div class='del'>-				</div><div class='del'>-				if (name)</div><div class='del'>-					e_destination_set_name (dest, name);</div><div class='del'>-				</div><div class='del'>-				if (addr)</div><div class='del'>-					e_destination_set_email (dest, addr);</div><div class='del'>-				</div><div class='del'>-				node = g_list_alloc ();</div><div class='del'>-				node-&gt;data = dest;</div><div class='del'>-				node-&gt;next = NULL;</div><div class='del'>-				</div><div class='del'>-				if (tail) {</div><div class='del'>-					node-&gt;prev = tail;</div><div class='del'>-					tail-&gt;next = node;</div><div class='del'>-				} else {</div><div class='del'>-					node-&gt;prev = NULL;</div><div class='del'>-					list = node;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				tail = node;</div><div class='del'>-				n++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (iaddr));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case UPDATE_AUTO_CC:</div><div class='del'>-		destv = e_msg_composer_hdrs_get_cc (hdrs);</div><div class='del'>-		break;</div><div class='del'>-	case UPDATE_AUTO_BCC:</div><div class='del'>-		destv = e_msg_composer_hdrs_get_bcc (hdrs);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (destv) {</div><div class='del'>-		for (i = 0; destv[i]; i++) {</div><div class='del'>-			if (!e_destination_is_auto_recipient (destv[i])) {</div><div class='del'>-				node = g_list_alloc ();</div><div class='del'>-				node-&gt;data = e_destination_copy (destv[i]);</div><div class='del'>-				node-&gt;next = NULL;</div><div class='del'>-				</div><div class='del'>-				if (tail) {</div><div class='del'>-					node-&gt;prev = tail;</div><div class='del'>-					tail-&gt;next = node;</div><div class='del'>-				} else {</div><div class='del'>-					node-&gt;prev = NULL;</div><div class='del'>-					list = node;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				tail = node;</div><div class='del'>-				n++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		e_destination_freev (destv);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	destv = e_destination_list_to_vector_sized (list, n);</div><div class='del'>-	g_list_free (list);</div><div class='del'>-	</div><div class='del'>-	switch (mode) {</div><div class='del'>-	case UPDATE_AUTO_CC:</div><div class='del'>-		e_msg_composer_hdrs_set_cc (hdrs, destv);</div><div class='del'>-		break;</div><div class='del'>-	case UPDATE_AUTO_BCC:</div><div class='del'>-		e_msg_composer_hdrs_set_bcc (hdrs, destv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_destination_freev (destv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-from_changed_cb (EMsgComposerHdrs *hdrs, void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	if (hdrs-&gt;account) {</div><div class='del'>-		const MailConfigAccount *account = hdrs-&gt;account;</div><div class='del'>-		</div><div class='del'>-		e_msg_composer_set_pgp_sign (composer, account-&gt;pgp_always_sign);</div><div class='del'>-		e_msg_composer_set_smime_sign (composer, account-&gt;smime_always_sign);</div><div class='del'>-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, account-&gt;always_cc ? account-&gt;cc_addrs : NULL);</div><div class='del'>-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, account-&gt;always_bcc ? account-&gt;bcc_addrs : NULL);</div><div class='del'>-	} else {</div><div class='del'>-		update_auto_recipients (hdrs, UPDATE_AUTO_CC, NULL);</div><div class='del'>-		update_auto_recipients (hdrs, UPDATE_AUTO_BCC, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	set_editor_signature (composer);</div><div class='del'>-	e_msg_composer_show_sig_file (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-composer_shutdown (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	/* When destroy() is called, the contents of the window</div><div class='del'>-	 * (including the remote editor control) will already have</div><div class='del'>-	 * been destroyed, so we have to do this here.</div><div class='del'>-	 */</div><div class='del'>-	autosave_manager_unregister (am, E_MSG_COMPOSER (object));</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;shutdown != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;shutdown) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (object);</div><div class='del'>-</div><div class='del'>-	mail_config_signature_unregister_client ((MailConfigSignatureClient) sig_event_client, composer);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;config_db) {</div><div class='del'>-		Bonobo_ConfigDatabase_sync (composer-&gt;config_db, &amp;ev);</div><div class='del'>-		bonobo_object_release_unref (composer-&gt;config_db, NULL);</div><div class='del'>-	}</div><div class='del'>-	composer-&gt;config_db = NULL;</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;uic)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (composer-&gt;uic));</div><div class='del'>-	composer-&gt;uic = NULL;</div><div class='del'>-	</div><div class='del'>-	/* FIXME?  I assume the Bonobo widget will get destroyed</div><div class='del'>-           normally?  */</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;address_dialog != NULL)</div><div class='del'>-		gtk_widget_destroy (composer-&gt;address_dialog);</div><div class='del'>-	if (composer-&gt;hdrs != NULL)</div><div class='del'>-		gtk_widget_destroy (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;extra_hdr_names) {</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; composer-&gt;extra_hdr_names-&gt;len; i++) {</div><div class='del'>-			g_free (composer-&gt;extra_hdr_names-&gt;pdata[i]);</div><div class='del'>-			g_free (composer-&gt;extra_hdr_values-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (composer-&gt;extra_hdr_names, TRUE);</div><div class='del'>-		g_ptr_array_free (composer-&gt;extra_hdr_values, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_clear_inlined_table (composer);</div><div class='del'>-	g_hash_table_destroy (composer-&gt;inline_images);</div><div class='del'>-	g_hash_table_destroy (composer-&gt;inline_images_by_url);</div><div class='del'>-	</div><div class='del'>-	g_free (composer-&gt;charset);</div><div class='del'>-	g_free (composer-&gt;mime_type);</div><div class='del'>-	g_free (composer-&gt;mime_body);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;persist_stream_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;persist_stream_interface, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;persist_stream_interface, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;persist_file_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;editor_engine != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;redirect)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (composer-&gt;redirect));</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;editor_listener)</div><div class='del'>-		bonobo_object_unref (composer-&gt;editor_listener);</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkWidget methods.  */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-delete_event (GtkWidget *widget,</div><div class='del'>-	      GdkEventAny *event)</div><div class='del'>-{</div><div class='del'>-	do_exit (E_MSG_COMPOSER (widget));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-message_rfc822_dnd (EMsgComposer *composer, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-	</div><div class='del'>-	mp = camel_mime_parser_new ();</div><div class='del'>-	camel_mime_parser_scan_from (mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_stream (mp, stream);</div><div class='del'>-	</div><div class='del'>-	ex = camel_exception_new ();</div><div class='del'>-	</div><div class='del'>-	while (camel_mime_parser_step (mp, 0, 0) == HSCAN_FROM) {</div><div class='del'>-		CamelMimeMessage *message;</div><div class='del'>-		CamelMimePart *part;</div><div class='del'>-		</div><div class='del'>-		message = camel_mime_message_new ();</div><div class='del'>-		if (camel_mime_part_construct_from_parser (CAMEL_MIME_PART (message), mp) == -1) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_mime_part_set_disposition (part, "inline");</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (part),</div><div class='del'>-						 CAMEL_DATA_WRAPPER (message));</div><div class='del'>-		camel_mime_part_set_content_type (part, "message/rfc822");</div><div class='del'>-		e_msg_composer_attachment_bar_attach_mime_part (E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-								part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (message));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		camel_exception_clear (ex);</div><div class='del'>-		</div><div class='del'>-		/* skip over the FROM_END state */</div><div class='del'>-		camel_mime_parser_step (mp, 0, 0);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (mp));</div><div class='del'>-	camel_exception_free (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-drag_data_received (EMsgComposer *composer, GdkDragContext *context,</div><div class='del'>-		    int x, int y, GtkSelectionData *selection,</div><div class='del'>-		    guint info, guint time)</div><div class='del'>-{</div><div class='del'>-	char *tmp, *filename, **filenames;</div><div class='del'>-	CamelMimePart *mime_part;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	switch (info) {</div><div class='del'>-	case DND_TYPE_MESSAGE_RFC822:</div><div class='del'>-		d(printf ("dropping a message/rfc822\n"));</div><div class='del'>-		/* write the message(s) out to a CamelStream so we can use it */</div><div class='del'>-		stream = camel_stream_mem_new ();</div><div class='del'>-		camel_stream_write (stream, selection-&gt;data, selection-&gt;length);</div><div class='del'>-		camel_stream_reset (stream);</div><div class='del'>-		</div><div class='del'>-		message_rfc822_dnd (composer, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		break;</div><div class='del'>-	case DND_TYPE_TEXT_URI_LIST:</div><div class='del'>-		d(printf ("dropping a text/uri-list\n"));</div><div class='del'>-		tmp = g_strndup (selection-&gt;data, selection-&gt;length);</div><div class='del'>-		filenames = g_strsplit (tmp, "\n", 0);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-		</div><div class='del'>-		for (i = 0; filenames[i] != NULL; i++) {</div><div class='del'>-			filename = g_strstrip (filenames[i]);</div><div class='del'>-			</div><div class='del'>-			url = camel_url_new (filename, NULL);</div><div class='del'>-			g_free (filename);</div><div class='del'>-			filename = url-&gt;path;</div><div class='del'>-			url-&gt;path = NULL;</div><div class='del'>-			camel_url_free (url);</div><div class='del'>-			</div><div class='del'>-			e_msg_composer_attachment_bar_attach</div><div class='del'>-				(E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-				 filename);</div><div class='del'>-			</div><div class='del'>-			g_free (filename);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_free (filenames);</div><div class='del'>-		break;</div><div class='del'>-	case DND_TYPE_TEXT_VCARD:</div><div class='del'>-		d(printf ("dropping a text/x-vcard\n"));</div><div class='del'>-		mime_part = camel_mime_part_new ();</div><div class='del'>-		camel_mime_part_set_content (mime_part, selection-&gt;data,</div><div class='del'>-					     selection-&gt;length, "text/x-vcard");</div><div class='del'>-		camel_mime_part_set_disposition (mime_part, "inline");</div><div class='del'>-		</div><div class='del'>-		e_msg_composer_attachment_bar_attach_mime_part</div><div class='del'>-			(E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-			 mime_part);</div><div class='del'>-		</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (mime_part));</div><div class='del'>-	default:</div><div class='del'>-		d(printf ("dropping an unknown\n"));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__NONE_INT) (GtkObject *, int, gpointer);</div><div class='del'>-</div><div class='del'>-static void marshal_NONE__NONE_INT (GtkObject *object, GtkSignalFunc func,</div><div class='del'>-				    gpointer func_data, GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__NONE_INT rfunc;</div><div class='del'>-	</div><div class='del'>-	rfunc = (GtkSignal_NONE__NONE_INT) func;</div><div class='del'>-	(*rfunc)(object, GTK_VALUE_INT (args[0]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;shutdown = composer_shutdown;</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-	</div><div class='del'>-	widget_class-&gt;delete_event = delete_event;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (bonobo_window_get_type ());</div><div class='del'>-	</div><div class='del'>-	signals[SEND] =</div><div class='del'>-		gtk_signal_new ("send",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerClass, send),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	signals[POSTPONE] =</div><div class='del'>-		gtk_signal_new ("postpone",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerClass, postpone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	signals[SAVE_DRAFT] =</div><div class='del'>-		gtk_signal_new ("save-draft",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerClass, save_draft),</div><div class='del'>-				marshal_NONE__NONE_INT,</div><div class='del'>-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	composer-&gt;uic                      = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;hdrs                     = NULL;</div><div class='del'>-	composer-&gt;extra_hdr_names          = g_ptr_array_new ();</div><div class='del'>-	composer-&gt;extra_hdr_values         = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	composer-&gt;editor                   = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;address_dialog           = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_bar           = NULL;</div><div class='del'>-	composer-&gt;attachment_scroll_frame  = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;persist_file_interface   = CORBA_OBJECT_NIL;</div><div class='del'>-	composer-&gt;persist_stream_interface = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;editor_engine            = CORBA_OBJECT_NIL;</div><div class='del'>-	composer-&gt;inline_images            = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	composer-&gt;inline_images_by_url     = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	composer-&gt;current_images           = NULL;</div><div class='del'>-</div><div class='del'>-	composer-&gt;attachment_bar_visible   = FALSE;</div><div class='del'>-	composer-&gt;send_html                = FALSE;</div><div class='del'>-	composer-&gt;pgp_sign                 = FALSE;</div><div class='del'>-	composer-&gt;pgp_encrypt              = FALSE;</div><div class='del'>-	composer-&gt;smime_sign               = FALSE;</div><div class='del'>-	composer-&gt;smime_encrypt            = FALSE;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;has_changed              = FALSE;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;redirect                 = FALSE;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;charset                  = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;enable_autosave          = TRUE;</div><div class='del'>-	composer-&gt;autosave_file            = NULL;</div><div class='del'>-	composer-&gt;autosave_fd              = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposer",</div><div class='del'>-			sizeof (EMsgComposer),</div><div class='del'>-			sizeof (EMsgComposerClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (bonobo_window_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_from_config_db (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db = composer-&gt;config_db;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;view_from = bonobo_config_get_long_with_default (db, </div><div class='del'>-		"Mail/Composer/ViewFrom", 1, NULL);</div><div class='del'>-	composer-&gt;view_replyto = bonobo_config_get_long_with_default (db, </div><div class='del'>-                "Mail/Composer/ViewReplyTo", 0, NULL);</div><div class='del'>-	composer-&gt;view_bcc = bonobo_config_get_long_with_default (db, </div><div class='del'>-                "Mail/Composer/ViewBCC", 0, NULL);</div><div class='del'>-	composer-&gt;view_cc = bonobo_config_get_long_with_default (db, </div><div class='del'>-                "Mail/Composer/ViewCC", 1, NULL);</div><div class='del'>-	composer-&gt;view_subject = bonobo_config_get_long_with_default (db, </div><div class='del'>-                "Mail/Composer/ViewSubject", 1, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_msg_composer_load_config (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	db = bonobo_get_object ( "wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major == CORBA_NO_EXCEPTION &amp;&amp; db != CORBA_OBJECT_NIL){</div><div class='del'>-		composer-&gt;config_db = db;</div><div class='del'>-		load_from_config_db (composer);</div><div class='del'>-	} else</div><div class='del'>-		composer-&gt;config_db = CORBA_OBJECT_NIL;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_msg_composer_get_visible_flags (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	int flags = 0;</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;view_from)</div><div class='del'>-		flags |= E_MSG_COMPOSER_VISIBLE_FROM;</div><div class='del'>-	if (composer-&gt;view_replyto)</div><div class='del'>-		flags |= E_MSG_COMPOSER_VISIBLE_REPLYTO;</div><div class='del'>-	if (composer-&gt;view_cc)</div><div class='del'>-		flags |= E_MSG_COMPOSER_VISIBLE_CC;</div><div class='del'>-	if (composer-&gt;view_bcc)</div><div class='del'>-		flags |= E_MSG_COMPOSER_VISIBLE_BCC;</div><div class='del'>-	if (composer-&gt;view_subject)</div><div class='del'>-		flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Until we have a GUI way, lets make sure that</div><div class='del'>-	 * even if the user screws up, we will do the right</div><div class='del'>-	 * thing (screws up == edit the config file manually</div><div class='del'>-	 * and screw up).</div><div class='del'>-	 */</div><div class='del'>-	flags |= E_MSG_COMPOSER_VISIBLE_SUBJECT;	</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_default_cb (EMsgComposer *composer, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *to;</div><div class='del'>-        BonoboControlFrame *cf;</div><div class='del'>-        Bonobo_PropertyBag pb = CORBA_OBJECT_NIL;</div><div class='del'>-	char *text;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	/* If the 'To:' field is empty, focus it (This is ridiculously complicated) */</div><div class='del'>-</div><div class='del'>-	to = e_msg_composer_hdrs_get_to_entry (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs));</div><div class='del'>-        cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (to));</div><div class='del'>-        pb = bonobo_control_frame_get_control_property_bag (cf, NULL);</div><div class='del'>-	text = bonobo_property_bag_client_get_value_string (pb, "text", NULL);</div><div class='del'>-	bonobo_object_release_unref (pb, NULL);</div><div class='del'>-	</div><div class='del'>-	if (!text || text[0] == '\0') {</div><div class='del'>-		bonobo_control_frame_focus_child (cf, GTK_DIR_TAB_FORWARD);</div><div class='del'>-		g_free (text);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (text);</div><div class='del'>-	</div><div class='del'>-	/* If not, check the subject field */</div><div class='del'>-</div><div class='del'>-	text = e_msg_composer_hdrs_get_subject (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs));</div><div class='del'>-</div><div class='del'>-	if (!text || text[0] == '\0') {</div><div class='del'>-		GtkWidget *widget;</div><div class='del'>-		</div><div class='del'>-		widget = e_msg_composer_hdrs_get_subject_entry (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs));</div><div class='del'>-		gtk_widget_grab_focus (GTK_WIDGET (E_ENTRY (widget)-&gt;canvas));</div><div class='del'>-		g_free (text);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (text);</div><div class='del'>-</div><div class='del'>-	/* Jump to the editor as a last resort. */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "grab-focus", &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EMsgComposer *</div><div class='del'>-create_composer (void)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	BonoboObject *editor_server;</div><div class='del'>-	gint vis;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (gtk_main_level () &gt; 0, NULL);</div><div class='del'>-</div><div class='del'>-	composer = gtk_type_new (E_TYPE_MSG_COMPOSER);</div><div class='del'>-	</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (composer),</div><div class='del'>-				     DEFAULT_WIDTH, DEFAULT_HEIGHT);</div><div class='del'>-	gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_DATADIR</div><div class='del'>-					 "/images/evolution/compose-message.png");</div><div class='del'>-	bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",</div><div class='del'>-				 _("Compose a message"));</div><div class='del'>-	</div><div class='del'>-	/* DND support */</div><div class='del'>-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,</div><div class='del'>-			   drop_types, num_drop_types, GDK_ACTION_COPY);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer), "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (drag_data_received), NULL);</div><div class='del'>-	e_msg_composer_load_config (composer);</div><div class='del'>-	</div><div class='del'>-	setup_ui (composer);</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	vis = e_msg_composer_get_visible_flags (composer);</div><div class='del'>-	composer-&gt;hdrs = e_msg_composer_hdrs_new (vis);</div><div class='del'>-	if (!composer-&gt;hdrs) {</div><div class='del'>-		e_activation_failure_dialog (GTK_WINDOW (composer),</div><div class='del'>-					     _("Could not create composer window:\n"</div><div class='del'>-					       "Unable to activate address selector control."),</div><div class='del'>-					     SELECT_NAMES_OAFIID,</div><div class='del'>-					     "IDL:Bonobo/Control:1.0");</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (composer));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), composer-&gt;hdrs, FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;hdrs), "subject_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (subject_changed_cb), composer);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;hdrs), "hdrs_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (hdrs_changed_cb), composer);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;hdrs), "from_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (from_changed_cb), composer);</div><div class='del'>-	gtk_widget_show (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	/* Editor component.  */</div><div class='del'>-	composer-&gt;editor = bonobo_widget_new_control (</div><div class='del'>-		GNOME_GTKHTML_EDITOR_CONTROL_ID,</div><div class='del'>-		bonobo_ui_component_get_container (composer-&gt;uic));</div><div class='del'>-	if (!composer-&gt;editor) {</div><div class='del'>-		e_activation_failure_dialog (GTK_WINDOW (composer),</div><div class='del'>-					     _("Could not create composer window:\n"</div><div class='del'>-					       "Unable to activate HTML editor component."),</div><div class='del'>-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,</div><div class='del'>-					     "IDL:Bonobo/Control:1.0");</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (composer));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* let the editor know which mode we are in */</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (composer-&gt;editor), </div><div class='del'>-				    "FormatHTML", composer-&gt;send_html,</div><div class='del'>-				    NULL);</div><div class='del'>-	</div><div class='del'>-	editor_server = BONOBO_OBJECT (bonobo_widget_get_server (BONOBO_WIDGET (composer-&gt;editor)));</div><div class='del'>-	</div><div class='del'>-	composer-&gt;persist_file_interface</div><div class='del'>-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistFile:1.0");</div><div class='del'>-	composer-&gt;persist_stream_interface</div><div class='del'>-		= bonobo_object_query_interface (editor_server, "IDL:Bonobo/PersistStream:1.0");</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), composer-&gt;editor, TRUE, TRUE, 0);</div><div class='del'>-	</div><div class='del'>-	/* Attachment editor, wrapped into an EScrollFrame.  We don't</div><div class='del'>-           show it for now.  */</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_scroll_frame = e_scroll_frame_new (NULL, NULL);</div><div class='del'>-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (composer-&gt;attachment_scroll_frame),</div><div class='del'>-					GTK_SHADOW_IN);</div><div class='del'>-	e_scroll_frame_set_policy (E_SCROLL_FRAME (composer-&gt;attachment_scroll_frame),</div><div class='del'>-				   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_bar = e_msg_composer_attachment_bar_new (NULL);</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (composer-&gt;attachment_bar, GTK_CAN_FOCUS);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (composer-&gt;attachment_scroll_frame),</div><div class='del'>-			   composer-&gt;attachment_bar);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox),</div><div class='del'>-			    composer-&gt;attachment_scroll_frame,</div><div class='del'>-			    FALSE, FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;attachment_bar), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);</div><div class='del'>-	</div><div class='del'>-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-	</div><div class='del'>-	/* If we show this widget earlier, we lose network transparency. i.e. the</div><div class='del'>-	   component appears on the machine evo is running on, ignoring any DISPLAY</div><div class='del'>-	   variable. */</div><div class='del'>-	gtk_widget_show (composer-&gt;editor);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_show_attachments (composer, FALSE);</div><div class='del'>-	</div><div class='del'>-	prepare_engine (composer);</div><div class='del'>-	if (composer-&gt;editor_engine == CORBA_OBJECT_NIL) {</div><div class='del'>-		e_activation_failure_dialog (GTK_WINDOW (composer),</div><div class='del'>-					     _("Could not create composer window:\n"</div><div class='del'>-					       "Unable to activate HTML editor component."),</div><div class='del'>-					     GNOME_GTKHTML_EDITOR_CONTROL_ID,</div><div class='del'>-					     "IDL:GNOME/GtkHTML/Editor/Engine:1.0");</div><div class='del'>-		gtk_object_destroy (GTK_OBJECT (composer));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer), "map", map_default_cb, NULL);</div><div class='del'>-	</div><div class='del'>-	if (am == NULL) {</div><div class='del'>-		am = autosave_manager_new ();</div><div class='del'>-	}</div><div class='del'>-	autosave_manager_register (am, composer);</div><div class='del'>-	</div><div class='del'>-	return composer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editor_signature (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	printf ("set_editor_signature\n");</div><div class='del'>-	if (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs)-&gt;account-&gt;id) {</div><div class='del'>-		MailConfigIdentity *id;</div><div class='del'>-		char *verb;</div><div class='del'>-		</div><div class='del'>-		id = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs)-&gt;account-&gt;id;</div><div class='del'>-		</div><div class='del'>-		composer-&gt;random_signature = composer-&gt;send_html ? id-&gt;html_random : id-&gt;text_random;</div><div class='del'>-		if (composer-&gt;random_signature)</div><div class='del'>-			composer-&gt;signature = NULL;</div><div class='del'>-		else</div><div class='del'>-			composer-&gt;signature = composer-&gt;send_html ? id-&gt;html_signature : id-&gt;text_signature;</div><div class='del'>-		</div><div class='del'>-		if (composer-&gt;random_signature) {</div><div class='del'>-			verb = g_strdup ("/commands/SignatureRandom");</div><div class='del'>-		} else if (composer-&gt;signature == NULL) {</div><div class='del'>-			verb = g_strdup ("/commands/SignatureNone");</div><div class='del'>-		} else {</div><div class='del'>-			verb = g_strdup_printf ("/commands/Signature%d", composer-&gt;signature-&gt;id);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		bonobo_ui_component_set_prop (composer-&gt;uic, verb, "state", "1", NULL);</div><div class='del'>-		g_free (verb);</div><div class='del'>-	}</div><div class='del'>-	printf ("set_editor_signature end\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_new:</div><div class='del'>- *</div><div class='del'>- * Create a new message composer widget.</div><div class='del'>- * </div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new (void)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	</div><div class='del'>-	new = create_composer ();</div><div class='del'>-	if (new) {</div><div class='del'>-		e_msg_composer_set_send_html (new, mail_config_get_send_html ());</div><div class='del'>-		set_editor_text (new, "");</div><div class='del'>-		set_editor_signature (new);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_special_header (const char *hdr_name)</div><div class='del'>-{</div><div class='del'>-	/* Note: a header is a "special header" if it has any meaning:</div><div class='del'>-	   1. it's not a X-* header or</div><div class='del'>-	   2. it's an X-Evolution* header</div><div class='del'>-	*/</div><div class='del'>-	if (g_strncasecmp (hdr_name, "X-", 2))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	if (!g_strncasecmp (hdr_name, "X-Evolution", 11))</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	/* we can keep all other X-* headers */</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_msg_composer_set_pending_body (EMsgComposer *composer, char *text)</div><div class='del'>-{</div><div class='del'>-	char *old;</div><div class='del'>-	</div><div class='del'>-	old = gtk_object_get_data (GTK_OBJECT (composer), "body:text");</div><div class='del'>-        g_free (old);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (composer), "body:text", text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_msg_composer_flush_pending_body (EMsgComposer *composer, gboolean apply)</div><div class='del'>-{</div><div class='del'>-        char *body;</div><div class='del'>-	</div><div class='del'>-	body = gtk_object_get_data (GTK_OBJECT (composer), "body:text");</div><div class='del'>-	if (body) {</div><div class='del'>-		if (apply) </div><div class='del'>-			set_editor_text (composer, body);</div><div class='del'>-		</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (composer), "body:text", NULL);</div><div class='del'>-		g_free (body);</div><div class='del'>-	}</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_attachments_from_multipart (EMsgComposer *composer, CamelMultipart *multipart,</div><div class='del'>-				gboolean just_inlines, int depth)</div><div class='del'>-{</div><div class='del'>-	/* find appropriate message attachments to add to the composer */</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		CamelContentType *content_type;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content_type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-			/* another layer of multipartness... */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			add_attachments_from_multipart (composer, mpart, just_inlines, depth + 1);</div><div class='del'>-		} else if (header_content_type_is (content_type, "text", "*")) {</div><div class='del'>-			/* do nothing */</div><div class='del'>-		} else if (header_content_type_is (content_type, "message", "*")) {</div><div class='del'>-			/* do nothing */</div><div class='del'>-		} else if (just_inlines) {</div><div class='del'>-			if (camel_mime_part_get_content_id (mime_part) ||</div><div class='del'>-			    camel_mime_part_get_content_location (mime_part))</div><div class='del'>-				e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);</div><div class='del'>-		} else {</div><div class='del'>-			e_msg_composer_attach (composer, mime_part);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_add_message_attachments:</div><div class='del'>- * @composer: the composer to add the attachments to.</div><div class='del'>- * @message: the source message to copy the attachments from.</div><div class='del'>- * @just_inlines: whether to attach all attachments or just add</div><div class='del'>- * inline images.</div><div class='del'>- *</div><div class='del'>- * Walk through all the mime parts in @message and add them to the composer</div><div class='del'>- * specified in @composer.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_add_message_attachments (EMsgComposer *composer, CamelMimeMessage *message,</div><div class='del'>-					gboolean just_inlines)</div><div class='del'>-{</div><div class='del'>-	CamelContentType *content_type;</div><div class='del'>-	</div><div class='del'>-	content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));</div><div class='del'>-	if (header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-		/* there must be attachments... */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (message)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		add_attachments_from_multipart (composer, multipart, just_inlines, 0);</div><div class='del'>-	} else {</div><div class='del'>-		/* do nothing... */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart, int depth)</div><div class='del'>-{</div><div class='del'>-	/* Find the text/html part and set the composer body to it's contents */</div><div class='del'>-	CamelMimePart *text_part = NULL;</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		CamelContentType *content_type;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content_type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-			/* another layer of multipartness... */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			/* depth doesn't matter so long as we don't pass 0 */</div><div class='del'>-			handle_multipart (composer, mpart, depth + 1);</div><div class='del'>-		} else if (header_content_type_is (content_type, "text", "html")) {</div><div class='del'>-			/* text/html is preferable, so once we find it we're done... */</div><div class='del'>-			text_part = mime_part;</div><div class='del'>-			break;</div><div class='del'>-		} else if (header_content_type_is (content_type, "text", "*")) {</div><div class='del'>-			/* anyt text part not text/html is second rate so the first</div><div class='del'>-			   text part we find isn't necessarily the one we'll use. */</div><div class='del'>-			if (!text_part)</div><div class='del'>-				text_part = mime_part;</div><div class='del'>-		} else {</div><div class='del'>-			e_msg_composer_attach (composer, mime_part);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (text_part) {</div><div class='del'>-		CamelDataWrapper *contents;</div><div class='del'>-		char *text;</div><div class='del'>-		</div><div class='del'>-		contents = camel_medium_get_content_object (CAMEL_MEDIUM (text_part));</div><div class='del'>-		text = mail_get_message_body (contents, FALSE, FALSE);</div><div class='del'>-		</div><div class='del'>-		if (text)</div><div class='del'>-			e_msg_composer_set_pending_body (composer, text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)</div><div class='del'>-{</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		CamelContentType *content_type;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content_type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (header_content_type_is (content_type, "multipart", "alternative")) {</div><div class='del'>-			/* this structure contains the body */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			handle_multipart_alternative (composer, mpart, depth + 1);</div><div class='del'>-		} else if (header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-			/* another layer of multipartness... */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			handle_multipart (composer, mpart, depth + 1);</div><div class='del'>-		} else if (depth == 0 &amp;&amp; i == 0) {</div><div class='del'>-			/* Since the first part is not multipart/alternative, then this must be the body */</div><div class='del'>-			CamelDataWrapper *contents;</div><div class='del'>-			char *text;</div><div class='del'>-			</div><div class='del'>-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			text = mail_get_message_body (contents, FALSE, FALSE);</div><div class='del'>-			</div><div class='del'>-			if (text)</div><div class='del'>-				e_msg_composer_set_pending_body (composer, text);</div><div class='del'>-		} else if (camel_mime_part_get_content_id (mime_part) ||</div><div class='del'>-			   camel_mime_part_get_content_location (mime_part)) {</div><div class='del'>-			/* special in-line attachment */</div><div class='del'>-			e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);</div><div class='del'>-		} else {</div><div class='del'>-			/* normal attachment */</div><div class='del'>-			e_msg_composer_attach (composer, mime_part);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_new_with_message:</div><div class='del'>- * @message: The message to use as the source</div><div class='del'>- * </div><div class='del'>- * Create a new message composer widget.</div><div class='del'>- *</div><div class='del'>- * Note: Designed to work only for messages constructed using Evolution.</div><div class='del'>- *</div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new_with_message (CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	const CamelInternetAddress *to, *cc, *bcc;</div><div class='del'>-	GList *To = NULL, *Cc = NULL, *Bcc = NULL;</div><div class='del'>-	EDestination **Tov, **Ccv, **Bccv;</div><div class='del'>-	const char *format, *subject, *account_name;</div><div class='del'>-	CamelContentType *content_type;</div><div class='del'>-	struct _header_raw *headers;</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	XEvolution *xev;</div><div class='del'>-	guint len, i;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (gtk_main_level () &gt; 0, NULL);</div><div class='del'>-	</div><div class='del'>-	new = create_composer ();</div><div class='del'>-	if (!new)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	subject = camel_mime_message_get_subject (message);</div><div class='del'>-	</div><div class='del'>-	to = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-	cc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-	bcc = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC);</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (to)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (to, i, &amp;name, &amp;addr)) {</div><div class='del'>-			EDestination *dest = e_destination_new ();</div><div class='del'>-			e_destination_set_name (dest, name);</div><div class='del'>-			e_destination_set_email (dest, addr);</div><div class='del'>-			To = g_list_append (To, dest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	Tov = e_destination_list_to_vector (To);</div><div class='del'>-	g_list_free (To);</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (cc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (cc, i, &amp;name, &amp;addr)) {</div><div class='del'>-			EDestination *dest = e_destination_new ();</div><div class='del'>-			e_destination_set_name (dest, name);</div><div class='del'>-			e_destination_set_email (dest, addr);</div><div class='del'>-			Cc = g_list_append (Cc, dest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	Ccv = e_destination_list_to_vector (Cc);</div><div class='del'>-	g_list_free (Cc);</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (bcc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (bcc, i, &amp;name, &amp;addr)) {</div><div class='del'>-			EDestination *dest = e_destination_new ();</div><div class='del'>-			e_destination_set_name (dest, name);</div><div class='del'>-			e_destination_set_email (dest, addr);</div><div class='del'>-			Bcc = g_list_append (Bcc, dest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	Bccv = e_destination_list_to_vector (Bcc);</div><div class='del'>-	g_list_free (Bcc);</div><div class='del'>-	</div><div class='del'>-	/* Restore the Account preference */</div><div class='del'>-	account_name = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account");</div><div class='del'>-	if (account_name) {</div><div class='del'>-		while (*account_name &amp;&amp; isspace ((unsigned) *account_name))</div><div class='del'>-			account_name++;</div><div class='del'>-	}</div><div class='del'>-	if (account_name == NULL) {</div><div class='del'>-		account_name = camel_medium_get_header (CAMEL_MEDIUM (message), "From");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_headers (new, account_name, Tov, Ccv, Bccv, subject);</div><div class='del'>-	</div><div class='del'>-	e_destination_freev (Tov);</div><div class='del'>-	e_destination_freev (Ccv);</div><div class='del'>-	e_destination_freev (Bccv);</div><div class='del'>-	</div><div class='del'>-	/* Restore the format editing preference */</div><div class='del'>-	format = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format");</div><div class='del'>-	if (format) {</div><div class='del'>-		while (*format &amp;&amp; isspace ((unsigned) *format))</div><div class='del'>-			format++;</div><div class='del'>-		</div><div class='del'>-		if (!g_strcasecmp (format, "text/html"))</div><div class='del'>-			e_msg_composer_set_send_html (new, TRUE);</div><div class='del'>-		else</div><div class='del'>-			e_msg_composer_set_send_html (new, FALSE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Remove any other X-Evolution-* headers that may have been set */</div><div class='del'>-	xev = mail_tool_remove_xevolution_headers (message);</div><div class='del'>-	mail_tool_destroy_xevolution (xev);</div><div class='del'>-	</div><div class='del'>-	/* set extra headers */</div><div class='del'>-	headers = CAMEL_MIME_PART (message)-&gt;headers;</div><div class='del'>-	while (headers) {</div><div class='del'>-		if (!is_special_header (headers-&gt;name)) {</div><div class='del'>-			g_ptr_array_add (new-&gt;extra_hdr_names, g_strdup (headers-&gt;name));</div><div class='del'>-			g_ptr_array_add (new-&gt;extra_hdr_values, g_strdup (headers-&gt;value));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		headers = headers-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Restore the attachments and body text */</div><div class='del'>-	content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));</div><div class='del'>-	if (header_content_type_is (content_type, "multipart", "alternative")) {</div><div class='del'>-		/* this contains the text/plain and text/html versions of the message body */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (message)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		handle_multipart_alternative (new, multipart, 0);</div><div class='del'>-	} else if (header_content_type_is (content_type, "multipart", "*")) {</div><div class='del'>-		/* there must be attachments... */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (message)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		handle_multipart (new, multipart, 0);</div><div class='del'>-	} else {</div><div class='del'>-		/* We either have a text/plain or a text/html part */</div><div class='del'>-		CamelDataWrapper *contents;</div><div class='del'>-		char *text;</div><div class='del'>-		</div><div class='del'>-		contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));</div><div class='del'>-		text = mail_get_message_body (contents, FALSE, FALSE);</div><div class='del'>-		</div><div class='del'>-		if (text)</div><div class='del'>-			e_msg_composer_set_pending_body (new, text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* We wait until now to set the body text because we need to ensure that</div><div class='del'>-	 * the attachment bar has all the attachments, before we request them.</div><div class='del'>-	 */	</div><div class='del'>-	e_msg_composer_flush_pending_body (new, TRUE);</div><div class='del'>-</div><div class='del'>-	set_editor_signature (new);</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-disable_editor (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive (composer-&gt;editor, FALSE);</div><div class='del'>-	gtk_widget_set_sensitive (composer-&gt;attachment_bar, FALSE);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/menu/Edit", "sensitive", "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/menu/Format", "sensitive", "0", NULL);</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/menu/Insert", "sensitive", "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_new_redirect:</div><div class='del'>- * @message: The message to use as the source</div><div class='del'>- * </div><div class='del'>- * Create a new message composer widget.</div><div class='del'>- *</div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new_redirect (CamelMimeMessage *message, const char *resent_from)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	const char *subject;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (message != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	composer = e_msg_composer_new_with_message (message);</div><div class='del'>-	subject = camel_mime_message_get_subject (message);</div><div class='del'>-	</div><div class='del'>-	composer-&gt;redirect = message;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (message));</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_headers (composer, resent_from, NULL, NULL, NULL, subject);</div><div class='del'>-	</div><div class='del'>-	disable_editor (composer);</div><div class='del'>-	</div><div class='del'>-	return composer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-add_recipients (GList *list, const char *recips, gboolean decode)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *cia;</div><div class='del'>-	const char *name, *addr;</div><div class='del'>-	int num, i;</div><div class='del'>-	</div><div class='del'>-	cia = camel_internet_address_new ();</div><div class='del'>-	if (decode)</div><div class='del'>-		num = camel_address_decode (CAMEL_ADDRESS (cia), recips);</div><div class='del'>-	else</div><div class='del'>-		num = camel_address_unformat (CAMEL_ADDRESS (cia), recips);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; num; i++) {</div><div class='del'>-		if (camel_internet_address_get (cia, i, &amp;name, &amp;addr)) {</div><div class='del'>-			EDestination *dest = e_destination_new ();</div><div class='del'>-			e_destination_set_name (dest, name);</div><div class='del'>-			e_destination_set_email (dest, addr);</div><div class='del'>-			</div><div class='del'>-			list = g_list_append (list, dest);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_new_from_url:</div><div class='del'>- * @url: a mailto URL</div><div class='del'>- *</div><div class='del'>- * Create a new message composer widget, and fill in fields as</div><div class='del'>- * defined by the provided URL.</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new_from_url (const char *url_in)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	GList *to = NULL, *cc = NULL, *bcc = NULL;</div><div class='del'>-	EDestination **tov, **ccv, **bccv;</div><div class='del'>-	char *subject = NULL, *body = NULL;</div><div class='del'>-	const char *p, *header;</div><div class='del'>-	char *content;</div><div class='del'>-	int len, clen;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (g_strncasecmp (url_in, "mailto:", 7) == 0, NULL);</div><div class='del'>-	</div><div class='del'>-	composer = e_msg_composer_new ();</div><div class='del'>-	if (!composer)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* Parse recipients (everything after ':' until '?' or eos). */</div><div class='del'>-	p = url_in + 7;</div><div class='del'>-	len = strcspn (p, "?");</div><div class='del'>-	if (len) {</div><div class='del'>-		content = g_strndup (p, len);</div><div class='del'>-		camel_url_decode (content);</div><div class='del'>-		to = add_recipients (to, content, FALSE);</div><div class='del'>-		g_free (content);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	p += len;</div><div class='del'>-	if (*p == '?') {</div><div class='del'>-		p++;</div><div class='del'>-		</div><div class='del'>-		while (*p) {</div><div class='del'>-			len = strcspn (p, "=&amp;");</div><div class='del'>-			</div><div class='del'>-			/* If it's malformed, give up. */</div><div class='del'>-			if (p[len] != '=')</div><div class='del'>-				break;</div><div class='del'>-			</div><div class='del'>-			header = p;</div><div class='del'>-			p += len + 1;</div><div class='del'>-			</div><div class='del'>-			clen = strcspn (p, "&amp;");</div><div class='del'>-			</div><div class='del'>-			content = g_strndup (p, clen);</div><div class='del'>-			camel_url_decode (content);</div><div class='del'>-			</div><div class='del'>-			if (!g_strncasecmp (header, "to", len)) {</div><div class='del'>-				to = add_recipients (to, content, FALSE);</div><div class='del'>-			} else if (!g_strncasecmp (header, "cc", len)) {</div><div class='del'>-				cc = add_recipients (cc, content, FALSE);</div><div class='del'>-			} else if (!g_strncasecmp (header, "bcc", len)) {</div><div class='del'>-				bcc = add_recipients (bcc, content, FALSE);</div><div class='del'>-			} else if (!g_strncasecmp (header, "subject", len)) {</div><div class='del'>-				g_free (subject);</div><div class='del'>-				subject = g_strdup (content);</div><div class='del'>-			} else if (!g_strncasecmp (header, "body", len)) {</div><div class='del'>-				g_free (body);</div><div class='del'>-				body = g_strdup (content);</div><div class='del'>-			} else {</div><div class='del'>-				/* add an arbitrary header */</div><div class='del'>-				e_msg_composer_add_header (composer, header, content);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			g_free (content);</div><div class='del'>-			</div><div class='del'>-			p += clen;</div><div class='del'>-			if (*p == '&amp;') {</div><div class='del'>-				p++;</div><div class='del'>-				if (!strcmp (p, "amp;"))</div><div class='del'>-					p += 4;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	tov  = e_destination_list_to_vector (to);</div><div class='del'>-	ccv  = e_destination_list_to_vector (cc);</div><div class='del'>-	bccv = e_destination_list_to_vector (bcc);</div><div class='del'>-	</div><div class='del'>-	g_list_free (to);</div><div class='del'>-	g_list_free (cc);</div><div class='del'>-	g_list_free (bcc);</div><div class='del'>-	</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_hdrs_set_to (hdrs, tov);</div><div class='del'>-	e_msg_composer_hdrs_set_cc (hdrs, ccv);</div><div class='del'>-	e_msg_composer_hdrs_set_bcc (hdrs, bccv);</div><div class='del'>-	</div><div class='del'>-	e_destination_freev (tov);</div><div class='del'>-	e_destination_freev (ccv);</div><div class='del'>-	e_destination_freev (bccv);</div><div class='del'>-	</div><div class='del'>-	if (subject) {</div><div class='del'>-		e_msg_composer_hdrs_set_subject (hdrs, subject);</div><div class='del'>-		g_free (subject);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (body) {</div><div class='del'>-		char *htmlbody;</div><div class='del'>-		</div><div class='del'>-		htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);</div><div class='del'>-		set_editor_text (composer, htmlbody);</div><div class='del'>-		g_free (htmlbody);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return composer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_show_attachments:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @show: A boolean specifying whether the attachment bar should be shown or</div><div class='del'>- * not</div><div class='del'>- * </div><div class='del'>- * If @show is %FALSE, hide the attachment bar.  Otherwise, show it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_show_attachments (EMsgComposer *composer,</div><div class='del'>-				 gboolean show)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	show_attachments (composer, show);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_headers:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @from: the name of the account the user will send from,</div><div class='del'>- * or %NULL for the default account</div><div class='del'>- * @to: the values for the "To" header</div><div class='del'>- * @cc: the values for the "Cc" header</div><div class='del'>- * @bcc: the values for the "Bcc" header</div><div class='del'>- * @subject: the value for the "Subject" header</div><div class='del'>- *</div><div class='del'>- * Sets the headers in the composer to the given values.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-e_msg_composer_set_headers (EMsgComposer *composer,</div><div class='del'>-			    const char *from,</div><div class='del'>-			    EDestination **to,</div><div class='del'>-			    EDestination **cc,</div><div class='del'>-			    EDestination **bcc,</div><div class='del'>-			    const char *subject)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_hdrs_set_from_account (hdrs, from);</div><div class='del'>-	e_msg_composer_hdrs_set_to (hdrs, to);</div><div class='del'>-	e_msg_composer_hdrs_set_cc (hdrs, cc);</div><div class='del'>-	e_msg_composer_hdrs_set_bcc (hdrs, bcc);</div><div class='del'>-	e_msg_composer_hdrs_set_subject (hdrs, subject);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_body_text:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @text: the HTML text to initialize the editor with</div><div class='del'>- *</div><div class='del'>- * Loads the given HTML text into the editor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_body_text (EMsgComposer *composer, const char *text)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	set_editor_text (composer, text);</div><div class='del'>-	</div><div class='del'>-	/* set editor text unfortunately kills the signature so we</div><div class='del'>-           have to re-show it */</div><div class='del'>-	e_msg_composer_show_sig_file (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_body:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @body: the data to initialize the composer with</div><div class='del'>- * @mime_type: the MIME type of data</div><div class='del'>- *</div><div class='del'>- * Loads the given data into the composer as the message body.</div><div class='del'>- * This function should only be used by the CORBA composer factory.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_body (EMsgComposer *composer, const char *body,</div><div class='del'>-			 const char *mime_type)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	set_editor_text (composer, U_("&lt;b&gt;(The composer contains a non-text "</div><div class='del'>-				      "message body, which cannot be "</div><div class='del'>-				      "editted.)&lt;b&gt;"));</div><div class='del'>-	e_msg_composer_set_send_html (composer, FALSE);</div><div class='del'>-	disable_editor (composer);</div><div class='del'>-</div><div class='del'>-	g_free (composer-&gt;mime_body);</div><div class='del'>-	composer-&gt;mime_body = g_strdup (body);</div><div class='del'>-	g_free (composer-&gt;mime_type);</div><div class='del'>-	composer-&gt;mime_type = g_strdup (mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_add_header:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @name: the header name</div><div class='del'>- * @value: the header value</div><div class='del'>- *</div><div class='del'>- * Adds a header with @name and @value to the message. This header</div><div class='del'>- * may not be displayed by the composer, but will be included in</div><div class='del'>- * the message it outputs.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_add_header (EMsgComposer *composer, const char *name,</div><div class='del'>-			   const char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	g_return_if_fail (name != NULL);</div><div class='del'>-	g_return_if_fail (value != NULL);</div><div class='del'>-	</div><div class='del'>-	g_ptr_array_add (composer-&gt;extra_hdr_names, g_strdup (name));</div><div class='del'>-	g_ptr_array_add (composer-&gt;extra_hdr_values, g_strdup (value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_attach:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @attachment: the CamelMimePart to attach</div><div class='del'>- *</div><div class='del'>- * Attaches @attachment to the message being composed in the composer.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_attach (EMsgComposer *composer, CamelMimePart *attachment)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *bar;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (attachment));</div><div class='del'>-	</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar);</div><div class='del'>-	e_msg_composer_attachment_bar_attach_mime_part (bar, attachment);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_add_inline_image_from_file:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @file_name: the name of the file containing the image</div><div class='del'>- *</div><div class='del'>- * This reads in the image in @file_name and adds it to @composer</div><div class='del'>- * as an inline image, to be wrapped in a multipart/related.</div><div class='del'>- *</div><div class='del'>- * Return value: the newly-created CamelMimePart (which must be reffed</div><div class='del'>- * if the caller wants to keep its own reference), or %NULL on error.</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-e_msg_composer_add_inline_image_from_file (EMsgComposer *composer,</div><div class='del'>-					   const char *file_name)</div><div class='del'>-{</div><div class='del'>-	char *mime_type, *cid, *url;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-</div><div class='del'>-	/* check for regular file */</div><div class='del'>-	if (stat (file_name, &amp;statbuf) &lt; 0 || !S_ISREG (statbuf.st_mode))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	wrapper = camel_data_wrapper_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (wrapper, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	mime_type = e_msg_composer_guess_mime_type (file_name);</div><div class='del'>-	camel_data_wrapper_set_mime_type (wrapper, mime_type ? mime_type : "application/octet-stream");</div><div class='del'>-	g_free (mime_type);</div><div class='del'>-	</div><div class='del'>-	part = camel_mime_part_new ();</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (wrapper));</div><div class='del'>-</div><div class='del'>-	cid = header_msgid_generate ();</div><div class='del'>-	camel_mime_part_set_content_id (part, cid);</div><div class='del'>-	camel_mime_part_set_filename (part, g_basename (file_name));</div><div class='del'>-	camel_mime_part_set_encoding (part, CAMEL_MIME_PART_ENCODING_BASE64);</div><div class='del'>-</div><div class='del'>-	url = g_strdup_printf ("file:%s", file_name);</div><div class='del'>-	g_hash_table_insert (composer-&gt;inline_images_by_url, url, part);</div><div class='del'>-</div><div class='del'>-	url = g_strdup_printf ("cid:%s", cid);</div><div class='del'>-	g_hash_table_insert (composer-&gt;inline_images, url, part);</div><div class='del'>-	g_free (cid);</div><div class='del'>-</div><div class='del'>-	return part;</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_add_inline_image_from_mime_part:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @part: a CamelMimePart containing image data</div><div class='del'>- *</div><div class='del'>- * This adds the mime part @part to @composer as an inline image, to</div><div class='del'>- * be wrapped in a multipart/related.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_add_inline_image_from_mime_part (EMsgComposer  *composer,</div><div class='del'>-						CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	char *cid, *url;</div><div class='del'>-	const char *location;</div><div class='del'>-</div><div class='del'>-	cid = (char *)camel_mime_part_get_content_id (part);</div><div class='del'>-	if (!cid) {</div><div class='del'>-		camel_mime_part_set_content_id (part, NULL);</div><div class='del'>-		cid = (char *)camel_mime_part_get_content_id (part);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	url = g_strdup_printf ("cid:%s", cid);</div><div class='del'>-	g_hash_table_insert (composer-&gt;inline_images, url, part);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-</div><div class='del'>-	location = camel_mime_part_get_content_location (part);</div><div class='del'>-	if (location) {</div><div class='del'>-		g_hash_table_insert (composer-&gt;inline_images_by_url,</div><div class='del'>-				     g_strdup (location), part);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_message:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Retrieve the message edited by the user as a CamelMimeMessage.  The</div><div class='del'>- * CamelMimeMessage object is created on the fly; subsequent calls to this</div><div class='del'>- * function will always create new objects from scratch.</div><div class='del'>- * </div><div class='del'>- * Return value: A pointer to the new CamelMimeMessage object</div><div class='del'>- **/</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-e_msg_composer_get_message (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);</div><div class='del'>-	</div><div class='del'>-	return build_message (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-e_msg_composer_get_message_draft (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const MailConfigAccount *account;</div><div class='del'>-	gboolean old_send_html;</div><div class='del'>-	gboolean old_pgp_sign;</div><div class='del'>-	gboolean old_pgp_encrypt;</div><div class='del'>-	gboolean old_smime_sign;</div><div class='del'>-	gboolean old_smime_encrypt;</div><div class='del'>-	</div><div class='del'>-	/* always save drafts as HTML to preserve formatting */</div><div class='del'>-	old_send_html = composer-&gt;send_html;</div><div class='del'>-	composer-&gt;send_html = TRUE;</div><div class='del'>-	old_pgp_sign = composer-&gt;pgp_sign;</div><div class='del'>-	composer-&gt;pgp_sign = FALSE;</div><div class='del'>-	old_pgp_encrypt = composer-&gt;pgp_encrypt;</div><div class='del'>-	composer-&gt;pgp_encrypt = FALSE;</div><div class='del'>-	old_smime_sign = composer-&gt;smime_sign;</div><div class='del'>-	composer-&gt;smime_sign = FALSE;</div><div class='del'>-	old_smime_encrypt = composer-&gt;smime_encrypt;</div><div class='del'>-	composer-&gt;smime_encrypt = FALSE;</div><div class='del'>-	</div><div class='del'>-	msg = e_msg_composer_get_message (composer);</div><div class='del'>-	</div><div class='del'>-	composer-&gt;send_html = old_send_html;</div><div class='del'>-	composer-&gt;pgp_sign = old_pgp_sign;</div><div class='del'>-	composer-&gt;pgp_encrypt = old_pgp_encrypt;</div><div class='del'>-	composer-&gt;smime_sign = old_smime_sign;</div><div class='del'>-	composer-&gt;smime_encrypt = old_smime_encrypt;</div><div class='del'>-	</div><div class='del'>-	/* Attach account info to the draft. */</div><div class='del'>-	account = e_msg_composer_get_preferred_account (composer);</div><div class='del'>-	if (account &amp;&amp; account-&gt;name)</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Account", account-&gt;name);</div><div class='del'>-	</div><div class='del'>-	/* build_message() set this to text/html since we set composer-&gt;send_html to</div><div class='del'>-	   TRUE before calling e_msg_composer_get_message() */</div><div class='del'>-	if (!composer-&gt;send_html)</div><div class='del'>-		camel_medium_set_header (CAMEL_MEDIUM (msg), "X-Evolution-Format", "text/plain");</div><div class='del'>-	</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_old_signature (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	/* printf ("delete_old_signature\n"); */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-bod", &amp;ev);</div><div class='del'>-	if (GNOME_GtkHTML_Editor_Engine_searchByData (composer-&gt;editor_engine, 1, "ClueFlow", "signature", "1", &amp;ev)) {</div><div class='del'>-		/* printf ("found\n"); */</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "select-paragraph", &amp;ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "delete", &amp;ev);</div><div class='del'>-		/* selection-move-right doesn't succeed means that we are already on the end of document */</div><div class='del'>-		/* if (!rv)</div><div class='del'>-		   break; */</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer-&gt;editor_engine, "signature", "0", &amp;ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "delete-back", &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_show_sig:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Set a signature</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_show_sig_file (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gchar *html;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	printf ("e_msg_composer_show_sig_file\n");</div><div class='del'>-	/* printf ("set sig '%s' '%s'\n", sig_file, composer-&gt;sig_file); */</div><div class='del'>-</div><div class='del'>-	composer-&gt;in_signature_insert = TRUE;</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_freeze (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-position-save", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoBegin (composer-&gt;editor_engine, "Set signature", "Reset signature", &amp;ev);</div><div class='del'>-</div><div class='del'>-	delete_old_signature (composer);</div><div class='del'>-	html = get_signature_html (composer);</div><div class='del'>-	if (html) {</div><div class='del'>-		if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (composer-&gt;editor_engine, &amp;ev))</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "insert-paragraph", &amp;ev);</div><div class='del'>-		if (!GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-backward", &amp;ev))</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "insert-paragraph", &amp;ev);</div><div class='del'>-		else</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-forward", &amp;ev);</div><div class='del'>-		/* printf ("insert %s\n", html); */</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_setParagraphData (composer-&gt;editor_engine, "orig", "0", &amp;ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "indent-zero", &amp;ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_insertHTML (composer-&gt;editor_engine, html, &amp;ev);</div><div class='del'>-		g_free (html);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_undoEnd (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "cursor-position-restore", &amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_thaw (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	composer-&gt;in_signature_insert = FALSE;</div><div class='del'>-</div><div class='del'>-	printf ("e_msg_composer_show_sig_file end\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_send_html:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "Send HTML" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "Send HTML" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_send_html (EMsgComposer *composer,</div><div class='del'>-			      gboolean send_html)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;send_html &amp;&amp; send_html)</div><div class='del'>-		return;</div><div class='del'>-	if (! composer-&gt;send_html &amp;&amp; ! send_html)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;send_html = send_html;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "block-redraw", &amp;ev);</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/FormatHtml",</div><div class='del'>-		"state", composer-&gt;send_html ? "1" : "0", NULL);</div><div class='del'>-</div><div class='del'>-	/* let the editor know which mode we are in */</div><div class='del'>-	bonobo_widget_set_property (BONOBO_WIDGET (composer-&gt;editor), "FormatHTML",</div><div class='del'>-				    composer-&gt;send_html, NULL);</div><div class='del'>-</div><div class='del'>-	set_config (composer, "FormatHTML", composer-&gt;send_html);</div><div class='del'>-	set_editor_signature (composer);</div><div class='del'>-	e_msg_composer_show_sig_file (composer);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (composer-&gt;editor_engine, "unblock-redraw", &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_send_html:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "Send HTML mail" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "Send HTML mail" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_send_html (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-</div><div class='del'>-	return composer-&gt;send_html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_preferred_account:</div><div class='del'>- * @composer: composer</div><div class='del'>- *</div><div class='del'>- * Returns the user-specified account (from field).</div><div class='del'>- */</div><div class='del'>-const MailConfigAccount *</div><div class='del'>-e_msg_composer_get_preferred_account (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (composer != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);</div><div class='del'>-	</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;account;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_pgp_sign:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "PGP Sign" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "PGP Sign" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_pgp_sign (EMsgComposer *composer, gboolean pgp_sign)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;pgp_sign &amp;&amp; pgp_sign)</div><div class='del'>-		return;</div><div class='del'>-	if (!composer-&gt;pgp_sign &amp;&amp; !pgp_sign)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;pgp_sign = pgp_sign;</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/SecurityPGPSign",</div><div class='del'>-				      "state", composer-&gt;pgp_sign ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_pgp_sign:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "PGP Sign" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "PGP Sign" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_pgp_sign (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;pgp_sign;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_pgp_encrypt:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "PGP Encrypt" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "PGP Encrypt" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_pgp_encrypt (EMsgComposer *composer, gboolean pgp_encrypt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;pgp_encrypt &amp;&amp; pgp_encrypt)</div><div class='del'>-		return;</div><div class='del'>-	if (!composer-&gt;pgp_encrypt &amp;&amp; !pgp_encrypt)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;pgp_encrypt = pgp_encrypt;</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/SecurityPGPEncrypt",</div><div class='del'>-				      "state", composer-&gt;pgp_encrypt ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_pgp_encrypt:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "PGP Encrypt" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "PGP Encrypt" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_pgp_encrypt (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;pgp_encrypt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_smime_sign:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "S/MIME Sign" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "S/MIME Sign" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_smime_sign (EMsgComposer *composer, gboolean smime_sign)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;smime_sign &amp;&amp; smime_sign)</div><div class='del'>-		return;</div><div class='del'>-	if (!composer-&gt;smime_sign &amp;&amp; !smime_sign)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;smime_sign = smime_sign;</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/SecuritySMimeSign",</div><div class='del'>-				      "state", composer-&gt;smime_sign ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_smime_sign:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "S/MIME Sign" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "S/MIME Sign" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_smime_sign (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;smime_sign;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_smime_encrypt:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "S/MIME Encrypt" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "S/MIME Encrypt" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_smime_encrypt (EMsgComposer *composer, gboolean smime_encrypt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;smime_encrypt &amp;&amp; smime_encrypt)</div><div class='del'>-		return;</div><div class='del'>-	if (!composer-&gt;smime_encrypt &amp;&amp; !smime_encrypt)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;smime_encrypt = smime_encrypt;</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/SecuritySMimeEncrypt",</div><div class='del'>-				      "state", composer-&gt;smime_encrypt ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_smime_encrypt:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "S/MIME Encrypt" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "S/MIME Encrypt" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_smime_encrypt (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;smime_encrypt;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_view_bcc:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @state: whether to show or hide the bcc view</div><div class='del'>- *</div><div class='del'>- * Controls the state of the BCC display</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_view_bcc (EMsgComposer *composer, gboolean view_bcc)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if ((composer-&gt;view_bcc &amp;&amp; view_bcc) ||</div><div class='del'>-	    (!composer-&gt;view_bcc &amp;&amp; !view_bcc))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;view_bcc = view_bcc;</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewBCC",</div><div class='del'>-		"state", composer-&gt;view_bcc ? "1" : "0", NULL);</div><div class='del'>-	set_config (composer, "ViewBCC", composer-&gt;view_bcc);</div><div class='del'>-	e_msg_composer_set_hdrs_visible</div><div class='del'>-		(E_MSG_COMPOSER_HDRS (composer-&gt;hdrs),</div><div class='del'>-		 e_msg_composer_get_visible_flags (composer));</div><div class='del'>-		 </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_view_bcc:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "View BCC header" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "View BCC header" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_view_bcc (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;view_bcc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_view_cc:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @state: whether to show or hide the cc view</div><div class='del'>- *</div><div class='del'>- * Controls the state of the CC display</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_view_cc (EMsgComposer *composer, gboolean view_cc)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if ((composer-&gt;view_cc &amp;&amp; view_cc) ||</div><div class='del'>-	    (!composer-&gt;view_cc &amp;&amp; !view_cc))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;view_cc = view_cc;</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewCC",</div><div class='del'>-		"state", composer-&gt;view_cc ? "1" : "0", NULL);</div><div class='del'>-	set_config (composer, "ViewCC", composer-&gt;view_cc);</div><div class='del'>-	e_msg_composer_set_hdrs_visible</div><div class='del'>-		(E_MSG_COMPOSER_HDRS (composer-&gt;hdrs),</div><div class='del'>-		 e_msg_composer_get_visible_flags (composer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDestination **</div><div class='del'>-e_msg_composer_get_recipients (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL);</div><div class='del'>-</div><div class='del'>-	return composer-&gt;hdrs ? e_msg_composer_hdrs_get_recipients (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs)) : NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_view_cc:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "View CC header" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "View CC header" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_view_cc (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;view_cc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_view_from:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @state: whether to show or hide the From selector</div><div class='del'>- *</div><div class='del'>- * Controls the state of the From selector</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_view_from (EMsgComposer *composer, gboolean view_from)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if ((composer-&gt;view_from &amp;&amp; view_from) ||</div><div class='del'>-	    (!composer-&gt;view_from &amp;&amp; !view_from))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;view_from = view_from;</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewFrom",</div><div class='del'>-		"state", composer-&gt;view_from ? "1" : "0", NULL);</div><div class='del'>-	set_config (composer, "ViewFrom", composer-&gt;view_from);</div><div class='del'>-	e_msg_composer_set_hdrs_visible</div><div class='del'>-		(E_MSG_COMPOSER_HDRS (composer-&gt;hdrs),</div><div class='del'>-		 e_msg_composer_get_visible_flags (composer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_view_from:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "View From header" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "View From header" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_view_from (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;view_from;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_view_from:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @state: whether to show or hide the From selector</div><div class='del'>- *</div><div class='del'>- * Controls the state of the From selector</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_view_replyto (EMsgComposer *composer, gboolean view_replyto)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	if ((composer-&gt;view_replyto &amp;&amp; view_replyto) ||</div><div class='del'>-	    (!composer-&gt;view_replyto &amp;&amp; !view_replyto))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;view_replyto = view_replyto;</div><div class='del'>-	bonobo_ui_component_set_prop (</div><div class='del'>-		composer-&gt;uic, "/commands/ViewReplyTo",</div><div class='del'>-		"state", composer-&gt;view_replyto ? "1" : "0", NULL);</div><div class='del'>-	set_config (composer, "ViewReplyTo", composer-&gt;view_replyto);</div><div class='del'>-	e_msg_composer_set_hdrs_visible</div><div class='del'>-		(E_MSG_COMPOSER_HDRS (composer-&gt;hdrs),</div><div class='del'>-		 e_msg_composer_get_visible_flags (composer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_view_replyto:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "View Reply-To header" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "View Reply-To header" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_view_replyto (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-	</div><div class='del'>-	return composer-&gt;view_replyto;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_guess_mime_type:</div><div class='del'>- * @file_name: filename</div><div class='del'>- *</div><div class='del'>- * Returns the guessed mime type of the file given by #file_name.</div><div class='del'>- **/</div><div class='del'>-gchar *</div><div class='del'>-e_msg_composer_guess_mime_type (const gchar *file_name)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSFileInfo info;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_get_file_info (file_name, &amp;info,</div><div class='del'>-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |</div><div class='del'>-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);</div><div class='del'>-	if (result == GNOME_VFS_OK) {</div><div class='del'>-		gchar *type;</div><div class='del'>-</div><div class='del'>-		type = g_strdup (gnome_vfs_file_info_get_mime_type (&amp;info));</div><div class='del'>-		gnome_vfs_file_info_unref (&amp;info);</div><div class='del'>-		return type;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_changed:</div><div class='del'>- * @composer: An EMsgComposer object.</div><div class='del'>- *</div><div class='del'>- * Mark the composer as changed, so before the composer gets destroyed</div><div class='del'>- * the user will be prompted about unsaved changes.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_changed (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	composer-&gt;has_changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_unset_changed:</div><div class='del'>- * @composer: An EMsgComposer object.</div><div class='del'>- *</div><div class='del'>- * Mark the composer as unchanged, so no prompt about unsaved changes</div><div class='del'>- * will appear before destroying the composer.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_unset_changed (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	composer-&gt;has_changed = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_is_dirty (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean rv;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	rv = composer-&gt;has_changed || GNOME_GtkHTML_Editor_Engine_hasUndo (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_enable_autosave  (EMsgComposer *composer, gboolean enabled)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	composer-&gt;enable_autosave = enabled;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-next_word (const gchar *s, const gchar **sr)</div><div class='del'>-{</div><div class='del'>-	if (!s || !*s)</div><div class='del'>-		return NULL;</div><div class='del'>-	else {</div><div class='del'>-		const gchar *begin;</div><div class='del'>-		gunichar uc;</div><div class='del'>-		gboolean cited;</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			begin = s;</div><div class='del'>-			cited = FALSE;</div><div class='del'>-			uc = g_utf8_get_char (s);</div><div class='del'>-			if (uc == 0)</div><div class='del'>-				return NULL;</div><div class='del'>-			s  = g_utf8_next_char (s);</div><div class='del'>-		} while (!html_selection_spell_word (uc, &amp;cited) &amp;&amp; !cited &amp;&amp; s);</div><div class='del'>-</div><div class='del'>-		/* we are at beginning of word */</div><div class='del'>-		if (s &amp;&amp; *s) {</div><div class='del'>-			gboolean cited_end;</div><div class='del'>-</div><div class='del'>-			cited_end = FALSE;</div><div class='del'>-			uc = g_utf8_get_char (s);</div><div class='del'>-</div><div class='del'>-			/* go to end of word */</div><div class='del'>-			while (html_selection_spell_word (uc, &amp;cited_end) || (!cited &amp;&amp; cited_end)) {</div><div class='del'>-				cited_end = FALSE;</div><div class='del'>-				s  = g_utf8_next_char (s);</div><div class='del'>-				uc = g_utf8_get_char (s);</div><div class='del'>-				if (uc == 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			*sr = s;</div><div class='del'>-			return s ? g_strndup (begin, s - begin) : g_strdup (begin);</div><div class='del'>-		} else</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_ignore (EMsgComposer *composer, const gchar *str)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gchar *word;</div><div class='del'>-</div><div class='del'>-	if (!str)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	while ((word = next_word (str, &amp;str))) {</div><div class='del'>-		/* printf ("ignore word %s\n", word); */</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_ignoreWord (composer-&gt;editor_engine, word, &amp;ev);</div><div class='del'>-		g_free (word);</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_drop_editor_undo (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_dropUndo (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h<br/>deleted file mode 100644<br/>index 921dfc2ee1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/e-msg-composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-msg-composer.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999, 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef ___E_MSG_COMPOSER_H__</div><div class='del'>-#define ___E_MSG_COMPOSER_H__</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposer       EMsgComposer;</div><div class='del'>-typedef struct _EMsgComposerClass  EMsgComposerClass;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-win.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer-attachment-bar.h"</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-#include "Editor.h"</div><div class='del'>-</div><div class='del'>-#include &lt;mail/mail-config.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER	       (e_msg_composer_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER(obj)	       (GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER, EMsgComposer))</div><div class='del'>-#define E_MSG_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER, EMsgComposerClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER(obj)	       (GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER))</div><div class='del'>-#define E_IS_MSG_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _EMsgComposer {</div><div class='del'>-	BonoboWindow parent;</div><div class='del'>-	</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *hdrs;</div><div class='del'>-	GPtrArray *extra_hdr_names, *extra_hdr_values;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *editor;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *attachment_bar;</div><div class='del'>-	GtkWidget *attachment_scroll_frame;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *address_dialog;</div><div class='del'>-	</div><div class='del'>-	Bonobo_PersistFile       persist_file_interface;</div><div class='del'>-	Bonobo_PersistStream     persist_stream_interface;</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine  editor_engine;</div><div class='del'>-	BonoboObject            *editor_listener;</div><div class='del'>-	GHashTable              *inline_images, *inline_images_by_url;</div><div class='del'>-	GList                   *current_images;</div><div class='del'>-	</div><div class='del'>-	Bonobo_ConfigDatabase    config_db;</div><div class='del'>-	</div><div class='del'>-	char *mime_type, *mime_body, *charset;</div><div class='del'>-</div><div class='del'>-	char *autosave_file;</div><div class='del'>-        int   autosave_fd;</div><div class='del'>-</div><div class='del'>-	gboolean attachment_bar_visible : 1;</div><div class='del'>-	gboolean send_html     : 1;</div><div class='del'>-	gboolean is_alternative: 1;</div><div class='del'>-	gboolean pgp_sign      : 1;</div><div class='del'>-	gboolean pgp_encrypt   : 1;</div><div class='del'>-	gboolean smime_sign    : 1;</div><div class='del'>-	gboolean smime_encrypt : 1;</div><div class='del'>-	gboolean view_from     : 1;</div><div class='del'>-	gboolean view_replyto  : 1;</div><div class='del'>-	gboolean view_bcc      : 1;</div><div class='del'>-	gboolean view_cc       : 1;</div><div class='del'>-	gboolean view_subject  : 1;</div><div class='del'>-	gboolean has_changed   : 1;</div><div class='del'>-</div><div class='del'>-	gboolean in_signature_insert : 1;</div><div class='del'>-</div><div class='del'>-	gboolean enable_autosave : 1;</div><div class='del'>-	</div><div class='del'>-	CamelMimeMessage *redirect;</div><div class='del'>-</div><div class='del'>-	MailConfigSignature *signature;</div><div class='del'>-	gboolean random_signature;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerClass {</div><div class='del'>-	BonoboWindowClass parent_class;</div><div class='del'>-	</div><div class='del'>-	void (* send) (EMsgComposer *composer);</div><div class='del'>-	void (* postpone) (EMsgComposer *composer);</div><div class='del'>-	void (* save_draft) (EMsgComposer *composer, int quit);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType                  e_msg_composer_get_type                         (void);</div><div class='del'>-EMsgComposer            *e_msg_composer_new                              (void);</div><div class='del'>-EMsgComposer            *e_msg_composer_new_with_message                 (CamelMimeMessage  *msg);</div><div class='del'>-EMsgComposer            *e_msg_composer_new_from_url                     (const char        *url);</div><div class='del'>-EMsgComposer            *e_msg_composer_new_redirect                     (CamelMimeMessage  *message,</div><div class='del'>-									  const char        *resent_from);</div><div class='del'>-void                     e_msg_composer_show_attachments                 (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           show);</div><div class='del'>-void                     e_msg_composer_set_headers                      (EMsgComposer      *composer,</div><div class='del'>-									  const char        *from,</div><div class='del'>-									  EDestination     **to,</div><div class='del'>-									  EDestination     **cc,</div><div class='del'>-									  EDestination     **bcc,</div><div class='del'>-									  const char        *subject);</div><div class='del'>-void                     e_msg_composer_set_body_text                    (EMsgComposer      *composer,</div><div class='del'>-									  const char        *text);</div><div class='del'>-void                     e_msg_composer_set_body                         (EMsgComposer      *composer,</div><div class='del'>-									  const char        *body,</div><div class='del'>-									  const char        *mime_type);</div><div class='del'>-void                     e_msg_composer_add_header                       (EMsgComposer      *composer,</div><div class='del'>-									  const char        *name,</div><div class='del'>-									  const char        *value);</div><div class='del'>-void                     e_msg_composer_attach                           (EMsgComposer      *composer,</div><div class='del'>-									  CamelMimePart     *attachment);</div><div class='del'>-CamelMimePart           *e_msg_composer_add_inline_image_from_file       (EMsgComposer      *composer,</div><div class='del'>-									  const char        *filename);</div><div class='del'>-void                     e_msg_composer_add_inline_image_from_mime_part  (EMsgComposer      *composer,</div><div class='del'>-									  CamelMimePart     *part);</div><div class='del'>-CamelMimeMessage        *e_msg_composer_get_message                      (EMsgComposer      *composer);</div><div class='del'>-CamelMimeMessage        *e_msg_composer_get_message_draft                (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_show_sig_file                    (EMsgComposer      *composer);</div><div class='del'>-gboolean                 e_msg_composer_get_send_html                    (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_send_html                    (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           send_html);</div><div class='del'>-gboolean                 e_msg_composer_get_view_from                    (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_view_from                    (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           view_from);</div><div class='del'>-gboolean                 e_msg_composer_get_view_replyto                 (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_view_replyto                 (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           view_replyto);</div><div class='del'>-gboolean                 e_msg_composer_get_view_bcc                     (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_view_bcc                     (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           view_bcc);</div><div class='del'>-gboolean                 e_msg_composer_get_view_cc                      (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_view_cc                      (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           view_cc);</div><div class='del'>-</div><div class='del'>-EDestination    **e_msg_composer_get_recipients       (EMsgComposer     *composer);</div><div class='del'>-</div><div class='del'>-const MailConfigAccount *e_msg_composer_get_preferred_account            (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_clear_inlined_table              (EMsgComposer      *composer);</div><div class='del'>-gchar                   *e_msg_composer_guess_mime_type                  (const gchar       *file_name);</div><div class='del'>-void                     e_msg_composer_set_changed                      (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_unset_changed                    (EMsgComposer      *composer);</div><div class='del'>-gboolean                 e_msg_composer_is_dirty                         (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_enable_autosave              (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           enabled);</div><div class='del'>-</div><div class='del'>-/* PGP */</div><div class='del'>-void                     e_msg_composer_set_pgp_sign                     (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           pgp_sign);</div><div class='del'>-gboolean                 e_msg_composer_get_pgp_sign                     (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_pgp_encrypt                  (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           pgp_encrypt);</div><div class='del'>-gboolean                 e_msg_composer_get_pgp_encrypt                  (EMsgComposer      *composer);</div><div class='del'>-</div><div class='del'>-/* S/MIME */</div><div class='del'>-void                     e_msg_composer_set_smime_sign                   (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           smime_sign);</div><div class='del'>-gboolean                 e_msg_composer_get_smime_sign                   (EMsgComposer      *composer);</div><div class='del'>-void                     e_msg_composer_set_smime_encrypt                (EMsgComposer      *composer,</div><div class='del'>-									  gboolean           smime_encrypt);</div><div class='del'>-gboolean                 e_msg_composer_get_smime_encrypt                (EMsgComposer      *composer);</div><div class='del'>-gchar                   *e_msg_composer_get_sig_file_content             (const char        *sigfile,</div><div class='del'>-									  gboolean           in_html);</div><div class='del'>-void                     e_msg_composer_add_message_attachments          (EMsgComposer      *composer,</div><div class='del'>-									  CamelMimeMessage  *message,</div><div class='del'>-									  gboolean           just_inlines);</div><div class='del'>-void                     e_msg_composer_ignore                           (EMsgComposer      *composer,</div><div class='del'>-									  const gchar       *str);</div><div class='del'>-void                     e_msg_composer_drop_editor_undo                 (EMsgComposer      *composer);</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ___E_MSG_COMPOSER_H__ */</div><div class='head'>diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c<br/>deleted file mode 100644<br/>index b6aec0af29..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/evolution-composer.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/evolution-composer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,397 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* evolution-composer.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-item-handler.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-#include "evolution-composer.h"</div><div class='del'>-#include "mail/mail-config.h"</div><div class='del'>-#include "e-util/e-html-utils.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void (*send_cb) (EMsgComposer *, gpointer);</div><div class='del'>-static void (*postpone_cb) (EMsgComposer *, gpointer);</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation.  */</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Composer__vepv Composer_vepv;</div><div class='del'>-</div><div class='del'>-static EDestination **</div><div class='del'>-corba_recipientlist_to_destv (const GNOME_Evolution_Composer_RecipientList *cl)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Composer_Recipient *recip;</div><div class='del'>-	EDestination **destv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (cl-&gt;_length == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	destv = g_new (EDestination *, cl-&gt;_length+1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; cl-&gt;_length; ++i) {</div><div class='del'>-		recip = &amp;(cl-&gt;_buffer[i]);</div><div class='del'>-</div><div class='del'>-		destv[i] = e_destination_new ();</div><div class='del'>-</div><div class='del'>-		if (*recip-&gt;name)</div><div class='del'>-			e_destination_set_name (destv[i], recip-&gt;name);</div><div class='del'>-		e_destination_set_email (destv[i], recip-&gt;address);</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	destv[cl-&gt;_length] = NULL;</div><div class='del'>-</div><div class='del'>-	return destv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_set_headers (PortableServer_Servant servant,</div><div class='del'>-			   const GNOME_Evolution_Composer_RecipientList *to,</div><div class='del'>-			   const GNOME_Evolution_Composer_RecipientList *cc,</div><div class='del'>-			   const GNOME_Evolution_Composer_RecipientList *bcc,</div><div class='del'>-			   const CORBA_char *subject,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	EDestination **tov, **ccv, **bccv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	tov  = corba_recipientlist_to_destv (to);</div><div class='del'>-	ccv  = corba_recipientlist_to_destv (cc);</div><div class='del'>-	bccv = corba_recipientlist_to_destv (bcc);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_headers (composer-&gt;composer, NULL, tov, ccv, bccv, subject);</div><div class='del'>-</div><div class='del'>-	e_destination_freev (tov);</div><div class='del'>-	e_destination_freev (ccv);</div><div class='del'>-	e_destination_freev (bccv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_set_multipart_type (PortableServer_Servant servant,</div><div class='del'>-				  GNOME_Evolution_Composer_MultipartType type,</div><div class='del'>-				  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	if (type == GNOME_Evolution_Composer_ALTERNATIVE) {</div><div class='del'>-		composer-&gt;composer-&gt;is_alternative = TRUE;</div><div class='del'>-		composer-&gt;composer-&gt;send_html = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_set_body (PortableServer_Servant servant,</div><div class='del'>-			const CORBA_char *body,</div><div class='del'>-			const CORBA_char *mime_type,</div><div class='del'>-			CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (mime_type, "text/plain")) {</div><div class='del'>-		char *htmlbody = e_text_to_html (body, E_TEXT_TO_HTML_PRE);</div><div class='del'>-		e_msg_composer_set_body_text (composer-&gt;composer, htmlbody);</div><div class='del'>-		g_free (htmlbody);</div><div class='del'>-	} else if (!g_strcasecmp (mime_type, "text/html"))</div><div class='del'>-		e_msg_composer_set_body_text (composer-&gt;composer, body);</div><div class='del'>-	else</div><div class='del'>-		e_msg_composer_set_body (composer-&gt;composer, body, mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_attach_MIME (PortableServer_Servant servant,</div><div class='del'>-			   const CORBA_char *data,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	CamelMimePart *attachment;</div><div class='del'>-	CamelStream *mem_stream;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	mem_stream = camel_stream_mem_new_with_buffer (data, strlen (data));</div><div class='del'>-	attachment = camel_mime_part_new ();</div><div class='del'>-	status = camel_data_wrapper_construct_from_stream (</div><div class='del'>-		CAMEL_DATA_WRAPPER (attachment), mem_stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (mem_stream));</div><div class='del'>-</div><div class='del'>-	if (status == -1) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_GNOME_Evolution_Composer_CouldNotParse,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_msg_composer_attach (composer-&gt;composer, attachment);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_attach_data (PortableServer_Servant servant,</div><div class='del'>-			   const CORBA_char *content_type,</div><div class='del'>-			   const CORBA_char *filename,</div><div class='del'>-			   const CORBA_char *description,</div><div class='del'>-			   const CORBA_boolean show_inline,</div><div class='del'>-			   const GNOME_Evolution_Composer_AttachmentData *data,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	CamelMimePart *attachment;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	attachment = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (attachment, data-&gt;_buffer, data-&gt;_length,</div><div class='del'>-				     content_type);</div><div class='del'>-</div><div class='del'>-	if (*filename)</div><div class='del'>-		camel_mime_part_set_filename (attachment, filename);</div><div class='del'>-	if (*description)</div><div class='del'>-		camel_mime_part_set_description (attachment, description);</div><div class='del'>-	camel_mime_part_set_disposition (attachment, show_inline ?</div><div class='del'>-					 "inline" : "attachment");</div><div class='del'>-</div><div class='del'>-	e_msg_composer_attach (composer-&gt;composer, attachment);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_show (PortableServer_Servant servant,</div><div class='del'>-		    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (composer-&gt;composer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_send (PortableServer_Servant servant,</div><div class='del'>-		    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	send_cb (composer-&gt;composer, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Composer__epv *</div><div class='del'>-evolution_composer_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Composer__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Composer__epv, 1);</div><div class='del'>-	epv-&gt;setHeaders       = impl_Composer_set_headers;</div><div class='del'>-	epv-&gt;setMultipartType = impl_Composer_set_multipart_type;</div><div class='del'>-	epv-&gt;setBody          = impl_Composer_set_body;</div><div class='del'>-	epv-&gt;attachMIME       = impl_Composer_attach_MIME;</div><div class='del'>-	epv-&gt;attachData       = impl_Composer_attach_data;</div><div class='del'>-	epv-&gt;show             = impl_Composer_show;</div><div class='del'>-	epv-&gt;send             = impl_Composer_send;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject stuff */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EvolutionComposer *composer = EVOLUTION_COMPOSER (object);</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;composer)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (composer-&gt;composer));</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EvolutionComposerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	Composer_vepv.GNOME_Evolution_Composer_epv = evolution_composer_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EvolutionComposer *composer)</div><div class='del'>-{</div><div class='del'>-	const MailConfigAccount *account;</div><div class='del'>-</div><div class='del'>-	account            = mail_config_get_default_account ();</div><div class='del'>-	composer-&gt;composer = e_msg_composer_new ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;composer), "send",</div><div class='del'>-			    GTK_SIGNAL_FUNC (send_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;composer), "postpone",</div><div class='del'>-			    GTK_SIGNAL_FUNC (postpone_cb), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static Bonobo_ItemContainer_ObjectNames *</div><div class='del'>-enum_objects (BonoboItemHandler *handler, gpointer data, CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static Bonobo_Unknown </div><div class='del'>-get_object (BonoboItemHandler *h, const char *item_name, gboolean only_if_exists,</div><div class='del'>-	    gpointer data, CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EvolutionComposer *composer = data;</div><div class='del'>-	GSList *options, *l;</div><div class='del'>-	</div><div class='del'>-	options = bonobo_item_option_parse (item_name);</div><div class='del'>-	for (l = options; l; l = l-&gt;next){</div><div class='del'>-		BonoboItemOption *option = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (strcmp (option-&gt;key, "visible") == 0){</div><div class='del'>-			gboolean show = 1;</div><div class='del'>-			</div><div class='del'>-			if (option-&gt;value)</div><div class='del'>-				show = atoi (option-&gt;value);</div><div class='del'>-</div><div class='del'>-			if (show)</div><div class='del'>-				gtk_widget_show (GTK_WIDGET (composer-&gt;composer));</div><div class='del'>-			else</div><div class='del'>-				gtk_widget_hide (GTK_WIDGET (composer-&gt;composer));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return bonobo_object_dup_ref (</div><div class='del'>-		BONOBO_OBJECT (composer)-&gt;corba_objref, ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-evolution_composer_construct (EvolutionComposer *composer,</div><div class='del'>-			      GNOME_Evolution_Composer corba_object)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *item_handler;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);</div><div class='del'>-</div><div class='del'>-	item_handler = BONOBO_OBJECT (</div><div class='del'>-		bonobo_item_handler_new (NULL, get_object, composer));</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (composer), BONOBO_OBJECT (item_handler));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EvolutionComposer *</div><div class='del'>-evolution_composer_new (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionComposer *new;</div><div class='del'>-	POA_GNOME_Evolution_Composer *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GNOME_Evolution_Composer corba_object;</div><div class='del'>-	</div><div class='del'>-	servant = (POA_GNOME_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;Composer_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_Evolution_Composer__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (evolution_composer_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new),</div><div class='del'>-						       servant);</div><div class='del'>-	evolution_composer_construct (new, corba_object);</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ComposerFactory"</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	if (!mail_config_is_configured ()) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Could not create composer window, because you "</div><div class='del'>-			    "have not yet\nconfigured any identities in the "</div><div class='del'>-			    "mail component."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	return BONOBO_OBJECT (evolution_composer_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),</div><div class='del'>-				 void (*postpone) (EMsgComposer *, gpointer))</div><div class='del'>-{</div><div class='del'>-	if (bonobo_generic_factory_new (GNOME_EVOLUTION_MAIL_COMPOSER_FACTORY_ID,</div><div class='del'>-					factory_fn, NULL) == NULL) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Cannot initialize Evolution's composer."));</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	send_cb = send;</div><div class='del'>-	postpone_cb = postpone;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h<br/>deleted file mode 100644<br/>index e8b9a284cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/evolution-composer.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/evolution-composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* evolution-composer.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Dan Winship</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __EVOLUTION_COMPOSER_H__</div><div class='del'>-#define __EVOLUTION_COMPOSER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define EVOLUTION_TYPE_COMPOSER            (evolution_composer_get_type ())</div><div class='del'>-#define EVOLUTION_COMPOSER(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer))</div><div class='del'>-#define EVOLUTION_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass))</div><div class='del'>-#define EVOLUTION_IS_COMPOSER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))</div><div class='del'>-#define EVOLUTION_IS_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))</div><div class='del'>-</div><div class='del'>-typedef struct _EvolutionComposer        EvolutionComposer;</div><div class='del'>-typedef struct _EvolutionComposerClass   EvolutionComposerClass;</div><div class='del'>-</div><div class='del'>-struct _EvolutionComposer {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EvolutionComposerClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-POA_GNOME_Evolution_Composer__epv *evolution_composer_get_epv            (void);</div><div class='del'>-</div><div class='del'>-GtkType            evolution_composer_get_type     (void);</div><div class='del'>-void               evolution_composer_construct    (EvolutionComposer *,</div><div class='del'>-						    GNOME_Evolution_Composer);</div><div class='del'>-EvolutionComposer *evolution_composer_new          (void);</div><div class='del'>-</div><div class='del'>-void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),</div><div class='del'>-						    void (*postpone) (EMsgComposer *, gpointer));</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __EVOLUTION_COMPOSER_H__ */</div><div class='head'>diff --git a/composer/listener.c b/composer/listener.c<br/>deleted file mode 100644<br/>index 9f609c3fd3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/listener.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,346 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*  This file is part of gnome-spell bonobo component</div><div class='del'>-</div><div class='del'>-    Copyright (C) 2000 Ximian, Inc.</div><div class='del'>-    Authors:           Radek Doulik &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of version 2 of the GNU General Public</div><div class='del'>-    License as published by the Free Software Foundation.</div><div class='del'>- </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>-    General Public License for more details.</div><div class='del'>- </div><div class='del'>-    You should have received a copy of the GNU General Public</div><div class='del'>-    License along with this program; if not, write to the</div><div class='del'>-    Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>-    Boston, MA 02111-1307, USA.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-arg.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-client.h&gt;</div><div class='del'>-</div><div class='del'>-#include "listener.h"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *listener_parent_class;</div><div class='del'>-static POA_GNOME_GtkHTML_Editor_Listener__vepv listener_vepv;</div><div class='del'>-</div><div class='del'>-inline static EditorListener *</div><div class='del'>-listener_from_servant (PortableServer_Servant servant)</div><div class='del'>-{</div><div class='del'>-	return EDITOR_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_any *</div><div class='del'>-get_any_null ()</div><div class='del'>-{</div><div class='del'>-	CORBA_any *rv;</div><div class='del'>-</div><div class='del'>-	rv = CORBA_any__alloc ();</div><div class='del'>-	rv-&gt;_type = TC_null;</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-resolve_image_url (EditorListener *l, gchar *url)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	const char *cid;</div><div class='del'>-</div><div class='del'>-	part = g_hash_table_lookup (l-&gt;composer-&gt;inline_images_by_url, url);</div><div class='del'>-	if (!part &amp;&amp; !strncmp (url, "file:", 5)) {</div><div class='del'>-		part = e_msg_composer_add_inline_image_from_file (l-&gt;composer,</div><div class='del'>-								  url + 5);</div><div class='del'>-	}</div><div class='del'>-	if (!part &amp;&amp; !strncmp (url, "cid:", 4)) {</div><div class='del'>-		part = g_hash_table_lookup (l-&gt;composer-&gt;inline_images, url);</div><div class='del'>-	}</div><div class='del'>-	if (!part)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	l-&gt;composer-&gt;current_images  = g_list_prepend (l-&gt;composer-&gt;current_images, part);</div><div class='del'>-</div><div class='del'>-	cid = camel_mime_part_get_content_id (part);</div><div class='del'>-	if (!cid)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return g_strconcat ("cid:", cid, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reply_indent (EditorListener *l, CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	if (!GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (l-&gt;composer-&gt;editor_engine, ev)) {</div><div class='del'>-		if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (l-&gt;composer-&gt;editor_engine, ev))</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "cursor-backward", ev);</div><div class='del'>-		else {</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color", ev);</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "insert-paragraph", ev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "style-normal", ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "indent-zero", ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color", ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clear_signature (GNOME_GtkHTML_Editor_Engine e, CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (e, ev))</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);</div><div class='del'>-	else if (GNOME_GtkHTML_Editor_Engine_isPreviousParagraphEmpty (e, ev)</div><div class='del'>-		 &amp;&amp; GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-backward", ev)) {</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_setParagraphData (e, "signature", "0", ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (e, "cursor-forward", ev);</div><div class='del'>-	}</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "text-default-color", ev);</div><div class='del'>-	GNOME_GtkHTML_Editor_Engine_runCommand (e, "italic-off", ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_paragraph_before (EditorListener *l, CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	if (!l-&gt;composer-&gt;in_signature_insert) {</div><div class='del'>-		CORBA_char *orig, *signature;</div><div class='del'>-		gboolean changed = FALSE;</div><div class='del'>-		/* FIXME check for insert-paragraph command */</div><div class='del'>-</div><div class='del'>-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l-&gt;composer-&gt;editor_engine, "orig", ev);</div><div class='del'>-		if (ev-&gt;_major == CORBA_NO_EXCEPTION) {</div><div class='del'>-			if (orig &amp;&amp; *orig == '1') {</div><div class='del'>-				GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color", ev);</div><div class='del'>-				GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-				changed = TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (!changed) {</div><div class='del'>-			signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (l-&gt;composer-&gt;editor_engine, "signature", ev);</div><div class='del'>-			if (ev-&gt;_major == CORBA_NO_EXCEPTION) {</div><div class='del'>-				if (signature &amp;&amp; *signature == '1') {</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color",</div><div class='del'>-										ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-insert_paragraph_after (EditorListener *l, CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	if (!l-&gt;composer-&gt;in_signature_insert) {</div><div class='del'>-		CORBA_char *orig, *signature;</div><div class='del'>-		/* FIXME check for insert-paragraph command */</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color", ev);</div><div class='del'>-		GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-</div><div class='del'>-		orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l-&gt;composer-&gt;editor_engine, "orig", ev);</div><div class='del'>-		if (ev-&gt;_major == CORBA_NO_EXCEPTION) {</div><div class='del'>-			if (orig &amp;&amp; *orig == '1')</div><div class='del'>-				reply_indent (l, ev);</div><div class='del'>-			GNOME_GtkHTML_Editor_Engine_setParagraphData (l-&gt;composer-&gt;editor_engine, "orig", "0", ev);</div><div class='del'>-		}</div><div class='del'>-		signature = GNOME_GtkHTML_Editor_Engine_getParagraphData (l-&gt;composer-&gt;editor_engine, "signature", ev);</div><div class='del'>-		if (ev-&gt;_major == CORBA_NO_EXCEPTION) {</div><div class='del'>-			if (signature &amp;&amp; *signature == '1')</div><div class='del'>-				clear_signature (l-&gt;composer-&gt;editor_engine, ev);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_any *</div><div class='del'>-impl_event (PortableServer_Servant _servant,</div><div class='del'>-	    const CORBA_char * name, const CORBA_any * arg,</div><div class='del'>-	    CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	EditorListener *l = listener_from_servant (_servant);</div><div class='del'>-	CORBA_any  *rv = NULL;</div><div class='del'>-	gchar *command;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (name, "command_before")) {</div><div class='del'>-		command = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		if (!strcmp (command, "insert-paragraph")) {</div><div class='del'>-			insert_paragraph_before (l, ev);</div><div class='del'>-		}</div><div class='del'>-	} else if (!strcmp (name, "command_after")) {</div><div class='del'>-		command = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		if (!strcmp (command, "insert-paragraph")) {</div><div class='del'>-			insert_paragraph_after (l, ev);</div><div class='del'>-		}</div><div class='del'>-	} else if (!strcmp (name, "image_url")) {</div><div class='del'>-		gchar *url;</div><div class='del'>-</div><div class='del'>-		if ((url = resolve_image_url (l, BONOBO_ARG_GET_STRING (arg)))) {</div><div class='del'>-			rv = bonobo_arg_new (TC_string);</div><div class='del'>-			BONOBO_ARG_SET_STRING (rv, url);</div><div class='del'>-			/* printf ("new url: %s\n", url); */</div><div class='del'>-			g_free (url);</div><div class='del'>-		}</div><div class='del'>-	} else if (!strcmp (name, "delete")) {</div><div class='del'>-		CORBA_char *orig;</div><div class='del'>-		</div><div class='del'>-		if (GNOME_GtkHTML_Editor_Engine_isParagraphEmpty (l-&gt;composer-&gt;editor_engine, ev)) {</div><div class='del'>-			orig = GNOME_GtkHTML_Editor_Engine_getParagraphData (l-&gt;composer-&gt;editor_engine, "orig", ev);</div><div class='del'>-			if (ev-&gt;_major == CORBA_NO_EXCEPTION) {</div><div class='del'>-				if (orig &amp;&amp; *orig == '1') {</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_setParagraphData (l-&gt;composer-&gt;editor_engine, "orig", "0", ev);</div><div class='del'>-</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "indent-zero", ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "style-normal", ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "text-default-color", ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "insert-paragraph", ev);</div><div class='del'>-					GNOME_GtkHTML_Editor_Engine_runCommand (l-&gt;composer-&gt;editor_engine, "delete-back", ev);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (!strcmp (name, "url_requested")) {</div><div class='del'>-		GNOME_GtkHTML_Editor_URLRequestEvent *e;</div><div class='del'>-		CamelMimePart *part;</div><div class='del'>-		GByteArray *ba;</div><div class='del'>-		CamelStream *cstream;</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-</div><div class='del'>-		e = (GNOME_GtkHTML_Editor_URLRequestEvent *)arg-&gt;_value;</div><div class='del'>-</div><div class='del'>-		if (!e-&gt;url || e-&gt;stream == CORBA_OBJECT_NIL)</div><div class='del'>-			return get_any_null ();</div><div class='del'>-</div><div class='del'>-		part = g_hash_table_lookup (l-&gt;composer-&gt;inline_images_by_url, e-&gt;url);</div><div class='del'>-		if (!part)</div><div class='del'>-			part = g_hash_table_lookup (l-&gt;composer-&gt;inline_images, e-&gt;url);</div><div class='del'>-		if (!part)</div><div class='del'>-			return get_any_null ();</div><div class='del'>-</div><div class='del'>-		/* Write the data to a CamelStreamMem... */</div><div class='del'>-		ba = g_byte_array_new ();</div><div class='del'>-		cstream = camel_stream_mem_new_with_byte_array (ba);</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));</div><div class='del'>-		camel_data_wrapper_write_to_stream (wrapper, cstream);</div><div class='del'>-</div><div class='del'>-		bonobo_stream_client_write (e-&gt;stream, ba-&gt;data, ba-&gt;len, ev);</div><div class='del'>-</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cstream));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv ? rv : get_any_null ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_GNOME_GtkHTML_Editor_Listener__epv *</div><div class='del'>-listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_GtkHTML_Editor_Listener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_GtkHTML_Editor_Listener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;event = impl_event;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_listener_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	listener_vepv.Bonobo_Unknown_epv            = bonobo_object_get_epv ();</div><div class='del'>-	listener_vepv.GNOME_GtkHTML_Editor_Listener_epv = listener_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-listener_class_init (EditorListenerClass *klass)</div><div class='del'>-{</div><div class='del'>-	listener_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	init_listener_corba_class ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-listener_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EditorListener",</div><div class='del'>-			sizeof (EditorListener),</div><div class='del'>-			sizeof (EditorListenerClass),</div><div class='del'>-			(GtkClassInitFunc) listener_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EditorListener *</div><div class='del'>-listener_construct (EditorListener *listener, GNOME_GtkHTML_Editor_Listener corba_listener)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (listener != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EDITOR_LISTENER (listener), NULL);</div><div class='del'>-	g_return_val_if_fail (corba_listener != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!bonobo_object_construct (BONOBO_OBJECT (listener), (CORBA_Object) corba_listener))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_GtkHTML_Editor_Listener</div><div class='del'>-create_listener (BonoboObject *listener)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_GtkHTML_Editor_Listener *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_GtkHTML_Editor_Listener *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;listener_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_GtkHTML_Editor_Listener__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	ORBIT_OBJECT_KEY(servant-&gt;_private)-&gt;object = NULL;</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return (GNOME_GtkHTML_Editor_Listener) bonobo_object_activate_servant (listener, servant);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EditorListener *</div><div class='del'>-listener_new (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	EditorListener *listener;</div><div class='del'>-	GNOME_GtkHTML_Editor_Listener corba_listener;</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (EDITOR_LISTENER_TYPE);</div><div class='del'>-	listener-&gt;composer = composer;</div><div class='del'>-</div><div class='del'>-	corba_listener = create_listener (BONOBO_OBJECT (listener));</div><div class='del'>-</div><div class='del'>-	if (corba_listener == CORBA_OBJECT_NIL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return listener_construct (listener, corba_listener);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/listener.h b/composer/listener.h<br/>deleted file mode 100644<br/>index 00ce8a0e01..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/listener.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>composer/listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*  This file is part of gnome-spell bonobo component</div><div class='del'>-</div><div class='del'>-    Copyright (C) 2000 Ximian, Inc.</div><div class='del'>-    Authors:           Radek Doulik &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-    This program is free software; you can redistribute it and/or</div><div class='del'>-    modify it under the terms of version 2 of the GNU General Public</div><div class='del'>-    License as published by the Free Software Foundation.</div><div class='del'>- </div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>-    General Public License for more details.</div><div class='del'>- </div><div class='del'>-    You should have received a copy of the GNU General Public</div><div class='del'>-    License along with this program; if not, write to the</div><div class='del'>-    Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>-    Boston, MA 02111-1307, USA.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef LISTENER_H_</div><div class='del'>-#define LISTENER_H_</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include "Editor.h"</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define EDITOR_LISTENER_TYPE        (listener_get_type ())</div><div class='del'>-#define EDITOR_LISTENER(o)          (GTK_CHECK_CAST ((o), EDITOR_LISTENER_TYPE, EditorListener))</div><div class='del'>-#define EDITOR_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), EDITOR_LISTENER_TYPE, EditorListenerClass))</div><div class='del'>-#define IS_EDITOR_LISTENER(o)       (GTK_CHECK_TYPE ((o), EDITOR_LISTENER_TYPE))</div><div class='del'>-#define IS_EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EDITOR_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-} EditorListener;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-} EditorListenerClass;</div><div class='del'>-</div><div class='del'>-GtkType                                 listener_get_type   (void);</div><div class='del'>-EditorListener                         *listener_construct  (EditorListener                *listener,</div><div class='del'>-									GNOME_GtkHTML_Editor_Listener  corba_listener);</div><div class='del'>-EditorListener                         *listener_new        (EMsgComposer                  *composer);</div><div class='del'>-POA_GNOME_GtkHTML_Editor_Listener__epv *listener_get_epv    (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* LISTENER_H_ */</div><div class='head'>diff --git a/configure.in b/configure.in<br/>deleted file mode 100644<br/>index 8aea95fa2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/configure.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>configure.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1366 +0,0 @@</div><div class='del'>-# Process this file with autoconf to produce a configure script.</div><div class='del'>-AC_INIT(camel)</div><div class='del'>-AM_CONFIG_HEADER(config.h)</div><div class='del'>-</div><div class='del'>-EVOLUTION_MAJOR_VERSION=1</div><div class='del'>-EVOLUTION_MINOR_VERSION=1</div><div class='del'>-EVOLUTION_MICRO_VERSION=0</div><div class='del'>-EVOLUTION_NANO_VERSION=99</div><div class='del'>-VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION.$EVOLUTION_NANO_VERSION</div><div class='del'>-PACKAGE=evolution</div><div class='del'>-</div><div class='del'>-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)</div><div class='del'>-AC_SUBST(VERSION)</div><div class='del'>-</div><div class='del'>-AC_CANONICAL_HOST</div><div class='del'>-</div><div class='del'>-AC_DEFINE_UNQUOTED(VERSION_COMMENT, "(Preview Release)")</div><div class='del'>-</div><div class='del'>-AC_DEFUN(EVO_CHECK_LIB, [</div><div class='del'>-	dispname="$1"</div><div class='del'>-	pkgname="$2"</div><div class='del'>-	minvers="$3"</div><div class='del'>-	maxvers="$4"</div><div class='del'>-</div><div class='del'>-	AC_MSG_CHECKING(for $dispname)</div><div class='del'>-</div><div class='del'>-	if gnome-config --libs $pkgname &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-		pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[[^0-9]]*//'`</div><div class='del'>-	else</div><div class='del'>-		pkgvers=not</div><div class='del'>-	fi</div><div class='del'>-	AC_MSG_RESULT($pkgvers found)</div><div class='del'>-</div><div class='del'>-	pkgvers=`echo $pkgvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`</div><div class='del'>-	cmpminvers=`echo $minvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`</div><div class='del'>-	cmpmaxvers=`echo $maxvers | awk -F. '{ print $[]1 * 1000000 + $[]2 * 10000 + $[]3 * 100 + $[]4;}'`</div><div class='del'>-	ok=yes</div><div class='del'>-	if test "$pkgvers" -lt $cmpminvers; then</div><div class='del'>-		ok=no</div><div class='del'>-	elif test -n "$maxvers"; then</div><div class='del'>-		if test "$pkgvers" -gt $cmpmaxvers; then</div><div class='del'>-			ok=no</div><div class='del'>-		elif test "$maxvers" != "$minvers" -a "$cmpmaxvers" -eq "$pkgvers"; then</div><div class='del'>-			ok=no</div><div class='del'>-		fi</div><div class='del'>-	fi</div><div class='del'>-	if test $ok = no; then</div><div class='del'>-		case $maxvers in</div><div class='del'>-		"")</div><div class='del'>-			dispvers="$minvers or higher"</div><div class='del'>-			;;</div><div class='del'>-		$minvers)</div><div class='del'>-			dispvers="$minvers (exactly)"</div><div class='del'>-			;;</div><div class='del'>-		*)</div><div class='del'>-			dispvers="$minvers or higher, but less than $maxvers,"</div><div class='del'>-			;;</div><div class='del'>-		esac</div><div class='del'>-</div><div class='del'>-		AC_MSG_ERROR([</div><div class='del'>-""</div><div class='del'>-"You need $dispname $dispvers to build Evolution"</div><div class='del'>-"If you think you already have this installed, consult the README."])</div><div class='del'>-	fi</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-SCROLLKEEPER_REQUIRED=0.1.4</div><div class='del'>-AC_SUBST(SCROLLKEEPER_REQUIRED)</div><div class='del'>-</div><div class='del'>-dnl Check for scrollkeeper</div><div class='del'>-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)</div><div class='del'>-if test x$SCROLLKEEPER_CONFIG = xno; then</div><div class='del'>-  AC_MSG_ERROR(Couldn't find scrollkeeper-config -- please install the scrollkeeper package)</div><div class='del'>-fi</div><div class='del'>-SCROLLKEEPER_LOCALSTATE_DIR=`scrollkeeper-config --pkglocalstatedir`</div><div class='del'>-AC_SUBST(SCROLLKEEPER_LOCALSTATE_DIR)</div><div class='del'>-</div><div class='del'>-dnl  Test whether jw is installed</div><div class='del'>-AC_PATH_PROG(JW,jw,no)</div><div class='del'>-if test x$JW = xno; then</div><div class='del'>-  HAVE_JW="no"</div><div class='del'>-else</div><div class='del'>-  HAVE_JW="yes"</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")</div><div class='del'>-AC_SUBST(HAVE_JW)</div><div class='del'>-</div><div class='del'>-dnl Initialize maintainer mode</div><div class='del'>-AM_MAINTAINER_MODE</div><div class='del'>-</div><div class='del'>-AC_ISC_POSIX</div><div class='del'>-AC_PROG_CC</div><div class='del'>-AC_PROG_CPP</div><div class='del'>-AM_PROG_LEX</div><div class='del'>-AC_PROG_YACC</div><div class='del'>-case $YACC in</div><div class='del'>-*yacc*)</div><div class='del'>-	AC_MSG_ERROR(You need bison to build Evolution)</div><div class='del'>-	;;</div><div class='del'>-esac</div><div class='del'>-AC_STDC_HEADERS</div><div class='del'>-AC_ARG_PROGRAM</div><div class='del'>-AC_PROG_INSTALL</div><div class='del'>-AC_PROG_LN_S</div><div class='del'>-AC_PROG_MAKE_SET</div><div class='del'>-</div><div class='del'>-dnl Initialize xml-i18n-tools</div><div class='del'>-AM_PROG_XML_I18N_TOOLS</div><div class='del'>-</div><div class='del'>-dnl Initialize libtool</div><div class='del'>-AM_PROG_LIBTOOL</div><div class='del'>-</div><div class='del'>-AM_ACLOCAL_INCLUDE(macros)</div><div class='del'>-GNOME_INIT()</div><div class='del'>-GNOME_COMPILE_WARNINGS</div><div class='del'>-GNOME_X_CHECKS</div><div class='del'>-EVO_CHECK_LIB(gnome-libs, gnome, 1.2.9)</div><div class='del'>-AC_CHECK_HEADERS(alloca.h)</div><div class='del'>-</div><div class='del'>-dnl check for socklen_t (in Unix98)</div><div class='del'>-AC_MSG_CHECKING(for socklen_t)</div><div class='del'>-AC_TRY_COMPILE([#include &lt;sys/socket.h&gt;</div><div class='del'>-socklen_t x;</div><div class='del'>-],[],[AC_MSG_RESULT(yes)],[</div><div class='del'>-AC_TRY_COMPILE([#include &lt;sys/socket.h&gt;</div><div class='del'>-int accept (int, struct sockaddr *, size_t *);</div><div class='del'>-],[],[</div><div class='del'>-AC_MSG_RESULT(size_t)</div><div class='del'>-AC_DEFINE(socklen_t,size_t)], [</div><div class='del'>-AC_MSG_RESULT(int)</div><div class='del'>-AC_DEFINE(socklen_t,int)])])</div><div class='del'>-</div><div class='del'>-ALL_LINGUAS="az bg ca cs da de el en_AU en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk vi zh_CN zh_TW"</div><div class='del'>-AM_GNOME_GETTEXT</div><div class='del'>-localedir='$(prefix)/$(DATADIRNAME)/locale'</div><div class='del'>-AC_SUBST(localedir)</div><div class='del'>-</div><div class='del'>-dnl</div><div class='del'>-dnl Purify support</div><div class='del'>-dnl</div><div class='del'>-AC_ARG_ENABLE(purify, </div><div class='del'>-[  --enable-purify=[no/yes]      Enable support for building executables with</div><div class='del'>-                                Purify.],,enable_purify=no)</div><div class='del'>-AC_PATH_PROG(PURIFY, purify, impure)</div><div class='del'>-AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])</div><div class='del'>-if test "x$with_purify_options" = "xno"; then</div><div class='del'>-  with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"</div><div class='del'>-fi</div><div class='del'>-if test "x$PURIFYOPTIONS" = "x"; then</div><div class='del'>-  PURIFYOPTIONS=$with_purify_options</div><div class='del'>-fi</div><div class='del'>-AC_SUBST(PURIFY)</div><div class='del'>-AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")</div><div class='del'>-PURIFY="$PURIFY $PURIFYOPTIONS"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, /usr/sbin:/usr/lib)</div><div class='del'>-AC_DEFINE_UNQUOTED(SENDMAIL_PATH, "$SENDMAIL")</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING(system mail directory)</div><div class='del'>-if test -d /var/mail -a '!' -h /var/mail ; then</div><div class='del'>-	system_mail_dir=/var/mail</div><div class='del'>-else</div><div class='del'>-	system_mail_dir=/var/spool/mail</div><div class='del'>-fi</div><div class='del'>-AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir")</div><div class='del'>-</div><div class='del'>-case `ls -ld $system_mail_dir 2&gt;&amp;1 | awk '{print $1;}'` in</div><div class='del'>-d??????rw?)</div><div class='del'>-	CAMEL_LOCK_HELPER_USER=""</div><div class='del'>-	CAMEL_LOCK_HELPER_GROUP=""</div><div class='del'>-	system_mail_perm="world writable"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-d???rw????)</div><div class='del'>-	CAMEL_LOCK_HELPER_USER=""</div><div class='del'>-	CAMEL_LOCK_HELPER_GROUP=`ls -ld $system_mail_dir 2&gt;&amp;1 | awk '{print $4;}'`</div><div class='del'>-	system_mail_perm="writable by group $CAMEL_LOCK_HELPER_GROUP"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-drw???????)</div><div class='del'>-	CAMEL_LOCK_HELPER_USER=`ls -ld $system_mail_dir 2&gt;&amp;1 | awk '{print $3;}'`</div><div class='del'>-	CAMEL_LOCK_HELPER_GROUP=""</div><div class='del'>-	system_mail_perm="writable by user $CAMEL_LOCK_HELPER_USER"</div><div class='del'>-	;;</div><div class='del'>-</div><div class='del'>-*)</div><div class='del'>-	CAMEL_LOCK_HELPER_USER=""</div><div class='del'>-	CAMEL_LOCK_HELPER_GROUP=""</div><div class='del'>-	system_mail_perm="???"</div><div class='del'>-	;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-AC_MSG_RESULT([$system_mail_dir, $system_mail_perm])</div><div class='del'>-AC_SUBST(CAMEL_LOCK_HELPER_USER)</div><div class='del'>-AC_SUBST(CAMEL_LOCK_HELPER_GROUP)</div><div class='del'>-</div><div class='del'>-dnl * Time zone stuff</div><div class='del'>-AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#include &lt;time.h&gt;</div><div class='del'>-	], [</div><div class='del'>-		timezone = 1;</div><div class='del'>-	], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))</div><div class='del'>-if test $ac_cv_var_timezone = yes; then</div><div class='del'>-	AC_DEFINE(HAVE_TIMEZONE)</div><div class='del'>-else</div><div class='del'>-	AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,</div><div class='del'>-		AC_TRY_COMPILE([</div><div class='del'>-			#include &lt;time.h&gt;</div><div class='del'>-			], [</div><div class='del'>-			struct tm tm;</div><div class='del'>-			tm.tm_gmtoff = 1;</div><div class='del'>-			], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))</div><div class='del'>-	if test $ac_cv_struct_tm_gmtoff = yes; then</div><div class='del'>-		AC_DEFINE(HAVE_TM_GMTOFF)</div><div class='del'>-	else</div><div class='del'>-		AC_ERROR(unable to find a way to determine timezone)</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_CHECK_FUNCS(mkstemp mkdtemp isblank)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl ctime_r prototype</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,</div><div class='del'>-[</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#include &lt;time.h&gt;</div><div class='del'>-	],[</div><div class='del'>-		char *buf;</div><div class='del'>-		time_t date;</div><div class='del'>-		ctime_r( &amp;date, buf, 100 );</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_ctime_r_three_args=yes</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_ctime_r_three_args=no</div><div class='del'>-	])</div><div class='del'>-])</div><div class='del'>-	</div><div class='del'>-if test x"$ac_cv_ctime_r_three_args" = xyes ; then</div><div class='del'>-	AC_DEFINE(CTIME_R_THREE_ARGS)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl gethostbyname_r prototype</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_CHECK_FUNCS(gethostbyname_r,[</div><div class='del'>-AC_CACHE_CHECK([if gethostbyname_r wants five arguments], ac_cv_gethostbyname_r_five_args,</div><div class='del'>-[</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#include "confdefs.h"</div><div class='del'>-		#include &lt;sys/types.h&gt;</div><div class='del'>-		#include &lt;sys/socket.h&gt;</div><div class='del'>-		#include &lt;netinet/in.h&gt;</div><div class='del'>-		#include &lt;netdb.h&gt;</div><div class='del'>-</div><div class='del'>-		#define BUFSIZE (sizeof(struct hostent)+10)</div><div class='del'>-	],[</div><div class='del'>-		struct hostent hent;</div><div class='del'>-		char buffer[BUFSIZE];</div><div class='del'>-		int bufsize=BUFSIZE;</div><div class='del'>-		int h_errno;</div><div class='del'>-</div><div class='del'>-		(void)gethostbyname_r ("www.ximian.com", &amp;hent, buffer, bufsize, &amp;h_errno);</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_gethostbyname_r_five_args=yes</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_gethostbyname_r_five_args=no</div><div class='del'>-	])</div><div class='del'>-])])</div><div class='del'>-	</div><div class='del'>-if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then</div><div class='del'>-	AC_DEFINE(GETHOSTBYNAME_R_FIVE_ARGS)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl gethostbyaddr_r prototype</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_CHECK_FUNCS(gethostbyaddr_r,[</div><div class='del'>-AC_CACHE_CHECK([if gethostbyaddr_r wants seven arguments], ac_cv_gethostbyaddr_r_seven_args,</div><div class='del'>-[</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#include "confdefs.h"</div><div class='del'>-		#include &lt;sys/types.h&gt;</div><div class='del'>-		#include &lt;sys/socket.h&gt;</div><div class='del'>-		#include &lt;netinet/in.h&gt;</div><div class='del'>-		#include &lt;netdb.h&gt;</div><div class='del'>-</div><div class='del'>-		#define BUFSIZE (sizeof(struct hostent)+10)</div><div class='del'>-	],[</div><div class='del'>-		struct hostent hent;</div><div class='del'>-		char buffer[BUFSIZE];</div><div class='del'>-		int bufsize=BUFSIZE;</div><div class='del'>-		int h_errno;</div><div class='del'>-</div><div class='del'>-		(void)gethostbyaddr_r ("www.ximian.com", 14, AF_INET, &amp;hent, buffer, bufsize, &amp;h_errno);</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_gethostbyaddr_r_seven_args=yes</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_gethostbyaddr_r_seven_args=no</div><div class='del'>-	])</div><div class='del'>-])])</div><div class='del'>-	</div><div class='del'>-if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then</div><div class='del'>-	AC_DEFINE(GETHOSTBYADDR_R_SEVEN_ARGS)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ***********</div><div class='del'>-dnl * db3 stuff</div><div class='del'>-dnl ***********</div><div class='del'>-</div><div class='del'>-# To ensure that any copy of evolution of a given version can read</div><div class='del'>-# the data files of any other copy, we require a precise db3 version.</div><div class='del'>-# This can only change between Evolution versions (and then can only</div><div class='del'>-# go up.)</div><div class='del'>-evolution_db_version_major=3</div><div class='del'>-evolution_db_version_minor=1</div><div class='del'>-evolution_db_version_patch=17</div><div class='del'>-</div><div class='del'>-evolution_db_version=${evolution_db_version_major}.${evolution_db_version_minor}.${evolution_db_version_patch}</div><div class='del'>-AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_MAJOR,$evolution_db_version_major)</div><div class='del'>-AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_MINOR,$evolution_db_version_minor)</div><div class='del'>-AC_DEFINE_UNQUOTED(EVOLUTION_DB_VERSION_PATCH,$evolution_db_version_patch)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-AC_ARG_WITH(db3,          [  --with-db3=PREFIX              Location of db3],</div><div class='del'>-	[with_db3_includes="$withval/include"</div><div class='del'>-	 with_db3_libs="$withval/lib"])</div><div class='del'>-AC_ARG_WITH(db3-includes, [  --with-db3-includes=PATH       Location of db3 includes],</div><div class='del'>-	with_db3_includes="$withval")</div><div class='del'>-AC_ARG_WITH(db3-libs,     [  --with-db3-libs=PATH           Location of db3 libs],</div><div class='del'>-	with_db3_libs="$withval")</div><div class='del'>-</div><div class='del'>-if test -z "$with_db3_libs"; then</div><div class='del'>-	with_db3_libs="/usr/lib"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl The AC_CACHE_CHECK lets you avoid having to specify --with-db3</div><div class='del'>-dnl again with later configures</div><div class='del'>-AC_CACHE_CHECK([for db3 compiler flags], ac_cv_db3_cflags,</div><div class='del'>-[</div><div class='del'>-	if test -n "${with_db3_includes}"; then</div><div class='del'>-		ac_cv_db3_cflags="-I$with_db3_includes"</div><div class='del'>-	fi</div><div class='del'>-])</div><div class='del'>-DB3_CFLAGS=$ac_cv_db3_cflags</div><div class='del'>-AC_SUBST(DB3_CFLAGS)</div><div class='del'>-</div><div class='del'>-CPPFLAGS_save="$CPPFLAGS"</div><div class='del'>-CPPFLAGS="$DB3_CFLAGS $CPPFLAGS"</div><div class='del'>-AC_CHECK_HEADERS(db.h db3/db.h, break)</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([db3 header version], ac_cv_db3_header_version,</div><div class='del'>-[</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#ifdef HAVE_DB3_DB_H</div><div class='del'>-		#include &lt;db3/db.h&gt;</div><div class='del'>-		#else</div><div class='del'>-		#include &lt;db.h&gt;</div><div class='del'>-		#endif</div><div class='del'>-	],[</div><div class='del'>-		#if DB_VERSION_MAJOR != $evolution_db_version_major || \</div><div class='del'>-		    DB_VERSION_MINOR != $evolution_db_version_minor || \</div><div class='del'>-		    DB_VERSION_PATCH != $evolution_db_version_patch</div><div class='del'>-		#error</div><div class='del'>-		#endif</div><div class='del'>-	], :, AC_MSG_ERROR(Found db.h is not version $evolution_db_version))</div><div class='del'>-</div><div class='del'>-	ac_cv_db3_header_version=$evolution_db_version</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([for db3 library name], ac_cv_db3_ldadd,</div><div class='del'>-[</div><div class='del'>-	LIBS_save="$LIBS"</div><div class='del'>-	ac_cv_db3_ldadd=""</div><div class='del'>-</div><div class='del'>-	for name in db db3 db-3.1; do</div><div class='del'>-		LIBS="$LIBS_save $with_db3_libs/lib${name}.a"</div><div class='del'>-		AC_TRY_LINK([</div><div class='del'>-			#ifdef HAVE_DB3_DB_H</div><div class='del'>-			#include &lt;db3/db.h&gt;</div><div class='del'>-			#else</div><div class='del'>-			#include &lt;db.h&gt;</div><div class='del'>-			#endif</div><div class='del'>-		],[</div><div class='del'>-			DB *db;</div><div class='del'>-			db_create (&amp;db, 0, 0);</div><div class='del'>-		], [</div><div class='del'>-			ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a"</div><div class='del'>-			break</div><div class='del'>-		])</div><div class='del'>-	done</div><div class='del'>-	LIBS="$LIBS_save"</div><div class='del'>-</div><div class='del'>-	if test -z "$ac_cv_db3_ldadd"; then</div><div class='del'>-		AC_MSG_ERROR(Could not find db3 library)</div><div class='del'>-	fi</div><div class='del'>-])</div><div class='del'>-DB3_LDADD=$ac_cv_db3_ldadd</div><div class='del'>-AC_SUBST(DB3_LDADD)</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([that db3 library version matches header version], ac_cv_db3_lib_version_match,</div><div class='del'>-[</div><div class='del'>-	LIBS="$DB3_LDADD $LIBS"</div><div class='del'>-	AC_TRY_RUN([</div><div class='del'>-		#ifdef HAVE_DB3_DB_H</div><div class='del'>-		#include &lt;db3/db.h&gt;</div><div class='del'>-		#else</div><div class='del'>-		#include &lt;db.h&gt;</div><div class='del'>-		#endif</div><div class='del'>-</div><div class='del'>-		int</div><div class='del'>-		main (void)</div><div class='del'>-		{</div><div class='del'>-			int major, minor, patch;</div><div class='del'>-</div><div class='del'>-			db_version (&amp;major, &amp;minor, &amp;patch);</div><div class='del'>-			return !(major == DB_VERSION_MAJOR &amp;&amp;</div><div class='del'>-				 minor == DB_VERSION_MINOR &amp;&amp;</div><div class='del'>-				 patch == DB_VERSION_PATCH);</div><div class='del'>-		}</div><div class='del'>-	], ac_cv_db3_lib_version_match=yes, ac_cv_db3_lib_version_match=no,</div><div class='del'>-	ac_cv_db3_lib_version_match=yes)</div><div class='del'>-])</div><div class='del'>-if test "$ac_cv_db3_lib_version_match" = no; then</div><div class='del'>-	AC_MSG_ERROR(db3 headers and library do not match... multiple copies installed?)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-CPPFLAGS="$CPPFLAGS_save"</div><div class='del'>-LIBS="$LIBS_save"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * ldap related stuff.</div><div class='del'>-dnl **************************************************</div><div class='del'>-AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])</div><div class='del'>-AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])</div><div class='del'>-AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=no}")</div><div class='del'>-case $ac_cv_with_openldap in</div><div class='del'>-no|"")</div><div class='del'>-	msg_ldap=no</div><div class='del'>-	;;</div><div class='del'>-yes)</div><div class='del'>-	with_openldap=/usr</div><div class='del'>-	msg_ldap=yes</div><div class='del'>-	;;</div><div class='del'>-*)</div><div class='del'>-	with_openldap=$ac_cv_with_openldap</div><div class='del'>-	LDAP_CFLAGS="-I$ac_cv_with_openldap/include"</div><div class='del'>-	LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"</div><div class='del'>-	msg_ldap=yes</div><div class='del'>-	;;</div><div class='del'>-esac</div><div class='del'>-</div><div class='del'>-if test "$msg_ldap" = yes; then</div><div class='del'>-</div><div class='del'>-	AC_DEFINE(HAVE_LDAP)</div><div class='del'>-</div><div class='del'>-	if test -f $with_openldap/lib/libldap.la; then</div><div class='del'>-		msg_ldap_linktype="(static)"</div><div class='del'>-	else</div><div class='del'>-		msg_ldap_linktype="(dynamic)"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if test "${with_static_ldap+set}" = set; then</div><div class='del'>-		case $with_static_ldap in</div><div class='del'>-		no|"")</div><div class='del'>-			msg_ldap_linktype="(dynamic)"</div><div class='del'>-			;;</div><div class='del'>-		*)</div><div class='del'>-			msg_ldap_linktype="(static)"</div><div class='del'>-			;;</div><div class='del'>-		esac</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [</div><div class='del'>-		CPPFLAGS_save="$CPPFLAGS"</div><div class='del'>-		CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"</div><div class='del'>-		AC_EGREP_CPP(yes, [</div><div class='del'>-			#include "ldap.h"</div><div class='del'>-			#if LDAP_VENDOR_VERSION &gt; 20000</div><div class='del'>-			yes</div><div class='del'>-			#endif</div><div class='del'>-		], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)</div><div class='del'>-		CPPFLAGS="$CPPFLAGS_save"</div><div class='del'>-	])</div><div class='del'>-	if test "$ac_cv_openldap_version2" = no; then</div><div class='del'>-		AC_MSG_ERROR(evolution requires OpenLDAP version &gt;= 2)</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")</div><div class='del'>-	AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")</div><div class='del'>-	AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")</div><div class='del'>-	AC_CHECK_LIB(lber, ber_get_tag, [</div><div class='del'>-		if test "$msg_ldap_linktype" = "(static)"; then</div><div class='del'>-			LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"</div><div class='del'>-</div><div class='del'>-			# libldap might depend on OpenSSL... We need to pull</div><div class='del'>-			# in the dependency libs explicitly here since we're</div><div class='del'>-			# not using libtool for the configure test.</div><div class='del'>-			if test -f $with_openldap/lib/libldap.la; then</div><div class='del'>-				LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"</div><div class='del'>-			fi</div><div class='del'>-		else</div><div class='del'>-			LDAP_LIBS="-llber $LDAP_LIBS"</div><div class='del'>-		fi</div><div class='del'>-		AC_CHECK_LIB(ldap, ldap_open, [</div><div class='del'>-				if test $msg_ldap_linktype = "(static)"; then</div><div class='del'>-					LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"</div><div class='del'>-				else</div><div class='del'>-					LDAP_LIBS="-lldap $LDAP_LIBS"</div><div class='del'>-				fi],</div><div class='del'>-			LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)</div><div class='del'>-		LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"</div><div class='del'>-	], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)</div><div class='del'>-</div><div class='del'>-	if test -z "$LDAP_LIBS"; then</div><div class='del'>-		AC_MSG_ERROR(could not find OpenLDAP libraries)</div><div class='del'>-	elif test "$msg_ldap_linktype" = "(static)"; then</div><div class='del'>-		case "$host" in</div><div class='del'>-		   *solaris*)</div><div class='del'>-		         if echo $LDAP_LIBS | grep -- "-lresolv" &gt;/dev/null 2&gt;&amp;1; then</div><div class='del'>-		           LDAP_LIBS=`echo $LDAP_LIBS | sed "s,-lresolv ,,g"`</div><div class='del'>-			   LDAP_SHARED="-lresolv"</div><div class='del'>-		         fi</div><div class='del'>-		  ;;</div><div class='del'>-		esac</div><div class='del'>-</div><div class='del'>-		LDAP_LIBS="-Wl,-Bstatic $LDAP_LIBS -Wl,-Bdynamic $LDAP_SHARED"</div><div class='del'>-	fi</div><div class='del'>-</div><div class='del'>-	AC_SUBST(LDAP_CFLAGS)</div><div class='del'>-	AC_SUBST(LDAP_LIBS)</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(ENABLE_LDAP, test $msg_ldap = yes)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl NNTP support.</div><div class='del'>-dnl **************************************************</div><div class='del'>-AC_ARG_ENABLE(nntp, </div><div class='del'>-[  --enable-nntp=[no/yes]      Attempt to compile incomplete, unsupported NNTP code],,enable_nntp=no)</div><div class='del'>-if test "x$enable_nntp" = "xyes"; then</div><div class='del'>-	AC_DEFINE(ENABLE_NNTP)</div><div class='del'>-	msg_nntp=yes</div><div class='del'>-else</div><div class='del'>-	msg_nntp=no</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(ENABLE_NNTP, test x$enable_nntp = xyes)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * Posix thread support</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-dnl Hah! Threads are no longer an option</div><div class='del'>-dnl AC_ARG_WITH(threads, [  --with-threads          Include thread support],[</div><div class='del'>-dnl FIXME: support more thread types, pth at least</div><div class='del'>-</div><div class='del'>-GLIB_CONFIG=${GLIB_CONFIG-glib-config}</div><div class='del'>-GNOME_PTHREAD_CHECK</div><div class='del'>-</div><div class='del'>-if test "x$PTHREAD_LIB" = "x" ; then</div><div class='del'>-	AC_MSG_ERROR([POSIX threads are currently required for Evolution])</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl</div><div class='del'>-dnl Notice that this is a hack, and we wont be able to use this forever, but</div><div class='del'>-dnl at least for some time</div><div class='del'>-dnl</div><div class='del'>-</div><div class='del'>-THREADS_LIBS="$PTHREAD_LIB `$GLIB_CONFIG --libs gthread`"</div><div class='del'>-THREADS_CFLAGS="`$GLIB_CONFIG --cflags gthread`"</div><div class='del'>-</div><div class='del'>-AC_SUBST(THREADS_LIBS)</div><div class='del'>-AC_SUBST(THREADS_CFLAGS)</div><div class='del'>-AC_DEFINE(ENABLE_THREADS)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * File locking</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_ARG_ENABLE(dot-locking, </div><div class='del'>-[  --enable-dot-locking=[yes/no] Enable support for locking mail files with dot locking],,enable_dot_locking=yes)</div><div class='del'>-if test "x$enable_dot_locking" = "xyes"; then</div><div class='del'>-  AC_DEFINE(USE_DOT)</div><div class='del'>-  msg_dot=yes</div><div class='del'>-else</div><div class='del'>-  msg_dot=no	</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_ARG_ENABLE(file-locking, </div><div class='del'>-[  --enable-file-locking=[fcntl/flock/no] Enable support for locking mail files with file locking],,enable_file_locking=fcntl)</div><div class='del'>-if test "x$enable_file_locking" = "xfcntl"; then</div><div class='del'>-  AC_DEFINE(USE_FCNTL)</div><div class='del'>-  msg_file=fcntl</div><div class='del'>-else</div><div class='del'>-  if test "x$enable_file_locking" = "xflock"; then</div><div class='del'>-    AC_DEFINE(USE_FLOCK)</div><div class='del'>-    msg_file=flock</div><div class='del'>-  else</div><div class='del'>-    msg_file=no	</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * sendmail operation</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_MSG_CHECKING(for SunOS broken spool format)</div><div class='del'>-if test "x$host_os" = "xsunos" ; then</div><div class='del'>-   with_broken_spool="yes"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_ARG_WITH(broken-spool, </div><div class='del'>-[  --with-broken-spool=[yes/no] Using SunOS/Solaris sendmail which has a broken spool format],,with_broken_spool=${with_broken_spool:=no})</div><div class='del'>-</div><div class='del'>-if test "x$with_broken_spool" = "xyes"; then</div><div class='del'>-  AC_DEFINE(HAVE_BROKEN_SPOOL)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_MSG_RESULT($with_broken_spool)</div><div class='del'>-</div><div class='del'>-dnl ***************************************************************</div><div class='del'>-dnl Whether to build shlib components (instead of out-of-proc ones)</div><div class='del'>-dnl ***************************************************************</div><div class='del'>-</div><div class='del'>-AC_ARG_ENABLE(shlib-components,</div><div class='del'>-              [   --enable-shlib-components Enable building of some of the components as shared libs],</div><div class='del'>-	      enable_shlib_components=yes,enable_shlib_components=no)</div><div class='del'>-</div><div class='del'>-AM_CONDITIONAL(ENABLE_SHLIB_COMPONENTS, test "x$enable_shlib_components" = "xyes")</div><div class='del'>-</div><div class='del'>-if test "x$enable_shlib_components" = "xyes" ; then</div><div class='del'>-	OAF_SHLIB_TYPE="shlib"</div><div class='del'>-	OAF_SHLIB_PREFIX="lib"</div><div class='del'>-	OAF_SHLIB_SUFFIX=".so"</div><div class='del'>-else</div><div class='del'>-	OAF_SHLIB_TYPE="exe"</div><div class='del'>-	OAF_SHLIB_PREFIX=""</div><div class='del'>-	OAF_SHLIB_SUFFIX=""</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(OAF_SHLIB_TYPE)</div><div class='del'>-AC_SUBST(OAF_SHLIB_PREFIX)</div><div class='del'>-AC_SUBST(OAF_SHLIB_SUFFIX)</div><div class='del'>-</div><div class='del'>-dnl ***************</div><div class='del'>-dnl GNOME Libraries</div><div class='del'>-dnl ***************</div><div class='del'>-EVO_CHECK_LIB(Bonobo, bonobox, 1.0.3)</div><div class='del'>-EVO_CHECK_LIB(OAF, oaf, 0.6.2)</div><div class='del'>-EVO_CHECK_LIB(libglade, libglade, 0.14)</div><div class='del'>-EVO_CHECK_LIB(gdk-pixbuf with GNOME canvas support, gnomecanvaspixbuf, 0.9.0)</div><div class='del'>-EVO_CHECK_LIB(GNOME-VFS, vfs, 1.0)</div><div class='del'>-EVO_CHECK_LIB(libxml, xml, 1.8.10, 2.0)</div><div class='del'>-EVO_CHECK_LIB(bonobo-conf, bonobo_conf, 0.11)</div><div class='del'>-</div><div class='del'>-EVO_CHECK_LIB(GAL, gal, 0.19.99.15)</div><div class='del'>-EVO_CHECK_LIB(GtkHTML, gtkhtml, 1.1.1)</div><div class='del'>-EVO_CHECK_LIB(Libsoup, soup, 0.6)</div><div class='del'>-</div><div class='del'>-AM_PATH_GCONF(1.0)</div><div class='del'>-if test "x$GCONF_CFLAGS" = "x" ; then</div><div class='del'>-	AC_MSG_ERROR(Evolution requires GConf to be installed)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Pilot checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_ARG_ENABLE(pilot-conduits, </div><div class='del'>-[  --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)</div><div class='del'>-if test "x$enable_pilot_conduits" = "xyes"; then</div><div class='del'>-	GNOME_PILOT_CHECK</div><div class='del'>-</div><div class='del'>-	CFLAGS_save="$CFLAGS"</div><div class='del'>-	CFLAGS="$CFLAGS $PISOCK_CFLAGS"</div><div class='del'>-	LDFLAGS_save="$LDFLAGS"</div><div class='del'>-	LDFLAGS="$LDFLAGS $PISOCK_LIBS"</div><div class='del'>-</div><div class='del'>-	AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions], ac_cv_pilot_link_utf8, AC_TRY_RUN([</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;pi-util.h&gt;</div><div class='del'>-</div><div class='del'>-int main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";</div><div class='del'>-	size_t utf8_real_len = strlen (utf8);</div><div class='del'>-	char *pstring;	</div><div class='del'>-</div><div class='del'>-	if (convert_ToPilotChar ("UTF-8", utf8, utf8_real_len, &amp;pstring) == -1)</div><div class='del'>-	        exit (1);</div><div class='del'>-</div><div class='del'>-	exit (0);</div><div class='del'>-}</div><div class='del'>-], ac_cv_pilot_link_utf8=yes, ac_cv_pilot_link_utf8=no, ac_cv_pilot_link_utf8=no))</div><div class='del'>-</div><div class='del'>-	CFLAGS="$CFLAGS_save"</div><div class='del'>-	LDFLAGS="$LDFLAGS_save"</div><div class='del'>-</div><div class='del'>-	if test "$ac_cv_pilot_link_utf8" = no; then</div><div class='del'>-		AC_MSG_ERROR(evolution requires pilot-link to have working UTF-8 conversion routines)</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")</div><div class='del'>-if test x$enable_pilot_conduits = xyes; then</div><div class='del'>-   msg_pilot=yes</div><div class='del'>-else</div><div class='del'>-   msg_pilot=no</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ********</div><div class='del'>-dnl Kerberos</div><div class='del'>-dnl ********</div><div class='del'>-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 libs/includes])</div><div class='del'>-AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 libs/includes])</div><div class='del'>-msg_krb5=no</div><div class='del'>-if test ${with_krb5:=no} != no; then</div><div class='del'>-	LDFLAGS_save="$LDFLAGS"</div><div class='del'>-</div><div class='del'>-	mitlibs="-lkrb5 -lk5crypto -lcom_err"</div><div class='del'>-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken"</div><div class='del'>-	AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,</div><div class='del'>-	[</div><div class='del'>-		LDFLAGS="$LDFLAGS -L$with_krb5/lib $mitlibs"</div><div class='del'>-		AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",</div><div class='del'>-		[</div><div class='del'>-			LDFLAGS="$LDFLAGS_save -L$with_krb5/lib $heimlibs"</div><div class='del'>-			AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", ac_cv_lib_kerberos5=no)</div><div class='del'>-		])</div><div class='del'>-		LDFLAGS="$LDFLAGS_save"</div><div class='del'>-	])</div><div class='del'>-	if test "$ac_cv_lib_kerberos5" != no; then</div><div class='del'>-		AC_DEFINE(HAVE_KRB5)</div><div class='del'>-		msg_krb5=yes</div><div class='del'>-		KRB5_CFLAGS="-I$with_krb5/include/krb5"</div><div class='del'>-		KRB5_LDFLAGS="-L$with_krb5/lib $ac_cv_lib_kerberos5"</div><div class='del'>-	fi</div><div class='del'>-else</div><div class='del'>-	AC_MSG_CHECKING(for Kerberos 5)</div><div class='del'>-	AC_MSG_RESULT($with_krb5)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-msg_krb4=no</div><div class='del'>-if test x${with_krb4:=no} != xno; then</div><div class='del'>-	LDFLAGS_save="$LDFLAGS"</div><div class='del'>-	AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,</div><div class='del'>-	[</div><div class='del'>-		ac_cv_lib_kerberos4=no</div><div class='del'>-</div><div class='del'>-		case $ac_cv_lib_kerberos5 in</div><div class='del'>-		*k5crypto*)</div><div class='del'>-			# Look for MIT krb5 compat krb4</div><div class='del'>-			LDFLAGS="$LDFLAGS -L$with_krb4/lib -lkrb4 -ldes425 $KRB5_LDFLAGS"</div><div class='del'>-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb4 -ldes425 $KRB5_LDFLAGS")</div><div class='del'>-			;;</div><div class='del'>-		esac</div><div class='del'>-</div><div class='del'>-		if test "$ac_cv_lib_kerberos4" = no; then</div><div class='del'>-			# Look for KTH krb4</div><div class='del'>-			LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb -lcrypto -lcom_err -lroken"</div><div class='del'>-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken")</div><div class='del'>-		fi</div><div class='del'>-		if test "$ac_cv_lib_kerberos4" = no; then</div><div class='del'>-			# Look for old MIT krb4</div><div class='del'>-			LDFLAGS="$LDFLAGS_save -L$with_krb4/lib -lkrb"</div><div class='del'>-			AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4=-lkrb,</div><div class='del'>-			[</div><div class='del'>-				LDFLAGS="$LDFLAGS -ldes"</div><div class='del'>-				AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb -ldes")</div><div class='del'>-			])</div><div class='del'>-		fi</div><div class='del'>-	])</div><div class='del'>-	LDFLAGS="$LDFLAGS_save"</div><div class='del'>-	if test "$ac_cv_lib_kerberos4" != no; then</div><div class='del'>-		AC_DEFINE(HAVE_KRB4)</div><div class='del'>-		msg_krb4=yes</div><div class='del'>-		if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then</div><div class='del'>-			KRB4_CFLAGS="-I$with_krb4/include"</div><div class='del'>-		fi</div><div class='del'>-		if test -d "$with_krb4/include/kerberosIV"; then</div><div class='del'>-			KRB4_CFLAGS="-I$with_krb4/include/kerberosIV"</div><div class='del'>-		fi</div><div class='del'>-		KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4"</div><div class='del'>-</div><div class='del'>-		CFLAGS_save="$CFLAGS"</div><div class='del'>-		CFLAGS="$CFLAGS $KRB4_CFLAGS"</div><div class='del'>-		AC_TRY_COMPILE([#include "krb.h"</div><div class='del'>-		int krb_sendauth;</div><div class='del'>-		],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO)],)</div><div class='del'>-		CFLAGS="$CFLAGS_save"</div><div class='del'>-	fi</div><div class='del'>-else</div><div class='del'>-	AC_MSG_CHECKING(for Kerberos 4)</div><div class='del'>-	AC_MSG_RESULT(${with_krb4})</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(KRB5_CFLAGS)</div><div class='del'>-AC_SUBST(KRB5_LDFLAGS)</div><div class='del'>-AC_SUBST(KRB4_CFLAGS)</div><div class='del'>-AC_SUBST(KRB4_LDFLAGS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ==========================</div><div class='del'>-dnl Pedantic PGP/MIME</div><div class='del'>-dnl ==========================</div><div class='del'>-AC_ARG_ENABLE(pedantic-pgp-mime, </div><div class='del'>-[  --enable-pedantic-pgp-mime=[no/yes] Enable pedantic PGP/MIME handling (not recommended)],,enable_pedantic_pgp_mime=no)</div><div class='del'>-if test "x$enable_pedantic_pgp_mime" = "xyes"; then</div><div class='del'>-	AC_DEFINE(ENABLE_PEDANTIC_PGPMIME)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ********************************************************************************</div><div class='del'>-dnl security extension support (SSL and S/MIME)</div><div class='del'>-dnl</div><div class='del'>-dnl The following voodoo does detection of mozilla libraries (nspr and nss) </div><div class='del'>-dnl needed by Camel (SSL and S/MIME).</div><div class='del'>-dnl</div><div class='del'>-dnl The Evolution security extensions are only built if these libraries are found</div><div class='del'>-dnl ********************************************************************************</div><div class='del'>-msg_ssl=no</div><div class='del'>-</div><div class='del'>-dnl these 2 enable's are inverses of each other</div><div class='del'>-AC_ARG_ENABLE(nss, [  --enable-nss=[yes,no]        Attempt to use Mozilla libnss for SSL support.],</div><div class='del'>-	enable_nss="$enableval", enable_nss="yes")</div><div class='del'>-</div><div class='del'>-AC_ARG_ENABLE(openssl, [  --enable-openssl=[yes,no]        Attempt to use OpenSSL for SSL support.],</div><div class='del'>-	enable_openssl="$enableval", enable_openssl="auto")</div><div class='del'>-</div><div class='del'>-if test "x${enable_openssl}" = "xyes"; then</div><div class='del'>-dnl User wants to override nss with OpenSSL</div><div class='del'>-	enable_nss="no"</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "x${enable_nss}" = "xyes"; then</div><div class='del'>-	AC_ARG_WITH(nspr-includes, [  --with-nspr-includes=PREFIX     Location of Mozilla nspr4 includes.],</div><div class='del'>-		with_nspr_includes="$withval", with_nspr_includes="/usr/include/nspr")</div><div class='del'>-	have_nspr_includes="no"</div><div class='del'>-	if test "x${with_nspr_includes}" != "xno"; then</div><div class='del'>-		CPPFLAGS_save="$CPPFLAGS"</div><div class='del'>-		</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)</div><div class='del'>-		AC_MSG_RESULT("")</div><div class='del'>-		</div><div class='del'>-		CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"</div><div class='del'>-		AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ])</div><div class='del'>-		CPPFLAGS="$CPPFLAGS_save"</div><div class='del'>-		</div><div class='del'>-		if test "x{$moz_nspr_includes}" != "xno" -a "x{$moz_nspr_includes}" != "x" ; then</div><div class='del'>-			have_nspr_includes="yes"</div><div class='del'>-			NSPR_CFLAGS="-I$with_nspr_includes"</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nspr4 includes)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-	</div><div class='del'>-	AC_ARG_WITH(nspr-libs, [  --with-nspr-libs=PREFIX     Location of Mozilla nspr4 libs.],</div><div class='del'>-		with_nspr_libs="$withval")</div><div class='del'>-	have_nspr_libs="no"</div><div class='del'>-	if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then</div><div class='del'>-		CFLAGS_save="$CFLAGS"</div><div class='del'>-		LDFLAGS_save="$LDFLAGS"</div><div class='del'>-		</div><div class='del'>-		nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"</div><div class='del'>-		AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,</div><div class='del'>-		[</div><div class='del'>-			CFLAGS="$CFLAGS $NSPR_CFLAGS"</div><div class='del'>-			</div><div class='del'>-			if test "x${with_nspr_libs}" != "x"; then</div><div class='del'>-				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs"</div><div class='del'>-			else</div><div class='del'>-				LDFLAGS="$LDFLAGS $nsprlibs"</div><div class='del'>-			fi</div><div class='del'>-			</div><div class='del'>-			AC_TRY_LINK_FUNC(PR_Init, moz_nspr_libs="yes", moz_nspr_libs="no")</div><div class='del'>-			CFLAGS="$CFLAGS_save"</div><div class='del'>-			LDFLAGS="$LDFLAGS_save"</div><div class='del'>-		])</div><div class='del'>-		if test "x$moz_nspr_libs" != "xno"; then</div><div class='del'>-			have_nspr_libs="yes"</div><div class='del'>-			NSPR_LDFLAGS="-L$with_nspr_libs $nsprlibs"</div><div class='del'>-		else</div><div class='del'>-			NSPR_CLFAGS=""</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nspr4 libraries)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-	</div><div class='del'>-	AC_ARG_WITH(nss-includes, [  --with-nss-includes=PREFIX     Location of Mozilla nss3 includes.],</div><div class='del'>-		with_nss_includes="$withval", with_nss_includes="/usr/include/moznss")</div><div class='del'>-	if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then</div><div class='del'>-		CPPFLAGS_save="$CPPFLAGS"</div><div class='del'>-		</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)</div><div class='del'>-		AC_MSG_RESULT("")</div><div class='del'>-	</div><div class='del'>-        	if test "x${with_nspr_includes}" != "x"; then</div><div class='del'>-	        	CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"</div><div class='del'>-        	else</div><div class='del'>-	        	CPPFLAGS="$CPPFLAGS -I$with_nss_includes"</div><div class='del'>-		fi</div><div class='del'>-	</div><div class='del'>-		AC_CHECK_HEADERS(nss.h ssl.h smime.h,</div><div class='del'>-			[ have_nss_includes="yes" ], </div><div class='del'>-			[ have_nss_includes="no" ])</div><div class='del'>-	</div><div class='del'>-		CPPFLAGS="$CPPFLAGS_save"</div><div class='del'>-		</div><div class='del'>-		if test "x${have_nss_includes}" = xyes ; then	</div><div class='del'>-			have_nss_includes="yes"</div><div class='del'>-			NSS_CFLAGS="-I$with_nss_includes"</div><div class='del'>-		else</div><div class='del'>-			NSPR_CFLAGS=""</div><div class='del'>-			NSPR_LDFLAGS=""</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nss3 includes)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-	</div><div class='del'>-	AC_ARG_WITH(nss-libs, [  --with-nss-libs=PREFIX     	Location of Mozilla nss3 libs.],</div><div class='del'>-		with_nss_libs="$withval")</div><div class='del'>-	if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then</div><div class='del'>-		LDFLAGS_save="$LDFLAGS"</div><div class='del'>-		</div><div class='del'>-		nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"</div><div class='del'>-		nsslibs="-lssl3 -lsmime3 -lnss3"</div><div class='del'>-		AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,</div><div class='del'>-		[</div><div class='del'>-			LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"</div><div class='del'>-			AC_TRY_LINK_FUNC(NSS_Init, moz_nss_libs="yes", moz_nss_libs="no")</div><div class='del'>-			LDFLAGS="$LDFLAGS_save"</div><div class='del'>-		])</div><div class='del'>-		if test "$moz_nss_libs" != no; then</div><div class='del'>-			AC_DEFINE(HAVE_NSS)</div><div class='del'>-			AC_DEFINE(HAVE_SSL)</div><div class='del'>-			msg_ssl="yes (Mozilla NSS)"</div><div class='del'>-			NSS_LDFLAGS="-L$with_nss_libs $nsslibs"</div><div class='del'>-		else</div><div class='del'>-			NSS_CFLAGS=""</div><div class='del'>-			NSPR_CFLAGS=""</div><div class='del'>-			NSPR_LDFLAGS=""</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for Mozilla nss libraries)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(NSPR_CFLAGS)</div><div class='del'>-AC_SUBST(NSPR_LDFLAGS)</div><div class='del'>-AC_SUBST(NSS_CFLAGS)</div><div class='del'>-AC_SUBST(NSS_LDFLAGS)</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl OpenSSL</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-dnl only continue detecting OpenSSL if we haven't already found all of the</div><div class='del'>-dnl Mozilla libnss includes/libraries and if user actually wants ssl support</div><div class='del'>-if test "$msg_ssl" = "no" -a "x${enable_openssl}" != "xno"; then</div><div class='del'>-	AC_ARG_WITH(openssl-includes, [  --with-openssl-includes=PREFIX     Location of OpenSSL includes.],</div><div class='del'>-		with_openssl_includes="$withval", with_openssl_includes="/usr/include")</div><div class='del'>-	have_openssl_includes="no"</div><div class='del'>-	if test "x${with_openssl_includes}" != "xno"; then</div><div class='del'>-		CPPFLAGS_save="$CPPFLAGS"</div><div class='del'>-		</div><div class='del'>-		AC_MSG_CHECKING(for OpenSSL includes)</div><div class='del'>-		AC_MSG_RESULT("")</div><div class='del'>-		</div><div class='del'>-		CPPFLAGS="$CPPFLAGS -I$with_openssl_includes"</div><div class='del'>-		AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h, [ openssl_includes="yes" ])</div><div class='del'>-		CPPFLAGS="$CPPFLAGS_save"</div><div class='del'>-		</div><div class='del'>-		if test "x{$openssl_includes}" != "xno" -a "x{$openssl_includes}" != "x"; then</div><div class='del'>-			have_openssl_includes="yes"</div><div class='del'>-			OPENSSL_CFLAGS="-I$with_openssl_includes"</div><div class='del'>-		else</div><div class='del'>-			OPENSSL_CFLAGS=""</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for OpenSSL includes)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-	</div><div class='del'>-	AC_ARG_WITH(openssl-libs, [  --with-openssl-libs=PREFIX     	Location of OpenSSL libs.],</div><div class='del'>-		with_openssl_libs="$withval")</div><div class='del'>-	if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then</div><div class='del'>-		LDFLAGS_save="$LDFLAGS"</div><div class='del'>-	</div><div class='del'>-		case $with_openssl_libs in</div><div class='del'>-		""|-L*) ;;</div><div class='del'>-		*) with_openssl_libs="-L$with_openssl_libs" ;;</div><div class='del'>-		esac</div><div class='del'>-	</div><div class='del'>-		AC_CHECK_LIB(dl, dlopen, DL_LDFLAGS="-ldl", DL_LDFLAGS="")</div><div class='del'>-		AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,</div><div class='del'>-		[</div><div class='del'>-			LDFLAGS="$LDFLAGS $with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"</div><div class='del'>-			AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")</div><div class='del'>-			LDFLAGS="$LDFLAGS_save"</div><div class='del'>-		])</div><div class='del'>-		if test "x${openssl_libs}" != "xno"; then</div><div class='del'>-			AC_DEFINE(HAVE_OPENSSL)</div><div class='del'>-			AC_DEFINE(HAVE_SSL)</div><div class='del'>-			msg_ssl="yes (OpenSSL)"</div><div class='del'>-			OPENSSL_LDFLAGS="$with_openssl_libs -lssl -lcrypto $DL_LDFLAGS"</div><div class='del'>-		else</div><div class='del'>-			OPENSSL_CFLAGS=""</div><div class='del'>-			OPENSSL_LDFLAGS=""</div><div class='del'>-		fi</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_CHECKING(for OpenSSL libraries)</div><div class='del'>-		AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-else</div><div class='del'>-	OPENSSL_CFLAGS=""</div><div class='del'>-	OPENSSL_LDFLAGS=""</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(OPENSSL_CFLAGS)</div><div class='del'>-AC_SUBST(OPENSSL_LDFLAGS)</div><div class='del'>-</div><div class='del'>-dnl *************************</div><div class='del'>-dnl CFLAGS and LIBS and stuff</div><div class='del'>-dnl *************************</div><div class='del'>-</div><div class='del'>-AC_DEFUN(EVO_SET_COMPILE_FLAGS, [</div><div class='del'>-	deps="$2"</div><div class='del'>-	extra_cflags="$3"</div><div class='del'>-	extra_libs="$4"</div><div class='del'>-	$1_CFLAGS="`gnome-config --cflags $deps` $extra_cflags"</div><div class='del'>-	$1_LIBS="`gnome-config --libs $deps` $extra_libs"</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-dnl --- Flags to get all the GNOME stuff</div><div class='del'>-</div><div class='del'>-FULL_GNOME_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS)</div><div class='del'>-AC_SUBST(GNOME_FULL_CFLAGS)</div><div class='del'>-AC_SUBST(GNOME_FULL_LIBS)</div><div class='del'>-</div><div class='del'>-dnl -- Find the directory where the GtkHTML editing component has its</div><div class='del'>-dnl    IDL files</div><div class='del'>-</div><div class='del'>-GTKHTML_DATADIR=`gnome-config --moddatadir gtkhtml`</div><div class='del'>-AC_SUBST(GTKHTML_DATADIR)</div><div class='del'>-</div><div class='del'>-dnl --- Flags for the various libraries we build</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(CAMEL, gal xml,</div><div class='del'>-		      $THREADS_CFLAGS $KRB4_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $OPENSSL_CFLAGS,</div><div class='del'>-	              $THREADS_LIBS $KRB4_LDFLAGS $NSPR_LDFLAGS $NSS_LDFLAGS $OPENSSL_LDFLAGS)</div><div class='del'>-AC_SUBST(CAMEL_CFLAGS)</div><div class='del'>-AC_SUBST(CAMEL_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(E_NAME, bonobox gal oaf)</div><div class='del'>-AC_SUBST(E_NAME_CFLAGS)</div><div class='del'>-AC_SUBST(E_NAME_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(E_UTIL, bonobox gal oaf libglade)</div><div class='del'>-AC_SUBST(E_UTIL_CFLAGS)</div><div class='del'>-AC_SUBST(E_UTIL_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)</div><div class='del'>-AC_SUBST(E_WIDGETS_CFLAGS)</div><div class='del'>-AC_SUBST(E_WIDGETS_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(IMPORTERS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)</div><div class='del'>-AC_SUBST(IMPORTERS_CFLAGS)</div><div class='del'>-AC_SUBST(IMPORTERS_LIBS)</div><div class='del'>-</div><div class='del'>-dnl libibex is now deprecated</div><div class='del'>-dnl EVO_SET_COMPILE_FLAGS(LIBIBEX, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs,</div><div class='del'>-dnl 		      $THREADS_CFLAGS, $THREADS_LIBS)</div><div class='del'>-dnl AC_SUBST(LIBIBEX_CFLAGS)</div><div class='del'>-dnl AC_SUBST(LIBIBEX_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(LIBFILTER, bonobo gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade)</div><div class='del'>-AC_SUBST(LIBFILTER_CFLAGS)</div><div class='del'>-AC_SUBST(LIBFILTER_LIBS)</div><div class='del'>-</div><div class='del'>-dnl --- evolution (shell) flags</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(SHELL, bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs)</div><div class='del'>-AC_SUBST(SHELL_CFLAGS)</div><div class='del'>-AC_SUBST(SHELL_LIBS)</div><div class='del'>-</div><div class='del'>-dnl --- evolution-addressbook flags</div><div class='del'>-</div><div class='del'>-EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)</div><div class='del'>-AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS, $PISOCK_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)</div><div class='del'>-</div><div class='del'>-dnl -- evolution-executive-summary flags</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY,</div><div class='del'>-                      bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf soup vfs)</div><div class='del'>-AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)</div><div class='del'>-</div><div class='del'>-dnl --- evolution-calendar flags</div><div class='del'>-</div><div class='del'>-EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)</div><div class='del'>-AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_CALENDAR_LIBS)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS, $PISOCK_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)</div><div class='del'>-</div><div class='del'>-dnl --- evolution-mail flags</div><div class='del'>-</div><div class='del'>-camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION</div><div class='del'>-AC_SUBST(camel_providerdir)</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS, $GCONF_CFLAGS $THREADS_CFLAGS, $GCONF_LIBS $THREADS_LIBS)</div><div class='del'>-AC_SUBST(EVOLUTION_MAIL_CFLAGS)</div><div class='del'>-AC_SUBST(EVOLUTION_MAIL_LIBS)</div><div class='del'>-</div><div class='del'>-dnl -- wombat flags</div><div class='del'>-</div><div class='del'>-EVO_SET_COMPILE_FLAGS(WOMBAT, $FULL_GNOME_DEPS, $LDAP_CFLAGS, $LDAP_LIBS)</div><div class='del'>-AC_SUBST(WOMBAT_CFLAGS)</div><div class='del'>-AC_SUBST(WOMBAT_LIBS)</div><div class='del'>-</div><div class='del'>-##################################################</div><div class='del'>-# Check for gtk-doc.</div><div class='del'>-##################################################</div><div class='del'>-</div><div class='del'>-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])</div><div class='del'>-</div><div class='del'>-if test "x$with_html_dir" = "x" ; then</div><div class='del'>-  HTML_DIR='${datadir}/gnome/html'</div><div class='del'>-else</div><div class='del'>-  HTML_DIR=$with_html_dir</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(HTML_DIR)</div><div class='del'>-</div><div class='del'>-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)</div><div class='del'>-</div><div class='del'>-gtk_doc_min_version=0.6</div><div class='del'>-if $GTKDOC ; then </div><div class='del'>-    gtk_doc_version=`gtkdoc-mkdb --version`</div><div class='del'>-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) &gt;= $gtk_doc_min_version])</div><div class='del'>-    if perl &lt;&lt;EOF ; then</div><div class='del'>-      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &amp;&amp;</div><div class='del'>-            ("$gtk_doc_version" &gt;= "$gtk_doc_min_version") ? 0 : 1);</div><div class='del'>-EOF</div><div class='del'>-      AC_MSG_RESULT(yes)</div><div class='del'>-   else</div><div class='del'>-      AC_MSG_RESULT(no)</div><div class='del'>-      GTKDOC=false</div><div class='del'>-   fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl Let people disable the gtk-doc stuff.</div><div class='del'>-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)</div><div class='del'>-</div><div class='del'>-if test x$enable_gtk_doc = xauto ; then</div><div class='del'>-  if test x$GTKDOC = xtrue ; then</div><div class='del'>-    enable_gtk_doc=yes</div><div class='del'>-  else</div><div class='del'>-    enable_gtk_doc=no </div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)</div><div class='del'>-</div><div class='del'>-dnl ******************</div><div class='del'>-dnl Sub-version number</div><div class='del'>-dnl ******************</div><div class='del'>-AC_ARG_WITH(sub-version, [  --with-sub-version=VERSION Specify a sub-version string])</div><div class='del'>-AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version")</div><div class='del'>-</div><div class='del'>-dnl ********************</div><div class='del'>-dnl KDE applnk directory</div><div class='del'>-dnl ********************</div><div class='del'>-AC_ARG_WITH(kde-applnk-path, [  --with-kde-applnk-path=PATH    Location of KDE applnk files],</div><div class='del'>-            [with_kde_applnk_path="$withval"])</div><div class='del'>-AC_MSG_CHECKING(for the KDE applnk directory)</div><div class='del'>-if test -z "$with_kde_applnk_path"; then</div><div class='del'>-	with_kde_applnk_path="$prefix/share/applnk"</div><div class='del'>-fi</div><div class='del'>-if test -d "$with_kde_applnk_path" ; then</div><div class='del'>-	AC_MSG_RESULT("$with_kde_applnk_path" found)</div><div class='del'>-	AC_DEFINE(HAVE_KDE_APPLNK)</div><div class='del'>-	KDE_APPLNK_DIR="$with_kde_applnk_path"</div><div class='del'>-else</div><div class='del'>-	AC_MSG_RESULT(not found)</div><div class='del'>-	KDE_APPLNK_DIR=""</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)</div><div class='del'>-AC_SUBST(KDE_APPLNK_DIR)</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Makefiles</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-AC_CONFIG_SUBDIRS(libical)</div><div class='del'>-</div><div class='del'>-EVOLUTION_DIR=`(cd $srcdir; pwd)`</div><div class='del'>-AC_SUBST(EVOLUTION_DIR)</div><div class='del'>-</div><div class='del'>-AC_OUTPUT([</div><div class='del'>-Makefile</div><div class='del'>-addressbook/Makefile</div><div class='del'>-addressbook/backend/Makefile</div><div class='del'>-addressbook/backend/ebook/Makefile</div><div class='del'>-addressbook/backend/idl/Makefile</div><div class='del'>-addressbook/backend/pas/Makefile</div><div class='del'>-addressbook/conduit/Makefile</div><div class='del'>-addressbook/gui/Makefile</div><div class='del'>-addressbook/gui/component/Makefile</div><div class='del'>-addressbook/gui/component/select-names/Makefile</div><div class='del'>-addressbook/gui/contact-editor/Makefile</div><div class='del'>-addressbook/gui/contact-list-editor/Makefile</div><div class='del'>-addressbook/gui/merging/Makefile</div><div class='del'>-addressbook/gui/search/Makefile</div><div class='del'>-addressbook/gui/widgets/Makefile</div><div class='del'>-addressbook/printing/Makefile</div><div class='del'>-art/Makefile</div><div class='del'>-calendar/Makefile</div><div class='del'>-calendar/cal-client/Makefile</div><div class='del'>-calendar/cal-util/Makefile</div><div class='del'>-calendar/conduits/Makefile</div><div class='del'>-calendar/conduits/calendar/Makefile</div><div class='del'>-calendar/conduits/todo/Makefile</div><div class='del'>-calendar/gui/Makefile</div><div class='del'>-calendar/gui/alarm-notify/Makefile</div><div class='del'>-calendar/gui/dialogs/Makefile</div><div class='del'>-calendar/idl/Makefile</div><div class='del'>-calendar/importers/Makefile</div><div class='del'>-calendar/pcs/Makefile</div><div class='del'>-camel/Makefile</div><div class='del'>-camel/providers/Makefile</div><div class='del'>-camel/providers/imap/Makefile</div><div class='del'>-camel/providers/local/Makefile</div><div class='del'>-camel/providers/nntp/Makefile</div><div class='del'>-camel/providers/pop3/Makefile</div><div class='del'>-camel/providers/sendmail/Makefile</div><div class='del'>-camel/providers/smtp/Makefile</div><div class='del'>-camel/tests/Makefile</div><div class='del'>-camel/tests/folder/Makefile</div><div class='del'>-camel/tests/lib/Makefile</div><div class='del'>-camel/tests/message/Makefile</div><div class='del'>-camel/tests/mime-filter/Makefile</div><div class='del'>-camel/tests/misc/Makefile</div><div class='del'>-camel/tests/smime/Makefile</div><div class='del'>-camel/tests/stream/Makefile</div><div class='del'>-composer/Makefile</div><div class='del'>-data/Makefile</div><div class='del'>-default_user/Makefile</div><div class='del'>-default_user/local/Makefile</div><div class='del'>-default_user/local/Calendar/Makefile</div><div class='del'>-default_user/local/Contacts/Makefile</div><div class='del'>-default_user/local/Drafts/Makefile</div><div class='del'>-default_user/local/Inbox/Makefile</div><div class='del'>-default_user/local/Outbox/Makefile</div><div class='del'>-default_user/local/Sent/Makefile</div><div class='del'>-default_user/local/Tasks/Makefile</div><div class='del'>-default_user/local/Trash/Makefile</div><div class='del'>-doc/Makefile</div><div class='del'>-doc/devel/Makefile</div><div class='del'>-doc/devel/calendar/Makefile</div><div class='del'>-doc/devel/calendar/cal-client/Makefile</div><div class='del'>-doc/devel/calendar/cal-util/Makefile</div><div class='del'>-e-util/Makefile</div><div class='del'>-e-util/ename/Makefile</div><div class='del'>-filter/Makefile</div><div class='del'>-help/Makefile</div><div class='del'>-help/C/Makefile</div><div class='del'>-help/no/Makefile</div><div class='del'>-importers/Makefile</div><div class='del'>-intl/Makefile</div><div class='del'>-libversit/Makefile</div><div class='del'>-libwombat/Makefile</div><div class='del'>-macros/Makefile</div><div class='del'>-mail/Makefile</div><div class='del'>-mail/importers/Makefile</div><div class='del'>-my-evolution/Makefile</div><div class='del'>-omf-install/Makefile</div><div class='del'>-po/Makefile.in</div><div class='del'>-shell/Makefile</div><div class='del'>-shell/glade/Makefile</div><div class='del'>-shell/importer/Makefile</div><div class='del'>-sounds/Makefile</div><div class='del'>-tools/Makefile</div><div class='del'>-ui/Makefile</div><div class='del'>-views/Makefile</div><div class='del'>-views/addressbook/Makefile</div><div class='del'>-views/calendar/Makefile</div><div class='del'>-views/mail/Makefile</div><div class='del'>-views/tasks/Makefile</div><div class='del'>-widgets/Makefile</div><div class='del'>-widgets/e-timezone-dialog/Makefile</div><div class='del'>-widgets/menus/Makefile</div><div class='del'>-widgets/misc/Makefile</div><div class='del'>-wombat/Makefile</div><div class='del'>-</div><div class='del'>-my-evolution/GNOME_Evolution_Summary.oaf.in</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-if test "x$with_sub_version" != "x"; then</div><div class='del'>-echo "</div><div class='del'>-	Evolution ($with_sub_version) has been configured as follows: "</div><div class='del'>-else</div><div class='del'>-echo "</div><div class='del'>-	Evolution has been configured as follows: "</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-echo "</div><div class='del'>-	Mail Directory:   $system_mail_dir, $system_mail_perm</div><div class='del'>-	LDAP support:     $msg_ldap $msg_ldap_linktype"</div><div class='del'>-if test "$msg_nntp" = "yes"; then</div><div class='del'>-echo "\</div><div class='del'>-	NNTP support:     $msg_nntp"</div><div class='del'>-fi</div><div class='del'>-echo "\</div><div class='del'>-	Pilot conduits:   $msg_pilot</div><div class='del'>-	Kerberos 4/5:     $msg_krb4/$msg_krb5</div><div class='del'>-	SSL support:      $msg_ssl</div><div class='del'>-	Dot Locking:	  $msg_dot</div><div class='del'>-	File Locking:	  $msg_file</div><div class='del'>-	Gtk-doc:	  $enable_gtk_doc</div><div class='del'>-	Shlib components: $enable_shlib_components"</div><div class='del'>-</div><div class='del'>-if test x$enable_gtk_doc = xyes; then</div><div class='del'>-echo "</div><div class='del'>-	Programming documentation files will be built automatically."</div><div class='del'>-else</div><div class='del'>-echo "</div><div class='del'>-	Programming documentation files will not be built.</div><div class='del'>-	You may want to install the gtk-doc package</div><div class='del'>-	so that you will get the Evolution Developer's Guide."</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-if test "x$enable_shlib_components" = "xyes" ; then</div><div class='del'>-	echo "</div><div class='del'>-        *** Warning, shlib components are currently broken.</div><div class='del'>-        *** Enabling this option will probably cause Evolution to not</div><div class='del'>-        *** work correctly.</div><div class='del'>-"</div><div class='del'>-else</div><div class='del'>-	echo "</div><div class='del'>-"</div><div class='del'>-fi</div><div class='head'>diff --git a/data/.cvsignore b/data/.cvsignore<br/>deleted file mode 100644<br/>index 5f6365598d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-evolution.keys</div><div class='del'>-evolution.desktop</div><div class='head'>diff --git a/data/Makefile.am b/data/Makefile.am<br/>deleted file mode 100644<br/>index 20c4dee0cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-desktopdir = $(datadir)/gnome/apps/Applications</div><div class='del'>-desktop_in_files = evolution.desktop.in</div><div class='del'>-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)</div><div class='del'>-@XML_I18N_MERGE_DESKTOP_RULE@</div><div class='del'>-</div><div class='del'>-keysdir = $(datadir)/mime-info</div><div class='del'>-keys_in_files = evolution.keys.in</div><div class='del'>-keys_DATA = $(keys_in_files:.keys.in=.keys) </div><div class='del'>-@XML_I18N_MERGE_KEYS_RULE@</div><div class='del'>-</div><div class='del'>-mimedir = $(datadir)/mime-info</div><div class='del'>-mime_DATA = evolution.mime</div><div class='del'>-</div><div class='del'>-if HAVE_KDE_APPLNK</div><div class='del'>-kdedesktopdir = $(KDE_APPLNK_DIR)/Applications</div><div class='del'>-kdedesktop_DATA = $(desktop_in_files:.desktop.in=.desktop)</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-man_MANS = evolution.1</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(desktop_in_files) $(keys_in_files) $(mime_DATA) $(man_MANS)</div><div class='head'>diff --git a/data/evolution.1 b/data/evolution.1<br/>deleted file mode 100644<br/>index 13d67e2dbe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.1?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/evolution.1</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-.TH "Evolution" "1" "1.0" "Ximian, Inc." "GNOME Applications"</div><div class='del'>-.SH "NAME"</div><div class='del'>-.LP </div><div class='del'>-evolution \- Run Ximian Evolution, the GNOME groupware suite.</div><div class='del'>-.SH "SYNOPSIS"</div><div class='del'>-.LP </div><div class='del'>-evolution [OPTION] ... [URI]</div><div class='del'>-.SH "DESCRIPTION"</div><div class='del'>-.LP </div><div class='del'>-This program is a graphical groupware suite.  Documentation for</div><div class='del'>-Evolution is available by running the application and selecting items</div><div class='del'>-from the Help menu, or by visiting the Ximian knowledge base at</div><div class='del'>-\fBhttp://support.ximian.com\fR.</div><div class='del'>-.TP</div><div class='del'>-\fB\-\-no-splash\fR</div><div class='del'>-do not display the start-up splash screen</div><div class='del'>-.TP</div><div class='del'>-\fB\-\-debug\fR=\fIFILENAME\fR</div><div class='del'>-output debugging messages to FILENAME</div><div class='del'>-.SH "EXAMPLES"</div><div class='del'>-To run this program the standard way type:</div><div class='del'>-.sp</div><div class='del'>-	\fBevolution\fR</div><div class='del'>-.sp</div><div class='del'>-To open the local Inbox folder</div><div class='del'>-.sp</div><div class='del'>-	\fBevolution evolution:/local/Inbox\fR</div><div class='del'>-.sp</div><div class='del'>-To open your default mail/calendar/contacts/tasks folder</div><div class='del'>-.sp</div><div class='del'>-	\fBevolution default:mail\fR</div><div class='del'>-.sp</div><div class='del'>-To send mail to \fBjoe@somewhere.net\fR</div><div class='del'>-.sp</div><div class='del'>-	\fBevolution mailto:joe@somewhere.net\fR</div><div class='del'>-.sp</div><div class='del'>-To use Evolution as the handler for \fBmailto:\fR links in GNOME</div><div class='del'>-applications, set the GNOME URL handler in the GNOME Control Center to</div><div class='del'>-be:</div><div class='del'>-.sp</div><div class='del'>-	\fBevolution "%s"\fR</div><div class='del'>-.sp</div><div class='del'>-(A similar approach works for Mozilla and other applications.)
\ No newline at end of file</div><div class='head'>diff --git a/data/evolution.desktop.in b/data/evolution.desktop.in<br/>deleted file mode 100644<br/>index c6f2e1c652..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.desktop.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/evolution.desktop.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-_Name=Ximian Evolution</div><div class='del'>-_Comment=The Evolution groupware suite</div><div class='del'>-Exec=evolution</div><div class='del'>-Icon=evolution.png</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</div><div class='head'>diff --git a/data/evolution.keys.in b/data/evolution.keys.in<br/>deleted file mode 100644<br/>index c2c27d1af7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.keys.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/evolution.keys.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-text/x-vcard</div><div class='del'>-	_description=address card</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control</div><div class='del'>-</div><div class='del'>-text/x-calendar</div><div class='del'>-	_description=calendar information</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-</div><div class='del'>-text/calendar</div><div class='del'>-	_description=calendar information</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:GNOME_Evolution_Calendar_iTip_Control</div><div class='del'>-</div><div class='head'>diff --git a/data/evolution.mime b/data/evolution.mime<br/>deleted file mode 100644<br/>index f72de6399b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.mime?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>data/evolution.mime</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-text/x-vcard</div><div class='del'>-	ext: vcf</div><div class='del'>-</div><div class='del'>-text/calendar</div><div class='del'>-	ext: ics
\ No newline at end of file</div><div class='head'>diff --git a/default_user/.cvsignore b/default_user/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/ChangeLog b/default_user/ChangeLog<br/>deleted file mode 100644<br/>index 0da2965a35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,270 +0,0 @@</div><div class='del'>-2001-12-10  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added vfolders.xml containing default initial</div><div class='del'>-	vfolders - important vfolder and unread vfolder, #1040.</div><div class='del'>-</div><div class='del'>-2001-11-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Fix email link to be valid</div><div class='del'>-</div><div class='del'>-2001-10-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-hook): make the private dir so it gets</div><div class='del'>-	created in ~/evolution.</div><div class='del'>-</div><div class='del'>-2001-10-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Oops, remove stray "&gt;".</div><div class='del'>-</div><div class='del'>-2001-10-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: New version of the default mailbox by Aaron.</div><div class='del'>-</div><div class='del'>-2001-10-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Drafts/Makefile.am: Install the empty mbox file too.</div><div class='del'>-	* local/Sent/Makefile.am: Likewise.</div><div class='del'>-	* local/Outbox/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2001-09-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add mkdir config in dist-hook here instead.</div><div class='del'>-</div><div class='del'>-2001-09-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* config/: Added.</div><div class='del'>-</div><div class='del'>-2001-08-16  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: Implement "Message Contains" (searches sender,</div><div class='del'>-	recipients, subject, and body) and make it first.</div><div class='del'>-</div><div class='del'>-2001-08-14  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: Rename &lt;title&gt; to &lt;_title&gt; so that these fields can</div><div class='del'>-	be translated.</div><div class='del'>-</div><div class='del'>-2001-08-09  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook-sources.xml: remove the description field.</div><div class='del'>-</div><div class='del'>-2001-08-07  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook-sources.xml: giving up for now.  removed netcenter.</div><div class='del'>-</div><div class='del'>-2001-08-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: So it turns out that I needed to name the</div><div class='del'>-	recipient's part name to "to" instead of "recipient" because they</div><div class='del'>-	need to match whatever is in vfoldertypes.xml. I also changed the</div><div class='del'>-	"type" to "address" which is what the vfoldertypes.xml</div><div class='del'>-	specifies. Unfortunately, it's still not working? At least it's</div><div class='del'>-	probably more correct now...</div><div class='del'>-</div><div class='del'>-2001-07-31  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: Moved "Sender-contains" to the top of the list and</div><div class='del'>-	added a Recipient contains item. This fixes bugs #4888 and #5668.</div><div class='del'>-</div><div class='del'>-2001-07-30  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-hook): Only try to make a</div><div class='del'>-	$(defaultdir)/news if building with NNTP support.</div><div class='del'>-</div><div class='del'>-2001-07-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook-sources.xml: remove all the servers that just don't</div><div class='del'>-	work anymore, and add Verisign's directory.</div><div class='del'>-</div><div class='del'>-2001-07-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (default_DATA): Remove `shortcuts.xml'.  The shell</div><div class='del'>-	is now able to create that by itself.</div><div class='del'>-</div><div class='del'>-2001-06-07  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Removed the references to local/Executive-Summary.</div><div class='del'>-</div><div class='del'>-	* local/Executive-Summary: Removed.</div><div class='del'>-</div><div class='del'>-2001-05-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: Reverted Gediminas patch.</div><div class='del'>-</div><div class='del'>-2001-05-08  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* searches.xml: replace title&gt; with _title&gt;. Part of fix to #2253.</div><div class='del'>-</div><div class='del'>-2001-03-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Change the From address to "The Evolution</div><div class='del'>-	Team" &lt;evolve@ximian.com&gt; so that we get spammed instead of hello@</div><div class='del'>-</div><div class='del'>-2001-03-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Trash/folder-metadata.xml: The type of this folder is now</div><div class='del'>-	"vtrash" and not "mail".</div><div class='del'>-</div><div class='del'>-2001-03-01  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added searches.xml to default user data.</div><div class='del'>-</div><div class='del'>-2001-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Contacts/Makefile.am (defaultcalendar_DATA): Added</div><div class='del'>-	create-initial.</div><div class='del'>-</div><div class='del'>-	* local/Contacts/create-initial: New empty file to trigger the</div><div class='del'>-	contact manager to add the initial Hello contact.</div><div class='del'>-</div><div class='del'>-2001-01-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am (SUBDIRS): added Tasks subdir.</div><div class='del'>-</div><div class='del'>-	* local/Tasks/Makefile.am: </div><div class='del'>-	* local/Tasks/folder-metadata.xml: new files for the default Tasks</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: added Tasks folder shortcut.</div><div class='del'>-</div><div class='del'>-2000-12-29  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldap-servers.xml, addressbook-sources.xml: down with</div><div class='del'>-	ldap-servers.xml, up with addressbook-sources.xml.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (default_DATA): same.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added executive-summary again.</div><div class='del'>-</div><div class='del'>-	* shortcurts.xml: In out, in out and shake it all about</div><div class='del'>-	The executive summary is back in.</div><div class='del'>-</div><div class='del'>-2000-10-12  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: And removed it again.</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Commented out the Exec-summary.</div><div class='del'>-</div><div class='del'>-2000-10-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added the Executive-Summary dir.</div><div class='del'>-</div><div class='del'>-2000-10-05  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile: Added Executive-Summary.</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Added the Executive-Summary</div><div class='del'>-</div><div class='del'>-	* local/Executive-Summary/*: Added.</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: added yahoo, whowhere, and infospace servers.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (defaultdir): Use $(datadir), not $(prefix)/share</div><div class='del'>-</div><div class='del'>-2000-09-13  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Sent/Makefile.am (defaultcalendardir): Install the Sent</div><div class='del'>-	dir in Sent, not Sentbox</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Renamed Sentbox to Sent</div><div class='del'>-</div><div class='del'>-	* local/{Sent\ Mail,Sentbox}/*: removed</div><div class='del'>-</div><div class='del'>-	* local/Sent/*: created</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Reversed my last change, folders with spaces in the name breaks</div><div class='del'>-	configure</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Renamed Sentbox to Sent\ Mail</div><div class='del'>-</div><div class='del'>-	* local/Sent\ Mail/*: Updated</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added Sentbox</div><div class='del'>-</div><div class='del'>-	* local/Sentbox/*: New folder for storing sent messages</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	(install-data-hook): ignore error on mkdir.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-hook): create an empty news directory</div><div class='del'>-	in $(defaultdir).</div><div class='del'>-</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: break up the uri into it's component pieces. -</div><div class='del'>-	don't store the uri in this file.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: remove the Internet Directories group.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (default_DATA): add ldapservers.xml.</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am (SUBDIRS): remove Directories.</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: new ldap metadata.</div><div class='del'>-	</div><div class='del'>-	* local/Directories/*: remove directories.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Removed `&lt;blockquote&gt;' from the main text so</div><div class='del'>-	that the welcome mail is all visible when loaded into Evolution at</div><div class='del'>-	startup.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Commented out currently unimplemented shortcut</div><div class='del'>-	items.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am, local/Calendar/Makefile.am,</div><div class='del'>-	local/Contacts/Makefile.am, local/Directories/Makefile.am,</div><div class='del'>-	local/Directories/subfolders/Bigfoot/Makefile.am,</div><div class='del'>-	local/Directories/subfolders/Netcenter/Makefile.am,</div><div class='del'>-	local/Drafts/Makefile.am, local/Inbox/Makefile.am,</div><div class='del'>-	local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a</div><div class='del'>-	proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Directories/subfolders/Bigfoot/.cvsignore: New .cvsignore</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Contacts/Makefile.am, local/Contacts/addressbook.db:</div><div class='del'>-	Removed addressbook.db since this is now handled by the pas.</div><div class='del'>-</div><div class='del'>-2000-05-08  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Removed unused shortcuts which point to</div><div class='del'>-	unimplemented folders.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Contacts/Makefile.am: Install `addressbook.db'.</div><div class='del'>-</div><div class='del'>-000-05-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* default_user/local/Inbox/Makefile.am: Install `mbox'.</div><div class='del'>-</div><div class='del'>-	</div><div class='head'>diff --git a/default_user/Makefile.am b/default_user/Makefile.am<br/>deleted file mode 100644<br/>index 6a30840858..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-SUBDIRS = local</div><div class='del'>-</div><div class='del'>-defaultdir = $(datadir)/evolution/default_user</div><div class='del'>-default_DATA = addressbook-sources.xml searches.xml vfolders.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(default_DATA)</div><div class='del'>-</div><div class='del'>-install-data-hook:</div><div class='del'>-	-mkdir $(defaultdir)/private</div><div class='del'>-if ENABLE_NNTP</div><div class='del'>-	-mkdir $(defaultdir)/news</div><div class='del'>-	-mkdir $(defaultdir)/config</div><div class='del'>-endif</div><div class='head'>diff --git a/default_user/addressbook-sources.xml b/default_user/addressbook-sources.xml<br/>deleted file mode 100644<br/>index a2d3d49049..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/addressbook-sources.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/addressbook-sources.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;addressbooks&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;Bigfoot&lt;/name&gt;</div><div class='del'>-      &lt;host&gt;ldap.bigfoot.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;Verisign&lt;/name&gt;</div><div class='del'>-      &lt;host&gt;directory.verisign.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn/&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-&lt;/addressbooks&gt;</div><div class='head'>diff --git a/default_user/local/.cvsignore b/default_user/local/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Calendar/.cvsignore b/default_user/local/Calendar/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Calendar/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am<br/>deleted file mode 100644<br/>index 9117ae6373..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Calendar/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar</div><div class='del'>-defaultcalendar_DATA = folder-metadata.xml</div><div class='del'>-EXTRA_DIST = $(defaultcalendar_DATA)</div><div class='head'>diff --git a/default_user/local/Calendar/folder-metadata.xml b/default_user/local/Calendar/folder-metadata.xml<br/>deleted file mode 100644<br/>index 9313cb5f50..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Calendar/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Calendar/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;calendar&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Calendar items&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Contacts/.cvsignore b/default_user/local/Contacts/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Contacts/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Contacts/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am<br/>deleted file mode 100644<br/>index 3a30a122fe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Contacts/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Contacts/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts</div><div class='del'>-defaultcalendar_DATA =		\</div><div class='del'>-	folder-metadata.xml	\</div><div class='del'>-	create-initial</div><div class='del'>-EXTRA_DIST = $(defaultcalendar_DATA)</div><div class='head'>diff --git a/default_user/local/Contacts/create-initial b/default_user/local/Contacts/create-initial<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Contacts/create-initial?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Contacts/create-initial</a><br/>+++ /dev/null</div><div class='head'>diff --git a/default_user/local/Contacts/folder-metadata.xml b/default_user/local/Contacts/folder-metadata.xml<br/>deleted file mode 100644<br/>index dcee1ec826..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Contacts/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Contacts/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;contacts&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Contacts&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Drafts/.cvsignore b/default_user/local/Drafts/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Drafts/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am<br/>deleted file mode 100644<br/>index e8471ef7f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Drafts/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultfolderdir = $(datadir)/evolution/default_user/local/Drafts</div><div class='del'>-defaultfolder_DATA = folder-metadata.xml mbox</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultfolder_DATA)</div><div class='head'>diff --git a/default_user/local/Drafts/folder-metadata.xml b/default_user/local/Drafts/folder-metadata.xml<br/>deleted file mode 100644<br/>index ee9cafe3b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Drafts/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;mail&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Drafts&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Drafts/mbox b/default_user/local/Drafts/mbox<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/mbox?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Drafts/mbox</a><br/>+++ /dev/null</div><div class='head'>diff --git a/default_user/local/Inbox/.cvsignore b/default_user/local/Inbox/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Inbox/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Inbox/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am<br/>deleted file mode 100644<br/>index ed3ecd58d4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Inbox/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Inbox/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox</div><div class='del'>-</div><div class='del'>-defaultcalendar_DATA = 		\</div><div class='del'>-	folder-metadata.xml	\</div><div class='del'>-	mbox</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultcalendar_DATA)</div><div class='head'>diff --git a/default_user/local/Inbox/folder-metadata.xml b/default_user/local/Inbox/folder-metadata.xml<br/>deleted file mode 100644<br/>index 64cfbadfc3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Inbox/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Inbox/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;mail&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Inbox folder&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Inbox/mbox b/default_user/local/Inbox/mbox<br/>deleted file mode 100644<br/>index 3c7e20fb04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Inbox/mbox?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Inbox/mbox</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,427 +0,0 @@</div><div class='del'>-From evolve@ximian.com Tue Sep 25 07:45:12 2001</div><div class='del'>-Return-Path: &lt;evolve@ximian.com&gt;</div><div class='del'>-Received: from pop.ximian.com (IDENT:mail@localhost [127.0.0.1]) by</div><div class='del'>-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20680; Tue, 25 Sep 2001</div><div class='del'>-	07:45:12 -0400</div><div class='del'>-Received: from smtp.ximian.com (smtp.ximian.com [141.154.95.10]) by</div><div class='del'>-	pop.ximian.com (8.9.3/8.9.3) with ESMTP id HAA20659 for</div><div class='del'>-	&lt;evolve@ximian.com&gt;; Tue, 25 Sep 2001 07:45:10 -0400</div><div class='del'>-Received: (qmail 5610 invoked from network); 25 Sep 2001 11:45:02 -0000</div><div class='del'>-Received: from smtp.ximian.com (HELO localhost) (141.154.95.10) by</div><div class='del'>-	pop.ximian.com with SMTP; 25 Sep 2001 11:45:02 -0000</div><div class='del'>-From: Ximian, Inc. &lt;evolve@ximian.com&gt;</div><div class='del'>-To: Ximian Evolution Users &lt;evolve@ximian.com&gt;</div><div class='del'>-Content-Type: multipart/related; type="multipart/alternative"; boundary="=-t4dRE6cqcdSBHOrMdTQ1"</div><div class='del'>-X-Mailer: Evolution/0.14.99 (Preview Release)</div><div class='del'>-Date: 25 Sep 2001 14:45:00 +0300</div><div class='del'>-Message-Id: &lt;1001418302.27070.20.camel@spectrolite&gt;</div><div class='del'>-Mime-Version: 1.0</div><div class='del'>-Subject: Welcome to Ximian Evolution!</div><div class='del'>-Sender: evolve@ximian.com</div><div class='del'>-Errors-To: evolve@ximian.com</div><div class='del'>-X-Mailman-Version: 1.1</div><div class='del'>-Status:   </div><div class='del'>-X-Evolution-Source: pop://aaron@pop.ximian.com/inbox</div><div class='del'>-X-Evolution: 00000ddd-0030</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: multipart/alternative; boundary="=-2gZ1roA/HoYrlRDVGyiM"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---=-2gZ1roA/HoYrlRDVGyiM</div><div class='del'>-Content-Type: text/plain</div><div class='del'>-Content-Transfer-Encoding: 7bit</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Ximian is proud to welcome you to Ximian Evolution, a complete system</div><div class='del'>-for managing your communications and personal information.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Getting Started</div><div class='del'>-</div><div class='del'>-	On the left of the Ximian Evolution window is the Shortcut</div><div class='del'>-	Bar, with icons for each of your primary tools: Summary,</div><div class='del'>-	Inbox, Calendar, Tasks, and Contacts. You can click on those icons to</div><div class='del'>-	jump from one tool to another. For more detailed information</div><div class='del'>-	management, activate the Folder Bar by selecting Folder Bar from</div><div class='del'>-	the View menu.</div><div class='del'>-</div><div class='del'>-	For a complete guide to using Ximian Evolution, select Table of</div><div class='del'>-	Contents or Getting Started in the Help menu.</div><div class='del'>-</div><div class='del'>-Learn More, Do More</div><div class='del'>-</div><div class='del'>-	Ximian offers a range of products and services for you and for</div><div class='del'>-	your business. Learn more about how Ximian can help you be more</div><div class='del'>-	productive at &lt;A HREF="http://www.ximian.com"&gt;Ximian.com&lt;/A&gt;.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Questions? Comments? Suggestions?</div><div class='del'>-</div><div class='del'>-	To read our list of frequently asked questions (FAQ), select</div><div class='del'>-	Ximian Evolution FAQ from the Help menu.</div><div class='del'>-</div><div class='del'>-	If your question isn't there, or if you'd like to send us some</div><div class='del'>-	comments, write to us at evolve@ximian.com. We'd be glad to</div><div class='del'>-	hear from you!</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Yours Sincerely,</div><div class='del'>-The Ximian Evolution Team</div><div class='del'>-evolve@ximian.com</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---=-2gZ1roA/HoYrlRDVGyiM</div><div class='del'>-Content-Type: text/html; charset=utf-8</div><div class='del'>-</div><div class='del'>-&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"&gt;</div><div class='del'>-&lt;HTML&gt;</div><div class='del'>-&lt;HEAD&gt;</div><div class='del'>-  &lt;META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"&gt;</div><div class='del'>-  &lt;META NAME="GENERATOR" CONTENT="GtkHTML/0.13.99"&gt;</div><div class='del'>-&lt;/HEAD&gt;</div><div class='del'>-&lt;BODY BGCOLOR="#f8fcf8"&gt;&lt;TABLE BACKGROUND="cid:1001417869.27019.4.camel@spectrolite" CELLSPACING="0" CELLPADDING="0" WIDTH="100%"&gt;</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD ALIGN="left" VALIGN="top"&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001417869.27019.5.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD ALIGN="right" VALIGN="top"&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001417929.27019.7.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001417989.27019.11.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;FONT COLOR="#f8fcf8"&gt;&lt;FONT SIZE="4"&gt;&lt;B&gt;Ximian&lt;/FONT&gt;&lt;/B&gt;&lt;/FONT SIZE="4"&gt;&lt;FONT COLOR="#f8fcf8"&gt;&lt;FONT SIZE="4"&gt; is proud to welcome you to &lt;/FONT&gt;&lt;/FONT SIZE="4"&gt;&lt;FONT COLOR="#f8fcf8"&gt;&lt;FONT SIZE="4"&gt;&lt;B&gt;Ximian Evolution&lt;/FONT&gt;&lt;/B&gt;&lt;/FONT SIZE="4"&gt;&lt;FONT COLOR="#f8fcf8"&gt;&lt;FONT SIZE="4"&gt;, a complete system for managing your communications and personal information.&lt;/FONT&gt;&lt;/FONT SIZE="4"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001418096.27019.14.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-&lt;TR&gt;</div><div class='del'>-&lt;TD ALIGN="left" VALIGN="bottom"&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001417929.27019.8.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;TD ALIGN="right" VALIGN="bottom"&gt;</div><div class='del'>-&lt;div align=right&gt;</div><div class='del'>-&lt;IMG SRC="cid:1001417929.27019.9.camel@spectrolite" ALIGN="top" BORDER="0"&gt;&lt;/div&gt;</div><div class='del'>-&lt;/TD&gt;</div><div class='del'>-&lt;/TR&gt;</div><div class='del'>-&lt;/TABLE&gt;</div><div class='del'>-&lt;h2&gt;Getting Started&lt;/h2&gt;</div><div class='del'>-</div><div class='del'>-&lt;blockquote&gt;</div><div class='del'>-    On the left of the Ximian Evolution window is the Shortcut Bar, with icons for each of your primary tools: Summary, Inbox, Calendar, Tasks, and Contacts. You can click on those icons to jump from one tool to another. For more detailed information management, activate the Folder Bar by selecting Folder Bar from the View menu.&lt;br&gt;</div><div class='del'>-    &lt;br&gt;</div><div class='del'>-    For a complete guide to using Ximian Evolution, select &lt;b&gt;Table of Contents&lt;/b&gt; or &lt;b&gt;Getting Started&lt;/b&gt; in the &lt;b&gt;Help&lt;/b&gt; menu.</div><div class='del'>-&lt;/blockquote&gt; </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;h2&gt;Learn More, Do More&lt;/h2&gt;</div><div class='del'>-&lt;blockquote&gt;</div><div class='del'>-    Ximian offers a range of products and services for you and for</div><div class='del'>-    your business. Learn more about how Ximian can help you be more</div><div class='del'>-    productive at &lt;A HREF="http://www.ximian.com"&gt;Ximian.com&lt;/A&gt;.</div><div class='del'>-&lt;/blockquote&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;h2&gt;Questions? Comments? Suggestions?&lt;/h2&gt;</div><div class='del'>-</div><div class='del'>-&lt;blockquote&gt;</div><div class='del'>-</div><div class='del'>-    To read our list of frequently asked questions (FAQ), select</div><div class='del'>-    &lt;b&gt;Ximian Evolution FAQ&lt;/b&gt; from the &lt;b&gt;Help&lt;/b&gt; menu.</div><div class='del'>-    If your question isn't there, or if you'd like to send us some</div><div class='del'>-    comments, write to us at &lt;a</div><div class='del'>-    HREF="mailto:evolve@ximian.com"&gt;evolve@ximian.com&lt;/A&gt;. We'd</div><div class='del'>-    be glad to hear from you!</div><div class='del'>-&lt;/blockquote&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Yours Sincerely,&lt;br&gt;</div><div class='del'>-The Ximian Evolution Team&lt;br&gt;</div><div class='del'>-&lt;a href="mailto:evolve@ximian.com"&gt;evolve@ximian.com&lt;/a&gt;</div><div class='del'>-</div><div class='del'>-&lt;/BODY&gt;</div><div class='del'>-&lt;/HTML&gt;</div><div class='del'>-</div><div class='del'>---=-2gZ1roA/HoYrlRDVGyiM--</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417929.27019.9.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=corner-bottomright.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBAVf+8XgAAAA7SURB</div><div class='del'>-VHjaY/z//z8DPsDEgB8IE1JgSkhBGMP///9xYbP/eCSF////f/4/Hp3n/0MBsg6P////z/uPBgDp</div><div class='del'>-AG5RDY2ymwAAAABJRU5ErkJggg==</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417989.27019.11.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=evolution-icon.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0</div><div class='del'>-U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABPQSURBVHjaYtzEuI6BCQgZoRDGRtDIJCrP</div><div class='del'>-6r8dAxQwATEjlEbGjFD5/0D8Dw3DxBgeMt7BsJdYtwAEEON3xk8EHQqmGSG8X//+IzsahFmAmBWI</div><div class='del'>-2YGYDUqzQsWZoWpBDv0DxL+g+CcS+w+Spxi0mFQIuwWJBAggRmsmUyL8DmFt+7cX5nBmqGM5gZgH</div><div class='del'>-iA2B2AWIzYFYCoglGbCD20B8E4hPAfEeIH4OxF+B+BvUM39BHilgyiToFhgLIIAYG5gqCCor/VfL</div><div class='del'>-AE0OIIdzQB2tCcThQOyHx8GEwBEg3gjEW4H4AxB/hsYOKFb+72BazyCdpMjwfN4juFvEkmwY3s47</div><div class='del'>-ziBc/BCoYwEDQAAxXhIXYNB7+YWBQZGH4f+NEwz3nrCi2KCsrAwLdVCIcwOxPBAXAXE0A/XACyDu</div><div class='del'>-g3rmHRB/gcbIv7t37+LVCBBAjPgUQB3PAg11QSAOAuJmIObFpcfWiJtBTpKFQV4C6Of/f6GYgeHQ</div><div class='del'>-+V8Mj178ZXj08h8+91wE4mIgvgWNke/Q2GDA5U6AAGIhwvFcQCwCxP3Q5IIC+HlYGHwdhRl8HYQY</div><div class='del'>-fBwEwA7+/x9o5//fwPD7xcD47wfD/38/GSr//mf4B8QPnv5l2HL4J8Py3d8Zrtz/i26cPhBvAOIK</div><div class='del'>-IN4JxK+h+eM3LncCBBDWGEByPCitK7Gxsi7T09JSv3brFsO3798hDudlYciOVmDIiVEAstmgWeQf</div><div class='del'>-2AOMQMf///8LyAQmZ6AHGP8B9fz9DuT/ZfgL8gjQf39//QfHSvfybwzHr2F1XwcQLwTil9Ak9Rub</div><div class='del'>-WwECCMMDaCGvIijAv8zMwFD9xLmzDB8/fYYkExNhhpktRgzyMnxAd6OVluAkAwr9n9DQBzkcGIhA</div><div class='del'>-zAjE/4Ce+PfnP8NfEAb67w/QIzM3fmfoW/uN4dO3/+ju6wLi+dA8AvLEH3T3AgQQigeQMizI8eLA</div><div class='del'>-kJ9jaWricP7yFYZPnyGOr8pUZ6jONWdgk85iYGTmZbh9bgaDnMRfSAzA0/xPsAcY/v4A0iDHfwEK</div><div class='del'>-fwV64CuY/v/nH9ADkFj48xNC33vylyF1wieG648xklUdEK+AegKUnP4iuxkggJjQYwRa2oAybJmh</div><div class='del'>-ro7Djdt34I6f2WzIUFPkzcCp3MXAwq3H8ODhEwYL71kM4dm7GT5+B+ZzVqA2Fn5ghIAwMHZYgIUW</div><div class='del'>-MzfDYWBSOXIemKyYOBgYmdiBGFhIA21mZAbSzCAaWLSJMzEsL+Nj0JRhRvdAORAbQd0ETqvQgAYD</div><div class='del'>-gABiwpJ0QEWlm5K8XNqHT58YXr5+DXW8AUNsuC0Du1QG2J9/vpxjSExKY0hIymBg5tJi0LSdyrBl</div><div class='del'>-72MGJlZ+BkYgZmABFlTAGPrwlZUhvPASQ2DBA4ay/ldAPgvQA8xAzAB3PNhDQM/w8zAxLCniY9CQ</div><div class='del'>-RvEEyD3VQCwBzZMoBQ9AADGhJR1QM0CYg4O9gpeXh+HmHUhUZUfLM8QEaTKwiQQBMygwDf98wjBh</div><div class='del'>-Qg+wWGQA0hMYGhoawNrlFRQZDp16xfAR5EgWHnDol3VeYlBS0WFoampiOH5ThkEr8D7D5sO/wI5m</div><div class='del'>-ZIR4AhwbUMzPzcQwJYWXgZeDEdmdukAcCcSi0CKdCRYLAAGEnISYoT6MlJaUULn/8DFYUE+Nh6Gr</div><div class='del'>-XIeBld8RXDv///OZ4e71bQwtfTsYFixYAFbz4MEDBn5+bqAHlBhSi5YzaFh1MGzefY/h8OnXDEvX</div><div class='del'>-32Tg4uIC47y8PIa4xGyGxKavDBFVH4B1wl+IR6COh3lERpiJoSWCGz0pgSpOZWiMwGMBIICYkGhw</div><div class='del'>-2mdjY81gAgYLLN13laoCk4QE0HBBoOM/AUvDqwwp+fMZEhLTGRwcHMBqQLSikhaDpGoikNZmWLBw</div><div class='del'>-OUNayWYGj8jFDPX19QwsLCwMJSUlDOfOnWMwMjJi6OnpYfjJacdgk/qOYfq6b/B2KyhGwDTQU07a</div><div class='del'>-rAwOmiitAlDouwOxEDSlgGMBIIAYkSo0UCaJFxcT7f79+w/Du/fvGWyN+Rh2zjFlYOVzA3pCCJgJ</div><div class='del'>-2RkmzF7JMGXBFYYLFy4wCAgI4KxSP3z4wJCQkMBw4MABeEyB+EpKSgxRUVEMIiIiDDdu3GCYM2cO</div><div class='del'>-g7rkJ4amBG4gzcLw+8d/ht/AauPXj38MD5//ZfDp/YRs7BsgDgHiG9Amx2+AAIK12WGZ14WNjY3h</div><div class='del'>-y9evkCIzTQqYyQQgxeHvDwz3719laOnfA3YQyPGvXr3C6QGQ/IYNG8B5JDAwEOwhUFK7d+8eQ11d</div><div class='del'>-HcOuXbsYNDQ0wLEhquzF4FLyAVwXwMpCUMNNSoCJwV4dJRZEoC1fXqibGQECiBmafEDNYnFgVDcw</div><div class='del'>-MTGxffnyFdieYWXoKpZjYGYSB0YtC8N/xn8MwZlLGDx9YxkyMjIYnj17xnDlymWGz8CkJiwszMDM</div><div class='del'>-jCg5Pn78yMDBwQFmgzxhYGDAUFFRweDh4cFw8+ZNhtWrVzPMnj2b4cSJEwxycnIM5ubm4KS1bt8j</div><div class='del'>-YKX2FFgKsTBI8DOCa2yW/4wMu1Fr6q/Q5jgoan4BBBDMA6DM6wZ0RNDPnz8Y/gE7LTHe/AyuVgJA</div><div class='del'>-hwGLRaa/DJMWn2PYffwzw4oVKxh+//7NcOfObQYZGRmGly9fMjx+/IiBjY2dgZeXF8h+zLBo8WKG</div><div class='del'>-Hz9/MkhKSjI8efKEoaOjg+HFixcMO3bsYJCQkAAnHZDH/vz5Ay3BGMCesLGxAbbcOBl6ll5jePfp</div><div class='del'>-F4MO0CNKQkwMc4/8ZEArbPZAk9APgABihkYFsOBm8Adii79/Ia3FpiwhBgVpbnDJ8PD5F4aYkqMM</div><div class='del'>-HZ29DBYWFgy/fv0CJof7YMcqKiqBMx/IE++B+UZeXoGBFZhpT50+zXADGNpubm4M6urqDD9+/AB7</div><div class='del'>-BBQTIBqUpEA0KHYaGxsZjhw5Ao8NEN537gXD5E0PGXSkmBmev//H8OLTf+RktB7W0AMIIGZo9w+U</div><div class='del'>-gYP///+vBW+E5PMxcHKwAD3AxCDAx8nw/TczQ3HNHLCcu7s7w6RJkxhqamqBxScfg6ysLDC0pRje</div><div class='del'>-vn3L8PTpE6An5BmsrKwYngA9eOz4cQYNTU2GyMhIcIzNmDEDnHRAMQlKZqDkCMrcII+C8sO7d+8Y</div><div class='del'>-dHV1wflj6/ZdDOHG7Aw/gD2DC0/+oneEHoA6QAABxABt96gD8QVoRxuMvxyR/P/thOr/b2eM/n87</div><div class='del'>-7/j/6yX//8fXev7X1RD6D3Tgf35+/v/9/f1gtp6e3v/Fixf9B+aJ/2fOnP6/e/cuMP3t2zcgfeb/</div><div class='del'>-pMmT/1++fPn//fv3wfpA5ufn58P1A2PuPwiA5P39/f9zcnL+BwbK/xQ7jv9HS/n+59ix/0d2G7RP</div><div class='del'>-AuoRcgEEEHIpBK/UbAyAkfLvH7Al+QvYegQ2i/+BGmXfgZUaJ8OOhW4MH949B2fUgIAAcHHq6OgI</div><div class='del'>-DMlMhqlTpzJ8Bza3ZWXlwJn75MkTDKKiIgxxsbEMOjo64JAGYaBDwfoKCwvBfFhxrKCgAM4bYWFh</div><div class='del'>-DH8+P2WINGMH2g2svYQx2kewQQMmgABiQurrIgDQj/+BGfk/rEMCbMuDW5X/vjJMXXCBwcDIkgEY</div><div class='del'>-UmDLQJaDisotW7YwHDt2HOyg/fv3Ax0uCs7Ut4B9CFDRDCp6QcUoKNOCHArSZ29vD9YLCgiQHKz+</div><div class='del'>-AJnbGMjFwM3GAPbAf8xOHHzYBiCAGKAlkB4QX4JFka4yy/+Pe8X+fzko/v/rUen/X06o/f9y2vD/</div><div class='del'>-8eUGYPnz58//nz9//n99ff3/6ABY84LVxMbG/t++ffv/d+/egpMIKOkAPQZWA6JBfJA4CIOSEyxJ</div><div class='del'>-gpIQsAb+f6Ze4P+xMv7/B/P4/vf6cqEnoS5o740XIIBgrT1tZA+A8PtdYv8/7QN64hDIEzJgT+iq</div><div class='del'>-cYIdCAIgi0HqQOkWHYDEgKH7X1xcHOxYkKNAakEeXr9+PTjdgxyLDEDqQPLARtz/QzX8/0/WCPw/</div><div class='del'>-Usz3f3823/9MC4w80AFt4PEABBCsFAI23hk0oIJgEOHMwSDAwwStFf8xTF35keHKU2Vw6QECoBIE</div><div class='del'>-lI5BxSOoaEWvhUFJCdQGApUyFy9eBKd7kJ6CggKwHlCSglV2MD2g5JTj+ItBC9ikAHVy/v6G9Nj2</div><div class='del'>-3/nNcOM1SjpaCcT3QCkOIICYoINJv6CDTHBw6dZvoAGQ/uv9J38Y2uZ9AluADECNOFg7BxsAORaU</div><div class='del'>-tkH5BVTew2ppkD5QPkDWC8obosxPGXwN2MAOh3Q7IfTdtyiOB5YoDO9hwy4AAcQAbYXKAHE6cjSl</div><div class='del'>-enP+f7VR9P/bbaL/rfVYwekUlDRAaT8+Ph5elOJKRugAlnRAGKQexgclNRAblHS2AYtMUNo/Xs7/</div><div class='del'>-/1A+3/896bz/18ZwoycfUCclAIjlQG4HCCBYDIB8dRXa5wSD7ad+gqNx8+GfDEcv/QaHFigUYW0b</div><div class='del'>-EA0qMWClESEAK3JBAFbygPggs0CNvWhrdgZxXiaGP7//g2P+z5//4NA/9hA8LMQgxC/AwMbKBhs7</div><div class='del'>-+gR18z+AAGKB+uoXtFY7DcT2IFVPgGlu2/GfDJ++/2fg42KEOxq9CQ1yCMhBIHlQcoEVh+gA1KwG</div><div class='del'>-eRiWXGDpHpSU1CWZGdIcOBh+gzr4IMeDkhAQ/we6bPftPwxMjKDWAB/Du49g/WdhDTmQBwACiBnq</div><div class='del'>-ASZoZgYBD5ilr4BtkPpoboYAG3aGbYfuMnRPXgq2EFTNwwCs8gE5EBSiIBoEQI029Pwyc+ZMsONh</div><div class='del'>-HSGQZyMiIhjq/ZgZxIBdSfAoxS8GaAb+z3AR2B9YcuEXgyA/P8Pfv38Zvn7/9hCobRW0GQHKB38A</div><div class='del'>-Agh5hE4UGvrXkdNcdxL3/wcLhf8/XiL8f24R739gbICLRVj1jw5AeQWE0QFIj6Ys839eTkawPEg/</div><div class='del'>-KP1HAovIU3XAMh+U7gv4/u/L5P2/M5nn/84knv/Aluh/FmaW/8qycv+BJdp/6PCKA7SDDw5wgABi</div><div class='del'>-go6x/IOOQ76BKoKDpuXfgL2zf+DoddJjYzjWL8jA+m4HOOTRSyVYkkLPEyD+vl2bGBYX8DGsL+Nn</div><div class='del'>-OLplKjjJ3bpwmCHFloPhz8//EPwLgkFBt/7qL4Z77/4xiAoJMXz59g3U9Aaln91Iw43g1h1AAIEH</div><div class='del'>-tqA9fDZoUxWUPqYDsRrMAWaqLEDL+SEjCNChkJM3fzOUzPnCoKJjC87gIA8hl+mg5AQSA6V7kGPT</div><div class='del'>-bd4w+Juwg0fk/gGTxx5gwQAqJm2UmIFJhgHueFCz4e7bvwxZG78z8PHwgD3wENh5AnpgFtDodUB8</div><div class='del'>-GYjfgobhQW4HCCDkUYk/0Iz8FIgnIpdIp4AZqXzBF0h/FdpnNVFgZdhcI8Cgx3sK2CdQhGdM9FgA</div><div class='del'>-l+8sTxl8gOX7b2A/9w/YDAYGa0UWBhsFZiAf2FuFxgDM8aXbvzOwA9tPIMe/BQYA0PGgZH0QVLZA</div><div class='del'>-3QjvogEEELOUlBTDnj17GNDK2t/QfGEEU3jj2V9gyfSXwV6DFTx6+A+IWYG1tJkyK4MzMGlNWrCH</div><div class='del'>-Yc7ideAMDooBWO+rtDCLYWoCDwM3MyM4g8IzKRD/hta0IDZ4CB3q+N/A5C0D1Pv123eGt+/ffwRK</div><div class='del'>-TYY2dZ6ij5ECBBD62CgjdMhCDIhVQQEIal2jlCaarAxNwVzgohU+FAKdy1ty+AfD9L0/GILD4xgW</div><div class='del'>-LlzIAGzbMDhL3GKIADaL/8FGpf9A6d+QAd5/0H4KqMRp3At0/H9WBmlJCXB38+mLlz/+/fsHSs47</div><div class='del'>-oCMRb6B59T/M3QABxAzsPDAYGxszzJo1i+Ho0aOwmPgLxaD5LEVoTQ0p+t78Y9hx8TeDiggzgziw</div><div class='del'>-rQSu7kExAqS1pVgY3LTZGFbtOMfw/OM/Br7/rxmqPbmgIc4Ab9uA0zzQA6By/gsw6cw984thMrDO</div><div class='del'>-YefgYhAHNsP//PnL8Ozli5/AvvlcoJX7gfgOkuNRZm0AAgjf8DoPdO4LlKlLgdgSvcQxlGNhSAHW</div><div class='del'>-oIayiOHK//8hpchBYFtKAlizgjojwL4RPAZAAwYMUIevv/YbXNp8/83IICIsxMDNxQUe0nn99h2o</div><div class='del'>-loU5/jq0nfYZ2/A6QACB84C2tjZcAJon/iE18n5ADfkH7TcgJraAobztym+wY78DHcQMdBg/KxM4</div><div class='del'>-pGX4mBj42SDpHtYo/AzMwGeAfduVl34xTAKG+Lln/xg4uXgZRIGOBw0EvAb2qT9++vwKWgoehqYA</div><div class='del'>-2NzA3/LycnBqQQYAAYRvhgbWdeOGVnIK0PyQAp1KxQn0gU2D/7DECAUvv/wDYogAGysrAxcXJwMX</div><div class='del'>-MPkyMzMxfANm1ncfPoJi7xC0qAQFGKjWfQXLtMjpHpTc09LSwGyAAGLEJoglOXFCRy4koQOs3kDs</div><div class='del'>-BSrysXkANJIBNhySw8GOBA18gRzOCsQsQPY/YFL7/v0HOMkAHX4FOid2DtpMeAKd5INVWP9xTfIB</div><div class='del'>-BBAxs5SwwSR2aL4QhXpEFjQYBi1q4ZUeyNGg5MAI9ATIIyA+EyMjeMD2399/4DbNL2D5CSxdPkNn</div><div class='del'>-I0Hl+zWoo59AMytsvvgvoWlWgABiBA0uhYaGwgVAw37IfCSPMCJNufJAYwTkGXGoZ3ShbXQlaONQ</div><div class='del'>-FsmIT1AMaoA9g87Y34ZO4L2ENg/eIzn8N75QRwYAAcRIjCK02ICtj2CH5g8e6MgeP7STzQv1JDvS</div><div class='del'>-aAesQPgOHdv8CPXQR6ijvyE5/B++eWF0ABBALMROpcMMBHrkH9IijR9QR7yGOpgdadEH8lgT+mKP</div><div class='del'>-H0iLPv7A1kgg2wNKCcQAgAACJyFyAGiME2liEHmpDTMSH3m5DWx5zV+0JTfgognmDq/+Dga9lyA/</div><div class='del'>-mTD8/zmDIZFnPrjwEwWPJtowJIJLVltg+j0MpgECDADuXybnyFX8nAAAAABJRU5ErkJggg==</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417929.27019.8.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=corner-bottomleft.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsBCVkleUoAAAA/SURB</div><div class='del'>-VHjaY/z//z8DPsDEwMAgTEiBKSEFYXjt+A8BZv///2fAhmEKzv///18YnwKYIjN8CmBg3v///z1g</div><div class='del'>-JgIAui9uUdDfxKcAAAAASUVORK5CYII=</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417929.27019.7.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=corner-topright.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsANW9RNIwAAAA7SURB</div><div class='del'>-VHjahcwxDcAwEATBCwZzCQajNCVDGlduouh/petGFwQDE8un/OzFrsB93BW4Tx6kaHVgdmB0IAcq</div><div class='del'>-73eg4H8gZQAAAABJRU5ErkJggg==</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417869.27019.5.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=corner-topleft.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsAJuvvdVIAAABISURB</div><div class='del'>-VHjafcxRDYAwDAbhYxbqZRpQOQGYQQkabk8kzRj9kz59l+J3Qz3VUCHBrXaVfCSMFXPQd/gG4w9V</div><div class='del'>-GnBR7FADeKqgesAEj0KK3Z8K59sAAAAASUVORK5CYII=</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001417869.27019.4.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=bluestripes.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAZiS0dE</div><div class='del'>-AP8A/wD/oL2nkwAAAAlwSFlzAAALEgAACxIB0t1+/AAAAAd0SU1FB9EJGQsLBap83esAAACESURB</div><div class='del'>-VHja7dRBDcAgEADBgwDBEj4wUvdN+2h1kJvVMNmy9vVF4mokr93PGwRkFjBHJ8ADCPAAAjyAAA8g</div><div class='del'>-wAMI8AACPIAADyDAAwjwAAI8gAAPIMADCPAAAjyAAA8gwAMI8AACPIAADyDAAwjwAAI8gAAPIMAD</div><div class='del'>-CPAAAjyAAA8gwAMIOL8fcegyqOBdwTkAAAAASUVORK5CYII=</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1</div><div class='del'>-Content-Type: image/png</div><div class='del'>-Content-ID: &lt;1001418096.27019.14.camel@spectrolite&gt;</div><div class='del'>-Content-Disposition: attachment; filename=ximian-update.png</div><div class='del'>-Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAANbY1E9YMgAAABl0RVh0</div><div class='del'>-U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAABMfSURBVHjaXM1LCoAwDATQqYq2qQs9R7bm</div><div class='del'>-Km69YK/kWepUWwUDD0I+DEQEUeLNZCWDLQdyzg9VKFqdb6eaWuuoo4FG8iQ0/0jdlZu+/pRfmG1f</div><div class='del'>-XmKe/vM42zNSvZEQ4NxEHpcAYuQACvxi4oQ7rGH1d4baYCgnHuixNSBbQPZogW1+/+00TCkTFLNC</div><div class='del'>-HQXC7FCsBcT8MAcCwX8gvgnE74D4JxT/guLfQPwPihlAAQoJMUawkWwMKgyqIANPnWJYADaqiUFH</div><div class='del'>-p57h6lWIBwECCO7DMFgI/I9g4GTiAPuQA0j//2/EwMQI9AIjI7LD2aChKgbE+kBcDsR7gPgp1LH4</div><div class='del'>-8BkgngbEQUCsCDWDB2omEwOJACCASEGM0NDmBWJJII4B4n1EOBgffgbEvUBsBsRSULNZkWKOIAAI</div><div class='del'>-IMb2KgWGyrYnwLDgYfh/PIfh3tdEFAXKysoM0DQLCiFuILYE4lpQ0qVi4HwG4tlAPAuazD5Dk9bf</div><div class='del'>-u3fv4tUIEECMuBRAHc4IdTwoAwoCcRkQZ+EyTF6SjcHOmIdBXoKFQU6CEUgDA/nfH4ZD538y/Aem</div><div class='del'>-8EMXfjEcufgbn3vuAHE9EB8G4g9A/B2I/4BTOw53AgQQCwHHs0BDXZGNlXXZr9+/NTAcLcXBkBsl</div><div class='del'>-x+DrKAz2AMP/v0D8G4z///sBDMMfDLZGQPrfXxAC4v8Mmw79ZFi26zvDthO/0I1TAeKZQNwPxIuA</div><div class='del'>-+DUQf4V5AhsACCCsMQD0AMzxoMxlw8/Lu0RXQ5PvyOlTSA7nZKjJ1GCI85cDehWa94CFAMP/PxDH</div><div class='del'>-//8FdjzDv+9AP30D0t+A9B+wB/7+AeLf/xkePP3LUDX7C8OOU7+wuW0+EHcB8Usg/gJKUtjcChBA</div><div class='del'>-GB6Ahj7M8bbiIiJL5WVkec9duczw5w8kIHJiVBhqs3UYBPiBkcPIwvDxE0Scn48V4oF/wBgAhj44</div><div class='del'>-BoAOZ/gLcjzQDUAM8gQQQTzxC+IRUNIqmPqF4cmbf+juA5WcnUD8HBYT6O4FCCAmHBkWlOYVebm5</div><div class='del'>-Z0iJS/Ceu3wJ7Hh+XlaG1ZOsGPoaQxhEdFsYWNVmMjByKDFMXv6MQUBEBugXAQhmBVYBLPxANi8D</div><div class='del'>-IzOwYGHmBtJAzzIBjWViBiEIZoHQNjqsDDvb+Bm05JjRPZAAqo2AWBSIQZUVM9SNcAAQQExYikpQ</div><div class='del'>-aSPIwsw8S0leXurW/XsMf/7+BTt+93wHhoDASAZWuWoGJg5lhn/vdjA0T9jLYG+lCXQgD9jxDCDM</div><div class='del'>-DHI8H5AGOZ4HLAdyPCMzEDMBa1AmRgYmKGZkhmABXkaGbU18DMFWbOieqAClBCAWgLqNEdkTAAHE</div><div class='del'>-giPpZMnLyJg8fPKU4eu3b2D53fPtGAxNHBhYRILBafvf1/MMB/bvYnj4ggHsAbDXgUUN479fkOTz</div><div class='del'>-lwVcg/8H6/4HzxsMTL/AahiZ/gAdDuT+hcYGM8hD/xm6ErkYHr/+y3Dq9l9kT9QA8RUg/gEtXuGZ</div><div class='del'>-GiCAmJAczwSNJgVuLq4sUKh/+PQRrGh2swGDgZ42A7OAB1DrN2C+vM3w7sVphuKmnQx1pSHAJANK</div><div class='del'>-OoJADA15YNL5+I2ZYdO+pwwtUy8zuCYeYkitvw20gQMcAwxMrOCaHYxBscAEKQfAsQGkp6VxM0gJ</div><div class='del'>-odRlSkCcB8Qi0PYUEywWAAKIBa1IBYV+jRC/AM+zFy/Agr6OYgxxAUpANzkwMAJz3///H4Chf4Zh</div><div class='del'>-8txjDP7e1gwKCrJAh7BCC6E/DEnZfQwHj15lePjkLaLEkhVjOHT6PkOsjyCDnQFQLUg940+gY/8z</div><div class='del'>-gFooEI8g2HzcjAxtEZwMCdO+IXsiEIhXgppjSO0oBoAAYkFr38iys7P7/fj5g+E3KNPyMDP0lGoy</div><div class='del'>-MHPqAhMD0NI/n4HF4GOg4z4wLFx9huHcwUmQEAe2m0C2M/77ybBo5SGwgXMnZQIrMiYGe3Nphv8/</div><div class='del'>-njAkl+9kaJlxn2HXLA1wyQVWz8CACH1wjMA8AazmVVgY/IxZGDadhacWUH0UDW3BgUskYCz8Awgg</div><div class='del'>-JrSSJ4wb2FT9/PUrWEdutDSDgjQfMG2KA1PeR4b/v54Bk/IbhkWrTzI42BgwCAgKQjIpOOnwgzNt</div><div class='del'>-XmYYMGZsGeJDTRnsLZXB+QHk4LhAFYZDZ98zLN78GpRWgI5kQm3xQB0OrlLAnmFgyHBmR8/QLtBk</div><div class='del'>-xAlL/gABxIJU4/IAQ8GPmZmZ4cfPn2DVsb6iQMeLMDD++QqupP4xAaOUhYlh4ux9DPu29IGTAiMj</div><div class='del'>-MOJYeMDmMQIzcX9HNtCzH4AefQ9zDRjZmYoDKz8uhpKe+wy+NmoM/JxI5R7MI+AW738IF0hICTAy</div><div class='del'>-+BiwMGy5AI8FkONdoY1AUHvpD0AAMSEVnapAx6t8gYa+rz0fuGnA9B8oBXTM/7/vwOn/4LFb4BDV</div><div class='del'>-1xSDNuFB7QNQyfMT2oxAamzC2dCiJEuD4eOXvwwts18gwhRZyX8GVHEgcFDDqBuMgJgP2mplAggg</div><div class='del'>-WKcEFFeWIJ98//ED4gE7YKj+BxZtoJr0P8jxb4H4H8PB47cZDLSALd//sOISWMv+AZZWQPz/71eI</div><div class='del'>-GEgOXGz+gXrqL9ijfg6iwHzFwjBl5XuGTQe/ojoL5F8QhNIwYAf0AA9qStKFegAkyggQQExIGVjj</div><div class='del'>-719E2WtnCAp9kOVvoR74AnE0SAyUNP5+hzj4zycgBiUZYOPx7ydokwEk94PhwtVHDMHpqxnY1KYy</div><div class='del'>-sGstZVDz3AsP2rS2D8BW6i+Ig/+jRdw/BhRxQ1mU+lYO2m8Ad4AAAogF6gFQ2ar+7z/C56CmMON/</div><div class='del'>-YGz8/8rw7x8LELODQ1dempvh4MTrDA8ePmZQkJdh+M/0G1yuQ0LxDzgpgWKlqXczQ3P/LpSg+/gZ</div><div class='del'>-0aj8+OU/Q9tiZmDd9p7B05yNIdmDA+5wiCf+w/mqokwMh++gtJPUgPgaqPABCCAWpH4t3Ju2BmxA</div><div class='del'>-zcAyH5i2fwMd9A/ocEagBxj/sQJLE1WG5onAKj9pJsOe1bkMggL8kGIR7AFg5ffxI4NzyCSGi9ee</div><div class='del'>-EezFHD77BkwfufSb4T6wZVofyQV2+L9/0FiAekJZGKODxg+LAYAAYkIaUVBCTZB/Gf4CHf4P3KL8</div><div class='del'>-AW1RglqWXxnWTPNmePD4LYOJexfDhm3HwSUOCL9/9wLo+IlEOR4drAZ2Yf6BHP+XAdUTwOY3NxuG</div><div class='del'>-B1hhJShAALEgDYvwoLgfaAiotgS15xmB7Zr/DJCyGxTDempcDKc3RTKkVOxnCEldzCAvI8AQF6zH</div><div class='del'>-sGnXTYaL119iOM7PWR6oh53h0KlXwLrgA1hMT12I4dLNd3A14c5iQMd/BvcXwJ4A0zCP/Ec3Ej4s</div><div class='del'>-AxBAyE2JV9ARAkhe+gcqlv9CQh5UxoMbZv/BZT0D8x8GeXF2hj0LnBgWbbjDMHnRLWCyOoQax3xc</div><div class='del'>-DHlx2gw5kSIM/OzvwJm7OoafQcL9Izj9L2sQYDh4+jdDdt9nhrRAOYY890/QHhsD3BMw9v+/uGMO</div><div class='del'>-IICYoO79B+35QDPbf0RIgDonwGQDKV0+A5PKJ0SxCcSxvpIMp9Y4MPi5KKIY3FOqzlCdxMnAz/YG</div><div class='del'>-qhdoBjA/6alAwkxa8DNDuAM7w8tNSgx1oV+ARSUjsPv8Hyt+/gkjBv5C3fwfIICYoIw/yNXI5Xt/</div><div class='del'>-wD0mSJr8D87MEMd/BheVMMf//wOtcYE174cPH1FsWLzxMbiI/Q/UB2pDgYpVULJ4+BwSnP/AvTJQ</div><div class='del'>-BH8EOxLcQwMVYmBHQ3tsUPYLTA+8hrkZIIBgHgC1sS8iq7h4C9h//Y0Ihf9/f4ND8j/U8SBHM/x+</div><div class='del'>-D282fPj0A1w7z66TA+s/dAbYZtr4BBJjf39B+sJA/OjlPwZbMyW4AyH9YwZw1/IfshjMI0A9F59j</div><div class='del'>-dDWfQ1uj/wACCOYBUOPnNrKKIxd/wfuu/6Ch8x9Y0YFDEpyMPsBj4D/QE5dufWOw1WdgiPFgYZhV</div><div class='del'>-LQQ2o2Xue7AecHIEmrFk+3ew+KXrz4Dqf4MD6C8B/PnHf4ZLL1BiANYaBXsAIICQPXAaWdXyvT8Y</div><div class='del'>-/kA73X9+I4cKMDb+/AM6CliL/vkObOe/Y0htegxtfnCBi1pbfSZgXcLK8OjFX4bFO1nhjgl34mdI</div><div class='del'>-9xcA5rEfDEENnxgu3fkD7tj/gcr/gbJh9oLsO/YAEvpC/PwMbKzgCvMGKJtC3fwXIICYkYolUMVg</div><div class='del'>-DB3iY3j94T+DuxErgyg/E0qjC1Qzti/8ysDHxcgwd+M3hvSOTwwfvrIxdBXKM3hb/GG4ePM7g2PW</div><div class='del'>-O4Zbj/4yRHvLMWT4/GNgAZZmkFGIPwx22owMWgrcDDtPf2dYfeQXg4IIE4O8IBPE0SAP/IR44PdP</div><div class='del'>-SCU2/cRfhtdfGRnEhUUY3gMrSaD1y0GRCM0HvwACiBmtMy8BxBbwcvX9PwY/YDWP3C4BhWpM8yeG</div><div class='del'>-eZu/Mzx8xcrQkSPOML2Ei0FH7hvQgl8MNunvGD5+/c8QCWzLT85lZmBl/ANOy4jkAuyzCv9jiLTn</div><div class='del'>-ZTgJbNjO2vUNqP4fw7wDvxhUxTgZ+IBFNMgToCQLSvtLzv8DFsl8wEr1L8PX799fQIdaHkJH7v4A</div><div class='del'>-BBALNGz/QNvXm6C9HtAwBsPOs7/B1byVNisDE8t/cMe7Y8lXBi87GYZIJw4GL9Mf4KLxzw/o8MHU</div><div class='del'>-L2DHRzixM0zM5QWHJKJMh+YlaNLg/P+TYV4qE8OUnbwM03d9BusX5+Ng+PP9B1gNuCQ79xc8Ms7P</div><div class='del'>-w8Pw/DUowMGDya9gfQGQ2wECCDywBeyVMUF7ZAqghiKoMwaLBU1ZZoYVZTwMArxMQE8Am9eswDbR</div><div class='del'>-/1/QbiAk7h6//sdw/NpvhrzJXxgi3GUZJqQBM+6fn5AmAdzxkBIFFhPgdP8LklxuPGdl4GJjZxAE</div><div class='del'>-9jdAoQ+K6XVX/jLMOPmXQVRICFyJvnr3FtQXLgRi0PAgKNN9A7r9H0AAwRpw/6C5GlS3bwDiNzAP</div><div class='del'>-XH/8l6Fx2Xdwmvz94x/D72/A/vLPf1AMSavLd/8AO95Sm5uhJ+EPwy+QGpDaH/8RNFD9nx8IPX9+</div><div class='del'>-/IezFbh/ojj+7tt/YMeDurfsbGwM7z6Cmx/rgfgJUqcenLsBAogJaZAIloxALbFJyCXSuuO/GObu</div><div class='del'>-/AF2yK/vUAd9hznuH7ADzsygrSzEMDNPmOHX1++YjofTCD3gAEBiIzu+ZNsfBlYWFmCs8wFLrM+g</div><div class='del'>-gTVQ03kndALlC2xcCOR2gABCbgv9gw4cgcZDQD0PA+gsChi0r/vBwAPM5gFmbOABKNhIAigJcQLZ</div><div class='del'>-bZFMDOzAjv9vUJ/nP8Qx8JblXwZ4JQVOSr9Ri05Ymoc5/hew/yEiKMTw49dP0AADKPjnQDPuW2jx</div><div class='del'>-+Q82RgoQQCiDu9BRaXZoow40NdUIxNYoLUtjFobmEA7IgBQjIh8guoVIPSpoaxKWgUEegWXiv9A8</div><div class='del'>-8A9ayYJKnIY9fxh+/gU5XgBY6vxjePP+/Q9gYEwGSu8A4ltQD/zoZX/wv/hnAsOk3AMMAAHELGkm</div><div class='del'>-xHDb3Yhh8/FtDGeebGNAatyBGi2PgNgc2oEAg5tAi/Zd/cMgJwAsm3kYoSEKxdDQBTcLkCslMGaA</div><div class='del'>-VFQ/YZkX4skvQP7cM38ZJh0DljjMbAyC4CLzH8PbDx9Ajp8JLXnuQfMlOPR3/Z3I8DDOhuGc/SEG</div><div class='del'>-gAACtpM3MNRd9GBgjYxBbul9g1YUl6GDqxeQY+HWi38MaQt+MNSt/cnw8MUfcL4A428g/B9M/wSx</div><div class='del'>-QfnkO4SGyYPyAcijIIfvuvWXIXbVb4YN1/4z8HBxAYtLXnCyQXP8HahbQMn778OQBIgjvrEw3OPL</div><div class='del'>-YAAIIMb2pR8YonZmAAU4GOTXvWFoX3KEoTLqA6zXwwOt3FShxas3tja5oQyw6aDMzGCjxMQgzssI</div><div class='del'>-TUKQmhTSmoX2dYHg6MN/DMeg+BswFjjYORg4OdjB+enbjx+gUZGX0NmZg1DHv0TOuCAPrElkYAgJ</div><div class='del'>-mcMg/52FASCAWBgYDzCsCedgeFhvwyA+rQ2o5AA0/4I1fIG2/EDsidAR4lRQ0wTZA+ef/APjSUAr</div><div class='del'>-uYEZXUUYMiqtLMTI8BLYt/gCdCgI33sH8QUTEzDDA+sTfl42MPvX79+gWhbk6WNA6TXQlvEjpCkm</div><div class='del'>-cMhvlNZhWGbxhaHSu4HhwbEjDAxWDAwAAQQ2sHdrAkaoPowrQR705YUOZ4CmQyOBeAs0mWGdPgWG</div><div class='del'>-JhgzQTEzsNgCFov/OdjZ/wOTyn8+Hp7/vNzc/znY2MHyQD33gbgDNLQJzXMy0NhngYU6CChyBTC0</div><div class='del'>-rwAHLkP6VUgBChBA4PKjF9hLKr7zB1+fmxlpclsUOk8MSlZ2QOwITWbQ0UFGBqCDwTQTlAYlJ0ZY</div><div class='del'>-6QDMoKBMCqR/Qhtl+6FDJE+g5fxbaMz/ImaaFSCAGAkpwDJryQEdKRaEegZW5OpCY0kaKsePZsxj</div><div class='del'>-aKw9hTr8FrRd8wpawnyAVqQ/Ye0cYtwGEEBEeQDJEwxIwzDsSIs6+KHDfbxQPic0xliQavlfUA+A</div><div class='del'>-0vQnJPwZOh8Mc/g/Yt0EAgABxEiKYiwewbXYAzZug9zW+oM0MYG84OMP8mIPUt0DEEAspA5AwSwA</div><div class='del'>-TS4gVXg/kTyEjNHHoJH1wDM9qY5GBgABBgBtfYX2h4rUhAAAAABJRU5ErkJggg==</div><div class='del'>-</div><div class='del'>---=-t4dRE6cqcdSBHOrMdTQ1--</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am<br/>deleted file mode 100644<br/>index a1baef5052..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-SUBDIRS =					\</div><div class='del'>-	Calendar				\</div><div class='del'>-	Contacts				\</div><div class='del'>-	Drafts					\</div><div class='del'>-	Inbox					\</div><div class='del'>-	Outbox					\</div><div class='del'>-	Sent					\</div><div class='del'>-	Tasks					\</div><div class='del'>-	Trash</div><div class='head'>diff --git a/default_user/local/Outbox/.cvsignore b/default_user/local/Outbox/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Outbox/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Outbox/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am<br/>deleted file mode 100644<br/>index 0f081fc680..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Outbox/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Outbox/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultfolderdir = $(datadir)/evolution/default_user/local/Outbox</div><div class='del'>-defaultfolder_DATA = folder-metadata.xml mbox</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultfolder_DATA)</div><div class='head'>diff --git a/default_user/local/Outbox/folder-metadata.xml b/default_user/local/Outbox/folder-metadata.xml<br/>deleted file mode 100644<br/>index 4452fb9e0c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Outbox/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Outbox/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;mail&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Outbox&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Outbox/mbox b/default_user/local/Outbox/mbox<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Outbox/mbox?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Outbox/mbox</a><br/>+++ /dev/null</div><div class='head'>diff --git a/default_user/local/Sent/.cvsignore b/default_user/local/Sent/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Sent/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am<br/>deleted file mode 100644<br/>index d76801917e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Sent/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultfolderdir = $(datadir)/evolution/default_user/local/Sent</div><div class='del'>-defaultfolder_DATA = folder-metadata.xml mbox</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultfolder_DATA)</div><div class='head'>diff --git a/default_user/local/Sent/folder-metadata.xml b/default_user/local/Sent/folder-metadata.xml<br/>deleted file mode 100644<br/>index 87188daedb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Sent/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;mail&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Sent&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Sent/mbox b/default_user/local/Sent/mbox<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/mbox?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Sent/mbox</a><br/>+++ /dev/null</div><div class='head'>diff --git a/default_user/local/Tasks/.cvsignore b/default_user/local/Tasks/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Tasks/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Tasks/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Tasks/Makefile.am b/default_user/local/Tasks/Makefile.am<br/>deleted file mode 100644<br/>index 10ac77fb38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Tasks/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Tasks/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-defaulttasksdir = $(datadir)/evolution/default_user/local/Tasks</div><div class='del'>-defaulttasks_DATA = folder-metadata.xml</div><div class='del'>-EXTRA_DIST = $(defaulttasks_DATA)</div><div class='head'>diff --git a/default_user/local/Tasks/folder-metadata.xml b/default_user/local/Tasks/folder-metadata.xml<br/>deleted file mode 100644<br/>index 32b3381af6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Tasks/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Tasks/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;tasks&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Tasks&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Trash/.cvsignore b/default_user/local/Trash/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Trash/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Trash/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am<br/>deleted file mode 100644<br/>index 25def5bfe9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Trash/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Trash/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Trash</div><div class='del'>-defaultcalendar_DATA = folder-metadata.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(defaultcalendar_DATA)</div><div class='head'>diff --git a/default_user/local/Trash/folder-metadata.xml b/default_user/local/Trash/folder-metadata.xml<br/>deleted file mode 100644<br/>index 0ca3820f8c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Trash/folder-metadata.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/local/Trash/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;vtrash&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Trash&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/searches.xml b/default_user/searches.xml<br/>deleted file mode 100644<br/>index 6b08f8eda2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/searches.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/searches.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,108 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filteroptions&gt;</div><div class='del'>-  &lt;ruleset&gt;</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Message contains&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="subject"&gt;</div><div class='del'>-          &lt;value name="subject-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="subject" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-        &lt;part name="body"&gt;</div><div class='del'>-          &lt;value name="body-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="word" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-        &lt;part name="sender"&gt;</div><div class='del'>-          &lt;value name="sender-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="sender" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-        &lt;part name="to"&gt;</div><div class='del'>-          &lt;value name="recipient-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="recipient" type="address"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Sender contains&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="sender"&gt;</div><div class='del'>-          &lt;value name="sender-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="sender" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Body or subject contains&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="subject"&gt;</div><div class='del'>-          &lt;value name="subject-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="subject" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-        &lt;part name="body"&gt;</div><div class='del'>-          &lt;value name="body-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="word" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Body contains&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="body"&gt;</div><div class='del'>-          &lt;value name="body-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="word" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Subject contains&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="subject"&gt;</div><div class='del'>-          &lt;value name="subject-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="subject" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Body does not contain&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="body"&gt;</div><div class='del'>-          &lt;value name="body-type" type="option" value="not contains"/&gt;</div><div class='del'>-          &lt;value name="word" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Subject does not contain&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="subject"&gt;</div><div class='del'>-          &lt;value name="subject-type" type="option" value="not contains"/&gt;</div><div class='del'>-          &lt;value name="subject" type="string"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-</div><div class='del'>-    &lt;rule grouping="any" source="demand"&gt;</div><div class='del'>-      &lt;_title&gt;Recipients contain&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="to"&gt;</div><div class='del'>-          &lt;value name="recipient-type" type="option" value="contains"/&gt;</div><div class='del'>-          &lt;value name="recipient" type="address"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-  &lt;/ruleset&gt;</div><div class='del'>-&lt;/filteroptions&gt;</div><div class='head'>diff --git a/default_user/vfolders.xml b/default_user/vfolders.xml<br/>deleted file mode 100644<br/>index 08fdd5bcbc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/vfolders.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>default_user/vfolders.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filteroptions&gt;</div><div class='del'>-  &lt;ruleset&gt;</div><div class='del'>-    &lt;rule grouping="all" source="local_remote_active"&gt;</div><div class='del'>-      &lt;_title&gt;Important mail&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="status"&gt;</div><div class='del'>-          &lt;value name="match-type" type="option" value="is"/&gt;</div><div class='del'>-          &lt;value name="flag" type="option" value="Flagged"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-    &lt;rule grouping="all" source="local_remote_active"&gt;</div><div class='del'>-      &lt;_title&gt;Unread mail&lt;/_title&gt;</div><div class='del'>-      &lt;partset&gt;</div><div class='del'>-        &lt;part name="status"&gt;</div><div class='del'>-          &lt;value name="match-type" type="option" value="is not"/&gt;</div><div class='del'>-          &lt;value name="flag" type="option" value="Seen"/&gt;</div><div class='del'>-        &lt;/part&gt;</div><div class='del'>-      &lt;/partset&gt;</div><div class='del'>-      &lt;sources/&gt;</div><div class='del'>-    &lt;/rule&gt;</div><div class='del'>-  &lt;/ruleset&gt;</div><div class='del'>-&lt;/filteroptions&gt;</div><div class='head'>diff --git a/devel-docs/.cvsignore b/devel-docs/.cvsignore<br/>deleted file mode 100644<br/>index d436efd0f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/Makefile.am b/devel-docs/Makefile.am<br/>deleted file mode 100644<br/>index 74a5ff5b60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS=camel</div><div class='head'>diff --git a/devel-docs/camel/.cvsignore b/devel-docs/camel/.cvsignore<br/>deleted file mode 100644<br/>index 56d9506207..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-html</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-camel.signals</div><div class='del'>-camel.hierarchy</div><div class='del'>-camel.args</div><div class='del'>-camel-decl.txt</div><div class='del'>-camel-unused.txt</div><div class='del'>-camel.html</div><div class='del'>-camel-decl-list.txt</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/Makefile.am b/devel-docs/camel/Makefile.am<br/>deleted file mode 100644<br/>index 276059cf88..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-# The name of the module.</div><div class='del'>-DOC_MODULE=camel</div><div class='del'>-</div><div class='del'>-# The top-level SGML file.</div><div class='del'>-DOC_MAIN_SGML_FILE=camel-docs.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code (if it contains documentation).</div><div class='del'>-DOC_SOURCE_DIR=$(top_srcdir)/camel</div><div class='del'>-</div><div class='del'>-CFLAGS=`gtk-config --cflags gtk`</div><div class='del'>-LDFLAGS="-lcamel `gtk-config --libs gtk` "</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-HTML_DIR=$(datadir)/gnome/html</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-tmpl_sources =					\</div><div class='del'>-	tmpl/camel-data-wrapper.sgml		\</div><div class='del'>-	tmpl/camel-folder.sgml			\</div><div class='del'>-	tmpl/camel-mime-message.sgml		\</div><div class='del'>-	tmpl/camel-mime-part.sgml		\</div><div class='del'>-	tmpl/camel-recipient.sgml		\</div><div class='del'>-	tmpl/camel-service.sgml			\</div><div class='del'>-	tmpl/camel-store.sgml			\</div><div class='del'>-	tmpl/camel-stream.sgml		</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-camel_docdir = $(HTML_DIR)</div><div class='del'>-camel_doc_DATA =				\</div><div class='del'>-	camel.html				\</div><div class='del'>-	camel.hierarchy			\</div><div class='del'>-	camel.types				\</div><div class='del'>-	camel-scan.c				\</div><div class='del'>-	camel-decl.txt			\</div><div class='del'>-	camel-sections.txt</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(camel_doc_DATA)</div><div class='del'>-</div><div class='del'>-camel.html: html/book1.html</div><div class='del'>-	-cd $(srcdir) &amp;&amp; cp html/book1.html camel.html</div><div class='del'>-</div><div class='del'>-html/book1.html: sgml/camel-doc.bottom</div><div class='del'>-	$(MAKE) html</div><div class='del'>-</div><div class='del'>-sgml/camel-doc.bottom: $(tmpl_sources)</div><div class='del'>-	$(MAKE) sgml</div><div class='del'>-</div><div class='del'>-camel-scan.c:</div><div class='del'>-</div><div class='del'>-scan: camel-scan.c				</div><div class='del'>-	CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) gtkdoc-scanobj --module=$(DOC_MODULE)</div><div class='del'>-	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)</div><div class='del'>-</div><div class='del'>-templates: scan</div><div class='del'>-	gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-sgml: </div><div class='del'>-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)</div><div class='del'>-</div><div class='del'>-html: </div><div class='del'>-	if ! test -d html ; then mkdir html ; fi</div><div class='del'>-	-cd html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt camel.html</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt Makefile.in </div><div class='del'>-</div><div class='del'>-install-data-local: </div><div class='del'>-	$(mkinstalldirs) $(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \</div><div class='del'>-	  echo '-- Fixing Crossreferences' ; \</div><div class='del'>-	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	mkdir $(distdir)/html</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	mkdir $(distdir)/tmpl</div><div class='del'>-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html</div><div class='del'>-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl</div><div class='del'>-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml</div><div class='del'>-	-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-.PHONY : html sgml templates scan</div><div class='head'>diff --git a/devel-docs/camel/README_AND_TODO.txt b/devel-docs/camel/README_AND_TODO.txt<br/>deleted file mode 100644<br/>index 5feeb1e4e9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/README_AND_TODO.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/README_AND_TODO.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-Camel is currently (conceptualy) separated in four parts:</div><div class='del'>-</div><div class='del'>-* the session handling </div><div class='del'>-* the storage mechanism.</div><div class='del'>-* the (mime) message handling.</div><div class='del'>-* some general utilities class/functions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Session handling </div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-(This is not gnome session managing related)</div><div class='del'>-CamelSession is an object used to store some parameters on a user</div><div class='del'>-basis. This can be a permanent (fs based) or volatile </div><div class='del'>-(ram only) storage depending on user preferences. </div><div class='del'>-The session object is, for example, responsible for </div><div class='del'>-remembering authentication datas during application lifetime.</div><div class='del'>-It is also responsible for selecting and loading providers </div><div class='del'>-corresponding to protocols. In the case where only one </div><div class='del'>-provider exists for a given protocol, the task is trivial, </div><div class='del'>-but when multiple providers exist for a given protocol, the</div><div class='del'>-user can choose their prefered one. Given its relationship</div><div class='del'>-with providers, the session object is also used to instanciate</div><div class='del'>-a store given an URL.</div><div class='del'>-</div><div class='del'>-Associated Classes:</div><div class='del'>-  CamelSession </div><div class='del'>-    implementation: 5%</div><div class='del'>-</div><div class='del'>-Associated Files:</div><div class='del'>-  camel-provider.[ch]</div><div class='del'>-    implementation: 2.5% (a struct in camel-provider.h)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* the storage mechanism.</div><div class='del'>-------------------------</div><div class='del'>-</div><div class='del'>-The storage mechanism is  mainly represented by </div><div class='del'>-the Store class and the Folder class. </div><div class='del'>-* the (mime) message handling.</div><div class='del'>-* some general utilities class/functions.</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/camel-docs.sgml b/devel-docs/camel/camel-docs.sgml<br/>deleted file mode 100644<br/>index 33c6623731..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/camel-docs.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/camel-docs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-&lt;!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity CamelDataWrapper SYSTEM "sgml/camel-data-wrapper.sgml"&gt;</div><div class='del'>-&lt;!entity CamelFolder SYSTEM "sgml/camel-folder.sgml"&gt;</div><div class='del'>-&lt;!entity CamelMimeMessage SYSTEM "sgml/camel-mime-message.sgml"&gt;</div><div class='del'>-&lt;!entity CamelMimePart SYSTEM "sgml/camel-mime-part.sgml"&gt;</div><div class='del'>-&lt;!entity CamelRecipient SYSTEM "sgml/camel-recipient.sgml"&gt;</div><div class='del'>-&lt;!entity CamelService SYSTEM "sgml/camel-service.sgml"&gt;</div><div class='del'>-&lt;!entity CamelStore SYSTEM "sgml/camel-store.sgml"&gt;</div><div class='del'>-&lt;!entity CamelStream SYSTEM "sgml/camel-stream.sgml"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;book&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;Camel Messaging Library Reference Manual&lt;/title&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter id="camel-objects"&gt;</div><div class='del'>-    &lt;title&gt;Camel Objects&lt;/title&gt;</div><div class='del'>-    &amp;CamelMimeMessage;</div><div class='del'>-    &amp;CamelService;</div><div class='del'>-    &amp;CamelStore;</div><div class='del'>-    &amp;CamelFolder;</div><div class='del'>-    &amp;CamelMimePart;</div><div class='del'>-    &amp;CamelDataWrapper;</div><div class='del'>-    &amp;CamelRecipient;</div><div class='del'>-</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/devel-docs/camel/camel-sections.txt b/devel-docs/camel/camel-sections.txt<br/>deleted file mode 100644<br/>index 1f6d45c03c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/camel-sections.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/camel-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;gnome.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;INCLUDE&gt;camel-data-wrapper.h&lt;/INCLUDE&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-data-wrapper&lt;/FILE&gt;</div><div class='del'>-CamelDataWrapper</div><div class='del'>-&lt;TITLE&gt;CamelDataWrapper&lt;/TITLE&gt;</div><div class='del'>-camel_data_wrapper_write_to_stream</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_DATA_WRAPPER</div><div class='del'>-camel_data_wrapper_get_type</div><div class='del'>-CAMEL_DATA_WRAPPER_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-recipient&lt;/FILE&gt;</div><div class='del'>-CamelRecipientTable</div><div class='del'>-&lt;TITLE&gt;CamelRecipientTable&lt;/TITLE&gt;</div><div class='del'>-camel_recipient_table_new</div><div class='del'>-camel_recipient_table_get</div><div class='del'>-camel_recipient_table_add</div><div class='del'>-camel_recipient_table_add_list</div><div class='del'>-camel_recipient_table_remove</div><div class='del'>-camel_recipient_table_ref</div><div class='del'>-camel_recipient_table_unref</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-mime-part&lt;/FILE&gt;</div><div class='del'>-CamelMimePart</div><div class='del'>-&lt;TITLE&gt;CamelMimePart&lt;/TITLE&gt;</div><div class='del'>-camel_mime_part_add_header</div><div class='del'>-camel_mime_part_set_content_object</div><div class='del'>-camel_mime_part_set_filename</div><div class='del'>-camel_mime_part_get_disposition</div><div class='del'>-camel_mime_part_get_content_MD5</div><div class='del'>-camel_mime_part_get_encoding</div><div class='del'>-camel_mime_part_set_header_lines</div><div class='del'>-camel_mime_part_get_content_object</div><div class='del'>-camel_mime_part_get_content_id</div><div class='del'>-camel_mime_part_set_description</div><div class='del'>-camel_mime_part_set_text</div><div class='del'>-camel_mime_part_set_encoding</div><div class='del'>-camel_mime_part_set_disposition</div><div class='del'>-camel_mime_part_remove_header</div><div class='del'>-camel_mime_part_get_filename</div><div class='del'>-camel_mime_part_get_content_languages</div><div class='del'>-camel_mime_part_set_content_languages</div><div class='del'>-camel_mime_part_get_header_lines</div><div class='del'>-camel_mime_part_get_description</div><div class='del'>-camel_mime_part_get_header</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_MIME_PART</div><div class='del'>-camel_mime_part_get_type</div><div class='del'>-CAMEL_MIME_PART_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-mime-message&lt;/FILE&gt;</div><div class='del'>-CamelMimeMessage</div><div class='del'>-&lt;TITLE&gt;CamelMimeMessage&lt;/TITLE&gt;</div><div class='del'>-camel_mime_message_remove_recipient</div><div class='del'>-camel_mime_message_get_recipients</div><div class='del'>-camel_mime_message_set_flag</div><div class='del'>-camel_mime_message_set_subject</div><div class='del'>-camel_mime_message_get_reply_to</div><div class='del'>-camel_mime_message_get_from</div><div class='del'>-camel_mime_message_set_reply_to</div><div class='del'>-camel_mime_message_get_sent_date</div><div class='del'>-camel_mime_message_new_with_session</div><div class='del'>-camel_mime_message_add_recipient</div><div class='del'>-camel_mime_message_get_subject</div><div class='del'>-camel_mime_message_set_from</div><div class='del'>-camel_mime_message_get_flag</div><div class='del'>-camel_mime_message_get_message_number</div><div class='del'>-camel_mime_message_get_received_date</div><div class='del'>-camel_mime_message_set_received_date</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_MIME_MESSAGE</div><div class='del'>-camel_mime_message_get_type</div><div class='del'>-CAMEL_MIME_MESSAGE_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-folder&lt;/FILE&gt;</div><div class='del'>-CamelFolder</div><div class='del'>-&lt;TITLE&gt;CamelFolder&lt;/TITLE&gt;</div><div class='del'>-camel_folder_get_folder</div><div class='del'>-camel_folder_create</div><div class='del'>-camel_folder_delete</div><div class='del'>-camel_folder_delete_messages</div><div class='del'>-camel_folder_get_parent_folder</div><div class='del'>-camel_folder_get_parent_store</div><div class='del'>-camel_folder_get_mode</div><div class='del'>-camel_folder_list_subfolders</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_FOLDER</div><div class='del'>-camel_folder_get_type</div><div class='del'>-CAMEL_FOLDER_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-service&lt;/FILE&gt;</div><div class='del'>-CamelService</div><div class='del'>-&lt;TITLE&gt;CamelService&lt;/TITLE&gt;</div><div class='del'>-camel_service_connect</div><div class='del'>-camel_service_is_connected</div><div class='del'>-camel_service_connect_to_with_login_passwd</div><div class='del'>-camel_service_connect_to_with_login_passwd_port</div><div class='del'>-camel_service_get_url</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_SERVICE</div><div class='del'>-camel_service_get_type</div><div class='del'>-CAMEL_SERVICE_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-store&lt;/FILE&gt;</div><div class='del'>-CamelStore</div><div class='del'>-&lt;TITLE&gt;CamelStore&lt;/TITLE&gt;</div><div class='del'>-camel_store_get_separator</div><div class='del'>-camel_store_get_folder</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_STORE</div><div class='del'>-camel_store_get_type</div><div class='del'>-CAMEL_STORE_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;camel-stream&lt;/FILE&gt;</div><div class='del'>-CamelStream</div><div class='del'>-&lt;TITLE&gt;CamelStream&lt;/TITLE&gt;</div><div class='del'>-camel_stream_seek</div><div class='del'>-camel_stream_write</div><div class='del'>-camel_stream_flush</div><div class='del'>-camel_stream_eos</div><div class='del'>-camel_stream_write_string</div><div class='del'>-camel_stream_close</div><div class='del'>-camel_stream_write_strings</div><div class='del'>-camel_stream_read</div><div class='del'>-camel_stream_available</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAMEL_STREAM</div><div class='del'>-camel_stream_get_type</div><div class='del'>-CAMEL_STREAM_CLASS</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/camel.types b/devel-docs/camel/camel.types<br/>deleted file mode 100644<br/>index 93142d8692..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/camel.types?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/camel.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;camel/camel-data-wrapper.h&gt;</div><div class='del'>-camel_data_wrapper_get_type</div><div class='del'>-camel_folder_get_type</div><div class='del'>-camel_mime_message_get_type</div><div class='del'>-camel_mime_part_get_type</div><div class='del'>-camel_service_get_type</div><div class='del'>-camel_store_get_type</div><div class='del'>-camel_stream_get_type</div><div class='head'>diff --git a/devel-docs/camel/tmpl/.cvsignore b/devel-docs/camel/tmpl/.cvsignore<br/>deleted file mode 100644<br/>index 29db8d052d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-camel-unused.sgml</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-data-wrapper.sgml b/devel-docs/camel/tmpl/camel-data-wrapper.sgml<br/>deleted file mode 100644<br/>index 6fce9eb128..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-data-wrapper.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-data-wrapper.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelDataWrapper</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-data container with streaming methods</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-A CamelDataWrapper is wrapper around data which can save them to a stream</div><div class='del'>-and restore them from a stream. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_data_wrapper_write_to_stream ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@data_wrapper: </div><div class='del'>-@stream: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-folder.sgml b/devel-docs/camel/tmpl/camel-folder.sgml<br/>deleted file mode 100644<br/>index 882d63499c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-folder.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-folder.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelFolder</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-Represents a folder of messages on a store.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-CamelFolder represents a folder in a message store. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelFolder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@folder_name: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_create ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_delete ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@recurse: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_delete_messages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_parent_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_parent_store ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_mode ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_list_subfolders ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-mime-message.sgml b/devel-docs/camel/tmpl/camel-mime-message.sgml<br/>deleted file mode 100644<br/>index 704f3d3572..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-mime-message.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-mime-message.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelMimeMessage</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelMimeMessage ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_remove_recipient ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_recipients ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_flag ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@flag: </div><div class='del'>-@value: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_subject ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@subject: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_reply_to ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_from ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_reply_to ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@reply_to: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_sent_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_new_with_session ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@session: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_add_recipient ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_subject ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_from ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@from: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_flag ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@flag: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_message_number ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_received_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_received_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@received_date: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-mime-part.sgml b/devel-docs/camel/tmpl/camel-mime-part.sgml<br/>deleted file mode 100644<br/>index 2db158b25f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-mime-part.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-mime-part.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,151 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelMimePart</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_filename ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@filename: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_disposition ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_MD5 ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_encoding ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_header_lines ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@header_lines: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@description: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_text ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@camel_mime_part: </div><div class='del'>-@text: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_encoding ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@encoding: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_disposition ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@disposition: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_filename ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_languages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_content_languages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@content_languages: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_header_lines ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-recipient.sgml b/devel-docs/camel/tmpl/camel-recipient.sgml<br/>deleted file mode 100644<br/>index 4af84cf58e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-recipient.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-recipient.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelRecipientTable</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelRecipientTable ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_hash_table: </div><div class='del'>-@ref_count: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_unref ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_get ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_add ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_remove ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_add_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_ref ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-service.sgml b/devel-docs/camel/tmpl/camel-service.sgml<br/>deleted file mode 100644<br/>index 5b51ea902e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-service.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-service.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelService</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelService ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@e: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_is_connected ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect_to_with_login_passwd ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@host: </div><div class='del'>-@login: </div><div class='del'>-@passwd: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect_to_with_login_passwd_port ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@host: </div><div class='del'>-@login: </div><div class='del'>-@passwd: </div><div class='del'>-@port: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_get_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-store.sgml b/devel-docs/camel/tmpl/camel-store.sgml<br/>deleted file mode 100644<br/>index 2882c09986..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-store.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-store.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelStore</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-A class representing a message (local or distant) repository</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The store class models a place where messages can be stored and retreived. It can be a local </div><div class='del'>-store (for example an mbox-style store) or a distant server (for example an POP3 server). Messages are</div><div class='del'>-not retreived or stored directly with a CamelStore object. Instead, a CamelFolder object must be</div><div class='del'>-obtained from the store first. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelStore ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_store_get_separator ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@store: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_store_get_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@store: </div><div class='del'>-@folder_name: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-stream.sgml b/devel-docs/camel/tmpl/camel-stream.sgml<br/>deleted file mode 100644<br/>index e965db2e45..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-stream.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/camel/tmpl/camel-stream.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelStream</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_seek ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@offset: </div><div class='del'>-@policy: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_write ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@buffer: </div><div class='del'>-@n: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_flush ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_eos ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO camel_stream_write_string ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@string: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_close ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_write_strings ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Varargs: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_read ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@buffer: </div><div class='del'>-@n: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_available ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/misc/ref_and_id_proposition.txt b/devel-docs/misc/ref_and_id_proposition.txt<br/>deleted file mode 100644<br/>index 2127b45a57..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/misc/ref_and_id_proposition.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/misc/ref_and_id_proposition.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-Author: Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-Date: August 9th 1999</div><div class='del'>-Last revision date : September 3rd 1999</div><div class='del'>-Version: 0.2</div><div class='del'>-</div><div class='del'>-The last version of this document is always available in gnome CVS in</div><div class='del'>-the gnome-mailer module: devel-docs/misc/ref_and_id_proposition.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-A) Identifying messages within folders</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-Currently, in Camel there is only one way to retrieve a message from a</div><div class='del'>-mail store:</div><div class='del'>-     CamelMimeMessage * </div><div class='del'>-     get_message (CamelFolder *folder, gint number)</div><div class='del'>-</div><div class='del'>-where number is an integer representing the message rank within its</div><div class='del'>-parent folder.</div><div class='del'>-</div><div class='del'>-This is a traditional method (JavaMail, MAPI) and it is very useful</div><div class='del'>-because this is often the only way to get a message in from a</div><div class='del'>-classical store (pop3 for example).</div><div class='del'>-</div><div class='del'>-Moreover, various documents ([1], [2]) proposed to generalize the URL</div><div class='del'>-scheme used in Camel ([3]) to access mail stores in order to identify</div><div class='del'>-messages. Such an URL would be, for instance:</div><div class='del'>-</div><div class='del'>-pop3://po.myisp.com:1</div><div class='del'>-</div><div class='del'>-Meaning: "Access message 1 on Pop3 server po.myisp.com"</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-However, referencing a message with its number within a folder is a</div><div class='del'>-very unreliable method:</div><div class='del'>-</div><div class='del'>-1) Message order in a folder can change during a session: </div><div class='del'>-   </div><div class='del'>-   The user can move or remove messages from the folder, thus</div><div class='del'>-   completely changing message numbers.  We could however imagine to</div><div class='del'>-   follow message operations in order to keep camel in a coherent</div><div class='del'>-   state at each time instant. This could be quite complex but may</div><div class='del'>-   be feasible using gtk signal system.</div><div class='del'>-</div><div class='del'>-2) Message order can change between sessions:</div><div class='del'>-</div><div class='del'>-   Gnome-mailer was designed from the begining to allow messages to be</div><div class='del'>-   stored in classical mailboxes (mbox, maildir, MH, IMAP ...), in</div><div class='del'>-   order to allow users to run other MUA on their mailboxes if</div><div class='del'>-   necessary.  These other MUA can change message order within folders</div><div class='del'>-   without any chance for Camel to trace the operations.</div><div class='del'>-   </div><div class='del'>-These two scenarii show that it is quite impossible to use reliable</div><div class='del'>-folder caching or message referencing if messages are referenced only</div><div class='del'>-by their position within their parent folder.</div><div class='del'>-   </div><div class='del'>-</div><div class='del'>-We thus have to find a general way to identify and retreive a message</div><div class='del'>-within its folder. One thing is sure, however: all folders</div><div class='del'>-implementation won't allow this method. Pop3 stores will always access</div><div class='del'>-messages using their rank on the server. MUA using Camel will thus</div><div class='del'>-have to be prepared to access some stores providing only the old</div><div class='del'>-fashionned message number access method.</div><div class='del'>-</div><div class='del'>-Basically, we have two choices:</div><div class='del'>-</div><div class='del'>-1) Accessing messages using (mailbox) Unique ID (UID)</div><div class='del'>-</div><div class='del'>-   A UID is a string identifier associated to a message, which is</div><div class='del'>-   guaranteed to be unique within its parent folder and which will not</div><div class='del'>-   change between sessions.</div><div class='del'>-</div><div class='del'>-2) Accessing messages using Message ID</div><div class='del'>-</div><div class='del'>-   A Message ID is a string identifier associated to a messages which</div><div class='del'>-   is guaranteed to be unique in the world, that is, no other message</div><div class='del'>-   can have the same Message ID. The message ID is defined in RFC 822,</div><div class='del'>-   and is stored as the message header "Message-id"</div><div class='del'>-   </div><div class='del'>-Method (1) already exists in IMAP.  </div><div class='del'>-It is quite simple to define on local stores (MH, mbox, ....) but it</div><div class='del'>-may not resist to message modification by other MUA.</div><div class='del'>-Methods based on Message-id matching or message content checksum seem</div><div class='del'>-to be the best one. Using an "X-" header is another possibility for</div><div class='del'>-non read-only folders. A combination of these three methods may be the</div><div class='del'>-most reliable solution.</div><div class='del'>-The UID is impossible to implement in a POP3 store provider.</div><div class='del'>-</div><div class='del'>-(2) Can be used with IMAP, but would be very ineficient. </div><div class='del'>-The main issue with this method is its dependancy upon other MUAs and</div><div class='del'>-MTAs. Message-id is set before or during message transport. Moreover,</div><div class='del'>-some rfc822 compliant messages may not even have any Message-id</div><div class='del'>-header.</div><div class='del'>-These are major issues when accessing read-only stores.  </div><div class='del'>-The M-ID is also impossible to implement in a POP3 store provider.</div><div class='del'>-   </div><div class='del'>-</div><div class='del'>-We may not rely on external MUA and MTA to guarentee the uniqueness of</div><div class='del'>-the identifier . We may loose messages by never being able to read them</div><div class='del'>-if two had the same uid. It would be possible to find workarounds, but</div><div class='del'>-it could make Camel use a bit tricky.</div><div class='del'>-</div><div class='del'>-Given that most users will use IMAP or a database based store as their</div><div class='del'>-main mail store, and given that this stores allow UID very</div><div class='del'>-easily, I suggest that we use method (1). Discussion is still open,</div><div class='del'>-though.</div><div class='del'>-</div><div class='del'>-Here are the public methods I propose to add to CamelFolder:</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_supports_uid (CamelFolder *folder)</div><div class='del'>-    returns true if the folder can get messages </div><div class='del'>-    by their uid.</div><div class='del'>-</div><div class='del'>-gchar * camel_folder_get_uid_by_number (CamelFolder *folder, gint message_number)</div><div class='del'>-    return the uid of message which number in the folder</div><div class='del'>-    is %message_number.</div><div class='del'>-</div><div class='del'>-gchar * camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message)</div><div class='del'>-    return the uid of the message within the folder.</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_folder_get_message_by_uid  (CamelFolder *folder, gchar *uid)</div><div class='del'>-    return the message which uid is %uid</div><div class='del'>-</div><div class='del'>-In addition, the CamelMessage Class will have a new public method</div><div class='del'>-</div><div class='del'>-gchar * camel_mime_message_get_uid (CamelMimeMessage *message) </div><div class='del'>-    return the uid associated to the message in its physical parent</div><div class='del'>-    folder.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-B) Handling message references in (v)folders.</div><div class='del'>----------------------------------------------</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-We want the future Gnome mailer to be able to build (virtual) folders</div><div class='del'>-holding references to messages physically located in other</div><div class='del'>-folders. More generally, we would like folders to be able to hold:</div><div class='del'>-</div><div class='del'>-1) messages</div><div class='del'>-2) subfolders</div><div class='del'>-3) references to messages</div><div class='del'>-</div><div class='del'>-(1) and (2) are already implemented in Camel because most mail stores</div><div class='del'>-can hold messages and/or subfolders.</div><div class='del'>-</div><div class='del'>-(3) is a different issue, because no existing mail store can currently</div><div class='del'>-hold, within folders, references to messages in other folders.</div><div class='del'>-It will thus be a specific gnome-mailer extension. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-One of the main issue is to determine what kind of behaviour we expect</div><div class='del'>-from folders holding references. Here is a possible API.</div><div class='del'>-</div><div class='del'>-( the world (v)folder is used to distinguish between the physical</div><div class='del'>-parent folder and the folder holding a reference to the message, when</div><div class='del'>-a confusion may arise)</div><div class='del'>-</div><div class='del'>-Addition to CamelFolder:</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_can_hold_references (CamelFolder *folder)</div><div class='del'>-    return true if the folder can contain references</div><div class='del'>-</div><div class='del'>-void camel_folder_add_reference_by_uid (CamelFolder *folder, gchar *folder_url, gchar *message_uid)</div><div class='del'>-    add a reference into a folder. %folder_url is the url of </div><div class='del'>-    the folder, %message_uid is the uid of the message within </div><div class='del'>-    its physical parent folder.</div><div class='del'>- </div><div class='del'>-void camel_folder_add_reference_by_message (CamelFolder *folder, CamelMessage *message)</div><div class='del'>-    add a reference. The place where the reference points </div><div class='del'>-    to is found using CamelMessage methods</div><div class='del'>-</div><div class='del'>-void camel_folder_remove_reference_by_uid (CamelFolder *folder, gchar *uid)</div><div class='del'>-    remove a message reference form a folder. Reference </div><div class='del'>-    is identified using its uid within the folder.</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_uid_is_reference (CamelFolder *folder, gchar *uid)</div><div class='del'>-    return true if the message corresponding to the uid is a reference.</div><div class='del'>-</div><div class='del'>-Then all usual operations on the folder act if the message was</div><div class='del'>-actually physically stored in this folder. For example, when the mailer</div><div class='del'>-uses camel_folder_get_message_by_uid onto the (v)folder, the actual</div><div class='del'>-message is retreived from its physical store.</div><div class='del'>-</div><div class='del'>-As you can see, the uid of the message within its physical parent</div><div class='del'>-folder is different than its uid within the (v)folder. This is because</div><div class='del'>-there is no way to guarantee that the uids of two messages in two</div><div class='del'>-different folders would be different. Using references on this two</div><div class='del'>-message in the same vfolder would break uniqueness of the uid in the</div><div class='del'>-(v)folder.</div><div class='del'>-</div><div class='del'>-A couple of other methods could be defined but all the basics are</div><div class='del'>-described here.  </div><div class='del'>-</div><div class='del'>-This draft API is far from complete nor perfect, and is described here</div><div class='del'>-only to stimulate discussions before the actual implementation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The question now is to know how we store references. There are basically </div><div class='del'>-two ways:</div><div class='del'>-</div><div class='del'>-1) references are stored using the URL of the physical folder</div><div class='del'>-   and the uid of the message within the folder</div><div class='del'>-</div><div class='del'>-2) a list of reference is kept, and in this list, reference are stored</div><div class='del'>-as in (1). Folders would refer to the actual message using index in</div><div class='del'>-the list</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   </div><div class='del'>-The main problem with (1) is that references get lost as soon</div><div class='del'>-as the actual message is moved. There is no way to find in which</div><div class='del'>-folders references to the message exist. </div><div class='del'>-</div><div class='del'>-(2) is a way to solve this issue. When messages are used, Camel looks</div><div class='del'>-in the list to see if the message is refered somewhere, and actualize </div><div class='del'>-the URL and the uid with their new values. </div><div class='del'>-</div><div class='del'>-The problem with (2) is that we need to keep this information in a file</div><div class='del'>-and libraries writing automatically to files are generally a bad idea.</div><div class='del'>-</div><div class='del'>-As in additional remark, it is clear that Camel will only be able to</div><div class='del'>-hold references to messages on stores supporting UIDs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Thanks in advance for your comments and ideas,</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       Bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-[1] : http://www.selequa.com/%7epurp/gnomail/mail2db.html </div><div class='del'>-[2] : http://www.selequa.com/%7epurp/gnomail/dbRecFmt.html </div><div class='del'>-[3] : http://www.gnome.org/mailing-lists/archives/gnome-mailer-list/1999-April/0248.shtml</div><div class='head'>diff --git a/devel-docs/query/virtual-folder-in-depth.sgml b/devel-docs/query/virtual-folder-in-depth.sgml<br/>deleted file mode 100644<br/>index d3e3e0504b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/query/virtual-folder-in-depth.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/query/virtual-folder-in-depth.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,407 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- SGMLized by Bertrand &lt;Bertrand.Guiheneuf@aful.org&gt; --&gt;</div><div class='del'>-</div><div class='del'>-&lt;article id="index"&gt;</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Giao&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Nguyen&lt;/surname&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;title&gt;An in-depth look at the virtual folder mechanism&lt;/title&gt;</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This document describes a different way of approaching mail</div><div class='del'>-	organization and how all things are possible in this brave new</div><div class='del'>-	world. This document does not describe physical storage issues</div><div class='del'>-	nor interface issues.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Historically mail has been organized into folders. These</div><div class='del'>-	folders usually mapped to a single storage medium. The</div><div class='del'>-	relationship between mail organization and storage medium was</div><div class='del'>-	one to one. There was one mail organization for every storage</div><div class='del'>-	medium. This scheme had its limitations.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	Efforts at categorizations are only meaningful at the instance that</div><div class='del'>-	one categorized. To find any piece of data, regardless of how well</div><div class='del'>-	it was categorized, required some amount of searching. Therefore, any</div><div class='del'>-	attempts to nullify searching is doomed to fail. It's time to embrace</div><div class='del'>-	searching as a way of life.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	These are the terms and their definitions. The example rules used are</div><div class='del'>-	based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle</div><div class='del'>-	Jones whose ideas form the basis for this. I'm only adding the</div><div class='del'>-	existence of summary files to aid in scaling. I currently use VM and</div><div class='del'>-	it's virtual-folder rules for my daily mail purposes. To date, my only </div><div class='del'>-	complaints are speed (it has no caches) and for the unitiated, it's</div><div class='del'>-	not very user-friendly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	Comments, questions, rants, etc. should be directed at Giao Nguyen</div><div class='del'>-	(grail@cafebabe.org) who will try to address issues in a timely</div><div class='del'>-	manner.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Definitions --&gt;</div><div class='del'>-  &lt;sect1 id="definitions"&gt;</div><div class='del'>-    &lt;title&gt;Definitions&lt;/title&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Store&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A location where mail can be found. This may be a file (Berkeley</div><div class='del'>-	mbox), directory (MH), IMAP server, POP3 server, Exchange server,</div><div class='del'>-	Lotus Notes server, a stack of Post-Its by your monitor fed through</div><div class='del'>-	some OCR system.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Message&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	An individual mail message.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Vfolder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	A group of messages sharing some commonality. This is the result of a</div><div class='del'>-	query. The vfolder maybe contained in a store, but it is not necessary</div><div class='del'>-	that a store holds only one vfolder. There is always an implicit</div><div class='del'>-	vfolder rule which matches all messages. A store contains the vfolder</div><div class='del'>-	which is the result of the query (any). It's short for virtual folder</div><div class='del'>-	or maybe view folder. I dunno.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Default-vfolder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	The vfolder defined by (any) applied to the store. This is not the</div><div class='del'>-	inbox. The inbox could easily be defined by a query. A default rule</div><div class='del'>-	for the inbox could be (new) but it doesn't have to be. Mine happens</div><div class='del'>-	to be (or (unread) (new)).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Folder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	The classical mail folder approach: one message organization per</div><div class='del'>-	store.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Query&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	A search for messages. The result of this is a vfolder. There are two</div><div class='del'>-	kinds of queries: named queries and lambda queries. More on this</div><div class='del'>-	later.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Summary file &lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	An external file that contains pointers to messages which are matches</div><div class='del'>-	for a named query. In addition to pointers, the summary file should</div><div class='del'>-	also contain signatures of the store for sanity checks. When the term</div><div class='del'>-	"index" is used as a verb, it means to build a summary file for a</div><div class='del'>-	given name-value pair.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Queries --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Queries&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;  </div><div class='del'>-      Named queries are analogous to classical mail folders. Because named</div><div class='del'>-      queries maybe reused, summary files are kept as caches to reduce</div><div class='del'>-      the overall cost of viewing a vfolder. Summary files are superior to</div><div class='del'>-      folders in that they allow for the same messages to appear in multiple</div><div class='del'>-      vfolders without message duplications. Duplications of messages</div><div class='del'>-      defeats attempts at tagging a message with additional user information</div><div class='del'>-      like annotations. Named queries will define folders.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Lambda queries are similar to named queries except that they have no</div><div class='del'>-      name. These are created on the fly by the user to filter out or</div><div class='del'>-      include certain messages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      All queries can be layered on top of each other. A lambda query can be </div><div class='del'>-      layered on a named query and a named query can be layered on a lambda</div><div class='del'>-      query. The possibilities are endless.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The layerings can be done as boolean operations (and, or, not). Short</div><div class='del'>-      circuiting should be used. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Examples:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(and (author "Giao")</div><div class='del'>-  (unread))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      The (unread) query should only be evaluated on the results of (author</div><div class='del'>-      "Giao").</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(or (author "Giao")</div><div class='del'>-  (unread))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Both of these queries should be evaluated. Any matches are added to the</div><div class='del'>-      resulting vfolder.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Summary files --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Summary files&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;    </div><div class='del'>-      Summary files are only meaningful when applied to the context of the</div><div class='del'>-      default-vfolder of a store.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Summary files should be generated for queries of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(function "constant value")</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Summary files should never be generated for queries of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-	(function (function1))</div><div class='del'>-	</div><div class='del'>-	(and (function "value")</div><div class='del'>-	(another-function "another value"))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Given a query of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-	(and (function "value")</div><div class='del'>-	(another-function "another value"))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      The system should use one summary file for (function "value") and</div><div class='del'>-      another summary file for (another-function "another value"). I will</div><div class='del'>-      call the prior form the "plain form".</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      It should be noted that the signature of the store should be based on</div><div class='del'>-      the assumption that new data may have been added to the store since</div><div class='del'>-      the application generated the summary file. Signatures generated on</div><div class='del'>-      the entirety of the store will most likely be meaningless for things</div><div class='del'>-      like POP/IMAP servers. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Incremental Indexing --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Incremental indexing&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      When new messages are detected, all known queries should be evaluated</div><div class='del'>-      on the new messages. vfolders should be notified of new messages that</div><div class='del'>-      are positive matches for their queries. The indexes generated by this</div><div class='del'>-      process should be merged into the current indexes for the vfolder.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Can I have multiple stores --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Can I have multiple stores?&lt;/title&gt; </div><div class='del'>-    &lt;para&gt; </div><div class='del'>-      I don't see why not. Again, the inbox is a vfolder so you can get a</div><div class='del'>-      unified inbox consisting of all new mail sent to all your stores or</div><div class='del'>-      your can get inboxes for each store or any combination your heart</div><div class='del'>-      desire. You get your cake, eat it, and someone else cleans the dishes!</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Why all this? --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Why all this?&lt;/title&gt; </div><div class='del'>-    &lt;para&gt; </div><div class='del'>-      Consider the dynamic nature of the following query:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(and (author "Giao")</div><div class='del'>-  (sent-after (today-midnight)))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      today-midnight would be a function that is evaluated at run-time to</div><div class='del'>-      calculate the appropriate object.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Scenarios of usage and their solutions --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Scenarios of usage and their solutions&lt;/title&gt; </div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Mesage alterations&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This is a fuzzy area that should be left to the UI to handle. Messages </div><div class='del'>-	are altered. Read status are altered when a new message is read for</div><div class='del'>-	example. How do we handle this if our query is for unread messages?</div><div class='del'>-	Upon viewing the state would change.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	One idea is to not evaluate the queries unless we're changing between</div><div class='del'>-	vfolder views. This assumes that one can only view a particular</div><div class='del'>-	vfolder at a time. For multi-vfolder viewing, a message change should</div><div class='del'>-	propagate through the vfolder system. Certain effects (as in our</div><div class='del'>-	example) would not be intuitive.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-	It would not be a clean solution to make special cases but they may be </div><div class='del'>-	necessary where certain defined fields are ignored when they are</div><div class='del'>-	changed. Some combination of the above rules can be used. I don't</div><div class='del'>-	think it's an easy solution.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Message inclusion and exclusion&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Messages are included and excluded also with queries. The final query</div><div class='del'>-	will have the form of:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  (and (author "Giao")</div><div class='del'>-	  (criteria value)</div><div class='del'>-	  (not (criteria other-value)))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	Userland criterias may be a label of some sort. These may be userland</div><div class='del'>-	labels or Message-IDs. What are the performance issues involved in</div><div class='del'>-	this? With short circuiting, it's not a major problem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	The criterias and values are determined by the UI. The vfolder</div><div class='del'>-	mechanism isn't concerned with such issues.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;   </div><div class='del'>-	Messages can be included and excluded at will. The idea is often</div><div class='del'>-	called "arbitrary inclusion/exclusion". This can be done by</div><div class='del'>-	Message-IDs or other fields. It's been noted that Message-IDs are not</div><div class='del'>-	unique. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	I propose that any given vfolder is allocated an inclusion label and an </div><div class='del'>-	exclusion label. These should be randomly generated. This should be</div><div class='del'>-	part of the vfolder description. It should be noted that the vfolder</div><div class='del'>-	description has not been drafted yet.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;   </div><div class='del'>-	The result is such that the rules for a given named query is:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  (and (user-query)</div><div class='del'>-	  (label inclusion-label)</div><div class='del'>-	  (not exclusion-label))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Query scheduling&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Consider the following extremely dynamic queries:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  A:</div><div class='del'>-	  (and (author "Giao")</div><div class='del'>-	  (sent-after (today-midnight)))</div><div class='del'>-	  </div><div class='del'>-	  B:</div><div class='del'>-	  (and (sent-after (today-midnight))</div><div class='del'>-	  (author "Giao"))</div><div class='del'>-	  </div><div class='del'>-	  C:</div><div class='del'>-	  (or (author "Giao")</div><div class='del'>-	  (sent-after (today-midnight)))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	Query A would be significantly faster because (author "Giao") is not</div><div class='del'>-	dynamic. A summary file could be generated for this query. Query B is</div><div class='del'>-	slow and can be optimized if there was a query compiler of some</div><div class='del'>-	sort. Query C demonstrates a query in which there is no good</div><div class='del'>-	optimization which can be applied. These come with a certain amount of</div><div class='del'>-	baggage.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	It seems then that for boolean 'and' operations, plain forms should be </div><div class='del'>-	moved forward and other queries should be moved such that they are</div><div class='del'>-	evaluated later. I would expect that the majority of queries would be</div><div class='del'>-	of the plain form.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	First is that the summary file is tied to the query and the store</div><div class='del'>-	where the query originates from. Second, a hashing function for</div><div class='del'>-	strings needs to be calculated for the query so that the query and the </div><div class='del'>-	summary file can be associated. This hashing function could be similar </div><div class='del'>-	to the hashing function described in Rob Pike's "The Practice of</div><div class='del'>-	Programming". (FIXME: Stick page number here)</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Archives&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Many people are concerned that archives won't be preserved, archives</div><div class='del'>-	aren't supported, and many other archive related issues. This is the</div><div class='del'>-	short version.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	Archives are just that, archives. Archives are stores. Take your</div><div class='del'>-	vfolder, export it to a store. You are done. If you load up the store</div><div class='del'>-	again, then the default-vfolder of that store is the view of the</div><div class='del'>-	vfolder, except the query is different.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	The point to vfolder is not to do away with classical folder</div><div class='del'>-	representation but to move the queries to the front where it would</div><div class='del'>-	make data management easier for people who don't think in terms of</div><div class='del'>-	files but in terms of queries because ordinary people don't think in</div><div class='del'>-	terms of files.</div><div class='del'>-      &lt;/para&gt;    </div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Miscellany --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Miscellany&lt;/title&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Annotations&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	There should be a scheme to add annotations to messages. Common mail</div><div class='del'>-	user agents have used a tag in the message header to mark messages as</div><div class='del'>-	read/unread for example. Extending on this we have the ability to add</div><div class='del'>-	our own data to a message to add meaning to it. If we have a good</div><div class='del'>-	scheme for doing this, new possibilities are opened.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;sect3&gt;</div><div class='del'>-	&lt;title&gt;Keywords&lt;/title&gt;  </div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  When sending a message, a message could have certain keywords attached </div><div class='del'>-	  to it. While this can be done with the subject line, the subject line</div><div class='del'>-	  has a tendency to be munged by other mail applications. One popular</div><div class='del'>-	  example is the "[rR]e:" prefix. Using the subject line also breaks the </div><div class='del'>-	  "contract" with other mail user agents. Using keywords in another</div><div class='del'>-	  field in the message header allows the sender to assist the recipient</div><div class='del'>-	  in organizing data automatically. Note that the sender can only</div><div class='del'>-	  provide hints as the sender is unlikely to know the organization</div><div class='del'>-	  schemes of the recipient.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Scope&lt;/title&gt;  </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Let us assume that we have multiple stores. Does a query work on a</div><div class='del'>-	given store? Or does it work on all stores? Or is it configurable such </div><div class='del'>-	that a query can work on a user-selected list of stores?</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Alternatives to the above --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Alternatives to the above&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Jim Meyer (purp@selequa.com) is putting some notes on where</div><div class='del'>-      annotations needs to be located. They'll be located here as well as</div><div class='del'>-      any contributions I may have to them.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/devel-docs/query/virtual-folder-in-depth.txt b/devel-docs/query/virtual-folder-in-depth.txt<br/>deleted file mode 100644<br/>index 01718a5f05..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/query/virtual-folder-in-depth.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>devel-docs/query/virtual-folder-in-depth.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,309 +0,0 @@</div><div class='del'>-TITLE: An in-depth look at the virtual folder mechanism</div><div class='del'>-AUTHOR: Giao Nguyen &lt;grail@cafebabe.org&gt;</div><div class='del'>-</div><div class='del'>-* introduction</div><div class='del'>-</div><div class='del'>-This document describes a different way of approaching mail</div><div class='del'>-organization and how all things are possible in this brave new</div><div class='del'>-world. This document does not describe physical storage issues nor</div><div class='del'>-interface issues.</div><div class='del'>-</div><div class='del'>-Historically mail has been organized into folders. These folders</div><div class='del'>-usually mapped to a single storage medium. The relationship between</div><div class='del'>-mail organization and storage medium was one to one. There was one</div><div class='del'>-mail organization for every storage medium. This scheme had its</div><div class='del'>-limitations.</div><div class='del'>-</div><div class='del'>-Efforts at categorizations are only meaningful at the instance that</div><div class='del'>-one categorized. To find any piece of data, regardless of how well</div><div class='del'>-it was categorized, required some amount of searching. Therefore, any</div><div class='del'>-attempts to nullify searching is doomed to fail. It's time to embrace</div><div class='del'>-searching as a way of life.</div><div class='del'>-</div><div class='del'>-These are the terms and their definitions. The example rules used are</div><div class='del'>-based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle</div><div class='del'>-Jones whose ideas form the basis for this. I'm only adding the</div><div class='del'>-existence of summary files to aid in scaling. I currently use VM and</div><div class='del'>-it's virtual-folder rules for my daily mail purposes. To date, my only </div><div class='del'>-complaints are speed (it has no caches) and for the unitiated, it's</div><div class='del'>-not very user-friendly.</div><div class='del'>-</div><div class='del'>-Comments, questions, rants, etc. should be directed at Giao Nguyen</div><div class='del'>-&lt;grail@cafebabe.org&gt; who will try to address issues in a timely</div><div class='del'>-manner.</div><div class='del'>-</div><div class='del'>-* Definitions</div><div class='del'>-</div><div class='del'>-** store </div><div class='del'>-</div><div class='del'>-A location where mail can be found. This may be a file (Berkeley</div><div class='del'>-mbox), directory (MH), IMAP server, POP3 server, Exchange server,</div><div class='del'>-Lotus Notes server, a stack of Post-Its by your monitor fed through</div><div class='del'>-some OCR system.</div><div class='del'>-</div><div class='del'>-** message </div><div class='del'>-</div><div class='del'>-An individual mail message.</div><div class='del'>-</div><div class='del'>-** vfolder </div><div class='del'>-</div><div class='del'>-A group of messages sharing some commonality. This is the result of a</div><div class='del'>-query. The vfolder maybe contained in a store, but it is not necessary</div><div class='del'>-that a store holds only one vfolder. There is always an implicit</div><div class='del'>-vfolder rule which matches all messages. A store contains the vfolder</div><div class='del'>-which is the result of the query (any). It's short for virtual folder</div><div class='del'>-or maybe view folder. I dunno.</div><div class='del'>-</div><div class='del'>-** default-vfolder </div><div class='del'>-</div><div class='del'>-The vfolder defined by (any) applied to the store. This is not the</div><div class='del'>-inbox. The inbox could easily be defined by a query. A default rule</div><div class='del'>-for the inbox could be (new) but it doesn't have to be. Mine happens</div><div class='del'>-to be (or (unread) (new)).</div><div class='del'>-</div><div class='del'>-** folder </div><div class='del'>-</div><div class='del'>-The classical mail folder approach: one message organization per</div><div class='del'>-store.</div><div class='del'>-</div><div class='del'>-** query </div><div class='del'>-</div><div class='del'>-A search for messages. The result of this is a vfolder. There are two</div><div class='del'>-kinds of queries: named queries and lambda queries. More on this</div><div class='del'>-later.</div><div class='del'>-</div><div class='del'>-** summary file </div><div class='del'>-</div><div class='del'>-An external file that contains pointers to messages which are matches</div><div class='del'>-for a named query. In addition to pointers, the summary file should</div><div class='del'>-also contain signatures of the store for sanity checks. When the term</div><div class='del'>-"index" is used as a verb, it means to build a summary file for a</div><div class='del'>-given name-value pair.</div><div class='del'>-</div><div class='del'>-* Queries</div><div class='del'>-</div><div class='del'>-Named queries are analogous to classical mail folders. Because named</div><div class='del'>-queries maybe reused, summary files are kept as caches to reduce</div><div class='del'>-the overall cost of viewing a vfolder. Summary files are superior to</div><div class='del'>-folders in that they allow for the same messages to appear in multiple</div><div class='del'>-vfolders without message duplications. Duplications of messages</div><div class='del'>-defeats attempts at tagging a message with additional user information</div><div class='del'>-like annotations. Named queries will define folders.</div><div class='del'>-</div><div class='del'>-Lambda queries are similar to named queries except that they have no</div><div class='del'>-name. These are created on the fly by the user to filter out or</div><div class='del'>-include certain messages.</div><div class='del'>-</div><div class='del'>-All queries can be layered on top of each other. A lambda query can be </div><div class='del'>-layered on a named query and a named query can be layered on a lambda</div><div class='del'>-query. The possibilities are endless.</div><div class='del'>-</div><div class='del'>-The layerings can be done as boolean operations (and, or, not). Short</div><div class='del'>-circuiting should be used. </div><div class='del'>-</div><div class='del'>-Examples:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (unread))</div><div class='del'>-</div><div class='del'>-The (unread) query should only be evaluated on the results of (author</div><div class='del'>-"Giao").</div><div class='del'>-</div><div class='del'>-(or (author "Giao")</div><div class='del'>-    (unread))</div><div class='del'>-</div><div class='del'>-Both of these queries should be evaluated. Any matches are added to the</div><div class='del'>-resulting vfolder.</div><div class='del'>-</div><div class='del'>-* Summary files</div><div class='del'>-</div><div class='del'>-Summary files are only meaningful when applied to the context of the</div><div class='del'>-default-vfolder of a store.</div><div class='del'>-</div><div class='del'>-Summary files should be generated for queries of the form:</div><div class='del'>-</div><div class='del'>-(function "constant value")</div><div class='del'>-</div><div class='del'>-Summary files should never be generated for queries of the form:</div><div class='del'>-</div><div class='del'>-(function (function1))</div><div class='del'>-</div><div class='del'>-(and (function "value")</div><div class='del'>-     (another-function "another value"))</div><div class='del'>-</div><div class='del'>-Given a query of the form:</div><div class='del'>-</div><div class='del'>-(and (function "value")</div><div class='del'>-     (another-function "another value"))</div><div class='del'>-</div><div class='del'>-The system should use one summary file for (function "value") and</div><div class='del'>-another summary file for (another-function "another value"). I will</div><div class='del'>-call the prior form the "plain form".</div><div class='del'>-</div><div class='del'>-It should be noted that the signature of the store should be based on</div><div class='del'>-the assumption that new data may have been added to the store since</div><div class='del'>-the application generated the summary file. Signatures generated on</div><div class='del'>-the entirety of the store will most likely be meaningless for things</div><div class='del'>-like POP/IMAP servers. </div><div class='del'>-</div><div class='del'>-* Incremental indexing</div><div class='del'>-</div><div class='del'>-When new messages are detected, all known queries should be evaluated</div><div class='del'>-on the new messages. vfolders should be notified of new messages that</div><div class='del'>-are positive matches for their queries. The indexes generated by this</div><div class='del'>-process should be merged into the current indexes for the vfolder.</div><div class='del'>-</div><div class='del'>-* Can I have multiple stores?</div><div class='del'>-</div><div class='del'>-I don't see why not. Again, the inbox is a vfolder so you can get a</div><div class='del'>-unified inbox consisting of all new mail sent to all your stores or</div><div class='del'>-your can get inboxes for each store or any combination your heart</div><div class='del'>-desire. You get your cake, eat it, and someone else cleans the dishes!</div><div class='del'>-</div><div class='del'>-* Why all this?</div><div class='del'>-</div><div class='del'>-Consider the dynamic nature of the following query:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-today-midnight would be a function that is evaluated at run-time to</div><div class='del'>-calculate the appropriate object.</div><div class='del'>-</div><div class='del'>-* Scenarios of usage and their solutions</div><div class='del'>-</div><div class='del'>-** Mesage alterations</div><div class='del'>-</div><div class='del'>-This is a fuzzy area that should be left to the UI to handle. Messages </div><div class='del'>-are altered. Read status are altered when a new message is read for</div><div class='del'>-example. How do we handle this if our query is for unread messages?</div><div class='del'>-Upon viewing the state would change.</div><div class='del'>-</div><div class='del'>-One idea is to not evaluate the queries unless we're changing between</div><div class='del'>-vfolder views. This assumes that one can only view a particular</div><div class='del'>-vfolder at a time. For multi-vfolder viewing, a message change should</div><div class='del'>-propagate through the vfolder system. Certain effects (as in our</div><div class='del'>-example) would not be intuitive.</div><div class='del'>-</div><div class='del'>-It would not be a clean solution to make special cases but they may be </div><div class='del'>-necessary where certain defined fields are ignored when they are</div><div class='del'>-changed. Some combination of the above rules can be used. I don't</div><div class='del'>-think it's an easy solution.</div><div class='del'>-</div><div class='del'>-** Message inclusion and exclusion</div><div class='del'>-</div><div class='del'>-Messages are included and excluded also with queries. The final query</div><div class='del'>-will have the form of:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (criteria value)</div><div class='del'>-     (not (criteria other-value)))</div><div class='del'>-</div><div class='del'>-Userland criterias may be a label of some sort. These may be userland</div><div class='del'>-labels or Message-IDs. What are the performance issues involved in</div><div class='del'>-this? With short circuiting, it's not a major problem.</div><div class='del'>-</div><div class='del'>-The criterias and values are determined by the UI. The vfolder</div><div class='del'>-mechanism isn't concerned with such issues.</div><div class='del'>-</div><div class='del'>-Messages can be included and excluded at will. The idea is often</div><div class='del'>-called "arbitrary inclusion/exclusion". This can be done by</div><div class='del'>-Message-IDs or other fields. It's been noted that Message-IDs are not</div><div class='del'>-unique. </div><div class='del'>-</div><div class='del'>-I propose that any given vfolder is allocated an inclusion label and an </div><div class='del'>-exclusion label. These should be randomly generated. This should be</div><div class='del'>-part of the vfolder description. It should be noted that the vfolder</div><div class='del'>-description has not been drafted yet.</div><div class='del'>-</div><div class='del'>-The result is such that the rules for a given named query is:</div><div class='del'>-</div><div class='del'>-(and (user-query)</div><div class='del'>-     (label inclusion-label)</div><div class='del'>-     (not exclusion-label))</div><div class='del'>-</div><div class='del'>-** Query scheduling</div><div class='del'>-</div><div class='del'>-Consider the following extremely dynamic queries:</div><div class='del'>-</div><div class='del'>-A:</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-B:</div><div class='del'>-(and (sent-after (today-midnight))</div><div class='del'>-     (author "Giao"))</div><div class='del'>-</div><div class='del'>-C:</div><div class='del'>-(or (author "Giao")</div><div class='del'>-    (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-Query A would be significantly faster because (author "Giao") is not</div><div class='del'>-dynamic. A summary file could be generated for this query. Query B is</div><div class='del'>-slow and can be optimized if there was a query compiler of some</div><div class='del'>-sort. Query C demonstrates a query in which there is no good</div><div class='del'>-optimization which can be applied. These come with a certain amount of</div><div class='del'>-baggage.</div><div class='del'>-</div><div class='del'>-It seems then that for boolean 'and' operations, plain forms should be </div><div class='del'>-moved forward and other queries should be moved such that they are</div><div class='del'>-evaluated later. I would expect that the majority of queries would be</div><div class='del'>-of the plain form.</div><div class='del'>-</div><div class='del'>-First is that the summary file is tied to the query and the store</div><div class='del'>-where the query originates from. Second, a hashing function for</div><div class='del'>-strings needs to be calculated for the query so that the query and the </div><div class='del'>-summary file can be associated. This hashing function could be similar </div><div class='del'>-to the hashing function described in Rob Pike's "The Practice of</div><div class='del'>-Programming". (FIXME: Stick page number here)</div><div class='del'>-</div><div class='del'>-** Archives</div><div class='del'>-</div><div class='del'>-Many people are concerned that archives won't be preserved, archives</div><div class='del'>-aren't supported, and many other archive related issues. This is the</div><div class='del'>-short version.</div><div class='del'>-</div><div class='del'>-Archives are just that, archives. Archives are stores. Take your</div><div class='del'>-vfolder, export it to a store. You are done. If you load up the store</div><div class='del'>-again, then the default-vfolder of that store is the view of the</div><div class='del'>-vfolder, except the query is different.</div><div class='del'>-</div><div class='del'>-The point to vfolder is not to do away with classical folder</div><div class='del'>-representation but to move the queries to the front where it would</div><div class='del'>-make data management easier for people who don't think in terms of</div><div class='del'>-files but in terms of queries because ordinary people don't think in</div><div class='del'>-terms of files.</div><div class='del'>-</div><div class='del'>-* Miscellany</div><div class='del'>-</div><div class='del'>-** Annotations</div><div class='del'>-</div><div class='del'>-There should be a scheme to add annotations to messages. Common mail</div><div class='del'>-user agents have used a tag in the message header to mark messages as</div><div class='del'>-read/unread for example. Extending on this we have the ability to add</div><div class='del'>-our own data to a message to add meaning to it. If we have a good</div><div class='del'>-scheme for doing this, new possibilities are opened.</div><div class='del'>-</div><div class='del'>-*** Keywords</div><div class='del'>-</div><div class='del'>-When sending a message, a message could have certain keywords attached </div><div class='del'>-to it. While this can be done with the subject line, the subject line</div><div class='del'>-has a tendency to be munged by other mail applications. One popular</div><div class='del'>-example is the "[rR]e:" prefix. Using the subject line also breaks the </div><div class='del'>-"contract" with other mail user agents. Using keywords in another</div><div class='del'>-field in the message header allows the sender to assist the recipient</div><div class='del'>-in organizing data automatically. Note that the sender can only</div><div class='del'>-provide hints as the sender is unlikely to know the organization</div><div class='del'>-schemes of the recipient.</div><div class='del'>-</div><div class='del'>-** Scope</div><div class='del'>-</div><div class='del'>-Let us assume that we have multiple stores. Does a query work on a</div><div class='del'>-given store? Or does it work on all stores? Or is it configurable such </div><div class='del'>-that a query can work on a user-selected list of stores?</div><div class='del'>-</div><div class='del'>-* Alternatives to the above</div><div class='del'>-</div><div class='del'>-Jim Meyer &lt;purp@selequa.com&gt; is putting some notes on where</div><div class='del'>-annotations needs to be located. They'll be located here as well as</div><div class='del'>-any contributions I may have to them.</div><div class='head'>diff --git a/doc/.cvsignore b/doc/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/COPYING-DOCS b/doc/COPYING-DOCS<br/>deleted file mode 100644<br/>index b42936beb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/COPYING-DOCS?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/COPYING-DOCS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,355 +0,0 @@</div><div class='del'>-		GNU Free Documentation License</div><div class='del'>-		   Version 1.1, March 2000</div><div class='del'>-</div><div class='del'>- Copyright (C) 2000  Free Software Foundation, Inc.</div><div class='del'>-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- Everyone is permitted to copy and distribute verbatim copies</div><div class='del'>- of this license document, but changing it is not allowed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-0. PREAMBLE</div><div class='del'>-</div><div class='del'>-The purpose of this License is to make a manual, textbook, or other</div><div class='del'>-written document "free" in the sense of freedom: to assure everyone</div><div class='del'>-the effective freedom to copy and redistribute it, with or without</div><div class='del'>-modifying it, either commercially or noncommercially.  Secondarily,</div><div class='del'>-this License preserves for the author and publisher a way to get</div><div class='del'>-credit for their work, while not being considered responsible for</div><div class='del'>-modifications made by others.</div><div class='del'>-</div><div class='del'>-This License is a kind of "copyleft", which means that derivative</div><div class='del'>-works of the document must themselves be free in the same sense.  It</div><div class='del'>-complements the GNU General Public License, which is a copyleft</div><div class='del'>-license designed for free software.</div><div class='del'>-</div><div class='del'>-We have designed this License in order to use it for manuals for free</div><div class='del'>-software, because free software needs free documentation: a free</div><div class='del'>-program should come with manuals providing the same freedoms that the</div><div class='del'>-software does.  But this License is not limited to software manuals;</div><div class='del'>-it can be used for any textual work, regardless of subject matter or</div><div class='del'>-whether it is published as a printed book.  We recommend this License</div><div class='del'>-principally for works whose purpose is instruction or reference.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. APPLICABILITY AND DEFINITIONS</div><div class='del'>-</div><div class='del'>-This License applies to any manual or other work that contains a</div><div class='del'>-notice placed by the copyright holder saying it can be distributed</div><div class='del'>-under the terms of this License.  The "Document", below, refers to any</div><div class='del'>-such manual or work.  Any member of the public is a licensee, and is</div><div class='del'>-addressed as "you".</div><div class='del'>-</div><div class='del'>-A "Modified Version" of the Document means any work containing the</div><div class='del'>-Document or a portion of it, either copied verbatim, or with</div><div class='del'>-modifications and/or translated into another language.</div><div class='del'>-</div><div class='del'>-A "Secondary Section" is a named appendix or a front-matter section of</div><div class='del'>-the Document that deals exclusively with the relationship of the</div><div class='del'>-publishers or authors of the Document to the Document's overall subject</div><div class='del'>-(or to related matters) and contains nothing that could fall directly</div><div class='del'>-within that overall subject.  (For example, if the Document is in part a</div><div class='del'>-textbook of mathematics, a Secondary Section may not explain any</div><div class='del'>-mathematics.)  The relationship could be a matter of historical</div><div class='del'>-connection with the subject or with related matters, or of legal,</div><div class='del'>-commercial, philosophical, ethical or political position regarding</div><div class='del'>-them.</div><div class='del'>-</div><div class='del'>-The "Invariant Sections" are certain Secondary Sections whose titles</div><div class='del'>-are designated, as being those of Invariant Sections, in the notice</div><div class='del'>-that says that the Document is released under this License.</div><div class='del'>-</div><div class='del'>-The "Cover Texts" are certain short passages of text that are listed,</div><div class='del'>-as Front-Cover Texts or Back-Cover Texts, in the notice that says that</div><div class='del'>-the Document is released under this License.</div><div class='del'>-</div><div class='del'>-A "Transparent" copy of the Document means a machine-readable copy,</div><div class='del'>-represented in a format whose specification is available to the</div><div class='del'>-general public, whose contents can be viewed and edited directly and</div><div class='del'>-straightforwardly with generic text editors or (for images composed of</div><div class='del'>-pixels) generic paint programs or (for drawings) some widely available</div><div class='del'>-drawing editor, and that is suitable for input to text formatters or</div><div class='del'>-for automatic translation to a variety of formats suitable for input</div><div class='del'>-to text formatters.  A copy made in an otherwise Transparent file</div><div class='del'>-format whose markup has been designed to thwart or discourage</div><div class='del'>-subsequent modification by readers is not Transparent.  A copy that is</div><div class='del'>-not "Transparent" is called "Opaque".</div><div class='del'>-</div><div class='del'>-Examples of suitable formats for Transparent copies include plain</div><div class='del'>-ASCII without markup, Texinfo input format, LaTeX input format, SGML</div><div class='del'>-or XML using a publicly available DTD, and standard-conforming simple</div><div class='del'>-HTML designed for human modification.  Opaque formats include</div><div class='del'>-PostScript, PDF, proprietary formats that can be read and edited only</div><div class='del'>-by proprietary word processors, SGML or XML for which the DTD and/or</div><div class='del'>-processing tools are not generally available, and the</div><div class='del'>-machine-generated HTML produced by some word processors for output</div><div class='del'>-purposes only.</div><div class='del'>-</div><div class='del'>-The "Title Page" means, for a printed book, the title page itself,</div><div class='del'>-plus such following pages as are needed to hold, legibly, the material</div><div class='del'>-this License requires to appear in the title page.  For works in</div><div class='del'>-formats which do not have any title page as such, "Title Page" means</div><div class='del'>-the text near the most prominent appearance of the work's title,</div><div class='del'>-preceding the beginning of the body of the text.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. VERBATIM COPYING</div><div class='del'>-</div><div class='del'>-You may copy and distribute the Document in any medium, either</div><div class='del'>-commercially or noncommercially, provided that this License, the</div><div class='del'>-copyright notices, and the license notice saying this License applies</div><div class='del'>-to the Document are reproduced in all copies, and that you add no other</div><div class='del'>-conditions whatsoever to those of this License.  You may not use</div><div class='del'>-technical measures to obstruct or control the reading or further</div><div class='del'>-copying of the copies you make or distribute.  However, you may accept</div><div class='del'>-compensation in exchange for copies.  If you distribute a large enough</div><div class='del'>-number of copies you must also follow the conditions in section 3.</div><div class='del'>-</div><div class='del'>-You may also lend copies, under the same conditions stated above, and</div><div class='del'>-you may publicly display copies.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. COPYING IN QUANTITY</div><div class='del'>-</div><div class='del'>-If you publish printed copies of the Document numbering more than 100,</div><div class='del'>-and the Document's license notice requires Cover Texts, you must enclose</div><div class='del'>-the copies in covers that carry, clearly and legibly, all these Cover</div><div class='del'>-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on</div><div class='del'>-the back cover.  Both covers must also clearly and legibly identify</div><div class='del'>-you as the publisher of these copies.  The front cover must present</div><div class='del'>-the full title with all words of the title equally prominent and</div><div class='del'>-visible.  You may add other material on the covers in addition.</div><div class='del'>-Copying with changes limited to the covers, as long as they preserve</div><div class='del'>-the title of the Document and satisfy these conditions, can be treated</div><div class='del'>-as verbatim copying in other respects.</div><div class='del'>-</div><div class='del'>-If the required texts for either cover are too voluminous to fit</div><div class='del'>-legibly, you should put the first ones listed (as many as fit</div><div class='del'>-reasonably) on the actual cover, and continue the rest onto adjacent</div><div class='del'>-pages.</div><div class='del'>-</div><div class='del'>-If you publish or distribute Opaque copies of the Document numbering</div><div class='del'>-more than 100, you must either include a machine-readable Transparent</div><div class='del'>-copy along with each Opaque copy, or state in or with each Opaque copy</div><div class='del'>-a publicly-accessible computer-network location containing a complete</div><div class='del'>-Transparent copy of the Document, free of added material, which the</div><div class='del'>-general network-using public has access to download anonymously at no</div><div class='del'>-charge using public-standard network protocols.  If you use the latter</div><div class='del'>-option, you must take reasonably prudent steps, when you begin</div><div class='del'>-distribution of Opaque copies in quantity, to ensure that this</div><div class='del'>-Transparent copy will remain thus accessible at the stated location</div><div class='del'>-until at least one year after the last time you distribute an Opaque</div><div class='del'>-copy (directly or through your agents or retailers) of that edition to</div><div class='del'>-the public.</div><div class='del'>-</div><div class='del'>-It is requested, but not required, that you contact the authors of the</div><div class='del'>-Document well before redistributing any large number of copies, to give</div><div class='del'>-them a chance to provide you with an updated version of the Document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4. MODIFICATIONS</div><div class='del'>-</div><div class='del'>-You may copy and distribute a Modified Version of the Document under</div><div class='del'>-the conditions of sections 2 and 3 above, provided that you release</div><div class='del'>-the Modified Version under precisely this License, with the Modified</div><div class='del'>-Version filling the role of the Document, thus licensing distribution</div><div class='del'>-and modification of the Modified Version to whoever possesses a copy</div><div class='del'>-of it.  In addition, you must do these things in the Modified Version:</div><div class='del'>-</div><div class='del'>-A. Use in the Title Page (and on the covers, if any) a title distinct</div><div class='del'>-   from that of the Document, and from those of previous versions</div><div class='del'>-   (which should, if there were any, be listed in the History section</div><div class='del'>-   of the Document).  You may use the same title as a previous version</div><div class='del'>-   if the original publisher of that version gives permission.</div><div class='del'>-B. List on the Title Page, as authors, one or more persons or entities</div><div class='del'>-   responsible for authorship of the modifications in the Modified</div><div class='del'>-   Version, together with at least five of the principal authors of the</div><div class='del'>-   Document (all of its principal authors, if it has less than five).</div><div class='del'>-C. State on the Title page the name of the publisher of the</div><div class='del'>-   Modified Version, as the publisher.</div><div class='del'>-D. Preserve all the copyright notices of the Document.</div><div class='del'>-E. Add an appropriate copyright notice for your modifications</div><div class='del'>-   adjacent to the other copyright notices.</div><div class='del'>-F. Include, immediately after the copyright notices, a license notice</div><div class='del'>-   giving the public permission to use the Modified Version under the</div><div class='del'>-   terms of this License, in the form shown in the Addendum below.</div><div class='del'>-G. Preserve in that license notice the full lists of Invariant Sections</div><div class='del'>-   and required Cover Texts given in the Document's license notice.</div><div class='del'>-H. Include an unaltered copy of this License.</div><div class='del'>-I. Preserve the section entitled "History", and its title, and add to</div><div class='del'>-   it an item stating at least the title, year, new authors, and</div><div class='del'>-   publisher of the Modified Version as given on the Title Page.  If</div><div class='del'>-   there is no section entitled "History" in the Document, create one</div><div class='del'>-   stating the title, year, authors, and publisher of the Document as</div><div class='del'>-   given on its Title Page, then add an item describing the Modified</div><div class='del'>-   Version as stated in the previous sentence.</div><div class='del'>-J. Preserve the network location, if any, given in the Document for</div><div class='del'>-   public access to a Transparent copy of the Document, and likewise</div><div class='del'>-   the network locations given in the Document for previous versions</div><div class='del'>-   it was based on.  These may be placed in the "History" section.</div><div class='del'>-   You may omit a network location for a work that was published at</div><div class='del'>-   least four years before the Document itself, or if the original</div><div class='del'>-   publisher of the version it refers to gives permission.</div><div class='del'>-K. In any section entitled "Acknowledgements" or "Dedications",</div><div class='del'>-   preserve the section's title, and preserve in the section all the</div><div class='del'>-   substance and tone of each of the contributor acknowledgements</div><div class='del'>-   and/or dedications given therein.</div><div class='del'>-L. Preserve all the Invariant Sections of the Document,</div><div class='del'>-   unaltered in their text and in their titles.  Section numbers</div><div class='del'>-   or the equivalent are not considered part of the section titles.</div><div class='del'>-M. Delete any section entitled "Endorsements".  Such a section</div><div class='del'>-   may not be included in the Modified Version.</div><div class='del'>-N. Do not retitle any existing section as "Endorsements"</div><div class='del'>-   or to conflict in title with any Invariant Section.</div><div class='del'>-</div><div class='del'>-If the Modified Version includes new front-matter sections or</div><div class='del'>-appendices that qualify as Secondary Sections and contain no material</div><div class='del'>-copied from the Document, you may at your option designate some or all</div><div class='del'>-of these sections as invariant.  To do this, add their titles to the</div><div class='del'>-list of Invariant Sections in the Modified Version's license notice.</div><div class='del'>-These titles must be distinct from any other section titles.</div><div class='del'>-</div><div class='del'>-You may add a section entitled "Endorsements", provided it contains</div><div class='del'>-nothing but endorsements of your Modified Version by various</div><div class='del'>-parties--for example, statements of peer review or that the text has</div><div class='del'>-been approved by an organization as the authoritative definition of a</div><div class='del'>-standard.</div><div class='del'>-</div><div class='del'>-You may add a passage of up to five words as a Front-Cover Text, and a</div><div class='del'>-passage of up to 25 words as a Back-Cover Text, to the end of the list</div><div class='del'>-of Cover Texts in the Modified Version.  Only one passage of</div><div class='del'>-Front-Cover Text and one of Back-Cover Text may be added by (or</div><div class='del'>-through arrangements made by) any one entity.  If the Document already</div><div class='del'>-includes a cover text for the same cover, previously added by you or</div><div class='del'>-by arrangement made by the same entity you are acting on behalf of,</div><div class='del'>-you may not add another; but you may replace the old one, on explicit</div><div class='del'>-permission from the previous publisher that added the old one.</div><div class='del'>-</div><div class='del'>-The author(s) and publisher(s) of the Document do not by this License</div><div class='del'>-give permission to use their names for publicity for or to assert or</div><div class='del'>-imply endorsement of any Modified Version.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. COMBINING DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may combine the Document with other documents released under this</div><div class='del'>-License, under the terms defined in section 4 above for modified</div><div class='del'>-versions, provided that you include in the combination all of the</div><div class='del'>-Invariant Sections of all of the original documents, unmodified, and</div><div class='del'>-list them all as Invariant Sections of your combined work in its</div><div class='del'>-license notice.</div><div class='del'>-</div><div class='del'>-The combined work need only contain one copy of this License, and</div><div class='del'>-multiple identical Invariant Sections may be replaced with a single</div><div class='del'>-copy.  If there are multiple Invariant Sections with the same name but</div><div class='del'>-different contents, make the title of each such section unique by</div><div class='del'>-adding at the end of it, in parentheses, the name of the original</div><div class='del'>-author or publisher of that section if known, or else a unique number.</div><div class='del'>-Make the same adjustment to the section titles in the list of</div><div class='del'>-Invariant Sections in the license notice of the combined work.</div><div class='del'>-</div><div class='del'>-In the combination, you must combine any sections entitled "History"</div><div class='del'>-in the various original documents, forming one section entitled</div><div class='del'>-"History"; likewise combine any sections entitled "Acknowledgements",</div><div class='del'>-and any sections entitled "Dedications".  You must delete all sections</div><div class='del'>-entitled "Endorsements."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6. COLLECTIONS OF DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may make a collection consisting of the Document and other documents</div><div class='del'>-released under this License, and replace the individual copies of this</div><div class='del'>-License in the various documents with a single copy that is included in</div><div class='del'>-the collection, provided that you follow the rules of this License for</div><div class='del'>-verbatim copying of each of the documents in all other respects.</div><div class='del'>-</div><div class='del'>-You may extract a single document from such a collection, and distribute</div><div class='del'>-it individually under this License, provided you insert a copy of this</div><div class='del'>-License into the extracted document, and follow this License in all</div><div class='del'>-other respects regarding verbatim copying of that document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7. AGGREGATION WITH INDEPENDENT WORKS</div><div class='del'>-</div><div class='del'>-A compilation of the Document or its derivatives with other separate</div><div class='del'>-and independent documents or works, in or on a volume of a storage or</div><div class='del'>-distribution medium, does not as a whole count as a Modified Version</div><div class='del'>-of the Document, provided no compilation copyright is claimed for the</div><div class='del'>-compilation.  Such a compilation is called an "aggregate", and this</div><div class='del'>-License does not apply to the other self-contained works thus compiled</div><div class='del'>-with the Document, on account of their being thus compiled, if they</div><div class='del'>-are not themselves derivative works of the Document.</div><div class='del'>-</div><div class='del'>-If the Cover Text requirement of section 3 is applicable to these</div><div class='del'>-copies of the Document, then if the Document is less than one quarter</div><div class='del'>-of the entire aggregate, the Document's Cover Texts may be placed on</div><div class='del'>-covers that surround only the Document within the aggregate.</div><div class='del'>-Otherwise they must appear on covers around the whole aggregate.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-8. TRANSLATION</div><div class='del'>-</div><div class='del'>-Translation is considered a kind of modification, so you may</div><div class='del'>-distribute translations of the Document under the terms of section 4.</div><div class='del'>-Replacing Invariant Sections with translations requires special</div><div class='del'>-permission from their copyright holders, but you may include</div><div class='del'>-translations of some or all Invariant Sections in addition to the</div><div class='del'>-original versions of these Invariant Sections.  You may include a</div><div class='del'>-translation of this License provided that you also include the</div><div class='del'>-original English version of this License.  In case of a disagreement</div><div class='del'>-between the translation and the original English version of this</div><div class='del'>-License, the original English version will prevail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-9. TERMINATION</div><div class='del'>-</div><div class='del'>-You may not copy, modify, sublicense, or distribute the Document except</div><div class='del'>-as expressly provided for under this License.  Any other attempt to</div><div class='del'>-copy, modify, sublicense or distribute the Document is void, and will</div><div class='del'>-automatically terminate your rights under this License.  However,</div><div class='del'>-parties who have received copies, or rights, from you under this</div><div class='del'>-License will not have their licenses terminated so long as such</div><div class='del'>-parties remain in full compliance.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10. FUTURE REVISIONS OF THIS LICENSE</div><div class='del'>-</div><div class='del'>-The Free Software Foundation may publish new, revised versions</div><div class='del'>-of the GNU Free Documentation License from time to time.  Such new</div><div class='del'>-versions will be similar in spirit to the present version, but may</div><div class='del'>-differ in detail to address new problems or concerns.  See</div><div class='del'>-http://www.gnu.org/copyleft/.</div><div class='del'>-</div><div class='del'>-Each version of the License is given a distinguishing version number.</div><div class='del'>-If the Document specifies that a particular numbered version of this</div><div class='del'>-License "or any later version" applies to it, you have the option of</div><div class='del'>-following the terms and conditions either of that specified version or</div><div class='del'>-of any later version that has been published (not as a draft) by the</div><div class='del'>-Free Software Foundation.  If the Document does not specify a version</div><div class='del'>-number of this License, you may choose any version ever published (not</div><div class='del'>-as a draft) by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ADDENDUM: How to use this License for your documents</div><div class='del'>-</div><div class='del'>-To use this License in a document you have written, include a copy of</div><div class='del'>-the License in the document and put the following copyright and</div><div class='del'>-license notices just after the title page:</div><div class='del'>-</div><div class='del'>-      Copyright (c)  YEAR  YOUR NAME.</div><div class='del'>-      Permission is granted to copy, distribute and/or modify this document</div><div class='del'>-      under the terms of the GNU Free Documentation License, Version 1.1</div><div class='del'>-      or any later version published by the Free Software Foundation;</div><div class='del'>-      with the Invariant Sections being LIST THEIR TITLES, with the</div><div class='del'>-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.</div><div class='del'>-      A copy of the license is included in the section entitled "GNU</div><div class='del'>-      Free Documentation License".</div><div class='del'>-</div><div class='del'>-If you have no Invariant Sections, write "with no Invariant Sections"</div><div class='del'>-instead of saying which ones are invariant.  If you have no</div><div class='del'>-Front-Cover Texts, write "no Front-Cover Texts" instead of</div><div class='del'>-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</div><div class='del'>-</div><div class='del'>-If your document contains nontrivial examples of program code, we</div><div class='del'>-recommend releasing these examples in parallel under your choice of</div><div class='del'>-free software license, such as the GNU General Public License,</div><div class='del'>-to permit their use in free software.</div><div class='head'>diff --git a/doc/Camel-Classes b/doc/Camel-Classes<br/>deleted file mode 100644<br/>index 8b510dad7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Camel-Classes?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/Camel-Classes</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-CamelException</div><div class='del'>-CamelLock</div><div class='del'>-CamelLockClient</div><div class='del'>-CamelLockHelper</div><div class='del'>-CamelMovemail</div><div class='del'>-CamelOperation</div><div class='del'>-CamelProvider</div><div class='del'>-CamelUIDCache</div><div class='del'>-CamelURL</div><div class='del'>-CamelObject</div><div class='del'>- + CamelAddress</div><div class='del'>- |  + CamelInternetAddress</div><div class='del'>- |  ` CamelNewsAddress</div><div class='del'>- + CamelDataWrapper</div><div class='del'>- |  + CamelMedium</div><div class='del'>- |  |  ` CamelMimePart</div><div class='del'>- |  |     ` CamelMimeMessage</div><div class='del'>- |  ` CamelMultipart</div><div class='del'>- + CamelCipherContext</div><div class='del'>- |  ` CamelPgpContext</div><div class='del'>- + CamelCMSContext</div><div class='del'>- |  ` CamelSMimeContext</div><div class='del'>- + CamelDiscoDiary</div><div class='del'>- + CamelFolder</div><div class='del'>- |  + CamelDiscoFolder</div><div class='del'>- |  ` CamelVeeFolder</div><div class='del'>- |     ` CamelVTrashFolder</div><div class='del'>- + CamelFolderSearch</div><div class='del'>- + CamelFolderSummary</div><div class='del'>- + CamelMimeFilter</div><div class='del'>- |  + CamelMimeFilterBasic</div><div class='del'>- |  + CamelMimeFilterBestenc</div><div class='del'>- |  + CamelMimeFilterCharset</div><div class='del'>- |  + CamelMimeFilterCRLF</div><div class='del'>- |  + CamelMimeFilterFrom</div><div class='del'>- |  + CamelMimeFilterIndex</div><div class='del'>- |  + CamelMimeFilterLinewrap</div><div class='del'>- |  + CamelMimeFilterSave</div><div class='del'>- |  ` CamelMimeFilterStripHeader</div><div class='del'>- + CamelSasl</div><div class='del'>- |  + CamelSaslAnonymous</div><div class='del'>- |  + CamelSaslCramMD5</div><div class='del'>- |  + CamelSaslDigestMD5</div><div class='del'>- |  + CamelSaslKerberos</div><div class='del'>- |  + CamelSaslLogin</div><div class='del'>- |  ` CamelSaslPlain</div><div class='del'>- + CamelService</div><div class='del'>- |  + CamelStore</div><div class='del'>- |  |  + CamelRemoteStore</div><div class='del'>- |  |  |  ` CamelDiscoStore</div><div class='del'>- |  |  ` CamelVeeStore</div><div class='del'>- |  ` CamelTransport</div><div class='del'>- + CamelSession</div><div class='del'>- ` CamelStream</div><div class='del'>-    + CamelSeekableStream</div><div class='del'>-    |  + CamelSeekableSubstream</div><div class='del'>-    |  + CamelStreamFs</div><div class='del'>-    |  ` CamelStreamMem</div><div class='del'>-    + CamelStreamBuffer</div><div class='del'>-    + CamelStreamFilter</div><div class='del'>-    + CamelStreamNull</div><div class='del'>-    ` CamelTcpStream</div><div class='del'>-       + CamelTcpStreamOpenSSL</div><div class='del'>-       + CamelTcpStreamRaw</div><div class='del'>-       ` CamelTcpStreamSSL</div><div class='head'>diff --git a/doc/ChangeLog b/doc/ChangeLog<br/>deleted file mode 100644<br/>index e7dd37db31..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1146 +0,0 @@</div><div class='del'>-2001-08-16  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Small fix to build.</div><div class='del'>-	* C/evolution-C.omf: Small fix. Remove an extra space.</div><div class='del'>-	* no/Makefile.am: Same here.</div><div class='del'>-	* no/evolution-no.omf: And here.</div><div class='del'>-	</div><div class='del'>-2001-08-15  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Updated one line about bullet points.</div><div class='del'>-</div><div class='del'>-2001-08-15  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* no/*: Added beginnings of a Norwegian translation.</div><div class='del'>-	* sgmldocs.make: Forgot to add this. Kinda important.</div><div class='del'>-	* C/*.sgml: s/fig/figures/</div><div class='del'>-	* C/Makefile.am: Make it use the sgmldocs.make framework.</div><div class='del'>-	</div><div class='del'>-2001-08-14  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Commented out menuref.</div><div class='del'>-	* C/usage-contact.sgml: Commented out menuref.</div><div class='del'>-	* C/evolution.sgml: commented out menuref.</div><div class='del'>-	* C/preface.sgml: commented out menuref.</div><div class='del'>-</div><div class='del'>-2001-08-12  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: Added missing ;'s after entities.</div><div class='del'>-	* C/evolution-C.omf: s/en/C in Language.</div><div class='del'>-	* C/usage-mail-org.sgml: Add missing ;.</div><div class='del'>-	* C/usage-mainwindow.sgml: Same here.</div><div class='del'>-	</div><div class='del'>-2001-08-10  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Switched all images in entire document to</div><div class='del'>-	*not* use file extensions, so that they work properly with</div><div class='del'>-	db2ps. This doesn't completely fix the db2ps issues, but it's</div><div class='del'>-	apparently the right way to do this.</div><div class='del'>-</div><div class='del'>-2001-08-09  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Made sharing tip an orderedlist.</div><div class='del'>-</div><div class='del'>-2001-08-08  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Add information about sharing mailbox files.</div><div class='del'>-</div><div class='del'>-2001-08-03  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Add information about gathering actions.</div><div class='del'>-</div><div class='del'>-2001-08-02  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added a &lt;tip&gt; for scrolling through mails.</div><div class='del'>-</div><div class='del'>-2001-07-30  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Fixed some breakage Aaron caused.</div><div class='del'>-</div><div class='del'>-2001-07-26  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: revised.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: revisions and stuff.</div><div class='del'>-</div><div class='del'>-2001-07-24  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Reworded a few questions.</div><div class='del'>-</div><div class='del'>-2001-07-23  Kevin Breit &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Pulled instance of config-setupassist.sgml to make stuff build right.</div><div class='del'>-</div><div class='del'>-2001-07-23  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: validated.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Removed.</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: removed config-setupassist.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Minor revisions.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml:  Added 'format="png"' to all &lt;image&gt; tags</div><div class='del'>-	missing the attribute.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Added 'format="png"' to all &lt;image&gt; tags</div><div class='del'>-	missing the attribute.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added 'format="png"' to all &lt;image&gt; tags</div><div class='del'>-	missing the attribute.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Style. Merged info from preface. Added</div><div class='del'>-	'format="png"' to all &lt;image&gt; tags missing the attribute.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Style changes. Removed info that was duplicated</div><div class='del'>-	in mainwindow.sgml.</div><div class='del'>-</div><div class='del'>-2001-07-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Fixed the first time druid stuff a little more.</div><div class='del'>-	</div><div class='del'>-2001-07-16  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Sepllcheck.</div><div class='del'>-</div><div class='del'>-2001-07-15  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-sync.sgml: Updated slightly for new design.</div><div class='del'>-</div><div class='del'>-2001-07-13  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Added lots of good stuff with the first time druid.</div><div class='del'>-</div><div class='del'>-2001-07-12  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: TYPO fixing.</div><div class='del'>-</div><div class='del'>-2001-07-12  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Added "get bt for component-only crash" qandaentry.</div><div class='del'>-</div><div class='del'>-2001-07-10  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* */Makefile.am (dist-hook): Clean up make dist.</div><div class='del'>-</div><div class='del'>-2001-07-11  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.	</div><div class='del'>-</div><div class='del'>-2001-07-11  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: More edits.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Sick amounts of changes too!</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: A bit of editing.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Screwed with the examples and did some cleanup.</div><div class='del'>-</div><div class='del'>-2001-07-10  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: validation.</div><div class='del'>-</div><div class='del'>-2001-07-10  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added &lt;application&gt; tags</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: Added &lt;application&gt; tags</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added &lt;application&gt; tags</div><div class='del'>-</div><div class='del'>-2001-07-09  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Editing</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Editing</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: Editing</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Editing</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Editing</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: Mention UNMATCHED</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Commented on trash being a vFolder</div><div class='del'>-</div><div class='del'>-2001-07-06  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Spell check</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Spell check</div><div class='del'>-</div><div class='del'>-2001-07-05  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Added orderedlists.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Added orderedlists.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Added orderedlists.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail-org.sgml: Added orderedlists.</div><div class='del'>-</div><div class='del'>-2001-07-03  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less</div><div class='del'>-	for the user to read.  They'll thank me in droves later.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Fixed build error</div><div class='del'>-</div><div class='del'>-2001-06-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* white-papers/mail/camel.sgml: Updated slightly.</div><div class='del'>-</div><div class='del'>-	* Camel-Classes: Updated.</div><div class='del'>-</div><div class='del'>-2001-07-02  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-common-tasks.sgml: Created its own file.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: You name it.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Pulled shortcuts from here into its own apx</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: Reordered entities</div><div class='del'>-	</div><div class='del'>-2001-06-30  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.</div><div class='del'>-</div><div class='del'>-2001-06-26  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Revised move/rename/copy questions, now</div><div class='del'>-	that these functions work.</div><div class='del'>-</div><div class='del'>-2001-06-25  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Now that bug-buddy works with our</div><div class='del'>-	bugzilla, update faq to reflect it.</div><div class='del'>-</div><div class='del'>-2001-06-25  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Put config-encryption in usage-mail.sgml.</div><div class='del'>-	config-encryption.sgml should be depreciated.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Fixed typo</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added info about mailing lists Elaborated on</div><div class='del'>-	mailing lists</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: Fixed a few typos</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Added section for importing files</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Removed some *'s that are causing</div><div class='del'>-	problems.</div><div class='del'>-</div><div class='del'>-2001-06-22  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Put in Contacts information in the quicktasks.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Pulled some redundant information.</div><div class='del'>-</div><div class='del'>-2001-06-21  battery841  &lt;battery841@mediaone.net&gt;</div><div class='del'>-	</div><div class='del'>-	* C/preface.sgml, C/fig/mail-inbox.png, C/fig/mainwindow-pic.png,</div><div class='del'>-	C/usage-mail.sgml: Updated screenshots and redid layout for</div><div class='del'>-	graphics on pages.</div><div class='del'>-	</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-	</div><div class='del'>-	* C/usage-contact.sgml: Fixed .gif problem</div><div class='del'>-		</div><div class='del'>-	* C/usage-mail.sgml:</div><div class='del'>-	</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Specify the file format</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml, C/usage-mail.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-		</div><div class='del'>-	* C/usage-mail.sgml: Trying to fix the .gif problem</div><div class='del'>-</div><div class='del'>-	* C/fig/calendar.png, C/fig/contact.png, C/usage-calendar.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Redid graphics to add labels to them and</div><div class='del'>-		described the labels in text.</div><div class='del'>-</div><div class='del'>-	* C/config-encryption.sgml, C/evolution.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: Added config-encryption.sgml for building</div><div class='del'>-</div><div class='del'>-	* C/fig/calendar.png, C/fig/config-cal.png, C/fig/config-mail.png,</div><div class='del'>-	C/fig/filter-assist-fig.png, C/fig/filter-new-fig.png,</div><div class='del'>-	C/fig/mail-composer.png, C/fig/mail-druid-pic.png,</div><div class='del'>-	C/fig/mail-inbox.png, C/fig/print-dest.png,</div><div class='del'>-	C/fig/print-preview.png, C/fig/vfolder-createrule-fig.png:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/*png: Updated graphics for newer UI.</div><div class='del'>-</div><div class='del'>-	* C/fig/full-1.png, C/fig/full-2.png, C/fig/full-3.png,</div><div class='del'>-	C/fig/full-4.png, C/fig/full-5.png, C/fig/full-6.png,</div><div class='del'>-	C/fig/full-7.png, C/fig/mainwindow-pic.png, C/usage-mail.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid graphics to add labels to them and</div><div class='del'>-	described in labels in text.  Looks good!</div><div class='del'>-</div><div class='del'>-	* C/usage-encryption.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/encryption.sgml: Added file</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* doc/ChangeLog: Moved my entires to doc/ChangeLog per request of</div><div class='del'>-	danw</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Fixed .gif problem</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Specify the file format</div><div class='del'>-	</div><div class='del'>-	* C/usage-mail.sgml: Trying to fix the .gif problem</div><div class='del'>-	</div><div class='del'>-	* C/usage-calendar.sgml: Redid graphics to add labels to them and</div><div class='del'>-	described the labels in text.</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: Added config-encryption.sgml for building</div><div class='del'>-</div><div class='del'>-	* C/fig/*png: Updated graphics for newer UI.</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid graphics to add labels to them and</div><div class='del'>-	described in labels in text.  Looks good!</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml:</div><div class='del'>-</div><div class='del'>-2001-06-21  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/encryption.sgml: Added file</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* ChangeLog: Moved my entires to doc/ChangeLog per request of danw</div><div class='del'>-	</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Updated for new UI.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-sync: Reworded a little bit for more descrip.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Documented categorizing an event.</div><div class='del'>-</div><div class='del'>-2001-06-20  Kevin Breit  &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Updated Bcc: example</div><div class='del'>-</div><div class='del'>-2001-06-19  Aaron Weber  &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: A couple changes to Kevin's update.</div><div class='del'>-</div><div class='del'>-2001-06-19  Kevin Breit &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Basic edits</div><div class='del'>-	</div><div class='del'>-2001-06-19  Kevin Breit &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary: Updated to say "My Evolution"</div><div class='del'>-</div><div class='del'>-2001-06-19  Kevin Breit &lt;battery841@mediaone.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added definition.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Routine updates.</div><div class='del'>-	</div><div class='del'>-2001-06-07  Duncan Mak  &lt;duncan@lumox.simplemente.net&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Fixed a typo. Thanks to Greg Leblanc for</div><div class='del'>-	pointing this out.</div><div class='del'>-</div><div class='del'>-2001-05-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Re-indented.</div><div class='del'>-</div><div class='del'>-2001-05-18  Duncan Mak  &lt;duncan@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Added two questions about importing</div><div class='del'>-	Outlook (text from Iain).  Fixed some tags and cleaned up a bit</div><div class='del'>-	here and there.</div><div class='del'>-</div><div class='del'>-2001-05-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: Added a question about the permission</div><div class='del'>-	issues with /var/spool/mail.</div><div class='del'>-</div><div class='del'>-2001-05-15  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.</div><div class='del'>-	(EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.</div><div class='del'>-	(all): Depend on `evolution-faq' too.</div><div class='del'>-	(evolution-faq): New.</div><div class='del'>-	(install-data-local): Depend on `evolution-faq' too.  Install the</div><div class='del'>-	FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into</div><div class='del'>-	`$(evolution_helpdir)/evolution-guide'.</div><div class='del'>-</div><div class='del'>-	* C/evolution-faq.sgml: New.</div><div class='del'>-</div><div class='del'>-2001-04-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (install-data-local): Changed dependency for</div><div class='del'>-	install-data-local from "evolution" to "evolution-guide".</div><div class='del'>-</div><div class='del'>-2001-04-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (evolution-guide): Use `$(srcdir)' here.</div><div class='del'>-</div><div class='del'>-2001-04-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (SGML_FILES): Add `evolution.sgml'.</div><div class='del'>-	(evolution-guide): Process `evolution.sgml', not</div><div class='del'>-	`evolution-guide.sgml'.</div><div class='del'>-	(dist-hook): s/evolution-guide/evolution/</div><div class='del'>-	(install-data-local): Likewise.</div><div class='del'>-</div><div class='del'>-2001-02-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: s/helixcode/ximian (How I missed this page</div><div class='del'>-	on the first go-round I don't know).</div><div class='del'>-</div><div class='del'>-2001-03-14  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: there's no apx-fdl.sgml and evolution-guide.sgml</div><div class='del'>-	anymore</div><div class='del'>-</div><div class='del'>-2001-02-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: IMAP subscriptions stuff.</div><div class='del'>-</div><div class='del'>-2001-02-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.</div><div class='del'>-</div><div class='del'>-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for</div><div class='del'>-	Nautilus Readiness.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: glossterm conduit.</div><div class='del'>-</div><div class='del'>-	* C/config-sync.sgml: Glossterm conduit.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other</div><div class='del'>-	truthfulness.</div><div class='del'>-</div><div class='del'>-2001-02-15  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in</div><div class='del'>-	several individual files.</div><div class='del'>-</div><div class='del'>-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.</div><div class='del'>-</div><div class='del'>-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.</div><div class='del'>-</div><div class='del'>-2001-02-09  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and</div><div class='del'>-	clear.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Minor Changes.</div><div class='del'>-</div><div class='del'>-2001-02-08  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Minor Changes.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Minor Changes.</div><div class='del'>-</div><div class='del'>-2001-02-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: A little functionality described.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.</div><div class='del'>-</div><div class='del'>-2001-02-06 Aaron Weber &lt;aaron@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: s/contact manager/address book/ and</div><div class='del'>-	revised text.</div><div class='del'>-</div><div class='del'>-	* C/usage-exec-summary.sgml: New file. Describes Executive</div><div class='del'>-	Summary.</div><div class='del'>-	</div><div class='del'>-2001-01-19  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser</div><div class='del'>-	functions in the Sort section.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: added "ToolTip"</div><div class='del'>-</div><div class='del'>-2001-01-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's</div><div class='del'>-	comments.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: s/Helix Code/Ximian/</div><div class='del'>-</div><div class='del'>-2000-12-13  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to</div><div class='del'>-	filter dialogs... which still need some renaming, IMHO.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Revisions as suggested by</div><div class='del'>-	Dan. Especially to the Folder Limits thing, which still upsets me</div><div class='del'>-	somehow.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Revisions as suggested by Dan.</div><div class='del'>-</div><div class='del'>-2000-11-29  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: added some &lt;glossterms&gt;, added</div><div class='del'>-	linkends to existing glossterms.</div><div class='del'>-</div><div class='del'>-2000-11-28  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Changed intro to Config section. Now</div><div class='del'>-	defines what, exactly, "configurable" means.</div><div class='del'>-</div><div class='del'>-	* C/usage-print.sgml: Stylistic revisions.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Stylistic revisions.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Stylistic revisions.</div><div class='del'>-</div><div class='del'>-2000-11-09  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Message heading Right-Click Menu.</div><div class='del'>-</div><div class='del'>-2000-11-03  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to</div><div class='del'>-	Sasha.</div><div class='del'>-</div><div class='del'>-2000-11-02  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Style and spelling.</div><div class='del'>-</div><div class='del'>-2000-11-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Fixed validation errors.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Fixed HTML, style stuff.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Stylistic overhaul.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed</div><div class='del'>-	folder navigation tips.</div><div class='del'>-</div><div class='del'>-2000-10-31  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Minor stylistic revisions.</div><div class='del'>-</div><div class='del'>-2000-10-30  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* COPYING-DOCS: New file. This is the official place to put the</div><div class='del'>-	FDL now.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-11-01  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Keybindings: added composer keybindings description</div><div class='del'>-</div><div class='del'>-2000-10-25  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Added mail Settings-&gt;Manage Subscriptions menu.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Subscriptions section added. Quite</div><div class='del'>-	incomplete, though.</div><div class='del'>-</div><div class='del'>-2000-10-11  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Re-checked validity of all files. Made</div><div class='del'>-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml</div><div class='del'>-	to bring up to spec.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid Filter &amp; Vfolder to match the new &amp;</div><div class='del'>-	improved functionality.</div><div class='del'>-</div><div class='del'>-	* C/fig/*: Re-did remaining screenshots.</div><div class='del'>-</div><div class='del'>-2000-10-10  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* C/usage-print.sgml: New file, describing printing and</div><div class='del'>-	print-preview.</div><div class='del'>-</div><div class='del'>-	* C/fig/print-preview.png: New file.</div><div class='del'>-</div><div class='del'>-	* C/fig/print-dest.png: New file.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Added usage-print entity.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Fixed calendar menu stuff.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: No more "Actions" menu, other assorted</div><div class='del'>-	menu-related changes.</div><div class='del'>-</div><div class='del'>-2000-10-06  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/ * replaced a whole bunch of screenshots.</div><div class='del'>-</div><div class='del'>-2000-10-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Described Search features.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Contact Manager menus fixed.</div><div class='del'>-</div><div class='del'>-2000-10-04  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Fixed glossterms.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added "Inline," "VCard".</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Fixed glossterms,</div><div class='del'>-	filenames. Spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL,</div><div class='del'>-	  which are now included as part of the gnome-help package.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and</div><div class='del'>-	responded to clahey's suggestions-- notably, commented out the</div><div class='del'>-	"add to master list" category feature.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap</div><div class='del'>-	description.</div><div class='del'>-	</div><div class='del'>-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes</div><div class='del'>-	entities.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: Spellchecked, then decided to comment out</div><div class='del'>-	this file/chapter and all references to it, since it's unlikely to</div><div class='del'>-	be implemented any time soon.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May</div><div class='del'>-	  need more work in the near future.</div><div class='del'>-</div><div class='del'>-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.</div><div class='del'>-</div><div class='del'>-2000-10-03  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Mostly spelling. Still needs major</div><div class='del'>-	alteration.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,</div><div class='del'>-	ran spellcheck. Still needs lots of work, since many menus have</div><div class='del'>-	changed.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,</div><div class='del'>-	spellchecked.</div><div class='del'>-</div><div class='del'>-2000-09-26  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added sendmail and SMTP.</div><div class='del'>-</div><div class='del'>-2000-09-22  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Changed to reflect new menu layout.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Changed to reflect new menu</div><div class='del'>-	layout. Again.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Stop and Display All features.</div><div class='del'>-</div><div class='del'>-2000-09-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.</div><div class='del'>-	  I will have to make changes to the markup-- adding ids, etc, or</div><div class='del'>-	  switch to another version of the markup. Pending discussion by</div><div class='del'>-	  GDP.</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: Changed Matt Loper's email address to</div><div class='del'>-	loper.org; added Jeff Stedfast and Peter Williams to authors list,</div><div class='del'>-	realphebetized.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Revision to reflect current options</div><div class='del'>-	labelling.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Changes to part intros.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Spelling and menu fixes.  Will need more work</div><div class='del'>-	tomorrow.</div><div class='del'>-	</div><div class='del'>-2000-09-20  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.</div><div class='del'>-</div><div class='del'>-	* C/config-sync.sgml: Fixed description of conduit usage.</div><div class='del'>-</div><div class='del'>-2000-09-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Spelling fixes, etc.</div><div class='del'>-</div><div class='del'>-2000-09-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Fixed to install the stylesheet-images as well.</div><div class='del'>-</div><div class='del'>-2000-09-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/ New files: contact-editor.png, mail-composer.png,</div><div class='del'>-	filter-assist-fig.png, mail-inbox.png</div><div class='del'>-</div><div class='del'>-2000-09-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Redid "soft" intro stuff.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.</div><div class='del'>-</div><div class='del'>-2000-09-06  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Editing, proofing.</div><div class='del'>-</div><div class='del'>-2000-09-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Grammar, links, screenshots.</div><div class='del'>-</div><div class='del'>-	* fig/* Re-took most screenshots.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Filters, proofing.</div><div class='del'>-</div><div class='del'>-2000-09-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP</div><div class='del'>-	distinction (there's a theme to these four log entries here).</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added coverage of news.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Revised mail sources content for</div><div class='del'>-	IMAP/POP stuff.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added IMAP and POP.</div><div class='del'>-</div><div class='del'>-2000-08-31  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added regular expressions to glossary.</div><div class='del'>-	Explanation should be removed from other portions of the book now.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Revisions, minor.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new</div><div class='del'>-	status as a part.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a</div><div class='del'>-	part, not an appendix.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Added contextual menus for mail.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Added "quickref and pointers" sections. Props to</div><div class='del'>-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the</div><div class='del'>-	  idea.</div><div class='del'>-</div><div class='del'>-2000-08-30  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Minor fixes.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Corrected grammar, added glossterms, described</div><div class='del'>-	menuref.</div><div class='del'>-</div><div class='del'>-2000-08-25  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid filter and vFolder assistant</div><div class='del'>-	descriptions.</div><div class='del'>-</div><div class='del'>-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.</div><div class='del'>-</div><div class='del'>-	* C/fig/filter-assist-fig.png: New file, showing only assistant.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* C/apx-menuref.sgml: Finished message composer and calendar</div><div class='del'>-	editor menus. Looked at Contact Editor menus and decided to</div><div class='del'>-	document those features after implementation.</div><div class='del'>-</div><div class='del'>-2000-08-24  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Message Composer File and Edit menus.</div><div class='del'>-</div><div class='del'>-2000-08-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Added editor sections.</div><div class='del'>-	</div><div class='del'>-	* C/evolution-guide.sgml: Included Menu Reference Appendix.</div><div class='del'>-</div><div class='del'>-2000-08-22  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Minor markup changes.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much</div><div class='del'>-	work, but not bad for an evening.</div><div class='del'>-</div><div class='del'>-2000-08-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.</div><div class='del'>-</div><div class='del'>-2000-08-09  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to</div><div class='del'>-	sleep.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Redid menubar description.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added coverage of folder config, requested</div><div class='del'>-	that feature be transferred to config section. Switched to</div><div class='del'>-	variablelist in "Other" config section.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added coverage of right-click on messages,</div><div class='del'>-	threaded-view.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.</div><div class='del'>-</div><div class='del'>-2000-08-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added news server coverage.  Other config</div><div class='del'>-	proofing changes.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-08-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING", but</div><div class='del'>-	marked up (probably not very well, but valid) as docbook</div><div class='del'>-	(SGML).</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Subtle change to the legal notice:</div><div class='del'>-	distinguished manual license from software license. Linked to</div><div class='del'>-	apx-gpl.sgml above.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: I redid all the usage files.</div><div class='del'>-</div><div class='del'>-2000-07-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added password remembering/forgetting</div><div class='del'>-	feature.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Mostly moved to variablelists, a few</div><div class='del'>-	language changes.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Minor changes to formatting, wording.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: Changed trademark references, other minor</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Minor fixes, added additional calendar</div><div class='del'>-	section, removed references to unimplemented features. Spellcheck,</div><div class='del'>-	prep for 0.3 release.</div><div class='del'>-	</div><div class='del'>-2000-07-19  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: lots of minor fixes to language. added</div><div class='del'>-	desc. of clahey's cool button-address thing.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut</div><div class='del'>-	bar &amp; folder descs, removed refs to trash.</div><div class='del'>-</div><div class='del'>-2000-07-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Altered category addition stuff, plus</div><div class='del'>-	suggestions from Kevin.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added ldap and signature definitions (from</div><div class='del'>-	Kevin).</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.</div><div class='del'>-</div><div class='del'>-2000-07-14  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: moved to variablelists from itemizedlists</div><div class='del'>-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists</div><div class='del'>-</div><div class='del'>-2000-06-29  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Minor fixes.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: New File for feature that is yet to come.</div><div class='del'>-	* C/evolution-guide.sgml: Added entity for notes chapter.</div><div class='del'>-	* C/usage-mainwindow.sgml: Un-commented references to notes section.</div><div class='del'>-	</div><div class='del'>-	* C/apx-authors.sgml: Removed dcm from author list.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Added to-do list features.</div><div class='del'>-</div><div class='del'>-2000-06-28  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: commented out future features; redid</div><div class='del'>-	contact editor stuff.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"</div><div class='del'>-</div><div class='del'>-2000-06-27  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/devel-action.sgml: Removed file.</div><div class='del'>-	* C/devel-script.sgml: Same.</div><div class='del'>-	* C/devel-component.sgml: Same.</div><div class='del'>-	* C/preface.sgml: Removed references to devel section.</div><div class='del'>-	* C/evolution-guide.sgml: Removed references to devel section.</div><div class='del'>-</div><div class='del'>-2000-06-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Made moderate to major stylistic updates</div><div class='del'>-	to this, apx-gloss.sgml, and to all files beginning with "usage,"</div><div class='del'>-	especially wrt HTML mail.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-06-15  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Category stuff improved.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Now covers how to add an event properly.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added the devel directory.</div><div class='del'>-</div><div class='del'>-2000-06-28  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed</div><div class='del'>-	devel-*.sgml files.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/.cvsignore: added evolution-guide and evolution-guide.junk</div><div class='del'>-	so we don't get the '? doc/C/evolution-guide' messages each time we</div><div class='del'>-	do a cvs update.</div><div class='del'>-</div><div class='del'>-2000-06-14  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Improved filter and vfolder</div><div class='del'>-	description, and some minor changes from me and Kevin.</div><div class='del'>-</div><div class='del'>-2000-06-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.</div><div class='del'>-	* C/fig/config-cal.png: new file (screenshot for above)</div><div class='del'>-	* C/fig/config-mail.png: same</div><div class='del'>-	</div><div class='del'>-2000-06-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.</div><div class='del'>-	</div><div class='del'>-	* C/config-prefs.sgml: began total overhaul of structure and added</div><div class='del'>-	content reflecting new prefs items.  needs LOTS more work.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: changed some references to id's in the </div><div class='del'>-	config-prefs section.	</div><div class='del'>-</div><div class='del'>-	* C/fig/config-mail.png: changed filename from config-prefs.png</div><div class='del'>-</div><div class='del'>-2000-06-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: filename was wrong, altered.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: improved filter instructions, vFolder</div><div class='del'>-	instructions.  still need work though.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: added screenshot.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: added screenshot.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: added screenshots, and now describes the</div><div class='del'>-	actual prefs dialogs.</div><div class='del'>-</div><div class='del'>-	* C/fig/config-camel.png: new (screenshot) file</div><div class='del'>-	* C/fig/filter-druid.png: same</div><div class='del'>-	* C/fig/vfolder-druid.png: same</div><div class='del'>-	* C/fig/calendar.png: same</div><div class='del'>-	* C/fig/contact.png: same</div><div class='del'>-	* C/fig/vfolder-createrule-fig.png: same</div><div class='del'>-	* C/fig/filter-new-fig.png: same</div><div class='del'>-	* C/fig/config-camel.png: same</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: recurse into the C directory</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Rules to build and install the docs. Mostly</div><div class='del'>-	stolen from gnomecal. Only works if you have GDP stuff</div><div class='del'>-	(http://www.gnome.org/gdp/) set up on your machine, but won't make</div><div class='del'>-	the build fail if you don't.</div><div class='del'>-</div><div class='del'>-2000-05-29  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: incorporated kevins notes.</div><div class='del'>-	* C/usage-mainwindow.sgml: incorporated kevins notes.</div><div class='del'>-</div><div class='del'>-2000-05-27  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: added Kevin Breit to author and</div><div class='del'>-	copyright.</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: Put app authors in a simplelist.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send</div><div class='del'>-        users to config-setupassist chapter. This and the following changes </div><div class='del'>-	take setup druid coverage out of usage </div><div class='del'>-	section and put it in config section. </div><div class='del'>-	* C/config-setupassist.sgml: Added mail druid coverage from</div><div class='del'>-	usage-setup.sgml.</div><div class='del'>-	* C/usage-setup.sgml: Removed file. contents in</div><div class='del'>-	config-setupassist.sgml.  </div><div class='del'>-	* C/evolution-guide.sgml: Removed</div><div class='del'>-	USAGE-SETUP entity (and file usage-setup.sgml.)</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-2000-05-26  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/mainwindow-pic.png: new file</div><div class='del'>-	* C/fig/mail-druid-pic.png: new file</div><div class='del'>-	* C/fig: New directory, for figure graphics.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.</div><div class='del'>-	</div><div class='del'>-	* C/usage-setup.sgml: More accurate description of druid, and</div><div class='del'>-	moved to mail section-- see usage-mail.sgml entry.  This is a new</div><div class='del'>-	location for this entity, and it may move more later.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: altered description of starting</div><div class='del'>-	evolution. added screenshot for main-window picture. </div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: added screenshots, added coverage of setup</div><div class='del'>-	druid and put it into get-and-send section, which is probably not</div><div class='del'>-	where it should stay.  Also started filter druid coverage and</div><div class='del'>-	clarified examples, esp. in Bcc: section.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Clarified examples.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: rewording of "what is" and "about book" sections.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered</div><div class='del'>-	phrasing in part intros, changed order of Setup-assistant section.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: changed wording, removed ref. to re-running</div><div class='del'>-	setup assistant.</div><div class='del'>-</div><div class='del'>-2000-05-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evo_book_0.1.sgml: removed.	</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: new file.</div><div class='del'>-	* C/apx-bugs.sgml: same.</div><div class='del'>-	* C/apx-fdl.sgml: same.</div><div class='del'>-	* C/config-prefs.sgml: same.</div><div class='del'>-	* C/config-setupassist.sgml: same.</div><div class='del'>-	* C/config-sync.sgml: same.</div><div class='del'>-	* C/devel-action.sgml: same.</div><div class='del'>-	* C/devel-component.sgml: same.</div><div class='del'>-	* C/devel-script.sgml: same.</div><div class='del'>-	* C/evolution-guide.sgml: same.</div><div class='del'>-	* C/preface.sgml: same.</div><div class='del'>-	* C/usage-calendar.sgml: same.</div><div class='del'>-	* C/usage-contact.sgml: same.</div><div class='del'>-	* C/usage-mail.sgml: same.</div><div class='del'>-	* C/usage-mainwindow.sgml: same.</div><div class='del'>-	* C/usage-setup.sgml: same.</div><div class='del'>-	* C/usage-sync.sgml: same.</div><div class='del'>-</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Camel-Classes: sync</div><div class='del'>-</div><div class='del'>-2000-04-16  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evo_book_0.1.sgml: new file (doc sgml)</div><div class='del'>-	</div><div class='del'>-	* C/ : New directory for doc sgml &amp; graphics</div><div class='del'>-</div><div class='del'>-2000-03-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* white-papers/widgets/e-table.sgml: Added Miguel to the author</div><div class='del'>-	list for ETable.</div><div class='del'>-</div><div class='del'>-2000-03-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New</div><div class='del'>-	doc for the ETable widget.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: Created a ChangeLog file for the docs file and</div><div class='del'>-	integrated the individual ChangeLogs.</div><div class='del'>-</div><div class='del'>-2000-03-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ibex.sgml: Ibex white paper</div><div class='del'>-</div><div class='del'>-2000-02-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: Sections for the calendar user agent and the</div><div class='del'>-	calendar client library.</div><div class='del'>-</div><div class='del'>-2000-02-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: Reorg a bit more, make the &lt;PRE&gt; section narrower,</div><div class='del'>-	add more references to graphics (the graphics themselves are</div><div class='del'>-	still in beta), add a section on CamelStream.</div><div class='del'>-</div><div class='del'>-2000-02-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: Section for the personal calendar server.</div><div class='del'>-</div><div class='del'>-2000-02-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: add Bertrand to authors, edit his additions</div><div class='del'>-</div><div class='del'>-2000-02-28  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: add a blurb about camel offering</div><div class='del'>-	uniform interface. needs style and grammar corrections. </div><div class='del'>-	Talk about virtual folders.</div><div class='del'>-	Talk about lightweight messages</div><div class='del'>-	Talk about IMAP. </div><div class='del'>-</div><div class='del'>-2000-02-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: Beginnings of a Camel white paper</div><div class='del'>-</div><div class='del'>-2000-02-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: New file for the Evolution calendaring white paper.</div><div class='head'>diff --git a/doc/Design b/doc/Design<br/>deleted file mode 100644<br/>index 7b7cf6f821..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Design?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/Design</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-</div><div class='del'>-The Evolution Project specification</div><div class='del'>-Miguel de Icaza.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Introduction</div><div class='del'>-</div><div class='del'>-	Evolution is a project aiming at providing the free software</div><div class='del'>-	community with a professional, high-quality tool for managing</div><div class='del'>-	mail, appointments, tasks and other personal information</div><div class='del'>-	tools.  </div><div class='del'>-</div><div class='del'>-	We want to make Evolution a system that addresses our needs</div><div class='del'>-	(the free software development community) and we believe that</div><div class='del'>-	by addressing our needs, we will provide a system that will</div><div class='del'>-	scale in the years to come for other users that are just</div><div class='del'>-	starting to use computers and the internet.</div><div class='del'>-</div><div class='del'>-	The main objectives of Evolution are to provide these powerful</div><div class='del'>-	features, and to make the user interface as pretty and</div><div class='del'>-	polished as possible.</div><div class='del'>-</div><div class='del'>-	Evolution is a GNOME application and a number of auxiliary</div><div class='del'>-	CORBA servers that act as the storage backends. </div><div class='del'>-</div><div class='del'>-	Evolution will copy the best user interface bits and the best</div><div class='del'>-	ideas and features found on contemporary groupware systems.</div><div class='del'>-</div><div class='del'>-* Evolution internals.</div><div class='del'>-</div><div class='del'>-	Evolution can store its information locally (files for mail,</div><div class='del'>-	calendar and address book) or on a remote server (imap/pop,</div><div class='del'>-	cap, ldap).  </div><div class='del'>-</div><div class='del'>-	Given the importance of syncing in this modern PDA world,</div><div class='del'>-	the Evolution GUI acts as a client to the data repository.</div><div class='del'>-	The data repository is a GUI-less CORBA server called Wombat.</div><div class='del'>-</div><div class='del'>-	Wombat provides a unified access system to the calendar and</div><div class='del'>-	addressbook data (doing mail is a bit hard, so we are leaving</div><div class='del'>-	this as a TODO item for now).</div><div class='del'>-</div><div class='del'>-	Wombat's CORBA interfaces are notifier-based.  This means that</div><div class='del'>-	CORBA requests sent to Wombat do not return values</div><div class='del'>-	inmediately, but rather than for Wombat requests the user has</div><div class='del'>-	to provide a CORBA object that will be notified of what</div><div class='del'>-	happened.</div><div class='del'>-</div><div class='del'>-	Yes, that sounds hairy.  It is actually pretty simple.  It</div><div class='del'>-	basically means that you submit requests to Wombat, and a</div><div class='del'>-	callback is invoked in your code when the request has been</div><div class='del'>-	carried away. </div><div class='del'>-</div><div class='del'>-	This enables a Palm to sync to the repository without having</div><div class='del'>-	the GUI for Evolution running.  It also means that volunteers</div><div class='del'>-	will be able to write text-based and web-based versions of</div><div class='del'>-	Evolution (not me though :-).</div><div class='del'>-</div><div class='del'>-* Evolution as a platform</div><div class='del'>-</div><div class='del'>-	Evolution is more than a client for managing the above</div><div class='del'>-	information: Evolution is a platform for building groupware</div><div class='del'>-	applications that use the above components to get their work done.</div><div class='del'>-</div><div class='del'>-	To achieve this Evolution is designed to be scriptable, and it</div><div class='del'>-	exports its internals trough CORBA/Bonobo.  It is implemented</div><div class='del'>-	as a collection of Bonobo containers and Bonobo components.</div><div class='del'>-</div><div class='del'>-	There is a clean separation between the views (the user</div><div class='del'>-	interface) and the model (the view).  The views that we are</div><div class='del'>-	writing are GNOME based, and they talk to the Wombat CORBA</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	Wombat takes care of notifications to the various clients for</div><div class='del'>-	the data. </div><div class='del'>-</div><div class='del'>-* The overall organization</div><div class='del'>-</div><div class='del'>-	A bar similar to outlook provides shortcuts for accessing the</div><div class='del'>-	various resources managed by Evolution: mail folders,</div><div class='del'>-	contacts, tasks, journal entries, notes, messages and other</div><div class='del'>-	user-defined destinations. </div><div class='del'>-</div><div class='del'>-* User interface widgets</div><div class='del'>-</div><div class='del'>-** The ETable package</div><div class='del'>-</div><div class='del'>-	This package provides a way of displaying and editing tables.</div><div class='del'>-</div><div class='del'>-	Tables are displayed based on a TableColumn definition that</div><div class='del'>-	defines the layout used for the display.  Table Columns can be</div><div class='del'>-	nested, and the package does grouping of information displayed</div><div class='del'>-	according to the criteria defined there.</div><div class='del'>-</div><div class='del'>-	This is used in multiple places troughout evolution: it is</div><div class='del'>-	used for the Mail summary display, for the TODO display and</div><div class='del'>-	TODO new data entry and for the address book.</div><div class='del'>-</div><div class='del'>-	Nesting in the address book can be performed on various</div><div class='del'>-	fields.  For example, a first level of nesting could be</div><div class='del'>-	"Company" and a second level would be "Country" the result is</div><div class='del'>-	a 2-level tree that can be collapsed expanded and contains the</div><div class='del'>-	information sorted/grouped by those two criteria.</div><div class='del'>-</div><div class='del'>-	The user interface for this will be copied from Outlook: the</div><div class='del'>-	possibility of adding and removing fields with drag and drop</div><div class='del'>-	as well as grouping using drag and drop.</div><div class='del'>-</div><div class='del'>-* The Mail system</div><div class='del'>-</div><div class='del'>-** The Mail sources</div><div class='del'>-</div><div class='del'>-	The mail system will support 4 sources of mail:</div><div class='del'>-</div><div class='del'>-		POP3 (transfer to a local file).</div><div class='del'>-		IMAP</div><div class='del'>-		Local mbox format in $MAIL.</div><div class='del'>-		Local mbox format that have other delivery points.</div><div class='del'>-</div><div class='del'>-	On top of that, it will be possible to browse existing mbox</div><div class='del'>-	archives (and possibly other formats in the future, like</div><div class='del'>-	Mailbox and Maildir).</div><div class='del'>-</div><div class='del'>-** Storing the mail</div><div class='del'>-</div><div class='del'>-	Mail that gets incorporated into the system is stored in mbox</div><div class='del'>-	format, and summary files are provided for quick access to the</div><div class='del'>-	files.  No modifications to the file on disk is performed (I</div><div class='del'>-	am not quite sure about this, perhaps we want to add the</div><div class='del'>-	status flags and some method for adding metadata to the mail).</div><div class='del'>-</div><div class='del'>-	Summary files are rebuilt on demand or rebuild if the mbox</div><div class='del'>-	file and the summary file have got out of sync.</div><div class='del'>-</div><div class='del'>-	A Metadata system that will enable us to attach information to</div><div class='del'>-	a message will have to be designed and implemented (enabling</div><div class='del'>-	users to add annotations to mails, and special keywords and</div><div class='del'>-	flags in a per-message fashion).</div><div class='del'>-</div><div class='del'>-** Folders</div><div class='del'>-</div><div class='del'>-	Michael Zucchi is working on a system that will let users</div><div class='del'>-	easily define rules for splitting their incoming mail into</div><div class='del'>-	physical folders.  </div><div class='del'>-</div><div class='del'>-	A further refinement to Folders are Virtual Folders.  This</div><div class='del'>-	basically provides a powerful search and viewing facility for</div><div class='del'>-	mail.  It works like this: when a mail is "incorporated" into</div><div class='del'>-	Evolution it is scanned and indexed.</div><div class='del'>-</div><div class='del'>-	Then users can enter queries into Evolution that will search</div><div class='del'>-	the entire database of messages.	</div><div class='del'>-</div><div class='del'>-** Virtual folders</div><div class='del'>-</div><div class='del'>-	Virtual folders will enable users to read/browse their mail in</div><div class='del'>-	new ways: by specifying search criterias, these folders will</div><div class='del'>-	contain messages that match the criteria given.  </div><div class='del'>-</div><div class='del'>-	There is more information about this in the libcamel</div><div class='del'>-	directory. </div><div class='del'>-</div><div class='del'>-	We will index all headers from a message, and possible the</div><div class='del'>-	contents of messages and keep those on a separate file, to</div><div class='del'>-	enable users to query their mail database.</div><div class='del'>-</div><div class='del'>-** Mail summary display</div><div class='del'>-</div><div class='del'>-	The summary will be displayed using the ETable package, to</div><div class='del'>-	enable users to add a number of sorting criteria and various</div><div class='del'>-	display methods for the summary view.</div><div class='del'>-</div><div class='del'>-	The Outlook methods for displaying will be present on the</div><div class='del'>-	system.</div><div class='del'>-</div><div class='del'>-	Message threading will be supported in Evolution.</div><div class='del'>-</div><div class='del'>-** Message display engine</div><div class='del'>-</div><div class='del'>-	We are going to be using a combination of</div><div class='del'>-	libcamel/limime/libjamie to parse messages and render them</div><div class='del'>-	into an HTML buffer.</div><div class='del'>-</div><div class='del'>-* The HTML engine</div><div class='del'>-</div><div class='del'>-	The GtkHTML engine will be used to display messages, and will</div><div class='del'>-	be extended to support a number of features that we require:</div><div class='del'>-	internal handling of characters will be based on Unicode</div><div class='del'>-</div><div class='del'>-* The message composer</div><div class='del'>-</div><div class='del'>-	Regular features found in composers will be added: connecting</div><div class='del'>-	the composer to the address book, support for drag and drop</div><div class='del'>-	for including attachments, editing the message, archiving</div><div class='del'>-	drafts and archiving messages sent.</div><div class='del'>-</div><div class='del'>-	Ettore has been working on adding editing support to the</div><div class='del'>-	GtkHTML and he is working currently on a Bonobo component that</div><div class='del'>-	will provide a ready-to-use Bonobo control for embedding into</div><div class='del'>-	other applications.</div><div class='del'>-</div><div class='head'>diff --git a/doc/Keybindings b/doc/Keybindings<br/>deleted file mode 100644<br/>index f232802110..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Keybindings?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/Keybindings</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-* Keybindings for the mailer</div><div class='del'>-</div><div class='del'>-	Delete key: 	Deletes message, moves forward.</div><div class='del'>-	</div><div class='del'>-* Keybindings for the composer</div><div class='del'>-</div><div class='del'>-	Control-s:		Saves message to file.</div><div class='del'>-	Control-w:		Closes composer window.</div><div class='del'>-	Control-Return: 	Sends message now.</div><div class='del'>-</div><div class='del'>-	F6:			Opens find dialog.</div><div class='del'>-	F7:			Opens replace dialog.</div><div class='del'>-</div><div class='head'>diff --git a/doc/Makefile.am b/doc/Makefile.am<br/>deleted file mode 100644<br/>index 75be1c7ed2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = devel</div><div class='head'>diff --git a/doc/NAMESPACE b/doc/NAMESPACE<br/>deleted file mode 100644<br/>index 4ca7c454d1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/NAMESPACE?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/NAMESPACE</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-</div><div class='del'>-	Here is how both the Evolution implementation and IDL namespacing</div><div class='del'>-is to be organized, NB. for implementations and oafinfo filenames we replace</div><div class='del'>-'/' with '_'</div><div class='del'>-</div><div class='del'>-Files:</div><div class='del'>-</div><div class='del'>-/GNOME/Evolution/</div><div class='del'>-</div><div class='del'>-	Addressbook/</div><div class='del'>-	Calendar/</div><div class='del'>-		Control</div><div class='del'>-		gnomecal</div><div class='del'>-	Composer/</div><div class='del'>-	Mail/</div><div class='del'>-	Notes/		</div><div class='del'>-	Shell/</div><div class='del'>-	Summary/</div><div class='del'>-		test</div><div class='del'>-		rdf</div><div class='del'>-	Wombat/</div><div class='del'>-</div><div class='del'>-Components:</div><div class='del'>-</div><div class='del'>-	Shell components end in _ShellComponent, controls in _Control,</div><div class='del'>-executive summary components in _ExecutiveSummaryComponent and</div><div class='del'>-factories append 'Factory'.</div><div class='del'>-</div><div class='del'>-GNOME/</div><div class='del'>-	Evolution/</div><div class='del'>-</div><div class='del'>-		Shell</div><div class='del'>-</div><div class='del'>-		Addressbook/</div><div class='del'>-			MiniCard/</div><div class='del'>-				Control, ControlFactory</div><div class='del'>-			SelectNames, SelectNamesFactory</div><div class='del'>-			Control, ControlFactory</div><div class='del'>-			ShellComponent, ShellComponentFactory</div><div class='del'>-		Calendar/		</div><div class='del'>-			iTip/</div><div class='del'>-				Control, ControlFactory</div><div class='del'>-			Control, ControlFactory</div><div class='del'>-			ShellComponent, ShellComponentFactory</div><div class='del'>-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory</div><div class='del'>-		Mail/</div><div class='del'>-			Control, ControlFactory</div><div class='del'>-			ShellComponent, ShellComponentFactory</div><div class='del'>-			ExecutiveSummaryComponent, ExecutiveSummaryComponentFactory</div><div class='del'>-			Composer, ComposerFactory</div><div class='del'>-		Notes/</div><div class='del'>-			control, controlFactory</div><div class='del'>-			shellComponent, shellComponentFactory</div><div class='del'>-		Summary/</div><div class='del'>-			rdf/</div><div class='del'>-				SummaryComponent, SummaryComponentFactory</div><div class='del'>-			test/</div><div class='del'>-				Component, ComponentFactory</div><div class='del'>-</div><div class='del'>-			ShellComponent, ShellComponentFactory</div><div class='del'>-</div><div class='del'>-		Wombat/</div><div class='del'>-			ServerFactory</div><div class='del'>-			CalendarFactory</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/.cvsignore b/doc/devel/.cvsignore<br/>deleted file mode 100644<br/>index 81268d18cf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-html</div><div class='del'>-evolution-devel-guide.html</div><div class='del'>-*.stamp</div><div class='head'>diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog<br/>deleted file mode 100644<br/>index e4edcaaf77..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,274 +0,0 @@</div><div class='del'>-2002-03-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/Makefile.am (GTKDOC_LIBS): Update for</div><div class='del'>-	libversit change.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am (GTKDOC_LIBS): Likewise</div><div class='del'>-</div><div class='del'>-2002-01-24  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am: Use EVOLUTION_CALENDAR_CFLAGS</div><div class='del'>-	and EVOLUTION_CALENDAR_LIBS.</div><div class='del'>-	* calendar/cal-util/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2001-12-18  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am: cal-client needs bonobo-conf</div><div class='del'>-	now</div><div class='del'>-</div><div class='del'>-2001-10-29  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/alarm-generation.sgml: Updated docs for repeating</div><div class='del'>-	alarms.</div><div class='del'>-</div><div class='del'>-2001-07-31  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (dist-hook): Remove the copying of the </div><div class='del'>-	index.sgml file which doesn't seem to be generated </div><div class='del'>-	anywhere anyway.</div><div class='del'>-</div><div class='del'>-2001-06-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: ... and comment out more exec summary stuff.</div><div class='del'>-</div><div class='del'>-	* reference.sgml: Here too.</div><div class='del'>-	</div><div class='del'>-2001-06-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/Makefile.am,</div><div class='del'>-	calendar/cal-client/Makefile.am: Fix make dist.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: clean up a bit.</div><div class='del'>-</div><div class='del'>-2001-06-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: disable executive summary build because it is no</div><div class='del'>-	longer built</div><div class='del'>-	</div><div class='del'>-2001-06-21  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am: add new lib</div><div class='del'>-</div><div class='del'>-2001-06-21  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am:</div><div class='del'>-	calendar/cal-client/Makefile.am:</div><div class='del'>-	calendar/cal-util/Makefile.am:</div><div class='del'>-	importer/Makefile.am:</div><div class='del'>-	executive-summary/Makefile.am: Changed to used gtk-doc's</div><div class='del'>-	canonical Makefile.am (plus some tweaks because not every</div><div class='del'>-	dir builds html).</div><div class='del'>-</div><div class='del'>-2001-06-14  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* executive-summary/.cvsignore: </div><div class='del'>-	* calendar/cal-util/.cvsignore: </div><div class='del'>-	* calendar/cal-client/.cvsignore: added *-undocumented.txt</div><div class='del'>-</div><div class='del'>-2001-05-24  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: s/Helix Code/Ximian</div><div class='del'>-</div><div class='del'>-2001-05-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Removed some evolution-*-decl.txt files since these are</div><div class='del'>-	autogenerated by gtk-doc and don't belong in cvs anyway.</div><div class='del'>-	Should the tmpl/ dirs also be removed??</div><div class='del'>-</div><div class='del'>-	Updated: Readded them and updated the .cvsignore files - I guess</div><div class='del'>-	we do need them after all ;-)</div><div class='del'>-</div><div class='del'>-2001-04-25  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Removed generated files from CVS, updated .cvsignore files</div><div class='del'>-	to include generated files.</div><div class='del'>-</div><div class='del'>-2001-04-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* executive-summary/Makefile.am (scan) [ENABLE_GTK_DOC]: Kludge</div><div class='del'>-	builddir != srcdir behavior by symlinking the $(DOC_MODULE).types</div><div class='del'>-	file into the builddir.</div><div class='del'>-	* calendar/cal-client/Makefile.am (scan) [ENABLE_GTK_DOC]:</div><div class='del'>-	Likewise.</div><div class='del'>-	* calendar/cal-util/Makefile.am (scan) [ENABLE_GTK_DOC]: Likewise.</div><div class='del'>-</div><div class='del'>-2001-04-23  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Disable the importer references here</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove the importer stuff for now.</div><div class='del'>-</div><div class='del'>-2001-04-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* importer/evolution-shell-importer.types: changed path to the</div><div class='del'>-	importer header files, since we've had reports that they aren't being</div><div class='del'>-	found (though it worked OK for me).</div><div class='del'>-</div><div class='del'>-2001-04-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am (install-data-local): Install</div><div class='del'>-	the $(DOC_DIR_INSTALL_FILES) from the srcdir.</div><div class='del'>-	* calendar/cal-util/Makefile.am (install-data-local): Likewise.</div><div class='del'>-	* importer/Makefile.am (install-data-local): Likewise.</div><div class='del'>-	* executive-summary/Makefile.am (install-data-local): Likewise.</div><div class='del'>-</div><div class='del'>-2001-01-26  John R. Sheets  &lt;dusk@ravendusk.org&gt;</div><div class='del'>-</div><div class='del'>-	* importer/Makefile.am: Change (nonexistant) importer.sgml</div><div class='del'>-	references to evolution-importer.sgml to fix dependency problem.</div><div class='del'>-</div><div class='del'>-2001-01-17  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (local_entities): Added the importer stuff.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Added entities for the importer documents.</div><div class='del'>-</div><div class='del'>-	* reference.sgml: Added the public and private APIs for the importer.</div><div class='del'>-</div><div class='del'>-	* importer/*: New directory containing all the documenation for the</div><div class='del'>-	importer.</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Ximianified.</div><div class='del'>-</div><div class='del'>-	* calendar/evolution-calendar.sgml: Ditto.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.</div><div class='del'>-</div><div class='del'>-2001-01-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Make it work when gtk-doc is not installed.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2000-12-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Added proper dependency lists to the gtk-doc mess.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/Makefile.am (TARGET_DIR): Removed unused</div><div class='del'>-	variable.</div><div class='del'>-	(SOURCE_FILES): New variable with the list of source files we</div><div class='del'>-	depend on.</div><div class='del'>-	(IGNORED_SOURCE_HEADERS): New variable with the headers we ignore</div><div class='del'>-	for the gtkdoc-scan phase.</div><div class='del'>-	(scan_generated):</div><div class='del'>-	(tmpl_dependencies):</div><div class='del'>-	(tmpl_sources):</div><div class='del'>-	(tmpl_generated);</div><div class='del'>-	(sgml_dependencies):</div><div class='del'>-	(sgml_generated): Lists of stuff that is generated and that other</div><div class='del'>-	stuff depends on.</div><div class='del'>-	(all): Added the $(sgml_generated) as the final target.</div><div class='del'>-	(install-data-local): Added an installation hook; gtk-doc seems to</div><div class='del'>-	want some of its generated files to be installed.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/Makefile.am: Made the same changes as for</div><div class='del'>-	calendar/cal-client/Makefile.am.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/evolution-cal-util-sections.txt: Updated.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (local_entities): Added alarm-generation.sgml.</div><div class='del'>-	(all): Made the main target be the html/index.html.</div><div class='del'>-</div><div class='del'>-2000-12-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/alarm-generation.sgml: New file with a description of</div><div class='del'>-	the algorithm used to generate alarm instances.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Added an entity for the above</div><div class='del'>-	chapter.</div><div class='del'>-</div><div class='del'>-	* calendar/evolution-calendar.sgml: Reference the entity here.</div><div class='del'>-</div><div class='del'>-	* calendar/Makefile.am (EXTRA_DIST): Added alarm-generation.sgml.</div><div class='del'>-</div><div class='del'>-2000-12-13  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/Makefile.am (EXTRA_DIST): make it public-reference.sgml</div><div class='del'>-	not referenc.sgml here.</div><div class='del'>-</div><div class='del'>-2000-11-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/architecture.sgml: Finished the calendar architecture</div><div class='del'>-	chapter.</div><div class='del'>-</div><div class='del'>-2000-11-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Added an id for the API reference &lt;part&gt;.</div><div class='del'>-	Added the FDL &lt;legalnotice&gt;.</div><div class='del'>-	Added the preface and toplevel reference entities.</div><div class='del'>-	Added entities for Evolution, Wombat, and Camel.</div><div class='del'>-	Added an appendix for the GNU FDL.</div><div class='del'>-	</div><div class='del'>-	* preface.sgml: New file with the introduction to the Evolution</div><div class='del'>-	Developer's Guide.</div><div class='del'>-</div><div class='del'>-	* reference.sgml: Split the toplevel reference part into its own</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-	* fdl.sgml: Added the GNU Free Documentation License.</div><div class='del'>-</div><div class='del'>-	* calendar/evolution-calendar.sgml: Added an id for the &lt;part&gt;.</div><div class='del'>-</div><div class='del'>-	* calendar/public-reference.sgml: Added an id for the &lt;reference&gt;.</div><div class='del'>-	Moved this file over from calendar/reference.sgml.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (local_entities): Added a list of the SGML files</div><div class='del'>-	that define entities for inclusion in the toplevel document.  This</div><div class='del'>-	way we can track documentation file dependencies down to all</div><div class='del'>-	levels.</div><div class='del'>-	(html/index.html): Made the toplevel document depend on</div><div class='del'>-	$(local_entities).  Also, removed the "html" target and put its</div><div class='del'>-	contents directly here; this way we avoid having .PHONY targets.</div><div class='del'>-	(EXTRA_DIST): Removed the evolution_devel_guideDATA; it made no</div><div class='del'>-	sense.</div><div class='del'>-	(content_files): Added preface.sgml and reference.sgml.</div><div class='del'>-</div><div class='del'>-2000-09-15  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Made the toplevel &lt;book&gt; id be</div><div class='del'>-	"index".</div><div class='del'>-</div><div class='del'>-2000-08-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/*: Integrated the cal-util library into the</div><div class='del'>-	documentation framework.</div><div class='del'>-</div><div class='del'>-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.</div><div class='del'>-	Added entity for libical.</div><div class='del'>-</div><div class='del'>-	* calendar/reference.sgml: Added the cal-util reference entries.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated</div><div class='del'>-	for new API.</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (maintainer-clean-local): Don't depend</div><div class='del'>-	on 'clean'; this messes up maintainer-clean.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: New &lt;book&gt; toplevel for the</div><div class='del'>-	Evolution Developer's Guide.</div><div class='del'>-</div><div class='del'>-	* calendar/evolution-calendar.sgml: New &lt;part&gt; for the calendar</div><div class='del'>-	developer's documentation.</div><div class='del'>-</div><div class='del'>-	* calendar/architecture.sgml: New &lt;chapter&gt; for the calendar</div><div class='del'>-	architecture.</div><div class='del'>-</div><div class='del'>-	* calendar/reference.sgml: New &lt;reference&gt; for the calendar API</div><div class='del'>-	reference.</div><div class='head'>diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am<br/>deleted file mode 100644<br/>index f8597eccf1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-SUBDIRS = calendar </div><div class='del'>-</div><div class='del'>-# The name of the module, e.g. 'glib'.</div><div class='del'>-DOC_MODULE=evolution-devel-guide</div><div class='del'>-</div><div class='del'>-# The top-level SGML file. Change it if you want.</div><div class='del'>-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code. Relative to $(srcdir).</div><div class='del'>-# gtk-doc will search all .c &amp; .h files beneath here for inline comments</div><div class='del'>-# documenting functions and macros.</div><div class='del'>-#DOC_SOURCE_DIR=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-scan.</div><div class='del'>-#SCAN_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-mkdb.</div><div class='del'>-#MKDB_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-fixref.</div><div class='del'>-#FIXXREF_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Used for dependencies.</div><div class='del'>-#HFILE_GLOB=</div><div class='del'>-#CFILE_GLOB=</div><div class='del'>-</div><div class='del'>-# Header files to ignore when scanning.</div><div class='del'>-#IGNORE_HFILES=</div><div class='del'>-</div><div class='del'>-# Images to copy into HTML directory.</div><div class='del'>-HTML_IMAGES =</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Add your module's hand-written and auto-generated files here; these</div><div class='del'>-# are used for dependency tracking.</div><div class='del'>-</div><div class='del'>-local_entities =					\</div><div class='del'>-	calendar/alarm-generation.sgml			\</div><div class='del'>-	calendar/architecture.sgml			\</div><div class='del'>-	calendar/evolution-calendar.sgml		\</div><div class='del'>-	calendar/public-reference.sgml			\</div><div class='del'>-							\</div><div class='del'>-	calendar/cal-client/sgml/cal-client.sgml	\</div><div class='del'>-							\</div><div class='del'>-	calendar/cal-util/sgml/cal-component.sgml	\</div><div class='del'>-	calendar/cal-util/sgml/cal-recur.sgml		\</div><div class='del'>-	calendar/cal-util/sgml/cal-util.sgml		\</div><div class='del'>-	calendar/cal-util/sgml/timeutil.sgml</div><div class='del'>-</div><div class='del'>-#	executive-summary/sgml/executive-summary-component.sgml	\</div><div class='del'>-#	executive-summary/sgml/executive-summary-component-factory.sgml	\</div><div class='del'>-#	executive-summary/sgml/executive-summary-component-factory-client.sgml	\</div><div class='del'>-#	executive-summary/sgml/executive-summary-html-view.sgml</div><div class='del'>-</div><div class='del'>-#	importer/sgml/evolution-importer.sgml		\</div><div class='del'>-#	importer/sgml/evolution-importer-client.sgml</div><div class='del'>-</div><div class='del'>-installed_content_files = 		\</div><div class='del'>-	fdl.sgml			\</div><div class='del'>-	preface.sgml			\</div><div class='del'>-	reference.sgml</div><div class='del'>-</div><div class='del'>-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).</div><div class='del'>-content_files =				\</div><div class='del'>-	$(installed_content_files)	\</div><div class='del'>-	$(local_entities)</div><div class='del'>-</div><div class='del'>-# Other files to distribute.</div><div class='del'>-extra_files =</div><div class='del'>-</div><div class='del'>-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib</div><div class='del'>-# contains GtkObjects/GObjects and you want to document signals and properties.</div><div class='del'>-#GTKDOC_CFLAGS =</div><div class='del'>-#GTKDOC_LIBS =</div><div class='del'>-#</div><div class='del'>-#GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)</div><div class='del'>-#GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)</div><div class='del'>-</div><div class='del'>-# If you need to override some of the declarations, place them in this file</div><div class='del'>-# and uncomment this line.</div><div class='del'>-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt</div><div class='del'>-</div><div class='del'>-HTML_DIR = $(datadir)/gnome/html</div><div class='del'>-</div><div class='del'>-###########################################################################</div><div class='del'>-# Everything below here is generic and you shouldn't need to change it.</div><div class='del'>-###########################################################################</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =				\</div><div class='del'>-	$(extra_files)		  	\</div><div class='del'>-	$(installed_content_files)	\</div><div class='del'>-	$(HTML_IMAGES)			\</div><div class='del'>-	$(DOC_MAIN_SGML_FILE)</div><div class='del'>-</div><div class='del'>-#	$(DOC_MODULE).types	     \</div><div class='del'>-#	$(DOC_MODULE)-sections.txt      \</div><div class='del'>-#	$(DOC_OVERRIDES)</div><div class='del'>-</div><div class='del'>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \</div><div class='del'>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp</div><div class='del'>-</div><div class='del'>-#SCANOBJ_FILES =		 \</div><div class='del'>-#	$(DOC_MODULE).args      \</div><div class='del'>-#	$(DOC_MODULE).hierarchy \</div><div class='del'>-#	$(DOC_MODULE).signals</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-all-local: html-build.stamp</div><div class='del'>-</div><div class='del'>-#### html ####</div><div class='del'>-</div><div class='del'>-html-build.stamp: $(DOC_MAIN_SGML_FILE) $(content_files) #sgml.stamp</div><div class='del'>-	@echo '*** Building HTML ***'</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) &amp;&amp; cp $(HTML_IMAGES) html )</div><div class='del'>-	@echo '-- Fixing Crossreferences' </div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)</div><div class='del'>-	touch html-build.stamp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-##############</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak *-unused.txt $(DOC_STAMPS) # $(SCANOBJ_FILES)</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-#	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-#	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Require gtk-doc when making dist</div><div class='del'>-#</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-else</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-	@echo "*** gtk-doc must be installed and enabled in order to make dist"</div><div class='del'>-	@false</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-dist-hook: dist-check-gtkdoc dist-hook-local</div><div class='del'>-	mkdir $(distdir)/html</div><div class='del'>-	files=`echo $(srcdir)/html/*.html` ; \</div><div class='del'>-	test '$(srcdir)/html/*.html' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/html</div><div class='del'>-	files=`echo $(srcdir)/html/*.css` ; \</div><div class='del'>-	test '$(srcdir)/html/*.css' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/html</div><div class='del'>-	images=$(HTML_IMAGES) ;	       \</div><div class='del'>-	for i in $$images ; do		\</div><div class='del'>-	  cp $(srcdir)/$$i $(distdir)/html ;  \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-#	mkdir $(distdir)/tmpl</div><div class='del'>-#	mkdir $(distdir)/sgml</div><div class='del'>-#	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml</div><div class='del'>-#	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl</div><div class='del'>-</div><div class='del'>-.PHONY : dist-hook-local</div><div class='head'>diff --git a/doc/devel/calendar/.cvsignore b/doc/devel/calendar/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/devel/calendar/Makefile.am b/doc/devel/calendar/Makefile.am<br/>deleted file mode 100644<br/>index 028622bd82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-SUBDIRS = cal-util cal-client</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =				\</div><div class='del'>-	alarm-generation.sgml		\</div><div class='del'>-	architecture.sgml		\</div><div class='del'>-	evolution-calendar.sgml		\</div><div class='del'>-	public-reference.sgml</div><div class='head'>diff --git a/doc/devel/calendar/alarm-generation.sgml b/doc/devel/calendar/alarm-generation.sgml<br/>deleted file mode 100644<br/>index 46f7e4bff1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/alarm-generation.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/alarm-generation.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,155 +0,0 @@</div><div class='del'>-  &lt;chapter id="calendar-alarm-generation"&gt;</div><div class='del'>-    &lt;title&gt;How the Wombat generates alarm instances&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This chapter describes the algorithm that the &amp;Wombat; uses</div><div class='del'>-      internally to generate instances of a calendar component's</div><div class='del'>-      alarms.  You do not need to read this chapter if you are simply</div><div class='del'>-      using the client-side functions.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="what-makes-up-an-alarm-trigger"&gt;</div><div class='del'>-      &lt;title&gt;What makes up an alarm trigger&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	VTODO and VEVENT calendar components can have any number of</div><div class='del'>-	alarms defined for them.  Each alarm has a trigger</div><div class='del'>-	specification, an alarm type (display, audio, email, or</div><div class='del'>-	procedure), and data corresponding to the alarm type.  The</div><div class='del'>-	Wombat side of things is interested only in the trigger</div><div class='del'>-	specification, since this is all that the Wombat needs to</div><div class='del'>-	produce alarm instances.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	An alarm trigger can be relative or absolute.  Relative</div><div class='del'>-	triggers occur a certain time before or after the start or end</div><div class='del'>-	of a calendar component's occurrence.  For example, you could</div><div class='del'>-	configure a trigger to notify you 15 minutes before an</div><div class='del'>-	appointment starts, so that you can get to its location on</div><div class='del'>-	time; or another one to notify you 5 minutes after another</div><div class='del'>-	person's meeting has ended, so that you can call that person</div><div class='del'>-	on the phone after the meeting and not disturb him while</div><div class='del'>-	there.  Absolute triggers occur at a specific point in time;</div><div class='del'>-	you can configure an alarm to trigger exactly at a particular</div><div class='del'>-	date and time that has no relation to the component's</div><div class='del'>-	occurrences at all.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="generating-trigger-instances"&gt;</div><div class='del'>-      &lt;title&gt;Generating trigger instances&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Generating absolute triggers is trivial; you just use the date</div><div class='del'>-	and time they specify.  However, relative triggers are</div><div class='del'>-	associated to recurrence instances, so in order to generate</div><div class='del'>-	trigger instances we must generate the corresponding</div><div class='del'>-	recurrence instances and compute the trigger times based on</div><div class='del'>-	those.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Since relative triggers are specified as occurring a certain</div><div class='del'>-	amount of time before or after each of a calendar component's</div><div class='del'>-	recurrence instances, we can compute a trigger time by adding</div><div class='del'>-	or subtracting that amount of time to the corresponding</div><div class='del'>-	recurrence instance's time.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Recurrence instances are generated by specifying a range of</div><div class='del'>-	time and asking the Wombat to generate the instances that</div><div class='del'>-	occur within that range.  We shall see that the range of time</div><div class='del'>-	in which instances occur is not necessarily the same range of</div><div class='del'>-	time in which those instances' alarm triggers occur.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Consider an alarm that is set to trigger 10 minutes before the</div><div class='del'>-	start time of an event's occurrence, that is, the trigger has</div><div class='del'>-	an offset of -10 minutes.  Say this event recurs every hour at</div><div class='del'>-	5 minutes past the hour:  it would occur at 1:05, 2:05, 3:05,</div><div class='del'>-	etc.; the corresponding triggers would occur at 12:55, 1:55,</div><div class='del'>-	2:55, etc.  If we wish to compute the alarm triggers that</div><div class='del'>-	occur between 4:00 and 6:00 (which would be at 4:55 and 5:55),</div><div class='del'>-	then we cannot just generate recurrence instances between 4:00</div><div class='del'>-	and 6:00 because we will miss the 6:05 occurrence which</div><div class='del'>-	corresponds to the 5:55 trigger.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The solution is to expand the range of time on both sides to</div><div class='del'>-	fit the relative triggers that have the largest time periods.</div><div class='del'>-	If a trigger's offset is negative, like the -10 minutes in the</div><div class='del'>-	example above, then we must expand the</div><div class='del'>-	&lt;emphasis&gt;end&lt;/emphasis&gt; of the time range: in the case above,</div><div class='del'>-	the range's ending time of 6:00 must be grown by 10 minutes to</div><div class='del'>-	6:10 so that the last recurrence instance will be that of</div><div class='del'>-	6:05; computing the trigger's offset we will get the 5:55</div><div class='del'>-	trigger, which is what we wanted.  For triggers with positive</div><div class='del'>-	offsets, like if an alarm were to trigger 20 minutes after an</div><div class='del'>-	event's occurrence, we must expand the</div><div class='del'>-	&lt;emphasis&gt;start&lt;/emphasis&gt; of the time range in an analogous</div><div class='del'>-	way, by subtracting the time offset from it.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Again, absolute triggers need no special computation.  We can</div><div class='del'>-	just see if the trigger time is within the requested range of</div><div class='del'>-	time, and if so, we take that trigger occurrence into account</div><div class='del'>-	for the final result.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	In addition, alarms may specify a number of repetitions and a</div><div class='del'>-	duration time.  For example, an alarm may be configured to</div><div class='del'>-	repeat 3 extra times after the original occurrence with 5</div><div class='del'>-	minutes between each repetition.  Again, for absolute triggers</div><div class='del'>-	this does not present a problem, as we can just generate the</div><div class='del'>-	repetitions starting from the absolute trigger time.  For</div><div class='del'>-	relative triggers, we expand the range as described above and</div><div class='del'>-	also add the total offset for the repetitions to the start of</div><div class='del'>-	the range, i.e. 15 extra minutes for the case of 3 repetitions</div><div class='del'>-	with 5 minutes between each.  We do not need to modify the end</div><div class='del'>-	of the range because alarm repetitions always have positive</div><div class='del'>-	offsets, so they are equivalent to relative alarm triggers</div><div class='del'>-	with positive offsets.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="alarm-trigger-generation-code"&gt;</div><div class='del'>-      &lt;title&gt;Alarm trigger generation code&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The main function to generate alarm trigger instances is</div><div class='del'>-	&lt;function&gt;generate_alarms_for_comp()&lt;/function&gt; in</div><div class='del'>-	&lt;filename&gt;evolution/calendar/pcs/cal-backend-file.c&lt;/filename&gt;.</div><div class='del'>-	This function calls &lt;function&gt;compute_alarm_range()&lt;/function&gt;</div><div class='del'>-	to expand the specified range of time in the way described in</div><div class='del'>-	the previous section.  It then generates the instances for</div><div class='del'>-	relative alarm triggers inside the</div><div class='del'>-	&lt;function&gt;add_alarm_occurrences_cb()&lt;/function&gt; callback,</div><div class='del'>-	which is used by</div><div class='del'>-	&lt;function&gt;cal_recur_generate_instances()&lt;/function&gt; with the</div><div class='del'>-	expanded range of time.  The callback goes through all of the</div><div class='del'>-	calendar component's relative alarm triggers and adds the</div><div class='del'>-	trigger offsets to the occurrence's time; the results are</div><div class='del'>-	added as &lt;structname&gt;CalAlarmInstance&lt;/structname&gt; structures</div><div class='del'>-	to the final list of trigger instances.  Finally,</div><div class='del'>-	&lt;function&gt;generate_alarms_for_comp()&lt;/function&gt; calls</div><div class='del'>-	&lt;function&gt;generate_absolute_triggers()&lt;/function&gt;, which</div><div class='del'>-	simply adds the instances for absolute alarm triggers; these</div><div class='del'>-	are the absolute times that are within the time range that was</div><div class='del'>-	requested originally.  In the very end, the list of instances</div><div class='del'>-	is sorted to produce nicer results.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/architecture.sgml b/doc/devel/calendar/architecture.sgml<br/>deleted file mode 100644<br/>index d261f0a7f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/architecture.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/architecture.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-  &lt;chapter id="calendar-architecture"&gt;</div><div class='del'>-    &lt;title&gt;Architecture of the Calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This chapter gives an overview of the &amp;Evolution; Calendar</div><div class='del'>-      architecture.  It describes the model/view split of the calendar</div><div class='del'>-      into a personal calendar server, or &amp;PCS;, and the GUI clients</div><div class='del'>-      that appear inside the &amp;Evolution; Shell.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Model/View Separation --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="calendar-model-view"&gt;</div><div class='del'>-      &lt;title&gt;Model/View Separation&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Like other base components in &amp;Evolution;, the calendar</div><div class='del'>-	separates the data model from the views or clients.  This is</div><div class='del'>-	done so that multiple clients can access the same calendar</div><div class='del'>-	data in an orderly fashion and without clashes.  For example,</div><div class='del'>-	the user may be running a graphical calendar client.  If he</div><div class='del'>-	then wants to synchronize his calendar with a handheld device,</div><div class='del'>-	then the corresponding synchronization program (e.g. a conduit</div><div class='del'>-	for the &lt;application&gt;gnome-pilot&lt;/application&gt; package) will</div><div class='del'>-	also need to access the calendar storage.  It is important</div><div class='del'>-	that both the GUI client and the synchronization program keep</div><div class='del'>-	a consistent view of the calendar at all times, otherwise one</div><div class='del'>-	of them will be left in an inconsistent state if the</div><div class='del'>-	calendar's data changes unexpectedly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;Evolution; puts the calendar storage in a daemon called the</div><div class='del'>-	&amp;Wombat; and completely separates it from clients who wants to</div><div class='del'>-	access calendar data.  This part of the &amp;Wombat; is called the</div><div class='del'>-	personal calendar server, or &amp;PCS;.  Clients must contact the</div><div class='del'>-	&amp;PCS; and ask it to open an existing calendar or create a new</div><div class='del'>-	one.  When a calendar component object (e.g. an appointment or</div><div class='del'>-	to-do item) changes in the &amp;PCS; it will notify all the</div><div class='del'>-	clients that are using the component's parent calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Personal Calendar Server --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1&gt;</div><div class='del'>-      &lt;title&gt;Personal Calendar Server&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The personal calendar server, or &amp;PCS;, provides centralized</div><div class='del'>-	management and storage of a user's personal calendar.</div><div class='del'>-	Multiple clients can connect to the &amp;PCS; simultaneously to</div><div class='del'>-	query and modify the user's calendar in a synchronized</div><div class='del'>-	fashion.  The main features of the &amp;PCS; are as follows:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Storage&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The &amp;PCS; is responsible for loading and saving calendars.</div><div class='del'>-	  Centralizing the loading and saving functionality allows</div><div class='del'>-	  multiple clients to use the same calendar at the same time</div><div class='del'>-	  without having to worry about each other.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Basic Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The &amp;PCS; provides functions to do basic queries on a</div><div class='del'>-	  calendar, for example, a client can ask the server for a</div><div class='del'>-	  list of all the appointments in the calendar, or for all the</div><div class='del'>-	  data for a specific appointment.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Recurrence and Alarm Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Looking for the events that recur or have alarm triggers in</div><div class='del'>-	  a specific period of time involves scanning all the</div><div class='del'>-	  appointments in a calendar.  To keep clients from having to</div><div class='del'>-	  load whole calendars at once, the &amp;PCS; can do these</div><div class='del'>-	  computations and send the results to clients.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Modification Log&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  To allow multiple handheld devices to be synchronized</div><div class='del'>-	  against a calendar, the &amp;PCS; keeps a log of all the</div><div class='del'>-	  modifications that are done to the calendar.  When an</div><div class='del'>-	  appointment is updated or removed, the &amp;PCS; logs this</div><div class='del'>-	  action in the modification log.  Synchronization conduit</div><div class='del'>-	  programs can then use this information to do their work.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Data Views --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1&gt;</div><div class='del'>-      &lt;title&gt;Data Views&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;Evolution; provides a graphical calendar client inside the</div><div class='del'>-	shell that is just a view onto the data stored in the personal</div><div class='del'>-	calendar server.  You can launch as many views of a calendar</div><div class='del'>-	as you like and they will all receive notification from the</div><div class='del'>-	&amp;PCS; when changes occur.  The views are then responsible for</div><div class='del'>-	updating their respective displays.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Even within a single calendar view in the &amp;Evolution; shell</div><div class='del'>-	there can be multiple clients of a single calendar.  For</div><div class='del'>-	example, in the day view of the &amp;Evolution; calendar there are</div><div class='del'>-	three widgets that act as three different clients of the</div><div class='del'>-	&amp;PCS;:  the multi-day view, the busy days calendar, and the</div><div class='del'>-	task list.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Non-graphical Clients --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1&gt;</div><div class='del'>-      &lt;title&gt;Non-graphical Clients&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Clients of the personal calendar server can be non-graphical,</div><div class='del'>-	that is, they do not have to provide views of the data to the</div><div class='del'>-	user.  Examples of such clients are the synchronization</div><div class='del'>-	conduit programs for handheld devices.  These usually run with</div><div class='del'>-	no user interface as a result of being invoked by a daemon</div><div class='del'>-	that watches the connection to a handheld device.  For</div><div class='del'>-	example, the calendar synchronization conduit in &amp;Evolution;</div><div class='del'>-	gets run when the &lt;application&gt;gpilotd&lt;/application&gt; daemon</div><div class='del'>-	from the &lt;application&gt;gnome-pilot&lt;/application&gt; package</div><div class='del'>-	detects that the HotSync button has been pressed on a Palm</div><div class='del'>-	Pilot device.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Such clients simply take advantage of the centralized storage</div><div class='del'>-	in the &amp;PCS; without presenting any graphical display of the</div><div class='del'>-	data; they just act as middlemen between the &amp;PCS; and other</div><div class='del'>-	applications.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/.cvsignore b/doc/devel/calendar/cal-client/.cvsignore<br/>deleted file mode 100644<br/>index 87bb93d0b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*-decl.txt</div><div class='del'>-*-decl-list.txt</div><div class='del'>-*-unused.txt</div><div class='del'>-*-undocumented.txt</div><div class='del'>-*.hierarchy</div><div class='del'>-*.signals</div><div class='del'>-*.stamp</div><div class='del'>-*-scan.c</div><div class='del'>-.libs</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am<br/>deleted file mode 100644<br/>index 0e097c701f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,195 +0,0 @@</div><div class='del'>-# The name of the module.</div><div class='del'>-DOC_MODULE=evolution-cal-client</div><div class='del'>-</div><div class='del'>-# The top-level SGML file. Change it if you want.</div><div class='del'>-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code. Relative to $(srcdir).</div><div class='del'>-# gtk-doc will search all .c &amp; .h files beneath here for inline comments</div><div class='del'>-# documenting functions and macros.</div><div class='del'>-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-client</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-scan.</div><div class='del'>-SCAN_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-mkdb.</div><div class='del'>-MKDB_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-fixref.</div><div class='del'>-FIXXREF_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Used for dependencies.</div><div class='del'>-HFILE_GLOB=							\</div><div class='del'>-	$(top_srcdir)/calendar/cal-client/cal-client.c		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-client/cal-client-types.c</div><div class='del'>-</div><div class='del'>-CFILE_GLOB=							\</div><div class='del'>-	$(top_srcdir)/calendar/cal-client/cal-client.h		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-client/cal-client-types.h</div><div class='del'>-</div><div class='del'>-# Header files to ignore when scanning.</div><div class='del'>-IGNORE_HFILES=			\</div><div class='del'>-	cal-listener.h		\</div><div class='del'>-	evolution-calendar.h</div><div class='del'>-</div><div class='del'>-# Images to copy into HTML directory.</div><div class='del'>-HTML_IMAGES =</div><div class='del'>-</div><div class='del'>-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).</div><div class='del'>-content_files =</div><div class='del'>-</div><div class='del'>-# Other files to distribute.</div><div class='del'>-extra_files =</div><div class='del'>-</div><div class='del'>-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib</div><div class='del'>-# contains GtkObjects/GObjects and you want to document signals and properties.</div><div class='del'>-GTKDOC_CFLAGS=						\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_builddir)/calendar/cal-client		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-GTKDOC_LIBS=									\</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)						\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/.libs/libcal-client-static.al	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al		\</div><div class='del'>-	$(top_builddir)/libical/src/libical/.libs/libical-static.al		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a				\</div><div class='del'>-	$(top_builddir)/libwombat/libwombat.la</div><div class='del'>-</div><div class='del'>-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)</div><div class='del'>-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)</div><div class='del'>-</div><div class='del'>-# If you need to override some of the declarations, place them in this file</div><div class='del'>-# and uncomment this line.</div><div class='del'>-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt</div><div class='del'>-DOC_OVERRIDES = </div><div class='del'>-</div><div class='del'>-#DOC_DIR=$(datadir)/gnome/html</div><div class='del'>-</div><div class='del'>-###########################################################################</div><div class='del'>-# Everything below here is generic and you shouldn't need to change it.</div><div class='del'>-###########################################################################</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			    \</div><div class='del'>-	$(content_files)		\</div><div class='del'>-	$(extra_files)		  \</div><div class='del'>-	$(HTML_IMAGES)		  \</div><div class='del'>-	$(DOC_MAIN_SGML_FILE)	   \</div><div class='del'>-	$(DOC_MODULE).types	     \</div><div class='del'>-	$(DOC_MODULE)-sections.txt      \</div><div class='del'>-	$(DOC_OVERRIDES)</div><div class='del'>-</div><div class='del'>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \</div><div class='del'>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp</div><div class='del'>-</div><div class='del'>-SCANOBJ_FILES =		 \</div><div class='del'>-	$(DOC_MODULE).args      \</div><div class='del'>-	$(DOC_MODULE).hierarchy \</div><div class='del'>-	$(DOC_MODULE).signals</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-#all-local: html-build.stamp</div><div class='del'>-all-local: sgml-build.stamp</div><div class='del'>-</div><div class='del'>-#### scan ####</div><div class='del'>-</div><div class='del'>-scan-build.stamp: $(HFILE_GLOB)</div><div class='del'>-	@echo '*** Scanning header files ***'</div><div class='del'>-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types &gt; /dev/null ; then \</div><div class='del'>-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scanobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \</div><div class='del'>-	else \</div><div class='del'>-	    cd $(srcdir) ; \</div><div class='del'>-	    for i in $(SCANOBJ_FILES) ; do \</div><div class='del'>-	       test -f $$i || touch $$i ; \</div><div class='del'>-	    done \</div><div class='del'>-	fi</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)</div><div class='del'>-	touch scan-build.stamp</div><div class='del'>-</div><div class='del'>-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### templates ####</div><div class='del'>-</div><div class='del'>-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)</div><div class='del'>-	@echo '*** Rebuilding template files ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-	touch tmpl-build.stamp</div><div class='del'>-</div><div class='del'>-tmpl.stamp: tmpl-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### sgml ####</div><div class='del'>-</div><div class='del'>-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml</div><div class='del'>-	@echo '*** Building SGML ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)</div><div class='del'>-	touch sgml-build.stamp</div><div class='del'>-</div><div class='del'>-sgml.stamp: sgml-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### html ####</div><div class='del'>-</div><div class='del'>-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)</div><div class='del'>-	@echo '*** Building HTML ***'</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) &amp;&amp; cp $(HTML_IMAGES) html )</div><div class='del'>-	@echo '-- Fixing Crossreferences' </div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)</div><div class='del'>-	touch html-build.stamp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-##############</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Require gtk-doc when making dist</div><div class='del'>-#</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-else</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-	@echo "*** gtk-doc must be installed and enabled in order to make dist"</div><div class='del'>-	@false</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-dist-hook: dist-check-gtkdoc dist-hook-local</div><div class='del'>-	mkdir $(distdir)/tmpl</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	files=`echo $(srcdir)/tmpl/*.sgml` ; \</div><div class='del'>-	test '$(srcdir)/tmpl/*.sgml' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/tmpl</div><div class='del'>-	files=`echo $(srcdir)/sgml/*.sgml` ; \</div><div class='del'>-	test '$(srcdir)/sgml/*.sgml' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/sgml</div><div class='del'>-</div><div class='del'>-.PHONY : dist-hook-local</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt<br/>deleted file mode 100644<br/>index 79d0fec3c6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client-decl.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,490 +0,0 @@</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientChangeType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_CHANGE_ADDED = 1 &lt;&lt; 0,</div><div class='del'>-	CAL_CLIENT_CHANGE_MODIFIED = 1 &lt;&lt; 1,</div><div class='del'>-	CAL_CLIENT_CHANGE_DELETED = 1 &lt;&lt; 2</div><div class='del'>-} CalClientChangeType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_change_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_TYPE            (cal_client_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClient&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientOpenStatus&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_OPEN_SUCCESS,</div><div class='del'>-	CAL_CLIENT_OPEN_ERROR,</div><div class='del'>-	CAL_CLIENT_OPEN_NOT_FOUND,</div><div class='del'>-	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED</div><div class='del'>-} CalClientOpenStatus;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientSetModeStatus&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_SET_MODE_SUCCESS,</div><div class='del'>-	CAL_CLIENT_SET_MODE_ERROR,</div><div class='del'>-	CAL_CLIENT_SET_MODE_NOT_SUPPORTED</div><div class='del'>-} CalClientSetModeStatus;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientGetStatus&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_GET_SUCCESS,</div><div class='del'>-	CAL_CLIENT_GET_NOT_FOUND,</div><div class='del'>-	CAL_CLIENT_GET_SYNTAX_ERROR</div><div class='del'>-} CalClientGetStatus;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientLoadState&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_LOAD_NOT_LOADED,</div><div class='del'>-	CAL_CLIENT_LOAD_LOADING,</div><div class='del'>-	CAL_CLIENT_LOAD_LOADED</div><div class='del'>-} CalClientLoadState;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClient&lt;/NAME&gt;</div><div class='del'>-struct CalClient {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;CalClientAuthFunc&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gchar *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,</div><div class='del'>-                                      const gchar *prompt,</div><div class='del'>-                                      const gchar *key,</div><div class='del'>-                                      gpointer user_data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_set_auth_func&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalClientAuthFunc func, gpointer data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_set_default_timezone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_open_calendar&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *str_uri, gboolean only_if_exists</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_open_default_calendar&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, gboolean only_if_exists</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_open_default_tasks&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, gboolean only_if_exists</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_uri_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalMode mode</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_load_state&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientLoadState  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_uri&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_set_mode&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalMode mode</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_n_objects&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,const char *uid,CalComponent **comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_timezone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,const char *tzid,icaltimezone **zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_uids&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_changes&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type, const char *change_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_objects_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type,time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_free_busy&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, GList *users,time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_generate_instances&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_alarms_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GSList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_free_alarms&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *comp_alarms</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_alarms_for_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms **alarms</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_update_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_update_objects&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, icalcomponent *icalcomp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_remove_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_query&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalQuery  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *sexp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_resolve_tzid_cb&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icaltimezone  *&lt;/RETURNS&gt;</div><div class='del'>-const char *tzid, gpointer data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_component_as_string&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_QUERY_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_QUERY_TYPE            (cal_query_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_QUERY&lt;/NAME&gt;</div><div class='del'>-#define CAL_QUERY(obj)            (GTK_CHECK_CAST ((obj), CAL_QUERY_TYPE, CalQuery))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_QUERY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_QUERY_TYPE, CalQueryClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_QUERY&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_QUERY(obj)         (GTK_CHECK_TYPE ((obj), CAL_QUERY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_QUERY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_QUERY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalQueryDoneStatus&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_QUERY_DONE_SUCCESS,</div><div class='del'>-	CAL_QUERY_DONE_PARSE_ERROR</div><div class='del'>-} CalQueryDoneStatus;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalQueryPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalQuery&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalQueryPrivate *priv;</div><div class='del'>-} CalQuery;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_query_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_query_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalQuery  *&lt;/RETURNS&gt;</div><div class='del'>-CalQuery *query,GNOME_Evolution_Calendar_Cal cal,const char *sexp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_query_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalQuery  *&lt;/RETURNS&gt;</div><div class='del'>-GNOME_Evolution_Calendar_Cal cal,const char *sexp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;QUERY_LISTENER_TYPE&lt;/NAME&gt;</div><div class='del'>-#define QUERY_LISTENER_TYPE            (query_listener_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;QUERY_LISTENER&lt;/NAME&gt;</div><div class='del'>-#define QUERY_LISTENER(obj)            (GTK_CHECK_CAST ((obj), QUERY_LISTENER_TYPE, QueryListener))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;QUERY_LISTENER_CLASS&lt;/NAME&gt;</div><div class='del'>-#define QUERY_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), QUERY_LISTENER_TYPE,	\</div><div class='del'>-					QueryListenerClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_QUERY_LISTENER&lt;/NAME&gt;</div><div class='del'>-#define IS_QUERY_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), QUERY_LISTENER_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_QUERY_LISTENER_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_QUERY_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), QUERY_LISTENER_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;QueryListenerPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;QueryListener&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboXObject xobject;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	QueryListenerPrivate *priv;</div><div class='del'>-} QueryListener;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;QueryListenerObjUpdatedFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void &lt;/RETURNS&gt;</div><div class='del'>-QueryListener *ql,</div><div class='del'>-					    const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					    CORBA_boolean query_in_progress,</div><div class='del'>-					    CORBA_long n_scanned,</div><div class='del'>-					    CORBA_long total,</div><div class='del'>-					    gpointer data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;QueryListenerObjRemovedFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void &lt;/RETURNS&gt;</div><div class='del'>-QueryListener *ql,</div><div class='del'>-					    const GNOME_Evolution_Calendar_CalObjUID uid,</div><div class='del'>-					    gpointer data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;QueryListenerQueryDoneFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void &lt;/RETURNS&gt;</div><div class='del'>-</div><div class='del'>-	QueryListener *ql,</div><div class='del'>-	GNOME_Evolution_Calendar_QueryListener_QueryDoneStatus status,</div><div class='del'>-	const CORBA_char *error_str,</div><div class='del'>-	gpointer data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;QueryListenerEvalErrorFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void &lt;/RETURNS&gt;</div><div class='del'>-QueryListener *ql,</div><div class='del'>-					   const CORBA_char *error_str,</div><div class='del'>-					   gpointer data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;query_listener_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;query_listener_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;QueryListener  *&lt;/RETURNS&gt;</div><div class='del'>-QueryListener *ql,QueryListenerObjUpdatedFn obj_updated_fn,QueryListenerObjRemovedFn obj_removed_fn,QueryListenerQueryDoneFn query_done_fn,QueryListenerEvalErrorFn eval_error_fn,gpointer fn_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;query_listener_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;QueryListener  *&lt;/RETURNS&gt;</div><div class='del'>-QueryListenerObjUpdatedFn obj_updated_fn,QueryListenerObjRemovedFn obj_removed_fn,QueryListenerQueryDoneFn query_done_fn,QueryListenerEvalErrorFn eval_error_fn,gpointer fn_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;query_listener_stop_notification&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-QueryListener *ql</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_MULTI_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_MULTI_TYPE            (cal_client_multi_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_MULTI&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_MULTI(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_MULTI_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_MULTI_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT_MULTI&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT_MULTI(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT_MULTI_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientMulti&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientMultiClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientMultiPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientMulti&lt;/NAME&gt;</div><div class='del'>-struct CalClientMulti {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalClientMultiPrivate *priv;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientMulti     *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_add_client&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi, CalClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_set_auth_func&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,CalClientAuthFunc func,gpointer user_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_open_calendar&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient          *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,const char *str_uri,gboolean only_if_exists</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_client_for_uri&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient          *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,const char *uri</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_n_objects&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,const char *uid,CalComponent **comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_timezone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,const char *tzid,icaltimezone **zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_uids&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList              *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_changes&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList              *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,CalObjType type,const char *change_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_objects_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList              *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,CalObjType type,time_t start,time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_free_busy&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList              *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,GList *users,time_t start,time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_generate_instances&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,CalObjType type,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_multi_get_alarms_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GSList             *&lt;/RETURNS&gt;</div><div class='del'>-CalClientMulti *multi,time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml b/doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml<br/>deleted file mode 100644<br/>index 136cf77e5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client-docs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,15 +0,0 @@</div><div class='del'>-&lt;!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!ENTITY CalClient SYSTEM "sgml/cal-client.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-cal-client-CalQuery SYSTEM "sgml/cal-query.sgml"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;[Insert name here] Reference Manual&lt;/title&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter&gt;</div><div class='del'>-    &lt;title&gt;[Insert title here]&lt;/title&gt;</div><div class='del'>-    &amp;CalClient;</div><div class='del'>-    &amp;evolution-cal-client-CalQuery;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt<br/>deleted file mode 100644<br/>index 8e33be4933..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-&lt;INCLUDE&gt;cal-client/cal-client.h&lt;/INCLUDE&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-client&lt;/FILE&gt;</div><div class='del'>-CAL_CLIENT</div><div class='del'>-&lt;TITLE&gt;CalClient&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-CalClientOpenStatus</div><div class='del'>-CalClientGetStatus</div><div class='del'>-CalClientLoadState</div><div class='del'>-</div><div class='del'>-CalClientChangeType</div><div class='del'>-</div><div class='del'>-cal_client_new</div><div class='del'>-cal_client_open_calendar</div><div class='del'>-cal_client_get_load_state</div><div class='del'>-cal_client_get_uri</div><div class='del'>-cal_client_get_n_objects</div><div class='del'>-cal_client_get_uids</div><div class='del'>-cal_client_get_object</div><div class='del'>-cal_client_get_changes</div><div class='del'>-cal_client_change_list_free</div><div class='del'>-cal_client_get_objects_in_range</div><div class='del'>-cal_client_generate_instances</div><div class='del'>-cal_client_get_alarms_in_range</div><div class='del'>-cal_client_free_alarms</div><div class='del'>-cal_client_get_alarms_for_object</div><div class='del'>-cal_client_update_object</div><div class='del'>-cal_client_remove_object</div><div class='del'>-cal_client_get_query</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-</div><div class='del'>-CAL_CLIENT_TYPE</div><div class='del'>-IS_CAL_CLIENT</div><div class='del'>-CAL_CLIENT_CLASS</div><div class='del'>-IS_CAL_CLIENT_CLASS</div><div class='del'>-cal_client_get_type</div><div class='del'>-cal_client_construct</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-CalClient</div><div class='del'>-CalClientPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-query&lt;/FILE&gt;</div><div class='del'>-CAL_QUERY</div><div class='del'>-&lt;TITLE&gt;CalQuery&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-CalQueryDoneStatus</div><div class='del'>-cal_query_new</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-</div><div class='del'>-CAL_QUERY_TYPE</div><div class='del'>-IS_CAL_QUERY</div><div class='del'>-CAL_QUERY_CLASS</div><div class='del'>-IS_CAL_QUERY_CLASS</div><div class='del'>-cal_query_get_type</div><div class='del'>-cal_query_construct</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-CalQuery</div><div class='del'>-CalQueryPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.args b/doc/devel/calendar/cal-client/evolution-cal-client.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.args?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy b/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy<br/>deleted file mode 100644<br/>index 88efa3e673..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  CalClient</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.types b/doc/devel/calendar/cal-client/evolution-cal-client.types<br/>deleted file mode 100644<br/>index 84d65a6637..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.types?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/evolution-cal-client.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-cal_client_get_type</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml<br/>deleted file mode 100644<br/>index 4426d6c478..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/tmpl/cal-client.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/tmpl/cal-client.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,338 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CalClient</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-GTK+ object for communication with personal calendar server.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    The #CalClient object provides a nice GTK+ wrapper for the CORBA</div><div class='del'>-    interfaces that are used to communicate between calendar clients</div><div class='del'>-    and the personal calendar server in the user's Wombat daemon.  The</div><div class='del'>-    CORBA interfaces transfer calendar components in RFC 2445 text</div><div class='del'>-    format; the #CalClient object automatically converts these into</div><div class='del'>-    #CalComponent structures that are easier to handle.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    After a #CalClient object is created with cal_client_new(), it</div><div class='del'>-    should be asked to send a request to the personal calendar server</div><div class='del'>-    to load or create a calendar based on its URI.  The server will</div><div class='del'>-    asynchronously notify the client about completion of the request,</div><div class='del'>-    and will return an appropriate result code; this should be noted</div><div class='del'>-    by the client with the &lt;link</div><div class='del'>-    linkend="CalClient--cal-loaded"&gt;cal_loaded&lt;/link&gt; signal.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    When a client asks the server to update or delete a calendar</div><div class='del'>-    component from the storage, the server will do so and then notify</div><div class='del'>-    all the clients about the update or removal.  This is the core of</div><div class='del'>-    the model/view split between calendar clients and the storage in</div><div class='del'>-    the personal calendar server.  Clients should watch the &lt;link</div><div class='del'>-    linkend="calclient-obj-updated"&gt;obj_updated&lt;/link&gt; and &lt;link</div><div class='del'>-    linkend="calclient-obj-removed"&gt;obj_removed&lt;/link&gt; signals on the</div><div class='del'>-    CalClient objects they create so that they can be notified about</div><div class='del'>-    changes in the storage.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    #CalComponent</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO CAL_CLIENT ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Casts a #GtkObject to a #CalClient.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A GTK+ object.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientOpenStatus ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_OPEN_SUCCESS: </div><div class='del'>-@CAL_CLIENT_OPEN_ERROR: </div><div class='del'>-@CAL_CLIENT_OPEN_NOT_FOUND: </div><div class='del'>-@CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientGetStatus ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values describe the result of the cal_client_get_object()</div><div class='del'>-    function.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_GET_SUCCESS: </div><div class='del'>-@CAL_CLIENT_GET_NOT_FOUND: </div><div class='del'>-@CAL_CLIENT_GET_SYNTAX_ERROR: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientLoadState ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_LOAD_NOT_LOADED: </div><div class='del'>-@CAL_CLIENT_LOAD_LOADING: </div><div class='del'>-@CAL_CLIENT_LOAD_LOADED: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientChangeType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_CHANGE_ADDED: </div><div class='del'>-@CAL_CLIENT_CHANGE_MODIFIED: </div><div class='del'>-@CAL_CLIENT_CHANGE_DELETED: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_open_calendar ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@str_uri: </div><div class='del'>-@only_if_exists: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_load_state ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_uri ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_n_objects ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_uids ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@ico: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_changes ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@change_id: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_change_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_objects_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_generate_instances ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@cb: </div><div class='del'>-@cb_data: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_alarms_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_free_alarms ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp_alarms: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_alarms_for_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@alarms: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_update_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@ico: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_remove_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_query ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@sexp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::cal-opened ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::cal-set-mode ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-@arg2: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::obj-updated ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted when the calendar clients receives</div><div class='del'>-    notification of a calendar component's data being changed in the</div><div class='del'>-    personal calendar server.  Graphical clients may want to get the</div><div class='del'>-    new version of the object and update their display, for example.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@uid: Unique identifier of the calendar component that changed in the</div><div class='del'>-  personal calendar server's storage.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::obj-removed ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted when the calendar client receives</div><div class='del'>-    notification for a calendar component being removed from the</div><div class='del'>-    storage in the personal calendar server.  Graphical clients may</div><div class='del'>-    want to delete the corresponding object from their display, for</div><div class='del'>-    example.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@uid: Unique identifier of the calendar component that was removed</div><div class='del'>-  from the personal calendar server's storage.</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::categories-changed ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::forget-password ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml<br/>deleted file mode 100644<br/>index 3e8ce25ee6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::cal-loaded ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted some time after the calendar clients sends</div><div class='del'>-    a load or create request to the personal calendar server.  The</div><div class='del'>-    server will notify the client asynchronously of the completion of</div><div class='del'>-    the request.  The @status parameter indicates the status of the</div><div class='del'>-    request.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@status: Status of the request.  See the description of</div><div class='del'>-  #CalClientLoadStatus for more details.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientLoadStatus ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values describe the status of a calendar load or create</div><div class='del'>-    request.  After asking a calendar factory to load or create a</div><div class='del'>-    calendar, the provided listener will get notification about the</div><div class='del'>-    result in asynchronous fashion.  Such notification is represented</div><div class='del'>-    by one of these enumeration values.  For values other than</div><div class='del'>-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept</div><div class='del'>-    any other operations on the calendar and it should just be</div><div class='del'>-    destroyed.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_create_calendar ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@str_uri: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_events_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@pilot_id: </div><div class='del'>-@uid: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_is_loaded ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_load_calendar ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@str_uri: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_update_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@pilot_id: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/.cvsignore b/doc/devel/calendar/cal-util/.cvsignore<br/>deleted file mode 100644<br/>index 4c0883da0a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*-decl.txt</div><div class='del'>-*-decl-list.txt</div><div class='del'>-*-unused.txt</div><div class='del'>-*-undocumented.txt</div><div class='del'>-*.signals</div><div class='del'>-*.hierarchy</div><div class='del'>-*.stamp</div><div class='del'>-*-scan.c</div><div class='del'>-.libs</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am<br/>deleted file mode 100644<br/>index fc2ff32368..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-# The name of the module, e.g. 'glib'.</div><div class='del'>-DOC_MODULE=evolution-cal-util</div><div class='del'>-</div><div class='del'>-# The top-level SGML file. Change it if you want.</div><div class='del'>-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code. Relative to $(srcdir).</div><div class='del'>-# gtk-doc will search all .c &amp; .h files beneath here for inline comments</div><div class='del'>-# documenting functions and macros.</div><div class='del'>-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/calendar/cal-util</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-scan.</div><div class='del'>-SCAN_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-mkdb.</div><div class='del'>-MKDB_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-fixref.</div><div class='del'>-FIXXREF_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Used for dependencies.</div><div class='del'>-HFILE_GLOB=							\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-component.h		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-recur.h		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-util.h		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/timeutil.h</div><div class='del'>-</div><div class='del'>-CFILE_GLOB=							\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-component.c		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-recur.c		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/cal-util.c		\</div><div class='del'>-	$(top_srcdir)/calendar/cal-util/timeutil.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Header files to ignore when scanning.</div><div class='del'>-IGNORE_HFILES=		\</div><div class='del'>-	calobj.h</div><div class='del'>-</div><div class='del'>-# Images to copy into HTML directory.</div><div class='del'>-HTML_IMAGES =</div><div class='del'>-</div><div class='del'>-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).</div><div class='del'>-content_files =</div><div class='del'>-</div><div class='del'>-# Other files to distribute.</div><div class='del'>-extra_files =</div><div class='del'>-</div><div class='del'>-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib</div><div class='del'>-# contains GtkObjects/GObjects and you want to document signals and properties.</div><div class='del'>-GTKDOC_CFLAGS = 					\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	$(EVOLUTION_CALENDAR_CFLAGS)</div><div class='del'>-</div><div class='del'>-GTKDOC_LIBS = 								\</div><div class='del'>-	$(EVOLUTION_CALENDAR_LIBS)					\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/.libs/libcal-util-static.al	\</div><div class='del'>-	$(top_builddir)/libical/src/libical/.libs/libical-static.al	\</div><div class='del'>-	$(top_builddir)/libversit/libversit.a</div><div class='del'>-</div><div class='del'>-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)</div><div class='del'>-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)</div><div class='del'>-</div><div class='del'>-# If you need to override some of the declarations, place them in this file</div><div class='del'>-# and uncomment this line.</div><div class='del'>-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt</div><div class='del'>-DOC_OVERRIDES = </div><div class='del'>-</div><div class='del'>-###########################################################################</div><div class='del'>-# Everything below here is generic and you shouldn't need to change it.</div><div class='del'>-###########################################################################</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =				\</div><div class='del'>-	$(content_files)		\</div><div class='del'>-	$(extra_files)			\</div><div class='del'>-	$(HTML_IMAGES)			\</div><div class='del'>-	$(DOC_MAIN_SGML_FILE)		\</div><div class='del'>-	$(DOC_MODULE).types		\</div><div class='del'>-	$(DOC_MODULE)-sections.txt	\</div><div class='del'>-	$(DOC_OVERRIDES)</div><div class='del'>-</div><div class='del'>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \</div><div class='del'>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp</div><div class='del'>-</div><div class='del'>-SCANOBJ_FILES =			\</div><div class='del'>-	$(DOC_MODULE).args      \</div><div class='del'>-	$(DOC_MODULE).hierarchy \</div><div class='del'>-	$(DOC_MODULE).signals</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-all-local: sgml-build.stamp</div><div class='del'>-#all-local: html-build.stamp</div><div class='del'>-</div><div class='del'>-#### scan ####</div><div class='del'>-</div><div class='del'>-scan-build.stamp: $(HFILE_GLOB)</div><div class='del'>-	@echo '*** Scanning header files ***'</div><div class='del'>-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types &gt; /dev/null ; then \</div><div class='del'>-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scanobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \</div><div class='del'>-	else \</div><div class='del'>-	    cd $(srcdir) ; \</div><div class='del'>-	    for i in $(SCANOBJ_FILES) ; do \</div><div class='del'>-		test -f $$i || touch $$i ; \</div><div class='del'>-	    done \</div><div class='del'>-	fi</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)</div><div class='del'>-	touch scan-build.stamp</div><div class='del'>-</div><div class='del'>-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### templates ####</div><div class='del'>-</div><div class='del'>-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)</div><div class='del'>-	@echo '*** Rebuilding template files ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-	touch tmpl-build.stamp</div><div class='del'>-</div><div class='del'>-tmpl.stamp: tmpl-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### sgml ####</div><div class='del'>-</div><div class='del'>-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml</div><div class='del'>-	@echo '*** Building SGML ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)</div><div class='del'>-	touch sgml-build.stamp</div><div class='del'>-</div><div class='del'>-sgml.stamp: sgml-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### html ####</div><div class='del'>-</div><div class='del'>-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)</div><div class='del'>-	@echo '*** Building HTML ***'</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) &amp;&amp; cp $(HTML_IMAGES) html )</div><div class='del'>-	@echo '-- Fixing Crossreferences' </div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)</div><div class='del'>-	touch html-build.stamp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-##############</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Require gtk-doc when making dist</div><div class='del'>-#</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-else</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-	@echo "*** gtk-doc must be installed and enabled in order to make dist"</div><div class='del'>-	@false</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-dist-hook: dist-check-gtkdoc dist-hook-local</div><div class='del'>-	mkdir $(distdir)/tmpl</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	files=`echo $(srcdir)/tmpl/*.sgml` ; \</div><div class='del'>-	test '$(srcdir)/tmpl/*.sgml' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/tmpl</div><div class='del'>-	files=`echo $(srcdir)/sgml/*.sgml` ; \</div><div class='del'>-	test '$(srcdir)/sgml/*.sgml' = "$$files" \</div><div class='del'>-	    || cp $$files $(distdir)/sgml</div><div class='del'>-</div><div class='del'>-.PHONY : dist-hook-local
\ No newline at end of file</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt<br/>deleted file mode 100644<br/>index 30a652765b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util-decl.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1009 +0,0 @@</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\</div><div class='del'>-				       CalComponentClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentVType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_NO_TYPE,</div><div class='del'>-	CAL_COMPONENT_EVENT,</div><div class='del'>-	CAL_COMPONENT_TODO,</div><div class='del'>-	CAL_COMPONENT_JOURNAL,</div><div class='del'>-	CAL_COMPONENT_FREEBUSY,</div><div class='del'>-	CAL_COMPONENT_TIMEZONE</div><div class='del'>-} CalComponentVType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentField&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */</div><div class='del'>-	CAL_COMPONENT_FIELD_CLASSIFICATION,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETED,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTEND,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTSTART,</div><div class='del'>-	CAL_COMPONENT_FIELD_DUE,</div><div class='del'>-	CAL_COMPONENT_FIELD_GEO,</div><div class='del'>-	CAL_COMPONENT_FIELD_PERCENT,</div><div class='del'>-	CAL_COMPONENT_FIELD_PRIORITY,</div><div class='del'>-	CAL_COMPONENT_FIELD_SUMMARY,</div><div class='del'>-	CAL_COMPONENT_FIELD_TRANSPARENCY,</div><div class='del'>-	CAL_COMPONENT_FIELD_URL,</div><div class='del'>-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_STATUS,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPONENT,		/* not a real field */</div><div class='del'>-#if 0</div><div class='del'>-	CAL_COMPONENT_FIELD_LOCATION,</div><div class='del'>-#endif</div><div class='del'>-	CAL_COMPONENT_FIELD_NUM_FIELDS</div><div class='del'>-} CalComponentField;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentClassification&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_CLASS_NONE,</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	CAL_COMPONENT_CLASS_UNKNOWN</div><div class='del'>-} CalComponentClassification;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentDateTime&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Actual date/time value */</div><div class='del'>-	struct icaltimetype *value;</div><div class='del'>-</div><div class='del'>-	/* Timezone ID */</div><div class='del'>-	const char *tzid;</div><div class='del'>-} CalComponentDateTime;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPeriodType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_PERIOD_DATETIME,</div><div class='del'>-	CAL_COMPONENT_PERIOD_DURATION</div><div class='del'>-} CalComponentPeriodType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPeriod&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentPeriodType type;</div><div class='del'>-</div><div class='del'>-	struct icaltimetype start;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaltimetype end;</div><div class='del'>-		struct icaldurationtype duration;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentPeriod;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentRangeType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_RANGE_SINGLE,</div><div class='del'>-	CAL_COMPONENT_RANGE_THISPRIOR,</div><div class='del'>-	CAL_COMPONENT_RANGE_THISFUTURE,</div><div class='del'>-} CalComponentRangeType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentRange&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentRangeType type;</div><div class='del'>-	</div><div class='del'>-	CalComponentDateTime *datetime;</div><div class='del'>-} CalComponentRange;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentText&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Description string */</div><div class='del'>-	const char *value;</div><div class='del'>-</div><div class='del'>-	/* Alternate representation URI */</div><div class='del'>-	const char *altrep;</div><div class='del'>-} CalComponentText;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentTransparency&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_TRANSP_NONE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-	CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_UNKNOWN</div><div class='del'>-} CalComponentTransparency;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAttendee&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	const char *value;</div><div class='del'>-	</div><div class='del'>-	const char *member;</div><div class='del'>-	icalparameter_cutype cutype;</div><div class='del'>-	icalparameter_role role;</div><div class='del'>-	icalparameter_partstat status;</div><div class='del'>-	gboolean rsvp;</div><div class='del'>-	</div><div class='del'>-	const char *delto;</div><div class='del'>-	const char *delfrom;</div><div class='del'>-	const char *sentby;</div><div class='del'>-	const char *cn;</div><div class='del'>-	const char *language;</div><div class='del'>-} CalComponentAttendee;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentOrganizer&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	const char *value;</div><div class='del'>-	const char *sentby;</div><div class='del'>-	const char *cn;</div><div class='del'>-	const char *language;</div><div class='del'>-} CalComponentOrganizer;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponent&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponent&lt;/NAME&gt;</div><div class='del'>-struct CalComponent {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_gen_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponent  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_clone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponent  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_new_vtype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentVType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_icalcomponent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, icalcomponent *icalcomp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_icalcomponent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icalcomponent  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_rescan&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_vtype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentVType  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_as_string&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_commit_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_categories&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **categories</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_categories&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *categories</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_classification&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentClassification *classif</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_classification&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentClassification classif</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_comment_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_comment_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_completed&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_completed&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_contact_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_contact_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_created&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_created&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_description_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_description_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtend&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtend&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtstamp&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtstamp&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtstart&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtstart&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_due&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_due&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_exdates&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_exrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_exrule_property_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_exrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_exrules&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_exceptions&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icalgeotype **geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icalgeotype *geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_last_modified&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_last_modified&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_organizer&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentOrganizer *organizer</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_organizer&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentOrganizer *organizer</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_organizer&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_recurid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentRange **recur_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_recurid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentRange *recur_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_rdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_rdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_rdates&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_rrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_rrule_property_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_rrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_rrules&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_recurrences&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_status&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, icalproperty_status *status</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_status&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, icalproperty_status status</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_summary&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentText *summary</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_summary&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentText *summary</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_transparency&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentTransparency *transp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_transparency&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentTransparency transp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_url&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **url</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_url&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *url</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_attendee_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **attendee_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_attendee_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *attendee_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_attendees&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_location&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **location</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_location&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *location</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_event_dates_match&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp1, CalComponent *comp2</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_datetime&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-struct icalgeotype *geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_icaltimetype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_period_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_recur_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_text_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_attendee_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *attendee_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarm&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmInstance&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* UID of the alarm that triggered */</div><div class='del'>-	const char *auid;</div><div class='del'>-</div><div class='del'>-	/* Trigger time, i.e. "5 minutes before the appointment" */</div><div class='del'>-	time_t trigger;</div><div class='del'>-</div><div class='del'>-	/* Actual event occurrence to which this trigger corresponds */</div><div class='del'>-	time_t occur_start;</div><div class='del'>-	time_t occur_end;</div><div class='del'>-} CalAlarmInstance;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarms&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* The actual component */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* List of CalAlarmInstance structures */</div><div class='del'>-	GSList *alarms;</div><div class='del'>-} CalComponentAlarms;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmAction&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_ALARM_NONE,</div><div class='del'>-	CAL_ALARM_AUDIO,</div><div class='del'>-	CAL_ALARM_DISPLAY,</div><div class='del'>-	CAL_ALARM_EMAIL,</div><div class='del'>-	CAL_ALARM_PROCEDURE,</div><div class='del'>-	CAL_ALARM_UNKNOWN</div><div class='del'>-} CalAlarmAction;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmTriggerType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_ALARM_TRIGGER_NONE,</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_START,</div><div class='del'>-	CAL_ALARM_TRIGGER_RELATIVE_END,</div><div class='del'>-	CAL_ALARM_TRIGGER_ABSOLUTE</div><div class='del'>-} CalAlarmTriggerType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmTrigger&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalAlarmTriggerType type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaldurationtype rel_duration;</div><div class='del'>-		struct icaltimetype abs_time;</div><div class='del'>-	} u;</div><div class='del'>-} CalAlarmTrigger;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmRepeat&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Number of extra repetitions, zero for none */</div><div class='del'>-	int repetitions;</div><div class='del'>-</div><div class='del'>-	/* Interval between repetitions */</div><div class='del'>-	struct icaldurationtype duration;</div><div class='del'>-} CalAlarmRepeat;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_alarms&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_add_alarm&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentAlarm *alarm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_remove_alarm&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *auid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_remove_all_alarms&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_alarm_uids&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_alarm&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarm  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *auid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarms_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarms *alarms</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarm  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_clone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarm  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_action&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmAction *action</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_action&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmAction action</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_attach&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, icalattach **attach</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_attach&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, icalattach *attach</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_description&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentText *description</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_description&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentText *description</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_repeat&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmRepeat *repeat</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_repeat&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmRepeat repeat</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_trigger&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmTrigger *trigger</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_trigger&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalAlarmTrigger trigger</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;CalRecurInstanceFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp,</div><div class='del'>-					 time_t        instance_start,</div><div class='del'>-					 time_t        instance_end,</div><div class='del'>-					 gpointer      data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;CalRecurResolveTimezoneFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icaltimezone *&lt;/RETURNS&gt;</div><div class='del'>-const char   *tzid,</div><div class='del'>-							 gpointer      data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_recur_generate_instances&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void 	&lt;/RETURNS&gt;</div><div class='del'>-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data,CalRecurResolveTimezoneFn tz_cb,gpointer		   tz_cb_data,icaltimezone		*default_timezone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalObjInstance&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;			/* UID of the object */</div><div class='del'>-	time_t start;			/* Start time of instance */</div><div class='del'>-	time_t end;			/* End time of instance */</div><div class='del'>-} CalObjInstance;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_obj_instance_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalObjType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CALOBJ_TYPE_EVENT   = 1 &lt;&lt; 0,</div><div class='del'>-	CALOBJ_TYPE_TODO    = 1 &lt;&lt; 1,</div><div class='del'>-	CALOBJ_TYPE_JOURNAL = 1 &lt;&lt; 2,</div><div class='del'>-	CALOBJ_TYPE_ANY     = 0x07</div><div class='del'>-} CalObjType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalMode&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_MODE_INVALID = -1,</div><div class='del'>-	CAL_MODE_LOCAL   = 1 &lt;&lt; 0,</div><div class='del'>-	CAL_MODE_REMOTE  = 1 &lt;&lt; 1,</div><div class='del'>-	CAL_MODE_ANY     = 0x07</div><div class='del'>-} CalMode;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_obj_uid_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_new_top_level&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icalcomponent  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_generate_alarms_for_comp&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarms  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp,time_t start,time_t end,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_generate_alarms_for_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-GList *comps,time_t start,time_t end,GSList **comp_alarms,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_resolve_tzid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icaltimezone  *&lt;/RETURNS&gt;</div><div class='del'>-const char *tzid, gpointer data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_priority_to_string&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-int priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_util_priority_from_string&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-const char *string</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_days_in_month&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int 	&lt;/RETURNS&gt;</div><div class='del'>-int year, int month</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_of_year&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int 	&lt;/RETURNS&gt;</div><div class='del'>-int day, int month, int year</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_of_week&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int 	&lt;/RETURNS&gt;</div><div class='del'>-int day, int month, int year</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_is_leap_year&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-int year</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_leap_years_up_to&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int 	&lt;/RETURNS&gt;</div><div class='del'>-int year</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;isodate_from_time_t&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char    *&lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_from_isodate&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-const char *str</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_day&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int days</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_week&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int weeks</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_begin&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_end&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_day_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int days, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_week_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int weeks, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_month_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int months, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_year_begin_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_month_begin_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_week_begin_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, int week_start_day,icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_begin_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_end_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t 	&lt;/RETURNS&gt;</div><div class='del'>-time_t time, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_to_gdate_with_zone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GDate *date, time_t time, icaltimezone *zone</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml b/doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml<br/>deleted file mode 100644<br/>index bab3cac78e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util-docs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-&lt;!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!ENTITY CalComponent SYSTEM "sgml/cal-component.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-cal-util-cal-recur SYSTEM "sgml/cal-recur.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-cal-util-cal-util SYSTEM "sgml/cal-util.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-cal-util-timeutil SYSTEM "sgml/timeutil.sgml"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;[Insert name here] Reference Manual&lt;/title&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;chapter&gt;</div><div class='del'>-    &lt;title&gt;[Insert title here]&lt;/title&gt;</div><div class='del'>-    &amp;CalComponent;</div><div class='del'>-    &amp;evolution-cal-util-cal-recur;</div><div class='del'>-    &amp;evolution-cal-util-cal-util;</div><div class='del'>-    &amp;evolution-cal-util-timeutil;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt b/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt<br/>deleted file mode 100644<br/>index 1a03226591..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,161 +0,0 @@</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-component&lt;/FILE&gt;</div><div class='del'>-CAL_COMPONENT</div><div class='del'>-&lt;TITLE&gt;CalComponent&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-CalComponentVType</div><div class='del'>-CalComponentField</div><div class='del'>-CalComponentClassification</div><div class='del'>-CalComponentDateTime</div><div class='del'>-CalComponentPeriodType</div><div class='del'>-CalComponentPeriod</div><div class='del'>-CalComponentText</div><div class='del'>-CalComponentTransparency</div><div class='del'>-</div><div class='del'>-cal_component_gen_uid</div><div class='del'>-cal_component_new</div><div class='del'>-cal_component_clone</div><div class='del'>-cal_component_set_new_vtype</div><div class='del'>-cal_component_set_icalcomponent</div><div class='del'>-cal_component_get_icalcomponent</div><div class='del'>-cal_component_get_vtype</div><div class='del'>-cal_component_get_as_string</div><div class='del'>-cal_component_commit_sequence</div><div class='del'>-cal_component_get_uid</div><div class='del'>-cal_component_set_uid</div><div class='del'>-cal_component_get_categories</div><div class='del'>-cal_component_set_categories</div><div class='del'>-cal_component_get_categories_list</div><div class='del'>-cal_component_set_categories_list</div><div class='del'>-cal_component_get_classification</div><div class='del'>-cal_component_set_classification</div><div class='del'>-cal_component_get_comment_list</div><div class='del'>-cal_component_set_comment_list</div><div class='del'>-cal_component_get_completed</div><div class='del'>-cal_component_set_completed</div><div class='del'>-cal_component_get_created</div><div class='del'>-cal_component_set_created</div><div class='del'>-cal_component_get_description_list</div><div class='del'>-cal_component_set_description_list</div><div class='del'>-cal_component_get_dtend</div><div class='del'>-cal_component_set_dtend</div><div class='del'>-cal_component_get_dtstamp</div><div class='del'>-cal_component_set_dtstamp</div><div class='del'>-cal_component_get_dtstart</div><div class='del'>-cal_component_set_dtstart</div><div class='del'>-cal_component_get_due</div><div class='del'>-cal_component_set_due</div><div class='del'>-cal_component_get_exdate_list</div><div class='del'>-cal_component_set_exdate_list</div><div class='del'>-cal_component_has_exdates</div><div class='del'>-cal_component_get_exrule_list</div><div class='del'>-cal_component_get_exrule_property_list</div><div class='del'>-cal_component_set_exrule_list</div><div class='del'>-cal_component_has_exrules</div><div class='del'>-cal_component_has_exceptions</div><div class='del'>-cal_component_get_geo</div><div class='del'>-cal_component_set_geo</div><div class='del'>-cal_component_get_last_modified</div><div class='del'>-cal_component_set_last_modified</div><div class='del'>-cal_component_get_percent</div><div class='del'>-cal_component_set_percent</div><div class='del'>-cal_component_get_priority</div><div class='del'>-cal_component_set_priority</div><div class='del'>-cal_component_get_rdate_list</div><div class='del'>-cal_component_set_rdate_list</div><div class='del'>-cal_component_has_rdates</div><div class='del'>-cal_component_get_rrule_list</div><div class='del'>-cal_component_get_rrule_property_list</div><div class='del'>-cal_component_set_rrule_list</div><div class='del'>-cal_component_has_rrules</div><div class='del'>-cal_component_has_recurrences</div><div class='del'>-cal_component_get_sequence</div><div class='del'>-cal_component_set_sequence</div><div class='del'>-cal_component_get_status</div><div class='del'>-cal_component_set_status</div><div class='del'>-cal_component_get_summary</div><div class='del'>-cal_component_set_summary</div><div class='del'>-cal_component_get_transparency</div><div class='del'>-cal_component_set_transparency</div><div class='del'>-cal_component_get_url</div><div class='del'>-cal_component_set_url</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Functions to free returned values&gt;</div><div class='del'>-cal_component_free_categories_list</div><div class='del'>-cal_component_free_datetime</div><div class='del'>-cal_component_free_exdate_list</div><div class='del'>-cal_component_free_geo</div><div class='del'>-cal_component_free_icaltimetype</div><div class='del'>-cal_component_free_percent</div><div class='del'>-cal_component_free_priority</div><div class='del'>-cal_component_free_period_list</div><div class='del'>-cal_component_free_recur_list</div><div class='del'>-cal_component_free_sequence</div><div class='del'>-cal_component_free_text_list</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Alarms&gt;</div><div class='del'>-CalComponentAlarm</div><div class='del'>-CalAlarmInstance</div><div class='del'>-CalComponentAlarms</div><div class='del'>-CalAlarmAction</div><div class='del'>-CalAlarmTriggerType</div><div class='del'>-CalAlarmTrigger</div><div class='del'>-</div><div class='del'>-cal_component_has_alarms</div><div class='del'>-cal_component_get_alarm_uids</div><div class='del'>-cal_component_get_alarm</div><div class='del'>-cal_component_alarm_free</div><div class='del'>-cal_component_alarms_free</div><div class='del'>-cal_component_alarm_get_uid</div><div class='del'>-cal_component_alarm_get_action</div><div class='del'>-cal_component_alarm_set_action</div><div class='del'>-cal_component_alarm_get_trigger</div><div class='del'>-cal_component_alarm_set_trigger</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAL_COMPONENT_TYPE</div><div class='del'>-CAL_COMPONENT_CLASS</div><div class='del'>-IS_CAL_COMPONENT</div><div class='del'>-IS_CAL_COMPONENT_CLASS</div><div class='del'>-cal_component_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-CalComponent</div><div class='del'>-CalComponentPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-recur&lt;/FILE&gt;</div><div class='del'>-CalRecurInstanceFn</div><div class='del'>-cal_recur_generate_instances</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-util&lt;/FILE&gt;</div><div class='del'>-CalObjInstance</div><div class='del'>-cal_obj_instance_list_free</div><div class='del'>-CalObjType</div><div class='del'>-cal_obj_uid_list_free</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;timeutil&lt;/FILE&gt;</div><div class='del'>-isodate_from_time_t</div><div class='del'>-time_add_minutes</div><div class='del'>-time_add_day</div><div class='del'>-time_add_week</div><div class='del'>-time_add_month</div><div class='del'>-time_add_year</div><div class='del'>-time_days_in_month</div><div class='del'>-time_from_day</div><div class='del'>-time_year_begin</div><div class='del'>-time_year_end</div><div class='del'>-time_month_begin</div><div class='del'>-time_month_end</div><div class='del'>-time_week_begin</div><div class='del'>-time_week_end</div><div class='del'>-time_day_begin</div><div class='del'>-time_day_end</div><div class='del'>-print_time_t</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.args b/doc/devel/calendar/cal-util/evolution-cal-util.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.args?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy b/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy<br/>deleted file mode 100644<br/>index cc235653f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  CalComponent</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.signals b/doc/devel/calendar/cal-util/evolution-cal-util.signals<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.signals?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util.signals</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.types b/doc/devel/calendar/cal-util/evolution-cal-util.types<br/>deleted file mode 100644<br/>index 52b2d9bf90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.types?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/evolution-cal-util.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-cal_component_get_type</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml<br/>deleted file mode 100644<br/>index 8a8cfa8907..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-component.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/tmpl/cal-component.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,992 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CalComponent</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-RFC 2445 iCalendar component object.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    The #CalComponent object provides a wrapper over the &amp;libical;</div><div class='del'>-    functions for manipulating calendar components.  #CalComponent</div><div class='del'>-    presents a GTK+-like interface to calendar components according to</div><div class='del'>-    RFC 2445.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    While &amp;libical; supports almost all of the features of the</div><div class='del'>-    iCalendar RFCs, applications are normally not interested in all</div><div class='del'>-    the mindless gunk that is there.  Still, applications should do</div><div class='del'>-    their best not to drop extension fields from calendar components</div><div class='del'>-    or any other extra information they do not support (including</div><div class='del'>-    standard fields they are not interested in).  The #CalComponent</div><div class='del'>-    object provides a wrapper over</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; structures from &amp;libical;</div><div class='del'>-    so that no information in them will be lost even if the</div><div class='del'>-    application is not designed to handle it.  Also, #CalComponent</div><div class='del'>-    provides a higher-level API to many of the &amp;libical; operations so</div><div class='del'>-    as to make it less painful to deal with iCalendar components.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    A #CalComponent object starts out empty.  It must be initialized</div><div class='del'>-    from an existing &lt;structname&gt;icalcomponent&lt;/structname&gt; structure</div><div class='del'>-    by using the cal_component_set_icalcomponent() function, or from a</div><div class='del'>-    completely new data by specifying the desired component type to</div><div class='del'>-    the cal_component_set_new_vtype() function.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    #CalComponent will create an internal map of the properties in the</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; structure and then allow</div><div class='del'>-    random access to them via the #CalComponent API functions;</div><div class='del'>-    normally the &amp;libical; API would have to be used by creating many</div><div class='del'>-    iterators and other unpleasant constructs.  #CalComponent keeps</div><div class='del'>-    handles to the properties it scanned from the</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; and will let the parent</div><div class='del'>-    application modify them at any time without having to do any</div><div class='del'>-    iteration.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Eventually a #CalComponent may be turned into the RFC 2445 string</div><div class='del'>-    representation of an iCalendar component by using the</div><div class='del'>-    cal_component_get_as_string() function.  Applications can then</div><div class='del'>-    transfer this interoperable</div><div class='del'>-    &lt;footnote&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;ldquo;Interoperable.&amp;rdquo;  Heavens, I love that word.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/footnote&gt;</div><div class='del'>-    string to other programs that deal with iCalendar.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO CAL_COMPONENT ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Casts a #GtkObject to a #CalComponent.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A GTK+ object.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentVType ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Calendar component types as defined by RFC 2445.  These values can</div><div class='del'>-    be used to create a new calendar component by passing them to the</div><div class='del'>-    cal_component_set_new_vtype() function.  They are also the return</div><div class='del'>-    value of the cal_component_get_vtype() function.  The only time</div><div class='del'>-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the</div><div class='del'>-    vtype of an uninitialized #CalComponent.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_NO_TYPE: </div><div class='del'>-@CAL_COMPONENT_EVENT: </div><div class='del'>-@CAL_COMPONENT_TODO: </div><div class='del'>-@CAL_COMPONENT_JOURNAL: </div><div class='del'>-@CAL_COMPONENT_FREEBUSY: </div><div class='del'>-@CAL_COMPONENT_TIMEZONE: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentField ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values are used as identifiers for #ETable columns.  These</div><div class='del'>-    are used by the calendar GUI code in &amp;Evolution;.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_FIELD_CATEGORIES: </div><div class='del'>-@CAL_COMPONENT_FIELD_CLASSIFICATION: </div><div class='del'>-@CAL_COMPONENT_FIELD_COMPLETED: </div><div class='del'>-@CAL_COMPONENT_FIELD_DTEND: </div><div class='del'>-@CAL_COMPONENT_FIELD_DTSTART: </div><div class='del'>-@CAL_COMPONENT_FIELD_DUE: </div><div class='del'>-@CAL_COMPONENT_FIELD_GEO: </div><div class='del'>-@CAL_COMPONENT_FIELD_PERCENT: </div><div class='del'>-@CAL_COMPONENT_FIELD_PRIORITY: </div><div class='del'>-@CAL_COMPONENT_FIELD_SUMMARY: </div><div class='del'>-@CAL_COMPONENT_FIELD_TRANSPARENCY: </div><div class='del'>-@CAL_COMPONENT_FIELD_URL: </div><div class='del'>-@CAL_COMPONENT_FIELD_HAS_ALARMS: </div><div class='del'>-@CAL_COMPONENT_FIELD_ICON: </div><div class='del'>-@CAL_COMPONENT_FIELD_COMPLETE: </div><div class='del'>-@CAL_COMPONENT_FIELD_RECURRING: </div><div class='del'>-@CAL_COMPONENT_FIELD_OVERDUE: </div><div class='del'>-@CAL_COMPONENT_FIELD_COLOR: </div><div class='del'>-@CAL_COMPONENT_FIELD_STATUS: </div><div class='del'>-@CAL_COMPONENT_FIELD_COMPONENT: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentClassification ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Values for the access classification property of a calendar</div><div class='del'>-    component.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_CLASS_NONE: </div><div class='del'>-@CAL_COMPONENT_CLASS_PUBLIC: </div><div class='del'>-@CAL_COMPONENT_CLASS_PRIVATE: </div><div class='del'>-@CAL_COMPONENT_CLASS_CONFIDENTIAL: </div><div class='del'>-@CAL_COMPONENT_CLASS_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentDateTime ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines a date and time value.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentPeriodType ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Defines how a period of time is specified.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_PERIOD_DATETIME: </div><div class='del'>-@CAL_COMPONENT_PERIOD_DURATION: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentPeriod ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines a period of time.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentText ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines the value of a text property that may have</div><div class='del'>-    an alternate representation parameter.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentTransparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_TRANSP_NONE: </div><div class='del'>-@CAL_COMPONENT_TRANSP_TRANSPARENT: </div><div class='del'>-@CAL_COMPONENT_TRANSP_OPAQUE: </div><div class='del'>-@CAL_COMPONENT_TRANSP_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_gen_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_clone ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_new_vtype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@type: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_icalcomponent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@icalcomp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_icalcomponent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_vtype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_as_string ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_commit_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@uid: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@uid: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_categories ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categories: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_categories ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categories: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_classification ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@classif: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_classification ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@classif: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_comment_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_comment_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_completed ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_completed ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_created ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_created ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_description_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_description_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtend ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtend ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtstamp ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtstamp ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtstart ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtstart ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_due ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_due ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_exdates ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_exrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_exrule_property_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_exrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_exrules ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_exceptions ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_last_modified ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_last_modified ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_rdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_rdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_rdates ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_rrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_rrule_property_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_rrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_rrules ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_recurrences ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@status: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@status: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_summary ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@summary: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_summary ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@summary: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_transparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@transp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_transparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@transp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@url: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@url: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_datetime ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_icaltimetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_period_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_recur_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_text_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalComponentAlarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalAlarmInstance ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentAlarms ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalAlarmAction ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_ALARM_NONE: </div><div class='del'>-@CAL_ALARM_AUDIO: </div><div class='del'>-@CAL_ALARM_DISPLAY: </div><div class='del'>-@CAL_ALARM_EMAIL: </div><div class='del'>-@CAL_ALARM_PROCEDURE: </div><div class='del'>-@CAL_ALARM_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalAlarmTriggerType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_ALARM_TRIGGER_NONE: </div><div class='del'>-@CAL_ALARM_TRIGGER_RELATIVE_START: </div><div class='del'>-@CAL_ALARM_TRIGGER_RELATIVE_END: </div><div class='del'>-@CAL_ALARM_TRIGGER_ABSOLUTE: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalAlarmTrigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_alarms ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_alarm_uids ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_alarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@auid: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarms_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarms: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_get_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_get_action ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@action: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_set_action ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@action: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_get_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@trigger: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_set_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@trigger: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml<br/>deleted file mode 100644<br/>index 214b24cbf7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/tmpl/cal-recur.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-cal-recur</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION CalRecurInstanceFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@instance_start: </div><div class='del'>-@instance_end: </div><div class='del'>-@data: </div><div class='del'>-@Returns: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@instace_end: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_generate_instances ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@cb: </div><div class='del'>-@cb_data: </div><div class='del'>-@tz_cb: </div><div class='del'>-@tz_cb_data: </div><div class='del'>-@default_timezone: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml<br/>deleted file mode 100644<br/>index ccd35fac2e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-util.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/tmpl/cal-util.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-Miscellaneous utilities</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalObjInstance ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_obj_instance_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalObjType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CALOBJ_TYPE_EVENT: </div><div class='del'>-@CALOBJ_TYPE_TODO: </div><div class='del'>-@CALOBJ_TYPE_JOURNAL: </div><div class='del'>-@CALOBJ_TYPE_ANY: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_obj_uid_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml<br/>deleted file mode 100644<br/>index 757b46b170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,322 +0,0 @@</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmAction ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_NONE: </div><div class='del'>-@CAL_COMPONENT_ALARM_AUDIO: </div><div class='del'>-@CAL_COMPONENT_ALARM_DISPLAY: </div><div class='del'>-@CAL_COMPONENT_ALARM_EMAIL: </div><div class='del'>-@CAL_COMPONENT_ALARM_PROCEDURE: </div><div class='del'>-@CAL_COMPONENT_ALARM_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentAlarmTrigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmTriggerRelated ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: </div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmTriggerType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: </div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalComponentPrivate ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalObjTime ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@day: </div><div class='del'>-@hour: </div><div class='del'>-@minute: </div><div class='del'>-@second: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalRecurType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_RECUR_YEARLY: </div><div class='del'>-@CAL_RECUR_MONTHLY: </div><div class='del'>-@CAL_RECUR_WEEKLY: </div><div class='del'>-@CAL_RECUR_DAILY: </div><div class='del'>-@CAL_RECUR_HOURLY: </div><div class='del'>-@CAL_RECUR_MINUTELY: </div><div class='del'>-@CAL_RECUR_SECONDLY: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalRecurrence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_alarm_instance_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_free_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@trigger: &lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_first_alarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_next_alarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_id: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_pilot_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_id: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_pilot_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@r: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@ir: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION format_simple_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@hour: </div><div class='del'>-@use_am_pm: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION get_time_t_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodiff_from_secs ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@secs: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodiff_to_secs ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION parse_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION print_time_t ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_minutes ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@minutes: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_month ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@months: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_year ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@years: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@hour: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_day ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@day: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_icaltimetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@itt: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_isodate ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_start_duration ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@start: </div><div class='del'>-@duration: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_month_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_month_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_week_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@week_start_day: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_week_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@week_start_day: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_year_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_year_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml<br/>deleted file mode 100644<br/>index e118c438eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/timeutil.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/cal-util/tmpl/timeutil.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-timeutil</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodate_from_time_t ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_day ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@days: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_week ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@weeks: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_days_in_month ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/evolution-calendar.sgml b/doc/devel/calendar/evolution-calendar.sgml<br/>deleted file mode 100644<br/>index ea0d8c7127..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/evolution-calendar.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/evolution-calendar.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-  &lt;part id="evolution-calendar"&gt;</div><div class='del'>-    &lt;docinfo&gt;</div><div class='del'>-      &lt;authorgroup&gt;</div><div class='del'>-	&lt;author&gt;</div><div class='del'>-	  &lt;firstname&gt;Federico&lt;/firstname&gt;</div><div class='del'>-	  &lt;surname&gt;Mena Quintero&lt;/surname&gt;</div><div class='del'>-	  &lt;affiliation&gt;</div><div class='del'>-	    &lt;address&gt;</div><div class='del'>-	      &lt;email&gt;federico@ximian.com&lt;/email&gt;</div><div class='del'>-	    &lt;/address&gt;</div><div class='del'>-	  &lt;/affiliation&gt;</div><div class='del'>-	&lt;/author&gt;</div><div class='del'>-      &lt;/authorgroup&gt;</div><div class='del'>-    &lt;/docinfo&gt;</div><div class='del'>-</div><div class='del'>-    &lt;title&gt;Developing Applications with the &amp;Evolution; Calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part of the &amp;Evolution; Developer's Guide describes how</div><div class='del'>-	to write applications for the &amp;Evolution; Calendar by using</div><div class='del'>-	its public interfaces.  The &amp;Evolution; Calendar exports its</div><div class='del'>-	functionality through a number of interfaces, including CORBA,</div><div class='del'>-	GTK+ wrappers for Bonobo objects, and other utility libraries.</div><div class='del'>-	This part also describes the internals of the calendar so that</div><div class='del'>-	it will be easy for you to make changes to &amp;Evolution;'s core</div><div class='del'>-	code.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	You should read this part of the &amp;Evolution; Developer's guide</div><div class='del'>-	if you intend to write client applications that use the</div><div class='del'>-	functionality of the &amp;Evolution; Calendar, such as its storage</div><div class='del'>-	interfaces and generic recurrence engine.  If you intend to</div><div class='del'>-	make changes to the calendar's core code, it will be useful to</div><div class='del'>-	read the sections on the calendar internals as well.  Even if</div><div class='del'>-	you do not intend to modify the core code of the calendar, it</div><div class='del'>-	may be useful to know a few things about the way it works so</div><div class='del'>-	that you can make better use of the public interfaces.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;calendar-architecture;</div><div class='del'>-    &amp;calendar-alarm-generation;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/public-reference.sgml b/doc/devel/calendar/public-reference.sgml<br/>deleted file mode 100644<br/>index b880bd2972..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/public-reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/calendar/public-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-  &lt;reference id="calendar-public-reference"&gt;</div><div class='del'>-    &lt;title&gt;Calendar Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	public APIs of the different components of the &amp;Evolution;</div><div class='del'>-	Calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;CalClient;</div><div class='del'>-    &amp;CalComponent;</div><div class='del'>-    &amp;cal-util;</div><div class='del'>-    &amp;cal-recur;</div><div class='del'>-    &amp;timeutil;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml<br/>deleted file mode 100644<br/>index c089c5b885..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/evolution-devel-guide.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/evolution-devel-guide.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//Davenport//DTD DocBook V3.0//EN"[</div><div class='del'>-&lt;!ENTITY preface SYSTEM "preface.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-reference SYSTEM "reference.sgml"&gt;</div><div class='del'>-&lt;!ENTITY FDL SYSTEM "fdl.sgml"&gt;</div><div class='del'>-</div><div class='del'>-&lt;!ENTITY evolution-calendar SYSTEM "calendar/evolution-calendar.sgml"&gt;</div><div class='del'>-&lt;!ENTITY calendar-architecture SYSTEM "calendar/architecture.sgml"&gt;</div><div class='del'>-&lt;!ENTITY calendar-alarm-generation SYSTEM "calendar/alarm-generation.sgml"&gt;</div><div class='del'>-&lt;!ENTITY calendar-public-reference SYSTEM "calendar/public-reference.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml"&gt;</div><div class='del'>-&lt;!ENTITY cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml"&gt;</div><div class='del'>-&lt;!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml"&gt;</div><div class='del'>-&lt;!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml"&gt;</div><div class='del'>-</div><div class='del'>-&lt;!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml"&gt;</div><div class='del'>-&lt;!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml"&gt;</div><div class='del'>-&lt;!ENTITY ExecutiveSummaryComponent SYSTEM "executive-summary/sgml/executive-summary-component.sgml"&gt;</div><div class='del'>-&lt;!ENTITY ExecutiveSummaryComponentFactory SYSTEM "executive-summary/sgml/executive-summary-component-factory.sgml"&gt;</div><div class='del'>-&lt;!ENTITY ExecutiveSummaryComponentFactoryClient SYSTEM "executive-summary/sgml/executive-summary-component-factory-client.sgml"&gt;</div><div class='del'>-&lt;!ENTITY ExecutiveSummaryHtmlView SYSTEM "executive-summary/sgml/executive-summary-html-view.sgml"&gt;</div><div class='del'>-</div><div class='del'>-&lt;!ENTITY Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!ENTITY Wombat "&lt;application&gt;Wombat&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!ENTITY Camel "&lt;application&gt;Camel&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!ENTITY PCS "&lt;acronym&gt;PCS&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!ENTITY libical "&lt;application&gt;libical&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!ENTITY Executive-Summary "&lt;application&gt;Executive Summary&lt;/application&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml" --&gt;</div><div class='del'>-&lt;!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml" --&gt;</div><div class='del'>-&lt;!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml" --&gt;</div><div class='del'>-&lt;!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml" --&gt;</div><div class='del'>-&lt;!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml" --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;&amp;Evolution; Developer's Guide&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;corpauthor&gt;</div><div class='del'>-	Ximian, Inc.</div><div class='del'>-      &lt;/corpauthor&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2001&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Ximian, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2001&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Ximian, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-    &lt;legalnotice id="legalnotice"&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Permission is granted to copy, distribute and/or modify this</div><div class='del'>-	document under the terms of the &lt;ulink type="help"</div><div class='del'>-	url="gnome-help:fdl"&gt;&lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-	License&lt;/citetitle&gt;&lt;/ulink&gt;, Version 1.1 or any later version</div><div class='del'>-	published by the Free Software Foundation with no Invariant</div><div class='del'>-	Sections, no Front-Cover Texts, and no Back-Cover Texts. You</div><div class='del'>-	may obtain a copy of the &lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-	License&lt;/citetitle&gt; from the Free Software Foundation by</div><div class='del'>-	visiting &lt;ulink type="http" url="http://www.fsf.org"&gt;their Web</div><div class='del'>-	site&lt;/ulink&gt; or by writing to: Free Software Foundation, Inc.,</div><div class='del'>-	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Many of the names used by companies to distinguish their</div><div class='del'>-	products and services are claimed as trademarks. Where those</div><div class='del'>-	names appear in any GNOME documentation, and those trademarks</div><div class='del'>-	are made aware to the members of the GNOME Documentation</div><div class='del'>-	Project, the names have been printed in caps or initial caps.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Introduction --&gt;</div><div class='del'>-</div><div class='del'>-  &amp;preface;</div><div class='del'>-</div><div class='del'>-  &lt;!-- DocBook parts for each individual component --&gt;</div><div class='del'>-</div><div class='del'>-  &amp;evolution-calendar;</div><div class='del'>-</div><div class='del'>-  &lt;!-- API Reference part --&gt;</div><div class='del'>-</div><div class='del'>-  &amp;evolution-reference;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Appendices --&gt;</div><div class='del'>-</div><div class='del'>-  &amp;FDL;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/doc/devel/executive-summary/.cvsignore b/doc/devel/executive-summary/.cvsignore<br/>deleted file mode 100644<br/>index 489a3d04fd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*-decl.txt</div><div class='del'>-*.signals</div><div class='del'>-*.hierarchy</div><div class='del'>-*.stamp</div><div class='del'>-*-scan.c</div><div class='del'>-*-unused.txt</div><div class='del'>-*-undocumented.txt</div><div class='del'>-*-decl-list.txt</div><div class='del'>-sgml</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/executive-summary/Makefile.am b/doc/devel/executive-summary/Makefile.am<br/>deleted file mode 100644<br/>index 9e0901bd9f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,191 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-# The name of the module, e.g. 'glib'.</div><div class='del'>-DOC_MODULE=evolution-services</div><div class='del'>-</div><div class='del'>-# The top-level SGML file. Change it if you want.</div><div class='del'>-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code. Relative to $(srcdir).</div><div class='del'>-# gtk-doc will search all .c &amp; .h files beneath here for inline comments</div><div class='del'>-# documenting functions and macros.</div><div class='del'>-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/executive-summary/evolution-services</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-scan.</div><div class='del'>-SCAN_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-mkdb.</div><div class='del'>-MKDB_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-fixref.</div><div class='del'>-FIXXREF_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Used for dependencies.</div><div class='del'>-HFILE_GLOB=</div><div class='del'>-CFILE_GLOB=												\</div><div class='del'>-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component.c		\</div><div class='del'>-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-component-factory-client.c	\</div><div class='del'>-	$(top_srcdir)/executive-summary/evolution-services/executive-summary-html-view.c</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Header files to ignore when scanning.</div><div class='del'>-IGNORE_HFILES=Executive-Summary.h</div><div class='del'>-</div><div class='del'>-# Images to copy into HTML directory.</div><div class='del'>-HTML_IMAGES =</div><div class='del'>-</div><div class='del'>-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).</div><div class='del'>-content_files =</div><div class='del'>-</div><div class='del'>-# Other files to distribute.</div><div class='del'>-extra_files =</div><div class='del'>-</div><div class='del'>-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib</div><div class='del'>-# contains GtkObjects/GObjects and you want to document signals and properties.</div><div class='del'>-GTKDOC_CFLAGS =							\</div><div class='del'>-	-I$(top_srcdir)/executive-summary/evolution-services	\</div><div class='del'>-	-I$(top_srcdir)/executive-summary			\</div><div class='del'>-	-I$(top_srcdir)						\</div><div class='del'>-	-I$(top_builddir)					\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-GTKDOC_LIBS = 								\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/executive-summary/evolution-services/.libs/libevolution-services.so</div><div class='del'>-</div><div class='del'>-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)</div><div class='del'>-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)</div><div class='del'>-</div><div class='del'>-# If you need to override some of the declarations, place them in this file</div><div class='del'>-# and uncomment this line.</div><div class='del'>-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt</div><div class='del'>-DOC_OVERRIDES = </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-###########################################################################</div><div class='del'>-# Everything below here is generic and you shouldn't need to change it.</div><div class='del'>-###########################################################################</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			    \</div><div class='del'>-	$(content_files)		\</div><div class='del'>-	$(extra_files)		  \</div><div class='del'>-	$(HTML_IMAGES)		  \</div><div class='del'>-	$(DOC_MAIN_SGML_FILE)	   \</div><div class='del'>-	$(DOC_MODULE).types	     \</div><div class='del'>-	$(DOC_MODULE)-sections.txt      \</div><div class='del'>-	$(DOC_OVERRIDES)</div><div class='del'>-</div><div class='del'>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \</div><div class='del'>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp</div><div class='del'>-</div><div class='del'>-SCANOBJ_FILES =		 \</div><div class='del'>-	$(DOC_MODULE).args      \</div><div class='del'>-	$(DOC_MODULE).hierarchy \</div><div class='del'>-	$(DOC_MODULE).signals</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-#all-local: html-build.stamp</div><div class='del'>-all-local: sgml-build.stamp</div><div class='del'>-</div><div class='del'>-#### scan ####</div><div class='del'>-</div><div class='del'>-scan-build.stamp: $(HFILE_GLOB)</div><div class='del'>-	@echo '*** Scanning header files ***'</div><div class='del'>-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types &gt; /dev/null ; then \</div><div class='del'>-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scanobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \</div><div class='del'>-	else \</div><div class='del'>-	    cd $(srcdir) ; \</div><div class='del'>-	    for i in $(SCANOBJ_FILES) ; do \</div><div class='del'>-	       test -f $$i || touch $$i ; \</div><div class='del'>-	    done \</div><div class='del'>-	fi</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)</div><div class='del'>-	touch scan-build.stamp</div><div class='del'>-</div><div class='del'>-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### templates ####</div><div class='del'>-</div><div class='del'>-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)</div><div class='del'>-	@echo '*** Rebuilding template files ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-	touch tmpl-build.stamp</div><div class='del'>-</div><div class='del'>-tmpl.stamp: tmpl-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### sgml ####</div><div class='del'>-</div><div class='del'>-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml</div><div class='del'>-	@echo '*** Building SGML ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)</div><div class='del'>-	touch sgml-build.stamp</div><div class='del'>-</div><div class='del'>-sgml.stamp: sgml-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### html ####</div><div class='del'>-</div><div class='del'>-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)</div><div class='del'>-	@echo '*** Building HTML ***'</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) &amp;&amp; cp $(HTML_IMAGES) html )</div><div class='del'>-	@echo '-- Fixing Crossreferences' </div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)</div><div class='del'>-	touch html-build.stamp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-##############</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Require gtk-doc when making dist</div><div class='del'>-#</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-else</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-	@echo "*** gtk-doc must be installed and enabled in order to make dist"</div><div class='del'>-	@false</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-dist-hook: dist-check-gtkdoc dist-hook-local</div><div class='del'>-	mkdir $(distdir)/tmpl</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	mkdir $(distdir)/html</div><div class='del'>-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl</div><div class='del'>-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml</div><div class='del'>-	-cp $(srcdir)/html/index.sgml $(distdir)/html</div><div class='del'>-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html</div><div class='del'>-</div><div class='del'>-	images=$(HTML_IMAGES) ;	       \</div><div class='del'>-	for i in $$images ; do		\</div><div class='del'>-	  cp $(srcdir)/$$i $(distdir)/html ;  \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-.PHONY : dist-hook-local</div><div class='head'>diff --git a/doc/devel/executive-summary/evolution-services-decl.txt b/doc/devel/executive-summary/evolution-services-decl.txt<br/>deleted file mode 100644<br/>index caaabb2ee7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/evolution-services-decl.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/evolution-services-decl.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,536 +0,0 @@</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_CLIENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryClientPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryClient&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryClientClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryClient&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryClient {</div><div class='del'>-	BonoboObjectClient parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryClient *client,CORBA_Object object</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_set_title&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryClient *client,int id,const char *title</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_set_icon&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryClient *client,int id,const char *icon</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_flash&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryClient *client,int id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_client_update&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryClient *client,int id,const char *html</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentClientPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentClient&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentClientClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentClient&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryComponentClient {</div><div class='del'>-  BonoboObjectClient parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;ExecutiveSummaryComponentClient  *&lt;/RETURNS&gt;</div><div class='del'>-const char *id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_set_owner&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentClient *client,ExecutiveSummary *summary</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_unset_owner&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_supports&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentClient *client,gboolean *bonobo,gboolean *html</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_configure&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_client_destroy_view&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentClient *client,ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClientClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryClientPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryClient&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryClientClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryClient&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryComponentFactoryClient {</div><div class='del'>-  BonoboObjectClient parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentFactoryClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_client_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_client_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentFactoryClient *client,CORBA_Object corba_object</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_client_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;ExecutiveSummaryComponentFactoryClient  *&lt;/RETURNS&gt;</div><div class='del'>-const char *id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_client_create_view&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CORBA_Object  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentFactoryClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_VIEW&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentViewPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentView&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentViewClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentView&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryComponentView {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;ExecutiveSummaryComponentView  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponent *component,BonoboControl *control,const char *html,const char *title,const char *icon</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_set_title&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,const char *title</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_title&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_set_icon&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,const char *icon</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_icon&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_flash&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_set_html&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,const char *html</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_html&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_control&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_set_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,int id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_configure&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_set_objref&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view,Bonobo_Control objref</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_view_get_widget&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkWidget  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponent&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponent&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryComponent {</div><div class='del'>-  BonoboObject parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE (executive_summary_component_factory_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactory))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactoryClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactory&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactoryClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;EvolutionServicesCreateViewFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryComponentFactory *factory,</div><div class='del'>-							 void *closure</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryComponentFactory&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryComponentFactory {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_component_factory_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-EvolutionServicesCreateViewFn create_view,void *closure</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED "GNOME:Evolution:Summary:HTMLView:html_changed"</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_HTML_VIEW_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_TYPE (executive_summary_html_view_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_HTML_VIEW&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlView))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_HTML_VIEW_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlViewClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_HTML_VIEW&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryHtmlViewPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryHtmlView&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryHtmlViewClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryHtmlView&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummaryHtmlView {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_new_full&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-BonoboEventSource *event_source</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_set_html&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryHtmlView *view,const char *html</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_get_html&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;const char  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryHtmlView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_html_view_get_event_source&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboEventSource  *&lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummaryHtmlView *view</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_TYPE&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;EXECUTIVE_SUMMARY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_EXECUTIVE_SUMMARY_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummary&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummaryClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;ExecutiveSummary&lt;/NAME&gt;</div><div class='del'>-struct ExecutiveSummary {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryPrivate *private;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-ExecutiveSummary *es,GNOME_Evolution_Summary_ViewFrame corba_object</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;executive_summary_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;BonoboObject  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='head'>diff --git a/doc/devel/executive-summary/evolution-services-sections.txt b/doc/devel/executive-summary/evolution-services-sections.txt<br/>deleted file mode 100644<br/>index 8ba2b42317..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/evolution-services-sections.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/evolution-services-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,95 +0,0 @@</div><div class='del'>-&lt;INCLUDE&gt;executive-summary-component.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;executive-summary-component&lt;/FILE&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT</div><div class='del'>-&lt;TITLE&gt;ExecutiveSummaryComponent&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-executive_summary_component_new</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_TYPE</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_CLASS</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS</div><div class='del'>-executive_summary_component_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-ExecutiveSummaryComponent</div><div class='del'>-ExecutiveSummaryComponentPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;executive-summary-component-factory&lt;/FILE&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY</div><div class='del'>-&lt;TITLE&gt;ExecutiveSummaryComponentFactory&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-EvolutionServicesCreateViewFn</div><div class='del'>-</div><div class='del'>-executive_summary_component_factory_new</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS</div><div class='del'>-executive_summary_component_factory_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-ExecutiveSummaryComponentFactory</div><div class='del'>-ExecutiveSummaryComponentFactoryPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;executive-summary-component-factory-client.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;executive-summary-component-factory-client&lt;/FILE&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</div><div class='del'>-&lt;TITLE&gt;ExecutiveSummaryComponentFactoryClient&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-executive_summary_component_factory_client_construct</div><div class='del'>-executive_summary_component_factory_client_new</div><div class='del'>-executive_summary_component_factory_client_create_view</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</div><div class='del'>-EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT</div><div class='del'>-IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS</div><div class='del'>-executive_summary_component_factory_client_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-ExecutiveSummaryComponentFactoryClient</div><div class='del'>-ExecutiveSummaryComponentFactoryClientPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;executive-summary-html-view.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;executive-summary-html-view&lt;/FILE&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_HTML_VIEW</div><div class='del'>-&lt;TITLE&gt;ExecutiveSummaryHtmlView&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED</div><div class='del'>-</div><div class='del'>-executive_summary_html_view_new_full</div><div class='del'>-executive_summary_html_view_new</div><div class='del'>-executive_summary_html_view_set_html</div><div class='del'>-executive_summary_html_view_get_html</div><div class='del'>-executive_summary_html_view_get_event_source</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EXECUTIVE_SUMMARY_HTML_VIEW_TYPE</div><div class='del'>-EXECUTIVE_SUMMARY_HTML_VIEW</div><div class='del'>-IS_EXECUTIVE_SUMMARY_HTML_VIEW</div><div class='del'>-EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</div><div class='del'>-IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS</div><div class='del'>-executive_summary_html_view_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-ExecutiveSummaryHtmlView</div><div class='del'>-ExecutiveSummaryHtmlViewPrivate</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/executive-summary/evolution-services.args b/doc/devel/executive-summary/evolution-services.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/evolution-services.args?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/evolution-services.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy<br/>deleted file mode 100644<br/>index 37559d819d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/evolution-services.hierarchy?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/evolution-services.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  BonoboObject</div><div class='del'>-    ExecutiveSummaryComponent</div><div class='del'>-    ExecutiveSummaryComponentFactory</div><div class='del'>-    Handle to remote Bonobo::Unknown</div><div class='del'>-      ExecutiveSummaryComponentFactoryClient</div><div class='del'>-    ExecutiveSummaryHtmlView</div><div class='head'>diff --git a/doc/devel/executive-summary/evolution-services.types b/doc/devel/executive-summary/evolution-services.types<br/>deleted file mode 100644<br/>index b7ac05b89c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/evolution-services.types?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/evolution-services.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-factory-client.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-html-view.h&gt;</div><div class='del'>-</div><div class='del'>-executive_summary_component_get_type</div><div class='del'>-executive_summary_component_factory_get_type</div><div class='del'>-executive_summary_component_factory_client_get_type</div><div class='del'>-executive_summary_html_view_get_type</div><div class='head'>diff --git a/doc/devel/executive-summary/private-reference.sgml b/doc/devel/executive-summary/private-reference.sgml<br/>deleted file mode 100644<br/>index e06d7c1690..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/private-reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/private-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-  &lt;reference id="evolution-services-private-reference"&gt;</div><div class='del'>-    &lt;title&gt;Evolution Services Private API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	private APIs of the different components of the &amp;Evolution;</div><div class='del'>-	Executive Summary Services Framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-    </div><div class='del'>-    &amp;ExecutiveSummaryComponentFactoryClient;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/executive-summary/public-reference.sgml b/doc/devel/executive-summary/public-reference.sgml<br/>deleted file mode 100644<br/>index 7758a9a5c8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/public-reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/public-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>- &lt;reference id="evolution-services-public-reference"&gt;</div><div class='del'>-    &lt;title&gt;Evolution Services Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This part presents the class and function reference for the</div><div class='del'>-        public APIs of the different components of the &amp;Evolution;</div><div class='del'>-        Executive Summary Services Framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;ExecutiveSummaryComponent;</div><div class='del'>-    &amp;ExecutiveSummaryComponentFactory;</div><div class='del'>-    &amp;ExecutiveSummaryHtmlView;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml b/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml<br/>deleted file mode 100644<br/>index 9f8096db6a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/tmpl/evolution-services-unused.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/tmpl/evolution-services-unused.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-&lt;!-- ##### SIGNAL ExecutiveSummaryHtmlView::handle-uri ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@executivesummaryhtmlview: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml<br/>deleted file mode 100644<br/>index ee8ef25689..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/tmpl/executive-summary-component-factory-client.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-ExecutiveSummaryComponentFactoryClient</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-GtkObject client to simplfy use of GNOME_Evolution_Summary_ComponentFactory</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-This object provides an easy wrapper around the CORBA object that represents the</div><div class='del'>- GNOME_Evolution_Summary_ComponentFactory interface. It handles conversion from</div><div class='del'>-normal types to CORBA types and has error checking.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Casts a #GtkObject into an #ExecutiveSummaryComponentFactoryClient</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_component_factory_client_construct ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@corba_object: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_component_factory_client_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@id: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_component_factory_client_create_view ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml<br/>deleted file mode 100644<br/>index 7069eea9d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/tmpl/executive-summary-component-factory.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-ExecutiveSummaryComponentFactory</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-GtkObject wrapper for GNOME/Evolution/Summary/ComponentFactory.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-An ExecutiveSummaryComponentFactory simplifies the creation of a </div><div class='del'>-GNOME_Evolution_Summary_ComponentFactory object. It also allows error checking</div><div class='del'>-and all the standard #GtkObject signals.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT_FACTORY ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Casts a #GtkObject to an #ExecutiveSummaryComponentFactory.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A #GtkObject.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionServicesCreateViewFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The type of function that is called when the factory has to create a new view.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@factory: The #ExecutiveSummaryComponent that is creating the view.</div><div class='del'>-@closure: The data that was passed into executive_summary_factory_new ().</div><div class='del'>-@Returns: An #ExecutiveSummaryComponent.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_component_factory_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@create_view: </div><div class='del'>-@closure: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/executive-summary/tmpl/executive-summary-component.sgml b/doc/devel/executive-summary/tmpl/executive-summary-component.sgml<br/>deleted file mode 100644<br/>index 04768b1b1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/tmpl/executive-summary-component.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/tmpl/executive-summary-component.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-ExecutiveSummaryComponent</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-The base #BonoboObject that implements GNOME/Evolution/Summary/Component.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-This #GtkObject wrapper around the GNOME/Evolution/Summary/Component, is the</div><div class='del'>-base object that has all the other interfaces aggregated onto it. These</div><div class='del'>-interfaces are: GNOME/Evolution/HTMLView, Bonobo/Control, Bonobo/EventSource,</div><div class='del'>-Bonobo/PropertyBag, Bonobo/PropertyControl and Bonobo/PersistStream. Each of</div><div class='del'>-the aggregated interfaces performs a specific job in the creation of the service.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-#ExecutiveSummaryHtmlView, #BonoboControl, #BonoboEventSource, #BonoboPropertyBag,</div><div class='del'>-#BonoboPropertyControl, #BonoboPersistStream.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EXECUTIVE_SUMMARY_COMPONENT ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Casts a #GtkObject to an #ExecutiveSummaryComponent.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A #GtkObject.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_component_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml b/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml<br/>deleted file mode 100644<br/>index 2fb66a2035..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/executive-summary/tmpl/executive-summary-html-view.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-ExecutiveSummaryHtmlView</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-A Bonobo component used to implement HTML based services.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-When writing HTML services, this component is aggregated onto an #ExecutiveSummaryComponent, to allow the Executive Summary to be able to find the HTML.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-#ExecutiveSummaryComponent, #BonoboEventSource</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  Casts a #GtkObject into an #ExecutiveSummaryHtmlView</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A #GtkObject</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-This is the event that is emitted on the BonoboEventSource when the HTML is changed.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_html_view_new_full ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@event_source: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_html_view_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_html_view_set_html ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@view: </div><div class='del'>-@html: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_html_view_get_html ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@view: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION executive_summary_html_view_get_event_source ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@view: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/fdl.sgml b/doc/devel/fdl.sgml<br/>deleted file mode 100644<br/>index 817adbdbb7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/fdl.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/fdl.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,671 +0,0 @@</div><div class='del'>-&lt;!--  </div><div class='del'>-     The GNU Free Documentation License 1.1 in DocBook</div><div class='del'>-     Markup by Eric Baudais &lt;baudais@okstate.edu&gt;</div><div class='del'>-     Maintained by the GNOME Documentation Project</div><div class='del'>-     http://developer.gnome.org/projects/gdp</div><div class='del'>-     Version: 1.0.1</div><div class='del'>-     Last Modified: Nov 16, 2000</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;appendix id="fdl"&gt;</div><div class='del'>-  &lt;docinfo&gt;</div><div class='del'>-    &lt;releaseinfo&gt;</div><div class='del'>-      Version 1.1, March 2000</div><div class='del'>-    &lt;/releaseinfo&gt;</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;&lt;holder&gt;Free Software Foundation, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-    &lt;legalnotice id="fdl-legalnotice"&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&lt;address&gt;Free Software Foundation, Inc. &lt;street&gt;59 Temple Place, </div><div class='del'>-        Suite 330&lt;/street&gt;, &lt;city&gt;Boston&lt;/city&gt;, &lt;state&gt;MA&lt;/state&gt;  </div><div class='del'>-        &lt;postcode&gt;02111-1307&lt;/postcode&gt;  &lt;country&gt;USA&lt;/country&gt;&lt;/address&gt; </div><div class='del'>-	Everyone is permitted to copy and distribute verbatim copies of this </div><div class='del'>-        license document, but changing it is not allowed.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-  &lt;/docinfo&gt;</div><div class='del'>-  &lt;title&gt;GNU Free Documentation License&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="fdl-preamble"&gt;</div><div class='del'>-    &lt;title&gt;0. PREAMBLE&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The purpose of this License is to make a manual, textbook, or</div><div class='del'>-      other written document &lt;quote&gt;free&lt;/quote&gt; in the sense of</div><div class='del'>-      freedom: to assure everyone the effective freedom to copy and</div><div class='del'>-      redistribute it, with or without modifying it, either</div><div class='del'>-      commercially or noncommercially. Secondarily, this License</div><div class='del'>-      preserves for the author and publisher a way to get credit for</div><div class='del'>-      their work, while not being considered responsible for</div><div class='del'>-      modifications made by others.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This License is a kind of &lt;quote&gt;copyleft&lt;/quote&gt;, which means</div><div class='del'>-      that derivative works of the document must themselves be free in</div><div class='del'>-      the same sense. It complements the GNU General Public License,</div><div class='del'>-      which is a copyleft license designed for free software.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      We have designed this License in order to use it for manuals for</div><div class='del'>-      free software, because free software needs free documentation: a</div><div class='del'>-      free program should come with manuals providing the same</div><div class='del'>-      freedoms that the software does. But this License is not limited</div><div class='del'>-      to software manuals; it can be used for any textual work,</div><div class='del'>-      regardless of subject matter or whether it is published as a</div><div class='del'>-      printed book. We recommend this License principally for works</div><div class='del'>-      whose purpose is instruction or reference.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="fdl-section1"&gt;</div><div class='del'>-    &lt;title&gt;1. APPLICABILITY AND DEFINITIONS&lt;/title&gt;</div><div class='del'>-    &lt;para id="fdl-document"&gt;</div><div class='del'>-      This License applies to any manual or other work that contains a</div><div class='del'>-      notice placed by the copyright holder saying it can be</div><div class='del'>-      distributed under the terms of this License. The</div><div class='del'>-      &lt;quote&gt;Document&lt;/quote&gt;, below, refers to any such manual or</div><div class='del'>-      work. Any member of the public is a licensee, and is addressed</div><div class='del'>-      as &lt;quote&gt;you&lt;/quote&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para id="fdl-modified"&gt;</div><div class='del'>-      A &lt;quote&gt;Modified Version&lt;/quote&gt; of the Document means any work</div><div class='del'>-      containing the Document or a portion of it, either copied</div><div class='del'>-      verbatim, or with modifications and/or translated into another</div><div class='del'>-      language.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-	</div><div class='del'>-    &lt;para id="fdl-secondary"&gt;</div><div class='del'>-      A &lt;quote&gt;Secondary Section&lt;/quote&gt; is a named appendix or a</div><div class='del'>-      front-matter section of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; that deals exclusively</div><div class='del'>-      with the relationship of the publishers or authors of the</div><div class='del'>-      Document to the Document's overall subject (or to related</div><div class='del'>-      matters) and contains nothing that could fall directly within</div><div class='del'>-      that overall subject. (For example, if the Document is in part a</div><div class='del'>-      textbook of mathematics, a Secondary Section may not explain any</div><div class='del'>-      mathematics.)  The relationship could be a matter of historical</div><div class='del'>-      connection with the subject or with related matters, or of</div><div class='del'>-      legal, commercial, philosophical, ethical or political position</div><div class='del'>-      regarding them.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para id="fdl-invariant"&gt;</div><div class='del'>-      The &lt;quote&gt;Invariant Sections&lt;/quote&gt; are certain &lt;link</div><div class='del'>-      linkend="fdl-secondary"&gt; Secondary Sections&lt;/link&gt; whose titles</div><div class='del'>-      are designated, as being those of Invariant Sections, in the</div><div class='del'>-      notice that says that the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; is released under this</div><div class='del'>-      License.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para id="fdl-cover-texts"&gt;</div><div class='del'>-      The &lt;quote&gt;Cover Texts&lt;/quote&gt; are certain short passages of</div><div class='del'>-      text that are listed, as Front-Cover Texts or Back-Cover Texts,</div><div class='del'>-      in the notice that says that the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; is released under this</div><div class='del'>-      License.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-	</div><div class='del'>-    &lt;para id="fdl-transparent"&gt;</div><div class='del'>-      A &lt;quote&gt;Transparent&lt;/quote&gt; copy of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt; Document&lt;/link&gt; means a machine-readable</div><div class='del'>-      copy, represented in a format whose specification is available</div><div class='del'>-      to the general public, whose contents can be viewed and edited</div><div class='del'>-      directly and straightforwardly with generic text editors or (for</div><div class='del'>-      images composed of pixels) generic paint programs or (for</div><div class='del'>-      drawings) some widely available drawing editor, and that is</div><div class='del'>-      suitable for input to text formatters or for automatic</div><div class='del'>-      translation to a variety of formats suitable for input to text</div><div class='del'>-      formatters. A copy made in an otherwise Transparent file format</div><div class='del'>-      whose markup has been designed to thwart or discourage</div><div class='del'>-      subsequent modification by readers is not Transparent.  A copy</div><div class='del'>-      that is not &lt;quote&gt;Transparent&lt;/quote&gt; is called</div><div class='del'>-      &lt;quote&gt;Opaque&lt;/quote&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Examples of suitable formats for Transparent copies include</div><div class='del'>-      plain ASCII without markup, Texinfo input format, LaTeX input</div><div class='del'>-      format, SGML or XML using a publicly available DTD, and</div><div class='del'>-      standard-conforming simple HTML designed for human</div><div class='del'>-      modification. Opaque formats include PostScript, PDF,</div><div class='del'>-      proprietary formats that can be read and edited only by</div><div class='del'>-      proprietary word processors, SGML or XML for which the DTD</div><div class='del'>-      and/or processing tools are not generally available, and the</div><div class='del'>-      machine-generated HTML produced by some word processors for</div><div class='del'>-      output purposes only.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para id="fdl-title-page"&gt;</div><div class='del'>-      The &lt;quote&gt;Title Page&lt;/quote&gt; means, for a printed book, the</div><div class='del'>-      title page itself, plus such following pages as are needed to</div><div class='del'>-      hold, legibly, the material this License requires to appear in</div><div class='del'>-      the title page. For works in formats which do not have any title</div><div class='del'>-      page as such, &lt;quote&gt;Title Page&lt;/quote&gt; means the text near the</div><div class='del'>-      most prominent appearance of the work's title, preceding the</div><div class='del'>-      beginning of the body of the text.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section2"&gt;</div><div class='del'>-    &lt;title&gt;2. VERBATIM COPYING&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may copy and distribute the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; in any medium, either</div><div class='del'>-      commercially or noncommercially, provided that this License, the</div><div class='del'>-      copyright notices, and the license notice saying this License</div><div class='del'>-      applies to the Document are reproduced in all copies, and that</div><div class='del'>-      you add no other conditions whatsoever to those of this</div><div class='del'>-      License. You may not use technical measures to obstruct or</div><div class='del'>-      control the reading or further copying of the copies you make or</div><div class='del'>-      distribute. However, you may accept compensation in exchange for</div><div class='del'>-      copies. If you distribute a large enough number of copies you</div><div class='del'>-      must also follow the conditions in &lt;link</div><div class='del'>-      linkend="fdl-section3"&gt;section 3&lt;/link&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may also lend copies, under the same conditions stated</div><div class='del'>-      above, and you may publicly display copies.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section3"&gt;</div><div class='del'>-    &lt;title&gt;3. COPYING IN QUANTITY&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you publish printed copies of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; numbering more than 100,</div><div class='del'>-      and the Document's license notice requires &lt;link</div><div class='del'>-      linkend="fdl-cover-texts"&gt;Cover Texts&lt;/link&gt;, you must enclose</div><div class='del'>-      the copies in covers that carry, clearly and legibly, all these</div><div class='del'>-      Cover Texts: Front-Cover Texts on the front cover, and</div><div class='del'>-      Back-Cover Texts on the back cover. Both covers must also</div><div class='del'>-      clearly and legibly identify you as the publisher of these</div><div class='del'>-      copies. The front cover must present the full title with all</div><div class='del'>-      words of the title equally prominent and visible. You may add</div><div class='del'>-      other material on the covers in addition. Copying with changes</div><div class='del'>-      limited to the covers, as long as they preserve the title of the</div><div class='del'>-      &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt; and satisfy these</div><div class='del'>-      conditions, can be treated as verbatim copying in other</div><div class='del'>-      respects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If the required texts for either cover are too voluminous to fit</div><div class='del'>-      legibly, you should put the first ones listed (as many as fit</div><div class='del'>-      reasonably) on the actual cover, and continue the rest onto</div><div class='del'>-      adjacent pages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you publish or distribute &lt;link</div><div class='del'>-      linkend="fdl-transparent"&gt;Opaque&lt;/link&gt; copies of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; numbering more than 100,</div><div class='del'>-      you must either include a machine-readable &lt;link</div><div class='del'>-      linkend="fdl-transparent"&gt;Transparent&lt;/link&gt; copy along with</div><div class='del'>-      each Opaque copy, or state in or with each Opaque copy a</div><div class='del'>-      publicly-accessible computer-network location containing a</div><div class='del'>-      complete Transparent copy of the Document, free of added</div><div class='del'>-      material, which the general network-using public has access to</div><div class='del'>-      download anonymously at no charge using public-standard network</div><div class='del'>-      protocols. If you use the latter option, you must take</div><div class='del'>-      reasonably prudent steps, when you begin distribution of Opaque</div><div class='del'>-      copies in quantity, to ensure that this Transparent copy will</div><div class='del'>-      remain thus accessible at the stated location until at least one</div><div class='del'>-      year after the last time you distribute an Opaque copy (directly</div><div class='del'>-      or through your agents or retailers) of that edition to the</div><div class='del'>-      public.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      It is requested, but not required, that you contact the authors</div><div class='del'>-      of the &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt; well before</div><div class='del'>-      redistributing any large number of copies, to give them a chance</div><div class='del'>-      to provide you with an updated version of the Document.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section4"&gt;</div><div class='del'>-    &lt;title&gt;4. MODIFICATIONS&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may copy and distribute a &lt;link</div><div class='del'>-      linkend="fdl-modified"&gt;Modified Version&lt;/link&gt; of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; under the conditions of</div><div class='del'>-      sections &lt;link linkend="fdl-section2"&gt;2&lt;/link&gt; and &lt;link</div><div class='del'>-      linkend="fdl-section3"&gt;3&lt;/link&gt; above, provided that you release</div><div class='del'>-      the Modified Version under precisely this License, with the</div><div class='del'>-      Modified Version filling the role of the Document, thus</div><div class='del'>-      licensing distribution and modification of the Modified Version</div><div class='del'>-      to whoever possesses a copy of it. In addition, you must do</div><div class='del'>-      these things in the Modified Version:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;itemizedlist mark="opencircle"&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;A&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Use in the &lt;link linkend="fdl-title-page"&gt;Title</div><div class='del'>-	    Page&lt;/link&gt; (and on the covers, if any) a title distinct</div><div class='del'>-	    from that of the &lt;link</div><div class='del'>-	    linkend="fdl-document"&gt;Document&lt;/link&gt;, and from those of</div><div class='del'>-	    previous versions (which should, if there were any, be</div><div class='del'>-	    listed in the History section of the Document). You may</div><div class='del'>-	    use the same title as a previous version if the original</div><div class='del'>-	    publisher of that version gives permission.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;B&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    List on the &lt;link linkend="fdl-title-page"&gt;Title</div><div class='del'>-	    Page&lt;/link&gt;, as authors, one or more persons or entities</div><div class='del'>-	    responsible for authorship of the modifications in the</div><div class='del'>-	    &lt;link linkend="fdl-modified"&gt;Modified Version&lt;/link&gt;,</div><div class='del'>-	    together with at least five of the principal authors of</div><div class='del'>-	    the &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt; (all of</div><div class='del'>-	    its principal authors, if it has less than five).</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;C&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    State on the &lt;link linkend="fdl-title-page"&gt;Title</div><div class='del'>-	    Page&lt;/link&gt; the name of the publisher of the &lt;link</div><div class='del'>-	    linkend="fdl-modified"&gt;Modified Version&lt;/link&gt;, as the</div><div class='del'>-	    publisher.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;D&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Preserve all the copyright notices of the &lt;link</div><div class='del'>-	    linkend="fdl-document"&gt;Document&lt;/link&gt;.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;E&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Add an appropriate copyright notice for your modifications</div><div class='del'>-	    adjacent to the other copyright notices.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;F&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Include, immediately after the copyright notices, a</div><div class='del'>-	    license notice giving the public permission to use the</div><div class='del'>-	    &lt;link linkend="fdl-modified"&gt;Modified Version&lt;/link&gt; under</div><div class='del'>-	    the terms of this License, in the form shown in the</div><div class='del'>-	    Addendum below.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;G&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Preserve in that license notice the full lists of &lt;link</div><div class='del'>-	    linkend="fdl-invariant"&gt; Invariant Sections&lt;/link&gt; and</div><div class='del'>-	    required &lt;link linkend="fdl-cover-texts"&gt;Cover</div><div class='del'>-	    Texts&lt;/link&gt; given in the &lt;link</div><div class='del'>-	    linkend="fdl-document"&gt;Document's&lt;/link&gt; license notice.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;H&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Include an unaltered copy of this License.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;I&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Preserve the section entitled &lt;quote&gt;History&lt;/quote&gt;, and</div><div class='del'>-	    its title, and add to it an item stating at least the</div><div class='del'>-	    title, year, new authors, and publisher of the &lt;link</div><div class='del'>-	    linkend="fdl-modified"&gt;Modified Version &lt;/link&gt;as given on</div><div class='del'>-	    the &lt;link linkend="fdl-title-page"&gt;Title Page&lt;/link&gt;.  If</div><div class='del'>-	    there is no section entitled &lt;quote&gt;History&lt;/quote&gt; in the</div><div class='del'>-	    &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt;, create one</div><div class='del'>-	    stating the title, year, authors, and publisher of the</div><div class='del'>-	    Document as given on its Title Page, then add an item</div><div class='del'>-	    describing the Modified Version as stated in the previous</div><div class='del'>-	    sentence.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;J&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Preserve the network location, if any, given in the &lt;link</div><div class='del'>-	    linkend="fdl-document"&gt;Document&lt;/link&gt; for public access</div><div class='del'>-	    to a &lt;link linkend="fdl-transparent"&gt;Transparent&lt;/link&gt;</div><div class='del'>-	    copy of the Document, and likewise the network locations</div><div class='del'>-	    given in the Document for previous versions it was based</div><div class='del'>-	    on. These may be placed in the &lt;quote&gt;History&lt;/quote&gt;</div><div class='del'>-	    section.  You may omit a network location for a work that</div><div class='del'>-	    was published at least four years before the Document</div><div class='del'>-	    itself, or if the original publisher of the version it</div><div class='del'>-	    refers to gives permission.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;K&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    In any section entitled &lt;quote&gt;Acknowledgements&lt;/quote&gt; or</div><div class='del'>-	    &lt;quote&gt;Dedications&lt;/quote&gt;, preserve the section's title,</div><div class='del'>-	    and preserve in the section all the substance and tone of</div><div class='del'>-	    each of the contributor acknowledgements and/or</div><div class='del'>-	    dedications given therein.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;L&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Preserve all the &lt;link linkend="fdl-invariant"&gt;Invariant</div><div class='del'>-	    Sections&lt;/link&gt; of the &lt;link</div><div class='del'>-	    linkend="fdl-document"&gt;Document&lt;/link&gt;, unaltered in their</div><div class='del'>-	    text and in their titles.  Section numbers or the</div><div class='del'>-	    equivalent are not considered part of the section titles.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;M&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Delete any section entitled</div><div class='del'>-	    &lt;quote&gt;Endorsements&lt;/quote&gt;. Such a section may not be</div><div class='del'>-	    included in the &lt;link linkend="fdl-modified"&gt;Modified</div><div class='del'>-	    Version&lt;/link&gt;.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-	&lt;formalpara&gt;</div><div class='del'>-	  &lt;title&gt;N&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Do not retitle any existing section as</div><div class='del'>-	    &lt;quote&gt;Endorsements&lt;/quote&gt; or to conflict in title with</div><div class='del'>-	    any &lt;link linkend="fdl-invariant"&gt;Invariant</div><div class='del'>-	    Section&lt;/link&gt;.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/formalpara&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If the &lt;link linkend="fdl-modified"&gt;Modified Version&lt;/link&gt;</div><div class='del'>-      includes new front-matter sections or appendices that qualify as</div><div class='del'>-      &lt;link linkend="fdl-secondary"&gt;Secondary Sections&lt;/link&gt; and</div><div class='del'>-      contain no material copied from the Document, you may at your</div><div class='del'>-      option designate some or all of these sections as invariant. To</div><div class='del'>-      do this, add their titles to the list of &lt;link</div><div class='del'>-      linkend="fdl-invariant"&gt;Invariant Sections&lt;/link&gt; in the</div><div class='del'>-      Modified Version's license notice.  These titles must be</div><div class='del'>-      distinct from any other section titles.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may add a section entitled &lt;quote&gt;Endorsements&lt;/quote&gt;,</div><div class='del'>-      provided it contains nothing but endorsements of your &lt;link</div><div class='del'>-      linkend="fdl-modified"&gt;Modified Version&lt;/link&gt; by various</div><div class='del'>-      parties--for example, statements of peer review or that the text</div><div class='del'>-      has been approved by an organization as the authoritative</div><div class='del'>-      definition of a standard.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may add a passage of up to five words as a &lt;link</div><div class='del'>-      linkend="fdl-cover-texts"&gt;Front-Cover Text&lt;/link&gt;, and a passage</div><div class='del'>-      of up to 25 words as a &lt;link</div><div class='del'>-      linkend="fdl-cover-texts"&gt;Back-Cover Text&lt;/link&gt;, to the end of</div><div class='del'>-      the list of &lt;link linkend="fdl-cover-texts"&gt;Cover Texts&lt;/link&gt;</div><div class='del'>-      in the &lt;link linkend="fdl-modified"&gt;Modified Version&lt;/link&gt;.</div><div class='del'>-      Only one passage of Front-Cover Text and one of Back-Cover Text</div><div class='del'>-      may be added by (or through arrangements made by) any one</div><div class='del'>-      entity. If the &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt;</div><div class='del'>-      already includes a cover text for the same cover, previously</div><div class='del'>-      added by you or by arrangement made by the same entity you are</div><div class='del'>-      acting on behalf of, you may not add another; but you may</div><div class='del'>-      replace the old one, on explicit permission from the previous</div><div class='del'>-      publisher that added the old one.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The author(s) and publisher(s) of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; do not by this License</div><div class='del'>-      give permission to use their names for publicity for or to</div><div class='del'>-      assert or imply endorsement of any &lt;link</div><div class='del'>-      linkend="fdl-modified"&gt;Modified Version &lt;/link&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section5"&gt;</div><div class='del'>-    &lt;title&gt;5. COMBINING DOCUMENTS&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may combine the &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt;</div><div class='del'>-      with other documents released under this License, under the</div><div class='del'>-      terms defined in &lt;link linkend="fdl-section4"&gt;section 4&lt;/link&gt;</div><div class='del'>-      above for modified versions, provided that you include in the</div><div class='del'>-      combination all of the &lt;link linkend="fdl-invariant"&gt;Invariant</div><div class='del'>-      Sections&lt;/link&gt; of all of the original documents, unmodified,</div><div class='del'>-      and list them all as Invariant Sections of your combined work in</div><div class='del'>-      its license notice.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The combined work need only contain one copy of this License,</div><div class='del'>-      and multiple identical &lt;link linkend="fdl-invariant"&gt;Invariant</div><div class='del'>-      Sections&lt;/link&gt; may be replaced with a single copy. If there are</div><div class='del'>-      multiple Invariant Sections with the same name but different</div><div class='del'>-      contents, make the title of each such section unique by adding</div><div class='del'>-      at the end of it, in parentheses, the name of the original</div><div class='del'>-      author or publisher of that section if known, or else a unique</div><div class='del'>-      number. Make the same adjustment to the section titles in the</div><div class='del'>-      list of Invariant Sections in the license notice of the combined</div><div class='del'>-      work.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In the combination, you must combine any sections entitled</div><div class='del'>-      &lt;quote&gt;History&lt;/quote&gt; in the various original documents,</div><div class='del'>-      forming one section entitled &lt;quote&gt;History&lt;/quote&gt;; likewise</div><div class='del'>-      combine any sections entitled &lt;quote&gt;Acknowledgements&lt;/quote&gt;,</div><div class='del'>-      and any sections entitled &lt;quote&gt;Dedications&lt;/quote&gt;.  You must</div><div class='del'>-      delete all sections entitled &lt;quote&gt;Endorsements.&lt;/quote&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section6"&gt;</div><div class='del'>-    &lt;title&gt;6. COLLECTIONS OF DOCUMENTS&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may make a collection consisting of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; and other documents</div><div class='del'>-      released under this License, and replace the individual copies</div><div class='del'>-      of this License in the various documents with a single copy that</div><div class='del'>-      is included in the collection, provided that you follow the</div><div class='del'>-      rules of this License for verbatim copying of each of the</div><div class='del'>-      documents in all other respects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may extract a single document from such a collection, and</div><div class='del'>-      dispbibute it individually under this License, provided you</div><div class='del'>-      insert a copy of this License into the extracted document, and</div><div class='del'>-      follow this License in all other respects regarding verbatim</div><div class='del'>-      copying of that document.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section7"&gt;</div><div class='del'>-    &lt;title&gt;7. AGGREGATION WITH INDEPENDENT WORKS&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A compilation of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; or its derivatives with</div><div class='del'>-      other separate and independent documents or works, in or on a</div><div class='del'>-      volume of a storage or distribution medium, does not as a whole</div><div class='del'>-      count as a &lt;link linkend="fdl-modified"&gt;Modified Version&lt;/link&gt;</div><div class='del'>-      of the Document, provided no compilation copyright is claimed</div><div class='del'>-      for the compilation.  Such a compilation is called an</div><div class='del'>-      &lt;quote&gt;aggregate&lt;/quote&gt;, and this License does not apply to the</div><div class='del'>-      other self-contained works thus compiled with the Document , on</div><div class='del'>-      account of their being thus compiled, if they are not themselves</div><div class='del'>-      derivative works of the Document.  If the &lt;link</div><div class='del'>-      linkend="fdl-cover-texts"&gt;Cover Text&lt;/link&gt; requirement of &lt;link</div><div class='del'>-      linkend="fdl-section3"&gt;section 3&lt;/link&gt; is applicable to these</div><div class='del'>-      copies of the Document, then if the Document is less than one</div><div class='del'>-      quarter of the entire aggregate, the Document's Cover Texts may</div><div class='del'>-      be placed on covers that surround only the Document within the</div><div class='del'>-      aggregate. Otherwise they must appear on covers around the whole</div><div class='del'>-      aggregate.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section8"&gt;</div><div class='del'>-    &lt;title&gt;8. TRANSLATION&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Translation is considered a kind of modification, so you may</div><div class='del'>-      distribute translations of the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; under the terms of &lt;link</div><div class='del'>-      linkend="fdl-section4"&gt;section 4&lt;/link&gt;. Replacing &lt;link</div><div class='del'>-      linkend="fdl-invariant"&gt; Invariant Sections&lt;/link&gt; with</div><div class='del'>-      translations requires special permission from their copyright</div><div class='del'>-      holders, but you may include translations of some or all</div><div class='del'>-      Invariant Sections in addition to the original versions of these</div><div class='del'>-      Invariant Sections. You may include a translation of this</div><div class='del'>-      License provided that you also include the original English</div><div class='del'>-      version of this License. In case of a disagreement between the</div><div class='del'>-      translation and the original English version of this License,</div><div class='del'>-      the original English version will prevail.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section9"&gt;</div><div class='del'>-    &lt;title&gt;9. TERMINATION&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      You may not copy, modify, sublicense, or distribute the &lt;link</div><div class='del'>-      linkend="fdl-document"&gt;Document&lt;/link&gt; except as expressly</div><div class='del'>-      provided for under this License. Any other attempt to copy,</div><div class='del'>-      modify, sublicense or distribute the Document is void, and will</div><div class='del'>-      automatically terminate your rights under this License. However,</div><div class='del'>-      parties who have received copies, or rights, from you under this</div><div class='del'>-      License will not have their licenses terminated so long as such</div><div class='del'>-      parties remain in full compliance.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="fdl-section10"&gt;</div><div class='del'>-    &lt;title&gt;10. FUTURE REVISIONS OF THIS LICENSE&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;ulink type="http"</div><div class='del'>-      url="http://www.gnu.org/fsf/fsf.html"&gt;Free Software</div><div class='del'>-      Foundation&lt;/ulink&gt; may publish new, revised versions of the GNU</div><div class='del'>-      Free Documentation License from time to time. Such new versions</div><div class='del'>-      will be similar in spirit to the present version, but may differ</div><div class='del'>-      in detail to address new problems or concerns. See &lt;ulink</div><div class='del'>-      type="http"</div><div class='del'>-      url="http://www.gnu.org/copyleft"&gt;http://www.gnu.org/copyleft/&lt;/ulink&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Each version of the License is given a distinguishing version</div><div class='del'>-      number. If the &lt;link linkend="fdl-document"&gt;Document&lt;/link&gt;</div><div class='del'>-      specifies that a particular numbered version of this License</div><div class='del'>-      &lt;quote&gt;or any later version&lt;/quote&gt; applies to it, you have the</div><div class='del'>-      option of following the terms and conditions either of that</div><div class='del'>-      specified version or of any later version that has been</div><div class='del'>-      published (not as a draft) by the Free Software Foundation. If</div><div class='del'>-      the Document does not specify a version number of this License,</div><div class='del'>-      you may choose any version ever published (not as a draft) by</div><div class='del'>-      the Free Software Foundation.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="fdl-using"&gt;</div><div class='del'>-    &lt;title&gt;Addendum&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To use this License in a document you have written, include a copy of</div><div class='del'>-      the License in the document and put the following copyright and</div><div class='del'>-      license notices just after the title page:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;blockquote&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Copyright &amp;copy; YEAR YOUR NAME.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Permission is granted to copy, distribute and/or modify this</div><div class='del'>-	document under the terms of the GNU Free Documentation</div><div class='del'>-	License, Version 1.1 or any later version published by the</div><div class='del'>-	Free Software Foundation; with the &lt;link</div><div class='del'>-	linkend="fdl-invariant"&gt;Invariant Sections&lt;/link&gt; being LIST</div><div class='del'>-	THEIR TITLES, with the &lt;link</div><div class='del'>-	linkend="fdl-cover-texts"&gt;Front-Cover Texts&lt;/link&gt; being LIST,</div><div class='del'>-	and with the &lt;link linkend="fdl-cover-texts"&gt;Back-Cover</div><div class='del'>-	Texts&lt;/link&gt; being LIST.  A copy of the license is included in</div><div class='del'>-	the section entitled &lt;quote&gt;GNU Free Documentation</div><div class='del'>-	License&lt;/quote&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/blockquote&gt;</div><div class='del'>-      </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you have no &lt;link linkend="fdl-invariant"&gt;Invariant</div><div class='del'>-      Sections&lt;/link&gt;, write &lt;quote&gt;with no Invariant Sections&lt;/quote&gt;</div><div class='del'>-      instead of saying which ones are invariant.  If you have no</div><div class='del'>-      &lt;link linkend="fdl-cover-texts"&gt;Front-Cover Texts&lt;/link&gt;, write</div><div class='del'>-      &lt;quote&gt;no Front-Cover Texts&lt;/quote&gt; instead of</div><div class='del'>-      &lt;quote&gt;Front-Cover Texts being LIST&lt;/quote&gt;; likewise for &lt;link</div><div class='del'>-      linkend="fdl-cover-texts"&gt;Back-Cover Texts&lt;/link&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If your document contains nontrivial examples of program code,</div><div class='del'>-      we recommend releasing these examples in parallel under your</div><div class='del'>-      choice of free software license, such as the &lt;ulink type="http"</div><div class='del'>-      url="http://www.gnu.org/copyleft/gpl.html"&gt; GNU General Public</div><div class='del'>-      License&lt;/ulink&gt;, to permit their use in free software.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/appendix&gt;  </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/importer/.cvsignore b/doc/devel/importer/.cvsignore<br/>deleted file mode 100644<br/>index 439d6641ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*-decl.txt</div><div class='del'>-*-decl-list.txt</div><div class='del'>-*-unused.txt</div><div class='del'>-*.hierarchy</div><div class='del'>-*.signals</div><div class='del'>-*.stamp</div><div class='del'>-*-scan.c</div><div class='head'>diff --git a/doc/devel/importer/Makefile.am b/doc/devel/importer/Makefile.am<br/>deleted file mode 100644<br/>index 8b5343677a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,195 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-# The name of the module, e.g. 'glib'.</div><div class='del'>-DOC_MODULE=evolution-shell-importer</div><div class='del'>-</div><div class='del'>-# The top-level SGML file. Change it if you want.</div><div class='del'>-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml</div><div class='del'>-</div><div class='del'>-# The directory containing the source code. Relative to $(srcdir).</div><div class='del'>-# gtk-doc will search all .c &amp; .h files beneath here for inline comments</div><div class='del'>-# documenting functions and macros.</div><div class='del'>-DOC_SOURCE_DIR=$(EVOLUTION_DIR)/shell/importer</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-scan.</div><div class='del'>-SCAN_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-mkdb.</div><div class='del'>-MKDB_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Extra options to supply to gtkdoc-fixref.</div><div class='del'>-FIXXREF_OPTIONS=</div><div class='del'>-</div><div class='del'>-# Used for dependencies.</div><div class='del'>-HFILE_GLOB=								\</div><div class='del'>-	$(top_srcdir)/shell/importer/evolution-importer.h		\</div><div class='del'>-	$(top_srcdir)/shell/importer/evolution-importer-client.h</div><div class='del'>-</div><div class='del'>-CFILE_GLOB=								\</div><div class='del'>-	$(top_srcdir)/shell/importer/evolution-importer.c		\</div><div class='del'>-	$(top_srcdir)/shell/importer/evolution-importer-client.c</div><div class='del'>-</div><div class='del'>-# Header files to ignore when scanning.</div><div class='del'>-IGNORE_HFILES=				\</div><div class='del'>-	GNOME_Evolution_Importer.h	\</div><div class='del'>-	importer.h</div><div class='del'>-</div><div class='del'>-# Images to copy into HTML directory.</div><div class='del'>-HTML_IMAGES =</div><div class='del'>-</div><div class='del'>-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).</div><div class='del'>-content_files =</div><div class='del'>-</div><div class='del'>-# Other files to distribute.</div><div class='del'>-extra_files =</div><div class='del'>-</div><div class='del'>-# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib</div><div class='del'>-# contains GtkObjects/GObjects and you want to document signals and properties.</div><div class='del'>-GTKDOC_CFLAGS = 					\</div><div class='del'>-	-I$(top_srcdir)/shell/importer			\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-GTKDOC_LIBS = 								\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/shell/importer/.libs/libevolution-importer.so</div><div class='del'>-</div><div class='del'>-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)</div><div class='del'>-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)</div><div class='del'>-</div><div class='del'>-# If you need to override some of the declarations, place them in this file</div><div class='del'>-# and uncomment this line.</div><div class='del'>-#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt</div><div class='del'>-DOC_OVERRIDES = </div><div class='del'>-</div><div class='del'>-###########################################################################</div><div class='del'>-# Everything below here is generic and you shouldn't need to change it.</div><div class='del'>-###########################################################################</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =			    \</div><div class='del'>-	$(content_files)		\</div><div class='del'>-	$(extra_files)		  \</div><div class='del'>-	$(HTML_IMAGES)		  \</div><div class='del'>-	$(DOC_MAIN_SGML_FILE)	   \</div><div class='del'>-	$(DOC_MODULE).types	     \</div><div class='del'>-	$(DOC_MODULE)-sections.txt      \</div><div class='del'>-	$(DOC_OVERRIDES)</div><div class='del'>-</div><div class='del'>-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \</div><div class='del'>-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp</div><div class='del'>-</div><div class='del'>-SCANOBJ_FILES =		 \</div><div class='del'>-	$(DOC_MODULE).args      \</div><div class='del'>-	$(DOC_MODULE).hierarchy \</div><div class='del'>-	$(DOC_MODULE).signals</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-#all-local: html-build.stamp</div><div class='del'>-all-local: sgml-build.stamp</div><div class='del'>-</div><div class='del'>-#### scan ####</div><div class='del'>-</div><div class='del'>-scan-build.stamp: $(HFILE_GLOB)</div><div class='del'>-	@echo '*** Scanning header files ***'</div><div class='del'>-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types &gt; /dev/null ; then \</div><div class='del'>-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scanobj --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \</div><div class='del'>-	else \</div><div class='del'>-	    cd $(srcdir) ; \</div><div class='del'>-	    for i in $(SCANOBJ_FILES) ; do \</div><div class='del'>-	       test -f $$i || touch $$i ; \</div><div class='del'>-	    done \</div><div class='del'>-	fi</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)</div><div class='del'>-	touch scan-build.stamp</div><div class='del'>-</div><div class='del'>-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### templates ####</div><div class='del'>-</div><div class='del'>-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES)</div><div class='del'>-	@echo '*** Rebuilding template files ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-	touch tmpl-build.stamp</div><div class='del'>-</div><div class='del'>-tmpl.stamp: tmpl-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### sgml ####</div><div class='del'>-</div><div class='del'>-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml</div><div class='del'>-	@echo '*** Building SGML ***'</div><div class='del'>-	cd $(srcdir) &amp;&amp; \</div><div class='del'>-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)</div><div class='del'>-	touch sgml-build.stamp</div><div class='del'>-</div><div class='del'>-sgml.stamp: sgml-build.stamp</div><div class='del'>-	@true</div><div class='del'>-</div><div class='del'>-#### html ####</div><div class='del'>-</div><div class='del'>-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)</div><div class='del'>-	@echo '*** Building HTML ***'</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) &amp;&amp; cp $(HTML_IMAGES) html )</div><div class='del'>-	@echo '-- Fixing Crossreferences' </div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)</div><div class='del'>-	touch html-build.stamp</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-##############</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	fi)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# Require gtk-doc when making dist</div><div class='del'>-#</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-else</div><div class='del'>-dist-check-gtkdoc:</div><div class='del'>-	@echo "*** gtk-doc must be installed and enabled in order to make dist"</div><div class='del'>-	@false</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-dist-hook: dist-check-gtkdoc dist-hook-local</div><div class='del'>-	mkdir $(distdir)/tmpl</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	mkdir $(distdir)/html</div><div class='del'>-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl</div><div class='del'>-	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml</div><div class='del'>-	-cp $(srcdir)/html/index.sgml $(distdir)/html</div><div class='del'>-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html</div><div class='del'>-</div><div class='del'>-	images=$(HTML_IMAGES) ;	       \</div><div class='del'>-	for i in $$images ; do		\</div><div class='del'>-	  cp $(srcdir)/$$i $(distdir)/html ;  \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-.PHONY : dist-hook-local</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/importer/evolution-shell-importer-sections.txt b/doc/devel/importer/evolution-shell-importer-sections.txt<br/>deleted file mode 100644<br/>index e2474f6375..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/evolution-shell-importer-sections.txt?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/evolution-shell-importer-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-&lt;INCLUDE&gt;evolution-importer.h&lt;/INCLUDE&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;evolution-importer&lt;/FILE&gt;</div><div class='del'>-EVOLUTION_IMPORTER</div><div class='del'>-&lt;TITLE&gt;EvolutionImporter&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-EvolutionImporterSupportFormatFn</div><div class='del'>-EvolutionImporterLoadFileFn</div><div class='del'>-EvolutionImporterProcessItemFn</div><div class='del'>-EvolutionImporterGetErrorFn</div><div class='del'>-</div><div class='del'>-EvolutionImporterResult</div><div class='del'>-</div><div class='del'>-evolution_importer_new</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EVOLUTION_TYPE_IMPORTER</div><div class='del'>-EVOLUTION_IMPORTER</div><div class='del'>-EVOLUTION_IS_IMPORTER</div><div class='del'>-EVOLUTION_IMPORTER_CLASS</div><div class='del'>-EVOLUTION_IS_IMPORTER_CLASS</div><div class='del'>-evolution_importer_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-EvolutionImporter</div><div class='del'>-EvolutionImporterPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;evolution-importer-listener.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;evolution-importer-listener&lt;/FILE&gt;</div><div class='del'>-EVOLUTION_IMPORTER_LISTENER</div><div class='del'>-&lt;TITLE&gt;EvolutionImporterListener&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-EvolutionImporterListenerCallback</div><div class='del'>-</div><div class='del'>-evolution_importer_listener_new</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EVOLUTION_TYPE_IMPORTER_LISTENER</div><div class='del'>-EVOLUTION_IMPORTER_LISTENER</div><div class='del'>-EVOLUTION_IMPORTER_LISTENER_CLASS</div><div class='del'>-EVOLUTION_IS_IMPORTER_LISTENER</div><div class='del'>-EVOLUTION_IS_IMPORTER_LISTENER_CLASS</div><div class='del'>-evolution_importer_listener_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-EvolutionImporterListener</div><div class='del'>-EvolutionImporterListenerPrivate</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;INCLUDE&gt;evolution-importer-client.h&lt;/INCLUDE&gt;</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;evolution-importer-client&lt;/FILE&gt;</div><div class='del'>-EVOLUTION_IMPORTER_CLIENT</div><div class='del'>-&lt;TITLE&gt;EvolutionImporterClient&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-evolution_importer_client_new</div><div class='del'>-evolution_importer_client_new_from_id</div><div class='del'>-evolution_importer_client_support_format</div><div class='del'>-evolution_importer_client_load_file</div><div class='del'>-evolution_importer_client_process_item</div><div class='del'>-evolution_importer_client_get_error</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-EVOLUTION_TYPE_IMPORTER_CLIENT</div><div class='del'>-EVOLUTION_IMPORTER_CLIENT</div><div class='del'>-EVOLUTION_IMPORTER_CLIENT_CLASS</div><div class='del'>-EVOLUTION_IS_IMPORTER_CLIENT</div><div class='del'>-EVOLUTION_IS_IMPORTER_CLIENT_CLASS</div><div class='del'>-evolution_importer_client_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-EvolutionImporterClient</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/importer/evolution-shell-importer.args b/doc/devel/importer/evolution-shell-importer.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/evolution-shell-importer.args?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/evolution-shell-importer.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy<br/>deleted file mode 100644<br/>index c46ebdf782..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/evolution-shell-importer.hierarchy?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/evolution-shell-importer.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  BonoboObject</div><div class='del'>-    BonoboXObject</div><div class='del'>-      EvolutionImporter</div><div class='del'>-      EvolutionImporterListener</div><div class='del'>-    Handle to remote Bonobo::Unknown</div><div class='del'>-      EvolutionImporterClient</div><div class='head'>diff --git a/doc/devel/importer/evolution-shell-importer.types b/doc/devel/importer/evolution-shell-importer.types<br/>deleted file mode 100644<br/>index e787818599..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/evolution-shell-importer.types?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/evolution-shell-importer.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;shell/importer/evolution-importer.h&gt;</div><div class='del'>-#include &lt;shell/importer/evolution-importer-client.h&gt;</div><div class='del'>-#include &lt;shell/importer/evolution-importer-listener.h&gt;</div><div class='del'>-</div><div class='del'>-evolution_importer_get_type</div><div class='del'>-evolution_importer_client_get_type</div><div class='del'>-evolution_importer_listener_get_type</div><div class='head'>diff --git a/doc/devel/importer/private-reference.sgml b/doc/devel/importer/private-reference.sgml<br/>deleted file mode 100644<br/>index d28c7b8591..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/private-reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/private-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-  &lt;reference id="importer-private-reference"&gt;</div><div class='del'>-    &lt;title&gt;Importer Private API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	private APIs of the different components of the &amp;Evolution;</div><div class='del'>-	Import Framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;EvolutionImporterListener;</div><div class='del'>-    &amp;EvolutionImporterClient;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/importer/public-reference.sgml b/doc/devel/importer/public-reference.sgml<br/>deleted file mode 100644<br/>index ba99c9b309..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/public-reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/public-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-  &lt;reference id="importer-public-reference"&gt;</div><div class='del'>-    &lt;title&gt;Importer Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	public APIs of the different components of the &amp;Evolution;</div><div class='del'>-	Import Framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;EvolutionImporter;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/importer/tmpl/evolution-importer-client.sgml b/doc/devel/importer/tmpl/evolution-importer-client.sgml<br/>deleted file mode 100644<br/>index 6cee37bef1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/tmpl/evolution-importer-client.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/tmpl/evolution-importer-client.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-EvolutionImporterClient</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-A #GtkObject based client to simplify use of a GNOME_Evolution_Importer object.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-This #GtkObject provides a convience wrapper to the GNOME_Evolution_Importer object, providing error checking and hiding all the CORBA internals from the user.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EVOLUTION_IMPORTER_CLIENT ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Casts a #GtkObject into an #EvolutionImporterClient</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A #GtkObject</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@objref: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_new_from_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@id: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_support_format ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@filename: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_load_file ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@filename: </div><div class='del'>-@folderpath: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_process_item ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@listener: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@callback: </div><div class='del'>-@closure: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_client_get_error ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/importer/tmpl/evolution-importer.sgml b/doc/devel/importer/tmpl/evolution-importer.sgml<br/>deleted file mode 100644<br/>index 1c7736a37f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/tmpl/evolution-importer.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/tmpl/evolution-importer.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-EvolutionImporter</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-A #BonoboObject that implements the GNOME/Evolution/Importer interface.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-A #BonoboObject wrapper around the GNOME/Evolution/Importer interface, providing error checking and reference counting, hiding the CORBA internals from the user and providing a simple way to create a GNOME_Evolution_Importer object.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO EVOLUTION_IMPORTER ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Casts a #GtkObject into an #EvolutionImporter.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A #GtkObject.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionImporterSupportFormatFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The type of function that is called when the importer wishes to find out if the importing component can support the file given in @filename.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@importer: The #EvolutionImporter.</div><div class='del'>-@filename: The filename of the file to check.</div><div class='del'>-@closure: The data passed into evolution_importer_new ().</div><div class='del'>-@Returns: A #gboolean. TRUE if the importing component can import the file, FALSE otherwise.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionImporterLoadFileFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The type of function that is called when the importer wishes the importing component to load the file given in @filename, and initialise itself.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@importer: The #EvolutionImporter.</div><div class='del'>-@filename: The filename of the file to load.</div><div class='del'>-@folderpath: </div><div class='del'>-@closure: The data passed into evolution_importer_new ().</div><div class='del'>-@Returns: A #gboolean. TRUE if the load and initialisation was successful, FALSE otherwise.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionImporterProcessItemFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The type of function that is called when the importer wants the importing component to process the next item (or items) in a file.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@importer: The #EvolutionImporter</div><div class='del'>-@listener: A GNOME_Evolution_Importer_Listener CORBA object.</div><div class='del'>-@closure: The data passed into evolution_importer_new ().</div><div class='del'>-@ev: A #CORBA_Environment for returning any CORBA exceptions.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionImporterGetErrorFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The type of function that is called when the importer wants to get a string version of an error. Not all importing components support this function.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@importer: The #EvolutionImporter.</div><div class='del'>-@closure: The data passed to evolution_importer_new ().</div><div class='del'>-@Returns: A string representation of the error, or NULL if there was no error, or the importing component does not support the getError method.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM EvolutionImporterResult ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@EVOLUTION_IMPORTER_OK: </div><div class='del'>-@EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION: </div><div class='del'>-@EVOLUTION_IMPORTER_INTERRUPTED: </div><div class='del'>-@EVOLUTION_IMPORTER_BUSY: </div><div class='del'>-@EVOLUTION_IMPORTER_NOT_READY: </div><div class='del'>-@EVOLUTION_IMPORTER_UNKNOWN_DATA: </div><div class='del'>-@EVOLUTION_IMPORTER_BAD_DATA: </div><div class='del'>-@EVOLUTION_IMPORTER_BAD_FILE: </div><div class='del'>-@EVOLUTION_IMPORTER_UNKNOWN_ERROR: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION evolution_importer_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@support_format_fn: </div><div class='del'>-@load_file_fn: </div><div class='del'>-@process_item_fn: </div><div class='del'>-@get_error_fn: </div><div class='del'>-@closure: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml b/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml<br/>deleted file mode 100644<br/>index 7a9a98034b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/importer/tmpl/evolution-shell-importer-unused.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-&lt;!-- ##### USER_FUNCTION EvolutionImporterClientCallback ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@result: </div><div class='del'>-@more_items: </div><div class='del'>-@data: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/preface.sgml b/doc/devel/preface.sgml<br/>deleted file mode 100644<br/>index fdaa824a8b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/preface.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/preface.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-  &lt;preface id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This is the &amp;Evolution; Developer's Guide or programming guide</div><div class='del'>-      for the &amp;Evolution; groupware suite.  If you are a programmer</div><div class='del'>-      and you wish to use &amp;Evolution;'s functionality from your own</div><div class='del'>-      applications or if you wish to modify the &amp;Evolution; core code,</div><div class='del'>-      you should read this guide.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you are an end-user of &amp;Evolution; you do not need to read</div><div class='del'>-      this guide; please read the &amp;Evolution; User's Guide instead.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This guide contains the information you need to know to do the</div><div class='del'>-      following:</div><div class='del'>-</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Write applications that use &amp;Evolution;'s data</div><div class='del'>-	    repositories via the &amp;Wombat; personal information server.</div><div class='del'>-	    Examples of this would be a &lt;application&gt;GNOME</div><div class='del'>-	    Panel&lt;/application&gt; applet that displays today's</div><div class='del'>-	    appointments, or a telephone dialer application that uses</div><div class='del'>-	    the contents of the &amp;Evolution; Addressbook.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Write applications that use the &amp;Camel; mail library.</div><div class='del'>-	    This includes extending &amp;Evolution;'s own mail component</div><div class='del'>-	    to perform additional functions.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Write new components for the &amp;Evolution; Shell.  Instead</div><div class='del'>-	    of writing a stand-alone application, you can provide your</div><div class='del'>-	    users with the benefit of having integrated views of their</div><div class='del'>-	    data from within Evolution.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Write new modules for the &amp;Evolution; Executive Summary.</div><div class='del'>-	    This allows you to present commonly-accessed information</div><div class='del'>-	    in a convenient fashion directly in the &amp;Evolution; Shell.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Modify the core &amp;Evolution; code to add new features or</div><div class='del'>-	    change its architecture.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="organization"&gt;</div><div class='del'>-      &lt;title&gt;Organization of this Guide&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This guide is organized in two big sections.  The first is a</div><div class='del'>-	programming guide, which consists of one part for each one of</div><div class='del'>-	&amp;Evolution;'s components:  there are separate parts for the</div><div class='del'>-	calendar, the addressbook, the mailer, the executive summary,</div><div class='del'>-	and the shell.  Each part gives a description of the</div><div class='del'>-	architecture of its corresponding component, and also gives</div><div class='del'>-	information about the component's internal architecture and</div><div class='del'>-	some implementation details.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The second section of this guide is a reference guide for</div><div class='del'>-	&amp;Evolution;'s programming interfaces.  We have separated these</div><div class='del'>-	into public and private interfaces.  The public ones are those</div><div class='del'>-	that most people will need to use when writing extensions or</div><div class='del'>-	third-party components; the private interfaces are those used</div><div class='del'>-	internally in &amp;Evolution;.  Even if you do not intend to</div><div class='del'>-	modify the &amp;Evolution; core code, it may be useful to know a</div><div class='del'>-	bit about the way it is organized internally.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;Evolution; is free software, and we want you as a programmer</div><div class='del'>-	to make the most of it.  We have provided many useful</div><div class='del'>-	interfaces that you can use in your own applications.  Still,</div><div class='del'>-	we want you to view &amp;Evolution; as a framework for building</div><div class='del'>-	groupware applications, and this may occasionally involve</div><div class='del'>-	making changes to its core code.  We want you to learn from</div><div class='del'>-	&amp;Evolution;'s design because we think it marks an important</div><div class='del'>-	milestone in the development of large-scale free software</div><div class='del'>-	applications.  We want you to modify it as you see fit.  Free</div><div class='del'>-	software gives you this freedom, and we want the whole world</div><div class='del'>-	to benefit from it.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/preface&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/reference.sgml b/doc/devel/reference.sgml<br/>deleted file mode 100644<br/>index 4381ad29b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/reference.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/devel/reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-  &lt;part id="evolution-api-reference"&gt;</div><div class='del'>-    &lt;title&gt;&amp;Evolution; API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	different libraries and interfaces that &amp;Evolution; provides.</div><div class='del'>-	Classes are described together with their methods; individual</div><div class='del'>-	functions are grouped by functional group.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;Evolution; provides two kinds of interfaces, public and</div><div class='del'>-	private.  The public interfaces are those designed to be used</div><div class='del'>-	from third-party applications or components; if you wanted to</div><div class='del'>-	write an application that uses &amp;Evolution;'s data repositories</div><div class='del'>-	to display data in a particular way, you would use the public</div><div class='del'>-	interfaces.  The private interfaces are those used inside</div><div class='del'>-	&amp;Evolution; itself; these are generally not interesting unless</div><div class='del'>-	you intend to make modifications to the &amp;Evolution; code base.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	While the public and private interfaces are described in</div><div class='del'>-	separate reference sections, we have decided to put them</div><div class='del'>-	together in the same book, this guide, because we want to</div><div class='del'>-	encourage you to regard &amp;Evolution; as something more than a</div><div class='del'>-	black box that stores and dispatches personal information.  We</div><div class='del'>-	want you to make modifications to the &amp;Evolution; core if</div><div class='del'>-	these would allow you to present or store your data in better</div><div class='del'>-	ways.  &amp;Evolution; is free software; we want you to learn from</div><div class='del'>-	its design and implementation details so that you can make it</div><div class='del'>-	even better for the whole world to use.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;calendar-public-reference;</div><div class='del'>-    &lt;!-- &amp;importer-public-reference; --&gt;</div><div class='del'>-    &lt;!-- &amp;evolution-services-public-reference; --&gt;</div><div class='del'>-    &lt;!-- &amp;importer-private-reference; --&gt;</div><div class='del'>-    &lt;!-- &amp;evolution-services-private-reference; --&gt;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("evolution-devel-guide.sgml" "book" "book" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/white-papers/calendar/calendar.sgml b/doc/white-papers/calendar/calendar.sgml<br/>deleted file mode 100644<br/>index 2cb3132e2b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/calendar/calendar.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/white-papers/calendar/calendar.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,209 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity CUA "&lt;acronym&gt;CUA&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity PCS "&lt;acronym&gt;PCS&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity Bonobo "&lt;application&gt;Bonobo&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity CORBA "&lt;acronym&gt;CORBA&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity GTK "&lt;acronym&gt;GTK+&lt;/acronym&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="calendar"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;&amp;Evolution; Calendaring Framework&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Federico&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Mena Quintero&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;federico@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;Evolution; groupware suite provides a framework for</div><div class='del'>-	developing calendaring applications, as well as a graphical</div><div class='del'>-	calendar client and a personal calendar server.  This white</div><div class='del'>-	paper describes the architecture of the &amp;Evolution;</div><div class='del'>-	calendaring framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Introduction --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Calendaring is an important part of a groupware suite.  A</div><div class='del'>-      calendaring framework will allow a user to keep a personal</div><div class='del'>-      calendar and have several applications use it.  Such</div><div class='del'>-      applications could be a graphical calendar client that the user</div><div class='del'>-      employs to schedule appointments and keep track of his time, a</div><div class='del'>-      &lt;productname&gt;Palm Pilot&lt;/productname&gt; synchronization client, or</div><div class='del'>-      a simple alarm or reminder utility.  A comprehensive calendaring</div><div class='del'>-      framework will also allow multiple users to schedule</div><div class='del'>-      appointments between each other; for example, a project director</div><div class='del'>-      may want to schedule a weekly meeting with the rest of the</div><div class='del'>-      project members, or a person who owns a large house may want to</div><div class='del'>-      schedule a big party with his friends.  The attendees will then</div><div class='del'>-      want to reply with messages such as, &amp;ldquo;I will</div><div class='del'>-      attend&amp;rdquo;, or &amp;ldquo;I will attend only if the proposed time</div><div class='del'>-      is changed&amp;rdquo;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;Evolution; groupware suite provides a framework for</div><div class='del'>-      developing calendaring applications, as well as a graphical</div><div class='del'>-      calendar client or calendar user agent (&amp;CUA;) and a personal</div><div class='del'>-      calendar server (&amp;PCS;).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The following sections explain the basic calendaring framework,</div><div class='del'>-      the functions of the calendar user agent and the personal</div><div class='del'>-      calendar server, and the relationship between the two.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Personal Calendar Server --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="pcs"&gt;</div><div class='del'>-    &lt;title&gt;Personal Calendar Server&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The personal calendar server (&amp;PCS;) provides centralized</div><div class='del'>-      management and storage of a user's personal calendar.  Multiple</div><div class='del'>-      clients can connect to the &amp;PCS; simultaneously to query and</div><div class='del'>-      modify the user's calendar in a synchronized fashion.  The main</div><div class='del'>-      features of the &amp;PCS; are as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Storage&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;PCS; is responsible for loading and saving calendars.</div><div class='del'>-	Centralizing the loading and saving functionality allows</div><div class='del'>-	multiple clients to use the same calendar at the same time</div><div class='del'>-	without having to worry about each other.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Basic Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;PCS; provides functions to do basic queries on a</div><div class='del'>-	calendar, for example, a client can ask the server for a list</div><div class='del'>-	of all the appointments in the calendar, or for all the data</div><div class='del'>-	for a specific appointment.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Recurrence and Alarm Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Clients can ask the &amp;PCS; for a list of the appointments that</div><div class='del'>-	occur within a specified time range; for example a graphical</div><div class='del'>-	client that has a per-week view could ask the &amp;PCS; for all</div><div class='del'>-	the appointments that occur in a particular week.  This</div><div class='del'>-	includes multiple occurrences of a single recurring event; for</div><div class='del'>-	example, the object for &amp;ldquo;a 1-hour meeting that occurs on</div><div class='del'>-	every Tuesday and Thursday&amp;rdquo; is represented inside the</div><div class='del'>-	&amp;PCS; as a single event with a recurrence rule.  Similarly,</div><div class='del'>-	clients can ask the &amp;PCS; for a list of events that have</div><div class='del'>-	alarms that trigger within a specified time range.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Notification of Changes&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This is the most important function of the &amp;PCS;, as it allows</div><div class='del'>-	multiple calendar clients to maintain a unified view of the</div><div class='del'>-	calendar between the server and themselves.  When a client</div><div class='del'>-	asks the &amp;PCS; to modify or remove an event, the &amp;PCS;</div><div class='del'>-	notifies all the clients that are connected to it about the</div><div class='del'>-	change.  The policy is that &amp;ldquo;the server is always</div><div class='del'>-	right&amp;rdquo;; clients can act as dumb views onto the</div><div class='del'>-	calendar's data and they will be notified by the &amp;PCS; when</div><div class='del'>-	something changes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Calenar User Agent --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="cua"&gt;</div><div class='del'>-    &lt;title&gt;Calendar User Agent&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A calendar user agent (&amp;CUA;) is a program that lets a user</div><div class='del'>-      manipulate a calendar.  &amp;Evolution; provides an attractive,</div><div class='del'>-      graphical calendar client that communicates with the &amp;Evolution;</div><div class='del'>-      personal calendar server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;Evolution; calendar client just provides a view onto the</div><div class='del'>-      data that is stored and managed by the personal calendar server.</div><div class='del'>-      The calendar client does not perform direct manipulations on a</div><div class='del'>-      calendar's data; instead it offloads those requests to the</div><div class='del'>-      calendar server, which takes care of making the appropriate</div><div class='del'>-      modifications in the calendar and then notifies all the clients</div><div class='del'>-      about the changes.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Calendar Client Library --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="client-lib"&gt;</div><div class='del'>-    &lt;title&gt;Calendar Client Library&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Communication between the personal calendar server and calendar</div><div class='del'>-      clients is defined by a set of &amp;Bonobo; &amp;CORBA; interfaces.</div><div class='del'>-      Clients can be written by implementing the client-side</div><div class='del'>-      &lt;classname&gt;Listener&lt;/classname&gt; interface, which defines the</div><div class='del'>-      notification callbacks that the PCS uses to inform clients about</div><div class='del'>-      changes to the calendar.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      As a convenience for &amp;GTK; programmers, &amp;Evolution; also</div><div class='del'>-      includes a library which provides a</div><div class='del'>-      &lt;classname&gt;CalClient&lt;/classname&gt; class which can be used for</div><div class='del'>-      communication with the personal calendar server.  Objects of</div><div class='del'>-      this class automatically contact the PCS when they are created.</div><div class='del'>-      &lt;classname&gt;CalClient&lt;/classname&gt; provides functions to request</div><div class='del'>-      changes in the calendar, and it also emits signals when it gets</div><div class='del'>-      notification about changes from the PCS.  This makes it easy and</div><div class='del'>-      convenient to write calendar clients for &amp;Evolution; using</div><div class='del'>-      &amp;GTK;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The implementation of the &lt;classname&gt;CalClient&lt;/classname&gt; class</div><div class='del'>-      simply wraps the &amp;Evolution; &amp;CORBA; interfaces for calendaring</div><div class='del'>-      with a familiar-looking &amp;GTK; object.  Calls to the</div><div class='del'>-      &lt;classname&gt;Listener&lt;/classname&gt; interface get translated to</div><div class='del'>-      signal emissions from the &lt;classname&gt;CalClient&lt;/classname&gt;, thus</div><div class='del'>-      shielding programmers from the details of the &amp;CORBA;</div><div class='del'>-      interfaces.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/mail/camel.sgml b/doc/white-papers/mail/camel.sgml<br/>deleted file mode 100644<br/>index 5f5ea27a98..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/mail/camel.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/white-papers/mail/camel.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,356 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity Camel "Camel"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="camel"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;The &amp;Camel; Messaging Library&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Jeffrey&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Stedfast&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;fejj@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Michael&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Zucchi&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;notzed@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Dan&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Winship&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;danw@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Bertrand&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Guiheneuf&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;bertrand@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000, 2001&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Ximian, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel; is a generic messaging library. It is being used as the</div><div class='del'>-      back end for the mail component of &amp;Evolution;. The name</div><div class='del'>-      "&amp;Camel;" is an acronym; it refers to the fact that the</div><div class='del'>-      library is capable of going several days without food or water.</div><div class='del'>-      It means : Camel's Acronym Makes Everyone Laugh.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel;'s initial design is heavily based on Sun's</div><div class='del'>-      &lt;trademark&gt;JavaMail&lt;/trademark&gt; API. It uses the Gtk+ object</div><div class='del'>-      system, and many of its classes are direct analags of JavaMail</div><div class='del'>-      classes. Its design has also been influenced by the features of</div><div class='del'>-      IMAP, and the limitations of the standard UNIX mbox mail store,</div><div class='del'>-      which set some of the boundaries on its requirements and</div><div class='del'>-      extensibility.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel; sees all message repositories as stores containing</div><div class='del'>-      folders. These folders in turn contain the messages the client</div><div class='del'>-      actually accesses. The use of such a unified interface allows</div><div class='del'>-      the client applications to be very extensible. &amp;Camel; includes</div><div class='del'>-      an external provider mechanism which allows applications to</div><div class='del'>-      dynamically load and use protocols which were not available when</div><div class='del'>-      the application was initially written.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The abstract store/folder mechanism is a powerful and versatile</div><div class='del'>-      way of accessing messages. No particular asumptions are made on</div><div class='del'>-      the client side, thus allowing new ways of managing the</div><div class='del'>-      messages. For example, the messages stored in the folders don't</div><div class='del'>-      necessarily have to share some common physical location. The</div><div class='del'>-      folder can be a purely virtual folder, containing only</div><div class='del'>-      references to the actual messages. This is used by the "vFolder"</div><div class='del'>-      provider, which allows you select messages meeting particular</div><div class='del'>-      criteria and deal with them as a group.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In addition to these possibilities, &amp;Camel; has full MIME</div><div class='del'>-      support. &amp;Camel; MIME messages are lightweight objects</div><div class='del'>-      representing the MIME skeleton of the actual message. The data</div><div class='del'>-      contained in the subparts are never stored in memory except when</div><div class='del'>-      they are actually needed. The application, when accessing the</div><div class='del'>-      various MIME objects contained in the message (text parts,</div><div class='del'>-      attachments, embedded binary objects ...) asks &amp;Camel; for a</div><div class='del'>-      stream that it can read data from. This scheme is particularly</div><div class='del'>-      useful with the IMAP provider. IMAP has strong MIME support</div><div class='del'>-      built-in, which allows &amp;Camel; to download only the parts of</div><div class='del'>-      messages that it actually needs: attachments need not be</div><div class='del'>-      downloaded until they are viewed, and unnecessary</div><div class='del'>-      "multipart/alternative" parts will never be read off the server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="overview"&gt;</div><div class='del'>-    &lt;title&gt;Overview&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;graphic format="gif" fileref="camel"&gt;&lt;/graphic&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To begin using &amp;Camel;, an application first creates subclassed</div><div class='del'>-      &lt;classname&gt;CamelSession&lt;/classname&gt; object. This object is used</div><div class='del'>-      to store application defaults, and to coordinate communication</div><div class='del'>-      between providers and the application.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A &lt;classname&gt;CamelProvider&lt;/classname&gt; is a dynamically-loadable</div><div class='del'>-      module that provides functionality associated with a specific</div><div class='del'>-      service. Examples of providers are POP, IMAP and SMTP. Providers</div><div class='del'>-      include subclasses of the various other &amp;Camel; classes for</div><div class='del'>-      accessing and manipulating messages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;classname&gt;CamelService&lt;/classname&gt; is an abstract class for</div><div class='del'>-      describing a connection to a local or remote service. It</div><div class='del'>-      currently has two subclasses: &lt;classname&gt;CamelStore&lt;/classname&gt;,</div><div class='del'>-      for services that store messages (such as IMAP servers and mbox</div><div class='del'>-      files), and &lt;classname&gt;CamelTransport&lt;/classname&gt;, for services</div><div class='del'>-      that deliver messages (such as SMTP or a local MTA). A provider</div><div class='del'>-      could also be both a store and a transport, as in the case of</div><div class='del'>-      NNTP.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A &lt;classname&gt;CamelStore&lt;/classname&gt; contains some number of</div><div class='del'>-      &lt;classname&gt;CamelFolder&lt;/classname&gt; objects, which in turn</div><div class='del'>-      contain messages. A &lt;classname&gt;CamelFolder&lt;/classname&gt; provides</div><div class='del'>-      a &lt;classname&gt;CamelFolderSummary&lt;/classname&gt; object, which</div><div class='del'>-      includes details about the subject, date, and sender of each</div><div class='del'>-      message in the folder. The folder also includes the messages</div><div class='del'>-      themselves, as subclasses of &lt;classname&gt;CamelMedium&lt;/classname&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Email messages are represented by the</div><div class='del'>-      &lt;classname&gt;CamelMimeMessage&lt;/classname&gt; class, a subclass of</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt;. This class includes</div><div class='del'>-      operations for accessing RFC822 and MIME headers, accessing</div><div class='del'>-      subparts of MIME messages, encoding and decoding Base64 and</div><div class='del'>-      Quoted-Printable, etc.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;classname&gt;CamelTransport&lt;/classname&gt; includes methods for</div><div class='del'>-      delivering messages. While the abstract</div><div class='del'>-      &lt;function&gt;CamelTransport::send&lt;/function&gt; method takes a</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt;, its subclasses may only be</div><div class='del'>-      able to deliver messages of specific</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt; subclasses. For instance,</div><div class='del'>-      &lt;classname&gt;CamelSendmailTransport&lt;/classname&gt; requires a</div><div class='del'>-      &lt;classname&gt;CamelMimeMessage&lt;/classname&gt;, because it needs a</div><div class='del'>-      message that includes a "To:" header. A hypothetical</div><div class='del'>-      &lt;classname&gt;CamelNNTPTransport&lt;/classname&gt; would need a</div><div class='del'>-      &lt;classname&gt;CamelNewsMessage&lt;/classname&gt;, which would have a</div><div class='del'>-      "Newsgroups:" header.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The content of messages are referred to using</div><div class='del'>-      &lt;classname&gt;CamelStream&lt;/classname&gt; and its subclasses. In the</div><div class='del'>-      case of an mbox-based store, the</div><div class='del'>-      &lt;classname&gt;CamelStream&lt;/classname&gt; would abstract the operation</div><div class='del'>-      of reading the correct section of the mbox file. For IMAP,</div><div class='del'>-      reading off the &lt;classname&gt;CamelStream&lt;/classname&gt; might result</div><div class='del'>-      in commands being issued to the remote IMAP server and data</div><div class='del'>-      being read off a socket.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The final major class in &amp;Camel; is</div><div class='del'>-      &lt;classname&gt;CamelException&lt;/classname&gt;, which is used to</div><div class='del'>-      propagate information about errors. Many methods take a</div><div class='del'>-      &lt;classname&gt;CamelException&lt;/classname&gt; as an argument, which the</div><div class='del'>-      caller can then check if an error occurs. It includes both a</div><div class='del'>-      numeric error code which can be interpreted by the program, and</div><div class='del'>-      a text error message that can be displayed to the user.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="classes"&gt;</div><div class='del'>-    &lt;title&gt;Major Subcomponents&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="store"&gt;</div><div class='del'>-      &lt;title&gt;The Message Store&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        A &lt;classname&gt;CamelStore&lt;/classname&gt; inherits the ability to</div><div class='del'>-        connect and authenticate to a service from its parent class,</div><div class='del'>-        &lt;classname&gt;CamelService&lt;/classname&gt;. It then adds the ability</div><div class='del'>-        to retrieve folders. A store must contain at least one folder,</div><div class='del'>-        which can be retrieved with</div><div class='del'>-        &lt;function&gt;CamelStore::get_default_folder&lt;/function&gt;. There are</div><div class='del'>-        also methods to retrieve the "top-level" folder (for</div><div class='del'>-        hieararchical stores), and to retrieve an arbitrary folder by</div><div class='del'>-        name.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        All &lt;classname&gt;CamelFolder&lt;/classname&gt;s must implement certain</div><div class='del'>-        core operations, most notably generating a summary and</div><div class='del'>-        retrieving and deleting messages. A</div><div class='del'>-        &lt;classname&gt;CamelFolder&lt;/classname&gt; must assign a permanently</div><div class='del'>-        unique identifier to each message it contains. Messages can</div><div class='del'>-        then be retrieved via</div><div class='del'>-        &lt;function&gt;CamelFolder::get_message&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Folders must also implement the</div><div class='del'>-        &lt;function&gt;get_parent_folder&lt;/function&gt; and</div><div class='del'>-        &lt;function&gt;list_subfolders&lt;/function&gt; methods. For stores that</div><div class='del'>-        don't allow multiple folders, they would return NULL and an</div><div class='del'>-        empty list, respectively. Stores that do allow multiple</div><div class='del'>-        folders will also define methods for creating and deleting</div><div class='del'>-        folders, and for moving messages between them (assuming the</div><div class='del'>-        folders are writable).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Folders that support searching can define the</div><div class='del'>-        &lt;function&gt;search_by_expression&lt;/function&gt; method. For mbox</div><div class='del'>-        folders, this is implemented by indexing the messages with the</div><div class='del'>-        ibex library and using that to search them later. For IMAP</div><div class='del'>-        folders, this uses the IMAP SEARCH command. Other folder types</div><div class='del'>-        might not be able to implement this functionality, in which</div><div class='del'>-        case users would not be able to do full-content searches on</div><div class='del'>-        them.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="messages"&gt;</div><div class='del'>-      &lt;title&gt;Messages&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        As mentioned before, messages are represented by subclasses of</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt;.</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt; itself is a subclass of</div><div class='del'>-        &lt;classname&gt;CamelDataWrapper&lt;/classname&gt;, a generic class for</div><div class='del'>-        connecting a typed data source to a data sink.</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt; adds the concept of message</div><div class='del'>-        headers versus message body.</div><div class='del'>-        (&lt;classname&gt;CamelDataWrapper&lt;/classname&gt; has one other</div><div class='del'>-        important subclass, &lt;classname&gt;CamelMultipart&lt;/classname&gt;,</div><div class='del'>-        which is used to provide separate access to the multiple</div><div class='del'>-        independent parts of a multipart MIME type.)</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt;'s subclasses provide more</div><div class='del'>-        specialized handling of various headers:</div><div class='del'>-        &lt;classname&gt;CamelMimePart&lt;/classname&gt; adds special handling for</div><div class='del'>-        the &amp;ldquot;Content-*&amp;rdquot; headers in MIME messages, and</div><div class='del'>-        its subclass &lt;classname&gt;CamelMimeMessage&lt;/classname&gt; adds</div><div class='del'>-        handling for the RFC822 headers.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;graphic format="gif" fileref="mimemessage"&gt;&lt;/graphic&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Consider a message with two parts: a text part (in both plain</div><div class='del'>-        text and HTML), and an attached image:</div><div class='del'>-</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-	  From: Dan Winship &amp;lt;danw@helixcode.com&amp;gt;</div><div class='del'>-	  To: Matt Loper &amp;lt;matt@helixcode.com&amp;gt;</div><div class='del'>-	  Subject: the Camel white paper</div><div class='del'>-	  MIME-Version: 1.0</div><div class='del'>-	  Content-Type: multipart/mixed;</div><div class='del'>-		boundary="jhTYrnsRrdhDFGa"</div><div class='del'>-</div><div class='del'>-	  This is a multi-part message in MIME format.</div><div class='del'>-	  --jhTYrnsRrdhDFGa</div><div class='del'>-	  Content-Type: multipart/alternative;</div><div class='del'>-		boundary="sFSenbAFDSgDfg"</div><div class='del'>-</div><div class='del'>-	  --sFSenbAFDSgDfg</div><div class='del'>-	  Content-Type: text/plain</div><div class='del'>-</div><div class='del'>-	  Hey, Matt</div><div class='del'>-</div><div class='del'>-	  Check out this graphic...</div><div class='del'>-</div><div class='del'>-	  -- Dan</div><div class='del'>-</div><div class='del'>-	  --sFSenbAFDSgDfg</div><div class='del'>-	  Content-Type: text/html</div><div class='del'>-</div><div class='del'>-	  Hey, Matt&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  Check out this graphic...&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  -- Dan&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  --sFSenbAFDSgDfg--</div><div class='del'>-</div><div class='del'>-	  --jhTYrnsRrdhDFGa</div><div class='del'>-	  Content-Type: image/png</div><div class='del'>-	  Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...</div><div class='del'>-	  --jhTYrnsRrdhDFGa--</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  In &amp;Camel;, this would be represented as follows:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;graphic fileref="samplemsg"&gt;&lt;/graphic&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect2 id="streams"&gt;</div><div class='del'>-        &lt;title&gt;Streams&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Streams are a generic data transport layer. Two basic stream</div><div class='del'>-	  classes are &lt;classname&gt;CamelStreamFs&lt;/classname&gt;, for</div><div class='del'>-	  reading and writing files, and</div><div class='del'>-	  &lt;classname&gt;CamelStreamMem&lt;/classname&gt;, for reading from and</div><div class='del'>-	  writing to objects that are already in memory.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Streams can also be filtered. So a CamelMimePart</div><div class='del'>-	  containing base64-encoded data can filter its output through</div><div class='del'>-	  CamelMimeFilterBasic. Other parts of the application that want</div><div class='del'>-	  to read its data will never need to even realize that the</div><div class='del'>-	  original data was encoded.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/mail/ibex.sgml b/doc/white-papers/mail/ibex.sgml<br/>deleted file mode 100644<br/>index dcb8f5ca4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/mail/ibex.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/white-papers/mail/ibex.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity Camel "Camel"&gt;</div><div class='del'>-&lt;!entity Ibex "Ibex"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="ibex"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;Ibex: an Indexing System&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Dan&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Winship&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;danw@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Ibex; is a library for text indexing. It is being used by</div><div class='del'>-      &amp;Camel; to allow it to quickly search locally-stored messages,</div><div class='del'>-      either because the user is looking for a specific piece of text,</div><div class='del'>-      or because the application is contructing a vFolder or filtering</div><div class='del'>-      incoming mail.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="goals"&gt;</div><div class='del'>-    &lt;title&gt;Design Goals and Requirements for Ibex&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The design of &amp;Ibex; is based on a number of requirements.</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  First, obviously, it must be fast. In particular, searching</div><div class='del'>-	  the index must be appreciably faster than searching through</div><div class='del'>-	  the messages themselves, and constructing and maintaining</div><div class='del'>-	  the index must not take a noticeable amount of time.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  The indexes must not take up too much space. Many users have</div><div class='del'>-	  limited filesystem quotas on the systems where they read</div><div class='del'>-	  their mail, and even users who read mail on private machines</div><div class='del'>-	  have to worry about running out of space on their disks. The</div><div class='del'>-	  indexes should be able to do their job without taking up so</div><div class='del'>-	  much space that the user decides he would be better off</div><div class='del'>-	  without them.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Another aspect of this problem is that the system as a whole</div><div class='del'>-	  must be clever about what it does and does not index:</div><div class='del'>-	  accidentally indexing a "text" mail message containing</div><div class='del'>-	  uuencoded, BinHexed, or PGP-encrypted data will drastically</div><div class='del'>-	  affect the size of the index file. Either the caller or the</div><div class='del'>-	  indexer itself has to avoid trying to index these sorts of</div><div class='del'>-	  things.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  The indexing system must allow data to be added to the index</div><div class='del'>-	  incrementally, so that new messages can be added to the</div><div class='del'>-	  index (and deleted messages can be removed from it) without</div><div class='del'>-	  having to re-scan all existing messages.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  It must allow the calling application to explain the</div><div class='del'>-	  structure of the data however it wants to, rather than</div><div class='del'>-	  requiring that the unit of indexing be individual files.</div><div class='del'>-	  This way, &amp;Camel; can index a single mbox-format file and</div><div class='del'>-	  treat it as multiple messages.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  It must support non-ASCII text, given that many people send</div><div class='del'>-	  and receive non-English email, and even people who only</div><div class='del'>-	  speak English may receive email from people whose names</div><div class='del'>-	  cannot be written in the US-ASCII character set.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      While there are a number of existing indexing systems, none of</div><div class='del'>-      them met all (or even most) of our requirements.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="implementation"&gt;</div><div class='del'>-    &lt;title&gt;The Implementation&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Ibex; is still young, and many of the details of the current</div><div class='del'>-      implementation are not yet finalized.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      With the current index file format, 13 megabytes of Info files</div><div class='del'>-      can be indexed into a 371 kilobyte index file&amp;mdash;a bit under</div><div class='del'>-      3% of the original size. This is reasonable, but making it</div><div class='del'>-      smaller would be nice. (The file format includes some simple</div><div class='del'>-      compression, but &lt;application&gt;gzip&lt;/application&gt; can compress an</div><div class='del'>-      index file to about half its size, so we can clearly do better.)</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The implementation has been profiled and optimized for speed to</div><div class='del'>-      some degree. But, it has so far only been run on a 500MHz</div><div class='del'>-      Pentium III system with very fast disks, so we have no solid</div><div class='del'>-      benchmarks.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Further optimization (of both the file format and the in-memory</div><div class='del'>-      data structures) awaits seeing how the library is most easily</div><div class='del'>-      used by &amp;Evolution;: if the indexes are likely to be kept in</div><div class='del'>-      memory for long periods of time, the in-memory data structures</div><div class='del'>-      need to be kept small, but the reading and writing operations</div><div class='del'>-      can be slow. On the other hand, if the indexes will only be</div><div class='del'>-      opened when they are needed, reading and writing must be fast,</div><div class='del'>-      and memory usage is less critical.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Of course, to be useful for other applications that have</div><div class='del'>-      indexing needs, the library should provide several options, so</div><div class='del'>-      that each application can use the library in the way that is</div><div class='del'>-      most suited for its needs.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/widgets/e-table.sgml b/doc/white-papers/widgets/e-table.sgml<br/>deleted file mode 100644<br/>index 5ff4faf2ae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/widgets/e-table.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>doc/white-papers/widgets/e-table.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity ETable "&lt;classname&gt;ETable&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableModel "&lt;classname&gt;ETableModel&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableSimple "&lt;classname&gt;ETableSimple&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableHeader "&lt;classname&gt;ETableHeader&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableSpecification "&lt;classname&gt;ETableSpecification&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableCol "&lt;classname&gt;ETableCol&lt;/classname&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="e-table"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;The ETable Widget&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Chris&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Lahey&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;clahey@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Miguel&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;de Icaza&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;miguel@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; is a table widget on steroids. It is intended to provide</div><div class='del'>-      all the table functionality needed throughout &amp;Evolution;, and</div><div class='del'>-      hopefully be general purpose enough to be used in other projects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; provides a lot of interactive control over the data in the</div><div class='del'>-      table.  Without any work from the programmer, &amp;ETable; provides</div><div class='del'>-      rearrangeable columns and editable data.  When finished, &amp;ETable; will</div><div class='del'>-      also provide, again with no programmer intervention, easy interactive</div><div class='del'>-      sorting and grouping.  </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; gives you a great deal of functionality, flexibility, and</div><div class='del'>-      power. Most of this power is internal to the widget, but some of</div><div class='del'>-      the flexibility requires a bit of work by the programmer.</div><div class='del'>-      However, once you learn it, &amp;ETable; is not very hard at all to</div><div class='del'>-      use.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable;'s power comes from the fact that it is fully</div><div class='del'>-      model/view/controller based.  Various models are involved into</div><div class='del'>-      the process of rendering the information, and various views are</div><div class='del'>-      provided.  The programmer has a wide range of options: from the</div><div class='del'>-      most finely hand-tuned table to a generic all-encompasing widget</div><div class='del'>-      that takes over most of tasks.  It is up to the programmer: he</div><div class='del'>-      can use the simple to use &amp;ETable; widget that takes care of</div><div class='del'>-      everything in a generic way, or he can use the various</div><div class='del'>-      components to roll his own tabular display.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; ships with a standard set of information renderers:</div><div class='del'>-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line</div><div class='del'>-      strings.  But the programmer can write and implement his own</div><div class='del'>-      renderer for his information.  This means that by default</div><div class='del'>-      &amp;ETable; provides the basic display facilities that programmers</div><div class='del'>-      required, but they offer the programmer a complete freedom to</div><div class='del'>-      incorporate new cell renderers.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="model"&gt;</div><div class='del'>-    &lt;title&gt;ETableModel&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The data back end for the &amp;ETable; is an &amp;ETableModel;. The</div><div class='del'>-      &amp;ETableModel is an abstract interface that acts as the</div><div class='del'>-      information repository for the various &amp;ETable components.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To use &amp;ETable; you have to create a subclass of the abstract</div><div class='del'>-      &amp;ETableModel; class.  However, to save you the work of defining</div><div class='del'>-      a new &lt;classname&gt;GtkClass&lt;/classname&gt; every time you use</div><div class='del'>-      &amp;ETable, there is a predefined subclass of &amp;ETableModel; called</div><div class='del'>-      &amp;ETableSimple; which simply takes a list of function callbacks</div><div class='del'>-      to perform the various operations.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="columns"&gt;</div><div class='del'>-    &lt;title&gt;Columns&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      There are two different meanings to the word "column". The first</div><div class='del'>-      is the model column (defined by the &amp;ETableCol: object). A model</div><div class='del'>-      column describes how it maps to the column in the &amp;ETableModel;</div><div class='del'>-      as well as containing information about its properties (name,</div><div class='del'>-      resizability, resize dimensions, and a renderer for this</div><div class='del'>-      specific columns). </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; distinguishes between a model column index, and a view</div><div class='del'>-      column index.  The former reflects the column in which the data</div><div class='del'>-      is stored in the &amp;ETableModel;  The later represents the actual</div><div class='del'>-      location at which the column is being displayed in the screen.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Each view column index corresponds to a specific model column,</div><div class='del'>-      though a model column may have any number of view columns</div><div class='del'>-      associated with it (including zero).  For example the same</div><div class='del'>-      column might be rendered twice, or the data from one column</div><div class='del'>-      could be used to display different bits of information</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column does not necessarily depend on only one model</div><div class='del'>-      column. In some cases, the view column renderer can be given a</div><div class='del'>-      reference to another model column to get extra information about</div><div class='del'>-      its display. For example, a mail program could display deleted</div><div class='del'>-      messages with a line through them by creating a model column</div><div class='del'>-      with no corresponding view column that told whether or not the</div><div class='del'>-      message is deleted, and then having the text column</div><div class='del'>-      strikethrough the display if the invisible column had a value</div><div class='del'>-      corresponding to "deleted".</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column also specifies a few other pieces of</div><div class='del'>-      information. One piece of information is the renderer. &amp;ETable;</div><div class='del'>-      provides a number of renderers to choose from, or you can write</div><div class='del'>-      your own. Currently, there are renderers for text, image sets,</div><div class='del'>-      and checkboxes.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column also includes information about the header.</div><div class='del'>-      There are two types of headers: text, and pixbuf. The first</div><div class='del'>-      allows you to specify a string which is rendered in the header.</div><div class='del'>-      The second allows you to specify an image to copy into the</div><div class='del'>-      header.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="header"&gt;</div><div class='del'>-    &lt;title&gt;Header&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;ETableHeader; represents the header information for the</div><div class='del'>-      table. The &amp;ETableHeader; is used in two different ways. The</div><div class='del'>-      first is the in the &lt;structfield&gt;full_header&lt;/structfield&gt;</div><div class='del'>-      element of an &amp;ETable;. This is the list of possible columns in</div><div class='del'>-      the view. You add each of your columns to this &amp;ETableHeader;</div><div class='del'>-      and then pass it into the &amp;ETable;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The second use is completely internal. &amp;ETable; uses another</div><div class='del'>-      &amp;ETableHeader; to store the actual displayed columns. Many of</div><div class='del'>-      the &amp;ETableHeader; functions are for this purpose. The only</div><div class='del'>-      functions that users of the library should need to use are</div><div class='del'>-      &lt;function&gt;e_table_header_new&lt;/function&gt; and</div><div class='del'>-      &lt;function&gt;e_table_header_add_col&lt;/function&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="layout"&gt;</div><div class='del'>-    &lt;title&gt;Layout Specification&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; uses an &amp;ETableSpecification; to layout the columns of</div><div class='del'>-      the widget. The &amp;ETableSpecification; is specified as XML data</div><div class='del'>-      passed into the &amp;ETable; as a string.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The most powerful part of the &amp;ETableSpecification; is that when</div><div class='del'>-      finished, &amp;ETable; will allow you to get a copy of an</div><div class='del'>-      &amp;ETableSpecification; that describes the current view of the</div><div class='del'>-      tree. This allows the developer to save the current view so that</div><div class='del'>-      next time the user opens this table, they find it in exactly the</div><div class='del'>-      state that they left it.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The XML specification allows for a number of things. First, it</div><div class='del'>-      allows you to pick a set of default columns to be shown. Thus,</div><div class='del'>-      even if you had hundreds of pieces of data, you could choose to</div><div class='del'>-      only display a few that fit on the screen by default.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The second major thing that the &amp;ETableSpecification; allows you</div><div class='del'>-      to specify is the column grouping and sorting. &amp;ETable; has a</div><div class='del'>-      powerful mechanism for allowing the user to choose columns to</div><div class='del'>-      group by, thus allowing multiple columns of sorting, as well as</div><div class='del'>-      visual grouping of similar elements and interactive selection of</div><div class='del'>-      what data to display.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The grouping in &amp;ETableSpecification; is specified as a</div><div class='del'>-      hierarchy of columns to group by. Each level of the hierarchy</div><div class='del'>-      lets you sort by a particular column, either ascending or</div><div class='del'>-      descending. All levels except the last cause the canvas to group</div><div class='del'>-      by the given column.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      An example &amp;ETableSpecification; follows.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-      &amp;lt;ETableSpecification&amp;gt;</div><div class='del'>-        &amp;lt;columns-shown frozen_columns="2"&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 0 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 1 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 2 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 3 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 4 &amp;lt;/column&amp;gt;</div><div class='del'>-	&amp;lt;/columns-shown&amp;gt;</div><div class='del'>-	&amp;lt;grouping&amp;gt;</div><div class='del'>-	  &amp;lt;group column="3" ascending="1"&amp;gt;</div><div class='del'>-	    &amp;lt;group column="4" ascending="0"&amp;gt;</div><div class='del'>-	      &amp;lt;leaf column="2" ascending="1"/&amp;gt;</div><div class='del'>-	    &amp;lt;/group&amp;gt;</div><div class='del'>-	  &amp;lt;/group&amp;gt;</div><div class='del'>-	&amp;lt;/grouping&amp;gt;</div><div class='del'>-      &amp;lt;/ETableSpecification&amp;gt;</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This example has 5 columns which are initially in order. It has</div><div class='del'>-      2 levels of grouping. The first is grouped by the 4th column</div><div class='del'>-      (all indexes are 0 based) and sorts those groups in ascending</div><div class='del'>-      order. Inside those groups, the data is grouped by the fifth</div><div class='del'>-      column and sorted in descending order of the fifth column.</div><div class='del'>-      Finally, the data in those groups is sorted by the third column</div><div class='del'>-      in ascending order. Due to the "frozen_columns" attribute on the</div><div class='del'>-      columns-shown element, the user will not be</div><div class='del'>-      able to rearrange the first two columns. They will always be the</div><div class='del'>-      first two.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="conclusion"&gt;</div><div class='del'>-    &lt;title&gt;Conclusion&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      All in all, &amp;ETable; is a very powerful widget. Once you learn</div><div class='del'>-      to use it, you have access to a vast amount of power requiring a</div><div class='del'>-      comparatively small amount of work.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/e-util/.cvsignore b/e-util/.cvsignore<br/>deleted file mode 100644<br/>index cb49036068..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/e-util/ChangeLog b/e-util/ChangeLog<br/>deleted file mode 100644<br/>index 842e78b281..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1862 +0,0 @@</div><div class='del'>-2002-05-07  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-corba-utils.c (e_safe_corba_string_dup): New.</div><div class='del'>-</div><div class='del'>-2002-05-06  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_thread_destroy): Destroy our mutex too.</div><div class='del'>-	(e_thread_new): Add thread to a new list of all threads.</div><div class='del'>-	(e_thread_destroy): Remove thread from list of all threads.</div><div class='del'>-	(e_thread_busy): New function, returh true if we're busy somewhere</div><div class='del'>-	processing work.</div><div class='del'>-</div><div class='del'>-2002-04-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_get_password): Don't leak the base64</div><div class='del'>-	encoded password buffer.</div><div class='del'>-</div><div class='del'>-2002-04-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c (e_gethostbyaddr_r): New wrapper around</div><div class='del'>-	gethostbyaddr_r if the system has it, else a whole new</div><div class='del'>-	implementation.</div><div class='del'>-</div><div class='del'>-2002-04-11  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (parse_value): Handle parsing negative integers.</div><div class='del'>-</div><div class='del'>-2002-03-29  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.c (e_file_dialog_save): open a file selection</div><div class='del'>-	dialog with the given title and return the selected file name</div><div class='del'>-	(save_ok): if the ok button is clicked, make sure the file doesn't</div><div class='del'>-	already exist and if it does, see if the user wants to over write</div><div class='del'>-	it</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.h: new proto</div><div class='del'>-</div><div class='del'>-2002-03-22  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-lang-utils.c: New.</div><div class='del'>-	* e-lang-utils.h: New.</div><div class='del'>-</div><div class='del'>-2002-03-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-request.c (e_request_string): Document the fact that this</div><div class='del'>-	takes two locale charset strings and one UTF8 string and returns a</div><div class='del'>-	UTF8 string. (Huh.)</div><div class='del'>-</div><div class='del'>-2002-03-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-mktemp.c: #include &lt;string.h&gt; for strcmp.</div><div class='del'>-</div><div class='del'>-2002-02-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Fix for if the buffer ends</div><div class='del'>-	with an email address (and no newline).</div><div class='del'>-</div><div class='del'>-2002-02-09  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-settings.h: add row and column defines</div><div class='del'>-</div><div class='del'>-2002-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Use E_NAME_CFLAGS and E_NAME_LIBS.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Use E_UTIL_CFLAGS and E_UTIL_LIBS.</div><div class='del'>-</div><div class='del'>-2002-01-14  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: compile new files</div><div class='del'>-</div><div class='del'>-	* e-pilot-settings.[hc]: beginnings of a general conduit</div><div class='del'>-	configuration gui</div><div class='del'>-</div><div class='del'>-2002-01-10  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_word_is_suffix): Allow</div><div class='del'>-	for a period after suffixes.  Fixes Ximian bug #17012.</div><div class='del'>-</div><div class='del'>-2002-01-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_memchunk_clean): Prune free'd nodes from our free</div><div class='del'>-	list otherwise we'll end up re-using free'd memory blocks and</div><div class='del'>-	that's not a Good Thing (tm).</div><div class='del'>-</div><div class='del'>-2002-01-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* md5-utils.h: Reverted.</div><div class='del'>-</div><div class='del'>-2002-01-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* md5-utils.h: Move the struct into md5-utils.c - this is a</div><div class='del'>-	kludgey hack around the fact that NSS also defines</div><div class='del'>-	MD5Context. Besides, this should be a private struct anyway.</div><div class='del'>-</div><div class='del'>-2002-01-02  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.c (e_gnome_dialog_set_parent): util function</div><div class='del'>-	moved from mail-callbacks, also destroys the dialog if the parent</div><div class='del'>-	is destroyed</div><div class='del'>-	(e_gnome_warning_dialog_parented): similarly</div><div class='del'>-	(e_gnome_ok_cancel_dialog_parented): ditto</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.h: new protos</div><div class='del'>-</div><div class='del'>-2001-12-17  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_clear): clear all info from the map</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: add proto</div><div class='del'>-</div><div class='del'>-2001-12-10  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-util.c (e_pilot_utf8_to_pchar): use UTF-8 instead of</div><div class='del'>-	UTF8 as the source char set</div><div class='del'>-	(e_pilot_utf8_from_pchar): use UTF-8 instead of UTF8 as the</div><div class='del'>-	destination char set</div><div class='del'>-</div><div class='del'>-2001-11-20  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_forget_password): Clear the password</div><div class='del'>-	in bonobo-conf as well. Fixes ximian 14893.</div><div class='del'>-</div><div class='del'>-2001-11-13  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_LIBADD): Remove `-lc'.  It makes the</div><div class='del'>-	mailer do strange things when it calls `fork()', thus breaking</div><div class='del'>-	e.g. mail sending through sendmail.</div><div class='del'>-</div><div class='del'>-2001-11-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>- </div><div class='del'>- 	* e-pilot-map.c (real_e_pilot_map_insert): only insert non-0 pids</div><div class='del'>- 	into the pid map</div><div class='del'>- 	(e_pilot_map_insert): remove and free old keys/values here -</div><div class='del'>- 	including possibly orphaned keys</div><div class='del'>- 	(e_pilot_map_remove_by_uid): only free things if they should have</div><div class='del'>- 	been found</div><div class='del'>-</div><div class='del'>-2001-11-13  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_LIBADD): Explicitly add -lc</div><div class='del'>-</div><div class='del'>-2001-10-30  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date): added a 2nd format, with the</div><div class='del'>-	weekday and the date. We need this so we can try to parse DATE values</div><div class='del'>-	in the ECalendarTable.</div><div class='del'>-</div><div class='del'>-2001-10-29  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.c (e_set_dialog_parent): Remove a g_warning.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_fixup): Added French</div><div class='del'>-	conjunction.</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c: Don't define gethost_mutex unless we need it.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c: Cleaned this up a bit.</div><div class='del'>-</div><div class='del'>-2001-10-29  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_fixup): Check for</div><div class='del'>-	compound first names here (X &amp; Y).  Fixes Ximian bug #13859.</div><div class='del'>-</div><div class='del'>-2001-10-28  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_remove_by_pid): make sure to free the</div><div class='del'>-	keys as well</div><div class='del'>-	(e_pilot_map_remove_by_uid): ditto</div><div class='del'>-</div><div class='del'>-2001-10-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: update proto</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_lookup_pid): touch the nodes if</div><div class='del'>-	indicated and found</div><div class='del'>-	(e_pilot_map_lookup_uid): ditto</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (real_e_pilot_map_insert): take an extra param on</div><div class='del'>-	whether to mark touched</div><div class='del'>-	(map_sax_start_element): use above</div><div class='del'>-	(e_pilot_map_insert): ditto</div><div class='del'>-	(e_pilot_map_write): pass in extra info to foreach call</div><div class='del'>-	(map_write_foreach): if we are in touched only mode, write out the</div><div class='del'>-	map only if its been touched</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: add new member</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-pilot-map.c (map_sax_start_element): add archived records</div><div class='del'>-	with pilot id of 0</div><div class='del'>-	(map_write_foreach): use the uid map for writing</div><div class='del'>-	(e_pilot_map_write): write using the uid map</div><div class='del'>-</div><div class='del'>-2001-10-26  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_insert): free up old memory first</div><div class='del'>-	(e_pilot_map_destroy): free allocated memory when destroying</div><div class='del'>-</div><div class='del'>-2001-10-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (map_set_node_timet): plug leak</div><div class='del'>-</div><div class='del'>-2001-10-23  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Change " " to "&amp;nbsp;" at</div><div class='del'>-	start of line.</div><div class='del'>-</div><div class='del'>-2001-10-22  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_get_password): Pass a</div><div class='del'>-	CORBA_Environment to bonobo_config_get_string so it doesn't g_warn</div><div class='del'>-	on error. (Since the "error" is most likely just that the password</div><div class='del'>-	isn't cached.)</div><div class='del'>-	(e_passwords_remember_password, e_passwords_get_password,</div><div class='del'>-	e_passwords_add_password): Change "if (foo) { entire function; }"</div><div class='del'>-	to "if (!foo) return;"</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (special_chars): Don't allow single quote or</div><div class='del'>-	backtick in email addresses, or pipes following URLs.</div><div class='del'>-</div><div class='del'>-2001-10-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-dbhash.c (e_dbhash_foreach_key): null out DBT memory prior to</div><div class='del'>-	usage (from Edd Dumbill &lt;edd@usefulinc.com&gt;)</div><div class='del'>-	</div><div class='del'>-2001-10-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.c (e_set_dialog_parent_from_xid): New.</div><div class='del'>-</div><div class='del'>-2001-10-12  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.h: new parameter to e_passwords_init, and add</div><div class='del'>-	prototype for e_passwords_clear_component_passwords.</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_init): copy off the component name.</div><div class='del'>-	(e_passwords_shutdown): free/NULL the component name.</div><div class='del'>-	(e_passwords_clear_component_passwords): new function.  remove the</div><div class='del'>-	subtree rooted at /Passwords/&lt;ComponentName&gt;.</div><div class='del'>-	(e_passwords_remember_password): use component_name when building</div><div class='del'>-	up the path.</div><div class='del'>-	(e_passwords_get_password): same.</div><div class='del'>-	(e_passwords_add_password): remove/free the currently stored</div><div class='del'>-	session password for this key if there is one, before adding the</div><div class='del'>-	new one.</div><div class='del'>-</div><div class='del'>-2001-10-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.h: change prototype for e_passwords_get_password.</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_get_password): remove 'const' from</div><div class='del'>-	return type - the return type is now allocated and must be freed</div><div class='del'>-	by the caller.</div><div class='del'>-	</div><div class='del'>-2001-10-11  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_init): open the bonobo config db for</div><div class='del'>-	our passwords.</div><div class='del'>-	(e_passwords_shutdown): sync and unref the bonobo db, and clear</div><div class='del'>-	out the per session hash.</div><div class='del'>-	(e_passwords_forget_passwords): remove the bonobo config db</div><div class='del'>-	/Passwords path, and free up the session hash (but don't destroy</div><div class='del'>-	it).</div><div class='del'>-	(e_passwords_remember_password): remove the key/value from the</div><div class='del'>-	session hash, after inserting it into the bonobo db.</div><div class='del'>-	(e_passwords_get_password): look up a session password for the</div><div class='del'>-	uri, and if it's not there, consult the bonobo db.</div><div class='del'>-	(e_passwords_ask_password): quiet gcc's warnings, and only consult</div><div class='del'>-	the toggle button state if we actaully created it.</div><div class='del'>-</div><div class='del'>-2001-10-09  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-url.c (e_uri_to_string): don't add the host if it's null</div><div class='del'>-</div><div class='del'>-2001-10-06  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c (e_address_western_parse): Made this</div><div class='del'>-	refuse to parse more than 2047 characters of address.</div><div class='del'>-</div><div class='del'>-2001-10-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_add_password): Make this dup the</div><div class='del'>-	strings it's passed.</div><div class='del'>-	(*) Add lots of docs.</div><div class='del'>-</div><div class='del'>-2001-10-03  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-url.c (e_uri_new): default protocol to file: if not specified</div><div class='del'>-</div><div class='del'>-2001-10-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-url.c (e_uri_copy): duplicate also the params member</div><div class='del'>-</div><div class='del'>-2001-10-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-url.[ch] (e_uri_copy, e_uri_to_string): new functions</div><div class='del'>-	</div><div class='del'>-2001-10-01  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-url.[ch]: added basic URI management functions</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added BONOBO flags to make it compile with latest</div><div class='del'>-	Bonobo, which installs headers in a version-based directory</div><div class='del'>-</div><div class='del'>-2001-10-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c (e_passwords_ask_password): New, copied/renamed</div><div class='del'>-	from mailer and gnome-libs.</div><div class='del'>-</div><div class='del'>-2001-09-30  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): add e-passwords.[ch]</div><div class='del'>-</div><div class='del'>-2001-09-30  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-passwords.c: copy/rename the mail specific password stuff</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* e-passwords.h: same.</div><div class='del'>-</div><div class='del'>-2001-09-28    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_msgport_put): Write the pipe notification outside</div><div class='del'>-	the lock.  This way if the pipe fills up because of too many</div><div class='del'>-	outstanding request, the queue isn't deadlocked.  This only</div><div class='del'>-	happens wiht 4096 outstanding messages, so something is getting</div><div class='del'>-	VERY busy!  Fixes #11121.</div><div class='del'>-</div><div class='del'>-2001-09-24  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c (ecmlw_load, ecmlw_save): Make</div><div class='del'>-	the printouts here conditionally compiled out.</div><div class='del'>-</div><div class='del'>-2001-09-21    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_thread_destroy): Instead of using</div><div class='del'>-	pthread_cancel() which seems to have numerous implementation</div><div class='del'>-	issues, send a special quit message to the subordinate thread.</div><div class='del'>-	(thread_dispatch): When it gets a quit message, well, quit!</div><div class='del'>-</div><div class='del'>-2001-09-18  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.c (widget_realize_callback_for_backing_store): Use</div><div class='del'>-	-&gt;bin_window [instead of -&gt;window] if the widget is a GtkLayout.</div><div class='del'>-</div><div class='del'>-2001-09-17  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date): only use 1 format, so we are</div><div class='del'>-	consistent everywhere. If we support multiple formats we have to</div><div class='del'>-	support that in e_time_parse_date_and_time() which means an explosion</div><div class='del'>-	of different formats. I don't think the alternatives are that useful,</div><div class='del'>-	anyway.</div><div class='del'>-	(e_time_parse_date_and_time): parse everything in one go, to avoid</div><div class='del'>-	i18n problems. Also only use '%p' if the locale has am/pm strings.</div><div class='del'>-	(e_time_parse_time): Only use '%p' if locale has am/pm strings.</div><div class='del'>-</div><div class='del'>-2001-09-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.c (gtk_radio_button_get_nth_selected): Removed.</div><div class='del'>-	(gtk_radio_button_select_nth): Removed.</div><div class='del'>-	(e_make_widget_backing_stored): New.</div><div class='del'>-</div><div class='del'>-2001-09-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-mktemp.c (e_mktemp_cleanup): Make sure the dir pointer is</div><div class='del'>-	non-NULL before using it.</div><div class='del'>-</div><div class='del'>-2001-09-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Fix some broken calls to</div><div class='del'>-	check_size that could result in memory corruption displaying short</div><div class='del'>-	replies.</div><div class='del'>-</div><div class='del'>-2001-09-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Add E_TEXT_TO_HTML_CITE,</div><div class='del'>-	to prepend "&gt; " to each line.</div><div class='del'>-</div><div class='del'>-2001-09-05  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-mktemp.c (get_path): Fix the check for the case when mkdir()</div><div class='del'>-	returns EEXIST to check S_ISDIR on the right structure component.</div><div class='del'>-	Fixes bug #8775.</div><div class='del'>-</div><div class='del'>-2001-08-31  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date_and_time): Added format for </div><div class='del'>-	"7 PM" and equivalents.  Fixes bug #7456.</div><div class='del'>-	(e_time_parse_time): Likewise.</div><div class='del'>-</div><div class='del'>-2001-08-28  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c (ecmlw_load): Dont call</div><div class='del'>-	g_print with a NULL string.  See bug #7396.</div><div class='del'>-</div><div class='del'>-2001-08-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-mktemp.c (get_path): Make more robust.</div><div class='del'>-</div><div class='del'>-2001-08-24  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-mktemp.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* e-mktemp.c (e_mktemp): A new wrapper around mktemp so that we</div><div class='del'>-	can keep track of temp files for later cleanup.</div><div class='del'>-	(e_mkstemp): Same but obviously for the mkstemp call.</div><div class='del'>-	(e_mkdtemp): And finally a mkdtemp wrapper.</div><div class='del'>-</div><div class='del'>-2001-08-24  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added e-unicode-i18n.c and</div><div class='del'>-	e-unicode-i18n.h.</div><div class='del'>-</div><div class='del'>-	* e-unicode-i18n.[ch]: New files with two extra functions</div><div class='del'>-	(e_utf8_gettext, e_utf8_dgettext) and U_() macro.</div><div class='del'>-	Should be used instead of _() if we need UTF-8 string.</div><div class='del'>-</div><div class='del'>-2001-08-23  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* e-request.c (e_request_string): Modified to accept and return</div><div class='del'>-	UTF-8 string.  It's currently used only in</div><div class='del'>-	shell/e-shortcuts-view.c and we need UTF-8 there.</div><div class='del'>-</div><div class='del'>-2001-08-20  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date): added comments to help</div><div class='del'>-	translators a bit.</div><div class='del'>-</div><div class='del'>-2001-08-09  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c (e_categories_config_get_icon_for): return</div><div class='del'>-	when there's no icon associated with the category</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c: reworked to use the</div><div class='del'>-	ECategoriesMasterListWombat class. Also, load correctly images</div><div class='del'>-	(fixes #6794)</div><div class='del'>-</div><div class='del'>-2001-08-09  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c (ecmlw_destroy): Chain to the</div><div class='del'>-	destroy handler in the parent class!</div><div class='del'>-</div><div class='del'>-	* e-list-iterator.c (e_list_iterator_destroy): Likewise.  Sigh.</div><div class='del'>-</div><div class='del'>-	* e-list.c (e_list_destroy): Likewise.  Double sigh.</div><div class='del'>-</div><div class='del'>-2001-08-08  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-utils.h: New.</div><div class='del'>-	* e-dialog-utils.c: New.</div><div class='del'>-</div><div class='del'>-2001-08-04  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-bonobo-factory-util.c</div><div class='del'>-	(e_bonobo_generic_factory_multi_display_new): New function to</div><div class='del'>-	create a factory that creates separate component instances for</div><div class='del'>-	different displays.</div><div class='del'>-</div><div class='del'>-2001-08-03  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-list-iterator.c (e_list_iterator_next): Made it so that</div><div class='del'>-	e_list_iterator_next goes to the first element if it's set to</div><div class='del'>-	NULL.  This makes deleting the first element and then doing</div><div class='del'>-	e_list_iterator_next go to the new first element.  Did the analogy</div><div class='del'>-	for e_list_iterator_prev for completeness and consistency's sakes.</div><div class='del'>-	Fixes Ximian bug #6057.</div><div class='del'>-</div><div class='del'>-2001-08-01  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c (ecmlw_load): Fixed the load</div><div class='del'>-	statement here by just using array_from_string.</div><div class='del'>-	(ecmlw_save): Removed the part where we save the icons and colors</div><div class='del'>-	since that's handled in the array_to_string function.  Fixes</div><div class='del'>-	Ximian bug #4451.</div><div class='del'>-</div><div class='del'>-2001-07-27  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dbhash.c (string_to_dbt): memset everything to 0</div><div class='del'>-	(md5_to_dbt): ditto</div><div class='del'>-</div><div class='del'>-2001-07-20  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c (initialize_categories_config): use the 2</div><div class='del'>-	new category icons (16_category_suppliers.png and</div><div class='del'>-	16_category_time-and-expenses.png)</div><div class='del'>-</div><div class='del'>-2001-07-19  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c (initialize_categories_config): use the 2</div><div class='del'>-	new category icons</div><div class='del'>-</div><div class='del'>-	* Makefile.am: s/imagedir/imagesdir</div><div class='del'>-</div><div class='del'>-2001-07-17  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c (initialize_categories_config): generate</div><div class='del'>-	default configuration for icons-per-category the first time. And</div><div class='del'>-	use a global (for this file) Bonobo_ConfigDatabase</div><div class='del'>-</div><div class='del'>-2001-07-16  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c (e_categories_config_get_icon_for):</div><div class='del'>-	(e_categories_config_get_icon_file_for):</div><div class='del'>-	(e_categories_config_set_icon_file_for): use GdkPixbuf to load images</div><div class='del'>-</div><div class='del'>-2001-07-16  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (parse_with_strptime): Generalized function for</div><div class='del'>-	trying a number of strptime() formats on a string.</div><div class='del'>-	(e_time_parse_time): Use parse_with_strptime().</div><div class='del'>-	(e_time_parse_date): New function, analogous to the previous one,</div><div class='del'>-	but uses a number of date formats.</div><div class='del'>-</div><div class='del'>-2001-07-12  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date_and_time): If the string is</div><div class='del'>-	empty, clear the struct tm before returning.</div><div class='del'>-</div><div class='del'>-2001-07-12  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c: Added is_addr_char_no_pipes macro, which specifically</div><div class='del'>-	does not consider '|' ("pipe") to be a legal address character.</div><div class='del'>-	(email_address_extract): Use is_addr_char_no_pipes when looking for</div><div class='del'>-	e-mail addresses to turn into HTML links. (Bug #3940)</div><div class='del'>-</div><div class='del'>-2001-07-05  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c: Added some malloc check stuff.</div><div class='del'>-</div><div class='del'>-2001-07-04  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c (ecmlw_load): load all icons</div><div class='del'>-	and colors for each category</div><div class='del'>-</div><div class='del'>-	(ecmlw_save): save all icons and categories associated with</div><div class='del'>-	each category</div><div class='del'>-</div><div class='del'>-	* e-categories-config.c: use BonoboConf to store/retrieve settings,</div><div class='del'>-	and use ECategoriesMasterListWombat when creating a ECategories</div><div class='del'>-	dialog widget</div><div class='del'>-</div><div class='del'>-2001-07-02  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added</div><div class='del'>-	e-categories-master-list-wombat.c and</div><div class='del'>-	e-categories-master-list-wombat.h.</div><div class='del'>-	(INCLUDES): Added $(BONOBO_CONF_CFLAGS).</div><div class='del'>-</div><div class='del'>-	* e-categories-master-list-wombat.c,</div><div class='del'>-	e-categories-master-list-wombat.h: New class implementing a master</div><div class='del'>-	list that stores its state using bonobo-conf.</div><div class='del'>-</div><div class='del'>-2001-07-02  Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-categories-config.[ch]: new file for a set of functions for</div><div class='del'>-	managing category-related (icons, colors) configuration</div><div class='del'>-</div><div class='del'>-2001-07-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-request.c: New.</div><div class='del'>-	* e-request.h: New.</div><div class='del'>-</div><div class='del'>-2001-06-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (term_eval_and): When ANDing two bools, don't use a</div><div class='del'>-	bitwise AND.</div><div class='del'>-</div><div class='del'>-2001-06-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Split e-db3-utils and e-dbhash off into libedb3util</div><div class='del'>-	so eutil won't depend on db3.</div><div class='del'>-</div><div class='del'>-2001-06-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (parse_values): REmove a silly hardcoded term limit,</div><div class='del'>-	oops forgot about that.</div><div class='del'>-</div><div class='del'>-2001-06-11  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date_and_time): skip any non-digits</div><div class='del'>-	while looking for dates and times. This should fix some translation</div><div class='del'>-	problems. Though there is still a problem with Japanese, where the</div><div class='del'>-	am/pm flag comes before the time so we will skip it incorrectly.</div><div class='del'>-</div><div class='del'>-2001-06-10  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_parse_date_and_time): </div><div class='del'>-	(e_time_parse_time): got rid of '%n' at end of each format string</div><div class='del'>-	for strptime. I don't know how I managed to put them in there.</div><div class='del'>-</div><div class='del'>-2001-05-31  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added db3 cflags.</div><div class='del'>-</div><div class='del'>-	* e-dbhash.c: Made this use db3.</div><div class='del'>-</div><div class='del'>-	* e-db3-utils.c, e-db3-utils.h: New files with some helper</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-2001-05-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c: Remove e_pixmaps_update (moved to libeshell) so</div><div class='del'>-	libeutil won't depend on bonobo.</div><div class='del'>-</div><div class='del'>-2001-05-19  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c (e_gethostbyname_r)</div><div class='del'>-	[HAVE_GETHOSTBYNAME_R &amp;&amp; GETHOSTBYNAME_R_FIVE_ARGS]: Set `*herr'</div><div class='del'>-	to zero if the function returns a non-NULL pointer to the hostent.</div><div class='del'>-	According to the docs, a returned non-NULL hostent always means</div><div class='del'>-	"no error" no matter what the returned value of `herr' is.  [And</div><div class='del'>-	in fact, at least on libc 2.2.3, trying to resolve `localhost'</div><div class='del'>-	sets herr to `HOST_NOT_FOUND' even if the name is resolved</div><div class='del'>-	correctly and the returned hostent is non-NULL.]</div><div class='del'>-</div><div class='del'>-2001-05-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): add</div><div class='del'>-	E_TEXT_TO_HTML_ESCAPE_8BIT to turn non-US-ASCII characters into</div><div class='del'>-	"?"s.</div><div class='del'>-</div><div class='del'>-2001-05-14  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (is_citation): Check for bad utf8.</div><div class='del'>-</div><div class='del'>-2001-05-08  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-path.c (e_path_find_folders): Walk a hierarchy using the</div><div class='del'>-	"/subfolders/" convention and call a callback for each folder</div><div class='del'>-	found.</div><div class='del'>-</div><div class='del'>-2001-05-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_mutex_assert_locked): Debugging routine. (Only</div><div class='del'>-	works for recursive mutexes right now.)</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Don't use g_utf8_next_char</div><div class='del'>-	on text that isn't valid UTF8, since it won't work (and might even</div><div class='del'>-	get into an infinite loop).</div><div class='del'>-</div><div class='del'>-2001-04-29  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (email_address_extract): Make this smarter. Now</div><div class='del'>-	e_text_to_html_full calls it when it sees a '@', and</div><div class='del'>-	email_address_extract deals with scanning both forward and</div><div class='del'>-	backward to find the bounds of the email address. It's still</div><div class='del'>-	fooled by Message-IDs, but there's not a whole lot we can do</div><div class='del'>-	there...</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c (e_gethostbyname_r): Make the Solaris and</div><div class='del'>-	no-gethostbyname_r implementations behave more like the Linux one.</div><div class='del'>-	Document.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS</div><div class='del'>-	(libeutil_la_LIBADD): Change UNICODE_LIBS to GAL_LIBS</div><div class='del'>-</div><div class='del'>-2001-04-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_poolv_get): Modified to match e_strv_get</div><div class='del'>-	behaviour.  Assert on bad cases, and return "" rather than NULL</div><div class='del'>-	for empty/unset strings.</div><div class='del'>-	(e_poolv_new): Simplify the mutex cases, only have a single mutex</div><div class='del'>-	for mempool and hashtable references.</div><div class='del'>-	(e_poolv_set): Simplify mutex code.  Fixed a #ifdef orde prob in</div><div class='del'>-	profile stuff.  Always copy string to our own memory when we add</div><div class='del'>-	it to the hash, even if we free it; I think this would have led to</div><div class='del'>-	dangling references otherwise.</div><div class='del'>-	(e_poolv_destroy): Renamed from poolv_free, for consistency with</div><div class='del'>-	the rest of the allocators here.</div><div class='del'>-	(e_poolv_set): Add optional refcounting code here, not currently</div><div class='del'>-	enabled/used, but should make proper string collection work</div><div class='del'>-	easily.</div><div class='del'>-	(e_poolv_destroy): Unrefcount the strings here.</div><div class='del'>-	(e_poolv_cpy): Add refcounting code here.</div><div class='del'>-</div><div class='del'>-	* e-memory.[ch]: Applied Jacob's patches &lt;jacob@ximian.com&gt; for</div><div class='del'>-	'e-poolv' type, added his name to the authors list.</div><div class='del'>-</div><div class='del'>-2001-04-24  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (check_size): If the buffer is too small, making</div><div class='del'>-	it twice as big does not guarantee it will be big enough. "Duh".</div><div class='del'>-	Also, a bunch of the check_size calls don't seem to be taking</div><div class='del'>-	trailing NULs into account, so add in a +1 here.</div><div class='del'>-</div><div class='del'>-2001-04-24  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-memory, e-msgport.c, e-pilot-map, e-sexp.c:</div><div class='del'>-	Added #include &lt;glib.h&gt; and move corresponding local headers</div><div class='del'>-	to the top to catch missing includes in them. Tip from clahey.</div><div class='del'>-	</div><div class='del'>-2001-04-24  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-host-utils.h: remove prototype for e_gethostbyname_init.</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c (e_gethostbyname_r): don't dynamically allocate</div><div class='del'>-	anything - store everything in the buffer that's passed in.  Also,</div><div class='del'>-	stop using EMutex.  Switch to a static GMutex (so we can</div><div class='del'>-	initialize it without having e_gethostbyname_init).</div><div class='del'>-	(e_gethostbyname_init): removed.</div><div class='del'>-	</div><div class='del'>-2001-04-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Removed attempts to use</div><div class='del'>-	Radek's evil &lt;DATA&gt; hacks, which were just causing me</div><div class='del'>-	(and GtkHTML) grief.</div><div class='del'>-</div><div class='del'>-2001-04-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c: Include glib.h, so that the g_warning in</div><div class='del'>-	e_gethostbyname_r will be treated as a macro and not as an</div><div class='del'>-	unresolved symbol.</div><div class='del'>-</div><div class='del'>-2001-04-22  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): add e-host-utils.[ch]</div><div class='del'>-</div><div class='del'>-	* e-host-utils.c: new file, with e_gethostbyname_r.</div><div class='del'>-</div><div class='del'>-	* e-host-utils.h: new file.</div><div class='del'>-</div><div class='del'>-2001-04-19  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (is_citation): "&gt;From" is not a citation unless</div><div class='del'>-	the previous or following line is a citation.</div><div class='del'>-	(e_text_to_html_full): Update for is_citation change. Also, when</div><div class='del'>-	marking citations, unmangle mbox From-mangling.</div><div class='del'>-	</div><div class='del'>-2001-04-15  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_parse): Start parsing the sexp with</div><div class='del'>-	parse_value(), not parse_list(), because we may have immediate</div><div class='del'>-	values (e.g. "#f") as the whole sexp.</div><div class='del'>-</div><div class='del'>-2001-04-08  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Setup up the conduit library building better so the</div><div class='del'>-	files get disted</div><div class='del'>-</div><div class='del'>-2001-04-06  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (scanner_config): Added a question mark to the set of</div><div class='del'>-	valid characters for symbol names.</div><div class='del'>-	(parse_value): Fixed parsing of boolean values.</div><div class='del'>-	(parse_term_free): Added missing clause for ESEXP_TERM_BOOL.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* ename/test-ename-western-gtk.c: Fix headers.</div><div class='del'>-	</div><div class='del'>-2001-04-03  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.h (ESExpResultType): Added ESEXP_RES_TIME for time</div><div class='del'>-	values.</div><div class='del'>-	(ESExpResult): Added a "time_t value.time" field.</div><div class='del'>-	(ESExpTermType): Added ESEXP_TERM_TIME.</div><div class='del'>-	(ESExpTerm): Added a "time_t value.time" field.</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_result_free): Deal with time values.  Also, be</div><div class='del'>-	more paranoid; added a default clause with g_assert_not_reached().</div><div class='del'>-	(term_eval_lt): Deal with time values.</div><div class='del'>-	(term_eval_gt): Likewise.</div><div class='del'>-	(term_eval_eq): Likewise.</div><div class='del'>-	(term_eval_plus): Likewise.</div><div class='del'>-	(term_eval_sub): Likewise.</div><div class='del'>-	(e_sexp_term_eval): Likewise.</div><div class='del'>-	(eval_dump_result): Likewise.</div><div class='del'>-	(parse_dump_term): Likewise.</div><div class='del'>-	(parse_term_free): Likewise.</div><div class='del'>-</div><div class='del'>-2001-04-01  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.h: new type EPixmap, which is used to cache pixmaps for</div><div class='del'>-	bonobo components. use e_pixmaps_update to load icons into ui</div><div class='del'>-	component.</div><div class='del'>-	* e-gui-utils.c: implementation of EPixmap cache, moved here from</div><div class='del'>-	mail/folder-browser-factory.c.</div><div class='del'>-</div><div class='del'>-2001-03-31  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-url.c (e_url_shroud): Check that first_colon &lt; last_at,</div><div class='del'>-	to prevent horrible things from happening.  Removed spew.</div><div class='del'>-	(e_url_equal): Removed spew.</div><div class='del'>-</div><div class='del'>-2001-03-30  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): Add support for converting</div><div class='del'>-	e-mail addresses to links.</div><div class='del'>-	(is_email_address): Added.  Identifies e-mail addresses.</div><div class='del'>-	(email_address_extract): Added.  Extracts a copy of the e-mail</div><div class='del'>-	address from the text.</div><div class='del'>-</div><div class='del'>-	* e-html-utils.h (E_TEXT_TO_HTML_CONVERT_ADDRESSES): Added.</div><div class='del'>-</div><div class='del'>-	* e-url.c (e_url_shroud): Added.  Copy a url, replacing</div><div class='del'>-	any plaintext passwords with a single *.</div><div class='del'>-	(e_url_equal): Compare two urls, taking into account that</div><div class='del'>-	they may or may not be shrouded.</div><div class='del'>-</div><div class='del'>-2001-03-29  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-corba-utils.h: Remove #include &lt;glib.h&gt;</div><div class='del'>-	* e-dialog-widgets.c: Shuffle some headers.</div><div class='del'>-	* e-dialog-widgets.h: Remove #include &lt;libgnomeui/gnome-propertybox.h&gt;</div><div class='del'>-	* e-gtk-utils.c: #include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-	* e-gtk-utils.h: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-gui-utils.c: Replace #include &lt;gnome.h&gt;</div><div class='del'>-	* e-html-utils.c: Shuffle headers.</div><div class='del'>-	* e-iterator.c: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-iterator.h: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-list-iterator.c: Remove #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-list-iterator.h: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-list.c: Remove #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-list.h: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-memory.c: #include &lt;string.h&gt; and &lt;stdlib.h&gt;</div><div class='del'>-	* e-msgport.c: Move around some includes. s/%d/%ld/g in a printf()</div><div class='del'>-	call to fix a warning.</div><div class='del'>-	* e-pilot-map.c: #include &lt;string.h&gt;. Replace #include &lt;gnome.h&gt;</div><div class='del'>-	* e-pilot-util.c: Remove #include &lt;gnome.h&gt;</div><div class='del'>-	* e-sexp.c: Remove #include &lt;glib.h&gt;</div><div class='del'>-	* e-sexp.h: Replace #include &lt;gtk/gtk.h&gt;</div><div class='del'>-	* e-time-utils.c: #include &lt;string.h&gt;</div><div class='del'>-	* md5-utils.c: Shuffle headers.</div><div class='del'>-	* test-ename-western-gtk.c: Replace #include &lt;gnome.h&gt;</div><div class='del'>-	* test-ename-western.c: Same here.</div><div class='del'>-	</div><div class='del'>-2001-03-20  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html_full): new function, extracted</div><div class='del'>-	from e_text_to_html, added color parameter</div><div class='del'>-</div><div class='del'>-2001-03-19  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): support mark citation</div><div class='del'>-</div><div class='del'>-	* e-html-utils.h (E_TEXT_TO_HTML_MARK_CITATION): added</div><div class='del'>-	E_TEXT_TO_HTML_MARK_CITATION</div><div class='del'>-</div><div class='del'>-2001-03-18  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.c (e_time_format_time): added function to format just</div><div class='del'>-	the time.</div><div class='del'>-</div><div class='del'>-2001-03-16  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-path.c (e_path_to_physical): Fix a bug noticed by kmaraas</div><div class='del'>-</div><div class='del'>-2001-03-15  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (url_extract): Fix a bit: [mailto:foo] shouldn't</div><div class='del'>-	grab the ']'</div><div class='del'>-</div><div class='del'>-2001-03-12  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: update cflag macros</div><div class='del'>-</div><div class='del'>-2001-03-07  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (url_extract): Fix an off-by-one in the "is this</div><div class='del'>-	for real?" check so that "http:// " won't get URLified</div><div class='del'>-</div><div class='del'>-2001-03-04  Damon Chaplin  &lt;damon@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-time-utils.[hc]: new files to contain functions to parse and</div><div class='del'>-	format dates and times for various calendar widgets.</div><div class='del'>-</div><div class='del'>-2001-03-01  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-path.c (e_path_to_physical): New function to turn foo/bar into</div><div class='del'>-	foo/subfolders/bar. The inverse function doesn't exist yet because</div><div class='del'>-	I didn't need it. Also, if the shell were going to use this, we'd</div><div class='del'>-	need a few more tools...</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Add e-path.[ch]</div><div class='del'>-</div><div class='del'>-2001-03-01  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_encode_string): Make it handle a NULL string as</div><div class='del'>-	an empty string.</div><div class='del'>-</div><div class='del'>-2001-02-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_thread_destroy): Wait a lot lot longer for</div><div class='del'>-	threads to finish.</div><div class='del'>-	: Turned off some of the debug.</div><div class='del'>-</div><div class='del'>-2001-02-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (EMemChunk): Changed to allocate raw blocks for the</div><div class='del'>-	data, and keep track of them with an array, this is so the native</div><div class='del'>-	malloc alignment is not lost at the allocation stage.</div><div class='del'>-</div><div class='del'>-2001-01-30  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_thread_destroy): Turn on joining of cancelled threads.</div><div class='del'>-	(e_msgport_wait): Put a cleanup handler to clear the mp lock if it</div><div class='del'>-	happens in cond_wait, since it will be locked again.</div><div class='del'>-</div><div class='del'>-2001-01-29  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_thread_put): If we have waiting threads, then</div><div class='del'>-	dont start a new one for the NEW case.</div><div class='del'>-	(thread_dispatch): For the NEW case, dont exit, just keep running,</div><div class='del'>-	waiting for a new message to come along.</div><div class='del'>-	(e_thread_destroy): When cleaning up NEW threads, cancel any</div><div class='del'>-	non-busy threads.</div><div class='del'>-</div><div class='del'>-2001-01-24  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.h (ESExp): Add chunk allocators.</div><div class='del'>-</div><div class='del'>-	* e-sexp.c: Removed some redundant debug printfs.</div><div class='del'>-	(e_sexp_term_eval): Dont allocate result till we have it. so we</div><div class='del'>-	can have a fatal error, and not leak it.</div><div class='del'>-	(term_eval_plus): If we have to abort, free our arguments.</div><div class='del'>-	(term_eval_sub): Same.</div><div class='del'>-	(parse_new_term): Renamed to parse_term_new for consistency.</div><div class='del'>-	Fixed callers.</div><div class='del'>-	(e_sexp_result_new): Add the esexp as an argument.  Ouch, lots of</div><div class='del'>-	code to change for this.  Allocate blocks from an ememchunk.</div><div class='del'>-	Fixed all callers.</div><div class='del'>-	(e_sexp_result_free): Same as above, free blocks from the</div><div class='del'>-	ememchunk.  Fixed all callers.</div><div class='del'>-	(parse_term_new): </div><div class='del'>-	(parse_term_free): Similarly, add the esexp to the argument, and</div><div class='del'>-	alloc/free from memchunks.  Fixed all local callers.</div><div class='del'>-	(e_sexp_init): Setup the memory chunk allocators.</div><div class='del'>-	(e_sexp_finalise): Destroy memchunk allocators.</div><div class='del'>-</div><div class='del'>-2001-01-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_parse): Setup error return and return error on</div><div class='del'>-	parse error.</div><div class='del'>-	(parse_list): Fail if we have a problem.</div><div class='del'>-	(parse_value): Here too.</div><div class='del'>-	(fatal_error): Fatal error handling function, jumps back to the</div><div class='del'>-	top caller.</div><div class='del'>-	(term_eval_and):</div><div class='del'>-	(e_sexp_term_eval): </div><div class='del'>-	(term_eval_sub): </div><div class='del'>-	(term_eval_plus): </div><div class='del'>-	(term_eval_gt): </div><div class='del'>-	(term_eval_lt): </div><div class='del'>-	(term_eval_or):  Fail on error.</div><div class='del'>-	(e_sexp_term_eval): Added a comment about where this can be</div><div class='del'>-	called, which is only from inside e_sexp_eval().</div><div class='del'>-	(e_sexp_eval): Setup setjmp error handler.</div><div class='del'>-	(e_sexp_error): Error accessor function.</div><div class='del'>-</div><div class='del'>-	* e-sexp.h: Added a longjmp environment to the structure, and an</div><div class='del'>-	error return to parse.	</div><div class='del'>-</div><div class='del'>-2001-01-22  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dbhash.c (md5_to_dbt): New function, can't use strlen on the md5</div><div class='del'>-	hash because it might have null chars in it.</div><div class='del'>-	(e_dbhash_add): use md5_to_dbt</div><div class='del'>-</div><div class='del'>-2001-01-19  JP Rosevear  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_remove_by_pid): Remove an item by pid</div><div class='del'>-	(e_pilot_map_remove_by_uid): ditto for uid</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: new protos</div><div class='del'>-</div><div class='del'>-2001-01-17  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.c (gtk_radio_button_get_nth_selected): New function,</div><div class='del'>-	name describes it well.</div><div class='del'>-	(gtk_radio_button_select_nth): New function.</div><div class='del'>-</div><div class='del'>-2001-01-17  Federico Mena Quintero  &lt;federico@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.[ch]: Ximianified.</div><div class='del'>-</div><div class='del'>-2001-01-15  JP Roseveaer  &lt;jpr@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-util.c (e_pilot_utf8_from_pchar): Dup the string passed</div><div class='del'>-	in, not the temporary string. d'oh.</div><div class='del'>-</div><div class='del'>-2001-01-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c: #define E_THREAD_NONE as ((pthread_t)~0) and use</div><div class='del'>-	that instead of ~0 throughout. (pthread_t is a pointer type on my</div><div class='del'>-	system, so there are lots of warnings without the cast.)</div><div class='del'>-</div><div class='del'>-2000-12-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Merge from camel-mt-branch.</div><div class='del'>-</div><div class='del'>-2000-12-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Check for null strings</div><div class='del'>-	(e_pilot_utf8_from_pchar): ditto</div><div class='del'>-</div><div class='del'>-2000-12-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-util.c (e_pilot_utf8_to_pchar): Convert utf8 strings to</div><div class='del'>-	pilot character set</div><div class='del'>-	(e_pilot_utf8_from_pchar): vice versa</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Conditionally build e-pilot-util.[hc] because</div><div class='del'>-	they depend on pilot-link stuff</div><div class='del'>-</div><div class='del'>-2000-12-23  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msgport.c (e_dlist_length): Util function.</div><div class='del'>-	(e_thread_new): Another new thread primitive.  This one is a</div><div class='del'>-	re-usable 'server thread' thingy.</div><div class='del'>-</div><div class='del'>-2000-12-21  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added msgport stuff.</div><div class='del'>-</div><div class='del'>-	* e-msgport.[ch]: Some thread primitives.  e_dlist, a</div><div class='del'>-	double-linked list (ok, not a thread primitive, but used in ...),</div><div class='del'>-	e_msgport - an asynchronous, non-copying message passing</div><div class='del'>-	rendesvous port, and e_mutex, a portably configurable mutex.</div><div class='del'>-</div><div class='del'>-2000-12-19  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c: Make the code compile without being a gtk object (the</div><div class='del'>-	old code can still be built as a gtk object if required).  Also</div><div class='del'>-	removed some dead code.</div><div class='del'>-	(e_sexp_ref): New function to ref if we're not a gkt object.</div><div class='del'>-	(e_sexp_unref): Same for unref.</div><div class='del'>-</div><div class='del'>-2000-12-13  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): make sure we actually make</div><div class='del'>-	enough space for "&amp;nbsp;".</div><div class='del'>-</div><div class='del'>-2000-12-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_get): Updated</div><div class='del'>-	documentation comment.</div><div class='del'>-</div><div class='del'>-2000-12-04  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-corba-utils.h: New.</div><div class='del'>-</div><div class='del'>-	* e-corba-utils.c: New.</div><div class='del'>-	(e_safe_corba_string): New.</div><div class='del'>-</div><div class='del'>-2000-11-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_strv_new): Fix typename of args (for all funcs).</div><div class='del'>-	(e_strv_set_ref): Assert the index is in range.</div><div class='del'>-	(e_strv_set_ref_free): "</div><div class='del'>-	(e_strv_set): "</div><div class='del'>-	(e_strv_get): "</div><div class='del'>-</div><div class='del'>-2000-11-29  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (term_eval_lt): Plug a memleak, need to free results</div><div class='del'>-	from term_eval().</div><div class='del'>-	(term_eval_gt): </div><div class='del'>-	(term_eval_eq): </div><div class='del'>-</div><div class='del'>-2000-11-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_mempool_new): Added some locking to global data.</div><div class='del'>-	This should make the interfaces mt-safe, although each object is</div><div class='del'>-	only per-thread safe.</div><div class='del'>-</div><div class='del'>-2000-11-22  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_mempool_alloc): If we dont get a big enough chunk</div><div class='del'>-	in the first node, give up.  Otherwise we spend too much time</div><div class='del'>-	searching.</div><div class='del'>-	(e_mempool_strdup): Doh, and allocate enough for the terminating</div><div class='del'>-	NUL at that.</div><div class='del'>-	(e_strv_set_ref_free): New function, set a reference to a string</div><div class='del'>-	that is then owned/free'd by the strv.</div><div class='del'>-	(e_strv_destroy): If there are any strings to destroy, free them</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-2000-11-21  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.c (e_memchunk_alloc0): New function to allocate a</div><div class='del'>-	zero'd out chunk.</div><div class='del'>-	(e_mempool_strdup): New function to strdup into a mempool.</div><div class='del'>-</div><div class='del'>-2000-11-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-memory.[ch]: New routines for fast memory management and</div><div class='del'>-	compact string array storage.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added e-memory.[ch].</div><div class='del'>-</div><div class='del'>-2000-11-09  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dbhash.h: oops thats func not *func</div><div class='del'>-</div><div class='del'>-	* e-dbhash.c (e_dbhash_foreach_key): Memset the data DBT to 0</div><div class='del'>-</div><div class='del'>-2000-11-07  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Build e-dbhash.[hc]</div><div class='del'>-</div><div class='del'>-	* e-dbhash.[hc]: New routines to manage a db database on disk that</div><div class='del'>-	contains md5 hashed data and indexed by uids.  Provides comparison</div><div class='del'>-	functions and such so the caller does not have to do the md5 bits.</div><div class='del'>-</div><div class='del'>-200-10-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: #include &lt;string.h&gt; to quench warning.</div><div class='del'>-	* e-sexp.c: #include &lt;stdlib.h&gt; for same reason.</div><div class='del'>-	</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: build md5-utils</div><div class='del'>-</div><div class='del'>-	* md5-utils.c: Make part of util, get rid of camel stream util</div><div class='del'>-	function include string.h</div><div class='del'>-</div><div class='del'>-	* md5-utils.h: ditto</div><div class='del'>-	</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_lookup_uid): Return null if no</div><div class='del'>-	pnode was found.</div><div class='del'>-</div><div class='del'>-2000-10-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (map_sax_start_element): Get archive field while</div><div class='del'>-	parsing</div><div class='del'>-	(map_write_foreach): Write out archive field</div><div class='del'>-	(e_pilot_map_pid_is_archived): implement</div><div class='del'>-	(e_pilot_map_uid_is_archived): ditto</div><div class='del'>-	(e_pilot_map_insert): Insert new node structures</div><div class='del'>-	(e_pilot_map_lookup_pid): Take into account the list is now</div><div class='del'>-	a list of structures</div><div class='del'>-	(e_pilot_map_lookup_uid): ditto</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c (e_address_western_is_postal): </div><div class='del'>-	unsigned chars.</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_get_one_prefix_at_str):</div><div class='del'>-	cast to unsigned char.</div><div class='del'>-</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Deal properly with URLs at the</div><div class='del'>-	end of the buffer. (The old code would append a "&amp;#0;" to the</div><div class='del'>-	text.)</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_lookup_pid): Lookup a pid by uid.</div><div class='del'>-	(e_pilot_map_lookup_uid): Lookup a uid by pid.</div><div class='del'>-	Now this is wrapped, we can store archive info internally</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: New accessor prototypes</div><div class='del'>-	</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am (INCLUDES): Remove unused GNOMELOCALEDIR</div><div class='del'>-	setting.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c: Operate with EPilotMap structure so things are</div><div class='del'>-	abstract to the caller</div><div class='del'>-	(e_pilot_map_pid_is_archived): Infrastructure for marking records</div><div class='del'>-	as archived</div><div class='del'>-	(e_pilot_map_uid_is_archived): ditto</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: Add more to public interface, including EPilotMap</div><div class='del'>-	structure</div><div class='del'>-	</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c: Pilot map functions grabbed from existing conduits</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h (e_pilot_map_write): Header</div><div class='del'>-</div><div class='del'>-2000-10-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,</div><div class='del'>-	assume it was actually undeclared iso-8859-1 text.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: made the routines use the stardard</div><div class='del'>-	e_strstrcase instead of the included function that existed</div><div class='del'>-	earlier.</div><div class='del'>-</div><div class='del'>-2000-10-11  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c (e_address_western_parse): g_strconcat</div><div class='del'>-	needs to be NULL terminated or it goes funny.</div><div class='del'>-</div><div class='del'>-Tue Sep 26 16:48:49 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS).</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: add ename as a SUBDIR</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-list-iterator.c, e-list.c, e-list.h: Made e_list a bit more</div><div class='del'>-	reentrant.  If a iterator gets its data pulled out from under it</div><div class='del'>-	while in a loop, it goes back one so that loops will be able to</div><div class='del'>-	continue.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed all the files moved to gal.</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: Fixed the #include lines to deal properly</div><div class='del'>-	with gal.</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality</div><div class='del'>-	that was moved to gal.</div><div class='del'>-</div><div class='del'>-	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,</div><div class='del'>-	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,</div><div class='del'>-	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,</div><div class='del'>-	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,</div><div class='del'>-	e-xml-utils.c, e-xml-utils.h: Moved to gal.</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Fixed an uninitialized variable.</div><div class='del'>-</div><div class='del'>-2000-09-12  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c (e_utf8_to_gtk_string_sized): Use underscores</div><div class='del'>-	for untranslatable characters</div><div class='del'>-	(e_utf8_from_gtk_string_sized): Ditto</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c (e_font_from_gdk_font): Change this a bit so that if</div><div class='del'>-	you pass it a bold font, it puts that in font-&gt;bold and finds a</div><div class='del'>-	lighter font for font-&gt;font (if it can). This is for themes like</div><div class='del'>-	Metal where the default font is bold.</div><div class='del'>-	(find_variants): renamed from find_best_bold</div><div class='del'>-	</div><div class='del'>-2000-09-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c (find_best_bold): Thou shalt leave space for the</div><div class='del'>-	trailing \0.</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_strstrcase): The return value should not be</div><div class='del'>-	const. (Well, unless the input was, but you can't know that.)</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c, e-unicode.h: Added e_utf8_gtk_editable_get_text and</div><div class='del'>-	e_utf8_gtk_editable_set_text.</div><div class='del'>-</div><div class='del'>-2000-09-11  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Try to find real bold variant of X font, fall</div><div class='del'>-	to double stroke only if not found</div><div class='del'>-</div><div class='del'>-2000-09-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.c: New.</div><div class='del'>-	(e_gtk_signal_connect_full_while_alive): New.</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.h: New.</div><div class='del'>-</div><div class='del'>-2000-09-08  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Use experimental 16-bit font stuff for EFonts</div><div class='del'>-</div><div class='del'>-2000-09-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.h: remove consts from the EPopupMenu structure: the</div><div class='del'>-	caller may want to modify its own EPopupMenu before calling</div><div class='del'>-	e_popup_menu_run.</div><div class='del'>-</div><div class='del'>-2000-09-07  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_get): Use UTF-8</div><div class='del'>-	(e_dialog_editable_set): Use UTF-8</div><div class='del'>-</div><div class='del'>-	* e-font.c (translate_encoding): More encodings</div><div class='del'>-	(e_gdk_font_encoding): Use experimental stuff</div><div class='del'>-</div><div class='del'>-	* e-unicode.* (e_utf8_gtk_editable_insert_text): New wrapper</div><div class='del'>-	</div><div class='del'>-2000-09-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (emit_event): Remove incorrect optimization.  Events</div><div class='del'>-	are read-only!</div><div class='del'>-</div><div class='del'>-2000-09-04  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c: Added new font code, but comment it out now</div><div class='del'>-	* e-font.h, e-font.c: Test code for font analyzing</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h, e-unicode.c: New functions</div><div class='del'>-	e_utf8_gtk_clist_append, e_utf8_gtk_clist_set_text</div><div class='del'>-	e_unicode_init</div><div class='del'>-</div><div class='del'>-2000-08-31  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Use UTF-8</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (g_unichar_to_utf8): glib 1.3 function</div><div class='del'>-	(gdk_keyval_to_unicode): gdk 1.3 function</div><div class='del'>-	(e_utf8_from_gdk_event_key): Use keyval, not string</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h: #define gnome_font_get_size and</div><div class='del'>-	gnome_font_get_width, and gnome_font_lookup_default,</div><div class='del'>-	if compiling with gnome-print 0.20</div><div class='del'>-</div><div class='del'>-2000-08-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_LIBADD): make e-util depend on</div><div class='del'>-	libunicode</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c (make_item): Use GtkMenuItem rather than</div><div class='del'>-	GtkPixmapMenuItem for items with no pixmaps, so that if the whole</div><div class='del'>-	menu is pixmapless, you don't get a column of blank pixmaps.</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (e_utf8_gtk_menu_item_new_with_label): New wrapper</div><div class='del'>-</div><div class='del'>-2000-08-23  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (e_utf8_strstrcase): New function</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_set): Constify.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c: e_utf8_gtk_editable_get_chars</div><div class='del'>-	e_utf8_gtk_entry_get_text</div><div class='del'>-	e_utf8_gtk_entry_set_text</div><div class='del'>-	e_utf8_to_gtk_string: New convenience functions</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c: Some convenience functions to deal with Gtk+ and UTF-8</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-unicode.h, e-unicode.c</div><div class='del'>-</div><div class='del'>-2000-08-21  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.h:</div><div class='del'>-	* e-font.c: Changed UTF-8 syntax from char-based to byte-based</div><div class='del'>-	</div><div class='del'>-2000-08-21  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Fix a booboo in the tab</div><div class='del'>-	expansion code (didn't use the new value of 'out').</div><div class='del'>-</div><div class='del'>-2000-08-19  Lauris Kaplinski  lauris@helixcode.com</div><div class='del'>-</div><div class='del'>-	* e-font.h: #define e_font_height(f) to save some space</div><div class='del'>-	</div><div class='del'>-2000-08-19  Lauris Kaplinski  lauris@helixcode.com</div><div class='del'>-</div><div class='del'>-	* e-font.h:</div><div class='del'>-	* e-font.c: Thin wrapper around GdkFont to deal with UTF-8 directly</div><div class='del'>-	Also handles bold/italic styling</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (scanner_config): Add "-" to be an acceptable</div><div class='del'>-	first character for an operation -- yaaay subtraction!</div><div class='del'>-</div><div class='del'>-2000-08-11  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Fix the tab expansion</div><div class='del'>-	for when the length would exceed the ten characters that</div><div class='del'>-	we allocated.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-setup.[ch]: Remove. The shell tells the components where</div><div class='del'>-	the evolution homedir is now.</div><div class='del'>-	</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Remove e-setup.c</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): If converting both spaces and</div><div class='del'>-	newlines, then convert tabs too. The joys of pseudo-&lt;PRE&gt;.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: Fix the bug where it truncates the last item</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: Ooops.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added uncompiled e_read_uri function.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c, e-popup-menu.h: Added a hide_mask argument to</div><div class='del'>-	the two popup menu functions.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.c: Added</div><div class='del'>-	e_container_change_tab_order.</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_destroy): Chain the</div><div class='del'>-	destroy handler.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;	</div><div class='del'>-	</div><div class='del'>-	* e-canvas.c (emit_event): Don't bother with </div><div class='del'>-	dereferencing the event pointer.</div><div class='del'>-	(e_canvas_item_set_cursor): Reference our selection</div><div class='del'>-	item; print a debug message. Deref when destroying</div><div class='del'>-	(e_canvas_item_add_selection): Same.</div><div class='del'>-	(e_canvas_item_remove_selection): Same.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_static_la_LDFLAGS): Build both libraries</div><div class='del'>-	(a typo didn't build libeutil.la, only -static.)</div><div class='del'>-</div><div class='del'>-2000-07-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_static_la_LDFLAGS): build static version</div><div class='del'>-	of library for conduit to use</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added a bunch of e_marshal functions.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strstrcase function.</div><div class='del'>-</div><div class='del'>-2000-07-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas-vbox.c: Removed some debugging printfs.</div><div class='del'>-	</div><div class='del'>-	* e-canvas.c (e_canvas_unrealize): Call parent unrealize method.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (eval_dump_result): `#if 0'ed out.</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.h (e_popup_menu_create): New prototype.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c: Fix warnings.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-list.c, e-list.h: Added e_list_duplicate.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strsplit to work around a bug in</div><div class='del'>-	g_strsplit.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-iterator.c, e-iterator.h, e-list-iterator.c,</div><div class='del'>-	e-list-iterator.h: Added last and insert functions.</div><div class='del'>-</div><div class='del'>-2000-07-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: Added docstrings.  This file did not have</div><div class='del'>-	them at all.  EEEEEEK!</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_parse): Kill debugging message</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-iterator.c, e-iterator.h, e-list-iterator.c,</div><div class='del'>-	e-list-iterator.h, e-list.c, e-list.h: New list class with</div><div class='del'>-	iterators.</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Made it so that you don't get the same selection in</div><div class='del'>-	the selection list more than once.</div><div class='del'>-</div><div class='del'>-2000-07-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.h: #include &lt;libgnomeui/gnome-messagebox.h&gt;.  It's</div><div class='del'>-	needed to be able to pass an appropriate @type arg to</div><div class='del'>-	`e_notice()'.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jody Goldberg &lt;jgoldberg@home.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_init) : Init the InputContext members</div><div class='del'>-	(e_canvas_class_init) : Add a handler for unrealize.</div><div class='del'>-	(e_canvas_focus_in) : enable the input context.</div><div class='del'>-	(e_canvas_focus_out) : enable the input context.</div><div class='del'>-	(e_canvas_realize) : Create an input context.</div><div class='del'>-	(e_canvas_unrealize) : New function to release the input context.</div><div class='del'>-</div><div class='del'>-2000-06-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (url_extract): add ")" to the set of characters</div><div class='del'>-	to back up over at the end of a potential URL.</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (get_toggle_value): Use `value_var', not</div><div class='del'>-	`value'.</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): `-I$(top_srcdir)' to fix compilation</div><div class='del'>-	with builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h.</div><div class='del'>-</div><div class='del'>-	* e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like</div><div class='del'>-	a vbox using the reflow system.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c, e-canvas.h: Added a variable to keep track of the</div><div class='del'>-	cursor.  Set the cursor when selection_add is called.  Properly</div><div class='del'>-	unset the cursor at the right times.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Grab the focus when setting the cursor.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c, e-canvas.h: Built a system for doing selections</div><div class='del'>-	and/or a cursor in canvas.</div><div class='del'>-</div><div class='del'>-2000-06-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Changed the needed e_marshal functions.</div><div class='del'>-</div><div class='del'>-	* e-printable.c, e-printable.h: Added a quantize parameter to</div><div class='del'>-	e_printable_height.  Also, added a e_printable_will_fit function.</div><div class='del'>-	</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-printable.c and e-printable.h.</div><div class='del'>-</div><div class='del'>-	* e-printable.c, e-printable.h: This new class is a printing</div><div class='del'>-	context.  Other classes return an EPrintable which represents a</div><div class='del'>-	context for printing that object.</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added</div><div class='del'>-	e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL and</div><div class='del'>-	e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c: Fixed e_marshal_INT__INT_INT_POINTER.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_marshal_INT__INT_INT_POINTER.</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c (g_int_compare): Duh! -1 != 1. :)</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_term_eval): g_return_val_if_fail to prevent a crash.</div><div class='del'>-</div><div class='del'>-2000-05-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_encode_bool): Utility function to build a bool</div><div class='del'>-	as part of an expression string.</div><div class='del'>-	(e_sexp_encode_string): Likewise for strings.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas-utils.c, e-canvas-utils.h: Added</div><div class='del'>-	e_canvas_item_show_area which makes sure that a particular area of</div><div class='del'>-	a given item is in the scroll area.</div><div class='del'>-</div><div class='del'>-2000-05-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (hook_radio): Use the exported function to</div><div class='del'>-	set the value.</div><div class='del'>-	(get_radio_value): Likewise.</div><div class='del'>-	(hook_option_menu): Likewise.</div><div class='del'>-	(get_option_menu_value): Likewise.</div><div class='del'>-	(hook_toggle): Likewise.</div><div class='del'>-	(get_toggle_value): Likewise.</div><div class='del'>-	(hook_spin_button): Likewise.</div><div class='del'>-	(get_spin_button_value): Likewise.</div><div class='del'>-	(hook_editable): Likewise.</div><div class='del'>-	(get_editable_value): Likewise.</div><div class='del'>-	(e_dialog_radio_set): Radio buttons are prepended to their parent</div><div class='del'>-	group's list, so we need to flip the index around when</div><div class='del'>-	getting/setting the value.</div><div class='del'>-	(e_dialog_radio_get): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_set): Moved over from</div><div class='del'>-	event-editor-utils.c.</div><div class='del'>-	(e_dialog_editable_get): Likewise.</div><div class='del'>-	(e_dialog_toggle_set): Likewise.</div><div class='del'>-	(e_dialog_toggle_get): Likewise.</div><div class='del'>-	(e_dialog_spin_set): Likewise.</div><div class='del'>-	(e_dialog_spin_get_double): Likewise.</div><div class='del'>-	(e_dialog_spin_get_int): Likewise.</div><div class='del'>-	(e_dialog_option_menu_set): Likewise, and added a value map.</div><div class='del'>-	(e_dialog_option_menu_get): Likewise.</div><div class='del'>-	(e_dialog_dateedit_set): Likewise.</div><div class='del'>-	(e_dialog_dateedit_get): Likewise.</div><div class='del'>-	(e_dialog_radio_set): New function.</div><div class='del'>-	(e_dialog_radio_get): New function.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-paned.c, e-paned.h: Removed.</div><div class='del'>-</div><div class='del'>-2000-05-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (get_radio_value): Implemented.  Amazing that</div><div class='del'>-	one has to go through so much pain to get a stupid value from</div><div class='del'>-	GTK+.</div><div class='del'>-	(hook_option_menu): Implemented.  Same complaint.</div><div class='del'>-	(get_toggle_value): Implemented.</div><div class='del'>-	(get_spin_button_value): Implemented.</div><div class='del'>-	(get_entry_value): Implemented.</div><div class='del'>-	(e_dialog_widget_hook_value): Function to hook a widget to the</div><div class='del'>-	variable it will modify.</div><div class='del'>-	(e_dialog_get_values): Function to feed the variables from a</div><div class='del'>-	dialog's widgets.</div><div class='del'>-	(e_dialog_xml_widget_hook_value): Function to hook a widget from</div><div class='del'>-	a Glade file.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_write_file.</div><div class='del'>-</div><div class='del'>-2000-05-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.[ch]: New files with utilities for hooking up</div><div class='del'>-	widgets in Glade-generated dialogs.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added e-dialog-widgets.[ch].</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Added e_container_foreach_leaf.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add imagesdir support.</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Added e_create_image_widget for</div><div class='del'>-	glade use.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: xmlGetProp appears to return malloced memory.</div><div class='del'>-	Thus we must free it.</div><div class='del'>-</div><div class='del'>-2000-05-15  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_free_string_list): New function.</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strdup_strip which returns a copy of</div><div class='del'>-	the string with the leading and trailing spaces removed.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_finalise): Destroy the g_scanner when cleaning up.</div><div class='del'>-	(e_sexp_finalise): Free symbol table on finalise.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Remove reflow idle when being destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c: Got rid of some warnings.</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_read_file which takes a filename and</div><div class='del'>-	returns a newly allocated string containing the contents of that</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-05-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.h: #include &lt;glib.h&gt; and &lt;gtk/gtktypeutils.h&gt;.</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_free_object_list): New utility function.</div><div class='del'>-</div><div class='del'>-2000-05-02  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_focus_in): </div><div class='del'>-	(e_canvas_focus_out): set and reset the GTK_HAS_FOCUS flag. We now get</div><div class='del'>-	focus_out events correctly.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_finalise): Free the parse tree if we have one.</div><div class='del'>-	(e_sexp_parse): If we already have a parse tree, free it.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-</div><div class='del'>-2000-05-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c, e-xml-utils.h: Constified all the functions.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Moved here from the mailer,</div><div class='del'>-	since it's of general use, and the composer needs it too.</div><div class='del'>-</div><div class='del'>-2000-04-24  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: New file.  Implements easy to use popup menus. </div><div class='del'>-</div><div class='del'>-2000-04-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-paned.c: New file. Makes a GtkPaned with more than two</div><div class='del'>-	children.</div><div class='del'>-	* e-paned.h: same.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added e-paned.[ch].</div><div class='del'>-</div><div class='del'>-2000-04-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c, e-xml-utils.h: Added</div><div class='del'>-	e_xml_get_child_by_name_by_lang.</div><div class='del'>-</div><div class='del'>-2000-04-16  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-      * e-canvas.c (e_canvas_class_init): Add realize.</div><div class='del'>-      (e_canvas_realize): Set the back pixmap to NULL to reduce flicker.</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: Fixing a warning.</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: Add g_return_if_fails.</div><div class='del'>-</div><div class='del'>-2000-04-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Added proper keyboard focus handling.</div><div class='del'>-</div><div class='del'>-2000-04-06  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory</div><div class='del'>-	via gnome-config.</div><div class='del'>-	(mkdir_if_necessary): New function.</div><div class='del'>-	(e_setup_base_dir): Use mkdir_if_necessary().</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-sexp.h: Formatting cleanup.</div><div class='del'>-</div><div class='del'>-2000-03-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -&gt; e-sexp.h.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to</div><div class='del'>-	speed up reflow and to make it fail less often.</div><div class='del'>-</div><div class='del'>-2000-03-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for</div><div class='del'>-	doing hierarchical displays in the canvas.  Adds an extra idle</div><div class='del'>-	loop to the canvas system.</div><div class='del'>-</div><div class='del'>-2000-03-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c: Fixed e_xml_set_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-2000-03-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added</div><div class='del'>-	e_xml_set_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-sexp.[ch]: Added.  moved from filter-sexp.[ch]</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_a_SOURCES): Add e-sexp.</div><div class='del'>-	(noinst_LTLIBRARIES): Changed to a libtool library.</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added</div><div class='del'>-	e_xml_get_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am: Added e-util.c.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.h: Added e-util.c functions.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.c: New file for compare functions</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-canvas-utils.h: Fixed the comment at the top and added</div><div class='del'>-	#ifndef __E_CANVAS_UTILS__.</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am: Added e-xml-utils.c and</div><div class='del'>-	e-xml-utils.h.</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some</div><div class='del'>-	xml utilities.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.h: Added type EFocus which describes which</div><div class='del'>-	direction the focus will be coming from.</div><div class='del'>-</div><div class='del'>-2000-02-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-setup.c (e_setup_base_dir): Make ~/evolution mode 700</div><div class='del'>-	rather than mode 600 (and use the symbolic name rather than the</div><div class='del'>-	number).</div><div class='del'>-	</div><div class='del'>-2000-02-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/Makefile.am: Add canvas utilities to libeutil.</div><div class='del'>-</div><div class='head'>diff --git a/e-util/Makefile.am b/e-util/Makefile.am<br/>deleted file mode 100644<br/>index ebcb439c4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,99 +0,0 @@</div><div class='del'>-SUBDIRS = . ename</div><div class='del'>-</div><div class='del'>-imagesdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-INCLUDES =								\</div><div class='del'>-	-I$(top_srcdir)							\</div><div class='del'>-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"				\</div><div class='del'>-	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-utils\"					\</div><div class='del'>-	$(DB3_CFLAGS)							\</div><div class='del'>-	$(PISOCK_CFLAGS)						\</div><div class='del'>-	$(E_UTIL_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES = libeutil.la libeutil-static.la \</div><div class='del'>-	libeconduit.la libeconduit-static.la \</div><div class='del'>-	libedb3util.la</div><div class='del'>-</div><div class='del'>-libeutil_la_SOURCES =				\</div><div class='del'>-	e-bonobo-factory-util.c			\</div><div class='del'>-	e-bonobo-factory-util.h			\</div><div class='del'>-	e-categories-master-list-wombat.c	\</div><div class='del'>-	e-categories-master-list-wombat.h	\</div><div class='del'>-	e-categories-config.c			\</div><div class='del'>-	e-categories-config.h			\</div><div class='del'>-	e-corba-utils.c				\</div><div class='del'>-	e-corba-utils.h				\</div><div class='del'>-	e-dialog-utils.c			\</div><div class='del'>-	e-dialog-utils.h			\</div><div class='del'>-	e-dialog-widgets.c			\</div><div class='del'>-	e-dialog-widgets.h			\</div><div class='del'>-	e-gtk-utils.c				\</div><div class='del'>-	e-gtk-utils.h				\</div><div class='del'>-	e-gui-utils.c				\</div><div class='del'>-	e-gui-utils.h				\</div><div class='del'>-	e-host-utils.c				\</div><div class='del'>-	e-host-utils.h				\</div><div class='del'>-	e-html-utils.c				\</div><div class='del'>-	e-html-utils.h				\</div><div class='del'>-	e-iterator.c				\</div><div class='del'>-	e-iterator.h				\</div><div class='del'>-	e-lang-utils.c				\</div><div class='del'>-	e-lang-utils.h				\</div><div class='del'>-	e-list-iterator.c			\</div><div class='del'>-	e-list-iterator.h			\</div><div class='del'>-	e-list.c				\</div><div class='del'>-	e-list.h				\</div><div class='del'>-	e-memory.c				\</div><div class='del'>-	e-memory.h				\</div><div class='del'>-	e-mktemp.c				\</div><div class='del'>-	e-mktemp.h				\</div><div class='del'>-	e-msgport.c				\</div><div class='del'>-	e-msgport.h				\</div><div class='del'>-	e-passwords.c				\</div><div class='del'>-	e-passwords.h				\</div><div class='del'>-	e-path.c				\</div><div class='del'>-	e-path.h				\</div><div class='del'>-	e-request.c				\</div><div class='del'>-	e-request.h				\</div><div class='del'>-	e-sexp.c				\</div><div class='del'>-	e-sexp.h				\</div><div class='del'>-	e-time-utils.c				\</div><div class='del'>-	e-time-utils.h				\</div><div class='del'>-	e-url.c					\</div><div class='del'>-	e-url.h					\</div><div class='del'>-	md5-utils.c				\</div><div class='del'>-	md5-utils.h</div><div class='del'>-</div><div class='del'>-libeutil_la_LIBADD = $(E_UTIL_LIBS)</div><div class='del'>-</div><div class='del'>-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)</div><div class='del'>-libeutil_static_la_LIBADD  = $(libeutil_la_LIBADD)</div><div class='del'>-libeutil_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-pilot_sources = \</div><div class='del'>-	e-pilot-map.c		\</div><div class='del'>-	e-pilot-map.h		\</div><div class='del'>-	e-pilot-settings.c	\</div><div class='del'>-	e-pilot-settings.h	\</div><div class='del'>-	e-pilot-util.c		\</div><div class='del'>-	e-pilot-util.h</div><div class='del'>-</div><div class='del'>-if ENABLE_PILOT_CONDUITS</div><div class='del'>-pilot_compile = $(pilot_sources)</div><div class='del'>-else</div><div class='del'>-pilot_compile = </div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-libeconduit_la_SOURCES = $(pilot_compile)</div><div class='del'>-</div><div class='del'>-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)</div><div class='del'>-libeconduit_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(pilot_sources)</div><div class='del'>-</div><div class='del'>-libedb3util_la_SOURCES =		\</div><div class='del'>-	e-db3-utils.c			\</div><div class='del'>-	e-db3-utils.h			\</div><div class='del'>-	e-dbhash.c			\</div><div class='del'>-	e-dbhash.h</div><div class='head'>diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c<br/>deleted file mode 100644<br/>index 9dd8a17b60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-bit-array.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-bit-array.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,429 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-bit-array.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-bit-array.h"</div><div class='del'>-#include "gal/util/e-util.h"</div><div class='del'>-</div><div class='del'>-#define EBA_CLASS(e) ((EBitArrayClass *)((GtkObject *)e)-&gt;klass)</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-#define ONES ((guint32) 0xffffffff)</div><div class='del'>-</div><div class='del'>-#define BOX(n) ((n) / 32)</div><div class='del'>-#define OFFSET(n) (31 - ((n) % 32))</div><div class='del'>-#define BITMASK(n) ((guint32)(((guint32) 0x1) &lt;&lt; OFFSET((n))))</div><div class='del'>-#define BITMASK_LEFT(n) ((((n) % 32) == 0) ? 0 : (ONES &lt;&lt; (32 - ((n) % 32))))</div><div class='del'>-#define BITMASK_RIGHT(n) ((guint32)(((guint32) ONES) &gt;&gt; ((n) % 32)))</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_bit_array_insert_real(EBitArray *eba, int row)</div><div class='del'>-{</div><div class='del'>-	int box;</div><div class='del'>-	int i;</div><div class='del'>-	if(eba-&gt;bit_count &gt;= 0) {</div><div class='del'>-		/* Add another word if needed. */</div><div class='del'>-		if ((eba-&gt;bit_count &amp; 0x1f) == 0) {</div><div class='del'>-			eba-&gt;data = g_renew(guint32, eba-&gt;data, (eba-&gt;bit_count &gt;&gt; 5) + 1);</div><div class='del'>-			eba-&gt;data[eba-&gt;bit_count &gt;&gt; 5] = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* The box is the word that our row is in. */</div><div class='del'>-		box = BOX(row);</div><div class='del'>-		/* Shift all words to the right of our box right one bit. */</div><div class='del'>-		for (i = eba-&gt;bit_count &gt;&gt; 5; i &gt; box; i--) {</div><div class='del'>-			eba-&gt;data[i] = (eba-&gt;data[i] &gt;&gt; 1) | (eba-&gt;data[i - 1] &lt;&lt; 31);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Shift right half of box one bit to the right. */</div><div class='del'>-		eba-&gt;data[box] = (eba-&gt;data[box] &amp; BITMASK_LEFT(row)) | ((eba-&gt;data[box] &amp; BITMASK_RIGHT(row)) &gt;&gt; 1);</div><div class='del'>-		eba-&gt;bit_count ++;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_bit_array_delete_real(EBitArray *eba, int row, gboolean move_selection_mode)</div><div class='del'>-{</div><div class='del'>-	int box;</div><div class='del'>-	int i;</div><div class='del'>-	int last;</div><div class='del'>-	int selected = FALSE;</div><div class='del'>-	if(eba-&gt;bit_count &gt;= 0) {</div><div class='del'>-		guint32 bitmask;</div><div class='del'>-		box = row &gt;&gt; 5;</div><div class='del'>-		last = eba-&gt;bit_count &gt;&gt; 5;</div><div class='del'>-</div><div class='del'>-		/* Build bitmasks for the left and right half of the box */</div><div class='del'>-		bitmask = BITMASK_RIGHT(row) &gt;&gt; 1;</div><div class='del'>-		if (move_selection_mode)</div><div class='del'>-			selected = e_bit_array_value_at(eba, row);</div><div class='del'>-		/* Shift right half of box one bit to the left. */</div><div class='del'>-		eba-&gt;data[box] = (eba-&gt;data[box] &amp; BITMASK_LEFT(row))| ((eba-&gt;data[box] &amp; bitmask) &lt;&lt; 1);</div><div class='del'>-</div><div class='del'>-		/* Shift all words to the right of our box left one bit. */</div><div class='del'>-		if (box &lt; last) {</div><div class='del'>-			eba-&gt;data[box] &amp;= eba-&gt;data[box + 1] &gt;&gt; 31;</div><div class='del'>-</div><div class='del'>-			for (i = box + 1; i &lt; last; i++) {</div><div class='del'>-				eba-&gt;data[i] = (eba-&gt;data[i] &lt;&lt; 1) | (eba-&gt;data[i + 1] &gt;&gt; 31);</div><div class='del'>-			}</div><div class='del'>-			/* this over-runs our memory! */</div><div class='del'>-			/*eba-&gt;data[i] = eba-&gt;data[i] &lt;&lt; 1; */</div><div class='del'>-		}</div><div class='del'>-		eba-&gt;bit_count --;</div><div class='del'>-		/* Remove the last word if not needed. */</div><div class='del'>-		if ((eba-&gt;bit_count &amp; 0x1f) == 0) {</div><div class='del'>-			eba-&gt;data = g_renew(guint32, eba-&gt;data, eba-&gt;bit_count &gt;&gt; 5);</div><div class='del'>-		}</div><div class='del'>-		if (move_selection_mode &amp;&amp; selected) {</div><div class='del'>-			e_bit_array_select_single_row (eba, row &gt; 0 ? row - 1 : 0);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME : Improve efficiency here. */</div><div class='del'>-void</div><div class='del'>-e_bit_array_delete(EBitArray *eba, int row, int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		e_bit_array_delete_real(eba, row, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME : Improve efficiency here. */</div><div class='del'>-void</div><div class='del'>-e_bit_array_delete_single_mode(EBitArray *eba, int row, int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		e_bit_array_delete_real(eba, row, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME : Improve efficiency here. */</div><div class='del'>-void</div><div class='del'>-e_bit_array_insert(EBitArray *eba, int row, int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; count; i++)</div><div class='del'>-		e_bit_array_insert_real(eba, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Implement this more efficiently. */</div><div class='del'>-void</div><div class='del'>-e_bit_array_move_row(EBitArray *eba, int old_row, int new_row)</div><div class='del'>-{</div><div class='del'>-	e_bit_array_delete_real(eba, old_row, FALSE);</div><div class='del'>-	e_bit_array_insert_real(eba, new_row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eba_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EBitArray *eba;</div><div class='del'>-</div><div class='del'>-	eba = E_BIT_ARRAY (object);</div><div class='del'>-</div><div class='del'>-	g_free(eba-&gt;data);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_is_row_selected</div><div class='del'>- * @selection: #EBitArray to check</div><div class='del'>- * @n: The row to check</div><div class='del'>- *</div><div class='del'>- * This routine calculates whether the given row is selected.</div><div class='del'>- *</div><div class='del'>- * Returns: %TRUE if the given row is selected</div><div class='del'>- */</div><div class='del'>-gboolean</div><div class='del'>-e_bit_array_value_at (EBitArray *eba,</div><div class='del'>-		      gint             n)</div><div class='del'>-{</div><div class='del'>-	if (eba-&gt;bit_count &lt; n || eba-&gt;bit_count == 0)</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return (eba-&gt;data[BOX(n)] &gt;&gt; OFFSET(n)) &amp; 0x1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_foreach</div><div class='del'>- * @selection: #EBitArray to traverse</div><div class='del'>- * @callback: The callback function to call back.</div><div class='del'>- * @closure: The closure</div><div class='del'>- *</div><div class='del'>- * This routine calls the given callback function once for each</div><div class='del'>- * selected row, passing closure as the closure.</div><div class='del'>- */</div><div class='del'>-void </div><div class='del'>-e_bit_array_foreach (EBitArray *eba,</div><div class='del'>-		     EForeachFunc     callback,</div><div class='del'>-		     gpointer         closure)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int last = (eba-&gt;bit_count + 31) / 32;</div><div class='del'>-	for (i = 0; i &lt; last; i++) {</div><div class='del'>-		if (eba-&gt;data[i]) {</div><div class='del'>-			int j;</div><div class='del'>-			guint32 value = eba-&gt;data[i];</div><div class='del'>-			for (j = 0; j &lt; 32; j++) {</div><div class='del'>-				if (value &amp; 0x80000000) {</div><div class='del'>-					callback(i * 32 + j, closure);</div><div class='del'>-				}</div><div class='del'>-				value &lt;&lt;= 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_clear</div><div class='del'>- * @selection: #EBitArray to clear</div><div class='del'>- *</div><div class='del'>- * This routine clears the selection to no rows selected.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_bit_array_clear(EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	g_free(eba-&gt;data);</div><div class='del'>-	eba-&gt;data = NULL;</div><div class='del'>-	eba-&gt;bit_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define PART(x,n) (((x) &amp; (0x01010101 &lt;&lt; n)) &gt;&gt; n)</div><div class='del'>-#define SECTION(x, n) (((x) &gt;&gt; (n * 8)) &amp; 0xff)</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_selected_count</div><div class='del'>- * @selection: #EBitArray to count</div><div class='del'>- *</div><div class='del'>- * This routine calculates the number of rows selected.</div><div class='del'>- *</div><div class='del'>- * Returns: The number of rows selected in the given model.</div><div class='del'>- */</div><div class='del'>-gint</div><div class='del'>-e_bit_array_selected_count (EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	gint count;</div><div class='del'>-	int i;</div><div class='del'>-	int last;</div><div class='del'>-</div><div class='del'>-	if (!eba-&gt;data)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	count = 0;</div><div class='del'>-</div><div class='del'>-	last = BOX(eba-&gt;bit_count - 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt;= last; i++) {</div><div class='del'>-		int j;</div><div class='del'>-		guint32 thiscount = 0;</div><div class='del'>-		for (j = 0; j &lt; 8; j++)</div><div class='del'>-			thiscount += PART(eba-&gt;data[i], j);</div><div class='del'>-		for (j = 0; j &lt; 4; j++)</div><div class='del'>-			count += SECTION(thiscount, j);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_select_all</div><div class='del'>- * @selection: #EBitArray to select all</div><div class='del'>- *</div><div class='del'>- * This routine selects all the rows in the given</div><div class='del'>- * #EBitArray.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_bit_array_select_all (EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (!eba-&gt;data)</div><div class='del'>-		eba-&gt;data = g_new0 (guint32, (eba-&gt;bit_count + 31) / 32);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; (eba-&gt;bit_count + 31) / 32; i ++) {</div><div class='del'>-		eba-&gt;data[i] = ONES;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* need to zero out the bits corresponding to the rows not</div><div class='del'>-	   selected in the last full 32 bit mask */</div><div class='del'>-	if (eba-&gt;bit_count % 32) {</div><div class='del'>-		int unselected_mask = 0;</div><div class='del'>-		int num_unselected_in_last_byte = 32 - eba-&gt;bit_count % 32;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; num_unselected_in_last_byte; i ++)</div><div class='del'>-			unselected_mask |= 1 &lt;&lt; i;</div><div class='del'>-</div><div class='del'>-		eba-&gt;data[(eba-&gt;bit_count + 31) / 32 - 1] &amp;= ~unselected_mask;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/** </div><div class='del'>- * e_selection_model_invert_selection</div><div class='del'>- * @selection: #EBitArray to invert</div><div class='del'>- *</div><div class='del'>- * This routine inverts all the rows in the given</div><div class='del'>- * #EBitArray.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_bit_array_invert_selection (EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!eba-&gt;data)</div><div class='del'>-		eba-&gt;data = g_new0 (guint32, (eba-&gt;bit_count + 31) / 32);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; (eba-&gt;bit_count + 31) / 32; i ++) {</div><div class='del'>-		eba-&gt;data[i] = ~eba-&gt;data[i];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_bit_array_bit_count (EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	return eba-&gt;bit_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_bit_array_cross_and           (EBitArray    *eba)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; eba-&gt;bit_count / 32; i++) {</div><div class='del'>-		if (eba-&gt;data[i] != ONES)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	if ((eba-&gt;bit_count % 32) &amp;&amp; ((eba-&gt;data[i] &amp; BITMASK_LEFT(eba-&gt;bit_count)) != BITMASK_LEFT(eba-&gt;bit_count)))</div><div class='del'>-		return FALSE;</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_bit_array_cross_or            (EBitArray    *eba)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; eba-&gt;bit_count / 32; i++) {</div><div class='del'>-		if (eba-&gt;data[i] != 0)</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-	if ((eba-&gt;bit_count % 32) &amp;&amp; ((eba-&gt;data[i] &amp; BITMASK_LEFT(eba-&gt;bit_count)) != 0))</div><div class='del'>-		return TRUE;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define OPERATE(object, i,mask,grow) ((grow) ? (((object)-&gt;data[(i)]) |= ((guint32) ~(mask))) : (((object)-&gt;data[(i)]) &amp;= (mask)))</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_bit_array_change_one_row(EBitArray *eba, int row, gboolean grow)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	i = BOX(row);</div><div class='del'>-</div><div class='del'>-	OPERATE(eba, i, ~BITMASK(row), grow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_bit_array_change_range(EBitArray *eba, int start, int end, gboolean grow)</div><div class='del'>-{</div><div class='del'>-	int i, last;</div><div class='del'>-	if (start != end) {</div><div class='del'>-		i = BOX(start);</div><div class='del'>-		last = BOX(end);</div><div class='del'>-</div><div class='del'>-		if (i == last) {</div><div class='del'>-			OPERATE(eba, i, BITMASK_LEFT(start) | BITMASK_RIGHT(end), grow);</div><div class='del'>-		} else {</div><div class='del'>-			OPERATE(eba, i, BITMASK_LEFT(start), grow);</div><div class='del'>-			if (grow)</div><div class='del'>-				for (i ++; i &lt; last; i++)</div><div class='del'>-					eba-&gt;data[i] = ONES;</div><div class='del'>-			else</div><div class='del'>-				for (i ++; i &lt; last; i++)</div><div class='del'>-					eba-&gt;data[i] = 0;</div><div class='del'>-			OPERATE(eba, i, BITMASK_RIGHT(end), grow);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_bit_array_select_single_row (EBitArray *eba, int row)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; ((eba-&gt;bit_count + 31) / 32); i++) {</div><div class='del'>-		if (!((i == BOX(row) &amp;&amp; eba-&gt;data[i] == BITMASK(row)) ||</div><div class='del'>-		      (i != BOX(row) &amp;&amp; eba-&gt;data[i] == 0))) {</div><div class='del'>-			g_free(eba-&gt;data);</div><div class='del'>-			eba-&gt;data = g_new0(guint32, (eba-&gt;bit_count + 31) / 32);</div><div class='del'>-			eba-&gt;data[BOX(row)] = BITMASK(row);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_bit_array_toggle_single_row (EBitArray *eba, int row)</div><div class='del'>-{</div><div class='del'>-	if (eba-&gt;data[BOX(row)] &amp; BITMASK(row))</div><div class='del'>-		eba-&gt;data[BOX(row)] &amp;= ~BITMASK(row);</div><div class='del'>-	else</div><div class='del'>-		eba-&gt;data[BOX(row)] |= BITMASK(row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_bit_array_init (EBitArray *eba)</div><div class='del'>-{</div><div class='del'>-	eba-&gt;data = NULL;</div><div class='del'>-	eba-&gt;bit_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_bit_array_class_init (EBitArrayClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = eba_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE(e_bit_array, "EBitArray", EBitArray,</div><div class='del'>-	    e_bit_array_class_init, e_bit_array_init, PARENT_TYPE)</div><div class='del'>-</div><div class='del'>-EBitArray *</div><div class='del'>-e_bit_array_new (int count)</div><div class='del'>-{</div><div class='del'>-	EBitArray *eba = gtk_type_new (e_bit_array_get_type ());</div><div class='del'>-	eba-&gt;bit_count = count;</div><div class='del'>-	eba-&gt;data = g_new0(guint32, (eba-&gt;bit_count + 31) / 32);</div><div class='del'>-	return eba;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h<br/>deleted file mode 100644<br/>index c06f405ede..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-bit-array.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-bit-array.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-bit-array.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_BIT_ARRAY_H_</div><div class='del'>-#define _E_BIT_ARRAY_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_BIT_ARRAY_TYPE        (e_bit_array_get_type ())</div><div class='del'>-#define E_BIT_ARRAY(o)          (GTK_CHECK_CAST ((o), E_BIT_ARRAY_TYPE, EBitArray))</div><div class='del'>-#define E_BIT_ARRAY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BIT_ARRAY_TYPE, EBitArrayClass))</div><div class='del'>-#define E_IS_BIT_ARRAY(o)       (GTK_CHECK_TYPE ((o), E_BIT_ARRAY_TYPE))</div><div class='del'>-#define E_IS_BIT_ARRAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BIT_ARRAY_TYPE))</div><div class='del'>-</div><div class='del'>-#ifndef _E_FOREACH_FUNC_H_</div><div class='del'>-#define _E_FOREACH_FUNC_H_</div><div class='del'>-typedef void (*EForeachFunc) (int model_row,</div><div class='del'>-			      gpointer closure);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject base;</div><div class='del'>-</div><div class='del'>-	gint bit_count;</div><div class='del'>-        guint32 *data;</div><div class='del'>-} EBitArray;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-} EBitArrayClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_bit_array_get_type            (void);</div><div class='del'>-EBitArray *e_bit_array_new                 (int           count);</div><div class='del'>-</div><div class='del'>-gboolean   e_bit_array_value_at            (EBitArray    *selection,</div><div class='del'>-					    gint          n);</div><div class='del'>-void       e_bit_array_foreach             (EBitArray    *selection,</div><div class='del'>-					    EForeachFunc  callback,</div><div class='del'>-					    gpointer      closure);</div><div class='del'>-void       e_bit_array_clear               (EBitArray    *selection);</div><div class='del'>-gint       e_bit_array_selected_count      (EBitArray    *selection);</div><div class='del'>-void       e_bit_array_select_all          (EBitArray    *selection);</div><div class='del'>-void       e_bit_array_invert_selection    (EBitArray    *selection);</div><div class='del'>-int        e_bit_array_bit_count           (EBitArray    *selection);</div><div class='del'>-void       e_bit_array_change_one_row      (EBitArray    *selection,</div><div class='del'>-					    int           row,</div><div class='del'>-					    gboolean      grow);</div><div class='del'>-void       e_bit_array_change_range        (EBitArray    *selection,</div><div class='del'>-					    int           start,</div><div class='del'>-					    int           end,</div><div class='del'>-					    gboolean      grow);</div><div class='del'>-void       e_bit_array_select_single_row   (EBitArray    *eba,</div><div class='del'>-					    int           row);</div><div class='del'>-void       e_bit_array_toggle_single_row   (EBitArray    *eba,</div><div class='del'>-					    int           row);</div><div class='del'>-</div><div class='del'>-void       e_bit_array_insert              (EBitArray    *esm,</div><div class='del'>-					    int           row,</div><div class='del'>-					    int           count);</div><div class='del'>-void       e_bit_array_delete              (EBitArray    *esm,</div><div class='del'>-					    int           row,</div><div class='del'>-					    int           count);</div><div class='del'>-void       e_bit_array_delete_single_mode  (EBitArray    *esm,</div><div class='del'>-					    int           row,</div><div class='del'>-					    int           count);</div><div class='del'>-void       e_bit_array_move_row            (EBitArray    *esm,</div><div class='del'>-					    int           old_row,</div><div class='del'>-					    int           new_row);</div><div class='del'>-gint       e_bit_array_bit_count           (EBitArray    *esm);</div><div class='del'>-</div><div class='del'>-gboolean   e_bit_array_cross_and           (EBitArray    *esm);</div><div class='del'>-gboolean   e_bit_array_cross_or            (EBitArray    *esm);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* _E_BIT_ARRAY_H_ */</div><div class='head'>diff --git a/e-util/e-bonobo-factory-util.c b/e-util/e-bonobo-factory-util.c<br/>deleted file mode 100644<br/>index 560bfc57c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-bonobo-factory-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-bonobo-factory-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-bonobo-factory-util.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-bonobo-factory-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;X11/Xlib.h&gt;</div><div class='del'>-#include &lt;gdk/gdkprivate.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-BonoboGenericFactory *</div><div class='del'>-e_bonobo_generic_factory_multi_display_new (const char *factory_iid,</div><div class='del'>-					    GnomeFactoryCallback factory_callback,</div><div class='del'>-					    void *factory_callback_data)</div><div class='del'>-{</div><div class='del'>-	BonoboGenericFactory *factory;</div><div class='del'>-	char *registration_id;</div><div class='del'>-	char *display_string;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (factory_iid != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (factory_callback != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	display_string = DisplayString (gdk_display);</div><div class='del'>-        registration_id = oaf_make_registration_id (factory_iid, display_string);</div><div class='del'>-	factory = bonobo_generic_factory_new_multi (registration_id, factory_callback, factory_callback_data);</div><div class='del'>-</div><div class='del'>-	g_free (registration_id);</div><div class='del'>-	XFree (display_string);</div><div class='del'>-</div><div class='del'>-	return factory;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-bonobo-factory-util.h b/e-util/e-bonobo-factory-util.h<br/>deleted file mode 100644<br/>index 4b20ed6351..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-bonobo-factory-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-bonobo-factory-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-bonobo-factory-util.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_BONOBO_FACTORY_UTIL_H</div><div class='del'>-#define E_BONOBO_FACTORY_UTIL_H</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-BonoboGenericFactory *e_bonobo_generic_factory_multi_display_new  (const char           *factory_iid,</div><div class='del'>-								   GnomeFactoryCallback  factory_callback,</div><div class='del'>-								   void                 *factory_callback_data);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c<br/>deleted file mode 100644<br/>index 72db8e572c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-categories-config.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-categories-config.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,204 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Categories configuration.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-categories.h&gt;</div><div class='del'>-#include "e-categories-config.h"</div><div class='del'>-#include "e-categories-master-list-wombat.h"</div><div class='del'>-</div><div class='del'>-static gboolean initialized = FALSE;</div><div class='del'>-static ECategoriesMasterListWombat *ecmlw = NULL;</div><div class='del'>-static GHashTable *icons_table = NULL;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-initialize_categories_config (void)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (initialized == FALSE);</div><div class='del'>-</div><div class='del'>-	ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (e_categories_master_list_wombat_new ());</div><div class='del'>-	icons_table = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	/* FIXME: must free the two objects above when exiting */</div><div class='del'>-</div><div class='del'>-	initialized = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_get_color_for:</div><div class='del'>- * @category: Category to get the color for.</div><div class='del'>- *</div><div class='del'>- * Returns the representation of the color configured for the given</div><div class='del'>- * category</div><div class='del'>- *</div><div class='del'>- * Returns: An X color specification.</div><div class='del'>- */</div><div class='del'>-const char *</div><div class='del'>-e_categories_config_get_color_for (const char *category)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (category != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!initialized)</div><div class='del'>-		initialize_categories_config ();</div><div class='del'>-</div><div class='del'>-	for (n = 0;</div><div class='del'>-	     n &lt; e_categories_master_list_count (E_CATEGORIES_MASTER_LIST (ecmlw));</div><div class='del'>-	     n++) {</div><div class='del'>-		char *tmp_cat;</div><div class='del'>-</div><div class='del'>-		tmp_cat = (char *) e_categories_master_list_nth (E_CATEGORIES_MASTER_LIST (ecmlw), n);</div><div class='del'>-		if (tmp_cat &amp;&amp; !strcmp (tmp_cat, category))</div><div class='del'>-			return e_categories_master_list_nth_color (E_CATEGORIES_MASTER_LIST (ecmlw), n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL; /* not found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_set_color_for</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_categories_config_set_color_for (const char *category, const char *color)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: implement */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_get_icon_for:</div><div class='del'>- * @category: Category for which to get the icon.</div><div class='del'>- * @icon: A pointer to where the pixmap will be returned.</div><div class='del'>- * @mask: A pointer to where the mask will be returned.</div><div class='del'>- *</div><div class='del'>- * Returns the icon (and associated mask) configured for the</div><div class='del'>- * given category.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_categories_config_get_icon_for (const char *category, GdkPixmap **pixmap, GdkBitmap **mask)</div><div class='del'>-{</div><div class='del'>-	char *icon_file;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	GdkBitmap *tmp_mask;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (pixmap != NULL);</div><div class='del'>-</div><div class='del'>-	icon_file = (char *) e_categories_config_get_icon_file_for (category);</div><div class='del'>-	if (!icon_file) {</div><div class='del'>-		*pixmap = NULL;</div><div class='del'>-		if (mask != NULL)</div><div class='del'>-			*mask = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* load the icon in our list */</div><div class='del'>-	pixbuf = g_hash_table_lookup (icons_table, icon_file);</div><div class='del'>-	if (!pixbuf) {</div><div class='del'>-		pixbuf = gdk_pixbuf_new_from_file (icon_file);</div><div class='del'>-		if (!pixbuf) {</div><div class='del'>-			*pixmap = NULL;</div><div class='del'>-			if (mask != NULL)</div><div class='del'>-				*mask = NULL;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (icons_table, g_strdup (icon_file), pixbuf);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* render the pixbuf to the pixmap and mask passed */</div><div class='del'>-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, pixmap, &amp;tmp_mask, 1);</div><div class='del'>-	if (mask != NULL)</div><div class='del'>-		*mask = tmp_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_get_icon_file_for</div><div class='del'>- * @category: Category for which to get the icon file</div><div class='del'>- */</div><div class='del'>-const char *</div><div class='del'>-e_categories_config_get_icon_file_for (const char *category)</div><div class='del'>-{</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (category != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!initialized)</div><div class='del'>-		initialize_categories_config ();</div><div class='del'>-</div><div class='del'>-	for (n = 0;</div><div class='del'>-	     n &lt; e_categories_master_list_count (E_CATEGORIES_MASTER_LIST (ecmlw));</div><div class='del'>-	     n++) {</div><div class='del'>-		char *tmp_cat;</div><div class='del'>-</div><div class='del'>-		tmp_cat = (char *) e_categories_master_list_nth (E_CATEGORIES_MASTER_LIST (ecmlw), n);</div><div class='del'>-		if (tmp_cat &amp;&amp; !strcmp (tmp_cat, category))</div><div class='del'>-			return e_categories_master_list_nth_icon (E_CATEGORIES_MASTER_LIST (ecmlw), n);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL; /* not found */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_set_icon_for</div><div class='del'>- * @category: Category for which to set the icon.</div><div class='del'>- * @icon_file: Full path of the icon file.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_categories_config_set_icon_for (const char *category, const char *icon_file)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_categories_config_open_dialog_for_entry:</div><div class='del'>- * entry: A GtkEntry on which to get/set the categories list.</div><div class='del'>- *</div><div class='del'>- * This is a self-contained function that lets you open a popup dialog for</div><div class='del'>- * the user to select a list of categories.</div><div class='del'>- *</div><div class='del'>- * The @entry parameter is used, at initialization time, as the list of</div><div class='del'>- * initial categories that are selected in the categories selection dialog.</div><div class='del'>- * Then, when the user commits its changes, the list of selected categories</div><div class='del'>- * is put back on the entry widget.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_categories_config_open_dialog_for_entry (GtkEntry *entry)</div><div class='del'>-{</div><div class='del'>-	char *categories;</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (entry != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_ENTRY (entry));</div><div class='del'>-</div><div class='del'>-	if (!initialized)</div><div class='del'>-		initialize_categories_config ();</div><div class='del'>-</div><div class='del'>-	categories = e_utf8_gtk_entry_get_text (GTK_ENTRY (entry));</div><div class='del'>-	dialog = GNOME_DIALOG (e_categories_new (categories));</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (dialog),</div><div class='del'>-			"ecml", ecmlw,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* run the dialog */</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-	g_free (categories);</div><div class='del'>-</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		gtk_object_get (GTK_OBJECT (dialog),</div><div class='del'>-				"categories", &amp;categories,</div><div class='del'>-				NULL);</div><div class='del'>-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), categories);</div><div class='del'>-		g_free (categories);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (dialog));</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h<br/>deleted file mode 100644<br/>index 0b798e466e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-categories-config.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-categories-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Categories configuration.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Rodrigo Moya &lt;rodrigo@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_CATEGORIES_CONFIG_H__</div><div class='del'>-#define __E_CATEGORIES_CONFIG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gdk/gdk.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-const char *e_categories_config_get_color_for (const char *category);</div><div class='del'>-void e_categories_config_set_color_for (const char *category, const char *color);</div><div class='del'>-</div><div class='del'>-void e_categories_config_get_icon_for (const char *category,</div><div class='del'>-				       GdkPixmap **icon,</div><div class='del'>-				       GdkBitmap **mask);</div><div class='del'>-const char *e_categories_config_get_icon_file_for (const char *category);</div><div class='del'>-void e_categories_config_set_icon_for (const char *category,</div><div class='del'>-				       const char *pixmap_file);</div><div class='del'>-</div><div class='del'>-void e_categories_config_open_dialog_for_entry (GtkEntry *entry);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-categories-master-list-wombat.c b/e-util/e-categories-master-list-wombat.c<br/>deleted file mode 100644<br/>index 29318dec04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-categories-master-list-wombat.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-categories-master-list-wombat.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,207 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * e-categories-master-list.c: the master list of categories.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * (C) 1999, 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-categories-master-list-wombat.h"</div><div class='del'>-#include "e-categories-config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;tree.h&gt;</div><div class='del'>-#include &lt;parser.h&gt;</div><div class='del'>-#include &lt;gal/util/e-i18n.h&gt;</div><div class='del'>-#include &lt;gal/util/e-xml-utils.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-listener.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_categories_master_list_array_get_type ()</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-struct _ECategoriesMasterListWombatPriv {</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	Bonobo_EventSource_ListenerId listener_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static ECategoriesMasterListArrayClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecmlw_load (ECategoriesMasterListWombat *ecmlw)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	gboolean def;</div><div class='del'>-</div><div class='del'>-	string = bonobo_config_get_string_with_default</div><div class='del'>-		(ecmlw-&gt;priv-&gt;db,</div><div class='del'>-		 "General/CategoryMasterList",</div><div class='del'>-		 NULL,</div><div class='del'>-		 &amp;def);</div><div class='del'>-</div><div class='del'>-	/* parse the XML string */</div><div class='del'>-	if (!def) {</div><div class='del'>-		e_categories_master_list_array_from_string (E_CATEGORIES_MASTER_LIST_ARRAY (ecmlw),</div><div class='del'>-							    string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(g_print ("load: %s\n", string?string:"(nil)"));</div><div class='del'>-</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecmlw_save (ECategoriesMasterListWombat *ecmlw)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	string = e_categories_master_list_array_to_string (E_CATEGORIES_MASTER_LIST_ARRAY (ecmlw));</div><div class='del'>-</div><div class='del'>-	d(g_print ("save: %s\n", string));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (ecmlw-&gt;priv-&gt;db,</div><div class='del'>-				  "General/CategoryMasterList",</div><div class='del'>-				  string,</div><div class='del'>-				  &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecmlw_commit:</div><div class='del'>- * @ecml: the master list to remove from.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ecmlw_commit (ECategoriesMasterList *ecml)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (ecml);</div><div class='del'>-</div><div class='del'>-	((ECategoriesMasterListClass *) parent_class)-&gt;commit (ecml);</div><div class='del'>-</div><div class='del'>-	ecmlw_save (ecmlw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * ecmlw_reset:</div><div class='del'>- * @ecml: the master list to reset.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ecmlw_reset (ECategoriesMasterList *ecml)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (ecml);</div><div class='del'>-</div><div class='del'>-	((ECategoriesMasterListClass *) parent_class)-&gt;reset (ecml);</div><div class='del'>-</div><div class='del'>-	ecmlw_save (ecmlw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecmlw_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterListWombat *ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (object);</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* remove the listener */</div><div class='del'>-</div><div class='del'>-	bonobo_event_source_client_remove_listener (ecmlw-&gt;priv-&gt;db,</div><div class='del'>-						    ecmlw-&gt;priv-&gt;listener_id,</div><div class='del'>-						    &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (ecmlw-&gt;priv-&gt;db, &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecmlw_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	ECategoriesMasterListClass *ecml_class = E_CATEGORIES_MASTER_LIST_CLASS(object_class);</div><div class='del'>-</div><div class='del'>-	parent_class          = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	ecml_class-&gt;commit    = ecmlw_commit;</div><div class='del'>-</div><div class='del'>-	ecml_class-&gt;reset     = ecmlw_reset ;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = ecmlw_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-property_change_cb (BonoboListener    *listener,</div><div class='del'>-		    char              *event_name, </div><div class='del'>-		    CORBA_any         *any,</div><div class='del'>-		    CORBA_Environment *ev,</div><div class='del'>-		    gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	ecmlw_load (user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecmlw_init (ECategoriesMasterListWombat *ecmlw)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	ecmlw-&gt;priv = g_new (ECategoriesMasterListWombatPriv, 1);</div><div class='del'>-	ecmlw-&gt;priv-&gt;db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-</div><div class='del'>-	/* add a listener */</div><div class='del'>-	ecmlw-&gt;priv-&gt;listener_id =</div><div class='del'>-		bonobo_event_source_client_add_listener (ecmlw-&gt;priv-&gt;db, property_change_cb,</div><div class='del'>-							 NULL, &amp;ev, ecmlw);</div><div class='del'>-	if (BONOBO_EX (&amp;ev)) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	ecmlw_load (ecmlw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_categories_master_list_wombat_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"ECategoriesMasterListWombat",</div><div class='del'>-			sizeof (ECategoriesMasterListWombat),</div><div class='del'>-			sizeof (ECategoriesMasterListWombatClass),</div><div class='del'>-			(GtkClassInitFunc) ecmlw_class_init,</div><div class='del'>-			(GtkObjectInitFunc) ecmlw_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECategoriesMasterList *</div><div class='del'>-e_categories_master_list_wombat_new       (void)</div><div class='del'>-{</div><div class='del'>-	return E_CATEGORIES_MASTER_LIST (gtk_type_new (e_categories_master_list_wombat_get_type ()));</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-categories-master-list-wombat.h b/e-util/e-categories-master-list-wombat.h<br/>deleted file mode 100644<br/>index a6fe2a04ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-categories-master-list-wombat.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-categories-master-list-wombat.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_CATEGORIES_MASTER_LIST_WOMBAT_H_</div><div class='del'>-#define _E_CATEGORIES_MASTER_LIST_WOMBAT_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-categories-master-list-array.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_CATEGORIES_MASTER_LIST_WOMBAT_TYPE        (e_categories_master_list_wombat_get_type ())</div><div class='del'>-#define E_CATEGORIES_MASTER_LIST_WOMBAT(o)          (GTK_CHECK_CAST ((o), E_CATEGORIES_MASTER_LIST_WOMBAT_TYPE, ECategoriesMasterListWombat))</div><div class='del'>-#define E_CATEGORIES_MASTER_LIST_WOMBAT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CATEGORIES_MASTER_LIST_WOMBAT_TYPE, ECategoriesMasterListWombatClass))</div><div class='del'>-#define E_IS_CATEGORIES_MASTER_LIST_WOMBAT(o)       (GTK_CHECK_TYPE ((o), E_CATEGORIES_MASTER_LIST_WOMBAT_TYPE))</div><div class='del'>-#define E_IS_CATEGORIES_MASTER_LIST_WOMBAT_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CATEGORIES_MASTER_LIST_WOMBAT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ECategoriesMasterListWombatPriv ECategoriesMasterListWombatPriv;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ECategoriesMasterListArray       base;</div><div class='del'>-	ECategoriesMasterListWombatPriv *priv;</div><div class='del'>-} ECategoriesMasterListWombat;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ECategoriesMasterListArrayClass parent_class;</div><div class='del'>-} ECategoriesMasterListWombatClass;</div><div class='del'>-</div><div class='del'>-GtkType                e_categories_master_list_wombat_get_type  (void);</div><div class='del'>-ECategoriesMasterList *e_categories_master_list_wombat_new       (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_CATEGORIES_MASTER_LIST_WOMBAT_H_ */</div><div class='head'>diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c<br/>deleted file mode 100644<br/>index b92b247656..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-corba-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-corba-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-html-utils.c</div><div class='del'>-* </div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-corba-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const CORBA_char *</div><div class='del'>-e_safe_corba_string (const char *s)</div><div class='del'>-{</div><div class='del'>-	if (s == NULL)</div><div class='del'>-		return (CORBA_char *) "";</div><div class='del'>-</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CORBA_char *</div><div class='del'>-e_safe_corba_string_dup (const char *s)</div><div class='del'>-{</div><div class='del'>-	return CORBA_string_dup (e_safe_corba_string (s));</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h<br/>deleted file mode 100644<br/>index 32cf1df0ee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-corba-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-corba-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-corba-utils.h</div><div class='del'>- * </div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_CORBA_UTILS_H</div><div class='del'>-#define E_CORBA_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;orb/orbit.h&gt;</div><div class='del'>-</div><div class='del'>-const CORBA_char *e_safe_corba_string      (const char *s);</div><div class='del'>-CORBA_char       *e_safe_corba_string_dup  (const char *s);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-db3-utils.c b/e-util/e-db3-utils.c<br/>deleted file mode 100644<br/>index c1da265453..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-db3-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-db3-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include "e-db3-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;db.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-</div><div class='del'>-#if DB_VERSION_MAJOR != 3 || \</div><div class='del'>-    DB_VERSION_MINOR != 1 || \</div><div class='del'>-    DB_VERSION_PATCH != 17</div><div class='del'>-#error Including wrong DB3.  Need libdb 3.1.17.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_check_filename (const char *filename)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("%s-upgrading", filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_copy_filename (const char *filename)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf ("%s-copy", filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-cp_file (const char *src, const char *dest)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int o;</div><div class='del'>-	char buffer[1024];</div><div class='del'>-	int length;</div><div class='del'>-	int place;</div><div class='del'>-</div><div class='del'>-	i = open (src, O_RDONLY);</div><div class='del'>-	if (i == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	o = creat (dest, S_IREAD | S_IWRITE);</div><div class='del'>-	if (o == -1) {</div><div class='del'>-		close (i);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	while (1) {</div><div class='del'>-		length = read (i, &amp;buffer, sizeof (buffer));</div><div class='del'>-</div><div class='del'>-		if (length == 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (length == -1) {</div><div class='del'>-			if (errno == EINTR)</div><div class='del'>-				continue;</div><div class='del'>-			else {</div><div class='del'>-				close (i);</div><div class='del'>-				close (o);</div><div class='del'>-				unlink (dest);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		place = 0;</div><div class='del'>-		while (length != 0) {</div><div class='del'>-			int count;</div><div class='del'>-			count = write (o, buffer + place, length);</div><div class='del'>-			if (count == -1) {</div><div class='del'>-				if (errno == EINTR)</div><div class='del'>-					continue;</div><div class='del'>-				else {</div><div class='del'>-					close (i);</div><div class='del'>-					close (o);</div><div class='del'>-					unlink (dest);</div><div class='del'>-					return -1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			length -= count;</div><div class='del'>-			place += count;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (close (i))</div><div class='del'>-		return -1;</div><div class='del'>-	if (close (o))</div><div class='del'>-		return -1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-touch_file (const char *file)</div><div class='del'>-{</div><div class='del'>-	int o;</div><div class='del'>-	o = creat (file, S_IREAD | S_IWRITE);</div><div class='del'>-	if (o == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (close (o) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-resume_upgrade (const char *filename, const char *copy_filename, const char *check_filename)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	int ret_val;</div><div class='del'>-</div><div class='del'>-	ret_val = db_create (&amp;db, NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = cp_file (copy_filename, filename);</div><div class='del'>-</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = db-&gt;upgrade (db, filename, 0);</div><div class='del'>-</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = unlink (check_filename);</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = unlink (copy_filename);</div><div class='del'>-</div><div class='del'>-	db-&gt;close (db, 0);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_db3_utils_maybe_recover (const char *filename)</div><div class='del'>-{</div><div class='del'>-	int ret_val = 0;</div><div class='del'>-	char *copy_filename;</div><div class='del'>-	char *check_filename;</div><div class='del'>-</div><div class='del'>-	copy_filename = get_copy_filename (filename);</div><div class='del'>-	check_filename = get_check_filename (filename);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (check_filename)) {</div><div class='del'>-		ret_val = resume_upgrade(filename, copy_filename, check_filename);</div><div class='del'>-	} else if (g_file_exists (copy_filename)) {</div><div class='del'>-		unlink (copy_filename);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (copy_filename);</div><div class='del'>-	g_free (check_filename);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_db3_utils_upgrade_format (const char *filename)</div><div class='del'>-{</div><div class='del'>-	char *copy_filename;</div><div class='del'>-	char *check_filename;</div><div class='del'>-	DB *db;</div><div class='del'>-	int ret_val;</div><div class='del'>-</div><div class='del'>-	ret_val = db_create (&amp;db, NULL, 0);</div><div class='del'>-	if (ret_val != 0)</div><div class='del'>-		return ret_val;</div><div class='del'>-</div><div class='del'>-	copy_filename = get_copy_filename (filename);</div><div class='del'>-	check_filename = get_check_filename (filename);</div><div class='del'>-</div><div class='del'>-	ret_val = cp_file (filename, copy_filename);</div><div class='del'>-</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = touch_file (check_filename);</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = db-&gt;upgrade (db, filename, 0);</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = unlink (check_filename);</div><div class='del'>-</div><div class='del'>-	if (ret_val == 0)</div><div class='del'>-		ret_val = unlink (copy_filename);</div><div class='del'>-</div><div class='del'>-	db-&gt;close (db, 0);</div><div class='del'>-</div><div class='del'>-	g_free (check_filename);</div><div class='del'>-	g_free (copy_filename);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-db3-utils.h b/e-util/e-db3-utils.h<br/>deleted file mode 100644<br/>index a574e59178..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-db3-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-db3-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * db3 utils.</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_DB3_UTILS_H__</div><div class='del'>-#define __E_DB3_UTILS_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-int e_db3_utils_maybe_recover (const char *filename);</div><div class='del'>-int e_db3_utils_upgrade_format (const char *filename);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_DB3_UTILS_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-dbhash.c b/e-util/e-dbhash.c<br/>deleted file mode 100644<br/>index 209798fbc5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dbhash.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dbhash.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,227 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   JP Rosevear (jpr@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-dbhash.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;db.h&gt;</div><div class='del'>-#include "md5-utils.h"</div><div class='del'>-</div><div class='del'>-#if DB_VERSION_MAJOR != 3 || \</div><div class='del'>-    DB_VERSION_MINOR != 1 || \</div><div class='del'>-    DB_VERSION_PATCH != 17</div><div class='del'>-#error Including wrong DB3.  Need libdb 3.1.17.</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _EDbHashPrivate </div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EDbHash *</div><div class='del'>-e_dbhash_new (const char *filename)</div><div class='del'>-{</div><div class='del'>-	EDbHash *edbh;</div><div class='del'>-	DB *db;</div><div class='del'>-	int rv;</div><div class='del'>-</div><div class='del'>-	int major, minor, patch;</div><div class='del'>-</div><div class='del'>-	db_version (&amp;major, &amp;minor, &amp;patch);</div><div class='del'>-</div><div class='del'>-	if (major != 3 ||</div><div class='del'>-	    minor != 1 ||</div><div class='del'>-	    patch != 17) {</div><div class='del'>-		g_warning ("Wrong version of libdb.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Attempt to open the database */</div><div class='del'>-	rv = db_create (&amp;db, NULL, 0);</div><div class='del'>-	if (rv != 0) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = db-&gt;open (db, filename, NULL, DB_HASH, 0, 0666);</div><div class='del'>-	if (rv != 0) {</div><div class='del'>-		rv = db-&gt;open (db, filename, NULL, DB_HASH, DB_CREATE, 0666);</div><div class='del'>-</div><div class='del'>-		if (rv != 0)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	edbh = g_new (EDbHash, 1);</div><div class='del'>-	edbh-&gt;priv = g_new (EDbHashPrivate, 1);</div><div class='del'>-	edbh-&gt;priv-&gt;db = db;</div><div class='del'>-</div><div class='del'>-	return edbh;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-string_to_dbt(const char *str, DBT *dbt)</div><div class='del'>-{</div><div class='del'>-	memset (dbt, 0, sizeof (DBT));</div><div class='del'>-	dbt-&gt;data = (void*)str;</div><div class='del'>-	dbt-&gt;size = strlen (str) + 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-md5_to_dbt(const char str[16], DBT *dbt)</div><div class='del'>-{</div><div class='del'>-	memset (dbt, 0, sizeof (DBT));</div><div class='del'>-	dbt-&gt;data = (void*)str;</div><div class='del'>-	dbt-&gt;size = 16;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_dbhash_add (EDbHash *edbh, const gchar *key, const gchar *data)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	DBT dkey;</div><div class='del'>-	DBT ddata;</div><div class='del'>-	guchar local_hash[16];</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (edbh != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv-&gt;db != NULL);</div><div class='del'>-	g_return_if_fail (key != NULL);</div><div class='del'>-	g_return_if_fail (data != NULL);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-	</div><div class='del'>-	/* Key dbt */</div><div class='del'>-	string_to_dbt (key, &amp;dkey);</div><div class='del'>-</div><div class='del'>-	/* Data dbt */</div><div class='del'>-	md5_get_digest (data, strlen (data), local_hash);</div><div class='del'>-	md5_to_dbt (local_hash, &amp;ddata);</div><div class='del'>-</div><div class='del'>-	/* Add to database */</div><div class='del'>-	db-&gt;put (db, NULL, &amp;dkey, &amp;ddata, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_dbhash_remove (EDbHash *edbh, const char *key)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	DBT dkey;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (edbh != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv != NULL);</div><div class='del'>-	g_return_if_fail (key != NULL);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-	</div><div class='del'>-	/* Key dbt */</div><div class='del'>-	string_to_dbt (key, &amp;dkey);</div><div class='del'>-</div><div class='del'>-	/* Remove from database */</div><div class='del'>-	db-&gt;del (db, NULL, &amp;dkey, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc func, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	DBT dkey;</div><div class='del'>-	DBT ddata;</div><div class='del'>-	DBC *dbc;</div><div class='del'>-	int db_error = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (edbh != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv != NULL);</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-</div><div class='del'>-	db_error = db-&gt;cursor (db, NULL, &amp;dbc, 0);</div><div class='del'>-</div><div class='del'>-	if (db_error != 0) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset(&amp;dkey, 0, sizeof(DBT));</div><div class='del'>-	memset(&amp;ddata, 0, sizeof(DBT));</div><div class='del'>-	db_error = dbc-&gt;c_get(dbc, &amp;dkey, &amp;ddata, DB_FIRST);</div><div class='del'>-</div><div class='del'>-	while (db_error == 0) {</div><div class='del'>-		(*func) ((const char *)dkey.data, user_data);</div><div class='del'>-</div><div class='del'>-		db_error = dbc-&gt;c_get(dbc, &amp;dkey, &amp;ddata, DB_NEXT);</div><div class='del'>-	}</div><div class='del'>-	dbc-&gt;c_close (dbc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDbHashStatus</div><div class='del'>-e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	DBT dkey;</div><div class='del'>-	DBT ddata;</div><div class='del'>-	guchar compare_hash[16];</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (edbh != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (edbh-&gt;priv != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (key != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (compare_hash != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-	</div><div class='del'>-	/* Key dbt */</div><div class='del'>-	string_to_dbt (key, &amp;dkey);</div><div class='del'>-</div><div class='del'>-	/* Lookup in database */</div><div class='del'>-	memset (&amp;ddata, 0, sizeof (DBT));</div><div class='del'>-	db-&gt;get (db, NULL, &amp;dkey, &amp;ddata, 0);</div><div class='del'>-	</div><div class='del'>-	/* Compare */</div><div class='del'>-	if (ddata.data) {</div><div class='del'>-		md5_get_digest (compare_data, strlen (compare_data), compare_hash);</div><div class='del'>-		</div><div class='del'>-		if (memcmp (ddata.data, compare_hash, sizeof (guchar) * 16))</div><div class='del'>-			return E_DBHASH_STATUS_DIFFERENT;</div><div class='del'>-	} else {</div><div class='del'>-		return E_DBHASH_STATUS_NOT_FOUND;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return E_DBHASH_STATUS_SAME;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_dbhash_write (EDbHash *edbh)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (edbh != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv != NULL);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-	</div><div class='del'>-	/* Flush database to disk */</div><div class='del'>-	db-&gt;sync (db, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_dbhash_destroy (EDbHash *edbh)</div><div class='del'>-{</div><div class='del'>-	DB *db;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (edbh != NULL);</div><div class='del'>-	g_return_if_fail (edbh-&gt;priv != NULL);</div><div class='del'>-</div><div class='del'>-	db = edbh-&gt;priv-&gt;db;</div><div class='del'>-	</div><div class='del'>-	/* Close datbase */</div><div class='del'>-	db-&gt;close (db, 0);</div><div class='del'>-	</div><div class='del'>-	g_free (edbh-&gt;priv);</div><div class='del'>-	g_free (edbh);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-dbhash.h b/e-util/e-dbhash.h<br/>deleted file mode 100644<br/>index 9772a60c41..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dbhash.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dbhash.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Writes hashes that go to/from disk in db form. Hash keys are strings</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   JP Rosevear (jpr@ximian.com)</div><div class='del'>- *</div><div class='del'>- * Copyright 2000, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_DBHASH_H__</div><div class='del'>-#define __E_DBHASH_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_DBHASH_STATUS_SAME,</div><div class='del'>-	E_DBHASH_STATUS_DIFFERENT,</div><div class='del'>-	E_DBHASH_STATUS_NOT_FOUND,</div><div class='del'>-} EDbHashStatus;</div><div class='del'>-</div><div class='del'>-typedef struct _EDbHash EDbHash;</div><div class='del'>-typedef struct _EDbHashPrivate EDbHashPrivate;</div><div class='del'>-</div><div class='del'>-struct _EDbHash</div><div class='del'>-{</div><div class='del'>-	EDbHashPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*EDbHashFunc) (const char *key, gpointer user_data);</div><div class='del'>-</div><div class='del'>-EDbHash *e_dbhash_new (const char *filename);</div><div class='del'>-</div><div class='del'>-void e_dbhash_add (EDbHash *edbh, const char *key, const char *data);</div><div class='del'>-void e_dbhash_remove (EDbHash *edbh, const char *key);</div><div class='del'>-</div><div class='del'>-EDbHashStatus e_dbhash_compare (EDbHash *edbh, const char *key, const char *compare_data);</div><div class='del'>-void e_dbhash_foreach_key (EDbHash *edbh, EDbHashFunc func, gpointer user_data);</div><div class='del'>-</div><div class='del'>-void e_dbhash_write (EDbHash *edbh);</div><div class='del'>-</div><div class='del'>-void e_dbhash_destroy (EDbHash *edbh);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_DBHASH_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c<br/>deleted file mode 100644<br/>index 0102c45167..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dialog-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,264 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-dialog-utils.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Meeks &lt;michael@ximian.com&gt;</div><div class='del'>- *   Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "e-dialog-utils.h"</div><div class='del'>-</div><div class='del'>-#include "widgets/misc/e-bonobo-widget.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gdk/gdkx.h&gt;</div><div class='del'>-#include &lt;gdk/gdkprivate.h&gt;</div><div class='del'>-#include &lt;gdk/gdk.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkfilesel.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-uidefs.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TRANSIENT_DATA_ID "e-dialog:transient"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transient_realize_callback (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-</div><div class='del'>-	window = gtk_object_get_data (GTK_OBJECT (widget), TRANSIENT_DATA_ID);</div><div class='del'>-	g_assert (window != NULL);</div><div class='del'>-</div><div class='del'>-	gdk_window_set_transient_for (GTK_WIDGET (widget)-&gt;window, window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transient_unrealize_callback (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-</div><div class='del'>-	window = gtk_object_get_data (GTK_OBJECT (widget), TRANSIENT_DATA_ID);</div><div class='del'>-	g_assert (window != NULL);</div><div class='del'>-</div><div class='del'>-	gdk_property_delete (window, gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-transient_destroy_callback (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-	</div><div class='del'>-	window = gtk_object_get_data (GTK_OBJECT (widget), "transient");</div><div class='del'>-	if (window != NULL)</div><div class='del'>-		gdk_window_unref (window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void       </div><div class='del'>-set_transient_for_gdk (GtkWindow *window, </div><div class='del'>-		       GdkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (window != NULL);</div><div class='del'>-	g_return_if_fail (gtk_object_get_data (GTK_OBJECT (window), TRANSIENT_DATA_ID) == NULL);</div><div class='del'>-</div><div class='del'>-	gdk_window_ref (parent); /* FIXME? */</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (window), TRANSIENT_DATA_ID, parent);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_REALIZED (window))</div><div class='del'>-		gdk_window_set_transient_for (GTK_WIDGET (window)-&gt;window, parent);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (window), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (transient_realize_callback), NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (window), "unrealize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (transient_unrealize_callback), NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (window), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (transient_destroy_callback), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_set_dialog_parent:</div><div class='del'>- * @dialog: </div><div class='del'>- * @parent_widget: </div><div class='del'>- * </div><div class='del'>- * This sets the parent for @dialog to be @parent_widget.  Unlike</div><div class='del'>- * gtk_window_set_parent(), this doesn't need @parent_widget to be the actual</div><div class='del'>- * toplevel, and also works if @parent_widget is been embedded as a Bonobo</div><div class='del'>- * control by an out-of-process container.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_set_dialog_parent (GtkWindow *dialog,</div><div class='del'>-		     GtkWidget *parent_widget)</div><div class='del'>-{</div><div class='del'>-	Bonobo_PropertyBag property_bag;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-	GdkWindow *gdk_window;</div><div class='del'>-	CORBA_char *id;</div><div class='del'>-	guint32 xid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_WINDOW (dialog));</div><div class='del'>-	g_return_if_fail (parent_widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_WIDGET (parent_widget));</div><div class='del'>-</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (parent_widget);</div><div class='del'>-	if (toplevel == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (! BONOBO_IS_CONTROL (toplevel)) {</div><div class='del'>-		if (GTK_IS_WINDOW (toplevel))</div><div class='del'>-			gtk_window_set_transient_for (dialog, GTK_WINDOW (toplevel));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	property_bag = bonobo_control_get_ambient_properties (BONOBO_CONTROL (toplevel), NULL);</div><div class='del'>-	if (property_bag == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	id = bonobo_property_bag_client_get_value_string (property_bag, E_BONOBO_WIDGET_TOPLEVEL_PROPERTY_ID, NULL);</div><div class='del'>-	if (id == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	xid = strtol (id, NULL, 10);</div><div class='del'>-</div><div class='del'>-	gdk_window = gdk_window_foreign_new (xid);</div><div class='del'>-	set_transient_for_gdk (dialog, gdk_window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_set_dialog_parent_from_xid:</div><div class='del'>- * @dialog: </div><div class='del'>- * @xid: </div><div class='del'>- * </div><div class='del'>- * Like %e_set_dialog_parent_from_xid, but use an XID to specify the parent</div><div class='del'>- * window.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_set_dialog_parent_from_xid (GtkWindow *dialog,</div><div class='del'>-			      Window xid)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_WINDOW (dialog));</div><div class='del'>-</div><div class='del'>-	set_transient_for_gdk (dialog, gdk_window_foreign_new (xid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_gnome_dialog_parent_destroyed (GtkWidget *parent, GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_gnome_dialog_set_parent (GnomeDialog *dialog, GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_set_parent (dialog, parent);</div><div class='del'>-	gtk_signal_connect_while_alive (GTK_OBJECT (parent), "destroy",</div><div class='del'>-					e_gnome_dialog_parent_destroyed,</div><div class='del'>-					dialog, GTK_OBJECT (dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_gnome_warning_dialog_parented (const char *warning, GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_warning_dialog_parented (warning, parent);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (parent), "destroy",</div><div class='del'>-			    e_gnome_dialog_parent_destroyed, dialog);</div><div class='del'>-	</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_gnome_ok_cancel_dialog_parented (const char *message, GnomeReplyCallback callback,</div><div class='del'>-				   gpointer data, GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_ok_cancel_dialog_parented (message, callback, data, parent);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (parent), "destroy",</div><div class='del'>-			    e_gnome_dialog_parent_destroyed, dialog);</div><div class='del'>-	</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_ok (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *fs;</div><div class='del'>-	char **filename = data;</div><div class='del'>-	char *path;</div><div class='del'>-	int btn = GNOME_YES;</div><div class='del'>-</div><div class='del'>-	fs = gtk_widget_get_toplevel (widget);</div><div class='del'>-	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));</div><div class='del'>-</div><div class='del'>-	if (g_file_test (path, G_FILE_TEST_ISFILE)) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-</div><div class='del'>-		dlg = gnome_question_dialog_modal (_("A file by that name already exists.\n"</div><div class='del'>-						     "Overwrite it?"), NULL, NULL);</div><div class='del'>-		btn = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (btn == GNOME_YES)</div><div class='del'>-		*filename = g_strdup (path);</div><div class='del'>-</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_file_dialog_save (const char *title)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *fs;</div><div class='del'>-	char *path, *filename = NULL;</div><div class='del'>-</div><div class='del'>-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (title));</div><div class='del'>-	path = g_strdup_printf ("%s/", g_get_home_dir ());</div><div class='del'>-	gtk_file_selection_set_filename (fs, path);</div><div class='del'>-	g_free (path);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fs-&gt;ok_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (save_ok), &amp;filename);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fs-&gt;cancel_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (fs));</div><div class='del'>-	gtk_grab_add (GTK_WIDGET (fs));</div><div class='del'>-	gtk_main ();</div><div class='del'>-	</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (fs));</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h<br/>deleted file mode 100644<br/>index 275f8ec264..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dialog-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-dialog-utils.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_DIALOG_UTILS_H</div><div class='del'>-#define E_DIALOG_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-types.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;X11/Xlib.h&gt;		/* Window */</div><div class='del'>-</div><div class='del'>-void       e_set_dialog_parent               (GtkWindow          *dialog,</div><div class='del'>-					      GtkWidget          *parent_widget);</div><div class='del'>-void       e_set_dialog_parent_from_xid      (GtkWindow          *dialog,</div><div class='del'>-					      Window              xid);</div><div class='del'>-void       e_gnome_dialog_set_parent         (GnomeDialog        *dialog,</div><div class='del'>-					      GtkWindow          *parent);</div><div class='del'>-GtkWidget *e_gnome_warning_dialog_parented   (const char         *warning,</div><div class='del'>-					      GtkWindow          *parent);</div><div class='del'>-GtkWidget *e_gnome_ok_cancel_dialog_parented (const char         *message,</div><div class='del'>-					      GnomeReplyCallback  callback,</div><div class='del'>-					      gpointer            data,</div><div class='del'>-					      GtkWindow          *parent);</div><div class='del'>-char      *e_file_dialog_save                (const char         *title);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c<br/>deleted file mode 100644<br/>index b3ddb1b5ea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-widgets.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dialog-widgets.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,832 +0,0 @@</div><div class='del'>-/* Evolution internal utilities - Glade dialog widget utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkradiobutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dateedit.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-propertybox.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-dialog-widgets.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A widget, a pointer to the variable it will modify, and extra information */</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	gpointer value_var;</div><div class='del'>-	gpointer info;</div><div class='del'>-} WidgetHook;</div><div class='del'>-</div><div class='del'>-/* Hook information for a complete dialog */</div><div class='del'>-typedef struct {</div><div class='del'>-	GSList *whooks;</div><div class='del'>-} DialogHooks;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the dialog; frees the dialog hooks */</div><div class='del'>-static void</div><div class='del'>-dialog_destroy_cb (GtkObject *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-</div><div class='del'>-	hooks = data;</div><div class='del'>-</div><div class='del'>-	g_slist_free (hooks-&gt;whooks);</div><div class='del'>-	hooks-&gt;whooks = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (hooks);</div><div class='del'>-	gtk_object_set_data (dialog, "dialog-hooks", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that the dialog has the necessary attached data to store the widget</div><div class='del'>- * hook information.</div><div class='del'>- */</div><div class='del'>-static DialogHooks *</div><div class='del'>-get_dialog_hooks (GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-</div><div class='del'>-	hooks = gtk_object_get_data (GTK_OBJECT (dialog), "dialog-hooks");</div><div class='del'>-	if (!hooks) {</div><div class='del'>-		hooks = g_new0 (DialogHooks, 1);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (dialog), "dialog-hooks", hooks);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (dialog), "destroy",</div><div class='del'>-				    GTK_SIGNAL_FUNC (dialog_destroy_cb), hooks);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hooks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts an mapped value to the appropriate index in an item group.  The</div><div class='del'>- * values for the items are provided as a -1-terminated array.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-value_to_index (const int *value_map, int value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; value_map[i] != -1; i++)</div><div class='del'>-		if (value_map[i] == value)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts an index in an item group to the appropriate mapped value.  See the</div><div class='del'>- * function above.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-index_to_value (const int *value_map, int index)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* We do this the hard way, i.e. not as a simple array reference, to</div><div class='del'>-	 * check for correctness.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; value_map[i] != -1; i++)</div><div class='del'>-		if (i == index)</div><div class='del'>-			return value_map[i];</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "toggled" signal of toggle buttons */</div><div class='del'>-static void</div><div class='del'>-toggled_cb (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-</div><div class='del'>-	/* For radio buttons, we only notify the property box if the button is</div><div class='del'>-	 * active, because we'll get one call for each of the changed buttons in</div><div class='del'>-	 * the radio group.</div><div class='del'>-	 */</div><div class='del'>-	if (!GTK_IS_RADIO_BUTTON (toggle) || toggle-&gt;active)</div><div class='del'>-		gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a radio button group */</div><div class='del'>-static void</div><div class='del'>-hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (radio);</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		for (l = group; l; l = l-&gt;next)</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (l-&gt;data), "toggled",</div><div class='del'>-					    GTK_SIGNAL_FUNC (toggled_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a radio button group */</div><div class='del'>-static void</div><div class='del'>-get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_radio_get (GTK_WIDGET (radio), value_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "activate" signal of menu items */</div><div class='del'>-static void</div><div class='del'>-activate_cb (GtkMenuItem *item, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks an option menu */</div><div class='del'>-static void</div><div class='del'>-hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog)) {</div><div class='del'>-		GtkMenu *menu;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		menu = GTK_MENU (gtk_option_menu_get_menu (omenu));</div><div class='del'>-</div><div class='del'>-		for (l = GTK_MENU_SHELL (menu)-&gt;children; l; l = l-&gt;next)</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (l-&gt;data), "activate",</div><div class='del'>-					    GTK_SIGNAL_FUNC (activate_cb), dialog);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of an option menu */</div><div class='del'>-static void</div><div class='del'>-get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a toggle button */</div><div class='del'>-static void</div><div class='del'>-hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	gboolean *value;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (gboolean *) value_var;</div><div class='del'>-	e_dialog_toggle_set (GTK_WIDGET (toggle), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (toggle), "toggled",</div><div class='del'>-				    GTK_SIGNAL_FUNC (toggled_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a toggle button */</div><div class='del'>-static void</div><div class='del'>-get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	gboolean *value;</div><div class='del'>-</div><div class='del'>-	value = (gboolean *) value_var;</div><div class='del'>-	*value = e_dialog_toggle_get (GTK_WIDGET (toggle));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "value_changed" signal of the adjustment of a spin button */</div><div class='del'>-static void</div><div class='del'>-value_changed_cb (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a spin button */</div><div class='del'>-static void</div><div class='del'>-hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	double *value;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (double *) value_var;</div><div class='del'>-	e_dialog_spin_set (GTK_WIDGET (spin), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (spin);</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (value_changed_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a spin button */</div><div class='del'>-static void</div><div class='del'>-get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	double *value;</div><div class='del'>-</div><div class='del'>-	value = (double *) value_var;</div><div class='del'>-	*value = e_dialog_spin_get_double (GTK_WIDGET (spin));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "changed" signal of a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-changed_cb (GtkEditable *editable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	char **value;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (char **) value_var;</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (GTK_WIDGET (editable), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (editable), "changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (changed_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char **value;</div><div class='del'>-</div><div class='del'>-	value = (char **) value_var;</div><div class='del'>-	if (*value)</div><div class='del'>-		g_free (*value);</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_editable_get (GTK_WIDGET (editable));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_editable_set:</div><div class='del'>- * @widget: A #GtkEditable widget.</div><div class='del'>- * @value: String value.</div><div class='del'>- * </div><div class='del'>- * Sets the string value inside a #GtkEditable-derived widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_editable_set (GtkWidget *widget, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_EDITABLE (widget));</div><div class='del'>-</div><div class='del'>-	gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1);</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		gint pos;</div><div class='del'>-</div><div class='del'>-		pos = 0;</div><div class='del'>-		e_utf8_gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &amp;pos);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_editable_get:</div><div class='del'>- * @widget: A #GtkEditable widget.</div><div class='del'>- * </div><div class='del'>- * Queries the string value inside a #GtkEditable-derived widget.</div><div class='del'>- * </div><div class='del'>- * Return value: String value.  You should free it when you are done with it.</div><div class='del'>- * This function can return NULL if the string could not be converted from</div><div class='del'>- * GTK+'s encoding into UTF8.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_dialog_editable_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL);</div><div class='del'>-</div><div class='del'>-	return e_utf8_gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_radio_set:</div><div class='del'>- * @widget: A #GtkRadioButton in a radio button group.</div><div class='del'>- * @value: Enumerated value.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Sets the selected item in a radio group.  The specified @widget can be any of</div><div class='del'>- * the #GtkRadioButtons in the group.  Each radio button should correspond to an</div><div class='del'>- * enumeration value; the specified @value will be mapped to an integer from</div><div class='del'>- * zero to the number of items in the group minus 1 by using a mapping table</div><div class='del'>- * specified in @value_map.  The last element in this table should be -1.  Thus</div><div class='del'>- * a table to map three possible interpolation values to integers could be</div><div class='del'>- * specified as { NEAREST_NEIGHBOR, BILINEAR, HYPERBOLIC, -1 }.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	int i;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_RADIO_BUTTON (widget));</div><div class='del'>-	g_return_if_fail (value_map != NULL);</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	i = value_to_index (value_map, value);</div><div class='del'>-	if (i != -1) {</div><div class='del'>-		/* Groups are built by prepending items, so the list ends up in reverse</div><div class='del'>-		 * order; we need to flip the index around.</div><div class='del'>-		 */</div><div class='del'>-		i = g_slist_length (group) - i - 1;</div><div class='del'>-</div><div class='del'>-		l = g_slist_nth (group, i);</div><div class='del'>-		if (!l)</div><div class='del'>-			g_message ("e_dialog_radio_set(): could not find index %d in radio group!",</div><div class='del'>-				   i);</div><div class='del'>-</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l-&gt;data), TRUE);</div><div class='del'>-	} else</div><div class='del'>-		g_message ("e_dialog_radio_set(): could not find value %d in value map!",</div><div class='del'>-			   value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_radio_get:</div><div class='del'>- * @widget: A #GtkRadioButton in a radio button group.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Queries the selected item in a #GtkRadioButton group.  Please read the</div><div class='del'>- * description of e_dialog_radio_set() to see how @value_map maps enumeration</div><div class='del'>- * values to button indices.</div><div class='del'>- * </div><div class='del'>- * Return value: Enumeration value which corresponds to the selected item in the</div><div class='del'>- * radio group.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_radio_get (GtkWidget *widget, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int i;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1);</div><div class='del'>-	g_return_val_if_fail (value_map != NULL, -1);</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = group; l; l = l-&gt;next, i++) {</div><div class='del'>-		widget = GTK_WIDGET (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (GTK_TOGGLE_BUTTON (widget)-&gt;active)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!l)</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	/* Groups are built by prepending items, so the list ends up in reverse</div><div class='del'>-	 * order; we need to flip the index around.</div><div class='del'>-	 */</div><div class='del'>-	i = g_slist_length (group) - i - 1;</div><div class='del'>-</div><div class='del'>-	v = index_to_value (value_map, i);</div><div class='del'>-	if (v == -1) {</div><div class='del'>-		g_message ("e_dialog_radio_get(): could not find index %d in value map!", i);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_toggle_set:</div><div class='del'>- * @widget: A #GtkToggleButton.</div><div class='del'>- * @value: Toggle value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GtkToggleButton-derived widget.  This should not be used</div><div class='del'>- * for radio buttons; it is more convenient to use use e_dialog_radio_set()</div><div class='del'>- * instead.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_toggle_set (GtkWidget *widget, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_toggle_get:</div><div class='del'>- * @widget: A #GtkToggleButton.</div><div class='del'>- * </div><div class='del'>- * Queries the value of a #GtkToggleButton-derived widget.  This should not be</div><div class='del'>- * used for radio buttons; it is more convenient to use e_dialog_radio_get()</div><div class='del'>- * instead.</div><div class='del'>- * </div><div class='del'>- * Return value: Toggle value.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_toggle_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE);</div><div class='del'>-</div><div class='del'>-	return GTK_TOGGLE_BUTTON (widget)-&gt;active;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_set:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * @value: Numeric value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GtkSpinButton widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_spin_set (GtkWidget *widget, double value)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	adj-&gt;value = value;</div><div class='del'>-	gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_get_double:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * </div><div class='del'>- * Queries the floating-point value of a #GtkSpinButton widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Numeric value.</div><div class='del'>- **/</div><div class='del'>-double</div><div class='del'>-e_dialog_spin_get_double (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, 0.0);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0);</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));</div><div class='del'>-	return adj-&gt;value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_get_int:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * </div><div class='del'>- * Queries the integer value of a #GtkSpinButton widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Numeric value.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_spin_get_int (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	double value;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);</div><div class='del'>-</div><div class='del'>-	value = e_dialog_spin_get_double (widget);</div><div class='del'>-	return (int) floor (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_option_menu_set:</div><div class='del'>- * @widget: A #GtkOptionMenu.</div><div class='del'>- * @value: Enumerated value.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Sets the selected item in a #GtkOptionMenu.  Please read the description of</div><div class='del'>- * e_dialog_radio_set() to see how @value_map maps enumeration values to item</div><div class='del'>- * indices.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_OPTION_MENU (widget));</div><div class='del'>-	g_return_if_fail (value_map != NULL);</div><div class='del'>-</div><div class='del'>-	i = value_to_index (value_map, value);</div><div class='del'>-</div><div class='del'>-	if (i != -1)</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i);</div><div class='del'>-	else</div><div class='del'>-		g_message ("e_dialog_option_menu_set(): could not find value %d in value map!",</div><div class='del'>-			   value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_option_menu_get:</div><div class='del'>- * @widget: A #GtkOptionMenu.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Queries the selected item in a #GtkOptionMenu.  Please read the description</div><div class='del'>- * of e_dialog_radio_set() to see how @value_map maps enumeration values to item</div><div class='del'>- * indices.</div><div class='del'>- * </div><div class='del'>- * Return value: Enumeration value which corresponds to the selected item in the</div><div class='del'>- * option menu.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_option_menu_get (GtkWidget *widget, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GtkMenu *menu;</div><div class='del'>-	GtkWidget *active;</div><div class='del'>-	GList *children;</div><div class='del'>-	GList *l;</div><div class='del'>-	int i;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1);</div><div class='del'>-	g_return_val_if_fail (value_map != NULL, -1);</div><div class='del'>-</div><div class='del'>-	menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)));</div><div class='del'>-</div><div class='del'>-	active = gtk_menu_get_active (menu);</div><div class='del'>-	g_assert (active != NULL);</div><div class='del'>-</div><div class='del'>-	children = GTK_MENU_SHELL (menu)-&gt;children;</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = children; l; l = l-&gt;next, i++) {</div><div class='del'>-		if (GTK_WIDGET (l-&gt;data) == active)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!l)</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	v = index_to_value (value_map, i);</div><div class='del'>-	if (v == -1) {</div><div class='del'>-		g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_dateedit_set:</div><div class='del'>- * @widget: A #GnomeDateEdit widget.</div><div class='del'>- * @t: Date/time value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GnomeDateEdit widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_dateedit_set (GtkWidget *widget, time_t t)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));</div><div class='del'>-</div><div class='del'>-	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_dateedit_get:</div><div class='del'>- * @widget: A #GnomeDateEdit widget.</div><div class='del'>- * </div><div class='del'>- * Queries the value of a #GnomeDateEdit widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Date/time value.</div><div class='del'>- **/</div><div class='del'>-time_t</div><div class='del'>-e_dialog_dateedit_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);</div><div class='del'>-</div><div class='del'>-	return gnome_date_edit_get_date (GNOME_DATE_EDIT (widget));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_widget_hook_value:</div><div class='del'>- * @dialog: Dialog box in which the @widget lives in.</div><div class='del'>- * @widget: A widget that will control a variable.</div><div class='del'>- * @value_var: Pointer to the variable that the @widget will control.</div><div class='del'>- * @info: NULL for most widgets, or an integer value map array (see</div><div class='del'>- * e_dialog_radio_set() for details).</div><div class='del'>- * </div><div class='del'>- * Hooks a widget from a dialog box to the variable it will modify.  Supported</div><div class='del'>- * widgets are:  #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see</div><div class='del'>- * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean),</div><div class='del'>- * #GtkSpinButton (double), #GtkOptionMenu (int/value_map pair), and</div><div class='del'>- * #GnomeDateEdit (time_t).</div><div class='del'>- *</div><div class='del'>- * A pointer to the appropriate variable to modify should be passed in @value_var.</div><div class='del'>- * For values that take a value_map array as well, it should be passed in @info.</div><div class='del'>- *</div><div class='del'>- * The widgets within a dialog that are hooked with this function will set their</div><div class='del'>- * respective variables only when e_dialog_get_values() is called.  The typical</div><div class='del'>- * use is to call that function in the handler for the "OK" button of a dialog</div><div class='del'>- * box.</div><div class='del'>- *</div><div class='del'>- * In addition, if the specified @dialog is a #GnomePropertyBox, the widgets wil</div><div class='del'>- * automatically turn on the "Apply" button of the property box when they are</div><div class='del'>- * modified by the user.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the type of the specified @widget is supported, FALSE</div><div class='del'>- * otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,</div><div class='del'>-			    gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-	WidgetHook *wh;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (value_var != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	hooks = get_dialog_hooks (dialog);</div><div class='del'>-</div><div class='del'>-	/* First check if it is a "group" widget, like a radio button or an</div><div class='del'>-	 * option menu.  Then we check for normal ungrouped widgets.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (GTK_IS_RADIO_BUTTON (widget))</div><div class='del'>-		hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_OPTION_MENU (widget))</div><div class='del'>-		hook_option_menu (dialog, GTK_OPTION_MENU (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_TOGGLE_BUTTON (widget))</div><div class='del'>-		hook_toggle (dialog, GTK_TOGGLE_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_SPIN_BUTTON (widget))</div><div class='del'>-		hook_spin_button (dialog, GTK_SPIN_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_EDITABLE (widget))</div><div class='del'>-		hook_editable (dialog, GTK_EDITABLE (widget), value_var, info);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	wh = g_new (WidgetHook, 1);</div><div class='del'>-	wh-&gt;widget = widget;</div><div class='del'>-	wh-&gt;value_var = value_var;</div><div class='del'>-	wh-&gt;info = info;</div><div class='del'>-</div><div class='del'>-	hooks-&gt;whooks = g_slist_prepend (hooks-&gt;whooks, wh);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_get_values:</div><div class='del'>- * @dialog: A dialog box whose widgets have been hooked to the appropriate</div><div class='del'>- * variables with e_dialog_widget_hook_value().</div><div class='del'>- * </div><div class='del'>- * Makes every widget in a @dialog that was hooked with</div><div class='del'>- * e_dialog_widget_hook_value() apply its value to its corresponding variable.</div><div class='del'>- * The typical usage is to call this function in the handler for the "OK" button</div><div class='del'>- * of a dialog box.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_get_values (GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-</div><div class='del'>-	hooks = get_dialog_hooks (dialog);</div><div class='del'>-</div><div class='del'>-	for (l = hooks-&gt;whooks; l; l = l-&gt;next) {</div><div class='del'>-		WidgetHook *wh;</div><div class='del'>-</div><div class='del'>-		wh = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (GTK_IS_RADIO_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_radio_value (GTK_RADIO_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_OPTION_MENU (wh-&gt;widget))</div><div class='del'>-			get_option_menu_value (GTK_OPTION_MENU (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_TOGGLE_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_toggle_value (GTK_TOGGLE_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_SPIN_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_spin_button_value (GTK_SPIN_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_EDITABLE (wh-&gt;widget))</div><div class='del'>-			get_editable_value (GTK_EDITABLE (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_xml_widget_hook_value:</div><div class='del'>- * @xml: Glade XML description of a dialog box.</div><div class='del'>- * @dialog: Dialog box in which the widget lives in.</div><div class='del'>- * @widget_name: Name of the widget in the Glade XML data.</div><div class='del'>- * @value_var: Pointer to the variable that the widget will control.</div><div class='del'>- * @info: NULL for most widgets, or an integer value map array (see</div><div class='del'>- * e_dialog_radio_set() for details).</div><div class='del'>- * </div><div class='del'>- * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML</div><div class='del'>- * data structure.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the type of the specified widget is supported, FALSE</div><div class='del'>- * otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,</div><div class='del'>-				gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (xml != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GLADE_IS_XML (xml), FALSE);</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (widget_name != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (value_var != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget (xml, widget_name);</div><div class='del'>-	if (!widget) {</div><div class='del'>-		g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in "</div><div class='del'>-			   "Glade data!", widget_name);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_dialog_widget_hook_value (dialog, widget, value_var, info);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h<br/>deleted file mode 100644<br/>index a006092e04..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-widgets.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-dialog-widgets.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* Evolution internal utilities - Glade dialog widget utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_DIALOG_WIDGETS_H</div><div class='del'>-#define E_DIALOG_WIDGETS_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void e_dialog_editable_set (GtkWidget *widget, const char *value);</div><div class='del'>-char *e_dialog_editable_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map);</div><div class='del'>-int e_dialog_radio_get (GtkWidget *widget, const int *value_map);</div><div class='del'>-</div><div class='del'>-void e_dialog_toggle_set (GtkWidget *widget, gboolean value);</div><div class='del'>-gboolean e_dialog_toggle_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_spin_set (GtkWidget *widget, double value);</div><div class='del'>-double e_dialog_spin_get_double (GtkWidget *widget);</div><div class='del'>-int e_dialog_spin_get_int (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map);</div><div class='del'>-int e_dialog_option_menu_get (GtkWidget *widget, const int *value_map);</div><div class='del'>-</div><div class='del'>-void e_dialog_dateedit_set (GtkWidget *widget, time_t t);</div><div class='del'>-time_t e_dialog_dateedit_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,</div><div class='del'>-				     gpointer value_var, gpointer info);</div><div class='del'>-</div><div class='del'>-void e_dialog_get_values (GtkWidget *dialog);</div><div class='del'>-</div><div class='del'>-gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,</div><div class='del'>-					 gpointer value_var, gpointer info);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c<br/>deleted file mode 100644<br/>index ed233be3f5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gtk-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-gtk-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,152 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-gtk-utils.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtklayout.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gdk/gdkx.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;X11/Xlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-gtk-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* (Cut and pasted from Gtk.)  */</div><div class='del'>-</div><div class='del'>-typedef struct DisconnectInfo {</div><div class='del'>-	unsigned int signal_handler;</div><div class='del'>-</div><div class='del'>-	GtkObject *object1;</div><div class='del'>-	unsigned int disconnect_handler1;</div><div class='del'>-</div><div class='del'>-	GtkObject *object2;</div><div class='del'>-	unsigned int disconnect_handler2;</div><div class='del'>-} DisconnectInfo;</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-alive_disconnecter (GtkObject *object,</div><div class='del'>-		    DisconnectInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_assert (info != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object1, info-&gt;disconnect_handler1);</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object1, info-&gt;signal_handler);</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object2, info-&gt;disconnect_handler2);</div><div class='del'>-	</div><div class='del'>-	g_free (info);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_gtk_signal_connect_full_while_alive:</div><div class='del'>- * @object: </div><div class='del'>- * @name: </div><div class='del'>- * @func: </div><div class='del'>- * @marshal: </div><div class='del'>- * @data: </div><div class='del'>- * @destroy_func: </div><div class='del'>- * @object_signal: </div><div class='del'>- * @after: </div><div class='del'>- * @alive_object: </div><div class='del'>- * </div><div class='del'>- * Connect a signal like `gtk_signal_connect_while_alive()', but with full</div><div class='del'>- * params like `gtk_signal_connect_full()'.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_gtk_signal_connect_full_while_alive (GtkObject *object,</div><div class='del'>-				       const char *name,</div><div class='del'>-				       GtkSignalFunc func,</div><div class='del'>-				       GtkCallbackMarshal marshal,</div><div class='del'>-				       void *data,</div><div class='del'>-				       GtkDestroyNotify destroy_func,</div><div class='del'>-				       gboolean object_signal,</div><div class='del'>-				       gboolean after,</div><div class='del'>-				       GtkObject *alive_object)</div><div class='del'>-{</div><div class='del'>-	DisconnectInfo *info;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (GTK_IS_OBJECT (object));</div><div class='del'>-	g_return_if_fail (name != NULL);</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_OBJECT (alive_object));</div><div class='del'>-	</div><div class='del'>-	info = g_new (DisconnectInfo, 1);</div><div class='del'>-</div><div class='del'>-	info-&gt;signal_handler = gtk_signal_connect_full (object, name,</div><div class='del'>-							func, marshal, data,</div><div class='del'>-							destroy_func,</div><div class='del'>-							object_signal, after);</div><div class='del'>-</div><div class='del'>-	info-&gt;object1 = object;</div><div class='del'>-	info-&gt;disconnect_handler1 = gtk_signal_connect (object, "destroy",</div><div class='del'>-							GTK_SIGNAL_FUNC (alive_disconnecter), info);</div><div class='del'>-</div><div class='del'>-	info-&gt;object2 = alive_object;</div><div class='del'>-	info-&gt;disconnect_handler2 = gtk_signal_connect (alive_object, "destroy",</div><div class='del'>-							GTK_SIGNAL_FUNC (alive_disconnecter), info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* BackingStore support.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-widget_realize_callback_for_backing_store (GtkWidget *widget,</div><div class='del'>-					   void *data)</div><div class='del'>-{</div><div class='del'>-	XSetWindowAttributes attributes;</div><div class='del'>-	GdkWindow *window;</div><div class='del'>-</div><div class='del'>-	if (GTK_IS_LAYOUT (widget))</div><div class='del'>-		window = GTK_LAYOUT (widget)-&gt;bin_window;</div><div class='del'>-	else</div><div class='del'>-		window = widget-&gt;window;</div><div class='del'>-</div><div class='del'>-	attributes.backing_store = Always;</div><div class='del'>-	XChangeWindowAttributes (GDK_WINDOW_XDISPLAY (window), GDK_WINDOW_XWINDOW (window),</div><div class='del'>-				 CWBackingStore, &amp;attributes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_make_widget_backing_stored:</div><div class='del'>- * @widget: A GtkWidget</div><div class='del'>- * </div><div class='del'>- * Make sure that the window for @widget has the BackingStore attribute set to</div><div class='del'>- * Always when realized.  This will allow the widget to be refreshed by the X</div><div class='del'>- * server even if the application is currently not responding to X events (this</div><div class='del'>- * is e.g. very useful for the splash screen).</div><div class='del'>- *</div><div class='del'>- * Notice that this will not work 100% in all cases as the server might not</div><div class='del'>- * support that or just refuse to do so.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_make_widget_backing_stored  (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (widget), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (widget_realize_callback_for_backing_store), NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h<br/>deleted file mode 100644<br/>index 3eae136152..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gtk-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-gtk-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-gtk-utils.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_GTK_UTILS_H</div><div class='del'>-#define E_GTK_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkradiobutton.h&gt;</div><div class='del'>-</div><div class='del'>-void  e_gtk_signal_connect_full_while_alive  (GtkObject          *object,</div><div class='del'>-					      const char         *name,</div><div class='del'>-					      GtkSignalFunc       func,</div><div class='del'>-					      GtkCallbackMarshal  marshal,</div><div class='del'>-					      void               *data,</div><div class='del'>-					      GtkDestroyNotify    destroy_func,</div><div class='del'>-					      gboolean            object_signal,</div><div class='del'>-					      gboolean            after,</div><div class='del'>-					      GtkObject          *alive_object);</div><div class='del'>-</div><div class='del'>-void  e_make_widget_backing_stored  (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c<br/>deleted file mode 100644<br/>index 70007cf07a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gui-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-gui-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * GUI utility functions</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Miguel de Icaza (miguel@ximian.com)</div><div class='del'>- *</div><div class='del'>- * (C) 1999 Miguel de Icaza</div><div class='del'>- * (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-gui-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkalignment.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-GtkWidget *e_create_image_widget(gchar *name,</div><div class='del'>-				 gchar *string1, gchar *string2,</div><div class='del'>-				 gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	double width, height;</div><div class='del'>-	GtkWidget *canvas, *alignment;</div><div class='del'>-	if (string1) {</div><div class='del'>-		if (*string1 == '/')</div><div class='del'>-			filename = g_strdup(string1);</div><div class='del'>-		else</div><div class='del'>-			filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1);</div><div class='del'>-		pixbuf = gdk_pixbuf_new_from_file(filename);</div><div class='del'>-		width = gdk_pixbuf_get_width(pixbuf);</div><div class='del'>-		height = gdk_pixbuf_get_height(pixbuf);</div><div class='del'>-</div><div class='del'>-		canvas = gnome_canvas_new_aa();</div><div class='del'>-		GTK_OBJECT_UNSET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS);</div><div class='del'>-		gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(canvas)),</div><div class='del'>-				      gnome_canvas_pixbuf_get_type(),</div><div class='del'>-				      "pixbuf", pixbuf,</div><div class='del'>-				      NULL);</div><div class='del'>-</div><div class='del'>-		alignment = gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-					   "child", canvas,</div><div class='del'>-					   "xalign", (double) 0,</div><div class='del'>-					   "yalign", (double) 0,</div><div class='del'>-					   "xscale", (double) 0,</div><div class='del'>-					   "yscale", (double) 0,</div><div class='del'>-					   NULL);</div><div class='del'>-	</div><div class='del'>-		gtk_widget_set_usize(canvas, width, height);</div><div class='del'>-</div><div class='del'>-		gdk_pixbuf_unref(pixbuf);</div><div class='del'>-</div><div class='del'>-		gtk_widget_show(canvas);</div><div class='del'>-		gtk_widget_show(alignment);</div><div class='del'>-		g_free(filename);</div><div class='del'>-</div><div class='del'>-		return alignment;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h<br/>deleted file mode 100644<br/>index 9cbb64fbf6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gui-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-gui-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef E_GUI_UTILS_H</div><div class='del'>-#define E_GUI_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-#endif /* E_GUI_UTILS_H */</div><div class='head'>diff --git a/e-util/e-host-utils.c b/e-util/e-host-utils.c<br/>deleted file mode 100644<br/>index 1649d14ece..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-host-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-host-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,219 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-host-utils.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Chris Toshok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "e-host-utils.h"</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#if !defined (HAVE_GETHOSTBYNAME_R) || !defined (HAVE_GETHOSTBYADDR_R)</div><div class='del'>-G_LOCK_DEFINE_STATIC (gethost_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GETHOST_PROCESS(h, host, buf, buflen, herr) G_STMT_START {     \</div><div class='del'>-	int num_aliases = 0, num_addrs = 0;                            \</div><div class='del'>-	int req_length;                                                \</div><div class='del'>-	char *p;                                                       \</div><div class='del'>-	int i;                                                         \</div><div class='del'>-	                                                               \</div><div class='del'>-	/* check to make sure we have enough room in our buffer */     \</div><div class='del'>-	req_length = 0;                                                \</div><div class='del'>-	if (h-&gt;h_aliases) {                                            \</div><div class='del'>-		for (i = 0; h-&gt;h_aliases[i]; i++)                      \</div><div class='del'>-			req_length += strlen (h-&gt;h_aliases[i]) + 1;    \</div><div class='del'>-		num_aliases = i;                                       \</div><div class='del'>-	}                                                              \</div><div class='del'>-	                                                               \</div><div class='del'>-	if (h-&gt;h_addr_list) {                                          \</div><div class='del'>-		for (i = 0; h-&gt;h_addr_list[i]; i++)                    \</div><div class='del'>-			req_length += h-&gt;h_length;                     \</div><div class='del'>-		num_addrs = i;                                         \</div><div class='del'>-	}                                                              \</div><div class='del'>-	                                                               \</div><div class='del'>-	req_length += sizeof (char *) * (num_aliases + 1);             \</div><div class='del'>-	req_length += sizeof (char *) * (num_addrs + 1);               \</div><div class='del'>-	req_length += strlen (h-&gt;h_name) + 1;                          \</div><div class='del'>-	                                                               \</div><div class='del'>-	if (buflen &lt; req_length) {                                     \</div><div class='del'>-		*herr = ERANGE;                                        \</div><div class='del'>-		G_UNLOCK (gethost_mutex);                              \</div><div class='del'>-		return ERANGE;                                         \</div><div class='del'>-	}                                                              \</div><div class='del'>-	                                                               \</div><div class='del'>-	/* we store the alias/addr pointers in the buffer */           \</div><div class='del'>-        /* their addresses here. */                                    \</div><div class='del'>-	p = buf;                                                       \</div><div class='del'>-	if (num_aliases) {                                             \</div><div class='del'>-		host-&gt;h_aliases = (char **) p;                         \</div><div class='del'>-		p += sizeof (char *) * (num_aliases + 1);              \</div><div class='del'>-	} else                                                         \</div><div class='del'>-		host-&gt;h_aliases = NULL;                                \</div><div class='del'>-                                                                       \</div><div class='del'>-	if (num_addrs) {                                               \</div><div class='del'>-		host-&gt;h_addr_list = (char **) p;                       \</div><div class='del'>-		p += sizeof (char *) * (num_addrs + 1);                \</div><div class='del'>-	} else                                                         \</div><div class='del'>-		host-&gt;h_addr_list = NULL;                              \</div><div class='del'>-	                                                               \</div><div class='del'>-	/* copy the host name into the buffer */                       \</div><div class='del'>-	host-&gt;h_name = p;                                              \</div><div class='del'>-	strcpy (p, h-&gt;h_name);                                         \</div><div class='del'>-	p += strlen (h-&gt;h_name) + 1;                                   \</div><div class='del'>-	host-&gt;h_addrtype = h-&gt;h_addrtype;                              \</div><div class='del'>-	host-&gt;h_length = h-&gt;h_length;                                  \</div><div class='del'>-	                                                               \</div><div class='del'>-	/* copy the aliases/addresses into the buffer */               \</div><div class='del'>-        /* and assign pointers into the hostent */                     \</div><div class='del'>-	*p = 0;                                                        \</div><div class='del'>-	if (num_aliases) {                                             \</div><div class='del'>-		for (i = 0; i &lt; num_aliases; i++) {                    \</div><div class='del'>-			strcpy (p, h-&gt;h_aliases[i]);                   \</div><div class='del'>-			host-&gt;h_aliases[i] = p;                        \</div><div class='del'>-			p += strlen (h-&gt;h_aliases[i]);                 \</div><div class='del'>-		}                                                      \</div><div class='del'>-		host-&gt;h_aliases[num_aliases] = NULL;                   \</div><div class='del'>-	}                                                              \</div><div class='del'>-	                                                               \</div><div class='del'>-	if (num_addrs) {                                               \</div><div class='del'>-		for (i = 0; i &lt; num_addrs; i++) {                      \</div><div class='del'>-			memcpy (p, h-&gt;h_addr_list[i], h-&gt;h_length);    \</div><div class='del'>-			host-&gt;h_addr_list[i] = p;                      \</div><div class='del'>-			p += h-&gt;h_length;                              \</div><div class='del'>-		}                                                      \</div><div class='del'>-		host-&gt;h_addr_list[num_addrs] = NULL;                   \</div><div class='del'>-	}                                                              \</div><div class='del'>-} G_STMT_END</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_gethostbyname_r:</div><div class='del'>- * @name: the host to resolve</div><div class='del'>- * @host: a buffer pointing to a struct hostent to use for storage</div><div class='del'>- * @buf: a buffer to use for hostname storage</div><div class='del'>- * @buflen: the size of @buf</div><div class='del'>- * @herr: a pointer to a variable to store an error code in</div><div class='del'>- *</div><div class='del'>- * Resolves the hostname @name, in a hopefully-reentrant fashion.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 on success, ERANGE if @buflen is too small,</div><div class='del'>- * "something else" otherwise (in which case *@herr will be set to</div><div class='del'>- * one of the gethostbyname() error codes).</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_gethostbyname_r (const char *name, struct hostent *host,</div><div class='del'>-		   char *buf, size_t buflen, int *herr)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_GETHOSTBYNAME_R</div><div class='del'>-#ifdef GETHOSTBYNAME_R_FIVE_ARGS</div><div class='del'>-	if (gethostbyname_r (name, host, buf, buflen, herr))</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return errno;</div><div class='del'>-#else</div><div class='del'>-	struct hostent *hp;</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	retval = gethostbyname_r (name, host, buf, buflen, &amp;hp, herr);</div><div class='del'>-	if (hp != NULL)</div><div class='del'>-		*herr = 0;</div><div class='del'>-	return retval;</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	</div><div class='del'>-	G_LOCK (gethost_mutex);</div><div class='del'>-	</div><div class='del'>-	h = gethostbyname (name);</div><div class='del'>-	</div><div class='del'>-	if (!h) {</div><div class='del'>-		*herr = h_errno;</div><div class='del'>-		G_UNLOCK (gethost_mutex);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	GETHOST_PROCESS (h, host,buf, buflen, herr);</div><div class='del'>-	</div><div class='del'>-	G_UNLOCK (gethost_mutex);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_gethostbyaddr_r:</div><div class='del'>- * @addr: the addr to resolve</div><div class='del'>- * @len: address length</div><div class='del'>- * @type: AF type</div><div class='del'>- * @host: a buffer pointing to a struct hostent to use for storage</div><div class='del'>- * @buf: a buffer to use for hostname storage</div><div class='del'>- * @buflen: the size of @buf</div><div class='del'>- * @herr: a pointer to a variable to store an error code in</div><div class='del'>- *</div><div class='del'>- * Resolves the address @addr, in a hopefully-reentrant fashion.</div><div class='del'>- *</div><div class='del'>- * Return value: 0 on success, ERANGE if @buflen is too small,</div><div class='del'>- * "something else" otherwise (in which case *@herr will be set to</div><div class='del'>- * one of the gethostbyaddr() error codes).</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_gethostbyaddr_r (const char *addr, int len, int type, struct hostent *host,</div><div class='del'>-		   char *buf, size_t buflen, int *herr)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_GETHOSTBYADDR_R</div><div class='del'>-#ifdef GETHOSTBYADDR_R_SEVEN_ARGS</div><div class='del'>-	if (gethostbyaddr_r (addr, len, type, host, buf, buflen, herr))</div><div class='del'>-		return 0;</div><div class='del'>-	else</div><div class='del'>-		return errno;</div><div class='del'>-#else</div><div class='del'>-	struct hostent *hp;</div><div class='del'>-	int retval;</div><div class='del'>-	</div><div class='del'>-	retval = gethostbyaddr_r (addr, len, type, host, buf, buflen, &amp;hp, herr);</div><div class='del'>-	if (hp != NULL)</div><div class='del'>-		*herr = 0;</div><div class='del'>-	return retval;</div><div class='del'>-#endif</div><div class='del'>-#else</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	</div><div class='del'>-	G_LOCK (gethost_mutex);</div><div class='del'>-	</div><div class='del'>-	h = gethostbyaddr (addr, len, type);</div><div class='del'>-	</div><div class='del'>-	if (!h) {</div><div class='del'>-		*herr = h_errno;</div><div class='del'>-		G_UNLOCK (gethost_mutex);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	GETHOST_PROCESS (h, host, buf, buflen, herr);</div><div class='del'>-	</div><div class='del'>-	G_UNLOCK (gethost_mutex);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-host-utils.h b/e-util/e-host-utils.h<br/>deleted file mode 100644<br/>index 543a9d3cc2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-host-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-host-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,38 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-host-utils.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Authors: Chris Toshok, Jeffrey Stedfast</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_HOST_UTILS_H</div><div class='del'>-#define E_HOST_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;netdb.h&gt;</div><div class='del'>-</div><div class='del'>-/* gethostbyname_r implementation that works for systems without a</div><div class='del'>-   native gethostbyname_r.  if you use this, you must make sure to</div><div class='del'>-   *only* use this - it can't even coexist with naked calls to</div><div class='del'>-   gethostbyname (even if they exist in libraries.)  yes, this loses</div><div class='del'>-   in many ways.  blame your local OS developer. */</div><div class='del'>-int e_gethostbyname_r (const char *name, struct hostent *host, char *buf, size_t buflen, int *herr);</div><div class='del'>-</div><div class='del'>-int e_gethostbyaddr_r (const char *addr, int len, int type, struct hostent *host, char *buf, size_t buflen, int *herr);</div><div class='del'>-</div><div class='del'>-#endif /* E_HOST_UTILS_H */</div><div class='head'>diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c<br/>deleted file mode 100644<br/>index 2b5e3d2d37..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-html-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-html-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,418 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-html-utils.c</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gal/unicode/gunicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-html-utils.h"</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-check_size (char **buffer, int *buffer_size, char *out, int len)</div><div class='del'>-{</div><div class='del'>-	if (out + len + 1&gt; *buffer + *buffer_size) {</div><div class='del'>-		int index = out - *buffer;</div><div class='del'>-</div><div class='del'>-		*buffer_size = MAX (index + len + 1, *buffer_size * 2);</div><div class='del'>-		*buffer = g_realloc (*buffer, *buffer_size);</div><div class='del'>-		out = *buffer + index;</div><div class='del'>-	}</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 1 = non-email-address chars: ()&lt;&gt;@,;:\"[]`'|  */</div><div class='del'>-/* 2 = trailing url garbage:    ,.!?;:&gt;)]}`'-_|  */</div><div class='del'>-static int special_chars[] = {</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /*  nul - 0x0f */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /* 0x10 - 0x1f */</div><div class='del'>-	1, 2, 1, 0, 0, 0, 0, 3, 1, 3, 0, 0, 3, 2, 2, 0,    /*   sp - /    */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 1, 0, 3, 2,    /*    0 - ?    */</div><div class='del'>-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /*    @ - O    */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 3, 0, 2,    /*    P - _    */</div><div class='del'>-	3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    /*    ` - o    */</div><div class='del'>-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 0, 0     /*    p - del  */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define is_addr_char(c) (isprint (c) &amp;&amp; !(special_chars[c] &amp; 1))</div><div class='del'>-#define is_trailing_garbage(c) (!isprint(c) || (special_chars[c] &amp; 2))</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-url_extract (const unsigned char **text, gboolean check)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *end = *text, *p;</div><div class='del'>-	char *out;</div><div class='del'>-</div><div class='del'>-	while (*end &amp;&amp; !isspace (*end) &amp;&amp; (*end != '"') &amp;&amp; (*end &lt; 0x80))</div><div class='del'>-		end++;</div><div class='del'>-</div><div class='del'>-	/* Back up if we probably went too far. */</div><div class='del'>-	while (end &gt; *text &amp;&amp; is_trailing_garbage (*(end - 1)))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	if (check) {</div><div class='del'>-		/* Make sure we weren't fooled. */</div><div class='del'>-		p = memchr (*text, ':', end - *text);</div><div class='del'>-		if (!p || end - p &lt; 4)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out = g_strndup (*text, end - *text);</div><div class='del'>-	*text = end;</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-email_address_extract (const unsigned char **cur, char **out, const unsigned char *linestart)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *start, *end, *dot;</div><div class='del'>-	char *addr;</div><div class='del'>-</div><div class='del'>-	/* *cur points to the '@'. Look backward for a valid local-part */</div><div class='del'>-	for (start = *cur; start - 1 &gt;= linestart &amp;&amp; is_addr_char (*(start - 1)); start--)</div><div class='del'>-		;</div><div class='del'>-	if (start == *cur)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Now look forward for a valid domain part */</div><div class='del'>-	for (end = *cur + 1, dot = NULL; is_addr_char (*end); end++) {</div><div class='del'>-		if (*end == '.' &amp;&amp; !dot)</div><div class='del'>-			dot = end;</div><div class='del'>-	}</div><div class='del'>-	if (!dot)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Remove trailing garbage */</div><div class='del'>-	while (is_trailing_garbage (*(end - 1)))</div><div class='del'>-		end--;</div><div class='del'>-	if (dot &gt; end)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	addr = g_strndup (start, end - start);</div><div class='del'>-	*out -= *cur - start;</div><div class='del'>-	*cur = end;</div><div class='del'>-</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-is_citation (const unsigned char *c, gboolean saw_citation)</div><div class='del'>-{</div><div class='del'>-	gunichar u;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	/* A line that starts with a "&gt;" is a citation, unless it's</div><div class='del'>-	 * just mbox From-mangling...</div><div class='del'>-	 */</div><div class='del'>-	if (*c == '&gt;') {</div><div class='del'>-		const unsigned char *p;</div><div class='del'>-</div><div class='del'>-		if (strncmp (c, "&gt;From ", 6) != 0)</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		/* If the previous line was a citation, then say this</div><div class='del'>-		 * one is too.</div><div class='del'>-		 */</div><div class='del'>-		if (saw_citation)</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		/* Same if the next line is */</div><div class='del'>-		p = (const unsigned char *)strchr ((const char *)c, '\n');</div><div class='del'>-		if (p &amp;&amp; *++p == '&gt;')</div><div class='del'>-			return TRUE;</div><div class='del'>-</div><div class='del'>-		/* Otherwise, it was just an isolated "&gt;From" line. */</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check for "Rupert&gt; " and the like... */</div><div class='del'>-	for (i = 0; c &amp;&amp; *c &amp;&amp; g_unichar_validate (g_utf8_get_char (c)) &amp;&amp; *c != '\n' &amp;&amp; i &lt; 10; i ++, c = g_utf8_next_char (c)) {</div><div class='del'>-		u = g_utf8_get_char (c);</div><div class='del'>-		if (u == '&gt;')</div><div class='del'>-			return TRUE;</div><div class='del'>-		if (!g_unichar_isalnum (u))</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_text_to_html_full:</div><div class='del'>- * @input: a NUL-terminated input buffer</div><div class='del'>- * @flags: some combination of the E_TEXT_TO_HTML_* flags defined</div><div class='del'>- * in e-html-utils.h</div><div class='del'>- * @color: color for citation highlighting</div><div class='del'>- *</div><div class='del'>- * This takes a buffer of text as input and produces a buffer of</div><div class='del'>- * "equivalent" HTML, subject to certain transformation rules.</div><div class='del'>- *</div><div class='del'>- * The set of possible flags is:</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_PRE: wrap the output HTML in &lt;PRE&gt; and &lt;/PRE&gt;.</div><div class='del'>- *     Should only be used if @input is the entire buffer to be</div><div class='del'>- *     converted. If e_text_to_html is being called with small pieces</div><div class='del'>- *     of data, you should wrap the entire result in &lt;PRE&gt; yourself.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_NL: convert "\n" to "&lt;BR&gt;\n" on output.</div><div class='del'>- *     (should not be used with E_TEXT_TO_HTML_PRE, since that would</div><div class='del'>- *     result in double-newlines).</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_SPACES: convert a block of N spaces</div><div class='del'>- *     into N-1 non-breaking spaces and one normal space. A space</div><div class='del'>- *     at the start of the buffer is always converted to a</div><div class='del'>- *     non-breaking space, regardless of the following character,</div><div class='del'>- *     which probably means you don't want to use this flag on</div><div class='del'>- *     pieces of data that aren't delimited by at least line breaks.</div><div class='del'>- *</div><div class='del'>- *     If E_TEXT_TO_HTML_CONVERT_NL and E_TEXT_TO_HTML_CONVERT_SPACES</div><div class='del'>- *     are both defined, then TABs will also be converted to spaces.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_URLS: wrap &lt;a href="..."&gt; &lt;/a&gt; around</div><div class='del'>- *     strings that look like URLs.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_ADDRESSES: wrap &lt;a href="mailto:..."&gt; &lt;/a&gt; around</div><div class='del'>- *     strings that look like mail addresses.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_MARK_CITATION: wrap &lt;font color="..."&gt; &lt;/font&gt; around</div><div class='del'>- *     citations (lines beginning with "&gt; ", etc).</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_ESCAPE_8BIT: flatten everything to US-ASCII</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CITE: quote the text with "&gt; " at the start of each</div><div class='del'>- *     line.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_text_to_html_full (const char *input, unsigned int flags, guint32 color)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *cur, *next, *linestart;</div><div class='del'>-	char *buffer = NULL;</div><div class='del'>-	char *out = NULL;</div><div class='del'>-	int buffer_size = 0, col;</div><div class='del'>-	gboolean colored = FALSE, saw_citation = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Allocate a translation buffer.  */</div><div class='del'>-	buffer_size = strlen (input) * 2 + 5;</div><div class='del'>-	buffer = g_malloc (buffer_size);</div><div class='del'>-</div><div class='del'>-	out = buffer;</div><div class='del'>-	if (flags &amp; E_TEXT_TO_HTML_PRE)</div><div class='del'>-		out += sprintf (out, "&lt;PRE&gt;");</div><div class='del'>-</div><div class='del'>-	col = 0;</div><div class='del'>-</div><div class='del'>-	for (cur = linestart = input; cur &amp;&amp; *cur; cur = next) {</div><div class='del'>-		gunichar u;</div><div class='del'>-</div><div class='del'>-		if (flags &amp; E_TEXT_TO_HTML_MARK_CITATION &amp;&amp; col == 0) {</div><div class='del'>-			saw_citation = is_citation (cur, saw_citation);</div><div class='del'>-			if (saw_citation) {</div><div class='del'>-				if (!colored) {</div><div class='del'>-					gchar font [25];</div><div class='del'>-</div><div class='del'>-					g_snprintf (font, 25, "&lt;FONT COLOR=\"#%06x\"&gt;", color);</div><div class='del'>-</div><div class='del'>-					out = check_size (&amp;buffer, &amp;buffer_size, out, 25);</div><div class='del'>-					out += sprintf (out, "%s", font);</div><div class='del'>-					colored = TRUE;</div><div class='del'>-				}</div><div class='del'>-			} else if (colored) {</div><div class='del'>-				gchar *no_font = "&lt;/FONT&gt;";</div><div class='del'>-</div><div class='del'>-				out = check_size (&amp;buffer, &amp;buffer_size, out, 9);</div><div class='del'>-				out += sprintf (out, "%s", no_font);</div><div class='del'>-				colored = FALSE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Display mbox-mangled "&gt;From" as "From" */</div><div class='del'>-			if (*cur == '&gt;' &amp;&amp; !saw_citation)</div><div class='del'>-				cur++;</div><div class='del'>-		} else if (flags &amp; E_TEXT_TO_HTML_CITE &amp;&amp; col == 0) {</div><div class='del'>-			out = check_size (&amp;buffer, &amp;buffer_size, out, 5);</div><div class='del'>-			out += sprintf (out, "&amp;gt; ");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		u = g_utf8_get_char (cur);</div><div class='del'>-		if (g_unichar_isalpha (u) &amp;&amp;</div><div class='del'>-		    (flags &amp; E_TEXT_TO_HTML_CONVERT_URLS)) {</div><div class='del'>-			char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;</div><div class='del'>-</div><div class='del'>-			if (!strncasecmp (cur, "http://", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "https://", 8) ||</div><div class='del'>-			    !strncasecmp (cur, "ftp://", 6) ||</div><div class='del'>-			    !strncasecmp (cur, "nntp://", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "mailto:", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "news:", 5)) {</div><div class='del'>-				tmpurl = url_extract (&amp;cur, TRUE);</div><div class='del'>-				if (tmpurl) {</div><div class='del'>-					refurl = e_text_to_html (tmpurl, 0);</div><div class='del'>-					dispurl = g_strdup (refurl);</div><div class='del'>-				}</div><div class='del'>-			} else if (!strncasecmp (cur, "www.", 4) &amp;&amp;</div><div class='del'>-				   (*(cur + 4) &lt; 0x80) &amp;&amp;</div><div class='del'>-				   g_unichar_isalnum (*(cur + 4))) {</div><div class='del'>-				tmpurl = url_extract (&amp;cur, FALSE);</div><div class='del'>-				dispurl = e_text_to_html (tmpurl, 0);</div><div class='del'>-				refurl = g_strdup_printf ("http://%s",</div><div class='del'>-							  dispurl);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (tmpurl) {</div><div class='del'>-				out = check_size (&amp;buffer, &amp;buffer_size, out,</div><div class='del'>-						  strlen (refurl) +</div><div class='del'>-						  strlen (dispurl) + 15);</div><div class='del'>-				out += sprintf (out,</div><div class='del'>-						"&lt;a href=\"%s\"&gt;%s&lt;/a&gt;",</div><div class='del'>-						refurl, dispurl);</div><div class='del'>-				col += strlen (tmpurl);</div><div class='del'>-				g_free (tmpurl);</div><div class='del'>-				g_free (refurl);</div><div class='del'>-				g_free (dispurl);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!*cur)</div><div class='del'>-				break;</div><div class='del'>-			u = g_utf8_get_char (cur);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (u == '@' &amp;&amp; (flags &amp; E_TEXT_TO_HTML_CONVERT_ADDRESSES)) {</div><div class='del'>-			char *addr, *dispaddr, *outaddr;</div><div class='del'>-</div><div class='del'>-			addr = email_address_extract (&amp;cur, &amp;out, linestart);</div><div class='del'>-			if (addr) {</div><div class='del'>-				dispaddr = e_text_to_html (addr, 0);</div><div class='del'>-				outaddr = g_strdup_printf ("&lt;a href=\"mailto:%s\"&gt;%s&lt;/a&gt;",</div><div class='del'>-							   addr, dispaddr);</div><div class='del'>-				out = check_size (&amp;buffer, &amp;buffer_size, out, strlen (outaddr));</div><div class='del'>-				out += sprintf (out, "%s", outaddr);</div><div class='del'>-				col += strlen (addr);</div><div class='del'>-				g_free (addr);</div><div class='del'>-				g_free (dispaddr);</div><div class='del'>-				g_free (outaddr);</div><div class='del'>-</div><div class='del'>-				if (!*cur)</div><div class='del'>-					break;</div><div class='del'>-				u = g_utf8_get_char (cur);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!g_unichar_validate (u)) {</div><div class='del'>-			/* Sigh. Someone sent undeclared 8-bit data.</div><div class='del'>-			 * Assume it's iso-8859-1.</div><div class='del'>-			 */</div><div class='del'>-			u = *cur;</div><div class='del'>-			next = cur + 1;</div><div class='del'>-		} else</div><div class='del'>-			next = g_utf8_next_char (cur);</div><div class='del'>-</div><div class='del'>-		out = check_size (&amp;buffer, &amp;buffer_size, out, 10);</div><div class='del'>-</div><div class='del'>-		switch (u) {</div><div class='del'>-		case '&lt;':</div><div class='del'>-			strcpy (out, "&amp;lt;");</div><div class='del'>-			out += 4;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '&gt;':</div><div class='del'>-			strcpy (out, "&amp;gt;");</div><div class='del'>-			out += 4;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '&amp;':</div><div class='del'>-			strcpy (out, "&amp;amp;");</div><div class='del'>-			out += 5;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '"':</div><div class='del'>-			strcpy (out, "&amp;quot;");</div><div class='del'>-			out += 6;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '\n':</div><div class='del'>-			if (flags &amp; E_TEXT_TO_HTML_CONVERT_NL) {</div><div class='del'>-				strcpy (out, "&lt;br&gt;");</div><div class='del'>-				out += 4;</div><div class='del'>-			}</div><div class='del'>-			*out++ = *cur;</div><div class='del'>-			linestart = cur;</div><div class='del'>-			col = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '\t':</div><div class='del'>-			if (flags &amp; (E_TEXT_TO_HTML_CONVERT_SPACES |</div><div class='del'>-				     E_TEXT_TO_HTML_CONVERT_NL)) {</div><div class='del'>-				do {</div><div class='del'>-					out = check_size (&amp;buffer, &amp;buffer_size,</div><div class='del'>-						    out, 7);</div><div class='del'>-					strcpy (out, "&amp;nbsp;");</div><div class='del'>-					out += 6;</div><div class='del'>-					col++;</div><div class='del'>-				} while (col % 8);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-</div><div class='del'>-		case ' ':</div><div class='del'>-			if (flags &amp; E_TEXT_TO_HTML_CONVERT_SPACES) {</div><div class='del'>-				if (cur == (const unsigned char *)input ||</div><div class='del'>-				    *(cur + 1) == ' ' || *(cur + 1) == '\t' ||</div><div class='del'>-				    *(cur - 1) == '\n') {</div><div class='del'>-					strcpy (out, "&amp;nbsp;");</div><div class='del'>-					out += 6;</div><div class='del'>-					col++;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			if ((u &gt;= 0x20 &amp;&amp; u &lt; 0x80) ||</div><div class='del'>-			    (u == '\r' || u == '\t')) {</div><div class='del'>-				/* Default case, just copy. */</div><div class='del'>-				*out++ = u;</div><div class='del'>-			} else {</div><div class='del'>-				if (flags &amp; E_TEXT_TO_HTML_ESCAPE_8BIT)</div><div class='del'>-					*out++ = '?';</div><div class='del'>-				else</div><div class='del'>-					out += g_snprintf(out, 9, "&amp;#%d;", u);</div><div class='del'>-			}</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out = check_size (&amp;buffer, &amp;buffer_size, out, 7);</div><div class='del'>-	if (flags &amp; E_TEXT_TO_HTML_PRE)</div><div class='del'>-		strcpy (out, "&lt;/PRE&gt;");</div><div class='del'>-	else</div><div class='del'>-		*out = '\0';</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_text_to_html (const char *input, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	return e_text_to_html_full (input, flags, 0);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h<br/>deleted file mode 100644<br/>index 551996e089..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-html-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-html-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-html-utils.c */</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- * Author: Dan Winship &lt;danw@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_HTML_UTILS__</div><div class='del'>-#define __E_HTML_UTILS__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TEXT_TO_HTML_PRE               (1 &lt;&lt; 0)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_NL        (1 &lt;&lt; 1)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_SPACES    (1 &lt;&lt; 2)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_URLS      (1 &lt;&lt; 3)</div><div class='del'>-#define E_TEXT_TO_HTML_MARK_CITATION     (1 &lt;&lt; 4)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_ADDRESSES (1 &lt;&lt; 5)</div><div class='del'>-#define E_TEXT_TO_HTML_ESCAPE_8BIT       (1 &lt;&lt; 6)</div><div class='del'>-#define E_TEXT_TO_HTML_CITE              (1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-char *e_text_to_html_full (const char *input, unsigned int flags, guint32 color);</div><div class='del'>-char *e_text_to_html      (const char *input, unsigned int flags);</div><div class='del'>-</div><div class='del'>-#endif /* __E_HTML_UTILS__ */</div><div class='head'>diff --git a/e-util/e-i18n.h b/e-util/e-i18n.h<br/>deleted file mode 100644<br/>index 48c9f90458..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-i18n.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-i18n.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-i18n.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copied from gnome-i18nP.h, because this header is typically not installed</div><div class='del'>- *</div><div class='del'>- * This file has to be included before any file from the GNOME libraries</div><div class='del'>- * to have this override the definitions that are pulled from the gnome-i18n.h</div><div class='del'>- *</div><div class='del'>- * the difference is that gnome-i18n.h is used for applications, and this is</div><div class='del'>- * used by libraries (because libraries have to use dcgettext instead of</div><div class='del'>- * gettext and they need to provide the translation domain, unlike apps).</div><div class='del'>- *</div><div class='del'>- * So you can just put this after you include config.h</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_I18N_H__</div><div class='del'>-#define __E_I18N_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_NLS</div><div class='del'>-#    include &lt;libintl.h&gt;</div><div class='del'>-#    undef _</div><div class='del'>-#    ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN</div><div class='del'>-#        define _(String) dgettext (GNOME_EXPLICIT_TRANSLATION_DOMAIN, String)</div><div class='del'>-/* No parentheses allowed here since that breaks string concatenation. */</div><div class='del'>-#        define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN</div><div class='del'>-#    else</div><div class='del'>-#        define _(String) dgettext (PACKAGE, String)</div><div class='del'>-/* No parentheses allowed here since that breaks string concatenation. */</div><div class='del'>-#        define E_I18N_DOMAIN PACKAGE</div><div class='del'>-#    endif</div><div class='del'>-#    ifdef gettext_noop</div><div class='del'>-#        define N_(String) gettext_noop (String)</div><div class='del'>-#    else</div><div class='del'>-#        define N_(String) (String)</div><div class='del'>-#    endif</div><div class='del'>-#else</div><div class='del'>-/* Stubs that do something close enough.  */</div><div class='del'>-#    define textdomain(String) (String)</div><div class='del'>-#    define gettext(String) (String)</div><div class='del'>-#    define dgettext(Domain,Message) (Message)</div><div class='del'>-#    define dcgettext(Domain,Message,Type) (Message)</div><div class='del'>-#    define bindtextdomain(Domain,Directory) (Domain)</div><div class='del'>-#    define _(String) (String)</div><div class='del'>-#    define N_(String) (String)</div><div class='del'>-/* No parentheses allowed here since that breaks string concatenation. */</div><div class='del'>-#    define E_I18N_DOMAIN ""</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Do not remove the following define, nor do surround it with ifdefs.</div><div class='del'>- *</div><div class='del'>- * If you get any `redefined' errors, it means that you are including</div><div class='del'>- * -incorrectly- a header file provided by gnome-libs before this file.</div><div class='del'>- * To correctly solve this issue include this file before any libgnome/</div><div class='del'>- * libgnomeui headers</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define __GNOME_I18N_H__ 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is copied staight out of the prototypes for gnome-i18n.h */</div><div class='del'>-const char *gnome_i18n_get_language(void);</div><div class='del'>-GList      *gnome_i18n_get_language_list (const gchar *category_name);</div><div class='del'>-void	   gnome_i18n_set_preferred_language (const char *val);</div><div class='del'>-const char *gnome_i18n_get_preferred_language (void);</div><div class='del'>-void gnome_i18n_init (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* __E_I18N_H__ */</div><div class='head'>diff --git a/e-util/e-iconv.c b/e-util/e-iconv.c<br/>deleted file mode 100644<br/>index 7f18a5b43e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iconv.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-iconv.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,478 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-iconv.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *   Jeffery Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "e-iconv.h"</div><div class='del'>-</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CODESET</div><div class='del'>-#include &lt;langinfo.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "iconv-detect.h"</div><div class='del'>-</div><div class='del'>-#define cd(x) </div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-static GStaticMutex lock = G_STATIC_MUTEX_INIT;</div><div class='del'>-#define LOCK() g_static_mutex_lock(&amp;lock)</div><div class='del'>-#define UNLOCK() g_static_mutex_unlock(&amp;lock)</div><div class='del'>-#else</div><div class='del'>-#define LOCK()</div><div class='del'>-#define UNLOCK()</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct _EDListNode {</div><div class='del'>-	struct _EDListNode *next;</div><div class='del'>-	struct _EDListNode *prev;</div><div class='del'>-} EDListNode;</div><div class='del'>-</div><div class='del'>-typedef struct _EDList {</div><div class='del'>-	struct _EDListNode *head;</div><div class='del'>-	struct _EDListNode *tail;</div><div class='del'>-	struct _EDListNode *tailpred;</div><div class='del'>-} EDList;</div><div class='del'>-</div><div class='del'>-#define E_DLIST_INITIALISER(l) { (EDListNode *)&amp;l.tail, 0, (EDListNode *)&amp;l.head }</div><div class='del'>-</div><div class='del'>-struct _iconv_cache_node {</div><div class='del'>-	struct _iconv_cache_node *next;</div><div class='del'>-	struct _iconv_cache_node *prev;</div><div class='del'>-</div><div class='del'>-	struct _iconv_cache *parent;</div><div class='del'>-</div><div class='del'>-	int busy;</div><div class='del'>-	iconv_t ip;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _iconv_cache {</div><div class='del'>-	struct _iconv_cache *next;</div><div class='del'>-	struct _iconv_cache *prev;</div><div class='del'>-</div><div class='del'>-	char *conv;</div><div class='del'>-</div><div class='del'>-	EDList open;		/* stores iconv_cache_nodes, busy ones up front */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define E_ICONV_CACHE_SIZE (16)</div><div class='del'>-</div><div class='del'>-static EDList iconv_cache_list;</div><div class='del'>-static GHashTable *iconv_cache;</div><div class='del'>-static GHashTable *iconv_cache_open;</div><div class='del'>-static unsigned int iconv_cache_size = 0;</div><div class='del'>-</div><div class='del'>-static GHashTable *iconv_charsets = NULL;</div><div class='del'>-static const char *locale_charset = NULL;</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *charset;</div><div class='del'>-	char *iconv_name;</div><div class='del'>-} known_iconv_charsets[] = {</div><div class='del'>-#if 0</div><div class='del'>-	/* charset name, iconv-friendly charset name */</div><div class='del'>-	{ "iso-8859-1",     "iso-8859-1" },</div><div class='del'>-	{ "iso8859-1",      "iso-8859-1" },</div><div class='del'>-	/* the above mostly serves as an example for iso-style charsets,</div><div class='del'>-	   but we have code that will populate the iso-*'s if/when they</div><div class='del'>-	   show up in e_iconv_charset_name() so I'm</div><div class='del'>-	   not going to bother putting them all in here... */</div><div class='del'>-	{ "windows-cp1251", "cp1251"     },</div><div class='del'>-	{ "windows-1251",   "cp1251"     },</div><div class='del'>-	{ "cp1251",         "cp1251"     },</div><div class='del'>-	/* the above mostly serves as an example for windows-style</div><div class='del'>-	   charsets, but we have code that will parse and convert them</div><div class='del'>-	   to their cp#### equivalents if/when they show up in</div><div class='del'>-	   e_iconv_charset_name() so I'm not going to bother</div><div class='del'>-	   putting them all in here either... */</div><div class='del'>-#endif</div><div class='del'>-	/* charset name (lowercase!), iconv-friendly name (sometimes case sensitive) */</div><div class='del'>-	{ "utf-8",          "UTF-8"      },</div><div class='del'>-</div><div class='del'>-	/* 10646 is a special case, its usually UCS-2 big endian */</div><div class='del'>-	/* This might need some checking but should be ok for solaris/linux */</div><div class='del'>-	{ "iso-10646-1",    "UCS-2BE"    },</div><div class='del'>-	{ "iso_10646-1",    "UCS-2BE"    },</div><div class='del'>-	{ "iso10646-1",     "UCS-2BE"    },</div><div class='del'>-	{ "iso-10646",      "UCS-2BE"    },</div><div class='del'>-	{ "iso_10646",      "UCS-2BE"    },</div><div class='del'>-	{ "iso10646",       "UCS-2BE"    },</div><div class='del'>-</div><div class='del'>-	{ "ks_c_5601-1987", "EUC-KR"     },</div><div class='del'>-</div><div class='del'>-	/* FIXME: Japanese/Korean/Chinese stuff needs checking */</div><div class='del'>-	{ "euckr-0",        "EUC-KR"     },</div><div class='del'>-	{ "big5-0",         "BIG5"       },</div><div class='del'>-	{ "big5.eten-0",    "BIG5"       },</div><div class='del'>-	{ "big5hkscs-0",    "BIG5HKCS"   },</div><div class='del'>-	{ "gb2312-0",       "gb2312"     },</div><div class='del'>-	{ "gb2312.1980-0",  "gb2312"     },</div><div class='del'>-	{ "gb18030-0",      "gb18030"    },</div><div class='del'>-	{ "gbk-0",          "GBK"        },</div><div class='del'>-</div><div class='del'>-	{ "eucjp-0",        "eucJP"  	 },</div><div class='del'>-	{ "ujis-0",         "ujis"  	 },</div><div class='del'>-	{ "jisx0208.1983-0","SJIS"       },</div><div class='del'>-	{ "jisx0212.1990-0","SJIS"       },</div><div class='del'>-	{ NULL,             NULL         }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Another copy of this trivial list implementation</div><div class='del'>-   Why?  This stuff gets called a lot (potentially), should run fast,</div><div class='del'>-   and g_list's are f@@#$ed up to make this a hassle */</div><div class='del'>-static void e_dlist_init(EDList *v)</div><div class='del'>-{</div><div class='del'>-        v-&gt;head = (EDListNode *)&amp;v-&gt;tail;</div><div class='del'>-        v-&gt;tail = 0;</div><div class='del'>-        v-&gt;tailpred = (EDListNode *)&amp;v-&gt;head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EDListNode *e_dlist_addhead(EDList *l, EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next = l-&gt;head;</div><div class='del'>-        n-&gt;prev = (EDListNode *)&amp;l-&gt;head;</div><div class='del'>-        l-&gt;head-&gt;prev = n;</div><div class='del'>-        l-&gt;head = n;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EDListNode *e_dlist_addtail(EDList *l, EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next = (EDListNode *)&amp;l-&gt;tail;</div><div class='del'>-        n-&gt;prev = l-&gt;tailpred;</div><div class='del'>-        l-&gt;tailpred-&gt;next = n;</div><div class='del'>-        l-&gt;tailpred = n;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EDListNode *e_dlist_remove(EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next-&gt;prev = n-&gt;prev;</div><div class='del'>-        n-&gt;prev-&gt;next = n-&gt;next;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* NOTE: Owns the lock on return if keep is TRUE ! */</div><div class='del'>-static void</div><div class='del'>-e_iconv_init(int keep)</div><div class='del'>-{</div><div class='del'>-	char *from, *to, *locale;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	LOCK();</div><div class='del'>-</div><div class='del'>-	if (iconv_charsets != NULL) {</div><div class='del'>-		if (!keep)</div><div class='del'>-			UNLOCK();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iconv_charsets = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; known_iconv_charsets[i].charset != NULL; i++) {</div><div class='del'>-		from = g_strdup(known_iconv_charsets[i].charset);</div><div class='del'>-		to = g_strdup(known_iconv_charsets[i].iconv_name);</div><div class='del'>-		g_strdown(from);</div><div class='del'>-		g_hash_table_insert(iconv_charsets, from, to);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_dlist_init(&amp;iconv_cache_list);</div><div class='del'>-	iconv_cache = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	iconv_cache_open = g_hash_table_new(NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	locale = setlocale (LC_ALL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!locale || !strcmp (locale, "C") || !strcmp (locale, "POSIX")) {</div><div class='del'>-		/* The locale "C"  or  "POSIX"  is  a  portable  locale;  its</div><div class='del'>-		 * LC_CTYPE  part  corresponds  to  the 7-bit ASCII character</div><div class='del'>-		 * set.</div><div class='del'>-		 */</div><div class='del'>-		</div><div class='del'>-		locale_charset = NULL;</div><div class='del'>-	} else {</div><div class='del'>-#ifdef HAVE_CODESET</div><div class='del'>-		locale_charset = g_strdup(nl_langinfo(CODESET));</div><div class='del'>-		g_strdown((char *)locale_charset);</div><div class='del'>-#else</div><div class='del'>-		/* A locale name is typically of  the  form  language[_terri-</div><div class='del'>-		 * tory][.codeset][@modifier],  where  language is an ISO 639</div><div class='del'>-		 * language code, territory is an ISO 3166 country code,  and</div><div class='del'>-		 * codeset  is  a  character  set or encoding identifier like</div><div class='del'>-		 * ISO-8859-1 or UTF-8.</div><div class='del'>-		 */</div><div class='del'>-		char *codeset, *p;</div><div class='del'>-		</div><div class='del'>-		codeset = strchr (locale, '.');</div><div class='del'>-		if (codeset) {</div><div class='del'>-			codeset++;</div><div class='del'>-			</div><div class='del'>-			/* ; is a hack for debian systems and / is a hack for Solaris systems */</div><div class='del'>-			for (p = codeset; *p &amp;&amp; !strchr ("@;/", *p); p++);</div><div class='del'>-			locale_charset = g_strndup (codeset, p - codeset);</div><div class='del'>-			g_strdown (locale_charset);</div><div class='del'>-		} else {</div><div class='del'>-			/* charset unknown */</div><div class='del'>-			locale_charset = NULL;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!keep)</div><div class='del'>-		UNLOCK();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *e_iconv_charset_name(const char *charset)</div><div class='del'>-{</div><div class='del'>-	char *name, *ret, *tmp;</div><div class='del'>-</div><div class='del'>-	if (charset == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	name = alloca(strlen(charset)+1);</div><div class='del'>-	strcpy(name, charset);</div><div class='del'>-	g_strdown(name);</div><div class='del'>-</div><div class='del'>-	e_iconv_init(TRUE);</div><div class='del'>-	ret = g_hash_table_lookup(iconv_charsets, name);</div><div class='del'>-	if (ret != NULL) {</div><div class='del'>-		UNLOCK();</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Unknown, try canonicalise some basic charset types to something that should work */</div><div class='del'>-	if (strncmp(name, "iso", 3) == 0) {</div><div class='del'>-		/* Convert iso-nnnn-n or isonnnn-n or iso_nnnn-n to iso-nnnn-n or isonnnn-n */</div><div class='del'>-		int iso, codepage;</div><div class='del'>-		char *p;</div><div class='del'>-		</div><div class='del'>-		tmp = name + 3;</div><div class='del'>-		if (*tmp == '-' || *tmp == '_')</div><div class='del'>-			tmp++;</div><div class='del'>-		</div><div class='del'>-		iso = strtoul (tmp, &amp;p, 10);</div><div class='del'>-		</div><div class='del'>-		if (iso == 10646) {</div><div class='del'>-			/* they all become ICONV_10646 */</div><div class='del'>-			ret = g_strdup (ICONV_10646);</div><div class='del'>-		} else {</div><div class='del'>-			tmp = p;</div><div class='del'>-			if (*tmp == '-' || *tmp == '_')</div><div class='del'>-				tmp++;</div><div class='del'>-			</div><div class='del'>-			codepage = strtoul (tmp, &amp;p, 10);</div><div class='del'>-			</div><div class='del'>-			if (p &gt; tmp) {</div><div class='del'>-				/* codepage is numeric */</div><div class='del'>-#ifdef __aix__</div><div class='del'>-				if (codepage == 13)</div><div class='del'>-					ret = g_strdup ("IBM-921");</div><div class='del'>-				else</div><div class='del'>-#endif /* __aix__ */</div><div class='del'>-					ret = g_strdup_printf (ICONV_ISO_D_FORMAT, iso, codepage);</div><div class='del'>-			} else {</div><div class='del'>-				/* codepage is a string - probably iso-2022-jp or something */</div><div class='del'>-				ret = g_strdup_printf (ICONV_ISO_S_FORMAT, iso, p);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (strncmp(name, "windows-", 8) == 0) {</div><div class='del'>-		/* Convert windows-nnnnn or windows-cpnnnnn to cpnnnn */</div><div class='del'>-		tmp = name+8;</div><div class='del'>-		if (!strncmp(tmp, "cp", 2))</div><div class='del'>-			tmp+=2;</div><div class='del'>-		ret = g_strdup_printf("CP%s", tmp);</div><div class='del'>-	} else if (strncmp(name, "microsoft-", 10) == 0) {</div><div class='del'>-		/* Convert microsoft-nnnnn or microsoft-cpnnnnn to cpnnnn */</div><div class='del'>-		tmp = name+10;</div><div class='del'>-		if (!strncmp(tmp, "cp", 2))</div><div class='del'>-			tmp+=2;</div><div class='del'>-		ret = g_strdup_printf("CP%s", tmp);	</div><div class='del'>-	} else {</div><div class='del'>-		/* Just assume its ok enough as is, case and all */</div><div class='del'>-		ret = g_strdup(charset);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert(iconv_charsets, g_strdup(name), ret);</div><div class='del'>-	UNLOCK();</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-flush_entry(struct _iconv_cache *ic)</div><div class='del'>-{</div><div class='del'>-	struct _iconv_cache_node *in, *nn;</div><div class='del'>-</div><div class='del'>-	in = (struct _iconv_cache_node *)ic-&gt;open.head;</div><div class='del'>-	nn = in-&gt;next;</div><div class='del'>-	while (nn) {</div><div class='del'>-		if (in-&gt;ip != (iconv_t)-1) {</div><div class='del'>-			g_hash_table_remove(iconv_cache_open, in-&gt;ip);</div><div class='del'>-			iconv_close(in-&gt;ip);</div><div class='del'>-		}</div><div class='del'>-		g_free(in);</div><div class='del'>-		in = nn;</div><div class='del'>-		nn = in-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	g_free(ic-&gt;conv);</div><div class='del'>-	g_free(ic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This should run pretty quick, its called a lot */</div><div class='del'>-iconv_t e_iconv_open(const char *oto, const char *ofrom)</div><div class='del'>-{</div><div class='del'>-	const char *to, *from;</div><div class='del'>-	char *tofrom;</div><div class='del'>-	struct _iconv_cache *ic;</div><div class='del'>-	struct _iconv_cache_node *in;</div><div class='del'>-	iconv_t ip;</div><div class='del'>-</div><div class='del'>-	if (oto == NULL || ofrom == NULL)</div><div class='del'>-		return (iconv_t)-1;</div><div class='del'>-</div><div class='del'>-	to = e_iconv_charset_name (oto);</div><div class='del'>-	from = e_iconv_charset_name (ofrom);</div><div class='del'>-	tofrom = alloca(strlen(to) +strlen(from) + 2);</div><div class='del'>-	sprintf(tofrom, "%s%%%s", to, from);</div><div class='del'>-</div><div class='del'>-	LOCK();</div><div class='del'>-</div><div class='del'>-	ic = g_hash_table_lookup(iconv_cache, tofrom);</div><div class='del'>-	if (ic) {</div><div class='del'>-		e_dlist_remove((EDListNode *)ic);</div><div class='del'>-	} else {</div><div class='del'>-		struct _iconv_cache *last = (struct _iconv_cache *)iconv_cache_list.tailpred;</div><div class='del'>-		struct _iconv_cache *prev;</div><div class='del'>-</div><div class='del'>-		prev = last-&gt;prev;</div><div class='del'>-		while (prev &amp;&amp; iconv_cache_size &gt; E_ICONV_CACHE_SIZE) {</div><div class='del'>-			in = (struct _iconv_cache_node *)last-&gt;open.head;</div><div class='del'>-			if (in-&gt;next &amp;&amp; !in-&gt;busy) {</div><div class='del'>-				cd(printf("Flushing iconv converter '%s'\n", last-&gt;conv));</div><div class='del'>-				e_dlist_remove((EDListNode *)last);</div><div class='del'>-				g_hash_table_remove(iconv_cache, last-&gt;conv);</div><div class='del'>-				flush_entry(last);</div><div class='del'>-				iconv_cache_size--;</div><div class='del'>-			}</div><div class='del'>-			last = prev;</div><div class='del'>-			prev = last-&gt;prev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iconv_cache_size++;</div><div class='del'>-		</div><div class='del'>-		ic = g_malloc(sizeof(*ic));</div><div class='del'>-		e_dlist_init(&amp;ic-&gt;open);</div><div class='del'>-		ic-&gt;conv = g_strdup(tofrom);</div><div class='del'>-		g_hash_table_insert(iconv_cache, ic-&gt;conv, ic);</div><div class='del'>-</div><div class='del'>-		cd(printf("Creating iconv converter '%s'\n", ic-&gt;conv));</div><div class='del'>-	}</div><div class='del'>-	e_dlist_addhead(&amp;iconv_cache_list, (EDListNode *)ic);</div><div class='del'>-</div><div class='del'>-	/* If we have a free iconv, use it */</div><div class='del'>-	in = (struct _iconv_cache_node *)ic-&gt;open.tailpred;</div><div class='del'>-	if (in-&gt;prev &amp;&amp; !in-&gt;busy) {</div><div class='del'>-		cd(printf("using existing iconv converter '%s'\n", ic-&gt;conv));</div><div class='del'>-		ip = in-&gt;ip;</div><div class='del'>-		if (ip != (iconv_t)-1) {</div><div class='del'>-			/* work around some broken iconv implementations </div><div class='del'>-			 * that die if the length arguments are NULL </div><div class='del'>-			 */</div><div class='del'>-			size_t buggy_iconv = 0;</div><div class='del'>-</div><div class='del'>-			/* resets the converter */</div><div class='del'>-			iconv(ip, NULL, &amp;buggy_iconv, NULL, &amp;buggy_iconv);</div><div class='del'>-			in-&gt;busy = TRUE;</div><div class='del'>-			e_dlist_remove((EDListNode *)in);</div><div class='del'>-			e_dlist_addhead(&amp;ic-&gt;open, (EDListNode *)in);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cd(printf("creating new iconv converter '%s'\n", ic-&gt;conv));</div><div class='del'>-		ip = iconv_open(to, from);</div><div class='del'>-		in = g_malloc(sizeof(*in));</div><div class='del'>-		in-&gt;ip = ip;</div><div class='del'>-		in-&gt;parent = ic;</div><div class='del'>-		e_dlist_addhead(&amp;ic-&gt;open, (EDListNode *)in);</div><div class='del'>-		if (ip != (iconv_t)-1) {</div><div class='del'>-			g_hash_table_insert(iconv_cache_open, ip, in);</div><div class='del'>-			in-&gt;busy = TRUE;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Could not open converter for '%s' to '%s' charset", from, to);</div><div class='del'>-			in-&gt;busy = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	UNLOCK();</div><div class='del'>-</div><div class='del'>-	return ip;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft)</div><div class='del'>-{</div><div class='del'>-	return iconv(cd, (char **) inbuf, inbytesleft, outbuf, outbytesleft);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iconv_close(iconv_t ip)</div><div class='del'>-{</div><div class='del'>-	struct _iconv_cache_node *in;</div><div class='del'>-</div><div class='del'>-	if (ip == (iconv_t)-1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	LOCK();</div><div class='del'>-	in = g_hash_table_lookup(iconv_cache_open, ip);</div><div class='del'>-	if (in) {</div><div class='del'>-		cd(printf("closing iconv converter '%s'\n", in-&gt;parent-&gt;conv));</div><div class='del'>-		e_dlist_remove((EDListNode *)in);</div><div class='del'>-		in-&gt;busy = FALSE;</div><div class='del'>-		e_dlist_addtail(&amp;in-&gt;parent-&gt;open, (EDListNode *)in);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning("trying to close iconv i dont know about: %p", ip);</div><div class='del'>-		iconv_close(ip);</div><div class='del'>-	}</div><div class='del'>-	UNLOCK();</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *e_iconv_locale_charset(void)</div><div class='del'>-{</div><div class='del'>-	e_iconv_init(FALSE);</div><div class='del'>-</div><div class='del'>-	return locale_charset;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-iconv.h b/e-util/e-iconv.h<br/>deleted file mode 100644<br/>index daf97a30ab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iconv.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-iconv.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-iconv.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_ICONV_H_</div><div class='del'>-#define _E_ICONV_H_</div><div class='del'>-</div><div class='del'>-#include &lt;iconv.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-const char *e_iconv_charset_name(const char *charset);</div><div class='del'>-iconv_t e_iconv_open(const char *oto, const char *ofrom);</div><div class='del'>-size_t e_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char ** outbuf, size_t *outbytesleft);</div><div class='del'>-void e_iconv_close(iconv_t ip);</div><div class='del'>-const char *e_iconv_locale_charset(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* !_E_ICONV_H_ */</div><div class='head'>diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c<br/>deleted file mode 100644<br/>index 8bd14ee6c8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iterator.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Christopher James Lahey &lt;clahey@umich.edu&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_iterator_init (EIterator *card);</div><div class='del'>-static void e_iterator_class_init (EIteratorClass *klass);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	INVALIDATE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_iterator_signals [LAST_SIGNAL] = { 0, };</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EIterator class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_iterator_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EIterator",</div><div class='del'>-			sizeof (EIterator),</div><div class='del'>-			sizeof (EIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_iterator_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_iterator_class_init (EIteratorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	e_iterator_signals [INVALIDATE] =</div><div class='del'>-		gtk_signal_new ("invalidate",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EIteratorClass, invalidate),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_iterator_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;invalidate = NULL;</div><div class='del'>-	klass-&gt;get        = NULL;</div><div class='del'>-	klass-&gt;reset      = NULL;</div><div class='del'>-	klass-&gt;last       = NULL;</div><div class='del'>-	klass-&gt;next       = NULL;</div><div class='del'>-	klass-&gt;prev       = NULL;</div><div class='del'>-	klass-&gt;delete     = NULL;</div><div class='del'>-	klass-&gt;insert     = NULL;</div><div class='del'>-	klass-&gt;set        = NULL;</div><div class='del'>-	klass-&gt;is_valid   = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_iterator_init (EIterator *card)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual functions: </div><div class='del'>- */</div><div class='del'>-const void *</div><div class='del'>-e_iterator_get      (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;get)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;get(iterator);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_reset    (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;reset)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;reset(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_last     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;last)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;last(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_next     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;next)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;next(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_prev     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;prev)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;prev(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_delete   (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;delete)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;delete(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void           e_iterator_insert     (EIterator  *iterator,</div><div class='del'>-				      const void *object,</div><div class='del'>-				      gboolean    before)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;insert)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;insert(iterator, object, before);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_set      (EIterator *iterator,</div><div class='del'>-			  const void    *object)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;set)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;set(iterator, object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_is_valid (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;is_valid)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;is_valid(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_invalidate (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (iterator != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_ITERATOR (iterator));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (iterator),</div><div class='del'>-			 e_iterator_signals [INVALIDATE]);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h<br/>deleted file mode 100644<br/>index a6f0899235..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iterator.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-iterator.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_ITERATOR_H__</div><div class='del'>-#define __E_ITERATOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_ITERATOR            (e_iterator_get_type ())</div><div class='del'>-#define E_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))</div><div class='del'>-#define E_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))</div><div class='del'>-#define E_IS_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ITERATOR))</div><div class='del'>-#define E_IS_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))</div><div class='del'>-</div><div class='del'>-typedef struct _EIterator EIterator;</div><div class='del'>-typedef struct _EIteratorClass EIteratorClass;</div><div class='del'>-</div><div class='del'>-struct _EIterator {</div><div class='del'>-	GtkObject object;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EIteratorClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Signals */</div><div class='del'>-	void         (*invalidate) (EIterator  *iterator);</div><div class='del'>-	</div><div class='del'>-	/* Virtual functions */</div><div class='del'>-	const void * (*get)        (EIterator  *iterator);</div><div class='del'>-	void         (*reset)      (EIterator  *iterator);</div><div class='del'>-	void         (*last)       (EIterator  *iterator);</div><div class='del'>-	gboolean     (*next)       (EIterator  *iterator);</div><div class='del'>-	gboolean     (*prev)       (EIterator  *iterator);</div><div class='del'>-	void         (*delete)     (EIterator  *iterator);</div><div class='del'>-	void         (*insert)     (EIterator  *iterator,</div><div class='del'>-				    const void *object,</div><div class='del'>-				    gboolean   	before);</div><div class='del'>-	void         (*set)        (EIterator  *iterator,</div><div class='del'>-				    const void *object);</div><div class='del'>-	gboolean     (*is_valid)   (EIterator  *iterator);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const void    *e_iterator_get        (EIterator  *iterator);</div><div class='del'>-void           e_iterator_reset      (EIterator  *iterator);</div><div class='del'>-void           e_iterator_last       (EIterator  *iterator);</div><div class='del'>-gboolean       e_iterator_next       (EIterator  *iterator);</div><div class='del'>-gboolean       e_iterator_prev       (EIterator  *iterator);</div><div class='del'>-void           e_iterator_delete     (EIterator  *iterator);</div><div class='del'>-void           e_iterator_insert     (EIterator  *iterator,</div><div class='del'>-				      const void *object,</div><div class='del'>-				      gboolean    before);</div><div class='del'>-void           e_iterator_set        (EIterator  *iterator, </div><div class='del'>-				      const void *object);</div><div class='del'>-gboolean       e_iterator_is_valid   (EIterator  *iterator);</div><div class='del'>-</div><div class='del'>-void           e_iterator_invalidate (EIterator  *iterator);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType        e_iterator_get_type   (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_ITERATOR_H__ */</div><div class='head'>diff --git a/e-util/e-lang-utils.c b/e-util/e-lang-utils.c<br/>deleted file mode 100644<br/>index 3516531eb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-lang-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-lang-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-lang-utils.c - Utility functions for multi-language support.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-lang-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GSList *</div><div class='del'>-e_get_language_list (void)</div><div class='del'>-{</div><div class='del'>-	const char *env;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	env = g_getenv ("LANGUAGE");</div><div class='del'>-	if (env == NULL) {</div><div class='del'>-		env = g_getenv ("LANG");</div><div class='del'>-		if (env == NULL)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = strchr (env, '=');</div><div class='del'>-	if (p != NULL)</div><div class='del'>-		return g_slist_prepend (NULL, (void *) (p + 1));</div><div class='del'>-	else</div><div class='del'>-		return g_slist_prepend (NULL, (void *) env);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_language_list (GSList *list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (list != NULL);</div><div class='del'>-</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-lang-utils.h b/e-util/e-lang-utils.h<br/>deleted file mode 100644<br/>index 135d98db7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-lang-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-lang-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-lang-utils.h - Utility functions for multi-language support.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2002 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_LANG_UTILS_H</div><div class='del'>-#define E_LANG_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-GSList *e_get_language_list (void);</div><div class='del'>-void e_free_language_list (GSList *list);</div><div class='del'>-</div><div class='del'>-#endif /* E_LANG_UTILS_H */</div><div class='head'>diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c<br/>deleted file mode 100644<br/>index 7d3d644fc2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list-iterator.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-list-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Christopher James Lahey &lt;clahey@umich.edu&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-list-iterator.h"</div><div class='del'>-#include "e-list.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void        e_list_iterator_init       (EListIterator *list);</div><div class='del'>-static void        e_list_iterator_class_init (EListIteratorClass *klass);</div><div class='del'>-		   </div><div class='del'>-static void        e_list_iterator_invalidate (EIterator *iterator);</div><div class='del'>-static gboolean    e_list_iterator_is_valid   (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_set        (EIterator  *iterator,</div><div class='del'>-	           			       const void *object);</div><div class='del'>-static void        e_list_iterator_delete     (EIterator  *iterator);</div><div class='del'>-static void        e_list_iterator_insert     (EIterator  *iterator,</div><div class='del'>-		   			       const void *object,</div><div class='del'>-		   			       gboolean    before);</div><div class='del'>-static gboolean    e_list_iterator_prev       (EIterator  *iterator);</div><div class='del'>-static gboolean    e_list_iterator_next       (EIterator  *iterator);</div><div class='del'>-static void        e_list_iterator_reset      (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_last       (EIterator *iterator);</div><div class='del'>-static const void *e_list_iterator_get        (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_destroy    (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (e_iterator_get_type ())</div><div class='del'>-</div><div class='del'>-static EIteratorClass *parent_class;</div><div class='del'>-#define PARENT_CLASS (E_ITERATOR_CLASS(parent_class))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EListIterator class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EListIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_list_iterator_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EListIterator",</div><div class='del'>-			sizeof (EListIterator),</div><div class='del'>-			sizeof (EListIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_list_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_list_iterator_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_class_init (EListIteratorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	EIteratorClass *iterator_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	iterator_class = E_ITERATOR_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_list_iterator_destroy;</div><div class='del'>-</div><div class='del'>-	iterator_class-&gt;invalidate = e_list_iterator_invalidate;</div><div class='del'>-	iterator_class-&gt;get        = e_list_iterator_get;</div><div class='del'>-	iterator_class-&gt;reset      = e_list_iterator_reset;</div><div class='del'>-	iterator_class-&gt;last       = e_list_iterator_last;</div><div class='del'>-	iterator_class-&gt;next       = e_list_iterator_next;</div><div class='del'>-	iterator_class-&gt;prev       = e_list_iterator_prev;</div><div class='del'>-	iterator_class-&gt;delete     = e_list_iterator_delete;</div><div class='del'>-	iterator_class-&gt;insert     = e_list_iterator_insert;</div><div class='del'>-	iterator_class-&gt;set        = e_list_iterator_set;</div><div class='del'>-	iterator_class-&gt;is_valid   = e_list_iterator_is_valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_init (EListIterator *list)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EIterator *</div><div class='del'>-e_list_iterator_new (EList *list)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = gtk_type_new(e_list_iterator_get_type());</div><div class='del'>-</div><div class='del'>-	iterator-&gt;list = list;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(list));</div><div class='del'>-	iterator-&gt;iterator = list-&gt;list;</div><div class='del'>-</div><div class='del'>-	return E_ITERATOR(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual functions: </div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(object);</div><div class='del'>-	e_list_remove_iterator(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator-&gt;list));</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-e_list_iterator_get      (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		return iterator-&gt;iterator-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_reset    (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = iterator-&gt;list-&gt;list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_last     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = g_list_last(iterator-&gt;list-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_next     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		iterator-&gt;iterator = g_list_next(iterator-&gt;iterator);</div><div class='del'>-	else</div><div class='del'>-		iterator-&gt;iterator = iterator-&gt;list-&gt;list;</div><div class='del'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_prev     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		iterator-&gt;iterator = g_list_previous(iterator-&gt;iterator);</div><div class='del'>-	else</div><div class='del'>-		iterator-&gt;iterator = g_list_last(iterator-&gt;list-&gt;list);</div><div class='del'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_insert   (EIterator  *_iterator,</div><div class='del'>-			  const void *object,</div><div class='del'>-			  gboolean    before)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	void *data;</div><div class='del'>-	if (iterator-&gt;list-&gt;copy)</div><div class='del'>-		data = iterator-&gt;list-&gt;copy(object, iterator-&gt;list-&gt;closure);</div><div class='del'>-	else</div><div class='del'>-		data = (void *) object;</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		if (before) {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_first(g_list_prepend(iterator-&gt;iterator, data));</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;iterator-&gt;prev;</div><div class='del'>-		} else {</div><div class='del'>-			if (iterator-&gt;iterator-&gt;next)</div><div class='del'>-				g_list_prepend(iterator-&gt;iterator-&gt;next, data);</div><div class='del'>-			else</div><div class='del'>-				g_list_append(iterator-&gt;iterator, data);</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;iterator-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		e_list_invalidate_iterators(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	} else {</div><div class='del'>-		if (before) {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_append(iterator-&gt;list-&gt;list, data);</div><div class='del'>-			iterator-&gt;iterator = g_list_last(iterator-&gt;list-&gt;list);</div><div class='del'>-		} else {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_prepend(iterator-&gt;list-&gt;list, data);</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;list-&gt;list;</div><div class='del'>-		}</div><div class='del'>-		e_list_invalidate_iterators(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_delete   (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		e_list_remove_link (iterator-&gt;list, iterator-&gt;iterator);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_set      (EIterator  *_iterator,</div><div class='del'>-			  const void *object)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		if (iterator-&gt;list-&gt;free)</div><div class='del'>-			iterator-&gt;list-&gt;free(iterator-&gt;iterator-&gt;data, iterator-&gt;list-&gt;closure);</div><div class='del'>-		if (iterator-&gt;list-&gt;copy)</div><div class='del'>-			iterator-&gt;iterator-&gt;data = iterator-&gt;list-&gt;copy(object, iterator-&gt;list-&gt;closure);</div><div class='del'>-		else</div><div class='del'>-			iterator-&gt;iterator-&gt;data = (void *) object;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_is_valid (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	return iterator-&gt;iterator != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_invalidate (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-list-iterator.h b/e-util/e-list-iterator.h<br/>deleted file mode 100644<br/>index 6903015002..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list-iterator.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-list-iterator.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_LIST_ITERATOR_H__</div><div class='del'>-#define __E_LIST_ITERATOR_H__</div><div class='del'>-</div><div class='del'>-typedef struct _EListIterator EListIterator;</div><div class='del'>-typedef struct _EListIteratorClass EListIteratorClass;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;e-util/e-iterator.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())</div><div class='del'>-#define E_LIST_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST_ITERATOR, EListIterator))</div><div class='del'>-#define E_LIST_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST_ITERATOR, EListIteratorClass))</div><div class='del'>-#define E_IS_LIST_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST_ITERATOR))</div><div class='del'>-#define E_IS_LIST_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST_ITERATOR))</div><div class='del'>-</div><div class='del'>-struct _EListIterator {</div><div class='del'>-	EIterator      parent;</div><div class='del'>-</div><div class='del'>-	EList         *list;</div><div class='del'>-	GList         *iterator;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EListIteratorClass {</div><div class='del'>-	EIteratorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EIterator *e_list_iterator_new      (EList *list);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType    e_list_iterator_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_LIST_ITERATOR_H__ */</div><div class='head'>diff --git a/e-util/e-list.c b/e-util/e-list.c<br/>deleted file mode 100644<br/>index 64ccea728c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-list.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,179 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Christopher James Lahey &lt;clahey@umich.edu&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-list.h"</div><div class='del'>-#include "e-list-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECL_CLASS(object) (E_LIST_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_list_init (EList *list);</div><div class='del'>-static void e_list_class_init (EListClass *klass);</div><div class='del'>-static void e_list_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EList class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EList class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_list_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EList",</div><div class='del'>-			sizeof (EList),</div><div class='del'>-			sizeof (EListClass),</div><div class='del'>-			(GtkClassInitFunc) e_list_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_list_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_class_init (EListClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_list_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_init (EList *list)</div><div class='del'>-{</div><div class='del'>-	list-&gt;list = NULL;</div><div class='del'>-	list-&gt;iterators = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_list_new          (EListCopyFunc copy, EListFreeFunc free, void *closure)</div><div class='del'>-{</div><div class='del'>-	EList *list = gtk_type_new(e_list_get_type());</div><div class='del'>-	list-&gt;copy    = copy;</div><div class='del'>-	list-&gt;free    = free;</div><div class='del'>-	list-&gt;closure = closure;</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_list_duplicate    (EList *old)</div><div class='del'>-{</div><div class='del'>-	EList *list = gtk_type_new(e_list_get_type());</div><div class='del'>-</div><div class='del'>-	list-&gt;copy    = old-&gt;copy;</div><div class='del'>-	list-&gt;free    = old-&gt;free;</div><div class='del'>-	list-&gt;closure = old-&gt;closure;</div><div class='del'>-	list-&gt;list    = g_list_copy(old-&gt;list);</div><div class='del'>-	if (list-&gt;copy) {</div><div class='del'>-		GList *listlist;</div><div class='del'>-		for (listlist = list-&gt;list; listlist; listlist = listlist-&gt;next) {</div><div class='del'>-			listlist-&gt;data = list-&gt;copy (listlist-&gt;data, list-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EIterator *</div><div class='del'>-e_list_get_iterator (EList *list)</div><div class='del'>-{</div><div class='del'>-	EIterator *iterator = e_list_iterator_new(list);</div><div class='del'>-	list-&gt;iterators = g_list_append(list-&gt;iterators, iterator);</div><div class='del'>-	return iterator;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_list_length (EList *list)</div><div class='del'>-{</div><div class='del'>-	return g_list_length(list-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_append       (EList *list, const void *data)</div><div class='del'>-{</div><div class='del'>-	e_list_invalidate_iterators(list, NULL);</div><div class='del'>-	if (list-&gt;copy)</div><div class='del'>-		list-&gt;list = g_list_append(list-&gt;list, list-&gt;copy(data, list-&gt;closure));</div><div class='del'>-	else</div><div class='del'>-		list-&gt;list = g_list_append(list-&gt;list, (void *) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_invalidate_iterators (EList *list, EIterator *skip)</div><div class='del'>-{</div><div class='del'>-	GList *iterators = list-&gt;iterators;</div><div class='del'>-	for (; iterators; iterators = iterators-&gt;next) {</div><div class='del'>-		if (iterators-&gt;data != skip) {</div><div class='del'>-			e_iterator_invalidate(E_ITERATOR(iterators-&gt;data));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: This doesn't work properly if the iterator is the first</div><div class='del'>-   iterator in the list.  Well, the iterator doesn't continue on after</div><div class='del'>-   the next time next is called, at least. */</div><div class='del'>-void</div><div class='del'>-e_list_remove_link (EList *list, GList *link)</div><div class='del'>-{</div><div class='del'>-	GList *iterators = list-&gt;iterators;</div><div class='del'>-	for (; iterators; iterators = iterators-&gt;next) {</div><div class='del'>-		if (((EListIterator *)iterators-&gt;data)-&gt;iterator == link) {</div><div class='del'>-			e_iterator_prev(iterators-&gt;data);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (list-&gt;free)</div><div class='del'>-		list-&gt;free(link-&gt;data, list-&gt;closure);</div><div class='del'>-	list-&gt;list = g_list_remove_link(list-&gt;list, link);</div><div class='del'>-	g_list_free_1(link);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_remove_iterator (EList *list, EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	list-&gt;iterators = g_list_remove(list-&gt;iterators, iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Virtual functions </div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EList *list = E_LIST(object);</div><div class='del'>-	g_list_foreach(list-&gt;list, (GFunc) list-&gt;free, list-&gt;closure);</div><div class='del'>-	g_list_free(list-&gt;list);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-list.h b/e-util/e-list.h<br/>deleted file mode 100644<br/>index da63576996..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-list.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- * Copyright (C) 1999 The Free Software Foundation</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_LIST_H__</div><div class='del'>-#define __E_LIST_H__</div><div class='del'>-</div><div class='del'>-typedef struct _EList EList;</div><div class='del'>-typedef struct _EListClass EListClass;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;e-util/e-list-iterator.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_LIST            (e_list_get_type ())</div><div class='del'>-#define E_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST, EList))</div><div class='del'>-#define E_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass))</div><div class='del'>-#define E_IS_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST))</div><div class='del'>-#define E_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST))</div><div class='del'>-</div><div class='del'>-typedef void *(*EListCopyFunc) (const void *data, void *closure);</div><div class='del'>-typedef void (*EListFreeFunc) (void *data, void *closure);</div><div class='del'>-</div><div class='del'>-struct _EList {</div><div class='del'>-	GtkObject      object;</div><div class='del'>-	GList         *list;</div><div class='del'>-	GList         *iterators;</div><div class='del'>-	EListCopyFunc  copy;</div><div class='del'>-	EListFreeFunc  free;</div><div class='del'>-	void          *closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EListClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EList     *e_list_new                  (EListCopyFunc  copy, </div><div class='del'>-					EListFreeFunc  free,</div><div class='del'>-					void          *closure);</div><div class='del'>-EList     *e_list_duplicate            (EList *list);</div><div class='del'>-EIterator *e_list_get_iterator         (EList         *list);</div><div class='del'>-void       e_list_append               (EList         *list,</div><div class='del'>-					const void    *data);</div><div class='del'>-int        e_list_length               (EList         *list);</div><div class='del'>-</div><div class='del'>-/* For iterators to call. */</div><div class='del'>-void       e_list_remove_link          (EList         *list, </div><div class='del'>-					GList         *link);</div><div class='del'>-void       e_list_remove_iterator      (EList         *list,</div><div class='del'>-					EIterator     *iterator);</div><div class='del'>-void       e_list_invalidate_iterators (EList         *list,</div><div class='del'>-					EIterator     *skip);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType    e_list_get_type             (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_LIST_H__ */</div><div class='head'>diff --git a/e-util/e-memory.c b/e-util/e-memory.c<br/>deleted file mode 100644<br/>index 108a627076..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-memory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-memory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1296 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (c) 2000, 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *	    Jacob Berkman &lt;jacob@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>-</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "e-memory.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt; /* memset() */</div><div class='del'>-#include &lt;stdlib.h&gt; /* alloca() */</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#define s(x)			/* strv debug */</div><div class='del'>-#define p(x)   /* poolv debug */</div><div class='del'>-#define p2(x)   /* poolv assertion checking */</div><div class='del'>-</div><div class='del'>-/*#define MALLOC_CHECK*/</div><div class='del'>-</div><div class='del'>-/* #define PROFILE_POOLV */</div><div class='del'>-</div><div class='del'>-#ifdef PROFILE_POOLV</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#define pp(x) x</div><div class='del'>-#else</div><div class='del'>-#define pp(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*#define TIMEIT*/</div><div class='del'>-</div><div class='del'>-#ifdef TIMEIT</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-struct timeval timeit_start;</div><div class='del'>-</div><div class='del'>-static time_start(const char *desc)</div><div class='del'>-{</div><div class='del'>-	gettimeofday(&amp;timeit_start, NULL);</div><div class='del'>-	printf("starting: %s\n", desc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static time_end(const char *desc)</div><div class='del'>-{</div><div class='del'>-	unsigned long diff;</div><div class='del'>-	struct timeval end;</div><div class='del'>-</div><div class='del'>-	gettimeofday(&amp;end, NULL);</div><div class='del'>-	diff = end.tv_sec * 1000 + end.tv_usec/1000;</div><div class='del'>-	diff -= timeit_start.tv_sec * 1000 + timeit_start.tv_usec/1000;</div><div class='del'>-	printf("%s took %ld.%03ld seconds\n",</div><div class='del'>-	       desc, diff / 1000, diff % 1000);</div><div class='del'>-}</div><div class='del'>-#else</div><div class='del'>-#define time_start(x)</div><div class='del'>-#define time_end(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-#include &lt;mcheck.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-static void</div><div class='del'>-checkmem(void *p)</div><div class='del'>-{</div><div class='del'>-	if (p) {</div><div class='del'>-		int status = mprobe(p);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case MCHECK_HEAD:</div><div class='del'>-			printf("Memory underrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_TAIL:</div><div class='del'>-			printf("Memory overrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_FREE:</div><div class='del'>-			printf("Double free %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#define MPROBE(x) checkmem((void *)(x))</div><div class='del'>-#else</div><div class='del'>-#define MPROBE(x)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* mempool class */</div><div class='del'>-</div><div class='del'>-#define STRUCT_ALIGN (4)</div><div class='del'>-</div><div class='del'>-typedef struct _MemChunkFreeNode {</div><div class='del'>-	struct _MemChunkFreeNode *next;</div><div class='del'>-	unsigned int atoms;</div><div class='del'>-} MemChunkFreeNode;</div><div class='del'>-</div><div class='del'>-typedef struct _EMemChunk {</div><div class='del'>-	unsigned int blocksize;	/* number of atoms in a block */</div><div class='del'>-	unsigned int atomsize;	/* size of each atom */</div><div class='del'>-	GPtrArray *blocks;	/* blocks of raw memory */</div><div class='del'>-	struct _MemChunkFreeNode *free;</div><div class='del'>-} MemChunk;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_memchunk_new:</div><div class='del'>- * @atomcount: The number of atoms stored in a single malloc'd block of memory.</div><div class='del'>- * @atomsize: The size of each allocation.</div><div class='del'>- * </div><div class='del'>- * Create a new memchunk header.  Memchunks are an efficient way to allocate</div><div class='del'>- * and deallocate identical sized blocks of memory quickly, and space efficiently.</div><div class='del'>- * </div><div class='del'>- * e_memchunks are effectively the same as gmemchunks, only faster (much), and</div><div class='del'>- * they use less memory overhead for housekeeping.</div><div class='del'>- *</div><div class='del'>- * Return value: The new header.</div><div class='del'>- **/</div><div class='del'>-MemChunk *e_memchunk_new(int atomcount, int atomsize)</div><div class='del'>-{</div><div class='del'>-	MemChunk *m = g_malloc(sizeof(*m));</div><div class='del'>-</div><div class='del'>-	m-&gt;blocksize = atomcount;</div><div class='del'>-	m-&gt;atomsize = MAX(atomsize, sizeof(MemChunkFreeNode));</div><div class='del'>-	m-&gt;blocks = g_ptr_array_new();</div><div class='del'>-	m-&gt;free = NULL;</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * memchunk_alloc:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Allocate a new atom size block of memory from a memchunk.</div><div class='del'>- **/</div><div class='del'>-void *e_memchunk_alloc(MemChunk *m)</div><div class='del'>-{</div><div class='del'>-	char *b;</div><div class='del'>-	MemChunkFreeNode *f;</div><div class='del'>-	void *mem;</div><div class='del'>-</div><div class='del'>-	f = m-&gt;free;</div><div class='del'>-	if (f) {</div><div class='del'>-		f-&gt;atoms--;</div><div class='del'>-		if (f-&gt;atoms &gt; 0) {</div><div class='del'>-			mem = ((char *)f) + (f-&gt;atoms*m-&gt;atomsize);</div><div class='del'>-		} else {</div><div class='del'>-			mem = f;</div><div class='del'>-			m-&gt;free = m-&gt;free-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		return mem;</div><div class='del'>-	} else {</div><div class='del'>-		b = g_malloc(m-&gt;blocksize * m-&gt;atomsize);</div><div class='del'>-		g_ptr_array_add(m-&gt;blocks, b);</div><div class='del'>-		f = (MemChunkFreeNode *)&amp;b[m-&gt;atomsize];</div><div class='del'>-		f-&gt;atoms = m-&gt;blocksize-1;</div><div class='del'>-		f-&gt;next = NULL;</div><div class='del'>-		m-&gt;free = f;</div><div class='del'>-		return b;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *e_memchunk_alloc0(EMemChunk *m)</div><div class='del'>-{</div><div class='del'>-	void *mem;</div><div class='del'>-</div><div class='del'>-	mem = e_memchunk_alloc(m);</div><div class='del'>-	memset(mem, 0, m-&gt;atomsize);</div><div class='del'>-</div><div class='del'>-	return mem;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_memchunk_free:</div><div class='del'>- * @m: </div><div class='del'>- * @mem: Address of atom to free.</div><div class='del'>- * </div><div class='del'>- * Free a single atom back to the free pool of atoms in the given</div><div class='del'>- * memchunk.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_memchunk_free(MemChunk *m, void *mem)</div><div class='del'>-{</div><div class='del'>-	MemChunkFreeNode *f;</div><div class='del'>-</div><div class='del'>-	/* put the location back in the free list.  If we knew if the preceeding or following</div><div class='del'>-	   cells were free, we could merge the free nodes, but it doesn't really add much */</div><div class='del'>-	f = mem;</div><div class='del'>-	f-&gt;next = m-&gt;free;</div><div class='del'>-	m-&gt;free = f;</div><div class='del'>-	f-&gt;atoms = 1;</div><div class='del'>-</div><div class='del'>-	/* we could store the free list sorted - we could then do the above, and also</div><div class='del'>-	   probably improve the locality of reference properties for the allocator */</div><div class='del'>-	/* and it would simplify some other algorithms at that, but slow this one down</div><div class='del'>-	   significantly */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_memchunk_empty:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Clean out the memchunk buffers.  Marks all allocated memory as free blocks,</div><div class='del'>- * but does not give it back to the system.  Can be used if the memchunk</div><div class='del'>- * is to be used repeatedly.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_memchunk_empty(MemChunk *m)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	MemChunkFreeNode *f, *h = NULL;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;m-&gt;blocks-&gt;len;i++) {</div><div class='del'>-		f = (MemChunkFreeNode *)m-&gt;blocks-&gt;pdata[i];</div><div class='del'>-		f-&gt;atoms = m-&gt;blocksize;</div><div class='del'>-		f-&gt;next = h;</div><div class='del'>-		h = f;</div><div class='del'>-	}</div><div class='del'>-	m-&gt;free = h;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _cleaninfo {</div><div class='del'>-	struct _cleaninfo *next;</div><div class='del'>-	char *base;</div><div class='del'>-	int count;</div><div class='del'>-	int size;		/* just so tree_search has it, sigh */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int tree_compare(struct _cleaninfo *a, struct _cleaninfo *b)</div><div class='del'>-{</div><div class='del'>-	if (a-&gt;base &lt; b-&gt;base)</div><div class='del'>-		return -1;</div><div class='del'>-	else if (a-&gt;base &gt; b-&gt;base)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int tree_search(struct _cleaninfo *a, char *mem)</div><div class='del'>-{</div><div class='del'>-	if (a-&gt;base &lt;= mem) {</div><div class='del'>-		if (mem &lt; &amp;a-&gt;base[a-&gt;size])</div><div class='del'>-			return 0;</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_memchunk_clean:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Scan all empty blocks and check for blocks which can be free'd </div><div class='del'>- * back to the system.</div><div class='del'>- *</div><div class='del'>- * This routine may take a while to run if there are many allocated</div><div class='del'>- * memory blocks (if the total number of allocations is many times</div><div class='del'>- * greater than atomcount).</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_memchunk_clean(MemChunk *m)</div><div class='del'>-{</div><div class='del'>-	GTree *tree;</div><div class='del'>-	int i;</div><div class='del'>-	MemChunkFreeNode *f;</div><div class='del'>-	struct _cleaninfo *ci, *hi = NULL;</div><div class='del'>-</div><div class='del'>-	f = m-&gt;free;</div><div class='del'>-	if (m-&gt;blocks-&gt;len == 0 || f == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* first, setup the tree/list so we can map free block addresses to block addresses */</div><div class='del'>-	tree = g_tree_new((GCompareFunc)tree_compare);</div><div class='del'>-	for (i=0;i&lt;m-&gt;blocks-&gt;len;i++) {</div><div class='del'>-		ci = alloca(sizeof(*ci));</div><div class='del'>-		ci-&gt;count = 0;</div><div class='del'>-		ci-&gt;base = m-&gt;blocks-&gt;pdata[i];</div><div class='del'>-		ci-&gt;size = m-&gt;blocksize * m-&gt;atomsize;</div><div class='del'>-		g_tree_insert(tree, ci, ci);</div><div class='del'>-		ci-&gt;next = hi;</div><div class='del'>-		hi = ci;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now, scan all free nodes, and count them in their tree node */</div><div class='del'>-	while (f) {</div><div class='del'>-		ci = g_tree_search(tree, (GSearchFunc)tree_search, f);</div><div class='del'>-		if (ci) {</div><div class='del'>-			ci-&gt;count += f-&gt;atoms;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("error, can't find free node in memory block\n");</div><div class='del'>-		}</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if any nodes are all free, free &amp; unlink them */</div><div class='del'>-	ci = hi;</div><div class='del'>-	while (ci) {</div><div class='del'>-		if (ci-&gt;count == m-&gt;blocksize) {</div><div class='del'>-			MemChunkFreeNode *prev = NULL;</div><div class='del'>-			</div><div class='del'>-			f = m-&gt;free;</div><div class='del'>-			while (f) {</div><div class='del'>-				if (tree_search (ci, (void *) f) == 0) {</div><div class='del'>-					/* prune this node from our free-node list */</div><div class='del'>-					if (prev)</div><div class='del'>-						prev-&gt;next = f-&gt;next;</div><div class='del'>-					else</div><div class='del'>-						m-&gt;free = f-&gt;next;</div><div class='del'>-				} else {</div><div class='del'>-					prev = f;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				f = f-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			g_ptr_array_remove_fast(m-&gt;blocks, ci-&gt;base);</div><div class='del'>-			g_free(ci-&gt;base);</div><div class='del'>-		}</div><div class='del'>-		ci = ci-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_tree_destroy(tree);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_memchunk_destroy:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Free the memchunk header, and all associated memory.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_memchunk_destroy(MemChunk *m)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (m == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;m-&gt;blocks-&gt;len;i++)</div><div class='del'>-		g_free(m-&gt;blocks-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free(m-&gt;blocks, TRUE);</div><div class='del'>-	g_free(m);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct _MemPoolNode {</div><div class='del'>-	struct _MemPoolNode *next;</div><div class='del'>-</div><div class='del'>-	int free;</div><div class='del'>-	char data[1];</div><div class='del'>-} MemPoolNode;</div><div class='del'>-</div><div class='del'>-typedef struct _MemPoolThresholdNode {</div><div class='del'>-	struct _MemPoolThresholdNode *next;</div><div class='del'>-	char data[1];</div><div class='del'>-} MemPoolThresholdNode;</div><div class='del'>-</div><div class='del'>-typedef struct _EMemPool {</div><div class='del'>-	int blocksize;</div><div class='del'>-	int threshold;</div><div class='del'>-	unsigned int align;</div><div class='del'>-	struct _MemPoolNode *blocks;</div><div class='del'>-	struct _MemPoolThresholdNode *threshold_blocks;</div><div class='del'>-} MemPool;</div><div class='del'>-</div><div class='del'>-/* a pool of mempool header blocks */</div><div class='del'>-static MemChunk *mempool_memchunk;</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-static GStaticMutex mempool_mutex = G_STATIC_MUTEX_INIT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mempool_new:</div><div class='del'>- * @blocksize: The base blocksize to use for all system alocations.</div><div class='del'>- * @threshold: If the allocation exceeds the threshold, then it is</div><div class='del'>- * allocated separately and stored in a separate list.</div><div class='del'>- * @flags: Alignment options: E_MEMPOOL_ALIGN_STRUCT uses native</div><div class='del'>- * struct alignment, E_MEMPOOL_ALIGN_WORD aligns to 16 bits (2 bytes),</div><div class='del'>- * and E_MEMPOOL_ALIGN_BYTE aligns to the nearest byte.  The default</div><div class='del'>- * is to align to native structures.</div><div class='del'>- * </div><div class='del'>- * Create a new mempool header.  Mempools can be used to efficiently</div><div class='del'>- * allocate data which can then be freed as a whole.</div><div class='del'>- *</div><div class='del'>- * Mempools can also be used to efficiently allocate arbitrarily</div><div class='del'>- * aligned data (such as strings) without incurring the space overhead</div><div class='del'>- * of aligning each allocation (which is not required for strings).</div><div class='del'>- *</div><div class='del'>- * However, each allocation cannot be freed individually, only all</div><div class='del'>- * or nothing.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-MemPool *e_mempool_new(int blocksize, int threshold, EMemPoolFlags flags)</div><div class='del'>-{</div><div class='del'>-	MemPool *pool;</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_lock(&amp;mempool_mutex);</div><div class='del'>-#endif</div><div class='del'>-	if (mempool_memchunk == NULL) {</div><div class='del'>-		mempool_memchunk = e_memchunk_new(8, sizeof(MemPool));</div><div class='del'>-	}</div><div class='del'>-	pool = e_memchunk_alloc(mempool_memchunk);</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_unlock(&amp;mempool_mutex);</div><div class='del'>-#endif</div><div class='del'>-	if (threshold &gt;= blocksize)</div><div class='del'>-		threshold = blocksize * 2 / 3;</div><div class='del'>-	pool-&gt;blocksize = blocksize;</div><div class='del'>-	pool-&gt;threshold = threshold;</div><div class='del'>-	pool-&gt;blocks = NULL;</div><div class='del'>-	pool-&gt;threshold_blocks = NULL;</div><div class='del'>-</div><div class='del'>-	switch (flags &amp; E_MEMPOOL_ALIGN_MASK) {</div><div class='del'>-	case E_MEMPOOL_ALIGN_STRUCT:</div><div class='del'>-	default:</div><div class='del'>-		pool-&gt;align = STRUCT_ALIGN-1;</div><div class='del'>-		break;</div><div class='del'>-	case E_MEMPOOL_ALIGN_WORD:</div><div class='del'>-		pool-&gt;align = 2-1;</div><div class='del'>-		break;</div><div class='del'>-	case E_MEMPOOL_ALIGN_BYTE:</div><div class='del'>-		pool-&gt;align = 1-1;</div><div class='del'>-	}</div><div class='del'>-	return pool;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mempool_alloc:</div><div class='del'>- * @pool: </div><div class='del'>- * @size: </div><div class='del'>- * </div><div class='del'>- * Allocate a new data block in the mempool.  Size will</div><div class='del'>- * be rounded up to the mempool's alignment restrictions</div><div class='del'>- * before being used.</div><div class='del'>- **/</div><div class='del'>-void *e_mempool_alloc(MemPool *pool, register int size)</div><div class='del'>-{</div><div class='del'>-	size = (size + pool-&gt;align) &amp; (~(pool-&gt;align));</div><div class='del'>-	if (size&gt;=pool-&gt;threshold) {</div><div class='del'>-		MemPoolThresholdNode *n;</div><div class='del'>-</div><div class='del'>-		n = g_malloc(sizeof(*n) - sizeof(char) + size);</div><div class='del'>-		n-&gt;next = pool-&gt;threshold_blocks;</div><div class='del'>-		pool-&gt;threshold_blocks = n;</div><div class='del'>-		return &amp;n-&gt;data[0];</div><div class='del'>-	} else {</div><div class='del'>-		register MemPoolNode *n;</div><div class='del'>-</div><div class='del'>-		n = pool-&gt;blocks;</div><div class='del'>-		if (n &amp;&amp; n-&gt;free &gt;= size) {</div><div class='del'>-			n-&gt;free -= size;</div><div class='del'>-			return &amp;n-&gt;data[n-&gt;free];</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* maybe we could do some sort of the free blocks based on size, but</div><div class='del'>-		   it doubt its worth it at all */</div><div class='del'>-</div><div class='del'>-		n = g_malloc(sizeof(*n) - sizeof(char) + pool-&gt;blocksize);</div><div class='del'>-		n-&gt;next = pool-&gt;blocks;</div><div class='del'>-		pool-&gt;blocks = n;</div><div class='del'>-		n-&gt;free = pool-&gt;blocksize - size;</div><div class='del'>-		return &amp;n-&gt;data[n-&gt;free];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *e_mempool_strdup(EMemPool *pool, const char *str)</div><div class='del'>-{</div><div class='del'>-	char *out;</div><div class='del'>-</div><div class='del'>-	out = e_mempool_alloc(pool, strlen(str)+1);</div><div class='del'>-	strcpy(out, str);</div><div class='del'>-</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mempool_flush:</div><div class='del'>- * @pool: </div><div class='del'>- * @freeall: Free all system allocated blocks as well.</div><div class='del'>- * </div><div class='del'>- * Flush used memory and mark allocated blocks as free.</div><div class='del'>- *</div><div class='del'>- * If @freeall is #TRUE, then all allocated blocks are free'd</div><div class='del'>- * as well.  Otherwise only blocks above the threshold are</div><div class='del'>- * actually freed, and the others are simply marked as empty.</div><div class='del'>- **/</div><div class='del'>-void e_mempool_flush(MemPool *pool, int freeall)</div><div class='del'>-{</div><div class='del'>-	MemPoolThresholdNode *tn, *tw;</div><div class='del'>-	MemPoolNode *pw, *pn;</div><div class='del'>-</div><div class='del'>-	tw = pool-&gt;threshold_blocks;</div><div class='del'>-	while (tw) {</div><div class='del'>-		tn = tw-&gt;next;</div><div class='del'>-		g_free(tw);</div><div class='del'>-		tw = tn;</div><div class='del'>-	}</div><div class='del'>-	pool-&gt;threshold_blocks = NULL;</div><div class='del'>-</div><div class='del'>-	if (freeall) {</div><div class='del'>-		pw = pool-&gt;blocks;</div><div class='del'>-		while (pw) {</div><div class='del'>-			pn = pw-&gt;next;</div><div class='del'>-			g_free(pw);</div><div class='del'>-			pw = pn;</div><div class='del'>-		}</div><div class='del'>-		pool-&gt;blocks = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		pw = pool-&gt;blocks;</div><div class='del'>-		while (pw) {</div><div class='del'>-			pw-&gt;free = pool-&gt;blocksize;</div><div class='del'>-			pw = pw-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mempool_destroy:</div><div class='del'>- * @pool: </div><div class='del'>- * </div><div class='del'>- * Free all memory associated with a mempool.</div><div class='del'>- **/</div><div class='del'>-void e_mempool_destroy(MemPool *pool)</div><div class='del'>-{</div><div class='del'>-	if (pool) {</div><div class='del'>-		e_mempool_flush(pool, 1);</div><div class='del'>-		e_memchunk_free(mempool_memchunk, pool);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  string array classes</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#define STRV_UNPACKED ((unsigned char)(~0))</div><div class='del'>-</div><div class='del'>-struct _EStrv {</div><div class='del'>-	unsigned char length;	/* how many entries we have (or the token STRV_UNPACKED) */</div><div class='del'>-	char data[1];		/* data follows */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _s_strv_string {</div><div class='del'>-	char *string;		/* the string to output */</div><div class='del'>-	char *free;		/* a string to free, if we referenced it */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _e_strvunpacked {</div><div class='del'>-	unsigned char type;	/* we overload last to indicate this is unpacked */</div><div class='del'>-	MemPool *pool;		/* pool of memory for strings */</div><div class='del'>-	struct _EStrv *source;	/* if we were converted from a packed one, keep the source around for a while */</div><div class='del'>-	unsigned int length;</div><div class='del'>-	struct _s_strv_string strings[1]; /* the string array data follows */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_new:</div><div class='del'>- * @size: The number of elements in the strv.  Currently this is limited</div><div class='del'>- * to 254 elements.</div><div class='del'>- * </div><div class='del'>- * Create a new strv (string array) header.  strv's can be used to</div><div class='del'>- * create and work with arrays of strings that can then be compressed</div><div class='del'>- * into a space-efficient static structure.  This is useful</div><div class='del'>- * where a number of strings are to be stored for lookup, and not</div><div class='del'>- * generally edited afterwards.</div><div class='del'>- *</div><div class='del'>- * The size limit is currently 254 elements.  This will probably not</div><div class='del'>- * change as arrays of this size suffer significant performance</div><div class='del'>- * penalties when looking up strings with high indices.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-struct _EStrv *</div><div class='del'>-e_strv_new(int size)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-</div><div class='del'>-	g_assert(size&lt;255);</div><div class='del'>-</div><div class='del'>-	s = g_malloc(sizeof(*s) + (size-1)*sizeof(s-&gt;strings[0]));</div><div class='del'>-	s(printf("new strv=%p, size = %d bytes\n", s, sizeof(*s) + (size-1)*sizeof(char *)));</div><div class='del'>-	s-&gt;type = STRV_UNPACKED;</div><div class='del'>-	s-&gt;pool = NULL;</div><div class='del'>-	s-&gt;length = size;</div><div class='del'>-	s-&gt;source = NULL;</div><div class='del'>-	memset(s-&gt;strings, 0, size*sizeof(s-&gt;strings[0]));</div><div class='del'>-</div><div class='del'>-	return (struct _EStrv *)s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _e_strvunpacked *</div><div class='del'>-strv_unpack(struct _EStrv *strv)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-	register char *p;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	s(printf("unpacking\n"));</div><div class='del'>-</div><div class='del'>-	s = (struct _e_strvunpacked *)e_strv_new(strv-&gt;length);</div><div class='del'>-	p = strv-&gt;data;</div><div class='del'>-	for (i=0;i&lt;s-&gt;length;i++) {</div><div class='del'>-		if (i&gt;0)</div><div class='del'>-			while (*p++)</div><div class='del'>-				;</div><div class='del'>-		s-&gt;strings[i].string = p;</div><div class='del'>-	}</div><div class='del'>-	s-&gt;source = strv;</div><div class='del'>-	s-&gt;type = STRV_UNPACKED;</div><div class='del'>-</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_set_ref:</div><div class='del'>- * @strv: </div><div class='del'>- * @index: </div><div class='del'>- * @str: </div><div class='del'>- * </div><div class='del'>- * Set a string array element by reference.  The string</div><div class='del'>- * is not copied until the array is packed.</div><div class='del'>- * </div><div class='del'>- * If @strv has been packed, then it is unpacked ready</div><div class='del'>- * for more inserts, and should be packed again once finished with.</div><div class='del'>- * The memory used by the original @strv is not freed until</div><div class='del'>- * the new strv is packed, or freed itself.</div><div class='del'>- *</div><div class='del'>- * Return value: A new EStrv if the strv has already</div><div class='del'>- * been packed, otherwise @strv.</div><div class='del'>- **/</div><div class='del'>-struct _EStrv *</div><div class='del'>-e_strv_set_ref(struct _EStrv *strv, int index, char *str)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-</div><div class='del'>-	s(printf("set ref %d '%s'\nawkmeharder: %s\n ", index, str, str));</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length != STRV_UNPACKED)</div><div class='del'>-		s = strv_unpack(strv);</div><div class='del'>-	else</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-</div><div class='del'>-	g_assert(index&gt;=0 &amp;&amp; index &lt; s-&gt;length);</div><div class='del'>-</div><div class='del'>-	s-&gt;strings[index].string = str;</div><div class='del'>-</div><div class='del'>-	return (struct _EStrv *)s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_set_ref_free:</div><div class='del'>- * @strv: </div><div class='del'>- * @index: </div><div class='del'>- * @str: </div><div class='del'>- * </div><div class='del'>- * Set a string by reference, similar to set_ref, but also</div><div class='del'>- * free the string when finished with it.  The string</div><div class='del'>- * is not copied until the strv is packed, and not at</div><div class='del'>- * all if the index is overwritten.</div><div class='del'>- * </div><div class='del'>- * Return value: @strv if already unpacked, otherwise an packed</div><div class='del'>- * EStrv.</div><div class='del'>- **/</div><div class='del'>-struct _EStrv *</div><div class='del'>-e_strv_set_ref_free(struct _EStrv *strv, int index, char *str)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-</div><div class='del'>-	s(printf("set ref %d '%s'\nawkmeevenharder: %s\n ", index, str, str));</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length != STRV_UNPACKED)</div><div class='del'>-		s = strv_unpack(strv);</div><div class='del'>-	else</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-</div><div class='del'>-	g_assert(index&gt;=0 &amp;&amp; index &lt; s-&gt;length);</div><div class='del'>-</div><div class='del'>-	s-&gt;strings[index].string = str;</div><div class='del'>-	if (s-&gt;strings[index].free)</div><div class='del'>-		g_free(s-&gt;strings[index].free);</div><div class='del'>-	s-&gt;strings[index].free = str;</div><div class='del'>-</div><div class='del'>-	return (struct _EStrv *)s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_set:</div><div class='del'>- * @strv: </div><div class='del'>- * @index: </div><div class='del'>- * @str: </div><div class='del'>- * </div><div class='del'>- * Set a string array reference.  The string @str is copied</div><div class='del'>- * into the string array at location @index.</div><div class='del'>- * </div><div class='del'>- * If @strv has been packed, then it is unpacked ready</div><div class='del'>- * for more inserts, and should be packed again once finished with.</div><div class='del'>- *</div><div class='del'>- * Return value: A new EStrv if the strv has already</div><div class='del'>- * been packed, otherwise @strv.</div><div class='del'>- **/</div><div class='del'>-struct _EStrv *</div><div class='del'>-e_strv_set(struct _EStrv *strv, int index, const char *str)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-</div><div class='del'>-	s(printf("set %d '%s'\n", index, str));</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length != STRV_UNPACKED)</div><div class='del'>-		s = strv_unpack(strv);</div><div class='del'>-	else</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-</div><div class='del'>-	g_assert(index&gt;=0 &amp;&amp; index &lt; s-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;pool == NULL)</div><div class='del'>-		s-&gt;pool = e_mempool_new(1024, 512, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-</div><div class='del'>-	s-&gt;strings[index].string = e_mempool_alloc(s-&gt;pool, strlen(str)+1);</div><div class='del'>-	strcpy(s-&gt;strings[index].string, str);</div><div class='del'>-</div><div class='del'>-	return (struct _EStrv *)s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_pack:</div><div class='del'>- * @strv: </div><div class='del'>- * </div><div class='del'>- * Pack the @strv into a space efficient structure for later lookup.</div><div class='del'>- *</div><div class='del'>- * All strings are packed into a single allocated block, separated</div><div class='del'>- * by single \0 characters, together with a count byte.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-struct _EStrv *</div><div class='del'>-e_strv_pack(struct _EStrv *strv)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-	int len, i;</div><div class='del'>-	register char *src, *dst;</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length == STRV_UNPACKED) {</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-</div><div class='del'>-		s(printf("packing string\n"));</div><div class='del'>-</div><div class='del'>-		len = 0;</div><div class='del'>-		for (i=0;i&lt;s-&gt;length;i++)</div><div class='del'>-			len += s-&gt;strings[i].string?strlen(s-&gt;strings[i].string)+1:1;</div><div class='del'>-</div><div class='del'>-		strv = g_malloc(sizeof(*strv) + len);</div><div class='del'>-		s(printf("allocating strv=%p, size = %d\n", strv, sizeof(*strv)+len));</div><div class='del'>-		strv-&gt;length = s-&gt;length;</div><div class='del'>-		dst = strv-&gt;data;</div><div class='del'>-		for (i=0;i&lt;s-&gt;length;i++) {</div><div class='del'>-			if ((src = s-&gt;strings[i].string)) {</div><div class='del'>-				while ((*dst++ = *src++))</div><div class='del'>-					;</div><div class='del'>-			} else {</div><div class='del'>-				*dst++ = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		e_strv_destroy((struct _EStrv *)s);</div><div class='del'>-	}</div><div class='del'>-	return strv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_get:</div><div class='del'>- * @strv: </div><div class='del'>- * @index: </div><div class='del'>- * </div><div class='del'>- * Retrieve a string by index.  This function works</div><div class='del'>- * identically on both packed and unpacked strv's, although</div><div class='del'>- * may be much slower on a packed strv.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_strv_get(struct _EStrv *strv, int index)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length != STRV_UNPACKED) {</div><div class='del'>-		g_assert(index&gt;=0 &amp;&amp; index &lt; strv-&gt;length);</div><div class='del'>-		p = strv-&gt;data;</div><div class='del'>-		while (index &gt; 0) {</div><div class='del'>-			while (*p++ != 0)</div><div class='del'>-				;</div><div class='del'>-			index--;</div><div class='del'>-		}</div><div class='del'>-		return p;</div><div class='del'>-	} else {</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-		g_assert(index&gt;=0 &amp;&amp; index &lt; s-&gt;length);</div><div class='del'>-		return s-&gt;strings[index].string?s-&gt;strings[index].string:"";</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_strv_destroy:</div><div class='del'>- * @strv: </div><div class='del'>- * </div><div class='del'>- * Free a strv and all associated memory.  Works on packed</div><div class='del'>- * or unpacked strv's.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_strv_destroy(struct _EStrv *strv)</div><div class='del'>-{</div><div class='del'>-	struct _e_strvunpacked *s;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	s(printf("freeing strv\n"));</div><div class='del'>-</div><div class='del'>-	if (strv-&gt;length == STRV_UNPACKED) {</div><div class='del'>-		s = (struct _e_strvunpacked *)strv;</div><div class='del'>-		if (s-&gt;pool)</div><div class='del'>-			e_mempool_destroy(s-&gt;pool);</div><div class='del'>-		if (s-&gt;source)</div><div class='del'>-			e_strv_destroy(s-&gt;source);</div><div class='del'>-		for (i=0;i&lt;s-&gt;length;i++) {</div><div class='del'>-			if (s-&gt;strings[i].free)</div><div class='del'>-				g_free(s-&gt;strings[i].free);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s(printf("freeing strv=%p\n", strv));</div><div class='del'>-</div><div class='del'>-	g_free(strv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* string pool stuff */</div><div class='del'>-</div><div class='del'>-/* TODO:</div><div class='del'>-    garbage collection, using the following technique:</div><div class='del'>-      Create a memchunk for each possible size of poolv, and allocate every poolv from those</div><div class='del'>-      To garbage collect, scan all memchunk internally, ignoring any free areas (or mark each</div><div class='del'>-        poolv when freeing it - set length 0?), and find out which strings are not anywhere,</div><div class='del'>-	then free them.</div><div class='del'>-</div><div class='del'>-    OR:</div><div class='del'>-       Just keep a refcount in the hashtable, instead of duplicating the key pointer.</div><div class='del'>-</div><div class='del'>-   either would also require a free for the mempool, so ignore it for now */</div><div class='del'>-</div><div class='del'>-/*#define POOLV_REFCNT*/ /* Define to enable refcounting code that does</div><div class='del'>-			automatic garbage collection of unused strings */</div><div class='del'>-</div><div class='del'>-static GHashTable *poolv_pool = NULL;</div><div class='del'>-static EMemPool *poolv_mempool = NULL;</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-static GPtrArray *poolv_table = NULL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef PROFILE_POOLV</div><div class='del'>-static gulong poolv_hits = 0;</div><div class='del'>-static gulong poolv_misses = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-static GStaticMutex poolv_mutex = G_STATIC_MUTEX_INIT;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _EPoolv {</div><div class='del'>-	unsigned char length;</div><div class='del'>-	char *s[1];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_poolv_new: @size: The number of elements in the poolv, maximum of 254 elements.</div><div class='del'>- *</div><div class='del'>- * create a new poolv (string vector which shares a global string</div><div class='del'>- * pool).  poolv's can be used to work with arrays of strings which</div><div class='del'>- * save memory by eliminating duplicated allocations of the same</div><div class='del'>- * string.</div><div class='del'>- *</div><div class='del'>- * this is useful when you have a log of read-only strings that do not</div><div class='del'>- * go away and are duplicated a lot (such as email headers).</div><div class='del'>- *</div><div class='del'>- * we should probably in the future ref count the strings contained in</div><div class='del'>- * the hash table, but for now let's not.</div><div class='del'>- *</div><div class='del'>- * Return value: new pooled string vector</div><div class='del'>- **/</div><div class='del'>-EPoolv *</div><div class='del'>-e_poolv_new(unsigned int size)</div><div class='del'>-{</div><div class='del'>-	EPoolv *poolv;</div><div class='del'>-</div><div class='del'>-	g_assert(size &lt; 255);</div><div class='del'>-</div><div class='del'>-	poolv = g_malloc0(sizeof (*poolv) + (size - 1) * sizeof (char *));</div><div class='del'>-	poolv-&gt;length = size;</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_lock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-	if (!poolv_pool)</div><div class='del'>-		poolv_pool = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (!poolv_mempool)</div><div class='del'>-		poolv_mempool = e_mempool_new(32 * 1024, 512, E_MEMPOOL_ALIGN_BYTE);</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	{</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (poolv_table == NULL)</div><div class='del'>-			poolv_table = g_ptr_array_new();</div><div class='del'>-</div><div class='del'>-		for (i=0;i&lt;poolv_table-&gt;len;i++)</div><div class='del'>-			MPROBE(poolv_table-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add(poolv_table, poolv);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_unlock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	p(printf("new poolv=%p\tsize=%d\n", poolv, sizeof(*poolv) + (size-1)*sizeof(char *)));</div><div class='del'>-</div><div class='del'>-	return poolv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_poolv_cpy:</div><div class='del'>- * @dest: destination pooled string vector</div><div class='del'>- * @src: source pooled string vector</div><div class='del'>- *</div><div class='del'>- * Copy the contents of a pooled string vector</div><div class='del'>- *</div><div class='del'>- * Return value: @dest, which may be re-allocated if the strings</div><div class='del'>- * are different lengths.</div><div class='del'>- **/</div><div class='del'>-EPoolv *</div><div class='del'>-e_poolv_cpy(EPoolv *dest, const EPoolv *src)</div><div class='del'>-{</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int ref;</div><div class='del'>-	char *key;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	p2(g_return_val_if_fail (dest != NULL, NULL));</div><div class='del'>-	p2(g_return_val_if_fail (src != NULL, NULL));</div><div class='del'>-</div><div class='del'>-	MPROBE(dest);</div><div class='del'>-	MPROBE(src);</div><div class='del'>-</div><div class='del'>-	if (dest-&gt;length != src-&gt;length) {</div><div class='del'>-		e_poolv_destroy(dest);</div><div class='del'>-		dest = e_poolv_new(src-&gt;length);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_lock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-	/* ref new copies */</div><div class='del'>-	for (i=0;i&lt;src-&gt;length;i++) {</div><div class='del'>-		if (src-&gt;s[i]) {</div><div class='del'>-			if (g_hash_table_lookup_extended(poolv_pool, src-&gt;s[i], (void **)&amp;key, (void **)&amp;ref)) {</div><div class='del'>-				g_hash_table_insert(poolv_pool, key, (void *)(ref+1));</div><div class='del'>-			} else {</div><div class='del'>-				g_assert_not_reached();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* unref the old ones */</div><div class='del'>-	for (i=0;i&lt;dest-&gt;length;i++) {</div><div class='del'>-		if (dest-&gt;s[i]) {</div><div class='del'>-			if (g_hash_table_lookup_extended(poolv_pool, dest-&gt;s[i], (void **)&amp;key, (void **)&amp;ref)) {</div><div class='del'>-				/* if ref == 1 free it */</div><div class='del'>-				g_assert(ref &gt; 0);</div><div class='del'>-				g_hash_table_insert(poolv_pool, key, (void *)(ref-1));</div><div class='del'>-			} else {</div><div class='del'>-				g_assert_not_reached();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_unlock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	memcpy(dest-&gt;s, src-&gt;s, src-&gt;length * sizeof (char *));</div><div class='del'>-</div><div class='del'>-	return dest;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef PROFILE_POOLV</div><div class='del'>-static void</div><div class='del'>-poolv_profile_update (void)</div><div class='del'>-{</div><div class='del'>-	static time_t last_time = 0;</div><div class='del'>-	time_t new_time;</div><div class='del'>-</div><div class='del'>-	new_time = time (NULL);</div><div class='del'>-	if (new_time - last_time &lt; 5)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	printf("poolv profile: %lu hits, %lu misses: %d%% hit rate\n", </div><div class='del'>-	       poolv_hits, poolv_misses, </div><div class='del'>-	       (int)(100.0 * ((double) poolv_hits / (double) (poolv_hits + poolv_misses))));</div><div class='del'>-</div><div class='del'>-	last_time = new_time;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_poolv_set:</div><div class='del'>- * @poolv: pooled string vector</div><div class='del'>- * @index: index in vector of string</div><div class='del'>- * @str: string to set</div><div class='del'>- * @freeit: whether the caller is releasing its reference to the</div><div class='del'>- * string</div><div class='del'>- *</div><div class='del'>- * Set a string vector reference.  If the caller will no longer be</div><div class='del'>- * referencing the string, freeit should be TRUE.  Otherwise, this</div><div class='del'>- * will duplicate the string if it is not found in the pool.</div><div class='del'>- *</div><div class='del'>- * Return value: @poolv</div><div class='del'>- **/</div><div class='del'>-EPoolv *</div><div class='del'>-e_poolv_set (EPoolv *poolv, int index, char *str, int freeit)</div><div class='del'>-{</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-	unsigned int ref;</div><div class='del'>-	char *key;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	p2(g_return_val_if_fail (poolv != NULL, NULL));</div><div class='del'>-</div><div class='del'>-	g_assert(index &gt;=0 &amp;&amp; index &lt; poolv-&gt;length);</div><div class='del'>-</div><div class='del'>-	MPROBE(poolv);</div><div class='del'>-</div><div class='del'>-	p(printf("setting %d `%s'\n", index, str));</div><div class='del'>-</div><div class='del'>-	if (!str) {</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-		if (poolv-&gt;s[index]) {</div><div class='del'>-			if (g_hash_table_lookup_extended(poolv_pool, poolv-&gt;s[index], (void **)&amp;key, (void **)&amp;ref)) {</div><div class='del'>-				g_assert(ref &gt; 0);</div><div class='del'>-				g_hash_table_insert(poolv_pool, key, (void *)(ref-1));</div><div class='del'>-			} else {</div><div class='del'>-				g_assert_not_reached();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		poolv-&gt;s[index] = NULL;</div><div class='del'>-		return poolv;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_lock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-	if (g_hash_table_lookup_extended(poolv_pool, str, (void **)&amp;key, (void **)&amp;ref)) {</div><div class='del'>-		g_hash_table_insert(poolv_pool, key, (void *)(ref+1));</div><div class='del'>-		poolv-&gt;s[index] = key;</div><div class='del'>-# ifdef PROFILE_POOLV</div><div class='del'>-		poolv_hits++;</div><div class='del'>-		poolv_profile_update ();</div><div class='del'>-# endif</div><div class='del'>-	} else {</div><div class='del'>-# ifdef PROFILE_POOLV</div><div class='del'>-		poolv_misses++;</div><div class='del'>-		poolv_profile_update ();</div><div class='del'>-# endif</div><div class='del'>-		poolv-&gt;s[index] = e_mempool_strdup(poolv_mempool, str);</div><div class='del'>-		g_hash_table_insert(poolv_pool, poolv-&gt;s[index], (void *)1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#else  /* !POOLV_REFCNT */</div><div class='del'>-	if ((poolv-&gt;s[index] = g_hash_table_lookup(poolv_pool, str)) != NULL) {</div><div class='del'>-# ifdef PROFILE_POOLV</div><div class='del'>-		poolv_hits++;</div><div class='del'>-		poolv_profile_update ();</div><div class='del'>-# endif</div><div class='del'>-	} else {</div><div class='del'>-# ifdef PROFILE_POOLV</div><div class='del'>-		poolv_misses++;</div><div class='del'>-		poolv_profile_update ();</div><div class='del'>-# endif</div><div class='del'>-		poolv-&gt;s[index] = e_mempool_strdup(poolv_mempool, str);</div><div class='del'>-		g_hash_table_insert(poolv_pool, poolv-&gt;s[index], poolv-&gt;s[index]);</div><div class='del'>-	}</div><div class='del'>-#endif /* !POOLV_REFCNT */</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_unlock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (freeit)</div><div class='del'>-		g_free(str);</div><div class='del'>-</div><div class='del'>-	return poolv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_poolv_get:</div><div class='del'>- * @poolv: pooled string vector</div><div class='del'>- * @index: index in vector of string</div><div class='del'>- *</div><div class='del'>- * Retrieve a string by index.  This could possibly just be a macro.</div><div class='del'>- *</div><div class='del'>- * Since the pool is never freed, this string does not need to be</div><div class='del'>- * duplicated, but should not be modified.</div><div class='del'>- *</div><div class='del'>- * Return value: string at that index.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-e_poolv_get(EPoolv *poolv, int index)</div><div class='del'>-{</div><div class='del'>-	g_assert(poolv != NULL);</div><div class='del'>-	g_assert(index&gt;= 0 &amp;&amp; index &lt; poolv-&gt;length);</div><div class='del'>-</div><div class='del'>-	MPROBE(poolv);</div><div class='del'>-</div><div class='del'>-	p(printf("get %d = `%s'\n", index, poolv-&gt;s[index]));</div><div class='del'>-</div><div class='del'>-	return poolv-&gt;s[index]?poolv-&gt;s[index]:"";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_poolv_destroy:</div><div class='del'>- * @poolv: pooled string vector to free</div><div class='del'>- *</div><div class='del'>- * Free a pooled string vector.  This doesn't free the strings from</div><div class='del'>- * the vector, however.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_poolv_destroy(EPoolv *poolv)</div><div class='del'>-{</div><div class='del'>-#ifdef POOLV_REFCNT</div><div class='del'>-	int i;</div><div class='del'>-	unsigned int ref;</div><div class='del'>-	char *key;</div><div class='del'>-</div><div class='del'>-	MPROBE(poolv);</div><div class='del'>-</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_lock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	for (i=0;i&lt;poolv_table-&gt;len;i++)</div><div class='del'>-		MPROBE(poolv_table-&gt;pdata[i]);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_remove_fast(poolv_table, poolv);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;poolv-&gt;length;i++) {</div><div class='del'>-		if (poolv-&gt;s[i]) {</div><div class='del'>-			if (g_hash_table_lookup_extended(poolv_pool, poolv-&gt;s[i], (void **)&amp;key, (void **)&amp;ref)) {</div><div class='del'>-				/* if ref == 1 free it */</div><div class='del'>-				g_assert(ref &gt; 0);</div><div class='del'>-				g_hash_table_insert(poolv_pool, key, (void *)(ref-1));</div><div class='del'>-			} else {</div><div class='del'>-				g_assert_not_reached();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#ifdef G_THREADS_ENABLED</div><div class='del'>-	g_static_mutex_unlock(&amp;poolv_mutex);</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free(poolv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-#define CHUNK_SIZE (20)</div><div class='del'>-#define CHUNK_COUNT (32)</div><div class='del'>-</div><div class='del'>-#define s(x)</div><div class='del'>-</div><div class='del'>-main()</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	MemChunk *mc;</div><div class='del'>-	void *mem, *last;</div><div class='del'>-	GMemChunk *gmc;</div><div class='del'>-	struct _EStrv *s;</div><div class='del'>-</div><div class='del'>-	s = strv_new(8);</div><div class='del'>-	s = strv_set(s, 1, "Testing 1");</div><div class='del'>-	s = strv_set(s, 2, "Testing 2");</div><div class='del'>-	s = strv_set(s, 3, "Testing 3");</div><div class='del'>-	s = strv_set(s, 4, "Testing 4");</div><div class='del'>-	s = strv_set(s, 5, "Testing 5");</div><div class='del'>-	s = strv_set(s, 6, "Testing 7");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;8;i++) {</div><div class='del'>-		printf("s[%d] = %s\n", i, strv_get(s, i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s(sleep(5));</div><div class='del'>-</div><div class='del'>-	printf("packing ...\n");</div><div class='del'>-	s = strv_pack(s);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;8;i++) {</div><div class='del'>-		printf("s[%d] = %s\n", i, strv_get(s, i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("setting ...\n");</div><div class='del'>-</div><div class='del'>-	s = strv_set_ref(s, 1, "Testing 1 x");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;8;i++) {</div><div class='del'>-		printf("s[%d] = %s\n", i, strv_get(s, i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("packing ...\n");</div><div class='del'>-	s = strv_pack(s);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;8;i++) {</div><div class='del'>-		printf("s[%d] = %s\n", i, strv_get(s, i));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	strv_free(s);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	time_start("Using memchunks");</div><div class='del'>-	mc = memchunk_new(CHUNK_COUNT, CHUNK_SIZE);</div><div class='del'>-	for (i=0;i&lt;1000000;i++) {</div><div class='del'>-		mem = memchunk_alloc(mc);</div><div class='del'>-		if ((i &amp; 1) == 0)</div><div class='del'>-			memchunk_free(mc, mem);</div><div class='del'>-	}</div><div class='del'>-	s(sleep(10));</div><div class='del'>-	memchunk_destroy(mc);</div><div class='del'>-	time_end("allocating 1000000 memchunks, freeing 500k");</div><div class='del'>-</div><div class='del'>-	time_start("Using gmemchunks");</div><div class='del'>-	gmc = g_mem_chunk_new("memchunk", CHUNK_SIZE, CHUNK_SIZE*CHUNK_COUNT, G_ALLOC_AND_FREE);</div><div class='del'>-	for (i=0;i&lt;1000000;i++) {</div><div class='del'>-		mem = g_mem_chunk_alloc(gmc);</div><div class='del'>-		if ((i &amp; 1) == 0)</div><div class='del'>-			g_mem_chunk_free(gmc, mem);</div><div class='del'>-	}</div><div class='del'>-	s(sleep(10));</div><div class='del'>-	g_mem_chunk_destroy(gmc);</div><div class='del'>-	time_end("allocating 1000000 gmemchunks, freeing 500k");</div><div class='del'>-</div><div class='del'>-	time_start("Using memchunks");</div><div class='del'>-	mc = memchunk_new(CHUNK_COUNT, CHUNK_SIZE);</div><div class='del'>-	for (i=0;i&lt;1000000;i++) {</div><div class='del'>-		mem = memchunk_alloc(mc);</div><div class='del'>-	}</div><div class='del'>-	s(sleep(10));</div><div class='del'>-	memchunk_destroy(mc);</div><div class='del'>-	time_end("allocating 1000000 memchunks");</div><div class='del'>-</div><div class='del'>-	time_start("Using gmemchunks");</div><div class='del'>-	gmc = g_mem_chunk_new("memchunk", CHUNK_SIZE, CHUNK_COUNT*CHUNK_SIZE, G_ALLOC_ONLY);</div><div class='del'>-	for (i=0;i&lt;1000000;i++) {</div><div class='del'>-		mem = g_mem_chunk_alloc(gmc);</div><div class='del'>-	}</div><div class='del'>-	s(sleep(10));</div><div class='del'>-	g_mem_chunk_destroy(gmc);</div><div class='del'>-	time_end("allocating 1000000 gmemchunks");</div><div class='del'>-</div><div class='del'>-	time_start("Using malloc");</div><div class='del'>-	for (i=0;i&lt;1000000;i++) {</div><div class='del'>-		malloc(CHUNK_SIZE);</div><div class='del'>-	}</div><div class='del'>-	time_end("allocating 1000000 malloc");</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-memory.h b/e-util/e-memory.h<br/>deleted file mode 100644<br/>index 9cc89f2f23..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-memory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-memory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 2001, Ximian Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>- *	    Jacob Berkman &lt;jacob@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_MEMORY_H</div><div class='del'>-#define _E_MEMORY_H</div><div class='del'>-</div><div class='del'>-/* memchunks - allocate/free fixed-size blocks of memory */</div><div class='del'>-/* this is like gmemchunk, only faster and less overhead (only 4 bytes for every atomcount allocations) */</div><div class='del'>-typedef struct _EMemChunk EMemChunk;</div><div class='del'>-</div><div class='del'>-EMemChunk *e_memchunk_new(int atomcount, int atomsize);</div><div class='del'>-void *e_memchunk_alloc(EMemChunk *m);</div><div class='del'>-void *e_memchunk_alloc0(EMemChunk *m);</div><div class='del'>-void e_memchunk_free(EMemChunk *m, void *mem);</div><div class='del'>-void e_memchunk_empty(EMemChunk *m);</div><div class='del'>-void e_memchunk_clean(EMemChunk *m);</div><div class='del'>-void e_memchunk_destroy(EMemChunk *m);</div><div class='del'>-</div><div class='del'>-/* mempools - allocate variable sized blocks of memory, and free as one */</div><div class='del'>-/* allocation is very fast, but cannot be freed individually */</div><div class='del'>-typedef struct _EMemPool EMemPool;</div><div class='del'>-typedef enum {</div><div class='del'>-	E_MEMPOOL_ALIGN_STRUCT = 0,	/* allocate to native structure alignment */</div><div class='del'>-	E_MEMPOOL_ALIGN_WORD = 1,	/* allocate to words - 16 bit alignment */</div><div class='del'>-	E_MEMPOOL_ALIGN_BYTE = 2,	/* allocate to bytes - 8 bit alignment */</div><div class='del'>-	E_MEMPOOL_ALIGN_MASK = 3, /* which bits determine the alignment information */</div><div class='del'>-} EMemPoolFlags;</div><div class='del'>-</div><div class='del'>-EMemPool *e_mempool_new(int blocksize, int threshold, EMemPoolFlags flags);</div><div class='del'>-void *e_mempool_alloc(EMemPool *pool, int size);</div><div class='del'>-char *e_mempool_strdup(EMemPool *pool, const char *str);</div><div class='del'>-void e_mempool_flush(EMemPool *pool, int freeall);</div><div class='del'>-void e_mempool_destroy(EMemPool *pool);</div><div class='del'>-</div><div class='del'>-/* strv's string arrays that can be efficiently modified and then compressed mainly for retrival */</div><div class='del'>-/* building is relatively fast, once compressed it takes the minimum amount of memory possible to store */</div><div class='del'>-typedef struct _EStrv EStrv;</div><div class='del'>-</div><div class='del'>-EStrv *e_strv_new(int size);</div><div class='del'>-EStrv *e_strv_set_ref(EStrv *strv, int index, char *str);</div><div class='del'>-EStrv *e_strv_set_ref_free(EStrv *strv, int index, char *str);</div><div class='del'>-EStrv *e_strv_set(EStrv *strv, int index, const char *str);</div><div class='del'>-EStrv *e_strv_pack(EStrv *strv);</div><div class='del'>-char *e_strv_get(EStrv *strv, int index);</div><div class='del'>-void e_strv_destroy(EStrv *strv);</div><div class='del'>-</div><div class='del'>-/* poolv's are similar to strv's, but they store common strings */</div><div class='del'>-typedef struct _EPoolv EPoolv;</div><div class='del'>-</div><div class='del'>-EPoolv *e_poolv_new(unsigned int size);</div><div class='del'>-EPoolv *e_poolv_cpy(EPoolv *dest, const EPoolv *src);</div><div class='del'>-EPoolv *e_poolv_set(EPoolv *poolv, int index, char *str, int freeit);</div><div class='del'>-const char *e_poolv_get(EPoolv *poolv, int index);</div><div class='del'>-void e_poolv_destroy(EPoolv *poolv);</div><div class='del'>-</div><div class='del'>-#endif /* ! _E_MEMORY_H */</div><div class='head'>diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c<br/>deleted file mode 100644<br/>index 48a45c0288..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-mktemp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-mktemp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,269 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-mktemp.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean initialized = FALSE;</div><div class='del'>-static GSList *temp_files = NULL;</div><div class='del'>-static GSList *temp_dirs = NULL;</div><div class='del'>-#ifdef ENABLE_THREADS</div><div class='del'>-static pthread_mutex_t temp_files_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-static pthread_mutex_t temp_dirs_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-#define TEMP_FILES_LOCK() pthread_mutex_lock (&amp;temp_files_lock)</div><div class='del'>-#define TEMP_FILES_UNLOCK() pthread_mutex_unlock (&amp;temp_files_lock)</div><div class='del'>-#define TEMP_DIRS_LOCK() pthread_mutex_lock (&amp;temp_dirs_lock)</div><div class='del'>-#define TEMP_DIRS_UNLOCK() pthread_mutex_unlock (&amp;temp_dirs_lock)</div><div class='del'>-#else</div><div class='del'>-#define TEMP_FILES_LOCK()</div><div class='del'>-#define TEMP_FILES_UNLOCK()</div><div class='del'>-#define TEMP_DIRS_LOCK()</div><div class='del'>-#define TEMP_DIRS_UNLOCK()</div><div class='del'>-#endif /* ENABLE_THREADS */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GString *</div><div class='del'>-get_path (gboolean make)</div><div class='del'>-{</div><div class='del'>-	GString *path;</div><div class='del'>-	</div><div class='del'>-	path = g_string_new ("/tmp/evolution-");</div><div class='del'>-	g_string_sprintfa (path, "%d-%d", (int) getuid (), (int) getpid ());</div><div class='del'>-	</div><div class='del'>-	if (make) {</div><div class='del'>-		int ret;</div><div class='del'>-		</div><div class='del'>-		/* shoot now, ask questions later */</div><div class='del'>-		ret = mkdir (path-&gt;str, S_IRWXU);</div><div class='del'>-		if (ret == -1) {</div><div class='del'>-			if (errno == EEXIST) {</div><div class='del'>-				struct stat st;</div><div class='del'>-				</div><div class='del'>-				if (stat (path-&gt;str, &amp;st) == -1) {</div><div class='del'>-					/* reset errno */</div><div class='del'>-					errno = EEXIST;</div><div class='del'>-					g_string_free (path, TRUE);</div><div class='del'>-					return NULL;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* make sure this is a directory and belongs to us... */</div><div class='del'>-				if (!S_ISDIR (st.st_mode) || st.st_uid != getuid ()) {</div><div class='del'>-					/* eek! this is bad... */</div><div class='del'>-					g_string_free (path, TRUE);</div><div class='del'>-					return NULL;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* some other error...do not pass go, do not collect $200 */</div><div class='del'>-				g_string_free (path, TRUE);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_mktemp_cleanup (void)</div><div class='del'>-{</div><div class='del'>-	GString *path;</div><div class='del'>-	GSList *node;</div><div class='del'>-	</div><div class='del'>-	TEMP_FILES_LOCK ();</div><div class='del'>-	if (temp_files) {</div><div class='del'>-		node = temp_files;</div><div class='del'>-		while (node) {</div><div class='del'>-			unlink (node-&gt;data);</div><div class='del'>-			g_free (node-&gt;data);</div><div class='del'>-			node = node-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_slist_free (temp_files);</div><div class='del'>-		temp_files = NULL;</div><div class='del'>-	}</div><div class='del'>-	TEMP_FILES_UNLOCK ();</div><div class='del'>-	</div><div class='del'>-	TEMP_DIRS_LOCK ();</div><div class='del'>-	if (temp_dirs) {</div><div class='del'>-		node = temp_dirs;</div><div class='del'>-		while (node) {</div><div class='del'>-			/* perform the equivalent of a rm -rf */</div><div class='del'>-			struct dirent *dent;</div><div class='del'>-			DIR *dir;</div><div class='del'>-			</div><div class='del'>-			/* first empty out this directory of it's files... */</div><div class='del'>-			dir = opendir (node-&gt;data);</div><div class='del'>-			if (dir) {</div><div class='del'>-				while ((dent = readdir (dir)) != NULL) {</div><div class='del'>-					/* yea...so if we contain</div><div class='del'>-					   subdirectories this won't work, but</div><div class='del'>-					   it shouldn't so we won't</div><div class='del'>-					   bother caring... */</div><div class='del'>-					if (strcmp (dent-&gt;d_name, ".") &amp;&amp; strcmp (dent-&gt;d_name, ".."))</div><div class='del'>-						unlink (dent-&gt;d_name);</div><div class='del'>-				}</div><div class='del'>-				closedir (dir);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* ...then rmdir the directory */</div><div class='del'>-			rmdir (node-&gt;data);</div><div class='del'>-			g_free (node-&gt;data);</div><div class='del'>-			node = node-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_slist_free (temp_dirs);</div><div class='del'>-		temp_dirs = NULL;</div><div class='del'>-	}</div><div class='del'>-	TEMP_DIRS_UNLOCK ();</div><div class='del'>-	</div><div class='del'>-	path = get_path (FALSE);</div><div class='del'>-	rmdir (path-&gt;str);</div><div class='del'>-	</div><div class='del'>-	g_string_free (path, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_mktemp (const char *template)</div><div class='del'>-{</div><div class='del'>-	GString *path;</div><div class='del'>-	char *ret;</div><div class='del'>-	</div><div class='del'>-	path = get_path (TRUE);</div><div class='del'>-	if (!path)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	g_string_append_c (path, '/');</div><div class='del'>-	if (template)</div><div class='del'>-		g_string_append (path, template);</div><div class='del'>-	else</div><div class='del'>-		g_string_append (path, "unknown-XXXXXX");</div><div class='del'>-	</div><div class='del'>-	ret = mktemp (path-&gt;str);</div><div class='del'>-	if (ret) {</div><div class='del'>-		TEMP_FILES_LOCK ();</div><div class='del'>-		if (!initialized) {</div><div class='del'>-			g_atexit (e_mktemp_cleanup);</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-		temp_files = g_slist_prepend (temp_files, ret);</div><div class='del'>-		g_string_free (path, FALSE);</div><div class='del'>-		TEMP_FILES_UNLOCK ();</div><div class='del'>-	} else {</div><div class='del'>-		g_string_free (path, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_mkstemp (const char *template)</div><div class='del'>-{</div><div class='del'>-	GString *path;</div><div class='del'>-	int fd;</div><div class='del'>-	</div><div class='del'>-	path = get_path (TRUE);</div><div class='del'>-	if (!path)</div><div class='del'>-		return -1;</div><div class='del'>-	</div><div class='del'>-	g_string_append_c (path, '/');</div><div class='del'>-	if (template)</div><div class='del'>-		g_string_append (path, template);</div><div class='del'>-	else</div><div class='del'>-		g_string_append (path, "unknown-XXXXXX");</div><div class='del'>-	</div><div class='del'>-	fd = mkstemp (path-&gt;str);</div><div class='del'>-	if (fd != -1) {</div><div class='del'>-		TEMP_FILES_LOCK ();</div><div class='del'>-		if (!initialized) {</div><div class='del'>-			g_atexit (e_mktemp_cleanup);</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-		temp_files = g_slist_prepend (temp_files, path-&gt;str);</div><div class='del'>-		g_string_free (path, FALSE);</div><div class='del'>-		TEMP_FILES_UNLOCK ();</div><div class='del'>-	} else {</div><div class='del'>-		g_string_free (path, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_mkdtemp (const char *template)</div><div class='del'>-{</div><div class='del'>-	GString *path;</div><div class='del'>-	char *tmpdir;</div><div class='del'>-	</div><div class='del'>-	path = get_path (TRUE);</div><div class='del'>-	if (!path)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	g_string_append_c (path, '/');</div><div class='del'>-	if (template)</div><div class='del'>-		g_string_append (path, template);</div><div class='del'>-	else</div><div class='del'>-		g_string_append (path, "unknown-XXXXXX");</div><div class='del'>-	</div><div class='del'>-#ifdef HAVE_MKDTEMP</div><div class='del'>-	tmpdir = mkdtemp (path-&gt;str);</div><div class='del'>-#else</div><div class='del'>-	tmpdir = mktemp (path-&gt;str);</div><div class='del'>-	if (tmpdir) {</div><div class='del'>-		if (mkdir (tmpdir, S_IRWXU) == -1)</div><div class='del'>-			tmpdir = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	if (tmpdir) {</div><div class='del'>-		TEMP_DIRS_LOCK ();</div><div class='del'>-		if (!initialized) {</div><div class='del'>-			g_atexit (e_mktemp_cleanup);</div><div class='del'>-			initialized = TRUE;</div><div class='del'>-		}</div><div class='del'>-		temp_dirs = g_slist_prepend (temp_dirs, tmpdir);</div><div class='del'>-		g_string_free (path, FALSE);</div><div class='del'>-		TEMP_DIRS_UNLOCK ();</div><div class='del'>-	} else {</div><div class='del'>-		g_string_free (path, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return tmpdir;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h<br/>deleted file mode 100644<br/>index b5eb587d86..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-mktemp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-mktemp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2001 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef __E_MKTEMP_H__</div><div class='del'>-#define __E_MKTEMP_H__</div><div class='del'>-</div><div class='del'>-const char *e_mktemp  (const char *template);</div><div class='del'>-</div><div class='del'>-int         e_mkstemp (const char *template);</div><div class='del'>-</div><div class='del'>-const char *e_mkdtemp (const char *template);</div><div class='del'>-</div><div class='del'>-#endif /* __E_MKTEMP_H__ */</div><div class='head'>diff --git a/e-util/e-msgport.c b/e-util/e-msgport.c<br/>deleted file mode 100644<br/>index e04fa8dc9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-msgport.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-msgport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,914 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include "e-msgport.h"</div><div class='del'>-</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;pthread.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#define m(x)			/* msgport debug */</div><div class='del'>-#define t(x) 			/* thread debug */</div><div class='del'>-</div><div class='del'>-void e_dlist_init(EDList *v)</div><div class='del'>-{</div><div class='del'>-        v-&gt;head = (EDListNode *)&amp;v-&gt;tail;</div><div class='del'>-        v-&gt;tail = 0;</div><div class='del'>-        v-&gt;tailpred = (EDListNode *)&amp;v-&gt;head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDListNode *e_dlist_addhead(EDList *l, EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next = l-&gt;head;</div><div class='del'>-        n-&gt;prev = (EDListNode *)&amp;l-&gt;head;</div><div class='del'>-        l-&gt;head-&gt;prev = n;</div><div class='del'>-        l-&gt;head = n;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDListNode *e_dlist_addtail(EDList *l, EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next = (EDListNode *)&amp;l-&gt;tail;</div><div class='del'>-        n-&gt;prev = l-&gt;tailpred;</div><div class='del'>-        l-&gt;tailpred-&gt;next = n;</div><div class='del'>-        l-&gt;tailpred = n;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDListNode *e_dlist_remove(EDListNode *n)</div><div class='del'>-{</div><div class='del'>-        n-&gt;next-&gt;prev = n-&gt;prev;</div><div class='del'>-        n-&gt;prev-&gt;next = n-&gt;next;</div><div class='del'>-        return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDListNode *e_dlist_remhead(EDList *l)</div><div class='del'>-{</div><div class='del'>-	EDListNode *n, *nn;</div><div class='del'>-</div><div class='del'>-	n = l-&gt;head;</div><div class='del'>-	nn = n-&gt;next;</div><div class='del'>-	if (nn) {</div><div class='del'>-		nn-&gt;prev = n-&gt;prev;</div><div class='del'>-		l-&gt;head = nn;</div><div class='del'>-		return n;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EDListNode *e_dlist_remtail(EDList *l)</div><div class='del'>-{</div><div class='del'>-	EDListNode *n, *np;</div><div class='del'>-</div><div class='del'>-	n = l-&gt;tailpred;</div><div class='del'>-	np = n-&gt;prev;</div><div class='del'>-	if (np) {</div><div class='del'>-		np-&gt;next = n-&gt;next;</div><div class='del'>-		l-&gt;tailpred = np;</div><div class='del'>-		return n;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int e_dlist_empty(EDList *l)</div><div class='del'>-{</div><div class='del'>-	return (l-&gt;head == (EDListNode *)&amp;l-&gt;tail);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int e_dlist_length(EDList *l)</div><div class='del'>-{</div><div class='del'>-	EDListNode *n, *nn;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	n = l-&gt;head;</div><div class='del'>-	nn = n-&gt;next;</div><div class='del'>-	while (nn) {</div><div class='del'>-		count++;</div><div class='del'>-		n = nn;</div><div class='del'>-		nn = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _EMsgPort {</div><div class='del'>-	EDList queue;</div><div class='del'>-	int condwait;		/* how many waiting in condwait */</div><div class='del'>-	union {</div><div class='del'>-		int pipe[2];</div><div class='del'>-		struct {</div><div class='del'>-			int read;</div><div class='del'>-			int write;</div><div class='del'>-		} fd;</div><div class='del'>-	} pipe;</div><div class='del'>-	/* @#@$#$ glib stuff */</div><div class='del'>-	GCond *cond;</div><div class='del'>-	GMutex *lock;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EMsgPort *e_msgport_new(void)</div><div class='del'>-{</div><div class='del'>-	EMsgPort *mp;</div><div class='del'>-</div><div class='del'>-	mp = g_malloc(sizeof(*mp));</div><div class='del'>-	e_dlist_init(&amp;mp-&gt;queue);</div><div class='del'>-	mp-&gt;lock = g_mutex_new();</div><div class='del'>-	mp-&gt;cond = g_cond_new();</div><div class='del'>-	mp-&gt;pipe.fd.read = -1;</div><div class='del'>-	mp-&gt;pipe.fd.write = -1;</div><div class='del'>-	mp-&gt;condwait = 0;</div><div class='del'>-</div><div class='del'>-	return mp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void e_msgport_destroy(EMsgPort *mp)</div><div class='del'>-{</div><div class='del'>-	g_mutex_free(mp-&gt;lock);</div><div class='del'>-	g_cond_free(mp-&gt;cond);</div><div class='del'>-	if (mp-&gt;pipe.fd.read != -1) {</div><div class='del'>-		close(mp-&gt;pipe.fd.read);</div><div class='del'>-		close(mp-&gt;pipe.fd.write);</div><div class='del'>-	}</div><div class='del'>-	g_free(mp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* get a fd that can be used to wait on the port asynchronously */</div><div class='del'>-int e_msgport_fd(EMsgPort *mp)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-</div><div class='del'>-	g_mutex_lock(mp-&gt;lock);</div><div class='del'>-	fd = mp-&gt;pipe.fd.read;</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		pipe(mp-&gt;pipe.pipe);</div><div class='del'>-		fd = mp-&gt;pipe.fd.read;</div><div class='del'>-	}</div><div class='del'>-	g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return fd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void e_msgport_put(EMsgPort *mp, EMsg *msg)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-</div><div class='del'>-	m(printf("put:\n"));</div><div class='del'>-	g_mutex_lock(mp-&gt;lock);</div><div class='del'>-	e_dlist_addtail(&amp;mp-&gt;queue, &amp;msg-&gt;ln);</div><div class='del'>-	if (mp-&gt;condwait &gt; 0) {</div><div class='del'>-		m(printf("put: condwait &gt; 0, waking up\n"));</div><div class='del'>-		g_cond_signal(mp-&gt;cond);</div><div class='del'>-	}</div><div class='del'>-	fd = mp-&gt;pipe.fd.write;</div><div class='del'>-	g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	if (fd != -1) {</div><div class='del'>-		m(printf("put: have pipe, writing notification to it\n"));</div><div class='del'>-		write(fd, "", 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	m(printf("put: done\n"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-msgport_cleanlock(void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgPort *mp = data;</div><div class='del'>-</div><div class='del'>-	g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMsg *e_msgport_wait(EMsgPort *mp)</div><div class='del'>-{</div><div class='del'>-	EMsg *msg;</div><div class='del'>-</div><div class='del'>-	m(printf("wait:\n"));</div><div class='del'>-	g_mutex_lock(mp-&gt;lock);</div><div class='del'>-	while (e_dlist_empty(&amp;mp-&gt;queue)) {</div><div class='del'>-		if (mp-&gt;pipe.fd.read == -1) {</div><div class='del'>-			m(printf("wait: waiting on condition\n"));</div><div class='del'>-			mp-&gt;condwait++;</div><div class='del'>-			/* if we are cancelled in the cond-wait, then we need to unlock our lock when we cleanup */</div><div class='del'>-			pthread_cleanup_push(msgport_cleanlock, mp);</div><div class='del'>-			g_cond_wait(mp-&gt;cond, mp-&gt;lock);</div><div class='del'>-			pthread_cleanup_pop(0);</div><div class='del'>-			m(printf("wait: got condition\n"));</div><div class='del'>-			mp-&gt;condwait--;</div><div class='del'>-		} else {</div><div class='del'>-			fd_set rfds;</div><div class='del'>-</div><div class='del'>-			m(printf("wait: waitng on pipe\n"));</div><div class='del'>-			FD_ZERO(&amp;rfds);</div><div class='del'>-			FD_SET(mp-&gt;pipe.fd.read, &amp;rfds);</div><div class='del'>-			g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-			select(mp-&gt;pipe.fd.read+1, &amp;rfds, NULL, NULL, NULL);</div><div class='del'>-			pthread_testcancel();</div><div class='del'>-			g_mutex_lock(mp-&gt;lock);</div><div class='del'>-			m(printf("wait: got pipe\n"));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	msg = (EMsg *)mp-&gt;queue.head;</div><div class='del'>-	m(printf("wait: message = %p\n", msg));</div><div class='del'>-	g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-	m(printf("wait: done\n"));</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EMsg *e_msgport_get(EMsgPort *mp)</div><div class='del'>-{</div><div class='del'>-	EMsg *msg;</div><div class='del'>-	char dummy[1];</div><div class='del'>-</div><div class='del'>-	g_mutex_lock(mp-&gt;lock);</div><div class='del'>-	msg = (EMsg *)e_dlist_remhead(&amp;mp-&gt;queue);</div><div class='del'>-	if (msg &amp;&amp; mp-&gt;pipe.fd.read != -1)</div><div class='del'>-		read(mp-&gt;pipe.fd.read, dummy, 1);</div><div class='del'>-	m(printf("get: message = %p\n", msg));</div><div class='del'>-	g_mutex_unlock(mp-&gt;lock);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void e_msgport_reply(EMsg *msg)</div><div class='del'>-{</div><div class='del'>-	if (msg-&gt;reply_port) {</div><div class='del'>-		e_msgport_put(msg-&gt;reply_port, msg);</div><div class='del'>-	}</div><div class='del'>-	/* else lost? */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _thread_info {</div><div class='del'>-	pthread_t id;</div><div class='del'>-	int busy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EThread {</div><div class='del'>-	struct _EThread *next;</div><div class='del'>-	struct _EThread *prev;</div><div class='del'>-</div><div class='del'>-	EMsgPort *server_port;</div><div class='del'>-	EMsgPort *reply_port;</div><div class='del'>-	pthread_mutex_t mutex;</div><div class='del'>-	e_thread_t type;</div><div class='del'>-	int queue_limit;</div><div class='del'>-</div><div class='del'>-	int waiting;		/* if we are waiting for a new message, count of waiting processes */</div><div class='del'>-	pthread_t id;		/* id of our running child thread */</div><div class='del'>-	GList *id_list;		/* if THREAD_NEW, then a list of our child threads in thread_info structs */</div><div class='del'>-</div><div class='del'>-	EThreadFunc destroy;</div><div class='del'>-	void *destroy_data;</div><div class='del'>-</div><div class='del'>-	EThreadFunc received;</div><div class='del'>-	void *received_data;</div><div class='del'>-</div><div class='del'>-	EThreadFunc lost;</div><div class='del'>-	void *lost_data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* All active threads */</div><div class='del'>-static EDList ethread_list = E_DLIST_INITIALISER(ethread_list);</div><div class='del'>-static pthread_mutex_t ethread_lock = PTHREAD_MUTEX_INITIALIZER;</div><div class='del'>-</div><div class='del'>-#define E_THREAD_NONE ((pthread_t)~0)</div><div class='del'>-#define E_THREAD_QUIT_REPLYPORT ((struct _EMsgPort *)~0)</div><div class='del'>-</div><div class='del'>-static void thread_destroy_msg(EThread *e, EMsg *m);</div><div class='del'>-</div><div class='del'>-static struct _thread_info *thread_find(EThread *e, pthread_t id)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	struct _thread_info *info;</div><div class='del'>-</div><div class='del'>-	node = e-&gt;id_list;</div><div class='del'>-	while (node) {</div><div class='del'>-		info = node-&gt;data;</div><div class='del'>-		if (info-&gt;id == id)</div><div class='del'>-			return info;</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void thread_remove(EThread *e, pthread_t id)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	struct _thread_info *info;</div><div class='del'>-</div><div class='del'>-	node = e-&gt;id_list;</div><div class='del'>-	while (node) {</div><div class='del'>-		info = node-&gt;data;</div><div class='del'>-		if (info-&gt;id == id) {</div><div class='del'>-			e-&gt;id_list = g_list_remove(e-&gt;id_list, info);</div><div class='del'>-			g_free(info);</div><div class='del'>-		}</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-EThread *e_thread_new(e_thread_t type)</div><div class='del'>-{</div><div class='del'>-	EThread *e;</div><div class='del'>-</div><div class='del'>-	e = g_malloc0(sizeof(*e));</div><div class='del'>-	pthread_mutex_init(&amp;e-&gt;mutex, 0);</div><div class='del'>-	e-&gt;type = type;</div><div class='del'>-	e-&gt;server_port = e_msgport_new();</div><div class='del'>-	e-&gt;id = E_THREAD_NONE;</div><div class='del'>-	e-&gt;queue_limit = INT_MAX;</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;ethread_lock);</div><div class='del'>-	e_dlist_addtail(&amp;ethread_list, (EDListNode *)e);</div><div class='del'>-	pthread_mutex_unlock(&amp;ethread_lock);</div><div class='del'>-</div><div class='del'>-	return e;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* close down the threads &amp; resources etc */</div><div class='del'>-void e_thread_destroy(EThread *e)</div><div class='del'>-{</div><div class='del'>-	int busy = FALSE;</div><div class='del'>-	EMsg *msg;</div><div class='del'>-	struct _thread_info *info;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	/* make sure we soak up all the messages first */</div><div class='del'>-	while ( (msg = e_msgport_get(e-&gt;server_port)) ) {</div><div class='del'>-		thread_destroy_msg(e, msg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	switch(e-&gt;type) {</div><div class='del'>-	case E_THREAD_QUEUE:</div><div class='del'>-	case E_THREAD_DROP:</div><div class='del'>-		/* if we have a thread, 'kill' it */</div><div class='del'>-		if (e-&gt;id != E_THREAD_NONE) {</div><div class='del'>-			pthread_t id = e-&gt;id;</div><div class='del'>-</div><div class='del'>-			t(printf("Sending thread '%d' quit message\n", id));</div><div class='del'>-</div><div class='del'>-			e-&gt;id = E_THREAD_NONE;</div><div class='del'>-</div><div class='del'>-			msg = g_malloc0(sizeof(*msg));</div><div class='del'>-			msg-&gt;reply_port = E_THREAD_QUIT_REPLYPORT;</div><div class='del'>-			e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-</div><div class='del'>-			pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-			t(printf("Joining thread '%d'\n", id));</div><div class='del'>-			pthread_join(id, 0);</div><div class='del'>-			t(printf("Joined thread '%d'!\n", id));</div><div class='del'>-			pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-		}</div><div class='del'>-		busy = e-&gt;id != E_THREAD_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case E_THREAD_NEW:</div><div class='del'>-		/* first, send everyone a quit message */</div><div class='del'>-		l = e-&gt;id_list;</div><div class='del'>-		while (l) {</div><div class='del'>-			info = l-&gt;data;</div><div class='del'>-			t(printf("Sending thread '%d' quit message\n", info-&gt;id));</div><div class='del'>-			msg = g_malloc0(sizeof(*msg));</div><div class='del'>-			msg-&gt;reply_port = E_THREAD_QUIT_REPLYPORT;</div><div class='del'>-			e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-			l = l-&gt;next;			</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* then, wait for everyone to quit */</div><div class='del'>-		while (e-&gt;id_list) {</div><div class='del'>-			info = e-&gt;id_list-&gt;data;</div><div class='del'>-			e-&gt;id_list = g_list_remove(e-&gt;id_list, info);</div><div class='del'>-			pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-			t(printf("Joining thread '%d'\n", info-&gt;id));</div><div class='del'>-			pthread_join(info-&gt;id, 0);</div><div class='del'>-			t(printf("Joined thread '%d'!\n", info-&gt;id));</div><div class='del'>-			pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-			g_free(info);</div><div class='del'>-		}</div><div class='del'>-		busy = g_list_length(e-&gt;id_list) != 0;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* and clean up, if we can */</div><div class='del'>-	if (busy) {</div><div class='del'>-		g_warning("threads were busy, leaked EThread");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;ethread_lock);</div><div class='del'>-	e_dlist_remove((EDListNode *)e);</div><div class='del'>-	pthread_mutex_unlock(&amp;ethread_lock);</div><div class='del'>-</div><div class='del'>-	pthread_mutex_destroy(&amp;e-&gt;mutex);</div><div class='del'>-	e_msgport_destroy(e-&gt;server_port);</div><div class='del'>-	g_free(e);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set the queue maximum depth, what happens when the queue</div><div class='del'>-   fills up depends on the queue type */</div><div class='del'>-void e_thread_set_queue_limit(EThread *e, int limit)</div><div class='del'>-{</div><div class='del'>-	e-&gt;queue_limit = limit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set a msg destroy callback, this can not call any e_thread functions on @e */</div><div class='del'>-void e_thread_set_msg_destroy(EThread *e, EThreadFunc destroy, void *data)</div><div class='del'>-{</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	e-&gt;destroy = destroy;</div><div class='del'>-	e-&gt;destroy_data = data;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set a message lost callback, called if any message is discarded */</div><div class='del'>-void e_thread_set_msg_lost(EThread *e, EThreadFunc lost, void *data)</div><div class='del'>-{</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	e-&gt;lost = lost;</div><div class='del'>-	e-&gt;lost_data = lost;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set a reply port, if set, then send messages back once finished */</div><div class='del'>-void e_thread_set_reply_port(EThread *e, EMsgPort *reply_port)</div><div class='del'>-{</div><div class='del'>-	e-&gt;reply_port = reply_port;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set a received data callback */</div><div class='del'>-void e_thread_set_msg_received(EThread *e, EThreadFunc received, void *data)</div><div class='del'>-{</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	e-&gt;received = received;</div><div class='del'>-	e-&gt;received_data = data;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* find out if we're busy doing any work, e==NULL, check for all work */</div><div class='del'>-int e_thread_busy(EThread *e)</div><div class='del'>-{</div><div class='del'>-	int busy = FALSE;</div><div class='del'>-</div><div class='del'>-	if (e == NULL) {</div><div class='del'>-		pthread_mutex_lock(&amp;ethread_lock);</div><div class='del'>-		e = (EThread *)ethread_list.head;</div><div class='del'>-		while (e-&gt;next &amp;&amp; !busy) {</div><div class='del'>-			busy = e_thread_busy(e);</div><div class='del'>-			e = e-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		pthread_mutex_unlock(&amp;ethread_lock);</div><div class='del'>-	} else {</div><div class='del'>-		pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-		switch (e-&gt;type) {</div><div class='del'>-		case E_THREAD_QUEUE:</div><div class='del'>-		case E_THREAD_DROP:</div><div class='del'>-			busy = e-&gt;waiting != 1 &amp;&amp; e-&gt;id != E_THREAD_NONE;</div><div class='del'>-			break;</div><div class='del'>-		case E_THREAD_NEW:</div><div class='del'>-			busy = e-&gt;waiting != g_list_length(e-&gt;id_list);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return busy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-thread_destroy_msg(EThread *e, EMsg *m)</div><div class='del'>-{</div><div class='del'>-	EThreadFunc func;</div><div class='del'>-	void *func_data;</div><div class='del'>-</div><div class='del'>-	/* we do this so we never get an incomplete/unmatched callback + data */</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	func = e-&gt;destroy;</div><div class='del'>-	func_data = e-&gt;destroy_data;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-	</div><div class='del'>-	if (func)</div><div class='del'>-		func(e, m, func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-thread_received_msg(EThread *e, EMsg *m)</div><div class='del'>-{</div><div class='del'>-	EThreadFunc func;</div><div class='del'>-	void *func_data;</div><div class='del'>-</div><div class='del'>-	/* we do this so we never get an incomplete/unmatched callback + data */</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	func = e-&gt;received;</div><div class='del'>-	func_data = e-&gt;received_data;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-	</div><div class='del'>-	if (func)</div><div class='del'>-		func(e, m, func_data);</div><div class='del'>-	else</div><div class='del'>-		g_warning("No processing callback for EThread, message unprocessed");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-thread_lost_msg(EThread *e, EMsg *m)</div><div class='del'>-{</div><div class='del'>-	EThreadFunc func;</div><div class='del'>-	void *func_data;</div><div class='del'>-</div><div class='del'>-	/* we do this so we never get an incomplete/unmatched callback + data */</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-	func = e-&gt;lost;</div><div class='del'>-	func_data = e-&gt;lost_data;</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-	</div><div class='del'>-	if (func)</div><div class='del'>-		func(e, m, func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* the actual thread dispatcher */</div><div class='del'>-static void *</div><div class='del'>-thread_dispatch(void *din)</div><div class='del'>-{</div><div class='del'>-	EThread *e = din;</div><div class='del'>-	EMsg *m;</div><div class='del'>-	struct _thread_info *info;</div><div class='del'>-	pthread_t self = pthread_self();</div><div class='del'>-</div><div class='del'>-	t(printf("dispatch thread started: %ld\n", pthread_self()));</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-		m = e_msgport_get(e-&gt;server_port);</div><div class='del'>-		if (m == NULL) {</div><div class='del'>-			/* nothing to do?  If we are a 'new' type thread, just quit.</div><div class='del'>-			   Otherwise, go into waiting (can be cancelled here) */</div><div class='del'>-			info = NULL;</div><div class='del'>-			switch (e-&gt;type) {</div><div class='del'>-			case E_THREAD_NEW:</div><div class='del'>-			case E_THREAD_QUEUE:</div><div class='del'>-			case E_THREAD_DROP:</div><div class='del'>-				info = thread_find(e, self);</div><div class='del'>-				if (info)</div><div class='del'>-					info-&gt;busy = FALSE;</div><div class='del'>-				e-&gt;waiting++;</div><div class='del'>-				pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-				e_msgport_wait(e-&gt;server_port);</div><div class='del'>-				pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-				e-&gt;waiting--;</div><div class='del'>-				pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-				break;</div><div class='del'>-#if 0</div><div class='del'>-			case E_THREAD_NEW:</div><div class='del'>-				e-&gt;id_list = g_list_remove(e-&gt;id_list, (void *)pthread_self());</div><div class='del'>-				pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-				return 0;</div><div class='del'>-#endif</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			continue;</div><div class='del'>-		} else if (m-&gt;reply_port == E_THREAD_QUIT_REPLYPORT) {</div><div class='del'>-			t(printf("Thread %d got quit message\n", self));</div><div class='del'>-			/* Handle a quit message, say we're quitting, free the message, and break out of the loop */</div><div class='del'>-			info = thread_find(e, self);</div><div class='del'>-			if (info)</div><div class='del'>-				info-&gt;busy = 2;</div><div class='del'>-			pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-			g_free(m);</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			info = thread_find(e, self);</div><div class='del'>-			if (info)</div><div class='del'>-				info-&gt;busy = TRUE;</div><div class='del'>-		}</div><div class='del'>-		pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-</div><div class='del'>-		t(printf("got message in dispatch thread\n"));</div><div class='del'>-</div><div class='del'>-		/* process it */</div><div class='del'>-		thread_received_msg(e, m);</div><div class='del'>-</div><div class='del'>-		/* if we have a reply port, send it back, otherwise, lose it */</div><div class='del'>-		if (m-&gt;reply_port) {</div><div class='del'>-			e_msgport_reply(m);</div><div class='del'>-		} else {</div><div class='del'>-			thread_destroy_msg(e, m);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* send a message to the thread, start thread if necessary */</div><div class='del'>-void e_thread_put(EThread *e, EMsg *msg)</div><div class='del'>-{</div><div class='del'>-	pthread_t id;</div><div class='del'>-	EMsg *dmsg = NULL;</div><div class='del'>-</div><div class='del'>-	pthread_mutex_lock(&amp;e-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	/* the caller forgot to tell us what to do, well, we can't do anything can we */</div><div class='del'>-	if (e-&gt;received == NULL) {</div><div class='del'>-		pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-		g_warning("EThread called with no receiver function, no work to do!");</div><div class='del'>-		thread_destroy_msg(e, msg);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	msg-&gt;reply_port = e-&gt;reply_port;</div><div class='del'>-</div><div class='del'>-	switch(e-&gt;type) {</div><div class='del'>-	case E_THREAD_QUEUE:</div><div class='del'>-		/* if the queue is full, lose this new addition */</div><div class='del'>-		if (e_dlist_length(&amp;e-&gt;server_port-&gt;queue) &lt; e-&gt;queue_limit) {</div><div class='del'>-			e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-		} else {</div><div class='del'>-			printf("queue limit reached, dropping new message\n");</div><div class='del'>-			dmsg = msg;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case E_THREAD_DROP:</div><div class='del'>-		/* if the queue is full, lose the oldest (unprocessed) message */</div><div class='del'>-		if (e_dlist_length(&amp;e-&gt;server_port-&gt;queue) &lt; e-&gt;queue_limit) {</div><div class='del'>-			e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-		} else {</div><div class='del'>-			printf("queue limit reached, dropping old message\n");</div><div class='del'>-			e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-			dmsg = e_msgport_get(e-&gt;server_port);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case E_THREAD_NEW:</div><div class='del'>-		/* it is possible that an existing thread can catch this message, so</div><div class='del'>-		   we might create a thread with no work to do.</div><div class='del'>-		   but that doesn't matter, the other alternative that it be lost is worse */</div><div class='del'>-		e_msgport_put(e-&gt;server_port, msg);</div><div class='del'>-		if (e-&gt;waiting == 0</div><div class='del'>-		    &amp;&amp; g_list_length(e-&gt;id_list) &lt; e-&gt;queue_limit</div><div class='del'>-		    &amp;&amp; pthread_create(&amp;id, NULL, thread_dispatch, e) == 0) {</div><div class='del'>-			struct _thread_info *info = g_malloc0(sizeof(*info));</div><div class='del'>-			t(printf("created NEW thread %ld\n", id));</div><div class='del'>-			info-&gt;id = id;</div><div class='del'>-			info-&gt;busy = TRUE;</div><div class='del'>-			e-&gt;id_list = g_list_append(e-&gt;id_list, info);</div><div class='del'>-		}</div><div class='del'>-		pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* create the thread, if there is none to receive it yet */</div><div class='del'>-	if (e-&gt;id == E_THREAD_NONE) {</div><div class='del'>-		if (pthread_create(&amp;e-&gt;id, NULL, thread_dispatch, e) == -1) {</div><div class='del'>-			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(errno));</div><div class='del'>-			e-&gt;id = E_THREAD_NONE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pthread_mutex_unlock(&amp;e-&gt;mutex);</div><div class='del'>-</div><div class='del'>-	if (dmsg) {</div><div class='del'>-		thread_lost_msg(e, dmsg);</div><div class='del'>-		thread_destroy_msg(e, dmsg);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* yet-another-mutex interface */</div><div class='del'>-struct _EMutex {</div><div class='del'>-	int type;</div><div class='del'>-	pthread_t owner;</div><div class='del'>-	short waiters;</div><div class='del'>-	short depth;</div><div class='del'>-	pthread_mutex_t mutex;</div><div class='del'>-	pthread_cond_t cond;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* sigh, this is just painful to have to need, but recursive</div><div class='del'>-   read/write, etc mutexes just aren't very common in thread</div><div class='del'>-   implementations */</div><div class='del'>-/* TODO: Just make it use recursive mutexes if they are available */</div><div class='del'>-EMutex *e_mutex_new(e_mutex_t type)</div><div class='del'>-{</div><div class='del'>-	struct _EMutex *m;</div><div class='del'>-</div><div class='del'>-	m = g_malloc(sizeof(*m));</div><div class='del'>-	m-&gt;type = type;</div><div class='del'>-	m-&gt;waiters = 0;</div><div class='del'>-	m-&gt;depth = 0;</div><div class='del'>-	m-&gt;owner = E_THREAD_NONE;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case E_MUTEX_SIMPLE:</div><div class='del'>-		pthread_mutex_init(&amp;m-&gt;mutex, 0);</div><div class='del'>-		break;</div><div class='del'>-	case E_MUTEX_REC:</div><div class='del'>-		pthread_mutex_init(&amp;m-&gt;mutex, 0);</div><div class='del'>-		pthread_cond_init(&amp;m-&gt;cond, 0);</div><div class='del'>-		break;</div><div class='del'>-		/* read / write ?  flags for same? */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return m;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int e_mutex_destroy(EMutex *m)</div><div class='del'>-{</div><div class='del'>-	int ret = 0;</div><div class='del'>-</div><div class='del'>-	switch (m-&gt;type) {</div><div class='del'>-	case E_MUTEX_SIMPLE:</div><div class='del'>-		ret = pthread_mutex_destroy(&amp;m-&gt;mutex);</div><div class='del'>-		if (ret == -1)</div><div class='del'>-			g_warning("EMutex destroy failed: %s", strerror(errno));</div><div class='del'>-		g_free(m);</div><div class='del'>-		break;</div><div class='del'>-	case E_MUTEX_REC:</div><div class='del'>-		ret = pthread_mutex_destroy(&amp;m-&gt;mutex);</div><div class='del'>-		if (ret == -1)</div><div class='del'>-			g_warning("EMutex destroy failed: %s", strerror(errno));</div><div class='del'>-		ret = pthread_cond_destroy(&amp;m-&gt;cond);</div><div class='del'>-		if (ret == -1)</div><div class='del'>-			g_warning("EMutex destroy failed: %s", strerror(errno));</div><div class='del'>-		g_free(m);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int e_mutex_lock(EMutex *m)</div><div class='del'>-{</div><div class='del'>-	pthread_t id;</div><div class='del'>-</div><div class='del'>-	switch (m-&gt;type) {</div><div class='del'>-	case E_MUTEX_SIMPLE:</div><div class='del'>-		return pthread_mutex_lock(&amp;m-&gt;mutex);</div><div class='del'>-	case E_MUTEX_REC:</div><div class='del'>-		id = pthread_self();</div><div class='del'>-		if (pthread_mutex_lock(&amp;m-&gt;mutex) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		while (1) {</div><div class='del'>-			if (m-&gt;owner == E_THREAD_NONE) {</div><div class='del'>-				m-&gt;owner = id;</div><div class='del'>-				m-&gt;depth = 1;</div><div class='del'>-				break;</div><div class='del'>-			} else if (id == m-&gt;owner) {</div><div class='del'>-				m-&gt;depth++;</div><div class='del'>-				break;</div><div class='del'>-			} else {</div><div class='del'>-				m-&gt;waiters++;</div><div class='del'>-				if (pthread_cond_wait(&amp;m-&gt;cond, &amp;m-&gt;mutex) == -1)</div><div class='del'>-					return -1;</div><div class='del'>-				m-&gt;waiters--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		return pthread_mutex_unlock(&amp;m-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	errno = EINVAL;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int e_mutex_unlock(EMutex *m)</div><div class='del'>-{</div><div class='del'>-	switch (m-&gt;type) {</div><div class='del'>-	case E_MUTEX_SIMPLE:</div><div class='del'>-		return pthread_mutex_unlock(&amp;m-&gt;mutex);</div><div class='del'>-	case E_MUTEX_REC:</div><div class='del'>-		if (pthread_mutex_lock(&amp;m-&gt;mutex) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		g_assert(m-&gt;owner == pthread_self());</div><div class='del'>-</div><div class='del'>-		m-&gt;depth--;</div><div class='del'>-		if (m-&gt;depth == 0) {</div><div class='del'>-			m-&gt;owner = E_THREAD_NONE;</div><div class='del'>-			if (m-&gt;waiters &gt; 0)</div><div class='del'>-				pthread_cond_signal(&amp;m-&gt;cond);</div><div class='del'>-		}</div><div class='del'>-		return pthread_mutex_unlock(&amp;m-&gt;mutex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	errno = EINVAL;</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void e_mutex_assert_locked(EMutex *m)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (m-&gt;type == E_MUTEX_REC);</div><div class='del'>-	pthread_mutex_lock(&amp;m-&gt;mutex);</div><div class='del'>-	g_assert(m-&gt;owner == pthread_self());</div><div class='del'>-	pthread_mutex_unlock(&amp;m-&gt;mutex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef STANDALONE</div><div class='del'>-EMsgPort *server_port;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void *fdserver(void *data)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	EMsg *msg;</div><div class='del'>-	int id = (int)data;</div><div class='del'>-	fd_set rfds;</div><div class='del'>-</div><div class='del'>-	fd = e_msgport_fd(server_port);</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		int count = 0;</div><div class='del'>-</div><div class='del'>-		printf("server %d: waiting on fd %d\n", id, fd);</div><div class='del'>-		FD_ZERO(&amp;rfds);</div><div class='del'>-		FD_SET(fd, &amp;rfds);</div><div class='del'>-		select(fd+1, &amp;rfds, NULL, NULL, NULL);</div><div class='del'>-		printf("server %d: Got async notification, checking for messages\n", id);</div><div class='del'>-		while ((msg = e_msgport_get(server_port))) {</div><div class='del'>-			printf("server %d: got message\n", id);</div><div class='del'>-			sleep(1);</div><div class='del'>-			printf("server %d: replying\n", id);</div><div class='del'>-			e_msgport_reply(msg);</div><div class='del'>-			count++;</div><div class='del'>-		}</div><div class='del'>-		printf("server %d: got %d messages\n", id, count);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *server(void *data)</div><div class='del'>-{</div><div class='del'>-	EMsg *msg;</div><div class='del'>-	int id = (int)data;</div><div class='del'>-</div><div class='del'>-	while (1) {</div><div class='del'>-		printf("server %d: waiting\n", id);</div><div class='del'>-		msg = e_msgport_wait(server_port);</div><div class='del'>-		msg = e_msgport_get(server_port);</div><div class='del'>-		if (msg) {</div><div class='del'>-			printf("server %d: got message\n", id);</div><div class='del'>-			sleep(1);</div><div class='del'>-			printf("server %d: replying\n", id);</div><div class='del'>-			e_msgport_reply(msg);</div><div class='del'>-		} else {</div><div class='del'>-			printf("server %d: didn't get message\n", id);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void *client(void *data)</div><div class='del'>-{</div><div class='del'>-	EMsg *msg;</div><div class='del'>-	EMsgPort *replyport;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	replyport = e_msgport_new();</div><div class='del'>-	msg = g_malloc0(sizeof(*msg));</div><div class='del'>-	msg-&gt;reply_port = replyport;</div><div class='del'>-	for (i=0;i&lt;10;i++) {</div><div class='del'>-		/* synchronous operation */</div><div class='del'>-		printf("client: sending\n");</div><div class='del'>-		e_msgport_put(server_port, msg);</div><div class='del'>-		printf("client: waiting for reply\n");</div><div class='del'>-		e_msgport_wait(replyport);</div><div class='del'>-		e_msgport_get(replyport);</div><div class='del'>-		printf("client: got reply\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("client: sleeping ...\n");</div><div class='del'>-	sleep(2);</div><div class='del'>-	printf("client: sending multiple\n");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;10;i++) {</div><div class='del'>-		msg = g_malloc0(sizeof(*msg));</div><div class='del'>-		msg-&gt;reply_port = replyport;</div><div class='del'>-		e_msgport_put(server_port, msg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("client: receiving multiple\n");</div><div class='del'>-	for (i=0;i&lt;10;i++) {</div><div class='del'>-		e_msgport_wait(replyport);</div><div class='del'>-		msg = e_msgport_get(replyport);</div><div class='del'>-		g_free(msg);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("client: done\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	pthread_t serverid, clientid;</div><div class='del'>-</div><div class='del'>-	g_thread_init(NULL);</div><div class='del'>-</div><div class='del'>-	server_port = e_msgport_new();</div><div class='del'>-</div><div class='del'>-	/*pthread_create(&amp;serverid, NULL, server, (void *)1);*/</div><div class='del'>-	pthread_create(&amp;serverid, NULL, fdserver, (void *)1);</div><div class='del'>-	pthread_create(&amp;clientid, NULL, client, NULL);</div><div class='del'>-</div><div class='del'>-	sleep(60);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-msgport.h b/e-util/e-msgport.h<br/>deleted file mode 100644<br/>index 03dc514b07..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-msgport.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-msgport.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-</div><div class='del'>-#ifndef _E_MSGPORT_H</div><div class='del'>-#define _E_MSGPORT_H</div><div class='del'>-</div><div class='del'>-/* double-linked list yeah another one, deal */</div><div class='del'>-typedef struct _EDListNode {</div><div class='del'>-	struct _EDListNode *next;</div><div class='del'>-	struct _EDListNode *prev;</div><div class='del'>-} EDListNode;</div><div class='del'>-</div><div class='del'>-typedef struct _EDList {</div><div class='del'>-	struct _EDListNode *head;</div><div class='del'>-	struct _EDListNode *tail;</div><div class='del'>-	struct _EDListNode *tailpred;</div><div class='del'>-} EDList;</div><div class='del'>-</div><div class='del'>-#define E_DLIST_INITIALISER(l) { (EDListNode *)&amp;l.tail, 0, (EDListNode *)&amp;l.head }</div><div class='del'>-</div><div class='del'>-void e_dlist_init(EDList *v);</div><div class='del'>-EDListNode *e_dlist_addhead(EDList *l, EDListNode *n);</div><div class='del'>-EDListNode *e_dlist_addtail(EDList *l, EDListNode *n);</div><div class='del'>-EDListNode *e_dlist_remove(EDListNode *n);</div><div class='del'>-EDListNode *e_dlist_remhead(EDList *l);</div><div class='del'>-EDListNode *e_dlist_remtail(EDList *l);</div><div class='del'>-int e_dlist_empty(EDList *l);</div><div class='del'>-int e_dlist_length(EDList *l);</div><div class='del'>-</div><div class='del'>-/* message ports - a simple inter-thread 'ipc' primitive */</div><div class='del'>-/* opaque handle */</div><div class='del'>-typedef struct _EMsgPort EMsgPort;</div><div class='del'>-</div><div class='del'>-/* header for any message */</div><div class='del'>-typedef struct _EMsg {</div><div class='del'>-	EDListNode ln;</div><div class='del'>-	EMsgPort *reply_port;</div><div class='del'>-} EMsg;</div><div class='del'>-</div><div class='del'>-EMsgPort *e_msgport_new(void);</div><div class='del'>-void e_msgport_destroy(EMsgPort *mp);</div><div class='del'>-/* get a fd that can be used to wait on the port asynchronously */</div><div class='del'>-int e_msgport_fd(EMsgPort *mp);</div><div class='del'>-void e_msgport_put(EMsgPort *mp, EMsg *msg);</div><div class='del'>-EMsg *e_msgport_wait(EMsgPort *mp);</div><div class='del'>-EMsg *e_msgport_get(EMsgPort *mp);</div><div class='del'>-void e_msgport_reply(EMsg *msg);</div><div class='del'>-</div><div class='del'>-/* e threads, a server thread with a message based request-response, and flexible queuing */</div><div class='del'>-typedef struct _EThread EThread;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_THREAD_QUEUE = 0,	/* run one by one, until done, if the queue_limit is reached, discard new request */</div><div class='del'>-	E_THREAD_DROP,		/* run one by one, until done, if the queue_limit is reached, discard oldest requests */</div><div class='del'>-	E_THREAD_NEW,		/* always run in a new thread, if the queue limit is reached, new requests are</div><div class='del'>-				   stored in the queue until a thread becomes available for it, creating a thread pool */</div><div class='del'>-} e_thread_t;</div><div class='del'>-</div><div class='del'>-typedef void (*EThreadFunc)(EThread *, EMsg *, void *data);</div><div class='del'>-</div><div class='del'>-EThread *e_thread_new(e_thread_t type);</div><div class='del'>-void e_thread_destroy(EThread *e);</div><div class='del'>-void e_thread_set_queue_limit(EThread *e, int limit);</div><div class='del'>-void e_thread_set_msg_lost(EThread *e, EThreadFunc destroy, void *data);</div><div class='del'>-void e_thread_set_msg_destroy(EThread *e, EThreadFunc destroy, void *data);</div><div class='del'>-void e_thread_set_reply_port(EThread *e, EMsgPort *reply_port);</div><div class='del'>-void e_thread_set_msg_received(EThread *e, EThreadFunc received, void *data);</div><div class='del'>-void e_thread_put(EThread *e, EMsg *msg);</div><div class='del'>-int e_thread_busy(EThread *e);</div><div class='del'>-</div><div class='del'>-/* sigh, another mutex interface, this one allows different mutex types, portably */</div><div class='del'>-typedef struct _EMutex EMutex;</div><div class='del'>-</div><div class='del'>-typedef enum _e_mutex_t {</div><div class='del'>-	E_MUTEX_SIMPLE,		/* == pthread_mutex */</div><div class='del'>-	E_MUTEX_REC,		/* recursive mutex */</div><div class='del'>-} e_mutex_t;</div><div class='del'>-</div><div class='del'>-EMutex *e_mutex_new(e_mutex_t type);</div><div class='del'>-int e_mutex_destroy(EMutex *m);</div><div class='del'>-int e_mutex_lock(EMutex *m);</div><div class='del'>-int e_mutex_unlock(EMutex *m);</div><div class='del'>-void e_mutex_assert_locked(EMutex *m);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c<br/>deleted file mode 100644<br/>index 7d5f25a545..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-passwords.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-passwords.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,600 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-passwords.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include "config.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-passwords.h"</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-config.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-messagebox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcheckbutton.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-</div><div class='del'>-static char *decode_base64 (char *base64);</div><div class='del'>-</div><div class='del'>-Bonobo_ConfigDatabase db;</div><div class='del'>-static GHashTable *passwords = NULL;</div><div class='del'>-static char *component_name = NULL;</div><div class='del'>-</div><div class='del'>-static int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-static int base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_init:</div><div class='del'>- *</div><div class='del'>- * Initializes the e_passwords routines. Must be called before any other</div><div class='del'>- * e_passwords_* function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_init (const char *component)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	/* open up our bonobo config database */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	db = bonobo_get_object ("wombat-private:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		char *err;</div><div class='del'>-		g_error ("Very serious error, cannot activate private config database '%s'",</div><div class='del'>-			 (err = bonobo_exception_get_text (&amp;ev)));</div><div class='del'>-		g_free (err);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>- 	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* and create the per-session hash table */</div><div class='del'>-	passwords = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	component_name = g_strdup (component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-free_entry (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	memset (value, 0, strlen (value));</div><div class='del'>-	g_free (value);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_shutdown:</div><div class='del'>- *</div><div class='del'>- * Cleanup routine to call before exiting.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_shutdown ()</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	/* sync our db work */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (db, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	db = NULL;</div><div class='del'>-</div><div class='del'>-	/* and destroy our per session hash */</div><div class='del'>-	g_hash_table_foreach_remove (passwords, free_entry, NULL);</div><div class='del'>-	g_hash_table_destroy (passwords);</div><div class='del'>-	passwords = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (component_name);</div><div class='del'>-	component_name = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_forget_passwords:</div><div class='del'>- *</div><div class='del'>- * Forgets all cached passwords, in memory and on disk.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_forget_passwords ()</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	/* remove all the persistent passwords */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_removeDir (db, "/Passwords", &amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* free up the session passwords */</div><div class='del'>-	g_hash_table_foreach_remove (passwords, free_entry, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_clear_component_passwords:</div><div class='del'>- *</div><div class='del'>- * Forgets all disk cached passwords.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_clear_component_passwords ()</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	path = g_strdup_printf ("/Passwords/%s", component_name);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_removeDir (db, path, &amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_sync (db, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-password_path (const char *key)</div><div class='del'>-{</div><div class='del'>-	int len, state, save;</div><div class='del'>-	char *key64, *path;</div><div class='del'>-</div><div class='del'>-	len = strlen (key);</div><div class='del'>-	key64 = g_malloc0 ((len + 2) * 4 / 3 + 1);</div><div class='del'>-	state = save = 0;</div><div class='del'>-	base64_encode_close ((char*)key, len, FALSE, key64, &amp;state, &amp;save);</div><div class='del'>-	path = g_strdup_printf ("/Passwords/%s/%s", component_name, key64);</div><div class='del'>-	g_free (key64);</div><div class='del'>-</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_remember_password:</div><div class='del'>- * @key: the key</div><div class='del'>- *</div><div class='del'>- * Saves the password associated with @key to disk.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_remember_password (const char *key)</div><div class='del'>-{</div><div class='del'>-	gpointer okey, value;</div><div class='del'>-	char *path, *pass64;</div><div class='del'>-	int len, state, save;</div><div class='del'>-</div><div class='del'>-	if (!g_hash_table_lookup_extended (passwords, key, &amp;okey, &amp;value))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* add it to the on-disk cache of passwords */</div><div class='del'>-	path = password_path (okey);</div><div class='del'>-</div><div class='del'>-	len = strlen (value);</div><div class='del'>-	pass64 = g_malloc0 ((len + 2) * 4 / 3 + 1);</div><div class='del'>-	state = save = 0;</div><div class='del'>-	base64_encode_close (value, len, FALSE, pass64, &amp;state, &amp;save);</div><div class='del'>-</div><div class='del'>-	bonobo_config_set_string (db, path, pass64, NULL);</div><div class='del'>-	g_free (path);</div><div class='del'>-	g_free (pass64);</div><div class='del'>-</div><div class='del'>-	/* now remove it from our session hash */</div><div class='del'>-	g_hash_table_remove (passwords, key);</div><div class='del'>-	g_free (okey);</div><div class='del'>-	g_free (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_forget_password:</div><div class='del'>- * @key: the key</div><div class='del'>- *</div><div class='del'>- * Forgets the password associated with @key, in memory and on disk.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_forget_password (const char *key)</div><div class='del'>-{</div><div class='del'>-	gpointer okey, value;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended (passwords, key, &amp;okey, &amp;value)) {</div><div class='del'>-		g_hash_table_remove (passwords, key);</div><div class='del'>-		memset (value, 0, strlen (value));</div><div class='del'>-		g_free (okey);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* clear it in the on disk db */</div><div class='del'>-	path = password_path (key);</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_ConfigDatabase_removeValue (db, path, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_get_password:</div><div class='del'>- * @key: the key</div><div class='del'>- *</div><div class='del'>- * Return value: the password associated with @key, or %NULL.  Caller</div><div class='del'>- * must free the returned password.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_passwords_get_password (const char *key)</div><div class='del'>-{</div><div class='del'>-	char *path, *passwd = g_hash_table_lookup (passwords, key);</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *encoded;</div><div class='del'>-	</div><div class='del'>-	if (passwd)</div><div class='del'>-		return g_strdup (passwd);</div><div class='del'>-	</div><div class='del'>-	/* not part of the session hash, look it up in the on disk db */</div><div class='del'>-	path = password_path (key);</div><div class='del'>-	</div><div class='del'>-	/* We need to pass an ev to bonobo-conf, or it will emit a</div><div class='del'>-	 * g_warning if the data isn't found.</div><div class='del'>-	 */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	encoded = bonobo_config_get_string (db, path, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	g_free (path);</div><div class='del'>-	</div><div class='del'>-	if (!encoded)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	passwd = decode_base64 (encoded);</div><div class='del'>-	g_free (encoded);</div><div class='del'>-	</div><div class='del'>-	return passwd;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_add_password:</div><div class='del'>- * @key: a key</div><div class='del'>- * @passwd: the password for @key</div><div class='del'>- *</div><div class='del'>- * This stores the @key/@passwd pair in the current session's password</div><div class='del'>- * hash.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_passwords_add_password (const char *key, const char *passwd)</div><div class='del'>-{</div><div class='del'>-	gpointer okey, value;</div><div class='del'>-</div><div class='del'>-	/* FIXME: shouldn't this be g_return_if_fail? */</div><div class='del'>-	if (!key || !passwd)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended (passwords, key, &amp;okey, &amp;value)) {</div><div class='del'>-		g_hash_table_remove (passwords, key);</div><div class='del'>-		g_free (okey);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (passwords, g_strdup (key), g_strdup (passwd));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_passwords_ask_password:</div><div class='del'>- * @title: title for the password dialog</div><div class='del'>- * @key: key to store the password under</div><div class='del'>- * @prompt: prompt string</div><div class='del'>- * @secret: whether or not the password text should be ***ed out</div><div class='del'>- * @remember_type: whether or not to offer to remember the password,</div><div class='del'>- * and for how long.</div><div class='del'>- * @remember: on input, the default state of the remember checkbox.</div><div class='del'>- * on output, the state of the checkbox when the dialog was closed.</div><div class='del'>- * @parent: parent window of the dialog, or %NULL</div><div class='del'>- *</div><div class='del'>- * Asks the user for a password.</div><div class='del'>- *</div><div class='del'>- * Return value: the password, which the caller must free, or %NULL if</div><div class='del'>- * the user cancelled the operation. *@remember will be set if the</div><div class='del'>- * return value is non-%NULL and @remember_type is not</div><div class='del'>- * E_PASSWORDS_DO_NOT_REMEMBER.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_passwords_ask_password (const char *title, const char *key,</div><div class='del'>-			  const char *prompt, gboolean secret,</div><div class='del'>-			  EPasswordsRememberType remember_type,</div><div class='del'>-			  gboolean *remember,</div><div class='del'>-			  GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *check = NULL, *entry;</div><div class='del'>-	char *password;</div><div class='del'>-	int button;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (prompt, GNOME_MESSAGE_BOX_QUESTION,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, </div><div class='del'>-					GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-					NULL);</div><div class='del'>-	gtk_window_set_title (GTK_WINDOW (dialog), title);</div><div class='del'>-	if (parent)</div><div class='del'>-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_set_close (GNOME_DIALOG (dialog), FALSE);</div><div class='del'>-</div><div class='del'>-	/* Password entry */</div><div class='del'>-	entry = gtk_entry_new();</div><div class='del'>-	if (secret)</div><div class='del'>-		gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), </div><div class='del'>-			    entry, FALSE, FALSE, 4);</div><div class='del'>-	gtk_widget_show (entry);</div><div class='del'>-	gtk_widget_grab_focus (entry);</div><div class='del'>-</div><div class='del'>-	/* If Return is pressed in the text entry, propagate to the buttons */</div><div class='del'>-	gnome_dialog_editable_enters (GNOME_DIALOG(dialog), GTK_EDITABLE(entry));</div><div class='del'>-</div><div class='del'>-	/* Remember the password? */</div><div class='del'>-	if (remember_type != E_PASSWORDS_DO_NOT_REMEMBER) {</div><div class='del'>-		const char *label;</div><div class='del'>-</div><div class='del'>-		if (remember_type == E_PASSWORDS_REMEMBER_FOREVER)</div><div class='del'>-			label = _("Remember this password");</div><div class='del'>-		else</div><div class='del'>-			label = _("Remember this password for the remainder of this session");</div><div class='del'>-		check = gtk_check_button_new_with_label (label);</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),</div><div class='del'>-					      *remember);</div><div class='del'>-</div><div class='del'>-		gtk_box_pack_end (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox),</div><div class='del'>-				  check, TRUE, FALSE, 4);</div><div class='del'>-		gtk_widget_show (check);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-	button = gnome_dialog_run (GNOME_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	if (button == 0) {</div><div class='del'>-		password = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);</div><div class='del'>-		if (remember_type != E_PASSWORDS_DO_NOT_REMEMBER) {</div><div class='del'>-			*remember = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));</div><div class='del'>-</div><div class='del'>-			if (*remember || remember_type == E_PASSWORDS_REMEMBER_FOREVER)</div><div class='del'>-				e_passwords_add_password (key, password);</div><div class='del'>-			if (*remember &amp;&amp; remember_type == E_PASSWORDS_REMEMBER_FOREVER)</div><div class='del'>-				e_passwords_remember_password (key);</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		password = NULL;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-	return password;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *base64_alphabet =</div><div class='del'>-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";</div><div class='del'>-</div><div class='del'>-static unsigned char camel_mime_base64_rank[256] = {</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,</div><div class='del'>-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,</div><div class='del'>-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,</div><div class='del'>-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,</div><div class='del'>-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,</div><div class='del'>-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* call this when finished encoding everything, to</div><div class='del'>-   flush off the last little bit */</div><div class='del'>-static int</div><div class='del'>-base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	int c1, c2;</div><div class='del'>-	unsigned char *outptr = out;</div><div class='del'>-</div><div class='del'>-	if (inlen&gt;0)</div><div class='del'>-		outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	c1 = ((unsigned char *)save)[1];</div><div class='del'>-	c2 = ((unsigned char *)save)[2];</div><div class='del'>-	</div><div class='del'>-	switch (((char *)save)[0]) {</div><div class='del'>-	case 2:</div><div class='del'>-		outptr[2] = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) ];</div><div class='del'>-		g_assert(outptr[2] != 0);</div><div class='del'>-		goto skip;</div><div class='del'>-	case 1:</div><div class='del'>-		outptr[2] = '=';</div><div class='del'>-	skip:</div><div class='del'>-		outptr[0] = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-		outptr[1] = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 )];</div><div class='del'>-		outptr[3] = '=';</div><div class='del'>-		outptr += 4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (break_lines)</div><div class='del'>-		*outptr++ = '\n';</div><div class='del'>-</div><div class='del'>-	*save = 0;</div><div class='del'>-	*state = 0;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  performs an 'encode step', only encodes blocks of 3 characters to the</div><div class='del'>-  output at a time, saves left-over state in state and save (initialise to</div><div class='del'>-  0 on first invocation).</div><div class='del'>-*/</div><div class='del'>-static int</div><div class='del'>-base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-</div><div class='del'>-	if (len&lt;=0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	if (len + ((char *)save)[0] &gt; 2) {</div><div class='del'>-		unsigned char *inend = in+len-2;</div><div class='del'>-		register int c1, c2, c3;</div><div class='del'>-		register int already;</div><div class='del'>-</div><div class='del'>-		already = *state;</div><div class='del'>-</div><div class='del'>-		switch (((char *)save)[0]) {</div><div class='del'>-		case 1:	c1 = ((unsigned char *)save)[1]; goto skip1;</div><div class='del'>-		case 2:	c1 = ((unsigned char *)save)[1];</div><div class='del'>-			c2 = ((unsigned char *)save)[2]; goto skip2;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */</div><div class='del'>-		while (inptr &lt; inend) {</div><div class='del'>-			c1 = *inptr++;</div><div class='del'>-		skip1:</div><div class='del'>-			c2 = *inptr++;</div><div class='del'>-		skip2:</div><div class='del'>-			c3 = *inptr++;</div><div class='del'>-			*outptr++ = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 ) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) | (c3 &gt;&gt; 6) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c3 &amp; 0x3f ];</div><div class='del'>-			/* this is a bit ugly ... */</div><div class='del'>-			if (break_lines &amp;&amp; (++already)&gt;=19) {</div><div class='del'>-				*outptr++='\n';</div><div class='del'>-				already = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		((char *)save)[0] = 0;</div><div class='del'>-		len = 2-(inptr-inend);</div><div class='del'>-		*state = already;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (len&gt;0) {</div><div class='del'>-		register char *saveout;</div><div class='del'>-</div><div class='del'>-		/* points to the slot for the next char to save */</div><div class='del'>-		saveout = &amp; (((char *)save)[1]) + ((char *)save)[0];</div><div class='del'>-</div><div class='del'>-		/* len can only be 0 1 or 2 */</div><div class='del'>-		switch(len) {</div><div class='del'>-		case 2:	*saveout++ = *inptr++;</div><div class='del'>-		case 1:	*saveout++ = *inptr++;</div><div class='del'>-		}</div><div class='del'>-		((char *)save)[0]+=len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * base64_decode_step: decode a chunk of base64 encoded data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: max length of data to decode</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- *</div><div class='del'>- * Decodes a chunk of base64 encoded data</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, c;</div><div class='del'>-	register unsigned int v;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	inend = in+len;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	/* convert 4 base64 bytes to 3 normal bytes */</div><div class='del'>-	v=*save;</div><div class='del'>-	i=*state;</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		c = camel_mime_base64_rank[*inptr++];</div><div class='del'>-		if (c != 0xff) {</div><div class='del'>-			v = (v&lt;&lt;6) | c;</div><div class='del'>-			i++;</div><div class='del'>-			if (i==4) {</div><div class='del'>-				*outptr++ = v&gt;&gt;16;</div><div class='del'>-				*outptr++ = v&gt;&gt;8;</div><div class='del'>-				*outptr++ = v;</div><div class='del'>-				i=0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*save = v;</div><div class='del'>-	*state = i;</div><div class='del'>-</div><div class='del'>-	/* quick scan back for '=' on the end somewhere */</div><div class='del'>-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */</div><div class='del'>-	i=2;</div><div class='del'>-	while (inptr&gt;in &amp;&amp; i) {</div><div class='del'>-		inptr--;</div><div class='del'>-		if (camel_mime_base64_rank[*inptr] != 0xff) {</div><div class='del'>-			if (*inptr == '=')</div><div class='del'>-				outptr--;</div><div class='del'>-			i--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if i!= 0 then there is a truncation error! */</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-decode_base64 (char *base64)</div><div class='del'>-{</div><div class='del'>-	char *plain, *pad = "==";</div><div class='del'>-	int len, out, state, save;</div><div class='del'>-	</div><div class='del'>-	len = strlen (base64);</div><div class='del'>-	plain = g_malloc0 (len);</div><div class='del'>-	state = save = 0;</div><div class='del'>-	out = base64_decode_step (base64, len, plain, &amp;state, &amp;save);</div><div class='del'>-	if (len % 4) {</div><div class='del'>-		base64_decode_step (pad, 4 - len % 4, plain + out,</div><div class='del'>-				    &amp;state, &amp;save);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return plain;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-passwords.h b/e-util/e-passwords.h<br/>deleted file mode 100644<br/>index aad7e8569c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-passwords.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-passwords.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * e-passwords.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_PASSWORD_H_</div><div class='del'>-#define _E_PASSWORD_H_</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-component.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-void        e_passwords_init              (const char *component);</div><div class='del'>-void        e_passwords_shutdown          (void);</div><div class='del'>-</div><div class='del'>-void        e_passwords_remember_password (const char *key);</div><div class='del'>-void        e_passwords_add_password      (const char *key, const char *passwd);</div><div class='del'>-char       *e_passwords_get_password      (const char *key);</div><div class='del'>-void        e_passwords_forget_password   (const char *key);</div><div class='del'>-void        e_passwords_forget_passwords  (void);</div><div class='del'>-void        e_passwords_clear_component_passwords (void);</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_PASSWORDS_DO_NOT_REMEMBER,</div><div class='del'>-	E_PASSWORDS_REMEMBER_FOR_SESSION,</div><div class='del'>-	E_PASSWORDS_REMEMBER_FOREVER</div><div class='del'>-} EPasswordsRememberType;</div><div class='del'>-</div><div class='del'>-char *      e_passwords_ask_password      (const char *title, const char *key,</div><div class='del'>-					   const char *prompt, gboolean secret,</div><div class='del'>-					   EPasswordsRememberType remember_type,</div><div class='del'>-					   gboolean *remember,</div><div class='del'>-					   GtkWindow *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_PASSWORD_H_ */</div><div class='head'>diff --git a/e-util/e-path.c b/e-util/e-path.c<br/>deleted file mode 100644<br/>index 06ac05ef25..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-path.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-path.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,206 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-path.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-path.h"</div><div class='del'>-</div><div class='del'>-#define SUBFOLDER_DIR_NAME     "subfolders"</div><div class='del'>-#define SUBFOLDER_DIR_NAME_LEN 10</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_path_to_physical:</div><div class='del'>- * @prefix: a prefix to prepend to the path, or %NULL</div><div class='del'>- * @path: the virtual path to convert to a filesystem path.</div><div class='del'>- *</div><div class='del'>- * This converts the "virtual" path @path into an expanded form that</div><div class='del'>- * allows a given name to refer to both a file and a directory. The</div><div class='del'>- * expanded path will have a "subfolders" directory inserted between</div><div class='del'>- * each path component. If the path ends with "/", the returned</div><div class='del'>- * physical path will end with "/subfolders"</div><div class='del'>- *</div><div class='del'>- * If @prefix is non-%NULL, it will be prepended to the returned path.</div><div class='del'>- *</div><div class='del'>- * Return value: the expanded path</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_path_to_physical (const char *prefix, const char *vpath)</div><div class='del'>-{</div><div class='del'>-	const char *p, *newp;</div><div class='del'>-	char *dp;</div><div class='del'>-	char *ppath;</div><div class='del'>-	int ppath_len;</div><div class='del'>-	int prefix_len;</div><div class='del'>-</div><div class='del'>-	while (*vpath == '/')</div><div class='del'>-		vpath++;</div><div class='del'>-	if (!prefix)</div><div class='del'>-		prefix = "";</div><div class='del'>-</div><div class='del'>-	/* Calculate the length of the real path. */</div><div class='del'>-	ppath_len = strlen (vpath);</div><div class='del'>-	ppath_len++;	/* For the ending zero.  */</div><div class='del'>-</div><div class='del'>-	prefix_len = strlen (prefix);</div><div class='del'>-	ppath_len += prefix_len;</div><div class='del'>-	ppath_len++;	/* For the separating slash.  */</div><div class='del'>-</div><div class='del'>-	/* Take account of the fact that we need to translate every</div><div class='del'>-	 * separator into `subfolders/'.</div><div class='del'>-	 */</div><div class='del'>-	p = vpath;</div><div class='del'>-	while (1) {</div><div class='del'>-		newp = strchr (p, '/');</div><div class='del'>-		if (newp == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		ppath_len += SUBFOLDER_DIR_NAME_LEN;</div><div class='del'>-		ppath_len++; /* For the separating slash.  */</div><div class='del'>-</div><div class='del'>-		/* Skip consecutive slashes.  */</div><div class='del'>-		while (*newp == '/')</div><div class='del'>-			newp++;</div><div class='del'>-</div><div class='del'>-		p = newp;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	ppath = g_malloc (ppath_len);</div><div class='del'>-	dp = ppath;</div><div class='del'>-</div><div class='del'>-	memcpy (dp, prefix, prefix_len);</div><div class='del'>-	dp += prefix_len;</div><div class='del'>-	*(dp++) = '/';</div><div class='del'>-</div><div class='del'>-	/* Copy the mangled path.  */</div><div class='del'>-	p = vpath;</div><div class='del'>- 	while (1) {</div><div class='del'>-		newp = strchr (p, '/');</div><div class='del'>-		if (newp == NULL) {</div><div class='del'>-			strcpy (dp, p);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too.  */</div><div class='del'>-		dp += newp - p + 1;</div><div class='del'>-</div><div class='del'>-		memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);</div><div class='del'>-		dp += SUBFOLDER_DIR_NAME_LEN;</div><div class='del'>-</div><div class='del'>-		*(dp++) = '/';</div><div class='del'>-</div><div class='del'>-		/* Skip consecutive slashes.  */</div><div class='del'>-		while (*newp == '/')</div><div class='del'>-			newp++;</div><div class='del'>-</div><div class='del'>-		p = newp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ppath;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-find_folders_recursive (const char *physical_path, const char *path,</div><div class='del'>-			EPathFindFoldersCallback callback, gpointer data)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	char *subfolder_directory_path;</div><div class='del'>-	gboolean ok;</div><div class='del'>-</div><div class='del'>-	if (*path) {</div><div class='del'>-		if (!callback (physical_path, path, data))</div><div class='del'>-			return FALSE;</div><div class='del'>-</div><div class='del'>-		subfolder_directory_path = g_strdup_printf ("%s/%s", physical_path, SUBFOLDER_DIR_NAME);</div><div class='del'>-	} else {</div><div class='del'>-		/* On the top level, we have no folders and,</div><div class='del'>-		 * consequently, no subfolder directory.</div><div class='del'>-		 */</div><div class='del'>-</div><div class='del'>-		subfolder_directory_path = g_strdup (physical_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now scan the subfolders and load them. */</div><div class='del'>-	dir = opendir (subfolder_directory_path);</div><div class='del'>-	if (dir == NULL) {</div><div class='del'>-		g_free (subfolder_directory_path);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ok = TRUE;</div><div class='del'>-	while (ok) {</div><div class='del'>-		struct stat file_stat;</div><div class='del'>-		struct dirent *dirent;</div><div class='del'>-		char *file_path;</div><div class='del'>-		char *new_path;</div><div class='del'>-</div><div class='del'>-		dirent = readdir (dir);</div><div class='del'>-		if (dirent == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (strcmp (dirent-&gt;d_name, ".") == 0 || strcmp (dirent-&gt;d_name, "..") == 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		file_path = g_strdup_printf ("%s/%s", subfolder_directory_path,</div><div class='del'>-					     dirent-&gt;d_name);</div><div class='del'>-</div><div class='del'>-		if (stat (file_path, &amp;file_stat) &lt; 0 ||</div><div class='del'>-		    ! S_ISDIR (file_stat.st_mode)) {</div><div class='del'>-			g_free (file_path);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		new_path = g_strdup_printf ("%s/%s", path, dirent-&gt;d_name);</div><div class='del'>-</div><div class='del'>-		ok = find_folders_recursive (file_path, new_path, callback, data);</div><div class='del'>-</div><div class='del'>-		g_free (file_path);</div><div class='del'>-		g_free (new_path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	closedir (dir);</div><div class='del'>-	g_free (subfolder_directory_path);</div><div class='del'>-</div><div class='del'>-	return ok;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_path_find_folders:</div><div class='del'>- * @prefix: directory to start from</div><div class='del'>- * @callback: Callback to invoke on each folder</div><div class='del'>- * @data: Data for @callback</div><div class='del'>- *</div><div class='del'>- * Walks the folder tree starting at @prefix and calls @callback</div><div class='del'>- * on each folder.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE on success, %FALSE if an error occurs at any point</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_path_find_folders (const char *prefix,</div><div class='del'>-		     EPathFindFoldersCallback callback,</div><div class='del'>-		     gpointer data)</div><div class='del'>-{</div><div class='del'>-	return find_folders_recursive (prefix, "", callback, data);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-path.h b/e-util/e-path.h<br/>deleted file mode 100644<br/>index a40cf9fb16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-path.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-path.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this library; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_PATH__</div><div class='del'>-#define __E_PATH__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef gboolean (*EPathFindFoldersCallback) (const char *physical_path,</div><div class='del'>-					      const char *path,</div><div class='del'>-					      gpointer user_data);</div><div class='del'>-</div><div class='del'>-char *   e_path_to_physical  (const char *prefix, const char *vpath);</div><div class='del'>-</div><div class='del'>-gboolean e_path_find_folders (const char *prefix,</div><div class='del'>-			      EPathFindFoldersCallback callback,</div><div class='del'>-			      gpointer data);</div><div class='del'>-</div><div class='del'>-#endif /* __E_PATH__ */</div><div class='head'>diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c<br/>deleted file mode 100644<br/>index a113427da3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-map.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-map.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,450 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "e-pilot-map.h"</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt; /* memset(), strcmp() */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-	gboolean archived;</div><div class='del'>-	gboolean touched;</div><div class='del'>-} EPilotMapPidNode;</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	guint32 pid;</div><div class='del'>-	gboolean archived;</div><div class='del'>-	gboolean touched;</div><div class='del'>-} EPilotMapUidNode;</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	gboolean touched_only;</div><div class='del'>-	xmlNodePtr root;</div><div class='del'>-} EPilotMapWriteData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived, gboolean touch)</div><div class='del'>-{</div><div class='del'>-	char *new_uid;</div><div class='del'>-	guint32 *new_pid;</div><div class='del'>-	EPilotMapPidNode *pnode;</div><div class='del'>-	EPilotMapUidNode *unode;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (map != NULL);</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	/* Keys */</div><div class='del'>-	if (pid != 0) {</div><div class='del'>-		new_pid = g_new (guint32, 1);</div><div class='del'>-		*new_pid = pid;</div><div class='del'>-	}	</div><div class='del'>-	new_uid = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-	/* Values */</div><div class='del'>-	if (pid != 0) {</div><div class='del'>-		pnode = g_new0 (EPilotMapPidNode, 1);</div><div class='del'>-		pnode-&gt;uid = new_uid;</div><div class='del'>-		pnode-&gt;archived = archived;</div><div class='del'>-		if (touch)</div><div class='del'>-			pnode-&gt;touched = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	unode = g_new0 (EPilotMapUidNode, 1);</div><div class='del'>-	unode-&gt;pid = pid;</div><div class='del'>-	unode-&gt;archived = archived;</div><div class='del'>-	if (touch)</div><div class='del'>-		unode-&gt;touched = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Insertion */</div><div class='del'>-	if (pid != 0)</div><div class='del'>-		g_hash_table_insert (map-&gt;pid_map, new_pid, pnode);</div><div class='del'>-	g_hash_table_insert (map-&gt;uid_map, new_uid, unode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)</div><div class='del'>-{</div><div class='del'>-	char *tstring;</div><div class='del'>-	</div><div class='del'>-	tstring = g_strdup_printf ("%ld", t);</div><div class='del'>-	xmlSetProp (node, name, tstring);</div><div class='del'>-	g_free (tstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_sax_start_element (void *data, const xmlChar *name, </div><div class='del'>-		       const xmlChar **attrs)</div><div class='del'>-{</div><div class='del'>-	EPilotMap *map = (EPilotMap *)data;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (name, "PilotMap")) {</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "timestamp")) </div><div class='del'>-				map-&gt;since = (time_t)strtoul (*val, NULL, 0);</div><div class='del'>-</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	 </div><div class='del'>-	if (!strcmp (name, "map")) {</div><div class='del'>-		const char *uid = NULL;</div><div class='del'>-		guint32 pid = 0;</div><div class='del'>-		gboolean archived = FALSE;</div><div class='del'>-</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "uid")) </div><div class='del'>-				uid = *val;</div><div class='del'>-			</div><div class='del'>-			if (!strcmp (*attrs, "pilot_id"))</div><div class='del'>-				pid = strtoul (*val, NULL, 0);</div><div class='del'>-</div><div class='del'>-			if (!strcmp (*attrs, "archived"))</div><div class='del'>-				archived = strtoul (*val, NULL, 0)== 1 ? TRUE : FALSE;</div><div class='del'>-				</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_assert (uid != NULL);</div><div class='del'>-		g_assert (pid != 0 || archived);</div><div class='del'>-</div><div class='del'>-		real_e_pilot_map_insert (map, pid, uid, archived, FALSE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_write_foreach (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EPilotMapWriteData *wd = data;</div><div class='del'>-	xmlNodePtr root = wd-&gt;root;</div><div class='del'>-	char *uid = key;</div><div class='del'>-	EPilotMapUidNode *unode = value;</div><div class='del'>-	xmlNodePtr mnode;</div><div class='del'>-</div><div class='del'>-	if (wd-&gt;touched_only &amp;&amp; !unode-&gt;touched)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	mnode = xmlNewChild (root, NULL, "map", NULL);</div><div class='del'>-	xmlSetProp (mnode, "uid", uid);</div><div class='del'>-</div><div class='del'>-	if (unode-&gt;archived) {</div><div class='del'>-		xmlSetProp (mnode, "archived", "1");</div><div class='del'>-	} else {</div><div class='del'>-		char *pidstr;</div><div class='del'>-</div><div class='del'>-		pidstr = g_strdup_printf ("%d", unode-&gt;pid);</div><div class='del'>-		xmlSetProp (mnode, "pilot_id", pidstr);</div><div class='del'>-		g_free (pidstr);</div><div class='del'>-		xmlSetProp (mnode, "archived", "0");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (map != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	pnode = g_hash_table_lookup (map-&gt;pid_map, &amp;pid);</div><div class='del'>-</div><div class='del'>-	if (pnode == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return pnode-&gt;archived;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapUidNode *unode;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (map != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	unode = g_hash_table_lookup (map-&gt;uid_map, uid);</div><div class='del'>-</div><div class='del'>-	if (unode == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return unode-&gt;archived;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived)</div><div class='del'>-{</div><div class='del'>-	gpointer key, value;</div><div class='del'>-	</div><div class='del'>-	if (g_hash_table_lookup_extended (map-&gt;pid_map, &amp;pid, &amp;key, &amp;value)) {</div><div class='del'>-		EPilotMapPidNode *pnode = value;</div><div class='del'>-		gpointer other_key, other_value;</div><div class='del'>-</div><div class='del'>-		g_hash_table_remove (map-&gt;pid_map, &amp;pid);</div><div class='del'>-</div><div class='del'>-		/* In case the pid&lt;-&gt;uid mapping is not the same anymore */</div><div class='del'>-		if (g_hash_table_lookup_extended (map-&gt;uid_map, pnode-&gt;uid, &amp;other_key, &amp;other_value)) {</div><div class='del'>-			g_hash_table_remove (map-&gt;uid_map, pnode-&gt;uid);</div><div class='del'>-			g_free (other_key);</div><div class='del'>-			g_free (other_value);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (key);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-	if (g_hash_table_lookup_extended (map-&gt;uid_map, uid, &amp;key, &amp;value)) {</div><div class='del'>-		EPilotMapUidNode *unode = value;</div><div class='del'>-		gpointer other_key, other_value;</div><div class='del'>-</div><div class='del'>-		g_hash_table_remove (map-&gt;uid_map, uid);</div><div class='del'>-</div><div class='del'>-		/* In case the pid&lt;-&gt;uid mapping is not the same anymore */</div><div class='del'>-		if (g_hash_table_lookup_extended (map-&gt;pid_map, &amp;unode-&gt;pid, &amp;other_key, &amp;other_value)) {</div><div class='del'>-			g_hash_table_remove (map-&gt;pid_map, &amp;unode-&gt;pid);</div><div class='del'>-			g_free (other_key);</div><div class='del'>-			g_free (other_value);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (key);</div><div class='del'>-		g_free (value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	real_e_pilot_map_insert (map, pid, uid, archived, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode = NULL;</div><div class='del'>-	EPilotMapUidNode *unode = NULL;</div><div class='del'>-	gpointer pkey, ukey;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (map != NULL);</div><div class='del'>-</div><div class='del'>-	if (!g_hash_table_lookup_extended (map-&gt;pid_map, &amp;pid, </div><div class='del'>-					   &amp;pkey, (gpointer *)&amp;pnode))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_hash_table_lookup_extended (map-&gt;uid_map, pnode-&gt;uid, &amp;ukey,</div><div class='del'>-				      (gpointer *)&amp;unode);</div><div class='del'>-	g_assert (unode != NULL);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_remove (map-&gt;pid_map, &amp;pid);</div><div class='del'>-	g_hash_table_remove (map-&gt;uid_map, pnode-&gt;uid);</div><div class='del'>-</div><div class='del'>-	g_free (pkey);</div><div class='del'>-	g_free (ukey);</div><div class='del'>-	g_free (pnode);</div><div class='del'>-	g_free (unode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode = NULL;</div><div class='del'>-	EPilotMapUidNode *unode = NULL;</div><div class='del'>-	gpointer pkey, ukey;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (map != NULL);</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	if (!g_hash_table_lookup_extended (map-&gt;uid_map, uid, &amp;ukey, (gpointer *)&amp;unode))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_lookup_extended (map-&gt;pid_map, &amp;unode-&gt;pid, &amp;pkey, (gpointer *)&amp;pnode);</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (map-&gt;uid_map, uid);</div><div class='del'>-	g_hash_table_remove (map-&gt;pid_map, &amp;unode-&gt;pid);</div><div class='del'>-</div><div class='del'>-	if (unode-&gt;pid != 0)</div><div class='del'>-		g_free (pkey);</div><div class='del'>-	g_free (ukey);</div><div class='del'>-</div><div class='del'>-	if (unode-&gt;pid != 0)</div><div class='del'>-		g_free (pnode);</div><div class='del'>-	g_free (unode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint32 </div><div class='del'>-e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch) </div><div class='del'>-{</div><div class='del'>-	EPilotMapUidNode *unode = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (map != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (uid != NULL, 0);</div><div class='del'>-	</div><div class='del'>-	unode = g_hash_table_lookup (map-&gt;uid_map, uid);</div><div class='del'>-</div><div class='del'>-	if (unode == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	if (touch) {</div><div class='del'>-		EPilotMapPidNode *pnode = NULL;</div><div class='del'>-		</div><div class='del'>-		pnode = g_hash_table_lookup (map-&gt;pid_map, &amp;unode-&gt;pid);</div><div class='del'>-		if (pnode != NULL)</div><div class='del'>-			pnode-&gt;touched = TRUE;</div><div class='del'>-		unode-&gt;touched = TRUE;	</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return unode-&gt;pid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (map != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	pnode = g_hash_table_lookup (map-&gt;pid_map, &amp;pid);</div><div class='del'>-</div><div class='del'>-	if (pnode == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	if (touch) {</div><div class='del'>-		EPilotMapUidNode *unode = NULL;</div><div class='del'>-		</div><div class='del'>-		unode = g_hash_table_lookup (map-&gt;uid_map, pnode-&gt;uid);</div><div class='del'>-		g_assert (unode != NULL);</div><div class='del'>-		</div><div class='del'>-		unode-&gt;touched = TRUE;</div><div class='del'>-		pnode-&gt;touched = TRUE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return pnode-&gt;uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-e_pilot_map_read (const char *filename, EPilotMap **map)</div><div class='del'>-{</div><div class='del'>-	xmlSAXHandler handler;</div><div class='del'>-	EPilotMap *new_map;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (filename != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (map != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*map = NULL;</div><div class='del'>-	new_map = g_new0 (EPilotMap, 1);</div><div class='del'>-</div><div class='del'>-	memset (&amp;handler, 0, sizeof (xmlSAXHandler));</div><div class='del'>-	handler.startElement = map_sax_start_element;</div><div class='del'>-</div><div class='del'>-	new_map-&gt;pid_map = g_hash_table_new (g_int_hash, g_int_equal);</div><div class='del'>-	new_map-&gt;uid_map = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (filename)) {</div><div class='del'>-		if (xmlSAXUserParseFile (&amp;handler, new_map, filename) &lt; 0) {</div><div class='del'>-			g_free (new_map);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	new_map-&gt;write_touched_only = FALSE;</div><div class='del'>-	</div><div class='del'>-	*map = new_map;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-int</div><div class='del'>-e_pilot_map_write (const char *filename, EPilotMap *map)</div><div class='del'>-{</div><div class='del'>-	EPilotMapWriteData wd;</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (filename != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (map != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	doc = xmlNewDoc ("1.0");</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		g_warning ("Pilot map file could not be created\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	doc-&gt;root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);</div><div class='del'>-	map-&gt;since = time (NULL);</div><div class='del'>-	map_set_node_timet (doc-&gt;root, "timestamp", map-&gt;since);</div><div class='del'>-</div><div class='del'>-	wd.touched_only = map-&gt;write_touched_only;</div><div class='del'>-	wd.root = doc-&gt;root;</div><div class='del'>-	g_hash_table_foreach (map-&gt;uid_map, map_write_foreach, &amp;wd);</div><div class='del'>-	</div><div class='del'>-	/* Write the file */</div><div class='del'>-	xmlSetDocCompressMode (doc, 0);</div><div class='del'>-	ret = xmlSaveFile (filename, doc);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		g_warning ("Pilot map file '%s' could not be saved\n", filename);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-foreach_remove (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_pilot_map_clear (EPilotMap *map)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (map != NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (map-&gt;pid_map, foreach_remove, NULL);</div><div class='del'>-	g_hash_table_foreach_remove (map-&gt;uid_map, foreach_remove, NULL);</div><div class='del'>-</div><div class='del'>-	map-&gt;since = 0;</div><div class='del'>-	map-&gt;write_touched_only = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_destroy (EPilotMap *map)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (map != NULL);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (map-&gt;pid_map, foreach_remove, NULL);</div><div class='del'>-	g_hash_table_foreach_remove (map-&gt;uid_map, foreach_remove, NULL);</div><div class='del'>-	</div><div class='del'>-	g_hash_table_destroy (map-&gt;pid_map);</div><div class='del'>-	g_hash_table_destroy (map-&gt;uid_map);</div><div class='del'>-	g_free (map);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h<br/>deleted file mode 100644<br/>index ff02994645..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-map.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-map.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_PILOT_MAP_H</div><div class='del'>-#define E_PILOT_MAP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _EPilotMap EPilotMap;</div><div class='del'>-</div><div class='del'>-struct _EPilotMap</div><div class='del'>-{</div><div class='del'>-	GHashTable *pid_map;</div><div class='del'>-	GHashTable *uid_map;</div><div class='del'>-</div><div class='del'>-	time_t since;</div><div class='del'>-</div><div class='del'>-	gboolean write_touched_only;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid);</div><div class='del'>-gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid);</div><div class='del'>-</div><div class='del'>-void e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived);</div><div class='del'>-void e_pilot_map_remove_by_pid (EPilotMap *map, guint32 pid);</div><div class='del'>-void e_pilot_map_remove_by_uid (EPilotMap *map, const char *uid);</div><div class='del'>-</div><div class='del'>-guint32 e_pilot_map_lookup_pid (EPilotMap *map, const char *uid, gboolean touch);</div><div class='del'>-const char * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid, gboolean touch);</div><div class='del'>-</div><div class='del'>-int e_pilot_map_read (const char *filename, EPilotMap **map);</div><div class='del'>-int e_pilot_map_write (const char *filename, EPilotMap *map);</div><div class='del'>-</div><div class='del'>-void e_pilot_map_clear (EPilotMap *map);</div><div class='del'>-</div><div class='del'>-void e_pilot_map_destroy (EPilotMap *map);</div><div class='del'>-</div><div class='del'>-#endif /* E_PILOT_MAP_H */</div><div class='head'>diff --git a/e-util/e-pilot-settings.c b/e-util/e-pilot-settings.c<br/>deleted file mode 100644<br/>index 4b5c55ebca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-settings.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-settings.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-pilot-settings.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  JP Rosevear</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "e-pilot-settings.h"</div><div class='del'>-</div><div class='del'>-struct _EPilotSettingsPrivate </div><div class='del'>-{</div><div class='del'>-	GtkWidget *secret;</div><div class='del'>-	GtkWidget *cat;</div><div class='del'>-	GtkWidget *cat_btn;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void class_init (EPilotSettingsClass *klass);</div><div class='del'>-static void init (EPilotSettings *ps);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_pilot_settings_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-  if (type == 0)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo info =</div><div class='del'>-      {</div><div class='del'>-        "EPilotSettings",</div><div class='del'>-        sizeof (EPilotSettings),</div><div class='del'>-        sizeof (EPilotSettingsClass),</div><div class='del'>-        (GtkClassInitFunc) class_init,</div><div class='del'>-        (GtkObjectInitFunc) init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      type = gtk_type_unique (gtk_table_get_type (), &amp;info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EPilotSettingsClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_table_get_type ());</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EPilotSettings *ps)</div><div class='del'>-{</div><div class='del'>-	EPilotSettingsPrivate *priv;</div><div class='del'>-	GtkWidget *lbl;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (EPilotSettingsPrivate, 1);</div><div class='del'>-</div><div class='del'>-	ps-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	gtk_table_resize (GTK_TABLE (ps), 2, 2);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (ps), 4);</div><div class='del'>-	gtk_table_set_col_spacings (GTK_TABLE (ps), 4);</div><div class='del'>-</div><div class='del'>-	lbl = gtk_label_new (_("Sync Private Records:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);</div><div class='del'>-	priv-&gt;secret = gtk_check_button_new ();</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1);</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), priv-&gt;secret, 1, 2, 0, 1);</div><div class='del'>-	gtk_widget_show (lbl);</div><div class='del'>-	gtk_widget_show (priv-&gt;secret);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	lbl = gtk_label_new (_("Sync Categories:"));</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5);</div><div class='del'>-	priv-&gt;cat = gtk_check_button_new ();</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 1, 2);</div><div class='del'>-	gtk_table_attach_defaults (GTK_TABLE (ps), priv-&gt;cat, 1, 2, 1, 2);</div><div class='del'>-	gtk_widget_show (lbl);</div><div class='del'>-	gtk_widget_show (priv-&gt;cat);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_pilot_settings_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (E_TYPE_PILOT_SETTINGS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_pilot_settings_get_secret (EPilotSettings *ps)</div><div class='del'>-{</div><div class='del'>-	EPilotSettingsPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ps != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = ps-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;secret));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret)</div><div class='del'>-{</div><div class='del'>-	EPilotSettingsPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (ps != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_PILOT_SETTINGS (ps));</div><div class='del'>-</div><div class='del'>-	priv = ps-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;secret),</div><div class='del'>-				      secret);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-pilot-settings.h b/e-util/e-pilot-settings.h<br/>deleted file mode 100644<br/>index 295977c406..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-settings.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-settings.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-pilot-settings.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001  JP Rosevear</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: JP Rosevear</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_PILOT_SETTINGS_H_</div><div class='del'>-#define _E_PILOT_SETTINGS_H_</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_PILOT_SETTINGS			(e_pilot_settings_get_type ())</div><div class='del'>-#define E_PILOT_SETTINGS(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_PILOT_SETTINGS, EPilotSettings))</div><div class='del'>-#define E_PILOT_SETTINGS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_PILOT_SETTINGS, EPilotSettingsClass))</div><div class='del'>-#define E_IS_PILOT_SETTINGS(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_PILOT_SETTINGS))</div><div class='del'>-#define E_IS_PILOT_SETTINGS_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_PILOT_SETTINGS))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EPilotSettings        EPilotSettings;</div><div class='del'>-typedef struct _EPilotSettingsPrivate EPilotSettingsPrivate;</div><div class='del'>-typedef struct _EPilotSettingsClass   EPilotSettingsClass;</div><div class='del'>-</div><div class='del'>-#define E_PILOT_SETTINGS_TABLE_ROWS 2</div><div class='del'>-#define E_PILOT_SETTINGS_TABLE_COLS 2</div><div class='del'>-</div><div class='del'>-struct _EPilotSettings {</div><div class='del'>-	GtkTable parent;</div><div class='del'>-</div><div class='del'>-	EPilotSettingsPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EPilotSettingsClass {</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_pilot_settings_get_type (void);</div><div class='del'>-GtkWidget *e_pilot_settings_new      (void);</div><div class='del'>-</div><div class='del'>-gboolean e_pilot_settings_get_secret (EPilotSettings *ps);</div><div class='del'>-void e_pilot_settings_set_secret (EPilotSettings *ps, gboolean secret);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_PILOT_SETTINGS_H_ */</div><div class='head'>diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c<br/>deleted file mode 100644<br/>index c1da384317..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;pi-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-pilot-util.h"</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_pilot_utf8_to_pchar (const char *string)</div><div class='del'>-{</div><div class='del'>-	char *pstring = NULL;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (!string)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	res = convert_ToPilotChar ("UTF-8", string, strlen (string), &amp;pstring);</div><div class='del'>-</div><div class='del'>-	if (res != 0)</div><div class='del'>-		pstring = strdup (string);</div><div class='del'>-</div><div class='del'>-	return pstring;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_pilot_utf8_from_pchar (const char *string)</div><div class='del'>-{</div><div class='del'>-	char *ustring = NULL;</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	if (!string)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	res = convert_FromPilotChar ("UTF-8", string, strlen (string), &amp;ustring);</div><div class='del'>-	</div><div class='del'>-	if (res != 0)</div><div class='del'>-		ustring = strdup (string);</div><div class='del'>-	</div><div class='del'>-	return ustring;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h<br/>deleted file mode 100644<br/>index 059b113694..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-pilot-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_PILOT_UTIL_H</div><div class='del'>-#define E_PILOT_UTIL_H</div><div class='del'>-</div><div class='del'>-char *e_pilot_utf8_to_pchar (const char *string);</div><div class='del'>-char *e_pilot_utf8_from_pchar (const char *string);</div><div class='del'>-</div><div class='del'>-#endif /* E_PILOT_UTIL_H */</div><div class='head'>diff --git a/e-util/e-request.c b/e-util/e-request.c<br/>deleted file mode 100644<br/>index a54b46bf9d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-request.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-request.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-request.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-request.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkentry.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_request_string:</div><div class='del'>- * @parent: parent window, or %NULL</div><div class='del'>- * @title: the dialog title (in the locale character set)</div><div class='del'>- * @prompt: the prompt (in the locale character set)</div><div class='del'>- * @default: default value (in UTF8)</div><div class='del'>- * </div><div class='del'>- * Request a string from the user.</div><div class='del'>- * </div><div class='del'>- * Return value: %NULL if the user cancelled the dialog, the inserted</div><div class='del'>- * string (in UTF8) otherwise. The string must be freed by the caller.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_request_string (GtkWindow *parent,</div><div class='del'>-		  const char *title,</div><div class='del'>-		  const char *prompt,</div><div class='del'>-		  const char *default_string)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *prompt_label;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-	char *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (title != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (prompt != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_dialog_new (title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);</div><div class='del'>-</div><div class='del'>-	vbox = GNOME_DIALOG (dialog)-&gt;vbox;</div><div class='del'>-</div><div class='del'>-	prompt_label = gtk_label_new (prompt);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), prompt_label, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	entry = gtk_entry_new ();</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), default_string);</div><div class='del'>-	gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), entry, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_grab_focus (entry);</div><div class='del'>-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE (entry));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (prompt_label);</div><div class='del'>-	gtk_widget_show (entry);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-</div><div class='del'>-	switch (gnome_dialog_run (GNOME_DIALOG (dialog))) {</div><div class='del'>-	case 0:</div><div class='del'>-		/* OK.  */</div><div class='del'>-		retval = e_utf8_gtk_entry_get_text (GTK_ENTRY (entry));</div><div class='del'>-		break;</div><div class='del'>-	case -1:</div><div class='del'>-	case 1:</div><div class='del'>-		/* Cancel.  */</div><div class='del'>-		retval = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		retval = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (dialog);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-request.h b/e-util/e-request.h<br/>deleted file mode 100644<br/>index 7ebb70c43f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-request.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-request.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-request.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000, 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_REQUEST_H</div><div class='del'>-#define E_REQUEST_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwindow.h&gt;</div><div class='del'>-</div><div class='del'>-char *e_request_string  (GtkWindow  *parent,</div><div class='del'>-			 const char *title,</div><div class='del'>-			 const char *prompt,</div><div class='del'>-			 const char *default_string);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c<br/>deleted file mode 100644<br/>index 9dce281465..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sexp.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sexp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1303 +0,0 @@</div><div class='del'>-/* </div><div class='del'>- * Copyright 2000 Ximian (www.ximian.com).</div><div class='del'>- *</div><div class='del'>- * A simple, extensible s-exp evaluation engine.</div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Michael Zucchi &lt;notzed@ximian.com&gt;</div><div class='del'>-</div><div class='del'>- * This program is free software; you can redistribute it and/or </div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public </div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  The following built-in s-exp's are supported:</div><div class='del'>-</div><div class='del'>-  list = (and list*)</div><div class='del'>-	perform an intersection of a number of lists, and return that.</div><div class='del'>-</div><div class='del'>-  bool = (and bool*)</div><div class='del'>-	perform a boolean AND of boolean values.</div><div class='del'>-</div><div class='del'>-  list = (or list*)</div><div class='del'>-	perform a union of a number of lists, returning the new list.</div><div class='del'>-</div><div class='del'>-  bool = (or bool*)</div><div class='del'>-	perform a boolean OR of boolean values.</div><div class='del'>-</div><div class='del'>-  int = (+ int*)</div><div class='del'>-	Add integers.</div><div class='del'>-</div><div class='del'>-  string = (+ string*)</div><div class='del'>-	Concat strings.</div><div class='del'>-</div><div class='del'>-  time_t = (+ time_t*)</div><div class='del'>-	Add time_t values.</div><div class='del'>-</div><div class='del'>-  int = (- int int*)</div><div class='del'>-	Subtract integers from the first.</div><div class='del'>-</div><div class='del'>-  time_t = (- time_t*)</div><div class='del'>-	Subtract time_t values from the first.</div><div class='del'>-</div><div class='del'>-  Comparison operators:</div><div class='del'>-</div><div class='del'>-  bool = (&lt; int int)</div><div class='del'>-  bool = (&gt; int int)</div><div class='del'>-  bool = (= int int)</div><div class='del'>-</div><div class='del'>-  bool = (&lt; string string)</div><div class='del'>-  bool = (&gt; string string)</div><div class='del'>-  bool = (= string string)</div><div class='del'>-</div><div class='del'>-  bool = (&lt; time_t time_t)</div><div class='del'>-  bool = (&gt; time_t time_t)</div><div class='del'>-  bool = (= time_t time_t)</div><div class='del'>-	Perform a comparision of 2 integers, 2 string values, or 2 time values.</div><div class='del'>-</div><div class='del'>-  Function flow:</div><div class='del'>-</div><div class='del'>-  type = (if bool function)</div><div class='del'>-  type = (if bool function function)</div><div class='del'>-  	Choose a flow path based on a boolean value</div><div class='del'>-</div><div class='del'>-  type = (begin  func func func)</div><div class='del'>-        Execute a sequence.  The last function return is the return type.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include "e-sexp.h"</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include "e-memory.h"</div><div class='del'>-#define p(x)			/* parse debug */</div><div class='del'>-#define r(x)			/* run debug */</div><div class='del'>-#define d(x)			/* general debug */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm * parse_list(ESExp *f, int gotbrace);</div><div class='del'>-static struct _ESExpTerm * parse_value(ESExp *f);</div><div class='del'>-</div><div class='del'>-static void parse_dump_term(struct _ESExpTerm *t, int depth);</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static GScannerConfig scanner_config =</div><div class='del'>-{</div><div class='del'>-	( " \t\r\n")		/* cset_skip_characters */,</div><div class='del'>-	( G_CSET_a_2_z</div><div class='del'>-	  "_+-&lt;=&gt;?"</div><div class='del'>-	  G_CSET_A_2_Z)		/* cset_identifier_first */,</div><div class='del'>-	( G_CSET_a_2_z</div><div class='del'>-	  "_0123456789-&lt;&gt;?"</div><div class='del'>-	  G_CSET_A_2_Z</div><div class='del'>-	  G_CSET_LATINS</div><div class='del'>-	  G_CSET_LATINC	)	/* cset_identifier_nth */,</div><div class='del'>-	( ";\n" )		/* cpair_comment_single */,</div><div class='del'>-  </div><div class='del'>-	FALSE			/* case_sensitive */,</div><div class='del'>-  </div><div class='del'>-	TRUE			/* skip_comment_multi */,</div><div class='del'>-	TRUE			/* skip_comment_single */,</div><div class='del'>-	TRUE			/* scan_comment_multi */,</div><div class='del'>-	TRUE			/* scan_identifier */,</div><div class='del'>-	TRUE			/* scan_identifier_1char */,</div><div class='del'>-	FALSE			/* scan_identifier_NULL */,</div><div class='del'>-	TRUE			/* scan_symbols */,</div><div class='del'>-	FALSE			/* scan_binary */,</div><div class='del'>-	TRUE			/* scan_octal */,</div><div class='del'>-	TRUE			/* scan_float */,</div><div class='del'>-	TRUE			/* scan_hex */,</div><div class='del'>-	FALSE			/* scan_hex_dollar */,</div><div class='del'>-	TRUE			/* scan_string_sq */,</div><div class='del'>-	TRUE			/* scan_string_dq */,</div><div class='del'>-	TRUE			/* numbers_2_int */,</div><div class='del'>-	FALSE			/* int_2_float */,</div><div class='del'>-	FALSE			/* identifier_2_string */,</div><div class='del'>-	TRUE			/* char_2_token */,</div><div class='del'>-	FALSE			/* symbol_2_token */,</div><div class='del'>-	FALSE			/* scope_0_fallback */,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* jumps back to the caller of f-&gt;failenv, only to be called from inside a callback */</div><div class='del'>-void</div><div class='del'>-e_sexp_fatal_error(struct _ESExp *f, char *why, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	if (f-&gt;error)</div><div class='del'>-		g_free(f-&gt;error);</div><div class='del'>-	</div><div class='del'>-	va_start(args, why);</div><div class='del'>-	f-&gt;error = g_strdup_vprintf(why, args);</div><div class='del'>-	va_end(args);</div><div class='del'>-</div><div class='del'>-	longjmp(f-&gt;failenv, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_sexp_error(struct _ESExp *f)</div><div class='del'>-{</div><div class='del'>-	return f-&gt;error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_result_new(struct _ESExp *f, int type)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r = e_memchunk_alloc0(f-&gt;result_chunks);</div><div class='del'>-	r-&gt;type = type;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_result_free(struct _ESExp *f, struct _ESExpResult *t)</div><div class='del'>-{</div><div class='del'>-	if (t == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch(t-&gt;type) {</div><div class='del'>-	case ESEXP_RES_ARRAY_PTR:</div><div class='del'>-		g_ptr_array_free(t-&gt;value.ptrarray, TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_BOOL:</div><div class='del'>-	case ESEXP_RES_INT:</div><div class='del'>-	case ESEXP_RES_TIME:</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_STRING:</div><div class='del'>-		g_free(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_UNDEFINED:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached();</div><div class='del'>-	}</div><div class='del'>-	e_memchunk_free(f-&gt;result_chunks, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used in normal functions if they have to abort, and free their arguments */</div><div class='del'>-void</div><div class='del'>-e_sexp_resultv_free(struct _ESExp *f, int argc, struct _ESExpResult **argv)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		e_sexp_result_free(f, argv[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implementations for the builtin functions */</div><div class='del'>-</div><div class='del'>-/* can you tell, i dont like glib? */</div><div class='del'>-/* we can only itereate a hashtable from a called function */</div><div class='del'>-struct _glib_sux_donkeys {</div><div class='del'>-	int count;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ok, store any values that are in all sets */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	if (value == fuckup-&gt;count) {</div><div class='del'>-		g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* or, store all unique values */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1;</div><div class='del'>-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-	int type=-1;</div><div class='del'>-	int bool = TRUE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	r(printf("( and\n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	for (i=0;bool &amp;&amp; i&lt;argc;i++) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-		if (type == -1)</div><div class='del'>-			type = r1-&gt;type;</div><div class='del'>-		if (type != r1-&gt;type) {</div><div class='del'>-			e_sexp_result_free(f, r);</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-			g_hash_table_destroy(ht);</div><div class='del'>-			e_sexp_fatal_error(f, "Invalid types in AND");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-			char **a1;</div><div class='del'>-			int l1, j;</div><div class='del'>-			</div><div class='del'>-			a1 = (char **)r1-&gt;value.ptrarray-&gt;pdata;</div><div class='del'>-			l1 = r1-&gt;value.ptrarray-&gt;len;</div><div class='del'>-			for (j=0;j&lt;l1;j++) {</div><div class='del'>-				int n;</div><div class='del'>-				n = (int)g_hash_table_lookup(ht, a1[j]);</div><div class='del'>-				g_hash_table_insert(ht, a1[j], (void *)n+1);</div><div class='del'>-			}</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-			bool = bool &amp;&amp; r1-&gt;value.bool;</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(f, r1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-		lambdafoo.count = argc;</div><div class='del'>-		lambdafoo.uids = g_ptr_array_new();</div><div class='del'>-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &amp;lambdafoo);</div><div class='del'>-		r-&gt;type = ESEXP_RES_ARRAY_PTR;</div><div class='del'>-		r-&gt;value.ptrarray = lambdafoo.uids;</div><div class='del'>-	} else if (type == ESEXP_RES_BOOL) {</div><div class='del'>-		r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-		r-&gt;value.bool = bool;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_hash_table_destroy(ht);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1;</div><div class='del'>-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-	int type = -1;</div><div class='del'>-	int bool = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	r(printf("(or \n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	for (i=0;!bool &amp;&amp; i&lt;argc;i++) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-		if (type == -1)</div><div class='del'>-			type = r1-&gt;type;</div><div class='del'>-		if (r1-&gt;type != type) {</div><div class='del'>-			e_sexp_result_free(f, r);</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-			g_hash_table_destroy(ht);</div><div class='del'>-			e_sexp_fatal_error(f, "Invalid types in OR");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-			char **a1;</div><div class='del'>-			int l1, j;</div><div class='del'>-			</div><div class='del'>-			a1 = (char **)r1-&gt;value.ptrarray-&gt;pdata;</div><div class='del'>-			l1 = r1-&gt;value.ptrarray-&gt;len;</div><div class='del'>-			for (j=0;j&lt;l1;j++) {</div><div class='del'>-				g_hash_table_insert(ht, a1[j], (void *)1);</div><div class='del'>-			}</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-			bool |= r1-&gt;value.bool;				</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(f, r1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-		lambdafoo.count = argc;</div><div class='del'>-		lambdafoo.uids = g_ptr_array_new();</div><div class='del'>-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &amp;lambdafoo);</div><div class='del'>-		r-&gt;type = ESEXP_RES_ARRAY_PTR;</div><div class='del'>-		r-&gt;value.ptrarray = lambdafoo.uids;</div><div class='del'>-	} else if (type == ESEXP_RES_BOOL) {</div><div class='del'>-		r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-		r-&gt;value.bool = bool;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(ht);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	int res = TRUE;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		if (argv[0]-&gt;type == ESEXP_RES_BOOL</div><div class='del'>-		    &amp;&amp; argv[0]-&gt;value.bool)</div><div class='del'>-			res = FALSE;</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = res;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_lt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-			e_sexp_result_free(f, r2);</div><div class='del'>-			e_sexp_result_free(f, r);</div><div class='del'>-			e_sexp_fatal_error(f, "Incompatible types in compare &lt;");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number &lt; r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_TIME) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.time &lt; r2-&gt;value.time;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) &lt; 0;</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(f, r1);</div><div class='del'>-		e_sexp_result_free(f, r2);</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_gt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			e_sexp_result_free(f, r1);</div><div class='del'>-			e_sexp_result_free(f, r2);</div><div class='del'>-			e_sexp_result_free(f, r);</div><div class='del'>-			e_sexp_fatal_error(f, "Incompatible types in compare &gt;");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number &gt; r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_TIME) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.time &gt; r2-&gt;value.time;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) &gt; 0;</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(f, r1);</div><div class='del'>-		e_sexp_result_free(f, r2);</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_eq(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			r-&gt;value.bool = FALSE;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number == r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.bool == r2-&gt;value.bool;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_TIME) {</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.time == r2-&gt;value.time;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) == 0;</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(f, r1);</div><div class='del'>-		e_sexp_result_free(f, r2);</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_plus(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int type;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		type = argv[0]-&gt;type;</div><div class='del'>-		switch(type) {</div><div class='del'>-		case ESEXP_RES_INT: {</div><div class='del'>-			int total = argv[0]-&gt;value.number;</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_INT;i++) {</div><div class='del'>-				total += argv[i]-&gt;value.number;</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				e_sexp_resultv_free(f, argc, argv);</div><div class='del'>-				e_sexp_fatal_error(f, "Invalid types in (+ ints)");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-			r-&gt;value.number = total;</div><div class='del'>-			break; }</div><div class='del'>-		case ESEXP_RES_STRING: {</div><div class='del'>-			GString *s = g_string_new(argv[0]-&gt;value.string);</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_STRING;i++) {</div><div class='del'>-				g_string_append(s, argv[i]-&gt;value.string);</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				e_sexp_resultv_free(f, argc, argv);</div><div class='del'>-				e_sexp_fatal_error(f, "Invalid types in (+ strings)");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_STRING);</div><div class='del'>-			r-&gt;value.string = s-&gt;str;</div><div class='del'>-			g_string_free(s, FALSE);</div><div class='del'>-			break; }</div><div class='del'>-		case ESEXP_RES_TIME: {</div><div class='del'>-			time_t total;</div><div class='del'>-</div><div class='del'>-			total = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-			for (i = 1; i &lt; argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_TIME; i++)</div><div class='del'>-				total += argv[i]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-			if (i &lt; argc) {</div><div class='del'>-				e_sexp_resultv_free (f, argc, argv);</div><div class='del'>-				e_sexp_fatal_error (f, "Invalid types in (+ time_t)");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			r = e_sexp_result_new (f, ESEXP_RES_TIME);</div><div class='del'>-			r-&gt;value.time = total;</div><div class='del'>-			break; }</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-		r-&gt;value.number = 0;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_sub(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int type;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		type = argv[0]-&gt;type;</div><div class='del'>-		switch(type) {</div><div class='del'>-		case ESEXP_RES_INT: {</div><div class='del'>-			int total = argv[0]-&gt;value.number;</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_INT;i++) {</div><div class='del'>-				total -= argv[i]-&gt;value.number;</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				e_sexp_resultv_free(f, argc, argv);</div><div class='del'>-				e_sexp_fatal_error(f, "Invalid types in -");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-			r-&gt;value.number = total;</div><div class='del'>-			break; }</div><div class='del'>-		case ESEXP_RES_TIME: {</div><div class='del'>-			time_t total;</div><div class='del'>-</div><div class='del'>-			total = argv[0]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-			for (i = 1; i &lt; argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_TIME; i++)</div><div class='del'>-				total -= argv[i]-&gt;value.time;</div><div class='del'>-</div><div class='del'>-			if (i &lt; argc) {</div><div class='del'>-				e_sexp_resultv_free (f, argc, argv);</div><div class='del'>-				e_sexp_fatal_error (f, "Invalid types in (- time_t)");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			r = e_sexp_result_new (f, ESEXP_RES_TIME);</div><div class='del'>-			r-&gt;value.time = total;</div><div class='del'>-			break; }</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-		r-&gt;value.number = 0;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implements 'if' function */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_if(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r;</div><div class='del'>-	int doit;</div><div class='del'>-</div><div class='del'>-	if (argc &gt;=2 &amp;&amp; argc&lt;=3) {</div><div class='del'>-		r = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		doit = (r-&gt;type == ESEXP_RES_BOOL &amp;&amp; r-&gt;value.bool);</div><div class='del'>-		e_sexp_result_free(f, r);</div><div class='del'>-		if (doit) {</div><div class='del'>-			return e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		} else if (argc&gt;2) {</div><div class='del'>-			return e_sexp_term_eval(f, argv[2]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implements 'begin' statement */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_begin(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (r)</div><div class='del'>-			e_sexp_result_free(f, r);</div><div class='del'>-		r = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-	}</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-	else</div><div class='del'>-		return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* this must only be called from inside term evaluation callbacks! */</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	struct _ESExpResult **argv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(t != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	r(printf("eval term :\n"));</div><div class='del'>-	r(parse_dump_term(t, 0));</div><div class='del'>-</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		r(printf(" (string \"%s\")\n", t-&gt;value.string));</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_STRING);</div><div class='del'>-		/* erk, this shoul;dn't need to strdup this ... */</div><div class='del'>-		r-&gt;value.string = g_strdup(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-		r(printf(" (int %d)\n", t-&gt;value.number));</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_INT);</div><div class='del'>-		r-&gt;value.number = t-&gt;value.number;</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_BOOL:</div><div class='del'>-		r(printf(" (int %d)\n", t-&gt;value.number));</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_BOOL);</div><div class='del'>-		r-&gt;value.bool = t-&gt;value.bool;</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_TIME:</div><div class='del'>-		r(printf(" (time_t %d)\n", t-&gt;value.time));</div><div class='del'>-		r = e_sexp_result_new (f, ESEXP_RES_TIME);</div><div class='del'>-		r-&gt;value.time = t-&gt;value.time;</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_IFUNC:</div><div class='del'>-		if (t-&gt;value.func.sym-&gt;f.ifunc)</div><div class='del'>-			r = t-&gt;value.func.sym-&gt;f.ifunc(f, t-&gt;value.func.termcount, t-&gt;value.func.terms, t-&gt;value.func.sym-&gt;data);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_FUNC:</div><div class='del'>-		/* first evaluate all arguments to result types */</div><div class='del'>-		argv = alloca(sizeof(argv[0]) * t-&gt;value.func.termcount);</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			argv[i] = e_sexp_term_eval(f, t-&gt;value.func.terms[i]);</div><div class='del'>-		}</div><div class='del'>-		/* call the function */</div><div class='del'>-		if (t-&gt;value.func.sym-&gt;f.func)</div><div class='del'>-			r = t-&gt;value.func.sym-&gt;f.func(f, t-&gt;value.func.termcount, argv, t-&gt;value.func.sym-&gt;data);</div><div class='del'>-</div><div class='del'>-		e_sexp_resultv_free(f, t-&gt;value.func.termcount, argv);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		e_sexp_fatal_error(f, "Unknown type in parse tree: %d", t-&gt;type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (r==NULL)</div><div class='del'>-		r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef TESTER</div><div class='del'>-static void</div><div class='del'>-eval_dump_result(ESExpResult *r, int depth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (r==NULL) {</div><div class='del'>-		printf("null result???\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;depth;i++)</div><div class='del'>-		printf("   ");</div><div class='del'>-</div><div class='del'>-	switch (r-&gt;type) {</div><div class='del'>-	case ESEXP_RES_ARRAY_PTR:</div><div class='del'>-		printf("array pointers\n");</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_INT:</div><div class='del'>-		printf("int: %d\n", r-&gt;value.number);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_STRING:</div><div class='del'>-		printf("string: '%s'\n", r-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_BOOL:</div><div class='del'>-		printf("bool: %c\n", r-&gt;value.bool?'t':'f');</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_TIME:</div><div class='del'>-		printf("time_t: %ld\n", (long) r-&gt;value.time);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_UNDEFINED:</div><div class='del'>-		printf(" &lt;undefined&gt;\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	printf("\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_dump_term(struct _ESExpTerm *t, int depth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (t==NULL) {</div><div class='del'>-		printf("null term??\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;depth;i++)</div><div class='del'>-		printf("   ");</div><div class='del'>-	</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		printf(" \"%s\"", t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-		printf(" %d", t-&gt;value.number);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_BOOL:</div><div class='del'>-		printf(" #%c", t-&gt;value.bool?'t':'f');</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_TIME:</div><div class='del'>-		printf(" %ld", (long) t-&gt;value.time);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_IFUNC:</div><div class='del'>-	case ESEXP_TERM_FUNC:</div><div class='del'>-		printf(" (function %s\n", t-&gt;value.func.sym-&gt;name);</div><div class='del'>-		/*printf(" [%d] ", t-&gt;value.func.termcount);*/</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			parse_dump_term(t-&gt;value.func.terms[i], depth+1);</div><div class='del'>-		}</div><div class='del'>-		for (i=0;i&lt;depth;i++)</div><div class='del'>-			printf("   ");</div><div class='del'>-		printf(" )");</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_VAR:</div><div class='del'>-		printf(" (variable %s )\n", t-&gt;value.var-&gt;name);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printf("unknown type: %d\n", t-&gt;type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  PARSER</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_term_new(struct _ESExp *f, int type)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpTerm *s = e_memchunk_alloc0(f-&gt;term_chunks);</div><div class='del'>-	s-&gt;type = type;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_term_free(struct _ESExp *f, struct _ESExpTerm *t)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (t==NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-	case ESEXP_TERM_BOOL:</div><div class='del'>-	case ESEXP_TERM_TIME:</div><div class='del'>-	case ESEXP_TERM_VAR:</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		g_free(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ESEXP_TERM_FUNC:</div><div class='del'>-	case ESEXP_TERM_IFUNC:</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			parse_term_free(f, t-&gt;value.func.terms[i]);</div><div class='del'>-		}</div><div class='del'>-		g_free(t-&gt;value.func.terms);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		printf("parse_term_free: unknown type: %d\n", t-&gt;type);</div><div class='del'>-	}</div><div class='del'>-	e_memchunk_free(f-&gt;term_chunks, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm **</div><div class='del'>-parse_values(ESExp *f, int *len)</div><div class='del'>-{</div><div class='del'>-	int token;</div><div class='del'>-	struct _ESExpTerm **terms;</div><div class='del'>-	int i, size = 0;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-	GSList *list = NULL, *l;</div><div class='del'>-</div><div class='del'>-	p(printf("parsing values\n"));</div><div class='del'>-</div><div class='del'>-	while ( (token = g_scanner_peek_next_token(gs)) != G_TOKEN_EOF</div><div class='del'>-		&amp;&amp; token != ')') {</div><div class='del'>-		list = g_slist_prepend(list, parse_value(f));</div><div class='del'>-		size++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* go over the list, and put them backwards into the term array */</div><div class='del'>-	terms = g_malloc(size * sizeof(*terms));</div><div class='del'>-	l = list;</div><div class='del'>-	for (i=size-1;i&gt;=0;i--) {</div><div class='del'>-		g_assert(l);</div><div class='del'>-		g_assert(l-&gt;data);</div><div class='del'>-		terms[i] = l-&gt;data;</div><div class='del'>-		l = g_slist_next(l);</div><div class='del'>-	}</div><div class='del'>-	g_slist_free(list);</div><div class='del'>-</div><div class='del'>-	p(printf("found %d subterms\n", size));</div><div class='del'>-	*len = size;</div><div class='del'>-	</div><div class='del'>-	p(printf("done parsing values\n"));</div><div class='del'>-	return terms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_value(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	int token, negative = FALSE;</div><div class='del'>-	struct _ESExpTerm *t = NULL;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-	</div><div class='del'>-	p(printf("parsing value\n"));</div><div class='del'>-	</div><div class='del'>-	token = g_scanner_get_next_token(gs);</div><div class='del'>-	switch(token) {</div><div class='del'>-	case G_TOKEN_LEFT_PAREN:</div><div class='del'>-		p(printf("got brace, its a list!\n"));</div><div class='del'>-		return parse_list(f, TRUE);</div><div class='del'>-	case G_TOKEN_STRING:</div><div class='del'>-		p(printf("got string\n"));</div><div class='del'>-		t = parse_term_new(f, ESEXP_TERM_STRING);</div><div class='del'>-		t-&gt;value.string = g_strdup(g_scanner_cur_value(gs).v_string);</div><div class='del'>-		break;</div><div class='del'>-	case '-':</div><div class='del'>-		p(printf ("got negative int?\n"));</div><div class='del'>-		token = g_scanner_get_next_token (gs);</div><div class='del'>-		if (token != G_TOKEN_INT) {</div><div class='del'>-			e_sexp_fatal_error (f, "Invalid format for a integer value");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		negative = TRUE;</div><div class='del'>-		/* fall through... */</div><div class='del'>-	case G_TOKEN_INT:</div><div class='del'>-		t = parse_term_new(f, ESEXP_TERM_INT);</div><div class='del'>-		t-&gt;value.number = g_scanner_cur_value(gs).v_int;</div><div class='del'>-		if (negative)</div><div class='del'>-			t-&gt;value.number = -t-&gt;value.number;</div><div class='del'>-		p(printf("got int\n"));</div><div class='del'>-		break;</div><div class='del'>-	case '#': {</div><div class='del'>-		char *str;</div><div class='del'>-		</div><div class='del'>-		p(printf("got bool?\n"));</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		if (token != G_TOKEN_IDENTIFIER) {</div><div class='del'>-			e_sexp_fatal_error (f, "Invalid format for a boolean value");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		str = g_scanner_cur_value (gs).v_identifier;</div><div class='del'>-		</div><div class='del'>-		g_assert (str != NULL);</div><div class='del'>-		if (!(strlen (str) == 1 &amp;&amp; (str[0] == 't' || str[0] == 'f'))) {</div><div class='del'>-			e_sexp_fatal_error (f, "Invalid format for a boolean value");</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		t = parse_term_new(f, ESEXP_TERM_BOOL);</div><div class='del'>-		t-&gt;value.bool = (str[0] == 't');</div><div class='del'>-		break; }</div><div class='del'>-	case G_TOKEN_SYMBOL:</div><div class='del'>-		s = g_scanner_cur_value(gs).v_symbol;</div><div class='del'>-		switch (s-&gt;type) {</div><div class='del'>-		case ESEXP_TERM_FUNC:</div><div class='del'>-		case ESEXP_TERM_IFUNC:</div><div class='del'>-				/* this is basically invalid, since we can't use function</div><div class='del'>-				   pointers, but let the runtime catch it ... */</div><div class='del'>-			t = parse_term_new(f, s-&gt;type);</div><div class='del'>-			t-&gt;value.func.sym = s;</div><div class='del'>-			t-&gt;value.func.terms = parse_values(f, &amp;t-&gt;value.func.termcount);</div><div class='del'>-			break;</div><div class='del'>-		case ESEXP_TERM_VAR:</div><div class='del'>-			t = parse_term_new(f, s-&gt;type);</div><div class='del'>-			t-&gt;value.var = s;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			e_sexp_fatal_error(f, "Invalid symbol type: %s: %d", s-&gt;name, s-&gt;type);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case G_TOKEN_IDENTIFIER:</div><div class='del'>-		e_sexp_fatal_error(f, "Unknown identifier: %s", g_scanner_cur_value(gs).v_identifier);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		e_sexp_fatal_error(f, "Unexpected token encountered: %d", token);</div><div class='del'>-	}</div><div class='del'>-	p(printf("done parsing value\n"));</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: this needs some robustification */</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_list(ESExp *f, int gotbrace)</div><div class='del'>-{</div><div class='del'>-	int token;</div><div class='del'>-	struct _ESExpTerm *t = NULL;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-</div><div class='del'>-	p(printf("parsing list\n"));</div><div class='del'>-	if (gotbrace)</div><div class='del'>-		token = '(';</div><div class='del'>-	else</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-	if (token =='(') {</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		switch(token) {</div><div class='del'>-		case G_TOKEN_SYMBOL: {</div><div class='del'>-			struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-			s = g_scanner_cur_value(gs).v_symbol;</div><div class='del'>-			p(printf("got funciton: %s\n", s-&gt;name));</div><div class='del'>-			t = parse_term_new(f, s-&gt;type);</div><div class='del'>-			p(printf("created new list %p\n", t));</div><div class='del'>-			/* if we have a variable, find out its base type */</div><div class='del'>-			while (s-&gt;type == ESEXP_TERM_VAR) {</div><div class='del'>-				s = ((ESExpTerm *)(s-&gt;data))-&gt;value.var;</div><div class='del'>-			}</div><div class='del'>-			if (s-&gt;type == ESEXP_TERM_FUNC</div><div class='del'>-			    || s-&gt;type == ESEXP_TERM_IFUNC) {</div><div class='del'>-				t-&gt;value.func.sym = s;</div><div class='del'>-				t-&gt;value.func.terms = parse_values(f, &amp;t-&gt;value.func.termcount);</div><div class='del'>-			} else {</div><div class='del'>-				parse_term_free(f, t);</div><div class='del'>-				e_sexp_fatal_error(f, "Trying to call variable as function: %s", s-&gt;name);</div><div class='del'>-			}</div><div class='del'>-			break; }</div><div class='del'>-		case G_TOKEN_IDENTIFIER:</div><div class='del'>-			e_sexp_fatal_error(f, "Unknown identifier: %s", g_scanner_cur_value(gs).v_identifier);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			e_sexp_fatal_error(f, "Unexpected token encountered: %d", token);</div><div class='del'>-		}</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		if (token != ')') {</div><div class='del'>-			e_sexp_fatal_error(f, "Missing ')'");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		e_sexp_fatal_error(f, "Missing '('");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p(printf("returning list %p\n", t));</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void e_sexp_finalise(void *);</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-static void</div><div class='del'>-e_sexp_class_init (ESExpClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = e_sexp_finalise;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* 'builtin' functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "and", (ESExpFunc *)term_eval_and, 1 },</div><div class='del'>-	{ "or", (ESExpFunc *)term_eval_or, 1 },</div><div class='del'>-	{ "not", (ESExpFunc *)term_eval_not, 0 },</div><div class='del'>-	{ "&lt;", (ESExpFunc *)term_eval_lt, 1 },</div><div class='del'>-	{ "&gt;", (ESExpFunc *)term_eval_gt, 1 },</div><div class='del'>-	{ "=", (ESExpFunc *)term_eval_eq, 1 },</div><div class='del'>-	{ "+", (ESExpFunc *)term_eval_plus, 0 },</div><div class='del'>-	{ "-", (ESExpFunc *)term_eval_sub, 0 },</div><div class='del'>-	{ "if", (ESExpFunc *)term_eval_if, 1 },</div><div class='del'>-	{ "begin", (ESExpFunc *)term_eval_begin, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_symbol(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s = value;</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;name);</div><div class='del'>-	g_free(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_sexp_finalise(void *o)</div><div class='del'>-{</div><div class='del'>-	ESExp *s = (ESExp *)o;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;tree) {</div><div class='del'>-		parse_term_free(s, s-&gt;tree);</div><div class='del'>-		s-&gt;tree = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_memchunk_destroy(s-&gt;term_chunks);</div><div class='del'>-	e_memchunk_destroy(s-&gt;result_chunks);</div><div class='del'>-</div><div class='del'>-	g_scanner_scope_foreach_symbol(s-&gt;scanner, 0, free_symbol, 0);</div><div class='del'>-	g_scanner_destroy(s-&gt;scanner);</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-	((GtkObjectClass *)(parent_class))-&gt;finalize((GtkObject *)o);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_sexp_init (ESExp *s)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	s-&gt;scanner = g_scanner_new(&amp;scanner_config);</div><div class='del'>-	s-&gt;term_chunks = e_memchunk_new(16, sizeof(struct _ESExpTerm));</div><div class='del'>-	s-&gt;result_chunks = e_memchunk_new(16, sizeof(struct _ESExpResult));</div><div class='del'>-</div><div class='del'>-	/* load in builtin symbols? */</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction(s, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &amp;symbols[i]);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function(s, 0, symbols[i].name, symbols[i].func, &amp;symbols[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifndef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-	s-&gt;refcount = 1;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-guint</div><div class='del'>-e_sexp_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"ESExp",</div><div class='del'>-			sizeof (ESExp),</div><div class='del'>-			sizeof (ESExpClass),</div><div class='del'>-			(GtkClassInitFunc) e_sexp_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_sexp_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-ESExp *</div><div class='del'>-e_sexp_new (void)</div><div class='del'>-{</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-	ESExp *f = E_SEXP ( gtk_type_new (e_sexp_get_type ()));</div><div class='del'>-#else</div><div class='del'>-	ESExp *f = g_malloc0(sizeof(*f));</div><div class='del'>-	e_sexp_init(f);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifndef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-void		e_sexp_ref		(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	f-&gt;refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void		e_sexp_unref		(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	f-&gt;refcount--;</div><div class='del'>-	if (f-&gt;refcount == 0) {</div><div class='del'>-		e_sexp_finalise(f);</div><div class='del'>-		g_free(f);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_function(ESExp *f, int scope, char *name, ESExpFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;f.func = func;</div><div class='del'>-	s-&gt;type = ESEXP_TERM_FUNC;</div><div class='del'>-	s-&gt;data = data;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_ifunction(ESExp *f, int scope, char *name, ESExpIFunc *ifunc, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;f.ifunc = ifunc;</div><div class='del'>-	s-&gt;type = ESEXP_TERM_IFUNC;</div><div class='del'>-	s-&gt;data = data;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_variable(ESExp *f, int scope, char *name, ESExpTerm *value)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;type = ESEXP_TERM_VAR;</div><div class='del'>-	s-&gt;data = value;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_remove_symbol(ESExp *f, int scope, char *name)</div><div class='del'>-{</div><div class='del'>-	int oldscope;</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	oldscope = g_scanner_set_scope(f-&gt;scanner, scope);</div><div class='del'>-	s = g_scanner_lookup_symbol(f-&gt;scanner, name);</div><div class='del'>-	g_scanner_scope_remove_symbol(f-&gt;scanner, scope, name);</div><div class='del'>-	g_scanner_set_scope(f-&gt;scanner, oldscope);</div><div class='del'>-	if (s) {</div><div class='del'>-		g_free(s-&gt;name);</div><div class='del'>-		g_free(s);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_sexp_set_scope(ESExp *f, int scope)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(FILTER_IS_SEXP(f), 0);</div><div class='del'>-</div><div class='del'>-	return g_scanner_set_scope(f-&gt;scanner, scope);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_input_text(ESExp *f, const char *text, int len)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(text != NULL);</div><div class='del'>-</div><div class='del'>-	g_scanner_input_text(f-&gt;scanner, text, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_input_file (ESExp *f, int fd)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-</div><div class='del'>-	g_scanner_input_file(f-&gt;scanner, fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns -1 on error */</div><div class='del'>-int</div><div class='del'>-e_sexp_parse(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(FILTER_IS_SEXP(f), -1);</div><div class='del'>-</div><div class='del'>-	if (setjmp(f-&gt;failenv)) {</div><div class='del'>-		g_warning("Error in parsing: %s", f-&gt;error);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (f-&gt;tree)</div><div class='del'>-		parse_term_free(f, f-&gt;tree);</div><div class='del'>-</div><div class='del'>-	f-&gt;tree = parse_value (f);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* returns NULL on error */</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_eval(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(FILTER_IS_SEXP(f), NULL);</div><div class='del'>-	g_return_val_if_fail(f-&gt;tree != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (setjmp(f-&gt;failenv)) {</div><div class='del'>-		g_warning("Error in execution: %s", f-&gt;error);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_sexp_term_eval(f, f-&gt;tree);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_sexp_encode_bool:</div><div class='del'>- * @s: </div><div class='del'>- * @state: </div><div class='del'>- * </div><div class='del'>- * Encode a bool into an s-expression @s.  Bools are</div><div class='del'>- * encoded using #t #f syntax.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_sexp_encode_bool(GString *s, gboolean state)</div><div class='del'>-{</div><div class='del'>-	if (state)</div><div class='del'>-		g_string_append(s, " #t");</div><div class='del'>-	else</div><div class='del'>-		g_string_append(s, " #f");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_sexp_encode_string:</div><div class='del'>- * @s: Destination string.</div><div class='del'>- * @string: String expression.</div><div class='del'>- * </div><div class='del'>- * Add a c string @string to the s-expression stored in</div><div class='del'>- * the gstring @s.  Quotes are added, and special characters</div><div class='del'>- * are escaped appropriately.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_sexp_encode_string(GString *s, const char *string)</div><div class='del'>-{</div><div class='del'>-	char c;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	if (string == NULL)</div><div class='del'>-		p = "";</div><div class='del'>-	else</div><div class='del'>-		p = string;</div><div class='del'>-	g_string_append(s, " \"");</div><div class='del'>-	while ( (c = *p++) ) {</div><div class='del'>-		if (c=='\\' || c=='\"' || c=='\'')</div><div class='del'>-			g_string_append_c(s, '\\');</div><div class='del'>-		g_string_append_c(s, c);</div><div class='del'>-	}</div><div class='del'>-	g_string_append(s, "\"");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef TESTER</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	ESExp *f;</div><div class='del'>-	char *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	gtk_init(&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-	f = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	e_sexp_add_variable(f, 0, "test", NULL);</div><div class='del'>-</div><div class='del'>-	e_sexp_input_text(f, t, strlen(t));</div><div class='del'>-	e_sexp_parse(f);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;tree) {</div><div class='del'>-		parse_dump_term(f-&gt;tree, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_eval(f);</div><div class='del'>-	if (r) {</div><div class='del'>-		eval_dump_result(r, 0);</div><div class='del'>-	} else {</div><div class='del'>-		printf("no result?|\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-sexp.h b/e-util/e-sexp.h<br/>deleted file mode 100644<br/>index d4b8795c3e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sexp.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sexp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,162 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  generic s-exp evaluator class</div><div class='del'>-*/</div><div class='del'>-#ifndef _E_SEXP_H</div><div class='del'>-#define _E_SEXP_H</div><div class='del'>-</div><div class='del'>-#include &lt;setjmp.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-#define E_SEXP(obj)         GTK_CHECK_CAST (obj, e_sexp_get_type (), ESExp)</div><div class='del'>-#define E_SEXP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_sexp_get_type (), ESExpClass)</div><div class='del'>-#define FILTER_IS_SEXP(obj)      GTK_CHECK_TYPE (obj, e_sexp_get_type ())</div><div class='del'>-#else</div><div class='del'>-#define E_SEXP(obj)         ((struct _ESExp *)(obj))</div><div class='del'>-#define E_SEXP_CLASS(klass) 	((struct _ESExpClass *)(klass))</div><div class='del'>-#define FILTER_IS_SEXP(obj)      (1)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct _ESExp      ESExp;</div><div class='del'>-typedef struct _ESExpClass ESExpClass;</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpSymbol ESExpSymbol;</div><div class='del'>-typedef struct _ESExpResult ESExpResult;</div><div class='del'>-typedef struct _ESExpTerm ESExpTerm;</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpResult *(ESExpFunc)(struct _ESExp *sexp,</div><div class='del'>-						   int argc,</div><div class='del'>-						   struct _ESExpResult **argv,</div><div class='del'>-						   void *data);</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpResult *(ESExpIFunc)(struct _ESExp *sexp,</div><div class='del'>-						    int argc,</div><div class='del'>-						    struct _ESExpTerm **argv,</div><div class='del'>-						    void *data);</div><div class='del'>-enum _ESExpResultType {</div><div class='del'>-	ESEXP_RES_ARRAY_PTR=0,	/* type is a ptrarray, what it points to is implementation dependant */</div><div class='del'>-	ESEXP_RES_INT,		/* type is a number */</div><div class='del'>-	ESEXP_RES_STRING,	/* type is a pointer to a single string */</div><div class='del'>-	ESEXP_RES_BOOL,		/* boolean type */</div><div class='del'>-	ESEXP_RES_TIME,		/* time_t type */</div><div class='del'>-	ESEXP_RES_UNDEFINED	/* unknown type */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpResult {</div><div class='del'>-	enum _ESExpResultType type;</div><div class='del'>-	union {</div><div class='del'>-		GPtrArray *ptrarray;</div><div class='del'>-		int number;</div><div class='del'>-		char *string;</div><div class='del'>-		int bool;</div><div class='del'>-		time_t time;</div><div class='del'>-	} value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _ESExpTermType {</div><div class='del'>-	ESEXP_TERM_INT	= 0,	/* integer literal */</div><div class='del'>-	ESEXP_TERM_BOOL,	/* boolean literal */</div><div class='del'>-	ESEXP_TERM_STRING,	/* string literal */</div><div class='del'>-	ESEXP_TERM_TIME,	/* time_t literal (number of seconds past the epoch) */</div><div class='del'>-	ESEXP_TERM_FUNC,	/* normal function, arguments are evaluated before calling */</div><div class='del'>-	ESEXP_TERM_IFUNC,	/* immediate function, raw terms are arguments */</div><div class='del'>-	ESEXP_TERM_VAR,		/* variable reference */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpSymbol {</div><div class='del'>-	int type;		/* ESEXP_TERM_FUNC or ESEXP_TERM_VAR */</div><div class='del'>-	char *name;</div><div class='del'>-	void *data;</div><div class='del'>-	union {</div><div class='del'>-		ESExpFunc *func;</div><div class='del'>-		ESExpIFunc *ifunc;</div><div class='del'>-	} f;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpTerm {</div><div class='del'>-	enum _ESExpTermType type;</div><div class='del'>-	union {</div><div class='del'>-		char *string;</div><div class='del'>-		int number;</div><div class='del'>-		int bool;</div><div class='del'>-		time_t time;</div><div class='del'>-		struct {</div><div class='del'>-			struct _ESExpSymbol *sym;</div><div class='del'>-			struct _ESExpTerm **terms;</div><div class='del'>-			int termcount;</div><div class='del'>-		} func;</div><div class='del'>-		struct _ESExpSymbol *var;</div><div class='del'>-	} value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _ESExp {</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-	GtkObject object;</div><div class='del'>-#else</div><div class='del'>-	int refcount;</div><div class='del'>-#endif</div><div class='del'>-	GScanner *scanner;	/* for parsing text version */</div><div class='del'>-	ESExpTerm *tree;	/* root of expression tree */</div><div class='del'>-</div><div class='del'>-	/* private stuff */</div><div class='del'>-	jmp_buf failenv;</div><div class='del'>-	char *error;</div><div class='del'>-</div><div class='del'>-	/* TODO: may also need a pool allocator for term strings, so we dont lose them</div><div class='del'>-	   in error conditions? */</div><div class='del'>-	struct _EMemChunk *term_chunks;</div><div class='del'>-	struct _EMemChunk *result_chunks;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpClass {</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-guint		e_sexp_get_type		(void);</div><div class='del'>-#endif</div><div class='del'>-ESExp 	       *e_sexp_new		(void);</div><div class='del'>-#ifndef E_SEXP_IS_GTK_OBJECT</div><div class='del'>-void		e_sexp_ref		(ESExp *f);</div><div class='del'>-void		e_sexp_unref		(ESExp *f);</div><div class='del'>-#endif</div><div class='del'>-void		e_sexp_add_function  	(ESExp *f, int scope, char *name, ESExpFunc *func, void *data);</div><div class='del'>-void		e_sexp_add_ifunction  	(ESExp *f, int scope, char *name, ESExpIFunc *func, void *data);</div><div class='del'>-void		e_sexp_add_variable  	(ESExp *f, int scope, char *name, ESExpTerm *value);</div><div class='del'>-void		e_sexp_remove_symbol	(ESExp *f, int scope, char *name);</div><div class='del'>-int		e_sexp_set_scope	(ESExp *f, int scope);</div><div class='del'>-</div><div class='del'>-void		e_sexp_input_text	(ESExp *f, const char *text, int len);</div><div class='del'>-void		e_sexp_input_file	(ESExp *f, int fd);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int		e_sexp_parse		(ESExp *f);</div><div class='del'>-ESExpResult    *e_sexp_eval		(ESExp *f);</div><div class='del'>-</div><div class='del'>-ESExpResult    *e_sexp_term_eval	(struct _ESExp *f, struct _ESExpTerm *t);</div><div class='del'>-ESExpResult    *e_sexp_result_new	(struct _ESExp *f, int type);</div><div class='del'>-void		e_sexp_result_free	(struct _ESExp *f, struct _ESExpResult *t);</div><div class='del'>-</div><div class='del'>-/* used in normal functions if they have to abort, to free their arguments */</div><div class='del'>-void		e_sexp_resultv_free	(struct _ESExp *f, int argc, struct _ESExpResult **argv);</div><div class='del'>-</div><div class='del'>-/* utility functions for creating s-exp strings. */</div><div class='del'>-void		e_sexp_encode_bool	(GString *s, gboolean state);</div><div class='del'>-void		e_sexp_encode_string	(GString *s, const char *string);</div><div class='del'>-</div><div class='del'>-/* only to be called from inside a callback to signal a fatal execution error */</div><div class='del'>-void		e_sexp_fatal_error	(struct _ESExp *f, char *why, ...);</div><div class='del'>-</div><div class='del'>-/* return the error string */</div><div class='del'>-const char     *e_sexp_error		(struct _ESExp *f);</div><div class='del'>-</div><div class='del'>-#endif /* _E_SEXP_H */</div><div class='head'>diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c<br/>deleted file mode 100644<br/>index 11a40a9ca9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sorter-array.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sorter-array.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,292 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-sorter-array.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "gal/util/e-util.h"</div><div class='del'>-#include "e-sorter-array.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE e_sorter_get_type()</div><div class='del'>-</div><div class='del'>-#define INCREMENT_AMOUNT 100</div><div class='del'>-</div><div class='del'>-static ESorterClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void    	esa_sort               (ESorterArray *esa);</div><div class='del'>-static void    	esa_backsort           (ESorterArray *esa);</div><div class='del'>-</div><div class='del'>-static gint    	esa_model_to_sorted           (ESorter *sorter, int row);</div><div class='del'>-static gint    	esa_sorted_to_model           (ESorter *sorter, int row);</div><div class='del'>-static void    	esa_get_model_to_sorted_array (ESorter *sorter, int **array, int *count);</div><div class='del'>-static void    	esa_get_sorted_to_model_array (ESorter *sorter, int **array, int *count);</div><div class='del'>-static gboolean esa_needs_sorting             (ESorter *esa);</div><div class='del'>-</div><div class='del'>-#define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))-&gt;compare != NULL)</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-esort_callback(const void *data1, const void *data2, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = user_data;</div><div class='del'>-	int ret_val;</div><div class='del'>-	int int1, int2;</div><div class='del'>-</div><div class='del'>-	int1 = *(int *)data1;</div><div class='del'>-	int2 = *(int *)data2;</div><div class='del'>-</div><div class='del'>-	ret_val = esa-&gt;compare (int1, int2, esa-&gt;closure);</div><div class='del'>-	if (ret_val != 0)</div><div class='del'>-		return ret_val;</div><div class='del'>-</div><div class='del'>-	if (int1 &lt; int2)</div><div class='del'>-		return -1;</div><div class='del'>-	if (int1 &gt; int2)</div><div class='del'>-		return 1;</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_sort(ESorterArray *esa)</div><div class='del'>-{</div><div class='del'>-	int rows;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;sorted)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	rows = esa-&gt;rows;</div><div class='del'>-</div><div class='del'>-	esa-&gt;sorted = g_new(int, rows);</div><div class='del'>-	for (i = 0; i &lt; rows; i++)</div><div class='del'>-		esa-&gt;sorted[i] = i;</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;compare)</div><div class='del'>-		e_sort (esa-&gt;sorted, rows, sizeof(int), esort_callback, esa);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_backsort(ESorterArray *esa)</div><div class='del'>-{</div><div class='del'>-	int i, rows;</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;backsorted)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	esa_sort(esa);</div><div class='del'>-</div><div class='del'>-	rows = esa-&gt;rows;</div><div class='del'>-</div><div class='del'>-	esa-&gt;backsorted = g_new0(int, rows);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; rows; i++) {</div><div class='del'>-		esa-&gt;backsorted[esa-&gt;sorted[i]] = i;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-esa_model_to_sorted (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = E_SORTER_ARRAY(es);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(row &gt;= 0, -1);</div><div class='del'>-	g_return_val_if_fail(row &lt; esa-&gt;rows, -1);</div><div class='del'>-</div><div class='del'>-	if (ESA_NEEDS_SORTING(es))</div><div class='del'>-		esa_backsort(esa);</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;backsorted)</div><div class='del'>-		return esa-&gt;backsorted[row];</div><div class='del'>-	else</div><div class='del'>-		return row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-esa_sorted_to_model (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = (ESorterArray *) es;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(row &gt;= 0, -1);</div><div class='del'>-	g_return_val_if_fail(row &lt; esa-&gt;rows, -1);</div><div class='del'>-</div><div class='del'>-	if (ESA_NEEDS_SORTING(es))</div><div class='del'>-		esa_sort(esa);</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;sorted)</div><div class='del'>-		return esa-&gt;sorted[row];</div><div class='del'>-	else</div><div class='del'>-		return row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_get_model_to_sorted_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = E_SORTER_ARRAY(es);</div><div class='del'>-	if (array || count) {</div><div class='del'>-		esa_backsort(esa);</div><div class='del'>-</div><div class='del'>-		if (array)</div><div class='del'>-			*array = esa-&gt;backsorted;</div><div class='del'>-		if (count)</div><div class='del'>-			*count = esa-&gt;rows;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_get_sorted_to_model_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = E_SORTER_ARRAY(es);</div><div class='del'>-	if (array || count) {</div><div class='del'>-		esa_sort(esa);</div><div class='del'>-</div><div class='del'>-		if (array)</div><div class='del'>-			*array = esa-&gt;sorted;</div><div class='del'>-		if (count)</div><div class='del'>-			*count = esa-&gt;rows;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-esa_needs_sorting(ESorter *es)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = E_SORTER_ARRAY(es);</div><div class='del'>-	return esa-&gt;compare != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sorter_array_clean(ESorterArray *esa)</div><div class='del'>-{</div><div class='del'>-	g_free(esa-&gt;sorted);</div><div class='del'>-	esa-&gt;sorted = NULL;</div><div class='del'>-</div><div class='del'>-	g_free(esa-&gt;backsorted);</div><div class='del'>-	esa-&gt;backsorted = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sorter_array_set_count  (ESorterArray *esa, int count)</div><div class='del'>-{</div><div class='del'>-	e_sorter_array_clean (esa);</div><div class='del'>-	esa-&gt;rows = count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sorter_array_append  (ESorterArray *esa, int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	g_free(esa-&gt;backsorted);</div><div class='del'>-	esa-&gt;backsorted = NULL;</div><div class='del'>-</div><div class='del'>-	if (esa-&gt;sorted) {</div><div class='del'>-		esa-&gt;sorted = g_renew(int, esa-&gt;sorted, esa-&gt;rows + count);</div><div class='del'>-		for (i = 0; i &lt; count; i++) {</div><div class='del'>-			int value = esa-&gt;rows;</div><div class='del'>-			size_t pos;</div><div class='del'>-			e_bsearch (&amp;value, esa-&gt;sorted, esa-&gt;rows, sizeof (int), esort_callback, esa, &amp;pos, NULL);</div><div class='del'>-			memmove (esa-&gt;sorted + pos + 1, esa-&gt;sorted + pos, sizeof (int) * (esa-&gt;rows - pos));</div><div class='del'>-			esa-&gt;sorted[pos] = value;</div><div class='del'>-			esa-&gt;rows ++;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		esa-&gt;rows += count;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESorterArray *</div><div class='del'>-e_sorter_array_construct  (ESorterArray *esa,</div><div class='del'>-			   ECompareRowsFunc  compare,</div><div class='del'>-			   gpointer      closure)</div><div class='del'>-{</div><div class='del'>-	esa-&gt;compare = compare;</div><div class='del'>-	esa-&gt;closure = closure;</div><div class='del'>-	return esa;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESorterArray *</div><div class='del'>-e_sorter_array_new (ECompareRowsFunc compare, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ESorterArray *esa = gtk_type_new (E_SORTER_ARRAY_TYPE);</div><div class='del'>-</div><div class='del'>-	return e_sorter_array_construct (esa, compare, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_class_init (ESorterArrayClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	ESorterClass *sorter_class = E_SORTER_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class                            = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy                   = esa_destroy;</div><div class='del'>-	object_class-&gt;set_arg                   = esa_set_arg;</div><div class='del'>-	object_class-&gt;get_arg                   = esa_get_arg;</div><div class='del'>-</div><div class='del'>-	sorter_class-&gt;model_to_sorted           = esa_model_to_sorted           ;</div><div class='del'>-	sorter_class-&gt;sorted_to_model           = esa_sorted_to_model           ;</div><div class='del'>-	sorter_class-&gt;get_model_to_sorted_array = esa_get_model_to_sorted_array ;</div><div class='del'>-	sorter_class-&gt;get_sorted_to_model_array = esa_get_sorted_to_model_array ;		</div><div class='del'>-	sorter_class-&gt;needs_sorting             = esa_needs_sorting             ;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-esa_init (ESorterArray *esa)</div><div class='del'>-{</div><div class='del'>-	esa-&gt;rows       = 0;</div><div class='del'>-	esa-&gt;compare    = NULL;</div><div class='del'>-	esa-&gt;closure    = NULL;</div><div class='del'>-	esa-&gt;sorted     = NULL;</div><div class='del'>-	esa-&gt;backsorted = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE(e_sorter_array, "ESorterArray", ESorterArray, esa_class_init, esa_init, PARENT_TYPE)</div><div class='head'>diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h<br/>deleted file mode 100644<br/>index a80534c0e5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sorter-array.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sorter-array.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-sorter-array.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SORTER_ARRAY_H_</div><div class='del'>-#define _E_SORTER_ARRAY_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/util/e-sorter.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_SORTER_ARRAY_TYPE        (e_sorter_array_get_type ())</div><div class='del'>-#define E_SORTER_ARRAY(o)          (GTK_CHECK_CAST ((o), E_SORTER_ARRAY_TYPE, ESorterArray))</div><div class='del'>-#define E_SORTER_ARRAY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SORTER_ARRAY_TYPE, ESorterArrayClass))</div><div class='del'>-#define E_IS_SORTER_ARRAY(o)       (GTK_CHECK_TYPE ((o), E_SORTER_ARRAY_TYPE))</div><div class='del'>-#define E_IS_SORTER_ARRAY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SORTER_ARRAY_TYPE))</div><div class='del'>-</div><div class='del'>-#ifndef _E_COMPARE_ROWS_FUNC_H_</div><div class='del'>-#define _E_COMPARE_ROWS_FUNC_H_</div><div class='del'>-typedef int (*ECompareRowsFunc) (int row1,</div><div class='del'>-				 int row2,</div><div class='del'>-				 gpointer closure);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ESorter      base;</div><div class='del'>-</div><div class='del'>-	ECompareRowsFunc compare;</div><div class='del'>-	gpointer     closure;</div><div class='del'>-</div><div class='del'>-	/* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */</div><div class='del'>-	int         *sorted;</div><div class='del'>-	int         *backsorted;</div><div class='del'>-</div><div class='del'>-	int rows;</div><div class='del'>-} ESorterArray;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ESorterClass parent_class;</div><div class='del'>-} ESorterArrayClass;</div><div class='del'>-</div><div class='del'>-GtkType       e_sorter_array_get_type   (void);</div><div class='del'>-ESorterArray *e_sorter_array_construct  (ESorterArray     *sorter,</div><div class='del'>-					 ECompareRowsFunc  compare,</div><div class='del'>-					 gpointer          closure);</div><div class='del'>-ESorterArray *e_sorter_array_new        (ECompareRowsFunc  compare,</div><div class='del'>-					 gpointer          closure);</div><div class='del'>-void          e_sorter_array_clean      (ESorterArray     *esa);</div><div class='del'>-void          e_sorter_array_set_count  (ESorterArray     *esa,</div><div class='del'>-					 int               count);</div><div class='del'>-void          e_sorter_array_append     (ESorterArray     *esa,</div><div class='del'>-					 int               count);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _E_SORTER_ARRAY_H_ */</div><div class='head'>diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c<br/>deleted file mode 100644<br/>index 4f6c8e069a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sorter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sorter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-sorter.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "gal/util/e-util.h"</div><div class='del'>-#include "e-sorter.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE gtk_object_get_type()</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-#define ES_CLASS(es) ((ESorterClass *)((GtkObject *)(es))-&gt;klass)</div><div class='del'>-</div><div class='del'>-static gint es_model_to_sorted (ESorter *es, int row);</div><div class='del'>-static gint es_sorted_to_model (ESorter *es, int row);</div><div class='del'>-static void es_get_model_to_sorted_array (ESorter *es, int **array, int *count);</div><div class='del'>-static void es_get_sorted_to_model_array (ESorter *es, int **array, int *count);</div><div class='del'>-static gboolean es_needs_sorting(ESorter *es);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-es_class_init (ESorterClass *klass)</div><div class='del'>-{</div><div class='del'>-	parent_class                     = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	klass-&gt;model_to_sorted           = es_model_to_sorted;</div><div class='del'>-	klass-&gt;sorted_to_model           = es_sorted_to_model;</div><div class='del'>-	klass-&gt;get_model_to_sorted_array = es_get_model_to_sorted_array;</div><div class='del'>-	klass-&gt;get_sorted_to_model_array = es_get_sorted_to_model_array;</div><div class='del'>-	klass-&gt;needs_sorting             = es_needs_sorting;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-es_init (ESorter *es)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE(e_sorter, "ESorter", ESorter, es_class_init, es_init, PARENT_TYPE)</div><div class='del'>-</div><div class='del'>-ESorter *</div><div class='del'>-e_sorter_new (void)</div><div class='del'>-{</div><div class='del'>-	ESorter *es = gtk_type_new (E_SORTER_TYPE);</div><div class='del'>-	</div><div class='del'>-	return es;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-es_model_to_sorted (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	return row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-es_sorted_to_model (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	return row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-es_get_model_to_sorted_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-es_get_sorted_to_model_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-es_needs_sorting(ESorter *es)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_sorter_model_to_sorted (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(es != NULL, -1);</div><div class='del'>-	g_return_val_if_fail(row &gt;= 0, -1);</div><div class='del'>-</div><div class='del'>-	if (ES_CLASS(es)-&gt;model_to_sorted)</div><div class='del'>-		return ES_CLASS(es)-&gt;model_to_sorted (es, row);</div><div class='del'>-	else</div><div class='del'>-		return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_sorter_sorted_to_model (ESorter *es, int row)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(es != NULL, -1);</div><div class='del'>-	g_return_val_if_fail(row &gt;= 0, -1);</div><div class='del'>-</div><div class='del'>-	if (ES_CLASS(es)-&gt;sorted_to_model)</div><div class='del'>-		return ES_CLASS(es)-&gt;sorted_to_model (es, row);</div><div class='del'>-	else</div><div class='del'>-		return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sorter_get_model_to_sorted_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(es != NULL);</div><div class='del'>-</div><div class='del'>-	if (ES_CLASS(es)-&gt;get_model_to_sorted_array)</div><div class='del'>-		ES_CLASS(es)-&gt;get_model_to_sorted_array (es, array, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sorter_get_sorted_to_model_array (ESorter *es, int **array, int *count)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(es != NULL);</div><div class='del'>-</div><div class='del'>-	if (ES_CLASS(es)-&gt;get_sorted_to_model_array)</div><div class='del'>-		ES_CLASS(es)-&gt;get_sorted_to_model_array (es, array, count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_sorter_needs_sorting(ESorter *es)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (es != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	if (ES_CLASS(es)-&gt;needs_sorting)</div><div class='del'>-		return ES_CLASS(es)-&gt;needs_sorting (es);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h<br/>deleted file mode 100644<br/>index 5a89fa4c59..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sorter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-sorter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-sorter.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SORTER_H_</div><div class='del'>-#define _E_SORTER_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_SORTER_TYPE        (e_sorter_get_type ())</div><div class='del'>-#define E_SORTER(o)          (GTK_CHECK_CAST ((o), E_SORTER_TYPE, ESorter))</div><div class='del'>-#define E_SORTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_SORTER_TYPE, ESorterClass))</div><div class='del'>-#define E_IS_SORTER(o)       (GTK_CHECK_TYPE ((o), E_SORTER_TYPE))</div><div class='del'>-#define E_IS_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SORTER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObject base;</div><div class='del'>-} ESorter;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-	gint      (*model_to_sorted)            (ESorter    *sorter,</div><div class='del'>-						 int         row);</div><div class='del'>-	gint      (*sorted_to_model)            (ESorter    *sorter,</div><div class='del'>-						 int         row);</div><div class='del'>-	  </div><div class='del'>-	void      (*get_model_to_sorted_array)  (ESorter    *sorter,</div><div class='del'>-						 int       **array,</div><div class='del'>-						 int        *count);</div><div class='del'>-	void      (*get_sorted_to_model_array)  (ESorter    *sorter,</div><div class='del'>-						 int       **array,</div><div class='del'>-						 int        *count);</div><div class='del'>-	  </div><div class='del'>-	gboolean  (*needs_sorting)              (ESorter    *sorter);</div><div class='del'>-} ESorterClass;</div><div class='del'>-</div><div class='del'>-GtkType   e_sorter_get_type                   (void);</div><div class='del'>-ESorter  *e_sorter_new                        (void);</div><div class='del'>-</div><div class='del'>-gint      e_sorter_model_to_sorted            (ESorter  *sorter,</div><div class='del'>-					       int       row);</div><div class='del'>-gint      e_sorter_sorted_to_model            (ESorter  *sorter,</div><div class='del'>-					       int       row);</div><div class='del'>-</div><div class='del'>-void      e_sorter_get_model_to_sorted_array  (ESorter  *sorter,</div><div class='del'>-					       int     **array,</div><div class='del'>-					       int      *count);</div><div class='del'>-void      e_sorter_get_sorted_to_model_array  (ESorter  *sorter,</div><div class='del'>-					       int     **array,</div><div class='del'>-					       int      *count);</div><div class='del'>-</div><div class='del'>-gboolean  e_sorter_needs_sorting              (ESorter  *sorter);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_SORTER_H_ */</div><div class='head'>diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c<br/>deleted file mode 100644<br/>index 887cfd9e24..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-emacs-like.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-text-event-processor-emacs-like.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,508 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-text-event-processor-emacs-like.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gdk/gdkkeysyms.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include "e-text-event-processor-emacs-like.h"</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);</div><div class='del'>-static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);</div><div class='del'>-static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-</div><div class='del'>-static ETextEventProcessorClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const ETextEventProcessorCommand control_keys[26] =</div><div class='del'>-{</div><div class='del'>-	{ E_TEP_START_OF_LINE,      E_TEP_MOVE, 0, "" }, /* a */</div><div class='del'>-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_MOVE, 0, "" }, /* b */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_COPY, 0, "" }, /* c */</div><div class='del'>-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_DELETE, 0, "" }, /* d */</div><div class='del'>-	{ E_TEP_END_OF_LINE,        E_TEP_MOVE, 0, "" }, /* e */</div><div class='del'>-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_MOVE, 0, "" }, /* f */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */</div><div class='del'>-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_DELETE, 0, "" }, /* h */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */</div><div class='del'>-	{ E_TEP_END_OF_LINE,        E_TEP_DELETE, 0, "" }, /* k */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */</div><div class='del'>-	{ E_TEP_FORWARD_LINE,       E_TEP_MOVE, 0, "" }, /* n */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */</div><div class='del'>-	{ E_TEP_BACKWARD_LINE,      E_TEP_MOVE, 0, "" }, /* p */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */</div><div class='del'>-	{ E_TEP_START_OF_LINE,      E_TEP_DELETE, 0, "" }, /* u */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* v */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_NOP, 0, "" }, /* w */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* x */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* y */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const ETextEventProcessorCommand alt_keys[26] =</div><div class='del'>-{</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* a */</div><div class='del'>-	{ E_TEP_BACKWARD_WORD,      E_TEP_MOVE, 0, "" }, /* b */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_CAPS, E_TEP_CAPS_TITLE, "" },/* c */</div><div class='del'>-	{ E_TEP_FORWARD_WORD,       E_TEP_DELETE, 0, "" }, /* d */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* e */</div><div class='del'>-	{ E_TEP_FORWARD_WORD,       E_TEP_MOVE, 0, "" }, /* f */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* h */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* k */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_CAPS, E_TEP_CAPS_LOWER, "" },           /* l */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* n */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* p */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_CAPS, E_TEP_CAPS_UPPER, "" },           /* u */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* v */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* w */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* x */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* y */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_text_event_processor_emacs_like_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType text_event_processor_emacs_like_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!text_event_processor_emacs_like_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo text_event_processor_emacs_like_info =</div><div class='del'>-      {</div><div class='del'>-        "ETextEventProcessorEmacsLike",</div><div class='del'>-        sizeof (ETextEventProcessorEmacsLike),</div><div class='del'>-        sizeof (ETextEventProcessorEmacsLikeClass),</div><div class='del'>-        (GtkClassInitFunc) e_text_event_processor_emacs_like_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_text_event_processor_emacs_like_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      text_event_processor_emacs_like_type = gtk_type_unique (e_text_event_processor_get_type (), &amp;text_event_processor_emacs_like_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return text_event_processor_emacs_like_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-  ETextEventProcessorClass *processor_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-  processor_class = (ETextEventProcessorClass*) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (e_text_event_processor_get_type ());</div><div class='del'>-</div><div class='del'>-  processor_class-&gt;event = e_text_event_processor_emacs_like_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *tep)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorCommand command;</div><div class='del'>-	ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep);</div><div class='del'>-	command.action = E_TEP_NOP;</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_GRAB;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-			if (event-&gt;button.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-				command.action = E_TEP_SELECT;</div><div class='del'>-			else</div><div class='del'>-				command.action = E_TEP_MOVE;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.value = event-&gt;button.position;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			tep_el-&gt;mouse_down = TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_SELECT_WORD;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_SELECT_ALL;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_UNGRAB;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			tep_el-&gt;mouse_down = FALSE;</div><div class='del'>-		} else if (event-&gt;button.button == 2) {</div><div class='del'>-			command.action = E_TEP_MOVE;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.value = event-&gt;button.position;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-</div><div class='del'>-			command.action = E_TEP_GET_SELECTION;</div><div class='del'>-			command.position = E_TEP_SELECTION;</div><div class='del'>-			command.value = 0;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		if (tep_el-&gt;mouse_down) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.time = event-&gt;motion.time;</div><div class='del'>-			command.value = event-&gt;motion.position;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_KEY_PRESS: </div><div class='del'>-		{</div><div class='del'>-			ETextEventProcessorEventKey key = event-&gt;key;</div><div class='del'>-			command.time = event-&gt;key.time;</div><div class='del'>-			if (key.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-				command.action = E_TEP_SELECT;</div><div class='del'>-			else</div><div class='del'>-				command.action = E_TEP_MOVE;</div><div class='del'>-			switch(key.keyval) {</div><div class='del'>-			case GDK_Home:</div><div class='del'>-			case GDK_KP_Home:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_START_OF_BUFFER;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_START_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_End:</div><div class='del'>-			case GDK_KP_End:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_END_OF_BUFFER;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_END_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Page_Up:</div><div class='del'>-			case GDK_KP_Page_Up: command.position = E_TEP_BACKWARD_PAGE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Page_Down:</div><div class='del'>-			case GDK_KP_Page_Down: command.position = E_TEP_FORWARD_PAGE; break;</div><div class='del'>-				/* CUA has Ctrl-Up/Ctrl-Down as paragraph up down */</div><div class='del'>-			case GDK_Up:</div><div class='del'>-			case GDK_KP_Up:        command.position = E_TEP_BACKWARD_LINE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Down:</div><div class='del'>-			case GDK_KP_Down:      command.position = E_TEP_FORWARD_LINE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Left:</div><div class='del'>-			case GDK_KP_Left:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_BACKWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_BACKWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Right:</div><div class='del'>-			case GDK_KP_Right:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_FORWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_FORWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-	  </div><div class='del'>-			case GDK_BackSpace:</div><div class='del'>-				command.action = E_TEP_DELETE;</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_BACKWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_BACKWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Clear:</div><div class='del'>-				command.action = E_TEP_DELETE;</div><div class='del'>-				command.position = E_TEP_END_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Insert:</div><div class='del'>-			case GDK_KP_Insert:</div><div class='del'>-				if (key.state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-					command.action = E_TEP_PASTE;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else if (key.state &amp; GDK_CONTROL_MASK) {</div><div class='del'>-					command.action = E_TEP_COPY;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else {</div><div class='del'>-				/* gtk_toggle_insert(text) -- IMPLEMENT -- FIXME */</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Delete:</div><div class='del'>-			case GDK_KP_Delete:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK){</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_FORWARD_WORD;</div><div class='del'>-				} else if (key.state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-					command.action = E_TEP_COPY;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-					gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-				</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else {</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_FORWARD_CHARACTER;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Tab:</div><div class='del'>-			case GDK_KP_Tab:</div><div class='del'>-			case GDK_ISO_Left_Tab:</div><div class='del'>-			case GDK_3270_BackTab:</div><div class='del'>-				/* Don't insert literally */</div><div class='del'>-				command.action = E_TEP_NOP;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Return:</div><div class='del'>-			case GDK_KP_Enter:</div><div class='del'>-				if (tep-&gt;allow_newlines) {</div><div class='del'>-					if (key.state &amp; GDK_CONTROL_MASK) {</div><div class='del'>-						command.action = E_TEP_ACTIVATE;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-					} else {</div><div class='del'>-						command.action = E_TEP_INSERT;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-						command.value = 1;</div><div class='del'>-						command.string = "\n";</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (key.state &amp; GDK_CONTROL_MASK) {</div><div class='del'>-						command.action = E_TEP_NOP;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-					} else {</div><div class='del'>-						command.action = E_TEP_ACTIVATE;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Escape:</div><div class='del'>-				/* Don't insert literally */</div><div class='del'>-				command.action = E_TEP_NOP;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case GDK_KP_Space:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = " ";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Equal:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "=";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Multiply:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "*";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Add:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "+";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Subtract:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "-";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Decimal:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = ".";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Divide:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "/";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_0:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "0";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_1:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "1";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_2:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "2";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_3:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "3";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_4:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "4";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_5:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "5";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_6:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "6";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_7:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "7";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_8:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "8";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_9:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "9";</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				if ((key.state &amp; GDK_CONTROL_MASK) &amp;&amp; !(key.state &amp; GDK_MOD1_MASK)) {</div><div class='del'>-					if ((key.keyval &gt;= 'A') &amp;&amp; (key.keyval &lt;= 'Z'))</div><div class='del'>-						key.keyval -= 'A' - 'a';</div><div class='del'>-					</div><div class='del'>-					if ((key.keyval &gt;= 'a') &amp;&amp; (key.keyval &lt;= 'z')) {</div><div class='del'>-						command.position = control_keys[(int) (key.keyval - 'a')].position;</div><div class='del'>-						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)</div><div class='del'>-							command.action = control_keys[(int) (key.keyval - 'a')].action;</div><div class='del'>-						command.value = control_keys[(int) (key.keyval - 'a')].value;</div><div class='del'>-						command.string = control_keys[(int) (key.keyval - 'a')].string;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if (key.keyval == 'x') {</div><div class='del'>-						command.action = E_TEP_COPY;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-						gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-						</div><div class='del'>-						command.action = E_TEP_DELETE;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					break;</div><div class='del'>-				} else if ((key.state &amp; GDK_MOD1_MASK) &amp;&amp; !(key.state &amp; GDK_CONTROL_MASK)) {</div><div class='del'>-					if ((key.keyval &gt;= 'A') &amp;&amp; (key.keyval &lt;= 'Z'))</div><div class='del'>-						key.keyval -= 'A' - 'a';</div><div class='del'>-					</div><div class='del'>-					if ((key.keyval &gt;= 'a') &amp;&amp; (key.keyval &lt;= 'z')) {</div><div class='del'>-						command.position = alt_keys[(int) (key.keyval - 'a')].position;</div><div class='del'>-						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)</div><div class='del'>-							command.action = alt_keys[(int) (key.keyval - 'a')].action;</div><div class='del'>-						command.value = alt_keys[(int) (key.keyval - 'a')].value;</div><div class='del'>-						command.string = alt_keys[(int) (key.keyval - 'a')].string;</div><div class='del'>-					}</div><div class='del'>-				} else if (!(key.state &amp; GDK_MOD1_MASK) &amp;&amp; !(key.state &amp; GDK_CONTROL_MASK) &amp;&amp; key.length &gt; 0) {</div><div class='del'>-					if (key.keyval &gt;= GDK_KP_0 &amp;&amp; key.keyval &lt;= GDK_KP_9) {</div><div class='del'>-						key.keyval = '0';</div><div class='del'>-						key.string = "0";</div><div class='del'>-					}</div><div class='del'>-					command.action = E_TEP_INSERT;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-					command.value = strlen(key.string);</div><div class='del'>-					command.string = key.string;</div><div class='del'>-					</div><div class='del'>-				} else {</div><div class='del'>-					command.action = E_TEP_NOP;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_KEY_RELEASE:</div><div class='del'>-			command.time = event-&gt;key.time;</div><div class='del'>-			command.action = E_TEP_NOP;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			command.action = E_TEP_NOP;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (command.action != E_TEP_NOP) {</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETextEventProcessor *</div><div class='del'>-e_text_event_processor_emacs_like_new (void)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorEmacsLike *retval = gtk_type_new (e_text_event_processor_emacs_like_get_type ());</div><div class='del'>-	return E_TEXT_EVENT_PROCESSOR (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h<br/>deleted file mode 100644<br/>index 58a92168a8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-emacs-like.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-text-event-processor-emacs-like.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-text-event-processor-emacs-like.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-text-event-processor.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands.  Uses an emacs-ish interface.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE			(e_text_event_processor_emacs_like_get_type ())</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;</div><div class='del'>-typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeClass;</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEmacsLike</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor parent;</div><div class='del'>-	</div><div class='del'>-	/* object specific fields */</div><div class='del'>-	guint mouse_down : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEmacsLikeClass</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_text_event_processor_emacs_like_get_type (void);</div><div class='del'>-ETextEventProcessor *e_text_event_processor_emacs_like_new (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */</div><div class='head'>diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h<br/>deleted file mode 100644<br/>index 0881438cec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-types.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-text-event-processor-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,136 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-text-event-processor-types.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;gdk/gdktypes.h&gt;</div><div class='del'>-</div><div class='del'>-typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_TEP_VALUE,</div><div class='del'>-	E_TEP_SELECTION,</div><div class='del'>-</div><div class='del'>-	E_TEP_START_OF_BUFFER,</div><div class='del'>-	E_TEP_END_OF_BUFFER,</div><div class='del'>-</div><div class='del'>-	E_TEP_START_OF_LINE,</div><div class='del'>-	E_TEP_END_OF_LINE,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_CHARACTER,</div><div class='del'>-	E_TEP_BACKWARD_CHARACTER,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_WORD,</div><div class='del'>-	E_TEP_BACKWARD_WORD,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_LINE,</div><div class='del'>-	E_TEP_BACKWARD_LINE,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_PARAGRAPH,</div><div class='del'>-	E_TEP_BACKWARD_PARAGRAPH,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_PAGE,</div><div class='del'>-	E_TEP_BACKWARD_PAGE,</div><div class='del'>-</div><div class='del'>-	E_TEP_SELECT_WORD,</div><div class='del'>-	E_TEP_SELECT_ALL</div><div class='del'>-</div><div class='del'>-} ETextEventProcessorCommandPosition;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_TEP_MOVE,</div><div class='del'>-	E_TEP_SELECT,</div><div class='del'>-	E_TEP_DELETE,</div><div class='del'>-	E_TEP_INSERT,</div><div class='del'>-</div><div class='del'>-	E_TEP_CAPS,</div><div class='del'>-	</div><div class='del'>-	E_TEP_COPY,</div><div class='del'>-	E_TEP_PASTE,</div><div class='del'>-	E_TEP_GET_SELECTION,</div><div class='del'>-	E_TEP_SET_SELECT_BY_WORD,</div><div class='del'>-	E_TEP_ACTIVATE,</div><div class='del'>-</div><div class='del'>-	E_TEP_GRAB,</div><div class='del'>-	E_TEP_UNGRAB,</div><div class='del'>-</div><div class='del'>-	E_TEP_NOP</div><div class='del'>-} ETextEventProcessorCommandAction;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETextEventProcessorCommandPosition position;</div><div class='del'>-	ETextEventProcessorCommandAction action;</div><div class='del'>-	int value;</div><div class='del'>-	char *string;</div><div class='del'>-	guint32 time;</div><div class='del'>-} ETextEventProcessorCommand;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	guint button;</div><div class='del'>-	gint position;</div><div class='del'>-} ETextEventProcessorEventButton;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	guint keyval;</div><div class='del'>-	gint length;</div><div class='del'>-	gchar *string;</div><div class='del'>-} ETextEventProcessorEventKey;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	gint position;</div><div class='del'>-} ETextEventProcessorEventMotion;</div><div class='del'>-</div><div class='del'>-union _ETextEventProcessorEvent {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	ETextEventProcessorEventButton button;</div><div class='del'>-	ETextEventProcessorEventKey key;</div><div class='del'>-	ETextEventProcessorEventMotion motion;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum _ETextEventProcessorCaps {</div><div class='del'>-	E_TEP_CAPS_UPPER,</div><div class='del'>-	E_TEP_CAPS_LOWER,</div><div class='del'>-	E_TEP_CAPS_TITLE</div><div class='del'>-} ETextEventProcessorCaps;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_TYPES_H__ */</div><div class='head'>diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c<br/>deleted file mode 100644<br/>index b24ce2433a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-text-event-processor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-text-event-processor.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "e-text-event-processor.h"</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_init		(ETextEventProcessor		 *card);</div><div class='del'>-static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ALLOW_NEWLINES</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_TEP_EVENT,</div><div class='del'>-	E_TEP_LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_tep_signals[E_TEP_LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_text_event_processor_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType text_event_processor_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!text_event_processor_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo text_event_processor_info =</div><div class='del'>-      {</div><div class='del'>-        "ETextEventProcessor",</div><div class='del'>-        sizeof (ETextEventProcessor),</div><div class='del'>-        sizeof (ETextEventProcessorClass),</div><div class='del'>-        (GtkClassInitFunc) e_text_event_processor_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_text_event_processor_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      text_event_processor_type = gtk_type_unique (gtk_object_get_type (), &amp;text_event_processor_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return text_event_processor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_class_init (ETextEventProcessorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_tep_signals[E_TEP_EVENT] =</div><div class='del'>-		gtk_signal_new ("command",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				E_OBJECT_CLASS_TYPE (object_class),</div><div class='del'>-				GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);</div><div class='del'>-</div><div class='del'>-	klass-&gt;event = NULL;</div><div class='del'>-	klass-&gt;command = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_text_event_processor_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_text_event_processor_get_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_init (ETextEventProcessor *tep)</div><div class='del'>-{</div><div class='del'>-	tep-&gt;allow_newlines = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)</div><div class='del'>-{</div><div class='del'>-	if (E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)-&gt;klass)-&gt;event) {</div><div class='del'>-		return E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)-&gt;klass)-&gt;event(tep, event);</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the text item */</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ALLOW_NEWLINES:</div><div class='del'>-		tep-&gt;allow_newlines = GTK_VALUE_BOOL (*arg);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the text item */</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ALLOW_NEWLINES:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = tep-&gt;allow_newlines;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h<br/>deleted file mode 100644<br/>index 2f9bd590dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-text-event-processor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-text-event-processor.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_TEXT_EVENT_PROCESSOR_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gal/util/e-text-event-processor-types.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ETextEventProcessor - Turns events on a text widget into commands.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_TYPE			(e_text_event_processor_get_type ())</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ETextEventProcessor       ETextEventProcessor;</div><div class='del'>-typedef struct _ETextEventProcessorClass  ETextEventProcessorClass;</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessor</div><div class='del'>-{</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	/* object specific fields */</div><div class='del'>-	guint allow_newlines : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	void (* command) (ETextEventProcessor *tep, ETextEventProcessorCommand *command);</div><div class='del'>-</div><div class='del'>-	/* virtual functions */</div><div class='del'>-	gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_text_event_processor_get_type (void);</div><div class='del'>-gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_H__ */</div><div class='head'>diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c<br/>deleted file mode 100644<br/>index c07c280447..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-time-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-time-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,409 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Time utility functions</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Damon Chaplin (damon@ximian.com)</div><div class='del'>- *</div><div class='del'>- * (C) 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-/* We need this for strptime. */</div><div class='del'>-#define _XOPEN_SOURCE 500</div><div class='del'>-#define __USE_XOPEN</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#undef _XOPEN_SOURCE</div><div class='del'>-#undef __USE_XOPEN</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "e-time-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns whether a string is NULL, empty, or full of whitespace */</div><div class='del'>-static gboolean</div><div class='del'>-string_is_empty (const char *value)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	gboolean empty = TRUE;</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		p = value;</div><div class='del'>-		while (*p) {</div><div class='del'>-			if (!isspace (*p)) {</div><div class='del'>-				empty = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return empty;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Takes a number of format strings for strptime() and attempts to parse a</div><div class='del'>- * string with them.</div><div class='del'>- */</div><div class='del'>-static ETimeParseStatus</div><div class='del'>-parse_with_strptime (const char *value, struct tm *result, const char **formats, int n_formats)</div><div class='del'>-{</div><div class='del'>-	const char *parse_end = NULL, *pos;</div><div class='del'>-	gboolean parsed = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		memset (result, 0, sizeof (*result));</div><div class='del'>-		result-&gt;tm_isdst = -1;</div><div class='del'>-		return E_TIME_PARSE_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pos = value;</div><div class='del'>-</div><div class='del'>-	/* Skip whitespace */</div><div class='del'>-	while (isspace (*pos))</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-	/* Try each of the formats in turn */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; n_formats; i++) {</div><div class='del'>-		memset (result, 0, sizeof (*result));</div><div class='del'>-		parse_end = strptime (pos, formats[i], result);</div><div class='del'>-		if (parse_end) {</div><div class='del'>-			parsed = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result-&gt;tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	/* If we parsed something, make sure we parsed the entire string. */</div><div class='del'>-	if (parsed) {</div><div class='del'>-		/* Skip whitespace */</div><div class='del'>-		while (isspace (*parse_end))</div><div class='del'>-			parse_end++;</div><div class='del'>-</div><div class='del'>-		if (*parse_end == '\0')</div><div class='del'>-			return E_TIME_PARSE_OK;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return E_TIME_PARSE_INVALID;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns TRUE if the locale has 'am' and 'pm' strings defined, in which</div><div class='del'>-   case the user can choose between 12 and 24-hour time formats. */</div><div class='del'>-static gboolean</div><div class='del'>-locale_supports_12_hour_format (void)</div><div class='del'>-{  </div><div class='del'>-	struct tm tmp_tm = { 0 };</div><div class='del'>-	char s[16];</div><div class='del'>-</div><div class='del'>-	strftime (s, sizeof (s), "%p", &amp;tmp_tm);</div><div class='del'>-	return s[0] != '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parses a string containing a date and a time. The date is expected to be</div><div class='del'>- * in a format something like "Wed 3/13/00 14:20:00", though we use gettext</div><div class='del'>- * to support the appropriate local formats and we try to accept slightly</div><div class='del'>- * different formats, e.g. the weekday can be skipped and we can accept 12-hour</div><div class='del'>- * formats with an am/pm string.</div><div class='del'>- *</div><div class='del'>- * Returns E_TIME_PARSE_OK if it could not be parsed, E_TIME_PARSE_NONE if it</div><div class='del'>- * was empty, or E_TIME_PARSE_INVALID if it couldn't be parsed.</div><div class='del'>- */</div><div class='del'>-ETimeParseStatus</div><div class='del'>-e_time_parse_date_and_time		(const char	*value,</div><div class='del'>-					 struct tm	*result)</div><div class='del'>-{</div><div class='del'>-	struct tm *today_tm;</div><div class='del'>-	time_t t;</div><div class='del'>-	const char *format[16];</div><div class='del'>-	int num_formats = 0;</div><div class='del'>-	gboolean use_12_hour_formats = locale_supports_12_hour_format ();</div><div class='del'>-	ETimeParseStatus status;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		memset (result, 0, sizeof (*result));</div><div class='del'>-		result-&gt;tm_isdst = -1;</div><div class='del'>-		return E_TIME_PARSE_NONE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We'll parse the whole date and time in one go, otherwise we get</div><div class='del'>-	   into i18n problems. We attempt to parse with several formats,</div><div class='del'>-	   longest first. Note that we only use the '%p' specifier if the</div><div class='del'>-	   locale actually has 'am' and 'pm' strings defined, otherwise we</div><div class='del'>-	   will get incorrect results. Note also that we try to use exactly</div><div class='del'>-	   the same strings as in e_time_format_date_and_time(), to try to</div><div class='del'>-	   avoid i18n problems. We also use cut-down versions, so users don't</div><div class='del'>-	   have to type in the weekday or the seconds, for example.</div><div class='del'>-	   Note that all these formats include the full date, and the time</div><div class='del'>-	   will be set to 00:00:00 before parsing, so we don't need to worry</div><div class='del'>-	   about filling in any missing fields after parsing. */</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Try the full times, with the weekday. Then try without seconds,</div><div class='del'>-	 * and without minutes, and finally with no time at all.</div><div class='del'>-	 */</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a weekday, a date and a time,</div><div class='del'>-		   in 12-hour format. */</div><div class='del'>-		format[num_formats++] = _("%a %m/%d/%Y %I:%M:%S %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday, a date and a time, </div><div class='del'>-	   in 24-hour format. */</div><div class='del'>-	format[num_formats++] = _("%a %m/%d/%Y %H:%M:%S");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a weekday, a date and a time,</div><div class='del'>-		   in 12-hour format, without seconds. */</div><div class='del'>-		format[num_formats++] = _("%a %m/%d/%Y %I:%M %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday, a date and a time,</div><div class='del'>-	   in 24-hour format, without seconds. */</div><div class='del'>-	format[num_formats++] = _("%a %m/%d/%Y %H:%M");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a weekday, a date and a time,</div><div class='del'>-		   in 12-hour format, without minutes or seconds. */</div><div class='del'>-		format[num_formats++] = _("%a %m/%d/%Y %I %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday, a date and a time,</div><div class='del'>-	   in 24-hour format, without minutes or seconds. */</div><div class='del'>-	format[num_formats++] = _("%a %m/%d/%Y %H");</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday and a date. */</div><div class='del'>-	format[num_formats++] = _("%a %m/%d/%Y");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Now try all the above formats again, but without the weekday.</div><div class='del'>-	 */</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a date and a time, in 12-hour format. */</div><div class='del'>-		format[num_formats++] = _("%m/%d/%Y %I:%M:%S %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a date and a time, in 24-hour format. */</div><div class='del'>-	format[num_formats++] = _("%m/%d/%Y %H:%M:%S");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a date and a time, in 12-hour format,</div><div class='del'>-		   without seconds. */</div><div class='del'>-		format[num_formats++] = _("%m/%d/%Y %I:%M %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a date and a time, in 24-hour format,</div><div class='del'>-	   without seconds. */</div><div class='del'>-	format[num_formats++] = _("%m/%d/%Y %H:%M");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format of a date and a time, in 12-hour format,</div><div class='del'>-		   without minutes or seconds. */</div><div class='del'>-		format[num_formats++] = _("%m/%d/%Y %I %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format of a date and a time, in 24-hour format,</div><div class='del'>-	   without minutes or seconds. */</div><div class='del'>-	format[num_formats++] = _("%m/%d/%Y %H");</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday and a date. */</div><div class='del'>-	format[num_formats++] = _("%m/%d/%Y");</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	status = parse_with_strptime (value, result, format, num_formats);</div><div class='del'>-	/* Note that we checked if it was empty already, so it is either OK</div><div class='del'>-	   or INVALID here. */</div><div class='del'>-	if (status == E_TIME_PARSE_OK) {</div><div class='del'>-		/* If a 2-digit year was used we use the current century. */</div><div class='del'>-		if (result-&gt;tm_year &lt; 0) {</div><div class='del'>-			t = time (NULL);</div><div class='del'>-			today_tm = localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-			/* This should convert it into a value from 0 to 99. */</div><div class='del'>-			result-&gt;tm_year += 1900;</div><div class='del'>-</div><div class='del'>-			/* Now add on the century. */</div><div class='del'>-			result-&gt;tm_year += today_tm-&gt;tm_year</div><div class='del'>-				- (today_tm-&gt;tm_year % 100);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Now we try to just parse a time, assuming the current day.*/</div><div class='del'>-		status = e_time_parse_time (value, result);</div><div class='del'>-		if (status == E_TIME_PARSE_OK) {</div><div class='del'>-			/* We fill in the current day. */</div><div class='del'>-			t = time (NULL);</div><div class='del'>-			today_tm = localtime (&amp;t);</div><div class='del'>-			result-&gt;tm_mday = today_tm-&gt;tm_mday;</div><div class='del'>-			result-&gt;tm_mon  = today_tm-&gt;tm_mon;</div><div class='del'>-			result-&gt;tm_year = today_tm-&gt;tm_year;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return status;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_time_parse_date:</div><div class='del'>- * @value: A date string.</div><div class='del'>- * @result: Return value for the parsed date.</div><div class='del'>- * </div><div class='del'>- * Takes in a date string entered by the user and tries to convert it to</div><div class='del'>- * a struct tm.</div><div class='del'>- * </div><div class='del'>- * Return value: Result code indicating whether the @value was an empty</div><div class='del'>- * string, a valid date, or an invalid date.</div><div class='del'>- **/</div><div class='del'>-ETimeParseStatus</div><div class='del'>-e_time_parse_date (const char *value, struct tm *result)</div><div class='del'>-{</div><div class='del'>-	const char *format[2];</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (value != NULL, E_TIME_PARSE_INVALID);</div><div class='del'>-	g_return_val_if_fail (result != NULL, E_TIME_PARSE_INVALID);</div><div class='del'>-</div><div class='del'>-	/* strptime format of a weekday and a date. */</div><div class='del'>-	format[0] = _("%a %m/%d/%Y");</div><div class='del'>-</div><div class='del'>-	/* This is the preferred date format for the locale. */</div><div class='del'>-	format[1] = _("%m/%d/%Y");</div><div class='del'>-</div><div class='del'>-	return parse_with_strptime (value, result, format, sizeof (format) / sizeof (format[0]));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Parses a string containing a time. It is expected to be in a format</div><div class='del'>- * something like "14:20:00", though we use gettext to support the appropriate</div><div class='del'>- * local formats and we try to accept slightly different formats, e.g. we can</div><div class='del'>- * accept 12-hour formats with an am/pm string.</div><div class='del'>- *</div><div class='del'>- * Returns E_TIME_PARSE_OK if it could not be parsed, E_TIME_PARSE_NONE if it</div><div class='del'>- * was empty, or E_TIME_PARSE_INVALID if it couldn't be parsed.</div><div class='del'>- */</div><div class='del'>-ETimeParseStatus</div><div class='del'>-e_time_parse_time (const char *value, struct tm *result)</div><div class='del'>-{</div><div class='del'>-	const char *format[6];</div><div class='del'>-	int num_formats = 0;</div><div class='del'>-	gboolean use_12_hour_formats = locale_supports_12_hour_format ();</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format for a time of day, in 12-hour format. */</div><div class='del'>-		format[num_formats++] = _("%I:%M:%S %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format for a time of day, in 24-hour format. */</div><div class='del'>-	format[num_formats++] = _("%H:%M:%S");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format for time of day, without seconds,</div><div class='del'>-		   in 12-hour format. */</div><div class='del'>-		format[num_formats++] = _("%I:%M %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format for time of day, without seconds 24-hour format. */</div><div class='del'>-	format[num_formats++] = _("%H:%M");</div><div class='del'>-</div><div class='del'>-	if (use_12_hour_formats) {</div><div class='del'>-		/* strptime format for hour and AM/PM, 12-hour format. */</div><div class='del'>-		format[num_formats++] = _("%I %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strptime format for hour, 24-hour format. */</div><div class='del'>-	format[num_formats++] = "%H";</div><div class='del'>-</div><div class='del'>-	return parse_with_strptime (value, result, format, num_formats);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates a string representation of a time value and stores it in buffer.</div><div class='del'>-   buffer_size should be about 64 to be safe. If show_midnight is FALSE, and</div><div class='del'>-   the time is midnight, then we just show the date. If show_zero_seconds</div><div class='del'>-   is FALSE, then if the time has zero seconds only the hour and minute are</div><div class='del'>-   shown. */</div><div class='del'>-void</div><div class='del'>-e_time_format_date_and_time		(struct tm	*date_tm,</div><div class='del'>-					 gboolean	 use_24_hour_format,</div><div class='del'>-					 gboolean	 show_midnight,</div><div class='del'>-					 gboolean	 show_zero_seconds,</div><div class='del'>-					 char		*buffer,</div><div class='del'>-					 int		 buffer_size)</div><div class='del'>-{</div><div class='del'>-	char *format;</div><div class='del'>-</div><div class='del'>-	if (!show_midnight &amp;&amp; date_tm-&gt;tm_hour == 0</div><div class='del'>-	    &amp;&amp; date_tm-&gt;tm_min == 0 &amp;&amp; date_tm-&gt;tm_sec == 0) {</div><div class='del'>-		/* strftime format of a weekday and a date. */</div><div class='del'>-		format = _("%a %m/%d/%Y");</div><div class='del'>-	} else if (use_24_hour_format) {</div><div class='del'>-		if (!show_zero_seconds &amp;&amp; date_tm-&gt;tm_sec == 0)</div><div class='del'>-			/* strftime format of a weekday, a date and a</div><div class='del'>-			   time, in 24-hour format, without seconds. */</div><div class='del'>-			format = _("%a %m/%d/%Y %H:%M");</div><div class='del'>-		else</div><div class='del'>-			/* strftime format of a weekday, a date and a</div><div class='del'>-			   time, in 24-hour format. */</div><div class='del'>-			format = _("%a %m/%d/%Y %H:%M:%S");</div><div class='del'>-	} else {</div><div class='del'>-		if (!show_zero_seconds &amp;&amp; date_tm-&gt;tm_sec == 0)</div><div class='del'>-			/* strftime format of a weekday, a date and a</div><div class='del'>-			   time, in 12-hour format, without seconds. */</div><div class='del'>-			format = _("%a %m/%d/%Y %I:%M %p");</div><div class='del'>-		else</div><div class='del'>-			/* strftime format of a weekday, a date and a</div><div class='del'>-			   time, in 12-hour format. */</div><div class='del'>-			format = _("%a %m/%d/%Y %I:%M:%S %p");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* strftime returns 0 if the string doesn't fit, and leaves the buffer</div><div class='del'>-	   undefined, so we set it to the empty string in that case. */</div><div class='del'>-	if (strftime (buffer, buffer_size, format, date_tm) == 0)</div><div class='del'>-		buffer[0] = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates a string representation of a time value and stores it in buffer.</div><div class='del'>-   buffer_size should be about 64 to be safe. */</div><div class='del'>-void</div><div class='del'>-e_time_format_time			(struct tm	*date_tm,</div><div class='del'>-					 gboolean	 use_24_hour_format,</div><div class='del'>-					 gboolean	 show_zero_seconds,</div><div class='del'>-					 char		*buffer,</div><div class='del'>-					 int		 buffer_size)</div><div class='del'>-{</div><div class='del'>-	char *format;</div><div class='del'>-</div><div class='del'>-	if (use_24_hour_format) {</div><div class='del'>-		if (!show_zero_seconds &amp;&amp; date_tm-&gt;tm_sec == 0)</div><div class='del'>-			/* strftime format of a time in 24-hour format,</div><div class='del'>-			   without seconds. */</div><div class='del'>-			format = _("%H:%M");</div><div class='del'>-		else</div><div class='del'>-			/* strftime format of a time in 24-hour format. */</div><div class='del'>-			format = _("%H:%M:%S");</div><div class='del'>-	} else {</div><div class='del'>-		if (!show_zero_seconds &amp;&amp; date_tm-&gt;tm_sec == 0)</div><div class='del'>-			/* strftime format of a time in 12-hour format,</div><div class='del'>-			   without seconds. */</div><div class='del'>-			format = _("%I:%M %p");</div><div class='del'>-		else</div><div class='del'>-			/* strftime format of a time in 12-hour format. */</div><div class='del'>-			format = _("%I:%M:%S %p");</div><div class='del'>-	}</div><div class='del'>-			</div><div class='del'>-	/* strftime returns 0 if the string doesn't fit, and leaves the buffer</div><div class='del'>-	   undefined, so we set it to the empty string in that case. */</div><div class='del'>-	if (strftime (buffer, buffer_size, format, date_tm) == 0)</div><div class='del'>-		buffer[0] = '\0';</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-time-utils.h b/e-util/e-time-utils.h<br/>deleted file mode 100644<br/>index f6d85df5ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-time-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-time-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Time utility functions</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Damon Chaplin (damon@ximian.com)</div><div class='del'>- *</div><div class='del'>- * (C) 2001 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef E_TIME_UTILS</div><div class='del'>-#define E_TIME_UTILS</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_TIME_PARSE_OK,</div><div class='del'>-	E_TIME_PARSE_NONE,</div><div class='del'>-	E_TIME_PARSE_INVALID</div><div class='del'>-} ETimeParseStatus;</div><div class='del'>-</div><div class='del'>-/* Tries to parse a string containing a date and time. */</div><div class='del'>-ETimeParseStatus e_time_parse_date_and_time	(const char	*value,</div><div class='del'>-						 struct tm	*result);</div><div class='del'>-</div><div class='del'>-/* Tries to parse a string containing a date. */</div><div class='del'>-ETimeParseStatus e_time_parse_date		(const char	*value,</div><div class='del'>-						 struct tm	*result);</div><div class='del'>-</div><div class='del'>-/* Tries to parse a string containing a time. */</div><div class='del'>-ETimeParseStatus e_time_parse_time		(const char	*value,</div><div class='del'>-						 struct tm	*result);</div><div class='del'>-</div><div class='del'>-/* Turns a struct tm into a string like "Wed  3/12/00 12:00:00 AM". */</div><div class='del'>-void e_time_format_date_and_time		(struct tm	*date_tm,</div><div class='del'>-						 gboolean	 use_24_hour_format,</div><div class='del'>-						 gboolean	 show_midnight,</div><div class='del'>-						 gboolean	 show_zero_seconds,</div><div class='del'>-						 char		*buffer,</div><div class='del'>-						 int		 buffer_size);</div><div class='del'>-</div><div class='del'>-/* Formats a time from a struct tm, e.g. "01:59 PM". */</div><div class='del'>-void e_time_format_time				(struct tm	*date_tm,</div><div class='del'>-						 gboolean	 use_24_hour_format,</div><div class='del'>-						 gboolean	 show_zero_seconds,</div><div class='del'>-						 char		*buffer,</div><div class='del'>-						 int		 buffer_size);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* E_TIME_UTILS */</div><div class='head'>diff --git a/e-util/e-url.c b/e-util/e-url.c<br/>deleted file mode 100644<br/>index 6c24b20b8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-url.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,339 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-url.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *              Rodrigo Moya   &lt;rodrigo@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "e-url.h"</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_url_shroud (const char *url)</div><div class='del'>-{</div><div class='del'>-	const char *first_colon = NULL;</div><div class='del'>-	const char *last_at = NULL;</div><div class='del'>-	const char *p;</div><div class='del'>-	char *shrouded;</div><div class='del'>-	</div><div class='del'>-	if (url == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Skip past the moniker */</div><div class='del'>-	for (p = url; *p &amp;&amp; *p != ':'; ++p);</div><div class='del'>-	if (*p)</div><div class='del'>-		++p;</div><div class='del'>-</div><div class='del'>-	while (*p) {</div><div class='del'>-		if (first_colon == NULL &amp;&amp; *p == ':')</div><div class='del'>-			first_colon = p;</div><div class='del'>-		if (*p == '@')</div><div class='del'>-			last_at = p;</div><div class='del'>-		++p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (first_colon &amp;&amp; last_at &amp;&amp; first_colon &lt; last_at) {</div><div class='del'>-		shrouded = g_strdup_printf ("%.*s%s", first_colon - url, url, last_at);</div><div class='del'>-	} else {</div><div class='del'>-		shrouded = g_strdup (url);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return shrouded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_url_equal (const char *url1, const char *url2)</div><div class='del'>-{</div><div class='del'>-	char *shroud1 = e_url_shroud (url1);</div><div class='del'>-	char *shroud2 = e_url_shroud (url2);</div><div class='del'>-	gint len1, len2;</div><div class='del'>-	gboolean rv;</div><div class='del'>-</div><div class='del'>-	if (shroud1 == NULL || shroud2 == NULL) {</div><div class='del'>-		rv = (shroud1 == shroud2);</div><div class='del'>-	} else {</div><div class='del'>-		len1 = strlen (shroud1);</div><div class='del'>-		len2 = strlen (shroud2);</div><div class='del'>-</div><div class='del'>-		rv = !strncmp (shroud1, shroud2, MIN (len1, len2));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (shroud1);</div><div class='del'>-	g_free (shroud2);</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-uri_decode (char *part)</div><div class='del'>-{</div><div class='del'>-	guchar *s, *d;</div><div class='del'>-</div><div class='del'>-	s = d = (guchar *)part;</div><div class='del'>-	while (*s) {</div><div class='del'>-		if (*s == '%') {</div><div class='del'>-			if (isxdigit (s[1]) &amp;&amp; isxdigit (s[2])) {</div><div class='del'>-				*d++ = HEXVAL (s[1]) * 16 + HEXVAL (s[2]);</div><div class='del'>-				s += 3;</div><div class='del'>-			} else</div><div class='del'>-				*d++ = *s++;</div><div class='del'>-		} else</div><div class='del'>-			*d++ = *s++;</div><div class='del'>-	}</div><div class='del'>-	*d = '\0';</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EUri *</div><div class='del'>-e_uri_new (const char *uri_string)</div><div class='del'>-{</div><div class='del'>-	EUri *uri;</div><div class='del'>-	const char *end, *hash, *colon, *semi, *at, *slash, *question;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	uri = g_new0 (EUri, 1);</div><div class='del'>-</div><div class='del'>-	/* find fragment */</div><div class='del'>-	end = hash = strchr (uri_string, '#');</div><div class='del'>-	if (hash &amp;&amp; hash[1]) {</div><div class='del'>-		uri-&gt;fragment = g_strdup (hash + 1);</div><div class='del'>-		uri_decode (uri-&gt;fragment);</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		end = uri_string + strlen (uri_string);</div><div class='del'>-</div><div class='del'>-	/* find protocol: initial [a-z+.-]* substring until ":" */</div><div class='del'>-	p = uri_string;</div><div class='del'>-	while (p &lt; end &amp;&amp; (isalnum ((unsigned char) *p) ||</div><div class='del'>-			   *p == '.' || *p == '+' || *p == '-'))</div><div class='del'>-		p++;</div><div class='del'>-</div><div class='del'>-	if (p &gt; uri_string &amp;&amp; *p == ':') {</div><div class='del'>-		uri-&gt;protocol = g_strndup (uri_string, p - uri_string);</div><div class='del'>-		g_strdown (uri-&gt;protocol);</div><div class='del'>-		uri_string = p + 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		uri-&gt;protocol = g_strdup ("file");</div><div class='del'>-</div><div class='del'>-	if (!*uri_string)</div><div class='del'>-		return uri;</div><div class='del'>-</div><div class='del'>-	/* check for authority */</div><div class='del'>-	if (strncmp (uri_string, "//", 2) == 0) {</div><div class='del'>-		uri_string += 2;</div><div class='del'>-</div><div class='del'>-		slash = uri_string + strcspn (uri_string, "/#");</div><div class='del'>-		at = strchr (uri_string, '@');</div><div class='del'>-		if (at &amp;&amp; at &lt; slash) {</div><div class='del'>-			colon = strchr (uri_string, ':');</div><div class='del'>-			if (colon &amp;&amp; colon &lt; at) {</div><div class='del'>-				uri-&gt;passwd = g_strndup (colon + 1, at - colon - 1);</div><div class='del'>-				uri_decode (uri-&gt;passwd);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				uri-&gt;passwd = NULL;</div><div class='del'>-				colon = at;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			semi = strchr (uri_string, ';');</div><div class='del'>-			if (semi &amp;&amp; semi &lt; colon &amp;&amp;</div><div class='del'>-			    !strncasecmp (semi, ";auth=", 6)) {</div><div class='del'>-				uri-&gt;authmech = g_strndup (semi + 6, colon - semi - 6);</div><div class='del'>-				uri_decode (uri-&gt;authmech);</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				uri-&gt;authmech = NULL;</div><div class='del'>-				semi = colon;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			uri-&gt;user = g_strndup (uri_string, semi - uri_string);</div><div class='del'>-			uri_decode (uri-&gt;user);</div><div class='del'>-			uri_string = at + 1;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			uri-&gt;user = uri-&gt;passwd = uri-&gt;authmech = NULL;</div><div class='del'>-</div><div class='del'>-		/* find host and port */</div><div class='del'>-		colon = strchr (uri_string, ':');</div><div class='del'>-		if (colon &amp;&amp; colon &lt; slash) {</div><div class='del'>-			uri-&gt;host = g_strndup (uri_string, colon - uri_string);</div><div class='del'>-			uri-&gt;port = strtoul (colon + 1, NULL, 10);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			uri-&gt;host = g_strndup (uri_string, slash - uri_string);</div><div class='del'>-			uri_decode (uri-&gt;host);</div><div class='del'>-			uri-&gt;port = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		uri_string = slash;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* find query */</div><div class='del'>-	question = memchr (uri_string, '?', end - uri_string);</div><div class='del'>-	if (question) {</div><div class='del'>-		if (question[1]) {</div><div class='del'>-			uri-&gt;query = g_strndup (question + 1, end - (question + 1));</div><div class='del'>-			uri_decode (uri-&gt;query);</div><div class='del'>-		}</div><div class='del'>-		end = question;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* find parameters */</div><div class='del'>-	semi = memchr (uri_string, ';', end - uri_string);</div><div class='del'>-	if (semi) {</div><div class='del'>-		if (semi[1]) {</div><div class='del'>-			const char *cur, *p, *eq;</div><div class='del'>-			char *name, *value;</div><div class='del'>-</div><div class='del'>-			for (cur = semi + 1; cur &lt; end; cur = p + 1) {</div><div class='del'>-				p = memchr (cur, ';', end - cur);</div><div class='del'>-				if (!p)</div><div class='del'>-					p = end;</div><div class='del'>-				eq = memchr (cur, '=', p - cur);</div><div class='del'>-				if (eq) {</div><div class='del'>-					name = g_strndup (cur, eq - cur);</div><div class='del'>-					value = g_strndup (eq + 1, p - (eq + 1));</div><div class='del'>-					uri_decode (value);</div><div class='del'>-				} else {</div><div class='del'>-					name = g_strndup (cur, p - cur);</div><div class='del'>-					value = g_strdup ("");</div><div class='del'>-				}</div><div class='del'>-				uri_decode (name);</div><div class='del'>-				g_datalist_set_data_full (&amp;uri-&gt;params, name,</div><div class='del'>-							  value, g_free);</div><div class='del'>-				g_free (name);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		end = semi;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (end != uri_string) {</div><div class='del'>-		uri-&gt;path = g_strndup (uri_string, end - uri_string);</div><div class='del'>-		uri_decode (uri-&gt;path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return uri;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_uri_free (EUri *uri)</div><div class='del'>-{</div><div class='del'>-	if (uri) {</div><div class='del'>-		g_free (uri-&gt;protocol);</div><div class='del'>-		g_free (uri-&gt;user);</div><div class='del'>-		g_free (uri-&gt;authmech);</div><div class='del'>-		g_free (uri-&gt;passwd);</div><div class='del'>-		g_free (uri-&gt;host);</div><div class='del'>-		g_free (uri-&gt;path);</div><div class='del'>-		g_datalist_clear (&amp;uri-&gt;params);</div><div class='del'>-		g_free (uri-&gt;query);</div><div class='del'>-		g_free (uri-&gt;fragment);</div><div class='del'>-</div><div class='del'>-		g_free (uri);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_uri_get_param (EUri *uri, const char *name)</div><div class='del'>-{</div><div class='del'>-	return g_datalist_get_data (&amp;uri-&gt;params, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_param_cb (GQuark key_id, gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GData *params = (GData *) user_data;</div><div class='del'>-</div><div class='del'>-	g_datalist_id_set_data_full (&amp;params, key_id, g_strdup (data), g_free);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EUri *</div><div class='del'>-e_uri_copy (EUri *uri)</div><div class='del'>-{</div><div class='del'>-	EUri *uri_copy;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uri != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	uri_copy = g_new0 (EUri, 1);</div><div class='del'>-	uri_copy-&gt;protocol = g_strdup (uri-&gt;protocol);</div><div class='del'>-	uri_copy-&gt;user = g_strdup (uri-&gt;user);</div><div class='del'>-	uri_copy-&gt;authmech = g_strdup (uri-&gt;authmech);</div><div class='del'>-	uri_copy-&gt;passwd = g_strdup (uri-&gt;passwd);</div><div class='del'>-	uri_copy-&gt;host = g_strdup (uri-&gt;host);</div><div class='del'>-	uri_copy-&gt;port = uri-&gt;port;</div><div class='del'>-	uri_copy-&gt;path = g_strdup (uri-&gt;path);</div><div class='del'>-	uri_copy-&gt;query = g_strdup (uri-&gt;query);</div><div class='del'>-	uri_copy-&gt;fragment = g_strdup (uri-&gt;fragment);</div><div class='del'>-</div><div class='del'>-	/* copy uri-&gt;params */</div><div class='del'>-	g_datalist_foreach (&amp;uri-&gt;params,</div><div class='del'>-			    (GDataForeachFunc) copy_param_cb,</div><div class='del'>-			    &amp;uri_copy-&gt;params);</div><div class='del'>-</div><div class='del'>-	return uri_copy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_uri_to_string (EUri *uri, gboolean show_password)</div><div class='del'>-{</div><div class='del'>-	char *str_uri = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uri != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (uri-&gt;port != 0)</div><div class='del'>-		str_uri = g_strdup_printf (</div><div class='del'>-			"%s://%s%s%s%s%s%s%s:%d%s%s%s",</div><div class='del'>-			uri-&gt;protocol,</div><div class='del'>-			uri-&gt;user ? uri-&gt;user : "",</div><div class='del'>-			uri-&gt;authmech ? ";auth=" : "",</div><div class='del'>-			uri-&gt;authmech ? uri-&gt;authmech : "",</div><div class='del'>-			uri-&gt;passwd &amp;&amp; show_password ? ":" : "",</div><div class='del'>-			uri-&gt;passwd &amp;&amp; show_password ? uri-&gt;passwd : "",</div><div class='del'>-			uri-&gt;user ? "@" : "",</div><div class='del'>-			uri-&gt;host ? uri-&gt;host : "",</div><div class='del'>-			uri-&gt;port,</div><div class='del'>-			uri-&gt;path ? uri-&gt;path : "",</div><div class='del'>-			uri-&gt;query ? "?" : "",</div><div class='del'>-			uri-&gt;query ? uri-&gt;query : "");</div><div class='del'>-	else</div><div class='del'>-		str_uri = g_strdup_printf(</div><div class='del'>-                        "%s://%s%s%s%s%s%s%s%s%s%s",</div><div class='del'>-                        uri-&gt;protocol,</div><div class='del'>-                        uri-&gt;user ? uri-&gt;user : "",</div><div class='del'>-                        uri-&gt;authmech ? ";auth=" : "",</div><div class='del'>-                        uri-&gt;authmech ? uri-&gt;authmech : "",</div><div class='del'>-                        uri-&gt;passwd &amp;&amp; show_password ? ":" : "",</div><div class='del'>-                        uri-&gt;passwd &amp;&amp; show_password ? uri-&gt;passwd : "",</div><div class='del'>-                        uri-&gt;user ? "@" : "",</div><div class='del'>-                        uri-&gt;host ? uri-&gt;host : "",</div><div class='del'>-                        uri-&gt;path ? uri-&gt;path : "",</div><div class='del'>-                        uri-&gt;query ? "?" : "",</div><div class='del'>-                        uri-&gt;query ? uri-&gt;query : "");</div><div class='del'>-</div><div class='del'>-	return str_uri;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-url.h b/e-util/e-url.h<br/>deleted file mode 100644<br/>index e37b5d68f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-url.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-url.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e-url.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Developed by Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *              Rodrigo Moya   &lt;rodrigo@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- * </div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- * </div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_URL_H__</div><div class='del'>-#define __E_URL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-char *e_url_shroud (const char *url);</div><div class='del'>-gboolean e_url_equal (const char *url1, const char *url2);</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char  *protocol;</div><div class='del'>-	char  *user;</div><div class='del'>-	char  *authmech;</div><div class='del'>-	char  *passwd;</div><div class='del'>-	char  *host;</div><div class='del'>-	int    port;</div><div class='del'>-	char  *path;</div><div class='del'>-	GData *params;</div><div class='del'>-	char  *query;</div><div class='del'>-	char  *fragment;</div><div class='del'>-} EUri;</div><div class='del'>-</div><div class='del'>-EUri       *e_uri_new       (const char *uri_string);</div><div class='del'>-void        e_uri_free      (EUri *uri);</div><div class='del'>-const char *e_uri_get_param (EUri *uri, const char *name);</div><div class='del'>-EUri       *e_uri_copy      (EUri *uri);</div><div class='del'>-char       *e_uri_to_string (EUri *uri, gboolean show_password);</div><div class='del'>-</div><div class='del'>-#endif /* __E_URL_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-util.c b/e-util/e-util.c<br/>deleted file mode 100644<br/>index c6862ab8c5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1667 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-util.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include "e-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-g_str_compare(const void *x, const void *y)</div><div class='del'>-{</div><div class='del'>-	if (x == NULL || y == NULL) {</div><div class='del'>-		if (x == y)</div><div class='del'>-			return 0;</div><div class='del'>-		else</div><div class='del'>-			return x ? -1 : 1;</div><div class='del'>-	} </div><div class='del'>-		</div><div class='del'>-	return strcmp(x, y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-g_int_compare(const void *x, const void *y)</div><div class='del'>-{</div><div class='del'>-  if ( GPOINTER_TO_INT(x) &lt; GPOINTER_TO_INT(y) )</div><div class='del'>-    return -1;</div><div class='del'>-  else if ( GPOINTER_TO_INT(x) == GPOINTER_TO_INT(y) )</div><div class='del'>-    return 0;</div><div class='del'>-  else</div><div class='del'>-    return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_strdup_strip(const char *string)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int initial = 0;</div><div class='del'>-	for ( i = 0; string[i]; i++ ) {</div><div class='del'>-		if (initial == i &amp;&amp; isspace((unsigned char) string[i])) {</div><div class='del'>-			initial ++;</div><div class='del'>-		}</div><div class='del'>-		if (!isspace((unsigned char) string[i])) {</div><div class='del'>-			length = i - initial + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return g_strndup(string + initial, length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_object_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_object_slist (GSList *list)</div><div class='del'>-{</div><div class='del'>-	GSList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_string_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		g_free (p-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_string_slist (GSList *list)</div><div class='del'>-{</div><div class='del'>-	GSList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		g_free (p-&gt;data);</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BUFF_SIZE 1024</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_read_file(const char *filename)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	char buffer[BUFF_SIZE];</div><div class='del'>-	GList *list = NULL, *list_iterator;</div><div class='del'>-	GList *lengths = NULL, *lengths_iterator;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int bytes;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	fd = open(filename, O_RDONLY);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	bytes = read(fd, buffer, BUFF_SIZE);</div><div class='del'>-	while (bytes) {</div><div class='del'>-		if (bytes &gt; 0) {</div><div class='del'>-			char *temp = g_malloc(bytes);</div><div class='del'>-			memcpy (temp, buffer, bytes);</div><div class='del'>-			list = g_list_prepend(list, temp);</div><div class='del'>-			lengths = g_list_prepend(lengths, GINT_TO_POINTER(bytes));</div><div class='del'>-			length += bytes;</div><div class='del'>-		} else {</div><div class='del'>-			if (errno != EINTR) {</div><div class='del'>-				close(fd);</div><div class='del'>-				g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-				g_list_free(list);</div><div class='del'>-				g_list_free(lengths);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bytes = read(fd, buffer, BUFF_SIZE);</div><div class='del'>-	}</div><div class='del'>-	ret_val = g_new(char, length + 1);</div><div class='del'>-	ret_val[length] = 0;</div><div class='del'>-	lengths_iterator = lengths;</div><div class='del'>-	list_iterator = list;</div><div class='del'>-	for ( ; list_iterator; list_iterator = list_iterator-&gt;next, lengths_iterator = lengths_iterator-&gt;next) {</div><div class='del'>-		int this_length = GPOINTER_TO_INT(lengths_iterator-&gt;data);</div><div class='del'>-		length -= this_length;</div><div class='del'>-		memcpy(ret_val + length, list_iterator-&gt;data, this_length);</div><div class='del'>-	}</div><div class='del'>-	close(fd);</div><div class='del'>-	g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-	g_list_free(lengths);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_write_file(const char *filename, const char *data, int flags)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	int length = strlen(data);</div><div class='del'>-	int bytes;</div><div class='del'>-	fd = open(filename, flags, 0666);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return errno;</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		bytes = write(fd, data, length);</div><div class='del'>-		if (bytes &gt; 0) {</div><div class='del'>-			length -= bytes;</div><div class='del'>-			data += bytes;</div><div class='del'>-		} else {</div><div class='del'>-			if (errno != EINTR &amp;&amp; errno != EAGAIN) {</div><div class='del'>-				int save_errno = errno;</div><div class='del'>-				close(fd);</div><div class='del'>-				return save_errno;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (close(fd) != 0) {</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_write_file_mkstemp(char *filename, const char *data)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	int length = strlen(data);</div><div class='del'>-	int bytes;</div><div class='del'>-	fd = mkstemp (filename);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return errno;</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		bytes = write(fd, data, length);</div><div class='del'>-		if (bytes &gt; 0) {</div><div class='del'>-			length -= bytes;</div><div class='del'>-			data += bytes;</div><div class='del'>-		} else {</div><div class='del'>-			if (errno != EINTR &amp;&amp; errno != EAGAIN) {</div><div class='del'>-				int save_errno = errno;</div><div class='del'>-				close(fd);</div><div class='del'>-				return save_errno;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (close(fd) != 0) {</div><div class='del'>-		return errno;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mkdir_hier:</div><div class='del'>- * @path: a directory path</div><div class='del'>- * @mode: a mode, as for mkdir(2)</div><div class='del'>- *</div><div class='del'>- * This creates the named directory with the given @mode, creating</div><div class='del'>- * any necessary intermediate directories (with the same @mode).</div><div class='del'>- *</div><div class='del'>- * Return value: 0 on success, -1 on error, in which case errno will</div><div class='del'>- * be set as for mkdir(2).</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_mkdir_hier(const char *path, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	char *copy, *p;</div><div class='del'>-</div><div class='del'>-	if (path[0] == '/') {</div><div class='del'>-		p = copy = g_strdup (path);</div><div class='del'>-	} else {</div><div class='del'>-		gchar *current_dir = g_get_current_dir();</div><div class='del'>-		p = copy = g_concat_dir_and_file (current_dir, path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		p = strchr (p + 1, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '\0';</div><div class='del'>-		if (mkdir (copy, mode) == -1) {</div><div class='del'>-			switch (errno) {</div><div class='del'>-			case EEXIST:</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				g_free (copy);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '/';</div><div class='del'>-	} while (p);</div><div class='del'>-</div><div class='del'>-	g_free (copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-char *</div><div class='del'>-e_read_uri(const char *uri)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSHandle *handle;</div><div class='del'>-	GList *list = NULL, *list_iterator;</div><div class='del'>-	GList *lengths = NULL, *lengths_iterator;</div><div class='del'>-	gchar buffer[1025];</div><div class='del'>-	gchar *ret_val;</div><div class='del'>-	int length = 0;</div><div class='del'>-	GnomeVFSFileSize bytes;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_open(&amp;handle, uri, GNOME_VFS_OPEN_READ);</div><div class='del'>-	</div><div class='del'>-	gnome_vfs_read(handle, buffer, 1024, &amp;bytes);</div><div class='del'>-	while (bytes) {</div><div class='del'>-		if (bytes) {</div><div class='del'>-			char *temp = g_malloc(bytes);</div><div class='del'>-			memcpy (temp, buffer, bytes);</div><div class='del'>-			list = g_list_prepend(list, temp);</div><div class='del'>-			lengths = g_list_prepend(lengths, GINT_TO_POINTER((gint) bytes));</div><div class='del'>-			length += bytes;</div><div class='del'>-		}</div><div class='del'>-		gnome_vfs_read(handle, buffer, 1024, &amp;bytes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret_val = g_new(char, length + 1);</div><div class='del'>-	ret_val[length] = 0;</div><div class='del'>-	lengths_iterator = lengths;</div><div class='del'>-	list_iterator = list;</div><div class='del'>-	for ( ; list_iterator; list_iterator = list_iterator-&gt;next, lengths_iterator = lengths_iterator-&gt;next) {</div><div class='del'>-		int this_length = GPOINTER_TO_INT(lengths_iterator-&gt;data);</div><div class='del'>-		length -= this_length;</div><div class='del'>-		memcpy(ret_val + length, list_iterator-&gt;data, this_length);</div><div class='del'>-	}</div><div class='del'>-	gnome_vfs_close(handle);</div><div class='del'>-	g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-	g_list_free(lengths);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef gint (*GtkSignal_INT__INT_INT_POINTER) (GtkObject * object,</div><div class='del'>-						gint arg1,</div><div class='del'>-						gint arg2,</div><div class='del'>-						gpointer arg3,</div><div class='del'>-						gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__INT_INT_POINTER (GtkObject * object,</div><div class='del'>-				GtkSignalFunc func,</div><div class='del'>-				gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__INT_INT_POINTER rfunc;</div><div class='del'>-	gint *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[3]);</div><div class='del'>-	rfunc = (GtkSignal_INT__INT_INT_POINTER) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_INT     (args[0]),</div><div class='del'>-				GTK_VALUE_INT     (args[1]),</div><div class='del'>-				GTK_VALUE_POINTER (args[2]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gint (*GtkSignal_INT__INT_POINTER_INT_POINTER) (GtkObject * object,</div><div class='del'>-							gint arg1,</div><div class='del'>-							gpointer arg2,</div><div class='del'>-							gint arg3,</div><div class='del'>-							gpointer arg4,</div><div class='del'>-							gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__INT_POINTER_INT_POINTER (GtkObject * object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__INT_POINTER_INT_POINTER rfunc;</div><div class='del'>-	gint *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[4]);</div><div class='del'>-	rfunc = (GtkSignal_INT__INT_POINTER_INT_POINTER) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_INT     (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]),</div><div class='del'>-				GTK_VALUE_INT     (args[2]),</div><div class='del'>-				GTK_VALUE_POINTER (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-							      GtkObject *arg1,</div><div class='del'>-							      gdouble arg2,</div><div class='del'>-							      gdouble arg3,</div><div class='del'>-							      gboolean arg4,</div><div class='del'>-							      gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					   GtkSignalFunc func,</div><div class='del'>-					   gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	rfunc = (GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-		  GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-		  GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-		  GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gdouble (*GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-								GtkObject *arg1,</div><div class='del'>-								gdouble arg2,</div><div class='del'>-								gdouble arg3,</div><div class='del'>-								gboolean arg4,</div><div class='del'>-								gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	gdouble *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_DOUBLE (args[4]);</div><div class='del'>-	rfunc = (GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-				GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gdouble (*GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-							      GtkObject *arg1,</div><div class='del'>-							      gdouble arg2,</div><div class='del'>-							      gdouble arg3,</div><div class='del'>-							      gboolean arg4,</div><div class='del'>-							      gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	gboolean *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_BOOL (args[4]);</div><div class='del'>-	rfunc = (GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-				GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) (GtkObject * object,</div><div class='del'>-								 gint arg1, </div><div class='del'>-								 gint arg2,</div><div class='del'>-								 gpointer arg3,</div><div class='del'>-								 gpointer arg4,</div><div class='del'>-								 gint arg5,</div><div class='del'>-								 gint arg6,</div><div class='del'>-								 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-					   GtkSignalFunc func,</div><div class='del'>-					   gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[3]),</div><div class='del'>-	    GTK_VALUE_INT (args[4]), GTK_VALUE_INT (args[5]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT) (GtkObject * object,</div><div class='del'>-									 gint arg1, </div><div class='del'>-									 gpointer arg2,</div><div class='del'>-									 gint arg3,</div><div class='del'>-									 gpointer arg4,</div><div class='del'>-									 gpointer arg5,</div><div class='del'>-									 gint arg6,</div><div class='del'>-									 gint arg7,</div><div class='del'>-									 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-							 GtkSignalFunc func,</div><div class='del'>-							 gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_POINTER (args[1]), GTK_VALUE_INT (args[2]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[3]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[4]),</div><div class='del'>-	    GTK_VALUE_INT (args[5]), GTK_VALUE_INT (args[6]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT) (GtkObject * object,</div><div class='del'>-						     gint arg1, </div><div class='del'>-						     gint arg2,</div><div class='del'>-						     gpointer arg3,</div><div class='del'>-						     gint arg4, gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,</div><div class='del'>-			       GtkSignalFunc func,</div><div class='del'>-			       gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]), GTK_VALUE_INT (args[3]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_POINTER_INT_POINTER_INT) (GtkObject * object,</div><div class='del'>-							     gint arg1, </div><div class='del'>-							     gpointer arg2,</div><div class='del'>-							     gint arg3,</div><div class='del'>-							     gpointer arg4,</div><div class='del'>-							     gint arg5, gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_POINTER_INT_POINTER_INT (GtkObject * object,</div><div class='del'>-					     GtkSignalFunc func,</div><div class='del'>-					     gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_POINTER_INT_POINTER_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_POINTER_INT_POINTER_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_POINTER (args[1]), GTK_VALUE_INT (args[2]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[3]), GTK_VALUE_INT (args[4]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) (GtkObject * object,</div><div class='del'>-								 gint arg1, </div><div class='del'>-								 gint arg2,</div><div class='del'>-								 gpointer arg3,</div><div class='del'>-								 gint arg4,</div><div class='del'>-								 gint arg5,</div><div class='del'>-								 gint arg6,</div><div class='del'>-								 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,</div><div class='del'>-				       GtkSignalFunc func,</div><div class='del'>-				       gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT rfunc;</div><div class='del'>-  gboolean *return_val;</div><div class='del'>-  return_val = GTK_RETLOC_BOOL (args[6]);</div><div class='del'>-  rfunc = (GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) func;</div><div class='del'>-  *return_val = (*rfunc) (object,</div><div class='del'>-			  GTK_VALUE_INT (args[0]),</div><div class='del'>-			  GTK_VALUE_INT (args[1]), </div><div class='del'>-			  GTK_VALUE_POINTER (args[2]),</div><div class='del'>-			  GTK_VALUE_INT (args[3]),</div><div class='del'>-			  GTK_VALUE_INT (args[4]),</div><div class='del'>-			  GTK_VALUE_INT (args[5]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*GtkSignal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT) (GtkObject * object,</div><div class='del'>-									 gint arg1, </div><div class='del'>-									 gpointer arg2,</div><div class='del'>-									 gint arg3,</div><div class='del'>-									 gpointer arg4,</div><div class='del'>-									 gint arg5,</div><div class='del'>-									 gint arg6,</div><div class='del'>-									 gint arg7,</div><div class='del'>-									 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT (GtkObject * object,</div><div class='del'>-						     GtkSignalFunc func,</div><div class='del'>-						     gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT rfunc;</div><div class='del'>-  gboolean *return_val;</div><div class='del'>-  return_val = GTK_RETLOC_BOOL (args[7]);</div><div class='del'>-  rfunc = (GtkSignal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT) func;</div><div class='del'>-  *return_val = (*rfunc) (object,</div><div class='del'>-			  GTK_VALUE_INT (args[0]),</div><div class='del'>-			  GTK_VALUE_POINTER (args[1]),</div><div class='del'>-			  GTK_VALUE_INT (args[2]), </div><div class='del'>-			  GTK_VALUE_POINTER (args[3]),</div><div class='del'>-			  GTK_VALUE_INT (args[4]),</div><div class='del'>-			  GTK_VALUE_INT (args[5]),</div><div class='del'>-			  GTK_VALUE_INT (args[6]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) (GtkObject *</div><div class='del'>-									 object,</div><div class='del'>-									 gint arg1, </div><div class='del'>-									 gint arg2,</div><div class='del'>-									 gpointer</div><div class='del'>-									 arg3,</div><div class='del'>-									 gint arg4,</div><div class='del'>-									 gint arg5,</div><div class='del'>-									 gpointer</div><div class='del'>-									 arg6,</div><div class='del'>-									 gint arg7,</div><div class='del'>-									 gint arg8,</div><div class='del'>-									 gpointer</div><div class='del'>-									 user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-						   GtkSignalFunc func,</div><div class='del'>-						   gpointer func_data,</div><div class='del'>-						   GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]),</div><div class='del'>-	    GTK_VALUE_INT (args[3]),</div><div class='del'>-	    GTK_VALUE_INT (args[4]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[5]),</div><div class='del'>-	    GTK_VALUE_INT (args[6]), GTK_VALUE_INT (args[7]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT) (GtkObject *</div><div class='del'>-										 object,</div><div class='del'>-										 gint arg1, </div><div class='del'>-										 gpointer arg2,</div><div class='del'>-										 gint arg3,</div><div class='del'>-										 gpointer arg4,</div><div class='del'>-										 gint arg5,</div><div class='del'>-										 gint arg6,</div><div class='del'>-										 gpointer arg7,</div><div class='del'>-										 gint arg8,</div><div class='del'>-										 gint arg9,</div><div class='del'>-										 gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-								 GtkSignalFunc func,</div><div class='del'>-								 gpointer func_data,</div><div class='del'>-								 GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[1]),</div><div class='del'>-	    GTK_VALUE_INT (args[2]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[3]),</div><div class='del'>-	    GTK_VALUE_INT (args[4]),</div><div class='del'>-	    GTK_VALUE_INT (args[5]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[6]),</div><div class='del'>-	    GTK_VALUE_INT (args[7]), GTK_VALUE_INT (args[8]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__POINTER_POINTER_INT) (GtkObject *, gpointer,</div><div class='del'>-						     gpointer, gint, gpointer);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object, GtkSignalFunc func,</div><div class='del'>-				     gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__POINTER_POINTER_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__POINTER_POINTER_INT) func;</div><div class='del'>-  (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),</div><div class='del'>-	    GTK_VALUE_INT (args[2]), func_data);</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_POINTER_INT_POINTER) (GtkObject *, gint, gpointer,</div><div class='del'>-							 gint, gpointer, gpointer);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_POINTER_INT_POINTER (GtkObject * object, GtkSignalFunc func,</div><div class='del'>-					 gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_POINTER_INT_POINTER rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_POINTER_INT_POINTER) func;</div><div class='del'>-  (*rfunc) (object, GTK_VALUE_INT (args[0]), GTK_VALUE_POINTER (args[1]),</div><div class='del'>-	    GTK_VALUE_INT (args[2]), GTK_VALUE_POINTER (args[3]), func_data);</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__POINTER_POINTER_POINTER_POINTER) (GtkObject *,</div><div class='del'>-								 gpointer, gpointer, gpointer, gpointer,</div><div class='del'>-								 gpointer);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__POINTER_POINTER_POINTER_POINTER (GtkObject         *object,</div><div class='del'>-						 GtkSignalFunc      func,</div><div class='del'>-						 gpointer           func_data,</div><div class='del'>-						 GtkArg            *args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__POINTER_POINTER_POINTER_POINTER rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__POINTER_POINTER_POINTER_POINTER) func;</div><div class='del'>-  (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[2]), GTK_VALUE_POINTER (args[3]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*GtkSignal_INT__POINTER_POINTER) (GtkObject *,</div><div class='del'>-					       gpointer, gpointer, </div><div class='del'>-					       gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__POINTER_POINTER (GtkObject *object,</div><div class='del'>-				GtkSignalFunc func,</div><div class='del'>-				gpointer func_data,</div><div class='del'>-				GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__POINTER_POINTER rfunc;</div><div class='del'>-	int *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_INT__POINTER_POINTER) func;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[2]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_POINTER (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]), </div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*GtkSignal_INT__POINTER_POINTER_POINTER) (GtkObject *,</div><div class='del'>-						       gpointer, gpointer, gpointer, </div><div class='del'>-						       gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__POINTER_POINTER_POINTER (GtkObject *object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data,</div><div class='del'>-					GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__POINTER_POINTER_POINTER rfunc;</div><div class='del'>-	int *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_INT__POINTER_POINTER_POINTER) func;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[3]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_POINTER (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]), </div><div class='del'>-				GTK_VALUE_POINTER (args[2]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*GtkSignal_INT__POINTER_POINTER_POINTER_POINTER) (GtkObject *,</div><div class='del'>-							       gpointer, gpointer, gpointer, gpointer,</div><div class='del'>-							       gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__POINTER_POINTER_POINTER_POINTER (GtkObject *object,</div><div class='del'>-						GtkSignalFunc func,</div><div class='del'>-						gpointer func_data,</div><div class='del'>-						GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__POINTER_POINTER_POINTER_POINTER rfunc;</div><div class='del'>-	int *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_INT__POINTER_POINTER_POINTER_POINTER) func;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[4]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_POINTER (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]), </div><div class='del'>-				GTK_VALUE_POINTER (args[2]),</div><div class='del'>-				GTK_VALUE_POINTER (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef int (*GtkSignal_INT__POINTER_POINTER_POINTER_POINTER_POINTER) (GtkObject *,</div><div class='del'>-								       gpointer, gpointer, gpointer, gpointer, gpointer,</div><div class='del'>-								       gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER (GtkObject *object,</div><div class='del'>-							GtkSignalFunc func,</div><div class='del'>-							gpointer func_data,</div><div class='del'>-							GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__POINTER_POINTER_POINTER_POINTER_POINTER rfunc;</div><div class='del'>-	int *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_INT__POINTER_POINTER_POINTER_POINTER_POINTER) func;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[4]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_POINTER (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]), </div><div class='del'>-				GTK_VALUE_POINTER (args[2]),</div><div class='del'>-				GTK_VALUE_POINTER (args[3]),</div><div class='del'>-				GTK_VALUE_POINTER (args[4]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__POINTER_POINTER_POINTER_BOOL) (GtkObject *,</div><div class='del'>-							      gpointer, gpointer, gpointer, gboolean,</div><div class='del'>-							      gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__POINTER_POINTER_POINTER_BOOL (GtkObject *object,</div><div class='del'>-					      GtkSignalFunc func,</div><div class='del'>-					      gpointer func_data,</div><div class='del'>-					      GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__POINTER_POINTER_POINTER_BOOL rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_NONE__POINTER_POINTER_POINTER_BOOL) func;</div><div class='del'>-</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_POINTER (args[0]),</div><div class='del'>-		  GTK_VALUE_POINTER (args[1]), </div><div class='del'>-		  GTK_VALUE_POINTER (args[2]),</div><div class='del'>-		  GTK_VALUE_BOOL (args[3]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__POINTER_INT_INT_INT (GtkObject       *object,</div><div class='del'>-				     GtkSignalFunc    func,</div><div class='del'>-				     gpointer         func_data,</div><div class='del'>-				     GtkArg          *args)</div><div class='del'>-{</div><div class='del'>-        (* (void (*)(GtkObject *, gpointer, int, int, int, gpointer)) func)</div><div class='del'>-                (object,</div><div class='del'>-		 GTK_VALUE_POINTER (args[0]),</div><div class='del'>-                 GTK_VALUE_INT (args[1]),</div><div class='del'>-                 GTK_VALUE_INT (args[2]),</div><div class='del'>-                 </div><div class='del'>-                 GTK_VALUE_INT (args[3]),</div><div class='del'>-                 func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef int (*GtkSignal_INT__OBJECT_POINTER) (GtkObject *,</div><div class='del'>-					      GtkObject *, gpointer,</div><div class='del'>-					      gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__OBJECT_POINTER (GtkObject *object,</div><div class='del'>-			       GtkSignalFunc func,</div><div class='del'>-			       gpointer func_data,</div><div class='del'>-			       GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__OBJECT_POINTER rfunc;</div><div class='del'>-	int *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_INT__OBJECT_POINTER) func;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[2]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_OBJECT  (args[0]),</div><div class='del'>-				GTK_VALUE_POINTER (args[1]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__DOUBLE) (GtkObject *,</div><div class='del'>-				       gdouble,</div><div class='del'>-				       gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__DOUBLE (GtkObject *object,</div><div class='del'>-			GtkSignalFunc func,</div><div class='del'>-			gpointer func_data,</div><div class='del'>-			GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__DOUBLE rfunc;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_NONE__DOUBLE) func;</div><div class='del'>-</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_DOUBLE (args[0]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*GtkSignal_BOOL__STRING_INT) (GtkObject *,</div><div class='del'>-						char *,</div><div class='del'>-						gint,</div><div class='del'>-						gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__STRING_INT (GtkObject *object,</div><div class='del'>-			    GtkSignalFunc func,</div><div class='del'>-			    gpointer func_data,</div><div class='del'>-			    GtkArg *args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_BOOL__STRING_INT rfunc;</div><div class='del'>-	gboolean *return_val;</div><div class='del'>-</div><div class='del'>-	rfunc = (GtkSignal_BOOL__STRING_INT) func;</div><div class='del'>-	return_val = GTK_RETLOC_BOOL (args[2]);</div><div class='del'>-</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_STRING  (args[0]),</div><div class='del'>-				GTK_VALUE_INT (args[1]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar**</div><div class='del'>-e_strsplit (const gchar *string,</div><div class='del'>-	    const gchar *delimiter,</div><div class='del'>-	    gint         max_tokens)</div><div class='del'>-{</div><div class='del'>-  GSList *string_list = NULL, *slist;</div><div class='del'>-  gchar **str_array, *s;</div><div class='del'>-  guint i, n = 1;</div><div class='del'>-</div><div class='del'>-  g_return_val_if_fail (string != NULL, NULL);</div><div class='del'>-  g_return_val_if_fail (delimiter != NULL, NULL);</div><div class='del'>-</div><div class='del'>-  if (max_tokens &lt; 1)</div><div class='del'>-    max_tokens = G_MAXINT;</div><div class='del'>-</div><div class='del'>-  s = strstr (string, delimiter);</div><div class='del'>-  if (s)</div><div class='del'>-    {</div><div class='del'>-      guint delimiter_len = strlen (delimiter);</div><div class='del'>-</div><div class='del'>-      do</div><div class='del'>-	{</div><div class='del'>-	  guint len;</div><div class='del'>-	  gchar *new_string;</div><div class='del'>-</div><div class='del'>-	  len = s - string;</div><div class='del'>-	  new_string = g_new (gchar, len + 1);</div><div class='del'>-	  strncpy (new_string, string, len);</div><div class='del'>-	  new_string[len] = 0;</div><div class='del'>-	  string_list = g_slist_prepend (string_list, new_string);</div><div class='del'>-	  n++;</div><div class='del'>-	  string = s + delimiter_len;</div><div class='del'>-	  s = strstr (string, delimiter);</div><div class='del'>-	}</div><div class='del'>-      while (--max_tokens &amp;&amp; s);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  n++;</div><div class='del'>-  string_list = g_slist_prepend (string_list, g_strdup (string));</div><div class='del'>-</div><div class='del'>-  str_array = g_new (gchar*, n);</div><div class='del'>-</div><div class='del'>-  i = n - 1;</div><div class='del'>-</div><div class='del'>-  str_array[i--] = NULL;</div><div class='del'>-  for (slist = string_list; slist; slist = slist-&gt;next)</div><div class='del'>-    str_array[i--] = slist-&gt;data;</div><div class='del'>-</div><div class='del'>-  g_slist_free (string_list);</div><div class='del'>-</div><div class='del'>-  return str_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_strstrcase (const gchar *haystack, const gchar *needle)</div><div class='del'>-{</div><div class='del'>-	/* find the needle in the haystack neglecting case */</div><div class='del'>-	const gchar *ptr;</div><div class='del'>-	guint len;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (haystack != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (needle != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	len = strlen(needle);</div><div class='del'>-	if (len &gt; strlen(haystack))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return (gchar *) haystack;</div><div class='del'>-</div><div class='del'>-	for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)</div><div class='del'>-		if (!g_strncasecmp (ptr, needle, len))</div><div class='del'>-			return (gchar *) ptr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This only makes a filename safe for usage as a filename.  It still may have shell meta-characters in it. */</div><div class='del'>-void</div><div class='del'>-e_filename_make_safe (gchar *string)</div><div class='del'>-{</div><div class='del'>-	gchar *p;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (string != NULL);</div><div class='del'>-	</div><div class='del'>-	for (p = string; *p; p++) {</div><div class='del'>-		if (!isprint ((unsigned char)*p) || strchr (" /'\"`&amp;();|&lt;&gt;${}!", *p))</div><div class='del'>-			*p = '_';</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-epow10 (gint number) {</div><div class='del'>-	gint value;</div><div class='del'>-</div><div class='del'>-	for (value = 1; number &gt; 0; number --) {</div><div class='del'>-		value *= 10;</div><div class='del'>-	}</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_format_number (gint number)</div><div class='del'>-{</div><div class='del'>-	GList *iterator, *list = NULL;</div><div class='del'>-	struct lconv *locality;</div><div class='del'>-	gint char_length = 0;</div><div class='del'>-	gint group_count = 0;</div><div class='del'>-	guchar *grouping;</div><div class='del'>-	int last_count = 3;</div><div class='del'>-	int divider;</div><div class='del'>-	char *value;</div><div class='del'>-	char *value_iterator;</div><div class='del'>-</div><div class='del'>-	locality = localeconv();</div><div class='del'>-	grouping = locality-&gt;grouping;</div><div class='del'>-	while (number) {</div><div class='del'>-		char *group;</div><div class='del'>-		switch (*grouping) {</div><div class='del'>-		default:</div><div class='del'>-			last_count = *grouping;</div><div class='del'>-			grouping++;</div><div class='del'>-		case 0:</div><div class='del'>-			divider = epow10(last_count);</div><div class='del'>-			if (number &gt;= divider) {</div><div class='del'>-				group = g_strdup_printf("%0*d", last_count, number % divider);</div><div class='del'>-			} else {</div><div class='del'>-				group = g_strdup_printf("%d", number % divider);</div><div class='del'>-			}</div><div class='del'>-			number /= divider;</div><div class='del'>-			break;</div><div class='del'>-		case CHAR_MAX:</div><div class='del'>-			group = g_strdup_printf("%d", number);</div><div class='del'>-			number = 0;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		char_length += strlen(group);</div><div class='del'>-		list = g_list_prepend(list, group);</div><div class='del'>-		group_count ++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (list) {</div><div class='del'>-		value = g_new(char, 1 + char_length + (group_count - 1) * strlen(locality-&gt;thousands_sep));</div><div class='del'>-</div><div class='del'>-		iterator = list;</div><div class='del'>-		value_iterator = value;</div><div class='del'>-</div><div class='del'>-		strcpy(value_iterator, iterator-&gt;data);</div><div class='del'>-		value_iterator += strlen(iterator-&gt;data);</div><div class='del'>-		for (iterator = iterator-&gt;next; iterator; iterator = iterator-&gt;next) {</div><div class='del'>-			strcpy(value_iterator, locality-&gt;thousands_sep);</div><div class='del'>-			value_iterator += strlen(locality-&gt;thousands_sep);</div><div class='del'>-</div><div class='del'>-			strcpy(value_iterator, iterator-&gt;data);</div><div class='del'>-			value_iterator += strlen(iterator-&gt;data);</div><div class='del'>-		}</div><div class='del'>-		e_free_string_list (list);</div><div class='del'>-		return value;</div><div class='del'>-	} else {</div><div class='del'>-		return g_strdup("0");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-do_format_number_as_float (double number)</div><div class='del'>-{</div><div class='del'>-	GList *iterator, *list = NULL;</div><div class='del'>-	struct lconv *locality;</div><div class='del'>-	gint char_length = 0;</div><div class='del'>-	gint group_count = 0;</div><div class='del'>-	guchar *grouping;</div><div class='del'>-	int last_count = 3;</div><div class='del'>-	int divider;</div><div class='del'>-	char *value;</div><div class='del'>-	char *value_iterator;</div><div class='del'>-	double fractional;</div><div class='del'>-</div><div class='del'>-	locality = localeconv();</div><div class='del'>-	grouping = locality-&gt;grouping;</div><div class='del'>-	while (number &gt;= 1.0) {</div><div class='del'>-		char *group;</div><div class='del'>-		switch (*grouping) {</div><div class='del'>-		default:</div><div class='del'>-			last_count = *grouping;</div><div class='del'>-			grouping++;</div><div class='del'>-			/* Fall through */</div><div class='del'>-		case 0:</div><div class='del'>-			divider = epow10(last_count);</div><div class='del'>-			number /= divider;</div><div class='del'>-			fractional = modf (number, &amp;number);</div><div class='del'>-			fractional *= divider;</div><div class='del'>-			fractional = floor (fractional);</div><div class='del'>-</div><div class='del'>-			if (number &gt;= 1.0) {</div><div class='del'>-				group = g_strdup_printf("%0*d", last_count, (int) fractional);</div><div class='del'>-			} else {</div><div class='del'>-				group = g_strdup_printf("%d", (int) fractional);</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case CHAR_MAX:</div><div class='del'>-			divider = epow10(last_count);</div><div class='del'>-			number /= divider;</div><div class='del'>-			fractional = modf (number, &amp;number);</div><div class='del'>-			fractional *= divider;</div><div class='del'>-			fractional = floor (fractional);</div><div class='del'>-</div><div class='del'>-			while (number &gt;= 1.0) {</div><div class='del'>-				group = g_strdup_printf("%0*d", last_count, (int) fractional);</div><div class='del'>-</div><div class='del'>-				char_length += strlen(group);</div><div class='del'>-				list = g_list_prepend(list, group);</div><div class='del'>-				group_count ++;</div><div class='del'>-</div><div class='del'>-				divider = epow10(last_count);</div><div class='del'>-				number /= divider;</div><div class='del'>-				fractional = modf (number, &amp;number);</div><div class='del'>-				fractional *= divider;</div><div class='del'>-				fractional = floor (fractional);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			group = g_strdup_printf("%d", (int) fractional);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		char_length += strlen(group);</div><div class='del'>-		list = g_list_prepend(list, group);</div><div class='del'>-		group_count ++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (list) {</div><div class='del'>-		value = g_new(char, 1 + char_length + (group_count - 1) * strlen(locality-&gt;thousands_sep));</div><div class='del'>-</div><div class='del'>-		iterator = list;</div><div class='del'>-		value_iterator = value;</div><div class='del'>-</div><div class='del'>-		strcpy(value_iterator, iterator-&gt;data);</div><div class='del'>-		value_iterator += strlen(iterator-&gt;data);</div><div class='del'>-		for (iterator = iterator-&gt;next; iterator; iterator = iterator-&gt;next) {</div><div class='del'>-			strcpy(value_iterator, locality-&gt;thousands_sep);</div><div class='del'>-			value_iterator += strlen(locality-&gt;thousands_sep);</div><div class='del'>-</div><div class='del'>-			strcpy(value_iterator, iterator-&gt;data);</div><div class='del'>-			value_iterator += strlen(iterator-&gt;data);</div><div class='del'>-		}</div><div class='del'>-		e_free_string_list (list);</div><div class='del'>-		return value;</div><div class='del'>-	} else {</div><div class='del'>-		return g_strdup("0");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_format_number_float (gfloat number)</div><div class='del'>-{</div><div class='del'>-	gfloat          int_part;</div><div class='del'>-	gint            fraction;</div><div class='del'>-	struct lconv   *locality;</div><div class='del'>-	gchar          *str_intpart;</div><div class='del'>-	gchar          *decimal_point;</div><div class='del'>-	gchar          *str_fraction;</div><div class='del'>-	gchar          *value;</div><div class='del'>-</div><div class='del'>-	locality = localeconv();</div><div class='del'>-	</div><div class='del'>-	int_part = floor (number);</div><div class='del'>-	str_intpart = do_format_number_as_float ((double) int_part);</div><div class='del'>-</div><div class='del'>-	if (!strcmp(locality-&gt;mon_decimal_point, "")) {</div><div class='del'>-		decimal_point = ".";</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		decimal_point = locality-&gt;mon_decimal_point;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fraction = (int) ((number - int_part) * 100);</div><div class='del'>-</div><div class='del'>-	if (fraction == 0) {</div><div class='del'>-		str_fraction = g_strdup ("00");</div><div class='del'>-	} else {</div><div class='del'>-		str_fraction = g_strdup_printf ("%02d", fraction);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	value = g_strconcat (str_intpart, decimal_point, str_fraction, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (str_intpart);</div><div class='del'>-	g_free (str_fraction);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_create_directory (gchar *directory)</div><div class='del'>-{</div><div class='del'>-	gint ret_val = e_mkdir_hier (directory, 0777);</div><div class='del'>-	if (ret_val == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-	else</div><div class='del'>-		return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Perform a binary search for key in base which has nmemb elements</div><div class='del'>-   of size bytes each.  The comparisons are done by (*compare)().  */</div><div class='del'>-void      e_bsearch                                                        (const void       *key,</div><div class='del'>-									    const void       *base,</div><div class='del'>-									    size_t            nmemb,</div><div class='del'>-									    size_t            size,</div><div class='del'>-									    ESortCompareFunc  compare,</div><div class='del'>-									    gpointer          closure,</div><div class='del'>-									    size_t	     *start,</div><div class='del'>-									    size_t	     *end)</div><div class='del'>-{</div><div class='del'>-	size_t l, u, idx;</div><div class='del'>-	const void *p;</div><div class='del'>-	int comparison;</div><div class='del'>-	if (!(start || end))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	l = 0;</div><div class='del'>-	u = nmemb;</div><div class='del'>-	while (l &lt; u) {</div><div class='del'>-		idx = (l + u) / 2;</div><div class='del'>-		p = (void *) (((const char *) base) + (idx * size));</div><div class='del'>-		comparison = (*compare) (key, p, closure);</div><div class='del'>-		if (comparison &lt; 0)</div><div class='del'>-			u = idx;</div><div class='del'>-		else if (comparison &gt; 0)</div><div class='del'>-			l = idx + 1;</div><div class='del'>-		else {</div><div class='del'>-			size_t lsave, usave;</div><div class='del'>-			lsave = l;</div><div class='del'>-			usave = u;</div><div class='del'>-			if (start) {</div><div class='del'>-				while (l &lt; u) {</div><div class='del'>-					idx = (l + u) / 2;</div><div class='del'>-					p = (void *) (((const char *) base) + (idx * size));</div><div class='del'>-					comparison = (*compare) (key, p, closure);</div><div class='del'>-					if (comparison &lt;= 0)</div><div class='del'>-						u = idx;</div><div class='del'>-					else</div><div class='del'>-						l = idx + 1;</div><div class='del'>-				}</div><div class='del'>-				*start = l;</div><div class='del'>-				</div><div class='del'>-				l = lsave;</div><div class='del'>-				u = usave;</div><div class='del'>-			}</div><div class='del'>-			if (end) {</div><div class='del'>-				while (l &lt; u) {</div><div class='del'>-					idx = (l + u) / 2;</div><div class='del'>-					p = (void *) (((const char *) base) + (idx * size));</div><div class='del'>-					comparison = (*compare) (key, p, closure);</div><div class='del'>-					if (comparison &lt; 0)</div><div class='del'>-						u = idx;</div><div class='del'>-					else</div><div class='del'>-						l = idx + 1;</div><div class='del'>-				}</div><div class='del'>-				*end = l;</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start)</div><div class='del'>-		*start = l;</div><div class='del'>-	if (end)</div><div class='del'>-		*end = l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gpointer closure_closure;</div><div class='del'>-static ESortCompareFunc compare_closure;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-qsort_callback(const void *data1, const void *data2)</div><div class='del'>-{</div><div class='del'>-	return (*compare_closure) (data1, data2, closure_closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Forget it.  We're just going to use qsort.  I lost the need for a stable sort. */</div><div class='del'>-void</div><div class='del'>-e_sort (void             *base,</div><div class='del'>-	size_t            nmemb,</div><div class='del'>-	size_t            size,</div><div class='del'>-	ESortCompareFunc  compare,</div><div class='del'>-	gpointer          closure)</div><div class='del'>-{</div><div class='del'>-	closure_closure = closure;</div><div class='del'>-	compare_closure = compare;</div><div class='del'>-	qsort(base, nmemb, size, qsort_callback);</div><div class='del'>-#if 0</div><div class='del'>-	void *base_copy;</div><div class='del'>-	int i;</div><div class='del'>-	base_copy = g_malloc(nmemb * size);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; nmemb; i++) {</div><div class='del'>-		int position;</div><div class='del'>-		e_bsearch(base + (i * size), base_copy, i, size, compare, closure, NULL, &amp;position);</div><div class='del'>-		memmove(base_copy + (position + 1) * size, base_copy + position * size, (i - position) * size);</div><div class='del'>-		memcpy(base_copy + position * size, base + i * size, size);</div><div class='del'>-	}</div><div class='del'>-	memcpy(base, base_copy, nmemb * size);</div><div class='del'>-	g_free(base_copy);</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-size_t e_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)</div><div class='del'>-{</div><div class='del'>-#ifdef HAVE_LKSTRFTIME</div><div class='del'>-	return strftime(s, max, fmt, tm);</div><div class='del'>-#else</div><div class='del'>-	char *c, *ffmt, *ff;</div><div class='del'>-	size_t ret;</div><div class='del'>-</div><div class='del'>-	ffmt = g_strdup(fmt);</div><div class='del'>-	ff = ffmt;</div><div class='del'>-	while ((c = strstr(ff, "%l")) != NULL) {</div><div class='del'>-		c[1] = 'I';</div><div class='del'>-		ff = c;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ff = fmt;</div><div class='del'>-	while ((c = strstr(ff, "%k")) != NULL) {</div><div class='del'>-		c[1] = 'H';</div><div class='del'>-		ff = c;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret = strftime(s, max, ffmt, tm);</div><div class='del'>-	g_free(ffmt);</div><div class='del'>-	return ret;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * Function to do a last minute fixup of the AM/PM stuff if the locale</div><div class='del'>- * and gettext haven't done it right. Most English speaking countries</div><div class='del'>- * except the USA use the 24 hour clock (UK, Australia etc). However</div><div class='del'>- * since they are English nobody bothers to write a language</div><div class='del'>- * translation (gettext) file. So the locale turns off the AM/PM, but</div><div class='del'>- * gettext does not turn on the 24 hour clock. Leaving a mess.</div><div class='del'>- *</div><div class='del'>- * This routine checks if AM/PM are defined in the locale, if not it</div><div class='del'>- * forces the use of the 24 hour clock.</div><div class='del'>- *</div><div class='del'>- * The function itself is a front end on strftime and takes exactly</div><div class='del'>- * the same arguments.</div><div class='del'>- *</div><div class='del'>- * TODO: Actually remove the '%p' from the fixed up string so that</div><div class='del'>- * there isn't a stray space.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-size_t e_strftime_fix_am_pm(char *s, size_t max, const char *fmt, const struct tm *tm)</div><div class='del'>-{</div><div class='del'>-	char buf[10];</div><div class='del'>-	char *sp;</div><div class='del'>-	char *ffmt;</div><div class='del'>-	size_t ret;</div><div class='del'>-</div><div class='del'>-	if (strstr(fmt, "%p")==NULL &amp;&amp; strstr(fmt, "%P")==NULL) {</div><div class='del'>-		/* No AM/PM involved - can use the fmt string directly */</div><div class='del'>-		ret=e_strftime(s, max, fmt, tm);</div><div class='del'>-	} else {</div><div class='del'>-		/* Get the AM/PM symbol from the locale */</div><div class='del'>-		e_strftime (buf, 10, "%p", tm);</div><div class='del'>-</div><div class='del'>-		if (buf[0]) {</div><div class='del'>-			/**</div><div class='del'>-			 * AM/PM have been defined in the locale</div><div class='del'>-			 * so we can use the fmt string directly</div><div class='del'>-			 **/</div><div class='del'>-			ret=e_strftime(s, max, fmt, tm);</div><div class='del'>-		} else {</div><div class='del'>-			/**</div><div class='del'>-			 * No AM/PM defined by locale</div><div class='del'>-			 * must change to 24 hour clock</div><div class='del'>-			 **/</div><div class='del'>-			ffmt=g_strdup(fmt);</div><div class='del'>-			for (sp=ffmt; (sp=strstr(sp, "%l")); sp++) {</div><div class='del'>-				/**</div><div class='del'>-				 * Maybe this should be 'k', but I have never</div><div class='del'>-				 * seen a 24 clock actually use that format</div><div class='del'>-				 **/</div><div class='del'>-				sp[1]='H';</div><div class='del'>-			}</div><div class='del'>-			for (sp=ffmt; (sp=strstr(sp, "%I")); sp++) {</div><div class='del'>-				sp[1]='H';</div><div class='del'>-			}</div><div class='del'>-			ret=e_strftime(s, max, ffmt, tm);</div><div class='del'>-			g_free(ffmt);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return(ret);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_flexible_strtod:</div><div class='del'>- * @nptr:    the string to convert to a numeric value.</div><div class='del'>- * @endptr:  if non-NULL, it returns the character after</div><div class='del'>- *           the last character used in the conversion.</div><div class='del'>- * </div><div class='del'>- * Converts a string to a gdouble value.  This function detects</div><div class='del'>- * strings either in the standard C locale or in the current locale.</div><div class='del'>- *</div><div class='del'>- * This function is typically used when reading configuration files or</div><div class='del'>- * other non-user input that should not be locale dependent, but may</div><div class='del'>- * have been in the past.  To handle input from the user you should</div><div class='del'>- * normally use the locale-sensitive system strtod function.</div><div class='del'>- *</div><div class='del'>- * To convert from a double to a string in a locale-insensitive way, use</div><div class='del'>- * @g_ascii_dtostr.</div><div class='del'>- * </div><div class='del'>- * Return value: the gdouble value.</div><div class='del'>- **/</div><div class='del'>-gdouble</div><div class='del'>-e_flexible_strtod (const gchar *nptr,</div><div class='del'>-		   gchar      **endptr)</div><div class='del'>-{</div><div class='del'>-	gchar *fail_pos;</div><div class='del'>-	gdouble val;</div><div class='del'>-	struct lconv *locale_data;</div><div class='del'>-	const char *decimal_point;</div><div class='del'>-	int decimal_point_len;</div><div class='del'>-	const char *p, *decimal_point_pos;</div><div class='del'>-	const char *end = NULL; /* Silence gcc */</div><div class='del'>-	char *copy, *c;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (nptr != NULL, 0);</div><div class='del'>-</div><div class='del'>-	fail_pos = NULL;</div><div class='del'>-</div><div class='del'>-	locale_data = localeconv ();</div><div class='del'>-	decimal_point = locale_data-&gt;decimal_point;</div><div class='del'>-	decimal_point_len = strlen (decimal_point);</div><div class='del'>-</div><div class='del'>-	g_assert (decimal_point_len != 0);</div><div class='del'>-</div><div class='del'>-	decimal_point_pos = NULL;</div><div class='del'>-	if (!strcmp (decimal_point, "."))</div><div class='del'>-		return strtod (nptr, endptr);</div><div class='del'>-</div><div class='del'>-	p = nptr;</div><div class='del'>-</div><div class='del'>-	/* Skip leading space */</div><div class='del'>-	while (isspace ((guchar)*p))</div><div class='del'>-		p++;</div><div class='del'>-</div><div class='del'>-	/* Skip leading optional sign */</div><div class='del'>-	if (*p == '+' || *p == '-')</div><div class='del'>-		p++;</div><div class='del'>-</div><div class='del'>-	if (p[0] == '0' &amp;&amp;</div><div class='del'>-	    (p[1] == 'x' || p[1] == 'X')) {</div><div class='del'>-		p += 2;</div><div class='del'>-		/* HEX - find the (optional) decimal point */</div><div class='del'>-</div><div class='del'>-		while (isxdigit ((guchar)*p))</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		if (*p == '.') {</div><div class='del'>-			decimal_point_pos = p++;</div><div class='del'>-             </div><div class='del'>-			while (isxdigit ((guchar)*p))</div><div class='del'>-				p++;</div><div class='del'>-             </div><div class='del'>-			if (*p == 'p' || *p == 'P')</div><div class='del'>-				p++;</div><div class='del'>-			if (*p == '+' || *p == '-')</div><div class='del'>-				p++;</div><div class='del'>-			while (isdigit ((guchar)*p))</div><div class='del'>-				p++;</div><div class='del'>-			end = p;</div><div class='del'>-		} else if (strncmp (p, decimal_point, decimal_point_len) == 0) {</div><div class='del'>-			return strtod (nptr, endptr);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		while (isdigit ((guchar)*p))</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		if (*p == '.') {</div><div class='del'>-			decimal_point_pos = p++;</div><div class='del'>-</div><div class='del'>-			while (isdigit ((guchar)*p))</div><div class='del'>-				p++;</div><div class='del'>-</div><div class='del'>-			if (*p == 'e' || *p == 'E')</div><div class='del'>-				p++;</div><div class='del'>-			if (*p == '+' || *p == '-')</div><div class='del'>-				p++;</div><div class='del'>-			while (isdigit ((guchar)*p))</div><div class='del'>-				p++;</div><div class='del'>-			end = p;</div><div class='del'>-		} else if (strncmp (p, decimal_point, decimal_point_len) == 0) {</div><div class='del'>-			return strtod (nptr, endptr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	/* For the other cases, we need not convert the decimal point */</div><div class='del'>-  </div><div class='del'>-	if (!decimal_point_pos)</div><div class='del'>-		return strtod (nptr, endptr);</div><div class='del'>-</div><div class='del'>-	/* We need to convert the '.' to the locale specific decimal point */</div><div class='del'>-	copy = g_malloc (end - nptr + 1 + decimal_point_len);</div><div class='del'>-</div><div class='del'>-	c = copy;</div><div class='del'>-	memcpy (c, nptr, decimal_point_pos - nptr);</div><div class='del'>-	c += decimal_point_pos - nptr;</div><div class='del'>-	memcpy (c, decimal_point, decimal_point_len);</div><div class='del'>-	c += decimal_point_len;</div><div class='del'>-	memcpy (c, decimal_point_pos + 1, end - (decimal_point_pos + 1));</div><div class='del'>-	c += end - (decimal_point_pos + 1);</div><div class='del'>-	*c = 0;</div><div class='del'>-</div><div class='del'>-	val = strtod (copy, &amp;fail_pos);</div><div class='del'>-</div><div class='del'>-	if (fail_pos) {</div><div class='del'>-		if (fail_pos &gt; decimal_point_pos)</div><div class='del'>-			fail_pos = (char *)nptr + (fail_pos - copy) - (decimal_point_len - 1);</div><div class='del'>-		else</div><div class='del'>-			fail_pos = (char *)nptr + (fail_pos - copy);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (copy);</div><div class='del'>-</div><div class='del'>-	if (endptr)</div><div class='del'>-		*endptr = fail_pos;</div><div class='del'>-</div><div class='del'>-	return val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_ascii_dtostr:</div><div class='del'>- * @buffer: A buffer to place the resulting string in</div><div class='del'>- * @buf_len: The length of the buffer.</div><div class='del'>- * @format: The printf-style format to use for the</div><div class='del'>- *          code to use for converting. </div><div class='del'>- * @d: The double to convert</div><div class='del'>- *</div><div class='del'>- * Converts a double to a string, using the '.' as</div><div class='del'>- * decimal_point. To format the number you pass in</div><div class='del'>- * a printf-style formating string. Allowed conversion</div><div class='del'>- * specifiers are eEfFgG. </div><div class='del'>- * </div><div class='del'>- * If you want to generates enough precision that converting</div><div class='del'>- * the string back using @g_strtod gives the same machine-number</div><div class='del'>- * (on machines with IEEE compatible 64bit doubles) use the format</div><div class='del'>- * string "%.17g". If you do this it is guaranteed that the size</div><div class='del'>- * of the resulting string will never be larger than</div><div class='del'>- * @G_ASCII_DTOSTR_BUF_SIZE bytes.</div><div class='del'>- *</div><div class='del'>- * Return value: The pointer to the buffer with the converted string.</div><div class='del'>- **/</div><div class='del'>-gchar *</div><div class='del'>-e_ascii_dtostr (gchar       *buffer,</div><div class='del'>-		gint         buf_len,</div><div class='del'>-		const gchar *format,</div><div class='del'>-		gdouble      d)</div><div class='del'>-{</div><div class='del'>-	struct lconv *locale_data;</div><div class='del'>-	const char *decimal_point;</div><div class='del'>-	int decimal_point_len;</div><div class='del'>-	gchar *p;</div><div class='del'>-	int rest_len;</div><div class='del'>-	gchar format_char;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (buffer != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (format[0] == '%', NULL);</div><div class='del'>-	g_return_val_if_fail (strpbrk (format + 1, "'l%") == NULL, NULL);</div><div class='del'>- </div><div class='del'>-	format_char = format[strlen (format) - 1];</div><div class='del'>-  </div><div class='del'>-	g_return_val_if_fail (format_char == 'e' || format_char == 'E' ||</div><div class='del'>-			      format_char == 'f' || format_char == 'F' ||</div><div class='del'>-			      format_char == 'g' || format_char == 'G',</div><div class='del'>-			      NULL);</div><div class='del'>-</div><div class='del'>-	if (format[0] != '%')</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (strpbrk (format + 1, "'l%"))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!(format_char == 'e' || format_char == 'E' ||</div><div class='del'>-	      format_char == 'f' || format_char == 'F' ||</div><div class='del'>-	      format_char == 'g' || format_char == 'G'))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_snprintf (buffer, buf_len, format, d);</div><div class='del'>-</div><div class='del'>-	locale_data = localeconv ();</div><div class='del'>-	decimal_point = locale_data-&gt;decimal_point;</div><div class='del'>-	decimal_point_len = strlen (decimal_point);</div><div class='del'>-</div><div class='del'>-	g_assert (decimal_point_len != 0);</div><div class='del'>-</div><div class='del'>-	if (strcmp (decimal_point, ".")) {</div><div class='del'>-		p = buffer;</div><div class='del'>-</div><div class='del'>-		if (*p == '+' || *p == '-')</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		while (isdigit ((guchar)*p))</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		if (strncmp (p, decimal_point, decimal_point_len) == 0) {</div><div class='del'>-			*p = '.';</div><div class='del'>-			p++;</div><div class='del'>-			if (decimal_point_len &gt; 1) {</div><div class='del'>-				rest_len = strlen (p + (decimal_point_len-1));</div><div class='del'>-				memmove (p, p + (decimal_point_len-1),</div><div class='del'>-					 rest_len);</div><div class='del'>-				p[rest_len] = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_strdup_append_strings (gchar *first_string, ...)</div><div class='del'>-{</div><div class='del'>-	gchar *buffer;</div><div class='del'>-	gchar *current;</div><div class='del'>-	gint length;</div><div class='del'>-	va_list args1;</div><div class='del'>-	va_list args2;</div><div class='del'>-	char *v_string;</div><div class='del'>-	int v_int;</div><div class='del'>-</div><div class='del'>-	va_start (args1, first_string);</div><div class='del'>-	G_VA_COPY (args2, args1);</div><div class='del'>-</div><div class='del'>-	length = 0;</div><div class='del'>-</div><div class='del'>-	v_string = first_string;</div><div class='del'>-	while (v_string) {</div><div class='del'>-		v_int = va_arg (args1, int);</div><div class='del'>-		if (v_int &gt;= 0)</div><div class='del'>-			length += v_int;</div><div class='del'>-		else</div><div class='del'>-			length += strlen (v_string);</div><div class='del'>-		v_string = va_arg (args1, char *);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	buffer  = g_new (char, length + 1);</div><div class='del'>-	current = buffer;</div><div class='del'>-</div><div class='del'>-	v_string = first_string;</div><div class='del'>-	while (v_string) {</div><div class='del'>-		v_int = va_arg (args2, int);</div><div class='del'>-		if (v_int &lt; 0) {</div><div class='del'>-			int i;</div><div class='del'>-			for (i = 0; v_string[i]; i++) {</div><div class='del'>-				*(current++) = v_string[i];</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			int i;</div><div class='del'>-			for (i = 0; v_string[i] &amp;&amp; i &lt; v_int; i++) {</div><div class='del'>-				*(current++) = v_string[i];</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		v_string = va_arg (args2, char *);</div><div class='del'>-	}</div><div class='del'>-	*(current++) = 0;</div><div class='del'>-</div><div class='del'>-	va_end (args1);</div><div class='del'>-	va_end (args2);</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar **</div><div class='del'>-e_strdupv (const gchar **str_array)</div><div class='del'>-{</div><div class='del'>-	if (str_array) {</div><div class='del'>-		gint i;</div><div class='del'>-		gchar **retval;</div><div class='del'>-</div><div class='del'>-		i = 0;</div><div class='del'>-		while (str_array[i])</div><div class='del'>-			i++;</div><div class='del'>-          </div><div class='del'>-		retval = g_new (gchar*, i + 1);</div><div class='del'>-</div><div class='del'>-		i = 0;</div><div class='del'>-		while (str_array[i]) {</div><div class='del'>-			retval[i] = g_strdup (str_array[i]);</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-		retval[i] = NULL;</div><div class='del'>-</div><div class='del'>-		return retval;</div><div class='del'>-	} else {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-util.h b/e-util/e-util.h<br/>deleted file mode 100644<br/>index 1c558f485e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,329 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-util.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_UTIL_H_</div><div class='del'>-#define _E_UTIL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;gtk/gtktypeutils.h&gt;</div><div class='del'>-#include &lt;limits.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_MAKE_TYPE(l,str,t,ci,i,parent) \</div><div class='del'>-GtkType l##_get_type(void)\</div><div class='del'>-{\</div><div class='del'>-	static GtkType type = 0;\</div><div class='del'>-	if (!type){\</div><div class='del'>-		GtkTypeInfo info = {\</div><div class='del'>-			str,\</div><div class='del'>-			sizeof (t),\</div><div class='del'>-			sizeof (t##Class),\</div><div class='del'>-			(GtkClassInitFunc) ci,\</div><div class='del'>-			(GtkObjectInitFunc) i,\</div><div class='del'>-			NULL, /* reserved 1 */\</div><div class='del'>-			NULL, /* reserved 2 */\</div><div class='del'>-			(GtkClassInitFunc) NULL\</div><div class='del'>-		};\</div><div class='del'>-                type = gtk_type_unique (parent, &amp;info);\</div><div class='del'>-	}\</div><div class='del'>-	return type;\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_MAKE_X_TYPE(l,str,t,ci,i,parent,poa_init,offset) \</div><div class='del'>-GtkType l##_get_type(void)\</div><div class='del'>-{\</div><div class='del'>-	static GtkType type = 0;\</div><div class='del'>-	if (!type){\</div><div class='del'>-		GtkTypeInfo info = {\</div><div class='del'>-			str,\</div><div class='del'>-			sizeof (t),\</div><div class='del'>-			sizeof (t##Class),\</div><div class='del'>-			(GtkClassInitFunc) ci,\</div><div class='del'>-			(GtkObjectInitFunc) i,\</div><div class='del'>-			NULL, /* reserved 1 */\</div><div class='del'>-			NULL, /* reserved 2 */\</div><div class='del'>-			(GtkClassInitFunc) NULL\</div><div class='del'>-		};\</div><div class='del'>-                type = bonobo_x_type_unique (\</div><div class='del'>-			parent, poa_init, NULL,\</div><div class='del'>-			offset, &amp;info);\</div><div class='del'>-	}\</div><div class='del'>-	return type;\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define GET_STRING_ARRAY_FROM_ELLIPSIS(labels, first_string) \</div><div class='del'>-        { \</div><div class='del'>-		va_list args; \</div><div class='del'>-		int i; \</div><div class='del'>-		char *s; \</div><div class='del'>- \</div><div class='del'>-		va_start (args, (first_string)); \</div><div class='del'>- \</div><div class='del'>-		i = 0; \</div><div class='del'>-		for (s = (first_string); s; s = va_arg (args, char *)) \</div><div class='del'>-			i++; \</div><div class='del'>-		va_end (args); \</div><div class='del'>- \</div><div class='del'>-		(labels) = g_new (char *, i + 1); \</div><div class='del'>- \</div><div class='del'>-		va_start (args, (first_string)); \</div><div class='del'>-		i = 0; \</div><div class='del'>-		for (s = (first_string); s; s = va_arg (args, char *)) \</div><div class='del'>-		        (labels)[i++] = s; \</div><div class='del'>- \</div><div class='del'>-		va_end (args); \</div><div class='del'>-		(labels)[i] = NULL; \</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GET_DUPLICATED_STRING_ARRAY_FROM_ELLIPSIS(labels, first_string) \</div><div class='del'>-        { \</div><div class='del'>-                int i; \</div><div class='del'>-                GET_STRING_ARRAY_FROM_ELLIPSIS ((labels), (first_string)); \</div><div class='del'>-                for (i = 0; labels[i]; i++) \</div><div class='del'>-			labels[i] = g_strdup (labels[i]); \</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 1</div><div class='del'>-#  define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last) \</div><div class='del'>-	gtk_object_class_add_signals (oc, sigs, last)</div><div class='del'>-#  define E_OBJECT_CLASS_TYPE(oc) (oc)-&gt;type</div><div class='del'>-#else</div><div class='del'>-#  define E_OBJECT_CLASS_ADD_SIGNALS(oc,sigs,last)</div><div class='del'>-#  define E_OBJECT_CLASS_TYPE(oc) G_TYPE_FROM_CLASS (oc)</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_FOCUS_NONE,</div><div class='del'>-	E_FOCUS_CURRENT,</div><div class='del'>-	E_FOCUS_START,</div><div class='del'>-	E_FOCUS_END</div><div class='del'>-} EFocus;</div><div class='del'>-int       g_str_compare                                                    (const void        *x,</div><div class='del'>-									    const void        *y);</div><div class='del'>-int       g_int_compare                                                    (const void        *x,</div><div class='del'>-									    const void        *y);</div><div class='del'>-char     *e_strdup_strip                                                   (const char        *string);</div><div class='del'>-void      e_free_object_list                                               (GList             *list);</div><div class='del'>-void      e_free_object_slist                                              (GSList            *list);</div><div class='del'>-void      e_free_string_list                                               (GList             *list);</div><div class='del'>-void      e_free_string_slist                                              (GSList            *list);</div><div class='del'>-char     *e_read_file                                                      (const char        *filename);</div><div class='del'>-int       e_write_file                                                     (const char        *filename,</div><div class='del'>-									    const char        *data,</div><div class='del'>-									    int                flags);</div><div class='del'>-int       e_write_file_mkstemp                                             (char              *filename,</div><div class='del'>-									    const char        *data);</div><div class='del'>-int       e_mkdir_hier                                                     (const char        *path,</div><div class='del'>-									    mode_t             mode);</div><div class='del'>-</div><div class='del'>-gchar   **e_strsplit                                                	   (const gchar      *string,</div><div class='del'>-								    	    const gchar      *delimiter,</div><div class='del'>-								    	    gint              max_tokens);</div><div class='del'>-gchar    *e_strstrcase                                                     (const gchar       *haystack,</div><div class='del'>-									    const gchar       *needle);</div><div class='del'>-/* This only makes a filename safe for usage as a filename.  It still may have shell meta-characters in it. */</div><div class='del'>-void      e_filename_make_safe                                             (gchar             *string);</div><div class='del'>-gchar    *e_format_number                                                  (gint               number);</div><div class='del'>-gchar    *e_format_number_float                                            (gfloat             number);</div><div class='del'>-gboolean  e_create_directory                                               (gchar             *directory);</div><div class='del'>-gchar   **e_strdupv                                                        (const gchar      **str_array);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef int (*ESortCompareFunc) (const void *first,</div><div class='del'>-				 const void *second,</div><div class='del'>-				 gpointer    closure);</div><div class='del'>-void      e_sort                                                           (void              *base,</div><div class='del'>-									    size_t             nmemb,</div><div class='del'>-									    size_t             size,</div><div class='del'>-									    ESortCompareFunc   compare,</div><div class='del'>-									    gpointer           closure);</div><div class='del'>-void      e_bsearch                                                        (const void        *key,</div><div class='del'>-									    const void        *base,</div><div class='del'>-									    size_t             nmemb,</div><div class='del'>-									    size_t             size,</div><div class='del'>-									    ESortCompareFunc   compare,</div><div class='del'>-									    gpointer           closure,</div><div class='del'>-									    size_t            *start,</div><div class='del'>-									    size_t            *end);</div><div class='del'>-size_t    e_strftime_fix_am_pm                                             (char              *s,</div><div class='del'>-									    size_t             max,</div><div class='del'>-									    const char        *fmt,</div><div class='del'>-									    const struct tm   *tm);</div><div class='del'>-</div><div class='del'>-size_t    e_strftime													   (char              *s,</div><div class='del'>-                                        size_t             max,</div><div class='del'>-                                        const char        *fmt,</div><div class='del'>-                                        const struct tm   *tm);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* String to/from double conversion functions */</div><div class='del'>-gdouble   e_flexible_strtod                                                (const gchar       *nptr,</div><div class='del'>-									    gchar            **endptr);</div><div class='del'>-/* 29 bytes should enough for all possible values that</div><div class='del'>- * g_ascii_dtostr can produce with the %.17g format.</div><div class='del'>- * Then add 10 for good measure */</div><div class='del'>-#define E_ASCII_DTOSTR_BUF_SIZE (DBL_DIG + 12 + 10)</div><div class='del'>-gchar    *e_ascii_dtostr                                                   (gchar             *buffer,</div><div class='del'>-									    gint               buf_len,</div><div class='del'>-									    const gchar       *format,</div><div class='del'>-									    gdouble            d);</div><div class='del'>-</div><div class='del'>-/* Alternating char * and int arguments with a NULL char * to end.</div><div class='del'>-   Less than 0 for the int means copy the whole string. */</div><div class='del'>-gchar    *e_strdup_append_strings                                          (gchar             *first_string,</div><div class='del'>-									    ...);</div><div class='del'>-</div><div class='del'>-/* Marshallers */</div><div class='del'>-void      e_marshal_INT__INT_INT_POINTER                                   (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__INT_POINTER_INT_POINTER                           (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL                        (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL                      (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL                        (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT</div><div class='del'>-void      e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT                  (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT</div><div class='del'>-void      e_marshal_NONE__INT_POINTER_INT_POINTER_POINTER_INT_INT          (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_UINT e_marshal_NONE__INT_INT_POINTER_INT</div><div class='del'>-void      e_marshal_NONE__INT_INT_POINTER_INT                              (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_POINTER_INT_POINTER_UINT e_marshal_NONE__INT_POINTER_INT_POINTER_INT</div><div class='del'>-void      e_marshal_NONE__INT_POINTER_INT_POINTER_INT                      (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT</div><div class='del'>-void      e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT                      (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT</div><div class='del'>-void      e_marshal_BOOL__INT_POINTER_INT_POINTER_INT_INT_INT              (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT</div><div class='del'>-void      e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT          (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT</div><div class='del'>-void      e_marshal_NONE__INT_POINTER_INT_POINTER_INT_INT_POINTER_INT_INT  (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__POINTER_POINTER_INT                              (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__INT_POINTER_INT_POINTER                          (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__POINTER_POINTER_POINTER_POINTER                  (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__POINTER_POINTER                                   (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__POINTER_POINTER_POINTER                           (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__POINTER_POINTER_POINTER_POINTER                   (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER           (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__POINTER_POINTER_POINTER_BOOL	                   (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__POINTER_INT_INT_INT                              (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_INT__OBJECT_POINTER                                    (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-void      e_marshal_NONE__DOUBLE                                           (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_BOOL__STRING_ENUM e_marshal_BOOL__STRING_INT</div><div class='del'>-void      e_marshal_BOOL__STRING_INT                                       (GtkObject         *object,</div><div class='del'>-									    GtkSignalFunc      func,</div><div class='del'>-									    gpointer           func_data,</div><div class='del'>-									    GtkArg            *args);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_UTIL_H_ */</div><div class='head'>diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c<br/>deleted file mode 100644<br/>index 98c089074b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-xml-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-xml-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,427 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-xml-utils.c</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-xml-utils.h"</div><div class='del'>-</div><div class='del'>-#include &lt;locale.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;parser.h&gt;</div><div class='del'>-#include &lt;xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "gal/util/e-i18n.h"</div><div class='del'>-#include "gal/util/e-util.h"</div><div class='del'>-</div><div class='del'>-xmlNode *</div><div class='del'>-e_xml_get_child_by_name (const xmlNode *parent, const xmlChar *child_name)</div><div class='del'>-{</div><div class='del'>-	xmlNode *child;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (child_name != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	for (child = parent-&gt;xmlChildrenNode; child != NULL; child = child-&gt;next) {</div><div class='del'>-		if (xmlStrcmp (child-&gt;name, child_name) == 0) {</div><div class='del'>-			return child;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the first child with the name child_name and the "lang"</div><div class='del'>- * attribute that matches the current LC_MESSAGES, or else, the first</div><div class='del'>- * child with the name child_name and no "lang" attribute.</div><div class='del'>- */</div><div class='del'>-xmlNode *</div><div class='del'>-e_xml_get_child_by_name_by_lang (const xmlNode *parent,</div><div class='del'>-				 const xmlChar *child_name,</div><div class='del'>-				 const gchar *lang)</div><div class='del'>-{</div><div class='del'>-	xmlNode *child;</div><div class='del'>-	/* This is the default version of the string. */</div><div class='del'>-	xmlNode *C = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (child_name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (lang == NULL) {</div><div class='del'>-#ifdef HAVE_LC_MESSAGES</div><div class='del'>-		lang = setlocale (LC_MESSAGES, NULL);</div><div class='del'>-#else</div><div class='del'>-		lang = setlocale (LC_CTYPE, NULL);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-	for (child = parent-&gt;xmlChildrenNode; child != NULL; child = child-&gt;next) {</div><div class='del'>-		if (xmlStrcmp (child-&gt;name, child_name) == 0) {</div><div class='del'>-			xmlChar *this_lang = xmlGetProp (child, "lang");</div><div class='del'>-			if (this_lang == NULL) {</div><div class='del'>-				C = child;</div><div class='del'>-			} else if (xmlStrcmp(this_lang, "lang") == 0) {</div><div class='del'>-				return child;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return C;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNode *</div><div class='del'>-e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent,</div><div class='del'>-						 const gchar *name,</div><div class='del'>-						 GList *lang_list,</div><div class='del'>-						 gint *best_lang_score)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr best_node = NULL, node;</div><div class='del'>-</div><div class='del'>-	for (node = parent-&gt;xmlChildrenNode; node != NULL; node = node-&gt;next) {</div><div class='del'>-		xmlChar *lang;</div><div class='del'>-</div><div class='del'>-		if (node-&gt;name == NULL || strcmp (node-&gt;name, name) != 0) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		lang = xmlGetProp (node, "xml:lang");</div><div class='del'>-		if (lang != NULL) {</div><div class='del'>-			GList *l;</div><div class='del'>-			gint i;</div><div class='del'>-</div><div class='del'>-			for (l = lang_list, i = 0;</div><div class='del'>-			     l != NULL &amp;&amp; i &lt; *best_lang_score;</div><div class='del'>-			     l = l-&gt;next, i++) {</div><div class='del'>-				if (strcmp ((gchar *) l-&gt;data, lang) == 0) {</div><div class='del'>-					best_node = node;</div><div class='del'>-					*best_lang_score = i;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (best_node == NULL) {</div><div class='del'>-				best_node = node;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		xmlFree (lang);</div><div class='del'>-		if (*best_lang_score == 0) {</div><div class='del'>-			return best_node;</div><div class='del'>-		} </div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return best_node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e_xml_get_child_by_name_by_lang_list:</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-xmlNode *</div><div class='del'>-e_xml_get_child_by_name_by_lang_list (const xmlNode *parent,</div><div class='del'>-				      const gchar *name,</div><div class='del'>-				      GList *lang_list)</div><div class='del'>-{</div><div class='del'>-	gint best_lang_score = INT_MAX;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (lang_list == NULL) {</div><div class='del'>-		lang_list = gnome_i18n_get_language_list ("LC_MESSAGES");</div><div class='del'>-	}</div><div class='del'>-	return e_xml_get_child_by_name_by_lang_list_with_score</div><div class='del'>-		(parent,name,</div><div class='del'>-		 lang_list,</div><div class='del'>-		 &amp;best_lang_score);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * e_xml_get_child_by_name_no_lang</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-xmlNode *</div><div class='del'>-e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr node;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	for (node = parent-&gt;xmlChildrenNode; node != NULL; node = node-&gt;next) {</div><div class='del'>-		xmlChar *lang;</div><div class='del'>-</div><div class='del'>-		if (node-&gt;name == NULL || strcmp (node-&gt;name, name) != 0) {</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		lang = xmlGetProp (node, "xml:lang");</div><div class='del'>-		if (lang == NULL) {</div><div class='del'>-			return node;</div><div class='del'>-		}</div><div class='del'>-		xmlFree (lang);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	return e_xml_get_integer_prop_by_name_with_default (parent, prop_name, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,</div><div class='del'>-					     const xmlChar *prop_name,</div><div class='del'>-					     gint def)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gint ret_val = def;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		(void) sscanf (prop, "%d", &amp;ret_val);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_integer_prop_by_name (xmlNode *parent,</div><div class='del'>-				const xmlChar *prop_name,</div><div class='del'>-				gint value)</div><div class='del'>-{</div><div class='del'>-	gchar *valuestr;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	valuestr = g_strdup_printf ("%d", value);</div><div class='del'>-	xmlSetProp (parent, prop_name, valuestr);</div><div class='del'>-	g_free (valuestr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_xml_get_uint_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	return e_xml_get_uint_prop_by_name_with_default (parent, prop_name, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent,</div><div class='del'>-					  const xmlChar *prop_name,</div><div class='del'>-					  guint def)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	guint ret_val = def;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		(void) sscanf (prop, "%u", &amp;ret_val);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_uint_prop_by_name (xmlNode *parent,</div><div class='del'>-			     const xmlChar *prop_name,</div><div class='del'>-			     guint value)</div><div class='del'>-{</div><div class='del'>-	gchar *valuestr;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	valuestr = g_strdup_printf ("%u", value);</div><div class='del'>-	xmlSetProp (parent, prop_name, valuestr);</div><div class='del'>-	g_free (valuestr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_xml_get_bool_prop_by_name (const xmlNode *parent,</div><div class='del'>-			     const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	return e_xml_get_bool_prop_by_name_with_default (parent,</div><div class='del'>-							 prop_name,</div><div class='del'>-							 FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_xml_get_bool_prop_by_name_with_default(const xmlNode *parent,</div><div class='del'>-					 const xmlChar *prop_name,</div><div class='del'>-					 gboolean def)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gboolean ret_val = def;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		if (g_strcasecmp (prop, "true") == 0) {</div><div class='del'>-			ret_val = TRUE;</div><div class='del'>-		} else if (g_strcasecmp (prop, "false") == 0) {</div><div class='del'>-			ret_val = FALSE;</div><div class='del'>-		}</div><div class='del'>-		xmlFree(prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_bool_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		xmlSetProp (parent, prop_name, "true");</div><div class='del'>-	} else {</div><div class='del'>-		xmlSetProp (parent, prop_name, "false");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gdouble</div><div class='del'>-e_xml_get_double_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	return e_xml_get_double_prop_by_name_with_default (parent, prop_name, 0.0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gdouble</div><div class='del'>-e_xml_get_double_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, gdouble def)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gdouble ret_val = def;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		ret_val = e_flexible_strtod (prop, NULL);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gdouble value)</div><div class='del'>-{</div><div class='del'>-	char buffer[E_ASCII_DTOSTR_BUF_SIZE];</div><div class='del'>-	char *format;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (fabs (value) &lt; 1e9 &amp;&amp; fabs (value) &gt; 1e-5) {</div><div class='del'>-		format = g_strdup_printf ("%%.%df", DBL_DIG);</div><div class='del'>-	} else {</div><div class='del'>-		format = g_strdup_printf ("%%.%dg", DBL_DIG);</div><div class='del'>-	}</div><div class='del'>-	e_ascii_dtostr (buffer, sizeof (buffer), format, value);</div><div class='del'>-	g_free (format);</div><div class='del'>-</div><div class='del'>-	xmlSetProp (parent, prop_name, buffer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	return e_xml_get_string_prop_by_name_with_default (parent, prop_name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, const xmlChar *prop_name, const gchar *def)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gchar *ret_val;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		ret_val = g_strdup (prop);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	} else {</div><div class='del'>-		ret_val = g_strdup (def);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_string_prop_by_name (xmlNode *parent, const xmlChar *prop_name, const gchar *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (value != NULL) {</div><div class='del'>-		xmlSetProp (parent, prop_name, value);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_xml_get_translated_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gchar *ret_val = NULL;</div><div class='del'>-	gchar *combined_name;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, prop_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		ret_val = g_strdup (prop);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-		return ret_val;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	combined_name = g_strdup_printf("_%s", prop_name);</div><div class='del'>-	prop = xmlGetProp ((xmlNode *) parent, combined_name);</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		ret_val = g_strdup (gettext(prop));</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	g_free(combined_name);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h<br/>deleted file mode 100644<br/>index 54981c96e6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-xml-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/e-xml-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-xml-utils.h</div><div class='del'>- * Copyright 2000, 2001, Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public</div><div class='del'>- * License, version 2, as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This library is distributed in the hope that it will be useful, but</div><div class='del'>- * WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with this library; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA</div><div class='del'>- * 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_XML_UTILS__</div><div class='del'>-#define __E_XML_UTILS__</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-xmlNode *e_xml_get_child_by_name                     (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *child_name);</div><div class='del'>-/* lang set to NULL means use the current locale. */</div><div class='del'>-xmlNode *e_xml_get_child_by_name_by_lang             (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *child_name,</div><div class='del'>-                                                      const gchar   *lang);</div><div class='del'>-/* lang_list set to NULL means use the current locale. */</div><div class='del'>-xmlNode *e_xml_get_child_by_name_by_lang_list        (const xmlNode *parent,</div><div class='del'>-                                                      const gchar   *name,</div><div class='del'>-                                                      GList         *lang_list);</div><div class='del'>-xmlNode *e_xml_get_child_by_name_no_lang             (const xmlNode *parent,</div><div class='del'>-                                                      const gchar   *name);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint     e_xml_get_integer_prop_by_name              (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-gint     e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gint           def);</div><div class='del'>-void     e_xml_set_integer_prop_by_name              (xmlNode       *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gint           value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-guint    e_xml_get_uint_prop_by_name                 (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-guint    e_xml_get_uint_prop_by_name_with_default    (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      guint          def);</div><div class='del'>-void     e_xml_set_uint_prop_by_name                 (xmlNode       *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      guint          value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean e_xml_get_bool_prop_by_name                 (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-gboolean e_xml_get_bool_prop_by_name_with_default    (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gboolean       def);</div><div class='del'>-void     e_xml_set_bool_prop_by_name                 (xmlNode       *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gboolean       value);</div><div class='del'>-</div><div class='del'>-gdouble  e_xml_get_double_prop_by_name               (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-gdouble  e_xml_get_double_prop_by_name_with_default  (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gdouble        def);</div><div class='del'>-void      e_xml_set_double_prop_by_name              ( xmlNode       *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      gdouble        value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gchar    *e_xml_get_string_prop_by_name              (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-gchar    *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      const gchar   *def);</div><div class='del'>-void      e_xml_set_string_prop_by_name              (xmlNode       *parent,</div><div class='del'>-                                                      const xmlChar *prop_name,</div><div class='del'>-                                                      const gchar   *value);</div><div class='del'>-</div><div class='del'>-gchar    *e_xml_get_translated_string_prop_by_name   (const xmlNode *parent,</div><div class='del'>-                                                      const xmlChar *prop_name);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* __E_XML_UTILS__ */</div><div class='head'>diff --git a/e-util/ename/.cvsignore b/e-util/ename/.cvsignore<br/>deleted file mode 100644<br/>index 4f8c173841..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-ename-western</div><div class='del'>-test-ename-western-gtk</div><div class='head'>diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am<br/>deleted file mode 100644<br/>index 551399bc9f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"EName\"			\</div><div class='del'>-	-I$(srcdir)					\</div><div class='del'>-	-I$(srcdir)/..					\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-        -I$(includedir)                                 \</div><div class='del'>-	$(E_NAME_CFLAGS)</div><div class='del'>-</div><div class='del'>-ename_libs = 						\</div><div class='del'>-	libename.la 					\</div><div class='del'>-	$(E_NAME_LIBS)</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libename.la</div><div class='del'>-</div><div class='del'>-libename_la_SOURCES =					\</div><div class='del'>-	e-address-western.c				\</div><div class='del'>-	e-name-western.c</div><div class='del'>-</div><div class='del'>-libenameincludedir = $(includedir)/ename</div><div class='del'>-</div><div class='del'>-libenameinclude_HEADERS =				\</div><div class='del'>-	e-address-western.h				\</div><div class='del'>-	e-name-western-tables.h				\</div><div class='del'>-	e-name-western.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES = libename-static.la</div><div class='del'>-libename_static_la_SOURCES = $(libename_la_SOURCES)</div><div class='del'>-libename_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =		\</div><div class='del'>-	test-ename-western	\</div><div class='del'>-	test-ename-western-gtk</div><div class='del'>-</div><div class='del'>-test_ename_western_SOURCES =	\</div><div class='del'>-	test-ename-western.c</div><div class='del'>-</div><div class='del'>-test_ename_western_LDADD =	\</div><div class='del'>-	$(ename_libs)</div><div class='del'>-</div><div class='del'>-test_ename_western_gtk_SOURCES =				\</div><div class='del'>-	test-ename-western-gtk.c</div><div class='del'>-</div><div class='del'>-test_ename_western_gtk_LDADD = 			\</div><div class='del'>-	$(ename_libs) 				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='head'>diff --git a/e-util/ename/TODO b/e-util/ename/TODO<br/>deleted file mode 100644<br/>index 669661eea7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/TODO?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-* Support other naming systems.</div><div class='del'>-* Handle misspelled suffixes better.</div><div class='head'>diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c<br/>deleted file mode 100644<br/>index f2200a9dba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-address-western.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/e-address-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,446 +0,0 @@</div><div class='del'>-/* --------------------------------------------------</div><div class='del'>-</div><div class='del'>- An address parser, yielding fields as per RFC 2426.</div><div class='del'>-</div><div class='del'>- Author:</div><div class='del'>-   Jesse Pavel (jpavel@ximian.com)</div><div class='del'>-</div><div class='del'>- Copyright 2000, Ximian, Inc.</div><div class='del'>-   -------------------------------------------------- </div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef E_ADDRESS_WESTERN_TEST </div><div class='del'>-</div><div class='del'>-#include "e-address-western.h"</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;ename/e-address-western.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* These are the keywords that will distinguish the start of an extended</div><div class='del'>-   address. */</div><div class='del'>-</div><div class='del'>-static char *extended_keywords[] = {</div><div class='del'>-	"apt", "apartment", "suite", NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_line_blank (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean blank = TRUE;</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	/* A blank line consists of whitespace only, or a NULL line. */</div><div class='del'>-	for (cntr = 0; line[cntr] != '\0'; cntr++ ) {</div><div class='del'>-		if (!isspace(line[cntr])) {</div><div class='del'>-			blank = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return blank;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* In the array of lines, `lines', we will erase the line at line_num, and</div><div class='del'>- shift the remaining lines, up to line number num_lines, up one position. */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines)</div><div class='del'>-{</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	if (line_num &gt;= (num_lines - 1)) {</div><div class='del'>-		/* It is the last line, so simply shift in a NULL. */</div><div class='del'>-		lines[line_num] = NULL;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		for (cntr = line_num; cntr &lt; num_lines; cntr++)</div><div class='del'>-			lines[cntr] = lines[cntr + 1];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)</div><div class='del'>-{</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	for (cntr = 0; cntr &lt; *linecntr; cntr++) {</div><div class='del'>-		if (e_address_western_is_line_blank (lines[cntr])) {</div><div class='del'>-			/* Delete the blank line, and shift all subsequent lines up</div><div class='del'>-			   one spot to fill its old spot. */</div><div class='del'>-			e_address_western_shift_line (lines, cntr, *linecntr);</div><div class='del'>-</div><div class='del'>-			/* Since we must check the newly shifted line, let's </div><div class='del'>-			  not advance the counter on this next pass. */</div><div class='del'>-			cntr--;</div><div class='del'>-</div><div class='del'>-			/* There is now one less line, total. */</div><div class='del'>-			*linecntr -= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_po_box (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* In which phase of processing are we? */</div><div class='del'>-	enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* If the first two letters of the line are `p' and `o', and these</div><div class='del'>-	 are in turn followed by whitespace before another letter, then I</div><div class='del'>-	 will deem the line a representation of a PO Box address. */</div><div class='del'>-	</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	state = FIRSTCHAR;</div><div class='del'>-	for (cntr = 0; line[cntr] != '\0'; cntr++) {</div><div class='del'>-		if (state == FIRSTCHAR)	{</div><div class='del'>-			if (isalnum(line[cntr])) {</div><div class='del'>-				if (tolower(line[cntr]) == 'p')</div><div class='del'>-					state = SECONDCHAR;</div><div class='del'>-				else {</div><div class='del'>-					retval = FALSE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else if (state == SECONDCHAR) {</div><div class='del'>-			if (isalnum (line[cntr])) {</div><div class='del'>-				if (tolower(line[cntr]) == 'o')</div><div class='del'>-					state = WHITESPACE;</div><div class='del'>-				else {</div><div class='del'>-					retval = FALSE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else if (state == WHITESPACE) {</div><div class='del'>-			if (isspace (line[cntr])) {</div><div class='del'>-				retval = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			else if (isalnum (line[cntr])) {</div><div class='del'>-				retval = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* A line that contains a comma followed eventually by a number is</div><div class='del'>-  deemed to be the line in the form of &lt;town, region postal-code&gt;. */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_postal (guchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean retval;</div><div class='del'>-	int cntr;</div><div class='del'>-	</div><div class='del'>-	if (strchr (line, ',') == NULL)</div><div class='del'>-		retval = FALSE;  /* No comma. */</div><div class='del'>-	else {</div><div class='del'>-		int index;</div><div class='del'>-		</div><div class='del'>-		/* Ensure that the first character after the comma is</div><div class='del'>-		 a letter. */</div><div class='del'>-		index = strcspn (line, ",");</div><div class='del'>-		index++;</div><div class='del'>-		while (isspace(line[index]))</div><div class='del'>-			index++;</div><div class='del'>-		</div><div class='del'>-		if (!isalpha (line[index]))</div><div class='del'>-			return FALSE;   /* FIXME: ugly control flow. */</div><div class='del'>-</div><div class='del'>-		cntr = strlen(line) - 1;</div><div class='del'>-</div><div class='del'>-		/* Go to the character immediately following the last</div><div class='del'>-		  whitespace character. */</div><div class='del'>-		while (cntr &gt;= 0 &amp;&amp; isspace(line[cntr]))</div><div class='del'>-			cntr--;	</div><div class='del'>-		</div><div class='del'>-		while (cntr &gt;= 0 &amp;&amp; !isspace(line[cntr]))</div><div class='del'>-			cntr--;</div><div class='del'>-</div><div class='del'>-		if (cntr == 0)</div><div class='del'>-			retval = FALSE;</div><div class='del'>-		else {</div><div class='del'>-			if (isdigit (line[cntr+1]))</div><div class='del'>-				retval = TRUE;</div><div class='del'>-			else</div><div class='del'>-				retval = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_po_box (gchar *line)</div><div class='del'>-{</div><div class='del'>-	/* Return everything from the beginning of the line to</div><div class='del'>-	   the end of the first word that contains a number. */</div><div class='del'>-	</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	index = 0;</div><div class='del'>-	while (!isdigit(line[index]))</div><div class='del'>-		index++;</div><div class='del'>-	</div><div class='del'>-	while (isgraph(line[index]))</div><div class='del'>-		index++;</div><div class='del'>-	</div><div class='del'>-	return g_strndup (line, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_locality (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gint index;</div><div class='del'>-</div><div class='del'>-	/* Everything before the comma is the locality. */</div><div class='del'>-	index = strcspn(line, ",");</div><div class='del'>-</div><div class='del'>-	if (index == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	else</div><div class='del'>-		return g_strndup (line, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whatever resides between the comma and the start of the</div><div class='del'>-  postal code is deemed to be the region. */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_region (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gint start, end;</div><div class='del'>-</div><div class='del'>-	start = strcspn (line, ",");</div><div class='del'>-	start++;</div><div class='del'>-	while (isspace(line[start]))</div><div class='del'>-		start++;</div><div class='del'>-	</div><div class='del'>-	end = strlen(line) - 1;</div><div class='del'>-	while (isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	while (!isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	while (isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-	end++;</div><div class='del'>-</div><div class='del'>-	/* Between start and end lie the string. */</div><div class='del'>-	return g_strndup ( (line+start), end-start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_postal_code (gchar *line)</div><div class='del'>-{</div><div class='del'>-	int start, end;</div><div class='del'>-</div><div class='del'>-	end = strlen (line) - 1;</div><div class='del'>-	while (isspace(line[end]))</div><div class='del'>-		end--;</div><div class='del'>-	</div><div class='del'>-	start = end;</div><div class='del'>-	end++;</div><div class='del'>-</div><div class='del'>-	while (!isspace(line[start]))</div><div class='del'>-		start--;</div><div class='del'>-	start++;	</div><div class='del'>-</div><div class='del'>-	/* Between start and end lie the string. */</div><div class='del'>-	return g_strndup ( (line+start), end-start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_western_extract_street (gchar *line, gchar **street, gchar **extended)</div><div class='del'>-{</div><div class='del'>-        const gchar *split = NULL;</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) {</div><div class='del'>-		split = e_strstrcase (line, extended_keywords[cntr]);</div><div class='del'>-		if (split != NULL)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (split != NULL) {</div><div class='del'>-		*street = g_strndup (line, (split - line));</div><div class='del'>-		*extended = g_strdup (split);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*street = g_strdup (line);</div><div class='del'>-		*extended = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EAddressWestern *</div><div class='del'>-e_address_western_parse (const gchar *in_address)</div><div class='del'>-{</div><div class='del'>-	gchar **lines;</div><div class='del'>-	gint linecntr, lineindex;</div><div class='del'>-	gchar *address;</div><div class='del'>-	gint cntr;</div><div class='del'>-	gboolean found_po_box, found_postal;</div><div class='del'>-</div><div class='del'>-	EAddressWestern *eaw;</div><div class='del'>-#if 0</div><div class='del'>-	gint start, end;  /* To be used to classify address lines. */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (in_address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	eaw = (EAddressWestern *)g_malloc (sizeof(EAddressWestern));</div><div class='del'>-	eaw-&gt;po_box = NULL;</div><div class='del'>-	eaw-&gt;extended = NULL;</div><div class='del'>-	eaw-&gt;street = NULL;</div><div class='del'>-	eaw-&gt;locality = NULL;</div><div class='del'>-	eaw-&gt;region = NULL;</div><div class='del'>-	eaw-&gt;postal_code = NULL;</div><div class='del'>-	eaw-&gt;country = NULL;</div><div class='del'>-	</div><div class='del'>-	address = g_strndup (in_address, 2047);</div><div class='del'>-</div><div class='del'>-	/* The first thing I'll do is divide the multiline input string</div><div class='del'>-	into lines. */</div><div class='del'>-</div><div class='del'>-	/* ... count the lines. */</div><div class='del'>-	linecntr = 1;</div><div class='del'>-	lineindex = 0;</div><div class='del'>-	while (address[lineindex] != '\0') {</div><div class='del'>-		if (address[lineindex] == '\n')</div><div class='del'>-			linecntr++;</div><div class='del'>-			</div><div class='del'>-		lineindex++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ... tally them. */</div><div class='del'>-	lines = (gchar **)g_malloc (sizeof(gchar *) * (linecntr+3));</div><div class='del'>-	lineindex = 0;</div><div class='del'>-	lines[0] = &amp;address[0];</div><div class='del'>-	linecntr = 1;</div><div class='del'>-	while (address[lineindex] != '\0') {</div><div class='del'>-		if (address[lineindex] == '\n') {</div><div class='del'>-			lines[linecntr] = &amp;address[lineindex + 1];</div><div class='del'>-			linecntr++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lineindex++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the newlines at the end of each line (except the last,</div><div class='del'>-	 because it is already NULL terminated) to NULLs. */</div><div class='del'>-	for (cntr = 0; cntr &lt; (linecntr - 1); cntr++) {</div><div class='del'>-		*(strchr (lines[cntr], '\n')) = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_address_western_remove_blank_lines (lines, &amp;linecntr);</div><div class='del'>-</div><div class='del'>-	/* Let's just test these functions. */</div><div class='del'>-	found_po_box = FALSE;</div><div class='del'>-	found_postal = FALSE;</div><div class='del'>-</div><div class='del'>-   	for (cntr = 0; cntr &lt; linecntr; cntr++)  {</div><div class='del'>-		if (e_address_western_is_po_box (lines[cntr])) {</div><div class='del'>-			if (eaw-&gt;po_box == NULL)</div><div class='del'>-				eaw-&gt;po_box = e_address_western_extract_po_box (lines[cntr]);</div><div class='del'>-			found_po_box = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else if (e_address_western_is_postal (lines[cntr])) {</div><div class='del'>-			if (eaw-&gt;locality == NULL)</div><div class='del'>-				eaw-&gt;locality = e_address_western_extract_locality (lines[cntr]);</div><div class='del'>-			if (eaw-&gt;region == NULL)</div><div class='del'>-				eaw-&gt;region = e_address_western_extract_region (lines[cntr]);</div><div class='del'>-			if (eaw-&gt;postal_code == NULL)</div><div class='del'>-				eaw-&gt;postal_code = e_address_western_extract_postal_code (lines[cntr]);</div><div class='del'>-			found_postal = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			if (found_postal) {</div><div class='del'>-				if (eaw-&gt;country == NULL)</div><div class='del'>-					eaw-&gt;country = g_strdup (lines[cntr]);</div><div class='del'>-				else {</div><div class='del'>-					gchar *temp;</div><div class='del'>-					temp = g_strconcat (eaw-&gt;country, "\n", lines[cntr], NULL);</div><div class='del'>-					g_free (eaw-&gt;country);</div><div class='del'>-					eaw-&gt;country = temp;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if (eaw-&gt;street == NULL) {</div><div class='del'>-					e_address_western_extract_street (lines[cntr], &amp;eaw-&gt;street,</div><div class='del'>-										&amp;eaw-&gt;extended );</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					if (eaw-&gt;extended == NULL) {</div><div class='del'>-						eaw-&gt;extended = g_strdup (lines[cntr]);</div><div class='del'>-					}</div><div class='del'>-					else {</div><div class='del'>-						gchar *temp;</div><div class='del'>-						temp = g_strconcat (eaw-&gt;extended, "\n", lines[cntr], NULL);</div><div class='del'>-						g_free (eaw-&gt;extended);</div><div class='del'>-						eaw-&gt;extended = temp;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}			</div><div class='del'>-	</div><div class='del'>-	g_free (lines);</div><div class='del'>-	g_free (address);	</div><div class='del'>-	</div><div class='del'>-	return eaw;</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_address_western_free (EAddressWestern *eaw)</div><div class='del'>-{</div><div class='del'>-	if (eaw == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (eaw-&gt;po_box != NULL)</div><div class='del'>-		g_free(eaw-&gt;po_box);</div><div class='del'>-	if (eaw-&gt;extended != NULL)</div><div class='del'>-		g_free(eaw-&gt;extended);</div><div class='del'>-	if (eaw-&gt;street != NULL)</div><div class='del'>-		g_free(eaw-&gt;street);</div><div class='del'>-	if (eaw-&gt;locality != NULL)</div><div class='del'>-		g_free(eaw-&gt;locality);</div><div class='del'>-	if (eaw-&gt;region != NULL)</div><div class='del'>-		g_free(eaw-&gt;region);</div><div class='del'>-	if (eaw-&gt;postal_code != NULL)</div><div class='del'>-		g_free(eaw-&gt;postal_code);</div><div class='del'>-	if (eaw-&gt;country != NULL)</div><div class='del'>-		g_free(eaw-&gt;country);</div><div class='del'>-	</div><div class='del'>-	g_free (eaw);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/ename/e-address-western.h b/e-util/ename/e-address-western.h<br/>deleted file mode 100644<br/>index e6417f88c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-address-western.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/e-address-western.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-#ifndef __E_ADDRESS_WESTERN_H__</div><div class='del'>-#define __E_ADDRESS_WESTERN_H__</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	</div><div class='del'>-	/* Public */</div><div class='del'>-	char *po_box;</div><div class='del'>-	char *extended;  /* I'm not sure what this is. */</div><div class='del'>-	char *street;</div><div class='del'>-	char *locality;  /* For example, the city or town. */</div><div class='del'>-	char *region;	/* The state or province. */</div><div class='del'>-	char *postal_code;</div><div class='del'>-	char *country;</div><div class='del'>-} EAddressWestern;</div><div class='del'>-</div><div class='del'>-EAddressWestern *e_address_western_parse (const char *address);</div><div class='del'>-void e_address_western_free (EAddressWestern *eaw);</div><div class='del'>-</div><div class='del'>-#endif  /* ! __E_ADDRESS_WESTERN_H__ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/ename/e-name-western-tables.h b/e-util/ename/e-name-western-tables.h<br/>deleted file mode 100644<br/>index 2e94a94845..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western-tables.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/e-name-western-tables.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-#ifndef __E_NAME_WESTERN_TABLES_H__</div><div class='del'>-#define __E_NAME_WESTERN_TABLES_H__</div><div class='del'>-</div><div class='del'>-char *e_name_western_pfx_table[] = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-	"mister", "miss.", "mr.", "mrs.", "ms.",</div><div class='del'>-	"miss", "mr", "mrs", "ms", "sir", </div><div class='del'>-	"professor", "prof.", "dr", "dr.", "doctor",</div><div class='del'>-	"judge", "justice", "chief justice", </div><div class='del'>-	"congressman", "congresswoman", "commander",</div><div class='del'>-	"lieutenant", "lt.", "colonel", "col.", "major", "maj.",</div><div class='del'>-	"general", "gen.", "admiral", "admr.", "sergeant", "sgt.",</div><div class='del'>-	"lord", "lady", "baron", "baroness", "duke", "duchess",</div><div class='del'>-	"king", "queen", "prince", "princess",</div><div class='del'>-</div><div class='del'>-	"the most honorable", "the honorable",</div><div class='del'>-	"the reverend", "his holiness",</div><div class='del'>-	"his eminence", "his majesty", "her majesty", </div><div class='del'>-	"his grace", "her grace",</div><div class='del'>-</div><div class='del'>-	"president", "vice president", "secretary", "undersecretary",</div><div class='del'>-	"consul", "ambassador",</div><div class='del'>-</div><div class='del'>-	"senator", "saint", "st.", "pastor", "deacon",</div><div class='del'>-	"father", "bishop", "archbishop", "cardinal", "pope",</div><div class='del'>-	"reverend", "rev.", "rabbi", </div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * French.</div><div class='del'>-	 */</div><div class='del'>-	"monsieur", "m.", "mademoiselle", "melle",</div><div class='del'>-	"madame", "mme", "professeur", "dauphin", "dauphine",</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * German</div><div class='del'>-	 */</div><div class='del'>-	"herr", "frau", "fraulein", "herr doktor", "doktor frau", "doktor frau doktor",</div><div class='del'>-	"frau doktor",</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Spanish.</div><div class='del'>-	 */</div><div class='del'>-	"senor", "senora", "sra.", "senorita", "srita.", </div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_sfx_table[]  = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-         "junior", "senior", "jr", "sr", "I", "II", "III", "IV", "V",</div><div class='del'>-	 "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV",</div><div class='del'>-	 "XV", "XVI", "XVII", "XVIII", "XIX", "XX", "XXI", "XXII",</div><div class='del'>-	 "phd", "ms", "md", "esq", "esq.", "esquire",</div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_twopart_sfx_table[] = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-	"the first", "the second", "the third",</div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_complex_last_table[] = {"van", "von", "de", NULL};</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_NAME_WESTERN_TABLES_H__ */</div><div class='head'>diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c<br/>deleted file mode 100644<br/>index f8d717c403..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/e-name-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,958 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A simple Western name parser.</div><div class='del'>- *</div><div class='del'>- * &lt;Nat&gt; Jamie, do you know anything about name parsing?</div><div class='del'>- * &lt;jwz&gt; Are you going down that rat hole?  Bring a flashlight.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Nat Friedman &lt;nat@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999 - 2001, Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>- </div><div class='del'>-#include &lt;ename/e-name-western.h&gt;</div><div class='del'>-#include &lt;ename/e-name-western-tables.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int prefix_idx;</div><div class='del'>-	int first_idx;</div><div class='del'>-	int middle_idx;</div><div class='del'>-	int nick_idx;</div><div class='del'>-	int last_idx;</div><div class='del'>-	int suffix_idx;</div><div class='del'>-} ENameWesternIdxs;</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-e_name_western_str_count_words (char *str)</div><div class='del'>-{</div><div class='del'>-	int word_count;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	word_count = 0;</div><div class='del'>-</div><div class='del'>-	for (p = str; p != NULL; p = strchr (p, ' ')) {</div><div class='del'>-		word_count ++;</div><div class='del'>-		p ++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return word_count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_cleanup_string (char **str)</div><div class='del'>-{</div><div class='del'>-	char *newstr;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (*str == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* skip any spaces and commas at the start of the string */</div><div class='del'>-	p = *str;</div><div class='del'>-	while (isspace (*p) || *p == ',')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	/* make the copy we're going to return */</div><div class='del'>-	newstr = g_strdup (p);</div><div class='del'>-</div><div class='del'>-	if ( strlen(newstr) &gt; 0) {</div><div class='del'>-		/* now search from the back, skipping over any spaces and commas */</div><div class='del'>-		p = newstr + strlen (newstr) - 1;</div><div class='del'>-		while (isspace (*p) || *p == ',')</div><div class='del'>-			p --;</div><div class='del'>-		/* advance p to after the character that caused us to exit the</div><div class='del'>-		   previous loop, and end the string. */</div><div class='del'>-		if ((! isspace (*p)) &amp;&amp; *p != ',')</div><div class='del'>-			p ++;</div><div class='del'>-		*p = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (*str);</div><div class='del'>-	*str = newstr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_words_at_idx (char *str, int idx, int num_words)</div><div class='del'>-{</div><div class='del'>-	char *words;</div><div class='del'>-	char *p;</div><div class='del'>-	int   word_count;</div><div class='del'>-	int   words_len;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Walk to the end of the words.</div><div class='del'>-	 */</div><div class='del'>-	word_count = 0;</div><div class='del'>-	p = str + idx;</div><div class='del'>-	while (word_count &lt; num_words &amp;&amp; *p != '\0') {</div><div class='del'>-		while (! isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-			p ++;</div><div class='del'>-</div><div class='del'>-		while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-			p ++;</div><div class='del'>-</div><div class='del'>-		word_count ++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	words_len = p - str - idx - 1;</div><div class='del'>-</div><div class='del'>-	if (*p == '\0')</div><div class='del'>-		words_len ++;</div><div class='del'>-</div><div class='del'>-	words = g_malloc0 (1 + words_len);</div><div class='del'>-	strncpy (words, str + idx, words_len);</div><div class='del'>-</div><div class='del'>-	return words;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * What the fuck is wrong with glib's MAX macro.</div><div class='del'>- */ </div><div class='del'>-static int</div><div class='del'>-e_name_western_max (const int a, const int b)</div><div class='del'>-{</div><div class='del'>-	if (a &gt; b)</div><div class='del'>-		return a;</div><div class='del'>-</div><div class='del'>-	return b;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_name_western_word_is_suffix (char *word)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; e_name_western_sfx_table [i] != NULL; i ++) {</div><div class='del'>-		int length = strlen (e_name_western_sfx_table [i]);</div><div class='del'>-		if (!g_strcasecmp (word, e_name_western_sfx_table [i]) || </div><div class='del'>-		    ( !g_strncasecmp (word, e_name_western_sfx_table [i], length) &amp;&amp;</div><div class='del'>-		      strlen(word) == length + 1 &amp;&amp;</div><div class='del'>-		      word[length] == '.' ))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_one_prefix_at_str (char *str)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int   i;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check for prefixes from our table.</div><div class='del'>-	 */</div><div class='del'>-	for (i = 0; e_name_western_pfx_table [i] != NULL; i ++) {</div><div class='del'>-		int pfx_words;</div><div class='del'>-		char *words;</div><div class='del'>-</div><div class='del'>-		pfx_words = e_name_western_str_count_words (e_name_western_pfx_table [i]);</div><div class='del'>-		words = e_name_western_get_words_at_idx (str, 0, pfx_words);</div><div class='del'>-</div><div class='del'>-		if (! g_strcasecmp (words, e_name_western_pfx_table [i]))</div><div class='del'>-			return words;</div><div class='del'>-</div><div class='del'>-		g_free (words);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check for prefixes we don't know about.  These are always a</div><div class='del'>-	 * sequence of more than one letters followed by a period.</div><div class='del'>-	 */</div><div class='del'>-	word = e_name_western_get_words_at_idx (str, 0, 1);</div><div class='del'>-</div><div class='del'>-	if (strlen (word) &gt; 2 &amp;&amp; </div><div class='del'>-	    isalpha ((unsigned char) word [0]) &amp;&amp;</div><div class='del'>-	    isalpha ((unsigned char) word [1]) &amp;&amp;</div><div class='del'>-	    word [strlen (word) - 1] == '.')</div><div class='del'>-		return word;</div><div class='del'>-</div><div class='del'>-	g_free (word);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_prefix_at_str (char *str)</div><div class='del'>-{</div><div class='del'>-	char *pfx;</div><div class='del'>-	char *pfx1;</div><div class='del'>-	char *pfx2;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/* Get the first prefix. */</div><div class='del'>-	pfx1 = e_name_western_get_one_prefix_at_str (str);</div><div class='del'>-</div><div class='del'>-	if (pfx1 == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Check for a second prefix. */</div><div class='del'>-	p = str + strlen (pfx1);</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	pfx2 = e_name_western_get_one_prefix_at_str (p);</div><div class='del'>-</div><div class='del'>-	if (pfx2 != NULL) {</div><div class='del'>-		int pfx_len;</div><div class='del'>-</div><div class='del'>-		pfx_len = (p + strlen (pfx2)) - str;</div><div class='del'>-		pfx = g_malloc0 (pfx_len + 1);</div><div class='del'>-		strncpy (pfx, str, pfx_len);</div><div class='del'>-	} else {</div><div class='del'>-		pfx = g_strdup (pfx1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (pfx1);</div><div class='del'>-	g_free (pfx2);</div><div class='del'>-</div><div class='del'>-	return pfx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_prefix (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *pfx;</div><div class='del'>-</div><div class='del'>-	pfx = e_name_western_get_prefix_at_str (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (pfx == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idxs-&gt;prefix_idx = 0;</div><div class='del'>-	name-&gt;prefix     = pfx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_name_western_is_complex_last_beginning (char *word)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; e_name_western_complex_last_table [i] != NULL; i ++) {</div><div class='del'>-</div><div class='del'>-		if (! g_strcasecmp (</div><div class='del'>-			word, e_name_western_complex_last_table [i]))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_first (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If there's a prefix, then the first name is right after it.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;prefix_idx != -1) {</div><div class='del'>-		int   first_idx;</div><div class='del'>-		char *p;</div><div class='del'>-</div><div class='del'>-		first_idx = idxs-&gt;prefix_idx + strlen (name-&gt;prefix);</div><div class='del'>-</div><div class='del'>-		/* Skip past white space. */</div><div class='del'>-		p = name-&gt;full + first_idx;</div><div class='del'>-		while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		if (*p == '\0')</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		idxs-&gt;first_idx = p - name-&gt;full;</div><div class='del'>-		name-&gt;first = e_name_western_get_words_at_idx (</div><div class='del'>-			name-&gt;full, idxs-&gt;first_idx, 1);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Otherwise, the first name is probably the first string.</div><div class='del'>-		 */</div><div class='del'>-		idxs-&gt;first_idx = 0;</div><div class='del'>-		name-&gt;first = e_name_western_get_words_at_idx (</div><div class='del'>-			name-&gt;full, idxs-&gt;first_idx, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check that we didn't just assign the beginning of a</div><div class='del'>-	 * compound last name to the first name.</div><div class='del'>-	 */</div><div class='del'>-	if (name-&gt;first != NULL) {</div><div class='del'>-		if (e_name_western_is_complex_last_beginning (name-&gt;first)) {</div><div class='del'>-			g_free (name-&gt;first);</div><div class='del'>-			name-&gt;first = NULL;</div><div class='del'>-			idxs-&gt;first_idx = -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int   middle_idx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Middle names can only exist if you have a first name.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;first_idx == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	middle_idx = idxs-&gt;first_idx + strlen (name-&gt;first) + 1;</div><div class='del'>-</div><div class='del'>-	if (middle_idx &gt; strlen (name-&gt;full))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Search for the first space (or the terminating \0)</div><div class='del'>-	 */</div><div class='del'>-	while (isspace (name-&gt;full [middle_idx]) &amp;&amp;</div><div class='del'>-	       name-&gt;full [middle_idx] != '\0')</div><div class='del'>-		middle_idx ++;</div><div class='del'>-		</div><div class='del'>-	if (name-&gt;full [middle_idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip past the nickname, if it's there.</div><div class='del'>-	 */</div><div class='del'>-	if (name-&gt;full [middle_idx] == '\"') {</div><div class='del'>-		if (idxs-&gt;nick_idx == -1)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		middle_idx = idxs-&gt;nick_idx + strlen (name-&gt;nick) + 1;</div><div class='del'>-		</div><div class='del'>-		while (isspace (name-&gt;full [middle_idx]) &amp;&amp;</div><div class='del'>-		       name-&gt;full [middle_idx] != '\0')</div><div class='del'>-			middle_idx ++;</div><div class='del'>-</div><div class='del'>-		if (name-&gt;full [middle_idx] == '\0')</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure this isn't the beginning of a complex last name.</div><div class='del'>-	 */</div><div class='del'>-	word = e_name_western_get_words_at_idx (name-&gt;full, middle_idx, 1);</div><div class='del'>-	if (e_name_western_is_complex_last_beginning (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure this isn't a suffix.</div><div class='del'>-	 */</div><div class='del'>-	e_name_western_cleanup_string (&amp; word);</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure we didn't just grab a cute nickname.</div><div class='del'>-	 */</div><div class='del'>-	if (word [0] == '\"') {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	idxs-&gt;middle_idx = middle_idx;</div><div class='del'>-	name-&gt;middle = word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_nickname (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	int   idx;</div><div class='del'>-	int   start_idx;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	if (idxs-&gt;first_idx == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (idxs-&gt;middle_idx &gt; idxs-&gt;first_idx)</div><div class='del'>-		idx = idxs-&gt;middle_idx + strlen (name-&gt;middle);</div><div class='del'>-	else</div><div class='del'>-		idx = idxs-&gt;first_idx + strlen (name-&gt;first);</div><div class='del'>-</div><div class='del'>-	while (name-&gt;full [idx] != '\"' &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] != '\"')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	start_idx = idx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Advance to the next double quote.</div><div class='del'>-	 */</div><div class='del'>-	idx ++;</div><div class='del'>-	</div><div class='del'>-	while (name-&gt;full [idx] != '\"' &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	str = g_malloc0 (idx - start_idx + 2);</div><div class='del'>-	strncpy (str, name-&gt;full + start_idx, idx - start_idx + 1);</div><div class='del'>-</div><div class='del'>-	name-&gt;nick = str;</div><div class='del'>-	idxs-&gt;nick_idx = start_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-e_name_western_last_get_max_idx (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	int max_idx = -1;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;prefix != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;prefix_idx + strlen (name-&gt;prefix));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;first != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;first_idx + strlen (name-&gt;first));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;middle != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;middle_idx + strlen (name-&gt;middle));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;nick != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;nick_idx + strlen (name-&gt;nick));</div><div class='del'>-</div><div class='del'>-	return max_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_last (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int   idx = -1;</div><div class='del'>-</div><div class='del'>-	idx = e_name_western_last_get_max_idx (name, idxs);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In the case where there is no preceding name element, the</div><div class='del'>-	 * name is either just a first name ("Nat", "John"), is a</div><div class='del'>-	 * single-element name ("Cher", which we treat as a first</div><div class='del'>-	 * name), or is just a last name.  The only time we can</div><div class='del'>-	 * differentiate a last name alone from a single-element name</div><div class='del'>-	 * or a first name alone is if it's a complex last name ("de</div><div class='del'>-	 * Icaza", "van Josephsen").  So if there is no preceding name</div><div class='del'>-	 * element, we check to see whether or not the first part of</div><div class='del'>-	 * the name is the beginning of a complex name.  If it is,</div><div class='del'>-	 * we subsume the entire string.  If we accidentally subsume</div><div class='del'>-	 * the suffix, this will get fixed in the fixup routine.</div><div class='del'>-	 */</div><div class='del'>-	if (idx == -1) {</div><div class='del'>-		word = e_name_western_get_words_at_idx (name-&gt;full, 0, 1);</div><div class='del'>-		if (! e_name_western_is_complex_last_beginning (word)) {</div><div class='del'>-			g_free (word);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		name-&gt;last     = g_strdup (name-&gt;full);</div><div class='del'>-		idxs-&gt;last_idx = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Skip past the white space. */</div><div class='del'>-	while (isspace (name-&gt;full [idx]) &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	word = e_name_western_get_words_at_idx (name-&gt;full, idx, 1);</div><div class='del'>-	e_name_western_cleanup_string (&amp; word);</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (word);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Subsume the rest of the string into the last name.  If we</div><div class='del'>-	 * accidentally include the prefix, it will get fixed later.</div><div class='del'>-	 * This is the only way to handle things like "Miguel de Icaza</div><div class='del'>-	 * Amozorrutia" without dropping data and forcing the user</div><div class='del'>-	 * to retype it.</div><div class='del'>-	 */</div><div class='del'>-	name-&gt;last = g_strdup (name-&gt;full + idx);</div><div class='del'>-	idxs-&gt;last_idx = idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_preceding_word (char *str, int idx)</div><div class='del'>-{</div><div class='del'>-	int   word_len;</div><div class='del'>-	char *word;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	p = str + idx;</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; p &gt; str)</div><div class='del'>-		p --;</div><div class='del'>-</div><div class='del'>-	while (! isspace (*p) &amp;&amp; p &gt; str)</div><div class='del'>-		p --;</div><div class='del'>-</div><div class='del'>-	if (isspace (*p))</div><div class='del'>-	    p ++;</div><div class='del'>-</div><div class='del'>-	word_len = (str + idx) - p;</div><div class='del'>-	word = g_malloc0 (word_len + 1);</div><div class='del'>-	if (word_len &gt; 0)</div><div class='del'>-		strncpy (word, p, word_len);</div><div class='del'>-</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_suffix_at_str_end (char *str)</div><div class='del'>-{</div><div class='del'>-	char *suffix;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Walk backwards till we reach the beginning of the</div><div class='del'>-	 * (potentially-comma-separated) list of suffixes.</div><div class='del'>-	 */</div><div class='del'>-	p = str + strlen (str);</div><div class='del'>-	while (1) {</div><div class='del'>-		char *nextp;</div><div class='del'>-		char *word;</div><div class='del'>-</div><div class='del'>-		word = e_name_western_get_preceding_word (str, p - str);</div><div class='del'>-		nextp = p - strlen (word) - 1;</div><div class='del'>-		</div><div class='del'>-		e_name_western_cleanup_string (&amp; word);</div><div class='del'>-</div><div class='del'>-		if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-			p = nextp;</div><div class='del'>-			g_free (word);</div><div class='del'>-		} else {</div><div class='del'>-			g_free (word);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p == (str + strlen (str)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	suffix = g_strdup (p);</div><div class='del'>-	e_name_western_cleanup_string (&amp; suffix);</div><div class='del'>-</div><div class='del'>-	if (strlen (suffix) == 0) {</div><div class='del'>-		g_free (suffix);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return suffix;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_suffix (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	name-&gt;suffix = e_name_western_get_suffix_at_str_end (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (name-&gt;suffix == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idxs-&gt;suffix_idx = strlen (name-&gt;full) - strlen (name-&gt;suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_name_western_detect_backwards (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *comma;</div><div class='del'>-	char *word;</div><div class='del'>-</div><div class='del'>-	comma = strchr (name-&gt;full, ',');</div><div class='del'>-</div><div class='del'>-	if (comma == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there's a comma, we need to detect whether it's</div><div class='del'>-	 * separating the last name from the first or just separating</div><div class='del'>-	 * suffixes.  So we grab the word which comes before the</div><div class='del'>-	 * comma and check if it's a suffix.</div><div class='del'>-	 */</div><div class='del'>-	word = e_name_western_get_preceding_word (name-&gt;full, comma - name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (word);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *prefix;</div><div class='del'>-	char *last;</div><div class='del'>-	char *suffix;</div><div class='del'>-	char *firstmidnick;</div><div class='del'>-	char *newfull;</div><div class='del'>-</div><div class='del'>-	char *comma;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (! e_name_western_detect_backwards (name, idxs))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Convert</div><div class='del'>-	 *    &lt;Prefix&gt; &lt;Last name&gt;, &lt;First name&gt; &lt;Middle[+nick] name&gt; &lt;Suffix&gt;</div><div class='del'>-	 * to</div><div class='del'>-	 *    &lt;Prefix&gt; &lt;First name&gt; &lt;Middle[+nick] name&gt; &lt;Last name&gt; &lt;Suffix&gt;</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Grab the prefix from the beginning.</div><div class='del'>-	 */</div><div class='del'>-	prefix = e_name_western_get_prefix_at_str (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Everything from the end of the prefix to the comma is the</div><div class='del'>-	 * last name.</div><div class='del'>-	 */</div><div class='del'>-	comma = strchr (name-&gt;full, ',');</div><div class='del'>-	if (comma == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	p = name-&gt;full + (prefix == NULL ? 0 : strlen (prefix));</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	last = g_malloc0 (comma - p + 1);</div><div class='del'>-	strncpy (last, p, comma - p);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the suffix off the end.</div><div class='del'>-	 */</div><div class='del'>-	suffix = e_name_western_get_suffix_at_str_end (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Firstmidnick is everything from the comma to the beginning</div><div class='del'>-	 * of the suffix.</div><div class='del'>-	 */</div><div class='del'>-	p = comma + 1;</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	if (suffix != NULL) {</div><div class='del'>-		char *q;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Point q at the beginning of the suffix.</div><div class='del'>-		 */</div><div class='del'>-		q = name-&gt;full + strlen (name-&gt;full) - strlen (suffix) - 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Walk backwards until we hit the space which</div><div class='del'>-		 * separates the suffix from firstmidnick.</div><div class='del'>-		 */</div><div class='del'>-		while (! isspace (*q) &amp;&amp; q &gt; comma)</div><div class='del'>-			q --;</div><div class='del'>-</div><div class='del'>-		if ((q - p + 1) &gt; 0) {</div><div class='del'>-			firstmidnick = g_malloc0 (q - p + 1);</div><div class='del'>-			strncpy (firstmidnick, p, q - p);</div><div class='del'>-		} else</div><div class='del'>-			firstmidnick = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		firstmidnick = g_strdup (p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create our new reordered version of the name.</div><div class='del'>-	 */</div><div class='del'>-#define NULLSTR(a) ((a) == NULL ? "" : (a))</div><div class='del'>-	newfull = g_strdup_printf ("%s %s %s %s", NULLSTR (prefix), NULLSTR (firstmidnick),</div><div class='del'>-				   NULLSTR (last), NULLSTR (suffix));</div><div class='del'>-	g_strstrip (newfull);</div><div class='del'>-	g_free (name-&gt;full);</div><div class='del'>-	name-&gt;full = newfull;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_free (prefix);</div><div class='del'>-	g_free (firstmidnick);</div><div class='del'>-	g_free (last);</div><div class='del'>-	g_free (suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_zap_nil (char **str, int *idx)</div><div class='del'>-{</div><div class='del'>-	if (*str == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (strlen (*str) != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*idx = -1;</div><div class='del'>-	g_free (*str);</div><div class='del'>-	*str = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION	\</div><div class='del'>-	char *last_start = NULL;	\</div><div class='del'>-	if (name-&gt;last)	\</div><div class='del'>-		last_start = strchr (name-&gt;last, ' ');	\</div><div class='del'>-	if (last_start) {	\</div><div class='del'>-		char *new_last, *new_first;	\</div><div class='del'>-	\</div><div class='del'>-		new_last = g_strdup (last_start + 1);	\</div><div class='del'>-		*last_start = '\0';	\</div><div class='del'>-	\</div><div class='del'>-		idxs-&gt;last_idx += (last_start - name-&gt;last) + 1;	\</div><div class='del'>-	\</div><div class='del'>-		new_first = g_strdup_printf ("%s %s %s", name-&gt;first, name-&gt;middle, name-&gt;last);	\</div><div class='del'>-	\</div><div class='del'>-		g_free (name-&gt;first);	\</div><div class='del'>-		g_free (name-&gt;middle);	\</div><div class='del'>-		g_free (name-&gt;last);	\</div><div class='del'>-	\</div><div class='del'>-		name-&gt;first = new_first;	\</div><div class='del'>-		name-&gt;middle = NULL;	\</div><div class='del'>-		name-&gt;last = new_last;	\</div><div class='del'>-	\</div><div class='del'>-		idxs-&gt;middle_idx = -1;	\</div><div class='del'>-	} else {	\</div><div class='del'>-		char *new_first;	\</div><div class='del'>-	\</div><div class='del'>-		new_first = g_strdup_printf ("%s %s %s", name-&gt;first, name-&gt;middle, name-&gt;last);	\</div><div class='del'>-	\</div><div class='del'>-		g_free (name-&gt;first);	\</div><div class='del'>-		g_free (name-&gt;middle);	\</div><div class='del'>-		g_free (name-&gt;last);	\</div><div class='del'>-	\</div><div class='del'>-		name-&gt;first = new_first;	\</div><div class='del'>-		name-&gt;middle = NULL;	\</div><div class='del'>-		name-&gt;last = NULL;	\</div><div class='del'>-		idxs-&gt;middle_idx = -1;	\</div><div class='del'>-		idxs-&gt;last_idx = -1;	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define CHECK_MIDDLE_NAME_FOR_CONJUNCTION(conj) \</div><div class='del'>-	if (idxs-&gt;middle_idx != -1 &amp;&amp; !strcmp (name-&gt;middle, conj)) {	\</div><div class='del'>-		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#define CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE(conj) \</div><div class='del'>-	if (idxs-&gt;middle_idx != -1 &amp;&amp; !strcasecmp (name-&gt;middle, conj)) {	\</div><div class='del'>-		FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION	\</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_fixup (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * The middle and last names cannot be the same.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;middle_idx != -1 &amp;&amp; idxs-&gt;middle_idx == idxs-&gt;last_idx) {</div><div class='del'>-		idxs-&gt;middle_idx = -1;</div><div class='del'>-		g_free (name-&gt;middle);</div><div class='del'>-		name-&gt;middle = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have a middle name and no last name, then we mistook</div><div class='del'>-	 * the last name for the middle name.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;last_idx == -1 &amp;&amp; idxs-&gt;middle_idx != -1) {</div><div class='del'>-		idxs-&gt;last_idx   = idxs-&gt;middle_idx;</div><div class='del'>-		name-&gt;last       = name-&gt;middle;</div><div class='del'>-		name-&gt;middle     = NULL;</div><div class='del'>-		idxs-&gt;middle_idx = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check to see if we accidentally included the suffix in the</div><div class='del'>-	 * last name.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;suffix_idx != -1 &amp;&amp; idxs-&gt;last_idx != -1 &amp;&amp;</div><div class='del'>-	    idxs-&gt;suffix_idx &lt; (idxs-&gt;last_idx + strlen (name-&gt;last))) {</div><div class='del'>-		char *sfx;</div><div class='del'>-</div><div class='del'>-		sfx = name-&gt;last + (idxs-&gt;suffix_idx - idxs-&gt;last_idx);</div><div class='del'>-		if (sfx != NULL) {</div><div class='del'>-			char *newlast;</div><div class='del'>-			char *p;</div><div class='del'>-</div><div class='del'>-			p = sfx - 1;</div><div class='del'>-			while (isspace (*p) &amp;&amp; p &gt; name-&gt;last)</div><div class='del'>-				p --;</div><div class='del'>-			p ++;</div><div class='del'>-</div><div class='del'>-			newlast = g_malloc0 (p - name-&gt;last + 1);</div><div class='del'>-			strncpy (newlast, name-&gt;last, p - name-&gt;last);</div><div class='del'>-			g_free (name-&gt;last);</div><div class='del'>-			name-&gt;last = newlast;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If we have a prefix and a first name, but no last name,</div><div class='del'>-	 * then we need to assign the first name to the last name.</div><div class='del'>-	 * This way we get things like "Mr Friedman" correctly.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;first_idx != -1 &amp;&amp; idxs-&gt;prefix_idx != -1 &amp;&amp;</div><div class='del'>-	    idxs-&gt;last_idx == -1) {</div><div class='del'>-		name-&gt;last      = name-&gt;first;</div><div class='del'>-		idxs-&gt;last_idx  = idxs-&gt;first_idx;</div><div class='del'>-		idxs-&gt;first_idx = -1;</div><div class='del'>-		name-&gt;first     = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idxs-&gt;middle_idx != -1) {</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("&amp;");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("*");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("|");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("^");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("&amp;&amp;");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("||");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("+");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("-");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("and");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("or");</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("plus");</div><div class='del'>-</div><div class='del'>-		/* Spanish */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("y");</div><div class='del'>-</div><div class='del'>-		/* German */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("und");</div><div class='del'>-</div><div class='del'>-		/* Italian */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("e");</div><div class='del'>-</div><div class='del'>-		/* Czech */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("a");</div><div class='del'>-</div><div class='del'>-		/* Finnish */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("ja");</div><div class='del'>-</div><div class='del'>-		/* French */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE ("et");</div><div class='del'>-</div><div class='del'>-		/* Russian */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("\xd0\x98"); /* u+0418 */</div><div class='del'>-		CHECK_MIDDLE_NAME_FOR_CONJUNCTION ("\xd0\xb8"); /* u+0438 */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Remove stray spaces and commas (although there don't seem</div><div class='del'>-	 * to be any in the test cases, they might show up later).</div><div class='del'>-	 */</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;prefix);</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;first);</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;middle);</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;nick);</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;last);</div><div class='del'>-	e_name_western_cleanup_string (&amp; name-&gt;suffix);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make zero-length strings just NULL.</div><div class='del'>-	 */</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;prefix, &amp; idxs-&gt;prefix_idx);</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;first,  &amp; idxs-&gt;first_idx);</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;middle, &amp; idxs-&gt;middle_idx);</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;nick,   &amp; idxs-&gt;nick_idx);</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;last,   &amp; idxs-&gt;last_idx);</div><div class='del'>-	e_name_western_zap_nil (&amp; name-&gt;suffix, &amp; idxs-&gt;suffix_idx);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_name_western_western_parse_fullname:</div><div class='del'>- * @full_name: A string containing a Western name.</div><div class='del'>- *</div><div class='del'>- * Parses @full_name and returns an #ENameWestern object filled with</div><div class='del'>- * the component parts of the name.</div><div class='del'>- */</div><div class='del'>-ENameWestern *</div><div class='del'>-e_name_western_parse (const char *full_name)</div><div class='del'>-{</div><div class='del'>-	ENameWesternIdxs *idxs;</div><div class='del'>-	ENameWestern *wname;</div><div class='del'>-</div><div class='del'>-	wname = g_new0 (ENameWestern, 1);</div><div class='del'>-</div><div class='del'>-	wname-&gt;full = g_strdup (full_name);</div><div class='del'>-</div><div class='del'>-	idxs = g_new0 (ENameWesternIdxs, 1);</div><div class='del'>-</div><div class='del'>-	idxs-&gt;prefix_idx = -1;</div><div class='del'>-	idxs-&gt;first_idx  = -1;</div><div class='del'>-	idxs-&gt;middle_idx = -1;</div><div class='del'>-	idxs-&gt;nick_idx   = -1;</div><div class='del'>-	idxs-&gt;last_idx   = -1;</div><div class='del'>-	idxs-&gt;suffix_idx = -1;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * An extremely simple algorithm.</div><div class='del'>-	 *</div><div class='del'>-	 * The goal here is to get it right 95% of the time for</div><div class='del'>-	 * Western names.</div><div class='del'>-	 *</div><div class='del'>-	 * First we check to see if this is an ass-backwards name</div><div class='del'>-	 * ("Prefix Last, First Middle Suffix").  These names really</div><div class='del'>-	 * suck (imagine "Dr von Johnson, Albert Roderick Jr"), so</div><div class='del'>-	 * we reorder them first and then parse them.</div><div class='del'>-	 *</div><div class='del'>-	 * Next, we grab the most obvious assignments for the various</div><div class='del'>-	 * parts of the name.  Once this is done, we check for stupid</div><div class='del'>-	 * errors and fix them up.</div><div class='del'>-	 */</div><div class='del'>-	e_name_western_reorder_asshole  (wname, idxs);</div><div class='del'>-</div><div class='del'>-	e_name_western_extract_prefix   (wname, idxs);</div><div class='del'>-	e_name_western_extract_first    (wname, idxs);</div><div class='del'>-	e_name_western_extract_nickname (wname, idxs);</div><div class='del'>-	e_name_western_extract_middle   (wname, idxs);</div><div class='del'>-	e_name_western_extract_last     (wname, idxs);</div><div class='del'>-	e_name_western_extract_suffix   (wname, idxs);</div><div class='del'>-</div><div class='del'>-	e_name_western_fixup            (wname, idxs);</div><div class='del'>-</div><div class='del'>-	g_free (idxs);</div><div class='del'>-</div><div class='del'>-	return wname;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_name_western_free:</div><div class='del'>- * @name: An ENameWestern object which needs to be freed.</div><div class='del'>- *</div><div class='del'>- * Deep-frees @name</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_name_western_free (ENameWestern *w)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	g_free (w-&gt;prefix);</div><div class='del'>-	g_free (w-&gt;first);</div><div class='del'>-	g_free (w-&gt;middle);</div><div class='del'>-	g_free (w-&gt;nick);</div><div class='del'>-	g_free (w-&gt;last);</div><div class='del'>-	g_free (w-&gt;suffix);</div><div class='del'>-	</div><div class='del'>-	g_free (w-&gt;full);</div><div class='del'>-</div><div class='del'>-	g_free (w);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/ename/e-name-western.h b/e-util/ename/e-name-western.h<br/>deleted file mode 100644<br/>index fa5bac494c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/e-name-western.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-#ifndef __E_NAME_WESTERN_H__</div><div class='del'>-#define __E_NAME_WESTERN_H__</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-</div><div class='del'>-	/* Public */</div><div class='del'>-	char *prefix;</div><div class='del'>-	char *first;</div><div class='del'>-	char *middle;</div><div class='del'>-	char *nick;</div><div class='del'>-	char *last;</div><div class='del'>-	char *suffix;</div><div class='del'>-</div><div class='del'>-	/* Private */</div><div class='del'>-	char *full;</div><div class='del'>-} ENameWestern;</div><div class='del'>-</div><div class='del'>-ENameWestern *e_name_western_parse (const char   *full_name);</div><div class='del'>-void          e_name_western_free  (ENameWestern *w);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_NAME_WESTERN_H__ */</div><div class='head'>diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c<br/>deleted file mode 100644<br/>index 8ae0ef8770..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/test-ename-western-gtk.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/test-ename-western-gtk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,157 +0,0 @@</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-app.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "e-name-western.h"</div><div class='del'>-</div><div class='del'>-ENameWestern *name;</div><div class='del'>-GtkWidget    *full;</div><div class='del'>-GtkWidget    *prefix;</div><div class='del'>-GtkWidget    *first;</div><div class='del'>-GtkWidget    *middle;</div><div class='del'>-GtkWidget    *nick;</div><div class='del'>-GtkWidget    *last;</div><div class='del'>-GtkWidget    *suffix;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_entries (void)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-#define SET(a,b) (e_utf8_gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))</div><div class='del'>-	SET(prefix, name-&gt;prefix);</div><div class='del'>-	SET(first,  name-&gt;first);</div><div class='del'>-	SET(middle, name-&gt;middle);</div><div class='del'>-	SET(nick,   name-&gt;nick);</div><div class='del'>-	SET(last,   name-&gt;last);</div><div class='del'>-	SET(suffix, name-&gt;suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_changed_cb (GtkEntry *fulle)</div><div class='del'>-{</div><div class='del'>-	gchar *str;</div><div class='del'>-</div><div class='del'>-	e_name_western_free (name);</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (fulle);</div><div class='del'>-	name = e_name_western_parse (str);</div><div class='del'>-	fill_entries ();</div><div class='del'>-</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_window (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GtkTable  *table;</div><div class='del'>-</div><div class='del'>-	GtkWidget *prefix_label;</div><div class='del'>-	GtkWidget *first_label;</div><div class='del'>-	GtkWidget *middle_label;</div><div class='del'>-	GtkWidget *nick_label;</div><div class='del'>-	GtkWidget *last_label;</div><div class='del'>-	GtkWidget *suffix_label;</div><div class='del'>-</div><div class='del'>-	app = gnome_app_new ("test", "Evolution Western Name Parser");</div><div class='del'>-</div><div class='del'>-	table = GTK_TABLE (gtk_table_new (3, 6, FALSE));</div><div class='del'>-</div><div class='del'>-	full   = gtk_entry_new ();</div><div class='del'>-	prefix = gtk_entry_new ();</div><div class='del'>-	first  = gtk_entry_new ();</div><div class='del'>-	middle = gtk_entry_new ();</div><div class='del'>-	nick   = gtk_entry_new ();</div><div class='del'>-	last   = gtk_entry_new ();</div><div class='del'>-	suffix = gtk_entry_new ();</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (prefix, 100, 0);</div><div class='del'>-	gtk_widget_set_usize (first,  100, 0);</div><div class='del'>-	gtk_widget_set_usize (middle, 100, 0);</div><div class='del'>-	gtk_widget_set_usize (nick,   100, 0);</div><div class='del'>-	gtk_widget_set_usize (last,   100, 0);</div><div class='del'>-	gtk_widget_set_usize (suffix, 100, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, full, 0, 6, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, prefix, 0, 1, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, first, 1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, middle, 2, 3, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, nick, 3, 4, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, last, 4, 5, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, suffix, 5, 6, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	prefix_label = gtk_label_new ("Prefix"); </div><div class='del'>-	first_label  = gtk_label_new ("First"); </div><div class='del'>-	middle_label = gtk_label_new ("Middle"); </div><div class='del'>-	nick_label   = gtk_label_new ("Nick"); </div><div class='del'>-	last_label   = gtk_label_new ("Last"); </div><div class='del'>-	suffix_label = gtk_label_new ("Suffix"); </div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, prefix_label, 0, 1, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, first_label, 1, 2, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, middle_label, 2, 3, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, nick_label, 3, 4, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, last_label, 4, 5, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, suffix_label, 5, 6, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gnome_app_set_contents (GNOME_APP (app), GTK_WIDGET (table));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (app);</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (full),</div><div class='del'>-			    "The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");</div><div class='del'>-</div><div class='del'>-	name = e_name_western_parse ("The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");</div><div class='del'>-	fill_entries ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (full), "changed", full_changed_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init ("Test EName", "Test EName", argc, argv);</div><div class='del'>-</div><div class='del'>-	create_window ();</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c<br/>deleted file mode 100644<br/>index 09847b5b4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/test-ename-western.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/ename/test-ename-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmain.h&gt;</div><div class='del'>-#include &lt;ename/e-name-western.h&gt;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_name (char *n)</div><div class='del'>-{</div><div class='del'>-	ENameWestern *wname;</div><div class='del'>-</div><div class='del'>-	wname = e_name_western_parse (n);</div><div class='del'>-</div><div class='del'>-	printf ("Full Name: [%s]\n", n);</div><div class='del'>-</div><div class='del'>-	printf ("Prefix: [%s]\n", wname-&gt;prefix);</div><div class='del'>-	printf ("First:  [%s]\n", wname-&gt;first);</div><div class='del'>-	printf ("Middle: [%s]\n", wname-&gt;middle);</div><div class='del'>-	printf ("Nick:   [%s]\n", wname-&gt;nick);</div><div class='del'>-	printf ("Last:   [%s]\n", wname-&gt;last);</div><div class='del'>-	printf ("Suffix: [%s]\n", wname-&gt;suffix);</div><div class='del'>-</div><div class='del'>-	printf ("\n");</div><div class='del'>-</div><div class='del'>-	e_name_western_free (wname);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		while (! feof (stdin)) {</div><div class='del'>-			char s[256];</div><div class='del'>-</div><div class='del'>-			if (fgets (s, sizeof (s), stdin) == NULL)</div><div class='del'>-				return 0;</div><div class='del'>-</div><div class='del'>-			g_strstrip (s);</div><div class='del'>-</div><div class='del'>-			do_name (s);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	do_name ("Nat");</div><div class='del'>-	do_name ("Karl Anders Carlsson");</div><div class='del'>-	do_name ("Miguel de Icaza Amozorrutia");</div><div class='del'>-	do_name ("The Honorable Doctor de Icaza, Miguel \"Sparky\" Junior, PhD, MD");</div><div class='del'>-	do_name ("Nat Friedman MD, Phd");</div><div class='del'>-	do_name ("Nat Friedman PhD");</div><div class='del'>-	do_name ("Friedman, Nat");</div><div class='del'>-	do_name ("Miguel de Icaza Esquire");</div><div class='del'>-	do_name ("Dr Miguel \"Sparky\" de Icaza");</div><div class='del'>-	do_name ("Robert H.B. Netzer");</div><div class='del'>-	do_name ("W. Richard Stevens");</div><div class='del'>-	do_name ("Nat Friedman");</div><div class='del'>-	do_name ("N. Friedman");</div><div class='del'>-	do_name ("Miguel de Icaza");</div><div class='del'>-	do_name ("Drew Johnson");</div><div class='del'>-	do_name ("President Bill \"Slick Willy\" Clinton");</div><div class='del'>-	do_name ("The Honorable Mark J. Einstein Jr");</div><div class='del'>-	do_name ("Friedman, Nat");</div><div class='del'>-	do_name ("de Icaza, Miguel");</div><div class='del'>-	do_name ("Mr de Icaza, Miguel");</div><div class='del'>-	do_name ("Smith, John Jr");</div><div class='del'>-	do_name ("Nick Glennie-Smith");</div><div class='del'>-	do_name ("Dr von Johnson, Albert Roderick Jr");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/md5-utils.c b/e-util/md5-utils.c<br/>deleted file mode 100644<br/>index 6f7e06f48d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/md5-utils.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/md5-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,363 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * This code implements the MD5 message-digest algorithm.</div><div class='del'>- * The algorithm is due to Ron Rivest.  This code was</div><div class='del'>- * written by Colin Plumb in 1993, no copyright is claimed.</div><div class='del'>- * This code is in the public domain; do with it what you wish.</div><div class='del'>- *</div><div class='del'>- * Equivalent code is available from RSA Data Security, Inc.</div><div class='del'>- * This code has been tested against that, and is equivalent,</div><div class='del'>- * except that you don't need to include two pages of legalese</div><div class='del'>- * with every copy.</div><div class='del'>- *</div><div class='del'>- * To compute the message digest of a chunk of bytes, declare an</div><div class='del'>- * MD5Context structure, pass it to md5_init, call md5_update as</div><div class='del'>- * needed on buffers full of bytes, and then call md5_Final, which</div><div class='del'>- * will fill a supplied 16-byte array with the digest.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* parts of this file are :</div><div class='del'>- * Written March 1993 by Branko Lankester</div><div class='del'>- * Modified June 1993 by Colin Plumb for altered md5.c.</div><div class='del'>- * Modified October 1995 by Erik Troan for RPM</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "md5-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void md5_transform (guint32 buf[4], const guint32 in[16]);</div><div class='del'>-</div><div class='del'>-static gint _ie = 0x44332211;</div><div class='del'>-static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&amp;_ie;</div><div class='del'>-#define	IS_BIG_ENDIAN()		(_endian-&gt;b[0] == '\x44')</div><div class='del'>-#define	IS_LITTLE_ENDIAN()	(_endian-&gt;b[0] == '\x11')</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Note: this code is harmless on little-endian machines.</div><div class='del'>- */</div><div class='del'>-static void </div><div class='del'>-_byte_reverse (guchar *buf, guint32 longs)</div><div class='del'>-{</div><div class='del'>-	guint32 t;</div><div class='del'>-	do {</div><div class='del'>-		t = (guint32) ((guint32) buf[3] &lt;&lt; 8 | buf[2]) &lt;&lt; 16 |</div><div class='del'>-			((guint32) buf[1] &lt;&lt; 8 | buf[0]);</div><div class='del'>-		*(guint32 *) buf = t;</div><div class='del'>-		buf += 4;</div><div class='del'>-	} while (--longs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * md5_init: Initialise an md5 context object</div><div class='del'>- * @ctx: md5 context </div><div class='del'>- * </div><div class='del'>- * Initialise an md5 buffer. </div><div class='del'>- *</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-md5_init (MD5Context *ctx)</div><div class='del'>-{</div><div class='del'>-	ctx-&gt;buf[0] = 0x67452301;</div><div class='del'>-	ctx-&gt;buf[1] = 0xefcdab89;</div><div class='del'>-	ctx-&gt;buf[2] = 0x98badcfe;</div><div class='del'>-	ctx-&gt;buf[3] = 0x10325476;</div><div class='del'>-	</div><div class='del'>-	ctx-&gt;bits[0] = 0;</div><div class='del'>-	ctx-&gt;bits[1] = 0;</div><div class='del'>-	</div><div class='del'>-	if (IS_BIG_ENDIAN())	</div><div class='del'>-		ctx-&gt;doByteReverse = 1;		</div><div class='del'>-	else </div><div class='del'>-		ctx-&gt;doByteReverse = 0;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * md5_update: add a buffer to md5 hash computation</div><div class='del'>- * @ctx: conetxt object used for md5 computaion</div><div class='del'>- * @buf: buffer to add</div><div class='del'>- * @len: buffer length</div><div class='del'>- * </div><div class='del'>- * Update context to reflect the concatenation of another buffer full</div><div class='del'>- * of bytes. Use this to progressively construct an md5 hash.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-md5_update (MD5Context *ctx, const guchar *buf, guint32 len)</div><div class='del'>-{</div><div class='del'>-	guint32 t;</div><div class='del'>-	</div><div class='del'>-	/* Update bitcount */</div><div class='del'>-	</div><div class='del'>-	t = ctx-&gt;bits[0];</div><div class='del'>-	if ((ctx-&gt;bits[0] = t + ((guint32) len &lt;&lt; 3)) &lt; t)</div><div class='del'>-		ctx-&gt;bits[1]++;		/* Carry from low to high */</div><div class='del'>-	ctx-&gt;bits[1] += len &gt;&gt; 29;</div><div class='del'>-	</div><div class='del'>-	t = (t &gt;&gt; 3) &amp; 0x3f;	/* Bytes already in shsInfo-&gt;data */</div><div class='del'>-	</div><div class='del'>-	/* Handle any leading odd-sized chunks */</div><div class='del'>-	</div><div class='del'>-	if (t) {</div><div class='del'>-		guchar *p = (guchar *) ctx-&gt;in + t;</div><div class='del'>-		</div><div class='del'>-		t = 64 - t;</div><div class='del'>-		if (len &lt; t) {</div><div class='del'>-			memcpy (p, buf, len);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		memcpy (p, buf, t);</div><div class='del'>-		if (ctx-&gt;doByteReverse)</div><div class='del'>-			_byte_reverse (ctx-&gt;in, 16);</div><div class='del'>-		md5_transform (ctx-&gt;buf, (guint32 *) ctx-&gt;in);</div><div class='del'>-		buf += t;</div><div class='del'>-		len -= t;</div><div class='del'>-	}</div><div class='del'>-	/* Process data in 64-byte chunks */</div><div class='del'>-	</div><div class='del'>-	while (len &gt;= 64) {</div><div class='del'>-		memcpy (ctx-&gt;in, buf, 64);</div><div class='del'>-		if (ctx-&gt;doByteReverse)</div><div class='del'>-			_byte_reverse (ctx-&gt;in, 16);</div><div class='del'>-		md5_transform (ctx-&gt;buf, (guint32 *) ctx-&gt;in);</div><div class='del'>-		buf += 64;</div><div class='del'>-		len -= 64;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Handle any remaining bytes of data. */</div><div class='del'>-	</div><div class='del'>-	memcpy (ctx-&gt;in, buf, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Final wrapup - pad to 64-byte boundary with the bit pattern </div><div class='del'>- * 1 0* (64-bit count of bits processed, MSB-first)</div><div class='del'>- */</div><div class='del'>-/**</div><div class='del'>- * md5_final: copy the final md5 hash to a bufer</div><div class='del'>- * @digest: 16 bytes buffer</div><div class='del'>- * @ctx: context containing the calculated md5</div><div class='del'>- * </div><div class='del'>- * copy the final md5 hash to a bufer</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-md5_final (MD5Context *ctx, guchar digest[16])</div><div class='del'>-{</div><div class='del'>-	guint32 count;</div><div class='del'>-	guchar *p;</div><div class='del'>-	</div><div class='del'>-	/* Compute number of bytes mod 64 */</div><div class='del'>-	count = (ctx-&gt;bits[0] &gt;&gt; 3) &amp; 0x3F;</div><div class='del'>-	</div><div class='del'>-	/* Set the first char of padding to 0x80.  This is safe since there is</div><div class='del'>-	   always at least one byte free */</div><div class='del'>-	p = ctx-&gt;in + count;</div><div class='del'>-	*p++ = 0x80;</div><div class='del'>-	</div><div class='del'>-	/* Bytes of padding needed to make 64 bytes */</div><div class='del'>-	count = 64 - 1 - count;</div><div class='del'>-	</div><div class='del'>-	/* Pad out to 56 mod 64 */</div><div class='del'>-	if (count &lt; 8) {</div><div class='del'>-		/* Two lots of padding:  Pad the first block to 64 bytes */</div><div class='del'>-		memset (p, 0, count);</div><div class='del'>-		if (ctx-&gt;doByteReverse)</div><div class='del'>-			_byte_reverse (ctx-&gt;in, 16);</div><div class='del'>-		md5_transform (ctx-&gt;buf, (guint32 *) ctx-&gt;in);</div><div class='del'>-		</div><div class='del'>-		/* Now fill the next block with 56 bytes */</div><div class='del'>-		memset (ctx-&gt;in, 0, 56);</div><div class='del'>-	} else {</div><div class='del'>-		/* Pad block to 56 bytes */</div><div class='del'>-		memset (p, 0, count - 8);</div><div class='del'>-	}</div><div class='del'>-	if (ctx-&gt;doByteReverse)</div><div class='del'>-		_byte_reverse (ctx-&gt;in, 14);</div><div class='del'>-	</div><div class='del'>-	/* Append length in bits and transform */</div><div class='del'>-	((guint32 *) ctx-&gt;in)[14] = ctx-&gt;bits[0];</div><div class='del'>-	((guint32 *) ctx-&gt;in)[15] = ctx-&gt;bits[1];</div><div class='del'>-	</div><div class='del'>-	md5_transform (ctx-&gt;buf, (guint32 *) ctx-&gt;in);</div><div class='del'>-	if (ctx-&gt;doByteReverse)</div><div class='del'>-		_byte_reverse ((guchar *) ctx-&gt;buf, 4);</div><div class='del'>-	memcpy (digest, ctx-&gt;buf, 16);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The four core functions - F1 is optimized somewhat */</div><div class='del'>-</div><div class='del'>-/* #define F1(x, y, z) (x &amp; y | ~x &amp; z) */</div><div class='del'>-#define F1(x, y, z) (z ^ (x &amp; (y ^ z)))</div><div class='del'>-#define F2(x, y, z) F1(z, x, y)</div><div class='del'>-#define F3(x, y, z) (x ^ y ^ z)</div><div class='del'>-#define F4(x, y, z) (y ^ (x | ~z))</div><div class='del'>-</div><div class='del'>-/* This is the central step in the MD5 algorithm. */</div><div class='del'>-#define MD5STEP(f, w, x, y, z, data, s) \</div><div class='del'>-	( w += f(x, y, z) + data,  w = w&lt;&lt;s | w&gt;&gt;(32-s),  w += x )</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * The core of the MD5 algorithm, this alters an existing MD5 hash to</div><div class='del'>- * reflect the addition of 16 longwords of new data.  md5_Update blocks</div><div class='del'>- * the data and converts bytes into longwords for this routine.</div><div class='del'>- */</div><div class='del'>-static void </div><div class='del'>-md5_transform (guint32 buf[4], const guint32 in[16])</div><div class='del'>-{</div><div class='del'>-	register guint32 a, b, c, d;</div><div class='del'>-	</div><div class='del'>-	a = buf[0];</div><div class='del'>-	b = buf[1];</div><div class='del'>-	c = buf[2];</div><div class='del'>-	d = buf[3];</div><div class='del'>-	</div><div class='del'>-	MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);</div><div class='del'>-	MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);</div><div class='del'>-	MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);</div><div class='del'>-	MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);</div><div class='del'>-	MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);</div><div class='del'>-	MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);</div><div class='del'>-	MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);</div><div class='del'>-	MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);</div><div class='del'>-	MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);</div><div class='del'>-	MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);</div><div class='del'>-	MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);</div><div class='del'>-	MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);</div><div class='del'>-	MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);</div><div class='del'>-	MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);</div><div class='del'>-	MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);</div><div class='del'>-	MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);</div><div class='del'>-	</div><div class='del'>-	MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);</div><div class='del'>-	MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);</div><div class='del'>-	MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);</div><div class='del'>-	MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);</div><div class='del'>-	MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);</div><div class='del'>-	MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);</div><div class='del'>-	MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);</div><div class='del'>-	MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);</div><div class='del'>-	MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);</div><div class='del'>-	MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);</div><div class='del'>-	MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);</div><div class='del'>-	MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);</div><div class='del'>-	MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);</div><div class='del'>-	MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);</div><div class='del'>-	MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);</div><div class='del'>-	MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);</div><div class='del'>-	</div><div class='del'>-	MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);</div><div class='del'>-	MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);</div><div class='del'>-	MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);</div><div class='del'>-	MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);</div><div class='del'>-	MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);</div><div class='del'>-	MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);</div><div class='del'>-	MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);</div><div class='del'>-	MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);</div><div class='del'>-	MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);</div><div class='del'>-	MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);</div><div class='del'>-	MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);</div><div class='del'>-	MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);</div><div class='del'>-	MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);</div><div class='del'>-	MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);</div><div class='del'>-	MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);</div><div class='del'>-	MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);</div><div class='del'>-	</div><div class='del'>-	MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);</div><div class='del'>-	MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);</div><div class='del'>-	MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);</div><div class='del'>-	MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);</div><div class='del'>-	MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);</div><div class='del'>-	MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);</div><div class='del'>-	MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);</div><div class='del'>-	MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);</div><div class='del'>-	MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);</div><div class='del'>-	MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);</div><div class='del'>-	MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);</div><div class='del'>-	MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);</div><div class='del'>-	MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);</div><div class='del'>-	MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);</div><div class='del'>-	MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);</div><div class='del'>-	MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);</div><div class='del'>-	</div><div class='del'>-	buf[0] += a;</div><div class='del'>-	buf[1] += b;</div><div class='del'>-	buf[2] += c;</div><div class='del'>-	buf[3] += d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * md5_get_digest: get the md5 hash of a buffer</div><div class='del'>- * @buffer: byte buffer</div><div class='del'>- * @buffer_size: buffer size (in bytes)</div><div class='del'>- * @digest: 16 bytes buffer receiving the hash code.</div><div class='del'>- * </div><div class='del'>- * Get the md5 hash of a buffer. The result is put in </div><div class='del'>- * the 16 bytes buffer @digest .</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])</div><div class='del'>-{	</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	md5_update (&amp;ctx, buffer, buffer_size);</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * md5_get_digest_from_file: get the md5 hash of a file</div><div class='del'>- * @filename: file name</div><div class='del'>- * @digest: 16 bytes buffer receiving the hash code.</div><div class='del'>- * </div><div class='del'>- * Get the md5 hash of a file. The result is put in </div><div class='del'>- * the 16 bytes buffer @digest .</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-md5_get_digest_from_file (const gchar *filename, guchar digest[16])</div><div class='del'>-{	</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	guchar tmp_buf[1024];</div><div class='del'>-	gint nb_bytes_read;</div><div class='del'>-	FILE *fp;</div><div class='del'>-</div><div class='del'>-	printf("generating checksum\n");</div><div class='del'>-</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	fp = fopen(filename, "r");</div><div class='del'>-	if (!fp) {</div><div class='del'>-	return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) &gt; 0)</div><div class='del'>-		md5_update (&amp;ctx, tmp_buf, nb_bytes_read);</div><div class='del'>-	</div><div class='del'>-	if (ferror(fp)) {</div><div class='del'>-		fclose(fp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	printf("checksum done\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/md5-utils.h b/e-util/md5-utils.h<br/>deleted file mode 100644<br/>index 607471a752..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/md5-utils.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>e-util/md5-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * This code implements the MD5 message-digest algorithm.</div><div class='del'>- * The algorithm is due to Ron Rivest.  This code was</div><div class='del'>- * written by Colin Plumb in 1993, no copyright is claimed.</div><div class='del'>- * This code is in the public domain; do with it what you wish.</div><div class='del'>- *</div><div class='del'>- * Equivalent code is available from RSA Data Security, Inc.</div><div class='del'>- * This code has been tested against that, and is equivalent,</div><div class='del'>- * except that you don't need to include two pages of legalese</div><div class='del'>- * with every copy.</div><div class='del'>- *</div><div class='del'>- * To compute the message digest of a chunk of bytes, declare an</div><div class='del'>- * MD5Context structure, pass it to rpmMD5Init, call rpmMD5Update as</div><div class='del'>- * needed on buffers full of bytes, and then call rpmMD5Final, which</div><div class='del'>- * will fill a supplied 16-byte array with the digest.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* parts of this file are :</div><div class='del'>- * Written March 1993 by Branko Lankester</div><div class='del'>- * Modified June 1993 by Colin Plumb for altered md5.c.</div><div class='del'>- * Modified October 1995 by Erik Troan for RPM</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef MD5_UTILS_H</div><div class='del'>-#define MD5_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _MD5Context {</div><div class='del'>-	guint32 buf[4];</div><div class='del'>-	guint32 bits[2];</div><div class='del'>-	guchar in[64];</div><div class='del'>-	gint doByteReverse;</div><div class='del'>-} MD5Context;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);</div><div class='del'>-</div><div class='del'>-/* use this one when speed is needed */</div><div class='del'>-/* for use in provider code only */</div><div class='del'>-void md5_get_digest_from_file (const gchar *filename, guchar digest[16]);</div><div class='del'>-</div><div class='del'>-/* raw routines */</div><div class='del'>-void md5_init (MD5Context *ctx);</div><div class='del'>-void md5_update (MD5Context *ctx, const guchar *buf, guint32 len);</div><div class='del'>-void md5_final (MD5Context *ctx, guchar digest[16]);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif	/* MD5_UTILS_H */</div><div class='head'>diff --git a/executive-summary/.cvsignore b/executive-summary/.cvsignore<br/>deleted file mode 100644<br/>index a098ff204f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-core</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-GNOME_Evolution_Summary.oaf</div><div class='head'>diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog<br/>deleted file mode 100644<br/>index 3ab48d9509..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,908 +0,0 @@</div><div class='del'>-2001-09-14  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	[Automake 1.5 fixes pointed out by Richard Boulton</div><div class='del'>-	&lt;richard@tartarus.org&gt;, as per #9258.]</div><div class='del'>-</div><div class='del'>-	* executive-summary/component/Makefile.am (CLEANFILE): Assign</div><div class='del'>-	directly with `=', not `+='.</div><div class='del'>-	* executive-summary/evolution-services/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2001-07-21  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c: Make the "executive-summary"</div><div class='del'>-	folders non-user-creatable by setting `user_creatable' to %FALSE</div><div class='del'>-	in the `EvolutionShellComponentFolderType's.</div><div class='del'>-</div><div class='del'>-2001-06-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/Makefile.am (test_service_LDADD): Remove DB3_LDADD</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution_executive_summary_LDADD):</div><div class='del'>-	Remove DB3_LDADD</div><div class='del'>-</div><div class='del'>-2001-06-04  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution_executive_summary_LDADD): Move</div><div class='del'>-	`libevolution-services.la' on top.</div><div class='del'>-</div><div class='del'>-2001-06-03  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/Makefile.am (rdf_summary_LDADD): Move</div><div class='del'>-	`$(DB3_LDADD)' before the shared libraries.</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution_executive_summary_LDADD): Move</div><div class='del'>-	`$(DB3_LDADD)' before libeutil.</div><div class='del'>-</div><div class='del'>-2001-06-01  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution_executive_summary_LDADD): Add</div><div class='del'>-	`$(DB3_LDADD)'.</div><div class='del'>-	* test-service/Makefile.am (test_service_LDADD): Likewise.</div><div class='del'>-	(rdf_summary_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2001-05-27  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c: #include</div><div class='del'>-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"</div><div class='del'>-	for e_pixmaps_update.</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution_executive_summary_LDADD): Use</div><div class='del'>-	libeshell.la, not libeshell.a (Did Peter forget to commit this?)</div><div class='del'>-</div><div class='del'>-2001-05-25  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am: Reference libeshell.la instead of libeshell.a.</div><div class='del'>-</div><div class='del'>-2001-05-23  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c: Mark a string for translation.</div><div class='del'>-	</div><div class='del'>-2001-05-10  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (load_from_stream): Set the time, not the</div><div class='del'>-	timeout id. (duh!)</div><div class='del'>-	(summary_to_string): Get the time, not the timeout id. (DUH!)</div><div class='del'>-	(property_control): Connect the spin button to the item_changed callback.</div><div class='del'>-</div><div class='del'>-2001-05-10  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (property_control): Don't let the spinner </div><div class='del'>-	be set to 0</div><div class='del'>-</div><div class='del'>-2001-05-10  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (download_cb): Proxy clicked events to</div><div class='del'>-	download.</div><div class='del'>-	(property_control): Connect the Update Now button to the download_cb</div><div class='del'>-	instead of download to prevent a crash.</div><div class='del'>-</div><div class='del'>-2001-05-05  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am, evolution-services/Makefile.am: no need of</div><div class='del'>-	-DEVOLUTION_VERSION</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c: translate window title.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_describe): contents are in</div><div class='del'>-	utf-8, convert to locale.</div><div class='del'>-</div><div class='del'>-	* test-service/Makefile.am: define EVOLUTION_LOCALEDIR.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c: init gettext.</div><div class='del'>-</div><div class='del'>-2001-05-02  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c: set default content type of html to</div><div class='del'>-	"text/html; charset=utf-8".</div><div class='del'>-</div><div class='del'>-2001-04-25  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am (INCLUDES): Remove this section, which doesn't</div><div class='del'>-	apply to anything since there are no targets in this directory.</div><div class='del'>-</div><div class='del'>-	* test-service/Makefile.am: </div><div class='del'>-	* evolution-services/Makefile.am: </div><div class='del'>-	* component/Makefile.am: Remove UNICODE_LIBS/UNICODE_CFLAGS</div><div class='del'>-</div><div class='del'>-2001-04-14  Michael Meeks  &lt;michael@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am: Remove stale build cruftiness.</div><div class='del'>-</div><div class='del'>-2001-04-10  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-summary-subwindow.c: added some missing includes.</div><div class='del'>-	* widgets/e-summary-title-button.h: same.</div><div class='del'>-</div><div class='del'>-2001-04-04  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c: last time I've broken shortcut view.</div><div class='del'>-	renamed icons properly.</div><div class='del'>-</div><div class='del'>-2001-04-01  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c: Changed folder type icon to tiny</div><div class='del'>-	executive summary icon.</div><div class='del'>-	* component/e-summary-factory.c: replaced set_pixmap with new EPixmap</div><div class='del'>-	cache.</div><div class='del'>-</div><div class='del'>-2001-03-29  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* *.*: Clean up includes. Remove/replace &lt;gnome.h&gt;, &lt;bonobo.h&gt;</div><div class='del'>-	and &lt;gtk/gtk.h&gt;.</div><div class='del'>-	</div><div class='del'>-2001-03-08  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c (factory_fn): Specify a NULL</div><div class='del'>-	`EvolutionShellComponentGetDndSelectionFn'.</div><div class='del'>-</div><div class='del'>-2001-02-14  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Remove the new</div><div class='del'>-	OTHER uri stuff.</div><div class='del'>-</div><div class='del'>-2001-02-14  Christopher James Lahey  &lt;clahey@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c (component_destroy_cb): Removed</div><div class='del'>-	this unused function.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.c</div><div class='del'>-	(impl_GNOME_Evolution_Summary_HTMLView_handleURI): Changed the</div><div class='del'>-	declaration of this function to match the signature in the</div><div class='del'>-	generated header file.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (property_control): Added a cast here.</div><div class='del'>-</div><div class='del'>-2001-02-14  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.c </div><div class='del'>-	(executive_summary_html_view_destroy): Don't unref the event source.</div><div class='del'>-	(impl_GNOME_Evolution_Summary_HTMLView_handleURI): Emit the signal.</div><div class='del'>-	(corba_class_init): Hook up the handleURI method.</div><div class='del'>-	(executive_summary_html_view_class_init): Create the signal.</div><div class='del'>-</div><div class='del'>-	* idl/HTMLView.idl: Add the handleURI method.</div><div class='del'>-</div><div class='del'>-2001-02-13  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (property_control): Add an update now button.</div><div class='del'>-</div><div class='del'>-2001-02-12  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (property_control): Add a "Update" spinner.</div><div class='del'>-	(property_action): Only download a new RDF if the URL changed. Use a cached</div><div class='del'>-	version otherwise.</div><div class='del'>-</div><div class='del'>-2001-02-08  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Close and remove the</div><div class='del'>-	window on an idle, so that the whole desktop isn't locked by a </div><div class='del'>-	GNOME-VFS bug.</div><div class='del'>-</div><div class='del'>-2001-02-13  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: xml-i18n-tools setup for .oaf.in files.</div><div class='del'>-	* GNOME_Evolution_Summary.oaf.in: Mark strings for translation.</div><div class='del'>-	* test-service/Makefile.am: xml-i18n-tools setup for .oaf.in files.</div><div class='del'>-	* test-service/*.oaf.in: Mark strings for translation.</div><div class='del'>-	</div><div class='del'>-2001-01-23  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_load_page): Don't strdup the NULL.</div><div class='del'>-</div><div class='del'>-2001-01-20  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_display_window): Free the html</div><div class='del'>-	variable and the header too.</div><div class='del'>-</div><div class='del'>-2001-01-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c: Change the callbacks in this file to</div><div class='del'>-	match the callback function types.  Fixes warnings.</div><div class='del'>-</div><div class='del'>-2001-01-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c (factory_fn): Pass NULL as the</div><div class='del'>-	@copy_folder_fn arg to `evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c</div><div class='del'>-	(executive_summary_component_destroy): Remove unused variable.</div><div class='del'>-</div><div class='del'>-2001-01-12  Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-util.c (e_summary_rm_dir): If base == NULL return;</div><div class='del'>-	Closes bug #37077</div><div class='del'>-</div><div class='del'>-2000-12-30  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): The number of columns</div><div class='del'>-	is no longer hardcoded.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-prefs.[ch]: Add a columns member, and all the </div><div class='del'>-	necessary code to support it.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c: Set the columns member.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c: Add a "Show title" button for turning off</div><div class='del'>-	the title if it is taking up too much room.</div><div class='del'>-</div><div class='del'>-2000-12-29  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (view_destroyed): Cancel all pending</div><div class='del'>-	async downloads.</div><div class='del'>-	(load_from_stream): Check if the XML was correctly loaded.</div><div class='del'>-	(read_callback):</div><div class='del'>-	(close_callback):</div><div class='del'>-	(open_callback): Add a cast to remove warnings</div><div class='del'>-	</div><div class='del'>-	* component/e-summary.c (listener_event): Check for the correct event names.</div><div class='del'>-</div><div class='del'>-2000-12-28  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (create_view): Aggregate a </div><div class='del'>-	Bonobo::PersistStream interface.</div><div class='del'>-	(load_from_stream):</div><div class='del'>-	(summary_to_string):</div><div class='del'>-	(save_to_stream):</div><div class='del'>-	(content_types): Functions to load and save an XML document.</div><div class='del'>-</div><div class='del'>-2000-12-26  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (make_control_html): Neatened the code.</div><div class='del'>-	(e_summary_add_service): Get the event source that is shared</div><div class='del'>-	between everything.</div><div class='del'>-	</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Use the shared</div><div class='del'>-	event source.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (create_view): Use the EventSource when</div><div class='del'>-	creating the BonoboPropertyBag.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c (create_view): Create a shared BonoboEventSource.</div><div class='del'>-</div><div class='del'>-2000-12-21  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (download): Split this function into</div><div class='del'>-	many callbacks, for async action.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_request): Split this </div><div class='del'>-	into async callbacks too.</div><div class='del'>-</div><div class='del'>-2000-12-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c (configure_summary): Added a</div><div class='del'>-	cast.</div><div class='del'>-</div><div class='del'>-2000-12-13  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): Display all the windows</div><div class='del'>-	correctly.</div><div class='del'>-	(e_summary_save_state): Remove the whole of the Executive-Summary dir.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-util.[ch]: Add e_summary_rm_dir, a function to reove</div><div class='del'>-	everything in the path. RC people have a function to do it too, but I can't</div><div class='del'>-	remember how to get RC :)</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c: (configure_summary): Put an HTML </div><div class='del'>-	explanation into the configure dialog.</div><div class='del'>-</div><div class='del'>-2000-12-13  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): Count the number</div><div class='del'>-	of rows correctly.</div><div class='del'>-</div><div class='del'>-2000-12-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c: Added #include</div><div class='del'>-	&lt;e-summary-callbacks.h&gt;.</div><div class='del'>-	(destroy_prefs_cb): Added a cast.</div><div class='del'>-	(configure_summary): Added a cast.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.h: Added #include "e-summary.h"</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Removed an</div><div class='del'>-	unused variable.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-util.c: Added #include &lt;e-summary-util.h&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c: Added #include &lt;gtkhtml/htmlselection.h&gt;.</div><div class='del'>-	(e_summary_queue_rebuild): Added a cast.</div><div class='del'>-</div><div class='del'>-	* component/main.c: Added #include &lt;glade/glade.h&gt;.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Changed some variable types to make casting</div><div class='del'>-	easier.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c: Changed some variable types to make</div><div class='del'>-	casting easier.</div><div class='del'>-</div><div class='del'>-2000-12-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Add stuff. (From campd.)</div><div class='del'>-</div><div class='del'>-2000-12-11  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.h: Add a define</div><div class='del'>-	for the "html_changed" signal to name space it. Change the</div><div class='del'>-	function declarations to fit with the below change too.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.c </div><div class='del'>-	(executive_summary_html_view_new): Create a default BonoboEventSource</div><div class='del'>-	and use the new _full function.</div><div class='del'>-	(executive_summary_html_view_new_full): Creates a new HtmlView with</div><div class='del'>-	the given BonoboEventSource.</div><div class='del'>-	(executive_summary_html_view_get_event_source): Returns the </div><div class='del'>-	BonoboEventSource for the view.</div><div class='del'>-	(executive_summary_html_view_set_html): Use the new #define for the event</div><div class='del'>-	name.</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (create_view): Share the BonoboEventSource</div><div class='del'>-	between the HtmlView and the BonoboPropertyControl.</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (html_event): Use the name spaced #define.</div><div class='del'>-	(e_summary_start_load): Add a new hack to set the border width of the </div><div class='del'>-	GtkHTML widget to 0.</div><div class='del'>-	(e_summary_rebuild_page): Redid the way the tables are drawn. Made the</div><div class='del'>-	title icon be constrained to 48.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_GNOME_Evolution_Summary_ComponentFactory_createViw): Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-util (e_pixmap_file): Free the edir. </div><div class='del'>-</div><div class='del'>-2000-12-08  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* summary.html: Don't hardcode the image paths.</div><div class='del'>-</div><div class='del'>-2000-12-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (evolution-executive-summary.pure): Add purify</div><div class='del'>-	options for the build</div><div class='del'>-	</div><div class='del'>-2000-12-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove files from extra_dist since they are already</div><div class='del'>-	listed</div><div class='del'>-</div><div class='del'>-2000-12-07  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* summary.html: Prettier HTML summary.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install the new summary.html</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (load_component): Free corba_subdir and</div><div class='del'>-	corba_stream.</div><div class='del'>-	(save_component): Free corba stuff. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-12-06  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-summary-callbacks.c (new_mail): Update COMPOSER_IID to the new</div><div class='del'>-	style IIDs.</div><div class='del'>-	(configure_summary): Set up to do stuff when preferences are changed.</div><div class='del'>-</div><div class='del'>-	* e-summary-prefs.c (e_summary_prefs_save): Sync and drop the config file</div><div class='del'>-	so that changes are written to disk.</div><div class='del'>-</div><div class='del'>-	* e-summary.c (e_summary_reconfigure): Change the summary to the new</div><div class='del'>-	preferences.</div><div class='del'>-</div><div class='del'>-2000-12-04  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c (entry_changed): Add a NULL for opt_ev.</div><div class='del'>-</div><div class='del'>-	* idl/HtmlView.idl: Inherit from Bonobo::Unknown and not </div><div class='del'>-	Bonobo::EventSource.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.[ch]: Change </div><div class='del'>-	implementation of the EventSource so that it is aggregated onto</div><div class='del'>-	the HtmlView object and not inherited.</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_window_free): Free the event_source.</div><div class='del'>-	(e_summary_add_service): query for the EventSource interface.</div><div class='del'>-</div><div class='del'>-2000-12-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_load_state): Fix memory leak.</div><div class='del'>-	(everywhere): Fixed memory leaks, and unref problems.</div><div class='del'>-</div><div class='del'>-2000-11-30  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_window_free): remove the</div><div class='del'>-	event listener before destruction.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Handle the</div><div class='del'>-	new PropertyControl api. Add a listener to detect when the page</div><div class='del'>-	is changed, and adjust the property box accordingly.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c (create_view): Increment running view.</div><div class='del'>-</div><div class='del'>-2000-11-29  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c: Big memory leak cleanup.</div><div class='del'>-</div><div class='del'>-2000-11-28  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_display_window): If the HTML</div><div class='del'>-	control dies, then just close the open tags.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url (e_summary_url_click): Put the control</div><div class='del'>-	into a GnomePropertyBox.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_GNOME_Evolution_Summary_ComponentFactory_createView): </div><div class='del'>-	Duplicate the component.</div><div class='del'>-</div><div class='del'>-2000-11-27  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_window_free): Free all the</div><div class='del'>-	interfaces and the component.</div><div class='del'>-	(e_summary_load_state): Fix typos.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-prefs.c: Fix some typos.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c: If configure is pressed, retrieve</div><div class='del'>-	the control and embed it in a window.</div><div class='del'>-</div><div class='del'>-	* test-services/main.c (component_destroyed): assign ud from data</div><div class='del'>-	not from ud!</div><div class='del'>-</div><div class='del'>-	* test-services/rdf-summary.c (view_destroyed): Connect this </div><div class='del'>-	callback and free the summary.</div><div class='del'>-	(property_control): Made a simple configuration dialog.</div><div class='del'>-</div><div class='del'>-2000-11-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-prefs.[ch]: New files to handle loading,</div><div class='del'>-	saving, copying and freeing preferences.</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_save_state): Use the new</div><div class='del'>-	prefs stuff to save.</div><div class='del'>-	(e_summary_load_state): Use the new prefs stuff to load.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (set_pixmap): Use e_pixmap_file</div><div class='del'>-	to find the pixbuf.</div><div class='del'>-</div><div class='del'>-2000-11-24  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Removed the setOwner and unsetOwner </div><div class='del'>-	methods from the Component interface.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary.[ch]</div><div class='del'>-	  evolution-services/executive-summary-client.[ch]</div><div class='del'>-	  evolution-services/executive-summary-component-client.[ch]</div><div class='del'>-	  evolution-services/executive-summary-component-view.[ch]:</div><div class='del'>-	Removed.</div><div class='del'>- </div><div class='del'>-	* component/main.c (main): Stopped ignoring the signals.</div><div class='del'>-</div><div class='del'>-	* component/executive-summary-config.glade: Glade file for the</div><div class='del'>-	prefs dialog.</div><div class='del'>-</div><div class='del'>-2000-11-23  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (embed-service): Moved to</div><div class='del'>-	e-summary-callbacks.c.</div><div class='del'>-	(e_summary_factory_embed_from_id): Moved to e-summary.c and renamed</div><div class='del'>-	e_summary_embed_from_id.</div><div class='del'>-	Added a New Mail button.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-callbacks.c: New file.</div><div class='del'>-</div><div class='del'>-2000-11-22  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_save_state): removed the #if 0s</div><div class='del'>-	and changed the save type to fs.</div><div class='del'>-</div><div class='del'>-2000-11-21  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-services/rdf-summary.c: Rewrote to use the new services code.</div><div class='del'>-</div><div class='del'>-	* idl/HtmlView.idl: Inherit from Bonobo::EventSource instead of</div><div class='del'>-	Bonobo::Unknown.</div><div class='del'>-</div><div class='del'>-2000-11-20  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_save_state): #if 0'd out the </div><div class='del'>-	PersistStream code till it is fixed.</div><div class='del'>-	(e_summary_window_free): Only Bonobo_Unknown_unref the component,</div><div class='del'>-	not all the other interfaces.</div><div class='del'>-	(e_summary_remove_window): Function to remove the window from the</div><div class='del'>-	window list and free it.</div><div class='del'>-	(make_control_html): Make "id" the address of the window structure.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c: Reimplemented all the functions that the</div><div class='del'>-	Executive Summary had before the big code change.</div><div class='del'>-</div><div class='del'>-2000-11-18  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_save_state): Use Persist stream to</div><div class='del'>-	save the state of all the components.</div><div class='del'>-	(e_summary_load_state): Use Persist stream to load the components again.</div><div class='del'>-	(e_summary_add_service): Add a Property Listener to the property bag to</div><div class='del'>-	be notified of changes to the title or icon.</div><div class='del'>-</div><div class='del'>-2000-12-07  Dave Camp  &lt;dave@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/evolution-summary-component.c: Don't include </div><div class='del'>-	executive-summary-client.h.</div><div class='del'>-</div><div class='del'>-2000-12-07  Dave Camp  &lt;dave@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am (IDLS): Include HtmlView.idl</div><div class='del'>-	</div><div class='del'>-2000-11-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/main.c (main): Remove no-longer-needed e_unicode_init.</div><div class='del'>-</div><div class='del'>-2000-17-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	 * component/e-summary.c (make_control_html): Set the configure button</div><div class='del'>-	active if there is a Bonobo_PropertyControl object associated with the</div><div class='del'>-	window.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Remove the widgets subdirectory.</div><div class='del'>-</div><div class='del'>-2000-16-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_display_window): Use the property</div><div class='del'>-	bag to get the window title and icon.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: (create_view): Add a PropertyBag to the object.</div><div class='del'>-	(set_property): Set the properties.</div><div class='del'>-	(get_property): Get the properties.</div><div class='del'>- </div><div class='del'>-2000-15-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-factory-client.[ch]:</div><div class='del'>-	A client for the factory stuff.</div><div class='del'>-</div><div class='del'>-2000-14-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-html-view.[ch]: Implementation</div><div class='del'>-	of the HtmlView interface.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c </div><div class='del'>-	(e_summary_factory_embed_service_from_id): Rewrote to use the new</div><div class='del'>-	component_factory.</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_add_service): Rewrote to use</div><div class='del'>-	the new component stuff. Lots of queryInterfaces :)</div><div class='del'>-	(e_summary_window_free): Rewrote.</div><div class='del'>-	</div><div class='del'>-	* test-service/main.c: Rewrote completely as an example of the</div><div class='del'>-	new services.</div><div class='del'>-</div><div class='del'>-2000-13-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c:</div><div class='del'>-	Created the ExecutiveSummaryComponentFactory type, that implements</div><div class='del'>-	GNOME/Evolution/Summary/ComponentFactory. Changed the way </div><div class='del'>-	GNOME/Evolution/Summary/Component is implemented.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Removed all methods from Component</div><div class='del'>-	execpt setOwner and unsetOwner. Added ComponentFactory interface</div><div class='del'>-	with a createView method.</div><div class='del'>-</div><div class='del'>-	* idl/HtmlView.idl: New interface for HTML services. One method</div><div class='del'>-	getHtml.</div><div class='del'>-</div><div class='del'>-2000-11-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.c</div><div class='del'>-	(executive_summary_component_view_set_title): Removed the</div><div class='del'>-	"wrong side" warning.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (set_icon): Change the view's </div><div class='del'>-	icon.</div><div class='del'>-	(e_summary_factory_embed_service_from_id): Connect to the set_icon</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-2000-11-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/rdf-summary.c: Made Alan Cox's rdf-engine.c from</div><div class='del'>-	Portaloo into a summary component.</div><div class='del'>-</div><div class='del'>-2000-11-08  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* component/e-summary.c (e_summary_window_free): Remove the view</div><div class='del'>-	from the id_to_view hash table.</div><div class='del'>-	(make_control_html): Fix the bottom row comparison.</div><div class='del'>-	</div><div class='del'>-2000-11-07  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_load_state): Load the HTML</div><div class='del'>-	page for the background.</div><div class='del'>-	(load_html_page): Use GnomeVFS to load this page, and split it</div><div class='del'>-	into a header and footer.</div><div class='del'>-	(e_summary_rebuild_page): If a header and footer exist, use them</div><div class='del'>-	otherwise just load the default.</div><div class='del'>-</div><div class='del'>-2000-11-06  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (on_object_requested): Load a bonobo </div><div class='del'>-	service and try to get it to display (Not working yet).</div><div class='del'>-</div><div class='del'>-2000-11-04  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/test-bonobo.c: New file to test Bonobo control</div><div class='del'>-	based services.</div><div class='del'>-</div><div class='del'>-	* test-service/test-service.oafinfo: Added the details for the</div><div class='del'>-	test-bonobo service.</div><div class='del'>-</div><div class='del'>-2000-11-03  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (make_control_html): Make a neater</div><div class='del'>-	function to create the window controls. Check if a window can</div><div class='del'>-	be moved in a certain direction before making a link.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.c: Added a</div><div class='del'>-	GtkWidget to the private structure to store the control's widget.</div><div class='del'>-</div><div class='del'>-2000-11-03  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.c:</div><div class='del'>-	(executive_summary_component_view_class_init): Add a "configure"</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.h: Add the</div><div class='del'>-	default handler in the class type.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Add an id to the configure method.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-client.[ch]:</div><div class='del'>-	executive_summary_component_client_configure: Takes a View param. </div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c: Connect to the configure signal</div><div class='del'>-	of the created view and call the configure method.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c: When the [?] is clicked, emit the</div><div class='del'>-	configure signal.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Connect the configure signal to something.</div><div class='del'>-</div><div class='del'>-2000-11-21  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): use html_engine_is_selection_active</div><div class='del'>-	added some includes</div><div class='del'>-</div><div class='del'>-2000-11-11  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c: (control_activate_cb),</div><div class='del'>-	(embed_service):</div><div class='del'>-	* evolution-executive-summary.oafinfo:</div><div class='del'>-	* test-service/test-service.oafinfo:</div><div class='del'>-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"</div><div class='del'>-	to sync up with yesterday's IDL re-scoping.</div><div class='del'>-</div><div class='del'>-2000-11-10  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am: Regenerate the idl-generated files</div><div class='del'>-	if composer idl changes.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Clean the idl-generated files</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c:</div><div class='del'>-	  component/e-summary-factory.c:</div><div class='del'>-	  component/e-summary-url.c: Warning's cleanup.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): Requeue the redraw</div><div class='del'>-	if there is a selection on the widget.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_display_window): Draw the window </div><div class='del'>-	controls to move, close and configure the window.</div><div class='del'>-	(e_summary_window_move_(left|right|up|down)): Move the window around the</div><div class='del'>-	window list.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Add handlers for the</div><div class='del'>-	window control URIs (close:// configure:// up:// down:// left:// and </div><div class='del'>-	right://).</div><div class='del'>-	(get_protocol): Add support for the new protocols.</div><div class='del'>-	(parse_uri): Ditto.</div><div class='del'>-	(e_summary_url_describe): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-30  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (embed_service): Generate the uid here</div><div class='del'>-	and pass it into the create_view method.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-client.c</div><div class='del'>-	(executive_summary_component_client_create_view): Use the passed in UID</div><div class='del'>-	to generate a view.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c</div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Don't generate the id here</div><div class='del'>-	but use the passed in one instead.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: create_view now takes an ID parameter.</div><div class='del'>-</div><div class='del'>-2000-10-26  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (load_default): Neaten the Report bug link.</div><div class='del'>-	(e_summary_end_load): Put in a &lt;hr&gt; and a mailto to me.</div><div class='del'>-	(e_summary_new): Create an EvolutionShellClient from the Evolution_Shell.</div><div class='del'>-	(e_summary_get_shell_client): Retrieve the shell-client.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): On a PROTOCOL_VIEW</div><div class='del'>-	change the current view to the one specified in the URL. </div><div class='del'>-</div><div class='del'>-2000-10-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/executive-summary/evolution-services' and</div><div class='del'>-	`-I$(top_srcdir)/executive-summary/evolution-services'.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_exec): Execute a program</div><div class='del'>-	specified in the format "exec://program args".</div><div class='del'>-	(e_summary_url_mail_compose): Run the mail composer when a mailto:</div><div class='del'>-	URL is clicked.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_start_load): Add a hack to stop the</div><div class='del'>-	GtkHTML widget returning to the top when it is redrawn.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.[ch]</div><div class='del'>-	* component/e-summary-util.[ch]: Split some functions out of e-summary.c</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am: Added the new files, and run orbit-idl on the</div><div class='del'>-	mail composer idl.</div><div class='del'>-</div><div class='del'>-2000-10-25    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (control_activate): User </div><div class='del'>-	bonobo_control_get_remote_uid_container, not the old version</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Store each individual views data with the view.</div><div class='del'>-	Add comments to explain everything.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Only try to create a </div><div class='del'>-	control if the returned control != NULL.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Set the UID of the view </div><div class='del'>-	before passing it to the create_view method.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Summary.idl: Added set_icon method, and changed update_html_component</div><div class='del'>-	to update_component. Made all methods take a long ID instead of an</div><div class='del'>-	SummaryComponent.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Combined the create_bonobo_view and </div><div class='del'>-	create_html_view into create_view.</div><div class='del'>-	Added a destroy_view method.</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Added the 2 new files.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.[ch]: New</div><div class='del'>-	files implementing a view of an ExecutiveSummaryComponent.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary.[ch]</div><div class='del'>-	* evolution-services/executive-summary-client.[ch]</div><div class='del'>-	* evolution-services/executive-summary-component.[ch]</div><div class='del'>-	* evolution-services/executive-summary-component-client.[ch]:</div><div class='del'>-	* component/e-summary-factory.c</div><div class='del'>-	* component/e-summary.c</div><div class='del'>-	* test-service/main.c:</div><div class='del'>-	Updated to use new methods and the new ExecutiveSummaryComponentView</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary.c (executive_summary_class_init):</div><div class='del'>-	Implement the update, set_title and flash functionality as signals</div><div class='del'>-	instead of methods.</div><div class='del'>-	(impl_Evolution_Summary_set_title): Emit signal.</div><div class='del'>-	(impl_Evolution_Summary_flash): Emit signal.</div><div class='del'>-	(impl_Evolution_Summary_update_html_component): Emit signal.</div><div class='del'>-	(executive_summary_new): Don't need the methods anymore.</div><div class='del'>-	(executive_summary_construct): Same.</div><div class='del'>-	(executive_summary_init): Remove the private initialisation.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am (INCLUDES): </div><div class='del'>-	* evolution-services/Makefile.am (INCLUDES): </div><div class='del'>-	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-executive-summary.oafinfo: Added</div><div class='del'>-	"evolution:shell-component-icon" property.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jacob "Ulysses" Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am (IDLS): make the built sources</div><div class='del'>-	depend on the idl files</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Added an icon parameter to the</div><div class='del'>-	create_view methods.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c: Implement</div><div class='del'>-	the icon parameter.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-client.c: Ditto</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c: Draw the specified icon.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c: Use the icon parameter.</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) to </div><div class='del'>-	find gnomesupport.h</div><div class='del'>-</div><div class='del'>-2000-10-06  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (request_cb): Use gnome-vfs to retrieve</div><div class='del'>-	the requested files. Allows services to specify remote urls.</div><div class='del'>-	(load_default, e_summary_display_window, e_summary_rebuild_page): </div><div class='del'>-	Change the html to match TigerT's lovely design.</div><div class='del'>-	(e_summary_add_html_service, e_summary_add_html_service): Add</div><div class='del'>-	the client argument so we can destroy it when we've quit.</div><div class='del'>-	(e_summary_window_update): Only do an update if there isn't one</div><div class='del'>-	pending.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (embed_service): upd.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Made the test service be really silly and count</div><div class='del'>-	the number of seconds since it was started.</div><div class='del'>-</div><div class='del'>-2000-10-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (INCLUDES): Fix builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-10-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* .cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* idl/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* evolution-services/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* component/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* .cvsignore: add Makefile</div><div class='del'>-</div><div class='del'>-2000-10-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c: include</div><div class='del'>-	&lt;gal/widgets/e-gui-utils.h&gt; instead of "e-util/e-gui-utils.h" to</div><div class='del'>-	clear up e_notice declaration, and #include &lt;gnome.h&gt; to get "_".</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (control_activate): upd.</div><div class='del'>-	(set_pixmap): upd. (update_pixmaps): upd.</div><div class='del'>-	(control_activate_cb): upd.</div><div class='del'>-	(control_deactivate): upd.</div><div class='del'>-</div><div class='del'>-2000-10-04  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Added a title argument to the </div><div class='del'>-	create_view methods.</div><div class='del'>-</div><div class='del'>-2000-09-13  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Started the Executive Summary</div><div class='head'>diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in<br/>deleted file mode 100644<br/>index eeffbe28c0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/GNOME_Evolution_Summary.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/GNOME_Evolution_Summary.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"</div><div class='del'>-	type="exe"</div><div class='del'>-	location="evolution-executive-summary"&gt;</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/ObjectFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string" </div><div class='del'>-		_value="Factory for the Evolution executive summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_ShellComponent"</div><div class='del'>-	type="factory"</div><div class='del'>-	location="OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution/ShellComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		_value="Evolution component for the executive summary."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-today.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am<br/>deleted file mode 100644<br/>index 6d9aa83a17..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-SUBDIRS = idl evolution-services component test-service</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = GNOME_Evolution_Summary.oaf.in</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-htmldir = $(datadir)/evolution</div><div class='del'>-html_DATA = summary.html</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(html_DATA)</div><div class='head'>diff --git a/executive-summary/component/.cvsignore b/executive-summary/component/.cvsignore<br/>deleted file mode 100644<br/>index 75f1a012f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-core</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-evolution-executive-summary</div><div class='del'>-Composer-common.c</div><div class='del'>-Composer.h</div><div class='del'>-Composer-stubs.c</div><div class='del'>-Composer-skels.c
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am<br/>deleted file mode 100644<br/>index 870746bf1e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-bin_PROGRAMS =	evolution-executive-summary</div><div class='del'>-</div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)/widgets					\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text				\</div><div class='del'>-	-I$(top_srcdir)						\</div><div class='del'>-	-I$(top_builddir)/shell					\</div><div class='del'>-	-I$(top_srcdir)/shell					\</div><div class='del'>-	-I$(top_builddir)/executive-summary			\</div><div class='del'>-	-I$(top_srcdir)/executive-summary			\</div><div class='del'>-	-I$(top_builddir)/executive-summary/evolution-services  \</div><div class='del'>-	-I$(top_srcdir)/executive-summary/evolution-services    \</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)					\</div><div class='del'>-	$(GNOME_VFS_CFLAGS)					\</div><div class='del'>-	$(GTKHTML_CFLAGS)					\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"</div><div class='del'>-</div><div class='del'>-COMPOSER_GENERATED = \</div><div class='del'>-	Composer.h			\</div><div class='del'>-	Composer-common.c		\</div><div class='del'>-	Composer-skels.c		\</div><div class='del'>-	Composer-stubs.c</div><div class='del'>-</div><div class='del'>-Composer-impl.o: Composer.h</div><div class='del'>-</div><div class='del'>-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	$(selectnamesdir)/Evolution-Addressbook-SelectNames.idl	\</div><div class='del'>-	$(top_srcdir)/composer/Evolution-Composer.idl		\</div><div class='del'>-	$(top_srcdir)/composer/Composer.idl</div><div class='del'>-</div><div class='del'>-$(COMPOSER_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \</div><div class='del'>-		$(top_srcdir)/composer/Composer.idl</div><div class='del'>-</div><div class='del'>-evolution_executive_summary_SOURCES =		\</div><div class='del'>-	$(COMPOSER_GENERATED)		\</div><div class='del'>-	component-factory.c		\</div><div class='del'>-	component-factory.h		\</div><div class='del'>-	e-summary.c			\</div><div class='del'>-	e-summary.h			\</div><div class='del'>-	e-summary-callbacks.c		\</div><div class='del'>-	e-summary-callbacks.h		\</div><div class='del'>-	e-summary-factory.c		\</div><div class='del'>-	e-summary-factory.h		\</div><div class='del'>-	e-summary-prefs.c		\</div><div class='del'>-	e-summary-prefs.h		\</div><div class='del'>-	e-summary-url.c			\</div><div class='del'>-	e-summary-url.h			\</div><div class='del'>-	e-summary-util.c		\</div><div class='del'>-	e-summary-util.h		\</div><div class='del'>-	main.c</div><div class='del'>-</div><div class='del'>-evolution_executive_summary_LDADD = 							\</div><div class='del'>-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\</div><div class='del'>-	$(top_builddir)/shell/libeshell.la						\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a					\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la						\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)							\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)								\</div><div class='del'>-	-lgal										\</div><div class='del'>-	$(GTKHTML_LIBS)</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = executive-summary-config.glade</div><div class='del'>-</div><div class='del'>-if ENABLE_PURIFY</div><div class='del'>-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-all-local: evolution-executive-summary.pure</div><div class='del'>-</div><div class='del'>-evolution-executive-summary.pure: evolution-executive-summary</div><div class='del'>-	@rm -f evolution-executive-summary.pure</div><div class='del'>-	$(PLINK) $(evolution_executive_summary_OBJECTS) $(evolution_executive_summary_LDADD) $(LIBS)</div><div class='del'>-</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(glade_DATA)</div><div class='del'>-CLEANFILES = $(COMPOSER_GENERATED)</div><div class='del'>-BUILT_SOURCES = $(COMPOSER_GENERATED)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c<br/>deleted file mode 100644<br/>index ab917251d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/component-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/component-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.c</div><div class='del'>- *</div><div class='del'>- * Authors: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *          Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-#include "evolution-storage.h"</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Summary_ShellComponentFactory"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-static gint running_objects = 0;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-	{ "executive-summary", "evolution-today.png", FALSE, NULL, NULL },</div><div class='del'>-	{ NULL, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *evolution_dir;</div><div class='del'>-</div><div class='del'>-/* EvolutionShellComponent methods and signals */</div><div class='del'>-</div><div class='del'>-static EvolutionShellComponentResult</div><div class='del'>-create_view (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *physical_uri,</div><div class='del'>-	     const char *folder_type,</div><div class='del'>-	     BonoboControl **control_return,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellClient *shell_client;</div><div class='del'>-	GNOME_Evolution_Shell corba_shell;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	</div><div class='del'>-	if (g_strcasecmp (folder_type, "executive-summary") != 0)</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-	</div><div class='del'>-	shell_client = evolution_shell_component_get_owner (shell_component);</div><div class='del'>-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-	</div><div class='del'>-	control = e_summary_factory_new_control (physical_uri, corba_shell);</div><div class='del'>-	if (!control)</div><div class='del'>-		return EVOLUTION_SHELL_COMPONENT_NOTFOUND;</div><div class='del'>-	</div><div class='del'>-	*control_return = control;</div><div class='del'>-	</div><div class='del'>-	return EVOLUTION_SHELL_COMPONENT_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Shell corba_shell;</div><div class='del'>-	</div><div class='del'>-	evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-	</div><div class='del'>-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-factory_destroy (BonoboObject *component,</div><div class='del'>-		 gpointer dummy)</div><div class='del'>-{</div><div class='del'>-	running_objects--;</div><div class='del'>-	</div><div class='del'>-	if (running_objects &gt; 0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (factory)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (factory));</div><div class='del'>-	else</div><div class='del'>-		g_warning ("Serious ref counting error");</div><div class='del'>-	factory = NULL;</div><div class='del'>-	</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory, </div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellComponent *shell_component;</div><div class='del'>-	</div><div class='del'>-	running_objects++;</div><div class='del'>-	</div><div class='del'>-	shell_component = evolution_shell_component_new (folder_types,</div><div class='del'>-							 create_view,</div><div class='del'>-							 NULL, NULL, NULL, NULL, NULL,</div><div class='del'>-							 NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (factory_destroy), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",</div><div class='del'>-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (shell_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, </div><div class='del'>-					      factory_fn, NULL);</div><div class='del'>-	</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Cannot initialize Evolution's Executive Summary component."));</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h<br/>deleted file mode 100644<br/>index fc10a08046..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/component-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/component-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Ettore Perazzoli</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef COMPONENT_FACTORY_H</div><div class='del'>-#define COMPONENT_FACTORY_H</div><div class='del'>-</div><div class='del'>-void  component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c<br/>deleted file mode 100644<br/>index 1eff427af9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-callbacks.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-callbacks.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,320 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-callbacks.c</div><div class='del'>- *</div><div class='del'>- * Author: </div><div class='del'>- *          Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-propertybox.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-file-entry.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-selector.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt; /* For atoi */</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;e-util/e-html-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-callbacks.h"</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-</div><div class='del'>-#define COMPOSER_IID "OAFIID:GNOME_Evolution_Mail_Composer"</div><div class='del'>-typedef struct _PropertyData {</div><div class='del'>-	ESummary *esummary;</div><div class='del'>-	GnomePropertyBox *box;</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-} PropertyData;</div><div class='del'>-</div><div class='del'>-/* HTML helper functions from mail/mail-config-gui.c */</div><div class='del'>-static void</div><div class='del'>-html_size_req (GtkWidget *widget,</div><div class='del'>-	       GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	requisition-&gt;height = GTK_LAYOUT (widget)-&gt;height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a GtkHTML which is already inside a GtkScrolledWindow. If</div><div class='del'>- * @white is TRUE, the GtkScrolledWindow will be inside a GtkFrame.</div><div class='del'>- */</div><div class='del'>-static GtkWidget *</div><div class='del'>-html_new (gboolean white)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *html, *scrolled, *frame;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-</div><div class='del'>-	html = gtk_html_new ();</div><div class='del'>-	GTK_LAYOUT (html)-&gt;height = 0;</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (html), "size_request",</div><div class='del'>-			    GTK_SIGNAL_FUNC (html_size_req), NULL);</div><div class='del'>-	gtk_html_set_editable (GTK_HTML (html), FALSE);</div><div class='del'>-	style = gtk_rc_get_style (html);</div><div class='del'>-</div><div class='del'>-	if (style) {</div><div class='del'>-		gtk_html_set_default_background_color (GTK_HTML (html),</div><div class='del'>-						       white ? &amp;style-&gt;white:</div><div class='del'>-						       &amp;style-&gt;bg[0]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive (html, FALSE);</div><div class='del'>-	scrolled = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),</div><div class='del'>-					GTK_POLICY_NEVER, GTK_POLICY_NEVER);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (scrolled), html);</div><div class='del'>-	if (white) {</div><div class='del'>-		frame = gtk_frame_new (NULL);</div><div class='del'>-		gtk_frame_set_shadow_type (GTK_FRAME (frame),</div><div class='del'>-					   GTK_SHADOW_ETCHED_IN);</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (frame), scrolled);</div><div class='del'>-		gtk_widget_show_all (frame);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_show_all (scrolled);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-put_html (GtkHTML *html,</div><div class='del'>-	  const char *text)</div><div class='del'>-{</div><div class='del'>-	GtkHTMLStream *handle;</div><div class='del'>-	char *htmltext;</div><div class='del'>-</div><div class='del'>-	htmltext = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL);</div><div class='del'>-	handle = gtk_html_begin (html);</div><div class='del'>-	gtk_html_write (html, handle, "&lt;HTML&gt;&lt;BODY&gt;", 12);</div><div class='del'>-	gtk_html_write (html, handle, text, strlen (text));</div><div class='del'>-	gtk_html_write (html, handle, "&lt;/BODY&gt;&lt;/HTML&gt;", 14);</div><div class='del'>-	g_free (htmltext);</div><div class='del'>-	gtk_html_end (html, handle, GTK_HTML_STREAM_OK);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-embed_service (GtkWidget *widget,</div><div class='del'>-	       ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	char *required_interfaces[2] = {"IDL:GNOME/Evolution:Summary:ComponentFactory:1.0",</div><div class='del'>-					NULL};</div><div class='del'>-	char *obj_id;</div><div class='del'>-	</div><div class='del'>-	obj_id = bonobo_selector_select_id (_("Select a service"),</div><div class='del'>-					    (const char **) required_interfaces);</div><div class='del'>-	if (obj_id == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_summary_embed_service_from_id (esummary, obj_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-new_mail (GtkWidget *widget,</div><div class='del'>-	  ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;</div><div class='del'>-	CORBA_char *subject;</div><div class='del'>-	CORBA_Object composer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || composer == NULL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Unable to start composer component!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	to = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	to-&gt;_length = 0;</div><div class='del'>-	to-&gt;_maximum = 0;</div><div class='del'>-	to-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);</div><div class='del'>-</div><div class='del'>-	cc = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	cc-&gt;_length = 0;</div><div class='del'>-	cc-&gt;_maximum = 0;</div><div class='del'>-	cc-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);</div><div class='del'>-</div><div class='del'>-	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	bcc-&gt;_length = 0;</div><div class='del'>-	bcc-&gt;_maximum = 0;</div><div class='del'>-	bcc-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (0);</div><div class='del'>-</div><div class='del'>-	subject = CORBA_string_dup ("");</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Composer_setHeaders (composer, to, cc, </div><div class='del'>-					     bcc, subject, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_free (to);</div><div class='del'>-		CORBA_free (cc);</div><div class='del'>-		CORBA_free (bcc);</div><div class='del'>-		CORBA_free (subject);</div><div class='del'>-</div><div class='del'>-		g_warning ("Error setting headers!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_free (to);</div><div class='del'>-	CORBA_free (cc);</div><div class='del'>-	CORBA_free (bcc);</div><div class='del'>-	CORBA_free (subject);</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Composer_show (composer, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Error showing composer");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_prefs_cb (GtkObject *object,</div><div class='del'>-		  PropertyData *data)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(data-&gt;xml));</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-html_page_changed_cb (GtkEntry *entry,</div><div class='del'>-		      PropertyData *data)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrefs *prefs;</div><div class='del'>-</div><div class='del'>-	/* Change the tmp prefs so that we can restore if the user cancels */</div><div class='del'>-	prefs = data-&gt;esummary-&gt;tmp_prefs;</div><div class='del'>-</div><div class='del'>-	if (prefs-&gt;page)</div><div class='del'>-		g_free (prefs-&gt;page);</div><div class='del'>-</div><div class='del'>-	prefs-&gt;page = g_strdup (gtk_entry_get_text (entry));</div><div class='del'>-</div><div class='del'>-	gnome_property_box_changed (data-&gt;box);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-column_spinner_changed_cb (GtkEntry *entry,</div><div class='del'>-			   PropertyData *data)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrefs *prefs;</div><div class='del'>-	char *value;</div><div class='del'>-</div><div class='del'>-	prefs = data-&gt;esummary-&gt;tmp_prefs;</div><div class='del'>-</div><div class='del'>-	gnome_property_box_changed (data-&gt;box);</div><div class='del'>-	value = gtk_entry_get_text (entry);</div><div class='del'>-	if (value == NULL || *value == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prefs-&gt;columns = atoi (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-apply_prefs_cb (GnomePropertyBox *property_box,</div><div class='del'>-		int page,</div><div class='del'>-		ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	g_print ("Applying\n");</div><div class='del'>-</div><div class='del'>-	if (page != -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	esummary-&gt;prefs = e_summary_prefs_copy (esummary-&gt;tmp_prefs);</div><div class='del'>-</div><div class='del'>-	e_summary_reconfigure (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-configure_summary (GtkWidget *widget,</div><div class='del'>-		   ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	static GtkWidget *prefs = NULL;</div><div class='del'>-	PropertyData *data;</div><div class='del'>-	GtkWidget *html_page;</div><div class='del'>-	GtkWidget *vbox, *html, *spinner;</div><div class='del'>-	char *tmp;</div><div class='del'>-</div><div class='del'>-	if (prefs != NULL) {</div><div class='del'>-		g_assert (GTK_WIDGET_REALIZED (prefs));</div><div class='del'>-		gdk_window_show (prefs-&gt;window);</div><div class='del'>-		gdk_window_raise (prefs-&gt;window);</div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	data = g_new (PropertyData, 1);</div><div class='del'>-	data-&gt;esummary = esummary;</div><div class='del'>-  </div><div class='del'>-	if (esummary-&gt;tmp_prefs != NULL) {</div><div class='del'>-		e_summary_prefs_free (esummary-&gt;tmp_prefs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	esummary-&gt;tmp_prefs = e_summary_prefs_copy (esummary-&gt;prefs);</div><div class='del'>-	</div><div class='del'>-	data-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR</div><div class='del'>-				   "/executive-summary-config.glade", NULL);</div><div class='del'>-	prefs = glade_xml_get_widget (data-&gt;xml, "summaryprefs");</div><div class='del'>-	data-&gt;box = GNOME_PROPERTY_BOX(prefs);</div><div class='del'>-</div><div class='del'>-	vbox = glade_xml_get_widget (data-&gt;xml, "vbox");</div><div class='del'>-	html = html_new (TRUE);</div><div class='del'>-	put_html (GTK_HTML(html),</div><div class='del'>-		  _("You can select a different HTML page for the background "</div><div class='del'>-		    "of the Executive Summary.\n\nJust leave it blank for the "</div><div class='del'>-		    "default"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), html-&gt;parent-&gt;parent, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_reorder_child (GTK_BOX (vbox), html-&gt;parent-&gt;parent, 0);</div><div class='del'>-</div><div class='del'>-	html_page = glade_xml_get_widget (data-&gt;xml, "htmlpage");</div><div class='del'>-</div><div class='del'>-	if (esummary-&gt;prefs-&gt;page != NULL)</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (html_page))), esummary-&gt;prefs-&gt;page);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (html_page))),</div><div class='del'>-			    "changed", GTK_SIGNAL_FUNC (html_page_changed_cb),</div><div class='del'>-			    data);</div><div class='del'>-</div><div class='del'>-	spinner = glade_xml_get_widget (data-&gt;xml, "columnspinner");</div><div class='del'>-</div><div class='del'>-	tmp = g_strdup_printf ("%d", esummary-&gt;prefs-&gt;columns);</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (spinner), tmp);</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (spinner), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (column_spinner_changed_cb), data);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prefs), "apply",</div><div class='del'>-			    GTK_SIGNAL_FUNC (apply_prefs_cb), esummary);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prefs), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (destroy_prefs_cb), data);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (prefs), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gtk_widget_destroyed), &amp;prefs);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/component/e-summary-callbacks.h b/executive-summary/component/e-summary-callbacks.h<br/>deleted file mode 100644<br/>index 6b908d694c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-callbacks.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-callbacks.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-#ifndef __E_SUMMARY_CALLBACKS_H__</div><div class='del'>-#define __E_SUMMARY_CALLBACKS_H__</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-</div><div class='del'>-void embed_service (GtkWidget *widget,</div><div class='del'>-		    ESummary *esummary);</div><div class='del'>-void new_mail (GtkWidget *widget,</div><div class='del'>-	       ESummary *esummary);</div><div class='del'>-void configure_summary (GtkWidget *widget,</div><div class='del'>-			ESummary *esummary);</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c<br/>deleted file mode 100644<br/>index 735074bcc3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-factory.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-factory.c</div><div class='del'>- *</div><div class='del'>- * Authors: Ettore Perazzoli &lt;ettore@ximian.com&gt;</div><div class='del'>- *          Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-ui-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include "evolution-shell-component-utils.h"</div><div class='del'>-</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-util.h"</div><div class='del'>-#include "e-summary-callbacks.h"</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/Executive-Summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-factory-client.h&gt;</div><div class='del'>-</div><div class='del'>-static GList *control_list = NULL;</div><div class='del'>-</div><div class='del'>-BonoboUIVerb verbs[] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("NewMail", new_mail),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ESummarySettings", configure_summary),</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static EPixmap pixmaps [] = {</div><div class='del'>-	E_PIXMAP ("/Toolbar/AddService", "buttons/add-service.png"),</div><div class='del'>-	E_PIXMAP ("/Toolbar/NewMail", "buttons/compose-message.png"),</div><div class='del'>-	E_PIXMAP_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate (BonoboControl     *control,</div><div class='del'>-		  BonoboUIComponent *ui_component,</div><div class='del'>-		  ESummary          *esummary)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer container;</div><div class='del'>-</div><div class='del'>-	container = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (ui_component, container);</div><div class='del'>-	bonobo_object_release_unref (container, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_freeze (ui_component, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-executive-summary.xml", </div><div class='del'>-			       "evolution-executive-summary");</div><div class='del'>-</div><div class='del'>-	e_pixmaps_update (ui_component, pixmaps);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (ui_component, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_deactivate (BonoboControl     *control,</div><div class='del'>-		    BonoboUIComponent *ui_component,</div><div class='del'>-		    ESummary          *esummary)</div><div class='del'>-{</div><div class='del'>-	e_summary_unset_message (esummary); </div><div class='del'>-	bonobo_ui_component_unset_container (ui_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate_cb (BonoboControl *control,</div><div class='del'>-		     gboolean activate,</div><div class='del'>-		     gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESummary *summary;</div><div class='del'>-	BonoboUIComponent *ui_component;</div><div class='del'>-	Bonobo_ControlFrame control_frame;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view_interface;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	ui_component = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (ui_component != NULL);</div><div class='del'>-</div><div class='del'>-	if (gtk_object_get_data (GTK_OBJECT (control), "shell_view_interface") == NULL) {</div><div class='del'>-		control_frame = bonobo_control_get_control_frame (control);</div><div class='del'>-		if (control_frame == NULL) {</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,</div><div class='del'>-								      "IDL:GNOME/Evolution/ShellView:1.0",</div><div class='del'>-								      &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (shell_view_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-			gtk_object_set_data (GTK_OBJECT (control),</div><div class='del'>-					     "shell_view_interface",</div><div class='del'>-					     shell_view_interface);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Control frame doesn't have Evolution/ShellView.");</div><div class='del'>-		}</div><div class='del'>-									       </div><div class='del'>-		summary = E_SUMMARY (user_data);</div><div class='del'>-		e_summary_set_shell_view_interface (summary, </div><div class='del'>-						    shell_view_interface);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (activate)</div><div class='del'>-		control_activate (control, ui_component, user_data);</div><div class='del'>-	else</div><div class='del'>-		control_deactivate (control, ui_component, user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_destroy_cb (BonoboControl *control,</div><div class='del'>-		    gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *esummary = user_data;</div><div class='del'>-</div><div class='del'>-	control_list = g_list_remove (control_list, control);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (esummary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboControl *</div><div class='del'>-e_summary_factory_new_control (const char *uri,</div><div class='del'>-			       const GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-  BonoboControl *control;</div><div class='del'>-  GtkWidget *esummary;</div><div class='del'>-</div><div class='del'>-  esummary = e_summary_new (shell);</div><div class='del'>-  if (esummary == NULL)</div><div class='del'>-    return NULL;</div><div class='del'>-</div><div class='del'>-  gtk_widget_show (esummary);</div><div class='del'>-</div><div class='del'>-  control = bonobo_control_new (esummary);</div><div class='del'>-</div><div class='del'>-  if (control == NULL) {</div><div class='del'>-    gtk_object_destroy (GTK_OBJECT (esummary));</div><div class='del'>-    return NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-		      control_activate_cb, esummary);</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (control), "destroy",</div><div class='del'>-		      control_destroy_cb, esummary);</div><div class='del'>-</div><div class='del'>-  control_list = g_list_prepend (control_list, control);</div><div class='del'>-</div><div class='del'>-  return control;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h<br/>deleted file mode 100644<br/>index d047ebd491..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-factory.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-factory.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_FACTORY_H__</div><div class='del'>-#define _E_SUMMARY_FACTORY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution.h&gt;</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-</div><div class='del'>-BonoboControl *e_summary_factory_new_control (const char *uri,</div><div class='del'>-					      const GNOME_Evolution_Shell shell);</div><div class='del'>-ESummaryWindow *e_summary_factory_embed_service_from_id (ESummary *esummary,</div><div class='del'>-							 const char *obj_id);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-prefs.c b/executive-summary/component/e-summary-prefs.c<br/>deleted file mode 100644<br/>index fdf51ead1e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-prefs.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-prefs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-prefs.c: Preference handling routines.</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-config.h&gt;</div><div class='del'>-#include "e-summary-prefs.h"</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_prefs_free (ESummaryPrefs *prefs)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (prefs != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (prefs-&gt;page);</div><div class='del'>-	g_free (prefs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESummaryPrefs *</div><div class='del'>-e_summary_prefs_new (void)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrefs *prefs;</div><div class='del'>-</div><div class='del'>-	prefs = g_new0 (ESummaryPrefs, 1);</div><div class='del'>-	return prefs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESummaryPrefs *</div><div class='del'>-e_summary_prefs_copy (ESummaryPrefs *prefs)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrefs *copy;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (prefs != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	copy = e_summary_prefs_new ();</div><div class='del'>-	copy-&gt;page = g_strdup (prefs-&gt;page);</div><div class='del'>-	copy-&gt;columns = prefs-&gt;columns;</div><div class='del'>-</div><div class='del'>-	return copy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_summary_prefs_compare (ESummaryPrefs *p1,</div><div class='del'>-			 ESummaryPrefs *p2)</div><div class='del'>-{</div><div class='del'>-	if (p1 == p2)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (strcmp (p1-&gt;page, p2-&gt;page) == 0)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (p1-&gt;columns == p2-&gt;columns)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESummaryPrefs *</div><div class='del'>-e_summary_prefs_load (const char *path)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrefs *prefs;</div><div class='del'>-	char *item;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (path != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (*path != '\0', NULL);</div><div class='del'>-</div><div class='del'>-	prefs = e_summary_prefs_new ();</div><div class='del'>-	</div><div class='del'>-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/page", path);</div><div class='del'>-	prefs-&gt;page = gnome_config_get_string (item);</div><div class='del'>-	g_free (item);</div><div class='del'>-</div><div class='del'>-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/columns=3", path);</div><div class='del'>-	prefs-&gt;columns = gnome_config_get_int (item);</div><div class='del'>-	g_free (item);</div><div class='del'>-	return prefs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_prefs_save (ESummaryPrefs *prefs,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	char *item;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (prefs != NULL);</div><div class='del'>-	g_return_if_fail (path != NULL);</div><div class='del'>-	g_return_if_fail (*path != '\0');</div><div class='del'>-</div><div class='del'>-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/page", path);</div><div class='del'>-	gnome_config_set_string (item, prefs-&gt;page);</div><div class='del'>-	g_free (item);</div><div class='del'>-</div><div class='del'>-	item = g_strdup_printf ("=%s/e-summary=/executive-summary/columns", path);</div><div class='del'>-	gnome_config_set_int (item, prefs-&gt;columns);</div><div class='del'>-	g_free (item);</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-	gnome_config_drop_all ();</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary-prefs.h b/executive-summary/component/e-summary-prefs.h<br/>deleted file mode 100644<br/>index e7b2b9b127..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-prefs.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-prefs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-prefs.h: Preference handling routines.</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SUMMARY_PREFS_H__</div><div class='del'>-#define __E_SUMMARY_PREFS_H__</div><div class='del'>-</div><div class='del'>-typedef struct _ESummaryPrefs ESummaryPrefs;</div><div class='del'>-struct _ESummaryPrefs {</div><div class='del'>-	char *page; /* Background HTML page URL */</div><div class='del'>-	int columns; /* Number of components per row (Default = 3) */</div><div class='del'>-</div><div class='del'>-	/* If anything is added here, don't forget to add </div><div class='del'>-	   copy, compare, load and save routines to the appropriate</div><div class='del'>-	   functions. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ESummaryPrefs *e_summary_prefs_new (void);</div><div class='del'>-void e_summary_prefs_free (ESummaryPrefs *prefs);</div><div class='del'>-ESummaryPrefs *e_summary_prefs_copy (ESummaryPrefs *prefs);</div><div class='del'>-gboolean e_summary_prefs_compare (ESummaryPrefs *p1,</div><div class='del'>-				  ESummaryPrefs *p2);</div><div class='del'>-ESummaryPrefs *e_summary_prefs_load (const char *path);</div><div class='del'>-void e_summary_prefs_save (ESummaryPrefs *prefs,</div><div class='del'>-			   const char *path);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c<br/>deleted file mode 100644<br/>index ed4aa7af69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-url.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,851 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-url.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-property-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-url.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-exec.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-propertybox.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-url.h"</div><div class='del'>-#include "e-summary-util.h"</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-</div><div class='del'>-typedef enum _ESummaryProtocol {</div><div class='del'>-	PROTOCOL_NONE,</div><div class='del'>-	PROTOCOL_HTTP,</div><div class='del'>-	PROTOCOL_MAILTO,</div><div class='del'>-	PROTOCOL_VIEW,</div><div class='del'>-	PROTOCOL_EXEC,</div><div class='del'>-	PROTOCOL_FILE,</div><div class='del'>-	PROTOCOL_CLOSE,</div><div class='del'>-	PROTOCOL_LEFT,</div><div class='del'>-	PROTOCOL_RIGHT,</div><div class='del'>-	PROTOCOL_UP,</div><div class='del'>-	PROTOCOL_DOWN,</div><div class='del'>-	PROTOCOL_CONFIGURE,</div><div class='del'>-	PROTOCOL_OTHER</div><div class='del'>-} ESummaryProtocol;</div><div class='del'>-</div><div class='del'>-static char *descriptions[] = {</div><div class='del'>-	N_("Open %s with the default GNOME application"),</div><div class='del'>-	N_("Open %s with the default GNOME web browser"),</div><div class='del'>-	N_("Send an email to %s"),</div><div class='del'>-	N_("Change the view to %s"),</div><div class='del'>-	N_("Run %s"),</div><div class='del'>-	N_("Open %s with the default GNOME application"),</div><div class='del'>-	N_("Close %s"),</div><div class='del'>-	N_("Move %s to the left"),</div><div class='del'>-	N_("Move %s to the right"),</div><div class='del'>-	N_("Move %s into the previous row"),</div><div class='del'>-	N_("Move %s into the next row"),</div><div class='del'>-	N_("Configure %s"),</div><div class='del'>-	N_("Open %s with the default GNOME application")</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _PropertyDialog {</div><div class='del'>-	BonoboListener *listener;</div><div class='del'>-	int listener_id;</div><div class='del'>-</div><div class='del'>-	Bonobo_EventSource eventsource;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-} PropertyDialog;</div><div class='del'>-#define COMPOSER_IID "OAFIID:GNOME_Evolution_Mail_Composer"</div><div class='del'>-</div><div class='del'>-#if HAVECACHE</div><div class='del'>-static ESummaryCache *image_cache = NULL;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-gboolean e_summary_url_mail_compose (ESummary *esummary,</div><div class='del'>-				     const char *url);</div><div class='del'>-gboolean e_summary_url_exec (const char *exec);</div><div class='del'>-</div><div class='del'>-struct _DownloadInfo {</div><div class='del'>-	GtkHTMLStream *stream;</div><div class='del'>-	char *uri;</div><div class='del'>-	char *buffer;</div><div class='del'>-</div><div class='del'>-	gboolean error;</div><div class='del'>-};</div><div class='del'>-typedef struct _DownloadInfo DownloadInfo;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-		GnomeVFSResult result,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	DownloadInfo *info = data;</div><div class='del'>-	if (info-&gt;error) {</div><div class='del'>-		gtk_html_stream_close (info-&gt;stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_html_stream_close (info-&gt;stream, GTK_HTML_STREAM_OK);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (info-&gt;uri);</div><div class='del'>-	g_free (info-&gt;buffer);</div><div class='del'>-	g_free (info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-read_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	       GnomeVFSResult result,</div><div class='del'>-	       gpointer buffer,</div><div class='del'>-	       GnomeVFSFileSize bytes_requested,</div><div class='del'>-	       GnomeVFSFileSize bytes_read,</div><div class='del'>-	       gpointer data)</div><div class='del'>-{</div><div class='del'>-	DownloadInfo *info = data;</div><div class='del'>-	if (result != GNOME_VFS_OK &amp;&amp; result != GNOME_VFS_ERROR_EOF) {</div><div class='del'>-		g_warning ("Read error");</div><div class='del'>-		info-&gt;error = TRUE;</div><div class='del'>-		gnome_vfs_async_close (handle, close_callback, info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (bytes_read == 0) {</div><div class='del'>-		info-&gt;error = FALSE;</div><div class='del'>-		gnome_vfs_async_close (handle, close_callback, info);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_html_stream_write (info-&gt;stream, buffer, bytes_read);</div><div class='del'>-		gnome_vfs_async_read (handle, buffer, 4095, read_callback,</div><div class='del'>-				      info);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-open_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	       GnomeVFSResult result,</div><div class='del'>-	       DownloadInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		gtk_html_stream_close (info-&gt;stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		g_free (info-&gt;uri);</div><div class='del'>-		g_free (info);</div><div class='del'>-		return;</div><div class='del'>-	} </div><div class='del'>-</div><div class='del'>-	info-&gt;buffer = g_new (char, 4096);</div><div class='del'>-	gnome_vfs_async_read (handle, info-&gt;buffer, 4095, read_callback, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_request (GtkHTML *html,</div><div class='del'>-		       const gchar *url,</div><div class='del'>-		       GtkHTMLStream *stream)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	GnomeVFSAsyncHandle *handle;</div><div class='del'>-	DownloadInfo *info;</div><div class='del'>-</div><div class='del'>-	g_print ("url: %s\n", url);</div><div class='del'>-	if (strncasecmp (url, "file:", 5) == 0) {</div><div class='del'>-		url += 5;</div><div class='del'>-		filename = e_pixmap_file (url);</div><div class='del'>-	} else if (strchr (url, ':') &gt;= strchr (url, '/')) {</div><div class='del'>-		filename = e_pixmap_file (url);</div><div class='del'>-	} else</div><div class='del'>-		filename = g_strdup (url);</div><div class='del'>-</div><div class='del'>-	if (filename == NULL) {</div><div class='del'>-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_print ("Filename: %s\n", filename);</div><div class='del'>-</div><div class='del'>-	info = g_new (DownloadInfo, 1);</div><div class='del'>-	info-&gt;stream = stream;</div><div class='del'>-	info-&gt;uri = filename;</div><div class='del'>-	info-&gt;error = FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_async_open (&amp;handle, filename, GNOME_VFS_OPEN_READ,</div><div class='del'>-			      (GnomeVFSAsyncOpenCallback) open_callback, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-parse_uri (const char *uri,</div><div class='del'>-	   ESummaryProtocol protocol,</div><div class='del'>-	   ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	char *parsed;</div><div class='del'>-	char *p;</div><div class='del'>-	int address;</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-</div><div class='del'>-	switch (protocol) {</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_HTTP:</div><div class='del'>-		/* "http://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_EXEC:</div><div class='del'>-		/* "exec://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_VIEW:</div><div class='del'>-		/* "view://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_MAILTO:</div><div class='del'>-		/* Fun. Mailto's might be "mailto:" or "mailto://" */</div><div class='del'>-		if (strstr (uri, "mailto://") == NULL) {</div><div class='del'>-			parsed = (char *) (uri + 7);</div><div class='del'>-		} else {</div><div class='del'>-			parsed = (char *) (uri + 9);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now strip anything after a question mark, </div><div class='del'>-		   as it is a parameter (that we ignore for the time being) */</div><div class='del'>-		if ( (p = strchr (parsed, '?')) != NULL) {</div><div class='del'>-			parsed = g_strndup (parsed, p - parsed);</div><div class='del'>-		} else {</div><div class='del'>-			parsed = g_strdup (parsed);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CLOSE:</div><div class='del'>-		address = atoi (uri + 8);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_LEFT:</div><div class='del'>-		address = atoi (uri + 7);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_RIGHT:</div><div class='del'>-		address = atoi (uri + 8);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_UP:</div><div class='del'>-		address = atoi (uri + 5);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_DOWN:</div><div class='del'>-		address = atoi (uri + 7);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CONFIGURE:</div><div class='del'>-		address = atoi (uri + 12);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		parsed = g_strdup (window-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_NONE:</div><div class='del'>-	case PROTOCOL_OTHER:</div><div class='del'>-	default:</div><div class='del'>-		/* Just return the uneditted uri. */</div><div class='del'>-		parsed = g_strdup (uri);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return parsed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESummaryProtocol</div><div class='del'>-get_protocol (const char *url)</div><div class='del'>-{</div><div class='del'>-	char *lowerurl;</div><div class='del'>-	ESummaryProtocol protocol = PROTOCOL_OTHER;</div><div class='del'>-	</div><div class='del'>-	lowerurl = g_strdup (url);</div><div class='del'>-	g_strdown (lowerurl);</div><div class='del'>-	</div><div class='del'>-	/* Check for no :/ */</div><div class='del'>-	if (strstr (lowerurl, "://") == NULL) {</div><div class='del'>-		</div><div class='del'>-		/* Annoying alternative for mailto URLs */</div><div class='del'>-		if (strncmp (lowerurl, "mailto:", 6) != 0) {</div><div class='del'>-			g_free (lowerurl);</div><div class='del'>-			return PROTOCOL_NONE;</div><div class='del'>-		} else {</div><div class='del'>-			g_free (lowerurl);</div><div class='del'>-			return PROTOCOL_MAILTO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (lowerurl[0]) {</div><div class='del'>-	case 'c':</div><div class='del'>-		switch (lowerurl[1]) {</div><div class='del'>-		case 'l':</div><div class='del'>-			if (strncmp (lowerurl + 2, "ose", 3) == 0)</div><div class='del'>-				protocol = PROTOCOL_CLOSE;</div><div class='del'>-			break;</div><div class='del'>-		case 'o':</div><div class='del'>-			if (strncmp (lowerurl + 2, "nfigure", 7) == 0)</div><div class='del'>-				protocol = PROTOCOL_CONFIGURE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case 'd':</div><div class='del'>-		if (strncmp (lowerurl + 1, "own", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_DOWN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'e':</div><div class='del'>-		if (strncmp (lowerurl + 1, "xec", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_EXEC;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'f':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ile", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_FILE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'h':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ttp", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_HTTP;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'l':</div><div class='del'>-		if (strncmp (lowerurl + 1, "eft", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_LEFT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'm':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ailto", 5) == 0)</div><div class='del'>-			protocol = PROTOCOL_MAILTO;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'r':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ight", 4) == 0)</div><div class='del'>-			protocol = PROTOCOL_RIGHT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'u':</div><div class='del'>-		if (lowerurl[1] == 'p')</div><div class='del'>-			protocol = PROTOCOL_UP;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'v':</div><div class='del'>-		if (strncmp (lowerurl + 1, "iew", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_VIEW;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (lowerurl);</div><div class='del'>-	</div><div class='del'>-	return protocol;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-property_apply (GnomePropertyBox *propertybox,</div><div class='del'>-		gint page_num,</div><div class='del'>-		Bonobo_PropertyControl control)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_print ("page_num: %d\n", page_num);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_PropertyControl_notifyAction (control, page_num, Bonobo_PropertyControl_APPLY, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-property_help (GnomePropertyBox *propertybox,</div><div class='del'>-	       gint page_num,</div><div class='del'>-	       Bonobo_PropertyControl control)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_PropertyControl_notifyAction (control, page_num, Bonobo_PropertyControl_HELP, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-property_event (BonoboListener *listener,</div><div class='del'>-		char *event_name,</div><div class='del'>-		CORBA_any *any,</div><div class='del'>-		CORBA_Environment *ev,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	PropertyDialog *data = (PropertyDialog *) user_data;</div><div class='del'>-	if (strcmp (event_name, BONOBO_PROPERTY_CONTROL_CHANGED) == 0) {</div><div class='del'>-		gnome_property_box_changed (GNOME_PROPERTY_BOX (data-&gt;dialog));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-dialog_destroyed (GtkObject *object,</div><div class='del'>-		  PropertyDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Bonobo_EventSource_removeListener (dialog-&gt;eventsource,</div><div class='del'>-					   dialog-&gt;listener_id, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error: %s", CORBA_exception_id (&amp;ev));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (dialog-&gt;listener));</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _idle_data {</div><div class='del'>-	ESummary *esummary;</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-idle_remove_window (gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct _idle_data *id = data;</div><div class='del'>-</div><div class='del'>-	e_summary_remove_window (id-&gt;esummary, id-&gt;window);</div><div class='del'>-	e_summary_queue_rebuild (id-&gt;esummary);</div><div class='del'>-	g_free (id);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_click (GtkWidget *widget,</div><div class='del'>-		     const char *url,</div><div class='del'>-		     ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryProtocol protocol;</div><div class='del'>-	char *parsed;</div><div class='del'>-	int address;</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	struct _idle_data *id;</div><div class='del'>-	Bonobo_Control control;</div><div class='del'>-	Bonobo_Listener corba_listener;</div><div class='del'>-	GtkWidget *prefsbox, *control_widget;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	PropertyDialog *data;</div><div class='del'>-	int num_pages, i;</div><div class='del'>-</div><div class='del'>-	protocol = get_protocol (url);</div><div class='del'>-</div><div class='del'>-	parsed = parse_uri (url, protocol, esummary);</div><div class='del'>-</div><div class='del'>-	switch (protocol) {</div><div class='del'>-	case PROTOCOL_MAILTO:</div><div class='del'>-		/* Open a composer window */</div><div class='del'>-		e_summary_url_mail_compose (esummary, parsed);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_VIEW:</div><div class='del'>-		/* Change the EShellView's current uri */</div><div class='del'>-		e_summary_change_current_view (esummary, parsed);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_EXEC:</div><div class='del'>-		/* Execute the rest of the url */</div><div class='del'>-		e_summary_url_exec (parsed);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CLOSE:</div><div class='del'>-		/* Close the window. */</div><div class='del'>-		address = atoi (url + 8);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		id = g_new (struct _idle_data, 1);</div><div class='del'>-		id-&gt;window = window;</div><div class='del'>-		id-&gt;esummary = esummary;</div><div class='del'>-</div><div class='del'>-		/* Close the window on an idle to work around a bug in</div><div class='del'>-		   gnome-vfs which locks the e_summary_remove_window function </div><div class='del'>-		   and as gtkhtml has a pointer grab on, this locks the whole </div><div class='del'>-		   display. GAH! */</div><div class='del'>-		g_idle_add (idle_remove_window, id);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CONFIGURE:</div><div class='del'>-		/* Configure the window. . . */</div><div class='del'>-		address = atoi (url + 12);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-	</div><div class='del'>-		data = g_new (PropertyDialog, 1);</div><div class='del'>-		/* Create the property box */</div><div class='del'>-		prefsbox = gnome_property_box_new ();</div><div class='del'>-		data-&gt;dialog = prefsbox;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		data-&gt;eventsource = window-&gt;event_source;</div><div class='del'>-		data-&gt;listener = bonobo_listener_new (property_event, data);</div><div class='del'>-		corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (data-&gt;listener));</div><div class='del'>-		data-&gt;listener_id = Bonobo_EventSource_addListener (data-&gt;eventsource,</div><div class='del'>-								    corba_listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (prefsbox), "apply",</div><div class='del'>-				    GTK_SIGNAL_FUNC (property_apply), </div><div class='del'>-				    window-&gt;propertycontrol);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (prefsbox), "help",</div><div class='del'>-				    GTK_SIGNAL_FUNC (property_help),</div><div class='del'>-				    window-&gt;propertycontrol);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (prefsbox), "destroy",</div><div class='del'>-				    GTK_SIGNAL_FUNC (dialog_destroyed), data);</div><div class='del'>-</div><div class='del'>-		num_pages = Bonobo_PropertyControl__get_pageCount (window-&gt;propertycontrol, &amp;ev);</div><div class='del'>-		for (i = 0; i &lt; num_pages; i++) {</div><div class='del'>-			control = Bonobo_PropertyControl_getControl (window-&gt;propertycontrol, i, &amp;ev);</div><div class='del'>-			if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-				g_warning ("Unable to get property control.");</div><div class='del'>-				CORBA_exception_free (&amp;ev);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			control_widget = bonobo_widget_new_control_from_objref (control,</div><div class='del'>-										CORBA_OBJECT_NIL);</div><div class='del'>-			gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefsbox),</div><div class='del'>-							control_widget,</div><div class='del'>-							gtk_label_new (_("page")));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_widget_show_all (prefsbox);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_LEFT:</div><div class='del'>-		/* Window left */</div><div class='del'>-		address = atoi (url + 7);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_left (esummary, window);</div><div class='del'>-		e_summary_queue_rebuild (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_RIGHT:</div><div class='del'>-		address = atoi (url + 8);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_right (esummary, window);</div><div class='del'>-		e_summary_queue_rebuild (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_UP:</div><div class='del'>-		address = atoi (url + 5);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_up (esummary, window);</div><div class='del'>-		e_summary_queue_rebuild (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_DOWN:</div><div class='del'>-		address = atoi (url + 7);</div><div class='del'>-		window = (ESummaryWindow *) GINT_TO_POINTER (address);</div><div class='del'>-		if (window-&gt;iid == NULL)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_down (esummary, window);</div><div class='del'>-		e_summary_queue_rebuild (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_OTHER:</div><div class='del'>-	case PROTOCOL_NONE:</div><div class='del'>-	case PROTOCOL_HTTP:</div><div class='del'>-	case PROTOCOL_FILE:</div><div class='del'>-	default:</div><div class='del'>-		/* Let browser handle it */</div><div class='del'>-		gnome_url_show (url);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}      </div><div class='del'>-</div><div class='del'>-	g_free (parsed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_mail_url (char *url,</div><div class='del'>-		GList **cc,</div><div class='del'>-		GList **bcc,</div><div class='del'>-		char **subject)</div><div class='del'>-{</div><div class='del'>-	char **options;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	options = g_strsplit (url, "&amp;", 0);</div><div class='del'>-	while (options[i] != NULL) {</div><div class='del'>-		char **params;</div><div class='del'>-</div><div class='del'>-		params = g_strsplit (options[i], "=", 2);</div><div class='del'>-		if (strcmp (params[0], "subject") == 0) {</div><div class='del'>-			*subject = g_strdup (params[1]);</div><div class='del'>-		} else if (strcmp (params[0], "cc") == 0) {</div><div class='del'>-			*cc = g_list_prepend (*cc, g_strdup (params[1]));</div><div class='del'>-		} else if (strcmp (params[1], "bcc") == 0) {</div><div class='del'>-			*bcc = g_list_prepend (*bcc, g_strdup (params[1]));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_strfreev (params);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_strfreev (options);</div><div class='del'>-	/* Reverse the list so it's in the correct order */</div><div class='del'>-	*cc = g_list_reverse (*cc);</div><div class='del'>-	*bcc = g_list_reverse (*bcc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-recipients_from_list (GNOME_Evolution_Composer_RecipientList *recipients,</div><div class='del'>-		      GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *t;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0, t = list; t; i++, t = t-&gt;next) {</div><div class='del'>-		GNOME_Evolution_Composer_Recipient *recipient;</div><div class='del'>-		char *address = (char *)t-&gt;data;</div><div class='del'>-</div><div class='del'>-		recipient = recipients-&gt;_buffer + i;</div><div class='del'>-		recipient-&gt;name = CORBA_string_dup ("");</div><div class='del'>-		recipient-&gt;address = CORBA_string_dup (address ? address : "");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	for (; list; list = list-&gt;next) {</div><div class='del'>-		g_free (list-&gt;data);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_summary_url_mail_compose (ESummary *esummary,</div><div class='del'>-			    const char *url)</div><div class='del'>-{</div><div class='del'>-	CORBA_Object composer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *full_address, *address, *proto, *q;</div><div class='del'>-	GNOME_Evolution_Composer_RecipientList *to, *cc, *bcc;</div><div class='del'>-	GNOME_Evolution_Composer_Recipient *recipient;</div><div class='del'>-	CORBA_char *subject;</div><div class='del'>-	GList *gcc = NULL, *gbcc = NULL;</div><div class='del'>-	char *gsubject = NULL;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Query for IIDs? */</div><div class='del'>-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Unable to start composer component!");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( (proto = strstr (url, "://")) != NULL){</div><div class='del'>-		full_address = proto + 3;</div><div class='del'>-	} else {</div><div class='del'>-		if (strncmp (url, "mailto:", 7) == 0)</div><div class='del'>-			full_address = (char *) (url + 7);</div><div class='del'>-		else</div><div class='del'>-			full_address = (char *) url;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	q = strchr (full_address, '?');</div><div class='del'>-	if (q != NULL) {</div><div class='del'>-		address = g_strndup (full_address, q - full_address);</div><div class='del'>-		parse_mail_url (q + 1, &amp;gcc, &amp;gbcc, &amp;gsubject);</div><div class='del'>-	} else {</div><div class='del'>-		address = g_strdup (full_address);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	to = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	to-&gt;_length = 1;</div><div class='del'>-	to-&gt;_maximum = 1;</div><div class='del'>-	to-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	recipient = to-&gt;_buffer;</div><div class='del'>-	recipient-&gt;name = CORBA_string_dup ("");</div><div class='del'>-	recipient-&gt;address = CORBA_string_dup (address?address:"");</div><div class='del'>-	g_free (address);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Get these out of the URL */</div><div class='del'>-	cc = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	cc-&gt;_length = g_list_length (gcc);</div><div class='del'>-	cc-&gt;_maximum = cc-&gt;_length;</div><div class='del'>-	cc-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (cc-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	recipients_from_list (cc, gcc);</div><div class='del'>-	free_list (gcc);</div><div class='del'>-	g_list_free (gcc);</div><div class='del'>-</div><div class='del'>-	bcc = GNOME_Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	bcc-&gt;_length = g_list_length (gbcc);</div><div class='del'>-	bcc-&gt;_maximum = bcc-&gt;_length;</div><div class='del'>-	bcc-&gt;_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	recipients_from_list (bcc, gbcc);</div><div class='del'>-	free_list (gbcc);</div><div class='del'>-	g_list_free (gbcc);</div><div class='del'>-</div><div class='del'>-	subject = CORBA_string_dup (gsubject ? gsubject : "");</div><div class='del'>-	g_free (gsubject);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_Composer_setHeaders (composer, to, cc, bcc, subject, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_free (to);</div><div class='del'>-		CORBA_free (cc);</div><div class='del'>-		CORBA_free (bcc);</div><div class='del'>-		CORBA_free (subject);</div><div class='del'>-</div><div class='del'>-		g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_free (to);</div><div class='del'>-	CORBA_free (cc);</div><div class='del'>-	CORBA_free (bcc);</div><div class='del'>-	CORBA_free (subject);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);  </div><div class='del'>-	GNOME_Evolution_Composer_show (composer, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Free the composer? */</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_summary_url_exec (const char *exec)</div><div class='del'>-{</div><div class='del'>-	gchar **exec_array;</div><div class='del'>-	int argc;</div><div class='del'>-	</div><div class='del'>-	exec_array = g_strsplit (exec, " ", 0);</div><div class='del'>-	</div><div class='del'>-	argc = 0;</div><div class='del'>-	while (exec_array[argc] != NULL) {</div><div class='del'>-		argc++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gnome_execute_async (NULL, argc, exec_array);</div><div class='del'>-	</div><div class='del'>-	g_strfreev (exec_array);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_summary_url_describe (const char *uri, </div><div class='del'>-			ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryProtocol protocol;</div><div class='del'>-	char *contents, *description, *tmp;</div><div class='del'>-</div><div class='del'>-	protocol = get_protocol (uri);</div><div class='del'>-	contents = parse_uri (uri, protocol, esummary);</div><div class='del'>-	tmp = e_utf8_to_locale_string (contents);</div><div class='del'>-</div><div class='del'>-	description = g_strdup_printf (_(descriptions[protocol]), tmp);</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	g_free (contents);</div><div class='del'>-</div><div class='del'>-	return description;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_over (GtkHTML *html,</div><div class='del'>-		    const char *uri,</div><div class='del'>-		    ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	char *description;</div><div class='del'>-</div><div class='del'>-	if (uri != NULL) {</div><div class='del'>-		description = e_summary_url_describe (uri, esummary);</div><div class='del'>-		e_summary_set_message (esummary, description, FALSE);</div><div class='del'>-		g_free (description);</div><div class='del'>-	} else {</div><div class='del'>-		e_summary_unset_message (esummary);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cache stuff */</div><div class='del'>-#if HAVECACHE</div><div class='del'>-void</div><div class='del'>-e_summary_url_init_cache (void)</div><div class='del'>-{</div><div class='del'>-	if (image_cache != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	image_cache = e_summary_cache_new ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_cache_destroy (void)</div><div class='del'>-{</div><div class='del'>-	if (image_cache == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (image_cache));</div><div class='del'>-</div><div class='del'>-	image_cache = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h<br/>deleted file mode 100644<br/>index 03db66353b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-url.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-url.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-url.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_URL_H__</div><div class='del'>-#define _E_SUMMARY_URL_H__</div><div class='del'>-</div><div class='del'>-void e_summary_url_request (GtkHTML *html,</div><div class='del'>-			    const gchar *url,</div><div class='del'>-			    GtkHTMLStream *stream);</div><div class='del'>-void e_summary_url_click (GtkWidget *widget,</div><div class='del'>-			  const char *url,</div><div class='del'>-			  ESummary *esummary);</div><div class='del'>-void e_summary_url_over (GtkHTML *html,</div><div class='del'>-			 const char *uri,</div><div class='del'>-			 ESummary *esummary);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c<br/>deleted file mode 100644<br/>index 4f7b5f5d6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-util.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-url.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;e-summary-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_pixmap_file:</div><div class='del'>- * @filename: Filename of pixmap.</div><div class='del'>- *</div><div class='del'>- * Finds @filename in the Evolution or GNOME installation dir.</div><div class='del'>- *</div><div class='del'>- * Returns: A newly allocated absolute path to @filename, or NULL</div><div class='del'>- * if it cannot be found.</div><div class='del'>- */</div><div class='del'>-char *</div><div class='del'>-e_pixmap_file (const char *filename)</div><div class='del'>-{</div><div class='del'>-	char *ret;</div><div class='del'>-	char *edir;</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (filename)) {</div><div class='del'>-		ret = g_strdup (filename);</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try the evolution images dir */</div><div class='del'>-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution",</div><div class='del'>-				      filename);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (edir)) {</div><div class='del'>-		ret = g_strdup (edir);</div><div class='del'>-		g_free (edir);</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	g_free (edir);</div><div class='del'>-</div><div class='del'>-	/* Try the evolution button images dir */</div><div class='del'>-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons",</div><div class='del'>-				      filename);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (edir)) {</div><div class='del'>-		ret = g_strdup (edir);</div><div class='del'>-		g_free (edir);</div><div class='del'>-		</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-	g_free (edir);</div><div class='del'>-</div><div class='del'>-	/* Fall back to the gnome_pixmap_file */</div><div class='del'>-	return gnome_pixmap_file (filename);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-/**</div><div class='del'>- * e_summary_rm_dir:</div><div class='del'>- * @path: Full path to the directory or file to be removed.</div><div class='del'>- *</div><div class='del'>- * Deletes everything in fullpath.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_summary_rm_dir (const char *path)</div><div class='del'>-{</div><div class='del'>-	DIR *base;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	struct dirent *contents;</div><div class='del'>-</div><div class='del'>-	stat (path, &amp;statbuf);</div><div class='del'>-	if (!S_ISDIR (statbuf.st_mode)) {</div><div class='del'>-		/* Not a directory */</div><div class='del'>-		g_warning ("Removing: %s", path);</div><div class='del'>-		unlink (path);</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Opening: %s", path);</div><div class='del'>-		base = opendir (path);</div><div class='del'>-</div><div class='del'>-		if (base == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		contents = readdir (base);</div><div class='del'>-		while (contents != NULL) {</div><div class='del'>-			char *fullpath;</div><div class='del'>-</div><div class='del'>-			if (strcmp (contents-&gt;d_name, ".") == 0|| </div><div class='del'>-			    strcmp (contents-&gt;d_name, "..") ==0) {</div><div class='del'>-				contents = readdir (base);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			fullpath = g_concat_dir_and_file (path, contents-&gt;d_name);</div><div class='del'>-			e_summary_rm_dir (fullpath);</div><div class='del'>-			g_free (fullpath);</div><div class='del'>-</div><div class='del'>-			contents = readdir (base);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		closedir (base);</div><div class='del'>-		rmdir (path);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h<br/>deleted file mode 100644<br/>index 185bafcf1f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-util.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-util.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_UTIL_H__</div><div class='del'>-#define _E_SUMMARY_UTIL_H__</div><div class='del'>-</div><div class='del'>-char *e_pixmap_file (const char *filename);</div><div class='del'>-void e_summary_rm_dir (const char *filename);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c<br/>deleted file mode 100644<br/>index 7a33ba14ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1340 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-listener.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-control.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-storage.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-stream-client.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-embedded.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include &lt;gtkhtml/htmlengine.h&gt;</div><div class='del'>-#include &lt;gtkhtml/htmlselection.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-#include "e-summary-util.h"</div><div class='del'>-#include "e-summary-url.h"</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-factory-client.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-html-view.h&gt;</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_vbox_get_type ())</div><div class='del'>-</div><div class='del'>-#define STORAGE_TYPE "fs"</div><div class='del'>-#define IID_FILE "oaf.id"</div><div class='del'>-#define DATA_FILE "data"</div><div class='del'>-</div><div class='del'>-/* From component-factory.c */</div><div class='del'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *e_summary_parent_class;</div><div class='del'>-</div><div class='del'>-struct _ESummaryPrivate {</div><div class='del'>-	GNOME_Evolution_Shell shell;</div><div class='del'>-	GNOME_Evolution_ShellView shell_view_interface;</div><div class='del'>-</div><div class='del'>-	GtkWidget *html_scroller;</div><div class='del'>-	GtkWidget *html;</div><div class='del'>-</div><div class='del'>-	guint idle;</div><div class='del'>-</div><div class='del'>-	GtkHTMLStream *stream;</div><div class='del'>-	gboolean grabbed;</div><div class='del'>-</div><div class='del'>-	GList *window_list;</div><div class='del'>-</div><div class='del'>-	char *header;</div><div class='del'>-	int header_len;</div><div class='del'>-	char *footer;</div><div class='del'>-	int footer_len;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean on_object_requested (GtkHTML *html,</div><div class='del'>-				     GtkHTMLEmbedded *eb,</div><div class='del'>-				     ESummary *summary);</div><div class='del'>-static void e_summary_save_state (ESummary *esummary,</div><div class='del'>-				  const char *path);</div><div class='del'>-static void e_summary_load_state (ESummary *esummary,</div><div class='del'>-				  const char *path);</div><div class='del'>-</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESummary *esummary = E_SUMMARY (object);</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	char *prefix;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prefix = g_concat_dir_and_file (evolution_dir, "config/");</div><div class='del'>-	e_summary_save_state (esummary, prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	e_summary_prefs_free (esummary-&gt;prefs);</div><div class='del'>-	for (l = priv-&gt;window_list; l; l = l-&gt;next)</div><div class='del'>-		e_summary_window_free (l-&gt;data);</div><div class='del'>-	g_list_free (priv-&gt;window_list);</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;header);</div><div class='del'>-	g_free (priv-&gt;footer);</div><div class='del'>-	g_free (esummary-&gt;private);</div><div class='del'>-	esummary-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	e_summary_parent_class-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	object_class-&gt;destroy = e_summary_destroy;</div><div class='del'>-	</div><div class='del'>-	e_summary_parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_start_load (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;stream = gtk_html_begin (GTK_HTML (priv-&gt;html));</div><div class='del'>-</div><div class='del'>-	/* HTML hacks */</div><div class='del'>-	/* Hack to stop page returning to the top */</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;newPage = FALSE;</div><div class='del'>-	/* Hack to make the border width of the page 0 */</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;leftBorder = 0;</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;rightBorder = 0;</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;topBorder = 0;</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;bottomBorder = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_default_header (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *def = "&lt;html&gt;&lt;body bgcolor=\"#ffffff\"&gt;"</div><div class='del'>-		"&lt;table width=\"100%\"&gt;&lt;tr&gt;&lt;td align=\"right\"&gt;"</div><div class='del'>-		"&lt;img src=\"ccsplash.png\"&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"</div><div class='del'>-		"&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;a href=\"exec://bug-buddy\"&gt;&lt;img src=\"file://gnome-spider.png\" width=\"24\" height=\"24\" border=\"0\"&gt;"</div><div class='del'>-		"&lt;/a&gt;&lt;/td&gt;&lt;td&gt;&lt;a href=\"exec://bug-buddy\"&gt;Submit a bug report"</div><div class='del'>-		"&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;hr&gt;";</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;stream != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, def, strlen (def));</div><div class='del'>-}</div><div class='del'>-static void</div><div class='del'>-load_default_footer (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *footer = "&lt;hr&gt;&lt;p align=\"right\"&gt;All Executive Summary comments to &lt;a href=\"mailto:iain@ximian.com\"&gt;Iain Holmes (iain@ximian.com)&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;";</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, </div><div class='del'>-			footer, strlen (footer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_end_load (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	gtk_html_end (GTK_HTML (priv-&gt;html), priv-&gt;stream, GTK_HTML_STREAM_OK);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stream = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_init (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	GdkColor bgcolour = {0, 0xdfff, 0xdfff, 0xffff};</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	esummary-&gt;prefs = NULL;</div><div class='del'>-	esummary-&gt;tmp_prefs = NULL;</div><div class='del'>-	esummary-&gt;private = g_new0 (ESummaryPrivate, 1);</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = NULL;</div><div class='del'>-	priv-&gt;idle = 0;</div><div class='del'>-</div><div class='del'>-	/* HTML widget */</div><div class='del'>-	priv-&gt;html_scroller = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv-&gt;html_scroller),</div><div class='del'>-					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);</div><div class='del'>-	priv-&gt;html = gtk_html_new ();</div><div class='del'>-	gtk_html_set_editable (GTK_HTML (priv-&gt;html), FALSE);</div><div class='del'>-	gtk_html_set_default_content_type (GTK_HTML (priv-&gt;html),</div><div class='del'>-					   "text/html; charset=utf-8");</div><div class='del'>-	gtk_html_set_default_background_color (GTK_HTML (priv-&gt;html), &amp;bgcolour);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "url-requested",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_request), esummary);</div><div class='del'>-  	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "object-requested", </div><div class='del'>-  			    GTK_SIGNAL_FUNC (on_object_requested), esummary); </div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "link-clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_click), esummary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "on-url",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_over), esummary);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;html_scroller), priv-&gt;html);</div><div class='del'>-	gtk_widget_show_all (priv-&gt;html_scroller);</div><div class='del'>-</div><div class='del'>-	e_summary_queue_rebuild (esummary);</div><div class='del'>-</div><div class='del'>-	/* Pack stuff */</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (esummary), priv-&gt;html_scroller, </div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,</div><div class='del'>-	     e_summary_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_summary_new (const GNOME_Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	ESummary *esummary;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	esummary = gtk_type_new (e_summary_get_type ());</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;shell = shell;</div><div class='del'>-</div><div class='del'>-	/* Restore services */</div><div class='del'>-	path = g_concat_dir_and_file (evolution_dir, </div><div class='del'>-				      "config");</div><div class='del'>-	e_summary_load_state (esummary, path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-control_unrealize (GtkHTMLEmbedded *eb,</div><div class='del'>-		   GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_print ("Removing\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-being_unrealized (GtkWidget *widget,</div><div class='del'>-		  GtkHTMLEmbedded *eb)</div><div class='del'>-{</div><div class='del'>-	g_warning ("Widget is being unrealized");</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (eb), widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-being_realized (GtkWidget *widget,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	gdk_window_ref (widget-&gt;window);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-on_object_requested (GtkHTML *html,</div><div class='del'>-		     GtkHTMLEmbedded *eb,</div><div class='del'>-		     ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	static GtkWidget *widget = NULL;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	if (sscanf (eb-&gt;classid, "cid:%d", &amp;id) != 1) {</div><div class='del'>-		g_warning ("Could not get the view id: eb-&gt;classid = %s",</div><div class='del'>-			   eb-&gt;classid);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (widget == NULL || !GTK_IS_WIDGET (widget)) {</div><div class='del'>-		g_print ("Create new\n");</div><div class='del'>-      		widget = executive_summary_component_view_get_widget (view);  </div><div class='del'>-/*    		widget = gtk_button_new_with_label ("Hello?");  */</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (widget), "realize",</div><div class='del'>-				    GTK_SIGNAL_FUNC (being_realized), NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (widget), "unrealize",</div><div class='del'>-				    GTK_SIGNAL_FUNC (being_unrealized), eb);</div><div class='del'>-		g_print ("New widget: %p\n", GTK_BIN (widget)-&gt;child);</div><div class='del'>-	} else {</div><div class='del'>-		g_print ("No new\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (widget == NULL) {</div><div class='del'>-		g_warning ("View %d has no GtkWidget.", id);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (eb), "unrealize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (control_unrealize), widget);</div><div class='del'>-	gtk_widget_show_all (widget);</div><div class='del'>-	gtk_widget_ref (widget);</div><div class='del'>-</div><div class='del'>-	if (widget-&gt;parent == NULL)</div><div class='del'>-		gtk_container_add (GTK_CONTAINER (eb), widget);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generates the window controls and works out</div><div class='del'>-   if they should be disabled or not */</div><div class='del'>-static char *</div><div class='del'>-make_control_html (ESummaryWindow *window,</div><div class='del'>-		   int row, </div><div class='del'>-		   int col,</div><div class='del'>-		   int numwindows)</div><div class='del'>-{</div><div class='del'>-	char *html, *tmp;</div><div class='del'>-	int id = GPOINTER_TO_INT (window);</div><div class='del'>-	gboolean config;</div><div class='del'>-</div><div class='del'>-	config = TRUE;</div><div class='del'>-</div><div class='del'>-	if (window-&gt;propertycontrol == CORBA_OBJECT_NIL)</div><div class='del'>-		config = FALSE;</div><div class='del'>-</div><div class='del'>-	html = g_strdup_printf ("&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;a href=\"close://%d\"&gt;"</div><div class='del'>-				"&lt;img src=\"service-close.png\" border=\"0\"&gt;"</div><div class='del'>-				"&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;", id);</div><div class='del'>-</div><div class='del'>-	tmp = html;</div><div class='del'>-	if (!config) {</div><div class='del'>-		html = g_strdup_printf ("%s&lt;img src=\"service-configure.png\"&gt;"</div><div class='del'>-					"&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;", tmp);</div><div class='del'>-	} else {</div><div class='del'>-		html = g_strdup_printf ("%s&lt;a href=\"configure://%d\"&gt;"</div><div class='del'>-					"&lt;img src=\"service-configure.png\" border=\"0\"&gt;"</div><div class='del'>-					"&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;", tmp, id);</div><div class='del'>-	}</div><div class='del'>-	g_free (tmp);</div><div class='del'>-</div><div class='del'>-	return html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_display_window_title (ESummary *esummary,</div><div class='del'>-				ESummaryWindow *window,</div><div class='del'>-				int row,</div><div class='del'>-				int col,</div><div class='del'>-				int numwindows)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *title_html;</div><div class='del'>-	char *control_html;</div><div class='del'>-	char *title_colour[2] = {"bac1b6",</div><div class='del'>-				 "cdd1c7"};</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	control_html = make_control_html (window, row, col, numwindows);</div><div class='del'>-	title_html = g_strdup_printf ("&lt;td bgcolor=\"#%s\"&gt;"</div><div class='del'>-				      "&lt;table width=\"100%%\" height=\"100%%\"&gt;&lt;tr&gt;&lt;td&gt;"</div><div class='del'>-				      "&lt;img src=\"%s\" height=\"48\"&gt;&lt;/td&gt;"</div><div class='del'>-				      "&lt;td nowrap align=\"center\" width=\"100%%\"&gt;"</div><div class='del'>-				      "&lt;b&gt;%s&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%s&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/td&gt;",</div><div class='del'>-				      title_colour[col % 2], window-&gt;icon, </div><div class='del'>-				      window-&gt;title, control_html);</div><div class='del'>-	g_free (control_html);</div><div class='del'>-	</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, title_html,</div><div class='del'>-			strlen (title_html));</div><div class='del'>-	g_free (title_html);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-e_summary_display_window (ESummary *esummary,</div><div class='del'>-			  ESummaryWindow *window,</div><div class='del'>-			  int row,</div><div class='del'>-			  int col,</div><div class='del'>-			  int numwindows)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *footer = "&lt;/td&gt;";</div><div class='del'>-	char *header;</div><div class='del'>-	char *colour[2] = {"e6e8e4", </div><div class='del'>-			   "edeeeb"};</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	header = g_strdup_printf ("&lt;td bgcolor=\"%s\" valign=\"top\"&gt;", colour[col % 2]);</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, header, strlen (header));</div><div class='del'>-	g_free (header);</div><div class='del'>-</div><div class='del'>-	if (window-&gt;html != CORBA_OBJECT_NIL) {</div><div class='del'>-		char *html = NULL;</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		html = GNOME_Evolution_Summary_HTMLView_getHtml (window-&gt;html,</div><div class='del'>-								 &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			g_warning ("Cannot get HTML.");</div><div class='del'>-			if (html)</div><div class='del'>-				CORBA_free (html);</div><div class='del'>-		} else {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			</div><div class='del'>-			gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-					html, strlen (html));</div><div class='del'>-			CORBA_free (html);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-#if 0</div><div class='del'>-		char *body_cid;</div><div class='del'>-</div><div class='del'>-		body_cid = g_strdup_printf ("&lt;object classid=\"cid:%d\"&gt;&lt;/object&gt;", id);</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				body_cid, strlen (body_cid));</div><div class='del'>-		g_free (body_cid);</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-			footer, strlen (footer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-e_summary_rebuild_page (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *windows;</div><div class='del'>-	char *service_table = "&lt;table numcols=\"%d\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" height=\"100%%\" width=\"100%%\"&gt;";</div><div class='del'>-	char *tmp;</div><div class='del'>-	int numwindows, numrows;</div><div class='del'>-	int i, j, k;</div><div class='del'>-	int columns;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (esummary != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;idle == 0) {</div><div class='del'>-		g_warning ("esummary-&gt;private-&gt;idle == 0! This means that "</div><div class='del'>-			   "e_summary_rebuild_page was called by itself and "</div><div class='del'>-			   "not queued. You should use e_summary_queue_rebuild "</div><div class='del'>-			   "instead.");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If there is a selection, don't redraw the page so that the selection</div><div class='del'>-	   isn't cleared */</div><div class='del'>-	if (GTK_HTML (priv-&gt;html)-&gt;in_selection == TRUE ||</div><div class='del'>-	    html_engine_is_selection_active (GTK_HTML (priv-&gt;html)-&gt;engine) == TRUE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_layout_freeze (GTK_LAYOUT (priv-&gt;html));</div><div class='del'>-	e_summary_start_load (esummary);</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;header == NULL || *priv-&gt;header == '\0') {</div><div class='del'>-		load_default_header (esummary);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				priv-&gt;header, priv-&gt;header_len);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the start of the services */</div><div class='del'>-	tmp = g_strdup_printf (service_table, esummary-&gt;prefs-&gt;columns);</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, tmp, strlen (tmp));</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	/* Load each of the services */</div><div class='del'>-	numwindows = g_list_length (priv-&gt;window_list);</div><div class='del'>-</div><div class='del'>-	columns = esummary-&gt;prefs-&gt;columns;</div><div class='del'>-</div><div class='del'>-	windows = priv-&gt;window_list;</div><div class='del'>-	if (numwindows % columns == 0)</div><div class='del'>-		numrows = numwindows / columns;</div><div class='del'>-	else</div><div class='del'>-		numrows = numwindows / columns + 1;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; numrows; i++) {</div><div class='del'>-		GList *window = windows;</div><div class='del'>-		</div><div class='del'>-		/* Do the same row twice: </div><div class='del'>-		   Once for the title, once for the contents */</div><div class='del'>-		for (j = 0; j &lt; 2; j++) {</div><div class='del'>-			int limit;</div><div class='del'>-			</div><div class='del'>-			gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-					"&lt;tr&gt;", 4);</div><div class='del'>-				/* For each window on row i */</div><div class='del'>-			limit = MIN (columns, (numwindows - (i * columns)));</div><div class='del'>-			for (k = 0; k &lt; limit; k++) {</div><div class='del'>-				</div><div class='del'>-				if (window == NULL)</div><div class='del'>-					break;</div><div class='del'>-</div><div class='del'>-				if (j == 0) {</div><div class='del'>-					e_summary_display_window_title (esummary,</div><div class='del'>-									window-&gt;data,</div><div class='del'>-									k, k, </div><div class='del'>-									numwindows);</div><div class='del'>-				} else {</div><div class='del'>-					e_summary_display_window (esummary,</div><div class='del'>-								  window-&gt;data,</div><div class='del'>-								  k, k,</div><div class='del'>-								  numwindows);</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				if (window != NULL)</div><div class='del'>-					window = window-&gt;next;</div><div class='del'>-				</div><div class='del'>-				if (window == NULL)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-					"&lt;/tr&gt;", 5);</div><div class='del'>-			if (j == 0)</div><div class='del'>-				window = windows;</div><div class='del'>-			else {</div><div class='del'>-				if (window)</div><div class='del'>-					windows = window;</div><div class='del'>-				else </div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, "&lt;/tr&gt;&lt;/table&gt;", 13);</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;footer == NULL || *priv-&gt;footer == '\0') {</div><div class='del'>-		load_default_footer (esummary);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				priv-&gt;footer, priv-&gt;footer_len);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_summary_end_load (esummary);</div><div class='del'>-	gtk_layout_thaw (GTK_LAYOUT (priv-&gt;html));</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is the function that should be called instead of </div><div class='del'>-   e_summary_queue_rebuild. This prevents multiple </div><div class='del'>-   rebuilds happening together. */</div><div class='del'>-void</div><div class='del'>-e_summary_queue_rebuild (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	if (priv-&gt;idle != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-listener_event (BonoboListener *listener,</div><div class='del'>-		char *event_name,</div><div class='del'>-		BonoboArg *event_data,</div><div class='del'>-		CORBA_Environment *ev,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window = (ESummaryWindow *) user_data;</div><div class='del'>-</div><div class='del'>-	if (strcmp (event_name, "Bonobo/Property:change:window_title") == 0) {</div><div class='del'>-		if (window-&gt;title != NULL)</div><div class='del'>-			g_free (window-&gt;title);</div><div class='del'>-</div><div class='del'>-		window-&gt;title = g_strdup (BONOBO_ARG_GET_STRING (event_data));</div><div class='del'>-		e_summary_queue_rebuild (window-&gt;esummary);</div><div class='del'>-	} else if (strcmp (event_name, "Bonobo/Property:change:window_icon") == 0) {</div><div class='del'>-		if (window-&gt;icon != NULL)</div><div class='del'>-			g_free (window-&gt;icon);</div><div class='del'>-</div><div class='del'>-		window-&gt;icon = g_strdup (BONOBO_ARG_GET_STRING (event_data));</div><div class='del'>-		e_summary_queue_rebuild (window-&gt;esummary);</div><div class='del'>-	} else if (strcmp (event_name, EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED) == 0) {</div><div class='del'>-		e_summary_queue_rebuild (window-&gt;esummary);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-ESummaryWindow *</div><div class='del'>-e_summary_add_service (ESummary *esummary,</div><div class='del'>-		       GNOME_Evolution_Summary_Component component,</div><div class='del'>-		       const char *iid)</div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	Bonobo_Unknown unknown = CORBA_OBJECT_NIL;</div><div class='del'>-	Bonobo_Listener listener;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (esummary != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL);</div><div class='del'>-	g_return_val_if_fail (component != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	window = g_new0 (ESummaryWindow, 1);</div><div class='del'>-	window-&gt;component = component;</div><div class='del'>-	window-&gt;iid = g_strdup (iid);</div><div class='del'>-	window-&gt;esummary = esummary;</div><div class='del'>-</div><div class='del'>-	/* See what interfaces our component supports */</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	unknown = Bonobo_Unknown_queryInterface (component,</div><div class='del'>-						 "IDL:Bonobo/Control:1.0", &amp;ev);</div><div class='del'>-	window-&gt;control = (Bonobo_Control) unknown;</div><div class='del'>-</div><div class='del'>-	unknown = Bonobo_Unknown_queryInterface (component,</div><div class='del'>-						 "IDL:GNOME/Evolution/Summary/HTMLView:1.0", </div><div class='del'>-						 &amp;ev);</div><div class='del'>-	window-&gt;html = (GNOME_Evolution_Summary_HTMLView) unknown;</div><div class='del'>-</div><div class='del'>-	/* Check at least one of the above interfaces was supported */</div><div class='del'>-	if (window-&gt;html == CORBA_OBJECT_NIL &amp;&amp;</div><div class='del'>-	    window-&gt;control == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev2;</div><div class='del'>-		g_warning ("This component does not support either" </div><div class='del'>-			   "Bonobo/Control:1.0 or GNOME/Evolution/Summary/HTMLView:1.0");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev2);</div><div class='del'>-		CORBA_Object_release (component, &amp;ev2);</div><div class='del'>-		CORBA_exception_free (&amp;ev2);</div><div class='del'>-</div><div class='del'>-		g_free (window);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	unknown = Bonobo_Unknown_queryInterface (component,</div><div class='del'>-						 "IDL:Bonobo/PropertyBag:1.0",</div><div class='del'>-						 &amp;ev);</div><div class='del'>-	window-&gt;propertybag = (Bonobo_PropertyBag) unknown;</div><div class='del'>-</div><div class='del'>-	window-&gt;event_source = Bonobo_Unknown_queryInterface(window-&gt;propertybag,</div><div class='del'>-							     "IDL:Bonobo/EventSource:1.0", &amp;ev);</div><div class='del'>-	if (window-&gt;event_source == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("There is no Bonobo::EventSource interface");</div><div class='del'>-</div><div class='del'>-		/* FIXME: Free whatever objects exist */</div><div class='del'>-		g_free (window);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	window-&gt;listener = bonobo_listener_new (NULL, NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (window-&gt;listener), "event_notify",</div><div class='del'>-			    GTK_SIGNAL_FUNC (listener_event), window);</div><div class='del'>-	listener = bonobo_object_corba_objref (BONOBO_OBJECT (window-&gt;listener));</div><div class='del'>-	window-&gt;listener_id = Bonobo_EventSource_addListener (window-&gt;event_source, listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	unknown = Bonobo_Unknown_queryInterface (component,</div><div class='del'>-						 "IDL:Bonobo/PersistStream:1.0",</div><div class='del'>-						 &amp;ev);</div><div class='del'>-	window-&gt;persiststream = (Bonobo_PersistStream) unknown;</div><div class='del'>-	</div><div class='del'>-	unknown = Bonobo_Unknown_queryInterface (component,</div><div class='del'>-						 "IDL:Bonobo/PropertyControl:1.0",</div><div class='del'>-						 &amp;ev);</div><div class='del'>-	window-&gt;propertycontrol = (Bonobo_PropertyControl) unknown;</div><div class='del'>-</div><div class='del'>-	/* Cache the title and icon */</div><div class='del'>-	window-&gt;title = bonobo_property_bag_client_get_value_string (window-&gt;propertybag,</div><div class='del'>-								     "window_title", </div><div class='del'>-								     NULL);</div><div class='del'>-	g_print ("title: %s\n", window-&gt;title);</div><div class='del'>-	window-&gt;icon = bonobo_property_bag_client_get_value_string (window-&gt;propertybag,</div><div class='del'>-								    "window_icon", NULL);</div><div class='del'>-	g_print ("icon: %s\n", window-&gt;icon);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	priv-&gt;window_list = g_list_append (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	return window;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ESummaryWindow *</div><div class='del'>-e_summary_embed_service_from_id (ESummary *esummary,</div><div class='del'>-				 const char *obj_id)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_Component component;</div><div class='del'>-	ExecutiveSummaryComponentFactoryClient *client;</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	</div><div class='del'>-	client = executive_summary_component_factory_client_new (obj_id);</div><div class='del'>-	</div><div class='del'>-	component = executive_summary_component_factory_client_create_view (client);</div><div class='del'>-</div><div class='del'>-	/* Don't need the client any more */</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	window = e_summary_add_service (esummary, component, obj_id);</div><div class='del'>-	e_summary_queue_rebuild (esummary);</div><div class='del'>-	</div><div class='del'>-	return window;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_free (ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (window != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (window-&gt;iid);</div><div class='del'>-	g_free (window-&gt;icon);</div><div class='del'>-	g_free (window-&gt;title);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (window-&gt;control != CORBA_OBJECT_NIL) {</div><div class='del'>-		bonobo_object_release_unref (window-&gt;control, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (window-&gt;event_source != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_EventSource_removeListener (window-&gt;event_source,</div><div class='del'>-						   window-&gt;listener_id,</div><div class='del'>-						   &amp;ev);</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("CORBA ERROR: %s", CORBA_exception_id (&amp;ev));</div><div class='del'>-		}</div><div class='del'>-		bonobo_object_release_unref (window-&gt;event_source, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (window-&gt;propertybag, &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (window-&gt;persiststream, &amp;ev);</div><div class='del'>-	bonobo_object_release_unref (window-&gt;propertycontrol, &amp;ev);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (window-&gt;listener));</div><div class='del'>-	bonobo_object_release_unref (window-&gt;html, &amp;ev);</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (window-&gt;component, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_remove_window (ESummary *esummary,</div><div class='del'>-			 ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-	g_return_if_fail (window != NULL);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	priv-&gt;window_list = g_list_remove (priv-&gt;window_list, window);</div><div class='del'>-	e_summary_window_free (window);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-void</div><div class='del'>-e_summary_set_shell_view_interface (ESummary *esummary,</div><div class='del'>-				    GNOME_Evolution_ShellView svi)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-	g_return_if_fail (svi != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	priv-&gt;shell_view_interface = svi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Wrappers for GNOME_Evolution_ShellView */</div><div class='del'>-void</div><div class='del'>-e_summary_set_message (ESummary *esummary,</div><div class='del'>-		       const char *message,</div><div class='del'>-		       gboolean busy)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	if (message != NULL)</div><div class='del'>-		GNOME_Evolution_ShellView_setMessage (svi, message, busy, &amp;ev);</div><div class='del'>-	else </div><div class='del'>-		GNOME_Evolution_ShellView_setMessage (svi, "", busy, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_unset_message (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_ShellView_unsetMessage (svi, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_change_current_view (ESummary *esummary,</div><div class='del'>-			       const char *uri)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_ShellView_changeCurrentView (svi, uri, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_set_title (ESummary *esummary,</div><div class='del'>-		     const char *title)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	GNOME_Evolution_ShellView_setTitle (svi, title, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_load_page (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GnomeVFSHandle *handle = NULL;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-	GString *string;</div><div class='del'>-	char *str, *comment;</div><div class='del'>-	char *filename;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-	</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	/* Pass NULL to reset the page to the default */</div><div class='del'>-	if ((esummary-&gt;prefs-&gt;page) == NULL || </div><div class='del'>-	    *(esummary-&gt;prefs-&gt;page) == '\0') {</div><div class='del'>-		filename = g_concat_dir_and_file (EVOLUTION_DATADIR, "/evolution/summary.html");</div><div class='del'>-	} else {</div><div class='del'>-		filename = g_strdup (esummary-&gt;prefs-&gt;page);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (esummary));</div><div class='del'>-	string = g_string_new ("");</div><div class='del'>-	result = gnome_vfs_open (&amp;handle, filename, GNOME_VFS_OPEN_READ);</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING,</div><div class='del'>-			  _("Cannot open the HTML file:\n%s"), filename);</div><div class='del'>-		g_free (filename);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (filename);</div><div class='del'>-	while (1) {</div><div class='del'>-		char buffer[4096];</div><div class='del'>-		GnomeVFSFileSize size;</div><div class='del'>-</div><div class='del'>-		memset (buffer, 0x00, 4096);</div><div class='del'>-		result = gnome_vfs_read (handle, buffer, 4096, &amp;size);</div><div class='del'>-		if (result != GNOME_VFS_OK &amp;&amp; result != GNOME_VFS_ERROR_EOF) {</div><div class='del'>-			e_notice (GTK_WINDOW (toplevel), GNOME_MESSAGE_BOX_WARNING, </div><div class='del'>-				  _("Error reading data:\n%s"),</div><div class='del'>-				  gnome_vfs_result_to_string (result));</div><div class='del'>-			gnome_vfs_close (handle);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		if (size == 0)</div><div class='del'>-			break; /* EOF */</div><div class='del'>-</div><div class='del'>-		string = g_string_append (string, buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (handle);</div><div class='del'>-	str = string-&gt;str;</div><div class='del'>-	g_string_free (string, FALSE);</div><div class='del'>-</div><div class='del'>-	comment = strstr (str, "&lt;!-- EVOLUTION EXECUTIVE SUMMARY SERVICES DO NOT REMOVE --&gt;");</div><div class='del'>-	if (comment == NULL) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_WARNING, </div><div class='del'>-			  _("File does not have a place for the services.\n"));</div><div class='del'>-		g_free (str);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;header != NULL)</div><div class='del'>-		g_free (priv-&gt;header);</div><div class='del'>-	priv-&gt;header = g_strndup (str, comment - str);</div><div class='del'>-	priv-&gt;header_len = strlen (priv-&gt;header);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;footer != NULL)</div><div class='del'>-		g_free (priv-&gt;footer);</div><div class='del'>-	priv-&gt;footer = g_strdup (comment);</div><div class='del'>-	priv-&gt;footer_len = strlen (priv-&gt;footer);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-load_component_id_stream_read (Bonobo_Stream stream,</div><div class='del'>-			       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	GString *str;</div><div class='del'>-	char *ans;</div><div class='del'>-</div><div class='del'>-	str = g_string_sized_new (256);</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-	do {</div><div class='del'>-		int i;</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE, &amp;buffer, ev);</div><div class='del'>-		if (ev-&gt;_major != CORBA_NO_EXCEPTION)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		/* FIXME: make better PLEASE!!!*/</div><div class='del'>-		for (i = 0; i &lt; buffer-&gt;_length; i++)</div><div class='del'>-			g_string_append_c (str, buffer-&gt;_buffer[i]);</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-	} while (1);</div><div class='del'>-#undef READ_CHUNK_SIZE</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-</div><div class='del'>-	ans = str-&gt;str;</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-</div><div class='del'>-	return ans;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-load_component_id (Bonobo_Storage corba_storage,</div><div class='del'>-		   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream corba_stream;</div><div class='del'>-	char *iid;</div><div class='del'>-</div><div class='del'>-	corba_stream = Bonobo_Storage_openStream (corba_storage, IID_FILE,</div><div class='del'>-						  Bonobo_Storage_READ, ev);</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (corba_stream) {</div><div class='del'>-		iid = load_component_id_stream_read (corba_stream, ev);</div><div class='del'>-		Bonobo_Unknown_unref (corba_stream, ev);</div><div class='del'>-		CORBA_Object_release (corba_stream, ev);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Cannot find `%s'", IID_FILE);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return iid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_component (ESummary *esummary,</div><div class='del'>-		BonoboStorage *storage,</div><div class='del'>-		int index)</div><div class='del'>-{</div><div class='del'>-	char *curdir;</div><div class='del'>-	char *iid;</div><div class='del'>-	Bonobo_Storage corba_subdir;</div><div class='del'>-	Bonobo_Storage corba_storage;</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	curdir = g_strdup_printf ("%08d", index);</div><div class='del'>-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir,</div><div class='del'>-						   Bonobo_Storage_READ, &amp;ev);</div><div class='del'>-	if (corba_subdir == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (curdir);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	iid = load_component_id (corba_subdir, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (iid) {</div><div class='del'>-		Bonobo_Stream corba_stream;</div><div class='del'>-</div><div class='del'>-		window = e_summary_embed_service_from_id (esummary, iid);</div><div class='del'>-		if (window) {</div><div class='del'>-			if (window-&gt;persiststream) {</div><div class='del'>-				corba_stream = Bonobo_Storage_openStream </div><div class='del'>-					(corba_subdir,</div><div class='del'>-					 DATA_FILE,</div><div class='del'>-					 Bonobo_Storage_READ |</div><div class='del'>-					 Bonobo_Storage_CREATE, &amp;ev);</div><div class='del'>-				if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-					g_print ("Gah");</div><div class='del'>-					return;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				Bonobo_PersistStream_load (window-&gt;persiststream,</div><div class='del'>-							   corba_stream, </div><div class='del'>-							   "", &amp;ev);</div><div class='del'>-				if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-					g_warning ("Could not load `%s'", iid);</div><div class='del'>-</div><div class='del'>-				bonobo_object_release_unref (corba_stream, &amp;ev);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (iid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_release_unref (corba_subdir, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	g_free (curdir);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_reconfigure (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	e_summary_load_page (esummary);</div><div class='del'>-	e_summary_queue_rebuild (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_load_state (ESummary *esummary,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	char *fullpath;</div><div class='del'>-	BonoboStorage *storage;</div><div class='del'>-	Bonobo_Storage corba_storage;</div><div class='del'>-	Bonobo_Storage_DirectoryList *list;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	fullpath = g_strdup_printf ("%s/Executive-Summary", path);</div><div class='del'>-	storage = bonobo_storage_open (STORAGE_TYPE, fullpath,</div><div class='del'>-				       Bonobo_Storage_READ |</div><div class='del'>-				       Bonobo_Storage_WRITE, </div><div class='del'>-				       0664);</div><div class='del'>-	if (storage != NULL) {</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		</div><div class='del'>-		corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));</div><div class='del'>-		list = Bonobo_Storage_listContents (corba_storage, "/", 0, &amp;ev);</div><div class='del'>-		if (list) {</div><div class='del'>-			for (i = 0; i &lt; list-&gt;_length; i++)</div><div class='del'>-				load_component (esummary, storage, i);</div><div class='del'>-			</div><div class='del'>-			CORBA_free (list);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (storage));</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (fullpath);</div><div class='del'>-</div><div class='del'>-	/* Load the preferences */</div><div class='del'>-	if (esummary-&gt;prefs != NULL)</div><div class='del'>-		e_summary_prefs_free (esummary-&gt;prefs);</div><div class='del'>-</div><div class='del'>-	esummary-&gt;prefs = e_summary_prefs_load (path);</div><div class='del'>-	e_summary_reconfigure (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_component (BonoboStorage *storage,</div><div class='del'>-		ESummaryWindow *window,</div><div class='del'>-		int index)</div><div class='del'>-{</div><div class='del'>-	char *curdir = g_strdup_printf ("%08d", index);</div><div class='del'>-	Bonobo_Storage corba_storage;</div><div class='del'>-	Bonobo_Storage corba_subdir;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	corba_subdir = Bonobo_Storage_openStorage (corba_storage, curdir,</div><div class='del'>-						   Bonobo_Storage_CREATE|</div><div class='del'>-						   Bonobo_Storage_WRITE|</div><div class='del'>-						   Bonobo_Storage_READ, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Cannot create '%s'", curdir);</div><div class='del'>-		g_free (curdir);</div><div class='del'>-	} else {</div><div class='del'>-		Bonobo_Stream corba_stream;</div><div class='del'>-</div><div class='del'>-		g_free (curdir);</div><div class='del'>-		corba_stream = Bonobo_Storage_openStream</div><div class='del'>-			(corba_subdir, IID_FILE, </div><div class='del'>-			 Bonobo_Storage_CREATE|</div><div class='del'>-			 Bonobo_Storage_READ|</div><div class='del'>-			 Bonobo_Storage_WRITE, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			g_warning ("EEK: %s", CORBA_exception_id (&amp;ev));</div><div class='del'>-			if (corba_subdir != CORBA_OBJECT_NIL)</div><div class='del'>-				bonobo_object_release_unref (corba_subdir, &amp;ev);</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bonobo_stream_client_write_string (corba_stream,</div><div class='del'>-						   window-&gt;iid, TRUE, &amp;ev);</div><div class='del'>-		bonobo_object_release_unref (corba_stream, &amp;ev);</div><div class='del'>-</div><div class='del'>-		corba_stream = Bonobo_Storage_openStream (corba_subdir, DATA_FILE,</div><div class='del'>-							  Bonobo_Storage_CREATE,</div><div class='del'>-							  &amp;ev);</div><div class='del'>-		if (window-&gt;persiststream != CORBA_OBJECT_NIL) {</div><div class='del'>-			Bonobo_PersistStream_save (window-&gt;persiststream,</div><div class='del'>-						   corba_stream, "", &amp;ev);</div><div class='del'>-			if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-				g_warning ("Unable to save %s", window-&gt;iid);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		bonobo_object_release_unref (corba_stream, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (corba_subdir != CORBA_OBJECT_NIL)</div><div class='del'>-		bonobo_object_release_unref (corba_subdir, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_save_state (ESummary *esummary,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	BonoboStorage *storage;</div><div class='del'>-	Bonobo_Storage corba_storage;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	GList *windows;</div><div class='del'>-	char *fullpath;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	fullpath = g_strdup_printf("%s/Executive-Summary", path);</div><div class='del'>-	g_print ("fullpath: %s\n", fullpath);</div><div class='del'>-</div><div class='del'>-	e_summary_rm_dir (fullpath);</div><div class='del'>-</div><div class='del'>-	storage = bonobo_storage_open (STORAGE_TYPE, fullpath,</div><div class='del'>-				       Bonobo_Storage_READ |</div><div class='del'>-				       Bonobo_Storage_WRITE |</div><div class='del'>-				       Bonobo_Storage_CREATE, 0660);</div><div class='del'>-	g_return_if_fail (storage);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	corba_storage = bonobo_object_corba_objref (BONOBO_OBJECT (storage));</div><div class='del'>-	</div><div class='del'>-	i = 0;</div><div class='del'>-	for (windows = priv-&gt;window_list; windows; windows = windows-&gt;next) {</div><div class='del'>-		save_component (storage, windows-&gt;data, i);</div><div class='del'>-		g_print ("IID: %s\n", ((ESummaryWindow *)windows-&gt;data)-&gt;iid);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Bonobo_Storage_commit (corba_storage, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (storage));</div><div class='del'>-</div><div class='del'>-	e_summary_prefs_save (esummary-&gt;prefs, path);</div><div class='del'>-	g_free (fullpath);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_left (ESummary *esummary,</div><div class='del'>-			    ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item, *grandparent;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	/* Need to cache this location */</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-	</div><div class='del'>-	/* Find the item 2 previous. */</div><div class='del'>-	if (win_item-&gt;prev == NULL)</div><div class='del'>-		return; /* Item was first, can't be moved left */</div><div class='del'>-</div><div class='del'>-	grandparent = win_item-&gt;prev-&gt;prev;</div><div class='del'>-</div><div class='del'>-	/* Remove it from the list */</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	/* Insert it after the grandparent */</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, grandparent);</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 1);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_right (ESummary *esummary,</div><div class='del'>-			     ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item, *child;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	if (win_item-&gt;next == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	child = win_item-&gt;next;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-	</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, child);</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 1);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_up (ESummary *esummary,</div><div class='del'>-			  ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-	</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, win_item);</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position - 3);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_down (ESummary *esummary,</div><div class='del'>-			    ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, win_item);</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 3);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h<br/>deleted file mode 100644<br/>index 5469adc6fe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/e-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,115 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_H__</div><div class='del'>-#define _E_SUMMARY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-listener.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-#include &lt;Evolution.h&gt;</div><div class='del'>-#include &lt;evolution-services/Executive-Summary.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary-prefs.h"</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_TYPE (e_summary_get_type ())</div><div class='del'>-#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary))</div><div class='del'>-#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass))</div><div class='del'>-#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummaryPrivate ESummaryPrivate;</div><div class='del'>-typedef struct _ESummary ESummary;</div><div class='del'>-typedef struct _ESummaryClass ESummaryClass;</div><div class='del'>-typedef struct _ESummaryWindow ESummaryWindow;</div><div class='del'>-</div><div class='del'>-struct _ESummaryWindow {</div><div class='del'>-	GNOME_Evolution_Summary_Component component;</div><div class='del'>-</div><div class='del'>-	Bonobo_Control control;</div><div class='del'>-	GNOME_Evolution_Summary_HTMLView html;</div><div class='del'>-</div><div class='del'>-	Bonobo_PersistStream persiststream;</div><div class='del'>-	Bonobo_PropertyBag propertybag;</div><div class='del'>-	Bonobo_PropertyControl propertycontrol;</div><div class='del'>-	Bonobo_EventSource event_source;</div><div class='del'>-	</div><div class='del'>-	/* Listener for the event_source */</div><div class='del'>-	BonoboListener *listener;</div><div class='del'>-	int listener_id;</div><div class='del'>-</div><div class='del'>-	char *iid;</div><div class='del'>-	char *title;</div><div class='del'>-	char *icon;</div><div class='del'>-	</div><div class='del'>-	ESummary *esummary;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummary {</div><div class='del'>-	GtkVBox parent;</div><div class='del'>-</div><div class='del'>-	ESummaryPrefs *prefs;</div><div class='del'>-	ESummaryPrefs *tmp_prefs;</div><div class='del'>-	ESummaryPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummaryClass {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_get_type (void);</div><div class='del'>-GtkWidget *e_summary_new (const GNOME_Evolution_Shell shell);</div><div class='del'>-void e_summary_queue_rebuild (ESummary *esummary);</div><div class='del'>-</div><div class='del'>-void e_summary_window_free (ESummaryWindow *window);</div><div class='del'>-void e_summary_remove_window (ESummary *esummary,</div><div class='del'>-			      ESummaryWindow *window);</div><div class='del'>-ESummaryWindow *e_summary_add_service (ESummary *esummary,</div><div class='del'>-				       GNOME_Evolution_Summary_Component component,</div><div class='del'>-				       const char *iid);</div><div class='del'>-ESummaryWindow * e_summary_embed_service_from_id (ESummary *esummary,</div><div class='del'>-						  const char *obj_id);</div><div class='del'>-</div><div class='del'>-void e_summary_set_shell_view_interface (ESummary *summary,</div><div class='del'>-					 GNOME_Evolution_ShellView svi);</div><div class='del'>-void e_summary_set_message (ESummary *esummary,</div><div class='del'>-			    const char *message,</div><div class='del'>-			    gboolean busy);</div><div class='del'>-void e_summary_unset_message (ESummary *esummary);</div><div class='del'>-void e_summary_change_current_view (ESummary *esummary,</div><div class='del'>-				    const char *uri);</div><div class='del'>-void e_summary_set_title (ESummary *esummary,</div><div class='del'>-			  const char *title);</div><div class='del'>-</div><div class='del'>-void e_summary_window_move_left (ESummary *esummary,</div><div class='del'>-				 ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_right (ESummary *esummary,</div><div class='del'>-				  ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_up (ESummary *esummary,</div><div class='del'>-			       ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_down (ESummary *esummary,</div><div class='del'>-				 ESummaryWindow *window);</div><div class='del'>-void e_summary_reconfigure (ESummary *esummary);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/executive-summary-config.glade b/executive-summary/component/executive-summary-config.glade<br/>deleted file mode 100644<br/>index 17fd9b0e69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/executive-summary-config.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/executive-summary-config.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Project1&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;project1&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;False&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;True&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;True&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;True&lt;/output_build_files&gt;</div><div class='del'>-  &lt;backup_source_files&gt;True&lt;/backup_source_files&gt;</div><div class='del'>-  &lt;main_source_file&gt;interface.c&lt;/main_source_file&gt;</div><div class='del'>-  &lt;main_header_file&gt;interface.h&lt;/main_header_file&gt;</div><div class='del'>-  &lt;handler_source_file&gt;callbacks.c&lt;/handler_source_file&gt;</div><div class='del'>-  &lt;handler_header_file&gt;callbacks.h&lt;/handler_header_file&gt;</div><div class='del'>-  &lt;support_source_file&gt;support.c&lt;/support_source_file&gt;</div><div class='del'>-  &lt;support_header_file&gt;support.h&lt;/support_header_file&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;&lt;/translatable_strings_file&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomePropertyBox&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;summaryprefs&lt;/name&gt;</div><div class='del'>-  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomePropertyBox:notebook&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;notebook1&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-    &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-    &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-    &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-    &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-    &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-    &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-    &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	&lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	&lt;label&gt;Appearance&lt;/label&gt;</div><div class='del'>-	&lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	      &lt;label&gt;Background:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GnomeFileEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;htmlpage&lt;/name&gt;</div><div class='del'>-	      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	      &lt;max_saved&gt;10&lt;/max_saved&gt;</div><div class='del'>-	      &lt;directory&gt;False&lt;/directory&gt;</div><div class='del'>-	      &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-		&lt;child_name&gt;GnomeEntry:entry&lt;/child_name&gt;</div><div class='del'>-		&lt;name&gt;combo-entry1&lt;/name&gt;</div><div class='del'>-		&lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-		&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-		&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-		&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;5&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	      &lt;label&gt;Number of columns:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;columnspinner&lt;/name&gt;</div><div class='del'>-	      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	      &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	      &lt;numeric&gt;True&lt;/numeric&gt;</div><div class='del'>-	      &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	      &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	      &lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-	      &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-	      &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	      &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	      &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;Label&lt;/name&gt;</div><div class='del'>-      &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;label&gt;General&lt;/label&gt;</div><div class='del'>-      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/executive-summary/component/executive-summary.png b/executive-summary/component/executive-summary.png<br/>deleted file mode 100644<br/>index 10a122f39e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/executive-summary.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/executive-summary.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c<br/>deleted file mode 100644<br/>index e23b59c23a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/main.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/component/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* </div><div class='del'>- * main.c: The core of the executive summary component.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- * Author: Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-init.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-#include &lt;gconf/gconf.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "gal/widgets/e-gui-utils.h"</div><div class='del'>-#include "gal/widgets/e-cursors.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc,</div><div class='del'>-      char **argv)</div><div class='del'>-{</div><div class='del'>-  CORBA_ORB orb;</div><div class='del'>-  </div><div class='del'>-  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-  textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-  gnome_init_with_popt_table ("evolution-executive-summary", VERSION,</div><div class='del'>-			      argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-  orb = oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-  gdk_rgb_init ();</div><div class='del'>-  glade_gnome_init ();</div><div class='del'>-  if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-    g_error (_("Executive summary component could not initialize Bonobo.\n"</div><div class='del'>-	       "If there was a warning message about the "</div><div class='del'>-	       "RootPOA, it probably means\nyou compiled "</div><div class='del'>-	       "Bonobo against GOAD instead of OAF."));</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-  gconf_init (argc, argv, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  e_cursors_init ();</div><div class='del'>-</div><div class='del'>-  component_factory_init ();</div><div class='del'>-</div><div class='del'>-  gnome_vfs_init ();</div><div class='del'>-  bonobo_main ();</div><div class='del'>-</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/default-header.html b/executive-summary/default-header.html<br/>deleted file mode 100644<br/>index 64fc119ea6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/default-header.html?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/default-header.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-&lt;html&gt;</div><div class='del'>-&lt;head&gt;</div><div class='del'>-&lt;title&gt;Evolution - Executive Summary&lt;/title&gt;</div><div class='del'>-&lt;/head&gt;</div><div class='del'>-</div><div class='del'>-&lt;body bgcolor="#ffffff"&gt;</div><div class='del'>-&lt;table&gt;</div><div class='del'>-&lt;tr valign="center"&gt;</div><div class='del'>-&lt;td align="right"&gt;&lt;img src="executive-summary.png"&gt;&lt;/td&gt;</div><div class='del'>-&lt;/tr&gt;</div><div class='del'>-&lt;/table&gt;</div><div class='del'>-&lt;/body&gt;</div><div class='del'>-&lt;/html&gt;</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/.cvsignore b/executive-summary/evolution-services/.cvsignore<br/>deleted file mode 100644<br/>index d9807cd94f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-Executive-Summary.h</div><div class='del'>-Executive-Summary-common.c</div><div class='del'>-Executive-Summary-skels.c</div><div class='del'>-Executive-Summary-stubs.c</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-core</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am<br/>deleted file mode 100644<br/>index e371b0ddf4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-lib_LTLIBRARIES = libevolution-services.la</div><div class='del'>-</div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/executive-summary		\</div><div class='del'>-	-I$(top_builddir)/executive-summary		\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)				\</div><div class='del'>-	$(GNOME_VFS_CFLAGS)				\</div><div class='del'>-	$(GTKHTML_CFLAGS)				\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-services\"</div><div class='del'>-</div><div class='del'>-IDL_GENERATED = \</div><div class='del'>-	Executive-Summary.h		\</div><div class='del'>-	Executive-Summary-common.c	\</div><div class='del'>-	Executive-Summary-skels.c	\</div><div class='del'>-	Executive-Summary-stubs.c</div><div class='del'>-</div><div class='del'>-Executive-Summary-impl.o: Executive-Summary.h</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	$(srcdir)/../idl/Executive-Summary.idl		\</div><div class='del'>-	$(srcdir)/../idl/Summary.idl			\</div><div class='del'>-	$(srcdir)/../idl/SummaryComponent.idl		\</div><div class='del'>-	$(srcdir)/../idl/HtmlView.idl</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \</div><div class='del'>-		$(srcdir)/../idl/Executive-Summary.idl</div><div class='del'>-</div><div class='del'>-libevolution_services_la_SOURCES =		\</div><div class='del'>-	$(IDL_GENERATED)		\</div><div class='del'>-	executive-summary-component.c	\</div><div class='del'>-	executive-summary-component.h	\</div><div class='del'>-	executive-summary-component-factory-client.c	\</div><div class='del'>-	executive-summary-component-factory-client.h	\</div><div class='del'>-	executive-summary-html-view.c	\</div><div class='del'>-	executive-summary-html-view.h</div><div class='del'>-</div><div class='del'>-libevolution_services_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)			\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(GTKHTML_LIBS)</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES = $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	cd $(distdir); rm -f $(BUILT_SOURCES)</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c<br/>deleted file mode 100644<br/>index b2415810ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-client.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary-client.h"</div><div class='del'>-#include "executive-summary-component.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClientPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryClient *client;</div><div class='del'>-	ExecutiveSummaryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	client = EXECUTIVE_SUMMARY_CLIENT (object);</div><div class='del'>-	priv = client-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_init (ExecutiveSummaryClient *client)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryClientPrivate, 1);</div><div class='del'>-	client-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_class_init (ExecutiveSummaryClientClass *client)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (client);</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = executive_summary_client_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_construct (ExecutiveSummaryClient *client,</div><div class='del'>-				    CORBA_Object corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_CLIENT (client));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_client, "ExecutiveSummaryClient",</div><div class='del'>-	     ExecutiveSummaryClient, executive_summary_client_class_init,</div><div class='del'>-	     executive_summary_client_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_set_title (ExecutiveSummaryClient *client,</div><div class='del'>-				    int id,</div><div class='del'>-				    const char *title)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame_setTitle (summary, id, title, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&amp;ev));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_set_icon (ExecutiveSummaryClient *client,</div><div class='del'>-				   int id,</div><div class='del'>-				   const char *icon)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame_setIcon (summary, id, icon, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&amp;ev));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_flash (ExecutiveSummaryClient *client,</div><div class='del'>-				int id)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame_flash (summary, id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error flashing");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_update (ExecutiveSummaryClient *client,</div><div class='del'>-				 int id,</div><div class='del'>-				 const char *html)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame_updateComponent (summary, id, html, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error updating the component");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-		</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h<br/>deleted file mode 100644<br/>index 765f9e3988..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-client.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-client.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_CLIENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_CLIENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryClientPrivate ExecutiveSummaryClientPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryClient ExecutiveSummaryClient;</div><div class='del'>-typedef struct _ExecutiveSummaryClientClass ExecutiveSummaryClientClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClient {</div><div class='del'>-	BonoboObjectClient parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClientClass {</div><div class='del'>-	BonoboObjectClientClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_client_get_type (void);</div><div class='del'>-void executive_summary_client_construct (ExecutiveSummaryClient *client,</div><div class='del'>-					 CORBA_Object object);</div><div class='del'>-void executive_summary_client_set_title (ExecutiveSummaryClient *client,</div><div class='del'>-					 int id,</div><div class='del'>-					 const char *title);</div><div class='del'>-void executive_summary_client_set_icon (ExecutiveSummaryClient *client,</div><div class='del'>-					int id,</div><div class='del'>-					const char *icon);</div><div class='del'>-void executive_summary_client_flash (ExecutiveSummaryClient *client,</div><div class='del'>-				     int id);</div><div class='del'>-void executive_summary_client_update (ExecutiveSummaryClient *client,</div><div class='del'>-				      int id,</div><div class='del'>-				      const char *html);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c<br/>deleted file mode 100644<br/>index 98247bdb00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-client.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;Executive-Summary.h&gt;</div><div class='del'>-#include "executive-summary-component-client.h"</div><div class='del'>-#include "executive-summary.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClientPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClient *client;</div><div class='del'>-	ExecutiveSummaryComponentClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	client = EXECUTIVE_SUMMARY_COMPONENT_CLIENT (object);</div><div class='del'>-	priv = client-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_init (ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryComponentClientPrivate, 1);</div><div class='del'>-	client-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_class_init (ExecutiveSummaryComponentClientClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_client_destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_construct (ExecutiveSummaryComponentClient *client,</div><div class='del'>-					      CORBA_Object corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentClient*</div><div class='del'>-executive_summary_component_client_new (const char *id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClient *client;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object corba_object;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Could not start %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (corba_object == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Could not activate %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	client = gtk_type_new (executive_summary_component_client_get_type ());</div><div class='del'>-	executive_summary_component_client_construct (client, corba_object);</div><div class='del'>-	</div><div class='del'>-	return client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* External API */</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,</div><div class='del'>-					      ExecutiveSummary *summary)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_Component component;</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame corba_object;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	GNOME_Evolution_Summary_Component_setOwner (component, corba_object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting owner");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_Component component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-	GNOME_Evolution_Summary_Component_unsetOwner (component, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error unsetting owner");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_client, </div><div class='del'>-	     "ExecutiveSummaryComponentClient", </div><div class='del'>-	     ExecutiveSummaryComponentClient,</div><div class='del'>-	     executive_summary_component_client_class_init,</div><div class='del'>-	     executive_summary_component_client_init, PARENT_TYPE)</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h<br/>deleted file mode 100644<br/>index 5a8e70f0fe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-client.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-client.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClientPrivate ExecutiveSummaryComponentClientPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClient ExecutiveSummaryComponentClient;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClientClass ExecutiveSummaryComponentClientClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClient {</div><div class='del'>-  BonoboObjectClient parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClientClass {</div><div class='del'>-  BonoboObjectClientClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_client_get_type (void);</div><div class='del'>-ExecutiveSummaryComponentClient *executive_summary_component_client_new (const char *id);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						   ExecutiveSummary *summary);</div><div class='del'>-void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						  gboolean *bonobo,</div><div class='del'>-						  gboolean *html);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						   ExecutiveSummaryComponentView *view);</div><div class='del'>-void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						      ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.c b/executive-summary/evolution-services/executive-summary-component-factory-client.c<br/>deleted file mode 100644<br/>index 23b5034849..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-factory-client.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-factory-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-factory-client.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;Executive-Summary.h&gt;</div><div class='del'>-#include "executive-summary-component-factory-client.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactoryClientPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactoryClient *client;</div><div class='del'>-	ExecutiveSummaryComponentFactoryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	client = EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (object);</div><div class='del'>-	priv = client-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_client_init (ExecutiveSummaryComponentFactoryClient *client)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactoryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryComponentFactoryClientPrivate, 1);</div><div class='del'>-	client-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_client_class_init (ExecutiveSummaryComponentFactoryClientClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_factory_client_destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_factory_client, </div><div class='del'>-	     "ExecutiveSummaryComponentFactoryClient", </div><div class='del'>-	     ExecutiveSummaryComponentFactoryClient,</div><div class='del'>-	     executive_summary_component_factory_client_class_init,</div><div class='del'>-	     executive_summary_component_factory_client_init, PARENT_TYPE)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** Public API ***/</div><div class='del'>-/**</div><div class='del'>- * executive_summary_component_factory_client_construct:</div><div class='del'>- * @client: The ExecutiveSummaryComponentFactoryClient to construct.</div><div class='del'>- * @corba_object: The CORBA_Object to construct it from.</div><div class='del'>- *</div><div class='del'>- * Constructs a client from the given CORBA_Object.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-executive_summary_component_factory_client_construct (ExecutiveSummaryComponentFactoryClient *client,</div><div class='del'>-						      CORBA_Object corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (client));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * executive_summary_component_factory_client_new:</div><div class='del'>- * @id: The OAFIID of the component to activate.</div><div class='del'>- *</div><div class='del'>- * Activates the component specified by @id, and creates a server side client</div><div class='del'>- * for that object.</div><div class='del'>- *</div><div class='del'>- * Returns: A pointer to an ExecutiveSummaryComponentFactoryClient object.</div><div class='del'>- */</div><div class='del'>-ExecutiveSummaryComponentFactoryClient *</div><div class='del'>-executive_summary_component_factory_client_new (const char *id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactoryClient *client;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object corba_object;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Could not start %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (corba_object == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Could not activate %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	client = gtk_type_new (executive_summary_component_factory_client_get_type ());</div><div class='del'>-	executive_summary_component_factory_client_construct (client, </div><div class='del'>-							      corba_object);</div><div class='del'>-	</div><div class='del'>-	return client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * executive_summary_component_factory_client_create_view:</div><div class='del'>- * @client: The client on which to create the view.</div><div class='del'>- *</div><div class='del'>- * Creates a new view of a remote component.</div><div class='del'>- * </div><div class='del'>- * Returns: A GNOME_Evolution_Summary_Component.</div><div class='del'>- */</div><div class='del'>-GNOME_Evolution_Summary_Component</div><div class='del'>-executive_summary_component_factory_client_create_view (ExecutiveSummaryComponentFactoryClient *client)</div><div class='del'>-{</div><div class='del'>-	GNOME_Evolution_Summary_ComponentFactory factory;</div><div class='del'>-	GNOME_Evolution_Summary_Component component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, CORBA_OBJECT_NIL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT (client),</div><div class='del'>-			      CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	factory = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-	component = GNOME_Evolution_Summary_ComponentFactory_createView (factory, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error creating view: %s", CORBA_exception_id (&amp;ev));</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return component;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-factory-client.h b/executive-summary/evolution-services/executive-summary-component-factory-client.h<br/>deleted file mode 100644<br/>index 71cd7af613..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-factory-client.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-factory-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-factory-client.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object-client.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE (executive_summary_component_factory_client_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClient))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE, ExecutiveSummaryComponentFactoryClientClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactoryClientPrivate ExecutiveSummaryComponentFactoryClientPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactoryClient ExecutiveSummaryComponentFactoryClient;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactoryClientClass ExecutiveSummaryComponentFactoryClientClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactoryClient {</div><div class='del'>-  BonoboObjectClient parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentFactoryClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactoryClientClass {</div><div class='del'>-  BonoboObjectClientClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_factory_client_get_type (void);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_factory_client_construct (ExecutiveSummaryComponentFactoryClient *client,</div><div class='del'>-							   CORBA_Object corba_object);</div><div class='del'>-ExecutiveSummaryComponentFactoryClient *executive_summary_component_factory_client_new (const char *id);</div><div class='del'>-CORBA_Object executive_summary_component_factory_client_create_view (ExecutiveSummaryComponentFactoryClient *client);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c<br/>deleted file mode 100644<br/>index 2b769b3bbe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,400 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.c - Bonobo implementation of </div><div class='del'>- *                                 SummaryComponent.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentViewPrivate {</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	Bonobo_Control objref;</div><div class='del'>-</div><div class='del'>-	char *html;</div><div class='del'>-	</div><div class='del'>-	char *title;</div><div class='del'>-	char *icon;</div><div class='del'>-	</div><div class='del'>-	int id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CONFIGURE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint32 view_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	view = EXECUTIVE_SUMMARY_COMPONENT_VIEW (object);</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;component)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;component));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;control)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;control));</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;html);</div><div class='del'>-	g_free (priv-&gt;title);</div><div class='del'>-	g_free (priv-&gt;icon);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	view-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_class_init (ExecutiveSummaryComponentViewClass *view_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (view_class);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_view_destroy;</div><div class='del'>-	</div><div class='del'>-	view_signals[CONFIGURE] = gtk_signal_new ("configure",</div><div class='del'>-						  GTK_RUN_FIRST,</div><div class='del'>-						  object_class-&gt;type,</div><div class='del'>-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryComponentViewClass, configure),</div><div class='del'>-						  gtk_marshal_NONE__NONE,</div><div class='del'>-						  GTK_TYPE_NONE, 0);</div><div class='del'>-	gtk_object_class_add_signals (object_class, view_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_init (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryComponentViewPrivate, 1);</div><div class='del'>-	view-&gt;private = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;control = NULL;</div><div class='del'>-	priv-&gt;objref = NULL;</div><div class='del'>-	priv-&gt;html = NULL;</div><div class='del'>-	priv-&gt;title = NULL;</div><div class='del'>-	priv-&gt;icon = NULL;</div><div class='del'>-	priv-&gt;id = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_view, "ExecutiveSummaryComponentView",</div><div class='del'>-	     ExecutiveSummaryComponentView, </div><div class='del'>-	     executive_summary_component_view_class_init,</div><div class='del'>-	     executive_summary_component_view_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    ExecutiveSummaryComponent *component,</div><div class='del'>-					    BonoboControl *control,</div><div class='del'>-					    const char *html,</div><div class='del'>-					    const char *title,</div><div class='del'>-					    const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	g_return_if_fail (control != NULL || html != NULL);</div><div class='del'>-	</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (component != NULL) {</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (component));</div><div class='del'>-		priv-&gt;component = component;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;component = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (control != NULL) {</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (control));</div><div class='del'>-		priv-&gt;control = control;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;control = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (html) {</div><div class='del'>-		priv-&gt;html = g_strdup (html);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;html = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (title) {</div><div class='del'>-		priv-&gt;title = g_strdup (title);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;title = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icon) {</div><div class='del'>-		priv-&gt;icon = g_strdup (icon);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;icon = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-executive_summary_component_view_new (ExecutiveSummaryComponent *component,</div><div class='del'>-				      BonoboControl *control,</div><div class='del'>-				      const char *html,</div><div class='del'>-				      const char *title,</div><div class='del'>-				      const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (control != NULL || html != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	view = gtk_type_new (executive_summary_component_view_get_type ());</div><div class='del'>-	executive_summary_component_view_construct (view, component, control,</div><div class='del'>-						    html, title, icon);</div><div class='del'>-</div><div class='del'>-	return view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    const char *title)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;title)</div><div class='del'>-		g_free (priv-&gt;title);</div><div class='del'>-	priv-&gt;title = g_strdup (title);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_set_title (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;title;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,</div><div class='del'>-					   const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;icon)</div><div class='del'>-		g_free (priv-&gt;icon);</div><div class='del'>-	priv-&gt;icon = g_strdup (icon);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	executive_summary_component_set_icon (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_flash (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_flash (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,</div><div class='del'>-					   const char *html)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;html)</div><div class='del'>-		g_free (priv-&gt;html);</div><div class='del'>-</div><div class='del'>-	priv-&gt;html = g_strdup (html);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_update (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_configure (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (view), view_signals[CONFIGURE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	return (BonoboObject *)priv-&gt;control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,</div><div class='del'>-					 int id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;id = id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), -1);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_objref (ExecutiveSummaryComponentView *view,</div><div class='del'>-					     Bonobo_Control objref)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;objref) {</div><div class='del'>-		g_warning ("View already has an objref.");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;objref = objref;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-executive_summary_component_view_get_widget (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;objref == NULL) {</div><div class='del'>-		g_warning ("View has no objref.");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return bonobo_widget_new_control_from_objref (priv-&gt;objref, NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h<br/>deleted file mode 100644<br/>index a204dbe007..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__</div><div class='del'>-#define __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentViewPrivate ExecutiveSummaryComponentViewPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentView ExecutiveSummaryComponentView;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentViewClass ExecutiveSummaryComponentViewClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentView {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentViewClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Signals */</div><div class='del'>-	void (* configure) (ExecutiveSummaryComponentView *view);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_view_get_type (void);</div><div class='del'>-void </div><div class='del'>-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    ExecutiveSummaryComponent *component,</div><div class='del'>-					    BonoboControl *control,</div><div class='del'>-					    const char *html,</div><div class='del'>-					    const char *title,</div><div class='del'>-					    const char *icon);</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-executive_summary_component_view_new (ExecutiveSummaryComponent *component,</div><div class='del'>-				      BonoboControl *control,</div><div class='del'>-				      const char *html,</div><div class='del'>-				      const char *title,</div><div class='del'>-				      const char *icon);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,</div><div class='del'>-						 const char *title);</div><div class='del'>-const char *executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,</div><div class='del'>-						const char *icon);</div><div class='del'>-const char *executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_flash (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,</div><div class='del'>-						const char *html);</div><div class='del'>-const char *executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view);</div><div class='del'>-BonoboObject *executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-int executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view);</div><div class='del'>-void executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,</div><div class='del'>-					      int id);</div><div class='del'>-void executive_summary_component_view_configure (ExecutiveSummaryComponentView *view);</div><div class='del'>-void executive_summary_component_view_set_objref (ExecutiveSummaryComponentView *view,</div><div class='del'>-						  Bonobo_Control objref);</div><div class='del'>-GtkWidget *executive_summary_component_view_get_widget (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c<br/>deleted file mode 100644<br/>index cb2fd95ee9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,353 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.c - Bonobo implementation of </div><div class='del'>- *                                 SummaryComponent.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary-component.h"</div><div class='del'>-</div><div class='del'>-static void executive_summary_component_destroy (GtkObject *object);</div><div class='del'>-static void executive_summary_component_init (ExecutiveSummaryComponent *component);</div><div class='del'>-static void executive_summary_component_class_init (ExecutiveSummaryComponentClass *esc_class);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-#define FACTORY_PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-static BonoboObjectClass *factory_parent_class;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactoryPrivate {</div><div class='del'>-	EvolutionServicesCreateViewFn create_view;</div><div class='del'>-	void *closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORBA interface */</div><div class='del'>-static POA_GNOME_Evolution_Summary_Component__vepv SummaryComponent_vepv;</div><div class='del'>-static POA_GNOME_Evolution_Summary_ComponentFactory__vepv ComponentFactory_vepv;</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Summary_Component *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_Component *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	servant = (POA_GNOME_Evolution_Summary_Component *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;SummaryComponent_vepv;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_Evolution_Summary_Component__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	component-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Init */</div><div class='del'>-static void</div><div class='del'>-corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_Component__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Summary_Component__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-	</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-	</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Summary_Component__epv, 1);</div><div class='del'>-		</div><div class='del'>-	vepv = &amp;SummaryComponent_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Summary_Component_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_class_init (ExecutiveSummaryComponentClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-	</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_init (ExecutiveSummaryComponent *component)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new (ExecutiveSummaryComponentPrivate, 1);</div><div class='del'>-	</div><div class='del'>-	component-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component, "ExecutiveSummaryComponent", </div><div class='del'>-	     ExecutiveSummaryComponent, executive_summary_component_class_init,</div><div class='del'>-	     executive_summary_component_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_construct (ExecutiveSummaryComponent *component,</div><div class='del'>-				       GNOME_Evolution_Summary_Component corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (component), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** Public API ***/</div><div class='del'>-/**</div><div class='del'>- * executive_summary_component_new:</div><div class='del'>- *</div><div class='del'>- * Creates a BonoboObject that implements the Summary::Component interface.</div><div class='del'>- *</div><div class='del'>- * Returns: A pointer to a BonoboObject.</div><div class='del'>- */</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_component_new (void)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	POA_GNOME_Evolution_Summary_Component *servant;</div><div class='del'>-	GNOME_Evolution_Summary_Component corba_object;</div><div class='del'>-	</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	component = gtk_type_new (executive_summary_component_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (component),</div><div class='del'>-						       servant);</div><div class='del'>-	</div><div class='del'>-	executive_summary_component_construct (component, corba_object);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**** ComponentFactory implementation ****/</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Summary_ComponentFactory *</div><div class='del'>-create_factory_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_ComponentFactory *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	servant = (POA_GNOME_Evolution_Summary_ComponentFactory *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;ComponentFactory_vepv;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_Evolution_Summary_ComponentFactory__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GNOME_Evolution_Summary_Component</div><div class='del'>-impl_GNOME_Evolution_Summary_ComponentFactory_createView (PortableServer_Servant servant,</div><div class='del'>-							  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	BonoboObject *view;</div><div class='del'>-	ExecutiveSummaryComponentFactory *factory;</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *priv;</div><div class='del'>-	GNOME_Evolution_Summary_Component component, component_dup;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	factory = EXECUTIVE_SUMMARY_COMPONENT_FACTORY (bonobo_object);</div><div class='del'>-	priv = factory-&gt;private;</div><div class='del'>-</div><div class='del'>-	view = (* priv-&gt;create_view) (factory, priv-&gt;closure);</div><div class='del'>-	g_return_val_if_fail (view != NULL, CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (view));</div><div class='del'>-</div><div class='del'>-	component_dup = CORBA_Object_duplicate (component, ev);</div><div class='del'>-</div><div class='del'>-	return component_dup;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_ComponentFactory__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Summary_ComponentFactory__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-	</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-	</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Summary_ComponentFactory__epv, 1);</div><div class='del'>-	epv-&gt;createView = impl_GNOME_Evolution_Summary_ComponentFactory_createView;</div><div class='del'>-</div><div class='del'>-	vepv = &amp;ComponentFactory_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Summary_ComponentFactory_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactory *factory;</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	factory = EXECUTIVE_SUMMARY_COMPONENT_FACTORY (object);</div><div class='del'>-	priv = factory-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	factory-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	(* GTK_OBJECT_CLASS (factory_parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_class_init (ExecutiveSummaryComponentFactoryClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_factory_destroy;</div><div class='del'>-</div><div class='del'>-	factory_parent_class = gtk_type_class (FACTORY_PARENT_TYPE);</div><div class='del'>-	corba_factory_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_init (ExecutiveSummaryComponentFactory *factory)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryComponentFactoryPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_view = NULL;</div><div class='del'>-	priv-&gt;closure = NULL;</div><div class='del'>-	factory-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_factory, </div><div class='del'>-	     "ExecutiveSummaryComponentFactory",</div><div class='del'>-	     ExecutiveSummaryComponentFactory,</div><div class='del'>-	     executive_summary_component_factory_class_init,</div><div class='del'>-	     executive_summary_component_factory_init, FACTORY_PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_factory_construct (ExecutiveSummaryComponentFactory *factory,</div><div class='del'>-					       GNOME_Evolution_Summary_ComponentFactory corba_object,</div><div class='del'>-					       EvolutionServicesCreateViewFn create_view,</div><div class='del'>-					       void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (factory != NULL);</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_object);</div><div class='del'>-	priv = factory-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;create_view = create_view;</div><div class='del'>-	priv-&gt;closure = closure;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*** Public API ***/</div><div class='del'>-/**</div><div class='del'>- * executive_summary_component_factory_new:</div><div class='del'>- * @create_view: A pointer to the function to create a new view.</div><div class='del'>- * @closure: The data to be passed to the @create_view function when it is </div><div class='del'>- * called.</div><div class='del'>- *</div><div class='del'>- * Creates a BonoboObject that implements the Summary::ComponentFactory</div><div class='del'>- * interface.</div><div class='del'>- *</div><div class='del'>- * Returns: A pointer to a BonoboObject.</div><div class='del'>- */</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_component_factory_new (EvolutionServicesCreateViewFn create_view,</div><div class='del'>-					 void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentFactory *factory;</div><div class='del'>-	POA_GNOME_Evolution_Summary_ComponentFactory *servant;</div><div class='del'>-	GNOME_Evolution_Summary_ComponentFactory corba_object;</div><div class='del'>-</div><div class='del'>-	servant = create_factory_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	factory = gtk_type_new (executive_summary_component_factory_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (factory),</div><div class='del'>-						       servant);</div><div class='del'>-	executive_summary_component_factory_construct (factory, corba_object,</div><div class='del'>-						       create_view, closure);</div><div class='del'>-	return BONOBO_OBJECT (factory);</div><div class='del'>-}</div><div class='del'>-	</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h<br/>deleted file mode 100644<br/>index 23b653d488..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_COMPONENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentPrivate ExecutiveSummaryComponentPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponent ExecutiveSummaryComponent;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClass ExecutiveSummaryComponentClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponent {</div><div class='del'>-  BonoboObject parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClass {</div><div class='del'>-  BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_get_type (void);</div><div class='del'>-</div><div class='del'>-BonoboObject *executive_summary_component_new (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Factory */</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE (executive_summary_component_factory_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactory))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE, ExecutiveSummaryComponentFactoryClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_FACTORY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactoryPrivate ExecutiveSummaryComponentFactoryPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactory ExecutiveSummaryComponentFactory;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentFactoryClass ExecutiveSummaryComponentFactoryClass;</div><div class='del'>-</div><div class='del'>-typedef BonoboObject *(* EvolutionServicesCreateViewFn) (ExecutiveSummaryComponentFactory *factory,</div><div class='del'>-							 void *closure);</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactory {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	ExecutiveSummaryComponentFactoryPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentFactoryClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_factory_get_type (void);</div><div class='del'>-</div><div class='del'>-BonoboObject *executive_summary_component_factory_new (EvolutionServicesCreateViewFn create_view,</div><div class='del'>-						       void *closure);</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-html-view.c b/executive-summary/evolution-services/executive-summary-html-view.c<br/>deleted file mode 100644<br/>index 054da34fae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-html-view.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-html-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,340 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-html-view.c - Bonobo implementation of </div><div class='del'>- *                                 HtmlView.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary-html-view.h"</div><div class='del'>-</div><div class='del'>-static void executive_summary_html_view_destroy (GtkObject *object);</div><div class='del'>-static void executive_summary_html_view_init (ExecutiveSummaryHtmlView *component);</div><div class='del'>-static void executive_summary_html_view_class_init (ExecutiveSummaryHtmlViewClass *klass);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	HANDLE_URI,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryHtmlViewPrivate {</div><div class='del'>-	BonoboEventSource *event_source;</div><div class='del'>-</div><div class='del'>-	char *html;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORBA interface */</div><div class='del'>-static POA_GNOME_Evolution_Summary_HTMLView__vepv HTMLView_vepv;</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Summary_HTMLView *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_HTMLView *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Summary_HTMLView *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;HTMLView_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_GNOME_Evolution_Summary_HTMLView__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_char *</div><div class='del'>-impl_GNOME_Evolution_Summary_HTMLView_getHtml (PortableServer_Servant servant,</div><div class='del'>-					       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryHtmlView *view;</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	view = EXECUTIVE_SUMMARY_HTML_VIEW (bonobo_object);</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	return CORBA_string_dup (priv-&gt;html? priv-&gt;html: "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Summary_HTMLView_handleURI (PortableServer_Servant servant,</div><div class='del'>-						 const CORBA_char *uri,</div><div class='del'>-						 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[HANDLE_URI], uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-static void</div><div class='del'>-executive_summary_html_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlView *view;</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_print ("BANG!");</div><div class='del'>-	view = EXECUTIVE_SUMMARY_HTML_VIEW (object);</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;html);</div><div class='del'>-	g_free (priv);</div><div class='del'>-</div><div class='del'>-	view-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_HTMLView__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Summary_HTMLView__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Summary_HTMLView__epv, 1);</div><div class='del'>-	epv-&gt;getHtml = impl_GNOME_Evolution_Summary_HTMLView_getHtml;</div><div class='del'>-	epv-&gt;handleURI = impl_GNOME_Evolution_Summary_HTMLView_handleURI;</div><div class='del'>-</div><div class='del'>-	vepv = &amp;HTMLView_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Summary_HTMLView_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_html_view_class_init (ExecutiveSummaryHtmlViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_html_view_destroy;</div><div class='del'>-</div><div class='del'>-	signals[HANDLE_URI] = gtk_signal_new ("handle_uri", GTK_RUN_FIRST,</div><div class='del'>-					      object_class-&gt;type,</div><div class='del'>-					      GTK_SIGNAL_OFFSET (ExecutiveSummaryHtmlViewClass, handle_uri),</div><div class='del'>-					      gtk_marshal_NONE__POINTER,</div><div class='del'>-					      GTK_TYPE_NONE, 1,</div><div class='del'>-					      GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_html_view_init (ExecutiveSummaryHtmlView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryHtmlViewPrivate, 1);</div><div class='del'>-	priv-&gt;html = NULL;</div><div class='del'>-	priv-&gt;event_source = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_html_view, "ExecutiveSummaryHtmlView",</div><div class='del'>-	     ExecutiveSummaryHtmlView, executive_summary_html_view_class_init,</div><div class='del'>-	     executive_summary_html_view_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_html_view_construct (ExecutiveSummaryHtmlView *view,</div><div class='del'>-				       BonoboEventSource *event_source,</div><div class='del'>-				       GNOME_Evolution_Summary_HTMLView corba_object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;event_source = event_source;</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (view), </div><div class='del'>-				     BONOBO_OBJECT (priv-&gt;event_source));</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (view), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*** Public API ***/</div><div class='del'>-/**</div><div class='del'>- * executive_summary_html_view_new_full:</div><div class='del'>- * @event_source: A BonoboEventSource that will be aggregated onto the </div><div class='del'>- * interface.</div><div class='del'>- *</div><div class='del'>- * Creates a new BonoboObject that implements </div><div class='del'>- * the HTMLView.idl interface.</div><div class='del'>- *</div><div class='del'>- * Returns: A BonoboObject.</div><div class='del'>- */</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_html_view_new_full (BonoboEventSource *event_source)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlView *view;</div><div class='del'>-	POA_GNOME_Evolution_Summary_HTMLView *servant;</div><div class='del'>-	GNOME_Evolution_Summary_HTMLView corba_object;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (event_source != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (BONOBO_IS_EVENT_SOURCE (event_source), NULL);</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	view = gtk_type_new (executive_summary_html_view_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (view),</div><div class='del'>-						       servant);</div><div class='del'>-</div><div class='del'>-	executive_summary_html_view_construct (view, event_source, corba_object);</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * executive_summary_html_view_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new BonoboObject that implements </div><div class='del'>- * the HTMLView.idl interface.</div><div class='del'>- * Creates a default Bonobo::EventSource interface that will be aggregated onto</div><div class='del'>- * the interface.</div><div class='del'>- *</div><div class='del'>- * Returns: A BonoboObject.</div><div class='del'>- */</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_html_view_new (void)</div><div class='del'>-{</div><div class='del'>-	BonoboEventSource *event_source;</div><div class='del'>-</div><div class='del'>-	event_source = bonobo_event_source_new ();</div><div class='del'>-	return executive_summary_html_view_new_full (event_source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * executive_summary_html_view_set_html:</div><div class='del'>- * @view: The ExecutiveSummaryHtmlView to operate on,</div><div class='del'>- * @html: The HTML as a string.</div><div class='del'>- *</div><div class='del'>- * Sets the HTML string in @view to @html. @html is copied into @view,</div><div class='del'>- * so after this call you are free to do what you want with @html.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-executive_summary_html_view_set_html (ExecutiveSummaryHtmlView *view,</div><div class='del'>-				      const char *html)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-	CORBA_any any;</div><div class='del'>-	CORBA_short s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;html)</div><div class='del'>-		g_free (priv-&gt;html);</div><div class='del'>-</div><div class='del'>-	if (html != NULL)</div><div class='del'>-		priv-&gt;html = g_strdup (html);</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;html = NULL;</div><div class='del'>-</div><div class='del'>-	/* Notify any listeners */</div><div class='del'>-	s = 0;</div><div class='del'>-</div><div class='del'>-	any._type = (CORBA_TypeCode) TC_short;</div><div class='del'>-	any._value = &amp;s;</div><div class='del'>-</div><div class='del'>-	bonobo_event_source_notify_listeners (BONOBO_EVENT_SOURCE (priv-&gt;event_source),</div><div class='del'>-					      EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED, </div><div class='del'>-					      &amp;any, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * executive_summary_html_view_get_html:</div><div class='del'>- * @view: The ExecutiveSummaryHtmlView to operate on.</div><div class='del'>- *</div><div class='del'>- * Retrieves the HTML stored in @view. This return value is not duplicated</div><div class='del'>- * before returning, so you should not free it. Instead, if you want to free</div><div class='del'>- * the HTML stored in @view, you should use </div><div class='del'>- * executive_summary_html_view_set_html (view, NULL);.</div><div class='del'>- *</div><div class='del'>- * Returns: A pointer to the HTML stored in @view.</div><div class='del'>- */</div><div class='del'>-const char *</div><div class='del'>-executive_summary_html_view_get_html (ExecutiveSummaryHtmlView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	return priv-&gt;html;</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-/**</div><div class='del'>- * executive_summary_html_view_get_event_source:</div><div class='del'>- * @view: The ExecutiveSummaryHtmlView to operate on.</div><div class='del'>- *</div><div class='del'>- * Retrieves the BonoboEventSource that is used in this view.</div><div class='del'>- *</div><div class='del'>- * Returns: A BonoboEventSource pointer.</div><div class='del'>- */</div><div class='del'>-BonoboEventSource *</div><div class='del'>-executive_summary_html_view_get_event_source (ExecutiveSummaryHtmlView *view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_HTML_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	return view-&gt;private-&gt;event_source;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-html-view.h b/executive-summary/evolution-services/executive-summary-html-view.h<br/>deleted file mode 100644<br/>index d5cf6741fc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-html-view.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary-html-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-html-view.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_HTML_VIEW_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_HTML_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-event-source.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_HTML_CHANGED "GNOME:Evolution:Summary:HTMLView:html_changed"</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_TYPE (executive_summary_html_view_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlView))</div><div class='del'>-#define EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE, ExecutiveSummaryHtmlViewClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_HTML_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_HTML_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryHtmlViewPrivate ExecutiveSummaryHtmlViewPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryHtmlView ExecutiveSummaryHtmlView;</div><div class='del'>-typedef struct _ExecutiveSummaryHtmlViewClass ExecutiveSummaryHtmlViewClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryHtmlView {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryHtmlViewPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryHtmlViewClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* handle_uri) (ExecutiveSummaryHtmlView *view,</div><div class='del'>-			     char *uri);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_html_view_get_type (void);</div><div class='del'>-BonoboObject *executive_summary_html_view_new_full (BonoboEventSource *event_source);</div><div class='del'>-BonoboObject *executive_summary_html_view_new (void);</div><div class='del'>-</div><div class='del'>-void executive_summary_html_view_set_html (ExecutiveSummaryHtmlView *view,</div><div class='del'>-					   const char *html);</div><div class='del'>-const char *executive_summary_html_view_get_html (ExecutiveSummaryHtmlView *view);</div><div class='del'>-BonoboEventSource *executive_summary_html_view_get_event_source (ExecutiveSummaryHtmlView *view);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c<br/>deleted file mode 100644<br/>index 8be483b750..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,266 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary.c - Bonobo implementation of Summary.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary.h"</div><div class='del'>-</div><div class='del'>-static void executive_summary_destroy (GtkObject *object);</div><div class='del'>-static void executive_summary_class_init (ExecutiveSummaryClass *es_class);</div><div class='del'>-static void executive_summary_init (ExecutiveSummary *es);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	UPDATE,</div><div class='del'>-	SET_TITLE,</div><div class='del'>-	SET_ICON,</div><div class='del'>-	FLASH,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint32 summary_signals [LAST_SIGNAL] = { 0 };</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation */</div><div class='del'>-static POA_GNOME_Evolution_Summary_ViewFrame__vepv Summary_vepv;</div><div class='del'>-</div><div class='del'>-static POA_GNOME_Evolution_Summary_ViewFrame *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_ViewFrame *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_GNOME_Evolution_Summary_ViewFrame *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;Summary_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_GNOME_Evolution_Summary_ViewFrame__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Summary_ViewFrame_setTitle (PortableServer_Servant servant,</div><div class='del'>-				  CORBA_long id,</div><div class='del'>-				  const CORBA_char *title,</div><div class='del'>-				  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_TITLE], </div><div class='del'>-			 id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Summary_ViewFrame_setIcon (PortableServer_Servant servant,</div><div class='del'>-				 CORBA_long id,</div><div class='del'>-				 const CORBA_char *title,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_ICON],</div><div class='del'>-			 id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Summary_ViewFrame_flash (PortableServer_Servant servant,</div><div class='del'>-					      CORBA_long id,</div><div class='del'>-					      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[FLASH], id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_GNOME_Evolution_Summary_ViewFrame_updateComponent (PortableServer_Servant servant,</div><div class='del'>-							const CORBA_long id,</div><div class='del'>-							const CORBA_char *html,</div><div class='del'>-							CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[UPDATE],</div><div class='del'>-			 id, html);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-static void</div><div class='del'>-executive_summary_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummary *es;</div><div class='del'>-	ExecutiveSummaryPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	es = EXECUTIVE_SUMMARY (object);</div><div class='del'>-	priv = es-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	es-&gt;private = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialisation */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_ViewFrame__vepv *vepv;</div><div class='del'>-	POA_GNOME_Evolution_Summary_ViewFrame__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-	</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_GNOME_Evolution_Summary_ViewFrame__epv, 1);</div><div class='del'>-</div><div class='del'>-	vepv = &amp;Summary_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;GNOME_Evolution_Summary_ViewFrame_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_class_init (ExecutiveSummaryClass *es_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) es_class;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = executive_summary_destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	summary_signals[UPDATE] = gtk_signal_new ("update",</div><div class='del'>-						  GTK_RUN_LAST,</div><div class='del'>-						  object_class-&gt;type,</div><div class='del'>-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, update),</div><div class='del'>-						  gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						  GTK_TYPE_NONE, 2,</div><div class='del'>-						  GTK_TYPE_POINTER,</div><div class='del'>-						  GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[SET_TITLE] = gtk_signal_new ("set_title",</div><div class='del'>-						     GTK_RUN_LAST,</div><div class='del'>-						     object_class-&gt;type,</div><div class='del'>-						     GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_title),</div><div class='del'>-						     gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						     GTK_TYPE_NONE, 2,</div><div class='del'>-						     GTK_TYPE_POINTER,</div><div class='del'>-						     GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[SET_ICON] = gtk_signal_new ("set_icon",</div><div class='del'>-						    GTK_RUN_LAST,</div><div class='del'>-						    object_class-&gt;type,</div><div class='del'>-						    GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_icon),</div><div class='del'>-						    gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						    GTK_TYPE_NONE, 2,</div><div class='del'>-						    GTK_TYPE_POINTER,</div><div class='del'>-						    GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[FLASH] = gtk_signal_new ("flash",</div><div class='del'>-						 GTK_RUN_LAST,</div><div class='del'>-						 object_class-&gt;type,</div><div class='del'>-						 GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, flash),</div><div class='del'>-						 gtk_marshal_NONE__POINTER,</div><div class='del'>-						 GTK_TYPE_NONE, 1,</div><div class='del'>-						 GTK_TYPE_POINTER);</div><div class='del'>-	gtk_object_class_add_signals (object_class, summary_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_init (ExecutiveSummary *es)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryPrivate, 1);</div><div class='del'>-	es-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,</div><div class='del'>-	     executive_summary_class_init, executive_summary_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_construct (ExecutiveSummary *es,</div><div class='del'>-			     GNOME_Evolution_Summary_ViewFrame corba_object)</div><div class='del'>-{</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_new (void)</div><div class='del'>-{</div><div class='del'>-	POA_GNOME_Evolution_Summary_ViewFrame *servant;</div><div class='del'>-	GNOME_Evolution_Summary_ViewFrame corba_object;</div><div class='del'>-	ExecutiveSummary *es;</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	es = gtk_type_new (executive_summary_get_type ());</div><div class='del'>-	</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (es), </div><div class='del'>-						       servant);</div><div class='del'>-	executive_summary_construct (es, corba_object);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (es);</div><div class='del'>-}  </div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h<br/>deleted file mode 100644<br/>index 704da9a721..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/evolution-services/executive-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryPrivate ExecutiveSummaryPrivate;</div><div class='del'>-typedef struct _ExecutiveSummary ExecutiveSummary;</div><div class='del'>-typedef struct _ExecutiveSummaryClass ExecutiveSummaryClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummary {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* update) (ExecutiveSummary *summary,</div><div class='del'>-			 const GNOME_Evolution_Summary_Component component,</div><div class='del'>-			 const char *html);</div><div class='del'>-	void (* set_title) (ExecutiveSummary *summary,</div><div class='del'>-			    const GNOME_Evolution_Summary_Component component,</div><div class='del'>-			    const char *title);</div><div class='del'>-	void (* set_icon) (ExecutiveSummary *summary,</div><div class='del'>-			   const GNOME_Evolution_Summary_Component component,</div><div class='del'>-			   const char *icon);</div><div class='del'>-	void (* flash) (ExecutiveSummary *summary,</div><div class='del'>-			const GNOME_Evolution_Summary_Component component);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_get_type (void);</div><div class='del'>-void executive_summary_construct (ExecutiveSummary *es,</div><div class='del'>-				  GNOME_Evolution_Summary_ViewFrame corba_object);</div><div class='del'>-BonoboObject *executive_summary_new (void);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/idl/.cvsignore b/executive-summary/idl/.cvsignore<br/>deleted file mode 100644<br/>index b840c21800..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl<br/>deleted file mode 100644<br/>index a564e90fe6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Executive-Summary.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/Executive-Summary.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-#include &lt;SummaryComponent.idl&gt;</div><div class='del'>-#include &lt;Summary.idl&gt;</div><div class='del'>-#include &lt;HtmlView.idl&gt;</div><div class='head'>diff --git a/executive-summary/idl/HtmlView.idl b/executive-summary/idl/HtmlView.idl<br/>deleted file mode 100644<br/>index 627873563f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/HtmlView.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/HtmlView.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,25 +0,0 @@</div><div class='del'>-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for an HTML view.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Iain Holmes  &lt;iain@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-module Summary {</div><div class='del'>-</div><div class='del'>-	interface HTMLView : Bonobo::Unknown {</div><div class='del'>-		string getHtml ();</div><div class='del'>-</div><div class='del'>-		void handleURI (in string uri);</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am<br/>deleted file mode 100644<br/>index 29a35f43cf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-EXTRA_DIST = $(IDLS)</div><div class='del'>-</div><div class='del'>-IDLS =					\</div><div class='del'>-	Executive-Summary.idl		\</div><div class='del'>-	HtmlView.idl                    \</div><div class='del'>-	Summary.idl			\</div><div class='del'>-	SummaryComponent.idl
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl<br/>deleted file mode 100644<br/>index c460b856ab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Summary.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/Summary.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the Evolution shell.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Iain Holmes  &lt;iain@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-module Summary {</div><div class='del'>-	interface ViewFrame: Bonobo::Unknown {</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl<br/>deleted file mode 100644<br/>index f6aab37469..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/SummaryComponent.idl?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/idl/SummaryComponent.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the Evolution Executive Summary Components.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Iain Holmes  &lt;iain@ximian.com&gt; </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* TODO: Needs Exceptions */</div><div class='del'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-#include &lt;oaf-factory.idl&gt;</div><div class='del'>-</div><div class='del'>-module GNOME {</div><div class='del'>-module Evolution {</div><div class='del'>-module Summary {</div><div class='del'>-	interface ViewFrame;</div><div class='del'>-</div><div class='del'>-	interface Component: Bonobo::Unknown {</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	interface ComponentFactory: Bonobo::Unknown {</div><div class='del'>-		/**</div><div class='del'>-		 * createView:</div><div class='del'>-		 *</div><div class='del'>- 		 * Creates a new Component object.</div><div class='del'>-		 *</div><div class='del'>-		 * Returns: A Component object.</div><div class='del'>-		 **/</div><div class='del'>-		Component createView ();</div><div class='del'>-	};</div><div class='del'>-};</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/executive-summary/summary.html b/executive-summary/summary.html<br/>deleted file mode 100644<br/>index 16602da2a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/summary.html?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/summary.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-&lt;html&gt;</div><div class='del'>-&lt;head&gt;</div><div class='del'>-&lt;Title&gt;Evolution Executive Summary&lt;/title&gt;</div><div class='del'>-&lt;/head&gt;</div><div class='del'>-</div><div class='del'>-&lt;body bgcolor="#ffffff" background="executive-summary-bg.png"&gt;</div><div class='del'>-&lt;table cellpadding="0" cellspacing="0" numcols="3" width="100%" height="100%" border="0"&gt;</div><div class='del'>-&lt;tr&gt;</div><div class='del'>-&lt;td bgcolor="#9aadbf" height="102"&gt;</div><div class='del'>-&lt;img src="butterfly.png"&gt;&lt;/td&gt;</div><div class='del'>-&lt;td width="100%" colspan="2" align="middle" bgcolor="#9aadbf"&gt;</div><div class='del'>-E V O L U T I O N</div><div class='del'>-&lt;/td&gt;&lt;/tr&gt;</div><div class='del'>-&lt;!-- Hmmmm.</div><div class='del'>-&lt;tr&gt;&lt;td bgcolor="#9aadbf"&gt;&amp;nbsp;&lt;/td&gt;</div><div class='del'>-&lt;td valign="top" width="100"&gt;&lt;img src="executive-summary-curve.png"&gt;&lt;/td&gt;</div><div class='del'>-&lt;td width="95%"&gt;</div><div class='del'>-</div><div class='del'>-&lt;table border="0" align="middle"&gt;</div><div class='del'>-&lt;tr&gt;</div><div class='del'>-&lt;td align="left"&gt;</div><div class='del'>- &lt;form method="get" action="/search" name="f"&gt;</div><div class='del'>- &lt;b&gt;Search On Google&lt;/b&gt;</div><div class='del'>- &lt;input type="text" size="15" name=q&gt;</div><div class='del'>- &lt;input type="submit" name"submit"&gt;</div><div class='del'>- &lt;/form&gt;</div><div class='del'>-&lt;/td&gt;</div><div class='del'>-&lt;/tr&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;tr&gt;</div><div class='del'>-&lt;td colspan="2"&gt;</div><div class='del'>-&lt;!-- EVOLUTION EXECUTIVE SUMMARY SERVICES DO NOT REMOVE --&gt;</div><div class='del'>-&lt;/td&gt;</div><div class='del'>-&lt;/tr&gt;</div><div class='del'>-</div><div class='del'>-&lt;/table&gt;</div><div class='del'>-</div><div class='del'>-&lt;/td&gt;</div><div class='del'>-&lt;/tr&gt;</div><div class='del'>-</div><div class='del'>-&lt;/table&gt;</div><div class='del'>-&lt;/body&gt;</div><div class='del'>-&lt;/html&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/test-service/.cvsignore b/executive-summary/test-service/.cvsignore<br/>deleted file mode 100644<br/>index e9a7d4280b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-core</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-test-service</div><div class='del'>-rdf-summary</div><div class='del'>-GNOME_Evolution_Summary_test.oaf</div><div class='del'>-GNOME_Evolution_Summary_rdf.oaf</div><div class='head'>diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in<br/>deleted file mode 100644<br/>index decd499293..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="rdf-summary"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME:GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			_value="Factory for the RDF summary."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponent"</div><div class='del'>-		type="factory"</div><div class='del'>-		location="OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			_value="RDF Summary"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in<br/>deleted file mode 100644<br/>index b0c9e8f0d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="test-service"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			_value="Factory for the test component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:GNOME_Evolution_Summary_test_Component"</div><div class='del'>-		type="factory"</div><div class='del'>-		location="OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/Evolution:Summary:ComponentFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			_value="Test service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- This does not work</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"</div><div class='del'>-                type="exe"</div><div class='del'>-                location="test-bonobo-service"&gt;</div><div class='del'>-</div><div class='del'>-        &lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-                &lt;item value="IDL:GNOME:GenericFactory:1.0"/&gt;</div><div class='del'>-        &lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-        &lt;oaf_attribute name="description" type="string"</div><div class='del'>-                        _value="Factory for the test bonobo component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component:test-bonobo-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"</div><div class='del'>-                type="factory"</div><div class='del'>-                location="OAFIID:evolution-summary-component-factory:test-bonobo-service:b6da2ad2-1fbb-4539-93f9-038b1702810e"&gt;</div><div class='del'>-</div><div class='del'>-        &lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-                &lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-        &lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-        &lt;oaf_attribute name="description" type="string"</div><div class='del'>-                        _value="Test bonobo service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>---&gt;</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am<br/>deleted file mode 100644<br/>index 458b015c1e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-bin_PROGRAMS = test-service rdf-summary</div><div class='del'>-</div><div class='del'>-CFLAGS += -g </div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)			\</div><div class='del'>-	-I$(top_srcdir)/executive-summary	\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)		\</div><div class='del'>-	$(BONOBO_HTML_GNOME_CFLAGS)	\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"</div><div class='del'>-</div><div class='del'>-test_service_SOURCES = 			\</div><div class='del'>-	main.c</div><div class='del'>-</div><div class='del'>-test_service_LDADD = 			\</div><div class='del'>-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)							\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-#test_bonobo_service_SOURCES =		\</div><div class='del'>-#	test-bonobo.c</div><div class='del'>-</div><div class='del'>-#test_bonobo_service_LDADD =		\</div><div class='del'>-#        $(top_builddir)/executive-summary/evolution-services/libevolution-services.la   \</div><div class='del'>-#        $(BONOBO_VFS_GNOME_LIBS)        \</div><div class='del'>-#        $(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-rdf_summary_SOURCES =			\</div><div class='del'>-	rdf-summary.c</div><div class='del'>-</div><div class='del'>-rdf_summary_LDADD =									\</div><div class='del'>-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)							\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_in_files = \</div><div class='del'>-	GNOME_Evolution_Summary_test.oaf.in \</div><div class='del'>-	GNOME_Evolution_Summary_rdf.oaf.in</div><div class='del'>-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)</div><div class='del'>-</div><div class='del'>-@XML_I18N_MERGE_OAF_RULE@</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) </div><div class='head'>diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c<br/>deleted file mode 100644<br/>index b80f3e6a89..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/main.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,296 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* main.c</div><div class='del'>- * Test Service that counts the number of seconds since it was started.</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-stream.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-html-view.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	PROPERTY_TITLE,</div><div class='del'>-	PROPERTY_ICON</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _UserData {</div><div class='del'>-	char *title;</div><div class='del'>-	char *icon;</div><div class='del'>-};</div><div class='del'>-typedef struct _UserData UserData;</div><div class='del'>-</div><div class='del'>-static int running_views = 0;</div><div class='del'>-</div><div class='del'>-#define TEST_SERVICE_ID "OAFIID:GNOME_Evolution_Summary_test_ComponentFactory"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-/* PersistStream callbacks */</div><div class='del'>-static void</div><div class='del'>-load_from_stream (BonoboPersistStream *ps,</div><div class='del'>-		  Bonobo_Stream stream,</div><div class='del'>-		  Bonobo_Persist_ContentType type,</div><div class='del'>-		  gpointer data,</div><div class='del'>-		  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	if (*type &amp;&amp; g_strcasecmp (type, "application/x-test-service") != 0) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_read_string (stream, &amp;str, ev);</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION || str == NULL) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_print ("Restoring with :%s\n", str);</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_to_stream (BonoboPersistStream *ps,</div><div class='del'>-		const Bonobo_Stream stream,</div><div class='del'>-		Bonobo_Persist_ContentType type,</div><div class='del'>-		gpointer data,</div><div class='del'>-		CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	if (*type &amp;&amp; g_strcasecmp (type, "application/x-test-service") != 0) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_printf (stream, TRUE, ev, "Yo yo yo");</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION)</div><div class='del'>-		return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-content_types (BonoboPersistStream *ps,</div><div class='del'>-	       void *closure,</div><div class='del'>-	       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (1, "application/x-test-service");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* PropertyControl callback */</div><div class='del'>-</div><div class='del'>-/* Propertybag set/get functions */</div><div class='del'>-static void</div><div class='del'>-set_property (BonoboPropertyBag *bag,</div><div class='del'>-	      const BonoboArg *arg,</div><div class='del'>-	      guint arg_id,</div><div class='del'>-	      CORBA_Environment *ev,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case PROPERTY_TITLE:</div><div class='del'>-		g_print ("Setting title.\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_ICON:</div><div class='del'>-		g_print ("Setting icon.\n");</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_property (BonoboPropertyBag *bag,</div><div class='del'>-	      BonoboArg *arg,</div><div class='del'>-	      guint arg_id,</div><div class='del'>-	      CORBA_Environment *ev,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	UserData *ud = (UserData *) user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case PROPERTY_TITLE:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, ud-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_ICON:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, ud-&gt;icon);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-component_destroyed (GtkObject *object,</div><div class='del'>-		     gpointer data)</div><div class='del'>-{</div><div class='del'>-	UserData *ud = (UserData *) data;</div><div class='del'>-	/* Free the UserData structure */</div><div class='del'>-	g_free (ud-&gt;title);</div><div class='del'>-	g_free (ud-&gt;icon);</div><div class='del'>-	g_free (ud);</div><div class='del'>-</div><div class='del'>-	running_views--;</div><div class='del'>-</div><div class='del'>-	g_print ("Destroy!\n");</div><div class='del'>-	if (running_views &lt;= 0) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (factory));</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-create_view (ExecutiveSummaryComponentFactory *_factory,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *component, *view;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	BonoboPropertyBag *bag;</div><div class='del'>-	BonoboEventSource *event_source;</div><div class='del'>-	UserData *ud;</div><div class='del'>-</div><div class='del'>-	/* Create the component object */</div><div class='del'>-	component = executive_summary_component_new ();</div><div class='del'>-</div><div class='del'>-	/* Create the UserData structure and fill it */</div><div class='del'>-	ud = g_new (UserData, 1);</div><div class='del'>-	ud-&gt;title = g_strdup ("Hello World!");</div><div class='del'>-	ud-&gt;icon = g_strdup ("apple-red.png");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (component), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (component_destroyed), ud);</div><div class='del'>-</div><div class='del'>-	/* Now create the aggregate objects. For a "service"</div><div class='del'>-	   either a Summary::HTMLView or Bonobo::Control are required.</div><div class='del'>-	   Other supported agreggate objects are </div><div class='del'>-	   PersistStream: For saving and restoring the component.</div><div class='del'>-	   PropertyBag: To set the icon and title and other properties</div><div class='del'>-	   PropertyControl: To produce a control to configure the service.</div><div class='del'>-	</div><div class='del'>-	   To aggregate the objects</div><div class='del'>-	   i) Create the objects using their creation functions</div><div class='del'>-	   ii) Use bonobo_object_add_interface ().</div><div class='del'>-	*/</div><div class='del'>-	</div><div class='del'>-	/* Create an event source to share with all the interfaces, </div><div class='del'>-	   as we can only aggregate one onto the ExecutiveSummaryComponent */</div><div class='del'>-	event_source = bonobo_event_source_new ();</div><div class='del'>-</div><div class='del'>-	/* The Summary::HTMLView interface */</div><div class='del'>-	view = executive_summary_html_view_new_full (event_source);</div><div class='del'>-	/* Set the default HTML */</div><div class='del'>-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (view),</div><div class='del'>-					      "&lt;B&gt;Hello World&lt;/b&gt;");</div><div class='del'>-	</div><div class='del'>-	bonobo_object_add_interface (component, view);</div><div class='del'>-</div><div class='del'>-	/* Add the Bonobo::PropertyBag interface */</div><div class='del'>-	bag = bonobo_property_bag_new_full (get_property, set_property, </div><div class='del'>-					    event_source, ud);</div><div class='del'>-	/* Add the properties. There should be 2:</div><div class='del'>-	   window_title: For the window title.</div><div class='del'>-	   window_icon: For the window icon.</div><div class='del'>-	*/</div><div class='del'>-	bonobo_property_bag_add (bag,</div><div class='del'>-				 "window_title", PROPERTY_TITLE,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 "The title of this components window", 0);</div><div class='del'>-	bonobo_property_bag_add (bag,</div><div class='del'>-				 "window_icon", PROPERTY_ICON,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 "The icon for this component's window", 0);</div><div class='del'>-</div><div class='del'>-	/* Now add the interface */</div><div class='del'>-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));</div><div class='del'>-</div><div class='del'>-	/* Add the Bonobo::PersistStream interface */</div><div class='del'>-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,</div><div class='del'>-					    NULL, content_types, NULL);</div><div class='del'>-	bonobo_object_add_interface (component, BONOBO_OBJECT(stream));</div><div class='del'>-</div><div class='del'>-	running_views++;</div><div class='del'>-	/* Return the ExecutiveSummaryComponent object */</div><div class='del'>-	return component;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *generic_factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *_factory;</div><div class='del'>-	</div><div class='del'>-	/* Create an executive summary component factory */</div><div class='del'>-	_factory = executive_summary_component_factory_new (create_view, NULL);</div><div class='del'>-	return _factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_service_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* Register the factory creation function and the IID */</div><div class='del'>-	factory = bonobo_generic_factory_new (TEST_SERVICE_ID, factory_fn, NULL);</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_warning ("Cannot initialize test service");</div><div class='del'>-		exit (0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-	</div><div class='del'>-	/* Init GNOME, oaf and bonobo */</div><div class='del'>-	gnome_init_with_popt_table ("Test service", VERSION,</div><div class='del'>-				    argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Register the factory */</div><div class='del'>-	test_service_factory_init ();</div><div class='del'>-	</div><div class='del'>-	/* Enter main */</div><div class='del'>-	bonobo_main ();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/test-service/rdf-summary.c b/executive-summary/test-service/rdf-summary.c<br/>deleted file mode 100644<br/>index 301ededea2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/rdf-summary.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/test-service/rdf-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,984 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* RDF viewer Evolution Executive Summary Component.</div><div class='del'>- * Bonoboised by Iain Holmes  &lt;iain@ximian.com&gt;</div><div class='del'>- * Copyright (C) 2000 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Based on code from Portaloo</div><div class='del'>- * Channel retrieval tool</div><div class='del'>- *</div><div class='del'>- * (C) 1998 Alan Cox.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>- </div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-persist-stream.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-property-control.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-html-view.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-</div><div class='del'>-int xmlSubstituteEntitiesDefaultValue = 1;	/* DV thinks of everything */</div><div class='del'>-</div><div class='del'>-static int wipe_trackers = FALSE;</div><div class='del'>-static int running_views = 0;</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-#define RDF_SUMMARY_ID "OAFIID:GNOME_Evolution_Summary_rdf_SummaryComponentFactory"</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	PROPERTY_TITLE,</div><div class='del'>-	PROPERTY_ICON</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _RdfSummary {</div><div class='del'>-	BonoboObject *component;</div><div class='del'>-	BonoboObject *view;</div><div class='del'>-	BonoboPropertyBag *bag;</div><div class='del'>-	BonoboPropertyControl *property_control;</div><div class='del'>-</div><div class='del'>-	GtkWidget *rdf;</div><div class='del'>-	GtkWidget *g_limit;</div><div class='del'>-	GtkWidget *g_title;</div><div class='del'>-	GtkWidget *g_update;</div><div class='del'>-	GtkWidget *g_update_container;</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-</div><div class='del'>-	char *title;</div><div class='del'>-	char *icon;</div><div class='del'>-	char *location;</div><div class='del'>-	int limit;</div><div class='del'>-	gboolean showtitle;</div><div class='del'>-</div><div class='del'>-	gboolean usetimer;</div><div class='del'>-	int time;</div><div class='del'>-	int timer;</div><div class='del'>-</div><div class='del'>-	GString *str;</div><div class='del'>-	char *buffer;</div><div class='del'>-</div><div class='del'>-	GnomeVFSAsyncHandle *handle;</div><div class='del'>-</div><div class='del'>-	xmlDocPtr cache;</div><div class='del'>-};</div><div class='del'>-typedef struct _RdfSummary RdfSummary;</div><div class='del'>-</div><div class='del'>-/************ RDF Parser *******************/</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-layer_find (xmlNodePtr node, </div><div class='del'>-	    char *match, </div><div class='del'>-	    char *fail)</div><div class='del'>-{</div><div class='del'>-	while (node!=NULL) {</div><div class='del'>-#ifdef RDF_DEBUG</div><div class='del'>-		xmlDebugDumpNode (stdout, node, 32);</div><div class='del'>-		printf("%s.\n", node-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-		if (strcasecmp (node-&gt;name, match)==0) {</div><div class='del'>-			if (node-&gt;childs != NULL &amp;&amp; node-&gt;childs-&gt;content != NULL) {</div><div class='del'>-				return node-&gt;childs-&gt;content;</div><div class='del'>-			} else {</div><div class='del'>-				return fail;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return fail;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-layer_find_url (xmlNodePtr node, </div><div class='del'>-		char *match, </div><div class='del'>-		char *fail)</div><div class='del'>-{</div><div class='del'>-	char *p = layer_find (node, match, fail);</div><div class='del'>-	char *r = p;</div><div class='del'>-	static char *wb = NULL;</div><div class='del'>-	char *w;</div><div class='del'>-	</div><div class='del'>-	if (wb) {</div><div class='del'>-		free (wb);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	wb = w = malloc (3 * strlen (p));</div><div class='del'>-	</div><div class='del'>-	if (w == NULL) {</div><div class='del'>-		fprintf(stderr, "Out of memory\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (*r == ' ') r++;	/* Fix UF bug */</div><div class='del'>-</div><div class='del'>-	while (*r) {</div><div class='del'>-		if (memcmp (r, "&amp;amp;", 5) == 0) {</div><div class='del'>-			*w++ = '&amp;';</div><div class='del'>-			r += 5;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (memcmp (r, "&amp;lt;", 4) == 0) {</div><div class='del'>-			*w++ = '&lt;';</div><div class='del'>-			r += 4;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (memcmp (r, "&amp;gt;", 4) == 0) {</div><div class='del'>-			*w++ = '&gt;';</div><div class='del'>-			r += 4;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (*r == '"' || *r == ' '){</div><div class='del'>-			*w++ = '%';</div><div class='del'>-			*w++ = "0123456789ABCDEF"[*r/16];</div><div class='del'>-			*w++ = "0123456789ABCDEF"[*r&amp;15];</div><div class='del'>-			r++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		*w++ = *r++;</div><div class='del'>-	}</div><div class='del'>-	*w = 0;</div><div class='del'>-	return wb;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-tree_walk (xmlNodePtr root,</div><div class='del'>-	   RdfSummary *summary,</div><div class='del'>-	   GString *html)</div><div class='del'>-{</div><div class='del'>-	BonoboArg *arg;</div><div class='del'>-	xmlNodePtr walk;</div><div class='del'>-	xmlNodePtr rewalk = root;</div><div class='del'>-	xmlNodePtr channel = NULL;</div><div class='del'>-	xmlNodePtr image = NULL;</div><div class='del'>-	xmlNodePtr item[16];</div><div class='del'>-	int items = 0;</div><div class='del'>-	int limit = summary-&gt;limit;</div><div class='del'>-	int i;</div><div class='del'>-	char *t;</div><div class='del'>-	char n[512];</div><div class='del'>-	char *tmp;</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		walk = rewalk;</div><div class='del'>-		rewalk = NULL;</div><div class='del'>-		</div><div class='del'>-		while (walk!=NULL){</div><div class='del'>-#ifdef RDF_DEBUG</div><div class='del'>-			printf ("%p, %s\n", walk, walk-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-			if (strcasecmp (walk-&gt;name, "rdf") == 0) {</div><div class='del'>-				rewalk = walk-&gt;childs;</div><div class='del'>-				walk = walk-&gt;next;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			if (strcasecmp (walk-&gt;name, "rss") == 0){</div><div class='del'>-				rewalk = walk-&gt;childs;</div><div class='del'>-				walk = walk-&gt;next;</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-			/* This is the channel top level */</div><div class='del'>-#ifdef RDF_DEBUG</div><div class='del'>-			printf ("Top level '%s'.\n", walk-&gt;name);</div><div class='del'>-#endif</div><div class='del'>-			if (strcasecmp (walk-&gt;name, "channel") == 0) {</div><div class='del'>-				channel = walk;</div><div class='del'>-				rewalk = channel-&gt;childs;</div><div class='del'>-			}</div><div class='del'>-			if (strcasecmp (walk-&gt;name, "image") == 0) {</div><div class='del'>-				image = walk;</div><div class='del'>-				g_print ("Image\n");</div><div class='del'>-			}</div><div class='del'>-			if (strcasecmp (walk-&gt;name, "item") == 0 &amp;&amp; items &lt; 16) {</div><div class='del'>-				item[items++] = walk;</div><div class='del'>-			}</div><div class='del'>-			walk = walk-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while (rewalk);</div><div class='del'>-	</div><div class='del'>-	if (channel == NULL) {</div><div class='del'>-		fprintf(stderr, "No channel definition.\n");</div><div class='del'>-		exit(1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	t = layer_find(channel-&gt;childs, "title", "No title");</div><div class='del'>-</div><div class='del'>-	arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;showtitle) {</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, t);</div><div class='del'>-	} else {</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, "");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_set_value (summary-&gt;bag,</div><div class='del'>-				       "window_title", </div><div class='del'>-				       (const BonoboArg *) arg, NULL);</div><div class='del'>-	bonobo_arg_release (arg);</div><div class='del'>-</div><div class='del'>-	if (image &amp;&amp; !wipe_trackers) {		</div><div class='del'>-		char *icon;</div><div class='del'>-</div><div class='del'>-		icon = layer_find_url (image-&gt;childs, "url", "apple-red.png");</div><div class='del'>-		arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, icon);</div><div class='del'>-		bonobo_property_bag_set_value (summary-&gt;bag,</div><div class='del'>-					       "window_icon", </div><div class='del'>-					       (const BonoboArg *) arg, NULL);</div><div class='del'>-		bonobo_arg_release (arg);</div><div class='del'>-			</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_string_append (html, "&lt;br clear=all&gt;&lt;FONT size=\"-1\" face=\"helvetica\"&gt;&lt;P&gt;&lt;UL&gt;\n");</div><div class='del'>-</div><div class='del'>-	items = MIN (limit, items);</div><div class='del'>-	for (i = 0; i &lt; items; i++) {</div><div class='del'>-		char *p = layer_find (item[i]-&gt;childs, "title", "No information");</div><div class='del'>-		</div><div class='del'>-		if (wipe_trackers) {</div><div class='del'>-			char *p = layer_find_url (item[i]-&gt;childs, "link", "");</div><div class='del'>-			char *x = strchr (p, '?');</div><div class='del'>-			unsigned char *r, *w;</div><div class='del'>-			int n;</div><div class='del'>-			if (x == NULL)</div><div class='del'>-				continue;</div><div class='del'>-			x++;</div><div class='del'>-			r = x;</div><div class='del'>-			w = x;</div><div class='del'>-			while (*r) {</div><div class='del'>-				if (*r == '+') {</div><div class='del'>-					*w++ = ' ';</div><div class='del'>-				} else if (*r == '%') {</div><div class='del'>-					sscanf (r+1, "%02x", &amp;n);</div><div class='del'>-					*w++ = n;</div><div class='del'>-					r += 2;</div><div class='del'>-				} else {</div><div class='del'>-					*w++ = *r;</div><div class='del'>-				}</div><div class='del'>-				r++;</div><div class='del'>-			}</div><div class='del'>-			*w = 0;</div><div class='del'>-			tmp = g_strdup_printf ("&lt;LI&gt;&lt;A href=\"%s\"&gt;\n", x+4);</div><div class='del'>-			g_string_append (html, tmp);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			tmp = g_strdup_printf ("&lt;LI&gt;&lt;A href=\"%s\"&gt;\n", layer_find_url(item[i]-&gt;childs, "link", ""));</div><div class='del'>-			g_string_append (html, tmp);</div><div class='del'>-			g_free (tmp);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tmp = g_strdup_printf ("%s\n&lt;/A&gt;\n", p);</div><div class='del'>-		g_string_append (html, tmp);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-	}</div><div class='del'>-	g_string_append (html, "&lt;/UL&gt;&lt;/FONT&gt;\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/********* ExecutiveSummaryComponent section **************/</div><div class='del'>-static void </div><div class='del'>-view_destroyed (GtkObject *object,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) data;</div><div class='del'>-</div><div class='del'>-	g_warning ("RDF: Point 1");</div><div class='del'>-	if (summary-&gt;handle)</div><div class='del'>-		gnome_vfs_async_cancel (summary-&gt;handle);</div><div class='del'>-</div><div class='del'>-	g_warning ("RDF: Point 2");</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;cache != NULL)</div><div class='del'>-		xmlFreeDoc (summary-&gt;cache);</div><div class='del'>-</div><div class='del'>-	g_free (summary-&gt;title);</div><div class='del'>-	g_free (summary-&gt;icon);</div><div class='del'>-	g_free (summary);</div><div class='del'>-</div><div class='del'>-	running_views--;</div><div class='del'>-	g_print ("Running_views: %d\n", running_views);</div><div class='del'>-	if (running_views &lt;= 0) {</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-	}</div><div class='del'>-	g_warning ("RDF: Point 3");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* PersistStream callbacks */</div><div class='del'>-static void</div><div class='del'>-load_from_stream (BonoboPersistStream *ps,</div><div class='del'>-		  Bonobo_Stream stream,</div><div class='del'>-		  Bonobo_Persist_ContentType type,</div><div class='del'>-		  gpointer data,</div><div class='del'>-		  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) data;</div><div class='del'>-	char *str;</div><div class='del'>-	xmlChar *xml_str;</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	xmlNodePtr root, children;</div><div class='del'>-</div><div class='del'>-	if (*type &amp;&amp; g_strcasecmp (type, "application/x-rdf-summary") != 0) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_read_string (stream, &amp;str, ev);</div><div class='del'>-	if (ev-&gt;_major != CORBA_NO_EXCEPTION || str == NULL) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	doc = xmlParseDoc ((xmlChar *) str);</div><div class='del'>-	</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		g_warning ("Bad data: %s!", str);</div><div class='del'>-		g_free (str);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	root = doc-&gt;root;</div><div class='del'>-	children = root-&gt;childs;</div><div class='del'>-	while (children) {</div><div class='del'>-		if (strcasecmp (children-&gt;name, "location") == 0) {</div><div class='del'>-			xml_str = xmlNodeListGetString (doc, children-&gt;childs, 1);</div><div class='del'>-			summary-&gt;location = g_strdup (xml_str);</div><div class='del'>-			xmlFree (xml_str);</div><div class='del'>-</div><div class='del'>-			children = children-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		} </div><div class='del'>-</div><div class='del'>-		if (strcasecmp (children-&gt;name, "limit") == 0) {</div><div class='del'>-			xml_str = xmlNodeListGetString (doc, children-&gt;childs, 1);</div><div class='del'>-			summary-&gt;limit = atoi (xml_str);</div><div class='del'>-			xmlFree (xml_str);</div><div class='del'>-</div><div class='del'>-			children = children-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (strcasecmp (children-&gt;name, "showtitle") == 0) {</div><div class='del'>-			xml_str = xmlNodeListGetString (doc, children-&gt;childs, 1);</div><div class='del'>-			summary-&gt;showtitle = atoi (xml_str);</div><div class='del'>-			xmlFree (xml_str);</div><div class='del'>-</div><div class='del'>-			children = children-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (strcasecmp (children-&gt;name, "usetimer") == 0) {</div><div class='del'>-			xml_str = xmlNodeListGetString (doc, children-&gt;childs, 1);</div><div class='del'>-			summary-&gt;usetimer = atoi (xml_str);</div><div class='del'>-			xmlFree (xml_str);</div><div class='del'>-</div><div class='del'>-			children = children-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (strcasecmp (children-&gt;name, "timer") == 0) {</div><div class='del'>-			xml_str = xmlNodeListGetString (doc, children-&gt;childs, 1);</div><div class='del'>-			summary-&gt;time = atoi (xml_str);</div><div class='del'>-			xmlFree (xml_str);</div><div class='del'>-</div><div class='del'>-			children = children-&gt;next;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_print ("Unknown name: %s\n", children-&gt;name);</div><div class='del'>-		children = children-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-summary_to_string (RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	xmlChar *out_str;</div><div class='del'>-	int out_len = 0;</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	xmlNodePtr root;</div><div class='del'>-	xmlNsPtr ns;</div><div class='del'>-	char *tmp_str;</div><div class='del'>-	</div><div class='del'>-	doc = xmlNewDoc ("1.0");</div><div class='del'>-	ns = xmlNewGlobalNs (doc, "www.ximian.com", "rdf");</div><div class='del'>-	</div><div class='del'>-	doc-&gt;root = xmlNewDocNode (doc, ns, "rdf-summary", NULL);</div><div class='del'>-</div><div class='del'>-	xmlNewChild (doc-&gt;root, ns, "location", summary-&gt;location);</div><div class='del'>-	tmp_str = g_strdup_printf ("%d", summary-&gt;limit);</div><div class='del'>-	xmlNewChild (doc-&gt;root, ns, "limit", tmp_str);</div><div class='del'>-	g_free (tmp_str);</div><div class='del'>-</div><div class='del'>-	tmp_str = g_strdup_printf ("%d", summary-&gt;showtitle);</div><div class='del'>-	xmlNewChild (doc-&gt;root, ns, "showtitle", tmp_str);</div><div class='del'>-	g_free (tmp_str);</div><div class='del'>-</div><div class='del'>-	tmp_str = g_strdup_printf ("%d", summary-&gt;usetimer);</div><div class='del'>-	xmlNewChild (doc-&gt;root, ns, "usetimer", tmp_str);</div><div class='del'>-	g_free (tmp_str);</div><div class='del'>-</div><div class='del'>-	tmp_str = g_strdup_printf ("%d", summary-&gt;time);</div><div class='del'>-	xmlNewChild (doc-&gt;root, ns, "timer", tmp_str);</div><div class='del'>-	g_free (tmp_str);</div><div class='del'>-</div><div class='del'>-	xmlDocDumpMemory (doc, &amp;out_str, &amp;out_len);</div><div class='del'>-</div><div class='del'>-	return out_str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_to_stream (BonoboPersistStream *ps,</div><div class='del'>-		const Bonobo_Stream stream,</div><div class='del'>-		Bonobo_Persist_ContentType type,</div><div class='del'>-		gpointer data,</div><div class='del'>-		CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) data;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	if (*type &amp;&amp; g_strcasecmp (type, "application/x-rdf-summary") != 0) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str = summary_to_string (summary);</div><div class='del'>-	if (str)</div><div class='del'>-		bonobo_stream_client_printf (stream, TRUE, ev, str);</div><div class='del'>-	xmlFree (str);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-content_types (BonoboPersistStream *ps,</div><div class='del'>-	       void *closure,</div><div class='del'>-	       CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (1, "application/x-rdf-summary");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-display_doc (RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	GString *html;</div><div class='del'>-</div><div class='del'>-	html = g_string_new ("");</div><div class='del'>-</div><div class='del'>-	tree_walk (summary-&gt;cache-&gt;root, summary, html);</div><div class='del'>-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary-&gt;view), html-&gt;str);</div><div class='del'>-	g_string_free (html, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-		GnomeVFSResult result,</div><div class='del'>-		RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	char *xml;</div><div class='del'>-</div><div class='del'>-	if (summary == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	summary-&gt;handle = NULL;</div><div class='del'>-	g_free (summary-&gt;buffer);</div><div class='del'>-	xml = summary-&gt;str-&gt;str;</div><div class='del'>-	g_string_free (summary-&gt;str, FALSE);</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;cache != NULL)</div><div class='del'>-		xmlFreeDoc (summary-&gt;cache);</div><div class='del'>-</div><div class='del'>-	doc = xmlParseMemory (xml, strlen (xml));</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		char *emsg;</div><div class='del'>-		BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-		arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, _("Error"));</div><div class='del'>-		bonobo_property_bag_set_value (summary-&gt;bag,</div><div class='del'>-					       "window_title", </div><div class='del'>-					       (const BonoboArg *) arg,</div><div class='del'>-					       NULL);</div><div class='del'>-		bonobo_arg_release (arg);</div><div class='del'>-		</div><div class='del'>-		emsg = g_strdup_printf ("&lt;b&gt;Cannot open location:&lt;br&gt;%s&lt;/b&gt;",</div><div class='del'>-					summary-&gt;location);</div><div class='del'>-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary-&gt;view), emsg);</div><div class='del'>-		g_free (emsg);</div><div class='del'>-		g_free (xml);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (xml);</div><div class='del'>-</div><div class='del'>-	/* Cache it for later */</div><div class='del'>-	summary-&gt;cache = doc;</div><div class='del'>-</div><div class='del'>-	/* Draw it */</div><div class='del'>-	display_doc (summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-read_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	       GnomeVFSResult result,</div><div class='del'>-	       gpointer buffer,</div><div class='del'>-	       GnomeVFSFileSize bytes_requested,</div><div class='del'>-	       GnomeVFSFileSize bytes_read,</div><div class='del'>-	       RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	if (result != GNOME_VFS_OK &amp;&amp; result != GNOME_VFS_ERROR_EOF) {</div><div class='del'>-		char *emsg;</div><div class='del'>-		BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-		arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, _("Error"));</div><div class='del'>-		bonobo_property_bag_set_value (summary-&gt;bag,</div><div class='del'>-					       "window_title", </div><div class='del'>-					       (const BonoboArg *) arg,</div><div class='del'>-					       NULL);</div><div class='del'>-		bonobo_arg_release (arg);</div><div class='del'>-		</div><div class='del'>-		emsg = g_strdup_printf ("&lt;b&gt;Cannot open location:&lt;br&gt;%s&lt;/b&gt;",</div><div class='del'>-					summary-&gt;location);</div><div class='del'>-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary-&gt;view), emsg);</div><div class='del'>-		g_free (emsg);</div><div class='del'>-		gnome_vfs_async_close (handle, </div><div class='del'>-				       (GnomeVFSAsyncCloseCallback) close_callback,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_print ("NULLING\n");</div><div class='del'>-		summary-&gt;handle = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bytes_read == 0) {</div><div class='del'>-		/* EOF */</div><div class='del'>-		gnome_vfs_async_close (handle, </div><div class='del'>-				       (GnomeVFSAsyncCloseCallback) close_callback,</div><div class='del'>-				       summary);</div><div class='del'>-	} else {</div><div class='del'>-		*((char *) buffer + bytes_read) = 0;</div><div class='del'>-		g_string_append (summary-&gt;str, (const char *) buffer);</div><div class='del'>-		gnome_vfs_async_read (handle, buffer, 4095, </div><div class='del'>-				      (GnomeVFSAsyncReadCallback) read_callback,</div><div class='del'>-				      summary);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-open_callback (GnomeVFSAsyncHandle *handle,</div><div class='del'>-	       GnomeVFSResult result,</div><div class='del'>-	       RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	GList *uri;</div><div class='del'>-	char *buffer;</div><div class='del'>-</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		char *emsg;</div><div class='del'>-		BonoboArg *arg;</div><div class='del'>-</div><div class='del'>-		arg = bonobo_arg_new (BONOBO_ARG_STRING);</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, _("Error"));</div><div class='del'>-		bonobo_property_bag_set_value (summary-&gt;bag,</div><div class='del'>-					       "window_title", </div><div class='del'>-					       (const BonoboArg *) arg,</div><div class='del'>-					       NULL);</div><div class='del'>-		bonobo_arg_release (arg);</div><div class='del'>-		</div><div class='del'>-		emsg = g_strdup_printf ("&lt;b&gt;Cannot open location:&lt;br&gt;%s&lt;/b&gt;",</div><div class='del'>-					summary-&gt;location);</div><div class='del'>-		executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary-&gt;view), emsg);</div><div class='del'>-		g_free (emsg);</div><div class='del'>-		summary-&gt;handle = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	summary-&gt;str = g_string_new ("");</div><div class='del'>-	summary-&gt;buffer = g_new (char, 4096);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_async_read (handle, summary-&gt;buffer, 4095, </div><div class='del'>-			      (GnomeVFSAsyncReadCallback) read_callback, </div><div class='del'>-			      summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-download (RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSAsyncHandle *handle;</div><div class='del'>-	char *html = "&lt;b&gt;Loading RDF file. . .&lt;br&gt;Please wait&lt;/b&gt;";</div><div class='del'>-	</div><div class='del'>-	executive_summary_html_view_set_html (EXECUTIVE_SUMMARY_HTML_VIEW (summary-&gt;view),</div><div class='del'>-					      html);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_async_open (&amp;handle, summary-&gt;location, GNOME_VFS_OPEN_READ,</div><div class='del'>-			      (GnomeVFSAsyncOpenCallback) open_callback, </div><div class='del'>-			      summary);</div><div class='del'>-</div><div class='del'>-	summary-&gt;handle = handle;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-download_cb (GtkWidget *w,</div><div class='del'>-	     RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	download (summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg *arg,</div><div class='del'>-	  guint arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case PROPERTY_TITLE:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, summary-&gt;title);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_ICON:</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, summary-&gt;icon);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  const BonoboArg *arg,</div><div class='del'>-	  guint arg_id,</div><div class='del'>-	  CORBA_Environment *ev,</div><div class='del'>-	  gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case PROPERTY_TITLE:</div><div class='del'>-		if (summary-&gt;title)</div><div class='del'>-			g_free (summary-&gt;title);</div><div class='del'>-</div><div class='del'>-		summary-&gt;title = g_strdup (BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		g_print ("Notify listener!\n");</div><div class='del'>-		bonobo_property_bag_notify_listeners (bag, "window_title",</div><div class='del'>-						      arg, NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROPERTY_ICON:</div><div class='del'>-		if (summary-&gt;icon)</div><div class='del'>-			g_free (summary-&gt;icon);</div><div class='del'>-</div><div class='del'>-		summary-&gt;icon = g_strdup (BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		g_print ("Notify listener 2\n");</div><div class='del'>-		bonobo_property_bag_notify_listeners (bag, "window_icon",</div><div class='del'>-						      arg, NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-item_changed (GtkWidget *widget,</div><div class='del'>-	      RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	if (widget == summary-&gt;g_update) {</div><div class='del'>-		summary-&gt;usetimer = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));</div><div class='del'>-		gtk_widget_set_sensitive (summary-&gt;g_update_container, </div><div class='del'>-					  summary-&gt;usetimer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_property_control_changed (summary-&gt;property_control, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboControl *</div><div class='del'>-property_control (BonoboPropertyControl *property_control,</div><div class='del'>-		  int page_num,</div><div class='del'>-		  gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	RdfSummary *summary = (RdfSummary *) user_data;</div><div class='del'>-	GtkWidget *container, *label, *hbox, *spinner, *button;</div><div class='del'>-	char *climit;</div><div class='del'>-</div><div class='del'>-	container = gtk_vbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_set_border_width (GTK_CONTAINER (container), 2);</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("Location:");</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	summary-&gt;rdf = gtk_entry_new ();</div><div class='del'>-	if (summary-&gt;location)</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (summary-&gt;rdf), summary-&gt;location);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary-&gt;rdf), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (item_changed), summary);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), summary-&gt;rdf, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new ("Maximum number of entries:");</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	summary-&gt;g_limit = gtk_entry_new ();</div><div class='del'>-	climit = g_strdup_printf ("%d", summary-&gt;limit);</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (summary-&gt;g_limit), climit);</div><div class='del'>-	g_free (climit);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary-&gt;g_limit), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (item_changed), summary);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), summary-&gt;g_limit, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Do this better? */</div><div class='del'>-	label = gtk_label_new ("Show window title");</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	summary-&gt;g_title = gtk_check_button_new ();</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary-&gt;g_title),</div><div class='del'>-				      summary-&gt;showtitle);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary-&gt;g_title), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (item_changed), summary);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), summary-&gt;g_title, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-</div><div class='del'>-	/* Update */</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	label = gtk_label_new (_("Update automatically"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-	summary-&gt;g_update = gtk_check_button_new ();</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (summary-&gt;g_update),</div><div class='del'>-				      summary-&gt;usetimer);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary-&gt;g_update), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (item_changed), summary);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), summary-&gt;g_update, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label (_("Update now"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (download_cb), summary);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Timer */</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	summary-&gt;g_update_container = hbox;</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("Update every "));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	summary-&gt;adjustment = GTK_ADJUSTMENT(gtk_adjustment_new (summary-&gt;time / 1000 / 60,</div><div class='del'>-								 1.0, 1000.0, 1.0, 10.0, 1.0));</div><div class='del'>-	spinner = gtk_spin_button_new (summary-&gt;adjustment, 1.0, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (spinner), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (item_changed), summary);</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	label = gtk_label_new (_("minutes"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (container), hbox, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_set_sensitive (hbox, summary-&gt;usetimer);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (container);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (container);</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-property_action (GtkObject *property_control,</div><div class='del'>-		 int page_num,</div><div class='del'>-		 Bonobo_PropertyControl_Action action,</div><div class='del'>-		 RdfSummary *summary)</div><div class='del'>-{</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-	char *old_location;</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case Bonobo_PropertyControl_APPLY:</div><div class='del'>-		old_location = summary-&gt;location;</div><div class='del'>-		summary-&gt;showtitle = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (summary-&gt;g_title));</div><div class='del'>-		summary-&gt;location = g_strdup (gtk_entry_get_text (GTK_ENTRY (summary-&gt;rdf)));</div><div class='del'>-		if (strcmp (old_location, summary-&gt;location) != 0) </div><div class='del'>-			changed = TRUE;</div><div class='del'>-</div><div class='del'>-		summary-&gt;limit = atoi (gtk_entry_get_text (GTK_ENTRY (summary-&gt;g_limit)));</div><div class='del'>-		summary-&gt;time = summary-&gt;adjustment-&gt;value * 60 * 1000;</div><div class='del'>-		if (summary-&gt;timer)</div><div class='del'>-			gtk_timeout_remove (summary-&gt;timer);</div><div class='del'>-		summary-&gt;timer = gtk_timeout_add (summary-&gt;time, </div><div class='del'>-						  (GSourceFunc)download, summary);</div><div class='del'>-		</div><div class='del'>-		if (changed)</div><div class='del'>-			g_idle_add ((GSourceFunc) download, summary);</div><div class='del'>-		else</div><div class='del'>-			g_idle_add ((GSourceFunc) display_doc, summary);</div><div class='del'>-</div><div class='del'>-		g_free (old_location);</div><div class='del'>-		break;</div><div class='del'>- </div><div class='del'>-	case Bonobo_PropertyControl_HELP:</div><div class='del'>-		g_print ("HELP: Page %d!\n", page_num);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-create_view (ExecutiveSummaryComponentFactory *_factory,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	RdfSummary *summary;</div><div class='del'>-	BonoboObject *component, *view;</div><div class='del'>-	BonoboEventSource *event_source;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	BonoboPropertyBag *bag;</div><div class='del'>-	BonoboPropertyControl *property;</div><div class='del'>-	</div><div class='del'>-	summary = g_new (RdfSummary, 1);</div><div class='del'>-	summary-&gt;icon = g_strdup ("apple-green.png");</div><div class='del'>-	summary-&gt;title = g_strdup ("Downloading...");</div><div class='del'>-	summary-&gt;location = g_strdup ("http://news.gnome.org/gnome-news/rdf");</div><div class='del'>-	summary-&gt;limit = 10;</div><div class='del'>-	summary-&gt;showtitle = TRUE;</div><div class='del'>-</div><div class='del'>-	summary-&gt;cache = NULL;</div><div class='del'>-	</div><div class='del'>-	summary-&gt;usetimer = TRUE;</div><div class='del'>-	summary-&gt;time = 600000; /* 10 minutes */</div><div class='del'>-	summary-&gt;timer = gtk_timeout_add (summary-&gt;time, (GSourceFunc) download,</div><div class='del'>-					  summary);</div><div class='del'>-</div><div class='del'>-	component = executive_summary_component_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (component), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_destroyed), summary);</div><div class='del'>-</div><div class='del'>-	summary-&gt;component = component;</div><div class='del'>-</div><div class='del'>-	/* Share the event source between the ExecutiveSummaryHtmlView and the</div><div class='del'>-	   BonoboPropertyControl as we can only have one Bonobo::EventSource</div><div class='del'>-	   interface aggregated */</div><div class='del'>-	event_source = bonobo_event_source_new ();</div><div class='del'>-</div><div class='del'>-	/* Summary::HtmlView */</div><div class='del'>-	view = executive_summary_html_view_new_full (event_source);</div><div class='del'>-</div><div class='del'>-	summary-&gt;view = view;</div><div class='del'>-	bonobo_object_add_interface (component, view);</div><div class='del'>-</div><div class='del'>-	/* Bonobo::PropertyBag */</div><div class='del'>-	bag = bonobo_property_bag_new_full (get_prop, set_prop, </div><div class='del'>-					    event_source, summary);</div><div class='del'>-</div><div class='del'>-	summary-&gt;bag = bag;</div><div class='del'>-	bonobo_property_bag_add (bag,</div><div class='del'>-				 "window_title", PROPERTY_TITLE,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL,</div><div class='del'>-				 "The title of this component's window", 0);</div><div class='del'>-	bonobo_property_bag_add (bag,</div><div class='del'>-				 "window_icon", PROPERTY_ICON,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL,</div><div class='del'>-				 "The icon for this component's window", 0);</div><div class='del'>-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));</div><div class='del'>-</div><div class='del'>-	/* Bonobo::PropertyControl */</div><div class='del'>-	property = bonobo_property_control_new_full (property_control, 1,</div><div class='del'>-						     event_source,</div><div class='del'>-						     summary);</div><div class='del'>-	summary-&gt;property_control = property;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (property), "action",</div><div class='del'>-			    GTK_SIGNAL_FUNC (property_action), summary);</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (component, BONOBO_OBJECT(property));</div><div class='del'>-</div><div class='del'>-	/* Bonobo::PersistStream */</div><div class='del'>-	stream = bonobo_persist_stream_new (load_from_stream, save_to_stream,</div><div class='del'>-					    NULL, content_types, summary);</div><div class='del'>-	bonobo_object_add_interface (component, BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	running_views++;</div><div class='del'>-	gtk_idle_add ((GSourceFunc) download, summary);</div><div class='del'>-</div><div class='del'>-	return component;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *_factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *component_factory;</div><div class='del'>-</div><div class='del'>-	component_factory = executive_summary_component_factory_new (create_view, NULL);</div><div class='del'>-	return component_factory;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (RDF_SUMMARY_ID, factory_fn, NULL);</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_error ("Cannot initialize factory");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-main (int argc, </div><div class='del'>-      char *argv[])</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table ("RDF-Summary", VERSION,</div><div class='del'>-				    argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	gnome_vfs_init ();</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	factory_init ();</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-	</div><div class='head'>diff --git a/executive-summary/widgets/.cvsignore b/executive-summary/widgets/.cvsignore<br/>deleted file mode 100644<br/>index ddca354b6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-esummary-window-test
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/widgets/Makefile.am b/executive-summary/widgets/Makefile.am<br/>deleted file mode 100644<br/>index f83d956d63..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-INCLUDES = 	\</div><div class='del'>-	-I$(top_srcdir) 	\</div><div class='del'>-	-I$(includedir)		\</div><div class='del'>-	$(GNOME_INCLUDEDIR)	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"Executive-Summary-Widgets\"	\</div><div class='del'>-	-g 	\</div><div class='del'>-	-Wall	\</div><div class='del'>-	-Wmissing-prototypes	\</div><div class='del'>-	-Wmissing-declarations</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libesummary-widgets.a</div><div class='del'>-</div><div class='del'>-libesummary_widgets_a_SOURCES = 	\</div><div class='del'>-	e-summary-subwindow.c		\</div><div class='del'>-	e-summary-subwindow.h		\</div><div class='del'>-	e-summary-titlebar.c		\</div><div class='del'>-	e-summary-titlebar.h		\</div><div class='del'>-	e-summary-title-button.c	\</div><div class='del'>-	e-summary-title-button.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =		\</div><div class='del'>-	esummary-window-test</div><div class='del'>-</div><div class='del'>-esummary_window_test_SOURCES =	\</div><div class='del'>-	esummary-window-test.c</div><div class='del'>-</div><div class='del'>-esummary_window_test_LDADD =	\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)	\</div><div class='del'>-	libesummary-widgets.a	\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c<br/>deleted file mode 100644<br/>index 336b73bb76..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-subwindow.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-subwindow.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-widget.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary-subwindow.h"</div><div class='del'>-#include "e-summary-titlebar.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_canvas_group_get_type ())</div><div class='del'>-#define TITLEBAR_BORDER_WIDTH 2</div><div class='del'>-</div><div class='del'>-static void e_summary_subwindow_destroy (GtkObject *object);</div><div class='del'>-static void e_summary_subwindow_class_init (GtkObjectClass *object_class);</div><div class='del'>-static void e_summary_subwindow_init (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class;</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindowPrivate {</div><div class='del'>-  GnomeCanvasItem *titlebar;</div><div class='del'>-  GnomeCanvasItem *contents;</div><div class='del'>-</div><div class='del'>-  GtkWidget *container;</div><div class='del'>-</div><div class='del'>-  char *title;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-  ARG_0,</div><div class='del'>-  ARG_X,</div><div class='del'>-  ARG_Y,</div><div class='del'>-  ARG_WIDTH,</div><div class='del'>-  ARG_HEIGHT,</div><div class='del'>-  ARG_STATE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-  CLOSE_CLICKED,</div><div class='del'>-  SHADE_CLICKED,</div><div class='del'>-  EDIT_CLICKED,</div><div class='del'>-  LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint32 e_summary_subwindow_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  if (priv == NULL)</div><div class='del'>-    return;</div><div class='del'>-</div><div class='del'>-  if (priv-&gt;container) {</div><div class='del'>-    gtk_widget_destroy (priv-&gt;container);</div><div class='del'>-    priv-&gt;container = NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (priv-&gt;title) {</div><div class='del'>-    g_free (priv-&gt;title);</div><div class='del'>-    priv-&gt;title = NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  g_free (subwindow-&gt;private);</div><div class='del'>-  subwindow-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-  if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-  (* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-  item_class = (GnomeCanvasItemClass *) object_class;</div><div class='del'>-</div><div class='del'>-  object_class-&gt;destroy = e_summary_subwindow_destroy;</div><div class='del'>-</div><div class='del'>-  item_class-&gt;realize = e_summary_subwindow_realize;</div><div class='del'>-  item_class-&gt;unrealize = e_summary_subwindow_unrealize;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  subwindow-&gt;private = g_new0 (ESummarySubwindowPrivate, 1);</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  priv-&gt;title = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary_subwindow, "ESummarySubwindow", ESummarySubwindow,</div><div class='del'>-	     e_summary_subwindow_class_init, e_summary_subwindow_init,</div><div class='del'>-	     PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-container_size_allocate (GtkWidget *widget,</div><div class='del'>-			 GtkAllocation *allocation,</div><div class='del'>-			 ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gnome_canvas_item_set (priv-&gt;titlebar,</div><div class='del'>-			 "width", (double) allocation-&gt;width - 1,</div><div class='del'>-			 NULL);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_cb (GnomeCanvasItem *item,</div><div class='del'>-	 ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("EDIT!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-shade_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("SHADE!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("CLOSE!\n");</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (subwindow));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_construct (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasGroup *group;</div><div class='del'>-  ESummarySubwindow *subwindow;</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-  EFont *font;</div><div class='del'>-  int titlebar_height;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (item != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (item));</div><div class='del'>-</div><div class='del'>-  subwindow = E_SUMMARY_SUBWINDOW (item);</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  group = GNOME_CANVAS_GROUP (item);</div><div class='del'>-</div><div class='del'>-  font = e_font_from_gdk_font ( ((GtkWidget *) item-&gt;canvas)-&gt;style-&gt;font);</div><div class='del'>-</div><div class='del'>-  titlebar_height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */</div><div class='del'>-</div><div class='del'>-  priv-&gt;titlebar = gnome_canvas_item_new (group,</div><div class='del'>-					  e_summary_titlebar_get_type (),</div><div class='del'>-					  "text", "Titlebar",</div><div class='del'>-					  "width", 100.0,</div><div class='del'>-					  NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "edit",</div><div class='del'>-		      GTK_SIGNAL_FUNC (edit_cb), subwindow);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "shade",</div><div class='del'>-		      GTK_SIGNAL_FUNC (shade_cb), subwindow);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "close",</div><div class='del'>-		      GTK_SIGNAL_FUNC (close_cb), subwindow);</div><div class='del'>-</div><div class='del'>-  priv-&gt;container = gtk_frame_new (NULL);</div><div class='del'>-  gtk_frame_set_shadow_type (GTK_FRAME (priv-&gt;container), GTK_SHADOW_ETCHED_IN);</div><div class='del'>-  gtk_widget_show (priv-&gt;container);</div><div class='del'>-  </div><div class='del'>-  priv-&gt;contents = gnome_canvas_item_new (group,</div><div class='del'>-					  gnome_canvas_widget_get_type (),</div><div class='del'>-					  "x", (double) 0,</div><div class='del'>-					  "y", (double) titlebar_height + 1,</div><div class='del'>-					  "widget", priv-&gt;container,</div><div class='del'>-					  NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;container), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC (container_size_allocate), subwindow);</div><div class='del'>-  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCanvasItem *</div><div class='del'>-e_summary_subwindow_new (GnomeCanvasGroup *parent,</div><div class='del'>-			 double x,</div><div class='del'>-			 double y)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-  item = gnome_canvas_item_new (parent, e_summary_subwindow_get_type (), </div><div class='del'>-				"x", x,</div><div class='del'>-				"y", y,</div><div class='del'>-				NULL);</div><div class='del'>-  e_summary_subwindow_construct (item);</div><div class='del'>-</div><div class='del'>-  return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These functions mimic the GtkContainer methods */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_add (ESummarySubwindow *subwindow,</div><div class='del'>-			 GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (GTK_IS_WIDGET (widget));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gtk_container_add (GTK_CONTAINER (priv-&gt;container), widget);</div><div class='del'>-  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_remove (ESummarySubwindow *subwindow,</div><div class='del'>-			    GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (GTK_IS_WIDGET (widget));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gtk_container_remove (GTK_CONTAINER (priv-&gt;container), widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_set_title (ESummarySubwindow *subwindow,</div><div class='del'>-			       const char *title)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (title != NULL);</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-  if (priv-&gt;title)</div><div class='del'>-    g_free (priv-&gt;title);</div><div class='del'>-</div><div class='del'>-  priv-&gt;title = g_strdup (title);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h<br/>deleted file mode 100644<br/>index 27771d296d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-subwindow.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-subwindow.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-subwindow.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_SUBWINDOW_H__</div><div class='del'>-#define _E_SUMMARY_SUBWINDIW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_SUBWINDOW_TYPE (e_summary_subwindow_get_type ())</div><div class='del'>-#define E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindow))</div><div class='del'>-#define E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindowClass))</div><div class='del'>-#define IS_E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummarySubwindowPrivate ESummarySubwindowPrivate;</div><div class='del'>-typedef struct _ESummarySubwindow ESummarySubwindow;</div><div class='del'>-typedef struct _ESummarySubwindowClass ESummarySubwindowClass;</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindow {</div><div class='del'>-  GnomeCanvasGroup parent;</div><div class='del'>-</div><div class='del'>-  ESummarySubwindowPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindowClass {</div><div class='del'>-  GnomeCanvasGroupClass parent_class;</div><div class='del'>-</div><div class='del'>-  void (*close_clicked) (ESummarySubwindow *window);</div><div class='del'>-  void (*shade_clicked) (ESummarySubwindow *window);</div><div class='del'>-  void (*edit_clicked) (ESummarySubwindow *window);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_subwindow_get_type (void);</div><div class='del'>-</div><div class='del'>-void e_summary_subwindow_construct (GnomeCanvasItem *subwindow);</div><div class='del'>-GnomeCanvasItem *e_summary_subwindow_new (GnomeCanvasGroup *parent,</div><div class='del'>-					  double x,</div><div class='del'>-					  double y);</div><div class='del'>-</div><div class='del'>-void e_summary_subwindow_add (ESummarySubwindow *subwindow,</div><div class='del'>-			      GtkWidget *widget);</div><div class='del'>-void e_summary_subwindow_remove (ESummarySubwindow *subwindow,</div><div class='del'>-				 GtkWidget *widget);</div><div class='del'>-void e_summary_subwindow_set_title (ESummarySubwindow *subwindow,</div><div class='del'>-				    const char *title);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c<br/>deleted file mode 100644<br/>index 518ce692c6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-title-button.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-title-button.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,402 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-title-buttons.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary-title-button.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_canvas_rect_get_type ())</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_PIXBUF,</div><div class='del'>-	ARG_X,</div><div class='del'>-	ARG_Y</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CLICKED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_summary_title_button_destroy (GtkObject *object);</div><div class='del'>-static void e_summary_title_button_set_arg (GtkObject *object,</div><div class='del'>-					    GtkArg *arg,</div><div class='del'>-					    guint arg_id);</div><div class='del'>-static void e_summary_title_button_get_arg (GtkObject *object,</div><div class='del'>-					    GtkArg *arg,</div><div class='del'>-					    guint arg_id);</div><div class='del'>-static void e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class);</div><div class='del'>-static void e_summary_title_button_init (ESummaryTitleButton *estb);</div><div class='del'>-static double e_summary_title_button_point (GnomeCanvasItem *item,</div><div class='del'>-					    double x,</div><div class='del'>-					    double y,</div><div class='del'>-					    int cx,</div><div class='del'>-					    int cy,</div><div class='del'>-					    GnomeCanvasItem **actual_item);</div><div class='del'>-static void e_summary_title_button_update (GnomeCanvasItem *item,</div><div class='del'>-					   double affine[6],</div><div class='del'>-					   ArtSVP *clip_path,</div><div class='del'>-					   gint flags);</div><div class='del'>-static void e_summary_title_button_draw (GnomeCanvasItem *item,</div><div class='del'>-					 GdkDrawable *drawable,</div><div class='del'>-					 int x, int y,</div><div class='del'>-					 int width, int height);</div><div class='del'>-static gint e_summary_title_button_event (GnomeCanvasItem *item,</div><div class='del'>-					  GdkEvent *event);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasRectClass *parent_class;</div><div class='del'>-static guint estb_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitleButtonPrivate {</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	double x, y;</div><div class='del'>-	int width, height;</div><div class='del'>-</div><div class='del'>-	int in_button : 1;</div><div class='del'>-	int button_down : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (object);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	gdk_pixbuf_unref (priv-&gt;pixbuf);</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	estb-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_set_arg (GtkObject *object,</div><div class='del'>-				GtkArg *arg,</div><div class='del'>-				guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	gboolean update = FALSE;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (object);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_PIXBUF:</div><div class='del'>-		if (priv-&gt;pixbuf)</div><div class='del'>-			gdk_pixbuf_unref (priv-&gt;pixbuf);</div><div class='del'>-		</div><div class='del'>-		priv-&gt;pixbuf = GTK_VALUE_POINTER (*arg);</div><div class='del'>-		gdk_pixbuf_ref (priv-&gt;pixbuf);</div><div class='del'>-		</div><div class='del'>-		priv-&gt;width = gdk_pixbuf_get_width (priv-&gt;pixbuf);</div><div class='del'>-		priv-&gt;height = gdk_pixbuf_get_height (priv-&gt;pixbuf);</div><div class='del'>-		</div><div class='del'>-		update = TRUE;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_X: </div><div class='del'>-		priv-&gt;x = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_Y:</div><div class='del'>-		priv-&gt;y = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (update)</div><div class='del'>-		gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (estb));</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_get_arg (GtkObject *object,</div><div class='del'>-				GtkArg *arg,</div><div class='del'>-				guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (object);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_PIXBUF:</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = priv-&gt;pixbuf;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_X:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = priv-&gt;x;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_Y:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = priv-&gt;y;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_init (ESummaryTitleButton *estb)</div><div class='del'>-{</div><div class='del'>-	estb-&gt;private = g_new0 (ESummaryTitleButtonPrivate, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_class_init (ESummaryTitleButtonClass *estb_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) estb_class;</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) estb_class;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = e_summary_title_button_destroy;</div><div class='del'>-	object_class-&gt;set_arg = e_summary_title_button_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_summary_title_button_get_arg;</div><div class='del'>-	</div><div class='del'>-	item_class-&gt;draw = e_summary_title_button_draw;</div><div class='del'>-	item_class-&gt;point = e_summary_title_button_point;</div><div class='del'>-	item_class-&gt;update = e_summary_title_button_update;</div><div class='del'>-	item_class-&gt;event = e_summary_title_button_event;</div><div class='del'>-	</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitleButton::pixbuf",</div><div class='del'>-				 GTK_TYPE_POINTER,</div><div class='del'>-				 GTK_ARG_READWRITE,</div><div class='del'>-				 ARG_PIXBUF);</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitleButton::x",</div><div class='del'>-				 GTK_TYPE_DOUBLE,</div><div class='del'>-				 GTK_ARG_READWRITE,</div><div class='del'>-				 ARG_X);</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitleButton::y",</div><div class='del'>-				 GTK_TYPE_DOUBLE,</div><div class='del'>-				 GTK_ARG_READWRITE,</div><div class='del'>-				 ARG_Y);</div><div class='del'>-	estb_signals[CLICKED] = gtk_signal_new ("clicked", GTK_RUN_LAST,</div><div class='del'>-						object_class-&gt;type,</div><div class='del'>-						GTK_SIGNAL_OFFSET (ESummaryTitleButtonClass,</div><div class='del'>-								   clicked),</div><div class='del'>-						gtk_marshal_NONE__NONE,</div><div class='del'>-						GTK_TYPE_NONE, 0);</div><div class='del'>-	gtk_object_class_add_signals (object_class, estb_signals, LAST_SIGNAL);</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary_title_button, "ESummaryTitleButton", </div><div class='del'>-	     ESummaryTitleButton, e_summary_title_button_class_init,</div><div class='del'>-	     e_summary_title_button_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_summary_title_button_point (GnomeCanvasItem *item,</div><div class='del'>-			      double x,</div><div class='del'>-			      double y,</div><div class='del'>-			      int cx,</div><div class='del'>-			      int cy,</div><div class='del'>-			      GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	double d = 1.0;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (item);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (x &gt;= priv-&gt;x &amp;&amp; x &lt;= priv-&gt;x + gdk_pixbuf_get_width (priv-&gt;pixbuf)</div><div class='del'>-	    &amp;&amp; y &gt;= priv-&gt;y &amp;&amp; y &lt;= priv-&gt;y + gdk_pixbuf_get_height (priv-&gt;pixbuf)) {</div><div class='del'>-		d = 0.0;</div><div class='del'>-		*actual_item = item;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return d;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_bounds (ESummaryTitleButton *estb,</div><div class='del'>-	    double *px1, double *py1,</div><div class='del'>-	    double *px2, double *py2)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	double x1, y1, x2, y2;</div><div class='del'>-	int cx1, cy1, cx2, cy2;</div><div class='del'>-	</div><div class='del'>-	item = GNOME_CANVAS_ITEM (estb);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	x1 = priv-&gt;x;</div><div class='del'>-	y1 = priv-&gt;y;</div><div class='del'>-	x2 = x1 + priv-&gt;width;</div><div class='del'>-	y2 = y1 + priv-&gt;height;</div><div class='del'>-	</div><div class='del'>-	gnome_canvas_item_i2w (item, &amp;x1, &amp;y1);</div><div class='del'>-	gnome_canvas_item_i2w (item, &amp;x2, &amp;x2);</div><div class='del'>-	gnome_canvas_w2c (item-&gt;canvas, x1, y1, &amp;cx1, &amp;cy1);</div><div class='del'>-	gnome_canvas_w2c (item-&gt;canvas, x2, y2, &amp;cx2, &amp;cy2);</div><div class='del'>-	</div><div class='del'>-	*px1 = cx1;</div><div class='del'>-	*py1 = cy1;</div><div class='del'>-	*px2 = cx2;</div><div class='del'>-	*py2 = cy2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_update (GnomeCanvasItem *item,</div><div class='del'>-			       double affine[6],</div><div class='del'>-			       ArtSVP *clip_path,</div><div class='del'>-			       gint flags)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	double x1, y1, x2, y2;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (item);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	get_bounds (estb, &amp;x1, &amp;y1, &amp;x2, &amp;y2);</div><div class='del'>-	gnome_canvas_update_bbox (item, (int) x1, (int) y1, (int) x2, (int) y2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_title_button_draw (GnomeCanvasItem *item,</div><div class='del'>-			     GdkDrawable *drawable,</div><div class='del'>-			     int x, int y,</div><div class='del'>-			     int width, int height)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-	double i2w[6], w2c[6], i2c[6];</div><div class='del'>-	int x1, x2, y1, y2;</div><div class='del'>-	ArtPoint i1, i2;</div><div class='del'>-	ArtPoint c1, c2;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (item);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;draw)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;draw) (item, drawable, x, y, width, height);</div><div class='del'>-	</div><div class='del'>-	gnome_canvas_item_i2w_affine (item, i2w);</div><div class='del'>-	gnome_canvas_w2c_affine (item-&gt;canvas, w2c);</div><div class='del'>-	art_affine_multiply (i2c, i2w, w2c);</div><div class='del'>-	</div><div class='del'>-	i1.x = priv-&gt;x;</div><div class='del'>-	i1.y = priv-&gt;y;</div><div class='del'>-	i2.x = i1.x + priv-&gt;width + 4;</div><div class='del'>-	i2.y = i1.y + priv-&gt;height + 4;</div><div class='del'>-	art_affine_point (&amp;c1, &amp;i1, i2c);</div><div class='del'>-	art_affine_point (&amp;c2, &amp;i2, i2c);</div><div class='del'>-	x1 = c1.x;</div><div class='del'>-	y1 = c1.y;</div><div class='del'>-	x2 = c2.x;</div><div class='del'>-	y2 = c2.y;</div><div class='del'>-	</div><div class='del'>-	gc = gdk_gc_new (item-&gt;canvas-&gt;layout.bin_window);</div><div class='del'>-	gdk_draw_rectangle (drawable, gc,</div><div class='del'>-			    FALSE, x1 - x,</div><div class='del'>-			    y1 - y,</div><div class='del'>-			    x2 - x1,</div><div class='del'>-			    y2 - y1);</div><div class='del'>-	gdk_gc_unref (gc);</div><div class='del'>-	</div><div class='del'>-	gdk_pixbuf_render_to_drawable_alpha (priv-&gt;pixbuf,</div><div class='del'>-					     drawable,</div><div class='del'>-					     0, 0,</div><div class='del'>-					     x1 + 2, y1 + 2,</div><div class='del'>-					     priv-&gt;width, priv-&gt;height,</div><div class='del'>-					     GDK_PIXBUF_ALPHA_BILEVEL,</div><div class='del'>-					     127,</div><div class='del'>-					     GDK_RGB_DITHER_NORMAL,</div><div class='del'>-					     0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_summary_title_button_event (GnomeCanvasItem *item,</div><div class='del'>-			      GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitleButton *estb;</div><div class='del'>-	ESummaryTitleButtonPrivate *priv;</div><div class='del'>-</div><div class='del'>-	estb = E_SUMMARY_TITLE_BUTTON (item);</div><div class='del'>-	priv = estb-&gt;private;</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_ENTER_NOTIFY:</div><div class='del'>-		priv-&gt;in_button = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_LEAVE_NOTIFY:</div><div class='del'>-		priv-&gt;in_button = FALSE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (priv-&gt;in_button) {</div><div class='del'>-			priv-&gt;button_down = TRUE;</div><div class='del'>-			gnome_canvas_item_grab (item,</div><div class='del'>-						GDK_LEAVE_NOTIFY_MASK |</div><div class='del'>-						GDK_ENTER_NOTIFY_MASK |</div><div class='del'>-						GDK_POINTER_MOTION_MASK |</div><div class='del'>-						GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-						NULL, event-&gt;button.time);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		priv-&gt;button_down = FALSE;</div><div class='del'>-		gnome_canvas_item_ungrab (item, event-&gt;button.time);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;in_button) {</div><div class='del'>-			gtk_signal_emit (GTK_OBJECT (estb), estb_signals[CLICKED]);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-title-button.h b/executive-summary/widgets/e-summary-title-button.h<br/>deleted file mode 100644<br/>index 59b9e92445..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-title-button.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-title-button.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-title-button.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_TITLE_BUTTON_H__</div><div class='del'>-#define _E_SUMMARY_TITLE_BUTTON_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_TITLE_BUTTON_TYPE (e_summary_title_button_get_type ())</div><div class='del'>-#define E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButton))</div><div class='del'>-#define E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLE_BUTTON_TYPE, ESummaryTitleButtonClass))</div><div class='del'>-#define IS_E_SUMMARY_TITLE_BUTTON(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_TITLE_BUTTON_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLE_BUTTON_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummaryTitleButtonPrivate ESummaryTitleButtonPrivate;</div><div class='del'>-typedef struct _ESummaryTitleButton ESummaryTitleButton;</div><div class='del'>-typedef struct _ESummaryTitleButtonClass ESummaryTitleButtonClass;</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitleButton {</div><div class='del'>-	GnomeCanvasRect parent;</div><div class='del'>-	</div><div class='del'>-	ESummaryTitleButtonPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitleButtonClass {</div><div class='del'>-	GnomeCanvasRectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	void (*clicked) (ESummaryTitleButton *estb);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_title_button_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-titlebar.c b/executive-summary/widgets/e-summary-titlebar.c<br/>deleted file mode 100644<br/>index fa76661a78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-titlebar.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-titlebar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,411 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-titlebar.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary-titlebar.h"</div><div class='del'>-#include "e-summary-title-button.h"</div><div class='del'>-</div><div class='del'>-/* XPMS */</div><div class='del'>-#include "edit.xpm"</div><div class='del'>-#include "x.xpm"</div><div class='del'>-#include "shade.xpm"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_canvas_group_get_type ())</div><div class='del'>-#define TITLEBAR_BORDER_WIDTH 2</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_TEXT,</div><div class='del'>-	ARG_WIDTH,</div><div class='del'>-	ARG_HEIGHT</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	EDIT,</div><div class='del'>-	SHADE,</div><div class='del'>-	CLOSE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_summary_titlebar_destroy (GtkObject *object);</div><div class='del'>-static void e_summary_titlebar_class_init (GtkObjectClass *object_class);</div><div class='del'>-static void e_summary_titlebar_init (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class;</div><div class='del'>-static guint titlebar_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitlebarPrivate {</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	GnomeCanvasItem *titletext;</div><div class='del'>-	</div><div class='del'>-	GnomeCanvasItem *edit;</div><div class='del'>-	GnomeCanvasItem *shade;</div><div class='del'>-	GnomeCanvasItem *close;</div><div class='del'>-	</div><div class='del'>-	char *text;</div><div class='del'>-	double width, height;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitlebar *titlebar;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	titlebar = E_SUMMARY_TITLEBAR (object);</div><div class='del'>-	priv = titlebar-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	titlebar-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_cb (GnomeCanvasItem *item,</div><div class='del'>-	 ESummaryTitlebar *titlebar)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[EDIT]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-shade_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummaryTitlebar *titlebar)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[SHADE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummaryTitlebar *titlebar)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (titlebar), titlebar_signals[CLOSE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	ESummaryTitlebar *titlebar;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	GdkPixbuf *pb;</div><div class='del'>-	EFont *font;</div><div class='del'>-	int font_height;</div><div class='del'>-	</div><div class='del'>-	group = GNOME_CANVAS_GROUP (item);</div><div class='del'>-	titlebar = E_SUMMARY_TITLEBAR (item);</div><div class='del'>-	priv = titlebar-&gt;private;</div><div class='del'>-	</div><div class='del'>-	font = e_font_from_gdk_font (GTK_WIDGET (item-&gt;canvas)-&gt;style-&gt;font);</div><div class='del'>-	font_height = e_font_height (font);</div><div class='del'>-	priv-&gt;height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */</div><div class='del'>-	</div><div class='del'>-	priv-&gt;rect = gnome_canvas_item_new (group,</div><div class='del'>-					    gnome_canvas_rect_get_type (),</div><div class='del'>-					    "x1", 0.0,</div><div class='del'>-					    "y1", 0.0,</div><div class='del'>-					    "y2", (double) priv-&gt;height,</div><div class='del'>-					    "x2", priv-&gt;width, </div><div class='del'>-					    "fill_color_rgba", 0x88AAFFFF,</div><div class='del'>-					    NULL);</div><div class='del'>-	</div><div class='del'>-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) x_xpm);</div><div class='del'>-	priv-&gt;close = gnome_canvas_item_new (group,</div><div class='del'>-					     e_summary_title_button_get_type (),</div><div class='del'>-					     "x", (double) priv-&gt;width - TITLEBAR_BORDER_WIDTH - 18,</div><div class='del'>-					     "y", (double) TITLEBAR_BORDER_WIDTH,</div><div class='del'>-					     "pixbuf", pb,</div><div class='del'>-					     NULL);</div><div class='del'>-	gdk_pixbuf_unref (pb);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;close), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (close_cb), titlebar);</div><div class='del'>-	</div><div class='del'>-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) shade_xpm);</div><div class='del'>-	priv-&gt;shade = gnome_canvas_item_new (group,</div><div class='del'>-					     e_summary_title_button_get_type (),</div><div class='del'>-					     "x", (double) priv-&gt;width - (TITLEBAR_BORDER_WIDTH * 2) - 36,</div><div class='del'>-					     "y", (double) TITLEBAR_BORDER_WIDTH,</div><div class='del'>-					     "pixbuf", pb,</div><div class='del'>-					     NULL);</div><div class='del'>-	gdk_pixbuf_unref (pb);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;shade), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (shade_cb), titlebar);</div><div class='del'>-	</div><div class='del'>-	pb = gdk_pixbuf_new_from_xpm_data ((const char**) edit_xpm);</div><div class='del'>-	priv-&gt;edit = gnome_canvas_item_new (group,</div><div class='del'>-					    e_summary_title_button_get_type (),</div><div class='del'>-					    "x", (double) priv-&gt;width - (TITLEBAR_BORDER_WIDTH * 3) - 54,</div><div class='del'>-					    "y", (double) TITLEBAR_BORDER_WIDTH,</div><div class='del'>-					    "pixbuf", pb,</div><div class='del'>-					    NULL);</div><div class='del'>-	gdk_pixbuf_unref (pb);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;edit), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (edit_cb), titlebar);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;titletext = gnome_canvas_item_new (group,</div><div class='del'>-						 e_text_get_type (),</div><div class='del'>-						 "text", priv-&gt;text,</div><div class='del'>-						 "font_gdk", GTK_WIDGET (item-&gt;canvas)-&gt;style-&gt;font,</div><div class='del'>-						 "clip_width", (double) priv-&gt;width - </div><div class='del'>-						 (TITLEBAR_BORDER_WIDTH*4)- 50,</div><div class='del'>-						 "clip_height", (double) e_font_height (font),</div><div class='del'>-</div><div class='del'>-						 "clip", TRUE,</div><div class='del'>-						 "use_ellipsis", TRUE,</div><div class='del'>-						 "fill_color", "black",</div><div class='del'>-						 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-						 "draw_background", FALSE,</div><div class='del'>-						 NULL);</div><div class='del'>-	gnome_canvas_item_move (priv-&gt;titletext, TITLEBAR_BORDER_WIDTH,</div><div class='del'>-				(priv-&gt;height - font_height) / 2);</div><div class='del'>-	</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_set_arg (GtkObject *object,</div><div class='del'>-			    GtkArg *arg,</div><div class='del'>-			    guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitlebar *titlebar;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	titlebar = E_SUMMARY_TITLEBAR (object);</div><div class='del'>-	priv = titlebar-&gt;private;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_TEXT:</div><div class='del'>-		if (priv-&gt;text)</div><div class='del'>-			g_free (priv-&gt;text);</div><div class='del'>-		</div><div class='del'>-		priv-&gt;text = g_strdup (GTK_VALUE_STRING (*arg));</div><div class='del'>-		</div><div class='del'>-		if (priv-&gt;titletext)</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;titletext,</div><div class='del'>-					       "text", priv-&gt;text,</div><div class='del'>-					       NULL);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		priv-&gt;width = GTK_VALUE_DOUBLE (*arg);</div><div class='del'>-		</div><div class='del'>-		if (priv-&gt;rect)</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;rect,</div><div class='del'>-					       "x2", priv-&gt;width,</div><div class='del'>-					       NULL);</div><div class='del'>-		if (priv-&gt;titletext)</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;titletext,</div><div class='del'>-					       "clip_width", priv-&gt;width - </div><div class='del'>-					       (TITLEBAR_BORDER_WIDTH* 4) - 42,</div><div class='del'>-					       NULL);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_get_arg (GtkObject *object,</div><div class='del'>-			    GtkArg *arg,</div><div class='del'>-			    guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitlebar *titlebar;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	titlebar = E_SUMMARY_TITLEBAR (object);</div><div class='del'>-	priv = titlebar-&gt;private;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_TEXT:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = priv-&gt;text;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = priv-&gt;width;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-		GTK_VALUE_DOUBLE (*arg) = priv-&gt;height;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_summary_titlebar_event (GnomeCanvasItem *item,</div><div class='del'>-			  GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;type == GDK_2BUTTON_PRESS &amp;&amp;</div><div class='del'>-	    event-&gt;button.button == 1) {</div><div class='del'>-		gtk_signal_emit (GTK_OBJECT (item), titlebar_signals[SHADE]);</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else {</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_summary_titlebar_point (GnomeCanvasItem *item,</div><div class='del'>-			  double x,</div><div class='del'>-			  double y,</div><div class='del'>-			  int cx,</div><div class='del'>-			  int cy,</div><div class='del'>-			  GnomeCanvasItem **actual_item)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitlebar *est;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	GnomeCanvasItem *ret_item;</div><div class='del'>-	double d;</div><div class='del'>-</div><div class='del'>-	est = E_SUMMARY_TITLEBAR (item);</div><div class='del'>-	priv = est-&gt;private;</div><div class='del'>-</div><div class='del'>-	d = (* GNOME_CANVAS_ITEM_CLASS </div><div class='del'>-	     (GTK_OBJECT (priv-&gt;edit)-&gt;klass)-&gt;point) (priv-&gt;edit,</div><div class='del'>-						       x, y, </div><div class='del'>-						       cx, cy,</div><div class='del'>-						       &amp;ret_item);</div><div class='del'>-	if (d == 0.0) {</div><div class='del'>-		*actual_item = ret_item;</div><div class='del'>-		return 0.0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d = (* GNOME_CANVAS_ITEM_CLASS </div><div class='del'>-	     (GTK_OBJECT (priv-&gt;shade)-&gt;klass)-&gt;point) (priv-&gt;shade,</div><div class='del'>-							x, y,</div><div class='del'>-							cx, cy,</div><div class='del'>-							&amp;ret_item);</div><div class='del'>-	if (d == 0.0) {</div><div class='del'>-		*actual_item = ret_item;</div><div class='del'>-		return 0.0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d = (* GNOME_CANVAS_ITEM_CLASS</div><div class='del'>-	     (GTK_OBJECT (priv-&gt;close)-&gt;klass)-&gt;point) (priv-&gt;close,</div><div class='del'>-							x, y,</div><div class='del'>-							cx, cy,</div><div class='del'>-							&amp;ret_item);</div><div class='del'>-	if (d == 0.0) {</div><div class='del'>-		*actual_item = ret_item;</div><div class='del'>-		return 0.0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*actual_item = item;</div><div class='del'>-	return 0.0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasItemClass *item_class;</div><div class='del'>-	</div><div class='del'>-	item_class = (GnomeCanvasItemClass *) object_class;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = e_summary_titlebar_destroy;</div><div class='del'>-	object_class-&gt;set_arg = e_summary_titlebar_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_summary_titlebar_get_arg;</div><div class='del'>-	</div><div class='del'>-	item_class-&gt;realize = e_summary_titlebar_realize;</div><div class='del'>-	item_class-&gt;unrealize = e_summary_titlebar_unrealize;</div><div class='del'>-	item_class-&gt;event = e_summary_titlebar_event;</div><div class='del'>-	item_class-&gt;point = e_summary_titlebar_point;</div><div class='del'>-	</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitlebar::text",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE,</div><div class='del'>-				 ARG_TEXT);</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitlebar::width",</div><div class='del'>-				 GTK_TYPE_DOUBLE, GTK_ARG_READWRITE,</div><div class='del'>-				 ARG_WIDTH);</div><div class='del'>-	gtk_object_add_arg_type ("ESummaryTitlebar::height",</div><div class='del'>-				 GTK_TYPE_DOUBLE, GTK_ARG_READABLE,</div><div class='del'>-				 ARG_HEIGHT);</div><div class='del'>-	</div><div class='del'>-	titlebar_signals[EDIT] = gtk_signal_new ("edit", GTK_RUN_LAST,</div><div class='del'>-						 object_class-&gt;type,</div><div class='del'>-						 GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,</div><div class='del'>-								    edit),</div><div class='del'>-						 gtk_marshal_NONE__NONE,</div><div class='del'>-						 GTK_TYPE_NONE, 0);</div><div class='del'>-	titlebar_signals[SHADE] = gtk_signal_new ("shade", GTK_RUN_LAST,</div><div class='del'>-						  object_class-&gt;type,</div><div class='del'>-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,</div><div class='del'>-								     shade),</div><div class='del'>-						  gtk_marshal_NONE__NONE,</div><div class='del'>-						  GTK_TYPE_NONE, 0);</div><div class='del'>-	titlebar_signals[CLOSE] = gtk_signal_new ("close", GTK_RUN_LAST,</div><div class='del'>-						  object_class-&gt;type,</div><div class='del'>-						  GTK_SIGNAL_OFFSET (ESummaryTitlebarClass,</div><div class='del'>-								     close),</div><div class='del'>-						  gtk_marshal_NONE__NONE,</div><div class='del'>-						  GTK_TYPE_NONE, 0);</div><div class='del'>-	gtk_object_class_add_signals (object_class, titlebar_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_titlebar_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESummaryTitlebar *titlebar;</div><div class='del'>-	ESummaryTitlebarPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	titlebar = E_SUMMARY_TITLEBAR (object);</div><div class='del'>-	titlebar-&gt;private = g_new0 (ESummaryTitlebarPrivate, 1);</div><div class='del'>-	priv = titlebar-&gt;private;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;width = 100.0;</div><div class='del'>-	priv-&gt;text = NULL;</div><div class='del'>-	</div><div class='del'>-	gdk_rgb_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary_titlebar, "ESummaryTitlebar", ESummaryTitlebar,</div><div class='del'>-	     e_summary_titlebar_class_init, e_summary_titlebar_init,</div><div class='del'>-	     PARENT_TYPE);</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-titlebar.h b/executive-summary/widgets/e-summary-titlebar.h<br/>deleted file mode 100644<br/>index b754fd9108..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-titlebar.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/e-summary-titlebar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-titlebar.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_TITLEBAR_H__</div><div class='del'>-#define _E_SUMMARY_TITLEBAR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_TITLEBAR_TYPE (e_summary_titlebar_get_type ())</div><div class='del'>-#define E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebar))</div><div class='del'>-#define E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TITLEBAR_TYPE, ESummaryTitlebarClass))</div><div class='del'>-#define IS_E_SUMMARY_TITLEBAR(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_TITLEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TITLEBAR_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummaryTitlebarPrivate ESummaryTitlebarPrivate;</div><div class='del'>-typedef struct _ESummaryTitlebar ESummaryTitlebar;</div><div class='del'>-typedef struct _ESummaryTitlebarClass ESummaryTitlebarClass;</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitlebar {</div><div class='del'>-  GnomeCanvasGroup parent;</div><div class='del'>-</div><div class='del'>-  ESummaryTitlebarPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummaryTitlebarClass {</div><div class='del'>-  GnomeCanvasGroupClass parent_class;</div><div class='del'>-</div><div class='del'>-  void (*close) (ESummaryTitlebar *window);</div><div class='del'>-  void (*shade) (ESummaryTitlebar *window);</div><div class='del'>-  void (*edit) (ESummaryTitlebar *window);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_titlebar_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/widgets/edit.xpm b/executive-summary/widgets/edit.xpm<br/>deleted file mode 100644<br/>index 7f2deb1525..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/edit.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/edit.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * edit_xpm[] = {</div><div class='del'>-"14 14 2 1",</div><div class='del'>-" 	g None",</div><div class='del'>-".	g #000000",</div><div class='del'>-"              ",</div><div class='del'>-"              ",</div><div class='del'>-"     ...      ",</div><div class='del'>-"    .   .     ",</div><div class='del'>-"    .   .     ",</div><div class='del'>-"        .     ",</div><div class='del'>-"        .     ",</div><div class='del'>-"      ..      ",</div><div class='del'>-"      ..      ",</div><div class='del'>-"      ..      ",</div><div class='del'>-"              ",</div><div class='del'>-"      ..      ",</div><div class='del'>-"      ..      ",</div><div class='del'>-"              "};</div><div class='head'>diff --git a/executive-summary/widgets/esummary-window-test.c b/executive-summary/widgets/esummary-window-test.c<br/>deleted file mode 100644<br/>index 7928e8b6f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/esummary-window-test.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/esummary-window-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "e-summary-subwindow.h"</div><div class='del'>-#include "e-summary-titlebar.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void close_test (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-close_test (GtkWidget *widget,</div><div class='del'>-	    gpointer data)</div><div class='del'>-{</div><div class='del'>-  gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc,</div><div class='del'>-      char **argv)</div><div class='del'>-{</div><div class='del'>-  GtkWidget *window, *canvas;</div><div class='del'>-  ESummarySubwindow *subwindow;</div><div class='del'>-  GtkWidget *control;</div><div class='del'>-</div><div class='del'>-  gnome_init ("Executive Summary Subwindow Test", "1.0", argc, argv);</div><div class='del'>-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (window), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC (close_test), NULL);</div><div class='del'>-</div><div class='del'>-  canvas = e_canvas_new ();</div><div class='del'>-</div><div class='del'>-  subwindow = e_summary_subwindow_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (canvas)-&gt;root), 100, 100);</div><div class='del'>-</div><div class='del'>-  control = gtk_button_new_with_label ("A big button");</div><div class='del'>-  gtk_widget_set_usize (control, 400, 200);</div><div class='del'>-</div><div class='del'>-  e_summary_subwindow_add (subwindow, control); </div><div class='del'>-  gtk_widget_show (control);</div><div class='del'>-</div><div class='del'>-  gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0.0, 0.0, 1000.0, 1300.0); </div><div class='del'>-  gtk_container_add (GTK_CONTAINER (window), canvas);</div><div class='del'>-  gtk_widget_show_all (window);</div><div class='del'>-</div><div class='del'>-  gtk_main ();</div><div class='del'>-</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/widgets/shade.xpm b/executive-summary/widgets/shade.xpm<br/>deleted file mode 100644<br/>index 349212e906..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/shade.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/shade.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * shade_xpm[] = {</div><div class='del'>-"14 14 2 1",</div><div class='del'>-" 	g None",</div><div class='del'>-".	g #000000",</div><div class='del'>-"              ",</div><div class='del'>-" ............ ",</div><div class='del'>-" ............ ",</div><div class='del'>-" ............ ",</div><div class='del'>-" ............ ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" .          . ",</div><div class='del'>-" ............ ",</div><div class='del'>-"              "};</div><div class='head'>diff --git a/executive-summary/widgets/x.xpm b/executive-summary/widgets/x.xpm<br/>deleted file mode 100644<br/>index ce9e9f19dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/x.xpm?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>executive-summary/widgets/x.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * x_xpm[] = {</div><div class='del'>-"14 14 2 1",</div><div class='del'>-" 	g None",</div><div class='del'>-".	g #000000",</div><div class='del'>-"              ",</div><div class='del'>-" ..        .. ",</div><div class='del'>-" ...      ... ",</div><div class='del'>-"  ...    ...  ",</div><div class='del'>-"   ...  ...   ",</div><div class='del'>-"    ......    ",</div><div class='del'>-"     ....     ",</div><div class='del'>-"     ....     ",</div><div class='del'>-"    ......    ",</div><div class='del'>-"   ...  ...   ",</div><div class='del'>-"  ...    ...  ",</div><div class='del'>-" ...      ... ",</div><div class='del'>-" ..        .. ",</div><div class='del'>-"              "};</div><div class='head'>diff --git a/filter/.cvsignore b/filter/.cvsignore<br/>deleted file mode 100644<br/>index 7c13af9a14..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-*.la</div><div class='del'>-*.lo</div><div class='del'>-.libs</div><div class='del'>-.deps</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-filter-driver</div><div class='del'>-filter-editor</div><div class='head'>diff --git a/filter/ChangeLog b/filter/ChangeLog<br/>deleted file mode 100644<br/>index 6a4f792b07..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/ChangeLog?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2365 +0,0 @@</div><div class='del'>-2002-05-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-file.c (get_widget): Set the path in the entry widget.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add filter-file.[c,h] to the build.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Add a "Command" filter rule.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Add support for</div><div class='del'>-	type "command" which uses the new FilterFile widget.</div><div class='del'>-</div><div class='del'>-	* filter-file.[c,h]: New filter widgets for choosing files and/or</div><div class='del'>-	command-line's (?). Not yet hooked up or anything, just for future</div><div class='del'>-	use.</div><div class='del'>-</div><div class='del'>-2002-05-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_delete_uri): Changed to return a</div><div class='del'>-	GList *, a list of the names of the rules affected by the delete,</div><div class='del'>-	fixed all implementors.</div><div class='del'>-	(rule_context_rename_uri): Similarly for delete_uri, for</div><div class='del'>-	api consistency.</div><div class='del'>-	(rule_context_free_uri_list): Util function to free the return</div><div class='del'>-	from above.</div><div class='del'>-</div><div class='del'>-	* filter-context.c (filter_delete_uri): Actually implement it, fix</div><div class='del'>-	for #18826, and some related bugs.</div><div class='del'>-</div><div class='del'>-2002-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Get rid of ibex stuff, we no longer use it.</div><div class='del'>-</div><div class='del'>-2002-04-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: The score "is" rule should have a value of "is"</div><div class='del'>-	and not "less-than".</div><div class='del'>-</div><div class='del'>-2002-04-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Fixed a grammer mistake, or so</div><div class='del'>-	according to bug #23376. Whatever.</div><div class='del'>-</div><div class='del'>-2002-04-11  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Fix "Follow Up" searches by generating a</div><div class='del'>-	boolean, rather than a string result (Fixes #23334)</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Ditto</div><div class='del'>-</div><div class='del'>-2002-04-09  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (double_click): This needs to return a gboolean</div><div class='del'>-	(TRUE).</div><div class='del'>-	(rule_edit): Using gnome_dialog_set_parent instead of</div><div class='del'>-	gtk_widget_set_parent_window seems to fix bug #23226.</div><div class='del'>-</div><div class='del'>-2002-04-10  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c (validate): Check that there is a value to</div><div class='del'>-	setup.  Fixes #15470.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added closing ) for "not starts with" subject</div><div class='del'>-	rule.</div><div class='del'>-	Added closing ) for all the other broken rules too ...</div><div class='del'>-</div><div class='del'>-2002-04-04  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c: Remove the #ifndef SHELL part. Use an</div><div class='del'>-	EvolutionFolderSelectorButton. Remove FilterFolder-&gt;name since</div><div class='del'>-	it's no longer needed.</div><div class='del'>-</div><div class='del'>-	* filter-context.c (filter_rename_uri): Update for removal of</div><div class='del'>-	FilterFolder-&gt;name.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_copy_value): Likewise.</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (source_add): Update for</div><div class='del'>-	evolution_shell_client_user_select_folder API change.</div><div class='del'>-</div><div class='del'>-2002-04-01  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_edit): Set 're' as the parent window rather</div><div class='del'>-	than as the parent widget.</div><div class='del'>-	(add_editor_clicked): Only unref the editor if it is non-NULL.</div><div class='del'>-</div><div class='del'>-2002-03-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-source.c (filter_source_get_sources): Free account_name</div><div class='del'>-	so we don't leak. Also after getting the source uri, use camel-url</div><div class='del'>-	to hide unwanted stuff.</div><div class='del'>-	(xml_decode): Use xmlFree on the buffer returned from</div><div class='del'>-	xmlNodeGetContent rather than g_free, as I think they are</div><div class='del'>-	incompatable. Also use camel-url here to hide any params in the</div><div class='del'>-	decoded url (to make things compatable with what older versions</div><div class='del'>-	may have saved).</div><div class='del'>-</div><div class='del'>-2002-03-06  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added beep and play-sound actions.</div><div class='del'>-</div><div class='del'>-2002-02-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (option_activate): Copy values across to new</div><div class='del'>-	part.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (option_activate): copy values across to new part,</div><div class='del'>-	if they are compatible.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_copy_value): New function to</div><div class='del'>-	copy values (where they can be) from one filter element to another.</div><div class='del'>-</div><div class='del'>-	* filter-part.c (filter_part_copy_values): New function to copy</div><div class='del'>-	values of a filter part.  #1359.</div><div class='del'>-</div><div class='del'>-2002-02-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: </div><div class='del'>-	* filtertypes.xml: Re-added contains and</div><div class='del'>-	not-contains. Also added filter/vfolder rules for</div><div class='del'>-	Flag-for-Followup.</div><div class='del'>-</div><div class='del'>-2002-02-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Same here.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: For mlist matching, we only want "is" and "is</div><div class='del'>-	not" because that is all we really support anyway.</div><div class='del'>-</div><div class='del'>-2002-01-27  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Use LIBFILTER_CFLAGS.</div><div class='del'>-</div><div class='del'>-2002-01-26  Mikael Hallendal  &lt;micke@codefactory.se&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (add_editor_clicked): check if re-&gt;edit != NULL</div><div class='del'>-	  before trying to unref it. Fixes a segfault when closing the </div><div class='del'>-	  rule editor.</div><div class='del'>-</div><div class='del'>-2002-01-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c (xml_decode): If we write "" to an xml file, we</div><div class='del'>-	read back NULL.  So if we read back NULL, convert it to "".</div><div class='del'>-	Sigh.  This makes a fix for #7801, although new gui may also be</div><div class='del'>-	required.</div><div class='del'>-</div><div class='del'>-2002-01-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-source.c (filter_source_get_sources): Get the account</div><div class='del'>-	name because that is the string we'd like to use for display.</div><div class='del'>-	(get_widget): Generate the account label the same as we do for the</div><div class='del'>-	composer's From optionmenu.</div><div class='del'>-	(filter_source_finalize): Free the account_name.</div><div class='del'>-	(clone): Pass along the account_name member to filter_add_source</div><div class='del'>-</div><div class='del'>-2002-01-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Make the date comparisons read the same as the</div><div class='del'>-	ones in filtertypes.xml</div><div class='del'>-</div><div class='del'>-2001-12-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Add new action to execute a shell command.</div><div class='del'>-</div><div class='del'>-2001-12-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Add "Needs Reply" option to different status</div><div class='del'>-	types.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Add "Needs Reply" option to different status</div><div class='del'>-	types.</div><div class='del'>-</div><div class='del'>-2001-11-15  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (set_source): Removed U_.  Fixes #15415.</div><div class='del'>-</div><div class='del'>-2001-11-21  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_edit): Hook onto destroy event.</div><div class='del'>-	(edit_editor_destroyed): IF we get destroyed, fake a -1 click</div><div class='del'>-	event to clean up.</div><div class='del'>-	(rule_add): hook onto destroy of dialogue.</div><div class='del'>-	(add_editor_destroyed): Simulate -1 click event to clean up.  Fix</div><div class='del'>-	for #15745.</div><div class='del'>-</div><div class='del'>-2001-11-20  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (source_add): Desensitise button while we're</div><div class='del'>-	running, and if we are destroyed, exit and do nothing when we're</div><div class='del'>-	done.  Fixes crash in #15498.</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Ref 'ff' around dialogue</div><div class='del'>-	showing incase we go away before it returns.  Also desensitise</div><div class='del'>-	button that invoked us while its being processed &amp; remove</div><div class='del'>-	'is_active' hack.  Fixes similar problems to those in #15498.</div><div class='del'>-</div><div class='del'>-2001-11-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (validate): Force the user to name the filter.</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (validate): Force the user to name the vfolder.</div><div class='del'>-</div><div class='del'>-2001-10-29    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c: Some debug printf fixes for printf's that dont</div><div class='del'>-	like null %s's.</div><div class='del'>-	Fixed previous fix.</div><div class='del'>-	(rule_editor_play_undo): Need to ref rule since add doesn't.  This</div><div class='del'>-	doesn't crash anymore but doesn't seem to do everything right either.</div><div class='del'>-</div><div class='del'>-2001-10-28    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-context.c (filter_rename_uri): Implement, change any</div><div class='del'>-	folder uri's that have been renamed, to the new one.</div><div class='del'>-	(filter_delete_uri): Dont actually do any work (yet).</div><div class='del'>-</div><div class='del'>-	We could probably put rename_uri on every rule context/filter</div><div class='del'>-	part/filter element, and let their methods handle it, but for now</div><div class='del'>-	its easy enough just to handle the few cases that we have to</div><div class='del'>-	handle manually.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_delete_uri): Update a filter</div><div class='del'>-	context for a deleted uri, e.g. folder removed.</div><div class='del'>-	(rule_context_rename_uri): Update a filter context for a renamed</div><div class='del'>-	uri, e.g. </div><div class='del'>-</div><div class='del'>-	* filter-folder.c (filter_folder_set_value): New function to set</div><div class='del'>-	the uri of a folder filter.</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_move): Add undo for move.</div><div class='del'>-	(rule_editor_add_undo): Add extra rank item.</div><div class='del'>-	(rule_editor_play_undo): handle rank case.</div><div class='del'>-	(rule_editor_finalise): Clean up any hanging over undo log.</div><div class='del'>-	(editor_clicked): Only enable 'undo' if we have</div><div class='del'>-	EVOLUTION_RULE_UNDO enabled.  Code still a bit flakey.</div><div class='del'>-	(rule_editor_construct): Only enable a cancel button if</div><div class='del'>-	EVOLUTION_RULE_UNDO is set.</div><div class='del'>-	(rule_editor_add_undo): Only add if undo enabled.</div><div class='del'>-	(rule_editor_add_undo): Fix enable undo logic.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_set_name): Emit a changed event if it</div><div class='del'>-	changes.</div><div class='del'>-	(filter_rule_set_source): Same.</div><div class='del'>-</div><div class='del'>-2001-10-26    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_find_rank_rule): Find a rule at a</div><div class='del'>-	specific rank/source.</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (add_editor_clicked): Log the added object.</div><div class='del'>-	(rule_editor_add_undo): New function to add an undo record to the</div><div class='del'>-	rule editor.</div><div class='del'>-	(edit_editor_clicked): Log the changed object.</div><div class='del'>-	(rule_delete): Add undo object.</div><div class='del'>-	(rule_editor_play_undo): Play an undo log back.</div><div class='del'>-</div><div class='del'>-2001-10-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_add): Desensitize the parent dialog.</div><div class='del'>-	(rule_edit): Same.</div><div class='del'>-	(add_editor_clicked): Re-sensitize it.</div><div class='del'>-	(edit_editor_clicked): Same.</div><div class='del'>-</div><div class='del'>-2001-10-25  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c: Keep track of the current editor dialog window so</div><div class='del'>-	that on exit, we can close it too.</div><div class='del'>-	(rule_edit): Don't make the dialog modal and set it's parent</div><div class='del'>-	window as well as don't allow more than a single editor window to</div><div class='del'>-	be popped up.</div><div class='del'>-	(rule_add): Same.</div><div class='del'>-</div><div class='del'>-2001-10-24    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_class_init): Add a changed signal.</div><div class='del'>-	Emits if the order changes or if you add or remove a rule.</div><div class='del'>-	(rule_context_rank_rule): Fix rank rule to properly rank based on</div><div class='del'>-	source, not merely on list position.</div><div class='del'>-	(rule_context_add_rule): Also emit changed signal.</div><div class='del'>-	(rule_context_remove_rule): Same.</div><div class='del'>-	(rule_context_rank_rule): Emit changed signal.</div><div class='del'>-</div><div class='del'>-2001-10-20  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (set_source): Translate the rule names. (Bug</div><div class='del'>-	#13082)</div><div class='del'>-</div><div class='del'>-2001-10-17  Ettore Perazzoli  &lt;ettore@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Pass the toplevel to</div><div class='del'>-	`evolution_shell_client_user_select_folder()'.</div><div class='del'>-	* vfolder-rule.c (source_add): Likewise.</div><div class='del'>-</div><div class='del'>-2001-10-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Kludge to raise the filter</div><div class='del'>-	dialog when the folder-selection window is closed.</div><div class='del'>-</div><div class='del'>-2001-10-15    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c (xml_decode): If we have no node content, dont</div><div class='del'>-	append any value or try to decode it.  Gets rid of a bunch of</div><div class='del'>-	annoying warnings.</div><div class='del'>-</div><div class='del'>-2001-10-04  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (validate): And again here.</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (validate): Same.</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (validate): Take out the "Oops" part of the</div><div class='del'>-	warning.</div><div class='del'>-</div><div class='del'>-2001-10-04    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (save): "safe" save code, first save to .#name,</div><div class='del'>-	then rename to name if it worked, also create backups to name~.</div><div class='del'>-	Means filters/etc wont get reset/lost if disk fills up, although</div><div class='del'>-	relies on libxml failing properly.</div><div class='del'>-	(new_rule_clicked): Removed warning, we do now have changed</div><div class='del'>-	signals!</div><div class='del'>-</div><div class='del'>-2001-09-28    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (vfolder_rule_add_source): Emit changed events</div><div class='del'>-	when we change it.</div><div class='del'>-	(vfolder_rule_remove_source): "</div><div class='del'>-</div><div class='del'>-2001-09-28  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (edit_editor_clicked): Set the item label to the</div><div class='del'>-	new rule name, not the old rule name. Fixes bug #11168.</div><div class='del'>-</div><div class='del'>-2001-09-27    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (xml_decode): Use g_strdup for the uri, not the</div><div class='del'>-	xml memory.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c, filter-message-search.c: Removed, again, how</div><div class='del'>-	did they come back???</div><div class='del'>-</div><div class='del'>-2001-09-13    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (filter_filter_add_action):</div><div class='del'>-	(filter_filter_remove_action):</div><div class='del'>-	(filter_filter_replace_action): Emit changed events.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_xml_decode): Emiot a rule changed</div><div class='del'>-	event.</div><div class='del'>-	(filter_rule_copy): Emit a changed event.</div><div class='del'>-	(filter_rule_replace_part): "</div><div class='del'>-	(filter_rule_add_part): "</div><div class='del'>-	(filter_rule_remove_part): "</div><div class='del'>-	(filter_rule_xml_decode): Freeze around decoding, so we only emit</div><div class='del'>-	changed when done.</div><div class='del'>-	(filter_rule_emit_changed): New function to emit changed events if</div><div class='del'>-	not frozen.</div><div class='del'>-</div><div class='del'>-2001-09-13    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_class_init): Added a 'rule_added'</div><div class='del'>-	and 'rule_removed' signal.</div><div class='del'>-	(rule_context_load): Set a (private) frozen flag while we're</div><div class='del'>-	loading.</div><div class='del'>-	(rule_context_add_rule): Emit a rule_added signal if we're not</div><div class='del'>-	frozen.</div><div class='del'>-	(rule_context_remove_rule): Emit a rule_removed signal if we're</div><div class='del'>-	not frozen.</div><div class='del'>-</div><div class='del'>-2001-09-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_edit): Clone the current rule before editing</div><div class='del'>-	it so that changes can be undone.</div><div class='del'>-	(edit_editor_clicked): If the user hit OK, replace the original</div><div class='del'>-	rule with the new one.</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (vfolder_rule_finalise): Free the sources list.</div><div class='del'>-	(rule_copy): Implemented.</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (rule_copy): Implemented.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_copy): New convenience function to</div><div class='del'>-	copy one rule "into" another.</div><div class='del'>-	(rule_copy): Default implementation.</div><div class='del'>-	(filter_rule_clone): Use filter_rule_copy() internally to get rid</div><div class='del'>-	of the nastiness/slowness of xml encoding and then decoding.</div><div class='del'>-</div><div class='del'>-2001-09-12    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Remove the match-all from the not</div><div class='del'>-	body-contains, so we can use the new vector not function.</div><div class='del'>-</div><div class='del'>-2001-09-10    &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-score.c (format_sexp): Encode the score as an integer</div><div class='del'>-	string, not as a string of integers.  #5098.</div><div class='del'>-</div><div class='del'>-2001-09-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (button_clicked): Allow the dialog's title to</div><div class='del'>-	be translated.</div><div class='del'>-</div><div class='del'>-2001-08-19  Chris Toshok  &lt;toshok@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c: #include &lt;sys/types.h&gt; for regex_t on freebsd.</div><div class='del'>-</div><div class='del'>-2001-08-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter.glade: Added key accelerators.</div><div class='del'>-</div><div class='del'>-2001-08-14  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (xml_decode): Match either "title" or "_title" to</div><div class='del'>-	allow for translations of the title (provided in the default</div><div class='del'>-	files)</div><div class='del'>-</div><div class='del'>-2001-08-13  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (make_span_editor): Add a gettext around our static</div><div class='del'>-	strings.</div><div class='del'>-	(format_time): New function. Convert a time_t to a gchar * (with i18n)</div><div class='del'>-	(describe_button): Use format_time instead of ctime.</div><div class='del'>-</div><div class='del'>-2001-08-10  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_add_rule_gui): Make this compile again.</div><div class='del'>-</div><div class='del'>-2001-08-10  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_add_rule_gui): No need to</div><div class='del'>-	gtk_widget_show() the gnome dialog widget twice...</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (get_widget): Unref the glade_xml gui object</div><div class='del'>-	before returning.</div><div class='del'>-</div><div class='del'>-2001-08-08  Radek Doulik  &lt;rodo@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): don't mix g_free and xmlAlloc</div><div class='del'>-	(xml_decode): don't mix g_free and xmlAlloc</div><div class='del'>-</div><div class='del'>-	* filter-code.c (filter_code_init): use xmlStrdup instead of</div><div class='del'>-	g_strdup</div><div class='del'>-</div><div class='del'>-	* filter-input.c (filter_input_new_type_name): use xmlStrdup</div><div class='del'>-	instead of g_strdup</div><div class='del'>-	(filter_input_finalise): don't mix g_free and xmlAlloc</div><div class='del'>-</div><div class='del'>-	* filter-option.c (clone): use xmlStrdup instead of g_strdup</div><div class='del'>-	(free_option): don't mix g_free and xmlAlloc</div><div class='del'>-</div><div class='del'>-	* filter-source.c (clone): use xmlStrdup rather than g_strdup</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_finalise): don't mix g_free and</div><div class='del'>-	xmlAlloc</div><div class='del'>-</div><div class='del'>-2001-08-07  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_finalise): Properly free the list of</div><div class='del'>-	parts, and the private data.</div><div class='del'>-	(FilterRulePrivate): Remove unused 'parts' member.</div><div class='del'>-</div><div class='del'>-	* filter-option.c (free_option): For freeing options.</div><div class='del'>-	(filter_option_finalise): Free options list.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_finalise): free name.</div><div class='del'>-</div><div class='del'>-	* filter-input.c (filter_input_finalise): Free type and values</div><div class='del'>-	list.</div><div class='del'>-</div><div class='del'>-	* filter-context.c (filter_context_finalise): Free the actions.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_finalise): Remove the totally weird</div><div class='del'>-	arsed *_set_list free code.</div><div class='del'>-	(free_part_set): </div><div class='del'>-	(free_rule_set): Use this to free stuff using g_list_foreach.</div><div class='del'>-	(rule_context_finalise): Free the error string.</div><div class='del'>-	(rule_context_finalise): Free the rules and parts.</div><div class='del'>-</div><div class='del'>-2001-08-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Reverted my previous change, I fixed the filter</div><div class='del'>-	code to handle this the way danw said to handle it in bug #5886</div><div class='del'>-	now.</div><div class='del'>-</div><div class='del'>-2001-08-07  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Removed the "is" and "is not" rules from the</div><div class='del'>-	xml file for address matching because users are easily confused.</div><div class='del'>-</div><div class='del'>-2001-08-03  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Do an evil kludgy hack so that the</div><div class='del'>-	Rule Name entry widget gets focused when the filter editor is</div><div class='del'>-	shown.</div><div class='del'>-</div><div class='del'>-2001-08-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c: Wrap some debug printf's with d().</div><div class='del'>-</div><div class='del'>-	* rule-context.h: Removed prototype for rule_context_delete_rule()</div><div class='del'>-	since the function doesn't exist.</div><div class='del'>-</div><div class='del'>-2001-07-23  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (validate): Added a validate function</div><div class='del'>-	that checks to make sure that vfolders that have "specific</div><div class='del'>-	folders" as their source actually have a non-empty list of</div><div class='del'>-	source folders selected.  (Bug #4937)</div><div class='del'>-	(get_widget): If fr-&gt;source is NULL for some reason, bring</div><div class='del'>-	it into sync with the default in the option menu.</div><div class='del'>-</div><div class='del'>-2001-07-23  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (make_span_editor): Change the butt-ugly</div><div class='del'>-	UI to a saner (and just as flexible) one. Instead of all those</div><div class='del'>-	spinbuttons, just have one and let the user select the time unit.</div><div class='del'>-	(omenu_item_activated): New function. When the user changes the</div><div class='del'>-	time unit, convert it from the old number. Pretty.</div><div class='del'>-	(adj_value_changed): This function is now simpler.</div><div class='del'>-	(set_adjustments): Also modified for new UI model.</div><div class='del'>-	(button_clicked): Set the selected_type before calling the callback.</div><div class='del'>-	(FilterDatespecPrivate): Members change a bit.</div><div class='del'>-	(filter_datespec_init): No longer need to allocation spinbuttons</div><div class='del'>-	(filter_datespec_finalise): No longer need to free spinbuttons.</div><div class='del'>-</div><div class='del'>-2001-07-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Removed the "Forward To" filter action.</div><div class='del'>-</div><div class='del'>-2001-07-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_get_rank_rule): Return -1 if we</div><div class='del'>-	don't find it? This is what most of the code expected but not what</div><div class='del'>-	we were returning on fail.</div><div class='del'>-</div><div class='del'>-2001-07-12  Zbigniew Chyla  &lt;cyba@gnome.pl&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (stringify_agoness): Marked string for translation.</div><div class='del'>-</div><div class='del'>-2001-07-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Users should not be able to filter on "Status</div><div class='del'>-	is Deleted" since we don't allow that in the filter driver code.</div><div class='del'>-</div><div class='del'>-2001-07-11  Jason Leach  &lt;jleach@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Copied the "Attachments" rule part over from</div><div class='del'>-	filtertypes.xml, would be a powerful feature for vfolders (see all</div><div class='del'>-	the patches across all folders, or all the attachments you've sent,</div><div class='del'>-	without having to duplicate potentially big files, blah blah, bug</div><div class='del'>-	#1155).</div><div class='del'>-</div><div class='del'>-2001-07-10  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Put a match-all around the not-body-contains</div><div class='del'>-	to make it work per-message.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Same.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Set the focus on the title of the</div><div class='del'>-	filter rule.</div><div class='del'>-</div><div class='del'>-2001-07-09  Anna Marie Dirks  &lt;anna@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_add_rule_gui): Increased the size</div><div class='del'>-	of the "Add Filter Rule" dialog to 600 x 400, so that no resizing</div><div class='del'>-	is necessary to use the dialog.</div><div class='del'>-</div><div class='del'>-2001-07-09  Jon Trowbridge  &lt;trow@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-source.c (filter_source_get_sources): Bonobo-conf-ified.</div><div class='del'>-	Removed /home/trow hard-wiring. :)</div><div class='del'>-	(xml_encode): Encode things properly.</div><div class='del'>-	(xml_decode): Decode things properly.</div><div class='del'>-	(get_widget): Ignore accounts w/o source URLs.</div><div class='del'>-	(clone): Set the -&gt;name in our copy.</div><div class='del'>-</div><div class='del'>-2001-07-05  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_delete): Select the most appropriate filter</div><div class='del'>-	rule.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Fix bug #4043: s/colour/color</div><div class='del'>-</div><div class='del'>-2001-07-03  Peter Williams  &lt;peterw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-source.c (get_widget): Prevent crashing while we work</div><div class='del'>-	this out.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Don't try to gtk_widget_grab_default</div><div class='del'>-	with a widget that can't be the default. Altough it should be able</div><div class='del'>-	to....</div><div class='del'>-</div><div class='del'>-2001-07-02  Sam Creasey &lt;sammy@oh.verio.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-int.c: Added an integer type for filtering values.  used</div><div class='del'>-	for size.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SOURCES): added filter-int.c, filter-int.h</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: added a part entry for size based filters</div><div class='del'>-	</div><div class='del'>-2001-07-02  Anna Marie Dirks &lt;anna@ximian.com&gt; </div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Changed "Add criterion" button to</div><div class='del'>-	have normal button relief in response to complaints of it not</div><div class='del'>-	appearing clickable.</div><div class='del'>-</div><div class='del'>-	* filter-filter.c: Changed "Add action" button to have normal</div><div class='del'>-	button relief in response to complaints of it not appearing</div><div class='del'>-	clickable.</div><div class='del'>-</div><div class='del'>-2001-06-29  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_editor_construct): Set the filter-rule</div><div class='del'>-	dialog to be user-resizable.</div><div class='del'>-</div><div class='del'>-2001-06-27  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Make "Move" the default action.</div><div class='del'>-</div><div class='del'>-2001-05-08  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c: Deleted Gediminas patch.</div><div class='del'>-</div><div class='del'>-2001-05-08  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (xml_decode): allow "_title" in user</div><div class='del'>-	rules. translate them and encode to utf8.</div><div class='del'>-	(get_rule_part_widget): do not call gettext on part-&gt;title. It is</div><div class='del'>-	always translated already.</div><div class='del'>-</div><div class='del'>-2001-04-26  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_edit): Set the default size of the dialog to</div><div class='del'>-	600x400, which seems to be a nice size that fits all the widgets</div><div class='del'>-	into it.</div><div class='del'>-	(rule_add): Same.</div><div class='del'>-</div><div class='del'>-2001-04-26  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS</div><div class='del'>-</div><div class='del'>-2001-04-26  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-part.c (filter_part_xml_create): Blah blah fix for xml1</div><div class='del'>-	broken utf8 encoding, and use "g" memory for all allocations.</div><div class='del'>-	(filter_part_finalise): Free our data properly.</div><div class='del'>-</div><div class='del'>-2001-04-20  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c: Pull up fix for translation of filter</div><div class='del'>-	direction drop down menu from the branch.</div><div class='del'>-	</div><div class='del'>-2001-04-18  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-colour.c, filter-datespec.c, filter-folder.c,</div><div class='del'>-	filter-input.c, filter-option.c, filter-rule.c, filter-score.c,</div><div class='del'>-	filter-source.c, score-rule.c (xml_decode): Plug memory leaks.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_finalise): Implement. Free stuff.</div><div class='del'>-</div><div class='del'>-	* filter-element.h: #include &lt;gnome-xml/xmlmemory.h&gt; here for xmlFree</div><div class='del'>-</div><div class='del'>-	* filter-filter.c, filter-part.c: Remove xmlmemory.h #include</div><div class='del'>-</div><div class='del'>-2001-04-15  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: s/Is/is/ and s/Is Not/is not/ to be more</div><div class='del'>-	consistant with the rest.</div><div class='del'>-</div><div class='del'>-2001-04-13  Jon Trowbridge  &lt;trow@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Add XML specs for source account filtering.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Recognize</div><div class='del'>-	type "source", construct a FilterSource.</div><div class='del'>-</div><div class='del'>-	* filter-source.c: Added.  A FilterElement for the account e-mail</div><div class='del'>-	comes from.</div><div class='del'>-</div><div class='del'>-2001-04-04  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: Fix headers.</div><div class='del'>-	* filter-filter.c: Same here.</div><div class='del'>-	* filter-option.c: Same here.</div><div class='del'>-	* filter-part.c: Same here.</div><div class='del'>-	* filter-rule.c: Same here.</div><div class='del'>-	* rule-editor.c: Same here.</div><div class='del'>-	* score-editor.c: Same here.</div><div class='del'>-	* vfolder-editor.c: Same here.</div><div class='del'>-	* vfolder-rule.c: Same here.</div><div class='del'>-	</div><div class='del'>-2001-04-02  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (option_activate): Set the newpart on the</div><div class='del'>-	container object.</div><div class='del'>-	(less_parts): Remove the rule tht the user wants to remove.</div><div class='del'>-	(attach_rule): Attach a new rule and it's remove button to the end</div><div class='del'>-	of the table.</div><div class='del'>-	(more_parts): Fix to resize the table and such.</div><div class='del'>-	(get_widget): Don't have a remove action button, we are putting</div><div class='del'>-	this next to the rule part now.</div><div class='del'>-	</div><div class='del'>-2001-03-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* *.*: Fix headers. Remove unneccesary ones and replace</div><div class='del'>-	with more finegrained ones where needed.</div><div class='del'>-	</div><div class='del'>-2001-03-22  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (validate): Oops, an unspecified date is '0',</div><div class='del'>-	not -1.</div><div class='del'>-</div><div class='del'>-2001-03-21  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (new_rule_clicked): Validate the rule before</div><div class='del'>-	closing.</div><div class='del'>-</div><div class='del'>-2001-03-20  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-editor.c (rule_edit): Set the editor dialog modal rather</div><div class='del'>-	than setting the filter dialog insensitive. Also ref re-&gt;edit</div><div class='del'>-	since we unref it when the editor closes. This should fix bug</div><div class='del'>-	#1905.</div><div class='del'>-	(edit_editor_clicked): No need to set the filter dialog sensitive</div><div class='del'>-	again.</div><div class='del'>-	(rule_add): Set the add-rule dialog modal and don't set the filter</div><div class='del'>-	dialog insensitive.</div><div class='del'>-	(add_editor_clicked): No need to set the filter dialog sensitive</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2001-03-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-option.c (build_code): Since we are now using</div><div class='del'>-	filter-option widgets in place of system-flag, we do not need a</div><div class='del'>-	"code" part so if there isn't a code part, don't build it.</div><div class='del'>-	(clone): Updated to allow NULL code parts.</div><div class='del'>-</div><div class='del'>-2001-03-17  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): If the filter</div><div class='del'>-	type is a "system-flag", use the optionlist type as type</div><div class='del'>-	system-flag has been removed. This should allow backward</div><div class='del'>-	compatability.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (filter_editor_construct): Remove the menu that</div><div class='del'>-	is in the glade file because we want to replace it with our menu,</div><div class='del'>-	not append items to that menu.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Oops, missed the system-flag action-set.</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Update "status" ruleset.</div><div class='del'>-</div><div class='del'>-2001-03-16  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed filter-url.[c,h] and</div><div class='del'>-	filter-system-flag.[c,h]</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Removed</div><div class='del'>-	references to the url-type and system-flag types.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Removed "source" type and fixed "status" to use</div><div class='del'>-	the optionmenu.</div><div class='del'>-</div><div class='del'>-	* filter-url.[c,h]: Removed.</div><div class='del'>-</div><div class='del'>-	* filter-system-flag.[c,h]: Removed (just use optionmenu).</div><div class='del'>-</div><div class='del'>-2001-03-15  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter.glade: Changed the edit_filter to be a standalone window</div><div class='del'>-	rather than a widget, so we can get the rule editor part out</div><div class='del'>-	separately.  Same for vfolder editor, and new score, and basic rule</div><div class='del'>-	editors.</div><div class='del'>-</div><div class='del'>-	* score-editor.c (score_editor_new): Turned back on object</div><div class='del'>-	stuff, subclass rule-editor, and removed most of the code.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (filter_editor_new): Turned into an object,</div><div class='del'>-	subclass rule-editor, removed most of the code.  Now we accept the</div><div class='del'>-	source list during create, and plug that into the glade.</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (vfolder_editor_new): Turned back on object</div><div class='del'>-	stuff, subclass rule-editor, and removed most of the code.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libfilter_la_SOURCES): Added rule-editor.[ch].</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (validate): inherit the validate function and</div><div class='del'>-	also validate the actions part of a filterfilter.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_validate): New method so that filter</div><div class='del'>-	rules can validate themselves.</div><div class='del'>-	(validate): Default implementation, validates base rules.</div><div class='del'>-</div><div class='del'>-	* rule-editor.h: New generic rule editor, to be used for filter</div><div class='del'>-	editor/vfolder editor/score editor/saved searches editor.</div><div class='del'>-</div><div class='del'>-2001-03-15  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* filter-system-flag.c: translate status flag title.</div><div class='del'>-</div><div class='del'>-2001-03-12  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added an "Attachments" filter option where you</div><div class='del'>-	can filter messages that have (or do not have) attachments. This</div><div class='del'>-	does not allow you to filter based on the types of the</div><div class='del'>-	attachments.</div><div class='del'>-</div><div class='del'>-2001-03-08  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (double_click): Make sure we have something</div><div class='del'>-	selected first ;-)</div><div class='del'>-	</div><div class='del'>-	* filter-editor.c (double_click): And here too.</div><div class='del'>-</div><div class='del'>-2001-03-03  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter.glade: Added option menu to vfolder editor.</div><div class='del'>-</div><div class='del'>-2001-03-02  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c (get_widget): Setup the data on the base source</div><div class='del'>-	opiton menu, and make hte option menu reflect the source.</div><div class='del'>-	(select_source_with): Set the source type for this</div><div class='del'>-	rule. e.g. these folders, "with ..."</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: Removed the N_() stuff from the source_names</div><div class='del'>-	array, they must not be internationalised!!!</div><div class='del'>-</div><div class='del'>-2001-02-28  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_clone): New function to clone rules.</div><div class='del'>-</div><div class='del'>-2001-02-23  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added mailing list matching rules.</div><div class='del'>-	renamed mailing list options to be more meaningful.</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Added mailing list rules.</div><div class='del'>-	renamed mailing list options to be more meaningful.</div><div class='del'>-</div><div class='del'>-2001-02-11  Gediminas Paulauskas &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* filter.glade.h: removed.</div><div class='del'>-	* filter.glade: do not donnt output to above one.</div><div class='del'>-	* Makefile.am: do not include filter.glade.h in EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2001-02-06  Dan Winship  &lt;danw@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-option.c (get_widget): Translate the option title.</div><div class='del'>-	(Noticed by Kjartan).</div><div class='del'>-</div><div class='del'>-2001-02-05  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* filter-code.c, filter-colour.c, filter-context.c,</div><div class='del'>-	filter-element.c, filter-input.c, filter-score.c,</div><div class='del'>-	filter-system-flag.c, filter-url.c: Add #include &lt;config.h&gt;</div><div class='del'>-	and mark some strings for translation.</div><div class='del'>-	</div><div class='del'>-2001-01-22  Not Zed  &lt;NotZed@Ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.[ch]: Removed, now lives in</div><div class='del'>-	camel-filter-search.*</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libfilter_la_SOURCES): Removed filter-driver.[ch]</div><div class='del'>-	and filter-message-search.[ch].</div><div class='del'>-</div><div class='del'>-	* filter-driver.[ch]: Removed.  now lives in camel-filter-driver.*</div><div class='del'>-</div><div class='del'>-2001-01-19  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Set the delete</div><div class='del'>-	bit *before* copying to the default folder.</div><div class='del'>-</div><div class='del'>-2001-01-18  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (less_parts): Er, don't set the button</div><div class='del'>-	insensitive if there is *1* action, set it insensitive if there</div><div class='del'>-	are less than or equal to *1* actions. Doh!</div><div class='del'>-	(more_parts): Only set the remove button sensitive if there is</div><div class='del'>-	more than 1 action.</div><div class='del'>-	(get_widget): Here too.</div><div class='del'>-</div><div class='del'>-2001-01-16  Jason Leach  &lt;jasonleach@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* e-search-bar.[ch]: Moved ESearchBar to $(toplevel)/widgets/misc,</div><div class='del'>-	a more appropriate home.  Bug #1060.</div><div class='del'>-</div><div class='del'>-2001-01-13  Jeffrey Stedfast  &lt;fejj@ximian.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_copy): Moved p-&gt;copied to the inner part of</div><div class='del'>-	the loop so that in the case of a folder not existing, it doesn't</div><div class='del'>-	think that the message was already copied to some place and thus</div><div class='del'>-	not save it to the Inbox.</div><div class='del'>-	(do_move): Same.</div><div class='del'>-</div><div class='del'>-2001-01-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Changed Priority to Score.</div><div class='del'>-</div><div class='del'>-	* filter-option.c (get_widget): Attach to the "activate" signal -</div><div class='del'>-	this should now make it so that a filter-option will "remember"</div><div class='del'>-	what a user changed.</div><div class='del'>-</div><div class='del'>-	* filter-system-flag.c (get_widget): Don't reset fsf-&gt;value to the</div><div class='del'>-	first system flag, this should already be defaulted to the</div><div class='del'>-	appropriate flag. This should fix the problem of always defaulting</div><div class='del'>-	to the first menu option and thus "forgetting" the user's settings.</div><div class='del'>-</div><div class='del'>-2001-01-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-system-flag.c: comment out some of the system flags as we</div><div class='del'>-	don't want to use them.</div><div class='del'>-	(xml_encode): Update the printf</div><div class='del'>-	(get_widget): Use strcmp instead of g_strcasecmp.</div><div class='del'>-</div><div class='del'>-2001-01-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c (xml_encode): Encode utf8</div><div class='del'>-	(xml_decode): Decode utf8</div><div class='del'>-</div><div class='del'>-	* filter-option.c (xml_create): Decode utf8</div><div class='del'>-</div><div class='del'>-	* filter-part.c (filter_part_xml_create): Decode utf8</div><div class='del'>-</div><div class='del'>-	* filter_rule.c (xml_encode): Encode utf8</div><div class='del'>-	(xml_decode): Decode utf8</div><div class='del'>-	</div><div class='del'>-2001-01-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_flag): Set the 'dirty' flag - this should</div><div class='del'>-	fix the problem of flags not being set (or, more precisely,</div><div class='del'>-	synced).</div><div class='del'>-	(filter_driver_filter_message): Here too.</div><div class='del'>-</div><div class='del'>-2000-12-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_contains): Use</div><div class='del'>-	e_utf8_strstrcase() instead of just strstr().</div><div class='del'>-	(header_starts_with): Make sure that the header contents are</div><div class='del'>-	longer than the starts-with string.</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Don't send \"Subject\" to body-contains.</div><div class='del'>-	Also added matches, starts-with, and ends-with xml stuff.</div><div class='del'>-</div><div class='del'>-2000-12-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (handle_multipart, body_contains,</div><div class='del'>-	body_regex): Use CamelContentType rather than GMimeContentField.</div><div class='del'>-</div><div class='del'>-2000-12-24  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Merge from camel-mt-branch.</div><div class='del'>-</div><div class='del'>-2000-12-21  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (filter_message_search): And here too.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_finalise): Kind of revert an</div><div class='del'>-	accidentally commited patch for e_sexp_unref.</div><div class='del'>-</div><div class='del'>-2000-12-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Oops, slight</div><div class='del'>-	logic error. We want to copy the message to the default folder if</div><div class='del'>-	the message hasn't been Moved (which is the same as Copied &amp;&amp;</div><div class='del'>-	Deleted). This fixes bug #1007.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (more_parts): Make sure we have more than 1 part</div><div class='del'>-	before we sensitize the "remove" button.</div><div class='del'>-</div><div class='del'>-2000-12-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (filter_message_search): Oops, missed a</div><div class='del'>-	gtk unref of the now-no-longer gtk e_sexp.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Remove mail_tool_lock stuff.</div><div class='del'>-	(filter_driver_finalise): unref e_sexp properly.</div><div class='del'>-</div><div class='del'>-2000-12-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-search-bar.c (esb_pack_menubar): Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-12-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Added a kludge, 'is_active'</div><div class='del'>-	which is a static variable that holds whether or not there is an</div><div class='del'>-	active shell folder dialog up or not.</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (rule_delete): Autoselect the rule that ends up</div><div class='del'>-	in the same position (or the one above it if the list is shorter</div><div class='del'>-	than the position).</div><div class='del'>-</div><div class='del'>-2000-12-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Don't highlight the title if it's</div><div class='del'>-	"Untitled" because switching widget focus doesn't cause this</div><div class='del'>-	selection to go away.</div><div class='del'>-</div><div class='del'>-2000-12-06  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: Mark some strings for translation.</div><div class='del'>-	</div><div class='del'>-2000-12-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Added support</div><div class='del'>-	for the system-flag type.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added filter-system-flag.[c,h].</div><div class='del'>-</div><div class='del'>-	* filter-system-flag.[c,h]: New type for system flags.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Oops, looks like we were still using integers</div><div class='del'>-	as arguments to set-flag. Change over to using strings which are</div><div class='del'>-	safer and also change the name to set-system-flag.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_flag): Use strings instead of integers.</div><div class='del'>-	Instead of set-flag, the callback is now set-system-flag for less</div><div class='del'>-	confusion. Sorry Ettore, but you'll have to change your filters.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added system-flags stuff.</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: And here too.</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (system_flag): New ESExp callback for</div><div class='del'>-	filtering on system flags.</div><div class='del'>-</div><div class='del'>-2000-11-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Use</div><div class='del'>-	camel_message_info_free() instead of freeing everything by hand -</div><div class='del'>-	is this a new function? I don't ever recall seeing this</div><div class='del'>-	before. Also use my new function,</div><div class='del'>-	camel_message_info_new_from_header - ahhh... this code is now so</div><div class='del'>-	beatiful. Okay, I'm done.</div><div class='del'>-</div><div class='del'>-2000-11-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Update to use</div><div class='del'>-	EStrv in appropriate places (wrapped with #ifdef DOESTRV for the</div><div class='del'>-	moment).</div><div class='del'>-</div><div class='del'>-2000-11-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Moved the regex filter rule around - we've</div><div class='del'>-	changed the format a bit.</div><div class='del'>-</div><div class='del'>-	* filter-option.c (option_activate): Removed.</div><div class='del'>-	(get_widget): Don't connect the activate signal.</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (validate): Updated.</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (validate): Updated.</div><div class='del'>-</div><div class='del'>-	* filter-part.c (filter_part_validate): Updated.</div><div class='del'>-</div><div class='del'>-	* filter-input.c (validate): Check the filter-input type - if it's</div><div class='del'>-	of type "regex", then check for regex validity.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_validate): No longer takes a</div><div class='del'>-	gpointer argument.</div><div class='del'>-	(filter_element_new_type_name): Allow type "regex" and create a</div><div class='del'>-	new filter-input with type "regex".</div><div class='del'>-</div><div class='del'>-2000-11-24  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (get_full_header): impl.</div><div class='del'>-	(header_full_regex): use it.</div><div class='del'>-</div><div class='del'>-2000-11-23  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_full_regex): impl.</div><div class='del'>-</div><div class='del'>-2000-11-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* filter-message-search.c: took out some no longer needed</div><div class='del'>-	printfs.</div><div class='del'>-</div><div class='del'>-2000-11-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_folder): Sync here</div><div class='del'>-	instead.</div><div class='del'>-	(filter_driver_filter_mbox): And here too.</div><div class='del'>-	(filter_driver_finalise): Don't sync here afterall - it's more</div><div class='del'>-	preferable to sync right after processing.</div><div class='del'>-</div><div class='del'>-2000-11-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_finalise): Sync the</div><div class='del'>-	defaultfolder.</div><div class='del'>-	(filter_driver_filter_folder): Sync here instead.</div><div class='del'>-	(filter_driver_filter_mbox): And here too.</div><div class='del'>-</div><div class='del'>-2000-11-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_matches): Neglect any leading</div><div class='del'>-	whitespace in the header contents.</div><div class='del'>-	(header_starts_with): Same.</div><div class='del'>-	(header_ends_with): Same.</div><div class='del'>-	(header_soundex): Same.</div><div class='del'>-</div><div class='del'>-2000-11-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): If there is a</div><div class='del'>-	default folder and the message hasn't been deleted then... should</div><div class='del'>-	be: If there is a default folder and the message hasn't been</div><div class='del'>-	copied to another folder and the message hasn't been deleted...</div><div class='del'>-	(filter_driver_filter_message): Make it so that the FILTER_LOG_END</div><div class='del'>-	is only called if filtered were applied to the message so we don't</div><div class='del'>-	get huge gaps of whitespace in the log file.</div><div class='del'>-	(filter_driver_filter_message): </div><div class='del'>-</div><div class='del'>-2000-11-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-search-bar.c: Made the underline show up properly in the main</div><div class='del'>-	menu bar.</div><div class='del'>-</div><div class='del'>-2000-11-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-search-bar.c: Switched from using gtk_menu_item_new_with_label</div><div class='del'>-	for the menu header to using gnome_stock_menu_item.</div><div class='del'>-</div><div class='del'>-2000-11-08  Anna Marie Dirks  &lt;anna@helixcode.com&gt;</div><div class='del'>-	* e-search-bar.c: Fixed two spacing problems: first, changed</div><div class='del'>-	the spacing around the end of the text-entry widget so that </div><div class='del'>-	the text entry is always aligned with the beginning of the scrollbar;</div><div class='del'>-	second, trimmed down the space between the widgets in the search bar.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-11-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_flag): you shouldn't use an integer to</div><div class='del'>-	set the flag.  You should use a string, and look it up, because</div><div class='del'>-	the flag bits might change.</div><div class='del'>-	(filter_driver_filter_message): Can som e one PLEASE STOP</div><div class='del'>-	INDENTING THE CODE.  Even if i have to come over the and</div><div class='del'>-	beat it into you.  YOU DONT INDENT CODE ONCE ITS BEEN CHECKED IN</div><div class='del'>-	TO CVS, otherwise you SCREW UP THE DIFF's.  Can't you please</div><div class='del'>-	please learn this?</div><div class='del'>-	(filter_driver_log): Fixes for api changes to mime_message.</div><div class='del'>-</div><div class='del'>-2000-11-05  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (get_sent_date): Fix for date change</div><div class='del'>-	api.  No longer need to encode/decode the date, after its been</div><div class='del'>-	encoded/ecoded already.</div><div class='del'>-	(get_received_date): Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-search-bar.h: Fixed the argument comment.  Removed an old enum</div><div class='del'>-	that's not used here.</div><div class='del'>-</div><div class='del'>-2000-11-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-search-bar.c and e-search-bar.h.</div><div class='del'>-</div><div class='del'>-	* e-search-bar.c, e-search-bar.h: Moved this from</div><div class='del'>-	e-addressbook-search.</div><div class='del'>-</div><div class='del'>-2000-11-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_log): Fix for when 'desc' is</div><div class='del'>-	NULL.</div><div class='del'>-	(filter_driver_filter_message): Use a more user-friendly filter</div><div class='del'>-	name in the log file.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Use</div><div class='del'>-	filter_driver_log() where appropriate.</div><div class='del'>-	(do_copy): Use the service url for the path rather than the</div><div class='del'>-	folder-&gt;full_name because that'll only get you a "/mbox" which is</div><div class='del'>-	entirely useless. Replace occurences of report_status with</div><div class='del'>-	filter_driver_log.</div><div class='del'>-	(do_move): Same.</div><div class='del'>-	(report_status): Don't use this for logging anymore, use only for</div><div class='del'>-	reporting the status back to the caller.</div><div class='del'>-	(filter_driver_log): Renamed from filter_driver_status_log. Now</div><div class='del'>-	ONLY handles file logging and is for INTERNAL USE ONLY.</div><div class='del'>-	(do_flag): Replace occurences of report_status with</div><div class='del'>-	filter_driver_log.</div><div class='del'>-	(do_score): Same.</div><div class='del'>-	(do_colour): Same.</div><div class='del'>-	(do_stop): Same.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (validate): Check to make sure the user has</div><div class='del'>-	entered a valid date.</div><div class='del'>-</div><div class='del'>-2000-10-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Updated to allow the user to select "sounds</div><div class='del'>-	like" or "does not sound like" (uses header-soundex).</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_matches): Oops. Should be using</div><div class='del'>-	!g_strncasecmp. This should fix it so this filter match works</div><div class='del'>-	right.</div><div class='del'>-	(header_starts_with): Same.</div><div class='del'>-	(header_ends_with): Same.</div><div class='del'>-	(header_soundex): New filter callback for soundex matching (yes,</div><div class='del'>-	it's probably a bloated feature but hey, it was fun to code)</div><div class='del'>-</div><div class='del'>-2000-10-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* filter-folder.c (validate): Override the default validate</div><div class='del'>-	function to only return TRUE if a folder has been selected.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (rule_add): Validate that all the rule parts and</div><div class='del'>-	action parts are correctly filled in.</div><div class='del'>-	(rule_edit): Same.</div><div class='del'>-</div><div class='del'>-2000-10-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Updated to add an action to set message flags.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_flag): New callback to set message info</div><div class='del'>-	flags.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_set_data): New convenience</div><div class='del'>-	function to set the data on a FilterElement.</div><div class='del'>-</div><div class='del'>-	* filter-url.c (get_widget): Set the sources list to point to the</div><div class='del'>-	FilterElement data.</div><div class='del'>-</div><div class='del'>-2000-10-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Do not pad around the Name hbox;</div><div class='del'>-	its parent already has spacing.  </div><div class='del'>-	Do not pad around the inframe's children; the inframe already has</div><div class='del'>-	spacing.</div><div class='del'>-</div><div class='del'>-2000-10-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-option.c (option_activate): If a regex option is</div><div class='del'>-	selected, change the FilterElement data to TRUE else set to FALSE.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (more_parts): Validate the previously entered</div><div class='del'>-	FilterPart before allowing the user to add a new FilterPart.</div><div class='del'>-</div><div class='del'>-	* filter-part.c (filter_part_validate): New convenience function</div><div class='del'>-	to validate an entire FilterPart expression.</div><div class='del'>-</div><div class='del'>-	* filter-input.c (validate): Validate the entry text if it</div><div class='del'>-	contains a regular expression.</div><div class='del'>-</div><div class='del'>-	* filter-element.[c,h]: New virtual function to validate the</div><div class='del'>-	contents of the FilterElement (useful for regex and sexp).</div><div class='del'>-	(filter_element_validate): You get the idea...	</div><div class='del'>-</div><div class='del'>-2000-10-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* filter-input.c: </div><div class='del'>-	* filter-option.c: </div><div class='del'>-	* filter-part.c: Pure formatting changes, no actual code</div><div class='del'>-	changes. Since I know I'm going to get flamed for this, I'm sorry</div><div class='del'>-	but I'll probably have to modify code in these files and it's</div><div class='del'>-	easier if the code is quickly readable by me.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Set the "remove" button insensitive</div><div class='del'>-	for &lt;= 1 instead of == 1.</div><div class='del'>-</div><div class='del'>-2000-10-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_message): Copy the message</div><div class='del'>-	to the default folder if it wasn't marked as deleted.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added header-starts-with, header-ends-with, and</div><div class='del'>-	header-exists menu items.</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_starts_with): New callback to</div><div class='del'>-	match the beginnings of headers.</div><div class='del'>-	(header_ends_with): New callback to match the ends of headers.</div><div class='del'>-	(header_exists): New callback to determine if a header exists</div><div class='del'>-	which is useful when filtering out all those pesky bug-buddy</div><div class='del'>-	emails!</div><div class='del'>-</div><div class='del'>-2000-10-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Add header-matches expressions ("is" / "is not").</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (header_matches): New callback to match</div><div class='del'>-	headers exactly (aka strcmp rather than strstr).</div><div class='del'>-</div><div class='del'>-2000-10-27  Jacob "Ulysses" Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_mbox): divide before</div><div class='del'>-	multiple so that we don't overflow.</div><div class='del'>-</div><div class='del'>-2000-10-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Fixed this to include EXTRA_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_move): Don't mark as deleted here, otherwise</div><div class='del'>-	the message will have the DELETED flag set in the folder it's</div><div class='del'>-	being moved to.</div><div class='del'>-	(do_delete): Don't set the DELETED flag here either...we'll only</div><div class='del'>-	set it at the very end of the filtering process.</div><div class='del'>-	(filter_driver_filter_message): Set the DELETED flag after all</div><div class='del'>-	processing is completed.</div><div class='del'>-</div><div class='del'>-2000-10-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Readded Source url stuff.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Added url stuff</div><div class='del'>-	back in.</div><div class='del'>-</div><div class='del'>-	* filter-url.[c,h]: Back from the dead...</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Re-added filter-url.[c,h].</div><div class='del'>-</div><div class='del'>-2000-10-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added option menu items to allow searching</div><div class='del'>-	based on regular expressions.</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (body_regex): New callback to match text</div><div class='del'>-	in the body using regex.</div><div class='del'>-	(body_contains): Modified to only match using strstr.</div><div class='del'>-	(header_regex): New callback to match headers using regex.</div><div class='del'>-	(header_contains): Modified to only match using strstr.</div><div class='del'>-</div><div class='del'>-2000-10-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Take out the reference to "Source".</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Remove</div><div class='del'>-	filter-url code.</div><div class='del'>-</div><div class='del'>-	* filter-url.[c,h]: What was I smoking? There's no good reason to</div><div class='del'>-	filter on source urls as there are other ways to get the same</div><div class='del'>-	effect. Thanks to both Zucchi and Miguel for helping me see this</div><div class='del'>-	:-)</div><div class='del'>-</div><div class='del'>-2000-10-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Fixed NULL in fprintf.</div><div class='del'>-</div><div class='del'>-2000-10-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libfilter-i18n.h): Build a fake header file with</div><div class='del'>-	the titles from the xml files, for translation purposes.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_rule_part_widget): Call _() on the rule's</div><div class='del'>-	title.</div><div class='del'>-</div><div class='del'>-	* filter-option.c (get_widget): Call _() on the option's title.</div><div class='del'>-</div><div class='del'>-	* filter.glade: Turn on translatable strings.</div><div class='del'>-</div><div class='del'>-	* libfilter-i18n.h, filter.glade.h: Translatable string files.</div><div class='del'>-</div><div class='del'>-	* add #include &lt;config.h&gt; to a bunch of C files so that _()</div><div class='del'>-	actually does anything. Undo some UTF8 frobs since we're now</div><div class='del'>-	dealing in localized strings.</div><div class='del'>-</div><div class='del'>-2000-10-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (less_parts): Set the remove button insensitive</div><div class='del'>-	if there is only 1 action left.</div><div class='del'>-	(more_parts): Set the remove button sensitive (since we now have 2</div><div class='del'>-	or more actions).</div><div class='del'>-	(get_widget): If there is only 1 action, disable the remove</div><div class='del'>-	button.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (xml_encode): If there is a defined source, don't</div><div class='del'>-	set it to "incoming", set it to whatever the source is!</div><div class='del'>-	(less_parts): Set the remove button insensitive if there is only 1</div><div class='del'>-	criterion left.</div><div class='del'>-	(more_parts): Set the remove button sensitive (since we now have 2</div><div class='del'>-	or more criterion).</div><div class='del'>-	(get_widget): If there is no name for the filter then set it to</div><div class='del'>-	"Untitled", highlight it, and grab the focus. If there is only 1</div><div class='del'>-	criterion, disable the remove button.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c, vfolder-editor.c: GUI fixes here and there as</div><div class='del'>-	well as some consistancy fixes between them.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_mbox): Updated to send the</div><div class='del'>-	source url to filter_driver_filter_message()</div><div class='del'>-	(filter_driver_filter_folder): Updated to send the source url of</div><div class='del'>-	the folder to filter_driver_filter_message()</div><div class='del'>-	(filter_driver_filter_message): Now takes a source_url argument</div><div class='del'>-	that represents the url of the folder the message is coming from</div><div class='del'>-	(so that we may filter based upon that information).</div><div class='del'>-</div><div class='del'>-2000-10-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter.glade: Fixed these widgets to resize properly.</div><div class='del'>-</div><div class='del'>-2000-10-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: Remove the "demand" source from the list.</div><div class='del'>-</div><div class='del'>-	* filter.glade: Remove the "On Demand" option and replace it with</div><div class='del'>-	an "Outgoing" option.</div><div class='del'>-</div><div class='del'>-2000-10-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c, filter-filter.c, filter-folder.c,</div><div class='del'>-	filter-part.c, filter-rule.c, rule-context.c, score-editor.c,</div><div class='del'>-	vfolder-editor.c: Fixed these widgets to resize properly.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added filter-url.[c,h].</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (get_source): New callback to get the</div><div class='del'>-	source url of the message being filtered.</div><div class='del'>-	(filter_message_search): Now takes a source argument.</div><div class='del'>-</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Added code to</div><div class='del'>-	handle URL types.</div><div class='del'>-</div><div class='del'>-	* filter-url.[c,h]: New filter object to handle URLs (ie in the</div><div class='del'>-	case of filtering on source url). FIXME: find a way to populate</div><div class='del'>-	the source combo box (including mail-config.h breaks the build in</div><div class='del'>-	the addressbook - how does including mail-tools.h not break the</div><div class='del'>-	build???)</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added the source filter type and added the</div><div class='del'>-	move-to action.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_move): New callback, a "Copy" action should</div><div class='del'>-	just copy the message to another location while a Move should both</div><div class='del'>-	copy the message to a new location and delete it from the source</div><div class='del'>-	location.</div><div class='del'>-	(do_delete): Set the deleted flag on the message info.</div><div class='del'>-	(filter_driver_filter_message): Now returns void as we don't care</div><div class='del'>-	if it was copied or not in the caller functions. Also check the</div><div class='del'>-	CamelMessageInfo being passed in - if the message has been marked</div><div class='del'>-	as deleted prior to being filtered, then return immediately as we</div><div class='del'>-	don't want to apply filter actions to deleted messages.</div><div class='del'>-</div><div class='del'>-2000-10-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_folder): Start fetching at</div><div class='del'>-	1, not 0.</div><div class='del'>-</div><div class='del'>-2000-10-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_filter_mbox): Report the</div><div class='del'>-	percentage of file complete for the filter.</div><div class='del'>-</div><div class='del'>-2000-10-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Why on earth does this code</div><div class='del'>-	ref all these objects for?  This is not right at all.</div><div class='del'>-	(filter_driver_run): Changed source type to a string.</div><div class='del'>-	(filter_driver_run): REmove the very weird exception copying</div><div class='del'>-	stuff - just ref it instead.</div><div class='del'>-	(do_score): </div><div class='del'>-	(do_colour): </div><div class='del'>-	(do_stop): </div><div class='del'>-	(do_copy): </div><div class='del'>-	(mark_forward): </div><div class='del'>-	(do_delete): Removed bogus 'terminated' testing.  This is NOT</div><div class='del'>-	NEEDED HERE.  It is tested after every rule/action, and</div><div class='del'>-	termination only makes sense at that point.</div><div class='del'>-	(filter_driver_filter_message): new funciton (renamed), filter</div><div class='del'>-	only a message.</div><div class='del'>-	(filter_driver_filter_mbox): Filter a whole mbox.</div><div class='del'>-	(filter_driver_run): If we aren't given an info, create a simple</div><div class='del'>-	one based on the message headers.</div><div class='del'>-	(filter_driver_filter_message): Renamed from filter_driver_run().</div><div class='del'>-	(filter_driver_set_status_func): Set the status callback function.</div><div class='del'>-	(filter_driver_set_default_folder): Set the default folder for</div><div class='del'>-	filtering.</div><div class='del'>-	(report_status): Internal function to report the status of a given</div><div class='del'>-	event.</div><div class='del'>-	(do_copy): Removed a pointless cache lookup - duh, we do it in</div><div class='del'>-	open_folder anyway (infact, we do it in camel too!!).</div><div class='del'>-	(filter_driver_filter_message): Removed pointless re-refing of</div><div class='del'>-	arguments.  Why would anyone think this could be any use at all?</div><div class='del'>-	(filter_driver_filter_folder): New function to filter a whole</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (rule_add): api fixes.</div><div class='del'>-	(rule_edit): </div><div class='del'>-	(rule_up): </div><div class='del'>-	(rule_down): </div><div class='del'>-	(set_sensitive): This didn't take into account the source, now it</div><div class='del'>-	does.</div><div class='del'>-	(select_source): Fix for api changes.  Changed the rather generic</div><div class='del'>-	'number' argument to be 'source', and a string.</div><div class='del'>-	(filter_editor_construct): Changed the 'number' to 'source', and</div><div class='del'>-	set the string appropriately.  Added a warning for one case where</div><div class='del'>-	the glade file is out of sync.</div><div class='del'>-</div><div class='del'>-	* score-editor.c (score_editor_construct): </div><div class='del'>-	(rule_edit): </div><div class='del'>-	(rule_delete): </div><div class='del'>-	(rule_up): </div><div class='del'>-	(rule_down): </div><div class='del'>-	(set_sensitive): api fixes.</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (set_sensitive): Api fixes.</div><div class='del'>-	(vfolder_editor_construct): </div><div class='del'>-	(rule_edit): </div><div class='del'>-	(vfolder_editor_construct): </div><div class='del'>-</div><div class='del'>-	* rule-context.h (RCNextRuleFunc): Added a source argument.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_next_rule): Added source argument.</div><div class='del'>-	(rule_context_find_rule): Added source argument.</div><div class='del'>-	(rule_context_get_rank_rule): Added source argument.</div><div class='del'>-	(rule_context_get_rank_rule_with_source): Removed.</div><div class='del'>-	(save): Fixed for changes to RCNextRuleFunc prototype.</div><div class='del'>-</div><div class='del'>-	* filter-rule.h: Changed the source to be a string, removed the</div><div class='del'>-	filter_source_t type.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_set_source): New function to set the</div><div class='del'>-	source of a rule.  What idiot ran this code through indent?</div><div class='del'>-	(filter_rule_find_list): Added a source argument.</div><div class='del'>-	(filter_rule_next_list): Added a source argument.</div><div class='del'>-	(get_widget): Fixed the wording.  You dont remove search parts,</div><div class='del'>-	you can only remove the last one.  Why you even need to mention</div><div class='del'>-	they are search 'criteria' is beyond me.  Whoever added the</div><div class='del'>-	scrolled window needs to be shot, its the single most awful GUI</div><div class='del'>-	feature ever invented (ranks with the close button next to</div><div class='del'>-	maximise).</div><div class='del'>-	(xml_encode): Save source as a string (if present).</div><div class='del'>-	(xml_decode): Likewise for loading &amp; fixed a small memleak.</div><div class='del'>-	(filter_rule_finalise): Free source.</div><div class='del'>-</div><div class='del'>-2000-10-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (load): Remove the stupid on-demand cb shit.</div><div class='del'>-	(rule_context_load): And here too.</div><div class='del'>-</div><div class='del'>-2000-09-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Now takes an argument to</div><div class='del'>-	specify the log file (or NULL if logging is not to be performed).</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gladedir, filterdir): Use $(datadir), not</div><div class='del'>-	$(prefix)/share.</div><div class='del'>-</div><div class='del'>-2000-09-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Modified to use more intuitive naming</div><div class='del'>-</div><div class='del'>-	* score-rule.c (xml_decode): Make sure the score is within our</div><div class='del'>-	range</div><div class='del'>-	(get_widget): Changed range to -3 to +3</div><div class='del'>-</div><div class='del'>-	* filter-score.c (get_widget): Changed range to -3 to +3</div><div class='del'>-	(xml_decode): Make sure the score is within our range</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Rearranged widgets.</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (get_widget): Rearranged widgets.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (filter_editor_construct): Updated to allow for</div><div class='del'>-	double-clicking on a rule to edit it.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c, filter-filter.c, filter-folder.c,</div><div class='del'>-	filter-input.c, filter-message-search.c, filter-option.c,</div><div class='del'>-	filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:</div><div class='del'>-	Fixed the #include lines to deal properly with gal.</div><div class='del'>-</div><div class='del'>-2000-09-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (body_contains): Modified to only match</div><div class='del'>-	text MIME parts in the message rather than the entire MIME message</div><div class='del'>-	(header_contains): Added regex matching</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (d): </div><div class='del'>-	* filter-datespec.c (d): Turn off debugging output.</div><div class='del'>-</div><div class='del'>-2000-09-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: We now use a "copied" variable to record</div><div class='del'>-	whether a message was marked as copied or not instead of trying to</div><div class='del'>-	"guess" by looking at the folders hash table as that won't work at</div><div class='del'>-	all anymore.</div><div class='del'>-	(do_copy): Renamed as this is more appropriate now that it</div><div class='del'>-	actually copies the message rather than marking it for copying</div><div class='del'>-	later. Also fixed a logic error which prevented a message from</div><div class='del'>-	being dumped into a folder if the fodler had been previously</div><div class='del'>-	opened.</div><div class='del'>-</div><div class='del'>-2000-09-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): No longer takes a</div><div class='del'>-	self_destruct argument.</div><div class='del'>-</div><div class='del'>-2000-09-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Don't freeze/thaw the</div><div class='del'>-	default inbox here, let the caller freeze/thaw it. Don't destroy</div><div class='del'>-	the folders hash table here, it's faster if we wait till the</div><div class='del'>-	filter-driver is destroyed.</div><div class='del'>-	(filter_driver_finalise): Destroy the folders hash table here</div><div class='del'>-	(filter_driver_init): Initialize the folders hash table here</div><div class='del'>-</div><div class='del'>-2000-09-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Changed "Header" to be "Message header" so it's</div><div class='del'>-	not quite as confusing (??)</div><div class='del'>-</div><div class='del'>-2000-09-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Updated to allow the user to specify arbitrary</div><div class='del'>-	headers.</div><div class='del'>-</div><div class='del'>-2000-09-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Fixed a logic error. Only</div><div class='del'>-	mark filtered as TRUE if it was successfully copied to another</div><div class='del'>-	folder, this means don't mark true if the default inbox is NULL.</div><div class='del'>-</div><div class='del'>-2000-09-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Erm, okay I misunderstood</div><div class='del'>-	what camel_folder_[un]hook_event() did - we don't even need this</div><div class='del'>-	crap in the filter driver so lets take it completely out and let</div><div class='del'>-	the caller handle this junk.</div><div class='del'>-</div><div class='del'>-2000-09-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Updated to not emit the</div><div class='del'>-	folder_changed signal when a message is appended to the default</div><div class='del'>-	mailbox - lets leave that up to the caller so we don't queue up a</div><div class='del'>-	bunch of these emits if the caller is downloading messages for</div><div class='del'>-	example.</div><div class='del'>-</div><div class='del'>-2000-09-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Added scoring xml stuffs</div><div class='del'>-	</div><div class='del'>-	* Makefile.am: added filter-score.[c,h]</div><div class='del'>-	</div><div class='del'>-	* filter-score.[c,h]: New functions to handle the "score" filter</div><div class='del'>-	type.</div><div class='del'>-	</div><div class='del'>-	* filter-element.c (filter_element_new_type_name): Added support</div><div class='del'>-	for "score" type.</div><div class='del'>-	</div><div class='del'>-	* filter-driver.c (do_score): New ESExp callback for filter</div><div class='del'>-	actions to set the score on a message.</div><div class='del'>-	</div><div class='del'>-	* filter-message-search.c (get_score): New ESExp callback for</div><div class='del'>-	getting the score tag as an integer value.</div><div class='del'>-</div><div class='del'>-2000-09-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Now takes a</div><div class='del'>-	CamelMessageInfo argument in preparation for handling scoring</div><div class='del'>-</div><div class='del'>-2000-09-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Modified to return a</div><div class='del'>-	boolean value specifying whether or not the message was filtered</div><div class='del'>-	into a folder other than the default. The default mailbox can now</div><div class='del'>-	also be specified as NULL if the message shouldn't be appended to</div><div class='del'>-	it in the case that it's not filtered into some other folder.</div><div class='del'>-</div><div class='del'>-2000-09-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Rewrote - this shouldn't</div><div class='del'>-	need to be an async function</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (match_all): Modified to look at the</div><div class='del'>-	boolean value being fed to it and just to return that instead of</div><div class='del'>-	always returning TRUE</div><div class='del'>-</div><div class='del'>-2000-09-07  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c, filter-filter.c, filter-folder.c, filter-option.c:</div><div class='del'>-	* filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c:</div><div class='del'>-	More UTF-8 wrapping</div><div class='del'>-</div><div class='del'>-2000-09-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Totally rewritten to filter</div><div class='del'>-	a single message at a time instead of filtering a folder.</div><div class='del'>-</div><div class='del'>-	* filter-message-search.c (filter_message_search): New convenience</div><div class='del'>-	function for searching a message.</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* filter-input.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* filter-rule.c: Use e_utf8 wrappers</div><div class='del'>-	</div><div class='del'>-2000-08-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-datespec.c (cal_day_selected): Set seltime.tm_isdst to</div><div class='del'>-	-1, not daylight, because the current dst value is not relevant to</div><div class='del'>-	the selected date.</div><div class='del'>-</div><div class='del'>-2000-08-18  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_filter_mail): Unlink a new parameter, path_to_unlink,</div><div class='del'>-	if it is empty once the mail is filtered. Fixes a race in </div><div class='del'>-	mail_tool_filter_contents_into.</div><div class='del'>-</div><div class='del'>-	* filter-driver.h: Update the prototype.</div><div class='del'>-</div><div class='del'>-2000-08-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (rule_add): Add translation marks and use stock</div><div class='del'>-	buttons.</div><div class='del'>-	(rule_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* score-editor.c (rule_add): Add translation marks and use stock</div><div class='del'>-	buttons.</div><div class='del'>-	(rule_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_add_rule_gui): Add translation</div><div class='del'>-	marks and use stock buttons.</div><div class='del'>-</div><div class='del'>-	* filter-part.c (main): Add translation marks and use</div><div class='del'>-	stock buttons.</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Add translation marks and use</div><div class='del'>-	stock buttons.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (rule_add): Add translation marks and use stock</div><div class='del'>-	buttons.</div><div class='del'>-	(rule_edit): Likewise.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (get_widget): Add translation marks.</div><div class='del'>-</div><div class='del'>-	* filter-filter.c (get_widget): Add translation marks.  Add</div><div class='del'>-	padding to make it look like the buttons in `filter-rule.c'.</div><div class='del'>-</div><div class='del'>-2000-08-17  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Implement filtering on demand.</div><div class='del'>-</div><div class='del'>-	* rule-context.h: Add a new callback to rule_context_load</div><div class='del'>-	that allows the caller to hook on-demand rules into its UI.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_load): Changed to pass the</div><div class='del'>-	extra parameters to load().</div><div class='del'>-	(load): If the rule is successfully loaded, call the provided</div><div class='del'>-	callback so that the UI can be updated.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (rule_add): Set the source of the new filter.</div><div class='del'>-	(rule_edit): Use the new rule_context_get_rank_rule_with_source()</div><div class='del'>-	so that we don't get a bad index into the GtkList.</div><div class='del'>-	(rule_delete): Same as above.</div><div class='del'>-	(rule_up): Same as above.</div><div class='del'>-	(rule_down): Same as above.</div><div class='del'>-	(select_source): New function. When the user changes the </div><div class='del'>-	dropdown list to select a new source type, repopulate the</div><div class='del'>-	list with rules of the appropriate type.</div><div class='del'>-	(filter_editor_construct): Code moved from here into</div><div class='del'>-	select_source(). Hook up all the elements of the source optionmenu</div><div class='del'>-	to callbacks to select_source().</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (xml_encode): Save the rule's source type.</div><div class='del'>-	(xml_decode): Load it. Default to 'incoming' if unspecified.</div><div class='del'>-</div><div class='del'>-	* filter-rule.h: New enumeration, _filter_source_t, the</div><div class='del'>-	specifies the rule's source. Add it to struct _FilterRule.</div><div class='del'>-	</div><div class='del'>-	* filter-driver.c (filter_driver_run): Add a new input,</div><div class='del'>-	sourcetype, that specifies which rules to run (only ones</div><div class='del'>-	with the same source will be run). struct filter_mail_input_t</div><div class='del'>-	changed to accomodate.</div><div class='del'>-	(do_filter_mail): Skip rules if they're not the specified source.</div><div class='del'>-	If source and dest are the same, don't delete the messages or</div><div class='del'>-	copy unnecessarily.</div><div class='del'>-</div><div class='del'>-	* filter.glade: Make the optionmenu sensitive. Change "Outgoing"</div><div class='del'>-	to "On Demand" (outgoing should be added later).</div><div class='del'>-	</div><div class='del'>-2000-08-15  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertype.xml, filtertypes.xml: Add entries defining the</div><div class='del'>-	date-based message filtering and vfoldering.</div><div class='del'>-</div><div class='del'>-	* filter-datespec.{c,h}: New files implementing the UI for</div><div class='del'>-	date-based filtering and vfoldering -- specifically, choosing</div><div class='del'>-	what to compare the message to.</div><div class='del'>-</div><div class='del'>-	* filter-element,c: Hook up to create a datespec filter if</div><div class='del'>-	that's what's called for.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Build the new -datespec files.</div><div class='del'>-</div><div class='del'>-2000-08-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): remove blank.xpm and check.xpm which</div><div class='del'>-	no longer exist. Add filter.glade.</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (describe_filter_mail): Use</div><div class='del'>-	mail_tool_get_folder_name here too. (Hm... this directory really</div><div class='del'>-	shouldn't depend on stuff in mail/, but it already did. We'll have</div><div class='del'>-	to sort this out later.)</div><div class='del'>-</div><div class='del'>-2000-08-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_filter_mail): Remove an '#if 0' that must</div><div class='del'>-	have been left in accidentally, so that messages which are copied</div><div class='del'>-	to other folders will not also be copied into the Inbox. Also,</div><div class='del'>-	#ifdef out the line that printfs the rule, because the rules are</div><div class='del'>-	often very large.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_colour): Use proper accessor function</div><div class='del'>-	instead of poking the structure.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c, filter-folder.c, rule-context.c,</div><div class='del'>-	vfolder-editor.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-10  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_filter_mail): Fix the infinite fetchmail.</div><div class='del'>-</div><div class='del'>-2000-08-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Save the results of</div><div class='del'>-	searches till we're done.  So we dont have to go strduping strings</div><div class='del'>-	agian and again and again and again ...  Remove all the unecessary</div><div class='del'>-	strdups.</div><div class='del'>-	(do_colour): Implement.</div><div class='del'>-	(filter_driver_run): Change for append api change.</div><div class='del'>-	(free_key): Removed.</div><div class='del'>-</div><div class='del'>-2000-08-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_add_rule_gui): Helper function to</div><div class='del'>-	add a rule, but present a gui first, asking for confirmation/allow</div><div class='del'>-	editing.</div><div class='del'>-	(rule_context_add_rule_gui): Keep track of context so it isn't freed under us.</div><div class='del'>-</div><div class='del'>-	* filter-context.c (filter_context_create_action): Implement,</div><div class='del'>-	helper to aid filter generation.</div><div class='del'>-</div><div class='del'>-2000-08-08  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (close_folder): Fix an accidental GTK unref</div><div class='del'>-	of a CamelObject.</div><div class='del'>-</div><div class='del'>-2000-08-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Use the base name of the</div><div class='del'>-	Evoluton URI for the button's label.</div><div class='del'>-	(get_widget): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-03  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (op_filter_mail): Conform to the new mail-threads</div><div class='del'>-	interface.</div><div class='del'>-</div><div class='del'>-2000-08-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfolder-editor.c (rule_add): Oops, create a vfolder_rule when we</div><div class='del'>-	add a new one.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (load): If there are no user rules, dont bomb</div><div class='del'>-	out.</div><div class='del'>-</div><div class='del'>-2000-07-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-input.c (filter_input_set_value): Set value of a simple</div><div class='del'>-	type to a new string.</div><div class='del'>-</div><div class='del'>-	* filter-option.c (filter_option_set_current): New function to set</div><div class='del'>-	the current value of an option.</div><div class='del'>-</div><div class='del'>-	* filter-rule.c (filter_rule_find_list): New function to find a</div><div class='del'>-	rule in a list, by name.</div><div class='del'>-	(filter_rule_set_name): Let you set the name of a rule.</div><div class='del'>-</div><div class='del'>-	* rule-context.c (rule_context_find_rule): Find a rule by name.</div><div class='del'>-	(rule_context_create_part): Helper to find and clone a part by</div><div class='del'>-	name.</div><div class='del'>-</div><div class='del'>-	* filter-folder.c (button_clicked): Fix warning.</div><div class='del'>-</div><div class='del'>-	* filter.glade: Add new widgets for vfolder rule editor.</div><div class='del'>-	</div><div class='del'>-	* vfolder-context.c (vfolder_context_init): Changed to use vfolder</div><div class='del'>-	rule as the rule type.</div><div class='del'>-</div><div class='del'>-	* vfolder-rule.c: New class to encode extra information required</div><div class='del'>-	for vfolder rules.</div><div class='del'>-</div><div class='del'>-2000-07-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	**  Almost a total rewrite of every file, except for filter-driver</div><div class='del'>-	which just had minor updates.</div><div class='del'>-</div><div class='del'>-	The rule format has changed.</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_delete, filter_driver_run): Update for</div><div class='del'>-	CamelFolder API changes. (delete_message and get_uids don't take</div><div class='del'>-	exceptions any more.)</div><div class='del'>-</div><div class='del'>-2000-07-21  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (cleanup_filter_mail): Use the exception</div><div class='del'>-	provided to us by the async manager instead of allocating</div><div class='del'>-	our own; use mail_tool_camel_lock_{up,down} around camel</div><div class='del'>-	operations.</div><div class='del'>-	(filter_driver_run): Make it return void.</div><div class='del'>-</div><div class='del'>-2000-07-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Update to make "async".</div><div class='del'>-</div><div class='del'>-2000-07-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Update for CamelFolder API changes</div><div class='del'>-</div><div class='del'>-2000-07-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Updated to reflect changes to</div><div class='del'>-	camel_folder_append_message ()</div><div class='del'>-</div><div class='del'>-2000-07-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.[ch]: add a "string" type</div><div class='del'>-</div><div class='del'>-	* filtertype.xml, vfoldertypes.xml: Use type="string" rather than</div><div class='del'>-	"folder" for subject/body matching.</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c: Update some strings for "text" input. Fix</div><div class='del'>-	some warnings (including one that pointed out a real bug).</div><div class='del'>-</div><div class='del'>-	* filter-arg.c, filter-druid.c, filter-format.c: fix warnings</div><div class='del'>-</div><div class='del'>-2000-07-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Update for camel_folder_search_by_expression</div><div class='del'>-	change (GList -&gt; GPtrArray).</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: sync this to filtertypes.xml (to/cc thing)</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* remove some non-error case debugging messages.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Fix typos and update the "to-address" rule to</div><div class='del'>-	match To or Cc.</div><div class='del'>-	* vfoldertypes.xml: Fix typos.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_delete, do_copy, do_stop,</div><div class='del'>-	filter_driver_run): Add uids to the "processed" list only after</div><div class='del'>-	succesfully doing something with them. Fixes the problem where</div><div class='del'>-	copying a message to a folder that didn't exist would result in it</div><div class='del'>-	disapearing.</div><div class='del'>-</div><div class='del'>-2000-07-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_new): Don't free the ruleset nor</div><div class='del'>-	the xmlDoc.  This will make us leak [I think], but at least</div><div class='del'>-	filters work.</div><div class='del'>-</div><div class='del'>-2000-07-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (open_folder): freeze the folder to avoid</div><div class='del'>-	multiple folder_changed's</div><div class='del'>-	(close_folder): and thaw it.</div><div class='del'>-	</div><div class='del'>-2000-07-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_new): kill</div><div class='del'>-	filter_driver_set_session and filter_driver_set_rules and instead</div><div class='del'>-	make filter_driver_new take the rules and a callback function it</div><div class='del'>-	can use to turn URIs into folders.</div><div class='del'>-	(open_folder): Use the callback function rather than calling camel</div><div class='del'>-	directly: some URIs need special handling to turn them into stores</div><div class='del'>-	and folders correctly, so let the mailer do that.</div><div class='del'>-</div><div class='del'>-2000-07-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (arg_folder_edit_value): Only allow type</div><div class='del'>-	"mail" when selecting a folder for the filter.</div><div class='del'>-</div><div class='del'>-2000-07-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Updated to reflect changes made to </div><div class='del'>-	camel-folder.</div><div class='del'>-</div><div class='del'>-2000-06-30  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (filter_load_optionset_file): Check for failure</div><div class='del'>-	when loading the filter doc.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_set_rules): Ditto.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (filter_editor_set_rule_files): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c: Replaced `global_shell_interface' with</div><div class='del'>-	`global_shell_client'.</div><div class='del'>-	(arg_folder_edit_value): Use</div><div class='del'>-	`evolution_shell_client_user_select_folder()'.</div><div class='del'>-	(create_listener): Removed.</div><div class='del'>-	(impl_FolderSelectionListener_selected): Removed, together with</div><div class='del'>-	all the ::Listener stuff.</div><div class='del'>-</div><div class='del'>-2000-06-29  Arik Devens  &lt;arik@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml (ruleset type="match"): Changed Cc to CC to be</div><div class='del'>-	the same as the other CC rule. None of this works however, cause</div><div class='del'>-	the CC code is not hooked up to camel... oh well ;-(</div><div class='del'>-	</div><div class='del'>-2000-06-29  Arik Devens  &lt;arik@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* vfoldertypes.xml (ruleset type="match"): Added a Cc rule to</div><div class='del'>-	vfolders. Works like To except on the Cc of a message ;-)</div><div class='del'>-	</div><div class='del'>-2000-06-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (arg_string_edit_value): Changed "Filter name"</div><div class='del'>-	to "Option value" as "Filter name" made no sense in the dialog</div><div class='del'>-	(arg_address_edit_value): Same</div><div class='del'>-	(arg_folder_edit_value): What do we want to return??</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (load_desc): Strdup content before assigning the</div><div class='del'>-	value.  Also, no need to check for NULL when g_strdup()ing as</div><div class='del'>-	g_strdup() returns NULL for a NULL arg.</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): `-I$(top_builddir)/shell' so that it</div><div class='del'>-	works with builddir != srcdir.  [We need to #include</div><div class='del'>-	"Evolution.h".]</div><div class='del'>-</div><div class='del'>-2000-06-27  Michael Zucchi  &lt;zucchi@zedzone.mmc.com.au&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add the shell dir for includes (for</div><div class='del'>-	corba interfaces).</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (impl_FolderSelectionListener_selected):</div><div class='del'>-	Listener for folder query.  Sigh.</div><div class='del'>-	(create_listener): Create the listener object for the folder</div><div class='del'>-	dialogue query.  Uses a global for linkage to the shell object,</div><div class='del'>-	via the mail component.</div><div class='del'>-	(arg_folder_edit_value): Call the folder selection dialogue to</div><div class='del'>-	edit the value, rather than a simple text widget.</div><div class='del'>-</div><div class='del'>-2000-06-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: Added a #include &lt;gnome-xml/parser.h&gt; as this</div><div class='del'>-	was needed (since we used the xml parser...)</div><div class='del'>-	(druid_dialogue_clicked): Do we want to use struct filter_option</div><div class='del'>-	or do we instead want to use struct filter_optionrule as we had before?</div><div class='del'>-	Since the function we pass the data to expects filter_option, I suspect </div><div class='del'>-	that that is what we want.</div><div class='del'>-</div><div class='del'>-	* filter-format.h (filter_description_html_write): Renamed from</div><div class='del'>-	description_html_write in order to match function name in</div><div class='del'>-	filter-format.c</div><div class='del'>-</div><div class='del'>-	* filter-druid.c (option_name_changed): Fixed a memory leak (Free'd</div><div class='del'>-	a filter description list).</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (arg_folder_edit_values): Free'd GList data in</div><div class='del'>-	argin-&gt;values.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_set_rules): Added code to free an</div><div class='del'>-	xmlDoc and some other data.</div><div class='del'>-</div><div class='del'>-	* filter-arg.h: Add prototypes for filter_arg_write_html() and </div><div class='del'>-	filter_arg_write_text();</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c: Lets see if we can't get rid of some of these </div><div class='del'>-	warnings... (use some casts to make warnings go away)</div><div class='del'>-	(arg_address_edit_value): Lets make sure that ad exists before looking</div><div class='del'>-	at member data.</div><div class='del'>-</div><div class='del'>-2000-06-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (do_delete, filter_driver_run): Update for Camel</div><div class='del'>-	flag handling changes.</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (open_folder, close_folder): Update for</div><div class='del'>-	CamelFolder changes.</div><div class='del'>-</div><div class='del'>-2000-06-09  Jacob Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (add_or_edit): use stock pixmap buttons</div><div class='del'>-</div><div class='del'>-	* filter-druid.c (build_druid): remove the border on the notebook,</div><div class='del'>-	put the html widget in a scroll frame, and add some padding</div><div class='del'>-</div><div class='del'>-2000-06-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (open_folder): Update for folder</div><div class='del'>-	existence/creation changes.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Free the exception and the priv struct.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (arg_address_edit_value): Search for ad in</div><div class='del'>-	arg-&gt;values instead of text since it's a list of</div><div class='del'>-	filter_arg_adresses.  Also, free the old value in the list.</div><div class='del'>-</div><div class='del'>-2000-05-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: And here too.</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: Add body-contains and not-body-contains</div><div class='del'>-	types.</div><div class='del'>-</div><div class='del'>-2000-05-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* vfoldertypes.xml: New file - lists rules appropriate for</div><div class='del'>-	vfolders (no actions, etc).</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Add vfoldertypes.xml</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_expand_option): Made public from</div><div class='del'>-	expand_filter_option.</div><div class='del'>-	(filter_driver_rule_count): find out how many user rules are</div><div class='del'>-	defined.</div><div class='del'>-	(filter_driver_rule_get): Get a user rule by index.</div><div class='del'>-</div><div class='del'>-2000-05-21  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-druid.c: Don't pass an empty URL to `gtk_html_begin()'</div><div class='del'>-	anymore.</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c: Updated for the new GtkHTML API which uses</div><div class='del'>-	`GtkHTMLStream *' instead of `GtkHTMLStreamHandle'.</div><div class='del'>-	* filter-arg.c: Likewise.</div><div class='del'>-	* filter-arg.h: Likewise.</div><div class='del'>-	* filter-druid.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* filter-format.c: Likewise.</div><div class='del'>-	* filter-format.h: Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): update for</div><div class='del'>-	camel_folder_get_uids change</div><div class='del'>-</div><div class='del'>-2000-05-17  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-druid.c: Fix some html formatting.</div><div class='del'>-</div><div class='del'>-2000-05-16  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (filter_driver_run): Delete all processed</div><div class='del'>-	messages.  This is probably going to slow it down a bit.</div><div class='del'>-	(filter_driver_run): Close folders before destroying them *sigh*.</div><div class='del'>-	(open_folder): Actually open the folder. Doh.</div><div class='del'>-</div><div class='del'>-	* filtertypes.xml: Initial filter rules.</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (filter_write_optionset): Save the description</div><div class='del'>-	also.</div><div class='del'>-	(write_description): Routine to save description - only saves 1</div><div class='del'>-	node of description.</div><div class='del'>-</div><div class='del'>-	* filter-arg.c (filter_arg_edit_clicked): Dont free edata here,</div><div class='del'>-	let the destroy do it(?)</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (main): Simple driver program for testing, so i</div><div class='del'>-	can fix all this really broken code *sigh*</div><div class='del'>-</div><div class='del'>-2000-05-15  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (filter_editor_set_rule_files): filename based</div><div class='del'>-	interface.</div><div class='del'>-	(filter_editor_save_rules): Interface to save the options to a</div><div class='del'>-	filename.</div><div class='del'>-</div><div class='del'>-	* filter-xml.[ch]: Bunch of cleanup.</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (filter_*_file): New interfaces to read/write files</div><div class='del'>-	directly, rather than messing with xmldoc crap.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed filter-driver test program, now just part</div><div class='del'>-	of libfilter.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Made an object, with an api and everything, can</div><div class='del'>-	apply a filter to a given mailbox.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg.h: Changed tree.h to gnome-xml/tree.h.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added filter-arg-types.h, filter-arg.h,</div><div class='del'>-	filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (main): Fix for api.</div><div class='del'>-</div><div class='del'>-2000-04-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (start): Remove no-longer-necessary call to</div><div class='del'>-	camel_provider_register_as_module.</div><div class='del'>-</div><div class='del'>-2000-04-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Use `$(GTKHTML_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: Removed a bunch of crappy unrequired headers.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (filter_driver_LDADD): Added libibex back again.</div><div class='del'>-</div><div class='del'>-2000-04-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c: remove unused camel-log.h include</div><div class='del'>-</div><div class='del'>-2000-04-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-arg.c (filter_arg_edit_value): Return a value.</div><div class='del'>-</div><div class='del'>-2000-03-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (tokenise_xmlfreeprop): Free a prop after</div><div class='del'>-	tokenising it.</div><div class='del'>-	(find_node_attr): Free the prop after using it.</div><div class='del'>-	(load_desc): Ditto.   I use free() because xmlFree() is nowhere to</div><div class='del'>-	be found.</div><div class='del'>-	(filter_load_optionset): Ditto.</div><div class='del'>-</div><div class='del'>-	* filter-arg-types.c (arg_address_values_add_xml): free() xml</div><div class='del'>-	stuff, plugs a leak.</div><div class='del'>-	(arg_folder_values_add_xml): Ditto.</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (main): Changed to use async search api.</div><div class='del'>-</div><div class='del'>-2000-03-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-druid.c (html_write_options): Output 'and' bits between</div><div class='del'>-	the rules.</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (main): Actually implement filtering, at least,</div><div class='del'>-	from Inbox.  Copy messages to folder (in the same store only, so</div><div class='del'>-	far), delete, and stop processing are implemented, and the logic</div><div class='del'>-	to handle default processing.</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (load_optionvalue): Fix up a bug where we lost the</div><div class='del'>-	name of the arg (ouch).</div><div class='del'>-	* filter-xml.c: Wrapped printf's in debug macros.</div><div class='del'>-</div><div class='del'>-2000-03-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-druid.c (object_destroy): Disconnect the list signal, so</div><div class='del'>-	we dont get spurious emits during destroy.</div><div class='del'>-	(arg_changed): Callback to update filter arg asynchronously.</div><div class='del'>-	(arg_link_clicked): Edit the value non-modally.</div><div class='del'>-</div><div class='del'>-	* filter-arg.c (filter_arg_edit_values_1): Changed to use</div><div class='del'>-	non-modal interface.</div><div class='del'>-</div><div class='del'>-2000-03-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: New file.</div><div class='del'>-</div><div class='del'>-	* Makefile: Removed.  I wonder why we are using plain Makefiles</div><div class='del'>-	instead of automake Makefiles at all.</div><div class='del'>-</div><div class='del'>-2000-02-29  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-driver.c (main): Remove gui code, this will be actual</div><div class='del'>-	filtering code.</div><div class='del'>-</div><div class='del'>-	* Makefile: Added filter-editor to the library.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c (main): Comment out, make it a proper library.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-druid.c: Removed unused header.</div><div class='del'>-</div><div class='del'>-	* Makefile: Removed references to filter-sexp.[ch].</div><div class='del'>-</div><div class='del'>-	* filter-sexp.[ch]: Removed some unecessary includes.  Moved to</div><div class='del'>-	e-util.  Renamed callers.</div><div class='del'>-</div><div class='del'>-2000-02-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (filter_description_free): </div><div class='del'>-	(filter_load_ruleset_free): </div><div class='del'>-	(filter_load_optionset_free): Functions for memory management.</div><div class='del'>-</div><div class='del'>-	* filter-arg.c (filter_arg_copy): Copy the values of one arg into</div><div class='del'>-	another.</div><div class='del'>-</div><div class='del'>-	* filter-editor.c: New widget, a dialogue which uses filter-druid</div><div class='del'>-	to present the various editing views.</div><div class='del'>-	(druid_dialogue_clicked): On finish, save the user's new filter</div><div class='del'>-	definition where it came from.</div><div class='del'>-</div><div class='del'>-	* filter-druid.c: Changed to just being a notebook with no tabs,</div><div class='del'>-	rather than a full druid (no next/prev/etc buttons).</div><div class='del'>-	(option_name_changed): Update the option's description as the user</div><div class='del'>-	enters it in.</div><div class='del'>-</div><div class='del'>-2000-02-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* filter-xml.c (filter_clone_optionrule):</div><div class='del'>-	(filter_clone_optionrule_free): </div><div class='del'>-	(filter_optionrule_new_from_rule): New utility functions for</div><div class='del'>-	working with the internal rule format.</div><div class='del'>-</div><div class='del'>-	* filter-arg.[ch]: Added new callbacks for editing a single value,</div><div class='del'>-	and a new editor which shows all items in a list, and allows you</div><div class='del'>-	to edit them via the single-edit method.  This needs some cleanup</div><div class='del'>-	for some unused/unusable virtual methods (edit_values,</div><div class='del'>-	write_html?).</div><div class='del'>-</div><div class='del'>-	* Makefile: Add the druid for build.</div><div class='del'>-</div><div class='del'>-	* filter-druid.c: A 'druid' widget for editing a single filter</div><div class='del'>-	rule.</div><div class='del'>-</div><div class='del'>-2000-02-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: New file.</div><div class='del'>-</div><div class='del'>-2000-02-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* blank/check.xpm: Added forgotten files.</div><div class='del'>-</div><div class='del'>-	* Uh, more changes, lots, its still work in progress.</div><div class='del'>-</div><div class='del'>-2000-02-14  NotZed  &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Initial import.</div><div class='del'>-</div><div class='head'>diff --git a/filter/Makefile.am b/filter/Makefile.am<br/>deleted file mode 100644<br/>index 7576a1f169..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = filter.glade</div><div class='del'>-</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I $(top_srcdir)			\</div><div class='del'>-	-I $(top_srcdir)/camel			\</div><div class='del'>-	-I $(top_srcdir)/e-util			\</div><div class='del'>-	-I $(top_srcdir)/shell			\</div><div class='del'>-	-I $(top_srcdir)/camel/providers/mbox	\</div><div class='del'>-	-I $(top_builddir)/shell		\</div><div class='del'>-	-I $(GNOME_INCLUDEDIR)			\</div><div class='del'>-	-DFILTER_GLADEDIR=\"$(gladedir)\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"filter\"		\</div><div class='del'>-	$(LIBFILTER_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES =				\</div><div class='del'>-	libfilter.la</div><div class='del'>-</div><div class='del'>-libfilter_la_SOURCES =				\</div><div class='del'>-	filter-code.c				\</div><div class='del'>-	filter-code.h				\</div><div class='del'>-	filter-colour.c				\</div><div class='del'>-	filter-colour.h				\</div><div class='del'>-	filter-context.c			\</div><div class='del'>-	filter-context.h			\</div><div class='del'>-	filter-datespec.c			\</div><div class='del'>-	filter-datespec.h			\</div><div class='del'>-	filter-editor.c				\</div><div class='del'>-	filter-editor.h				\</div><div class='del'>-	filter-element.c			\</div><div class='del'>-	filter-element.h			\</div><div class='del'>-	filter-file.c				\</div><div class='del'>-	filter-file.h				\</div><div class='del'>-	filter-filter.c				\</div><div class='del'>-	filter-filter.h				\</div><div class='del'>-	filter-folder.c				\</div><div class='del'>-	filter-folder.h				\</div><div class='del'>-	filter-input.c				\</div><div class='del'>-	filter-input.h				\</div><div class='del'>-	filter-int.c				\</div><div class='del'>-	filter-int.h				\</div><div class='del'>-	filter-option.c				\</div><div class='del'>-	filter-option.h				\</div><div class='del'>-	filter-part.c				\</div><div class='del'>-	filter-part.h				\</div><div class='del'>-	filter-rule.c				\</div><div class='del'>-	filter-rule.h				\</div><div class='del'>-	filter-score.c				\</div><div class='del'>-	filter-score.h				\</div><div class='del'>-	filter-source.h				\</div><div class='del'>-	filter-source.c				\</div><div class='del'>-	rule-context.c				\</div><div class='del'>-	rule-context.h				\</div><div class='del'>-	rule-editor.c				\</div><div class='del'>-	rule-editor.h				\</div><div class='del'>-	score-context.c				\</div><div class='del'>-	score-context.h				\</div><div class='del'>-	score-editor.c				\</div><div class='del'>-	score-editor.h				\</div><div class='del'>-	score-rule.c				\</div><div class='del'>-	score-rule.h				\</div><div class='del'>-	vfolder-context.c			\</div><div class='del'>-	vfolder-context.h			\</div><div class='del'>-	vfolder-editor.c			\</div><div class='del'>-	vfolder-editor.h			\</div><div class='del'>-	vfolder-rule.c				\</div><div class='del'>-	vfolder-rule.h</div><div class='del'>-</div><div class='del'>-libfilter_la_DEPENDENCIES = libfilter-i18n.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = filtertypes.xml vfoldertypes.xml \</div><div class='del'>-	$(glade_DATA) libfilter-i18n.h</div><div class='del'>-</div><div class='del'>-# basic rules.</div><div class='del'>-filterdir = $(datadir)/evolution</div><div class='del'>-filter_DATA = filtertypes.xml vfoldertypes.xml</div><div class='del'>-</div><div class='del'>-libfilter-i18n.h: filtertypes.xml vfoldertypes.xml</div><div class='del'>-	echo "/* Automatically generated. Do not edit. */" &gt; $@;	      \</div><div class='del'>-	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \</div><div class='del'>-		sed -n -e 's:.*&lt;title&gt;\(.*\)&lt;/title&gt;:char *s = N_("\1");:p' | \</div><div class='del'>-		sort -u &gt;&gt; $@</div><div class='head'>diff --git a/filter/filter-code.c b/filter/filter-code.c<br/>deleted file mode 100644<br/>index eb4de2f374..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-code.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-code.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,122 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "filter-code.h"</div><div class='del'>-</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_code_class_init	(FilterCodeClass *class);</div><div class='del'>-static void filter_code_init	(FilterCode *gspaper);</div><div class='del'>-static void filter_code_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static FilterInputClass *parent_class;</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_code_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterCode",</div><div class='del'>-			sizeof(FilterCode),</div><div class='del'>-			sizeof(FilterCodeClass),</div><div class='del'>-			(GtkClassInitFunc)filter_code_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_code_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(filter_input_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_code_class_init (FilterCodeClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_input_get_type ());</div><div class='del'>-</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_code_finalise;</div><div class='del'>-	/* override methods */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_code_init (FilterCode *o)</div><div class='del'>-{</div><div class='del'>-	((FilterInput *)o)-&gt;type = xmlStrdup("code");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_code_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterCode *o = (FilterCode *)obj;</div><div class='del'>-</div><div class='del'>-	o = o;</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_code_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterCode object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterCode object.</div><div class='del'>- **/</div><div class='del'>-FilterCode *</div><div class='del'>-filter_code_new(void)</div><div class='del'>-{</div><div class='del'>-	FilterCode *o = (FilterCode *)gtk_type_new(filter_code_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* here, the string IS the code */</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-</div><div class='del'>-	l = fi-&gt;values;</div><div class='del'>-	while (l) {</div><div class='del'>-		g_string_append(out, (char *)l-&gt;data);</div><div class='del'>-		l = g_list_next(l);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* and we have no value */</div><div class='del'>-static void format_sexp(FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-code.h b/filter/filter-code.h<br/>deleted file mode 100644<br/>index 3f640fe909..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-code.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-code.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_CODE_H</div><div class='del'>-#define _FILTER_CODE_H</div><div class='del'>-</div><div class='del'>-#include "filter-input.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_CODE(obj)	GTK_CHECK_CAST (obj, filter_code_get_type (), FilterCode)</div><div class='del'>-#define FILTER_CODE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_code_get_type (), FilterCodeClass)</div><div class='del'>-#define IS_FILTER_CODE(obj)      GTK_CHECK_TYPE (obj, filter_code_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterCode	FilterCode;</div><div class='del'>-typedef struct _FilterCodeClass	FilterCodeClass;</div><div class='del'>-</div><div class='del'>-struct _FilterCode {</div><div class='del'>-	FilterInput parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterCodeClass {</div><div class='del'>-	FilterInputClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_code_get_type	(void);</div><div class='del'>-FilterCode	*filter_code_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_CODE_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-colour.c b/filter/filter-colour.c<br/>deleted file mode 100644<br/>index 0836c30932..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-colour.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-colour.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,224 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-color-picker.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-#include "filter-colour.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_colour_class_init	(FilterColourClass *class);</div><div class='del'>-static void filter_colour_init	(FilterColour *gspaper);</div><div class='del'>-static void filter_colour_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterColour *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterColourPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_colour_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterColour",</div><div class='del'>-			sizeof(FilterColour),</div><div class='del'>-			sizeof(FilterColourClass),</div><div class='del'>-			(GtkClassInitFunc)filter_colour_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_colour_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_colour_class_init (FilterColourClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_element_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_colour_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_colour_init (FilterColour *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_colour_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterColour *o = (FilterColour *)obj;</div><div class='del'>-</div><div class='del'>-	o = o;</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_colour_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterColour object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterColour object.</div><div class='del'>- **/</div><div class='del'>-FilterColour *</div><div class='del'>-filter_colour_new(void)</div><div class='del'>-{</div><div class='del'>-	FilterColour *o = (FilterColour *)gtk_type_new(filter_colour_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/*FilterColour *fc = (FilterColour *)fe;*/</div><div class='del'>-</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	FilterColour *fc = (FilterColour *)fe;</div><div class='del'>-	char hex[16];</div><div class='del'>-</div><div class='del'>-	d(printf("Encoding colour as xml\n"));</div><div class='del'>-	value = xmlNewNode(NULL, "value");</div><div class='del'>-	xmlSetProp(value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp(value, "type", "colour");</div><div class='del'>-</div><div class='del'>-	sprintf(hex, "%04x", fc-&gt;r);</div><div class='del'>-	xmlSetProp(value, "red", hex);</div><div class='del'>-	sprintf(hex, "%04x", fc-&gt;g);</div><div class='del'>-	xmlSetProp(value, "green", hex);</div><div class='del'>-	sprintf(hex, "%04x", fc-&gt;b);</div><div class='del'>-	xmlSetProp(value, "blue", hex);</div><div class='del'>-	sprintf(hex, "%04x", fc-&gt;a);</div><div class='del'>-	xmlSetProp(value, "alpha", hex);</div><div class='del'>-</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint16</div><div class='del'>-get_value(xmlNodePtr node, char *name)</div><div class='del'>-{</div><div class='del'>-	unsigned int ret;</div><div class='del'>-	char *value;</div><div class='del'>-</div><div class='del'>-	value = xmlGetProp(node, name);</div><div class='del'>-	sscanf(value, "%04x", &amp;ret);</div><div class='del'>-	xmlFree(value);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterColour *fc = (FilterColour *)fe;</div><div class='del'>-</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = xmlGetProp(node, "name");</div><div class='del'>-	fc-&gt;r = get_value(node, "red");</div><div class='del'>-	fc-&gt;g = get_value(node, "green");</div><div class='del'>-	fc-&gt;b = get_value(node, "blue");</div><div class='del'>-	fc-&gt;a = get_value(node, "alpha");</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void set_colour(GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc)</div><div class='del'>-{</div><div class='del'>-	fc-&gt;r = r;</div><div class='del'>-	fc-&gt;g = g;</div><div class='del'>-	fc-&gt;b = b;</div><div class='del'>-	fc-&gt;a = a;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterColour *fc = (FilterColour *)fe;</div><div class='del'>-	GnomeColorPicker *cp;</div><div class='del'>-</div><div class='del'>-	cp = (GnomeColorPicker *)gnome_color_picker_new();</div><div class='del'>-	gnome_color_picker_set_i16(cp, fc-&gt;r, fc-&gt;g, fc-&gt;b, fc-&gt;a);</div><div class='del'>-	gtk_widget_show((GtkWidget *)cp);</div><div class='del'>-	gtk_signal_connect((GtkObject *)cp, "color_set", set_colour, fe);</div><div class='del'>-	return (GtkWidget *)cp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void format_sexp(FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	FilterColour *fc = (FilterColour *)fe;</div><div class='del'>-</div><div class='del'>-	str =g_strdup_printf("rgb:%04x/%04x/%04x", fc-&gt;r, fc-&gt;g, fc-&gt;b);</div><div class='del'>-	e_sexp_encode_string(out, str);</div><div class='del'>-	g_free(str);</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-colour.h b/filter/filter-colour.h<br/>deleted file mode 100644<br/>index 95ca2a4249..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-colour.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-colour.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_COLOUR_H</div><div class='del'>-#define _FILTER_COLOUR_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_COLOUR(obj)	GTK_CHECK_CAST (obj, filter_colour_get_type (), FilterColour)</div><div class='del'>-#define FILTER_COLOUR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_colour_get_type (), FilterColourClass)</div><div class='del'>-#define IS_FILTER_COLOUR(obj)      GTK_CHECK_TYPE (obj, filter_colour_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterColour	FilterColour;</div><div class='del'>-typedef struct _FilterColourClass	FilterColourClass;</div><div class='del'>-</div><div class='del'>-struct _FilterColour {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterColourPrivate *priv;</div><div class='del'>-</div><div class='del'>-	guint16 r,g,b,a;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterColourClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_colour_get_type	(void);</div><div class='del'>-FilterColour	*filter_colour_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_COLOUR_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-context.c b/filter/filter-context.c<br/>deleted file mode 100644<br/>index cb049d6093..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,284 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktypeutils.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-context.h"</div><div class='del'>-#include "filter-filter.h"</div><div class='del'>-</div><div class='del'>-/* For poking into filter-folder guts */</div><div class='del'>-#include "filter-folder.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-static void filter_context_class_init	(FilterContextClass *class);</div><div class='del'>-static void filter_context_init	(FilterContext *gspaper);</div><div class='del'>-static void filter_context_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static GList *filter_rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp);</div><div class='del'>-static GList *filter_delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterContext *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterContextPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static RuleContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterContext",</div><div class='del'>-			sizeof(FilterContext),</div><div class='del'>-			sizeof(FilterContextClass),</div><div class='del'>-			(GtkClassInitFunc)filter_context_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_context_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(rule_context_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_context_class_init (FilterContextClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	RuleContextClass *rule_class = (RuleContextClass *)class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(rule_context_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_context_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	rule_class-&gt;rename_uri = filter_rename_uri;</div><div class='del'>-	rule_class-&gt;delete_uri = filter_delete_uri;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_context_init (FilterContext *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-</div><div class='del'>-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),</div><div class='del'>-				  rule_context_add_part, rule_context_next_part);</div><div class='del'>-	rule_context_add_part_set((RuleContext *)o, "actionset", filter_part_get_type(),</div><div class='del'>-				  (RCPartFunc)filter_context_add_action,</div><div class='del'>-				  (RCNextPartFunc)filter_context_next_action);</div><div class='del'>-</div><div class='del'>-	rule_context_add_rule_set((RuleContext *)o, "ruleset", filter_filter_get_type(),</div><div class='del'>-				  (RCRuleFunc)rule_context_add_rule, rule_context_next_rule);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_context_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterContext *o = (FilterContext *)obj;</div><div class='del'>-</div><div class='del'>-	g_list_foreach(o-&gt;actions, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free(o-&gt;actions);</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_context_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterContext object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterContext object.</div><div class='del'>- **/</div><div class='del'>-FilterContext *</div><div class='del'>-filter_context_new(void)</div><div class='del'>-{</div><div class='del'>-	FilterContext *o = (FilterContext *)gtk_type_new(filter_context_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void filter_context_add_action(FilterContext *f, FilterPart *action)</div><div class='del'>-{</div><div class='del'>-	d(printf("find action : "));</div><div class='del'>-	f-&gt;actions = g_list_append(f-&gt;actions, action);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart *filter_context_find_action(FilterContext *f, const char *name)</div><div class='del'>-{</div><div class='del'>-	d(printf("find action : "));</div><div class='del'>-	return filter_part_find_list(f-&gt;actions, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart 	*filter_context_create_action(FilterContext *f, const char *name)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	part = filter_context_find_action(f, name);</div><div class='del'>-	if (part)</div><div class='del'>-		part = filter_part_clone(part);</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last)</div><div class='del'>-{</div><div class='del'>-	return filter_part_next_list(f-&gt;actions, last);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* We search for any folders in our actions list that need updating, update them */</div><div class='del'>-static GList *filter_rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-	GList *l, *el;</div><div class='del'>-	FilterPart *action;</div><div class='del'>-	FilterElement *element;</div><div class='del'>-	int count = 0;</div><div class='del'>-	GList *changed = NULL;</div><div class='del'>-</div><div class='del'>-	d(printf("uri '%s' renamed to '%s'\n", olduri, newuri));</div><div class='del'>-</div><div class='del'>-	/* For all rules, for all actions, for all elements, rename any folder elements */</div><div class='del'>-	/* Yes we could do this inside each part itself, but not today */</div><div class='del'>-	rule = NULL;</div><div class='del'>-	while ( (rule = rule_context_next_rule(f, rule, NULL)) ) {</div><div class='del'>-		int rulecount = 0;</div><div class='del'>-</div><div class='del'>-		d(printf("checking rule '%s'\n", rule-&gt;name));</div><div class='del'>-		</div><div class='del'>-		l = FILTER_FILTER(rule)-&gt;actions;</div><div class='del'>-		while (l) {</div><div class='del'>-			action = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			d(printf("checking action '%s'\n", action-&gt;name));</div><div class='del'>-			</div><div class='del'>-			el = action-&gt;elements;</div><div class='del'>-			while (el) {</div><div class='del'>-				element = el-&gt;data;</div><div class='del'>-</div><div class='del'>-				d(printf("checking element '%s'\n", element-&gt;name));</div><div class='del'>-				if (IS_FILTER_FOLDER(element))</div><div class='del'>-					d(printf(" is folder, existing uri = '%s'\n", FILTER_FOLDER(element)-&gt;uri));</div><div class='del'>-</div><div class='del'>-				if (IS_FILTER_FOLDER(element)</div><div class='del'>-				    &amp;&amp; cmp(((FilterFolder *)element)-&gt;uri, olduri)) {</div><div class='del'>-					d(printf(" Changed!\n"));</div><div class='del'>-					filter_folder_set_value((FilterFolder *)element, newuri);</div><div class='del'>-					rulecount++;</div><div class='del'>-				}</div><div class='del'>-				el = el-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (rulecount) {</div><div class='del'>-			changed = g_list_append(changed, g_strdup(rule-&gt;name));</div><div class='del'>-			filter_rule_emit_changed(rule);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		count += rulecount;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* might need to call parent class, if it did anything ... parent_class-&gt;rename_uri(f, olduri, newuri, cmp); */</div><div class='del'>-</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *filter_delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	/* We basically do similar to above, but when we find it,</div><div class='del'>-	   Remove the action, and if thats the last action, this might create an empty rule?  remove the rule? */</div><div class='del'>-</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-	GList *l, *el;</div><div class='del'>-	FilterPart *action;</div><div class='del'>-	FilterElement *element;</div><div class='del'>-	int count = 0;</div><div class='del'>-	GList *deleted = NULL;</div><div class='del'>-</div><div class='del'>-	d(printf("uri '%s' deleted\n", uri));</div><div class='del'>-</div><div class='del'>-	/* For all rules, for all actions, for all elements, check deleted folder elements */</div><div class='del'>-	/* Yes we could do this inside each part itself, but not today */</div><div class='del'>-	rule = NULL;</div><div class='del'>-	while ( (rule = rule_context_next_rule(f, rule, NULL)) ) {</div><div class='del'>-		int recorded = 0;</div><div class='del'>-</div><div class='del'>-		d(printf("checking rule '%s'\n", rule-&gt;name));</div><div class='del'>-		</div><div class='del'>-		l = FILTER_FILTER(rule)-&gt;actions;</div><div class='del'>-		while (l) {</div><div class='del'>-			action = l-&gt;data;</div><div class='del'>-</div><div class='del'>-			d(printf("checking action '%s'\n", action-&gt;name));</div><div class='del'>-			</div><div class='del'>-			el = action-&gt;elements;</div><div class='del'>-			while (el) {</div><div class='del'>-				element = el-&gt;data;</div><div class='del'>-</div><div class='del'>-				d(printf("checking element '%s'\n", element-&gt;name));</div><div class='del'>-				if (IS_FILTER_FOLDER(element))</div><div class='del'>-					d(printf(" is folder, existing uri = '%s'\n", FILTER_FOLDER(element)-&gt;uri));</div><div class='del'>-</div><div class='del'>-				if (IS_FILTER_FOLDER(element)</div><div class='del'>-				    &amp;&amp; cmp(((FilterFolder *)element)-&gt;uri, uri)) {</div><div class='del'>-					d(printf(" Deleted!\n"));</div><div class='del'>-					/* check if last action, if so, remove rule instead? */</div><div class='del'>-					l = l-&gt;next;</div><div class='del'>-					filter_filter_remove_action((FilterFilter *)rule, action);</div><div class='del'>-					gtk_object_unref((GtkObject *)action);</div><div class='del'>-					count++;</div><div class='del'>-					if (!recorded)</div><div class='del'>-						deleted = g_list_append(deleted, g_strdup(rule-&gt;name));</div><div class='del'>-					goto next_action;</div><div class='del'>-				}</div><div class='del'>-				el = el-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		next_action:</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* TODO: could call parent and merge lists */</div><div class='del'>-</div><div class='del'>-	return deleted;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-context.h b/filter/filter-context.h<br/>deleted file mode 100644<br/>index d9d78af2af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_CONTEXT_H</div><div class='del'>-#define _FILTER_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include "rule-context.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_CONTEXT(obj)	GTK_CHECK_CAST (obj, filter_context_get_type (), FilterContext)</div><div class='del'>-#define FILTER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_context_get_type (), FilterContextClass)</div><div class='del'>-#define IS_FILTER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, filter_context_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterContext	FilterContext;</div><div class='del'>-typedef struct _FilterContextClass	FilterContextClass;</div><div class='del'>-</div><div class='del'>-struct _FilterContext {</div><div class='del'>-	RuleContext parent;</div><div class='del'>-	struct _FilterContextPrivate *priv;</div><div class='del'>-</div><div class='del'>-	GList *actions;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterContextClass {</div><div class='del'>-	RuleContextClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_context_get_type	(void);</div><div class='del'>-FilterContext	*filter_context_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		filter_context_add_action(FilterContext *f, FilterPart *action);</div><div class='del'>-FilterPart	*filter_context_find_action(FilterContext *f, const char *name);</div><div class='del'>-FilterPart	*filter_context_create_action(FilterContext *f, const char *name);</div><div class='del'>-FilterPart 	*filter_context_next_action(FilterContext *f, FilterPart *last);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_CONTEXT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c<br/>deleted file mode 100644<br/>index fe4e5e3b32..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-datespec.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-datespec.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,764 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;math.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkcalendar.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhseparator.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-datespec.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static gboolean validate (FilterElement *fe);</div><div class='del'>-static void xml_create (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode (FilterElement *fe);</div><div class='del'>-static int xml_decode (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget (FilterElement *fe);</div><div class='del'>-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *fds);</div><div class='del'>-static void format_sexp (FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_datespec_class_init (FilterDatespecClass *class);</div><div class='del'>-static void filter_datespec_init (FilterDatespec *gspaper);</div><div class='del'>-static void filter_datespec_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static void make_span_editor (FilterDatespec *fds);</div><div class='del'>-static void adj_value_changed (GtkAdjustment *adj, gpointer user_data);</div><div class='del'>-static void omenu_item_activated (GtkMenuItem *item, gpointer user_data);</div><div class='del'>-static gchar *describe_button (FilterDatespec *fds);</div><div class='del'>-static gchar *stringify_agoness (FilterDatespec *fds);</div><div class='del'>-static void set_adjustments (FilterDatespec *fds);</div><div class='del'>-</div><div class='del'>-static void cal_day_selected (GtkCalendar *cal, gpointer user_data);</div><div class='del'>-static void cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data);</div><div class='del'>-</div><div class='del'>-#define PRIV(x) (((FilterDatespec *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-typedef struct _timespan {</div><div class='del'>-	guint32 seconds;</div><div class='del'>-	const gchar *singular;</div><div class='del'>-	const gchar *plural;</div><div class='del'>-	gfloat max;</div><div class='del'>-} timespan;</div><div class='del'>-</div><div class='del'>-static const timespan timespans[] = {</div><div class='del'>-	{ 31557600, N_("year"), N_("years"), 1000.0 },</div><div class='del'>-	{ 2419200, N_("month"), N_("months"), 12.0 },</div><div class='del'>-	{ 604800, N_("week"), N_("weeks"), 52.0 },</div><div class='del'>-	{ 86400, N_("day"), N_("days"), 31.0 },</div><div class='del'>-	{ 3600, N_("hour"), N_("hours"), 23.0 },</div><div class='del'>-	{ 60, N_("minute"), N_("minutes"), 59.0 },</div><div class='del'>-	{ 1, N_("second"), N_("seconds"), 59.0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define DAY_INDEX 3</div><div class='del'>-#define N_TIMESPANS (sizeof (timespans) / sizeof (timespans[0]))</div><div class='del'>-</div><div class='del'>-struct _FilterDatespecPrivate {</div><div class='del'>-	GnomeDialog *gd;</div><div class='del'>-	GtkWidget *descriptive_label;</div><div class='del'>-	GtkWidget *cur_extra_widget;</div><div class='del'>-	FilterDatespec_type selected_type;</div><div class='del'>-</div><div class='del'>-	GtkWidget *date_chooser;</div><div class='del'>-	GtkWidget *span_chooser;</div><div class='del'>-	GtkWidget *omenu, *spinbutton, *recent_item;</div><div class='del'>-	gboolean double_click;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_datespec_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterDatespec",</div><div class='del'>-			sizeof (FilterDatespec),</div><div class='del'>-			sizeof (FilterDatespecClass),</div><div class='del'>-			(GtkClassInitFunc) filter_datespec_class_init,</div><div class='del'>-			(GtkObjectInitFunc) filter_datespec_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_datespec_class_init (FilterDatespecClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_element_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_datespec_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;validate = validate;</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_datespec_init (FilterDatespec *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-	o-&gt;type = FDST_UNKNOWN;</div><div class='del'>-	PRIV(o)-&gt;selected_type = FDST_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_datespec_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *o = (FilterDatespec *)obj;</div><div class='del'>-	</div><div class='del'>-	if (o-&gt;priv)</div><div class='del'>-		g_free (o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_datespec_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterDatespec object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterDatespec object.</div><div class='del'>- **/</div><div class='del'>-FilterDatespec *</div><div class='del'>-filter_datespec_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *o = (FilterDatespec *)gtk_type_new (filter_datespec_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *) fe;</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-	</div><div class='del'>-	if (fds-&gt;value &lt;= 0) {</div><div class='del'>-		GtkWidget *gd;</div><div class='del'>-		</div><div class='del'>-		valid = FALSE;</div><div class='del'>-		</div><div class='del'>-		if (fds-&gt;type == FDST_UNKNOWN)</div><div class='del'>-			gd = gnome_ok_dialog (_("You have forgotten to choose a date."));</div><div class='del'>-		else</div><div class='del'>-			gd = gnome_ok_dialog (_("You have chosen an invalid date."));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (gd));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value, work;</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)fe;</div><div class='del'>-	gchar str[32];</div><div class='del'>-	</div><div class='del'>-	d(printf ("Encoding datespec as xml\n"));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "datespec");</div><div class='del'>-	</div><div class='del'>-	work = xmlNewChild (value, NULL, "datespec", NULL);</div><div class='del'>-	sprintf (str, "%d", fds-&gt;type);</div><div class='del'>-	xmlSetProp (work, "type", str);</div><div class='del'>-	sprintf (str, "%d", (int)fds-&gt;value);</div><div class='del'>-	xmlSetProp (work, "value", str);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)fe;</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	gchar *val;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Decoding datespec from xml %p\n", fe));</div><div class='del'>-	</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = xmlGetProp (node, "name");</div><div class='del'>-	</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, "datespec")) {</div><div class='del'>-			val = xmlGetProp (n, "type");</div><div class='del'>-			fds-&gt;type = atoi (val);</div><div class='del'>-			xmlFree (val);</div><div class='del'>-			val = xmlGetProp (n, "value");</div><div class='del'>-			fds-&gt;value = atoi (val);</div><div class='del'>-			xmlFree (val);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-activate_now (GtkMenuItem *item, FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	if (PRIV (fds)-&gt;cur_extra_widget) {</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (PRIV(fds)-&gt;gd-&gt;vbox),</div><div class='del'>-				      PRIV (fds)-&gt;cur_extra_widget);</div><div class='del'>-		PRIV (fds)-&gt;cur_extra_widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (PRIV (fds)-&gt;descriptive_label),</div><div class='del'>-			    _("The message's date will be compared against\n"</div><div class='del'>-			      "whatever the time is when the filter is run\n"</div><div class='del'>-			      "or vfolder is opened."));</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;selected_type = FDST_NOW;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-activate_specified (GtkMenuItem *item, FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	struct tm *seltime;</div><div class='del'>-	</div><div class='del'>-	/* Remove other widget if it exists */</div><div class='del'>-	</div><div class='del'>-	if (PRIV (fds)-&gt;cur_extra_widget) {</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)-&gt;gd-&gt;vbox),</div><div class='del'>-				      PRIV (fds)-&gt;cur_extra_widget);</div><div class='del'>-		PRIV (fds)-&gt;cur_extra_widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Set description */</div><div class='del'>-	</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (PRIV (fds)-&gt;descriptive_label),</div><div class='del'>-			    _("The message's date will be compared against\n"</div><div class='del'>-			      "the time that you specify here."));</div><div class='del'>-	</div><div class='del'>-	/* Reset if going from one type to another */</div><div class='del'>-	if (PRIV (fds)-&gt;selected_type != FDST_SPECIFIED)</div><div class='del'>-		fds-&gt;value = 0;</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;selected_type = FDST_SPECIFIED;</div><div class='del'>-	</div><div class='del'>-	/* Set the calendar's time */</div><div class='del'>-	</div><div class='del'>-	if (fds-&gt;value &gt; 0) {</div><div class='del'>-		/* gmtime? */</div><div class='del'>-		seltime = localtime (&amp;(fds-&gt;value));</div><div class='del'>-		</div><div class='del'>-		gtk_calendar_select_month (GTK_CALENDAR (PRIV (fds)-&gt;date_chooser),</div><div class='del'>-					   seltime-&gt;tm_mon,</div><div class='del'>-					   seltime-&gt;tm_year + 1900);</div><div class='del'>-		gtk_calendar_select_day (GTK_CALENDAR (PRIV (fds)-&gt;date_chooser),</div><div class='del'>-					 seltime-&gt;tm_mday);</div><div class='del'>-		/* free seltime?? */</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (PRIV (fds)-&gt;gd-&gt;vbox),</div><div class='del'>-			    PRIV (fds)-&gt;date_chooser,</div><div class='del'>-			    TRUE, TRUE, 3);</div><div class='del'>-	gtk_widget_show (PRIV (fds)-&gt;date_chooser);</div><div class='del'>-	PRIV (fds)-&gt;cur_extra_widget = PRIV (fds)-&gt;date_chooser;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-activate_x_ago (GtkMenuItem *item, FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	if (PRIV (fds)-&gt;cur_extra_widget) {</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (PRIV (fds)-&gt;gd-&gt;vbox),</div><div class='del'>-				      PRIV (fds)-&gt;cur_extra_widget);</div><div class='del'>-		PRIV (fds)-&gt;cur_extra_widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_label_set_text (GTK_LABEL (PRIV (fds)-&gt;descriptive_label),</div><div class='del'>-			    _("The message's date will be compared against\n"</div><div class='del'>-			      "a time relative to when the filter is run;\n"</div><div class='del'>-			      "\"a week ago\", for example."));</div><div class='del'>-	</div><div class='del'>-	/* Reset if going from one type to another */</div><div class='del'>-	if (PRIV (fds)-&gt;selected_type != FDST_X_AGO)</div><div class='del'>-		fds-&gt;value = 0;</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;selected_type = FDST_X_AGO;</div><div class='del'>-</div><div class='del'>-	if (fds-&gt;value &gt; 0)</div><div class='del'>-		set_adjustments (fds);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (PRIV (fds)-&gt;gd-&gt;vbox),</div><div class='del'>-			    PRIV (fds)-&gt;span_chooser,</div><div class='del'>-			    TRUE, TRUE, 3);</div><div class='del'>-	gtk_widget_show (PRIV (fds)-&gt;span_chooser);</div><div class='del'>-	PRIV (fds)-&gt;cur_extra_widget = PRIV (fds)-&gt;span_chooser;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*my_menu_callback) (GtkMenuItem *, FilterDatespec *);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_clicked (GtkButton *button, FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *gd;</div><div class='del'>-	GtkWidget *box;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *selectomatic;</div><div class='del'>-	GtkWidget *sep;</div><div class='del'>-	int i;</div><div class='del'>-	gchar *desc;</div><div class='del'>-	</div><div class='del'>-	/* keep in sync with FilterDatespec_type! */</div><div class='del'>-	const char *items[] = { N_("the current time"), N_("a time you specify"), </div><div class='del'>-			       N_("a time relative to the current time"), NULL };</div><div class='del'>-	const my_menu_callback callbacks[]</div><div class='del'>-		= { activate_now, activate_specified, activate_x_ago };</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;descriptive_label = gtk_label_new("");</div><div class='del'>-	PRIV (fds)-&gt;cur_extra_widget = NULL;</div><div class='del'>-	PRIV (fds)-&gt;double_click = FALSE;</div><div class='del'>-	</div><div class='del'>-	/* The calendar */</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;date_chooser = gtk_calendar_new ();</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (PRIV (fds)-&gt;date_chooser));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)-&gt;date_chooser), "day_selected",</div><div class='del'>-			    cal_day_selected, fds);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (PRIV (fds)-&gt;date_chooser), "day_selected_double_click",</div><div class='del'>-			    cal_day_selected_double_click, fds);</div><div class='del'>-	</div><div class='del'>-	/* The span editor thingie */</div><div class='del'>-	</div><div class='del'>-	make_span_editor (fds);</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (PRIV (fds)-&gt;span_chooser));</div><div class='del'>-	</div><div class='del'>-	/* The dialog */</div><div class='del'>-	</div><div class='del'>-	gd = (GnomeDialog *) gnome_dialog_new (_("Select a time to compare against"), </div><div class='del'>-					       GNOME_STOCK_BUTTON_OK, </div><div class='del'>-					       GNOME_STOCK_BUTTON_CANCEL, </div><div class='del'>-					       NULL);</div><div class='del'>-	PRIV (fds)-&gt;gd = gd;</div><div class='del'>-	</div><div class='del'>-	/* The menu */</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	</div><div class='del'>-	for (i = 0; items[i]; i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-		</div><div class='del'>-		item = gtk_menu_item_new_with_label (gettext (items[i]));</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-				    callbacks[i], fds);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (menu);</div><div class='del'>-	</div><div class='del'>-	/* The selector */</div><div class='del'>-	</div><div class='del'>-	selectomatic = gtk_option_menu_new();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (selectomatic), GTK_WIDGET (menu));</div><div class='del'>-	if (fds-&gt;type != FDST_UNKNOWN)</div><div class='del'>-		/* Keep in sync with FilterDatespec_type! */</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (selectomatic), fds-&gt;type);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show ((GtkWidget *)selectomatic);</div><div class='del'>-	</div><div class='del'>-	/* The label */</div><div class='del'>-	</div><div class='del'>-	label = gtk_label_new (_("Compare against"));</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	</div><div class='del'>-	/* The hbox */</div><div class='del'>-	</div><div class='del'>-	box = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), label,</div><div class='del'>-			    TRUE, TRUE, 2);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), selectomatic,</div><div class='del'>-			    TRUE, TRUE, 2);</div><div class='del'>-	gtk_widget_show (box);</div><div class='del'>-	gtk_box_pack_start ((GtkBox *)gd-&gt;vbox, (GtkWidget *)box, TRUE, TRUE, 3);</div><div class='del'>-	</div><div class='del'>-	/* The separator */</div><div class='del'>-	</div><div class='del'>-	sep = gtk_hseparator_new ();</div><div class='del'>-	gtk_widget_show (sep);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gd-&gt;vbox), sep, TRUE, TRUE, 3);</div><div class='del'>-	</div><div class='del'>-	/* The descriptive label */</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gd-&gt;vbox), PRIV (fds)-&gt;descriptive_label, TRUE, TRUE, 3);</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (PRIV (fds)-&gt;descriptive_label), 0.5, 0.5);</div><div class='del'>-	gtk_widget_show (PRIV (fds)-&gt;descriptive_label);</div><div class='del'>-	</div><div class='del'>-	/* Set up the current view */</div><div class='del'>-	</div><div class='del'>-	if (fds-&gt;type == FDST_UNKNOWN)</div><div class='del'>-		fds-&gt;type = FDST_NOW;</div><div class='del'>-	PRIV (fds)-&gt;selected_type = fds-&gt;type;</div><div class='del'>-</div><div class='del'>-	(callbacks[fds-&gt;type]) (NULL, fds);</div><div class='del'>-	</div><div class='del'>-	/* go go gadget gnomedialog! */</div><div class='del'>-	</div><div class='del'>-	switch (gnome_dialog_run_and_close(gd)) {</div><div class='del'>-	case -1: /*wm close*/</div><div class='del'>-		if (PRIV (fds)-&gt;double_click == FALSE)</div><div class='del'>-			break;</div><div class='del'>-		/* else fall */</div><div class='del'>-	case 0:</div><div class='del'>-		fds-&gt;type = PRIV (fds)-&gt;selected_type;</div><div class='del'>-		</div><div class='del'>-		PRIV (fds)-&gt;descriptive_label = NULL;</div><div class='del'>-		</div><div class='del'>-		desc = describe_button (fds);</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (GTK_BIN (button)-&gt;child), desc);</div><div class='del'>-		g_free (desc);</div><div class='del'>-		/* falllllll */</div><div class='del'>-	case 1:</div><div class='del'>-		/* cancel */</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_widget_destroy (PRIV (fds)-&gt;date_chooser);</div><div class='del'>-	gtk_widget_destroy (PRIV (fds)-&gt;span_chooser);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)fe;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	gchar *desc;</div><div class='del'>-	</div><div class='del'>-	desc = describe_button (fds);</div><div class='del'>-	label = gtk_label_new (desc);</div><div class='del'>-	gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);</div><div class='del'>-	g_free (desc);</div><div class='del'>-	</div><div class='del'>-	button = gtk_button_new();</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (button), label);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "clicked", button_clicked, fds);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	return button;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)fe;</div><div class='del'>-	</div><div class='del'>-	switch (fds-&gt;type) {</div><div class='del'>-	case FDST_UNKNOWN:</div><div class='del'>-		g_warning ("user hasn't selected a datespec yet!");</div><div class='del'>-		/* fall through */</div><div class='del'>-	case FDST_NOW:</div><div class='del'>-		g_string_append (out, "(get-current-date)");</div><div class='del'>-		break;</div><div class='del'>-	case FDST_SPECIFIED:</div><div class='del'>-		g_string_sprintfa (out, "%d", (int) fds-&gt;value);</div><div class='del'>-		break;</div><div class='del'>-	case FDST_X_AGO:</div><div class='del'>-		g_string_sprintfa (out, "(- (get-current-date) %d)", (int) fds-&gt;value);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-stringify_agoness (FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	time_t val;</div><div class='del'>-	GString *str;</div><div class='del'>-	gchar *ret;</div><div class='del'>-	</div><div class='del'>-	str = g_string_new("");</div><div class='del'>-	val = fds-&gt;value;</div><div class='del'>-	</div><div class='del'>-	if (val == 0) {</div><div class='del'>-		g_string_append (str, _("now"));</div><div class='del'>-	} else {</div><div class='del'>-		int where;</div><div class='del'>-		</div><div class='del'>-		where = 0;</div><div class='del'>-		</div><div class='del'>-		while (val) {</div><div class='del'>-			int count;</div><div class='del'>-			</div><div class='del'>-			count = 0;</div><div class='del'>-			</div><div class='del'>-			while (timespans[where].seconds &lt;= val) {</div><div class='del'>-				count++;</div><div class='del'>-				val -= timespans[where].seconds;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (count != 0 ) {</div><div class='del'>-				if (count &gt; 1)</div><div class='del'>-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].plural));</div><div class='del'>-				else</div><div class='del'>-					g_string_sprintfa (str, "%d %s", (int) count, gettext (timespans[where].singular));</div><div class='del'>-				</div><div class='del'>-				if (val)</div><div class='del'>-					g_string_append (str, ", ");</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			where++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		g_string_append (str, _(" ago"));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = str-&gt;str;</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-make_span_editor (FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GtkObject *adj;</div><div class='del'>-	GtkWidget *hbox, *menu, *om, *sb, *label;</div><div class='del'>-</div><div class='del'>-	/*PRIV (fds)-&gt;span_chooser = gtk_vbox_new (TRUE, 3);*/</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (TRUE, 3);</div><div class='del'>-</div><div class='del'>-	adj = gtk_adjustment_new (0.0, 0.0,</div><div class='del'>-				  /*timespans[i].max*/100000.0,</div><div class='del'>-				  1.0, 10.0, 0.0);</div><div class='del'>-	sb = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0, 0);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (sb));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), sb, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	for (i = 0; i &lt; N_TIMESPANS; i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (gettext (timespans[i].plural));</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "timespan", (gpointer) &amp;(timespans[i]));</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate", omenu_item_activated, fds);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		gtk_menu_prepend (GTK_MENU (menu), item);</div><div class='del'>-</div><div class='del'>-		if (i == DAY_INDEX)</div><div class='del'>-			PRIV (fds)-&gt;recent_item = item;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	om = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (om), menu);</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (om), DAY_INDEX);</div><div class='del'>-	gtk_widget_show (om);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), om, FALSE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("ago"));</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gtk_misc_set_padding (GTK_MISC (label), 3, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (hbox);</div><div class='del'>-	</div><div class='del'>-	PRIV (fds)-&gt;span_chooser = hbox;</div><div class='del'>-	PRIV (fds)-&gt;omenu = om;</div><div class='del'>-	PRIV (fds)-&gt;spinbutton = sb;</div><div class='del'>-</div><div class='del'>-	/* if we do this earlier, we get the signal before the private</div><div class='del'>-	 * members have been set up. */</div><div class='del'>-	gtk_signal_connect (adj, "value_changed",</div><div class='del'>-			    adj_value_changed, fds);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-omenu_item_activated (GtkMenuItem *item, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *) user_data;</div><div class='del'>-	GtkOptionMenu *om;</div><div class='del'>-	timespan *old_ts, *new_ts;</div><div class='del'>-	int cur_val;</div><div class='del'>-	gfloat new_val;</div><div class='del'>-</div><div class='del'>-	if (!PRIV (fds)-&gt;recent_item) {</div><div class='del'>-		PRIV (fds)-&gt;recent_item = GTK_WIDGET (item);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	om = GTK_OPTION_MENU (PRIV (fds)-&gt;omenu);</div><div class='del'>-	old_ts = gtk_object_get_data (GTK_OBJECT (PRIV (fds)-&gt;recent_item), "timespan");</div><div class='del'>-	new_ts = gtk_object_get_data (GTK_OBJECT (item), "timespan");</div><div class='del'>-</div><div class='del'>-	cur_val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PRIV (fds)-&gt;spinbutton));</div><div class='del'>-</div><div class='del'>-	/*if (old_ts-&gt;seconds &gt; new_ts-&gt;seconds)*/</div><div class='del'>-	new_val = ceil (cur_val * old_ts-&gt;seconds / new_ts-&gt;seconds);</div><div class='del'>-</div><div class='del'>-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (PRIV (fds)-&gt;spinbutton), new_val);</div><div class='del'>-	PRIV (fds)-&gt;recent_item = GTK_WIDGET (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-adj_value_changed (GtkAdjustment *adj, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *) user_data;</div><div class='del'>-	GtkOptionMenu *om;</div><div class='del'>-	timespan *ts;</div><div class='del'>-</div><div class='del'>-	om = GTK_OPTION_MENU (PRIV (fds)-&gt;omenu);</div><div class='del'>-</div><div class='del'>-	if (om-&gt;menu_item == NULL) /* this has happened to me... dunno what it means */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ts = gtk_object_get_data (GTK_OBJECT (om-&gt;menu_item), "timespan");</div><div class='del'>-	fds-&gt;value = ts-&gt;seconds * </div><div class='del'>-		(gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (PRIV (fds)-&gt;spinbutton)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_adjustments (FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	time_t val;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	val = fds-&gt;value;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; N_TIMESPANS; i++) {</div><div class='del'>-		if (val % timespans[i].seconds == 0) {</div><div class='del'>-			gtk_spin_button_set_value (GTK_SPIN_BUTTON (PRIV (fds)-&gt;spinbutton),</div><div class='del'>-						   (gfloat) val / timespans[i].seconds);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (PRIV (fds)-&gt;omenu),</div><div class='del'>-				     N_TIMESPANS - (i + 1));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-format_time (time_t time)</div><div class='del'>-{</div><div class='del'>-	struct tm *as_tm;</div><div class='del'>-	char buf[128];</div><div class='del'>-</div><div class='del'>-	/* no idea if this format is the 'correct' one */</div><div class='del'>-</div><div class='del'>-	as_tm = localtime (&amp;time);</div><div class='del'>-	strftime (buf, 128, _("%b %d %l:%M %p"), as_tm);</div><div class='del'>-	return g_strdup (buf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-describe_button (FilterDatespec *fds)</div><div class='del'>-{</div><div class='del'>-	gchar *desc = NULL;</div><div class='del'>-</div><div class='del'>-	switch (fds-&gt;type) {</div><div class='del'>-	case FDST_UNKNOWN:</div><div class='del'>-		desc = g_strdup (_("&lt;click here to select a date&gt;"));</div><div class='del'>-		break;</div><div class='del'>-	case FDST_NOW:</div><div class='del'>-		desc = g_strdup (_("now"));</div><div class='del'>-		break;</div><div class='del'>-	case FDST_SPECIFIED:</div><div class='del'>-		desc = format_time (fds-&gt;value);</div><div class='del'>-		break;</div><div class='del'>-	case FDST_X_AGO:</div><div class='del'>-		desc = stringify_agoness (fds);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return desc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_day_selected (GtkCalendar *cal, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)user_data;</div><div class='del'>-	struct tm seltime;</div><div class='del'>-	</div><div class='del'>-	seltime.tm_sec = 0;</div><div class='del'>-	seltime.tm_min = 0;</div><div class='del'>-	seltime.tm_hour = 0;</div><div class='del'>-	seltime.tm_mday = cal-&gt;selected_day;</div><div class='del'>-	seltime.tm_mon = cal-&gt;month;</div><div class='del'>-	seltime.tm_year = cal-&gt;year - 1900;</div><div class='del'>-	seltime.tm_isdst = -1;</div><div class='del'>-	</div><div class='del'>-	fds-&gt;value = mktime (&amp;seltime);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-cal_day_selected_double_click (GtkCalendar *cal, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	FilterDatespec *fds = (FilterDatespec *)user_data;</div><div class='del'>-	</div><div class='del'>-	cal_day_selected (cal, user_data);</div><div class='del'>-	PRIV (fds)-&gt;double_click = TRUE;</div><div class='del'>-	gnome_dialog_close (PRIV (fds)-&gt;gd);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h<br/>deleted file mode 100644<br/>index a606cc1d2f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-datespec.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-datespec.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_DATESPEC_H</div><div class='del'>-#define _FILTER_DATESPEC_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_DATESPEC(obj)	GTK_CHECK_CAST (obj, filter_datespec_get_type (), FilterDatespec)</div><div class='del'>-#define FILTER_DATESPEC_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_datespec_get_type (), FilterDatespecClass)</div><div class='del'>-#define IS_FILTER_DATESPEC(obj)      GTK_CHECK_TYPE (obj, filter_datespec_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterDatespec	FilterDatespec;</div><div class='del'>-typedef struct _FilterDatespecClass	FilterDatespecClass;</div><div class='del'>-</div><div class='del'>-typedef enum _FilterDatespec_type { FDST_NOW, FDST_SPECIFIED, FDST_X_AGO, FDST_UNKNOWN } FilterDatespec_type;</div><div class='del'>-</div><div class='del'>-struct _FilterDatespec {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterDatespecPrivate *priv;</div><div class='del'>-</div><div class='del'>-	FilterDatespec_type type;</div><div class='del'>-</div><div class='del'>-	/* either a timespan, an absolute time, or 0</div><div class='del'>-	 * depending on type -- the above mapping to</div><div class='del'>-	 * (X_AGO, SPECIFIED, NOW)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	time_t value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterDatespecClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_datespec_get_type	(void);</div><div class='del'>-FilterDatespec	*filter_datespec_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_DATESPEC_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-editor.c b/filter/filter-editor.c<br/>deleted file mode 100644<br/>index 4f7183b103..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,187 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000, 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-editor.h"</div><div class='del'>-#include "filter-context.h"</div><div class='del'>-#include "filter-filter.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static FilterRule * create_rule(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-static void filter_editor_class_init (FilterEditorClass *class);</div><div class='del'>-static void filter_editor_init (FilterEditor *gspaper);</div><div class='del'>-static void filter_editor_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterEditor *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterEditorPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterEditor",</div><div class='del'>-			sizeof(FilterEditor),</div><div class='del'>-			sizeof(FilterEditorClass),</div><div class='del'>-			(GtkClassInitFunc)filter_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_editor_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (rule_editor_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_editor_class_init (FilterEditorClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *)class;</div><div class='del'>-	RuleEditorClass *re_class = (RuleEditorClass *)class;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (gnome_dialog_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_editor_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	re_class-&gt;create_rule = create_rule;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_editor_init (FilterEditor *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_editor_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterEditor *o = (FilterEditor *)obj;</div><div class='del'>-	</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_editor_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterEditor object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterEditor object.</div><div class='del'>- **/</div><div class='del'>-FilterEditor *</div><div class='del'>-filter_editor_new(FilterContext *f, const char **source_names)</div><div class='del'>-{</div><div class='del'>-	FilterEditor *o = (FilterEditor *)gtk_type_new (filter_editor_get_type ());</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	</div><div class='del'>-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor");</div><div class='del'>-	filter_editor_construct (o, f, gui, source_names);</div><div class='del'>-	</div><div class='del'>-        w = glade_xml_get_widget (gui, "rule_frame");</div><div class='del'>-	gtk_frame_set_label (GTK_FRAME (w), _("Filter Rules"));</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gui));</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_source (GtkMenuItem *mi, FilterEditor *fe)</div><div class='del'>-{</div><div class='del'>-	char *source;</div><div class='del'>-	</div><div class='del'>-	source = gtk_object_get_data (GTK_OBJECT (mi), "source");</div><div class='del'>-	g_assert (source);</div><div class='del'>-	</div><div class='del'>-	rule_editor_set_source ((RuleEditor *)fe, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_editor_construct (FilterEditor *fe, FilterContext *fc, GladeXML *gui, const char **source_names)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu, *item, *omenu;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-        omenu = glade_xml_get_widget (gui, "filter_source");</div><div class='del'>-	gtk_option_menu_remove_menu (GTK_OPTION_MENU (omenu));</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	</div><div class='del'>-	for (i = 0; source_names[i]; i++) {</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(source_names[i]));</div><div class='del'>-		gtk_object_set_data_full (GTK_OBJECT (item), "source", g_strdup (source_names[i]), g_free);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate", select_source, fe);</div><div class='del'>-	}</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	gtk_widget_show (omenu);</div><div class='del'>-	</div><div class='del'>-	rule_editor_construct ((RuleEditor *)fe, (RuleContext *)fc, gui, source_names[0]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterRule *</div><div class='del'>-create_rule (RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = filter_rule_new ();</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	</div><div class='del'>-	/* create a rule with 1 part &amp; 1 action in it */</div><div class='del'>-	rule = (FilterRule *)filter_filter_new ();</div><div class='del'>-	part = rule_context_next_part (re-&gt;context, NULL);</div><div class='del'>-	filter_rule_add_part (rule, filter_part_clone (part));</div><div class='del'>-	part = filter_context_next_action ((FilterContext *)re-&gt;context, NULL);</div><div class='del'>-	filter_filter_add_action ((FilterFilter *)rule, filter_part_clone (part));</div><div class='del'>-	</div><div class='del'>-	return rule;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-editor.h b/filter/filter-editor.h<br/>deleted file mode 100644<br/>index 6a859951a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000, 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_EDITOR_H</div><div class='del'>-#define _FILTER_EDITOR_H</div><div class='del'>-</div><div class='del'>-#include "rule-editor.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_EDITOR(obj)	GTK_CHECK_CAST (obj, filter_editor_get_type (), FilterEditor)</div><div class='del'>-#define FILTER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_editor_get_type (), FilterEditorClass)</div><div class='del'>-#define IS_FILTER_EDITOR(obj)      GTK_CHECK_TYPE (obj, filter_editor_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterEditor	FilterEditor;</div><div class='del'>-typedef struct _FilterEditorClass	FilterEditorClass;</div><div class='del'>-</div><div class='del'>-struct _FilterEditor {</div><div class='del'>-	RuleEditor parent;</div><div class='del'>-	struct _FilterEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterEditorClass {</div><div class='del'>-	RuleEditorClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterContext;</div><div class='del'>-</div><div class='del'>-guint		filter_editor_get_type	(void);</div><div class='del'>-FilterEditor    *filter_editor_new(struct _FilterContext *f, const char **source_names);</div><div class='del'>-void		filter_editor_construct(FilterEditor *fe, struct _FilterContext *fc, struct _GladeXML *gui, const char **source_names);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_EDITOR_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-element.c b/filter/filter-element.c<br/>deleted file mode 100644<br/>index 1d22da1839..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-element.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-element.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,374 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtktypeutils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-#include "filter-input.h"</div><div class='del'>-#include "filter-option.h"</div><div class='del'>-#include "filter-code.h"</div><div class='del'>-#include "filter-colour.h"</div><div class='del'>-#include "filter-datespec.h"</div><div class='del'>-#include "filter-score.h"</div><div class='del'>-#include "filter-int.h"</div><div class='del'>-#include "filter-folder.h"</div><div class='del'>-#include "filter-source.h"</div><div class='del'>-#include "filter-file.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean validate (FilterElement *fe);</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static FilterElement *clone(FilterElement *fe);</div><div class='del'>-</div><div class='del'>-static void filter_element_class_init	(FilterElementClass *class);</div><div class='del'>-static void filter_element_init	(FilterElement *gspaper);</div><div class='del'>-static void filter_element_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterElement *)(x))-&gt;priv)</div><div class='del'>-struct _FilterElementPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_element_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterElement",</div><div class='del'>-			sizeof(FilterElement),</div><div class='del'>-			sizeof(FilterElementClass),</div><div class='del'>-			(GtkClassInitFunc)filter_element_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_element_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(gtk_object_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_element_class_init (FilterElementClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_element_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	class-&gt;validate = validate;</div><div class='del'>-	class-&gt;xml_create = xml_create;</div><div class='del'>-	class-&gt;clone = clone;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_element_init (FilterElement *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_element_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterElement *o = (FilterElement *)obj;</div><div class='del'>-</div><div class='del'>-	xmlFree(o-&gt;name);</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterElement object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterElement object.</div><div class='del'>- **/</div><div class='del'>-FilterElement *</div><div class='del'>-filter_element_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterElement *o = (FilterElement *)gtk_type_new(filter_element_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-filter_element_validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;validate (fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_xml_create:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * @node: xml node</div><div class='del'>- * </div><div class='del'>- * Create a new filter element based on an xml definition of</div><div class='del'>- * that element.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_element_xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_xml_encode:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * </div><div class='del'>- * Encode the values of a filter element into xml format.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-xmlNodePtr</div><div class='del'>-filter_element_xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;xml_encode(fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_xml_decode:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * @node: xml node</div><div class='del'>- * </div><div class='del'>- * Decode the values of a fitler element from xml format.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-filter_element_xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;xml_decode(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_clone:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * </div><div class='del'>- * Clones the FilterElement @fe.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-FilterElement *</div><div class='del'>-filter_element_clone (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;clone(fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_get_widget:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * @node: xml node</div><div class='del'>- * </div><div class='del'>- * Create a widget to represent this element.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-filter_element_get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;get_widget(fe);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_build_code:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * @out: output buffer</div><div class='del'>- * @ff: </div><div class='del'>- * </div><div class='del'>- * Add the code representing this element to the output string @out.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_element_build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;build_code(fe, out, ff);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_format_sexp:</div><div class='del'>- * @fe: filter element</div><div class='del'>- * @out: output buffer</div><div class='del'>- * </div><div class='del'>- * Format the value(s) of this element in a method suitable for the context of</div><div class='del'>- * sexp where it is used.  Usually as space separated, double-quoted strings.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_element_format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	return ((FilterElementClass *)((GtkObject *)fe)-&gt;klass)-&gt;format_sexp(fe, out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_element_new_type_name:</div><div class='del'>- * @type: filter element type</div><div class='del'>- * </div><div class='del'>- * Create a new filter element based on its type name.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-FilterElement *</div><div class='del'>-filter_element_new_type_name (const char *type)</div><div class='del'>-{</div><div class='del'>-	if (type == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (type, "string")) {</div><div class='del'>-		return (FilterElement *)filter_input_new ();</div><div class='del'>-	} else if (!strcmp (type, "folder")) {</div><div class='del'>-		return (FilterElement *)filter_folder_new ();</div><div class='del'>-	} else if (!strcmp (type, "address")) {</div><div class='del'>-		/* FIXME: temporary ... need real address type */</div><div class='del'>-		return (FilterElement *)filter_input_new_type_name (type);</div><div class='del'>-	} else if (!strcmp (type, "code")) {</div><div class='del'>-		return (FilterElement *)filter_code_new ();</div><div class='del'>-	} else if (!strcmp (type, "colour")) {</div><div class='del'>-		return (FilterElement *)filter_colour_new ();</div><div class='del'>-	} else if (!strcmp (type, "optionlist") || !strcmp (type, "system-flag")) {</div><div class='del'>-		return (FilterElement *)filter_option_new ();</div><div class='del'>-	} else if (!strcmp (type, "datespec")) {</div><div class='del'>-		return (FilterElement *)filter_datespec_new ();</div><div class='del'>-	} else if (!strcmp (type, "score")) {</div><div class='del'>-		return (FilterElement *)filter_score_new ();</div><div class='del'>-	} else if (!strcmp (type, "integer")) {</div><div class='del'>-		return (FilterElement *)filter_int_new ();</div><div class='del'>-	} else if (!strcmp (type, "regex")) {</div><div class='del'>-		return (FilterElement *)filter_input_new_type_name (type);</div><div class='del'>-	} else if (!strcmp (type, "source")) {</div><div class='del'>-    	        return (FilterElement *)filter_source_new ();</div><div class='del'>-	} else if (!strcmp (type, "command")) {</div><div class='del'>-		return (FilterElement *) filter_file_new_type_name (type);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning("Unknown filter type '%s'", type);</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_element_set_data (FilterElement *fe, gpointer data)</div><div class='del'>-{</div><div class='del'>-	fe-&gt;data = data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* default implementations */</div><div class='del'>-static gboolean</div><div class='del'>-validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	fe-&gt;name = xmlGetProp (node, "name");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterElement *</div><div class='del'>-clone (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr node;</div><div class='del'>-	FilterElement *new;</div><div class='del'>-</div><div class='del'>-	new = (FilterElement *)gtk_type_new (GTK_OBJECT (fe)-&gt;klass-&gt;type);</div><div class='del'>-	node = filter_element_xml_encode (fe);</div><div class='del'>-	filter_element_xml_decode (new, node);</div><div class='del'>-	xmlFreeNodeList (node);</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* only copies the value, not the name/type */</div><div class='del'>-void</div><div class='del'>-filter_element_copy_value(FilterElement *de, FilterElement *se)</div><div class='del'>-{</div><div class='del'>-	/* bit of a hack, but saves having to do the same in each type ? */</div><div class='del'>-</div><div class='del'>-	if (IS_FILTER_INPUT(se)) {</div><div class='del'>-		if (IS_FILTER_INPUT(de)) {</div><div class='del'>-			if (((FilterInput *)se)-&gt;values)</div><div class='del'>-				filter_input_set_value((FilterInput*)de, ((FilterInput *)se)-&gt;values-&gt;data);</div><div class='del'>-		} else if (IS_FILTER_INT(de)) {</div><div class='del'>-			((FilterInt *)de)-&gt;val = atoi((char *) ((FilterInput *)se)-&gt;values-&gt;data);</div><div class='del'>-		}</div><div class='del'>-	} else if (IS_FILTER_FOLDER(se)) {</div><div class='del'>-		if (IS_FILTER_FOLDER(de)) {</div><div class='del'>-			filter_folder_set_value((FilterFolder *)de, ((FilterFolder *)se)-&gt;uri);</div><div class='del'>-		}</div><div class='del'>-	} else if (IS_FILTER_COLOUR(se)) {</div><div class='del'>-		if (IS_FILTER_COLOUR(de)) {</div><div class='del'>-			FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de;</div><div class='del'>-</div><div class='del'>-			d-&gt;r = s-&gt;r;</div><div class='del'>-			d-&gt;g = s-&gt;g;</div><div class='del'>-			d-&gt;b = s-&gt;b;</div><div class='del'>-			d-&gt;a = s-&gt;a;</div><div class='del'>-		}</div><div class='del'>-	} else if (IS_FILTER_DATESPEC(se)) {</div><div class='del'>-		if (IS_FILTER_DATESPEC(de)) {</div><div class='del'>-			FilterDatespec *s = (FilterDatespec *)se, *d = (FilterDatespec *)de;</div><div class='del'>-</div><div class='del'>-			d-&gt;type = s-&gt;type;</div><div class='del'>-			d-&gt;value = s-&gt;value;</div><div class='del'>-		}</div><div class='del'>-	} else if (IS_FILTER_INT(se)) {</div><div class='del'>-		if (IS_FILTER_INT(de)) {</div><div class='del'>-			FilterInt *s = (FilterInt *)se, *d = (FilterInt *)de;</div><div class='del'>-</div><div class='del'>-			d-&gt;val = s-&gt;val;</div><div class='del'>-		} else if (IS_FILTER_INPUT(de)) {</div><div class='del'>-			FilterInt *s = (FilterInt *)se;</div><div class='del'>-			FilterInput *d = (FilterInput *)de;</div><div class='del'>-			char *v;</div><div class='del'>-</div><div class='del'>-			v = g_strdup_printf("%d", s-&gt;val);</div><div class='del'>-			filter_input_set_value(d, v);</div><div class='del'>-			g_free(v);</div><div class='del'>-		}</div><div class='del'>-	} else if (IS_FILTER_OPTION(se)) {</div><div class='del'>-		if (IS_FILTER_OPTION(de)) {</div><div class='del'>-			FilterOption *s = (FilterOption *)se, *d = (FilterOption *)de;</div><div class='del'>-</div><div class='del'>-			if (s-&gt;current)</div><div class='del'>-				filter_option_set_current(d, s-&gt;current-&gt;value);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-element.h b/filter/filter-element.h<br/>deleted file mode 100644<br/>index d5ff5177ce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-element.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-element.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_ELEMENT_H</div><div class='del'>-#define _FILTER_ELEMENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#define FILTER_ELEMENT(obj)	GTK_CHECK_CAST (obj, filter_element_get_type (), FilterElement)</div><div class='del'>-#define FILTER_ELEMENT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_element_get_type (), FilterElementClass)</div><div class='del'>-#define IS_FILTER_ELEMENT(obj)      GTK_CHECK_TYPE (obj, filter_element_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterElement	FilterElement;</div><div class='del'>-typedef struct _FilterElementClass	FilterElementClass;</div><div class='del'>-</div><div class='del'>-struct _FilterElement {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-	struct _FilterElementPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *name;</div><div class='del'>-	gpointer data;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterPart;</div><div class='del'>-</div><div class='del'>-struct _FilterElementClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	gboolean (*validate)(FilterElement *fe);</div><div class='del'>-	</div><div class='del'>-	void (*xml_create)(FilterElement *, xmlNodePtr);</div><div class='del'>-	xmlNodePtr (*xml_encode)(FilterElement *);</div><div class='del'>-	int (*xml_decode)(FilterElement *, xmlNodePtr);</div><div class='del'>-</div><div class='del'>-	FilterElement *(*clone)(FilterElement *fe);</div><div class='del'>-</div><div class='del'>-	GtkWidget *(*get_widget)(FilterElement *);</div><div class='del'>-	void (*build_code)(FilterElement *, GString *, struct _FilterPart *ff);</div><div class='del'>-	void (*format_sexp)(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_element_get_type	(void);</div><div class='del'>-FilterElement	*filter_element_new	(void);</div><div class='del'>-</div><div class='del'>-FilterElement	*filter_element_new_type_name	(const char *type);</div><div class='del'>-</div><div class='del'>-void            filter_element_set_data (FilterElement *fe, gpointer data);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-gboolean        filter_element_validate         (FilterElement *fe);</div><div class='del'>-</div><div class='del'>-void		filter_element_xml_create	(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-</div><div class='del'>-xmlNodePtr	filter_element_xml_encode	(FilterElement *fe);</div><div class='del'>-int		filter_element_xml_decode	(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-FilterElement	*filter_element_clone		(FilterElement *fe);</div><div class='del'>-void		filter_element_copy_value	(FilterElement *de, FilterElement *se);</div><div class='del'>-</div><div class='del'>-GtkWidget	*filter_element_get_widget	(FilterElement *fe);</div><div class='del'>-void		filter_element_build_code	(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-void		filter_element_format_sexp	(FilterElement *fe, GString *out);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_ELEMENT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-file.c b/filter/filter-file.c<br/>deleted file mode 100644<br/>index 0ca8e31902..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-file.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,311 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-file-entry.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-file.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-static gboolean validate (FilterElement *fe);</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_file_class_init	(FilterFileClass *class);</div><div class='del'>-static void filter_file_init	(FilterFile *gspaper);</div><div class='del'>-static void filter_file_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterFile *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterFilePrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-filter_file_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterFile",</div><div class='del'>-			sizeof (FilterFile),</div><div class='del'>-			sizeof (FilterFileClass),</div><div class='del'>-			(GtkClassInitFunc) filter_file_class_init,</div><div class='del'>-			(GtkObjectInitFunc) filter_file_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_file_class_init (FilterFileClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *) klass;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (filter_element_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_file_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;validate = validate;</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_file_init (FilterFile *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_file_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterFile *o = (FilterFile *) obj;</div><div class='del'>-	</div><div class='del'>-	xmlFree (o-&gt;type);</div><div class='del'>-	g_free (o-&gt;path);</div><div class='del'>-	</div><div class='del'>-	g_free (o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_file_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterFile object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterFile object.</div><div class='del'>- **/</div><div class='del'>-FilterFile *</div><div class='del'>-filter_file_new (void)</div><div class='del'>-{</div><div class='del'>-	return (FilterFile *) gtk_type_new (filter_file_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-FilterFile *</div><div class='del'>-filter_file_new_type_name (const char *type)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file;</div><div class='del'>-	</div><div class='del'>-	file = filter_file_new ();</div><div class='del'>-	file-&gt;type = xmlStrdup (type);</div><div class='del'>-	</div><div class='del'>-	return file;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_file_set_path (FilterFile *file, const char *path)</div><div class='del'>-{</div><div class='del'>-	g_free (file-&gt;path);</div><div class='del'>-	file-&gt;path = g_strdup (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *) fe;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	struct stat st;</div><div class='del'>-	</div><div class='del'>-	if (!file-&gt;path) {</div><div class='del'>-		dialog = gnome_ok_dialog (_("You must specify a file name"));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (strcmp (file-&gt;type, "command") != 0) {</div><div class='del'>-		if (stat (file-&gt;path, &amp;st) == -1 || !S_ISREG (st.st_mode)) {</div><div class='del'>-			char *errmsg;</div><div class='del'>-			</div><div class='del'>-			errmsg = g_strdup_printf (_("File '%s' does not exist or is not a regular file."), file-&gt;path);</div><div class='del'>-			dialog = gnome_ok_dialog (errmsg);</div><div class='del'>-			g_free (errmsg);</div><div class='del'>-			</div><div class='del'>-			gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create (fe, node);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *) fe;</div><div class='del'>-	xmlNodePtr cur, value;</div><div class='del'>-	char *encstr, *type;</div><div class='del'>-	</div><div class='del'>-	type = file-&gt;type ? file-&gt;type : "file";</div><div class='del'>-	</div><div class='del'>-	d(printf ("Encoding %s as xml\n", type));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", type);</div><div class='del'>-	</div><div class='del'>-	cur = xmlNewChild (value, NULL, type, NULL);</div><div class='del'>-	encstr = e_utf8_xml1_encode (file-&gt;path);</div><div class='del'>-	xmlNodeSetContent (cur, encstr);</div><div class='del'>-	g_free (encstr);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *)fe;</div><div class='del'>-	char *name, *str, *type;</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	</div><div class='del'>-	name = xmlGetProp (node, "name");</div><div class='del'>-	type = xmlGetProp (node, "type");</div><div class='del'>-	</div><div class='del'>-	d(printf("Decoding %s from xml %p\n", type, fe));</div><div class='del'>-	d(printf ("Name = %s\n", name));</div><div class='del'>-	</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = name;</div><div class='del'>-	xmlFree (file-&gt;type);</div><div class='del'>-	file-&gt;type = type;</div><div class='del'>-	</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	if (!strcmp (n-&gt;name, type)) {</div><div class='del'>-		char *decstr;</div><div class='del'>-		</div><div class='del'>-		str = xmlNodeGetContent (n);</div><div class='del'>-		if (str) {</div><div class='del'>-			decstr = e_utf8_xml1_decode (str);</div><div class='del'>-			xmlFree (str);</div><div class='del'>-		} else</div><div class='del'>-			decstr = g_strdup ("");</div><div class='del'>-		</div><div class='del'>-		d(printf ("  '%s'\n", decstr));</div><div class='del'>-		</div><div class='del'>-		file-&gt;path = decstr;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Unknown node type '%s' encountered decoding a %s\n", n-&gt;name, type);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_changed (GtkEntry *entry, FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *) fe;</div><div class='del'>-	char *new;</div><div class='del'>-	</div><div class='del'>-	new = e_utf8_gtk_entry_get_text (entry);</div><div class='del'>-	</div><div class='del'>-	g_free (file-&gt;path);</div><div class='del'>-	file-&gt;path = new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *) fe;</div><div class='del'>-	GtkWidget *fileentry, *entry;</div><div class='del'>-	</div><div class='del'>-	fileentry = gnome_file_entry_new (NULL, _("Choose a file"));</div><div class='del'>-	gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (fileentry), file-&gt;path);</div><div class='del'>-	gnome_file_entry_set_modal (GNOME_FILE_ENTRY (fileentry), TRUE);</div><div class='del'>-	</div><div class='del'>-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (fileentry));</div><div class='del'>-	e_utf8_gtk_entry_set_text (entry, file-&gt;path);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe);</div><div class='del'>-	</div><div class='del'>-	return fileentry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterFile *file = (FilterFile *) fe;</div><div class='del'>-	</div><div class='del'>-	e_sexp_encode_string (out, file-&gt;path);</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-file.h b/filter/filter-file.h<br/>deleted file mode 100644<br/>index fa772f7bd2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-file.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2002 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or modify</div><div class='del'>- *  it under the terms of the GNU General Public License as published by</div><div class='del'>- *  the Free Software Foundation; either version 2 of the License, or</div><div class='del'>- *  (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- *  This program is distributed in the hope that it will be useful,</div><div class='del'>- *  but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>- *  GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_FILE_H</div><div class='del'>-#define _FILTER_FILE_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_FILE(obj)         GTK_CHECK_CAST (obj, filter_file_get_type (), FilterFile)</div><div class='del'>-#define FILTER_FILE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_file_get_type (), FilterFileClass)</div><div class='del'>-#define IS_FILTER_FILE(obj)      GTK_CHECK_TYPE (obj, filter_file_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterFile	FilterFile;</div><div class='del'>-typedef struct _FilterFileClass	FilterFileClass;</div><div class='del'>-</div><div class='del'>-struct _FilterFile {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterFilePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	char *type;</div><div class='del'>-	char *path;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterFileClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType filter_file_get_type (void);</div><div class='del'>-</div><div class='del'>-FilterFile *filter_file_new (void);</div><div class='del'>-</div><div class='del'>-FilterFile *filter_file_new_type_name (const char *type);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void filter_file_set_path (FilterFile *file, const char *path);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_FILE_H */</div><div class='head'>diff --git a/filter/filter-filter.c b/filter/filter-filter.c<br/>deleted file mode 100644<br/>index 199018da6c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-filter.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,535 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000-2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@ximian.com&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkscrolledwindow.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-filter.h"</div><div class='del'>-#include "filter-context.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static int validate(FilterRule *);</div><div class='del'>-static xmlNodePtr xml_encode (FilterRule *);</div><div class='del'>-static int xml_decode (FilterRule *, xmlNodePtr, struct _RuleContext *f);</div><div class='del'>-static void rule_copy (FilterRule *dest, FilterRule *src);</div><div class='del'>-/*static void build_code(FilterRule *, GString *out);*/</div><div class='del'>-static GtkWidget *get_widget (FilterRule *fr, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-static void filter_filter_class_init (FilterFilterClass *class);</div><div class='del'>-static void filter_filter_init (FilterFilter *gspaper);</div><div class='del'>-static void filter_filter_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterFilter *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterFilterPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterRuleClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_filter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterFilter",</div><div class='del'>-			sizeof(FilterFilter),</div><div class='del'>-			sizeof(FilterFilterClass),</div><div class='del'>-			(GtkClassInitFunc)filter_filter_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_filter_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(filter_rule_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_filter_class_init (FilterFilterClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_rule_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_filter_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_rule-&gt;validate = validate;</div><div class='del'>-	filter_rule-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_rule-&gt;xml_decode = xml_decode;</div><div class='del'>-	/*filter_rule-&gt;build_code = build_code;*/</div><div class='del'>-	filter_rule-&gt;copy = rule_copy;</div><div class='del'>-	filter_rule-&gt;get_widget = get_widget;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_filter_init (FilterFilter *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unref_list (GList *l)</div><div class='del'>-{</div><div class='del'>-	while (l) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (l-&gt;data));</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_filter_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterFilter *o = (FilterFilter *)obj;</div><div class='del'>-	</div><div class='del'>-	unref_list (o-&gt;actions);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_filter_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterFilter object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterFilter object.</div><div class='del'>- **/</div><div class='del'>-FilterFilter *</div><div class='del'>-filter_filter_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterFilter *o = (FilterFilter *)gtk_type_new(filter_filter_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_filter_add_action (FilterFilter *fr, FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	fr-&gt;actions = g_list_append (fr-&gt;actions, fp);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed((FilterRule *)fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_filter_remove_action (FilterFilter *fr, FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	fr-&gt;actions = g_list_remove (fr-&gt;actions, fp);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed((FilterRule *)fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_filter_replace_action (FilterFilter *fr, FilterPart *fp, FilterPart *new)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	l = g_list_find (fr-&gt;actions, fp);</div><div class='del'>-	if (l) {</div><div class='del'>-		l-&gt;data = new;</div><div class='del'>-	} else {</div><div class='del'>-		fr-&gt;actions = g_list_append (fr-&gt;actions, new);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed((FilterRule *)fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_filter_build_action (FilterFilter *fr, GString *out)</div><div class='del'>-{</div><div class='del'>-	g_string_append (out, "(begin\n");</div><div class='del'>-	filter_part_build_code_list (fr-&gt;actions, out);</div><div class='del'>-	g_string_append (out, ")\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-validate(FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	int valid;</div><div class='del'>-	GList *parts;</div><div class='del'>-	FilterFilter *ff = (FilterFilter *)fr;</div><div class='del'>-</div><div class='del'>-        valid = ((FilterRuleClass *)(parent_class))-&gt;validate(fr);</div><div class='del'>-</div><div class='del'>-	/* validate rule actions */</div><div class='del'>-	parts = ff-&gt;actions;</div><div class='del'>-	while (parts &amp;&amp; valid) {</div><div class='del'>-		valid = filter_part_validate((FilterPart *)parts-&gt;data);</div><div class='del'>-		parts = parts-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr node, set, work;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterFilter *ff = (FilterFilter *)fr;</div><div class='del'>-	</div><div class='del'>-        node = ((FilterRuleClass *)(parent_class))-&gt;xml_encode (fr);</div><div class='del'>-	g_assert (node != NULL);</div><div class='del'>-	set = xmlNewNode (NULL, "actionset");</div><div class='del'>-	xmlAddChild (node, set);</div><div class='del'>-	l = ff-&gt;actions;</div><div class='del'>-	while (l) {</div><div class='del'>-		work = filter_part_xml_encode ((FilterPart *)l-&gt;data);</div><div class='del'>-		xmlAddChild (set, work);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return node;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_set (xmlNodePtr node, FilterFilter *ff, RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr work;</div><div class='del'>-	char *rulename;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	</div><div class='del'>-	work = node-&gt;childs;</div><div class='del'>-	while (work) {</div><div class='del'>-		if (!strcmp (work-&gt;name, "part")) {</div><div class='del'>-			rulename = xmlGetProp (work, "name");</div><div class='del'>-			part = filter_context_find_action ((FilterContext *)f, rulename);</div><div class='del'>-			if (part) {</div><div class='del'>-				part = filter_part_clone (part);</div><div class='del'>-				filter_part_xml_decode (part, work);</div><div class='del'>-				filter_filter_add_action (ff, part);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning ("cannot find rule part '%s'\n", rulename);</div><div class='del'>-			}</div><div class='del'>-			xmlFree (rulename);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unknwon xml node in part: %s", work-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		work = work-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr work;</div><div class='del'>-	FilterFilter *ff = (FilterFilter *)fr;</div><div class='del'>-	int result;</div><div class='del'>-	</div><div class='del'>-        result = ((FilterRuleClass *)(parent_class))-&gt;xml_decode (fr, node, f);</div><div class='del'>-	if (result != 0)</div><div class='del'>-		return result;</div><div class='del'>-	</div><div class='del'>-	work = node-&gt;childs;</div><div class='del'>-	while (work) {</div><div class='del'>-		if (!strcmp (work-&gt;name, "actionset")) {</div><div class='del'>-			load_set (work, ff, f);</div><div class='del'>-		}</div><div class='del'>-		work = work-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_copy (FilterRule *dest, FilterRule *src)</div><div class='del'>-{</div><div class='del'>-	FilterFilter *fdest, *fsrc;</div><div class='del'>-	GList *node;</div><div class='del'>-	</div><div class='del'>-	fdest = (FilterFilter *) dest;</div><div class='del'>-	fsrc = (FilterFilter *) src;</div><div class='del'>-	</div><div class='del'>-	if (fdest-&gt;actions) {</div><div class='del'>-		g_list_foreach (fdest-&gt;actions, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (fdest-&gt;actions);</div><div class='del'>-		fdest-&gt;actions = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	node = fsrc-&gt;actions;</div><div class='del'>-	while (node) {</div><div class='del'>-		FilterPart *part = node-&gt;data;</div><div class='del'>-		</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (part));</div><div class='del'>-		fdest-&gt;actions = g_list_append (fdest-&gt;actions, part);</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	((FilterRuleClass *)(parent_class))-&gt;copy (dest, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*static void build_code(FilterRule *fr, GString *out)</div><div class='del'>-{</div><div class='del'>-        return ((FilterRuleClass *)(parent_class))-&gt;build_code(fr, out);</div><div class='del'>-}*/</div><div class='del'>-</div><div class='del'>-struct _part_data {</div><div class='del'>-	FilterRule *fr;</div><div class='del'>-	FilterContext *f;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	GtkWidget *partwidget, *container;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-option_activate (GtkMenuItem *item, struct _part_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");</div><div class='del'>-	FilterPart *newpart;</div><div class='del'>-	</div><div class='del'>-	/* dont update if we haven't changed */</div><div class='del'>-	if (!strcmp (part-&gt;title, data-&gt;part-&gt;title))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* here we do a widget shuffle, throw away the old widget/rulepart,</div><div class='del'>-	   and create another */</div><div class='del'>-	if (data-&gt;partwidget)</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (data-&gt;container), data-&gt;partwidget);</div><div class='del'>-	</div><div class='del'>-	newpart = filter_part_clone (part);</div><div class='del'>-	filter_part_copy_values(newpart, data-&gt;part);</div><div class='del'>-	filter_filter_replace_action ((FilterFilter *)data-&gt;fr, data-&gt;part, newpart);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (data-&gt;part));</div><div class='del'>-	data-&gt;part = newpart;</div><div class='del'>-	data-&gt;partwidget = filter_part_get_widget (newpart);</div><div class='del'>-	if (data-&gt;partwidget)</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (data-&gt;container), data-&gt;partwidget, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (data-&gt;container), "part", newpart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_rule_part_widget (FilterContext *f, FilterPart *newpart, FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part = NULL;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *p;</div><div class='del'>-	int index = 0, current = 0;</div><div class='del'>-	struct _part_data *data;</div><div class='del'>-	</div><div class='del'>-	data = g_malloc0 (sizeof (*data));</div><div class='del'>-	data-&gt;fr = fr;</div><div class='del'>-	data-&gt;f = f;</div><div class='del'>-	data-&gt;part = newpart;</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	p = filter_part_get_widget (newpart);</div><div class='del'>-	</div><div class='del'>-	data-&gt;partwidget = p;</div><div class='del'>-	data-&gt;container = hbox;</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	while ((part = filter_context_next_action (f, part))) {</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(part-&gt;title));</div><div class='del'>-		</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "part", part);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		</div><div class='del'>-		if (!strcmp (newpart-&gt;title, part-&gt;title)) {</div><div class='del'>-			current = index;</div><div class='del'>-		}</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);</div><div class='del'>-	gtk_widget_show (omenu);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);</div><div class='del'>-	if (p) {</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-	</div><div class='del'>-	return hbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _rule_data {</div><div class='del'>-	FilterRule *fr;</div><div class='del'>-	FilterContext *f;</div><div class='del'>-	GtkWidget *parts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-less_parts (GtkWidget *button, struct _rule_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	GtkWidget *rule;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	l = ((FilterFilter *)data-&gt;fr)-&gt;actions;</div><div class='del'>-	if (g_list_length (l) &lt; 2)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	rule = gtk_object_get_data (GTK_OBJECT (button), "rule");</div><div class='del'>-	part = gtk_object_get_data (GTK_OBJECT (rule), "part");</div><div class='del'>-	</div><div class='del'>-	/* remove the part from the list */</div><div class='del'>-	filter_filter_remove_action ((FilterFilter *)data-&gt;fr, part);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-	</div><div class='del'>-	/* and from the display */</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (data-&gt;parts), rule);</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (data-&gt;parts), button);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attach_rule (GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *remove;</div><div class='del'>-	GtkWidget *pixmap;</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach (GTK_TABLE (data-&gt;parts), rule, 0, 1, row, row + 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);</div><div class='del'>-	</div><div class='del'>-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);</div><div class='del'>-	remove = gnome_pixmap_button (pixmap, _("Remove"));</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (remove), "rule", rule);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (rule), "part", part);</div><div class='del'>-	/*gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);*/</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (data-&gt;parts), remove, 1, 2, row, row + 1,</div><div class='del'>-			  0, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (remove);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-more_parts (GtkWidget *button, struct _rule_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *new;</div><div class='del'>-	</div><div class='del'>-	/* create a new rule entry, use the first type of rule */</div><div class='del'>-	new = filter_context_next_action ((FilterContext *)data-&gt;f, NULL);</div><div class='del'>-	if (new) {</div><div class='del'>-		GtkWidget *w;</div><div class='del'>-		guint16 rows;</div><div class='del'>-		</div><div class='del'>-		new = filter_part_clone (new);</div><div class='del'>-		filter_filter_add_action ((FilterFilter *)data-&gt;fr, new);</div><div class='del'>-		w = get_rule_part_widget (data-&gt;f, new, data-&gt;fr);</div><div class='del'>-		</div><div class='del'>-		rows = GTK_TABLE (data-&gt;parts)-&gt;nrows;</div><div class='del'>-		gtk_table_resize (GTK_TABLE (data-&gt;parts), rows + 1, 2);</div><div class='del'>-		attach_rule (w, data, new, rows);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterRule *fr, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *parts, *inframe;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *add, *pixmap;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *scrolledwindow;</div><div class='del'>-	GtkObject *hadj, *vadj;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	struct _rule_data *data;</div><div class='del'>-	FilterFilter *ff = (FilterFilter *)fr;</div><div class='del'>-	gint rows, i = 0;</div><div class='del'>-	</div><div class='del'>-        widget = ((FilterRuleClass *)(parent_class))-&gt;get_widget (fr, f);</div><div class='del'>-	</div><div class='del'>-	/* and now for the action area */</div><div class='del'>-	frame = gtk_frame_new (_("Then"));</div><div class='del'>-	inframe = gtk_vbox_new (FALSE, 3);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), inframe);</div><div class='del'>-	</div><div class='del'>-	rows = g_list_length (ff-&gt;actions);</div><div class='del'>-	parts = gtk_table_new (rows, 2, FALSE);</div><div class='del'>-	data = g_malloc0 (sizeof (*data));</div><div class='del'>-	data-&gt;f = (FilterContext *)f;</div><div class='del'>-	data-&gt;fr = fr;</div><div class='del'>-	data-&gt;parts = parts;</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);</div><div class='del'>-	add = gnome_pixmap_button (pixmap, _("Add action"));</div><div class='del'>-	/* gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE); */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	l = ff-&gt;actions;</div><div class='del'>-	while (l) {</div><div class='del'>-		part = l-&gt;data;</div><div class='del'>-		d(printf ("adding action %s\n", part-&gt;title));</div><div class='del'>-		w = get_rule_part_widget ((FilterContext *)f, part, fr);</div><div class='del'>-		attach_rule (w, data, part, i++);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);</div><div class='del'>-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);</div><div class='del'>-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),</div><div class='del'>-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);</div><div class='del'>-	</div><div class='del'>-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);</div><div class='del'>-	</div><div class='del'>-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3);*/</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (frame);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);</div><div class='del'>-	</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-filter.h b/filter/filter-filter.h<br/>deleted file mode 100644<br/>index 54c4a144f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-filter.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-filter.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_FILTER_H</div><div class='del'>-#define _FILTER_FILTER_H</div><div class='del'>-</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_FILTER(obj)	GTK_CHECK_CAST (obj, filter_filter_get_type (), FilterFilter)</div><div class='del'>-#define FILTER_FILTER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_filter_get_type (), FilterFilterClass)</div><div class='del'>-#define IS_FILTER_FILTER(obj)      GTK_CHECK_TYPE (obj, filter_filter_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterFilter	FilterFilter;</div><div class='del'>-typedef struct _FilterFilterClass	FilterFilterClass;</div><div class='del'>-</div><div class='del'>-struct _FilterFilter {</div><div class='del'>-	FilterRule parent;</div><div class='del'>-	struct _FilterFilterPrivate *priv;</div><div class='del'>-</div><div class='del'>-	GList *actions;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterFilterClass {</div><div class='del'>-	FilterRuleClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_filter_get_type	(void);</div><div class='del'>-FilterFilter	*filter_filter_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		filter_filter_add_action	(FilterFilter *fr, FilterPart *fp);</div><div class='del'>-void		filter_filter_remove_action	(FilterFilter *fr, FilterPart *fp);</div><div class='del'>-void		filter_filter_replace_action	(FilterFilter *fr, FilterPart *fp, FilterPart *new);</div><div class='del'>-</div><div class='del'>-void		filter_filter_build_action	(FilterFilter *fr, GString *out);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_FILTER_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-folder.c b/filter/filter-folder.c<br/>deleted file mode 100644<br/>index 100b4fe253..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-folder.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,250 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-folder.h"</div><div class='del'>-#include "shell/evolution-folder-selector-button.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static gboolean validate (FilterElement *fe);</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-extern EvolutionShellClient *global_shell_client;</div><div class='del'>-</div><div class='del'>-static void filter_folder_class_init	(FilterFolderClass *class);</div><div class='del'>-static void filter_folder_init	(FilterFolder *gspaper);</div><div class='del'>-static void filter_folder_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterFolder *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterFolderPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterFolder",</div><div class='del'>-			sizeof(FilterFolder),</div><div class='del'>-			sizeof(FilterFolderClass),</div><div class='del'>-			(GtkClassInitFunc)filter_folder_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_folder_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_folder_class_init (FilterFolderClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_element_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_folder_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;validate = validate;</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_folder_init (FilterFolder *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_folder_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterFolder *o = (FilterFolder *)obj;</div><div class='del'>-	</div><div class='del'>-	g_free (o-&gt;uri);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_folder_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterFolder object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterFolder object.</div><div class='del'>- **/</div><div class='del'>-FilterFolder *</div><div class='del'>-filter_folder_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterFolder *o = (FilterFolder *)gtk_type_new (filter_folder_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_folder_set_value(FilterFolder *ff, const char *uri)</div><div class='del'>-{</div><div class='del'>-	g_free(ff-&gt;uri);</div><div class='del'>-	ff-&gt;uri = g_strdup(uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterFolder *ff = (FilterFolder *) fe;</div><div class='del'>-	</div><div class='del'>-	if (ff-&gt;uri &amp;&amp; *ff-&gt;uri) {</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		</div><div class='del'>-		dialog = gnome_ok_dialog (_("You forgot to choose a folder.\n"</div><div class='del'>-					    "Please go back and specify a valid folder to deliver mail to."));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value, work;</div><div class='del'>-	FilterFolder *ff = (FilterFolder *)fe;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Encoding folder as xml\n"));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "folder");</div><div class='del'>-	</div><div class='del'>-	work = xmlNewChild (value, NULL, "folder", NULL);</div><div class='del'>-	xmlSetProp (work, "uri", ff-&gt;uri);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterFolder *ff = (FilterFolder *)fe;</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Decoding folder from xml %p\n", fe));</div><div class='del'>-	</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = xmlGetProp (node, "name");</div><div class='del'>-	</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, "folder")) {</div><div class='del'>-			char *uri;</div><div class='del'>-</div><div class='del'>-			uri = xmlGetProp (n, "uri");</div><div class='del'>-			g_free (ff-&gt;uri);</div><div class='del'>-			ff-&gt;uri = g_strdup (uri);</div><div class='del'>-			xmlFree (uri);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_selected (EvolutionFolderSelectorButton *button,</div><div class='del'>-		 GNOME_Evolution_Folder *folder,</div><div class='del'>-		 FilterFolder *ff)</div><div class='del'>-{</div><div class='del'>-	g_free (ff-&gt;uri);</div><div class='del'>-	ff-&gt;uri = g_strdup (folder-&gt;physicalUri);</div><div class='del'>-	</div><div class='del'>-	gdk_window_raise (GTK_WIDGET (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW))-&gt;window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	static const char *allowed_types[] = { "mail", NULL };</div><div class='del'>-	FilterFolder *ff = (FilterFolder *)fe;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	</div><div class='del'>-	button = evolution_folder_selector_button_new (global_shell_client,</div><div class='del'>-						       _("Select Folder"),</div><div class='del'>-						       ff-&gt;uri,</div><div class='del'>-						       allowed_types);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (button), "selected", folder_selected, ff);</div><div class='del'>-	</div><div class='del'>-	return button;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterFolder *ff = (FilterFolder *)fe;</div><div class='del'>-	</div><div class='del'>-	e_sexp_encode_string (out, ff-&gt;uri);</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-folder.h b/filter/filter-folder.h<br/>deleted file mode 100644<br/>index d69a5e5352..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-folder.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_FOLDER_H</div><div class='del'>-#define _FILTER_FOLDER_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_FOLDER(obj)	GTK_CHECK_CAST (obj, filter_folder_get_type (), FilterFolder)</div><div class='del'>-#define FILTER_FOLDER_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_folder_get_type (), FilterFolderClass)</div><div class='del'>-#define IS_FILTER_FOLDER(obj)      GTK_CHECK_TYPE (obj, filter_folder_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterFolder	FilterFolder;</div><div class='del'>-typedef struct _FilterFolderClass	FilterFolderClass;</div><div class='del'>-</div><div class='del'>-struct _FilterFolder {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterFolderPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *uri;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterFolderClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_folder_get_type	(void);</div><div class='del'>-FilterFolder	*filter_folder_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void            filter_folder_set_value(FilterFolder *ff, const char *uri);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_FOLDER_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-input.c b/filter/filter-input.c<br/>deleted file mode 100644<br/>index 8343abbfa8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-input.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-input.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,347 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-input.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-static gboolean validate (FilterElement *fe);</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_input_class_init	(FilterInputClass *class);</div><div class='del'>-static void filter_input_init	(FilterInput *gspaper);</div><div class='del'>-static void filter_input_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterInput *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterInputPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_input_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterInput",</div><div class='del'>-			sizeof(FilterInput),</div><div class='del'>-			sizeof(FilterInputClass),</div><div class='del'>-			(GtkClassInitFunc)filter_input_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_input_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_input_class_init (FilterInputClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_element_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_input_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;validate = validate;</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_input_init (FilterInput *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_input_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterInput *o = (FilterInput *)obj;</div><div class='del'>-</div><div class='del'>-	xmlFree (o-&gt;type);</div><div class='del'>-	g_list_foreach(o-&gt;values, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free(o-&gt;values);</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_input_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterInput object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterInput object.</div><div class='del'>- **/</div><div class='del'>-FilterInput *</div><div class='del'>-filter_input_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterInput *o = (FilterInput *)gtk_type_new(filter_input_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterInput *</div><div class='del'>-filter_input_new_type_name (const char *type)</div><div class='del'>-{</div><div class='del'>-	FilterInput *o = filter_input_new ();</div><div class='del'>-	o-&gt;type = xmlStrdup (type);</div><div class='del'>-	</div><div class='del'>-	d(printf("new type %s = %p\n", type, o));</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_input_set_value (FilterInput *fi, const char *value)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	l = fi-&gt;values;</div><div class='del'>-	while (l) {</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (fi-&gt;values);</div><div class='del'>-	</div><div class='del'>-	fi-&gt;values = g_list_append (NULL, g_strdup (value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-validate (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	gboolean valid = TRUE;</div><div class='del'>-	</div><div class='del'>-	if (fi-&gt;values &amp;&amp; !strcmp (fi-&gt;type, "regex")) {</div><div class='del'>-		regex_t regexpat;        /* regex patern */</div><div class='del'>-		gint regerr;</div><div class='del'>-		char *text;</div><div class='del'>-		</div><div class='del'>-		text = fi-&gt;values-&gt;data;</div><div class='del'>-		</div><div class='del'>-		regerr = regcomp (&amp;regexpat, text, REG_EXTENDED | REG_NEWLINE | REG_ICASE);</div><div class='del'>-		if (regerr) {</div><div class='del'>-			GtkWidget *dialog;</div><div class='del'>-			gchar *regmsg, *errmsg;</div><div class='del'>-			size_t reglen;</div><div class='del'>-			</div><div class='del'>-			/* regerror gets called twice to get the full error string </div><div class='del'>-			   length to do proper posix error reporting */</div><div class='del'>-			reglen = regerror (regerr, &amp;regexpat, 0, 0);</div><div class='del'>-			regmsg = g_malloc0 (reglen + 1);</div><div class='del'>-			regerror (regerr, &amp;regexpat, regmsg, reglen);</div><div class='del'>-			</div><div class='del'>-			errmsg = g_strdup_printf (_("Error in regular expression '%s':\n%s"),</div><div class='del'>-						  text, regmsg);</div><div class='del'>-			g_free (regmsg);</div><div class='del'>-			</div><div class='del'>-			dialog = gnome_ok_dialog (errmsg);</div><div class='del'>-			</div><div class='del'>-			gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-			</div><div class='del'>-			g_free (errmsg);</div><div class='del'>-			valid = FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		regfree (&amp;regexpat);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	char *type;</div><div class='del'>-	</div><div class='del'>-	type = fi-&gt;type ? fi-&gt;type : "string";</div><div class='del'>-	</div><div class='del'>-	d(printf ("Encoding %s as xml\n", type));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", type);</div><div class='del'>-	l = fi-&gt;values;</div><div class='del'>-	while (l) {</div><div class='del'>-                xmlNodePtr cur;</div><div class='del'>-		char *str = l-&gt;data;</div><div class='del'>-		char *encstr;</div><div class='del'>-		</div><div class='del'>-                cur = xmlNewChild (value, NULL, type, NULL);</div><div class='del'>-		encstr = e_utf8_xml1_encode (str);</div><div class='del'>-		xmlNodeSetContent (cur, encstr);</div><div class='del'>-		g_free (encstr);</div><div class='del'>-                l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	char *name, *str, *type;</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	</div><div class='del'>-	name = xmlGetProp (node, "name");</div><div class='del'>-	type = xmlGetProp (node, "type");</div><div class='del'>-	</div><div class='del'>-	d(printf("Decoding %s from xml %p\n", type, fe));</div><div class='del'>-	d(printf ("Name = %s\n", name));</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = name;</div><div class='del'>-	xmlFree (fi-&gt;type);</div><div class='del'>-	fi-&gt;type = type;</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, type)) {</div><div class='del'>-			gchar *decstr;</div><div class='del'>-			str = xmlNodeGetContent (n);</div><div class='del'>-			if (str) {</div><div class='del'>-				decstr = e_utf8_xml1_decode (str);</div><div class='del'>-				xmlFree (str);</div><div class='del'>-			} else</div><div class='del'>-				decstr = g_strdup("");</div><div class='del'>-</div><div class='del'>-			d(printf ("  '%s'\n", decstr));</div><div class='del'>-			fi-&gt;values = g_list_append (fi-&gt;values, decstr);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unknown node type '%s' encountered decoding a %s\n", n-&gt;name, type);</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_changed (GtkEntry *entry, FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	char *new;</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	new = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	</div><div class='del'>-	/* NOTE: entry only supports a single value ... */</div><div class='del'>-	l = fi-&gt;values;</div><div class='del'>-	while (l) {</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_list_free (fi-&gt;values);</div><div class='del'>-	</div><div class='del'>-	fi-&gt;values = g_list_append (NULL, new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	</div><div class='del'>-	entry = gtk_entry_new ();</div><div class='del'>-	if (fi-&gt;values &amp;&amp; fi-&gt;values-&gt;data) {</div><div class='del'>-		e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), fi-&gt;values-&gt;data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (entry), "changed", entry_changed, fe);</div><div class='del'>-	</div><div class='del'>-	return entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterInput *fi = (FilterInput *)fe;</div><div class='del'>-	</div><div class='del'>-	l = fi-&gt;values;</div><div class='del'>-	while (l) {</div><div class='del'>-		e_sexp_encode_string (out, l-&gt;data);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-input.h b/filter/filter-input.h<br/>deleted file mode 100644<br/>index ab03391116..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-input.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-input.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_INPUT_H</div><div class='del'>-#define _FILTER_INPUT_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_INPUT(obj)	GTK_CHECK_CAST (obj, filter_input_get_type (), FilterInput)</div><div class='del'>-#define FILTER_INPUT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_input_get_type (), FilterInputClass)</div><div class='del'>-#define IS_FILTER_INPUT(obj)      GTK_CHECK_TYPE (obj, filter_input_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterInput	FilterInput;</div><div class='del'>-typedef struct _FilterInputClass	FilterInputClass;</div><div class='del'>-</div><div class='del'>-struct _FilterInput {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterInputPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *type;		/* name of type */</div><div class='del'>-	GList *values;		/* strings */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterInputClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_input_get_type	(void);</div><div class='del'>-FilterInput	*filter_input_new	(void);</div><div class='del'>-</div><div class='del'>-FilterInput	*filter_input_new_type_name	(const char *type);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		filter_input_set_value(FilterInput *fi, const char *value);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_INPUT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-int.c b/filter/filter-int.c<br/>deleted file mode 100644<br/>index 0fb0685aec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-int.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-int.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Ripped off by Sam Creasey &lt;sammy@oh.verio.com&gt; from</div><div class='del'>- *  filter-score by Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-#include "filter-int.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void xml_create (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode (FilterElement *fe);</div><div class='del'>-static int xml_decode (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget (FilterElement *fe);</div><div class='del'>-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp (FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_int_class_init (FilterIntClass *class);</div><div class='del'>-static void filter_int_init (FilterInt *gspaper);</div><div class='del'>-static void filter_int_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterInt *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterIntPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_int_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterInt",</div><div class='del'>-			sizeof (FilterInt),</div><div class='del'>-			sizeof (FilterIntClass),</div><div class='del'>-			(GtkClassInitFunc) filter_int_class_init,</div><div class='del'>-			(GtkObjectInitFunc) filter_int_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_int_class_init (FilterIntClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_element_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_int_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_int_init (FilterInt *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_int_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterInt *o = (FilterInt *)obj;</div><div class='del'>-	</div><div class='del'>-	o = o;</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_int_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterInt object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterInt object.</div><div class='del'>- **/</div><div class='del'>-FilterInt *</div><div class='del'>-filter_int_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterInt *o = (FilterInt *)gtk_type_new(filter_int_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	FilterInt *fs = (FilterInt *)fe;</div><div class='del'>-	char *intval;</div><div class='del'>-	</div><div class='del'>-	d(printf("Encoding integer as xml\n"));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "integer");</div><div class='del'>-	</div><div class='del'>-	intval = g_strdup_printf ("%d", fs-&gt;val);</div><div class='del'>-	xmlSetProp (value, "integer", intval);</div><div class='del'>-	g_free (intval);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterInt *fs = (FilterInt *)fe;</div><div class='del'>-	char *name;</div><div class='del'>-	char *intval;</div><div class='del'>-	</div><div class='del'>-	d(printf("Decoding integer from xml %p\n", fe));</div><div class='del'>-	</div><div class='del'>-	name = xmlGetProp (node, "name");</div><div class='del'>-	d(printf ("Name = %s\n", name));</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = name;</div><div class='del'>-	intval = xmlGetProp (node, "integer");</div><div class='del'>-	if (intval) {</div><div class='del'>-		fs-&gt;val = atoi (intval);</div><div class='del'>-		xmlFree (intval);</div><div class='del'>-	} else</div><div class='del'>-		fs-&gt;val = 0;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spin_changed (GtkWidget *spin, FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterInt *fs = (FilterInt *)fe;</div><div class='del'>-	</div><div class='del'>-	fs-&gt;val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *spin;</div><div class='del'>-	GtkObject *adjustment;</div><div class='del'>-	FilterInt *fs = (FilterInt *)fe;</div><div class='del'>-	</div><div class='del'>-	adjustment = gtk_adjustment_new (0.0, 0.0, (gfloat)G_MAXINT, </div><div class='del'>-					 1.0, 1.0, 1.0);</div><div class='del'>-	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 5.0, 0);</div><div class='del'>-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);</div><div class='del'>-	</div><div class='del'>-	if (fs-&gt;val) {</div><div class='del'>-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs-&gt;val);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (spin), "changed", spin_changed, fe);</div><div class='del'>-	</div><div class='del'>-	return spin;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterInt *fs = (FilterInt *)fe;</div><div class='del'>-	</div><div class='del'>-	g_string_append(out, g_strdup_printf("%d", fs-&gt;val));</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-int.h b/filter/filter-int.h<br/>deleted file mode 100644<br/>index 7a451f29ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-int.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-int.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Ripped off by Sam Creasey &lt;sammy@oh.verio.com&gt; from filter-score by:</div><div class='del'>- *</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *  You should have received a copy of the GNU General Public License</div><div class='del'>- *  along with this program; if not, write to the Free Software</div><div class='del'>- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_INT_H</div><div class='del'>-#define _FILTER_INT_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_INT(obj)           GTK_CHECK_CAST (obj, filter_int_get_type (), FilterInt)</div><div class='del'>-#define FILTER_INT_CLASS(klass)   GTK_CHECK_CLASS_CAST (klass, filter_int_get_type (), FilterIntClass)</div><div class='del'>-#define IS_FILTER_INT(obj)        GTK_CHECK_TYPE (obj, filter_int_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterInt        FilterInt;</div><div class='del'>-typedef struct _FilterIntClass   FilterIntClass;</div><div class='del'>-</div><div class='del'>-struct _FilterInt {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterIntPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	gint32 val;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterIntClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_int_get_type	(void);</div><div class='del'>-FilterInt	*filter_int_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_INT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-option.c b/filter/filter-option.c<br/>deleted file mode 100644<br/>index b0e1abc3d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-option.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-option.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,361 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-option.h"</div><div class='del'>-#include "filter-part.h"</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static FilterElement *clone(FilterElement *fe);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_option_class_init	(FilterOptionClass *class);</div><div class='del'>-static void filter_option_init	(FilterOption *gspaper);</div><div class='del'>-static void filter_option_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterOption *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterOptionPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_option_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterOption",</div><div class='del'>-			sizeof(FilterOption),</div><div class='del'>-			sizeof(FilterOptionClass),</div><div class='del'>-			(GtkClassInitFunc)filter_option_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_option_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_option_class_init (FilterOptionClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_element_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_option_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;clone = clone;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_option_init (FilterOption *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_option(struct _filter_option *o, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free(o-&gt;title);</div><div class='del'>-	xmlFree (o-&gt;value);</div><div class='del'>-	g_free(o-&gt;code);</div><div class='del'>-	g_free(o);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_option_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterOption *o = (FilterOption *)obj;</div><div class='del'>-</div><div class='del'>-	g_list_foreach(o-&gt;options, (GFunc)free_option, NULL);</div><div class='del'>-	g_list_free(o-&gt;options);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_option_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterOption object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterOption object.</div><div class='del'>- **/</div><div class='del'>-FilterOption *</div><div class='del'>-filter_option_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterOption *o = (FilterOption *)gtk_type_new (filter_option_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _filter_option *</div><div class='del'>-find_option (FilterOption *fo, const char *name)</div><div class='del'>-{</div><div class='del'>-	GList *l = fo-&gt;options;</div><div class='del'>-	struct _filter_option *op;</div><div class='del'>-	</div><div class='del'>-	while (l) {</div><div class='del'>-		op = l-&gt;data;</div><div class='del'>-		if (!strcmp (name, op-&gt;value)) {</div><div class='del'>-			return op;</div><div class='del'>-		}</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_option_set_current (FilterOption *option, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_assert(IS_FILTER_OPTION(option));</div><div class='del'>-	</div><div class='del'>-	option-&gt;current = find_option (option, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	xmlNodePtr n, work;</div><div class='del'>-	struct _filter_option *op;</div><div class='del'>-	</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-	</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, "option")) {</div><div class='del'>-			op = g_malloc0 (sizeof (*op));</div><div class='del'>-			op-&gt;value = xmlGetProp (n, "value");</div><div class='del'>-			work = n-&gt;childs;</div><div class='del'>-			while (work) {</div><div class='del'>-				if (!strcmp (work-&gt;name, "title")) {</div><div class='del'>-					if (!op-&gt;title) {</div><div class='del'>-						gchar *str, *decstr;</div><div class='del'>-						str = xmlNodeGetContent (work);</div><div class='del'>-						decstr = e_utf8_xml1_decode (str);</div><div class='del'>-						if (str) xmlFree (str);</div><div class='del'>-						op-&gt;title = decstr;</div><div class='del'>-					}</div><div class='del'>-				} else if (!strcmp (work-&gt;name, "code")) {</div><div class='del'>-					if (!op-&gt;code) {</div><div class='del'>-						gchar *str, *decstr;</div><div class='del'>-						str = xmlNodeGetContent (work);</div><div class='del'>-						decstr = e_utf8_xml1_decode (str);</div><div class='del'>-						if (str) xmlFree (str);</div><div class='del'>-						op-&gt;code = decstr;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				work = work-&gt;next;</div><div class='del'>-			}</div><div class='del'>-			d(printf ("creating new option:\n title %s\n value %s\n code %s\n",</div><div class='del'>-				  op-&gt;title, op-&gt;value, op-&gt;code ? op-&gt;code : "none"));</div><div class='del'>-			fo-&gt;options = g_list_append (fo-&gt;options, op);</div><div class='del'>-			if (fo-&gt;current == NULL)</div><div class='del'>-				fo-&gt;current = op;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unknown xml node within optionlist: %s\n", n-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Encoding option as xml\n"));</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "option");</div><div class='del'>-	if (fo-&gt;current) {</div><div class='del'>-		xmlSetProp (value, "value", fo-&gt;current-&gt;value);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	char *value;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Decoding option from xml\n"));</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = xmlGetProp (node, "name");</div><div class='del'>-	value = xmlGetProp (node, "value");</div><div class='del'>-	if (value) {</div><div class='del'>-		fo-&gt;current = find_option (fo, value);</div><div class='del'>-		xmlFree (value);</div><div class='del'>-	} else {</div><div class='del'>-		fo-&gt;current = NULL;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-option_changed (GtkWidget *widget, FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	</div><div class='del'>-	fo-&gt;current = gtk_object_get_data (GTK_OBJECT (widget), "option");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GtkWidget *first = NULL;</div><div class='del'>-	GList *l = fo-&gt;options;</div><div class='del'>-	struct _filter_option *op;</div><div class='del'>-	int index = 0, current = 0;</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	while (l) {</div><div class='del'>-		op = l-&gt;data;</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(op-&gt;title));</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "option", op);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_changed, fe);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		if (op == fo-&gt;current) {</div><div class='del'>-			current = index;</div><div class='del'>-			first = item;</div><div class='del'>-		} else if (!first) {</div><div class='del'>-			first = item;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	</div><div class='del'>-	if (first)</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (first), "activate", fe);</div><div class='del'>-	</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);</div><div class='del'>-	</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	</div><div class='del'>-	d(printf ("building option code %p, current = %p\n", fo, fo-&gt;current));</div><div class='del'>-	</div><div class='del'>-	if (fo-&gt;current &amp;&amp; fo-&gt;current-&gt;code) {</div><div class='del'>-		filter_part_expand_code (ff, fo-&gt;current-&gt;code, out);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe;</div><div class='del'>-	</div><div class='del'>-	if (fo-&gt;current) {</div><div class='del'>-		e_sexp_encode_string (out, fo-&gt;current-&gt;value);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterElement *</div><div class='del'>-clone (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterOption *fo = (FilterOption *)fe, *new;</div><div class='del'>-	GList *l;</div><div class='del'>-	struct _filter_option *fn, *op;</div><div class='del'>-	</div><div class='del'>-	d(printf ("cloning option\n"));</div><div class='del'>-	</div><div class='del'>-        new = FILTER_OPTION (((FilterElementClass *)(parent_class))-&gt;clone(fe));</div><div class='del'>-	l = fo-&gt;options;</div><div class='del'>-	while (l) {</div><div class='del'>-		op = l-&gt;data;</div><div class='del'>-		fn = g_malloc (sizeof (*fn));</div><div class='del'>-		d(printf ("  option %s\n", op-&gt;title));</div><div class='del'>-		fn-&gt;title = g_strdup (op-&gt;title);</div><div class='del'>-		fn-&gt;value = xmlStrdup (op-&gt;value);</div><div class='del'>-		if (op-&gt;code)</div><div class='del'>-			fn-&gt;code = g_strdup (op-&gt;code);</div><div class='del'>-		else</div><div class='del'>-			fn-&gt;code = NULL;</div><div class='del'>-		new-&gt;options = g_list_append (new-&gt;options, fn);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-		</div><div class='del'>-		if (new-&gt;current == NULL)</div><div class='del'>-			new-&gt;current = fn;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf ("cloning option code %p, current = %p\n", new, new-&gt;current));</div><div class='del'>-	</div><div class='del'>-	return (FilterElement *)new;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-option.h b/filter/filter-option.h<br/>deleted file mode 100644<br/>index 4b33a18697..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-option.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-option.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_OPTION_H</div><div class='del'>-#define _FILTER_OPTION_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_OPTION(obj)	GTK_CHECK_CAST (obj, filter_option_get_type (), FilterOption)</div><div class='del'>-#define FILTER_OPTION_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_option_get_type (), FilterOptionClass)</div><div class='del'>-#define IS_FILTER_OPTION(obj)      GTK_CHECK_TYPE (obj, filter_option_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterOption	FilterOption;</div><div class='del'>-typedef struct _FilterOptionClass	FilterOptionClass;</div><div class='del'>-</div><div class='del'>-struct _filter_option {</div><div class='del'>-	char *title;		/* button title */</div><div class='del'>-	char *value;		/* value, if it has one */</div><div class='del'>-	char *code;		/* used to string code segments together */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterOption {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterOptionPrivate *priv;</div><div class='del'>-</div><div class='del'>-	GList *options;</div><div class='del'>-	struct _filter_option *current;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterOptionClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_option_get_type	(void);</div><div class='del'>-FilterOption	*filter_option_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		filter_option_set_current(FilterOption *option, const char *name);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_OPTION_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-part.c b/filter/filter-part.c<br/>deleted file mode 100644<br/>index e92c42aafb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-part.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-part.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,531 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-part.h"</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void filter_part_class_init	(FilterPartClass *class);</div><div class='del'>-static void filter_part_init	(FilterPart *gspaper);</div><div class='del'>-static void filter_part_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterPart *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterPartPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_part_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterPart",</div><div class='del'>-			sizeof(FilterPart),</div><div class='del'>-			sizeof(FilterPartClass),</div><div class='del'>-			(GtkClassInitFunc)filter_part_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_part_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(gtk_object_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_part_class_init (FilterPartClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_part_finalise;</div><div class='del'>-	/* override methods */</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_part_init (FilterPart *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_part_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterPart *o = (FilterPart *)obj;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	o = o;</div><div class='del'>-</div><div class='del'>-	l = o-&gt;elements;</div><div class='del'>-	while (l) {</div><div class='del'>-		gtk_object_unref((GtkObject *)l-&gt;data);</div><div class='del'>-		l = g_list_next(l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free(o-&gt;elements);</div><div class='del'>-	g_free(o-&gt;name);</div><div class='del'>-	g_free(o-&gt;title);</div><div class='del'>-	g_free(o-&gt;code);</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterPart object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterPart object.</div><div class='del'>- **/</div><div class='del'>-FilterPart *</div><div class='del'>-filter_part_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterPart *o = (FilterPart *)gtk_type_new(filter_part_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-filter_part_validate (FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	gboolean correct = TRUE;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	l = fp-&gt;elements;</div><div class='del'>-	while (l &amp;&amp; correct) {</div><div class='del'>-		FilterElement *fe = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-	        correct = filter_element_validate (fe);</div><div class='del'>-		</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return correct;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-filter_part_xml_create (FilterPart *ff, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	char *type, *str, *decstr;</div><div class='del'>-	FilterElement *el;</div><div class='del'>-	</div><div class='del'>-	str = xmlGetProp(node, "name");</div><div class='del'>-	ff-&gt;name = g_strdup(str);</div><div class='del'>-	if (str)</div><div class='del'>-		xmlFree(str);</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, "input")) {</div><div class='del'>-			type = xmlGetProp (n, "type");</div><div class='del'>-			d(printf ("creating new element type input '%s'\n", type));</div><div class='del'>-			if (type != NULL</div><div class='del'>-			    &amp;&amp; (el = filter_element_new_type_name (type)) != NULL) {</div><div class='del'>-				filter_element_xml_create (el, n);</div><div class='del'>-				xmlFree(type);</div><div class='del'>-				d(printf ("adding element part %p %s\n", ff, el, el-&gt;name));</div><div class='del'>-				ff-&gt;elements = g_list_append (ff-&gt;elements, el);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning ("Invalid xml format, missing/unknown input type");</div><div class='del'>-			}</div><div class='del'>-		} else if (!strcmp(n-&gt;name, "title")) {</div><div class='del'>-			if (!ff-&gt;title) {</div><div class='del'>-				str = xmlNodeGetContent (n);</div><div class='del'>-				ff-&gt;title = e_utf8_xml1_decode (str);</div><div class='del'>-				if (str)</div><div class='del'>-					xmlFree (str);</div><div class='del'>-			}</div><div class='del'>-		} else if (!strcmp (n-&gt;name, "code")) {</div><div class='del'>-			if (!ff-&gt;code) {</div><div class='del'>-				str = xmlNodeGetContent (n);</div><div class='del'>-				ff-&gt;code = e_utf8_xml1_decode (str);</div><div class='del'>-				if (str)</div><div class='del'>-					xmlFree (str);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unknwon part element in xml: %s\n", n-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-xmlNodePtr</div><div class='del'>-filter_part_xml_encode (FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	xmlNodePtr part, value;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (fp != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	part = xmlNewNode (NULL, "part");</div><div class='del'>-	xmlSetProp (part, "name", fp-&gt;name);</div><div class='del'>-	l = fp-&gt;elements;</div><div class='del'>-	while (l) {</div><div class='del'>-		fe = l-&gt;data;</div><div class='del'>-		value = filter_element_xml_encode (fe);</div><div class='del'>-		xmlAddChild (part, value);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-filter_part_xml_decode (FilterPart *fp, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	xmlNodePtr n;</div><div class='del'>-	char *name;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (fp != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (node != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	n = node-&gt;childs;</div><div class='del'>-	while (n) {</div><div class='del'>-		if (!strcmp (n-&gt;name, "value")) {</div><div class='del'>-			name = xmlGetProp (n, "name");</div><div class='del'>-			d(printf ("finding element part %p %s = %p\n", name, name, fe));</div><div class='del'>-			fe = filter_part_find_element (fp, name);</div><div class='del'>-			d(printf ("finding element part %p %s = %p\n", name, name, fe));</div><div class='del'>-			xmlFree (name);</div><div class='del'>-			if (fe) {</div><div class='del'>-				filter_element_xml_decode (fe, n);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		n = n-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart *</div><div class='del'>-filter_part_clone (FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	FilterPart *new;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterElement *fe, *ne;</div><div class='del'>-	</div><div class='del'>-	new = (FilterPart *)gtk_type_new ((GTK_OBJECT (fp))-&gt;klass-&gt;type);</div><div class='del'>-	new-&gt;name = g_strdup(fp-&gt;name);</div><div class='del'>-	new-&gt;title = g_strdup(fp-&gt;title);</div><div class='del'>-	new-&gt;code = g_strdup(fp-&gt;code);</div><div class='del'>-	l = fp-&gt;elements;</div><div class='del'>-	while (l) {</div><div class='del'>-		fe = l-&gt;data;</div><div class='del'>-		ne = filter_element_clone (fe);</div><div class='del'>-		new-&gt;elements = g_list_append (new-&gt;elements, ne);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* only copies values of matching parts in the right order */</div><div class='del'>-void</div><div class='del'>-filter_part_copy_values (FilterPart *dst, FilterPart *src)</div><div class='del'>-{</div><div class='del'>-	GList *dstl, *srcl, *dstt;</div><div class='del'>-	FilterElement *de, *se;</div><div class='del'>-</div><div class='del'>-	/* NOTE: we go backwards, it just works better that way */</div><div class='del'>-</div><div class='del'>-	/* for each source type, search the dest type for</div><div class='del'>-	   a matching type in the same order */</div><div class='del'>-	srcl = g_list_last(src-&gt;elements);</div><div class='del'>-	dstl = g_list_last(dst-&gt;elements);</div><div class='del'>-	while (srcl &amp;&amp; dstl) {</div><div class='del'>-		se = srcl-&gt;data;</div><div class='del'>-		dstt = dstl;</div><div class='del'>-		while (dstt) {</div><div class='del'>-			de = dstt-&gt;data;</div><div class='del'>-			if (((GtkObject *)de)-&gt;klass == ((GtkObject *)se)-&gt;klass) {</div><div class='del'>-				filter_element_copy_value(de, se);</div><div class='del'>-				dstl = dstt-&gt;prev;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			dstt = dstt-&gt;prev;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		srcl = srcl-&gt;prev;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterElement *</div><div class='del'>-filter_part_find_element (FilterPart *ff, const char *name)</div><div class='del'>-{</div><div class='del'>-	GList *l = ff-&gt;elements;</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	</div><div class='del'>-	if (name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	while (l) {</div><div class='del'>-		fe = l-&gt;data;</div><div class='del'>-		if (fe-&gt;name &amp;&amp; !strcmp (fe-&gt;name, name))</div><div class='del'>-			return fe;</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-filter_part_get_widget (FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GList *l = ff-&gt;elements;</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	while (l) {</div><div class='del'>-		fe = l-&gt;data;</div><div class='del'>-		w = filter_element_get_widget (fe);</div><div class='del'>-		if (w) {</div><div class='del'>-			gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 3);</div><div class='del'>-		}</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-	</div><div class='del'>-	return hbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_build_code:</div><div class='del'>- * @ff: </div><div class='del'>- * @out: </div><div class='del'>- * </div><div class='del'>- * Outputs the code of a part.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_part_build_code (FilterPart *ff, GString *out)</div><div class='del'>-{</div><div class='del'>-	GList *l = ff-&gt;elements;</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	</div><div class='del'>-	if (ff-&gt;code) {</div><div class='del'>-		filter_part_expand_code (ff, ff-&gt;code, out);</div><div class='del'>-	}</div><div class='del'>-	while (l) {</div><div class='del'>-		fe = l-&gt;data;</div><div class='del'>-		filter_element_build_code (fe, out, ff);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_build_code_list:</div><div class='del'>- * @l: </div><div class='del'>- * @out: </div><div class='del'>- * </div><div class='del'>- * Construct a list of the filter parts code into</div><div class='del'>- * a single string.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_part_build_code_list (GList *l, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterPart *fp;</div><div class='del'>-	</div><div class='del'>-	while (l) {</div><div class='del'>-		fp = l-&gt;data;</div><div class='del'>-		filter_part_build_code (fp, out);</div><div class='del'>-		g_string_append (out, "\n  ");</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_find_list:</div><div class='del'>- * @l: </div><div class='del'>- * @name: </div><div class='del'>- * </div><div class='del'>- * Find a filter part stored in a list.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-FilterPart *</div><div class='del'>-filter_part_find_list (GList *l, const char *name)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	</div><div class='del'>-	d(printf ("Find part named %s\n", name));</div><div class='del'>-	</div><div class='del'>-	while (l) {</div><div class='del'>-		part = l-&gt;data;</div><div class='del'>-		if (!strcmp (part-&gt;name, name)) {</div><div class='del'>-			d(printf ("Found!\n"));</div><div class='del'>-			return part;</div><div class='del'>-		}</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_next_list:</div><div class='del'>- * @l: </div><div class='del'>- * @last: The last item retrieved, or NULL to start</div><div class='del'>- * from the beginning of the list.</div><div class='del'>- * </div><div class='del'>- * Iterate through a filter part list.</div><div class='del'>- * </div><div class='del'>- * Return value: The next value in the list, or NULL if the</div><div class='del'>- * list is expired.</div><div class='del'>- **/</div><div class='del'>-FilterPart *</div><div class='del'>-filter_part_next_list (GList *l, FilterPart *last)</div><div class='del'>-{</div><div class='del'>-	GList *node = l;</div><div class='del'>-	</div><div class='del'>-	if (last != NULL) {</div><div class='del'>-		node = g_list_find (node, last);</div><div class='del'>-		if (node == NULL)</div><div class='del'>-			node = l;</div><div class='del'>-		else</div><div class='del'>-			node = g_list_next (node);</div><div class='del'>-	}</div><div class='del'>-	if (node)</div><div class='del'>-		return node-&gt;data;</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_part_expand_code:</div><div class='del'>- * @ff: </div><div class='del'>- * @str: </div><div class='del'>- * @out: </div><div class='del'>- * </div><div class='del'>- * Expands the variables in string @str based on the values of the part.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-filter_part_expand_code (FilterPart *ff, const char *source, GString *out)</div><div class='del'>-{</div><div class='del'>-	const char *newstart, *start, *end;</div><div class='del'>-	char *name = alloca (32);</div><div class='del'>-	int len, namelen = 32;</div><div class='del'>-	FilterElement *fe;</div><div class='del'>-	</div><div class='del'>-	start = source;</div><div class='del'>-	while (start &amp;&amp; (newstart = strstr (start, "${"))</div><div class='del'>-		&amp;&amp; (end = strstr (newstart+2, "}")) ) {</div><div class='del'>-		len = end - newstart - 2;</div><div class='del'>-		if (len + 1 &gt; namelen) {</div><div class='del'>-			namelen = (len + 1) * 2;</div><div class='del'>-			name = alloca (namelen);</div><div class='del'>-		}</div><div class='del'>-		memcpy (name, newstart+2, len);</div><div class='del'>-		name[len] = 0;</div><div class='del'>-		fe = filter_part_find_element (ff, name);</div><div class='del'>-		d(printf("expand code: looking up variab le '%s' = %p\n", ff, name, fe));</div><div class='del'>-		if (fe) {</div><div class='del'>-			g_string_sprintfa (out, "%.*s", newstart-start, start);</div><div class='del'>-			filter_element_format_sexp (fe, out);</div><div class='del'>-#if 0</div><div class='del'>-		} else if ( (val = g_hash_table_lookup (ff-&gt;globals, name)) ) {</div><div class='del'>-			g_string_sprintfa (out, "%.*s", newstart-start, start);</div><div class='del'>-			e_sexp_encode_string (out, val);</div><div class='del'>-#endif</div><div class='del'>-		} else {</div><div class='del'>-			g_string_sprintfa (out, "%.*s", end-start+1, start);</div><div class='del'>-		}</div><div class='del'>-		start = end + 1;</div><div class='del'>-	}</div><div class='del'>-	g_string_append (out, start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr system;</div><div class='del'>-	FilterPart *ff;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GnomeDialog *gd;</div><div class='del'>-	xmlNodePtr node;</div><div class='del'>-	GString *code;</div><div class='del'>-</div><div class='del'>-	gnome_init("test", "0.0", argc, argv);</div><div class='del'>-</div><div class='del'>-	system = xmlParseFile("form.xml");</div><div class='del'>-	if (system==NULL) {</div><div class='del'>-		printf("i/o error\n");</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ff = filter_part_new();</div><div class='del'>-	filter_part_xml_create(ff, system-&gt;root);</div><div class='del'>-</div><div class='del'>-	w = filter_part_get_widget(ff);</div><div class='del'>-</div><div class='del'>-	gd = (GnomeDialog *)gnome_dialog_new(_("Test"), GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(gd), FALSE, TRUE, FALSE);</div><div class='del'>-	gtk_box_pack_start((GtkBox *)gd-&gt;vbox, w, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show((GtkWidget *)gd);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_run_and_close(gd);</div><div class='del'>-</div><div class='del'>-	code = g_string_new("");</div><div class='del'>-	filter_part_build_code(ff, code);</div><div class='del'>-	printf("code is:\n%s\n", code-&gt;str);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/filter/filter-part.h b/filter/filter-part.h<br/>deleted file mode 100644<br/>index 904be6b191..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-part.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-part.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_PART_H</div><div class='del'>-#define _FILTER_PART_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include "filter-input.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_PART(obj)	GTK_CHECK_CAST (obj, filter_part_get_type (), FilterPart)</div><div class='del'>-#define FILTER_PART_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_part_get_type (), FilterPartClass)</div><div class='del'>-#define IS_FILTER_PART(obj)      GTK_CHECK_TYPE (obj, filter_part_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterPart	FilterPart;</div><div class='del'>-typedef struct _FilterPartClass	FilterPartClass;</div><div class='del'>-</div><div class='del'>-struct _FilterPart {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-	struct _FilterPartPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *name;</div><div class='del'>-	char *title;</div><div class='del'>-	char *code;</div><div class='del'>-	GList *elements;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterPartClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_part_get_type	(void);</div><div class='del'>-FilterPart	*filter_part_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-gboolean        filter_part_validate    (FilterPart *fp);</div><div class='del'>-</div><div class='del'>-int		filter_part_xml_create	(FilterPart *ff, xmlNodePtr node);</div><div class='del'>-</div><div class='del'>-xmlNodePtr	filter_part_xml_encode	(FilterPart *fe);</div><div class='del'>-int		filter_part_xml_decode	(FilterPart *fe, xmlNodePtr node);</div><div class='del'>-</div><div class='del'>-FilterPart	*filter_part_clone	(FilterPart *fp);</div><div class='del'>-void		filter_part_copy_values (FilterPart *dfp, FilterPart *sfp);</div><div class='del'>-</div><div class='del'>-FilterElement	*filter_part_find_element(FilterPart *ff, const char *name);</div><div class='del'>-</div><div class='del'>-GtkWidget	*filter_part_get_widget		(FilterPart *ff);</div><div class='del'>-void		filter_part_build_code		(FilterPart *ff, GString *out);</div><div class='del'>-void		filter_part_expand_code		(FilterPart *ff, const char *str, GString *out);</div><div class='del'>-</div><div class='del'>-/* static functions */</div><div class='del'>-void		filter_part_build_code_list	(GList *l, GString *out);</div><div class='del'>-FilterPart	*filter_part_find_list		(GList *l, const char *name);</div><div class='del'>-FilterPart	*filter_part_next_list		(GList *l, FilterPart *last);</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_PART_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-rule.c b/filter/filter-rule.c<br/>deleted file mode 100644<br/>index 85d92f9818..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-rule.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-rule.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,867 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkscrolledwindow.h&gt;</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-#include "filter-context.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static int validate(FilterRule *);</div><div class='del'>-static xmlNodePtr xml_encode (FilterRule *);</div><div class='del'>-static int xml_decode (FilterRule *, xmlNodePtr, RuleContext *);</div><div class='del'>-static void build_code (FilterRule *, GString * out);</div><div class='del'>-static void rule_copy  (FilterRule *dest, FilterRule *src);</div><div class='del'>-static GtkWidget *get_widget (FilterRule * fr, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-static void filter_rule_class_init (FilterRuleClass * class);</div><div class='del'>-static void filter_rule_init (FilterRule * gspaper);</div><div class='del'>-static void filter_rule_finalise (GtkObject * obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterRule *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterRulePrivate {</div><div class='del'>-	int frozen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_rule_get_type ()</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterRule",</div><div class='del'>-			sizeof (FilterRule),</div><div class='del'>-			sizeof (FilterRuleClass),</div><div class='del'>-			(GtkClassInitFunc) filter_rule_class_init,</div><div class='del'>-			(GtkObjectInitFunc) filter_rule_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type(), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_rule_class_init (FilterRuleClass * class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_rule_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	class-&gt;validate = validate;</div><div class='del'>-	class-&gt;xml_encode = xml_encode;</div><div class='del'>-	class-&gt;xml_decode = xml_decode;</div><div class='del'>-	class-&gt;build_code = build_code;</div><div class='del'>-	class-&gt;copy = rule_copy;</div><div class='del'>-	class-&gt;get_widget = get_widget;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	signals[CHANGED] =</div><div class='del'>-		gtk_signal_new("changed",</div><div class='del'>-			       GTK_RUN_LAST,</div><div class='del'>-			       object_class-&gt;type,</div><div class='del'>-			       GTK_SIGNAL_OFFSET (FilterRuleClass, changed),</div><div class='del'>-			       gtk_marshal_NONE__NONE,</div><div class='del'>-			       GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_rule_init (FilterRule * o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_rule_finalise (GtkObject * obj)</div><div class='del'>-{</div><div class='del'>-	FilterRule *o = (FilterRule *) obj;</div><div class='del'>-</div><div class='del'>-	g_free (o-&gt;name);</div><div class='del'>-	g_free (o-&gt;source);</div><div class='del'>-	g_list_foreach(o-&gt;parts, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free(o-&gt;parts);</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	((GtkObjectClass *) (parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_rule_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterRule object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterRule object.</div><div class='del'>- **/</div><div class='del'>-FilterRule *</div><div class='del'>-filter_rule_new ()</div><div class='del'>-{</div><div class='del'>-	FilterRule *o = (FilterRule *) gtk_type_new (filter_rule_get_type());</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-filter_rule_clone (FilterRule *base)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-	</div><div class='del'>-	g_assert (IS_FILTER_RULE (base));</div><div class='del'>-	</div><div class='del'>-	rule = gtk_type_new (GTK_OBJECT (base)-&gt;klass-&gt;type);</div><div class='del'>-	filter_rule_copy (rule, base);</div><div class='del'>-	</div><div class='del'>-	return rule;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_set_name (FilterRule *fr, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-</div><div class='del'>-	if ((fr-&gt;name &amp;&amp; name &amp;&amp; strcmp(fr-&gt;name, name) == 0)</div><div class='del'>-	    || (fr-&gt;name == NULL &amp;&amp; name == NULL))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (fr-&gt;name);</div><div class='del'>-	fr-&gt;name = g_strdup (name);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_set_source (FilterRule *fr, const char *source)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-</div><div class='del'>-	if ((fr-&gt;source &amp;&amp; source &amp;&amp; strcmp(fr-&gt;source, source) == 0)</div><div class='del'>-	    || (fr-&gt;source == NULL &amp;&amp; source == NULL))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (fr-&gt;source);</div><div class='del'>-	fr-&gt;source = g_strdup (source);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-filter_rule_validate (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	</div><div class='del'>-	return ((FilterRuleClass *) ((GtkObject *) fr)-&gt;klass)-&gt;validate (fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-validate (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	int valid = TRUE;</div><div class='del'>-	GList *parts;</div><div class='del'>-	</div><div class='del'>-	if (!fr-&gt;name || !*fr-&gt;name) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		</div><div class='del'>-		dialog = gnome_ok_dialog (_("You must name this filter."));</div><div class='del'>-		</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* validate rule parts */</div><div class='del'>-	parts = fr-&gt;parts;</div><div class='del'>-	while (parts &amp;&amp; valid) {</div><div class='del'>-		valid = filter_part_validate ((FilterPart *)parts-&gt;data);</div><div class='del'>-		parts = parts-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-xmlNodePtr</div><div class='del'>-filter_rule_xml_encode (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	</div><div class='del'>-	return ((FilterRuleClass *) ((GtkObject *) fr)-&gt;klass)-&gt;xml_encode (fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr node, set, work;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	node = xmlNewNode (NULL, "rule");</div><div class='del'>-	switch (fr-&gt;grouping) {</div><div class='del'>-	case FILTER_GROUP_ALL:</div><div class='del'>-		xmlSetProp (node, "grouping", "all");</div><div class='del'>-		break;</div><div class='del'>-	case FILTER_GROUP_ANY:</div><div class='del'>-		xmlSetProp (node, "grouping", "any");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (fr-&gt;source) {</div><div class='del'>-		xmlSetProp (node, "source", fr-&gt;source);</div><div class='del'>-	} else {</div><div class='del'>-		/* set to the default filter type */</div><div class='del'>-		xmlSetProp (node, "source", "incoming");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (fr-&gt;name) {</div><div class='del'>-		char *encstr;</div><div class='del'>-		</div><div class='del'>-		work = xmlNewNode (NULL, "title");</div><div class='del'>-		encstr = e_utf8_xml1_encode (fr-&gt;name);</div><div class='del'>-		xmlNodeSetContent (work, encstr);</div><div class='del'>-		g_free (encstr);</div><div class='del'>-		xmlAddChild (node, work);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	set = xmlNewNode (NULL, "partset");</div><div class='del'>-	xmlAddChild (node, set);</div><div class='del'>-	l = fr-&gt;parts;</div><div class='del'>-	while (l) {</div><div class='del'>-		work = filter_part_xml_encode ((FilterPart *) l-&gt;data);</div><div class='del'>-		xmlAddChild (set, work);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_set (xmlNodePtr node, FilterRule *fr, RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr work;</div><div class='del'>-	char *rulename;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	</div><div class='del'>-	work = node-&gt;childs;</div><div class='del'>-	while (work) {</div><div class='del'>-		if (!strcmp (work-&gt;name, "part")) {</div><div class='del'>-			rulename = xmlGetProp (work, "name");</div><div class='del'>-			part = rule_context_find_part (f, rulename);</div><div class='del'>-			if (part) {</div><div class='del'>-				part = filter_part_clone (part);</div><div class='del'>-				filter_part_xml_decode (part, work);</div><div class='del'>-				filter_rule_add_part (fr, part);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning ("cannot find rule part '%s'\n", rulename);</div><div class='del'>-			}</div><div class='del'>-			xmlFree (rulename);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Unknwon xml node in part: %s", work-&gt;name);</div><div class='del'>-		}</div><div class='del'>-		work = work-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-filter_rule_xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	g_assert (IS_RULE_CONTEXT (f));</div><div class='del'>-	g_assert (node != NULL);</div><div class='del'>-</div><div class='del'>-	fr-&gt;priv-&gt;frozen++;	</div><div class='del'>-	res = ((FilterRuleClass *) ((GtkObject *) fr)-&gt;klass)-&gt;xml_decode (fr, node, f);</div><div class='del'>-	fr-&gt;priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterRule *fr, xmlNodePtr node, RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr work;</div><div class='del'>-	char *grouping;</div><div class='del'>-	char *source;</div><div class='del'>-	</div><div class='del'>-	if (fr-&gt;name) {</div><div class='del'>-		g_free (fr-&gt;name);</div><div class='del'>-		fr-&gt;name = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	grouping = xmlGetProp (node, "grouping");</div><div class='del'>-	if (!strcmp (grouping, "any"))</div><div class='del'>-		fr-&gt;grouping = FILTER_GROUP_ANY;</div><div class='del'>-	else</div><div class='del'>-		fr-&gt;grouping = FILTER_GROUP_ALL;</div><div class='del'>-	xmlFree (grouping);</div><div class='del'>-	</div><div class='del'>-	g_free (fr-&gt;source);</div><div class='del'>-	source = xmlGetProp (node, "source");</div><div class='del'>-	if (source) {</div><div class='del'>-		fr-&gt;source = g_strdup (source);</div><div class='del'>-		xmlFree (source);</div><div class='del'>-	} else {</div><div class='del'>-		/* default filter type */</div><div class='del'>-		fr-&gt;source = g_strdup ("incoming");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	work = node-&gt;childs;</div><div class='del'>-	while (work) {</div><div class='del'>-		if (!strcmp (work-&gt;name, "partset")) {</div><div class='del'>-			load_set (work, fr, f);</div><div class='del'>-		} else if (!strcmp (work-&gt;name, "title") || !strcmp (work-&gt;name, "_title")) {</div><div class='del'>-			if (!fr-&gt;name) {</div><div class='del'>-				char *str, *decstr;</div><div class='del'>-</div><div class='del'>-				str = xmlNodeGetContent (work);</div><div class='del'>-				decstr = e_utf8_xml1_decode (str);</div><div class='del'>-				if (str)</div><div class='del'>-					xmlFree (str);</div><div class='del'>-				fr-&gt;name = decstr;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		work = work-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_copy (FilterRule *dest, FilterRule *src)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;name);</div><div class='del'>-	dest-&gt;name = g_strdup (src-&gt;name);</div><div class='del'>-	</div><div class='del'>-	g_free (dest-&gt;source);</div><div class='del'>-	dest-&gt;source = g_strdup (src-&gt;source);</div><div class='del'>-	</div><div class='del'>-	dest-&gt;grouping = src-&gt;grouping;</div><div class='del'>-	</div><div class='del'>-	if (dest-&gt;parts) {</div><div class='del'>-		g_list_foreach (dest-&gt;parts, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-		g_list_free (dest-&gt;parts);</div><div class='del'>-		dest-&gt;parts = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	node = src-&gt;parts;</div><div class='del'>-	while (node) {</div><div class='del'>-		FilterPart *part = node-&gt;data;</div><div class='del'>-		</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (part));</div><div class='del'>-		dest-&gt;parts = g_list_append (dest-&gt;parts, part);</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_copy (FilterRule *dest, FilterRule *src)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (dest));</div><div class='del'>-	g_assert (IS_FILTER_RULE (src));</div><div class='del'>-	</div><div class='del'>-	((FilterRuleClass *) ((GtkObject *) dest)-&gt;klass)-&gt;copy (dest, src);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(dest);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_add_part (FilterRule *fr, FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	g_assert (IS_FILTER_PART (fp));</div><div class='del'>-	</div><div class='del'>-	fr-&gt;parts = g_list_append (fr-&gt;parts, fp);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_remove_part (FilterRule *fr, FilterPart *fp)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	g_assert (IS_FILTER_PART (fp));</div><div class='del'>-	</div><div class='del'>-	fr-&gt;parts = g_list_remove (fr-&gt;parts, fp);</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_replace_part (FilterRule *fr, FilterPart *fp, FilterPart *new)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	g_assert (IS_FILTER_PART (fp));</div><div class='del'>-	g_assert (IS_FILTER_PART (new));</div><div class='del'>-	</div><div class='del'>-	l = g_list_find (fr-&gt;parts, fp);</div><div class='del'>-	if (l) {</div><div class='del'>-		l-&gt;data = new;</div><div class='del'>-	} else {</div><div class='del'>-		fr-&gt;parts = g_list_append (fr-&gt;parts, new);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed(fr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_build_code (FilterRule *fr, GString *out)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-	g_assert (out != NULL);</div><div class='del'>-	</div><div class='del'>-	((FilterRuleClass *) ((GtkObject *) fr)-&gt;klass)-&gt;build_code (fr, out);</div><div class='del'>-	</div><div class='del'>-	d(printf ("build_code: [%s](%d)", out-&gt;str, out-&gt;len));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-filter_rule_emit_changed(FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	g_assert (IS_FILTER_RULE (fr));</div><div class='del'>-</div><div class='del'>-	if (fr-&gt;priv-&gt;frozen == 0)</div><div class='del'>-		gtk_signal_emit((GtkObject *)fr, signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterRule *fr, GString *out)</div><div class='del'>-{</div><div class='del'>-	switch (fr-&gt;grouping) {</div><div class='del'>-	case FILTER_GROUP_ALL:</div><div class='del'>-		g_string_append (out, " (and\n  ");</div><div class='del'>-		break;</div><div class='del'>-	case FILTER_GROUP_ANY:</div><div class='del'>-		g_string_append (out, " (or\n  ");</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Invalid grouping");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	filter_part_build_code_list (fr-&gt;parts, out);</div><div class='del'>-	g_string_append (out, ")\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-match_all (GtkWidget *widget, FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	fr-&gt;grouping = FILTER_GROUP_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-match_any (GtkWidget *widget, FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	fr-&gt;grouping = FILTER_GROUP_ANY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _part_data {</div><div class='del'>-	FilterRule *fr;</div><div class='del'>-	RuleContext *f;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	GtkWidget *partwidget, *container;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-option_activate (GtkMenuItem *item, struct _part_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part = gtk_object_get_data (GTK_OBJECT (item), "part");</div><div class='del'>-	FilterPart *newpart;</div><div class='del'>-	</div><div class='del'>-	/* dont update if we haven't changed */</div><div class='del'>-	if (!strcmp (part-&gt;title, data-&gt;part-&gt;title))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* here we do a widget shuffle, throw away the old widget/rulepart,</div><div class='del'>-	   and create another */</div><div class='del'>-	if (data-&gt;partwidget)</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (data-&gt;container), data-&gt;partwidget);</div><div class='del'>-	</div><div class='del'>-	newpart = filter_part_clone (part);</div><div class='del'>-	filter_part_copy_values(newpart, data-&gt;part);</div><div class='del'>-	filter_rule_replace_part (data-&gt;fr, data-&gt;part, newpart);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (data-&gt;part));</div><div class='del'>-	data-&gt;part = newpart;</div><div class='del'>-	data-&gt;partwidget = filter_part_get_widget (newpart);</div><div class='del'>-	if (data-&gt;partwidget)</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (data-&gt;container), data-&gt;partwidget, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (data-&gt;container), "part", newpart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part = NULL;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *p;</div><div class='del'>-	int index = 0, current = 0;</div><div class='del'>-	struct _part_data *data;</div><div class='del'>-	</div><div class='del'>-	data = g_malloc0 (sizeof (*data));</div><div class='del'>-	data-&gt;fr = fr;</div><div class='del'>-	data-&gt;f = f;</div><div class='del'>-	data-&gt;part = newpart;</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 0);</div><div class='del'>-	/* only set to automatically clean up the memory */</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (hbox), "data", data, g_free);</div><div class='del'>-	</div><div class='del'>-	p = filter_part_get_widget (newpart);</div><div class='del'>-	</div><div class='del'>-	data-&gt;partwidget = p;</div><div class='del'>-	data-&gt;container = hbox;</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	/* sigh, this is a little ugly */</div><div class='del'>-	while ((part = rule_context_next_part (f, part))) {</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(part-&gt;title));</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "part", part);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		if (!strcmp (newpart-&gt;title, part-&gt;title)) {</div><div class='del'>-			current = index;</div><div class='del'>-		}</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current);</div><div class='del'>-	gtk_widget_show (omenu);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);</div><div class='del'>-	if (p) {</div><div class='del'>-		gtk_box_pack_start (GTK_BOX (hbox), p, FALSE, FALSE, 0);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-	</div><div class='del'>-	return hbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _rule_data {</div><div class='del'>-	FilterRule *fr;</div><div class='del'>-	RuleContext *f;</div><div class='del'>-	GtkWidget *parts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-less_parts (GtkWidget *button, struct _rule_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	GtkWidget *rule;</div><div class='del'>-	</div><div class='del'>-	if (g_list_length (data-&gt;fr-&gt;parts) &lt; 2)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	rule = gtk_object_get_data (GTK_OBJECT (button), "rule");</div><div class='del'>-	part = gtk_object_get_data (GTK_OBJECT (rule), "part");</div><div class='del'>-	</div><div class='del'>-	/* remove the part from the list */</div><div class='del'>-	filter_rule_remove_part (data-&gt;fr, part);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-	</div><div class='del'>-	/* and from the display */</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (data-&gt;parts), rule);</div><div class='del'>-	gtk_container_remove (GTK_CONTAINER (data-&gt;parts), button);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attach_rule (GtkWidget *rule, struct _rule_data *data, FilterPart *part, int row)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *remove;</div><div class='del'>-	GtkWidget *pixmap;</div><div class='del'>-	</div><div class='del'>-	gtk_table_attach (GTK_TABLE (data-&gt;parts), rule, 0, 1, row, row + 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, 0, 0, 0);</div><div class='del'>-	</div><div class='del'>-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_REMOVE);</div><div class='del'>-	remove = gnome_pixmap_button (pixmap, _("Remove"));</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (remove), "rule", rule);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (rule), "part", part);</div><div class='del'>-	/*gtk_button_set_relief (GTK_BUTTON (remove), GTK_RELIEF_NONE);*/</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (remove), "clicked", less_parts, data);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (data-&gt;parts), remove, 1, 2, row, row + 1,</div><div class='del'>-			  0, 0, 0, 0);</div><div class='del'>-	gtk_widget_show (remove);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-more_parts (GtkWidget *button, struct _rule_data *data)</div><div class='del'>-{</div><div class='del'>-	FilterPart *new;</div><div class='del'>-	</div><div class='del'>-	/* first make sure that the last part is ok */</div><div class='del'>-	if (data-&gt;fr-&gt;parts) {</div><div class='del'>-		FilterPart *part;</div><div class='del'>-		GList *l;</div><div class='del'>-		</div><div class='del'>-		l = g_list_last (data-&gt;fr-&gt;parts);</div><div class='del'>-		part = l-&gt;data;</div><div class='del'>-		if (!filter_part_validate (part))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* create a new rule entry, use the first type of rule */</div><div class='del'>-	new = rule_context_next_part (data-&gt;f, NULL);</div><div class='del'>-	if (new) {</div><div class='del'>-		GtkWidget *w;</div><div class='del'>-		int rows;</div><div class='del'>-		</div><div class='del'>-		new = filter_part_clone (new);</div><div class='del'>-		filter_rule_add_part (data-&gt;fr, new);</div><div class='del'>-		w = get_rule_part_widget (data-&gt;f, new, data-&gt;fr);</div><div class='del'>-		</div><div class='del'>-		rows = GTK_TABLE (data-&gt;parts)-&gt;nrows;</div><div class='del'>-		gtk_table_resize (GTK_TABLE (data-&gt;parts), rows + 1, 2);</div><div class='del'>-		attach_rule (w, data, new, rows);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_changed (GtkEntry *entry, FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	g_free (fr-&gt;name);</div><div class='del'>-	fr-&gt;name = e_utf8_gtk_entry_get_text (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-filter_rule_get_widget (FilterRule *fr, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	return ((FilterRuleClass *) ((GtkObject *) fr)-&gt;klass)-&gt;get_widget(fr, f);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-grab_focus (GtkWidget *entry, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_grab_focus (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterRule *fr, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *vbox, *parts, *inframe;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *add, *pixmap;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	GtkWidget *menu, *item, *omenu;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *name;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *scrolledwindow;</div><div class='del'>-	GtkObject *hadj, *vadj;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	struct _rule_data *data;</div><div class='del'>-	gint rows, i = 0;</div><div class='del'>-	</div><div class='del'>-	/* this stuff should probably be a table, but the</div><div class='del'>-	   rule parts need to be a vbox */</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	label = gtk_label_new (_("Rule name: "));</div><div class='del'>-	name = gtk_entry_new ();</div><div class='del'>-	</div><div class='del'>-	if (!fr-&gt;name) {</div><div class='del'>-		fr-&gt;name = g_strdup (_("Untitled"));</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (name), fr-&gt;name);</div><div class='del'>-		/* FIXME: do we want the following code in the future? */</div><div class='del'>-		/*gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);*/</div><div class='del'>-	} else {</div><div class='del'>-		e_utf8_gtk_entry_set_text (GTK_ENTRY (name), fr-&gt;name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* evil kludgy hack because gtk sucks */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (name), "realize", grab_focus, name);</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (name), "changed", name_changed, fr);</div><div class='del'>-	</div><div class='del'>-	frame = gtk_frame_new (_("If"));</div><div class='del'>-	inframe = gtk_vbox_new (FALSE, 3);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), inframe);</div><div class='del'>-	</div><div class='del'>-	/* this is the parts table, it should probably be inside a scrolling list */</div><div class='del'>-	rows = g_list_length (fr-&gt;parts);</div><div class='del'>-	parts = gtk_table_new (rows, 2, FALSE);</div><div class='del'>-	</div><div class='del'>-	/* data for the parts part of the display */</div><div class='del'>-	data = g_malloc0 (sizeof (*data));</div><div class='del'>-	data-&gt;f = f;</div><div class='del'>-	data-&gt;fr = fr;</div><div class='del'>-	data-&gt;parts = parts;</div><div class='del'>-	</div><div class='del'>-	/* only set to automatically clean up the memory */</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (vbox), "data", data, g_free);</div><div class='del'>-	</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	label = gtk_label_new (_("Execute actions"));</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	</div><div class='del'>-	item = gtk_menu_item_new_with_label (_("if all criteria are met"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_all, fr);</div><div class='del'>-	gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-	gtk_widget_show (item);</div><div class='del'>-	</div><div class='del'>-	item = gtk_menu_item_new_with_label (_("if any criterion are met"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (item), "activate", match_any, fr);</div><div class='del'>-	gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-	gtk_widget_show (item);</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), fr-&gt;grouping == FILTER_GROUP_ALL ? 0 : 1);</div><div class='del'>-	gtk_widget_show (omenu);</div><div class='del'>-	</div><div class='del'>-	pixmap = gnome_stock_new_with_icon (GNOME_STOCK_PIXMAP_ADD);</div><div class='del'>-	add = gnome_pixmap_button (pixmap, _("Add criterion"));</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (add), "clicked", more_parts, data);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_end (GTK_BOX (hbox), omenu, FALSE, FALSE, 0);</div><div class='del'>-	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	l = fr-&gt;parts;</div><div class='del'>-	while (l) {</div><div class='del'>-		part = l-&gt;data;</div><div class='del'>-		d(printf ("adding rule %s\n", part-&gt;title));</div><div class='del'>-		w = get_rule_part_widget (f, part, fr);</div><div class='del'>-		attach_rule (w, data, part, i++);</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);</div><div class='del'>-	vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0, 1.0, 1.0);</div><div class='del'>-	scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),</div><div class='del'>-					GTK_POLICY_AUTOMATIC,</div><div class='del'>-					GTK_POLICY_AUTOMATIC);</div><div class='del'>-	</div><div class='del'>-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0);</div><div class='del'>-	</div><div class='del'>-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (vbox);</div><div class='del'>-	</div><div class='del'>-	return vbox;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-filter_rule_next_list (GList * l, FilterRule * last, const char *source)</div><div class='del'>-{</div><div class='del'>-	GList *node = l;</div><div class='del'>-	</div><div class='del'>-	if (last != NULL) {</div><div class='del'>-		node = g_list_find (node, last);</div><div class='del'>-		if (node == NULL)</div><div class='del'>-			node = l;</div><div class='del'>-		else</div><div class='del'>-			node = g_list_next (node);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (source) {</div><div class='del'>-		while (node) {</div><div class='del'>-			FilterRule *rule = node-&gt;data;</div><div class='del'>-			</div><div class='del'>-			if (rule-&gt;source &amp;&amp; strcmp (rule-&gt;source, source) == 0)</div><div class='del'>-				break;</div><div class='del'>-			node = g_list_next (node);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (node)</div><div class='del'>-		return node-&gt;data;</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-filter_rule_find_list (GList * l, const char *name, const char *source)</div><div class='del'>-{</div><div class='del'>-	while (l) {</div><div class='del'>-		FilterRule *rule = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (strcmp (rule-&gt;name, name) == 0)</div><div class='del'>-			if (source == NULL || (rule-&gt;source != NULL &amp;&amp; strcmp (rule-&gt;source, source) == 0))</div><div class='del'>-				return rule;</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef FOR_TRANSLATIONS_ONLY</div><div class='del'>-</div><div class='del'>-static char *list[] = {</div><div class='del'>-  N_("incoming"), N_("outgoing")</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='head'>diff --git a/filter/filter-rule.h b/filter/filter-rule.h<br/>deleted file mode 100644<br/>index f0558d0f2b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-rule.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-rule.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_RULE_H</div><div class='del'>-#define _FILTER_RULE_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include "filter-part.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_RULE(obj)	GTK_CHECK_CAST (obj, filter_rule_get_type (), FilterRule)</div><div class='del'>-#define FILTER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_rule_get_type (), FilterRuleClass)</div><div class='del'>-#define IS_FILTER_RULE(obj)      GTK_CHECK_TYPE (obj, filter_rule_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterRule	FilterRule;</div><div class='del'>-typedef struct _FilterRuleClass	FilterRuleClass;</div><div class='del'>-</div><div class='del'>-struct _RuleContext;</div><div class='del'>-</div><div class='del'>-enum _filter_grouping_t {</div><div class='del'>-	FILTER_GROUP_ALL,	/* all rules must match */</div><div class='del'>-	FILTER_GROUP_ANY	/* any rule must match */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */</div><div class='del'>-#define FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder</div><div class='del'>-	 				   * when the user asks for it */</div><div class='del'>-#define	FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */</div><div class='del'>-</div><div class='del'>-struct _FilterRule {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-	struct _FilterRulePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	char *name;</div><div class='del'>-	char *source;</div><div class='del'>-	</div><div class='del'>-	enum _filter_grouping_t grouping;</div><div class='del'>-	GList *parts;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterRuleClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	int (*validate)(FilterRule *);</div><div class='del'>-</div><div class='del'>-	xmlNodePtr (*xml_encode)(FilterRule *);</div><div class='del'>-	int (*xml_decode)(FilterRule *, xmlNodePtr, struct _RuleContext *);</div><div class='del'>-	</div><div class='del'>-	void (*build_code)(FilterRule *, GString *out);</div><div class='del'>-</div><div class='del'>-	void (*copy)(FilterRule *dest, FilterRule *src);</div><div class='del'>-	</div><div class='del'>-	GtkWidget *(*get_widget)(FilterRule *fr, struct _RuleContext *f);</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	void (*changed)(FilterRule *fr);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_rule_get_type	(void);</div><div class='del'>-FilterRule	*filter_rule_new	(void);</div><div class='del'>-</div><div class='del'>-FilterRule 	*filter_rule_clone	(FilterRule *base);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		filter_rule_set_name	(FilterRule *fr, const char *name);</div><div class='del'>-void		filter_rule_set_source	(FilterRule *fr, const char *source);</div><div class='del'>-</div><div class='del'>-int		filter_rule_validate	(FilterRule *fr);</div><div class='del'>-</div><div class='del'>-xmlNodePtr	filter_rule_xml_encode	(FilterRule *fr);</div><div class='del'>-int		filter_rule_xml_decode	(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-void            filter_rule_copy        (FilterRule *dest, FilterRule *src);</div><div class='del'>-</div><div class='del'>-void		filter_rule_add_part	(FilterRule *fr, FilterPart *fp);</div><div class='del'>-void		filter_rule_remove_part	(FilterRule *fr, FilterPart *fp);</div><div class='del'>-void		filter_rule_replace_part(FilterRule *fr, FilterPart *fp, FilterPart *new);</div><div class='del'>-</div><div class='del'>-GtkWidget	*filter_rule_get_widget	(FilterRule *fr, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-void		filter_rule_build_code	(FilterRule *fr, GString *out);</div><div class='del'>-/*</div><div class='del'>-void		filter_rule_build_action(FilterRule *fr, GString *out);</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-void		filter_rule_emit_changed	(FilterRule *fr);</div><div class='del'>-</div><div class='del'>-/* static functions */</div><div class='del'>-FilterRule	*filter_rule_next_list		(GList *l, FilterRule *last, const char *source);</div><div class='del'>-FilterRule	*filter_rule_find_list		(GList *l, const char *name, const char *source);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_RULE_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-score.c b/filter/filter-score.c<br/>deleted file mode 100644<br/>index 170aa288ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-score.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-score.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,233 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util/e-sexp.h"</div><div class='del'>-#include "filter-score.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static void xml_create (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode (FilterElement *fe);</div><div class='del'>-static int xml_decode (FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static GtkWidget *get_widget (FilterElement *fe);</div><div class='del'>-static void build_code (FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp (FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_score_class_init (FilterScoreClass *class);</div><div class='del'>-static void filter_score_init (FilterScore *gspaper);</div><div class='del'>-static void filter_score_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((FilterScore *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _FilterScorePrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-filter_score_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterScore",</div><div class='del'>-			sizeof (FilterScore),</div><div class='del'>-			sizeof (FilterScoreClass),</div><div class='del'>-			(GtkClassInitFunc) filter_score_class_init,</div><div class='del'>-			(GtkObjectInitFunc) filter_score_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_score_class_init (FilterScoreClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_element_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = filter_score_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_score_init (FilterScore *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_score_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterScore *o = (FilterScore *)obj;</div><div class='del'>-	</div><div class='del'>-	o = o;</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * filter_score_new:</div><div class='del'>- *</div><div class='del'>- * Create a new FilterScore object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #FilterScore object.</div><div class='del'>- **/</div><div class='del'>-FilterScore *</div><div class='del'>-filter_score_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterScore *o = (FilterScore *)gtk_type_new(filter_score_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/*FilterScore *fs = (FilterScore *)fe;*/</div><div class='del'>-	</div><div class='del'>-	/* parent implementation */</div><div class='del'>-        ((FilterElementClass *)(parent_class))-&gt;xml_create(fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	FilterScore *fs = (FilterScore *)fe;</div><div class='del'>-	char *score;</div><div class='del'>-	</div><div class='del'>-	d(printf("Encoding score as xml\n"));</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "score");</div><div class='del'>-	</div><div class='del'>-	score = g_strdup_printf ("%d", fs-&gt;score);</div><div class='del'>-	xmlSetProp (value, "score", score);</div><div class='del'>-	g_free (score);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterScore *fs = (FilterScore *)fe;</div><div class='del'>-	char *name;</div><div class='del'>-	char *score;</div><div class='del'>-	</div><div class='del'>-	d(printf("Decoding score from xml %p\n", fe));</div><div class='del'>-	</div><div class='del'>-	name = xmlGetProp (node, "name");</div><div class='del'>-	d(printf ("Name = %s\n", name));</div><div class='del'>-	xmlFree (fe-&gt;name);</div><div class='del'>-	fe-&gt;name = name;</div><div class='del'>-	score = xmlGetProp (node, name);</div><div class='del'>-	if (score) {</div><div class='del'>-		fs-&gt;score = atoi (score);</div><div class='del'>-		xmlFree (score);</div><div class='del'>-	} else</div><div class='del'>-		fs-&gt;score = 0;</div><div class='del'>-	</div><div class='del'>-	if (fs-&gt;score &gt; 3)</div><div class='del'>-		fs-&gt;score = 3;</div><div class='del'>-	else if (fs-&gt;score &lt; -3)</div><div class='del'>-		fs-&gt;score = -3;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spin_changed (GtkWidget *spin, FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterScore *fs = (FilterScore *)fe;</div><div class='del'>-	</div><div class='del'>-	fs-&gt;score = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *spin;</div><div class='del'>-	GtkObject *adjustment;</div><div class='del'>-	FilterScore *fs = (FilterScore *)fe;</div><div class='del'>-	</div><div class='del'>-	adjustment = gtk_adjustment_new (0.0, -3.0, 3.0, 1.0, 1.0, 1.0);</div><div class='del'>-	spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1.0, 0);</div><div class='del'>-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);</div><div class='del'>-	</div><div class='del'>-	if (fs-&gt;score) {</div><div class='del'>-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), (gfloat) fs-&gt;score);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (spin), "changed", spin_changed, fe);</div><div class='del'>-	</div><div class='del'>-	return spin;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterScore *fs = (FilterScore *)fe;</div><div class='del'>-	</div><div class='del'>-	g_string_sprintfa(out, "%d ", fs-&gt;score);</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-score.h b/filter/filter-score.h<br/>deleted file mode 100644<br/>index a7b7acf929..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-score.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-score.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Authors: Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- *  Copyright 2000 Ximian, Inc. (www.ximian.com)</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _FILTER_SCORE_H</div><div class='del'>-#define _FILTER_SCORE_H</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_SCORE(obj)           GTK_CHECK_CAST (obj, filter_score_get_type (), FilterScore)</div><div class='del'>-#define FILTER_SCORE_CLASS(klass)   GTK_CHECK_CLASS_CAST (klass, filter_score_get_type (), FilterScoreClass)</div><div class='del'>-#define IS_FILTER_SCORE(obj)        GTK_CHECK_TYPE (obj, filter_score_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterScore        FilterScore;</div><div class='del'>-typedef struct _FilterScoreClass   FilterScoreClass;</div><div class='del'>-</div><div class='del'>-struct _FilterScore {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterScorePrivate *priv;</div><div class='del'>-	</div><div class='del'>-	gint32 score;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterScoreClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-	</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		filter_score_get_type	(void);</div><div class='del'>-FilterScore	*filter_score_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _FILTER_SCORE_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter-source.c b/filter/filter-source.c<br/>deleted file mode 100644<br/>index 8279a358e5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-source.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-source.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,399 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * filter-source.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "filter-source.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-util/e-url.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-context.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-moniker-util.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-exception.h&gt;</div><div class='del'>-#include &lt;bonobo-conf/bonobo-config-database.h&gt;</div><div class='del'>-#include &lt;camel/camel-url.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _SourceInfo SourceInfo;</div><div class='del'>-struct _SourceInfo {</div><div class='del'>-	char *account_name;</div><div class='del'>-	char *name;</div><div class='del'>-	char *address;</div><div class='del'>-	char *url;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterSourcePrivate {</div><div class='del'>-	GList *sources;</div><div class='del'>-	char *current_url;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterElementClass *parent_class = NULL;</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static void filter_source_class_init (FilterSourceClass *);</div><div class='del'>-static void filter_source_init (FilterSource *);</div><div class='del'>-static void filter_source_finalize (GtkObject *);</div><div class='del'>-</div><div class='del'>-static void xml_create(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static xmlNodePtr xml_encode(FilterElement *fe);</div><div class='del'>-static int xml_decode(FilterElement *fe, xmlNodePtr node);</div><div class='del'>-static FilterElement *clone(FilterElement *fe);</div><div class='del'>-static GtkWidget *get_widget(FilterElement *fe);</div><div class='del'>-static void build_code(FilterElement *fe, GString *out, struct _FilterPart *ff);</div><div class='del'>-static void format_sexp(FilterElement *, GString *);</div><div class='del'>-</div><div class='del'>-static void filter_source_add_source  (FilterSource *fs, const char *account_name, const char *name,</div><div class='del'>-				       const char *addr, const char *url);</div><div class='del'>-static void filter_source_get_sources (FilterSource *fs);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-filter_source_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"FilterSource",</div><div class='del'>-			sizeof(FilterSource),</div><div class='del'>-			sizeof(FilterSourceClass),</div><div class='del'>-			(GtkClassInitFunc)filter_source_class_init,</div><div class='del'>-			(GtkObjectInitFunc)filter_source_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_element_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_source_class_init (FilterSourceClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterElementClass *filter_element = (FilterElementClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_element_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = filter_source_finalize;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_element-&gt;xml_create = xml_create;</div><div class='del'>-	filter_element-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_element-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_element-&gt;clone = clone;</div><div class='del'>-	filter_element-&gt;get_widget = get_widget;</div><div class='del'>-	filter_element-&gt;build_code = build_code;</div><div class='del'>-	filter_element-&gt;format_sexp = format_sexp;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_source_init (FilterSource *fs)</div><div class='del'>-{</div><div class='del'>-	fs-&gt;priv = g_new (struct _FilterSourcePrivate, 1);</div><div class='del'>-	fs-&gt;priv-&gt;sources = NULL;</div><div class='del'>-	fs-&gt;priv-&gt;current_url = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_source_finalize (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	FilterSource *fs = FILTER_SOURCE (obj);</div><div class='del'>-	GList *i = fs-&gt;priv-&gt;sources;</div><div class='del'>-</div><div class='del'>-	while (i) {</div><div class='del'>-		SourceInfo *info = i-&gt;data;</div><div class='del'>-		g_free (info-&gt;account_name);</div><div class='del'>-		g_free (info-&gt;name);</div><div class='del'>-		g_free (info-&gt;address);</div><div class='del'>-		g_free (info-&gt;url);</div><div class='del'>-		g_free (info);</div><div class='del'>-		i = g_list_next (i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (fs-&gt;priv-&gt;sources);</div><div class='del'>-</div><div class='del'>-	g_free (fs-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		GTK_OBJECT_CLASS (parent_class)-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterSource *</div><div class='del'>-filter_source_new (void)</div><div class='del'>-{</div><div class='del'>-	FilterSource *s = (FilterSource *) gtk_type_new (filter_source_get_type ());</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-xml_create (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	/* Call parent implementation */</div><div class='del'>-	((FilterElementClass *)parent_class)-&gt;xml_create (fe, node);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	</div><div class='del'>-	FilterSource *fs = (FilterSource *) fe;</div><div class='del'>-	</div><div class='del'>-	value = xmlNewNode (NULL, "value");</div><div class='del'>-	xmlSetProp (value, "name", fe-&gt;name);</div><div class='del'>-	xmlSetProp (value, "type", "uri");</div><div class='del'>-	</div><div class='del'>-	if (fs-&gt;priv-&gt;current_url)</div><div class='del'>-		xmlNewTextChild (value, NULL, "uri", fs-&gt;priv-&gt;current_url);</div><div class='del'>-	</div><div class='del'>-	return value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-xml_decode (FilterElement *fe, xmlNodePtr node)</div><div class='del'>-{</div><div class='del'>-	FilterSource *fs = (FilterSource *) fe;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	char *uri;</div><div class='del'>-	</div><div class='del'>-	node = node-&gt;childs;</div><div class='del'>-	if (node &amp;&amp; node-&gt;name &amp;&amp; !strcmp (node-&gt;name, "uri")) {</div><div class='del'>-		uri = xmlNodeGetContent (node);</div><div class='del'>-		url = camel_url_new (uri, NULL);</div><div class='del'>-		xmlFree (uri);</div><div class='del'>-		</div><div class='del'>-		g_free (fs-&gt;priv-&gt;current_url);</div><div class='del'>-		fs-&gt;priv-&gt;current_url = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterElement *</div><div class='del'>-clone (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterSource *fs = (FilterSource *) fe;</div><div class='del'>-	FilterSource *cpy = filter_source_new ();</div><div class='del'>-	GList *i;</div><div class='del'>-</div><div class='del'>-	((FilterElement *)cpy)-&gt;name = xmlStrdup (fe-&gt;name);</div><div class='del'>-</div><div class='del'>-	cpy-&gt;priv-&gt;current_url = g_strdup (fs-&gt;priv-&gt;current_url);</div><div class='del'>-</div><div class='del'>-	for (i = fs-&gt;priv-&gt;sources; i != NULL; i = g_list_next (i)) {</div><div class='del'>-		SourceInfo *info = (SourceInfo *) i-&gt;data;</div><div class='del'>-		filter_source_add_source (cpy, info-&gt;account_name, info-&gt;name, info-&gt;address, info-&gt;url);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (FilterElement *) cpy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-source_changed (GtkWidget *w, FilterSource *fs)</div><div class='del'>-{</div><div class='del'>-	SourceInfo *info = (SourceInfo *) gtk_object_get_data (GTK_OBJECT (w), "source");</div><div class='del'>-	</div><div class='del'>-	g_free (fs-&gt;priv-&gt;current_url);</div><div class='del'>-	fs-&gt;priv-&gt;current_url = g_strdup (info-&gt;url);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterElement *fe)</div><div class='del'>-{</div><div class='del'>-	FilterSource *fs = (FilterSource *) fe;</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GList *i;</div><div class='del'>-	SourceInfo *first = NULL;</div><div class='del'>-	int index, current_index;</div><div class='del'>-	</div><div class='del'>-	if (fs-&gt;priv-&gt;sources == NULL)</div><div class='del'>-		filter_source_get_sources (fs);</div><div class='del'>-	</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	</div><div class='del'>-	index = 0;</div><div class='del'>-	current_index = -1;</div><div class='del'>-	</div><div class='del'>-	for (i = fs-&gt;priv-&gt;sources; i != NULL; i = g_list_next (i)) {</div><div class='del'>-		SourceInfo *info = (SourceInfo *) i-&gt;data;</div><div class='del'>-		char *label, *native_label;</div><div class='del'>-		</div><div class='del'>-		if (info-&gt;url != NULL) {</div><div class='del'>-			if (first == NULL)</div><div class='del'>-				first = info;</div><div class='del'>-			</div><div class='del'>-			if (info-&gt;account_name &amp;&amp; strcmp (info-&gt;account_name, info-&gt;address))</div><div class='del'>-				label = g_strdup_printf ("%s &lt;%s&gt; (%s)", info-&gt;name,</div><div class='del'>-							 info-&gt;address, info-&gt;account_name);</div><div class='del'>-			else</div><div class='del'>-				label = g_strdup_printf ("%s &lt;%s&gt;", info-&gt;name, info-&gt;address);</div><div class='del'>-			</div><div class='del'>-			native_label = e_utf8_to_gtk_string (GTK_WIDGET (menu), label);</div><div class='del'>-			item = gtk_menu_item_new_with_label (native_label);</div><div class='del'>-			g_free (label);</div><div class='del'>-			g_free (native_label);</div><div class='del'>-			</div><div class='del'>-			gtk_object_set_data (GTK_OBJECT (item), "source", info);</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (item), "activate", GTK_SIGNAL_FUNC (source_changed), fs);</div><div class='del'>-			gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-			gtk_widget_show (item);</div><div class='del'>-			</div><div class='del'>-			/* FIXME: don't use e_url_equal */</div><div class='del'>-			if (fs-&gt;priv-&gt;current_url &amp;&amp; e_url_equal (info-&gt;url, fs-&gt;priv-&gt;current_url)) {</div><div class='del'>-				current_index = index;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			index++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-	</div><div class='del'>-	if (current_index &gt;= 0) {</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), current_index);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), 0);</div><div class='del'>-		g_free (fs-&gt;priv-&gt;current_url);</div><div class='del'>-		</div><div class='del'>-		if (first)</div><div class='del'>-			fs-&gt;priv-&gt;current_url = g_strdup (first-&gt;url);</div><div class='del'>-		else</div><div class='del'>-			fs-&gt;priv-&gt;current_url = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-build_code (FilterElement *fe, GString *out, struct _FilterPart *ff)</div><div class='del'>-{</div><div class='del'>-	/* We are doing nothing on purpose. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-format_sexp (FilterElement *fe, GString *out)</div><div class='del'>-{</div><div class='del'>-	FilterSource *fs = (FilterSource *) fe;</div><div class='del'>-	</div><div class='del'>-	e_sexp_encode_string (out, fs-&gt;priv-&gt;current_url);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_source_add_source (FilterSource *fs, const char *account_name, const char *name,</div><div class='del'>-			  const char *addr, const char *url)</div><div class='del'>-{</div><div class='del'>-	SourceInfo *info;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (fs &amp;&amp; IS_FILTER_SOURCE (fs));</div><div class='del'>-	</div><div class='del'>-	info = g_new0 (SourceInfo, 1);</div><div class='del'>-	info-&gt;account_name = g_strdup (account_name);</div><div class='del'>-	info-&gt;name = g_strdup (name);</div><div class='del'>-	info-&gt;address = g_strdup (addr);</div><div class='del'>-	info-&gt;url = g_strdup (url);</div><div class='del'>-	</div><div class='del'>-	fs-&gt;priv-&gt;sources = g_list_append (fs-&gt;priv-&gt;sources, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter_source_get_sources (FilterSource *fs)</div><div class='del'>-{</div><div class='del'>-	Bonobo_ConfigDatabase db;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int i, len;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (BONOBO_EX (&amp;ev) || db == CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	len = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; len; ++i) {</div><div class='del'>-		char *path, *account_name, *name, *addr, *uri;</div><div class='del'>-		CamelURL *url;</div><div class='del'>-		</div><div class='del'>-		path = g_strdup_printf ("/Mail/Accounts/source_url_%d", i);</div><div class='del'>-		uri = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-		g_free (path);</div><div class='del'>-		</div><div class='del'>-		if (uri == NULL || *uri == '\0') {</div><div class='del'>-			g_free (uri);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);</div><div class='del'>-		account_name = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-		g_free (path);</div><div class='del'>-		</div><div class='del'>-		path = g_strdup_printf ("/Mail/Accounts/identity_name_%d", i);</div><div class='del'>-		name = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-		g_free (path);</div><div class='del'>-		</div><div class='del'>-		path = g_strdup_printf ("/Mail/Accounts/identity_address_%d", i);</div><div class='del'>-		addr = bonobo_config_get_string (db, path, NULL);</div><div class='del'>-		g_free (path);</div><div class='del'>-		</div><div class='del'>-		/* hide unwanted url params and stuff */</div><div class='del'>-		url = camel_url_new (uri, NULL);</div><div class='del'>-		g_free (uri);</div><div class='del'>-		uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		</div><div class='del'>-		filter_source_add_source (fs, account_name, name, addr, uri);</div><div class='del'>-		</div><div class='del'>-		g_free (account_name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		g_free (addr);</div><div class='del'>-		g_free (uri);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/filter/filter-source.h b/filter/filter-source.h<br/>deleted file mode 100644<br/>index da7cadb3dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter-source.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter-source.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * filter-source.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2001 Ximian, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Jon Trowbridge &lt;trow@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __FILTER_SOURCE_H__</div><div class='del'>-#define __FILTER_SOURCE_H__</div><div class='del'>-</div><div class='del'>-#include "filter-element.h"</div><div class='del'>-</div><div class='del'>-#define FILTER_SOURCE(obj)	GTK_CHECK_CAST (obj, filter_source_get_type (), FilterSource)</div><div class='del'>-#define FILTER_SOURCE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_source_get_type (), FilterSourceClass)</div><div class='del'>-#define IS_FILTER_SOURCE(obj)      GTK_CHECK_TYPE (obj, filter_source_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _FilterSource	FilterSource;</div><div class='del'>-typedef struct _FilterSourceClass	FilterSourceClass;</div><div class='del'>-struct _FilterSourcePrivate;</div><div class='del'>-</div><div class='del'>-struct _FilterSource {</div><div class='del'>-	FilterElement parent;</div><div class='del'>-	struct _FilterSourcePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _FilterSourceClass {</div><div class='del'>-	FilterElementClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType       filter_source_get_type (void);</div><div class='del'>-FilterSource *filter_source_new      (void);</div><div class='del'>-</div><div class='del'>-void filter_source_set_current (FilterSource *src, const gchar *url);</div><div class='del'>-</div><div class='del'>-#endif /* __FILTER_SOURCE_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/filter/filter.glade b/filter/filter.glade<br/>deleted file mode 100644<br/>index 7325381317..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filter.glade?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filter.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,738 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Filter&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;filter&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;edit_filter_2&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Edit Filters&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;filter_source&lt;/name&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;items&gt;Incoming</div><div class='del'>-Outgoing</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-      &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Filter Rules&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;256&lt;/width&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;viewport1&lt;/name&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkList&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_list&lt;/name&gt;</div><div class='del'>-	      &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbuttonbox1&lt;/name&gt;</div><div class='del'>-	    &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	    &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	    &lt;child_ipad_x&gt;6&lt;/child_ipad_x&gt;</div><div class='del'>-	    &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_add&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_edit&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Edit&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_delete&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Delete&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_up&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_UP&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_down&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_DOWN&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;edit_vfolder_2&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Edit VFolders&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox2&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area2&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button13&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button15&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;frame2&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Virtual Folders&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow2&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;256&lt;/width&gt;</div><div class='del'>-	  &lt;height&gt;167&lt;/height&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;viewport2&lt;/name&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkList&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_list&lt;/name&gt;</div><div class='del'>-	      &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbuttonbox2&lt;/name&gt;</div><div class='del'>-	    &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	    &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	    &lt;child_ipad_x&gt;6&lt;/child_ipad_x&gt;</div><div class='del'>-	    &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_add&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_edit&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Edit&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_delete&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Delete&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_up&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_UP&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_down&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_DOWN&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;vfolder_source&lt;/name&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox3&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area3&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button16&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button17&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button18&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vfolder_source_frame&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;vFolder Sources&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vbox3&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;source_option&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;items&gt;specific folders only</div><div class='del'>-with all local folders</div><div class='del'>-with all active remote folders</div><div class='del'>-with all local and active remote folders</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox3&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;scrolledwindow3&lt;/name&gt;</div><div class='del'>-	    &lt;width&gt;256&lt;/width&gt;</div><div class='del'>-	    &lt;height&gt;125&lt;/height&gt;</div><div class='del'>-	    &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	    &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;viewport3&lt;/name&gt;</div><div class='del'>-	      &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkList&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;source_list&lt;/name&gt;</div><div class='del'>-		&lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox3&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbuttonbox3&lt;/name&gt;</div><div class='del'>-	      &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	      &lt;child_ipad_x&gt;6&lt;/child_ipad_x&gt;</div><div class='del'>-	      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;source_add&lt;/name&gt;</div><div class='del'>-		&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;source_remove&lt;/name&gt;</div><div class='del'>-		&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;_Remove&lt;/label&gt;</div><div class='del'>-		&lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;edit_filter&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;rule_editor&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;filter_source&lt;/name&gt;</div><div class='del'>-      &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;items&gt;Incoming</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-      &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;rule_frame&lt;/name&gt;</div><div class='del'>-      &lt;label&gt;Filter Rules&lt;/label&gt;</div><div class='del'>-      &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-      &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow4&lt;/name&gt;</div><div class='del'>-	  &lt;width&gt;256&lt;/width&gt;</div><div class='del'>-	  &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;viewport4&lt;/name&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkList&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_list&lt;/name&gt;</div><div class='del'>-	      &lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox5&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVButtonBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbuttonbox4&lt;/name&gt;</div><div class='del'>-	    &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	    &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	    &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	    &lt;child_ipad_x&gt;6&lt;/child_ipad_x&gt;</div><div class='del'>-	    &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_add&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Add&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_edit&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Edit&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_delete&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;_Delete&lt;/label&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_up&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_UP&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;rule_down&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;stock_button&gt;GNOME_STOCK_BUTTON_DOWN&lt;/stock_button&gt;</div><div class='del'>-	      &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml<br/>deleted file mode 100644<br/>index 2ef34da1c5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/filtertypes.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/filtertypes.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,672 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filterdescription&gt;</div><div class='del'>-&lt;partset&gt;</div><div class='del'>- &lt;part name="sender"&gt;</div><div class='del'>-   &lt;title&gt;Sender&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="sender-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-contains "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-contains "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-matches "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-matches "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-starts-with "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-starts-with "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-ends-with "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-ends-with "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="matches soundex"&gt;</div><div class='del'>-     &lt;title&gt;sounds like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-soundex "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not match soundex"&gt;</div><div class='del'>-     &lt;title&gt;does not sound like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-soundex "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="sender"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="to"&gt;</div><div class='del'>-   &lt;title&gt;Recipients&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="recipient-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (or (header-contains "To" ${recipient})</div><div class='del'>-	    	       (header-contains "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (or</div><div class='del'>-               (header-contains "To" ${recipient})</div><div class='del'>-	       (header-contains "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (or (header-matches "To" ${recipient})</div><div class='del'>-	    	       (header-matches "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (or</div><div class='del'>-               (header-matches "To" ${recipient})</div><div class='del'>-	       (header-matches "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (or (header-starts-with "To" ${recipient})</div><div class='del'>-	    	       (header-starts-with "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (or</div><div class='del'>-               (header-starts-with "To" ${recipient})</div><div class='del'>-	       (header-starts-with "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (or (header-ends-with "To" ${recipient})</div><div class='del'>-	    	       (header-ends-with "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (or</div><div class='del'>-               (header-ends-with "To" ${recipient})</div><div class='del'>-	       (header-ends-with "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="matches soundex"&gt;</div><div class='del'>-     &lt;title&gt;sounds like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (or (header-soundex "To" ${recipient})</div><div class='del'>-	    	       (header-soundex "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not match soundex"&gt;</div><div class='del'>-     &lt;title&gt;does not sound like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (or</div><div class='del'>-               (header-soundex "To" ${recipient})</div><div class='del'>-	       (header-soundex "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="address" name="recipient"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="subject"&gt;</div><div class='del'>-   &lt;title&gt;Subject&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="subject-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-contains "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-contains "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-matches "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-matches "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-starts-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-starts-with "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-ends-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-ends-with "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="matches soundex"&gt;</div><div class='del'>-     &lt;title&gt;sounds like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-soundex "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not match soundex"&gt;</div><div class='del'>-     &lt;title&gt;does not sound like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-soundex "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="subject"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="header"&gt;</div><div class='del'>-   &lt;title&gt;Specific header&lt;/title&gt;</div><div class='del'>-   &lt;input type="string" name="header-field"/&gt;</div><div class='del'>-   &lt;input type="optionlist" name="header-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-contains ${header-field} ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-contains ${header-field} ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-matches ${header-field} ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-matches ${header-field} ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-starts-with ${header-field} ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-starts-with ${header-field} ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-ends-with ${header-field} ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-ends-with ${header-field} ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="exists"&gt;</div><div class='del'>-     &lt;title&gt;exists&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-exists ${header-field}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not exists"&gt;</div><div class='del'>-     &lt;title&gt;does not exist&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-exists ${header-field})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="matches soundex"&gt;</div><div class='del'>-     &lt;title&gt;sounds like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-soundex ${header-field} ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not match soundex"&gt;</div><div class='del'>-     &lt;title&gt;does not sound like&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-soundex ${header-field} ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="word"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="body"&gt;</div><div class='del'>-   &lt;title&gt;Message Body&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="body-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(body-contains ${word})</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (body-contains ${word})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="word"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="sexp"&gt;</div><div class='del'>-   &lt;title&gt;Expression&lt;/title&gt;</div><div class='del'>-   &lt;input type="code" name="code"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="sent-date"&gt;</div><div class='del'>-  &lt;title&gt;Date sent&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="date-spec-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (= (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (not (= (get-sent-date) ${versus})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="before"&gt;</div><div class='del'>-    &lt;title&gt;is before&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="after"&gt;</div><div class='del'>-    &lt;title&gt;is after&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;    </div><div class='del'>-  &lt;input type="datespec" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="recv-date"&gt;</div><div class='del'>-  &lt;title&gt;Date received&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="date-spec-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (= (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (not (= (get-received-date) ${versus})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="before"&gt;</div><div class='del'>-    &lt;title&gt;is before&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="after"&gt;</div><div class='del'>-    &lt;title&gt;is after&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;    </div><div class='del'>-  &lt;input type="datespec" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="score"&gt;</div><div class='del'>-  &lt;title&gt;Score&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="score-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (= (get-score) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (not (= (get-score) ${versus})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="greater-than"&gt;</div><div class='del'>-    &lt;title&gt;is greater than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-score) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="less-than"&gt;</div><div class='del'>-    &lt;title&gt;is less than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-score) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="score" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="size"&gt;</div><div class='del'>-  &lt;title&gt;Size (kB)&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="size-type"&gt;</div><div class='del'>-   &lt;option value="greater-than"&gt;</div><div class='del'>-    &lt;title&gt;is greater than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-size) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="less-than"&gt;</div><div class='del'>-    &lt;title&gt;is less than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-size) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="integer" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="status"&gt;</div><div class='del'>-  &lt;title&gt;Status&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (system-flag ${flag}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (system-flag ${flag})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="optionlist" name="flag"&gt;</div><div class='del'>-   &lt;option value="Answered"&gt;</div><div class='del'>-    &lt;title&gt;Replied to&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Draft"&gt;</div><div class='del'>-    &lt;title&gt;Draft&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Flagged"&gt;</div><div class='del'>-    &lt;title&gt;Important&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Seen"&gt;</div><div class='del'>-    &lt;title&gt;Read&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="follow-up"&gt;</div><div class='del'>-  &lt;title&gt;Follow Up&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is Flagged&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (= (user-tag "follow-up") "")))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is not"&gt;</div><div class='del'>-    &lt;title&gt;is not Flagged&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (= (user-tag "follow-up") ""))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="attachments"&gt;</div><div class='del'>-  &lt;title&gt;Attachments&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="exist"&gt;</div><div class='del'>-    &lt;title&gt;Exist&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (system-flag "Attachments"))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="not exist"&gt;</div><div class='del'>-    &lt;title&gt;Do Not Exist&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (system-flag "Attachments")))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="mlist"&gt;</div><div class='del'>-  &lt;title&gt;Mailing list&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="mlist-type"&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (header-matches "x-camel-mlist" ${mlist}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-matches "x-camel-mlist" ${mlist})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (header-contains "x-camel-mlist" ${mlist}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-contains "x-camel-mlist" ${mlist})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="mlist"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="regex"&gt;</div><div class='del'>-  &lt;title&gt;Regex Match&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="header"&gt;</div><div class='del'>-    &lt;title&gt;Message Header&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (header-full-regex ${expression}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="body"&gt;</div><div class='del'>-    &lt;title&gt;Message Body&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (body-regex ${expression}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="regex" name="expression"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="source"&gt;</div><div class='del'>-  &lt;title&gt;Source Account&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="srcmatch-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (= (get-source) ${source}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (not (= (get-source) ${source})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="source" name="source"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="command"&gt;</div><div class='del'>-  &lt;title&gt;Command&lt;/title&gt;</div><div class='del'>-  &lt;input type="command" name="command"/&gt;</div><div class='del'>-  &lt;input type="optionlist" name="retval-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (= (shell-exec ${command}) ${retval}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (not (= (shell-exec ${command}) ${retval})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="greater-than"&gt;</div><div class='del'>-    &lt;title&gt;is greater than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (&amp;gt; (shell-exec ${command}) ${retval}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="less-than"&gt;</div><div class='del'>-    &lt;title&gt;is less than&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-      (match-all (&amp;lt; (shell-exec ${command}) ${retval}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="integer" name="retval"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-&lt;/partset&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;actionset&gt;</div><div class='del'>- &lt;part name="move-to-folder"&gt;</div><div class='del'>-  &lt;title&gt;Move to Folder&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(move-to ${folder})&lt;/code&gt;</div><div class='del'>-  &lt;input type="folder" name="folder"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="copy-to-folder"&gt;</div><div class='del'>-  &lt;title&gt;Copy to Folder&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(copy-to ${folder})&lt;/code&gt;</div><div class='del'>-  &lt;input type="folder" name="folder"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="delete"&gt;</div><div class='del'>-  &lt;title&gt;Delete&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(delete)&lt;/code&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="stop"&gt;</div><div class='del'>-  &lt;title&gt;Stop Processing&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(stop)&lt;/code&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="colour"&gt;</div><div class='del'>-  &lt;title&gt;Assign Color&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(set-colour ${colour})&lt;/code&gt;</div><div class='del'>-  &lt;input type="colour" name="colour"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="score"&gt;</div><div class='del'>-  &lt;title&gt;Assign Score&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(set-score ${score})&lt;/code&gt;</div><div class='del'>-  &lt;input type="score" name="score"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="adj-score"&gt;</div><div class='del'>-  &lt;title&gt;Adjust Score&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(adjust-score ${score})&lt;/code&gt;</div><div class='del'>-  &lt;input type="score" name="score"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="set-status"&gt;</div><div class='del'>-  &lt;title&gt;Set Status&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;</div><div class='del'>-   (set-system-flag ${flag})</div><div class='del'>-  &lt;/code&gt;</div><div class='del'>-  &lt;input type="optionlist" name="flag"&gt;</div><div class='del'>-   &lt;option value="Answered"&gt;</div><div class='del'>-    &lt;title&gt;Replied to&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Deleted"&gt;</div><div class='del'>-    &lt;title&gt;Deleted&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Draft"&gt;</div><div class='del'>-    &lt;title&gt;Draft&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Flagged"&gt;</div><div class='del'>-    &lt;title&gt;Important&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Seen"&gt;</div><div class='del'>-    &lt;title&gt;Read&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="beep"&gt;</div><div class='del'>-  &lt;title&gt;Beep&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(beep)&lt;/code&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="play-sound"&gt;</div><div class='del'>-  &lt;title&gt;Play Sound&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(play-sound ${sound})&lt;/code&gt;</div><div class='del'>-  &lt;input type="string" name="sound"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="shell-exec"&gt;</div><div class='del'>-  &lt;title&gt;Execute Shell Command&lt;/title&gt;</div><div class='del'>-  &lt;code&gt;(shell-exec ${command})&lt;/code&gt;</div><div class='del'>-  &lt;input type="string" name="command"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-&lt;/actionset&gt;</div><div class='del'>-&lt;/filterdescription&gt;</div><div class='head'>diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h<br/>deleted file mode 100644<br/>index 82aab705d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/libfilter-i18n.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/libfilter-i18n.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* Automatically generated. Do not edit. */</div><div class='del'>-char *s = N_("Adjust Score");</div><div class='del'>-char *s = N_("Assign Color");</div><div class='del'>-char *s = N_("Assign Score");</div><div class='del'>-char *s = N_("Attachments");</div><div class='del'>-char *s = N_("Beep");</div><div class='del'>-char *s = N_("Command");</div><div class='del'>-char *s = N_("contains");</div><div class='del'>-char *s = N_("Copy to Folder");</div><div class='del'>-char *s = N_("Date received");</div><div class='del'>-char *s = N_("Date sent");</div><div class='del'>-char *s = N_("Delete");</div><div class='del'>-char *s = N_("Deleted");</div><div class='del'>-char *s = N_("does not contain");</div><div class='del'>-char *s = N_("does not end with");</div><div class='del'>-char *s = N_("does not exist");</div><div class='del'>-char *s = N_("does not sound like");</div><div class='del'>-char *s = N_("does not start with");</div><div class='del'>-char *s = N_("Do Not Exist");</div><div class='del'>-char *s = N_("Draft");</div><div class='del'>-char *s = N_("ends with");</div><div class='del'>-char *s = N_("Execute Shell Command");</div><div class='del'>-char *s = N_("Exist");</div><div class='del'>-char *s = N_("exists");</div><div class='del'>-char *s = N_("Expression");</div><div class='del'>-char *s = N_("Follow Up");</div><div class='del'>-char *s = N_("Important");</div><div class='del'>-char *s = N_("is");</div><div class='del'>-char *s = N_("is after");</div><div class='del'>-char *s = N_("is before");</div><div class='del'>-char *s = N_("is Flagged");</div><div class='del'>-char *s = N_("is greater than");</div><div class='del'>-char *s = N_("is less than");</div><div class='del'>-char *s = N_("is not");</div><div class='del'>-char *s = N_("is not Flagged");</div><div class='del'>-char *s = N_("Mailing list");</div><div class='del'>-char *s = N_("Message Body");</div><div class='del'>-char *s = N_("Message Header");</div><div class='del'>-char *s = N_("Move to Folder");</div><div class='del'>-char *s = N_("Play Sound");</div><div class='del'>-char *s = N_("Read");</div><div class='del'>-char *s = N_("Recipients");</div><div class='del'>-char *s = N_("Regex Match");</div><div class='del'>-char *s = N_("Replied to");</div><div class='del'>-char *s = N_("Score");</div><div class='del'>-char *s = N_("Sender");</div><div class='del'>-char *s = N_("Set Status");</div><div class='del'>-char *s = N_("Size (kB)");</div><div class='del'>-char *s = N_("sounds like");</div><div class='del'>-char *s = N_("Source Account");</div><div class='del'>-char *s = N_("Specific header");</div><div class='del'>-char *s = N_("starts with");</div><div class='del'>-char *s = N_("Status");</div><div class='del'>-char *s = N_("Stop Processing");</div><div class='del'>-char *s = N_("Subject");</div><div class='head'>diff --git a/filter/rule-context.c b/filter/rule-context.c<br/>deleted file mode 100644<br/>index 18939a0041..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/rule-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/rule-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,694 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_ALLOCA_H</div><div class='del'>-#include &lt;alloca.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-</div><div class='del'>-#include "rule-context.h"</div><div class='del'>-</div><div class='del'>-#define d(x) </div><div class='del'>-</div><div class='del'>-static int load(RuleContext * f, const char *system, const char *user);</div><div class='del'>-static int save(RuleContext * f, const char *user);</div><div class='del'>-static GList *rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp);</div><div class='del'>-static GList *delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp);</div><div class='del'>-</div><div class='del'>-static void rule_context_class_init(RuleContextClass * class);</div><div class='del'>-static void rule_context_init(RuleContext * gspaper);</div><div class='del'>-static void rule_context_finalise(GtkObject * obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((RuleContext *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _RuleContextPrivate {</div><div class='del'>-	int frozen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RULE_ADDED,</div><div class='del'>-	RULE_REMOVED,</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-rule_context_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"RuleContext",</div><div class='del'>-			sizeof(RuleContext),</div><div class='del'>-			sizeof(RuleContextClass),</div><div class='del'>-			(GtkClassInitFunc) rule_context_class_init,</div><div class='del'>-			(GtkObjectInitFunc) rule_context_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique(gtk_object_get_type(), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_context_class_init (RuleContextClass * class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	parent_class = gtk_type_class(gtk_object_get_type());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = rule_context_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	class-&gt;load = load;</div><div class='del'>-	class-&gt;save = save;</div><div class='del'>-	class-&gt;rename_uri = rename_uri;</div><div class='del'>-	class-&gt;delete_uri = delete_uri;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	signals[RULE_ADDED] =</div><div class='del'>-		gtk_signal_new("rule_added",</div><div class='del'>-			       GTK_RUN_LAST,</div><div class='del'>-			       object_class-&gt;type,</div><div class='del'>-			       GTK_SIGNAL_OFFSET (RuleContextClass, rule_added),</div><div class='del'>-			       gtk_marshal_NONE__POINTER,</div><div class='del'>-			       GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	signals[RULE_REMOVED] =</div><div class='del'>-		gtk_signal_new("rule_removed",</div><div class='del'>-			       GTK_RUN_LAST,</div><div class='del'>-			       object_class-&gt;type,</div><div class='del'>-			       GTK_SIGNAL_OFFSET (RuleContextClass, rule_removed),</div><div class='del'>-			       gtk_marshal_NONE__POINTER,</div><div class='del'>-			       GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	signals[CHANGED] =</div><div class='del'>-		gtk_signal_new("changed",</div><div class='del'>-			       GTK_RUN_LAST,</div><div class='del'>-			       object_class-&gt;type,</div><div class='del'>-			       GTK_SIGNAL_OFFSET (RuleContextClass, changed),</div><div class='del'>-			       gtk_marshal_NONE__NONE,</div><div class='del'>-			       GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_context_init (RuleContext * o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-	</div><div class='del'>-	o-&gt;part_set_map = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	o-&gt;rule_set_map = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_part_set (struct _part_set_map *map, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (map-&gt;name);</div><div class='del'>-	g_free (map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_rule_set (struct _rule_set_map *map, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (map-&gt;name);</div><div class='del'>-	g_free (map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_context_finalise (GtkObject * obj)</div><div class='del'>-{</div><div class='del'>-	RuleContext *o = (RuleContext *) obj;</div><div class='del'>-	</div><div class='del'>-	g_list_foreach (o-&gt;rule_set_list, (GFunc)free_rule_set, NULL);</div><div class='del'>-	g_list_free (o-&gt;rule_set_list);</div><div class='del'>-	g_hash_table_destroy (o-&gt;rule_set_map);</div><div class='del'>-	</div><div class='del'>-	g_list_foreach (o-&gt;part_set_list, (GFunc)free_part_set, NULL);</div><div class='del'>-	g_list_free (o-&gt;part_set_list);</div><div class='del'>-	g_hash_table_destroy (o-&gt;part_set_map);</div><div class='del'>-	</div><div class='del'>-	g_free (o-&gt;error);</div><div class='del'>-	</div><div class='del'>-	g_list_foreach (o-&gt;parts, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (o-&gt;parts);</div><div class='del'>-	g_list_foreach (o-&gt;rules, (GFunc)gtk_object_unref, NULL);</div><div class='del'>-	g_list_free (o-&gt;rules);</div><div class='del'>-	</div><div class='del'>-	if (o-&gt;system)</div><div class='del'>-		xmlFreeDoc (o-&gt;system);</div><div class='del'>-	if (o-&gt;user)</div><div class='del'>-		xmlFreeDoc (o-&gt;user);</div><div class='del'>-	</div><div class='del'>-	g_free (o-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	((GtkObjectClass *) (parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rule_context_new:</div><div class='del'>- *</div><div class='del'>- * Create a new RuleContext object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #RuleContext object.</div><div class='del'>- **/</div><div class='del'>-RuleContext *</div><div class='del'>-rule_context_new (void)</div><div class='del'>-{</div><div class='del'>-	RuleContext *o = (RuleContext *) gtk_type_new(rule_context_get_type());</div><div class='del'>-</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_add_part_set (RuleContext * f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next)</div><div class='del'>-{</div><div class='del'>-	struct _part_set_map *map;</div><div class='del'>-	</div><div class='del'>-	g_assert(g_hash_table_lookup(f-&gt;part_set_map, setname) == NULL);</div><div class='del'>-	</div><div class='del'>-	map = g_malloc0 (sizeof(*map));</div><div class='del'>-	map-&gt;type = part_type;</div><div class='del'>-	map-&gt;append = append;</div><div class='del'>-	map-&gt;next = next;</div><div class='del'>-	map-&gt;name = g_strdup (setname);</div><div class='del'>-	g_hash_table_insert (f-&gt;part_set_map, map-&gt;name, map);</div><div class='del'>-	f-&gt;part_set_list = g_list_append (f-&gt;part_set_list, map);</div><div class='del'>-	d(printf("adding part set '%s'\n", setname));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_add_rule_set (RuleContext * f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next)</div><div class='del'>-{</div><div class='del'>-	struct _rule_set_map *map;</div><div class='del'>-</div><div class='del'>-	g_assert(g_hash_table_lookup (f-&gt;rule_set_map, setname) == NULL);</div><div class='del'>-	</div><div class='del'>-	map = g_malloc0 (sizeof (*map));</div><div class='del'>-	map-&gt;type = rule_type;</div><div class='del'>-	map-&gt;append = append;</div><div class='del'>-	map-&gt;next = next;</div><div class='del'>-	map-&gt;name = g_strdup (setname);</div><div class='del'>-	g_hash_table_insert (f-&gt;rule_set_map, map-&gt;name, map);</div><div class='del'>-	f-&gt;rule_set_list = g_list_append (f-&gt;rule_set_list, map);</div><div class='del'>-	d(printf("adding rule set '%s'\n", setname));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rule_context_set_error:</div><div class='del'>- * @f: </div><div class='del'>- * @error: </div><div class='del'>- * </div><div class='del'>- * Set the text error for the context, or NULL to clear it.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-rule_context_set_error (RuleContext * f, char *error)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	g_free (f-&gt;error);</div><div class='del'>-	f-&gt;error = error;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rule_context_load:</div><div class='del'>- * @f: </div><div class='del'>- * @system: </div><div class='del'>- * @user: </div><div class='del'>- *</div><div class='del'>- * Load a rule context from a system and user description file.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-rule_context_load (RuleContext *f, const char *system, const char *user)</div><div class='del'>-{</div><div class='del'>-	int res;</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	d(printf("rule_context: loading %s %s\n", system, user));</div><div class='del'>-</div><div class='del'>-	f-&gt;priv-&gt;frozen++;</div><div class='del'>-	res= ((RuleContextClass *) ((GtkObject *) f)-&gt;klass)-&gt;load (f, system, user);</div><div class='del'>-	f-&gt;priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	return res;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-load (RuleContext *f, const char *system, const char *user)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr set, rule;</div><div class='del'>-	struct _part_set_map *part_map;</div><div class='del'>-	struct _rule_set_map *rule_map;</div><div class='del'>-	</div><div class='del'>-	rule_context_set_error (f, NULL);</div><div class='del'>-	</div><div class='del'>-	d(printf("loading rules %s %s\n", system, user));</div><div class='del'>-	</div><div class='del'>-	f-&gt;system = xmlParseFile (system);</div><div class='del'>-	if (f-&gt;system == NULL) {</div><div class='del'>-		rule_context_set_error(f, g_strdup_printf ("Unable to load system rules '%s': %s",</div><div class='del'>-							   system, strerror(errno)));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	if (strcmp (f-&gt;system-&gt;root-&gt;name, "filterdescription")) {</div><div class='del'>-		rule_context_set_error (f, g_strdup_printf ("Unable to load system rules '%s': Invalid format", system));</div><div class='del'>-		xmlFreeDoc (f-&gt;system);</div><div class='del'>-		f-&gt;system = NULL;</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	/* doesn't matter if this doens't exist */</div><div class='del'>-	f-&gt;user = xmlParseFile (user);</div><div class='del'>-	</div><div class='del'>-	/* now parse structure */</div><div class='del'>-	/* get rule parts */</div><div class='del'>-	set = f-&gt;system-&gt;root-&gt;childs;</div><div class='del'>-	while (set) {</div><div class='del'>-		d(printf("set name = %s\n", set-&gt;name));</div><div class='del'>-		part_map = g_hash_table_lookup (f-&gt;part_set_map, set-&gt;name);</div><div class='del'>-		if (part_map) {</div><div class='del'>-			d(printf("loading parts ...\n"));</div><div class='del'>-			rule = set-&gt;childs;</div><div class='del'>-			while (rule) {</div><div class='del'>-				if (!strcmp (rule-&gt;name, "part")) {</div><div class='del'>-					FilterPart *part = FILTER_PART (gtk_type_new (part_map-&gt;type));</div><div class='del'>-					</div><div class='del'>-					if (filter_part_xml_create (part, rule) == 0) {</div><div class='del'>-						part_map-&gt;append (f, part);</div><div class='del'>-					} else {</div><div class='del'>-						gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-						g_warning ("Cannot load filter part");</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				rule = rule-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		set = set-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* now load actual rules */</div><div class='del'>-	if (f-&gt;user) {</div><div class='del'>-		set = f-&gt;user-&gt;root-&gt;childs;</div><div class='del'>-		while (set) {</div><div class='del'>-			d(printf("set name = %s\n", set-&gt;name));</div><div class='del'>-			rule_map = g_hash_table_lookup (f-&gt;rule_set_map, set-&gt;name);</div><div class='del'>-			if (rule_map) {</div><div class='del'>-				d(printf("loading rules ...\n"));</div><div class='del'>-				rule = set-&gt;childs;</div><div class='del'>-				while (rule) {</div><div class='del'>-					d(printf("checking node: %s\n", rule-&gt;name));</div><div class='del'>-					if (!strcmp (rule-&gt;name, "rule")) {</div><div class='del'>-						FilterRule *part = FILTER_RULE(gtk_type_new (rule_map-&gt;type));</div><div class='del'>-						</div><div class='del'>-						if (filter_rule_xml_decode (part, rule, f) == 0) {</div><div class='del'>-							rule_map-&gt;append (f, part);</div><div class='del'>-						} else {</div><div class='del'>-							gtk_object_unref (GTK_OBJECT (part));</div><div class='del'>-							g_warning ("Cannot load filter part");</div><div class='del'>-						}</div><div class='del'>-					}</div><div class='del'>-					rule = rule-&gt;next;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			set = set-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rule_context_save:</div><div class='del'>- * @f: </div><div class='del'>- * @user: </div><div class='del'>- * </div><div class='del'>- * Save a rule context to disk.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-rule_context_save (RuleContext *f, const char *user)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(user);</div><div class='del'>-</div><div class='del'>-	return ((RuleContextClass *) ((GtkObject *) f)-&gt;klass)-&gt;save(f, user);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-save (RuleContext *f, const char *user)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	xmlNodePtr root, rules, work;</div><div class='del'>-	GList *l;</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-	struct _rule_set_map *map;</div><div class='del'>-	char *usersav, *userbak, *slash;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	doc = xmlNewDoc ("1.0");</div><div class='del'>-	root = xmlNewDocNode (doc, NULL, "filteroptions", NULL);</div><div class='del'>-	xmlDocSetRootElement (doc, root);</div><div class='del'>-	l = f-&gt;rule_set_list;</div><div class='del'>-	while (l) {</div><div class='del'>-		map = l-&gt;data;</div><div class='del'>-		rules = xmlNewDocNode (doc, NULL, map-&gt;name, NULL);</div><div class='del'>-		xmlAddChild (root, rules);</div><div class='del'>-		rule = NULL;</div><div class='del'>-		while ((rule = map-&gt;next (f, rule, NULL))) {</div><div class='del'>-			d(printf("processing rule %s\n", rule-&gt;name));</div><div class='del'>-			work = filter_rule_xml_encode (rule);</div><div class='del'>-			xmlAddChild (rules, work);</div><div class='del'>-		}</div><div class='del'>-		l = g_list_next (l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	usersav = alloca(strlen(user)+5);</div><div class='del'>-	userbak = alloca(strlen(user)+5);</div><div class='del'>-	slash = strrchr(user, '/');</div><div class='del'>-	if (slash)</div><div class='del'>-		sprintf(usersav, "%.*s.#%s", slash-user+1, user, slash+1);</div><div class='del'>-	else</div><div class='del'>-		sprintf(usersav, ".#%s", user);</div><div class='del'>-	sprintf(userbak, "%s~", user);</div><div class='del'>-	printf("saving rules to '%s' then backup '%s'\n", usersav, userbak);</div><div class='del'>-	ret = xmlSaveFile(usersav, doc);</div><div class='del'>-	if (ret != -1) {</div><div class='del'>-		rename(user, userbak);</div><div class='del'>-		ret = rename(usersav, user);</div><div class='del'>-	}</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart *</div><div class='del'>-rule_context_find_part (RuleContext *f, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(name);</div><div class='del'>-</div><div class='del'>-	d(printf("find part : "));</div><div class='del'>-	return filter_part_find_list (f-&gt;parts, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart *</div><div class='del'>-rule_context_create_part (RuleContext *f, const char *name)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(name);</div><div class='del'>-</div><div class='del'>-	part = rule_context_find_part (f, name);</div><div class='del'>-	if (part)</div><div class='del'>-		part = filter_part_clone (part);</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterPart *</div><div class='del'>-rule_context_next_part (RuleContext *f, FilterPart *last)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	return filter_part_next_list (f-&gt;parts, last);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-rule_context_next_rule (RuleContext *f, FilterRule *last, const char *source)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	return filter_rule_next_list (f-&gt;rules, last, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-rule_context_find_rule (RuleContext *f, const char *name, const char *source)</div><div class='del'>-{</div><div class='del'>-	g_assert(name);</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	return filter_rule_find_list (f-&gt;rules, name, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_add_part (RuleContext *f, FilterPart *part)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(part);</div><div class='del'>-</div><div class='del'>-	f-&gt;parts = g_list_append (f-&gt;parts, part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_add_rule (RuleContext *f, FilterRule *new)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(new);</div><div class='del'>-</div><div class='del'>-	d(printf("add rule '%s'\n", new-&gt;name));</div><div class='del'>-</div><div class='del'>-	f-&gt;rules = g_list_append (f-&gt;rules, new);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;priv-&gt;frozen == 0) {</div><div class='del'>-		gtk_signal_emit((GtkObject *)f, signals[RULE_ADDED], new);</div><div class='del'>-		gtk_signal_emit((GtkObject *)f, signals[CHANGED]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_rule_clicked (GtkWidget *dialog, int button, RuleContext *context)</div><div class='del'>-{</div><div class='del'>-	if (button == 0) {</div><div class='del'>-		FilterRule *rule = gtk_object_get_data (GTK_OBJECT (dialog), "rule");</div><div class='del'>-		char *user = gtk_object_get_data (GTK_OBJECT (dialog), "path");</div><div class='del'>-		</div><div class='del'>-		if (!filter_rule_validate (rule)) {</div><div class='del'>-			/* no need to popup a dialog because the validate code does that. */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (rule));</div><div class='del'>-		rule_context_add_rule (context, rule);</div><div class='del'>-		if (user) {</div><div class='del'>-			rule_context_save ((RuleContext *) context, user);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (button != -1) {</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* add a rule, with a gui, asking for confirmation first ... optionally save to path */</div><div class='del'>-void</div><div class='del'>-rule_context_add_rule_gui (RuleContext *f, FilterRule *rule, const char *title, const char *path)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog, *w;</div><div class='del'>-</div><div class='del'>-	d(printf("add rule gui '%s'\n", rule-&gt;name));</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(rule);</div><div class='del'>-	</div><div class='del'>-	w = filter_rule_get_widget (rule, f);</div><div class='del'>-	dialog = gnome_dialog_new (title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);</div><div class='del'>-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), w, TRUE, TRUE, 0);</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (dialog), "rule", rule, (GtkDestroyNotify) gtk_object_unref);</div><div class='del'>-	if (path)</div><div class='del'>-		gtk_object_set_data_full (GTK_OBJECT (dialog), "path", g_strdup (path), (GtkDestroyNotify) g_free);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (dialog), "clicked", new_rule_clicked, f);</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (f));</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (dialog), "context", f, (GtkDestroyNotify) gtk_object_unref);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_remove_rule (RuleContext *f, FilterRule *rule)</div><div class='del'>-{</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(rule);</div><div class='del'>-</div><div class='del'>-	d(printf("remove rule '%s'\n", rule-&gt;name));</div><div class='del'>-</div><div class='del'>-	f-&gt;rules = g_list_remove (f-&gt;rules, rule);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;priv-&gt;frozen == 0) {</div><div class='del'>-		gtk_signal_emit((GtkObject *)f, signals[RULE_REMOVED], rule);</div><div class='del'>-		gtk_signal_emit((GtkObject *)f, signals[CHANGED]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_rank_rule (RuleContext *f, FilterRule *rule, int rank)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	int i = 0, index = 0;</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(rule);</div><div class='del'>-</div><div class='del'>-	if (rule_context_get_rank_rule(f, rule, rule-&gt;source) == rank)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	f-&gt;rules = g_list_remove(f-&gt;rules, rule);</div><div class='del'>-	node = f-&gt;rules;</div><div class='del'>-	while (node) {</div><div class='del'>-		FilterRule *r = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (i == rank) {</div><div class='del'>-			f-&gt;rules = g_list_insert(f-&gt;rules, rule, index);</div><div class='del'>-			if (f-&gt;priv-&gt;frozen == 0)</div><div class='del'>-				gtk_signal_emit((GtkObject *)f, signals[CHANGED]);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		index++;		</div><div class='del'>-		if (rule-&gt;source == NULL || (r-&gt;source &amp;&amp; strcmp (r-&gt;source, rule-&gt;source) == 0))</div><div class='del'>-			i++;</div><div class='del'>-</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f-&gt;rules = g_list_append(f-&gt;rules, rule);</div><div class='del'>-	if (f-&gt;priv-&gt;frozen == 0)</div><div class='del'>-		gtk_signal_emit((GtkObject *)f, signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-rule_context_get_rank_rule (RuleContext *f, FilterRule *rule, const char *source)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-	g_assert(rule);</div><div class='del'>-</div><div class='del'>-	d(printf("getting rank of rule '%s'\n", rule-&gt;name));</div><div class='del'>-</div><div class='del'>-	node = f-&gt;rules;</div><div class='del'>-	while (node) {</div><div class='del'>-		FilterRule *r = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		d(printf(" checking against rule '%s' rank '%d'\n", r-&gt;name, i));</div><div class='del'>-		</div><div class='del'>-		if (r == rule)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-		if (source == NULL || (r-&gt;source &amp;&amp; strcmp (r-&gt;source, source) == 0))</div><div class='del'>-			i++;</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-FilterRule *</div><div class='del'>-rule_context_find_rank_rule (RuleContext *f, int rank, const char *source)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	int i = 0;</div><div class='del'>-</div><div class='del'>-	g_assert(f);</div><div class='del'>-</div><div class='del'>-	d(printf("getting rule at rank %d source '%s'\n", rank, source?source:"&lt;any&gt;"));</div><div class='del'>-</div><div class='del'>-	node = f-&gt;rules;</div><div class='del'>-	while (node) {</div><div class='del'>-		FilterRule *r = node-&gt;data;</div><div class='del'>-</div><div class='del'>-		d(printf(" checking against rule '%s' rank '%d'\n", r-&gt;name, i));</div><div class='del'>-</div><div class='del'>-		if (source == NULL || (r-&gt;source &amp;&amp; strcmp(r-&gt;source, source) == 0)) {</div><div class='del'>-			if (rank == i)</div><div class='del'>-				return r;</div><div class='del'>-			i++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-rule_context_delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	return ((RuleContextClass *) ((GtkObject *) f)-&gt;klass)-&gt;delete_uri(f, uri, cmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-rule_context_rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp)</div><div class='del'>-{</div><div class='del'>-	return ((RuleContextClass *) ((GtkObject *) f)-&gt;klass)-&gt;rename_uri (f, olduri, newuri, cmp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_context_free_uri_list(RuleContext *f, GList *uris)</div><div class='del'>-{</div><div class='del'>-	GList *l = uris, *n;</div><div class='del'>-</div><div class='del'>-	/* TODO: should be virtual */</div><div class='del'>-</div><div class='del'>-	while (l) {</div><div class='del'>-		n = l-&gt;next;</div><div class='del'>-		g_free(l-&gt;data);</div><div class='del'>-		g_list_free_1(l);</div><div class='del'>-		l = n;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/filter/rule-context.h b/filter/rule-context.h<br/>deleted file mode 100644<br/>index 56c1bb491e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/rule-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/rule-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _RULE_CONTEXT_H</div><div class='del'>-#define _RULE_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter-part.h"</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-</div><div class='del'>-#define RULE_CONTEXT(obj)	GTK_CHECK_CAST (obj, rule_context_get_type (), RuleContext)</div><div class='del'>-#define RULE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, rule_context_get_type (), RuleContextClass)</div><div class='del'>-#define IS_RULE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, rule_context_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _RuleContext	RuleContext;</div><div class='del'>-typedef struct _RuleContextClass	RuleContextClass;</div><div class='del'>-</div><div class='del'>-struct _RuleContext {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-	struct _RuleContextPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *error;		/* string version of error */</div><div class='del'>-</div><div class='del'>-	xmlDocPtr system;	/* system rules source */</div><div class='del'>-	xmlDocPtr user;		/* user defined rules source */</div><div class='del'>-</div><div class='del'>-	GList *parts;</div><div class='del'>-	GList *rules;</div><div class='del'>-</div><div class='del'>-	GHashTable *part_set_map;/* map set types to part types */</div><div class='del'>-	GList *part_set_list;</div><div class='del'>-	GHashTable *rule_set_map;/* map set types to rule types */</div><div class='del'>-	GList *rule_set_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*RCRegisterFunc)(RuleContext *f, FilterRule *rule, gpointer data);</div><div class='del'>-</div><div class='del'>-struct _RuleContextClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	int (*load)(RuleContext *f, const char *system, const char *user);</div><div class='del'>-	int (*save)(RuleContext *f, const char *user);</div><div class='del'>-</div><div class='del'>-	GList *(*delete_uri)(RuleContext *f, const char *uri, GCompareFunc cmp);</div><div class='del'>-	GList *(*rename_uri)(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp);</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	void (*rule_added)(RuleContext *f, FilterRule *rule);</div><div class='del'>-	void (*rule_removed)(RuleContext *f, FilterRule *rule);</div><div class='del'>-	void (*changed)(RuleContext *f);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*RCPartFunc)(RuleContext *f, FilterPart *part);</div><div class='del'>-typedef void (*RCRuleFunc)(RuleContext *f, FilterRule *part);</div><div class='del'>-typedef FilterPart * (*RCNextPartFunc)(RuleContext *f, FilterPart *part);</div><div class='del'>-typedef FilterRule * (*RCNextRuleFunc)(RuleContext *f, FilterRule *rule, const char *source);</div><div class='del'>-</div><div class='del'>-struct _part_set_map {</div><div class='del'>-	char *name;</div><div class='del'>-	int type;</div><div class='del'>-	RCPartFunc append;</div><div class='del'>-	RCNextPartFunc next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _rule_set_map {</div><div class='del'>-	char *name;</div><div class='del'>-	int type;</div><div class='del'>-	RCRuleFunc append;</div><div class='del'>-	RCNextRuleFunc next;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		rule_context_get_type	(void);</div><div class='del'>-RuleContext	*rule_context_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-int		rule_context_load(RuleContext *f, const char *system, const char *user);</div><div class='del'>-int		rule_context_save(RuleContext *f, const char *user);</div><div class='del'>-</div><div class='del'>-void		rule_context_add_part(RuleContext *f, FilterPart *new);</div><div class='del'>-FilterPart 	*rule_context_find_part(RuleContext *f, const char *name);</div><div class='del'>-FilterPart 	*rule_context_create_part(RuleContext *f, const char *name);</div><div class='del'>-FilterPart 	*rule_context_next_part(RuleContext *f, FilterPart *last);</div><div class='del'>-</div><div class='del'>-FilterRule 	*rule_context_next_rule(RuleContext *f, FilterRule *last, const char *source);</div><div class='del'>-FilterRule 	*rule_context_find_rule(RuleContext *f, const char *name, const char *source);</div><div class='del'>-FilterRule 	*rule_context_find_rank_rule(RuleContext *f, int rank, const char *source);</div><div class='del'>-void		rule_context_add_rule(RuleContext *f, FilterRule *new);</div><div class='del'>-void		rule_context_add_rule_gui(RuleContext *f, FilterRule *rule, const char *title, const char *path);</div><div class='del'>-void		rule_context_remove_rule(RuleContext *f, FilterRule *rule);</div><div class='del'>-</div><div class='del'>-/* get/set the rank (position) of a rule */</div><div class='del'>-void		rule_context_rank_rule(RuleContext *f, FilterRule *rule, int rank);</div><div class='del'>-int		rule_context_get_rank_rule(RuleContext *f, FilterRule *rule, const char *source);</div><div class='del'>-</div><div class='del'>-/* setup type for set parts */</div><div class='del'>-void		rule_context_add_part_set(RuleContext *f, const char *setname, int part_type, RCPartFunc append, RCNextPartFunc next);</div><div class='del'>-void		rule_context_add_rule_set(RuleContext *f, const char *setname, int rule_type, RCRuleFunc append, RCNextRuleFunc next);</div><div class='del'>-</div><div class='del'>-/* uri's disappear/renamed externally */</div><div class='del'>-GList		*rule_context_delete_uri(RuleContext *f, const char *uri, GCompareFunc cmp);</div><div class='del'>-GList		*rule_context_rename_uri(RuleContext *f, const char *olduri, const char *newuri, GCompareFunc cmp);</div><div class='del'>-</div><div class='del'>-void		rule_context_free_uri_list(RuleContext *f, GList *uris);</div><div class='del'>-</div><div class='del'>-#endif /* ! _RULE_CONTEXT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/rule-editor.c b/filter/rule-editor.c<br/>deleted file mode 100644<br/>index f9350ea372..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/rule-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/rule-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,657 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-stock.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;gal/util/e-unicode-i18n.h&gt;</div><div class='del'>-#include "rule-editor.h"</div><div class='del'>-#include "rule-context.h"</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-</div><div class='del'>-/* for getenv only, remove when getenv need removed */</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-static int enable_undo;</div><div class='del'>-</div><div class='del'>-void rule_editor_add_undo(RuleEditor *re, int type, FilterRule *rule, int rank, int newrank);</div><div class='del'>-void rule_editor_play_undo(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-static void set_source(RuleEditor *re, const char *source);</div><div class='del'>-static void set_sensitive(RuleEditor *re);</div><div class='del'>-static FilterRule *create_rule(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-static void rule_editor_class_init(RuleEditorClass *class);</div><div class='del'>-static void rule_editor_init (RuleEditor *gspaper);</div><div class='del'>-static void rule_editor_finalise (GtkObject *obj);</div><div class='del'>-static void rule_editor_destroy (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x)(((RuleEditor *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	BUTTON_ADD,</div><div class='del'>-	BUTTON_EDIT,</div><div class='del'>-	BUTTON_DELETE,</div><div class='del'>-	BUTTON_UP,</div><div class='del'>-	BUTTON_DOWN,</div><div class='del'>-	BUTTON_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _RuleEditorPrivate {</div><div class='del'>-	GtkButton *buttons[BUTTON_LAST];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-rule_editor_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"RuleEditor",</div><div class='del'>-			sizeof (RuleEditor),</div><div class='del'>-			sizeof (RuleEditorClass),</div><div class='del'>-			(GtkClassInitFunc) rule_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) rule_editor_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		/* TODO: Remove when it works (or never will) */</div><div class='del'>-		enable_undo = getenv("EVOLUTION_RULE_UNDO") != NULL;</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gnome_dialog_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_editor_class_init (RuleEditorClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(gnome_dialog_get_type());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = rule_editor_finalise;</div><div class='del'>-	object_class-&gt;destroy = rule_editor_destroy;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	class-&gt;set_source = set_source;</div><div class='del'>-	class-&gt;set_sensitive = set_sensitive;</div><div class='del'>-	class-&gt;create_rule = create_rule;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_editor_init (RuleEditor *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_editor_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	RuleEditor *re = (RuleEditor *)obj;</div><div class='del'>-	RuleEditorUndo *undo, *next;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (re-&gt;context));</div><div class='del'>-	g_free (re-&gt;priv);</div><div class='del'>-</div><div class='del'>-	undo = re-&gt;undo_log;</div><div class='del'>-	while (undo) {</div><div class='del'>-		next = undo-&gt;next;</div><div class='del'>-		gtk_object_unref((GtkObject *)undo-&gt;rule);</div><div class='del'>-		g_free(undo);</div><div class='del'>-		undo = next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	((GtkObjectClass *)(parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_editor_destroy (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	RuleEditor *re = (RuleEditor *) obj;</div><div class='del'>-	</div><div class='del'>-	if (re-&gt;dialog)</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (re-&gt;dialog));</div><div class='del'>-	</div><div class='del'>-	((GtkObjectClass *)(parent_class))-&gt;destroy (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * rule_editor_new:</div><div class='del'>- *</div><div class='del'>- * Create a new RuleEditor object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #RuleEditor object.</div><div class='del'>- **/</div><div class='del'>-RuleEditor *</div><div class='del'>-rule_editor_new (RuleContext *f, const char *source)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	RuleEditor *o = (RuleEditor *)gtk_type_new (rule_editor_get_type ());</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	</div><div class='del'>-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor");</div><div class='del'>-	rule_editor_construct (o, f, gui, source);</div><div class='del'>-	</div><div class='del'>-        w = glade_xml_get_widget (gui, "rule_frame");</div><div class='del'>-	gtk_frame_set_label ((GtkFrame *)w, _("Rules"));</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gui));</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used internally by implementations if required */</div><div class='del'>-void</div><div class='del'>-rule_editor_set_sensitive (RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	return ((RuleEditorClass *)((GtkObject *)re)-&gt;klass)-&gt;set_sensitive(re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* used internally by implementations */</div><div class='del'>-void</div><div class='del'>-rule_editor_set_source (RuleEditor *re, const char *source)</div><div class='del'>-{</div><div class='del'>-	return ((RuleEditorClass *)((GtkObject *)re)-&gt;klass)-&gt;set_source(re, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* factory method for "add" button */</div><div class='del'>-FilterRule *</div><div class='del'>-rule_editor_create_rule (RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	return ((RuleEditorClass *)((GtkObject *)re)-&gt;klass)-&gt;create_rule(re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterRule *</div><div class='del'>-create_rule (RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = filter_rule_new ();</div><div class='del'>-	FilterPart *part;</div><div class='del'>-	</div><div class='del'>-	/* create a rule with 1 part in it */</div><div class='del'>-	part = rule_context_next_part (re-&gt;context, NULL);</div><div class='del'>-	filter_rule_add_part (rule, filter_part_clone (part));</div><div class='del'>-	</div><div class='del'>-	return rule;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	GList *l = NULL;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	switch (button) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!filter_rule_validate (re-&gt;edit)) {</div><div class='del'>-			/* no need to popup a dialog because the validate code does that. */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (re-&gt;edit));</div><div class='del'>-		string = e_utf8_to_gtk_string (GTK_WIDGET (re-&gt;list), re-&gt;edit-&gt;name);</div><div class='del'>-		item = gtk_list_item_new_with_label (string);</div><div class='del'>-		g_free (string);</div><div class='del'>-		</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "rule", re-&gt;edit);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-		</div><div class='del'>-		l = g_list_append (l, GTK_LIST_ITEM (item));</div><div class='del'>-		</div><div class='del'>-		gtk_list_append_items (re-&gt;list, l);</div><div class='del'>-		gtk_list_select_child (re-&gt;list, item);</div><div class='del'>-		</div><div class='del'>-		re-&gt;current = re-&gt;edit;</div><div class='del'>-		rule_context_add_rule (re-&gt;context, re-&gt;current);</div><div class='del'>-</div><div class='del'>-		gtk_object_ref((GtkObject *)re-&gt;current);</div><div class='del'>-		rule_editor_add_undo(re, RULE_EDITOR_LOG_ADD, re-&gt;current, rule_context_get_rank_rule (re-&gt;context, re-&gt;current, re-&gt;current-&gt;source), 0);</div><div class='del'>-	case 1:</div><div class='del'>-	default:</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-	case -1:</div><div class='del'>-                if (re-&gt;edit) {</div><div class='del'>-                        gtk_object_unref (GTK_OBJECT (re-&gt;edit));</div><div class='del'>-			re-&gt;edit = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		re-&gt;dialog = NULL;</div><div class='del'>-		</div><div class='del'>-		gtk_widget_set_sensitive (GTK_WIDGET (re), TRUE);</div><div class='del'>-		rule_editor_set_sensitive (re);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_editor_destroyed(GtkWidget *w, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	add_editor_clicked(w, -1, re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_add (GtkWidget *widget, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *rules;</div><div class='del'>-	</div><div class='del'>-	if (re-&gt;edit != NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	re-&gt;edit = rule_editor_create_rule (re);</div><div class='del'>-	filter_rule_set_source (re-&gt;edit, re-&gt;source);</div><div class='del'>-	rules = filter_rule_get_widget (re-&gt;edit, re-&gt;context);</div><div class='del'>-	</div><div class='del'>-	re-&gt;dialog = gnome_dialog_new (_("Add Rule"),</div><div class='del'>-				       GNOME_STOCK_BUTTON_OK,</div><div class='del'>-				       GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				       NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (re-&gt;dialog), 600, 400);</div><div class='del'>-	gtk_window_set_policy (GTK_WINDOW (re-&gt;dialog), FALSE, TRUE, FALSE);</div><div class='del'>-	gtk_widget_set_parent_window (GTK_WIDGET (re-&gt;dialog), GTK_WIDGET (re)-&gt;window);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re-&gt;dialog)-&gt;vbox), rules, TRUE, TRUE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (re-&gt;dialog), "clicked", add_editor_clicked, re);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (re-&gt;dialog), "destroy", add_editor_destroyed, re);</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re), FALSE);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (re-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *item;</div><div class='del'>-	char *string;</div><div class='del'>-	int pos;</div><div class='del'>-	</div><div class='del'>-	switch (button) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (!filter_rule_validate (re-&gt;edit)) {</div><div class='del'>-			/* no need to popup a dialog because the validate code does that. */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		pos = rule_context_get_rank_rule (re-&gt;context, re-&gt;current, re-&gt;source);</div><div class='del'>-		if (pos != -1) {</div><div class='del'>-			item = g_list_nth_data (GTK_LIST (re-&gt;list)-&gt;children, pos);</div><div class='del'>-			string = e_utf8_to_gtk_string (GTK_WIDGET (item), re-&gt;edit-&gt;name);</div><div class='del'>-			gtk_label_set_text (GTK_LABEL (GTK_BIN (item)-&gt;child), string);</div><div class='del'>-			g_free (string);</div><div class='del'>-</div><div class='del'>-			rule_editor_add_undo(re, RULE_EDITOR_LOG_EDIT, filter_rule_clone(re-&gt;current), pos, 0);</div><div class='del'>-</div><div class='del'>-			/* replace the old rule with the new rule */</div><div class='del'>-			filter_rule_copy (re-&gt;current, re-&gt;edit);</div><div class='del'>-		}</div><div class='del'>-	case 1:</div><div class='del'>-	default:</div><div class='del'>-		gnome_dialog_close (GNOME_DIALOG (dialog));</div><div class='del'>-	case -1:</div><div class='del'>-		if (re-&gt;edit) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (re-&gt;edit));</div><div class='del'>-			re-&gt;edit = NULL;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		re-&gt;dialog = NULL;</div><div class='del'>-		</div><div class='del'>-		gtk_widget_set_sensitive (GTK_WIDGET (re), TRUE);</div><div class='del'>-		rule_editor_set_sensitive (re);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_editor_destroyed(GtkWidget *w, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	edit_editor_clicked(w, -1, re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_edit (GtkWidget *widget, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *rules;</div><div class='del'>-	</div><div class='del'>-	if (re-&gt;current == NULL || re-&gt;edit != NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	re-&gt;edit = filter_rule_clone (re-&gt;current);</div><div class='del'>-	</div><div class='del'>-	rules = filter_rule_get_widget (re-&gt;edit, re-&gt;context);</div><div class='del'>-	re-&gt;dialog = gnome_dialog_new (_("Edit Rule"),</div><div class='del'>-				       GNOME_STOCK_BUTTON_OK,</div><div class='del'>-				       GNOME_STOCK_BUTTON_CANCEL,</div><div class='del'>-				       NULL);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (re-&gt;dialog), GTK_WINDOW (re));</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (re-&gt;dialog), 600, 400);</div><div class='del'>-	gtk_window_set_policy (GTK_WINDOW (re-&gt;dialog), FALSE, TRUE, FALSE);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re-&gt;dialog)-&gt;vbox), rules, TRUE, TRUE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (re-&gt;dialog), "clicked", edit_editor_clicked, re);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (re-&gt;dialog), "destroy", edit_editor_destroyed, re);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re), FALSE);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show (re-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_delete (GtkWidget *widget, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	int pos;</div><div class='del'>-	GList *l;</div><div class='del'>-	GtkListItem *item;</div><div class='del'>-	</div><div class='del'>-	d(printf ("delete rule\n"));</div><div class='del'>-	pos = rule_context_get_rank_rule (re-&gt;context, re-&gt;current, re-&gt;source);</div><div class='del'>-	if (pos != -1) {</div><div class='del'>-		int len;</div><div class='del'>-		</div><div class='del'>-		rule_context_remove_rule (re-&gt;context, re-&gt;current);</div><div class='del'>-		</div><div class='del'>-		item = g_list_nth_data (GTK_LIST (re-&gt;list)-&gt;children, pos);</div><div class='del'>-		l = g_list_append (NULL, item);</div><div class='del'>-		gtk_list_remove_items (re-&gt;list, l);</div><div class='del'>-		g_list_free (l);</div><div class='del'>-		</div><div class='del'>-		rule_editor_add_undo(re, RULE_EDITOR_LOG_REMOVE, re-&gt;current, rule_context_get_rank_rule(re-&gt;context, re-&gt;current, re-&gt;current-&gt;source), 0);</div><div class='del'>-#if 0		</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (re-&gt;current));</div><div class='del'>-#endif</div><div class='del'>-		re-&gt;current = NULL;</div><div class='del'>-		</div><div class='del'>-		/* now select the next rule */</div><div class='del'>-		len = g_list_length (GTK_LIST (re-&gt;list)-&gt;children);</div><div class='del'>-		pos = pos &gt;= len ? len - 1 : pos;</div><div class='del'>-		gtk_list_select_item (GTK_LIST (re-&gt;list), pos);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	rule_editor_set_sensitive (re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_move (RuleEditor *re, int from, int to)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	GtkListItem *item;</div><div class='del'>-</div><div class='del'>-	gtk_object_ref((GtkObject *)re-&gt;current);</div><div class='del'>-	rule_editor_add_undo(re, RULE_EDITOR_LOG_RANK, re-&gt;current, rule_context_get_rank_rule(re-&gt;context, re-&gt;current, re-&gt;current-&gt;source), to);</div><div class='del'>-	</div><div class='del'>-	d(printf ("moving %d to %d\n", from, to));</div><div class='del'>-	rule_context_rank_rule (re-&gt;context, re-&gt;current, to);</div><div class='del'>-	</div><div class='del'>-	item = g_list_nth_data (re-&gt;list-&gt;children, from);</div><div class='del'>-	l = g_list_append (NULL, item);</div><div class='del'>-	gtk_list_remove_items_no_unref (re-&gt;list, l);</div><div class='del'>-	gtk_list_insert_items (re-&gt;list, l, to);			      </div><div class='del'>-	gtk_list_select_child (re-&gt;list, GTK_WIDGET (item));</div><div class='del'>-	</div><div class='del'>-	rule_editor_set_sensitive (re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_up (GtkWidget *widget, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	int pos;</div><div class='del'>-	</div><div class='del'>-	d(printf ("up rule\n"));</div><div class='del'>-	pos = rule_context_get_rank_rule (re-&gt;context, re-&gt;current, re-&gt;source);</div><div class='del'>-	if (pos &gt; 0)</div><div class='del'>-		rule_move (re, pos, pos - 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_down (GtkWidget *widget, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	int pos;</div><div class='del'>-	</div><div class='del'>-	d(printf ("down rule\n"));</div><div class='del'>-	pos = rule_context_get_rank_rule (re-&gt;context, re-&gt;current, re-&gt;source);</div><div class='del'>-	if (pos &gt;= 0)</div><div class='del'>-		rule_move (re, pos, pos + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	GtkSignalFunc func;</div><div class='del'>-} edit_buttons[] = {</div><div class='del'>-	{ "rule_add", rule_add },</div><div class='del'>-	{ "rule_edit", rule_edit },</div><div class='del'>-	{ "rule_delete", rule_delete },</div><div class='del'>-	{ "rule_up", rule_up },</div><div class='del'>-	{ "rule_down", rule_down },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_sensitive (RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = NULL;</div><div class='del'>-	int index = -1, count = 0;</div><div class='del'>-	</div><div class='del'>-	while ((rule = rule_context_next_rule(re-&gt;context, rule, re-&gt;source))) {</div><div class='del'>-		if (rule == re-&gt;current)</div><div class='del'>-			index = count;</div><div class='del'>-		count++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(printf("index = %d count=%d\n", index, count));</div><div class='del'>-	</div><div class='del'>-	count--;</div><div class='del'>-	</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re-&gt;priv-&gt;buttons[BUTTON_EDIT]), index != -1);</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re-&gt;priv-&gt;buttons[BUTTON_DELETE]), index != -1);</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re-&gt;priv-&gt;buttons[BUTTON_UP]), index &gt; 0);</div><div class='del'>-	gtk_widget_set_sensitive (GTK_WIDGET (re-&gt;priv-&gt;buttons[BUTTON_DOWN]), index &gt;= 0 &amp;&amp; index &lt; count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_rule (GtkWidget *w, GtkWidget *child, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	re-&gt;current = gtk_object_get_data (GTK_OBJECT (child), "rule");</div><div class='del'>-	</div><div class='del'>-	g_assert (re-&gt;current);</div><div class='del'>-	</div><div class='del'>-	rule_editor_set_sensitive (re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-double_click (GtkWidget *widget, GdkEventButton *event, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	if (re-&gt;current &amp;&amp; event-&gt;type == GDK_2BUTTON_PRESS)</div><div class='del'>-		rule_edit (widget, re);</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_source (RuleEditor *re, const char *source)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = NULL;</div><div class='del'>-	GList *newitems = NULL;</div><div class='del'>-	</div><div class='del'>-	gtk_list_clear_items(GTK_LIST(re-&gt;list), 0, -1);</div><div class='del'>-	</div><div class='del'>-	d(printf("Checking for rules that are of type %s\n", source?source:"&lt;nil&gt;"));</div><div class='del'>-	while ((rule = rule_context_next_rule(re-&gt;context, rule, source)) != NULL) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-		char *s;</div><div class='del'>-		</div><div class='del'>-		d(printf("   hit %s(%s)\n", rule-&gt;name, source?source:"&lt;nil&gt;"));</div><div class='del'>-		s = e_utf8_to_gtk_string (GTK_WIDGET (re-&gt;list), rule-&gt;name);</div><div class='del'>-		item = gtk_list_item_new_with_label (s);</div><div class='del'>-		g_free (s);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (item));</div><div class='del'>-		newitems = g_list_append (newitems, item);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_list_append_items (re-&gt;list, newitems);</div><div class='del'>-	g_free (re-&gt;source);</div><div class='del'>-	re-&gt;source = g_strdup (source);</div><div class='del'>-	re-&gt;current = NULL;</div><div class='del'>-	rule_editor_set_sensitive (re);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_editor_add_undo(RuleEditor *re, int type, FilterRule *rule, int rank, int newrank)</div><div class='del'>-{</div><div class='del'>-	RuleEditorUndo *undo;</div><div class='del'>-</div><div class='del'>-	if (!re-&gt;undo_active &amp;&amp; enable_undo) {</div><div class='del'>-		undo = g_malloc0(sizeof(*undo));</div><div class='del'>-		undo-&gt;rule = rule;</div><div class='del'>-		undo-&gt;type = type;</div><div class='del'>-		undo-&gt;rank = rank;</div><div class='del'>-		undo-&gt;newrank = newrank;</div><div class='del'>-</div><div class='del'>-		undo-&gt;next = re-&gt;undo_log;</div><div class='del'>-		re-&gt;undo_log = undo;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_object_unref((GtkObject *)rule);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_editor_play_undo(RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	RuleEditorUndo *undo, *next;</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-</div><div class='del'>-	re-&gt;undo_active = TRUE;</div><div class='del'>-	undo = re-&gt;undo_log;</div><div class='del'>-	re-&gt;undo_log = NULL;</div><div class='del'>-	while (undo) {</div><div class='del'>-		next = undo-&gt;next;</div><div class='del'>-		switch (undo-&gt;type) {</div><div class='del'>-		case RULE_EDITOR_LOG_EDIT:</div><div class='del'>-			printf("Undoing edit on rule '%s'\n", undo-&gt;rule-&gt;name);</div><div class='del'>-			rule = rule_context_find_rank_rule(re-&gt;context, undo-&gt;rank, undo-&gt;rule-&gt;source);</div><div class='del'>-			if (rule) {</div><div class='del'>-				printf(" name was '%s'\n", rule-&gt;name);</div><div class='del'>-				filter_rule_copy(rule, undo-&gt;rule);</div><div class='del'>-				printf(" name is '%s'\n", rule-&gt;name);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning("Could not find the right rule to undo against?\n");</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case RULE_EDITOR_LOG_ADD:</div><div class='del'>-			printf("Undoing add on rule '%s'\n", undo-&gt;rule-&gt;name);</div><div class='del'>-			rule = rule_context_find_rank_rule(re-&gt;context, undo-&gt;rank, undo-&gt;rule-&gt;source);</div><div class='del'>-			if (rule)</div><div class='del'>-				rule_context_remove_rule(re-&gt;context, rule);</div><div class='del'>-			break;</div><div class='del'>-		case RULE_EDITOR_LOG_REMOVE:</div><div class='del'>-			printf("Undoing remove on rule '%s'\n", undo-&gt;rule-&gt;name);</div><div class='del'>-			gtk_object_ref((GtkObject *)undo-&gt;rule);</div><div class='del'>-			rule_context_add_rule(re-&gt;context, undo-&gt;rule);</div><div class='del'>-			rule_context_rank_rule(re-&gt;context, undo-&gt;rule, undo-&gt;rank);</div><div class='del'>-			break;</div><div class='del'>-		case RULE_EDITOR_LOG_RANK:</div><div class='del'>-			rule = rule_context_find_rank_rule(re-&gt;context, undo-&gt;newrank, undo-&gt;rule-&gt;source);</div><div class='del'>-			if (rule)</div><div class='del'>-				rule_context_rank_rule(re-&gt;context, rule, undo-&gt;rank);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref((GtkObject *)undo-&gt;rule);</div><div class='del'>-		g_free(undo);</div><div class='del'>-		undo = next;</div><div class='del'>-	}</div><div class='del'>-	re-&gt;undo_active = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_clicked (GtkWidget *dialog, int button, RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	if (button != 0) {</div><div class='del'>-		if (enable_undo)</div><div class='del'>-			rule_editor_play_undo(re);</div><div class='del'>-		else {</div><div class='del'>-			RuleEditorUndo *undo, *next;</div><div class='del'>-</div><div class='del'>-			undo = re-&gt;undo_log;</div><div class='del'>-			re-&gt;undo_log = 0;</div><div class='del'>-			while (undo) {</div><div class='del'>-				next = undo-&gt;next;</div><div class='del'>-				gtk_object_unref((GtkObject *)undo-&gt;rule);</div><div class='del'>-				g_free(undo);</div><div class='del'>-				undo = next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	re-&gt;context = context;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (context));</div><div class='del'>-	</div><div class='del'>-	gtk_window_set_policy (GTK_WINDOW (re), FALSE, TRUE, FALSE);</div><div class='del'>-	</div><div class='del'>-        w = glade_xml_get_widget (gui, "rule_editor");</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (re)-&gt;vbox), w, TRUE, TRUE, 0);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; BUTTON_LAST; i++) {</div><div class='del'>-		re-&gt;priv-&gt;buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, re);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        re-&gt;list = (GtkList *) w = glade_xml_get_widget(gui, "rule_list");</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, re);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (double_click), re);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (re), "clicked", editor_clicked, re);</div><div class='del'>-	rule_editor_set_source (re, source);</div><div class='del'>-</div><div class='del'>-	if (enable_undo) {</div><div class='del'>-		gnome_dialog_append_buttons (GNOME_DIALOG (re), GNOME_STOCK_BUTTON_OK,</div><div class='del'>-					     GNOME_STOCK_BUTTON_CANCEL, NULL);</div><div class='del'>-	} else</div><div class='del'>-		gnome_dialog_append_buttons (GNOME_DIALOG (re), GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-}</div><div class='head'>diff --git a/filter/rule-editor.h b/filter/rule-editor.h<br/>deleted file mode 100644<br/>index f054023c87..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/rule-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/rule-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _RULE_EDITOR_H</div><div class='del'>-#define _RULE_EDITOR_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtklist.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-</div><div class='del'>-#define RULE_EDITOR(obj)	GTK_CHECK_CAST (obj, rule_editor_get_type (), RuleEditor)</div><div class='del'>-#define RULE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, rule_editor_get_type (), RuleEditorClass)</div><div class='del'>-#define IS_RULE_EDITOR(obj)      GTK_CHECK_TYPE (obj, rule_editor_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _RuleEditor	RuleEditor;</div><div class='del'>-typedef struct _RuleEditorClass	RuleEditorClass;</div><div class='del'>-typedef struct _RuleEditorUndo	RuleEditorUndo;</div><div class='del'>-</div><div class='del'>-struct _RuleEditor {</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-</div><div class='del'>-	GtkList *list;</div><div class='del'>-	struct _RuleContext *context;</div><div class='del'>-	struct _FilterRule *current;</div><div class='del'>-	struct _FilterRule *edit;	/* for editing/adding rules, so we only do 1 at a time */</div><div class='del'>-	</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	char *source;</div><div class='del'>-</div><div class='del'>-	struct _RuleEditorUndo *undo_log;	/* cancel/undo log */</div><div class='del'>-	unsigned int undo_active:1; /* we're performing undo */</div><div class='del'>-</div><div class='del'>-	struct _RuleEditorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _RuleEditorClass {</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-	void (*set_sensitive)(RuleEditor *);</div><div class='del'>-	void (*set_source)(RuleEditor *, const char *source);</div><div class='del'>-</div><div class='del'>-	struct _FilterRule *(*create_rule)(RuleEditor *);</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	RULE_EDITOR_LOG_EDIT,</div><div class='del'>-	RULE_EDITOR_LOG_ADD,</div><div class='del'>-	RULE_EDITOR_LOG_REMOVE,</div><div class='del'>-	RULE_EDITOR_LOG_RANK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _RuleEditorUndo {</div><div class='del'>-	struct _RuleEditorUndo *next;</div><div class='del'>-</div><div class='del'>-	unsigned int type;</div><div class='del'>-	struct _FilterRule *rule;</div><div class='del'>-	int rank;</div><div class='del'>-	int newrank;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _GladeXML;</div><div class='del'>-struct _RuleContext;</div><div class='del'>-</div><div class='del'>-guint		rule_editor_get_type	(void);</div><div class='del'>-RuleEditor	*rule_editor_new	(struct _RuleContext *, const char *source);</div><div class='del'>-void		rule_editor_construct   (RuleEditor *re, struct _RuleContext *context, struct _GladeXML *gui, const char *source);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void rule_editor_set_source(RuleEditor *re, const char *source);</div><div class='del'>-/* calculates the sensitivity of the editor */</div><div class='del'>-void rule_editor_set_sensitive(RuleEditor *re);</div><div class='del'>-/* used internally to create a new rule appropriate for the editor */</div><div class='del'>-struct _FilterRule *rule_editor_create_rule(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-#endif /* ! _RULE_EDITOR_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/score-context.c b/filter/score-context.c<br/>deleted file mode 100644<br/>index 4c892bc8d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include "score-context.h"</div><div class='del'>-#include "score-rule.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void score_context_class_init	(ScoreContextClass *class);</div><div class='del'>-static void score_context_init	(ScoreContext *gspaper);</div><div class='del'>-static void score_context_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-static RuleContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-score_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"ScoreContext",</div><div class='del'>-			sizeof(ScoreContext),</div><div class='del'>-			sizeof(ScoreContextClass),</div><div class='del'>-			(GtkClassInitFunc)score_context_class_init,</div><div class='del'>-			(GtkObjectInitFunc)score_context_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(rule_context_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_context_class_init (ScoreContextClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(rule_context_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = score_context_finalise;</div><div class='del'>-	/* override methods */</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_context_init (ScoreContext *o)</div><div class='del'>-{</div><div class='del'>-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),</div><div class='del'>-				  rule_context_add_part, rule_context_next_part);</div><div class='del'>-	</div><div class='del'>-	rule_context_add_rule_set((RuleContext *)o, "ruleset", score_rule_get_type(),</div><div class='del'>-				  rule_context_add_rule, rule_context_next_rule);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_context_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	ScoreContext *o = (ScoreContext *)obj;</div><div class='del'>-</div><div class='del'>-	o = o;</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * score_context_new:</div><div class='del'>- *</div><div class='del'>- * Create a new ScoreContext object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #ScoreContext object.</div><div class='del'>- **/</div><div class='del'>-ScoreContext *</div><div class='del'>-score_context_new(void)</div><div class='del'>-{</div><div class='del'>-	ScoreContext *o = (ScoreContext *)gtk_type_new(score_context_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/score-context.h b/filter/score-context.h<br/>deleted file mode 100644<br/>index 3d636797f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SCORE_CONTEXT_H</div><div class='del'>-#define _SCORE_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include "rule-context.h"</div><div class='del'>-</div><div class='del'>-#define SCORE_CONTEXT(obj)	GTK_CHECK_CAST (obj, score_context_get_type (), ScoreContext)</div><div class='del'>-#define SCORE_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_context_get_type (), ScoreContextClass)</div><div class='del'>-#define IS_SCORE_CONTEXT(obj)      GTK_CHECK_TYPE (obj, score_context_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _ScoreContext	ScoreContext;</div><div class='del'>-typedef struct _ScoreContextClass	ScoreContextClass;</div><div class='del'>-</div><div class='del'>-struct _ScoreContext {</div><div class='del'>-	RuleContext parent;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ScoreContextClass {</div><div class='del'>-	RuleContextClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		score_context_get_type	(void);</div><div class='del'>-ScoreContext	*score_context_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _SCORE_CONTEXT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/score-editor.c b/filter/score-editor.c<br/>deleted file mode 100644<br/>index ab24afd499..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "score-editor.h"</div><div class='del'>-#include "score-context.h"</div><div class='del'>-#include "score-rule.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static FilterRule * create_rule(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-static void score_editor_class_init (ScoreEditorClass *class);</div><div class='del'>-static void score_editor_init	(ScoreEditor *gspaper);</div><div class='del'>-static void score_editor_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((ScoreEditor *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _ScoreEditorPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static RuleEditorClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-score_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"ScoreEditor",</div><div class='del'>-			sizeof(ScoreEditor),</div><div class='del'>-			sizeof(ScoreEditorClass),</div><div class='del'>-			(GtkClassInitFunc)score_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc)score_editor_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (rule_editor_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_editor_class_init (ScoreEditorClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *)class;</div><div class='del'>-	RuleEditorClass *re_class = (RuleEditorClass *)class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (rule_editor_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = score_editor_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	re_class-&gt;create_rule = create_rule;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_editor_init (ScoreEditor *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_editor_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	ScoreEditor *o = (ScoreEditor *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * score_editor_new:</div><div class='del'>- *</div><div class='del'>- * Create a new ScoreEditor object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #ScoreEditor object.</div><div class='del'>- **/</div><div class='del'>-ScoreEditor *</div><div class='del'>-score_editor_new(ScoreContext *f)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	ScoreEditor *o = (ScoreEditor *)gtk_type_new (score_editor_get_type ());</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "rule_editor");</div><div class='del'>-	rule_editor_construct((RuleEditor *)o, (RuleContext *)f, gui, NULL);</div><div class='del'>-</div><div class='del'>-        w = glade_xml_get_widget(gui, "rule_frame");</div><div class='del'>-	gtk_frame_set_label((GtkFrame *)w, _("Score Rules"));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)gui);</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterRule *</div><div class='del'>-create_rule(RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = filter_rule_new();</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	/* create a rule with 1 part in it */</div><div class='del'>-	rule = (FilterRule *)score_rule_new ();</div><div class='del'>-	part = rule_context_next_part(re-&gt;context, NULL);</div><div class='del'>-	filter_rule_add_part(rule, filter_part_clone(part));</div><div class='del'>-</div><div class='del'>-	return rule;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/score-editor.h b/filter/score-editor.h<br/>deleted file mode 100644<br/>index 5c25dd9ecc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SCORE_EDITOR_H</div><div class='del'>-#define _SCORE_EDITOR_H</div><div class='del'>-</div><div class='del'>-#include "rule-editor.h"</div><div class='del'>-</div><div class='del'>-#define SCORE_EDITOR(obj)	GTK_CHECK_CAST (obj, score_editor_get_type (), ScoreEditor)</div><div class='del'>-#define SCORE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_editor_get_type (), ScoreEditorClass)</div><div class='del'>-#define IS_SCORE_EDITOR(obj)      GTK_CHECK_TYPE (obj, score_editor_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _ScoreEditor	ScoreEditor;</div><div class='del'>-typedef struct _ScoreEditorClass	ScoreEditorClass;</div><div class='del'>-</div><div class='del'>-struct _ScoreEditor {</div><div class='del'>-	RuleEditor parent;</div><div class='del'>-</div><div class='del'>-	struct _ScoreEditorPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ScoreEditorClass {</div><div class='del'>-	RuleEditorClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ScoreContext;</div><div class='del'>-</div><div class='del'>-guint		score_editor_get_type	(void);</div><div class='del'>-ScoreEditor	*score_editor_new	(struct _ScoreContext *f);</div><div class='del'>-</div><div class='del'>-#endif /* ! _SCORE_EDITOR_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/score-rule.c b/filter/score-rule.c<br/>deleted file mode 100644<br/>index 2975a3854d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-rule.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-rule.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,221 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;gtk/gtkhbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtklabel.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#include "score-rule.h"</div><div class='del'>-</div><div class='del'>-static xmlNodePtr xml_encode(FilterRule *);</div><div class='del'>-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);</div><div class='del'>-/*static void build_code(FilterRule *, GString *out);*/</div><div class='del'>-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-static void score_rule_class_init	(ScoreRuleClass *class);</div><div class='del'>-static void score_rule_init	(ScoreRule *gspaper);</div><div class='del'>-static void score_rule_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((ScoreRule *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _ScoreRulePrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterRuleClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-score_rule_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"ScoreRule",</div><div class='del'>-			sizeof(ScoreRule),</div><div class='del'>-			sizeof(ScoreRuleClass),</div><div class='del'>-			(GtkClassInitFunc)score_rule_class_init,</div><div class='del'>-			(GtkObjectInitFunc)score_rule_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (filter_rule_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_rule_class_init (ScoreRuleClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterRuleClass *rule_class = (FilterRuleClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class (filter_rule_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = score_rule_finalise;</div><div class='del'>-	</div><div class='del'>-	/* override methods */</div><div class='del'>-	rule_class-&gt;xml_encode = xml_encode;</div><div class='del'>-	rule_class-&gt;xml_decode = xml_decode;</div><div class='del'>-/*	rule_class-&gt;build_code = build_code;*/</div><div class='del'>-	rule_class-&gt;get_widget = get_widget;</div><div class='del'>-	</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_rule_init (ScoreRule *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-score_rule_finalise (GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	ScoreRule *o = (ScoreRule *)obj;</div><div class='del'>-	</div><div class='del'>-	o = o;</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * score_rule_new:</div><div class='del'>- *</div><div class='del'>- * Create a new ScoreRule object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #ScoreRule object.</div><div class='del'>- **/</div><div class='del'>-ScoreRule *</div><div class='del'>-score_rule_new (void)</div><div class='del'>-{</div><div class='del'>-	ScoreRule *o = (ScoreRule *)gtk_type_new (score_rule_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	ScoreRule *sr = (ScoreRule *)fr;</div><div class='del'>-	xmlNodePtr node, value;</div><div class='del'>-	char number[16];</div><div class='del'>-	</div><div class='del'>-	node = ((FilterRuleClass *)(parent_class))-&gt;xml_encode (fr);</div><div class='del'>-	sprintf (number, "%d", sr-&gt;score);</div><div class='del'>-	value = xmlNewNode (NULL, "score");</div><div class='del'>-	xmlSetProp (value, "value", number);</div><div class='del'>-	xmlAddChild (node, value);</div><div class='del'>-	</div><div class='del'>-	return node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	ScoreRule *sr = (ScoreRule *)fr;</div><div class='del'>-	xmlNodePtr value;</div><div class='del'>-	int result;</div><div class='del'>-	char *str;</div><div class='del'>-	</div><div class='del'>-	result = ((FilterRuleClass *)(parent_class))-&gt;xml_decode (fr, node, f);</div><div class='del'>-	if (result != 0)</div><div class='del'>-		return result;</div><div class='del'>-	</div><div class='del'>-	value = node-&gt;childs;</div><div class='del'>-	while (value) {</div><div class='del'>-		if (!strcmp (value-&gt;name, "score")) {</div><div class='del'>-			str = xmlGetProp (value, "value");</div><div class='del'>-			sscanf (str, "%d", &amp;sr-&gt;score);</div><div class='del'>-			xmlFree (str);</div><div class='del'>-			</div><div class='del'>-			/* score range is -3 to +3 */</div><div class='del'>-			if (sr-&gt;score &gt; 3)</div><div class='del'>-				sr-&gt;score = 3;</div><div class='del'>-			else if (sr-&gt;score &lt; -3)</div><div class='del'>-				sr-&gt;score = -3;</div><div class='del'>-		}</div><div class='del'>-		value = value-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*static void build_code(FilterRule *fr, GString *out)</div><div class='del'>-{</div><div class='del'>-}*/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-spin_changed (GtkAdjustment *adj, ScoreRule *sr)</div><div class='del'>-{</div><div class='del'>-	sr-&gt;score = adj-&gt;value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (FilterRule *fr, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *frame;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	ScoreRule *sr = (ScoreRule *)fr;</div><div class='del'>-	GtkWidget *spin;</div><div class='del'>-	</div><div class='del'>-        widget = ((FilterRuleClass *)(parent_class))-&gt;get_widget (fr, f);</div><div class='del'>-	</div><div class='del'>-	frame = gtk_frame_new (_("Score"));</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 3);</div><div class='del'>-	label = gtk_label_new (_("Score"));</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);</div><div class='del'>-	adj = (GtkAdjustment *)gtk_adjustment_new ((float) sr-&gt;score, -3.0, 3.0, 1.0, 1.0, 1.0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed", spin_changed, sr);</div><div class='del'>-	</div><div class='del'>-	spin = gtk_spin_button_new (adj, 1.0, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 3);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (frame), hbox);</div><div class='del'>-	</div><div class='del'>-	gtk_widget_show_all (frame);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (widget), frame, FALSE, FALSE, 3);</div><div class='del'>-	</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/score-rule.h b/filter/score-rule.h<br/>deleted file mode 100644<br/>index bc7be4d043..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/score-rule.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/score-rule.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _SCORE_RULE_H</div><div class='del'>-#define _SCORE_RULE_H</div><div class='del'>-</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-</div><div class='del'>-#define SCORE_RULE(obj)	GTK_CHECK_CAST (obj, score_rule_get_type (), ScoreRule)</div><div class='del'>-#define SCORE_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_rule_get_type (), ScoreRuleClass)</div><div class='del'>-#define IS_SCORE_RULE(obj)      GTK_CHECK_TYPE (obj, score_rule_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _ScoreRule	ScoreRule;</div><div class='del'>-typedef struct _ScoreRuleClass	ScoreRuleClass;</div><div class='del'>-</div><div class='del'>-struct _ScoreRule {</div><div class='del'>-	FilterRule parent;</div><div class='del'>-	struct _ScoreRulePrivate *priv;</div><div class='del'>-</div><div class='del'>-	int score;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ScoreRuleClass {</div><div class='del'>-	FilterRuleClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		score_rule_get_type	(void);</div><div class='del'>-ScoreRule	*score_rule_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _SCORE_RULE_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/vfolder-context.c b/filter/vfolder-context.c<br/>deleted file mode 100644<br/>index 2cb7c6fcae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-context.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-context.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-</div><div class='del'>-#include "vfolder-context.h"</div><div class='del'>-#include "vfolder-rule.h"</div><div class='del'>-</div><div class='del'>-static void vfolder_context_class_init	(VfolderContextClass *class);</div><div class='del'>-static void vfolder_context_init	(VfolderContext *gspaper);</div><div class='del'>-static void vfolder_context_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((VfolderContext *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _VfolderContextPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static RuleContextClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-vfolder_context_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"VfolderContext",</div><div class='del'>-			sizeof(VfolderContext),</div><div class='del'>-			sizeof(VfolderContextClass),</div><div class='del'>-			(GtkClassInitFunc)vfolder_context_class_init,</div><div class='del'>-			(GtkObjectInitFunc)vfolder_context_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(rule_context_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_context_class_init (VfolderContextClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(rule_context_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = vfolder_context_finalise;</div><div class='del'>-	/* override methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals(object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_context_init (VfolderContext *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-</div><div class='del'>-	rule_context_add_part_set((RuleContext *)o, "partset", filter_part_get_type(),</div><div class='del'>-				  rule_context_add_part, rule_context_next_part);</div><div class='del'>-</div><div class='del'>-	rule_context_add_rule_set((RuleContext *)o, "ruleset", vfolder_rule_get_type(),</div><div class='del'>-				  rule_context_add_rule, rule_context_next_rule);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_context_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	VfolderContext *o = (VfolderContext *)obj;</div><div class='del'>-</div><div class='del'>-	o = o;</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vfolder_context_new:</div><div class='del'>- *</div><div class='del'>- * Create a new VfolderContext object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #VfolderContext object.</div><div class='del'>- **/</div><div class='del'>-VfolderContext *</div><div class='del'>-vfolder_context_new(void)</div><div class='del'>-{</div><div class='del'>-	VfolderContext *o = (VfolderContext *)gtk_type_new(vfolder_context_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/vfolder-context.h b/filter/vfolder-context.h<br/>deleted file mode 100644<br/>index bf28ac88f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-context.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-context.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _VFOLDER_CONTEXT_H</div><div class='del'>-#define _VFOLDER_CONTEXT_H</div><div class='del'>-</div><div class='del'>-#include "rule-context.h"</div><div class='del'>-</div><div class='del'>-#define VFOLDER_CONTEXT(obj)	GTK_CHECK_CAST (obj, vfolder_context_get_type (), VfolderContext)</div><div class='del'>-#define VFOLDER_CONTEXT_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_context_get_type (), VfolderContextClass)</div><div class='del'>-#define IS_VFOLDER_CONTEXT(obj)      GTK_CHECK_TYPE (obj, vfolder_context_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _VfolderContext	VfolderContext;</div><div class='del'>-typedef struct _VfolderContextClass	VfolderContextClass;</div><div class='del'>-</div><div class='del'>-struct _VfolderContext {</div><div class='del'>-	RuleContext parent;</div><div class='del'>-	struct _VfolderContextPrivate *priv;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _VfolderContextClass {</div><div class='del'>-	RuleContextClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		vfolder_context_get_type	(void);</div><div class='del'>-VfolderContext	*vfolder_context_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-</div><div class='del'>-#endif /* ! _VFOLDER_CONTEXT_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c<br/>deleted file mode 100644<br/>index b331c7ac14..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-editor.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,149 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *           Jeffrey Stedfast &lt;fejj@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkframe.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "vfolder-editor.h"</div><div class='del'>-#include "vfolder-context.h"</div><div class='del'>-#include "vfolder-rule.h"</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-static FilterRule * create_rule(RuleEditor *re);</div><div class='del'>-</div><div class='del'>-static void vfolder_editor_class_init (VfolderEditorClass *class);</div><div class='del'>-static void vfolder_editor_init	(VfolderEditor *gspaper);</div><div class='del'>-static void vfolder_editor_finalise (GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((VfolderEditor *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _VfolderEditorPrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static RuleEditorClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-vfolder_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"VfolderEditor",</div><div class='del'>-			sizeof(VfolderEditor),</div><div class='del'>-			sizeof(VfolderEditorClass),</div><div class='del'>-			(GtkClassInitFunc)vfolder_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc)vfolder_editor_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (rule_editor_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_editor_class_init (VfolderEditorClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class = (GtkObjectClass *)class;</div><div class='del'>-	RuleEditorClass *re_class = (RuleEditorClass *)class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (rule_editor_get_type ());</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;finalize = vfolder_editor_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	re_class-&gt;create_rule = create_rule;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_editor_init (VfolderEditor *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0 (sizeof (*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_editor_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	VfolderEditor *o = (VfolderEditor *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vfolder_editor_new:</div><div class='del'>- *</div><div class='del'>- * Create a new VfolderEditor object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #VfolderEditor object.</div><div class='del'>- **/</div><div class='del'>-VfolderEditor *</div><div class='del'>-vfolder_editor_new(VfolderContext *f)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	VfolderEditor *o = (VfolderEditor *)gtk_type_new (vfolder_editor_get_type ());</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "rule_editor");</div><div class='del'>-	rule_editor_construct((RuleEditor *)o, (RuleContext *)f, gui, NULL);</div><div class='del'>-</div><div class='del'>-        w = glade_xml_get_widget(gui, "rule_frame");</div><div class='del'>-	gtk_frame_set_label((GtkFrame *)w, _("Virtual Folders"));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)gui);</div><div class='del'>-	</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static FilterRule *</div><div class='del'>-create_rule(RuleEditor *re)</div><div class='del'>-{</div><div class='del'>-	FilterRule *rule = filter_rule_new();</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	/* create a rule with 1 part in it */</div><div class='del'>-	rule = (FilterRule *)vfolder_rule_new ();</div><div class='del'>-	part = rule_context_next_part(re-&gt;context, NULL);</div><div class='del'>-	filter_rule_add_part(rule, filter_part_clone(part));</div><div class='del'>-</div><div class='del'>-	return rule;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/vfolder-editor.h b/filter/vfolder-editor.h<br/>deleted file mode 100644<br/>index d749a3589d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-editor.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000, 2001 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _VFOLDER_EDITOR_H</div><div class='del'>-#define _VFOLDER_EDITOR_H</div><div class='del'>-</div><div class='del'>-#include "rule-editor.h"</div><div class='del'>-</div><div class='del'>-#define VFOLDER_EDITOR(obj)	GTK_CHECK_CAST (obj, vfolder_editor_get_type (), VfolderEditor)</div><div class='del'>-#define VFOLDER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_editor_get_type (), VfolderEditorClass)</div><div class='del'>-#define IS_VFOLDER_EDITOR(obj)      GTK_CHECK_TYPE (obj, vfolder_editor_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _VfolderEditor	VfolderEditor;</div><div class='del'>-typedef struct _VfolderEditorClass	VfolderEditorClass;</div><div class='del'>-</div><div class='del'>-struct _VfolderEditor {</div><div class='del'>-	RuleEditor parent;</div><div class='del'>-</div><div class='del'>-	struct _VfolderEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _VfolderEditorClass {</div><div class='del'>-	RuleEditorClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _VfolderContext;</div><div class='del'>-</div><div class='del'>-guint		vfolder_editor_get_type	(void);</div><div class='del'>-VfolderEditor	*vfolder_editor_new	(struct _VfolderContext *);</div><div class='del'>-</div><div class='del'>-#endif /* ! _VFOLDER_EDITOR_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c<br/>deleted file mode 100644<br/>index 36b381eb06..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-rule.c?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-rule.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,505 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Author: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkbox.h&gt;</div><div class='del'>-#include &lt;gtk/gtklist.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dialog-util.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "vfolder-context.h"</div><div class='del'>-#include "vfolder-rule.h"</div><div class='del'>-#include "shell/evolution-shell-client.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-static gint validate(FilterRule *);</div><div class='del'>-static xmlNodePtr xml_encode(FilterRule *);</div><div class='del'>-static int xml_decode(FilterRule *, xmlNodePtr, struct _RuleContext *f);</div><div class='del'>-static void rule_copy (FilterRule *dest, FilterRule *src);</div><div class='del'>-/*static void build_code(FilterRule *, GString *out);*/</div><div class='del'>-static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f);</div><div class='del'>-</div><div class='del'>-extern EvolutionShellClient *global_shell_client;</div><div class='del'>-</div><div class='del'>-static void vfolder_rule_class_init	(VfolderRuleClass *class);</div><div class='del'>-static void vfolder_rule_init	(VfolderRule *gspaper);</div><div class='del'>-static void vfolder_rule_finalise	(GtkObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((VfolderRule *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _VfolderRulePrivate {</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static FilterRuleClass *parent_class;</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-vfolder_rule_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"VfolderRule",</div><div class='del'>-			sizeof(VfolderRule),</div><div class='del'>-			sizeof(VfolderRuleClass),</div><div class='del'>-			(GtkClassInitFunc)vfolder_rule_class_init,</div><div class='del'>-			(GtkObjectInitFunc)vfolder_rule_init,</div><div class='del'>-			(GtkArgSetFunc)NULL,</div><div class='del'>-			(GtkArgGetFunc)NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique(filter_rule_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_rule_class_init (VfolderRuleClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	FilterRuleClass *filter_rule = (FilterRuleClass *)class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *)class;</div><div class='del'>-	parent_class = gtk_type_class(filter_rule_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = vfolder_rule_finalise;</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	filter_rule-&gt;validate   = validate;</div><div class='del'>-	filter_rule-&gt;xml_encode = xml_encode;</div><div class='del'>-	filter_rule-&gt;xml_decode = xml_decode;</div><div class='del'>-	filter_rule-&gt;copy = rule_copy;</div><div class='del'>-	/*filter_rule-&gt;build_code = build_code;*/</div><div class='del'>-	filter_rule-&gt;get_widget = get_widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_rule_init (VfolderRule *o)</div><div class='del'>-{</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vfolder_rule_finalise(GtkObject *obj)</div><div class='del'>-{</div><div class='del'>-	VfolderRule *o = (VfolderRule *)obj;</div><div class='del'>-	</div><div class='del'>-	g_list_foreach (o-&gt;sources, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free (o-&gt;sources);</div><div class='del'>-	</div><div class='del'>-        ((GtkObjectClass *)(parent_class))-&gt;finalize(obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * vfolder_rule_new:</div><div class='del'>- *</div><div class='del'>- * Create a new VfolderRule object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #VfolderRule object.</div><div class='del'>- **/</div><div class='del'>-VfolderRule *</div><div class='del'>-vfolder_rule_new (void)</div><div class='del'>-{</div><div class='del'>-	VfolderRule *o = (VfolderRule *)gtk_type_new(vfolder_rule_get_type ());</div><div class='del'>-	return o;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-vfolder_rule_add_source (VfolderRule *vr, const char *uri)</div><div class='del'>-{</div><div class='del'>-	g_assert(IS_VFOLDER_RULE(vr));</div><div class='del'>-</div><div class='del'>-	vr-&gt;sources = g_list_append(vr-&gt;sources, g_strdup(uri));</div><div class='del'>-</div><div class='del'>-	filter_rule_emit_changed((FilterRule *)vr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-vfolder_rule_find_source (VfolderRule *vr, const char *uri)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_assert(IS_VFOLDER_RULE(vr));</div><div class='del'>-</div><div class='del'>-	/* only does a simple string or address comparison, should</div><div class='del'>-	   probably do a decoded url comparison */</div><div class='del'>-	l = vr-&gt;sources;</div><div class='del'>-	while (l) {</div><div class='del'>-		if (l-&gt;data == uri || !strcmp(l-&gt;data, uri))</div><div class='del'>-			return l-&gt;data;</div><div class='del'>-		l = g_list_next(l);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-vfolder_rule_remove_source (VfolderRule *vr, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *found;</div><div class='del'>-</div><div class='del'>-	g_assert(IS_VFOLDER_RULE(vr));</div><div class='del'>-</div><div class='del'>-	found = (char *)vfolder_rule_find_source(vr, uri);</div><div class='del'>-	if (found) {</div><div class='del'>-		vr-&gt;sources = g_list_remove(vr-&gt;sources, found);</div><div class='del'>-		g_free(found);</div><div class='del'>-		filter_rule_emit_changed((FilterRule *)vr);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-vfolder_rule_next_source (VfolderRule *vr, const char *last)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	if (last == NULL) {</div><div class='del'>-		node = vr-&gt;sources;</div><div class='del'>-	} else {</div><div class='del'>-		node = g_list_find(vr-&gt;sources, (char *)last);</div><div class='del'>-		if (node == NULL)</div><div class='del'>-			node = vr-&gt;sources;</div><div class='del'>-		else</div><div class='del'>-			node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-	if (node)</div><div class='del'>-		return (const char *)node-&gt;data;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-validate (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (fr != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	if (!fr-&gt;name || !*fr-&gt;name) {</div><div class='del'>-		dialog = gnome_ok_dialog (_("You must name this vfolder."));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* We have to have at least one source set in the "specific" case.</div><div class='del'>-	   Do not translate this string! */</div><div class='del'>-	if (fr-&gt;source &amp;&amp; !strcmp (fr-&gt;source, "specific") &amp;&amp; VFOLDER_RULE (fr)-&gt;sources == NULL) {</div><div class='del'>-		dialog = gnome_ok_dialog (_("You need to to specify at least one folder as a source."));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-		</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (FILTER_RULE_CLASS (parent_class)-&gt;validate)</div><div class='del'>-		return FILTER_RULE_CLASS (parent_class)-&gt;validate (fr);</div><div class='del'>-	</div><div class='del'>-	return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static xmlNodePtr</div><div class='del'>-xml_encode (FilterRule *fr)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr node, set, work;</div><div class='del'>-	GList *l;</div><div class='del'>-	VfolderRule *vr = (VfolderRule *)fr;</div><div class='del'>-</div><div class='del'>-        node = ((FilterRuleClass *)(parent_class))-&gt;xml_encode(fr);</div><div class='del'>-	g_assert(node != NULL);</div><div class='del'>-	set = xmlNewNode(NULL, "sources");</div><div class='del'>-	xmlAddChild(node, set);</div><div class='del'>-	l = vr-&gt;sources;</div><div class='del'>-	while (l) {</div><div class='del'>-		work = xmlNewNode(NULL, "folder");</div><div class='del'>-		xmlSetProp(work, "uri", l-&gt;data);</div><div class='del'>-		xmlAddChild(set, work);</div><div class='del'>-		l = g_list_next(l);</div><div class='del'>-	}</div><div class='del'>-	return node;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-xml_decode (FilterRule *fr, xmlNodePtr node, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr set, work;</div><div class='del'>-	int result;</div><div class='del'>-	VfolderRule *vr = (VfolderRule *)fr;</div><div class='del'>-	char *uri;</div><div class='del'>-	</div><div class='del'>-        result = ((FilterRuleClass *)(parent_class))-&gt;xml_decode(fr, node, f);</div><div class='del'>-	if (result != 0)</div><div class='del'>-		return result;</div><div class='del'>-</div><div class='del'>-	set = node-&gt;childs;</div><div class='del'>-	while (set) {</div><div class='del'>-		if (!strcmp(set-&gt;name, "sources")) {</div><div class='del'>-			work = set-&gt;childs;</div><div class='del'>-			while (work) {</div><div class='del'>-				if (!strcmp(work-&gt;name, "folder")) {</div><div class='del'>-					uri = xmlGetProp(work, "uri");</div><div class='del'>-					if (uri) {</div><div class='del'>-						vr-&gt;sources = g_list_append(vr-&gt;sources, g_strdup(uri));</div><div class='del'>-						xmlFree(uri);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				work = work-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		set = set-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rule_copy (FilterRule *dest, FilterRule *src)</div><div class='del'>-{</div><div class='del'>-	VfolderRule *vdest, *vsrc;</div><div class='del'>-	GList *node;</div><div class='del'>-	</div><div class='del'>-	vdest = (VfolderRule *) dest;</div><div class='del'>-	vsrc = (VfolderRule *) src;</div><div class='del'>-	</div><div class='del'>-	if (vdest-&gt;sources) {</div><div class='del'>-		g_list_foreach (vdest-&gt;sources, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free (vdest-&gt;sources);</div><div class='del'>-		vdest-&gt;sources = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	node = vsrc-&gt;sources;</div><div class='del'>-	while (node) {</div><div class='del'>-		char *uri = node-&gt;data;</div><div class='del'>-		</div><div class='del'>-		vdest-&gt;sources = g_list_append (vdest-&gt;sources, g_strdup (uri));</div><div class='del'>-		node = node-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	((FilterRuleClass *)(parent_class))-&gt;copy (dest, src);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	BUTTON_ADD,</div><div class='del'>-	BUTTON_REMOVE,</div><div class='del'>-	BUTTON_LAST,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _source_data {</div><div class='del'>-	RuleContext *f;</div><div class='del'>-	VfolderRule *vr;</div><div class='del'>-	const char *current;</div><div class='del'>-	GtkList *list;</div><div class='del'>-	GtkButton *buttons[BUTTON_LAST];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void source_add(GtkWidget *widget, struct _source_data *data);</div><div class='del'>-static void source_remove(GtkWidget *widget, struct _source_data *data);</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	GtkSignalFunc func;</div><div class='del'>-} edit_buttons[] = {</div><div class='del'>-	{ "source_add", source_add },</div><div class='del'>-	{ "source_remove", source_remove },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_sensitive(struct _source_data *data)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_set_sensitive((GtkWidget *)data-&gt;buttons[BUTTON_ADD], TRUE);</div><div class='del'>-	gtk_widget_set_sensitive((GtkWidget *)data-&gt;buttons[BUTTON_REMOVE], data-&gt;current != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_source(GtkWidget *w, GtkWidget *child, struct _source_data *data)</div><div class='del'>-{</div><div class='del'>-	data-&gt;current = gtk_object_get_data((GtkObject *)child, "source");</div><div class='del'>-	set_sensitive(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_source_with(GtkWidget *w, struct _source_data *data)</div><div class='del'>-{</div><div class='del'>-	char *source = gtk_object_get_data((GtkObject *)w, "source");</div><div class='del'>-</div><div class='del'>-	filter_rule_set_source((FilterRule *)data-&gt;vr, source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-source_add(GtkWidget *widget, struct _source_data *data)</div><div class='del'>-{</div><div class='del'>-	static const char *allowed_types[] = { "mail", NULL };</div><div class='del'>-	GNOME_Evolution_Folder *folder;</div><div class='del'>-	char *def, *uri;</div><div class='del'>-	GtkListItem *item;</div><div class='del'>-	GList *l;</div><div class='del'>-	gchar *s;</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive(widget, FALSE);</div><div class='del'>-	def = "";</div><div class='del'>-	evolution_shell_client_user_select_folder (global_shell_client,</div><div class='del'>-						   GTK_WINDOW (gtk_widget_get_toplevel (widget)),</div><div class='del'>-						   _("Select Folder"),</div><div class='del'>-						   def, allowed_types, &amp;folder);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_DESTROYED(widget)) {</div><div class='del'>-		if (folder)</div><div class='del'>-			CORBA_free (folder);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_sensitive(widget, TRUE);</div><div class='del'>-</div><div class='del'>-	if (folder) {</div><div class='del'>-		uri = g_strdup (folder-&gt;physicalUri);</div><div class='del'>-		data-&gt;vr-&gt;sources = g_list_append(data-&gt;vr-&gt;sources, uri);</div><div class='del'>-</div><div class='del'>-		l = NULL;</div><div class='del'>-		s = e_utf8_to_gtk_string ((GtkWidget *) data-&gt;list, uri);</div><div class='del'>-		item = (GtkListItem *)gtk_list_item_new_with_label (s);</div><div class='del'>-		g_free (s);</div><div class='del'>-		gtk_object_set_data((GtkObject *)item, "source", uri);</div><div class='del'>-		gtk_widget_show((GtkWidget *)item);</div><div class='del'>-		l = g_list_append(NULL, item);</div><div class='del'>-		gtk_list_append_items(data-&gt;list, l);</div><div class='del'>-		gtk_list_select_child(data-&gt;list, (GtkWidget *)item);</div><div class='del'>-		data-&gt;current = uri;</div><div class='del'>-	}</div><div class='del'>-	CORBA_free (folder);</div><div class='del'>-	set_sensitive(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-source_remove(GtkWidget *widget, struct _source_data *data)</div><div class='del'>-{</div><div class='del'>-	const char *source;</div><div class='del'>-	int index = 0;</div><div class='del'>-	GList *l;</div><div class='del'>-	GtkListItem *item;</div><div class='del'>-</div><div class='del'>-	source = NULL;</div><div class='del'>-	while ((source = vfolder_rule_next_source(data-&gt;vr, source))) {</div><div class='del'>-		if (data-&gt;current == source) {</div><div class='del'>-			vfolder_rule_remove_source(data-&gt;vr, source);</div><div class='del'>-			item = g_list_nth_data(data-&gt;list-&gt;children, index);</div><div class='del'>-			l = g_list_append(NULL, item);</div><div class='del'>-			gtk_list_remove_items(data-&gt;list, l);</div><div class='del'>-			g_list_free(l);</div><div class='del'>-			data-&gt;current = NULL;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		index++;</div><div class='del'>-	}</div><div class='del'>-	set_sensitive(data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DO NOT internationalise these strings */</div><div class='del'>-const char *source_names[] = {</div><div class='del'>-	"specific",</div><div class='del'>-	"local",</div><div class='del'>-	"remote_active",</div><div class='del'>-	"local_remote_active"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget(FilterRule *fr, struct _RuleContext *f)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget, *frame, *w;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	const char *source;</div><div class='del'>-	VfolderRule *vr = (VfolderRule *)fr;</div><div class='del'>-	struct _source_data *data;</div><div class='del'>-	int i, row;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-        widget = ((FilterRuleClass *)(parent_class))-&gt;get_widget (fr, f);</div><div class='del'>-	</div><div class='del'>-	data = g_malloc0 (sizeof (*data));</div><div class='del'>-	data-&gt;f = f;</div><div class='del'>-	data-&gt;vr = vr;</div><div class='del'>-	</div><div class='del'>-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "vfolder_source_frame");</div><div class='del'>-        frame = glade_xml_get_widget (gui, "vfolder_source_frame");</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data_full (GTK_OBJECT (frame), "data", data, g_free);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; BUTTON_LAST; i++) {</div><div class='del'>-		data-&gt;buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-        w = glade_xml_get_widget (gui, "source_list");</div><div class='del'>-	data-&gt;list = (GtkList *)w;</div><div class='del'>-	l = NULL;</div><div class='del'>-	source = NULL;</div><div class='del'>-	while ((source = vfolder_rule_next_source (vr, source))) {</div><div class='del'>-		GtkListItem *item;</div><div class='del'>-		</div><div class='del'>-		gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (data-&gt;list), source);</div><div class='del'>-		item = (GtkListItem *)gtk_list_item_new_with_label (s);</div><div class='del'>-		g_free (s);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "source", (void *)source);</div><div class='del'>-		gtk_widget_show (GTK_WIDGET (item));</div><div class='del'>-		l = g_list_append (l, item);</div><div class='del'>-	}</div><div class='del'>-	gtk_list_append_items (data-&gt;list, l);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_source, data);</div><div class='del'>-	</div><div class='del'>-        w = glade_xml_get_widget (gui, "source_option");</div><div class='del'>-	l = GTK_MENU_SHELL (GTK_OPTION_MENU (w)-&gt;menu)-&gt;children;</div><div class='del'>-	i = 0;</div><div class='del'>-	row = 0;</div><div class='del'>-	while (l) {</div><div class='del'>-		GtkWidget *b = GTK_WIDGET (l-&gt;data);</div><div class='del'>-		</div><div class='del'>-		/* make sure that the glade is in sync with the source list! */</div><div class='del'>-		if (i &lt; sizeof (source_names) / sizeof (source_names[0])) {</div><div class='del'>-			gtk_object_set_data (GTK_OBJECT (b), "source", (char *)source_names[i]);</div><div class='del'>-			if (fr-&gt;source &amp;&amp; strcmp (source_names[i], fr-&gt;source) == 0) {</div><div class='del'>-				row = i;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Glade file " FILTER_GLADEDIR "/filter.glade out of sync with editor code");</div><div class='del'>-		}</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (b), "activate", select_source_with, data);</div><div class='del'>-		</div><div class='del'>-		i++;</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (w), row);</div><div class='del'>-	if (fr-&gt;source == NULL)</div><div class='del'>-		filter_rule_set_source (fr, (char *)source_names[row]);</div><div class='del'>-	</div><div class='del'>-	set_sensitive (data);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (widget), frame, TRUE, TRUE, 3);</div><div class='del'>-	</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (gui));</div><div class='del'>-	</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='head'>diff --git a/filter/vfolder-rule.h b/filter/vfolder-rule.h<br/>deleted file mode 100644<br/>index 25073a7a2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfolder-rule.h?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfolder-rule.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Ximian Inc.</div><div class='del'>- *</div><div class='del'>- *  Author: NotZed &lt;notzed@ximian.com&gt;</div><div class='del'>- *</div><div class='del'>- * This program is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of version 2 of the GNU General Public</div><div class='del'>- * License as published by the Free Software Foundation.</div><div class='del'>- *</div><div class='del'>- * This program is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _VFOLDER_RULE_H</div><div class='del'>-#define _VFOLDER_RULE_H</div><div class='del'>-</div><div class='del'>-#include "filter-rule.h"</div><div class='del'>-</div><div class='del'>-#define VFOLDER_RULE(obj)	GTK_CHECK_CAST (obj, vfolder_rule_get_type (), VfolderRule)</div><div class='del'>-#define VFOLDER_RULE_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, vfolder_rule_get_type (), VfolderRuleClass)</div><div class='del'>-#define IS_VFOLDER_RULE(obj)      GTK_CHECK_TYPE (obj, vfolder_rule_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _VfolderRule	VfolderRule;</div><div class='del'>-typedef struct _VfolderRuleClass	VfolderRuleClass;</div><div class='del'>-</div><div class='del'>-struct _VfolderRule {</div><div class='del'>-	FilterRule parent;</div><div class='del'>-	struct _VfolderRulePrivate *priv;</div><div class='del'>-</div><div class='del'>-	GList *sources;		/* uri's of the source folders */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _VfolderRuleClass {</div><div class='del'>-	FilterRuleClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		vfolder_rule_get_type	(void);</div><div class='del'>-VfolderRule	*vfolder_rule_new	(void);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-void		vfolder_rule_add_source		(VfolderRule *vr, const char *uri);</div><div class='del'>-void		vfolder_rule_remove_source	(VfolderRule *vr, const char *uri);</div><div class='del'>-const char	*vfolder_rule_find_source	(VfolderRule *vr, const char *uri);</div><div class='del'>-const char	*vfolder_rule_next_source	(VfolderRule *vr, const char *last);</div><div class='del'>-</div><div class='del'>-#endif /* ! _VFOLDER_RULE_H */</div><div class='del'>-</div><div class='head'>diff --git a/filter/vfoldertypes.xml b/filter/vfoldertypes.xml<br/>deleted file mode 100644<br/>index 176cc94464..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/filter/vfoldertypes.xml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>filter/vfoldertypes.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,352 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filterdescription&gt;</div><div class='del'>-&lt;partset&gt;</div><div class='del'>- &lt;part name="sender"&gt;</div><div class='del'>-  &lt;title&gt;Sender&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="sender-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(match-all (header-contains "From" ${sender}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-contains "From" ${sender})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(match-all (header-matches "From" ${sender}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-matches "From" ${sender})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-starts-with "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-starts-with "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (header-ends-with "From" ${sender}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (header-ends-with "From" ${sender})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="sender"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="to"&gt;</div><div class='del'>-   &lt;title&gt;Recipients&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="recipient-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (or (header-contains "To" ${recipient})</div><div class='del'>-	               (header-contains "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (or</div><div class='del'>-                          (header-contains "To" ${recipient})</div><div class='del'>-	                  (header-contains "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (or (header-matches "To" ${recipient})</div><div class='del'>-	    	       (header-matches "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (or</div><div class='del'>-               (header-matches "To" ${recipient})</div><div class='del'>-	       (header-matches "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (or (header-starts-with "To" ${recipient})</div><div class='del'>-	    	       (header-starts-with "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (or</div><div class='del'>-               (header-starts-with "To" ${recipient})</div><div class='del'>-	       (header-starts-with "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (or (header-ends-with "To" ${recipient})</div><div class='del'>-	    	       (header-ends-with "Cc" ${recipient})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-        (match-all (not (or</div><div class='del'>-               (header-ends-with "To" ${recipient})</div><div class='del'>-	       (header-ends-with "Cc" ${recipient}))))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="address" name="recipient"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="subject"&gt;</div><div class='del'>-   &lt;title&gt;Subject&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="subject-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-contains "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-contains "Subject" ${subject})))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-     &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-matches "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-     &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-matches "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="starts with"&gt;</div><div class='del'>-     &lt;title&gt;starts with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-starts-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not starts with"&gt;</div><div class='del'>-     &lt;title&gt;does not start with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-starts-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="ends with"&gt;</div><div class='del'>-     &lt;title&gt;ends with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (header-ends-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not ends with"&gt;</div><div class='del'>-     &lt;title&gt;does not end with&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(match-all (not (header-ends-with "Subject" ${subject}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="subject"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="body"&gt;</div><div class='del'>-   &lt;title&gt;Message Body&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="body-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-     &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(body-contains ${word})</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-     &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-     &lt;code&gt;</div><div class='del'>-	(not (body-contains ${word}))</div><div class='del'>-     &lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="word"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="sexp"&gt;</div><div class='del'>-   &lt;title&gt;Expression&lt;/title&gt;</div><div class='del'>-   &lt;input type="code" name="code"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="sent-date"&gt;</div><div class='del'>-  &lt;title&gt;Date sent&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="date-spec-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (= (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (not (= (get-sent-date) ${versus})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="before"&gt;</div><div class='del'>-    &lt;title&gt;is before&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="after"&gt;</div><div class='del'>-    &lt;title&gt;is after&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-sent-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;    </div><div class='del'>-  &lt;input type="datespec" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="recv-date"&gt;</div><div class='del'>-  &lt;title&gt;Date received&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="date-spec-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (= (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is-not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (not (= (get-received-date) ${versus})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="before"&gt;</div><div class='del'>-    &lt;title&gt;is before&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;lt; (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="after"&gt;</div><div class='del'>-    &lt;title&gt;is after&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-       (match-all (&amp;gt; (get-received-date) ${versus}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;    </div><div class='del'>-  &lt;input type="datespec" name="versus"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="status"&gt;</div><div class='del'>-  &lt;title&gt;Status&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (system-flag ${flag}))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is not"&gt;</div><div class='del'>-    &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (system-flag ${flag})))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>-  &lt;input type="optionlist" name="flag"&gt;</div><div class='del'>-   &lt;option value="Answered"&gt;</div><div class='del'>-    &lt;title&gt;Replied to&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Deleted"&gt;</div><div class='del'>-    &lt;title&gt;Deleted&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Draft"&gt;</div><div class='del'>-    &lt;title&gt;Draft&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Flagged"&gt;</div><div class='del'>-    &lt;title&gt;Important&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="Seen"&gt;</div><div class='del'>-    &lt;title&gt;Read&lt;/title&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="follow-up"&gt;</div><div class='del'>-  &lt;title&gt;Follow Up&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="is"&gt;</div><div class='del'>-    &lt;title&gt;is Flagged&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (= (user-tag "follow-up") "")))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="is not"&gt;</div><div class='del'>-    &lt;title&gt;is not Flagged&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (= (user-tag "follow-up") ""))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="attachments"&gt;</div><div class='del'>-  &lt;title&gt;Attachments&lt;/title&gt;</div><div class='del'>-  &lt;input type="optionlist" name="match-type"&gt;</div><div class='del'>-   &lt;option value="exist"&gt;</div><div class='del'>-    &lt;title&gt;Exist&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (system-flag "Attachments"))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-   &lt;option value="not exist"&gt;</div><div class='del'>-    &lt;title&gt;Do Not Exist&lt;/title&gt;</div><div class='del'>-    &lt;code&gt;</div><div class='del'>-     (match-all (not (system-flag "Attachments")))</div><div class='del'>-    &lt;/code&gt;</div><div class='del'>-   &lt;/option&gt;</div><div class='del'>-  &lt;/input&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>- &lt;part name="mlist"&gt;</div><div class='del'>-  &lt;title&gt;Mailing list&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="mlist-type"&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (header-matches "x-camel-mlist" ${mlist}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-matches "x-camel-mlist" ${mlist})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (header-contains "x-camel-mlist" ${mlist}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-        &lt;code&gt;(match-all (not (header-contains "x-camel-mlist" ${mlist})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="mlist"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-&lt;/partset&gt;</div><div class='del'>-&lt;/filterdescription&gt;</div><div class='head'>diff --git a/help/.cvsignore b/help/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/help/C/.cvsignore b/help/C/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/.cvsignore?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/help/C/Makefile.am b/help/C/Makefile.am<br/>deleted file mode 100644<br/>index e6c225a754..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/Makefile.am?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-figs = \</div><div class='del'>-	figures/calendar.png			\</div><div class='del'>-	figures/config-cal.png			\</div><div class='del'>-	figures/config-mail.png			\</div><div class='del'>-	figures/contact-editor.png		\</div><div class='del'>-	figures/contact.png			\</div><div class='del'>-	figures/exchange-identity.png		\</div><div class='del'>-	figures/exchange-receive-options.png	\</div><div class='del'>-	figures/exchange-receive.png		\</div><div class='del'>-	figures/filter-assist-fig.png		\</div><div class='del'>-	figures/filter-new-fig.png		\</div><div class='del'>-	figures/full-1.png			\</div><div class='del'>-	figures/full-2.png			\</div><div class='del'>-	figures/full-3.png			\</div><div class='del'>-	figures/full-4.png			\</div><div class='del'>-	figures/full-5.png			\</div><div class='del'>-	figures/full-6.png			\</div><div class='del'>-	figures/full-7.png			\</div><div class='del'>-	figures/mail-composer.png		\</div><div class='del'>-	figures/mail-druid-pic.png		\</div><div class='del'>-	figures/mail-inbox.png			\</div><div class='del'>-	figures/mail-threaded.png		\</div><div class='del'>-	figures/mainwindow-pic.png		\</div><div class='del'>-	figures/newmsg.png			\</div><div class='del'>-	figures/print-dest.png			\</div><div class='del'>-	figures/print-preview.png		\</div><div class='del'>-	figures/replymsg.png			\</div><div class='del'>-	figures/schedule.png			\</div><div class='del'>-	figures/small_desktop.png		\</div><div class='del'>-	figures/summary.png			\</div><div class='del'>-	figures/vfolder-createrule-fig.png</div><div class='del'>-</div><div class='del'>-docname = evolution</div><div class='del'>-lang = C</div><div class='del'>-omffile = evolution-C.omf</div><div class='del'>-sgml_ents =	\</div><div class='del'>-	apx-authors.sgml	\</div><div class='del'>-	apx-bugs.sgml		\</div><div class='del'>-	apx-gloss.sgml		\</div><div class='del'>-	config-prefs.sgml	\</div><div class='del'>-	config-sync.sgml	\</div><div class='del'>-	evolution-faq.sgml	\</div><div class='del'>-	menuref.sgml		\</div><div class='del'>-	preface.sgml		\</div><div class='del'>-	usage-calendar.sgml	\</div><div class='del'>-	usage-contact.sgml	\</div><div class='del'>-	usage-exec-summary.sgml	\</div><div class='del'>-	usage-exchange.sgml	\</div><div class='del'>-	usage-mail-org.sgml	\</div><div class='del'>-	usage-mail.sgml		\</div><div class='del'>-	usage-mainwindow.sgml	\</div><div class='del'>-	usage-print.sgml	\</div><div class='del'>-	usage-sync.sgml</div><div class='del'>-include $(top_srcdir)/help/sgmldocs.make</div><div class='del'>-dist-hook: app-dist-hook</div><div class='head'>diff --git a/help/C/POTFILES.in b/help/C/POTFILES.in<br/>deleted file mode 100644<br/>index d9393e82cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/POTFILES.in?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/POTFILES.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-apx-authors.sgml</div><div class='del'>-apx-bugs.sgml</div><div class='del'>-apx-gloss.sgml</div><div class='del'>-config-prefs.sgml</div><div class='del'>-config-setupassist.sgml</div><div class='del'>-config-sync.sgml</div><div class='del'>-evolution.sgml</div><div class='del'>-menuref.sgml</div><div class='del'>-preface.sgml</div><div class='del'>-usage-calendar.sgml</div><div class='del'>-usage-contact.sgml</div><div class='del'>-usage-mail.sgml</div><div class='del'>-usage-mainwindow.sgml</div><div class='del'>-usage-notes.sgml</div><div class='del'>-usage-print.sgml</div><div class='del'>-usage-sync.sgml</div><div class='head'>diff --git a/help/C/apx-authors.sgml b/help/C/apx-authors.sgml<br/>deleted file mode 100644<br/>index 9a0e3d2f42..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/apx-authors.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/apx-authors.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-  &lt;appendix id="authors"&gt;</div><div class='del'>-    &lt;title&gt;Authors&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; was written by the Ximian</div><div class='del'>-      Evolution team and numerous other dedicated GNOME programmers.</div><div class='del'>-      You can see their names by selecting &lt;menuchoice&gt;</div><div class='del'>-      &lt;guimenu&gt;Help&lt;/guimenu&gt; &lt;guimenuitem&gt;About&lt;/guimenuitem&gt;</div><div class='del'>-      &lt;/menuchoice&gt; from any Evolution window.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;application&gt;Evolution&lt;/application&gt; code owes a great debt</div><div class='del'>-       to the &lt;application&gt;GNOME-pim&lt;/application&gt; and</div><div class='del'>-       &lt;application&gt;GNOME-Calendar&lt;/application&gt; applications, and to</div><div class='del'>-       &lt;application&gt;KHTMLW&lt;/application&gt;.  The developers of</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; acknowledge the efforts</div><div class='del'>-       and contributions of all who worked on those projects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     Ximian would like to thank Miles Lane for his contributions in</div><div class='del'>-     quality assurance, and the staff of the El Pelon Taqueria, on</div><div class='del'>-     Peterborough St. in Boston, for sustenance.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      For more information please visit the</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; &lt;ulink</div><div class='del'>-      url="http://www.ximian.com/products/ximian_evolution/"</div><div class='del'>-      type="http"&gt;Web page&lt;/ulink&gt;.  Please send all comments,</div><div class='del'>-      suggestions, and bug reports to the &lt;ulink</div><div class='del'>-      url="http://bugzilla.ximian.com" type="http"&gt;Ximian bug tracking</div><div class='del'>-      database&lt;/ulink&gt;. Instructions for submitting bug reports can be</div><div class='del'>-      found on-line at the same location. You can also use the GNOME</div><div class='del'>-      bug report tool, &lt;command&gt;bug-buddy,&lt;/command&gt; to submit your</div><div class='del'>-      defect reports.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This manual was written by Aaron Weber</div><div class='del'>-      (&lt;email&gt;aaron@ximian.com&lt;/email&gt;), Kevin Breit</div><div class='del'>-      (&lt;email&gt;mrproper@ximian.com&lt;/email&gt;) Duncan Mak</div><div class='del'>-      (&lt;email&gt;duncan@ximian.com&lt;/email&gt;) and Ettore Perazzoli</div><div class='del'>-      (&lt;email&gt;ettore@ximian.com&lt;/email&gt;) with the help of the</div><div class='del'>-      application programmers and the GNOME Documentation Project.</div><div class='del'>-      Please file comments and suggestions for this manual as bugs in</div><div class='del'>-      the Ximian bug tracking system. If you contributed to this</div><div class='del'>-      project but do not see your name here, please contact Aaron</div><div class='del'>-      Weber (&lt;email&gt;aaron@ximian.com&lt;/email&gt;) and he'll list you.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       Partial list of Translators: </div><div class='del'>-         &lt;itemizedlist&gt;</div><div class='del'>-            &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Daniel Persson for .se</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          </div><div class='del'>-            &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Hector Garcia Alvarez for .es</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-            &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	    Kjartan Maraas for .no</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-           &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-         &lt;/para&gt;          </div><div class='del'>-    &lt;/appendix&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/help/C/apx-bugs.sgml b/help/C/apx-bugs.sgml<br/>deleted file mode 100644<br/>index 7de959dda8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/apx-bugs.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/apx-bugs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>- &lt;appendix id="bugs"&gt;</div><div class='del'>-   </div><div class='del'>-  &lt;title&gt;Known bugs and limitations&lt;/title&gt;</div><div class='del'>-  &lt;abstract&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Ximian Evolution bug tracking is done at the &lt;ulink</div><div class='del'>-							  url="http://bugzilla.ximian.com"&gt;Ximian bug tracking</div><div class='del'>-	System&lt;/ulink&gt;.  You may use that, or the GNOME &lt;application&gt;Bug</div><div class='del'>-	Report Tool&lt;/application&gt; (known as &lt;command&gt;bug-buddy&lt;/command&gt;</div><div class='del'>-      at the command line) if you find bugs or would like to request new</div><div class='del'>-      features.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you need additional help with Ximian Evolution, please visit</div><div class='del'>-      the Ximian support site at &lt;ulink</div><div class='del'>-					url="http://support.ximian.com"&gt;ximian.com/support&lt;/ulink&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/abstract&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    A number of often-requested features will not make it into</div><div class='del'>-    Ximian Evolution 1.0, but we plan to include them for version</div><div class='del'>-    1.1.  Some of them are:</div><div class='del'>-    &lt;simplelist&gt;</div><div class='del'>-      &lt;member&gt;Direct import of Microsoft Outlook contact cards&lt;/member&gt;</div><div class='del'>-      &lt;member&gt;Synchronization of email with handheld devices&lt;/member&gt;</div><div class='del'>-      &lt;member&gt;S/MIME support&lt;/member&gt;</div><div class='del'>-      &lt;member&gt;Read foreign mail folders without importing them&lt;/member&gt;</div><div class='del'>-      &lt;member&gt;Import of WINMAIL.DAT attachments&lt;/member&gt;</div><div class='del'>-      &lt;member&gt;Playing a sound to indicate new mail arriving&lt;/member&gt;</div><div class='del'>-    &lt;/simplelist&gt;</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-     A more complete list of feature requests and other issues with</div><div class='del'>-    Evolution is available online in the Ximian bug tracking system.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  </div><div class='del'>-&lt;/appendix&gt;</div><div class='del'>-</div><div class='head'>diff --git a/help/C/apx-gloss.sgml b/help/C/apx-gloss.sgml<br/>deleted file mode 100644<br/>index 40fa9a0ce9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/apx-gloss.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/apx-gloss.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,480 +0,0 @@</div><div class='del'>-&lt;glossary id="apx-gloss"&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;title&gt;Glossary&lt;/title&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;glossentry id="assistant"&gt;</div><div class='del'>-    &lt;glossterm&gt;Assistant:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	See druid</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="attachment"&gt;</div><div class='del'>-  &lt;glossterm&gt;Attachment:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Any file sent along with an email.  Attachments may be embedded in</div><div class='del'>-    a message or appended to it.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;glossentry id="automatic-indexing"&gt;</div><div class='del'>-  &lt;glossterm&gt;Automatic Indexing:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Pre-fetching procedure that allows</div><div class='del'>-     &lt;application&gt;Evolution&lt;/application&gt; to refer to data quickly.</div><div class='del'>-     It enables faster searches and decreases memory usage for</div><div class='del'>-     data displays.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="bcc"&gt;</div><div class='del'>-  &lt;glossterm&gt;Bcc (Blind Carbon Copy):&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A way of addressing a message.  Bcc is used to send a group of</div><div class='del'>-    people an e-mail, while hiding their names and addresses from each</div><div class='del'>-    other.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="cc"&gt;</div><div class='del'>-  &lt;glossterm&gt;Cc (Carbon Copy):&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Carbon-copies are used to send a 3rd party a copy of the e-mail,</div><div class='del'>-    so they an keep up to date on a conversation, without being in the</div><div class='del'>-    To: list.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="conduit"&gt;</div><div class='del'>-  &lt;glossterm&gt;Conduit:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A small application which controls</div><div class='del'>-     the transfer of data between a handheld device and a desktop</div><div class='del'>-     computer.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="druid"&gt;</div><div class='del'>-  &lt;glossterm&gt;Druid:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A tool which guides a user through a series of steps, usually to</div><div class='del'>-    configure or set up a program.  Equivalent to "Assistant" and</div><div class='del'>-    "Wizard."</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="evolution"&gt;</div><div class='del'>-  &lt;glossterm&gt;Evolution:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt; is the &lt;acronym&gt; GNOME</div><div class='del'>-    &lt;/acronym&gt; groupware application.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="execute"&gt;</div><div class='del'>-  &lt;glossterm&gt;Execute:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    To run a program.  Any file that can be run is called an</div><div class='del'>-    executable.  &lt;application&gt;Evolution&lt;/application&gt; can download</div><div class='del'>-    executable attachments, but before they can be run, the files must</div><div class='del'>-    be marked as executable with a shell or file manager.  This</div><div class='del'>-    security precaution prevents the automatic or accidental execution</div><div class='del'>-    of malicious programs. For more information on executables and file</div><div class='del'>-    permissions, see the documentation for your file manager or shell.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="expunge"&gt;</div><div class='del'>-  &lt;glossterm&gt;Expunge:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     When messages are marked for deletion, they remain till they are expunged.</div><div class='del'>-     When a message is expunged, it is permanently deleted, as long as it was</div><div class='del'>-     marked for deletion.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="filetree"&gt;</div><div class='del'>-  &lt;glossterm&gt;File Tree:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A way of describing a group of files on a computer.  With the</div><div class='del'>-     perversity typical of computer (and especially Unix and Linux)</div><div class='del'>-     nomenclature, the top of the tree is called the root directory,</div><div class='del'>-     and denoted by &lt;filename&gt;/&lt;/filename&gt;.</div><div class='del'>-     The rest of the "branches" spread downwards from the root.  Don't</div><div class='del'>-     confuse the root directory with the root</div><div class='del'>-     account, or root's home directory, normally</div><div class='del'>-     &lt;filename&gt;/root&lt;/filename&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="filter"&gt;</div><div class='del'>-  &lt;glossterm&gt;Filter:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Within &lt;application&gt;Evolution&lt;/application&gt;, a filter is a method</div><div class='del'>-    of sorting mail automatically when it's downloaded.  You can create filters to perform</div><div class='del'>-    one or more actions on a message that meets any (or all) of a wide</div><div class='del'>-    range of criteria.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="forward"&gt;</div><div class='del'>-  &lt;glossterm&gt;Forward:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    If you get a message intended for someone else, you can use</div><div class='del'>-    message forwarding to send it on to the right person. </div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="groupware"&gt;</div><div class='del'>- &lt;glossterm&gt;Groupware:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Groupware is a term describing an application which helps groups</div><div class='del'>-    of people work together.  Typically, a groupware application will</div><div class='del'>-    have several productivity features built into one program,</div><div class='del'>-    including: email, calendar, and addressbook tools.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="html"&gt;</div><div class='del'>-  &lt;glossterm&gt;HTML:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Hyper-text Markup Language (&lt;acronym&gt;HTML&lt;/acronym&gt;) is a language</div><div class='del'>-    for describing page layout in electronic documents like web pages,</div><div class='del'>-    help files, and email messages.  HTML can be used in email and</div><div class='del'>-    news posts to insert images and apply text treatments.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="hot-key"&gt;</div><div class='del'>-  &lt;glossterm&gt;Hot Key:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Hot-keys are keyboard combinations used to do actions on a</div><div class='del'>-    computer instead of using the mouse.</div><div class='del'>-    Hot-keys can speed up computer usage.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="ical"&gt;</div><div class='del'>-  &lt;glossterm&gt;iCal:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;iCal&lt;/application&gt; is the program which</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt; uses to manage the calendar</div><div class='del'>-    section.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>- &lt;glossentry id="imap"&gt;</div><div class='del'>-  &lt;glossterm&gt;IMAP:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Depending upon whom you ask, IMAP stands for the Internet Mail</div><div class='del'>-    Access Protocol, or the Interim Mail Access Protocol.  It allows access to email which is typically (although</div><div class='del'>-    not always) stored remotely on a server rather than on a local</div><div class='del'>-    hard disk.  Often contrasted with &lt;glossterm&gt;POP:&lt;/glossterm&gt;.</div><div class='del'>-    This will not be on the test.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="inline"&gt;</div><div class='del'>-  &lt;glossterm&gt;Inline:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Displayed as part of a message or other document, rather than</div><div class='del'>-     attached as a separate file. Contrast with &lt;glossterm</div><div class='del'>-     linkend="attachment"&gt;Attachment:&lt;/glossterm&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>- </div><div class='del'>-  &lt;glossentry id="ldap"&gt;</div><div class='del'>-   &lt;glossterm&gt;LDAP:&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     LDAP, the Lightweight Directory Access Protocol, allows a client</div><div class='del'>-     to search through a large database of addresses, phone numbers,</div><div class='del'>-     and people stored on a server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="mail-client"&gt;</div><div class='del'>-    &lt;glossterm&gt;Mail Client:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A mail client is the application with which a person reads and</div><div class='del'>-	sends e-mail.  Its counterparts are the various types of mail</div><div class='del'>-	servers, which handle user authentication and direct messages from</div><div class='del'>-	sender to recipient.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="minicard"&gt;</div><div class='del'>-  &lt;glossterm&gt;Minicard:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      A format for the display of contact data.  Similar in appearance</div><div class='del'>-      to a small business card.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>- &lt;glossentry id="nautilus"&gt;</div><div class='del'>-  &lt;glossterm&gt;Nautilus:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;Nautilus&lt;/application&gt; is the next generation file</div><div class='del'>-    manager for &lt;acronym&gt;GNOME&lt;/acronym&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="pop"&gt;</div><div class='del'>-  &lt;glossterm&gt;POP:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     POP, the Post Office Protocol, is a mechanism for email</div><div class='del'>-     transport.  In contrast to IMAP, it is used only to get mail from</div><div class='del'>-     a server and store it locally on your hard disk.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="protocol"&gt;</div><div class='del'>-  &lt;glossterm&gt;Protocol:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     An agreed-upon method of communication, especially one for</div><div class='del'>-     sending particular types of information between computer systems.</div><div class='del'>-     Examples include POP (Post Office Protocol), for email, and HTTP</div><div class='del'>-     (HypterText Transfer Protocol), for web pages.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="postscript"&gt;</div><div class='del'>-    &lt;glossterm&gt;Postscript:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A standard document publishing format.  Many printers read raw</div><div class='del'>-	Postscript, making Postscript quite versatile.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-  </div><div class='del'>- &lt;glossentry id="public-key-encryption"&gt;</div><div class='del'>-  &lt;glossterm&gt;Public Key Encryption:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A strong encryption method that uses a set of two "keys," one of</div><div class='del'>-     which is made public, and one of which is kept private. Data</div><div class='del'>-     encrypted using the public key can only be decrypted using the</div><div class='del'>-     private key.  The longer the keys, the more difficult it is to</div><div class='del'>-     break the encryption.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="regular-expression"&gt;</div><div class='del'>-  &lt;glossterm&gt;Regular Expression:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      A regular expression, or "regex", is a way of describing a</div><div class='del'>-      string of text using metacharacters or wild-card symbols.  For</div><div class='del'>-      example, the statement &lt;userinput&gt;fly.*so[au]p&lt;/userinput&gt; means</div><div class='del'>-      "any phrase beginning with 'fly' and ending in 'soup' or</div><div class='del'>-      'soap'".  If you searched for that expression, you'd find both</div><div class='del'>-      "fly in my soup" and "fly in my soap."  There's not room here to</div><div class='del'>-      go into depth, but if you want, have a look at the documentation</div><div class='del'>-      for the &lt;command&gt;grep&lt;/command&gt; command by opening a command</div><div class='del'>-      line and typing in &lt;command&gt;man grep&lt;/command&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="script"&gt;</div><div class='del'>-  &lt;glossterm&gt;Script:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A program written in an interpreted (rather than compiled)</div><div class='del'>-    language.  Often used as a synonym for "macro," to denote a series</div><div class='del'>-    of pre-recorded commands or actions within an application.  Often</div><div class='del'>-    times,  accomplish repetitive and tedious tasks, to save the</div><div class='del'>-    user time.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="search-base"&gt;</div><div class='del'>-    &lt;glossterm&gt;Search Base:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	LDAP can break contact lists into many groups.  The Search</div><div class='del'>-	Base tells LDAP the top group to use.  How much of the Search</div><div class='del'>-	Base that is searched is set by the &lt;glossterm</div><div class='del'>-	linkend="search-scope"&gt;Search Scope&lt;/glossterm&gt; option.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="search-scope"&gt;</div><div class='del'>-    &lt;glossterm&gt;Search Scope:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Search Scope states how much of the &lt;glossterm</div><div class='del'>-	linkend="search-base"&gt;Search Base&lt;/glossterm&gt; to search.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;glossentry id="sendmail"&gt;</div><div class='del'>-    &lt;glossterm&gt;Sendmail:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	As its name implies, &lt;application&gt;sendmail&lt;/application&gt; is a</div><div class='del'>-	program which sends mail.  &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	can use it instead of &lt;glossterm&gt;SMTP:&lt;/glossterm&gt;; some people</div><div class='del'>-	prefer it because it offers more flexibility, but is more</div><div class='del'>-	difficult to set up.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-  </div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="shortcut-bar"&gt;</div><div class='del'>-    &lt;glossterm&gt;Shortcut Bar:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A portion of &lt;application&gt;Evolution&lt;/application&gt; which offers</div><div class='del'>-	users fast access to the most frequently used portions of the</div><div class='del'>-	application.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;glossentry id="signature"&gt;</div><div class='del'>-   &lt;glossterm&gt;Signature:&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In email terms, a signature is a piece of text placed at the end</div><div class='del'>-     of every email sent, similar to a hand-written signature at the bottom</div><div class='del'>-     of a written letter.  A signature can be anything from a favorite</div><div class='del'>-     quotation to a link to a web page; courtesy dictates that it be</div><div class='del'>-     fewer than four lines long.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="SMTP"&gt;</div><div class='del'>-   &lt;glossterm&gt;SMTP:&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This is the most common way of transporting mail messages from</div><div class='del'>-      the client's computer (you) to the server. SMTP stands for</div><div class='del'>-      Simple Mail Transfer Protocol.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt; </div><div class='del'>-  </div><div class='del'>-  &lt;glossentry id="tooltip"&gt;</div><div class='del'>-    &lt;glossterm&gt;Tool-Tip:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A small box of explanatory text which appears when the mouse</div><div class='del'>-	pointer is held motionless over a button or other interface</div><div class='del'>-	element.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="virus"&gt;</div><div class='del'>-  &lt;glossterm&gt;Virus:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A program which inserts itself into other files or programs and</div><div class='del'>-    which, when executed, spreads to more programs and other</div><div class='del'>-    computers.  A virus can cause substantial damage by clogging</div><div class='del'>-    networks or disk drives, deleting files, or opening security</div><div class='del'>-    holes.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="vcard"&gt;</div><div class='del'>-    &lt;glossterm&gt;vCard:&lt;/glossterm&gt;</div><div class='del'>-    &lt;glossdef&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A file format for the exchange of contact information. When you</div><div class='del'>-	get an address card attached to an email, it's probably in vCard</div><div class='del'>-	format.  Not to be confused with &lt;glossterm</div><div class='del'>-	linkend="vfolder"&gt;vFolder:&lt;/glossterm&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-  </div><div class='del'>- &lt;glossentry id="vfolder"&gt;</div><div class='del'>-  &lt;glossterm&gt;vFolder:&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    An email organization tool. vFolders allows you to create a folder</div><div class='del'>-    that contains the results of a complex search. vFolder contents are</div><div class='del'>-    are updated dynamically.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;/glossary&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/help/C/config-prefs.sgml b/help/C/config-prefs.sgml<br/>deleted file mode 100644<br/>index 15c9bf15a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/config-prefs.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/config-prefs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,925 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;chapter id="config-prefs"&gt;</div><div class='del'>-</div><div class='del'>-      &lt;title&gt;Advanced Configuration&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Perhaps your mail server has changed names.  Perhaps you've</div><div class='del'>-        grown tired of a certain layout for your appointments.</div><div class='del'>-        Whatever the reason, you want to change your</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; settings.  This chapter</div><div class='del'>-        will tell you how to do just that.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;sect1 id="config-prefs-mail"&gt;</div><div class='del'>-         &lt;title&gt;Mail Settings&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        To change your mail settings, select &lt;menuchoice&gt;</div><div class='del'>-        &lt;guimenu&gt;Tools&lt;/guimenu&gt; &lt;guimenuitem&gt;Mail</div><div class='del'>-        Settings&lt;/guimenuitem&gt;&lt;/menuchoice&gt; in the Inbox.  This</div><div class='del'>-        will open the &lt;interface&gt;mail preferences window&lt;/interface&gt;,</div><div class='del'>-        illustrated in &lt;xref linkend="config-prefs-mail-fig"&gt;.  Mail</div><div class='del'>-        preferences are separated into several categories:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Accounts&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		This allows you to create and alter one or more</div><div class='del'>-		identities for your email.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Display&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Allows you to edit how email appears.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Composer&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Customizes the behavior of the email message composer.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Other&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Configures miscellanious aspects of</div><div class='del'>-		&lt;application&gt;Evolution&lt;/application&gt; such as character</div><div class='del'>-		set and encryption tools.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-	</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;!-- ==============Figure===================== --&gt;</div><div class='del'>-      &lt;figure id="config-prefs-mail-fig"&gt;</div><div class='del'>-	&lt;title&gt;Account Editor Window&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Account Editor Window&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;mediaobject&gt;&lt;imageobject&gt;&lt;imagedata fileref="figures/config-mail" format="png" srccredit="Aaron Weber"&gt;</div><div class='del'>-	    &lt;/imageobject&gt;&lt;/mediaobject&gt;</div><div class='del'>-	&lt;/screenshot&gt;</div><div class='del'>-      &lt;/figure&gt;</div><div class='del'>-      &lt;!-- ==============End of Figure================--&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-mail-identity"&gt;</div><div class='del'>-      &lt;title&gt;Working with the Accounts Tab&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         &lt;application&gt;Ximian Evolution&lt;/application&gt; allows you to</div><div class='del'>-         maintain multiple accounts, or identities.  This is useful</div><div class='del'>-         want to keep personal and professional email separate, or if</div><div class='del'>-         you wear several hats at work. When you are writing an email</div><div class='del'>-         message, you can which account to use by selecting from the</div><div class='del'>-         drop-down list next to the &lt;guilabel&gt;From&lt;/guilabel&gt; entry in</div><div class='del'>-         the message composer.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Clicking &lt;guibutton&gt;Get Mail&lt;/guibutton&gt; will refresh any</div><div class='del'>-         IMAP, &lt;filename&gt;mh&lt;/filename&gt;, or</div><div class='del'>-         &lt;filename&gt;mbox&lt;/filename&gt; listings</div><div class='del'>-         and check and download mail from all POP servers.  In other</div><div class='del'>-         words, &lt;guibutton&gt;Get Mail&lt;/guibutton&gt; gets your mail, no</div><div class='del'>-         matter how many sources you have, or what types they are.  If</div><div class='del'>-         you don't want to check mail for a given account, select it</div><div class='del'>-         in the &lt;guilabel&gt;Accounts&lt;/guilabel&gt; tab and click the</div><div class='del'>-         &lt;guibutton&gt;Disable&lt;/guibutton&gt; button.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         To add a new account, simply click &lt;guibutton&gt;Add&lt;/guibutton&gt;</div><div class='del'>-         to open the mail configuration assistant. To alter an</div><div class='del'>-         existing identity, select it in the</div><div class='del'>-         &lt;interface&gt;Preferences&lt;/interface&gt; window, and then click</div><div class='del'>-         &lt;guibutton&gt;Edit&lt;/guibutton&gt; to open the account editor</div><div class='del'>-         dialog.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-         The account editor dialog has six sections:</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Identity:&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Here, enter the name,</div><div class='del'>-              email address, and other identifying information for the</div><div class='del'>-              account.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Receiving Mail&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-             Here, select the way you will be getting mail: you may</div><div class='del'>-             download mail from a server (&lt;glossterm</div><div class='del'>-             linkend="pop"&gt;POP&lt;/glossterm&gt;), read and keep it on the</div><div class='del'>-             server (Microsoft Exchange or &lt;glossterm</div><div class='del'>-             linkend="imap"&gt;IMAP&lt;/glossterm&gt;), or read it from files</div><div class='del'>-             that already exist on your desktop computer.  If you use</div><div class='del'>-             a server, it may permit or require you to use a Secure</div><div class='del'>-             Socket Layer (SSL) connection.  To turn SSL connections</div><div class='del'>-             on, just click the &lt;guibutton&gt;Use Secure Connection</div><div class='del'>-             (SSL)&lt;/guibutton&gt; button.</div><div class='del'>-</div><div class='del'>-&lt;note id="config-arbitrary-port"&gt;</div><div class='del'>-&lt;title&gt;Specifying Port Numbers&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-Your system administrator may ask you to connect to a specific port on</div><div class='del'>-a mail server. To specify which port you use, just type a colon and</div><div class='del'>-the port number after the server name. For example, to connect to port</div><div class='del'>-143 on the server smtp.omniport.com, you would enter</div><div class='del'>-as</div><div class='del'>-&lt;userinput&gt;</div><div class='del'>-smtp.omniport.com:143</div><div class='del'>-&lt;/userinput&gt; as the server name.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/note&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Receiving Options&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Here, decide whether you'd like to check for mail</div><div class='del'>-              automatically and how often. </div><div class='del'>-</div><div class='del'>-              &lt;variablelist&gt;</div><div class='del'>-                &lt;varlistentry&gt;</div><div class='del'>-                   &lt;term&gt;If you chose POP:&lt;/term&gt;</div><div class='del'>-                   &lt;listitem&gt;</div><div class='del'>-                     &lt;para&gt;</div><div class='del'>-                   &lt;itemizedlist&gt;</div><div class='del'>-			  &lt;listitem&gt;</div><div class='del'>-			    &lt;para&gt;Checking for new mail: If you would</div><div class='del'>-	                     like &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	                     to check for new mail automatically,</div><div class='del'>-	                     check the box and select a frequency in</div><div class='del'>-	                     minutes.</div><div class='del'>-                           &lt;/para&gt;</div><div class='del'>-			  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-			  &lt;listitem&gt;</div><div class='del'>-			    &lt;para&gt;</div><div class='del'>-                             Message Storage: If you'd like to store</div><div class='del'>-	                      copies of your mail on the server, check</div><div class='del'>-	                      this option.</div><div class='del'>-                           &lt;/para&gt;</div><div class='del'>-			  &lt;/listitem&gt;</div><div class='del'>-			&lt;/itemizedlist&gt;</div><div class='del'>-                      &lt;/para&gt;</div><div class='del'>-		    &lt;/listitem&gt;</div><div class='del'>-                  &lt;/varlistentry&gt; </div><div class='del'>-</div><div class='del'>-                &lt;varlistentry&gt;</div><div class='del'>-                   &lt;term&gt;If you chose Microsoft Exchange:&lt;/term&gt;</div><div class='del'>-                   &lt;listitem&gt;</div><div class='del'>-                     &lt;para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;itemizedlist&gt; &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;Checking for new mail: If you would like</div><div class='del'>-		&lt;application&gt;Evolution&lt;/application&gt; to check for new mail</div><div class='del'>-		automatically, check the box and select a frequency in</div><div class='del'>-		minutes.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;Exchange Server: If your active directory user name</div><div class='del'>-		is different from your Exchange mail user name, check this</div><div class='del'>-		box and enter your mail username here.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;Create a Global Address List folder: If you would</div><div class='del'>-		like to have a seperate folder for the Active Directory's</div><div class='del'>-		Global Address List, leave this box checked. &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-		  Active Directory Server Name: In most organizations,</div><div class='del'>-    		  the Active Directory server will be different from</div><div class='del'>-    		  the Exchange mail server.  If so, check the box and</div><div class='del'>-    		  enter the Active Directory server name here.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;Limit number of Responses: Select a maximum number</div><div class='del'>-		of results for an address search. A maximum number of</div><div class='del'>-		results limits the load on your system and on your network.</div><div class='del'>-		  &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/itemizedlist&gt;                       </div><div class='del'>-                     &lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;/varlistentry&gt; </div><div class='del'>-</div><div class='del'>-                &lt;varlistentry&gt;</div><div class='del'>-                   &lt;term&gt;If you chose IMAP:&lt;/term&gt;</div><div class='del'>-                   &lt;listitem&gt;</div><div class='del'>-                     &lt;para&gt;</div><div class='del'>-                      </div><div class='del'>-         &lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;Checking for new mail: If you would like</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; to check for new mail</div><div class='del'>-	    automatically, check the box and select a frequency in</div><div class='del'>-	    minutes.  </div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;If you want &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	    to check for new messages in &lt;emphasis&gt;all&lt;/emphasis&gt; your</div><div class='del'>-	    IMAP folders, make sure the &lt;guilabel&gt;Check for new</div><div class='del'>-	    messages in all folders&lt;/guilabel&gt; box is selected.&lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;Show only subscribed folders: Check this box if you</div><div class='del'>-	    have more folders in your IMAP view than you want to</div><div class='del'>-	    read.&lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Override server-supplied namespace: If you like, enter a</div><div class='del'>-              specific directory where your server stores mail for</div><div class='del'>-              you.  Typical values are "mail" and "Mail."  For more</div><div class='del'>-              information about how to use IMAP mail, see &lt;xref</div><div class='del'>-              linkend="usage-mail-subscriptions"&gt;.&lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;Apply filters to new messages in INBOX on this</div><div class='del'>-	    server: If you'd like your filters to work on this account</div><div class='del'>-	    as well as on locally downloaded mail, check this box.&lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-                     &lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;/varlistentry&gt; </div><div class='del'>-</div><div class='del'>-             </div><div class='del'>-                  &lt;/variablelist&gt;  </div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Sending Mail&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              In this section, you will choose and configure a method</div><div class='del'>-              for sending mail.  You may choose &lt;glossterm</div><div class='del'>-              linkend="smtp"&gt;SMTP&lt;/glossterm&gt;, Microsoft Exchange (if</div><div class='del'>-              you have purchased the Ximian Connector for Microsoft</div><div class='del'>-              Exchange) or &lt;glossterm</div><div class='del'>-              linkend="sendmail"&gt;sendmail&lt;/glossterm&gt;.</div><div class='del'>-             &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Special Folders&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Here, you can decide where this account will store the</div><div class='del'>-              messages that it has sent, and the messages that you</div><div class='del'>-              save as drafts.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;Security&lt;/term&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              In this section, you will set the security options for</div><div class='del'>-              this account. Enter your PGP Key ID and decide how</div><div class='del'>-              frequently to encrypt and sign your messages. You can</div><div class='del'>-              learn more about PGP and encryption in &lt;xref</div><div class='del'>-              linkend="encryption"&gt;.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-mail-display"&gt;</div><div class='del'>-      &lt;title&gt;Mail Display Options&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In this tab you can decide how you would like</div><div class='del'>-        &lt;application&gt;Ximian Evolution&lt;/application&gt; to display your</div><div class='del'>-        mail: how to display citations, how long to wait before</div><div class='del'>-        marking a message as read, and so forth.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        This is also where you can decide how you would like</div><div class='del'>-        &lt;application&gt;Ximian Evolution&lt;/application&gt; to handle inline</div><div class='del'>-        images in HTML mail that you get. There is a detailed</div><div class='del'>-        discussion of the issues surrounding these options in &lt;xref</div><div class='del'>-        linkend="usage-mail-getnsend-get-attach-html"&gt;.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       To hange the font which &lt;application&gt;Ximian</div><div class='del'>-        Evolution&lt;/application&gt; uses to display mail, do the</div><div class='del'>-        following:</div><div class='del'>-       &lt;orderedlist numeration="arabic"&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-            &lt;para&gt;</div><div class='del'>-              Open the Control Center by selecting &lt;menuchoice&gt;</div><div class='del'>-		&lt;guimenu&gt;System&lt;/guimenu&gt;</div><div class='del'>-		&lt;guimenuitem&gt;Settings&lt;/guimenuitem&gt; &lt;/menuchoice&gt; from</div><div class='del'>-		the menu panel.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-               Select the HTML Viewer settings tool.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;Choose the font and font size you would like to use.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/orderedlist&gt;</div><div class='del'>-</div><div class='del'>-       Alternately, open a terminal and run the</div><div class='del'>-       &lt;command&gt;gtkhtml-properties-capplet&lt;/command&gt; command. This</div><div class='del'>-       will open the GNOME HTML Display Properties tool, and you can</div><div class='del'>-       select a font and other attributes of your HTML display,</div><div class='del'>-       including that in &lt;application&gt;Ximian Evolution&lt;/application&gt;.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-mail-composer"&gt;</div><div class='del'>-      &lt;title&gt;Message Composer Preferences&lt;/title&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Mercifully, there are only four preferences you can prefer in</div><div class='del'>-        the message composer preferences dialog:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Send mail in HTML format by default &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                 If you would like all email messages that you compose</div><div class='del'>-                 to begin in HTML format, leave this box checked. You</div><div class='del'>-                 can convert messages between HTML and plain text by</div><div class='del'>-                 selecting the &lt;menuchoice&gt; &lt;guimenu&gt;Format&lt;/guimenu&gt;</div><div class='del'>-                 &lt;guimenuitem&gt;HTML&lt;/guimenuitem&gt; &lt;/menuchoice&gt; toggle</div><div class='del'>-                 in the message composer.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Default Forward style&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                  Select from: </div><div class='del'>-                  &lt;simplelist&gt;</div><div class='del'>-                   &lt;member&gt;&lt;guilabel&gt;Attachment:&lt;/guilabel&gt; the</div><div class='del'>-                  message you forward appended to the message you send</div><div class='del'>-                  as a seperate file.&lt;/member&gt;</div><div class='del'>-</div><div class='del'>-                  &lt;member&gt; &lt;guilabel&gt;Inline:&lt;/guilabel&gt; The message</div><div class='del'>-                  you forward is included at the end of the message</div><div class='del'>-                  you send.&lt;/member&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;member&gt; </div><div class='del'>-                     &lt;guilabel&gt;Quoted:&lt;/guilabel&gt; The message</div><div class='del'>-                     you forward is included at the end of the message</div><div class='del'>-                     you send, and a greater-than symbol (&amp;gt;) is</div><div class='del'>-                     inserted at the beginning of each line to</div><div class='del'>-                     indicate that it is quoted.</div><div class='del'>-                   &lt;/member&gt;</div><div class='del'>-		&lt;/simplelist&gt;</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Prompt when sending messages with an empty subject&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                 The composer will warn you if you try to send a</div><div class='del'>-                 message without a subject.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Prompt when sending messages with only Bcc recipients defined&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                 The composer will warn you if you try to send a</div><div class='del'>-                 message that has only &lt;guilabel&gt;Bcc&lt;/guilabel&gt;</div><div class='del'>-                 recipients. This is important because some mail</div><div class='del'>-                 servers will fail to honor blind carbon copy if you</div><div class='del'>-                 do not have at least one recipient that is visible to</div><div class='del'>-                 all readers.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-     &lt;sect2 id="config-prefs-mail-other"&gt;</div><div class='del'>-	&lt;title&gt;Other Mail Preferences&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          Not everything fits neatly into categories.  This tab</div><div class='del'>-          contains some miscellaneous configuration options that</div><div class='del'>-          didn't fit anywhere else.</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt; </div><div class='del'>-	      &lt;guilabel&gt;PGP binary path&lt;/guilabel&gt;</div><div class='del'>-	    &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                The complete path to your external encryption tool On</div><div class='del'>-                most Linux systems, this will be</div><div class='del'>-                &lt;filename&gt;/usr/bin/gpg&lt;/filename&gt;.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt; </div><div class='del'>-	      &lt;guilabel&gt;Remember PGP Passphrase until Exit&lt;/guilabel&gt;</div><div class='del'>-	    &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt; Check this box if you want &lt;application&gt;Ximian</div><div class='del'>-                Evolution&lt;/application&gt; to remember your PGP</div><div class='del'>-                passphrase for as long as it is running.  You will</div><div class='del'>-                still have to enter your passphrase again each time</div><div class='del'>-                you start &lt;application&gt;Ximian Evolution&lt;/application&gt;.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;</div><div class='del'>-	      &lt;guilabel&gt;Default Character Encoding&lt;/guilabel&gt;</div><div class='del'>-	    &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt; &lt;para&gt; Choose a default character encoding for</div><div class='del'>-	      your messages.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-              &lt;/listitem&gt;</div><div class='del'>-             &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;</div><div class='del'>-	      &lt;guilabel&gt;Empty Trash Folders on Exit&lt;/guilabel&gt;</div><div class='del'>-	    &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt; &lt;para&gt; If you would like to expunge all deleted</div><div class='del'>-	      mail when you quit &lt;application&gt;Ximian</div><div class='del'>-	      Evolution&lt;/application&gt;, check this box.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-              &lt;/listitem&gt;</div><div class='del'>-             &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;</div><div class='del'>-	      &lt;guilabel&gt;Log filter actions to:&lt;/guilabel&gt;</div><div class='del'>-	    &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt; &lt;para&gt; If you like, you can have</div><div class='del'>-	      &lt;application&gt;Ximian Evolution&lt;/application&gt; write all</div><div class='del'>-	      its message filter actions to a log file. Select a log</div><div class='del'>-	      file here.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-              &lt;/listitem&gt;</div><div class='del'>-             &lt;/varlistentry&gt;</div><div class='del'>-           &lt;/variablelist&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- NOT FOR 1.0, see usage-mail.sgml</div><div class='del'>-      &lt;sect1 id="config-prefs-news"&gt;          </div><div class='del'>-          &lt;title&gt;News Servers&lt;/title&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Newsgroups are so much like mailing lists that there's no</div><div class='del'>-            reason not to keep them right next to your mail.  When you</div><div class='del'>-            first select the &lt;guilabel&gt;News Servers&lt;/guilabel&gt; tab,</div><div class='del'>-            you will see a blank box with the three familiar buttons</div><div class='del'>-            on the right: &lt;guibutton&gt;Add&lt;/guibutton&gt;,</div><div class='del'>-            &lt;guibutton&gt;Edit&lt;/guibutton&gt;, and</div><div class='del'>-            &lt;guibutton&gt;Delete&lt;/guibutton&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Click &lt;guibutton&gt;Add&lt;/guibutton&gt; to add a news server; you</div><div class='del'>-            will be prompted for its name.  Enter the name, click</div><div class='del'>-            &lt;guibutton&gt;OK&lt;/guibutton&gt;, and you're done.  You can have</div><div class='del'>-            as many news servers as you like, of course.  News servers</div><div class='del'>-            will appear next to your IMAP servers in the</div><div class='del'>-            &lt;interface&gt;folder bar&lt;/interface&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-     &lt;/sect2&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="config-prefs-cal"&gt;</div><div class='del'>-       &lt;title&gt;Configuring the Calendar&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-          To set your calendar preferences, select</div><div class='del'>-          &lt;menuchoice&gt;&lt;guimenu&gt;Settings&lt;/guimenu&gt;</div><div class='del'>-          &lt;guimenuitem&gt;Calendar</div><div class='del'>-          Settings&lt;/guimenuitem&gt;&lt;/menuchoice&gt; from the Calendar</div><div class='del'>-          view.  This will open up the</div><div class='del'>-          &lt;interface&gt;Preferences&lt;/interface&gt; window.  It contains four</div><div class='del'>-          tabs: &lt;guilabel&gt;General&lt;/guilabel&gt;, &lt;guilabel&gt;Display&lt;/guilabel&gt;, &lt;guilabel&gt;Task List&lt;/guilabel&gt;, and &lt;guilabel&gt;Other&lt;/guilabel&gt;.  The &lt;interface&gt;calendar</div><div class='del'>-          preferences window&lt;/interface&gt; is illustrated in &lt;xref</div><div class='del'>-          linkend="config-prefs-cal-fig"&gt;.</div><div class='del'>-</div><div class='del'>-      &lt;!-- ==============Figure===================== --&gt;</div><div class='del'>-      &lt;figure id="config-prefs-cal-fig"&gt;</div><div class='del'>-	&lt;title&gt;Calendar Preferences Dialog&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;If this worked on my job as well as my calendar...&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;mediaobject&gt;&lt;imageobject&gt;&lt;imagedata fileref="figures/config-cal" format="png" srccredit="Aaron Weber"&gt;</div><div class='del'>-	    &lt;/imageobject&gt;&lt;/mediaobject&gt;</div><div class='del'>-	&lt;/screenshot&gt;</div><div class='del'>-      &lt;/figure&gt;</div><div class='del'>-      &lt;!-- ==============End of Figure================--&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-general"&gt;</div><div class='del'>-      &lt;title&gt;Calendar's General Settings&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;guilabel&gt;Time display&lt;/guilabel&gt; tab lets you set the</div><div class='del'>-        following:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Time zone&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		The city you're located in, to judge your time zone.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Time format&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;You may choose between twelve-hour (AM/PM) and</div><div class='del'>-	      twenty-four hour time formats here by clicking the</div><div class='del'>-	      appropriate radio button.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Work Week&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                When does your work day start, and when does it end?</div><div class='del'>-		In the day and week views,</div><div class='del'>-		&lt;application&gt;Evolution&lt;/application&gt; displays all the</div><div class='del'>-		hours in the range you select here, even if there are</div><div class='del'>-		no appointments for those times.  Of course, you can</div><div class='del'>-		still schedule an appointment outside of these hours,</div><div class='del'>-		and if you do, the display will be extended to show</div><div class='del'>-		it.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;First day of the week&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;You can set weeks to start on Sunday or on Monday.&lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Start of day&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Says what time of the day your weekday starts.  This will show all times till the end of the day, regardless of there is an appointment during the time period.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;End of day&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Sets the time the day ends at.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-display"&gt;</div><div class='del'>-      &lt;title&gt;Display&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &lt;interface&gt;Display&lt;/interface&gt; section lets you configure some visual properties of the calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;The display properties you can set are:</div><div class='del'>-</div><div class='del'>-	&lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Time divisions&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-		Sets the increments shown on the daily view in the calendar.  You can set this to be:</div><div class='del'>-		&lt;itemizedlist&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      5 minutes</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      10 minutes</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      15 minutes</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      30 minutes</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      60 minutes</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/itemizedlist&gt;</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Show appointment end times in week and month views&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		If there is space, &lt;application&gt;Evolution&lt;/application&gt; will show the end times in the week and month views for each appointment.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Compress weekends in month view&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		If checked, your weekends will be shown in one box, instead of one for each day in the month view.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Show week numbers in date navigator&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-		This will show the week numbers next to the respective weeks in the calendar.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-tasklist"&gt;</div><div class='del'>-      &lt;title&gt;Task List Settings&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       You can choose what information the To Do list displays and the</div><div class='del'>-       way it is displayed.</div><div class='del'>-       &lt;variablelist&gt;</div><div class='del'>-	 &lt;varlistentry&gt;</div><div class='del'>-	   &lt;term&gt;Tasks due today&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Configures what color to set your tasks that are due today to.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Overdue tasks&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		Configures what color to set your overdue items to.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-other"&gt;</div><div class='del'>-      &lt;title&gt;Other Calendar Settings&lt;/title&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-	This configures miscellaneous items for the calendar and todo list's functionality.</div><div class='del'>-	&lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Ask for confirmation when deleting items&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		When you delete an item in either the Task List or the Calendar, you will be prompted to confirm that you want to delete the item.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create new appointments with a default reminder&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-		All your appointments will be created using a default reminder enabled.  You can still change what way you are reminded though.  If enabled, you can then set the time before your appointment to be reminded.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="config-prefs-contact"&gt;</div><div class='del'>-    &lt;title&gt;Managing the Addressbook&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The addressbook does not have a large list of configuration</div><div class='del'>-      settings, but those that are there can be found in the</div><div class='del'>-      &lt;guimenu&gt;Tools&lt;/guimenu&gt; menu.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-    &lt;sect2 id="config-prefs-contact-ldap-add"&gt;</div><div class='del'>-      &lt;title&gt;Adding Directory Servers&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	To add a new &lt;glossterm linkend="ldap"&gt;LDAP&lt;/glossterm&gt; server</div><div class='del'>-	to your available contact folders:</div><div class='del'>-	&lt;orderedlist numeration="arabic"&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Select </div><div class='del'>-	      &lt;menuchoice&gt;</div><div class='del'>-		&lt;guimenu&gt;Tools&lt;/guimenu&gt;</div><div class='del'>-		&lt;guimenuitem&gt;Addressbook Sources&lt;/guimenuitem&gt;</div><div class='del'>-	      &lt;/menuchoice&gt;</div><div class='del'>-	      from the menu.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Click the &lt;guibutton&gt;Add&lt;/guibutton&gt; button on the right</div><div class='del'>-	      side.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Enter the server information:</div><div class='del'>-	      &lt;variablelist&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;Account name&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      The name that you see on the screen.  This could</div><div class='del'>-		      be anything you wish.</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;Server name&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      Address of the server where the addressbook is located.</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;My server requires authentication&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      Select this if the server requires</div><div class='del'>-		      &lt;application&gt;Evolution&lt;/application&gt; to provide</div><div class='del'>-		      a server in order to access the LDAP contacts.</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;Port&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      The internet port</div><div class='del'>-		      &lt;application&gt;Evolution&lt;/application&gt; connects to</div><div class='del'>-		      in order to access the LDAP database.  This is</div><div class='del'>-		      normally 389.</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;&lt;glossterm linkend="search-base"&gt;Search base&lt;/glossterm&gt;&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      The base entry to use for all your searches.</div><div class='del'>-		      Contact your administrator for information about</div><div class='del'>-		      the correct settings.</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-		&lt;varlistentry&gt;</div><div class='del'>-		  &lt;term&gt;&lt;glossterm linkend="search-scope"&gt;Search scope&lt;/glossterm&gt;&lt;/term&gt;</div><div class='del'>-		  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-		      How broad the search is in the directory.  The</div><div class='del'>-		      following options are available:</div><div class='del'>-		      &lt;variablelist&gt;</div><div class='del'>-			&lt;varlistentry&gt;</div><div class='del'>-			  &lt;term&gt;Base&lt;/term&gt;</div><div class='del'>-			  &lt;listitem&gt;</div><div class='del'>-			    &lt;para&gt;</div><div class='del'>-			      Searches just the Search Base.  Most of the time,</div><div class='del'>-			      not very useful.</div><div class='del'>-			    &lt;/para&gt;</div><div class='del'>-			  &lt;/listitem&gt;</div><div class='del'>-			&lt;/varlistentry&gt;</div><div class='del'>-			&lt;varlistentry&gt;</div><div class='del'>-			  &lt;term&gt;One&lt;/term&gt;</div><div class='del'>-			  &lt;listitem&gt;</div><div class='del'>-			    &lt;para&gt;</div><div class='del'>-			      Searches the Search Base and one entry</div><div class='del'>-			      below it.</div><div class='del'>-			    &lt;/para&gt;</div><div class='del'>-			  &lt;/listitem&gt;</div><div class='del'>-			&lt;/varlistentry&gt;</div><div class='del'>-			&lt;varlistentry&gt;</div><div class='del'>-			  &lt;term&gt;Sub&lt;/term&gt;</div><div class='del'>-			  &lt;listitem&gt;</div><div class='del'>-			    &lt;para&gt;</div><div class='del'>-			      Searches the Search Base and all entries</div><div class='del'>-			      below it.</div><div class='del'>-			    &lt;/para&gt;</div><div class='del'>-			  &lt;/listitem&gt;</div><div class='del'>-			&lt;/varlistentry&gt;</div><div class='del'>-		      &lt;/variablelist&gt;</div><div class='del'>-		    &lt;/para&gt;</div><div class='del'>-		  &lt;/listitem&gt;</div><div class='del'>-		&lt;/varlistentry&gt;</div><div class='del'>-	      &lt;/variablelist&gt;</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Click &lt;guibutton&gt;OK&lt;/guibutton&gt;.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Click &lt;guibutton&gt;OK&lt;/guibutton&gt; to permanenty make</div><div class='del'>-	      changes or &lt;guibutton&gt;Apply&lt;/guibutton&gt; to temporarily</div><div class='del'>-	      set the changes.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/orderedlist&gt;</div><div class='del'>-&lt;!-- I gotta finish this example --&gt;</div><div class='del'>-	&lt;example id="ldap-config-example"&gt;</div><div class='del'>-	  &lt;title&gt;LDAP Configuration&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Rich works at a large chip manufacturer.  He needs to</div><div class='del'>-	    access the company's LDAP server.  Their LDAP address is</div><div class='del'>-	    wemakechips.com.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    His Account Name would be: We Make Chips Employees</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    His Server Name would be: ldap.wemakechips.com</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/example&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-  &lt;sect1 id="config-prefs-general"&gt;</div><div class='del'>-    &lt;title&gt;General Preferences&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Additional configuration options will be covered here, as</div><div class='del'>-      they become available.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-    </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/help/C/config-sync.sgml b/help/C/config-sync.sgml<br/>deleted file mode 100644<br/>index 5ce42c3467..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/config-sync.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/config-sync.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +0,0 @@</div><div class='del'>-  &lt;chapter id="config-sync"&gt;</div><div class='del'>-     &lt;title&gt;Setting up your synchronization system&lt;/title&gt; </div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        Synchronization presents you with two issues you'll need to</div><div class='del'>-        address. </div><div class='del'>-        &lt;simplelist&gt;</div><div class='del'>-          &lt;member&gt;</div><div class='del'>-            Your computer needs to recognize and access your handheld.</div><div class='del'>-            At this time, &lt;application&gt;Ximian Evolution&lt;/application&gt; only</div><div class='del'>-            supports Palm-OS devices like the PalmPilot and the</div><div class='del'>-            Handspring Visor.</div><div class='del'>-          &lt;/member&gt;</div><div class='del'>-          &lt;member&gt;</div><div class='del'>-           You should decide what sort of synchronization behavior you</div><div class='del'>-           want.</div><div class='del'>-          &lt;/member&gt;</div><div class='del'>-        &lt;/simplelist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       If you haven't used a handheld device with your computer</div><div class='del'>-       before, you'll need to run the GNOME &lt;application&gt;Control</div><div class='del'>-       Center&lt;/application&gt; by selecting</div><div class='del'>-       &lt;menuchoice&gt;&lt;guimenu&gt;System&lt;/guimenu&gt;&lt;guimenuitem&gt;Settings&lt;/guimenuitem&gt;&lt;/menuchoice&gt;,</div><div class='del'>-       and make sure that &lt;application&gt;Pilot Link&lt;/application&gt; is</div><div class='del'>-       properly configured.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        Once your computer and your Palm-OS device are talking happily</div><div class='del'>-        to each other, select the &lt;glossterm</div><div class='del'>-        linkend="conduit"&gt;conduits&lt;/glossterm&gt; you want under the</div><div class='del'>-        &lt;guilabel&gt;Pilot Conduits&lt;/guilabel&gt; section of the Control</div><div class='del'>-        Center.  You may use conduits to synchronize data with several</div><div class='del'>-        applications; the &lt;application&gt;Ximian Evolution&lt;/application&gt;</div><div class='del'>-        conduits are labelled &lt;guilabel&gt;EAddress&lt;/guilabel&gt;, for the</div><div class='del'>-        contacts in your addressbook, &lt;guilabel&gt;ECalendar&lt;/guilabel&gt;,</div><div class='del'>-        for your calendar, and &lt;guilabel&gt;ETodo&lt;/guilabel&gt;, for your</div><div class='del'>-        task list.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      To enable a conduit, click the</div><div class='del'>-        &lt;guibutton&gt;Enable&lt;/guibutton&gt; to enable it, and click</div><div class='del'>-        &lt;guibutton&gt;Settings&lt;/guibutton&gt; to change what it will do when</div><div class='del'>-        activated.  Your options may vary depending on the conduit,</div><div class='del'>-        but typically they will be:</div><div class='del'>-</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Disabled:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                  Do nothing.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Synchronize:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                  Copy new data from the computer to the handheld, and</div><div class='del'>-                  from the handheld to the computer.  Remove items</div><div class='del'>-                  that were on both systems but have been deleted on</div><div class='del'>-                  one.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Copy From Pilot:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                  If there is any new data on the the handheld device,</div><div class='del'>-                  copy it to the computer.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Copy To Pilot:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                 Copy new data from the computer to the handheld. </div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Merge From Pilot:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                  Copy new data from the handheld to the computer, and</div><div class='del'>-                  remove any information from the computer that has</div><div class='del'>-                  been deleted on the handheld.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-         &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Merge To Pilot:&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt; </div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                  Copy new data from the computer to the handheld, and</div><div class='del'>-                  remove any information from the handheld that has</div><div class='del'>-                  been deleted on the computer.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-       &lt;/variablelist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Select the behavior you want for each conduit you choose to use.</div><div class='del'>-      If you're not sure, go ahead and stick with</div><div class='del'>-      &lt;guilabel&gt;Synchronize&lt;/guilabel&gt;.  Then, put your handheld on</div><div class='del'>-      its cradle and press the HotSync button.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-         &lt;tip&gt; </div><div class='del'>-	  &lt;title&gt;Data Loss Prevention&lt;/title&gt; </div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    It's always a good idea to make a backup.  To do that,</div><div class='del'>-	    make a copy of the &lt;filename&gt;evolution&lt;/filename&gt;</div><div class='del'>-	    directory inside your home directory.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	&lt;/tip&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/help/C/evolution-C.omf b/help/C/evolution-C.omf<br/>deleted file mode 100644<br/>index e166862a81..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/evolution-C.omf?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/evolution-C.omf</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" standalone="no"?&gt;</div><div class='del'>-&lt;omf&gt;</div><div class='del'>-  &lt;resource&gt;</div><div class='del'>-    &lt;title&gt;</div><div class='del'>-      Evolution Manual</div><div class='del'>-    &lt;/title&gt;</div><div class='del'>-    &lt;subject&gt;</div><div class='del'>-      &lt;category&gt;GNOME|Applications&lt;/category&gt;</div><div class='del'>-    &lt;/subject&gt;</div><div class='del'>-    &lt;format mime="text/html" /&gt;</div><div class='del'>-    &lt;identifier url="index.html"/&gt;</div><div class='del'>-    &lt;language code="C"/&gt;</div><div class='del'>-  &lt;/resource&gt;</div><div class='del'>-&lt;/omf&gt;</div><div class='head'>diff --git a/help/C/evolution-faq.sgml b/help/C/evolution-faq.sgml<br/>deleted file mode 100644<br/>index 8e658ff308..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/evolution-faq.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/evolution-faq.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,973 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;appendix id="evolution-faq"&gt;</div><div class='del'>-  &lt;title&gt;Frequently Asked Questions About Ximian Evolution&lt;/title&gt;</div><div class='del'>-    	&lt;para&gt;</div><div class='del'>-	 Here are some frequently asked questions about the</div><div class='del'>-	 &lt;application&gt;Evolution&lt;/application&gt; groupware suite from</div><div class='del'>-	 Ximian.  If you have a question that's not listed, you can</div><div class='del'>-	 contact us at evolve@ximian.com.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="faq-features"&gt;</div><div class='del'>-    &lt;title&gt;Features&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;qandaset&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	   How can I use Evolution with Microsoft Exchange or Lotus Notes?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-             If your server uses standard open protocols like IMAP,</div><div class='del'>-             LDAP, POP, and SMTP, you can use Evolution with it.  You</div><div class='del'>-             can share addresses with vCards and calendar items with</div><div class='del'>-             iCal appointments.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-       &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	     Can I use Evolution with KDE?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-             Evolution will work fine in KDE.  You will need to</div><div class='del'>-             install all of the GNOME libraries that it depends on.</div><div class='del'>-             Also, certain configuration options, such as default</div><div class='del'>-             fonts and the message editor keybinding behavior, must be</div><div class='del'>-             changed using the GNOME Control Center application (this</div><div class='del'>-             will also run from within KDE).</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-       &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    How can I remove or rename a folder?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            Right-click on the folder and select the</div><div class='del'>-            &lt;guimenuitem&gt;Delete&lt;/guimenuitem&gt; or</div><div class='del'>-            &lt;guimenuitem&gt;Rename&lt;/guimenuitem&gt; items.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>- </div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Why doesn't drag and drop between folders seem to work?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    The implementation isn't finished, although it's nearly done.</div><div class='del'>-  	  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    In the meantime, right-click on the folders or messages</div><div class='del'>-	    you want to move, and select the</div><div class='del'>-	    &lt;guimenuitem&gt;Move&lt;/guimenuitem&gt; or</div><div class='del'>-	    &lt;guimenuitem&gt;Copy&lt;/guimenuitem&gt; options.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-      &lt;question&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Can I read mail from a mailbox file created by some other</div><div class='del'>-	  application (e.g. Mutt) without importing mail from it?</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    No, but it's a planned feature.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Can Evolution sync with my Palm OS (tm) device?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Yes.  However, it is not yet stable enough for general</div><div class='del'>-	    release and we do not yet ship Evolution with Palm</div><div class='del'>-	    synchronization enabled default. Until we do, you will</div><div class='del'>-	    need to compile this in yourself. Check the</div><div class='del'>-	    &lt;filename&gt;README&lt;/filename&gt; file for additional</div><div class='del'>-	    information on the requirements.  Full compatibility and</div><div class='del'>-	    synchronization for calendar and addressbook applications</div><div class='del'>-	    on Palm devices will be implemented and shipped soon.</div><div class='del'>- 	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    What is the difference between a virtual folder (vfolder)</div><div class='del'>-	    and a regular folder?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    A virtual folder is like a saved search: it is a view of</div><div class='del'>-	    your mail. Regular folders actually contain the mail</div><div class='del'>-	    messages.  You can have one message be in multiple virtual</div><div class='del'>-	    folders, but only in one regular folder.  See the section</div><div class='del'>-	    in the Evolution manual about virtual folders for more</div><div class='del'>-	    information.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Can Evolution spell-check messages while I compose them?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Yes. The Evolution composer is able to highlight</div><div class='del'>-	    mis-spelled word on the fly as you type them, and also</div><div class='del'>-	    give you suggestions for possible corrections.  In order</div><div class='del'>-	    for this to work you need the</div><div class='del'>-	    &lt;filename&gt;gnome-spell&lt;/filename&gt; component, which is not</div><div class='del'>-	    shipped with Ximian GNOME yet.</div><div class='del'>- 	 &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    If you are brave enough, you can check out module</div><div class='del'>-	    &lt;filename&gt;gnome-spell&lt;/filename&gt; from the GNOME CVS and</div><div class='del'>-	    compile it yourself.  Check out its README file for a list</div><div class='del'>-	    of &lt;filename&gt;gnome-spell&lt;/filename&gt;'s requirements for</div><div class='del'>-	    compilation.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Note that you don't need to recompile Evolution after</div><div class='del'>-	    installing &lt;filename&gt;gnome-spell&lt;/filename&gt;; it will be</div><div class='del'>-	    picked up automatically.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Why can't I see the images that are contained in some HTML</div><div class='del'>-	    mail messages.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-  	    Evolution currently doesn't support this, but it's a</div><div class='del'>-	    planned feature.  It will be an option: many people like</div><div class='del'>-	    to turn off the images because they use up bandwidth and can</div><div class='del'>-            be used to spy on your email reading habits.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Can I change the font that Evolution uses to compose and</div><div class='del'>-	    display mail messages?</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    You have to change the GtkHTML settings for that: in the</div><div class='del'>-	    GNOME Control Center, go to the "HTML Viewer"</div><div class='del'>-	    configuration page, which is under the "Document Handlers"</div><div class='del'>-	    category.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            How do I import my Outlook &lt;filename&gt;.pst&lt;/filename&gt; files into Evolution?</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            You cannot import these files directly into Evolution</div><div class='del'>-            because the &lt;filename&gt;.pst&lt;/filename&gt; format is a</div><div class='del'>-            proprietary format. However, Mozilla Mail on Windows can</div><div class='del'>-            convert them into the &lt;type&gt;mbox&lt;/type&gt; format, which can</div><div class='del'>-            then be imported by Evolution.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            To start importing your Outlook mail to Evolution, run</div><div class='del'>-            Mozilla Mail on Windows and select the</div><div class='del'>-            &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;&lt;guimenuitem&gt;Import...&lt;/guimenuitem&gt;&lt;/menuchoice&gt;</div><div class='del'>-            to begin. Then select that you wish to import Mail from</div><div class='del'>-            Outlook. Once Mozilla has imported all your mail, reboot</div><div class='del'>-            your computer into Linux.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Mount your Windows partition in Linux and run Evolution to</div><div class='del'>-            begin importing your mail. Select</div><div class='del'>-            &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;&lt;guimenuitem&gt;Import</div><div class='del'>-            File...&lt;/guimenuitem&gt;&lt;/menuchoice&gt; to start importing. Set</div><div class='del'>-            the file type to MBox (mbox) and click on</div><div class='del'>-            &lt;guibutton&gt;Browse&lt;/guibutton&gt; to select the mail you want</div><div class='del'>-            to import.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you are the only user on Windows, the mail files will</div><div class='del'>-            be stored in &lt;filename&gt;/mnt/c/windows/Application</div><div class='del'>-            Data/Mozilla/Profiles/default/XXXX/Mail/imported.mail/&lt;/filename&gt;</div><div class='del'>-            where &lt;filename&gt;/mnt/c/&lt;/filename&gt; is your windows</div><div class='del'>-            partition mount point and XXXX is some collection of</div><div class='del'>-            numbers and digits ending in &lt;filename&gt;.slt&lt;/filename&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            If there is more than one user, the file will be in</div><div class='del'>-            &lt;filename&gt;/mnt/c/windows/Profiles/USERNAME/XXXX/Mail/imported.mail/&lt;/filename&gt;</div><div class='del'>-            where USERNAME is your Windows username.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            For each mail folder in Outlook, Mozilla will convert the</div><div class='del'>-            folder into one mbox file. To import all your mail, import</div><div class='del'>-            all the files without a &lt;filename&gt;.msf&lt;/filename&gt;</div><div class='del'>-            extension.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If Mozilla can import &lt;filename&gt;.pst&lt;/filename&gt; files, why can't Evolution?</div><div class='del'>-          &lt;/para&gt; </div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Mozilla on Windows accesses the &lt;filename&gt;.pst&lt;/filename&gt;</div><div class='del'>-            files through the &lt;filename&gt;MAPI.DLL&lt;/filename&gt;, which is</div><div class='del'>-            only available on Windows.  &lt;filename&gt;MAPI.DLL&lt;/filename&gt;</div><div class='del'>-            is the only way to access &lt;filename&gt;.pst&lt;/filename&gt; files</div><div class='del'>-            and Evolution cannot use this DLL in Linux.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-             Will there be an Evolution server? How about a text-based or web-based front end?</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Of course, we can't comment on unannounced future product</div><div class='del'>-            plans, but Evolution's architecture would permit the</div><div class='del'>-            existence of that kind of software. If there is enough</div><div class='del'>-            demand for such software we will consider moving in that</div><div class='del'>-            direction.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-           Will Evolution make a good mocha?</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-             Only espresso is planned, but you can easily plug in a chocolate component.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/qandaset&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;!-- Section: Getting and compiling --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="faq-get-and-compile"&gt;</div><div class='del'>-    &lt;title&gt;</div><div class='del'>-      Getting and Compiling Evolution</div><div class='del'>-    &lt;/title&gt;</div><div class='del'>-     &lt;qandaset&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Where can I get the latest Evolution release?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            There are two ways to install the latest Evolution</div><div class='del'>-            release:</div><div class='del'>-            &lt;itemizedlist&gt;</div><div class='del'>-              &lt;listitem&gt;</div><div class='del'>-                &lt;para&gt;</div><div class='del'>-                  If you have Ximian GNOME installed, you can start</div><div class='del'>-                  Red Carpet, Ximian's software updating system, and</div><div class='del'>-                  subscribe to the Evolution channel.  This will let</div><div class='del'>-                  you install a binary for the latest release, and</div><div class='del'>-                  will also warn you when a new version has been made</div><div class='del'>-                  available.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-              &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-              &lt;listitem&gt;</div><div class='del'>-                &lt;para&gt;</div><div class='del'>-                  If you want to compile from source, you can</div><div class='del'>-                  download the latest official Evolution tarball</div><div class='del'>-                  from:</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-                &lt;para&gt;</div><div class='del'>-                  &lt;ulink url="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution"&gt;</div><div class='del'>-                    ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution&lt;/ulink&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-              &lt;/listitem&gt;</div><div class='del'>-            &lt;/itemizedlist&gt;</div><div class='del'>-          &lt;/para&gt;  </div><div class='del'>-        &lt;/answer&gt;      </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Are binary snapshots available?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Yes, if you have Ximian GNOME installed.  Just run Red</div><div class='del'>-            Carpet and subscribe to the Evolution Snapshot channel.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            You can check the status of snapshots at</div><div class='del'>-            &lt;ulink url="http://primates.ximian.com/~snapshot"&gt;http://primates.ximian.com/~snapshot&lt;/ulink&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Why isn't a new snapshot available today?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Sometimes the build might fail because of problems with</div><div class='del'>-            the source on CVS.  In this case, just wait for next day's</div><div class='del'>-            snapshot.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            How do I get Evolution from CVS?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you already have</div><div class='del'>-            &lt;ulink url="http://cvs.gnome.org"&gt;GNOME CVS&lt;/ulink&gt; access,</div><div class='del'>-            simply check out the following modules: evolution,</div><div class='del'>-            gtkhtml, gal.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you don't have a CVS account, you can use anoncvs</div><div class='del'>-            instead. Bear in mind that anoncvs is only synchronized once</div><div class='del'>-            a day, and code received from anoncvs may not be latest</div><div class='del'>-            version available.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Before using the anoncvs server, you have to log into it.</div><div class='del'>-            This only needs to be done once. Use this command:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome login</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Then you can retrieve the modules needed to compile Evolution</div><div class='del'>-            using the following command:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co evolution gtkhtml gal</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            How should I compile Evolution avoiding conflicts with my</div><div class='del'>-            existing GNOME installation?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            The best way is to install Evolution into a separate prefix.</div><div class='del'>-            In order to specify a non-default installation prefix, you</div><div class='del'>-            can pass the &lt;parameter&gt;--prefix&lt;/parameter&gt; option to</div><div class='del'>-            &lt;filename&gt;configure&lt;/filename&gt; or</div><div class='del'>-            &lt;filename&gt;autogen.sh&lt;/filename&gt;.  For example:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-            cd /cvs/evolution</div><div class='del'>-            ./autogen.sh --prefix=/opt/gnome</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you install Evolution and the Evolution libraries in a</div><div class='del'>-            non-standard prefix, make sure you set the appropriate</div><div class='del'>-            environment variables in the startup script for Evolution:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-            export PATH=/opt/gnome:$PATH</div><div class='del'>-            export GNOME_PATH=/opt/gnome:/usr</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            You may also need to add &lt;filename&gt;$prefix/lib&lt;/filename&gt;</div><div class='del'>-            (e.g. &lt;filename&gt;/opt/gnome/lib&lt;/filename&gt;) to your</div><div class='del'>-            &lt;filename&gt;/etc/ld.so.conf&lt;/filename&gt;.  Of course, this will</div><div class='del'>-            not work for systems which do not use ld.so.conf, such as</div><div class='del'>-            HP-UX.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            I get the error message: &lt;computeroutput&gt;make: *** No rule</div><div class='del'>-              to make target</div><div class='del'>-              `all-no-@BUILD_INCLUDED_LIBINTL@'&lt;/computeroutput&gt;</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            You probably have &lt;filename&gt;gettext&lt;/filename&gt; 0.10.36 or</div><div class='del'>-            later installed.  Try downgrading to 0.10.35;</div><div class='del'>-            unfortunately, 0.10.36 introduced some incompatibilities</div><div class='del'>-            with the current &lt;filename&gt;xml-i18n-tools&lt;/filename&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-    &lt;/qandaset&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="faq-trouble"&gt;</div><div class='del'>-      &lt;title&gt;Troubleshooting&lt;/title&gt;</div><div class='del'>-    &lt;qandaset&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    I get &lt;computeroutput&gt;Cannot initialize the Evolution</div><div class='del'>-	    shell&lt;/computeroutput&gt;.</div><div class='del'>-	   &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    There are a number of things that can cause this error.</div><div class='del'>-	    Check that:</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;itemizedlist&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-		  &lt;filename&gt;oafd&lt;/filename&gt; is listed in your &lt;envar&gt;PATH&lt;/envar&gt;</div><div class='del'>-		  environment variable.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-		  &lt;filename&gt;GNOME_Evolution_Shell.oaf&lt;/filename&gt; and</div><div class='del'>-		  the other      </div><div class='del'>-		  &lt;filename&gt;GNOME_Evolution_*.oaf&lt;/filename&gt; files are</div><div class='del'>-		  readable and installed in</div><div class='del'>-		  &lt;filename&gt;$prefix/share/oaf&lt;/filename&gt;, where</div><div class='del'>-		  &lt;filename&gt;$prefix&lt;/filename&gt; is one of the prefixes</div><div class='del'>-		  listed in &lt;envar&gt;GNOME_PATH&lt;/envar&gt; or</div><div class='del'>-		  &lt;envar&gt;OAF_INFO_PATH&lt;/envar&gt;.  (These variables are</div><div class='del'>-		  supposed to contain $PATH-like colon-separated lists of</div><div class='del'>-		  paths.  If the installation prefix for Evolution is</div><div class='del'>-		  different from that). Run `oaf-slay' once before running</div><div class='del'>-		  `evolution' again if you change $GNOME_PATH or</div><div class='del'>-		  $OAF_INFO_PATH.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-		  &lt;filename&gt;evolution&lt;/filename&gt;,</div><div class='del'>-		  &lt;filename&gt;evolution-mail&lt;/filename&gt; and the other</div><div class='del'>-		  &lt;filename&gt;evolution-*&lt;/filename&gt; executables are in your</div><div class='del'>-		  $PATH.</div><div class='del'>-		&lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/itemizedlist&gt;</div><div class='del'>-	&lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            I get &lt;computeroutput&gt;Cannot open composer window&lt;/computeroutput&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            This actually means that Evolution cannot activate the HTML</div><div class='del'>-            editor component from GtkHTML.  The comments in the previous</div><div class='del'>-            answer still apply; also make sure that</div><div class='del'>-            &lt;command&gt;gnome-gtkhtml-editor&lt;/command&gt; is in your</div><div class='del'>-            &lt;envar&gt;PATH&lt;/envar&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            The address suggestion list steals focus from the "To:"</div><div class='del'>-            entry box when I'm typing. How can I make it keep focus?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-           This is a bug in GTK version 1.2.10. To avoid it, downgrade</div><div class='del'>-           to GTK version 1.2.9, or install the Ximian version of GTK</div><div class='del'>-           1.2.10.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            I updated Evolution and now my addressbook information is gone!</div><div class='del'>-            What should I do?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Evolution uses the &lt;filename&gt;libdb&lt;/filename&gt; library to</div><div class='del'>-            handle the addressbook database.  Two versions of</div><div class='del'>-            &lt;filename&gt;libdb&lt;/filename&gt; can be used with Evolution: version</div><div class='del'>-            1.88 and version 2.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Unfortunately, an Evolution executable that is linked against</div><div class='del'>-            a certain version of &lt;filename&gt;libdb&lt;/filename&gt; will only be</div><div class='del'>-            able to read addressbook files written by another Evolution</div><div class='del'>-            executable that is linked with the same version of the</div><div class='del'>-            library.  If your addressbook is not readable by Evolution</div><div class='del'>-            anymore, it probably means that you used to have Evolution</div><div class='del'>-            linked with a certain version of &lt;filename&gt;libdb&lt;/filename&gt;,</div><div class='del'>-            but now it gets linked to a different version.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Because of the way &lt;filename&gt;libdb&lt;/filename&gt; is designed, it</div><div class='del'>-            is not easy for Evolution to automatically do the conversion</div><div class='del'>-            between the two formats.  But, if your Evolution used to be</div><div class='del'>-            linked against version 1.85 and now is linked to version 2,</div><div class='del'>-            there is a very simple way to convert the database and recover</div><div class='del'>-            your data.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                First of all, check the format of the database using the</div><div class='del'>-                &lt;command&gt;file&lt;/command&gt; command:</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-              &lt;programlisting&gt;</div><div class='del'>-                file ~/evolution/local/Contacts/addressbook.db</div><div class='del'>-              &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                You want version 1.85 there.  If your version is 2, then</div><div class='del'>-                your current Evolution is probably linked against</div><div class='del'>-                version 1.85 and you cannot convert the database to the</div><div class='del'>-                old format. To do that, follow these instructions:</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-            </div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                Quit Evolution.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                Make a copy of the addressbook database for backup</div><div class='del'>-                purposes, then move the original out of the way.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-              &lt;programlisting&gt;</div><div class='del'>-                cd ~/evolution/local/Contacts</div><div class='del'>-                cp addressbook.db addressbook.db.backup</div><div class='del'>-                mv addressbook.db addressbook.db.tmp</div><div class='del'>-               &lt;/programlisting&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                Convert the contacts to the new format using</div><div class='del'>-                &lt;command&gt;db_dump185&lt;/command&gt; and</div><div class='del'>-                &lt;command&gt;db_load&lt;/command&gt;:</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-              &lt;programlisting&gt;</div><div class='del'>-                db_dump185 addressbook.db.tmp | db_load ~/evolution/local/Contacts/addressbook.db</div><div class='del'>-              &lt;/programlisting&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                Restart Evolution.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-            &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-          &lt;/itemizedlist&gt;</div><div class='del'>-        &lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Evolution reported an error when trying to retrieve from my</div><div class='del'>-            local spool in &lt;filename&gt;/var/spool/mail/username&lt;/filename&gt;.  Why?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Evolution doesn't have an external helper for moving mail,</div><div class='del'>-            so &lt;filename&gt;/var/spool/mail/&lt;/filename&gt; must be writable</div><div class='del'>-            by you.  Try this:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          </div><div class='del'>-          &lt;programlisting&gt;</div><div class='del'>-            chmod 1777 /var/spool/mail</div><div class='del'>-          &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            We're working on a solution to this problem now.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Evolution crashes reporting that it couldn't allocate N</div><div class='del'>-            billion bytes; how do I fix this?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            This usually happens when a component tries talking a</div><div class='del'>-            certain version of a CORBA interface to another component</div><div class='del'>-            that supports a different version.  For example, this can</div><div class='del'>-            happen when you recompile and install a single component</div><div class='del'>-            without recompiling/installing the rest of Evolution.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you run into this problem, make sure all the components</div><div class='del'>-            are compiled and installed at the same time.  This also</div><div class='del'>-            applies to GtkHTML upgrades; after upgrading and</div><div class='del'>-            installing a newer GtkHTML, always re-compile and</div><div class='del'>-            re-install Evolution against it.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            What is &lt;command&gt;killev&lt;/command&gt; and why do I need to use it?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Evolution is actually made up of several components that run</div><div class='del'>-            as separate processes.  Evolution's shell is not very good</div><div class='del'>-            at cleaning up stale processes, so it is possible that</div><div class='del'>-            sometimes already-running components cause unexpected and/or</div><div class='del'>-            broken behavior.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            It's always a good idea to run &lt;command&gt;killev&lt;/command&gt;</div><div class='del'>-            after a crash in Evolution, especially if the Evolution</div><div class='del'>-            shell itself crashed.  (If a component crashes instead, you</div><div class='del'>-            should try to exit the shell cleanly first, so you give a</div><div class='del'>-            chance to the other components to clean things up properly.)</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            What is &lt;command&gt;oaf-slay&lt;/command&gt; and why do I need to use it?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            &lt;command&gt;oaf-slay&lt;/command&gt; is an utility which comes with</div><div class='del'>-            OAF, the Object Activation Framework that is used in the</div><div class='del'>-            GNOME Desktop to activate components.  It will kill the</div><div class='del'>-            object activation daemon (&lt;command&gt;oafd&lt;/command&gt;) as well</div><div class='del'>-            as all the active components on the system.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Using &lt;command&gt;oaf-slay&lt;/command&gt;</div><div class='del'>-            &lt;command&gt;oaf-slay&lt;/command&gt; is quite drastic and can cause</div><div class='del'>-            problems with other programs that use oaf, especially with</div><div class='del'>-            &lt;application&gt;Nautilus&lt;/application&gt;. To avoid problems, do</div><div class='del'>-            not run &lt;command&gt;oaf-slay&lt;/command&gt; while you are in GNOME.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-    &lt;/qandaset&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="faq-debugging"&gt;</div><div class='del'>-    &lt;title&gt;Questions about Bugs and Debugging&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Find a bug? Here's how to help us fix it!</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;qandaset&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Where should I report bugs for Evolution?</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            You can use the GNOME Bug Report Tool</div><div class='del'>-            (&lt;command&gt;bug-buddy&lt;/command&gt;), or report bugs to the</div><div class='del'>-            Ximian bug reporting system (Bugzilla), located at &lt;ulink</div><div class='del'>-            url="http://bugzilla.ximian.com"&gt;http://bugzilla.ximian.com&lt;/ulink&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          </div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Please use the query function to check if a bug has been</div><div class='del'>-            submitted already, so that we avoid duplicate reports.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt; </div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      </div><div class='del'>-</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-        &lt;question&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-             What is a stack trace (backtrace) and how do I get one?</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-        &lt;/question&gt;</div><div class='del'>-        &lt;answer&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-              A stack trace is a list of the chain of function calls</div><div class='del'>-              that lead to some point in the program. Typically, you</div><div class='del'>-              want to get a stack trace when Evolution crashes or</div><div class='del'>-              hangs and you want to try to figure out where in the</div><div class='del'>-              code that happened and why. For this reason, stack</div><div class='del'>-              traces are extremely useful for the Evolution</div><div class='del'>-              developers, so it's important that you learn how to get</div><div class='del'>-              them, and include them in crash reports. The</div><div class='del'>-              &lt;application&gt;bug-buddy&lt;/application&gt; tool can get and</div><div class='del'>-              submit a stack trace for you.  If you want to do it by</div><div class='del'>-              yourself, here's how:</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-             First of all, in order to get a stack trace, your</div><div class='del'>-             executable (and possibly the libraries) must be compiled</div><div class='del'>-             with debugging symbols. Debugging symbols are created by</div><div class='del'>-             default if you compile from CVS, and are included in the</div><div class='del'>-             snapshot builds. If you decide to compile by yourself</div><div class='del'>-             with some custom CFLAGS value, make sure -g is included</div><div class='del'>-             in them.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Finally, you must put the component that crashes through</div><div class='del'>-            &lt;application&gt;gdb&lt;/application&gt;, the GNU debugging tool.</div><div class='del'>-            To do so, make sure all the components are dead (exit</div><div class='del'>-            Evolution and run &lt;command&gt;killev&lt;/command&gt;), then run the</div><div class='del'>-            following command:</div><div class='del'>-               &lt;programlisting&gt;</div><div class='del'>-                   &lt;command&gt;gdb name-of-component&lt;/command&gt;</div><div class='del'>-                &lt;/programlisting&gt;</div><div class='del'>-           </div><div class='del'>-           Where "name-of-component" is the name of the component that</div><div class='del'>-           crashed.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-           &lt;para&gt;</div><div class='del'>-             Then, at the gdb prompt, type r (for "run") and wait a</div><div class='del'>-             few seconds to make sure the component has registered</div><div class='del'>-             with the name service. Then start</div><div class='del'>-             &lt;application&gt;Evolution&lt;/application&gt; normally from a</div><div class='del'>-             different terminal.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-           &lt;para&gt;</div><div class='del'>-             When you have started</div><div class='del'>-             &lt;application&gt;Evolution&lt;/application&gt;, reproduce the</div><div class='del'>-             crash, and go back to the terminal where you ran gdb. If</div><div class='del'>-             the component crashed, you should have a prompt there;</div><div class='del'>-             otherwise, just hit Control+C. At the prompt, type</div><div class='del'>-             &lt;command&gt;info threads&lt;/command&gt;.  This will give you a</div><div class='del'>-             screen that looks like this:</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-           &lt;para&gt;</div><div class='del'>-              &lt;programlisting&gt;</div><div class='del'>-(gdb) info threads</div><div class='del'>-  8 Thread 6151 (LWP 14908)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  7 Thread 5126 (LWP 14907)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  6 Thread 4101 (LWP 1007)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  5 Thread 3076 (LWP 1006)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  4 Thread 2051 (LWP 1005)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  3 Thread 1026 (LWP 1004)  0x409778fe in sigsuspend () from /lib/libc.so.6</div><div class='del'>-  2 Thread 2049 (LWP 1003)  0x40a10d90 in poll () from /lib/libc.so.6</div><div class='del'>-  1 Thread 1024 (LWP 995)  0x40a10d90 in poll () from /lib/libc.so.6</div><div class='del'>-            &lt;/programlisting&gt;</div><div class='del'>- </div><div class='del'>-             For the most part, only</div><div class='del'>-             &lt;application&gt;evolution-mail&lt;/application&gt; will have more</div><div class='del'>-             than one thread.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-         &lt;para&gt;</div><div class='del'>-           Now, for each of the threads listed, type the following commands:</div><div class='del'>-&lt;programlisting&gt;</div><div class='del'>-thread N</div><div class='del'>-bt</div><div class='del'>-&lt;/programlisting&gt;</div><div class='del'>-           Where 'N' is the number of the thread (in this example, 1</div><div class='del'>-           through 8).</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Cut and paste all the output gdb gives you into a text</div><div class='del'>-            file.  You can quit gdb by typing</div><div class='del'>-            &lt;userinput&gt;quit&lt;/userinput&gt;</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you prefer, you can start gdb while a process is</div><div class='del'>-            running. You'll want to do this right after a crash dialog</div><div class='del'>-            appears, but before hitting "OK" or "Submit bug report".</div><div class='del'>-            Start &lt;application&gt;gdb&lt;/application&gt; as above, but instead</div><div class='del'>-            of using &lt;userinput&gt;r&lt;/userinput&gt;, type &lt;userinput&gt;attach</div><div class='del'>-            PID&lt;/userinput&gt; where PID is the process ID of the</div><div class='del'>-            component you want to debug.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-             If that sounds too complicated, you can always use</div><div class='del'>-             &lt;command&gt;bug-buddy&lt;/command&gt; to get and submit the stack</div><div class='del'>-             trace.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-        &lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-      &lt;qandaentry&gt;</div><div class='del'>-	&lt;question&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-             A component of evolution crashed, but since the rest of</div><div class='del'>-             evolution stayed up, I couldn't use bug-buddy to get a</div><div class='del'>-             stack trace. How can I use gdb to get a stack trace of</div><div class='del'>-             the component?</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	&lt;/question&gt;</div><div class='del'>-	&lt;answer&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-             To trace a failing component (in this example, evolution-mail):</div><div class='del'>-             &lt;orderedlist numeration="arabic"&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Open two terminals.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                   In one, type &lt;command&gt;gdb evolution-mail&lt;/command&gt;</div><div class='del'>-                   .  Replace "evolution-mail" with the name of the</div><div class='del'>-                   component that is crashing: evolution-addressbook,</div><div class='del'>-                   evolution-calendar, etc.)</div><div class='del'>-                 &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Once gdb starts, type &lt;userinput&gt;r&lt;/userinput&gt; and</div><div class='del'>-                  hit enter. Give it a few seconds, to make sure it</div><div class='del'>-                  starts up completely.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                   In the second terminal, type</div><div class='del'>-                   &lt;command&gt;evolution&lt;/command&gt;. Do whatever you did</div><div class='del'>-                   to cause the crash in the component you used in</div><div class='del'>-                   step two.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;  </div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                   When the crash occurs, type 'bt' in the first</div><div class='del'>-                   terminal. </div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	      </div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                   Cut and paste the output into your bug report.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/orderedlist&gt;</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	&lt;/answer&gt;</div><div class='del'>-      &lt;/qandaentry&gt;</div><div class='del'>-    &lt;/qandaset&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;/appendix&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- Local Variables: --&gt; &lt;!-- indent-tabs-mode:nil --&gt; &lt;!-- End: --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/help/C/evolution.sgml b/help/C/evolution.sgml<br/>deleted file mode 100644<br/>index 8cc6534a1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/evolution.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/evolution.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[</div><div class='del'>-</div><div class='del'>-&lt;!ENTITY PREFACE SYSTEM "preface.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-EXCHANGE SYSTEM "usage-exchange.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml"&gt;</div><div class='del'>-&lt;!ENTITY MENUREF SYSTEM "menuref.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml"&gt;</div><div class='del'>-</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- Almost every chapter is an entity.  Files, Chapter id's, and</div><div class='del'>-entity names correspond.  APX is for appendix.  --&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;A User's Guide to Ximian Evolution&lt;/title&gt;</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Aaron&lt;/firstname&gt;&lt;surname&gt;Weber&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Kevin&lt;/firstname&gt;&lt;surname&gt;Breit&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Ettore&lt;/firstname&gt;&lt;surname&gt;Perazzoli&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Duncan&lt;/firstname&gt;&lt;surname&gt;Mak&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000-2002&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Ximian, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;legalnotice id="legalnotice"&gt;</div><div class='del'>- </div><div class='del'>-     &lt;para&gt;</div><div class='del'>-         Permission is granted to copy, distribute and/or modify this</div><div class='del'>-         document under the terms of the &lt;ulink type="help"</div><div class='del'>-         url="gnome-help:fdl"&gt;&lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-         License&lt;/citetitle&gt;&lt;/ulink&gt;, Version 1.1 or any later version</div><div class='del'>-         published by the Free Software Foundation with no Invariant</div><div class='del'>-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You</div><div class='del'>-         may obtain a copy of the &lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-         License&lt;/citetitle&gt; from the Free Software Foundation by</div><div class='del'>-         visiting &lt;ulink type="http" url="http://www.fsf.org"&gt;their</div><div class='del'>-         Web site&lt;/ulink&gt; or by writing to: Free Software Foundation,</div><div class='del'>-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='del'>-         USA.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Many of the names used by companies to distinguish their</div><div class='del'>-         products and services are claimed as trademarks. Where those</div><div class='del'>-         names appear in any GNOME documentation, and those trademarks</div><div class='del'>-         are made aware to the members of the GNOME Documentation</div><div class='del'>-         Project, the names have been printed in caps or initial caps.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-</div><div class='del'>-   &lt;releaseinfo&gt;</div><div class='del'>-      This is version 1.0 of the Ximian Evolution manual. It describes</div><div class='del'>-      version 1.0 of the Ximian Evolution groupware suite.</div><div class='del'>-   &lt;/releaseinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &amp;PREFACE;</div><div class='del'>-  </div><div class='del'>-  &lt;part id="usage"&gt;</div><div class='del'>-    &lt;title&gt;Getting Started with Ximian Evolution&lt;/title&gt;</div><div class='del'>-     &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Part one of the &lt;application&gt;Ximian Evolution&lt;/application&gt; manual</div><div class='del'>-        describes how to use &lt;application&gt;Ximian Evolution&lt;/application&gt; for</div><div class='del'>-        email, contact management, and appointment and task</div><div class='del'>-        scheduling.  You'll find as you go along that there's more</div><div class='del'>-        than one way to do things, and you can pick whichever method</div><div class='del'>-        you like best.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;USAGE-MAINWINDOW;</div><div class='del'>-    &amp;USAGE-EXEC-SUMMARY;</div><div class='del'>-    &amp;USAGE-MAIL;</div><div class='del'>-    &amp;USAGE-MAIL-ORG;</div><div class='del'>-    &amp;USAGE-CONTACT;</div><div class='del'>-    &amp;USAGE-CALENDAR;</div><div class='del'>-    &amp;USAGE-EXCHANGE;</div><div class='del'>-    &amp;USAGE-SYNC; </div><div class='del'>-    &amp;USAGE-PRINT;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-  &lt;part id="config"&gt;</div><div class='del'>-  &lt;title&gt;Configuring and Managing Ximian Evolution&lt;/title&gt;</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;application&gt;Ximian Evolution&lt;/application&gt; is highly</div><div class='del'>-        configurable.  Usually, when developers say that, they mean</div><div class='del'>-        that they didn't test it out thoroughly and have left it to</div><div class='del'>-        other programmers to "configure" themselves a working</div><div class='del'>-        system. In the case of &lt;application&gt;Ximian</div><div class='del'>-        Evolution&lt;/application&gt;, "configurable", it means that, while</div><div class='del'>-        you can expect the program to work perfectly well in its</div><div class='del'>-        default settings, it's also easy to alter its behavior in a</div><div class='del'>-        wide variety of ways, so that it fits your needs exactly.</div><div class='del'>-        This part of the book will describe that process, from the</div><div class='del'>-        quickest glimpse of the Setup Assistant to an in-depth tour of</div><div class='del'>-        the preferences dialogs.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;CONFIG-PREFS;</div><div class='del'>-    &amp;CONFIG-SYNC;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-  &amp;MENUREF;</div><div class='del'>-  &amp;APX-GLOSS;</div><div class='del'>-  &amp;APX-BUGS;</div><div class='del'>-  &amp;APX-AUTHORS; </div><div class='del'>-</div><div class='del'>-&lt;/book&gt;
\ No newline at end of file</div><div class='head'>diff --git a/help/C/figures/calendar.png b/help/C/figures/calendar.png<br/>deleted file mode 100644<br/>index c89b97c702..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/calendar.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/calendar.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/config-cal.png b/help/C/figures/config-cal.png<br/>deleted file mode 100644<br/>index 41fd408292..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/config-cal.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/config-cal.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/config-mail.png b/help/C/figures/config-mail.png<br/>deleted file mode 100644<br/>index 32d03785cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/config-mail.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/config-mail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/contact-editor.png b/help/C/figures/contact-editor.png<br/>deleted file mode 100644<br/>index 21a0bb61ad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/contact-editor.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/contact-editor.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/contact.png b/help/C/figures/contact.png<br/>deleted file mode 100644<br/>index c5138ce609..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/contact.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/contact.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/exchange-identity.png b/help/C/figures/exchange-identity.png<br/>deleted file mode 100644<br/>index 85f6cf30da..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/exchange-identity.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/exchange-identity.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/exchange-receive-options.png b/help/C/figures/exchange-receive-options.png<br/>deleted file mode 100644<br/>index 6e406599fa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/exchange-receive-options.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/exchange-receive-options.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/exchange-receive.png b/help/C/figures/exchange-receive.png<br/>deleted file mode 100644<br/>index adfb82dfd1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/exchange-receive.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/exchange-receive.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/filter-assist-fig.png b/help/C/figures/filter-assist-fig.png<br/>deleted file mode 100644<br/>index 672351b36e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/filter-assist-fig.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/filter-assist-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/filter-new-fig.png b/help/C/figures/filter-new-fig.png<br/>deleted file mode 100644<br/>index 51fc680df9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/filter-new-fig.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/filter-new-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-1.png b/help/C/figures/full-1.png<br/>deleted file mode 100644<br/>index 84afc9d3e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-1.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-1.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-2.png b/help/C/figures/full-2.png<br/>deleted file mode 100644<br/>index 929e356db5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-2.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-2.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-3.png b/help/C/figures/full-3.png<br/>deleted file mode 100644<br/>index 175fd1d970..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-3.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-3.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-4.png b/help/C/figures/full-4.png<br/>deleted file mode 100644<br/>index 45d66bb193..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-4.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-4.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-5.png b/help/C/figures/full-5.png<br/>deleted file mode 100644<br/>index 5fcfd20e45..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-5.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-5.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-6.png b/help/C/figures/full-6.png<br/>deleted file mode 100644<br/>index 484eca4903..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-6.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-6.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/full-7.png b/help/C/figures/full-7.png<br/>deleted file mode 100644<br/>index 8a19eaab42..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/full-7.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/full-7.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/mail-composer.png b/help/C/figures/mail-composer.png<br/>deleted file mode 100644<br/>index 83595e7249..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/mail-composer.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/mail-composer.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/mail-druid-pic.png b/help/C/figures/mail-druid-pic.png<br/>deleted file mode 100644<br/>index 18e29aa49d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/mail-druid-pic.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/mail-druid-pic.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/mail-inbox.png b/help/C/figures/mail-inbox.png<br/>deleted file mode 100644<br/>index 82a4347da2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/mail-inbox.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/mail-inbox.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/mail-threaded.png b/help/C/figures/mail-threaded.png<br/>deleted file mode 100644<br/>index 1b1da138f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/mail-threaded.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/mail-threaded.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/mainwindow-pic.png b/help/C/figures/mainwindow-pic.png<br/>deleted file mode 100644<br/>index 15f6d6d300..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/mainwindow-pic.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/mainwindow-pic.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/newmsg.png b/help/C/figures/newmsg.png<br/>deleted file mode 100644<br/>index fc960d9155..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/newmsg.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/newmsg.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/outline.png b/help/C/figures/outline.png<br/>deleted file mode 100644<br/>index ef94f814a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/outline.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/outline.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/print-dest.png b/help/C/figures/print-dest.png<br/>deleted file mode 100644<br/>index fb1faf7d70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/print-dest.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/print-dest.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/print-preview.png b/help/C/figures/print-preview.png<br/>deleted file mode 100644<br/>index 7f044afa3c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/print-preview.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/print-preview.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/replymsg.png b/help/C/figures/replymsg.png<br/>deleted file mode 100644<br/>index fc3ec6b599..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/replymsg.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/replymsg.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/schedule.png b/help/C/figures/schedule.png<br/>deleted file mode 100644<br/>index c90db58e95..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/schedule.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/schedule.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/small_desktop.png b/help/C/figures/small_desktop.png<br/>deleted file mode 100644<br/>index 029a9629d4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/small_desktop.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/small_desktop.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/summary.png b/help/C/figures/summary.png<br/>deleted file mode 100644<br/>index 148321feea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/summary.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/summary.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/figures/vfolder-createrule-fig.png b/help/C/figures/vfolder-createrule-fig.png<br/>deleted file mode 100644<br/>index 733ed1f7cf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/figures/vfolder-createrule-fig.png?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/figures/vfolder-createrule-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/help/C/menuref.sgml b/help/C/menuref.sgml<br/>deleted file mode 100644<br/>index 340a408847..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/help/C/menuref.sgml?h=rel-0_6_2&amp;id=74f4231f4eb650f0243ff39ab5a085b1df4f7697'>help/C/menuref.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,421 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;appendix id="menuref"&gt;</div><div class='del'>-  &lt;title&gt;Quick Reference&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-      You might want to copy this section and tape it to the wall</div><div class='del'>-      next to your computer: it's a very short summary of most of</div><div class='del'>-      the things you'll want to do with</div><div class='del'>-      &lt;application&gt;Ximian Evolution&lt;/application&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;note id="shortcuts"&gt;</div><div class='del'>-&lt;title&gt;Custom Keyboard Shortcuts&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  If you have set custom keyboard shortcuts for your desktop, (you can</div><div class='del'>-   do this the control center: select</div><div class='del'>-   &lt;menuchoice&gt;&lt;guimenu&gt;System&lt;/guimenu&gt;&lt;guimenuitem&gt;Settings&lt;/guimenuitem&gt;&lt;/menuchoice&gt;</div><div class='del'>-   from your menu panel), they may interfere with Evolution keyboard</div><div class='del'>-   shortcuts.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-   For example, if you have chosen Emacs-style key bindings for your</div><div class='del'>-   desktop-wide text editor, the shortcut</div><div class='del'>-   &lt;keycombo action="simul"&gt;</div><div class='del'>-    &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-    &lt;keycap&gt;W&lt;/keycap&gt;</div><div class='del'>-  &lt;/keycombo&gt;</div><div class='del'>-  will act as "Cut region" rather than as "Close Window" in the</div><div class='del'>-  message composer.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/note&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="quickref-open"&gt;</div><div class='del'>-      &lt;title&gt;Opening or Creating Anything&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;New Item:&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;